[med-svn] [fis-gtm] 01/01: Imported Upstream version 6.3-001A

Amul Shah tuskentower-guest at moszumanska.debian.org
Fri Aug 11 11:15:15 UTC 2017


This is an automated email from the git hooks/post-receive script.

tuskentower-guest pushed a commit to branch upstream
in repository fis-gtm.

commit ffafcb940cb193f0508d05bb6cc08c431b3bfeaf
Author: Amul Shah <amul.shah at fisglobal.com>
Date:   Fri Aug 11 06:38:16 2017 -0400

    Imported Upstream version 6.3-001A
---
 CMakeLists.txt                                     |    17 +-
 LICENSE                                            |     2 +-
 README                                             |    23 +-
 sr_i386/GDEINITSZ.m                                |    24 +
 sr_i386/GTMDefinedTypesInitDebug.m                 | 15272 ++++++++++---------
 sr_i386/GTMDefinedTypesInitRelease.m               | 15247 +++++++++---------
 sr_i386/cmerrors_ctl.c                             |     2 +-
 sr_i386/cmierrors_ctl.c                            |     2 +-
 sr_i386/emit_code.c                                |     5 +-
 sr_i386/gdeerrors_ctl.c                            |    12 +-
 sr_i386/merrors_ansi.h                             |    52 +-
 sr_i386/merrors_ctl.c                              |   120 +-
 sr_i386/ttt.c                                      |  1373 +-
 sr_linux/gtm_env_sp.csh                            |     9 +-
 sr_linux/platform.cmake                            |     6 +-
 sr_linux/release_name.h                            |    10 +-
 sr_port/advancewindow.c                            |    44 +-
 sr_port/aio_shim.h                                 |   102 +
 sr_port/anticipatory_freeze.h                      |   107 +-
 sr_port/backup_block.c                             |    10 +-
 sr_port/bm_find_blk.c                              |     5 +-
 sr_port/bm_getfree.c                               |    22 +-
 sr_port/bml_init.c                                 |    15 +-
 sr_port/bml_newmap.c                               |     3 +-
 sr_port/bool_expr.c                                |    82 +-
 sr_port/bt_put.c                                   |     5 +-
 sr_port/bx_boollit.c                               |   230 +
 sr_port/bx_boolop.c                                |   203 +-
 sr_port/bx_relop.c                                 |    10 +-
 sr_port/bx_tail.c                                  |   185 +-
 sr_port/cdb_sc.h                                   |     9 +
 sr_port/cdb_sc_table.h                             |    60 +-
 sr_port/cdbg_dump.c                                |     4 +-
 sr_port/ceprep_file.c                              |    19 +-
 sr_port/cert_blk.c                                 |    89 +-
 sr_port/cert_blk.h                                 |    13 +-
 sr_port/cmd.c                                      |    40 +-
 sr_port/cmd.h                                      |     4 +-
 sr_port/coerce.c                                   |    28 +-
 sr_port/collseq.h                                  |     5 +-
 sr_port/common_startup_init.c                      |    16 +-
 sr_port/common_startup_init.h                      |    43 +-
 sr_port/comp_fini.c                                |     4 +-
 sr_port/comp_init.c                                |    22 +-
 sr_port/compile_pattern.c                          |     7 +-
 sr_port/compiler.h                                 |    40 +-
 sr_port/compiler_startup.c                         |    15 +-
 sr_port/cre_jnl_file.c                             |   119 +-
 sr_port/cre_jnl_file_intrpt_rename.c               |    51 +-
 sr_port/create_dummy_gbldir.c                      |   100 +-
 sr_port/db_auto_upgrade.c                          |    45 +-
 sr_port/db_common_init.c                           |     1 +
 sr_port/db_csh_getn.c                              |   131 +-
 sr_port/db_csh_ref.c                               |     2 +-
 sr_port/dbcertify_certify_phase.c                  |    12 +-
 sr_port/dbcertify_scan_phase.c                     |     9 +-
 sr_port/desired_db_format_set.c                    |    30 +-
 sr_port/dpgbldir.c                                 |   113 +-
 sr_port/dpgbldir.h                                 |    35 +-
 sr_port/dse.h                                      |     3 +-
 sr_port/dse.hlp                                    |    28 +-
 sr_port/dse_all.c                                  |    21 +-
 sr_port/dse_chng_bhead.c                           |     2 +-
 sr_port/dse_chng_fhead.c                           |     9 +-
 sr_port/dse_dmp_fhead.c                            |    50 +-
 sr_port/dse_f_key.c                                |     9 +-
 sr_port/dse_f_reg.c                                |    53 +-
 sr_port/dse_find_gvt.c                             |     5 +-
 sr_port/dse_flush.c                                |     7 -
 sr_port/dse_integ.c                                |    16 +-
 sr_port/dse_ksrch.c                                |    30 +-
 sr_port/dse_wcreinit.c                             |     4 +-
 sr_port/dumpfhead.mpt                              |   180 +
 sr_port/emit_code.c                                |   496 +-
 sr_port/error.h                                    |    20 +-
 sr_port/eval_expr.c                                |     8 +-
 sr_port/ex_tail.c                                  |   240 +-
 sr_port/expritem.c                                 |    87 +-
 sr_port/extern_func.c                              |     8 +-
 sr_port/f_incr.c                                   |     5 +-
 sr_port/f_select.c                                 |   126 +-
 sr_port/f_zatransform.c                            |    78 +
 sr_port/f_zcollate.c                               |    62 +
 sr_port/file_head_write.h                          |     4 +-
 sr_port/format_targ_key.c                          |    38 +-
 sr_port/gbldefs.c                                  |    77 +-
 sr_port/gde.hlp                                    |   267 +-
 sr_port/gde.m                                      |    17 +-
 sr_port/gdeerrors.msg                              |     7 +-
 sr_port/gdeexit.m                                  |     5 +-
 sr_port/gdeinit.m                                  |   177 +-
 sr_port/gdemap.m                                   |    17 +-
 sr_port/gdemsgin.m                                 |     7 +-
 sr_port/gdeparse.m                                 |    15 +-
 sr_port/gdeshow.m                                  |   195 +-
 sr_port/gds_blk_downgrade.c                        |    29 +-
 sr_port/gds_map_moved.c                            |    26 +-
 sr_port/gds_rundown.h                              |    18 +-
 sr_port/gdsbgtr.h                                  |     4 +-
 sr_port/gdsblk.h                                   |     3 +-
 sr_port/gdsbml.h                                   |     4 +-
 sr_port/gdsbt.h                                    |   185 +-
 sr_port/gdsdbver_sp.h                              |     3 +-
 sr_port/gdsfhead.h                                 |  1944 +--
 sr_port/gdskill.h                                  |     3 +-
 sr_port/get_fs_block_size.c                        |    25 +-
 sr_port/get_log_name.c                             |    15 +-
 sr_port/get_symb_line.c                            |    45 +-
 sr_port/gi.mpt                                     |     6 +-
 sr_port/gsel.mpt                                   |     3 +-
 sr_port/gtm_common_defs.h                          |    15 +-
 sr_port/gtm_fetch.c                                |     2 +-
 sr_port/gtm_libaio.h                               |    85 +
 sr_port/gtm_memcpy_validate_and_execute.c          |     9 +-
 sr_port/gtm_rename.h                               |    11 +-
 sr_port/gtm_repl.h                                 |     8 +-
 sr_port/gtm_reservedDB.h                           |   121 +
 sr_port/gtm_threadgbl_defs.h                       |    45 +-
 sr_port/gtm_threadgbl_init.c                       |     7 +-
 sr_port/gtmdbglvl.h                                |     5 +-
 sr_port/gtmrecv_changelog.c                        |    51 +-
 sr_port/gtmsource_ctl_init.c                       |    17 +-
 sr_port/gtmsource_poll_actions.c                   |     2 +-
 sr_port/gv_bind_name.c                             |    63 +-
 sr_port/gv_bind_subsname.c                         |     9 +-
 sr_port/gv_rundown.c                               |   113 +-
 sr_port/gv_select.c                                |    15 +-
 sr_port/gv_srch_map.c                              |    48 +-
 sr_port/gvcst_blk_build.c                          |     6 +-
 sr_port/gvcst_bmp_mark_free.c                      |    15 +-
 sr_port/gvcst_dataget.c                            |     5 +-
 sr_port/gvcst_expand_free_subtree.c                |    28 +-
 sr_port/gvcst_expand_key.h                         |     3 +-
 sr_port/gvcst_gblmod.c                             |     5 +-
 sr_port/gvcst_get.c                                |    24 +-
 sr_port/gvcst_init.c                               |   853 +-
 sr_port/gvcst_kill.c                               |    39 +-
 sr_port/gvcst_protos.h                             |    52 +-
 sr_port/gvcst_put.c                                |   381 +-
 sr_port/gvcst_query.c                              |    12 +-
 sr_port/gvcst_queryget.c                           |     4 +-
 sr_port/gvcst_reservedDB_funcs.c                   |   859 ++
 sr_port/gvcst_root_search.c                        |     7 +-
 sr_port/gvcst_zprevious.c                          |   103 +-
 sr_port/gvn2gds.c                                  |   340 +
 sr_port/gvn2gds.h                                  |    32 +
 sr_port/gvname_env_restore.c                       |     5 +-
 sr_port/gvname_env_save.c                          |     5 +-
 sr_port/gvnh_spanreg_init.c                        |    16 +-
 sr_port/gvnh_spanreg_subs_gvt_init.c               |    18 +-
 sr_port/gvsub2str.c                                |    13 +-
 sr_port/gvzwrite_clnup.c                           |     6 +-
 sr_port/have_crit.h                                |     1 +
 sr_port/indir.h                                    |     3 +-
 sr_port/indirection.c                              |     5 +-
 sr_port/ins_triple.c                               |     4 +-
 sr_port/insert_region.c                            |     6 +-
 sr_port/io.h                                       |    37 +-
 sr_port/io_rundown.c                               |    59 +-
 sr_port/iop.h                                      |     8 +-
 sr_port/iosocket_close.c                           |     8 +-
 sr_port/iosocket_delimiter.c                       |    80 +-
 sr_port/iosocket_destroy.c                         |    10 +-
 sr_port/iosocket_open.c                            |   241 +-
 sr_port/iosocket_readfl.c                          |    45 +-
 sr_port/iosocket_use.c                             |   130 +-
 sr_port/iosocket_write.c                           |    41 +-
 sr_port/iosocketdef.h                              |     8 +-
 sr_port/is_canonic_name.c                          |   227 +-
 sr_port/is_canonic_name.h                          |    42 +-
 sr_port/jfh_from_jnl_info.c                        |     7 +-
 sr_port/jnl.h                                      |   217 +-
 sr_port/jnl_ensure_open.c                          |    23 +-
 sr_port/jnl_file_close.c                           |     9 +-
 sr_port/jnl_file_lost.c                            |    54 +-
 sr_port/jnl_file_open_common.c                     |    73 +-
 sr_port/jnl_file_open_switch.c                     |    16 +-
 sr_port/jnl_format.c                               |    13 +-
 sr_port/jnl_put_jrt_pfin.c                         |     3 +-
 sr_port/jnl_send_oper.c                            |    24 +-
 sr_port/jnl_set_cur_prior.c                        |    67 +
 sr_port/jnl_wait.c                                 |     9 +-
 sr_port/lb_init.c                                  |    21 +-
 sr_port/line.c                                     |     5 +-
 sr_port/lke.h                                      |     8 +-
 sr_port/lke.hlp                                    |     4 +-
 sr_port/lke_clear.c                                |    65 +-
 sr_port/lke_show.c                                 |    79 +-
 sr_port/lvzwr_out.c                                |     4 +-
 sr_port/m_do.c                                     |    68 +-
 sr_port/m_goto.c                                   |    33 +-
 sr_port/m_goto_postcond.c                          |    68 +
 sr_port/m_if.c                                     |    65 +-
 sr_port/m_set.c                                    |     6 +-
 sr_port/m_xecute.c                                 |    23 +-
 sr_port/m_zgoto.c                                  |    33 +-
 sr_port/mdb_condition_handler.c                    |    13 +-
 sr_port/mdef.h                                     |    69 +-
 sr_port/mdq.h                                      |   104 +-
 sr_port/memcoherency.h                             |    18 +-
 sr_port/merge_desc_check.c                         |    23 +-
 sr_port/merrors.msg                                |    68 +-
 sr_port/mlk_lock.c                                 |    13 +-
 sr_port/mlk_pvtblk_create.c                        |    25 +-
 sr_port/mlk_region_lookup.c                        |     5 +-
 sr_port/mlk_unlock.c                               |    13 +-
 sr_port/mlk_unpend.c                               |    22 +-
 sr_port/mtables.c                                  |    45 +-
 sr_port/mu_cre_file.h                              |     3 +-
 sr_port/mu_freeze_ch.c                             |    12 +-
 sr_port/mu_getlst.h                                |     3 +-
 sr_port/mu_gv_cur_reg_init.c                       |    51 +-
 sr_port/mu_int_blk.c                               |   131 +-
 sr_port/mu_int_err.c                               |    43 +-
 sr_port/mu_int_fhead.c                             |    73 +-
 sr_port/mu_int_init.c                              |    34 +-
 sr_port/mu_int_maps.c                              |    27 +-
 sr_port/mu_int_read.c                              |    39 +-
 sr_port/mu_int_reg.c                               |    70 +-
 sr_port/mu_int_write.c                             |    36 +-
 sr_port/mu_reorg_upgrd_dwngrd.c                    |    32 +-
 sr_port/mubclnup.c                                 |     2 +-
 sr_port/mucregini.c                                |   324 +-
 sr_port/mumps.hlp                                  |  1189 +-
 sr_port/mupfndfil.c                                |    41 +-
 sr_port/mupint.h                                   |    21 +-
 sr_port/mupip.hlp                                  |   713 +-
 sr_port/mupip_backup.c                             |   130 +-
 sr_port/mupip_create.c                             |    18 +-
 sr_port/mupip_downgrade.c                          |   199 +-
 sr_port/mupip_extend.c                             |    33 +-
 sr_port/mupip_freeze.c                             |   136 +-
 sr_port/mupip_integ.c                              |   158 +-
 sr_port/mupip_recover.c                            |    35 +-
 sr_port/mupip_reorg.c                              |    79 +-
 sr_port/mupip_set.c                                |    60 +-
 sr_port/mupip_set_jnl_cleanup.c                    |    35 +-
 sr_port/mupip_set_journal.c                        |   203 +-
 sr_port/mupip_set_journal_parse.c                  |    33 +-
 sr_port/mupip_upgrade.c                            |   171 +-
 sr_port/muprec.h                                   |    39 +-
 sr_port/mur_apply_pblk.c                           |    32 +-
 sr_port/mur_back_process.c                         |    64 +-
 sr_port/mur_block_count_correct.c                  |    16 +-
 sr_port/mur_blocks_free.c                          |    25 +-
 sr_port/mur_close_files.c                          |    84 +-
 sr_port/mur_db_files_from_jnllist.c                |     3 +-
 sr_port/mur_forward.c                              |    54 +-
 sr_port/mur_forward_play_cur_jrec.c                |    14 +-
 sr_port/mur_merge_sort_extfmt.c                    |    14 +-
 sr_port/mur_open_files.c                           |    28 +-
 sr_port/mur_output_record.c                        |    23 +-
 sr_port/mur_output_show.c                          |     7 +-
 sr_port/mur_process_intrpt_recov.c                 |    26 +-
 sr_port/mur_process_seqno_table.c                  |    11 +-
 sr_port/mur_read_file.c                            |    32 +-
 sr_port/mur_sort_files.c                           |    10 +-
 sr_port/mur_tp_resolve_time.c                      |    21 +-
 sr_port/mutex_deadlock_check.c                     |     5 +-
 sr_port/mval2subsc.c                               |     8 +-
 sr_port/objlabel.h                                 |     4 +-
 sr_port/op.h                                       |     5 +-
 sr_port/op_close.c                                 |    12 +-
 sr_port/op_exp.c                                   |     4 +-
 sr_port/op_fnfnumber.c                             |    31 +-
 sr_port/op_fnqlength.c                             |    10 +-
 sr_port/op_fnqsubscript.c                          |    13 +-
 sr_port/op_fnview.c                                |   378 +-
 sr_port/op_fnzatransform.c                         |   173 +
 sr_port/op_fnzcollate.c                            |    67 +
 sr_port/op_fnzqgblmod.c                            |     5 +-
 sr_port/op_gvdata.c                                |     5 +-
 sr_port/op_gvextnam.c                              |     4 +-
 sr_port/op_gvget.c                                 |     5 +-
 sr_port/op_gvincr.c                                |    67 +-
 sr_port/op_gvkill.c                                |    13 +-
 sr_port/op_gvnaked.c                               |    10 +-
 sr_port/op_gvname.c                                |    19 +-
 sr_port/op_gvnext.c                                |     5 +-
 sr_port/op_gvorder.c                               |   212 +-
 sr_port/op_gvput.c                                 |   109 +-
 sr_port/op_gvzwithdraw.c                           |     9 +-
 sr_port/op_hang.c                                  |     6 +-
 sr_port/op_incrlock.c                              |     5 +-
 sr_port/op_indfnname2.c                            |     9 +-
 sr_port/op_indtext.c                               |     4 +-
 sr_port/op_lock.c                                  |     6 +-
 sr_port/op_merge.c                                 |    13 +-
 sr_port/op_merge_arg.c                             |    10 +-
 sr_port/op_svget.c                                 |    11 +-
 sr_port/op_svput.c                                 |     7 +-
 sr_port/op_tcommit.c                               |   112 +-
 sr_port/op_trollback.c                             |    13 +-
 sr_port/op_tstart.c                                |     7 +-
 sr_port/op_view.c                                  |    46 +-
 sr_port/op_zprevious.c                             |   167 +-
 sr_port/op_ztcommit.c                              |     2 +-
 sr_port/opcode_def.h                               |    62 +-
 sr_port/preemptive_db_clnup.c                      |   100 +-
 sr_port/prepare_unique_name.c                      |    82 +-
 sr_port/process_deferred_stale.c                   |    32 +-
 sr_port/process_gvt_pending_list.c                 |     5 +-
 sr_port/put_lit.c                                  |     4 +
 sr_port/read_db_files_from_gld.c                   |    36 +-
 sr_port/region_freeze.c                            |   264 +-
 sr_port/region_init.c                              |    78 +-
 sr_port/rename_file_if_exists.c                    |     4 +-
 sr_port/repl_comm.c                                |     4 +-
 sr_port/repl_filter.c                              |    39 +-
 sr_port/resolve_optimize.c                         |   171 +
 sr_port/resolve_ref.c                              |   228 +-
 sr_port/sec_shr_map_build.c                        |    69 +-
 sr_port/sec_shr_map_build.h                        |     5 +-
 sr_port/secshr_db_clnup.c                          |   518 +-
 sr_port/set_gbuff_limit.c                          |     5 +
 sr_port/sgnl_gvnulsubsc.c                          |    11 +-
 sr_port/shmpool.c                                  |   225 +-
 sr_port/show_source_line.c                         |    17 +-
 sr_port/sleep_cnt.h                                |     9 +-
 sr_port/stp_gcol_src.h                             |    47 +-
 sr_port/stp_init.c                                 |    23 +-
 sr_port/stp_parms.h                                |    10 +-
 sr_port/stringpool.h                               |    31 +-
 sr_port/stx_error.c                                |    40 +-
 sr_port/t_abort.c                                  |    50 +-
 sr_port/t_abort.h                                  |    29 +-
 sr_port/t_abort_cleanup.c                          |    96 +
 sr_port/t_begin.c                                  |    12 +-
 sr_port/t_begin_crit.c                             |     5 +-
 sr_port/t_commit_cleanup.c                         |    39 +-
 sr_port/t_create.c                                 |    28 +-
 sr_port/t_end.c                                    |   258 +-
 sr_port/t_end_sysops.c                             |   400 +-
 sr_port/t_qread.c                                  |    67 +-
 sr_port/t_retry.c                                  |    11 +-
 sr_port/t_write.c                                  |     6 +-
 sr_port/t_write_map.c                              |     6 +-
 sr_port/tab_bg_trc_rec.h                           |    31 +-
 sr_port/tab_gvstats_rec.h                          |    14 +-
 sr_port/targ_alloc.c                               |    11 +-
 sr_port/ti.mpt                                     |    91 +-
 sr_port/toktyp.h                                   |     4 +-
 sr_port/tp.h                                       |   270 +-
 sr_port/tp_clean_up.c                              |    69 +-
 sr_port/tp_hist.c                                  |    81 +-
 sr_port/tp_incr_clean_up.c                         |     8 +-
 sr_port/tp_restart.c                               |     3 +-
 sr_port/tp_set_sgm.c                               |    15 +-
 sr_port/tp_tend.c                                  |   362 +-
 sr_port/tp_unwind.c                                |     9 +-
 sr_port/unary_tail.c                               |   345 +
 sr_port/unuse_literal.c                            |    53 +
 sr_port/updhelper_reader.c                         |    66 +-
 sr_port/updhelper_writer.c                         |    37 +-
 sr_port/updproc.c                                  |    59 +-
 sr_port/util_base_ch.c                             |     5 +-
 sr_port/view_arg_convert.c                         |     5 +-
 sr_port/viewtab.h                                  |     6 +-
 sr_port/wbox_test_init.h                           |    37 +-
 sr_port/wcs_phase2_commit_wait.c                   |    60 +-
 sr_port/wcs_read_in_progress_wait.c                |     6 +-
 sr_port/wcs_recover.c                              |   605 +-
 sr_port/wcs_verify.c                               |   483 +-
 sr_port/xfer.h                                     |    12 +-
 sr_port/zshow_gvstats.c                            |    16 +-
 sr_port/zshow_zwrite.c                             |    12 +-
 sr_port_cm/gtcm_bind_name.c                        |     5 +-
 sr_port_cm/gtcmd_rundown.c                         |    24 +-
 sr_port_cm/gtcml_chklck.c                          |    10 +-
 sr_port_cm/gtcmtr_lke_clearrep.c                   |    22 +-
 sr_port_cm/gtcmtr_lke_showrep.c                    |    24 +-
 sr_port_cm/gvcmy_open.c                            |    53 +-
 sr_unix/Makefile.mk                                |    36 +-
 sr_unix/aio_shim.c                                 |   584 +
 sr_unix/anticipatory_freeze.c                      |     4 +-
 sr_unix/append_time_stamp.c                        |    38 -
 sr_unix/bin_load.c                                 |   229 +-
 sr_unix/buildaux.csh                               |     5 +-
 sr_unix/buildaux_gtmcrypt.csh                      |    23 +-
 sr_unix/ce_substitute.c                            |     3 +-
 sr_unix/check_encrypt_support.sh                   |    20 +-
 sr_unix/check_trigger_support.csh                  |    31 -
 sr_unix/cli.c                                      |    16 +-
 sr_unix/cms_load.csh                               |     4 +-
 sr_unix/comlist.csh                                |    48 +-
 sr_unix/configure.gtc                              |    85 +-
 sr_unix/db_ipcs_reset.c                            |    13 +-
 sr_unix/db_snapshot.h                              |     6 +-
 sr_unix/db_write_eof_block.c                       |    57 +
 sr_unix/db_write_eof_block.h                       |    21 +
 sr_unix/dbcertify_dbfilop.c                        |    25 +-
 sr_unix/dbfilop.c                                  |   136 +-
 sr_unix/dbinit_ch.c                                |    14 +-
 sr_unix/dse.c                                      |     3 +-
 sr_unix/dse_cmd.c                                  |     3 +-
 sr_unix/dse_cmd_disallow.c                         |     5 +-
 sr_unix/dsk_read.c                                 |    12 +-
 sr_unix/dsk_write.c                                |   127 -
 sr_unix/dsk_write_nocache.c                        |    51 +-
 sr_unix/dskspace_msg_timer.c                       |    22 -
 sr_unix/dtgbldir.c                                 |   223 -
 sr_unix/err_init.c                                 |   106 +-
 sr_unix/errorsp.h                                  |    21 +-
 sr_unix/exttab_parse.c                             |     8 +-
 sr_unix/fake_enospc.c                              |   207 +-
 sr_unix/fake_enospc.h                              |     6 +-
 sr_unix/file_head_read.c                           |    34 +-
 sr_unix/file_head_write.c                          |    21 +-
 sr_unix/file_head_write_secshr.c                   |    79 -
 sr_unix/filestruct.h                               |   103 +-
 sr_unix/ftok_sem_incrcnt.c                         |    18 +-
 sr_unix/ftok_sems.c                                |    64 +-
 sr_unix/ftok_sems.h                                |    10 +-
 sr_unix/gbldirnam.h                                |     4 +-
 sr_unix/gdeget.m                                   |    86 +-
 sr_unix/gdeput.m                                   |    80 +-
 sr_unix/gdeverif.m                                 |     7 +-
 sr_unix/gds_rundown.c                              |   446 +-
 sr_unix/gds_rundown_err_cleanup.c                  |     4 +-
 sr_unix/gdsfheadsp.h                               |     4 +-
 sr_unix/gdsfilext.c                                |   117 +-
 sr_unix/gdsfilext_nojnl.c                          |    53 +-
 sr_unix/generate_help.csh                          |    14 +-
 sr_unix/generic_signal_handler.c                   |     7 +-
 sr_unix/get_src_line.c                             |    52 +-
 sr_unix/grab_crit_immediate.c                      |    27 +-
 sr_unix/gt_timer.h                                 |    93 +-
 sr_unix/gt_timers.c                                |   134 +-
 sr_unix/gt_timers_add_safe_hndlrs.c                |    15 +-
 sr_unix/gtm_aio.h                                  |     6 +-
 sr_unix/gtm_compile.c                              |     3 +-
 sr_unix/gtm_dbjnl_dupfd_check.c                    |    54 +-
 sr_unix/gtm_env.csh                                |     5 +-
 sr_unix/gtm_env_init_sp.c                          |   140 +-
 sr_unix/gtm_exit_handler.c                         |    26 +-
 sr_unix/gtm_fork_n_core.c                          |    11 +-
 sr_unix/gtm_is_main_thread.c                       |    39 +
 sr_unix/gtm_logicals.h                             |    13 +-
 sr_unix/gtm_main.c                                 |    13 +-
 sr_unix/gtm_multi_proc.c                           |     2 -
 sr_unix/gtm_permissions.c                          |   115 +-
 sr_unix/gtm_permissions.h                          |    38 +-
 sr_unix/{dskspace_msg_timer.h => gtm_poll.h}       |    18 +-
 sr_unix/gtm_pthread_init_key.c                     |     9 +-
 sr_unix/gtm_rel_quant.h                            |    14 +-
 sr_unix/gtm_semutils.c                             |    92 +-
 sr_unix/gtm_semutils.h                             |    10 +-
 sr_unix/gtm_startup.c                              |    65 +-
 sr_unix/gtm_test_install.csh                       |   158 +-
 sr_unix/gtm_test_install.txt                       |     9 +
 sr_unix/gtm_tls_impl.c                             |    10 +-
 sr_unix/gtm_trigger.c                              |     7 +
 sr_unix/gtmci.c                                    |    17 +-
 sr_unix/gtmcrypt.h                                 |    25 +
 sr_unix/gtmcrypt_dbk_ref.c                         |    76 +-
 sr_unix/gtmcrypt_dbk_ref.h                         |     2 +-
 sr_unix/gtmcrypt_pk_ref.h                          |    79 +-
 sr_unix/gtmcrypt_ref.h                             |     6 +-
 sr_unix/gtmcrypt_sym_ref.c                         |    36 +-
 sr_unix/gtmcrypt_sym_ref.h                         |     7 +-
 sr_unix/gtmdefinedtypestodb.m                      |     5 +-
 sr_unix/gtmgblstat.c                               |    44 +
 sr_unix/{gbldirnam.h => gtmgblstat.h}              |    14 +-
 sr_unix/gtmgblstat.xc                              |     4 +
 sr_unix/gtmhlpld.m                                 |     5 +-
 sr_unix/gtminstall_Solaris.sh                      |   481 -
 sr_unix/gtmio.h                                    |   503 +-
 sr_unix/gtmrecv.c                                  |     2 -
 sr_unix/gtmrecv_poll_actions.c                     |     7 +-
 sr_unix/gtmrecv_process.c                          |    38 +-
 sr_unix/gtmsecshr.c                                |   145 +-
 sr_unix/gtmsecshr.h                                |     4 +-
 sr_unix/gtmsecshr_wrapper.c                        |   225 +-
 sr_unix/gtmshr_symbols.exp                         |     3 +
 sr_unix/gtmsource.c                                |    27 +-
 sr_unix/gtmsource.h                                |     1 +
 sr_unix/gtmsource_changelog.c                      |    41 +-
 sr_unix/gtmsource_get_opt.c                        |     3 -
 sr_unix/gtmsource_heartbeat.c                      |     6 +-
 sr_unix/gtmsource_process.c                        |    24 +-
 sr_unix/gtmsource_readfiles.c                      |   115 +-
 sr_unix/gtmsource_rootprimary_init.c               |     2 +-
 sr_unix/gtmsource_seqno_init.c                     |    10 +-
 sr_unix/gtmsrc.csh                                 |     2 +-
 sr_unix/gtmxc_types.h                              |     3 +-
 sr_unix/gv_trigger.c                               |   108 +-
 sr_unix/gv_trigger.h                               |    13 +-
 sr_unix/gvcst_init_sysops.c                        |   882 +-
 sr_unix/gvcst_spr_data.c                           |     9 +-
 sr_unix/gvcst_spr_kill.c                           |     9 +-
 sr_unix/gvcst_spr_order.c                          |     9 +-
 sr_unix/gvcst_spr_query.c                          |    24 +-
 sr_unix/gvcst_spr_queryget.c                       |    30 +-
 sr_unix/gvcst_spr_zprevious.c                      |    10 +-
 sr_unix/heartbeat_timer.h                          |    40 -
 sr_unix/hpuxia64_badd.txt                          |    38 -
 sr_unix/hpuxparisc_badd.txt                        |    32 -
 sr_unix/hpuxparisc_bdeldir.txt                     |    17 -
 sr_unix/init_gtm.c                                 |    82 +-
 sr_unix/interlock.h                                |    31 +-
 sr_unix/io_open_try.c                              |    32 +-
 sr_unix/iob_read.c                                 |    64 +-
 sr_unix/iorm_close.c                               |     7 +-
 sr_unix/iorm_get.c                                 |    27 +-
 sr_unix/iorm_open.c                                |    84 +-
 sr_unix/iorm_readfl.c                              |   496 +-
 sr_unix/iorm_use.c                                 |   165 +-
 sr_unix/iorm_write.c                               |    12 +-
 sr_unix/iormdef.h                                  |    20 +-
 sr_unix/iott_open.c                                |    60 +-
 sr_unix/iott_readfl.c                              |     5 +-
 sr_unix/iott_use.c                                 |    69 +-
 sr_unix/is_fstype_nfs.c                            |    46 +
 sr_port/t_abort.h => sr_unix/is_fstype_nfs.h       |     9 +-
 sr_unix/is_proc_alive.c                            |    23 +-
 .../{heartbeat_timer.c => jnl_file_close_timer.c}  |    49 +-
 sr_unix/jnl_file_close_timer.h                     |    33 +
 sr_unix/jnl_file_extend.c                          |    20 +-
 sr_unix/jnl_file_open.c                            |    43 +-
 sr_unix/jnlpool_init.c                             |     2 -
 sr_unix/jnlsp.h                                    |    13 +-
 sr_unix/kitstart.csh                               |    53 +-
 sr_unix/liblke.list                                |     1 -
 sr_unix/libmupip.list                              |     3 -
 sr_unix/lintgtm.csh                                |    10 +-
 sr_unix/lke_cmd.c                                  |     4 +-
 sr_unix/lke_setgdr.c                               |    88 -
 sr_unix/mdefsa.h                                   |    19 +-
 sr_unix/mdefsp.h                                   |    12 +-
 sr_unix/mu_all_version_standalone.c                |     6 +-
 sr_unix/mu_cre_file.c                              |   359 +-
 sr_unix/mu_decrypt.c                               |     4 +-
 sr_unix/mu_extract.c                               |     3 +-
 sr_unix/mu_getlst.c                                |    30 +-
 sr_unix/mu_op_open.c                               |    11 +-
 sr_unix/mu_rndwn_all.c                             |    28 +-
 sr_unix/mu_rndwn_file.c                            |  1341 +-
 sr_unix/mu_rndwn_file.h                            |     6 +-
 sr_unix/mu_rndwn_repl_instance.c                   |     7 +-
 sr_unix/mu_size_arsample.c                         |    16 +-
 sr_unix/mu_size_impsample.c                        |    16 +-
 sr_unix/mu_trig_trgfile.c                          |    11 +-
 sr_unix/mu_truncate.c                              |    22 +-
 sr_unix/mubexpfilnam.c                             |     7 +-
 sr_unix/mubfilcpy.c                                |    50 +-
 sr_unix/mubinccpy.c                                |   114 +-
 sr_unix/mucblkini.c                                |    48 +-
 sr_unix/mupip.c                                    |     7 +-
 sr_unix/mupip_cmd.c                                |    95 +-
 sr_unix/mupip_cmd_disallow.c                       |    20 +-
 sr_unix/mupip_cmd_disallow.h                       |     3 +-
 sr_unix/mupip_cvtgbl.c                             |    19 +-
 sr_unix/mupip_dump_fhead.c                         |   108 +
 .../mu_cre_file.h => sr_unix/mupip_dump_fhead.h    |    11 +-
 sr_unix/mupip_endiancvt.c                          |   150 +-
 sr_unix/mupip_exit_handler.c                       |     5 +-
 sr_unix/mupip_reorg_encrypt.c                      |   168 +-
 sr_unix/mupip_restore.c                            |   160 +-
 sr_unix/mupip_rundown.c                            |    40 +-
 sr_unix/mupip_set_file.c                           |   159 +-
 sr_unix/mupip_size.c                               |     7 +-
 sr_unix/mupip_trigger.c                            |    12 +-
 sr_unix/mur_cre_file_extfmt.c                      |    20 +-
 sr_unix/mutex.c                                    |    68 +-
 sr_unix/mutexsp.h                                  |    22 +-
 sr_unix/ojchildioclean.c                           |     8 +-
 sr_unix/ojchildparms.c                             |    13 +-
 sr_unix/op_fnfgncal.c                              |    42 +-
 sr_unix/op_fnzconvert.c                            |    12 +
 sr_unix/op_fnzpeek.c                               |   109 +-
 sr_unix/op_setp1.c                                 |    20 +-
 sr_unix/op_setpiece.c                              |    18 +-
 sr_unix/op_ztrigger.c                              |    18 +-
 sr_unix/osf1alpha_badd.txt                         |    23 -
 sr_unix/peekbyname.mpt                             |    41 +-
 sr_unix/pinentry-gtm.sh                            |    40 +-
 sr_unix/pinentry.m                                 |     8 +-
 sr_unix/recover_truncate.c                         |    16 +-
 sr_unix/relinkctl.c                                |    18 +-
 sr_unix/remove_rms.c                               |    74 +-
 sr_unix/repl_inst_create.c                         |     5 +-
 sr_unix/repl_instance.c                            |    17 +-
 sr_unix/rtnobj.c                                   |    16 +-
 sr_unix/rts_error.c                                |    21 +-
 sr_unix/runall.csh                                 |     8 +-
 sr_unix/secshr_client.c                            |     4 +-
 sr_unix/set_jnl_file_close.c                       |    11 +-
 sr_unix/set_library_path.csh                       |    10 +-
 sr_unix/set_zstatus.c                              |     6 +-
 sr_unix/simple_timeout_timer.c                     |    33 +
 sr_unix/source_file.c                              |    16 +-
 sr_unix/ss_anal_shdw_file.c                        |    22 +-
 sr_unix/ss_initiate.c                              |    80 +-
 sr_unix/ss_read_block.c                            |    23 +-
 sr_unix/ss_write_block.c                           |     2 +-
 sr_unix/trigger.h                                  |    29 +-
 sr_unix/trigger_compare.c                          |    11 +-
 sr_unix/trigger_delete.c                           |    53 +-
 sr_unix/trigger_fill_xecute_buffer.c               |    33 +-
 sr_unix/trigger_gbl_fill_xecute_buffer.c           |    31 +-
 sr_unix/trigger_incr_cycle.c                       |     5 +-
 sr_unix/trigger_locate_andor_load.c                |    12 +-
 sr_unix/trigger_parse.c                            |     9 +-
 sr_unix/trigger_select.c                           |    35 +-
 sr_unix/trigger_source_read_andor_verify.c         |    41 +-
 sr_unix/trigger_update.c                           |    45 +-
 sr_unix/trigger_upgrade.c                          |     7 +-
 sr_unix/ttt.txt                                    |    45 +-
 sr_unix/util_exit_handler.c                        |     5 +-
 sr_unix/versions.csh                               |     2 +-
 sr_unix/wait_for_disk_space.c                      |     4 +-
 sr_unix/wcs_clean_dbsync.c                         |    75 +-
 sr_unix/wcs_clean_dbsync_timer.c                   |     6 +-
 sr_unix/wcs_flu.c                                  |   365 +-
 sr_unix/wcs_get_space.c                            |   281 +-
 sr_unix/wcs_write_in_progress_wait.c               |    30 +-
 sr_unix/wcs_wt.h                                   |    86 +
 sr_unix/wcs_wt_restart.c                           |    83 +
 sr_unix/wcs_wterror.c                              |   151 +
 sr_unix/wcs_wtfini.c                               |   407 +
 sr_unix/wcs_wtfini_nocrit.c                        |    60 +
 sr_unix/wcs_wtstart.c                              |   760 +-
 sr_unix/wcs_wtstart_fini.c                         |   207 +
 sr_unix/ygblstat.mpt                               |   183 +
 sr_unix/zshow_devices.c                            |    34 +-
 sr_unix_cm/rc_fnd_file.c                           |     9 +-
 sr_unix_gnp/cmi_open.c                             |     4 +-
 sr_unix_gnp/gtcm_open_cmerrlog.c                   |     3 +-
 sr_unix_gnp/gtcmd_ini_reg.c                        |    27 +-
 sr_unix_nsb/m_do.c                                 |   178 -
 sr_unix_nsb/opcode_def.h                           |    64 +-
 sr_unix_nsb/resolve_ref.c                          |   202 -
 sr_unix_nsb/ttt.txt                                |    13 +-
 sr_x86_64/GDEINITSZ.m                              |    24 +
 sr_x86_64/GTMDefinedTypesInitDebug.m               | 15132 +++++++++---------
 sr_x86_64/GTMDefinedTypesInitRelease.m             | 15109 +++++++++---------
 sr_x86_64/ci_restart.s                             |     4 +-
 sr_x86_64/cmerrors_ctl.c                           |     2 +-
 sr_x86_64/cmierrors_ctl.c                          |     2 +-
 sr_x86_64/emit_code_sp.c                           |   295 +-
 sr_x86_64/emit_code_sp.h                           |   816 +-
 sr_x86_64/find_line_call.c                         |     5 +-
 sr_x86_64/g_msf.si                                 |     6 +-
 sr_x86_64/gdeerrors_ctl.c                          |    12 +-
 sr_x86_64/merrors_ansi.h                           |    52 +-
 sr_x86_64/merrors_ctl.c                            |   120 +-
 sr_x86_64/mval_def.si                              |     5 +-
 sr_x86_64/op_fnget.s                               |     6 +-
 sr_x86_64/op_forcenum.s                            |     6 +-
 sr_x86_64/op_gettruth.s                            |     6 +-
 sr_x86_64/op_sto.s                                 |     6 +-
 sr_x86_64/ttt.c                                    |  1409 +-
 sr_x86_64/x86_64.h                                 |    12 +-
 sr_x86_regs/i386.h                                 |    15 +-
 654 files changed, 60635 insertions(+), 46222 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 134a6a0..287514e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,7 +27,7 @@ foreach(lang ${languages})
 endforeach()
 
 # Defaults
-set(version V6.3-000A)
+set(version V6.3-001A)
 if("${version}" STREQUAL "")
         set(version V9.9-0)
 endif()
@@ -521,17 +521,6 @@ target_link_libraries(libgtmcrypt_openssl_AES256CFB ${GPG_LIBRARIES} ${TLS_LIBRA
 add_dependencies(libgtmcrypt_openssl_AES256CFB gen_gtm_threadgbl_deftypes)
 install(TARGETS libgtmcrypt_openssl_AES256CFB DESTINATION ${GTM_INSTALL_DIR}/plugin)
 
-# Library=OPENSSL Algorithm=BLOWFISHCFB
-add_library(libgtmcrypt_openssl_BLOWFISHCFB MODULE ${libgtmcrypt_SOURCES})
-set_target_properties(libgtmcrypt_openssl_BLOWFISHCFB PROPERTIES
-  OUTPUT_NAME gtmcrypt_openssl_BLOWFISHCFB
-  COMPILE_DEFINITIONS "USE_OPENSSL -DUSE_BLOWFISHCFB"
-  LIBRARY_OUTPUT_DIRECTORY ${GTM_BINARY_DIR}/plugin
-  )
-target_link_libraries(libgtmcrypt_openssl_BLOWFISHCFB ${GPG_LIBRARIES} ${TLS_LIBRARIES})
-add_dependencies(libgtmcrypt_openssl_BLOWFISHCFB gen_gtm_threadgbl_deftypes)
-install(TARGETS libgtmcrypt_openssl_BLOWFISHCFB DESTINATION ${GTM_INSTALL_DIR}/plugin)
-
 add_library(libgtmtls MODULE ${libgtmtls_SOURCES})
 set_target_properties(libgtmtls PROPERTIES
   OUTPUT_NAME gtmtls
@@ -890,7 +879,9 @@ install(FILES sr_unix/lowerc_cp.sh DESTINATION ${GTM_INSTALL_DIR}
   RENAME lowerc_cp
   )
 
-install(FILES COPYING DESTINATION ${GTM_INSTALL_DIR})
+if (EXISTS ${GTM_SOURCE_DIR}/COPYING)
+  install(FILES COPYING DESTINATION ${GTM_INSTALL_DIR})
+endif()
 
 add_custom_target(place_files ALL DEPENDS ${files_to_place})
 
diff --git a/LICENSE b/LICENSE
index 501a9c3..8b3ce06 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-All software in this package is part of FIS GT.M (http://fis-gtm.com) which is Copyright 2016 Fidelity Information
+All software in this package is part of FIS GT.M (http://fis-gtm.com) which is Copyright 2017 Fidelity Information
 Services, Inc., and provided to you under the terms of a license. If there is a COPYING file included in this package,
 it contains the terms of the license under which the package is provided to you. If there is not a COPYING file in the
 package, you must ensure that your use of FIS GT.M complies with the license under which it is provided. If you are
diff --git a/README b/README
index 6320188..c964308 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 All software in this package is part of FIS GT.M (http://fis-gtm.com)
-which is Copyright 2016 Fidelity Information Services, Inc., and
+which is Copyright 2017 Fidelity Information Services, Inc., and
 provided to you under the terms of a license. If there is a COPYING
 file included in this package, it contains the terms of the license under
 which the package is provided to you. If there is not a COPYING file in
@@ -18,22 +18,23 @@ taken from the distribution repositories.
 To build GT.M for Linux, do the following steps:
 
 1. Fulfill the pre-requisites
-   Install developement libraries libelf, zlib, libicu, libgpgme, libgpg-error,
-   libgcrypt, libssl, libconfig. There may be other library dependencies. If
-   CMake issues a  NOTFOUND error, please see the FAQ below.
+   Install developement libraries
+   cmake tcsh {libconfig,libelf,libgcrypt,libgpg-error,libgpgme11,libicu,libncurses,libssl,zlib1g}-dev
+   There may be other library dependencies or the packages may have different names
+   If CMake issues a NOTFOUND error, please see the FAQ below.
 
 2. Unpack the GT.M sources
    The GT.M source tarball extracts to a directory with the version number in
-   the name, fis-gtm-V6.3-000A
-   $ tar xfz fis-gtm-V6.3-000A.tar.gz
-   $ cd fis-gtm-V6.3-000A
+   the name, fis-gtm-V6.3-001A
+   $ tar xfz fis-gtm-V6.3-001A.tar.gz
+   $ cd fis-gtm-V6.3-001A
 
    You should find this README, LICENSE, COPYING and CMakeLists.txt file and
    sr_* source directories.
 
 3. Building GT.M -
    <fis-gtm-build> can be a sub directory of the source directory,
-   fis-gtm-V6.3-000A, or any other valid path.
+   fis-gtm-V6.3-001A, or any other valid path.
 
    $ mkdir <fis-gtm-build>
    $ cd <fis-gtm-build>
@@ -52,16 +53,16 @@ To build GT.M for Linux, do the following steps:
    #
    #     -D CMAKE_INSTALL_PREFIX:PATH=${PWD}/package
    #
-   $ cmake -D CMAKE_INSTALL_PREFIX:PATH=${PWD}/package <path to>/fis-gtm-V6.3-000A
+   $ cmake -D CMAKE_INSTALL_PREFIX:PATH=${PWD}/package <path to>/fis-gtm-V6.3-001A
 
    $ make
 
    $ make install
 
-   $ cd package/lib/fis-gtm/V6.3-000A_x86_64
+   $ cd package/lib/fis-gtm/V6.3-001A_x86_64
 
    # Now you are ready to install GT.M. Answer a few questions and install it.
-   # The recommended installation path is /opt/fis-gtm/V6.3-000A_x86_64
+   # The recommended installation path is /opt/fis-gtm/V6.3-001A_x86_64
 
    $ sudo ./configure
 
diff --git a/sr_i386/GDEINITSZ.m b/sr_i386/GDEINITSZ.m
new file mode 100644
index 0000000..7bff1c1
--- /dev/null
+++ b/sr_i386/GDEINITSZ.m
@@ -0,0 +1,24 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;
+; Generated by scantypedefs.m at 10:50:09 on 2017-03-30
+; Build done with GT.M version: GT.M V6.3-000A Linux x86
+;
+; Environment variables during run:
+;   $gtm_dist: /usr/library/V63000A/dbg
+;   $gtm_exe: /usr/library/V63001A/dbg
+;   $gtm_src: /usr/library/V63001A/src
+;   $gtm_inc: /usr/library/V63001A/inc
+;
+; Note this file should not be manually invoked
+;
+	Write "GTM-E-GTMSDFILE This routine (",$TEXT(+0),") should not be manually invoked",!
+	Quit
+;
+; Entry point used by gdeinit.m to define GTM structure fields
+;
+Init
+	; GT.M structure and field definitions
+	Set SIZEOF("gvstats")=472
+	Quit
diff --git a/sr_i386/GTMDefinedTypesInitDebug.m b/sr_i386/GTMDefinedTypesInitDebug.m
index 5008f7f..18b8d61 100644
--- a/sr_i386/GTMDefinedTypesInitDebug.m
+++ b/sr_i386/GTMDefinedTypesInitDebug.m
@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;								;
-; Copyright (c) 2010-2016 Fidelity National Information 	;
+; Copyright (c) 2010-2017 Fidelity National Information 	;
 ; Services, Inc. and/or its subsidiaries. All rights reserved.	;
 ;								;
 ;	This source code contains the intellectual property	;
@@ -11,14 +11,14 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ;
-; Generated by scantypedefs.m at 17:38:51 on 2016-05-09
-; Build done with GT.M version: GT.M V6.3-000 Linux x86
+; Generated by scantypedefs.m at 10:50:09 on 2017-03-30
+; Build done with GT.M version: GT.M V6.3-000A Linux x86
 ;
 ; Environment variables during run:
-;   $gtm_dist: /usr/library/V63000/dbg
-;   $gtm_exe: /usr/library/V63000A/dbg
-;   $gtm_src: /usr/library/V63000A/src
-;   $gtm_inc: /usr/library/V63000A/inc
+;   $gtm_dist: /usr/library/V63000A/dbg
+;   $gtm_exe: /usr/library/V63001A/dbg
+;   $gtm_src: /usr/library/V63001A/src
+;   $gtm_inc: /usr/library/V63001A/inc
 ;
 ; Note this file should not be manually invoked
 ;
@@ -28,10 +28,10 @@
 ; Entry point used by gtmpcat and others to define GTM structure fields
 ;
 Init
-	Set gtmsdver="1.1.0"
+	; GT.M structure and field definitions
+	Set gtmsdver="1.2.0"
 	Set gtmsdtyp="dbg"
 	;
-	; GT.M structure and field definitions
 	;
 	Set gtmtypes("ABS_TIME")="struct"
 	Set gtmtypes("ABS_TIME",0)=2
@@ -209,8 +209,8 @@ Init
 	Set gtmtypfldindx("Dev_param_pairs","pairs[0].definition")=4
 	;
 	Set gtmtypes("GT_TIMER")="struct"
-	Set gtmtypes("GT_TIMER",0)=13
-	Set gtmtypes("GT_TIMER","len")=44
+	Set gtmtypes("GT_TIMER",0)=14
+	Set gtmtypes("GT_TIMER","len")=48
 	Set gtmtypes("GT_TIMER",1,"name")="GT_TIMER.expir_time"
 	Set gtmtypes("GT_TIMER",1,"off")=0
 	Set gtmtypes("GT_TIMER",1,"len")=8
@@ -261,21 +261,26 @@ Init
 	Set gtmtypes("GT_TIMER",10,"len")=4
 	Set gtmtypes("GT_TIMER",10,"type")="int"
 	Set gtmtypfldindx("GT_TIMER","safe")=10
-	Set gtmtypes("GT_TIMER",11,"name")="GT_TIMER.hd_len_max"
+	Set gtmtypes("GT_TIMER",11,"name")="GT_TIMER.block_int"
 	Set gtmtypes("GT_TIMER",11,"off")=32
 	Set gtmtypes("GT_TIMER",11,"len")=4
 	Set gtmtypes("GT_TIMER",11,"type")="int"
-	Set gtmtypfldindx("GT_TIMER","hd_len_max")=11
-	Set gtmtypes("GT_TIMER",12,"name")="GT_TIMER.hd_len"
+	Set gtmtypfldindx("GT_TIMER","block_int")=11
+	Set gtmtypes("GT_TIMER",12,"name")="GT_TIMER.hd_len_max"
 	Set gtmtypes("GT_TIMER",12,"off")=36
 	Set gtmtypes("GT_TIMER",12,"len")=4
 	Set gtmtypes("GT_TIMER",12,"type")="int"
-	Set gtmtypfldindx("GT_TIMER","hd_len")=12
-	Set gtmtypes("GT_TIMER",13,"name")="GT_TIMER.hd_data"
+	Set gtmtypfldindx("GT_TIMER","hd_len_max")=12
+	Set gtmtypes("GT_TIMER",13,"name")="GT_TIMER.hd_len"
 	Set gtmtypes("GT_TIMER",13,"off")=40
-	Set gtmtypes("GT_TIMER",13,"len")=1
-	Set gtmtypes("GT_TIMER",13,"type")="char"
-	Set gtmtypfldindx("GT_TIMER","hd_data")=13
+	Set gtmtypes("GT_TIMER",13,"len")=4
+	Set gtmtypes("GT_TIMER",13,"type")="int"
+	Set gtmtypfldindx("GT_TIMER","hd_len")=13
+	Set gtmtypes("GT_TIMER",14,"name")="GT_TIMER.hd_data"
+	Set gtmtypes("GT_TIMER",14,"off")=44
+	Set gtmtypes("GT_TIMER",14,"len")=1
+	Set gtmtypes("GT_TIMER",14,"type")="char"
+	Set gtmtypfldindx("GT_TIMER","hd_data")=14
 	;
 	Set gtmtypes("IN_PARMS")="struct"
 	Set gtmtypes("IN_PARMS",0)=5
@@ -823,8 +828,8 @@ Init
 	Set gtmtypfldindx("cache_que_head","latch.u.parts.latch_word")=8
 	;
 	Set gtmtypes("cache_que_heads")="struct"
-	Set gtmtypes("cache_que_heads",0)=49
-	Set gtmtypes("cache_que_heads","len")=152
+	Set gtmtypes("cache_que_heads",0)=52
+	Set gtmtypes("cache_que_heads","len")=292
 	Set gtmtypes("cache_que_heads",1,"name")="cache_que_heads.cacheq_wip"
 	Set gtmtypes("cache_que_heads",1,"off")=0
 	Set gtmtypes("cache_que_heads",1,"len")=16
@@ -917,7 +922,7 @@ Init
 	Set gtmtypfldindx("cache_que_heads","cacheq_active.latch.u.parts.latch_word")=18
 	Set gtmtypes("cache_que_heads",19,"name")="cache_que_heads.cache_array"
 	Set gtmtypes("cache_que_heads",19,"off")=32
-	Set gtmtypes("cache_que_heads",19,"len")=120
+	Set gtmtypes("cache_que_heads",19,"len")=260
 	Set gtmtypes("cache_que_heads",19,"type")="cache_rec"
 	Set gtmtypfldindx("cache_que_heads","cache_array")=19
 	Set gtmtypes("cache_que_heads",20,"name")="cache_que_heads.cache_array[0].blkque"
@@ -1015,65 +1020,80 @@ Init
 	Set gtmtypes("cache_que_heads",38,"len")=4
 	Set gtmtypes("cache_que_heads",38,"type")="unsigned-int"
 	Set gtmtypfldindx("cache_que_heads","cache_array[0].jnl_addr")=38
-	Set gtmtypes("cache_que_heads",39,"name")="cache_que_heads.cache_array[0].rip_latch"
+	Set gtmtypes("cache_que_heads",39,"name")="cache_que_heads.cache_array[0].stopped"
 	Set gtmtypes("cache_que_heads",39,"off")=104
-	Set gtmtypes("cache_que_heads",39,"len")=8
-	Set gtmtypes("cache_que_heads",39,"type")="global_latch_t"
-	Set gtmtypfldindx("cache_que_heads","cache_array[0].rip_latch")=39
-	Set gtmtypes("cache_que_heads",40,"name")="cache_que_heads.cache_array[0].image_count"
-	Set gtmtypes("cache_que_heads",40,"off")=112
-	Set gtmtypes("cache_que_heads",40,"len")=4
-	Set gtmtypes("cache_que_heads",40,"type")="int"
-	Set gtmtypfldindx("cache_que_heads","cache_array[0].image_count")=40
-	Set gtmtypes("cache_que_heads",41,"name")="cache_que_heads.cache_array[0].epid"
+	Set gtmtypes("cache_que_heads",39,"len")=4
+	Set gtmtypes("cache_que_heads",39,"type")="unsigned-int"
+	Set gtmtypfldindx("cache_que_heads","cache_array[0].stopped")=39
+	Set gtmtypes("cache_que_heads",40,"name")="cache_que_heads.cache_array[0].rip_latch"
+	Set gtmtypes("cache_que_heads",40,"off")=108
+	Set gtmtypes("cache_que_heads",40,"len")=8
+	Set gtmtypes("cache_que_heads",40,"type")="global_latch_t"
+	Set gtmtypfldindx("cache_que_heads","cache_array[0].rip_latch")=40
+	Set gtmtypes("cache_que_heads",41,"name")="cache_que_heads.cache_array[0].data_invalid"
 	Set gtmtypes("cache_que_heads",41,"off")=116
 	Set gtmtypes("cache_que_heads",41,"len")=4
-	Set gtmtypes("cache_que_heads",41,"type")="int"
-	Set gtmtypfldindx("cache_que_heads","cache_array[0].epid")=41
-	Set gtmtypes("cache_que_heads",42,"name")="cache_que_heads.cache_array[0].cycle"
+	Set gtmtypes("cache_que_heads",41,"type")="unsigned-int"
+	Set gtmtypfldindx("cache_que_heads","cache_array[0].data_invalid")=41
+	Set gtmtypes("cache_que_heads",42,"name")="cache_que_heads.cache_array[0].epid"
 	Set gtmtypes("cache_que_heads",42,"off")=120
 	Set gtmtypes("cache_que_heads",42,"len")=4
 	Set gtmtypes("cache_que_heads",42,"type")="int"
-	Set gtmtypfldindx("cache_que_heads","cache_array[0].cycle")=42
-	Set gtmtypes("cache_que_heads",43,"name")="cache_que_heads.cache_array[0].r_epid"
+	Set gtmtypfldindx("cache_que_heads","cache_array[0].epid")=42
+	Set gtmtypes("cache_que_heads",43,"name")="cache_que_heads.cache_array[0].cycle"
 	Set gtmtypes("cache_que_heads",43,"off")=124
 	Set gtmtypes("cache_que_heads",43,"len")=4
 	Set gtmtypes("cache_que_heads",43,"type")="int"
-	Set gtmtypfldindx("cache_que_heads","cache_array[0].r_epid")=43
-	Set gtmtypes("cache_que_heads",44,"name")="cache_que_heads.cache_array[0].read_in_progress"
+	Set gtmtypfldindx("cache_que_heads","cache_array[0].cycle")=43
+	Set gtmtypes("cache_que_heads",44,"name")="cache_que_heads.cache_array[0].r_epid"
 	Set gtmtypes("cache_que_heads",44,"off")=128
 	Set gtmtypes("cache_que_heads",44,"len")=4
 	Set gtmtypes("cache_que_heads",44,"type")="int"
-	Set gtmtypfldindx("cache_que_heads","cache_array[0].read_in_progress")=44
-	Set gtmtypes("cache_que_heads",45,"name")="cache_que_heads.cache_array[0].in_tend"
+	Set gtmtypfldindx("cache_que_heads","cache_array[0].r_epid")=44
+	Set gtmtypes("cache_que_heads",45,"name")="cache_que_heads.cache_array[0].aiocb"
 	Set gtmtypes("cache_que_heads",45,"off")=132
-	Set gtmtypes("cache_que_heads",45,"len")=4
-	Set gtmtypes("cache_que_heads",45,"type")="unsigned-int"
-	Set gtmtypfldindx("cache_que_heads","cache_array[0].in_tend")=45
-	Set gtmtypes("cache_que_heads",46,"name")="cache_que_heads.cache_array[0].in_cw_set"
-	Set gtmtypes("cache_que_heads",46,"off")=136
+	Set gtmtypes("cache_que_heads",45,"len")=144
+	Set gtmtypes("cache_que_heads",45,"type")="struct"
+	Set gtmtypfldindx("cache_que_heads","cache_array[0].aiocb")=45
+	Set gtmtypes("cache_que_heads",46,"name")="cache_que_heads.cache_array[0].read_in_progress"
+	Set gtmtypes("cache_que_heads",46,"off")=276
 	Set gtmtypes("cache_que_heads",46,"len")=4
-	Set gtmtypes("cache_que_heads",46,"type")="unsigned-int"
-	Set gtmtypfldindx("cache_que_heads","cache_array[0].in_cw_set")=46
-	Set gtmtypes("cache_que_heads",47,"name")="cache_que_heads.cache_array[0].data_invalid"
-	Set gtmtypes("cache_que_heads",47,"off")=140
+	Set gtmtypes("cache_que_heads",46,"type")="int"
+	Set gtmtypfldindx("cache_que_heads","cache_array[0].read_in_progress")=46
+	Set gtmtypes("cache_que_heads",47,"name")="cache_que_heads.cache_array[0].in_tend"
+	Set gtmtypes("cache_que_heads",47,"off")=280
 	Set gtmtypes("cache_que_heads",47,"len")=4
 	Set gtmtypes("cache_que_heads",47,"type")="unsigned-int"
-	Set gtmtypfldindx("cache_que_heads","cache_array[0].data_invalid")=47
-	Set gtmtypes("cache_que_heads",48,"name")="cache_que_heads.cache_array[0].stopped"
-	Set gtmtypes("cache_que_heads",48,"off")=144
+	Set gtmtypfldindx("cache_que_heads","cache_array[0].in_tend")=47
+	Set gtmtypes("cache_que_heads",48,"name")="cache_que_heads.cache_array[0].in_cw_set"
+	Set gtmtypes("cache_que_heads",48,"off")=284
 	Set gtmtypes("cache_que_heads",48,"len")=4
-	Set gtmtypes("cache_que_heads",48,"type")="boolean_t"
-	Set gtmtypfldindx("cache_que_heads","cache_array[0].stopped")=48
-	Set gtmtypes("cache_que_heads",49,"name")="cache_que_heads.cache_array[0].wip_stopped"
-	Set gtmtypes("cache_que_heads",49,"off")=148
-	Set gtmtypes("cache_que_heads",49,"len")=4
-	Set gtmtypes("cache_que_heads",49,"type")="boolean_t"
-	Set gtmtypfldindx("cache_que_heads","cache_array[0].wip_stopped")=49
+	Set gtmtypes("cache_que_heads",48,"type")="unsigned-int"
+	Set gtmtypfldindx("cache_que_heads","cache_array[0].in_cw_set")=48
+	Set gtmtypes("cache_que_heads",49,"name")="cache_que_heads.cache_array[0].wip_is_encr_buf"
+	Set gtmtypes("cache_que_heads",49,"off")=288
+	Set gtmtypes("cache_que_heads",49,"len")=1
+	Set gtmtypes("cache_que_heads",49,"type")="char"
+	Set gtmtypfldindx("cache_que_heads","cache_array[0].wip_is_encr_buf")=49
+	Set gtmtypes("cache_que_heads",50,"name")="cache_que_heads.cache_array[0].backup_cr_is_twin"
+	Set gtmtypes("cache_que_heads",50,"off")=289
+	Set gtmtypes("cache_que_heads",50,"len")=1
+	Set gtmtypes("cache_que_heads",50,"type")="char"
+	Set gtmtypfldindx("cache_que_heads","cache_array[0].backup_cr_is_twin")=50
+	Set gtmtypes("cache_que_heads",51,"name")="cache_que_heads.cache_array[0].aio_issued"
+	Set gtmtypes("cache_que_heads",51,"off")=290
+	Set gtmtypes("cache_que_heads",51,"len")=1
+	Set gtmtypes("cache_que_heads",51,"type")="char"
+	Set gtmtypfldindx("cache_que_heads","cache_array[0].aio_issued")=51
+	Set gtmtypes("cache_que_heads",52,"name")="cache_que_heads.cache_array[0].filler4bytealign"
+	Set gtmtypes("cache_que_heads",52,"off")=291
+	Set gtmtypes("cache_que_heads",52,"len")=1
+	Set gtmtypes("cache_que_heads",52,"type")="char"
+	Set gtmtypfldindx("cache_que_heads","cache_array[0].filler4bytealign")=52
 	;
 	Set gtmtypes("cache_rec")="struct"
-	Set gtmtypes("cache_rec",0)=35
-	Set gtmtypes("cache_rec","len")=120
+	Set gtmtypes("cache_rec",0)=38
+	Set gtmtypes("cache_rec","len")=260
 	Set gtmtypes("cache_rec",1,"name")="cache_rec.blkque"
 	Set gtmtypes("cache_rec",1,"off")=0
 	Set gtmtypes("cache_rec",1,"len")=8
@@ -1169,90 +1189,105 @@ Init
 	Set gtmtypes("cache_rec",19,"len")=4
 	Set gtmtypes("cache_rec",19,"type")="unsigned-int"
 	Set gtmtypfldindx("cache_rec","jnl_addr")=19
-	Set gtmtypes("cache_rec",20,"name")="cache_rec.rip_latch"
+	Set gtmtypes("cache_rec",20,"name")="cache_rec.stopped"
 	Set gtmtypes("cache_rec",20,"off")=72
-	Set gtmtypes("cache_rec",20,"len")=8
-	Set gtmtypes("cache_rec",20,"type")="global_latch_t"
-	Set gtmtypfldindx("cache_rec","rip_latch")=20
-	Set gtmtypes("cache_rec",21,"name")="cache_rec.rip_latch.u"
-	Set gtmtypes("cache_rec",21,"off")=72
+	Set gtmtypes("cache_rec",20,"len")=4
+	Set gtmtypes("cache_rec",20,"type")="unsigned-int"
+	Set gtmtypfldindx("cache_rec","stopped")=20
+	Set gtmtypes("cache_rec",21,"name")="cache_rec.rip_latch"
+	Set gtmtypes("cache_rec",21,"off")=76
 	Set gtmtypes("cache_rec",21,"len")=8
-	Set gtmtypes("cache_rec",21,"type")="union"
-	Set gtmtypfldindx("cache_rec","rip_latch.u")=21
-	Set gtmtypes("cache_rec",22,"name")="cache_rec.rip_latch.u.pid_imgcnt"
-	Set gtmtypes("cache_rec",22,"off")=72
+	Set gtmtypes("cache_rec",21,"type")="global_latch_t"
+	Set gtmtypfldindx("cache_rec","rip_latch")=21
+	Set gtmtypes("cache_rec",22,"name")="cache_rec.rip_latch.u"
+	Set gtmtypes("cache_rec",22,"off")=76
 	Set gtmtypes("cache_rec",22,"len")=8
-	Set gtmtypes("cache_rec",22,"type")="uint64_t"
-	Set gtmtypfldindx("cache_rec","rip_latch.u.pid_imgcnt")=22
-	Set gtmtypes("cache_rec",23,"name")="cache_rec.rip_latch.u.parts"
-	Set gtmtypes("cache_rec",23,"off")=72
+	Set gtmtypes("cache_rec",22,"type")="union"
+	Set gtmtypfldindx("cache_rec","rip_latch.u")=22
+	Set gtmtypes("cache_rec",23,"name")="cache_rec.rip_latch.u.pid_imgcnt"
+	Set gtmtypes("cache_rec",23,"off")=76
 	Set gtmtypes("cache_rec",23,"len")=8
-	Set gtmtypes("cache_rec",23,"type")="struct"
-	Set gtmtypfldindx("cache_rec","rip_latch.u.parts")=23
-	Set gtmtypes("cache_rec",24,"name")="cache_rec.rip_latch.u.parts.latch_pid"
-	Set gtmtypes("cache_rec",24,"off")=72
-	Set gtmtypes("cache_rec",24,"len")=4
-	Set gtmtypes("cache_rec",24,"type")="int"
-	Set gtmtypfldindx("cache_rec","rip_latch.u.parts.latch_pid")=24
-	Set gtmtypes("cache_rec",25,"name")="cache_rec.rip_latch.u.parts.latch_word"
+	Set gtmtypes("cache_rec",23,"type")="uint64_t"
+	Set gtmtypfldindx("cache_rec","rip_latch.u.pid_imgcnt")=23
+	Set gtmtypes("cache_rec",24,"name")="cache_rec.rip_latch.u.parts"
+	Set gtmtypes("cache_rec",24,"off")=76
+	Set gtmtypes("cache_rec",24,"len")=8
+	Set gtmtypes("cache_rec",24,"type")="struct"
+	Set gtmtypfldindx("cache_rec","rip_latch.u.parts")=24
+	Set gtmtypes("cache_rec",25,"name")="cache_rec.rip_latch.u.parts.latch_pid"
 	Set gtmtypes("cache_rec",25,"off")=76
 	Set gtmtypes("cache_rec",25,"len")=4
 	Set gtmtypes("cache_rec",25,"type")="int"
-	Set gtmtypfldindx("cache_rec","rip_latch.u.parts.latch_word")=25
-	Set gtmtypes("cache_rec",26,"name")="cache_rec.image_count"
+	Set gtmtypfldindx("cache_rec","rip_latch.u.parts.latch_pid")=25
+	Set gtmtypes("cache_rec",26,"name")="cache_rec.rip_latch.u.parts.latch_word"
 	Set gtmtypes("cache_rec",26,"off")=80
 	Set gtmtypes("cache_rec",26,"len")=4
 	Set gtmtypes("cache_rec",26,"type")="int"
-	Set gtmtypfldindx("cache_rec","image_count")=26
-	Set gtmtypes("cache_rec",27,"name")="cache_rec.epid"
+	Set gtmtypfldindx("cache_rec","rip_latch.u.parts.latch_word")=26
+	Set gtmtypes("cache_rec",27,"name")="cache_rec.data_invalid"
 	Set gtmtypes("cache_rec",27,"off")=84
 	Set gtmtypes("cache_rec",27,"len")=4
-	Set gtmtypes("cache_rec",27,"type")="int"
-	Set gtmtypfldindx("cache_rec","epid")=27
-	Set gtmtypes("cache_rec",28,"name")="cache_rec.cycle"
+	Set gtmtypes("cache_rec",27,"type")="unsigned-int"
+	Set gtmtypfldindx("cache_rec","data_invalid")=27
+	Set gtmtypes("cache_rec",28,"name")="cache_rec.epid"
 	Set gtmtypes("cache_rec",28,"off")=88
 	Set gtmtypes("cache_rec",28,"len")=4
 	Set gtmtypes("cache_rec",28,"type")="int"
-	Set gtmtypfldindx("cache_rec","cycle")=28
-	Set gtmtypes("cache_rec",29,"name")="cache_rec.r_epid"
+	Set gtmtypfldindx("cache_rec","epid")=28
+	Set gtmtypes("cache_rec",29,"name")="cache_rec.cycle"
 	Set gtmtypes("cache_rec",29,"off")=92
 	Set gtmtypes("cache_rec",29,"len")=4
 	Set gtmtypes("cache_rec",29,"type")="int"
-	Set gtmtypfldindx("cache_rec","r_epid")=29
-	Set gtmtypes("cache_rec",30,"name")="cache_rec.read_in_progress"
+	Set gtmtypfldindx("cache_rec","cycle")=29
+	Set gtmtypes("cache_rec",30,"name")="cache_rec.r_epid"
 	Set gtmtypes("cache_rec",30,"off")=96
 	Set gtmtypes("cache_rec",30,"len")=4
 	Set gtmtypes("cache_rec",30,"type")="int"
-	Set gtmtypfldindx("cache_rec","read_in_progress")=30
-	Set gtmtypes("cache_rec",31,"name")="cache_rec.in_tend"
+	Set gtmtypfldindx("cache_rec","r_epid")=30
+	Set gtmtypes("cache_rec",31,"name")="cache_rec.aiocb"
 	Set gtmtypes("cache_rec",31,"off")=100
-	Set gtmtypes("cache_rec",31,"len")=4
-	Set gtmtypes("cache_rec",31,"type")="unsigned-int"
-	Set gtmtypfldindx("cache_rec","in_tend")=31
-	Set gtmtypes("cache_rec",32,"name")="cache_rec.in_cw_set"
-	Set gtmtypes("cache_rec",32,"off")=104
+	Set gtmtypes("cache_rec",31,"len")=144
+	Set gtmtypes("cache_rec",31,"type")="struct"
+	Set gtmtypfldindx("cache_rec","aiocb")=31
+	Set gtmtypes("cache_rec",32,"name")="cache_rec.read_in_progress"
+	Set gtmtypes("cache_rec",32,"off")=244
 	Set gtmtypes("cache_rec",32,"len")=4
-	Set gtmtypes("cache_rec",32,"type")="unsigned-int"
-	Set gtmtypfldindx("cache_rec","in_cw_set")=32
-	Set gtmtypes("cache_rec",33,"name")="cache_rec.data_invalid"
-	Set gtmtypes("cache_rec",33,"off")=108
+	Set gtmtypes("cache_rec",32,"type")="int"
+	Set gtmtypfldindx("cache_rec","read_in_progress")=32
+	Set gtmtypes("cache_rec",33,"name")="cache_rec.in_tend"
+	Set gtmtypes("cache_rec",33,"off")=248
 	Set gtmtypes("cache_rec",33,"len")=4
 	Set gtmtypes("cache_rec",33,"type")="unsigned-int"
-	Set gtmtypfldindx("cache_rec","data_invalid")=33
-	Set gtmtypes("cache_rec",34,"name")="cache_rec.stopped"
-	Set gtmtypes("cache_rec",34,"off")=112
+	Set gtmtypfldindx("cache_rec","in_tend")=33
+	Set gtmtypes("cache_rec",34,"name")="cache_rec.in_cw_set"
+	Set gtmtypes("cache_rec",34,"off")=252
 	Set gtmtypes("cache_rec",34,"len")=4
-	Set gtmtypes("cache_rec",34,"type")="boolean_t"
-	Set gtmtypfldindx("cache_rec","stopped")=34
-	Set gtmtypes("cache_rec",35,"name")="cache_rec.wip_stopped"
-	Set gtmtypes("cache_rec",35,"off")=116
-	Set gtmtypes("cache_rec",35,"len")=4
-	Set gtmtypes("cache_rec",35,"type")="boolean_t"
-	Set gtmtypfldindx("cache_rec","wip_stopped")=35
+	Set gtmtypes("cache_rec",34,"type")="unsigned-int"
+	Set gtmtypfldindx("cache_rec","in_cw_set")=34
+	Set gtmtypes("cache_rec",35,"name")="cache_rec.wip_is_encr_buf"
+	Set gtmtypes("cache_rec",35,"off")=256
+	Set gtmtypes("cache_rec",35,"len")=1
+	Set gtmtypes("cache_rec",35,"type")="char"
+	Set gtmtypfldindx("cache_rec","wip_is_encr_buf")=35
+	Set gtmtypes("cache_rec",36,"name")="cache_rec.backup_cr_is_twin"
+	Set gtmtypes("cache_rec",36,"off")=257
+	Set gtmtypes("cache_rec",36,"len")=1
+	Set gtmtypes("cache_rec",36,"type")="char"
+	Set gtmtypfldindx("cache_rec","backup_cr_is_twin")=36
+	Set gtmtypes("cache_rec",37,"name")="cache_rec.aio_issued"
+	Set gtmtypes("cache_rec",37,"off")=258
+	Set gtmtypes("cache_rec",37,"len")=1
+	Set gtmtypes("cache_rec",37,"type")="char"
+	Set gtmtypfldindx("cache_rec","aio_issued")=37
+	Set gtmtypes("cache_rec",38,"name")="cache_rec.filler4bytealign"
+	Set gtmtypes("cache_rec",38,"off")=259
+	Set gtmtypes("cache_rec",38,"len")=1
+	Set gtmtypes("cache_rec",38,"type")="char"
+	Set gtmtypfldindx("cache_rec","filler4bytealign")=38
 	;
 	Set gtmtypes("cache_state_rec")="struct"
-	Set gtmtypes("cache_state_rec",0)=32
-	Set gtmtypes("cache_state_rec","len")=112
+	Set gtmtypes("cache_state_rec",0)=35
+	Set gtmtypes("cache_state_rec","len")=252
 	Set gtmtypes("cache_state_rec",1,"name")="cache_state_rec.state_que"
 	Set gtmtypes("cache_state_rec",1,"off")=0
 	Set gtmtypes("cache_state_rec",1,"len")=8
@@ -1333,86 +1368,101 @@ Init
 	Set gtmtypes("cache_state_rec",16,"len")=4
 	Set gtmtypes("cache_state_rec",16,"type")="unsigned-int"
 	Set gtmtypfldindx("cache_state_rec","jnl_addr")=16
-	Set gtmtypes("cache_state_rec",17,"name")="cache_state_rec.rip_latch"
+	Set gtmtypes("cache_state_rec",17,"name")="cache_state_rec.stopped"
 	Set gtmtypes("cache_state_rec",17,"off")=64
-	Set gtmtypes("cache_state_rec",17,"len")=8
-	Set gtmtypes("cache_state_rec",17,"type")="global_latch_t"
-	Set gtmtypfldindx("cache_state_rec","rip_latch")=17
-	Set gtmtypes("cache_state_rec",18,"name")="cache_state_rec.rip_latch.u"
-	Set gtmtypes("cache_state_rec",18,"off")=64
+	Set gtmtypes("cache_state_rec",17,"len")=4
+	Set gtmtypes("cache_state_rec",17,"type")="boolean_t"
+	Set gtmtypfldindx("cache_state_rec","stopped")=17
+	Set gtmtypes("cache_state_rec",18,"name")="cache_state_rec.rip_latch"
+	Set gtmtypes("cache_state_rec",18,"off")=68
 	Set gtmtypes("cache_state_rec",18,"len")=8
-	Set gtmtypes("cache_state_rec",18,"type")="union"
-	Set gtmtypfldindx("cache_state_rec","rip_latch.u")=18
-	Set gtmtypes("cache_state_rec",19,"name")="cache_state_rec.rip_latch.u.pid_imgcnt"
-	Set gtmtypes("cache_state_rec",19,"off")=64
+	Set gtmtypes("cache_state_rec",18,"type")="global_latch_t"
+	Set gtmtypfldindx("cache_state_rec","rip_latch")=18
+	Set gtmtypes("cache_state_rec",19,"name")="cache_state_rec.rip_latch.u"
+	Set gtmtypes("cache_state_rec",19,"off")=68
 	Set gtmtypes("cache_state_rec",19,"len")=8
-	Set gtmtypes("cache_state_rec",19,"type")="uint64_t"
-	Set gtmtypfldindx("cache_state_rec","rip_latch.u.pid_imgcnt")=19
-	Set gtmtypes("cache_state_rec",20,"name")="cache_state_rec.rip_latch.u.parts"
-	Set gtmtypes("cache_state_rec",20,"off")=64
+	Set gtmtypes("cache_state_rec",19,"type")="union"
+	Set gtmtypfldindx("cache_state_rec","rip_latch.u")=19
+	Set gtmtypes("cache_state_rec",20,"name")="cache_state_rec.rip_latch.u.pid_imgcnt"
+	Set gtmtypes("cache_state_rec",20,"off")=68
 	Set gtmtypes("cache_state_rec",20,"len")=8
-	Set gtmtypes("cache_state_rec",20,"type")="struct"
-	Set gtmtypfldindx("cache_state_rec","rip_latch.u.parts")=20
-	Set gtmtypes("cache_state_rec",21,"name")="cache_state_rec.rip_latch.u.parts.latch_pid"
-	Set gtmtypes("cache_state_rec",21,"off")=64
-	Set gtmtypes("cache_state_rec",21,"len")=4
-	Set gtmtypes("cache_state_rec",21,"type")="int"
-	Set gtmtypfldindx("cache_state_rec","rip_latch.u.parts.latch_pid")=21
-	Set gtmtypes("cache_state_rec",22,"name")="cache_state_rec.rip_latch.u.parts.latch_word"
+	Set gtmtypes("cache_state_rec",20,"type")="uint64_t"
+	Set gtmtypfldindx("cache_state_rec","rip_latch.u.pid_imgcnt")=20
+	Set gtmtypes("cache_state_rec",21,"name")="cache_state_rec.rip_latch.u.parts"
+	Set gtmtypes("cache_state_rec",21,"off")=68
+	Set gtmtypes("cache_state_rec",21,"len")=8
+	Set gtmtypes("cache_state_rec",21,"type")="struct"
+	Set gtmtypfldindx("cache_state_rec","rip_latch.u.parts")=21
+	Set gtmtypes("cache_state_rec",22,"name")="cache_state_rec.rip_latch.u.parts.latch_pid"
 	Set gtmtypes("cache_state_rec",22,"off")=68
 	Set gtmtypes("cache_state_rec",22,"len")=4
 	Set gtmtypes("cache_state_rec",22,"type")="int"
-	Set gtmtypfldindx("cache_state_rec","rip_latch.u.parts.latch_word")=22
-	Set gtmtypes("cache_state_rec",23,"name")="cache_state_rec.image_count"
+	Set gtmtypfldindx("cache_state_rec","rip_latch.u.parts.latch_pid")=22
+	Set gtmtypes("cache_state_rec",23,"name")="cache_state_rec.rip_latch.u.parts.latch_word"
 	Set gtmtypes("cache_state_rec",23,"off")=72
 	Set gtmtypes("cache_state_rec",23,"len")=4
 	Set gtmtypes("cache_state_rec",23,"type")="int"
-	Set gtmtypfldindx("cache_state_rec","image_count")=23
-	Set gtmtypes("cache_state_rec",24,"name")="cache_state_rec.epid"
+	Set gtmtypfldindx("cache_state_rec","rip_latch.u.parts.latch_word")=23
+	Set gtmtypes("cache_state_rec",24,"name")="cache_state_rec.data_invalid"
 	Set gtmtypes("cache_state_rec",24,"off")=76
 	Set gtmtypes("cache_state_rec",24,"len")=4
-	Set gtmtypes("cache_state_rec",24,"type")="int"
-	Set gtmtypfldindx("cache_state_rec","epid")=24
-	Set gtmtypes("cache_state_rec",25,"name")="cache_state_rec.cycle"
+	Set gtmtypes("cache_state_rec",24,"type")="unsigned-int"
+	Set gtmtypfldindx("cache_state_rec","data_invalid")=24
+	Set gtmtypes("cache_state_rec",25,"name")="cache_state_rec.epid"
 	Set gtmtypes("cache_state_rec",25,"off")=80
 	Set gtmtypes("cache_state_rec",25,"len")=4
 	Set gtmtypes("cache_state_rec",25,"type")="int"
-	Set gtmtypfldindx("cache_state_rec","cycle")=25
-	Set gtmtypes("cache_state_rec",26,"name")="cache_state_rec.r_epid"
+	Set gtmtypfldindx("cache_state_rec","epid")=25
+	Set gtmtypes("cache_state_rec",26,"name")="cache_state_rec.cycle"
 	Set gtmtypes("cache_state_rec",26,"off")=84
 	Set gtmtypes("cache_state_rec",26,"len")=4
 	Set gtmtypes("cache_state_rec",26,"type")="int"
-	Set gtmtypfldindx("cache_state_rec","r_epid")=26
-	Set gtmtypes("cache_state_rec",27,"name")="cache_state_rec.read_in_progress"
+	Set gtmtypfldindx("cache_state_rec","cycle")=26
+	Set gtmtypes("cache_state_rec",27,"name")="cache_state_rec.r_epid"
 	Set gtmtypes("cache_state_rec",27,"off")=88
 	Set gtmtypes("cache_state_rec",27,"len")=4
 	Set gtmtypes("cache_state_rec",27,"type")="int"
-	Set gtmtypfldindx("cache_state_rec","read_in_progress")=27
-	Set gtmtypes("cache_state_rec",28,"name")="cache_state_rec.in_tend"
+	Set gtmtypfldindx("cache_state_rec","r_epid")=27
+	Set gtmtypes("cache_state_rec",28,"name")="cache_state_rec.aiocb"
 	Set gtmtypes("cache_state_rec",28,"off")=92
-	Set gtmtypes("cache_state_rec",28,"len")=4
-	Set gtmtypes("cache_state_rec",28,"type")="unsigned-int"
-	Set gtmtypfldindx("cache_state_rec","in_tend")=28
-	Set gtmtypes("cache_state_rec",29,"name")="cache_state_rec.in_cw_set"
-	Set gtmtypes("cache_state_rec",29,"off")=96
+	Set gtmtypes("cache_state_rec",28,"len")=144
+	Set gtmtypes("cache_state_rec",28,"type")="struct"
+	Set gtmtypfldindx("cache_state_rec","aiocb")=28
+	Set gtmtypes("cache_state_rec",29,"name")="cache_state_rec.read_in_progress"
+	Set gtmtypes("cache_state_rec",29,"off")=236
 	Set gtmtypes("cache_state_rec",29,"len")=4
-	Set gtmtypes("cache_state_rec",29,"type")="unsigned-int"
-	Set gtmtypfldindx("cache_state_rec","in_cw_set")=29
-	Set gtmtypes("cache_state_rec",30,"name")="cache_state_rec.data_invalid"
-	Set gtmtypes("cache_state_rec",30,"off")=100
+	Set gtmtypes("cache_state_rec",29,"type")="int"
+	Set gtmtypfldindx("cache_state_rec","read_in_progress")=29
+	Set gtmtypes("cache_state_rec",30,"name")="cache_state_rec.in_tend"
+	Set gtmtypes("cache_state_rec",30,"off")=240
 	Set gtmtypes("cache_state_rec",30,"len")=4
 	Set gtmtypes("cache_state_rec",30,"type")="unsigned-int"
-	Set gtmtypfldindx("cache_state_rec","data_invalid")=30
-	Set gtmtypes("cache_state_rec",31,"name")="cache_state_rec.stopped"
-	Set gtmtypes("cache_state_rec",31,"off")=104
+	Set gtmtypfldindx("cache_state_rec","in_tend")=30
+	Set gtmtypes("cache_state_rec",31,"name")="cache_state_rec.in_cw_set"
+	Set gtmtypes("cache_state_rec",31,"off")=244
 	Set gtmtypes("cache_state_rec",31,"len")=4
-	Set gtmtypes("cache_state_rec",31,"type")="boolean_t"
-	Set gtmtypfldindx("cache_state_rec","stopped")=31
-	Set gtmtypes("cache_state_rec",32,"name")="cache_state_rec.wip_stopped"
-	Set gtmtypes("cache_state_rec",32,"off")=108
-	Set gtmtypes("cache_state_rec",32,"len")=4
-	Set gtmtypes("cache_state_rec",32,"type")="boolean_t"
-	Set gtmtypfldindx("cache_state_rec","wip_stopped")=32
+	Set gtmtypes("cache_state_rec",31,"type")="unsigned-int"
+	Set gtmtypfldindx("cache_state_rec","in_cw_set")=31
+	Set gtmtypes("cache_state_rec",32,"name")="cache_state_rec.wip_is_encr_buf"
+	Set gtmtypes("cache_state_rec",32,"off")=248
+	Set gtmtypes("cache_state_rec",32,"len")=1
+	Set gtmtypes("cache_state_rec",32,"type")="char"
+	Set gtmtypfldindx("cache_state_rec","wip_is_encr_buf")=32
+	Set gtmtypes("cache_state_rec",33,"name")="cache_state_rec.backup_cr_is_twin"
+	Set gtmtypes("cache_state_rec",33,"off")=249
+	Set gtmtypes("cache_state_rec",33,"len")=1
+	Set gtmtypes("cache_state_rec",33,"type")="char"
+	Set gtmtypfldindx("cache_state_rec","backup_cr_is_twin")=33
+	Set gtmtypes("cache_state_rec",34,"name")="cache_state_rec.aio_issued"
+	Set gtmtypes("cache_state_rec",34,"off")=250
+	Set gtmtypes("cache_state_rec",34,"len")=1
+	Set gtmtypes("cache_state_rec",34,"type")="char"
+	Set gtmtypfldindx("cache_state_rec","aio_issued")=34
+	Set gtmtypes("cache_state_rec",35,"name")="cache_state_rec.filler4bytealign"
+	Set gtmtypes("cache_state_rec",35,"off")=251
+	Set gtmtypes("cache_state_rec",35,"len")=1
+	Set gtmtypes("cache_state_rec",35,"type")="char"
+	Set gtmtypfldindx("cache_state_rec","filler4bytealign")=35
 	;
 	Set gtmtypes("callin_entry_list")="struct"
 	Set gtmtypes("callin_entry_list",0)=14
@@ -2707,8 +2757,8 @@ Init
 	Set gtmtypfldindx("d_mt_struct","stream")=32
 	;
 	Set gtmtypes("d_rm_struct")="struct"
-	Set gtmtypes("d_rm_struct",0)=88
-	Set gtmtypes("d_rm_struct","len")=856
+	Set gtmtypes("d_rm_struct",0)=90
+	Set gtmtypes("d_rm_struct","len")=356
 	Set gtmtypes("d_rm_struct",1,"name")="d_rm_struct.fixed"
 	Set gtmtypes("d_rm_struct",1,"off")=0
 	Set gtmtypes("d_rm_struct",1,"len")=4
@@ -3015,145 +3065,155 @@ Init
 	Set gtmtypes("d_rm_struct",61,"len")=4
 	Set gtmtypes("d_rm_struct",61,"type")="long"
 	Set gtmtypfldindx("d_rm_struct","pipe_buff_size")=61
-	Set gtmtypes("d_rm_struct",62,"name")="d_rm_struct.utf_tmp_buffer"
+	Set gtmtypes("d_rm_struct",62,"name")="d_rm_struct.tmp_buffer"
 	Set gtmtypes("d_rm_struct",62,"off")=256
-	Set gtmtypes("d_rm_struct",62,"len")=512
-	Set gtmtypes("d_rm_struct",62,"type")="char"
-	Set gtmtypfldindx("d_rm_struct","utf_tmp_buffer")=62
-	Set gtmtypes("d_rm_struct",63,"name")="d_rm_struct.utf_tot_bytes_in_buffer"
-	Set gtmtypes("d_rm_struct",63,"off")=768
+	Set gtmtypes("d_rm_struct",62,"len")=4
+	Set gtmtypes("d_rm_struct",62,"type")="addr"
+	Set gtmtypfldindx("d_rm_struct","tmp_buffer")=62
+	Set gtmtypes("d_rm_struct",63,"name")="d_rm_struct.tot_bytes_in_buffer"
+	Set gtmtypes("d_rm_struct",63,"off")=260
 	Set gtmtypes("d_rm_struct",63,"len")=4
 	Set gtmtypes("d_rm_struct",63,"type")="int"
-	Set gtmtypfldindx("d_rm_struct","utf_tot_bytes_in_buffer")=63
-	Set gtmtypes("d_rm_struct",64,"name")="d_rm_struct.utf_start_pos"
-	Set gtmtypes("d_rm_struct",64,"off")=772
+	Set gtmtypfldindx("d_rm_struct","tot_bytes_in_buffer")=63
+	Set gtmtypes("d_rm_struct",64,"name")="d_rm_struct.start_pos"
+	Set gtmtypes("d_rm_struct",64,"off")=264
 	Set gtmtypes("d_rm_struct",64,"len")=4
 	Set gtmtypes("d_rm_struct",64,"type")="int"
-	Set gtmtypfldindx("d_rm_struct","utf_start_pos")=64
+	Set gtmtypfldindx("d_rm_struct","start_pos")=64
 	Set gtmtypes("d_rm_struct",65,"name")="d_rm_struct.write_occurred"
-	Set gtmtypes("d_rm_struct",65,"off")=776
+	Set gtmtypes("d_rm_struct",65,"off")=268
 	Set gtmtypes("d_rm_struct",65,"len")=4
 	Set gtmtypes("d_rm_struct",65,"type")="boolean_t"
 	Set gtmtypfldindx("d_rm_struct","write_occurred")=65
 	Set gtmtypes("d_rm_struct",66,"name")="d_rm_struct.read_occurred"
-	Set gtmtypes("d_rm_struct",66,"off")=780
+	Set gtmtypes("d_rm_struct",66,"off")=272
 	Set gtmtypes("d_rm_struct",66,"len")=4
 	Set gtmtypes("d_rm_struct",66,"type")="boolean_t"
 	Set gtmtypfldindx("d_rm_struct","read_occurred")=66
 	Set gtmtypes("d_rm_struct",67,"name")="d_rm_struct.input_encrypted"
-	Set gtmtypes("d_rm_struct",67,"off")=784
+	Set gtmtypes("d_rm_struct",67,"off")=276
 	Set gtmtypes("d_rm_struct",67,"len")=4
 	Set gtmtypes("d_rm_struct",67,"type")="boolean_t"
 	Set gtmtypfldindx("d_rm_struct","input_encrypted")=67
 	Set gtmtypes("d_rm_struct",68,"name")="d_rm_struct.output_encrypted"
-	Set gtmtypes("d_rm_struct",68,"off")=788
+	Set gtmtypes("d_rm_struct",68,"off")=280
 	Set gtmtypes("d_rm_struct",68,"len")=4
 	Set gtmtypes("d_rm_struct",68,"type")="boolean_t"
 	Set gtmtypfldindx("d_rm_struct","output_encrypted")=68
 	Set gtmtypes("d_rm_struct",69,"name")="d_rm_struct.input_iv"
-	Set gtmtypes("d_rm_struct",69,"off")=792
+	Set gtmtypes("d_rm_struct",69,"off")=284
 	Set gtmtypes("d_rm_struct",69,"len")=12
 	Set gtmtypes("d_rm_struct",69,"type")="mstr"
 	Set gtmtypfldindx("d_rm_struct","input_iv")=69
 	Set gtmtypes("d_rm_struct",70,"name")="d_rm_struct.input_iv.char_len"
-	Set gtmtypes("d_rm_struct",70,"off")=792
+	Set gtmtypes("d_rm_struct",70,"off")=284
 	Set gtmtypes("d_rm_struct",70,"len")=4
 	Set gtmtypes("d_rm_struct",70,"type")="unsigned-int"
 	Set gtmtypfldindx("d_rm_struct","input_iv.char_len")=70
 	Set gtmtypes("d_rm_struct",71,"name")="d_rm_struct.input_iv.len"
-	Set gtmtypes("d_rm_struct",71,"off")=796
+	Set gtmtypes("d_rm_struct",71,"off")=288
 	Set gtmtypes("d_rm_struct",71,"len")=4
 	Set gtmtypes("d_rm_struct",71,"type")="int"
 	Set gtmtypfldindx("d_rm_struct","input_iv.len")=71
 	Set gtmtypes("d_rm_struct",72,"name")="d_rm_struct.input_iv.addr"
-	Set gtmtypes("d_rm_struct",72,"off")=800
+	Set gtmtypes("d_rm_struct",72,"off")=292
 	Set gtmtypes("d_rm_struct",72,"len")=4
 	Set gtmtypes("d_rm_struct",72,"type")="addr"
 	Set gtmtypfldindx("d_rm_struct","input_iv.addr")=72
 	Set gtmtypes("d_rm_struct",73,"name")="d_rm_struct.output_iv"
-	Set gtmtypes("d_rm_struct",73,"off")=804
+	Set gtmtypes("d_rm_struct",73,"off")=296
 	Set gtmtypes("d_rm_struct",73,"len")=12
 	Set gtmtypes("d_rm_struct",73,"type")="mstr"
 	Set gtmtypfldindx("d_rm_struct","output_iv")=73
 	Set gtmtypes("d_rm_struct",74,"name")="d_rm_struct.output_iv.char_len"
-	Set gtmtypes("d_rm_struct",74,"off")=804
+	Set gtmtypes("d_rm_struct",74,"off")=296
 	Set gtmtypes("d_rm_struct",74,"len")=4
 	Set gtmtypes("d_rm_struct",74,"type")="unsigned-int"
 	Set gtmtypfldindx("d_rm_struct","output_iv.char_len")=74
 	Set gtmtypes("d_rm_struct",75,"name")="d_rm_struct.output_iv.len"
-	Set gtmtypes("d_rm_struct",75,"off")=808
+	Set gtmtypes("d_rm_struct",75,"off")=300
 	Set gtmtypes("d_rm_struct",75,"len")=4
 	Set gtmtypes("d_rm_struct",75,"type")="int"
 	Set gtmtypfldindx("d_rm_struct","output_iv.len")=75
 	Set gtmtypes("d_rm_struct",76,"name")="d_rm_struct.output_iv.addr"
-	Set gtmtypes("d_rm_struct",76,"off")=812
+	Set gtmtypes("d_rm_struct",76,"off")=304
 	Set gtmtypes("d_rm_struct",76,"len")=4
 	Set gtmtypes("d_rm_struct",76,"type")="addr"
 	Set gtmtypfldindx("d_rm_struct","output_iv.addr")=76
 	Set gtmtypes("d_rm_struct",77,"name")="d_rm_struct.input_key"
-	Set gtmtypes("d_rm_struct",77,"off")=816
+	Set gtmtypes("d_rm_struct",77,"off")=308
 	Set gtmtypes("d_rm_struct",77,"len")=12
 	Set gtmtypes("d_rm_struct",77,"type")="mstr"
 	Set gtmtypfldindx("d_rm_struct","input_key")=77
 	Set gtmtypes("d_rm_struct",78,"name")="d_rm_struct.input_key.char_len"
-	Set gtmtypes("d_rm_struct",78,"off")=816
+	Set gtmtypes("d_rm_struct",78,"off")=308
 	Set gtmtypes("d_rm_struct",78,"len")=4
 	Set gtmtypes("d_rm_struct",78,"type")="unsigned-int"
 	Set gtmtypfldindx("d_rm_struct","input_key.char_len")=78
 	Set gtmtypes("d_rm_struct",79,"name")="d_rm_struct.input_key.len"
-	Set gtmtypes("d_rm_struct",79,"off")=820
+	Set gtmtypes("d_rm_struct",79,"off")=312
 	Set gtmtypes("d_rm_struct",79,"len")=4
 	Set gtmtypes("d_rm_struct",79,"type")="int"
 	Set gtmtypfldindx("d_rm_struct","input_key.len")=79
 	Set gtmtypes("d_rm_struct",80,"name")="d_rm_struct.input_key.addr"
-	Set gtmtypes("d_rm_struct",80,"off")=824
+	Set gtmtypes("d_rm_struct",80,"off")=316
 	Set gtmtypes("d_rm_struct",80,"len")=4
 	Set gtmtypes("d_rm_struct",80,"type")="addr"
 	Set gtmtypfldindx("d_rm_struct","input_key.addr")=80
 	Set gtmtypes("d_rm_struct",81,"name")="d_rm_struct.output_key"
-	Set gtmtypes("d_rm_struct",81,"off")=828
+	Set gtmtypes("d_rm_struct",81,"off")=320
 	Set gtmtypes("d_rm_struct",81,"len")=12
 	Set gtmtypes("d_rm_struct",81,"type")="mstr"
 	Set gtmtypfldindx("d_rm_struct","output_key")=81
 	Set gtmtypes("d_rm_struct",82,"name")="d_rm_struct.output_key.char_len"
-	Set gtmtypes("d_rm_struct",82,"off")=828
+	Set gtmtypes("d_rm_struct",82,"off")=320
 	Set gtmtypes("d_rm_struct",82,"len")=4
 	Set gtmtypes("d_rm_struct",82,"type")="unsigned-int"
 	Set gtmtypfldindx("d_rm_struct","output_key.char_len")=82
 	Set gtmtypes("d_rm_struct",83,"name")="d_rm_struct.output_key.len"
-	Set gtmtypes("d_rm_struct",83,"off")=832
+	Set gtmtypes("d_rm_struct",83,"off")=324
 	Set gtmtypes("d_rm_struct",83,"len")=4
 	Set gtmtypes("d_rm_struct",83,"type")="int"
 	Set gtmtypfldindx("d_rm_struct","output_key.len")=83
 	Set gtmtypes("d_rm_struct",84,"name")="d_rm_struct.output_key.addr"
-	Set gtmtypes("d_rm_struct",84,"off")=836
+	Set gtmtypes("d_rm_struct",84,"off")=328
 	Set gtmtypes("d_rm_struct",84,"len")=4
 	Set gtmtypes("d_rm_struct",84,"type")="addr"
 	Set gtmtypfldindx("d_rm_struct","output_key.addr")=84
 	Set gtmtypes("d_rm_struct",85,"name")="d_rm_struct.input_cipher_handle"
-	Set gtmtypes("d_rm_struct",85,"off")=840
+	Set gtmtypes("d_rm_struct",85,"off")=332
 	Set gtmtypes("d_rm_struct",85,"len")=4
 	Set gtmtypes("d_rm_struct",85,"type")="addr"
 	Set gtmtypfldindx("d_rm_struct","input_cipher_handle")=85
 	Set gtmtypes("d_rm_struct",86,"name")="d_rm_struct.output_cipher_handle"
-	Set gtmtypes("d_rm_struct",86,"off")=844
+	Set gtmtypes("d_rm_struct",86,"off")=336
 	Set gtmtypes("d_rm_struct",86,"len")=4
 	Set gtmtypes("d_rm_struct",86,"type")="addr"
 	Set gtmtypfldindx("d_rm_struct","output_cipher_handle")=86
-	Set gtmtypes("d_rm_struct",87,"name")="d_rm_struct.fsblock_buffer_size"
-	Set gtmtypes("d_rm_struct",87,"off")=848
+	Set gtmtypes("d_rm_struct",87,"name")="d_rm_struct.ichset_utf16_variant"
+	Set gtmtypes("d_rm_struct",87,"off")=340
 	Set gtmtypes("d_rm_struct",87,"len")=4
-	Set gtmtypes("d_rm_struct",87,"type")="unsigned-int"
-	Set gtmtypfldindx("d_rm_struct","fsblock_buffer_size")=87
-	Set gtmtypes("d_rm_struct",88,"name")="d_rm_struct.fsblock_buffer"
-	Set gtmtypes("d_rm_struct",88,"off")=852
+	Set gtmtypes("d_rm_struct",87,"type")="int"
+	Set gtmtypfldindx("d_rm_struct","ichset_utf16_variant")=87
+	Set gtmtypes("d_rm_struct",88,"name")="d_rm_struct.ochset_utf16_variant"
+	Set gtmtypes("d_rm_struct",88,"off")=344
 	Set gtmtypes("d_rm_struct",88,"len")=4
-	Set gtmtypes("d_rm_struct",88,"type")="addr"
-	Set gtmtypfldindx("d_rm_struct","fsblock_buffer")=88
+	Set gtmtypes("d_rm_struct",88,"type")="int"
+	Set gtmtypfldindx("d_rm_struct","ochset_utf16_variant")=88
+	Set gtmtypes("d_rm_struct",89,"name")="d_rm_struct.fsblock_buffer_size"
+	Set gtmtypes("d_rm_struct",89,"off")=348
+	Set gtmtypes("d_rm_struct",89,"len")=4
+	Set gtmtypes("d_rm_struct",89,"type")="unsigned-int"
+	Set gtmtypfldindx("d_rm_struct","fsblock_buffer_size")=89
+	Set gtmtypes("d_rm_struct",90,"name")="d_rm_struct.fsblock_buffer"
+	Set gtmtypes("d_rm_struct",90,"off")=352
+	Set gtmtypes("d_rm_struct",90,"len")=4
+	Set gtmtypes("d_rm_struct",90,"type")="addr"
+	Set gtmtypfldindx("d_rm_struct","fsblock_buffer")=90
 	;
 	Set gtmtypes("d_socket_struct")="struct"
-	Set gtmtypes("d_socket_struct",0)=17
-	Set gtmtypes("d_socket_struct","len")=68
+	Set gtmtypes("d_socket_struct",0)=19
+	Set gtmtypes("d_socket_struct","len")=76
 	Set gtmtypes("d_socket_struct",1,"name")="d_socket_struct.sock_save_state"
 	Set gtmtypes("d_socket_struct",1,"off")=0
 	Set gtmtypes("d_socket_struct",1,"len")=36
@@ -3229,16 +3289,26 @@ Init
 	Set gtmtypes("d_socket_struct",15,"len")=4
 	Set gtmtypes("d_socket_struct",15,"type")="boolean_t"
 	Set gtmtypfldindx("d_socket_struct","ochset_specified")=15
-	Set gtmtypes("d_socket_struct",16,"name")="d_socket_struct.iod"
+	Set gtmtypes("d_socket_struct",16,"name")="d_socket_struct.ichset_utf16_variant"
 	Set gtmtypes("d_socket_struct",16,"off")=60
 	Set gtmtypes("d_socket_struct",16,"len")=4
-	Set gtmtypes("d_socket_struct",16,"type")="addr"
-	Set gtmtypfldindx("d_socket_struct","iod")=16
-	Set gtmtypes("d_socket_struct",17,"name")="d_socket_struct.gtm_socket"
+	Set gtmtypes("d_socket_struct",16,"type")="int"
+	Set gtmtypfldindx("d_socket_struct","ichset_utf16_variant")=16
+	Set gtmtypes("d_socket_struct",17,"name")="d_socket_struct.ochset_utf16_variant"
 	Set gtmtypes("d_socket_struct",17,"off")=64
 	Set gtmtypes("d_socket_struct",17,"len")=4
-	Set gtmtypes("d_socket_struct",17,"type")="addr"
-	Set gtmtypfldindx("d_socket_struct","gtm_socket")=17
+	Set gtmtypes("d_socket_struct",17,"type")="int"
+	Set gtmtypfldindx("d_socket_struct","ochset_utf16_variant")=17
+	Set gtmtypes("d_socket_struct",18,"name")="d_socket_struct.iod"
+	Set gtmtypes("d_socket_struct",18,"off")=68
+	Set gtmtypes("d_socket_struct",18,"len")=4
+	Set gtmtypes("d_socket_struct",18,"type")="addr"
+	Set gtmtypfldindx("d_socket_struct","iod")=18
+	Set gtmtypes("d_socket_struct",19,"name")="d_socket_struct.gtm_socket"
+	Set gtmtypes("d_socket_struct",19,"off")=72
+	Set gtmtypes("d_socket_struct",19,"len")=4
+	Set gtmtypes("d_socket_struct",19,"type")="addr"
+	Set gtmtypfldindx("d_socket_struct","gtm_socket")=19
 	;
 	Set gtmtypes("d_tt_struct")="struct"
 	Set gtmtypes("d_tt_struct",0)=48
@@ -3903,6 +3973,25 @@ Init
 	Set gtmtypes("dev_dispatch_struct",16,"type")="addr"
 	Set gtmtypfldindx("dev_dispatch_struct","dlr_zkey")=16
 	;
+	Set gtmtypes("dio_buff_t")="struct"
+	Set gtmtypes("dio_buff_t",0)=3
+	Set gtmtypes("dio_buff_t","len")=12
+	Set gtmtypes("dio_buff_t",1,"name")="dio_buff_t.unaligned_size"
+	Set gtmtypes("dio_buff_t",1,"off")=0
+	Set gtmtypes("dio_buff_t",1,"len")=4
+	Set gtmtypes("dio_buff_t",1,"type")="int"
+	Set gtmtypfldindx("dio_buff_t","unaligned_size")=1
+	Set gtmtypes("dio_buff_t",2,"name")="dio_buff_t.unaligned"
+	Set gtmtypes("dio_buff_t",2,"off")=4
+	Set gtmtypes("dio_buff_t",2,"len")=4
+	Set gtmtypes("dio_buff_t",2,"type")="addr"
+	Set gtmtypfldindx("dio_buff_t","unaligned")=2
+	Set gtmtypes("dio_buff_t",3,"name")="dio_buff_t.aligned"
+	Set gtmtypes("dio_buff_t",3,"off")=8
+	Set gtmtypes("dio_buff_t",3,"len")=4
+	Set gtmtypes("dio_buff_t",3,"type")="addr"
+	Set gtmtypfldindx("dio_buff_t","aligned")=3
+	;
 	Set gtmtypes("dollar_ecode_struct")="struct"
 	Set gtmtypes("dollar_ecode_struct",0)=4
 	Set gtmtypes("dollar_ecode_struct","len")=12
@@ -4291,7 +4380,7 @@ Init
 	Set gtmtypfldindx("fdinfo_t","is_db")=2
 	;
 	Set gtmtypes("file_control")="struct"
-	Set gtmtypes("file_control",0)=6
+	Set gtmtypes("file_control",0)=5
 	Set gtmtypes("file_control","len")=24
 	Set gtmtypes("file_control",1,"name")="file_control.op_buff"
 	Set gtmtypes("file_control",1,"off")=0
@@ -4313,16 +4402,11 @@ Init
 	Set gtmtypes("file_control",4,"len")=4
 	Set gtmtypes("file_control",4,"type")="addr"
 	Set gtmtypfldindx("file_control","file_info")=4
-	Set gtmtypes("file_control",5,"name")="file_control.file_type"
+	Set gtmtypes("file_control",5,"name")="file_control.op"
 	Set gtmtypes("file_control",5,"off")=20
 	Set gtmtypes("file_control",5,"len")=1
 	Set gtmtypes("file_control",5,"type")="char"
-	Set gtmtypfldindx("file_control","file_type")=5
-	Set gtmtypes("file_control",6,"name")="file_control.op"
-	Set gtmtypes("file_control",6,"off")=21
-	Set gtmtypes("file_control",6,"len")=1
-	Set gtmtypes("file_control",6,"type")="char"
-	Set gtmtypfldindx("file_control","op")=6
+	Set gtmtypfldindx("file_control","op")=5
 	;
 	Set gtmtypes("file_info")="struct"
 	Set gtmtypes("file_info",0)=5
@@ -4693,7 +4777,7 @@ Init
 	Set gtmtypes("gcall_args",6,"dim")=32
 	;
 	Set gtmtypes("gd_addr")="struct"
-	Set gtmtypes("gd_addr",0)=17
+	Set gtmtypes("gd_addr",0)=20
 	Set gtmtypes("gd_addr","len")=76
 	Set gtmtypes("gd_addr",1,"name")="gd_addr.local_locks"
 	Set gtmtypes("gd_addr",1,"off")=0
@@ -4775,11 +4859,26 @@ Init
 	Set gtmtypes("gd_addr",16,"len")=4
 	Set gtmtypes("gd_addr",16,"type")="unsigned-int"
 	Set gtmtypfldindx("gd_addr","has_span_gbls")=16
-	Set gtmtypes("gd_addr",17,"name")="gd_addr.filler"
+	Set gtmtypes("gd_addr",17,"name")="gd_addr.ygs_map_entry_changed"
 	Set gtmtypes("gd_addr",17,"off")=64
-	Set gtmtypes("gd_addr",17,"len")=12
+	Set gtmtypes("gd_addr",17,"len")=1
 	Set gtmtypes("gd_addr",17,"type")="char"
-	Set gtmtypfldindx("gd_addr","filler")=17
+	Set gtmtypfldindx("gd_addr","ygs_map_entry_changed")=17
+	Set gtmtypes("gd_addr",18,"name")="gd_addr.is_dummy_gbldir"
+	Set gtmtypes("gd_addr",18,"off")=65
+	Set gtmtypes("gd_addr",18,"len")=1
+	Set gtmtypes("gd_addr",18,"type")="char"
+	Set gtmtypfldindx("gd_addr","is_dummy_gbldir")=18
+	Set gtmtypes("gd_addr",19,"name")="gd_addr.filler"
+	Set gtmtypes("gd_addr",19,"off")=66
+	Set gtmtypes("gd_addr",19,"len")=6
+	Set gtmtypes("gd_addr",19,"type")="char"
+	Set gtmtypfldindx("gd_addr","filler")=19
+	Set gtmtypes("gd_addr",20,"name")="gd_addr.thread_gdi"
+	Set gtmtypes("gd_addr",20,"off")=72
+	Set gtmtypes("gd_addr",20,"len")=4
+	Set gtmtypes("gd_addr",20,"type")="addr"
+	Set gtmtypfldindx("gd_addr","thread_gdi")=20
 	;
 	Set gtmtypes("gd_binding")="struct"
 	Set gtmtypes("gd_binding",0)=8
@@ -4845,8 +4944,8 @@ Init
 	Set gtmtypfldindx("gd_gblname","ver")=3
 	;
 	Set gtmtypes("gd_region")="struct"
-	Set gtmtypes("gd_region",0)=38
-	Set gtmtypes("gd_region","len")=372
+	Set gtmtypes("gd_region",0)=44
+	Set gtmtypes("gd_region","len")=412
 	Set gtmtypes("gd_region",1,"name")="gd_region.rname_len"
 	Set gtmtypes("gd_region",1,"off")=0
 	Set gtmtypes("gd_region",1,"len")=2
@@ -5027,16 +5126,46 @@ Init
 	Set gtmtypes("gd_region",36,"len")=4
 	Set gtmtypes("gd_region",36,"type")="unsigned-int"
 	Set gtmtypfldindx("gd_region","is_spanned")=36
-	Set gtmtypes("gd_region",37,"name")="gd_region.epoch_taper"
+	Set gtmtypes("gd_region",37,"name")="gd_region.statsDB_reg_index"
 	Set gtmtypes("gd_region",37,"off")=360
-	Set gtmtypes("gd_region",37,"len")=1
-	Set gtmtypes("gd_region",37,"type")="char"
-	Set gtmtypfldindx("gd_region","epoch_taper")=37
-	Set gtmtypes("gd_region",38,"name")="gd_region.filler"
-	Set gtmtypes("gd_region",38,"off")=361
-	Set gtmtypes("gd_region",38,"len")=11
+	Set gtmtypes("gd_region",37,"len")=4
+	Set gtmtypes("gd_region",37,"type")="unsigned-int"
+	Set gtmtypfldindx("gd_region","statsDB_reg_index")=37
+	Set gtmtypes("gd_region",38,"name")="gd_region.epoch_taper"
+	Set gtmtypes("gd_region",38,"off")=364
+	Set gtmtypes("gd_region",38,"len")=1
 	Set gtmtypes("gd_region",38,"type")="char"
-	Set gtmtypfldindx("gd_region","filler")=38
+	Set gtmtypfldindx("gd_region","epoch_taper")=38
+	Set gtmtypes("gd_region",39,"name")="gd_region.reservedDBFlags"
+	Set gtmtypes("gd_region",39,"off")=365
+	Set gtmtypes("gd_region",39,"len")=1
+	Set gtmtypes("gd_region",39,"type")="char"
+	Set gtmtypfldindx("gd_region","reservedDBFlags")=39
+	Set gtmtypes("gd_region",40,"name")="gd_region.lock_crit_with_db"
+	Set gtmtypes("gd_region",40,"off")=366
+	Set gtmtypes("gd_region",40,"len")=1
+	Set gtmtypes("gd_region",40,"type")="char"
+	Set gtmtypfldindx("gd_region","lock_crit_with_db")=40
+	Set gtmtypes("gd_region",41,"name")="gd_region.statsDB_setup_started"
+	Set gtmtypes("gd_region",41,"off")=367
+	Set gtmtypes("gd_region",41,"len")=1
+	Set gtmtypes("gd_region",41,"type")="char"
+	Set gtmtypfldindx("gd_region","statsDB_setup_started")=41
+	Set gtmtypes("gd_region",42,"name")="gd_region.owning_gd"
+	Set gtmtypes("gd_region",42,"off")=368
+	Set gtmtypes("gd_region",42,"len")=4
+	Set gtmtypes("gd_region",42,"type")="addr"
+	Set gtmtypfldindx("gd_region","owning_gd")=42
+	Set gtmtypes("gd_region",43,"name")="gd_region.statsDB_setup_completed"
+	Set gtmtypes("gd_region",43,"off")=372
+	Set gtmtypes("gd_region",43,"len")=1
+	Set gtmtypes("gd_region",43,"type")="char"
+	Set gtmtypfldindx("gd_region","statsDB_setup_completed")=43
+	Set gtmtypes("gd_region",44,"name")="gd_region.filler"
+	Set gtmtypes("gd_region",44,"off")=373
+	Set gtmtypes("gd_region",44,"len")=39
+	Set gtmtypes("gd_region",44,"type")="char"
+	Set gtmtypfldindx("gd_region","filler")=44
 	;
 	Set gtmtypes("gd_seg_addr")="union"
 	Set gtmtypes("gd_seg_addr",0)=2
@@ -5053,8 +5182,8 @@ Init
 	Set gtmtypfldindx("gd_seg_addr","addr")=2
 	;
 	Set gtmtypes("gd_segment")="struct"
-	Set gtmtypes("gd_segment",0)=23
-	Set gtmtypes("gd_segment","len")=364
+	Set gtmtypes("gd_segment",0)=24
+	Set gtmtypes("gd_segment","len")=368
 	Set gtmtypes("gd_segment",1,"name")="gd_segment.sname_len"
 	Set gtmtypes("gd_segment",1,"off")=0
 	Set gtmtypes("gd_segment",1,"len")=2
@@ -5165,11 +5294,16 @@ Init
 	Set gtmtypes("gd_segment",22,"len")=4
 	Set gtmtypes("gd_segment",22,"type")="unsigned-int"
 	Set gtmtypfldindx("gd_segment","is_encrypted")=22
-	Set gtmtypes("gd_segment",23,"name")="gd_segment.filler"
+	Set gtmtypes("gd_segment",23,"name")="gd_segment.asyncio"
 	Set gtmtypes("gd_segment",23,"off")=348
-	Set gtmtypes("gd_segment",23,"len")=16
-	Set gtmtypes("gd_segment",23,"type")="char"
-	Set gtmtypfldindx("gd_segment","filler")=23
+	Set gtmtypes("gd_segment",23,"len")=4
+	Set gtmtypes("gd_segment",23,"type")="boolean_t"
+	Set gtmtypfldindx("gd_segment","asyncio")=23
+	Set gtmtypes("gd_segment",24,"name")="gd_segment.filler"
+	Set gtmtypes("gd_segment",24,"off")=352
+	Set gtmtypes("gd_segment",24,"len")=16
+	Set gtmtypes("gd_segment",24,"type")="char"
+	Set gtmtypfldindx("gd_segment","filler")=24
 	;
 	Set gtmtypes("gdr_name")="struct"
 	Set gtmtypes("gdr_name",0)=10
@@ -6385,8 +6519,8 @@ Init
 	Set gtmtypfldindx("gtmrecv_options_t","autorollback_verbose")=29
 	;
 	Set gtmtypes("gtmsecshr_mesg")="struct"
-	Set gtmtypes("gtmsecshr_mesg",0)=15
-	Set gtmtypes("gtmsecshr_mesg","len")=4140
+	Set gtmtypes("gtmsecshr_mesg",0)=16
+	Set gtmtypes("gtmsecshr_mesg","len")=4144
 	Set gtmtypes("gtmsecshr_mesg",1,"name")="gtmsecshr_mesg.code"
 	Set gtmtypes("gtmsecshr_mesg",1,"off")=0
 	Set gtmtypes("gtmsecshr_mesg",1,"len")=4
@@ -6414,7 +6548,7 @@ Init
 	Set gtmtypfldindx("gtmsecshr_mesg","seqno")=5
 	Set gtmtypes("gtmsecshr_mesg",6,"name")="gtmsecshr_mesg.mesg"
 	Set gtmtypes("gtmsecshr_mesg",6,"off")=20
-	Set gtmtypes("gtmsecshr_mesg",6,"len")=4120
+	Set gtmtypes("gtmsecshr_mesg",6,"len")=4124
 	Set gtmtypes("gtmsecshr_mesg",6,"type")="union"
 	Set gtmtypfldindx("gtmsecshr_mesg","mesg")=6
 	Set gtmtypes("gtmsecshr_mesg",7,"name")="gtmsecshr_mesg.mesg.id"
@@ -6429,39 +6563,44 @@ Init
 	Set gtmtypfldindx("gtmsecshr_mesg","mesg.path")=8
 	Set gtmtypes("gtmsecshr_mesg",9,"name")="gtmsecshr_mesg.mesg.db_ipcs"
 	Set gtmtypes("gtmsecshr_mesg",9,"off")=20
-	Set gtmtypes("gtmsecshr_mesg",9,"len")=4120
+	Set gtmtypes("gtmsecshr_mesg",9,"len")=4124
 	Set gtmtypes("gtmsecshr_mesg",9,"type")="ipcs_mesg"
 	Set gtmtypfldindx("gtmsecshr_mesg","mesg.db_ipcs")=9
-	Set gtmtypes("gtmsecshr_mesg",10,"name")="gtmsecshr_mesg.mesg.db_ipcs.semid"
+	Set gtmtypes("gtmsecshr_mesg",10,"name")="gtmsecshr_mesg.mesg.db_ipcs.open_fd_with_o_direct"
 	Set gtmtypes("gtmsecshr_mesg",10,"off")=20
 	Set gtmtypes("gtmsecshr_mesg",10,"len")=4
-	Set gtmtypes("gtmsecshr_mesg",10,"type")="int"
-	Set gtmtypfldindx("gtmsecshr_mesg","mesg.db_ipcs.semid")=10
-	Set gtmtypes("gtmsecshr_mesg",11,"name")="gtmsecshr_mesg.mesg.db_ipcs.shmid"
+	Set gtmtypes("gtmsecshr_mesg",10,"type")="boolean_t"
+	Set gtmtypfldindx("gtmsecshr_mesg","mesg.db_ipcs.open_fd_with_o_direct")=10
+	Set gtmtypes("gtmsecshr_mesg",11,"name")="gtmsecshr_mesg.mesg.db_ipcs.semid"
 	Set gtmtypes("gtmsecshr_mesg",11,"off")=24
 	Set gtmtypes("gtmsecshr_mesg",11,"len")=4
 	Set gtmtypes("gtmsecshr_mesg",11,"type")="int"
-	Set gtmtypfldindx("gtmsecshr_mesg","mesg.db_ipcs.shmid")=11
-	Set gtmtypes("gtmsecshr_mesg",12,"name")="gtmsecshr_mesg.mesg.db_ipcs.gt_sem_ctime"
+	Set gtmtypfldindx("gtmsecshr_mesg","mesg.db_ipcs.semid")=11
+	Set gtmtypes("gtmsecshr_mesg",12,"name")="gtmsecshr_mesg.mesg.db_ipcs.shmid"
 	Set gtmtypes("gtmsecshr_mesg",12,"off")=28
 	Set gtmtypes("gtmsecshr_mesg",12,"len")=4
-	Set gtmtypes("gtmsecshr_mesg",12,"type")="time_t"
-	Set gtmtypfldindx("gtmsecshr_mesg","mesg.db_ipcs.gt_sem_ctime")=12
-	Set gtmtypes("gtmsecshr_mesg",13,"name")="gtmsecshr_mesg.mesg.db_ipcs.gt_shm_ctime"
+	Set gtmtypes("gtmsecshr_mesg",12,"type")="int"
+	Set gtmtypfldindx("gtmsecshr_mesg","mesg.db_ipcs.shmid")=12
+	Set gtmtypes("gtmsecshr_mesg",13,"name")="gtmsecshr_mesg.mesg.db_ipcs.gt_sem_ctime"
 	Set gtmtypes("gtmsecshr_mesg",13,"off")=32
 	Set gtmtypes("gtmsecshr_mesg",13,"len")=4
 	Set gtmtypes("gtmsecshr_mesg",13,"type")="time_t"
-	Set gtmtypfldindx("gtmsecshr_mesg","mesg.db_ipcs.gt_shm_ctime")=13
-	Set gtmtypes("gtmsecshr_mesg",14,"name")="gtmsecshr_mesg.mesg.db_ipcs.fn_len"
+	Set gtmtypfldindx("gtmsecshr_mesg","mesg.db_ipcs.gt_sem_ctime")=13
+	Set gtmtypes("gtmsecshr_mesg",14,"name")="gtmsecshr_mesg.mesg.db_ipcs.gt_shm_ctime"
 	Set gtmtypes("gtmsecshr_mesg",14,"off")=36
 	Set gtmtypes("gtmsecshr_mesg",14,"len")=4
-	Set gtmtypes("gtmsecshr_mesg",14,"type")="unsigned-int"
-	Set gtmtypfldindx("gtmsecshr_mesg","mesg.db_ipcs.fn_len")=14
-	Set gtmtypes("gtmsecshr_mesg",15,"name")="gtmsecshr_mesg.mesg.db_ipcs.fn"
+	Set gtmtypes("gtmsecshr_mesg",14,"type")="time_t"
+	Set gtmtypfldindx("gtmsecshr_mesg","mesg.db_ipcs.gt_shm_ctime")=14
+	Set gtmtypes("gtmsecshr_mesg",15,"name")="gtmsecshr_mesg.mesg.db_ipcs.fn_len"
 	Set gtmtypes("gtmsecshr_mesg",15,"off")=40
-	Set gtmtypes("gtmsecshr_mesg",15,"len")=4097
-	Set gtmtypes("gtmsecshr_mesg",15,"type")="char"
-	Set gtmtypfldindx("gtmsecshr_mesg","mesg.db_ipcs.fn")=15
+	Set gtmtypes("gtmsecshr_mesg",15,"len")=4
+	Set gtmtypes("gtmsecshr_mesg",15,"type")="unsigned-int"
+	Set gtmtypfldindx("gtmsecshr_mesg","mesg.db_ipcs.fn_len")=15
+	Set gtmtypes("gtmsecshr_mesg",16,"name")="gtmsecshr_mesg.mesg.db_ipcs.fn"
+	Set gtmtypes("gtmsecshr_mesg",16,"off")=44
+	Set gtmtypes("gtmsecshr_mesg",16,"len")=4097
+	Set gtmtypes("gtmsecshr_mesg",16,"type")="char"
+	Set gtmtypfldindx("gtmsecshr_mesg","mesg.db_ipcs.fn")=16
 	;
 	Set gtmtypes("gtmsiginfo_t")="struct"
 	Set gtmtypes("gtmsiginfo_t",0)=8
@@ -7005,6 +7144,22 @@ Init
 	Set gtmtypes("gv_key",4,"type")="unsigned-char"
 	Set gtmtypfldindx("gv_key","base")=4
 	;
+	Set gtmtypes("gv_name_and_subscripts")="union"
+	Set gtmtypes("gv_name_and_subscripts",0)=2
+	Set gtmtypes("gv_name_and_subscripts","len")=140
+	Set gtmtypes("gv_name_and_subscripts",1,"name")="gv_name_and_subscripts.lv"
+	Set gtmtypes("gv_name_and_subscripts",1,"off")=0
+	Set gtmtypes("gv_name_and_subscripts",1,"len")=140
+	Set gtmtypes("gv_name_and_subscripts",1,"type")="int"
+	Set gtmtypfldindx("gv_name_and_subscripts","lv")=1
+	Set gtmtypes("gv_name_and_subscripts",1,"dim")=35
+	Set gtmtypes("gv_name_and_subscripts",2,"name")="gv_name_and_subscripts.gv"
+	Set gtmtypes("gv_name_and_subscripts",2,"off")=0
+	Set gtmtypes("gv_name_and_subscripts",2,"len")=140
+	Set gtmtypes("gv_name_and_subscripts",2,"type")="int"
+	Set gtmtypfldindx("gv_name_and_subscripts","gv")=2
+	Set gtmtypes("gv_name_and_subscripts",2,"dim")=35
+	;
 	Set gtmtypes("gv_namehead")="struct"
 	Set gtmtypes("gv_namehead",0)=41
 	Set gtmtypes("gv_namehead","len")=568
@@ -7559,8 +7714,8 @@ Init
 	Set gtmtypfldindx("gvsavtarg_t","end")=8
 	;
 	Set gtmtypes("gvstats_rec_t")="struct"
-	Set gtmtypes("gvstats_rec_t",0)=58
-	Set gtmtypes("gvstats_rec_t","len")=464
+	Set gtmtypes("gvstats_rec_t",0)=59
+	Set gtmtypes("gvstats_rec_t","len")=472
 	Set gtmtypes("gvstats_rec_t",1,"name")="gvstats_rec_t.n_set"
 	Set gtmtypes("gvstats_rec_t",1,"off")=0
 	Set gtmtypes("gvstats_rec_t",1,"len")=8
@@ -7851,6 +8006,11 @@ Init
 	Set gtmtypes("gvstats_rec_t",58,"len")=8
 	Set gtmtypes("gvstats_rec_t",58,"type")="uint64_t"
 	Set gtmtypfldindx("gvstats_rec_t","n_crit_yields")=58
+	Set gtmtypes("gvstats_rec_t",59,"name")="gvstats_rec_t.n_clean2dirty"
+	Set gtmtypes("gvstats_rec_t",59,"off")=464
+	Set gtmtypes("gvstats_rec_t",59,"len")=8
+	Set gtmtypes("gvstats_rec_t",59,"type")="uint64_t"
+	Set gtmtypfldindx("gvstats_rec_t","n_clean2dirty")=59
 	;
 	Set gtmtypes("gvt_container")="struct"
 	Set gtmtypes("gvt_container",0)=4
@@ -9455,38 +9615,43 @@ Init
 	Set gtmtypfldindx("iosb","dev_dep_info")=3
 	;
 	Set gtmtypes("ipcs_mesg")="struct"
-	Set gtmtypes("ipcs_mesg",0)=6
-	Set gtmtypes("ipcs_mesg","len")=4120
-	Set gtmtypes("ipcs_mesg",1,"name")="ipcs_mesg.semid"
+	Set gtmtypes("ipcs_mesg",0)=7
+	Set gtmtypes("ipcs_mesg","len")=4124
+	Set gtmtypes("ipcs_mesg",1,"name")="ipcs_mesg.open_fd_with_o_direct"
 	Set gtmtypes("ipcs_mesg",1,"off")=0
 	Set gtmtypes("ipcs_mesg",1,"len")=4
-	Set gtmtypes("ipcs_mesg",1,"type")="int"
-	Set gtmtypfldindx("ipcs_mesg","semid")=1
-	Set gtmtypes("ipcs_mesg",2,"name")="ipcs_mesg.shmid"
+	Set gtmtypes("ipcs_mesg",1,"type")="boolean_t"
+	Set gtmtypfldindx("ipcs_mesg","open_fd_with_o_direct")=1
+	Set gtmtypes("ipcs_mesg",2,"name")="ipcs_mesg.semid"
 	Set gtmtypes("ipcs_mesg",2,"off")=4
 	Set gtmtypes("ipcs_mesg",2,"len")=4
 	Set gtmtypes("ipcs_mesg",2,"type")="int"
-	Set gtmtypfldindx("ipcs_mesg","shmid")=2
-	Set gtmtypes("ipcs_mesg",3,"name")="ipcs_mesg.gt_sem_ctime"
+	Set gtmtypfldindx("ipcs_mesg","semid")=2
+	Set gtmtypes("ipcs_mesg",3,"name")="ipcs_mesg.shmid"
 	Set gtmtypes("ipcs_mesg",3,"off")=8
 	Set gtmtypes("ipcs_mesg",3,"len")=4
-	Set gtmtypes("ipcs_mesg",3,"type")="time_t"
-	Set gtmtypfldindx("ipcs_mesg","gt_sem_ctime")=3
-	Set gtmtypes("ipcs_mesg",4,"name")="ipcs_mesg.gt_shm_ctime"
+	Set gtmtypes("ipcs_mesg",3,"type")="int"
+	Set gtmtypfldindx("ipcs_mesg","shmid")=3
+	Set gtmtypes("ipcs_mesg",4,"name")="ipcs_mesg.gt_sem_ctime"
 	Set gtmtypes("ipcs_mesg",4,"off")=12
 	Set gtmtypes("ipcs_mesg",4,"len")=4
 	Set gtmtypes("ipcs_mesg",4,"type")="time_t"
-	Set gtmtypfldindx("ipcs_mesg","gt_shm_ctime")=4
-	Set gtmtypes("ipcs_mesg",5,"name")="ipcs_mesg.fn_len"
+	Set gtmtypfldindx("ipcs_mesg","gt_sem_ctime")=4
+	Set gtmtypes("ipcs_mesg",5,"name")="ipcs_mesg.gt_shm_ctime"
 	Set gtmtypes("ipcs_mesg",5,"off")=16
 	Set gtmtypes("ipcs_mesg",5,"len")=4
-	Set gtmtypes("ipcs_mesg",5,"type")="unsigned-int"
-	Set gtmtypfldindx("ipcs_mesg","fn_len")=5
-	Set gtmtypes("ipcs_mesg",6,"name")="ipcs_mesg.fn"
+	Set gtmtypes("ipcs_mesg",5,"type")="time_t"
+	Set gtmtypfldindx("ipcs_mesg","gt_shm_ctime")=5
+	Set gtmtypes("ipcs_mesg",6,"name")="ipcs_mesg.fn_len"
 	Set gtmtypes("ipcs_mesg",6,"off")=20
-	Set gtmtypes("ipcs_mesg",6,"len")=4097
-	Set gtmtypes("ipcs_mesg",6,"type")="char"
-	Set gtmtypfldindx("ipcs_mesg","fn")=6
+	Set gtmtypes("ipcs_mesg",6,"len")=4
+	Set gtmtypes("ipcs_mesg",6,"type")="unsigned-int"
+	Set gtmtypfldindx("ipcs_mesg","fn_len")=6
+	Set gtmtypes("ipcs_mesg",7,"name")="ipcs_mesg.fn"
+	Set gtmtypes("ipcs_mesg",7,"off")=24
+	Set gtmtypes("ipcs_mesg",7,"len")=4097
+	Set gtmtypes("ipcs_mesg",7,"type")="char"
+	Set gtmtypfldindx("ipcs_mesg","fn")=7
 	;
 	Set gtmtypes("jext_heap_elem_t")="struct"
 	Set gtmtypes("jext_heap_elem_t",0)=2
@@ -10266,7 +10431,7 @@ Init
 	Set gtmtypfldindx("jnl_fence_control","strm_seqno")=4
 	;
 	Set gtmtypes("jnl_file_header")="struct"
-	Set gtmtypes("jnl_file_header",0)=66
+	Set gtmtypes("jnl_file_header",0)=67
 	Set gtmtypes("jnl_file_header","len")=2048
 	Set gtmtypes("jnl_file_header",1,"name")="jnl_file_header.label"
 	Set gtmtypes("jnl_file_header",1,"off")=0
@@ -10595,11 +10760,16 @@ Init
 	Set gtmtypes("jnl_file_header",65,"len")=4
 	Set gtmtypes("jnl_file_header",65,"type")="boolean_t"
 	Set gtmtypfldindx("jnl_file_header","last_eof_written")=65
-	Set gtmtypes("jnl_file_header",66,"name")="jnl_file_header.filler"
+	Set gtmtypes("jnl_file_header",66,"name")="jnl_file_header.is_not_latest_jnl"
 	Set gtmtypes("jnl_file_header",66,"off")=1612
-	Set gtmtypes("jnl_file_header",66,"len")=436
-	Set gtmtypes("jnl_file_header",66,"type")="char"
-	Set gtmtypfldindx("jnl_file_header","filler")=66
+	Set gtmtypes("jnl_file_header",66,"len")=4
+	Set gtmtypes("jnl_file_header",66,"type")="boolean_t"
+	Set gtmtypfldindx("jnl_file_header","is_not_latest_jnl")=66
+	Set gtmtypes("jnl_file_header",67,"name")="jnl_file_header.filler"
+	Set gtmtypes("jnl_file_header",67,"off")=1616
+	Set gtmtypes("jnl_file_header",67,"len")=432
+	Set gtmtypes("jnl_file_header",67,"type")="char"
+	Set gtmtypfldindx("jnl_file_header","filler")=67
 	;
 	Set gtmtypes("jnl_format_buffer")="struct"
 	Set gtmtypes("jnl_format_buffer",0)=14
@@ -10676,8 +10846,8 @@ Init
 	Set gtmtypfldindx("jnl_format_buffer","alt_buff")=14
 	;
 	Set gtmtypes("jnl_gbls_t")="struct"
-	Set gtmtypes("jnl_gbls_t",0)=26
-	Set gtmtypes("jnl_gbls_t","len")=108
+	Set gtmtypes("jnl_gbls_t",0)=27
+	Set gtmtypes("jnl_gbls_t","len")=112
 	Set gtmtypes("jnl_gbls_t",1,"name")="jnl_gbls_t.mur_jrec_seqno"
 	Set gtmtypes("jnl_gbls_t",1,"off")=0
 	Set gtmtypes("jnl_gbls_t",1,"len")=8
@@ -10788,30 +10958,35 @@ Init
 	Set gtmtypes("jnl_gbls_t",22,"len")=4
 	Set gtmtypes("jnl_gbls_t",22,"type")="boolean_t"
 	Set gtmtypfldindx("jnl_gbls_t","mur_options_forward")=22
-	Set gtmtypes("jnl_gbls_t",23,"name")="jnl_gbls_t.onlnrlbk"
+	Set gtmtypes("jnl_gbls_t",23,"name")="jnl_gbls_t.in_mupjnl"
 	Set gtmtypes("jnl_gbls_t",23,"off")=92
 	Set gtmtypes("jnl_gbls_t",23,"len")=4
 	Set gtmtypes("jnl_gbls_t",23,"type")="boolean_t"
-	Set gtmtypfldindx("jnl_gbls_t","onlnrlbk")=23
-	Set gtmtypes("jnl_gbls_t",24,"name")="jnl_gbls_t.mur_extract"
+	Set gtmtypfldindx("jnl_gbls_t","in_mupjnl")=23
+	Set gtmtypes("jnl_gbls_t",24,"name")="jnl_gbls_t.onlnrlbk"
 	Set gtmtypes("jnl_gbls_t",24,"off")=96
 	Set gtmtypes("jnl_gbls_t",24,"len")=4
 	Set gtmtypes("jnl_gbls_t",24,"type")="boolean_t"
-	Set gtmtypfldindx("jnl_gbls_t","mur_extract")=24
-	Set gtmtypes("jnl_gbls_t",25,"name")="jnl_gbls_t.save_dont_reset_gbl_jrec_time"
+	Set gtmtypfldindx("jnl_gbls_t","onlnrlbk")=24
+	Set gtmtypes("jnl_gbls_t",25,"name")="jnl_gbls_t.mur_extract"
 	Set gtmtypes("jnl_gbls_t",25,"off")=100
 	Set gtmtypes("jnl_gbls_t",25,"len")=4
 	Set gtmtypes("jnl_gbls_t",25,"type")="boolean_t"
-	Set gtmtypfldindx("jnl_gbls_t","save_dont_reset_gbl_jrec_time")=25
-	Set gtmtypes("jnl_gbls_t",26,"name")="jnl_gbls_t.mur_update"
+	Set gtmtypfldindx("jnl_gbls_t","mur_extract")=25
+	Set gtmtypes("jnl_gbls_t",26,"name")="jnl_gbls_t.save_dont_reset_gbl_jrec_time"
 	Set gtmtypes("jnl_gbls_t",26,"off")=104
 	Set gtmtypes("jnl_gbls_t",26,"len")=4
 	Set gtmtypes("jnl_gbls_t",26,"type")="boolean_t"
-	Set gtmtypfldindx("jnl_gbls_t","mur_update")=26
+	Set gtmtypfldindx("jnl_gbls_t","save_dont_reset_gbl_jrec_time")=26
+	Set gtmtypes("jnl_gbls_t",27,"name")="jnl_gbls_t.mur_update"
+	Set gtmtypes("jnl_gbls_t",27,"off")=108
+	Set gtmtypes("jnl_gbls_t",27,"len")=4
+	Set gtmtypes("jnl_gbls_t",27,"type")="boolean_t"
+	Set gtmtypfldindx("jnl_gbls_t","mur_update")=27
 	;
 	Set gtmtypes("jnl_private_control")="struct"
-	Set gtmtypes("jnl_private_control",0)=23
-	Set gtmtypes("jnl_private_control","len")=100
+	Set gtmtypes("jnl_private_control",0)=24
+	Set gtmtypes("jnl_private_control","len")=104
 	Set gtmtypes("jnl_private_control",1,"name")="jnl_private_control.jnl_buff"
 	Set gtmtypes("jnl_private_control",1,"off")=0
 	Set gtmtypes("jnl_private_control",1,"len")=4
@@ -10927,6 +11102,11 @@ Init
 	Set gtmtypes("jnl_private_control",23,"len")=4
 	Set gtmtypes("jnl_private_control",23,"type")="unsigned-int"
 	Set gtmtypfldindx("jnl_private_control","cycle")=23
+	Set gtmtypes("jnl_private_control",24,"name")="jnl_private_control.err_str"
+	Set gtmtypes("jnl_private_control",24,"off")=100
+	Set gtmtypes("jnl_private_control",24,"len")=4
+	Set gtmtypes("jnl_private_control",24,"type")="addr"
+	Set gtmtypfldindx("jnl_private_control","err_str")=24
 	;
 	Set gtmtypes("jnl_process_vector")="struct"
 	Set gtmtypes("jnl_process_vector",0)=10
@@ -13246,8 +13426,8 @@ Init
 	Set gtmtypfldindx("mline","table")=6
 	;
 	Set gtmtypes("mliteral")="struct"
-	Set gtmtypes("mliteral",0)=11
-	Set gtmtypes("mliteral","len")=44
+	Set gtmtypes("mliteral",0)=12
+	Set gtmtypes("mliteral","len")=48
 	Set gtmtypes("mliteral",1,"name")="mliteral.que"
 	Set gtmtypes("mliteral",1,"off")=0
 	Set gtmtypes("mliteral",1,"len")=8
@@ -13268,42 +13448,47 @@ Init
 	Set gtmtypes("mliteral",4,"len")=4
 	Set gtmtypes("mliteral",4,"type")="intptr_t"
 	Set gtmtypfldindx("mliteral","rt_addr")=4
-	Set gtmtypes("mliteral",5,"name")="mliteral.v"
+	Set gtmtypes("mliteral",5,"name")="mliteral.reference_count"
 	Set gtmtypes("mliteral",5,"off")=12
-	Set gtmtypes("mliteral",5,"len")=32
-	Set gtmtypes("mliteral",5,"type")="mval"
-	Set gtmtypfldindx("mliteral","v")=5
-	Set gtmtypes("mliteral",6,"name")="mliteral.v.mvtype"
-	Set gtmtypes("mliteral",6,"off")=12
-	Set gtmtypes("mliteral",6,"len")=2
-	Set gtmtypes("mliteral",6,"type")="unsigned-short"
-	Set gtmtypfldindx("mliteral","v.mvtype")=6
-	Set gtmtypes("mliteral",7,"name")="mliteral.v.fnpc_indx"
-	Set gtmtypes("mliteral",7,"off")=15
-	Set gtmtypes("mliteral",7,"len")=1
-	Set gtmtypes("mliteral",7,"type")="unsigned-char"
-	Set gtmtypfldindx("mliteral","v.fnpc_indx")=7
-	Set gtmtypes("mliteral",8,"name")="mliteral.v.utfcgr_indx"
-	Set gtmtypes("mliteral",8,"off")=16
-	Set gtmtypes("mliteral",8,"len")=4
-	Set gtmtypes("mliteral",8,"type")="unsigned-int"
-	Set gtmtypfldindx("mliteral","v.utfcgr_indx")=8
-	Set gtmtypes("mliteral",9,"name")="mliteral.v.filler2"
+	Set gtmtypes("mliteral",5,"len")=4
+	Set gtmtypes("mliteral",5,"type")="int"
+	Set gtmtypfldindx("mliteral","reference_count")=5
+	Set gtmtypes("mliteral",6,"name")="mliteral.v"
+	Set gtmtypes("mliteral",6,"off")=16
+	Set gtmtypes("mliteral",6,"len")=32
+	Set gtmtypes("mliteral",6,"type")="mval"
+	Set gtmtypfldindx("mliteral","v")=6
+	Set gtmtypes("mliteral",7,"name")="mliteral.v.mvtype"
+	Set gtmtypes("mliteral",7,"off")=16
+	Set gtmtypes("mliteral",7,"len")=2
+	Set gtmtypes("mliteral",7,"type")="unsigned-short"
+	Set gtmtypfldindx("mliteral","v.mvtype")=7
+	Set gtmtypes("mliteral",8,"name")="mliteral.v.fnpc_indx"
+	Set gtmtypes("mliteral",8,"off")=19
+	Set gtmtypes("mliteral",8,"len")=1
+	Set gtmtypes("mliteral",8,"type")="unsigned-char"
+	Set gtmtypfldindx("mliteral","v.fnpc_indx")=8
+	Set gtmtypes("mliteral",9,"name")="mliteral.v.utfcgr_indx"
 	Set gtmtypes("mliteral",9,"off")=20
 	Set gtmtypes("mliteral",9,"len")=4
 	Set gtmtypes("mliteral",9,"type")="unsigned-int"
-	Set gtmtypfldindx("mliteral","v.filler2")=9
-	Set gtmtypes("mliteral",10,"name")="mliteral.v.m"
+	Set gtmtypfldindx("mliteral","v.utfcgr_indx")=9
+	Set gtmtypes("mliteral",10,"name")="mliteral.v.filler2"
 	Set gtmtypes("mliteral",10,"off")=24
-	Set gtmtypes("mliteral",10,"len")=8
-	Set gtmtypes("mliteral",10,"type")="int"
-	Set gtmtypfldindx("mliteral","v.m")=10
-	Set gtmtypes("mliteral",10,"dim")=2
-	Set gtmtypes("mliteral",11,"name")="mliteral.v.str"
-	Set gtmtypes("mliteral",11,"off")=32
-	Set gtmtypes("mliteral",11,"len")=12
-	Set gtmtypes("mliteral",11,"type")="mstr"
-	Set gtmtypfldindx("mliteral","v.str")=11
+	Set gtmtypes("mliteral",10,"len")=4
+	Set gtmtypes("mliteral",10,"type")="unsigned-int"
+	Set gtmtypfldindx("mliteral","v.filler2")=10
+	Set gtmtypes("mliteral",11,"name")="mliteral.v.m"
+	Set gtmtypes("mliteral",11,"off")=28
+	Set gtmtypes("mliteral",11,"len")=8
+	Set gtmtypes("mliteral",11,"type")="int"
+	Set gtmtypfldindx("mliteral","v.m")=11
+	Set gtmtypes("mliteral",11,"dim")=2
+	Set gtmtypes("mliteral",12,"name")="mliteral.v.str"
+	Set gtmtypes("mliteral",12,"off")=36
+	Set gtmtypes("mliteral",12,"len")=12
+	Set gtmtypes("mliteral",12,"type")="mstr"
+	Set gtmtypfldindx("mliteral","v.str")=12
 	;
 	Set gtmtypes("mlk_ctldata")="struct"
 	Set gtmtypes("mlk_ctldata",0)=12
@@ -16904,8 +17089,8 @@ Init
 	Set gtmtypfldindx("nametabent","name")=2
 	;
 	Set gtmtypes("node_local")="struct"
-	Set gtmtypes("node_local",0)=210
-	Set gtmtypes("node_local","len")=51152
+	Set gtmtypes("node_local",0)=249
+	Set gtmtypes("node_local","len")=104768
 	Set gtmtypes("node_local",1,"name")="node_local.label"
 	Set gtmtypes("node_local",1,"off")=0
 	Set gtmtypes("node_local",1,"len")=12
@@ -17177,795 +17362,991 @@ Init
 	Set gtmtypes("node_local",54,"len")=28
 	Set gtmtypes("node_local",54,"type")="char"
 	Set gtmtypfldindx("node_local","fill_cacheline9")=54
-	Set gtmtypes("node_local",55,"name")="node_local.mm_extender_pid"
+	Set gtmtypes("node_local",55,"name")="node_local.wcs_wip_lvl"
 	Set gtmtypes("node_local",55,"off")=960
 	Set gtmtypes("node_local",55,"len")=4
 	Set gtmtypes("node_local",55,"type")="int"
-	Set gtmtypfldindx("node_local","mm_extender_pid")=55
-	Set gtmtypes("node_local",56,"name")="node_local.highest_lbm_blk_changed"
+	Set gtmtypfldindx("node_local","wcs_wip_lvl")=55
+	Set gtmtypes("node_local",56,"name")="node_local.fill_cacheline10"
 	Set gtmtypes("node_local",56,"off")=964
-	Set gtmtypes("node_local",56,"len")=4
-	Set gtmtypes("node_local",56,"type")="int"
-	Set gtmtypfldindx("node_local","highest_lbm_blk_changed")=56
-	Set gtmtypes("node_local",57,"name")="node_local.nbb"
-	Set gtmtypes("node_local",57,"off")=968
+	Set gtmtypes("node_local",56,"len")=28
+	Set gtmtypes("node_local",56,"type")="char"
+	Set gtmtypfldindx("node_local","fill_cacheline10")=56
+	Set gtmtypes("node_local",57,"name")="node_local.wtfini_in_prog"
+	Set gtmtypes("node_local",57,"off")=992
 	Set gtmtypes("node_local",57,"len")=4
 	Set gtmtypes("node_local",57,"type")="int"
-	Set gtmtypfldindx("node_local","nbb")=57
-	Set gtmtypes("node_local",58,"name")="node_local.lockhist_idx"
-	Set gtmtypes("node_local",58,"off")=972
+	Set gtmtypfldindx("node_local","wtfini_in_prog")=57
+	Set gtmtypes("node_local",58,"name")="node_local.freezer_waited_for_kip"
+	Set gtmtypes("node_local",58,"off")=996
 	Set gtmtypes("node_local",58,"len")=4
-	Set gtmtypes("node_local",58,"type")="int"
-	Set gtmtypfldindx("node_local","lockhist_idx")=58
-	Set gtmtypes("node_local",59,"name")="node_local.crit_ops_index"
-	Set gtmtypes("node_local",59,"off")=976
+	Set gtmtypes("node_local",58,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","freezer_waited_for_kip")=58
+	Set gtmtypes("node_local",59,"name")="node_local.mm_extender_pid"
+	Set gtmtypes("node_local",59,"off")=1000
 	Set gtmtypes("node_local",59,"len")=4
 	Set gtmtypes("node_local",59,"type")="int"
-	Set gtmtypfldindx("node_local","crit_ops_index")=59
-	Set gtmtypes("node_local",60,"name")="node_local.dskread_ops_index"
-	Set gtmtypes("node_local",60,"off")=980
+	Set gtmtypfldindx("node_local","mm_extender_pid")=59
+	Set gtmtypes("node_local",60,"name")="node_local.highest_lbm_blk_changed"
+	Set gtmtypes("node_local",60,"off")=1004
 	Set gtmtypes("node_local",60,"len")=4
 	Set gtmtypes("node_local",60,"type")="int"
-	Set gtmtypfldindx("node_local","dskread_ops_index")=60
-	Set gtmtypes("node_local",61,"name")="node_local.ftok_ops_index"
-	Set gtmtypes("node_local",61,"off")=984
+	Set gtmtypfldindx("node_local","highest_lbm_blk_changed")=60
+	Set gtmtypes("node_local",61,"name")="node_local.nbb"
+	Set gtmtypes("node_local",61,"off")=1008
 	Set gtmtypes("node_local",61,"len")=4
 	Set gtmtypes("node_local",61,"type")="int"
-	Set gtmtypfldindx("node_local","ftok_ops_index")=61
-	Set gtmtypes("node_local",62,"name")="node_local.lockhists"
-	Set gtmtypes("node_local",62,"off")=988
-	Set gtmtypes("node_local",62,"len")=10240
-	Set gtmtypes("node_local",62,"type")="lockhist"
-	Set gtmtypfldindx("node_local","lockhists")=62
-	Set gtmtypes("node_local",62,"dim")=512
-	Set gtmtypes("node_local",63,"name")="node_local.lockhists[0].lock_addr"
-	Set gtmtypes("node_local",63,"off")=988
+	Set gtmtypfldindx("node_local","nbb")=61
+	Set gtmtypes("node_local",62,"name")="node_local.lockhist_idx"
+	Set gtmtypes("node_local",62,"off")=1012
+	Set gtmtypes("node_local",62,"len")=4
+	Set gtmtypes("node_local",62,"type")="int"
+	Set gtmtypfldindx("node_local","lockhist_idx")=62
+	Set gtmtypes("node_local",63,"name")="node_local.crit_ops_index"
+	Set gtmtypes("node_local",63,"off")=1016
 	Set gtmtypes("node_local",63,"len")=4
-	Set gtmtypes("node_local",63,"type")="addr"
-	Set gtmtypfldindx("node_local","lockhists[0].lock_addr")=63
-	Set gtmtypes("node_local",64,"name")="node_local.lockhists[0].lock_callr"
-	Set gtmtypes("node_local",64,"off")=992
+	Set gtmtypes("node_local",63,"type")="int"
+	Set gtmtypfldindx("node_local","crit_ops_index")=63
+	Set gtmtypes("node_local",64,"name")="node_local.dskread_ops_index"
+	Set gtmtypes("node_local",64,"off")=1020
 	Set gtmtypes("node_local",64,"len")=4
-	Set gtmtypes("node_local",64,"type")="caddr_t"
-	Set gtmtypfldindx("node_local","lockhists[0].lock_callr")=64
-	Set gtmtypes("node_local",65,"name")="node_local.lockhists[0].lock_pid"
-	Set gtmtypes("node_local",65,"off")=996
+	Set gtmtypes("node_local",64,"type")="int"
+	Set gtmtypfldindx("node_local","dskread_ops_index")=64
+	Set gtmtypes("node_local",65,"name")="node_local.ftok_ops_index"
+	Set gtmtypes("node_local",65,"off")=1024
 	Set gtmtypes("node_local",65,"len")=4
 	Set gtmtypes("node_local",65,"type")="int"
-	Set gtmtypfldindx("node_local","lockhists[0].lock_pid")=65
-	Set gtmtypes("node_local",66,"name")="node_local.lockhists[0].loop_cnt"
-	Set gtmtypes("node_local",66,"off")=1000
+	Set gtmtypfldindx("node_local","ftok_ops_index")=65
+	Set gtmtypes("node_local",66,"name")="node_local.wcs_ops_index"
+	Set gtmtypes("node_local",66,"off")=1028
 	Set gtmtypes("node_local",66,"len")=4
 	Set gtmtypes("node_local",66,"type")="int"
-	Set gtmtypfldindx("node_local","lockhists[0].loop_cnt")=66
-	Set gtmtypes("node_local",67,"name")="node_local.lockhists[0].lock_op"
-	Set gtmtypes("node_local",67,"off")=1004
+	Set gtmtypfldindx("node_local","wcs_ops_index")=66
+	Set gtmtypes("node_local",67,"name")="node_local.filler_8byte_align2"
+	Set gtmtypes("node_local",67,"off")=1032
 	Set gtmtypes("node_local",67,"len")=4
-	Set gtmtypes("node_local",67,"type")="char"
-	Set gtmtypfldindx("node_local","lockhists[0].lock_op")=67
-	Set gtmtypes("node_local",68,"name")="node_local.crit_ops_array"
-	Set gtmtypes("node_local",68,"off")=11228
+	Set gtmtypes("node_local",67,"type")="int"
+	Set gtmtypfldindx("node_local","filler_8byte_align2")=67
+	Set gtmtypes("node_local",68,"name")="node_local.lockhists"
+	Set gtmtypes("node_local",68,"off")=1036
 	Set gtmtypes("node_local",68,"len")=10240
-	Set gtmtypes("node_local",68,"type")="crit_trace"
-	Set gtmtypfldindx("node_local","crit_ops_array")=68
+	Set gtmtypes("node_local",68,"type")="lockhist"
+	Set gtmtypfldindx("node_local","lockhists")=68
 	Set gtmtypes("node_local",68,"dim")=512
-	Set gtmtypes("node_local",69,"name")="node_local.crit_ops_array[0].call_from"
-	Set gtmtypes("node_local",69,"off")=11228
+	Set gtmtypes("node_local",69,"name")="node_local.lockhists[0].lock_addr"
+	Set gtmtypes("node_local",69,"off")=1036
 	Set gtmtypes("node_local",69,"len")=4
-	Set gtmtypes("node_local",69,"type")="caddr_t"
-	Set gtmtypfldindx("node_local","crit_ops_array[0].call_from")=69
-	Set gtmtypes("node_local",70,"name")="node_local.crit_ops_array[0].crit_act"
-	Set gtmtypes("node_local",70,"off")=11232
+	Set gtmtypes("node_local",69,"type")="addr"
+	Set gtmtypfldindx("node_local","lockhists[0].lock_addr")=69
+	Set gtmtypes("node_local",70,"name")="node_local.lockhists[0].lock_callr"
+	Set gtmtypes("node_local",70,"off")=1040
 	Set gtmtypes("node_local",70,"len")=4
-	Set gtmtypes("node_local",70,"type")="int"
-	Set gtmtypfldindx("node_local","crit_ops_array[0].crit_act")=70
-	Set gtmtypes("node_local",71,"name")="node_local.crit_ops_array[0].epid"
-	Set gtmtypes("node_local",71,"off")=11236
+	Set gtmtypes("node_local",70,"type")="caddr_t"
+	Set gtmtypfldindx("node_local","lockhists[0].lock_callr")=70
+	Set gtmtypes("node_local",71,"name")="node_local.lockhists[0].lock_pid"
+	Set gtmtypes("node_local",71,"off")=1044
 	Set gtmtypes("node_local",71,"len")=4
 	Set gtmtypes("node_local",71,"type")="int"
-	Set gtmtypfldindx("node_local","crit_ops_array[0].epid")=71
-	Set gtmtypes("node_local",72,"name")="node_local.crit_ops_array[0].curr_tn"
-	Set gtmtypes("node_local",72,"off")=11240
-	Set gtmtypes("node_local",72,"len")=8
-	Set gtmtypes("node_local",72,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","crit_ops_array[0].curr_tn")=72
-	Set gtmtypes("node_local",73,"name")="node_local.dskread_ops_array"
-	Set gtmtypes("node_local",73,"off")=21468
-	Set gtmtypes("node_local",73,"len")=12288
-	Set gtmtypes("node_local",73,"type")="dskread_trace"
-	Set gtmtypfldindx("node_local","dskread_ops_array")=73
-	Set gtmtypes("node_local",73,"dim")=512
-	Set gtmtypes("node_local",74,"name")="node_local.dskread_ops_array[0].cr_off"
-	Set gtmtypes("node_local",74,"off")=21468
-	Set gtmtypes("node_local",74,"len")=4
-	Set gtmtypes("node_local",74,"type")="intptr_t"
-	Set gtmtypfldindx("node_local","dskread_ops_array[0].cr_off")=74
-	Set gtmtypes("node_local",75,"name")="node_local.dskread_ops_array[0].cr_tn"
-	Set gtmtypes("node_local",75,"off")=21472
-	Set gtmtypes("node_local",75,"len")=8
-	Set gtmtypes("node_local",75,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","dskread_ops_array[0].cr_tn")=75
-	Set gtmtypes("node_local",76,"name")="node_local.dskread_ops_array[0].process_id"
-	Set gtmtypes("node_local",76,"off")=21480
+	Set gtmtypfldindx("node_local","lockhists[0].lock_pid")=71
+	Set gtmtypes("node_local",72,"name")="node_local.lockhists[0].loop_cnt"
+	Set gtmtypes("node_local",72,"off")=1048
+	Set gtmtypes("node_local",72,"len")=4
+	Set gtmtypes("node_local",72,"type")="int"
+	Set gtmtypfldindx("node_local","lockhists[0].loop_cnt")=72
+	Set gtmtypes("node_local",73,"name")="node_local.lockhists[0].lock_op"
+	Set gtmtypes("node_local",73,"off")=1052
+	Set gtmtypes("node_local",73,"len")=4
+	Set gtmtypes("node_local",73,"type")="char"
+	Set gtmtypfldindx("node_local","lockhists[0].lock_op")=73
+	Set gtmtypes("node_local",74,"name")="node_local.crit_ops_array"
+	Set gtmtypes("node_local",74,"off")=11276
+	Set gtmtypes("node_local",74,"len")=10240
+	Set gtmtypes("node_local",74,"type")="crit_trace"
+	Set gtmtypfldindx("node_local","crit_ops_array")=74
+	Set gtmtypes("node_local",74,"dim")=512
+	Set gtmtypes("node_local",75,"name")="node_local.crit_ops_array[0].call_from"
+	Set gtmtypes("node_local",75,"off")=11276
+	Set gtmtypes("node_local",75,"len")=4
+	Set gtmtypes("node_local",75,"type")="caddr_t"
+	Set gtmtypfldindx("node_local","crit_ops_array[0].call_from")=75
+	Set gtmtypes("node_local",76,"name")="node_local.crit_ops_array[0].crit_act"
+	Set gtmtypes("node_local",76,"off")=11280
 	Set gtmtypes("node_local",76,"len")=4
-	Set gtmtypes("node_local",76,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","dskread_ops_array[0].process_id")=76
-	Set gtmtypes("node_local",77,"name")="node_local.dskread_ops_array[0].blk"
-	Set gtmtypes("node_local",77,"off")=21484
+	Set gtmtypes("node_local",76,"type")="int"
+	Set gtmtypfldindx("node_local","crit_ops_array[0].crit_act")=76
+	Set gtmtypes("node_local",77,"name")="node_local.crit_ops_array[0].epid"
+	Set gtmtypes("node_local",77,"off")=11284
 	Set gtmtypes("node_local",77,"len")=4
 	Set gtmtypes("node_local",77,"type")="int"
-	Set gtmtypfldindx("node_local","dskread_ops_array[0].blk")=77
-	Set gtmtypes("node_local",78,"name")="node_local.dskread_ops_array[0].cycle"
-	Set gtmtypes("node_local",78,"off")=21488
-	Set gtmtypes("node_local",78,"len")=4
-	Set gtmtypes("node_local",78,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","dskread_ops_array[0].cycle")=78
-	Set gtmtypes("node_local",79,"name")="node_local.unique_id"
-	Set gtmtypes("node_local",79,"off")=33756
-	Set gtmtypes("node_local",79,"len")=20
-	Set gtmtypes("node_local",79,"type")="unique_file_id"
-	Set gtmtypfldindx("node_local","unique_id")=79
-	Set gtmtypes("node_local",80,"name")="node_local.unique_id.uid"
-	Set gtmtypes("node_local",80,"off")=33756
-	Set gtmtypes("node_local",80,"len")=20
-	Set gtmtypes("node_local",80,"type")="unix_file_id"
-	Set gtmtypfldindx("node_local","unique_id.uid")=80
-	Set gtmtypes("node_local",81,"name")="node_local.unique_id.file_id"
-	Set gtmtypes("node_local",81,"off")=33756
-	Set gtmtypes("node_local",81,"len")=20
-	Set gtmtypes("node_local",81,"type")="char"
-	Set gtmtypfldindx("node_local","unique_id.file_id")=81
-	Set gtmtypes("node_local",82,"name")="node_local.owner_node"
-	Set gtmtypes("node_local",82,"off")=33776
+	Set gtmtypfldindx("node_local","crit_ops_array[0].epid")=77
+	Set gtmtypes("node_local",78,"name")="node_local.crit_ops_array[0].curr_tn"
+	Set gtmtypes("node_local",78,"off")=11288
+	Set gtmtypes("node_local",78,"len")=8
+	Set gtmtypes("node_local",78,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","crit_ops_array[0].curr_tn")=78
+	Set gtmtypes("node_local",79,"name")="node_local.dskread_ops_array"
+	Set gtmtypes("node_local",79,"off")=21516
+	Set gtmtypes("node_local",79,"len")=12288
+	Set gtmtypes("node_local",79,"type")="dskread_trace"
+	Set gtmtypfldindx("node_local","dskread_ops_array")=79
+	Set gtmtypes("node_local",79,"dim")=512
+	Set gtmtypes("node_local",80,"name")="node_local.dskread_ops_array[0].cr_off"
+	Set gtmtypes("node_local",80,"off")=21516
+	Set gtmtypes("node_local",80,"len")=4
+	Set gtmtypes("node_local",80,"type")="intptr_t"
+	Set gtmtypfldindx("node_local","dskread_ops_array[0].cr_off")=80
+	Set gtmtypes("node_local",81,"name")="node_local.dskread_ops_array[0].cr_tn"
+	Set gtmtypes("node_local",81,"off")=21520
+	Set gtmtypes("node_local",81,"len")=8
+	Set gtmtypes("node_local",81,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","dskread_ops_array[0].cr_tn")=81
+	Set gtmtypes("node_local",82,"name")="node_local.dskread_ops_array[0].process_id"
+	Set gtmtypes("node_local",82,"off")=21528
 	Set gtmtypes("node_local",82,"len")=4
 	Set gtmtypes("node_local",82,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","owner_node")=82
-	Set gtmtypes("node_local",83,"name")="node_local.wcsflu_pid"
-	Set gtmtypes("node_local",83,"off")=33780
+	Set gtmtypfldindx("node_local","dskread_ops_array[0].process_id")=82
+	Set gtmtypes("node_local",83,"name")="node_local.dskread_ops_array[0].blk"
+	Set gtmtypes("node_local",83,"off")=21532
 	Set gtmtypes("node_local",83,"len")=4
 	Set gtmtypes("node_local",83,"type")="int"
-	Set gtmtypfldindx("node_local","wcsflu_pid")=83
-	Set gtmtypes("node_local",84,"name")="node_local.creation_date_time4"
-	Set gtmtypes("node_local",84,"off")=33784
+	Set gtmtypfldindx("node_local","dskread_ops_array[0].blk")=83
+	Set gtmtypes("node_local",84,"name")="node_local.dskread_ops_array[0].cycle"
+	Set gtmtypes("node_local",84,"off")=21536
 	Set gtmtypes("node_local",84,"len")=4
-	Set gtmtypes("node_local",84,"type")="int"
-	Set gtmtypfldindx("node_local","creation_date_time4")=84
-	Set gtmtypes("node_local",85,"name")="node_local.inhibit_kills"
-	Set gtmtypes("node_local",85,"off")=33788
-	Set gtmtypes("node_local",85,"len")=4
-	Set gtmtypes("node_local",85,"type")="int"
-	Set gtmtypfldindx("node_local","inhibit_kills")=85
-	Set gtmtypes("node_local",86,"name")="node_local.remove_shm"
-	Set gtmtypes("node_local",86,"off")=33792
-	Set gtmtypes("node_local",86,"len")=4
-	Set gtmtypes("node_local",86,"type")="boolean_t"
-	Set gtmtypfldindx("node_local","remove_shm")=86
-	Set gtmtypes("node_local",87,"name")="node_local.jnl_file"
-	Set gtmtypes("node_local",87,"off")=33796
-	Set gtmtypes("node_local",87,"len")=28
-	Set gtmtypes("node_local",87,"type")="union"
-	Set gtmtypfldindx("node_local","jnl_file")=87
-	Set gtmtypes("node_local",88,"name")="node_local.jnl_file.jnl_file_id"
-	Set gtmtypes("node_local",88,"off")=33796
-	Set gtmtypes("node_local",88,"len")=28
-	Set gtmtypes("node_local",88,"type")="gds_file_id"
-	Set gtmtypfldindx("node_local","jnl_file.jnl_file_id")=88
-	Set gtmtypes("node_local",89,"name")="node_local.jnl_file.jnl_file_id.dvi"
-	Set gtmtypes("node_local",89,"off")=33796
-	Set gtmtypes("node_local",89,"len")=16
-	Set gtmtypes("node_local",89,"type")="char"
-	Set gtmtypfldindx("node_local","jnl_file.jnl_file_id.dvi")=89
-	Set gtmtypes("node_local",90,"name")="node_local.jnl_file.jnl_file_id.did"
-	Set gtmtypes("node_local",90,"off")=33812
-	Set gtmtypes("node_local",90,"len")=6
-	Set gtmtypes("node_local",90,"type")="unsigned-short"
-	Set gtmtypfldindx("node_local","jnl_file.jnl_file_id.did")=90
-	Set gtmtypes("node_local",90,"dim")=3
-	Set gtmtypes("node_local",91,"name")="node_local.jnl_file.jnl_file_id.fid"
-	Set gtmtypes("node_local",91,"off")=33818
-	Set gtmtypes("node_local",91,"len")=6
-	Set gtmtypes("node_local",91,"type")="unsigned-short"
-	Set gtmtypfldindx("node_local","jnl_file.jnl_file_id.fid")=91
-	Set gtmtypes("node_local",91,"dim")=3
-	Set gtmtypes("node_local",92,"name")="node_local.jnl_file.u"
-	Set gtmtypes("node_local",92,"off")=33796
-	Set gtmtypes("node_local",92,"len")=20
-	Set gtmtypes("node_local",92,"type")="unix_file_id"
-	Set gtmtypfldindx("node_local","jnl_file.u")=92
-	Set gtmtypes("node_local",93,"name")="node_local.jnl_file.u.inode"
-	Set gtmtypes("node_local",93,"off")=33796
-	Set gtmtypes("node_local",93,"len")=8
-	Set gtmtypes("node_local",93,"type")="ino_t"
-	Set gtmtypfldindx("node_local","jnl_file.u.inode")=93
-	Set gtmtypes("node_local",94,"name")="node_local.jnl_file.u.device"
-	Set gtmtypes("node_local",94,"off")=33804
+	Set gtmtypes("node_local",84,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","dskread_ops_array[0].cycle")=84
+	Set gtmtypes("node_local",85,"name")="node_local.wcs_ops_array"
+	Set gtmtypes("node_local",85,"off")=33804
+	Set gtmtypes("node_local",85,"len")=53248
+	Set gtmtypes("node_local",85,"type")="wcs_ops_trace_t"
+	Set gtmtypfldindx("node_local","wcs_ops_array")=85
+	Set gtmtypes("node_local",85,"dim")=1024
+	Set gtmtypes("node_local",86,"name")="node_local.wcs_ops_array[0].db_tn"
+	Set gtmtypes("node_local",86,"off")=33804
+	Set gtmtypes("node_local",86,"len")=8
+	Set gtmtypes("node_local",86,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","wcs_ops_array[0].db_tn")=86
+	Set gtmtypes("node_local",87,"name")="node_local.wcs_ops_array[0].process_id"
+	Set gtmtypes("node_local",87,"off")=33812
+	Set gtmtypes("node_local",87,"len")=4
+	Set gtmtypes("node_local",87,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","wcs_ops_array[0].process_id")=87
+	Set gtmtypes("node_local",88,"name")="node_local.wcs_ops_array[0].wc_in_free"
+	Set gtmtypes("node_local",88,"off")=33816
+	Set gtmtypes("node_local",88,"len")=4
+	Set gtmtypes("node_local",88,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","wcs_ops_array[0].wc_in_free")=88
+	Set gtmtypes("node_local",89,"name")="node_local.wcs_ops_array[0].wcs_active_lvl"
+	Set gtmtypes("node_local",89,"off")=33820
+	Set gtmtypes("node_local",89,"len")=4
+	Set gtmtypes("node_local",89,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","wcs_ops_array[0].wcs_active_lvl")=89
+	Set gtmtypes("node_local",90,"name")="node_local.wcs_ops_array[0].wcs_wip_lvl"
+	Set gtmtypes("node_local",90,"off")=33824
+	Set gtmtypes("node_local",90,"len")=4
+	Set gtmtypes("node_local",90,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","wcs_ops_array[0].wcs_wip_lvl")=90
+	Set gtmtypes("node_local",91,"name")="node_local.wcs_ops_array[0].type"
+	Set gtmtypes("node_local",91,"off")=33828
+	Set gtmtypes("node_local",91,"len")=4
+	Set gtmtypes("node_local",91,"type")="int"
+	Set gtmtypfldindx("node_local","wcs_ops_array[0].type")=91
+	Set gtmtypes("node_local",92,"name")="node_local.wcs_ops_array[0].blk"
+	Set gtmtypes("node_local",92,"off")=33832
+	Set gtmtypes("node_local",92,"len")=4
+	Set gtmtypes("node_local",92,"type")="int"
+	Set gtmtypfldindx("node_local","wcs_ops_array[0].blk")=92
+	Set gtmtypes("node_local",93,"name")="node_local.wcs_ops_array[0].cr_off"
+	Set gtmtypes("node_local",93,"off")=33836
+	Set gtmtypes("node_local",93,"len")=4
+	Set gtmtypes("node_local",93,"type")="intptr_t"
+	Set gtmtypfldindx("node_local","wcs_ops_array[0].cr_off")=93
+	Set gtmtypes("node_local",94,"name")="node_local.wcs_ops_array[0].cr_dirty"
+	Set gtmtypes("node_local",94,"off")=33840
 	Set gtmtypes("node_local",94,"len")=8
-	Set gtmtypes("node_local",94,"type")="dev_t"
-	Set gtmtypfldindx("node_local","jnl_file.u.device")=94
-	Set gtmtypes("node_local",95,"name")="node_local.jnl_file.u.st_gen"
-	Set gtmtypes("node_local",95,"off")=33812
+	Set gtmtypes("node_local",94,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","wcs_ops_array[0].cr_dirty")=94
+	Set gtmtypes("node_local",95,"name")="node_local.wcs_ops_array[0].detail1"
+	Set gtmtypes("node_local",95,"off")=33848
 	Set gtmtypes("node_local",95,"len")=4
 	Set gtmtypes("node_local",95,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","jnl_file.u.st_gen")=95
-	Set gtmtypes("node_local",96,"name")="node_local.donotflush_dbjnl"
-	Set gtmtypes("node_local",96,"off")=33824
+	Set gtmtypfldindx("node_local","wcs_ops_array[0].detail1")=95
+	Set gtmtypes("node_local",96,"name")="node_local.wcs_ops_array[0].detail2"
+	Set gtmtypes("node_local",96,"off")=33852
 	Set gtmtypes("node_local",96,"len")=4
-	Set gtmtypes("node_local",96,"type")="boolean_t"
-	Set gtmtypfldindx("node_local","donotflush_dbjnl")=96
-	Set gtmtypes("node_local",97,"name")="node_local.n_pre_read"
-	Set gtmtypes("node_local",97,"off")=33828
-	Set gtmtypes("node_local",97,"len")=4
-	Set gtmtypes("node_local",97,"type")="int"
-	Set gtmtypfldindx("node_local","n_pre_read")=97
-	Set gtmtypes("node_local",98,"name")="node_local.replinstfilename"
-	Set gtmtypes("node_local",98,"off")=33832
-	Set gtmtypes("node_local",98,"len")=256
-	Set gtmtypes("node_local",98,"type")="char"
-	Set gtmtypfldindx("node_local","replinstfilename")=98
-	Set gtmtypes("node_local",99,"name")="node_local.secshr_ops_index"
-	Set gtmtypes("node_local",99,"off")=34088
-	Set gtmtypes("node_local",99,"len")=4
-	Set gtmtypes("node_local",99,"type")="int"
-	Set gtmtypfldindx("node_local","secshr_ops_index")=99
-	Set gtmtypes("node_local",100,"name")="node_local.secshr_ops_array"
-	Set gtmtypes("node_local",100,"off")=34092
-	Set gtmtypes("node_local",100,"len")=8184
-	Set gtmtypes("node_local",100,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","secshr_ops_array")=100
-	Set gtmtypes("node_local",100,"dim")=1023
-	Set gtmtypes("node_local",101,"name")="node_local.gvstats_rec"
-	Set gtmtypes("node_local",101,"off")=42276
-	Set gtmtypes("node_local",101,"len")=464
-	Set gtmtypes("node_local",101,"type")="gvstats_rec_t"
-	Set gtmtypfldindx("node_local","gvstats_rec")=101
-	Set gtmtypes("node_local",102,"name")="node_local.gvstats_rec.n_set"
-	Set gtmtypes("node_local",102,"off")=42276
-	Set gtmtypes("node_local",102,"len")=8
-	Set gtmtypes("node_local",102,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_set")=102
-	Set gtmtypes("node_local",103,"name")="node_local.gvstats_rec.n_kill"
-	Set gtmtypes("node_local",103,"off")=42284
-	Set gtmtypes("node_local",103,"len")=8
-	Set gtmtypes("node_local",103,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_kill")=103
-	Set gtmtypes("node_local",104,"name")="node_local.gvstats_rec.n_get"
-	Set gtmtypes("node_local",104,"off")=42292
-	Set gtmtypes("node_local",104,"len")=8
-	Set gtmtypes("node_local",104,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_get")=104
-	Set gtmtypes("node_local",105,"name")="node_local.gvstats_rec.n_data"
-	Set gtmtypes("node_local",105,"off")=42300
-	Set gtmtypes("node_local",105,"len")=8
-	Set gtmtypes("node_local",105,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_data")=105
-	Set gtmtypes("node_local",106,"name")="node_local.gvstats_rec.n_order"
-	Set gtmtypes("node_local",106,"off")=42308
-	Set gtmtypes("node_local",106,"len")=8
-	Set gtmtypes("node_local",106,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_order")=106
-	Set gtmtypes("node_local",107,"name")="node_local.gvstats_rec.n_zprev"
-	Set gtmtypes("node_local",107,"off")=42316
-	Set gtmtypes("node_local",107,"len")=8
-	Set gtmtypes("node_local",107,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_zprev")=107
-	Set gtmtypes("node_local",108,"name")="node_local.gvstats_rec.n_query"
-	Set gtmtypes("node_local",108,"off")=42324
-	Set gtmtypes("node_local",108,"len")=8
-	Set gtmtypes("node_local",108,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_query")=108
-	Set gtmtypes("node_local",109,"name")="node_local.gvstats_rec.n_lock_success"
-	Set gtmtypes("node_local",109,"off")=42332
-	Set gtmtypes("node_local",109,"len")=8
-	Set gtmtypes("node_local",109,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_lock_success")=109
-	Set gtmtypes("node_local",110,"name")="node_local.gvstats_rec.n_lock_fail"
-	Set gtmtypes("node_local",110,"off")=42340
-	Set gtmtypes("node_local",110,"len")=8
-	Set gtmtypes("node_local",110,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_lock_fail")=110
-	Set gtmtypes("node_local",111,"name")="node_local.gvstats_rec.db_curr_tn"
-	Set gtmtypes("node_local",111,"off")=42348
+	Set gtmtypes("node_local",96,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","wcs_ops_array[0].detail2")=96
+	Set gtmtypes("node_local",97,"name")="node_local.unique_id"
+	Set gtmtypes("node_local",97,"off")=87052
+	Set gtmtypes("node_local",97,"len")=20
+	Set gtmtypes("node_local",97,"type")="unique_file_id"
+	Set gtmtypfldindx("node_local","unique_id")=97
+	Set gtmtypes("node_local",98,"name")="node_local.unique_id.uid"
+	Set gtmtypes("node_local",98,"off")=87052
+	Set gtmtypes("node_local",98,"len")=20
+	Set gtmtypes("node_local",98,"type")="unix_file_id"
+	Set gtmtypfldindx("node_local","unique_id.uid")=98
+	Set gtmtypes("node_local",99,"name")="node_local.unique_id.file_id"
+	Set gtmtypes("node_local",99,"off")=87052
+	Set gtmtypes("node_local",99,"len")=20
+	Set gtmtypes("node_local",99,"type")="char"
+	Set gtmtypfldindx("node_local","unique_id.file_id")=99
+	Set gtmtypes("node_local",100,"name")="node_local.owner_node"
+	Set gtmtypes("node_local",100,"off")=87072
+	Set gtmtypes("node_local",100,"len")=4
+	Set gtmtypes("node_local",100,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","owner_node")=100
+	Set gtmtypes("node_local",101,"name")="node_local.wcsflu_pid"
+	Set gtmtypes("node_local",101,"off")=87076
+	Set gtmtypes("node_local",101,"len")=4
+	Set gtmtypes("node_local",101,"type")="int"
+	Set gtmtypfldindx("node_local","wcsflu_pid")=101
+	Set gtmtypes("node_local",102,"name")="node_local.creation_date_time4"
+	Set gtmtypes("node_local",102,"off")=87080
+	Set gtmtypes("node_local",102,"len")=4
+	Set gtmtypes("node_local",102,"type")="int"
+	Set gtmtypfldindx("node_local","creation_date_time4")=102
+	Set gtmtypes("node_local",103,"name")="node_local.inhibit_kills"
+	Set gtmtypes("node_local",103,"off")=87084
+	Set gtmtypes("node_local",103,"len")=4
+	Set gtmtypes("node_local",103,"type")="int"
+	Set gtmtypfldindx("node_local","inhibit_kills")=103
+	Set gtmtypes("node_local",104,"name")="node_local.remove_shm"
+	Set gtmtypes("node_local",104,"off")=87088
+	Set gtmtypes("node_local",104,"len")=4
+	Set gtmtypes("node_local",104,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","remove_shm")=104
+	Set gtmtypes("node_local",105,"name")="node_local.jnl_file"
+	Set gtmtypes("node_local",105,"off")=87092
+	Set gtmtypes("node_local",105,"len")=28
+	Set gtmtypes("node_local",105,"type")="union"
+	Set gtmtypfldindx("node_local","jnl_file")=105
+	Set gtmtypes("node_local",106,"name")="node_local.jnl_file.jnl_file_id"
+	Set gtmtypes("node_local",106,"off")=87092
+	Set gtmtypes("node_local",106,"len")=28
+	Set gtmtypes("node_local",106,"type")="gds_file_id"
+	Set gtmtypfldindx("node_local","jnl_file.jnl_file_id")=106
+	Set gtmtypes("node_local",107,"name")="node_local.jnl_file.jnl_file_id.dvi"
+	Set gtmtypes("node_local",107,"off")=87092
+	Set gtmtypes("node_local",107,"len")=16
+	Set gtmtypes("node_local",107,"type")="char"
+	Set gtmtypfldindx("node_local","jnl_file.jnl_file_id.dvi")=107
+	Set gtmtypes("node_local",108,"name")="node_local.jnl_file.jnl_file_id.did"
+	Set gtmtypes("node_local",108,"off")=87108
+	Set gtmtypes("node_local",108,"len")=6
+	Set gtmtypes("node_local",108,"type")="unsigned-short"
+	Set gtmtypfldindx("node_local","jnl_file.jnl_file_id.did")=108
+	Set gtmtypes("node_local",108,"dim")=3
+	Set gtmtypes("node_local",109,"name")="node_local.jnl_file.jnl_file_id.fid"
+	Set gtmtypes("node_local",109,"off")=87114
+	Set gtmtypes("node_local",109,"len")=6
+	Set gtmtypes("node_local",109,"type")="unsigned-short"
+	Set gtmtypfldindx("node_local","jnl_file.jnl_file_id.fid")=109
+	Set gtmtypes("node_local",109,"dim")=3
+	Set gtmtypes("node_local",110,"name")="node_local.jnl_file.u"
+	Set gtmtypes("node_local",110,"off")=87092
+	Set gtmtypes("node_local",110,"len")=20
+	Set gtmtypes("node_local",110,"type")="unix_file_id"
+	Set gtmtypfldindx("node_local","jnl_file.u")=110
+	Set gtmtypes("node_local",111,"name")="node_local.jnl_file.u.inode"
+	Set gtmtypes("node_local",111,"off")=87092
 	Set gtmtypes("node_local",111,"len")=8
-	Set gtmtypes("node_local",111,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.db_curr_tn")=111
-	Set gtmtypes("node_local",112,"name")="node_local.gvstats_rec.n_dsk_read"
-	Set gtmtypes("node_local",112,"off")=42356
+	Set gtmtypes("node_local",111,"type")="ino_t"
+	Set gtmtypfldindx("node_local","jnl_file.u.inode")=111
+	Set gtmtypes("node_local",112,"name")="node_local.jnl_file.u.device"
+	Set gtmtypes("node_local",112,"off")=87100
 	Set gtmtypes("node_local",112,"len")=8
-	Set gtmtypes("node_local",112,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_dsk_read")=112
-	Set gtmtypes("node_local",113,"name")="node_local.gvstats_rec.n_dsk_write"
-	Set gtmtypes("node_local",113,"off")=42364
-	Set gtmtypes("node_local",113,"len")=8
-	Set gtmtypes("node_local",113,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_dsk_write")=113
-	Set gtmtypes("node_local",114,"name")="node_local.gvstats_rec.n_nontp_readwrite"
-	Set gtmtypes("node_local",114,"off")=42372
-	Set gtmtypes("node_local",114,"len")=8
-	Set gtmtypes("node_local",114,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_nontp_readwrite")=114
-	Set gtmtypes("node_local",115,"name")="node_local.gvstats_rec.n_nontp_readonly"
-	Set gtmtypes("node_local",115,"off")=42380
-	Set gtmtypes("node_local",115,"len")=8
-	Set gtmtypes("node_local",115,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_nontp_readonly")=115
-	Set gtmtypes("node_local",116,"name")="node_local.gvstats_rec.n_nontp_blkwrite"
-	Set gtmtypes("node_local",116,"off")=42388
-	Set gtmtypes("node_local",116,"len")=8
-	Set gtmtypes("node_local",116,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_nontp_blkwrite")=116
-	Set gtmtypes("node_local",117,"name")="node_local.gvstats_rec.n_nontp_blkread"
-	Set gtmtypes("node_local",117,"off")=42396
-	Set gtmtypes("node_local",117,"len")=8
-	Set gtmtypes("node_local",117,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_nontp_blkread")=117
-	Set gtmtypes("node_local",118,"name")="node_local.gvstats_rec.n_nontp_retries_0"
-	Set gtmtypes("node_local",118,"off")=42404
-	Set gtmtypes("node_local",118,"len")=8
-	Set gtmtypes("node_local",118,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_nontp_retries_0")=118
-	Set gtmtypes("node_local",119,"name")="node_local.gvstats_rec.n_nontp_retries_1"
-	Set gtmtypes("node_local",119,"off")=42412
-	Set gtmtypes("node_local",119,"len")=8
+	Set gtmtypes("node_local",112,"type")="dev_t"
+	Set gtmtypfldindx("node_local","jnl_file.u.device")=112
+	Set gtmtypes("node_local",113,"name")="node_local.jnl_file.u.st_gen"
+	Set gtmtypes("node_local",113,"off")=87108
+	Set gtmtypes("node_local",113,"len")=4
+	Set gtmtypes("node_local",113,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","jnl_file.u.st_gen")=113
+	Set gtmtypes("node_local",114,"name")="node_local.donotflush_dbjnl"
+	Set gtmtypes("node_local",114,"off")=87120
+	Set gtmtypes("node_local",114,"len")=4
+	Set gtmtypes("node_local",114,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","donotflush_dbjnl")=114
+	Set gtmtypes("node_local",115,"name")="node_local.n_pre_read"
+	Set gtmtypes("node_local",115,"off")=87124
+	Set gtmtypes("node_local",115,"len")=4
+	Set gtmtypes("node_local",115,"type")="int"
+	Set gtmtypfldindx("node_local","n_pre_read")=115
+	Set gtmtypes("node_local",116,"name")="node_local.replinstfilename"
+	Set gtmtypes("node_local",116,"off")=87128
+	Set gtmtypes("node_local",116,"len")=256
+	Set gtmtypes("node_local",116,"type")="char"
+	Set gtmtypfldindx("node_local","replinstfilename")=116
+	Set gtmtypes("node_local",117,"name")="node_local.statsdb_fname"
+	Set gtmtypes("node_local",117,"off")=87384
+	Set gtmtypes("node_local",117,"len")=256
+	Set gtmtypes("node_local",117,"type")="char"
+	Set gtmtypfldindx("node_local","statsdb_fname")=117
+	Set gtmtypes("node_local",118,"name")="node_local.secshr_ops_index"
+	Set gtmtypes("node_local",118,"off")=87640
+	Set gtmtypes("node_local",118,"len")=4
+	Set gtmtypes("node_local",118,"type")="int"
+	Set gtmtypfldindx("node_local","secshr_ops_index")=118
+	Set gtmtypes("node_local",119,"name")="node_local.secshr_ops_array"
+	Set gtmtypes("node_local",119,"off")=87644
+	Set gtmtypes("node_local",119,"len")=8184
 	Set gtmtypes("node_local",119,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_nontp_retries_1")=119
-	Set gtmtypes("node_local",120,"name")="node_local.gvstats_rec.n_nontp_retries_2"
-	Set gtmtypes("node_local",120,"off")=42420
-	Set gtmtypes("node_local",120,"len")=8
-	Set gtmtypes("node_local",120,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_nontp_retries_2")=120
-	Set gtmtypes("node_local",121,"name")="node_local.gvstats_rec.n_nontp_retries_3"
-	Set gtmtypes("node_local",121,"off")=42428
+	Set gtmtypfldindx("node_local","secshr_ops_array")=119
+	Set gtmtypes("node_local",119,"dim")=1023
+	Set gtmtypes("node_local",120,"name")="node_local.gvstats_rec"
+	Set gtmtypes("node_local",120,"off")=95828
+	Set gtmtypes("node_local",120,"len")=472
+	Set gtmtypes("node_local",120,"type")="gvstats_rec_t"
+	Set gtmtypfldindx("node_local","gvstats_rec")=120
+	Set gtmtypes("node_local",121,"name")="node_local.gvstats_rec.n_set"
+	Set gtmtypes("node_local",121,"off")=95828
 	Set gtmtypes("node_local",121,"len")=8
 	Set gtmtypes("node_local",121,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_nontp_retries_3")=121
-	Set gtmtypes("node_local",122,"name")="node_local.gvstats_rec.n_tp_readwrite"
-	Set gtmtypes("node_local",122,"off")=42436
+	Set gtmtypfldindx("node_local","gvstats_rec.n_set")=121
+	Set gtmtypes("node_local",122,"name")="node_local.gvstats_rec.n_kill"
+	Set gtmtypes("node_local",122,"off")=95836
 	Set gtmtypes("node_local",122,"len")=8
 	Set gtmtypes("node_local",122,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_readwrite")=122
-	Set gtmtypes("node_local",123,"name")="node_local.gvstats_rec.n_tp_readonly"
-	Set gtmtypes("node_local",123,"off")=42444
+	Set gtmtypfldindx("node_local","gvstats_rec.n_kill")=122
+	Set gtmtypes("node_local",123,"name")="node_local.gvstats_rec.n_get"
+	Set gtmtypes("node_local",123,"off")=95844
 	Set gtmtypes("node_local",123,"len")=8
 	Set gtmtypes("node_local",123,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_readonly")=123
-	Set gtmtypes("node_local",124,"name")="node_local.gvstats_rec.n_tp_rolledback"
-	Set gtmtypes("node_local",124,"off")=42452
+	Set gtmtypfldindx("node_local","gvstats_rec.n_get")=123
+	Set gtmtypes("node_local",124,"name")="node_local.gvstats_rec.n_data"
+	Set gtmtypes("node_local",124,"off")=95852
 	Set gtmtypes("node_local",124,"len")=8
 	Set gtmtypes("node_local",124,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_rolledback")=124
-	Set gtmtypes("node_local",125,"name")="node_local.gvstats_rec.n_tp_blkwrite"
-	Set gtmtypes("node_local",125,"off")=42460
+	Set gtmtypfldindx("node_local","gvstats_rec.n_data")=124
+	Set gtmtypes("node_local",125,"name")="node_local.gvstats_rec.n_order"
+	Set gtmtypes("node_local",125,"off")=95860
 	Set gtmtypes("node_local",125,"len")=8
 	Set gtmtypes("node_local",125,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_blkwrite")=125
-	Set gtmtypes("node_local",126,"name")="node_local.gvstats_rec.n_tp_blkread"
-	Set gtmtypes("node_local",126,"off")=42468
+	Set gtmtypfldindx("node_local","gvstats_rec.n_order")=125
+	Set gtmtypes("node_local",126,"name")="node_local.gvstats_rec.n_zprev"
+	Set gtmtypes("node_local",126,"off")=95868
 	Set gtmtypes("node_local",126,"len")=8
 	Set gtmtypes("node_local",126,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_blkread")=126
-	Set gtmtypes("node_local",127,"name")="node_local.gvstats_rec.n_tp_tot_retries_0"
-	Set gtmtypes("node_local",127,"off")=42476
+	Set gtmtypfldindx("node_local","gvstats_rec.n_zprev")=126
+	Set gtmtypes("node_local",127,"name")="node_local.gvstats_rec.n_query"
+	Set gtmtypes("node_local",127,"off")=95876
 	Set gtmtypes("node_local",127,"len")=8
 	Set gtmtypes("node_local",127,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_tot_retries_0")=127
-	Set gtmtypes("node_local",128,"name")="node_local.gvstats_rec.n_tp_tot_retries_1"
-	Set gtmtypes("node_local",128,"off")=42484
+	Set gtmtypfldindx("node_local","gvstats_rec.n_query")=127
+	Set gtmtypes("node_local",128,"name")="node_local.gvstats_rec.n_lock_success"
+	Set gtmtypes("node_local",128,"off")=95884
 	Set gtmtypes("node_local",128,"len")=8
 	Set gtmtypes("node_local",128,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_tot_retries_1")=128
-	Set gtmtypes("node_local",129,"name")="node_local.gvstats_rec.n_tp_tot_retries_2"
-	Set gtmtypes("node_local",129,"off")=42492
+	Set gtmtypfldindx("node_local","gvstats_rec.n_lock_success")=128
+	Set gtmtypes("node_local",129,"name")="node_local.gvstats_rec.n_lock_fail"
+	Set gtmtypes("node_local",129,"off")=95892
 	Set gtmtypes("node_local",129,"len")=8
 	Set gtmtypes("node_local",129,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_tot_retries_2")=129
-	Set gtmtypes("node_local",130,"name")="node_local.gvstats_rec.n_tp_tot_retries_3"
-	Set gtmtypes("node_local",130,"off")=42500
+	Set gtmtypfldindx("node_local","gvstats_rec.n_lock_fail")=129
+	Set gtmtypes("node_local",130,"name")="node_local.gvstats_rec.db_curr_tn"
+	Set gtmtypes("node_local",130,"off")=95900
 	Set gtmtypes("node_local",130,"len")=8
 	Set gtmtypes("node_local",130,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_tot_retries_3")=130
-	Set gtmtypes("node_local",131,"name")="node_local.gvstats_rec.n_tp_tot_retries_4"
-	Set gtmtypes("node_local",131,"off")=42508
+	Set gtmtypfldindx("node_local","gvstats_rec.db_curr_tn")=130
+	Set gtmtypes("node_local",131,"name")="node_local.gvstats_rec.n_dsk_read"
+	Set gtmtypes("node_local",131,"off")=95908
 	Set gtmtypes("node_local",131,"len")=8
 	Set gtmtypes("node_local",131,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_tot_retries_4")=131
-	Set gtmtypes("node_local",132,"name")="node_local.gvstats_rec.n_tp_cnflct_retries_0"
-	Set gtmtypes("node_local",132,"off")=42516
+	Set gtmtypfldindx("node_local","gvstats_rec.n_dsk_read")=131
+	Set gtmtypes("node_local",132,"name")="node_local.gvstats_rec.n_dsk_write"
+	Set gtmtypes("node_local",132,"off")=95916
 	Set gtmtypes("node_local",132,"len")=8
 	Set gtmtypes("node_local",132,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_cnflct_retries_0")=132
-	Set gtmtypes("node_local",133,"name")="node_local.gvstats_rec.n_tp_cnflct_retries_1"
-	Set gtmtypes("node_local",133,"off")=42524
+	Set gtmtypfldindx("node_local","gvstats_rec.n_dsk_write")=132
+	Set gtmtypes("node_local",133,"name")="node_local.gvstats_rec.n_nontp_readwrite"
+	Set gtmtypes("node_local",133,"off")=95924
 	Set gtmtypes("node_local",133,"len")=8
 	Set gtmtypes("node_local",133,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_cnflct_retries_1")=133
-	Set gtmtypes("node_local",134,"name")="node_local.gvstats_rec.n_tp_cnflct_retries_2"
-	Set gtmtypes("node_local",134,"off")=42532
+	Set gtmtypfldindx("node_local","gvstats_rec.n_nontp_readwrite")=133
+	Set gtmtypes("node_local",134,"name")="node_local.gvstats_rec.n_nontp_readonly"
+	Set gtmtypes("node_local",134,"off")=95932
 	Set gtmtypes("node_local",134,"len")=8
 	Set gtmtypes("node_local",134,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_cnflct_retries_2")=134
-	Set gtmtypes("node_local",135,"name")="node_local.gvstats_rec.n_tp_cnflct_retries_3"
-	Set gtmtypes("node_local",135,"off")=42540
+	Set gtmtypfldindx("node_local","gvstats_rec.n_nontp_readonly")=134
+	Set gtmtypes("node_local",135,"name")="node_local.gvstats_rec.n_nontp_blkwrite"
+	Set gtmtypes("node_local",135,"off")=95940
 	Set gtmtypes("node_local",135,"len")=8
 	Set gtmtypes("node_local",135,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_cnflct_retries_3")=135
-	Set gtmtypes("node_local",136,"name")="node_local.gvstats_rec.n_tp_cnflct_retries_4"
-	Set gtmtypes("node_local",136,"off")=42548
+	Set gtmtypfldindx("node_local","gvstats_rec.n_nontp_blkwrite")=135
+	Set gtmtypes("node_local",136,"name")="node_local.gvstats_rec.n_nontp_blkread"
+	Set gtmtypes("node_local",136,"off")=95948
 	Set gtmtypes("node_local",136,"len")=8
 	Set gtmtypes("node_local",136,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_cnflct_retries_4")=136
-	Set gtmtypes("node_local",137,"name")="node_local.gvstats_rec.n_ztrigger"
-	Set gtmtypes("node_local",137,"off")=42556
+	Set gtmtypfldindx("node_local","gvstats_rec.n_nontp_blkread")=136
+	Set gtmtypes("node_local",137,"name")="node_local.gvstats_rec.n_nontp_retries_0"
+	Set gtmtypes("node_local",137,"off")=95956
 	Set gtmtypes("node_local",137,"len")=8
 	Set gtmtypes("node_local",137,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_ztrigger")=137
-	Set gtmtypes("node_local",138,"name")="node_local.gvstats_rec.n_db_flush"
-	Set gtmtypes("node_local",138,"off")=42564
+	Set gtmtypfldindx("node_local","gvstats_rec.n_nontp_retries_0")=137
+	Set gtmtypes("node_local",138,"name")="node_local.gvstats_rec.n_nontp_retries_1"
+	Set gtmtypes("node_local",138,"off")=95964
 	Set gtmtypes("node_local",138,"len")=8
 	Set gtmtypes("node_local",138,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_db_flush")=138
-	Set gtmtypes("node_local",139,"name")="node_local.gvstats_rec.n_db_fsync"
-	Set gtmtypes("node_local",139,"off")=42572
+	Set gtmtypfldindx("node_local","gvstats_rec.n_nontp_retries_1")=138
+	Set gtmtypes("node_local",139,"name")="node_local.gvstats_rec.n_nontp_retries_2"
+	Set gtmtypes("node_local",139,"off")=95972
 	Set gtmtypes("node_local",139,"len")=8
 	Set gtmtypes("node_local",139,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_db_fsync")=139
-	Set gtmtypes("node_local",140,"name")="node_local.gvstats_rec.n_jnl_flush"
-	Set gtmtypes("node_local",140,"off")=42580
+	Set gtmtypfldindx("node_local","gvstats_rec.n_nontp_retries_2")=139
+	Set gtmtypes("node_local",140,"name")="node_local.gvstats_rec.n_nontp_retries_3"
+	Set gtmtypes("node_local",140,"off")=95980
 	Set gtmtypes("node_local",140,"len")=8
 	Set gtmtypes("node_local",140,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_jnl_flush")=140
-	Set gtmtypes("node_local",141,"name")="node_local.gvstats_rec.n_jnl_fsync"
-	Set gtmtypes("node_local",141,"off")=42588
+	Set gtmtypfldindx("node_local","gvstats_rec.n_nontp_retries_3")=140
+	Set gtmtypes("node_local",141,"name")="node_local.gvstats_rec.n_tp_readwrite"
+	Set gtmtypes("node_local",141,"off")=95988
 	Set gtmtypes("node_local",141,"len")=8
 	Set gtmtypes("node_local",141,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_jnl_fsync")=141
-	Set gtmtypes("node_local",142,"name")="node_local.gvstats_rec.n_jbuff_bytes"
-	Set gtmtypes("node_local",142,"off")=42596
+	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_readwrite")=141
+	Set gtmtypes("node_local",142,"name")="node_local.gvstats_rec.n_tp_readonly"
+	Set gtmtypes("node_local",142,"off")=95996
 	Set gtmtypes("node_local",142,"len")=8
 	Set gtmtypes("node_local",142,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_jbuff_bytes")=142
-	Set gtmtypes("node_local",143,"name")="node_local.gvstats_rec.n_jfile_bytes"
-	Set gtmtypes("node_local",143,"off")=42604
+	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_readonly")=142
+	Set gtmtypes("node_local",143,"name")="node_local.gvstats_rec.n_tp_rolledback"
+	Set gtmtypes("node_local",143,"off")=96004
 	Set gtmtypes("node_local",143,"len")=8
 	Set gtmtypes("node_local",143,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_jfile_bytes")=143
-	Set gtmtypes("node_local",144,"name")="node_local.gvstats_rec.n_jfile_writes"
-	Set gtmtypes("node_local",144,"off")=42612
+	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_rolledback")=143
+	Set gtmtypes("node_local",144,"name")="node_local.gvstats_rec.n_tp_blkwrite"
+	Set gtmtypes("node_local",144,"off")=96012
 	Set gtmtypes("node_local",144,"len")=8
 	Set gtmtypes("node_local",144,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_jfile_writes")=144
-	Set gtmtypes("node_local",145,"name")="node_local.gvstats_rec.n_jrec_logical"
-	Set gtmtypes("node_local",145,"off")=42620
+	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_blkwrite")=144
+	Set gtmtypes("node_local",145,"name")="node_local.gvstats_rec.n_tp_blkread"
+	Set gtmtypes("node_local",145,"off")=96020
 	Set gtmtypes("node_local",145,"len")=8
 	Set gtmtypes("node_local",145,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_jrec_logical")=145
-	Set gtmtypes("node_local",146,"name")="node_local.gvstats_rec.n_jrec_pblk"
-	Set gtmtypes("node_local",146,"off")=42628
+	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_blkread")=145
+	Set gtmtypes("node_local",146,"name")="node_local.gvstats_rec.n_tp_tot_retries_0"
+	Set gtmtypes("node_local",146,"off")=96028
 	Set gtmtypes("node_local",146,"len")=8
 	Set gtmtypes("node_local",146,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_jrec_pblk")=146
-	Set gtmtypes("node_local",147,"name")="node_local.gvstats_rec.n_jrec_epoch_regular"
-	Set gtmtypes("node_local",147,"off")=42636
+	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_tot_retries_0")=146
+	Set gtmtypes("node_local",147,"name")="node_local.gvstats_rec.n_tp_tot_retries_1"
+	Set gtmtypes("node_local",147,"off")=96036
 	Set gtmtypes("node_local",147,"len")=8
 	Set gtmtypes("node_local",147,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_jrec_epoch_regular")=147
-	Set gtmtypes("node_local",148,"name")="node_local.gvstats_rec.n_jrec_epoch_idle"
-	Set gtmtypes("node_local",148,"off")=42644
+	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_tot_retries_1")=147
+	Set gtmtypes("node_local",148,"name")="node_local.gvstats_rec.n_tp_tot_retries_2"
+	Set gtmtypes("node_local",148,"off")=96044
 	Set gtmtypes("node_local",148,"len")=8
 	Set gtmtypes("node_local",148,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_jrec_epoch_idle")=148
-	Set gtmtypes("node_local",149,"name")="node_local.gvstats_rec.n_jrec_other"
-	Set gtmtypes("node_local",149,"off")=42652
+	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_tot_retries_2")=148
+	Set gtmtypes("node_local",149,"name")="node_local.gvstats_rec.n_tp_tot_retries_3"
+	Set gtmtypes("node_local",149,"off")=96052
 	Set gtmtypes("node_local",149,"len")=8
 	Set gtmtypes("node_local",149,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_jrec_other")=149
-	Set gtmtypes("node_local",150,"name")="node_local.gvstats_rec.n_jnl_extends"
-	Set gtmtypes("node_local",150,"off")=42660
+	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_tot_retries_3")=149
+	Set gtmtypes("node_local",150,"name")="node_local.gvstats_rec.n_tp_tot_retries_4"
+	Set gtmtypes("node_local",150,"off")=96060
 	Set gtmtypes("node_local",150,"len")=8
 	Set gtmtypes("node_local",150,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_jnl_extends")=150
-	Set gtmtypes("node_local",151,"name")="node_local.gvstats_rec.n_db_extends"
-	Set gtmtypes("node_local",151,"off")=42668
+	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_tot_retries_4")=150
+	Set gtmtypes("node_local",151,"name")="node_local.gvstats_rec.n_tp_cnflct_retries_0"
+	Set gtmtypes("node_local",151,"off")=96068
 	Set gtmtypes("node_local",151,"len")=8
 	Set gtmtypes("node_local",151,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_db_extends")=151
-	Set gtmtypes("node_local",152,"name")="node_local.gvstats_rec.n_crit_success"
-	Set gtmtypes("node_local",152,"off")=42676
+	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_cnflct_retries_0")=151
+	Set gtmtypes("node_local",152,"name")="node_local.gvstats_rec.n_tp_cnflct_retries_1"
+	Set gtmtypes("node_local",152,"off")=96076
 	Set gtmtypes("node_local",152,"len")=8
 	Set gtmtypes("node_local",152,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_crit_success")=152
-	Set gtmtypes("node_local",153,"name")="node_local.gvstats_rec.n_crits_in_epch"
-	Set gtmtypes("node_local",153,"off")=42684
+	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_cnflct_retries_1")=152
+	Set gtmtypes("node_local",153,"name")="node_local.gvstats_rec.n_tp_cnflct_retries_2"
+	Set gtmtypes("node_local",153,"off")=96084
 	Set gtmtypes("node_local",153,"len")=8
 	Set gtmtypes("node_local",153,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_crits_in_epch")=153
-	Set gtmtypes("node_local",154,"name")="node_local.gvstats_rec.sq_crit_failed"
-	Set gtmtypes("node_local",154,"off")=42692
+	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_cnflct_retries_2")=153
+	Set gtmtypes("node_local",154,"name")="node_local.gvstats_rec.n_tp_cnflct_retries_3"
+	Set gtmtypes("node_local",154,"off")=96092
 	Set gtmtypes("node_local",154,"len")=8
 	Set gtmtypes("node_local",154,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.sq_crit_failed")=154
-	Set gtmtypes("node_local",155,"name")="node_local.gvstats_rec.n_crit_failed"
-	Set gtmtypes("node_local",155,"off")=42700
+	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_cnflct_retries_3")=154
+	Set gtmtypes("node_local",155,"name")="node_local.gvstats_rec.n_tp_cnflct_retries_4"
+	Set gtmtypes("node_local",155,"off")=96100
 	Set gtmtypes("node_local",155,"len")=8
 	Set gtmtypes("node_local",155,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_crit_failed")=155
-	Set gtmtypes("node_local",156,"name")="node_local.gvstats_rec.sq_crit_que_slps"
-	Set gtmtypes("node_local",156,"off")=42708
+	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_cnflct_retries_4")=155
+	Set gtmtypes("node_local",156,"name")="node_local.gvstats_rec.n_ztrigger"
+	Set gtmtypes("node_local",156,"off")=96108
 	Set gtmtypes("node_local",156,"len")=8
 	Set gtmtypes("node_local",156,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.sq_crit_que_slps")=156
-	Set gtmtypes("node_local",157,"name")="node_local.gvstats_rec.n_crit_que_slps"
-	Set gtmtypes("node_local",157,"off")=42716
+	Set gtmtypfldindx("node_local","gvstats_rec.n_ztrigger")=156
+	Set gtmtypes("node_local",157,"name")="node_local.gvstats_rec.n_db_flush"
+	Set gtmtypes("node_local",157,"off")=96116
 	Set gtmtypes("node_local",157,"len")=8
 	Set gtmtypes("node_local",157,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_crit_que_slps")=157
-	Set gtmtypes("node_local",158,"name")="node_local.gvstats_rec.sq_crit_yields"
-	Set gtmtypes("node_local",158,"off")=42724
+	Set gtmtypfldindx("node_local","gvstats_rec.n_db_flush")=157
+	Set gtmtypes("node_local",158,"name")="node_local.gvstats_rec.n_db_fsync"
+	Set gtmtypes("node_local",158,"off")=96124
 	Set gtmtypes("node_local",158,"len")=8
 	Set gtmtypes("node_local",158,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.sq_crit_yields")=158
-	Set gtmtypes("node_local",159,"name")="node_local.gvstats_rec.n_crit_yields"
-	Set gtmtypes("node_local",159,"off")=42732
+	Set gtmtypfldindx("node_local","gvstats_rec.n_db_fsync")=158
+	Set gtmtypes("node_local",159,"name")="node_local.gvstats_rec.n_jnl_flush"
+	Set gtmtypes("node_local",159,"off")=96132
 	Set gtmtypes("node_local",159,"len")=8
 	Set gtmtypes("node_local",159,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_crit_yields")=159
-	Set gtmtypes("node_local",160,"name")="node_local.last_wcsflu_tn"
-	Set gtmtypes("node_local",160,"off")=42740
+	Set gtmtypfldindx("node_local","gvstats_rec.n_jnl_flush")=159
+	Set gtmtypes("node_local",160,"name")="node_local.gvstats_rec.n_jnl_fsync"
+	Set gtmtypes("node_local",160,"off")=96140
 	Set gtmtypes("node_local",160,"len")=8
 	Set gtmtypes("node_local",160,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","last_wcsflu_tn")=160
-	Set gtmtypes("node_local",161,"name")="node_local.encrypt_glo_buff_off"
-	Set gtmtypes("node_local",161,"off")=42748
-	Set gtmtypes("node_local",161,"len")=4
-	Set gtmtypes("node_local",161,"type")="intptr_t"
-	Set gtmtypfldindx("node_local","encrypt_glo_buff_off")=161
-	Set gtmtypes("node_local",162,"name")="node_local.snapshot_crit_latch"
-	Set gtmtypes("node_local",162,"off")=42752
+	Set gtmtypfldindx("node_local","gvstats_rec.n_jnl_fsync")=160
+	Set gtmtypes("node_local",161,"name")="node_local.gvstats_rec.n_jbuff_bytes"
+	Set gtmtypes("node_local",161,"off")=96148
+	Set gtmtypes("node_local",161,"len")=8
+	Set gtmtypes("node_local",161,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","gvstats_rec.n_jbuff_bytes")=161
+	Set gtmtypes("node_local",162,"name")="node_local.gvstats_rec.n_jfile_bytes"
+	Set gtmtypes("node_local",162,"off")=96156
 	Set gtmtypes("node_local",162,"len")=8
-	Set gtmtypes("node_local",162,"type")="global_latch_t"
-	Set gtmtypfldindx("node_local","snapshot_crit_latch")=162
-	Set gtmtypes("node_local",163,"name")="node_local.snapshot_crit_latch.u"
-	Set gtmtypes("node_local",163,"off")=42752
+	Set gtmtypes("node_local",162,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","gvstats_rec.n_jfile_bytes")=162
+	Set gtmtypes("node_local",163,"name")="node_local.gvstats_rec.n_jfile_writes"
+	Set gtmtypes("node_local",163,"off")=96164
 	Set gtmtypes("node_local",163,"len")=8
-	Set gtmtypes("node_local",163,"type")="union"
-	Set gtmtypfldindx("node_local","snapshot_crit_latch.u")=163
-	Set gtmtypes("node_local",164,"name")="node_local.snapshot_crit_latch.u.pid_imgcnt"
-	Set gtmtypes("node_local",164,"off")=42752
+	Set gtmtypes("node_local",163,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","gvstats_rec.n_jfile_writes")=163
+	Set gtmtypes("node_local",164,"name")="node_local.gvstats_rec.n_jrec_logical"
+	Set gtmtypes("node_local",164,"off")=96172
 	Set gtmtypes("node_local",164,"len")=8
 	Set gtmtypes("node_local",164,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","snapshot_crit_latch.u.pid_imgcnt")=164
-	Set gtmtypes("node_local",165,"name")="node_local.snapshot_crit_latch.u.parts"
-	Set gtmtypes("node_local",165,"off")=42752
+	Set gtmtypfldindx("node_local","gvstats_rec.n_jrec_logical")=164
+	Set gtmtypes("node_local",165,"name")="node_local.gvstats_rec.n_jrec_pblk"
+	Set gtmtypes("node_local",165,"off")=96180
 	Set gtmtypes("node_local",165,"len")=8
-	Set gtmtypes("node_local",165,"type")="struct"
-	Set gtmtypfldindx("node_local","snapshot_crit_latch.u.parts")=165
-	Set gtmtypes("node_local",166,"name")="node_local.snapshot_crit_latch.u.parts.latch_pid"
-	Set gtmtypes("node_local",166,"off")=42752
-	Set gtmtypes("node_local",166,"len")=4
-	Set gtmtypes("node_local",166,"type")="int"
-	Set gtmtypfldindx("node_local","snapshot_crit_latch.u.parts.latch_pid")=166
-	Set gtmtypes("node_local",167,"name")="node_local.snapshot_crit_latch.u.parts.latch_word"
-	Set gtmtypes("node_local",167,"off")=42756
-	Set gtmtypes("node_local",167,"len")=4
-	Set gtmtypes("node_local",167,"type")="int"
-	Set gtmtypfldindx("node_local","snapshot_crit_latch.u.parts.latch_word")=167
-	Set gtmtypes("node_local",168,"name")="node_local.ss_shmid"
-	Set gtmtypes("node_local",168,"off")=42760
-	Set gtmtypes("node_local",168,"len")=4
-	Set gtmtypes("node_local",168,"type")="long"
-	Set gtmtypfldindx("node_local","ss_shmid")=168
-	Set gtmtypes("node_local",169,"name")="node_local.ss_shmcycle"
-	Set gtmtypes("node_local",169,"off")=42764
-	Set gtmtypes("node_local",169,"len")=4
-	Set gtmtypes("node_local",169,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","ss_shmcycle")=169
-	Set gtmtypes("node_local",170,"name")="node_local.snapshot_in_prog"
-	Set gtmtypes("node_local",170,"off")=42768
-	Set gtmtypes("node_local",170,"len")=4
-	Set gtmtypes("node_local",170,"type")="boolean_t"
-	Set gtmtypfldindx("node_local","snapshot_in_prog")=170
-	Set gtmtypes("node_local",171,"name")="node_local.num_snapshots_in_effect"
-	Set gtmtypes("node_local",171,"off")=42772
-	Set gtmtypes("node_local",171,"len")=4
-	Set gtmtypes("node_local",171,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","num_snapshots_in_effect")=171
-	Set gtmtypes("node_local",172,"name")="node_local.wbox_test_seq_num"
-	Set gtmtypes("node_local",172,"off")=42776
-	Set gtmtypes("node_local",172,"len")=4
-	Set gtmtypes("node_local",172,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","wbox_test_seq_num")=172
-	Set gtmtypes("node_local",173,"name")="node_local.filler_8byte_align"
-	Set gtmtypes("node_local",173,"off")=42780
-	Set gtmtypes("node_local",173,"len")=4
-	Set gtmtypes("node_local",173,"type")="int"
-	Set gtmtypfldindx("node_local","filler_8byte_align")=173
-	Set gtmtypes("node_local",174,"name")="node_local.kip_pid_array"
-	Set gtmtypes("node_local",174,"off")=42784
-	Set gtmtypes("node_local",174,"len")=32
-	Set gtmtypes("node_local",174,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","kip_pid_array")=174
-	Set gtmtypes("node_local",174,"dim")=8
-	Set gtmtypes("node_local",175,"name")="node_local.sec_size"
-	Set gtmtypes("node_local",175,"off")=42816
+	Set gtmtypes("node_local",165,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","gvstats_rec.n_jrec_pblk")=165
+	Set gtmtypes("node_local",166,"name")="node_local.gvstats_rec.n_jrec_epoch_regular"
+	Set gtmtypes("node_local",166,"off")=96188
+	Set gtmtypes("node_local",166,"len")=8
+	Set gtmtypes("node_local",166,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","gvstats_rec.n_jrec_epoch_regular")=166
+	Set gtmtypes("node_local",167,"name")="node_local.gvstats_rec.n_jrec_epoch_idle"
+	Set gtmtypes("node_local",167,"off")=96196
+	Set gtmtypes("node_local",167,"len")=8
+	Set gtmtypes("node_local",167,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","gvstats_rec.n_jrec_epoch_idle")=167
+	Set gtmtypes("node_local",168,"name")="node_local.gvstats_rec.n_jrec_other"
+	Set gtmtypes("node_local",168,"off")=96204
+	Set gtmtypes("node_local",168,"len")=8
+	Set gtmtypes("node_local",168,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","gvstats_rec.n_jrec_other")=168
+	Set gtmtypes("node_local",169,"name")="node_local.gvstats_rec.n_jnl_extends"
+	Set gtmtypes("node_local",169,"off")=96212
+	Set gtmtypes("node_local",169,"len")=8
+	Set gtmtypes("node_local",169,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","gvstats_rec.n_jnl_extends")=169
+	Set gtmtypes("node_local",170,"name")="node_local.gvstats_rec.n_db_extends"
+	Set gtmtypes("node_local",170,"off")=96220
+	Set gtmtypes("node_local",170,"len")=8
+	Set gtmtypes("node_local",170,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","gvstats_rec.n_db_extends")=170
+	Set gtmtypes("node_local",171,"name")="node_local.gvstats_rec.n_crit_success"
+	Set gtmtypes("node_local",171,"off")=96228
+	Set gtmtypes("node_local",171,"len")=8
+	Set gtmtypes("node_local",171,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","gvstats_rec.n_crit_success")=171
+	Set gtmtypes("node_local",172,"name")="node_local.gvstats_rec.n_crits_in_epch"
+	Set gtmtypes("node_local",172,"off")=96236
+	Set gtmtypes("node_local",172,"len")=8
+	Set gtmtypes("node_local",172,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","gvstats_rec.n_crits_in_epch")=172
+	Set gtmtypes("node_local",173,"name")="node_local.gvstats_rec.sq_crit_failed"
+	Set gtmtypes("node_local",173,"off")=96244
+	Set gtmtypes("node_local",173,"len")=8
+	Set gtmtypes("node_local",173,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","gvstats_rec.sq_crit_failed")=173
+	Set gtmtypes("node_local",174,"name")="node_local.gvstats_rec.n_crit_failed"
+	Set gtmtypes("node_local",174,"off")=96252
+	Set gtmtypes("node_local",174,"len")=8
+	Set gtmtypes("node_local",174,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","gvstats_rec.n_crit_failed")=174
+	Set gtmtypes("node_local",175,"name")="node_local.gvstats_rec.sq_crit_que_slps"
+	Set gtmtypes("node_local",175,"off")=96260
 	Set gtmtypes("node_local",175,"len")=8
 	Set gtmtypes("node_local",175,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","sec_size")=175
-	Set gtmtypes("node_local",176,"name")="node_local.jnlpool_shmid"
-	Set gtmtypes("node_local",176,"off")=42824
-	Set gtmtypes("node_local",176,"len")=4
-	Set gtmtypes("node_local",176,"type")="int"
-	Set gtmtypfldindx("node_local","jnlpool_shmid")=176
-	Set gtmtypes("node_local",177,"name")="node_local.lockspacefull_logged"
-	Set gtmtypes("node_local",177,"off")=42828
-	Set gtmtypes("node_local",177,"len")=4
-	Set gtmtypes("node_local",177,"type")="boolean_t"
-	Set gtmtypfldindx("node_local","lockspacefull_logged")=177
-	Set gtmtypes("node_local",178,"name")="node_local.trunc_pid"
-	Set gtmtypes("node_local",178,"off")=42832
-	Set gtmtypes("node_local",178,"len")=4
-	Set gtmtypes("node_local",178,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","trunc_pid")=178
-	Set gtmtypes("node_local",179,"name")="node_local.highest_lbm_with_busy_blk"
-	Set gtmtypes("node_local",179,"off")=42836
-	Set gtmtypes("node_local",179,"len")=4
-	Set gtmtypes("node_local",179,"type")="int"
-	Set gtmtypfldindx("node_local","highest_lbm_with_busy_blk")=179
-	Set gtmtypes("node_local",180,"name")="node_local.ftok_ops_array"
-	Set gtmtypes("node_local",180,"off")=42840
-	Set gtmtypes("node_local",180,"len")=8192
-	Set gtmtypes("node_local",180,"type")="ftokhist"
-	Set gtmtypfldindx("node_local","ftok_ops_array")=180
-	Set gtmtypes("node_local",180,"dim")=512
-	Set gtmtypes("node_local",181,"name")="node_local.ftok_ops_array[0].ftok_oper"
-	Set gtmtypes("node_local",181,"off")=42840
-	Set gtmtypes("node_local",181,"len")=4
-	Set gtmtypes("node_local",181,"type")="int"
-	Set gtmtypfldindx("node_local","ftok_ops_array[0].ftok_oper")=181
-	Set gtmtypes("node_local",182,"name")="node_local.ftok_ops_array[0].process_id"
-	Set gtmtypes("node_local",182,"off")=42844
+	Set gtmtypfldindx("node_local","gvstats_rec.sq_crit_que_slps")=175
+	Set gtmtypes("node_local",176,"name")="node_local.gvstats_rec.n_crit_que_slps"
+	Set gtmtypes("node_local",176,"off")=96268
+	Set gtmtypes("node_local",176,"len")=8
+	Set gtmtypes("node_local",176,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","gvstats_rec.n_crit_que_slps")=176
+	Set gtmtypes("node_local",177,"name")="node_local.gvstats_rec.sq_crit_yields"
+	Set gtmtypes("node_local",177,"off")=96276
+	Set gtmtypes("node_local",177,"len")=8
+	Set gtmtypes("node_local",177,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","gvstats_rec.sq_crit_yields")=177
+	Set gtmtypes("node_local",178,"name")="node_local.gvstats_rec.n_crit_yields"
+	Set gtmtypes("node_local",178,"off")=96284
+	Set gtmtypes("node_local",178,"len")=8
+	Set gtmtypes("node_local",178,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","gvstats_rec.n_crit_yields")=178
+	Set gtmtypes("node_local",179,"name")="node_local.gvstats_rec.n_clean2dirty"
+	Set gtmtypes("node_local",179,"off")=96292
+	Set gtmtypes("node_local",179,"len")=8
+	Set gtmtypes("node_local",179,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","gvstats_rec.n_clean2dirty")=179
+	Set gtmtypes("node_local",180,"name")="node_local.last_wcsflu_tn"
+	Set gtmtypes("node_local",180,"off")=96300
+	Set gtmtypes("node_local",180,"len")=8
+	Set gtmtypes("node_local",180,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","last_wcsflu_tn")=180
+	Set gtmtypes("node_local",181,"name")="node_local.last_wcs_recover_tn"
+	Set gtmtypes("node_local",181,"off")=96308
+	Set gtmtypes("node_local",181,"len")=8
+	Set gtmtypes("node_local",181,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","last_wcs_recover_tn")=181
+	Set gtmtypes("node_local",182,"name")="node_local.encrypt_glo_buff_off"
+	Set gtmtypes("node_local",182,"off")=96316
 	Set gtmtypes("node_local",182,"len")=4
-	Set gtmtypes("node_local",182,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","ftok_ops_array[0].process_id")=182
-	Set gtmtypes("node_local",183,"name")="node_local.ftok_ops_array[0].cr_tn"
-	Set gtmtypes("node_local",183,"off")=42848
+	Set gtmtypes("node_local",182,"type")="intptr_t"
+	Set gtmtypfldindx("node_local","encrypt_glo_buff_off")=182
+	Set gtmtypes("node_local",183,"name")="node_local.snapshot_crit_latch"
+	Set gtmtypes("node_local",183,"off")=96320
 	Set gtmtypes("node_local",183,"len")=8
-	Set gtmtypes("node_local",183,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","ftok_ops_array[0].cr_tn")=183
-	Set gtmtypes("node_local",184,"name")="node_local.root_search_cycle"
-	Set gtmtypes("node_local",184,"off")=51032
-	Set gtmtypes("node_local",184,"len")=4
-	Set gtmtypes("node_local",184,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","root_search_cycle")=184
-	Set gtmtypes("node_local",185,"name")="node_local.onln_rlbk_cycle"
-	Set gtmtypes("node_local",185,"off")=51036
-	Set gtmtypes("node_local",185,"len")=4
-	Set gtmtypes("node_local",185,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","onln_rlbk_cycle")=185
-	Set gtmtypes("node_local",186,"name")="node_local.db_onln_rlbkd_cycle"
-	Set gtmtypes("node_local",186,"off")=51040
-	Set gtmtypes("node_local",186,"len")=4
-	Set gtmtypes("node_local",186,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","db_onln_rlbkd_cycle")=186
-	Set gtmtypes("node_local",187,"name")="node_local.onln_rlbk_pid"
-	Set gtmtypes("node_local",187,"off")=51044
+	Set gtmtypes("node_local",183,"type")="global_latch_t"
+	Set gtmtypfldindx("node_local","snapshot_crit_latch")=183
+	Set gtmtypes("node_local",184,"name")="node_local.snapshot_crit_latch.u"
+	Set gtmtypes("node_local",184,"off")=96320
+	Set gtmtypes("node_local",184,"len")=8
+	Set gtmtypes("node_local",184,"type")="union"
+	Set gtmtypfldindx("node_local","snapshot_crit_latch.u")=184
+	Set gtmtypes("node_local",185,"name")="node_local.snapshot_crit_latch.u.pid_imgcnt"
+	Set gtmtypes("node_local",185,"off")=96320
+	Set gtmtypes("node_local",185,"len")=8
+	Set gtmtypes("node_local",185,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","snapshot_crit_latch.u.pid_imgcnt")=185
+	Set gtmtypes("node_local",186,"name")="node_local.snapshot_crit_latch.u.parts"
+	Set gtmtypes("node_local",186,"off")=96320
+	Set gtmtypes("node_local",186,"len")=8
+	Set gtmtypes("node_local",186,"type")="struct"
+	Set gtmtypfldindx("node_local","snapshot_crit_latch.u.parts")=186
+	Set gtmtypes("node_local",187,"name")="node_local.snapshot_crit_latch.u.parts.latch_pid"
+	Set gtmtypes("node_local",187,"off")=96320
 	Set gtmtypes("node_local",187,"len")=4
-	Set gtmtypes("node_local",187,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","onln_rlbk_pid")=187
-	Set gtmtypes("node_local",188,"name")="node_local.dbrndwn_ftok_skip"
-	Set gtmtypes("node_local",188,"off")=51048
+	Set gtmtypes("node_local",187,"type")="int"
+	Set gtmtypfldindx("node_local","snapshot_crit_latch.u.parts.latch_pid")=187
+	Set gtmtypes("node_local",188,"name")="node_local.snapshot_crit_latch.u.parts.latch_word"
+	Set gtmtypes("node_local",188,"off")=96324
 	Set gtmtypes("node_local",188,"len")=4
-	Set gtmtypes("node_local",188,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","dbrndwn_ftok_skip")=188
-	Set gtmtypes("node_local",189,"name")="node_local.dbrndwn_access_skip"
-	Set gtmtypes("node_local",189,"off")=51052
+	Set gtmtypes("node_local",188,"type")="int"
+	Set gtmtypfldindx("node_local","snapshot_crit_latch.u.parts.latch_word")=188
+	Set gtmtypes("node_local",189,"name")="node_local.ss_shmid"
+	Set gtmtypes("node_local",189,"off")=96328
 	Set gtmtypes("node_local",189,"len")=4
-	Set gtmtypes("node_local",189,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","dbrndwn_access_skip")=189
-	Set gtmtypes("node_local",190,"name")="node_local.fastinteg_in_prog"
-	Set gtmtypes("node_local",190,"off")=51056
+	Set gtmtypes("node_local",189,"type")="long"
+	Set gtmtypfldindx("node_local","ss_shmid")=189
+	Set gtmtypes("node_local",190,"name")="node_local.ss_shmcycle"
+	Set gtmtypes("node_local",190,"off")=96332
 	Set gtmtypes("node_local",190,"len")=4
-	Set gtmtypes("node_local",190,"type")="boolean_t"
-	Set gtmtypfldindx("node_local","fastinteg_in_prog")=190
-	Set gtmtypes("node_local",191,"name")="node_local.wtstart_errcnt"
-	Set gtmtypes("node_local",191,"off")=51060
+	Set gtmtypes("node_local",190,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","ss_shmcycle")=190
+	Set gtmtypes("node_local",191,"name")="node_local.snapshot_in_prog"
+	Set gtmtypes("node_local",191,"off")=96336
 	Set gtmtypes("node_local",191,"len")=4
-	Set gtmtypes("node_local",191,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","wtstart_errcnt")=191
-	Set gtmtypes("node_local",192,"name")="node_local.fake_db_enospc"
-	Set gtmtypes("node_local",192,"off")=51064
+	Set gtmtypes("node_local",191,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","snapshot_in_prog")=191
+	Set gtmtypes("node_local",192,"name")="node_local.num_snapshots_in_effect"
+	Set gtmtypes("node_local",192,"off")=96340
 	Set gtmtypes("node_local",192,"len")=4
-	Set gtmtypes("node_local",192,"type")="boolean_t"
-	Set gtmtypfldindx("node_local","fake_db_enospc")=192
-	Set gtmtypes("node_local",193,"name")="node_local.fake_jnl_enospc"
-	Set gtmtypes("node_local",193,"off")=51068
+	Set gtmtypes("node_local",192,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","num_snapshots_in_effect")=192
+	Set gtmtypes("node_local",193,"name")="node_local.wbox_test_seq_num"
+	Set gtmtypes("node_local",193,"off")=96344
 	Set gtmtypes("node_local",193,"len")=4
-	Set gtmtypes("node_local",193,"type")="boolean_t"
-	Set gtmtypfldindx("node_local","fake_jnl_enospc")=193
-	Set gtmtypes("node_local",194,"name")="node_local.doing_epoch"
-	Set gtmtypes("node_local",194,"off")=51072
+	Set gtmtypes("node_local",193,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","wbox_test_seq_num")=193
+	Set gtmtypes("node_local",194,"name")="node_local.filler_8byte_align3"
+	Set gtmtypes("node_local",194,"off")=96348
 	Set gtmtypes("node_local",194,"len")=4
-	Set gtmtypes("node_local",194,"type")="boolean_t"
-	Set gtmtypfldindx("node_local","doing_epoch")=194
-	Set gtmtypes("node_local",195,"name")="node_local.epoch_taper_start_dbuffs"
-	Set gtmtypes("node_local",195,"off")=51076
-	Set gtmtypes("node_local",195,"len")=4
+	Set gtmtypes("node_local",194,"type")="int"
+	Set gtmtypfldindx("node_local","filler_8byte_align3")=194
+	Set gtmtypes("node_local",195,"name")="node_local.kip_pid_array"
+	Set gtmtypes("node_local",195,"off")=96352
+	Set gtmtypes("node_local",195,"len")=32
 	Set gtmtypes("node_local",195,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","epoch_taper_start_dbuffs")=195
-	Set gtmtypes("node_local",196,"name")="node_local.epoch_taper_need_fsync"
-	Set gtmtypes("node_local",196,"off")=51080
-	Set gtmtypes("node_local",196,"len")=4
-	Set gtmtypes("node_local",196,"type")="boolean_t"
-	Set gtmtypfldindx("node_local","epoch_taper_need_fsync")=196
-	Set gtmtypes("node_local",197,"name")="node_local.wt_pid_array"
-	Set gtmtypes("node_local",197,"off")=51084
-	Set gtmtypes("node_local",197,"len")=16
-	Set gtmtypes("node_local",197,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","wt_pid_array")=197
-	Set gtmtypes("node_local",197,"dim")=4
-	Set gtmtypes("node_local",198,"name")="node_local.reorg_encrypt_pid"
-	Set gtmtypes("node_local",198,"off")=51100
+	Set gtmtypfldindx("node_local","kip_pid_array")=195
+	Set gtmtypes("node_local",195,"dim")=8
+	Set gtmtypes("node_local",196,"name")="node_local.sec_size"
+	Set gtmtypes("node_local",196,"off")=96384
+	Set gtmtypes("node_local",196,"len")=8
+	Set gtmtypes("node_local",196,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","sec_size")=196
+	Set gtmtypes("node_local",197,"name")="node_local.jnlpool_shmid"
+	Set gtmtypes("node_local",197,"off")=96392
+	Set gtmtypes("node_local",197,"len")=4
+	Set gtmtypes("node_local",197,"type")="int"
+	Set gtmtypfldindx("node_local","jnlpool_shmid")=197
+	Set gtmtypes("node_local",198,"name")="node_local.lockspacefull_logged"
+	Set gtmtypes("node_local",198,"off")=96396
 	Set gtmtypes("node_local",198,"len")=4
-	Set gtmtypes("node_local",198,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","reorg_encrypt_pid")=198
-	Set gtmtypes("node_local",199,"name")="node_local.reorg_encrypt_cycle"
-	Set gtmtypes("node_local",199,"off")=51104
+	Set gtmtypes("node_local",198,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","lockspacefull_logged")=198
+	Set gtmtypes("node_local",199,"name")="node_local.trunc_pid"
+	Set gtmtypes("node_local",199,"off")=96400
 	Set gtmtypes("node_local",199,"len")=4
 	Set gtmtypes("node_local",199,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","reorg_encrypt_cycle")=199
-	Set gtmtypes("node_local",200,"name")="node_local.mupip_extract_count"
-	Set gtmtypes("node_local",200,"off")=51108
+	Set gtmtypfldindx("node_local","trunc_pid")=199
+	Set gtmtypes("node_local",200,"name")="node_local.highest_lbm_with_busy_blk"
+	Set gtmtypes("node_local",200,"off")=96404
 	Set gtmtypes("node_local",200,"len")=4
-	Set gtmtypes("node_local",200,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","mupip_extract_count")=200
-	Set gtmtypes("node_local",201,"name")="node_local.saved_acc_meth"
-	Set gtmtypes("node_local",201,"off")=51112
-	Set gtmtypes("node_local",201,"len")=4
-	Set gtmtypes("node_local",201,"type")="int"
-	Set gtmtypfldindx("node_local","saved_acc_meth")=201
-	Set gtmtypes("node_local",202,"name")="node_local.saved_blk_size"
-	Set gtmtypes("node_local",202,"off")=51116
+	Set gtmtypes("node_local",200,"type")="int"
+	Set gtmtypfldindx("node_local","highest_lbm_with_busy_blk")=200
+	Set gtmtypes("node_local",201,"name")="node_local.ftok_ops_array"
+	Set gtmtypes("node_local",201,"off")=96408
+	Set gtmtypes("node_local",201,"len")=8192
+	Set gtmtypes("node_local",201,"type")="ftokhist"
+	Set gtmtypfldindx("node_local","ftok_ops_array")=201
+	Set gtmtypes("node_local",201,"dim")=512
+	Set gtmtypes("node_local",202,"name")="node_local.ftok_ops_array[0].ftok_oper"
+	Set gtmtypes("node_local",202,"off")=96408
 	Set gtmtypes("node_local",202,"len")=4
 	Set gtmtypes("node_local",202,"type")="int"
-	Set gtmtypfldindx("node_local","saved_blk_size")=202
-	Set gtmtypes("node_local",203,"name")="node_local.saved_lock_space_size"
-	Set gtmtypes("node_local",203,"off")=51120
+	Set gtmtypfldindx("node_local","ftok_ops_array[0].ftok_oper")=202
+	Set gtmtypes("node_local",203,"name")="node_local.ftok_ops_array[0].process_id"
+	Set gtmtypes("node_local",203,"off")=96412
 	Set gtmtypes("node_local",203,"len")=4
 	Set gtmtypes("node_local",203,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","saved_lock_space_size")=203
-	Set gtmtypes("node_local",204,"name")="node_local.saved_jnl_buffer_size"
-	Set gtmtypes("node_local",204,"off")=51124
-	Set gtmtypes("node_local",204,"len")=4
-	Set gtmtypes("node_local",204,"type")="int"
-	Set gtmtypfldindx("node_local","saved_jnl_buffer_size")=204
-	Set gtmtypes("node_local",205,"name")="node_local.lastwriterbypas_msg_issued"
-	Set gtmtypes("node_local",205,"off")=51128
+	Set gtmtypfldindx("node_local","ftok_ops_array[0].process_id")=203
+	Set gtmtypes("node_local",204,"name")="node_local.ftok_ops_array[0].cr_tn"
+	Set gtmtypes("node_local",204,"off")=96416
+	Set gtmtypes("node_local",204,"len")=8
+	Set gtmtypes("node_local",204,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","ftok_ops_array[0].cr_tn")=204
+	Set gtmtypes("node_local",205,"name")="node_local.root_search_cycle"
+	Set gtmtypes("node_local",205,"off")=104600
 	Set gtmtypes("node_local",205,"len")=4
-	Set gtmtypes("node_local",205,"type")="boolean_t"
-	Set gtmtypfldindx("node_local","lastwriterbypas_msg_issued")=205
-	Set gtmtypes("node_local",206,"name")="node_local.first_writer_seen"
-	Set gtmtypes("node_local",206,"off")=51132
+	Set gtmtypes("node_local",205,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","root_search_cycle")=205
+	Set gtmtypes("node_local",206,"name")="node_local.onln_rlbk_cycle"
+	Set gtmtypes("node_local",206,"off")=104604
 	Set gtmtypes("node_local",206,"len")=4
-	Set gtmtypes("node_local",206,"type")="boolean_t"
-	Set gtmtypfldindx("node_local","first_writer_seen")=206
-	Set gtmtypes("node_local",207,"name")="node_local.first_nonbypas_writer_seen"
-	Set gtmtypes("node_local",207,"off")=51136
+	Set gtmtypes("node_local",206,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","onln_rlbk_cycle")=206
+	Set gtmtypes("node_local",207,"name")="node_local.db_onln_rlbkd_cycle"
+	Set gtmtypes("node_local",207,"off")=104608
 	Set gtmtypes("node_local",207,"len")=4
-	Set gtmtypes("node_local",207,"type")="boolean_t"
-	Set gtmtypfldindx("node_local","first_nonbypas_writer_seen")=207
-	Set gtmtypes("node_local",208,"name")="node_local.ftok_counter_halted"
-	Set gtmtypes("node_local",208,"off")=51140
+	Set gtmtypes("node_local",207,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","db_onln_rlbkd_cycle")=207
+	Set gtmtypes("node_local",208,"name")="node_local.onln_rlbk_pid"
+	Set gtmtypes("node_local",208,"off")=104612
 	Set gtmtypes("node_local",208,"len")=4
-	Set gtmtypes("node_local",208,"type")="boolean_t"
-	Set gtmtypfldindx("node_local","ftok_counter_halted")=208
-	Set gtmtypes("node_local",209,"name")="node_local.access_counter_halted"
-	Set gtmtypes("node_local",209,"off")=51144
+	Set gtmtypes("node_local",208,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","onln_rlbk_pid")=208
+	Set gtmtypes("node_local",209,"name")="node_local.dbrndwn_ftok_skip"
+	Set gtmtypes("node_local",209,"off")=104616
 	Set gtmtypes("node_local",209,"len")=4
-	Set gtmtypes("node_local",209,"type")="boolean_t"
-	Set gtmtypfldindx("node_local","access_counter_halted")=209
-	Set gtmtypes("node_local",210,"name")="node_local.filler_8byte_align1"
-	Set gtmtypes("node_local",210,"off")=51148
+	Set gtmtypes("node_local",209,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","dbrndwn_ftok_skip")=209
+	Set gtmtypes("node_local",210,"name")="node_local.dbrndwn_access_skip"
+	Set gtmtypes("node_local",210,"off")=104620
 	Set gtmtypes("node_local",210,"len")=4
 	Set gtmtypes("node_local",210,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","filler_8byte_align1")=210
+	Set gtmtypfldindx("node_local","dbrndwn_access_skip")=210
+	Set gtmtypes("node_local",211,"name")="node_local.fastinteg_in_prog"
+	Set gtmtypes("node_local",211,"off")=104624
+	Set gtmtypes("node_local",211,"len")=4
+	Set gtmtypes("node_local",211,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","fastinteg_in_prog")=211
+	Set gtmtypes("node_local",212,"name")="node_local.wtstart_errcnt"
+	Set gtmtypes("node_local",212,"off")=104628
+	Set gtmtypes("node_local",212,"len")=4
+	Set gtmtypes("node_local",212,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","wtstart_errcnt")=212
+	Set gtmtypes("node_local",213,"name")="node_local.fake_db_enospc"
+	Set gtmtypes("node_local",213,"off")=104632
+	Set gtmtypes("node_local",213,"len")=4
+	Set gtmtypes("node_local",213,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","fake_db_enospc")=213
+	Set gtmtypes("node_local",214,"name")="node_local.fake_jnl_enospc"
+	Set gtmtypes("node_local",214,"off")=104636
+	Set gtmtypes("node_local",214,"len")=4
+	Set gtmtypes("node_local",214,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","fake_jnl_enospc")=214
+	Set gtmtypes("node_local",215,"name")="node_local.doing_epoch"
+	Set gtmtypes("node_local",215,"off")=104640
+	Set gtmtypes("node_local",215,"len")=4
+	Set gtmtypes("node_local",215,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","doing_epoch")=215
+	Set gtmtypes("node_local",216,"name")="node_local.epoch_taper_start_dbuffs"
+	Set gtmtypes("node_local",216,"off")=104644
+	Set gtmtypes("node_local",216,"len")=4
+	Set gtmtypes("node_local",216,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","epoch_taper_start_dbuffs")=216
+	Set gtmtypes("node_local",217,"name")="node_local.epoch_taper_need_fsync"
+	Set gtmtypes("node_local",217,"off")=104648
+	Set gtmtypes("node_local",217,"len")=4
+	Set gtmtypes("node_local",217,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","epoch_taper_need_fsync")=217
+	Set gtmtypes("node_local",218,"name")="node_local.wt_pid_array"
+	Set gtmtypes("node_local",218,"off")=104652
+	Set gtmtypes("node_local",218,"len")=16
+	Set gtmtypes("node_local",218,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","wt_pid_array")=218
+	Set gtmtypes("node_local",218,"dim")=4
+	Set gtmtypes("node_local",219,"name")="node_local.reorg_encrypt_pid"
+	Set gtmtypes("node_local",219,"off")=104668
+	Set gtmtypes("node_local",219,"len")=4
+	Set gtmtypes("node_local",219,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","reorg_encrypt_pid")=219
+	Set gtmtypes("node_local",220,"name")="node_local.reorg_encrypt_cycle"
+	Set gtmtypes("node_local",220,"off")=104672
+	Set gtmtypes("node_local",220,"len")=4
+	Set gtmtypes("node_local",220,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","reorg_encrypt_cycle")=220
+	Set gtmtypes("node_local",221,"name")="node_local.mupip_extract_count"
+	Set gtmtypes("node_local",221,"off")=104676
+	Set gtmtypes("node_local",221,"len")=4
+	Set gtmtypes("node_local",221,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","mupip_extract_count")=221
+	Set gtmtypes("node_local",222,"name")="node_local.saved_acc_meth"
+	Set gtmtypes("node_local",222,"off")=104680
+	Set gtmtypes("node_local",222,"len")=4
+	Set gtmtypes("node_local",222,"type")="int"
+	Set gtmtypfldindx("node_local","saved_acc_meth")=222
+	Set gtmtypes("node_local",223,"name")="node_local.saved_blk_size"
+	Set gtmtypes("node_local",223,"off")=104684
+	Set gtmtypes("node_local",223,"len")=4
+	Set gtmtypes("node_local",223,"type")="int"
+	Set gtmtypfldindx("node_local","saved_blk_size")=223
+	Set gtmtypes("node_local",224,"name")="node_local.saved_lock_space_size"
+	Set gtmtypes("node_local",224,"off")=104688
+	Set gtmtypes("node_local",224,"len")=4
+	Set gtmtypes("node_local",224,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","saved_lock_space_size")=224
+	Set gtmtypes("node_local",225,"name")="node_local.saved_jnl_buffer_size"
+	Set gtmtypes("node_local",225,"off")=104692
+	Set gtmtypes("node_local",225,"len")=4
+	Set gtmtypes("node_local",225,"type")="int"
+	Set gtmtypfldindx("node_local","saved_jnl_buffer_size")=225
+	Set gtmtypes("node_local",226,"name")="node_local.lastwriterbypas_msg_issued"
+	Set gtmtypes("node_local",226,"off")=104696
+	Set gtmtypes("node_local",226,"len")=4
+	Set gtmtypes("node_local",226,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","lastwriterbypas_msg_issued")=226
+	Set gtmtypes("node_local",227,"name")="node_local.first_writer_seen"
+	Set gtmtypes("node_local",227,"off")=104700
+	Set gtmtypes("node_local",227,"len")=4
+	Set gtmtypes("node_local",227,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","first_writer_seen")=227
+	Set gtmtypes("node_local",228,"name")="node_local.first_nonbypas_writer_seen"
+	Set gtmtypes("node_local",228,"off")=104704
+	Set gtmtypes("node_local",228,"len")=4
+	Set gtmtypes("node_local",228,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","first_nonbypas_writer_seen")=228
+	Set gtmtypes("node_local",229,"name")="node_local.ftok_counter_halted"
+	Set gtmtypes("node_local",229,"off")=104708
+	Set gtmtypes("node_local",229,"len")=4
+	Set gtmtypes("node_local",229,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","ftok_counter_halted")=229
+	Set gtmtypes("node_local",230,"name")="node_local.access_counter_halted"
+	Set gtmtypes("node_local",230,"off")=104712
+	Set gtmtypes("node_local",230,"len")=4
+	Set gtmtypes("node_local",230,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","access_counter_halted")=230
+	Set gtmtypes("node_local",231,"name")="node_local.statsdb_created"
+	Set gtmtypes("node_local",231,"off")=104716
+	Set gtmtypes("node_local",231,"len")=4
+	Set gtmtypes("node_local",231,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","statsdb_created")=231
+	Set gtmtypes("node_local",232,"name")="node_local.statsdb_fname_len"
+	Set gtmtypes("node_local",232,"off")=104720
+	Set gtmtypes("node_local",232,"len")=4
+	Set gtmtypes("node_local",232,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","statsdb_fname_len")=232
+	Set gtmtypes("node_local",233,"name")="node_local.statsdb_rundown_clean"
+	Set gtmtypes("node_local",233,"off")=104724
+	Set gtmtypes("node_local",233,"len")=4
+	Set gtmtypes("node_local",233,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","statsdb_rundown_clean")=233
+	Set gtmtypes("node_local",234,"name")="node_local.freeze_latch"
+	Set gtmtypes("node_local",234,"off")=104728
+	Set gtmtypes("node_local",234,"len")=8
+	Set gtmtypes("node_local",234,"type")="global_latch_t"
+	Set gtmtypfldindx("node_local","freeze_latch")=234
+	Set gtmtypes("node_local",235,"name")="node_local.freeze_latch.u"
+	Set gtmtypes("node_local",235,"off")=104728
+	Set gtmtypes("node_local",235,"len")=8
+	Set gtmtypes("node_local",235,"type")="union"
+	Set gtmtypfldindx("node_local","freeze_latch.u")=235
+	Set gtmtypes("node_local",236,"name")="node_local.freeze_latch.u.pid_imgcnt"
+	Set gtmtypes("node_local",236,"off")=104728
+	Set gtmtypes("node_local",236,"len")=8
+	Set gtmtypes("node_local",236,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","freeze_latch.u.pid_imgcnt")=236
+	Set gtmtypes("node_local",237,"name")="node_local.freeze_latch.u.parts"
+	Set gtmtypes("node_local",237,"off")=104728
+	Set gtmtypes("node_local",237,"len")=8
+	Set gtmtypes("node_local",237,"type")="struct"
+	Set gtmtypfldindx("node_local","freeze_latch.u.parts")=237
+	Set gtmtypes("node_local",238,"name")="node_local.freeze_latch.u.parts.latch_pid"
+	Set gtmtypes("node_local",238,"off")=104728
+	Set gtmtypes("node_local",238,"len")=4
+	Set gtmtypes("node_local",238,"type")="int"
+	Set gtmtypfldindx("node_local","freeze_latch.u.parts.latch_pid")=238
+	Set gtmtypes("node_local",239,"name")="node_local.freeze_latch.u.parts.latch_word"
+	Set gtmtypes("node_local",239,"off")=104732
+	Set gtmtypes("node_local",239,"len")=4
+	Set gtmtypes("node_local",239,"type")="int"
+	Set gtmtypfldindx("node_local","freeze_latch.u.parts.latch_word")=239
+	Set gtmtypes("node_local",240,"name")="node_local.wcs_buffs_freed"
+	Set gtmtypes("node_local",240,"off")=104736
+	Set gtmtypes("node_local",240,"len")=8
+	Set gtmtypes("node_local",240,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","wcs_buffs_freed")=240
+	Set gtmtypes("node_local",241,"name")="node_local.dskspace_next_fire"
+	Set gtmtypes("node_local",241,"off")=104744
+	Set gtmtypes("node_local",241,"len")=8
+	Set gtmtypes("node_local",241,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","dskspace_next_fire")=241
+	Set gtmtypes("node_local",242,"name")="node_local.lock_crit"
+	Set gtmtypes("node_local",242,"off")=104752
+	Set gtmtypes("node_local",242,"len")=8
+	Set gtmtypes("node_local",242,"type")="global_latch_t"
+	Set gtmtypfldindx("node_local","lock_crit")=242
+	Set gtmtypes("node_local",243,"name")="node_local.lock_crit.u"
+	Set gtmtypes("node_local",243,"off")=104752
+	Set gtmtypes("node_local",243,"len")=8
+	Set gtmtypes("node_local",243,"type")="union"
+	Set gtmtypfldindx("node_local","lock_crit.u")=243
+	Set gtmtypes("node_local",244,"name")="node_local.lock_crit.u.pid_imgcnt"
+	Set gtmtypes("node_local",244,"off")=104752
+	Set gtmtypes("node_local",244,"len")=8
+	Set gtmtypes("node_local",244,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","lock_crit.u.pid_imgcnt")=244
+	Set gtmtypes("node_local",245,"name")="node_local.lock_crit.u.parts"
+	Set gtmtypes("node_local",245,"off")=104752
+	Set gtmtypes("node_local",245,"len")=8
+	Set gtmtypes("node_local",245,"type")="struct"
+	Set gtmtypfldindx("node_local","lock_crit.u.parts")=245
+	Set gtmtypes("node_local",246,"name")="node_local.lock_crit.u.parts.latch_pid"
+	Set gtmtypes("node_local",246,"off")=104752
+	Set gtmtypes("node_local",246,"len")=4
+	Set gtmtypes("node_local",246,"type")="int"
+	Set gtmtypfldindx("node_local","lock_crit.u.parts.latch_pid")=246
+	Set gtmtypes("node_local",247,"name")="node_local.lock_crit.u.parts.latch_word"
+	Set gtmtypes("node_local",247,"off")=104756
+	Set gtmtypes("node_local",247,"len")=4
+	Set gtmtypes("node_local",247,"type")="int"
+	Set gtmtypfldindx("node_local","lock_crit.u.parts.latch_word")=247
+	Set gtmtypes("node_local",248,"name")="node_local.tp_hint"
+	Set gtmtypes("node_local",248,"off")=104760
+	Set gtmtypes("node_local",248,"len")=4
+	Set gtmtypes("node_local",248,"type")="int"
+	Set gtmtypfldindx("node_local","tp_hint")=248
+	Set gtmtypes("node_local",249,"name")="node_local.filler_8byte_align6"
+	Set gtmtypes("node_local",249,"off")=104764
+	Set gtmtypes("node_local",249,"len")=4
+	Set gtmtypes("node_local",249,"type")="int"
+	Set gtmtypfldindx("node_local","filler_8byte_align6")=249
 	;
 	Set gtmtypes("noisolation_element")="struct"
 	Set gtmtypes("noisolation_element",0)=2
@@ -18007,11 +18388,11 @@ Init
 	;
 	Set gtmtypes("octabstruct")="struct"
 	Set gtmtypes("octabstruct",0)=1
-	Set gtmtypes("octabstruct","len")=2
+	Set gtmtypes("octabstruct","len")=4
 	Set gtmtypes("octabstruct",1,"name")="octabstruct.octype"
 	Set gtmtypes("octabstruct",1,"off")=0
-	Set gtmtypes("octabstruct",1,"len")=2
-	Set gtmtypes("octabstruct",1,"type")="unsigned-short"
+	Set gtmtypes("octabstruct",1,"len")=4
+	Set gtmtypes("octabstruct",1,"type")="unsigned-int"
 	Set gtmtypfldindx("octabstruct","octype")=1
 	;
 	Set gtmtypes("omi_cl_stat")="struct"
@@ -22642,8 +23023,8 @@ Init
 	Set gtmtypfldindx("redo_root_search_context","t_tries_dbg")=16
 	;
 	Set gtmtypes("reg_ctl_list")="struct"
-	Set gtmtypes("reg_ctl_list",0)=63
-	Set gtmtypes("reg_ctl_list","len")=324
+	Set gtmtypes("reg_ctl_list",0)=67
+	Set gtmtypes("reg_ctl_list","len")=336
 	Set gtmtypes("reg_ctl_list",1,"name")="reg_ctl_list.db_tn"
 	Set gtmtypes("reg_ctl_list",1,"off")=0
 	Set gtmtypes("reg_ctl_list",1,"len")=8
@@ -22967,6 +23348,26 @@ Init
 	Set gtmtypes("reg_ctl_list",63,"type")="boolean_t"
 	Set gtmtypfldindx("reg_ctl_list","last_jext_logical_rec")=63
 	Set gtmtypes("reg_ctl_list",63,"dim")=3
+	Set gtmtypes("reg_ctl_list",64,"name")="reg_ctl_list.dio_buff"
+	Set gtmtypes("reg_ctl_list",64,"off")=324
+	Set gtmtypes("reg_ctl_list",64,"len")=12
+	Set gtmtypes("reg_ctl_list",64,"type")="dio_buff_t"
+	Set gtmtypfldindx("reg_ctl_list","dio_buff")=64
+	Set gtmtypes("reg_ctl_list",65,"name")="reg_ctl_list.dio_buff.unaligned_size"
+	Set gtmtypes("reg_ctl_list",65,"off")=324
+	Set gtmtypes("reg_ctl_list",65,"len")=4
+	Set gtmtypes("reg_ctl_list",65,"type")="int"
+	Set gtmtypfldindx("reg_ctl_list","dio_buff.unaligned_size")=65
+	Set gtmtypes("reg_ctl_list",66,"name")="reg_ctl_list.dio_buff.unaligned"
+	Set gtmtypes("reg_ctl_list",66,"off")=328
+	Set gtmtypes("reg_ctl_list",66,"len")=4
+	Set gtmtypes("reg_ctl_list",66,"type")="addr"
+	Set gtmtypfldindx("reg_ctl_list","dio_buff.unaligned")=66
+	Set gtmtypes("reg_ctl_list",67,"name")="reg_ctl_list.dio_buff.aligned"
+	Set gtmtypes("reg_ctl_list",67,"off")=332
+	Set gtmtypes("reg_ctl_list",67,"len")=4
+	Set gtmtypes("reg_ctl_list",67,"type")="addr"
+	Set gtmtypfldindx("reg_ctl_list","dio_buff.aligned")=67
 	;
 	Set gtmtypes("reg_jrec_info_t")="struct"
 	Set gtmtypes("reg_jrec_info_t",0)=2
@@ -25976,8 +26377,8 @@ Init
 	Set gtmtypfldindx("sgmm_addrs","filler")=1
 	;
 	Set gtmtypes("sgmnt_addrs")="struct"
-	Set gtmtypes("sgmnt_addrs",0)=142
-	Set gtmtypes("sgmnt_addrs","len")=816
+	Set gtmtypes("sgmnt_addrs",0)=153
+	Set gtmtypes("sgmnt_addrs","len")=864
 	Set gtmtypes("sgmnt_addrs",1,"name")="sgmnt_addrs.hdr"
 	Set gtmtypes("sgmnt_addrs",1,"off")=0
 	Set gtmtypes("sgmnt_addrs",1,"len")=4
@@ -26135,564 +26536,619 @@ Init
 	Set gtmtypes("sgmnt_addrs",31,"len")=4
 	Set gtmtypes("sgmnt_addrs",31,"type")="addr"
 	Set gtmtypfldindx("sgmnt_addrs","acc_meth.bg.fill1")=31
-	Set gtmtypes("sgmnt_addrs",32,"name")="sgmnt_addrs.gvstats_rec"
+	Set gtmtypes("sgmnt_addrs",32,"name")="sgmnt_addrs.gvstats_rec_p"
 	Set gtmtypes("sgmnt_addrs",32,"off")=116
-	Set gtmtypes("sgmnt_addrs",32,"len")=464
-	Set gtmtypes("sgmnt_addrs",32,"type")="gvstats_rec_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec")=32
-	Set gtmtypes("sgmnt_addrs",33,"name")="sgmnt_addrs.gvstats_rec.n_set"
-	Set gtmtypes("sgmnt_addrs",33,"off")=116
-	Set gtmtypes("sgmnt_addrs",33,"len")=8
-	Set gtmtypes("sgmnt_addrs",33,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_set")=33
-	Set gtmtypes("sgmnt_addrs",34,"name")="sgmnt_addrs.gvstats_rec.n_kill"
-	Set gtmtypes("sgmnt_addrs",34,"off")=124
+	Set gtmtypes("sgmnt_addrs",32,"len")=4
+	Set gtmtypes("sgmnt_addrs",32,"type")="addr"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec_p")=32
+	Set gtmtypes("sgmnt_addrs",33,"name")="sgmnt_addrs.gvstats_rec"
+	Set gtmtypes("sgmnt_addrs",33,"off")=120
+	Set gtmtypes("sgmnt_addrs",33,"len")=472
+	Set gtmtypes("sgmnt_addrs",33,"type")="gvstats_rec_t"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec")=33
+	Set gtmtypes("sgmnt_addrs",34,"name")="sgmnt_addrs.gvstats_rec.n_set"
+	Set gtmtypes("sgmnt_addrs",34,"off")=120
 	Set gtmtypes("sgmnt_addrs",34,"len")=8
 	Set gtmtypes("sgmnt_addrs",34,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_kill")=34
-	Set gtmtypes("sgmnt_addrs",35,"name")="sgmnt_addrs.gvstats_rec.n_get"
-	Set gtmtypes("sgmnt_addrs",35,"off")=132
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_set")=34
+	Set gtmtypes("sgmnt_addrs",35,"name")="sgmnt_addrs.gvstats_rec.n_kill"
+	Set gtmtypes("sgmnt_addrs",35,"off")=128
 	Set gtmtypes("sgmnt_addrs",35,"len")=8
 	Set gtmtypes("sgmnt_addrs",35,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_get")=35
-	Set gtmtypes("sgmnt_addrs",36,"name")="sgmnt_addrs.gvstats_rec.n_data"
-	Set gtmtypes("sgmnt_addrs",36,"off")=140
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_kill")=35
+	Set gtmtypes("sgmnt_addrs",36,"name")="sgmnt_addrs.gvstats_rec.n_get"
+	Set gtmtypes("sgmnt_addrs",36,"off")=136
 	Set gtmtypes("sgmnt_addrs",36,"len")=8
 	Set gtmtypes("sgmnt_addrs",36,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_data")=36
-	Set gtmtypes("sgmnt_addrs",37,"name")="sgmnt_addrs.gvstats_rec.n_order"
-	Set gtmtypes("sgmnt_addrs",37,"off")=148
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_get")=36
+	Set gtmtypes("sgmnt_addrs",37,"name")="sgmnt_addrs.gvstats_rec.n_data"
+	Set gtmtypes("sgmnt_addrs",37,"off")=144
 	Set gtmtypes("sgmnt_addrs",37,"len")=8
 	Set gtmtypes("sgmnt_addrs",37,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_order")=37
-	Set gtmtypes("sgmnt_addrs",38,"name")="sgmnt_addrs.gvstats_rec.n_zprev"
-	Set gtmtypes("sgmnt_addrs",38,"off")=156
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_data")=37
+	Set gtmtypes("sgmnt_addrs",38,"name")="sgmnt_addrs.gvstats_rec.n_order"
+	Set gtmtypes("sgmnt_addrs",38,"off")=152
 	Set gtmtypes("sgmnt_addrs",38,"len")=8
 	Set gtmtypes("sgmnt_addrs",38,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_zprev")=38
-	Set gtmtypes("sgmnt_addrs",39,"name")="sgmnt_addrs.gvstats_rec.n_query"
-	Set gtmtypes("sgmnt_addrs",39,"off")=164
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_order")=38
+	Set gtmtypes("sgmnt_addrs",39,"name")="sgmnt_addrs.gvstats_rec.n_zprev"
+	Set gtmtypes("sgmnt_addrs",39,"off")=160
 	Set gtmtypes("sgmnt_addrs",39,"len")=8
 	Set gtmtypes("sgmnt_addrs",39,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_query")=39
-	Set gtmtypes("sgmnt_addrs",40,"name")="sgmnt_addrs.gvstats_rec.n_lock_success"
-	Set gtmtypes("sgmnt_addrs",40,"off")=172
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_zprev")=39
+	Set gtmtypes("sgmnt_addrs",40,"name")="sgmnt_addrs.gvstats_rec.n_query"
+	Set gtmtypes("sgmnt_addrs",40,"off")=168
 	Set gtmtypes("sgmnt_addrs",40,"len")=8
 	Set gtmtypes("sgmnt_addrs",40,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_lock_success")=40
-	Set gtmtypes("sgmnt_addrs",41,"name")="sgmnt_addrs.gvstats_rec.n_lock_fail"
-	Set gtmtypes("sgmnt_addrs",41,"off")=180
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_query")=40
+	Set gtmtypes("sgmnt_addrs",41,"name")="sgmnt_addrs.gvstats_rec.n_lock_success"
+	Set gtmtypes("sgmnt_addrs",41,"off")=176
 	Set gtmtypes("sgmnt_addrs",41,"len")=8
 	Set gtmtypes("sgmnt_addrs",41,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_lock_fail")=41
-	Set gtmtypes("sgmnt_addrs",42,"name")="sgmnt_addrs.gvstats_rec.db_curr_tn"
-	Set gtmtypes("sgmnt_addrs",42,"off")=188
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_lock_success")=41
+	Set gtmtypes("sgmnt_addrs",42,"name")="sgmnt_addrs.gvstats_rec.n_lock_fail"
+	Set gtmtypes("sgmnt_addrs",42,"off")=184
 	Set gtmtypes("sgmnt_addrs",42,"len")=8
 	Set gtmtypes("sgmnt_addrs",42,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.db_curr_tn")=42
-	Set gtmtypes("sgmnt_addrs",43,"name")="sgmnt_addrs.gvstats_rec.n_dsk_read"
-	Set gtmtypes("sgmnt_addrs",43,"off")=196
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_lock_fail")=42
+	Set gtmtypes("sgmnt_addrs",43,"name")="sgmnt_addrs.gvstats_rec.db_curr_tn"
+	Set gtmtypes("sgmnt_addrs",43,"off")=192
 	Set gtmtypes("sgmnt_addrs",43,"len")=8
 	Set gtmtypes("sgmnt_addrs",43,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_dsk_read")=43
-	Set gtmtypes("sgmnt_addrs",44,"name")="sgmnt_addrs.gvstats_rec.n_dsk_write"
-	Set gtmtypes("sgmnt_addrs",44,"off")=204
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.db_curr_tn")=43
+	Set gtmtypes("sgmnt_addrs",44,"name")="sgmnt_addrs.gvstats_rec.n_dsk_read"
+	Set gtmtypes("sgmnt_addrs",44,"off")=200
 	Set gtmtypes("sgmnt_addrs",44,"len")=8
 	Set gtmtypes("sgmnt_addrs",44,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_dsk_write")=44
-	Set gtmtypes("sgmnt_addrs",45,"name")="sgmnt_addrs.gvstats_rec.n_nontp_readwrite"
-	Set gtmtypes("sgmnt_addrs",45,"off")=212
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_dsk_read")=44
+	Set gtmtypes("sgmnt_addrs",45,"name")="sgmnt_addrs.gvstats_rec.n_dsk_write"
+	Set gtmtypes("sgmnt_addrs",45,"off")=208
 	Set gtmtypes("sgmnt_addrs",45,"len")=8
 	Set gtmtypes("sgmnt_addrs",45,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_nontp_readwrite")=45
-	Set gtmtypes("sgmnt_addrs",46,"name")="sgmnt_addrs.gvstats_rec.n_nontp_readonly"
-	Set gtmtypes("sgmnt_addrs",46,"off")=220
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_dsk_write")=45
+	Set gtmtypes("sgmnt_addrs",46,"name")="sgmnt_addrs.gvstats_rec.n_nontp_readwrite"
+	Set gtmtypes("sgmnt_addrs",46,"off")=216
 	Set gtmtypes("sgmnt_addrs",46,"len")=8
 	Set gtmtypes("sgmnt_addrs",46,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_nontp_readonly")=46
-	Set gtmtypes("sgmnt_addrs",47,"name")="sgmnt_addrs.gvstats_rec.n_nontp_blkwrite"
-	Set gtmtypes("sgmnt_addrs",47,"off")=228
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_nontp_readwrite")=46
+	Set gtmtypes("sgmnt_addrs",47,"name")="sgmnt_addrs.gvstats_rec.n_nontp_readonly"
+	Set gtmtypes("sgmnt_addrs",47,"off")=224
 	Set gtmtypes("sgmnt_addrs",47,"len")=8
 	Set gtmtypes("sgmnt_addrs",47,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_nontp_blkwrite")=47
-	Set gtmtypes("sgmnt_addrs",48,"name")="sgmnt_addrs.gvstats_rec.n_nontp_blkread"
-	Set gtmtypes("sgmnt_addrs",48,"off")=236
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_nontp_readonly")=47
+	Set gtmtypes("sgmnt_addrs",48,"name")="sgmnt_addrs.gvstats_rec.n_nontp_blkwrite"
+	Set gtmtypes("sgmnt_addrs",48,"off")=232
 	Set gtmtypes("sgmnt_addrs",48,"len")=8
 	Set gtmtypes("sgmnt_addrs",48,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_nontp_blkread")=48
-	Set gtmtypes("sgmnt_addrs",49,"name")="sgmnt_addrs.gvstats_rec.n_nontp_retries_0"
-	Set gtmtypes("sgmnt_addrs",49,"off")=244
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_nontp_blkwrite")=48
+	Set gtmtypes("sgmnt_addrs",49,"name")="sgmnt_addrs.gvstats_rec.n_nontp_blkread"
+	Set gtmtypes("sgmnt_addrs",49,"off")=240
 	Set gtmtypes("sgmnt_addrs",49,"len")=8
 	Set gtmtypes("sgmnt_addrs",49,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_nontp_retries_0")=49
-	Set gtmtypes("sgmnt_addrs",50,"name")="sgmnt_addrs.gvstats_rec.n_nontp_retries_1"
-	Set gtmtypes("sgmnt_addrs",50,"off")=252
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_nontp_blkread")=49
+	Set gtmtypes("sgmnt_addrs",50,"name")="sgmnt_addrs.gvstats_rec.n_nontp_retries_0"
+	Set gtmtypes("sgmnt_addrs",50,"off")=248
 	Set gtmtypes("sgmnt_addrs",50,"len")=8
 	Set gtmtypes("sgmnt_addrs",50,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_nontp_retries_1")=50
-	Set gtmtypes("sgmnt_addrs",51,"name")="sgmnt_addrs.gvstats_rec.n_nontp_retries_2"
-	Set gtmtypes("sgmnt_addrs",51,"off")=260
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_nontp_retries_0")=50
+	Set gtmtypes("sgmnt_addrs",51,"name")="sgmnt_addrs.gvstats_rec.n_nontp_retries_1"
+	Set gtmtypes("sgmnt_addrs",51,"off")=256
 	Set gtmtypes("sgmnt_addrs",51,"len")=8
 	Set gtmtypes("sgmnt_addrs",51,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_nontp_retries_2")=51
-	Set gtmtypes("sgmnt_addrs",52,"name")="sgmnt_addrs.gvstats_rec.n_nontp_retries_3"
-	Set gtmtypes("sgmnt_addrs",52,"off")=268
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_nontp_retries_1")=51
+	Set gtmtypes("sgmnt_addrs",52,"name")="sgmnt_addrs.gvstats_rec.n_nontp_retries_2"
+	Set gtmtypes("sgmnt_addrs",52,"off")=264
 	Set gtmtypes("sgmnt_addrs",52,"len")=8
 	Set gtmtypes("sgmnt_addrs",52,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_nontp_retries_3")=52
-	Set gtmtypes("sgmnt_addrs",53,"name")="sgmnt_addrs.gvstats_rec.n_tp_readwrite"
-	Set gtmtypes("sgmnt_addrs",53,"off")=276
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_nontp_retries_2")=52
+	Set gtmtypes("sgmnt_addrs",53,"name")="sgmnt_addrs.gvstats_rec.n_nontp_retries_3"
+	Set gtmtypes("sgmnt_addrs",53,"off")=272
 	Set gtmtypes("sgmnt_addrs",53,"len")=8
 	Set gtmtypes("sgmnt_addrs",53,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_readwrite")=53
-	Set gtmtypes("sgmnt_addrs",54,"name")="sgmnt_addrs.gvstats_rec.n_tp_readonly"
-	Set gtmtypes("sgmnt_addrs",54,"off")=284
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_nontp_retries_3")=53
+	Set gtmtypes("sgmnt_addrs",54,"name")="sgmnt_addrs.gvstats_rec.n_tp_readwrite"
+	Set gtmtypes("sgmnt_addrs",54,"off")=280
 	Set gtmtypes("sgmnt_addrs",54,"len")=8
 	Set gtmtypes("sgmnt_addrs",54,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_readonly")=54
-	Set gtmtypes("sgmnt_addrs",55,"name")="sgmnt_addrs.gvstats_rec.n_tp_rolledback"
-	Set gtmtypes("sgmnt_addrs",55,"off")=292
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_readwrite")=54
+	Set gtmtypes("sgmnt_addrs",55,"name")="sgmnt_addrs.gvstats_rec.n_tp_readonly"
+	Set gtmtypes("sgmnt_addrs",55,"off")=288
 	Set gtmtypes("sgmnt_addrs",55,"len")=8
 	Set gtmtypes("sgmnt_addrs",55,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_rolledback")=55
-	Set gtmtypes("sgmnt_addrs",56,"name")="sgmnt_addrs.gvstats_rec.n_tp_blkwrite"
-	Set gtmtypes("sgmnt_addrs",56,"off")=300
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_readonly")=55
+	Set gtmtypes("sgmnt_addrs",56,"name")="sgmnt_addrs.gvstats_rec.n_tp_rolledback"
+	Set gtmtypes("sgmnt_addrs",56,"off")=296
 	Set gtmtypes("sgmnt_addrs",56,"len")=8
 	Set gtmtypes("sgmnt_addrs",56,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_blkwrite")=56
-	Set gtmtypes("sgmnt_addrs",57,"name")="sgmnt_addrs.gvstats_rec.n_tp_blkread"
-	Set gtmtypes("sgmnt_addrs",57,"off")=308
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_rolledback")=56
+	Set gtmtypes("sgmnt_addrs",57,"name")="sgmnt_addrs.gvstats_rec.n_tp_blkwrite"
+	Set gtmtypes("sgmnt_addrs",57,"off")=304
 	Set gtmtypes("sgmnt_addrs",57,"len")=8
 	Set gtmtypes("sgmnt_addrs",57,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_blkread")=57
-	Set gtmtypes("sgmnt_addrs",58,"name")="sgmnt_addrs.gvstats_rec.n_tp_tot_retries_0"
-	Set gtmtypes("sgmnt_addrs",58,"off")=316
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_blkwrite")=57
+	Set gtmtypes("sgmnt_addrs",58,"name")="sgmnt_addrs.gvstats_rec.n_tp_blkread"
+	Set gtmtypes("sgmnt_addrs",58,"off")=312
 	Set gtmtypes("sgmnt_addrs",58,"len")=8
 	Set gtmtypes("sgmnt_addrs",58,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_tot_retries_0")=58
-	Set gtmtypes("sgmnt_addrs",59,"name")="sgmnt_addrs.gvstats_rec.n_tp_tot_retries_1"
-	Set gtmtypes("sgmnt_addrs",59,"off")=324
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_blkread")=58
+	Set gtmtypes("sgmnt_addrs",59,"name")="sgmnt_addrs.gvstats_rec.n_tp_tot_retries_0"
+	Set gtmtypes("sgmnt_addrs",59,"off")=320
 	Set gtmtypes("sgmnt_addrs",59,"len")=8
 	Set gtmtypes("sgmnt_addrs",59,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_tot_retries_1")=59
-	Set gtmtypes("sgmnt_addrs",60,"name")="sgmnt_addrs.gvstats_rec.n_tp_tot_retries_2"
-	Set gtmtypes("sgmnt_addrs",60,"off")=332
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_tot_retries_0")=59
+	Set gtmtypes("sgmnt_addrs",60,"name")="sgmnt_addrs.gvstats_rec.n_tp_tot_retries_1"
+	Set gtmtypes("sgmnt_addrs",60,"off")=328
 	Set gtmtypes("sgmnt_addrs",60,"len")=8
 	Set gtmtypes("sgmnt_addrs",60,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_tot_retries_2")=60
-	Set gtmtypes("sgmnt_addrs",61,"name")="sgmnt_addrs.gvstats_rec.n_tp_tot_retries_3"
-	Set gtmtypes("sgmnt_addrs",61,"off")=340
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_tot_retries_1")=60
+	Set gtmtypes("sgmnt_addrs",61,"name")="sgmnt_addrs.gvstats_rec.n_tp_tot_retries_2"
+	Set gtmtypes("sgmnt_addrs",61,"off")=336
 	Set gtmtypes("sgmnt_addrs",61,"len")=8
 	Set gtmtypes("sgmnt_addrs",61,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_tot_retries_3")=61
-	Set gtmtypes("sgmnt_addrs",62,"name")="sgmnt_addrs.gvstats_rec.n_tp_tot_retries_4"
-	Set gtmtypes("sgmnt_addrs",62,"off")=348
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_tot_retries_2")=61
+	Set gtmtypes("sgmnt_addrs",62,"name")="sgmnt_addrs.gvstats_rec.n_tp_tot_retries_3"
+	Set gtmtypes("sgmnt_addrs",62,"off")=344
 	Set gtmtypes("sgmnt_addrs",62,"len")=8
 	Set gtmtypes("sgmnt_addrs",62,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_tot_retries_4")=62
-	Set gtmtypes("sgmnt_addrs",63,"name")="sgmnt_addrs.gvstats_rec.n_tp_cnflct_retries_0"
-	Set gtmtypes("sgmnt_addrs",63,"off")=356
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_tot_retries_3")=62
+	Set gtmtypes("sgmnt_addrs",63,"name")="sgmnt_addrs.gvstats_rec.n_tp_tot_retries_4"
+	Set gtmtypes("sgmnt_addrs",63,"off")=352
 	Set gtmtypes("sgmnt_addrs",63,"len")=8
 	Set gtmtypes("sgmnt_addrs",63,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_cnflct_retries_0")=63
-	Set gtmtypes("sgmnt_addrs",64,"name")="sgmnt_addrs.gvstats_rec.n_tp_cnflct_retries_1"
-	Set gtmtypes("sgmnt_addrs",64,"off")=364
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_tot_retries_4")=63
+	Set gtmtypes("sgmnt_addrs",64,"name")="sgmnt_addrs.gvstats_rec.n_tp_cnflct_retries_0"
+	Set gtmtypes("sgmnt_addrs",64,"off")=360
 	Set gtmtypes("sgmnt_addrs",64,"len")=8
 	Set gtmtypes("sgmnt_addrs",64,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_cnflct_retries_1")=64
-	Set gtmtypes("sgmnt_addrs",65,"name")="sgmnt_addrs.gvstats_rec.n_tp_cnflct_retries_2"
-	Set gtmtypes("sgmnt_addrs",65,"off")=372
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_cnflct_retries_0")=64
+	Set gtmtypes("sgmnt_addrs",65,"name")="sgmnt_addrs.gvstats_rec.n_tp_cnflct_retries_1"
+	Set gtmtypes("sgmnt_addrs",65,"off")=368
 	Set gtmtypes("sgmnt_addrs",65,"len")=8
 	Set gtmtypes("sgmnt_addrs",65,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_cnflct_retries_2")=65
-	Set gtmtypes("sgmnt_addrs",66,"name")="sgmnt_addrs.gvstats_rec.n_tp_cnflct_retries_3"
-	Set gtmtypes("sgmnt_addrs",66,"off")=380
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_cnflct_retries_1")=65
+	Set gtmtypes("sgmnt_addrs",66,"name")="sgmnt_addrs.gvstats_rec.n_tp_cnflct_retries_2"
+	Set gtmtypes("sgmnt_addrs",66,"off")=376
 	Set gtmtypes("sgmnt_addrs",66,"len")=8
 	Set gtmtypes("sgmnt_addrs",66,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_cnflct_retries_3")=66
-	Set gtmtypes("sgmnt_addrs",67,"name")="sgmnt_addrs.gvstats_rec.n_tp_cnflct_retries_4"
-	Set gtmtypes("sgmnt_addrs",67,"off")=388
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_cnflct_retries_2")=66
+	Set gtmtypes("sgmnt_addrs",67,"name")="sgmnt_addrs.gvstats_rec.n_tp_cnflct_retries_3"
+	Set gtmtypes("sgmnt_addrs",67,"off")=384
 	Set gtmtypes("sgmnt_addrs",67,"len")=8
 	Set gtmtypes("sgmnt_addrs",67,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_cnflct_retries_4")=67
-	Set gtmtypes("sgmnt_addrs",68,"name")="sgmnt_addrs.gvstats_rec.n_ztrigger"
-	Set gtmtypes("sgmnt_addrs",68,"off")=396
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_cnflct_retries_3")=67
+	Set gtmtypes("sgmnt_addrs",68,"name")="sgmnt_addrs.gvstats_rec.n_tp_cnflct_retries_4"
+	Set gtmtypes("sgmnt_addrs",68,"off")=392
 	Set gtmtypes("sgmnt_addrs",68,"len")=8
 	Set gtmtypes("sgmnt_addrs",68,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_ztrigger")=68
-	Set gtmtypes("sgmnt_addrs",69,"name")="sgmnt_addrs.gvstats_rec.n_db_flush"
-	Set gtmtypes("sgmnt_addrs",69,"off")=404
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_cnflct_retries_4")=68
+	Set gtmtypes("sgmnt_addrs",69,"name")="sgmnt_addrs.gvstats_rec.n_ztrigger"
+	Set gtmtypes("sgmnt_addrs",69,"off")=400
 	Set gtmtypes("sgmnt_addrs",69,"len")=8
 	Set gtmtypes("sgmnt_addrs",69,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_db_flush")=69
-	Set gtmtypes("sgmnt_addrs",70,"name")="sgmnt_addrs.gvstats_rec.n_db_fsync"
-	Set gtmtypes("sgmnt_addrs",70,"off")=412
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_ztrigger")=69
+	Set gtmtypes("sgmnt_addrs",70,"name")="sgmnt_addrs.gvstats_rec.n_db_flush"
+	Set gtmtypes("sgmnt_addrs",70,"off")=408
 	Set gtmtypes("sgmnt_addrs",70,"len")=8
 	Set gtmtypes("sgmnt_addrs",70,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_db_fsync")=70
-	Set gtmtypes("sgmnt_addrs",71,"name")="sgmnt_addrs.gvstats_rec.n_jnl_flush"
-	Set gtmtypes("sgmnt_addrs",71,"off")=420
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_db_flush")=70
+	Set gtmtypes("sgmnt_addrs",71,"name")="sgmnt_addrs.gvstats_rec.n_db_fsync"
+	Set gtmtypes("sgmnt_addrs",71,"off")=416
 	Set gtmtypes("sgmnt_addrs",71,"len")=8
 	Set gtmtypes("sgmnt_addrs",71,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jnl_flush")=71
-	Set gtmtypes("sgmnt_addrs",72,"name")="sgmnt_addrs.gvstats_rec.n_jnl_fsync"
-	Set gtmtypes("sgmnt_addrs",72,"off")=428
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_db_fsync")=71
+	Set gtmtypes("sgmnt_addrs",72,"name")="sgmnt_addrs.gvstats_rec.n_jnl_flush"
+	Set gtmtypes("sgmnt_addrs",72,"off")=424
 	Set gtmtypes("sgmnt_addrs",72,"len")=8
 	Set gtmtypes("sgmnt_addrs",72,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jnl_fsync")=72
-	Set gtmtypes("sgmnt_addrs",73,"name")="sgmnt_addrs.gvstats_rec.n_jbuff_bytes"
-	Set gtmtypes("sgmnt_addrs",73,"off")=436
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jnl_flush")=72
+	Set gtmtypes("sgmnt_addrs",73,"name")="sgmnt_addrs.gvstats_rec.n_jnl_fsync"
+	Set gtmtypes("sgmnt_addrs",73,"off")=432
 	Set gtmtypes("sgmnt_addrs",73,"len")=8
 	Set gtmtypes("sgmnt_addrs",73,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jbuff_bytes")=73
-	Set gtmtypes("sgmnt_addrs",74,"name")="sgmnt_addrs.gvstats_rec.n_jfile_bytes"
-	Set gtmtypes("sgmnt_addrs",74,"off")=444
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jnl_fsync")=73
+	Set gtmtypes("sgmnt_addrs",74,"name")="sgmnt_addrs.gvstats_rec.n_jbuff_bytes"
+	Set gtmtypes("sgmnt_addrs",74,"off")=440
 	Set gtmtypes("sgmnt_addrs",74,"len")=8
 	Set gtmtypes("sgmnt_addrs",74,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jfile_bytes")=74
-	Set gtmtypes("sgmnt_addrs",75,"name")="sgmnt_addrs.gvstats_rec.n_jfile_writes"
-	Set gtmtypes("sgmnt_addrs",75,"off")=452
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jbuff_bytes")=74
+	Set gtmtypes("sgmnt_addrs",75,"name")="sgmnt_addrs.gvstats_rec.n_jfile_bytes"
+	Set gtmtypes("sgmnt_addrs",75,"off")=448
 	Set gtmtypes("sgmnt_addrs",75,"len")=8
 	Set gtmtypes("sgmnt_addrs",75,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jfile_writes")=75
-	Set gtmtypes("sgmnt_addrs",76,"name")="sgmnt_addrs.gvstats_rec.n_jrec_logical"
-	Set gtmtypes("sgmnt_addrs",76,"off")=460
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jfile_bytes")=75
+	Set gtmtypes("sgmnt_addrs",76,"name")="sgmnt_addrs.gvstats_rec.n_jfile_writes"
+	Set gtmtypes("sgmnt_addrs",76,"off")=456
 	Set gtmtypes("sgmnt_addrs",76,"len")=8
 	Set gtmtypes("sgmnt_addrs",76,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jrec_logical")=76
-	Set gtmtypes("sgmnt_addrs",77,"name")="sgmnt_addrs.gvstats_rec.n_jrec_pblk"
-	Set gtmtypes("sgmnt_addrs",77,"off")=468
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jfile_writes")=76
+	Set gtmtypes("sgmnt_addrs",77,"name")="sgmnt_addrs.gvstats_rec.n_jrec_logical"
+	Set gtmtypes("sgmnt_addrs",77,"off")=464
 	Set gtmtypes("sgmnt_addrs",77,"len")=8
 	Set gtmtypes("sgmnt_addrs",77,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jrec_pblk")=77
-	Set gtmtypes("sgmnt_addrs",78,"name")="sgmnt_addrs.gvstats_rec.n_jrec_epoch_regular"
-	Set gtmtypes("sgmnt_addrs",78,"off")=476
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jrec_logical")=77
+	Set gtmtypes("sgmnt_addrs",78,"name")="sgmnt_addrs.gvstats_rec.n_jrec_pblk"
+	Set gtmtypes("sgmnt_addrs",78,"off")=472
 	Set gtmtypes("sgmnt_addrs",78,"len")=8
 	Set gtmtypes("sgmnt_addrs",78,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jrec_epoch_regular")=78
-	Set gtmtypes("sgmnt_addrs",79,"name")="sgmnt_addrs.gvstats_rec.n_jrec_epoch_idle"
-	Set gtmtypes("sgmnt_addrs",79,"off")=484
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jrec_pblk")=78
+	Set gtmtypes("sgmnt_addrs",79,"name")="sgmnt_addrs.gvstats_rec.n_jrec_epoch_regular"
+	Set gtmtypes("sgmnt_addrs",79,"off")=480
 	Set gtmtypes("sgmnt_addrs",79,"len")=8
 	Set gtmtypes("sgmnt_addrs",79,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jrec_epoch_idle")=79
-	Set gtmtypes("sgmnt_addrs",80,"name")="sgmnt_addrs.gvstats_rec.n_jrec_other"
-	Set gtmtypes("sgmnt_addrs",80,"off")=492
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jrec_epoch_regular")=79
+	Set gtmtypes("sgmnt_addrs",80,"name")="sgmnt_addrs.gvstats_rec.n_jrec_epoch_idle"
+	Set gtmtypes("sgmnt_addrs",80,"off")=488
 	Set gtmtypes("sgmnt_addrs",80,"len")=8
 	Set gtmtypes("sgmnt_addrs",80,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jrec_other")=80
-	Set gtmtypes("sgmnt_addrs",81,"name")="sgmnt_addrs.gvstats_rec.n_jnl_extends"
-	Set gtmtypes("sgmnt_addrs",81,"off")=500
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jrec_epoch_idle")=80
+	Set gtmtypes("sgmnt_addrs",81,"name")="sgmnt_addrs.gvstats_rec.n_jrec_other"
+	Set gtmtypes("sgmnt_addrs",81,"off")=496
 	Set gtmtypes("sgmnt_addrs",81,"len")=8
 	Set gtmtypes("sgmnt_addrs",81,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jnl_extends")=81
-	Set gtmtypes("sgmnt_addrs",82,"name")="sgmnt_addrs.gvstats_rec.n_db_extends"
-	Set gtmtypes("sgmnt_addrs",82,"off")=508
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jrec_other")=81
+	Set gtmtypes("sgmnt_addrs",82,"name")="sgmnt_addrs.gvstats_rec.n_jnl_extends"
+	Set gtmtypes("sgmnt_addrs",82,"off")=504
 	Set gtmtypes("sgmnt_addrs",82,"len")=8
 	Set gtmtypes("sgmnt_addrs",82,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_db_extends")=82
-	Set gtmtypes("sgmnt_addrs",83,"name")="sgmnt_addrs.gvstats_rec.n_crit_success"
-	Set gtmtypes("sgmnt_addrs",83,"off")=516
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jnl_extends")=82
+	Set gtmtypes("sgmnt_addrs",83,"name")="sgmnt_addrs.gvstats_rec.n_db_extends"
+	Set gtmtypes("sgmnt_addrs",83,"off")=512
 	Set gtmtypes("sgmnt_addrs",83,"len")=8
 	Set gtmtypes("sgmnt_addrs",83,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_crit_success")=83
-	Set gtmtypes("sgmnt_addrs",84,"name")="sgmnt_addrs.gvstats_rec.n_crits_in_epch"
-	Set gtmtypes("sgmnt_addrs",84,"off")=524
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_db_extends")=83
+	Set gtmtypes("sgmnt_addrs",84,"name")="sgmnt_addrs.gvstats_rec.n_crit_success"
+	Set gtmtypes("sgmnt_addrs",84,"off")=520
 	Set gtmtypes("sgmnt_addrs",84,"len")=8
 	Set gtmtypes("sgmnt_addrs",84,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_crits_in_epch")=84
-	Set gtmtypes("sgmnt_addrs",85,"name")="sgmnt_addrs.gvstats_rec.sq_crit_failed"
-	Set gtmtypes("sgmnt_addrs",85,"off")=532
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_crit_success")=84
+	Set gtmtypes("sgmnt_addrs",85,"name")="sgmnt_addrs.gvstats_rec.n_crits_in_epch"
+	Set gtmtypes("sgmnt_addrs",85,"off")=528
 	Set gtmtypes("sgmnt_addrs",85,"len")=8
 	Set gtmtypes("sgmnt_addrs",85,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.sq_crit_failed")=85
-	Set gtmtypes("sgmnt_addrs",86,"name")="sgmnt_addrs.gvstats_rec.n_crit_failed"
-	Set gtmtypes("sgmnt_addrs",86,"off")=540
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_crits_in_epch")=85
+	Set gtmtypes("sgmnt_addrs",86,"name")="sgmnt_addrs.gvstats_rec.sq_crit_failed"
+	Set gtmtypes("sgmnt_addrs",86,"off")=536
 	Set gtmtypes("sgmnt_addrs",86,"len")=8
 	Set gtmtypes("sgmnt_addrs",86,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_crit_failed")=86
-	Set gtmtypes("sgmnt_addrs",87,"name")="sgmnt_addrs.gvstats_rec.sq_crit_que_slps"
-	Set gtmtypes("sgmnt_addrs",87,"off")=548
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.sq_crit_failed")=86
+	Set gtmtypes("sgmnt_addrs",87,"name")="sgmnt_addrs.gvstats_rec.n_crit_failed"
+	Set gtmtypes("sgmnt_addrs",87,"off")=544
 	Set gtmtypes("sgmnt_addrs",87,"len")=8
 	Set gtmtypes("sgmnt_addrs",87,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.sq_crit_que_slps")=87
-	Set gtmtypes("sgmnt_addrs",88,"name")="sgmnt_addrs.gvstats_rec.n_crit_que_slps"
-	Set gtmtypes("sgmnt_addrs",88,"off")=556
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_crit_failed")=87
+	Set gtmtypes("sgmnt_addrs",88,"name")="sgmnt_addrs.gvstats_rec.sq_crit_que_slps"
+	Set gtmtypes("sgmnt_addrs",88,"off")=552
 	Set gtmtypes("sgmnt_addrs",88,"len")=8
 	Set gtmtypes("sgmnt_addrs",88,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_crit_que_slps")=88
-	Set gtmtypes("sgmnt_addrs",89,"name")="sgmnt_addrs.gvstats_rec.sq_crit_yields"
-	Set gtmtypes("sgmnt_addrs",89,"off")=564
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.sq_crit_que_slps")=88
+	Set gtmtypes("sgmnt_addrs",89,"name")="sgmnt_addrs.gvstats_rec.n_crit_que_slps"
+	Set gtmtypes("sgmnt_addrs",89,"off")=560
 	Set gtmtypes("sgmnt_addrs",89,"len")=8
 	Set gtmtypes("sgmnt_addrs",89,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.sq_crit_yields")=89
-	Set gtmtypes("sgmnt_addrs",90,"name")="sgmnt_addrs.gvstats_rec.n_crit_yields"
-	Set gtmtypes("sgmnt_addrs",90,"off")=572
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_crit_que_slps")=89
+	Set gtmtypes("sgmnt_addrs",90,"name")="sgmnt_addrs.gvstats_rec.sq_crit_yields"
+	Set gtmtypes("sgmnt_addrs",90,"off")=568
 	Set gtmtypes("sgmnt_addrs",90,"len")=8
 	Set gtmtypes("sgmnt_addrs",90,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_crit_yields")=90
-	Set gtmtypes("sgmnt_addrs",91,"name")="sgmnt_addrs.dbsync_timer_tn"
-	Set gtmtypes("sgmnt_addrs",91,"off")=580
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.sq_crit_yields")=90
+	Set gtmtypes("sgmnt_addrs",91,"name")="sgmnt_addrs.gvstats_rec.n_crit_yields"
+	Set gtmtypes("sgmnt_addrs",91,"off")=576
 	Set gtmtypes("sgmnt_addrs",91,"len")=8
 	Set gtmtypes("sgmnt_addrs",91,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","dbsync_timer_tn")=91
-	Set gtmtypes("sgmnt_addrs",92,"name")="sgmnt_addrs.fullblockwrite_len"
-	Set gtmtypes("sgmnt_addrs",92,"off")=588
-	Set gtmtypes("sgmnt_addrs",92,"len")=4
-	Set gtmtypes("sgmnt_addrs",92,"type")="size_t"
-	Set gtmtypfldindx("sgmnt_addrs","fullblockwrite_len")=92
-	Set gtmtypes("sgmnt_addrs",93,"name")="sgmnt_addrs.total_blks"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_crit_yields")=91
+	Set gtmtypes("sgmnt_addrs",92,"name")="sgmnt_addrs.gvstats_rec.n_clean2dirty"
+	Set gtmtypes("sgmnt_addrs",92,"off")=584
+	Set gtmtypes("sgmnt_addrs",92,"len")=8
+	Set gtmtypes("sgmnt_addrs",92,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_clean2dirty")=92
+	Set gtmtypes("sgmnt_addrs",93,"name")="sgmnt_addrs.dbsync_timer_tn"
 	Set gtmtypes("sgmnt_addrs",93,"off")=592
-	Set gtmtypes("sgmnt_addrs",93,"len")=4
-	Set gtmtypes("sgmnt_addrs",93,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_addrs","total_blks")=93
-	Set gtmtypes("sgmnt_addrs",94,"name")="sgmnt_addrs.prev_free_blks"
-	Set gtmtypes("sgmnt_addrs",94,"off")=596
+	Set gtmtypes("sgmnt_addrs",93,"len")=8
+	Set gtmtypes("sgmnt_addrs",93,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_addrs","dbsync_timer_tn")=93
+	Set gtmtypes("sgmnt_addrs",94,"name")="sgmnt_addrs.our_midnite"
+	Set gtmtypes("sgmnt_addrs",94,"off")=600
 	Set gtmtypes("sgmnt_addrs",94,"len")=4
-	Set gtmtypes("sgmnt_addrs",94,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_addrs","prev_free_blks")=94
-	Set gtmtypes("sgmnt_addrs",95,"name")="sgmnt_addrs.timer"
-	Set gtmtypes("sgmnt_addrs",95,"off")=600
+	Set gtmtypes("sgmnt_addrs",94,"type")="addr"
+	Set gtmtypfldindx("sgmnt_addrs","our_midnite")=94
+	Set gtmtypes("sgmnt_addrs",95,"name")="sgmnt_addrs.fullblockwrite_len"
+	Set gtmtypes("sgmnt_addrs",95,"off")=604
 	Set gtmtypes("sgmnt_addrs",95,"len")=4
-	Set gtmtypes("sgmnt_addrs",95,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_addrs","timer")=95
-	Set gtmtypes("sgmnt_addrs",96,"name")="sgmnt_addrs.in_wtstart"
-	Set gtmtypes("sgmnt_addrs",96,"off")=604
+	Set gtmtypes("sgmnt_addrs",95,"type")="size_t"
+	Set gtmtypfldindx("sgmnt_addrs","fullblockwrite_len")=95
+	Set gtmtypes("sgmnt_addrs",96,"name")="sgmnt_addrs.our_lru_cache_rec_off"
+	Set gtmtypes("sgmnt_addrs",96,"off")=608
 	Set gtmtypes("sgmnt_addrs",96,"len")=4
-	Set gtmtypes("sgmnt_addrs",96,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_addrs","in_wtstart")=96
-	Set gtmtypes("sgmnt_addrs",97,"name")="sgmnt_addrs.now_crit"
-	Set gtmtypes("sgmnt_addrs",97,"off")=608
+	Set gtmtypes("sgmnt_addrs",96,"type")="intptr_t"
+	Set gtmtypfldindx("sgmnt_addrs","our_lru_cache_rec_off")=96
+	Set gtmtypes("sgmnt_addrs",97,"name")="sgmnt_addrs.total_blks"
+	Set gtmtypes("sgmnt_addrs",97,"off")=612
 	Set gtmtypes("sgmnt_addrs",97,"len")=4
 	Set gtmtypes("sgmnt_addrs",97,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_addrs","now_crit")=97
-	Set gtmtypes("sgmnt_addrs",98,"name")="sgmnt_addrs.wbuf_dqd"
-	Set gtmtypes("sgmnt_addrs",98,"off")=612
+	Set gtmtypfldindx("sgmnt_addrs","total_blks")=97
+	Set gtmtypes("sgmnt_addrs",98,"name")="sgmnt_addrs.prev_free_blks"
+	Set gtmtypes("sgmnt_addrs",98,"off")=616
 	Set gtmtypes("sgmnt_addrs",98,"len")=4
 	Set gtmtypes("sgmnt_addrs",98,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_addrs","wbuf_dqd")=98
-	Set gtmtypes("sgmnt_addrs",99,"name")="sgmnt_addrs.stale_defer"
-	Set gtmtypes("sgmnt_addrs",99,"off")=616
+	Set gtmtypfldindx("sgmnt_addrs","prev_free_blks")=98
+	Set gtmtypes("sgmnt_addrs",99,"name")="sgmnt_addrs.timer"
+	Set gtmtypes("sgmnt_addrs",99,"off")=620
 	Set gtmtypes("sgmnt_addrs",99,"len")=4
 	Set gtmtypes("sgmnt_addrs",99,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_addrs","stale_defer")=99
-	Set gtmtypes("sgmnt_addrs",100,"name")="sgmnt_addrs.freeze"
-	Set gtmtypes("sgmnt_addrs",100,"off")=620
+	Set gtmtypfldindx("sgmnt_addrs","timer")=99
+	Set gtmtypes("sgmnt_addrs",100,"name")="sgmnt_addrs.in_wtstart"
+	Set gtmtypes("sgmnt_addrs",100,"off")=624
 	Set gtmtypes("sgmnt_addrs",100,"len")=4
-	Set gtmtypes("sgmnt_addrs",100,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_addrs","freeze")=100
-	Set gtmtypes("sgmnt_addrs",101,"name")="sgmnt_addrs.dbsync_timer"
-	Set gtmtypes("sgmnt_addrs",101,"off")=624
+	Set gtmtypes("sgmnt_addrs",100,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_addrs","in_wtstart")=100
+	Set gtmtypes("sgmnt_addrs",101,"name")="sgmnt_addrs.now_crit"
+	Set gtmtypes("sgmnt_addrs",101,"off")=628
 	Set gtmtypes("sgmnt_addrs",101,"len")=4
-	Set gtmtypes("sgmnt_addrs",101,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_addrs","dbsync_timer")=101
-	Set gtmtypes("sgmnt_addrs",102,"name")="sgmnt_addrs.reorg_last_dest"
-	Set gtmtypes("sgmnt_addrs",102,"off")=628
+	Set gtmtypes("sgmnt_addrs",101,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_addrs","now_crit")=101
+	Set gtmtypes("sgmnt_addrs",102,"name")="sgmnt_addrs.wbuf_dqd"
+	Set gtmtypes("sgmnt_addrs",102,"off")=632
 	Set gtmtypes("sgmnt_addrs",102,"len")=4
-	Set gtmtypes("sgmnt_addrs",102,"type")="int"
-	Set gtmtypfldindx("sgmnt_addrs","reorg_last_dest")=102
-	Set gtmtypes("sgmnt_addrs",103,"name")="sgmnt_addrs.jnl_before_image"
-	Set gtmtypes("sgmnt_addrs",103,"off")=632
+	Set gtmtypes("sgmnt_addrs",102,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_addrs","wbuf_dqd")=102
+	Set gtmtypes("sgmnt_addrs",103,"name")="sgmnt_addrs.stale_defer"
+	Set gtmtypes("sgmnt_addrs",103,"off")=636
 	Set gtmtypes("sgmnt_addrs",103,"len")=4
-	Set gtmtypes("sgmnt_addrs",103,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_addrs","jnl_before_image")=103
-	Set gtmtypes("sgmnt_addrs",104,"name")="sgmnt_addrs.read_write"
-	Set gtmtypes("sgmnt_addrs",104,"off")=636
+	Set gtmtypes("sgmnt_addrs",103,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_addrs","stale_defer")=103
+	Set gtmtypes("sgmnt_addrs",104,"name")="sgmnt_addrs.freeze"
+	Set gtmtypes("sgmnt_addrs",104,"off")=640
 	Set gtmtypes("sgmnt_addrs",104,"len")=4
 	Set gtmtypes("sgmnt_addrs",104,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_addrs","read_write")=104
-	Set gtmtypes("sgmnt_addrs",105,"name")="sgmnt_addrs.persistent_freeze"
-	Set gtmtypes("sgmnt_addrs",105,"off")=640
+	Set gtmtypfldindx("sgmnt_addrs","freeze")=104
+	Set gtmtypes("sgmnt_addrs",105,"name")="sgmnt_addrs.dbsync_timer"
+	Set gtmtypes("sgmnt_addrs",105,"off")=644
 	Set gtmtypes("sgmnt_addrs",105,"len")=4
 	Set gtmtypes("sgmnt_addrs",105,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_addrs","persistent_freeze")=105
-	Set gtmtypes("sgmnt_addrs",106,"name")="sgmnt_addrs.pblk_align_jrecsize"
-	Set gtmtypes("sgmnt_addrs",106,"off")=644
+	Set gtmtypfldindx("sgmnt_addrs","dbsync_timer")=105
+	Set gtmtypes("sgmnt_addrs",106,"name")="sgmnt_addrs.reorg_last_dest"
+	Set gtmtypes("sgmnt_addrs",106,"off")=648
 	Set gtmtypes("sgmnt_addrs",106,"len")=4
 	Set gtmtypes("sgmnt_addrs",106,"type")="int"
-	Set gtmtypfldindx("sgmnt_addrs","pblk_align_jrecsize")=106
-	Set gtmtypes("sgmnt_addrs",107,"name")="sgmnt_addrs.min_total_tpjnl_rec_size"
-	Set gtmtypes("sgmnt_addrs",107,"off")=648
+	Set gtmtypfldindx("sgmnt_addrs","reorg_last_dest")=106
+	Set gtmtypes("sgmnt_addrs",107,"name")="sgmnt_addrs.jnl_before_image"
+	Set gtmtypes("sgmnt_addrs",107,"off")=652
 	Set gtmtypes("sgmnt_addrs",107,"len")=4
-	Set gtmtypes("sgmnt_addrs",107,"type")="int"
-	Set gtmtypfldindx("sgmnt_addrs","min_total_tpjnl_rec_size")=107
-	Set gtmtypes("sgmnt_addrs",108,"name")="sgmnt_addrs.min_total_nontpjnl_rec_size"
-	Set gtmtypes("sgmnt_addrs",108,"off")=652
+	Set gtmtypes("sgmnt_addrs",107,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_addrs","jnl_before_image")=107
+	Set gtmtypes("sgmnt_addrs",108,"name")="sgmnt_addrs.read_write"
+	Set gtmtypes("sgmnt_addrs",108,"off")=656
 	Set gtmtypes("sgmnt_addrs",108,"len")=4
-	Set gtmtypes("sgmnt_addrs",108,"type")="int"
-	Set gtmtypfldindx("sgmnt_addrs","min_total_nontpjnl_rec_size")=108
-	Set gtmtypes("sgmnt_addrs",109,"name")="sgmnt_addrs.jnl_state"
-	Set gtmtypes("sgmnt_addrs",109,"off")=656
+	Set gtmtypes("sgmnt_addrs",108,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_addrs","read_write")=108
+	Set gtmtypes("sgmnt_addrs",109,"name")="sgmnt_addrs.orig_read_write"
+	Set gtmtypes("sgmnt_addrs",109,"off")=660
 	Set gtmtypes("sgmnt_addrs",109,"len")=4
-	Set gtmtypes("sgmnt_addrs",109,"type")="int"
-	Set gtmtypfldindx("sgmnt_addrs","jnl_state")=109
-	Set gtmtypes("sgmnt_addrs",110,"name")="sgmnt_addrs.repl_state"
-	Set gtmtypes("sgmnt_addrs",110,"off")=660
+	Set gtmtypes("sgmnt_addrs",109,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_addrs","orig_read_write")=109
+	Set gtmtypes("sgmnt_addrs",110,"name")="sgmnt_addrs.persistent_freeze"
+	Set gtmtypes("sgmnt_addrs",110,"off")=664
 	Set gtmtypes("sgmnt_addrs",110,"len")=4
-	Set gtmtypes("sgmnt_addrs",110,"type")="int"
-	Set gtmtypfldindx("sgmnt_addrs","repl_state")=110
-	Set gtmtypes("sgmnt_addrs",111,"name")="sgmnt_addrs.crit_check_cycle"
-	Set gtmtypes("sgmnt_addrs",111,"off")=664
+	Set gtmtypes("sgmnt_addrs",110,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_addrs","persistent_freeze")=110
+	Set gtmtypes("sgmnt_addrs",111,"name")="sgmnt_addrs.pblk_align_jrecsize"
+	Set gtmtypes("sgmnt_addrs",111,"off")=668
 	Set gtmtypes("sgmnt_addrs",111,"len")=4
-	Set gtmtypes("sgmnt_addrs",111,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_addrs","crit_check_cycle")=111
-	Set gtmtypes("sgmnt_addrs",112,"name")="sgmnt_addrs.backup_in_prog"
-	Set gtmtypes("sgmnt_addrs",112,"off")=668
+	Set gtmtypes("sgmnt_addrs",111,"type")="int"
+	Set gtmtypfldindx("sgmnt_addrs","pblk_align_jrecsize")=111
+	Set gtmtypes("sgmnt_addrs",112,"name")="sgmnt_addrs.min_total_tpjnl_rec_size"
+	Set gtmtypes("sgmnt_addrs",112,"off")=672
 	Set gtmtypes("sgmnt_addrs",112,"len")=4
 	Set gtmtypes("sgmnt_addrs",112,"type")="int"
-	Set gtmtypfldindx("sgmnt_addrs","backup_in_prog")=112
-	Set gtmtypes("sgmnt_addrs",113,"name")="sgmnt_addrs.snapshot_in_prog"
-	Set gtmtypes("sgmnt_addrs",113,"off")=672
+	Set gtmtypfldindx("sgmnt_addrs","min_total_tpjnl_rec_size")=112
+	Set gtmtypes("sgmnt_addrs",113,"name")="sgmnt_addrs.min_total_nontpjnl_rec_size"
+	Set gtmtypes("sgmnt_addrs",113,"off")=676
 	Set gtmtypes("sgmnt_addrs",113,"len")=4
-	Set gtmtypes("sgmnt_addrs",113,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_addrs","snapshot_in_prog")=113
-	Set gtmtypes("sgmnt_addrs",114,"name")="sgmnt_addrs.ref_cnt"
-	Set gtmtypes("sgmnt_addrs",114,"off")=676
+	Set gtmtypes("sgmnt_addrs",113,"type")="int"
+	Set gtmtypfldindx("sgmnt_addrs","min_total_nontpjnl_rec_size")=113
+	Set gtmtypes("sgmnt_addrs",114,"name")="sgmnt_addrs.jnl_state"
+	Set gtmtypes("sgmnt_addrs",114,"off")=680
 	Set gtmtypes("sgmnt_addrs",114,"len")=4
 	Set gtmtypes("sgmnt_addrs",114,"type")="int"
-	Set gtmtypfldindx("sgmnt_addrs","ref_cnt")=114
-	Set gtmtypes("sgmnt_addrs",115,"name")="sgmnt_addrs.fid_index"
-	Set gtmtypes("sgmnt_addrs",115,"off")=680
+	Set gtmtypfldindx("sgmnt_addrs","jnl_state")=114
+	Set gtmtypes("sgmnt_addrs",115,"name")="sgmnt_addrs.repl_state"
+	Set gtmtypes("sgmnt_addrs",115,"off")=684
 	Set gtmtypes("sgmnt_addrs",115,"len")=4
 	Set gtmtypes("sgmnt_addrs",115,"type")="int"
-	Set gtmtypfldindx("sgmnt_addrs","fid_index")=115
-	Set gtmtypes("sgmnt_addrs",116,"name")="sgmnt_addrs.do_fullblockwrites"
-	Set gtmtypes("sgmnt_addrs",116,"off")=684
+	Set gtmtypfldindx("sgmnt_addrs","repl_state")=115
+	Set gtmtypes("sgmnt_addrs",116,"name")="sgmnt_addrs.crit_check_cycle"
+	Set gtmtypes("sgmnt_addrs",116,"off")=688
 	Set gtmtypes("sgmnt_addrs",116,"len")=4
-	Set gtmtypes("sgmnt_addrs",116,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_addrs","do_fullblockwrites")=116
-	Set gtmtypes("sgmnt_addrs",117,"name")="sgmnt_addrs.regnum"
-	Set gtmtypes("sgmnt_addrs",117,"off")=688
+	Set gtmtypes("sgmnt_addrs",116,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_addrs","crit_check_cycle")=116
+	Set gtmtypes("sgmnt_addrs",117,"name")="sgmnt_addrs.backup_in_prog"
+	Set gtmtypes("sgmnt_addrs",117,"off")=692
 	Set gtmtypes("sgmnt_addrs",117,"len")=4
 	Set gtmtypes("sgmnt_addrs",117,"type")="int"
-	Set gtmtypfldindx("sgmnt_addrs","regnum")=117
-	Set gtmtypes("sgmnt_addrs",118,"name")="sgmnt_addrs.n_pre_read_trigger"
-	Set gtmtypes("sgmnt_addrs",118,"off")=692
+	Set gtmtypfldindx("sgmnt_addrs","backup_in_prog")=117
+	Set gtmtypes("sgmnt_addrs",118,"name")="sgmnt_addrs.snapshot_in_prog"
+	Set gtmtypes("sgmnt_addrs",118,"off")=696
 	Set gtmtypes("sgmnt_addrs",118,"len")=4
-	Set gtmtypes("sgmnt_addrs",118,"type")="int"
-	Set gtmtypfldindx("sgmnt_addrs","n_pre_read_trigger")=118
-	Set gtmtypes("sgmnt_addrs",119,"name")="sgmnt_addrs.jnlpool_validate_check"
-	Set gtmtypes("sgmnt_addrs",119,"off")=696
+	Set gtmtypes("sgmnt_addrs",118,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_addrs","snapshot_in_prog")=118
+	Set gtmtypes("sgmnt_addrs",119,"name")="sgmnt_addrs.ref_cnt"
+	Set gtmtypes("sgmnt_addrs",119,"off")=700
 	Set gtmtypes("sgmnt_addrs",119,"len")=4
-	Set gtmtypes("sgmnt_addrs",119,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_addrs","jnlpool_validate_check")=119
-	Set gtmtypes("sgmnt_addrs",120,"name")="sgmnt_addrs.regcnt"
-	Set gtmtypes("sgmnt_addrs",120,"off")=700
+	Set gtmtypes("sgmnt_addrs",119,"type")="int"
+	Set gtmtypfldindx("sgmnt_addrs","ref_cnt")=119
+	Set gtmtypes("sgmnt_addrs",120,"name")="sgmnt_addrs.fid_index"
+	Set gtmtypes("sgmnt_addrs",120,"off")=704
 	Set gtmtypes("sgmnt_addrs",120,"len")=4
 	Set gtmtypes("sgmnt_addrs",120,"type")="int"
-	Set gtmtypfldindx("sgmnt_addrs","regcnt")=120
-	Set gtmtypes("sgmnt_addrs",121,"name")="sgmnt_addrs.t_commit_crit"
-	Set gtmtypes("sgmnt_addrs",121,"off")=704
+	Set gtmtypfldindx("sgmnt_addrs","fid_index")=120
+	Set gtmtypes("sgmnt_addrs",121,"name")="sgmnt_addrs.do_fullblockwrites"
+	Set gtmtypes("sgmnt_addrs",121,"off")=708
 	Set gtmtypes("sgmnt_addrs",121,"len")=4
 	Set gtmtypes("sgmnt_addrs",121,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_addrs","t_commit_crit")=121
-	Set gtmtypes("sgmnt_addrs",122,"name")="sgmnt_addrs.wcs_pidcnt_incremented"
-	Set gtmtypes("sgmnt_addrs",122,"off")=708
+	Set gtmtypfldindx("sgmnt_addrs","do_fullblockwrites")=121
+	Set gtmtypes("sgmnt_addrs",122,"name")="sgmnt_addrs.regnum"
+	Set gtmtypes("sgmnt_addrs",122,"off")=712
 	Set gtmtypes("sgmnt_addrs",122,"len")=4
-	Set gtmtypes("sgmnt_addrs",122,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_addrs","wcs_pidcnt_incremented")=122
-	Set gtmtypes("sgmnt_addrs",123,"name")="sgmnt_addrs.incr_db_trigger_cycle"
-	Set gtmtypes("sgmnt_addrs",123,"off")=712
+	Set gtmtypes("sgmnt_addrs",122,"type")="int"
+	Set gtmtypfldindx("sgmnt_addrs","regnum")=122
+	Set gtmtypes("sgmnt_addrs",123,"name")="sgmnt_addrs.n_pre_read_trigger"
+	Set gtmtypes("sgmnt_addrs",123,"off")=716
 	Set gtmtypes("sgmnt_addrs",123,"len")=4
-	Set gtmtypes("sgmnt_addrs",123,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_addrs","incr_db_trigger_cycle")=123
-	Set gtmtypes("sgmnt_addrs",124,"name")="sgmnt_addrs.db_trigger_cycle"
-	Set gtmtypes("sgmnt_addrs",124,"off")=716
+	Set gtmtypes("sgmnt_addrs",123,"type")="int"
+	Set gtmtypfldindx("sgmnt_addrs","n_pre_read_trigger")=123
+	Set gtmtypes("sgmnt_addrs",124,"name")="sgmnt_addrs.jnlpool_validate_check"
+	Set gtmtypes("sgmnt_addrs",124,"off")=720
 	Set gtmtypes("sgmnt_addrs",124,"len")=4
 	Set gtmtypes("sgmnt_addrs",124,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_addrs","db_trigger_cycle")=124
-	Set gtmtypes("sgmnt_addrs",125,"name")="sgmnt_addrs.db_dztrigger_cycle"
-	Set gtmtypes("sgmnt_addrs",125,"off")=720
+	Set gtmtypfldindx("sgmnt_addrs","jnlpool_validate_check")=124
+	Set gtmtypes("sgmnt_addrs",125,"name")="sgmnt_addrs.regcnt"
+	Set gtmtypes("sgmnt_addrs",125,"off")=724
 	Set gtmtypes("sgmnt_addrs",125,"len")=4
-	Set gtmtypes("sgmnt_addrs",125,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_addrs","db_dztrigger_cycle")=125
-	Set gtmtypes("sgmnt_addrs",126,"name")="sgmnt_addrs.hold_onto_crit"
-	Set gtmtypes("sgmnt_addrs",126,"off")=724
+	Set gtmtypes("sgmnt_addrs",125,"type")="int"
+	Set gtmtypfldindx("sgmnt_addrs","regcnt")=125
+	Set gtmtypes("sgmnt_addrs",126,"name")="sgmnt_addrs.t_commit_crit"
+	Set gtmtypes("sgmnt_addrs",126,"off")=728
 	Set gtmtypes("sgmnt_addrs",126,"len")=4
 	Set gtmtypes("sgmnt_addrs",126,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_addrs","hold_onto_crit")=126
-	Set gtmtypes("sgmnt_addrs",127,"name")="sgmnt_addrs.dse_crit_seize_done"
-	Set gtmtypes("sgmnt_addrs",127,"off")=728
+	Set gtmtypfldindx("sgmnt_addrs","t_commit_crit")=126
+	Set gtmtypes("sgmnt_addrs",127,"name")="sgmnt_addrs.wcs_pidcnt_incremented"
+	Set gtmtypes("sgmnt_addrs",127,"off")=732
 	Set gtmtypes("sgmnt_addrs",127,"len")=4
 	Set gtmtypes("sgmnt_addrs",127,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_addrs","dse_crit_seize_done")=127
-	Set gtmtypes("sgmnt_addrs",128,"name")="sgmnt_addrs.gbuff_limit"
-	Set gtmtypes("sgmnt_addrs",128,"off")=732
+	Set gtmtypfldindx("sgmnt_addrs","wcs_pidcnt_incremented")=127
+	Set gtmtypes("sgmnt_addrs",128,"name")="sgmnt_addrs.incr_db_trigger_cycle"
+	Set gtmtypes("sgmnt_addrs",128,"off")=736
 	Set gtmtypes("sgmnt_addrs",128,"len")=4
-	Set gtmtypes("sgmnt_addrs",128,"type")="int"
-	Set gtmtypfldindx("sgmnt_addrs","gbuff_limit")=128
-	Set gtmtypes("sgmnt_addrs",129,"name")="sgmnt_addrs.our_midnite"
-	Set gtmtypes("sgmnt_addrs",129,"off")=736
+	Set gtmtypes("sgmnt_addrs",128,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_addrs","incr_db_trigger_cycle")=128
+	Set gtmtypes("sgmnt_addrs",129,"name")="sgmnt_addrs.db_trigger_cycle"
+	Set gtmtypes("sgmnt_addrs",129,"off")=740
 	Set gtmtypes("sgmnt_addrs",129,"len")=4
-	Set gtmtypes("sgmnt_addrs",129,"type")="addr"
-	Set gtmtypfldindx("sgmnt_addrs","our_midnite")=129
-	Set gtmtypes("sgmnt_addrs",130,"name")="sgmnt_addrs.root_search_cycle"
-	Set gtmtypes("sgmnt_addrs",130,"off")=740
+	Set gtmtypes("sgmnt_addrs",129,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_addrs","db_trigger_cycle")=129
+	Set gtmtypes("sgmnt_addrs",130,"name")="sgmnt_addrs.db_dztrigger_cycle"
+	Set gtmtypes("sgmnt_addrs",130,"off")=744
 	Set gtmtypes("sgmnt_addrs",130,"len")=4
 	Set gtmtypes("sgmnt_addrs",130,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_addrs","root_search_cycle")=130
-	Set gtmtypes("sgmnt_addrs",131,"name")="sgmnt_addrs.onln_rlbk_cycle"
-	Set gtmtypes("sgmnt_addrs",131,"off")=744
+	Set gtmtypfldindx("sgmnt_addrs","db_dztrigger_cycle")=130
+	Set gtmtypes("sgmnt_addrs",131,"name")="sgmnt_addrs.hold_onto_crit"
+	Set gtmtypes("sgmnt_addrs",131,"off")=748
 	Set gtmtypes("sgmnt_addrs",131,"len")=4
-	Set gtmtypes("sgmnt_addrs",131,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_addrs","onln_rlbk_cycle")=131
-	Set gtmtypes("sgmnt_addrs",132,"name")="sgmnt_addrs.db_onln_rlbkd_cycle"
-	Set gtmtypes("sgmnt_addrs",132,"off")=748
+	Set gtmtypes("sgmnt_addrs",131,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_addrs","hold_onto_crit")=131
+	Set gtmtypes("sgmnt_addrs",132,"name")="sgmnt_addrs.dse_crit_seize_done"
+	Set gtmtypes("sgmnt_addrs",132,"off")=752
 	Set gtmtypes("sgmnt_addrs",132,"len")=4
-	Set gtmtypes("sgmnt_addrs",132,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_addrs","db_onln_rlbkd_cycle")=132
-	Set gtmtypes("sgmnt_addrs",133,"name")="sgmnt_addrs.read_only_fs"
-	Set gtmtypes("sgmnt_addrs",133,"off")=752
+	Set gtmtypes("sgmnt_addrs",132,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_addrs","dse_crit_seize_done")=132
+	Set gtmtypes("sgmnt_addrs",133,"name")="sgmnt_addrs.gbuff_limit"
+	Set gtmtypes("sgmnt_addrs",133,"off")=756
 	Set gtmtypes("sgmnt_addrs",133,"len")=4
-	Set gtmtypes("sgmnt_addrs",133,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_addrs","read_only_fs")=133
-	Set gtmtypes("sgmnt_addrs",134,"name")="sgmnt_addrs.crit_probe"
-	Set gtmtypes("sgmnt_addrs",134,"off")=756
+	Set gtmtypes("sgmnt_addrs",133,"type")="int"
+	Set gtmtypfldindx("sgmnt_addrs","gbuff_limit")=133
+	Set gtmtypes("sgmnt_addrs",134,"name")="sgmnt_addrs.root_search_cycle"
+	Set gtmtypes("sgmnt_addrs",134,"off")=760
 	Set gtmtypes("sgmnt_addrs",134,"len")=4
-	Set gtmtypes("sgmnt_addrs",134,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_addrs","crit_probe")=134
-	Set gtmtypes("sgmnt_addrs",135,"name")="sgmnt_addrs.probecrit_rec"
-	Set gtmtypes("sgmnt_addrs",135,"off")=760
-	Set gtmtypes("sgmnt_addrs",135,"len")=56
-	Set gtmtypes("sgmnt_addrs",135,"type")="probecrit_rec_t"
-	Set gtmtypfldindx("sgmnt_addrs","probecrit_rec")=135
-	Set gtmtypes("sgmnt_addrs",136,"name")="sgmnt_addrs.probecrit_rec.t_get_crit"
-	Set gtmtypes("sgmnt_addrs",136,"off")=760
-	Set gtmtypes("sgmnt_addrs",136,"len")=8
-	Set gtmtypes("sgmnt_addrs",136,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","probecrit_rec.t_get_crit")=136
-	Set gtmtypes("sgmnt_addrs",137,"name")="sgmnt_addrs.probecrit_rec.p_crit_failed"
-	Set gtmtypes("sgmnt_addrs",137,"off")=768
-	Set gtmtypes("sgmnt_addrs",137,"len")=8
-	Set gtmtypes("sgmnt_addrs",137,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","probecrit_rec.p_crit_failed")=137
-	Set gtmtypes("sgmnt_addrs",138,"name")="sgmnt_addrs.probecrit_rec.p_crit_que_slps"
+	Set gtmtypes("sgmnt_addrs",134,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_addrs","root_search_cycle")=134
+	Set gtmtypes("sgmnt_addrs",135,"name")="sgmnt_addrs.onln_rlbk_cycle"
+	Set gtmtypes("sgmnt_addrs",135,"off")=764
+	Set gtmtypes("sgmnt_addrs",135,"len")=4
+	Set gtmtypes("sgmnt_addrs",135,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_addrs","onln_rlbk_cycle")=135
+	Set gtmtypes("sgmnt_addrs",136,"name")="sgmnt_addrs.db_onln_rlbkd_cycle"
+	Set gtmtypes("sgmnt_addrs",136,"off")=768
+	Set gtmtypes("sgmnt_addrs",136,"len")=4
+	Set gtmtypes("sgmnt_addrs",136,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_addrs","db_onln_rlbkd_cycle")=136
+	Set gtmtypes("sgmnt_addrs",137,"name")="sgmnt_addrs.reservedDBFlags"
+	Set gtmtypes("sgmnt_addrs",137,"off")=772
+	Set gtmtypes("sgmnt_addrs",137,"len")=4
+	Set gtmtypes("sgmnt_addrs",137,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_addrs","reservedDBFlags")=137
+	Set gtmtypes("sgmnt_addrs",138,"name")="sgmnt_addrs.read_only_fs"
 	Set gtmtypes("sgmnt_addrs",138,"off")=776
-	Set gtmtypes("sgmnt_addrs",138,"len")=8
-	Set gtmtypes("sgmnt_addrs",138,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","probecrit_rec.p_crit_que_slps")=138
-	Set gtmtypes("sgmnt_addrs",139,"name")="sgmnt_addrs.probecrit_rec.p_crit_yields"
-	Set gtmtypes("sgmnt_addrs",139,"off")=784
-	Set gtmtypes("sgmnt_addrs",139,"len")=8
-	Set gtmtypes("sgmnt_addrs",139,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","probecrit_rec.p_crit_yields")=139
-	Set gtmtypes("sgmnt_addrs",140,"name")="sgmnt_addrs.probecrit_rec.p_crit_que_full"
-	Set gtmtypes("sgmnt_addrs",140,"off")=792
-	Set gtmtypes("sgmnt_addrs",140,"len")=8
-	Set gtmtypes("sgmnt_addrs",140,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","probecrit_rec.p_crit_que_full")=140
-	Set gtmtypes("sgmnt_addrs",141,"name")="sgmnt_addrs.probecrit_rec.p_crit_que_slots"
-	Set gtmtypes("sgmnt_addrs",141,"off")=800
-	Set gtmtypes("sgmnt_addrs",141,"len")=8
-	Set gtmtypes("sgmnt_addrs",141,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","probecrit_rec.p_crit_que_slots")=141
-	Set gtmtypes("sgmnt_addrs",142,"name")="sgmnt_addrs.probecrit_rec.p_crit_success"
-	Set gtmtypes("sgmnt_addrs",142,"off")=808
+	Set gtmtypes("sgmnt_addrs",138,"len")=4
+	Set gtmtypes("sgmnt_addrs",138,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_addrs","read_only_fs")=138
+	Set gtmtypes("sgmnt_addrs",139,"name")="sgmnt_addrs.crit_probe"
+	Set gtmtypes("sgmnt_addrs",139,"off")=780
+	Set gtmtypes("sgmnt_addrs",139,"len")=4
+	Set gtmtypes("sgmnt_addrs",139,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_addrs","crit_probe")=139
+	Set gtmtypes("sgmnt_addrs",140,"name")="sgmnt_addrs.canceled_flush_timer"
+	Set gtmtypes("sgmnt_addrs",140,"off")=784
+	Set gtmtypes("sgmnt_addrs",140,"len")=4
+	Set gtmtypes("sgmnt_addrs",140,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_addrs","canceled_flush_timer")=140
+	Set gtmtypes("sgmnt_addrs",141,"name")="sgmnt_addrs.probecrit_rec"
+	Set gtmtypes("sgmnt_addrs",141,"off")=788
+	Set gtmtypes("sgmnt_addrs",141,"len")=56
+	Set gtmtypes("sgmnt_addrs",141,"type")="probecrit_rec_t"
+	Set gtmtypfldindx("sgmnt_addrs","probecrit_rec")=141
+	Set gtmtypes("sgmnt_addrs",142,"name")="sgmnt_addrs.probecrit_rec.t_get_crit"
+	Set gtmtypes("sgmnt_addrs",142,"off")=788
 	Set gtmtypes("sgmnt_addrs",142,"len")=8
 	Set gtmtypes("sgmnt_addrs",142,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","probecrit_rec.p_crit_success")=142
+	Set gtmtypfldindx("sgmnt_addrs","probecrit_rec.t_get_crit")=142
+	Set gtmtypes("sgmnt_addrs",143,"name")="sgmnt_addrs.probecrit_rec.p_crit_failed"
+	Set gtmtypes("sgmnt_addrs",143,"off")=796
+	Set gtmtypes("sgmnt_addrs",143,"len")=8
+	Set gtmtypes("sgmnt_addrs",143,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_addrs","probecrit_rec.p_crit_failed")=143
+	Set gtmtypes("sgmnt_addrs",144,"name")="sgmnt_addrs.probecrit_rec.p_crit_que_slps"
+	Set gtmtypes("sgmnt_addrs",144,"off")=804
+	Set gtmtypes("sgmnt_addrs",144,"len")=8
+	Set gtmtypes("sgmnt_addrs",144,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_addrs","probecrit_rec.p_crit_que_slps")=144
+	Set gtmtypes("sgmnt_addrs",145,"name")="sgmnt_addrs.probecrit_rec.p_crit_yields"
+	Set gtmtypes("sgmnt_addrs",145,"off")=812
+	Set gtmtypes("sgmnt_addrs",145,"len")=8
+	Set gtmtypes("sgmnt_addrs",145,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_addrs","probecrit_rec.p_crit_yields")=145
+	Set gtmtypes("sgmnt_addrs",146,"name")="sgmnt_addrs.probecrit_rec.p_crit_que_full"
+	Set gtmtypes("sgmnt_addrs",146,"off")=820
+	Set gtmtypes("sgmnt_addrs",146,"len")=8
+	Set gtmtypes("sgmnt_addrs",146,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_addrs","probecrit_rec.p_crit_que_full")=146
+	Set gtmtypes("sgmnt_addrs",147,"name")="sgmnt_addrs.probecrit_rec.p_crit_que_slots"
+	Set gtmtypes("sgmnt_addrs",147,"off")=828
+	Set gtmtypes("sgmnt_addrs",147,"len")=8
+	Set gtmtypes("sgmnt_addrs",147,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_addrs","probecrit_rec.p_crit_que_slots")=147
+	Set gtmtypes("sgmnt_addrs",148,"name")="sgmnt_addrs.probecrit_rec.p_crit_success"
+	Set gtmtypes("sgmnt_addrs",148,"off")=836
+	Set gtmtypes("sgmnt_addrs",148,"len")=8
+	Set gtmtypes("sgmnt_addrs",148,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_addrs","probecrit_rec.p_crit_success")=148
+	Set gtmtypes("sgmnt_addrs",149,"name")="sgmnt_addrs.lock_crit_with_db"
+	Set gtmtypes("sgmnt_addrs",149,"off")=844
+	Set gtmtypes("sgmnt_addrs",149,"len")=4
+	Set gtmtypes("sgmnt_addrs",149,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_addrs","lock_crit_with_db")=149
+	Set gtmtypes("sgmnt_addrs",150,"name")="sgmnt_addrs.needs_post_freeze_online_clean"
+	Set gtmtypes("sgmnt_addrs",150,"off")=848
+	Set gtmtypes("sgmnt_addrs",150,"len")=4
+	Set gtmtypes("sgmnt_addrs",150,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_addrs","needs_post_freeze_online_clean")=150
+	Set gtmtypes("sgmnt_addrs",151,"name")="sgmnt_addrs.needs_post_freeze_flushsync"
+	Set gtmtypes("sgmnt_addrs",151,"off")=852
+	Set gtmtypes("sgmnt_addrs",151,"len")=4
+	Set gtmtypes("sgmnt_addrs",151,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_addrs","needs_post_freeze_flushsync")=151
+	Set gtmtypes("sgmnt_addrs",152,"name")="sgmnt_addrs.tp_hint"
+	Set gtmtypes("sgmnt_addrs",152,"off")=856
+	Set gtmtypes("sgmnt_addrs",152,"len")=4
+	Set gtmtypes("sgmnt_addrs",152,"type")="int"
+	Set gtmtypfldindx("sgmnt_addrs","tp_hint")=152
+	Set gtmtypes("sgmnt_addrs",153,"name")="sgmnt_addrs.statsDB_setup_completed"
+	Set gtmtypes("sgmnt_addrs",153,"off")=860
+	Set gtmtypes("sgmnt_addrs",153,"len")=4
+	Set gtmtypes("sgmnt_addrs",153,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_addrs","statsDB_setup_completed")=153
 	;
 	Set gtmtypes("sgmnt_data")="struct"
-	Set gtmtypes("sgmnt_data",0)=565
+	Set gtmtypes("sgmnt_data",0)=586
 	Set gtmtypes("sgmnt_data","len")=8192
 	Set gtmtypes("sgmnt_data",1,"name")="sgmnt_data.label"
 	Set gtmtypes("sgmnt_data",1,"off")=0
@@ -26782,7 +27238,7 @@ Init
 	Set gtmtypes("sgmnt_data",18,"name")="sgmnt_data.null_subs"
 	Set gtmtypes("sgmnt_data",18,"off")=76
 	Set gtmtypes("sgmnt_data",18,"len")=4
-	Set gtmtypes("sgmnt_data",18,"type")="boolean_t"
+	Set gtmtypes("sgmnt_data",18,"type")="int"
 	Set gtmtypfldindx("sgmnt_data","null_subs")=18
 	Set gtmtypes("sgmnt_data",19,"name")="sgmnt_data.free_space"
 	Set gtmtypes("sgmnt_data",19,"off")=80
@@ -26864,11 +27320,11 @@ Init
 	Set gtmtypes("sgmnt_data",34,"len")=4
 	Set gtmtypes("sgmnt_data",34,"type")="int"
 	Set gtmtypfldindx("sgmnt_data","creation_time4")=34
-	Set gtmtypes("sgmnt_data",35,"name")="sgmnt_data.creation_filler_8byte"
+	Set gtmtypes("sgmnt_data",35,"name")="sgmnt_data.reservedDBFlags"
 	Set gtmtypes("sgmnt_data",35,"off")=188
 	Set gtmtypes("sgmnt_data",35,"len")=4
-	Set gtmtypes("sgmnt_data",35,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","creation_filler_8byte")=35
+	Set gtmtypes("sgmnt_data",35,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","reservedDBFlags")=35
 	Set gtmtypes("sgmnt_data",36,"name")="sgmnt_data.max_tn"
 	Set gtmtypes("sgmnt_data",36,"off")=192
 	Set gtmtypes("sgmnt_data",36,"len")=8
@@ -26949,2592 +27405,2697 @@ Init
 	Set gtmtypes("sgmnt_data",51,"len")=4
 	Set gtmtypes("sgmnt_data",51,"type")="int"
 	Set gtmtypfldindx("sgmnt_data","abandoned_kills")=51
-	Set gtmtypes("sgmnt_data",52,"name")="sgmnt_data.filler_320"
+	Set gtmtypes("sgmnt_data",52,"name")="sgmnt_data.freeze_online"
 	Set gtmtypes("sgmnt_data",52,"off")=312
-	Set gtmtypes("sgmnt_data",52,"len")=8
-	Set gtmtypes("sgmnt_data",52,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","filler_320")=52
-	Set gtmtypes("sgmnt_data",53,"name")="sgmnt_data.tn_upgrd_blks_0"
-	Set gtmtypes("sgmnt_data",53,"off")=320
-	Set gtmtypes("sgmnt_data",53,"len")=8
-	Set gtmtypes("sgmnt_data",53,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","tn_upgrd_blks_0")=53
-	Set gtmtypes("sgmnt_data",54,"name")="sgmnt_data.desired_db_format_tn"
-	Set gtmtypes("sgmnt_data",54,"off")=328
+	Set gtmtypes("sgmnt_data",52,"len")=4
+	Set gtmtypes("sgmnt_data",52,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","freeze_online")=52
+	Set gtmtypes("sgmnt_data",53,"name")="sgmnt_data.filler_320"
+	Set gtmtypes("sgmnt_data",53,"off")=316
+	Set gtmtypes("sgmnt_data",53,"len")=4
+	Set gtmtypes("sgmnt_data",53,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","filler_320")=53
+	Set gtmtypes("sgmnt_data",54,"name")="sgmnt_data.tn_upgrd_blks_0"
+	Set gtmtypes("sgmnt_data",54,"off")=320
 	Set gtmtypes("sgmnt_data",54,"len")=8
 	Set gtmtypes("sgmnt_data",54,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","desired_db_format_tn")=54
-	Set gtmtypes("sgmnt_data",55,"name")="sgmnt_data.reorg_db_fmt_start_tn"
-	Set gtmtypes("sgmnt_data",55,"off")=336
+	Set gtmtypfldindx("sgmnt_data","tn_upgrd_blks_0")=54
+	Set gtmtypes("sgmnt_data",55,"name")="sgmnt_data.desired_db_format_tn"
+	Set gtmtypes("sgmnt_data",55,"off")=328
 	Set gtmtypes("sgmnt_data",55,"len")=8
 	Set gtmtypes("sgmnt_data",55,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","reorg_db_fmt_start_tn")=55
-	Set gtmtypes("sgmnt_data",56,"name")="sgmnt_data.reorg_upgrd_dwngrd_restart_block"
-	Set gtmtypes("sgmnt_data",56,"off")=344
-	Set gtmtypes("sgmnt_data",56,"len")=4
-	Set gtmtypes("sgmnt_data",56,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","reorg_upgrd_dwngrd_restart_block")=56
-	Set gtmtypes("sgmnt_data",57,"name")="sgmnt_data.blks_to_upgrd"
-	Set gtmtypes("sgmnt_data",57,"off")=348
+	Set gtmtypfldindx("sgmnt_data","desired_db_format_tn")=55
+	Set gtmtypes("sgmnt_data",56,"name")="sgmnt_data.reorg_db_fmt_start_tn"
+	Set gtmtypes("sgmnt_data",56,"off")=336
+	Set gtmtypes("sgmnt_data",56,"len")=8
+	Set gtmtypes("sgmnt_data",56,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","reorg_db_fmt_start_tn")=56
+	Set gtmtypes("sgmnt_data",57,"name")="sgmnt_data.reorg_upgrd_dwngrd_restart_block"
+	Set gtmtypes("sgmnt_data",57,"off")=344
 	Set gtmtypes("sgmnt_data",57,"len")=4
 	Set gtmtypes("sgmnt_data",57,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","blks_to_upgrd")=57
-	Set gtmtypes("sgmnt_data",58,"name")="sgmnt_data.blks_to_upgrd_subzero_error"
-	Set gtmtypes("sgmnt_data",58,"off")=352
+	Set gtmtypfldindx("sgmnt_data","reorg_upgrd_dwngrd_restart_block")=57
+	Set gtmtypes("sgmnt_data",58,"name")="sgmnt_data.blks_to_upgrd"
+	Set gtmtypes("sgmnt_data",58,"off")=348
 	Set gtmtypes("sgmnt_data",58,"len")=4
 	Set gtmtypes("sgmnt_data",58,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","blks_to_upgrd_subzero_error")=58
-	Set gtmtypes("sgmnt_data",59,"name")="sgmnt_data.desired_db_format"
-	Set gtmtypes("sgmnt_data",59,"off")=356
+	Set gtmtypfldindx("sgmnt_data","blks_to_upgrd")=58
+	Set gtmtypes("sgmnt_data",59,"name")="sgmnt_data.blks_to_upgrd_subzero_error"
+	Set gtmtypes("sgmnt_data",59,"off")=352
 	Set gtmtypes("sgmnt_data",59,"len")=4
 	Set gtmtypes("sgmnt_data",59,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","desired_db_format")=59
-	Set gtmtypes("sgmnt_data",60,"name")="sgmnt_data.fully_upgraded"
-	Set gtmtypes("sgmnt_data",60,"off")=360
+	Set gtmtypfldindx("sgmnt_data","blks_to_upgrd_subzero_error")=59
+	Set gtmtypes("sgmnt_data",60,"name")="sgmnt_data.desired_db_format"
+	Set gtmtypes("sgmnt_data",60,"off")=356
 	Set gtmtypes("sgmnt_data",60,"len")=4
-	Set gtmtypes("sgmnt_data",60,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","fully_upgraded")=60
-	Set gtmtypes("sgmnt_data",61,"name")="sgmnt_data.db_got_to_v5_once"
-	Set gtmtypes("sgmnt_data",61,"off")=364
+	Set gtmtypes("sgmnt_data",60,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","desired_db_format")=60
+	Set gtmtypes("sgmnt_data",61,"name")="sgmnt_data.fully_upgraded"
+	Set gtmtypes("sgmnt_data",61,"off")=360
 	Set gtmtypes("sgmnt_data",61,"len")=4
 	Set gtmtypes("sgmnt_data",61,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","db_got_to_v5_once")=61
-	Set gtmtypes("sgmnt_data",62,"name")="sgmnt_data.opened_by_gtmv53"
-	Set gtmtypes("sgmnt_data",62,"off")=368
+	Set gtmtypfldindx("sgmnt_data","fully_upgraded")=61
+	Set gtmtypes("sgmnt_data",62,"name")="sgmnt_data.db_got_to_v5_once"
+	Set gtmtypes("sgmnt_data",62,"off")=364
 	Set gtmtypes("sgmnt_data",62,"len")=4
 	Set gtmtypes("sgmnt_data",62,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","opened_by_gtmv53")=62
-	Set gtmtypes("sgmnt_data",63,"name")="sgmnt_data.filler_384"
-	Set gtmtypes("sgmnt_data",63,"off")=372
-	Set gtmtypes("sgmnt_data",63,"len")=12
-	Set gtmtypes("sgmnt_data",63,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","filler_384")=63
-	Set gtmtypes("sgmnt_data",64,"name")="sgmnt_data.trans_hist"
-	Set gtmtypes("sgmnt_data",64,"off")=384
-	Set gtmtypes("sgmnt_data",64,"len")=56
-	Set gtmtypes("sgmnt_data",64,"type")="th_index"
-	Set gtmtypfldindx("sgmnt_data","trans_hist")=64
-	Set gtmtypes("sgmnt_data",65,"name")="sgmnt_data.trans_hist.curr_tn"
+	Set gtmtypfldindx("sgmnt_data","db_got_to_v5_once")=62
+	Set gtmtypes("sgmnt_data",63,"name")="sgmnt_data.opened_by_gtmv53"
+	Set gtmtypes("sgmnt_data",63,"off")=368
+	Set gtmtypes("sgmnt_data",63,"len")=4
+	Set gtmtypes("sgmnt_data",63,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","opened_by_gtmv53")=63
+	Set gtmtypes("sgmnt_data",64,"name")="sgmnt_data.filler_384"
+	Set gtmtypes("sgmnt_data",64,"off")=372
+	Set gtmtypes("sgmnt_data",64,"len")=12
+	Set gtmtypes("sgmnt_data",64,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","filler_384")=64
+	Set gtmtypes("sgmnt_data",65,"name")="sgmnt_data.trans_hist"
 	Set gtmtypes("sgmnt_data",65,"off")=384
-	Set gtmtypes("sgmnt_data",65,"len")=8
-	Set gtmtypes("sgmnt_data",65,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","trans_hist.curr_tn")=65
-	Set gtmtypes("sgmnt_data",66,"name")="sgmnt_data.trans_hist.early_tn"
-	Set gtmtypes("sgmnt_data",66,"off")=392
+	Set gtmtypes("sgmnt_data",65,"len")=56
+	Set gtmtypes("sgmnt_data",65,"type")="th_index"
+	Set gtmtypfldindx("sgmnt_data","trans_hist")=65
+	Set gtmtypes("sgmnt_data",66,"name")="sgmnt_data.trans_hist.curr_tn"
+	Set gtmtypes("sgmnt_data",66,"off")=384
 	Set gtmtypes("sgmnt_data",66,"len")=8
 	Set gtmtypes("sgmnt_data",66,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","trans_hist.early_tn")=66
-	Set gtmtypes("sgmnt_data",67,"name")="sgmnt_data.trans_hist.last_mm_sync"
-	Set gtmtypes("sgmnt_data",67,"off")=400
+	Set gtmtypfldindx("sgmnt_data","trans_hist.curr_tn")=66
+	Set gtmtypes("sgmnt_data",67,"name")="sgmnt_data.trans_hist.early_tn"
+	Set gtmtypes("sgmnt_data",67,"off")=392
 	Set gtmtypes("sgmnt_data",67,"len")=8
 	Set gtmtypes("sgmnt_data",67,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","trans_hist.last_mm_sync")=67
-	Set gtmtypes("sgmnt_data",68,"name")="sgmnt_data.trans_hist.filler_8byte"
-	Set gtmtypes("sgmnt_data",68,"off")=408
+	Set gtmtypfldindx("sgmnt_data","trans_hist.early_tn")=67
+	Set gtmtypes("sgmnt_data",68,"name")="sgmnt_data.trans_hist.last_mm_sync"
+	Set gtmtypes("sgmnt_data",68,"off")=400
 	Set gtmtypes("sgmnt_data",68,"len")=8
-	Set gtmtypes("sgmnt_data",68,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","trans_hist.filler_8byte")=68
-	Set gtmtypes("sgmnt_data",69,"name")="sgmnt_data.trans_hist.mm_tn"
-	Set gtmtypes("sgmnt_data",69,"off")=416
+	Set gtmtypes("sgmnt_data",68,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","trans_hist.last_mm_sync")=68
+	Set gtmtypes("sgmnt_data",69,"name")="sgmnt_data.trans_hist.filler_8byte"
+	Set gtmtypes("sgmnt_data",69,"off")=408
 	Set gtmtypes("sgmnt_data",69,"len")=8
-	Set gtmtypes("sgmnt_data",69,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","trans_hist.mm_tn")=69
-	Set gtmtypes("sgmnt_data",70,"name")="sgmnt_data.trans_hist.lock_sequence"
-	Set gtmtypes("sgmnt_data",70,"off")=424
-	Set gtmtypes("sgmnt_data",70,"len")=4
-	Set gtmtypes("sgmnt_data",70,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","trans_hist.lock_sequence")=70
-	Set gtmtypes("sgmnt_data",71,"name")="sgmnt_data.trans_hist.ccp_jnl_filesize"
-	Set gtmtypes("sgmnt_data",71,"off")=428
+	Set gtmtypes("sgmnt_data",69,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","trans_hist.filler_8byte")=69
+	Set gtmtypes("sgmnt_data",70,"name")="sgmnt_data.trans_hist.mm_tn"
+	Set gtmtypes("sgmnt_data",70,"off")=416
+	Set gtmtypes("sgmnt_data",70,"len")=8
+	Set gtmtypes("sgmnt_data",70,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","trans_hist.mm_tn")=70
+	Set gtmtypes("sgmnt_data",71,"name")="sgmnt_data.trans_hist.lock_sequence"
+	Set gtmtypes("sgmnt_data",71,"off")=424
 	Set gtmtypes("sgmnt_data",71,"len")=4
 	Set gtmtypes("sgmnt_data",71,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","trans_hist.ccp_jnl_filesize")=71
-	Set gtmtypes("sgmnt_data",72,"name")="sgmnt_data.trans_hist.total_blks"
-	Set gtmtypes("sgmnt_data",72,"off")=432
+	Set gtmtypfldindx("sgmnt_data","trans_hist.lock_sequence")=71
+	Set gtmtypes("sgmnt_data",72,"name")="sgmnt_data.trans_hist.ccp_jnl_filesize"
+	Set gtmtypes("sgmnt_data",72,"off")=428
 	Set gtmtypes("sgmnt_data",72,"len")=4
 	Set gtmtypes("sgmnt_data",72,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","trans_hist.total_blks")=72
-	Set gtmtypes("sgmnt_data",73,"name")="sgmnt_data.trans_hist.free_blocks"
-	Set gtmtypes("sgmnt_data",73,"off")=436
+	Set gtmtypfldindx("sgmnt_data","trans_hist.ccp_jnl_filesize")=72
+	Set gtmtypes("sgmnt_data",73,"name")="sgmnt_data.trans_hist.total_blks"
+	Set gtmtypes("sgmnt_data",73,"off")=432
 	Set gtmtypes("sgmnt_data",73,"len")=4
 	Set gtmtypes("sgmnt_data",73,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","trans_hist.free_blocks")=73
-	Set gtmtypes("sgmnt_data",74,"name")="sgmnt_data.filler_trans_hist"
-	Set gtmtypes("sgmnt_data",74,"off")=440
-	Set gtmtypes("sgmnt_data",74,"len")=8
-	Set gtmtypes("sgmnt_data",74,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","filler_trans_hist")=74
-	Set gtmtypes("sgmnt_data",75,"name")="sgmnt_data.flush_time"
-	Set gtmtypes("sgmnt_data",75,"off")=448
+	Set gtmtypfldindx("sgmnt_data","trans_hist.total_blks")=73
+	Set gtmtypes("sgmnt_data",74,"name")="sgmnt_data.trans_hist.free_blocks"
+	Set gtmtypes("sgmnt_data",74,"off")=436
+	Set gtmtypes("sgmnt_data",74,"len")=4
+	Set gtmtypes("sgmnt_data",74,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","trans_hist.free_blocks")=74
+	Set gtmtypes("sgmnt_data",75,"name")="sgmnt_data.filler_trans_hist"
+	Set gtmtypes("sgmnt_data",75,"off")=440
 	Set gtmtypes("sgmnt_data",75,"len")=8
-	Set gtmtypes("sgmnt_data",75,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","flush_time")=75
-	Set gtmtypes("sgmnt_data",75,"dim")=2
-	Set gtmtypes("sgmnt_data",76,"name")="sgmnt_data.flush_trigger"
-	Set gtmtypes("sgmnt_data",76,"off")=456
-	Set gtmtypes("sgmnt_data",76,"len")=4
+	Set gtmtypes("sgmnt_data",75,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","filler_trans_hist")=75
+	Set gtmtypes("sgmnt_data",76,"name")="sgmnt_data.flush_time"
+	Set gtmtypes("sgmnt_data",76,"off")=448
+	Set gtmtypes("sgmnt_data",76,"len")=8
 	Set gtmtypes("sgmnt_data",76,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","flush_trigger")=76
-	Set gtmtypes("sgmnt_data",77,"name")="sgmnt_data.n_wrt_per_flu"
-	Set gtmtypes("sgmnt_data",77,"off")=460
+	Set gtmtypfldindx("sgmnt_data","flush_time")=76
+	Set gtmtypes("sgmnt_data",76,"dim")=2
+	Set gtmtypes("sgmnt_data",77,"name")="sgmnt_data.flush_trigger"
+	Set gtmtypes("sgmnt_data",77,"off")=456
 	Set gtmtypes("sgmnt_data",77,"len")=4
 	Set gtmtypes("sgmnt_data",77,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_wrt_per_flu")=77
-	Set gtmtypes("sgmnt_data",78,"name")="sgmnt_data.wait_disk_space"
-	Set gtmtypes("sgmnt_data",78,"off")=464
+	Set gtmtypfldindx("sgmnt_data","flush_trigger")=77
+	Set gtmtypes("sgmnt_data",78,"name")="sgmnt_data.n_wrt_per_flu"
+	Set gtmtypes("sgmnt_data",78,"off")=460
 	Set gtmtypes("sgmnt_data",78,"len")=4
 	Set gtmtypes("sgmnt_data",78,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wait_disk_space")=78
-	Set gtmtypes("sgmnt_data",79,"name")="sgmnt_data.defer_time"
-	Set gtmtypes("sgmnt_data",79,"off")=468
+	Set gtmtypfldindx("sgmnt_data","n_wrt_per_flu")=78
+	Set gtmtypes("sgmnt_data",79,"name")="sgmnt_data.wait_disk_space"
+	Set gtmtypes("sgmnt_data",79,"off")=464
 	Set gtmtypes("sgmnt_data",79,"len")=4
 	Set gtmtypes("sgmnt_data",79,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","defer_time")=79
-	Set gtmtypes("sgmnt_data",80,"name")="sgmnt_data.filler_wc_blocked"
-	Set gtmtypes("sgmnt_data",80,"off")=472
+	Set gtmtypfldindx("sgmnt_data","wait_disk_space")=79
+	Set gtmtypes("sgmnt_data",80,"name")="sgmnt_data.defer_time"
+	Set gtmtypes("sgmnt_data",80,"off")=468
 	Set gtmtypes("sgmnt_data",80,"len")=4
-	Set gtmtypes("sgmnt_data",80,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","filler_wc_blocked")=80
-	Set gtmtypes("sgmnt_data",81,"name")="sgmnt_data.mumps_can_bypass"
-	Set gtmtypes("sgmnt_data",81,"off")=476
+	Set gtmtypes("sgmnt_data",80,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","defer_time")=80
+	Set gtmtypes("sgmnt_data",81,"name")="sgmnt_data.filler_wc_blocked"
+	Set gtmtypes("sgmnt_data",81,"off")=472
 	Set gtmtypes("sgmnt_data",81,"len")=4
 	Set gtmtypes("sgmnt_data",81,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","mumps_can_bypass")=81
-	Set gtmtypes("sgmnt_data",82,"name")="sgmnt_data.epoch_taper"
-	Set gtmtypes("sgmnt_data",82,"off")=480
+	Set gtmtypfldindx("sgmnt_data","filler_wc_blocked")=81
+	Set gtmtypes("sgmnt_data",82,"name")="sgmnt_data.mumps_can_bypass"
+	Set gtmtypes("sgmnt_data",82,"off")=476
 	Set gtmtypes("sgmnt_data",82,"len")=4
 	Set gtmtypes("sgmnt_data",82,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","epoch_taper")=82
-	Set gtmtypes("sgmnt_data",83,"name")="sgmnt_data.epoch_taper_time_pct"
-	Set gtmtypes("sgmnt_data",83,"off")=484
+	Set gtmtypfldindx("sgmnt_data","mumps_can_bypass")=82
+	Set gtmtypes("sgmnt_data",83,"name")="sgmnt_data.epoch_taper"
+	Set gtmtypes("sgmnt_data",83,"off")=480
 	Set gtmtypes("sgmnt_data",83,"len")=4
-	Set gtmtypes("sgmnt_data",83,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","epoch_taper_time_pct")=83
-	Set gtmtypes("sgmnt_data",84,"name")="sgmnt_data.epoch_taper_jnl_pct"
-	Set gtmtypes("sgmnt_data",84,"off")=488
+	Set gtmtypes("sgmnt_data",83,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","epoch_taper")=83
+	Set gtmtypes("sgmnt_data",84,"name")="sgmnt_data.epoch_taper_time_pct"
+	Set gtmtypes("sgmnt_data",84,"off")=484
 	Set gtmtypes("sgmnt_data",84,"len")=4
 	Set gtmtypes("sgmnt_data",84,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","epoch_taper_jnl_pct")=84
-	Set gtmtypes("sgmnt_data",85,"name")="sgmnt_data.filler_512"
-	Set gtmtypes("sgmnt_data",85,"off")=492
+	Set gtmtypfldindx("sgmnt_data","epoch_taper_time_pct")=84
+	Set gtmtypes("sgmnt_data",85,"name")="sgmnt_data.epoch_taper_jnl_pct"
+	Set gtmtypes("sgmnt_data",85,"off")=488
 	Set gtmtypes("sgmnt_data",85,"len")=4
-	Set gtmtypes("sgmnt_data",85,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","filler_512")=85
-	Set gtmtypes("sgmnt_data",86,"name")="sgmnt_data.reserved_for_upd"
-	Set gtmtypes("sgmnt_data",86,"off")=496
+	Set gtmtypes("sgmnt_data",85,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","epoch_taper_jnl_pct")=85
+	Set gtmtypes("sgmnt_data",86,"name")="sgmnt_data.asyncio"
+	Set gtmtypes("sgmnt_data",86,"off")=492
 	Set gtmtypes("sgmnt_data",86,"len")=4
-	Set gtmtypes("sgmnt_data",86,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","reserved_for_upd")=86
-	Set gtmtypes("sgmnt_data",87,"name")="sgmnt_data.avg_blks_per_100gbl"
-	Set gtmtypes("sgmnt_data",87,"off")=500
+	Set gtmtypes("sgmnt_data",86,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","asyncio")=86
+	Set gtmtypes("sgmnt_data",87,"name")="sgmnt_data.reserved_for_upd"
+	Set gtmtypes("sgmnt_data",87,"off")=496
 	Set gtmtypes("sgmnt_data",87,"len")=4
 	Set gtmtypes("sgmnt_data",87,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","avg_blks_per_100gbl")=87
-	Set gtmtypes("sgmnt_data",88,"name")="sgmnt_data.pre_read_trigger_factor"
-	Set gtmtypes("sgmnt_data",88,"off")=504
+	Set gtmtypfldindx("sgmnt_data","reserved_for_upd")=87
+	Set gtmtypes("sgmnt_data",88,"name")="sgmnt_data.avg_blks_per_100gbl"
+	Set gtmtypes("sgmnt_data",88,"off")=500
 	Set gtmtypes("sgmnt_data",88,"len")=4
 	Set gtmtypes("sgmnt_data",88,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","pre_read_trigger_factor")=88
-	Set gtmtypes("sgmnt_data",89,"name")="sgmnt_data.writer_trigger_factor"
-	Set gtmtypes("sgmnt_data",89,"off")=508
+	Set gtmtypfldindx("sgmnt_data","avg_blks_per_100gbl")=88
+	Set gtmtypes("sgmnt_data",89,"name")="sgmnt_data.pre_read_trigger_factor"
+	Set gtmtypes("sgmnt_data",89,"off")=504
 	Set gtmtypes("sgmnt_data",89,"len")=4
 	Set gtmtypes("sgmnt_data",89,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","writer_trigger_factor")=89
-	Set gtmtypes("sgmnt_data",90,"name")="sgmnt_data.semid"
-	Set gtmtypes("sgmnt_data",90,"off")=512
+	Set gtmtypfldindx("sgmnt_data","pre_read_trigger_factor")=89
+	Set gtmtypes("sgmnt_data",90,"name")="sgmnt_data.writer_trigger_factor"
+	Set gtmtypes("sgmnt_data",90,"off")=508
 	Set gtmtypes("sgmnt_data",90,"len")=4
-	Set gtmtypes("sgmnt_data",90,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","semid")=90
-	Set gtmtypes("sgmnt_data",91,"name")="sgmnt_data.shmid"
-	Set gtmtypes("sgmnt_data",91,"off")=516
+	Set gtmtypes("sgmnt_data",90,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","writer_trigger_factor")=90
+	Set gtmtypes("sgmnt_data",91,"name")="sgmnt_data.semid"
+	Set gtmtypes("sgmnt_data",91,"off")=512
 	Set gtmtypes("sgmnt_data",91,"len")=4
 	Set gtmtypes("sgmnt_data",91,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","shmid")=91
-	Set gtmtypes("sgmnt_data",92,"name")="sgmnt_data.gt_sem_ctime"
-	Set gtmtypes("sgmnt_data",92,"off")=520
-	Set gtmtypes("sgmnt_data",92,"len")=8
-	Set gtmtypes("sgmnt_data",92,"type")="gtm_time8"
-	Set gtmtypfldindx("sgmnt_data","gt_sem_ctime")=92
-	Set gtmtypes("sgmnt_data",93,"name")="sgmnt_data.gt_sem_ctime.ctime"
+	Set gtmtypfldindx("sgmnt_data","semid")=91
+	Set gtmtypes("sgmnt_data",92,"name")="sgmnt_data.shmid"
+	Set gtmtypes("sgmnt_data",92,"off")=516
+	Set gtmtypes("sgmnt_data",92,"len")=4
+	Set gtmtypes("sgmnt_data",92,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","shmid")=92
+	Set gtmtypes("sgmnt_data",93,"name")="sgmnt_data.gt_sem_ctime"
 	Set gtmtypes("sgmnt_data",93,"off")=520
-	Set gtmtypes("sgmnt_data",93,"len")=4
-	Set gtmtypes("sgmnt_data",93,"type")="time_t"
-	Set gtmtypfldindx("sgmnt_data","gt_sem_ctime.ctime")=93
-	Set gtmtypes("sgmnt_data",94,"name")="sgmnt_data.gt_sem_ctime.filler"
+	Set gtmtypes("sgmnt_data",93,"len")=8
+	Set gtmtypes("sgmnt_data",93,"type")="gtm_time8"
+	Set gtmtypfldindx("sgmnt_data","gt_sem_ctime")=93
+	Set gtmtypes("sgmnt_data",94,"name")="sgmnt_data.gt_sem_ctime.ctime"
 	Set gtmtypes("sgmnt_data",94,"off")=520
-	Set gtmtypes("sgmnt_data",94,"len")=8
-	Set gtmtypes("sgmnt_data",94,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","gt_sem_ctime.filler")=94
-	Set gtmtypes("sgmnt_data",94,"dim")=2
-	Set gtmtypes("sgmnt_data",95,"name")="sgmnt_data.gt_shm_ctime"
-	Set gtmtypes("sgmnt_data",95,"off")=528
+	Set gtmtypes("sgmnt_data",94,"len")=4
+	Set gtmtypes("sgmnt_data",94,"type")="time_t"
+	Set gtmtypfldindx("sgmnt_data","gt_sem_ctime.ctime")=94
+	Set gtmtypes("sgmnt_data",95,"name")="sgmnt_data.gt_sem_ctime.filler"
+	Set gtmtypes("sgmnt_data",95,"off")=520
 	Set gtmtypes("sgmnt_data",95,"len")=8
-	Set gtmtypes("sgmnt_data",95,"type")="gtm_time8"
-	Set gtmtypfldindx("sgmnt_data","gt_shm_ctime")=95
-	Set gtmtypes("sgmnt_data",96,"name")="sgmnt_data.gt_shm_ctime.ctime"
+	Set gtmtypes("sgmnt_data",95,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","gt_sem_ctime.filler")=95
+	Set gtmtypes("sgmnt_data",95,"dim")=2
+	Set gtmtypes("sgmnt_data",96,"name")="sgmnt_data.gt_shm_ctime"
 	Set gtmtypes("sgmnt_data",96,"off")=528
-	Set gtmtypes("sgmnt_data",96,"len")=4
-	Set gtmtypes("sgmnt_data",96,"type")="time_t"
-	Set gtmtypfldindx("sgmnt_data","gt_shm_ctime.ctime")=96
-	Set gtmtypes("sgmnt_data",97,"name")="sgmnt_data.gt_shm_ctime.filler"
+	Set gtmtypes("sgmnt_data",96,"len")=8
+	Set gtmtypes("sgmnt_data",96,"type")="gtm_time8"
+	Set gtmtypfldindx("sgmnt_data","gt_shm_ctime")=96
+	Set gtmtypes("sgmnt_data",97,"name")="sgmnt_data.gt_shm_ctime.ctime"
 	Set gtmtypes("sgmnt_data",97,"off")=528
-	Set gtmtypes("sgmnt_data",97,"len")=8
-	Set gtmtypes("sgmnt_data",97,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","gt_shm_ctime.filler")=97
-	Set gtmtypes("sgmnt_data",97,"dim")=2
-	Set gtmtypes("sgmnt_data",98,"name")="sgmnt_data.filler_unixonly"
-	Set gtmtypes("sgmnt_data",98,"off")=536
-	Set gtmtypes("sgmnt_data",98,"len")=40
-	Set gtmtypes("sgmnt_data",98,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","filler_unixonly")=98
-	Set gtmtypes("sgmnt_data",99,"name")="sgmnt_data.filler_n_retries"
-	Set gtmtypes("sgmnt_data",99,"off")=576
-	Set gtmtypes("sgmnt_data",99,"len")=20
-	Set gtmtypes("sgmnt_data",99,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","filler_n_retries")=99
-	Set gtmtypes("sgmnt_data",99,"dim")=5
-	Set gtmtypes("sgmnt_data",100,"name")="sgmnt_data.filler_n_puts"
-	Set gtmtypes("sgmnt_data",100,"off")=596
-	Set gtmtypes("sgmnt_data",100,"len")=4
+	Set gtmtypes("sgmnt_data",97,"len")=4
+	Set gtmtypes("sgmnt_data",97,"type")="time_t"
+	Set gtmtypfldindx("sgmnt_data","gt_shm_ctime.ctime")=97
+	Set gtmtypes("sgmnt_data",98,"name")="sgmnt_data.gt_shm_ctime.filler"
+	Set gtmtypes("sgmnt_data",98,"off")=528
+	Set gtmtypes("sgmnt_data",98,"len")=8
+	Set gtmtypes("sgmnt_data",98,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","gt_shm_ctime.filler")=98
+	Set gtmtypes("sgmnt_data",98,"dim")=2
+	Set gtmtypes("sgmnt_data",99,"name")="sgmnt_data.filler_unixonly"
+	Set gtmtypes("sgmnt_data",99,"off")=536
+	Set gtmtypes("sgmnt_data",99,"len")=40
+	Set gtmtypes("sgmnt_data",99,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","filler_unixonly")=99
+	Set gtmtypes("sgmnt_data",100,"name")="sgmnt_data.filler_n_retries"
+	Set gtmtypes("sgmnt_data",100,"off")=576
+	Set gtmtypes("sgmnt_data",100,"len")=20
 	Set gtmtypes("sgmnt_data",100,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","filler_n_puts")=100
-	Set gtmtypes("sgmnt_data",101,"name")="sgmnt_data.filler_n_kills"
-	Set gtmtypes("sgmnt_data",101,"off")=600
+	Set gtmtypfldindx("sgmnt_data","filler_n_retries")=100
+	Set gtmtypes("sgmnt_data",100,"dim")=5
+	Set gtmtypes("sgmnt_data",101,"name")="sgmnt_data.filler_n_puts"
+	Set gtmtypes("sgmnt_data",101,"off")=596
 	Set gtmtypes("sgmnt_data",101,"len")=4
 	Set gtmtypes("sgmnt_data",101,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","filler_n_kills")=101
-	Set gtmtypes("sgmnt_data",102,"name")="sgmnt_data.filler_n_queries"
-	Set gtmtypes("sgmnt_data",102,"off")=604
+	Set gtmtypfldindx("sgmnt_data","filler_n_puts")=101
+	Set gtmtypes("sgmnt_data",102,"name")="sgmnt_data.filler_n_kills"
+	Set gtmtypes("sgmnt_data",102,"off")=600
 	Set gtmtypes("sgmnt_data",102,"len")=4
 	Set gtmtypes("sgmnt_data",102,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","filler_n_queries")=102
-	Set gtmtypes("sgmnt_data",103,"name")="sgmnt_data.filler_n_gets"
-	Set gtmtypes("sgmnt_data",103,"off")=608
+	Set gtmtypfldindx("sgmnt_data","filler_n_kills")=102
+	Set gtmtypes("sgmnt_data",103,"name")="sgmnt_data.filler_n_queries"
+	Set gtmtypes("sgmnt_data",103,"off")=604
 	Set gtmtypes("sgmnt_data",103,"len")=4
 	Set gtmtypes("sgmnt_data",103,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","filler_n_gets")=103
-	Set gtmtypes("sgmnt_data",104,"name")="sgmnt_data.filler_n_order"
-	Set gtmtypes("sgmnt_data",104,"off")=612
+	Set gtmtypfldindx("sgmnt_data","filler_n_queries")=103
+	Set gtmtypes("sgmnt_data",104,"name")="sgmnt_data.filler_n_gets"
+	Set gtmtypes("sgmnt_data",104,"off")=608
 	Set gtmtypes("sgmnt_data",104,"len")=4
 	Set gtmtypes("sgmnt_data",104,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","filler_n_order")=104
-	Set gtmtypes("sgmnt_data",105,"name")="sgmnt_data.filler_n_zprevs"
-	Set gtmtypes("sgmnt_data",105,"off")=616
+	Set gtmtypfldindx("sgmnt_data","filler_n_gets")=104
+	Set gtmtypes("sgmnt_data",105,"name")="sgmnt_data.filler_n_order"
+	Set gtmtypes("sgmnt_data",105,"off")=612
 	Set gtmtypes("sgmnt_data",105,"len")=4
 	Set gtmtypes("sgmnt_data",105,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","filler_n_zprevs")=105
-	Set gtmtypes("sgmnt_data",106,"name")="sgmnt_data.filler_n_data"
-	Set gtmtypes("sgmnt_data",106,"off")=620
+	Set gtmtypfldindx("sgmnt_data","filler_n_order")=105
+	Set gtmtypes("sgmnt_data",106,"name")="sgmnt_data.filler_n_zprevs"
+	Set gtmtypes("sgmnt_data",106,"off")=616
 	Set gtmtypes("sgmnt_data",106,"len")=4
 	Set gtmtypes("sgmnt_data",106,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","filler_n_data")=106
-	Set gtmtypes("sgmnt_data",107,"name")="sgmnt_data.filler_n_puts_duplicate"
-	Set gtmtypes("sgmnt_data",107,"off")=624
+	Set gtmtypfldindx("sgmnt_data","filler_n_zprevs")=106
+	Set gtmtypes("sgmnt_data",107,"name")="sgmnt_data.filler_n_data"
+	Set gtmtypes("sgmnt_data",107,"off")=620
 	Set gtmtypes("sgmnt_data",107,"len")=4
-	Set gtmtypes("sgmnt_data",107,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","filler_n_puts_duplicate")=107
-	Set gtmtypes("sgmnt_data",108,"name")="sgmnt_data.filler_n_tp_updates"
-	Set gtmtypes("sgmnt_data",108,"off")=628
+	Set gtmtypes("sgmnt_data",107,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","filler_n_data")=107
+	Set gtmtypes("sgmnt_data",108,"name")="sgmnt_data.filler_n_puts_duplicate"
+	Set gtmtypes("sgmnt_data",108,"off")=624
 	Set gtmtypes("sgmnt_data",108,"len")=4
 	Set gtmtypes("sgmnt_data",108,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","filler_n_tp_updates")=108
-	Set gtmtypes("sgmnt_data",109,"name")="sgmnt_data.filler_n_tp_updates_duplicate"
-	Set gtmtypes("sgmnt_data",109,"off")=632
+	Set gtmtypfldindx("sgmnt_data","filler_n_puts_duplicate")=108
+	Set gtmtypes("sgmnt_data",109,"name")="sgmnt_data.filler_n_tp_updates"
+	Set gtmtypes("sgmnt_data",109,"off")=628
 	Set gtmtypes("sgmnt_data",109,"len")=4
 	Set gtmtypes("sgmnt_data",109,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","filler_n_tp_updates_duplicate")=109
-	Set gtmtypes("sgmnt_data",110,"name")="sgmnt_data.filler_accounting_64_align"
-	Set gtmtypes("sgmnt_data",110,"off")=636
+	Set gtmtypfldindx("sgmnt_data","filler_n_tp_updates")=109
+	Set gtmtypes("sgmnt_data",110,"name")="sgmnt_data.filler_n_tp_updates_duplicate"
+	Set gtmtypes("sgmnt_data",110,"off")=632
 	Set gtmtypes("sgmnt_data",110,"len")=4
-	Set gtmtypes("sgmnt_data",110,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","filler_accounting_64_align")=110
-	Set gtmtypes("sgmnt_data",111,"name")="sgmnt_data.staleness"
-	Set gtmtypes("sgmnt_data",111,"off")=640
-	Set gtmtypes("sgmnt_data",111,"len")=8
-	Set gtmtypes("sgmnt_data",111,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","staleness")=111
-	Set gtmtypes("sgmnt_data",111,"dim")=2
-	Set gtmtypes("sgmnt_data",112,"name")="sgmnt_data.ccp_tick_interval"
-	Set gtmtypes("sgmnt_data",112,"off")=648
+	Set gtmtypes("sgmnt_data",110,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","filler_n_tp_updates_duplicate")=110
+	Set gtmtypes("sgmnt_data",111,"name")="sgmnt_data.filler_accounting_64_align"
+	Set gtmtypes("sgmnt_data",111,"off")=636
+	Set gtmtypes("sgmnt_data",111,"len")=4
+	Set gtmtypes("sgmnt_data",111,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","filler_accounting_64_align")=111
+	Set gtmtypes("sgmnt_data",112,"name")="sgmnt_data.staleness"
+	Set gtmtypes("sgmnt_data",112,"off")=640
 	Set gtmtypes("sgmnt_data",112,"len")=8
 	Set gtmtypes("sgmnt_data",112,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","ccp_tick_interval")=112
+	Set gtmtypfldindx("sgmnt_data","staleness")=112
 	Set gtmtypes("sgmnt_data",112,"dim")=2
-	Set gtmtypes("sgmnt_data",113,"name")="sgmnt_data.ccp_quantum_interval"
-	Set gtmtypes("sgmnt_data",113,"off")=656
+	Set gtmtypes("sgmnt_data",113,"name")="sgmnt_data.ccp_tick_interval"
+	Set gtmtypes("sgmnt_data",113,"off")=648
 	Set gtmtypes("sgmnt_data",113,"len")=8
 	Set gtmtypes("sgmnt_data",113,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","ccp_quantum_interval")=113
+	Set gtmtypfldindx("sgmnt_data","ccp_tick_interval")=113
 	Set gtmtypes("sgmnt_data",113,"dim")=2
-	Set gtmtypes("sgmnt_data",114,"name")="sgmnt_data.ccp_response_interval"
-	Set gtmtypes("sgmnt_data",114,"off")=664
+	Set gtmtypes("sgmnt_data",114,"name")="sgmnt_data.ccp_quantum_interval"
+	Set gtmtypes("sgmnt_data",114,"off")=656
 	Set gtmtypes("sgmnt_data",114,"len")=8
 	Set gtmtypes("sgmnt_data",114,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","ccp_response_interval")=114
+	Set gtmtypfldindx("sgmnt_data","ccp_quantum_interval")=114
 	Set gtmtypes("sgmnt_data",114,"dim")=2
-	Set gtmtypes("sgmnt_data",115,"name")="sgmnt_data.ccp_jnl_before"
-	Set gtmtypes("sgmnt_data",115,"off")=672
-	Set gtmtypes("sgmnt_data",115,"len")=4
-	Set gtmtypes("sgmnt_data",115,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","ccp_jnl_before")=115
-	Set gtmtypes("sgmnt_data",116,"name")="sgmnt_data.clustered"
-	Set gtmtypes("sgmnt_data",116,"off")=676
+	Set gtmtypes("sgmnt_data",115,"name")="sgmnt_data.ccp_response_interval"
+	Set gtmtypes("sgmnt_data",115,"off")=664
+	Set gtmtypes("sgmnt_data",115,"len")=8
+	Set gtmtypes("sgmnt_data",115,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","ccp_response_interval")=115
+	Set gtmtypes("sgmnt_data",115,"dim")=2
+	Set gtmtypes("sgmnt_data",116,"name")="sgmnt_data.ccp_jnl_before"
+	Set gtmtypes("sgmnt_data",116,"off")=672
 	Set gtmtypes("sgmnt_data",116,"len")=4
 	Set gtmtypes("sgmnt_data",116,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","clustered")=116
-	Set gtmtypes("sgmnt_data",117,"name")="sgmnt_data.unbacked_cache"
-	Set gtmtypes("sgmnt_data",117,"off")=680
+	Set gtmtypfldindx("sgmnt_data","ccp_jnl_before")=116
+	Set gtmtypes("sgmnt_data",117,"name")="sgmnt_data.clustered"
+	Set gtmtypes("sgmnt_data",117,"off")=676
 	Set gtmtypes("sgmnt_data",117,"len")=4
 	Set gtmtypes("sgmnt_data",117,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","unbacked_cache")=117
-	Set gtmtypes("sgmnt_data",118,"name")="sgmnt_data.rc_srv_cnt"
-	Set gtmtypes("sgmnt_data",118,"off")=684
+	Set gtmtypfldindx("sgmnt_data","clustered")=117
+	Set gtmtypes("sgmnt_data",118,"name")="sgmnt_data.unbacked_cache"
+	Set gtmtypes("sgmnt_data",118,"off")=680
 	Set gtmtypes("sgmnt_data",118,"len")=4
-	Set gtmtypes("sgmnt_data",118,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","rc_srv_cnt")=118
-	Set gtmtypes("sgmnt_data",119,"name")="sgmnt_data.dsid"
-	Set gtmtypes("sgmnt_data",119,"off")=688
+	Set gtmtypes("sgmnt_data",118,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","unbacked_cache")=118
+	Set gtmtypes("sgmnt_data",119,"name")="sgmnt_data.rc_srv_cnt"
+	Set gtmtypes("sgmnt_data",119,"off")=684
 	Set gtmtypes("sgmnt_data",119,"len")=4
 	Set gtmtypes("sgmnt_data",119,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","dsid")=119
-	Set gtmtypes("sgmnt_data",120,"name")="sgmnt_data.rc_node"
-	Set gtmtypes("sgmnt_data",120,"off")=692
+	Set gtmtypfldindx("sgmnt_data","rc_srv_cnt")=119
+	Set gtmtypes("sgmnt_data",120,"name")="sgmnt_data.dsid"
+	Set gtmtypes("sgmnt_data",120,"off")=688
 	Set gtmtypes("sgmnt_data",120,"len")=4
 	Set gtmtypes("sgmnt_data",120,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","rc_node")=120
-	Set gtmtypes("sgmnt_data",121,"name")="sgmnt_data.filler_ccp_rc"
-	Set gtmtypes("sgmnt_data",121,"off")=696
-	Set gtmtypes("sgmnt_data",121,"len")=8
-	Set gtmtypes("sgmnt_data",121,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","filler_ccp_rc")=121
-	Set gtmtypes("sgmnt_data",122,"name")="sgmnt_data.reg_seqno"
-	Set gtmtypes("sgmnt_data",122,"off")=704
+	Set gtmtypfldindx("sgmnt_data","dsid")=120
+	Set gtmtypes("sgmnt_data",121,"name")="sgmnt_data.rc_node"
+	Set gtmtypes("sgmnt_data",121,"off")=692
+	Set gtmtypes("sgmnt_data",121,"len")=4
+	Set gtmtypes("sgmnt_data",121,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","rc_node")=121
+	Set gtmtypes("sgmnt_data",122,"name")="sgmnt_data.filler_ccp_rc"
+	Set gtmtypes("sgmnt_data",122,"off")=696
 	Set gtmtypes("sgmnt_data",122,"len")=8
-	Set gtmtypes("sgmnt_data",122,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","reg_seqno")=122
-	Set gtmtypes("sgmnt_data",123,"name")="sgmnt_data.pre_multisite_resync_seqno"
-	Set gtmtypes("sgmnt_data",123,"off")=712
+	Set gtmtypes("sgmnt_data",122,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","filler_ccp_rc")=122
+	Set gtmtypes("sgmnt_data",123,"name")="sgmnt_data.reg_seqno"
+	Set gtmtypes("sgmnt_data",123,"off")=704
 	Set gtmtypes("sgmnt_data",123,"len")=8
 	Set gtmtypes("sgmnt_data",123,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","pre_multisite_resync_seqno")=123
-	Set gtmtypes("sgmnt_data",124,"name")="sgmnt_data.zqgblmod_tn"
-	Set gtmtypes("sgmnt_data",124,"off")=720
+	Set gtmtypfldindx("sgmnt_data","reg_seqno")=123
+	Set gtmtypes("sgmnt_data",124,"name")="sgmnt_data.pre_multisite_resync_seqno"
+	Set gtmtypes("sgmnt_data",124,"off")=712
 	Set gtmtypes("sgmnt_data",124,"len")=8
 	Set gtmtypes("sgmnt_data",124,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","zqgblmod_tn")=124
-	Set gtmtypes("sgmnt_data",125,"name")="sgmnt_data.zqgblmod_seqno"
-	Set gtmtypes("sgmnt_data",125,"off")=728
+	Set gtmtypfldindx("sgmnt_data","pre_multisite_resync_seqno")=124
+	Set gtmtypes("sgmnt_data",125,"name")="sgmnt_data.zqgblmod_tn"
+	Set gtmtypes("sgmnt_data",125,"off")=720
 	Set gtmtypes("sgmnt_data",125,"len")=8
 	Set gtmtypes("sgmnt_data",125,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","zqgblmod_seqno")=125
-	Set gtmtypes("sgmnt_data",126,"name")="sgmnt_data.repl_state"
-	Set gtmtypes("sgmnt_data",126,"off")=736
-	Set gtmtypes("sgmnt_data",126,"len")=4
-	Set gtmtypes("sgmnt_data",126,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","repl_state")=126
-	Set gtmtypes("sgmnt_data",127,"name")="sgmnt_data.multi_site_open"
-	Set gtmtypes("sgmnt_data",127,"off")=740
+	Set gtmtypfldindx("sgmnt_data","zqgblmod_tn")=125
+	Set gtmtypes("sgmnt_data",126,"name")="sgmnt_data.zqgblmod_seqno"
+	Set gtmtypes("sgmnt_data",126,"off")=728
+	Set gtmtypes("sgmnt_data",126,"len")=8
+	Set gtmtypes("sgmnt_data",126,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","zqgblmod_seqno")=126
+	Set gtmtypes("sgmnt_data",127,"name")="sgmnt_data.repl_state"
+	Set gtmtypes("sgmnt_data",127,"off")=736
 	Set gtmtypes("sgmnt_data",127,"len")=4
-	Set gtmtypes("sgmnt_data",127,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","multi_site_open")=127
-	Set gtmtypes("sgmnt_data",128,"name")="sgmnt_data.filler_seqno"
-	Set gtmtypes("sgmnt_data",128,"off")=744
-	Set gtmtypes("sgmnt_data",128,"len")=8
-	Set gtmtypes("sgmnt_data",128,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","filler_seqno")=128
-	Set gtmtypes("sgmnt_data",129,"name")="sgmnt_data.filler_repl"
-	Set gtmtypes("sgmnt_data",129,"off")=752
-	Set gtmtypes("sgmnt_data",129,"len")=16
-	Set gtmtypes("sgmnt_data",129,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","filler_repl")=129
-	Set gtmtypes("sgmnt_data",130,"name")="sgmnt_data.filler_n_tp_retries"
-	Set gtmtypes("sgmnt_data",130,"off")=768
-	Set gtmtypes("sgmnt_data",130,"len")=48
-	Set gtmtypes("sgmnt_data",130,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","filler_n_tp_retries")=130
-	Set gtmtypes("sgmnt_data",130,"dim")=12
-	Set gtmtypes("sgmnt_data",131,"name")="sgmnt_data.filler_n_tp_retries_conflicts"
-	Set gtmtypes("sgmnt_data",131,"off")=816
+	Set gtmtypes("sgmnt_data",127,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","repl_state")=127
+	Set gtmtypes("sgmnt_data",128,"name")="sgmnt_data.multi_site_open"
+	Set gtmtypes("sgmnt_data",128,"off")=740
+	Set gtmtypes("sgmnt_data",128,"len")=4
+	Set gtmtypes("sgmnt_data",128,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","multi_site_open")=128
+	Set gtmtypes("sgmnt_data",129,"name")="sgmnt_data.filler_seqno"
+	Set gtmtypes("sgmnt_data",129,"off")=744
+	Set gtmtypes("sgmnt_data",129,"len")=8
+	Set gtmtypes("sgmnt_data",129,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","filler_seqno")=129
+	Set gtmtypes("sgmnt_data",130,"name")="sgmnt_data.filler_repl"
+	Set gtmtypes("sgmnt_data",130,"off")=752
+	Set gtmtypes("sgmnt_data",130,"len")=16
+	Set gtmtypes("sgmnt_data",130,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","filler_repl")=130
+	Set gtmtypes("sgmnt_data",131,"name")="sgmnt_data.filler_n_tp_retries"
+	Set gtmtypes("sgmnt_data",131,"off")=768
 	Set gtmtypes("sgmnt_data",131,"len")=48
 	Set gtmtypes("sgmnt_data",131,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","filler_n_tp_retries_conflicts")=131
+	Set gtmtypfldindx("sgmnt_data","filler_n_tp_retries")=131
 	Set gtmtypes("sgmnt_data",131,"dim")=12
-	Set gtmtypes("sgmnt_data",132,"name")="sgmnt_data.tp_cdb_sc_blkmod"
-	Set gtmtypes("sgmnt_data",132,"off")=864
-	Set gtmtypes("sgmnt_data",132,"len")=32
+	Set gtmtypes("sgmnt_data",132,"name")="sgmnt_data.filler_n_tp_retries_conflicts"
+	Set gtmtypes("sgmnt_data",132,"off")=816
+	Set gtmtypes("sgmnt_data",132,"len")=48
 	Set gtmtypes("sgmnt_data",132,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","tp_cdb_sc_blkmod")=132
-	Set gtmtypes("sgmnt_data",132,"dim")=8
-	Set gtmtypes("sgmnt_data",133,"name")="sgmnt_data.jnl_alq"
-	Set gtmtypes("sgmnt_data",133,"off")=896
-	Set gtmtypes("sgmnt_data",133,"len")=4
-	Set gtmtypes("sgmnt_data",133,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","jnl_alq")=133
-	Set gtmtypes("sgmnt_data",134,"name")="sgmnt_data.jnl_deq"
-	Set gtmtypes("sgmnt_data",134,"off")=900
+	Set gtmtypfldindx("sgmnt_data","filler_n_tp_retries_conflicts")=132
+	Set gtmtypes("sgmnt_data",132,"dim")=12
+	Set gtmtypes("sgmnt_data",133,"name")="sgmnt_data.tp_cdb_sc_blkmod"
+	Set gtmtypes("sgmnt_data",133,"off")=864
+	Set gtmtypes("sgmnt_data",133,"len")=32
+	Set gtmtypes("sgmnt_data",133,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","tp_cdb_sc_blkmod")=133
+	Set gtmtypes("sgmnt_data",133,"dim")=8
+	Set gtmtypes("sgmnt_data",134,"name")="sgmnt_data.jnl_alq"
+	Set gtmtypes("sgmnt_data",134,"off")=896
 	Set gtmtypes("sgmnt_data",134,"len")=4
 	Set gtmtypes("sgmnt_data",134,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","jnl_deq")=134
-	Set gtmtypes("sgmnt_data",135,"name")="sgmnt_data.jnl_buffer_size"
-	Set gtmtypes("sgmnt_data",135,"off")=904
+	Set gtmtypfldindx("sgmnt_data","jnl_alq")=134
+	Set gtmtypes("sgmnt_data",135,"name")="sgmnt_data.jnl_deq"
+	Set gtmtypes("sgmnt_data",135,"off")=900
 	Set gtmtypes("sgmnt_data",135,"len")=4
-	Set gtmtypes("sgmnt_data",135,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","jnl_buffer_size")=135
-	Set gtmtypes("sgmnt_data",136,"name")="sgmnt_data.jnl_before_image"
-	Set gtmtypes("sgmnt_data",136,"off")=908
+	Set gtmtypes("sgmnt_data",135,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","jnl_deq")=135
+	Set gtmtypes("sgmnt_data",136,"name")="sgmnt_data.jnl_buffer_size"
+	Set gtmtypes("sgmnt_data",136,"off")=904
 	Set gtmtypes("sgmnt_data",136,"len")=4
-	Set gtmtypes("sgmnt_data",136,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","jnl_before_image")=136
-	Set gtmtypes("sgmnt_data",137,"name")="sgmnt_data.jnl_state"
-	Set gtmtypes("sgmnt_data",137,"off")=912
+	Set gtmtypes("sgmnt_data",136,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","jnl_buffer_size")=136
+	Set gtmtypes("sgmnt_data",137,"name")="sgmnt_data.jnl_before_image"
+	Set gtmtypes("sgmnt_data",137,"off")=908
 	Set gtmtypes("sgmnt_data",137,"len")=4
-	Set gtmtypes("sgmnt_data",137,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","jnl_state")=137
-	Set gtmtypes("sgmnt_data",138,"name")="sgmnt_data.jnl_file_len"
-	Set gtmtypes("sgmnt_data",138,"off")=916
+	Set gtmtypes("sgmnt_data",137,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","jnl_before_image")=137
+	Set gtmtypes("sgmnt_data",138,"name")="sgmnt_data.jnl_state"
+	Set gtmtypes("sgmnt_data",138,"off")=912
 	Set gtmtypes("sgmnt_data",138,"len")=4
-	Set gtmtypes("sgmnt_data",138,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","jnl_file_len")=138
-	Set gtmtypes("sgmnt_data",139,"name")="sgmnt_data.autoswitchlimit"
-	Set gtmtypes("sgmnt_data",139,"off")=920
+	Set gtmtypes("sgmnt_data",138,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","jnl_state")=138
+	Set gtmtypes("sgmnt_data",139,"name")="sgmnt_data.jnl_file_len"
+	Set gtmtypes("sgmnt_data",139,"off")=916
 	Set gtmtypes("sgmnt_data",139,"len")=4
 	Set gtmtypes("sgmnt_data",139,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","autoswitchlimit")=139
-	Set gtmtypes("sgmnt_data",140,"name")="sgmnt_data.epoch_interval"
-	Set gtmtypes("sgmnt_data",140,"off")=924
+	Set gtmtypfldindx("sgmnt_data","jnl_file_len")=139
+	Set gtmtypes("sgmnt_data",140,"name")="sgmnt_data.autoswitchlimit"
+	Set gtmtypes("sgmnt_data",140,"off")=920
 	Set gtmtypes("sgmnt_data",140,"len")=4
-	Set gtmtypes("sgmnt_data",140,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","epoch_interval")=140
-	Set gtmtypes("sgmnt_data",141,"name")="sgmnt_data.alignsize"
-	Set gtmtypes("sgmnt_data",141,"off")=928
+	Set gtmtypes("sgmnt_data",140,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","autoswitchlimit")=140
+	Set gtmtypes("sgmnt_data",141,"name")="sgmnt_data.epoch_interval"
+	Set gtmtypes("sgmnt_data",141,"off")=924
 	Set gtmtypes("sgmnt_data",141,"len")=4
-	Set gtmtypes("sgmnt_data",141,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","alignsize")=141
-	Set gtmtypes("sgmnt_data",142,"name")="sgmnt_data.jnl_sync_io"
-	Set gtmtypes("sgmnt_data",142,"off")=932
+	Set gtmtypes("sgmnt_data",141,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","epoch_interval")=141
+	Set gtmtypes("sgmnt_data",142,"name")="sgmnt_data.alignsize"
+	Set gtmtypes("sgmnt_data",142,"off")=928
 	Set gtmtypes("sgmnt_data",142,"len")=4
-	Set gtmtypes("sgmnt_data",142,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","jnl_sync_io")=142
-	Set gtmtypes("sgmnt_data",143,"name")="sgmnt_data.yield_lmt"
-	Set gtmtypes("sgmnt_data",143,"off")=936
+	Set gtmtypes("sgmnt_data",142,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","alignsize")=142
+	Set gtmtypes("sgmnt_data",143,"name")="sgmnt_data.jnl_sync_io"
+	Set gtmtypes("sgmnt_data",143,"off")=932
 	Set gtmtypes("sgmnt_data",143,"len")=4
 	Set gtmtypes("sgmnt_data",143,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","yield_lmt")=143
-	Set gtmtypes("sgmnt_data",144,"name")="sgmnt_data.turn_around_point"
-	Set gtmtypes("sgmnt_data",144,"off")=940
+	Set gtmtypfldindx("sgmnt_data","jnl_sync_io")=143
+	Set gtmtypes("sgmnt_data",144,"name")="sgmnt_data.yield_lmt"
+	Set gtmtypes("sgmnt_data",144,"off")=936
 	Set gtmtypes("sgmnt_data",144,"len")=4
-	Set gtmtypes("sgmnt_data",144,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","turn_around_point")=144
-	Set gtmtypes("sgmnt_data",145,"name")="sgmnt_data.jnl_eovtn"
-	Set gtmtypes("sgmnt_data",145,"off")=944
-	Set gtmtypes("sgmnt_data",145,"len")=8
-	Set gtmtypes("sgmnt_data",145,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","jnl_eovtn")=145
-	Set gtmtypes("sgmnt_data",146,"name")="sgmnt_data.filler_jnl"
-	Set gtmtypes("sgmnt_data",146,"off")=952
+	Set gtmtypes("sgmnt_data",144,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","yield_lmt")=144
+	Set gtmtypes("sgmnt_data",145,"name")="sgmnt_data.turn_around_point"
+	Set gtmtypes("sgmnt_data",145,"off")=940
+	Set gtmtypes("sgmnt_data",145,"len")=4
+	Set gtmtypes("sgmnt_data",145,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","turn_around_point")=145
+	Set gtmtypes("sgmnt_data",146,"name")="sgmnt_data.jnl_eovtn"
+	Set gtmtypes("sgmnt_data",146,"off")=944
 	Set gtmtypes("sgmnt_data",146,"len")=8
-	Set gtmtypes("sgmnt_data",146,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","filler_jnl")=146
-	Set gtmtypes("sgmnt_data",147,"name")="sgmnt_data.intrpt_recov_resync_seqno"
-	Set gtmtypes("sgmnt_data",147,"off")=960
+	Set gtmtypes("sgmnt_data",146,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","jnl_eovtn")=146
+	Set gtmtypes("sgmnt_data",147,"name")="sgmnt_data.filler_jnl"
+	Set gtmtypes("sgmnt_data",147,"off")=952
 	Set gtmtypes("sgmnt_data",147,"len")=8
-	Set gtmtypes("sgmnt_data",147,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","intrpt_recov_resync_seqno")=147
-	Set gtmtypes("sgmnt_data",148,"name")="sgmnt_data.intrpt_recov_tp_resolve_time"
-	Set gtmtypes("sgmnt_data",148,"off")=968
-	Set gtmtypes("sgmnt_data",148,"len")=4
-	Set gtmtypes("sgmnt_data",148,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","intrpt_recov_tp_resolve_time")=148
-	Set gtmtypes("sgmnt_data",149,"name")="sgmnt_data.recov_interrupted"
-	Set gtmtypes("sgmnt_data",149,"off")=972
+	Set gtmtypes("sgmnt_data",147,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","filler_jnl")=147
+	Set gtmtypes("sgmnt_data",148,"name")="sgmnt_data.intrpt_recov_resync_seqno"
+	Set gtmtypes("sgmnt_data",148,"off")=960
+	Set gtmtypes("sgmnt_data",148,"len")=8
+	Set gtmtypes("sgmnt_data",148,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","intrpt_recov_resync_seqno")=148
+	Set gtmtypes("sgmnt_data",149,"name")="sgmnt_data.intrpt_recov_tp_resolve_time"
+	Set gtmtypes("sgmnt_data",149,"off")=968
 	Set gtmtypes("sgmnt_data",149,"len")=4
-	Set gtmtypes("sgmnt_data",149,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","recov_interrupted")=149
-	Set gtmtypes("sgmnt_data",150,"name")="sgmnt_data.intrpt_recov_jnl_state"
-	Set gtmtypes("sgmnt_data",150,"off")=976
+	Set gtmtypes("sgmnt_data",149,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","intrpt_recov_tp_resolve_time")=149
+	Set gtmtypes("sgmnt_data",150,"name")="sgmnt_data.recov_interrupted"
+	Set gtmtypes("sgmnt_data",150,"off")=972
 	Set gtmtypes("sgmnt_data",150,"len")=4
-	Set gtmtypes("sgmnt_data",150,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","intrpt_recov_jnl_state")=150
-	Set gtmtypes("sgmnt_data",151,"name")="sgmnt_data.intrpt_recov_repl_state"
-	Set gtmtypes("sgmnt_data",151,"off")=980
+	Set gtmtypes("sgmnt_data",150,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","recov_interrupted")=150
+	Set gtmtypes("sgmnt_data",151,"name")="sgmnt_data.intrpt_recov_jnl_state"
+	Set gtmtypes("sgmnt_data",151,"off")=976
 	Set gtmtypes("sgmnt_data",151,"len")=4
 	Set gtmtypes("sgmnt_data",151,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","intrpt_recov_repl_state")=151
-	Set gtmtypes("sgmnt_data",152,"name")="sgmnt_data.before_trunc_total_blks"
-	Set gtmtypes("sgmnt_data",152,"off")=984
+	Set gtmtypfldindx("sgmnt_data","intrpt_recov_jnl_state")=151
+	Set gtmtypes("sgmnt_data",152,"name")="sgmnt_data.intrpt_recov_repl_state"
+	Set gtmtypes("sgmnt_data",152,"off")=980
 	Set gtmtypes("sgmnt_data",152,"len")=4
-	Set gtmtypes("sgmnt_data",152,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","before_trunc_total_blks")=152
-	Set gtmtypes("sgmnt_data",153,"name")="sgmnt_data.after_trunc_total_blks"
-	Set gtmtypes("sgmnt_data",153,"off")=988
+	Set gtmtypes("sgmnt_data",152,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","intrpt_recov_repl_state")=152
+	Set gtmtypes("sgmnt_data",153,"name")="sgmnt_data.before_trunc_total_blks"
+	Set gtmtypes("sgmnt_data",153,"off")=984
 	Set gtmtypes("sgmnt_data",153,"len")=4
 	Set gtmtypes("sgmnt_data",153,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","after_trunc_total_blks")=153
-	Set gtmtypes("sgmnt_data",154,"name")="sgmnt_data.before_trunc_free_blocks"
-	Set gtmtypes("sgmnt_data",154,"off")=992
+	Set gtmtypfldindx("sgmnt_data","before_trunc_total_blks")=153
+	Set gtmtypes("sgmnt_data",154,"name")="sgmnt_data.after_trunc_total_blks"
+	Set gtmtypes("sgmnt_data",154,"off")=988
 	Set gtmtypes("sgmnt_data",154,"len")=4
 	Set gtmtypes("sgmnt_data",154,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","before_trunc_free_blocks")=154
-	Set gtmtypes("sgmnt_data",155,"name")="sgmnt_data.filler_trunc"
-	Set gtmtypes("sgmnt_data",155,"off")=996
+	Set gtmtypfldindx("sgmnt_data","after_trunc_total_blks")=154
+	Set gtmtypes("sgmnt_data",155,"name")="sgmnt_data.before_trunc_free_blocks"
+	Set gtmtypes("sgmnt_data",155,"off")=992
 	Set gtmtypes("sgmnt_data",155,"len")=4
 	Set gtmtypes("sgmnt_data",155,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","filler_trunc")=155
-	Set gtmtypes("sgmnt_data",156,"name")="sgmnt_data.filler_1k"
-	Set gtmtypes("sgmnt_data",156,"off")=1000
-	Set gtmtypes("sgmnt_data",156,"len")=24
-	Set gtmtypes("sgmnt_data",156,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","filler_1k")=156
-	Set gtmtypes("sgmnt_data",157,"name")="sgmnt_data.jnl_file_name"
-	Set gtmtypes("sgmnt_data",157,"off")=1024
-	Set gtmtypes("sgmnt_data",157,"len")=256
-	Set gtmtypes("sgmnt_data",157,"type")="unsigned-char"
-	Set gtmtypfldindx("sgmnt_data","jnl_file_name")=157
-	Set gtmtypes("sgmnt_data",158,"name")="sgmnt_data.reorg_restart_key"
-	Set gtmtypes("sgmnt_data",158,"off")=1280
+	Set gtmtypfldindx("sgmnt_data","before_trunc_free_blocks")=155
+	Set gtmtypes("sgmnt_data",156,"name")="sgmnt_data.filler_trunc"
+	Set gtmtypes("sgmnt_data",156,"off")=996
+	Set gtmtypes("sgmnt_data",156,"len")=4
+	Set gtmtypes("sgmnt_data",156,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","filler_trunc")=156
+	Set gtmtypes("sgmnt_data",157,"name")="sgmnt_data.filler_1k"
+	Set gtmtypes("sgmnt_data",157,"off")=1000
+	Set gtmtypes("sgmnt_data",157,"len")=24
+	Set gtmtypes("sgmnt_data",157,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","filler_1k")=157
+	Set gtmtypes("sgmnt_data",158,"name")="sgmnt_data.jnl_file_name"
+	Set gtmtypes("sgmnt_data",158,"off")=1024
 	Set gtmtypes("sgmnt_data",158,"len")=256
 	Set gtmtypes("sgmnt_data",158,"type")="unsigned-char"
-	Set gtmtypfldindx("sgmnt_data","reorg_restart_key")=158
-	Set gtmtypes("sgmnt_data",159,"name")="sgmnt_data.machine_name"
-	Set gtmtypes("sgmnt_data",159,"off")=1536
+	Set gtmtypfldindx("sgmnt_data","jnl_file_name")=158
+	Set gtmtypes("sgmnt_data",159,"name")="sgmnt_data.reorg_restart_key"
+	Set gtmtypes("sgmnt_data",159,"off")=1280
 	Set gtmtypes("sgmnt_data",159,"len")=256
-	Set gtmtypes("sgmnt_data",159,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","machine_name")=159
-	Set gtmtypes("sgmnt_data",160,"name")="sgmnt_data.encryption_hash"
-	Set gtmtypes("sgmnt_data",160,"off")=1792
-	Set gtmtypes("sgmnt_data",160,"len")=80
+	Set gtmtypes("sgmnt_data",159,"type")="unsigned-char"
+	Set gtmtypfldindx("sgmnt_data","reorg_restart_key")=159
+	Set gtmtypes("sgmnt_data",160,"name")="sgmnt_data.machine_name"
+	Set gtmtypes("sgmnt_data",160,"off")=1536
+	Set gtmtypes("sgmnt_data",160,"len")=256
 	Set gtmtypes("sgmnt_data",160,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","encryption_hash")=160
-	Set gtmtypes("sgmnt_data",161,"name")="sgmnt_data.encryption_hash2"
-	Set gtmtypes("sgmnt_data",161,"off")=1872
+	Set gtmtypfldindx("sgmnt_data","machine_name")=160
+	Set gtmtypes("sgmnt_data",161,"name")="sgmnt_data.encryption_hash"
+	Set gtmtypes("sgmnt_data",161,"off")=1792
 	Set gtmtypes("sgmnt_data",161,"len")=80
 	Set gtmtypes("sgmnt_data",161,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","encryption_hash2")=161
-	Set gtmtypes("sgmnt_data",162,"name")="sgmnt_data.non_null_iv"
-	Set gtmtypes("sgmnt_data",162,"off")=1952
-	Set gtmtypes("sgmnt_data",162,"len")=4
-	Set gtmtypes("sgmnt_data",162,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","non_null_iv")=162
-	Set gtmtypes("sgmnt_data",163,"name")="sgmnt_data.encryption_hash_cutoff"
-	Set gtmtypes("sgmnt_data",163,"off")=1956
+	Set gtmtypfldindx("sgmnt_data","encryption_hash")=161
+	Set gtmtypes("sgmnt_data",162,"name")="sgmnt_data.encryption_hash2"
+	Set gtmtypes("sgmnt_data",162,"off")=1872
+	Set gtmtypes("sgmnt_data",162,"len")=80
+	Set gtmtypes("sgmnt_data",162,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","encryption_hash2")=162
+	Set gtmtypes("sgmnt_data",163,"name")="sgmnt_data.non_null_iv"
+	Set gtmtypes("sgmnt_data",163,"off")=1952
 	Set gtmtypes("sgmnt_data",163,"len")=4
-	Set gtmtypes("sgmnt_data",163,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","encryption_hash_cutoff")=163
-	Set gtmtypes("sgmnt_data",164,"name")="sgmnt_data.encryption_hash2_start_tn"
-	Set gtmtypes("sgmnt_data",164,"off")=1960
-	Set gtmtypes("sgmnt_data",164,"len")=8
-	Set gtmtypes("sgmnt_data",164,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","encryption_hash2_start_tn")=164
-	Set gtmtypes("sgmnt_data",165,"name")="sgmnt_data.filler_encrypt"
-	Set gtmtypes("sgmnt_data",165,"off")=1968
-	Set gtmtypes("sgmnt_data",165,"len")=80
-	Set gtmtypes("sgmnt_data",165,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","filler_encrypt")=165
-	Set gtmtypes("sgmnt_data",166,"name")="sgmnt_data.total_buffer_flush_tn"
-	Set gtmtypes("sgmnt_data",166,"off")=2048
-	Set gtmtypes("sgmnt_data",166,"len")=8
-	Set gtmtypes("sgmnt_data",166,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","total_buffer_flush_tn")=166
-	Set gtmtypes("sgmnt_data",167,"name")="sgmnt_data.bufct_buffer_flush_tn"
-	Set gtmtypes("sgmnt_data",167,"off")=2056
+	Set gtmtypes("sgmnt_data",163,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","non_null_iv")=163
+	Set gtmtypes("sgmnt_data",164,"name")="sgmnt_data.encryption_hash_cutoff"
+	Set gtmtypes("sgmnt_data",164,"off")=1956
+	Set gtmtypes("sgmnt_data",164,"len")=4
+	Set gtmtypes("sgmnt_data",164,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","encryption_hash_cutoff")=164
+	Set gtmtypes("sgmnt_data",165,"name")="sgmnt_data.encryption_hash2_start_tn"
+	Set gtmtypes("sgmnt_data",165,"off")=1960
+	Set gtmtypes("sgmnt_data",165,"len")=8
+	Set gtmtypes("sgmnt_data",165,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","encryption_hash2_start_tn")=165
+	Set gtmtypes("sgmnt_data",166,"name")="sgmnt_data.filler_encrypt"
+	Set gtmtypes("sgmnt_data",166,"off")=1968
+	Set gtmtypes("sgmnt_data",166,"len")=80
+	Set gtmtypes("sgmnt_data",166,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","filler_encrypt")=166
+	Set gtmtypes("sgmnt_data",167,"name")="sgmnt_data.total_buffer_flush_tn"
+	Set gtmtypes("sgmnt_data",167,"off")=2048
 	Set gtmtypes("sgmnt_data",167,"len")=8
 	Set gtmtypes("sgmnt_data",167,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","bufct_buffer_flush_tn")=167
-	Set gtmtypes("sgmnt_data",168,"name")="sgmnt_data.bufct_buffer_flush_loop_tn"
-	Set gtmtypes("sgmnt_data",168,"off")=2064
+	Set gtmtypfldindx("sgmnt_data","total_buffer_flush_tn")=167
+	Set gtmtypes("sgmnt_data",168,"name")="sgmnt_data.bufct_buffer_flush_tn"
+	Set gtmtypes("sgmnt_data",168,"off")=2056
 	Set gtmtypes("sgmnt_data",168,"len")=8
 	Set gtmtypes("sgmnt_data",168,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","bufct_buffer_flush_loop_tn")=168
-	Set gtmtypes("sgmnt_data",169,"name")="sgmnt_data.wrt_calls_tn"
-	Set gtmtypes("sgmnt_data",169,"off")=2072
+	Set gtmtypfldindx("sgmnt_data","bufct_buffer_flush_tn")=168
+	Set gtmtypes("sgmnt_data",169,"name")="sgmnt_data.bufct_buffer_flush_loop_tn"
+	Set gtmtypes("sgmnt_data",169,"off")=2064
 	Set gtmtypes("sgmnt_data",169,"len")=8
 	Set gtmtypes("sgmnt_data",169,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wrt_calls_tn")=169
-	Set gtmtypes("sgmnt_data",170,"name")="sgmnt_data.wrt_count_tn"
-	Set gtmtypes("sgmnt_data",170,"off")=2080
+	Set gtmtypfldindx("sgmnt_data","bufct_buffer_flush_loop_tn")=169
+	Set gtmtypes("sgmnt_data",170,"name")="sgmnt_data.wrt_calls_tn"
+	Set gtmtypes("sgmnt_data",170,"off")=2072
 	Set gtmtypes("sgmnt_data",170,"len")=8
 	Set gtmtypes("sgmnt_data",170,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wrt_count_tn")=170
-	Set gtmtypes("sgmnt_data",171,"name")="sgmnt_data.wrt_blocked_tn"
-	Set gtmtypes("sgmnt_data",171,"off")=2088
+	Set gtmtypfldindx("sgmnt_data","wrt_calls_tn")=170
+	Set gtmtypes("sgmnt_data",171,"name")="sgmnt_data.wrt_count_tn"
+	Set gtmtypes("sgmnt_data",171,"off")=2080
 	Set gtmtypes("sgmnt_data",171,"len")=8
 	Set gtmtypes("sgmnt_data",171,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wrt_blocked_tn")=171
-	Set gtmtypes("sgmnt_data",172,"name")="sgmnt_data.wrt_busy_tn"
-	Set gtmtypes("sgmnt_data",172,"off")=2096
+	Set gtmtypfldindx("sgmnt_data","wrt_count_tn")=171
+	Set gtmtypes("sgmnt_data",172,"name")="sgmnt_data.wrt_blocked_tn"
+	Set gtmtypes("sgmnt_data",172,"off")=2088
 	Set gtmtypes("sgmnt_data",172,"len")=8
 	Set gtmtypes("sgmnt_data",172,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wrt_busy_tn")=172
-	Set gtmtypes("sgmnt_data",173,"name")="sgmnt_data.wrt_noblks_wrtn_tn"
-	Set gtmtypes("sgmnt_data",173,"off")=2104
+	Set gtmtypfldindx("sgmnt_data","wrt_blocked_tn")=172
+	Set gtmtypes("sgmnt_data",173,"name")="sgmnt_data.wrt_busy_tn"
+	Set gtmtypes("sgmnt_data",173,"off")=2096
 	Set gtmtypes("sgmnt_data",173,"len")=8
 	Set gtmtypes("sgmnt_data",173,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wrt_noblks_wrtn_tn")=173
-	Set gtmtypes("sgmnt_data",174,"name")="sgmnt_data.reserved_bgtrcrec1_tn"
-	Set gtmtypes("sgmnt_data",174,"off")=2112
+	Set gtmtypfldindx("sgmnt_data","wrt_busy_tn")=173
+	Set gtmtypes("sgmnt_data",174,"name")="sgmnt_data.wrt_noblks_wrtn_tn"
+	Set gtmtypes("sgmnt_data",174,"off")=2104
 	Set gtmtypes("sgmnt_data",174,"len")=8
 	Set gtmtypes("sgmnt_data",174,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","reserved_bgtrcrec1_tn")=174
-	Set gtmtypes("sgmnt_data",175,"name")="sgmnt_data.reserved_bgtrcrec2_tn"
-	Set gtmtypes("sgmnt_data",175,"off")=2120
+	Set gtmtypfldindx("sgmnt_data","wrt_noblks_wrtn_tn")=174
+	Set gtmtypes("sgmnt_data",175,"name")="sgmnt_data.reserved_bgtrcrec1_tn"
+	Set gtmtypes("sgmnt_data",175,"off")=2112
 	Set gtmtypes("sgmnt_data",175,"len")=8
 	Set gtmtypes("sgmnt_data",175,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","reserved_bgtrcrec2_tn")=175
-	Set gtmtypes("sgmnt_data",176,"name")="sgmnt_data.reserved_bgtrcrec3_tn"
-	Set gtmtypes("sgmnt_data",176,"off")=2128
+	Set gtmtypfldindx("sgmnt_data","reserved_bgtrcrec1_tn")=175
+	Set gtmtypes("sgmnt_data",176,"name")="sgmnt_data.reserved_bgtrcrec2_tn"
+	Set gtmtypes("sgmnt_data",176,"off")=2120
 	Set gtmtypes("sgmnt_data",176,"len")=8
 	Set gtmtypes("sgmnt_data",176,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","reserved_bgtrcrec3_tn")=176
-	Set gtmtypes("sgmnt_data",177,"name")="sgmnt_data.lost_block_recovery_tn"
-	Set gtmtypes("sgmnt_data",177,"off")=2136
+	Set gtmtypfldindx("sgmnt_data","reserved_bgtrcrec2_tn")=176
+	Set gtmtypes("sgmnt_data",177,"name")="sgmnt_data.reserved_bgtrcrec3_tn"
+	Set gtmtypes("sgmnt_data",177,"off")=2128
 	Set gtmtypes("sgmnt_data",177,"len")=8
 	Set gtmtypes("sgmnt_data",177,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","lost_block_recovery_tn")=177
-	Set gtmtypes("sgmnt_data",178,"name")="sgmnt_data.wc_blocked_onln_rlbk_tn"
-	Set gtmtypes("sgmnt_data",178,"off")=2144
+	Set gtmtypfldindx("sgmnt_data","reserved_bgtrcrec3_tn")=177
+	Set gtmtypes("sgmnt_data",178,"name")="sgmnt_data.lost_block_recovery_tn"
+	Set gtmtypes("sgmnt_data",178,"off")=2136
 	Set gtmtypes("sgmnt_data",178,"len")=8
 	Set gtmtypes("sgmnt_data",178,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_onln_rlbk_tn")=178
-	Set gtmtypes("sgmnt_data",179,"name")="sgmnt_data.stale_tn"
-	Set gtmtypes("sgmnt_data",179,"off")=2152
+	Set gtmtypfldindx("sgmnt_data","lost_block_recovery_tn")=178
+	Set gtmtypes("sgmnt_data",179,"name")="sgmnt_data.wc_blocked_onln_rlbk_tn"
+	Set gtmtypes("sgmnt_data",179,"off")=2144
 	Set gtmtypes("sgmnt_data",179,"len")=8
 	Set gtmtypes("sgmnt_data",179,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","stale_tn")=179
-	Set gtmtypes("sgmnt_data",180,"name")="sgmnt_data.starved_tn"
-	Set gtmtypes("sgmnt_data",180,"off")=2160
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_onln_rlbk_tn")=179
+	Set gtmtypes("sgmnt_data",180,"name")="sgmnt_data.stale_tn"
+	Set gtmtypes("sgmnt_data",180,"off")=2152
 	Set gtmtypes("sgmnt_data",180,"len")=8
 	Set gtmtypes("sgmnt_data",180,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","starved_tn")=180
-	Set gtmtypes("sgmnt_data",181,"name")="sgmnt_data.stale_timer_started_tn"
-	Set gtmtypes("sgmnt_data",181,"off")=2168
+	Set gtmtypfldindx("sgmnt_data","stale_tn")=180
+	Set gtmtypes("sgmnt_data",181,"name")="sgmnt_data.starved_tn"
+	Set gtmtypes("sgmnt_data",181,"off")=2160
 	Set gtmtypes("sgmnt_data",181,"len")=8
 	Set gtmtypes("sgmnt_data",181,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","stale_timer_started_tn")=181
-	Set gtmtypes("sgmnt_data",182,"name")="sgmnt_data.stale_timer_pop_tn"
-	Set gtmtypes("sgmnt_data",182,"off")=2176
+	Set gtmtypfldindx("sgmnt_data","starved_tn")=181
+	Set gtmtypes("sgmnt_data",182,"name")="sgmnt_data.stale_timer_started_tn"
+	Set gtmtypes("sgmnt_data",182,"off")=2168
 	Set gtmtypes("sgmnt_data",182,"len")=8
 	Set gtmtypes("sgmnt_data",182,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","stale_timer_pop_tn")=182
-	Set gtmtypes("sgmnt_data",183,"name")="sgmnt_data.stale_process_defer_tn"
-	Set gtmtypes("sgmnt_data",183,"off")=2184
+	Set gtmtypfldindx("sgmnt_data","stale_timer_started_tn")=182
+	Set gtmtypes("sgmnt_data",183,"name")="sgmnt_data.stale_timer_pop_tn"
+	Set gtmtypes("sgmnt_data",183,"off")=2176
 	Set gtmtypes("sgmnt_data",183,"len")=8
 	Set gtmtypes("sgmnt_data",183,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","stale_process_defer_tn")=183
-	Set gtmtypes("sgmnt_data",184,"name")="sgmnt_data.stale_defer_processed_tn"
-	Set gtmtypes("sgmnt_data",184,"off")=2192
+	Set gtmtypfldindx("sgmnt_data","stale_timer_pop_tn")=183
+	Set gtmtypes("sgmnt_data",184,"name")="sgmnt_data.stale_process_defer_tn"
+	Set gtmtypes("sgmnt_data",184,"off")=2184
 	Set gtmtypes("sgmnt_data",184,"len")=8
 	Set gtmtypes("sgmnt_data",184,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","stale_defer_processed_tn")=184
-	Set gtmtypes("sgmnt_data",185,"name")="sgmnt_data.spcfc_buffer_flush_tn"
-	Set gtmtypes("sgmnt_data",185,"off")=2200
+	Set gtmtypfldindx("sgmnt_data","stale_process_defer_tn")=184
+	Set gtmtypes("sgmnt_data",185,"name")="sgmnt_data.stale_defer_processed_tn"
+	Set gtmtypes("sgmnt_data",185,"off")=2192
 	Set gtmtypes("sgmnt_data",185,"len")=8
 	Set gtmtypes("sgmnt_data",185,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","spcfc_buffer_flush_tn")=185
-	Set gtmtypes("sgmnt_data",186,"name")="sgmnt_data.spcfc_buffer_flush_loop_tn"
-	Set gtmtypes("sgmnt_data",186,"off")=2208
+	Set gtmtypfldindx("sgmnt_data","stale_defer_processed_tn")=185
+	Set gtmtypes("sgmnt_data",186,"name")="sgmnt_data.spcfc_buffer_flush_tn"
+	Set gtmtypes("sgmnt_data",186,"off")=2200
 	Set gtmtypes("sgmnt_data",186,"len")=8
 	Set gtmtypes("sgmnt_data",186,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","spcfc_buffer_flush_loop_tn")=186
-	Set gtmtypes("sgmnt_data",187,"name")="sgmnt_data.spcfc_buffer_flush_retries_tn"
-	Set gtmtypes("sgmnt_data",187,"off")=2216
+	Set gtmtypfldindx("sgmnt_data","spcfc_buffer_flush_tn")=186
+	Set gtmtypes("sgmnt_data",187,"name")="sgmnt_data.spcfc_buffer_flush_loop_tn"
+	Set gtmtypes("sgmnt_data",187,"off")=2208
 	Set gtmtypes("sgmnt_data",187,"len")=8
 	Set gtmtypes("sgmnt_data",187,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","spcfc_buffer_flush_retries_tn")=187
-	Set gtmtypes("sgmnt_data",188,"name")="sgmnt_data.spcfc_buffer_flushed_during_lockwait_tn"
-	Set gtmtypes("sgmnt_data",188,"off")=2224
+	Set gtmtypfldindx("sgmnt_data","spcfc_buffer_flush_loop_tn")=187
+	Set gtmtypes("sgmnt_data",188,"name")="sgmnt_data.spcfc_buffer_flush_retries_tn"
+	Set gtmtypes("sgmnt_data",188,"off")=2216
 	Set gtmtypes("sgmnt_data",188,"len")=8
 	Set gtmtypes("sgmnt_data",188,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","spcfc_buffer_flushed_during_lockwait_tn")=188
-	Set gtmtypes("sgmnt_data",189,"name")="sgmnt_data.tp_crit_retries_tn"
-	Set gtmtypes("sgmnt_data",189,"off")=2232
+	Set gtmtypfldindx("sgmnt_data","spcfc_buffer_flush_retries_tn")=188
+	Set gtmtypes("sgmnt_data",189,"name")="sgmnt_data.spcfc_buffer_flushed_during_lockwait_tn"
+	Set gtmtypes("sgmnt_data",189,"off")=2224
 	Set gtmtypes("sgmnt_data",189,"len")=8
 	Set gtmtypes("sgmnt_data",189,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","tp_crit_retries_tn")=189
-	Set gtmtypes("sgmnt_data",190,"name")="sgmnt_data.db_csh_getn_flush_dirty_tn"
-	Set gtmtypes("sgmnt_data",190,"off")=2240
+	Set gtmtypfldindx("sgmnt_data","spcfc_buffer_flushed_during_lockwait_tn")=189
+	Set gtmtypes("sgmnt_data",190,"name")="sgmnt_data.tp_crit_retries_tn"
+	Set gtmtypes("sgmnt_data",190,"off")=2232
 	Set gtmtypes("sgmnt_data",190,"len")=8
 	Set gtmtypes("sgmnt_data",190,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","db_csh_getn_flush_dirty_tn")=190
-	Set gtmtypes("sgmnt_data",191,"name")="sgmnt_data.db_csh_getn_rip_wait_tn"
-	Set gtmtypes("sgmnt_data",191,"off")=2248
+	Set gtmtypfldindx("sgmnt_data","tp_crit_retries_tn")=190
+	Set gtmtypes("sgmnt_data",191,"name")="sgmnt_data.db_csh_getn_flush_dirty_tn"
+	Set gtmtypes("sgmnt_data",191,"off")=2240
 	Set gtmtypes("sgmnt_data",191,"len")=8
 	Set gtmtypes("sgmnt_data",191,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","db_csh_getn_rip_wait_tn")=191
-	Set gtmtypes("sgmnt_data",192,"name")="sgmnt_data.db_csh_getn_buf_owner_stuck_tn"
-	Set gtmtypes("sgmnt_data",192,"off")=2256
+	Set gtmtypfldindx("sgmnt_data","db_csh_getn_flush_dirty_tn")=191
+	Set gtmtypes("sgmnt_data",192,"name")="sgmnt_data.db_csh_getn_rip_wait_tn"
+	Set gtmtypes("sgmnt_data",192,"off")=2248
 	Set gtmtypes("sgmnt_data",192,"len")=8
 	Set gtmtypes("sgmnt_data",192,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","db_csh_getn_buf_owner_stuck_tn")=192
-	Set gtmtypes("sgmnt_data",193,"name")="sgmnt_data.db_csh_getn_out_of_design_tn"
-	Set gtmtypes("sgmnt_data",193,"off")=2264
+	Set gtmtypfldindx("sgmnt_data","db_csh_getn_rip_wait_tn")=192
+	Set gtmtypes("sgmnt_data",193,"name")="sgmnt_data.db_csh_getn_buf_owner_stuck_tn"
+	Set gtmtypes("sgmnt_data",193,"off")=2256
 	Set gtmtypes("sgmnt_data",193,"len")=8
 	Set gtmtypes("sgmnt_data",193,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","db_csh_getn_out_of_design_tn")=193
-	Set gtmtypes("sgmnt_data",194,"name")="sgmnt_data.t_qread_buf_owner_stuck_tn"
-	Set gtmtypes("sgmnt_data",194,"off")=2272
+	Set gtmtypfldindx("sgmnt_data","db_csh_getn_buf_owner_stuck_tn")=193
+	Set gtmtypes("sgmnt_data",194,"name")="sgmnt_data.db_csh_getn_out_of_design_tn"
+	Set gtmtypes("sgmnt_data",194,"off")=2264
 	Set gtmtypes("sgmnt_data",194,"len")=8
 	Set gtmtypes("sgmnt_data",194,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","t_qread_buf_owner_stuck_tn")=194
-	Set gtmtypes("sgmnt_data",195,"name")="sgmnt_data.t_qread_out_of_design_tn"
-	Set gtmtypes("sgmnt_data",195,"off")=2280
+	Set gtmtypfldindx("sgmnt_data","db_csh_getn_out_of_design_tn")=194
+	Set gtmtypes("sgmnt_data",195,"name")="sgmnt_data.t_qread_buf_owner_stuck_tn"
+	Set gtmtypes("sgmnt_data",195,"off")=2272
 	Set gtmtypes("sgmnt_data",195,"len")=8
 	Set gtmtypes("sgmnt_data",195,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","t_qread_out_of_design_tn")=195
-	Set gtmtypes("sgmnt_data",196,"name")="sgmnt_data.bt_put_flush_dirty_tn"
-	Set gtmtypes("sgmnt_data",196,"off")=2288
+	Set gtmtypfldindx("sgmnt_data","t_qread_buf_owner_stuck_tn")=195
+	Set gtmtypes("sgmnt_data",196,"name")="sgmnt_data.t_qread_out_of_design_tn"
+	Set gtmtypes("sgmnt_data",196,"off")=2280
 	Set gtmtypes("sgmnt_data",196,"len")=8
 	Set gtmtypes("sgmnt_data",196,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","bt_put_flush_dirty_tn")=196
-	Set gtmtypes("sgmnt_data",197,"name")="sgmnt_data.mlock_wakeups_tn"
-	Set gtmtypes("sgmnt_data",197,"off")=2296
+	Set gtmtypfldindx("sgmnt_data","t_qread_out_of_design_tn")=196
+	Set gtmtypes("sgmnt_data",197,"name")="sgmnt_data.bt_put_flush_dirty_tn"
+	Set gtmtypes("sgmnt_data",197,"off")=2288
 	Set gtmtypes("sgmnt_data",197,"len")=8
 	Set gtmtypes("sgmnt_data",197,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","mlock_wakeups_tn")=197
-	Set gtmtypes("sgmnt_data",198,"name")="sgmnt_data.wc_blocked_wcs_recover_invoked_tn"
-	Set gtmtypes("sgmnt_data",198,"off")=2304
+	Set gtmtypfldindx("sgmnt_data","bt_put_flush_dirty_tn")=197
+	Set gtmtypes("sgmnt_data",198,"name")="sgmnt_data.mlock_wakeups_tn"
+	Set gtmtypes("sgmnt_data",198,"off")=2296
 	Set gtmtypes("sgmnt_data",198,"len")=8
 	Set gtmtypes("sgmnt_data",198,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_recover_invoked_tn")=198
-	Set gtmtypes("sgmnt_data",199,"name")="sgmnt_data.wc_blocked_wcs_verify_passed_tn"
-	Set gtmtypes("sgmnt_data",199,"off")=2312
+	Set gtmtypfldindx("sgmnt_data","mlock_wakeups_tn")=198
+	Set gtmtypes("sgmnt_data",199,"name")="sgmnt_data.wc_blocked_wcs_recover_invoked_tn"
+	Set gtmtypes("sgmnt_data",199,"off")=2304
 	Set gtmtypes("sgmnt_data",199,"len")=8
 	Set gtmtypes("sgmnt_data",199,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_verify_passed_tn")=199
-	Set gtmtypes("sgmnt_data",200,"name")="sgmnt_data.wc_blocked_t_qread_db_csh_getn_invalid_blk_tn"
-	Set gtmtypes("sgmnt_data",200,"off")=2320
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_recover_invoked_tn")=199
+	Set gtmtypes("sgmnt_data",200,"name")="sgmnt_data.wc_blocked_wcs_verify_passed_tn"
+	Set gtmtypes("sgmnt_data",200,"off")=2312
 	Set gtmtypes("sgmnt_data",200,"len")=8
 	Set gtmtypes("sgmnt_data",200,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_db_csh_getn_invalid_blk_tn")=200
-	Set gtmtypes("sgmnt_data",201,"name")="sgmnt_data.wc_blocked_t_qread_db_csh_get_invalid_blk_tn"
-	Set gtmtypes("sgmnt_data",201,"off")=2328
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_verify_passed_tn")=200
+	Set gtmtypes("sgmnt_data",201,"name")="sgmnt_data.wc_blocked_t_qread_db_csh_getn_invalid_blk_tn"
+	Set gtmtypes("sgmnt_data",201,"off")=2320
 	Set gtmtypes("sgmnt_data",201,"len")=8
 	Set gtmtypes("sgmnt_data",201,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_db_csh_get_invalid_blk_tn")=201
-	Set gtmtypes("sgmnt_data",202,"name")="sgmnt_data.wc_blocked_db_csh_getn_loopexceed_tn"
-	Set gtmtypes("sgmnt_data",202,"off")=2336
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_db_csh_getn_invalid_blk_tn")=201
+	Set gtmtypes("sgmnt_data",202,"name")="sgmnt_data.wc_blocked_t_qread_db_csh_get_invalid_blk_tn"
+	Set gtmtypes("sgmnt_data",202,"off")=2328
 	Set gtmtypes("sgmnt_data",202,"len")=8
 	Set gtmtypes("sgmnt_data",202,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_db_csh_getn_loopexceed_tn")=202
-	Set gtmtypes("sgmnt_data",203,"name")="sgmnt_data.wc_blocked_db_csh_getn_wcsstarvewrt_tn"
-	Set gtmtypes("sgmnt_data",203,"off")=2344
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_db_csh_get_invalid_blk_tn")=202
+	Set gtmtypes("sgmnt_data",203,"name")="sgmnt_data.wc_blocked_db_csh_getn_loopexceed_tn"
+	Set gtmtypes("sgmnt_data",203,"off")=2336
 	Set gtmtypes("sgmnt_data",203,"len")=8
 	Set gtmtypes("sgmnt_data",203,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_db_csh_getn_wcsstarvewrt_tn")=203
-	Set gtmtypes("sgmnt_data",204,"name")="sgmnt_data.wc_blocked_db_csh_get_tn"
-	Set gtmtypes("sgmnt_data",204,"off")=2352
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_db_csh_getn_loopexceed_tn")=203
+	Set gtmtypes("sgmnt_data",204,"name")="sgmnt_data.wc_blocked_db_csh_getn_wcsstarvewrt_tn"
+	Set gtmtypes("sgmnt_data",204,"off")=2344
 	Set gtmtypes("sgmnt_data",204,"len")=8
 	Set gtmtypes("sgmnt_data",204,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_db_csh_get_tn")=204
-	Set gtmtypes("sgmnt_data",205,"name")="sgmnt_data.wc_blocked_tp_tend_wcsgetspace_tn"
-	Set gtmtypes("sgmnt_data",205,"off")=2360
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_db_csh_getn_wcsstarvewrt_tn")=204
+	Set gtmtypes("sgmnt_data",205,"name")="sgmnt_data.wc_blocked_db_csh_get_tn"
+	Set gtmtypes("sgmnt_data",205,"off")=2352
 	Set gtmtypes("sgmnt_data",205,"len")=8
 	Set gtmtypes("sgmnt_data",205,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_wcsgetspace_tn")=205
-	Set gtmtypes("sgmnt_data",206,"name")="sgmnt_data.wc_blocked_tp_tend_t1_tn"
-	Set gtmtypes("sgmnt_data",206,"off")=2368
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_db_csh_get_tn")=205
+	Set gtmtypes("sgmnt_data",206,"name")="sgmnt_data.wc_blocked_tp_tend_wcsgetspace_tn"
+	Set gtmtypes("sgmnt_data",206,"off")=2360
 	Set gtmtypes("sgmnt_data",206,"len")=8
 	Set gtmtypes("sgmnt_data",206,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_t1_tn")=206
-	Set gtmtypes("sgmnt_data",207,"name")="sgmnt_data.wc_blocked_tp_tend_bitmap_tn"
-	Set gtmtypes("sgmnt_data",207,"off")=2376
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_wcsgetspace_tn")=206
+	Set gtmtypes("sgmnt_data",207,"name")="sgmnt_data.wc_blocked_tp_tend_t1_tn"
+	Set gtmtypes("sgmnt_data",207,"off")=2368
 	Set gtmtypes("sgmnt_data",207,"len")=8
 	Set gtmtypes("sgmnt_data",207,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_bitmap_tn")=207
-	Set gtmtypes("sgmnt_data",208,"name")="sgmnt_data.wc_blocked_tp_tend_jnl_cwset_tn"
-	Set gtmtypes("sgmnt_data",208,"off")=2384
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_t1_tn")=207
+	Set gtmtypes("sgmnt_data",208,"name")="sgmnt_data.wc_blocked_tp_tend_bitmap_tn"
+	Set gtmtypes("sgmnt_data",208,"off")=2376
 	Set gtmtypes("sgmnt_data",208,"len")=8
 	Set gtmtypes("sgmnt_data",208,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_jnl_cwset_tn")=208
-	Set gtmtypes("sgmnt_data",209,"name")="sgmnt_data.wc_blocked_tp_tend_jnl_wcsflu_tn"
-	Set gtmtypes("sgmnt_data",209,"off")=2392
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_bitmap_tn")=208
+	Set gtmtypes("sgmnt_data",209,"name")="sgmnt_data.wc_blocked_tp_tend_jnl_cwset_tn"
+	Set gtmtypes("sgmnt_data",209,"off")=2384
 	Set gtmtypes("sgmnt_data",209,"len")=8
 	Set gtmtypes("sgmnt_data",209,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_jnl_wcsflu_tn")=209
-	Set gtmtypes("sgmnt_data",210,"name")="sgmnt_data.wc_blocked_t_end_hist_tn"
-	Set gtmtypes("sgmnt_data",210,"off")=2400
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_jnl_cwset_tn")=209
+	Set gtmtypes("sgmnt_data",210,"name")="sgmnt_data.wc_blocked_tp_tend_jnl_wcsflu_tn"
+	Set gtmtypes("sgmnt_data",210,"off")=2392
 	Set gtmtypes("sgmnt_data",210,"len")=8
 	Set gtmtypes("sgmnt_data",210,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_hist_tn")=210
-	Set gtmtypes("sgmnt_data",211,"name")="sgmnt_data.wc_blocked_t_end_hist1_nullbt_tn"
-	Set gtmtypes("sgmnt_data",211,"off")=2408
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_jnl_wcsflu_tn")=210
+	Set gtmtypes("sgmnt_data",211,"name")="sgmnt_data.wc_blocked_t_end_hist_tn"
+	Set gtmtypes("sgmnt_data",211,"off")=2400
 	Set gtmtypes("sgmnt_data",211,"len")=8
 	Set gtmtypes("sgmnt_data",211,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_hist1_nullbt_tn")=211
-	Set gtmtypes("sgmnt_data",212,"name")="sgmnt_data.wc_blocked_t_end_hist1_nonnullbt_tn"
-	Set gtmtypes("sgmnt_data",212,"off")=2416
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_hist_tn")=211
+	Set gtmtypes("sgmnt_data",212,"name")="sgmnt_data.wc_blocked_t_end_hist1_nullbt_tn"
+	Set gtmtypes("sgmnt_data",212,"off")=2408
 	Set gtmtypes("sgmnt_data",212,"len")=8
 	Set gtmtypes("sgmnt_data",212,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_hist1_nonnullbt_tn")=212
-	Set gtmtypes("sgmnt_data",213,"name")="sgmnt_data.wc_blocked_t_end_bitmap_nullbt_tn"
-	Set gtmtypes("sgmnt_data",213,"off")=2424
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_hist1_nullbt_tn")=212
+	Set gtmtypes("sgmnt_data",213,"name")="sgmnt_data.wc_blocked_t_end_hist1_nonnullbt_tn"
+	Set gtmtypes("sgmnt_data",213,"off")=2416
 	Set gtmtypes("sgmnt_data",213,"len")=8
 	Set gtmtypes("sgmnt_data",213,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_bitmap_nullbt_tn")=213
-	Set gtmtypes("sgmnt_data",214,"name")="sgmnt_data.wc_blocked_t_end_bitmap_nonnullbt_tn"
-	Set gtmtypes("sgmnt_data",214,"off")=2432
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_hist1_nonnullbt_tn")=213
+	Set gtmtypes("sgmnt_data",214,"name")="sgmnt_data.wc_blocked_t_end_bitmap_nullbt_tn"
+	Set gtmtypes("sgmnt_data",214,"off")=2424
 	Set gtmtypes("sgmnt_data",214,"len")=8
 	Set gtmtypes("sgmnt_data",214,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_bitmap_nonnullbt_tn")=214
-	Set gtmtypes("sgmnt_data",215,"name")="sgmnt_data.wc_blocked_t_end_jnl_cwset_tn"
-	Set gtmtypes("sgmnt_data",215,"off")=2440
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_bitmap_nullbt_tn")=214
+	Set gtmtypes("sgmnt_data",215,"name")="sgmnt_data.wc_blocked_t_end_bitmap_nonnullbt_tn"
+	Set gtmtypes("sgmnt_data",215,"off")=2432
 	Set gtmtypes("sgmnt_data",215,"len")=8
 	Set gtmtypes("sgmnt_data",215,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_jnl_cwset_tn")=215
-	Set gtmtypes("sgmnt_data",216,"name")="sgmnt_data.wc_blocked_t_end_jnl_wcsflu_tn"
-	Set gtmtypes("sgmnt_data",216,"off")=2448
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_bitmap_nonnullbt_tn")=215
+	Set gtmtypes("sgmnt_data",216,"name")="sgmnt_data.wc_blocked_t_end_jnl_cwset_tn"
+	Set gtmtypes("sgmnt_data",216,"off")=2440
 	Set gtmtypes("sgmnt_data",216,"len")=8
 	Set gtmtypes("sgmnt_data",216,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_jnl_wcsflu_tn")=216
-	Set gtmtypes("sgmnt_data",217,"name")="sgmnt_data.db_csh_get_too_many_loops_tn"
-	Set gtmtypes("sgmnt_data",217,"off")=2456
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_jnl_cwset_tn")=216
+	Set gtmtypes("sgmnt_data",217,"name")="sgmnt_data.wc_blocked_t_end_jnl_wcsflu_tn"
+	Set gtmtypes("sgmnt_data",217,"off")=2448
 	Set gtmtypes("sgmnt_data",217,"len")=8
 	Set gtmtypes("sgmnt_data",217,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","db_csh_get_too_many_loops_tn")=217
-	Set gtmtypes("sgmnt_data",218,"name")="sgmnt_data.wc_blocked_tpckh_hist1_nullbt_tn"
-	Set gtmtypes("sgmnt_data",218,"off")=2464
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_jnl_wcsflu_tn")=217
+	Set gtmtypes("sgmnt_data",218,"name")="sgmnt_data.db_csh_get_too_many_loops_tn"
+	Set gtmtypes("sgmnt_data",218,"off")=2456
 	Set gtmtypes("sgmnt_data",218,"len")=8
 	Set gtmtypes("sgmnt_data",218,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tpckh_hist1_nullbt_tn")=218
-	Set gtmtypes("sgmnt_data",219,"name")="sgmnt_data.wc_blocked_tpckh_hist1_nonnullbt_tn"
-	Set gtmtypes("sgmnt_data",219,"off")=2472
+	Set gtmtypfldindx("sgmnt_data","db_csh_get_too_many_loops_tn")=218
+	Set gtmtypes("sgmnt_data",219,"name")="sgmnt_data.wc_blocked_tpckh_hist1_nullbt_tn"
+	Set gtmtypes("sgmnt_data",219,"off")=2464
 	Set gtmtypes("sgmnt_data",219,"len")=8
 	Set gtmtypes("sgmnt_data",219,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tpckh_hist1_nonnullbt_tn")=219
-	Set gtmtypes("sgmnt_data",220,"name")="sgmnt_data.jnl_blocked_writer_lost_tn"
-	Set gtmtypes("sgmnt_data",220,"off")=2480
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tpckh_hist1_nullbt_tn")=219
+	Set gtmtypes("sgmnt_data",220,"name")="sgmnt_data.wc_blocked_tpckh_hist1_nonnullbt_tn"
+	Set gtmtypes("sgmnt_data",220,"off")=2472
 	Set gtmtypes("sgmnt_data",220,"len")=8
 	Set gtmtypes("sgmnt_data",220,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","jnl_blocked_writer_lost_tn")=220
-	Set gtmtypes("sgmnt_data",221,"name")="sgmnt_data.jnl_blocked_writer_stuck_tn"
-	Set gtmtypes("sgmnt_data",221,"off")=2488
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tpckh_hist1_nonnullbt_tn")=220
+	Set gtmtypes("sgmnt_data",221,"name")="sgmnt_data.jnl_blocked_writer_lost_tn"
+	Set gtmtypes("sgmnt_data",221,"off")=2480
 	Set gtmtypes("sgmnt_data",221,"len")=8
 	Set gtmtypes("sgmnt_data",221,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","jnl_blocked_writer_stuck_tn")=221
-	Set gtmtypes("sgmnt_data",222,"name")="sgmnt_data.jnl_blocked_writer_blocked_tn"
-	Set gtmtypes("sgmnt_data",222,"off")=2496
+	Set gtmtypfldindx("sgmnt_data","jnl_blocked_writer_lost_tn")=221
+	Set gtmtypes("sgmnt_data",222,"name")="sgmnt_data.jnl_blocked_writer_stuck_tn"
+	Set gtmtypes("sgmnt_data",222,"off")=2488
 	Set gtmtypes("sgmnt_data",222,"len")=8
 	Set gtmtypes("sgmnt_data",222,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","jnl_blocked_writer_blocked_tn")=222
-	Set gtmtypes("sgmnt_data",223,"name")="sgmnt_data.n_jnl_fsyncs_tn"
-	Set gtmtypes("sgmnt_data",223,"off")=2504
+	Set gtmtypfldindx("sgmnt_data","jnl_blocked_writer_stuck_tn")=222
+	Set gtmtypes("sgmnt_data",223,"name")="sgmnt_data.jnl_blocked_writer_blocked_tn"
+	Set gtmtypes("sgmnt_data",223,"off")=2496
 	Set gtmtypes("sgmnt_data",223,"len")=8
 	Set gtmtypes("sgmnt_data",223,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","n_jnl_fsyncs_tn")=223
-	Set gtmtypes("sgmnt_data",224,"name")="sgmnt_data.n_jnl_fsync_tries_tn"
-	Set gtmtypes("sgmnt_data",224,"off")=2512
+	Set gtmtypfldindx("sgmnt_data","jnl_blocked_writer_blocked_tn")=223
+	Set gtmtypes("sgmnt_data",224,"name")="sgmnt_data.n_jnl_fsyncs_tn"
+	Set gtmtypes("sgmnt_data",224,"off")=2504
 	Set gtmtypes("sgmnt_data",224,"len")=8
 	Set gtmtypes("sgmnt_data",224,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","n_jnl_fsync_tries_tn")=224
-	Set gtmtypes("sgmnt_data",225,"name")="sgmnt_data.n_jnl_fsync_recovers_tn"
-	Set gtmtypes("sgmnt_data",225,"off")=2520
+	Set gtmtypfldindx("sgmnt_data","n_jnl_fsyncs_tn")=224
+	Set gtmtypes("sgmnt_data",225,"name")="sgmnt_data.n_jnl_fsync_tries_tn"
+	Set gtmtypes("sgmnt_data",225,"off")=2512
 	Set gtmtypes("sgmnt_data",225,"len")=8
 	Set gtmtypes("sgmnt_data",225,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","n_jnl_fsync_recovers_tn")=225
-	Set gtmtypes("sgmnt_data",226,"name")="sgmnt_data.n_db_fsyncs_tn"
-	Set gtmtypes("sgmnt_data",226,"off")=2528
+	Set gtmtypfldindx("sgmnt_data","n_jnl_fsync_tries_tn")=225
+	Set gtmtypes("sgmnt_data",226,"name")="sgmnt_data.n_jnl_fsync_recovers_tn"
+	Set gtmtypes("sgmnt_data",226,"off")=2520
 	Set gtmtypes("sgmnt_data",226,"len")=8
 	Set gtmtypes("sgmnt_data",226,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","n_db_fsyncs_tn")=226
-	Set gtmtypes("sgmnt_data",227,"name")="sgmnt_data.n_db_fsyncs_in_crit_tn"
-	Set gtmtypes("sgmnt_data",227,"off")=2536
+	Set gtmtypfldindx("sgmnt_data","n_jnl_fsync_recovers_tn")=226
+	Set gtmtypes("sgmnt_data",227,"name")="sgmnt_data.n_db_fsyncs_tn"
+	Set gtmtypes("sgmnt_data",227,"off")=2528
 	Set gtmtypes("sgmnt_data",227,"len")=8
 	Set gtmtypes("sgmnt_data",227,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","n_db_fsyncs_in_crit_tn")=227
-	Set gtmtypes("sgmnt_data",228,"name")="sgmnt_data.n_dbsync_timers_tn"
-	Set gtmtypes("sgmnt_data",228,"off")=2544
+	Set gtmtypfldindx("sgmnt_data","n_db_fsyncs_tn")=227
+	Set gtmtypes("sgmnt_data",228,"name")="sgmnt_data.n_db_fsyncs_in_crit_tn"
+	Set gtmtypes("sgmnt_data",228,"off")=2536
 	Set gtmtypes("sgmnt_data",228,"len")=8
 	Set gtmtypes("sgmnt_data",228,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","n_dbsync_timers_tn")=228
-	Set gtmtypes("sgmnt_data",229,"name")="sgmnt_data.n_dbsync_writes_tn"
-	Set gtmtypes("sgmnt_data",229,"off")=2552
+	Set gtmtypfldindx("sgmnt_data","n_db_fsyncs_in_crit_tn")=228
+	Set gtmtypes("sgmnt_data",229,"name")="sgmnt_data.n_dbsync_timers_tn"
+	Set gtmtypes("sgmnt_data",229,"off")=2544
 	Set gtmtypes("sgmnt_data",229,"len")=8
 	Set gtmtypes("sgmnt_data",229,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","n_dbsync_writes_tn")=229
-	Set gtmtypes("sgmnt_data",230,"name")="sgmnt_data.mutex_queue_full_tn"
-	Set gtmtypes("sgmnt_data",230,"off")=2560
+	Set gtmtypfldindx("sgmnt_data","n_dbsync_timers_tn")=229
+	Set gtmtypes("sgmnt_data",230,"name")="sgmnt_data.n_dbsync_writes_tn"
+	Set gtmtypes("sgmnt_data",230,"off")=2552
 	Set gtmtypes("sgmnt_data",230,"len")=8
 	Set gtmtypes("sgmnt_data",230,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","mutex_queue_full_tn")=230
-	Set gtmtypes("sgmnt_data",231,"name")="sgmnt_data.wcb_bt_put_tn"
-	Set gtmtypes("sgmnt_data",231,"off")=2568
+	Set gtmtypfldindx("sgmnt_data","n_dbsync_writes_tn")=230
+	Set gtmtypes("sgmnt_data",231,"name")="sgmnt_data.mutex_queue_full_tn"
+	Set gtmtypes("sgmnt_data",231,"off")=2560
 	Set gtmtypes("sgmnt_data",231,"len")=8
 	Set gtmtypes("sgmnt_data",231,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_bt_put_tn")=231
-	Set gtmtypes("sgmnt_data",232,"name")="sgmnt_data.wcb_mutex_salvage_tn"
-	Set gtmtypes("sgmnt_data",232,"off")=2576
+	Set gtmtypfldindx("sgmnt_data","mutex_queue_full_tn")=231
+	Set gtmtypes("sgmnt_data",232,"name")="sgmnt_data.wcb_bt_put_tn"
+	Set gtmtypes("sgmnt_data",232,"off")=2568
 	Set gtmtypes("sgmnt_data",232,"len")=8
 	Set gtmtypes("sgmnt_data",232,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_mutex_salvage_tn")=232
-	Set gtmtypes("sgmnt_data",233,"name")="sgmnt_data.wcb_tp_grab_crit_tn"
-	Set gtmtypes("sgmnt_data",233,"off")=2584
+	Set gtmtypfldindx("sgmnt_data","wcb_bt_put_tn")=232
+	Set gtmtypes("sgmnt_data",233,"name")="sgmnt_data.wcb_mutex_salvage_tn"
+	Set gtmtypes("sgmnt_data",233,"off")=2576
 	Set gtmtypes("sgmnt_data",233,"len")=8
 	Set gtmtypes("sgmnt_data",233,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_tp_grab_crit_tn")=233
-	Set gtmtypes("sgmnt_data",234,"name")="sgmnt_data.wcb_t_end_sysops_nocr_invcr_tn"
-	Set gtmtypes("sgmnt_data",234,"off")=2592
+	Set gtmtypfldindx("sgmnt_data","wcb_mutex_salvage_tn")=233
+	Set gtmtypes("sgmnt_data",234,"name")="sgmnt_data.wcb_tp_grab_crit_tn"
+	Set gtmtypes("sgmnt_data",234,"off")=2584
 	Set gtmtypes("sgmnt_data",234,"len")=8
 	Set gtmtypes("sgmnt_data",234,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_nocr_invcr_tn")=234
-	Set gtmtypes("sgmnt_data",235,"name")="sgmnt_data.wcb_t_end_sysops_cr_invcr_tn"
-	Set gtmtypes("sgmnt_data",235,"off")=2600
+	Set gtmtypfldindx("sgmnt_data","wcb_tp_grab_crit_tn")=234
+	Set gtmtypes("sgmnt_data",235,"name")="sgmnt_data.wcb_t_end_sysops_nocr_invcr_tn"
+	Set gtmtypes("sgmnt_data",235,"off")=2592
 	Set gtmtypes("sgmnt_data",235,"len")=8
 	Set gtmtypes("sgmnt_data",235,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_cr_invcr_tn")=235
-	Set gtmtypes("sgmnt_data",236,"name")="sgmnt_data.wcb_t_end_sysops_rip_wait_tn"
-	Set gtmtypes("sgmnt_data",236,"off")=2608
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_nocr_invcr_tn")=235
+	Set gtmtypes("sgmnt_data",236,"name")="sgmnt_data.wcb_t_end_sysops_cr_invcr_tn"
+	Set gtmtypes("sgmnt_data",236,"off")=2600
 	Set gtmtypes("sgmnt_data",236,"len")=8
 	Set gtmtypes("sgmnt_data",236,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_rip_wait_tn")=236
-	Set gtmtypes("sgmnt_data",237,"name")="sgmnt_data.wcb_t_end_sysops_dirtyripwait_tn"
-	Set gtmtypes("sgmnt_data",237,"off")=2616
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_cr_invcr_tn")=236
+	Set gtmtypes("sgmnt_data",237,"name")="sgmnt_data.wcb_t_end_sysops_rip_wait_tn"
+	Set gtmtypes("sgmnt_data",237,"off")=2608
 	Set gtmtypes("sgmnt_data",237,"len")=8
 	Set gtmtypes("sgmnt_data",237,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirtyripwait_tn")=237
-	Set gtmtypes("sgmnt_data",238,"name")="sgmnt_data.wcb_gds_rundown_tn"
-	Set gtmtypes("sgmnt_data",238,"off")=2624
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_rip_wait_tn")=237
+	Set gtmtypes("sgmnt_data",238,"name")="sgmnt_data.wcb_t_end_sysops_dirtyripwait_tn"
+	Set gtmtypes("sgmnt_data",238,"off")=2616
 	Set gtmtypes("sgmnt_data",238,"len")=8
 	Set gtmtypes("sgmnt_data",238,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_gds_rundown_tn")=238
-	Set gtmtypes("sgmnt_data",239,"name")="sgmnt_data.wcb_wcs_flu1_tn"
-	Set gtmtypes("sgmnt_data",239,"off")=2632
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirtyripwait_tn")=238
+	Set gtmtypes("sgmnt_data",239,"name")="sgmnt_data.wcb_gds_rundown_tn"
+	Set gtmtypes("sgmnt_data",239,"off")=2624
 	Set gtmtypes("sgmnt_data",239,"len")=8
 	Set gtmtypes("sgmnt_data",239,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_wcs_flu1_tn")=239
-	Set gtmtypes("sgmnt_data",240,"name")="sgmnt_data.wcb_mu_back_tn"
-	Set gtmtypes("sgmnt_data",240,"off")=2640
+	Set gtmtypfldindx("sgmnt_data","wcb_gds_rundown_tn")=239
+	Set gtmtypes("sgmnt_data",240,"name")="sgmnt_data.wcb_wcs_flu1_tn"
+	Set gtmtypes("sgmnt_data",240,"off")=2632
 	Set gtmtypes("sgmnt_data",240,"len")=8
 	Set gtmtypes("sgmnt_data",240,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_mu_back_tn")=240
-	Set gtmtypes("sgmnt_data",241,"name")="sgmnt_data.wcb_t_end_sysops_dirty_invcr_tn"
-	Set gtmtypes("sgmnt_data",241,"off")=2648
+	Set gtmtypfldindx("sgmnt_data","wcb_wcs_flu1_tn")=240
+	Set gtmtypes("sgmnt_data",241,"name")="sgmnt_data.wcb_mu_back_tn"
+	Set gtmtypes("sgmnt_data",241,"off")=2640
 	Set gtmtypes("sgmnt_data",241,"len")=8
 	Set gtmtypes("sgmnt_data",241,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirty_invcr_tn")=241
-	Set gtmtypes("sgmnt_data",242,"name")="sgmnt_data.wcb_t_end_sysops_wtfini_fail_tn"
-	Set gtmtypes("sgmnt_data",242,"off")=2656
+	Set gtmtypfldindx("sgmnt_data","wcb_mu_back_tn")=241
+	Set gtmtypes("sgmnt_data",242,"name")="sgmnt_data.wcb_t_end_sysops_dirty_invcr_tn"
+	Set gtmtypes("sgmnt_data",242,"off")=2648
 	Set gtmtypes("sgmnt_data",242,"len")=8
 	Set gtmtypes("sgmnt_data",242,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_wtfini_fail_tn")=242
-	Set gtmtypes("sgmnt_data",243,"name")="sgmnt_data.wcb_t_end_sysops_twin_stuck_tn"
-	Set gtmtypes("sgmnt_data",243,"off")=2664
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirty_invcr_tn")=242
+	Set gtmtypes("sgmnt_data",243,"name")="sgmnt_data.wcb_t_end_sysops_wtfini_fail_tn"
+	Set gtmtypes("sgmnt_data",243,"off")=2656
 	Set gtmtypes("sgmnt_data",243,"len")=8
 	Set gtmtypes("sgmnt_data",243,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_twin_stuck_tn")=243
-	Set gtmtypes("sgmnt_data",244,"name")="sgmnt_data.db_csh_getn_wrt_latch_stuck_tn"
-	Set gtmtypes("sgmnt_data",244,"off")=2672
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_wtfini_fail_tn")=243
+	Set gtmtypes("sgmnt_data",244,"name")="sgmnt_data.wcb_t_end_sysops_twin_stuck_tn"
+	Set gtmtypes("sgmnt_data",244,"off")=2664
 	Set gtmtypes("sgmnt_data",244,"len")=8
 	Set gtmtypes("sgmnt_data",244,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","db_csh_getn_wrt_latch_stuck_tn")=244
-	Set gtmtypes("sgmnt_data",245,"name")="sgmnt_data.wcb_secshr_db_clnup_now_crit_tn"
-	Set gtmtypes("sgmnt_data",245,"off")=2680
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_twin_stuck_tn")=244
+	Set gtmtypes("sgmnt_data",245,"name")="sgmnt_data.db_csh_getn_wrt_latch_stuck_tn"
+	Set gtmtypes("sgmnt_data",245,"off")=2672
 	Set gtmtypes("sgmnt_data",245,"len")=8
 	Set gtmtypes("sgmnt_data",245,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_secshr_db_clnup_now_crit_tn")=245
-	Set gtmtypes("sgmnt_data",246,"name")="sgmnt_data.wc_blocked_t_qread_bad_bt_index1_tn"
-	Set gtmtypes("sgmnt_data",246,"off")=2688
+	Set gtmtypfldindx("sgmnt_data","db_csh_getn_wrt_latch_stuck_tn")=245
+	Set gtmtypes("sgmnt_data",246,"name")="sgmnt_data.wcb_secshr_db_clnup_now_crit_tn"
+	Set gtmtypes("sgmnt_data",246,"off")=2680
 	Set gtmtypes("sgmnt_data",246,"len")=8
 	Set gtmtypes("sgmnt_data",246,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_bad_bt_index1_tn")=246
-	Set gtmtypes("sgmnt_data",247,"name")="sgmnt_data.wc_blocked_t_qread_bad_bt_index2_tn"
-	Set gtmtypes("sgmnt_data",247,"off")=2696
+	Set gtmtypfldindx("sgmnt_data","wcb_secshr_db_clnup_now_crit_tn")=246
+	Set gtmtypes("sgmnt_data",247,"name")="sgmnt_data.wc_blocked_t_qread_bad_bt_index1_tn"
+	Set gtmtypes("sgmnt_data",247,"off")=2688
 	Set gtmtypes("sgmnt_data",247,"len")=8
 	Set gtmtypes("sgmnt_data",247,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_bad_bt_index2_tn")=247
-	Set gtmtypes("sgmnt_data",248,"name")="sgmnt_data.wc_blocked_t_end_crbtmismatch1_tn"
-	Set gtmtypes("sgmnt_data",248,"off")=2704
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_bad_bt_index1_tn")=247
+	Set gtmtypes("sgmnt_data",248,"name")="sgmnt_data.wc_blocked_t_qread_bad_bt_index2_tn"
+	Set gtmtypes("sgmnt_data",248,"off")=2696
 	Set gtmtypes("sgmnt_data",248,"len")=8
 	Set gtmtypes("sgmnt_data",248,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_crbtmismatch1_tn")=248
-	Set gtmtypes("sgmnt_data",249,"name")="sgmnt_data.wc_blocked_t_end_crbtmismatch2_tn"
-	Set gtmtypes("sgmnt_data",249,"off")=2712
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_bad_bt_index2_tn")=248
+	Set gtmtypes("sgmnt_data",249,"name")="sgmnt_data.wc_blocked_t_end_crbtmismatch1_tn"
+	Set gtmtypes("sgmnt_data",249,"off")=2704
 	Set gtmtypes("sgmnt_data",249,"len")=8
 	Set gtmtypes("sgmnt_data",249,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_crbtmismatch2_tn")=249
-	Set gtmtypes("sgmnt_data",250,"name")="sgmnt_data.wc_blocked_t_end_crbtmismatch3_tn"
-	Set gtmtypes("sgmnt_data",250,"off")=2720
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_crbtmismatch1_tn")=249
+	Set gtmtypes("sgmnt_data",250,"name")="sgmnt_data.wc_blocked_t_end_crbtmismatch2_tn"
+	Set gtmtypes("sgmnt_data",250,"off")=2712
 	Set gtmtypes("sgmnt_data",250,"len")=8
 	Set gtmtypes("sgmnt_data",250,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_crbtmismatch3_tn")=250
-	Set gtmtypes("sgmnt_data",251,"name")="sgmnt_data.wc_blocked_tp_tend_crbtmismatch1_tn"
-	Set gtmtypes("sgmnt_data",251,"off")=2728
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_crbtmismatch2_tn")=250
+	Set gtmtypes("sgmnt_data",251,"name")="sgmnt_data.wc_blocked_t_end_crbtmismatch3_tn"
+	Set gtmtypes("sgmnt_data",251,"off")=2720
 	Set gtmtypes("sgmnt_data",251,"len")=8
 	Set gtmtypes("sgmnt_data",251,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_crbtmismatch1_tn")=251
-	Set gtmtypes("sgmnt_data",252,"name")="sgmnt_data.wc_blocked_tp_tend_crbtmismatch2_tn"
-	Set gtmtypes("sgmnt_data",252,"off")=2736
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_crbtmismatch3_tn")=251
+	Set gtmtypes("sgmnt_data",252,"name")="sgmnt_data.wc_blocked_tp_tend_crbtmismatch1_tn"
+	Set gtmtypes("sgmnt_data",252,"off")=2728
 	Set gtmtypes("sgmnt_data",252,"len")=8
 	Set gtmtypes("sgmnt_data",252,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_crbtmismatch2_tn")=252
-	Set gtmtypes("sgmnt_data",253,"name")="sgmnt_data.wc_blocked_tp_tend_crbtmismatch3_tn"
-	Set gtmtypes("sgmnt_data",253,"off")=2744
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_crbtmismatch1_tn")=252
+	Set gtmtypes("sgmnt_data",253,"name")="sgmnt_data.wc_blocked_tp_tend_crbtmismatch2_tn"
+	Set gtmtypes("sgmnt_data",253,"off")=2736
 	Set gtmtypes("sgmnt_data",253,"len")=8
 	Set gtmtypes("sgmnt_data",253,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_crbtmismatch3_tn")=253
-	Set gtmtypes("sgmnt_data",254,"name")="sgmnt_data.wc_blocked_wcs_wtstart_bad_cr_tn"
-	Set gtmtypes("sgmnt_data",254,"off")=2752
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_crbtmismatch2_tn")=253
+	Set gtmtypes("sgmnt_data",254,"name")="sgmnt_data.wc_blocked_tp_tend_crbtmismatch3_tn"
+	Set gtmtypes("sgmnt_data",254,"off")=2744
 	Set gtmtypes("sgmnt_data",254,"len")=8
 	Set gtmtypes("sgmnt_data",254,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_wtstart_bad_cr_tn")=254
-	Set gtmtypes("sgmnt_data",255,"name")="sgmnt_data.wc_blocked_wcs_wtfini_bad_cr_tn"
-	Set gtmtypes("sgmnt_data",255,"off")=2760
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_crbtmismatch3_tn")=254
+	Set gtmtypes("sgmnt_data",255,"name")="sgmnt_data.wc_blocked_wcs_wtstart_bad_cr_tn"
+	Set gtmtypes("sgmnt_data",255,"off")=2752
 	Set gtmtypes("sgmnt_data",255,"len")=8
 	Set gtmtypes("sgmnt_data",255,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_wtfini_bad_cr_tn")=255
-	Set gtmtypes("sgmnt_data",256,"name")="sgmnt_data.wc_blocked_bt_get_tn"
-	Set gtmtypes("sgmnt_data",256,"off")=2768
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_wtstart_bad_cr_tn")=255
+	Set gtmtypes("sgmnt_data",256,"name")="sgmnt_data.wc_blocked_wcs_wtfini_bad_cr_tn"
+	Set gtmtypes("sgmnt_data",256,"off")=2760
 	Set gtmtypes("sgmnt_data",256,"len")=8
 	Set gtmtypes("sgmnt_data",256,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_bt_get_tn")=256
-	Set gtmtypes("sgmnt_data",257,"name")="sgmnt_data.wc_blocked_wcs_cdb_sc_final_retry_tn"
-	Set gtmtypes("sgmnt_data",257,"off")=2776
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_wtfini_bad_cr_tn")=256
+	Set gtmtypes("sgmnt_data",257,"name")="sgmnt_data.wc_blocked_bt_get_tn"
+	Set gtmtypes("sgmnt_data",257,"off")=2768
 	Set gtmtypes("sgmnt_data",257,"len")=8
 	Set gtmtypes("sgmnt_data",257,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_cdb_sc_final_retry_tn")=257
-	Set gtmtypes("sgmnt_data",258,"name")="sgmnt_data.wcb_bg_update_lckfail1_tn"
-	Set gtmtypes("sgmnt_data",258,"off")=2784
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_bt_get_tn")=257
+	Set gtmtypes("sgmnt_data",258,"name")="sgmnt_data.wc_blocked_wcs_cdb_sc_final_retry_tn"
+	Set gtmtypes("sgmnt_data",258,"off")=2776
 	Set gtmtypes("sgmnt_data",258,"len")=8
 	Set gtmtypes("sgmnt_data",258,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_bg_update_lckfail1_tn")=258
-	Set gtmtypes("sgmnt_data",259,"name")="sgmnt_data.wcb_bg_update_lckfail2_tn"
-	Set gtmtypes("sgmnt_data",259,"off")=2792
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_cdb_sc_final_retry_tn")=258
+	Set gtmtypes("sgmnt_data",259,"name")="sgmnt_data.wcb_bg_update_lckfail1_tn"
+	Set gtmtypes("sgmnt_data",259,"off")=2784
 	Set gtmtypes("sgmnt_data",259,"len")=8
 	Set gtmtypes("sgmnt_data",259,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_bg_update_lckfail2_tn")=259
-	Set gtmtypes("sgmnt_data",260,"name")="sgmnt_data.wcb_wtstart_lckfail1_tn"
-	Set gtmtypes("sgmnt_data",260,"off")=2800
+	Set gtmtypfldindx("sgmnt_data","wcb_bg_update_lckfail1_tn")=259
+	Set gtmtypes("sgmnt_data",260,"name")="sgmnt_data.wcb_bg_update_lckfail2_tn"
+	Set gtmtypes("sgmnt_data",260,"off")=2792
 	Set gtmtypes("sgmnt_data",260,"len")=8
 	Set gtmtypes("sgmnt_data",260,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail1_tn")=260
-	Set gtmtypes("sgmnt_data",261,"name")="sgmnt_data.wcb_wtstart_lckfail2_tn"
-	Set gtmtypes("sgmnt_data",261,"off")=2808
+	Set gtmtypfldindx("sgmnt_data","wcb_bg_update_lckfail2_tn")=260
+	Set gtmtypes("sgmnt_data",261,"name")="sgmnt_data.wcb_wtstart_lckfail1_tn"
+	Set gtmtypes("sgmnt_data",261,"off")=2800
 	Set gtmtypes("sgmnt_data",261,"len")=8
 	Set gtmtypes("sgmnt_data",261,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail2_tn")=261
-	Set gtmtypes("sgmnt_data",262,"name")="sgmnt_data.wcb_wtstart_lckfail3_tn"
-	Set gtmtypes("sgmnt_data",262,"off")=2816
+	Set gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail1_tn")=261
+	Set gtmtypes("sgmnt_data",262,"name")="sgmnt_data.wcb_wtstart_lckfail2_tn"
+	Set gtmtypes("sgmnt_data",262,"off")=2808
 	Set gtmtypes("sgmnt_data",262,"len")=8
 	Set gtmtypes("sgmnt_data",262,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail3_tn")=262
-	Set gtmtypes("sgmnt_data",263,"name")="sgmnt_data.wcb_wtstart_lckfail4_tn"
-	Set gtmtypes("sgmnt_data",263,"off")=2824
+	Set gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail2_tn")=262
+	Set gtmtypes("sgmnt_data",263,"name")="sgmnt_data.wcb_wtstart_lckfail3_tn"
+	Set gtmtypes("sgmnt_data",263,"off")=2816
 	Set gtmtypes("sgmnt_data",263,"len")=8
 	Set gtmtypes("sgmnt_data",263,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail4_tn")=263
-	Set gtmtypes("sgmnt_data",264,"name")="sgmnt_data.wcb_wtfini_lckfail1_tn"
-	Set gtmtypes("sgmnt_data",264,"off")=2832
+	Set gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail3_tn")=263
+	Set gtmtypes("sgmnt_data",264,"name")="sgmnt_data.wcb_wtstart_lckfail4_tn"
+	Set gtmtypes("sgmnt_data",264,"off")=2824
 	Set gtmtypes("sgmnt_data",264,"len")=8
 	Set gtmtypes("sgmnt_data",264,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail1_tn")=264
-	Set gtmtypes("sgmnt_data",265,"name")="sgmnt_data.wcb_wtfini_lckfail2_tn"
-	Set gtmtypes("sgmnt_data",265,"off")=2840
+	Set gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail4_tn")=264
+	Set gtmtypes("sgmnt_data",265,"name")="sgmnt_data.wcb_wtfini_lckfail1_tn"
+	Set gtmtypes("sgmnt_data",265,"off")=2832
 	Set gtmtypes("sgmnt_data",265,"len")=8
 	Set gtmtypes("sgmnt_data",265,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail2_tn")=265
-	Set gtmtypes("sgmnt_data",266,"name")="sgmnt_data.wcb_wtfini_lckfail3_tn"
-	Set gtmtypes("sgmnt_data",266,"off")=2848
+	Set gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail1_tn")=265
+	Set gtmtypes("sgmnt_data",266,"name")="sgmnt_data.wcb_wtfini_lckfail2_tn"
+	Set gtmtypes("sgmnt_data",266,"off")=2840
 	Set gtmtypes("sgmnt_data",266,"len")=8
 	Set gtmtypes("sgmnt_data",266,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail3_tn")=266
-	Set gtmtypes("sgmnt_data",267,"name")="sgmnt_data.wcb_wtfini_lckfail4_tn"
-	Set gtmtypes("sgmnt_data",267,"off")=2856
+	Set gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail2_tn")=266
+	Set gtmtypes("sgmnt_data",267,"name")="sgmnt_data.wcb_wtfini_lckfail3_tn"
+	Set gtmtypes("sgmnt_data",267,"off")=2848
 	Set gtmtypes("sgmnt_data",267,"len")=8
 	Set gtmtypes("sgmnt_data",267,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail4_tn")=267
-	Set gtmtypes("sgmnt_data",268,"name")="sgmnt_data.wcb_t_end_sysops_dirtystuck1_tn"
-	Set gtmtypes("sgmnt_data",268,"off")=2864
+	Set gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail3_tn")=267
+	Set gtmtypes("sgmnt_data",268,"name")="sgmnt_data.wcb_wtfini_lckfail4_tn"
+	Set gtmtypes("sgmnt_data",268,"off")=2856
 	Set gtmtypes("sgmnt_data",268,"len")=8
 	Set gtmtypes("sgmnt_data",268,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirtystuck1_tn")=268
-	Set gtmtypes("sgmnt_data",269,"name")="sgmnt_data.wcb_t_end_sysops_dirtystuck2_tn"
-	Set gtmtypes("sgmnt_data",269,"off")=2872
+	Set gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail4_tn")=268
+	Set gtmtypes("sgmnt_data",269,"name")="sgmnt_data.wcb_t_end_sysops_dirtystuck1_tn"
+	Set gtmtypes("sgmnt_data",269,"off")=2864
 	Set gtmtypes("sgmnt_data",269,"len")=8
 	Set gtmtypes("sgmnt_data",269,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirtystuck2_tn")=269
-	Set gtmtypes("sgmnt_data",270,"name")="sgmnt_data.wcb_secshr_db_clnup_wbuf_dqd_tn"
-	Set gtmtypes("sgmnt_data",270,"off")=2880
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirtystuck1_tn")=269
+	Set gtmtypes("sgmnt_data",270,"name")="sgmnt_data.wcb_t_end_sysops_dirtystuck2_tn"
+	Set gtmtypes("sgmnt_data",270,"off")=2872
 	Set gtmtypes("sgmnt_data",270,"len")=8
 	Set gtmtypes("sgmnt_data",270,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_secshr_db_clnup_wbuf_dqd_tn")=270
-	Set gtmtypes("sgmnt_data",271,"name")="sgmnt_data.dwngrd_refmts_syncio_tn"
-	Set gtmtypes("sgmnt_data",271,"off")=2888
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirtystuck2_tn")=270
+	Set gtmtypes("sgmnt_data",271,"name")="sgmnt_data.wcb_secshr_db_clnup_wbuf_dqd_tn"
+	Set gtmtypes("sgmnt_data",271,"off")=2880
 	Set gtmtypes("sgmnt_data",271,"len")=8
 	Set gtmtypes("sgmnt_data",271,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","dwngrd_refmts_syncio_tn")=271
-	Set gtmtypes("sgmnt_data",272,"name")="sgmnt_data.dwngrd_refmts_asyncio_tn"
-	Set gtmtypes("sgmnt_data",272,"off")=2896
+	Set gtmtypfldindx("sgmnt_data","wcb_secshr_db_clnup_wbuf_dqd_tn")=271
+	Set gtmtypes("sgmnt_data",272,"name")="sgmnt_data.dwngrd_refmts_syncio_tn"
+	Set gtmtypes("sgmnt_data",272,"off")=2888
 	Set gtmtypes("sgmnt_data",272,"len")=8
 	Set gtmtypes("sgmnt_data",272,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","dwngrd_refmts_asyncio_tn")=272
-	Set gtmtypes("sgmnt_data",273,"name")="sgmnt_data.shmpool_refmt_harvests_tn"
-	Set gtmtypes("sgmnt_data",273,"off")=2904
+	Set gtmtypfldindx("sgmnt_data","dwngrd_refmts_syncio_tn")=272
+	Set gtmtypes("sgmnt_data",273,"name")="sgmnt_data.dwngrd_refmts_asyncio_tn"
+	Set gtmtypes("sgmnt_data",273,"off")=2896
 	Set gtmtypes("sgmnt_data",273,"len")=8
 	Set gtmtypes("sgmnt_data",273,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","shmpool_refmt_harvests_tn")=273
-	Set gtmtypes("sgmnt_data",274,"name")="sgmnt_data.shmpool_recovery_tn"
-	Set gtmtypes("sgmnt_data",274,"off")=2912
+	Set gtmtypfldindx("sgmnt_data","dwngrd_refmts_asyncio_tn")=273
+	Set gtmtypes("sgmnt_data",274,"name")="sgmnt_data.shmpool_refmt_harvests_tn"
+	Set gtmtypes("sgmnt_data",274,"off")=2904
 	Set gtmtypes("sgmnt_data",274,"len")=8
 	Set gtmtypes("sgmnt_data",274,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","shmpool_recovery_tn")=274
-	Set gtmtypes("sgmnt_data",275,"name")="sgmnt_data.shmpool_blkd_by_sdc_tn"
-	Set gtmtypes("sgmnt_data",275,"off")=2920
+	Set gtmtypfldindx("sgmnt_data","shmpool_refmt_harvests_tn")=274
+	Set gtmtypes("sgmnt_data",275,"name")="sgmnt_data.shmpool_recovery_tn"
+	Set gtmtypes("sgmnt_data",275,"off")=2912
 	Set gtmtypes("sgmnt_data",275,"len")=8
 	Set gtmtypes("sgmnt_data",275,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","shmpool_blkd_by_sdc_tn")=275
-	Set gtmtypes("sgmnt_data",276,"name")="sgmnt_data.shmpool_alloc_bbflush_tn"
-	Set gtmtypes("sgmnt_data",276,"off")=2928
+	Set gtmtypfldindx("sgmnt_data","shmpool_recovery_tn")=275
+	Set gtmtypes("sgmnt_data",276,"name")="sgmnt_data.shmpool_blkd_by_sdc_tn"
+	Set gtmtypes("sgmnt_data",276,"off")=2920
 	Set gtmtypes("sgmnt_data",276,"len")=8
 	Set gtmtypes("sgmnt_data",276,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","shmpool_alloc_bbflush_tn")=276
-	Set gtmtypes("sgmnt_data",277,"name")="sgmnt_data.refmt_hvst_blk_released_replaced_tn"
-	Set gtmtypes("sgmnt_data",277,"off")=2936
+	Set gtmtypfldindx("sgmnt_data","shmpool_blkd_by_sdc_tn")=276
+	Set gtmtypes("sgmnt_data",277,"name")="sgmnt_data.shmpool_alloc_bbflush_tn"
+	Set gtmtypes("sgmnt_data",277,"off")=2928
 	Set gtmtypes("sgmnt_data",277,"len")=8
 	Set gtmtypes("sgmnt_data",277,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","refmt_hvst_blk_released_replaced_tn")=277
-	Set gtmtypes("sgmnt_data",278,"name")="sgmnt_data.refmt_hvst_blk_released_io_complete_tn"
-	Set gtmtypes("sgmnt_data",278,"off")=2944
+	Set gtmtypfldindx("sgmnt_data","shmpool_alloc_bbflush_tn")=277
+	Set gtmtypes("sgmnt_data",278,"name")="sgmnt_data.refmt_hvst_blk_released_replaced_tn"
+	Set gtmtypes("sgmnt_data",278,"off")=2936
 	Set gtmtypes("sgmnt_data",278,"len")=8
 	Set gtmtypes("sgmnt_data",278,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","refmt_hvst_blk_released_io_complete_tn")=278
-	Set gtmtypes("sgmnt_data",279,"name")="sgmnt_data.refmt_hvst_blk_kept_tn"
-	Set gtmtypes("sgmnt_data",279,"off")=2952
+	Set gtmtypfldindx("sgmnt_data","refmt_hvst_blk_released_replaced_tn")=278
+	Set gtmtypes("sgmnt_data",279,"name")="sgmnt_data.refmt_hvst_blk_released_io_complete_tn"
+	Set gtmtypes("sgmnt_data",279,"off")=2944
 	Set gtmtypes("sgmnt_data",279,"len")=8
 	Set gtmtypes("sgmnt_data",279,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","refmt_hvst_blk_kept_tn")=279
-	Set gtmtypes("sgmnt_data",280,"name")="sgmnt_data.refmt_hvst_blk_ignored_tn"
-	Set gtmtypes("sgmnt_data",280,"off")=2960
+	Set gtmtypfldindx("sgmnt_data","refmt_hvst_blk_released_io_complete_tn")=279
+	Set gtmtypes("sgmnt_data",280,"name")="sgmnt_data.refmt_hvst_blk_kept_tn"
+	Set gtmtypes("sgmnt_data",280,"off")=2952
 	Set gtmtypes("sgmnt_data",280,"len")=8
 	Set gtmtypes("sgmnt_data",280,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","refmt_hvst_blk_ignored_tn")=280
-	Set gtmtypes("sgmnt_data",281,"name")="sgmnt_data.refmt_blk_chk_blk_freed_tn"
-	Set gtmtypes("sgmnt_data",281,"off")=2968
+	Set gtmtypfldindx("sgmnt_data","refmt_hvst_blk_kept_tn")=280
+	Set gtmtypes("sgmnt_data",281,"name")="sgmnt_data.refmt_hvst_blk_ignored_tn"
+	Set gtmtypes("sgmnt_data",281,"off")=2960
 	Set gtmtypes("sgmnt_data",281,"len")=8
 	Set gtmtypes("sgmnt_data",281,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","refmt_blk_chk_blk_freed_tn")=281
-	Set gtmtypes("sgmnt_data",282,"name")="sgmnt_data.refmt_blk_chk_blk_kept_tn"
-	Set gtmtypes("sgmnt_data",282,"off")=2976
+	Set gtmtypfldindx("sgmnt_data","refmt_hvst_blk_ignored_tn")=281
+	Set gtmtypes("sgmnt_data",282,"name")="sgmnt_data.refmt_blk_chk_blk_freed_tn"
+	Set gtmtypes("sgmnt_data",282,"off")=2968
 	Set gtmtypes("sgmnt_data",282,"len")=8
 	Set gtmtypes("sgmnt_data",282,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","refmt_blk_chk_blk_kept_tn")=282
-	Set gtmtypes("sgmnt_data",283,"name")="sgmnt_data.active_lvl_trigger_tn"
-	Set gtmtypes("sgmnt_data",283,"off")=2984
+	Set gtmtypfldindx("sgmnt_data","refmt_blk_chk_blk_freed_tn")=282
+	Set gtmtypes("sgmnt_data",283,"name")="sgmnt_data.refmt_blk_chk_blk_kept_tn"
+	Set gtmtypes("sgmnt_data",283,"off")=2976
 	Set gtmtypes("sgmnt_data",283,"len")=8
 	Set gtmtypes("sgmnt_data",283,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","active_lvl_trigger_tn")=283
-	Set gtmtypes("sgmnt_data",284,"name")="sgmnt_data.new_buff_tn"
-	Set gtmtypes("sgmnt_data",284,"off")=2992
+	Set gtmtypfldindx("sgmnt_data","refmt_blk_chk_blk_kept_tn")=283
+	Set gtmtypes("sgmnt_data",284,"name")="sgmnt_data.active_lvl_trigger_tn"
+	Set gtmtypes("sgmnt_data",284,"off")=2984
 	Set gtmtypes("sgmnt_data",284,"len")=8
 	Set gtmtypes("sgmnt_data",284,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","new_buff_tn")=284
-	Set gtmtypes("sgmnt_data",285,"name")="sgmnt_data.phase2_commit_wait_sleep_in_crit_tn"
-	Set gtmtypes("sgmnt_data",285,"off")=3000
+	Set gtmtypfldindx("sgmnt_data","active_lvl_trigger_tn")=284
+	Set gtmtypes("sgmnt_data",285,"name")="sgmnt_data.new_buff_tn"
+	Set gtmtypes("sgmnt_data",285,"off")=2992
 	Set gtmtypes("sgmnt_data",285,"len")=8
 	Set gtmtypes("sgmnt_data",285,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","phase2_commit_wait_sleep_in_crit_tn")=285
-	Set gtmtypes("sgmnt_data",286,"name")="sgmnt_data.phase2_commit_wait_sleep_no_crit_tn"
-	Set gtmtypes("sgmnt_data",286,"off")=3008
+	Set gtmtypfldindx("sgmnt_data","new_buff_tn")=285
+	Set gtmtypes("sgmnt_data",286,"name")="sgmnt_data.phase2_commit_wait_sleep_in_crit_tn"
+	Set gtmtypes("sgmnt_data",286,"off")=3000
 	Set gtmtypes("sgmnt_data",286,"len")=8
 	Set gtmtypes("sgmnt_data",286,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","phase2_commit_wait_sleep_no_crit_tn")=286
-	Set gtmtypes("sgmnt_data",287,"name")="sgmnt_data.phase2_commit_wait_pidcnt_tn"
-	Set gtmtypes("sgmnt_data",287,"off")=3016
+	Set gtmtypfldindx("sgmnt_data","phase2_commit_wait_sleep_in_crit_tn")=286
+	Set gtmtypes("sgmnt_data",287,"name")="sgmnt_data.phase2_commit_wait_sleep_no_crit_tn"
+	Set gtmtypes("sgmnt_data",287,"off")=3008
 	Set gtmtypes("sgmnt_data",287,"len")=8
 	Set gtmtypes("sgmnt_data",287,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","phase2_commit_wait_pidcnt_tn")=287
-	Set gtmtypes("sgmnt_data",288,"name")="sgmnt_data.wcb_t_end_sysops_intend_wait_tn"
-	Set gtmtypes("sgmnt_data",288,"off")=3024
+	Set gtmtypfldindx("sgmnt_data","phase2_commit_wait_sleep_no_crit_tn")=287
+	Set gtmtypes("sgmnt_data",288,"name")="sgmnt_data.phase2_commit_wait_pidcnt_tn"
+	Set gtmtypes("sgmnt_data",288,"off")=3016
 	Set gtmtypes("sgmnt_data",288,"len")=8
 	Set gtmtypes("sgmnt_data",288,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_intend_wait_tn")=288
-	Set gtmtypes("sgmnt_data",289,"name")="sgmnt_data.wcb_secshr_db_clnup_phase2_clnup_tn"
-	Set gtmtypes("sgmnt_data",289,"off")=3032
+	Set gtmtypfldindx("sgmnt_data","phase2_commit_wait_pidcnt_tn")=288
+	Set gtmtypes("sgmnt_data",289,"name")="sgmnt_data.wcb_t_end_sysops_intend_wait_tn"
+	Set gtmtypes("sgmnt_data",289,"off")=3024
 	Set gtmtypes("sgmnt_data",289,"len")=8
 	Set gtmtypes("sgmnt_data",289,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_secshr_db_clnup_phase2_clnup_tn")=289
-	Set gtmtypes("sgmnt_data",290,"name")="sgmnt_data.wcb_phase2_commit_wait_tn"
-	Set gtmtypes("sgmnt_data",290,"off")=3040
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_intend_wait_tn")=289
+	Set gtmtypes("sgmnt_data",290,"name")="sgmnt_data.wcb_secshr_db_clnup_phase2_clnup_tn"
+	Set gtmtypes("sgmnt_data",290,"off")=3032
 	Set gtmtypes("sgmnt_data",290,"len")=8
 	Set gtmtypes("sgmnt_data",290,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_phase2_commit_wait_tn")=290
-	Set gtmtypes("sgmnt_data",291,"name")="sgmnt_data.recompute_upd_array_calls_tn"
-	Set gtmtypes("sgmnt_data",291,"off")=3048
+	Set gtmtypfldindx("sgmnt_data","wcb_secshr_db_clnup_phase2_clnup_tn")=290
+	Set gtmtypes("sgmnt_data",291,"name")="sgmnt_data.wcb_phase2_commit_wait_tn"
+	Set gtmtypes("sgmnt_data",291,"off")=3040
 	Set gtmtypes("sgmnt_data",291,"len")=8
 	Set gtmtypes("sgmnt_data",291,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_calls_tn")=291
-	Set gtmtypes("sgmnt_data",292,"name")="sgmnt_data.recompute_upd_array_rip_tn"
-	Set gtmtypes("sgmnt_data",292,"off")=3056
+	Set gtmtypfldindx("sgmnt_data","wcb_phase2_commit_wait_tn")=291
+	Set gtmtypes("sgmnt_data",292,"name")="sgmnt_data.recompute_upd_array_calls_tn"
+	Set gtmtypes("sgmnt_data",292,"off")=3048
 	Set gtmtypes("sgmnt_data",292,"len")=8
 	Set gtmtypes("sgmnt_data",292,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_rip_tn")=292
-	Set gtmtypes("sgmnt_data",293,"name")="sgmnt_data.recompute_upd_array_in_tend_tn"
-	Set gtmtypes("sgmnt_data",293,"off")=3064
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_calls_tn")=292
+	Set gtmtypes("sgmnt_data",293,"name")="sgmnt_data.recompute_upd_array_rip_tn"
+	Set gtmtypes("sgmnt_data",293,"off")=3056
 	Set gtmtypes("sgmnt_data",293,"len")=8
 	Set gtmtypes("sgmnt_data",293,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_in_tend_tn")=293
-	Set gtmtypes("sgmnt_data",294,"name")="sgmnt_data.recompute_upd_array_search_blk_tn"
-	Set gtmtypes("sgmnt_data",294,"off")=3072
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_rip_tn")=293
+	Set gtmtypes("sgmnt_data",294,"name")="sgmnt_data.recompute_upd_array_in_tend_tn"
+	Set gtmtypes("sgmnt_data",294,"off")=3064
 	Set gtmtypes("sgmnt_data",294,"len")=8
 	Set gtmtypes("sgmnt_data",294,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_search_blk_tn")=294
-	Set gtmtypes("sgmnt_data",295,"name")="sgmnt_data.recompute_upd_array_new_rec_tn"
-	Set gtmtypes("sgmnt_data",295,"off")=3080
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_in_tend_tn")=294
+	Set gtmtypes("sgmnt_data",295,"name")="sgmnt_data.recompute_upd_array_search_blk_tn"
+	Set gtmtypes("sgmnt_data",295,"off")=3072
 	Set gtmtypes("sgmnt_data",295,"len")=8
 	Set gtmtypes("sgmnt_data",295,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_new_rec_tn")=295
-	Set gtmtypes("sgmnt_data",296,"name")="sgmnt_data.recompute_upd_array_rec_size_tn"
-	Set gtmtypes("sgmnt_data",296,"off")=3088
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_search_blk_tn")=295
+	Set gtmtypes("sgmnt_data",296,"name")="sgmnt_data.recompute_upd_array_new_rec_tn"
+	Set gtmtypes("sgmnt_data",296,"off")=3080
 	Set gtmtypes("sgmnt_data",296,"len")=8
 	Set gtmtypes("sgmnt_data",296,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_rec_size_tn")=296
-	Set gtmtypes("sgmnt_data",297,"name")="sgmnt_data.recompute_upd_array_rec_cmpc_tn"
-	Set gtmtypes("sgmnt_data",297,"off")=3096
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_new_rec_tn")=296
+	Set gtmtypes("sgmnt_data",297,"name")="sgmnt_data.recompute_upd_array_rec_size_tn"
+	Set gtmtypes("sgmnt_data",297,"off")=3088
 	Set gtmtypes("sgmnt_data",297,"len")=8
 	Set gtmtypes("sgmnt_data",297,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_rec_cmpc_tn")=297
-	Set gtmtypes("sgmnt_data",298,"name")="sgmnt_data.recompute_upd_array_blk_fini_tn"
-	Set gtmtypes("sgmnt_data",298,"off")=3104
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_rec_size_tn")=297
+	Set gtmtypes("sgmnt_data",298,"name")="sgmnt_data.recompute_upd_array_rec_cmpc_tn"
+	Set gtmtypes("sgmnt_data",298,"off")=3096
 	Set gtmtypes("sgmnt_data",298,"len")=8
 	Set gtmtypes("sgmnt_data",298,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_blk_fini_tn")=298
-	Set gtmtypes("sgmnt_data",299,"name")="sgmnt_data.recompute_upd_array_blk_split_tn"
-	Set gtmtypes("sgmnt_data",299,"off")=3112
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_rec_cmpc_tn")=298
+	Set gtmtypes("sgmnt_data",299,"name")="sgmnt_data.recompute_upd_array_blk_fini_tn"
+	Set gtmtypes("sgmnt_data",299,"off")=3104
 	Set gtmtypes("sgmnt_data",299,"len")=8
 	Set gtmtypes("sgmnt_data",299,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_blk_split_tn")=299
-	Set gtmtypes("sgmnt_data",300,"name")="sgmnt_data.t_qread_ripsleep_cnt_tn"
-	Set gtmtypes("sgmnt_data",300,"off")=3120
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_blk_fini_tn")=299
+	Set gtmtypes("sgmnt_data",300,"name")="sgmnt_data.recompute_upd_array_blk_split_tn"
+	Set gtmtypes("sgmnt_data",300,"off")=3112
 	Set gtmtypes("sgmnt_data",300,"len")=8
 	Set gtmtypes("sgmnt_data",300,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","t_qread_ripsleep_cnt_tn")=300
-	Set gtmtypes("sgmnt_data",301,"name")="sgmnt_data.t_qread_ripsleep_nblks_tn"
-	Set gtmtypes("sgmnt_data",301,"off")=3128
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_blk_split_tn")=300
+	Set gtmtypes("sgmnt_data",301,"name")="sgmnt_data.t_qread_ripsleep_cnt_tn"
+	Set gtmtypes("sgmnt_data",301,"off")=3120
 	Set gtmtypes("sgmnt_data",301,"len")=8
 	Set gtmtypes("sgmnt_data",301,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","t_qread_ripsleep_nblks_tn")=301
-	Set gtmtypes("sgmnt_data",302,"name")="sgmnt_data.bg_trc_rec_tn_filler"
-	Set gtmtypes("sgmnt_data",302,"off")=3136
-	Set gtmtypes("sgmnt_data",302,"len")=112
-	Set gtmtypes("sgmnt_data",302,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","bg_trc_rec_tn_filler")=302
-	Set gtmtypes("sgmnt_data",303,"name")="sgmnt_data.total_buffer_flush_cntr"
-	Set gtmtypes("sgmnt_data",303,"off")=3248
-	Set gtmtypes("sgmnt_data",303,"len")=4
-	Set gtmtypes("sgmnt_data",303,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","total_buffer_flush_cntr")=303
-	Set gtmtypes("sgmnt_data",304,"name")="sgmnt_data.bufct_buffer_flush_cntr"
-	Set gtmtypes("sgmnt_data",304,"off")=3252
-	Set gtmtypes("sgmnt_data",304,"len")=4
-	Set gtmtypes("sgmnt_data",304,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","bufct_buffer_flush_cntr")=304
-	Set gtmtypes("sgmnt_data",305,"name")="sgmnt_data.bufct_buffer_flush_loop_cntr"
-	Set gtmtypes("sgmnt_data",305,"off")=3256
-	Set gtmtypes("sgmnt_data",305,"len")=4
-	Set gtmtypes("sgmnt_data",305,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","bufct_buffer_flush_loop_cntr")=305
-	Set gtmtypes("sgmnt_data",306,"name")="sgmnt_data.wrt_calls_cntr"
-	Set gtmtypes("sgmnt_data",306,"off")=3260
-	Set gtmtypes("sgmnt_data",306,"len")=4
-	Set gtmtypes("sgmnt_data",306,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wrt_calls_cntr")=306
-	Set gtmtypes("sgmnt_data",307,"name")="sgmnt_data.wrt_count_cntr"
-	Set gtmtypes("sgmnt_data",307,"off")=3264
-	Set gtmtypes("sgmnt_data",307,"len")=4
-	Set gtmtypes("sgmnt_data",307,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wrt_count_cntr")=307
-	Set gtmtypes("sgmnt_data",308,"name")="sgmnt_data.wrt_blocked_cntr"
-	Set gtmtypes("sgmnt_data",308,"off")=3268
-	Set gtmtypes("sgmnt_data",308,"len")=4
-	Set gtmtypes("sgmnt_data",308,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wrt_blocked_cntr")=308
-	Set gtmtypes("sgmnt_data",309,"name")="sgmnt_data.wrt_busy_cntr"
-	Set gtmtypes("sgmnt_data",309,"off")=3272
-	Set gtmtypes("sgmnt_data",309,"len")=4
-	Set gtmtypes("sgmnt_data",309,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wrt_busy_cntr")=309
-	Set gtmtypes("sgmnt_data",310,"name")="sgmnt_data.wrt_noblks_wrtn_cntr"
-	Set gtmtypes("sgmnt_data",310,"off")=3276
-	Set gtmtypes("sgmnt_data",310,"len")=4
-	Set gtmtypes("sgmnt_data",310,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wrt_noblks_wrtn_cntr")=310
-	Set gtmtypes("sgmnt_data",311,"name")="sgmnt_data.reserved_bgtrcrec1_cntr"
-	Set gtmtypes("sgmnt_data",311,"off")=3280
-	Set gtmtypes("sgmnt_data",311,"len")=4
-	Set gtmtypes("sgmnt_data",311,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","reserved_bgtrcrec1_cntr")=311
-	Set gtmtypes("sgmnt_data",312,"name")="sgmnt_data.reserved_bgtrcrec2_cntr"
-	Set gtmtypes("sgmnt_data",312,"off")=3284
+	Set gtmtypfldindx("sgmnt_data","t_qread_ripsleep_cnt_tn")=301
+	Set gtmtypes("sgmnt_data",302,"name")="sgmnt_data.t_qread_ripsleep_nblks_tn"
+	Set gtmtypes("sgmnt_data",302,"off")=3128
+	Set gtmtypes("sgmnt_data",302,"len")=8
+	Set gtmtypes("sgmnt_data",302,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","t_qread_ripsleep_nblks_tn")=302
+	Set gtmtypes("sgmnt_data",303,"name")="sgmnt_data.wcs_wtfini_invoked_tn"
+	Set gtmtypes("sgmnt_data",303,"off")=3136
+	Set gtmtypes("sgmnt_data",303,"len")=8
+	Set gtmtypes("sgmnt_data",303,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","wcs_wtfini_invoked_tn")=303
+	Set gtmtypes("sgmnt_data",304,"name")="sgmnt_data.wcs_wterror_invoked_tn"
+	Set gtmtypes("sgmnt_data",304,"off")=3144
+	Set gtmtypes("sgmnt_data",304,"len")=8
+	Set gtmtypes("sgmnt_data",304,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","wcs_wterror_invoked_tn")=304
+	Set gtmtypes("sgmnt_data",305,"name")="sgmnt_data.wcs_wt_restart_invoked_tn"
+	Set gtmtypes("sgmnt_data",305,"off")=3152
+	Set gtmtypes("sgmnt_data",305,"len")=8
+	Set gtmtypes("sgmnt_data",305,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","wcs_wt_restart_invoked_tn")=305
+	Set gtmtypes("sgmnt_data",306,"name")="sgmnt_data.wcs_wt_restart_eagain_tn"
+	Set gtmtypes("sgmnt_data",306,"off")=3160
+	Set gtmtypes("sgmnt_data",306,"len")=8
+	Set gtmtypes("sgmnt_data",306,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","wcs_wt_restart_eagain_tn")=306
+	Set gtmtypes("sgmnt_data",307,"name")="sgmnt_data.wcs_wt_restart_reinsert_tn"
+	Set gtmtypes("sgmnt_data",307,"off")=3168
+	Set gtmtypes("sgmnt_data",307,"len")=8
+	Set gtmtypes("sgmnt_data",307,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","wcs_wt_restart_reinsert_tn")=307
+	Set gtmtypes("sgmnt_data",308,"name")="sgmnt_data.wcs_wtstart_eagain_tn"
+	Set gtmtypes("sgmnt_data",308,"off")=3176
+	Set gtmtypes("sgmnt_data",308,"len")=8
+	Set gtmtypes("sgmnt_data",308,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","wcs_wtstart_eagain_tn")=308
+	Set gtmtypes("sgmnt_data",309,"name")="sgmnt_data.wcs_wtstart_eagain_incrit_tn"
+	Set gtmtypes("sgmnt_data",309,"off")=3184
+	Set gtmtypes("sgmnt_data",309,"len")=8
+	Set gtmtypes("sgmnt_data",309,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","wcs_wtstart_eagain_incrit_tn")=309
+	Set gtmtypes("sgmnt_data",310,"name")="sgmnt_data.async_restart_eagain_tn"
+	Set gtmtypes("sgmnt_data",310,"off")=3192
+	Set gtmtypes("sgmnt_data",310,"len")=8
+	Set gtmtypes("sgmnt_data",310,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","async_restart_eagain_tn")=310
+	Set gtmtypes("sgmnt_data",311,"name")="sgmnt_data.bg_trc_rec_tn_filler"
+	Set gtmtypes("sgmnt_data",311,"off")=3200
+	Set gtmtypes("sgmnt_data",311,"len")=48
+	Set gtmtypes("sgmnt_data",311,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","bg_trc_rec_tn_filler")=311
+	Set gtmtypes("sgmnt_data",312,"name")="sgmnt_data.total_buffer_flush_cntr"
+	Set gtmtypes("sgmnt_data",312,"off")=3248
 	Set gtmtypes("sgmnt_data",312,"len")=4
 	Set gtmtypes("sgmnt_data",312,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","reserved_bgtrcrec2_cntr")=312
-	Set gtmtypes("sgmnt_data",313,"name")="sgmnt_data.reserved_bgtrcrec3_cntr"
-	Set gtmtypes("sgmnt_data",313,"off")=3288
+	Set gtmtypfldindx("sgmnt_data","total_buffer_flush_cntr")=312
+	Set gtmtypes("sgmnt_data",313,"name")="sgmnt_data.bufct_buffer_flush_cntr"
+	Set gtmtypes("sgmnt_data",313,"off")=3252
 	Set gtmtypes("sgmnt_data",313,"len")=4
 	Set gtmtypes("sgmnt_data",313,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","reserved_bgtrcrec3_cntr")=313
-	Set gtmtypes("sgmnt_data",314,"name")="sgmnt_data.lost_block_recovery_cntr"
-	Set gtmtypes("sgmnt_data",314,"off")=3292
+	Set gtmtypfldindx("sgmnt_data","bufct_buffer_flush_cntr")=313
+	Set gtmtypes("sgmnt_data",314,"name")="sgmnt_data.bufct_buffer_flush_loop_cntr"
+	Set gtmtypes("sgmnt_data",314,"off")=3256
 	Set gtmtypes("sgmnt_data",314,"len")=4
 	Set gtmtypes("sgmnt_data",314,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","lost_block_recovery_cntr")=314
-	Set gtmtypes("sgmnt_data",315,"name")="sgmnt_data.wc_blocked_onln_rlbk_cntr"
-	Set gtmtypes("sgmnt_data",315,"off")=3296
+	Set gtmtypfldindx("sgmnt_data","bufct_buffer_flush_loop_cntr")=314
+	Set gtmtypes("sgmnt_data",315,"name")="sgmnt_data.wrt_calls_cntr"
+	Set gtmtypes("sgmnt_data",315,"off")=3260
 	Set gtmtypes("sgmnt_data",315,"len")=4
 	Set gtmtypes("sgmnt_data",315,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_onln_rlbk_cntr")=315
-	Set gtmtypes("sgmnt_data",316,"name")="sgmnt_data.stale_cntr"
-	Set gtmtypes("sgmnt_data",316,"off")=3300
+	Set gtmtypfldindx("sgmnt_data","wrt_calls_cntr")=315
+	Set gtmtypes("sgmnt_data",316,"name")="sgmnt_data.wrt_count_cntr"
+	Set gtmtypes("sgmnt_data",316,"off")=3264
 	Set gtmtypes("sgmnt_data",316,"len")=4
 	Set gtmtypes("sgmnt_data",316,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","stale_cntr")=316
-	Set gtmtypes("sgmnt_data",317,"name")="sgmnt_data.starved_cntr"
-	Set gtmtypes("sgmnt_data",317,"off")=3304
+	Set gtmtypfldindx("sgmnt_data","wrt_count_cntr")=316
+	Set gtmtypes("sgmnt_data",317,"name")="sgmnt_data.wrt_blocked_cntr"
+	Set gtmtypes("sgmnt_data",317,"off")=3268
 	Set gtmtypes("sgmnt_data",317,"len")=4
 	Set gtmtypes("sgmnt_data",317,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","starved_cntr")=317
-	Set gtmtypes("sgmnt_data",318,"name")="sgmnt_data.stale_timer_started_cntr"
-	Set gtmtypes("sgmnt_data",318,"off")=3308
+	Set gtmtypfldindx("sgmnt_data","wrt_blocked_cntr")=317
+	Set gtmtypes("sgmnt_data",318,"name")="sgmnt_data.wrt_busy_cntr"
+	Set gtmtypes("sgmnt_data",318,"off")=3272
 	Set gtmtypes("sgmnt_data",318,"len")=4
 	Set gtmtypes("sgmnt_data",318,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","stale_timer_started_cntr")=318
-	Set gtmtypes("sgmnt_data",319,"name")="sgmnt_data.stale_timer_pop_cntr"
-	Set gtmtypes("sgmnt_data",319,"off")=3312
+	Set gtmtypfldindx("sgmnt_data","wrt_busy_cntr")=318
+	Set gtmtypes("sgmnt_data",319,"name")="sgmnt_data.wrt_noblks_wrtn_cntr"
+	Set gtmtypes("sgmnt_data",319,"off")=3276
 	Set gtmtypes("sgmnt_data",319,"len")=4
 	Set gtmtypes("sgmnt_data",319,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","stale_timer_pop_cntr")=319
-	Set gtmtypes("sgmnt_data",320,"name")="sgmnt_data.stale_process_defer_cntr"
-	Set gtmtypes("sgmnt_data",320,"off")=3316
+	Set gtmtypfldindx("sgmnt_data","wrt_noblks_wrtn_cntr")=319
+	Set gtmtypes("sgmnt_data",320,"name")="sgmnt_data.reserved_bgtrcrec1_cntr"
+	Set gtmtypes("sgmnt_data",320,"off")=3280
 	Set gtmtypes("sgmnt_data",320,"len")=4
 	Set gtmtypes("sgmnt_data",320,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","stale_process_defer_cntr")=320
-	Set gtmtypes("sgmnt_data",321,"name")="sgmnt_data.stale_defer_processed_cntr"
-	Set gtmtypes("sgmnt_data",321,"off")=3320
+	Set gtmtypfldindx("sgmnt_data","reserved_bgtrcrec1_cntr")=320
+	Set gtmtypes("sgmnt_data",321,"name")="sgmnt_data.reserved_bgtrcrec2_cntr"
+	Set gtmtypes("sgmnt_data",321,"off")=3284
 	Set gtmtypes("sgmnt_data",321,"len")=4
 	Set gtmtypes("sgmnt_data",321,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","stale_defer_processed_cntr")=321
-	Set gtmtypes("sgmnt_data",322,"name")="sgmnt_data.spcfc_buffer_flush_cntr"
-	Set gtmtypes("sgmnt_data",322,"off")=3324
+	Set gtmtypfldindx("sgmnt_data","reserved_bgtrcrec2_cntr")=321
+	Set gtmtypes("sgmnt_data",322,"name")="sgmnt_data.reserved_bgtrcrec3_cntr"
+	Set gtmtypes("sgmnt_data",322,"off")=3288
 	Set gtmtypes("sgmnt_data",322,"len")=4
 	Set gtmtypes("sgmnt_data",322,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","spcfc_buffer_flush_cntr")=322
-	Set gtmtypes("sgmnt_data",323,"name")="sgmnt_data.spcfc_buffer_flush_loop_cntr"
-	Set gtmtypes("sgmnt_data",323,"off")=3328
+	Set gtmtypfldindx("sgmnt_data","reserved_bgtrcrec3_cntr")=322
+	Set gtmtypes("sgmnt_data",323,"name")="sgmnt_data.lost_block_recovery_cntr"
+	Set gtmtypes("sgmnt_data",323,"off")=3292
 	Set gtmtypes("sgmnt_data",323,"len")=4
 	Set gtmtypes("sgmnt_data",323,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","spcfc_buffer_flush_loop_cntr")=323
-	Set gtmtypes("sgmnt_data",324,"name")="sgmnt_data.spcfc_buffer_flush_retries_cntr"
-	Set gtmtypes("sgmnt_data",324,"off")=3332
+	Set gtmtypfldindx("sgmnt_data","lost_block_recovery_cntr")=323
+	Set gtmtypes("sgmnt_data",324,"name")="sgmnt_data.wc_blocked_onln_rlbk_cntr"
+	Set gtmtypes("sgmnt_data",324,"off")=3296
 	Set gtmtypes("sgmnt_data",324,"len")=4
 	Set gtmtypes("sgmnt_data",324,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","spcfc_buffer_flush_retries_cntr")=324
-	Set gtmtypes("sgmnt_data",325,"name")="sgmnt_data.spcfc_buffer_flushed_during_lockwait_cntr"
-	Set gtmtypes("sgmnt_data",325,"off")=3336
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_onln_rlbk_cntr")=324
+	Set gtmtypes("sgmnt_data",325,"name")="sgmnt_data.stale_cntr"
+	Set gtmtypes("sgmnt_data",325,"off")=3300
 	Set gtmtypes("sgmnt_data",325,"len")=4
 	Set gtmtypes("sgmnt_data",325,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","spcfc_buffer_flushed_during_lockwait_cntr")=325
-	Set gtmtypes("sgmnt_data",326,"name")="sgmnt_data.tp_crit_retries_cntr"
-	Set gtmtypes("sgmnt_data",326,"off")=3340
+	Set gtmtypfldindx("sgmnt_data","stale_cntr")=325
+	Set gtmtypes("sgmnt_data",326,"name")="sgmnt_data.starved_cntr"
+	Set gtmtypes("sgmnt_data",326,"off")=3304
 	Set gtmtypes("sgmnt_data",326,"len")=4
 	Set gtmtypes("sgmnt_data",326,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","tp_crit_retries_cntr")=326
-	Set gtmtypes("sgmnt_data",327,"name")="sgmnt_data.db_csh_getn_flush_dirty_cntr"
-	Set gtmtypes("sgmnt_data",327,"off")=3344
+	Set gtmtypfldindx("sgmnt_data","starved_cntr")=326
+	Set gtmtypes("sgmnt_data",327,"name")="sgmnt_data.stale_timer_started_cntr"
+	Set gtmtypes("sgmnt_data",327,"off")=3308
 	Set gtmtypes("sgmnt_data",327,"len")=4
 	Set gtmtypes("sgmnt_data",327,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","db_csh_getn_flush_dirty_cntr")=327
-	Set gtmtypes("sgmnt_data",328,"name")="sgmnt_data.db_csh_getn_rip_wait_cntr"
-	Set gtmtypes("sgmnt_data",328,"off")=3348
+	Set gtmtypfldindx("sgmnt_data","stale_timer_started_cntr")=327
+	Set gtmtypes("sgmnt_data",328,"name")="sgmnt_data.stale_timer_pop_cntr"
+	Set gtmtypes("sgmnt_data",328,"off")=3312
 	Set gtmtypes("sgmnt_data",328,"len")=4
 	Set gtmtypes("sgmnt_data",328,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","db_csh_getn_rip_wait_cntr")=328
-	Set gtmtypes("sgmnt_data",329,"name")="sgmnt_data.db_csh_getn_buf_owner_stuck_cntr"
-	Set gtmtypes("sgmnt_data",329,"off")=3352
+	Set gtmtypfldindx("sgmnt_data","stale_timer_pop_cntr")=328
+	Set gtmtypes("sgmnt_data",329,"name")="sgmnt_data.stale_process_defer_cntr"
+	Set gtmtypes("sgmnt_data",329,"off")=3316
 	Set gtmtypes("sgmnt_data",329,"len")=4
 	Set gtmtypes("sgmnt_data",329,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","db_csh_getn_buf_owner_stuck_cntr")=329
-	Set gtmtypes("sgmnt_data",330,"name")="sgmnt_data.db_csh_getn_out_of_design_cntr"
-	Set gtmtypes("sgmnt_data",330,"off")=3356
+	Set gtmtypfldindx("sgmnt_data","stale_process_defer_cntr")=329
+	Set gtmtypes("sgmnt_data",330,"name")="sgmnt_data.stale_defer_processed_cntr"
+	Set gtmtypes("sgmnt_data",330,"off")=3320
 	Set gtmtypes("sgmnt_data",330,"len")=4
 	Set gtmtypes("sgmnt_data",330,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","db_csh_getn_out_of_design_cntr")=330
-	Set gtmtypes("sgmnt_data",331,"name")="sgmnt_data.t_qread_buf_owner_stuck_cntr"
-	Set gtmtypes("sgmnt_data",331,"off")=3360
+	Set gtmtypfldindx("sgmnt_data","stale_defer_processed_cntr")=330
+	Set gtmtypes("sgmnt_data",331,"name")="sgmnt_data.spcfc_buffer_flush_cntr"
+	Set gtmtypes("sgmnt_data",331,"off")=3324
 	Set gtmtypes("sgmnt_data",331,"len")=4
 	Set gtmtypes("sgmnt_data",331,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","t_qread_buf_owner_stuck_cntr")=331
-	Set gtmtypes("sgmnt_data",332,"name")="sgmnt_data.t_qread_out_of_design_cntr"
-	Set gtmtypes("sgmnt_data",332,"off")=3364
+	Set gtmtypfldindx("sgmnt_data","spcfc_buffer_flush_cntr")=331
+	Set gtmtypes("sgmnt_data",332,"name")="sgmnt_data.spcfc_buffer_flush_loop_cntr"
+	Set gtmtypes("sgmnt_data",332,"off")=3328
 	Set gtmtypes("sgmnt_data",332,"len")=4
 	Set gtmtypes("sgmnt_data",332,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","t_qread_out_of_design_cntr")=332
-	Set gtmtypes("sgmnt_data",333,"name")="sgmnt_data.bt_put_flush_dirty_cntr"
-	Set gtmtypes("sgmnt_data",333,"off")=3368
+	Set gtmtypfldindx("sgmnt_data","spcfc_buffer_flush_loop_cntr")=332
+	Set gtmtypes("sgmnt_data",333,"name")="sgmnt_data.spcfc_buffer_flush_retries_cntr"
+	Set gtmtypes("sgmnt_data",333,"off")=3332
 	Set gtmtypes("sgmnt_data",333,"len")=4
 	Set gtmtypes("sgmnt_data",333,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","bt_put_flush_dirty_cntr")=333
-	Set gtmtypes("sgmnt_data",334,"name")="sgmnt_data.mlock_wakeups_cntr"
-	Set gtmtypes("sgmnt_data",334,"off")=3372
+	Set gtmtypfldindx("sgmnt_data","spcfc_buffer_flush_retries_cntr")=333
+	Set gtmtypes("sgmnt_data",334,"name")="sgmnt_data.spcfc_buffer_flushed_during_lockwait_cntr"
+	Set gtmtypes("sgmnt_data",334,"off")=3336
 	Set gtmtypes("sgmnt_data",334,"len")=4
 	Set gtmtypes("sgmnt_data",334,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","mlock_wakeups_cntr")=334
-	Set gtmtypes("sgmnt_data",335,"name")="sgmnt_data.wc_blocked_wcs_recover_invoked_cntr"
-	Set gtmtypes("sgmnt_data",335,"off")=3376
+	Set gtmtypfldindx("sgmnt_data","spcfc_buffer_flushed_during_lockwait_cntr")=334
+	Set gtmtypes("sgmnt_data",335,"name")="sgmnt_data.tp_crit_retries_cntr"
+	Set gtmtypes("sgmnt_data",335,"off")=3340
 	Set gtmtypes("sgmnt_data",335,"len")=4
 	Set gtmtypes("sgmnt_data",335,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_recover_invoked_cntr")=335
-	Set gtmtypes("sgmnt_data",336,"name")="sgmnt_data.wc_blocked_wcs_verify_passed_cntr"
-	Set gtmtypes("sgmnt_data",336,"off")=3380
+	Set gtmtypfldindx("sgmnt_data","tp_crit_retries_cntr")=335
+	Set gtmtypes("sgmnt_data",336,"name")="sgmnt_data.db_csh_getn_flush_dirty_cntr"
+	Set gtmtypes("sgmnt_data",336,"off")=3344
 	Set gtmtypes("sgmnt_data",336,"len")=4
 	Set gtmtypes("sgmnt_data",336,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_verify_passed_cntr")=336
-	Set gtmtypes("sgmnt_data",337,"name")="sgmnt_data.wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr"
-	Set gtmtypes("sgmnt_data",337,"off")=3384
+	Set gtmtypfldindx("sgmnt_data","db_csh_getn_flush_dirty_cntr")=336
+	Set gtmtypes("sgmnt_data",337,"name")="sgmnt_data.db_csh_getn_rip_wait_cntr"
+	Set gtmtypes("sgmnt_data",337,"off")=3348
 	Set gtmtypes("sgmnt_data",337,"len")=4
 	Set gtmtypes("sgmnt_data",337,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr")=337
-	Set gtmtypes("sgmnt_data",338,"name")="sgmnt_data.wc_blocked_t_qread_db_csh_get_invalid_blk_cntr"
-	Set gtmtypes("sgmnt_data",338,"off")=3388
+	Set gtmtypfldindx("sgmnt_data","db_csh_getn_rip_wait_cntr")=337
+	Set gtmtypes("sgmnt_data",338,"name")="sgmnt_data.db_csh_getn_buf_owner_stuck_cntr"
+	Set gtmtypes("sgmnt_data",338,"off")=3352
 	Set gtmtypes("sgmnt_data",338,"len")=4
 	Set gtmtypes("sgmnt_data",338,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_db_csh_get_invalid_blk_cntr")=338
-	Set gtmtypes("sgmnt_data",339,"name")="sgmnt_data.wc_blocked_db_csh_getn_loopexceed_cntr"
-	Set gtmtypes("sgmnt_data",339,"off")=3392
+	Set gtmtypfldindx("sgmnt_data","db_csh_getn_buf_owner_stuck_cntr")=338
+	Set gtmtypes("sgmnt_data",339,"name")="sgmnt_data.db_csh_getn_out_of_design_cntr"
+	Set gtmtypes("sgmnt_data",339,"off")=3356
 	Set gtmtypes("sgmnt_data",339,"len")=4
 	Set gtmtypes("sgmnt_data",339,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_db_csh_getn_loopexceed_cntr")=339
-	Set gtmtypes("sgmnt_data",340,"name")="sgmnt_data.wc_blocked_db_csh_getn_wcsstarvewrt_cntr"
-	Set gtmtypes("sgmnt_data",340,"off")=3396
+	Set gtmtypfldindx("sgmnt_data","db_csh_getn_out_of_design_cntr")=339
+	Set gtmtypes("sgmnt_data",340,"name")="sgmnt_data.t_qread_buf_owner_stuck_cntr"
+	Set gtmtypes("sgmnt_data",340,"off")=3360
 	Set gtmtypes("sgmnt_data",340,"len")=4
 	Set gtmtypes("sgmnt_data",340,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_db_csh_getn_wcsstarvewrt_cntr")=340
-	Set gtmtypes("sgmnt_data",341,"name")="sgmnt_data.wc_blocked_db_csh_get_cntr"
-	Set gtmtypes("sgmnt_data",341,"off")=3400
+	Set gtmtypfldindx("sgmnt_data","t_qread_buf_owner_stuck_cntr")=340
+	Set gtmtypes("sgmnt_data",341,"name")="sgmnt_data.t_qread_out_of_design_cntr"
+	Set gtmtypes("sgmnt_data",341,"off")=3364
 	Set gtmtypes("sgmnt_data",341,"len")=4
 	Set gtmtypes("sgmnt_data",341,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_db_csh_get_cntr")=341
-	Set gtmtypes("sgmnt_data",342,"name")="sgmnt_data.wc_blocked_tp_tend_wcsgetspace_cntr"
-	Set gtmtypes("sgmnt_data",342,"off")=3404
+	Set gtmtypfldindx("sgmnt_data","t_qread_out_of_design_cntr")=341
+	Set gtmtypes("sgmnt_data",342,"name")="sgmnt_data.bt_put_flush_dirty_cntr"
+	Set gtmtypes("sgmnt_data",342,"off")=3368
 	Set gtmtypes("sgmnt_data",342,"len")=4
 	Set gtmtypes("sgmnt_data",342,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_wcsgetspace_cntr")=342
-	Set gtmtypes("sgmnt_data",343,"name")="sgmnt_data.wc_blocked_tp_tend_t1_cntr"
-	Set gtmtypes("sgmnt_data",343,"off")=3408
+	Set gtmtypfldindx("sgmnt_data","bt_put_flush_dirty_cntr")=342
+	Set gtmtypes("sgmnt_data",343,"name")="sgmnt_data.mlock_wakeups_cntr"
+	Set gtmtypes("sgmnt_data",343,"off")=3372
 	Set gtmtypes("sgmnt_data",343,"len")=4
 	Set gtmtypes("sgmnt_data",343,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_t1_cntr")=343
-	Set gtmtypes("sgmnt_data",344,"name")="sgmnt_data.wc_blocked_tp_tend_bitmap_cntr"
-	Set gtmtypes("sgmnt_data",344,"off")=3412
+	Set gtmtypfldindx("sgmnt_data","mlock_wakeups_cntr")=343
+	Set gtmtypes("sgmnt_data",344,"name")="sgmnt_data.wc_blocked_wcs_recover_invoked_cntr"
+	Set gtmtypes("sgmnt_data",344,"off")=3376
 	Set gtmtypes("sgmnt_data",344,"len")=4
 	Set gtmtypes("sgmnt_data",344,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_bitmap_cntr")=344
-	Set gtmtypes("sgmnt_data",345,"name")="sgmnt_data.wc_blocked_tp_tend_jnl_cwset_cntr"
-	Set gtmtypes("sgmnt_data",345,"off")=3416
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_recover_invoked_cntr")=344
+	Set gtmtypes("sgmnt_data",345,"name")="sgmnt_data.wc_blocked_wcs_verify_passed_cntr"
+	Set gtmtypes("sgmnt_data",345,"off")=3380
 	Set gtmtypes("sgmnt_data",345,"len")=4
 	Set gtmtypes("sgmnt_data",345,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_jnl_cwset_cntr")=345
-	Set gtmtypes("sgmnt_data",346,"name")="sgmnt_data.wc_blocked_tp_tend_jnl_wcsflu_cntr"
-	Set gtmtypes("sgmnt_data",346,"off")=3420
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_verify_passed_cntr")=345
+	Set gtmtypes("sgmnt_data",346,"name")="sgmnt_data.wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr"
+	Set gtmtypes("sgmnt_data",346,"off")=3384
 	Set gtmtypes("sgmnt_data",346,"len")=4
 	Set gtmtypes("sgmnt_data",346,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_jnl_wcsflu_cntr")=346
-	Set gtmtypes("sgmnt_data",347,"name")="sgmnt_data.wc_blocked_t_end_hist_cntr"
-	Set gtmtypes("sgmnt_data",347,"off")=3424
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr")=346
+	Set gtmtypes("sgmnt_data",347,"name")="sgmnt_data.wc_blocked_t_qread_db_csh_get_invalid_blk_cntr"
+	Set gtmtypes("sgmnt_data",347,"off")=3388
 	Set gtmtypes("sgmnt_data",347,"len")=4
 	Set gtmtypes("sgmnt_data",347,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_hist_cntr")=347
-	Set gtmtypes("sgmnt_data",348,"name")="sgmnt_data.wc_blocked_t_end_hist1_nullbt_cntr"
-	Set gtmtypes("sgmnt_data",348,"off")=3428
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_db_csh_get_invalid_blk_cntr")=347
+	Set gtmtypes("sgmnt_data",348,"name")="sgmnt_data.wc_blocked_db_csh_getn_loopexceed_cntr"
+	Set gtmtypes("sgmnt_data",348,"off")=3392
 	Set gtmtypes("sgmnt_data",348,"len")=4
 	Set gtmtypes("sgmnt_data",348,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_hist1_nullbt_cntr")=348
-	Set gtmtypes("sgmnt_data",349,"name")="sgmnt_data.wc_blocked_t_end_hist1_nonnullbt_cntr"
-	Set gtmtypes("sgmnt_data",349,"off")=3432
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_db_csh_getn_loopexceed_cntr")=348
+	Set gtmtypes("sgmnt_data",349,"name")="sgmnt_data.wc_blocked_db_csh_getn_wcsstarvewrt_cntr"
+	Set gtmtypes("sgmnt_data",349,"off")=3396
 	Set gtmtypes("sgmnt_data",349,"len")=4
 	Set gtmtypes("sgmnt_data",349,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_hist1_nonnullbt_cntr")=349
-	Set gtmtypes("sgmnt_data",350,"name")="sgmnt_data.wc_blocked_t_end_bitmap_nullbt_cntr"
-	Set gtmtypes("sgmnt_data",350,"off")=3436
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_db_csh_getn_wcsstarvewrt_cntr")=349
+	Set gtmtypes("sgmnt_data",350,"name")="sgmnt_data.wc_blocked_db_csh_get_cntr"
+	Set gtmtypes("sgmnt_data",350,"off")=3400
 	Set gtmtypes("sgmnt_data",350,"len")=4
 	Set gtmtypes("sgmnt_data",350,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_bitmap_nullbt_cntr")=350
-	Set gtmtypes("sgmnt_data",351,"name")="sgmnt_data.wc_blocked_t_end_bitmap_nonnullbt_cntr"
-	Set gtmtypes("sgmnt_data",351,"off")=3440
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_db_csh_get_cntr")=350
+	Set gtmtypes("sgmnt_data",351,"name")="sgmnt_data.wc_blocked_tp_tend_wcsgetspace_cntr"
+	Set gtmtypes("sgmnt_data",351,"off")=3404
 	Set gtmtypes("sgmnt_data",351,"len")=4
 	Set gtmtypes("sgmnt_data",351,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_bitmap_nonnullbt_cntr")=351
-	Set gtmtypes("sgmnt_data",352,"name")="sgmnt_data.wc_blocked_t_end_jnl_cwset_cntr"
-	Set gtmtypes("sgmnt_data",352,"off")=3444
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_wcsgetspace_cntr")=351
+	Set gtmtypes("sgmnt_data",352,"name")="sgmnt_data.wc_blocked_tp_tend_t1_cntr"
+	Set gtmtypes("sgmnt_data",352,"off")=3408
 	Set gtmtypes("sgmnt_data",352,"len")=4
 	Set gtmtypes("sgmnt_data",352,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_jnl_cwset_cntr")=352
-	Set gtmtypes("sgmnt_data",353,"name")="sgmnt_data.wc_blocked_t_end_jnl_wcsflu_cntr"
-	Set gtmtypes("sgmnt_data",353,"off")=3448
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_t1_cntr")=352
+	Set gtmtypes("sgmnt_data",353,"name")="sgmnt_data.wc_blocked_tp_tend_bitmap_cntr"
+	Set gtmtypes("sgmnt_data",353,"off")=3412
 	Set gtmtypes("sgmnt_data",353,"len")=4
 	Set gtmtypes("sgmnt_data",353,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_jnl_wcsflu_cntr")=353
-	Set gtmtypes("sgmnt_data",354,"name")="sgmnt_data.db_csh_get_too_many_loops_cntr"
-	Set gtmtypes("sgmnt_data",354,"off")=3452
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_bitmap_cntr")=353
+	Set gtmtypes("sgmnt_data",354,"name")="sgmnt_data.wc_blocked_tp_tend_jnl_cwset_cntr"
+	Set gtmtypes("sgmnt_data",354,"off")=3416
 	Set gtmtypes("sgmnt_data",354,"len")=4
 	Set gtmtypes("sgmnt_data",354,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","db_csh_get_too_many_loops_cntr")=354
-	Set gtmtypes("sgmnt_data",355,"name")="sgmnt_data.wc_blocked_tpckh_hist1_nullbt_cntr"
-	Set gtmtypes("sgmnt_data",355,"off")=3456
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_jnl_cwset_cntr")=354
+	Set gtmtypes("sgmnt_data",355,"name")="sgmnt_data.wc_blocked_tp_tend_jnl_wcsflu_cntr"
+	Set gtmtypes("sgmnt_data",355,"off")=3420
 	Set gtmtypes("sgmnt_data",355,"len")=4
 	Set gtmtypes("sgmnt_data",355,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tpckh_hist1_nullbt_cntr")=355
-	Set gtmtypes("sgmnt_data",356,"name")="sgmnt_data.wc_blocked_tpckh_hist1_nonnullbt_cntr"
-	Set gtmtypes("sgmnt_data",356,"off")=3460
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_jnl_wcsflu_cntr")=355
+	Set gtmtypes("sgmnt_data",356,"name")="sgmnt_data.wc_blocked_t_end_hist_cntr"
+	Set gtmtypes("sgmnt_data",356,"off")=3424
 	Set gtmtypes("sgmnt_data",356,"len")=4
 	Set gtmtypes("sgmnt_data",356,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tpckh_hist1_nonnullbt_cntr")=356
-	Set gtmtypes("sgmnt_data",357,"name")="sgmnt_data.jnl_blocked_writer_lost_cntr"
-	Set gtmtypes("sgmnt_data",357,"off")=3464
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_hist_cntr")=356
+	Set gtmtypes("sgmnt_data",357,"name")="sgmnt_data.wc_blocked_t_end_hist1_nullbt_cntr"
+	Set gtmtypes("sgmnt_data",357,"off")=3428
 	Set gtmtypes("sgmnt_data",357,"len")=4
 	Set gtmtypes("sgmnt_data",357,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","jnl_blocked_writer_lost_cntr")=357
-	Set gtmtypes("sgmnt_data",358,"name")="sgmnt_data.jnl_blocked_writer_stuck_cntr"
-	Set gtmtypes("sgmnt_data",358,"off")=3468
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_hist1_nullbt_cntr")=357
+	Set gtmtypes("sgmnt_data",358,"name")="sgmnt_data.wc_blocked_t_end_hist1_nonnullbt_cntr"
+	Set gtmtypes("sgmnt_data",358,"off")=3432
 	Set gtmtypes("sgmnt_data",358,"len")=4
 	Set gtmtypes("sgmnt_data",358,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","jnl_blocked_writer_stuck_cntr")=358
-	Set gtmtypes("sgmnt_data",359,"name")="sgmnt_data.jnl_blocked_writer_blocked_cntr"
-	Set gtmtypes("sgmnt_data",359,"off")=3472
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_hist1_nonnullbt_cntr")=358
+	Set gtmtypes("sgmnt_data",359,"name")="sgmnt_data.wc_blocked_t_end_bitmap_nullbt_cntr"
+	Set gtmtypes("sgmnt_data",359,"off")=3436
 	Set gtmtypes("sgmnt_data",359,"len")=4
 	Set gtmtypes("sgmnt_data",359,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","jnl_blocked_writer_blocked_cntr")=359
-	Set gtmtypes("sgmnt_data",360,"name")="sgmnt_data.n_jnl_fsyncs_cntr"
-	Set gtmtypes("sgmnt_data",360,"off")=3476
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_bitmap_nullbt_cntr")=359
+	Set gtmtypes("sgmnt_data",360,"name")="sgmnt_data.wc_blocked_t_end_bitmap_nonnullbt_cntr"
+	Set gtmtypes("sgmnt_data",360,"off")=3440
 	Set gtmtypes("sgmnt_data",360,"len")=4
 	Set gtmtypes("sgmnt_data",360,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_jnl_fsyncs_cntr")=360
-	Set gtmtypes("sgmnt_data",361,"name")="sgmnt_data.n_jnl_fsync_tries_cntr"
-	Set gtmtypes("sgmnt_data",361,"off")=3480
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_bitmap_nonnullbt_cntr")=360
+	Set gtmtypes("sgmnt_data",361,"name")="sgmnt_data.wc_blocked_t_end_jnl_cwset_cntr"
+	Set gtmtypes("sgmnt_data",361,"off")=3444
 	Set gtmtypes("sgmnt_data",361,"len")=4
 	Set gtmtypes("sgmnt_data",361,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_jnl_fsync_tries_cntr")=361
-	Set gtmtypes("sgmnt_data",362,"name")="sgmnt_data.n_jnl_fsync_recovers_cntr"
-	Set gtmtypes("sgmnt_data",362,"off")=3484
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_jnl_cwset_cntr")=361
+	Set gtmtypes("sgmnt_data",362,"name")="sgmnt_data.wc_blocked_t_end_jnl_wcsflu_cntr"
+	Set gtmtypes("sgmnt_data",362,"off")=3448
 	Set gtmtypes("sgmnt_data",362,"len")=4
 	Set gtmtypes("sgmnt_data",362,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_jnl_fsync_recovers_cntr")=362
-	Set gtmtypes("sgmnt_data",363,"name")="sgmnt_data.n_db_fsyncs_cntr"
-	Set gtmtypes("sgmnt_data",363,"off")=3488
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_jnl_wcsflu_cntr")=362
+	Set gtmtypes("sgmnt_data",363,"name")="sgmnt_data.db_csh_get_too_many_loops_cntr"
+	Set gtmtypes("sgmnt_data",363,"off")=3452
 	Set gtmtypes("sgmnt_data",363,"len")=4
 	Set gtmtypes("sgmnt_data",363,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_db_fsyncs_cntr")=363
-	Set gtmtypes("sgmnt_data",364,"name")="sgmnt_data.n_db_fsyncs_in_crit_cntr"
-	Set gtmtypes("sgmnt_data",364,"off")=3492
+	Set gtmtypfldindx("sgmnt_data","db_csh_get_too_many_loops_cntr")=363
+	Set gtmtypes("sgmnt_data",364,"name")="sgmnt_data.wc_blocked_tpckh_hist1_nullbt_cntr"
+	Set gtmtypes("sgmnt_data",364,"off")=3456
 	Set gtmtypes("sgmnt_data",364,"len")=4
 	Set gtmtypes("sgmnt_data",364,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_db_fsyncs_in_crit_cntr")=364
-	Set gtmtypes("sgmnt_data",365,"name")="sgmnt_data.n_dbsync_timers_cntr"
-	Set gtmtypes("sgmnt_data",365,"off")=3496
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tpckh_hist1_nullbt_cntr")=364
+	Set gtmtypes("sgmnt_data",365,"name")="sgmnt_data.wc_blocked_tpckh_hist1_nonnullbt_cntr"
+	Set gtmtypes("sgmnt_data",365,"off")=3460
 	Set gtmtypes("sgmnt_data",365,"len")=4
 	Set gtmtypes("sgmnt_data",365,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_dbsync_timers_cntr")=365
-	Set gtmtypes("sgmnt_data",366,"name")="sgmnt_data.n_dbsync_writes_cntr"
-	Set gtmtypes("sgmnt_data",366,"off")=3500
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tpckh_hist1_nonnullbt_cntr")=365
+	Set gtmtypes("sgmnt_data",366,"name")="sgmnt_data.jnl_blocked_writer_lost_cntr"
+	Set gtmtypes("sgmnt_data",366,"off")=3464
 	Set gtmtypes("sgmnt_data",366,"len")=4
 	Set gtmtypes("sgmnt_data",366,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_dbsync_writes_cntr")=366
-	Set gtmtypes("sgmnt_data",367,"name")="sgmnt_data.mutex_queue_full_cntr"
-	Set gtmtypes("sgmnt_data",367,"off")=3504
+	Set gtmtypfldindx("sgmnt_data","jnl_blocked_writer_lost_cntr")=366
+	Set gtmtypes("sgmnt_data",367,"name")="sgmnt_data.jnl_blocked_writer_stuck_cntr"
+	Set gtmtypes("sgmnt_data",367,"off")=3468
 	Set gtmtypes("sgmnt_data",367,"len")=4
 	Set gtmtypes("sgmnt_data",367,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","mutex_queue_full_cntr")=367
-	Set gtmtypes("sgmnt_data",368,"name")="sgmnt_data.wcb_bt_put_cntr"
-	Set gtmtypes("sgmnt_data",368,"off")=3508
+	Set gtmtypfldindx("sgmnt_data","jnl_blocked_writer_stuck_cntr")=367
+	Set gtmtypes("sgmnt_data",368,"name")="sgmnt_data.jnl_blocked_writer_blocked_cntr"
+	Set gtmtypes("sgmnt_data",368,"off")=3472
 	Set gtmtypes("sgmnt_data",368,"len")=4
 	Set gtmtypes("sgmnt_data",368,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_bt_put_cntr")=368
-	Set gtmtypes("sgmnt_data",369,"name")="sgmnt_data.wcb_mutex_salvage_cntr"
-	Set gtmtypes("sgmnt_data",369,"off")=3512
+	Set gtmtypfldindx("sgmnt_data","jnl_blocked_writer_blocked_cntr")=368
+	Set gtmtypes("sgmnt_data",369,"name")="sgmnt_data.n_jnl_fsyncs_cntr"
+	Set gtmtypes("sgmnt_data",369,"off")=3476
 	Set gtmtypes("sgmnt_data",369,"len")=4
 	Set gtmtypes("sgmnt_data",369,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_mutex_salvage_cntr")=369
-	Set gtmtypes("sgmnt_data",370,"name")="sgmnt_data.wcb_tp_grab_crit_cntr"
-	Set gtmtypes("sgmnt_data",370,"off")=3516
+	Set gtmtypfldindx("sgmnt_data","n_jnl_fsyncs_cntr")=369
+	Set gtmtypes("sgmnt_data",370,"name")="sgmnt_data.n_jnl_fsync_tries_cntr"
+	Set gtmtypes("sgmnt_data",370,"off")=3480
 	Set gtmtypes("sgmnt_data",370,"len")=4
 	Set gtmtypes("sgmnt_data",370,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_tp_grab_crit_cntr")=370
-	Set gtmtypes("sgmnt_data",371,"name")="sgmnt_data.wcb_t_end_sysops_nocr_invcr_cntr"
-	Set gtmtypes("sgmnt_data",371,"off")=3520
+	Set gtmtypfldindx("sgmnt_data","n_jnl_fsync_tries_cntr")=370
+	Set gtmtypes("sgmnt_data",371,"name")="sgmnt_data.n_jnl_fsync_recovers_cntr"
+	Set gtmtypes("sgmnt_data",371,"off")=3484
 	Set gtmtypes("sgmnt_data",371,"len")=4
 	Set gtmtypes("sgmnt_data",371,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_nocr_invcr_cntr")=371
-	Set gtmtypes("sgmnt_data",372,"name")="sgmnt_data.wcb_t_end_sysops_cr_invcr_cntr"
-	Set gtmtypes("sgmnt_data",372,"off")=3524
+	Set gtmtypfldindx("sgmnt_data","n_jnl_fsync_recovers_cntr")=371
+	Set gtmtypes("sgmnt_data",372,"name")="sgmnt_data.n_db_fsyncs_cntr"
+	Set gtmtypes("sgmnt_data",372,"off")=3488
 	Set gtmtypes("sgmnt_data",372,"len")=4
 	Set gtmtypes("sgmnt_data",372,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_cr_invcr_cntr")=372
-	Set gtmtypes("sgmnt_data",373,"name")="sgmnt_data.wcb_t_end_sysops_rip_wait_cntr"
-	Set gtmtypes("sgmnt_data",373,"off")=3528
+	Set gtmtypfldindx("sgmnt_data","n_db_fsyncs_cntr")=372
+	Set gtmtypes("sgmnt_data",373,"name")="sgmnt_data.n_db_fsyncs_in_crit_cntr"
+	Set gtmtypes("sgmnt_data",373,"off")=3492
 	Set gtmtypes("sgmnt_data",373,"len")=4
 	Set gtmtypes("sgmnt_data",373,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_rip_wait_cntr")=373
-	Set gtmtypes("sgmnt_data",374,"name")="sgmnt_data.wcb_t_end_sysops_dirtyripwait_cntr"
-	Set gtmtypes("sgmnt_data",374,"off")=3532
+	Set gtmtypfldindx("sgmnt_data","n_db_fsyncs_in_crit_cntr")=373
+	Set gtmtypes("sgmnt_data",374,"name")="sgmnt_data.n_dbsync_timers_cntr"
+	Set gtmtypes("sgmnt_data",374,"off")=3496
 	Set gtmtypes("sgmnt_data",374,"len")=4
 	Set gtmtypes("sgmnt_data",374,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirtyripwait_cntr")=374
-	Set gtmtypes("sgmnt_data",375,"name")="sgmnt_data.wcb_gds_rundown_cntr"
-	Set gtmtypes("sgmnt_data",375,"off")=3536
+	Set gtmtypfldindx("sgmnt_data","n_dbsync_timers_cntr")=374
+	Set gtmtypes("sgmnt_data",375,"name")="sgmnt_data.n_dbsync_writes_cntr"
+	Set gtmtypes("sgmnt_data",375,"off")=3500
 	Set gtmtypes("sgmnt_data",375,"len")=4
 	Set gtmtypes("sgmnt_data",375,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_gds_rundown_cntr")=375
-	Set gtmtypes("sgmnt_data",376,"name")="sgmnt_data.wcb_wcs_flu1_cntr"
-	Set gtmtypes("sgmnt_data",376,"off")=3540
+	Set gtmtypfldindx("sgmnt_data","n_dbsync_writes_cntr")=375
+	Set gtmtypes("sgmnt_data",376,"name")="sgmnt_data.mutex_queue_full_cntr"
+	Set gtmtypes("sgmnt_data",376,"off")=3504
 	Set gtmtypes("sgmnt_data",376,"len")=4
 	Set gtmtypes("sgmnt_data",376,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_wcs_flu1_cntr")=376
-	Set gtmtypes("sgmnt_data",377,"name")="sgmnt_data.wcb_mu_back_cntr"
-	Set gtmtypes("sgmnt_data",377,"off")=3544
+	Set gtmtypfldindx("sgmnt_data","mutex_queue_full_cntr")=376
+	Set gtmtypes("sgmnt_data",377,"name")="sgmnt_data.wcb_bt_put_cntr"
+	Set gtmtypes("sgmnt_data",377,"off")=3508
 	Set gtmtypes("sgmnt_data",377,"len")=4
 	Set gtmtypes("sgmnt_data",377,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_mu_back_cntr")=377
-	Set gtmtypes("sgmnt_data",378,"name")="sgmnt_data.wcb_t_end_sysops_dirty_invcr_cntr"
-	Set gtmtypes("sgmnt_data",378,"off")=3548
+	Set gtmtypfldindx("sgmnt_data","wcb_bt_put_cntr")=377
+	Set gtmtypes("sgmnt_data",378,"name")="sgmnt_data.wcb_mutex_salvage_cntr"
+	Set gtmtypes("sgmnt_data",378,"off")=3512
 	Set gtmtypes("sgmnt_data",378,"len")=4
 	Set gtmtypes("sgmnt_data",378,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirty_invcr_cntr")=378
-	Set gtmtypes("sgmnt_data",379,"name")="sgmnt_data.wcb_t_end_sysops_wtfini_fail_cntr"
-	Set gtmtypes("sgmnt_data",379,"off")=3552
+	Set gtmtypfldindx("sgmnt_data","wcb_mutex_salvage_cntr")=378
+	Set gtmtypes("sgmnt_data",379,"name")="sgmnt_data.wcb_tp_grab_crit_cntr"
+	Set gtmtypes("sgmnt_data",379,"off")=3516
 	Set gtmtypes("sgmnt_data",379,"len")=4
 	Set gtmtypes("sgmnt_data",379,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_wtfini_fail_cntr")=379
-	Set gtmtypes("sgmnt_data",380,"name")="sgmnt_data.wcb_t_end_sysops_twin_stuck_cntr"
-	Set gtmtypes("sgmnt_data",380,"off")=3556
+	Set gtmtypfldindx("sgmnt_data","wcb_tp_grab_crit_cntr")=379
+	Set gtmtypes("sgmnt_data",380,"name")="sgmnt_data.wcb_t_end_sysops_nocr_invcr_cntr"
+	Set gtmtypes("sgmnt_data",380,"off")=3520
 	Set gtmtypes("sgmnt_data",380,"len")=4
 	Set gtmtypes("sgmnt_data",380,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_twin_stuck_cntr")=380
-	Set gtmtypes("sgmnt_data",381,"name")="sgmnt_data.db_csh_getn_wrt_latch_stuck_cntr"
-	Set gtmtypes("sgmnt_data",381,"off")=3560
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_nocr_invcr_cntr")=380
+	Set gtmtypes("sgmnt_data",381,"name")="sgmnt_data.wcb_t_end_sysops_cr_invcr_cntr"
+	Set gtmtypes("sgmnt_data",381,"off")=3524
 	Set gtmtypes("sgmnt_data",381,"len")=4
 	Set gtmtypes("sgmnt_data",381,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","db_csh_getn_wrt_latch_stuck_cntr")=381
-	Set gtmtypes("sgmnt_data",382,"name")="sgmnt_data.wcb_secshr_db_clnup_now_crit_cntr"
-	Set gtmtypes("sgmnt_data",382,"off")=3564
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_cr_invcr_cntr")=381
+	Set gtmtypes("sgmnt_data",382,"name")="sgmnt_data.wcb_t_end_sysops_rip_wait_cntr"
+	Set gtmtypes("sgmnt_data",382,"off")=3528
 	Set gtmtypes("sgmnt_data",382,"len")=4
 	Set gtmtypes("sgmnt_data",382,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_secshr_db_clnup_now_crit_cntr")=382
-	Set gtmtypes("sgmnt_data",383,"name")="sgmnt_data.wc_blocked_t_qread_bad_bt_index1_cntr"
-	Set gtmtypes("sgmnt_data",383,"off")=3568
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_rip_wait_cntr")=382
+	Set gtmtypes("sgmnt_data",383,"name")="sgmnt_data.wcb_t_end_sysops_dirtyripwait_cntr"
+	Set gtmtypes("sgmnt_data",383,"off")=3532
 	Set gtmtypes("sgmnt_data",383,"len")=4
 	Set gtmtypes("sgmnt_data",383,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_bad_bt_index1_cntr")=383
-	Set gtmtypes("sgmnt_data",384,"name")="sgmnt_data.wc_blocked_t_qread_bad_bt_index2_cntr"
-	Set gtmtypes("sgmnt_data",384,"off")=3572
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirtyripwait_cntr")=383
+	Set gtmtypes("sgmnt_data",384,"name")="sgmnt_data.wcb_gds_rundown_cntr"
+	Set gtmtypes("sgmnt_data",384,"off")=3536
 	Set gtmtypes("sgmnt_data",384,"len")=4
 	Set gtmtypes("sgmnt_data",384,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_bad_bt_index2_cntr")=384
-	Set gtmtypes("sgmnt_data",385,"name")="sgmnt_data.wc_blocked_t_end_crbtmismatch1_cntr"
-	Set gtmtypes("sgmnt_data",385,"off")=3576
+	Set gtmtypfldindx("sgmnt_data","wcb_gds_rundown_cntr")=384
+	Set gtmtypes("sgmnt_data",385,"name")="sgmnt_data.wcb_wcs_flu1_cntr"
+	Set gtmtypes("sgmnt_data",385,"off")=3540
 	Set gtmtypes("sgmnt_data",385,"len")=4
 	Set gtmtypes("sgmnt_data",385,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_crbtmismatch1_cntr")=385
-	Set gtmtypes("sgmnt_data",386,"name")="sgmnt_data.wc_blocked_t_end_crbtmismatch2_cntr"
-	Set gtmtypes("sgmnt_data",386,"off")=3580
+	Set gtmtypfldindx("sgmnt_data","wcb_wcs_flu1_cntr")=385
+	Set gtmtypes("sgmnt_data",386,"name")="sgmnt_data.wcb_mu_back_cntr"
+	Set gtmtypes("sgmnt_data",386,"off")=3544
 	Set gtmtypes("sgmnt_data",386,"len")=4
 	Set gtmtypes("sgmnt_data",386,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_crbtmismatch2_cntr")=386
-	Set gtmtypes("sgmnt_data",387,"name")="sgmnt_data.wc_blocked_t_end_crbtmismatch3_cntr"
-	Set gtmtypes("sgmnt_data",387,"off")=3584
+	Set gtmtypfldindx("sgmnt_data","wcb_mu_back_cntr")=386
+	Set gtmtypes("sgmnt_data",387,"name")="sgmnt_data.wcb_t_end_sysops_dirty_invcr_cntr"
+	Set gtmtypes("sgmnt_data",387,"off")=3548
 	Set gtmtypes("sgmnt_data",387,"len")=4
 	Set gtmtypes("sgmnt_data",387,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_crbtmismatch3_cntr")=387
-	Set gtmtypes("sgmnt_data",388,"name")="sgmnt_data.wc_blocked_tp_tend_crbtmismatch1_cntr"
-	Set gtmtypes("sgmnt_data",388,"off")=3588
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirty_invcr_cntr")=387
+	Set gtmtypes("sgmnt_data",388,"name")="sgmnt_data.wcb_t_end_sysops_wtfini_fail_cntr"
+	Set gtmtypes("sgmnt_data",388,"off")=3552
 	Set gtmtypes("sgmnt_data",388,"len")=4
 	Set gtmtypes("sgmnt_data",388,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_crbtmismatch1_cntr")=388
-	Set gtmtypes("sgmnt_data",389,"name")="sgmnt_data.wc_blocked_tp_tend_crbtmismatch2_cntr"
-	Set gtmtypes("sgmnt_data",389,"off")=3592
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_wtfini_fail_cntr")=388
+	Set gtmtypes("sgmnt_data",389,"name")="sgmnt_data.wcb_t_end_sysops_twin_stuck_cntr"
+	Set gtmtypes("sgmnt_data",389,"off")=3556
 	Set gtmtypes("sgmnt_data",389,"len")=4
 	Set gtmtypes("sgmnt_data",389,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_crbtmismatch2_cntr")=389
-	Set gtmtypes("sgmnt_data",390,"name")="sgmnt_data.wc_blocked_tp_tend_crbtmismatch3_cntr"
-	Set gtmtypes("sgmnt_data",390,"off")=3596
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_twin_stuck_cntr")=389
+	Set gtmtypes("sgmnt_data",390,"name")="sgmnt_data.db_csh_getn_wrt_latch_stuck_cntr"
+	Set gtmtypes("sgmnt_data",390,"off")=3560
 	Set gtmtypes("sgmnt_data",390,"len")=4
 	Set gtmtypes("sgmnt_data",390,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_crbtmismatch3_cntr")=390
-	Set gtmtypes("sgmnt_data",391,"name")="sgmnt_data.wc_blocked_wcs_wtstart_bad_cr_cntr"
-	Set gtmtypes("sgmnt_data",391,"off")=3600
+	Set gtmtypfldindx("sgmnt_data","db_csh_getn_wrt_latch_stuck_cntr")=390
+	Set gtmtypes("sgmnt_data",391,"name")="sgmnt_data.wcb_secshr_db_clnup_now_crit_cntr"
+	Set gtmtypes("sgmnt_data",391,"off")=3564
 	Set gtmtypes("sgmnt_data",391,"len")=4
 	Set gtmtypes("sgmnt_data",391,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_wtstart_bad_cr_cntr")=391
-	Set gtmtypes("sgmnt_data",392,"name")="sgmnt_data.wc_blocked_wcs_wtfini_bad_cr_cntr"
-	Set gtmtypes("sgmnt_data",392,"off")=3604
+	Set gtmtypfldindx("sgmnt_data","wcb_secshr_db_clnup_now_crit_cntr")=391
+	Set gtmtypes("sgmnt_data",392,"name")="sgmnt_data.wc_blocked_t_qread_bad_bt_index1_cntr"
+	Set gtmtypes("sgmnt_data",392,"off")=3568
 	Set gtmtypes("sgmnt_data",392,"len")=4
 	Set gtmtypes("sgmnt_data",392,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_wtfini_bad_cr_cntr")=392
-	Set gtmtypes("sgmnt_data",393,"name")="sgmnt_data.wc_blocked_bt_get_cntr"
-	Set gtmtypes("sgmnt_data",393,"off")=3608
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_bad_bt_index1_cntr")=392
+	Set gtmtypes("sgmnt_data",393,"name")="sgmnt_data.wc_blocked_t_qread_bad_bt_index2_cntr"
+	Set gtmtypes("sgmnt_data",393,"off")=3572
 	Set gtmtypes("sgmnt_data",393,"len")=4
 	Set gtmtypes("sgmnt_data",393,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_bt_get_cntr")=393
-	Set gtmtypes("sgmnt_data",394,"name")="sgmnt_data.wc_blocked_wcs_cdb_sc_final_retry_cntr"
-	Set gtmtypes("sgmnt_data",394,"off")=3612
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_bad_bt_index2_cntr")=393
+	Set gtmtypes("sgmnt_data",394,"name")="sgmnt_data.wc_blocked_t_end_crbtmismatch1_cntr"
+	Set gtmtypes("sgmnt_data",394,"off")=3576
 	Set gtmtypes("sgmnt_data",394,"len")=4
 	Set gtmtypes("sgmnt_data",394,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_cdb_sc_final_retry_cntr")=394
-	Set gtmtypes("sgmnt_data",395,"name")="sgmnt_data.wcb_bg_update_lckfail1_cntr"
-	Set gtmtypes("sgmnt_data",395,"off")=3616
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_crbtmismatch1_cntr")=394
+	Set gtmtypes("sgmnt_data",395,"name")="sgmnt_data.wc_blocked_t_end_crbtmismatch2_cntr"
+	Set gtmtypes("sgmnt_data",395,"off")=3580
 	Set gtmtypes("sgmnt_data",395,"len")=4
 	Set gtmtypes("sgmnt_data",395,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_bg_update_lckfail1_cntr")=395
-	Set gtmtypes("sgmnt_data",396,"name")="sgmnt_data.wcb_bg_update_lckfail2_cntr"
-	Set gtmtypes("sgmnt_data",396,"off")=3620
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_crbtmismatch2_cntr")=395
+	Set gtmtypes("sgmnt_data",396,"name")="sgmnt_data.wc_blocked_t_end_crbtmismatch3_cntr"
+	Set gtmtypes("sgmnt_data",396,"off")=3584
 	Set gtmtypes("sgmnt_data",396,"len")=4
 	Set gtmtypes("sgmnt_data",396,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_bg_update_lckfail2_cntr")=396
-	Set gtmtypes("sgmnt_data",397,"name")="sgmnt_data.wcb_wtstart_lckfail1_cntr"
-	Set gtmtypes("sgmnt_data",397,"off")=3624
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_crbtmismatch3_cntr")=396
+	Set gtmtypes("sgmnt_data",397,"name")="sgmnt_data.wc_blocked_tp_tend_crbtmismatch1_cntr"
+	Set gtmtypes("sgmnt_data",397,"off")=3588
 	Set gtmtypes("sgmnt_data",397,"len")=4
 	Set gtmtypes("sgmnt_data",397,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail1_cntr")=397
-	Set gtmtypes("sgmnt_data",398,"name")="sgmnt_data.wcb_wtstart_lckfail2_cntr"
-	Set gtmtypes("sgmnt_data",398,"off")=3628
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_crbtmismatch1_cntr")=397
+	Set gtmtypes("sgmnt_data",398,"name")="sgmnt_data.wc_blocked_tp_tend_crbtmismatch2_cntr"
+	Set gtmtypes("sgmnt_data",398,"off")=3592
 	Set gtmtypes("sgmnt_data",398,"len")=4
 	Set gtmtypes("sgmnt_data",398,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail2_cntr")=398
-	Set gtmtypes("sgmnt_data",399,"name")="sgmnt_data.wcb_wtstart_lckfail3_cntr"
-	Set gtmtypes("sgmnt_data",399,"off")=3632
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_crbtmismatch2_cntr")=398
+	Set gtmtypes("sgmnt_data",399,"name")="sgmnt_data.wc_blocked_tp_tend_crbtmismatch3_cntr"
+	Set gtmtypes("sgmnt_data",399,"off")=3596
 	Set gtmtypes("sgmnt_data",399,"len")=4
 	Set gtmtypes("sgmnt_data",399,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail3_cntr")=399
-	Set gtmtypes("sgmnt_data",400,"name")="sgmnt_data.wcb_wtstart_lckfail4_cntr"
-	Set gtmtypes("sgmnt_data",400,"off")=3636
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_crbtmismatch3_cntr")=399
+	Set gtmtypes("sgmnt_data",400,"name")="sgmnt_data.wc_blocked_wcs_wtstart_bad_cr_cntr"
+	Set gtmtypes("sgmnt_data",400,"off")=3600
 	Set gtmtypes("sgmnt_data",400,"len")=4
 	Set gtmtypes("sgmnt_data",400,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail4_cntr")=400
-	Set gtmtypes("sgmnt_data",401,"name")="sgmnt_data.wcb_wtfini_lckfail1_cntr"
-	Set gtmtypes("sgmnt_data",401,"off")=3640
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_wtstart_bad_cr_cntr")=400
+	Set gtmtypes("sgmnt_data",401,"name")="sgmnt_data.wc_blocked_wcs_wtfini_bad_cr_cntr"
+	Set gtmtypes("sgmnt_data",401,"off")=3604
 	Set gtmtypes("sgmnt_data",401,"len")=4
 	Set gtmtypes("sgmnt_data",401,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail1_cntr")=401
-	Set gtmtypes("sgmnt_data",402,"name")="sgmnt_data.wcb_wtfini_lckfail2_cntr"
-	Set gtmtypes("sgmnt_data",402,"off")=3644
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_wtfini_bad_cr_cntr")=401
+	Set gtmtypes("sgmnt_data",402,"name")="sgmnt_data.wc_blocked_bt_get_cntr"
+	Set gtmtypes("sgmnt_data",402,"off")=3608
 	Set gtmtypes("sgmnt_data",402,"len")=4
 	Set gtmtypes("sgmnt_data",402,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail2_cntr")=402
-	Set gtmtypes("sgmnt_data",403,"name")="sgmnt_data.wcb_wtfini_lckfail3_cntr"
-	Set gtmtypes("sgmnt_data",403,"off")=3648
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_bt_get_cntr")=402
+	Set gtmtypes("sgmnt_data",403,"name")="sgmnt_data.wc_blocked_wcs_cdb_sc_final_retry_cntr"
+	Set gtmtypes("sgmnt_data",403,"off")=3612
 	Set gtmtypes("sgmnt_data",403,"len")=4
 	Set gtmtypes("sgmnt_data",403,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail3_cntr")=403
-	Set gtmtypes("sgmnt_data",404,"name")="sgmnt_data.wcb_wtfini_lckfail4_cntr"
-	Set gtmtypes("sgmnt_data",404,"off")=3652
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_cdb_sc_final_retry_cntr")=403
+	Set gtmtypes("sgmnt_data",404,"name")="sgmnt_data.wcb_bg_update_lckfail1_cntr"
+	Set gtmtypes("sgmnt_data",404,"off")=3616
 	Set gtmtypes("sgmnt_data",404,"len")=4
 	Set gtmtypes("sgmnt_data",404,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail4_cntr")=404
-	Set gtmtypes("sgmnt_data",405,"name")="sgmnt_data.wcb_t_end_sysops_dirtystuck1_cntr"
-	Set gtmtypes("sgmnt_data",405,"off")=3656
+	Set gtmtypfldindx("sgmnt_data","wcb_bg_update_lckfail1_cntr")=404
+	Set gtmtypes("sgmnt_data",405,"name")="sgmnt_data.wcb_bg_update_lckfail2_cntr"
+	Set gtmtypes("sgmnt_data",405,"off")=3620
 	Set gtmtypes("sgmnt_data",405,"len")=4
 	Set gtmtypes("sgmnt_data",405,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirtystuck1_cntr")=405
-	Set gtmtypes("sgmnt_data",406,"name")="sgmnt_data.wcb_t_end_sysops_dirtystuck2_cntr"
-	Set gtmtypes("sgmnt_data",406,"off")=3660
+	Set gtmtypfldindx("sgmnt_data","wcb_bg_update_lckfail2_cntr")=405
+	Set gtmtypes("sgmnt_data",406,"name")="sgmnt_data.wcb_wtstart_lckfail1_cntr"
+	Set gtmtypes("sgmnt_data",406,"off")=3624
 	Set gtmtypes("sgmnt_data",406,"len")=4
 	Set gtmtypes("sgmnt_data",406,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirtystuck2_cntr")=406
-	Set gtmtypes("sgmnt_data",407,"name")="sgmnt_data.wcb_secshr_db_clnup_wbuf_dqd_cntr"
-	Set gtmtypes("sgmnt_data",407,"off")=3664
+	Set gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail1_cntr")=406
+	Set gtmtypes("sgmnt_data",407,"name")="sgmnt_data.wcb_wtstart_lckfail2_cntr"
+	Set gtmtypes("sgmnt_data",407,"off")=3628
 	Set gtmtypes("sgmnt_data",407,"len")=4
 	Set gtmtypes("sgmnt_data",407,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_secshr_db_clnup_wbuf_dqd_cntr")=407
-	Set gtmtypes("sgmnt_data",408,"name")="sgmnt_data.dwngrd_refmts_syncio_cntr"
-	Set gtmtypes("sgmnt_data",408,"off")=3668
+	Set gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail2_cntr")=407
+	Set gtmtypes("sgmnt_data",408,"name")="sgmnt_data.wcb_wtstart_lckfail3_cntr"
+	Set gtmtypes("sgmnt_data",408,"off")=3632
 	Set gtmtypes("sgmnt_data",408,"len")=4
 	Set gtmtypes("sgmnt_data",408,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","dwngrd_refmts_syncio_cntr")=408
-	Set gtmtypes("sgmnt_data",409,"name")="sgmnt_data.dwngrd_refmts_asyncio_cntr"
-	Set gtmtypes("sgmnt_data",409,"off")=3672
+	Set gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail3_cntr")=408
+	Set gtmtypes("sgmnt_data",409,"name")="sgmnt_data.wcb_wtstart_lckfail4_cntr"
+	Set gtmtypes("sgmnt_data",409,"off")=3636
 	Set gtmtypes("sgmnt_data",409,"len")=4
 	Set gtmtypes("sgmnt_data",409,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","dwngrd_refmts_asyncio_cntr")=409
-	Set gtmtypes("sgmnt_data",410,"name")="sgmnt_data.shmpool_refmt_harvests_cntr"
-	Set gtmtypes("sgmnt_data",410,"off")=3676
+	Set gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail4_cntr")=409
+	Set gtmtypes("sgmnt_data",410,"name")="sgmnt_data.wcb_wtfini_lckfail1_cntr"
+	Set gtmtypes("sgmnt_data",410,"off")=3640
 	Set gtmtypes("sgmnt_data",410,"len")=4
 	Set gtmtypes("sgmnt_data",410,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","shmpool_refmt_harvests_cntr")=410
-	Set gtmtypes("sgmnt_data",411,"name")="sgmnt_data.shmpool_recovery_cntr"
-	Set gtmtypes("sgmnt_data",411,"off")=3680
+	Set gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail1_cntr")=410
+	Set gtmtypes("sgmnt_data",411,"name")="sgmnt_data.wcb_wtfini_lckfail2_cntr"
+	Set gtmtypes("sgmnt_data",411,"off")=3644
 	Set gtmtypes("sgmnt_data",411,"len")=4
 	Set gtmtypes("sgmnt_data",411,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","shmpool_recovery_cntr")=411
-	Set gtmtypes("sgmnt_data",412,"name")="sgmnt_data.shmpool_blkd_by_sdc_cntr"
-	Set gtmtypes("sgmnt_data",412,"off")=3684
+	Set gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail2_cntr")=411
+	Set gtmtypes("sgmnt_data",412,"name")="sgmnt_data.wcb_wtfini_lckfail3_cntr"
+	Set gtmtypes("sgmnt_data",412,"off")=3648
 	Set gtmtypes("sgmnt_data",412,"len")=4
 	Set gtmtypes("sgmnt_data",412,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","shmpool_blkd_by_sdc_cntr")=412
-	Set gtmtypes("sgmnt_data",413,"name")="sgmnt_data.shmpool_alloc_bbflush_cntr"
-	Set gtmtypes("sgmnt_data",413,"off")=3688
+	Set gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail3_cntr")=412
+	Set gtmtypes("sgmnt_data",413,"name")="sgmnt_data.wcb_wtfini_lckfail4_cntr"
+	Set gtmtypes("sgmnt_data",413,"off")=3652
 	Set gtmtypes("sgmnt_data",413,"len")=4
 	Set gtmtypes("sgmnt_data",413,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","shmpool_alloc_bbflush_cntr")=413
-	Set gtmtypes("sgmnt_data",414,"name")="sgmnt_data.refmt_hvst_blk_released_replaced_cntr"
-	Set gtmtypes("sgmnt_data",414,"off")=3692
+	Set gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail4_cntr")=413
+	Set gtmtypes("sgmnt_data",414,"name")="sgmnt_data.wcb_t_end_sysops_dirtystuck1_cntr"
+	Set gtmtypes("sgmnt_data",414,"off")=3656
 	Set gtmtypes("sgmnt_data",414,"len")=4
 	Set gtmtypes("sgmnt_data",414,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","refmt_hvst_blk_released_replaced_cntr")=414
-	Set gtmtypes("sgmnt_data",415,"name")="sgmnt_data.refmt_hvst_blk_released_io_complete_cntr"
-	Set gtmtypes("sgmnt_data",415,"off")=3696
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirtystuck1_cntr")=414
+	Set gtmtypes("sgmnt_data",415,"name")="sgmnt_data.wcb_t_end_sysops_dirtystuck2_cntr"
+	Set gtmtypes("sgmnt_data",415,"off")=3660
 	Set gtmtypes("sgmnt_data",415,"len")=4
 	Set gtmtypes("sgmnt_data",415,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","refmt_hvst_blk_released_io_complete_cntr")=415
-	Set gtmtypes("sgmnt_data",416,"name")="sgmnt_data.refmt_hvst_blk_kept_cntr"
-	Set gtmtypes("sgmnt_data",416,"off")=3700
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirtystuck2_cntr")=415
+	Set gtmtypes("sgmnt_data",416,"name")="sgmnt_data.wcb_secshr_db_clnup_wbuf_dqd_cntr"
+	Set gtmtypes("sgmnt_data",416,"off")=3664
 	Set gtmtypes("sgmnt_data",416,"len")=4
 	Set gtmtypes("sgmnt_data",416,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","refmt_hvst_blk_kept_cntr")=416
-	Set gtmtypes("sgmnt_data",417,"name")="sgmnt_data.refmt_hvst_blk_ignored_cntr"
-	Set gtmtypes("sgmnt_data",417,"off")=3704
+	Set gtmtypfldindx("sgmnt_data","wcb_secshr_db_clnup_wbuf_dqd_cntr")=416
+	Set gtmtypes("sgmnt_data",417,"name")="sgmnt_data.dwngrd_refmts_syncio_cntr"
+	Set gtmtypes("sgmnt_data",417,"off")=3668
 	Set gtmtypes("sgmnt_data",417,"len")=4
 	Set gtmtypes("sgmnt_data",417,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","refmt_hvst_blk_ignored_cntr")=417
-	Set gtmtypes("sgmnt_data",418,"name")="sgmnt_data.refmt_blk_chk_blk_freed_cntr"
-	Set gtmtypes("sgmnt_data",418,"off")=3708
+	Set gtmtypfldindx("sgmnt_data","dwngrd_refmts_syncio_cntr")=417
+	Set gtmtypes("sgmnt_data",418,"name")="sgmnt_data.dwngrd_refmts_asyncio_cntr"
+	Set gtmtypes("sgmnt_data",418,"off")=3672
 	Set gtmtypes("sgmnt_data",418,"len")=4
 	Set gtmtypes("sgmnt_data",418,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","refmt_blk_chk_blk_freed_cntr")=418
-	Set gtmtypes("sgmnt_data",419,"name")="sgmnt_data.refmt_blk_chk_blk_kept_cntr"
-	Set gtmtypes("sgmnt_data",419,"off")=3712
+	Set gtmtypfldindx("sgmnt_data","dwngrd_refmts_asyncio_cntr")=418
+	Set gtmtypes("sgmnt_data",419,"name")="sgmnt_data.shmpool_refmt_harvests_cntr"
+	Set gtmtypes("sgmnt_data",419,"off")=3676
 	Set gtmtypes("sgmnt_data",419,"len")=4
 	Set gtmtypes("sgmnt_data",419,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","refmt_blk_chk_blk_kept_cntr")=419
-	Set gtmtypes("sgmnt_data",420,"name")="sgmnt_data.active_lvl_trigger_cntr"
-	Set gtmtypes("sgmnt_data",420,"off")=3716
+	Set gtmtypfldindx("sgmnt_data","shmpool_refmt_harvests_cntr")=419
+	Set gtmtypes("sgmnt_data",420,"name")="sgmnt_data.shmpool_recovery_cntr"
+	Set gtmtypes("sgmnt_data",420,"off")=3680
 	Set gtmtypes("sgmnt_data",420,"len")=4
 	Set gtmtypes("sgmnt_data",420,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","active_lvl_trigger_cntr")=420
-	Set gtmtypes("sgmnt_data",421,"name")="sgmnt_data.new_buff_cntr"
-	Set gtmtypes("sgmnt_data",421,"off")=3720
+	Set gtmtypfldindx("sgmnt_data","shmpool_recovery_cntr")=420
+	Set gtmtypes("sgmnt_data",421,"name")="sgmnt_data.shmpool_blkd_by_sdc_cntr"
+	Set gtmtypes("sgmnt_data",421,"off")=3684
 	Set gtmtypes("sgmnt_data",421,"len")=4
 	Set gtmtypes("sgmnt_data",421,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","new_buff_cntr")=421
-	Set gtmtypes("sgmnt_data",422,"name")="sgmnt_data.phase2_commit_wait_sleep_in_crit_cntr"
-	Set gtmtypes("sgmnt_data",422,"off")=3724
+	Set gtmtypfldindx("sgmnt_data","shmpool_blkd_by_sdc_cntr")=421
+	Set gtmtypes("sgmnt_data",422,"name")="sgmnt_data.shmpool_alloc_bbflush_cntr"
+	Set gtmtypes("sgmnt_data",422,"off")=3688
 	Set gtmtypes("sgmnt_data",422,"len")=4
 	Set gtmtypes("sgmnt_data",422,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","phase2_commit_wait_sleep_in_crit_cntr")=422
-	Set gtmtypes("sgmnt_data",423,"name")="sgmnt_data.phase2_commit_wait_sleep_no_crit_cntr"
-	Set gtmtypes("sgmnt_data",423,"off")=3728
+	Set gtmtypfldindx("sgmnt_data","shmpool_alloc_bbflush_cntr")=422
+	Set gtmtypes("sgmnt_data",423,"name")="sgmnt_data.refmt_hvst_blk_released_replaced_cntr"
+	Set gtmtypes("sgmnt_data",423,"off")=3692
 	Set gtmtypes("sgmnt_data",423,"len")=4
 	Set gtmtypes("sgmnt_data",423,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","phase2_commit_wait_sleep_no_crit_cntr")=423
-	Set gtmtypes("sgmnt_data",424,"name")="sgmnt_data.phase2_commit_wait_pidcnt_cntr"
-	Set gtmtypes("sgmnt_data",424,"off")=3732
+	Set gtmtypfldindx("sgmnt_data","refmt_hvst_blk_released_replaced_cntr")=423
+	Set gtmtypes("sgmnt_data",424,"name")="sgmnt_data.refmt_hvst_blk_released_io_complete_cntr"
+	Set gtmtypes("sgmnt_data",424,"off")=3696
 	Set gtmtypes("sgmnt_data",424,"len")=4
 	Set gtmtypes("sgmnt_data",424,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","phase2_commit_wait_pidcnt_cntr")=424
-	Set gtmtypes("sgmnt_data",425,"name")="sgmnt_data.wcb_t_end_sysops_intend_wait_cntr"
-	Set gtmtypes("sgmnt_data",425,"off")=3736
+	Set gtmtypfldindx("sgmnt_data","refmt_hvst_blk_released_io_complete_cntr")=424
+	Set gtmtypes("sgmnt_data",425,"name")="sgmnt_data.refmt_hvst_blk_kept_cntr"
+	Set gtmtypes("sgmnt_data",425,"off")=3700
 	Set gtmtypes("sgmnt_data",425,"len")=4
 	Set gtmtypes("sgmnt_data",425,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_intend_wait_cntr")=425
-	Set gtmtypes("sgmnt_data",426,"name")="sgmnt_data.wcb_secshr_db_clnup_phase2_clnup_cntr"
-	Set gtmtypes("sgmnt_data",426,"off")=3740
+	Set gtmtypfldindx("sgmnt_data","refmt_hvst_blk_kept_cntr")=425
+	Set gtmtypes("sgmnt_data",426,"name")="sgmnt_data.refmt_hvst_blk_ignored_cntr"
+	Set gtmtypes("sgmnt_data",426,"off")=3704
 	Set gtmtypes("sgmnt_data",426,"len")=4
 	Set gtmtypes("sgmnt_data",426,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_secshr_db_clnup_phase2_clnup_cntr")=426
-	Set gtmtypes("sgmnt_data",427,"name")="sgmnt_data.wcb_phase2_commit_wait_cntr"
-	Set gtmtypes("sgmnt_data",427,"off")=3744
+	Set gtmtypfldindx("sgmnt_data","refmt_hvst_blk_ignored_cntr")=426
+	Set gtmtypes("sgmnt_data",427,"name")="sgmnt_data.refmt_blk_chk_blk_freed_cntr"
+	Set gtmtypes("sgmnt_data",427,"off")=3708
 	Set gtmtypes("sgmnt_data",427,"len")=4
 	Set gtmtypes("sgmnt_data",427,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_phase2_commit_wait_cntr")=427
-	Set gtmtypes("sgmnt_data",428,"name")="sgmnt_data.recompute_upd_array_calls_cntr"
-	Set gtmtypes("sgmnt_data",428,"off")=3748
+	Set gtmtypfldindx("sgmnt_data","refmt_blk_chk_blk_freed_cntr")=427
+	Set gtmtypes("sgmnt_data",428,"name")="sgmnt_data.refmt_blk_chk_blk_kept_cntr"
+	Set gtmtypes("sgmnt_data",428,"off")=3712
 	Set gtmtypes("sgmnt_data",428,"len")=4
 	Set gtmtypes("sgmnt_data",428,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_calls_cntr")=428
-	Set gtmtypes("sgmnt_data",429,"name")="sgmnt_data.recompute_upd_array_rip_cntr"
-	Set gtmtypes("sgmnt_data",429,"off")=3752
+	Set gtmtypfldindx("sgmnt_data","refmt_blk_chk_blk_kept_cntr")=428
+	Set gtmtypes("sgmnt_data",429,"name")="sgmnt_data.active_lvl_trigger_cntr"
+	Set gtmtypes("sgmnt_data",429,"off")=3716
 	Set gtmtypes("sgmnt_data",429,"len")=4
 	Set gtmtypes("sgmnt_data",429,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_rip_cntr")=429
-	Set gtmtypes("sgmnt_data",430,"name")="sgmnt_data.recompute_upd_array_in_tend_cntr"
-	Set gtmtypes("sgmnt_data",430,"off")=3756
+	Set gtmtypfldindx("sgmnt_data","active_lvl_trigger_cntr")=429
+	Set gtmtypes("sgmnt_data",430,"name")="sgmnt_data.new_buff_cntr"
+	Set gtmtypes("sgmnt_data",430,"off")=3720
 	Set gtmtypes("sgmnt_data",430,"len")=4
 	Set gtmtypes("sgmnt_data",430,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_in_tend_cntr")=430
-	Set gtmtypes("sgmnt_data",431,"name")="sgmnt_data.recompute_upd_array_search_blk_cntr"
-	Set gtmtypes("sgmnt_data",431,"off")=3760
+	Set gtmtypfldindx("sgmnt_data","new_buff_cntr")=430
+	Set gtmtypes("sgmnt_data",431,"name")="sgmnt_data.phase2_commit_wait_sleep_in_crit_cntr"
+	Set gtmtypes("sgmnt_data",431,"off")=3724
 	Set gtmtypes("sgmnt_data",431,"len")=4
 	Set gtmtypes("sgmnt_data",431,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_search_blk_cntr")=431
-	Set gtmtypes("sgmnt_data",432,"name")="sgmnt_data.recompute_upd_array_new_rec_cntr"
-	Set gtmtypes("sgmnt_data",432,"off")=3764
+	Set gtmtypfldindx("sgmnt_data","phase2_commit_wait_sleep_in_crit_cntr")=431
+	Set gtmtypes("sgmnt_data",432,"name")="sgmnt_data.phase2_commit_wait_sleep_no_crit_cntr"
+	Set gtmtypes("sgmnt_data",432,"off")=3728
 	Set gtmtypes("sgmnt_data",432,"len")=4
 	Set gtmtypes("sgmnt_data",432,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_new_rec_cntr")=432
-	Set gtmtypes("sgmnt_data",433,"name")="sgmnt_data.recompute_upd_array_rec_size_cntr"
-	Set gtmtypes("sgmnt_data",433,"off")=3768
+	Set gtmtypfldindx("sgmnt_data","phase2_commit_wait_sleep_no_crit_cntr")=432
+	Set gtmtypes("sgmnt_data",433,"name")="sgmnt_data.phase2_commit_wait_pidcnt_cntr"
+	Set gtmtypes("sgmnt_data",433,"off")=3732
 	Set gtmtypes("sgmnt_data",433,"len")=4
 	Set gtmtypes("sgmnt_data",433,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_rec_size_cntr")=433
-	Set gtmtypes("sgmnt_data",434,"name")="sgmnt_data.recompute_upd_array_rec_cmpc_cntr"
-	Set gtmtypes("sgmnt_data",434,"off")=3772
+	Set gtmtypfldindx("sgmnt_data","phase2_commit_wait_pidcnt_cntr")=433
+	Set gtmtypes("sgmnt_data",434,"name")="sgmnt_data.wcb_t_end_sysops_intend_wait_cntr"
+	Set gtmtypes("sgmnt_data",434,"off")=3736
 	Set gtmtypes("sgmnt_data",434,"len")=4
 	Set gtmtypes("sgmnt_data",434,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_rec_cmpc_cntr")=434
-	Set gtmtypes("sgmnt_data",435,"name")="sgmnt_data.recompute_upd_array_blk_fini_cntr"
-	Set gtmtypes("sgmnt_data",435,"off")=3776
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_intend_wait_cntr")=434
+	Set gtmtypes("sgmnt_data",435,"name")="sgmnt_data.wcb_secshr_db_clnup_phase2_clnup_cntr"
+	Set gtmtypes("sgmnt_data",435,"off")=3740
 	Set gtmtypes("sgmnt_data",435,"len")=4
 	Set gtmtypes("sgmnt_data",435,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_blk_fini_cntr")=435
-	Set gtmtypes("sgmnt_data",436,"name")="sgmnt_data.recompute_upd_array_blk_split_cntr"
-	Set gtmtypes("sgmnt_data",436,"off")=3780
+	Set gtmtypfldindx("sgmnt_data","wcb_secshr_db_clnup_phase2_clnup_cntr")=435
+	Set gtmtypes("sgmnt_data",436,"name")="sgmnt_data.wcb_phase2_commit_wait_cntr"
+	Set gtmtypes("sgmnt_data",436,"off")=3744
 	Set gtmtypes("sgmnt_data",436,"len")=4
 	Set gtmtypes("sgmnt_data",436,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_blk_split_cntr")=436
-	Set gtmtypes("sgmnt_data",437,"name")="sgmnt_data.t_qread_ripsleep_cnt_cntr"
-	Set gtmtypes("sgmnt_data",437,"off")=3784
+	Set gtmtypfldindx("sgmnt_data","wcb_phase2_commit_wait_cntr")=436
+	Set gtmtypes("sgmnt_data",437,"name")="sgmnt_data.recompute_upd_array_calls_cntr"
+	Set gtmtypes("sgmnt_data",437,"off")=3748
 	Set gtmtypes("sgmnt_data",437,"len")=4
 	Set gtmtypes("sgmnt_data",437,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","t_qread_ripsleep_cnt_cntr")=437
-	Set gtmtypes("sgmnt_data",438,"name")="sgmnt_data.t_qread_ripsleep_nblks_cntr"
-	Set gtmtypes("sgmnt_data",438,"off")=3788
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_calls_cntr")=437
+	Set gtmtypes("sgmnt_data",438,"name")="sgmnt_data.recompute_upd_array_rip_cntr"
+	Set gtmtypes("sgmnt_data",438,"off")=3752
 	Set gtmtypes("sgmnt_data",438,"len")=4
 	Set gtmtypes("sgmnt_data",438,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","t_qread_ripsleep_nblks_cntr")=438
-	Set gtmtypes("sgmnt_data",439,"name")="sgmnt_data.bg_trc_rec_cntr_filler"
-	Set gtmtypes("sgmnt_data",439,"off")=3792
-	Set gtmtypes("sgmnt_data",439,"len")=56
-	Set gtmtypes("sgmnt_data",439,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","bg_trc_rec_cntr_filler")=439
-	Set gtmtypes("sgmnt_data",440,"name")="sgmnt_data.n_gvcst_srches"
-	Set gtmtypes("sgmnt_data",440,"off")=3848
-	Set gtmtypes("sgmnt_data",440,"len")=8
-	Set gtmtypes("sgmnt_data",440,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("sgmnt_data","n_gvcst_srches")=440
-	Set gtmtypes("sgmnt_data",441,"name")="sgmnt_data.n_gvcst_srches.curr_count"
-	Set gtmtypes("sgmnt_data",441,"off")=3848
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_rip_cntr")=438
+	Set gtmtypes("sgmnt_data",439,"name")="sgmnt_data.recompute_upd_array_in_tend_cntr"
+	Set gtmtypes("sgmnt_data",439,"off")=3756
+	Set gtmtypes("sgmnt_data",439,"len")=4
+	Set gtmtypes("sgmnt_data",439,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_in_tend_cntr")=439
+	Set gtmtypes("sgmnt_data",440,"name")="sgmnt_data.recompute_upd_array_search_blk_cntr"
+	Set gtmtypes("sgmnt_data",440,"off")=3760
+	Set gtmtypes("sgmnt_data",440,"len")=4
+	Set gtmtypes("sgmnt_data",440,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_search_blk_cntr")=440
+	Set gtmtypes("sgmnt_data",441,"name")="sgmnt_data.recompute_upd_array_new_rec_cntr"
+	Set gtmtypes("sgmnt_data",441,"off")=3764
 	Set gtmtypes("sgmnt_data",441,"len")=4
 	Set gtmtypes("sgmnt_data",441,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_gvcst_srches.curr_count")=441
-	Set gtmtypes("sgmnt_data",442,"name")="sgmnt_data.n_gvcst_srches.cumul_count"
-	Set gtmtypes("sgmnt_data",442,"off")=3852
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_new_rec_cntr")=441
+	Set gtmtypes("sgmnt_data",442,"name")="sgmnt_data.recompute_upd_array_rec_size_cntr"
+	Set gtmtypes("sgmnt_data",442,"off")=3768
 	Set gtmtypes("sgmnt_data",442,"len")=4
 	Set gtmtypes("sgmnt_data",442,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_gvcst_srches.cumul_count")=442
-	Set gtmtypes("sgmnt_data",443,"name")="sgmnt_data.n_gvcst_srch_clues"
-	Set gtmtypes("sgmnt_data",443,"off")=3856
-	Set gtmtypes("sgmnt_data",443,"len")=8
-	Set gtmtypes("sgmnt_data",443,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("sgmnt_data","n_gvcst_srch_clues")=443
-	Set gtmtypes("sgmnt_data",444,"name")="sgmnt_data.n_gvcst_srch_clues.curr_count"
-	Set gtmtypes("sgmnt_data",444,"off")=3856
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_rec_size_cntr")=442
+	Set gtmtypes("sgmnt_data",443,"name")="sgmnt_data.recompute_upd_array_rec_cmpc_cntr"
+	Set gtmtypes("sgmnt_data",443,"off")=3772
+	Set gtmtypes("sgmnt_data",443,"len")=4
+	Set gtmtypes("sgmnt_data",443,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_rec_cmpc_cntr")=443
+	Set gtmtypes("sgmnt_data",444,"name")="sgmnt_data.recompute_upd_array_blk_fini_cntr"
+	Set gtmtypes("sgmnt_data",444,"off")=3776
 	Set gtmtypes("sgmnt_data",444,"len")=4
 	Set gtmtypes("sgmnt_data",444,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_gvcst_srch_clues.curr_count")=444
-	Set gtmtypes("sgmnt_data",445,"name")="sgmnt_data.n_gvcst_srch_clues.cumul_count"
-	Set gtmtypes("sgmnt_data",445,"off")=3860
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_blk_fini_cntr")=444
+	Set gtmtypes("sgmnt_data",445,"name")="sgmnt_data.recompute_upd_array_blk_split_cntr"
+	Set gtmtypes("sgmnt_data",445,"off")=3780
 	Set gtmtypes("sgmnt_data",445,"len")=4
 	Set gtmtypes("sgmnt_data",445,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_gvcst_srch_clues.cumul_count")=445
-	Set gtmtypes("sgmnt_data",446,"name")="sgmnt_data.n_clue_used_head"
-	Set gtmtypes("sgmnt_data",446,"off")=3864
-	Set gtmtypes("sgmnt_data",446,"len")=8
-	Set gtmtypes("sgmnt_data",446,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("sgmnt_data","n_clue_used_head")=446
-	Set gtmtypes("sgmnt_data",447,"name")="sgmnt_data.n_clue_used_head.curr_count"
-	Set gtmtypes("sgmnt_data",447,"off")=3864
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_blk_split_cntr")=445
+	Set gtmtypes("sgmnt_data",446,"name")="sgmnt_data.t_qread_ripsleep_cnt_cntr"
+	Set gtmtypes("sgmnt_data",446,"off")=3784
+	Set gtmtypes("sgmnt_data",446,"len")=4
+	Set gtmtypes("sgmnt_data",446,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","t_qread_ripsleep_cnt_cntr")=446
+	Set gtmtypes("sgmnt_data",447,"name")="sgmnt_data.t_qread_ripsleep_nblks_cntr"
+	Set gtmtypes("sgmnt_data",447,"off")=3788
 	Set gtmtypes("sgmnt_data",447,"len")=4
 	Set gtmtypes("sgmnt_data",447,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_clue_used_head.curr_count")=447
-	Set gtmtypes("sgmnt_data",448,"name")="sgmnt_data.n_clue_used_head.cumul_count"
-	Set gtmtypes("sgmnt_data",448,"off")=3868
+	Set gtmtypfldindx("sgmnt_data","t_qread_ripsleep_nblks_cntr")=447
+	Set gtmtypes("sgmnt_data",448,"name")="sgmnt_data.wcs_wtfini_invoked_cntr"
+	Set gtmtypes("sgmnt_data",448,"off")=3792
 	Set gtmtypes("sgmnt_data",448,"len")=4
 	Set gtmtypes("sgmnt_data",448,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_clue_used_head.cumul_count")=448
-	Set gtmtypes("sgmnt_data",449,"name")="sgmnt_data.n_clue_used_same"
-	Set gtmtypes("sgmnt_data",449,"off")=3872
-	Set gtmtypes("sgmnt_data",449,"len")=8
-	Set gtmtypes("sgmnt_data",449,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("sgmnt_data","n_clue_used_same")=449
-	Set gtmtypes("sgmnt_data",450,"name")="sgmnt_data.n_clue_used_same.curr_count"
-	Set gtmtypes("sgmnt_data",450,"off")=3872
+	Set gtmtypfldindx("sgmnt_data","wcs_wtfini_invoked_cntr")=448
+	Set gtmtypes("sgmnt_data",449,"name")="sgmnt_data.wcs_wterror_invoked_cntr"
+	Set gtmtypes("sgmnt_data",449,"off")=3796
+	Set gtmtypes("sgmnt_data",449,"len")=4
+	Set gtmtypes("sgmnt_data",449,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","wcs_wterror_invoked_cntr")=449
+	Set gtmtypes("sgmnt_data",450,"name")="sgmnt_data.wcs_wt_restart_invoked_cntr"
+	Set gtmtypes("sgmnt_data",450,"off")=3800
 	Set gtmtypes("sgmnt_data",450,"len")=4
 	Set gtmtypes("sgmnt_data",450,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_clue_used_same.curr_count")=450
-	Set gtmtypes("sgmnt_data",451,"name")="sgmnt_data.n_clue_used_same.cumul_count"
-	Set gtmtypes("sgmnt_data",451,"off")=3876
+	Set gtmtypfldindx("sgmnt_data","wcs_wt_restart_invoked_cntr")=450
+	Set gtmtypes("sgmnt_data",451,"name")="sgmnt_data.wcs_wt_restart_eagain_cntr"
+	Set gtmtypes("sgmnt_data",451,"off")=3804
 	Set gtmtypes("sgmnt_data",451,"len")=4
 	Set gtmtypes("sgmnt_data",451,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_clue_used_same.cumul_count")=451
-	Set gtmtypes("sgmnt_data",452,"name")="sgmnt_data.n_clue_used_tail"
-	Set gtmtypes("sgmnt_data",452,"off")=3880
-	Set gtmtypes("sgmnt_data",452,"len")=8
-	Set gtmtypes("sgmnt_data",452,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("sgmnt_data","n_clue_used_tail")=452
-	Set gtmtypes("sgmnt_data",453,"name")="sgmnt_data.n_clue_used_tail.curr_count"
-	Set gtmtypes("sgmnt_data",453,"off")=3880
+	Set gtmtypfldindx("sgmnt_data","wcs_wt_restart_eagain_cntr")=451
+	Set gtmtypes("sgmnt_data",452,"name")="sgmnt_data.wcs_wt_restart_reinsert_cntr"
+	Set gtmtypes("sgmnt_data",452,"off")=3808
+	Set gtmtypes("sgmnt_data",452,"len")=4
+	Set gtmtypes("sgmnt_data",452,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","wcs_wt_restart_reinsert_cntr")=452
+	Set gtmtypes("sgmnt_data",453,"name")="sgmnt_data.wcs_wtstart_eagain_cntr"
+	Set gtmtypes("sgmnt_data",453,"off")=3812
 	Set gtmtypes("sgmnt_data",453,"len")=4
 	Set gtmtypes("sgmnt_data",453,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_clue_used_tail.curr_count")=453
-	Set gtmtypes("sgmnt_data",454,"name")="sgmnt_data.n_clue_used_tail.cumul_count"
-	Set gtmtypes("sgmnt_data",454,"off")=3884
+	Set gtmtypfldindx("sgmnt_data","wcs_wtstart_eagain_cntr")=453
+	Set gtmtypes("sgmnt_data",454,"name")="sgmnt_data.wcs_wtstart_eagain_incrit_cntr"
+	Set gtmtypes("sgmnt_data",454,"off")=3816
 	Set gtmtypes("sgmnt_data",454,"len")=4
 	Set gtmtypes("sgmnt_data",454,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_clue_used_tail.cumul_count")=454
-	Set gtmtypes("sgmnt_data",455,"name")="sgmnt_data.n_t_qreads"
-	Set gtmtypes("sgmnt_data",455,"off")=3888
-	Set gtmtypes("sgmnt_data",455,"len")=8
-	Set gtmtypes("sgmnt_data",455,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("sgmnt_data","n_t_qreads")=455
-	Set gtmtypes("sgmnt_data",456,"name")="sgmnt_data.n_t_qreads.curr_count"
-	Set gtmtypes("sgmnt_data",456,"off")=3888
-	Set gtmtypes("sgmnt_data",456,"len")=4
-	Set gtmtypes("sgmnt_data",456,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_t_qreads.curr_count")=456
-	Set gtmtypes("sgmnt_data",457,"name")="sgmnt_data.n_t_qreads.cumul_count"
-	Set gtmtypes("sgmnt_data",457,"off")=3892
-	Set gtmtypes("sgmnt_data",457,"len")=4
-	Set gtmtypes("sgmnt_data",457,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_t_qreads.cumul_count")=457
-	Set gtmtypes("sgmnt_data",458,"name")="sgmnt_data.unused_dsk_reads"
-	Set gtmtypes("sgmnt_data",458,"off")=3896
-	Set gtmtypes("sgmnt_data",458,"len")=8
-	Set gtmtypes("sgmnt_data",458,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("sgmnt_data","unused_dsk_reads")=458
-	Set gtmtypes("sgmnt_data",459,"name")="sgmnt_data.unused_dsk_reads.curr_count"
-	Set gtmtypes("sgmnt_data",459,"off")=3896
+	Set gtmtypfldindx("sgmnt_data","wcs_wtstart_eagain_incrit_cntr")=454
+	Set gtmtypes("sgmnt_data",455,"name")="sgmnt_data.async_restart_eagain_cntr"
+	Set gtmtypes("sgmnt_data",455,"off")=3820
+	Set gtmtypes("sgmnt_data",455,"len")=4
+	Set gtmtypes("sgmnt_data",455,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","async_restart_eagain_cntr")=455
+	Set gtmtypes("sgmnt_data",456,"name")="sgmnt_data.bg_trc_rec_cntr_filler"
+	Set gtmtypes("sgmnt_data",456,"off")=3824
+	Set gtmtypes("sgmnt_data",456,"len")=24
+	Set gtmtypes("sgmnt_data",456,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","bg_trc_rec_cntr_filler")=456
+	Set gtmtypes("sgmnt_data",457,"name")="sgmnt_data.n_gvcst_srches"
+	Set gtmtypes("sgmnt_data",457,"off")=3848
+	Set gtmtypes("sgmnt_data",457,"len")=8
+	Set gtmtypes("sgmnt_data",457,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("sgmnt_data","n_gvcst_srches")=457
+	Set gtmtypes("sgmnt_data",458,"name")="sgmnt_data.n_gvcst_srches.curr_count"
+	Set gtmtypes("sgmnt_data",458,"off")=3848
+	Set gtmtypes("sgmnt_data",458,"len")=4
+	Set gtmtypes("sgmnt_data",458,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_gvcst_srches.curr_count")=458
+	Set gtmtypes("sgmnt_data",459,"name")="sgmnt_data.n_gvcst_srches.cumul_count"
+	Set gtmtypes("sgmnt_data",459,"off")=3852
 	Set gtmtypes("sgmnt_data",459,"len")=4
 	Set gtmtypes("sgmnt_data",459,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","unused_dsk_reads.curr_count")=459
-	Set gtmtypes("sgmnt_data",460,"name")="sgmnt_data.unused_dsk_reads.cumul_count"
-	Set gtmtypes("sgmnt_data",460,"off")=3900
-	Set gtmtypes("sgmnt_data",460,"len")=4
-	Set gtmtypes("sgmnt_data",460,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","unused_dsk_reads.cumul_count")=460
-	Set gtmtypes("sgmnt_data",461,"name")="sgmnt_data.n_bgmm_updates"
-	Set gtmtypes("sgmnt_data",461,"off")=3904
-	Set gtmtypes("sgmnt_data",461,"len")=8
-	Set gtmtypes("sgmnt_data",461,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("sgmnt_data","n_bgmm_updates")=461
-	Set gtmtypes("sgmnt_data",462,"name")="sgmnt_data.n_bgmm_updates.curr_count"
-	Set gtmtypes("sgmnt_data",462,"off")=3904
+	Set gtmtypfldindx("sgmnt_data","n_gvcst_srches.cumul_count")=459
+	Set gtmtypes("sgmnt_data",460,"name")="sgmnt_data.n_gvcst_srch_clues"
+	Set gtmtypes("sgmnt_data",460,"off")=3856
+	Set gtmtypes("sgmnt_data",460,"len")=8
+	Set gtmtypes("sgmnt_data",460,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("sgmnt_data","n_gvcst_srch_clues")=460
+	Set gtmtypes("sgmnt_data",461,"name")="sgmnt_data.n_gvcst_srch_clues.curr_count"
+	Set gtmtypes("sgmnt_data",461,"off")=3856
+	Set gtmtypes("sgmnt_data",461,"len")=4
+	Set gtmtypes("sgmnt_data",461,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_gvcst_srch_clues.curr_count")=461
+	Set gtmtypes("sgmnt_data",462,"name")="sgmnt_data.n_gvcst_srch_clues.cumul_count"
+	Set gtmtypes("sgmnt_data",462,"off")=3860
 	Set gtmtypes("sgmnt_data",462,"len")=4
 	Set gtmtypes("sgmnt_data",462,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_bgmm_updates.curr_count")=462
-	Set gtmtypes("sgmnt_data",463,"name")="sgmnt_data.n_bgmm_updates.cumul_count"
-	Set gtmtypes("sgmnt_data",463,"off")=3908
-	Set gtmtypes("sgmnt_data",463,"len")=4
-	Set gtmtypes("sgmnt_data",463,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_bgmm_updates.cumul_count")=463
-	Set gtmtypes("sgmnt_data",464,"name")="sgmnt_data.unused_dsk_writes"
-	Set gtmtypes("sgmnt_data",464,"off")=3912
-	Set gtmtypes("sgmnt_data",464,"len")=8
-	Set gtmtypes("sgmnt_data",464,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("sgmnt_data","unused_dsk_writes")=464
-	Set gtmtypes("sgmnt_data",465,"name")="sgmnt_data.unused_dsk_writes.curr_count"
-	Set gtmtypes("sgmnt_data",465,"off")=3912
+	Set gtmtypfldindx("sgmnt_data","n_gvcst_srch_clues.cumul_count")=462
+	Set gtmtypes("sgmnt_data",463,"name")="sgmnt_data.n_clue_used_head"
+	Set gtmtypes("sgmnt_data",463,"off")=3864
+	Set gtmtypes("sgmnt_data",463,"len")=8
+	Set gtmtypes("sgmnt_data",463,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("sgmnt_data","n_clue_used_head")=463
+	Set gtmtypes("sgmnt_data",464,"name")="sgmnt_data.n_clue_used_head.curr_count"
+	Set gtmtypes("sgmnt_data",464,"off")=3864
+	Set gtmtypes("sgmnt_data",464,"len")=4
+	Set gtmtypes("sgmnt_data",464,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_clue_used_head.curr_count")=464
+	Set gtmtypes("sgmnt_data",465,"name")="sgmnt_data.n_clue_used_head.cumul_count"
+	Set gtmtypes("sgmnt_data",465,"off")=3868
 	Set gtmtypes("sgmnt_data",465,"len")=4
 	Set gtmtypes("sgmnt_data",465,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","unused_dsk_writes.curr_count")=465
-	Set gtmtypes("sgmnt_data",466,"name")="sgmnt_data.unused_dsk_writes.cumul_count"
-	Set gtmtypes("sgmnt_data",466,"off")=3916
-	Set gtmtypes("sgmnt_data",466,"len")=4
-	Set gtmtypes("sgmnt_data",466,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","unused_dsk_writes.cumul_count")=466
-	Set gtmtypes("sgmnt_data",467,"name")="sgmnt_data.n_bg_update_creates"
-	Set gtmtypes("sgmnt_data",467,"off")=3920
-	Set gtmtypes("sgmnt_data",467,"len")=8
-	Set gtmtypes("sgmnt_data",467,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("sgmnt_data","n_bg_update_creates")=467
-	Set gtmtypes("sgmnt_data",468,"name")="sgmnt_data.n_bg_update_creates.curr_count"
-	Set gtmtypes("sgmnt_data",468,"off")=3920
+	Set gtmtypfldindx("sgmnt_data","n_clue_used_head.cumul_count")=465
+	Set gtmtypes("sgmnt_data",466,"name")="sgmnt_data.n_clue_used_same"
+	Set gtmtypes("sgmnt_data",466,"off")=3872
+	Set gtmtypes("sgmnt_data",466,"len")=8
+	Set gtmtypes("sgmnt_data",466,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("sgmnt_data","n_clue_used_same")=466
+	Set gtmtypes("sgmnt_data",467,"name")="sgmnt_data.n_clue_used_same.curr_count"
+	Set gtmtypes("sgmnt_data",467,"off")=3872
+	Set gtmtypes("sgmnt_data",467,"len")=4
+	Set gtmtypes("sgmnt_data",467,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_clue_used_same.curr_count")=467
+	Set gtmtypes("sgmnt_data",468,"name")="sgmnt_data.n_clue_used_same.cumul_count"
+	Set gtmtypes("sgmnt_data",468,"off")=3876
 	Set gtmtypes("sgmnt_data",468,"len")=4
 	Set gtmtypes("sgmnt_data",468,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_bg_update_creates.curr_count")=468
-	Set gtmtypes("sgmnt_data",469,"name")="sgmnt_data.n_bg_update_creates.cumul_count"
-	Set gtmtypes("sgmnt_data",469,"off")=3924
-	Set gtmtypes("sgmnt_data",469,"len")=4
-	Set gtmtypes("sgmnt_data",469,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_bg_update_creates.cumul_count")=469
-	Set gtmtypes("sgmnt_data",470,"name")="sgmnt_data.n_db_csh_getns"
-	Set gtmtypes("sgmnt_data",470,"off")=3928
-	Set gtmtypes("sgmnt_data",470,"len")=8
-	Set gtmtypes("sgmnt_data",470,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("sgmnt_data","n_db_csh_getns")=470
-	Set gtmtypes("sgmnt_data",471,"name")="sgmnt_data.n_db_csh_getns.curr_count"
-	Set gtmtypes("sgmnt_data",471,"off")=3928
+	Set gtmtypfldindx("sgmnt_data","n_clue_used_same.cumul_count")=468
+	Set gtmtypes("sgmnt_data",469,"name")="sgmnt_data.n_clue_used_tail"
+	Set gtmtypes("sgmnt_data",469,"off")=3880
+	Set gtmtypes("sgmnt_data",469,"len")=8
+	Set gtmtypes("sgmnt_data",469,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("sgmnt_data","n_clue_used_tail")=469
+	Set gtmtypes("sgmnt_data",470,"name")="sgmnt_data.n_clue_used_tail.curr_count"
+	Set gtmtypes("sgmnt_data",470,"off")=3880
+	Set gtmtypes("sgmnt_data",470,"len")=4
+	Set gtmtypes("sgmnt_data",470,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_clue_used_tail.curr_count")=470
+	Set gtmtypes("sgmnt_data",471,"name")="sgmnt_data.n_clue_used_tail.cumul_count"
+	Set gtmtypes("sgmnt_data",471,"off")=3884
 	Set gtmtypes("sgmnt_data",471,"len")=4
 	Set gtmtypes("sgmnt_data",471,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_db_csh_getns.curr_count")=471
-	Set gtmtypes("sgmnt_data",472,"name")="sgmnt_data.n_db_csh_getns.cumul_count"
-	Set gtmtypes("sgmnt_data",472,"off")=3932
-	Set gtmtypes("sgmnt_data",472,"len")=4
-	Set gtmtypes("sgmnt_data",472,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_db_csh_getns.cumul_count")=472
-	Set gtmtypes("sgmnt_data",473,"name")="sgmnt_data.n_db_csh_getn_lcnt"
-	Set gtmtypes("sgmnt_data",473,"off")=3936
-	Set gtmtypes("sgmnt_data",473,"len")=8
-	Set gtmtypes("sgmnt_data",473,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("sgmnt_data","n_db_csh_getn_lcnt")=473
-	Set gtmtypes("sgmnt_data",474,"name")="sgmnt_data.n_db_csh_getn_lcnt.curr_count"
-	Set gtmtypes("sgmnt_data",474,"off")=3936
+	Set gtmtypfldindx("sgmnt_data","n_clue_used_tail.cumul_count")=471
+	Set gtmtypes("sgmnt_data",472,"name")="sgmnt_data.n_t_qreads"
+	Set gtmtypes("sgmnt_data",472,"off")=3888
+	Set gtmtypes("sgmnt_data",472,"len")=8
+	Set gtmtypes("sgmnt_data",472,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("sgmnt_data","n_t_qreads")=472
+	Set gtmtypes("sgmnt_data",473,"name")="sgmnt_data.n_t_qreads.curr_count"
+	Set gtmtypes("sgmnt_data",473,"off")=3888
+	Set gtmtypes("sgmnt_data",473,"len")=4
+	Set gtmtypes("sgmnt_data",473,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_t_qreads.curr_count")=473
+	Set gtmtypes("sgmnt_data",474,"name")="sgmnt_data.n_t_qreads.cumul_count"
+	Set gtmtypes("sgmnt_data",474,"off")=3892
 	Set gtmtypes("sgmnt_data",474,"len")=4
 	Set gtmtypes("sgmnt_data",474,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_db_csh_getn_lcnt.curr_count")=474
-	Set gtmtypes("sgmnt_data",475,"name")="sgmnt_data.n_db_csh_getn_lcnt.cumul_count"
-	Set gtmtypes("sgmnt_data",475,"off")=3940
-	Set gtmtypes("sgmnt_data",475,"len")=4
-	Set gtmtypes("sgmnt_data",475,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_db_csh_getn_lcnt.cumul_count")=475
-	Set gtmtypes("sgmnt_data",476,"name")="sgmnt_data.db_csh_acct_rec_filler_4k"
-	Set gtmtypes("sgmnt_data",476,"off")=3944
-	Set gtmtypes("sgmnt_data",476,"len")=152
-	Set gtmtypes("sgmnt_data",476,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","db_csh_acct_rec_filler_4k")=476
-	Set gtmtypes("sgmnt_data",477,"name")="sgmnt_data.gvstats_rec"
-	Set gtmtypes("sgmnt_data",477,"off")=4096
-	Set gtmtypes("sgmnt_data",477,"len")=464
-	Set gtmtypes("sgmnt_data",477,"type")="gvstats_rec_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec")=477
-	Set gtmtypes("sgmnt_data",478,"name")="sgmnt_data.gvstats_rec.n_set"
-	Set gtmtypes("sgmnt_data",478,"off")=4096
+	Set gtmtypfldindx("sgmnt_data","n_t_qreads.cumul_count")=474
+	Set gtmtypes("sgmnt_data",475,"name")="sgmnt_data.unused_dsk_reads"
+	Set gtmtypes("sgmnt_data",475,"off")=3896
+	Set gtmtypes("sgmnt_data",475,"len")=8
+	Set gtmtypes("sgmnt_data",475,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("sgmnt_data","unused_dsk_reads")=475
+	Set gtmtypes("sgmnt_data",476,"name")="sgmnt_data.unused_dsk_reads.curr_count"
+	Set gtmtypes("sgmnt_data",476,"off")=3896
+	Set gtmtypes("sgmnt_data",476,"len")=4
+	Set gtmtypes("sgmnt_data",476,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","unused_dsk_reads.curr_count")=476
+	Set gtmtypes("sgmnt_data",477,"name")="sgmnt_data.unused_dsk_reads.cumul_count"
+	Set gtmtypes("sgmnt_data",477,"off")=3900
+	Set gtmtypes("sgmnt_data",477,"len")=4
+	Set gtmtypes("sgmnt_data",477,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","unused_dsk_reads.cumul_count")=477
+	Set gtmtypes("sgmnt_data",478,"name")="sgmnt_data.n_bgmm_updates"
+	Set gtmtypes("sgmnt_data",478,"off")=3904
 	Set gtmtypes("sgmnt_data",478,"len")=8
-	Set gtmtypes("sgmnt_data",478,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_set")=478
-	Set gtmtypes("sgmnt_data",479,"name")="sgmnt_data.gvstats_rec.n_kill"
-	Set gtmtypes("sgmnt_data",479,"off")=4104
-	Set gtmtypes("sgmnt_data",479,"len")=8
-	Set gtmtypes("sgmnt_data",479,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_kill")=479
-	Set gtmtypes("sgmnt_data",480,"name")="sgmnt_data.gvstats_rec.n_get"
-	Set gtmtypes("sgmnt_data",480,"off")=4112
-	Set gtmtypes("sgmnt_data",480,"len")=8
-	Set gtmtypes("sgmnt_data",480,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_get")=480
-	Set gtmtypes("sgmnt_data",481,"name")="sgmnt_data.gvstats_rec.n_data"
-	Set gtmtypes("sgmnt_data",481,"off")=4120
+	Set gtmtypes("sgmnt_data",478,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("sgmnt_data","n_bgmm_updates")=478
+	Set gtmtypes("sgmnt_data",479,"name")="sgmnt_data.n_bgmm_updates.curr_count"
+	Set gtmtypes("sgmnt_data",479,"off")=3904
+	Set gtmtypes("sgmnt_data",479,"len")=4
+	Set gtmtypes("sgmnt_data",479,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_bgmm_updates.curr_count")=479
+	Set gtmtypes("sgmnt_data",480,"name")="sgmnt_data.n_bgmm_updates.cumul_count"
+	Set gtmtypes("sgmnt_data",480,"off")=3908
+	Set gtmtypes("sgmnt_data",480,"len")=4
+	Set gtmtypes("sgmnt_data",480,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_bgmm_updates.cumul_count")=480
+	Set gtmtypes("sgmnt_data",481,"name")="sgmnt_data.unused_dsk_writes"
+	Set gtmtypes("sgmnt_data",481,"off")=3912
 	Set gtmtypes("sgmnt_data",481,"len")=8
-	Set gtmtypes("sgmnt_data",481,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_data")=481
-	Set gtmtypes("sgmnt_data",482,"name")="sgmnt_data.gvstats_rec.n_order"
-	Set gtmtypes("sgmnt_data",482,"off")=4128
-	Set gtmtypes("sgmnt_data",482,"len")=8
-	Set gtmtypes("sgmnt_data",482,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_order")=482
-	Set gtmtypes("sgmnt_data",483,"name")="sgmnt_data.gvstats_rec.n_zprev"
-	Set gtmtypes("sgmnt_data",483,"off")=4136
-	Set gtmtypes("sgmnt_data",483,"len")=8
-	Set gtmtypes("sgmnt_data",483,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_zprev")=483
-	Set gtmtypes("sgmnt_data",484,"name")="sgmnt_data.gvstats_rec.n_query"
-	Set gtmtypes("sgmnt_data",484,"off")=4144
+	Set gtmtypes("sgmnt_data",481,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("sgmnt_data","unused_dsk_writes")=481
+	Set gtmtypes("sgmnt_data",482,"name")="sgmnt_data.unused_dsk_writes.curr_count"
+	Set gtmtypes("sgmnt_data",482,"off")=3912
+	Set gtmtypes("sgmnt_data",482,"len")=4
+	Set gtmtypes("sgmnt_data",482,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","unused_dsk_writes.curr_count")=482
+	Set gtmtypes("sgmnt_data",483,"name")="sgmnt_data.unused_dsk_writes.cumul_count"
+	Set gtmtypes("sgmnt_data",483,"off")=3916
+	Set gtmtypes("sgmnt_data",483,"len")=4
+	Set gtmtypes("sgmnt_data",483,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","unused_dsk_writes.cumul_count")=483
+	Set gtmtypes("sgmnt_data",484,"name")="sgmnt_data.n_bg_update_creates"
+	Set gtmtypes("sgmnt_data",484,"off")=3920
 	Set gtmtypes("sgmnt_data",484,"len")=8
-	Set gtmtypes("sgmnt_data",484,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_query")=484
-	Set gtmtypes("sgmnt_data",485,"name")="sgmnt_data.gvstats_rec.n_lock_success"
-	Set gtmtypes("sgmnt_data",485,"off")=4152
-	Set gtmtypes("sgmnt_data",485,"len")=8
-	Set gtmtypes("sgmnt_data",485,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_lock_success")=485
-	Set gtmtypes("sgmnt_data",486,"name")="sgmnt_data.gvstats_rec.n_lock_fail"
-	Set gtmtypes("sgmnt_data",486,"off")=4160
-	Set gtmtypes("sgmnt_data",486,"len")=8
-	Set gtmtypes("sgmnt_data",486,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_lock_fail")=486
-	Set gtmtypes("sgmnt_data",487,"name")="sgmnt_data.gvstats_rec.db_curr_tn"
-	Set gtmtypes("sgmnt_data",487,"off")=4168
+	Set gtmtypes("sgmnt_data",484,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("sgmnt_data","n_bg_update_creates")=484
+	Set gtmtypes("sgmnt_data",485,"name")="sgmnt_data.n_bg_update_creates.curr_count"
+	Set gtmtypes("sgmnt_data",485,"off")=3920
+	Set gtmtypes("sgmnt_data",485,"len")=4
+	Set gtmtypes("sgmnt_data",485,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_bg_update_creates.curr_count")=485
+	Set gtmtypes("sgmnt_data",486,"name")="sgmnt_data.n_bg_update_creates.cumul_count"
+	Set gtmtypes("sgmnt_data",486,"off")=3924
+	Set gtmtypes("sgmnt_data",486,"len")=4
+	Set gtmtypes("sgmnt_data",486,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_bg_update_creates.cumul_count")=486
+	Set gtmtypes("sgmnt_data",487,"name")="sgmnt_data.n_db_csh_getns"
+	Set gtmtypes("sgmnt_data",487,"off")=3928
 	Set gtmtypes("sgmnt_data",487,"len")=8
-	Set gtmtypes("sgmnt_data",487,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.db_curr_tn")=487
-	Set gtmtypes("sgmnt_data",488,"name")="sgmnt_data.gvstats_rec.n_dsk_read"
-	Set gtmtypes("sgmnt_data",488,"off")=4176
-	Set gtmtypes("sgmnt_data",488,"len")=8
-	Set gtmtypes("sgmnt_data",488,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_dsk_read")=488
-	Set gtmtypes("sgmnt_data",489,"name")="sgmnt_data.gvstats_rec.n_dsk_write"
-	Set gtmtypes("sgmnt_data",489,"off")=4184
-	Set gtmtypes("sgmnt_data",489,"len")=8
-	Set gtmtypes("sgmnt_data",489,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_dsk_write")=489
-	Set gtmtypes("sgmnt_data",490,"name")="sgmnt_data.gvstats_rec.n_nontp_readwrite"
-	Set gtmtypes("sgmnt_data",490,"off")=4192
+	Set gtmtypes("sgmnt_data",487,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("sgmnt_data","n_db_csh_getns")=487
+	Set gtmtypes("sgmnt_data",488,"name")="sgmnt_data.n_db_csh_getns.curr_count"
+	Set gtmtypes("sgmnt_data",488,"off")=3928
+	Set gtmtypes("sgmnt_data",488,"len")=4
+	Set gtmtypes("sgmnt_data",488,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_db_csh_getns.curr_count")=488
+	Set gtmtypes("sgmnt_data",489,"name")="sgmnt_data.n_db_csh_getns.cumul_count"
+	Set gtmtypes("sgmnt_data",489,"off")=3932
+	Set gtmtypes("sgmnt_data",489,"len")=4
+	Set gtmtypes("sgmnt_data",489,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_db_csh_getns.cumul_count")=489
+	Set gtmtypes("sgmnt_data",490,"name")="sgmnt_data.n_db_csh_getn_lcnt"
+	Set gtmtypes("sgmnt_data",490,"off")=3936
 	Set gtmtypes("sgmnt_data",490,"len")=8
-	Set gtmtypes("sgmnt_data",490,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_readwrite")=490
-	Set gtmtypes("sgmnt_data",491,"name")="sgmnt_data.gvstats_rec.n_nontp_readonly"
-	Set gtmtypes("sgmnt_data",491,"off")=4200
-	Set gtmtypes("sgmnt_data",491,"len")=8
-	Set gtmtypes("sgmnt_data",491,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_readonly")=491
-	Set gtmtypes("sgmnt_data",492,"name")="sgmnt_data.gvstats_rec.n_nontp_blkwrite"
-	Set gtmtypes("sgmnt_data",492,"off")=4208
-	Set gtmtypes("sgmnt_data",492,"len")=8
-	Set gtmtypes("sgmnt_data",492,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_blkwrite")=492
-	Set gtmtypes("sgmnt_data",493,"name")="sgmnt_data.gvstats_rec.n_nontp_blkread"
-	Set gtmtypes("sgmnt_data",493,"off")=4216
-	Set gtmtypes("sgmnt_data",493,"len")=8
-	Set gtmtypes("sgmnt_data",493,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_blkread")=493
-	Set gtmtypes("sgmnt_data",494,"name")="sgmnt_data.gvstats_rec.n_nontp_retries_0"
-	Set gtmtypes("sgmnt_data",494,"off")=4224
-	Set gtmtypes("sgmnt_data",494,"len")=8
-	Set gtmtypes("sgmnt_data",494,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_retries_0")=494
-	Set gtmtypes("sgmnt_data",495,"name")="sgmnt_data.gvstats_rec.n_nontp_retries_1"
-	Set gtmtypes("sgmnt_data",495,"off")=4232
+	Set gtmtypes("sgmnt_data",490,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("sgmnt_data","n_db_csh_getn_lcnt")=490
+	Set gtmtypes("sgmnt_data",491,"name")="sgmnt_data.n_db_csh_getn_lcnt.curr_count"
+	Set gtmtypes("sgmnt_data",491,"off")=3936
+	Set gtmtypes("sgmnt_data",491,"len")=4
+	Set gtmtypes("sgmnt_data",491,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_db_csh_getn_lcnt.curr_count")=491
+	Set gtmtypes("sgmnt_data",492,"name")="sgmnt_data.n_db_csh_getn_lcnt.cumul_count"
+	Set gtmtypes("sgmnt_data",492,"off")=3940
+	Set gtmtypes("sgmnt_data",492,"len")=4
+	Set gtmtypes("sgmnt_data",492,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_db_csh_getn_lcnt.cumul_count")=492
+	Set gtmtypes("sgmnt_data",493,"name")="sgmnt_data.db_csh_acct_rec_filler_4k"
+	Set gtmtypes("sgmnt_data",493,"off")=3944
+	Set gtmtypes("sgmnt_data",493,"len")=152
+	Set gtmtypes("sgmnt_data",493,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","db_csh_acct_rec_filler_4k")=493
+	Set gtmtypes("sgmnt_data",494,"name")="sgmnt_data.gvstats_rec"
+	Set gtmtypes("sgmnt_data",494,"off")=4096
+	Set gtmtypes("sgmnt_data",494,"len")=472
+	Set gtmtypes("sgmnt_data",494,"type")="gvstats_rec_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec")=494
+	Set gtmtypes("sgmnt_data",495,"name")="sgmnt_data.gvstats_rec.n_set"
+	Set gtmtypes("sgmnt_data",495,"off")=4096
 	Set gtmtypes("sgmnt_data",495,"len")=8
 	Set gtmtypes("sgmnt_data",495,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_retries_1")=495
-	Set gtmtypes("sgmnt_data",496,"name")="sgmnt_data.gvstats_rec.n_nontp_retries_2"
-	Set gtmtypes("sgmnt_data",496,"off")=4240
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_set")=495
+	Set gtmtypes("sgmnt_data",496,"name")="sgmnt_data.gvstats_rec.n_kill"
+	Set gtmtypes("sgmnt_data",496,"off")=4104
 	Set gtmtypes("sgmnt_data",496,"len")=8
 	Set gtmtypes("sgmnt_data",496,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_retries_2")=496
-	Set gtmtypes("sgmnt_data",497,"name")="sgmnt_data.gvstats_rec.n_nontp_retries_3"
-	Set gtmtypes("sgmnt_data",497,"off")=4248
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_kill")=496
+	Set gtmtypes("sgmnt_data",497,"name")="sgmnt_data.gvstats_rec.n_get"
+	Set gtmtypes("sgmnt_data",497,"off")=4112
 	Set gtmtypes("sgmnt_data",497,"len")=8
 	Set gtmtypes("sgmnt_data",497,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_retries_3")=497
-	Set gtmtypes("sgmnt_data",498,"name")="sgmnt_data.gvstats_rec.n_tp_readwrite"
-	Set gtmtypes("sgmnt_data",498,"off")=4256
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_get")=497
+	Set gtmtypes("sgmnt_data",498,"name")="sgmnt_data.gvstats_rec.n_data"
+	Set gtmtypes("sgmnt_data",498,"off")=4120
 	Set gtmtypes("sgmnt_data",498,"len")=8
 	Set gtmtypes("sgmnt_data",498,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_readwrite")=498
-	Set gtmtypes("sgmnt_data",499,"name")="sgmnt_data.gvstats_rec.n_tp_readonly"
-	Set gtmtypes("sgmnt_data",499,"off")=4264
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_data")=498
+	Set gtmtypes("sgmnt_data",499,"name")="sgmnt_data.gvstats_rec.n_order"
+	Set gtmtypes("sgmnt_data",499,"off")=4128
 	Set gtmtypes("sgmnt_data",499,"len")=8
 	Set gtmtypes("sgmnt_data",499,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_readonly")=499
-	Set gtmtypes("sgmnt_data",500,"name")="sgmnt_data.gvstats_rec.n_tp_rolledback"
-	Set gtmtypes("sgmnt_data",500,"off")=4272
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_order")=499
+	Set gtmtypes("sgmnt_data",500,"name")="sgmnt_data.gvstats_rec.n_zprev"
+	Set gtmtypes("sgmnt_data",500,"off")=4136
 	Set gtmtypes("sgmnt_data",500,"len")=8
 	Set gtmtypes("sgmnt_data",500,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_rolledback")=500
-	Set gtmtypes("sgmnt_data",501,"name")="sgmnt_data.gvstats_rec.n_tp_blkwrite"
-	Set gtmtypes("sgmnt_data",501,"off")=4280
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_zprev")=500
+	Set gtmtypes("sgmnt_data",501,"name")="sgmnt_data.gvstats_rec.n_query"
+	Set gtmtypes("sgmnt_data",501,"off")=4144
 	Set gtmtypes("sgmnt_data",501,"len")=8
 	Set gtmtypes("sgmnt_data",501,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_blkwrite")=501
-	Set gtmtypes("sgmnt_data",502,"name")="sgmnt_data.gvstats_rec.n_tp_blkread"
-	Set gtmtypes("sgmnt_data",502,"off")=4288
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_query")=501
+	Set gtmtypes("sgmnt_data",502,"name")="sgmnt_data.gvstats_rec.n_lock_success"
+	Set gtmtypes("sgmnt_data",502,"off")=4152
 	Set gtmtypes("sgmnt_data",502,"len")=8
 	Set gtmtypes("sgmnt_data",502,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_blkread")=502
-	Set gtmtypes("sgmnt_data",503,"name")="sgmnt_data.gvstats_rec.n_tp_tot_retries_0"
-	Set gtmtypes("sgmnt_data",503,"off")=4296
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_lock_success")=502
+	Set gtmtypes("sgmnt_data",503,"name")="sgmnt_data.gvstats_rec.n_lock_fail"
+	Set gtmtypes("sgmnt_data",503,"off")=4160
 	Set gtmtypes("sgmnt_data",503,"len")=8
 	Set gtmtypes("sgmnt_data",503,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_tot_retries_0")=503
-	Set gtmtypes("sgmnt_data",504,"name")="sgmnt_data.gvstats_rec.n_tp_tot_retries_1"
-	Set gtmtypes("sgmnt_data",504,"off")=4304
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_lock_fail")=503
+	Set gtmtypes("sgmnt_data",504,"name")="sgmnt_data.gvstats_rec.db_curr_tn"
+	Set gtmtypes("sgmnt_data",504,"off")=4168
 	Set gtmtypes("sgmnt_data",504,"len")=8
 	Set gtmtypes("sgmnt_data",504,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_tot_retries_1")=504
-	Set gtmtypes("sgmnt_data",505,"name")="sgmnt_data.gvstats_rec.n_tp_tot_retries_2"
-	Set gtmtypes("sgmnt_data",505,"off")=4312
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.db_curr_tn")=504
+	Set gtmtypes("sgmnt_data",505,"name")="sgmnt_data.gvstats_rec.n_dsk_read"
+	Set gtmtypes("sgmnt_data",505,"off")=4176
 	Set gtmtypes("sgmnt_data",505,"len")=8
 	Set gtmtypes("sgmnt_data",505,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_tot_retries_2")=505
-	Set gtmtypes("sgmnt_data",506,"name")="sgmnt_data.gvstats_rec.n_tp_tot_retries_3"
-	Set gtmtypes("sgmnt_data",506,"off")=4320
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_dsk_read")=505
+	Set gtmtypes("sgmnt_data",506,"name")="sgmnt_data.gvstats_rec.n_dsk_write"
+	Set gtmtypes("sgmnt_data",506,"off")=4184
 	Set gtmtypes("sgmnt_data",506,"len")=8
 	Set gtmtypes("sgmnt_data",506,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_tot_retries_3")=506
-	Set gtmtypes("sgmnt_data",507,"name")="sgmnt_data.gvstats_rec.n_tp_tot_retries_4"
-	Set gtmtypes("sgmnt_data",507,"off")=4328
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_dsk_write")=506
+	Set gtmtypes("sgmnt_data",507,"name")="sgmnt_data.gvstats_rec.n_nontp_readwrite"
+	Set gtmtypes("sgmnt_data",507,"off")=4192
 	Set gtmtypes("sgmnt_data",507,"len")=8
 	Set gtmtypes("sgmnt_data",507,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_tot_retries_4")=507
-	Set gtmtypes("sgmnt_data",508,"name")="sgmnt_data.gvstats_rec.n_tp_cnflct_retries_0"
-	Set gtmtypes("sgmnt_data",508,"off")=4336
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_readwrite")=507
+	Set gtmtypes("sgmnt_data",508,"name")="sgmnt_data.gvstats_rec.n_nontp_readonly"
+	Set gtmtypes("sgmnt_data",508,"off")=4200
 	Set gtmtypes("sgmnt_data",508,"len")=8
 	Set gtmtypes("sgmnt_data",508,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_cnflct_retries_0")=508
-	Set gtmtypes("sgmnt_data",509,"name")="sgmnt_data.gvstats_rec.n_tp_cnflct_retries_1"
-	Set gtmtypes("sgmnt_data",509,"off")=4344
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_readonly")=508
+	Set gtmtypes("sgmnt_data",509,"name")="sgmnt_data.gvstats_rec.n_nontp_blkwrite"
+	Set gtmtypes("sgmnt_data",509,"off")=4208
 	Set gtmtypes("sgmnt_data",509,"len")=8
 	Set gtmtypes("sgmnt_data",509,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_cnflct_retries_1")=509
-	Set gtmtypes("sgmnt_data",510,"name")="sgmnt_data.gvstats_rec.n_tp_cnflct_retries_2"
-	Set gtmtypes("sgmnt_data",510,"off")=4352
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_blkwrite")=509
+	Set gtmtypes("sgmnt_data",510,"name")="sgmnt_data.gvstats_rec.n_nontp_blkread"
+	Set gtmtypes("sgmnt_data",510,"off")=4216
 	Set gtmtypes("sgmnt_data",510,"len")=8
 	Set gtmtypes("sgmnt_data",510,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_cnflct_retries_2")=510
-	Set gtmtypes("sgmnt_data",511,"name")="sgmnt_data.gvstats_rec.n_tp_cnflct_retries_3"
-	Set gtmtypes("sgmnt_data",511,"off")=4360
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_blkread")=510
+	Set gtmtypes("sgmnt_data",511,"name")="sgmnt_data.gvstats_rec.n_nontp_retries_0"
+	Set gtmtypes("sgmnt_data",511,"off")=4224
 	Set gtmtypes("sgmnt_data",511,"len")=8
 	Set gtmtypes("sgmnt_data",511,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_cnflct_retries_3")=511
-	Set gtmtypes("sgmnt_data",512,"name")="sgmnt_data.gvstats_rec.n_tp_cnflct_retries_4"
-	Set gtmtypes("sgmnt_data",512,"off")=4368
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_retries_0")=511
+	Set gtmtypes("sgmnt_data",512,"name")="sgmnt_data.gvstats_rec.n_nontp_retries_1"
+	Set gtmtypes("sgmnt_data",512,"off")=4232
 	Set gtmtypes("sgmnt_data",512,"len")=8
 	Set gtmtypes("sgmnt_data",512,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_cnflct_retries_4")=512
-	Set gtmtypes("sgmnt_data",513,"name")="sgmnt_data.gvstats_rec.n_ztrigger"
-	Set gtmtypes("sgmnt_data",513,"off")=4376
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_retries_1")=512
+	Set gtmtypes("sgmnt_data",513,"name")="sgmnt_data.gvstats_rec.n_nontp_retries_2"
+	Set gtmtypes("sgmnt_data",513,"off")=4240
 	Set gtmtypes("sgmnt_data",513,"len")=8
 	Set gtmtypes("sgmnt_data",513,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_ztrigger")=513
-	Set gtmtypes("sgmnt_data",514,"name")="sgmnt_data.gvstats_rec.n_db_flush"
-	Set gtmtypes("sgmnt_data",514,"off")=4384
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_retries_2")=513
+	Set gtmtypes("sgmnt_data",514,"name")="sgmnt_data.gvstats_rec.n_nontp_retries_3"
+	Set gtmtypes("sgmnt_data",514,"off")=4248
 	Set gtmtypes("sgmnt_data",514,"len")=8
 	Set gtmtypes("sgmnt_data",514,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_db_flush")=514
-	Set gtmtypes("sgmnt_data",515,"name")="sgmnt_data.gvstats_rec.n_db_fsync"
-	Set gtmtypes("sgmnt_data",515,"off")=4392
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_retries_3")=514
+	Set gtmtypes("sgmnt_data",515,"name")="sgmnt_data.gvstats_rec.n_tp_readwrite"
+	Set gtmtypes("sgmnt_data",515,"off")=4256
 	Set gtmtypes("sgmnt_data",515,"len")=8
 	Set gtmtypes("sgmnt_data",515,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_db_fsync")=515
-	Set gtmtypes("sgmnt_data",516,"name")="sgmnt_data.gvstats_rec.n_jnl_flush"
-	Set gtmtypes("sgmnt_data",516,"off")=4400
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_readwrite")=515
+	Set gtmtypes("sgmnt_data",516,"name")="sgmnt_data.gvstats_rec.n_tp_readonly"
+	Set gtmtypes("sgmnt_data",516,"off")=4264
 	Set gtmtypes("sgmnt_data",516,"len")=8
 	Set gtmtypes("sgmnt_data",516,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jnl_flush")=516
-	Set gtmtypes("sgmnt_data",517,"name")="sgmnt_data.gvstats_rec.n_jnl_fsync"
-	Set gtmtypes("sgmnt_data",517,"off")=4408
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_readonly")=516
+	Set gtmtypes("sgmnt_data",517,"name")="sgmnt_data.gvstats_rec.n_tp_rolledback"
+	Set gtmtypes("sgmnt_data",517,"off")=4272
 	Set gtmtypes("sgmnt_data",517,"len")=8
 	Set gtmtypes("sgmnt_data",517,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jnl_fsync")=517
-	Set gtmtypes("sgmnt_data",518,"name")="sgmnt_data.gvstats_rec.n_jbuff_bytes"
-	Set gtmtypes("sgmnt_data",518,"off")=4416
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_rolledback")=517
+	Set gtmtypes("sgmnt_data",518,"name")="sgmnt_data.gvstats_rec.n_tp_blkwrite"
+	Set gtmtypes("sgmnt_data",518,"off")=4280
 	Set gtmtypes("sgmnt_data",518,"len")=8
 	Set gtmtypes("sgmnt_data",518,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jbuff_bytes")=518
-	Set gtmtypes("sgmnt_data",519,"name")="sgmnt_data.gvstats_rec.n_jfile_bytes"
-	Set gtmtypes("sgmnt_data",519,"off")=4424
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_blkwrite")=518
+	Set gtmtypes("sgmnt_data",519,"name")="sgmnt_data.gvstats_rec.n_tp_blkread"
+	Set gtmtypes("sgmnt_data",519,"off")=4288
 	Set gtmtypes("sgmnt_data",519,"len")=8
 	Set gtmtypes("sgmnt_data",519,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jfile_bytes")=519
-	Set gtmtypes("sgmnt_data",520,"name")="sgmnt_data.gvstats_rec.n_jfile_writes"
-	Set gtmtypes("sgmnt_data",520,"off")=4432
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_blkread")=519
+	Set gtmtypes("sgmnt_data",520,"name")="sgmnt_data.gvstats_rec.n_tp_tot_retries_0"
+	Set gtmtypes("sgmnt_data",520,"off")=4296
 	Set gtmtypes("sgmnt_data",520,"len")=8
 	Set gtmtypes("sgmnt_data",520,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jfile_writes")=520
-	Set gtmtypes("sgmnt_data",521,"name")="sgmnt_data.gvstats_rec.n_jrec_logical"
-	Set gtmtypes("sgmnt_data",521,"off")=4440
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_tot_retries_0")=520
+	Set gtmtypes("sgmnt_data",521,"name")="sgmnt_data.gvstats_rec.n_tp_tot_retries_1"
+	Set gtmtypes("sgmnt_data",521,"off")=4304
 	Set gtmtypes("sgmnt_data",521,"len")=8
 	Set gtmtypes("sgmnt_data",521,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jrec_logical")=521
-	Set gtmtypes("sgmnt_data",522,"name")="sgmnt_data.gvstats_rec.n_jrec_pblk"
-	Set gtmtypes("sgmnt_data",522,"off")=4448
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_tot_retries_1")=521
+	Set gtmtypes("sgmnt_data",522,"name")="sgmnt_data.gvstats_rec.n_tp_tot_retries_2"
+	Set gtmtypes("sgmnt_data",522,"off")=4312
 	Set gtmtypes("sgmnt_data",522,"len")=8
 	Set gtmtypes("sgmnt_data",522,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jrec_pblk")=522
-	Set gtmtypes("sgmnt_data",523,"name")="sgmnt_data.gvstats_rec.n_jrec_epoch_regular"
-	Set gtmtypes("sgmnt_data",523,"off")=4456
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_tot_retries_2")=522
+	Set gtmtypes("sgmnt_data",523,"name")="sgmnt_data.gvstats_rec.n_tp_tot_retries_3"
+	Set gtmtypes("sgmnt_data",523,"off")=4320
 	Set gtmtypes("sgmnt_data",523,"len")=8
 	Set gtmtypes("sgmnt_data",523,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jrec_epoch_regular")=523
-	Set gtmtypes("sgmnt_data",524,"name")="sgmnt_data.gvstats_rec.n_jrec_epoch_idle"
-	Set gtmtypes("sgmnt_data",524,"off")=4464
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_tot_retries_3")=523
+	Set gtmtypes("sgmnt_data",524,"name")="sgmnt_data.gvstats_rec.n_tp_tot_retries_4"
+	Set gtmtypes("sgmnt_data",524,"off")=4328
 	Set gtmtypes("sgmnt_data",524,"len")=8
 	Set gtmtypes("sgmnt_data",524,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jrec_epoch_idle")=524
-	Set gtmtypes("sgmnt_data",525,"name")="sgmnt_data.gvstats_rec.n_jrec_other"
-	Set gtmtypes("sgmnt_data",525,"off")=4472
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_tot_retries_4")=524
+	Set gtmtypes("sgmnt_data",525,"name")="sgmnt_data.gvstats_rec.n_tp_cnflct_retries_0"
+	Set gtmtypes("sgmnt_data",525,"off")=4336
 	Set gtmtypes("sgmnt_data",525,"len")=8
 	Set gtmtypes("sgmnt_data",525,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jrec_other")=525
-	Set gtmtypes("sgmnt_data",526,"name")="sgmnt_data.gvstats_rec.n_jnl_extends"
-	Set gtmtypes("sgmnt_data",526,"off")=4480
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_cnflct_retries_0")=525
+	Set gtmtypes("sgmnt_data",526,"name")="sgmnt_data.gvstats_rec.n_tp_cnflct_retries_1"
+	Set gtmtypes("sgmnt_data",526,"off")=4344
 	Set gtmtypes("sgmnt_data",526,"len")=8
 	Set gtmtypes("sgmnt_data",526,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jnl_extends")=526
-	Set gtmtypes("sgmnt_data",527,"name")="sgmnt_data.gvstats_rec.n_db_extends"
-	Set gtmtypes("sgmnt_data",527,"off")=4488
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_cnflct_retries_1")=526
+	Set gtmtypes("sgmnt_data",527,"name")="sgmnt_data.gvstats_rec.n_tp_cnflct_retries_2"
+	Set gtmtypes("sgmnt_data",527,"off")=4352
 	Set gtmtypes("sgmnt_data",527,"len")=8
 	Set gtmtypes("sgmnt_data",527,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_db_extends")=527
-	Set gtmtypes("sgmnt_data",528,"name")="sgmnt_data.gvstats_rec.n_crit_success"
-	Set gtmtypes("sgmnt_data",528,"off")=4496
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_cnflct_retries_2")=527
+	Set gtmtypes("sgmnt_data",528,"name")="sgmnt_data.gvstats_rec.n_tp_cnflct_retries_3"
+	Set gtmtypes("sgmnt_data",528,"off")=4360
 	Set gtmtypes("sgmnt_data",528,"len")=8
 	Set gtmtypes("sgmnt_data",528,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_crit_success")=528
-	Set gtmtypes("sgmnt_data",529,"name")="sgmnt_data.gvstats_rec.n_crits_in_epch"
-	Set gtmtypes("sgmnt_data",529,"off")=4504
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_cnflct_retries_3")=528
+	Set gtmtypes("sgmnt_data",529,"name")="sgmnt_data.gvstats_rec.n_tp_cnflct_retries_4"
+	Set gtmtypes("sgmnt_data",529,"off")=4368
 	Set gtmtypes("sgmnt_data",529,"len")=8
 	Set gtmtypes("sgmnt_data",529,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_crits_in_epch")=529
-	Set gtmtypes("sgmnt_data",530,"name")="sgmnt_data.gvstats_rec.sq_crit_failed"
-	Set gtmtypes("sgmnt_data",530,"off")=4512
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_cnflct_retries_4")=529
+	Set gtmtypes("sgmnt_data",530,"name")="sgmnt_data.gvstats_rec.n_ztrigger"
+	Set gtmtypes("sgmnt_data",530,"off")=4376
 	Set gtmtypes("sgmnt_data",530,"len")=8
 	Set gtmtypes("sgmnt_data",530,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.sq_crit_failed")=530
-	Set gtmtypes("sgmnt_data",531,"name")="sgmnt_data.gvstats_rec.n_crit_failed"
-	Set gtmtypes("sgmnt_data",531,"off")=4520
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_ztrigger")=530
+	Set gtmtypes("sgmnt_data",531,"name")="sgmnt_data.gvstats_rec.n_db_flush"
+	Set gtmtypes("sgmnt_data",531,"off")=4384
 	Set gtmtypes("sgmnt_data",531,"len")=8
 	Set gtmtypes("sgmnt_data",531,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_crit_failed")=531
-	Set gtmtypes("sgmnt_data",532,"name")="sgmnt_data.gvstats_rec.sq_crit_que_slps"
-	Set gtmtypes("sgmnt_data",532,"off")=4528
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_db_flush")=531
+	Set gtmtypes("sgmnt_data",532,"name")="sgmnt_data.gvstats_rec.n_db_fsync"
+	Set gtmtypes("sgmnt_data",532,"off")=4392
 	Set gtmtypes("sgmnt_data",532,"len")=8
 	Set gtmtypes("sgmnt_data",532,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.sq_crit_que_slps")=532
-	Set gtmtypes("sgmnt_data",533,"name")="sgmnt_data.gvstats_rec.n_crit_que_slps"
-	Set gtmtypes("sgmnt_data",533,"off")=4536
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_db_fsync")=532
+	Set gtmtypes("sgmnt_data",533,"name")="sgmnt_data.gvstats_rec.n_jnl_flush"
+	Set gtmtypes("sgmnt_data",533,"off")=4400
 	Set gtmtypes("sgmnt_data",533,"len")=8
 	Set gtmtypes("sgmnt_data",533,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_crit_que_slps")=533
-	Set gtmtypes("sgmnt_data",534,"name")="sgmnt_data.gvstats_rec.sq_crit_yields"
-	Set gtmtypes("sgmnt_data",534,"off")=4544
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jnl_flush")=533
+	Set gtmtypes("sgmnt_data",534,"name")="sgmnt_data.gvstats_rec.n_jnl_fsync"
+	Set gtmtypes("sgmnt_data",534,"off")=4408
 	Set gtmtypes("sgmnt_data",534,"len")=8
 	Set gtmtypes("sgmnt_data",534,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.sq_crit_yields")=534
-	Set gtmtypes("sgmnt_data",535,"name")="sgmnt_data.gvstats_rec.n_crit_yields"
-	Set gtmtypes("sgmnt_data",535,"off")=4552
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jnl_fsync")=534
+	Set gtmtypes("sgmnt_data",535,"name")="sgmnt_data.gvstats_rec.n_jbuff_bytes"
+	Set gtmtypes("sgmnt_data",535,"off")=4416
 	Set gtmtypes("sgmnt_data",535,"len")=8
 	Set gtmtypes("sgmnt_data",535,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_crit_yields")=535
-	Set gtmtypes("sgmnt_data",536,"name")="sgmnt_data.gvstats_rec_filler_4k_plus_512"
-	Set gtmtypes("sgmnt_data",536,"off")=4560
-	Set gtmtypes("sgmnt_data",536,"len")=48
-	Set gtmtypes("sgmnt_data",536,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec_filler_4k_plus_512")=536
-	Set gtmtypes("sgmnt_data",537,"name")="sgmnt_data.filler_4k_plus_512"
-	Set gtmtypes("sgmnt_data",537,"off")=4608
-	Set gtmtypes("sgmnt_data",537,"len")=368
-	Set gtmtypes("sgmnt_data",537,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","filler_4k_plus_512")=537
-	Set gtmtypes("sgmnt_data",538,"name")="sgmnt_data.intrpt_recov_resync_strm_seqno"
-	Set gtmtypes("sgmnt_data",538,"off")=4976
-	Set gtmtypes("sgmnt_data",538,"len")=128
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jbuff_bytes")=535
+	Set gtmtypes("sgmnt_data",536,"name")="sgmnt_data.gvstats_rec.n_jfile_bytes"
+	Set gtmtypes("sgmnt_data",536,"off")=4424
+	Set gtmtypes("sgmnt_data",536,"len")=8
+	Set gtmtypes("sgmnt_data",536,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jfile_bytes")=536
+	Set gtmtypes("sgmnt_data",537,"name")="sgmnt_data.gvstats_rec.n_jfile_writes"
+	Set gtmtypes("sgmnt_data",537,"off")=4432
+	Set gtmtypes("sgmnt_data",537,"len")=8
+	Set gtmtypes("sgmnt_data",537,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jfile_writes")=537
+	Set gtmtypes("sgmnt_data",538,"name")="sgmnt_data.gvstats_rec.n_jrec_logical"
+	Set gtmtypes("sgmnt_data",538,"off")=4440
+	Set gtmtypes("sgmnt_data",538,"len")=8
 	Set gtmtypes("sgmnt_data",538,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","intrpt_recov_resync_strm_seqno")=538
-	Set gtmtypes("sgmnt_data",538,"dim")=16
-	Set gtmtypes("sgmnt_data",539,"name")="sgmnt_data.creation_db_ver"
-	Set gtmtypes("sgmnt_data",539,"off")=5104
-	Set gtmtypes("sgmnt_data",539,"len")=4
-	Set gtmtypes("sgmnt_data",539,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","creation_db_ver")=539
-	Set gtmtypes("sgmnt_data",540,"name")="sgmnt_data.creation_mdb_ver"
-	Set gtmtypes("sgmnt_data",540,"off")=5108
-	Set gtmtypes("sgmnt_data",540,"len")=4
-	Set gtmtypes("sgmnt_data",540,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","creation_mdb_ver")=540
-	Set gtmtypes("sgmnt_data",541,"name")="sgmnt_data.certified_for_upgrade_to"
-	Set gtmtypes("sgmnt_data",541,"off")=5112
-	Set gtmtypes("sgmnt_data",541,"len")=4
-	Set gtmtypes("sgmnt_data",541,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","certified_for_upgrade_to")=541
-	Set gtmtypes("sgmnt_data",542,"name")="sgmnt_data.filler_5k"
-	Set gtmtypes("sgmnt_data",542,"off")=5116
-	Set gtmtypes("sgmnt_data",542,"len")=4
-	Set gtmtypes("sgmnt_data",542,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","filler_5k")=542
-	Set gtmtypes("sgmnt_data",543,"name")="sgmnt_data.secshr_ops_index_filler"
-	Set gtmtypes("sgmnt_data",543,"off")=5120
-	Set gtmtypes("sgmnt_data",543,"len")=4
-	Set gtmtypes("sgmnt_data",543,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","secshr_ops_index_filler")=543
-	Set gtmtypes("sgmnt_data",544,"name")="sgmnt_data.secshr_ops_array_filler"
-	Set gtmtypes("sgmnt_data",544,"off")=5124
-	Set gtmtypes("sgmnt_data",544,"len")=1020
-	Set gtmtypes("sgmnt_data",544,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","secshr_ops_array_filler")=544
-	Set gtmtypes("sgmnt_data",544,"dim")=255
-	Set gtmtypes("sgmnt_data",545,"name")="sgmnt_data.next_upgrd_warn"
-	Set gtmtypes("sgmnt_data",545,"off")=6144
-	Set gtmtypes("sgmnt_data",545,"len")=24
-	Set gtmtypes("sgmnt_data",545,"type")="compswap_time_field"
-	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn")=545
-	Set gtmtypes("sgmnt_data",546,"name")="sgmnt_data.next_upgrd_warn.time_latch"
-	Set gtmtypes("sgmnt_data",546,"off")=6144
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jrec_logical")=538
+	Set gtmtypes("sgmnt_data",539,"name")="sgmnt_data.gvstats_rec.n_jrec_pblk"
+	Set gtmtypes("sgmnt_data",539,"off")=4448
+	Set gtmtypes("sgmnt_data",539,"len")=8
+	Set gtmtypes("sgmnt_data",539,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jrec_pblk")=539
+	Set gtmtypes("sgmnt_data",540,"name")="sgmnt_data.gvstats_rec.n_jrec_epoch_regular"
+	Set gtmtypes("sgmnt_data",540,"off")=4456
+	Set gtmtypes("sgmnt_data",540,"len")=8
+	Set gtmtypes("sgmnt_data",540,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jrec_epoch_regular")=540
+	Set gtmtypes("sgmnt_data",541,"name")="sgmnt_data.gvstats_rec.n_jrec_epoch_idle"
+	Set gtmtypes("sgmnt_data",541,"off")=4464
+	Set gtmtypes("sgmnt_data",541,"len")=8
+	Set gtmtypes("sgmnt_data",541,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jrec_epoch_idle")=541
+	Set gtmtypes("sgmnt_data",542,"name")="sgmnt_data.gvstats_rec.n_jrec_other"
+	Set gtmtypes("sgmnt_data",542,"off")=4472
+	Set gtmtypes("sgmnt_data",542,"len")=8
+	Set gtmtypes("sgmnt_data",542,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jrec_other")=542
+	Set gtmtypes("sgmnt_data",543,"name")="sgmnt_data.gvstats_rec.n_jnl_extends"
+	Set gtmtypes("sgmnt_data",543,"off")=4480
+	Set gtmtypes("sgmnt_data",543,"len")=8
+	Set gtmtypes("sgmnt_data",543,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jnl_extends")=543
+	Set gtmtypes("sgmnt_data",544,"name")="sgmnt_data.gvstats_rec.n_db_extends"
+	Set gtmtypes("sgmnt_data",544,"off")=4488
+	Set gtmtypes("sgmnt_data",544,"len")=8
+	Set gtmtypes("sgmnt_data",544,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_db_extends")=544
+	Set gtmtypes("sgmnt_data",545,"name")="sgmnt_data.gvstats_rec.n_crit_success"
+	Set gtmtypes("sgmnt_data",545,"off")=4496
+	Set gtmtypes("sgmnt_data",545,"len")=8
+	Set gtmtypes("sgmnt_data",545,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_crit_success")=545
+	Set gtmtypes("sgmnt_data",546,"name")="sgmnt_data.gvstats_rec.n_crits_in_epch"
+	Set gtmtypes("sgmnt_data",546,"off")=4504
 	Set gtmtypes("sgmnt_data",546,"len")=8
-	Set gtmtypes("sgmnt_data",546,"type")="global_latch_t"
-	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch")=546
-	Set gtmtypes("sgmnt_data",547,"name")="sgmnt_data.next_upgrd_warn.time_latch.u"
-	Set gtmtypes("sgmnt_data",547,"off")=6144
+	Set gtmtypes("sgmnt_data",546,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_crits_in_epch")=546
+	Set gtmtypes("sgmnt_data",547,"name")="sgmnt_data.gvstats_rec.sq_crit_failed"
+	Set gtmtypes("sgmnt_data",547,"off")=4512
 	Set gtmtypes("sgmnt_data",547,"len")=8
-	Set gtmtypes("sgmnt_data",547,"type")="union"
-	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch.u")=547
-	Set gtmtypes("sgmnt_data",548,"name")="sgmnt_data.next_upgrd_warn.time_latch.u.pid_imgcnt"
-	Set gtmtypes("sgmnt_data",548,"off")=6144
+	Set gtmtypes("sgmnt_data",547,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.sq_crit_failed")=547
+	Set gtmtypes("sgmnt_data",548,"name")="sgmnt_data.gvstats_rec.n_crit_failed"
+	Set gtmtypes("sgmnt_data",548,"off")=4520
 	Set gtmtypes("sgmnt_data",548,"len")=8
 	Set gtmtypes("sgmnt_data",548,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch.u.pid_imgcnt")=548
-	Set gtmtypes("sgmnt_data",549,"name")="sgmnt_data.next_upgrd_warn.time_latch.u.parts"
-	Set gtmtypes("sgmnt_data",549,"off")=6144
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_crit_failed")=548
+	Set gtmtypes("sgmnt_data",549,"name")="sgmnt_data.gvstats_rec.sq_crit_que_slps"
+	Set gtmtypes("sgmnt_data",549,"off")=4528
 	Set gtmtypes("sgmnt_data",549,"len")=8
-	Set gtmtypes("sgmnt_data",549,"type")="struct"
-	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch.u.parts")=549
-	Set gtmtypes("sgmnt_data",550,"name")="sgmnt_data.next_upgrd_warn.time_latch.u.parts.latch_pid"
-	Set gtmtypes("sgmnt_data",550,"off")=6144
-	Set gtmtypes("sgmnt_data",550,"len")=4
-	Set gtmtypes("sgmnt_data",550,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch.u.parts.latch_pid")=550
-	Set gtmtypes("sgmnt_data",551,"name")="sgmnt_data.next_upgrd_warn.time_latch.u.parts.latch_word"
-	Set gtmtypes("sgmnt_data",551,"off")=6148
-	Set gtmtypes("sgmnt_data",551,"len")=4
-	Set gtmtypes("sgmnt_data",551,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch.u.parts.latch_word")=551
-	Set gtmtypes("sgmnt_data",552,"name")="sgmnt_data.next_upgrd_warn.hp_latch_space"
-	Set gtmtypes("sgmnt_data",552,"off")=6152
-	Set gtmtypes("sgmnt_data",552,"len")=16
-	Set gtmtypes("sgmnt_data",552,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.hp_latch_space")=552
-	Set gtmtypes("sgmnt_data",552,"dim")=4
-	Set gtmtypes("sgmnt_data",553,"name")="sgmnt_data.is_encrypted"
-	Set gtmtypes("sgmnt_data",553,"off")=6168
-	Set gtmtypes("sgmnt_data",553,"len")=4
-	Set gtmtypes("sgmnt_data",553,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","is_encrypted")=553
-	Set gtmtypes("sgmnt_data",554,"name")="sgmnt_data.db_trigger_cycle"
-	Set gtmtypes("sgmnt_data",554,"off")=6172
-	Set gtmtypes("sgmnt_data",554,"len")=4
-	Set gtmtypes("sgmnt_data",554,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","db_trigger_cycle")=554
-	Set gtmtypes("sgmnt_data",555,"name")="sgmnt_data.strm_reg_seqno"
-	Set gtmtypes("sgmnt_data",555,"off")=6176
-	Set gtmtypes("sgmnt_data",555,"len")=128
-	Set gtmtypes("sgmnt_data",555,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","strm_reg_seqno")=555
-	Set gtmtypes("sgmnt_data",555,"dim")=16
-	Set gtmtypes("sgmnt_data",556,"name")="sgmnt_data.save_strm_reg_seqno"
-	Set gtmtypes("sgmnt_data",556,"off")=6304
+	Set gtmtypes("sgmnt_data",549,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.sq_crit_que_slps")=549
+	Set gtmtypes("sgmnt_data",550,"name")="sgmnt_data.gvstats_rec.n_crit_que_slps"
+	Set gtmtypes("sgmnt_data",550,"off")=4536
+	Set gtmtypes("sgmnt_data",550,"len")=8
+	Set gtmtypes("sgmnt_data",550,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_crit_que_slps")=550
+	Set gtmtypes("sgmnt_data",551,"name")="sgmnt_data.gvstats_rec.sq_crit_yields"
+	Set gtmtypes("sgmnt_data",551,"off")=4544
+	Set gtmtypes("sgmnt_data",551,"len")=8
+	Set gtmtypes("sgmnt_data",551,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.sq_crit_yields")=551
+	Set gtmtypes("sgmnt_data",552,"name")="sgmnt_data.gvstats_rec.n_crit_yields"
+	Set gtmtypes("sgmnt_data",552,"off")=4552
+	Set gtmtypes("sgmnt_data",552,"len")=8
+	Set gtmtypes("sgmnt_data",552,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_crit_yields")=552
+	Set gtmtypes("sgmnt_data",553,"name")="sgmnt_data.gvstats_rec.n_clean2dirty"
+	Set gtmtypes("sgmnt_data",553,"off")=4560
+	Set gtmtypes("sgmnt_data",553,"len")=8
+	Set gtmtypes("sgmnt_data",553,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_clean2dirty")=553
+	Set gtmtypes("sgmnt_data",554,"name")="sgmnt_data.gvstats_rec_filler_4k_plus_512"
+	Set gtmtypes("sgmnt_data",554,"off")=4568
+	Set gtmtypes("sgmnt_data",554,"len")=40
+	Set gtmtypes("sgmnt_data",554,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec_filler_4k_plus_512")=554
+	Set gtmtypes("sgmnt_data",555,"name")="sgmnt_data.filler_4k_plus_512"
+	Set gtmtypes("sgmnt_data",555,"off")=4608
+	Set gtmtypes("sgmnt_data",555,"len")=368
+	Set gtmtypes("sgmnt_data",555,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","filler_4k_plus_512")=555
+	Set gtmtypes("sgmnt_data",556,"name")="sgmnt_data.intrpt_recov_resync_strm_seqno"
+	Set gtmtypes("sgmnt_data",556,"off")=4976
 	Set gtmtypes("sgmnt_data",556,"len")=128
 	Set gtmtypes("sgmnt_data",556,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","save_strm_reg_seqno")=556
+	Set gtmtypfldindx("sgmnt_data","intrpt_recov_resync_strm_seqno")=556
 	Set gtmtypes("sgmnt_data",556,"dim")=16
-	Set gtmtypes("sgmnt_data",557,"name")="sgmnt_data.freeze_on_fail"
-	Set gtmtypes("sgmnt_data",557,"off")=6432
+	Set gtmtypes("sgmnt_data",557,"name")="sgmnt_data.creation_db_ver"
+	Set gtmtypes("sgmnt_data",557,"off")=5104
 	Set gtmtypes("sgmnt_data",557,"len")=4
-	Set gtmtypes("sgmnt_data",557,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","freeze_on_fail")=557
-	Set gtmtypes("sgmnt_data",558,"name")="sgmnt_data.span_node_absent"
-	Set gtmtypes("sgmnt_data",558,"off")=6436
+	Set gtmtypes("sgmnt_data",557,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","creation_db_ver")=557
+	Set gtmtypes("sgmnt_data",558,"name")="sgmnt_data.creation_mdb_ver"
+	Set gtmtypes("sgmnt_data",558,"off")=5108
 	Set gtmtypes("sgmnt_data",558,"len")=4
-	Set gtmtypes("sgmnt_data",558,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","span_node_absent")=558
-	Set gtmtypes("sgmnt_data",559,"name")="sgmnt_data.maxkeysz_assured"
-	Set gtmtypes("sgmnt_data",559,"off")=6440
+	Set gtmtypes("sgmnt_data",558,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","creation_mdb_ver")=558
+	Set gtmtypes("sgmnt_data",559,"name")="sgmnt_data.certified_for_upgrade_to"
+	Set gtmtypes("sgmnt_data",559,"off")=5112
 	Set gtmtypes("sgmnt_data",559,"len")=4
-	Set gtmtypes("sgmnt_data",559,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","maxkeysz_assured")=559
-	Set gtmtypes("sgmnt_data",560,"name")="sgmnt_data.hasht_upgrade_needed"
-	Set gtmtypes("sgmnt_data",560,"off")=6444
+	Set gtmtypes("sgmnt_data",559,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","certified_for_upgrade_to")=559
+	Set gtmtypes("sgmnt_data",560,"name")="sgmnt_data.filler_5k"
+	Set gtmtypes("sgmnt_data",560,"off")=5116
 	Set gtmtypes("sgmnt_data",560,"len")=4
-	Set gtmtypes("sgmnt_data",560,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","hasht_upgrade_needed")=560
-	Set gtmtypes("sgmnt_data",561,"name")="sgmnt_data.defer_allocate"
-	Set gtmtypes("sgmnt_data",561,"off")=6448
+	Set gtmtypes("sgmnt_data",560,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","filler_5k")=560
+	Set gtmtypes("sgmnt_data",561,"name")="sgmnt_data.secshr_ops_index_filler"
+	Set gtmtypes("sgmnt_data",561,"off")=5120
 	Set gtmtypes("sgmnt_data",561,"len")=4
-	Set gtmtypes("sgmnt_data",561,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","defer_allocate")=561
-	Set gtmtypes("sgmnt_data",562,"name")="sgmnt_data.filler_ftok_counter_halted"
-	Set gtmtypes("sgmnt_data",562,"off")=6452
-	Set gtmtypes("sgmnt_data",562,"len")=4
-	Set gtmtypes("sgmnt_data",562,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","filler_ftok_counter_halted")=562
-	Set gtmtypes("sgmnt_data",563,"name")="sgmnt_data.filler_access_counter_halted"
-	Set gtmtypes("sgmnt_data",563,"off")=6456
-	Set gtmtypes("sgmnt_data",563,"len")=4
-	Set gtmtypes("sgmnt_data",563,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","filler_access_counter_halted")=563
-	Set gtmtypes("sgmnt_data",564,"name")="sgmnt_data.filler_7k"
-	Set gtmtypes("sgmnt_data",564,"off")=6460
-	Set gtmtypes("sgmnt_data",564,"len")=708
-	Set gtmtypes("sgmnt_data",564,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","filler_7k")=564
-	Set gtmtypes("sgmnt_data",565,"name")="sgmnt_data.filler_8k"
-	Set gtmtypes("sgmnt_data",565,"off")=7168
-	Set gtmtypes("sgmnt_data",565,"len")=1024
-	Set gtmtypes("sgmnt_data",565,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","filler_8k")=565
+	Set gtmtypes("sgmnt_data",561,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","secshr_ops_index_filler")=561
+	Set gtmtypes("sgmnt_data",562,"name")="sgmnt_data.secshr_ops_array_filler"
+	Set gtmtypes("sgmnt_data",562,"off")=5124
+	Set gtmtypes("sgmnt_data",562,"len")=1020
+	Set gtmtypes("sgmnt_data",562,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","secshr_ops_array_filler")=562
+	Set gtmtypes("sgmnt_data",562,"dim")=255
+	Set gtmtypes("sgmnt_data",563,"name")="sgmnt_data.next_upgrd_warn"
+	Set gtmtypes("sgmnt_data",563,"off")=6144
+	Set gtmtypes("sgmnt_data",563,"len")=24
+	Set gtmtypes("sgmnt_data",563,"type")="compswap_time_field"
+	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn")=563
+	Set gtmtypes("sgmnt_data",564,"name")="sgmnt_data.next_upgrd_warn.time_latch"
+	Set gtmtypes("sgmnt_data",564,"off")=6144
+	Set gtmtypes("sgmnt_data",564,"len")=8
+	Set gtmtypes("sgmnt_data",564,"type")="global_latch_t"
+	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch")=564
+	Set gtmtypes("sgmnt_data",565,"name")="sgmnt_data.next_upgrd_warn.time_latch.u"
+	Set gtmtypes("sgmnt_data",565,"off")=6144
+	Set gtmtypes("sgmnt_data",565,"len")=8
+	Set gtmtypes("sgmnt_data",565,"type")="union"
+	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch.u")=565
+	Set gtmtypes("sgmnt_data",566,"name")="sgmnt_data.next_upgrd_warn.time_latch.u.pid_imgcnt"
+	Set gtmtypes("sgmnt_data",566,"off")=6144
+	Set gtmtypes("sgmnt_data",566,"len")=8
+	Set gtmtypes("sgmnt_data",566,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch.u.pid_imgcnt")=566
+	Set gtmtypes("sgmnt_data",567,"name")="sgmnt_data.next_upgrd_warn.time_latch.u.parts"
+	Set gtmtypes("sgmnt_data",567,"off")=6144
+	Set gtmtypes("sgmnt_data",567,"len")=8
+	Set gtmtypes("sgmnt_data",567,"type")="struct"
+	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch.u.parts")=567
+	Set gtmtypes("sgmnt_data",568,"name")="sgmnt_data.next_upgrd_warn.time_latch.u.parts.latch_pid"
+	Set gtmtypes("sgmnt_data",568,"off")=6144
+	Set gtmtypes("sgmnt_data",568,"len")=4
+	Set gtmtypes("sgmnt_data",568,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch.u.parts.latch_pid")=568
+	Set gtmtypes("sgmnt_data",569,"name")="sgmnt_data.next_upgrd_warn.time_latch.u.parts.latch_word"
+	Set gtmtypes("sgmnt_data",569,"off")=6148
+	Set gtmtypes("sgmnt_data",569,"len")=4
+	Set gtmtypes("sgmnt_data",569,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch.u.parts.latch_word")=569
+	Set gtmtypes("sgmnt_data",570,"name")="sgmnt_data.next_upgrd_warn.hp_latch_space"
+	Set gtmtypes("sgmnt_data",570,"off")=6152
+	Set gtmtypes("sgmnt_data",570,"len")=16
+	Set gtmtypes("sgmnt_data",570,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.hp_latch_space")=570
+	Set gtmtypes("sgmnt_data",570,"dim")=4
+	Set gtmtypes("sgmnt_data",571,"name")="sgmnt_data.is_encrypted"
+	Set gtmtypes("sgmnt_data",571,"off")=6168
+	Set gtmtypes("sgmnt_data",571,"len")=4
+	Set gtmtypes("sgmnt_data",571,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","is_encrypted")=571
+	Set gtmtypes("sgmnt_data",572,"name")="sgmnt_data.db_trigger_cycle"
+	Set gtmtypes("sgmnt_data",572,"off")=6172
+	Set gtmtypes("sgmnt_data",572,"len")=4
+	Set gtmtypes("sgmnt_data",572,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","db_trigger_cycle")=572
+	Set gtmtypes("sgmnt_data",573,"name")="sgmnt_data.strm_reg_seqno"
+	Set gtmtypes("sgmnt_data",573,"off")=6176
+	Set gtmtypes("sgmnt_data",573,"len")=128
+	Set gtmtypes("sgmnt_data",573,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","strm_reg_seqno")=573
+	Set gtmtypes("sgmnt_data",573,"dim")=16
+	Set gtmtypes("sgmnt_data",574,"name")="sgmnt_data.save_strm_reg_seqno"
+	Set gtmtypes("sgmnt_data",574,"off")=6304
+	Set gtmtypes("sgmnt_data",574,"len")=128
+	Set gtmtypes("sgmnt_data",574,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","save_strm_reg_seqno")=574
+	Set gtmtypes("sgmnt_data",574,"dim")=16
+	Set gtmtypes("sgmnt_data",575,"name")="sgmnt_data.freeze_on_fail"
+	Set gtmtypes("sgmnt_data",575,"off")=6432
+	Set gtmtypes("sgmnt_data",575,"len")=4
+	Set gtmtypes("sgmnt_data",575,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","freeze_on_fail")=575
+	Set gtmtypes("sgmnt_data",576,"name")="sgmnt_data.span_node_absent"
+	Set gtmtypes("sgmnt_data",576,"off")=6436
+	Set gtmtypes("sgmnt_data",576,"len")=4
+	Set gtmtypes("sgmnt_data",576,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","span_node_absent")=576
+	Set gtmtypes("sgmnt_data",577,"name")="sgmnt_data.maxkeysz_assured"
+	Set gtmtypes("sgmnt_data",577,"off")=6440
+	Set gtmtypes("sgmnt_data",577,"len")=4
+	Set gtmtypes("sgmnt_data",577,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","maxkeysz_assured")=577
+	Set gtmtypes("sgmnt_data",578,"name")="sgmnt_data.hasht_upgrade_needed"
+	Set gtmtypes("sgmnt_data",578,"off")=6444
+	Set gtmtypes("sgmnt_data",578,"len")=4
+	Set gtmtypes("sgmnt_data",578,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","hasht_upgrade_needed")=578
+	Set gtmtypes("sgmnt_data",579,"name")="sgmnt_data.defer_allocate"
+	Set gtmtypes("sgmnt_data",579,"off")=6448
+	Set gtmtypes("sgmnt_data",579,"len")=4
+	Set gtmtypes("sgmnt_data",579,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","defer_allocate")=579
+	Set gtmtypes("sgmnt_data",580,"name")="sgmnt_data.filler_ftok_counter_halted"
+	Set gtmtypes("sgmnt_data",580,"off")=6452
+	Set gtmtypes("sgmnt_data",580,"len")=4
+	Set gtmtypes("sgmnt_data",580,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","filler_ftok_counter_halted")=580
+	Set gtmtypes("sgmnt_data",581,"name")="sgmnt_data.filler_access_counter_halted"
+	Set gtmtypes("sgmnt_data",581,"off")=6456
+	Set gtmtypes("sgmnt_data",581,"len")=4
+	Set gtmtypes("sgmnt_data",581,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","filler_access_counter_halted")=581
+	Set gtmtypes("sgmnt_data",582,"name")="sgmnt_data.lock_crit_with_db"
+	Set gtmtypes("sgmnt_data",582,"off")=6460
+	Set gtmtypes("sgmnt_data",582,"len")=4
+	Set gtmtypes("sgmnt_data",582,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","lock_crit_with_db")=582
+	Set gtmtypes("sgmnt_data",583,"name")="sgmnt_data.basedb_fname_len"
+	Set gtmtypes("sgmnt_data",583,"off")=6464
+	Set gtmtypes("sgmnt_data",583,"len")=4
+	Set gtmtypes("sgmnt_data",583,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","basedb_fname_len")=583
+	Set gtmtypes("sgmnt_data",584,"name")="sgmnt_data.basedb_fname"
+	Set gtmtypes("sgmnt_data",584,"off")=6468
+	Set gtmtypes("sgmnt_data",584,"len")=256
+	Set gtmtypes("sgmnt_data",584,"type")="unsigned-char"
+	Set gtmtypfldindx("sgmnt_data","basedb_fname")=584
+	Set gtmtypes("sgmnt_data",585,"name")="sgmnt_data.filler_7k"
+	Set gtmtypes("sgmnt_data",585,"off")=6724
+	Set gtmtypes("sgmnt_data",585,"len")=444
+	Set gtmtypes("sgmnt_data",585,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","filler_7k")=585
+	Set gtmtypes("sgmnt_data",586,"name")="sgmnt_data.filler_8k"
+	Set gtmtypes("sgmnt_data",586,"off")=7168
+	Set gtmtypes("sgmnt_data",586,"len")=1024
+	Set gtmtypes("sgmnt_data",586,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","filler_8k")=586
 	;
 	Set gtmtypes("shm_forw_multi_t")="struct"
 	Set gtmtypes("shm_forw_multi_t",0)=20
@@ -29711,7 +30272,7 @@ Init
 	Set gtmtypes("shm_reg_ctl_t",9,"dim")=3
 	;
 	Set gtmtypes("shm_snapshot_t")="struct"
-	Set gtmtypes("shm_snapshot_t",0)=587
+	Set gtmtypes("shm_snapshot_t",0)=608
 	Set gtmtypes("shm_snapshot_t","len")=12360
 	Set gtmtypes("shm_snapshot_t",1,"name")="shm_snapshot_t.ss_info"
 	Set gtmtypes("shm_snapshot_t",1,"off")=0
@@ -29911,7 +30472,7 @@ Init
 	Set gtmtypes("shm_snapshot_t",40,"name")="shm_snapshot_t.shadow_file_header.null_subs"
 	Set gtmtypes("shm_snapshot_t",40,"off")=4244
 	Set gtmtypes("shm_snapshot_t",40,"len")=4
-	Set gtmtypes("shm_snapshot_t",40,"type")="boolean_t"
+	Set gtmtypes("shm_snapshot_t",40,"type")="int"
 	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.null_subs")=40
 	Set gtmtypes("shm_snapshot_t",41,"name")="shm_snapshot_t.shadow_file_header.free_space"
 	Set gtmtypes("shm_snapshot_t",41,"off")=4248
@@ -29993,11 +30554,11 @@ Init
 	Set gtmtypes("shm_snapshot_t",56,"len")=4
 	Set gtmtypes("shm_snapshot_t",56,"type")="int"
 	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.creation_time4")=56
-	Set gtmtypes("shm_snapshot_t",57,"name")="shm_snapshot_t.shadow_file_header.creation_filler_8byte"
+	Set gtmtypes("shm_snapshot_t",57,"name")="shm_snapshot_t.shadow_file_header.reservedDBFlags"
 	Set gtmtypes("shm_snapshot_t",57,"off")=4356
 	Set gtmtypes("shm_snapshot_t",57,"len")=4
-	Set gtmtypes("shm_snapshot_t",57,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.creation_filler_8byte")=57
+	Set gtmtypes("shm_snapshot_t",57,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reservedDBFlags")=57
 	Set gtmtypes("shm_snapshot_t",58,"name")="shm_snapshot_t.shadow_file_header.max_tn"
 	Set gtmtypes("shm_snapshot_t",58,"off")=4360
 	Set gtmtypes("shm_snapshot_t",58,"len")=8
@@ -30078,2592 +30639,2697 @@ Init
 	Set gtmtypes("shm_snapshot_t",73,"len")=4
 	Set gtmtypes("shm_snapshot_t",73,"type")="int"
 	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.abandoned_kills")=73
-	Set gtmtypes("shm_snapshot_t",74,"name")="shm_snapshot_t.shadow_file_header.filler_320"
+	Set gtmtypes("shm_snapshot_t",74,"name")="shm_snapshot_t.shadow_file_header.freeze_online"
 	Set gtmtypes("shm_snapshot_t",74,"off")=4480
-	Set gtmtypes("shm_snapshot_t",74,"len")=8
-	Set gtmtypes("shm_snapshot_t",74,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_320")=74
-	Set gtmtypes("shm_snapshot_t",75,"name")="shm_snapshot_t.shadow_file_header.tn_upgrd_blks_0"
-	Set gtmtypes("shm_snapshot_t",75,"off")=4488
-	Set gtmtypes("shm_snapshot_t",75,"len")=8
-	Set gtmtypes("shm_snapshot_t",75,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.tn_upgrd_blks_0")=75
-	Set gtmtypes("shm_snapshot_t",76,"name")="shm_snapshot_t.shadow_file_header.desired_db_format_tn"
-	Set gtmtypes("shm_snapshot_t",76,"off")=4496
+	Set gtmtypes("shm_snapshot_t",74,"len")=4
+	Set gtmtypes("shm_snapshot_t",74,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.freeze_online")=74
+	Set gtmtypes("shm_snapshot_t",75,"name")="shm_snapshot_t.shadow_file_header.filler_320"
+	Set gtmtypes("shm_snapshot_t",75,"off")=4484
+	Set gtmtypes("shm_snapshot_t",75,"len")=4
+	Set gtmtypes("shm_snapshot_t",75,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_320")=75
+	Set gtmtypes("shm_snapshot_t",76,"name")="shm_snapshot_t.shadow_file_header.tn_upgrd_blks_0"
+	Set gtmtypes("shm_snapshot_t",76,"off")=4488
 	Set gtmtypes("shm_snapshot_t",76,"len")=8
 	Set gtmtypes("shm_snapshot_t",76,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.desired_db_format_tn")=76
-	Set gtmtypes("shm_snapshot_t",77,"name")="shm_snapshot_t.shadow_file_header.reorg_db_fmt_start_tn"
-	Set gtmtypes("shm_snapshot_t",77,"off")=4504
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.tn_upgrd_blks_0")=76
+	Set gtmtypes("shm_snapshot_t",77,"name")="shm_snapshot_t.shadow_file_header.desired_db_format_tn"
+	Set gtmtypes("shm_snapshot_t",77,"off")=4496
 	Set gtmtypes("shm_snapshot_t",77,"len")=8
 	Set gtmtypes("shm_snapshot_t",77,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reorg_db_fmt_start_tn")=77
-	Set gtmtypes("shm_snapshot_t",78,"name")="shm_snapshot_t.shadow_file_header.reorg_upgrd_dwngrd_restart_block"
-	Set gtmtypes("shm_snapshot_t",78,"off")=4512
-	Set gtmtypes("shm_snapshot_t",78,"len")=4
-	Set gtmtypes("shm_snapshot_t",78,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reorg_upgrd_dwngrd_restart_block")=78
-	Set gtmtypes("shm_snapshot_t",79,"name")="shm_snapshot_t.shadow_file_header.blks_to_upgrd"
-	Set gtmtypes("shm_snapshot_t",79,"off")=4516
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.desired_db_format_tn")=77
+	Set gtmtypes("shm_snapshot_t",78,"name")="shm_snapshot_t.shadow_file_header.reorg_db_fmt_start_tn"
+	Set gtmtypes("shm_snapshot_t",78,"off")=4504
+	Set gtmtypes("shm_snapshot_t",78,"len")=8
+	Set gtmtypes("shm_snapshot_t",78,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reorg_db_fmt_start_tn")=78
+	Set gtmtypes("shm_snapshot_t",79,"name")="shm_snapshot_t.shadow_file_header.reorg_upgrd_dwngrd_restart_block"
+	Set gtmtypes("shm_snapshot_t",79,"off")=4512
 	Set gtmtypes("shm_snapshot_t",79,"len")=4
 	Set gtmtypes("shm_snapshot_t",79,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.blks_to_upgrd")=79
-	Set gtmtypes("shm_snapshot_t",80,"name")="shm_snapshot_t.shadow_file_header.blks_to_upgrd_subzero_error"
-	Set gtmtypes("shm_snapshot_t",80,"off")=4520
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reorg_upgrd_dwngrd_restart_block")=79
+	Set gtmtypes("shm_snapshot_t",80,"name")="shm_snapshot_t.shadow_file_header.blks_to_upgrd"
+	Set gtmtypes("shm_snapshot_t",80,"off")=4516
 	Set gtmtypes("shm_snapshot_t",80,"len")=4
 	Set gtmtypes("shm_snapshot_t",80,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.blks_to_upgrd_subzero_error")=80
-	Set gtmtypes("shm_snapshot_t",81,"name")="shm_snapshot_t.shadow_file_header.desired_db_format"
-	Set gtmtypes("shm_snapshot_t",81,"off")=4524
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.blks_to_upgrd")=80
+	Set gtmtypes("shm_snapshot_t",81,"name")="shm_snapshot_t.shadow_file_header.blks_to_upgrd_subzero_error"
+	Set gtmtypes("shm_snapshot_t",81,"off")=4520
 	Set gtmtypes("shm_snapshot_t",81,"len")=4
 	Set gtmtypes("shm_snapshot_t",81,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.desired_db_format")=81
-	Set gtmtypes("shm_snapshot_t",82,"name")="shm_snapshot_t.shadow_file_header.fully_upgraded"
-	Set gtmtypes("shm_snapshot_t",82,"off")=4528
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.blks_to_upgrd_subzero_error")=81
+	Set gtmtypes("shm_snapshot_t",82,"name")="shm_snapshot_t.shadow_file_header.desired_db_format"
+	Set gtmtypes("shm_snapshot_t",82,"off")=4524
 	Set gtmtypes("shm_snapshot_t",82,"len")=4
-	Set gtmtypes("shm_snapshot_t",82,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.fully_upgraded")=82
-	Set gtmtypes("shm_snapshot_t",83,"name")="shm_snapshot_t.shadow_file_header.db_got_to_v5_once"
-	Set gtmtypes("shm_snapshot_t",83,"off")=4532
+	Set gtmtypes("shm_snapshot_t",82,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.desired_db_format")=82
+	Set gtmtypes("shm_snapshot_t",83,"name")="shm_snapshot_t.shadow_file_header.fully_upgraded"
+	Set gtmtypes("shm_snapshot_t",83,"off")=4528
 	Set gtmtypes("shm_snapshot_t",83,"len")=4
 	Set gtmtypes("shm_snapshot_t",83,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_got_to_v5_once")=83
-	Set gtmtypes("shm_snapshot_t",84,"name")="shm_snapshot_t.shadow_file_header.opened_by_gtmv53"
-	Set gtmtypes("shm_snapshot_t",84,"off")=4536
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.fully_upgraded")=83
+	Set gtmtypes("shm_snapshot_t",84,"name")="shm_snapshot_t.shadow_file_header.db_got_to_v5_once"
+	Set gtmtypes("shm_snapshot_t",84,"off")=4532
 	Set gtmtypes("shm_snapshot_t",84,"len")=4
 	Set gtmtypes("shm_snapshot_t",84,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.opened_by_gtmv53")=84
-	Set gtmtypes("shm_snapshot_t",85,"name")="shm_snapshot_t.shadow_file_header.filler_384"
-	Set gtmtypes("shm_snapshot_t",85,"off")=4540
-	Set gtmtypes("shm_snapshot_t",85,"len")=12
-	Set gtmtypes("shm_snapshot_t",85,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_384")=85
-	Set gtmtypes("shm_snapshot_t",86,"name")="shm_snapshot_t.shadow_file_header.trans_hist"
-	Set gtmtypes("shm_snapshot_t",86,"off")=4552
-	Set gtmtypes("shm_snapshot_t",86,"len")=56
-	Set gtmtypes("shm_snapshot_t",86,"type")="th_index"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist")=86
-	Set gtmtypes("shm_snapshot_t",87,"name")="shm_snapshot_t.shadow_file_header.trans_hist.curr_tn"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_got_to_v5_once")=84
+	Set gtmtypes("shm_snapshot_t",85,"name")="shm_snapshot_t.shadow_file_header.opened_by_gtmv53"
+	Set gtmtypes("shm_snapshot_t",85,"off")=4536
+	Set gtmtypes("shm_snapshot_t",85,"len")=4
+	Set gtmtypes("shm_snapshot_t",85,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.opened_by_gtmv53")=85
+	Set gtmtypes("shm_snapshot_t",86,"name")="shm_snapshot_t.shadow_file_header.filler_384"
+	Set gtmtypes("shm_snapshot_t",86,"off")=4540
+	Set gtmtypes("shm_snapshot_t",86,"len")=12
+	Set gtmtypes("shm_snapshot_t",86,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_384")=86
+	Set gtmtypes("shm_snapshot_t",87,"name")="shm_snapshot_t.shadow_file_header.trans_hist"
 	Set gtmtypes("shm_snapshot_t",87,"off")=4552
-	Set gtmtypes("shm_snapshot_t",87,"len")=8
-	Set gtmtypes("shm_snapshot_t",87,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.curr_tn")=87
-	Set gtmtypes("shm_snapshot_t",88,"name")="shm_snapshot_t.shadow_file_header.trans_hist.early_tn"
-	Set gtmtypes("shm_snapshot_t",88,"off")=4560
+	Set gtmtypes("shm_snapshot_t",87,"len")=56
+	Set gtmtypes("shm_snapshot_t",87,"type")="th_index"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist")=87
+	Set gtmtypes("shm_snapshot_t",88,"name")="shm_snapshot_t.shadow_file_header.trans_hist.curr_tn"
+	Set gtmtypes("shm_snapshot_t",88,"off")=4552
 	Set gtmtypes("shm_snapshot_t",88,"len")=8
 	Set gtmtypes("shm_snapshot_t",88,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.early_tn")=88
-	Set gtmtypes("shm_snapshot_t",89,"name")="shm_snapshot_t.shadow_file_header.trans_hist.last_mm_sync"
-	Set gtmtypes("shm_snapshot_t",89,"off")=4568
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.curr_tn")=88
+	Set gtmtypes("shm_snapshot_t",89,"name")="shm_snapshot_t.shadow_file_header.trans_hist.early_tn"
+	Set gtmtypes("shm_snapshot_t",89,"off")=4560
 	Set gtmtypes("shm_snapshot_t",89,"len")=8
 	Set gtmtypes("shm_snapshot_t",89,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.last_mm_sync")=89
-	Set gtmtypes("shm_snapshot_t",90,"name")="shm_snapshot_t.shadow_file_header.trans_hist.filler_8byte"
-	Set gtmtypes("shm_snapshot_t",90,"off")=4576
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.early_tn")=89
+	Set gtmtypes("shm_snapshot_t",90,"name")="shm_snapshot_t.shadow_file_header.trans_hist.last_mm_sync"
+	Set gtmtypes("shm_snapshot_t",90,"off")=4568
 	Set gtmtypes("shm_snapshot_t",90,"len")=8
-	Set gtmtypes("shm_snapshot_t",90,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.filler_8byte")=90
-	Set gtmtypes("shm_snapshot_t",91,"name")="shm_snapshot_t.shadow_file_header.trans_hist.mm_tn"
-	Set gtmtypes("shm_snapshot_t",91,"off")=4584
+	Set gtmtypes("shm_snapshot_t",90,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.last_mm_sync")=90
+	Set gtmtypes("shm_snapshot_t",91,"name")="shm_snapshot_t.shadow_file_header.trans_hist.filler_8byte"
+	Set gtmtypes("shm_snapshot_t",91,"off")=4576
 	Set gtmtypes("shm_snapshot_t",91,"len")=8
-	Set gtmtypes("shm_snapshot_t",91,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.mm_tn")=91
-	Set gtmtypes("shm_snapshot_t",92,"name")="shm_snapshot_t.shadow_file_header.trans_hist.lock_sequence"
-	Set gtmtypes("shm_snapshot_t",92,"off")=4592
-	Set gtmtypes("shm_snapshot_t",92,"len")=4
-	Set gtmtypes("shm_snapshot_t",92,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.lock_sequence")=92
-	Set gtmtypes("shm_snapshot_t",93,"name")="shm_snapshot_t.shadow_file_header.trans_hist.ccp_jnl_filesize"
-	Set gtmtypes("shm_snapshot_t",93,"off")=4596
+	Set gtmtypes("shm_snapshot_t",91,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.filler_8byte")=91
+	Set gtmtypes("shm_snapshot_t",92,"name")="shm_snapshot_t.shadow_file_header.trans_hist.mm_tn"
+	Set gtmtypes("shm_snapshot_t",92,"off")=4584
+	Set gtmtypes("shm_snapshot_t",92,"len")=8
+	Set gtmtypes("shm_snapshot_t",92,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.mm_tn")=92
+	Set gtmtypes("shm_snapshot_t",93,"name")="shm_snapshot_t.shadow_file_header.trans_hist.lock_sequence"
+	Set gtmtypes("shm_snapshot_t",93,"off")=4592
 	Set gtmtypes("shm_snapshot_t",93,"len")=4
 	Set gtmtypes("shm_snapshot_t",93,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.ccp_jnl_filesize")=93
-	Set gtmtypes("shm_snapshot_t",94,"name")="shm_snapshot_t.shadow_file_header.trans_hist.total_blks"
-	Set gtmtypes("shm_snapshot_t",94,"off")=4600
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.lock_sequence")=93
+	Set gtmtypes("shm_snapshot_t",94,"name")="shm_snapshot_t.shadow_file_header.trans_hist.ccp_jnl_filesize"
+	Set gtmtypes("shm_snapshot_t",94,"off")=4596
 	Set gtmtypes("shm_snapshot_t",94,"len")=4
 	Set gtmtypes("shm_snapshot_t",94,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.total_blks")=94
-	Set gtmtypes("shm_snapshot_t",95,"name")="shm_snapshot_t.shadow_file_header.trans_hist.free_blocks"
-	Set gtmtypes("shm_snapshot_t",95,"off")=4604
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.ccp_jnl_filesize")=94
+	Set gtmtypes("shm_snapshot_t",95,"name")="shm_snapshot_t.shadow_file_header.trans_hist.total_blks"
+	Set gtmtypes("shm_snapshot_t",95,"off")=4600
 	Set gtmtypes("shm_snapshot_t",95,"len")=4
 	Set gtmtypes("shm_snapshot_t",95,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.free_blocks")=95
-	Set gtmtypes("shm_snapshot_t",96,"name")="shm_snapshot_t.shadow_file_header.filler_trans_hist"
-	Set gtmtypes("shm_snapshot_t",96,"off")=4608
-	Set gtmtypes("shm_snapshot_t",96,"len")=8
-	Set gtmtypes("shm_snapshot_t",96,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_trans_hist")=96
-	Set gtmtypes("shm_snapshot_t",97,"name")="shm_snapshot_t.shadow_file_header.flush_time"
-	Set gtmtypes("shm_snapshot_t",97,"off")=4616
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.total_blks")=95
+	Set gtmtypes("shm_snapshot_t",96,"name")="shm_snapshot_t.shadow_file_header.trans_hist.free_blocks"
+	Set gtmtypes("shm_snapshot_t",96,"off")=4604
+	Set gtmtypes("shm_snapshot_t",96,"len")=4
+	Set gtmtypes("shm_snapshot_t",96,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.free_blocks")=96
+	Set gtmtypes("shm_snapshot_t",97,"name")="shm_snapshot_t.shadow_file_header.filler_trans_hist"
+	Set gtmtypes("shm_snapshot_t",97,"off")=4608
 	Set gtmtypes("shm_snapshot_t",97,"len")=8
-	Set gtmtypes("shm_snapshot_t",97,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.flush_time")=97
-	Set gtmtypes("shm_snapshot_t",97,"dim")=2
-	Set gtmtypes("shm_snapshot_t",98,"name")="shm_snapshot_t.shadow_file_header.flush_trigger"
-	Set gtmtypes("shm_snapshot_t",98,"off")=4624
-	Set gtmtypes("shm_snapshot_t",98,"len")=4
+	Set gtmtypes("shm_snapshot_t",97,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_trans_hist")=97
+	Set gtmtypes("shm_snapshot_t",98,"name")="shm_snapshot_t.shadow_file_header.flush_time"
+	Set gtmtypes("shm_snapshot_t",98,"off")=4616
+	Set gtmtypes("shm_snapshot_t",98,"len")=8
 	Set gtmtypes("shm_snapshot_t",98,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.flush_trigger")=98
-	Set gtmtypes("shm_snapshot_t",99,"name")="shm_snapshot_t.shadow_file_header.n_wrt_per_flu"
-	Set gtmtypes("shm_snapshot_t",99,"off")=4628
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.flush_time")=98
+	Set gtmtypes("shm_snapshot_t",98,"dim")=2
+	Set gtmtypes("shm_snapshot_t",99,"name")="shm_snapshot_t.shadow_file_header.flush_trigger"
+	Set gtmtypes("shm_snapshot_t",99,"off")=4624
 	Set gtmtypes("shm_snapshot_t",99,"len")=4
 	Set gtmtypes("shm_snapshot_t",99,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_wrt_per_flu")=99
-	Set gtmtypes("shm_snapshot_t",100,"name")="shm_snapshot_t.shadow_file_header.wait_disk_space"
-	Set gtmtypes("shm_snapshot_t",100,"off")=4632
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.flush_trigger")=99
+	Set gtmtypes("shm_snapshot_t",100,"name")="shm_snapshot_t.shadow_file_header.n_wrt_per_flu"
+	Set gtmtypes("shm_snapshot_t",100,"off")=4628
 	Set gtmtypes("shm_snapshot_t",100,"len")=4
 	Set gtmtypes("shm_snapshot_t",100,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wait_disk_space")=100
-	Set gtmtypes("shm_snapshot_t",101,"name")="shm_snapshot_t.shadow_file_header.defer_time"
-	Set gtmtypes("shm_snapshot_t",101,"off")=4636
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_wrt_per_flu")=100
+	Set gtmtypes("shm_snapshot_t",101,"name")="shm_snapshot_t.shadow_file_header.wait_disk_space"
+	Set gtmtypes("shm_snapshot_t",101,"off")=4632
 	Set gtmtypes("shm_snapshot_t",101,"len")=4
 	Set gtmtypes("shm_snapshot_t",101,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.defer_time")=101
-	Set gtmtypes("shm_snapshot_t",102,"name")="shm_snapshot_t.shadow_file_header.filler_wc_blocked"
-	Set gtmtypes("shm_snapshot_t",102,"off")=4640
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wait_disk_space")=101
+	Set gtmtypes("shm_snapshot_t",102,"name")="shm_snapshot_t.shadow_file_header.defer_time"
+	Set gtmtypes("shm_snapshot_t",102,"off")=4636
 	Set gtmtypes("shm_snapshot_t",102,"len")=4
-	Set gtmtypes("shm_snapshot_t",102,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_wc_blocked")=102
-	Set gtmtypes("shm_snapshot_t",103,"name")="shm_snapshot_t.shadow_file_header.mumps_can_bypass"
-	Set gtmtypes("shm_snapshot_t",103,"off")=4644
+	Set gtmtypes("shm_snapshot_t",102,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.defer_time")=102
+	Set gtmtypes("shm_snapshot_t",103,"name")="shm_snapshot_t.shadow_file_header.filler_wc_blocked"
+	Set gtmtypes("shm_snapshot_t",103,"off")=4640
 	Set gtmtypes("shm_snapshot_t",103,"len")=4
 	Set gtmtypes("shm_snapshot_t",103,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.mumps_can_bypass")=103
-	Set gtmtypes("shm_snapshot_t",104,"name")="shm_snapshot_t.shadow_file_header.epoch_taper"
-	Set gtmtypes("shm_snapshot_t",104,"off")=4648
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_wc_blocked")=103
+	Set gtmtypes("shm_snapshot_t",104,"name")="shm_snapshot_t.shadow_file_header.mumps_can_bypass"
+	Set gtmtypes("shm_snapshot_t",104,"off")=4644
 	Set gtmtypes("shm_snapshot_t",104,"len")=4
 	Set gtmtypes("shm_snapshot_t",104,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.epoch_taper")=104
-	Set gtmtypes("shm_snapshot_t",105,"name")="shm_snapshot_t.shadow_file_header.epoch_taper_time_pct"
-	Set gtmtypes("shm_snapshot_t",105,"off")=4652
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.mumps_can_bypass")=104
+	Set gtmtypes("shm_snapshot_t",105,"name")="shm_snapshot_t.shadow_file_header.epoch_taper"
+	Set gtmtypes("shm_snapshot_t",105,"off")=4648
 	Set gtmtypes("shm_snapshot_t",105,"len")=4
-	Set gtmtypes("shm_snapshot_t",105,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.epoch_taper_time_pct")=105
-	Set gtmtypes("shm_snapshot_t",106,"name")="shm_snapshot_t.shadow_file_header.epoch_taper_jnl_pct"
-	Set gtmtypes("shm_snapshot_t",106,"off")=4656
+	Set gtmtypes("shm_snapshot_t",105,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.epoch_taper")=105
+	Set gtmtypes("shm_snapshot_t",106,"name")="shm_snapshot_t.shadow_file_header.epoch_taper_time_pct"
+	Set gtmtypes("shm_snapshot_t",106,"off")=4652
 	Set gtmtypes("shm_snapshot_t",106,"len")=4
 	Set gtmtypes("shm_snapshot_t",106,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.epoch_taper_jnl_pct")=106
-	Set gtmtypes("shm_snapshot_t",107,"name")="shm_snapshot_t.shadow_file_header.filler_512"
-	Set gtmtypes("shm_snapshot_t",107,"off")=4660
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.epoch_taper_time_pct")=106
+	Set gtmtypes("shm_snapshot_t",107,"name")="shm_snapshot_t.shadow_file_header.epoch_taper_jnl_pct"
+	Set gtmtypes("shm_snapshot_t",107,"off")=4656
 	Set gtmtypes("shm_snapshot_t",107,"len")=4
-	Set gtmtypes("shm_snapshot_t",107,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_512")=107
-	Set gtmtypes("shm_snapshot_t",108,"name")="shm_snapshot_t.shadow_file_header.reserved_for_upd"
-	Set gtmtypes("shm_snapshot_t",108,"off")=4664
+	Set gtmtypes("shm_snapshot_t",107,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.epoch_taper_jnl_pct")=107
+	Set gtmtypes("shm_snapshot_t",108,"name")="shm_snapshot_t.shadow_file_header.asyncio"
+	Set gtmtypes("shm_snapshot_t",108,"off")=4660
 	Set gtmtypes("shm_snapshot_t",108,"len")=4
-	Set gtmtypes("shm_snapshot_t",108,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reserved_for_upd")=108
-	Set gtmtypes("shm_snapshot_t",109,"name")="shm_snapshot_t.shadow_file_header.avg_blks_per_100gbl"
-	Set gtmtypes("shm_snapshot_t",109,"off")=4668
+	Set gtmtypes("shm_snapshot_t",108,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.asyncio")=108
+	Set gtmtypes("shm_snapshot_t",109,"name")="shm_snapshot_t.shadow_file_header.reserved_for_upd"
+	Set gtmtypes("shm_snapshot_t",109,"off")=4664
 	Set gtmtypes("shm_snapshot_t",109,"len")=4
 	Set gtmtypes("shm_snapshot_t",109,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.avg_blks_per_100gbl")=109
-	Set gtmtypes("shm_snapshot_t",110,"name")="shm_snapshot_t.shadow_file_header.pre_read_trigger_factor"
-	Set gtmtypes("shm_snapshot_t",110,"off")=4672
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reserved_for_upd")=109
+	Set gtmtypes("shm_snapshot_t",110,"name")="shm_snapshot_t.shadow_file_header.avg_blks_per_100gbl"
+	Set gtmtypes("shm_snapshot_t",110,"off")=4668
 	Set gtmtypes("shm_snapshot_t",110,"len")=4
 	Set gtmtypes("shm_snapshot_t",110,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.pre_read_trigger_factor")=110
-	Set gtmtypes("shm_snapshot_t",111,"name")="shm_snapshot_t.shadow_file_header.writer_trigger_factor"
-	Set gtmtypes("shm_snapshot_t",111,"off")=4676
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.avg_blks_per_100gbl")=110
+	Set gtmtypes("shm_snapshot_t",111,"name")="shm_snapshot_t.shadow_file_header.pre_read_trigger_factor"
+	Set gtmtypes("shm_snapshot_t",111,"off")=4672
 	Set gtmtypes("shm_snapshot_t",111,"len")=4
 	Set gtmtypes("shm_snapshot_t",111,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.writer_trigger_factor")=111
-	Set gtmtypes("shm_snapshot_t",112,"name")="shm_snapshot_t.shadow_file_header.semid"
-	Set gtmtypes("shm_snapshot_t",112,"off")=4680
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.pre_read_trigger_factor")=111
+	Set gtmtypes("shm_snapshot_t",112,"name")="shm_snapshot_t.shadow_file_header.writer_trigger_factor"
+	Set gtmtypes("shm_snapshot_t",112,"off")=4676
 	Set gtmtypes("shm_snapshot_t",112,"len")=4
-	Set gtmtypes("shm_snapshot_t",112,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.semid")=112
-	Set gtmtypes("shm_snapshot_t",113,"name")="shm_snapshot_t.shadow_file_header.shmid"
-	Set gtmtypes("shm_snapshot_t",113,"off")=4684
+	Set gtmtypes("shm_snapshot_t",112,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.writer_trigger_factor")=112
+	Set gtmtypes("shm_snapshot_t",113,"name")="shm_snapshot_t.shadow_file_header.semid"
+	Set gtmtypes("shm_snapshot_t",113,"off")=4680
 	Set gtmtypes("shm_snapshot_t",113,"len")=4
 	Set gtmtypes("shm_snapshot_t",113,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmid")=113
-	Set gtmtypes("shm_snapshot_t",114,"name")="shm_snapshot_t.shadow_file_header.gt_sem_ctime"
-	Set gtmtypes("shm_snapshot_t",114,"off")=4688
-	Set gtmtypes("shm_snapshot_t",114,"len")=8
-	Set gtmtypes("shm_snapshot_t",114,"type")="gtm_time8"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gt_sem_ctime")=114
-	Set gtmtypes("shm_snapshot_t",115,"name")="shm_snapshot_t.shadow_file_header.gt_sem_ctime.ctime"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.semid")=113
+	Set gtmtypes("shm_snapshot_t",114,"name")="shm_snapshot_t.shadow_file_header.shmid"
+	Set gtmtypes("shm_snapshot_t",114,"off")=4684
+	Set gtmtypes("shm_snapshot_t",114,"len")=4
+	Set gtmtypes("shm_snapshot_t",114,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmid")=114
+	Set gtmtypes("shm_snapshot_t",115,"name")="shm_snapshot_t.shadow_file_header.gt_sem_ctime"
 	Set gtmtypes("shm_snapshot_t",115,"off")=4688
-	Set gtmtypes("shm_snapshot_t",115,"len")=4
-	Set gtmtypes("shm_snapshot_t",115,"type")="time_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gt_sem_ctime.ctime")=115
-	Set gtmtypes("shm_snapshot_t",116,"name")="shm_snapshot_t.shadow_file_header.gt_sem_ctime.filler"
+	Set gtmtypes("shm_snapshot_t",115,"len")=8
+	Set gtmtypes("shm_snapshot_t",115,"type")="gtm_time8"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gt_sem_ctime")=115
+	Set gtmtypes("shm_snapshot_t",116,"name")="shm_snapshot_t.shadow_file_header.gt_sem_ctime.ctime"
 	Set gtmtypes("shm_snapshot_t",116,"off")=4688
-	Set gtmtypes("shm_snapshot_t",116,"len")=8
-	Set gtmtypes("shm_snapshot_t",116,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gt_sem_ctime.filler")=116
-	Set gtmtypes("shm_snapshot_t",116,"dim")=2
-	Set gtmtypes("shm_snapshot_t",117,"name")="shm_snapshot_t.shadow_file_header.gt_shm_ctime"
-	Set gtmtypes("shm_snapshot_t",117,"off")=4696
+	Set gtmtypes("shm_snapshot_t",116,"len")=4
+	Set gtmtypes("shm_snapshot_t",116,"type")="time_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gt_sem_ctime.ctime")=116
+	Set gtmtypes("shm_snapshot_t",117,"name")="shm_snapshot_t.shadow_file_header.gt_sem_ctime.filler"
+	Set gtmtypes("shm_snapshot_t",117,"off")=4688
 	Set gtmtypes("shm_snapshot_t",117,"len")=8
-	Set gtmtypes("shm_snapshot_t",117,"type")="gtm_time8"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gt_shm_ctime")=117
-	Set gtmtypes("shm_snapshot_t",118,"name")="shm_snapshot_t.shadow_file_header.gt_shm_ctime.ctime"
+	Set gtmtypes("shm_snapshot_t",117,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gt_sem_ctime.filler")=117
+	Set gtmtypes("shm_snapshot_t",117,"dim")=2
+	Set gtmtypes("shm_snapshot_t",118,"name")="shm_snapshot_t.shadow_file_header.gt_shm_ctime"
 	Set gtmtypes("shm_snapshot_t",118,"off")=4696
-	Set gtmtypes("shm_snapshot_t",118,"len")=4
-	Set gtmtypes("shm_snapshot_t",118,"type")="time_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gt_shm_ctime.ctime")=118
-	Set gtmtypes("shm_snapshot_t",119,"name")="shm_snapshot_t.shadow_file_header.gt_shm_ctime.filler"
+	Set gtmtypes("shm_snapshot_t",118,"len")=8
+	Set gtmtypes("shm_snapshot_t",118,"type")="gtm_time8"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gt_shm_ctime")=118
+	Set gtmtypes("shm_snapshot_t",119,"name")="shm_snapshot_t.shadow_file_header.gt_shm_ctime.ctime"
 	Set gtmtypes("shm_snapshot_t",119,"off")=4696
-	Set gtmtypes("shm_snapshot_t",119,"len")=8
-	Set gtmtypes("shm_snapshot_t",119,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gt_shm_ctime.filler")=119
-	Set gtmtypes("shm_snapshot_t",119,"dim")=2
-	Set gtmtypes("shm_snapshot_t",120,"name")="shm_snapshot_t.shadow_file_header.filler_unixonly"
-	Set gtmtypes("shm_snapshot_t",120,"off")=4704
-	Set gtmtypes("shm_snapshot_t",120,"len")=40
-	Set gtmtypes("shm_snapshot_t",120,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_unixonly")=120
-	Set gtmtypes("shm_snapshot_t",121,"name")="shm_snapshot_t.shadow_file_header.filler_n_retries"
-	Set gtmtypes("shm_snapshot_t",121,"off")=4744
-	Set gtmtypes("shm_snapshot_t",121,"len")=20
-	Set gtmtypes("shm_snapshot_t",121,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_retries")=121
-	Set gtmtypes("shm_snapshot_t",121,"dim")=5
-	Set gtmtypes("shm_snapshot_t",122,"name")="shm_snapshot_t.shadow_file_header.filler_n_puts"
-	Set gtmtypes("shm_snapshot_t",122,"off")=4764
-	Set gtmtypes("shm_snapshot_t",122,"len")=4
+	Set gtmtypes("shm_snapshot_t",119,"len")=4
+	Set gtmtypes("shm_snapshot_t",119,"type")="time_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gt_shm_ctime.ctime")=119
+	Set gtmtypes("shm_snapshot_t",120,"name")="shm_snapshot_t.shadow_file_header.gt_shm_ctime.filler"
+	Set gtmtypes("shm_snapshot_t",120,"off")=4696
+	Set gtmtypes("shm_snapshot_t",120,"len")=8
+	Set gtmtypes("shm_snapshot_t",120,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gt_shm_ctime.filler")=120
+	Set gtmtypes("shm_snapshot_t",120,"dim")=2
+	Set gtmtypes("shm_snapshot_t",121,"name")="shm_snapshot_t.shadow_file_header.filler_unixonly"
+	Set gtmtypes("shm_snapshot_t",121,"off")=4704
+	Set gtmtypes("shm_snapshot_t",121,"len")=40
+	Set gtmtypes("shm_snapshot_t",121,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_unixonly")=121
+	Set gtmtypes("shm_snapshot_t",122,"name")="shm_snapshot_t.shadow_file_header.filler_n_retries"
+	Set gtmtypes("shm_snapshot_t",122,"off")=4744
+	Set gtmtypes("shm_snapshot_t",122,"len")=20
 	Set gtmtypes("shm_snapshot_t",122,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_puts")=122
-	Set gtmtypes("shm_snapshot_t",123,"name")="shm_snapshot_t.shadow_file_header.filler_n_kills"
-	Set gtmtypes("shm_snapshot_t",123,"off")=4768
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_retries")=122
+	Set gtmtypes("shm_snapshot_t",122,"dim")=5
+	Set gtmtypes("shm_snapshot_t",123,"name")="shm_snapshot_t.shadow_file_header.filler_n_puts"
+	Set gtmtypes("shm_snapshot_t",123,"off")=4764
 	Set gtmtypes("shm_snapshot_t",123,"len")=4
 	Set gtmtypes("shm_snapshot_t",123,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_kills")=123
-	Set gtmtypes("shm_snapshot_t",124,"name")="shm_snapshot_t.shadow_file_header.filler_n_queries"
-	Set gtmtypes("shm_snapshot_t",124,"off")=4772
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_puts")=123
+	Set gtmtypes("shm_snapshot_t",124,"name")="shm_snapshot_t.shadow_file_header.filler_n_kills"
+	Set gtmtypes("shm_snapshot_t",124,"off")=4768
 	Set gtmtypes("shm_snapshot_t",124,"len")=4
 	Set gtmtypes("shm_snapshot_t",124,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_queries")=124
-	Set gtmtypes("shm_snapshot_t",125,"name")="shm_snapshot_t.shadow_file_header.filler_n_gets"
-	Set gtmtypes("shm_snapshot_t",125,"off")=4776
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_kills")=124
+	Set gtmtypes("shm_snapshot_t",125,"name")="shm_snapshot_t.shadow_file_header.filler_n_queries"
+	Set gtmtypes("shm_snapshot_t",125,"off")=4772
 	Set gtmtypes("shm_snapshot_t",125,"len")=4
 	Set gtmtypes("shm_snapshot_t",125,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_gets")=125
-	Set gtmtypes("shm_snapshot_t",126,"name")="shm_snapshot_t.shadow_file_header.filler_n_order"
-	Set gtmtypes("shm_snapshot_t",126,"off")=4780
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_queries")=125
+	Set gtmtypes("shm_snapshot_t",126,"name")="shm_snapshot_t.shadow_file_header.filler_n_gets"
+	Set gtmtypes("shm_snapshot_t",126,"off")=4776
 	Set gtmtypes("shm_snapshot_t",126,"len")=4
 	Set gtmtypes("shm_snapshot_t",126,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_order")=126
-	Set gtmtypes("shm_snapshot_t",127,"name")="shm_snapshot_t.shadow_file_header.filler_n_zprevs"
-	Set gtmtypes("shm_snapshot_t",127,"off")=4784
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_gets")=126
+	Set gtmtypes("shm_snapshot_t",127,"name")="shm_snapshot_t.shadow_file_header.filler_n_order"
+	Set gtmtypes("shm_snapshot_t",127,"off")=4780
 	Set gtmtypes("shm_snapshot_t",127,"len")=4
 	Set gtmtypes("shm_snapshot_t",127,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_zprevs")=127
-	Set gtmtypes("shm_snapshot_t",128,"name")="shm_snapshot_t.shadow_file_header.filler_n_data"
-	Set gtmtypes("shm_snapshot_t",128,"off")=4788
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_order")=127
+	Set gtmtypes("shm_snapshot_t",128,"name")="shm_snapshot_t.shadow_file_header.filler_n_zprevs"
+	Set gtmtypes("shm_snapshot_t",128,"off")=4784
 	Set gtmtypes("shm_snapshot_t",128,"len")=4
 	Set gtmtypes("shm_snapshot_t",128,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_data")=128
-	Set gtmtypes("shm_snapshot_t",129,"name")="shm_snapshot_t.shadow_file_header.filler_n_puts_duplicate"
-	Set gtmtypes("shm_snapshot_t",129,"off")=4792
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_zprevs")=128
+	Set gtmtypes("shm_snapshot_t",129,"name")="shm_snapshot_t.shadow_file_header.filler_n_data"
+	Set gtmtypes("shm_snapshot_t",129,"off")=4788
 	Set gtmtypes("shm_snapshot_t",129,"len")=4
-	Set gtmtypes("shm_snapshot_t",129,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_puts_duplicate")=129
-	Set gtmtypes("shm_snapshot_t",130,"name")="shm_snapshot_t.shadow_file_header.filler_n_tp_updates"
-	Set gtmtypes("shm_snapshot_t",130,"off")=4796
+	Set gtmtypes("shm_snapshot_t",129,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_data")=129
+	Set gtmtypes("shm_snapshot_t",130,"name")="shm_snapshot_t.shadow_file_header.filler_n_puts_duplicate"
+	Set gtmtypes("shm_snapshot_t",130,"off")=4792
 	Set gtmtypes("shm_snapshot_t",130,"len")=4
 	Set gtmtypes("shm_snapshot_t",130,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_tp_updates")=130
-	Set gtmtypes("shm_snapshot_t",131,"name")="shm_snapshot_t.shadow_file_header.filler_n_tp_updates_duplicate"
-	Set gtmtypes("shm_snapshot_t",131,"off")=4800
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_puts_duplicate")=130
+	Set gtmtypes("shm_snapshot_t",131,"name")="shm_snapshot_t.shadow_file_header.filler_n_tp_updates"
+	Set gtmtypes("shm_snapshot_t",131,"off")=4796
 	Set gtmtypes("shm_snapshot_t",131,"len")=4
 	Set gtmtypes("shm_snapshot_t",131,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_tp_updates_duplicate")=131
-	Set gtmtypes("shm_snapshot_t",132,"name")="shm_snapshot_t.shadow_file_header.filler_accounting_64_align"
-	Set gtmtypes("shm_snapshot_t",132,"off")=4804
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_tp_updates")=131
+	Set gtmtypes("shm_snapshot_t",132,"name")="shm_snapshot_t.shadow_file_header.filler_n_tp_updates_duplicate"
+	Set gtmtypes("shm_snapshot_t",132,"off")=4800
 	Set gtmtypes("shm_snapshot_t",132,"len")=4
-	Set gtmtypes("shm_snapshot_t",132,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_accounting_64_align")=132
-	Set gtmtypes("shm_snapshot_t",133,"name")="shm_snapshot_t.shadow_file_header.staleness"
-	Set gtmtypes("shm_snapshot_t",133,"off")=4808
-	Set gtmtypes("shm_snapshot_t",133,"len")=8
-	Set gtmtypes("shm_snapshot_t",133,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.staleness")=133
-	Set gtmtypes("shm_snapshot_t",133,"dim")=2
-	Set gtmtypes("shm_snapshot_t",134,"name")="shm_snapshot_t.shadow_file_header.ccp_tick_interval"
-	Set gtmtypes("shm_snapshot_t",134,"off")=4816
+	Set gtmtypes("shm_snapshot_t",132,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_tp_updates_duplicate")=132
+	Set gtmtypes("shm_snapshot_t",133,"name")="shm_snapshot_t.shadow_file_header.filler_accounting_64_align"
+	Set gtmtypes("shm_snapshot_t",133,"off")=4804
+	Set gtmtypes("shm_snapshot_t",133,"len")=4
+	Set gtmtypes("shm_snapshot_t",133,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_accounting_64_align")=133
+	Set gtmtypes("shm_snapshot_t",134,"name")="shm_snapshot_t.shadow_file_header.staleness"
+	Set gtmtypes("shm_snapshot_t",134,"off")=4808
 	Set gtmtypes("shm_snapshot_t",134,"len")=8
 	Set gtmtypes("shm_snapshot_t",134,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.ccp_tick_interval")=134
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.staleness")=134
 	Set gtmtypes("shm_snapshot_t",134,"dim")=2
-	Set gtmtypes("shm_snapshot_t",135,"name")="shm_snapshot_t.shadow_file_header.ccp_quantum_interval"
-	Set gtmtypes("shm_snapshot_t",135,"off")=4824
+	Set gtmtypes("shm_snapshot_t",135,"name")="shm_snapshot_t.shadow_file_header.ccp_tick_interval"
+	Set gtmtypes("shm_snapshot_t",135,"off")=4816
 	Set gtmtypes("shm_snapshot_t",135,"len")=8
 	Set gtmtypes("shm_snapshot_t",135,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.ccp_quantum_interval")=135
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.ccp_tick_interval")=135
 	Set gtmtypes("shm_snapshot_t",135,"dim")=2
-	Set gtmtypes("shm_snapshot_t",136,"name")="shm_snapshot_t.shadow_file_header.ccp_response_interval"
-	Set gtmtypes("shm_snapshot_t",136,"off")=4832
+	Set gtmtypes("shm_snapshot_t",136,"name")="shm_snapshot_t.shadow_file_header.ccp_quantum_interval"
+	Set gtmtypes("shm_snapshot_t",136,"off")=4824
 	Set gtmtypes("shm_snapshot_t",136,"len")=8
 	Set gtmtypes("shm_snapshot_t",136,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.ccp_response_interval")=136
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.ccp_quantum_interval")=136
 	Set gtmtypes("shm_snapshot_t",136,"dim")=2
-	Set gtmtypes("shm_snapshot_t",137,"name")="shm_snapshot_t.shadow_file_header.ccp_jnl_before"
-	Set gtmtypes("shm_snapshot_t",137,"off")=4840
-	Set gtmtypes("shm_snapshot_t",137,"len")=4
-	Set gtmtypes("shm_snapshot_t",137,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.ccp_jnl_before")=137
-	Set gtmtypes("shm_snapshot_t",138,"name")="shm_snapshot_t.shadow_file_header.clustered"
-	Set gtmtypes("shm_snapshot_t",138,"off")=4844
+	Set gtmtypes("shm_snapshot_t",137,"name")="shm_snapshot_t.shadow_file_header.ccp_response_interval"
+	Set gtmtypes("shm_snapshot_t",137,"off")=4832
+	Set gtmtypes("shm_snapshot_t",137,"len")=8
+	Set gtmtypes("shm_snapshot_t",137,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.ccp_response_interval")=137
+	Set gtmtypes("shm_snapshot_t",137,"dim")=2
+	Set gtmtypes("shm_snapshot_t",138,"name")="shm_snapshot_t.shadow_file_header.ccp_jnl_before"
+	Set gtmtypes("shm_snapshot_t",138,"off")=4840
 	Set gtmtypes("shm_snapshot_t",138,"len")=4
 	Set gtmtypes("shm_snapshot_t",138,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.clustered")=138
-	Set gtmtypes("shm_snapshot_t",139,"name")="shm_snapshot_t.shadow_file_header.unbacked_cache"
-	Set gtmtypes("shm_snapshot_t",139,"off")=4848
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.ccp_jnl_before")=138
+	Set gtmtypes("shm_snapshot_t",139,"name")="shm_snapshot_t.shadow_file_header.clustered"
+	Set gtmtypes("shm_snapshot_t",139,"off")=4844
 	Set gtmtypes("shm_snapshot_t",139,"len")=4
 	Set gtmtypes("shm_snapshot_t",139,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.unbacked_cache")=139
-	Set gtmtypes("shm_snapshot_t",140,"name")="shm_snapshot_t.shadow_file_header.rc_srv_cnt"
-	Set gtmtypes("shm_snapshot_t",140,"off")=4852
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.clustered")=139
+	Set gtmtypes("shm_snapshot_t",140,"name")="shm_snapshot_t.shadow_file_header.unbacked_cache"
+	Set gtmtypes("shm_snapshot_t",140,"off")=4848
 	Set gtmtypes("shm_snapshot_t",140,"len")=4
-	Set gtmtypes("shm_snapshot_t",140,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.rc_srv_cnt")=140
-	Set gtmtypes("shm_snapshot_t",141,"name")="shm_snapshot_t.shadow_file_header.dsid"
-	Set gtmtypes("shm_snapshot_t",141,"off")=4856
+	Set gtmtypes("shm_snapshot_t",140,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.unbacked_cache")=140
+	Set gtmtypes("shm_snapshot_t",141,"name")="shm_snapshot_t.shadow_file_header.rc_srv_cnt"
+	Set gtmtypes("shm_snapshot_t",141,"off")=4852
 	Set gtmtypes("shm_snapshot_t",141,"len")=4
 	Set gtmtypes("shm_snapshot_t",141,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.dsid")=141
-	Set gtmtypes("shm_snapshot_t",142,"name")="shm_snapshot_t.shadow_file_header.rc_node"
-	Set gtmtypes("shm_snapshot_t",142,"off")=4860
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.rc_srv_cnt")=141
+	Set gtmtypes("shm_snapshot_t",142,"name")="shm_snapshot_t.shadow_file_header.dsid"
+	Set gtmtypes("shm_snapshot_t",142,"off")=4856
 	Set gtmtypes("shm_snapshot_t",142,"len")=4
 	Set gtmtypes("shm_snapshot_t",142,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.rc_node")=142
-	Set gtmtypes("shm_snapshot_t",143,"name")="shm_snapshot_t.shadow_file_header.filler_ccp_rc"
-	Set gtmtypes("shm_snapshot_t",143,"off")=4864
-	Set gtmtypes("shm_snapshot_t",143,"len")=8
-	Set gtmtypes("shm_snapshot_t",143,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_ccp_rc")=143
-	Set gtmtypes("shm_snapshot_t",144,"name")="shm_snapshot_t.shadow_file_header.reg_seqno"
-	Set gtmtypes("shm_snapshot_t",144,"off")=4872
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.dsid")=142
+	Set gtmtypes("shm_snapshot_t",143,"name")="shm_snapshot_t.shadow_file_header.rc_node"
+	Set gtmtypes("shm_snapshot_t",143,"off")=4860
+	Set gtmtypes("shm_snapshot_t",143,"len")=4
+	Set gtmtypes("shm_snapshot_t",143,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.rc_node")=143
+	Set gtmtypes("shm_snapshot_t",144,"name")="shm_snapshot_t.shadow_file_header.filler_ccp_rc"
+	Set gtmtypes("shm_snapshot_t",144,"off")=4864
 	Set gtmtypes("shm_snapshot_t",144,"len")=8
-	Set gtmtypes("shm_snapshot_t",144,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reg_seqno")=144
-	Set gtmtypes("shm_snapshot_t",145,"name")="shm_snapshot_t.shadow_file_header.pre_multisite_resync_seqno"
-	Set gtmtypes("shm_snapshot_t",145,"off")=4880
+	Set gtmtypes("shm_snapshot_t",144,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_ccp_rc")=144
+	Set gtmtypes("shm_snapshot_t",145,"name")="shm_snapshot_t.shadow_file_header.reg_seqno"
+	Set gtmtypes("shm_snapshot_t",145,"off")=4872
 	Set gtmtypes("shm_snapshot_t",145,"len")=8
 	Set gtmtypes("shm_snapshot_t",145,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.pre_multisite_resync_seqno")=145
-	Set gtmtypes("shm_snapshot_t",146,"name")="shm_snapshot_t.shadow_file_header.zqgblmod_tn"
-	Set gtmtypes("shm_snapshot_t",146,"off")=4888
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reg_seqno")=145
+	Set gtmtypes("shm_snapshot_t",146,"name")="shm_snapshot_t.shadow_file_header.pre_multisite_resync_seqno"
+	Set gtmtypes("shm_snapshot_t",146,"off")=4880
 	Set gtmtypes("shm_snapshot_t",146,"len")=8
 	Set gtmtypes("shm_snapshot_t",146,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.zqgblmod_tn")=146
-	Set gtmtypes("shm_snapshot_t",147,"name")="shm_snapshot_t.shadow_file_header.zqgblmod_seqno"
-	Set gtmtypes("shm_snapshot_t",147,"off")=4896
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.pre_multisite_resync_seqno")=146
+	Set gtmtypes("shm_snapshot_t",147,"name")="shm_snapshot_t.shadow_file_header.zqgblmod_tn"
+	Set gtmtypes("shm_snapshot_t",147,"off")=4888
 	Set gtmtypes("shm_snapshot_t",147,"len")=8
 	Set gtmtypes("shm_snapshot_t",147,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.zqgblmod_seqno")=147
-	Set gtmtypes("shm_snapshot_t",148,"name")="shm_snapshot_t.shadow_file_header.repl_state"
-	Set gtmtypes("shm_snapshot_t",148,"off")=4904
-	Set gtmtypes("shm_snapshot_t",148,"len")=4
-	Set gtmtypes("shm_snapshot_t",148,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.repl_state")=148
-	Set gtmtypes("shm_snapshot_t",149,"name")="shm_snapshot_t.shadow_file_header.multi_site_open"
-	Set gtmtypes("shm_snapshot_t",149,"off")=4908
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.zqgblmod_tn")=147
+	Set gtmtypes("shm_snapshot_t",148,"name")="shm_snapshot_t.shadow_file_header.zqgblmod_seqno"
+	Set gtmtypes("shm_snapshot_t",148,"off")=4896
+	Set gtmtypes("shm_snapshot_t",148,"len")=8
+	Set gtmtypes("shm_snapshot_t",148,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.zqgblmod_seqno")=148
+	Set gtmtypes("shm_snapshot_t",149,"name")="shm_snapshot_t.shadow_file_header.repl_state"
+	Set gtmtypes("shm_snapshot_t",149,"off")=4904
 	Set gtmtypes("shm_snapshot_t",149,"len")=4
-	Set gtmtypes("shm_snapshot_t",149,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.multi_site_open")=149
-	Set gtmtypes("shm_snapshot_t",150,"name")="shm_snapshot_t.shadow_file_header.filler_seqno"
-	Set gtmtypes("shm_snapshot_t",150,"off")=4912
-	Set gtmtypes("shm_snapshot_t",150,"len")=8
-	Set gtmtypes("shm_snapshot_t",150,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_seqno")=150
-	Set gtmtypes("shm_snapshot_t",151,"name")="shm_snapshot_t.shadow_file_header.filler_repl"
-	Set gtmtypes("shm_snapshot_t",151,"off")=4920
-	Set gtmtypes("shm_snapshot_t",151,"len")=16
-	Set gtmtypes("shm_snapshot_t",151,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_repl")=151
-	Set gtmtypes("shm_snapshot_t",152,"name")="shm_snapshot_t.shadow_file_header.filler_n_tp_retries"
-	Set gtmtypes("shm_snapshot_t",152,"off")=4936
-	Set gtmtypes("shm_snapshot_t",152,"len")=48
-	Set gtmtypes("shm_snapshot_t",152,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_tp_retries")=152
-	Set gtmtypes("shm_snapshot_t",152,"dim")=12
-	Set gtmtypes("shm_snapshot_t",153,"name")="shm_snapshot_t.shadow_file_header.filler_n_tp_retries_conflicts"
-	Set gtmtypes("shm_snapshot_t",153,"off")=4984
+	Set gtmtypes("shm_snapshot_t",149,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.repl_state")=149
+	Set gtmtypes("shm_snapshot_t",150,"name")="shm_snapshot_t.shadow_file_header.multi_site_open"
+	Set gtmtypes("shm_snapshot_t",150,"off")=4908
+	Set gtmtypes("shm_snapshot_t",150,"len")=4
+	Set gtmtypes("shm_snapshot_t",150,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.multi_site_open")=150
+	Set gtmtypes("shm_snapshot_t",151,"name")="shm_snapshot_t.shadow_file_header.filler_seqno"
+	Set gtmtypes("shm_snapshot_t",151,"off")=4912
+	Set gtmtypes("shm_snapshot_t",151,"len")=8
+	Set gtmtypes("shm_snapshot_t",151,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_seqno")=151
+	Set gtmtypes("shm_snapshot_t",152,"name")="shm_snapshot_t.shadow_file_header.filler_repl"
+	Set gtmtypes("shm_snapshot_t",152,"off")=4920
+	Set gtmtypes("shm_snapshot_t",152,"len")=16
+	Set gtmtypes("shm_snapshot_t",152,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_repl")=152
+	Set gtmtypes("shm_snapshot_t",153,"name")="shm_snapshot_t.shadow_file_header.filler_n_tp_retries"
+	Set gtmtypes("shm_snapshot_t",153,"off")=4936
 	Set gtmtypes("shm_snapshot_t",153,"len")=48
 	Set gtmtypes("shm_snapshot_t",153,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_tp_retries_conflicts")=153
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_tp_retries")=153
 	Set gtmtypes("shm_snapshot_t",153,"dim")=12
-	Set gtmtypes("shm_snapshot_t",154,"name")="shm_snapshot_t.shadow_file_header.tp_cdb_sc_blkmod"
-	Set gtmtypes("shm_snapshot_t",154,"off")=5032
-	Set gtmtypes("shm_snapshot_t",154,"len")=32
+	Set gtmtypes("shm_snapshot_t",154,"name")="shm_snapshot_t.shadow_file_header.filler_n_tp_retries_conflicts"
+	Set gtmtypes("shm_snapshot_t",154,"off")=4984
+	Set gtmtypes("shm_snapshot_t",154,"len")=48
 	Set gtmtypes("shm_snapshot_t",154,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.tp_cdb_sc_blkmod")=154
-	Set gtmtypes("shm_snapshot_t",154,"dim")=8
-	Set gtmtypes("shm_snapshot_t",155,"name")="shm_snapshot_t.shadow_file_header.jnl_alq"
-	Set gtmtypes("shm_snapshot_t",155,"off")=5064
-	Set gtmtypes("shm_snapshot_t",155,"len")=4
-	Set gtmtypes("shm_snapshot_t",155,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_alq")=155
-	Set gtmtypes("shm_snapshot_t",156,"name")="shm_snapshot_t.shadow_file_header.jnl_deq"
-	Set gtmtypes("shm_snapshot_t",156,"off")=5068
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_tp_retries_conflicts")=154
+	Set gtmtypes("shm_snapshot_t",154,"dim")=12
+	Set gtmtypes("shm_snapshot_t",155,"name")="shm_snapshot_t.shadow_file_header.tp_cdb_sc_blkmod"
+	Set gtmtypes("shm_snapshot_t",155,"off")=5032
+	Set gtmtypes("shm_snapshot_t",155,"len")=32
+	Set gtmtypes("shm_snapshot_t",155,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.tp_cdb_sc_blkmod")=155
+	Set gtmtypes("shm_snapshot_t",155,"dim")=8
+	Set gtmtypes("shm_snapshot_t",156,"name")="shm_snapshot_t.shadow_file_header.jnl_alq"
+	Set gtmtypes("shm_snapshot_t",156,"off")=5064
 	Set gtmtypes("shm_snapshot_t",156,"len")=4
 	Set gtmtypes("shm_snapshot_t",156,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_deq")=156
-	Set gtmtypes("shm_snapshot_t",157,"name")="shm_snapshot_t.shadow_file_header.jnl_buffer_size"
-	Set gtmtypes("shm_snapshot_t",157,"off")=5072
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_alq")=156
+	Set gtmtypes("shm_snapshot_t",157,"name")="shm_snapshot_t.shadow_file_header.jnl_deq"
+	Set gtmtypes("shm_snapshot_t",157,"off")=5068
 	Set gtmtypes("shm_snapshot_t",157,"len")=4
-	Set gtmtypes("shm_snapshot_t",157,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_buffer_size")=157
-	Set gtmtypes("shm_snapshot_t",158,"name")="shm_snapshot_t.shadow_file_header.jnl_before_image"
-	Set gtmtypes("shm_snapshot_t",158,"off")=5076
+	Set gtmtypes("shm_snapshot_t",157,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_deq")=157
+	Set gtmtypes("shm_snapshot_t",158,"name")="shm_snapshot_t.shadow_file_header.jnl_buffer_size"
+	Set gtmtypes("shm_snapshot_t",158,"off")=5072
 	Set gtmtypes("shm_snapshot_t",158,"len")=4
-	Set gtmtypes("shm_snapshot_t",158,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_before_image")=158
-	Set gtmtypes("shm_snapshot_t",159,"name")="shm_snapshot_t.shadow_file_header.jnl_state"
-	Set gtmtypes("shm_snapshot_t",159,"off")=5080
+	Set gtmtypes("shm_snapshot_t",158,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_buffer_size")=158
+	Set gtmtypes("shm_snapshot_t",159,"name")="shm_snapshot_t.shadow_file_header.jnl_before_image"
+	Set gtmtypes("shm_snapshot_t",159,"off")=5076
 	Set gtmtypes("shm_snapshot_t",159,"len")=4
-	Set gtmtypes("shm_snapshot_t",159,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_state")=159
-	Set gtmtypes("shm_snapshot_t",160,"name")="shm_snapshot_t.shadow_file_header.jnl_file_len"
-	Set gtmtypes("shm_snapshot_t",160,"off")=5084
+	Set gtmtypes("shm_snapshot_t",159,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_before_image")=159
+	Set gtmtypes("shm_snapshot_t",160,"name")="shm_snapshot_t.shadow_file_header.jnl_state"
+	Set gtmtypes("shm_snapshot_t",160,"off")=5080
 	Set gtmtypes("shm_snapshot_t",160,"len")=4
-	Set gtmtypes("shm_snapshot_t",160,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_file_len")=160
-	Set gtmtypes("shm_snapshot_t",161,"name")="shm_snapshot_t.shadow_file_header.autoswitchlimit"
-	Set gtmtypes("shm_snapshot_t",161,"off")=5088
+	Set gtmtypes("shm_snapshot_t",160,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_state")=160
+	Set gtmtypes("shm_snapshot_t",161,"name")="shm_snapshot_t.shadow_file_header.jnl_file_len"
+	Set gtmtypes("shm_snapshot_t",161,"off")=5084
 	Set gtmtypes("shm_snapshot_t",161,"len")=4
 	Set gtmtypes("shm_snapshot_t",161,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.autoswitchlimit")=161
-	Set gtmtypes("shm_snapshot_t",162,"name")="shm_snapshot_t.shadow_file_header.epoch_interval"
-	Set gtmtypes("shm_snapshot_t",162,"off")=5092
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_file_len")=161
+	Set gtmtypes("shm_snapshot_t",162,"name")="shm_snapshot_t.shadow_file_header.autoswitchlimit"
+	Set gtmtypes("shm_snapshot_t",162,"off")=5088
 	Set gtmtypes("shm_snapshot_t",162,"len")=4
-	Set gtmtypes("shm_snapshot_t",162,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.epoch_interval")=162
-	Set gtmtypes("shm_snapshot_t",163,"name")="shm_snapshot_t.shadow_file_header.alignsize"
-	Set gtmtypes("shm_snapshot_t",163,"off")=5096
+	Set gtmtypes("shm_snapshot_t",162,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.autoswitchlimit")=162
+	Set gtmtypes("shm_snapshot_t",163,"name")="shm_snapshot_t.shadow_file_header.epoch_interval"
+	Set gtmtypes("shm_snapshot_t",163,"off")=5092
 	Set gtmtypes("shm_snapshot_t",163,"len")=4
-	Set gtmtypes("shm_snapshot_t",163,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.alignsize")=163
-	Set gtmtypes("shm_snapshot_t",164,"name")="shm_snapshot_t.shadow_file_header.jnl_sync_io"
-	Set gtmtypes("shm_snapshot_t",164,"off")=5100
+	Set gtmtypes("shm_snapshot_t",163,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.epoch_interval")=163
+	Set gtmtypes("shm_snapshot_t",164,"name")="shm_snapshot_t.shadow_file_header.alignsize"
+	Set gtmtypes("shm_snapshot_t",164,"off")=5096
 	Set gtmtypes("shm_snapshot_t",164,"len")=4
-	Set gtmtypes("shm_snapshot_t",164,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_sync_io")=164
-	Set gtmtypes("shm_snapshot_t",165,"name")="shm_snapshot_t.shadow_file_header.yield_lmt"
-	Set gtmtypes("shm_snapshot_t",165,"off")=5104
+	Set gtmtypes("shm_snapshot_t",164,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.alignsize")=164
+	Set gtmtypes("shm_snapshot_t",165,"name")="shm_snapshot_t.shadow_file_header.jnl_sync_io"
+	Set gtmtypes("shm_snapshot_t",165,"off")=5100
 	Set gtmtypes("shm_snapshot_t",165,"len")=4
 	Set gtmtypes("shm_snapshot_t",165,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.yield_lmt")=165
-	Set gtmtypes("shm_snapshot_t",166,"name")="shm_snapshot_t.shadow_file_header.turn_around_point"
-	Set gtmtypes("shm_snapshot_t",166,"off")=5108
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_sync_io")=165
+	Set gtmtypes("shm_snapshot_t",166,"name")="shm_snapshot_t.shadow_file_header.yield_lmt"
+	Set gtmtypes("shm_snapshot_t",166,"off")=5104
 	Set gtmtypes("shm_snapshot_t",166,"len")=4
-	Set gtmtypes("shm_snapshot_t",166,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.turn_around_point")=166
-	Set gtmtypes("shm_snapshot_t",167,"name")="shm_snapshot_t.shadow_file_header.jnl_eovtn"
-	Set gtmtypes("shm_snapshot_t",167,"off")=5112
-	Set gtmtypes("shm_snapshot_t",167,"len")=8
-	Set gtmtypes("shm_snapshot_t",167,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_eovtn")=167
-	Set gtmtypes("shm_snapshot_t",168,"name")="shm_snapshot_t.shadow_file_header.filler_jnl"
-	Set gtmtypes("shm_snapshot_t",168,"off")=5120
+	Set gtmtypes("shm_snapshot_t",166,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.yield_lmt")=166
+	Set gtmtypes("shm_snapshot_t",167,"name")="shm_snapshot_t.shadow_file_header.turn_around_point"
+	Set gtmtypes("shm_snapshot_t",167,"off")=5108
+	Set gtmtypes("shm_snapshot_t",167,"len")=4
+	Set gtmtypes("shm_snapshot_t",167,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.turn_around_point")=167
+	Set gtmtypes("shm_snapshot_t",168,"name")="shm_snapshot_t.shadow_file_header.jnl_eovtn"
+	Set gtmtypes("shm_snapshot_t",168,"off")=5112
 	Set gtmtypes("shm_snapshot_t",168,"len")=8
-	Set gtmtypes("shm_snapshot_t",168,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_jnl")=168
-	Set gtmtypes("shm_snapshot_t",169,"name")="shm_snapshot_t.shadow_file_header.intrpt_recov_resync_seqno"
-	Set gtmtypes("shm_snapshot_t",169,"off")=5128
+	Set gtmtypes("shm_snapshot_t",168,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_eovtn")=168
+	Set gtmtypes("shm_snapshot_t",169,"name")="shm_snapshot_t.shadow_file_header.filler_jnl"
+	Set gtmtypes("shm_snapshot_t",169,"off")=5120
 	Set gtmtypes("shm_snapshot_t",169,"len")=8
-	Set gtmtypes("shm_snapshot_t",169,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.intrpt_recov_resync_seqno")=169
-	Set gtmtypes("shm_snapshot_t",170,"name")="shm_snapshot_t.shadow_file_header.intrpt_recov_tp_resolve_time"
-	Set gtmtypes("shm_snapshot_t",170,"off")=5136
-	Set gtmtypes("shm_snapshot_t",170,"len")=4
-	Set gtmtypes("shm_snapshot_t",170,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.intrpt_recov_tp_resolve_time")=170
-	Set gtmtypes("shm_snapshot_t",171,"name")="shm_snapshot_t.shadow_file_header.recov_interrupted"
-	Set gtmtypes("shm_snapshot_t",171,"off")=5140
+	Set gtmtypes("shm_snapshot_t",169,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_jnl")=169
+	Set gtmtypes("shm_snapshot_t",170,"name")="shm_snapshot_t.shadow_file_header.intrpt_recov_resync_seqno"
+	Set gtmtypes("shm_snapshot_t",170,"off")=5128
+	Set gtmtypes("shm_snapshot_t",170,"len")=8
+	Set gtmtypes("shm_snapshot_t",170,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.intrpt_recov_resync_seqno")=170
+	Set gtmtypes("shm_snapshot_t",171,"name")="shm_snapshot_t.shadow_file_header.intrpt_recov_tp_resolve_time"
+	Set gtmtypes("shm_snapshot_t",171,"off")=5136
 	Set gtmtypes("shm_snapshot_t",171,"len")=4
-	Set gtmtypes("shm_snapshot_t",171,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recov_interrupted")=171
-	Set gtmtypes("shm_snapshot_t",172,"name")="shm_snapshot_t.shadow_file_header.intrpt_recov_jnl_state"
-	Set gtmtypes("shm_snapshot_t",172,"off")=5144
+	Set gtmtypes("shm_snapshot_t",171,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.intrpt_recov_tp_resolve_time")=171
+	Set gtmtypes("shm_snapshot_t",172,"name")="shm_snapshot_t.shadow_file_header.recov_interrupted"
+	Set gtmtypes("shm_snapshot_t",172,"off")=5140
 	Set gtmtypes("shm_snapshot_t",172,"len")=4
-	Set gtmtypes("shm_snapshot_t",172,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.intrpt_recov_jnl_state")=172
-	Set gtmtypes("shm_snapshot_t",173,"name")="shm_snapshot_t.shadow_file_header.intrpt_recov_repl_state"
-	Set gtmtypes("shm_snapshot_t",173,"off")=5148
+	Set gtmtypes("shm_snapshot_t",172,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recov_interrupted")=172
+	Set gtmtypes("shm_snapshot_t",173,"name")="shm_snapshot_t.shadow_file_header.intrpt_recov_jnl_state"
+	Set gtmtypes("shm_snapshot_t",173,"off")=5144
 	Set gtmtypes("shm_snapshot_t",173,"len")=4
 	Set gtmtypes("shm_snapshot_t",173,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.intrpt_recov_repl_state")=173
-	Set gtmtypes("shm_snapshot_t",174,"name")="shm_snapshot_t.shadow_file_header.before_trunc_total_blks"
-	Set gtmtypes("shm_snapshot_t",174,"off")=5152
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.intrpt_recov_jnl_state")=173
+	Set gtmtypes("shm_snapshot_t",174,"name")="shm_snapshot_t.shadow_file_header.intrpt_recov_repl_state"
+	Set gtmtypes("shm_snapshot_t",174,"off")=5148
 	Set gtmtypes("shm_snapshot_t",174,"len")=4
-	Set gtmtypes("shm_snapshot_t",174,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.before_trunc_total_blks")=174
-	Set gtmtypes("shm_snapshot_t",175,"name")="shm_snapshot_t.shadow_file_header.after_trunc_total_blks"
-	Set gtmtypes("shm_snapshot_t",175,"off")=5156
+	Set gtmtypes("shm_snapshot_t",174,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.intrpt_recov_repl_state")=174
+	Set gtmtypes("shm_snapshot_t",175,"name")="shm_snapshot_t.shadow_file_header.before_trunc_total_blks"
+	Set gtmtypes("shm_snapshot_t",175,"off")=5152
 	Set gtmtypes("shm_snapshot_t",175,"len")=4
 	Set gtmtypes("shm_snapshot_t",175,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.after_trunc_total_blks")=175
-	Set gtmtypes("shm_snapshot_t",176,"name")="shm_snapshot_t.shadow_file_header.before_trunc_free_blocks"
-	Set gtmtypes("shm_snapshot_t",176,"off")=5160
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.before_trunc_total_blks")=175
+	Set gtmtypes("shm_snapshot_t",176,"name")="shm_snapshot_t.shadow_file_header.after_trunc_total_blks"
+	Set gtmtypes("shm_snapshot_t",176,"off")=5156
 	Set gtmtypes("shm_snapshot_t",176,"len")=4
 	Set gtmtypes("shm_snapshot_t",176,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.before_trunc_free_blocks")=176
-	Set gtmtypes("shm_snapshot_t",177,"name")="shm_snapshot_t.shadow_file_header.filler_trunc"
-	Set gtmtypes("shm_snapshot_t",177,"off")=5164
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.after_trunc_total_blks")=176
+	Set gtmtypes("shm_snapshot_t",177,"name")="shm_snapshot_t.shadow_file_header.before_trunc_free_blocks"
+	Set gtmtypes("shm_snapshot_t",177,"off")=5160
 	Set gtmtypes("shm_snapshot_t",177,"len")=4
 	Set gtmtypes("shm_snapshot_t",177,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_trunc")=177
-	Set gtmtypes("shm_snapshot_t",178,"name")="shm_snapshot_t.shadow_file_header.filler_1k"
-	Set gtmtypes("shm_snapshot_t",178,"off")=5168
-	Set gtmtypes("shm_snapshot_t",178,"len")=24
-	Set gtmtypes("shm_snapshot_t",178,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_1k")=178
-	Set gtmtypes("shm_snapshot_t",179,"name")="shm_snapshot_t.shadow_file_header.jnl_file_name"
-	Set gtmtypes("shm_snapshot_t",179,"off")=5192
-	Set gtmtypes("shm_snapshot_t",179,"len")=256
-	Set gtmtypes("shm_snapshot_t",179,"type")="unsigned-char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_file_name")=179
-	Set gtmtypes("shm_snapshot_t",180,"name")="shm_snapshot_t.shadow_file_header.reorg_restart_key"
-	Set gtmtypes("shm_snapshot_t",180,"off")=5448
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.before_trunc_free_blocks")=177
+	Set gtmtypes("shm_snapshot_t",178,"name")="shm_snapshot_t.shadow_file_header.filler_trunc"
+	Set gtmtypes("shm_snapshot_t",178,"off")=5164
+	Set gtmtypes("shm_snapshot_t",178,"len")=4
+	Set gtmtypes("shm_snapshot_t",178,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_trunc")=178
+	Set gtmtypes("shm_snapshot_t",179,"name")="shm_snapshot_t.shadow_file_header.filler_1k"
+	Set gtmtypes("shm_snapshot_t",179,"off")=5168
+	Set gtmtypes("shm_snapshot_t",179,"len")=24
+	Set gtmtypes("shm_snapshot_t",179,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_1k")=179
+	Set gtmtypes("shm_snapshot_t",180,"name")="shm_snapshot_t.shadow_file_header.jnl_file_name"
+	Set gtmtypes("shm_snapshot_t",180,"off")=5192
 	Set gtmtypes("shm_snapshot_t",180,"len")=256
 	Set gtmtypes("shm_snapshot_t",180,"type")="unsigned-char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reorg_restart_key")=180
-	Set gtmtypes("shm_snapshot_t",181,"name")="shm_snapshot_t.shadow_file_header.machine_name"
-	Set gtmtypes("shm_snapshot_t",181,"off")=5704
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_file_name")=180
+	Set gtmtypes("shm_snapshot_t",181,"name")="shm_snapshot_t.shadow_file_header.reorg_restart_key"
+	Set gtmtypes("shm_snapshot_t",181,"off")=5448
 	Set gtmtypes("shm_snapshot_t",181,"len")=256
-	Set gtmtypes("shm_snapshot_t",181,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.machine_name")=181
-	Set gtmtypes("shm_snapshot_t",182,"name")="shm_snapshot_t.shadow_file_header.encryption_hash"
-	Set gtmtypes("shm_snapshot_t",182,"off")=5960
-	Set gtmtypes("shm_snapshot_t",182,"len")=80
+	Set gtmtypes("shm_snapshot_t",181,"type")="unsigned-char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reorg_restart_key")=181
+	Set gtmtypes("shm_snapshot_t",182,"name")="shm_snapshot_t.shadow_file_header.machine_name"
+	Set gtmtypes("shm_snapshot_t",182,"off")=5704
+	Set gtmtypes("shm_snapshot_t",182,"len")=256
 	Set gtmtypes("shm_snapshot_t",182,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.encryption_hash")=182
-	Set gtmtypes("shm_snapshot_t",183,"name")="shm_snapshot_t.shadow_file_header.encryption_hash2"
-	Set gtmtypes("shm_snapshot_t",183,"off")=6040
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.machine_name")=182
+	Set gtmtypes("shm_snapshot_t",183,"name")="shm_snapshot_t.shadow_file_header.encryption_hash"
+	Set gtmtypes("shm_snapshot_t",183,"off")=5960
 	Set gtmtypes("shm_snapshot_t",183,"len")=80
 	Set gtmtypes("shm_snapshot_t",183,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.encryption_hash2")=183
-	Set gtmtypes("shm_snapshot_t",184,"name")="shm_snapshot_t.shadow_file_header.non_null_iv"
-	Set gtmtypes("shm_snapshot_t",184,"off")=6120
-	Set gtmtypes("shm_snapshot_t",184,"len")=4
-	Set gtmtypes("shm_snapshot_t",184,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.non_null_iv")=184
-	Set gtmtypes("shm_snapshot_t",185,"name")="shm_snapshot_t.shadow_file_header.encryption_hash_cutoff"
-	Set gtmtypes("shm_snapshot_t",185,"off")=6124
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.encryption_hash")=183
+	Set gtmtypes("shm_snapshot_t",184,"name")="shm_snapshot_t.shadow_file_header.encryption_hash2"
+	Set gtmtypes("shm_snapshot_t",184,"off")=6040
+	Set gtmtypes("shm_snapshot_t",184,"len")=80
+	Set gtmtypes("shm_snapshot_t",184,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.encryption_hash2")=184
+	Set gtmtypes("shm_snapshot_t",185,"name")="shm_snapshot_t.shadow_file_header.non_null_iv"
+	Set gtmtypes("shm_snapshot_t",185,"off")=6120
 	Set gtmtypes("shm_snapshot_t",185,"len")=4
-	Set gtmtypes("shm_snapshot_t",185,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.encryption_hash_cutoff")=185
-	Set gtmtypes("shm_snapshot_t",186,"name")="shm_snapshot_t.shadow_file_header.encryption_hash2_start_tn"
-	Set gtmtypes("shm_snapshot_t",186,"off")=6128
-	Set gtmtypes("shm_snapshot_t",186,"len")=8
-	Set gtmtypes("shm_snapshot_t",186,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.encryption_hash2_start_tn")=186
-	Set gtmtypes("shm_snapshot_t",187,"name")="shm_snapshot_t.shadow_file_header.filler_encrypt"
-	Set gtmtypes("shm_snapshot_t",187,"off")=6136
-	Set gtmtypes("shm_snapshot_t",187,"len")=80
-	Set gtmtypes("shm_snapshot_t",187,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_encrypt")=187
-	Set gtmtypes("shm_snapshot_t",188,"name")="shm_snapshot_t.shadow_file_header.total_buffer_flush_tn"
-	Set gtmtypes("shm_snapshot_t",188,"off")=6216
-	Set gtmtypes("shm_snapshot_t",188,"len")=8
-	Set gtmtypes("shm_snapshot_t",188,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.total_buffer_flush_tn")=188
-	Set gtmtypes("shm_snapshot_t",189,"name")="shm_snapshot_t.shadow_file_header.bufct_buffer_flush_tn"
-	Set gtmtypes("shm_snapshot_t",189,"off")=6224
+	Set gtmtypes("shm_snapshot_t",185,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.non_null_iv")=185
+	Set gtmtypes("shm_snapshot_t",186,"name")="shm_snapshot_t.shadow_file_header.encryption_hash_cutoff"
+	Set gtmtypes("shm_snapshot_t",186,"off")=6124
+	Set gtmtypes("shm_snapshot_t",186,"len")=4
+	Set gtmtypes("shm_snapshot_t",186,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.encryption_hash_cutoff")=186
+	Set gtmtypes("shm_snapshot_t",187,"name")="shm_snapshot_t.shadow_file_header.encryption_hash2_start_tn"
+	Set gtmtypes("shm_snapshot_t",187,"off")=6128
+	Set gtmtypes("shm_snapshot_t",187,"len")=8
+	Set gtmtypes("shm_snapshot_t",187,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.encryption_hash2_start_tn")=187
+	Set gtmtypes("shm_snapshot_t",188,"name")="shm_snapshot_t.shadow_file_header.filler_encrypt"
+	Set gtmtypes("shm_snapshot_t",188,"off")=6136
+	Set gtmtypes("shm_snapshot_t",188,"len")=80
+	Set gtmtypes("shm_snapshot_t",188,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_encrypt")=188
+	Set gtmtypes("shm_snapshot_t",189,"name")="shm_snapshot_t.shadow_file_header.total_buffer_flush_tn"
+	Set gtmtypes("shm_snapshot_t",189,"off")=6216
 	Set gtmtypes("shm_snapshot_t",189,"len")=8
 	Set gtmtypes("shm_snapshot_t",189,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bufct_buffer_flush_tn")=189
-	Set gtmtypes("shm_snapshot_t",190,"name")="shm_snapshot_t.shadow_file_header.bufct_buffer_flush_loop_tn"
-	Set gtmtypes("shm_snapshot_t",190,"off")=6232
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.total_buffer_flush_tn")=189
+	Set gtmtypes("shm_snapshot_t",190,"name")="shm_snapshot_t.shadow_file_header.bufct_buffer_flush_tn"
+	Set gtmtypes("shm_snapshot_t",190,"off")=6224
 	Set gtmtypes("shm_snapshot_t",190,"len")=8
 	Set gtmtypes("shm_snapshot_t",190,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bufct_buffer_flush_loop_tn")=190
-	Set gtmtypes("shm_snapshot_t",191,"name")="shm_snapshot_t.shadow_file_header.wrt_calls_tn"
-	Set gtmtypes("shm_snapshot_t",191,"off")=6240
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bufct_buffer_flush_tn")=190
+	Set gtmtypes("shm_snapshot_t",191,"name")="shm_snapshot_t.shadow_file_header.bufct_buffer_flush_loop_tn"
+	Set gtmtypes("shm_snapshot_t",191,"off")=6232
 	Set gtmtypes("shm_snapshot_t",191,"len")=8
 	Set gtmtypes("shm_snapshot_t",191,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_calls_tn")=191
-	Set gtmtypes("shm_snapshot_t",192,"name")="shm_snapshot_t.shadow_file_header.wrt_count_tn"
-	Set gtmtypes("shm_snapshot_t",192,"off")=6248
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bufct_buffer_flush_loop_tn")=191
+	Set gtmtypes("shm_snapshot_t",192,"name")="shm_snapshot_t.shadow_file_header.wrt_calls_tn"
+	Set gtmtypes("shm_snapshot_t",192,"off")=6240
 	Set gtmtypes("shm_snapshot_t",192,"len")=8
 	Set gtmtypes("shm_snapshot_t",192,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_count_tn")=192
-	Set gtmtypes("shm_snapshot_t",193,"name")="shm_snapshot_t.shadow_file_header.wrt_blocked_tn"
-	Set gtmtypes("shm_snapshot_t",193,"off")=6256
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_calls_tn")=192
+	Set gtmtypes("shm_snapshot_t",193,"name")="shm_snapshot_t.shadow_file_header.wrt_count_tn"
+	Set gtmtypes("shm_snapshot_t",193,"off")=6248
 	Set gtmtypes("shm_snapshot_t",193,"len")=8
 	Set gtmtypes("shm_snapshot_t",193,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_blocked_tn")=193
-	Set gtmtypes("shm_snapshot_t",194,"name")="shm_snapshot_t.shadow_file_header.wrt_busy_tn"
-	Set gtmtypes("shm_snapshot_t",194,"off")=6264
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_count_tn")=193
+	Set gtmtypes("shm_snapshot_t",194,"name")="shm_snapshot_t.shadow_file_header.wrt_blocked_tn"
+	Set gtmtypes("shm_snapshot_t",194,"off")=6256
 	Set gtmtypes("shm_snapshot_t",194,"len")=8
 	Set gtmtypes("shm_snapshot_t",194,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_busy_tn")=194
-	Set gtmtypes("shm_snapshot_t",195,"name")="shm_snapshot_t.shadow_file_header.wrt_noblks_wrtn_tn"
-	Set gtmtypes("shm_snapshot_t",195,"off")=6272
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_blocked_tn")=194
+	Set gtmtypes("shm_snapshot_t",195,"name")="shm_snapshot_t.shadow_file_header.wrt_busy_tn"
+	Set gtmtypes("shm_snapshot_t",195,"off")=6264
 	Set gtmtypes("shm_snapshot_t",195,"len")=8
 	Set gtmtypes("shm_snapshot_t",195,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_noblks_wrtn_tn")=195
-	Set gtmtypes("shm_snapshot_t",196,"name")="shm_snapshot_t.shadow_file_header.reserved_bgtrcrec1_tn"
-	Set gtmtypes("shm_snapshot_t",196,"off")=6280
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_busy_tn")=195
+	Set gtmtypes("shm_snapshot_t",196,"name")="shm_snapshot_t.shadow_file_header.wrt_noblks_wrtn_tn"
+	Set gtmtypes("shm_snapshot_t",196,"off")=6272
 	Set gtmtypes("shm_snapshot_t",196,"len")=8
 	Set gtmtypes("shm_snapshot_t",196,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reserved_bgtrcrec1_tn")=196
-	Set gtmtypes("shm_snapshot_t",197,"name")="shm_snapshot_t.shadow_file_header.reserved_bgtrcrec2_tn"
-	Set gtmtypes("shm_snapshot_t",197,"off")=6288
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_noblks_wrtn_tn")=196
+	Set gtmtypes("shm_snapshot_t",197,"name")="shm_snapshot_t.shadow_file_header.reserved_bgtrcrec1_tn"
+	Set gtmtypes("shm_snapshot_t",197,"off")=6280
 	Set gtmtypes("shm_snapshot_t",197,"len")=8
 	Set gtmtypes("shm_snapshot_t",197,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reserved_bgtrcrec2_tn")=197
-	Set gtmtypes("shm_snapshot_t",198,"name")="shm_snapshot_t.shadow_file_header.reserved_bgtrcrec3_tn"
-	Set gtmtypes("shm_snapshot_t",198,"off")=6296
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reserved_bgtrcrec1_tn")=197
+	Set gtmtypes("shm_snapshot_t",198,"name")="shm_snapshot_t.shadow_file_header.reserved_bgtrcrec2_tn"
+	Set gtmtypes("shm_snapshot_t",198,"off")=6288
 	Set gtmtypes("shm_snapshot_t",198,"len")=8
 	Set gtmtypes("shm_snapshot_t",198,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reserved_bgtrcrec3_tn")=198
-	Set gtmtypes("shm_snapshot_t",199,"name")="shm_snapshot_t.shadow_file_header.lost_block_recovery_tn"
-	Set gtmtypes("shm_snapshot_t",199,"off")=6304
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reserved_bgtrcrec2_tn")=198
+	Set gtmtypes("shm_snapshot_t",199,"name")="shm_snapshot_t.shadow_file_header.reserved_bgtrcrec3_tn"
+	Set gtmtypes("shm_snapshot_t",199,"off")=6296
 	Set gtmtypes("shm_snapshot_t",199,"len")=8
 	Set gtmtypes("shm_snapshot_t",199,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.lost_block_recovery_tn")=199
-	Set gtmtypes("shm_snapshot_t",200,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_onln_rlbk_tn"
-	Set gtmtypes("shm_snapshot_t",200,"off")=6312
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reserved_bgtrcrec3_tn")=199
+	Set gtmtypes("shm_snapshot_t",200,"name")="shm_snapshot_t.shadow_file_header.lost_block_recovery_tn"
+	Set gtmtypes("shm_snapshot_t",200,"off")=6304
 	Set gtmtypes("shm_snapshot_t",200,"len")=8
 	Set gtmtypes("shm_snapshot_t",200,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_onln_rlbk_tn")=200
-	Set gtmtypes("shm_snapshot_t",201,"name")="shm_snapshot_t.shadow_file_header.stale_tn"
-	Set gtmtypes("shm_snapshot_t",201,"off")=6320
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.lost_block_recovery_tn")=200
+	Set gtmtypes("shm_snapshot_t",201,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_onln_rlbk_tn"
+	Set gtmtypes("shm_snapshot_t",201,"off")=6312
 	Set gtmtypes("shm_snapshot_t",201,"len")=8
 	Set gtmtypes("shm_snapshot_t",201,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_tn")=201
-	Set gtmtypes("shm_snapshot_t",202,"name")="shm_snapshot_t.shadow_file_header.starved_tn"
-	Set gtmtypes("shm_snapshot_t",202,"off")=6328
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_onln_rlbk_tn")=201
+	Set gtmtypes("shm_snapshot_t",202,"name")="shm_snapshot_t.shadow_file_header.stale_tn"
+	Set gtmtypes("shm_snapshot_t",202,"off")=6320
 	Set gtmtypes("shm_snapshot_t",202,"len")=8
 	Set gtmtypes("shm_snapshot_t",202,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.starved_tn")=202
-	Set gtmtypes("shm_snapshot_t",203,"name")="shm_snapshot_t.shadow_file_header.stale_timer_started_tn"
-	Set gtmtypes("shm_snapshot_t",203,"off")=6336
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_tn")=202
+	Set gtmtypes("shm_snapshot_t",203,"name")="shm_snapshot_t.shadow_file_header.starved_tn"
+	Set gtmtypes("shm_snapshot_t",203,"off")=6328
 	Set gtmtypes("shm_snapshot_t",203,"len")=8
 	Set gtmtypes("shm_snapshot_t",203,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_timer_started_tn")=203
-	Set gtmtypes("shm_snapshot_t",204,"name")="shm_snapshot_t.shadow_file_header.stale_timer_pop_tn"
-	Set gtmtypes("shm_snapshot_t",204,"off")=6344
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.starved_tn")=203
+	Set gtmtypes("shm_snapshot_t",204,"name")="shm_snapshot_t.shadow_file_header.stale_timer_started_tn"
+	Set gtmtypes("shm_snapshot_t",204,"off")=6336
 	Set gtmtypes("shm_snapshot_t",204,"len")=8
 	Set gtmtypes("shm_snapshot_t",204,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_timer_pop_tn")=204
-	Set gtmtypes("shm_snapshot_t",205,"name")="shm_snapshot_t.shadow_file_header.stale_process_defer_tn"
-	Set gtmtypes("shm_snapshot_t",205,"off")=6352
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_timer_started_tn")=204
+	Set gtmtypes("shm_snapshot_t",205,"name")="shm_snapshot_t.shadow_file_header.stale_timer_pop_tn"
+	Set gtmtypes("shm_snapshot_t",205,"off")=6344
 	Set gtmtypes("shm_snapshot_t",205,"len")=8
 	Set gtmtypes("shm_snapshot_t",205,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_process_defer_tn")=205
-	Set gtmtypes("shm_snapshot_t",206,"name")="shm_snapshot_t.shadow_file_header.stale_defer_processed_tn"
-	Set gtmtypes("shm_snapshot_t",206,"off")=6360
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_timer_pop_tn")=205
+	Set gtmtypes("shm_snapshot_t",206,"name")="shm_snapshot_t.shadow_file_header.stale_process_defer_tn"
+	Set gtmtypes("shm_snapshot_t",206,"off")=6352
 	Set gtmtypes("shm_snapshot_t",206,"len")=8
 	Set gtmtypes("shm_snapshot_t",206,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_defer_processed_tn")=206
-	Set gtmtypes("shm_snapshot_t",207,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flush_tn"
-	Set gtmtypes("shm_snapshot_t",207,"off")=6368
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_process_defer_tn")=206
+	Set gtmtypes("shm_snapshot_t",207,"name")="shm_snapshot_t.shadow_file_header.stale_defer_processed_tn"
+	Set gtmtypes("shm_snapshot_t",207,"off")=6360
 	Set gtmtypes("shm_snapshot_t",207,"len")=8
 	Set gtmtypes("shm_snapshot_t",207,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flush_tn")=207
-	Set gtmtypes("shm_snapshot_t",208,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flush_loop_tn"
-	Set gtmtypes("shm_snapshot_t",208,"off")=6376
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_defer_processed_tn")=207
+	Set gtmtypes("shm_snapshot_t",208,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flush_tn"
+	Set gtmtypes("shm_snapshot_t",208,"off")=6368
 	Set gtmtypes("shm_snapshot_t",208,"len")=8
 	Set gtmtypes("shm_snapshot_t",208,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flush_loop_tn")=208
-	Set gtmtypes("shm_snapshot_t",209,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flush_retries_tn"
-	Set gtmtypes("shm_snapshot_t",209,"off")=6384
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flush_tn")=208
+	Set gtmtypes("shm_snapshot_t",209,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flush_loop_tn"
+	Set gtmtypes("shm_snapshot_t",209,"off")=6376
 	Set gtmtypes("shm_snapshot_t",209,"len")=8
 	Set gtmtypes("shm_snapshot_t",209,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flush_retries_tn")=209
-	Set gtmtypes("shm_snapshot_t",210,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flushed_during_lockwait_tn"
-	Set gtmtypes("shm_snapshot_t",210,"off")=6392
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flush_loop_tn")=209
+	Set gtmtypes("shm_snapshot_t",210,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flush_retries_tn"
+	Set gtmtypes("shm_snapshot_t",210,"off")=6384
 	Set gtmtypes("shm_snapshot_t",210,"len")=8
 	Set gtmtypes("shm_snapshot_t",210,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flushed_during_lockwait_tn")=210
-	Set gtmtypes("shm_snapshot_t",211,"name")="shm_snapshot_t.shadow_file_header.tp_crit_retries_tn"
-	Set gtmtypes("shm_snapshot_t",211,"off")=6400
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flush_retries_tn")=210
+	Set gtmtypes("shm_snapshot_t",211,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flushed_during_lockwait_tn"
+	Set gtmtypes("shm_snapshot_t",211,"off")=6392
 	Set gtmtypes("shm_snapshot_t",211,"len")=8
 	Set gtmtypes("shm_snapshot_t",211,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.tp_crit_retries_tn")=211
-	Set gtmtypes("shm_snapshot_t",212,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_flush_dirty_tn"
-	Set gtmtypes("shm_snapshot_t",212,"off")=6408
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flushed_during_lockwait_tn")=211
+	Set gtmtypes("shm_snapshot_t",212,"name")="shm_snapshot_t.shadow_file_header.tp_crit_retries_tn"
+	Set gtmtypes("shm_snapshot_t",212,"off")=6400
 	Set gtmtypes("shm_snapshot_t",212,"len")=8
 	Set gtmtypes("shm_snapshot_t",212,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_flush_dirty_tn")=212
-	Set gtmtypes("shm_snapshot_t",213,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_rip_wait_tn"
-	Set gtmtypes("shm_snapshot_t",213,"off")=6416
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.tp_crit_retries_tn")=212
+	Set gtmtypes("shm_snapshot_t",213,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_flush_dirty_tn"
+	Set gtmtypes("shm_snapshot_t",213,"off")=6408
 	Set gtmtypes("shm_snapshot_t",213,"len")=8
 	Set gtmtypes("shm_snapshot_t",213,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_rip_wait_tn")=213
-	Set gtmtypes("shm_snapshot_t",214,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_buf_owner_stuck_tn"
-	Set gtmtypes("shm_snapshot_t",214,"off")=6424
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_flush_dirty_tn")=213
+	Set gtmtypes("shm_snapshot_t",214,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_rip_wait_tn"
+	Set gtmtypes("shm_snapshot_t",214,"off")=6416
 	Set gtmtypes("shm_snapshot_t",214,"len")=8
 	Set gtmtypes("shm_snapshot_t",214,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_buf_owner_stuck_tn")=214
-	Set gtmtypes("shm_snapshot_t",215,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_out_of_design_tn"
-	Set gtmtypes("shm_snapshot_t",215,"off")=6432
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_rip_wait_tn")=214
+	Set gtmtypes("shm_snapshot_t",215,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_buf_owner_stuck_tn"
+	Set gtmtypes("shm_snapshot_t",215,"off")=6424
 	Set gtmtypes("shm_snapshot_t",215,"len")=8
 	Set gtmtypes("shm_snapshot_t",215,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_out_of_design_tn")=215
-	Set gtmtypes("shm_snapshot_t",216,"name")="shm_snapshot_t.shadow_file_header.t_qread_buf_owner_stuck_tn"
-	Set gtmtypes("shm_snapshot_t",216,"off")=6440
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_buf_owner_stuck_tn")=215
+	Set gtmtypes("shm_snapshot_t",216,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_out_of_design_tn"
+	Set gtmtypes("shm_snapshot_t",216,"off")=6432
 	Set gtmtypes("shm_snapshot_t",216,"len")=8
 	Set gtmtypes("shm_snapshot_t",216,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_buf_owner_stuck_tn")=216
-	Set gtmtypes("shm_snapshot_t",217,"name")="shm_snapshot_t.shadow_file_header.t_qread_out_of_design_tn"
-	Set gtmtypes("shm_snapshot_t",217,"off")=6448
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_out_of_design_tn")=216
+	Set gtmtypes("shm_snapshot_t",217,"name")="shm_snapshot_t.shadow_file_header.t_qread_buf_owner_stuck_tn"
+	Set gtmtypes("shm_snapshot_t",217,"off")=6440
 	Set gtmtypes("shm_snapshot_t",217,"len")=8
 	Set gtmtypes("shm_snapshot_t",217,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_out_of_design_tn")=217
-	Set gtmtypes("shm_snapshot_t",218,"name")="shm_snapshot_t.shadow_file_header.bt_put_flush_dirty_tn"
-	Set gtmtypes("shm_snapshot_t",218,"off")=6456
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_buf_owner_stuck_tn")=217
+	Set gtmtypes("shm_snapshot_t",218,"name")="shm_snapshot_t.shadow_file_header.t_qread_out_of_design_tn"
+	Set gtmtypes("shm_snapshot_t",218,"off")=6448
 	Set gtmtypes("shm_snapshot_t",218,"len")=8
 	Set gtmtypes("shm_snapshot_t",218,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bt_put_flush_dirty_tn")=218
-	Set gtmtypes("shm_snapshot_t",219,"name")="shm_snapshot_t.shadow_file_header.mlock_wakeups_tn"
-	Set gtmtypes("shm_snapshot_t",219,"off")=6464
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_out_of_design_tn")=218
+	Set gtmtypes("shm_snapshot_t",219,"name")="shm_snapshot_t.shadow_file_header.bt_put_flush_dirty_tn"
+	Set gtmtypes("shm_snapshot_t",219,"off")=6456
 	Set gtmtypes("shm_snapshot_t",219,"len")=8
 	Set gtmtypes("shm_snapshot_t",219,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.mlock_wakeups_tn")=219
-	Set gtmtypes("shm_snapshot_t",220,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_recover_invoked_tn"
-	Set gtmtypes("shm_snapshot_t",220,"off")=6472
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bt_put_flush_dirty_tn")=219
+	Set gtmtypes("shm_snapshot_t",220,"name")="shm_snapshot_t.shadow_file_header.mlock_wakeups_tn"
+	Set gtmtypes("shm_snapshot_t",220,"off")=6464
 	Set gtmtypes("shm_snapshot_t",220,"len")=8
 	Set gtmtypes("shm_snapshot_t",220,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_recover_invoked_tn")=220
-	Set gtmtypes("shm_snapshot_t",221,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_verify_passed_tn"
-	Set gtmtypes("shm_snapshot_t",221,"off")=6480
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.mlock_wakeups_tn")=220
+	Set gtmtypes("shm_snapshot_t",221,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_recover_invoked_tn"
+	Set gtmtypes("shm_snapshot_t",221,"off")=6472
 	Set gtmtypes("shm_snapshot_t",221,"len")=8
 	Set gtmtypes("shm_snapshot_t",221,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_verify_passed_tn")=221
-	Set gtmtypes("shm_snapshot_t",222,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_tn"
-	Set gtmtypes("shm_snapshot_t",222,"off")=6488
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_recover_invoked_tn")=221
+	Set gtmtypes("shm_snapshot_t",222,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_verify_passed_tn"
+	Set gtmtypes("shm_snapshot_t",222,"off")=6480
 	Set gtmtypes("shm_snapshot_t",222,"len")=8
 	Set gtmtypes("shm_snapshot_t",222,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_tn")=222
-	Set gtmtypes("shm_snapshot_t",223,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_tn"
-	Set gtmtypes("shm_snapshot_t",223,"off")=6496
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_verify_passed_tn")=222
+	Set gtmtypes("shm_snapshot_t",223,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_tn"
+	Set gtmtypes("shm_snapshot_t",223,"off")=6488
 	Set gtmtypes("shm_snapshot_t",223,"len")=8
 	Set gtmtypes("shm_snapshot_t",223,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_tn")=223
-	Set gtmtypes("shm_snapshot_t",224,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_db_csh_getn_loopexceed_tn"
-	Set gtmtypes("shm_snapshot_t",224,"off")=6504
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_tn")=223
+	Set gtmtypes("shm_snapshot_t",224,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_tn"
+	Set gtmtypes("shm_snapshot_t",224,"off")=6496
 	Set gtmtypes("shm_snapshot_t",224,"len")=8
 	Set gtmtypes("shm_snapshot_t",224,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_db_csh_getn_loopexceed_tn")=224
-	Set gtmtypes("shm_snapshot_t",225,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_tn"
-	Set gtmtypes("shm_snapshot_t",225,"off")=6512
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_tn")=224
+	Set gtmtypes("shm_snapshot_t",225,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_db_csh_getn_loopexceed_tn"
+	Set gtmtypes("shm_snapshot_t",225,"off")=6504
 	Set gtmtypes("shm_snapshot_t",225,"len")=8
 	Set gtmtypes("shm_snapshot_t",225,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_tn")=225
-	Set gtmtypes("shm_snapshot_t",226,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_db_csh_get_tn"
-	Set gtmtypes("shm_snapshot_t",226,"off")=6520
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_db_csh_getn_loopexceed_tn")=225
+	Set gtmtypes("shm_snapshot_t",226,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_tn"
+	Set gtmtypes("shm_snapshot_t",226,"off")=6512
 	Set gtmtypes("shm_snapshot_t",226,"len")=8
 	Set gtmtypes("shm_snapshot_t",226,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_db_csh_get_tn")=226
-	Set gtmtypes("shm_snapshot_t",227,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_wcsgetspace_tn"
-	Set gtmtypes("shm_snapshot_t",227,"off")=6528
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_tn")=226
+	Set gtmtypes("shm_snapshot_t",227,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_db_csh_get_tn"
+	Set gtmtypes("shm_snapshot_t",227,"off")=6520
 	Set gtmtypes("shm_snapshot_t",227,"len")=8
 	Set gtmtypes("shm_snapshot_t",227,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_wcsgetspace_tn")=227
-	Set gtmtypes("shm_snapshot_t",228,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_t1_tn"
-	Set gtmtypes("shm_snapshot_t",228,"off")=6536
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_db_csh_get_tn")=227
+	Set gtmtypes("shm_snapshot_t",228,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_wcsgetspace_tn"
+	Set gtmtypes("shm_snapshot_t",228,"off")=6528
 	Set gtmtypes("shm_snapshot_t",228,"len")=8
 	Set gtmtypes("shm_snapshot_t",228,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_t1_tn")=228
-	Set gtmtypes("shm_snapshot_t",229,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_bitmap_tn"
-	Set gtmtypes("shm_snapshot_t",229,"off")=6544
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_wcsgetspace_tn")=228
+	Set gtmtypes("shm_snapshot_t",229,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_t1_tn"
+	Set gtmtypes("shm_snapshot_t",229,"off")=6536
 	Set gtmtypes("shm_snapshot_t",229,"len")=8
 	Set gtmtypes("shm_snapshot_t",229,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_bitmap_tn")=229
-	Set gtmtypes("shm_snapshot_t",230,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_jnl_cwset_tn"
-	Set gtmtypes("shm_snapshot_t",230,"off")=6552
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_t1_tn")=229
+	Set gtmtypes("shm_snapshot_t",230,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_bitmap_tn"
+	Set gtmtypes("shm_snapshot_t",230,"off")=6544
 	Set gtmtypes("shm_snapshot_t",230,"len")=8
 	Set gtmtypes("shm_snapshot_t",230,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_jnl_cwset_tn")=230
-	Set gtmtypes("shm_snapshot_t",231,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_tn"
-	Set gtmtypes("shm_snapshot_t",231,"off")=6560
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_bitmap_tn")=230
+	Set gtmtypes("shm_snapshot_t",231,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_jnl_cwset_tn"
+	Set gtmtypes("shm_snapshot_t",231,"off")=6552
 	Set gtmtypes("shm_snapshot_t",231,"len")=8
 	Set gtmtypes("shm_snapshot_t",231,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_tn")=231
-	Set gtmtypes("shm_snapshot_t",232,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_hist_tn"
-	Set gtmtypes("shm_snapshot_t",232,"off")=6568
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_jnl_cwset_tn")=231
+	Set gtmtypes("shm_snapshot_t",232,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_tn"
+	Set gtmtypes("shm_snapshot_t",232,"off")=6560
 	Set gtmtypes("shm_snapshot_t",232,"len")=8
 	Set gtmtypes("shm_snapshot_t",232,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_hist_tn")=232
-	Set gtmtypes("shm_snapshot_t",233,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_hist1_nullbt_tn"
-	Set gtmtypes("shm_snapshot_t",233,"off")=6576
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_tn")=232
+	Set gtmtypes("shm_snapshot_t",233,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_hist_tn"
+	Set gtmtypes("shm_snapshot_t",233,"off")=6568
 	Set gtmtypes("shm_snapshot_t",233,"len")=8
 	Set gtmtypes("shm_snapshot_t",233,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_hist1_nullbt_tn")=233
-	Set gtmtypes("shm_snapshot_t",234,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_tn"
-	Set gtmtypes("shm_snapshot_t",234,"off")=6584
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_hist_tn")=233
+	Set gtmtypes("shm_snapshot_t",234,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_hist1_nullbt_tn"
+	Set gtmtypes("shm_snapshot_t",234,"off")=6576
 	Set gtmtypes("shm_snapshot_t",234,"len")=8
 	Set gtmtypes("shm_snapshot_t",234,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_tn")=234
-	Set gtmtypes("shm_snapshot_t",235,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_bitmap_nullbt_tn"
-	Set gtmtypes("shm_snapshot_t",235,"off")=6592
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_hist1_nullbt_tn")=234
+	Set gtmtypes("shm_snapshot_t",235,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_tn"
+	Set gtmtypes("shm_snapshot_t",235,"off")=6584
 	Set gtmtypes("shm_snapshot_t",235,"len")=8
 	Set gtmtypes("shm_snapshot_t",235,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_bitmap_nullbt_tn")=235
-	Set gtmtypes("shm_snapshot_t",236,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_tn"
-	Set gtmtypes("shm_snapshot_t",236,"off")=6600
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_tn")=235
+	Set gtmtypes("shm_snapshot_t",236,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_bitmap_nullbt_tn"
+	Set gtmtypes("shm_snapshot_t",236,"off")=6592
 	Set gtmtypes("shm_snapshot_t",236,"len")=8
 	Set gtmtypes("shm_snapshot_t",236,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_tn")=236
-	Set gtmtypes("shm_snapshot_t",237,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_jnl_cwset_tn"
-	Set gtmtypes("shm_snapshot_t",237,"off")=6608
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_bitmap_nullbt_tn")=236
+	Set gtmtypes("shm_snapshot_t",237,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_tn"
+	Set gtmtypes("shm_snapshot_t",237,"off")=6600
 	Set gtmtypes("shm_snapshot_t",237,"len")=8
 	Set gtmtypes("shm_snapshot_t",237,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_jnl_cwset_tn")=237
-	Set gtmtypes("shm_snapshot_t",238,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_jnl_wcsflu_tn"
-	Set gtmtypes("shm_snapshot_t",238,"off")=6616
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_tn")=237
+	Set gtmtypes("shm_snapshot_t",238,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_jnl_cwset_tn"
+	Set gtmtypes("shm_snapshot_t",238,"off")=6608
 	Set gtmtypes("shm_snapshot_t",238,"len")=8
 	Set gtmtypes("shm_snapshot_t",238,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_jnl_wcsflu_tn")=238
-	Set gtmtypes("shm_snapshot_t",239,"name")="shm_snapshot_t.shadow_file_header.db_csh_get_too_many_loops_tn"
-	Set gtmtypes("shm_snapshot_t",239,"off")=6624
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_jnl_cwset_tn")=238
+	Set gtmtypes("shm_snapshot_t",239,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_jnl_wcsflu_tn"
+	Set gtmtypes("shm_snapshot_t",239,"off")=6616
 	Set gtmtypes("shm_snapshot_t",239,"len")=8
 	Set gtmtypes("shm_snapshot_t",239,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_get_too_many_loops_tn")=239
-	Set gtmtypes("shm_snapshot_t",240,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tpckh_hist1_nullbt_tn"
-	Set gtmtypes("shm_snapshot_t",240,"off")=6632
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_jnl_wcsflu_tn")=239
+	Set gtmtypes("shm_snapshot_t",240,"name")="shm_snapshot_t.shadow_file_header.db_csh_get_too_many_loops_tn"
+	Set gtmtypes("shm_snapshot_t",240,"off")=6624
 	Set gtmtypes("shm_snapshot_t",240,"len")=8
 	Set gtmtypes("shm_snapshot_t",240,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tpckh_hist1_nullbt_tn")=240
-	Set gtmtypes("shm_snapshot_t",241,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_tn"
-	Set gtmtypes("shm_snapshot_t",241,"off")=6640
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_get_too_many_loops_tn")=240
+	Set gtmtypes("shm_snapshot_t",241,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tpckh_hist1_nullbt_tn"
+	Set gtmtypes("shm_snapshot_t",241,"off")=6632
 	Set gtmtypes("shm_snapshot_t",241,"len")=8
 	Set gtmtypes("shm_snapshot_t",241,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_tn")=241
-	Set gtmtypes("shm_snapshot_t",242,"name")="shm_snapshot_t.shadow_file_header.jnl_blocked_writer_lost_tn"
-	Set gtmtypes("shm_snapshot_t",242,"off")=6648
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tpckh_hist1_nullbt_tn")=241
+	Set gtmtypes("shm_snapshot_t",242,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_tn"
+	Set gtmtypes("shm_snapshot_t",242,"off")=6640
 	Set gtmtypes("shm_snapshot_t",242,"len")=8
 	Set gtmtypes("shm_snapshot_t",242,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_blocked_writer_lost_tn")=242
-	Set gtmtypes("shm_snapshot_t",243,"name")="shm_snapshot_t.shadow_file_header.jnl_blocked_writer_stuck_tn"
-	Set gtmtypes("shm_snapshot_t",243,"off")=6656
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_tn")=242
+	Set gtmtypes("shm_snapshot_t",243,"name")="shm_snapshot_t.shadow_file_header.jnl_blocked_writer_lost_tn"
+	Set gtmtypes("shm_snapshot_t",243,"off")=6648
 	Set gtmtypes("shm_snapshot_t",243,"len")=8
 	Set gtmtypes("shm_snapshot_t",243,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_blocked_writer_stuck_tn")=243
-	Set gtmtypes("shm_snapshot_t",244,"name")="shm_snapshot_t.shadow_file_header.jnl_blocked_writer_blocked_tn"
-	Set gtmtypes("shm_snapshot_t",244,"off")=6664
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_blocked_writer_lost_tn")=243
+	Set gtmtypes("shm_snapshot_t",244,"name")="shm_snapshot_t.shadow_file_header.jnl_blocked_writer_stuck_tn"
+	Set gtmtypes("shm_snapshot_t",244,"off")=6656
 	Set gtmtypes("shm_snapshot_t",244,"len")=8
 	Set gtmtypes("shm_snapshot_t",244,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_blocked_writer_blocked_tn")=244
-	Set gtmtypes("shm_snapshot_t",245,"name")="shm_snapshot_t.shadow_file_header.n_jnl_fsyncs_tn"
-	Set gtmtypes("shm_snapshot_t",245,"off")=6672
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_blocked_writer_stuck_tn")=244
+	Set gtmtypes("shm_snapshot_t",245,"name")="shm_snapshot_t.shadow_file_header.jnl_blocked_writer_blocked_tn"
+	Set gtmtypes("shm_snapshot_t",245,"off")=6664
 	Set gtmtypes("shm_snapshot_t",245,"len")=8
 	Set gtmtypes("shm_snapshot_t",245,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_jnl_fsyncs_tn")=245
-	Set gtmtypes("shm_snapshot_t",246,"name")="shm_snapshot_t.shadow_file_header.n_jnl_fsync_tries_tn"
-	Set gtmtypes("shm_snapshot_t",246,"off")=6680
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_blocked_writer_blocked_tn")=245
+	Set gtmtypes("shm_snapshot_t",246,"name")="shm_snapshot_t.shadow_file_header.n_jnl_fsyncs_tn"
+	Set gtmtypes("shm_snapshot_t",246,"off")=6672
 	Set gtmtypes("shm_snapshot_t",246,"len")=8
 	Set gtmtypes("shm_snapshot_t",246,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_jnl_fsync_tries_tn")=246
-	Set gtmtypes("shm_snapshot_t",247,"name")="shm_snapshot_t.shadow_file_header.n_jnl_fsync_recovers_tn"
-	Set gtmtypes("shm_snapshot_t",247,"off")=6688
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_jnl_fsyncs_tn")=246
+	Set gtmtypes("shm_snapshot_t",247,"name")="shm_snapshot_t.shadow_file_header.n_jnl_fsync_tries_tn"
+	Set gtmtypes("shm_snapshot_t",247,"off")=6680
 	Set gtmtypes("shm_snapshot_t",247,"len")=8
 	Set gtmtypes("shm_snapshot_t",247,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_jnl_fsync_recovers_tn")=247
-	Set gtmtypes("shm_snapshot_t",248,"name")="shm_snapshot_t.shadow_file_header.n_db_fsyncs_tn"
-	Set gtmtypes("shm_snapshot_t",248,"off")=6696
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_jnl_fsync_tries_tn")=247
+	Set gtmtypes("shm_snapshot_t",248,"name")="shm_snapshot_t.shadow_file_header.n_jnl_fsync_recovers_tn"
+	Set gtmtypes("shm_snapshot_t",248,"off")=6688
 	Set gtmtypes("shm_snapshot_t",248,"len")=8
 	Set gtmtypes("shm_snapshot_t",248,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_fsyncs_tn")=248
-	Set gtmtypes("shm_snapshot_t",249,"name")="shm_snapshot_t.shadow_file_header.n_db_fsyncs_in_crit_tn"
-	Set gtmtypes("shm_snapshot_t",249,"off")=6704
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_jnl_fsync_recovers_tn")=248
+	Set gtmtypes("shm_snapshot_t",249,"name")="shm_snapshot_t.shadow_file_header.n_db_fsyncs_tn"
+	Set gtmtypes("shm_snapshot_t",249,"off")=6696
 	Set gtmtypes("shm_snapshot_t",249,"len")=8
 	Set gtmtypes("shm_snapshot_t",249,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_fsyncs_in_crit_tn")=249
-	Set gtmtypes("shm_snapshot_t",250,"name")="shm_snapshot_t.shadow_file_header.n_dbsync_timers_tn"
-	Set gtmtypes("shm_snapshot_t",250,"off")=6712
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_fsyncs_tn")=249
+	Set gtmtypes("shm_snapshot_t",250,"name")="shm_snapshot_t.shadow_file_header.n_db_fsyncs_in_crit_tn"
+	Set gtmtypes("shm_snapshot_t",250,"off")=6704
 	Set gtmtypes("shm_snapshot_t",250,"len")=8
 	Set gtmtypes("shm_snapshot_t",250,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_dbsync_timers_tn")=250
-	Set gtmtypes("shm_snapshot_t",251,"name")="shm_snapshot_t.shadow_file_header.n_dbsync_writes_tn"
-	Set gtmtypes("shm_snapshot_t",251,"off")=6720
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_fsyncs_in_crit_tn")=250
+	Set gtmtypes("shm_snapshot_t",251,"name")="shm_snapshot_t.shadow_file_header.n_dbsync_timers_tn"
+	Set gtmtypes("shm_snapshot_t",251,"off")=6712
 	Set gtmtypes("shm_snapshot_t",251,"len")=8
 	Set gtmtypes("shm_snapshot_t",251,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_dbsync_writes_tn")=251
-	Set gtmtypes("shm_snapshot_t",252,"name")="shm_snapshot_t.shadow_file_header.mutex_queue_full_tn"
-	Set gtmtypes("shm_snapshot_t",252,"off")=6728
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_dbsync_timers_tn")=251
+	Set gtmtypes("shm_snapshot_t",252,"name")="shm_snapshot_t.shadow_file_header.n_dbsync_writes_tn"
+	Set gtmtypes("shm_snapshot_t",252,"off")=6720
 	Set gtmtypes("shm_snapshot_t",252,"len")=8
 	Set gtmtypes("shm_snapshot_t",252,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.mutex_queue_full_tn")=252
-	Set gtmtypes("shm_snapshot_t",253,"name")="shm_snapshot_t.shadow_file_header.wcb_bt_put_tn"
-	Set gtmtypes("shm_snapshot_t",253,"off")=6736
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_dbsync_writes_tn")=252
+	Set gtmtypes("shm_snapshot_t",253,"name")="shm_snapshot_t.shadow_file_header.mutex_queue_full_tn"
+	Set gtmtypes("shm_snapshot_t",253,"off")=6728
 	Set gtmtypes("shm_snapshot_t",253,"len")=8
 	Set gtmtypes("shm_snapshot_t",253,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_bt_put_tn")=253
-	Set gtmtypes("shm_snapshot_t",254,"name")="shm_snapshot_t.shadow_file_header.wcb_mutex_salvage_tn"
-	Set gtmtypes("shm_snapshot_t",254,"off")=6744
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.mutex_queue_full_tn")=253
+	Set gtmtypes("shm_snapshot_t",254,"name")="shm_snapshot_t.shadow_file_header.wcb_bt_put_tn"
+	Set gtmtypes("shm_snapshot_t",254,"off")=6736
 	Set gtmtypes("shm_snapshot_t",254,"len")=8
 	Set gtmtypes("shm_snapshot_t",254,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_mutex_salvage_tn")=254
-	Set gtmtypes("shm_snapshot_t",255,"name")="shm_snapshot_t.shadow_file_header.wcb_tp_grab_crit_tn"
-	Set gtmtypes("shm_snapshot_t",255,"off")=6752
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_bt_put_tn")=254
+	Set gtmtypes("shm_snapshot_t",255,"name")="shm_snapshot_t.shadow_file_header.wcb_mutex_salvage_tn"
+	Set gtmtypes("shm_snapshot_t",255,"off")=6744
 	Set gtmtypes("shm_snapshot_t",255,"len")=8
 	Set gtmtypes("shm_snapshot_t",255,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_tp_grab_crit_tn")=255
-	Set gtmtypes("shm_snapshot_t",256,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_nocr_invcr_tn"
-	Set gtmtypes("shm_snapshot_t",256,"off")=6760
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_mutex_salvage_tn")=255
+	Set gtmtypes("shm_snapshot_t",256,"name")="shm_snapshot_t.shadow_file_header.wcb_tp_grab_crit_tn"
+	Set gtmtypes("shm_snapshot_t",256,"off")=6752
 	Set gtmtypes("shm_snapshot_t",256,"len")=8
 	Set gtmtypes("shm_snapshot_t",256,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_nocr_invcr_tn")=256
-	Set gtmtypes("shm_snapshot_t",257,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_cr_invcr_tn"
-	Set gtmtypes("shm_snapshot_t",257,"off")=6768
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_tp_grab_crit_tn")=256
+	Set gtmtypes("shm_snapshot_t",257,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_nocr_invcr_tn"
+	Set gtmtypes("shm_snapshot_t",257,"off")=6760
 	Set gtmtypes("shm_snapshot_t",257,"len")=8
 	Set gtmtypes("shm_snapshot_t",257,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_cr_invcr_tn")=257
-	Set gtmtypes("shm_snapshot_t",258,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_rip_wait_tn"
-	Set gtmtypes("shm_snapshot_t",258,"off")=6776
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_nocr_invcr_tn")=257
+	Set gtmtypes("shm_snapshot_t",258,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_cr_invcr_tn"
+	Set gtmtypes("shm_snapshot_t",258,"off")=6768
 	Set gtmtypes("shm_snapshot_t",258,"len")=8
 	Set gtmtypes("shm_snapshot_t",258,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_rip_wait_tn")=258
-	Set gtmtypes("shm_snapshot_t",259,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirtyripwait_tn"
-	Set gtmtypes("shm_snapshot_t",259,"off")=6784
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_cr_invcr_tn")=258
+	Set gtmtypes("shm_snapshot_t",259,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_rip_wait_tn"
+	Set gtmtypes("shm_snapshot_t",259,"off")=6776
 	Set gtmtypes("shm_snapshot_t",259,"len")=8
 	Set gtmtypes("shm_snapshot_t",259,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirtyripwait_tn")=259
-	Set gtmtypes("shm_snapshot_t",260,"name")="shm_snapshot_t.shadow_file_header.wcb_gds_rundown_tn"
-	Set gtmtypes("shm_snapshot_t",260,"off")=6792
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_rip_wait_tn")=259
+	Set gtmtypes("shm_snapshot_t",260,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirtyripwait_tn"
+	Set gtmtypes("shm_snapshot_t",260,"off")=6784
 	Set gtmtypes("shm_snapshot_t",260,"len")=8
 	Set gtmtypes("shm_snapshot_t",260,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_gds_rundown_tn")=260
-	Set gtmtypes("shm_snapshot_t",261,"name")="shm_snapshot_t.shadow_file_header.wcb_wcs_flu1_tn"
-	Set gtmtypes("shm_snapshot_t",261,"off")=6800
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirtyripwait_tn")=260
+	Set gtmtypes("shm_snapshot_t",261,"name")="shm_snapshot_t.shadow_file_header.wcb_gds_rundown_tn"
+	Set gtmtypes("shm_snapshot_t",261,"off")=6792
 	Set gtmtypes("shm_snapshot_t",261,"len")=8
 	Set gtmtypes("shm_snapshot_t",261,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wcs_flu1_tn")=261
-	Set gtmtypes("shm_snapshot_t",262,"name")="shm_snapshot_t.shadow_file_header.wcb_mu_back_tn"
-	Set gtmtypes("shm_snapshot_t",262,"off")=6808
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_gds_rundown_tn")=261
+	Set gtmtypes("shm_snapshot_t",262,"name")="shm_snapshot_t.shadow_file_header.wcb_wcs_flu1_tn"
+	Set gtmtypes("shm_snapshot_t",262,"off")=6800
 	Set gtmtypes("shm_snapshot_t",262,"len")=8
 	Set gtmtypes("shm_snapshot_t",262,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_mu_back_tn")=262
-	Set gtmtypes("shm_snapshot_t",263,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirty_invcr_tn"
-	Set gtmtypes("shm_snapshot_t",263,"off")=6816
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wcs_flu1_tn")=262
+	Set gtmtypes("shm_snapshot_t",263,"name")="shm_snapshot_t.shadow_file_header.wcb_mu_back_tn"
+	Set gtmtypes("shm_snapshot_t",263,"off")=6808
 	Set gtmtypes("shm_snapshot_t",263,"len")=8
 	Set gtmtypes("shm_snapshot_t",263,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirty_invcr_tn")=263
-	Set gtmtypes("shm_snapshot_t",264,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_wtfini_fail_tn"
-	Set gtmtypes("shm_snapshot_t",264,"off")=6824
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_mu_back_tn")=263
+	Set gtmtypes("shm_snapshot_t",264,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirty_invcr_tn"
+	Set gtmtypes("shm_snapshot_t",264,"off")=6816
 	Set gtmtypes("shm_snapshot_t",264,"len")=8
 	Set gtmtypes("shm_snapshot_t",264,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_wtfini_fail_tn")=264
-	Set gtmtypes("shm_snapshot_t",265,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_twin_stuck_tn"
-	Set gtmtypes("shm_snapshot_t",265,"off")=6832
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirty_invcr_tn")=264
+	Set gtmtypes("shm_snapshot_t",265,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_wtfini_fail_tn"
+	Set gtmtypes("shm_snapshot_t",265,"off")=6824
 	Set gtmtypes("shm_snapshot_t",265,"len")=8
 	Set gtmtypes("shm_snapshot_t",265,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_twin_stuck_tn")=265
-	Set gtmtypes("shm_snapshot_t",266,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_wrt_latch_stuck_tn"
-	Set gtmtypes("shm_snapshot_t",266,"off")=6840
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_wtfini_fail_tn")=265
+	Set gtmtypes("shm_snapshot_t",266,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_twin_stuck_tn"
+	Set gtmtypes("shm_snapshot_t",266,"off")=6832
 	Set gtmtypes("shm_snapshot_t",266,"len")=8
 	Set gtmtypes("shm_snapshot_t",266,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_wrt_latch_stuck_tn")=266
-	Set gtmtypes("shm_snapshot_t",267,"name")="shm_snapshot_t.shadow_file_header.wcb_secshr_db_clnup_now_crit_tn"
-	Set gtmtypes("shm_snapshot_t",267,"off")=6848
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_twin_stuck_tn")=266
+	Set gtmtypes("shm_snapshot_t",267,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_wrt_latch_stuck_tn"
+	Set gtmtypes("shm_snapshot_t",267,"off")=6840
 	Set gtmtypes("shm_snapshot_t",267,"len")=8
 	Set gtmtypes("shm_snapshot_t",267,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_secshr_db_clnup_now_crit_tn")=267
-	Set gtmtypes("shm_snapshot_t",268,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_bad_bt_index1_tn"
-	Set gtmtypes("shm_snapshot_t",268,"off")=6856
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_wrt_latch_stuck_tn")=267
+	Set gtmtypes("shm_snapshot_t",268,"name")="shm_snapshot_t.shadow_file_header.wcb_secshr_db_clnup_now_crit_tn"
+	Set gtmtypes("shm_snapshot_t",268,"off")=6848
 	Set gtmtypes("shm_snapshot_t",268,"len")=8
 	Set gtmtypes("shm_snapshot_t",268,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_bad_bt_index1_tn")=268
-	Set gtmtypes("shm_snapshot_t",269,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_bad_bt_index2_tn"
-	Set gtmtypes("shm_snapshot_t",269,"off")=6864
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_secshr_db_clnup_now_crit_tn")=268
+	Set gtmtypes("shm_snapshot_t",269,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_bad_bt_index1_tn"
+	Set gtmtypes("shm_snapshot_t",269,"off")=6856
 	Set gtmtypes("shm_snapshot_t",269,"len")=8
 	Set gtmtypes("shm_snapshot_t",269,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_bad_bt_index2_tn")=269
-	Set gtmtypes("shm_snapshot_t",270,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_crbtmismatch1_tn"
-	Set gtmtypes("shm_snapshot_t",270,"off")=6872
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_bad_bt_index1_tn")=269
+	Set gtmtypes("shm_snapshot_t",270,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_bad_bt_index2_tn"
+	Set gtmtypes("shm_snapshot_t",270,"off")=6864
 	Set gtmtypes("shm_snapshot_t",270,"len")=8
 	Set gtmtypes("shm_snapshot_t",270,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_crbtmismatch1_tn")=270
-	Set gtmtypes("shm_snapshot_t",271,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_crbtmismatch2_tn"
-	Set gtmtypes("shm_snapshot_t",271,"off")=6880
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_bad_bt_index2_tn")=270
+	Set gtmtypes("shm_snapshot_t",271,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_crbtmismatch1_tn"
+	Set gtmtypes("shm_snapshot_t",271,"off")=6872
 	Set gtmtypes("shm_snapshot_t",271,"len")=8
 	Set gtmtypes("shm_snapshot_t",271,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_crbtmismatch2_tn")=271
-	Set gtmtypes("shm_snapshot_t",272,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_crbtmismatch3_tn"
-	Set gtmtypes("shm_snapshot_t",272,"off")=6888
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_crbtmismatch1_tn")=271
+	Set gtmtypes("shm_snapshot_t",272,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_crbtmismatch2_tn"
+	Set gtmtypes("shm_snapshot_t",272,"off")=6880
 	Set gtmtypes("shm_snapshot_t",272,"len")=8
 	Set gtmtypes("shm_snapshot_t",272,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_crbtmismatch3_tn")=272
-	Set gtmtypes("shm_snapshot_t",273,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_tn"
-	Set gtmtypes("shm_snapshot_t",273,"off")=6896
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_crbtmismatch2_tn")=272
+	Set gtmtypes("shm_snapshot_t",273,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_crbtmismatch3_tn"
+	Set gtmtypes("shm_snapshot_t",273,"off")=6888
 	Set gtmtypes("shm_snapshot_t",273,"len")=8
 	Set gtmtypes("shm_snapshot_t",273,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_tn")=273
-	Set gtmtypes("shm_snapshot_t",274,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_tn"
-	Set gtmtypes("shm_snapshot_t",274,"off")=6904
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_crbtmismatch3_tn")=273
+	Set gtmtypes("shm_snapshot_t",274,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_tn"
+	Set gtmtypes("shm_snapshot_t",274,"off")=6896
 	Set gtmtypes("shm_snapshot_t",274,"len")=8
 	Set gtmtypes("shm_snapshot_t",274,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_tn")=274
-	Set gtmtypes("shm_snapshot_t",275,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_tn"
-	Set gtmtypes("shm_snapshot_t",275,"off")=6912
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_tn")=274
+	Set gtmtypes("shm_snapshot_t",275,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_tn"
+	Set gtmtypes("shm_snapshot_t",275,"off")=6904
 	Set gtmtypes("shm_snapshot_t",275,"len")=8
 	Set gtmtypes("shm_snapshot_t",275,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_tn")=275
-	Set gtmtypes("shm_snapshot_t",276,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_tn"
-	Set gtmtypes("shm_snapshot_t",276,"off")=6920
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_tn")=275
+	Set gtmtypes("shm_snapshot_t",276,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_tn"
+	Set gtmtypes("shm_snapshot_t",276,"off")=6912
 	Set gtmtypes("shm_snapshot_t",276,"len")=8
 	Set gtmtypes("shm_snapshot_t",276,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_tn")=276
-	Set gtmtypes("shm_snapshot_t",277,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_tn"
-	Set gtmtypes("shm_snapshot_t",277,"off")=6928
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_tn")=276
+	Set gtmtypes("shm_snapshot_t",277,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_tn"
+	Set gtmtypes("shm_snapshot_t",277,"off")=6920
 	Set gtmtypes("shm_snapshot_t",277,"len")=8
 	Set gtmtypes("shm_snapshot_t",277,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_tn")=277
-	Set gtmtypes("shm_snapshot_t",278,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_bt_get_tn"
-	Set gtmtypes("shm_snapshot_t",278,"off")=6936
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_tn")=277
+	Set gtmtypes("shm_snapshot_t",278,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_tn"
+	Set gtmtypes("shm_snapshot_t",278,"off")=6928
 	Set gtmtypes("shm_snapshot_t",278,"len")=8
 	Set gtmtypes("shm_snapshot_t",278,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_bt_get_tn")=278
-	Set gtmtypes("shm_snapshot_t",279,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_tn"
-	Set gtmtypes("shm_snapshot_t",279,"off")=6944
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_tn")=278
+	Set gtmtypes("shm_snapshot_t",279,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_bt_get_tn"
+	Set gtmtypes("shm_snapshot_t",279,"off")=6936
 	Set gtmtypes("shm_snapshot_t",279,"len")=8
 	Set gtmtypes("shm_snapshot_t",279,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_tn")=279
-	Set gtmtypes("shm_snapshot_t",280,"name")="shm_snapshot_t.shadow_file_header.wcb_bg_update_lckfail1_tn"
-	Set gtmtypes("shm_snapshot_t",280,"off")=6952
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_bt_get_tn")=279
+	Set gtmtypes("shm_snapshot_t",280,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_tn"
+	Set gtmtypes("shm_snapshot_t",280,"off")=6944
 	Set gtmtypes("shm_snapshot_t",280,"len")=8
 	Set gtmtypes("shm_snapshot_t",280,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_bg_update_lckfail1_tn")=280
-	Set gtmtypes("shm_snapshot_t",281,"name")="shm_snapshot_t.shadow_file_header.wcb_bg_update_lckfail2_tn"
-	Set gtmtypes("shm_snapshot_t",281,"off")=6960
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_tn")=280
+	Set gtmtypes("shm_snapshot_t",281,"name")="shm_snapshot_t.shadow_file_header.wcb_bg_update_lckfail1_tn"
+	Set gtmtypes("shm_snapshot_t",281,"off")=6952
 	Set gtmtypes("shm_snapshot_t",281,"len")=8
 	Set gtmtypes("shm_snapshot_t",281,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_bg_update_lckfail2_tn")=281
-	Set gtmtypes("shm_snapshot_t",282,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail1_tn"
-	Set gtmtypes("shm_snapshot_t",282,"off")=6968
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_bg_update_lckfail1_tn")=281
+	Set gtmtypes("shm_snapshot_t",282,"name")="shm_snapshot_t.shadow_file_header.wcb_bg_update_lckfail2_tn"
+	Set gtmtypes("shm_snapshot_t",282,"off")=6960
 	Set gtmtypes("shm_snapshot_t",282,"len")=8
 	Set gtmtypes("shm_snapshot_t",282,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail1_tn")=282
-	Set gtmtypes("shm_snapshot_t",283,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail2_tn"
-	Set gtmtypes("shm_snapshot_t",283,"off")=6976
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_bg_update_lckfail2_tn")=282
+	Set gtmtypes("shm_snapshot_t",283,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail1_tn"
+	Set gtmtypes("shm_snapshot_t",283,"off")=6968
 	Set gtmtypes("shm_snapshot_t",283,"len")=8
 	Set gtmtypes("shm_snapshot_t",283,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail2_tn")=283
-	Set gtmtypes("shm_snapshot_t",284,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail3_tn"
-	Set gtmtypes("shm_snapshot_t",284,"off")=6984
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail1_tn")=283
+	Set gtmtypes("shm_snapshot_t",284,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail2_tn"
+	Set gtmtypes("shm_snapshot_t",284,"off")=6976
 	Set gtmtypes("shm_snapshot_t",284,"len")=8
 	Set gtmtypes("shm_snapshot_t",284,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail3_tn")=284
-	Set gtmtypes("shm_snapshot_t",285,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail4_tn"
-	Set gtmtypes("shm_snapshot_t",285,"off")=6992
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail2_tn")=284
+	Set gtmtypes("shm_snapshot_t",285,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail3_tn"
+	Set gtmtypes("shm_snapshot_t",285,"off")=6984
 	Set gtmtypes("shm_snapshot_t",285,"len")=8
 	Set gtmtypes("shm_snapshot_t",285,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail4_tn")=285
-	Set gtmtypes("shm_snapshot_t",286,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail1_tn"
-	Set gtmtypes("shm_snapshot_t",286,"off")=7000
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail3_tn")=285
+	Set gtmtypes("shm_snapshot_t",286,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail4_tn"
+	Set gtmtypes("shm_snapshot_t",286,"off")=6992
 	Set gtmtypes("shm_snapshot_t",286,"len")=8
 	Set gtmtypes("shm_snapshot_t",286,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail1_tn")=286
-	Set gtmtypes("shm_snapshot_t",287,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail2_tn"
-	Set gtmtypes("shm_snapshot_t",287,"off")=7008
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail4_tn")=286
+	Set gtmtypes("shm_snapshot_t",287,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail1_tn"
+	Set gtmtypes("shm_snapshot_t",287,"off")=7000
 	Set gtmtypes("shm_snapshot_t",287,"len")=8
 	Set gtmtypes("shm_snapshot_t",287,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail2_tn")=287
-	Set gtmtypes("shm_snapshot_t",288,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail3_tn"
-	Set gtmtypes("shm_snapshot_t",288,"off")=7016
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail1_tn")=287
+	Set gtmtypes("shm_snapshot_t",288,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail2_tn"
+	Set gtmtypes("shm_snapshot_t",288,"off")=7008
 	Set gtmtypes("shm_snapshot_t",288,"len")=8
 	Set gtmtypes("shm_snapshot_t",288,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail3_tn")=288
-	Set gtmtypes("shm_snapshot_t",289,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail4_tn"
-	Set gtmtypes("shm_snapshot_t",289,"off")=7024
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail2_tn")=288
+	Set gtmtypes("shm_snapshot_t",289,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail3_tn"
+	Set gtmtypes("shm_snapshot_t",289,"off")=7016
 	Set gtmtypes("shm_snapshot_t",289,"len")=8
 	Set gtmtypes("shm_snapshot_t",289,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail4_tn")=289
-	Set gtmtypes("shm_snapshot_t",290,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirtystuck1_tn"
-	Set gtmtypes("shm_snapshot_t",290,"off")=7032
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail3_tn")=289
+	Set gtmtypes("shm_snapshot_t",290,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail4_tn"
+	Set gtmtypes("shm_snapshot_t",290,"off")=7024
 	Set gtmtypes("shm_snapshot_t",290,"len")=8
 	Set gtmtypes("shm_snapshot_t",290,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirtystuck1_tn")=290
-	Set gtmtypes("shm_snapshot_t",291,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirtystuck2_tn"
-	Set gtmtypes("shm_snapshot_t",291,"off")=7040
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail4_tn")=290
+	Set gtmtypes("shm_snapshot_t",291,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirtystuck1_tn"
+	Set gtmtypes("shm_snapshot_t",291,"off")=7032
 	Set gtmtypes("shm_snapshot_t",291,"len")=8
 	Set gtmtypes("shm_snapshot_t",291,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirtystuck2_tn")=291
-	Set gtmtypes("shm_snapshot_t",292,"name")="shm_snapshot_t.shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_tn"
-	Set gtmtypes("shm_snapshot_t",292,"off")=7048
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirtystuck1_tn")=291
+	Set gtmtypes("shm_snapshot_t",292,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirtystuck2_tn"
+	Set gtmtypes("shm_snapshot_t",292,"off")=7040
 	Set gtmtypes("shm_snapshot_t",292,"len")=8
 	Set gtmtypes("shm_snapshot_t",292,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_tn")=292
-	Set gtmtypes("shm_snapshot_t",293,"name")="shm_snapshot_t.shadow_file_header.dwngrd_refmts_syncio_tn"
-	Set gtmtypes("shm_snapshot_t",293,"off")=7056
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirtystuck2_tn")=292
+	Set gtmtypes("shm_snapshot_t",293,"name")="shm_snapshot_t.shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_tn"
+	Set gtmtypes("shm_snapshot_t",293,"off")=7048
 	Set gtmtypes("shm_snapshot_t",293,"len")=8
 	Set gtmtypes("shm_snapshot_t",293,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.dwngrd_refmts_syncio_tn")=293
-	Set gtmtypes("shm_snapshot_t",294,"name")="shm_snapshot_t.shadow_file_header.dwngrd_refmts_asyncio_tn"
-	Set gtmtypes("shm_snapshot_t",294,"off")=7064
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_tn")=293
+	Set gtmtypes("shm_snapshot_t",294,"name")="shm_snapshot_t.shadow_file_header.dwngrd_refmts_syncio_tn"
+	Set gtmtypes("shm_snapshot_t",294,"off")=7056
 	Set gtmtypes("shm_snapshot_t",294,"len")=8
 	Set gtmtypes("shm_snapshot_t",294,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.dwngrd_refmts_asyncio_tn")=294
-	Set gtmtypes("shm_snapshot_t",295,"name")="shm_snapshot_t.shadow_file_header.shmpool_refmt_harvests_tn"
-	Set gtmtypes("shm_snapshot_t",295,"off")=7072
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.dwngrd_refmts_syncio_tn")=294
+	Set gtmtypes("shm_snapshot_t",295,"name")="shm_snapshot_t.shadow_file_header.dwngrd_refmts_asyncio_tn"
+	Set gtmtypes("shm_snapshot_t",295,"off")=7064
 	Set gtmtypes("shm_snapshot_t",295,"len")=8
 	Set gtmtypes("shm_snapshot_t",295,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_refmt_harvests_tn")=295
-	Set gtmtypes("shm_snapshot_t",296,"name")="shm_snapshot_t.shadow_file_header.shmpool_recovery_tn"
-	Set gtmtypes("shm_snapshot_t",296,"off")=7080
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.dwngrd_refmts_asyncio_tn")=295
+	Set gtmtypes("shm_snapshot_t",296,"name")="shm_snapshot_t.shadow_file_header.shmpool_refmt_harvests_tn"
+	Set gtmtypes("shm_snapshot_t",296,"off")=7072
 	Set gtmtypes("shm_snapshot_t",296,"len")=8
 	Set gtmtypes("shm_snapshot_t",296,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_recovery_tn")=296
-	Set gtmtypes("shm_snapshot_t",297,"name")="shm_snapshot_t.shadow_file_header.shmpool_blkd_by_sdc_tn"
-	Set gtmtypes("shm_snapshot_t",297,"off")=7088
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_refmt_harvests_tn")=296
+	Set gtmtypes("shm_snapshot_t",297,"name")="shm_snapshot_t.shadow_file_header.shmpool_recovery_tn"
+	Set gtmtypes("shm_snapshot_t",297,"off")=7080
 	Set gtmtypes("shm_snapshot_t",297,"len")=8
 	Set gtmtypes("shm_snapshot_t",297,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_blkd_by_sdc_tn")=297
-	Set gtmtypes("shm_snapshot_t",298,"name")="shm_snapshot_t.shadow_file_header.shmpool_alloc_bbflush_tn"
-	Set gtmtypes("shm_snapshot_t",298,"off")=7096
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_recovery_tn")=297
+	Set gtmtypes("shm_snapshot_t",298,"name")="shm_snapshot_t.shadow_file_header.shmpool_blkd_by_sdc_tn"
+	Set gtmtypes("shm_snapshot_t",298,"off")=7088
 	Set gtmtypes("shm_snapshot_t",298,"len")=8
 	Set gtmtypes("shm_snapshot_t",298,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_alloc_bbflush_tn")=298
-	Set gtmtypes("shm_snapshot_t",299,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_released_replaced_tn"
-	Set gtmtypes("shm_snapshot_t",299,"off")=7104
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_blkd_by_sdc_tn")=298
+	Set gtmtypes("shm_snapshot_t",299,"name")="shm_snapshot_t.shadow_file_header.shmpool_alloc_bbflush_tn"
+	Set gtmtypes("shm_snapshot_t",299,"off")=7096
 	Set gtmtypes("shm_snapshot_t",299,"len")=8
 	Set gtmtypes("shm_snapshot_t",299,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_released_replaced_tn")=299
-	Set gtmtypes("shm_snapshot_t",300,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_released_io_complete_tn"
-	Set gtmtypes("shm_snapshot_t",300,"off")=7112
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_alloc_bbflush_tn")=299
+	Set gtmtypes("shm_snapshot_t",300,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_released_replaced_tn"
+	Set gtmtypes("shm_snapshot_t",300,"off")=7104
 	Set gtmtypes("shm_snapshot_t",300,"len")=8
 	Set gtmtypes("shm_snapshot_t",300,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_released_io_complete_tn")=300
-	Set gtmtypes("shm_snapshot_t",301,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_kept_tn"
-	Set gtmtypes("shm_snapshot_t",301,"off")=7120
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_released_replaced_tn")=300
+	Set gtmtypes("shm_snapshot_t",301,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_released_io_complete_tn"
+	Set gtmtypes("shm_snapshot_t",301,"off")=7112
 	Set gtmtypes("shm_snapshot_t",301,"len")=8
 	Set gtmtypes("shm_snapshot_t",301,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_kept_tn")=301
-	Set gtmtypes("shm_snapshot_t",302,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_ignored_tn"
-	Set gtmtypes("shm_snapshot_t",302,"off")=7128
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_released_io_complete_tn")=301
+	Set gtmtypes("shm_snapshot_t",302,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_kept_tn"
+	Set gtmtypes("shm_snapshot_t",302,"off")=7120
 	Set gtmtypes("shm_snapshot_t",302,"len")=8
 	Set gtmtypes("shm_snapshot_t",302,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_ignored_tn")=302
-	Set gtmtypes("shm_snapshot_t",303,"name")="shm_snapshot_t.shadow_file_header.refmt_blk_chk_blk_freed_tn"
-	Set gtmtypes("shm_snapshot_t",303,"off")=7136
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_kept_tn")=302
+	Set gtmtypes("shm_snapshot_t",303,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_ignored_tn"
+	Set gtmtypes("shm_snapshot_t",303,"off")=7128
 	Set gtmtypes("shm_snapshot_t",303,"len")=8
 	Set gtmtypes("shm_snapshot_t",303,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_blk_chk_blk_freed_tn")=303
-	Set gtmtypes("shm_snapshot_t",304,"name")="shm_snapshot_t.shadow_file_header.refmt_blk_chk_blk_kept_tn"
-	Set gtmtypes("shm_snapshot_t",304,"off")=7144
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_ignored_tn")=303
+	Set gtmtypes("shm_snapshot_t",304,"name")="shm_snapshot_t.shadow_file_header.refmt_blk_chk_blk_freed_tn"
+	Set gtmtypes("shm_snapshot_t",304,"off")=7136
 	Set gtmtypes("shm_snapshot_t",304,"len")=8
 	Set gtmtypes("shm_snapshot_t",304,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_blk_chk_blk_kept_tn")=304
-	Set gtmtypes("shm_snapshot_t",305,"name")="shm_snapshot_t.shadow_file_header.active_lvl_trigger_tn"
-	Set gtmtypes("shm_snapshot_t",305,"off")=7152
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_blk_chk_blk_freed_tn")=304
+	Set gtmtypes("shm_snapshot_t",305,"name")="shm_snapshot_t.shadow_file_header.refmt_blk_chk_blk_kept_tn"
+	Set gtmtypes("shm_snapshot_t",305,"off")=7144
 	Set gtmtypes("shm_snapshot_t",305,"len")=8
 	Set gtmtypes("shm_snapshot_t",305,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.active_lvl_trigger_tn")=305
-	Set gtmtypes("shm_snapshot_t",306,"name")="shm_snapshot_t.shadow_file_header.new_buff_tn"
-	Set gtmtypes("shm_snapshot_t",306,"off")=7160
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_blk_chk_blk_kept_tn")=305
+	Set gtmtypes("shm_snapshot_t",306,"name")="shm_snapshot_t.shadow_file_header.active_lvl_trigger_tn"
+	Set gtmtypes("shm_snapshot_t",306,"off")=7152
 	Set gtmtypes("shm_snapshot_t",306,"len")=8
 	Set gtmtypes("shm_snapshot_t",306,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.new_buff_tn")=306
-	Set gtmtypes("shm_snapshot_t",307,"name")="shm_snapshot_t.shadow_file_header.phase2_commit_wait_sleep_in_crit_tn"
-	Set gtmtypes("shm_snapshot_t",307,"off")=7168
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.active_lvl_trigger_tn")=306
+	Set gtmtypes("shm_snapshot_t",307,"name")="shm_snapshot_t.shadow_file_header.new_buff_tn"
+	Set gtmtypes("shm_snapshot_t",307,"off")=7160
 	Set gtmtypes("shm_snapshot_t",307,"len")=8
 	Set gtmtypes("shm_snapshot_t",307,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.phase2_commit_wait_sleep_in_crit_tn")=307
-	Set gtmtypes("shm_snapshot_t",308,"name")="shm_snapshot_t.shadow_file_header.phase2_commit_wait_sleep_no_crit_tn"
-	Set gtmtypes("shm_snapshot_t",308,"off")=7176
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.new_buff_tn")=307
+	Set gtmtypes("shm_snapshot_t",308,"name")="shm_snapshot_t.shadow_file_header.phase2_commit_wait_sleep_in_crit_tn"
+	Set gtmtypes("shm_snapshot_t",308,"off")=7168
 	Set gtmtypes("shm_snapshot_t",308,"len")=8
 	Set gtmtypes("shm_snapshot_t",308,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.phase2_commit_wait_sleep_no_crit_tn")=308
-	Set gtmtypes("shm_snapshot_t",309,"name")="shm_snapshot_t.shadow_file_header.phase2_commit_wait_pidcnt_tn"
-	Set gtmtypes("shm_snapshot_t",309,"off")=7184
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.phase2_commit_wait_sleep_in_crit_tn")=308
+	Set gtmtypes("shm_snapshot_t",309,"name")="shm_snapshot_t.shadow_file_header.phase2_commit_wait_sleep_no_crit_tn"
+	Set gtmtypes("shm_snapshot_t",309,"off")=7176
 	Set gtmtypes("shm_snapshot_t",309,"len")=8
 	Set gtmtypes("shm_snapshot_t",309,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.phase2_commit_wait_pidcnt_tn")=309
-	Set gtmtypes("shm_snapshot_t",310,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_intend_wait_tn"
-	Set gtmtypes("shm_snapshot_t",310,"off")=7192
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.phase2_commit_wait_sleep_no_crit_tn")=309
+	Set gtmtypes("shm_snapshot_t",310,"name")="shm_snapshot_t.shadow_file_header.phase2_commit_wait_pidcnt_tn"
+	Set gtmtypes("shm_snapshot_t",310,"off")=7184
 	Set gtmtypes("shm_snapshot_t",310,"len")=8
 	Set gtmtypes("shm_snapshot_t",310,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_intend_wait_tn")=310
-	Set gtmtypes("shm_snapshot_t",311,"name")="shm_snapshot_t.shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_tn"
-	Set gtmtypes("shm_snapshot_t",311,"off")=7200
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.phase2_commit_wait_pidcnt_tn")=310
+	Set gtmtypes("shm_snapshot_t",311,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_intend_wait_tn"
+	Set gtmtypes("shm_snapshot_t",311,"off")=7192
 	Set gtmtypes("shm_snapshot_t",311,"len")=8
 	Set gtmtypes("shm_snapshot_t",311,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_tn")=311
-	Set gtmtypes("shm_snapshot_t",312,"name")="shm_snapshot_t.shadow_file_header.wcb_phase2_commit_wait_tn"
-	Set gtmtypes("shm_snapshot_t",312,"off")=7208
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_intend_wait_tn")=311
+	Set gtmtypes("shm_snapshot_t",312,"name")="shm_snapshot_t.shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_tn"
+	Set gtmtypes("shm_snapshot_t",312,"off")=7200
 	Set gtmtypes("shm_snapshot_t",312,"len")=8
 	Set gtmtypes("shm_snapshot_t",312,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_phase2_commit_wait_tn")=312
-	Set gtmtypes("shm_snapshot_t",313,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_calls_tn"
-	Set gtmtypes("shm_snapshot_t",313,"off")=7216
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_tn")=312
+	Set gtmtypes("shm_snapshot_t",313,"name")="shm_snapshot_t.shadow_file_header.wcb_phase2_commit_wait_tn"
+	Set gtmtypes("shm_snapshot_t",313,"off")=7208
 	Set gtmtypes("shm_snapshot_t",313,"len")=8
 	Set gtmtypes("shm_snapshot_t",313,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_calls_tn")=313
-	Set gtmtypes("shm_snapshot_t",314,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_rip_tn"
-	Set gtmtypes("shm_snapshot_t",314,"off")=7224
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_phase2_commit_wait_tn")=313
+	Set gtmtypes("shm_snapshot_t",314,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_calls_tn"
+	Set gtmtypes("shm_snapshot_t",314,"off")=7216
 	Set gtmtypes("shm_snapshot_t",314,"len")=8
 	Set gtmtypes("shm_snapshot_t",314,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_rip_tn")=314
-	Set gtmtypes("shm_snapshot_t",315,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_in_tend_tn"
-	Set gtmtypes("shm_snapshot_t",315,"off")=7232
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_calls_tn")=314
+	Set gtmtypes("shm_snapshot_t",315,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_rip_tn"
+	Set gtmtypes("shm_snapshot_t",315,"off")=7224
 	Set gtmtypes("shm_snapshot_t",315,"len")=8
 	Set gtmtypes("shm_snapshot_t",315,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_in_tend_tn")=315
-	Set gtmtypes("shm_snapshot_t",316,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_search_blk_tn"
-	Set gtmtypes("shm_snapshot_t",316,"off")=7240
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_rip_tn")=315
+	Set gtmtypes("shm_snapshot_t",316,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_in_tend_tn"
+	Set gtmtypes("shm_snapshot_t",316,"off")=7232
 	Set gtmtypes("shm_snapshot_t",316,"len")=8
 	Set gtmtypes("shm_snapshot_t",316,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_search_blk_tn")=316
-	Set gtmtypes("shm_snapshot_t",317,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_new_rec_tn"
-	Set gtmtypes("shm_snapshot_t",317,"off")=7248
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_in_tend_tn")=316
+	Set gtmtypes("shm_snapshot_t",317,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_search_blk_tn"
+	Set gtmtypes("shm_snapshot_t",317,"off")=7240
 	Set gtmtypes("shm_snapshot_t",317,"len")=8
 	Set gtmtypes("shm_snapshot_t",317,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_new_rec_tn")=317
-	Set gtmtypes("shm_snapshot_t",318,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_rec_size_tn"
-	Set gtmtypes("shm_snapshot_t",318,"off")=7256
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_search_blk_tn")=317
+	Set gtmtypes("shm_snapshot_t",318,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_new_rec_tn"
+	Set gtmtypes("shm_snapshot_t",318,"off")=7248
 	Set gtmtypes("shm_snapshot_t",318,"len")=8
 	Set gtmtypes("shm_snapshot_t",318,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_rec_size_tn")=318
-	Set gtmtypes("shm_snapshot_t",319,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_rec_cmpc_tn"
-	Set gtmtypes("shm_snapshot_t",319,"off")=7264
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_new_rec_tn")=318
+	Set gtmtypes("shm_snapshot_t",319,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_rec_size_tn"
+	Set gtmtypes("shm_snapshot_t",319,"off")=7256
 	Set gtmtypes("shm_snapshot_t",319,"len")=8
 	Set gtmtypes("shm_snapshot_t",319,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_rec_cmpc_tn")=319
-	Set gtmtypes("shm_snapshot_t",320,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_blk_fini_tn"
-	Set gtmtypes("shm_snapshot_t",320,"off")=7272
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_rec_size_tn")=319
+	Set gtmtypes("shm_snapshot_t",320,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_rec_cmpc_tn"
+	Set gtmtypes("shm_snapshot_t",320,"off")=7264
 	Set gtmtypes("shm_snapshot_t",320,"len")=8
 	Set gtmtypes("shm_snapshot_t",320,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_blk_fini_tn")=320
-	Set gtmtypes("shm_snapshot_t",321,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_blk_split_tn"
-	Set gtmtypes("shm_snapshot_t",321,"off")=7280
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_rec_cmpc_tn")=320
+	Set gtmtypes("shm_snapshot_t",321,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_blk_fini_tn"
+	Set gtmtypes("shm_snapshot_t",321,"off")=7272
 	Set gtmtypes("shm_snapshot_t",321,"len")=8
 	Set gtmtypes("shm_snapshot_t",321,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_blk_split_tn")=321
-	Set gtmtypes("shm_snapshot_t",322,"name")="shm_snapshot_t.shadow_file_header.t_qread_ripsleep_cnt_tn"
-	Set gtmtypes("shm_snapshot_t",322,"off")=7288
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_blk_fini_tn")=321
+	Set gtmtypes("shm_snapshot_t",322,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_blk_split_tn"
+	Set gtmtypes("shm_snapshot_t",322,"off")=7280
 	Set gtmtypes("shm_snapshot_t",322,"len")=8
 	Set gtmtypes("shm_snapshot_t",322,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_ripsleep_cnt_tn")=322
-	Set gtmtypes("shm_snapshot_t",323,"name")="shm_snapshot_t.shadow_file_header.t_qread_ripsleep_nblks_tn"
-	Set gtmtypes("shm_snapshot_t",323,"off")=7296
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_blk_split_tn")=322
+	Set gtmtypes("shm_snapshot_t",323,"name")="shm_snapshot_t.shadow_file_header.t_qread_ripsleep_cnt_tn"
+	Set gtmtypes("shm_snapshot_t",323,"off")=7288
 	Set gtmtypes("shm_snapshot_t",323,"len")=8
 	Set gtmtypes("shm_snapshot_t",323,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_ripsleep_nblks_tn")=323
-	Set gtmtypes("shm_snapshot_t",324,"name")="shm_snapshot_t.shadow_file_header.bg_trc_rec_tn_filler"
-	Set gtmtypes("shm_snapshot_t",324,"off")=7304
-	Set gtmtypes("shm_snapshot_t",324,"len")=112
-	Set gtmtypes("shm_snapshot_t",324,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bg_trc_rec_tn_filler")=324
-	Set gtmtypes("shm_snapshot_t",325,"name")="shm_snapshot_t.shadow_file_header.total_buffer_flush_cntr"
-	Set gtmtypes("shm_snapshot_t",325,"off")=7416
-	Set gtmtypes("shm_snapshot_t",325,"len")=4
-	Set gtmtypes("shm_snapshot_t",325,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.total_buffer_flush_cntr")=325
-	Set gtmtypes("shm_snapshot_t",326,"name")="shm_snapshot_t.shadow_file_header.bufct_buffer_flush_cntr"
-	Set gtmtypes("shm_snapshot_t",326,"off")=7420
-	Set gtmtypes("shm_snapshot_t",326,"len")=4
-	Set gtmtypes("shm_snapshot_t",326,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bufct_buffer_flush_cntr")=326
-	Set gtmtypes("shm_snapshot_t",327,"name")="shm_snapshot_t.shadow_file_header.bufct_buffer_flush_loop_cntr"
-	Set gtmtypes("shm_snapshot_t",327,"off")=7424
-	Set gtmtypes("shm_snapshot_t",327,"len")=4
-	Set gtmtypes("shm_snapshot_t",327,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bufct_buffer_flush_loop_cntr")=327
-	Set gtmtypes("shm_snapshot_t",328,"name")="shm_snapshot_t.shadow_file_header.wrt_calls_cntr"
-	Set gtmtypes("shm_snapshot_t",328,"off")=7428
-	Set gtmtypes("shm_snapshot_t",328,"len")=4
-	Set gtmtypes("shm_snapshot_t",328,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_calls_cntr")=328
-	Set gtmtypes("shm_snapshot_t",329,"name")="shm_snapshot_t.shadow_file_header.wrt_count_cntr"
-	Set gtmtypes("shm_snapshot_t",329,"off")=7432
-	Set gtmtypes("shm_snapshot_t",329,"len")=4
-	Set gtmtypes("shm_snapshot_t",329,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_count_cntr")=329
-	Set gtmtypes("shm_snapshot_t",330,"name")="shm_snapshot_t.shadow_file_header.wrt_blocked_cntr"
-	Set gtmtypes("shm_snapshot_t",330,"off")=7436
-	Set gtmtypes("shm_snapshot_t",330,"len")=4
-	Set gtmtypes("shm_snapshot_t",330,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_blocked_cntr")=330
-	Set gtmtypes("shm_snapshot_t",331,"name")="shm_snapshot_t.shadow_file_header.wrt_busy_cntr"
-	Set gtmtypes("shm_snapshot_t",331,"off")=7440
-	Set gtmtypes("shm_snapshot_t",331,"len")=4
-	Set gtmtypes("shm_snapshot_t",331,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_busy_cntr")=331
-	Set gtmtypes("shm_snapshot_t",332,"name")="shm_snapshot_t.shadow_file_header.wrt_noblks_wrtn_cntr"
-	Set gtmtypes("shm_snapshot_t",332,"off")=7444
-	Set gtmtypes("shm_snapshot_t",332,"len")=4
-	Set gtmtypes("shm_snapshot_t",332,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_noblks_wrtn_cntr")=332
-	Set gtmtypes("shm_snapshot_t",333,"name")="shm_snapshot_t.shadow_file_header.reserved_bgtrcrec1_cntr"
-	Set gtmtypes("shm_snapshot_t",333,"off")=7448
-	Set gtmtypes("shm_snapshot_t",333,"len")=4
-	Set gtmtypes("shm_snapshot_t",333,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reserved_bgtrcrec1_cntr")=333
-	Set gtmtypes("shm_snapshot_t",334,"name")="shm_snapshot_t.shadow_file_header.reserved_bgtrcrec2_cntr"
-	Set gtmtypes("shm_snapshot_t",334,"off")=7452
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_ripsleep_cnt_tn")=323
+	Set gtmtypes("shm_snapshot_t",324,"name")="shm_snapshot_t.shadow_file_header.t_qread_ripsleep_nblks_tn"
+	Set gtmtypes("shm_snapshot_t",324,"off")=7296
+	Set gtmtypes("shm_snapshot_t",324,"len")=8
+	Set gtmtypes("shm_snapshot_t",324,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_ripsleep_nblks_tn")=324
+	Set gtmtypes("shm_snapshot_t",325,"name")="shm_snapshot_t.shadow_file_header.wcs_wtfini_invoked_tn"
+	Set gtmtypes("shm_snapshot_t",325,"off")=7304
+	Set gtmtypes("shm_snapshot_t",325,"len")=8
+	Set gtmtypes("shm_snapshot_t",325,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wtfini_invoked_tn")=325
+	Set gtmtypes("shm_snapshot_t",326,"name")="shm_snapshot_t.shadow_file_header.wcs_wterror_invoked_tn"
+	Set gtmtypes("shm_snapshot_t",326,"off")=7312
+	Set gtmtypes("shm_snapshot_t",326,"len")=8
+	Set gtmtypes("shm_snapshot_t",326,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wterror_invoked_tn")=326
+	Set gtmtypes("shm_snapshot_t",327,"name")="shm_snapshot_t.shadow_file_header.wcs_wt_restart_invoked_tn"
+	Set gtmtypes("shm_snapshot_t",327,"off")=7320
+	Set gtmtypes("shm_snapshot_t",327,"len")=8
+	Set gtmtypes("shm_snapshot_t",327,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wt_restart_invoked_tn")=327
+	Set gtmtypes("shm_snapshot_t",328,"name")="shm_snapshot_t.shadow_file_header.wcs_wt_restart_eagain_tn"
+	Set gtmtypes("shm_snapshot_t",328,"off")=7328
+	Set gtmtypes("shm_snapshot_t",328,"len")=8
+	Set gtmtypes("shm_snapshot_t",328,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wt_restart_eagain_tn")=328
+	Set gtmtypes("shm_snapshot_t",329,"name")="shm_snapshot_t.shadow_file_header.wcs_wt_restart_reinsert_tn"
+	Set gtmtypes("shm_snapshot_t",329,"off")=7336
+	Set gtmtypes("shm_snapshot_t",329,"len")=8
+	Set gtmtypes("shm_snapshot_t",329,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wt_restart_reinsert_tn")=329
+	Set gtmtypes("shm_snapshot_t",330,"name")="shm_snapshot_t.shadow_file_header.wcs_wtstart_eagain_tn"
+	Set gtmtypes("shm_snapshot_t",330,"off")=7344
+	Set gtmtypes("shm_snapshot_t",330,"len")=8
+	Set gtmtypes("shm_snapshot_t",330,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wtstart_eagain_tn")=330
+	Set gtmtypes("shm_snapshot_t",331,"name")="shm_snapshot_t.shadow_file_header.wcs_wtstart_eagain_incrit_tn"
+	Set gtmtypes("shm_snapshot_t",331,"off")=7352
+	Set gtmtypes("shm_snapshot_t",331,"len")=8
+	Set gtmtypes("shm_snapshot_t",331,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wtstart_eagain_incrit_tn")=331
+	Set gtmtypes("shm_snapshot_t",332,"name")="shm_snapshot_t.shadow_file_header.async_restart_eagain_tn"
+	Set gtmtypes("shm_snapshot_t",332,"off")=7360
+	Set gtmtypes("shm_snapshot_t",332,"len")=8
+	Set gtmtypes("shm_snapshot_t",332,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.async_restart_eagain_tn")=332
+	Set gtmtypes("shm_snapshot_t",333,"name")="shm_snapshot_t.shadow_file_header.bg_trc_rec_tn_filler"
+	Set gtmtypes("shm_snapshot_t",333,"off")=7368
+	Set gtmtypes("shm_snapshot_t",333,"len")=48
+	Set gtmtypes("shm_snapshot_t",333,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bg_trc_rec_tn_filler")=333
+	Set gtmtypes("shm_snapshot_t",334,"name")="shm_snapshot_t.shadow_file_header.total_buffer_flush_cntr"
+	Set gtmtypes("shm_snapshot_t",334,"off")=7416
 	Set gtmtypes("shm_snapshot_t",334,"len")=4
 	Set gtmtypes("shm_snapshot_t",334,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reserved_bgtrcrec2_cntr")=334
-	Set gtmtypes("shm_snapshot_t",335,"name")="shm_snapshot_t.shadow_file_header.reserved_bgtrcrec3_cntr"
-	Set gtmtypes("shm_snapshot_t",335,"off")=7456
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.total_buffer_flush_cntr")=334
+	Set gtmtypes("shm_snapshot_t",335,"name")="shm_snapshot_t.shadow_file_header.bufct_buffer_flush_cntr"
+	Set gtmtypes("shm_snapshot_t",335,"off")=7420
 	Set gtmtypes("shm_snapshot_t",335,"len")=4
 	Set gtmtypes("shm_snapshot_t",335,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reserved_bgtrcrec3_cntr")=335
-	Set gtmtypes("shm_snapshot_t",336,"name")="shm_snapshot_t.shadow_file_header.lost_block_recovery_cntr"
-	Set gtmtypes("shm_snapshot_t",336,"off")=7460
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bufct_buffer_flush_cntr")=335
+	Set gtmtypes("shm_snapshot_t",336,"name")="shm_snapshot_t.shadow_file_header.bufct_buffer_flush_loop_cntr"
+	Set gtmtypes("shm_snapshot_t",336,"off")=7424
 	Set gtmtypes("shm_snapshot_t",336,"len")=4
 	Set gtmtypes("shm_snapshot_t",336,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.lost_block_recovery_cntr")=336
-	Set gtmtypes("shm_snapshot_t",337,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_onln_rlbk_cntr"
-	Set gtmtypes("shm_snapshot_t",337,"off")=7464
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bufct_buffer_flush_loop_cntr")=336
+	Set gtmtypes("shm_snapshot_t",337,"name")="shm_snapshot_t.shadow_file_header.wrt_calls_cntr"
+	Set gtmtypes("shm_snapshot_t",337,"off")=7428
 	Set gtmtypes("shm_snapshot_t",337,"len")=4
 	Set gtmtypes("shm_snapshot_t",337,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_onln_rlbk_cntr")=337
-	Set gtmtypes("shm_snapshot_t",338,"name")="shm_snapshot_t.shadow_file_header.stale_cntr"
-	Set gtmtypes("shm_snapshot_t",338,"off")=7468
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_calls_cntr")=337
+	Set gtmtypes("shm_snapshot_t",338,"name")="shm_snapshot_t.shadow_file_header.wrt_count_cntr"
+	Set gtmtypes("shm_snapshot_t",338,"off")=7432
 	Set gtmtypes("shm_snapshot_t",338,"len")=4
 	Set gtmtypes("shm_snapshot_t",338,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_cntr")=338
-	Set gtmtypes("shm_snapshot_t",339,"name")="shm_snapshot_t.shadow_file_header.starved_cntr"
-	Set gtmtypes("shm_snapshot_t",339,"off")=7472
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_count_cntr")=338
+	Set gtmtypes("shm_snapshot_t",339,"name")="shm_snapshot_t.shadow_file_header.wrt_blocked_cntr"
+	Set gtmtypes("shm_snapshot_t",339,"off")=7436
 	Set gtmtypes("shm_snapshot_t",339,"len")=4
 	Set gtmtypes("shm_snapshot_t",339,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.starved_cntr")=339
-	Set gtmtypes("shm_snapshot_t",340,"name")="shm_snapshot_t.shadow_file_header.stale_timer_started_cntr"
-	Set gtmtypes("shm_snapshot_t",340,"off")=7476
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_blocked_cntr")=339
+	Set gtmtypes("shm_snapshot_t",340,"name")="shm_snapshot_t.shadow_file_header.wrt_busy_cntr"
+	Set gtmtypes("shm_snapshot_t",340,"off")=7440
 	Set gtmtypes("shm_snapshot_t",340,"len")=4
 	Set gtmtypes("shm_snapshot_t",340,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_timer_started_cntr")=340
-	Set gtmtypes("shm_snapshot_t",341,"name")="shm_snapshot_t.shadow_file_header.stale_timer_pop_cntr"
-	Set gtmtypes("shm_snapshot_t",341,"off")=7480
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_busy_cntr")=340
+	Set gtmtypes("shm_snapshot_t",341,"name")="shm_snapshot_t.shadow_file_header.wrt_noblks_wrtn_cntr"
+	Set gtmtypes("shm_snapshot_t",341,"off")=7444
 	Set gtmtypes("shm_snapshot_t",341,"len")=4
 	Set gtmtypes("shm_snapshot_t",341,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_timer_pop_cntr")=341
-	Set gtmtypes("shm_snapshot_t",342,"name")="shm_snapshot_t.shadow_file_header.stale_process_defer_cntr"
-	Set gtmtypes("shm_snapshot_t",342,"off")=7484
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_noblks_wrtn_cntr")=341
+	Set gtmtypes("shm_snapshot_t",342,"name")="shm_snapshot_t.shadow_file_header.reserved_bgtrcrec1_cntr"
+	Set gtmtypes("shm_snapshot_t",342,"off")=7448
 	Set gtmtypes("shm_snapshot_t",342,"len")=4
 	Set gtmtypes("shm_snapshot_t",342,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_process_defer_cntr")=342
-	Set gtmtypes("shm_snapshot_t",343,"name")="shm_snapshot_t.shadow_file_header.stale_defer_processed_cntr"
-	Set gtmtypes("shm_snapshot_t",343,"off")=7488
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reserved_bgtrcrec1_cntr")=342
+	Set gtmtypes("shm_snapshot_t",343,"name")="shm_snapshot_t.shadow_file_header.reserved_bgtrcrec2_cntr"
+	Set gtmtypes("shm_snapshot_t",343,"off")=7452
 	Set gtmtypes("shm_snapshot_t",343,"len")=4
 	Set gtmtypes("shm_snapshot_t",343,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_defer_processed_cntr")=343
-	Set gtmtypes("shm_snapshot_t",344,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flush_cntr"
-	Set gtmtypes("shm_snapshot_t",344,"off")=7492
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reserved_bgtrcrec2_cntr")=343
+	Set gtmtypes("shm_snapshot_t",344,"name")="shm_snapshot_t.shadow_file_header.reserved_bgtrcrec3_cntr"
+	Set gtmtypes("shm_snapshot_t",344,"off")=7456
 	Set gtmtypes("shm_snapshot_t",344,"len")=4
 	Set gtmtypes("shm_snapshot_t",344,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flush_cntr")=344
-	Set gtmtypes("shm_snapshot_t",345,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flush_loop_cntr"
-	Set gtmtypes("shm_snapshot_t",345,"off")=7496
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reserved_bgtrcrec3_cntr")=344
+	Set gtmtypes("shm_snapshot_t",345,"name")="shm_snapshot_t.shadow_file_header.lost_block_recovery_cntr"
+	Set gtmtypes("shm_snapshot_t",345,"off")=7460
 	Set gtmtypes("shm_snapshot_t",345,"len")=4
 	Set gtmtypes("shm_snapshot_t",345,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flush_loop_cntr")=345
-	Set gtmtypes("shm_snapshot_t",346,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flush_retries_cntr"
-	Set gtmtypes("shm_snapshot_t",346,"off")=7500
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.lost_block_recovery_cntr")=345
+	Set gtmtypes("shm_snapshot_t",346,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_onln_rlbk_cntr"
+	Set gtmtypes("shm_snapshot_t",346,"off")=7464
 	Set gtmtypes("shm_snapshot_t",346,"len")=4
 	Set gtmtypes("shm_snapshot_t",346,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flush_retries_cntr")=346
-	Set gtmtypes("shm_snapshot_t",347,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flushed_during_lockwait_cntr"
-	Set gtmtypes("shm_snapshot_t",347,"off")=7504
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_onln_rlbk_cntr")=346
+	Set gtmtypes("shm_snapshot_t",347,"name")="shm_snapshot_t.shadow_file_header.stale_cntr"
+	Set gtmtypes("shm_snapshot_t",347,"off")=7468
 	Set gtmtypes("shm_snapshot_t",347,"len")=4
 	Set gtmtypes("shm_snapshot_t",347,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flushed_during_lockwait_cntr")=347
-	Set gtmtypes("shm_snapshot_t",348,"name")="shm_snapshot_t.shadow_file_header.tp_crit_retries_cntr"
-	Set gtmtypes("shm_snapshot_t",348,"off")=7508
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_cntr")=347
+	Set gtmtypes("shm_snapshot_t",348,"name")="shm_snapshot_t.shadow_file_header.starved_cntr"
+	Set gtmtypes("shm_snapshot_t",348,"off")=7472
 	Set gtmtypes("shm_snapshot_t",348,"len")=4
 	Set gtmtypes("shm_snapshot_t",348,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.tp_crit_retries_cntr")=348
-	Set gtmtypes("shm_snapshot_t",349,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_flush_dirty_cntr"
-	Set gtmtypes("shm_snapshot_t",349,"off")=7512
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.starved_cntr")=348
+	Set gtmtypes("shm_snapshot_t",349,"name")="shm_snapshot_t.shadow_file_header.stale_timer_started_cntr"
+	Set gtmtypes("shm_snapshot_t",349,"off")=7476
 	Set gtmtypes("shm_snapshot_t",349,"len")=4
 	Set gtmtypes("shm_snapshot_t",349,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_flush_dirty_cntr")=349
-	Set gtmtypes("shm_snapshot_t",350,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_rip_wait_cntr"
-	Set gtmtypes("shm_snapshot_t",350,"off")=7516
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_timer_started_cntr")=349
+	Set gtmtypes("shm_snapshot_t",350,"name")="shm_snapshot_t.shadow_file_header.stale_timer_pop_cntr"
+	Set gtmtypes("shm_snapshot_t",350,"off")=7480
 	Set gtmtypes("shm_snapshot_t",350,"len")=4
 	Set gtmtypes("shm_snapshot_t",350,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_rip_wait_cntr")=350
-	Set gtmtypes("shm_snapshot_t",351,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_buf_owner_stuck_cntr"
-	Set gtmtypes("shm_snapshot_t",351,"off")=7520
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_timer_pop_cntr")=350
+	Set gtmtypes("shm_snapshot_t",351,"name")="shm_snapshot_t.shadow_file_header.stale_process_defer_cntr"
+	Set gtmtypes("shm_snapshot_t",351,"off")=7484
 	Set gtmtypes("shm_snapshot_t",351,"len")=4
 	Set gtmtypes("shm_snapshot_t",351,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_buf_owner_stuck_cntr")=351
-	Set gtmtypes("shm_snapshot_t",352,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_out_of_design_cntr"
-	Set gtmtypes("shm_snapshot_t",352,"off")=7524
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_process_defer_cntr")=351
+	Set gtmtypes("shm_snapshot_t",352,"name")="shm_snapshot_t.shadow_file_header.stale_defer_processed_cntr"
+	Set gtmtypes("shm_snapshot_t",352,"off")=7488
 	Set gtmtypes("shm_snapshot_t",352,"len")=4
 	Set gtmtypes("shm_snapshot_t",352,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_out_of_design_cntr")=352
-	Set gtmtypes("shm_snapshot_t",353,"name")="shm_snapshot_t.shadow_file_header.t_qread_buf_owner_stuck_cntr"
-	Set gtmtypes("shm_snapshot_t",353,"off")=7528
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_defer_processed_cntr")=352
+	Set gtmtypes("shm_snapshot_t",353,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flush_cntr"
+	Set gtmtypes("shm_snapshot_t",353,"off")=7492
 	Set gtmtypes("shm_snapshot_t",353,"len")=4
 	Set gtmtypes("shm_snapshot_t",353,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_buf_owner_stuck_cntr")=353
-	Set gtmtypes("shm_snapshot_t",354,"name")="shm_snapshot_t.shadow_file_header.t_qread_out_of_design_cntr"
-	Set gtmtypes("shm_snapshot_t",354,"off")=7532
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flush_cntr")=353
+	Set gtmtypes("shm_snapshot_t",354,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flush_loop_cntr"
+	Set gtmtypes("shm_snapshot_t",354,"off")=7496
 	Set gtmtypes("shm_snapshot_t",354,"len")=4
 	Set gtmtypes("shm_snapshot_t",354,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_out_of_design_cntr")=354
-	Set gtmtypes("shm_snapshot_t",355,"name")="shm_snapshot_t.shadow_file_header.bt_put_flush_dirty_cntr"
-	Set gtmtypes("shm_snapshot_t",355,"off")=7536
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flush_loop_cntr")=354
+	Set gtmtypes("shm_snapshot_t",355,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flush_retries_cntr"
+	Set gtmtypes("shm_snapshot_t",355,"off")=7500
 	Set gtmtypes("shm_snapshot_t",355,"len")=4
 	Set gtmtypes("shm_snapshot_t",355,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bt_put_flush_dirty_cntr")=355
-	Set gtmtypes("shm_snapshot_t",356,"name")="shm_snapshot_t.shadow_file_header.mlock_wakeups_cntr"
-	Set gtmtypes("shm_snapshot_t",356,"off")=7540
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flush_retries_cntr")=355
+	Set gtmtypes("shm_snapshot_t",356,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flushed_during_lockwait_cntr"
+	Set gtmtypes("shm_snapshot_t",356,"off")=7504
 	Set gtmtypes("shm_snapshot_t",356,"len")=4
 	Set gtmtypes("shm_snapshot_t",356,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.mlock_wakeups_cntr")=356
-	Set gtmtypes("shm_snapshot_t",357,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_recover_invoked_cntr"
-	Set gtmtypes("shm_snapshot_t",357,"off")=7544
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flushed_during_lockwait_cntr")=356
+	Set gtmtypes("shm_snapshot_t",357,"name")="shm_snapshot_t.shadow_file_header.tp_crit_retries_cntr"
+	Set gtmtypes("shm_snapshot_t",357,"off")=7508
 	Set gtmtypes("shm_snapshot_t",357,"len")=4
 	Set gtmtypes("shm_snapshot_t",357,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_recover_invoked_cntr")=357
-	Set gtmtypes("shm_snapshot_t",358,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_verify_passed_cntr"
-	Set gtmtypes("shm_snapshot_t",358,"off")=7548
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.tp_crit_retries_cntr")=357
+	Set gtmtypes("shm_snapshot_t",358,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_flush_dirty_cntr"
+	Set gtmtypes("shm_snapshot_t",358,"off")=7512
 	Set gtmtypes("shm_snapshot_t",358,"len")=4
 	Set gtmtypes("shm_snapshot_t",358,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_verify_passed_cntr")=358
-	Set gtmtypes("shm_snapshot_t",359,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr"
-	Set gtmtypes("shm_snapshot_t",359,"off")=7552
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_flush_dirty_cntr")=358
+	Set gtmtypes("shm_snapshot_t",359,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_rip_wait_cntr"
+	Set gtmtypes("shm_snapshot_t",359,"off")=7516
 	Set gtmtypes("shm_snapshot_t",359,"len")=4
 	Set gtmtypes("shm_snapshot_t",359,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr")=359
-	Set gtmtypes("shm_snapshot_t",360,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_cntr"
-	Set gtmtypes("shm_snapshot_t",360,"off")=7556
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_rip_wait_cntr")=359
+	Set gtmtypes("shm_snapshot_t",360,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_buf_owner_stuck_cntr"
+	Set gtmtypes("shm_snapshot_t",360,"off")=7520
 	Set gtmtypes("shm_snapshot_t",360,"len")=4
 	Set gtmtypes("shm_snapshot_t",360,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_cntr")=360
-	Set gtmtypes("shm_snapshot_t",361,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_db_csh_getn_loopexceed_cntr"
-	Set gtmtypes("shm_snapshot_t",361,"off")=7560
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_buf_owner_stuck_cntr")=360
+	Set gtmtypes("shm_snapshot_t",361,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_out_of_design_cntr"
+	Set gtmtypes("shm_snapshot_t",361,"off")=7524
 	Set gtmtypes("shm_snapshot_t",361,"len")=4
 	Set gtmtypes("shm_snapshot_t",361,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_db_csh_getn_loopexceed_cntr")=361
-	Set gtmtypes("shm_snapshot_t",362,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_cntr"
-	Set gtmtypes("shm_snapshot_t",362,"off")=7564
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_out_of_design_cntr")=361
+	Set gtmtypes("shm_snapshot_t",362,"name")="shm_snapshot_t.shadow_file_header.t_qread_buf_owner_stuck_cntr"
+	Set gtmtypes("shm_snapshot_t",362,"off")=7528
 	Set gtmtypes("shm_snapshot_t",362,"len")=4
 	Set gtmtypes("shm_snapshot_t",362,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_cntr")=362
-	Set gtmtypes("shm_snapshot_t",363,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_db_csh_get_cntr"
-	Set gtmtypes("shm_snapshot_t",363,"off")=7568
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_buf_owner_stuck_cntr")=362
+	Set gtmtypes("shm_snapshot_t",363,"name")="shm_snapshot_t.shadow_file_header.t_qread_out_of_design_cntr"
+	Set gtmtypes("shm_snapshot_t",363,"off")=7532
 	Set gtmtypes("shm_snapshot_t",363,"len")=4
 	Set gtmtypes("shm_snapshot_t",363,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_db_csh_get_cntr")=363
-	Set gtmtypes("shm_snapshot_t",364,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_wcsgetspace_cntr"
-	Set gtmtypes("shm_snapshot_t",364,"off")=7572
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_out_of_design_cntr")=363
+	Set gtmtypes("shm_snapshot_t",364,"name")="shm_snapshot_t.shadow_file_header.bt_put_flush_dirty_cntr"
+	Set gtmtypes("shm_snapshot_t",364,"off")=7536
 	Set gtmtypes("shm_snapshot_t",364,"len")=4
 	Set gtmtypes("shm_snapshot_t",364,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_wcsgetspace_cntr")=364
-	Set gtmtypes("shm_snapshot_t",365,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_t1_cntr"
-	Set gtmtypes("shm_snapshot_t",365,"off")=7576
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bt_put_flush_dirty_cntr")=364
+	Set gtmtypes("shm_snapshot_t",365,"name")="shm_snapshot_t.shadow_file_header.mlock_wakeups_cntr"
+	Set gtmtypes("shm_snapshot_t",365,"off")=7540
 	Set gtmtypes("shm_snapshot_t",365,"len")=4
 	Set gtmtypes("shm_snapshot_t",365,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_t1_cntr")=365
-	Set gtmtypes("shm_snapshot_t",366,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_bitmap_cntr"
-	Set gtmtypes("shm_snapshot_t",366,"off")=7580
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.mlock_wakeups_cntr")=365
+	Set gtmtypes("shm_snapshot_t",366,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_recover_invoked_cntr"
+	Set gtmtypes("shm_snapshot_t",366,"off")=7544
 	Set gtmtypes("shm_snapshot_t",366,"len")=4
 	Set gtmtypes("shm_snapshot_t",366,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_bitmap_cntr")=366
-	Set gtmtypes("shm_snapshot_t",367,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_jnl_cwset_cntr"
-	Set gtmtypes("shm_snapshot_t",367,"off")=7584
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_recover_invoked_cntr")=366
+	Set gtmtypes("shm_snapshot_t",367,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_verify_passed_cntr"
+	Set gtmtypes("shm_snapshot_t",367,"off")=7548
 	Set gtmtypes("shm_snapshot_t",367,"len")=4
 	Set gtmtypes("shm_snapshot_t",367,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_jnl_cwset_cntr")=367
-	Set gtmtypes("shm_snapshot_t",368,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_cntr"
-	Set gtmtypes("shm_snapshot_t",368,"off")=7588
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_verify_passed_cntr")=367
+	Set gtmtypes("shm_snapshot_t",368,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr"
+	Set gtmtypes("shm_snapshot_t",368,"off")=7552
 	Set gtmtypes("shm_snapshot_t",368,"len")=4
 	Set gtmtypes("shm_snapshot_t",368,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_cntr")=368
-	Set gtmtypes("shm_snapshot_t",369,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_hist_cntr"
-	Set gtmtypes("shm_snapshot_t",369,"off")=7592
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr")=368
+	Set gtmtypes("shm_snapshot_t",369,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_cntr"
+	Set gtmtypes("shm_snapshot_t",369,"off")=7556
 	Set gtmtypes("shm_snapshot_t",369,"len")=4
 	Set gtmtypes("shm_snapshot_t",369,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_hist_cntr")=369
-	Set gtmtypes("shm_snapshot_t",370,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_hist1_nullbt_cntr"
-	Set gtmtypes("shm_snapshot_t",370,"off")=7596
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_cntr")=369
+	Set gtmtypes("shm_snapshot_t",370,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_db_csh_getn_loopexceed_cntr"
+	Set gtmtypes("shm_snapshot_t",370,"off")=7560
 	Set gtmtypes("shm_snapshot_t",370,"len")=4
 	Set gtmtypes("shm_snapshot_t",370,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_hist1_nullbt_cntr")=370
-	Set gtmtypes("shm_snapshot_t",371,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_cntr"
-	Set gtmtypes("shm_snapshot_t",371,"off")=7600
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_db_csh_getn_loopexceed_cntr")=370
+	Set gtmtypes("shm_snapshot_t",371,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_cntr"
+	Set gtmtypes("shm_snapshot_t",371,"off")=7564
 	Set gtmtypes("shm_snapshot_t",371,"len")=4
 	Set gtmtypes("shm_snapshot_t",371,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_cntr")=371
-	Set gtmtypes("shm_snapshot_t",372,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_bitmap_nullbt_cntr"
-	Set gtmtypes("shm_snapshot_t",372,"off")=7604
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_cntr")=371
+	Set gtmtypes("shm_snapshot_t",372,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_db_csh_get_cntr"
+	Set gtmtypes("shm_snapshot_t",372,"off")=7568
 	Set gtmtypes("shm_snapshot_t",372,"len")=4
 	Set gtmtypes("shm_snapshot_t",372,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_bitmap_nullbt_cntr")=372
-	Set gtmtypes("shm_snapshot_t",373,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_cntr"
-	Set gtmtypes("shm_snapshot_t",373,"off")=7608
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_db_csh_get_cntr")=372
+	Set gtmtypes("shm_snapshot_t",373,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_wcsgetspace_cntr"
+	Set gtmtypes("shm_snapshot_t",373,"off")=7572
 	Set gtmtypes("shm_snapshot_t",373,"len")=4
 	Set gtmtypes("shm_snapshot_t",373,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_cntr")=373
-	Set gtmtypes("shm_snapshot_t",374,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_jnl_cwset_cntr"
-	Set gtmtypes("shm_snapshot_t",374,"off")=7612
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_wcsgetspace_cntr")=373
+	Set gtmtypes("shm_snapshot_t",374,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_t1_cntr"
+	Set gtmtypes("shm_snapshot_t",374,"off")=7576
 	Set gtmtypes("shm_snapshot_t",374,"len")=4
 	Set gtmtypes("shm_snapshot_t",374,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_jnl_cwset_cntr")=374
-	Set gtmtypes("shm_snapshot_t",375,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_jnl_wcsflu_cntr"
-	Set gtmtypes("shm_snapshot_t",375,"off")=7616
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_t1_cntr")=374
+	Set gtmtypes("shm_snapshot_t",375,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_bitmap_cntr"
+	Set gtmtypes("shm_snapshot_t",375,"off")=7580
 	Set gtmtypes("shm_snapshot_t",375,"len")=4
 	Set gtmtypes("shm_snapshot_t",375,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_jnl_wcsflu_cntr")=375
-	Set gtmtypes("shm_snapshot_t",376,"name")="shm_snapshot_t.shadow_file_header.db_csh_get_too_many_loops_cntr"
-	Set gtmtypes("shm_snapshot_t",376,"off")=7620
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_bitmap_cntr")=375
+	Set gtmtypes("shm_snapshot_t",376,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_jnl_cwset_cntr"
+	Set gtmtypes("shm_snapshot_t",376,"off")=7584
 	Set gtmtypes("shm_snapshot_t",376,"len")=4
 	Set gtmtypes("shm_snapshot_t",376,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_get_too_many_loops_cntr")=376
-	Set gtmtypes("shm_snapshot_t",377,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tpckh_hist1_nullbt_cntr"
-	Set gtmtypes("shm_snapshot_t",377,"off")=7624
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_jnl_cwset_cntr")=376
+	Set gtmtypes("shm_snapshot_t",377,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_cntr"
+	Set gtmtypes("shm_snapshot_t",377,"off")=7588
 	Set gtmtypes("shm_snapshot_t",377,"len")=4
 	Set gtmtypes("shm_snapshot_t",377,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tpckh_hist1_nullbt_cntr")=377
-	Set gtmtypes("shm_snapshot_t",378,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_cntr"
-	Set gtmtypes("shm_snapshot_t",378,"off")=7628
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_cntr")=377
+	Set gtmtypes("shm_snapshot_t",378,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_hist_cntr"
+	Set gtmtypes("shm_snapshot_t",378,"off")=7592
 	Set gtmtypes("shm_snapshot_t",378,"len")=4
 	Set gtmtypes("shm_snapshot_t",378,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_cntr")=378
-	Set gtmtypes("shm_snapshot_t",379,"name")="shm_snapshot_t.shadow_file_header.jnl_blocked_writer_lost_cntr"
-	Set gtmtypes("shm_snapshot_t",379,"off")=7632
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_hist_cntr")=378
+	Set gtmtypes("shm_snapshot_t",379,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_hist1_nullbt_cntr"
+	Set gtmtypes("shm_snapshot_t",379,"off")=7596
 	Set gtmtypes("shm_snapshot_t",379,"len")=4
 	Set gtmtypes("shm_snapshot_t",379,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_blocked_writer_lost_cntr")=379
-	Set gtmtypes("shm_snapshot_t",380,"name")="shm_snapshot_t.shadow_file_header.jnl_blocked_writer_stuck_cntr"
-	Set gtmtypes("shm_snapshot_t",380,"off")=7636
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_hist1_nullbt_cntr")=379
+	Set gtmtypes("shm_snapshot_t",380,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_cntr"
+	Set gtmtypes("shm_snapshot_t",380,"off")=7600
 	Set gtmtypes("shm_snapshot_t",380,"len")=4
 	Set gtmtypes("shm_snapshot_t",380,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_blocked_writer_stuck_cntr")=380
-	Set gtmtypes("shm_snapshot_t",381,"name")="shm_snapshot_t.shadow_file_header.jnl_blocked_writer_blocked_cntr"
-	Set gtmtypes("shm_snapshot_t",381,"off")=7640
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_cntr")=380
+	Set gtmtypes("shm_snapshot_t",381,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_bitmap_nullbt_cntr"
+	Set gtmtypes("shm_snapshot_t",381,"off")=7604
 	Set gtmtypes("shm_snapshot_t",381,"len")=4
 	Set gtmtypes("shm_snapshot_t",381,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_blocked_writer_blocked_cntr")=381
-	Set gtmtypes("shm_snapshot_t",382,"name")="shm_snapshot_t.shadow_file_header.n_jnl_fsyncs_cntr"
-	Set gtmtypes("shm_snapshot_t",382,"off")=7644
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_bitmap_nullbt_cntr")=381
+	Set gtmtypes("shm_snapshot_t",382,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_cntr"
+	Set gtmtypes("shm_snapshot_t",382,"off")=7608
 	Set gtmtypes("shm_snapshot_t",382,"len")=4
 	Set gtmtypes("shm_snapshot_t",382,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_jnl_fsyncs_cntr")=382
-	Set gtmtypes("shm_snapshot_t",383,"name")="shm_snapshot_t.shadow_file_header.n_jnl_fsync_tries_cntr"
-	Set gtmtypes("shm_snapshot_t",383,"off")=7648
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_cntr")=382
+	Set gtmtypes("shm_snapshot_t",383,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_jnl_cwset_cntr"
+	Set gtmtypes("shm_snapshot_t",383,"off")=7612
 	Set gtmtypes("shm_snapshot_t",383,"len")=4
 	Set gtmtypes("shm_snapshot_t",383,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_jnl_fsync_tries_cntr")=383
-	Set gtmtypes("shm_snapshot_t",384,"name")="shm_snapshot_t.shadow_file_header.n_jnl_fsync_recovers_cntr"
-	Set gtmtypes("shm_snapshot_t",384,"off")=7652
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_jnl_cwset_cntr")=383
+	Set gtmtypes("shm_snapshot_t",384,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_jnl_wcsflu_cntr"
+	Set gtmtypes("shm_snapshot_t",384,"off")=7616
 	Set gtmtypes("shm_snapshot_t",384,"len")=4
 	Set gtmtypes("shm_snapshot_t",384,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_jnl_fsync_recovers_cntr")=384
-	Set gtmtypes("shm_snapshot_t",385,"name")="shm_snapshot_t.shadow_file_header.n_db_fsyncs_cntr"
-	Set gtmtypes("shm_snapshot_t",385,"off")=7656
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_jnl_wcsflu_cntr")=384
+	Set gtmtypes("shm_snapshot_t",385,"name")="shm_snapshot_t.shadow_file_header.db_csh_get_too_many_loops_cntr"
+	Set gtmtypes("shm_snapshot_t",385,"off")=7620
 	Set gtmtypes("shm_snapshot_t",385,"len")=4
 	Set gtmtypes("shm_snapshot_t",385,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_fsyncs_cntr")=385
-	Set gtmtypes("shm_snapshot_t",386,"name")="shm_snapshot_t.shadow_file_header.n_db_fsyncs_in_crit_cntr"
-	Set gtmtypes("shm_snapshot_t",386,"off")=7660
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_get_too_many_loops_cntr")=385
+	Set gtmtypes("shm_snapshot_t",386,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tpckh_hist1_nullbt_cntr"
+	Set gtmtypes("shm_snapshot_t",386,"off")=7624
 	Set gtmtypes("shm_snapshot_t",386,"len")=4
 	Set gtmtypes("shm_snapshot_t",386,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_fsyncs_in_crit_cntr")=386
-	Set gtmtypes("shm_snapshot_t",387,"name")="shm_snapshot_t.shadow_file_header.n_dbsync_timers_cntr"
-	Set gtmtypes("shm_snapshot_t",387,"off")=7664
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tpckh_hist1_nullbt_cntr")=386
+	Set gtmtypes("shm_snapshot_t",387,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_cntr"
+	Set gtmtypes("shm_snapshot_t",387,"off")=7628
 	Set gtmtypes("shm_snapshot_t",387,"len")=4
 	Set gtmtypes("shm_snapshot_t",387,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_dbsync_timers_cntr")=387
-	Set gtmtypes("shm_snapshot_t",388,"name")="shm_snapshot_t.shadow_file_header.n_dbsync_writes_cntr"
-	Set gtmtypes("shm_snapshot_t",388,"off")=7668
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_cntr")=387
+	Set gtmtypes("shm_snapshot_t",388,"name")="shm_snapshot_t.shadow_file_header.jnl_blocked_writer_lost_cntr"
+	Set gtmtypes("shm_snapshot_t",388,"off")=7632
 	Set gtmtypes("shm_snapshot_t",388,"len")=4
 	Set gtmtypes("shm_snapshot_t",388,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_dbsync_writes_cntr")=388
-	Set gtmtypes("shm_snapshot_t",389,"name")="shm_snapshot_t.shadow_file_header.mutex_queue_full_cntr"
-	Set gtmtypes("shm_snapshot_t",389,"off")=7672
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_blocked_writer_lost_cntr")=388
+	Set gtmtypes("shm_snapshot_t",389,"name")="shm_snapshot_t.shadow_file_header.jnl_blocked_writer_stuck_cntr"
+	Set gtmtypes("shm_snapshot_t",389,"off")=7636
 	Set gtmtypes("shm_snapshot_t",389,"len")=4
 	Set gtmtypes("shm_snapshot_t",389,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.mutex_queue_full_cntr")=389
-	Set gtmtypes("shm_snapshot_t",390,"name")="shm_snapshot_t.shadow_file_header.wcb_bt_put_cntr"
-	Set gtmtypes("shm_snapshot_t",390,"off")=7676
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_blocked_writer_stuck_cntr")=389
+	Set gtmtypes("shm_snapshot_t",390,"name")="shm_snapshot_t.shadow_file_header.jnl_blocked_writer_blocked_cntr"
+	Set gtmtypes("shm_snapshot_t",390,"off")=7640
 	Set gtmtypes("shm_snapshot_t",390,"len")=4
 	Set gtmtypes("shm_snapshot_t",390,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_bt_put_cntr")=390
-	Set gtmtypes("shm_snapshot_t",391,"name")="shm_snapshot_t.shadow_file_header.wcb_mutex_salvage_cntr"
-	Set gtmtypes("shm_snapshot_t",391,"off")=7680
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_blocked_writer_blocked_cntr")=390
+	Set gtmtypes("shm_snapshot_t",391,"name")="shm_snapshot_t.shadow_file_header.n_jnl_fsyncs_cntr"
+	Set gtmtypes("shm_snapshot_t",391,"off")=7644
 	Set gtmtypes("shm_snapshot_t",391,"len")=4
 	Set gtmtypes("shm_snapshot_t",391,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_mutex_salvage_cntr")=391
-	Set gtmtypes("shm_snapshot_t",392,"name")="shm_snapshot_t.shadow_file_header.wcb_tp_grab_crit_cntr"
-	Set gtmtypes("shm_snapshot_t",392,"off")=7684
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_jnl_fsyncs_cntr")=391
+	Set gtmtypes("shm_snapshot_t",392,"name")="shm_snapshot_t.shadow_file_header.n_jnl_fsync_tries_cntr"
+	Set gtmtypes("shm_snapshot_t",392,"off")=7648
 	Set gtmtypes("shm_snapshot_t",392,"len")=4
 	Set gtmtypes("shm_snapshot_t",392,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_tp_grab_crit_cntr")=392
-	Set gtmtypes("shm_snapshot_t",393,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_nocr_invcr_cntr"
-	Set gtmtypes("shm_snapshot_t",393,"off")=7688
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_jnl_fsync_tries_cntr")=392
+	Set gtmtypes("shm_snapshot_t",393,"name")="shm_snapshot_t.shadow_file_header.n_jnl_fsync_recovers_cntr"
+	Set gtmtypes("shm_snapshot_t",393,"off")=7652
 	Set gtmtypes("shm_snapshot_t",393,"len")=4
 	Set gtmtypes("shm_snapshot_t",393,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_nocr_invcr_cntr")=393
-	Set gtmtypes("shm_snapshot_t",394,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_cr_invcr_cntr"
-	Set gtmtypes("shm_snapshot_t",394,"off")=7692
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_jnl_fsync_recovers_cntr")=393
+	Set gtmtypes("shm_snapshot_t",394,"name")="shm_snapshot_t.shadow_file_header.n_db_fsyncs_cntr"
+	Set gtmtypes("shm_snapshot_t",394,"off")=7656
 	Set gtmtypes("shm_snapshot_t",394,"len")=4
 	Set gtmtypes("shm_snapshot_t",394,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_cr_invcr_cntr")=394
-	Set gtmtypes("shm_snapshot_t",395,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_rip_wait_cntr"
-	Set gtmtypes("shm_snapshot_t",395,"off")=7696
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_fsyncs_cntr")=394
+	Set gtmtypes("shm_snapshot_t",395,"name")="shm_snapshot_t.shadow_file_header.n_db_fsyncs_in_crit_cntr"
+	Set gtmtypes("shm_snapshot_t",395,"off")=7660
 	Set gtmtypes("shm_snapshot_t",395,"len")=4
 	Set gtmtypes("shm_snapshot_t",395,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_rip_wait_cntr")=395
-	Set gtmtypes("shm_snapshot_t",396,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirtyripwait_cntr"
-	Set gtmtypes("shm_snapshot_t",396,"off")=7700
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_fsyncs_in_crit_cntr")=395
+	Set gtmtypes("shm_snapshot_t",396,"name")="shm_snapshot_t.shadow_file_header.n_dbsync_timers_cntr"
+	Set gtmtypes("shm_snapshot_t",396,"off")=7664
 	Set gtmtypes("shm_snapshot_t",396,"len")=4
 	Set gtmtypes("shm_snapshot_t",396,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirtyripwait_cntr")=396
-	Set gtmtypes("shm_snapshot_t",397,"name")="shm_snapshot_t.shadow_file_header.wcb_gds_rundown_cntr"
-	Set gtmtypes("shm_snapshot_t",397,"off")=7704
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_dbsync_timers_cntr")=396
+	Set gtmtypes("shm_snapshot_t",397,"name")="shm_snapshot_t.shadow_file_header.n_dbsync_writes_cntr"
+	Set gtmtypes("shm_snapshot_t",397,"off")=7668
 	Set gtmtypes("shm_snapshot_t",397,"len")=4
 	Set gtmtypes("shm_snapshot_t",397,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_gds_rundown_cntr")=397
-	Set gtmtypes("shm_snapshot_t",398,"name")="shm_snapshot_t.shadow_file_header.wcb_wcs_flu1_cntr"
-	Set gtmtypes("shm_snapshot_t",398,"off")=7708
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_dbsync_writes_cntr")=397
+	Set gtmtypes("shm_snapshot_t",398,"name")="shm_snapshot_t.shadow_file_header.mutex_queue_full_cntr"
+	Set gtmtypes("shm_snapshot_t",398,"off")=7672
 	Set gtmtypes("shm_snapshot_t",398,"len")=4
 	Set gtmtypes("shm_snapshot_t",398,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wcs_flu1_cntr")=398
-	Set gtmtypes("shm_snapshot_t",399,"name")="shm_snapshot_t.shadow_file_header.wcb_mu_back_cntr"
-	Set gtmtypes("shm_snapshot_t",399,"off")=7712
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.mutex_queue_full_cntr")=398
+	Set gtmtypes("shm_snapshot_t",399,"name")="shm_snapshot_t.shadow_file_header.wcb_bt_put_cntr"
+	Set gtmtypes("shm_snapshot_t",399,"off")=7676
 	Set gtmtypes("shm_snapshot_t",399,"len")=4
 	Set gtmtypes("shm_snapshot_t",399,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_mu_back_cntr")=399
-	Set gtmtypes("shm_snapshot_t",400,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirty_invcr_cntr"
-	Set gtmtypes("shm_snapshot_t",400,"off")=7716
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_bt_put_cntr")=399
+	Set gtmtypes("shm_snapshot_t",400,"name")="shm_snapshot_t.shadow_file_header.wcb_mutex_salvage_cntr"
+	Set gtmtypes("shm_snapshot_t",400,"off")=7680
 	Set gtmtypes("shm_snapshot_t",400,"len")=4
 	Set gtmtypes("shm_snapshot_t",400,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirty_invcr_cntr")=400
-	Set gtmtypes("shm_snapshot_t",401,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_wtfini_fail_cntr"
-	Set gtmtypes("shm_snapshot_t",401,"off")=7720
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_mutex_salvage_cntr")=400
+	Set gtmtypes("shm_snapshot_t",401,"name")="shm_snapshot_t.shadow_file_header.wcb_tp_grab_crit_cntr"
+	Set gtmtypes("shm_snapshot_t",401,"off")=7684
 	Set gtmtypes("shm_snapshot_t",401,"len")=4
 	Set gtmtypes("shm_snapshot_t",401,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_wtfini_fail_cntr")=401
-	Set gtmtypes("shm_snapshot_t",402,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_twin_stuck_cntr"
-	Set gtmtypes("shm_snapshot_t",402,"off")=7724
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_tp_grab_crit_cntr")=401
+	Set gtmtypes("shm_snapshot_t",402,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_nocr_invcr_cntr"
+	Set gtmtypes("shm_snapshot_t",402,"off")=7688
 	Set gtmtypes("shm_snapshot_t",402,"len")=4
 	Set gtmtypes("shm_snapshot_t",402,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_twin_stuck_cntr")=402
-	Set gtmtypes("shm_snapshot_t",403,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_wrt_latch_stuck_cntr"
-	Set gtmtypes("shm_snapshot_t",403,"off")=7728
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_nocr_invcr_cntr")=402
+	Set gtmtypes("shm_snapshot_t",403,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_cr_invcr_cntr"
+	Set gtmtypes("shm_snapshot_t",403,"off")=7692
 	Set gtmtypes("shm_snapshot_t",403,"len")=4
 	Set gtmtypes("shm_snapshot_t",403,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_wrt_latch_stuck_cntr")=403
-	Set gtmtypes("shm_snapshot_t",404,"name")="shm_snapshot_t.shadow_file_header.wcb_secshr_db_clnup_now_crit_cntr"
-	Set gtmtypes("shm_snapshot_t",404,"off")=7732
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_cr_invcr_cntr")=403
+	Set gtmtypes("shm_snapshot_t",404,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_rip_wait_cntr"
+	Set gtmtypes("shm_snapshot_t",404,"off")=7696
 	Set gtmtypes("shm_snapshot_t",404,"len")=4
 	Set gtmtypes("shm_snapshot_t",404,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_secshr_db_clnup_now_crit_cntr")=404
-	Set gtmtypes("shm_snapshot_t",405,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_bad_bt_index1_cntr"
-	Set gtmtypes("shm_snapshot_t",405,"off")=7736
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_rip_wait_cntr")=404
+	Set gtmtypes("shm_snapshot_t",405,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirtyripwait_cntr"
+	Set gtmtypes("shm_snapshot_t",405,"off")=7700
 	Set gtmtypes("shm_snapshot_t",405,"len")=4
 	Set gtmtypes("shm_snapshot_t",405,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_bad_bt_index1_cntr")=405
-	Set gtmtypes("shm_snapshot_t",406,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_bad_bt_index2_cntr"
-	Set gtmtypes("shm_snapshot_t",406,"off")=7740
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirtyripwait_cntr")=405
+	Set gtmtypes("shm_snapshot_t",406,"name")="shm_snapshot_t.shadow_file_header.wcb_gds_rundown_cntr"
+	Set gtmtypes("shm_snapshot_t",406,"off")=7704
 	Set gtmtypes("shm_snapshot_t",406,"len")=4
 	Set gtmtypes("shm_snapshot_t",406,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_bad_bt_index2_cntr")=406
-	Set gtmtypes("shm_snapshot_t",407,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_crbtmismatch1_cntr"
-	Set gtmtypes("shm_snapshot_t",407,"off")=7744
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_gds_rundown_cntr")=406
+	Set gtmtypes("shm_snapshot_t",407,"name")="shm_snapshot_t.shadow_file_header.wcb_wcs_flu1_cntr"
+	Set gtmtypes("shm_snapshot_t",407,"off")=7708
 	Set gtmtypes("shm_snapshot_t",407,"len")=4
 	Set gtmtypes("shm_snapshot_t",407,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_crbtmismatch1_cntr")=407
-	Set gtmtypes("shm_snapshot_t",408,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_crbtmismatch2_cntr"
-	Set gtmtypes("shm_snapshot_t",408,"off")=7748
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wcs_flu1_cntr")=407
+	Set gtmtypes("shm_snapshot_t",408,"name")="shm_snapshot_t.shadow_file_header.wcb_mu_back_cntr"
+	Set gtmtypes("shm_snapshot_t",408,"off")=7712
 	Set gtmtypes("shm_snapshot_t",408,"len")=4
 	Set gtmtypes("shm_snapshot_t",408,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_crbtmismatch2_cntr")=408
-	Set gtmtypes("shm_snapshot_t",409,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_crbtmismatch3_cntr"
-	Set gtmtypes("shm_snapshot_t",409,"off")=7752
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_mu_back_cntr")=408
+	Set gtmtypes("shm_snapshot_t",409,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirty_invcr_cntr"
+	Set gtmtypes("shm_snapshot_t",409,"off")=7716
 	Set gtmtypes("shm_snapshot_t",409,"len")=4
 	Set gtmtypes("shm_snapshot_t",409,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_crbtmismatch3_cntr")=409
-	Set gtmtypes("shm_snapshot_t",410,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_cntr"
-	Set gtmtypes("shm_snapshot_t",410,"off")=7756
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirty_invcr_cntr")=409
+	Set gtmtypes("shm_snapshot_t",410,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_wtfini_fail_cntr"
+	Set gtmtypes("shm_snapshot_t",410,"off")=7720
 	Set gtmtypes("shm_snapshot_t",410,"len")=4
 	Set gtmtypes("shm_snapshot_t",410,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_cntr")=410
-	Set gtmtypes("shm_snapshot_t",411,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_cntr"
-	Set gtmtypes("shm_snapshot_t",411,"off")=7760
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_wtfini_fail_cntr")=410
+	Set gtmtypes("shm_snapshot_t",411,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_twin_stuck_cntr"
+	Set gtmtypes("shm_snapshot_t",411,"off")=7724
 	Set gtmtypes("shm_snapshot_t",411,"len")=4
 	Set gtmtypes("shm_snapshot_t",411,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_cntr")=411
-	Set gtmtypes("shm_snapshot_t",412,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_cntr"
-	Set gtmtypes("shm_snapshot_t",412,"off")=7764
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_twin_stuck_cntr")=411
+	Set gtmtypes("shm_snapshot_t",412,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_wrt_latch_stuck_cntr"
+	Set gtmtypes("shm_snapshot_t",412,"off")=7728
 	Set gtmtypes("shm_snapshot_t",412,"len")=4
 	Set gtmtypes("shm_snapshot_t",412,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_cntr")=412
-	Set gtmtypes("shm_snapshot_t",413,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_cntr"
-	Set gtmtypes("shm_snapshot_t",413,"off")=7768
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_wrt_latch_stuck_cntr")=412
+	Set gtmtypes("shm_snapshot_t",413,"name")="shm_snapshot_t.shadow_file_header.wcb_secshr_db_clnup_now_crit_cntr"
+	Set gtmtypes("shm_snapshot_t",413,"off")=7732
 	Set gtmtypes("shm_snapshot_t",413,"len")=4
 	Set gtmtypes("shm_snapshot_t",413,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_cntr")=413
-	Set gtmtypes("shm_snapshot_t",414,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_cntr"
-	Set gtmtypes("shm_snapshot_t",414,"off")=7772
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_secshr_db_clnup_now_crit_cntr")=413
+	Set gtmtypes("shm_snapshot_t",414,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_bad_bt_index1_cntr"
+	Set gtmtypes("shm_snapshot_t",414,"off")=7736
 	Set gtmtypes("shm_snapshot_t",414,"len")=4
 	Set gtmtypes("shm_snapshot_t",414,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_cntr")=414
-	Set gtmtypes("shm_snapshot_t",415,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_bt_get_cntr"
-	Set gtmtypes("shm_snapshot_t",415,"off")=7776
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_bad_bt_index1_cntr")=414
+	Set gtmtypes("shm_snapshot_t",415,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_bad_bt_index2_cntr"
+	Set gtmtypes("shm_snapshot_t",415,"off")=7740
 	Set gtmtypes("shm_snapshot_t",415,"len")=4
 	Set gtmtypes("shm_snapshot_t",415,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_bt_get_cntr")=415
-	Set gtmtypes("shm_snapshot_t",416,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_cntr"
-	Set gtmtypes("shm_snapshot_t",416,"off")=7780
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_bad_bt_index2_cntr")=415
+	Set gtmtypes("shm_snapshot_t",416,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_crbtmismatch1_cntr"
+	Set gtmtypes("shm_snapshot_t",416,"off")=7744
 	Set gtmtypes("shm_snapshot_t",416,"len")=4
 	Set gtmtypes("shm_snapshot_t",416,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_cntr")=416
-	Set gtmtypes("shm_snapshot_t",417,"name")="shm_snapshot_t.shadow_file_header.wcb_bg_update_lckfail1_cntr"
-	Set gtmtypes("shm_snapshot_t",417,"off")=7784
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_crbtmismatch1_cntr")=416
+	Set gtmtypes("shm_snapshot_t",417,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_crbtmismatch2_cntr"
+	Set gtmtypes("shm_snapshot_t",417,"off")=7748
 	Set gtmtypes("shm_snapshot_t",417,"len")=4
 	Set gtmtypes("shm_snapshot_t",417,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_bg_update_lckfail1_cntr")=417
-	Set gtmtypes("shm_snapshot_t",418,"name")="shm_snapshot_t.shadow_file_header.wcb_bg_update_lckfail2_cntr"
-	Set gtmtypes("shm_snapshot_t",418,"off")=7788
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_crbtmismatch2_cntr")=417
+	Set gtmtypes("shm_snapshot_t",418,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_crbtmismatch3_cntr"
+	Set gtmtypes("shm_snapshot_t",418,"off")=7752
 	Set gtmtypes("shm_snapshot_t",418,"len")=4
 	Set gtmtypes("shm_snapshot_t",418,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_bg_update_lckfail2_cntr")=418
-	Set gtmtypes("shm_snapshot_t",419,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail1_cntr"
-	Set gtmtypes("shm_snapshot_t",419,"off")=7792
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_crbtmismatch3_cntr")=418
+	Set gtmtypes("shm_snapshot_t",419,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_cntr"
+	Set gtmtypes("shm_snapshot_t",419,"off")=7756
 	Set gtmtypes("shm_snapshot_t",419,"len")=4
 	Set gtmtypes("shm_snapshot_t",419,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail1_cntr")=419
-	Set gtmtypes("shm_snapshot_t",420,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail2_cntr"
-	Set gtmtypes("shm_snapshot_t",420,"off")=7796
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_cntr")=419
+	Set gtmtypes("shm_snapshot_t",420,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_cntr"
+	Set gtmtypes("shm_snapshot_t",420,"off")=7760
 	Set gtmtypes("shm_snapshot_t",420,"len")=4
 	Set gtmtypes("shm_snapshot_t",420,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail2_cntr")=420
-	Set gtmtypes("shm_snapshot_t",421,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail3_cntr"
-	Set gtmtypes("shm_snapshot_t",421,"off")=7800
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_cntr")=420
+	Set gtmtypes("shm_snapshot_t",421,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_cntr"
+	Set gtmtypes("shm_snapshot_t",421,"off")=7764
 	Set gtmtypes("shm_snapshot_t",421,"len")=4
 	Set gtmtypes("shm_snapshot_t",421,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail3_cntr")=421
-	Set gtmtypes("shm_snapshot_t",422,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail4_cntr"
-	Set gtmtypes("shm_snapshot_t",422,"off")=7804
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_cntr")=421
+	Set gtmtypes("shm_snapshot_t",422,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_cntr"
+	Set gtmtypes("shm_snapshot_t",422,"off")=7768
 	Set gtmtypes("shm_snapshot_t",422,"len")=4
 	Set gtmtypes("shm_snapshot_t",422,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail4_cntr")=422
-	Set gtmtypes("shm_snapshot_t",423,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail1_cntr"
-	Set gtmtypes("shm_snapshot_t",423,"off")=7808
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_cntr")=422
+	Set gtmtypes("shm_snapshot_t",423,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_cntr"
+	Set gtmtypes("shm_snapshot_t",423,"off")=7772
 	Set gtmtypes("shm_snapshot_t",423,"len")=4
 	Set gtmtypes("shm_snapshot_t",423,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail1_cntr")=423
-	Set gtmtypes("shm_snapshot_t",424,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail2_cntr"
-	Set gtmtypes("shm_snapshot_t",424,"off")=7812
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_cntr")=423
+	Set gtmtypes("shm_snapshot_t",424,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_bt_get_cntr"
+	Set gtmtypes("shm_snapshot_t",424,"off")=7776
 	Set gtmtypes("shm_snapshot_t",424,"len")=4
 	Set gtmtypes("shm_snapshot_t",424,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail2_cntr")=424
-	Set gtmtypes("shm_snapshot_t",425,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail3_cntr"
-	Set gtmtypes("shm_snapshot_t",425,"off")=7816
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_bt_get_cntr")=424
+	Set gtmtypes("shm_snapshot_t",425,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_cntr"
+	Set gtmtypes("shm_snapshot_t",425,"off")=7780
 	Set gtmtypes("shm_snapshot_t",425,"len")=4
 	Set gtmtypes("shm_snapshot_t",425,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail3_cntr")=425
-	Set gtmtypes("shm_snapshot_t",426,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail4_cntr"
-	Set gtmtypes("shm_snapshot_t",426,"off")=7820
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_cntr")=425
+	Set gtmtypes("shm_snapshot_t",426,"name")="shm_snapshot_t.shadow_file_header.wcb_bg_update_lckfail1_cntr"
+	Set gtmtypes("shm_snapshot_t",426,"off")=7784
 	Set gtmtypes("shm_snapshot_t",426,"len")=4
 	Set gtmtypes("shm_snapshot_t",426,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail4_cntr")=426
-	Set gtmtypes("shm_snapshot_t",427,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirtystuck1_cntr"
-	Set gtmtypes("shm_snapshot_t",427,"off")=7824
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_bg_update_lckfail1_cntr")=426
+	Set gtmtypes("shm_snapshot_t",427,"name")="shm_snapshot_t.shadow_file_header.wcb_bg_update_lckfail2_cntr"
+	Set gtmtypes("shm_snapshot_t",427,"off")=7788
 	Set gtmtypes("shm_snapshot_t",427,"len")=4
 	Set gtmtypes("shm_snapshot_t",427,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirtystuck1_cntr")=427
-	Set gtmtypes("shm_snapshot_t",428,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirtystuck2_cntr"
-	Set gtmtypes("shm_snapshot_t",428,"off")=7828
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_bg_update_lckfail2_cntr")=427
+	Set gtmtypes("shm_snapshot_t",428,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail1_cntr"
+	Set gtmtypes("shm_snapshot_t",428,"off")=7792
 	Set gtmtypes("shm_snapshot_t",428,"len")=4
 	Set gtmtypes("shm_snapshot_t",428,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirtystuck2_cntr")=428
-	Set gtmtypes("shm_snapshot_t",429,"name")="shm_snapshot_t.shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_cntr"
-	Set gtmtypes("shm_snapshot_t",429,"off")=7832
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail1_cntr")=428
+	Set gtmtypes("shm_snapshot_t",429,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail2_cntr"
+	Set gtmtypes("shm_snapshot_t",429,"off")=7796
 	Set gtmtypes("shm_snapshot_t",429,"len")=4
 	Set gtmtypes("shm_snapshot_t",429,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_cntr")=429
-	Set gtmtypes("shm_snapshot_t",430,"name")="shm_snapshot_t.shadow_file_header.dwngrd_refmts_syncio_cntr"
-	Set gtmtypes("shm_snapshot_t",430,"off")=7836
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail2_cntr")=429
+	Set gtmtypes("shm_snapshot_t",430,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail3_cntr"
+	Set gtmtypes("shm_snapshot_t",430,"off")=7800
 	Set gtmtypes("shm_snapshot_t",430,"len")=4
 	Set gtmtypes("shm_snapshot_t",430,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.dwngrd_refmts_syncio_cntr")=430
-	Set gtmtypes("shm_snapshot_t",431,"name")="shm_snapshot_t.shadow_file_header.dwngrd_refmts_asyncio_cntr"
-	Set gtmtypes("shm_snapshot_t",431,"off")=7840
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail3_cntr")=430
+	Set gtmtypes("shm_snapshot_t",431,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail4_cntr"
+	Set gtmtypes("shm_snapshot_t",431,"off")=7804
 	Set gtmtypes("shm_snapshot_t",431,"len")=4
 	Set gtmtypes("shm_snapshot_t",431,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.dwngrd_refmts_asyncio_cntr")=431
-	Set gtmtypes("shm_snapshot_t",432,"name")="shm_snapshot_t.shadow_file_header.shmpool_refmt_harvests_cntr"
-	Set gtmtypes("shm_snapshot_t",432,"off")=7844
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail4_cntr")=431
+	Set gtmtypes("shm_snapshot_t",432,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail1_cntr"
+	Set gtmtypes("shm_snapshot_t",432,"off")=7808
 	Set gtmtypes("shm_snapshot_t",432,"len")=4
 	Set gtmtypes("shm_snapshot_t",432,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_refmt_harvests_cntr")=432
-	Set gtmtypes("shm_snapshot_t",433,"name")="shm_snapshot_t.shadow_file_header.shmpool_recovery_cntr"
-	Set gtmtypes("shm_snapshot_t",433,"off")=7848
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail1_cntr")=432
+	Set gtmtypes("shm_snapshot_t",433,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail2_cntr"
+	Set gtmtypes("shm_snapshot_t",433,"off")=7812
 	Set gtmtypes("shm_snapshot_t",433,"len")=4
 	Set gtmtypes("shm_snapshot_t",433,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_recovery_cntr")=433
-	Set gtmtypes("shm_snapshot_t",434,"name")="shm_snapshot_t.shadow_file_header.shmpool_blkd_by_sdc_cntr"
-	Set gtmtypes("shm_snapshot_t",434,"off")=7852
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail2_cntr")=433
+	Set gtmtypes("shm_snapshot_t",434,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail3_cntr"
+	Set gtmtypes("shm_snapshot_t",434,"off")=7816
 	Set gtmtypes("shm_snapshot_t",434,"len")=4
 	Set gtmtypes("shm_snapshot_t",434,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_blkd_by_sdc_cntr")=434
-	Set gtmtypes("shm_snapshot_t",435,"name")="shm_snapshot_t.shadow_file_header.shmpool_alloc_bbflush_cntr"
-	Set gtmtypes("shm_snapshot_t",435,"off")=7856
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail3_cntr")=434
+	Set gtmtypes("shm_snapshot_t",435,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail4_cntr"
+	Set gtmtypes("shm_snapshot_t",435,"off")=7820
 	Set gtmtypes("shm_snapshot_t",435,"len")=4
 	Set gtmtypes("shm_snapshot_t",435,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_alloc_bbflush_cntr")=435
-	Set gtmtypes("shm_snapshot_t",436,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_released_replaced_cntr"
-	Set gtmtypes("shm_snapshot_t",436,"off")=7860
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail4_cntr")=435
+	Set gtmtypes("shm_snapshot_t",436,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirtystuck1_cntr"
+	Set gtmtypes("shm_snapshot_t",436,"off")=7824
 	Set gtmtypes("shm_snapshot_t",436,"len")=4
 	Set gtmtypes("shm_snapshot_t",436,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_released_replaced_cntr")=436
-	Set gtmtypes("shm_snapshot_t",437,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_released_io_complete_cntr"
-	Set gtmtypes("shm_snapshot_t",437,"off")=7864
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirtystuck1_cntr")=436
+	Set gtmtypes("shm_snapshot_t",437,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirtystuck2_cntr"
+	Set gtmtypes("shm_snapshot_t",437,"off")=7828
 	Set gtmtypes("shm_snapshot_t",437,"len")=4
 	Set gtmtypes("shm_snapshot_t",437,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_released_io_complete_cntr")=437
-	Set gtmtypes("shm_snapshot_t",438,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_kept_cntr"
-	Set gtmtypes("shm_snapshot_t",438,"off")=7868
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirtystuck2_cntr")=437
+	Set gtmtypes("shm_snapshot_t",438,"name")="shm_snapshot_t.shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_cntr"
+	Set gtmtypes("shm_snapshot_t",438,"off")=7832
 	Set gtmtypes("shm_snapshot_t",438,"len")=4
 	Set gtmtypes("shm_snapshot_t",438,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_kept_cntr")=438
-	Set gtmtypes("shm_snapshot_t",439,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_ignored_cntr"
-	Set gtmtypes("shm_snapshot_t",439,"off")=7872
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_cntr")=438
+	Set gtmtypes("shm_snapshot_t",439,"name")="shm_snapshot_t.shadow_file_header.dwngrd_refmts_syncio_cntr"
+	Set gtmtypes("shm_snapshot_t",439,"off")=7836
 	Set gtmtypes("shm_snapshot_t",439,"len")=4
 	Set gtmtypes("shm_snapshot_t",439,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_ignored_cntr")=439
-	Set gtmtypes("shm_snapshot_t",440,"name")="shm_snapshot_t.shadow_file_header.refmt_blk_chk_blk_freed_cntr"
-	Set gtmtypes("shm_snapshot_t",440,"off")=7876
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.dwngrd_refmts_syncio_cntr")=439
+	Set gtmtypes("shm_snapshot_t",440,"name")="shm_snapshot_t.shadow_file_header.dwngrd_refmts_asyncio_cntr"
+	Set gtmtypes("shm_snapshot_t",440,"off")=7840
 	Set gtmtypes("shm_snapshot_t",440,"len")=4
 	Set gtmtypes("shm_snapshot_t",440,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_blk_chk_blk_freed_cntr")=440
-	Set gtmtypes("shm_snapshot_t",441,"name")="shm_snapshot_t.shadow_file_header.refmt_blk_chk_blk_kept_cntr"
-	Set gtmtypes("shm_snapshot_t",441,"off")=7880
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.dwngrd_refmts_asyncio_cntr")=440
+	Set gtmtypes("shm_snapshot_t",441,"name")="shm_snapshot_t.shadow_file_header.shmpool_refmt_harvests_cntr"
+	Set gtmtypes("shm_snapshot_t",441,"off")=7844
 	Set gtmtypes("shm_snapshot_t",441,"len")=4
 	Set gtmtypes("shm_snapshot_t",441,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_blk_chk_blk_kept_cntr")=441
-	Set gtmtypes("shm_snapshot_t",442,"name")="shm_snapshot_t.shadow_file_header.active_lvl_trigger_cntr"
-	Set gtmtypes("shm_snapshot_t",442,"off")=7884
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_refmt_harvests_cntr")=441
+	Set gtmtypes("shm_snapshot_t",442,"name")="shm_snapshot_t.shadow_file_header.shmpool_recovery_cntr"
+	Set gtmtypes("shm_snapshot_t",442,"off")=7848
 	Set gtmtypes("shm_snapshot_t",442,"len")=4
 	Set gtmtypes("shm_snapshot_t",442,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.active_lvl_trigger_cntr")=442
-	Set gtmtypes("shm_snapshot_t",443,"name")="shm_snapshot_t.shadow_file_header.new_buff_cntr"
-	Set gtmtypes("shm_snapshot_t",443,"off")=7888
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_recovery_cntr")=442
+	Set gtmtypes("shm_snapshot_t",443,"name")="shm_snapshot_t.shadow_file_header.shmpool_blkd_by_sdc_cntr"
+	Set gtmtypes("shm_snapshot_t",443,"off")=7852
 	Set gtmtypes("shm_snapshot_t",443,"len")=4
 	Set gtmtypes("shm_snapshot_t",443,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.new_buff_cntr")=443
-	Set gtmtypes("shm_snapshot_t",444,"name")="shm_snapshot_t.shadow_file_header.phase2_commit_wait_sleep_in_crit_cntr"
-	Set gtmtypes("shm_snapshot_t",444,"off")=7892
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_blkd_by_sdc_cntr")=443
+	Set gtmtypes("shm_snapshot_t",444,"name")="shm_snapshot_t.shadow_file_header.shmpool_alloc_bbflush_cntr"
+	Set gtmtypes("shm_snapshot_t",444,"off")=7856
 	Set gtmtypes("shm_snapshot_t",444,"len")=4
 	Set gtmtypes("shm_snapshot_t",444,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.phase2_commit_wait_sleep_in_crit_cntr")=444
-	Set gtmtypes("shm_snapshot_t",445,"name")="shm_snapshot_t.shadow_file_header.phase2_commit_wait_sleep_no_crit_cntr"
-	Set gtmtypes("shm_snapshot_t",445,"off")=7896
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_alloc_bbflush_cntr")=444
+	Set gtmtypes("shm_snapshot_t",445,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_released_replaced_cntr"
+	Set gtmtypes("shm_snapshot_t",445,"off")=7860
 	Set gtmtypes("shm_snapshot_t",445,"len")=4
 	Set gtmtypes("shm_snapshot_t",445,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.phase2_commit_wait_sleep_no_crit_cntr")=445
-	Set gtmtypes("shm_snapshot_t",446,"name")="shm_snapshot_t.shadow_file_header.phase2_commit_wait_pidcnt_cntr"
-	Set gtmtypes("shm_snapshot_t",446,"off")=7900
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_released_replaced_cntr")=445
+	Set gtmtypes("shm_snapshot_t",446,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_released_io_complete_cntr"
+	Set gtmtypes("shm_snapshot_t",446,"off")=7864
 	Set gtmtypes("shm_snapshot_t",446,"len")=4
 	Set gtmtypes("shm_snapshot_t",446,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.phase2_commit_wait_pidcnt_cntr")=446
-	Set gtmtypes("shm_snapshot_t",447,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_intend_wait_cntr"
-	Set gtmtypes("shm_snapshot_t",447,"off")=7904
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_released_io_complete_cntr")=446
+	Set gtmtypes("shm_snapshot_t",447,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_kept_cntr"
+	Set gtmtypes("shm_snapshot_t",447,"off")=7868
 	Set gtmtypes("shm_snapshot_t",447,"len")=4
 	Set gtmtypes("shm_snapshot_t",447,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_intend_wait_cntr")=447
-	Set gtmtypes("shm_snapshot_t",448,"name")="shm_snapshot_t.shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_cntr"
-	Set gtmtypes("shm_snapshot_t",448,"off")=7908
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_kept_cntr")=447
+	Set gtmtypes("shm_snapshot_t",448,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_ignored_cntr"
+	Set gtmtypes("shm_snapshot_t",448,"off")=7872
 	Set gtmtypes("shm_snapshot_t",448,"len")=4
 	Set gtmtypes("shm_snapshot_t",448,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_cntr")=448
-	Set gtmtypes("shm_snapshot_t",449,"name")="shm_snapshot_t.shadow_file_header.wcb_phase2_commit_wait_cntr"
-	Set gtmtypes("shm_snapshot_t",449,"off")=7912
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_ignored_cntr")=448
+	Set gtmtypes("shm_snapshot_t",449,"name")="shm_snapshot_t.shadow_file_header.refmt_blk_chk_blk_freed_cntr"
+	Set gtmtypes("shm_snapshot_t",449,"off")=7876
 	Set gtmtypes("shm_snapshot_t",449,"len")=4
 	Set gtmtypes("shm_snapshot_t",449,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_phase2_commit_wait_cntr")=449
-	Set gtmtypes("shm_snapshot_t",450,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_calls_cntr"
-	Set gtmtypes("shm_snapshot_t",450,"off")=7916
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_blk_chk_blk_freed_cntr")=449
+	Set gtmtypes("shm_snapshot_t",450,"name")="shm_snapshot_t.shadow_file_header.refmt_blk_chk_blk_kept_cntr"
+	Set gtmtypes("shm_snapshot_t",450,"off")=7880
 	Set gtmtypes("shm_snapshot_t",450,"len")=4
 	Set gtmtypes("shm_snapshot_t",450,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_calls_cntr")=450
-	Set gtmtypes("shm_snapshot_t",451,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_rip_cntr"
-	Set gtmtypes("shm_snapshot_t",451,"off")=7920
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_blk_chk_blk_kept_cntr")=450
+	Set gtmtypes("shm_snapshot_t",451,"name")="shm_snapshot_t.shadow_file_header.active_lvl_trigger_cntr"
+	Set gtmtypes("shm_snapshot_t",451,"off")=7884
 	Set gtmtypes("shm_snapshot_t",451,"len")=4
 	Set gtmtypes("shm_snapshot_t",451,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_rip_cntr")=451
-	Set gtmtypes("shm_snapshot_t",452,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_in_tend_cntr"
-	Set gtmtypes("shm_snapshot_t",452,"off")=7924
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.active_lvl_trigger_cntr")=451
+	Set gtmtypes("shm_snapshot_t",452,"name")="shm_snapshot_t.shadow_file_header.new_buff_cntr"
+	Set gtmtypes("shm_snapshot_t",452,"off")=7888
 	Set gtmtypes("shm_snapshot_t",452,"len")=4
 	Set gtmtypes("shm_snapshot_t",452,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_in_tend_cntr")=452
-	Set gtmtypes("shm_snapshot_t",453,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_search_blk_cntr"
-	Set gtmtypes("shm_snapshot_t",453,"off")=7928
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.new_buff_cntr")=452
+	Set gtmtypes("shm_snapshot_t",453,"name")="shm_snapshot_t.shadow_file_header.phase2_commit_wait_sleep_in_crit_cntr"
+	Set gtmtypes("shm_snapshot_t",453,"off")=7892
 	Set gtmtypes("shm_snapshot_t",453,"len")=4
 	Set gtmtypes("shm_snapshot_t",453,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_search_blk_cntr")=453
-	Set gtmtypes("shm_snapshot_t",454,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_new_rec_cntr"
-	Set gtmtypes("shm_snapshot_t",454,"off")=7932
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.phase2_commit_wait_sleep_in_crit_cntr")=453
+	Set gtmtypes("shm_snapshot_t",454,"name")="shm_snapshot_t.shadow_file_header.phase2_commit_wait_sleep_no_crit_cntr"
+	Set gtmtypes("shm_snapshot_t",454,"off")=7896
 	Set gtmtypes("shm_snapshot_t",454,"len")=4
 	Set gtmtypes("shm_snapshot_t",454,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_new_rec_cntr")=454
-	Set gtmtypes("shm_snapshot_t",455,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_rec_size_cntr"
-	Set gtmtypes("shm_snapshot_t",455,"off")=7936
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.phase2_commit_wait_sleep_no_crit_cntr")=454
+	Set gtmtypes("shm_snapshot_t",455,"name")="shm_snapshot_t.shadow_file_header.phase2_commit_wait_pidcnt_cntr"
+	Set gtmtypes("shm_snapshot_t",455,"off")=7900
 	Set gtmtypes("shm_snapshot_t",455,"len")=4
 	Set gtmtypes("shm_snapshot_t",455,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_rec_size_cntr")=455
-	Set gtmtypes("shm_snapshot_t",456,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_rec_cmpc_cntr"
-	Set gtmtypes("shm_snapshot_t",456,"off")=7940
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.phase2_commit_wait_pidcnt_cntr")=455
+	Set gtmtypes("shm_snapshot_t",456,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_intend_wait_cntr"
+	Set gtmtypes("shm_snapshot_t",456,"off")=7904
 	Set gtmtypes("shm_snapshot_t",456,"len")=4
 	Set gtmtypes("shm_snapshot_t",456,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_rec_cmpc_cntr")=456
-	Set gtmtypes("shm_snapshot_t",457,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_blk_fini_cntr"
-	Set gtmtypes("shm_snapshot_t",457,"off")=7944
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_intend_wait_cntr")=456
+	Set gtmtypes("shm_snapshot_t",457,"name")="shm_snapshot_t.shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_cntr"
+	Set gtmtypes("shm_snapshot_t",457,"off")=7908
 	Set gtmtypes("shm_snapshot_t",457,"len")=4
 	Set gtmtypes("shm_snapshot_t",457,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_blk_fini_cntr")=457
-	Set gtmtypes("shm_snapshot_t",458,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_blk_split_cntr"
-	Set gtmtypes("shm_snapshot_t",458,"off")=7948
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_cntr")=457
+	Set gtmtypes("shm_snapshot_t",458,"name")="shm_snapshot_t.shadow_file_header.wcb_phase2_commit_wait_cntr"
+	Set gtmtypes("shm_snapshot_t",458,"off")=7912
 	Set gtmtypes("shm_snapshot_t",458,"len")=4
 	Set gtmtypes("shm_snapshot_t",458,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_blk_split_cntr")=458
-	Set gtmtypes("shm_snapshot_t",459,"name")="shm_snapshot_t.shadow_file_header.t_qread_ripsleep_cnt_cntr"
-	Set gtmtypes("shm_snapshot_t",459,"off")=7952
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_phase2_commit_wait_cntr")=458
+	Set gtmtypes("shm_snapshot_t",459,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_calls_cntr"
+	Set gtmtypes("shm_snapshot_t",459,"off")=7916
 	Set gtmtypes("shm_snapshot_t",459,"len")=4
 	Set gtmtypes("shm_snapshot_t",459,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_ripsleep_cnt_cntr")=459
-	Set gtmtypes("shm_snapshot_t",460,"name")="shm_snapshot_t.shadow_file_header.t_qread_ripsleep_nblks_cntr"
-	Set gtmtypes("shm_snapshot_t",460,"off")=7956
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_calls_cntr")=459
+	Set gtmtypes("shm_snapshot_t",460,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_rip_cntr"
+	Set gtmtypes("shm_snapshot_t",460,"off")=7920
 	Set gtmtypes("shm_snapshot_t",460,"len")=4
 	Set gtmtypes("shm_snapshot_t",460,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_ripsleep_nblks_cntr")=460
-	Set gtmtypes("shm_snapshot_t",461,"name")="shm_snapshot_t.shadow_file_header.bg_trc_rec_cntr_filler"
-	Set gtmtypes("shm_snapshot_t",461,"off")=7960
-	Set gtmtypes("shm_snapshot_t",461,"len")=56
-	Set gtmtypes("shm_snapshot_t",461,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bg_trc_rec_cntr_filler")=461
-	Set gtmtypes("shm_snapshot_t",462,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srches"
-	Set gtmtypes("shm_snapshot_t",462,"off")=8016
-	Set gtmtypes("shm_snapshot_t",462,"len")=8
-	Set gtmtypes("shm_snapshot_t",462,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srches")=462
-	Set gtmtypes("shm_snapshot_t",463,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srches.curr_count"
-	Set gtmtypes("shm_snapshot_t",463,"off")=8016
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_rip_cntr")=460
+	Set gtmtypes("shm_snapshot_t",461,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_in_tend_cntr"
+	Set gtmtypes("shm_snapshot_t",461,"off")=7924
+	Set gtmtypes("shm_snapshot_t",461,"len")=4
+	Set gtmtypes("shm_snapshot_t",461,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_in_tend_cntr")=461
+	Set gtmtypes("shm_snapshot_t",462,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_search_blk_cntr"
+	Set gtmtypes("shm_snapshot_t",462,"off")=7928
+	Set gtmtypes("shm_snapshot_t",462,"len")=4
+	Set gtmtypes("shm_snapshot_t",462,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_search_blk_cntr")=462
+	Set gtmtypes("shm_snapshot_t",463,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_new_rec_cntr"
+	Set gtmtypes("shm_snapshot_t",463,"off")=7932
 	Set gtmtypes("shm_snapshot_t",463,"len")=4
 	Set gtmtypes("shm_snapshot_t",463,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srches.curr_count")=463
-	Set gtmtypes("shm_snapshot_t",464,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srches.cumul_count"
-	Set gtmtypes("shm_snapshot_t",464,"off")=8020
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_new_rec_cntr")=463
+	Set gtmtypes("shm_snapshot_t",464,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_rec_size_cntr"
+	Set gtmtypes("shm_snapshot_t",464,"off")=7936
 	Set gtmtypes("shm_snapshot_t",464,"len")=4
 	Set gtmtypes("shm_snapshot_t",464,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srches.cumul_count")=464
-	Set gtmtypes("shm_snapshot_t",465,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srch_clues"
-	Set gtmtypes("shm_snapshot_t",465,"off")=8024
-	Set gtmtypes("shm_snapshot_t",465,"len")=8
-	Set gtmtypes("shm_snapshot_t",465,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srch_clues")=465
-	Set gtmtypes("shm_snapshot_t",466,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srch_clues.curr_count"
-	Set gtmtypes("shm_snapshot_t",466,"off")=8024
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_rec_size_cntr")=464
+	Set gtmtypes("shm_snapshot_t",465,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_rec_cmpc_cntr"
+	Set gtmtypes("shm_snapshot_t",465,"off")=7940
+	Set gtmtypes("shm_snapshot_t",465,"len")=4
+	Set gtmtypes("shm_snapshot_t",465,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_rec_cmpc_cntr")=465
+	Set gtmtypes("shm_snapshot_t",466,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_blk_fini_cntr"
+	Set gtmtypes("shm_snapshot_t",466,"off")=7944
 	Set gtmtypes("shm_snapshot_t",466,"len")=4
 	Set gtmtypes("shm_snapshot_t",466,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srch_clues.curr_count")=466
-	Set gtmtypes("shm_snapshot_t",467,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srch_clues.cumul_count"
-	Set gtmtypes("shm_snapshot_t",467,"off")=8028
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_blk_fini_cntr")=466
+	Set gtmtypes("shm_snapshot_t",467,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_blk_split_cntr"
+	Set gtmtypes("shm_snapshot_t",467,"off")=7948
 	Set gtmtypes("shm_snapshot_t",467,"len")=4
 	Set gtmtypes("shm_snapshot_t",467,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srch_clues.cumul_count")=467
-	Set gtmtypes("shm_snapshot_t",468,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_head"
-	Set gtmtypes("shm_snapshot_t",468,"off")=8032
-	Set gtmtypes("shm_snapshot_t",468,"len")=8
-	Set gtmtypes("shm_snapshot_t",468,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_head")=468
-	Set gtmtypes("shm_snapshot_t",469,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_head.curr_count"
-	Set gtmtypes("shm_snapshot_t",469,"off")=8032
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_blk_split_cntr")=467
+	Set gtmtypes("shm_snapshot_t",468,"name")="shm_snapshot_t.shadow_file_header.t_qread_ripsleep_cnt_cntr"
+	Set gtmtypes("shm_snapshot_t",468,"off")=7952
+	Set gtmtypes("shm_snapshot_t",468,"len")=4
+	Set gtmtypes("shm_snapshot_t",468,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_ripsleep_cnt_cntr")=468
+	Set gtmtypes("shm_snapshot_t",469,"name")="shm_snapshot_t.shadow_file_header.t_qread_ripsleep_nblks_cntr"
+	Set gtmtypes("shm_snapshot_t",469,"off")=7956
 	Set gtmtypes("shm_snapshot_t",469,"len")=4
 	Set gtmtypes("shm_snapshot_t",469,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_head.curr_count")=469
-	Set gtmtypes("shm_snapshot_t",470,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_head.cumul_count"
-	Set gtmtypes("shm_snapshot_t",470,"off")=8036
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_ripsleep_nblks_cntr")=469
+	Set gtmtypes("shm_snapshot_t",470,"name")="shm_snapshot_t.shadow_file_header.wcs_wtfini_invoked_cntr"
+	Set gtmtypes("shm_snapshot_t",470,"off")=7960
 	Set gtmtypes("shm_snapshot_t",470,"len")=4
 	Set gtmtypes("shm_snapshot_t",470,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_head.cumul_count")=470
-	Set gtmtypes("shm_snapshot_t",471,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_same"
-	Set gtmtypes("shm_snapshot_t",471,"off")=8040
-	Set gtmtypes("shm_snapshot_t",471,"len")=8
-	Set gtmtypes("shm_snapshot_t",471,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_same")=471
-	Set gtmtypes("shm_snapshot_t",472,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_same.curr_count"
-	Set gtmtypes("shm_snapshot_t",472,"off")=8040
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wtfini_invoked_cntr")=470
+	Set gtmtypes("shm_snapshot_t",471,"name")="shm_snapshot_t.shadow_file_header.wcs_wterror_invoked_cntr"
+	Set gtmtypes("shm_snapshot_t",471,"off")=7964
+	Set gtmtypes("shm_snapshot_t",471,"len")=4
+	Set gtmtypes("shm_snapshot_t",471,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wterror_invoked_cntr")=471
+	Set gtmtypes("shm_snapshot_t",472,"name")="shm_snapshot_t.shadow_file_header.wcs_wt_restart_invoked_cntr"
+	Set gtmtypes("shm_snapshot_t",472,"off")=7968
 	Set gtmtypes("shm_snapshot_t",472,"len")=4
 	Set gtmtypes("shm_snapshot_t",472,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_same.curr_count")=472
-	Set gtmtypes("shm_snapshot_t",473,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_same.cumul_count"
-	Set gtmtypes("shm_snapshot_t",473,"off")=8044
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wt_restart_invoked_cntr")=472
+	Set gtmtypes("shm_snapshot_t",473,"name")="shm_snapshot_t.shadow_file_header.wcs_wt_restart_eagain_cntr"
+	Set gtmtypes("shm_snapshot_t",473,"off")=7972
 	Set gtmtypes("shm_snapshot_t",473,"len")=4
 	Set gtmtypes("shm_snapshot_t",473,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_same.cumul_count")=473
-	Set gtmtypes("shm_snapshot_t",474,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_tail"
-	Set gtmtypes("shm_snapshot_t",474,"off")=8048
-	Set gtmtypes("shm_snapshot_t",474,"len")=8
-	Set gtmtypes("shm_snapshot_t",474,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_tail")=474
-	Set gtmtypes("shm_snapshot_t",475,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_tail.curr_count"
-	Set gtmtypes("shm_snapshot_t",475,"off")=8048
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wt_restart_eagain_cntr")=473
+	Set gtmtypes("shm_snapshot_t",474,"name")="shm_snapshot_t.shadow_file_header.wcs_wt_restart_reinsert_cntr"
+	Set gtmtypes("shm_snapshot_t",474,"off")=7976
+	Set gtmtypes("shm_snapshot_t",474,"len")=4
+	Set gtmtypes("shm_snapshot_t",474,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wt_restart_reinsert_cntr")=474
+	Set gtmtypes("shm_snapshot_t",475,"name")="shm_snapshot_t.shadow_file_header.wcs_wtstart_eagain_cntr"
+	Set gtmtypes("shm_snapshot_t",475,"off")=7980
 	Set gtmtypes("shm_snapshot_t",475,"len")=4
 	Set gtmtypes("shm_snapshot_t",475,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_tail.curr_count")=475
-	Set gtmtypes("shm_snapshot_t",476,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_tail.cumul_count"
-	Set gtmtypes("shm_snapshot_t",476,"off")=8052
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wtstart_eagain_cntr")=475
+	Set gtmtypes("shm_snapshot_t",476,"name")="shm_snapshot_t.shadow_file_header.wcs_wtstart_eagain_incrit_cntr"
+	Set gtmtypes("shm_snapshot_t",476,"off")=7984
 	Set gtmtypes("shm_snapshot_t",476,"len")=4
 	Set gtmtypes("shm_snapshot_t",476,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_tail.cumul_count")=476
-	Set gtmtypes("shm_snapshot_t",477,"name")="shm_snapshot_t.shadow_file_header.n_t_qreads"
-	Set gtmtypes("shm_snapshot_t",477,"off")=8056
-	Set gtmtypes("shm_snapshot_t",477,"len")=8
-	Set gtmtypes("shm_snapshot_t",477,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_t_qreads")=477
-	Set gtmtypes("shm_snapshot_t",478,"name")="shm_snapshot_t.shadow_file_header.n_t_qreads.curr_count"
-	Set gtmtypes("shm_snapshot_t",478,"off")=8056
-	Set gtmtypes("shm_snapshot_t",478,"len")=4
-	Set gtmtypes("shm_snapshot_t",478,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_t_qreads.curr_count")=478
-	Set gtmtypes("shm_snapshot_t",479,"name")="shm_snapshot_t.shadow_file_header.n_t_qreads.cumul_count"
-	Set gtmtypes("shm_snapshot_t",479,"off")=8060
-	Set gtmtypes("shm_snapshot_t",479,"len")=4
-	Set gtmtypes("shm_snapshot_t",479,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_t_qreads.cumul_count")=479
-	Set gtmtypes("shm_snapshot_t",480,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_reads"
-	Set gtmtypes("shm_snapshot_t",480,"off")=8064
-	Set gtmtypes("shm_snapshot_t",480,"len")=8
-	Set gtmtypes("shm_snapshot_t",480,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_reads")=480
-	Set gtmtypes("shm_snapshot_t",481,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_reads.curr_count"
-	Set gtmtypes("shm_snapshot_t",481,"off")=8064
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wtstart_eagain_incrit_cntr")=476
+	Set gtmtypes("shm_snapshot_t",477,"name")="shm_snapshot_t.shadow_file_header.async_restart_eagain_cntr"
+	Set gtmtypes("shm_snapshot_t",477,"off")=7988
+	Set gtmtypes("shm_snapshot_t",477,"len")=4
+	Set gtmtypes("shm_snapshot_t",477,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.async_restart_eagain_cntr")=477
+	Set gtmtypes("shm_snapshot_t",478,"name")="shm_snapshot_t.shadow_file_header.bg_trc_rec_cntr_filler"
+	Set gtmtypes("shm_snapshot_t",478,"off")=7992
+	Set gtmtypes("shm_snapshot_t",478,"len")=24
+	Set gtmtypes("shm_snapshot_t",478,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bg_trc_rec_cntr_filler")=478
+	Set gtmtypes("shm_snapshot_t",479,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srches"
+	Set gtmtypes("shm_snapshot_t",479,"off")=8016
+	Set gtmtypes("shm_snapshot_t",479,"len")=8
+	Set gtmtypes("shm_snapshot_t",479,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srches")=479
+	Set gtmtypes("shm_snapshot_t",480,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srches.curr_count"
+	Set gtmtypes("shm_snapshot_t",480,"off")=8016
+	Set gtmtypes("shm_snapshot_t",480,"len")=4
+	Set gtmtypes("shm_snapshot_t",480,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srches.curr_count")=480
+	Set gtmtypes("shm_snapshot_t",481,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srches.cumul_count"
+	Set gtmtypes("shm_snapshot_t",481,"off")=8020
 	Set gtmtypes("shm_snapshot_t",481,"len")=4
 	Set gtmtypes("shm_snapshot_t",481,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_reads.curr_count")=481
-	Set gtmtypes("shm_snapshot_t",482,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_reads.cumul_count"
-	Set gtmtypes("shm_snapshot_t",482,"off")=8068
-	Set gtmtypes("shm_snapshot_t",482,"len")=4
-	Set gtmtypes("shm_snapshot_t",482,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_reads.cumul_count")=482
-	Set gtmtypes("shm_snapshot_t",483,"name")="shm_snapshot_t.shadow_file_header.n_bgmm_updates"
-	Set gtmtypes("shm_snapshot_t",483,"off")=8072
-	Set gtmtypes("shm_snapshot_t",483,"len")=8
-	Set gtmtypes("shm_snapshot_t",483,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bgmm_updates")=483
-	Set gtmtypes("shm_snapshot_t",484,"name")="shm_snapshot_t.shadow_file_header.n_bgmm_updates.curr_count"
-	Set gtmtypes("shm_snapshot_t",484,"off")=8072
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srches.cumul_count")=481
+	Set gtmtypes("shm_snapshot_t",482,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srch_clues"
+	Set gtmtypes("shm_snapshot_t",482,"off")=8024
+	Set gtmtypes("shm_snapshot_t",482,"len")=8
+	Set gtmtypes("shm_snapshot_t",482,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srch_clues")=482
+	Set gtmtypes("shm_snapshot_t",483,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srch_clues.curr_count"
+	Set gtmtypes("shm_snapshot_t",483,"off")=8024
+	Set gtmtypes("shm_snapshot_t",483,"len")=4
+	Set gtmtypes("shm_snapshot_t",483,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srch_clues.curr_count")=483
+	Set gtmtypes("shm_snapshot_t",484,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srch_clues.cumul_count"
+	Set gtmtypes("shm_snapshot_t",484,"off")=8028
 	Set gtmtypes("shm_snapshot_t",484,"len")=4
 	Set gtmtypes("shm_snapshot_t",484,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bgmm_updates.curr_count")=484
-	Set gtmtypes("shm_snapshot_t",485,"name")="shm_snapshot_t.shadow_file_header.n_bgmm_updates.cumul_count"
-	Set gtmtypes("shm_snapshot_t",485,"off")=8076
-	Set gtmtypes("shm_snapshot_t",485,"len")=4
-	Set gtmtypes("shm_snapshot_t",485,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bgmm_updates.cumul_count")=485
-	Set gtmtypes("shm_snapshot_t",486,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_writes"
-	Set gtmtypes("shm_snapshot_t",486,"off")=8080
-	Set gtmtypes("shm_snapshot_t",486,"len")=8
-	Set gtmtypes("shm_snapshot_t",486,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_writes")=486
-	Set gtmtypes("shm_snapshot_t",487,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_writes.curr_count"
-	Set gtmtypes("shm_snapshot_t",487,"off")=8080
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srch_clues.cumul_count")=484
+	Set gtmtypes("shm_snapshot_t",485,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_head"
+	Set gtmtypes("shm_snapshot_t",485,"off")=8032
+	Set gtmtypes("shm_snapshot_t",485,"len")=8
+	Set gtmtypes("shm_snapshot_t",485,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_head")=485
+	Set gtmtypes("shm_snapshot_t",486,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_head.curr_count"
+	Set gtmtypes("shm_snapshot_t",486,"off")=8032
+	Set gtmtypes("shm_snapshot_t",486,"len")=4
+	Set gtmtypes("shm_snapshot_t",486,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_head.curr_count")=486
+	Set gtmtypes("shm_snapshot_t",487,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_head.cumul_count"
+	Set gtmtypes("shm_snapshot_t",487,"off")=8036
 	Set gtmtypes("shm_snapshot_t",487,"len")=4
 	Set gtmtypes("shm_snapshot_t",487,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_writes.curr_count")=487
-	Set gtmtypes("shm_snapshot_t",488,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_writes.cumul_count"
-	Set gtmtypes("shm_snapshot_t",488,"off")=8084
-	Set gtmtypes("shm_snapshot_t",488,"len")=4
-	Set gtmtypes("shm_snapshot_t",488,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_writes.cumul_count")=488
-	Set gtmtypes("shm_snapshot_t",489,"name")="shm_snapshot_t.shadow_file_header.n_bg_update_creates"
-	Set gtmtypes("shm_snapshot_t",489,"off")=8088
-	Set gtmtypes("shm_snapshot_t",489,"len")=8
-	Set gtmtypes("shm_snapshot_t",489,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bg_update_creates")=489
-	Set gtmtypes("shm_snapshot_t",490,"name")="shm_snapshot_t.shadow_file_header.n_bg_update_creates.curr_count"
-	Set gtmtypes("shm_snapshot_t",490,"off")=8088
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_head.cumul_count")=487
+	Set gtmtypes("shm_snapshot_t",488,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_same"
+	Set gtmtypes("shm_snapshot_t",488,"off")=8040
+	Set gtmtypes("shm_snapshot_t",488,"len")=8
+	Set gtmtypes("shm_snapshot_t",488,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_same")=488
+	Set gtmtypes("shm_snapshot_t",489,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_same.curr_count"
+	Set gtmtypes("shm_snapshot_t",489,"off")=8040
+	Set gtmtypes("shm_snapshot_t",489,"len")=4
+	Set gtmtypes("shm_snapshot_t",489,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_same.curr_count")=489
+	Set gtmtypes("shm_snapshot_t",490,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_same.cumul_count"
+	Set gtmtypes("shm_snapshot_t",490,"off")=8044
 	Set gtmtypes("shm_snapshot_t",490,"len")=4
 	Set gtmtypes("shm_snapshot_t",490,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bg_update_creates.curr_count")=490
-	Set gtmtypes("shm_snapshot_t",491,"name")="shm_snapshot_t.shadow_file_header.n_bg_update_creates.cumul_count"
-	Set gtmtypes("shm_snapshot_t",491,"off")=8092
-	Set gtmtypes("shm_snapshot_t",491,"len")=4
-	Set gtmtypes("shm_snapshot_t",491,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bg_update_creates.cumul_count")=491
-	Set gtmtypes("shm_snapshot_t",492,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getns"
-	Set gtmtypes("shm_snapshot_t",492,"off")=8096
-	Set gtmtypes("shm_snapshot_t",492,"len")=8
-	Set gtmtypes("shm_snapshot_t",492,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getns")=492
-	Set gtmtypes("shm_snapshot_t",493,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getns.curr_count"
-	Set gtmtypes("shm_snapshot_t",493,"off")=8096
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_same.cumul_count")=490
+	Set gtmtypes("shm_snapshot_t",491,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_tail"
+	Set gtmtypes("shm_snapshot_t",491,"off")=8048
+	Set gtmtypes("shm_snapshot_t",491,"len")=8
+	Set gtmtypes("shm_snapshot_t",491,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_tail")=491
+	Set gtmtypes("shm_snapshot_t",492,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_tail.curr_count"
+	Set gtmtypes("shm_snapshot_t",492,"off")=8048
+	Set gtmtypes("shm_snapshot_t",492,"len")=4
+	Set gtmtypes("shm_snapshot_t",492,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_tail.curr_count")=492
+	Set gtmtypes("shm_snapshot_t",493,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_tail.cumul_count"
+	Set gtmtypes("shm_snapshot_t",493,"off")=8052
 	Set gtmtypes("shm_snapshot_t",493,"len")=4
 	Set gtmtypes("shm_snapshot_t",493,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getns.curr_count")=493
-	Set gtmtypes("shm_snapshot_t",494,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getns.cumul_count"
-	Set gtmtypes("shm_snapshot_t",494,"off")=8100
-	Set gtmtypes("shm_snapshot_t",494,"len")=4
-	Set gtmtypes("shm_snapshot_t",494,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getns.cumul_count")=494
-	Set gtmtypes("shm_snapshot_t",495,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getn_lcnt"
-	Set gtmtypes("shm_snapshot_t",495,"off")=8104
-	Set gtmtypes("shm_snapshot_t",495,"len")=8
-	Set gtmtypes("shm_snapshot_t",495,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getn_lcnt")=495
-	Set gtmtypes("shm_snapshot_t",496,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getn_lcnt.curr_count"
-	Set gtmtypes("shm_snapshot_t",496,"off")=8104
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_tail.cumul_count")=493
+	Set gtmtypes("shm_snapshot_t",494,"name")="shm_snapshot_t.shadow_file_header.n_t_qreads"
+	Set gtmtypes("shm_snapshot_t",494,"off")=8056
+	Set gtmtypes("shm_snapshot_t",494,"len")=8
+	Set gtmtypes("shm_snapshot_t",494,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_t_qreads")=494
+	Set gtmtypes("shm_snapshot_t",495,"name")="shm_snapshot_t.shadow_file_header.n_t_qreads.curr_count"
+	Set gtmtypes("shm_snapshot_t",495,"off")=8056
+	Set gtmtypes("shm_snapshot_t",495,"len")=4
+	Set gtmtypes("shm_snapshot_t",495,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_t_qreads.curr_count")=495
+	Set gtmtypes("shm_snapshot_t",496,"name")="shm_snapshot_t.shadow_file_header.n_t_qreads.cumul_count"
+	Set gtmtypes("shm_snapshot_t",496,"off")=8060
 	Set gtmtypes("shm_snapshot_t",496,"len")=4
 	Set gtmtypes("shm_snapshot_t",496,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getn_lcnt.curr_count")=496
-	Set gtmtypes("shm_snapshot_t",497,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getn_lcnt.cumul_count"
-	Set gtmtypes("shm_snapshot_t",497,"off")=8108
-	Set gtmtypes("shm_snapshot_t",497,"len")=4
-	Set gtmtypes("shm_snapshot_t",497,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getn_lcnt.cumul_count")=497
-	Set gtmtypes("shm_snapshot_t",498,"name")="shm_snapshot_t.shadow_file_header.db_csh_acct_rec_filler_4k"
-	Set gtmtypes("shm_snapshot_t",498,"off")=8112
-	Set gtmtypes("shm_snapshot_t",498,"len")=152
-	Set gtmtypes("shm_snapshot_t",498,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_acct_rec_filler_4k")=498
-	Set gtmtypes("shm_snapshot_t",499,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec"
-	Set gtmtypes("shm_snapshot_t",499,"off")=8264
-	Set gtmtypes("shm_snapshot_t",499,"len")=464
-	Set gtmtypes("shm_snapshot_t",499,"type")="gvstats_rec_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec")=499
-	Set gtmtypes("shm_snapshot_t",500,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_set"
-	Set gtmtypes("shm_snapshot_t",500,"off")=8264
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_t_qreads.cumul_count")=496
+	Set gtmtypes("shm_snapshot_t",497,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_reads"
+	Set gtmtypes("shm_snapshot_t",497,"off")=8064
+	Set gtmtypes("shm_snapshot_t",497,"len")=8
+	Set gtmtypes("shm_snapshot_t",497,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_reads")=497
+	Set gtmtypes("shm_snapshot_t",498,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_reads.curr_count"
+	Set gtmtypes("shm_snapshot_t",498,"off")=8064
+	Set gtmtypes("shm_snapshot_t",498,"len")=4
+	Set gtmtypes("shm_snapshot_t",498,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_reads.curr_count")=498
+	Set gtmtypes("shm_snapshot_t",499,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_reads.cumul_count"
+	Set gtmtypes("shm_snapshot_t",499,"off")=8068
+	Set gtmtypes("shm_snapshot_t",499,"len")=4
+	Set gtmtypes("shm_snapshot_t",499,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_reads.cumul_count")=499
+	Set gtmtypes("shm_snapshot_t",500,"name")="shm_snapshot_t.shadow_file_header.n_bgmm_updates"
+	Set gtmtypes("shm_snapshot_t",500,"off")=8072
 	Set gtmtypes("shm_snapshot_t",500,"len")=8
-	Set gtmtypes("shm_snapshot_t",500,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_set")=500
-	Set gtmtypes("shm_snapshot_t",501,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_kill"
-	Set gtmtypes("shm_snapshot_t",501,"off")=8272
-	Set gtmtypes("shm_snapshot_t",501,"len")=8
-	Set gtmtypes("shm_snapshot_t",501,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_kill")=501
-	Set gtmtypes("shm_snapshot_t",502,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_get"
-	Set gtmtypes("shm_snapshot_t",502,"off")=8280
-	Set gtmtypes("shm_snapshot_t",502,"len")=8
-	Set gtmtypes("shm_snapshot_t",502,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_get")=502
-	Set gtmtypes("shm_snapshot_t",503,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_data"
-	Set gtmtypes("shm_snapshot_t",503,"off")=8288
+	Set gtmtypes("shm_snapshot_t",500,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bgmm_updates")=500
+	Set gtmtypes("shm_snapshot_t",501,"name")="shm_snapshot_t.shadow_file_header.n_bgmm_updates.curr_count"
+	Set gtmtypes("shm_snapshot_t",501,"off")=8072
+	Set gtmtypes("shm_snapshot_t",501,"len")=4
+	Set gtmtypes("shm_snapshot_t",501,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bgmm_updates.curr_count")=501
+	Set gtmtypes("shm_snapshot_t",502,"name")="shm_snapshot_t.shadow_file_header.n_bgmm_updates.cumul_count"
+	Set gtmtypes("shm_snapshot_t",502,"off")=8076
+	Set gtmtypes("shm_snapshot_t",502,"len")=4
+	Set gtmtypes("shm_snapshot_t",502,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bgmm_updates.cumul_count")=502
+	Set gtmtypes("shm_snapshot_t",503,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_writes"
+	Set gtmtypes("shm_snapshot_t",503,"off")=8080
 	Set gtmtypes("shm_snapshot_t",503,"len")=8
-	Set gtmtypes("shm_snapshot_t",503,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_data")=503
-	Set gtmtypes("shm_snapshot_t",504,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_order"
-	Set gtmtypes("shm_snapshot_t",504,"off")=8296
-	Set gtmtypes("shm_snapshot_t",504,"len")=8
-	Set gtmtypes("shm_snapshot_t",504,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_order")=504
-	Set gtmtypes("shm_snapshot_t",505,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_zprev"
-	Set gtmtypes("shm_snapshot_t",505,"off")=8304
-	Set gtmtypes("shm_snapshot_t",505,"len")=8
-	Set gtmtypes("shm_snapshot_t",505,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_zprev")=505
-	Set gtmtypes("shm_snapshot_t",506,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_query"
-	Set gtmtypes("shm_snapshot_t",506,"off")=8312
+	Set gtmtypes("shm_snapshot_t",503,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_writes")=503
+	Set gtmtypes("shm_snapshot_t",504,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_writes.curr_count"
+	Set gtmtypes("shm_snapshot_t",504,"off")=8080
+	Set gtmtypes("shm_snapshot_t",504,"len")=4
+	Set gtmtypes("shm_snapshot_t",504,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_writes.curr_count")=504
+	Set gtmtypes("shm_snapshot_t",505,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_writes.cumul_count"
+	Set gtmtypes("shm_snapshot_t",505,"off")=8084
+	Set gtmtypes("shm_snapshot_t",505,"len")=4
+	Set gtmtypes("shm_snapshot_t",505,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_writes.cumul_count")=505
+	Set gtmtypes("shm_snapshot_t",506,"name")="shm_snapshot_t.shadow_file_header.n_bg_update_creates"
+	Set gtmtypes("shm_snapshot_t",506,"off")=8088
 	Set gtmtypes("shm_snapshot_t",506,"len")=8
-	Set gtmtypes("shm_snapshot_t",506,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_query")=506
-	Set gtmtypes("shm_snapshot_t",507,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_lock_success"
-	Set gtmtypes("shm_snapshot_t",507,"off")=8320
-	Set gtmtypes("shm_snapshot_t",507,"len")=8
-	Set gtmtypes("shm_snapshot_t",507,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_lock_success")=507
-	Set gtmtypes("shm_snapshot_t",508,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_lock_fail"
-	Set gtmtypes("shm_snapshot_t",508,"off")=8328
-	Set gtmtypes("shm_snapshot_t",508,"len")=8
-	Set gtmtypes("shm_snapshot_t",508,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_lock_fail")=508
-	Set gtmtypes("shm_snapshot_t",509,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.db_curr_tn"
-	Set gtmtypes("shm_snapshot_t",509,"off")=8336
+	Set gtmtypes("shm_snapshot_t",506,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bg_update_creates")=506
+	Set gtmtypes("shm_snapshot_t",507,"name")="shm_snapshot_t.shadow_file_header.n_bg_update_creates.curr_count"
+	Set gtmtypes("shm_snapshot_t",507,"off")=8088
+	Set gtmtypes("shm_snapshot_t",507,"len")=4
+	Set gtmtypes("shm_snapshot_t",507,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bg_update_creates.curr_count")=507
+	Set gtmtypes("shm_snapshot_t",508,"name")="shm_snapshot_t.shadow_file_header.n_bg_update_creates.cumul_count"
+	Set gtmtypes("shm_snapshot_t",508,"off")=8092
+	Set gtmtypes("shm_snapshot_t",508,"len")=4
+	Set gtmtypes("shm_snapshot_t",508,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bg_update_creates.cumul_count")=508
+	Set gtmtypes("shm_snapshot_t",509,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getns"
+	Set gtmtypes("shm_snapshot_t",509,"off")=8096
 	Set gtmtypes("shm_snapshot_t",509,"len")=8
-	Set gtmtypes("shm_snapshot_t",509,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.db_curr_tn")=509
-	Set gtmtypes("shm_snapshot_t",510,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_dsk_read"
-	Set gtmtypes("shm_snapshot_t",510,"off")=8344
-	Set gtmtypes("shm_snapshot_t",510,"len")=8
-	Set gtmtypes("shm_snapshot_t",510,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_dsk_read")=510
-	Set gtmtypes("shm_snapshot_t",511,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_dsk_write"
-	Set gtmtypes("shm_snapshot_t",511,"off")=8352
-	Set gtmtypes("shm_snapshot_t",511,"len")=8
-	Set gtmtypes("shm_snapshot_t",511,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_dsk_write")=511
-	Set gtmtypes("shm_snapshot_t",512,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_readwrite"
-	Set gtmtypes("shm_snapshot_t",512,"off")=8360
+	Set gtmtypes("shm_snapshot_t",509,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getns")=509
+	Set gtmtypes("shm_snapshot_t",510,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getns.curr_count"
+	Set gtmtypes("shm_snapshot_t",510,"off")=8096
+	Set gtmtypes("shm_snapshot_t",510,"len")=4
+	Set gtmtypes("shm_snapshot_t",510,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getns.curr_count")=510
+	Set gtmtypes("shm_snapshot_t",511,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getns.cumul_count"
+	Set gtmtypes("shm_snapshot_t",511,"off")=8100
+	Set gtmtypes("shm_snapshot_t",511,"len")=4
+	Set gtmtypes("shm_snapshot_t",511,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getns.cumul_count")=511
+	Set gtmtypes("shm_snapshot_t",512,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getn_lcnt"
+	Set gtmtypes("shm_snapshot_t",512,"off")=8104
 	Set gtmtypes("shm_snapshot_t",512,"len")=8
-	Set gtmtypes("shm_snapshot_t",512,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_readwrite")=512
-	Set gtmtypes("shm_snapshot_t",513,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_readonly"
-	Set gtmtypes("shm_snapshot_t",513,"off")=8368
-	Set gtmtypes("shm_snapshot_t",513,"len")=8
-	Set gtmtypes("shm_snapshot_t",513,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_readonly")=513
-	Set gtmtypes("shm_snapshot_t",514,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_blkwrite"
-	Set gtmtypes("shm_snapshot_t",514,"off")=8376
-	Set gtmtypes("shm_snapshot_t",514,"len")=8
-	Set gtmtypes("shm_snapshot_t",514,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_blkwrite")=514
-	Set gtmtypes("shm_snapshot_t",515,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_blkread"
-	Set gtmtypes("shm_snapshot_t",515,"off")=8384
-	Set gtmtypes("shm_snapshot_t",515,"len")=8
-	Set gtmtypes("shm_snapshot_t",515,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_blkread")=515
-	Set gtmtypes("shm_snapshot_t",516,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_retries_0"
-	Set gtmtypes("shm_snapshot_t",516,"off")=8392
-	Set gtmtypes("shm_snapshot_t",516,"len")=8
-	Set gtmtypes("shm_snapshot_t",516,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_retries_0")=516
-	Set gtmtypes("shm_snapshot_t",517,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_retries_1"
-	Set gtmtypes("shm_snapshot_t",517,"off")=8400
+	Set gtmtypes("shm_snapshot_t",512,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getn_lcnt")=512
+	Set gtmtypes("shm_snapshot_t",513,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getn_lcnt.curr_count"
+	Set gtmtypes("shm_snapshot_t",513,"off")=8104
+	Set gtmtypes("shm_snapshot_t",513,"len")=4
+	Set gtmtypes("shm_snapshot_t",513,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getn_lcnt.curr_count")=513
+	Set gtmtypes("shm_snapshot_t",514,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getn_lcnt.cumul_count"
+	Set gtmtypes("shm_snapshot_t",514,"off")=8108
+	Set gtmtypes("shm_snapshot_t",514,"len")=4
+	Set gtmtypes("shm_snapshot_t",514,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getn_lcnt.cumul_count")=514
+	Set gtmtypes("shm_snapshot_t",515,"name")="shm_snapshot_t.shadow_file_header.db_csh_acct_rec_filler_4k"
+	Set gtmtypes("shm_snapshot_t",515,"off")=8112
+	Set gtmtypes("shm_snapshot_t",515,"len")=152
+	Set gtmtypes("shm_snapshot_t",515,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_acct_rec_filler_4k")=515
+	Set gtmtypes("shm_snapshot_t",516,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec"
+	Set gtmtypes("shm_snapshot_t",516,"off")=8264
+	Set gtmtypes("shm_snapshot_t",516,"len")=472
+	Set gtmtypes("shm_snapshot_t",516,"type")="gvstats_rec_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec")=516
+	Set gtmtypes("shm_snapshot_t",517,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_set"
+	Set gtmtypes("shm_snapshot_t",517,"off")=8264
 	Set gtmtypes("shm_snapshot_t",517,"len")=8
 	Set gtmtypes("shm_snapshot_t",517,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_retries_1")=517
-	Set gtmtypes("shm_snapshot_t",518,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_retries_2"
-	Set gtmtypes("shm_snapshot_t",518,"off")=8408
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_set")=517
+	Set gtmtypes("shm_snapshot_t",518,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_kill"
+	Set gtmtypes("shm_snapshot_t",518,"off")=8272
 	Set gtmtypes("shm_snapshot_t",518,"len")=8
 	Set gtmtypes("shm_snapshot_t",518,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_retries_2")=518
-	Set gtmtypes("shm_snapshot_t",519,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_retries_3"
-	Set gtmtypes("shm_snapshot_t",519,"off")=8416
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_kill")=518
+	Set gtmtypes("shm_snapshot_t",519,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_get"
+	Set gtmtypes("shm_snapshot_t",519,"off")=8280
 	Set gtmtypes("shm_snapshot_t",519,"len")=8
 	Set gtmtypes("shm_snapshot_t",519,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_retries_3")=519
-	Set gtmtypes("shm_snapshot_t",520,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_readwrite"
-	Set gtmtypes("shm_snapshot_t",520,"off")=8424
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_get")=519
+	Set gtmtypes("shm_snapshot_t",520,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_data"
+	Set gtmtypes("shm_snapshot_t",520,"off")=8288
 	Set gtmtypes("shm_snapshot_t",520,"len")=8
 	Set gtmtypes("shm_snapshot_t",520,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_readwrite")=520
-	Set gtmtypes("shm_snapshot_t",521,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_readonly"
-	Set gtmtypes("shm_snapshot_t",521,"off")=8432
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_data")=520
+	Set gtmtypes("shm_snapshot_t",521,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_order"
+	Set gtmtypes("shm_snapshot_t",521,"off")=8296
 	Set gtmtypes("shm_snapshot_t",521,"len")=8
 	Set gtmtypes("shm_snapshot_t",521,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_readonly")=521
-	Set gtmtypes("shm_snapshot_t",522,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_rolledback"
-	Set gtmtypes("shm_snapshot_t",522,"off")=8440
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_order")=521
+	Set gtmtypes("shm_snapshot_t",522,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_zprev"
+	Set gtmtypes("shm_snapshot_t",522,"off")=8304
 	Set gtmtypes("shm_snapshot_t",522,"len")=8
 	Set gtmtypes("shm_snapshot_t",522,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_rolledback")=522
-	Set gtmtypes("shm_snapshot_t",523,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_blkwrite"
-	Set gtmtypes("shm_snapshot_t",523,"off")=8448
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_zprev")=522
+	Set gtmtypes("shm_snapshot_t",523,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_query"
+	Set gtmtypes("shm_snapshot_t",523,"off")=8312
 	Set gtmtypes("shm_snapshot_t",523,"len")=8
 	Set gtmtypes("shm_snapshot_t",523,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_blkwrite")=523
-	Set gtmtypes("shm_snapshot_t",524,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_blkread"
-	Set gtmtypes("shm_snapshot_t",524,"off")=8456
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_query")=523
+	Set gtmtypes("shm_snapshot_t",524,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_lock_success"
+	Set gtmtypes("shm_snapshot_t",524,"off")=8320
 	Set gtmtypes("shm_snapshot_t",524,"len")=8
 	Set gtmtypes("shm_snapshot_t",524,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_blkread")=524
-	Set gtmtypes("shm_snapshot_t",525,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_tot_retries_0"
-	Set gtmtypes("shm_snapshot_t",525,"off")=8464
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_lock_success")=524
+	Set gtmtypes("shm_snapshot_t",525,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_lock_fail"
+	Set gtmtypes("shm_snapshot_t",525,"off")=8328
 	Set gtmtypes("shm_snapshot_t",525,"len")=8
 	Set gtmtypes("shm_snapshot_t",525,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_tot_retries_0")=525
-	Set gtmtypes("shm_snapshot_t",526,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_tot_retries_1"
-	Set gtmtypes("shm_snapshot_t",526,"off")=8472
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_lock_fail")=525
+	Set gtmtypes("shm_snapshot_t",526,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.db_curr_tn"
+	Set gtmtypes("shm_snapshot_t",526,"off")=8336
 	Set gtmtypes("shm_snapshot_t",526,"len")=8
 	Set gtmtypes("shm_snapshot_t",526,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_tot_retries_1")=526
-	Set gtmtypes("shm_snapshot_t",527,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_tot_retries_2"
-	Set gtmtypes("shm_snapshot_t",527,"off")=8480
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.db_curr_tn")=526
+	Set gtmtypes("shm_snapshot_t",527,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_dsk_read"
+	Set gtmtypes("shm_snapshot_t",527,"off")=8344
 	Set gtmtypes("shm_snapshot_t",527,"len")=8
 	Set gtmtypes("shm_snapshot_t",527,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_tot_retries_2")=527
-	Set gtmtypes("shm_snapshot_t",528,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_tot_retries_3"
-	Set gtmtypes("shm_snapshot_t",528,"off")=8488
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_dsk_read")=527
+	Set gtmtypes("shm_snapshot_t",528,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_dsk_write"
+	Set gtmtypes("shm_snapshot_t",528,"off")=8352
 	Set gtmtypes("shm_snapshot_t",528,"len")=8
 	Set gtmtypes("shm_snapshot_t",528,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_tot_retries_3")=528
-	Set gtmtypes("shm_snapshot_t",529,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_tot_retries_4"
-	Set gtmtypes("shm_snapshot_t",529,"off")=8496
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_dsk_write")=528
+	Set gtmtypes("shm_snapshot_t",529,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_readwrite"
+	Set gtmtypes("shm_snapshot_t",529,"off")=8360
 	Set gtmtypes("shm_snapshot_t",529,"len")=8
 	Set gtmtypes("shm_snapshot_t",529,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_tot_retries_4")=529
-	Set gtmtypes("shm_snapshot_t",530,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_0"
-	Set gtmtypes("shm_snapshot_t",530,"off")=8504
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_readwrite")=529
+	Set gtmtypes("shm_snapshot_t",530,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_readonly"
+	Set gtmtypes("shm_snapshot_t",530,"off")=8368
 	Set gtmtypes("shm_snapshot_t",530,"len")=8
 	Set gtmtypes("shm_snapshot_t",530,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_0")=530
-	Set gtmtypes("shm_snapshot_t",531,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_1"
-	Set gtmtypes("shm_snapshot_t",531,"off")=8512
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_readonly")=530
+	Set gtmtypes("shm_snapshot_t",531,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_blkwrite"
+	Set gtmtypes("shm_snapshot_t",531,"off")=8376
 	Set gtmtypes("shm_snapshot_t",531,"len")=8
 	Set gtmtypes("shm_snapshot_t",531,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_1")=531
-	Set gtmtypes("shm_snapshot_t",532,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_2"
-	Set gtmtypes("shm_snapshot_t",532,"off")=8520
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_blkwrite")=531
+	Set gtmtypes("shm_snapshot_t",532,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_blkread"
+	Set gtmtypes("shm_snapshot_t",532,"off")=8384
 	Set gtmtypes("shm_snapshot_t",532,"len")=8
 	Set gtmtypes("shm_snapshot_t",532,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_2")=532
-	Set gtmtypes("shm_snapshot_t",533,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_3"
-	Set gtmtypes("shm_snapshot_t",533,"off")=8528
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_blkread")=532
+	Set gtmtypes("shm_snapshot_t",533,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_retries_0"
+	Set gtmtypes("shm_snapshot_t",533,"off")=8392
 	Set gtmtypes("shm_snapshot_t",533,"len")=8
 	Set gtmtypes("shm_snapshot_t",533,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_3")=533
-	Set gtmtypes("shm_snapshot_t",534,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_4"
-	Set gtmtypes("shm_snapshot_t",534,"off")=8536
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_retries_0")=533
+	Set gtmtypes("shm_snapshot_t",534,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_retries_1"
+	Set gtmtypes("shm_snapshot_t",534,"off")=8400
 	Set gtmtypes("shm_snapshot_t",534,"len")=8
 	Set gtmtypes("shm_snapshot_t",534,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_4")=534
-	Set gtmtypes("shm_snapshot_t",535,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_ztrigger"
-	Set gtmtypes("shm_snapshot_t",535,"off")=8544
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_retries_1")=534
+	Set gtmtypes("shm_snapshot_t",535,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_retries_2"
+	Set gtmtypes("shm_snapshot_t",535,"off")=8408
 	Set gtmtypes("shm_snapshot_t",535,"len")=8
 	Set gtmtypes("shm_snapshot_t",535,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_ztrigger")=535
-	Set gtmtypes("shm_snapshot_t",536,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_db_flush"
-	Set gtmtypes("shm_snapshot_t",536,"off")=8552
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_retries_2")=535
+	Set gtmtypes("shm_snapshot_t",536,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_retries_3"
+	Set gtmtypes("shm_snapshot_t",536,"off")=8416
 	Set gtmtypes("shm_snapshot_t",536,"len")=8
 	Set gtmtypes("shm_snapshot_t",536,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_db_flush")=536
-	Set gtmtypes("shm_snapshot_t",537,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_db_fsync"
-	Set gtmtypes("shm_snapshot_t",537,"off")=8560
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_retries_3")=536
+	Set gtmtypes("shm_snapshot_t",537,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_readwrite"
+	Set gtmtypes("shm_snapshot_t",537,"off")=8424
 	Set gtmtypes("shm_snapshot_t",537,"len")=8
 	Set gtmtypes("shm_snapshot_t",537,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_db_fsync")=537
-	Set gtmtypes("shm_snapshot_t",538,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jnl_flush"
-	Set gtmtypes("shm_snapshot_t",538,"off")=8568
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_readwrite")=537
+	Set gtmtypes("shm_snapshot_t",538,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_readonly"
+	Set gtmtypes("shm_snapshot_t",538,"off")=8432
 	Set gtmtypes("shm_snapshot_t",538,"len")=8
 	Set gtmtypes("shm_snapshot_t",538,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jnl_flush")=538
-	Set gtmtypes("shm_snapshot_t",539,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jnl_fsync"
-	Set gtmtypes("shm_snapshot_t",539,"off")=8576
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_readonly")=538
+	Set gtmtypes("shm_snapshot_t",539,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_rolledback"
+	Set gtmtypes("shm_snapshot_t",539,"off")=8440
 	Set gtmtypes("shm_snapshot_t",539,"len")=8
 	Set gtmtypes("shm_snapshot_t",539,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jnl_fsync")=539
-	Set gtmtypes("shm_snapshot_t",540,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jbuff_bytes"
-	Set gtmtypes("shm_snapshot_t",540,"off")=8584
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_rolledback")=539
+	Set gtmtypes("shm_snapshot_t",540,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_blkwrite"
+	Set gtmtypes("shm_snapshot_t",540,"off")=8448
 	Set gtmtypes("shm_snapshot_t",540,"len")=8
 	Set gtmtypes("shm_snapshot_t",540,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jbuff_bytes")=540
-	Set gtmtypes("shm_snapshot_t",541,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jfile_bytes"
-	Set gtmtypes("shm_snapshot_t",541,"off")=8592
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_blkwrite")=540
+	Set gtmtypes("shm_snapshot_t",541,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_blkread"
+	Set gtmtypes("shm_snapshot_t",541,"off")=8456
 	Set gtmtypes("shm_snapshot_t",541,"len")=8
 	Set gtmtypes("shm_snapshot_t",541,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jfile_bytes")=541
-	Set gtmtypes("shm_snapshot_t",542,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jfile_writes"
-	Set gtmtypes("shm_snapshot_t",542,"off")=8600
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_blkread")=541
+	Set gtmtypes("shm_snapshot_t",542,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_tot_retries_0"
+	Set gtmtypes("shm_snapshot_t",542,"off")=8464
 	Set gtmtypes("shm_snapshot_t",542,"len")=8
 	Set gtmtypes("shm_snapshot_t",542,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jfile_writes")=542
-	Set gtmtypes("shm_snapshot_t",543,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jrec_logical"
-	Set gtmtypes("shm_snapshot_t",543,"off")=8608
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_tot_retries_0")=542
+	Set gtmtypes("shm_snapshot_t",543,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_tot_retries_1"
+	Set gtmtypes("shm_snapshot_t",543,"off")=8472
 	Set gtmtypes("shm_snapshot_t",543,"len")=8
 	Set gtmtypes("shm_snapshot_t",543,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jrec_logical")=543
-	Set gtmtypes("shm_snapshot_t",544,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jrec_pblk"
-	Set gtmtypes("shm_snapshot_t",544,"off")=8616
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_tot_retries_1")=543
+	Set gtmtypes("shm_snapshot_t",544,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_tot_retries_2"
+	Set gtmtypes("shm_snapshot_t",544,"off")=8480
 	Set gtmtypes("shm_snapshot_t",544,"len")=8
 	Set gtmtypes("shm_snapshot_t",544,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jrec_pblk")=544
-	Set gtmtypes("shm_snapshot_t",545,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jrec_epoch_regular"
-	Set gtmtypes("shm_snapshot_t",545,"off")=8624
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_tot_retries_2")=544
+	Set gtmtypes("shm_snapshot_t",545,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_tot_retries_3"
+	Set gtmtypes("shm_snapshot_t",545,"off")=8488
 	Set gtmtypes("shm_snapshot_t",545,"len")=8
 	Set gtmtypes("shm_snapshot_t",545,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jrec_epoch_regular")=545
-	Set gtmtypes("shm_snapshot_t",546,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jrec_epoch_idle"
-	Set gtmtypes("shm_snapshot_t",546,"off")=8632
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_tot_retries_3")=545
+	Set gtmtypes("shm_snapshot_t",546,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_tot_retries_4"
+	Set gtmtypes("shm_snapshot_t",546,"off")=8496
 	Set gtmtypes("shm_snapshot_t",546,"len")=8
 	Set gtmtypes("shm_snapshot_t",546,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jrec_epoch_idle")=546
-	Set gtmtypes("shm_snapshot_t",547,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jrec_other"
-	Set gtmtypes("shm_snapshot_t",547,"off")=8640
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_tot_retries_4")=546
+	Set gtmtypes("shm_snapshot_t",547,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_0"
+	Set gtmtypes("shm_snapshot_t",547,"off")=8504
 	Set gtmtypes("shm_snapshot_t",547,"len")=8
 	Set gtmtypes("shm_snapshot_t",547,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jrec_other")=547
-	Set gtmtypes("shm_snapshot_t",548,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jnl_extends"
-	Set gtmtypes("shm_snapshot_t",548,"off")=8648
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_0")=547
+	Set gtmtypes("shm_snapshot_t",548,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_1"
+	Set gtmtypes("shm_snapshot_t",548,"off")=8512
 	Set gtmtypes("shm_snapshot_t",548,"len")=8
 	Set gtmtypes("shm_snapshot_t",548,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jnl_extends")=548
-	Set gtmtypes("shm_snapshot_t",549,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_db_extends"
-	Set gtmtypes("shm_snapshot_t",549,"off")=8656
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_1")=548
+	Set gtmtypes("shm_snapshot_t",549,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_2"
+	Set gtmtypes("shm_snapshot_t",549,"off")=8520
 	Set gtmtypes("shm_snapshot_t",549,"len")=8
 	Set gtmtypes("shm_snapshot_t",549,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_db_extends")=549
-	Set gtmtypes("shm_snapshot_t",550,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_crit_success"
-	Set gtmtypes("shm_snapshot_t",550,"off")=8664
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_2")=549
+	Set gtmtypes("shm_snapshot_t",550,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_3"
+	Set gtmtypes("shm_snapshot_t",550,"off")=8528
 	Set gtmtypes("shm_snapshot_t",550,"len")=8
 	Set gtmtypes("shm_snapshot_t",550,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_crit_success")=550
-	Set gtmtypes("shm_snapshot_t",551,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_crits_in_epch"
-	Set gtmtypes("shm_snapshot_t",551,"off")=8672
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_3")=550
+	Set gtmtypes("shm_snapshot_t",551,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_4"
+	Set gtmtypes("shm_snapshot_t",551,"off")=8536
 	Set gtmtypes("shm_snapshot_t",551,"len")=8
 	Set gtmtypes("shm_snapshot_t",551,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_crits_in_epch")=551
-	Set gtmtypes("shm_snapshot_t",552,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.sq_crit_failed"
-	Set gtmtypes("shm_snapshot_t",552,"off")=8680
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_4")=551
+	Set gtmtypes("shm_snapshot_t",552,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_ztrigger"
+	Set gtmtypes("shm_snapshot_t",552,"off")=8544
 	Set gtmtypes("shm_snapshot_t",552,"len")=8
 	Set gtmtypes("shm_snapshot_t",552,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.sq_crit_failed")=552
-	Set gtmtypes("shm_snapshot_t",553,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_crit_failed"
-	Set gtmtypes("shm_snapshot_t",553,"off")=8688
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_ztrigger")=552
+	Set gtmtypes("shm_snapshot_t",553,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_db_flush"
+	Set gtmtypes("shm_snapshot_t",553,"off")=8552
 	Set gtmtypes("shm_snapshot_t",553,"len")=8
 	Set gtmtypes("shm_snapshot_t",553,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_crit_failed")=553
-	Set gtmtypes("shm_snapshot_t",554,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.sq_crit_que_slps"
-	Set gtmtypes("shm_snapshot_t",554,"off")=8696
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_db_flush")=553
+	Set gtmtypes("shm_snapshot_t",554,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_db_fsync"
+	Set gtmtypes("shm_snapshot_t",554,"off")=8560
 	Set gtmtypes("shm_snapshot_t",554,"len")=8
 	Set gtmtypes("shm_snapshot_t",554,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.sq_crit_que_slps")=554
-	Set gtmtypes("shm_snapshot_t",555,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_crit_que_slps"
-	Set gtmtypes("shm_snapshot_t",555,"off")=8704
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_db_fsync")=554
+	Set gtmtypes("shm_snapshot_t",555,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jnl_flush"
+	Set gtmtypes("shm_snapshot_t",555,"off")=8568
 	Set gtmtypes("shm_snapshot_t",555,"len")=8
 	Set gtmtypes("shm_snapshot_t",555,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_crit_que_slps")=555
-	Set gtmtypes("shm_snapshot_t",556,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.sq_crit_yields"
-	Set gtmtypes("shm_snapshot_t",556,"off")=8712
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jnl_flush")=555
+	Set gtmtypes("shm_snapshot_t",556,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jnl_fsync"
+	Set gtmtypes("shm_snapshot_t",556,"off")=8576
 	Set gtmtypes("shm_snapshot_t",556,"len")=8
 	Set gtmtypes("shm_snapshot_t",556,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.sq_crit_yields")=556
-	Set gtmtypes("shm_snapshot_t",557,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_crit_yields"
-	Set gtmtypes("shm_snapshot_t",557,"off")=8720
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jnl_fsync")=556
+	Set gtmtypes("shm_snapshot_t",557,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jbuff_bytes"
+	Set gtmtypes("shm_snapshot_t",557,"off")=8584
 	Set gtmtypes("shm_snapshot_t",557,"len")=8
 	Set gtmtypes("shm_snapshot_t",557,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_crit_yields")=557
-	Set gtmtypes("shm_snapshot_t",558,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec_filler_4k_plus_512"
-	Set gtmtypes("shm_snapshot_t",558,"off")=8728
-	Set gtmtypes("shm_snapshot_t",558,"len")=48
-	Set gtmtypes("shm_snapshot_t",558,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec_filler_4k_plus_512")=558
-	Set gtmtypes("shm_snapshot_t",559,"name")="shm_snapshot_t.shadow_file_header.filler_4k_plus_512"
-	Set gtmtypes("shm_snapshot_t",559,"off")=8776
-	Set gtmtypes("shm_snapshot_t",559,"len")=368
-	Set gtmtypes("shm_snapshot_t",559,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_4k_plus_512")=559
-	Set gtmtypes("shm_snapshot_t",560,"name")="shm_snapshot_t.shadow_file_header.intrpt_recov_resync_strm_seqno"
-	Set gtmtypes("shm_snapshot_t",560,"off")=9144
-	Set gtmtypes("shm_snapshot_t",560,"len")=128
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jbuff_bytes")=557
+	Set gtmtypes("shm_snapshot_t",558,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jfile_bytes"
+	Set gtmtypes("shm_snapshot_t",558,"off")=8592
+	Set gtmtypes("shm_snapshot_t",558,"len")=8
+	Set gtmtypes("shm_snapshot_t",558,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jfile_bytes")=558
+	Set gtmtypes("shm_snapshot_t",559,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jfile_writes"
+	Set gtmtypes("shm_snapshot_t",559,"off")=8600
+	Set gtmtypes("shm_snapshot_t",559,"len")=8
+	Set gtmtypes("shm_snapshot_t",559,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jfile_writes")=559
+	Set gtmtypes("shm_snapshot_t",560,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jrec_logical"
+	Set gtmtypes("shm_snapshot_t",560,"off")=8608
+	Set gtmtypes("shm_snapshot_t",560,"len")=8
 	Set gtmtypes("shm_snapshot_t",560,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.intrpt_recov_resync_strm_seqno")=560
-	Set gtmtypes("shm_snapshot_t",560,"dim")=16
-	Set gtmtypes("shm_snapshot_t",561,"name")="shm_snapshot_t.shadow_file_header.creation_db_ver"
-	Set gtmtypes("shm_snapshot_t",561,"off")=9272
-	Set gtmtypes("shm_snapshot_t",561,"len")=4
-	Set gtmtypes("shm_snapshot_t",561,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.creation_db_ver")=561
-	Set gtmtypes("shm_snapshot_t",562,"name")="shm_snapshot_t.shadow_file_header.creation_mdb_ver"
-	Set gtmtypes("shm_snapshot_t",562,"off")=9276
-	Set gtmtypes("shm_snapshot_t",562,"len")=4
-	Set gtmtypes("shm_snapshot_t",562,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.creation_mdb_ver")=562
-	Set gtmtypes("shm_snapshot_t",563,"name")="shm_snapshot_t.shadow_file_header.certified_for_upgrade_to"
-	Set gtmtypes("shm_snapshot_t",563,"off")=9280
-	Set gtmtypes("shm_snapshot_t",563,"len")=4
-	Set gtmtypes("shm_snapshot_t",563,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.certified_for_upgrade_to")=563
-	Set gtmtypes("shm_snapshot_t",564,"name")="shm_snapshot_t.shadow_file_header.filler_5k"
-	Set gtmtypes("shm_snapshot_t",564,"off")=9284
-	Set gtmtypes("shm_snapshot_t",564,"len")=4
-	Set gtmtypes("shm_snapshot_t",564,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_5k")=564
-	Set gtmtypes("shm_snapshot_t",565,"name")="shm_snapshot_t.shadow_file_header.secshr_ops_index_filler"
-	Set gtmtypes("shm_snapshot_t",565,"off")=9288
-	Set gtmtypes("shm_snapshot_t",565,"len")=4
-	Set gtmtypes("shm_snapshot_t",565,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.secshr_ops_index_filler")=565
-	Set gtmtypes("shm_snapshot_t",566,"name")="shm_snapshot_t.shadow_file_header.secshr_ops_array_filler"
-	Set gtmtypes("shm_snapshot_t",566,"off")=9292
-	Set gtmtypes("shm_snapshot_t",566,"len")=1020
-	Set gtmtypes("shm_snapshot_t",566,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.secshr_ops_array_filler")=566
-	Set gtmtypes("shm_snapshot_t",566,"dim")=255
-	Set gtmtypes("shm_snapshot_t",567,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn"
-	Set gtmtypes("shm_snapshot_t",567,"off")=10312
-	Set gtmtypes("shm_snapshot_t",567,"len")=24
-	Set gtmtypes("shm_snapshot_t",567,"type")="compswap_time_field"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn")=567
-	Set gtmtypes("shm_snapshot_t",568,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch"
-	Set gtmtypes("shm_snapshot_t",568,"off")=10312
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jrec_logical")=560
+	Set gtmtypes("shm_snapshot_t",561,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jrec_pblk"
+	Set gtmtypes("shm_snapshot_t",561,"off")=8616
+	Set gtmtypes("shm_snapshot_t",561,"len")=8
+	Set gtmtypes("shm_snapshot_t",561,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jrec_pblk")=561
+	Set gtmtypes("shm_snapshot_t",562,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jrec_epoch_regular"
+	Set gtmtypes("shm_snapshot_t",562,"off")=8624
+	Set gtmtypes("shm_snapshot_t",562,"len")=8
+	Set gtmtypes("shm_snapshot_t",562,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jrec_epoch_regular")=562
+	Set gtmtypes("shm_snapshot_t",563,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jrec_epoch_idle"
+	Set gtmtypes("shm_snapshot_t",563,"off")=8632
+	Set gtmtypes("shm_snapshot_t",563,"len")=8
+	Set gtmtypes("shm_snapshot_t",563,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jrec_epoch_idle")=563
+	Set gtmtypes("shm_snapshot_t",564,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jrec_other"
+	Set gtmtypes("shm_snapshot_t",564,"off")=8640
+	Set gtmtypes("shm_snapshot_t",564,"len")=8
+	Set gtmtypes("shm_snapshot_t",564,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jrec_other")=564
+	Set gtmtypes("shm_snapshot_t",565,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jnl_extends"
+	Set gtmtypes("shm_snapshot_t",565,"off")=8648
+	Set gtmtypes("shm_snapshot_t",565,"len")=8
+	Set gtmtypes("shm_snapshot_t",565,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jnl_extends")=565
+	Set gtmtypes("shm_snapshot_t",566,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_db_extends"
+	Set gtmtypes("shm_snapshot_t",566,"off")=8656
+	Set gtmtypes("shm_snapshot_t",566,"len")=8
+	Set gtmtypes("shm_snapshot_t",566,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_db_extends")=566
+	Set gtmtypes("shm_snapshot_t",567,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_crit_success"
+	Set gtmtypes("shm_snapshot_t",567,"off")=8664
+	Set gtmtypes("shm_snapshot_t",567,"len")=8
+	Set gtmtypes("shm_snapshot_t",567,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_crit_success")=567
+	Set gtmtypes("shm_snapshot_t",568,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_crits_in_epch"
+	Set gtmtypes("shm_snapshot_t",568,"off")=8672
 	Set gtmtypes("shm_snapshot_t",568,"len")=8
-	Set gtmtypes("shm_snapshot_t",568,"type")="global_latch_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch")=568
-	Set gtmtypes("shm_snapshot_t",569,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch.u"
-	Set gtmtypes("shm_snapshot_t",569,"off")=10312
+	Set gtmtypes("shm_snapshot_t",568,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_crits_in_epch")=568
+	Set gtmtypes("shm_snapshot_t",569,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.sq_crit_failed"
+	Set gtmtypes("shm_snapshot_t",569,"off")=8680
 	Set gtmtypes("shm_snapshot_t",569,"len")=8
-	Set gtmtypes("shm_snapshot_t",569,"type")="union"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch.u")=569
-	Set gtmtypes("shm_snapshot_t",570,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch.u.pid_imgcnt"
-	Set gtmtypes("shm_snapshot_t",570,"off")=10312
+	Set gtmtypes("shm_snapshot_t",569,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.sq_crit_failed")=569
+	Set gtmtypes("shm_snapshot_t",570,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_crit_failed"
+	Set gtmtypes("shm_snapshot_t",570,"off")=8688
 	Set gtmtypes("shm_snapshot_t",570,"len")=8
 	Set gtmtypes("shm_snapshot_t",570,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch.u.pid_imgcnt")=570
-	Set gtmtypes("shm_snapshot_t",571,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch.u.parts"
-	Set gtmtypes("shm_snapshot_t",571,"off")=10312
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_crit_failed")=570
+	Set gtmtypes("shm_snapshot_t",571,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.sq_crit_que_slps"
+	Set gtmtypes("shm_snapshot_t",571,"off")=8696
 	Set gtmtypes("shm_snapshot_t",571,"len")=8
-	Set gtmtypes("shm_snapshot_t",571,"type")="struct"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch.u.parts")=571
-	Set gtmtypes("shm_snapshot_t",572,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_pid"
-	Set gtmtypes("shm_snapshot_t",572,"off")=10312
-	Set gtmtypes("shm_snapshot_t",572,"len")=4
-	Set gtmtypes("shm_snapshot_t",572,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_pid")=572
-	Set gtmtypes("shm_snapshot_t",573,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_word"
-	Set gtmtypes("shm_snapshot_t",573,"off")=10316
-	Set gtmtypes("shm_snapshot_t",573,"len")=4
-	Set gtmtypes("shm_snapshot_t",573,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_word")=573
-	Set gtmtypes("shm_snapshot_t",574,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.hp_latch_space"
-	Set gtmtypes("shm_snapshot_t",574,"off")=10320
-	Set gtmtypes("shm_snapshot_t",574,"len")=16
-	Set gtmtypes("shm_snapshot_t",574,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.hp_latch_space")=574
-	Set gtmtypes("shm_snapshot_t",574,"dim")=4
-	Set gtmtypes("shm_snapshot_t",575,"name")="shm_snapshot_t.shadow_file_header.is_encrypted"
-	Set gtmtypes("shm_snapshot_t",575,"off")=10336
-	Set gtmtypes("shm_snapshot_t",575,"len")=4
-	Set gtmtypes("shm_snapshot_t",575,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.is_encrypted")=575
-	Set gtmtypes("shm_snapshot_t",576,"name")="shm_snapshot_t.shadow_file_header.db_trigger_cycle"
-	Set gtmtypes("shm_snapshot_t",576,"off")=10340
-	Set gtmtypes("shm_snapshot_t",576,"len")=4
-	Set gtmtypes("shm_snapshot_t",576,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_trigger_cycle")=576
-	Set gtmtypes("shm_snapshot_t",577,"name")="shm_snapshot_t.shadow_file_header.strm_reg_seqno"
-	Set gtmtypes("shm_snapshot_t",577,"off")=10344
-	Set gtmtypes("shm_snapshot_t",577,"len")=128
-	Set gtmtypes("shm_snapshot_t",577,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.strm_reg_seqno")=577
-	Set gtmtypes("shm_snapshot_t",577,"dim")=16
-	Set gtmtypes("shm_snapshot_t",578,"name")="shm_snapshot_t.shadow_file_header.save_strm_reg_seqno"
-	Set gtmtypes("shm_snapshot_t",578,"off")=10472
+	Set gtmtypes("shm_snapshot_t",571,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.sq_crit_que_slps")=571
+	Set gtmtypes("shm_snapshot_t",572,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_crit_que_slps"
+	Set gtmtypes("shm_snapshot_t",572,"off")=8704
+	Set gtmtypes("shm_snapshot_t",572,"len")=8
+	Set gtmtypes("shm_snapshot_t",572,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_crit_que_slps")=572
+	Set gtmtypes("shm_snapshot_t",573,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.sq_crit_yields"
+	Set gtmtypes("shm_snapshot_t",573,"off")=8712
+	Set gtmtypes("shm_snapshot_t",573,"len")=8
+	Set gtmtypes("shm_snapshot_t",573,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.sq_crit_yields")=573
+	Set gtmtypes("shm_snapshot_t",574,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_crit_yields"
+	Set gtmtypes("shm_snapshot_t",574,"off")=8720
+	Set gtmtypes("shm_snapshot_t",574,"len")=8
+	Set gtmtypes("shm_snapshot_t",574,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_crit_yields")=574
+	Set gtmtypes("shm_snapshot_t",575,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_clean2dirty"
+	Set gtmtypes("shm_snapshot_t",575,"off")=8728
+	Set gtmtypes("shm_snapshot_t",575,"len")=8
+	Set gtmtypes("shm_snapshot_t",575,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_clean2dirty")=575
+	Set gtmtypes("shm_snapshot_t",576,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec_filler_4k_plus_512"
+	Set gtmtypes("shm_snapshot_t",576,"off")=8736
+	Set gtmtypes("shm_snapshot_t",576,"len")=40
+	Set gtmtypes("shm_snapshot_t",576,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec_filler_4k_plus_512")=576
+	Set gtmtypes("shm_snapshot_t",577,"name")="shm_snapshot_t.shadow_file_header.filler_4k_plus_512"
+	Set gtmtypes("shm_snapshot_t",577,"off")=8776
+	Set gtmtypes("shm_snapshot_t",577,"len")=368
+	Set gtmtypes("shm_snapshot_t",577,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_4k_plus_512")=577
+	Set gtmtypes("shm_snapshot_t",578,"name")="shm_snapshot_t.shadow_file_header.intrpt_recov_resync_strm_seqno"
+	Set gtmtypes("shm_snapshot_t",578,"off")=9144
 	Set gtmtypes("shm_snapshot_t",578,"len")=128
 	Set gtmtypes("shm_snapshot_t",578,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.save_strm_reg_seqno")=578
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.intrpt_recov_resync_strm_seqno")=578
 	Set gtmtypes("shm_snapshot_t",578,"dim")=16
-	Set gtmtypes("shm_snapshot_t",579,"name")="shm_snapshot_t.shadow_file_header.freeze_on_fail"
-	Set gtmtypes("shm_snapshot_t",579,"off")=10600
+	Set gtmtypes("shm_snapshot_t",579,"name")="shm_snapshot_t.shadow_file_header.creation_db_ver"
+	Set gtmtypes("shm_snapshot_t",579,"off")=9272
 	Set gtmtypes("shm_snapshot_t",579,"len")=4
-	Set gtmtypes("shm_snapshot_t",579,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.freeze_on_fail")=579
-	Set gtmtypes("shm_snapshot_t",580,"name")="shm_snapshot_t.shadow_file_header.span_node_absent"
-	Set gtmtypes("shm_snapshot_t",580,"off")=10604
+	Set gtmtypes("shm_snapshot_t",579,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.creation_db_ver")=579
+	Set gtmtypes("shm_snapshot_t",580,"name")="shm_snapshot_t.shadow_file_header.creation_mdb_ver"
+	Set gtmtypes("shm_snapshot_t",580,"off")=9276
 	Set gtmtypes("shm_snapshot_t",580,"len")=4
-	Set gtmtypes("shm_snapshot_t",580,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.span_node_absent")=580
-	Set gtmtypes("shm_snapshot_t",581,"name")="shm_snapshot_t.shadow_file_header.maxkeysz_assured"
-	Set gtmtypes("shm_snapshot_t",581,"off")=10608
+	Set gtmtypes("shm_snapshot_t",580,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.creation_mdb_ver")=580
+	Set gtmtypes("shm_snapshot_t",581,"name")="shm_snapshot_t.shadow_file_header.certified_for_upgrade_to"
+	Set gtmtypes("shm_snapshot_t",581,"off")=9280
 	Set gtmtypes("shm_snapshot_t",581,"len")=4
-	Set gtmtypes("shm_snapshot_t",581,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.maxkeysz_assured")=581
-	Set gtmtypes("shm_snapshot_t",582,"name")="shm_snapshot_t.shadow_file_header.hasht_upgrade_needed"
-	Set gtmtypes("shm_snapshot_t",582,"off")=10612
+	Set gtmtypes("shm_snapshot_t",581,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.certified_for_upgrade_to")=581
+	Set gtmtypes("shm_snapshot_t",582,"name")="shm_snapshot_t.shadow_file_header.filler_5k"
+	Set gtmtypes("shm_snapshot_t",582,"off")=9284
 	Set gtmtypes("shm_snapshot_t",582,"len")=4
-	Set gtmtypes("shm_snapshot_t",582,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.hasht_upgrade_needed")=582
-	Set gtmtypes("shm_snapshot_t",583,"name")="shm_snapshot_t.shadow_file_header.defer_allocate"
-	Set gtmtypes("shm_snapshot_t",583,"off")=10616
+	Set gtmtypes("shm_snapshot_t",582,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_5k")=582
+	Set gtmtypes("shm_snapshot_t",583,"name")="shm_snapshot_t.shadow_file_header.secshr_ops_index_filler"
+	Set gtmtypes("shm_snapshot_t",583,"off")=9288
 	Set gtmtypes("shm_snapshot_t",583,"len")=4
-	Set gtmtypes("shm_snapshot_t",583,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.defer_allocate")=583
-	Set gtmtypes("shm_snapshot_t",584,"name")="shm_snapshot_t.shadow_file_header.filler_ftok_counter_halted"
-	Set gtmtypes("shm_snapshot_t",584,"off")=10620
-	Set gtmtypes("shm_snapshot_t",584,"len")=4
-	Set gtmtypes("shm_snapshot_t",584,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_ftok_counter_halted")=584
-	Set gtmtypes("shm_snapshot_t",585,"name")="shm_snapshot_t.shadow_file_header.filler_access_counter_halted"
-	Set gtmtypes("shm_snapshot_t",585,"off")=10624
-	Set gtmtypes("shm_snapshot_t",585,"len")=4
-	Set gtmtypes("shm_snapshot_t",585,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_access_counter_halted")=585
-	Set gtmtypes("shm_snapshot_t",586,"name")="shm_snapshot_t.shadow_file_header.filler_7k"
-	Set gtmtypes("shm_snapshot_t",586,"off")=10628
-	Set gtmtypes("shm_snapshot_t",586,"len")=708
-	Set gtmtypes("shm_snapshot_t",586,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_7k")=586
-	Set gtmtypes("shm_snapshot_t",587,"name")="shm_snapshot_t.shadow_file_header.filler_8k"
-	Set gtmtypes("shm_snapshot_t",587,"off")=11336
-	Set gtmtypes("shm_snapshot_t",587,"len")=1024
-	Set gtmtypes("shm_snapshot_t",587,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_8k")=587
+	Set gtmtypes("shm_snapshot_t",583,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.secshr_ops_index_filler")=583
+	Set gtmtypes("shm_snapshot_t",584,"name")="shm_snapshot_t.shadow_file_header.secshr_ops_array_filler"
+	Set gtmtypes("shm_snapshot_t",584,"off")=9292
+	Set gtmtypes("shm_snapshot_t",584,"len")=1020
+	Set gtmtypes("shm_snapshot_t",584,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.secshr_ops_array_filler")=584
+	Set gtmtypes("shm_snapshot_t",584,"dim")=255
+	Set gtmtypes("shm_snapshot_t",585,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn"
+	Set gtmtypes("shm_snapshot_t",585,"off")=10312
+	Set gtmtypes("shm_snapshot_t",585,"len")=24
+	Set gtmtypes("shm_snapshot_t",585,"type")="compswap_time_field"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn")=585
+	Set gtmtypes("shm_snapshot_t",586,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch"
+	Set gtmtypes("shm_snapshot_t",586,"off")=10312
+	Set gtmtypes("shm_snapshot_t",586,"len")=8
+	Set gtmtypes("shm_snapshot_t",586,"type")="global_latch_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch")=586
+	Set gtmtypes("shm_snapshot_t",587,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch.u"
+	Set gtmtypes("shm_snapshot_t",587,"off")=10312
+	Set gtmtypes("shm_snapshot_t",587,"len")=8
+	Set gtmtypes("shm_snapshot_t",587,"type")="union"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch.u")=587
+	Set gtmtypes("shm_snapshot_t",588,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch.u.pid_imgcnt"
+	Set gtmtypes("shm_snapshot_t",588,"off")=10312
+	Set gtmtypes("shm_snapshot_t",588,"len")=8
+	Set gtmtypes("shm_snapshot_t",588,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch.u.pid_imgcnt")=588
+	Set gtmtypes("shm_snapshot_t",589,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch.u.parts"
+	Set gtmtypes("shm_snapshot_t",589,"off")=10312
+	Set gtmtypes("shm_snapshot_t",589,"len")=8
+	Set gtmtypes("shm_snapshot_t",589,"type")="struct"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch.u.parts")=589
+	Set gtmtypes("shm_snapshot_t",590,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_pid"
+	Set gtmtypes("shm_snapshot_t",590,"off")=10312
+	Set gtmtypes("shm_snapshot_t",590,"len")=4
+	Set gtmtypes("shm_snapshot_t",590,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_pid")=590
+	Set gtmtypes("shm_snapshot_t",591,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_word"
+	Set gtmtypes("shm_snapshot_t",591,"off")=10316
+	Set gtmtypes("shm_snapshot_t",591,"len")=4
+	Set gtmtypes("shm_snapshot_t",591,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_word")=591
+	Set gtmtypes("shm_snapshot_t",592,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.hp_latch_space"
+	Set gtmtypes("shm_snapshot_t",592,"off")=10320
+	Set gtmtypes("shm_snapshot_t",592,"len")=16
+	Set gtmtypes("shm_snapshot_t",592,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.hp_latch_space")=592
+	Set gtmtypes("shm_snapshot_t",592,"dim")=4
+	Set gtmtypes("shm_snapshot_t",593,"name")="shm_snapshot_t.shadow_file_header.is_encrypted"
+	Set gtmtypes("shm_snapshot_t",593,"off")=10336
+	Set gtmtypes("shm_snapshot_t",593,"len")=4
+	Set gtmtypes("shm_snapshot_t",593,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.is_encrypted")=593
+	Set gtmtypes("shm_snapshot_t",594,"name")="shm_snapshot_t.shadow_file_header.db_trigger_cycle"
+	Set gtmtypes("shm_snapshot_t",594,"off")=10340
+	Set gtmtypes("shm_snapshot_t",594,"len")=4
+	Set gtmtypes("shm_snapshot_t",594,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_trigger_cycle")=594
+	Set gtmtypes("shm_snapshot_t",595,"name")="shm_snapshot_t.shadow_file_header.strm_reg_seqno"
+	Set gtmtypes("shm_snapshot_t",595,"off")=10344
+	Set gtmtypes("shm_snapshot_t",595,"len")=128
+	Set gtmtypes("shm_snapshot_t",595,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.strm_reg_seqno")=595
+	Set gtmtypes("shm_snapshot_t",595,"dim")=16
+	Set gtmtypes("shm_snapshot_t",596,"name")="shm_snapshot_t.shadow_file_header.save_strm_reg_seqno"
+	Set gtmtypes("shm_snapshot_t",596,"off")=10472
+	Set gtmtypes("shm_snapshot_t",596,"len")=128
+	Set gtmtypes("shm_snapshot_t",596,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.save_strm_reg_seqno")=596
+	Set gtmtypes("shm_snapshot_t",596,"dim")=16
+	Set gtmtypes("shm_snapshot_t",597,"name")="shm_snapshot_t.shadow_file_header.freeze_on_fail"
+	Set gtmtypes("shm_snapshot_t",597,"off")=10600
+	Set gtmtypes("shm_snapshot_t",597,"len")=4
+	Set gtmtypes("shm_snapshot_t",597,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.freeze_on_fail")=597
+	Set gtmtypes("shm_snapshot_t",598,"name")="shm_snapshot_t.shadow_file_header.span_node_absent"
+	Set gtmtypes("shm_snapshot_t",598,"off")=10604
+	Set gtmtypes("shm_snapshot_t",598,"len")=4
+	Set gtmtypes("shm_snapshot_t",598,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.span_node_absent")=598
+	Set gtmtypes("shm_snapshot_t",599,"name")="shm_snapshot_t.shadow_file_header.maxkeysz_assured"
+	Set gtmtypes("shm_snapshot_t",599,"off")=10608
+	Set gtmtypes("shm_snapshot_t",599,"len")=4
+	Set gtmtypes("shm_snapshot_t",599,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.maxkeysz_assured")=599
+	Set gtmtypes("shm_snapshot_t",600,"name")="shm_snapshot_t.shadow_file_header.hasht_upgrade_needed"
+	Set gtmtypes("shm_snapshot_t",600,"off")=10612
+	Set gtmtypes("shm_snapshot_t",600,"len")=4
+	Set gtmtypes("shm_snapshot_t",600,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.hasht_upgrade_needed")=600
+	Set gtmtypes("shm_snapshot_t",601,"name")="shm_snapshot_t.shadow_file_header.defer_allocate"
+	Set gtmtypes("shm_snapshot_t",601,"off")=10616
+	Set gtmtypes("shm_snapshot_t",601,"len")=4
+	Set gtmtypes("shm_snapshot_t",601,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.defer_allocate")=601
+	Set gtmtypes("shm_snapshot_t",602,"name")="shm_snapshot_t.shadow_file_header.filler_ftok_counter_halted"
+	Set gtmtypes("shm_snapshot_t",602,"off")=10620
+	Set gtmtypes("shm_snapshot_t",602,"len")=4
+	Set gtmtypes("shm_snapshot_t",602,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_ftok_counter_halted")=602
+	Set gtmtypes("shm_snapshot_t",603,"name")="shm_snapshot_t.shadow_file_header.filler_access_counter_halted"
+	Set gtmtypes("shm_snapshot_t",603,"off")=10624
+	Set gtmtypes("shm_snapshot_t",603,"len")=4
+	Set gtmtypes("shm_snapshot_t",603,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_access_counter_halted")=603
+	Set gtmtypes("shm_snapshot_t",604,"name")="shm_snapshot_t.shadow_file_header.lock_crit_with_db"
+	Set gtmtypes("shm_snapshot_t",604,"off")=10628
+	Set gtmtypes("shm_snapshot_t",604,"len")=4
+	Set gtmtypes("shm_snapshot_t",604,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.lock_crit_with_db")=604
+	Set gtmtypes("shm_snapshot_t",605,"name")="shm_snapshot_t.shadow_file_header.basedb_fname_len"
+	Set gtmtypes("shm_snapshot_t",605,"off")=10632
+	Set gtmtypes("shm_snapshot_t",605,"len")=4
+	Set gtmtypes("shm_snapshot_t",605,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.basedb_fname_len")=605
+	Set gtmtypes("shm_snapshot_t",606,"name")="shm_snapshot_t.shadow_file_header.basedb_fname"
+	Set gtmtypes("shm_snapshot_t",606,"off")=10636
+	Set gtmtypes("shm_snapshot_t",606,"len")=256
+	Set gtmtypes("shm_snapshot_t",606,"type")="unsigned-char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.basedb_fname")=606
+	Set gtmtypes("shm_snapshot_t",607,"name")="shm_snapshot_t.shadow_file_header.filler_7k"
+	Set gtmtypes("shm_snapshot_t",607,"off")=10892
+	Set gtmtypes("shm_snapshot_t",607,"len")=444
+	Set gtmtypes("shm_snapshot_t",607,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_7k")=607
+	Set gtmtypes("shm_snapshot_t",608,"name")="shm_snapshot_t.shadow_file_header.filler_8k"
+	Set gtmtypes("shm_snapshot_t",608,"off")=11336
+	Set gtmtypes("shm_snapshot_t",608,"len")=1024
+	Set gtmtypes("shm_snapshot_t",608,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_8k")=608
 	;
 	Set gtmtypes("shmpool_blk_hdr")="struct"
 	Set gtmtypes("shmpool_blk_hdr",0)=11
@@ -32725,7 +33391,7 @@ Init
 	Set gtmtypfldindx("shmpool_blk_hdr","image_count")=11
 	;
 	Set gtmtypes("shmpool_buff_hdr")="struct"
-	Set gtmtypes("shmpool_buff_hdr",0)=594
+	Set gtmtypes("shmpool_buff_hdr",0)=615
 	Set gtmtypes("shmpool_buff_hdr","len")=8544
 	Set gtmtypes("shmpool_buff_hdr",1,"name")="shmpool_buff_hdr.shmpool_crit_latch"
 	Set gtmtypes("shmpool_buff_hdr",1,"off")=0
@@ -32960,7 +33626,7 @@ Init
 	Set gtmtypes("shmpool_buff_hdr",47,"name")="shmpool_buff_hdr.shadow_file_header.null_subs"
 	Set gtmtypes("shmpool_buff_hdr",47,"off")=428
 	Set gtmtypes("shmpool_buff_hdr",47,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",47,"type")="boolean_t"
+	Set gtmtypes("shmpool_buff_hdr",47,"type")="int"
 	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.null_subs")=47
 	Set gtmtypes("shmpool_buff_hdr",48,"name")="shmpool_buff_hdr.shadow_file_header.free_space"
 	Set gtmtypes("shmpool_buff_hdr",48,"off")=432
@@ -33042,11 +33708,11 @@ Init
 	Set gtmtypes("shmpool_buff_hdr",63,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",63,"type")="int"
 	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.creation_time4")=63
-	Set gtmtypes("shmpool_buff_hdr",64,"name")="shmpool_buff_hdr.shadow_file_header.creation_filler_8byte"
+	Set gtmtypes("shmpool_buff_hdr",64,"name")="shmpool_buff_hdr.shadow_file_header.reservedDBFlags"
 	Set gtmtypes("shmpool_buff_hdr",64,"off")=540
 	Set gtmtypes("shmpool_buff_hdr",64,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",64,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.creation_filler_8byte")=64
+	Set gtmtypes("shmpool_buff_hdr",64,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reservedDBFlags")=64
 	Set gtmtypes("shmpool_buff_hdr",65,"name")="shmpool_buff_hdr.shadow_file_header.max_tn"
 	Set gtmtypes("shmpool_buff_hdr",65,"off")=544
 	Set gtmtypes("shmpool_buff_hdr",65,"len")=8
@@ -33127,2592 +33793,2697 @@ Init
 	Set gtmtypes("shmpool_buff_hdr",80,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",80,"type")="int"
 	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.abandoned_kills")=80
-	Set gtmtypes("shmpool_buff_hdr",81,"name")="shmpool_buff_hdr.shadow_file_header.filler_320"
+	Set gtmtypes("shmpool_buff_hdr",81,"name")="shmpool_buff_hdr.shadow_file_header.freeze_online"
 	Set gtmtypes("shmpool_buff_hdr",81,"off")=664
-	Set gtmtypes("shmpool_buff_hdr",81,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",81,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_320")=81
-	Set gtmtypes("shmpool_buff_hdr",82,"name")="shmpool_buff_hdr.shadow_file_header.tn_upgrd_blks_0"
-	Set gtmtypes("shmpool_buff_hdr",82,"off")=672
-	Set gtmtypes("shmpool_buff_hdr",82,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",82,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.tn_upgrd_blks_0")=82
-	Set gtmtypes("shmpool_buff_hdr",83,"name")="shmpool_buff_hdr.shadow_file_header.desired_db_format_tn"
-	Set gtmtypes("shmpool_buff_hdr",83,"off")=680
+	Set gtmtypes("shmpool_buff_hdr",81,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",81,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.freeze_online")=81
+	Set gtmtypes("shmpool_buff_hdr",82,"name")="shmpool_buff_hdr.shadow_file_header.filler_320"
+	Set gtmtypes("shmpool_buff_hdr",82,"off")=668
+	Set gtmtypes("shmpool_buff_hdr",82,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",82,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_320")=82
+	Set gtmtypes("shmpool_buff_hdr",83,"name")="shmpool_buff_hdr.shadow_file_header.tn_upgrd_blks_0"
+	Set gtmtypes("shmpool_buff_hdr",83,"off")=672
 	Set gtmtypes("shmpool_buff_hdr",83,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",83,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.desired_db_format_tn")=83
-	Set gtmtypes("shmpool_buff_hdr",84,"name")="shmpool_buff_hdr.shadow_file_header.reorg_db_fmt_start_tn"
-	Set gtmtypes("shmpool_buff_hdr",84,"off")=688
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.tn_upgrd_blks_0")=83
+	Set gtmtypes("shmpool_buff_hdr",84,"name")="shmpool_buff_hdr.shadow_file_header.desired_db_format_tn"
+	Set gtmtypes("shmpool_buff_hdr",84,"off")=680
 	Set gtmtypes("shmpool_buff_hdr",84,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",84,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reorg_db_fmt_start_tn")=84
-	Set gtmtypes("shmpool_buff_hdr",85,"name")="shmpool_buff_hdr.shadow_file_header.reorg_upgrd_dwngrd_restart_block"
-	Set gtmtypes("shmpool_buff_hdr",85,"off")=696
-	Set gtmtypes("shmpool_buff_hdr",85,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",85,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reorg_upgrd_dwngrd_restart_block")=85
-	Set gtmtypes("shmpool_buff_hdr",86,"name")="shmpool_buff_hdr.shadow_file_header.blks_to_upgrd"
-	Set gtmtypes("shmpool_buff_hdr",86,"off")=700
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.desired_db_format_tn")=84
+	Set gtmtypes("shmpool_buff_hdr",85,"name")="shmpool_buff_hdr.shadow_file_header.reorg_db_fmt_start_tn"
+	Set gtmtypes("shmpool_buff_hdr",85,"off")=688
+	Set gtmtypes("shmpool_buff_hdr",85,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",85,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reorg_db_fmt_start_tn")=85
+	Set gtmtypes("shmpool_buff_hdr",86,"name")="shmpool_buff_hdr.shadow_file_header.reorg_upgrd_dwngrd_restart_block"
+	Set gtmtypes("shmpool_buff_hdr",86,"off")=696
 	Set gtmtypes("shmpool_buff_hdr",86,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",86,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.blks_to_upgrd")=86
-	Set gtmtypes("shmpool_buff_hdr",87,"name")="shmpool_buff_hdr.shadow_file_header.blks_to_upgrd_subzero_error"
-	Set gtmtypes("shmpool_buff_hdr",87,"off")=704
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reorg_upgrd_dwngrd_restart_block")=86
+	Set gtmtypes("shmpool_buff_hdr",87,"name")="shmpool_buff_hdr.shadow_file_header.blks_to_upgrd"
+	Set gtmtypes("shmpool_buff_hdr",87,"off")=700
 	Set gtmtypes("shmpool_buff_hdr",87,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",87,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.blks_to_upgrd_subzero_error")=87
-	Set gtmtypes("shmpool_buff_hdr",88,"name")="shmpool_buff_hdr.shadow_file_header.desired_db_format"
-	Set gtmtypes("shmpool_buff_hdr",88,"off")=708
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.blks_to_upgrd")=87
+	Set gtmtypes("shmpool_buff_hdr",88,"name")="shmpool_buff_hdr.shadow_file_header.blks_to_upgrd_subzero_error"
+	Set gtmtypes("shmpool_buff_hdr",88,"off")=704
 	Set gtmtypes("shmpool_buff_hdr",88,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",88,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.desired_db_format")=88
-	Set gtmtypes("shmpool_buff_hdr",89,"name")="shmpool_buff_hdr.shadow_file_header.fully_upgraded"
-	Set gtmtypes("shmpool_buff_hdr",89,"off")=712
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.blks_to_upgrd_subzero_error")=88
+	Set gtmtypes("shmpool_buff_hdr",89,"name")="shmpool_buff_hdr.shadow_file_header.desired_db_format"
+	Set gtmtypes("shmpool_buff_hdr",89,"off")=708
 	Set gtmtypes("shmpool_buff_hdr",89,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",89,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.fully_upgraded")=89
-	Set gtmtypes("shmpool_buff_hdr",90,"name")="shmpool_buff_hdr.shadow_file_header.db_got_to_v5_once"
-	Set gtmtypes("shmpool_buff_hdr",90,"off")=716
+	Set gtmtypes("shmpool_buff_hdr",89,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.desired_db_format")=89
+	Set gtmtypes("shmpool_buff_hdr",90,"name")="shmpool_buff_hdr.shadow_file_header.fully_upgraded"
+	Set gtmtypes("shmpool_buff_hdr",90,"off")=712
 	Set gtmtypes("shmpool_buff_hdr",90,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",90,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_got_to_v5_once")=90
-	Set gtmtypes("shmpool_buff_hdr",91,"name")="shmpool_buff_hdr.shadow_file_header.opened_by_gtmv53"
-	Set gtmtypes("shmpool_buff_hdr",91,"off")=720
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.fully_upgraded")=90
+	Set gtmtypes("shmpool_buff_hdr",91,"name")="shmpool_buff_hdr.shadow_file_header.db_got_to_v5_once"
+	Set gtmtypes("shmpool_buff_hdr",91,"off")=716
 	Set gtmtypes("shmpool_buff_hdr",91,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",91,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.opened_by_gtmv53")=91
-	Set gtmtypes("shmpool_buff_hdr",92,"name")="shmpool_buff_hdr.shadow_file_header.filler_384"
-	Set gtmtypes("shmpool_buff_hdr",92,"off")=724
-	Set gtmtypes("shmpool_buff_hdr",92,"len")=12
-	Set gtmtypes("shmpool_buff_hdr",92,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_384")=92
-	Set gtmtypes("shmpool_buff_hdr",93,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist"
-	Set gtmtypes("shmpool_buff_hdr",93,"off")=736
-	Set gtmtypes("shmpool_buff_hdr",93,"len")=56
-	Set gtmtypes("shmpool_buff_hdr",93,"type")="th_index"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist")=93
-	Set gtmtypes("shmpool_buff_hdr",94,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.curr_tn"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_got_to_v5_once")=91
+	Set gtmtypes("shmpool_buff_hdr",92,"name")="shmpool_buff_hdr.shadow_file_header.opened_by_gtmv53"
+	Set gtmtypes("shmpool_buff_hdr",92,"off")=720
+	Set gtmtypes("shmpool_buff_hdr",92,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",92,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.opened_by_gtmv53")=92
+	Set gtmtypes("shmpool_buff_hdr",93,"name")="shmpool_buff_hdr.shadow_file_header.filler_384"
+	Set gtmtypes("shmpool_buff_hdr",93,"off")=724
+	Set gtmtypes("shmpool_buff_hdr",93,"len")=12
+	Set gtmtypes("shmpool_buff_hdr",93,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_384")=93
+	Set gtmtypes("shmpool_buff_hdr",94,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist"
 	Set gtmtypes("shmpool_buff_hdr",94,"off")=736
-	Set gtmtypes("shmpool_buff_hdr",94,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",94,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.curr_tn")=94
-	Set gtmtypes("shmpool_buff_hdr",95,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.early_tn"
-	Set gtmtypes("shmpool_buff_hdr",95,"off")=744
+	Set gtmtypes("shmpool_buff_hdr",94,"len")=56
+	Set gtmtypes("shmpool_buff_hdr",94,"type")="th_index"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist")=94
+	Set gtmtypes("shmpool_buff_hdr",95,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.curr_tn"
+	Set gtmtypes("shmpool_buff_hdr",95,"off")=736
 	Set gtmtypes("shmpool_buff_hdr",95,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",95,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.early_tn")=95
-	Set gtmtypes("shmpool_buff_hdr",96,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.last_mm_sync"
-	Set gtmtypes("shmpool_buff_hdr",96,"off")=752
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.curr_tn")=95
+	Set gtmtypes("shmpool_buff_hdr",96,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.early_tn"
+	Set gtmtypes("shmpool_buff_hdr",96,"off")=744
 	Set gtmtypes("shmpool_buff_hdr",96,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",96,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.last_mm_sync")=96
-	Set gtmtypes("shmpool_buff_hdr",97,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.filler_8byte"
-	Set gtmtypes("shmpool_buff_hdr",97,"off")=760
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.early_tn")=96
+	Set gtmtypes("shmpool_buff_hdr",97,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.last_mm_sync"
+	Set gtmtypes("shmpool_buff_hdr",97,"off")=752
 	Set gtmtypes("shmpool_buff_hdr",97,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",97,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.filler_8byte")=97
-	Set gtmtypes("shmpool_buff_hdr",98,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.mm_tn"
-	Set gtmtypes("shmpool_buff_hdr",98,"off")=768
+	Set gtmtypes("shmpool_buff_hdr",97,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.last_mm_sync")=97
+	Set gtmtypes("shmpool_buff_hdr",98,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.filler_8byte"
+	Set gtmtypes("shmpool_buff_hdr",98,"off")=760
 	Set gtmtypes("shmpool_buff_hdr",98,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",98,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.mm_tn")=98
-	Set gtmtypes("shmpool_buff_hdr",99,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.lock_sequence"
-	Set gtmtypes("shmpool_buff_hdr",99,"off")=776
-	Set gtmtypes("shmpool_buff_hdr",99,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",99,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.lock_sequence")=99
-	Set gtmtypes("shmpool_buff_hdr",100,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.ccp_jnl_filesize"
-	Set gtmtypes("shmpool_buff_hdr",100,"off")=780
+	Set gtmtypes("shmpool_buff_hdr",98,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.filler_8byte")=98
+	Set gtmtypes("shmpool_buff_hdr",99,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.mm_tn"
+	Set gtmtypes("shmpool_buff_hdr",99,"off")=768
+	Set gtmtypes("shmpool_buff_hdr",99,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",99,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.mm_tn")=99
+	Set gtmtypes("shmpool_buff_hdr",100,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.lock_sequence"
+	Set gtmtypes("shmpool_buff_hdr",100,"off")=776
 	Set gtmtypes("shmpool_buff_hdr",100,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",100,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.ccp_jnl_filesize")=100
-	Set gtmtypes("shmpool_buff_hdr",101,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.total_blks"
-	Set gtmtypes("shmpool_buff_hdr",101,"off")=784
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.lock_sequence")=100
+	Set gtmtypes("shmpool_buff_hdr",101,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.ccp_jnl_filesize"
+	Set gtmtypes("shmpool_buff_hdr",101,"off")=780
 	Set gtmtypes("shmpool_buff_hdr",101,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",101,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.total_blks")=101
-	Set gtmtypes("shmpool_buff_hdr",102,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.free_blocks"
-	Set gtmtypes("shmpool_buff_hdr",102,"off")=788
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.ccp_jnl_filesize")=101
+	Set gtmtypes("shmpool_buff_hdr",102,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.total_blks"
+	Set gtmtypes("shmpool_buff_hdr",102,"off")=784
 	Set gtmtypes("shmpool_buff_hdr",102,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",102,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.free_blocks")=102
-	Set gtmtypes("shmpool_buff_hdr",103,"name")="shmpool_buff_hdr.shadow_file_header.filler_trans_hist"
-	Set gtmtypes("shmpool_buff_hdr",103,"off")=792
-	Set gtmtypes("shmpool_buff_hdr",103,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",103,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_trans_hist")=103
-	Set gtmtypes("shmpool_buff_hdr",104,"name")="shmpool_buff_hdr.shadow_file_header.flush_time"
-	Set gtmtypes("shmpool_buff_hdr",104,"off")=800
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.total_blks")=102
+	Set gtmtypes("shmpool_buff_hdr",103,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.free_blocks"
+	Set gtmtypes("shmpool_buff_hdr",103,"off")=788
+	Set gtmtypes("shmpool_buff_hdr",103,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",103,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.free_blocks")=103
+	Set gtmtypes("shmpool_buff_hdr",104,"name")="shmpool_buff_hdr.shadow_file_header.filler_trans_hist"
+	Set gtmtypes("shmpool_buff_hdr",104,"off")=792
 	Set gtmtypes("shmpool_buff_hdr",104,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",104,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.flush_time")=104
-	Set gtmtypes("shmpool_buff_hdr",104,"dim")=2
-	Set gtmtypes("shmpool_buff_hdr",105,"name")="shmpool_buff_hdr.shadow_file_header.flush_trigger"
-	Set gtmtypes("shmpool_buff_hdr",105,"off")=808
-	Set gtmtypes("shmpool_buff_hdr",105,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",104,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_trans_hist")=104
+	Set gtmtypes("shmpool_buff_hdr",105,"name")="shmpool_buff_hdr.shadow_file_header.flush_time"
+	Set gtmtypes("shmpool_buff_hdr",105,"off")=800
+	Set gtmtypes("shmpool_buff_hdr",105,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",105,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.flush_trigger")=105
-	Set gtmtypes("shmpool_buff_hdr",106,"name")="shmpool_buff_hdr.shadow_file_header.n_wrt_per_flu"
-	Set gtmtypes("shmpool_buff_hdr",106,"off")=812
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.flush_time")=105
+	Set gtmtypes("shmpool_buff_hdr",105,"dim")=2
+	Set gtmtypes("shmpool_buff_hdr",106,"name")="shmpool_buff_hdr.shadow_file_header.flush_trigger"
+	Set gtmtypes("shmpool_buff_hdr",106,"off")=808
 	Set gtmtypes("shmpool_buff_hdr",106,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",106,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_wrt_per_flu")=106
-	Set gtmtypes("shmpool_buff_hdr",107,"name")="shmpool_buff_hdr.shadow_file_header.wait_disk_space"
-	Set gtmtypes("shmpool_buff_hdr",107,"off")=816
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.flush_trigger")=106
+	Set gtmtypes("shmpool_buff_hdr",107,"name")="shmpool_buff_hdr.shadow_file_header.n_wrt_per_flu"
+	Set gtmtypes("shmpool_buff_hdr",107,"off")=812
 	Set gtmtypes("shmpool_buff_hdr",107,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",107,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wait_disk_space")=107
-	Set gtmtypes("shmpool_buff_hdr",108,"name")="shmpool_buff_hdr.shadow_file_header.defer_time"
-	Set gtmtypes("shmpool_buff_hdr",108,"off")=820
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_wrt_per_flu")=107
+	Set gtmtypes("shmpool_buff_hdr",108,"name")="shmpool_buff_hdr.shadow_file_header.wait_disk_space"
+	Set gtmtypes("shmpool_buff_hdr",108,"off")=816
 	Set gtmtypes("shmpool_buff_hdr",108,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",108,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.defer_time")=108
-	Set gtmtypes("shmpool_buff_hdr",109,"name")="shmpool_buff_hdr.shadow_file_header.filler_wc_blocked"
-	Set gtmtypes("shmpool_buff_hdr",109,"off")=824
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wait_disk_space")=108
+	Set gtmtypes("shmpool_buff_hdr",109,"name")="shmpool_buff_hdr.shadow_file_header.defer_time"
+	Set gtmtypes("shmpool_buff_hdr",109,"off")=820
 	Set gtmtypes("shmpool_buff_hdr",109,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",109,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_wc_blocked")=109
-	Set gtmtypes("shmpool_buff_hdr",110,"name")="shmpool_buff_hdr.shadow_file_header.mumps_can_bypass"
-	Set gtmtypes("shmpool_buff_hdr",110,"off")=828
+	Set gtmtypes("shmpool_buff_hdr",109,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.defer_time")=109
+	Set gtmtypes("shmpool_buff_hdr",110,"name")="shmpool_buff_hdr.shadow_file_header.filler_wc_blocked"
+	Set gtmtypes("shmpool_buff_hdr",110,"off")=824
 	Set gtmtypes("shmpool_buff_hdr",110,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",110,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.mumps_can_bypass")=110
-	Set gtmtypes("shmpool_buff_hdr",111,"name")="shmpool_buff_hdr.shadow_file_header.epoch_taper"
-	Set gtmtypes("shmpool_buff_hdr",111,"off")=832
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_wc_blocked")=110
+	Set gtmtypes("shmpool_buff_hdr",111,"name")="shmpool_buff_hdr.shadow_file_header.mumps_can_bypass"
+	Set gtmtypes("shmpool_buff_hdr",111,"off")=828
 	Set gtmtypes("shmpool_buff_hdr",111,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",111,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.epoch_taper")=111
-	Set gtmtypes("shmpool_buff_hdr",112,"name")="shmpool_buff_hdr.shadow_file_header.epoch_taper_time_pct"
-	Set gtmtypes("shmpool_buff_hdr",112,"off")=836
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.mumps_can_bypass")=111
+	Set gtmtypes("shmpool_buff_hdr",112,"name")="shmpool_buff_hdr.shadow_file_header.epoch_taper"
+	Set gtmtypes("shmpool_buff_hdr",112,"off")=832
 	Set gtmtypes("shmpool_buff_hdr",112,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",112,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.epoch_taper_time_pct")=112
-	Set gtmtypes("shmpool_buff_hdr",113,"name")="shmpool_buff_hdr.shadow_file_header.epoch_taper_jnl_pct"
-	Set gtmtypes("shmpool_buff_hdr",113,"off")=840
+	Set gtmtypes("shmpool_buff_hdr",112,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.epoch_taper")=112
+	Set gtmtypes("shmpool_buff_hdr",113,"name")="shmpool_buff_hdr.shadow_file_header.epoch_taper_time_pct"
+	Set gtmtypes("shmpool_buff_hdr",113,"off")=836
 	Set gtmtypes("shmpool_buff_hdr",113,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",113,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.epoch_taper_jnl_pct")=113
-	Set gtmtypes("shmpool_buff_hdr",114,"name")="shmpool_buff_hdr.shadow_file_header.filler_512"
-	Set gtmtypes("shmpool_buff_hdr",114,"off")=844
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.epoch_taper_time_pct")=113
+	Set gtmtypes("shmpool_buff_hdr",114,"name")="shmpool_buff_hdr.shadow_file_header.epoch_taper_jnl_pct"
+	Set gtmtypes("shmpool_buff_hdr",114,"off")=840
 	Set gtmtypes("shmpool_buff_hdr",114,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",114,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_512")=114
-	Set gtmtypes("shmpool_buff_hdr",115,"name")="shmpool_buff_hdr.shadow_file_header.reserved_for_upd"
-	Set gtmtypes("shmpool_buff_hdr",115,"off")=848
+	Set gtmtypes("shmpool_buff_hdr",114,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.epoch_taper_jnl_pct")=114
+	Set gtmtypes("shmpool_buff_hdr",115,"name")="shmpool_buff_hdr.shadow_file_header.asyncio"
+	Set gtmtypes("shmpool_buff_hdr",115,"off")=844
 	Set gtmtypes("shmpool_buff_hdr",115,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",115,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reserved_for_upd")=115
-	Set gtmtypes("shmpool_buff_hdr",116,"name")="shmpool_buff_hdr.shadow_file_header.avg_blks_per_100gbl"
-	Set gtmtypes("shmpool_buff_hdr",116,"off")=852
+	Set gtmtypes("shmpool_buff_hdr",115,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.asyncio")=115
+	Set gtmtypes("shmpool_buff_hdr",116,"name")="shmpool_buff_hdr.shadow_file_header.reserved_for_upd"
+	Set gtmtypes("shmpool_buff_hdr",116,"off")=848
 	Set gtmtypes("shmpool_buff_hdr",116,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",116,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.avg_blks_per_100gbl")=116
-	Set gtmtypes("shmpool_buff_hdr",117,"name")="shmpool_buff_hdr.shadow_file_header.pre_read_trigger_factor"
-	Set gtmtypes("shmpool_buff_hdr",117,"off")=856
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reserved_for_upd")=116
+	Set gtmtypes("shmpool_buff_hdr",117,"name")="shmpool_buff_hdr.shadow_file_header.avg_blks_per_100gbl"
+	Set gtmtypes("shmpool_buff_hdr",117,"off")=852
 	Set gtmtypes("shmpool_buff_hdr",117,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",117,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.pre_read_trigger_factor")=117
-	Set gtmtypes("shmpool_buff_hdr",118,"name")="shmpool_buff_hdr.shadow_file_header.writer_trigger_factor"
-	Set gtmtypes("shmpool_buff_hdr",118,"off")=860
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.avg_blks_per_100gbl")=117
+	Set gtmtypes("shmpool_buff_hdr",118,"name")="shmpool_buff_hdr.shadow_file_header.pre_read_trigger_factor"
+	Set gtmtypes("shmpool_buff_hdr",118,"off")=856
 	Set gtmtypes("shmpool_buff_hdr",118,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",118,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.writer_trigger_factor")=118
-	Set gtmtypes("shmpool_buff_hdr",119,"name")="shmpool_buff_hdr.shadow_file_header.semid"
-	Set gtmtypes("shmpool_buff_hdr",119,"off")=864
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.pre_read_trigger_factor")=118
+	Set gtmtypes("shmpool_buff_hdr",119,"name")="shmpool_buff_hdr.shadow_file_header.writer_trigger_factor"
+	Set gtmtypes("shmpool_buff_hdr",119,"off")=860
 	Set gtmtypes("shmpool_buff_hdr",119,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",119,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.semid")=119
-	Set gtmtypes("shmpool_buff_hdr",120,"name")="shmpool_buff_hdr.shadow_file_header.shmid"
-	Set gtmtypes("shmpool_buff_hdr",120,"off")=868
+	Set gtmtypes("shmpool_buff_hdr",119,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.writer_trigger_factor")=119
+	Set gtmtypes("shmpool_buff_hdr",120,"name")="shmpool_buff_hdr.shadow_file_header.semid"
+	Set gtmtypes("shmpool_buff_hdr",120,"off")=864
 	Set gtmtypes("shmpool_buff_hdr",120,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",120,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmid")=120
-	Set gtmtypes("shmpool_buff_hdr",121,"name")="shmpool_buff_hdr.shadow_file_header.gt_sem_ctime"
-	Set gtmtypes("shmpool_buff_hdr",121,"off")=872
-	Set gtmtypes("shmpool_buff_hdr",121,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",121,"type")="gtm_time8"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gt_sem_ctime")=121
-	Set gtmtypes("shmpool_buff_hdr",122,"name")="shmpool_buff_hdr.shadow_file_header.gt_sem_ctime.ctime"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.semid")=120
+	Set gtmtypes("shmpool_buff_hdr",121,"name")="shmpool_buff_hdr.shadow_file_header.shmid"
+	Set gtmtypes("shmpool_buff_hdr",121,"off")=868
+	Set gtmtypes("shmpool_buff_hdr",121,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",121,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmid")=121
+	Set gtmtypes("shmpool_buff_hdr",122,"name")="shmpool_buff_hdr.shadow_file_header.gt_sem_ctime"
 	Set gtmtypes("shmpool_buff_hdr",122,"off")=872
-	Set gtmtypes("shmpool_buff_hdr",122,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",122,"type")="time_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gt_sem_ctime.ctime")=122
-	Set gtmtypes("shmpool_buff_hdr",123,"name")="shmpool_buff_hdr.shadow_file_header.gt_sem_ctime.filler"
+	Set gtmtypes("shmpool_buff_hdr",122,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",122,"type")="gtm_time8"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gt_sem_ctime")=122
+	Set gtmtypes("shmpool_buff_hdr",123,"name")="shmpool_buff_hdr.shadow_file_header.gt_sem_ctime.ctime"
 	Set gtmtypes("shmpool_buff_hdr",123,"off")=872
-	Set gtmtypes("shmpool_buff_hdr",123,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",123,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gt_sem_ctime.filler")=123
-	Set gtmtypes("shmpool_buff_hdr",123,"dim")=2
-	Set gtmtypes("shmpool_buff_hdr",124,"name")="shmpool_buff_hdr.shadow_file_header.gt_shm_ctime"
-	Set gtmtypes("shmpool_buff_hdr",124,"off")=880
+	Set gtmtypes("shmpool_buff_hdr",123,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",123,"type")="time_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gt_sem_ctime.ctime")=123
+	Set gtmtypes("shmpool_buff_hdr",124,"name")="shmpool_buff_hdr.shadow_file_header.gt_sem_ctime.filler"
+	Set gtmtypes("shmpool_buff_hdr",124,"off")=872
 	Set gtmtypes("shmpool_buff_hdr",124,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",124,"type")="gtm_time8"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gt_shm_ctime")=124
-	Set gtmtypes("shmpool_buff_hdr",125,"name")="shmpool_buff_hdr.shadow_file_header.gt_shm_ctime.ctime"
+	Set gtmtypes("shmpool_buff_hdr",124,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gt_sem_ctime.filler")=124
+	Set gtmtypes("shmpool_buff_hdr",124,"dim")=2
+	Set gtmtypes("shmpool_buff_hdr",125,"name")="shmpool_buff_hdr.shadow_file_header.gt_shm_ctime"
 	Set gtmtypes("shmpool_buff_hdr",125,"off")=880
-	Set gtmtypes("shmpool_buff_hdr",125,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",125,"type")="time_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gt_shm_ctime.ctime")=125
-	Set gtmtypes("shmpool_buff_hdr",126,"name")="shmpool_buff_hdr.shadow_file_header.gt_shm_ctime.filler"
+	Set gtmtypes("shmpool_buff_hdr",125,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",125,"type")="gtm_time8"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gt_shm_ctime")=125
+	Set gtmtypes("shmpool_buff_hdr",126,"name")="shmpool_buff_hdr.shadow_file_header.gt_shm_ctime.ctime"
 	Set gtmtypes("shmpool_buff_hdr",126,"off")=880
-	Set gtmtypes("shmpool_buff_hdr",126,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",126,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gt_shm_ctime.filler")=126
-	Set gtmtypes("shmpool_buff_hdr",126,"dim")=2
-	Set gtmtypes("shmpool_buff_hdr",127,"name")="shmpool_buff_hdr.shadow_file_header.filler_unixonly"
-	Set gtmtypes("shmpool_buff_hdr",127,"off")=888
-	Set gtmtypes("shmpool_buff_hdr",127,"len")=40
-	Set gtmtypes("shmpool_buff_hdr",127,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_unixonly")=127
-	Set gtmtypes("shmpool_buff_hdr",128,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_retries"
-	Set gtmtypes("shmpool_buff_hdr",128,"off")=928
-	Set gtmtypes("shmpool_buff_hdr",128,"len")=20
-	Set gtmtypes("shmpool_buff_hdr",128,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_retries")=128
-	Set gtmtypes("shmpool_buff_hdr",128,"dim")=5
-	Set gtmtypes("shmpool_buff_hdr",129,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_puts"
-	Set gtmtypes("shmpool_buff_hdr",129,"off")=948
-	Set gtmtypes("shmpool_buff_hdr",129,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",126,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",126,"type")="time_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gt_shm_ctime.ctime")=126
+	Set gtmtypes("shmpool_buff_hdr",127,"name")="shmpool_buff_hdr.shadow_file_header.gt_shm_ctime.filler"
+	Set gtmtypes("shmpool_buff_hdr",127,"off")=880
+	Set gtmtypes("shmpool_buff_hdr",127,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",127,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gt_shm_ctime.filler")=127
+	Set gtmtypes("shmpool_buff_hdr",127,"dim")=2
+	Set gtmtypes("shmpool_buff_hdr",128,"name")="shmpool_buff_hdr.shadow_file_header.filler_unixonly"
+	Set gtmtypes("shmpool_buff_hdr",128,"off")=888
+	Set gtmtypes("shmpool_buff_hdr",128,"len")=40
+	Set gtmtypes("shmpool_buff_hdr",128,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_unixonly")=128
+	Set gtmtypes("shmpool_buff_hdr",129,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_retries"
+	Set gtmtypes("shmpool_buff_hdr",129,"off")=928
+	Set gtmtypes("shmpool_buff_hdr",129,"len")=20
 	Set gtmtypes("shmpool_buff_hdr",129,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_puts")=129
-	Set gtmtypes("shmpool_buff_hdr",130,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_kills"
-	Set gtmtypes("shmpool_buff_hdr",130,"off")=952
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_retries")=129
+	Set gtmtypes("shmpool_buff_hdr",129,"dim")=5
+	Set gtmtypes("shmpool_buff_hdr",130,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_puts"
+	Set gtmtypes("shmpool_buff_hdr",130,"off")=948
 	Set gtmtypes("shmpool_buff_hdr",130,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",130,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_kills")=130
-	Set gtmtypes("shmpool_buff_hdr",131,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_queries"
-	Set gtmtypes("shmpool_buff_hdr",131,"off")=956
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_puts")=130
+	Set gtmtypes("shmpool_buff_hdr",131,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_kills"
+	Set gtmtypes("shmpool_buff_hdr",131,"off")=952
 	Set gtmtypes("shmpool_buff_hdr",131,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",131,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_queries")=131
-	Set gtmtypes("shmpool_buff_hdr",132,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_gets"
-	Set gtmtypes("shmpool_buff_hdr",132,"off")=960
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_kills")=131
+	Set gtmtypes("shmpool_buff_hdr",132,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_queries"
+	Set gtmtypes("shmpool_buff_hdr",132,"off")=956
 	Set gtmtypes("shmpool_buff_hdr",132,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",132,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_gets")=132
-	Set gtmtypes("shmpool_buff_hdr",133,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_order"
-	Set gtmtypes("shmpool_buff_hdr",133,"off")=964
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_queries")=132
+	Set gtmtypes("shmpool_buff_hdr",133,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_gets"
+	Set gtmtypes("shmpool_buff_hdr",133,"off")=960
 	Set gtmtypes("shmpool_buff_hdr",133,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",133,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_order")=133
-	Set gtmtypes("shmpool_buff_hdr",134,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_zprevs"
-	Set gtmtypes("shmpool_buff_hdr",134,"off")=968
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_gets")=133
+	Set gtmtypes("shmpool_buff_hdr",134,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_order"
+	Set gtmtypes("shmpool_buff_hdr",134,"off")=964
 	Set gtmtypes("shmpool_buff_hdr",134,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",134,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_zprevs")=134
-	Set gtmtypes("shmpool_buff_hdr",135,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_data"
-	Set gtmtypes("shmpool_buff_hdr",135,"off")=972
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_order")=134
+	Set gtmtypes("shmpool_buff_hdr",135,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_zprevs"
+	Set gtmtypes("shmpool_buff_hdr",135,"off")=968
 	Set gtmtypes("shmpool_buff_hdr",135,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",135,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_data")=135
-	Set gtmtypes("shmpool_buff_hdr",136,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_puts_duplicate"
-	Set gtmtypes("shmpool_buff_hdr",136,"off")=976
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_zprevs")=135
+	Set gtmtypes("shmpool_buff_hdr",136,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_data"
+	Set gtmtypes("shmpool_buff_hdr",136,"off")=972
 	Set gtmtypes("shmpool_buff_hdr",136,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",136,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_puts_duplicate")=136
-	Set gtmtypes("shmpool_buff_hdr",137,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_tp_updates"
-	Set gtmtypes("shmpool_buff_hdr",137,"off")=980
+	Set gtmtypes("shmpool_buff_hdr",136,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_data")=136
+	Set gtmtypes("shmpool_buff_hdr",137,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_puts_duplicate"
+	Set gtmtypes("shmpool_buff_hdr",137,"off")=976
 	Set gtmtypes("shmpool_buff_hdr",137,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",137,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_tp_updates")=137
-	Set gtmtypes("shmpool_buff_hdr",138,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_tp_updates_duplicate"
-	Set gtmtypes("shmpool_buff_hdr",138,"off")=984
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_puts_duplicate")=137
+	Set gtmtypes("shmpool_buff_hdr",138,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_tp_updates"
+	Set gtmtypes("shmpool_buff_hdr",138,"off")=980
 	Set gtmtypes("shmpool_buff_hdr",138,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",138,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_tp_updates_duplicate")=138
-	Set gtmtypes("shmpool_buff_hdr",139,"name")="shmpool_buff_hdr.shadow_file_header.filler_accounting_64_align"
-	Set gtmtypes("shmpool_buff_hdr",139,"off")=988
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_tp_updates")=138
+	Set gtmtypes("shmpool_buff_hdr",139,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_tp_updates_duplicate"
+	Set gtmtypes("shmpool_buff_hdr",139,"off")=984
 	Set gtmtypes("shmpool_buff_hdr",139,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",139,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_accounting_64_align")=139
-	Set gtmtypes("shmpool_buff_hdr",140,"name")="shmpool_buff_hdr.shadow_file_header.staleness"
-	Set gtmtypes("shmpool_buff_hdr",140,"off")=992
-	Set gtmtypes("shmpool_buff_hdr",140,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",140,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.staleness")=140
-	Set gtmtypes("shmpool_buff_hdr",140,"dim")=2
-	Set gtmtypes("shmpool_buff_hdr",141,"name")="shmpool_buff_hdr.shadow_file_header.ccp_tick_interval"
-	Set gtmtypes("shmpool_buff_hdr",141,"off")=1000
+	Set gtmtypes("shmpool_buff_hdr",139,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_tp_updates_duplicate")=139
+	Set gtmtypes("shmpool_buff_hdr",140,"name")="shmpool_buff_hdr.shadow_file_header.filler_accounting_64_align"
+	Set gtmtypes("shmpool_buff_hdr",140,"off")=988
+	Set gtmtypes("shmpool_buff_hdr",140,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",140,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_accounting_64_align")=140
+	Set gtmtypes("shmpool_buff_hdr",141,"name")="shmpool_buff_hdr.shadow_file_header.staleness"
+	Set gtmtypes("shmpool_buff_hdr",141,"off")=992
 	Set gtmtypes("shmpool_buff_hdr",141,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",141,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.ccp_tick_interval")=141
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.staleness")=141
 	Set gtmtypes("shmpool_buff_hdr",141,"dim")=2
-	Set gtmtypes("shmpool_buff_hdr",142,"name")="shmpool_buff_hdr.shadow_file_header.ccp_quantum_interval"
-	Set gtmtypes("shmpool_buff_hdr",142,"off")=1008
+	Set gtmtypes("shmpool_buff_hdr",142,"name")="shmpool_buff_hdr.shadow_file_header.ccp_tick_interval"
+	Set gtmtypes("shmpool_buff_hdr",142,"off")=1000
 	Set gtmtypes("shmpool_buff_hdr",142,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",142,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.ccp_quantum_interval")=142
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.ccp_tick_interval")=142
 	Set gtmtypes("shmpool_buff_hdr",142,"dim")=2
-	Set gtmtypes("shmpool_buff_hdr",143,"name")="shmpool_buff_hdr.shadow_file_header.ccp_response_interval"
-	Set gtmtypes("shmpool_buff_hdr",143,"off")=1016
+	Set gtmtypes("shmpool_buff_hdr",143,"name")="shmpool_buff_hdr.shadow_file_header.ccp_quantum_interval"
+	Set gtmtypes("shmpool_buff_hdr",143,"off")=1008
 	Set gtmtypes("shmpool_buff_hdr",143,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",143,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.ccp_response_interval")=143
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.ccp_quantum_interval")=143
 	Set gtmtypes("shmpool_buff_hdr",143,"dim")=2
-	Set gtmtypes("shmpool_buff_hdr",144,"name")="shmpool_buff_hdr.shadow_file_header.ccp_jnl_before"
-	Set gtmtypes("shmpool_buff_hdr",144,"off")=1024
-	Set gtmtypes("shmpool_buff_hdr",144,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",144,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.ccp_jnl_before")=144
-	Set gtmtypes("shmpool_buff_hdr",145,"name")="shmpool_buff_hdr.shadow_file_header.clustered"
-	Set gtmtypes("shmpool_buff_hdr",145,"off")=1028
+	Set gtmtypes("shmpool_buff_hdr",144,"name")="shmpool_buff_hdr.shadow_file_header.ccp_response_interval"
+	Set gtmtypes("shmpool_buff_hdr",144,"off")=1016
+	Set gtmtypes("shmpool_buff_hdr",144,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",144,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.ccp_response_interval")=144
+	Set gtmtypes("shmpool_buff_hdr",144,"dim")=2
+	Set gtmtypes("shmpool_buff_hdr",145,"name")="shmpool_buff_hdr.shadow_file_header.ccp_jnl_before"
+	Set gtmtypes("shmpool_buff_hdr",145,"off")=1024
 	Set gtmtypes("shmpool_buff_hdr",145,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",145,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.clustered")=145
-	Set gtmtypes("shmpool_buff_hdr",146,"name")="shmpool_buff_hdr.shadow_file_header.unbacked_cache"
-	Set gtmtypes("shmpool_buff_hdr",146,"off")=1032
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.ccp_jnl_before")=145
+	Set gtmtypes("shmpool_buff_hdr",146,"name")="shmpool_buff_hdr.shadow_file_header.clustered"
+	Set gtmtypes("shmpool_buff_hdr",146,"off")=1028
 	Set gtmtypes("shmpool_buff_hdr",146,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",146,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unbacked_cache")=146
-	Set gtmtypes("shmpool_buff_hdr",147,"name")="shmpool_buff_hdr.shadow_file_header.rc_srv_cnt"
-	Set gtmtypes("shmpool_buff_hdr",147,"off")=1036
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.clustered")=146
+	Set gtmtypes("shmpool_buff_hdr",147,"name")="shmpool_buff_hdr.shadow_file_header.unbacked_cache"
+	Set gtmtypes("shmpool_buff_hdr",147,"off")=1032
 	Set gtmtypes("shmpool_buff_hdr",147,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",147,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.rc_srv_cnt")=147
-	Set gtmtypes("shmpool_buff_hdr",148,"name")="shmpool_buff_hdr.shadow_file_header.dsid"
-	Set gtmtypes("shmpool_buff_hdr",148,"off")=1040
+	Set gtmtypes("shmpool_buff_hdr",147,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unbacked_cache")=147
+	Set gtmtypes("shmpool_buff_hdr",148,"name")="shmpool_buff_hdr.shadow_file_header.rc_srv_cnt"
+	Set gtmtypes("shmpool_buff_hdr",148,"off")=1036
 	Set gtmtypes("shmpool_buff_hdr",148,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",148,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.dsid")=148
-	Set gtmtypes("shmpool_buff_hdr",149,"name")="shmpool_buff_hdr.shadow_file_header.rc_node"
-	Set gtmtypes("shmpool_buff_hdr",149,"off")=1044
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.rc_srv_cnt")=148
+	Set gtmtypes("shmpool_buff_hdr",149,"name")="shmpool_buff_hdr.shadow_file_header.dsid"
+	Set gtmtypes("shmpool_buff_hdr",149,"off")=1040
 	Set gtmtypes("shmpool_buff_hdr",149,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",149,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.rc_node")=149
-	Set gtmtypes("shmpool_buff_hdr",150,"name")="shmpool_buff_hdr.shadow_file_header.filler_ccp_rc"
-	Set gtmtypes("shmpool_buff_hdr",150,"off")=1048
-	Set gtmtypes("shmpool_buff_hdr",150,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",150,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_ccp_rc")=150
-	Set gtmtypes("shmpool_buff_hdr",151,"name")="shmpool_buff_hdr.shadow_file_header.reg_seqno"
-	Set gtmtypes("shmpool_buff_hdr",151,"off")=1056
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.dsid")=149
+	Set gtmtypes("shmpool_buff_hdr",150,"name")="shmpool_buff_hdr.shadow_file_header.rc_node"
+	Set gtmtypes("shmpool_buff_hdr",150,"off")=1044
+	Set gtmtypes("shmpool_buff_hdr",150,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",150,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.rc_node")=150
+	Set gtmtypes("shmpool_buff_hdr",151,"name")="shmpool_buff_hdr.shadow_file_header.filler_ccp_rc"
+	Set gtmtypes("shmpool_buff_hdr",151,"off")=1048
 	Set gtmtypes("shmpool_buff_hdr",151,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",151,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reg_seqno")=151
-	Set gtmtypes("shmpool_buff_hdr",152,"name")="shmpool_buff_hdr.shadow_file_header.pre_multisite_resync_seqno"
-	Set gtmtypes("shmpool_buff_hdr",152,"off")=1064
+	Set gtmtypes("shmpool_buff_hdr",151,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_ccp_rc")=151
+	Set gtmtypes("shmpool_buff_hdr",152,"name")="shmpool_buff_hdr.shadow_file_header.reg_seqno"
+	Set gtmtypes("shmpool_buff_hdr",152,"off")=1056
 	Set gtmtypes("shmpool_buff_hdr",152,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",152,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.pre_multisite_resync_seqno")=152
-	Set gtmtypes("shmpool_buff_hdr",153,"name")="shmpool_buff_hdr.shadow_file_header.zqgblmod_tn"
-	Set gtmtypes("shmpool_buff_hdr",153,"off")=1072
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reg_seqno")=152
+	Set gtmtypes("shmpool_buff_hdr",153,"name")="shmpool_buff_hdr.shadow_file_header.pre_multisite_resync_seqno"
+	Set gtmtypes("shmpool_buff_hdr",153,"off")=1064
 	Set gtmtypes("shmpool_buff_hdr",153,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",153,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.zqgblmod_tn")=153
-	Set gtmtypes("shmpool_buff_hdr",154,"name")="shmpool_buff_hdr.shadow_file_header.zqgblmod_seqno"
-	Set gtmtypes("shmpool_buff_hdr",154,"off")=1080
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.pre_multisite_resync_seqno")=153
+	Set gtmtypes("shmpool_buff_hdr",154,"name")="shmpool_buff_hdr.shadow_file_header.zqgblmod_tn"
+	Set gtmtypes("shmpool_buff_hdr",154,"off")=1072
 	Set gtmtypes("shmpool_buff_hdr",154,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",154,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.zqgblmod_seqno")=154
-	Set gtmtypes("shmpool_buff_hdr",155,"name")="shmpool_buff_hdr.shadow_file_header.repl_state"
-	Set gtmtypes("shmpool_buff_hdr",155,"off")=1088
-	Set gtmtypes("shmpool_buff_hdr",155,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",155,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.repl_state")=155
-	Set gtmtypes("shmpool_buff_hdr",156,"name")="shmpool_buff_hdr.shadow_file_header.multi_site_open"
-	Set gtmtypes("shmpool_buff_hdr",156,"off")=1092
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.zqgblmod_tn")=154
+	Set gtmtypes("shmpool_buff_hdr",155,"name")="shmpool_buff_hdr.shadow_file_header.zqgblmod_seqno"
+	Set gtmtypes("shmpool_buff_hdr",155,"off")=1080
+	Set gtmtypes("shmpool_buff_hdr",155,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",155,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.zqgblmod_seqno")=155
+	Set gtmtypes("shmpool_buff_hdr",156,"name")="shmpool_buff_hdr.shadow_file_header.repl_state"
+	Set gtmtypes("shmpool_buff_hdr",156,"off")=1088
 	Set gtmtypes("shmpool_buff_hdr",156,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",156,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.multi_site_open")=156
-	Set gtmtypes("shmpool_buff_hdr",157,"name")="shmpool_buff_hdr.shadow_file_header.filler_seqno"
-	Set gtmtypes("shmpool_buff_hdr",157,"off")=1096
-	Set gtmtypes("shmpool_buff_hdr",157,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",157,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_seqno")=157
-	Set gtmtypes("shmpool_buff_hdr",158,"name")="shmpool_buff_hdr.shadow_file_header.filler_repl"
-	Set gtmtypes("shmpool_buff_hdr",158,"off")=1104
-	Set gtmtypes("shmpool_buff_hdr",158,"len")=16
-	Set gtmtypes("shmpool_buff_hdr",158,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_repl")=158
-	Set gtmtypes("shmpool_buff_hdr",159,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_tp_retries"
-	Set gtmtypes("shmpool_buff_hdr",159,"off")=1120
-	Set gtmtypes("shmpool_buff_hdr",159,"len")=48
-	Set gtmtypes("shmpool_buff_hdr",159,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_tp_retries")=159
-	Set gtmtypes("shmpool_buff_hdr",159,"dim")=12
-	Set gtmtypes("shmpool_buff_hdr",160,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_tp_retries_conflicts"
-	Set gtmtypes("shmpool_buff_hdr",160,"off")=1168
+	Set gtmtypes("shmpool_buff_hdr",156,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.repl_state")=156
+	Set gtmtypes("shmpool_buff_hdr",157,"name")="shmpool_buff_hdr.shadow_file_header.multi_site_open"
+	Set gtmtypes("shmpool_buff_hdr",157,"off")=1092
+	Set gtmtypes("shmpool_buff_hdr",157,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",157,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.multi_site_open")=157
+	Set gtmtypes("shmpool_buff_hdr",158,"name")="shmpool_buff_hdr.shadow_file_header.filler_seqno"
+	Set gtmtypes("shmpool_buff_hdr",158,"off")=1096
+	Set gtmtypes("shmpool_buff_hdr",158,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",158,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_seqno")=158
+	Set gtmtypes("shmpool_buff_hdr",159,"name")="shmpool_buff_hdr.shadow_file_header.filler_repl"
+	Set gtmtypes("shmpool_buff_hdr",159,"off")=1104
+	Set gtmtypes("shmpool_buff_hdr",159,"len")=16
+	Set gtmtypes("shmpool_buff_hdr",159,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_repl")=159
+	Set gtmtypes("shmpool_buff_hdr",160,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_tp_retries"
+	Set gtmtypes("shmpool_buff_hdr",160,"off")=1120
 	Set gtmtypes("shmpool_buff_hdr",160,"len")=48
 	Set gtmtypes("shmpool_buff_hdr",160,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_tp_retries_conflicts")=160
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_tp_retries")=160
 	Set gtmtypes("shmpool_buff_hdr",160,"dim")=12
-	Set gtmtypes("shmpool_buff_hdr",161,"name")="shmpool_buff_hdr.shadow_file_header.tp_cdb_sc_blkmod"
-	Set gtmtypes("shmpool_buff_hdr",161,"off")=1216
-	Set gtmtypes("shmpool_buff_hdr",161,"len")=32
+	Set gtmtypes("shmpool_buff_hdr",161,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_tp_retries_conflicts"
+	Set gtmtypes("shmpool_buff_hdr",161,"off")=1168
+	Set gtmtypes("shmpool_buff_hdr",161,"len")=48
 	Set gtmtypes("shmpool_buff_hdr",161,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.tp_cdb_sc_blkmod")=161
-	Set gtmtypes("shmpool_buff_hdr",161,"dim")=8
-	Set gtmtypes("shmpool_buff_hdr",162,"name")="shmpool_buff_hdr.shadow_file_header.jnl_alq"
-	Set gtmtypes("shmpool_buff_hdr",162,"off")=1248
-	Set gtmtypes("shmpool_buff_hdr",162,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",162,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_alq")=162
-	Set gtmtypes("shmpool_buff_hdr",163,"name")="shmpool_buff_hdr.shadow_file_header.jnl_deq"
-	Set gtmtypes("shmpool_buff_hdr",163,"off")=1252
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_tp_retries_conflicts")=161
+	Set gtmtypes("shmpool_buff_hdr",161,"dim")=12
+	Set gtmtypes("shmpool_buff_hdr",162,"name")="shmpool_buff_hdr.shadow_file_header.tp_cdb_sc_blkmod"
+	Set gtmtypes("shmpool_buff_hdr",162,"off")=1216
+	Set gtmtypes("shmpool_buff_hdr",162,"len")=32
+	Set gtmtypes("shmpool_buff_hdr",162,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.tp_cdb_sc_blkmod")=162
+	Set gtmtypes("shmpool_buff_hdr",162,"dim")=8
+	Set gtmtypes("shmpool_buff_hdr",163,"name")="shmpool_buff_hdr.shadow_file_header.jnl_alq"
+	Set gtmtypes("shmpool_buff_hdr",163,"off")=1248
 	Set gtmtypes("shmpool_buff_hdr",163,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",163,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_deq")=163
-	Set gtmtypes("shmpool_buff_hdr",164,"name")="shmpool_buff_hdr.shadow_file_header.jnl_buffer_size"
-	Set gtmtypes("shmpool_buff_hdr",164,"off")=1256
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_alq")=163
+	Set gtmtypes("shmpool_buff_hdr",164,"name")="shmpool_buff_hdr.shadow_file_header.jnl_deq"
+	Set gtmtypes("shmpool_buff_hdr",164,"off")=1252
 	Set gtmtypes("shmpool_buff_hdr",164,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",164,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_buffer_size")=164
-	Set gtmtypes("shmpool_buff_hdr",165,"name")="shmpool_buff_hdr.shadow_file_header.jnl_before_image"
-	Set gtmtypes("shmpool_buff_hdr",165,"off")=1260
+	Set gtmtypes("shmpool_buff_hdr",164,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_deq")=164
+	Set gtmtypes("shmpool_buff_hdr",165,"name")="shmpool_buff_hdr.shadow_file_header.jnl_buffer_size"
+	Set gtmtypes("shmpool_buff_hdr",165,"off")=1256
 	Set gtmtypes("shmpool_buff_hdr",165,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",165,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_before_image")=165
-	Set gtmtypes("shmpool_buff_hdr",166,"name")="shmpool_buff_hdr.shadow_file_header.jnl_state"
-	Set gtmtypes("shmpool_buff_hdr",166,"off")=1264
+	Set gtmtypes("shmpool_buff_hdr",165,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_buffer_size")=165
+	Set gtmtypes("shmpool_buff_hdr",166,"name")="shmpool_buff_hdr.shadow_file_header.jnl_before_image"
+	Set gtmtypes("shmpool_buff_hdr",166,"off")=1260
 	Set gtmtypes("shmpool_buff_hdr",166,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",166,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_state")=166
-	Set gtmtypes("shmpool_buff_hdr",167,"name")="shmpool_buff_hdr.shadow_file_header.jnl_file_len"
-	Set gtmtypes("shmpool_buff_hdr",167,"off")=1268
+	Set gtmtypes("shmpool_buff_hdr",166,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_before_image")=166
+	Set gtmtypes("shmpool_buff_hdr",167,"name")="shmpool_buff_hdr.shadow_file_header.jnl_state"
+	Set gtmtypes("shmpool_buff_hdr",167,"off")=1264
 	Set gtmtypes("shmpool_buff_hdr",167,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",167,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_file_len")=167
-	Set gtmtypes("shmpool_buff_hdr",168,"name")="shmpool_buff_hdr.shadow_file_header.autoswitchlimit"
-	Set gtmtypes("shmpool_buff_hdr",168,"off")=1272
+	Set gtmtypes("shmpool_buff_hdr",167,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_state")=167
+	Set gtmtypes("shmpool_buff_hdr",168,"name")="shmpool_buff_hdr.shadow_file_header.jnl_file_len"
+	Set gtmtypes("shmpool_buff_hdr",168,"off")=1268
 	Set gtmtypes("shmpool_buff_hdr",168,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",168,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.autoswitchlimit")=168
-	Set gtmtypes("shmpool_buff_hdr",169,"name")="shmpool_buff_hdr.shadow_file_header.epoch_interval"
-	Set gtmtypes("shmpool_buff_hdr",169,"off")=1276
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_file_len")=168
+	Set gtmtypes("shmpool_buff_hdr",169,"name")="shmpool_buff_hdr.shadow_file_header.autoswitchlimit"
+	Set gtmtypes("shmpool_buff_hdr",169,"off")=1272
 	Set gtmtypes("shmpool_buff_hdr",169,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",169,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.epoch_interval")=169
-	Set gtmtypes("shmpool_buff_hdr",170,"name")="shmpool_buff_hdr.shadow_file_header.alignsize"
-	Set gtmtypes("shmpool_buff_hdr",170,"off")=1280
+	Set gtmtypes("shmpool_buff_hdr",169,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.autoswitchlimit")=169
+	Set gtmtypes("shmpool_buff_hdr",170,"name")="shmpool_buff_hdr.shadow_file_header.epoch_interval"
+	Set gtmtypes("shmpool_buff_hdr",170,"off")=1276
 	Set gtmtypes("shmpool_buff_hdr",170,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",170,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.alignsize")=170
-	Set gtmtypes("shmpool_buff_hdr",171,"name")="shmpool_buff_hdr.shadow_file_header.jnl_sync_io"
-	Set gtmtypes("shmpool_buff_hdr",171,"off")=1284
+	Set gtmtypes("shmpool_buff_hdr",170,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.epoch_interval")=170
+	Set gtmtypes("shmpool_buff_hdr",171,"name")="shmpool_buff_hdr.shadow_file_header.alignsize"
+	Set gtmtypes("shmpool_buff_hdr",171,"off")=1280
 	Set gtmtypes("shmpool_buff_hdr",171,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",171,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_sync_io")=171
-	Set gtmtypes("shmpool_buff_hdr",172,"name")="shmpool_buff_hdr.shadow_file_header.yield_lmt"
-	Set gtmtypes("shmpool_buff_hdr",172,"off")=1288
+	Set gtmtypes("shmpool_buff_hdr",171,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.alignsize")=171
+	Set gtmtypes("shmpool_buff_hdr",172,"name")="shmpool_buff_hdr.shadow_file_header.jnl_sync_io"
+	Set gtmtypes("shmpool_buff_hdr",172,"off")=1284
 	Set gtmtypes("shmpool_buff_hdr",172,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",172,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.yield_lmt")=172
-	Set gtmtypes("shmpool_buff_hdr",173,"name")="shmpool_buff_hdr.shadow_file_header.turn_around_point"
-	Set gtmtypes("shmpool_buff_hdr",173,"off")=1292
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_sync_io")=172
+	Set gtmtypes("shmpool_buff_hdr",173,"name")="shmpool_buff_hdr.shadow_file_header.yield_lmt"
+	Set gtmtypes("shmpool_buff_hdr",173,"off")=1288
 	Set gtmtypes("shmpool_buff_hdr",173,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",173,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.turn_around_point")=173
-	Set gtmtypes("shmpool_buff_hdr",174,"name")="shmpool_buff_hdr.shadow_file_header.jnl_eovtn"
-	Set gtmtypes("shmpool_buff_hdr",174,"off")=1296
-	Set gtmtypes("shmpool_buff_hdr",174,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",174,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_eovtn")=174
-	Set gtmtypes("shmpool_buff_hdr",175,"name")="shmpool_buff_hdr.shadow_file_header.filler_jnl"
-	Set gtmtypes("shmpool_buff_hdr",175,"off")=1304
+	Set gtmtypes("shmpool_buff_hdr",173,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.yield_lmt")=173
+	Set gtmtypes("shmpool_buff_hdr",174,"name")="shmpool_buff_hdr.shadow_file_header.turn_around_point"
+	Set gtmtypes("shmpool_buff_hdr",174,"off")=1292
+	Set gtmtypes("shmpool_buff_hdr",174,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",174,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.turn_around_point")=174
+	Set gtmtypes("shmpool_buff_hdr",175,"name")="shmpool_buff_hdr.shadow_file_header.jnl_eovtn"
+	Set gtmtypes("shmpool_buff_hdr",175,"off")=1296
 	Set gtmtypes("shmpool_buff_hdr",175,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",175,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_jnl")=175
-	Set gtmtypes("shmpool_buff_hdr",176,"name")="shmpool_buff_hdr.shadow_file_header.intrpt_recov_resync_seqno"
-	Set gtmtypes("shmpool_buff_hdr",176,"off")=1312
+	Set gtmtypes("shmpool_buff_hdr",175,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_eovtn")=175
+	Set gtmtypes("shmpool_buff_hdr",176,"name")="shmpool_buff_hdr.shadow_file_header.filler_jnl"
+	Set gtmtypes("shmpool_buff_hdr",176,"off")=1304
 	Set gtmtypes("shmpool_buff_hdr",176,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",176,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.intrpt_recov_resync_seqno")=176
-	Set gtmtypes("shmpool_buff_hdr",177,"name")="shmpool_buff_hdr.shadow_file_header.intrpt_recov_tp_resolve_time"
-	Set gtmtypes("shmpool_buff_hdr",177,"off")=1320
-	Set gtmtypes("shmpool_buff_hdr",177,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",177,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.intrpt_recov_tp_resolve_time")=177
-	Set gtmtypes("shmpool_buff_hdr",178,"name")="shmpool_buff_hdr.shadow_file_header.recov_interrupted"
-	Set gtmtypes("shmpool_buff_hdr",178,"off")=1324
+	Set gtmtypes("shmpool_buff_hdr",176,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_jnl")=176
+	Set gtmtypes("shmpool_buff_hdr",177,"name")="shmpool_buff_hdr.shadow_file_header.intrpt_recov_resync_seqno"
+	Set gtmtypes("shmpool_buff_hdr",177,"off")=1312
+	Set gtmtypes("shmpool_buff_hdr",177,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",177,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.intrpt_recov_resync_seqno")=177
+	Set gtmtypes("shmpool_buff_hdr",178,"name")="shmpool_buff_hdr.shadow_file_header.intrpt_recov_tp_resolve_time"
+	Set gtmtypes("shmpool_buff_hdr",178,"off")=1320
 	Set gtmtypes("shmpool_buff_hdr",178,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",178,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recov_interrupted")=178
-	Set gtmtypes("shmpool_buff_hdr",179,"name")="shmpool_buff_hdr.shadow_file_header.intrpt_recov_jnl_state"
-	Set gtmtypes("shmpool_buff_hdr",179,"off")=1328
+	Set gtmtypes("shmpool_buff_hdr",178,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.intrpt_recov_tp_resolve_time")=178
+	Set gtmtypes("shmpool_buff_hdr",179,"name")="shmpool_buff_hdr.shadow_file_header.recov_interrupted"
+	Set gtmtypes("shmpool_buff_hdr",179,"off")=1324
 	Set gtmtypes("shmpool_buff_hdr",179,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",179,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.intrpt_recov_jnl_state")=179
-	Set gtmtypes("shmpool_buff_hdr",180,"name")="shmpool_buff_hdr.shadow_file_header.intrpt_recov_repl_state"
-	Set gtmtypes("shmpool_buff_hdr",180,"off")=1332
+	Set gtmtypes("shmpool_buff_hdr",179,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recov_interrupted")=179
+	Set gtmtypes("shmpool_buff_hdr",180,"name")="shmpool_buff_hdr.shadow_file_header.intrpt_recov_jnl_state"
+	Set gtmtypes("shmpool_buff_hdr",180,"off")=1328
 	Set gtmtypes("shmpool_buff_hdr",180,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",180,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.intrpt_recov_repl_state")=180
-	Set gtmtypes("shmpool_buff_hdr",181,"name")="shmpool_buff_hdr.shadow_file_header.before_trunc_total_blks"
-	Set gtmtypes("shmpool_buff_hdr",181,"off")=1336
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.intrpt_recov_jnl_state")=180
+	Set gtmtypes("shmpool_buff_hdr",181,"name")="shmpool_buff_hdr.shadow_file_header.intrpt_recov_repl_state"
+	Set gtmtypes("shmpool_buff_hdr",181,"off")=1332
 	Set gtmtypes("shmpool_buff_hdr",181,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",181,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.before_trunc_total_blks")=181
-	Set gtmtypes("shmpool_buff_hdr",182,"name")="shmpool_buff_hdr.shadow_file_header.after_trunc_total_blks"
-	Set gtmtypes("shmpool_buff_hdr",182,"off")=1340
+	Set gtmtypes("shmpool_buff_hdr",181,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.intrpt_recov_repl_state")=181
+	Set gtmtypes("shmpool_buff_hdr",182,"name")="shmpool_buff_hdr.shadow_file_header.before_trunc_total_blks"
+	Set gtmtypes("shmpool_buff_hdr",182,"off")=1336
 	Set gtmtypes("shmpool_buff_hdr",182,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",182,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.after_trunc_total_blks")=182
-	Set gtmtypes("shmpool_buff_hdr",183,"name")="shmpool_buff_hdr.shadow_file_header.before_trunc_free_blocks"
-	Set gtmtypes("shmpool_buff_hdr",183,"off")=1344
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.before_trunc_total_blks")=182
+	Set gtmtypes("shmpool_buff_hdr",183,"name")="shmpool_buff_hdr.shadow_file_header.after_trunc_total_blks"
+	Set gtmtypes("shmpool_buff_hdr",183,"off")=1340
 	Set gtmtypes("shmpool_buff_hdr",183,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",183,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.before_trunc_free_blocks")=183
-	Set gtmtypes("shmpool_buff_hdr",184,"name")="shmpool_buff_hdr.shadow_file_header.filler_trunc"
-	Set gtmtypes("shmpool_buff_hdr",184,"off")=1348
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.after_trunc_total_blks")=183
+	Set gtmtypes("shmpool_buff_hdr",184,"name")="shmpool_buff_hdr.shadow_file_header.before_trunc_free_blocks"
+	Set gtmtypes("shmpool_buff_hdr",184,"off")=1344
 	Set gtmtypes("shmpool_buff_hdr",184,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",184,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_trunc")=184
-	Set gtmtypes("shmpool_buff_hdr",185,"name")="shmpool_buff_hdr.shadow_file_header.filler_1k"
-	Set gtmtypes("shmpool_buff_hdr",185,"off")=1352
-	Set gtmtypes("shmpool_buff_hdr",185,"len")=24
-	Set gtmtypes("shmpool_buff_hdr",185,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_1k")=185
-	Set gtmtypes("shmpool_buff_hdr",186,"name")="shmpool_buff_hdr.shadow_file_header.jnl_file_name"
-	Set gtmtypes("shmpool_buff_hdr",186,"off")=1376
-	Set gtmtypes("shmpool_buff_hdr",186,"len")=256
-	Set gtmtypes("shmpool_buff_hdr",186,"type")="unsigned-char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_file_name")=186
-	Set gtmtypes("shmpool_buff_hdr",187,"name")="shmpool_buff_hdr.shadow_file_header.reorg_restart_key"
-	Set gtmtypes("shmpool_buff_hdr",187,"off")=1632
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.before_trunc_free_blocks")=184
+	Set gtmtypes("shmpool_buff_hdr",185,"name")="shmpool_buff_hdr.shadow_file_header.filler_trunc"
+	Set gtmtypes("shmpool_buff_hdr",185,"off")=1348
+	Set gtmtypes("shmpool_buff_hdr",185,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",185,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_trunc")=185
+	Set gtmtypes("shmpool_buff_hdr",186,"name")="shmpool_buff_hdr.shadow_file_header.filler_1k"
+	Set gtmtypes("shmpool_buff_hdr",186,"off")=1352
+	Set gtmtypes("shmpool_buff_hdr",186,"len")=24
+	Set gtmtypes("shmpool_buff_hdr",186,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_1k")=186
+	Set gtmtypes("shmpool_buff_hdr",187,"name")="shmpool_buff_hdr.shadow_file_header.jnl_file_name"
+	Set gtmtypes("shmpool_buff_hdr",187,"off")=1376
 	Set gtmtypes("shmpool_buff_hdr",187,"len")=256
 	Set gtmtypes("shmpool_buff_hdr",187,"type")="unsigned-char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reorg_restart_key")=187
-	Set gtmtypes("shmpool_buff_hdr",188,"name")="shmpool_buff_hdr.shadow_file_header.machine_name"
-	Set gtmtypes("shmpool_buff_hdr",188,"off")=1888
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_file_name")=187
+	Set gtmtypes("shmpool_buff_hdr",188,"name")="shmpool_buff_hdr.shadow_file_header.reorg_restart_key"
+	Set gtmtypes("shmpool_buff_hdr",188,"off")=1632
 	Set gtmtypes("shmpool_buff_hdr",188,"len")=256
-	Set gtmtypes("shmpool_buff_hdr",188,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.machine_name")=188
-	Set gtmtypes("shmpool_buff_hdr",189,"name")="shmpool_buff_hdr.shadow_file_header.encryption_hash"
-	Set gtmtypes("shmpool_buff_hdr",189,"off")=2144
-	Set gtmtypes("shmpool_buff_hdr",189,"len")=80
+	Set gtmtypes("shmpool_buff_hdr",188,"type")="unsigned-char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reorg_restart_key")=188
+	Set gtmtypes("shmpool_buff_hdr",189,"name")="shmpool_buff_hdr.shadow_file_header.machine_name"
+	Set gtmtypes("shmpool_buff_hdr",189,"off")=1888
+	Set gtmtypes("shmpool_buff_hdr",189,"len")=256
 	Set gtmtypes("shmpool_buff_hdr",189,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.encryption_hash")=189
-	Set gtmtypes("shmpool_buff_hdr",190,"name")="shmpool_buff_hdr.shadow_file_header.encryption_hash2"
-	Set gtmtypes("shmpool_buff_hdr",190,"off")=2224
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.machine_name")=189
+	Set gtmtypes("shmpool_buff_hdr",190,"name")="shmpool_buff_hdr.shadow_file_header.encryption_hash"
+	Set gtmtypes("shmpool_buff_hdr",190,"off")=2144
 	Set gtmtypes("shmpool_buff_hdr",190,"len")=80
 	Set gtmtypes("shmpool_buff_hdr",190,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.encryption_hash2")=190
-	Set gtmtypes("shmpool_buff_hdr",191,"name")="shmpool_buff_hdr.shadow_file_header.non_null_iv"
-	Set gtmtypes("shmpool_buff_hdr",191,"off")=2304
-	Set gtmtypes("shmpool_buff_hdr",191,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",191,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.non_null_iv")=191
-	Set gtmtypes("shmpool_buff_hdr",192,"name")="shmpool_buff_hdr.shadow_file_header.encryption_hash_cutoff"
-	Set gtmtypes("shmpool_buff_hdr",192,"off")=2308
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.encryption_hash")=190
+	Set gtmtypes("shmpool_buff_hdr",191,"name")="shmpool_buff_hdr.shadow_file_header.encryption_hash2"
+	Set gtmtypes("shmpool_buff_hdr",191,"off")=2224
+	Set gtmtypes("shmpool_buff_hdr",191,"len")=80
+	Set gtmtypes("shmpool_buff_hdr",191,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.encryption_hash2")=191
+	Set gtmtypes("shmpool_buff_hdr",192,"name")="shmpool_buff_hdr.shadow_file_header.non_null_iv"
+	Set gtmtypes("shmpool_buff_hdr",192,"off")=2304
 	Set gtmtypes("shmpool_buff_hdr",192,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",192,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.encryption_hash_cutoff")=192
-	Set gtmtypes("shmpool_buff_hdr",193,"name")="shmpool_buff_hdr.shadow_file_header.encryption_hash2_start_tn"
-	Set gtmtypes("shmpool_buff_hdr",193,"off")=2312
-	Set gtmtypes("shmpool_buff_hdr",193,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",193,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.encryption_hash2_start_tn")=193
-	Set gtmtypes("shmpool_buff_hdr",194,"name")="shmpool_buff_hdr.shadow_file_header.filler_encrypt"
-	Set gtmtypes("shmpool_buff_hdr",194,"off")=2320
-	Set gtmtypes("shmpool_buff_hdr",194,"len")=80
-	Set gtmtypes("shmpool_buff_hdr",194,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_encrypt")=194
-	Set gtmtypes("shmpool_buff_hdr",195,"name")="shmpool_buff_hdr.shadow_file_header.total_buffer_flush_tn"
-	Set gtmtypes("shmpool_buff_hdr",195,"off")=2400
-	Set gtmtypes("shmpool_buff_hdr",195,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",195,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.total_buffer_flush_tn")=195
-	Set gtmtypes("shmpool_buff_hdr",196,"name")="shmpool_buff_hdr.shadow_file_header.bufct_buffer_flush_tn"
-	Set gtmtypes("shmpool_buff_hdr",196,"off")=2408
+	Set gtmtypes("shmpool_buff_hdr",192,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.non_null_iv")=192
+	Set gtmtypes("shmpool_buff_hdr",193,"name")="shmpool_buff_hdr.shadow_file_header.encryption_hash_cutoff"
+	Set gtmtypes("shmpool_buff_hdr",193,"off")=2308
+	Set gtmtypes("shmpool_buff_hdr",193,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",193,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.encryption_hash_cutoff")=193
+	Set gtmtypes("shmpool_buff_hdr",194,"name")="shmpool_buff_hdr.shadow_file_header.encryption_hash2_start_tn"
+	Set gtmtypes("shmpool_buff_hdr",194,"off")=2312
+	Set gtmtypes("shmpool_buff_hdr",194,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",194,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.encryption_hash2_start_tn")=194
+	Set gtmtypes("shmpool_buff_hdr",195,"name")="shmpool_buff_hdr.shadow_file_header.filler_encrypt"
+	Set gtmtypes("shmpool_buff_hdr",195,"off")=2320
+	Set gtmtypes("shmpool_buff_hdr",195,"len")=80
+	Set gtmtypes("shmpool_buff_hdr",195,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_encrypt")=195
+	Set gtmtypes("shmpool_buff_hdr",196,"name")="shmpool_buff_hdr.shadow_file_header.total_buffer_flush_tn"
+	Set gtmtypes("shmpool_buff_hdr",196,"off")=2400
 	Set gtmtypes("shmpool_buff_hdr",196,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",196,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bufct_buffer_flush_tn")=196
-	Set gtmtypes("shmpool_buff_hdr",197,"name")="shmpool_buff_hdr.shadow_file_header.bufct_buffer_flush_loop_tn"
-	Set gtmtypes("shmpool_buff_hdr",197,"off")=2416
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.total_buffer_flush_tn")=196
+	Set gtmtypes("shmpool_buff_hdr",197,"name")="shmpool_buff_hdr.shadow_file_header.bufct_buffer_flush_tn"
+	Set gtmtypes("shmpool_buff_hdr",197,"off")=2408
 	Set gtmtypes("shmpool_buff_hdr",197,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",197,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bufct_buffer_flush_loop_tn")=197
-	Set gtmtypes("shmpool_buff_hdr",198,"name")="shmpool_buff_hdr.shadow_file_header.wrt_calls_tn"
-	Set gtmtypes("shmpool_buff_hdr",198,"off")=2424
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bufct_buffer_flush_tn")=197
+	Set gtmtypes("shmpool_buff_hdr",198,"name")="shmpool_buff_hdr.shadow_file_header.bufct_buffer_flush_loop_tn"
+	Set gtmtypes("shmpool_buff_hdr",198,"off")=2416
 	Set gtmtypes("shmpool_buff_hdr",198,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",198,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_calls_tn")=198
-	Set gtmtypes("shmpool_buff_hdr",199,"name")="shmpool_buff_hdr.shadow_file_header.wrt_count_tn"
-	Set gtmtypes("shmpool_buff_hdr",199,"off")=2432
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bufct_buffer_flush_loop_tn")=198
+	Set gtmtypes("shmpool_buff_hdr",199,"name")="shmpool_buff_hdr.shadow_file_header.wrt_calls_tn"
+	Set gtmtypes("shmpool_buff_hdr",199,"off")=2424
 	Set gtmtypes("shmpool_buff_hdr",199,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",199,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_count_tn")=199
-	Set gtmtypes("shmpool_buff_hdr",200,"name")="shmpool_buff_hdr.shadow_file_header.wrt_blocked_tn"
-	Set gtmtypes("shmpool_buff_hdr",200,"off")=2440
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_calls_tn")=199
+	Set gtmtypes("shmpool_buff_hdr",200,"name")="shmpool_buff_hdr.shadow_file_header.wrt_count_tn"
+	Set gtmtypes("shmpool_buff_hdr",200,"off")=2432
 	Set gtmtypes("shmpool_buff_hdr",200,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",200,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_blocked_tn")=200
-	Set gtmtypes("shmpool_buff_hdr",201,"name")="shmpool_buff_hdr.shadow_file_header.wrt_busy_tn"
-	Set gtmtypes("shmpool_buff_hdr",201,"off")=2448
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_count_tn")=200
+	Set gtmtypes("shmpool_buff_hdr",201,"name")="shmpool_buff_hdr.shadow_file_header.wrt_blocked_tn"
+	Set gtmtypes("shmpool_buff_hdr",201,"off")=2440
 	Set gtmtypes("shmpool_buff_hdr",201,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",201,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_busy_tn")=201
-	Set gtmtypes("shmpool_buff_hdr",202,"name")="shmpool_buff_hdr.shadow_file_header.wrt_noblks_wrtn_tn"
-	Set gtmtypes("shmpool_buff_hdr",202,"off")=2456
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_blocked_tn")=201
+	Set gtmtypes("shmpool_buff_hdr",202,"name")="shmpool_buff_hdr.shadow_file_header.wrt_busy_tn"
+	Set gtmtypes("shmpool_buff_hdr",202,"off")=2448
 	Set gtmtypes("shmpool_buff_hdr",202,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",202,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_noblks_wrtn_tn")=202
-	Set gtmtypes("shmpool_buff_hdr",203,"name")="shmpool_buff_hdr.shadow_file_header.reserved_bgtrcrec1_tn"
-	Set gtmtypes("shmpool_buff_hdr",203,"off")=2464
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_busy_tn")=202
+	Set gtmtypes("shmpool_buff_hdr",203,"name")="shmpool_buff_hdr.shadow_file_header.wrt_noblks_wrtn_tn"
+	Set gtmtypes("shmpool_buff_hdr",203,"off")=2456
 	Set gtmtypes("shmpool_buff_hdr",203,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",203,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reserved_bgtrcrec1_tn")=203
-	Set gtmtypes("shmpool_buff_hdr",204,"name")="shmpool_buff_hdr.shadow_file_header.reserved_bgtrcrec2_tn"
-	Set gtmtypes("shmpool_buff_hdr",204,"off")=2472
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_noblks_wrtn_tn")=203
+	Set gtmtypes("shmpool_buff_hdr",204,"name")="shmpool_buff_hdr.shadow_file_header.reserved_bgtrcrec1_tn"
+	Set gtmtypes("shmpool_buff_hdr",204,"off")=2464
 	Set gtmtypes("shmpool_buff_hdr",204,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",204,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reserved_bgtrcrec2_tn")=204
-	Set gtmtypes("shmpool_buff_hdr",205,"name")="shmpool_buff_hdr.shadow_file_header.reserved_bgtrcrec3_tn"
-	Set gtmtypes("shmpool_buff_hdr",205,"off")=2480
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reserved_bgtrcrec1_tn")=204
+	Set gtmtypes("shmpool_buff_hdr",205,"name")="shmpool_buff_hdr.shadow_file_header.reserved_bgtrcrec2_tn"
+	Set gtmtypes("shmpool_buff_hdr",205,"off")=2472
 	Set gtmtypes("shmpool_buff_hdr",205,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",205,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reserved_bgtrcrec3_tn")=205
-	Set gtmtypes("shmpool_buff_hdr",206,"name")="shmpool_buff_hdr.shadow_file_header.lost_block_recovery_tn"
-	Set gtmtypes("shmpool_buff_hdr",206,"off")=2488
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reserved_bgtrcrec2_tn")=205
+	Set gtmtypes("shmpool_buff_hdr",206,"name")="shmpool_buff_hdr.shadow_file_header.reserved_bgtrcrec3_tn"
+	Set gtmtypes("shmpool_buff_hdr",206,"off")=2480
 	Set gtmtypes("shmpool_buff_hdr",206,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",206,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.lost_block_recovery_tn")=206
-	Set gtmtypes("shmpool_buff_hdr",207,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_onln_rlbk_tn"
-	Set gtmtypes("shmpool_buff_hdr",207,"off")=2496
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reserved_bgtrcrec3_tn")=206
+	Set gtmtypes("shmpool_buff_hdr",207,"name")="shmpool_buff_hdr.shadow_file_header.lost_block_recovery_tn"
+	Set gtmtypes("shmpool_buff_hdr",207,"off")=2488
 	Set gtmtypes("shmpool_buff_hdr",207,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",207,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_onln_rlbk_tn")=207
-	Set gtmtypes("shmpool_buff_hdr",208,"name")="shmpool_buff_hdr.shadow_file_header.stale_tn"
-	Set gtmtypes("shmpool_buff_hdr",208,"off")=2504
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.lost_block_recovery_tn")=207
+	Set gtmtypes("shmpool_buff_hdr",208,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_onln_rlbk_tn"
+	Set gtmtypes("shmpool_buff_hdr",208,"off")=2496
 	Set gtmtypes("shmpool_buff_hdr",208,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",208,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_tn")=208
-	Set gtmtypes("shmpool_buff_hdr",209,"name")="shmpool_buff_hdr.shadow_file_header.starved_tn"
-	Set gtmtypes("shmpool_buff_hdr",209,"off")=2512
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_onln_rlbk_tn")=208
+	Set gtmtypes("shmpool_buff_hdr",209,"name")="shmpool_buff_hdr.shadow_file_header.stale_tn"
+	Set gtmtypes("shmpool_buff_hdr",209,"off")=2504
 	Set gtmtypes("shmpool_buff_hdr",209,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",209,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.starved_tn")=209
-	Set gtmtypes("shmpool_buff_hdr",210,"name")="shmpool_buff_hdr.shadow_file_header.stale_timer_started_tn"
-	Set gtmtypes("shmpool_buff_hdr",210,"off")=2520
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_tn")=209
+	Set gtmtypes("shmpool_buff_hdr",210,"name")="shmpool_buff_hdr.shadow_file_header.starved_tn"
+	Set gtmtypes("shmpool_buff_hdr",210,"off")=2512
 	Set gtmtypes("shmpool_buff_hdr",210,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",210,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_timer_started_tn")=210
-	Set gtmtypes("shmpool_buff_hdr",211,"name")="shmpool_buff_hdr.shadow_file_header.stale_timer_pop_tn"
-	Set gtmtypes("shmpool_buff_hdr",211,"off")=2528
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.starved_tn")=210
+	Set gtmtypes("shmpool_buff_hdr",211,"name")="shmpool_buff_hdr.shadow_file_header.stale_timer_started_tn"
+	Set gtmtypes("shmpool_buff_hdr",211,"off")=2520
 	Set gtmtypes("shmpool_buff_hdr",211,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",211,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_timer_pop_tn")=211
-	Set gtmtypes("shmpool_buff_hdr",212,"name")="shmpool_buff_hdr.shadow_file_header.stale_process_defer_tn"
-	Set gtmtypes("shmpool_buff_hdr",212,"off")=2536
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_timer_started_tn")=211
+	Set gtmtypes("shmpool_buff_hdr",212,"name")="shmpool_buff_hdr.shadow_file_header.stale_timer_pop_tn"
+	Set gtmtypes("shmpool_buff_hdr",212,"off")=2528
 	Set gtmtypes("shmpool_buff_hdr",212,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",212,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_process_defer_tn")=212
-	Set gtmtypes("shmpool_buff_hdr",213,"name")="shmpool_buff_hdr.shadow_file_header.stale_defer_processed_tn"
-	Set gtmtypes("shmpool_buff_hdr",213,"off")=2544
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_timer_pop_tn")=212
+	Set gtmtypes("shmpool_buff_hdr",213,"name")="shmpool_buff_hdr.shadow_file_header.stale_process_defer_tn"
+	Set gtmtypes("shmpool_buff_hdr",213,"off")=2536
 	Set gtmtypes("shmpool_buff_hdr",213,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",213,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_defer_processed_tn")=213
-	Set gtmtypes("shmpool_buff_hdr",214,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flush_tn"
-	Set gtmtypes("shmpool_buff_hdr",214,"off")=2552
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_process_defer_tn")=213
+	Set gtmtypes("shmpool_buff_hdr",214,"name")="shmpool_buff_hdr.shadow_file_header.stale_defer_processed_tn"
+	Set gtmtypes("shmpool_buff_hdr",214,"off")=2544
 	Set gtmtypes("shmpool_buff_hdr",214,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",214,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flush_tn")=214
-	Set gtmtypes("shmpool_buff_hdr",215,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flush_loop_tn"
-	Set gtmtypes("shmpool_buff_hdr",215,"off")=2560
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_defer_processed_tn")=214
+	Set gtmtypes("shmpool_buff_hdr",215,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flush_tn"
+	Set gtmtypes("shmpool_buff_hdr",215,"off")=2552
 	Set gtmtypes("shmpool_buff_hdr",215,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",215,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flush_loop_tn")=215
-	Set gtmtypes("shmpool_buff_hdr",216,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flush_retries_tn"
-	Set gtmtypes("shmpool_buff_hdr",216,"off")=2568
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flush_tn")=215
+	Set gtmtypes("shmpool_buff_hdr",216,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flush_loop_tn"
+	Set gtmtypes("shmpool_buff_hdr",216,"off")=2560
 	Set gtmtypes("shmpool_buff_hdr",216,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",216,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flush_retries_tn")=216
-	Set gtmtypes("shmpool_buff_hdr",217,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flushed_during_lockwait_tn"
-	Set gtmtypes("shmpool_buff_hdr",217,"off")=2576
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flush_loop_tn")=216
+	Set gtmtypes("shmpool_buff_hdr",217,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flush_retries_tn"
+	Set gtmtypes("shmpool_buff_hdr",217,"off")=2568
 	Set gtmtypes("shmpool_buff_hdr",217,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",217,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flushed_during_lockwait_tn")=217
-	Set gtmtypes("shmpool_buff_hdr",218,"name")="shmpool_buff_hdr.shadow_file_header.tp_crit_retries_tn"
-	Set gtmtypes("shmpool_buff_hdr",218,"off")=2584
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flush_retries_tn")=217
+	Set gtmtypes("shmpool_buff_hdr",218,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flushed_during_lockwait_tn"
+	Set gtmtypes("shmpool_buff_hdr",218,"off")=2576
 	Set gtmtypes("shmpool_buff_hdr",218,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",218,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.tp_crit_retries_tn")=218
-	Set gtmtypes("shmpool_buff_hdr",219,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_flush_dirty_tn"
-	Set gtmtypes("shmpool_buff_hdr",219,"off")=2592
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flushed_during_lockwait_tn")=218
+	Set gtmtypes("shmpool_buff_hdr",219,"name")="shmpool_buff_hdr.shadow_file_header.tp_crit_retries_tn"
+	Set gtmtypes("shmpool_buff_hdr",219,"off")=2584
 	Set gtmtypes("shmpool_buff_hdr",219,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",219,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_flush_dirty_tn")=219
-	Set gtmtypes("shmpool_buff_hdr",220,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_rip_wait_tn"
-	Set gtmtypes("shmpool_buff_hdr",220,"off")=2600
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.tp_crit_retries_tn")=219
+	Set gtmtypes("shmpool_buff_hdr",220,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_flush_dirty_tn"
+	Set gtmtypes("shmpool_buff_hdr",220,"off")=2592
 	Set gtmtypes("shmpool_buff_hdr",220,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",220,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_rip_wait_tn")=220
-	Set gtmtypes("shmpool_buff_hdr",221,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_buf_owner_stuck_tn"
-	Set gtmtypes("shmpool_buff_hdr",221,"off")=2608
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_flush_dirty_tn")=220
+	Set gtmtypes("shmpool_buff_hdr",221,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_rip_wait_tn"
+	Set gtmtypes("shmpool_buff_hdr",221,"off")=2600
 	Set gtmtypes("shmpool_buff_hdr",221,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",221,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_buf_owner_stuck_tn")=221
-	Set gtmtypes("shmpool_buff_hdr",222,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_out_of_design_tn"
-	Set gtmtypes("shmpool_buff_hdr",222,"off")=2616
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_rip_wait_tn")=221
+	Set gtmtypes("shmpool_buff_hdr",222,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_buf_owner_stuck_tn"
+	Set gtmtypes("shmpool_buff_hdr",222,"off")=2608
 	Set gtmtypes("shmpool_buff_hdr",222,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",222,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_out_of_design_tn")=222
-	Set gtmtypes("shmpool_buff_hdr",223,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_buf_owner_stuck_tn"
-	Set gtmtypes("shmpool_buff_hdr",223,"off")=2624
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_buf_owner_stuck_tn")=222
+	Set gtmtypes("shmpool_buff_hdr",223,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_out_of_design_tn"
+	Set gtmtypes("shmpool_buff_hdr",223,"off")=2616
 	Set gtmtypes("shmpool_buff_hdr",223,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",223,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_buf_owner_stuck_tn")=223
-	Set gtmtypes("shmpool_buff_hdr",224,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_out_of_design_tn"
-	Set gtmtypes("shmpool_buff_hdr",224,"off")=2632
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_out_of_design_tn")=223
+	Set gtmtypes("shmpool_buff_hdr",224,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_buf_owner_stuck_tn"
+	Set gtmtypes("shmpool_buff_hdr",224,"off")=2624
 	Set gtmtypes("shmpool_buff_hdr",224,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",224,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_out_of_design_tn")=224
-	Set gtmtypes("shmpool_buff_hdr",225,"name")="shmpool_buff_hdr.shadow_file_header.bt_put_flush_dirty_tn"
-	Set gtmtypes("shmpool_buff_hdr",225,"off")=2640
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_buf_owner_stuck_tn")=224
+	Set gtmtypes("shmpool_buff_hdr",225,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_out_of_design_tn"
+	Set gtmtypes("shmpool_buff_hdr",225,"off")=2632
 	Set gtmtypes("shmpool_buff_hdr",225,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",225,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bt_put_flush_dirty_tn")=225
-	Set gtmtypes("shmpool_buff_hdr",226,"name")="shmpool_buff_hdr.shadow_file_header.mlock_wakeups_tn"
-	Set gtmtypes("shmpool_buff_hdr",226,"off")=2648
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_out_of_design_tn")=225
+	Set gtmtypes("shmpool_buff_hdr",226,"name")="shmpool_buff_hdr.shadow_file_header.bt_put_flush_dirty_tn"
+	Set gtmtypes("shmpool_buff_hdr",226,"off")=2640
 	Set gtmtypes("shmpool_buff_hdr",226,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",226,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.mlock_wakeups_tn")=226
-	Set gtmtypes("shmpool_buff_hdr",227,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_recover_invoked_tn"
-	Set gtmtypes("shmpool_buff_hdr",227,"off")=2656
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bt_put_flush_dirty_tn")=226
+	Set gtmtypes("shmpool_buff_hdr",227,"name")="shmpool_buff_hdr.shadow_file_header.mlock_wakeups_tn"
+	Set gtmtypes("shmpool_buff_hdr",227,"off")=2648
 	Set gtmtypes("shmpool_buff_hdr",227,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",227,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_recover_invoked_tn")=227
-	Set gtmtypes("shmpool_buff_hdr",228,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_verify_passed_tn"
-	Set gtmtypes("shmpool_buff_hdr",228,"off")=2664
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.mlock_wakeups_tn")=227
+	Set gtmtypes("shmpool_buff_hdr",228,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_recover_invoked_tn"
+	Set gtmtypes("shmpool_buff_hdr",228,"off")=2656
 	Set gtmtypes("shmpool_buff_hdr",228,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",228,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_verify_passed_tn")=228
-	Set gtmtypes("shmpool_buff_hdr",229,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_tn"
-	Set gtmtypes("shmpool_buff_hdr",229,"off")=2672
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_recover_invoked_tn")=228
+	Set gtmtypes("shmpool_buff_hdr",229,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_verify_passed_tn"
+	Set gtmtypes("shmpool_buff_hdr",229,"off")=2664
 	Set gtmtypes("shmpool_buff_hdr",229,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",229,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_tn")=229
-	Set gtmtypes("shmpool_buff_hdr",230,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_tn"
-	Set gtmtypes("shmpool_buff_hdr",230,"off")=2680
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_verify_passed_tn")=229
+	Set gtmtypes("shmpool_buff_hdr",230,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_tn"
+	Set gtmtypes("shmpool_buff_hdr",230,"off")=2672
 	Set gtmtypes("shmpool_buff_hdr",230,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",230,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_tn")=230
-	Set gtmtypes("shmpool_buff_hdr",231,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_db_csh_getn_loopexceed_tn"
-	Set gtmtypes("shmpool_buff_hdr",231,"off")=2688
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_tn")=230
+	Set gtmtypes("shmpool_buff_hdr",231,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_tn"
+	Set gtmtypes("shmpool_buff_hdr",231,"off")=2680
 	Set gtmtypes("shmpool_buff_hdr",231,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",231,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_db_csh_getn_loopexceed_tn")=231
-	Set gtmtypes("shmpool_buff_hdr",232,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_tn"
-	Set gtmtypes("shmpool_buff_hdr",232,"off")=2696
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_tn")=231
+	Set gtmtypes("shmpool_buff_hdr",232,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_db_csh_getn_loopexceed_tn"
+	Set gtmtypes("shmpool_buff_hdr",232,"off")=2688
 	Set gtmtypes("shmpool_buff_hdr",232,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",232,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_tn")=232
-	Set gtmtypes("shmpool_buff_hdr",233,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_db_csh_get_tn"
-	Set gtmtypes("shmpool_buff_hdr",233,"off")=2704
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_db_csh_getn_loopexceed_tn")=232
+	Set gtmtypes("shmpool_buff_hdr",233,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_tn"
+	Set gtmtypes("shmpool_buff_hdr",233,"off")=2696
 	Set gtmtypes("shmpool_buff_hdr",233,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",233,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_db_csh_get_tn")=233
-	Set gtmtypes("shmpool_buff_hdr",234,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_wcsgetspace_tn"
-	Set gtmtypes("shmpool_buff_hdr",234,"off")=2712
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_tn")=233
+	Set gtmtypes("shmpool_buff_hdr",234,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_db_csh_get_tn"
+	Set gtmtypes("shmpool_buff_hdr",234,"off")=2704
 	Set gtmtypes("shmpool_buff_hdr",234,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",234,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_wcsgetspace_tn")=234
-	Set gtmtypes("shmpool_buff_hdr",235,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_t1_tn"
-	Set gtmtypes("shmpool_buff_hdr",235,"off")=2720
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_db_csh_get_tn")=234
+	Set gtmtypes("shmpool_buff_hdr",235,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_wcsgetspace_tn"
+	Set gtmtypes("shmpool_buff_hdr",235,"off")=2712
 	Set gtmtypes("shmpool_buff_hdr",235,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",235,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_t1_tn")=235
-	Set gtmtypes("shmpool_buff_hdr",236,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_bitmap_tn"
-	Set gtmtypes("shmpool_buff_hdr",236,"off")=2728
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_wcsgetspace_tn")=235
+	Set gtmtypes("shmpool_buff_hdr",236,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_t1_tn"
+	Set gtmtypes("shmpool_buff_hdr",236,"off")=2720
 	Set gtmtypes("shmpool_buff_hdr",236,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",236,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_bitmap_tn")=236
-	Set gtmtypes("shmpool_buff_hdr",237,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_jnl_cwset_tn"
-	Set gtmtypes("shmpool_buff_hdr",237,"off")=2736
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_t1_tn")=236
+	Set gtmtypes("shmpool_buff_hdr",237,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_bitmap_tn"
+	Set gtmtypes("shmpool_buff_hdr",237,"off")=2728
 	Set gtmtypes("shmpool_buff_hdr",237,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",237,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_jnl_cwset_tn")=237
-	Set gtmtypes("shmpool_buff_hdr",238,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_tn"
-	Set gtmtypes("shmpool_buff_hdr",238,"off")=2744
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_bitmap_tn")=237
+	Set gtmtypes("shmpool_buff_hdr",238,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_jnl_cwset_tn"
+	Set gtmtypes("shmpool_buff_hdr",238,"off")=2736
 	Set gtmtypes("shmpool_buff_hdr",238,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",238,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_tn")=238
-	Set gtmtypes("shmpool_buff_hdr",239,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_hist_tn"
-	Set gtmtypes("shmpool_buff_hdr",239,"off")=2752
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_jnl_cwset_tn")=238
+	Set gtmtypes("shmpool_buff_hdr",239,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_tn"
+	Set gtmtypes("shmpool_buff_hdr",239,"off")=2744
 	Set gtmtypes("shmpool_buff_hdr",239,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",239,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_hist_tn")=239
-	Set gtmtypes("shmpool_buff_hdr",240,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_hist1_nullbt_tn"
-	Set gtmtypes("shmpool_buff_hdr",240,"off")=2760
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_tn")=239
+	Set gtmtypes("shmpool_buff_hdr",240,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_hist_tn"
+	Set gtmtypes("shmpool_buff_hdr",240,"off")=2752
 	Set gtmtypes("shmpool_buff_hdr",240,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",240,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_hist1_nullbt_tn")=240
-	Set gtmtypes("shmpool_buff_hdr",241,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_tn"
-	Set gtmtypes("shmpool_buff_hdr",241,"off")=2768
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_hist_tn")=240
+	Set gtmtypes("shmpool_buff_hdr",241,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_hist1_nullbt_tn"
+	Set gtmtypes("shmpool_buff_hdr",241,"off")=2760
 	Set gtmtypes("shmpool_buff_hdr",241,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",241,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_tn")=241
-	Set gtmtypes("shmpool_buff_hdr",242,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_bitmap_nullbt_tn"
-	Set gtmtypes("shmpool_buff_hdr",242,"off")=2776
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_hist1_nullbt_tn")=241
+	Set gtmtypes("shmpool_buff_hdr",242,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_tn"
+	Set gtmtypes("shmpool_buff_hdr",242,"off")=2768
 	Set gtmtypes("shmpool_buff_hdr",242,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",242,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_bitmap_nullbt_tn")=242
-	Set gtmtypes("shmpool_buff_hdr",243,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_tn"
-	Set gtmtypes("shmpool_buff_hdr",243,"off")=2784
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_tn")=242
+	Set gtmtypes("shmpool_buff_hdr",243,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_bitmap_nullbt_tn"
+	Set gtmtypes("shmpool_buff_hdr",243,"off")=2776
 	Set gtmtypes("shmpool_buff_hdr",243,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",243,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_tn")=243
-	Set gtmtypes("shmpool_buff_hdr",244,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_jnl_cwset_tn"
-	Set gtmtypes("shmpool_buff_hdr",244,"off")=2792
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_bitmap_nullbt_tn")=243
+	Set gtmtypes("shmpool_buff_hdr",244,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_tn"
+	Set gtmtypes("shmpool_buff_hdr",244,"off")=2784
 	Set gtmtypes("shmpool_buff_hdr",244,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",244,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_jnl_cwset_tn")=244
-	Set gtmtypes("shmpool_buff_hdr",245,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_jnl_wcsflu_tn"
-	Set gtmtypes("shmpool_buff_hdr",245,"off")=2800
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_tn")=244
+	Set gtmtypes("shmpool_buff_hdr",245,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_jnl_cwset_tn"
+	Set gtmtypes("shmpool_buff_hdr",245,"off")=2792
 	Set gtmtypes("shmpool_buff_hdr",245,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",245,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_jnl_wcsflu_tn")=245
-	Set gtmtypes("shmpool_buff_hdr",246,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_get_too_many_loops_tn"
-	Set gtmtypes("shmpool_buff_hdr",246,"off")=2808
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_jnl_cwset_tn")=245
+	Set gtmtypes("shmpool_buff_hdr",246,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_jnl_wcsflu_tn"
+	Set gtmtypes("shmpool_buff_hdr",246,"off")=2800
 	Set gtmtypes("shmpool_buff_hdr",246,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",246,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_get_too_many_loops_tn")=246
-	Set gtmtypes("shmpool_buff_hdr",247,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tpckh_hist1_nullbt_tn"
-	Set gtmtypes("shmpool_buff_hdr",247,"off")=2816
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_jnl_wcsflu_tn")=246
+	Set gtmtypes("shmpool_buff_hdr",247,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_get_too_many_loops_tn"
+	Set gtmtypes("shmpool_buff_hdr",247,"off")=2808
 	Set gtmtypes("shmpool_buff_hdr",247,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",247,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tpckh_hist1_nullbt_tn")=247
-	Set gtmtypes("shmpool_buff_hdr",248,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_tn"
-	Set gtmtypes("shmpool_buff_hdr",248,"off")=2824
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_get_too_many_loops_tn")=247
+	Set gtmtypes("shmpool_buff_hdr",248,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tpckh_hist1_nullbt_tn"
+	Set gtmtypes("shmpool_buff_hdr",248,"off")=2816
 	Set gtmtypes("shmpool_buff_hdr",248,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",248,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_tn")=248
-	Set gtmtypes("shmpool_buff_hdr",249,"name")="shmpool_buff_hdr.shadow_file_header.jnl_blocked_writer_lost_tn"
-	Set gtmtypes("shmpool_buff_hdr",249,"off")=2832
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tpckh_hist1_nullbt_tn")=248
+	Set gtmtypes("shmpool_buff_hdr",249,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_tn"
+	Set gtmtypes("shmpool_buff_hdr",249,"off")=2824
 	Set gtmtypes("shmpool_buff_hdr",249,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",249,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_blocked_writer_lost_tn")=249
-	Set gtmtypes("shmpool_buff_hdr",250,"name")="shmpool_buff_hdr.shadow_file_header.jnl_blocked_writer_stuck_tn"
-	Set gtmtypes("shmpool_buff_hdr",250,"off")=2840
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_tn")=249
+	Set gtmtypes("shmpool_buff_hdr",250,"name")="shmpool_buff_hdr.shadow_file_header.jnl_blocked_writer_lost_tn"
+	Set gtmtypes("shmpool_buff_hdr",250,"off")=2832
 	Set gtmtypes("shmpool_buff_hdr",250,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",250,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_blocked_writer_stuck_tn")=250
-	Set gtmtypes("shmpool_buff_hdr",251,"name")="shmpool_buff_hdr.shadow_file_header.jnl_blocked_writer_blocked_tn"
-	Set gtmtypes("shmpool_buff_hdr",251,"off")=2848
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_blocked_writer_lost_tn")=250
+	Set gtmtypes("shmpool_buff_hdr",251,"name")="shmpool_buff_hdr.shadow_file_header.jnl_blocked_writer_stuck_tn"
+	Set gtmtypes("shmpool_buff_hdr",251,"off")=2840
 	Set gtmtypes("shmpool_buff_hdr",251,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",251,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_blocked_writer_blocked_tn")=251
-	Set gtmtypes("shmpool_buff_hdr",252,"name")="shmpool_buff_hdr.shadow_file_header.n_jnl_fsyncs_tn"
-	Set gtmtypes("shmpool_buff_hdr",252,"off")=2856
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_blocked_writer_stuck_tn")=251
+	Set gtmtypes("shmpool_buff_hdr",252,"name")="shmpool_buff_hdr.shadow_file_header.jnl_blocked_writer_blocked_tn"
+	Set gtmtypes("shmpool_buff_hdr",252,"off")=2848
 	Set gtmtypes("shmpool_buff_hdr",252,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",252,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_jnl_fsyncs_tn")=252
-	Set gtmtypes("shmpool_buff_hdr",253,"name")="shmpool_buff_hdr.shadow_file_header.n_jnl_fsync_tries_tn"
-	Set gtmtypes("shmpool_buff_hdr",253,"off")=2864
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_blocked_writer_blocked_tn")=252
+	Set gtmtypes("shmpool_buff_hdr",253,"name")="shmpool_buff_hdr.shadow_file_header.n_jnl_fsyncs_tn"
+	Set gtmtypes("shmpool_buff_hdr",253,"off")=2856
 	Set gtmtypes("shmpool_buff_hdr",253,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",253,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_jnl_fsync_tries_tn")=253
-	Set gtmtypes("shmpool_buff_hdr",254,"name")="shmpool_buff_hdr.shadow_file_header.n_jnl_fsync_recovers_tn"
-	Set gtmtypes("shmpool_buff_hdr",254,"off")=2872
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_jnl_fsyncs_tn")=253
+	Set gtmtypes("shmpool_buff_hdr",254,"name")="shmpool_buff_hdr.shadow_file_header.n_jnl_fsync_tries_tn"
+	Set gtmtypes("shmpool_buff_hdr",254,"off")=2864
 	Set gtmtypes("shmpool_buff_hdr",254,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",254,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_jnl_fsync_recovers_tn")=254
-	Set gtmtypes("shmpool_buff_hdr",255,"name")="shmpool_buff_hdr.shadow_file_header.n_db_fsyncs_tn"
-	Set gtmtypes("shmpool_buff_hdr",255,"off")=2880
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_jnl_fsync_tries_tn")=254
+	Set gtmtypes("shmpool_buff_hdr",255,"name")="shmpool_buff_hdr.shadow_file_header.n_jnl_fsync_recovers_tn"
+	Set gtmtypes("shmpool_buff_hdr",255,"off")=2872
 	Set gtmtypes("shmpool_buff_hdr",255,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",255,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_fsyncs_tn")=255
-	Set gtmtypes("shmpool_buff_hdr",256,"name")="shmpool_buff_hdr.shadow_file_header.n_db_fsyncs_in_crit_tn"
-	Set gtmtypes("shmpool_buff_hdr",256,"off")=2888
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_jnl_fsync_recovers_tn")=255
+	Set gtmtypes("shmpool_buff_hdr",256,"name")="shmpool_buff_hdr.shadow_file_header.n_db_fsyncs_tn"
+	Set gtmtypes("shmpool_buff_hdr",256,"off")=2880
 	Set gtmtypes("shmpool_buff_hdr",256,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",256,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_fsyncs_in_crit_tn")=256
-	Set gtmtypes("shmpool_buff_hdr",257,"name")="shmpool_buff_hdr.shadow_file_header.n_dbsync_timers_tn"
-	Set gtmtypes("shmpool_buff_hdr",257,"off")=2896
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_fsyncs_tn")=256
+	Set gtmtypes("shmpool_buff_hdr",257,"name")="shmpool_buff_hdr.shadow_file_header.n_db_fsyncs_in_crit_tn"
+	Set gtmtypes("shmpool_buff_hdr",257,"off")=2888
 	Set gtmtypes("shmpool_buff_hdr",257,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",257,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_dbsync_timers_tn")=257
-	Set gtmtypes("shmpool_buff_hdr",258,"name")="shmpool_buff_hdr.shadow_file_header.n_dbsync_writes_tn"
-	Set gtmtypes("shmpool_buff_hdr",258,"off")=2904
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_fsyncs_in_crit_tn")=257
+	Set gtmtypes("shmpool_buff_hdr",258,"name")="shmpool_buff_hdr.shadow_file_header.n_dbsync_timers_tn"
+	Set gtmtypes("shmpool_buff_hdr",258,"off")=2896
 	Set gtmtypes("shmpool_buff_hdr",258,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",258,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_dbsync_writes_tn")=258
-	Set gtmtypes("shmpool_buff_hdr",259,"name")="shmpool_buff_hdr.shadow_file_header.mutex_queue_full_tn"
-	Set gtmtypes("shmpool_buff_hdr",259,"off")=2912
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_dbsync_timers_tn")=258
+	Set gtmtypes("shmpool_buff_hdr",259,"name")="shmpool_buff_hdr.shadow_file_header.n_dbsync_writes_tn"
+	Set gtmtypes("shmpool_buff_hdr",259,"off")=2904
 	Set gtmtypes("shmpool_buff_hdr",259,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",259,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.mutex_queue_full_tn")=259
-	Set gtmtypes("shmpool_buff_hdr",260,"name")="shmpool_buff_hdr.shadow_file_header.wcb_bt_put_tn"
-	Set gtmtypes("shmpool_buff_hdr",260,"off")=2920
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_dbsync_writes_tn")=259
+	Set gtmtypes("shmpool_buff_hdr",260,"name")="shmpool_buff_hdr.shadow_file_header.mutex_queue_full_tn"
+	Set gtmtypes("shmpool_buff_hdr",260,"off")=2912
 	Set gtmtypes("shmpool_buff_hdr",260,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",260,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_bt_put_tn")=260
-	Set gtmtypes("shmpool_buff_hdr",261,"name")="shmpool_buff_hdr.shadow_file_header.wcb_mutex_salvage_tn"
-	Set gtmtypes("shmpool_buff_hdr",261,"off")=2928
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.mutex_queue_full_tn")=260
+	Set gtmtypes("shmpool_buff_hdr",261,"name")="shmpool_buff_hdr.shadow_file_header.wcb_bt_put_tn"
+	Set gtmtypes("shmpool_buff_hdr",261,"off")=2920
 	Set gtmtypes("shmpool_buff_hdr",261,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",261,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_mutex_salvage_tn")=261
-	Set gtmtypes("shmpool_buff_hdr",262,"name")="shmpool_buff_hdr.shadow_file_header.wcb_tp_grab_crit_tn"
-	Set gtmtypes("shmpool_buff_hdr",262,"off")=2936
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_bt_put_tn")=261
+	Set gtmtypes("shmpool_buff_hdr",262,"name")="shmpool_buff_hdr.shadow_file_header.wcb_mutex_salvage_tn"
+	Set gtmtypes("shmpool_buff_hdr",262,"off")=2928
 	Set gtmtypes("shmpool_buff_hdr",262,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",262,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_tp_grab_crit_tn")=262
-	Set gtmtypes("shmpool_buff_hdr",263,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_nocr_invcr_tn"
-	Set gtmtypes("shmpool_buff_hdr",263,"off")=2944
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_mutex_salvage_tn")=262
+	Set gtmtypes("shmpool_buff_hdr",263,"name")="shmpool_buff_hdr.shadow_file_header.wcb_tp_grab_crit_tn"
+	Set gtmtypes("shmpool_buff_hdr",263,"off")=2936
 	Set gtmtypes("shmpool_buff_hdr",263,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",263,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_nocr_invcr_tn")=263
-	Set gtmtypes("shmpool_buff_hdr",264,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_cr_invcr_tn"
-	Set gtmtypes("shmpool_buff_hdr",264,"off")=2952
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_tp_grab_crit_tn")=263
+	Set gtmtypes("shmpool_buff_hdr",264,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_nocr_invcr_tn"
+	Set gtmtypes("shmpool_buff_hdr",264,"off")=2944
 	Set gtmtypes("shmpool_buff_hdr",264,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",264,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_cr_invcr_tn")=264
-	Set gtmtypes("shmpool_buff_hdr",265,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_rip_wait_tn"
-	Set gtmtypes("shmpool_buff_hdr",265,"off")=2960
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_nocr_invcr_tn")=264
+	Set gtmtypes("shmpool_buff_hdr",265,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_cr_invcr_tn"
+	Set gtmtypes("shmpool_buff_hdr",265,"off")=2952
 	Set gtmtypes("shmpool_buff_hdr",265,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",265,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_rip_wait_tn")=265
-	Set gtmtypes("shmpool_buff_hdr",266,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirtyripwait_tn"
-	Set gtmtypes("shmpool_buff_hdr",266,"off")=2968
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_cr_invcr_tn")=265
+	Set gtmtypes("shmpool_buff_hdr",266,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_rip_wait_tn"
+	Set gtmtypes("shmpool_buff_hdr",266,"off")=2960
 	Set gtmtypes("shmpool_buff_hdr",266,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",266,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirtyripwait_tn")=266
-	Set gtmtypes("shmpool_buff_hdr",267,"name")="shmpool_buff_hdr.shadow_file_header.wcb_gds_rundown_tn"
-	Set gtmtypes("shmpool_buff_hdr",267,"off")=2976
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_rip_wait_tn")=266
+	Set gtmtypes("shmpool_buff_hdr",267,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirtyripwait_tn"
+	Set gtmtypes("shmpool_buff_hdr",267,"off")=2968
 	Set gtmtypes("shmpool_buff_hdr",267,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",267,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_gds_rundown_tn")=267
-	Set gtmtypes("shmpool_buff_hdr",268,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wcs_flu1_tn"
-	Set gtmtypes("shmpool_buff_hdr",268,"off")=2984
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirtyripwait_tn")=267
+	Set gtmtypes("shmpool_buff_hdr",268,"name")="shmpool_buff_hdr.shadow_file_header.wcb_gds_rundown_tn"
+	Set gtmtypes("shmpool_buff_hdr",268,"off")=2976
 	Set gtmtypes("shmpool_buff_hdr",268,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",268,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wcs_flu1_tn")=268
-	Set gtmtypes("shmpool_buff_hdr",269,"name")="shmpool_buff_hdr.shadow_file_header.wcb_mu_back_tn"
-	Set gtmtypes("shmpool_buff_hdr",269,"off")=2992
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_gds_rundown_tn")=268
+	Set gtmtypes("shmpool_buff_hdr",269,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wcs_flu1_tn"
+	Set gtmtypes("shmpool_buff_hdr",269,"off")=2984
 	Set gtmtypes("shmpool_buff_hdr",269,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",269,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_mu_back_tn")=269
-	Set gtmtypes("shmpool_buff_hdr",270,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirty_invcr_tn"
-	Set gtmtypes("shmpool_buff_hdr",270,"off")=3000
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wcs_flu1_tn")=269
+	Set gtmtypes("shmpool_buff_hdr",270,"name")="shmpool_buff_hdr.shadow_file_header.wcb_mu_back_tn"
+	Set gtmtypes("shmpool_buff_hdr",270,"off")=2992
 	Set gtmtypes("shmpool_buff_hdr",270,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",270,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirty_invcr_tn")=270
-	Set gtmtypes("shmpool_buff_hdr",271,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_wtfini_fail_tn"
-	Set gtmtypes("shmpool_buff_hdr",271,"off")=3008
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_mu_back_tn")=270
+	Set gtmtypes("shmpool_buff_hdr",271,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirty_invcr_tn"
+	Set gtmtypes("shmpool_buff_hdr",271,"off")=3000
 	Set gtmtypes("shmpool_buff_hdr",271,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",271,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_wtfini_fail_tn")=271
-	Set gtmtypes("shmpool_buff_hdr",272,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_twin_stuck_tn"
-	Set gtmtypes("shmpool_buff_hdr",272,"off")=3016
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirty_invcr_tn")=271
+	Set gtmtypes("shmpool_buff_hdr",272,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_wtfini_fail_tn"
+	Set gtmtypes("shmpool_buff_hdr",272,"off")=3008
 	Set gtmtypes("shmpool_buff_hdr",272,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",272,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_twin_stuck_tn")=272
-	Set gtmtypes("shmpool_buff_hdr",273,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_wrt_latch_stuck_tn"
-	Set gtmtypes("shmpool_buff_hdr",273,"off")=3024
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_wtfini_fail_tn")=272
+	Set gtmtypes("shmpool_buff_hdr",273,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_twin_stuck_tn"
+	Set gtmtypes("shmpool_buff_hdr",273,"off")=3016
 	Set gtmtypes("shmpool_buff_hdr",273,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",273,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_wrt_latch_stuck_tn")=273
-	Set gtmtypes("shmpool_buff_hdr",274,"name")="shmpool_buff_hdr.shadow_file_header.wcb_secshr_db_clnup_now_crit_tn"
-	Set gtmtypes("shmpool_buff_hdr",274,"off")=3032
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_twin_stuck_tn")=273
+	Set gtmtypes("shmpool_buff_hdr",274,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_wrt_latch_stuck_tn"
+	Set gtmtypes("shmpool_buff_hdr",274,"off")=3024
 	Set gtmtypes("shmpool_buff_hdr",274,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",274,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_secshr_db_clnup_now_crit_tn")=274
-	Set gtmtypes("shmpool_buff_hdr",275,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_bad_bt_index1_tn"
-	Set gtmtypes("shmpool_buff_hdr",275,"off")=3040
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_wrt_latch_stuck_tn")=274
+	Set gtmtypes("shmpool_buff_hdr",275,"name")="shmpool_buff_hdr.shadow_file_header.wcb_secshr_db_clnup_now_crit_tn"
+	Set gtmtypes("shmpool_buff_hdr",275,"off")=3032
 	Set gtmtypes("shmpool_buff_hdr",275,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",275,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_bad_bt_index1_tn")=275
-	Set gtmtypes("shmpool_buff_hdr",276,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_bad_bt_index2_tn"
-	Set gtmtypes("shmpool_buff_hdr",276,"off")=3048
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_secshr_db_clnup_now_crit_tn")=275
+	Set gtmtypes("shmpool_buff_hdr",276,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_bad_bt_index1_tn"
+	Set gtmtypes("shmpool_buff_hdr",276,"off")=3040
 	Set gtmtypes("shmpool_buff_hdr",276,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",276,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_bad_bt_index2_tn")=276
-	Set gtmtypes("shmpool_buff_hdr",277,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_crbtmismatch1_tn"
-	Set gtmtypes("shmpool_buff_hdr",277,"off")=3056
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_bad_bt_index1_tn")=276
+	Set gtmtypes("shmpool_buff_hdr",277,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_bad_bt_index2_tn"
+	Set gtmtypes("shmpool_buff_hdr",277,"off")=3048
 	Set gtmtypes("shmpool_buff_hdr",277,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",277,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_crbtmismatch1_tn")=277
-	Set gtmtypes("shmpool_buff_hdr",278,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_crbtmismatch2_tn"
-	Set gtmtypes("shmpool_buff_hdr",278,"off")=3064
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_bad_bt_index2_tn")=277
+	Set gtmtypes("shmpool_buff_hdr",278,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_crbtmismatch1_tn"
+	Set gtmtypes("shmpool_buff_hdr",278,"off")=3056
 	Set gtmtypes("shmpool_buff_hdr",278,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",278,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_crbtmismatch2_tn")=278
-	Set gtmtypes("shmpool_buff_hdr",279,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_crbtmismatch3_tn"
-	Set gtmtypes("shmpool_buff_hdr",279,"off")=3072
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_crbtmismatch1_tn")=278
+	Set gtmtypes("shmpool_buff_hdr",279,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_crbtmismatch2_tn"
+	Set gtmtypes("shmpool_buff_hdr",279,"off")=3064
 	Set gtmtypes("shmpool_buff_hdr",279,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",279,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_crbtmismatch3_tn")=279
-	Set gtmtypes("shmpool_buff_hdr",280,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_tn"
-	Set gtmtypes("shmpool_buff_hdr",280,"off")=3080
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_crbtmismatch2_tn")=279
+	Set gtmtypes("shmpool_buff_hdr",280,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_crbtmismatch3_tn"
+	Set gtmtypes("shmpool_buff_hdr",280,"off")=3072
 	Set gtmtypes("shmpool_buff_hdr",280,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",280,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_tn")=280
-	Set gtmtypes("shmpool_buff_hdr",281,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_tn"
-	Set gtmtypes("shmpool_buff_hdr",281,"off")=3088
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_crbtmismatch3_tn")=280
+	Set gtmtypes("shmpool_buff_hdr",281,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_tn"
+	Set gtmtypes("shmpool_buff_hdr",281,"off")=3080
 	Set gtmtypes("shmpool_buff_hdr",281,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",281,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_tn")=281
-	Set gtmtypes("shmpool_buff_hdr",282,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_tn"
-	Set gtmtypes("shmpool_buff_hdr",282,"off")=3096
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_tn")=281
+	Set gtmtypes("shmpool_buff_hdr",282,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_tn"
+	Set gtmtypes("shmpool_buff_hdr",282,"off")=3088
 	Set gtmtypes("shmpool_buff_hdr",282,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",282,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_tn")=282
-	Set gtmtypes("shmpool_buff_hdr",283,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_tn"
-	Set gtmtypes("shmpool_buff_hdr",283,"off")=3104
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_tn")=282
+	Set gtmtypes("shmpool_buff_hdr",283,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_tn"
+	Set gtmtypes("shmpool_buff_hdr",283,"off")=3096
 	Set gtmtypes("shmpool_buff_hdr",283,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",283,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_tn")=283
-	Set gtmtypes("shmpool_buff_hdr",284,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_tn"
-	Set gtmtypes("shmpool_buff_hdr",284,"off")=3112
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_tn")=283
+	Set gtmtypes("shmpool_buff_hdr",284,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_tn"
+	Set gtmtypes("shmpool_buff_hdr",284,"off")=3104
 	Set gtmtypes("shmpool_buff_hdr",284,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",284,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_tn")=284
-	Set gtmtypes("shmpool_buff_hdr",285,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_bt_get_tn"
-	Set gtmtypes("shmpool_buff_hdr",285,"off")=3120
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_tn")=284
+	Set gtmtypes("shmpool_buff_hdr",285,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_tn"
+	Set gtmtypes("shmpool_buff_hdr",285,"off")=3112
 	Set gtmtypes("shmpool_buff_hdr",285,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",285,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_bt_get_tn")=285
-	Set gtmtypes("shmpool_buff_hdr",286,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_tn"
-	Set gtmtypes("shmpool_buff_hdr",286,"off")=3128
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_tn")=285
+	Set gtmtypes("shmpool_buff_hdr",286,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_bt_get_tn"
+	Set gtmtypes("shmpool_buff_hdr",286,"off")=3120
 	Set gtmtypes("shmpool_buff_hdr",286,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",286,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_tn")=286
-	Set gtmtypes("shmpool_buff_hdr",287,"name")="shmpool_buff_hdr.shadow_file_header.wcb_bg_update_lckfail1_tn"
-	Set gtmtypes("shmpool_buff_hdr",287,"off")=3136
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_bt_get_tn")=286
+	Set gtmtypes("shmpool_buff_hdr",287,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_tn"
+	Set gtmtypes("shmpool_buff_hdr",287,"off")=3128
 	Set gtmtypes("shmpool_buff_hdr",287,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",287,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_bg_update_lckfail1_tn")=287
-	Set gtmtypes("shmpool_buff_hdr",288,"name")="shmpool_buff_hdr.shadow_file_header.wcb_bg_update_lckfail2_tn"
-	Set gtmtypes("shmpool_buff_hdr",288,"off")=3144
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_tn")=287
+	Set gtmtypes("shmpool_buff_hdr",288,"name")="shmpool_buff_hdr.shadow_file_header.wcb_bg_update_lckfail1_tn"
+	Set gtmtypes("shmpool_buff_hdr",288,"off")=3136
 	Set gtmtypes("shmpool_buff_hdr",288,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",288,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_bg_update_lckfail2_tn")=288
-	Set gtmtypes("shmpool_buff_hdr",289,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail1_tn"
-	Set gtmtypes("shmpool_buff_hdr",289,"off")=3152
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_bg_update_lckfail1_tn")=288
+	Set gtmtypes("shmpool_buff_hdr",289,"name")="shmpool_buff_hdr.shadow_file_header.wcb_bg_update_lckfail2_tn"
+	Set gtmtypes("shmpool_buff_hdr",289,"off")=3144
 	Set gtmtypes("shmpool_buff_hdr",289,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",289,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail1_tn")=289
-	Set gtmtypes("shmpool_buff_hdr",290,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail2_tn"
-	Set gtmtypes("shmpool_buff_hdr",290,"off")=3160
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_bg_update_lckfail2_tn")=289
+	Set gtmtypes("shmpool_buff_hdr",290,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail1_tn"
+	Set gtmtypes("shmpool_buff_hdr",290,"off")=3152
 	Set gtmtypes("shmpool_buff_hdr",290,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",290,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail2_tn")=290
-	Set gtmtypes("shmpool_buff_hdr",291,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail3_tn"
-	Set gtmtypes("shmpool_buff_hdr",291,"off")=3168
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail1_tn")=290
+	Set gtmtypes("shmpool_buff_hdr",291,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail2_tn"
+	Set gtmtypes("shmpool_buff_hdr",291,"off")=3160
 	Set gtmtypes("shmpool_buff_hdr",291,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",291,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail3_tn")=291
-	Set gtmtypes("shmpool_buff_hdr",292,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail4_tn"
-	Set gtmtypes("shmpool_buff_hdr",292,"off")=3176
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail2_tn")=291
+	Set gtmtypes("shmpool_buff_hdr",292,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail3_tn"
+	Set gtmtypes("shmpool_buff_hdr",292,"off")=3168
 	Set gtmtypes("shmpool_buff_hdr",292,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",292,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail4_tn")=292
-	Set gtmtypes("shmpool_buff_hdr",293,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail1_tn"
-	Set gtmtypes("shmpool_buff_hdr",293,"off")=3184
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail3_tn")=292
+	Set gtmtypes("shmpool_buff_hdr",293,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail4_tn"
+	Set gtmtypes("shmpool_buff_hdr",293,"off")=3176
 	Set gtmtypes("shmpool_buff_hdr",293,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",293,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail1_tn")=293
-	Set gtmtypes("shmpool_buff_hdr",294,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail2_tn"
-	Set gtmtypes("shmpool_buff_hdr",294,"off")=3192
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail4_tn")=293
+	Set gtmtypes("shmpool_buff_hdr",294,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail1_tn"
+	Set gtmtypes("shmpool_buff_hdr",294,"off")=3184
 	Set gtmtypes("shmpool_buff_hdr",294,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",294,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail2_tn")=294
-	Set gtmtypes("shmpool_buff_hdr",295,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail3_tn"
-	Set gtmtypes("shmpool_buff_hdr",295,"off")=3200
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail1_tn")=294
+	Set gtmtypes("shmpool_buff_hdr",295,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail2_tn"
+	Set gtmtypes("shmpool_buff_hdr",295,"off")=3192
 	Set gtmtypes("shmpool_buff_hdr",295,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",295,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail3_tn")=295
-	Set gtmtypes("shmpool_buff_hdr",296,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail4_tn"
-	Set gtmtypes("shmpool_buff_hdr",296,"off")=3208
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail2_tn")=295
+	Set gtmtypes("shmpool_buff_hdr",296,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail3_tn"
+	Set gtmtypes("shmpool_buff_hdr",296,"off")=3200
 	Set gtmtypes("shmpool_buff_hdr",296,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",296,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail4_tn")=296
-	Set gtmtypes("shmpool_buff_hdr",297,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirtystuck1_tn"
-	Set gtmtypes("shmpool_buff_hdr",297,"off")=3216
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail3_tn")=296
+	Set gtmtypes("shmpool_buff_hdr",297,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail4_tn"
+	Set gtmtypes("shmpool_buff_hdr",297,"off")=3208
 	Set gtmtypes("shmpool_buff_hdr",297,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",297,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirtystuck1_tn")=297
-	Set gtmtypes("shmpool_buff_hdr",298,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirtystuck2_tn"
-	Set gtmtypes("shmpool_buff_hdr",298,"off")=3224
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail4_tn")=297
+	Set gtmtypes("shmpool_buff_hdr",298,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirtystuck1_tn"
+	Set gtmtypes("shmpool_buff_hdr",298,"off")=3216
 	Set gtmtypes("shmpool_buff_hdr",298,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",298,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirtystuck2_tn")=298
-	Set gtmtypes("shmpool_buff_hdr",299,"name")="shmpool_buff_hdr.shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_tn"
-	Set gtmtypes("shmpool_buff_hdr",299,"off")=3232
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirtystuck1_tn")=298
+	Set gtmtypes("shmpool_buff_hdr",299,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirtystuck2_tn"
+	Set gtmtypes("shmpool_buff_hdr",299,"off")=3224
 	Set gtmtypes("shmpool_buff_hdr",299,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",299,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_tn")=299
-	Set gtmtypes("shmpool_buff_hdr",300,"name")="shmpool_buff_hdr.shadow_file_header.dwngrd_refmts_syncio_tn"
-	Set gtmtypes("shmpool_buff_hdr",300,"off")=3240
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirtystuck2_tn")=299
+	Set gtmtypes("shmpool_buff_hdr",300,"name")="shmpool_buff_hdr.shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_tn"
+	Set gtmtypes("shmpool_buff_hdr",300,"off")=3232
 	Set gtmtypes("shmpool_buff_hdr",300,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",300,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.dwngrd_refmts_syncio_tn")=300
-	Set gtmtypes("shmpool_buff_hdr",301,"name")="shmpool_buff_hdr.shadow_file_header.dwngrd_refmts_asyncio_tn"
-	Set gtmtypes("shmpool_buff_hdr",301,"off")=3248
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_tn")=300
+	Set gtmtypes("shmpool_buff_hdr",301,"name")="shmpool_buff_hdr.shadow_file_header.dwngrd_refmts_syncio_tn"
+	Set gtmtypes("shmpool_buff_hdr",301,"off")=3240
 	Set gtmtypes("shmpool_buff_hdr",301,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",301,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.dwngrd_refmts_asyncio_tn")=301
-	Set gtmtypes("shmpool_buff_hdr",302,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_refmt_harvests_tn"
-	Set gtmtypes("shmpool_buff_hdr",302,"off")=3256
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.dwngrd_refmts_syncio_tn")=301
+	Set gtmtypes("shmpool_buff_hdr",302,"name")="shmpool_buff_hdr.shadow_file_header.dwngrd_refmts_asyncio_tn"
+	Set gtmtypes("shmpool_buff_hdr",302,"off")=3248
 	Set gtmtypes("shmpool_buff_hdr",302,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",302,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_refmt_harvests_tn")=302
-	Set gtmtypes("shmpool_buff_hdr",303,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_recovery_tn"
-	Set gtmtypes("shmpool_buff_hdr",303,"off")=3264
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.dwngrd_refmts_asyncio_tn")=302
+	Set gtmtypes("shmpool_buff_hdr",303,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_refmt_harvests_tn"
+	Set gtmtypes("shmpool_buff_hdr",303,"off")=3256
 	Set gtmtypes("shmpool_buff_hdr",303,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",303,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_recovery_tn")=303
-	Set gtmtypes("shmpool_buff_hdr",304,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_blkd_by_sdc_tn"
-	Set gtmtypes("shmpool_buff_hdr",304,"off")=3272
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_refmt_harvests_tn")=303
+	Set gtmtypes("shmpool_buff_hdr",304,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_recovery_tn"
+	Set gtmtypes("shmpool_buff_hdr",304,"off")=3264
 	Set gtmtypes("shmpool_buff_hdr",304,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",304,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_blkd_by_sdc_tn")=304
-	Set gtmtypes("shmpool_buff_hdr",305,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_alloc_bbflush_tn"
-	Set gtmtypes("shmpool_buff_hdr",305,"off")=3280
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_recovery_tn")=304
+	Set gtmtypes("shmpool_buff_hdr",305,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_blkd_by_sdc_tn"
+	Set gtmtypes("shmpool_buff_hdr",305,"off")=3272
 	Set gtmtypes("shmpool_buff_hdr",305,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",305,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_alloc_bbflush_tn")=305
-	Set gtmtypes("shmpool_buff_hdr",306,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_released_replaced_tn"
-	Set gtmtypes("shmpool_buff_hdr",306,"off")=3288
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_blkd_by_sdc_tn")=305
+	Set gtmtypes("shmpool_buff_hdr",306,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_alloc_bbflush_tn"
+	Set gtmtypes("shmpool_buff_hdr",306,"off")=3280
 	Set gtmtypes("shmpool_buff_hdr",306,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",306,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_released_replaced_tn")=306
-	Set gtmtypes("shmpool_buff_hdr",307,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_released_io_complete_tn"
-	Set gtmtypes("shmpool_buff_hdr",307,"off")=3296
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_alloc_bbflush_tn")=306
+	Set gtmtypes("shmpool_buff_hdr",307,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_released_replaced_tn"
+	Set gtmtypes("shmpool_buff_hdr",307,"off")=3288
 	Set gtmtypes("shmpool_buff_hdr",307,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",307,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_released_io_complete_tn")=307
-	Set gtmtypes("shmpool_buff_hdr",308,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_kept_tn"
-	Set gtmtypes("shmpool_buff_hdr",308,"off")=3304
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_released_replaced_tn")=307
+	Set gtmtypes("shmpool_buff_hdr",308,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_released_io_complete_tn"
+	Set gtmtypes("shmpool_buff_hdr",308,"off")=3296
 	Set gtmtypes("shmpool_buff_hdr",308,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",308,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_kept_tn")=308
-	Set gtmtypes("shmpool_buff_hdr",309,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_ignored_tn"
-	Set gtmtypes("shmpool_buff_hdr",309,"off")=3312
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_released_io_complete_tn")=308
+	Set gtmtypes("shmpool_buff_hdr",309,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_kept_tn"
+	Set gtmtypes("shmpool_buff_hdr",309,"off")=3304
 	Set gtmtypes("shmpool_buff_hdr",309,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",309,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_ignored_tn")=309
-	Set gtmtypes("shmpool_buff_hdr",310,"name")="shmpool_buff_hdr.shadow_file_header.refmt_blk_chk_blk_freed_tn"
-	Set gtmtypes("shmpool_buff_hdr",310,"off")=3320
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_kept_tn")=309
+	Set gtmtypes("shmpool_buff_hdr",310,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_ignored_tn"
+	Set gtmtypes("shmpool_buff_hdr",310,"off")=3312
 	Set gtmtypes("shmpool_buff_hdr",310,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",310,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_blk_chk_blk_freed_tn")=310
-	Set gtmtypes("shmpool_buff_hdr",311,"name")="shmpool_buff_hdr.shadow_file_header.refmt_blk_chk_blk_kept_tn"
-	Set gtmtypes("shmpool_buff_hdr",311,"off")=3328
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_ignored_tn")=310
+	Set gtmtypes("shmpool_buff_hdr",311,"name")="shmpool_buff_hdr.shadow_file_header.refmt_blk_chk_blk_freed_tn"
+	Set gtmtypes("shmpool_buff_hdr",311,"off")=3320
 	Set gtmtypes("shmpool_buff_hdr",311,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",311,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_blk_chk_blk_kept_tn")=311
-	Set gtmtypes("shmpool_buff_hdr",312,"name")="shmpool_buff_hdr.shadow_file_header.active_lvl_trigger_tn"
-	Set gtmtypes("shmpool_buff_hdr",312,"off")=3336
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_blk_chk_blk_freed_tn")=311
+	Set gtmtypes("shmpool_buff_hdr",312,"name")="shmpool_buff_hdr.shadow_file_header.refmt_blk_chk_blk_kept_tn"
+	Set gtmtypes("shmpool_buff_hdr",312,"off")=3328
 	Set gtmtypes("shmpool_buff_hdr",312,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",312,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.active_lvl_trigger_tn")=312
-	Set gtmtypes("shmpool_buff_hdr",313,"name")="shmpool_buff_hdr.shadow_file_header.new_buff_tn"
-	Set gtmtypes("shmpool_buff_hdr",313,"off")=3344
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_blk_chk_blk_kept_tn")=312
+	Set gtmtypes("shmpool_buff_hdr",313,"name")="shmpool_buff_hdr.shadow_file_header.active_lvl_trigger_tn"
+	Set gtmtypes("shmpool_buff_hdr",313,"off")=3336
 	Set gtmtypes("shmpool_buff_hdr",313,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",313,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.new_buff_tn")=313
-	Set gtmtypes("shmpool_buff_hdr",314,"name")="shmpool_buff_hdr.shadow_file_header.phase2_commit_wait_sleep_in_crit_tn"
-	Set gtmtypes("shmpool_buff_hdr",314,"off")=3352
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.active_lvl_trigger_tn")=313
+	Set gtmtypes("shmpool_buff_hdr",314,"name")="shmpool_buff_hdr.shadow_file_header.new_buff_tn"
+	Set gtmtypes("shmpool_buff_hdr",314,"off")=3344
 	Set gtmtypes("shmpool_buff_hdr",314,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",314,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.phase2_commit_wait_sleep_in_crit_tn")=314
-	Set gtmtypes("shmpool_buff_hdr",315,"name")="shmpool_buff_hdr.shadow_file_header.phase2_commit_wait_sleep_no_crit_tn"
-	Set gtmtypes("shmpool_buff_hdr",315,"off")=3360
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.new_buff_tn")=314
+	Set gtmtypes("shmpool_buff_hdr",315,"name")="shmpool_buff_hdr.shadow_file_header.phase2_commit_wait_sleep_in_crit_tn"
+	Set gtmtypes("shmpool_buff_hdr",315,"off")=3352
 	Set gtmtypes("shmpool_buff_hdr",315,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",315,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.phase2_commit_wait_sleep_no_crit_tn")=315
-	Set gtmtypes("shmpool_buff_hdr",316,"name")="shmpool_buff_hdr.shadow_file_header.phase2_commit_wait_pidcnt_tn"
-	Set gtmtypes("shmpool_buff_hdr",316,"off")=3368
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.phase2_commit_wait_sleep_in_crit_tn")=315
+	Set gtmtypes("shmpool_buff_hdr",316,"name")="shmpool_buff_hdr.shadow_file_header.phase2_commit_wait_sleep_no_crit_tn"
+	Set gtmtypes("shmpool_buff_hdr",316,"off")=3360
 	Set gtmtypes("shmpool_buff_hdr",316,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",316,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.phase2_commit_wait_pidcnt_tn")=316
-	Set gtmtypes("shmpool_buff_hdr",317,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_intend_wait_tn"
-	Set gtmtypes("shmpool_buff_hdr",317,"off")=3376
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.phase2_commit_wait_sleep_no_crit_tn")=316
+	Set gtmtypes("shmpool_buff_hdr",317,"name")="shmpool_buff_hdr.shadow_file_header.phase2_commit_wait_pidcnt_tn"
+	Set gtmtypes("shmpool_buff_hdr",317,"off")=3368
 	Set gtmtypes("shmpool_buff_hdr",317,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",317,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_intend_wait_tn")=317
-	Set gtmtypes("shmpool_buff_hdr",318,"name")="shmpool_buff_hdr.shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_tn"
-	Set gtmtypes("shmpool_buff_hdr",318,"off")=3384
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.phase2_commit_wait_pidcnt_tn")=317
+	Set gtmtypes("shmpool_buff_hdr",318,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_intend_wait_tn"
+	Set gtmtypes("shmpool_buff_hdr",318,"off")=3376
 	Set gtmtypes("shmpool_buff_hdr",318,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",318,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_tn")=318
-	Set gtmtypes("shmpool_buff_hdr",319,"name")="shmpool_buff_hdr.shadow_file_header.wcb_phase2_commit_wait_tn"
-	Set gtmtypes("shmpool_buff_hdr",319,"off")=3392
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_intend_wait_tn")=318
+	Set gtmtypes("shmpool_buff_hdr",319,"name")="shmpool_buff_hdr.shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_tn"
+	Set gtmtypes("shmpool_buff_hdr",319,"off")=3384
 	Set gtmtypes("shmpool_buff_hdr",319,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",319,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_phase2_commit_wait_tn")=319
-	Set gtmtypes("shmpool_buff_hdr",320,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_calls_tn"
-	Set gtmtypes("shmpool_buff_hdr",320,"off")=3400
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_tn")=319
+	Set gtmtypes("shmpool_buff_hdr",320,"name")="shmpool_buff_hdr.shadow_file_header.wcb_phase2_commit_wait_tn"
+	Set gtmtypes("shmpool_buff_hdr",320,"off")=3392
 	Set gtmtypes("shmpool_buff_hdr",320,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",320,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_calls_tn")=320
-	Set gtmtypes("shmpool_buff_hdr",321,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_rip_tn"
-	Set gtmtypes("shmpool_buff_hdr",321,"off")=3408
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_phase2_commit_wait_tn")=320
+	Set gtmtypes("shmpool_buff_hdr",321,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_calls_tn"
+	Set gtmtypes("shmpool_buff_hdr",321,"off")=3400
 	Set gtmtypes("shmpool_buff_hdr",321,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",321,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_rip_tn")=321
-	Set gtmtypes("shmpool_buff_hdr",322,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_in_tend_tn"
-	Set gtmtypes("shmpool_buff_hdr",322,"off")=3416
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_calls_tn")=321
+	Set gtmtypes("shmpool_buff_hdr",322,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_rip_tn"
+	Set gtmtypes("shmpool_buff_hdr",322,"off")=3408
 	Set gtmtypes("shmpool_buff_hdr",322,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",322,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_in_tend_tn")=322
-	Set gtmtypes("shmpool_buff_hdr",323,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_search_blk_tn"
-	Set gtmtypes("shmpool_buff_hdr",323,"off")=3424
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_rip_tn")=322
+	Set gtmtypes("shmpool_buff_hdr",323,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_in_tend_tn"
+	Set gtmtypes("shmpool_buff_hdr",323,"off")=3416
 	Set gtmtypes("shmpool_buff_hdr",323,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",323,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_search_blk_tn")=323
-	Set gtmtypes("shmpool_buff_hdr",324,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_new_rec_tn"
-	Set gtmtypes("shmpool_buff_hdr",324,"off")=3432
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_in_tend_tn")=323
+	Set gtmtypes("shmpool_buff_hdr",324,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_search_blk_tn"
+	Set gtmtypes("shmpool_buff_hdr",324,"off")=3424
 	Set gtmtypes("shmpool_buff_hdr",324,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",324,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_new_rec_tn")=324
-	Set gtmtypes("shmpool_buff_hdr",325,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_rec_size_tn"
-	Set gtmtypes("shmpool_buff_hdr",325,"off")=3440
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_search_blk_tn")=324
+	Set gtmtypes("shmpool_buff_hdr",325,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_new_rec_tn"
+	Set gtmtypes("shmpool_buff_hdr",325,"off")=3432
 	Set gtmtypes("shmpool_buff_hdr",325,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",325,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_rec_size_tn")=325
-	Set gtmtypes("shmpool_buff_hdr",326,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_rec_cmpc_tn"
-	Set gtmtypes("shmpool_buff_hdr",326,"off")=3448
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_new_rec_tn")=325
+	Set gtmtypes("shmpool_buff_hdr",326,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_rec_size_tn"
+	Set gtmtypes("shmpool_buff_hdr",326,"off")=3440
 	Set gtmtypes("shmpool_buff_hdr",326,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",326,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_rec_cmpc_tn")=326
-	Set gtmtypes("shmpool_buff_hdr",327,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_blk_fini_tn"
-	Set gtmtypes("shmpool_buff_hdr",327,"off")=3456
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_rec_size_tn")=326
+	Set gtmtypes("shmpool_buff_hdr",327,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_rec_cmpc_tn"
+	Set gtmtypes("shmpool_buff_hdr",327,"off")=3448
 	Set gtmtypes("shmpool_buff_hdr",327,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",327,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_blk_fini_tn")=327
-	Set gtmtypes("shmpool_buff_hdr",328,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_blk_split_tn"
-	Set gtmtypes("shmpool_buff_hdr",328,"off")=3464
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_rec_cmpc_tn")=327
+	Set gtmtypes("shmpool_buff_hdr",328,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_blk_fini_tn"
+	Set gtmtypes("shmpool_buff_hdr",328,"off")=3456
 	Set gtmtypes("shmpool_buff_hdr",328,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",328,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_blk_split_tn")=328
-	Set gtmtypes("shmpool_buff_hdr",329,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_ripsleep_cnt_tn"
-	Set gtmtypes("shmpool_buff_hdr",329,"off")=3472
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_blk_fini_tn")=328
+	Set gtmtypes("shmpool_buff_hdr",329,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_blk_split_tn"
+	Set gtmtypes("shmpool_buff_hdr",329,"off")=3464
 	Set gtmtypes("shmpool_buff_hdr",329,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",329,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_ripsleep_cnt_tn")=329
-	Set gtmtypes("shmpool_buff_hdr",330,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_ripsleep_nblks_tn"
-	Set gtmtypes("shmpool_buff_hdr",330,"off")=3480
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_blk_split_tn")=329
+	Set gtmtypes("shmpool_buff_hdr",330,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_ripsleep_cnt_tn"
+	Set gtmtypes("shmpool_buff_hdr",330,"off")=3472
 	Set gtmtypes("shmpool_buff_hdr",330,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",330,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_ripsleep_nblks_tn")=330
-	Set gtmtypes("shmpool_buff_hdr",331,"name")="shmpool_buff_hdr.shadow_file_header.bg_trc_rec_tn_filler"
-	Set gtmtypes("shmpool_buff_hdr",331,"off")=3488
-	Set gtmtypes("shmpool_buff_hdr",331,"len")=112
-	Set gtmtypes("shmpool_buff_hdr",331,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bg_trc_rec_tn_filler")=331
-	Set gtmtypes("shmpool_buff_hdr",332,"name")="shmpool_buff_hdr.shadow_file_header.total_buffer_flush_cntr"
-	Set gtmtypes("shmpool_buff_hdr",332,"off")=3600
-	Set gtmtypes("shmpool_buff_hdr",332,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",332,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.total_buffer_flush_cntr")=332
-	Set gtmtypes("shmpool_buff_hdr",333,"name")="shmpool_buff_hdr.shadow_file_header.bufct_buffer_flush_cntr"
-	Set gtmtypes("shmpool_buff_hdr",333,"off")=3604
-	Set gtmtypes("shmpool_buff_hdr",333,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",333,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bufct_buffer_flush_cntr")=333
-	Set gtmtypes("shmpool_buff_hdr",334,"name")="shmpool_buff_hdr.shadow_file_header.bufct_buffer_flush_loop_cntr"
-	Set gtmtypes("shmpool_buff_hdr",334,"off")=3608
-	Set gtmtypes("shmpool_buff_hdr",334,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",334,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bufct_buffer_flush_loop_cntr")=334
-	Set gtmtypes("shmpool_buff_hdr",335,"name")="shmpool_buff_hdr.shadow_file_header.wrt_calls_cntr"
-	Set gtmtypes("shmpool_buff_hdr",335,"off")=3612
-	Set gtmtypes("shmpool_buff_hdr",335,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",335,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_calls_cntr")=335
-	Set gtmtypes("shmpool_buff_hdr",336,"name")="shmpool_buff_hdr.shadow_file_header.wrt_count_cntr"
-	Set gtmtypes("shmpool_buff_hdr",336,"off")=3616
-	Set gtmtypes("shmpool_buff_hdr",336,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",336,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_count_cntr")=336
-	Set gtmtypes("shmpool_buff_hdr",337,"name")="shmpool_buff_hdr.shadow_file_header.wrt_blocked_cntr"
-	Set gtmtypes("shmpool_buff_hdr",337,"off")=3620
-	Set gtmtypes("shmpool_buff_hdr",337,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",337,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_blocked_cntr")=337
-	Set gtmtypes("shmpool_buff_hdr",338,"name")="shmpool_buff_hdr.shadow_file_header.wrt_busy_cntr"
-	Set gtmtypes("shmpool_buff_hdr",338,"off")=3624
-	Set gtmtypes("shmpool_buff_hdr",338,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",338,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_busy_cntr")=338
-	Set gtmtypes("shmpool_buff_hdr",339,"name")="shmpool_buff_hdr.shadow_file_header.wrt_noblks_wrtn_cntr"
-	Set gtmtypes("shmpool_buff_hdr",339,"off")=3628
-	Set gtmtypes("shmpool_buff_hdr",339,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",339,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_noblks_wrtn_cntr")=339
-	Set gtmtypes("shmpool_buff_hdr",340,"name")="shmpool_buff_hdr.shadow_file_header.reserved_bgtrcrec1_cntr"
-	Set gtmtypes("shmpool_buff_hdr",340,"off")=3632
-	Set gtmtypes("shmpool_buff_hdr",340,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",340,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reserved_bgtrcrec1_cntr")=340
-	Set gtmtypes("shmpool_buff_hdr",341,"name")="shmpool_buff_hdr.shadow_file_header.reserved_bgtrcrec2_cntr"
-	Set gtmtypes("shmpool_buff_hdr",341,"off")=3636
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_ripsleep_cnt_tn")=330
+	Set gtmtypes("shmpool_buff_hdr",331,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_ripsleep_nblks_tn"
+	Set gtmtypes("shmpool_buff_hdr",331,"off")=3480
+	Set gtmtypes("shmpool_buff_hdr",331,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",331,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_ripsleep_nblks_tn")=331
+	Set gtmtypes("shmpool_buff_hdr",332,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wtfini_invoked_tn"
+	Set gtmtypes("shmpool_buff_hdr",332,"off")=3488
+	Set gtmtypes("shmpool_buff_hdr",332,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",332,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wtfini_invoked_tn")=332
+	Set gtmtypes("shmpool_buff_hdr",333,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wterror_invoked_tn"
+	Set gtmtypes("shmpool_buff_hdr",333,"off")=3496
+	Set gtmtypes("shmpool_buff_hdr",333,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",333,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wterror_invoked_tn")=333
+	Set gtmtypes("shmpool_buff_hdr",334,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wt_restart_invoked_tn"
+	Set gtmtypes("shmpool_buff_hdr",334,"off")=3504
+	Set gtmtypes("shmpool_buff_hdr",334,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",334,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wt_restart_invoked_tn")=334
+	Set gtmtypes("shmpool_buff_hdr",335,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wt_restart_eagain_tn"
+	Set gtmtypes("shmpool_buff_hdr",335,"off")=3512
+	Set gtmtypes("shmpool_buff_hdr",335,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",335,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wt_restart_eagain_tn")=335
+	Set gtmtypes("shmpool_buff_hdr",336,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wt_restart_reinsert_tn"
+	Set gtmtypes("shmpool_buff_hdr",336,"off")=3520
+	Set gtmtypes("shmpool_buff_hdr",336,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",336,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wt_restart_reinsert_tn")=336
+	Set gtmtypes("shmpool_buff_hdr",337,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wtstart_eagain_tn"
+	Set gtmtypes("shmpool_buff_hdr",337,"off")=3528
+	Set gtmtypes("shmpool_buff_hdr",337,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",337,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wtstart_eagain_tn")=337
+	Set gtmtypes("shmpool_buff_hdr",338,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wtstart_eagain_incrit_tn"
+	Set gtmtypes("shmpool_buff_hdr",338,"off")=3536
+	Set gtmtypes("shmpool_buff_hdr",338,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",338,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wtstart_eagain_incrit_tn")=338
+	Set gtmtypes("shmpool_buff_hdr",339,"name")="shmpool_buff_hdr.shadow_file_header.async_restart_eagain_tn"
+	Set gtmtypes("shmpool_buff_hdr",339,"off")=3544
+	Set gtmtypes("shmpool_buff_hdr",339,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",339,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.async_restart_eagain_tn")=339
+	Set gtmtypes("shmpool_buff_hdr",340,"name")="shmpool_buff_hdr.shadow_file_header.bg_trc_rec_tn_filler"
+	Set gtmtypes("shmpool_buff_hdr",340,"off")=3552
+	Set gtmtypes("shmpool_buff_hdr",340,"len")=48
+	Set gtmtypes("shmpool_buff_hdr",340,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bg_trc_rec_tn_filler")=340
+	Set gtmtypes("shmpool_buff_hdr",341,"name")="shmpool_buff_hdr.shadow_file_header.total_buffer_flush_cntr"
+	Set gtmtypes("shmpool_buff_hdr",341,"off")=3600
 	Set gtmtypes("shmpool_buff_hdr",341,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",341,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reserved_bgtrcrec2_cntr")=341
-	Set gtmtypes("shmpool_buff_hdr",342,"name")="shmpool_buff_hdr.shadow_file_header.reserved_bgtrcrec3_cntr"
-	Set gtmtypes("shmpool_buff_hdr",342,"off")=3640
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.total_buffer_flush_cntr")=341
+	Set gtmtypes("shmpool_buff_hdr",342,"name")="shmpool_buff_hdr.shadow_file_header.bufct_buffer_flush_cntr"
+	Set gtmtypes("shmpool_buff_hdr",342,"off")=3604
 	Set gtmtypes("shmpool_buff_hdr",342,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",342,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reserved_bgtrcrec3_cntr")=342
-	Set gtmtypes("shmpool_buff_hdr",343,"name")="shmpool_buff_hdr.shadow_file_header.lost_block_recovery_cntr"
-	Set gtmtypes("shmpool_buff_hdr",343,"off")=3644
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bufct_buffer_flush_cntr")=342
+	Set gtmtypes("shmpool_buff_hdr",343,"name")="shmpool_buff_hdr.shadow_file_header.bufct_buffer_flush_loop_cntr"
+	Set gtmtypes("shmpool_buff_hdr",343,"off")=3608
 	Set gtmtypes("shmpool_buff_hdr",343,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",343,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.lost_block_recovery_cntr")=343
-	Set gtmtypes("shmpool_buff_hdr",344,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_onln_rlbk_cntr"
-	Set gtmtypes("shmpool_buff_hdr",344,"off")=3648
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bufct_buffer_flush_loop_cntr")=343
+	Set gtmtypes("shmpool_buff_hdr",344,"name")="shmpool_buff_hdr.shadow_file_header.wrt_calls_cntr"
+	Set gtmtypes("shmpool_buff_hdr",344,"off")=3612
 	Set gtmtypes("shmpool_buff_hdr",344,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",344,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_onln_rlbk_cntr")=344
-	Set gtmtypes("shmpool_buff_hdr",345,"name")="shmpool_buff_hdr.shadow_file_header.stale_cntr"
-	Set gtmtypes("shmpool_buff_hdr",345,"off")=3652
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_calls_cntr")=344
+	Set gtmtypes("shmpool_buff_hdr",345,"name")="shmpool_buff_hdr.shadow_file_header.wrt_count_cntr"
+	Set gtmtypes("shmpool_buff_hdr",345,"off")=3616
 	Set gtmtypes("shmpool_buff_hdr",345,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",345,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_cntr")=345
-	Set gtmtypes("shmpool_buff_hdr",346,"name")="shmpool_buff_hdr.shadow_file_header.starved_cntr"
-	Set gtmtypes("shmpool_buff_hdr",346,"off")=3656
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_count_cntr")=345
+	Set gtmtypes("shmpool_buff_hdr",346,"name")="shmpool_buff_hdr.shadow_file_header.wrt_blocked_cntr"
+	Set gtmtypes("shmpool_buff_hdr",346,"off")=3620
 	Set gtmtypes("shmpool_buff_hdr",346,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",346,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.starved_cntr")=346
-	Set gtmtypes("shmpool_buff_hdr",347,"name")="shmpool_buff_hdr.shadow_file_header.stale_timer_started_cntr"
-	Set gtmtypes("shmpool_buff_hdr",347,"off")=3660
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_blocked_cntr")=346
+	Set gtmtypes("shmpool_buff_hdr",347,"name")="shmpool_buff_hdr.shadow_file_header.wrt_busy_cntr"
+	Set gtmtypes("shmpool_buff_hdr",347,"off")=3624
 	Set gtmtypes("shmpool_buff_hdr",347,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",347,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_timer_started_cntr")=347
-	Set gtmtypes("shmpool_buff_hdr",348,"name")="shmpool_buff_hdr.shadow_file_header.stale_timer_pop_cntr"
-	Set gtmtypes("shmpool_buff_hdr",348,"off")=3664
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_busy_cntr")=347
+	Set gtmtypes("shmpool_buff_hdr",348,"name")="shmpool_buff_hdr.shadow_file_header.wrt_noblks_wrtn_cntr"
+	Set gtmtypes("shmpool_buff_hdr",348,"off")=3628
 	Set gtmtypes("shmpool_buff_hdr",348,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",348,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_timer_pop_cntr")=348
-	Set gtmtypes("shmpool_buff_hdr",349,"name")="shmpool_buff_hdr.shadow_file_header.stale_process_defer_cntr"
-	Set gtmtypes("shmpool_buff_hdr",349,"off")=3668
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_noblks_wrtn_cntr")=348
+	Set gtmtypes("shmpool_buff_hdr",349,"name")="shmpool_buff_hdr.shadow_file_header.reserved_bgtrcrec1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",349,"off")=3632
 	Set gtmtypes("shmpool_buff_hdr",349,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",349,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_process_defer_cntr")=349
-	Set gtmtypes("shmpool_buff_hdr",350,"name")="shmpool_buff_hdr.shadow_file_header.stale_defer_processed_cntr"
-	Set gtmtypes("shmpool_buff_hdr",350,"off")=3672
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reserved_bgtrcrec1_cntr")=349
+	Set gtmtypes("shmpool_buff_hdr",350,"name")="shmpool_buff_hdr.shadow_file_header.reserved_bgtrcrec2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",350,"off")=3636
 	Set gtmtypes("shmpool_buff_hdr",350,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",350,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_defer_processed_cntr")=350
-	Set gtmtypes("shmpool_buff_hdr",351,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flush_cntr"
-	Set gtmtypes("shmpool_buff_hdr",351,"off")=3676
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reserved_bgtrcrec2_cntr")=350
+	Set gtmtypes("shmpool_buff_hdr",351,"name")="shmpool_buff_hdr.shadow_file_header.reserved_bgtrcrec3_cntr"
+	Set gtmtypes("shmpool_buff_hdr",351,"off")=3640
 	Set gtmtypes("shmpool_buff_hdr",351,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",351,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flush_cntr")=351
-	Set gtmtypes("shmpool_buff_hdr",352,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flush_loop_cntr"
-	Set gtmtypes("shmpool_buff_hdr",352,"off")=3680
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reserved_bgtrcrec3_cntr")=351
+	Set gtmtypes("shmpool_buff_hdr",352,"name")="shmpool_buff_hdr.shadow_file_header.lost_block_recovery_cntr"
+	Set gtmtypes("shmpool_buff_hdr",352,"off")=3644
 	Set gtmtypes("shmpool_buff_hdr",352,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",352,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flush_loop_cntr")=352
-	Set gtmtypes("shmpool_buff_hdr",353,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flush_retries_cntr"
-	Set gtmtypes("shmpool_buff_hdr",353,"off")=3684
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.lost_block_recovery_cntr")=352
+	Set gtmtypes("shmpool_buff_hdr",353,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_onln_rlbk_cntr"
+	Set gtmtypes("shmpool_buff_hdr",353,"off")=3648
 	Set gtmtypes("shmpool_buff_hdr",353,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",353,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flush_retries_cntr")=353
-	Set gtmtypes("shmpool_buff_hdr",354,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flushed_during_lockwait_cntr"
-	Set gtmtypes("shmpool_buff_hdr",354,"off")=3688
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_onln_rlbk_cntr")=353
+	Set gtmtypes("shmpool_buff_hdr",354,"name")="shmpool_buff_hdr.shadow_file_header.stale_cntr"
+	Set gtmtypes("shmpool_buff_hdr",354,"off")=3652
 	Set gtmtypes("shmpool_buff_hdr",354,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",354,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flushed_during_lockwait_cntr")=354
-	Set gtmtypes("shmpool_buff_hdr",355,"name")="shmpool_buff_hdr.shadow_file_header.tp_crit_retries_cntr"
-	Set gtmtypes("shmpool_buff_hdr",355,"off")=3692
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_cntr")=354
+	Set gtmtypes("shmpool_buff_hdr",355,"name")="shmpool_buff_hdr.shadow_file_header.starved_cntr"
+	Set gtmtypes("shmpool_buff_hdr",355,"off")=3656
 	Set gtmtypes("shmpool_buff_hdr",355,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",355,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.tp_crit_retries_cntr")=355
-	Set gtmtypes("shmpool_buff_hdr",356,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_flush_dirty_cntr"
-	Set gtmtypes("shmpool_buff_hdr",356,"off")=3696
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.starved_cntr")=355
+	Set gtmtypes("shmpool_buff_hdr",356,"name")="shmpool_buff_hdr.shadow_file_header.stale_timer_started_cntr"
+	Set gtmtypes("shmpool_buff_hdr",356,"off")=3660
 	Set gtmtypes("shmpool_buff_hdr",356,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",356,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_flush_dirty_cntr")=356
-	Set gtmtypes("shmpool_buff_hdr",357,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_rip_wait_cntr"
-	Set gtmtypes("shmpool_buff_hdr",357,"off")=3700
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_timer_started_cntr")=356
+	Set gtmtypes("shmpool_buff_hdr",357,"name")="shmpool_buff_hdr.shadow_file_header.stale_timer_pop_cntr"
+	Set gtmtypes("shmpool_buff_hdr",357,"off")=3664
 	Set gtmtypes("shmpool_buff_hdr",357,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",357,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_rip_wait_cntr")=357
-	Set gtmtypes("shmpool_buff_hdr",358,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_buf_owner_stuck_cntr"
-	Set gtmtypes("shmpool_buff_hdr",358,"off")=3704
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_timer_pop_cntr")=357
+	Set gtmtypes("shmpool_buff_hdr",358,"name")="shmpool_buff_hdr.shadow_file_header.stale_process_defer_cntr"
+	Set gtmtypes("shmpool_buff_hdr",358,"off")=3668
 	Set gtmtypes("shmpool_buff_hdr",358,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",358,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_buf_owner_stuck_cntr")=358
-	Set gtmtypes("shmpool_buff_hdr",359,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_out_of_design_cntr"
-	Set gtmtypes("shmpool_buff_hdr",359,"off")=3708
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_process_defer_cntr")=358
+	Set gtmtypes("shmpool_buff_hdr",359,"name")="shmpool_buff_hdr.shadow_file_header.stale_defer_processed_cntr"
+	Set gtmtypes("shmpool_buff_hdr",359,"off")=3672
 	Set gtmtypes("shmpool_buff_hdr",359,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",359,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_out_of_design_cntr")=359
-	Set gtmtypes("shmpool_buff_hdr",360,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_buf_owner_stuck_cntr"
-	Set gtmtypes("shmpool_buff_hdr",360,"off")=3712
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_defer_processed_cntr")=359
+	Set gtmtypes("shmpool_buff_hdr",360,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flush_cntr"
+	Set gtmtypes("shmpool_buff_hdr",360,"off")=3676
 	Set gtmtypes("shmpool_buff_hdr",360,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",360,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_buf_owner_stuck_cntr")=360
-	Set gtmtypes("shmpool_buff_hdr",361,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_out_of_design_cntr"
-	Set gtmtypes("shmpool_buff_hdr",361,"off")=3716
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flush_cntr")=360
+	Set gtmtypes("shmpool_buff_hdr",361,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flush_loop_cntr"
+	Set gtmtypes("shmpool_buff_hdr",361,"off")=3680
 	Set gtmtypes("shmpool_buff_hdr",361,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",361,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_out_of_design_cntr")=361
-	Set gtmtypes("shmpool_buff_hdr",362,"name")="shmpool_buff_hdr.shadow_file_header.bt_put_flush_dirty_cntr"
-	Set gtmtypes("shmpool_buff_hdr",362,"off")=3720
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flush_loop_cntr")=361
+	Set gtmtypes("shmpool_buff_hdr",362,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flush_retries_cntr"
+	Set gtmtypes("shmpool_buff_hdr",362,"off")=3684
 	Set gtmtypes("shmpool_buff_hdr",362,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",362,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bt_put_flush_dirty_cntr")=362
-	Set gtmtypes("shmpool_buff_hdr",363,"name")="shmpool_buff_hdr.shadow_file_header.mlock_wakeups_cntr"
-	Set gtmtypes("shmpool_buff_hdr",363,"off")=3724
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flush_retries_cntr")=362
+	Set gtmtypes("shmpool_buff_hdr",363,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flushed_during_lockwait_cntr"
+	Set gtmtypes("shmpool_buff_hdr",363,"off")=3688
 	Set gtmtypes("shmpool_buff_hdr",363,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",363,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.mlock_wakeups_cntr")=363
-	Set gtmtypes("shmpool_buff_hdr",364,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_recover_invoked_cntr"
-	Set gtmtypes("shmpool_buff_hdr",364,"off")=3728
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flushed_during_lockwait_cntr")=363
+	Set gtmtypes("shmpool_buff_hdr",364,"name")="shmpool_buff_hdr.shadow_file_header.tp_crit_retries_cntr"
+	Set gtmtypes("shmpool_buff_hdr",364,"off")=3692
 	Set gtmtypes("shmpool_buff_hdr",364,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",364,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_recover_invoked_cntr")=364
-	Set gtmtypes("shmpool_buff_hdr",365,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_verify_passed_cntr"
-	Set gtmtypes("shmpool_buff_hdr",365,"off")=3732
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.tp_crit_retries_cntr")=364
+	Set gtmtypes("shmpool_buff_hdr",365,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_flush_dirty_cntr"
+	Set gtmtypes("shmpool_buff_hdr",365,"off")=3696
 	Set gtmtypes("shmpool_buff_hdr",365,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",365,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_verify_passed_cntr")=365
-	Set gtmtypes("shmpool_buff_hdr",366,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr"
-	Set gtmtypes("shmpool_buff_hdr",366,"off")=3736
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_flush_dirty_cntr")=365
+	Set gtmtypes("shmpool_buff_hdr",366,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_rip_wait_cntr"
+	Set gtmtypes("shmpool_buff_hdr",366,"off")=3700
 	Set gtmtypes("shmpool_buff_hdr",366,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",366,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr")=366
-	Set gtmtypes("shmpool_buff_hdr",367,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_cntr"
-	Set gtmtypes("shmpool_buff_hdr",367,"off")=3740
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_rip_wait_cntr")=366
+	Set gtmtypes("shmpool_buff_hdr",367,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_buf_owner_stuck_cntr"
+	Set gtmtypes("shmpool_buff_hdr",367,"off")=3704
 	Set gtmtypes("shmpool_buff_hdr",367,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",367,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_cntr")=367
-	Set gtmtypes("shmpool_buff_hdr",368,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_db_csh_getn_loopexceed_cntr"
-	Set gtmtypes("shmpool_buff_hdr",368,"off")=3744
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_buf_owner_stuck_cntr")=367
+	Set gtmtypes("shmpool_buff_hdr",368,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_out_of_design_cntr"
+	Set gtmtypes("shmpool_buff_hdr",368,"off")=3708
 	Set gtmtypes("shmpool_buff_hdr",368,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",368,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_db_csh_getn_loopexceed_cntr")=368
-	Set gtmtypes("shmpool_buff_hdr",369,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_cntr"
-	Set gtmtypes("shmpool_buff_hdr",369,"off")=3748
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_out_of_design_cntr")=368
+	Set gtmtypes("shmpool_buff_hdr",369,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_buf_owner_stuck_cntr"
+	Set gtmtypes("shmpool_buff_hdr",369,"off")=3712
 	Set gtmtypes("shmpool_buff_hdr",369,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",369,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_cntr")=369
-	Set gtmtypes("shmpool_buff_hdr",370,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_db_csh_get_cntr"
-	Set gtmtypes("shmpool_buff_hdr",370,"off")=3752
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_buf_owner_stuck_cntr")=369
+	Set gtmtypes("shmpool_buff_hdr",370,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_out_of_design_cntr"
+	Set gtmtypes("shmpool_buff_hdr",370,"off")=3716
 	Set gtmtypes("shmpool_buff_hdr",370,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",370,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_db_csh_get_cntr")=370
-	Set gtmtypes("shmpool_buff_hdr",371,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_wcsgetspace_cntr"
-	Set gtmtypes("shmpool_buff_hdr",371,"off")=3756
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_out_of_design_cntr")=370
+	Set gtmtypes("shmpool_buff_hdr",371,"name")="shmpool_buff_hdr.shadow_file_header.bt_put_flush_dirty_cntr"
+	Set gtmtypes("shmpool_buff_hdr",371,"off")=3720
 	Set gtmtypes("shmpool_buff_hdr",371,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",371,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_wcsgetspace_cntr")=371
-	Set gtmtypes("shmpool_buff_hdr",372,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_t1_cntr"
-	Set gtmtypes("shmpool_buff_hdr",372,"off")=3760
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bt_put_flush_dirty_cntr")=371
+	Set gtmtypes("shmpool_buff_hdr",372,"name")="shmpool_buff_hdr.shadow_file_header.mlock_wakeups_cntr"
+	Set gtmtypes("shmpool_buff_hdr",372,"off")=3724
 	Set gtmtypes("shmpool_buff_hdr",372,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",372,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_t1_cntr")=372
-	Set gtmtypes("shmpool_buff_hdr",373,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_bitmap_cntr"
-	Set gtmtypes("shmpool_buff_hdr",373,"off")=3764
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.mlock_wakeups_cntr")=372
+	Set gtmtypes("shmpool_buff_hdr",373,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_recover_invoked_cntr"
+	Set gtmtypes("shmpool_buff_hdr",373,"off")=3728
 	Set gtmtypes("shmpool_buff_hdr",373,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",373,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_bitmap_cntr")=373
-	Set gtmtypes("shmpool_buff_hdr",374,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_jnl_cwset_cntr"
-	Set gtmtypes("shmpool_buff_hdr",374,"off")=3768
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_recover_invoked_cntr")=373
+	Set gtmtypes("shmpool_buff_hdr",374,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_verify_passed_cntr"
+	Set gtmtypes("shmpool_buff_hdr",374,"off")=3732
 	Set gtmtypes("shmpool_buff_hdr",374,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",374,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_jnl_cwset_cntr")=374
-	Set gtmtypes("shmpool_buff_hdr",375,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_cntr"
-	Set gtmtypes("shmpool_buff_hdr",375,"off")=3772
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_verify_passed_cntr")=374
+	Set gtmtypes("shmpool_buff_hdr",375,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr"
+	Set gtmtypes("shmpool_buff_hdr",375,"off")=3736
 	Set gtmtypes("shmpool_buff_hdr",375,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",375,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_cntr")=375
-	Set gtmtypes("shmpool_buff_hdr",376,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_hist_cntr"
-	Set gtmtypes("shmpool_buff_hdr",376,"off")=3776
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr")=375
+	Set gtmtypes("shmpool_buff_hdr",376,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_cntr"
+	Set gtmtypes("shmpool_buff_hdr",376,"off")=3740
 	Set gtmtypes("shmpool_buff_hdr",376,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",376,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_hist_cntr")=376
-	Set gtmtypes("shmpool_buff_hdr",377,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_hist1_nullbt_cntr"
-	Set gtmtypes("shmpool_buff_hdr",377,"off")=3780
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_cntr")=376
+	Set gtmtypes("shmpool_buff_hdr",377,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_db_csh_getn_loopexceed_cntr"
+	Set gtmtypes("shmpool_buff_hdr",377,"off")=3744
 	Set gtmtypes("shmpool_buff_hdr",377,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",377,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_hist1_nullbt_cntr")=377
-	Set gtmtypes("shmpool_buff_hdr",378,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_cntr"
-	Set gtmtypes("shmpool_buff_hdr",378,"off")=3784
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_db_csh_getn_loopexceed_cntr")=377
+	Set gtmtypes("shmpool_buff_hdr",378,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",378,"off")=3748
 	Set gtmtypes("shmpool_buff_hdr",378,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",378,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_cntr")=378
-	Set gtmtypes("shmpool_buff_hdr",379,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_bitmap_nullbt_cntr"
-	Set gtmtypes("shmpool_buff_hdr",379,"off")=3788
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_cntr")=378
+	Set gtmtypes("shmpool_buff_hdr",379,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_db_csh_get_cntr"
+	Set gtmtypes("shmpool_buff_hdr",379,"off")=3752
 	Set gtmtypes("shmpool_buff_hdr",379,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",379,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_bitmap_nullbt_cntr")=379
-	Set gtmtypes("shmpool_buff_hdr",380,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_cntr"
-	Set gtmtypes("shmpool_buff_hdr",380,"off")=3792
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_db_csh_get_cntr")=379
+	Set gtmtypes("shmpool_buff_hdr",380,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_wcsgetspace_cntr"
+	Set gtmtypes("shmpool_buff_hdr",380,"off")=3756
 	Set gtmtypes("shmpool_buff_hdr",380,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",380,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_cntr")=380
-	Set gtmtypes("shmpool_buff_hdr",381,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_jnl_cwset_cntr"
-	Set gtmtypes("shmpool_buff_hdr",381,"off")=3796
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_wcsgetspace_cntr")=380
+	Set gtmtypes("shmpool_buff_hdr",381,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_t1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",381,"off")=3760
 	Set gtmtypes("shmpool_buff_hdr",381,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",381,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_jnl_cwset_cntr")=381
-	Set gtmtypes("shmpool_buff_hdr",382,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_jnl_wcsflu_cntr"
-	Set gtmtypes("shmpool_buff_hdr",382,"off")=3800
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_t1_cntr")=381
+	Set gtmtypes("shmpool_buff_hdr",382,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_bitmap_cntr"
+	Set gtmtypes("shmpool_buff_hdr",382,"off")=3764
 	Set gtmtypes("shmpool_buff_hdr",382,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",382,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_jnl_wcsflu_cntr")=382
-	Set gtmtypes("shmpool_buff_hdr",383,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_get_too_many_loops_cntr"
-	Set gtmtypes("shmpool_buff_hdr",383,"off")=3804
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_bitmap_cntr")=382
+	Set gtmtypes("shmpool_buff_hdr",383,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_jnl_cwset_cntr"
+	Set gtmtypes("shmpool_buff_hdr",383,"off")=3768
 	Set gtmtypes("shmpool_buff_hdr",383,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",383,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_get_too_many_loops_cntr")=383
-	Set gtmtypes("shmpool_buff_hdr",384,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tpckh_hist1_nullbt_cntr"
-	Set gtmtypes("shmpool_buff_hdr",384,"off")=3808
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_jnl_cwset_cntr")=383
+	Set gtmtypes("shmpool_buff_hdr",384,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_cntr"
+	Set gtmtypes("shmpool_buff_hdr",384,"off")=3772
 	Set gtmtypes("shmpool_buff_hdr",384,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",384,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tpckh_hist1_nullbt_cntr")=384
-	Set gtmtypes("shmpool_buff_hdr",385,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_cntr"
-	Set gtmtypes("shmpool_buff_hdr",385,"off")=3812
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_cntr")=384
+	Set gtmtypes("shmpool_buff_hdr",385,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_hist_cntr"
+	Set gtmtypes("shmpool_buff_hdr",385,"off")=3776
 	Set gtmtypes("shmpool_buff_hdr",385,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",385,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_cntr")=385
-	Set gtmtypes("shmpool_buff_hdr",386,"name")="shmpool_buff_hdr.shadow_file_header.jnl_blocked_writer_lost_cntr"
-	Set gtmtypes("shmpool_buff_hdr",386,"off")=3816
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_hist_cntr")=385
+	Set gtmtypes("shmpool_buff_hdr",386,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_hist1_nullbt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",386,"off")=3780
 	Set gtmtypes("shmpool_buff_hdr",386,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",386,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_blocked_writer_lost_cntr")=386
-	Set gtmtypes("shmpool_buff_hdr",387,"name")="shmpool_buff_hdr.shadow_file_header.jnl_blocked_writer_stuck_cntr"
-	Set gtmtypes("shmpool_buff_hdr",387,"off")=3820
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_hist1_nullbt_cntr")=386
+	Set gtmtypes("shmpool_buff_hdr",387,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",387,"off")=3784
 	Set gtmtypes("shmpool_buff_hdr",387,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",387,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_blocked_writer_stuck_cntr")=387
-	Set gtmtypes("shmpool_buff_hdr",388,"name")="shmpool_buff_hdr.shadow_file_header.jnl_blocked_writer_blocked_cntr"
-	Set gtmtypes("shmpool_buff_hdr",388,"off")=3824
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_cntr")=387
+	Set gtmtypes("shmpool_buff_hdr",388,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_bitmap_nullbt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",388,"off")=3788
 	Set gtmtypes("shmpool_buff_hdr",388,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",388,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_blocked_writer_blocked_cntr")=388
-	Set gtmtypes("shmpool_buff_hdr",389,"name")="shmpool_buff_hdr.shadow_file_header.n_jnl_fsyncs_cntr"
-	Set gtmtypes("shmpool_buff_hdr",389,"off")=3828
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_bitmap_nullbt_cntr")=388
+	Set gtmtypes("shmpool_buff_hdr",389,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",389,"off")=3792
 	Set gtmtypes("shmpool_buff_hdr",389,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",389,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_jnl_fsyncs_cntr")=389
-	Set gtmtypes("shmpool_buff_hdr",390,"name")="shmpool_buff_hdr.shadow_file_header.n_jnl_fsync_tries_cntr"
-	Set gtmtypes("shmpool_buff_hdr",390,"off")=3832
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_cntr")=389
+	Set gtmtypes("shmpool_buff_hdr",390,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_jnl_cwset_cntr"
+	Set gtmtypes("shmpool_buff_hdr",390,"off")=3796
 	Set gtmtypes("shmpool_buff_hdr",390,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",390,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_jnl_fsync_tries_cntr")=390
-	Set gtmtypes("shmpool_buff_hdr",391,"name")="shmpool_buff_hdr.shadow_file_header.n_jnl_fsync_recovers_cntr"
-	Set gtmtypes("shmpool_buff_hdr",391,"off")=3836
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_jnl_cwset_cntr")=390
+	Set gtmtypes("shmpool_buff_hdr",391,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_jnl_wcsflu_cntr"
+	Set gtmtypes("shmpool_buff_hdr",391,"off")=3800
 	Set gtmtypes("shmpool_buff_hdr",391,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",391,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_jnl_fsync_recovers_cntr")=391
-	Set gtmtypes("shmpool_buff_hdr",392,"name")="shmpool_buff_hdr.shadow_file_header.n_db_fsyncs_cntr"
-	Set gtmtypes("shmpool_buff_hdr",392,"off")=3840
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_jnl_wcsflu_cntr")=391
+	Set gtmtypes("shmpool_buff_hdr",392,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_get_too_many_loops_cntr"
+	Set gtmtypes("shmpool_buff_hdr",392,"off")=3804
 	Set gtmtypes("shmpool_buff_hdr",392,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",392,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_fsyncs_cntr")=392
-	Set gtmtypes("shmpool_buff_hdr",393,"name")="shmpool_buff_hdr.shadow_file_header.n_db_fsyncs_in_crit_cntr"
-	Set gtmtypes("shmpool_buff_hdr",393,"off")=3844
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_get_too_many_loops_cntr")=392
+	Set gtmtypes("shmpool_buff_hdr",393,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tpckh_hist1_nullbt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",393,"off")=3808
 	Set gtmtypes("shmpool_buff_hdr",393,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",393,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_fsyncs_in_crit_cntr")=393
-	Set gtmtypes("shmpool_buff_hdr",394,"name")="shmpool_buff_hdr.shadow_file_header.n_dbsync_timers_cntr"
-	Set gtmtypes("shmpool_buff_hdr",394,"off")=3848
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tpckh_hist1_nullbt_cntr")=393
+	Set gtmtypes("shmpool_buff_hdr",394,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",394,"off")=3812
 	Set gtmtypes("shmpool_buff_hdr",394,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",394,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_dbsync_timers_cntr")=394
-	Set gtmtypes("shmpool_buff_hdr",395,"name")="shmpool_buff_hdr.shadow_file_header.n_dbsync_writes_cntr"
-	Set gtmtypes("shmpool_buff_hdr",395,"off")=3852
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_cntr")=394
+	Set gtmtypes("shmpool_buff_hdr",395,"name")="shmpool_buff_hdr.shadow_file_header.jnl_blocked_writer_lost_cntr"
+	Set gtmtypes("shmpool_buff_hdr",395,"off")=3816
 	Set gtmtypes("shmpool_buff_hdr",395,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",395,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_dbsync_writes_cntr")=395
-	Set gtmtypes("shmpool_buff_hdr",396,"name")="shmpool_buff_hdr.shadow_file_header.mutex_queue_full_cntr"
-	Set gtmtypes("shmpool_buff_hdr",396,"off")=3856
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_blocked_writer_lost_cntr")=395
+	Set gtmtypes("shmpool_buff_hdr",396,"name")="shmpool_buff_hdr.shadow_file_header.jnl_blocked_writer_stuck_cntr"
+	Set gtmtypes("shmpool_buff_hdr",396,"off")=3820
 	Set gtmtypes("shmpool_buff_hdr",396,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",396,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.mutex_queue_full_cntr")=396
-	Set gtmtypes("shmpool_buff_hdr",397,"name")="shmpool_buff_hdr.shadow_file_header.wcb_bt_put_cntr"
-	Set gtmtypes("shmpool_buff_hdr",397,"off")=3860
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_blocked_writer_stuck_cntr")=396
+	Set gtmtypes("shmpool_buff_hdr",397,"name")="shmpool_buff_hdr.shadow_file_header.jnl_blocked_writer_blocked_cntr"
+	Set gtmtypes("shmpool_buff_hdr",397,"off")=3824
 	Set gtmtypes("shmpool_buff_hdr",397,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",397,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_bt_put_cntr")=397
-	Set gtmtypes("shmpool_buff_hdr",398,"name")="shmpool_buff_hdr.shadow_file_header.wcb_mutex_salvage_cntr"
-	Set gtmtypes("shmpool_buff_hdr",398,"off")=3864
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_blocked_writer_blocked_cntr")=397
+	Set gtmtypes("shmpool_buff_hdr",398,"name")="shmpool_buff_hdr.shadow_file_header.n_jnl_fsyncs_cntr"
+	Set gtmtypes("shmpool_buff_hdr",398,"off")=3828
 	Set gtmtypes("shmpool_buff_hdr",398,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",398,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_mutex_salvage_cntr")=398
-	Set gtmtypes("shmpool_buff_hdr",399,"name")="shmpool_buff_hdr.shadow_file_header.wcb_tp_grab_crit_cntr"
-	Set gtmtypes("shmpool_buff_hdr",399,"off")=3868
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_jnl_fsyncs_cntr")=398
+	Set gtmtypes("shmpool_buff_hdr",399,"name")="shmpool_buff_hdr.shadow_file_header.n_jnl_fsync_tries_cntr"
+	Set gtmtypes("shmpool_buff_hdr",399,"off")=3832
 	Set gtmtypes("shmpool_buff_hdr",399,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",399,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_tp_grab_crit_cntr")=399
-	Set gtmtypes("shmpool_buff_hdr",400,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_nocr_invcr_cntr"
-	Set gtmtypes("shmpool_buff_hdr",400,"off")=3872
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_jnl_fsync_tries_cntr")=399
+	Set gtmtypes("shmpool_buff_hdr",400,"name")="shmpool_buff_hdr.shadow_file_header.n_jnl_fsync_recovers_cntr"
+	Set gtmtypes("shmpool_buff_hdr",400,"off")=3836
 	Set gtmtypes("shmpool_buff_hdr",400,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",400,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_nocr_invcr_cntr")=400
-	Set gtmtypes("shmpool_buff_hdr",401,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_cr_invcr_cntr"
-	Set gtmtypes("shmpool_buff_hdr",401,"off")=3876
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_jnl_fsync_recovers_cntr")=400
+	Set gtmtypes("shmpool_buff_hdr",401,"name")="shmpool_buff_hdr.shadow_file_header.n_db_fsyncs_cntr"
+	Set gtmtypes("shmpool_buff_hdr",401,"off")=3840
 	Set gtmtypes("shmpool_buff_hdr",401,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",401,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_cr_invcr_cntr")=401
-	Set gtmtypes("shmpool_buff_hdr",402,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_rip_wait_cntr"
-	Set gtmtypes("shmpool_buff_hdr",402,"off")=3880
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_fsyncs_cntr")=401
+	Set gtmtypes("shmpool_buff_hdr",402,"name")="shmpool_buff_hdr.shadow_file_header.n_db_fsyncs_in_crit_cntr"
+	Set gtmtypes("shmpool_buff_hdr",402,"off")=3844
 	Set gtmtypes("shmpool_buff_hdr",402,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",402,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_rip_wait_cntr")=402
-	Set gtmtypes("shmpool_buff_hdr",403,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirtyripwait_cntr"
-	Set gtmtypes("shmpool_buff_hdr",403,"off")=3884
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_fsyncs_in_crit_cntr")=402
+	Set gtmtypes("shmpool_buff_hdr",403,"name")="shmpool_buff_hdr.shadow_file_header.n_dbsync_timers_cntr"
+	Set gtmtypes("shmpool_buff_hdr",403,"off")=3848
 	Set gtmtypes("shmpool_buff_hdr",403,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",403,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirtyripwait_cntr")=403
-	Set gtmtypes("shmpool_buff_hdr",404,"name")="shmpool_buff_hdr.shadow_file_header.wcb_gds_rundown_cntr"
-	Set gtmtypes("shmpool_buff_hdr",404,"off")=3888
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_dbsync_timers_cntr")=403
+	Set gtmtypes("shmpool_buff_hdr",404,"name")="shmpool_buff_hdr.shadow_file_header.n_dbsync_writes_cntr"
+	Set gtmtypes("shmpool_buff_hdr",404,"off")=3852
 	Set gtmtypes("shmpool_buff_hdr",404,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",404,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_gds_rundown_cntr")=404
-	Set gtmtypes("shmpool_buff_hdr",405,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wcs_flu1_cntr"
-	Set gtmtypes("shmpool_buff_hdr",405,"off")=3892
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_dbsync_writes_cntr")=404
+	Set gtmtypes("shmpool_buff_hdr",405,"name")="shmpool_buff_hdr.shadow_file_header.mutex_queue_full_cntr"
+	Set gtmtypes("shmpool_buff_hdr",405,"off")=3856
 	Set gtmtypes("shmpool_buff_hdr",405,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",405,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wcs_flu1_cntr")=405
-	Set gtmtypes("shmpool_buff_hdr",406,"name")="shmpool_buff_hdr.shadow_file_header.wcb_mu_back_cntr"
-	Set gtmtypes("shmpool_buff_hdr",406,"off")=3896
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.mutex_queue_full_cntr")=405
+	Set gtmtypes("shmpool_buff_hdr",406,"name")="shmpool_buff_hdr.shadow_file_header.wcb_bt_put_cntr"
+	Set gtmtypes("shmpool_buff_hdr",406,"off")=3860
 	Set gtmtypes("shmpool_buff_hdr",406,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",406,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_mu_back_cntr")=406
-	Set gtmtypes("shmpool_buff_hdr",407,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirty_invcr_cntr"
-	Set gtmtypes("shmpool_buff_hdr",407,"off")=3900
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_bt_put_cntr")=406
+	Set gtmtypes("shmpool_buff_hdr",407,"name")="shmpool_buff_hdr.shadow_file_header.wcb_mutex_salvage_cntr"
+	Set gtmtypes("shmpool_buff_hdr",407,"off")=3864
 	Set gtmtypes("shmpool_buff_hdr",407,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",407,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirty_invcr_cntr")=407
-	Set gtmtypes("shmpool_buff_hdr",408,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_wtfini_fail_cntr"
-	Set gtmtypes("shmpool_buff_hdr",408,"off")=3904
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_mutex_salvage_cntr")=407
+	Set gtmtypes("shmpool_buff_hdr",408,"name")="shmpool_buff_hdr.shadow_file_header.wcb_tp_grab_crit_cntr"
+	Set gtmtypes("shmpool_buff_hdr",408,"off")=3868
 	Set gtmtypes("shmpool_buff_hdr",408,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",408,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_wtfini_fail_cntr")=408
-	Set gtmtypes("shmpool_buff_hdr",409,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_twin_stuck_cntr"
-	Set gtmtypes("shmpool_buff_hdr",409,"off")=3908
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_tp_grab_crit_cntr")=408
+	Set gtmtypes("shmpool_buff_hdr",409,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_nocr_invcr_cntr"
+	Set gtmtypes("shmpool_buff_hdr",409,"off")=3872
 	Set gtmtypes("shmpool_buff_hdr",409,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",409,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_twin_stuck_cntr")=409
-	Set gtmtypes("shmpool_buff_hdr",410,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_wrt_latch_stuck_cntr"
-	Set gtmtypes("shmpool_buff_hdr",410,"off")=3912
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_nocr_invcr_cntr")=409
+	Set gtmtypes("shmpool_buff_hdr",410,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_cr_invcr_cntr"
+	Set gtmtypes("shmpool_buff_hdr",410,"off")=3876
 	Set gtmtypes("shmpool_buff_hdr",410,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",410,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_wrt_latch_stuck_cntr")=410
-	Set gtmtypes("shmpool_buff_hdr",411,"name")="shmpool_buff_hdr.shadow_file_header.wcb_secshr_db_clnup_now_crit_cntr"
-	Set gtmtypes("shmpool_buff_hdr",411,"off")=3916
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_cr_invcr_cntr")=410
+	Set gtmtypes("shmpool_buff_hdr",411,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_rip_wait_cntr"
+	Set gtmtypes("shmpool_buff_hdr",411,"off")=3880
 	Set gtmtypes("shmpool_buff_hdr",411,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",411,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_secshr_db_clnup_now_crit_cntr")=411
-	Set gtmtypes("shmpool_buff_hdr",412,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_bad_bt_index1_cntr"
-	Set gtmtypes("shmpool_buff_hdr",412,"off")=3920
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_rip_wait_cntr")=411
+	Set gtmtypes("shmpool_buff_hdr",412,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirtyripwait_cntr"
+	Set gtmtypes("shmpool_buff_hdr",412,"off")=3884
 	Set gtmtypes("shmpool_buff_hdr",412,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",412,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_bad_bt_index1_cntr")=412
-	Set gtmtypes("shmpool_buff_hdr",413,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_bad_bt_index2_cntr"
-	Set gtmtypes("shmpool_buff_hdr",413,"off")=3924
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirtyripwait_cntr")=412
+	Set gtmtypes("shmpool_buff_hdr",413,"name")="shmpool_buff_hdr.shadow_file_header.wcb_gds_rundown_cntr"
+	Set gtmtypes("shmpool_buff_hdr",413,"off")=3888
 	Set gtmtypes("shmpool_buff_hdr",413,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",413,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_bad_bt_index2_cntr")=413
-	Set gtmtypes("shmpool_buff_hdr",414,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_crbtmismatch1_cntr"
-	Set gtmtypes("shmpool_buff_hdr",414,"off")=3928
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_gds_rundown_cntr")=413
+	Set gtmtypes("shmpool_buff_hdr",414,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wcs_flu1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",414,"off")=3892
 	Set gtmtypes("shmpool_buff_hdr",414,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",414,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_crbtmismatch1_cntr")=414
-	Set gtmtypes("shmpool_buff_hdr",415,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_crbtmismatch2_cntr"
-	Set gtmtypes("shmpool_buff_hdr",415,"off")=3932
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wcs_flu1_cntr")=414
+	Set gtmtypes("shmpool_buff_hdr",415,"name")="shmpool_buff_hdr.shadow_file_header.wcb_mu_back_cntr"
+	Set gtmtypes("shmpool_buff_hdr",415,"off")=3896
 	Set gtmtypes("shmpool_buff_hdr",415,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",415,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_crbtmismatch2_cntr")=415
-	Set gtmtypes("shmpool_buff_hdr",416,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_crbtmismatch3_cntr"
-	Set gtmtypes("shmpool_buff_hdr",416,"off")=3936
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_mu_back_cntr")=415
+	Set gtmtypes("shmpool_buff_hdr",416,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirty_invcr_cntr"
+	Set gtmtypes("shmpool_buff_hdr",416,"off")=3900
 	Set gtmtypes("shmpool_buff_hdr",416,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",416,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_crbtmismatch3_cntr")=416
-	Set gtmtypes("shmpool_buff_hdr",417,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_cntr"
-	Set gtmtypes("shmpool_buff_hdr",417,"off")=3940
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirty_invcr_cntr")=416
+	Set gtmtypes("shmpool_buff_hdr",417,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_wtfini_fail_cntr"
+	Set gtmtypes("shmpool_buff_hdr",417,"off")=3904
 	Set gtmtypes("shmpool_buff_hdr",417,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",417,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_cntr")=417
-	Set gtmtypes("shmpool_buff_hdr",418,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_cntr"
-	Set gtmtypes("shmpool_buff_hdr",418,"off")=3944
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_wtfini_fail_cntr")=417
+	Set gtmtypes("shmpool_buff_hdr",418,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_twin_stuck_cntr"
+	Set gtmtypes("shmpool_buff_hdr",418,"off")=3908
 	Set gtmtypes("shmpool_buff_hdr",418,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",418,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_cntr")=418
-	Set gtmtypes("shmpool_buff_hdr",419,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_cntr"
-	Set gtmtypes("shmpool_buff_hdr",419,"off")=3948
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_twin_stuck_cntr")=418
+	Set gtmtypes("shmpool_buff_hdr",419,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_wrt_latch_stuck_cntr"
+	Set gtmtypes("shmpool_buff_hdr",419,"off")=3912
 	Set gtmtypes("shmpool_buff_hdr",419,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",419,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_cntr")=419
-	Set gtmtypes("shmpool_buff_hdr",420,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_cntr"
-	Set gtmtypes("shmpool_buff_hdr",420,"off")=3952
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_wrt_latch_stuck_cntr")=419
+	Set gtmtypes("shmpool_buff_hdr",420,"name")="shmpool_buff_hdr.shadow_file_header.wcb_secshr_db_clnup_now_crit_cntr"
+	Set gtmtypes("shmpool_buff_hdr",420,"off")=3916
 	Set gtmtypes("shmpool_buff_hdr",420,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",420,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_cntr")=420
-	Set gtmtypes("shmpool_buff_hdr",421,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_cntr"
-	Set gtmtypes("shmpool_buff_hdr",421,"off")=3956
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_secshr_db_clnup_now_crit_cntr")=420
+	Set gtmtypes("shmpool_buff_hdr",421,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_bad_bt_index1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",421,"off")=3920
 	Set gtmtypes("shmpool_buff_hdr",421,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",421,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_cntr")=421
-	Set gtmtypes("shmpool_buff_hdr",422,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_bt_get_cntr"
-	Set gtmtypes("shmpool_buff_hdr",422,"off")=3960
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_bad_bt_index1_cntr")=421
+	Set gtmtypes("shmpool_buff_hdr",422,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_bad_bt_index2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",422,"off")=3924
 	Set gtmtypes("shmpool_buff_hdr",422,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",422,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_bt_get_cntr")=422
-	Set gtmtypes("shmpool_buff_hdr",423,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_cntr"
-	Set gtmtypes("shmpool_buff_hdr",423,"off")=3964
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_bad_bt_index2_cntr")=422
+	Set gtmtypes("shmpool_buff_hdr",423,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_crbtmismatch1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",423,"off")=3928
 	Set gtmtypes("shmpool_buff_hdr",423,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",423,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_cntr")=423
-	Set gtmtypes("shmpool_buff_hdr",424,"name")="shmpool_buff_hdr.shadow_file_header.wcb_bg_update_lckfail1_cntr"
-	Set gtmtypes("shmpool_buff_hdr",424,"off")=3968
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_crbtmismatch1_cntr")=423
+	Set gtmtypes("shmpool_buff_hdr",424,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_crbtmismatch2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",424,"off")=3932
 	Set gtmtypes("shmpool_buff_hdr",424,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",424,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_bg_update_lckfail1_cntr")=424
-	Set gtmtypes("shmpool_buff_hdr",425,"name")="shmpool_buff_hdr.shadow_file_header.wcb_bg_update_lckfail2_cntr"
-	Set gtmtypes("shmpool_buff_hdr",425,"off")=3972
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_crbtmismatch2_cntr")=424
+	Set gtmtypes("shmpool_buff_hdr",425,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_crbtmismatch3_cntr"
+	Set gtmtypes("shmpool_buff_hdr",425,"off")=3936
 	Set gtmtypes("shmpool_buff_hdr",425,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",425,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_bg_update_lckfail2_cntr")=425
-	Set gtmtypes("shmpool_buff_hdr",426,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail1_cntr"
-	Set gtmtypes("shmpool_buff_hdr",426,"off")=3976
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_crbtmismatch3_cntr")=425
+	Set gtmtypes("shmpool_buff_hdr",426,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",426,"off")=3940
 	Set gtmtypes("shmpool_buff_hdr",426,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",426,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail1_cntr")=426
-	Set gtmtypes("shmpool_buff_hdr",427,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail2_cntr"
-	Set gtmtypes("shmpool_buff_hdr",427,"off")=3980
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_cntr")=426
+	Set gtmtypes("shmpool_buff_hdr",427,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",427,"off")=3944
 	Set gtmtypes("shmpool_buff_hdr",427,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",427,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail2_cntr")=427
-	Set gtmtypes("shmpool_buff_hdr",428,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail3_cntr"
-	Set gtmtypes("shmpool_buff_hdr",428,"off")=3984
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_cntr")=427
+	Set gtmtypes("shmpool_buff_hdr",428,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_cntr"
+	Set gtmtypes("shmpool_buff_hdr",428,"off")=3948
 	Set gtmtypes("shmpool_buff_hdr",428,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",428,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail3_cntr")=428
-	Set gtmtypes("shmpool_buff_hdr",429,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail4_cntr"
-	Set gtmtypes("shmpool_buff_hdr",429,"off")=3988
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_cntr")=428
+	Set gtmtypes("shmpool_buff_hdr",429,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_cntr"
+	Set gtmtypes("shmpool_buff_hdr",429,"off")=3952
 	Set gtmtypes("shmpool_buff_hdr",429,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",429,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail4_cntr")=429
-	Set gtmtypes("shmpool_buff_hdr",430,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail1_cntr"
-	Set gtmtypes("shmpool_buff_hdr",430,"off")=3992
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_cntr")=429
+	Set gtmtypes("shmpool_buff_hdr",430,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_cntr"
+	Set gtmtypes("shmpool_buff_hdr",430,"off")=3956
 	Set gtmtypes("shmpool_buff_hdr",430,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",430,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail1_cntr")=430
-	Set gtmtypes("shmpool_buff_hdr",431,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail2_cntr"
-	Set gtmtypes("shmpool_buff_hdr",431,"off")=3996
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_cntr")=430
+	Set gtmtypes("shmpool_buff_hdr",431,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_bt_get_cntr"
+	Set gtmtypes("shmpool_buff_hdr",431,"off")=3960
 	Set gtmtypes("shmpool_buff_hdr",431,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",431,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail2_cntr")=431
-	Set gtmtypes("shmpool_buff_hdr",432,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail3_cntr"
-	Set gtmtypes("shmpool_buff_hdr",432,"off")=4000
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_bt_get_cntr")=431
+	Set gtmtypes("shmpool_buff_hdr",432,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_cntr"
+	Set gtmtypes("shmpool_buff_hdr",432,"off")=3964
 	Set gtmtypes("shmpool_buff_hdr",432,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",432,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail3_cntr")=432
-	Set gtmtypes("shmpool_buff_hdr",433,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail4_cntr"
-	Set gtmtypes("shmpool_buff_hdr",433,"off")=4004
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_cntr")=432
+	Set gtmtypes("shmpool_buff_hdr",433,"name")="shmpool_buff_hdr.shadow_file_header.wcb_bg_update_lckfail1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",433,"off")=3968
 	Set gtmtypes("shmpool_buff_hdr",433,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",433,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail4_cntr")=433
-	Set gtmtypes("shmpool_buff_hdr",434,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirtystuck1_cntr"
-	Set gtmtypes("shmpool_buff_hdr",434,"off")=4008
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_bg_update_lckfail1_cntr")=433
+	Set gtmtypes("shmpool_buff_hdr",434,"name")="shmpool_buff_hdr.shadow_file_header.wcb_bg_update_lckfail2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",434,"off")=3972
 	Set gtmtypes("shmpool_buff_hdr",434,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",434,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirtystuck1_cntr")=434
-	Set gtmtypes("shmpool_buff_hdr",435,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirtystuck2_cntr"
-	Set gtmtypes("shmpool_buff_hdr",435,"off")=4012
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_bg_update_lckfail2_cntr")=434
+	Set gtmtypes("shmpool_buff_hdr",435,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",435,"off")=3976
 	Set gtmtypes("shmpool_buff_hdr",435,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",435,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirtystuck2_cntr")=435
-	Set gtmtypes("shmpool_buff_hdr",436,"name")="shmpool_buff_hdr.shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_cntr"
-	Set gtmtypes("shmpool_buff_hdr",436,"off")=4016
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail1_cntr")=435
+	Set gtmtypes("shmpool_buff_hdr",436,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",436,"off")=3980
 	Set gtmtypes("shmpool_buff_hdr",436,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",436,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_cntr")=436
-	Set gtmtypes("shmpool_buff_hdr",437,"name")="shmpool_buff_hdr.shadow_file_header.dwngrd_refmts_syncio_cntr"
-	Set gtmtypes("shmpool_buff_hdr",437,"off")=4020
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail2_cntr")=436
+	Set gtmtypes("shmpool_buff_hdr",437,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail3_cntr"
+	Set gtmtypes("shmpool_buff_hdr",437,"off")=3984
 	Set gtmtypes("shmpool_buff_hdr",437,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",437,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.dwngrd_refmts_syncio_cntr")=437
-	Set gtmtypes("shmpool_buff_hdr",438,"name")="shmpool_buff_hdr.shadow_file_header.dwngrd_refmts_asyncio_cntr"
-	Set gtmtypes("shmpool_buff_hdr",438,"off")=4024
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail3_cntr")=437
+	Set gtmtypes("shmpool_buff_hdr",438,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail4_cntr"
+	Set gtmtypes("shmpool_buff_hdr",438,"off")=3988
 	Set gtmtypes("shmpool_buff_hdr",438,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",438,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.dwngrd_refmts_asyncio_cntr")=438
-	Set gtmtypes("shmpool_buff_hdr",439,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_refmt_harvests_cntr"
-	Set gtmtypes("shmpool_buff_hdr",439,"off")=4028
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail4_cntr")=438
+	Set gtmtypes("shmpool_buff_hdr",439,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",439,"off")=3992
 	Set gtmtypes("shmpool_buff_hdr",439,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",439,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_refmt_harvests_cntr")=439
-	Set gtmtypes("shmpool_buff_hdr",440,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_recovery_cntr"
-	Set gtmtypes("shmpool_buff_hdr",440,"off")=4032
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail1_cntr")=439
+	Set gtmtypes("shmpool_buff_hdr",440,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",440,"off")=3996
 	Set gtmtypes("shmpool_buff_hdr",440,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",440,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_recovery_cntr")=440
-	Set gtmtypes("shmpool_buff_hdr",441,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_blkd_by_sdc_cntr"
-	Set gtmtypes("shmpool_buff_hdr",441,"off")=4036
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail2_cntr")=440
+	Set gtmtypes("shmpool_buff_hdr",441,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail3_cntr"
+	Set gtmtypes("shmpool_buff_hdr",441,"off")=4000
 	Set gtmtypes("shmpool_buff_hdr",441,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",441,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_blkd_by_sdc_cntr")=441
-	Set gtmtypes("shmpool_buff_hdr",442,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_alloc_bbflush_cntr"
-	Set gtmtypes("shmpool_buff_hdr",442,"off")=4040
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail3_cntr")=441
+	Set gtmtypes("shmpool_buff_hdr",442,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail4_cntr"
+	Set gtmtypes("shmpool_buff_hdr",442,"off")=4004
 	Set gtmtypes("shmpool_buff_hdr",442,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",442,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_alloc_bbflush_cntr")=442
-	Set gtmtypes("shmpool_buff_hdr",443,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_released_replaced_cntr"
-	Set gtmtypes("shmpool_buff_hdr",443,"off")=4044
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail4_cntr")=442
+	Set gtmtypes("shmpool_buff_hdr",443,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirtystuck1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",443,"off")=4008
 	Set gtmtypes("shmpool_buff_hdr",443,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",443,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_released_replaced_cntr")=443
-	Set gtmtypes("shmpool_buff_hdr",444,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_released_io_complete_cntr"
-	Set gtmtypes("shmpool_buff_hdr",444,"off")=4048
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirtystuck1_cntr")=443
+	Set gtmtypes("shmpool_buff_hdr",444,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirtystuck2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",444,"off")=4012
 	Set gtmtypes("shmpool_buff_hdr",444,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",444,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_released_io_complete_cntr")=444
-	Set gtmtypes("shmpool_buff_hdr",445,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_kept_cntr"
-	Set gtmtypes("shmpool_buff_hdr",445,"off")=4052
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirtystuck2_cntr")=444
+	Set gtmtypes("shmpool_buff_hdr",445,"name")="shmpool_buff_hdr.shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_cntr"
+	Set gtmtypes("shmpool_buff_hdr",445,"off")=4016
 	Set gtmtypes("shmpool_buff_hdr",445,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",445,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_kept_cntr")=445
-	Set gtmtypes("shmpool_buff_hdr",446,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_ignored_cntr"
-	Set gtmtypes("shmpool_buff_hdr",446,"off")=4056
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_cntr")=445
+	Set gtmtypes("shmpool_buff_hdr",446,"name")="shmpool_buff_hdr.shadow_file_header.dwngrd_refmts_syncio_cntr"
+	Set gtmtypes("shmpool_buff_hdr",446,"off")=4020
 	Set gtmtypes("shmpool_buff_hdr",446,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",446,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_ignored_cntr")=446
-	Set gtmtypes("shmpool_buff_hdr",447,"name")="shmpool_buff_hdr.shadow_file_header.refmt_blk_chk_blk_freed_cntr"
-	Set gtmtypes("shmpool_buff_hdr",447,"off")=4060
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.dwngrd_refmts_syncio_cntr")=446
+	Set gtmtypes("shmpool_buff_hdr",447,"name")="shmpool_buff_hdr.shadow_file_header.dwngrd_refmts_asyncio_cntr"
+	Set gtmtypes("shmpool_buff_hdr",447,"off")=4024
 	Set gtmtypes("shmpool_buff_hdr",447,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",447,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_blk_chk_blk_freed_cntr")=447
-	Set gtmtypes("shmpool_buff_hdr",448,"name")="shmpool_buff_hdr.shadow_file_header.refmt_blk_chk_blk_kept_cntr"
-	Set gtmtypes("shmpool_buff_hdr",448,"off")=4064
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.dwngrd_refmts_asyncio_cntr")=447
+	Set gtmtypes("shmpool_buff_hdr",448,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_refmt_harvests_cntr"
+	Set gtmtypes("shmpool_buff_hdr",448,"off")=4028
 	Set gtmtypes("shmpool_buff_hdr",448,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",448,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_blk_chk_blk_kept_cntr")=448
-	Set gtmtypes("shmpool_buff_hdr",449,"name")="shmpool_buff_hdr.shadow_file_header.active_lvl_trigger_cntr"
-	Set gtmtypes("shmpool_buff_hdr",449,"off")=4068
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_refmt_harvests_cntr")=448
+	Set gtmtypes("shmpool_buff_hdr",449,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_recovery_cntr"
+	Set gtmtypes("shmpool_buff_hdr",449,"off")=4032
 	Set gtmtypes("shmpool_buff_hdr",449,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",449,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.active_lvl_trigger_cntr")=449
-	Set gtmtypes("shmpool_buff_hdr",450,"name")="shmpool_buff_hdr.shadow_file_header.new_buff_cntr"
-	Set gtmtypes("shmpool_buff_hdr",450,"off")=4072
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_recovery_cntr")=449
+	Set gtmtypes("shmpool_buff_hdr",450,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_blkd_by_sdc_cntr"
+	Set gtmtypes("shmpool_buff_hdr",450,"off")=4036
 	Set gtmtypes("shmpool_buff_hdr",450,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",450,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.new_buff_cntr")=450
-	Set gtmtypes("shmpool_buff_hdr",451,"name")="shmpool_buff_hdr.shadow_file_header.phase2_commit_wait_sleep_in_crit_cntr"
-	Set gtmtypes("shmpool_buff_hdr",451,"off")=4076
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_blkd_by_sdc_cntr")=450
+	Set gtmtypes("shmpool_buff_hdr",451,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_alloc_bbflush_cntr"
+	Set gtmtypes("shmpool_buff_hdr",451,"off")=4040
 	Set gtmtypes("shmpool_buff_hdr",451,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",451,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.phase2_commit_wait_sleep_in_crit_cntr")=451
-	Set gtmtypes("shmpool_buff_hdr",452,"name")="shmpool_buff_hdr.shadow_file_header.phase2_commit_wait_sleep_no_crit_cntr"
-	Set gtmtypes("shmpool_buff_hdr",452,"off")=4080
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_alloc_bbflush_cntr")=451
+	Set gtmtypes("shmpool_buff_hdr",452,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_released_replaced_cntr"
+	Set gtmtypes("shmpool_buff_hdr",452,"off")=4044
 	Set gtmtypes("shmpool_buff_hdr",452,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",452,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.phase2_commit_wait_sleep_no_crit_cntr")=452
-	Set gtmtypes("shmpool_buff_hdr",453,"name")="shmpool_buff_hdr.shadow_file_header.phase2_commit_wait_pidcnt_cntr"
-	Set gtmtypes("shmpool_buff_hdr",453,"off")=4084
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_released_replaced_cntr")=452
+	Set gtmtypes("shmpool_buff_hdr",453,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_released_io_complete_cntr"
+	Set gtmtypes("shmpool_buff_hdr",453,"off")=4048
 	Set gtmtypes("shmpool_buff_hdr",453,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",453,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.phase2_commit_wait_pidcnt_cntr")=453
-	Set gtmtypes("shmpool_buff_hdr",454,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_intend_wait_cntr"
-	Set gtmtypes("shmpool_buff_hdr",454,"off")=4088
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_released_io_complete_cntr")=453
+	Set gtmtypes("shmpool_buff_hdr",454,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_kept_cntr"
+	Set gtmtypes("shmpool_buff_hdr",454,"off")=4052
 	Set gtmtypes("shmpool_buff_hdr",454,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",454,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_intend_wait_cntr")=454
-	Set gtmtypes("shmpool_buff_hdr",455,"name")="shmpool_buff_hdr.shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_cntr"
-	Set gtmtypes("shmpool_buff_hdr",455,"off")=4092
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_kept_cntr")=454
+	Set gtmtypes("shmpool_buff_hdr",455,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_ignored_cntr"
+	Set gtmtypes("shmpool_buff_hdr",455,"off")=4056
 	Set gtmtypes("shmpool_buff_hdr",455,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",455,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_cntr")=455
-	Set gtmtypes("shmpool_buff_hdr",456,"name")="shmpool_buff_hdr.shadow_file_header.wcb_phase2_commit_wait_cntr"
-	Set gtmtypes("shmpool_buff_hdr",456,"off")=4096
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_ignored_cntr")=455
+	Set gtmtypes("shmpool_buff_hdr",456,"name")="shmpool_buff_hdr.shadow_file_header.refmt_blk_chk_blk_freed_cntr"
+	Set gtmtypes("shmpool_buff_hdr",456,"off")=4060
 	Set gtmtypes("shmpool_buff_hdr",456,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",456,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_phase2_commit_wait_cntr")=456
-	Set gtmtypes("shmpool_buff_hdr",457,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_calls_cntr"
-	Set gtmtypes("shmpool_buff_hdr",457,"off")=4100
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_blk_chk_blk_freed_cntr")=456
+	Set gtmtypes("shmpool_buff_hdr",457,"name")="shmpool_buff_hdr.shadow_file_header.refmt_blk_chk_blk_kept_cntr"
+	Set gtmtypes("shmpool_buff_hdr",457,"off")=4064
 	Set gtmtypes("shmpool_buff_hdr",457,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",457,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_calls_cntr")=457
-	Set gtmtypes("shmpool_buff_hdr",458,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_rip_cntr"
-	Set gtmtypes("shmpool_buff_hdr",458,"off")=4104
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_blk_chk_blk_kept_cntr")=457
+	Set gtmtypes("shmpool_buff_hdr",458,"name")="shmpool_buff_hdr.shadow_file_header.active_lvl_trigger_cntr"
+	Set gtmtypes("shmpool_buff_hdr",458,"off")=4068
 	Set gtmtypes("shmpool_buff_hdr",458,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",458,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_rip_cntr")=458
-	Set gtmtypes("shmpool_buff_hdr",459,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_in_tend_cntr"
-	Set gtmtypes("shmpool_buff_hdr",459,"off")=4108
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.active_lvl_trigger_cntr")=458
+	Set gtmtypes("shmpool_buff_hdr",459,"name")="shmpool_buff_hdr.shadow_file_header.new_buff_cntr"
+	Set gtmtypes("shmpool_buff_hdr",459,"off")=4072
 	Set gtmtypes("shmpool_buff_hdr",459,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",459,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_in_tend_cntr")=459
-	Set gtmtypes("shmpool_buff_hdr",460,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_search_blk_cntr"
-	Set gtmtypes("shmpool_buff_hdr",460,"off")=4112
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.new_buff_cntr")=459
+	Set gtmtypes("shmpool_buff_hdr",460,"name")="shmpool_buff_hdr.shadow_file_header.phase2_commit_wait_sleep_in_crit_cntr"
+	Set gtmtypes("shmpool_buff_hdr",460,"off")=4076
 	Set gtmtypes("shmpool_buff_hdr",460,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",460,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_search_blk_cntr")=460
-	Set gtmtypes("shmpool_buff_hdr",461,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_new_rec_cntr"
-	Set gtmtypes("shmpool_buff_hdr",461,"off")=4116
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.phase2_commit_wait_sleep_in_crit_cntr")=460
+	Set gtmtypes("shmpool_buff_hdr",461,"name")="shmpool_buff_hdr.shadow_file_header.phase2_commit_wait_sleep_no_crit_cntr"
+	Set gtmtypes("shmpool_buff_hdr",461,"off")=4080
 	Set gtmtypes("shmpool_buff_hdr",461,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",461,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_new_rec_cntr")=461
-	Set gtmtypes("shmpool_buff_hdr",462,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_rec_size_cntr"
-	Set gtmtypes("shmpool_buff_hdr",462,"off")=4120
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.phase2_commit_wait_sleep_no_crit_cntr")=461
+	Set gtmtypes("shmpool_buff_hdr",462,"name")="shmpool_buff_hdr.shadow_file_header.phase2_commit_wait_pidcnt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",462,"off")=4084
 	Set gtmtypes("shmpool_buff_hdr",462,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",462,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_rec_size_cntr")=462
-	Set gtmtypes("shmpool_buff_hdr",463,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_rec_cmpc_cntr"
-	Set gtmtypes("shmpool_buff_hdr",463,"off")=4124
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.phase2_commit_wait_pidcnt_cntr")=462
+	Set gtmtypes("shmpool_buff_hdr",463,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_intend_wait_cntr"
+	Set gtmtypes("shmpool_buff_hdr",463,"off")=4088
 	Set gtmtypes("shmpool_buff_hdr",463,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",463,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_rec_cmpc_cntr")=463
-	Set gtmtypes("shmpool_buff_hdr",464,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_blk_fini_cntr"
-	Set gtmtypes("shmpool_buff_hdr",464,"off")=4128
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_intend_wait_cntr")=463
+	Set gtmtypes("shmpool_buff_hdr",464,"name")="shmpool_buff_hdr.shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_cntr"
+	Set gtmtypes("shmpool_buff_hdr",464,"off")=4092
 	Set gtmtypes("shmpool_buff_hdr",464,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",464,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_blk_fini_cntr")=464
-	Set gtmtypes("shmpool_buff_hdr",465,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_blk_split_cntr"
-	Set gtmtypes("shmpool_buff_hdr",465,"off")=4132
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_cntr")=464
+	Set gtmtypes("shmpool_buff_hdr",465,"name")="shmpool_buff_hdr.shadow_file_header.wcb_phase2_commit_wait_cntr"
+	Set gtmtypes("shmpool_buff_hdr",465,"off")=4096
 	Set gtmtypes("shmpool_buff_hdr",465,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",465,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_blk_split_cntr")=465
-	Set gtmtypes("shmpool_buff_hdr",466,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_ripsleep_cnt_cntr"
-	Set gtmtypes("shmpool_buff_hdr",466,"off")=4136
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_phase2_commit_wait_cntr")=465
+	Set gtmtypes("shmpool_buff_hdr",466,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_calls_cntr"
+	Set gtmtypes("shmpool_buff_hdr",466,"off")=4100
 	Set gtmtypes("shmpool_buff_hdr",466,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",466,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_ripsleep_cnt_cntr")=466
-	Set gtmtypes("shmpool_buff_hdr",467,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_ripsleep_nblks_cntr"
-	Set gtmtypes("shmpool_buff_hdr",467,"off")=4140
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_calls_cntr")=466
+	Set gtmtypes("shmpool_buff_hdr",467,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_rip_cntr"
+	Set gtmtypes("shmpool_buff_hdr",467,"off")=4104
 	Set gtmtypes("shmpool_buff_hdr",467,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",467,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_ripsleep_nblks_cntr")=467
-	Set gtmtypes("shmpool_buff_hdr",468,"name")="shmpool_buff_hdr.shadow_file_header.bg_trc_rec_cntr_filler"
-	Set gtmtypes("shmpool_buff_hdr",468,"off")=4144
-	Set gtmtypes("shmpool_buff_hdr",468,"len")=56
-	Set gtmtypes("shmpool_buff_hdr",468,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bg_trc_rec_cntr_filler")=468
-	Set gtmtypes("shmpool_buff_hdr",469,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srches"
-	Set gtmtypes("shmpool_buff_hdr",469,"off")=4200
-	Set gtmtypes("shmpool_buff_hdr",469,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",469,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srches")=469
-	Set gtmtypes("shmpool_buff_hdr",470,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srches.curr_count"
-	Set gtmtypes("shmpool_buff_hdr",470,"off")=4200
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_rip_cntr")=467
+	Set gtmtypes("shmpool_buff_hdr",468,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_in_tend_cntr"
+	Set gtmtypes("shmpool_buff_hdr",468,"off")=4108
+	Set gtmtypes("shmpool_buff_hdr",468,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",468,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_in_tend_cntr")=468
+	Set gtmtypes("shmpool_buff_hdr",469,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_search_blk_cntr"
+	Set gtmtypes("shmpool_buff_hdr",469,"off")=4112
+	Set gtmtypes("shmpool_buff_hdr",469,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",469,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_search_blk_cntr")=469
+	Set gtmtypes("shmpool_buff_hdr",470,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_new_rec_cntr"
+	Set gtmtypes("shmpool_buff_hdr",470,"off")=4116
 	Set gtmtypes("shmpool_buff_hdr",470,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",470,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srches.curr_count")=470
-	Set gtmtypes("shmpool_buff_hdr",471,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srches.cumul_count"
-	Set gtmtypes("shmpool_buff_hdr",471,"off")=4204
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_new_rec_cntr")=470
+	Set gtmtypes("shmpool_buff_hdr",471,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_rec_size_cntr"
+	Set gtmtypes("shmpool_buff_hdr",471,"off")=4120
 	Set gtmtypes("shmpool_buff_hdr",471,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",471,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srches.cumul_count")=471
-	Set gtmtypes("shmpool_buff_hdr",472,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srch_clues"
-	Set gtmtypes("shmpool_buff_hdr",472,"off")=4208
-	Set gtmtypes("shmpool_buff_hdr",472,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",472,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srch_clues")=472
-	Set gtmtypes("shmpool_buff_hdr",473,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srch_clues.curr_count"
-	Set gtmtypes("shmpool_buff_hdr",473,"off")=4208
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_rec_size_cntr")=471
+	Set gtmtypes("shmpool_buff_hdr",472,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_rec_cmpc_cntr"
+	Set gtmtypes("shmpool_buff_hdr",472,"off")=4124
+	Set gtmtypes("shmpool_buff_hdr",472,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",472,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_rec_cmpc_cntr")=472
+	Set gtmtypes("shmpool_buff_hdr",473,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_blk_fini_cntr"
+	Set gtmtypes("shmpool_buff_hdr",473,"off")=4128
 	Set gtmtypes("shmpool_buff_hdr",473,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",473,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srch_clues.curr_count")=473
-	Set gtmtypes("shmpool_buff_hdr",474,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srch_clues.cumul_count"
-	Set gtmtypes("shmpool_buff_hdr",474,"off")=4212
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_blk_fini_cntr")=473
+	Set gtmtypes("shmpool_buff_hdr",474,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_blk_split_cntr"
+	Set gtmtypes("shmpool_buff_hdr",474,"off")=4132
 	Set gtmtypes("shmpool_buff_hdr",474,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",474,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srch_clues.cumul_count")=474
-	Set gtmtypes("shmpool_buff_hdr",475,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_head"
-	Set gtmtypes("shmpool_buff_hdr",475,"off")=4216
-	Set gtmtypes("shmpool_buff_hdr",475,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",475,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_head")=475
-	Set gtmtypes("shmpool_buff_hdr",476,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_head.curr_count"
-	Set gtmtypes("shmpool_buff_hdr",476,"off")=4216
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_blk_split_cntr")=474
+	Set gtmtypes("shmpool_buff_hdr",475,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_ripsleep_cnt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",475,"off")=4136
+	Set gtmtypes("shmpool_buff_hdr",475,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",475,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_ripsleep_cnt_cntr")=475
+	Set gtmtypes("shmpool_buff_hdr",476,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_ripsleep_nblks_cntr"
+	Set gtmtypes("shmpool_buff_hdr",476,"off")=4140
 	Set gtmtypes("shmpool_buff_hdr",476,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",476,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_head.curr_count")=476
-	Set gtmtypes("shmpool_buff_hdr",477,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_head.cumul_count"
-	Set gtmtypes("shmpool_buff_hdr",477,"off")=4220
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_ripsleep_nblks_cntr")=476
+	Set gtmtypes("shmpool_buff_hdr",477,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wtfini_invoked_cntr"
+	Set gtmtypes("shmpool_buff_hdr",477,"off")=4144
 	Set gtmtypes("shmpool_buff_hdr",477,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",477,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_head.cumul_count")=477
-	Set gtmtypes("shmpool_buff_hdr",478,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_same"
-	Set gtmtypes("shmpool_buff_hdr",478,"off")=4224
-	Set gtmtypes("shmpool_buff_hdr",478,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",478,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_same")=478
-	Set gtmtypes("shmpool_buff_hdr",479,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_same.curr_count"
-	Set gtmtypes("shmpool_buff_hdr",479,"off")=4224
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wtfini_invoked_cntr")=477
+	Set gtmtypes("shmpool_buff_hdr",478,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wterror_invoked_cntr"
+	Set gtmtypes("shmpool_buff_hdr",478,"off")=4148
+	Set gtmtypes("shmpool_buff_hdr",478,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",478,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wterror_invoked_cntr")=478
+	Set gtmtypes("shmpool_buff_hdr",479,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wt_restart_invoked_cntr"
+	Set gtmtypes("shmpool_buff_hdr",479,"off")=4152
 	Set gtmtypes("shmpool_buff_hdr",479,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",479,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_same.curr_count")=479
-	Set gtmtypes("shmpool_buff_hdr",480,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_same.cumul_count"
-	Set gtmtypes("shmpool_buff_hdr",480,"off")=4228
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wt_restart_invoked_cntr")=479
+	Set gtmtypes("shmpool_buff_hdr",480,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wt_restart_eagain_cntr"
+	Set gtmtypes("shmpool_buff_hdr",480,"off")=4156
 	Set gtmtypes("shmpool_buff_hdr",480,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",480,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_same.cumul_count")=480
-	Set gtmtypes("shmpool_buff_hdr",481,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_tail"
-	Set gtmtypes("shmpool_buff_hdr",481,"off")=4232
-	Set gtmtypes("shmpool_buff_hdr",481,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",481,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_tail")=481
-	Set gtmtypes("shmpool_buff_hdr",482,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_tail.curr_count"
-	Set gtmtypes("shmpool_buff_hdr",482,"off")=4232
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wt_restart_eagain_cntr")=480
+	Set gtmtypes("shmpool_buff_hdr",481,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wt_restart_reinsert_cntr"
+	Set gtmtypes("shmpool_buff_hdr",481,"off")=4160
+	Set gtmtypes("shmpool_buff_hdr",481,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",481,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wt_restart_reinsert_cntr")=481
+	Set gtmtypes("shmpool_buff_hdr",482,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wtstart_eagain_cntr"
+	Set gtmtypes("shmpool_buff_hdr",482,"off")=4164
 	Set gtmtypes("shmpool_buff_hdr",482,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",482,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_tail.curr_count")=482
-	Set gtmtypes("shmpool_buff_hdr",483,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_tail.cumul_count"
-	Set gtmtypes("shmpool_buff_hdr",483,"off")=4236
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wtstart_eagain_cntr")=482
+	Set gtmtypes("shmpool_buff_hdr",483,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wtstart_eagain_incrit_cntr"
+	Set gtmtypes("shmpool_buff_hdr",483,"off")=4168
 	Set gtmtypes("shmpool_buff_hdr",483,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",483,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_tail.cumul_count")=483
-	Set gtmtypes("shmpool_buff_hdr",484,"name")="shmpool_buff_hdr.shadow_file_header.n_t_qreads"
-	Set gtmtypes("shmpool_buff_hdr",484,"off")=4240
-	Set gtmtypes("shmpool_buff_hdr",484,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",484,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_t_qreads")=484
-	Set gtmtypes("shmpool_buff_hdr",485,"name")="shmpool_buff_hdr.shadow_file_header.n_t_qreads.curr_count"
-	Set gtmtypes("shmpool_buff_hdr",485,"off")=4240
-	Set gtmtypes("shmpool_buff_hdr",485,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",485,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_t_qreads.curr_count")=485
-	Set gtmtypes("shmpool_buff_hdr",486,"name")="shmpool_buff_hdr.shadow_file_header.n_t_qreads.cumul_count"
-	Set gtmtypes("shmpool_buff_hdr",486,"off")=4244
-	Set gtmtypes("shmpool_buff_hdr",486,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",486,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_t_qreads.cumul_count")=486
-	Set gtmtypes("shmpool_buff_hdr",487,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_reads"
-	Set gtmtypes("shmpool_buff_hdr",487,"off")=4248
-	Set gtmtypes("shmpool_buff_hdr",487,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",487,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_reads")=487
-	Set gtmtypes("shmpool_buff_hdr",488,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_reads.curr_count"
-	Set gtmtypes("shmpool_buff_hdr",488,"off")=4248
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wtstart_eagain_incrit_cntr")=483
+	Set gtmtypes("shmpool_buff_hdr",484,"name")="shmpool_buff_hdr.shadow_file_header.async_restart_eagain_cntr"
+	Set gtmtypes("shmpool_buff_hdr",484,"off")=4172
+	Set gtmtypes("shmpool_buff_hdr",484,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",484,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.async_restart_eagain_cntr")=484
+	Set gtmtypes("shmpool_buff_hdr",485,"name")="shmpool_buff_hdr.shadow_file_header.bg_trc_rec_cntr_filler"
+	Set gtmtypes("shmpool_buff_hdr",485,"off")=4176
+	Set gtmtypes("shmpool_buff_hdr",485,"len")=24
+	Set gtmtypes("shmpool_buff_hdr",485,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bg_trc_rec_cntr_filler")=485
+	Set gtmtypes("shmpool_buff_hdr",486,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srches"
+	Set gtmtypes("shmpool_buff_hdr",486,"off")=4200
+	Set gtmtypes("shmpool_buff_hdr",486,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",486,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srches")=486
+	Set gtmtypes("shmpool_buff_hdr",487,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srches.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",487,"off")=4200
+	Set gtmtypes("shmpool_buff_hdr",487,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",487,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srches.curr_count")=487
+	Set gtmtypes("shmpool_buff_hdr",488,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srches.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",488,"off")=4204
 	Set gtmtypes("shmpool_buff_hdr",488,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",488,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_reads.curr_count")=488
-	Set gtmtypes("shmpool_buff_hdr",489,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_reads.cumul_count"
-	Set gtmtypes("shmpool_buff_hdr",489,"off")=4252
-	Set gtmtypes("shmpool_buff_hdr",489,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",489,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_reads.cumul_count")=489
-	Set gtmtypes("shmpool_buff_hdr",490,"name")="shmpool_buff_hdr.shadow_file_header.n_bgmm_updates"
-	Set gtmtypes("shmpool_buff_hdr",490,"off")=4256
-	Set gtmtypes("shmpool_buff_hdr",490,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",490,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bgmm_updates")=490
-	Set gtmtypes("shmpool_buff_hdr",491,"name")="shmpool_buff_hdr.shadow_file_header.n_bgmm_updates.curr_count"
-	Set gtmtypes("shmpool_buff_hdr",491,"off")=4256
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srches.cumul_count")=488
+	Set gtmtypes("shmpool_buff_hdr",489,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srch_clues"
+	Set gtmtypes("shmpool_buff_hdr",489,"off")=4208
+	Set gtmtypes("shmpool_buff_hdr",489,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",489,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srch_clues")=489
+	Set gtmtypes("shmpool_buff_hdr",490,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srch_clues.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",490,"off")=4208
+	Set gtmtypes("shmpool_buff_hdr",490,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",490,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srch_clues.curr_count")=490
+	Set gtmtypes("shmpool_buff_hdr",491,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srch_clues.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",491,"off")=4212
 	Set gtmtypes("shmpool_buff_hdr",491,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",491,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bgmm_updates.curr_count")=491
-	Set gtmtypes("shmpool_buff_hdr",492,"name")="shmpool_buff_hdr.shadow_file_header.n_bgmm_updates.cumul_count"
-	Set gtmtypes("shmpool_buff_hdr",492,"off")=4260
-	Set gtmtypes("shmpool_buff_hdr",492,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",492,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bgmm_updates.cumul_count")=492
-	Set gtmtypes("shmpool_buff_hdr",493,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_writes"
-	Set gtmtypes("shmpool_buff_hdr",493,"off")=4264
-	Set gtmtypes("shmpool_buff_hdr",493,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",493,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_writes")=493
-	Set gtmtypes("shmpool_buff_hdr",494,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_writes.curr_count"
-	Set gtmtypes("shmpool_buff_hdr",494,"off")=4264
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srch_clues.cumul_count")=491
+	Set gtmtypes("shmpool_buff_hdr",492,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_head"
+	Set gtmtypes("shmpool_buff_hdr",492,"off")=4216
+	Set gtmtypes("shmpool_buff_hdr",492,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",492,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_head")=492
+	Set gtmtypes("shmpool_buff_hdr",493,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_head.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",493,"off")=4216
+	Set gtmtypes("shmpool_buff_hdr",493,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",493,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_head.curr_count")=493
+	Set gtmtypes("shmpool_buff_hdr",494,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_head.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",494,"off")=4220
 	Set gtmtypes("shmpool_buff_hdr",494,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",494,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_writes.curr_count")=494
-	Set gtmtypes("shmpool_buff_hdr",495,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_writes.cumul_count"
-	Set gtmtypes("shmpool_buff_hdr",495,"off")=4268
-	Set gtmtypes("shmpool_buff_hdr",495,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",495,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_writes.cumul_count")=495
-	Set gtmtypes("shmpool_buff_hdr",496,"name")="shmpool_buff_hdr.shadow_file_header.n_bg_update_creates"
-	Set gtmtypes("shmpool_buff_hdr",496,"off")=4272
-	Set gtmtypes("shmpool_buff_hdr",496,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",496,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bg_update_creates")=496
-	Set gtmtypes("shmpool_buff_hdr",497,"name")="shmpool_buff_hdr.shadow_file_header.n_bg_update_creates.curr_count"
-	Set gtmtypes("shmpool_buff_hdr",497,"off")=4272
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_head.cumul_count")=494
+	Set gtmtypes("shmpool_buff_hdr",495,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_same"
+	Set gtmtypes("shmpool_buff_hdr",495,"off")=4224
+	Set gtmtypes("shmpool_buff_hdr",495,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",495,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_same")=495
+	Set gtmtypes("shmpool_buff_hdr",496,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_same.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",496,"off")=4224
+	Set gtmtypes("shmpool_buff_hdr",496,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",496,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_same.curr_count")=496
+	Set gtmtypes("shmpool_buff_hdr",497,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_same.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",497,"off")=4228
 	Set gtmtypes("shmpool_buff_hdr",497,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",497,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bg_update_creates.curr_count")=497
-	Set gtmtypes("shmpool_buff_hdr",498,"name")="shmpool_buff_hdr.shadow_file_header.n_bg_update_creates.cumul_count"
-	Set gtmtypes("shmpool_buff_hdr",498,"off")=4276
-	Set gtmtypes("shmpool_buff_hdr",498,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",498,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bg_update_creates.cumul_count")=498
-	Set gtmtypes("shmpool_buff_hdr",499,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getns"
-	Set gtmtypes("shmpool_buff_hdr",499,"off")=4280
-	Set gtmtypes("shmpool_buff_hdr",499,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",499,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getns")=499
-	Set gtmtypes("shmpool_buff_hdr",500,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getns.curr_count"
-	Set gtmtypes("shmpool_buff_hdr",500,"off")=4280
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_same.cumul_count")=497
+	Set gtmtypes("shmpool_buff_hdr",498,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_tail"
+	Set gtmtypes("shmpool_buff_hdr",498,"off")=4232
+	Set gtmtypes("shmpool_buff_hdr",498,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",498,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_tail")=498
+	Set gtmtypes("shmpool_buff_hdr",499,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_tail.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",499,"off")=4232
+	Set gtmtypes("shmpool_buff_hdr",499,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",499,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_tail.curr_count")=499
+	Set gtmtypes("shmpool_buff_hdr",500,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_tail.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",500,"off")=4236
 	Set gtmtypes("shmpool_buff_hdr",500,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",500,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getns.curr_count")=500
-	Set gtmtypes("shmpool_buff_hdr",501,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getns.cumul_count"
-	Set gtmtypes("shmpool_buff_hdr",501,"off")=4284
-	Set gtmtypes("shmpool_buff_hdr",501,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",501,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getns.cumul_count")=501
-	Set gtmtypes("shmpool_buff_hdr",502,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getn_lcnt"
-	Set gtmtypes("shmpool_buff_hdr",502,"off")=4288
-	Set gtmtypes("shmpool_buff_hdr",502,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",502,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getn_lcnt")=502
-	Set gtmtypes("shmpool_buff_hdr",503,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getn_lcnt.curr_count"
-	Set gtmtypes("shmpool_buff_hdr",503,"off")=4288
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_tail.cumul_count")=500
+	Set gtmtypes("shmpool_buff_hdr",501,"name")="shmpool_buff_hdr.shadow_file_header.n_t_qreads"
+	Set gtmtypes("shmpool_buff_hdr",501,"off")=4240
+	Set gtmtypes("shmpool_buff_hdr",501,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",501,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_t_qreads")=501
+	Set gtmtypes("shmpool_buff_hdr",502,"name")="shmpool_buff_hdr.shadow_file_header.n_t_qreads.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",502,"off")=4240
+	Set gtmtypes("shmpool_buff_hdr",502,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",502,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_t_qreads.curr_count")=502
+	Set gtmtypes("shmpool_buff_hdr",503,"name")="shmpool_buff_hdr.shadow_file_header.n_t_qreads.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",503,"off")=4244
 	Set gtmtypes("shmpool_buff_hdr",503,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",503,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getn_lcnt.curr_count")=503
-	Set gtmtypes("shmpool_buff_hdr",504,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getn_lcnt.cumul_count"
-	Set gtmtypes("shmpool_buff_hdr",504,"off")=4292
-	Set gtmtypes("shmpool_buff_hdr",504,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",504,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getn_lcnt.cumul_count")=504
-	Set gtmtypes("shmpool_buff_hdr",505,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_acct_rec_filler_4k"
-	Set gtmtypes("shmpool_buff_hdr",505,"off")=4296
-	Set gtmtypes("shmpool_buff_hdr",505,"len")=152
-	Set gtmtypes("shmpool_buff_hdr",505,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_acct_rec_filler_4k")=505
-	Set gtmtypes("shmpool_buff_hdr",506,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec"
-	Set gtmtypes("shmpool_buff_hdr",506,"off")=4448
-	Set gtmtypes("shmpool_buff_hdr",506,"len")=464
-	Set gtmtypes("shmpool_buff_hdr",506,"type")="gvstats_rec_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec")=506
-	Set gtmtypes("shmpool_buff_hdr",507,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_set"
-	Set gtmtypes("shmpool_buff_hdr",507,"off")=4448
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_t_qreads.cumul_count")=503
+	Set gtmtypes("shmpool_buff_hdr",504,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_reads"
+	Set gtmtypes("shmpool_buff_hdr",504,"off")=4248
+	Set gtmtypes("shmpool_buff_hdr",504,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",504,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_reads")=504
+	Set gtmtypes("shmpool_buff_hdr",505,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_reads.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",505,"off")=4248
+	Set gtmtypes("shmpool_buff_hdr",505,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",505,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_reads.curr_count")=505
+	Set gtmtypes("shmpool_buff_hdr",506,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_reads.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",506,"off")=4252
+	Set gtmtypes("shmpool_buff_hdr",506,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",506,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_reads.cumul_count")=506
+	Set gtmtypes("shmpool_buff_hdr",507,"name")="shmpool_buff_hdr.shadow_file_header.n_bgmm_updates"
+	Set gtmtypes("shmpool_buff_hdr",507,"off")=4256
 	Set gtmtypes("shmpool_buff_hdr",507,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",507,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_set")=507
-	Set gtmtypes("shmpool_buff_hdr",508,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_kill"
-	Set gtmtypes("shmpool_buff_hdr",508,"off")=4456
-	Set gtmtypes("shmpool_buff_hdr",508,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",508,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_kill")=508
-	Set gtmtypes("shmpool_buff_hdr",509,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_get"
-	Set gtmtypes("shmpool_buff_hdr",509,"off")=4464
-	Set gtmtypes("shmpool_buff_hdr",509,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",509,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_get")=509
-	Set gtmtypes("shmpool_buff_hdr",510,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_data"
-	Set gtmtypes("shmpool_buff_hdr",510,"off")=4472
+	Set gtmtypes("shmpool_buff_hdr",507,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bgmm_updates")=507
+	Set gtmtypes("shmpool_buff_hdr",508,"name")="shmpool_buff_hdr.shadow_file_header.n_bgmm_updates.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",508,"off")=4256
+	Set gtmtypes("shmpool_buff_hdr",508,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",508,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bgmm_updates.curr_count")=508
+	Set gtmtypes("shmpool_buff_hdr",509,"name")="shmpool_buff_hdr.shadow_file_header.n_bgmm_updates.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",509,"off")=4260
+	Set gtmtypes("shmpool_buff_hdr",509,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",509,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bgmm_updates.cumul_count")=509
+	Set gtmtypes("shmpool_buff_hdr",510,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_writes"
+	Set gtmtypes("shmpool_buff_hdr",510,"off")=4264
 	Set gtmtypes("shmpool_buff_hdr",510,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",510,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_data")=510
-	Set gtmtypes("shmpool_buff_hdr",511,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_order"
-	Set gtmtypes("shmpool_buff_hdr",511,"off")=4480
-	Set gtmtypes("shmpool_buff_hdr",511,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",511,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_order")=511
-	Set gtmtypes("shmpool_buff_hdr",512,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_zprev"
-	Set gtmtypes("shmpool_buff_hdr",512,"off")=4488
-	Set gtmtypes("shmpool_buff_hdr",512,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",512,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_zprev")=512
-	Set gtmtypes("shmpool_buff_hdr",513,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_query"
-	Set gtmtypes("shmpool_buff_hdr",513,"off")=4496
+	Set gtmtypes("shmpool_buff_hdr",510,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_writes")=510
+	Set gtmtypes("shmpool_buff_hdr",511,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_writes.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",511,"off")=4264
+	Set gtmtypes("shmpool_buff_hdr",511,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",511,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_writes.curr_count")=511
+	Set gtmtypes("shmpool_buff_hdr",512,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_writes.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",512,"off")=4268
+	Set gtmtypes("shmpool_buff_hdr",512,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",512,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_writes.cumul_count")=512
+	Set gtmtypes("shmpool_buff_hdr",513,"name")="shmpool_buff_hdr.shadow_file_header.n_bg_update_creates"
+	Set gtmtypes("shmpool_buff_hdr",513,"off")=4272
 	Set gtmtypes("shmpool_buff_hdr",513,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",513,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_query")=513
-	Set gtmtypes("shmpool_buff_hdr",514,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_lock_success"
-	Set gtmtypes("shmpool_buff_hdr",514,"off")=4504
-	Set gtmtypes("shmpool_buff_hdr",514,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",514,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_lock_success")=514
-	Set gtmtypes("shmpool_buff_hdr",515,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_lock_fail"
-	Set gtmtypes("shmpool_buff_hdr",515,"off")=4512
-	Set gtmtypes("shmpool_buff_hdr",515,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",515,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_lock_fail")=515
-	Set gtmtypes("shmpool_buff_hdr",516,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.db_curr_tn"
-	Set gtmtypes("shmpool_buff_hdr",516,"off")=4520
+	Set gtmtypes("shmpool_buff_hdr",513,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bg_update_creates")=513
+	Set gtmtypes("shmpool_buff_hdr",514,"name")="shmpool_buff_hdr.shadow_file_header.n_bg_update_creates.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",514,"off")=4272
+	Set gtmtypes("shmpool_buff_hdr",514,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",514,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bg_update_creates.curr_count")=514
+	Set gtmtypes("shmpool_buff_hdr",515,"name")="shmpool_buff_hdr.shadow_file_header.n_bg_update_creates.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",515,"off")=4276
+	Set gtmtypes("shmpool_buff_hdr",515,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",515,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bg_update_creates.cumul_count")=515
+	Set gtmtypes("shmpool_buff_hdr",516,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getns"
+	Set gtmtypes("shmpool_buff_hdr",516,"off")=4280
 	Set gtmtypes("shmpool_buff_hdr",516,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",516,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.db_curr_tn")=516
-	Set gtmtypes("shmpool_buff_hdr",517,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_dsk_read"
-	Set gtmtypes("shmpool_buff_hdr",517,"off")=4528
-	Set gtmtypes("shmpool_buff_hdr",517,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",517,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_dsk_read")=517
-	Set gtmtypes("shmpool_buff_hdr",518,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_dsk_write"
-	Set gtmtypes("shmpool_buff_hdr",518,"off")=4536
-	Set gtmtypes("shmpool_buff_hdr",518,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",518,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_dsk_write")=518
-	Set gtmtypes("shmpool_buff_hdr",519,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_readwrite"
-	Set gtmtypes("shmpool_buff_hdr",519,"off")=4544
+	Set gtmtypes("shmpool_buff_hdr",516,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getns")=516
+	Set gtmtypes("shmpool_buff_hdr",517,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getns.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",517,"off")=4280
+	Set gtmtypes("shmpool_buff_hdr",517,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",517,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getns.curr_count")=517
+	Set gtmtypes("shmpool_buff_hdr",518,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getns.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",518,"off")=4284
+	Set gtmtypes("shmpool_buff_hdr",518,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",518,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getns.cumul_count")=518
+	Set gtmtypes("shmpool_buff_hdr",519,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getn_lcnt"
+	Set gtmtypes("shmpool_buff_hdr",519,"off")=4288
 	Set gtmtypes("shmpool_buff_hdr",519,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",519,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_readwrite")=519
-	Set gtmtypes("shmpool_buff_hdr",520,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_readonly"
-	Set gtmtypes("shmpool_buff_hdr",520,"off")=4552
-	Set gtmtypes("shmpool_buff_hdr",520,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",520,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_readonly")=520
-	Set gtmtypes("shmpool_buff_hdr",521,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_blkwrite"
-	Set gtmtypes("shmpool_buff_hdr",521,"off")=4560
-	Set gtmtypes("shmpool_buff_hdr",521,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",521,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_blkwrite")=521
-	Set gtmtypes("shmpool_buff_hdr",522,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_blkread"
-	Set gtmtypes("shmpool_buff_hdr",522,"off")=4568
-	Set gtmtypes("shmpool_buff_hdr",522,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",522,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_blkread")=522
-	Set gtmtypes("shmpool_buff_hdr",523,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_retries_0"
-	Set gtmtypes("shmpool_buff_hdr",523,"off")=4576
-	Set gtmtypes("shmpool_buff_hdr",523,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",523,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_retries_0")=523
-	Set gtmtypes("shmpool_buff_hdr",524,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_retries_1"
-	Set gtmtypes("shmpool_buff_hdr",524,"off")=4584
+	Set gtmtypes("shmpool_buff_hdr",519,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getn_lcnt")=519
+	Set gtmtypes("shmpool_buff_hdr",520,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getn_lcnt.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",520,"off")=4288
+	Set gtmtypes("shmpool_buff_hdr",520,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",520,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getn_lcnt.curr_count")=520
+	Set gtmtypes("shmpool_buff_hdr",521,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getn_lcnt.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",521,"off")=4292
+	Set gtmtypes("shmpool_buff_hdr",521,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",521,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getn_lcnt.cumul_count")=521
+	Set gtmtypes("shmpool_buff_hdr",522,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_acct_rec_filler_4k"
+	Set gtmtypes("shmpool_buff_hdr",522,"off")=4296
+	Set gtmtypes("shmpool_buff_hdr",522,"len")=152
+	Set gtmtypes("shmpool_buff_hdr",522,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_acct_rec_filler_4k")=522
+	Set gtmtypes("shmpool_buff_hdr",523,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec"
+	Set gtmtypes("shmpool_buff_hdr",523,"off")=4448
+	Set gtmtypes("shmpool_buff_hdr",523,"len")=472
+	Set gtmtypes("shmpool_buff_hdr",523,"type")="gvstats_rec_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec")=523
+	Set gtmtypes("shmpool_buff_hdr",524,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_set"
+	Set gtmtypes("shmpool_buff_hdr",524,"off")=4448
 	Set gtmtypes("shmpool_buff_hdr",524,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",524,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_retries_1")=524
-	Set gtmtypes("shmpool_buff_hdr",525,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_retries_2"
-	Set gtmtypes("shmpool_buff_hdr",525,"off")=4592
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_set")=524
+	Set gtmtypes("shmpool_buff_hdr",525,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_kill"
+	Set gtmtypes("shmpool_buff_hdr",525,"off")=4456
 	Set gtmtypes("shmpool_buff_hdr",525,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",525,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_retries_2")=525
-	Set gtmtypes("shmpool_buff_hdr",526,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_retries_3"
-	Set gtmtypes("shmpool_buff_hdr",526,"off")=4600
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_kill")=525
+	Set gtmtypes("shmpool_buff_hdr",526,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_get"
+	Set gtmtypes("shmpool_buff_hdr",526,"off")=4464
 	Set gtmtypes("shmpool_buff_hdr",526,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",526,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_retries_3")=526
-	Set gtmtypes("shmpool_buff_hdr",527,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_readwrite"
-	Set gtmtypes("shmpool_buff_hdr",527,"off")=4608
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_get")=526
+	Set gtmtypes("shmpool_buff_hdr",527,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_data"
+	Set gtmtypes("shmpool_buff_hdr",527,"off")=4472
 	Set gtmtypes("shmpool_buff_hdr",527,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",527,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_readwrite")=527
-	Set gtmtypes("shmpool_buff_hdr",528,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_readonly"
-	Set gtmtypes("shmpool_buff_hdr",528,"off")=4616
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_data")=527
+	Set gtmtypes("shmpool_buff_hdr",528,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_order"
+	Set gtmtypes("shmpool_buff_hdr",528,"off")=4480
 	Set gtmtypes("shmpool_buff_hdr",528,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",528,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_readonly")=528
-	Set gtmtypes("shmpool_buff_hdr",529,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_rolledback"
-	Set gtmtypes("shmpool_buff_hdr",529,"off")=4624
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_order")=528
+	Set gtmtypes("shmpool_buff_hdr",529,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_zprev"
+	Set gtmtypes("shmpool_buff_hdr",529,"off")=4488
 	Set gtmtypes("shmpool_buff_hdr",529,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",529,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_rolledback")=529
-	Set gtmtypes("shmpool_buff_hdr",530,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_blkwrite"
-	Set gtmtypes("shmpool_buff_hdr",530,"off")=4632
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_zprev")=529
+	Set gtmtypes("shmpool_buff_hdr",530,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_query"
+	Set gtmtypes("shmpool_buff_hdr",530,"off")=4496
 	Set gtmtypes("shmpool_buff_hdr",530,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",530,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_blkwrite")=530
-	Set gtmtypes("shmpool_buff_hdr",531,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_blkread"
-	Set gtmtypes("shmpool_buff_hdr",531,"off")=4640
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_query")=530
+	Set gtmtypes("shmpool_buff_hdr",531,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_lock_success"
+	Set gtmtypes("shmpool_buff_hdr",531,"off")=4504
 	Set gtmtypes("shmpool_buff_hdr",531,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",531,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_blkread")=531
-	Set gtmtypes("shmpool_buff_hdr",532,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_tot_retries_0"
-	Set gtmtypes("shmpool_buff_hdr",532,"off")=4648
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_lock_success")=531
+	Set gtmtypes("shmpool_buff_hdr",532,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_lock_fail"
+	Set gtmtypes("shmpool_buff_hdr",532,"off")=4512
 	Set gtmtypes("shmpool_buff_hdr",532,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",532,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_tot_retries_0")=532
-	Set gtmtypes("shmpool_buff_hdr",533,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_tot_retries_1"
-	Set gtmtypes("shmpool_buff_hdr",533,"off")=4656
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_lock_fail")=532
+	Set gtmtypes("shmpool_buff_hdr",533,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.db_curr_tn"
+	Set gtmtypes("shmpool_buff_hdr",533,"off")=4520
 	Set gtmtypes("shmpool_buff_hdr",533,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",533,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_tot_retries_1")=533
-	Set gtmtypes("shmpool_buff_hdr",534,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_tot_retries_2"
-	Set gtmtypes("shmpool_buff_hdr",534,"off")=4664
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.db_curr_tn")=533
+	Set gtmtypes("shmpool_buff_hdr",534,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_dsk_read"
+	Set gtmtypes("shmpool_buff_hdr",534,"off")=4528
 	Set gtmtypes("shmpool_buff_hdr",534,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",534,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_tot_retries_2")=534
-	Set gtmtypes("shmpool_buff_hdr",535,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_tot_retries_3"
-	Set gtmtypes("shmpool_buff_hdr",535,"off")=4672
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_dsk_read")=534
+	Set gtmtypes("shmpool_buff_hdr",535,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_dsk_write"
+	Set gtmtypes("shmpool_buff_hdr",535,"off")=4536
 	Set gtmtypes("shmpool_buff_hdr",535,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",535,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_tot_retries_3")=535
-	Set gtmtypes("shmpool_buff_hdr",536,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_tot_retries_4"
-	Set gtmtypes("shmpool_buff_hdr",536,"off")=4680
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_dsk_write")=535
+	Set gtmtypes("shmpool_buff_hdr",536,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_readwrite"
+	Set gtmtypes("shmpool_buff_hdr",536,"off")=4544
 	Set gtmtypes("shmpool_buff_hdr",536,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",536,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_tot_retries_4")=536
-	Set gtmtypes("shmpool_buff_hdr",537,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_0"
-	Set gtmtypes("shmpool_buff_hdr",537,"off")=4688
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_readwrite")=536
+	Set gtmtypes("shmpool_buff_hdr",537,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_readonly"
+	Set gtmtypes("shmpool_buff_hdr",537,"off")=4552
 	Set gtmtypes("shmpool_buff_hdr",537,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",537,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_0")=537
-	Set gtmtypes("shmpool_buff_hdr",538,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_1"
-	Set gtmtypes("shmpool_buff_hdr",538,"off")=4696
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_readonly")=537
+	Set gtmtypes("shmpool_buff_hdr",538,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_blkwrite"
+	Set gtmtypes("shmpool_buff_hdr",538,"off")=4560
 	Set gtmtypes("shmpool_buff_hdr",538,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",538,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_1")=538
-	Set gtmtypes("shmpool_buff_hdr",539,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_2"
-	Set gtmtypes("shmpool_buff_hdr",539,"off")=4704
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_blkwrite")=538
+	Set gtmtypes("shmpool_buff_hdr",539,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_blkread"
+	Set gtmtypes("shmpool_buff_hdr",539,"off")=4568
 	Set gtmtypes("shmpool_buff_hdr",539,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",539,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_2")=539
-	Set gtmtypes("shmpool_buff_hdr",540,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_3"
-	Set gtmtypes("shmpool_buff_hdr",540,"off")=4712
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_blkread")=539
+	Set gtmtypes("shmpool_buff_hdr",540,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_retries_0"
+	Set gtmtypes("shmpool_buff_hdr",540,"off")=4576
 	Set gtmtypes("shmpool_buff_hdr",540,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",540,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_3")=540
-	Set gtmtypes("shmpool_buff_hdr",541,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_4"
-	Set gtmtypes("shmpool_buff_hdr",541,"off")=4720
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_retries_0")=540
+	Set gtmtypes("shmpool_buff_hdr",541,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_retries_1"
+	Set gtmtypes("shmpool_buff_hdr",541,"off")=4584
 	Set gtmtypes("shmpool_buff_hdr",541,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",541,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_4")=541
-	Set gtmtypes("shmpool_buff_hdr",542,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_ztrigger"
-	Set gtmtypes("shmpool_buff_hdr",542,"off")=4728
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_retries_1")=541
+	Set gtmtypes("shmpool_buff_hdr",542,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_retries_2"
+	Set gtmtypes("shmpool_buff_hdr",542,"off")=4592
 	Set gtmtypes("shmpool_buff_hdr",542,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",542,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_ztrigger")=542
-	Set gtmtypes("shmpool_buff_hdr",543,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_db_flush"
-	Set gtmtypes("shmpool_buff_hdr",543,"off")=4736
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_retries_2")=542
+	Set gtmtypes("shmpool_buff_hdr",543,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_retries_3"
+	Set gtmtypes("shmpool_buff_hdr",543,"off")=4600
 	Set gtmtypes("shmpool_buff_hdr",543,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",543,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_db_flush")=543
-	Set gtmtypes("shmpool_buff_hdr",544,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_db_fsync"
-	Set gtmtypes("shmpool_buff_hdr",544,"off")=4744
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_retries_3")=543
+	Set gtmtypes("shmpool_buff_hdr",544,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_readwrite"
+	Set gtmtypes("shmpool_buff_hdr",544,"off")=4608
 	Set gtmtypes("shmpool_buff_hdr",544,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",544,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_db_fsync")=544
-	Set gtmtypes("shmpool_buff_hdr",545,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jnl_flush"
-	Set gtmtypes("shmpool_buff_hdr",545,"off")=4752
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_readwrite")=544
+	Set gtmtypes("shmpool_buff_hdr",545,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_readonly"
+	Set gtmtypes("shmpool_buff_hdr",545,"off")=4616
 	Set gtmtypes("shmpool_buff_hdr",545,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",545,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jnl_flush")=545
-	Set gtmtypes("shmpool_buff_hdr",546,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jnl_fsync"
-	Set gtmtypes("shmpool_buff_hdr",546,"off")=4760
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_readonly")=545
+	Set gtmtypes("shmpool_buff_hdr",546,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_rolledback"
+	Set gtmtypes("shmpool_buff_hdr",546,"off")=4624
 	Set gtmtypes("shmpool_buff_hdr",546,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",546,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jnl_fsync")=546
-	Set gtmtypes("shmpool_buff_hdr",547,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jbuff_bytes"
-	Set gtmtypes("shmpool_buff_hdr",547,"off")=4768
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_rolledback")=546
+	Set gtmtypes("shmpool_buff_hdr",547,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_blkwrite"
+	Set gtmtypes("shmpool_buff_hdr",547,"off")=4632
 	Set gtmtypes("shmpool_buff_hdr",547,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",547,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jbuff_bytes")=547
-	Set gtmtypes("shmpool_buff_hdr",548,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jfile_bytes"
-	Set gtmtypes("shmpool_buff_hdr",548,"off")=4776
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_blkwrite")=547
+	Set gtmtypes("shmpool_buff_hdr",548,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_blkread"
+	Set gtmtypes("shmpool_buff_hdr",548,"off")=4640
 	Set gtmtypes("shmpool_buff_hdr",548,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",548,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jfile_bytes")=548
-	Set gtmtypes("shmpool_buff_hdr",549,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jfile_writes"
-	Set gtmtypes("shmpool_buff_hdr",549,"off")=4784
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_blkread")=548
+	Set gtmtypes("shmpool_buff_hdr",549,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_tot_retries_0"
+	Set gtmtypes("shmpool_buff_hdr",549,"off")=4648
 	Set gtmtypes("shmpool_buff_hdr",549,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",549,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jfile_writes")=549
-	Set gtmtypes("shmpool_buff_hdr",550,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jrec_logical"
-	Set gtmtypes("shmpool_buff_hdr",550,"off")=4792
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_tot_retries_0")=549
+	Set gtmtypes("shmpool_buff_hdr",550,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_tot_retries_1"
+	Set gtmtypes("shmpool_buff_hdr",550,"off")=4656
 	Set gtmtypes("shmpool_buff_hdr",550,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",550,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jrec_logical")=550
-	Set gtmtypes("shmpool_buff_hdr",551,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jrec_pblk"
-	Set gtmtypes("shmpool_buff_hdr",551,"off")=4800
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_tot_retries_1")=550
+	Set gtmtypes("shmpool_buff_hdr",551,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_tot_retries_2"
+	Set gtmtypes("shmpool_buff_hdr",551,"off")=4664
 	Set gtmtypes("shmpool_buff_hdr",551,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",551,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jrec_pblk")=551
-	Set gtmtypes("shmpool_buff_hdr",552,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jrec_epoch_regular"
-	Set gtmtypes("shmpool_buff_hdr",552,"off")=4808
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_tot_retries_2")=551
+	Set gtmtypes("shmpool_buff_hdr",552,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_tot_retries_3"
+	Set gtmtypes("shmpool_buff_hdr",552,"off")=4672
 	Set gtmtypes("shmpool_buff_hdr",552,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",552,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jrec_epoch_regular")=552
-	Set gtmtypes("shmpool_buff_hdr",553,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jrec_epoch_idle"
-	Set gtmtypes("shmpool_buff_hdr",553,"off")=4816
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_tot_retries_3")=552
+	Set gtmtypes("shmpool_buff_hdr",553,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_tot_retries_4"
+	Set gtmtypes("shmpool_buff_hdr",553,"off")=4680
 	Set gtmtypes("shmpool_buff_hdr",553,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",553,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jrec_epoch_idle")=553
-	Set gtmtypes("shmpool_buff_hdr",554,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jrec_other"
-	Set gtmtypes("shmpool_buff_hdr",554,"off")=4824
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_tot_retries_4")=553
+	Set gtmtypes("shmpool_buff_hdr",554,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_0"
+	Set gtmtypes("shmpool_buff_hdr",554,"off")=4688
 	Set gtmtypes("shmpool_buff_hdr",554,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",554,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jrec_other")=554
-	Set gtmtypes("shmpool_buff_hdr",555,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jnl_extends"
-	Set gtmtypes("shmpool_buff_hdr",555,"off")=4832
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_0")=554
+	Set gtmtypes("shmpool_buff_hdr",555,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_1"
+	Set gtmtypes("shmpool_buff_hdr",555,"off")=4696
 	Set gtmtypes("shmpool_buff_hdr",555,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",555,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jnl_extends")=555
-	Set gtmtypes("shmpool_buff_hdr",556,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_db_extends"
-	Set gtmtypes("shmpool_buff_hdr",556,"off")=4840
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_1")=555
+	Set gtmtypes("shmpool_buff_hdr",556,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_2"
+	Set gtmtypes("shmpool_buff_hdr",556,"off")=4704
 	Set gtmtypes("shmpool_buff_hdr",556,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",556,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_db_extends")=556
-	Set gtmtypes("shmpool_buff_hdr",557,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_crit_success"
-	Set gtmtypes("shmpool_buff_hdr",557,"off")=4848
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_2")=556
+	Set gtmtypes("shmpool_buff_hdr",557,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_3"
+	Set gtmtypes("shmpool_buff_hdr",557,"off")=4712
 	Set gtmtypes("shmpool_buff_hdr",557,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",557,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_crit_success")=557
-	Set gtmtypes("shmpool_buff_hdr",558,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_crits_in_epch"
-	Set gtmtypes("shmpool_buff_hdr",558,"off")=4856
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_3")=557
+	Set gtmtypes("shmpool_buff_hdr",558,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_4"
+	Set gtmtypes("shmpool_buff_hdr",558,"off")=4720
 	Set gtmtypes("shmpool_buff_hdr",558,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",558,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_crits_in_epch")=558
-	Set gtmtypes("shmpool_buff_hdr",559,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.sq_crit_failed"
-	Set gtmtypes("shmpool_buff_hdr",559,"off")=4864
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_4")=558
+	Set gtmtypes("shmpool_buff_hdr",559,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_ztrigger"
+	Set gtmtypes("shmpool_buff_hdr",559,"off")=4728
 	Set gtmtypes("shmpool_buff_hdr",559,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",559,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.sq_crit_failed")=559
-	Set gtmtypes("shmpool_buff_hdr",560,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_crit_failed"
-	Set gtmtypes("shmpool_buff_hdr",560,"off")=4872
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_ztrigger")=559
+	Set gtmtypes("shmpool_buff_hdr",560,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_db_flush"
+	Set gtmtypes("shmpool_buff_hdr",560,"off")=4736
 	Set gtmtypes("shmpool_buff_hdr",560,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",560,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_crit_failed")=560
-	Set gtmtypes("shmpool_buff_hdr",561,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.sq_crit_que_slps"
-	Set gtmtypes("shmpool_buff_hdr",561,"off")=4880
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_db_flush")=560
+	Set gtmtypes("shmpool_buff_hdr",561,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_db_fsync"
+	Set gtmtypes("shmpool_buff_hdr",561,"off")=4744
 	Set gtmtypes("shmpool_buff_hdr",561,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",561,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.sq_crit_que_slps")=561
-	Set gtmtypes("shmpool_buff_hdr",562,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_crit_que_slps"
-	Set gtmtypes("shmpool_buff_hdr",562,"off")=4888
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_db_fsync")=561
+	Set gtmtypes("shmpool_buff_hdr",562,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jnl_flush"
+	Set gtmtypes("shmpool_buff_hdr",562,"off")=4752
 	Set gtmtypes("shmpool_buff_hdr",562,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",562,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_crit_que_slps")=562
-	Set gtmtypes("shmpool_buff_hdr",563,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.sq_crit_yields"
-	Set gtmtypes("shmpool_buff_hdr",563,"off")=4896
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jnl_flush")=562
+	Set gtmtypes("shmpool_buff_hdr",563,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jnl_fsync"
+	Set gtmtypes("shmpool_buff_hdr",563,"off")=4760
 	Set gtmtypes("shmpool_buff_hdr",563,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",563,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.sq_crit_yields")=563
-	Set gtmtypes("shmpool_buff_hdr",564,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_crit_yields"
-	Set gtmtypes("shmpool_buff_hdr",564,"off")=4904
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jnl_fsync")=563
+	Set gtmtypes("shmpool_buff_hdr",564,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jbuff_bytes"
+	Set gtmtypes("shmpool_buff_hdr",564,"off")=4768
 	Set gtmtypes("shmpool_buff_hdr",564,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",564,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_crit_yields")=564
-	Set gtmtypes("shmpool_buff_hdr",565,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec_filler_4k_plus_512"
-	Set gtmtypes("shmpool_buff_hdr",565,"off")=4912
-	Set gtmtypes("shmpool_buff_hdr",565,"len")=48
-	Set gtmtypes("shmpool_buff_hdr",565,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec_filler_4k_plus_512")=565
-	Set gtmtypes("shmpool_buff_hdr",566,"name")="shmpool_buff_hdr.shadow_file_header.filler_4k_plus_512"
-	Set gtmtypes("shmpool_buff_hdr",566,"off")=4960
-	Set gtmtypes("shmpool_buff_hdr",566,"len")=368
-	Set gtmtypes("shmpool_buff_hdr",566,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_4k_plus_512")=566
-	Set gtmtypes("shmpool_buff_hdr",567,"name")="shmpool_buff_hdr.shadow_file_header.intrpt_recov_resync_strm_seqno"
-	Set gtmtypes("shmpool_buff_hdr",567,"off")=5328
-	Set gtmtypes("shmpool_buff_hdr",567,"len")=128
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jbuff_bytes")=564
+	Set gtmtypes("shmpool_buff_hdr",565,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jfile_bytes"
+	Set gtmtypes("shmpool_buff_hdr",565,"off")=4776
+	Set gtmtypes("shmpool_buff_hdr",565,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",565,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jfile_bytes")=565
+	Set gtmtypes("shmpool_buff_hdr",566,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jfile_writes"
+	Set gtmtypes("shmpool_buff_hdr",566,"off")=4784
+	Set gtmtypes("shmpool_buff_hdr",566,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",566,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jfile_writes")=566
+	Set gtmtypes("shmpool_buff_hdr",567,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jrec_logical"
+	Set gtmtypes("shmpool_buff_hdr",567,"off")=4792
+	Set gtmtypes("shmpool_buff_hdr",567,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",567,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.intrpt_recov_resync_strm_seqno")=567
-	Set gtmtypes("shmpool_buff_hdr",567,"dim")=16
-	Set gtmtypes("shmpool_buff_hdr",568,"name")="shmpool_buff_hdr.shadow_file_header.creation_db_ver"
-	Set gtmtypes("shmpool_buff_hdr",568,"off")=5456
-	Set gtmtypes("shmpool_buff_hdr",568,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",568,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.creation_db_ver")=568
-	Set gtmtypes("shmpool_buff_hdr",569,"name")="shmpool_buff_hdr.shadow_file_header.creation_mdb_ver"
-	Set gtmtypes("shmpool_buff_hdr",569,"off")=5460
-	Set gtmtypes("shmpool_buff_hdr",569,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",569,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.creation_mdb_ver")=569
-	Set gtmtypes("shmpool_buff_hdr",570,"name")="shmpool_buff_hdr.shadow_file_header.certified_for_upgrade_to"
-	Set gtmtypes("shmpool_buff_hdr",570,"off")=5464
-	Set gtmtypes("shmpool_buff_hdr",570,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",570,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.certified_for_upgrade_to")=570
-	Set gtmtypes("shmpool_buff_hdr",571,"name")="shmpool_buff_hdr.shadow_file_header.filler_5k"
-	Set gtmtypes("shmpool_buff_hdr",571,"off")=5468
-	Set gtmtypes("shmpool_buff_hdr",571,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",571,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_5k")=571
-	Set gtmtypes("shmpool_buff_hdr",572,"name")="shmpool_buff_hdr.shadow_file_header.secshr_ops_index_filler"
-	Set gtmtypes("shmpool_buff_hdr",572,"off")=5472
-	Set gtmtypes("shmpool_buff_hdr",572,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",572,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.secshr_ops_index_filler")=572
-	Set gtmtypes("shmpool_buff_hdr",573,"name")="shmpool_buff_hdr.shadow_file_header.secshr_ops_array_filler"
-	Set gtmtypes("shmpool_buff_hdr",573,"off")=5476
-	Set gtmtypes("shmpool_buff_hdr",573,"len")=1020
-	Set gtmtypes("shmpool_buff_hdr",573,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.secshr_ops_array_filler")=573
-	Set gtmtypes("shmpool_buff_hdr",573,"dim")=255
-	Set gtmtypes("shmpool_buff_hdr",574,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn"
-	Set gtmtypes("shmpool_buff_hdr",574,"off")=6496
-	Set gtmtypes("shmpool_buff_hdr",574,"len")=24
-	Set gtmtypes("shmpool_buff_hdr",574,"type")="compswap_time_field"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn")=574
-	Set gtmtypes("shmpool_buff_hdr",575,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch"
-	Set gtmtypes("shmpool_buff_hdr",575,"off")=6496
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jrec_logical")=567
+	Set gtmtypes("shmpool_buff_hdr",568,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jrec_pblk"
+	Set gtmtypes("shmpool_buff_hdr",568,"off")=4800
+	Set gtmtypes("shmpool_buff_hdr",568,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",568,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jrec_pblk")=568
+	Set gtmtypes("shmpool_buff_hdr",569,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jrec_epoch_regular"
+	Set gtmtypes("shmpool_buff_hdr",569,"off")=4808
+	Set gtmtypes("shmpool_buff_hdr",569,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",569,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jrec_epoch_regular")=569
+	Set gtmtypes("shmpool_buff_hdr",570,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jrec_epoch_idle"
+	Set gtmtypes("shmpool_buff_hdr",570,"off")=4816
+	Set gtmtypes("shmpool_buff_hdr",570,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",570,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jrec_epoch_idle")=570
+	Set gtmtypes("shmpool_buff_hdr",571,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jrec_other"
+	Set gtmtypes("shmpool_buff_hdr",571,"off")=4824
+	Set gtmtypes("shmpool_buff_hdr",571,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",571,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jrec_other")=571
+	Set gtmtypes("shmpool_buff_hdr",572,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jnl_extends"
+	Set gtmtypes("shmpool_buff_hdr",572,"off")=4832
+	Set gtmtypes("shmpool_buff_hdr",572,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",572,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jnl_extends")=572
+	Set gtmtypes("shmpool_buff_hdr",573,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_db_extends"
+	Set gtmtypes("shmpool_buff_hdr",573,"off")=4840
+	Set gtmtypes("shmpool_buff_hdr",573,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",573,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_db_extends")=573
+	Set gtmtypes("shmpool_buff_hdr",574,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_crit_success"
+	Set gtmtypes("shmpool_buff_hdr",574,"off")=4848
+	Set gtmtypes("shmpool_buff_hdr",574,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",574,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_crit_success")=574
+	Set gtmtypes("shmpool_buff_hdr",575,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_crits_in_epch"
+	Set gtmtypes("shmpool_buff_hdr",575,"off")=4856
 	Set gtmtypes("shmpool_buff_hdr",575,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",575,"type")="global_latch_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch")=575
-	Set gtmtypes("shmpool_buff_hdr",576,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch.u"
-	Set gtmtypes("shmpool_buff_hdr",576,"off")=6496
+	Set gtmtypes("shmpool_buff_hdr",575,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_crits_in_epch")=575
+	Set gtmtypes("shmpool_buff_hdr",576,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.sq_crit_failed"
+	Set gtmtypes("shmpool_buff_hdr",576,"off")=4864
 	Set gtmtypes("shmpool_buff_hdr",576,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",576,"type")="union"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch.u")=576
-	Set gtmtypes("shmpool_buff_hdr",577,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch.u.pid_imgcnt"
-	Set gtmtypes("shmpool_buff_hdr",577,"off")=6496
+	Set gtmtypes("shmpool_buff_hdr",576,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.sq_crit_failed")=576
+	Set gtmtypes("shmpool_buff_hdr",577,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_crit_failed"
+	Set gtmtypes("shmpool_buff_hdr",577,"off")=4872
 	Set gtmtypes("shmpool_buff_hdr",577,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",577,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch.u.pid_imgcnt")=577
-	Set gtmtypes("shmpool_buff_hdr",578,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch.u.parts"
-	Set gtmtypes("shmpool_buff_hdr",578,"off")=6496
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_crit_failed")=577
+	Set gtmtypes("shmpool_buff_hdr",578,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.sq_crit_que_slps"
+	Set gtmtypes("shmpool_buff_hdr",578,"off")=4880
 	Set gtmtypes("shmpool_buff_hdr",578,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",578,"type")="struct"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch.u.parts")=578
-	Set gtmtypes("shmpool_buff_hdr",579,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_pid"
-	Set gtmtypes("shmpool_buff_hdr",579,"off")=6496
-	Set gtmtypes("shmpool_buff_hdr",579,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",579,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_pid")=579
-	Set gtmtypes("shmpool_buff_hdr",580,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_word"
-	Set gtmtypes("shmpool_buff_hdr",580,"off")=6500
-	Set gtmtypes("shmpool_buff_hdr",580,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",580,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_word")=580
-	Set gtmtypes("shmpool_buff_hdr",581,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.hp_latch_space"
-	Set gtmtypes("shmpool_buff_hdr",581,"off")=6504
-	Set gtmtypes("shmpool_buff_hdr",581,"len")=16
-	Set gtmtypes("shmpool_buff_hdr",581,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.hp_latch_space")=581
-	Set gtmtypes("shmpool_buff_hdr",581,"dim")=4
-	Set gtmtypes("shmpool_buff_hdr",582,"name")="shmpool_buff_hdr.shadow_file_header.is_encrypted"
-	Set gtmtypes("shmpool_buff_hdr",582,"off")=6520
-	Set gtmtypes("shmpool_buff_hdr",582,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",582,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.is_encrypted")=582
-	Set gtmtypes("shmpool_buff_hdr",583,"name")="shmpool_buff_hdr.shadow_file_header.db_trigger_cycle"
-	Set gtmtypes("shmpool_buff_hdr",583,"off")=6524
-	Set gtmtypes("shmpool_buff_hdr",583,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",583,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_trigger_cycle")=583
-	Set gtmtypes("shmpool_buff_hdr",584,"name")="shmpool_buff_hdr.shadow_file_header.strm_reg_seqno"
-	Set gtmtypes("shmpool_buff_hdr",584,"off")=6528
-	Set gtmtypes("shmpool_buff_hdr",584,"len")=128
-	Set gtmtypes("shmpool_buff_hdr",584,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.strm_reg_seqno")=584
-	Set gtmtypes("shmpool_buff_hdr",584,"dim")=16
-	Set gtmtypes("shmpool_buff_hdr",585,"name")="shmpool_buff_hdr.shadow_file_header.save_strm_reg_seqno"
-	Set gtmtypes("shmpool_buff_hdr",585,"off")=6656
+	Set gtmtypes("shmpool_buff_hdr",578,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.sq_crit_que_slps")=578
+	Set gtmtypes("shmpool_buff_hdr",579,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_crit_que_slps"
+	Set gtmtypes("shmpool_buff_hdr",579,"off")=4888
+	Set gtmtypes("shmpool_buff_hdr",579,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",579,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_crit_que_slps")=579
+	Set gtmtypes("shmpool_buff_hdr",580,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.sq_crit_yields"
+	Set gtmtypes("shmpool_buff_hdr",580,"off")=4896
+	Set gtmtypes("shmpool_buff_hdr",580,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",580,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.sq_crit_yields")=580
+	Set gtmtypes("shmpool_buff_hdr",581,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_crit_yields"
+	Set gtmtypes("shmpool_buff_hdr",581,"off")=4904
+	Set gtmtypes("shmpool_buff_hdr",581,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",581,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_crit_yields")=581
+	Set gtmtypes("shmpool_buff_hdr",582,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_clean2dirty"
+	Set gtmtypes("shmpool_buff_hdr",582,"off")=4912
+	Set gtmtypes("shmpool_buff_hdr",582,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",582,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_clean2dirty")=582
+	Set gtmtypes("shmpool_buff_hdr",583,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec_filler_4k_plus_512"
+	Set gtmtypes("shmpool_buff_hdr",583,"off")=4920
+	Set gtmtypes("shmpool_buff_hdr",583,"len")=40
+	Set gtmtypes("shmpool_buff_hdr",583,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec_filler_4k_plus_512")=583
+	Set gtmtypes("shmpool_buff_hdr",584,"name")="shmpool_buff_hdr.shadow_file_header.filler_4k_plus_512"
+	Set gtmtypes("shmpool_buff_hdr",584,"off")=4960
+	Set gtmtypes("shmpool_buff_hdr",584,"len")=368
+	Set gtmtypes("shmpool_buff_hdr",584,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_4k_plus_512")=584
+	Set gtmtypes("shmpool_buff_hdr",585,"name")="shmpool_buff_hdr.shadow_file_header.intrpt_recov_resync_strm_seqno"
+	Set gtmtypes("shmpool_buff_hdr",585,"off")=5328
 	Set gtmtypes("shmpool_buff_hdr",585,"len")=128
 	Set gtmtypes("shmpool_buff_hdr",585,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.save_strm_reg_seqno")=585
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.intrpt_recov_resync_strm_seqno")=585
 	Set gtmtypes("shmpool_buff_hdr",585,"dim")=16
-	Set gtmtypes("shmpool_buff_hdr",586,"name")="shmpool_buff_hdr.shadow_file_header.freeze_on_fail"
-	Set gtmtypes("shmpool_buff_hdr",586,"off")=6784
+	Set gtmtypes("shmpool_buff_hdr",586,"name")="shmpool_buff_hdr.shadow_file_header.creation_db_ver"
+	Set gtmtypes("shmpool_buff_hdr",586,"off")=5456
 	Set gtmtypes("shmpool_buff_hdr",586,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",586,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.freeze_on_fail")=586
-	Set gtmtypes("shmpool_buff_hdr",587,"name")="shmpool_buff_hdr.shadow_file_header.span_node_absent"
-	Set gtmtypes("shmpool_buff_hdr",587,"off")=6788
+	Set gtmtypes("shmpool_buff_hdr",586,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.creation_db_ver")=586
+	Set gtmtypes("shmpool_buff_hdr",587,"name")="shmpool_buff_hdr.shadow_file_header.creation_mdb_ver"
+	Set gtmtypes("shmpool_buff_hdr",587,"off")=5460
 	Set gtmtypes("shmpool_buff_hdr",587,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",587,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.span_node_absent")=587
-	Set gtmtypes("shmpool_buff_hdr",588,"name")="shmpool_buff_hdr.shadow_file_header.maxkeysz_assured"
-	Set gtmtypes("shmpool_buff_hdr",588,"off")=6792
+	Set gtmtypes("shmpool_buff_hdr",587,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.creation_mdb_ver")=587
+	Set gtmtypes("shmpool_buff_hdr",588,"name")="shmpool_buff_hdr.shadow_file_header.certified_for_upgrade_to"
+	Set gtmtypes("shmpool_buff_hdr",588,"off")=5464
 	Set gtmtypes("shmpool_buff_hdr",588,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",588,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.maxkeysz_assured")=588
-	Set gtmtypes("shmpool_buff_hdr",589,"name")="shmpool_buff_hdr.shadow_file_header.hasht_upgrade_needed"
-	Set gtmtypes("shmpool_buff_hdr",589,"off")=6796
+	Set gtmtypes("shmpool_buff_hdr",588,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.certified_for_upgrade_to")=588
+	Set gtmtypes("shmpool_buff_hdr",589,"name")="shmpool_buff_hdr.shadow_file_header.filler_5k"
+	Set gtmtypes("shmpool_buff_hdr",589,"off")=5468
 	Set gtmtypes("shmpool_buff_hdr",589,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",589,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.hasht_upgrade_needed")=589
-	Set gtmtypes("shmpool_buff_hdr",590,"name")="shmpool_buff_hdr.shadow_file_header.defer_allocate"
-	Set gtmtypes("shmpool_buff_hdr",590,"off")=6800
+	Set gtmtypes("shmpool_buff_hdr",589,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_5k")=589
+	Set gtmtypes("shmpool_buff_hdr",590,"name")="shmpool_buff_hdr.shadow_file_header.secshr_ops_index_filler"
+	Set gtmtypes("shmpool_buff_hdr",590,"off")=5472
 	Set gtmtypes("shmpool_buff_hdr",590,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",590,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.defer_allocate")=590
-	Set gtmtypes("shmpool_buff_hdr",591,"name")="shmpool_buff_hdr.shadow_file_header.filler_ftok_counter_halted"
-	Set gtmtypes("shmpool_buff_hdr",591,"off")=6804
-	Set gtmtypes("shmpool_buff_hdr",591,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",591,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_ftok_counter_halted")=591
-	Set gtmtypes("shmpool_buff_hdr",592,"name")="shmpool_buff_hdr.shadow_file_header.filler_access_counter_halted"
-	Set gtmtypes("shmpool_buff_hdr",592,"off")=6808
-	Set gtmtypes("shmpool_buff_hdr",592,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",592,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_access_counter_halted")=592
-	Set gtmtypes("shmpool_buff_hdr",593,"name")="shmpool_buff_hdr.shadow_file_header.filler_7k"
-	Set gtmtypes("shmpool_buff_hdr",593,"off")=6812
-	Set gtmtypes("shmpool_buff_hdr",593,"len")=708
-	Set gtmtypes("shmpool_buff_hdr",593,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_7k")=593
-	Set gtmtypes("shmpool_buff_hdr",594,"name")="shmpool_buff_hdr.shadow_file_header.filler_8k"
-	Set gtmtypes("shmpool_buff_hdr",594,"off")=7520
-	Set gtmtypes("shmpool_buff_hdr",594,"len")=1024
-	Set gtmtypes("shmpool_buff_hdr",594,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_8k")=594
+	Set gtmtypes("shmpool_buff_hdr",590,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.secshr_ops_index_filler")=590
+	Set gtmtypes("shmpool_buff_hdr",591,"name")="shmpool_buff_hdr.shadow_file_header.secshr_ops_array_filler"
+	Set gtmtypes("shmpool_buff_hdr",591,"off")=5476
+	Set gtmtypes("shmpool_buff_hdr",591,"len")=1020
+	Set gtmtypes("shmpool_buff_hdr",591,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.secshr_ops_array_filler")=591
+	Set gtmtypes("shmpool_buff_hdr",591,"dim")=255
+	Set gtmtypes("shmpool_buff_hdr",592,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn"
+	Set gtmtypes("shmpool_buff_hdr",592,"off")=6496
+	Set gtmtypes("shmpool_buff_hdr",592,"len")=24
+	Set gtmtypes("shmpool_buff_hdr",592,"type")="compswap_time_field"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn")=592
+	Set gtmtypes("shmpool_buff_hdr",593,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch"
+	Set gtmtypes("shmpool_buff_hdr",593,"off")=6496
+	Set gtmtypes("shmpool_buff_hdr",593,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",593,"type")="global_latch_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch")=593
+	Set gtmtypes("shmpool_buff_hdr",594,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch.u"
+	Set gtmtypes("shmpool_buff_hdr",594,"off")=6496
+	Set gtmtypes("shmpool_buff_hdr",594,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",594,"type")="union"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch.u")=594
+	Set gtmtypes("shmpool_buff_hdr",595,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch.u.pid_imgcnt"
+	Set gtmtypes("shmpool_buff_hdr",595,"off")=6496
+	Set gtmtypes("shmpool_buff_hdr",595,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",595,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch.u.pid_imgcnt")=595
+	Set gtmtypes("shmpool_buff_hdr",596,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch.u.parts"
+	Set gtmtypes("shmpool_buff_hdr",596,"off")=6496
+	Set gtmtypes("shmpool_buff_hdr",596,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",596,"type")="struct"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch.u.parts")=596
+	Set gtmtypes("shmpool_buff_hdr",597,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_pid"
+	Set gtmtypes("shmpool_buff_hdr",597,"off")=6496
+	Set gtmtypes("shmpool_buff_hdr",597,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",597,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_pid")=597
+	Set gtmtypes("shmpool_buff_hdr",598,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_word"
+	Set gtmtypes("shmpool_buff_hdr",598,"off")=6500
+	Set gtmtypes("shmpool_buff_hdr",598,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",598,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_word")=598
+	Set gtmtypes("shmpool_buff_hdr",599,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.hp_latch_space"
+	Set gtmtypes("shmpool_buff_hdr",599,"off")=6504
+	Set gtmtypes("shmpool_buff_hdr",599,"len")=16
+	Set gtmtypes("shmpool_buff_hdr",599,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.hp_latch_space")=599
+	Set gtmtypes("shmpool_buff_hdr",599,"dim")=4
+	Set gtmtypes("shmpool_buff_hdr",600,"name")="shmpool_buff_hdr.shadow_file_header.is_encrypted"
+	Set gtmtypes("shmpool_buff_hdr",600,"off")=6520
+	Set gtmtypes("shmpool_buff_hdr",600,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",600,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.is_encrypted")=600
+	Set gtmtypes("shmpool_buff_hdr",601,"name")="shmpool_buff_hdr.shadow_file_header.db_trigger_cycle"
+	Set gtmtypes("shmpool_buff_hdr",601,"off")=6524
+	Set gtmtypes("shmpool_buff_hdr",601,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",601,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_trigger_cycle")=601
+	Set gtmtypes("shmpool_buff_hdr",602,"name")="shmpool_buff_hdr.shadow_file_header.strm_reg_seqno"
+	Set gtmtypes("shmpool_buff_hdr",602,"off")=6528
+	Set gtmtypes("shmpool_buff_hdr",602,"len")=128
+	Set gtmtypes("shmpool_buff_hdr",602,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.strm_reg_seqno")=602
+	Set gtmtypes("shmpool_buff_hdr",602,"dim")=16
+	Set gtmtypes("shmpool_buff_hdr",603,"name")="shmpool_buff_hdr.shadow_file_header.save_strm_reg_seqno"
+	Set gtmtypes("shmpool_buff_hdr",603,"off")=6656
+	Set gtmtypes("shmpool_buff_hdr",603,"len")=128
+	Set gtmtypes("shmpool_buff_hdr",603,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.save_strm_reg_seqno")=603
+	Set gtmtypes("shmpool_buff_hdr",603,"dim")=16
+	Set gtmtypes("shmpool_buff_hdr",604,"name")="shmpool_buff_hdr.shadow_file_header.freeze_on_fail"
+	Set gtmtypes("shmpool_buff_hdr",604,"off")=6784
+	Set gtmtypes("shmpool_buff_hdr",604,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",604,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.freeze_on_fail")=604
+	Set gtmtypes("shmpool_buff_hdr",605,"name")="shmpool_buff_hdr.shadow_file_header.span_node_absent"
+	Set gtmtypes("shmpool_buff_hdr",605,"off")=6788
+	Set gtmtypes("shmpool_buff_hdr",605,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",605,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.span_node_absent")=605
+	Set gtmtypes("shmpool_buff_hdr",606,"name")="shmpool_buff_hdr.shadow_file_header.maxkeysz_assured"
+	Set gtmtypes("shmpool_buff_hdr",606,"off")=6792
+	Set gtmtypes("shmpool_buff_hdr",606,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",606,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.maxkeysz_assured")=606
+	Set gtmtypes("shmpool_buff_hdr",607,"name")="shmpool_buff_hdr.shadow_file_header.hasht_upgrade_needed"
+	Set gtmtypes("shmpool_buff_hdr",607,"off")=6796
+	Set gtmtypes("shmpool_buff_hdr",607,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",607,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.hasht_upgrade_needed")=607
+	Set gtmtypes("shmpool_buff_hdr",608,"name")="shmpool_buff_hdr.shadow_file_header.defer_allocate"
+	Set gtmtypes("shmpool_buff_hdr",608,"off")=6800
+	Set gtmtypes("shmpool_buff_hdr",608,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",608,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.defer_allocate")=608
+	Set gtmtypes("shmpool_buff_hdr",609,"name")="shmpool_buff_hdr.shadow_file_header.filler_ftok_counter_halted"
+	Set gtmtypes("shmpool_buff_hdr",609,"off")=6804
+	Set gtmtypes("shmpool_buff_hdr",609,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",609,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_ftok_counter_halted")=609
+	Set gtmtypes("shmpool_buff_hdr",610,"name")="shmpool_buff_hdr.shadow_file_header.filler_access_counter_halted"
+	Set gtmtypes("shmpool_buff_hdr",610,"off")=6808
+	Set gtmtypes("shmpool_buff_hdr",610,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",610,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_access_counter_halted")=610
+	Set gtmtypes("shmpool_buff_hdr",611,"name")="shmpool_buff_hdr.shadow_file_header.lock_crit_with_db"
+	Set gtmtypes("shmpool_buff_hdr",611,"off")=6812
+	Set gtmtypes("shmpool_buff_hdr",611,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",611,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.lock_crit_with_db")=611
+	Set gtmtypes("shmpool_buff_hdr",612,"name")="shmpool_buff_hdr.shadow_file_header.basedb_fname_len"
+	Set gtmtypes("shmpool_buff_hdr",612,"off")=6816
+	Set gtmtypes("shmpool_buff_hdr",612,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",612,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.basedb_fname_len")=612
+	Set gtmtypes("shmpool_buff_hdr",613,"name")="shmpool_buff_hdr.shadow_file_header.basedb_fname"
+	Set gtmtypes("shmpool_buff_hdr",613,"off")=6820
+	Set gtmtypes("shmpool_buff_hdr",613,"len")=256
+	Set gtmtypes("shmpool_buff_hdr",613,"type")="unsigned-char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.basedb_fname")=613
+	Set gtmtypes("shmpool_buff_hdr",614,"name")="shmpool_buff_hdr.shadow_file_header.filler_7k"
+	Set gtmtypes("shmpool_buff_hdr",614,"off")=7076
+	Set gtmtypes("shmpool_buff_hdr",614,"len")=444
+	Set gtmtypes("shmpool_buff_hdr",614,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_7k")=614
+	Set gtmtypes("shmpool_buff_hdr",615,"name")="shmpool_buff_hdr.shadow_file_header.filler_8k"
+	Set gtmtypes("shmpool_buff_hdr",615,"off")=7520
+	Set gtmtypes("shmpool_buff_hdr",615,"len")=1024
+	Set gtmtypes("shmpool_buff_hdr",615,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_8k")=615
 	;
 	Set gtmtypes("show_reply")="struct"
 	Set gtmtypes("show_reply",0)=2
@@ -36615,8 +37386,8 @@ Init
 	Set gtmtypfldindx("span_subs","b_sec")=3
 	;
 	Set gtmtypes("spdesc")="struct"
-	Set gtmtypes("spdesc",0)=5
-	Set gtmtypes("spdesc","len")=20
+	Set gtmtypes("spdesc",0)=6
+	Set gtmtypes("spdesc","len")=24
 	Set gtmtypes("spdesc",1,"name")="spdesc.base"
 	Set gtmtypes("spdesc",1,"off")=0
 	Set gtmtypes("spdesc",1,"len")=4
@@ -36642,6 +37413,11 @@ Init
 	Set gtmtypes("spdesc",5,"len")=1
 	Set gtmtypes("spdesc",5,"type")="unsigned-char"
 	Set gtmtypfldindx("spdesc","prvprt")=5
+	Set gtmtypes("spdesc",6,"name")="spdesc.invokestpgcollevel"
+	Set gtmtypes("spdesc",6,"off")=20
+	Set gtmtypes("spdesc",6,"len")=4
+	Set gtmtypes("spdesc",6,"type")="addr"
+	Set gtmtypfldindx("spdesc","invokestpgcollevel")=6
 	;
 	Set gtmtypes("src_line_struct")="struct"
 	Set gtmtypes("src_line_struct",0)=8
@@ -36963,6 +37739,25 @@ Init
 	Set gtmtypes("stack_frame",14,"type")="addr"
 	Set gtmtypfldindx("stack_frame","ret_value")=14
 	;
+	Set gtmtypes("statsDB_deferred_init_que_elem")="struct"
+	Set gtmtypes("statsDB_deferred_init_que_elem",0)=3
+	Set gtmtypes("statsDB_deferred_init_que_elem","len")=12
+	Set gtmtypes("statsDB_deferred_init_que_elem",1,"name")="statsDB_deferred_init_que_elem.next"
+	Set gtmtypes("statsDB_deferred_init_que_elem",1,"off")=0
+	Set gtmtypes("statsDB_deferred_init_que_elem",1,"len")=4
+	Set gtmtypes("statsDB_deferred_init_que_elem",1,"type")="addr"
+	Set gtmtypfldindx("statsDB_deferred_init_que_elem","next")=1
+	Set gtmtypes("statsDB_deferred_init_que_elem",2,"name")="statsDB_deferred_init_que_elem.baseDBreg"
+	Set gtmtypes("statsDB_deferred_init_que_elem",2,"off")=4
+	Set gtmtypes("statsDB_deferred_init_que_elem",2,"len")=4
+	Set gtmtypes("statsDB_deferred_init_que_elem",2,"type")="addr"
+	Set gtmtypfldindx("statsDB_deferred_init_que_elem","baseDBreg")=2
+	Set gtmtypes("statsDB_deferred_init_que_elem",3,"name")="statsDB_deferred_init_que_elem.statsDBreg"
+	Set gtmtypes("statsDB_deferred_init_que_elem",3,"off")=8
+	Set gtmtypes("statsDB_deferred_init_que_elem",3,"len")=4
+	Set gtmtypes("statsDB_deferred_init_que_elem",3,"type")="addr"
+	Set gtmtypfldindx("statsDB_deferred_init_que_elem","statsDBreg")=3
+	;
 	Set gtmtypes("storElem")="struct"
 	Set gtmtypes("storElem",0)=13
 	Set gtmtypes("storElem","len")=36
@@ -39505,11 +40300,11 @@ Init
 	Set gtmtypfldindx("unique_file_id","file_id")=5
 	;
 	Set gtmtypes("unix_db_info")="struct"
-	Set gtmtypes("unix_db_info",0)=156
-	Set gtmtypes("unix_db_info","len")=876
+	Set gtmtypes("unix_db_info",0)=169
+	Set gtmtypes("unix_db_info","len")=932
 	Set gtmtypes("unix_db_info",1,"name")="unix_db_info.s_addrs"
 	Set gtmtypes("unix_db_info",1,"off")=0
-	Set gtmtypes("unix_db_info",1,"len")=816
+	Set gtmtypes("unix_db_info",1,"len")=864
 	Set gtmtypes("unix_db_info",1,"type")="sgmnt_addrs"
 	Set gtmtypfldindx("unix_db_info","s_addrs")=1
 	Set gtmtypes("unix_db_info",2,"name")="unix_db_info.s_addrs.hdr"
@@ -39669,626 +40464,691 @@ Init
 	Set gtmtypes("unix_db_info",32,"len")=4
 	Set gtmtypes("unix_db_info",32,"type")="addr"
 	Set gtmtypfldindx("unix_db_info","s_addrs.acc_meth.bg.fill1")=32
-	Set gtmtypes("unix_db_info",33,"name")="unix_db_info.s_addrs.gvstats_rec"
+	Set gtmtypes("unix_db_info",33,"name")="unix_db_info.s_addrs.gvstats_rec_p"
 	Set gtmtypes("unix_db_info",33,"off")=116
-	Set gtmtypes("unix_db_info",33,"len")=464
-	Set gtmtypes("unix_db_info",33,"type")="gvstats_rec_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec")=33
-	Set gtmtypes("unix_db_info",34,"name")="unix_db_info.s_addrs.gvstats_rec.n_set"
-	Set gtmtypes("unix_db_info",34,"off")=116
-	Set gtmtypes("unix_db_info",34,"len")=8
-	Set gtmtypes("unix_db_info",34,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_set")=34
-	Set gtmtypes("unix_db_info",35,"name")="unix_db_info.s_addrs.gvstats_rec.n_kill"
-	Set gtmtypes("unix_db_info",35,"off")=124
+	Set gtmtypes("unix_db_info",33,"len")=4
+	Set gtmtypes("unix_db_info",33,"type")="addr"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec_p")=33
+	Set gtmtypes("unix_db_info",34,"name")="unix_db_info.s_addrs.gvstats_rec"
+	Set gtmtypes("unix_db_info",34,"off")=120
+	Set gtmtypes("unix_db_info",34,"len")=472
+	Set gtmtypes("unix_db_info",34,"type")="gvstats_rec_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec")=34
+	Set gtmtypes("unix_db_info",35,"name")="unix_db_info.s_addrs.gvstats_rec.n_set"
+	Set gtmtypes("unix_db_info",35,"off")=120
 	Set gtmtypes("unix_db_info",35,"len")=8
 	Set gtmtypes("unix_db_info",35,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_kill")=35
-	Set gtmtypes("unix_db_info",36,"name")="unix_db_info.s_addrs.gvstats_rec.n_get"
-	Set gtmtypes("unix_db_info",36,"off")=132
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_set")=35
+	Set gtmtypes("unix_db_info",36,"name")="unix_db_info.s_addrs.gvstats_rec.n_kill"
+	Set gtmtypes("unix_db_info",36,"off")=128
 	Set gtmtypes("unix_db_info",36,"len")=8
 	Set gtmtypes("unix_db_info",36,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_get")=36
-	Set gtmtypes("unix_db_info",37,"name")="unix_db_info.s_addrs.gvstats_rec.n_data"
-	Set gtmtypes("unix_db_info",37,"off")=140
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_kill")=36
+	Set gtmtypes("unix_db_info",37,"name")="unix_db_info.s_addrs.gvstats_rec.n_get"
+	Set gtmtypes("unix_db_info",37,"off")=136
 	Set gtmtypes("unix_db_info",37,"len")=8
 	Set gtmtypes("unix_db_info",37,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_data")=37
-	Set gtmtypes("unix_db_info",38,"name")="unix_db_info.s_addrs.gvstats_rec.n_order"
-	Set gtmtypes("unix_db_info",38,"off")=148
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_get")=37
+	Set gtmtypes("unix_db_info",38,"name")="unix_db_info.s_addrs.gvstats_rec.n_data"
+	Set gtmtypes("unix_db_info",38,"off")=144
 	Set gtmtypes("unix_db_info",38,"len")=8
 	Set gtmtypes("unix_db_info",38,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_order")=38
-	Set gtmtypes("unix_db_info",39,"name")="unix_db_info.s_addrs.gvstats_rec.n_zprev"
-	Set gtmtypes("unix_db_info",39,"off")=156
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_data")=38
+	Set gtmtypes("unix_db_info",39,"name")="unix_db_info.s_addrs.gvstats_rec.n_order"
+	Set gtmtypes("unix_db_info",39,"off")=152
 	Set gtmtypes("unix_db_info",39,"len")=8
 	Set gtmtypes("unix_db_info",39,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_zprev")=39
-	Set gtmtypes("unix_db_info",40,"name")="unix_db_info.s_addrs.gvstats_rec.n_query"
-	Set gtmtypes("unix_db_info",40,"off")=164
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_order")=39
+	Set gtmtypes("unix_db_info",40,"name")="unix_db_info.s_addrs.gvstats_rec.n_zprev"
+	Set gtmtypes("unix_db_info",40,"off")=160
 	Set gtmtypes("unix_db_info",40,"len")=8
 	Set gtmtypes("unix_db_info",40,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_query")=40
-	Set gtmtypes("unix_db_info",41,"name")="unix_db_info.s_addrs.gvstats_rec.n_lock_success"
-	Set gtmtypes("unix_db_info",41,"off")=172
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_zprev")=40
+	Set gtmtypes("unix_db_info",41,"name")="unix_db_info.s_addrs.gvstats_rec.n_query"
+	Set gtmtypes("unix_db_info",41,"off")=168
 	Set gtmtypes("unix_db_info",41,"len")=8
 	Set gtmtypes("unix_db_info",41,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_lock_success")=41
-	Set gtmtypes("unix_db_info",42,"name")="unix_db_info.s_addrs.gvstats_rec.n_lock_fail"
-	Set gtmtypes("unix_db_info",42,"off")=180
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_query")=41
+	Set gtmtypes("unix_db_info",42,"name")="unix_db_info.s_addrs.gvstats_rec.n_lock_success"
+	Set gtmtypes("unix_db_info",42,"off")=176
 	Set gtmtypes("unix_db_info",42,"len")=8
 	Set gtmtypes("unix_db_info",42,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_lock_fail")=42
-	Set gtmtypes("unix_db_info",43,"name")="unix_db_info.s_addrs.gvstats_rec.db_curr_tn"
-	Set gtmtypes("unix_db_info",43,"off")=188
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_lock_success")=42
+	Set gtmtypes("unix_db_info",43,"name")="unix_db_info.s_addrs.gvstats_rec.n_lock_fail"
+	Set gtmtypes("unix_db_info",43,"off")=184
 	Set gtmtypes("unix_db_info",43,"len")=8
 	Set gtmtypes("unix_db_info",43,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.db_curr_tn")=43
-	Set gtmtypes("unix_db_info",44,"name")="unix_db_info.s_addrs.gvstats_rec.n_dsk_read"
-	Set gtmtypes("unix_db_info",44,"off")=196
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_lock_fail")=43
+	Set gtmtypes("unix_db_info",44,"name")="unix_db_info.s_addrs.gvstats_rec.db_curr_tn"
+	Set gtmtypes("unix_db_info",44,"off")=192
 	Set gtmtypes("unix_db_info",44,"len")=8
 	Set gtmtypes("unix_db_info",44,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_dsk_read")=44
-	Set gtmtypes("unix_db_info",45,"name")="unix_db_info.s_addrs.gvstats_rec.n_dsk_write"
-	Set gtmtypes("unix_db_info",45,"off")=204
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.db_curr_tn")=44
+	Set gtmtypes("unix_db_info",45,"name")="unix_db_info.s_addrs.gvstats_rec.n_dsk_read"
+	Set gtmtypes("unix_db_info",45,"off")=200
 	Set gtmtypes("unix_db_info",45,"len")=8
 	Set gtmtypes("unix_db_info",45,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_dsk_write")=45
-	Set gtmtypes("unix_db_info",46,"name")="unix_db_info.s_addrs.gvstats_rec.n_nontp_readwrite"
-	Set gtmtypes("unix_db_info",46,"off")=212
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_dsk_read")=45
+	Set gtmtypes("unix_db_info",46,"name")="unix_db_info.s_addrs.gvstats_rec.n_dsk_write"
+	Set gtmtypes("unix_db_info",46,"off")=208
 	Set gtmtypes("unix_db_info",46,"len")=8
 	Set gtmtypes("unix_db_info",46,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_nontp_readwrite")=46
-	Set gtmtypes("unix_db_info",47,"name")="unix_db_info.s_addrs.gvstats_rec.n_nontp_readonly"
-	Set gtmtypes("unix_db_info",47,"off")=220
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_dsk_write")=46
+	Set gtmtypes("unix_db_info",47,"name")="unix_db_info.s_addrs.gvstats_rec.n_nontp_readwrite"
+	Set gtmtypes("unix_db_info",47,"off")=216
 	Set gtmtypes("unix_db_info",47,"len")=8
 	Set gtmtypes("unix_db_info",47,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_nontp_readonly")=47
-	Set gtmtypes("unix_db_info",48,"name")="unix_db_info.s_addrs.gvstats_rec.n_nontp_blkwrite"
-	Set gtmtypes("unix_db_info",48,"off")=228
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_nontp_readwrite")=47
+	Set gtmtypes("unix_db_info",48,"name")="unix_db_info.s_addrs.gvstats_rec.n_nontp_readonly"
+	Set gtmtypes("unix_db_info",48,"off")=224
 	Set gtmtypes("unix_db_info",48,"len")=8
 	Set gtmtypes("unix_db_info",48,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_nontp_blkwrite")=48
-	Set gtmtypes("unix_db_info",49,"name")="unix_db_info.s_addrs.gvstats_rec.n_nontp_blkread"
-	Set gtmtypes("unix_db_info",49,"off")=236
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_nontp_readonly")=48
+	Set gtmtypes("unix_db_info",49,"name")="unix_db_info.s_addrs.gvstats_rec.n_nontp_blkwrite"
+	Set gtmtypes("unix_db_info",49,"off")=232
 	Set gtmtypes("unix_db_info",49,"len")=8
 	Set gtmtypes("unix_db_info",49,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_nontp_blkread")=49
-	Set gtmtypes("unix_db_info",50,"name")="unix_db_info.s_addrs.gvstats_rec.n_nontp_retries_0"
-	Set gtmtypes("unix_db_info",50,"off")=244
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_nontp_blkwrite")=49
+	Set gtmtypes("unix_db_info",50,"name")="unix_db_info.s_addrs.gvstats_rec.n_nontp_blkread"
+	Set gtmtypes("unix_db_info",50,"off")=240
 	Set gtmtypes("unix_db_info",50,"len")=8
 	Set gtmtypes("unix_db_info",50,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_nontp_retries_0")=50
-	Set gtmtypes("unix_db_info",51,"name")="unix_db_info.s_addrs.gvstats_rec.n_nontp_retries_1"
-	Set gtmtypes("unix_db_info",51,"off")=252
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_nontp_blkread")=50
+	Set gtmtypes("unix_db_info",51,"name")="unix_db_info.s_addrs.gvstats_rec.n_nontp_retries_0"
+	Set gtmtypes("unix_db_info",51,"off")=248
 	Set gtmtypes("unix_db_info",51,"len")=8
 	Set gtmtypes("unix_db_info",51,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_nontp_retries_1")=51
-	Set gtmtypes("unix_db_info",52,"name")="unix_db_info.s_addrs.gvstats_rec.n_nontp_retries_2"
-	Set gtmtypes("unix_db_info",52,"off")=260
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_nontp_retries_0")=51
+	Set gtmtypes("unix_db_info",52,"name")="unix_db_info.s_addrs.gvstats_rec.n_nontp_retries_1"
+	Set gtmtypes("unix_db_info",52,"off")=256
 	Set gtmtypes("unix_db_info",52,"len")=8
 	Set gtmtypes("unix_db_info",52,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_nontp_retries_2")=52
-	Set gtmtypes("unix_db_info",53,"name")="unix_db_info.s_addrs.gvstats_rec.n_nontp_retries_3"
-	Set gtmtypes("unix_db_info",53,"off")=268
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_nontp_retries_1")=52
+	Set gtmtypes("unix_db_info",53,"name")="unix_db_info.s_addrs.gvstats_rec.n_nontp_retries_2"
+	Set gtmtypes("unix_db_info",53,"off")=264
 	Set gtmtypes("unix_db_info",53,"len")=8
 	Set gtmtypes("unix_db_info",53,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_nontp_retries_3")=53
-	Set gtmtypes("unix_db_info",54,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_readwrite"
-	Set gtmtypes("unix_db_info",54,"off")=276
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_nontp_retries_2")=53
+	Set gtmtypes("unix_db_info",54,"name")="unix_db_info.s_addrs.gvstats_rec.n_nontp_retries_3"
+	Set gtmtypes("unix_db_info",54,"off")=272
 	Set gtmtypes("unix_db_info",54,"len")=8
 	Set gtmtypes("unix_db_info",54,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_readwrite")=54
-	Set gtmtypes("unix_db_info",55,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_readonly"
-	Set gtmtypes("unix_db_info",55,"off")=284
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_nontp_retries_3")=54
+	Set gtmtypes("unix_db_info",55,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_readwrite"
+	Set gtmtypes("unix_db_info",55,"off")=280
 	Set gtmtypes("unix_db_info",55,"len")=8
 	Set gtmtypes("unix_db_info",55,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_readonly")=55
-	Set gtmtypes("unix_db_info",56,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_rolledback"
-	Set gtmtypes("unix_db_info",56,"off")=292
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_readwrite")=55
+	Set gtmtypes("unix_db_info",56,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_readonly"
+	Set gtmtypes("unix_db_info",56,"off")=288
 	Set gtmtypes("unix_db_info",56,"len")=8
 	Set gtmtypes("unix_db_info",56,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_rolledback")=56
-	Set gtmtypes("unix_db_info",57,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_blkwrite"
-	Set gtmtypes("unix_db_info",57,"off")=300
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_readonly")=56
+	Set gtmtypes("unix_db_info",57,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_rolledback"
+	Set gtmtypes("unix_db_info",57,"off")=296
 	Set gtmtypes("unix_db_info",57,"len")=8
 	Set gtmtypes("unix_db_info",57,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_blkwrite")=57
-	Set gtmtypes("unix_db_info",58,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_blkread"
-	Set gtmtypes("unix_db_info",58,"off")=308
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_rolledback")=57
+	Set gtmtypes("unix_db_info",58,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_blkwrite"
+	Set gtmtypes("unix_db_info",58,"off")=304
 	Set gtmtypes("unix_db_info",58,"len")=8
 	Set gtmtypes("unix_db_info",58,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_blkread")=58
-	Set gtmtypes("unix_db_info",59,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_tot_retries_0"
-	Set gtmtypes("unix_db_info",59,"off")=316
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_blkwrite")=58
+	Set gtmtypes("unix_db_info",59,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_blkread"
+	Set gtmtypes("unix_db_info",59,"off")=312
 	Set gtmtypes("unix_db_info",59,"len")=8
 	Set gtmtypes("unix_db_info",59,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_tot_retries_0")=59
-	Set gtmtypes("unix_db_info",60,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_tot_retries_1"
-	Set gtmtypes("unix_db_info",60,"off")=324
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_blkread")=59
+	Set gtmtypes("unix_db_info",60,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_tot_retries_0"
+	Set gtmtypes("unix_db_info",60,"off")=320
 	Set gtmtypes("unix_db_info",60,"len")=8
 	Set gtmtypes("unix_db_info",60,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_tot_retries_1")=60
-	Set gtmtypes("unix_db_info",61,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_tot_retries_2"
-	Set gtmtypes("unix_db_info",61,"off")=332
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_tot_retries_0")=60
+	Set gtmtypes("unix_db_info",61,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_tot_retries_1"
+	Set gtmtypes("unix_db_info",61,"off")=328
 	Set gtmtypes("unix_db_info",61,"len")=8
 	Set gtmtypes("unix_db_info",61,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_tot_retries_2")=61
-	Set gtmtypes("unix_db_info",62,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_tot_retries_3"
-	Set gtmtypes("unix_db_info",62,"off")=340
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_tot_retries_1")=61
+	Set gtmtypes("unix_db_info",62,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_tot_retries_2"
+	Set gtmtypes("unix_db_info",62,"off")=336
 	Set gtmtypes("unix_db_info",62,"len")=8
 	Set gtmtypes("unix_db_info",62,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_tot_retries_3")=62
-	Set gtmtypes("unix_db_info",63,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_tot_retries_4"
-	Set gtmtypes("unix_db_info",63,"off")=348
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_tot_retries_2")=62
+	Set gtmtypes("unix_db_info",63,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_tot_retries_3"
+	Set gtmtypes("unix_db_info",63,"off")=344
 	Set gtmtypes("unix_db_info",63,"len")=8
 	Set gtmtypes("unix_db_info",63,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_tot_retries_4")=63
-	Set gtmtypes("unix_db_info",64,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_cnflct_retries_0"
-	Set gtmtypes("unix_db_info",64,"off")=356
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_tot_retries_3")=63
+	Set gtmtypes("unix_db_info",64,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_tot_retries_4"
+	Set gtmtypes("unix_db_info",64,"off")=352
 	Set gtmtypes("unix_db_info",64,"len")=8
 	Set gtmtypes("unix_db_info",64,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_cnflct_retries_0")=64
-	Set gtmtypes("unix_db_info",65,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_cnflct_retries_1"
-	Set gtmtypes("unix_db_info",65,"off")=364
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_tot_retries_4")=64
+	Set gtmtypes("unix_db_info",65,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_cnflct_retries_0"
+	Set gtmtypes("unix_db_info",65,"off")=360
 	Set gtmtypes("unix_db_info",65,"len")=8
 	Set gtmtypes("unix_db_info",65,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_cnflct_retries_1")=65
-	Set gtmtypes("unix_db_info",66,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_cnflct_retries_2"
-	Set gtmtypes("unix_db_info",66,"off")=372
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_cnflct_retries_0")=65
+	Set gtmtypes("unix_db_info",66,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_cnflct_retries_1"
+	Set gtmtypes("unix_db_info",66,"off")=368
 	Set gtmtypes("unix_db_info",66,"len")=8
 	Set gtmtypes("unix_db_info",66,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_cnflct_retries_2")=66
-	Set gtmtypes("unix_db_info",67,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_cnflct_retries_3"
-	Set gtmtypes("unix_db_info",67,"off")=380
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_cnflct_retries_1")=66
+	Set gtmtypes("unix_db_info",67,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_cnflct_retries_2"
+	Set gtmtypes("unix_db_info",67,"off")=376
 	Set gtmtypes("unix_db_info",67,"len")=8
 	Set gtmtypes("unix_db_info",67,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_cnflct_retries_3")=67
-	Set gtmtypes("unix_db_info",68,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_cnflct_retries_4"
-	Set gtmtypes("unix_db_info",68,"off")=388
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_cnflct_retries_2")=67
+	Set gtmtypes("unix_db_info",68,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_cnflct_retries_3"
+	Set gtmtypes("unix_db_info",68,"off")=384
 	Set gtmtypes("unix_db_info",68,"len")=8
 	Set gtmtypes("unix_db_info",68,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_cnflct_retries_4")=68
-	Set gtmtypes("unix_db_info",69,"name")="unix_db_info.s_addrs.gvstats_rec.n_ztrigger"
-	Set gtmtypes("unix_db_info",69,"off")=396
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_cnflct_retries_3")=68
+	Set gtmtypes("unix_db_info",69,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_cnflct_retries_4"
+	Set gtmtypes("unix_db_info",69,"off")=392
 	Set gtmtypes("unix_db_info",69,"len")=8
 	Set gtmtypes("unix_db_info",69,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_ztrigger")=69
-	Set gtmtypes("unix_db_info",70,"name")="unix_db_info.s_addrs.gvstats_rec.n_db_flush"
-	Set gtmtypes("unix_db_info",70,"off")=404
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_cnflct_retries_4")=69
+	Set gtmtypes("unix_db_info",70,"name")="unix_db_info.s_addrs.gvstats_rec.n_ztrigger"
+	Set gtmtypes("unix_db_info",70,"off")=400
 	Set gtmtypes("unix_db_info",70,"len")=8
 	Set gtmtypes("unix_db_info",70,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_db_flush")=70
-	Set gtmtypes("unix_db_info",71,"name")="unix_db_info.s_addrs.gvstats_rec.n_db_fsync"
-	Set gtmtypes("unix_db_info",71,"off")=412
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_ztrigger")=70
+	Set gtmtypes("unix_db_info",71,"name")="unix_db_info.s_addrs.gvstats_rec.n_db_flush"
+	Set gtmtypes("unix_db_info",71,"off")=408
 	Set gtmtypes("unix_db_info",71,"len")=8
 	Set gtmtypes("unix_db_info",71,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_db_fsync")=71
-	Set gtmtypes("unix_db_info",72,"name")="unix_db_info.s_addrs.gvstats_rec.n_jnl_flush"
-	Set gtmtypes("unix_db_info",72,"off")=420
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_db_flush")=71
+	Set gtmtypes("unix_db_info",72,"name")="unix_db_info.s_addrs.gvstats_rec.n_db_fsync"
+	Set gtmtypes("unix_db_info",72,"off")=416
 	Set gtmtypes("unix_db_info",72,"len")=8
 	Set gtmtypes("unix_db_info",72,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jnl_flush")=72
-	Set gtmtypes("unix_db_info",73,"name")="unix_db_info.s_addrs.gvstats_rec.n_jnl_fsync"
-	Set gtmtypes("unix_db_info",73,"off")=428
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_db_fsync")=72
+	Set gtmtypes("unix_db_info",73,"name")="unix_db_info.s_addrs.gvstats_rec.n_jnl_flush"
+	Set gtmtypes("unix_db_info",73,"off")=424
 	Set gtmtypes("unix_db_info",73,"len")=8
 	Set gtmtypes("unix_db_info",73,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jnl_fsync")=73
-	Set gtmtypes("unix_db_info",74,"name")="unix_db_info.s_addrs.gvstats_rec.n_jbuff_bytes"
-	Set gtmtypes("unix_db_info",74,"off")=436
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jnl_flush")=73
+	Set gtmtypes("unix_db_info",74,"name")="unix_db_info.s_addrs.gvstats_rec.n_jnl_fsync"
+	Set gtmtypes("unix_db_info",74,"off")=432
 	Set gtmtypes("unix_db_info",74,"len")=8
 	Set gtmtypes("unix_db_info",74,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jbuff_bytes")=74
-	Set gtmtypes("unix_db_info",75,"name")="unix_db_info.s_addrs.gvstats_rec.n_jfile_bytes"
-	Set gtmtypes("unix_db_info",75,"off")=444
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jnl_fsync")=74
+	Set gtmtypes("unix_db_info",75,"name")="unix_db_info.s_addrs.gvstats_rec.n_jbuff_bytes"
+	Set gtmtypes("unix_db_info",75,"off")=440
 	Set gtmtypes("unix_db_info",75,"len")=8
 	Set gtmtypes("unix_db_info",75,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jfile_bytes")=75
-	Set gtmtypes("unix_db_info",76,"name")="unix_db_info.s_addrs.gvstats_rec.n_jfile_writes"
-	Set gtmtypes("unix_db_info",76,"off")=452
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jbuff_bytes")=75
+	Set gtmtypes("unix_db_info",76,"name")="unix_db_info.s_addrs.gvstats_rec.n_jfile_bytes"
+	Set gtmtypes("unix_db_info",76,"off")=448
 	Set gtmtypes("unix_db_info",76,"len")=8
 	Set gtmtypes("unix_db_info",76,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jfile_writes")=76
-	Set gtmtypes("unix_db_info",77,"name")="unix_db_info.s_addrs.gvstats_rec.n_jrec_logical"
-	Set gtmtypes("unix_db_info",77,"off")=460
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jfile_bytes")=76
+	Set gtmtypes("unix_db_info",77,"name")="unix_db_info.s_addrs.gvstats_rec.n_jfile_writes"
+	Set gtmtypes("unix_db_info",77,"off")=456
 	Set gtmtypes("unix_db_info",77,"len")=8
 	Set gtmtypes("unix_db_info",77,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jrec_logical")=77
-	Set gtmtypes("unix_db_info",78,"name")="unix_db_info.s_addrs.gvstats_rec.n_jrec_pblk"
-	Set gtmtypes("unix_db_info",78,"off")=468
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jfile_writes")=77
+	Set gtmtypes("unix_db_info",78,"name")="unix_db_info.s_addrs.gvstats_rec.n_jrec_logical"
+	Set gtmtypes("unix_db_info",78,"off")=464
 	Set gtmtypes("unix_db_info",78,"len")=8
 	Set gtmtypes("unix_db_info",78,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jrec_pblk")=78
-	Set gtmtypes("unix_db_info",79,"name")="unix_db_info.s_addrs.gvstats_rec.n_jrec_epoch_regular"
-	Set gtmtypes("unix_db_info",79,"off")=476
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jrec_logical")=78
+	Set gtmtypes("unix_db_info",79,"name")="unix_db_info.s_addrs.gvstats_rec.n_jrec_pblk"
+	Set gtmtypes("unix_db_info",79,"off")=472
 	Set gtmtypes("unix_db_info",79,"len")=8
 	Set gtmtypes("unix_db_info",79,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jrec_epoch_regular")=79
-	Set gtmtypes("unix_db_info",80,"name")="unix_db_info.s_addrs.gvstats_rec.n_jrec_epoch_idle"
-	Set gtmtypes("unix_db_info",80,"off")=484
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jrec_pblk")=79
+	Set gtmtypes("unix_db_info",80,"name")="unix_db_info.s_addrs.gvstats_rec.n_jrec_epoch_regular"
+	Set gtmtypes("unix_db_info",80,"off")=480
 	Set gtmtypes("unix_db_info",80,"len")=8
 	Set gtmtypes("unix_db_info",80,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jrec_epoch_idle")=80
-	Set gtmtypes("unix_db_info",81,"name")="unix_db_info.s_addrs.gvstats_rec.n_jrec_other"
-	Set gtmtypes("unix_db_info",81,"off")=492
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jrec_epoch_regular")=80
+	Set gtmtypes("unix_db_info",81,"name")="unix_db_info.s_addrs.gvstats_rec.n_jrec_epoch_idle"
+	Set gtmtypes("unix_db_info",81,"off")=488
 	Set gtmtypes("unix_db_info",81,"len")=8
 	Set gtmtypes("unix_db_info",81,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jrec_other")=81
-	Set gtmtypes("unix_db_info",82,"name")="unix_db_info.s_addrs.gvstats_rec.n_jnl_extends"
-	Set gtmtypes("unix_db_info",82,"off")=500
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jrec_epoch_idle")=81
+	Set gtmtypes("unix_db_info",82,"name")="unix_db_info.s_addrs.gvstats_rec.n_jrec_other"
+	Set gtmtypes("unix_db_info",82,"off")=496
 	Set gtmtypes("unix_db_info",82,"len")=8
 	Set gtmtypes("unix_db_info",82,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jnl_extends")=82
-	Set gtmtypes("unix_db_info",83,"name")="unix_db_info.s_addrs.gvstats_rec.n_db_extends"
-	Set gtmtypes("unix_db_info",83,"off")=508
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jrec_other")=82
+	Set gtmtypes("unix_db_info",83,"name")="unix_db_info.s_addrs.gvstats_rec.n_jnl_extends"
+	Set gtmtypes("unix_db_info",83,"off")=504
 	Set gtmtypes("unix_db_info",83,"len")=8
 	Set gtmtypes("unix_db_info",83,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_db_extends")=83
-	Set gtmtypes("unix_db_info",84,"name")="unix_db_info.s_addrs.gvstats_rec.n_crit_success"
-	Set gtmtypes("unix_db_info",84,"off")=516
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jnl_extends")=83
+	Set gtmtypes("unix_db_info",84,"name")="unix_db_info.s_addrs.gvstats_rec.n_db_extends"
+	Set gtmtypes("unix_db_info",84,"off")=512
 	Set gtmtypes("unix_db_info",84,"len")=8
 	Set gtmtypes("unix_db_info",84,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_crit_success")=84
-	Set gtmtypes("unix_db_info",85,"name")="unix_db_info.s_addrs.gvstats_rec.n_crits_in_epch"
-	Set gtmtypes("unix_db_info",85,"off")=524
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_db_extends")=84
+	Set gtmtypes("unix_db_info",85,"name")="unix_db_info.s_addrs.gvstats_rec.n_crit_success"
+	Set gtmtypes("unix_db_info",85,"off")=520
 	Set gtmtypes("unix_db_info",85,"len")=8
 	Set gtmtypes("unix_db_info",85,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_crits_in_epch")=85
-	Set gtmtypes("unix_db_info",86,"name")="unix_db_info.s_addrs.gvstats_rec.sq_crit_failed"
-	Set gtmtypes("unix_db_info",86,"off")=532
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_crit_success")=85
+	Set gtmtypes("unix_db_info",86,"name")="unix_db_info.s_addrs.gvstats_rec.n_crits_in_epch"
+	Set gtmtypes("unix_db_info",86,"off")=528
 	Set gtmtypes("unix_db_info",86,"len")=8
 	Set gtmtypes("unix_db_info",86,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.sq_crit_failed")=86
-	Set gtmtypes("unix_db_info",87,"name")="unix_db_info.s_addrs.gvstats_rec.n_crit_failed"
-	Set gtmtypes("unix_db_info",87,"off")=540
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_crits_in_epch")=86
+	Set gtmtypes("unix_db_info",87,"name")="unix_db_info.s_addrs.gvstats_rec.sq_crit_failed"
+	Set gtmtypes("unix_db_info",87,"off")=536
 	Set gtmtypes("unix_db_info",87,"len")=8
 	Set gtmtypes("unix_db_info",87,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_crit_failed")=87
-	Set gtmtypes("unix_db_info",88,"name")="unix_db_info.s_addrs.gvstats_rec.sq_crit_que_slps"
-	Set gtmtypes("unix_db_info",88,"off")=548
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.sq_crit_failed")=87
+	Set gtmtypes("unix_db_info",88,"name")="unix_db_info.s_addrs.gvstats_rec.n_crit_failed"
+	Set gtmtypes("unix_db_info",88,"off")=544
 	Set gtmtypes("unix_db_info",88,"len")=8
 	Set gtmtypes("unix_db_info",88,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.sq_crit_que_slps")=88
-	Set gtmtypes("unix_db_info",89,"name")="unix_db_info.s_addrs.gvstats_rec.n_crit_que_slps"
-	Set gtmtypes("unix_db_info",89,"off")=556
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_crit_failed")=88
+	Set gtmtypes("unix_db_info",89,"name")="unix_db_info.s_addrs.gvstats_rec.sq_crit_que_slps"
+	Set gtmtypes("unix_db_info",89,"off")=552
 	Set gtmtypes("unix_db_info",89,"len")=8
 	Set gtmtypes("unix_db_info",89,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_crit_que_slps")=89
-	Set gtmtypes("unix_db_info",90,"name")="unix_db_info.s_addrs.gvstats_rec.sq_crit_yields"
-	Set gtmtypes("unix_db_info",90,"off")=564
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.sq_crit_que_slps")=89
+	Set gtmtypes("unix_db_info",90,"name")="unix_db_info.s_addrs.gvstats_rec.n_crit_que_slps"
+	Set gtmtypes("unix_db_info",90,"off")=560
 	Set gtmtypes("unix_db_info",90,"len")=8
 	Set gtmtypes("unix_db_info",90,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.sq_crit_yields")=90
-	Set gtmtypes("unix_db_info",91,"name")="unix_db_info.s_addrs.gvstats_rec.n_crit_yields"
-	Set gtmtypes("unix_db_info",91,"off")=572
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_crit_que_slps")=90
+	Set gtmtypes("unix_db_info",91,"name")="unix_db_info.s_addrs.gvstats_rec.sq_crit_yields"
+	Set gtmtypes("unix_db_info",91,"off")=568
 	Set gtmtypes("unix_db_info",91,"len")=8
 	Set gtmtypes("unix_db_info",91,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_crit_yields")=91
-	Set gtmtypes("unix_db_info",92,"name")="unix_db_info.s_addrs.dbsync_timer_tn"
-	Set gtmtypes("unix_db_info",92,"off")=580
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.sq_crit_yields")=91
+	Set gtmtypes("unix_db_info",92,"name")="unix_db_info.s_addrs.gvstats_rec.n_crit_yields"
+	Set gtmtypes("unix_db_info",92,"off")=576
 	Set gtmtypes("unix_db_info",92,"len")=8
 	Set gtmtypes("unix_db_info",92,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.dbsync_timer_tn")=92
-	Set gtmtypes("unix_db_info",93,"name")="unix_db_info.s_addrs.fullblockwrite_len"
-	Set gtmtypes("unix_db_info",93,"off")=588
-	Set gtmtypes("unix_db_info",93,"len")=4
-	Set gtmtypes("unix_db_info",93,"type")="size_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.fullblockwrite_len")=93
-	Set gtmtypes("unix_db_info",94,"name")="unix_db_info.s_addrs.total_blks"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_crit_yields")=92
+	Set gtmtypes("unix_db_info",93,"name")="unix_db_info.s_addrs.gvstats_rec.n_clean2dirty"
+	Set gtmtypes("unix_db_info",93,"off")=584
+	Set gtmtypes("unix_db_info",93,"len")=8
+	Set gtmtypes("unix_db_info",93,"type")="uint64_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_clean2dirty")=93
+	Set gtmtypes("unix_db_info",94,"name")="unix_db_info.s_addrs.dbsync_timer_tn"
 	Set gtmtypes("unix_db_info",94,"off")=592
-	Set gtmtypes("unix_db_info",94,"len")=4
-	Set gtmtypes("unix_db_info",94,"type")="unsigned-int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.total_blks")=94
-	Set gtmtypes("unix_db_info",95,"name")="unix_db_info.s_addrs.prev_free_blks"
-	Set gtmtypes("unix_db_info",95,"off")=596
+	Set gtmtypes("unix_db_info",94,"len")=8
+	Set gtmtypes("unix_db_info",94,"type")="uint64_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.dbsync_timer_tn")=94
+	Set gtmtypes("unix_db_info",95,"name")="unix_db_info.s_addrs.our_midnite"
+	Set gtmtypes("unix_db_info",95,"off")=600
 	Set gtmtypes("unix_db_info",95,"len")=4
-	Set gtmtypes("unix_db_info",95,"type")="unsigned-int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.prev_free_blks")=95
-	Set gtmtypes("unix_db_info",96,"name")="unix_db_info.s_addrs.timer"
-	Set gtmtypes("unix_db_info",96,"off")=600
+	Set gtmtypes("unix_db_info",95,"type")="addr"
+	Set gtmtypfldindx("unix_db_info","s_addrs.our_midnite")=95
+	Set gtmtypes("unix_db_info",96,"name")="unix_db_info.s_addrs.fullblockwrite_len"
+	Set gtmtypes("unix_db_info",96,"off")=604
 	Set gtmtypes("unix_db_info",96,"len")=4
-	Set gtmtypes("unix_db_info",96,"type")="unsigned-int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.timer")=96
-	Set gtmtypes("unix_db_info",97,"name")="unix_db_info.s_addrs.in_wtstart"
-	Set gtmtypes("unix_db_info",97,"off")=604
+	Set gtmtypes("unix_db_info",96,"type")="size_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.fullblockwrite_len")=96
+	Set gtmtypes("unix_db_info",97,"name")="unix_db_info.s_addrs.our_lru_cache_rec_off"
+	Set gtmtypes("unix_db_info",97,"off")=608
 	Set gtmtypes("unix_db_info",97,"len")=4
-	Set gtmtypes("unix_db_info",97,"type")="unsigned-int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.in_wtstart")=97
-	Set gtmtypes("unix_db_info",98,"name")="unix_db_info.s_addrs.now_crit"
-	Set gtmtypes("unix_db_info",98,"off")=608
+	Set gtmtypes("unix_db_info",97,"type")="intptr_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.our_lru_cache_rec_off")=97
+	Set gtmtypes("unix_db_info",98,"name")="unix_db_info.s_addrs.total_blks"
+	Set gtmtypes("unix_db_info",98,"off")=612
 	Set gtmtypes("unix_db_info",98,"len")=4
 	Set gtmtypes("unix_db_info",98,"type")="unsigned-int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.now_crit")=98
-	Set gtmtypes("unix_db_info",99,"name")="unix_db_info.s_addrs.wbuf_dqd"
-	Set gtmtypes("unix_db_info",99,"off")=612
+	Set gtmtypfldindx("unix_db_info","s_addrs.total_blks")=98
+	Set gtmtypes("unix_db_info",99,"name")="unix_db_info.s_addrs.prev_free_blks"
+	Set gtmtypes("unix_db_info",99,"off")=616
 	Set gtmtypes("unix_db_info",99,"len")=4
 	Set gtmtypes("unix_db_info",99,"type")="unsigned-int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.wbuf_dqd")=99
-	Set gtmtypes("unix_db_info",100,"name")="unix_db_info.s_addrs.stale_defer"
-	Set gtmtypes("unix_db_info",100,"off")=616
+	Set gtmtypfldindx("unix_db_info","s_addrs.prev_free_blks")=99
+	Set gtmtypes("unix_db_info",100,"name")="unix_db_info.s_addrs.timer"
+	Set gtmtypes("unix_db_info",100,"off")=620
 	Set gtmtypes("unix_db_info",100,"len")=4
 	Set gtmtypes("unix_db_info",100,"type")="unsigned-int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.stale_defer")=100
-	Set gtmtypes("unix_db_info",101,"name")="unix_db_info.s_addrs.freeze"
-	Set gtmtypes("unix_db_info",101,"off")=620
+	Set gtmtypfldindx("unix_db_info","s_addrs.timer")=100
+	Set gtmtypes("unix_db_info",101,"name")="unix_db_info.s_addrs.in_wtstart"
+	Set gtmtypes("unix_db_info",101,"off")=624
 	Set gtmtypes("unix_db_info",101,"len")=4
-	Set gtmtypes("unix_db_info",101,"type")="boolean_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.freeze")=101
-	Set gtmtypes("unix_db_info",102,"name")="unix_db_info.s_addrs.dbsync_timer"
-	Set gtmtypes("unix_db_info",102,"off")=624
+	Set gtmtypes("unix_db_info",101,"type")="unsigned-int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.in_wtstart")=101
+	Set gtmtypes("unix_db_info",102,"name")="unix_db_info.s_addrs.now_crit"
+	Set gtmtypes("unix_db_info",102,"off")=628
 	Set gtmtypes("unix_db_info",102,"len")=4
-	Set gtmtypes("unix_db_info",102,"type")="boolean_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.dbsync_timer")=102
-	Set gtmtypes("unix_db_info",103,"name")="unix_db_info.s_addrs.reorg_last_dest"
-	Set gtmtypes("unix_db_info",103,"off")=628
+	Set gtmtypes("unix_db_info",102,"type")="unsigned-int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.now_crit")=102
+	Set gtmtypes("unix_db_info",103,"name")="unix_db_info.s_addrs.wbuf_dqd"
+	Set gtmtypes("unix_db_info",103,"off")=632
 	Set gtmtypes("unix_db_info",103,"len")=4
-	Set gtmtypes("unix_db_info",103,"type")="int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.reorg_last_dest")=103
-	Set gtmtypes("unix_db_info",104,"name")="unix_db_info.s_addrs.jnl_before_image"
-	Set gtmtypes("unix_db_info",104,"off")=632
+	Set gtmtypes("unix_db_info",103,"type")="unsigned-int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.wbuf_dqd")=103
+	Set gtmtypes("unix_db_info",104,"name")="unix_db_info.s_addrs.stale_defer"
+	Set gtmtypes("unix_db_info",104,"off")=636
 	Set gtmtypes("unix_db_info",104,"len")=4
-	Set gtmtypes("unix_db_info",104,"type")="boolean_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.jnl_before_image")=104
-	Set gtmtypes("unix_db_info",105,"name")="unix_db_info.s_addrs.read_write"
-	Set gtmtypes("unix_db_info",105,"off")=636
+	Set gtmtypes("unix_db_info",104,"type")="unsigned-int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.stale_defer")=104
+	Set gtmtypes("unix_db_info",105,"name")="unix_db_info.s_addrs.freeze"
+	Set gtmtypes("unix_db_info",105,"off")=640
 	Set gtmtypes("unix_db_info",105,"len")=4
 	Set gtmtypes("unix_db_info",105,"type")="boolean_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.read_write")=105
-	Set gtmtypes("unix_db_info",106,"name")="unix_db_info.s_addrs.persistent_freeze"
-	Set gtmtypes("unix_db_info",106,"off")=640
+	Set gtmtypfldindx("unix_db_info","s_addrs.freeze")=105
+	Set gtmtypes("unix_db_info",106,"name")="unix_db_info.s_addrs.dbsync_timer"
+	Set gtmtypes("unix_db_info",106,"off")=644
 	Set gtmtypes("unix_db_info",106,"len")=4
 	Set gtmtypes("unix_db_info",106,"type")="boolean_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.persistent_freeze")=106
-	Set gtmtypes("unix_db_info",107,"name")="unix_db_info.s_addrs.pblk_align_jrecsize"
-	Set gtmtypes("unix_db_info",107,"off")=644
+	Set gtmtypfldindx("unix_db_info","s_addrs.dbsync_timer")=106
+	Set gtmtypes("unix_db_info",107,"name")="unix_db_info.s_addrs.reorg_last_dest"
+	Set gtmtypes("unix_db_info",107,"off")=648
 	Set gtmtypes("unix_db_info",107,"len")=4
 	Set gtmtypes("unix_db_info",107,"type")="int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.pblk_align_jrecsize")=107
-	Set gtmtypes("unix_db_info",108,"name")="unix_db_info.s_addrs.min_total_tpjnl_rec_size"
-	Set gtmtypes("unix_db_info",108,"off")=648
+	Set gtmtypfldindx("unix_db_info","s_addrs.reorg_last_dest")=107
+	Set gtmtypes("unix_db_info",108,"name")="unix_db_info.s_addrs.jnl_before_image"
+	Set gtmtypes("unix_db_info",108,"off")=652
 	Set gtmtypes("unix_db_info",108,"len")=4
-	Set gtmtypes("unix_db_info",108,"type")="int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.min_total_tpjnl_rec_size")=108
-	Set gtmtypes("unix_db_info",109,"name")="unix_db_info.s_addrs.min_total_nontpjnl_rec_size"
-	Set gtmtypes("unix_db_info",109,"off")=652
+	Set gtmtypes("unix_db_info",108,"type")="boolean_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.jnl_before_image")=108
+	Set gtmtypes("unix_db_info",109,"name")="unix_db_info.s_addrs.read_write"
+	Set gtmtypes("unix_db_info",109,"off")=656
 	Set gtmtypes("unix_db_info",109,"len")=4
-	Set gtmtypes("unix_db_info",109,"type")="int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.min_total_nontpjnl_rec_size")=109
-	Set gtmtypes("unix_db_info",110,"name")="unix_db_info.s_addrs.jnl_state"
-	Set gtmtypes("unix_db_info",110,"off")=656
+	Set gtmtypes("unix_db_info",109,"type")="boolean_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.read_write")=109
+	Set gtmtypes("unix_db_info",110,"name")="unix_db_info.s_addrs.orig_read_write"
+	Set gtmtypes("unix_db_info",110,"off")=660
 	Set gtmtypes("unix_db_info",110,"len")=4
-	Set gtmtypes("unix_db_info",110,"type")="int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.jnl_state")=110
-	Set gtmtypes("unix_db_info",111,"name")="unix_db_info.s_addrs.repl_state"
-	Set gtmtypes("unix_db_info",111,"off")=660
+	Set gtmtypes("unix_db_info",110,"type")="boolean_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.orig_read_write")=110
+	Set gtmtypes("unix_db_info",111,"name")="unix_db_info.s_addrs.persistent_freeze"
+	Set gtmtypes("unix_db_info",111,"off")=664
 	Set gtmtypes("unix_db_info",111,"len")=4
-	Set gtmtypes("unix_db_info",111,"type")="int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.repl_state")=111
-	Set gtmtypes("unix_db_info",112,"name")="unix_db_info.s_addrs.crit_check_cycle"
-	Set gtmtypes("unix_db_info",112,"off")=664
+	Set gtmtypes("unix_db_info",111,"type")="boolean_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.persistent_freeze")=111
+	Set gtmtypes("unix_db_info",112,"name")="unix_db_info.s_addrs.pblk_align_jrecsize"
+	Set gtmtypes("unix_db_info",112,"off")=668
 	Set gtmtypes("unix_db_info",112,"len")=4
-	Set gtmtypes("unix_db_info",112,"type")="unsigned-int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.crit_check_cycle")=112
-	Set gtmtypes("unix_db_info",113,"name")="unix_db_info.s_addrs.backup_in_prog"
-	Set gtmtypes("unix_db_info",113,"off")=668
+	Set gtmtypes("unix_db_info",112,"type")="int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.pblk_align_jrecsize")=112
+	Set gtmtypes("unix_db_info",113,"name")="unix_db_info.s_addrs.min_total_tpjnl_rec_size"
+	Set gtmtypes("unix_db_info",113,"off")=672
 	Set gtmtypes("unix_db_info",113,"len")=4
 	Set gtmtypes("unix_db_info",113,"type")="int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.backup_in_prog")=113
-	Set gtmtypes("unix_db_info",114,"name")="unix_db_info.s_addrs.snapshot_in_prog"
-	Set gtmtypes("unix_db_info",114,"off")=672
+	Set gtmtypfldindx("unix_db_info","s_addrs.min_total_tpjnl_rec_size")=113
+	Set gtmtypes("unix_db_info",114,"name")="unix_db_info.s_addrs.min_total_nontpjnl_rec_size"
+	Set gtmtypes("unix_db_info",114,"off")=676
 	Set gtmtypes("unix_db_info",114,"len")=4
-	Set gtmtypes("unix_db_info",114,"type")="boolean_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.snapshot_in_prog")=114
-	Set gtmtypes("unix_db_info",115,"name")="unix_db_info.s_addrs.ref_cnt"
-	Set gtmtypes("unix_db_info",115,"off")=676
+	Set gtmtypes("unix_db_info",114,"type")="int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.min_total_nontpjnl_rec_size")=114
+	Set gtmtypes("unix_db_info",115,"name")="unix_db_info.s_addrs.jnl_state"
+	Set gtmtypes("unix_db_info",115,"off")=680
 	Set gtmtypes("unix_db_info",115,"len")=4
 	Set gtmtypes("unix_db_info",115,"type")="int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.ref_cnt")=115
-	Set gtmtypes("unix_db_info",116,"name")="unix_db_info.s_addrs.fid_index"
-	Set gtmtypes("unix_db_info",116,"off")=680
+	Set gtmtypfldindx("unix_db_info","s_addrs.jnl_state")=115
+	Set gtmtypes("unix_db_info",116,"name")="unix_db_info.s_addrs.repl_state"
+	Set gtmtypes("unix_db_info",116,"off")=684
 	Set gtmtypes("unix_db_info",116,"len")=4
 	Set gtmtypes("unix_db_info",116,"type")="int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.fid_index")=116
-	Set gtmtypes("unix_db_info",117,"name")="unix_db_info.s_addrs.do_fullblockwrites"
-	Set gtmtypes("unix_db_info",117,"off")=684
+	Set gtmtypfldindx("unix_db_info","s_addrs.repl_state")=116
+	Set gtmtypes("unix_db_info",117,"name")="unix_db_info.s_addrs.crit_check_cycle"
+	Set gtmtypes("unix_db_info",117,"off")=688
 	Set gtmtypes("unix_db_info",117,"len")=4
-	Set gtmtypes("unix_db_info",117,"type")="boolean_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.do_fullblockwrites")=117
-	Set gtmtypes("unix_db_info",118,"name")="unix_db_info.s_addrs.regnum"
-	Set gtmtypes("unix_db_info",118,"off")=688
+	Set gtmtypes("unix_db_info",117,"type")="unsigned-int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.crit_check_cycle")=117
+	Set gtmtypes("unix_db_info",118,"name")="unix_db_info.s_addrs.backup_in_prog"
+	Set gtmtypes("unix_db_info",118,"off")=692
 	Set gtmtypes("unix_db_info",118,"len")=4
 	Set gtmtypes("unix_db_info",118,"type")="int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.regnum")=118
-	Set gtmtypes("unix_db_info",119,"name")="unix_db_info.s_addrs.n_pre_read_trigger"
-	Set gtmtypes("unix_db_info",119,"off")=692
+	Set gtmtypfldindx("unix_db_info","s_addrs.backup_in_prog")=118
+	Set gtmtypes("unix_db_info",119,"name")="unix_db_info.s_addrs.snapshot_in_prog"
+	Set gtmtypes("unix_db_info",119,"off")=696
 	Set gtmtypes("unix_db_info",119,"len")=4
-	Set gtmtypes("unix_db_info",119,"type")="int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.n_pre_read_trigger")=119
-	Set gtmtypes("unix_db_info",120,"name")="unix_db_info.s_addrs.jnlpool_validate_check"
-	Set gtmtypes("unix_db_info",120,"off")=696
+	Set gtmtypes("unix_db_info",119,"type")="boolean_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.snapshot_in_prog")=119
+	Set gtmtypes("unix_db_info",120,"name")="unix_db_info.s_addrs.ref_cnt"
+	Set gtmtypes("unix_db_info",120,"off")=700
 	Set gtmtypes("unix_db_info",120,"len")=4
-	Set gtmtypes("unix_db_info",120,"type")="unsigned-int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.jnlpool_validate_check")=120
-	Set gtmtypes("unix_db_info",121,"name")="unix_db_info.s_addrs.regcnt"
-	Set gtmtypes("unix_db_info",121,"off")=700
+	Set gtmtypes("unix_db_info",120,"type")="int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.ref_cnt")=120
+	Set gtmtypes("unix_db_info",121,"name")="unix_db_info.s_addrs.fid_index"
+	Set gtmtypes("unix_db_info",121,"off")=704
 	Set gtmtypes("unix_db_info",121,"len")=4
 	Set gtmtypes("unix_db_info",121,"type")="int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.regcnt")=121
-	Set gtmtypes("unix_db_info",122,"name")="unix_db_info.s_addrs.t_commit_crit"
-	Set gtmtypes("unix_db_info",122,"off")=704
+	Set gtmtypfldindx("unix_db_info","s_addrs.fid_index")=121
+	Set gtmtypes("unix_db_info",122,"name")="unix_db_info.s_addrs.do_fullblockwrites"
+	Set gtmtypes("unix_db_info",122,"off")=708
 	Set gtmtypes("unix_db_info",122,"len")=4
 	Set gtmtypes("unix_db_info",122,"type")="boolean_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.t_commit_crit")=122
-	Set gtmtypes("unix_db_info",123,"name")="unix_db_info.s_addrs.wcs_pidcnt_incremented"
-	Set gtmtypes("unix_db_info",123,"off")=708
+	Set gtmtypfldindx("unix_db_info","s_addrs.do_fullblockwrites")=122
+	Set gtmtypes("unix_db_info",123,"name")="unix_db_info.s_addrs.regnum"
+	Set gtmtypes("unix_db_info",123,"off")=712
 	Set gtmtypes("unix_db_info",123,"len")=4
-	Set gtmtypes("unix_db_info",123,"type")="boolean_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.wcs_pidcnt_incremented")=123
-	Set gtmtypes("unix_db_info",124,"name")="unix_db_info.s_addrs.incr_db_trigger_cycle"
-	Set gtmtypes("unix_db_info",124,"off")=712
+	Set gtmtypes("unix_db_info",123,"type")="int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.regnum")=123
+	Set gtmtypes("unix_db_info",124,"name")="unix_db_info.s_addrs.n_pre_read_trigger"
+	Set gtmtypes("unix_db_info",124,"off")=716
 	Set gtmtypes("unix_db_info",124,"len")=4
-	Set gtmtypes("unix_db_info",124,"type")="boolean_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.incr_db_trigger_cycle")=124
-	Set gtmtypes("unix_db_info",125,"name")="unix_db_info.s_addrs.db_trigger_cycle"
-	Set gtmtypes("unix_db_info",125,"off")=716
+	Set gtmtypes("unix_db_info",124,"type")="int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.n_pre_read_trigger")=124
+	Set gtmtypes("unix_db_info",125,"name")="unix_db_info.s_addrs.jnlpool_validate_check"
+	Set gtmtypes("unix_db_info",125,"off")=720
 	Set gtmtypes("unix_db_info",125,"len")=4
 	Set gtmtypes("unix_db_info",125,"type")="unsigned-int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.db_trigger_cycle")=125
-	Set gtmtypes("unix_db_info",126,"name")="unix_db_info.s_addrs.db_dztrigger_cycle"
-	Set gtmtypes("unix_db_info",126,"off")=720
+	Set gtmtypfldindx("unix_db_info","s_addrs.jnlpool_validate_check")=125
+	Set gtmtypes("unix_db_info",126,"name")="unix_db_info.s_addrs.regcnt"
+	Set gtmtypes("unix_db_info",126,"off")=724
 	Set gtmtypes("unix_db_info",126,"len")=4
-	Set gtmtypes("unix_db_info",126,"type")="unsigned-int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.db_dztrigger_cycle")=126
-	Set gtmtypes("unix_db_info",127,"name")="unix_db_info.s_addrs.hold_onto_crit"
-	Set gtmtypes("unix_db_info",127,"off")=724
+	Set gtmtypes("unix_db_info",126,"type")="int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.regcnt")=126
+	Set gtmtypes("unix_db_info",127,"name")="unix_db_info.s_addrs.t_commit_crit"
+	Set gtmtypes("unix_db_info",127,"off")=728
 	Set gtmtypes("unix_db_info",127,"len")=4
 	Set gtmtypes("unix_db_info",127,"type")="boolean_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.hold_onto_crit")=127
-	Set gtmtypes("unix_db_info",128,"name")="unix_db_info.s_addrs.dse_crit_seize_done"
-	Set gtmtypes("unix_db_info",128,"off")=728
+	Set gtmtypfldindx("unix_db_info","s_addrs.t_commit_crit")=127
+	Set gtmtypes("unix_db_info",128,"name")="unix_db_info.s_addrs.wcs_pidcnt_incremented"
+	Set gtmtypes("unix_db_info",128,"off")=732
 	Set gtmtypes("unix_db_info",128,"len")=4
 	Set gtmtypes("unix_db_info",128,"type")="boolean_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.dse_crit_seize_done")=128
-	Set gtmtypes("unix_db_info",129,"name")="unix_db_info.s_addrs.gbuff_limit"
-	Set gtmtypes("unix_db_info",129,"off")=732
+	Set gtmtypfldindx("unix_db_info","s_addrs.wcs_pidcnt_incremented")=128
+	Set gtmtypes("unix_db_info",129,"name")="unix_db_info.s_addrs.incr_db_trigger_cycle"
+	Set gtmtypes("unix_db_info",129,"off")=736
 	Set gtmtypes("unix_db_info",129,"len")=4
-	Set gtmtypes("unix_db_info",129,"type")="int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gbuff_limit")=129
-	Set gtmtypes("unix_db_info",130,"name")="unix_db_info.s_addrs.our_midnite"
-	Set gtmtypes("unix_db_info",130,"off")=736
+	Set gtmtypes("unix_db_info",129,"type")="boolean_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.incr_db_trigger_cycle")=129
+	Set gtmtypes("unix_db_info",130,"name")="unix_db_info.s_addrs.db_trigger_cycle"
+	Set gtmtypes("unix_db_info",130,"off")=740
 	Set gtmtypes("unix_db_info",130,"len")=4
-	Set gtmtypes("unix_db_info",130,"type")="addr"
-	Set gtmtypfldindx("unix_db_info","s_addrs.our_midnite")=130
-	Set gtmtypes("unix_db_info",131,"name")="unix_db_info.s_addrs.root_search_cycle"
-	Set gtmtypes("unix_db_info",131,"off")=740
+	Set gtmtypes("unix_db_info",130,"type")="unsigned-int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.db_trigger_cycle")=130
+	Set gtmtypes("unix_db_info",131,"name")="unix_db_info.s_addrs.db_dztrigger_cycle"
+	Set gtmtypes("unix_db_info",131,"off")=744
 	Set gtmtypes("unix_db_info",131,"len")=4
 	Set gtmtypes("unix_db_info",131,"type")="unsigned-int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.root_search_cycle")=131
-	Set gtmtypes("unix_db_info",132,"name")="unix_db_info.s_addrs.onln_rlbk_cycle"
-	Set gtmtypes("unix_db_info",132,"off")=744
+	Set gtmtypfldindx("unix_db_info","s_addrs.db_dztrigger_cycle")=131
+	Set gtmtypes("unix_db_info",132,"name")="unix_db_info.s_addrs.hold_onto_crit"
+	Set gtmtypes("unix_db_info",132,"off")=748
 	Set gtmtypes("unix_db_info",132,"len")=4
-	Set gtmtypes("unix_db_info",132,"type")="unsigned-int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.onln_rlbk_cycle")=132
-	Set gtmtypes("unix_db_info",133,"name")="unix_db_info.s_addrs.db_onln_rlbkd_cycle"
-	Set gtmtypes("unix_db_info",133,"off")=748
+	Set gtmtypes("unix_db_info",132,"type")="boolean_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.hold_onto_crit")=132
+	Set gtmtypes("unix_db_info",133,"name")="unix_db_info.s_addrs.dse_crit_seize_done"
+	Set gtmtypes("unix_db_info",133,"off")=752
 	Set gtmtypes("unix_db_info",133,"len")=4
-	Set gtmtypes("unix_db_info",133,"type")="unsigned-int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.db_onln_rlbkd_cycle")=133
-	Set gtmtypes("unix_db_info",134,"name")="unix_db_info.s_addrs.read_only_fs"
-	Set gtmtypes("unix_db_info",134,"off")=752
+	Set gtmtypes("unix_db_info",133,"type")="boolean_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.dse_crit_seize_done")=133
+	Set gtmtypes("unix_db_info",134,"name")="unix_db_info.s_addrs.gbuff_limit"
+	Set gtmtypes("unix_db_info",134,"off")=756
 	Set gtmtypes("unix_db_info",134,"len")=4
-	Set gtmtypes("unix_db_info",134,"type")="boolean_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.read_only_fs")=134
-	Set gtmtypes("unix_db_info",135,"name")="unix_db_info.s_addrs.crit_probe"
-	Set gtmtypes("unix_db_info",135,"off")=756
+	Set gtmtypes("unix_db_info",134,"type")="int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gbuff_limit")=134
+	Set gtmtypes("unix_db_info",135,"name")="unix_db_info.s_addrs.root_search_cycle"
+	Set gtmtypes("unix_db_info",135,"off")=760
 	Set gtmtypes("unix_db_info",135,"len")=4
-	Set gtmtypes("unix_db_info",135,"type")="boolean_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.crit_probe")=135
-	Set gtmtypes("unix_db_info",136,"name")="unix_db_info.s_addrs.probecrit_rec"
-	Set gtmtypes("unix_db_info",136,"off")=760
-	Set gtmtypes("unix_db_info",136,"len")=56
-	Set gtmtypes("unix_db_info",136,"type")="probecrit_rec_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.probecrit_rec")=136
-	Set gtmtypes("unix_db_info",137,"name")="unix_db_info.s_addrs.probecrit_rec.t_get_crit"
-	Set gtmtypes("unix_db_info",137,"off")=760
-	Set gtmtypes("unix_db_info",137,"len")=8
-	Set gtmtypes("unix_db_info",137,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.probecrit_rec.t_get_crit")=137
-	Set gtmtypes("unix_db_info",138,"name")="unix_db_info.s_addrs.probecrit_rec.p_crit_failed"
-	Set gtmtypes("unix_db_info",138,"off")=768
-	Set gtmtypes("unix_db_info",138,"len")=8
-	Set gtmtypes("unix_db_info",138,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.probecrit_rec.p_crit_failed")=138
-	Set gtmtypes("unix_db_info",139,"name")="unix_db_info.s_addrs.probecrit_rec.p_crit_que_slps"
+	Set gtmtypes("unix_db_info",135,"type")="unsigned-int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.root_search_cycle")=135
+	Set gtmtypes("unix_db_info",136,"name")="unix_db_info.s_addrs.onln_rlbk_cycle"
+	Set gtmtypes("unix_db_info",136,"off")=764
+	Set gtmtypes("unix_db_info",136,"len")=4
+	Set gtmtypes("unix_db_info",136,"type")="unsigned-int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.onln_rlbk_cycle")=136
+	Set gtmtypes("unix_db_info",137,"name")="unix_db_info.s_addrs.db_onln_rlbkd_cycle"
+	Set gtmtypes("unix_db_info",137,"off")=768
+	Set gtmtypes("unix_db_info",137,"len")=4
+	Set gtmtypes("unix_db_info",137,"type")="unsigned-int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.db_onln_rlbkd_cycle")=137
+	Set gtmtypes("unix_db_info",138,"name")="unix_db_info.s_addrs.reservedDBFlags"
+	Set gtmtypes("unix_db_info",138,"off")=772
+	Set gtmtypes("unix_db_info",138,"len")=4
+	Set gtmtypes("unix_db_info",138,"type")="unsigned-int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.reservedDBFlags")=138
+	Set gtmtypes("unix_db_info",139,"name")="unix_db_info.s_addrs.read_only_fs"
 	Set gtmtypes("unix_db_info",139,"off")=776
-	Set gtmtypes("unix_db_info",139,"len")=8
-	Set gtmtypes("unix_db_info",139,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.probecrit_rec.p_crit_que_slps")=139
-	Set gtmtypes("unix_db_info",140,"name")="unix_db_info.s_addrs.probecrit_rec.p_crit_yields"
-	Set gtmtypes("unix_db_info",140,"off")=784
-	Set gtmtypes("unix_db_info",140,"len")=8
-	Set gtmtypes("unix_db_info",140,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.probecrit_rec.p_crit_yields")=140
-	Set gtmtypes("unix_db_info",141,"name")="unix_db_info.s_addrs.probecrit_rec.p_crit_que_full"
-	Set gtmtypes("unix_db_info",141,"off")=792
-	Set gtmtypes("unix_db_info",141,"len")=8
-	Set gtmtypes("unix_db_info",141,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.probecrit_rec.p_crit_que_full")=141
-	Set gtmtypes("unix_db_info",142,"name")="unix_db_info.s_addrs.probecrit_rec.p_crit_que_slots"
-	Set gtmtypes("unix_db_info",142,"off")=800
-	Set gtmtypes("unix_db_info",142,"len")=8
-	Set gtmtypes("unix_db_info",142,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.probecrit_rec.p_crit_que_slots")=142
-	Set gtmtypes("unix_db_info",143,"name")="unix_db_info.s_addrs.probecrit_rec.p_crit_success"
-	Set gtmtypes("unix_db_info",143,"off")=808
+	Set gtmtypes("unix_db_info",139,"len")=4
+	Set gtmtypes("unix_db_info",139,"type")="boolean_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.read_only_fs")=139
+	Set gtmtypes("unix_db_info",140,"name")="unix_db_info.s_addrs.crit_probe"
+	Set gtmtypes("unix_db_info",140,"off")=780
+	Set gtmtypes("unix_db_info",140,"len")=4
+	Set gtmtypes("unix_db_info",140,"type")="boolean_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.crit_probe")=140
+	Set gtmtypes("unix_db_info",141,"name")="unix_db_info.s_addrs.canceled_flush_timer"
+	Set gtmtypes("unix_db_info",141,"off")=784
+	Set gtmtypes("unix_db_info",141,"len")=4
+	Set gtmtypes("unix_db_info",141,"type")="boolean_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.canceled_flush_timer")=141
+	Set gtmtypes("unix_db_info",142,"name")="unix_db_info.s_addrs.probecrit_rec"
+	Set gtmtypes("unix_db_info",142,"off")=788
+	Set gtmtypes("unix_db_info",142,"len")=56
+	Set gtmtypes("unix_db_info",142,"type")="probecrit_rec_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.probecrit_rec")=142
+	Set gtmtypes("unix_db_info",143,"name")="unix_db_info.s_addrs.probecrit_rec.t_get_crit"
+	Set gtmtypes("unix_db_info",143,"off")=788
 	Set gtmtypes("unix_db_info",143,"len")=8
 	Set gtmtypes("unix_db_info",143,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.probecrit_rec.p_crit_success")=143
-	Set gtmtypes("unix_db_info",144,"name")="unix_db_info.fn"
-	Set gtmtypes("unix_db_info",144,"off")=816
-	Set gtmtypes("unix_db_info",144,"len")=4
-	Set gtmtypes("unix_db_info",144,"type")="addr"
-	Set gtmtypfldindx("unix_db_info","fn")=144
-	Set gtmtypes("unix_db_info",145,"name")="unix_db_info.fd"
-	Set gtmtypes("unix_db_info",145,"off")=820
-	Set gtmtypes("unix_db_info",145,"len")=4
-	Set gtmtypes("unix_db_info",145,"type")="int"
-	Set gtmtypfldindx("unix_db_info","fd")=145
-	Set gtmtypes("unix_db_info",146,"name")="unix_db_info.fileid"
-	Set gtmtypes("unix_db_info",146,"off")=824
-	Set gtmtypes("unix_db_info",146,"len")=20
-	Set gtmtypes("unix_db_info",146,"type")="unix_file_id"
-	Set gtmtypfldindx("unix_db_info","fileid")=146
-	Set gtmtypes("unix_db_info",147,"name")="unix_db_info.fileid.inode"
-	Set gtmtypes("unix_db_info",147,"off")=824
+	Set gtmtypfldindx("unix_db_info","s_addrs.probecrit_rec.t_get_crit")=143
+	Set gtmtypes("unix_db_info",144,"name")="unix_db_info.s_addrs.probecrit_rec.p_crit_failed"
+	Set gtmtypes("unix_db_info",144,"off")=796
+	Set gtmtypes("unix_db_info",144,"len")=8
+	Set gtmtypes("unix_db_info",144,"type")="uint64_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.probecrit_rec.p_crit_failed")=144
+	Set gtmtypes("unix_db_info",145,"name")="unix_db_info.s_addrs.probecrit_rec.p_crit_que_slps"
+	Set gtmtypes("unix_db_info",145,"off")=804
+	Set gtmtypes("unix_db_info",145,"len")=8
+	Set gtmtypes("unix_db_info",145,"type")="uint64_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.probecrit_rec.p_crit_que_slps")=145
+	Set gtmtypes("unix_db_info",146,"name")="unix_db_info.s_addrs.probecrit_rec.p_crit_yields"
+	Set gtmtypes("unix_db_info",146,"off")=812
+	Set gtmtypes("unix_db_info",146,"len")=8
+	Set gtmtypes("unix_db_info",146,"type")="uint64_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.probecrit_rec.p_crit_yields")=146
+	Set gtmtypes("unix_db_info",147,"name")="unix_db_info.s_addrs.probecrit_rec.p_crit_que_full"
+	Set gtmtypes("unix_db_info",147,"off")=820
 	Set gtmtypes("unix_db_info",147,"len")=8
-	Set gtmtypes("unix_db_info",147,"type")="ino_t"
-	Set gtmtypfldindx("unix_db_info","fileid.inode")=147
-	Set gtmtypes("unix_db_info",148,"name")="unix_db_info.fileid.device"
-	Set gtmtypes("unix_db_info",148,"off")=832
+	Set gtmtypes("unix_db_info",147,"type")="uint64_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.probecrit_rec.p_crit_que_full")=147
+	Set gtmtypes("unix_db_info",148,"name")="unix_db_info.s_addrs.probecrit_rec.p_crit_que_slots"
+	Set gtmtypes("unix_db_info",148,"off")=828
 	Set gtmtypes("unix_db_info",148,"len")=8
-	Set gtmtypes("unix_db_info",148,"type")="dev_t"
-	Set gtmtypfldindx("unix_db_info","fileid.device")=148
-	Set gtmtypes("unix_db_info",149,"name")="unix_db_info.fileid.st_gen"
-	Set gtmtypes("unix_db_info",149,"off")=840
-	Set gtmtypes("unix_db_info",149,"len")=4
-	Set gtmtypes("unix_db_info",149,"type")="unsigned-int"
-	Set gtmtypfldindx("unix_db_info","fileid.st_gen")=149
-	Set gtmtypes("unix_db_info",150,"name")="unix_db_info.semid"
+	Set gtmtypes("unix_db_info",148,"type")="uint64_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.probecrit_rec.p_crit_que_slots")=148
+	Set gtmtypes("unix_db_info",149,"name")="unix_db_info.s_addrs.probecrit_rec.p_crit_success"
+	Set gtmtypes("unix_db_info",149,"off")=836
+	Set gtmtypes("unix_db_info",149,"len")=8
+	Set gtmtypes("unix_db_info",149,"type")="uint64_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.probecrit_rec.p_crit_success")=149
+	Set gtmtypes("unix_db_info",150,"name")="unix_db_info.s_addrs.lock_crit_with_db"
 	Set gtmtypes("unix_db_info",150,"off")=844
 	Set gtmtypes("unix_db_info",150,"len")=4
-	Set gtmtypes("unix_db_info",150,"type")="int"
-	Set gtmtypfldindx("unix_db_info","semid")=150
-	Set gtmtypes("unix_db_info",151,"name")="unix_db_info.gt_sem_ctime"
+	Set gtmtypes("unix_db_info",150,"type")="boolean_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.lock_crit_with_db")=150
+	Set gtmtypes("unix_db_info",151,"name")="unix_db_info.s_addrs.needs_post_freeze_online_clean"
 	Set gtmtypes("unix_db_info",151,"off")=848
 	Set gtmtypes("unix_db_info",151,"len")=4
-	Set gtmtypes("unix_db_info",151,"type")="time_t"
-	Set gtmtypfldindx("unix_db_info","gt_sem_ctime")=151
-	Set gtmtypes("unix_db_info",152,"name")="unix_db_info.shmid"
+	Set gtmtypes("unix_db_info",151,"type")="boolean_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.needs_post_freeze_online_clean")=151
+	Set gtmtypes("unix_db_info",152,"name")="unix_db_info.s_addrs.needs_post_freeze_flushsync"
 	Set gtmtypes("unix_db_info",152,"off")=852
 	Set gtmtypes("unix_db_info",152,"len")=4
-	Set gtmtypes("unix_db_info",152,"type")="int"
-	Set gtmtypfldindx("unix_db_info","shmid")=152
-	Set gtmtypes("unix_db_info",153,"name")="unix_db_info.gt_shm_ctime"
+	Set gtmtypes("unix_db_info",152,"type")="boolean_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.needs_post_freeze_flushsync")=152
+	Set gtmtypes("unix_db_info",153,"name")="unix_db_info.s_addrs.tp_hint"
 	Set gtmtypes("unix_db_info",153,"off")=856
 	Set gtmtypes("unix_db_info",153,"len")=4
-	Set gtmtypes("unix_db_info",153,"type")="time_t"
-	Set gtmtypfldindx("unix_db_info","gt_shm_ctime")=153
-	Set gtmtypes("unix_db_info",154,"name")="unix_db_info.ftok_semid"
+	Set gtmtypes("unix_db_info",153,"type")="int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.tp_hint")=153
+	Set gtmtypes("unix_db_info",154,"name")="unix_db_info.s_addrs.statsDB_setup_completed"
 	Set gtmtypes("unix_db_info",154,"off")=860
 	Set gtmtypes("unix_db_info",154,"len")=4
-	Set gtmtypes("unix_db_info",154,"type")="int"
-	Set gtmtypfldindx("unix_db_info","ftok_semid")=154
-	Set gtmtypes("unix_db_info",155,"name")="unix_db_info.key"
-	Set gtmtypes("unix_db_info",155,"off")=868
+	Set gtmtypes("unix_db_info",154,"type")="boolean_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.statsDB_setup_completed")=154
+	Set gtmtypes("unix_db_info",155,"name")="unix_db_info.fn"
+	Set gtmtypes("unix_db_info",155,"off")=864
 	Set gtmtypes("unix_db_info",155,"len")=4
-	Set gtmtypes("unix_db_info",155,"type")="key_t"
-	Set gtmtypfldindx("unix_db_info","key")=155
-	Set gtmtypes("unix_db_info",156,"name")="unix_db_info.raw"
-	Set gtmtypes("unix_db_info",156,"off")=872
+	Set gtmtypes("unix_db_info",155,"type")="addr"
+	Set gtmtypfldindx("unix_db_info","fn")=155
+	Set gtmtypes("unix_db_info",156,"name")="unix_db_info.fd"
+	Set gtmtypes("unix_db_info",156,"off")=868
 	Set gtmtypes("unix_db_info",156,"len")=4
-	Set gtmtypes("unix_db_info",156,"type")="boolean_t"
-	Set gtmtypfldindx("unix_db_info","raw")=156
+	Set gtmtypes("unix_db_info",156,"type")="int"
+	Set gtmtypfldindx("unix_db_info","fd")=156
+	Set gtmtypes("unix_db_info",157,"name")="unix_db_info.owning_gd"
+	Set gtmtypes("unix_db_info",157,"off")=872
+	Set gtmtypes("unix_db_info",157,"len")=4
+	Set gtmtypes("unix_db_info",157,"type")="addr"
+	Set gtmtypfldindx("unix_db_info","owning_gd")=157
+	Set gtmtypes("unix_db_info",158,"name")="unix_db_info.fileid"
+	Set gtmtypes("unix_db_info",158,"off")=876
+	Set gtmtypes("unix_db_info",158,"len")=20
+	Set gtmtypes("unix_db_info",158,"type")="unix_file_id"
+	Set gtmtypfldindx("unix_db_info","fileid")=158
+	Set gtmtypes("unix_db_info",159,"name")="unix_db_info.fileid.inode"
+	Set gtmtypes("unix_db_info",159,"off")=876
+	Set gtmtypes("unix_db_info",159,"len")=8
+	Set gtmtypes("unix_db_info",159,"type")="ino_t"
+	Set gtmtypfldindx("unix_db_info","fileid.inode")=159
+	Set gtmtypes("unix_db_info",160,"name")="unix_db_info.fileid.device"
+	Set gtmtypes("unix_db_info",160,"off")=884
+	Set gtmtypes("unix_db_info",160,"len")=8
+	Set gtmtypes("unix_db_info",160,"type")="dev_t"
+	Set gtmtypfldindx("unix_db_info","fileid.device")=160
+	Set gtmtypes("unix_db_info",161,"name")="unix_db_info.fileid.st_gen"
+	Set gtmtypes("unix_db_info",161,"off")=892
+	Set gtmtypes("unix_db_info",161,"len")=4
+	Set gtmtypes("unix_db_info",161,"type")="unsigned-int"
+	Set gtmtypfldindx("unix_db_info","fileid.st_gen")=161
+	Set gtmtypes("unix_db_info",162,"name")="unix_db_info.semid"
+	Set gtmtypes("unix_db_info",162,"off")=896
+	Set gtmtypes("unix_db_info",162,"len")=4
+	Set gtmtypes("unix_db_info",162,"type")="int"
+	Set gtmtypfldindx("unix_db_info","semid")=162
+	Set gtmtypes("unix_db_info",163,"name")="unix_db_info.gt_sem_ctime"
+	Set gtmtypes("unix_db_info",163,"off")=900
+	Set gtmtypes("unix_db_info",163,"len")=4
+	Set gtmtypes("unix_db_info",163,"type")="time_t"
+	Set gtmtypfldindx("unix_db_info","gt_sem_ctime")=163
+	Set gtmtypes("unix_db_info",164,"name")="unix_db_info.shmid"
+	Set gtmtypes("unix_db_info",164,"off")=904
+	Set gtmtypes("unix_db_info",164,"len")=4
+	Set gtmtypes("unix_db_info",164,"type")="int"
+	Set gtmtypfldindx("unix_db_info","shmid")=164
+	Set gtmtypes("unix_db_info",165,"name")="unix_db_info.gt_shm_ctime"
+	Set gtmtypes("unix_db_info",165,"off")=908
+	Set gtmtypes("unix_db_info",165,"len")=4
+	Set gtmtypes("unix_db_info",165,"type")="time_t"
+	Set gtmtypfldindx("unix_db_info","gt_shm_ctime")=165
+	Set gtmtypes("unix_db_info",166,"name")="unix_db_info.ftok_semid"
+	Set gtmtypes("unix_db_info",166,"off")=912
+	Set gtmtypes("unix_db_info",166,"len")=4
+	Set gtmtypes("unix_db_info",166,"type")="int"
+	Set gtmtypfldindx("unix_db_info","ftok_semid")=166
+	Set gtmtypes("unix_db_info",167,"name")="unix_db_info.key"
+	Set gtmtypes("unix_db_info",167,"off")=916
+	Set gtmtypes("unix_db_info",167,"len")=4
+	Set gtmtypes("unix_db_info",167,"type")="key_t"
+	Set gtmtypfldindx("unix_db_info","key")=167
+	Set gtmtypes("unix_db_info",168,"name")="unix_db_info.raw"
+	Set gtmtypes("unix_db_info",168,"off")=920
+	Set gtmtypes("unix_db_info",168,"len")=4
+	Set gtmtypes("unix_db_info",168,"type")="boolean_t"
+	Set gtmtypfldindx("unix_db_info","raw")=168
+	Set gtmtypes("unix_db_info",169,"name")="unix_db_info.db_fs_block_size"
+	Set gtmtypes("unix_db_info",169,"off")=924
+	Set gtmtypes("unix_db_info",169,"len")=4
+	Set gtmtypes("unix_db_info",169,"type")="unsigned-int"
+	Set gtmtypfldindx("unix_db_info","db_fs_block_size")=169
 	;
 	Set gtmtypes("unix_file_id")="struct"
 	Set gtmtypes("unix_file_id",0)=3
@@ -40855,6 +41715,84 @@ Init
 	Set gtmtypes("wcs_conflict_trace_t",3,"type")="int"
 	Set gtmtypfldindx("wcs_conflict_trace_t","fsync_in_prog_pid")=3
 	;
+	Set gtmtypes("wcs_ops_trace_t")="struct"
+	Set gtmtypes("wcs_ops_trace_t",0)=11
+	Set gtmtypes("wcs_ops_trace_t","len")=52
+	Set gtmtypes("wcs_ops_trace_t",1,"name")="wcs_ops_trace_t.db_tn"
+	Set gtmtypes("wcs_ops_trace_t",1,"off")=0
+	Set gtmtypes("wcs_ops_trace_t",1,"len")=8
+	Set gtmtypes("wcs_ops_trace_t",1,"type")="uint64_t"
+	Set gtmtypfldindx("wcs_ops_trace_t","db_tn")=1
+	Set gtmtypes("wcs_ops_trace_t",2,"name")="wcs_ops_trace_t.process_id"
+	Set gtmtypes("wcs_ops_trace_t",2,"off")=8
+	Set gtmtypes("wcs_ops_trace_t",2,"len")=4
+	Set gtmtypes("wcs_ops_trace_t",2,"type")="unsigned-int"
+	Set gtmtypfldindx("wcs_ops_trace_t","process_id")=2
+	Set gtmtypes("wcs_ops_trace_t",3,"name")="wcs_ops_trace_t.wc_in_free"
+	Set gtmtypes("wcs_ops_trace_t",3,"off")=12
+	Set gtmtypes("wcs_ops_trace_t",3,"len")=4
+	Set gtmtypes("wcs_ops_trace_t",3,"type")="unsigned-int"
+	Set gtmtypfldindx("wcs_ops_trace_t","wc_in_free")=3
+	Set gtmtypes("wcs_ops_trace_t",4,"name")="wcs_ops_trace_t.wcs_active_lvl"
+	Set gtmtypes("wcs_ops_trace_t",4,"off")=16
+	Set gtmtypes("wcs_ops_trace_t",4,"len")=4
+	Set gtmtypes("wcs_ops_trace_t",4,"type")="unsigned-int"
+	Set gtmtypfldindx("wcs_ops_trace_t","wcs_active_lvl")=4
+	Set gtmtypes("wcs_ops_trace_t",5,"name")="wcs_ops_trace_t.wcs_wip_lvl"
+	Set gtmtypes("wcs_ops_trace_t",5,"off")=20
+	Set gtmtypes("wcs_ops_trace_t",5,"len")=4
+	Set gtmtypes("wcs_ops_trace_t",5,"type")="unsigned-int"
+	Set gtmtypfldindx("wcs_ops_trace_t","wcs_wip_lvl")=5
+	Set gtmtypes("wcs_ops_trace_t",6,"name")="wcs_ops_trace_t.type"
+	Set gtmtypes("wcs_ops_trace_t",6,"off")=24
+	Set gtmtypes("wcs_ops_trace_t",6,"len")=4
+	Set gtmtypes("wcs_ops_trace_t",6,"type")="int"
+	Set gtmtypfldindx("wcs_ops_trace_t","type")=6
+	Set gtmtypes("wcs_ops_trace_t",7,"name")="wcs_ops_trace_t.blk"
+	Set gtmtypes("wcs_ops_trace_t",7,"off")=28
+	Set gtmtypes("wcs_ops_trace_t",7,"len")=4
+	Set gtmtypes("wcs_ops_trace_t",7,"type")="int"
+	Set gtmtypfldindx("wcs_ops_trace_t","blk")=7
+	Set gtmtypes("wcs_ops_trace_t",8,"name")="wcs_ops_trace_t.cr_off"
+	Set gtmtypes("wcs_ops_trace_t",8,"off")=32
+	Set gtmtypes("wcs_ops_trace_t",8,"len")=4
+	Set gtmtypes("wcs_ops_trace_t",8,"type")="intptr_t"
+	Set gtmtypfldindx("wcs_ops_trace_t","cr_off")=8
+	Set gtmtypes("wcs_ops_trace_t",9,"name")="wcs_ops_trace_t.cr_dirty"
+	Set gtmtypes("wcs_ops_trace_t",9,"off")=36
+	Set gtmtypes("wcs_ops_trace_t",9,"len")=8
+	Set gtmtypes("wcs_ops_trace_t",9,"type")="uint64_t"
+	Set gtmtypfldindx("wcs_ops_trace_t","cr_dirty")=9
+	Set gtmtypes("wcs_ops_trace_t",10,"name")="wcs_ops_trace_t.detail1"
+	Set gtmtypes("wcs_ops_trace_t",10,"off")=44
+	Set gtmtypes("wcs_ops_trace_t",10,"len")=4
+	Set gtmtypes("wcs_ops_trace_t",10,"type")="unsigned-int"
+	Set gtmtypfldindx("wcs_ops_trace_t","detail1")=10
+	Set gtmtypes("wcs_ops_trace_t",11,"name")="wcs_ops_trace_t.detail2"
+	Set gtmtypes("wcs_ops_trace_t",11,"off")=48
+	Set gtmtypes("wcs_ops_trace_t",11,"len")=4
+	Set gtmtypes("wcs_ops_trace_t",11,"type")="unsigned-int"
+	Set gtmtypfldindx("wcs_ops_trace_t","detail2")=11
+	;
+	Set gtmtypes("wtstart_cr_list_t")="struct"
+	Set gtmtypes("wtstart_cr_list_t",0)=3
+	Set gtmtypes("wtstart_cr_list_t","len")=12
+	Set gtmtypes("wtstart_cr_list_t",1,"name")="wtstart_cr_list_t.numcrs"
+	Set gtmtypes("wtstart_cr_list_t",1,"off")=0
+	Set gtmtypes("wtstart_cr_list_t",1,"len")=4
+	Set gtmtypes("wtstart_cr_list_t",1,"type")="int"
+	Set gtmtypfldindx("wtstart_cr_list_t","numcrs")=1
+	Set gtmtypes("wtstart_cr_list_t",2,"name")="wtstart_cr_list_t.listsize"
+	Set gtmtypes("wtstart_cr_list_t",2,"off")=4
+	Set gtmtypes("wtstart_cr_list_t",2,"len")=4
+	Set gtmtypes("wtstart_cr_list_t",2,"type")="int"
+	Set gtmtypfldindx("wtstart_cr_list_t","listsize")=2
+	Set gtmtypes("wtstart_cr_list_t",3,"name")="wtstart_cr_list_t.listcrs"
+	Set gtmtypes("wtstart_cr_list_t",3,"off")=8
+	Set gtmtypes("wtstart_cr_list_t",3,"len")=4
+	Set gtmtypes("wtstart_cr_list_t",3,"type")="addr"
+	Set gtmtypfldindx("wtstart_cr_list_t","listcrs")=3
+	;
 	Set gtmtypes("z_records")="struct"
 	Set gtmtypes("z_records",0)=3
 	Set gtmtypes("z_records","len")=12
@@ -41504,6 +42442,7 @@ Init
 	Set gtmstructs("srch_blk_status_struct")="srch_blk_status"
 	Set gtmstructs("st_timer_alloc")="st_timer_alloc"
 	Set gtmstructs("stack_frame_struct")="stack_frame"
+	Set gtmstructs("statsDB_diqe")="statsDB_deferred_init_que_elem"
 	Set gtmstructs("storElemStruct")="storElem"
 	Set gtmstructs("struct_spanode_integ")="span_node_integ"
 	Set gtmstructs("symval_struct")="symval"
@@ -41533,6 +42472,7 @@ Init
 	Set gtmstructs("util_snapshot_struct")="util_snapshot_t"
 	Set gtmstructs("vms_lock_sb_struct")="vms_lock_sb"
 	Set gtmstructs("wcs_conflict_trace_struct")="wcs_conflict_trace_t"
+	Set gtmstructs("wtstart_cr_list_struct")="wtstart_cr_list_t"
 	Set gtmstructs("zro_ent_type")="zro_ent"
 	Set gtmstructs("zshow_out_struct")="zshow_out"
 	Set gtmstructs("zwr_alias_var_struct")="zwr_alias_var"
diff --git a/sr_i386/GTMDefinedTypesInitRelease.m b/sr_i386/GTMDefinedTypesInitRelease.m
index 8a207dc..69bac24 100644
--- a/sr_i386/GTMDefinedTypesInitRelease.m
+++ b/sr_i386/GTMDefinedTypesInitRelease.m
@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;								;
-; Copyright (c) 2010-2016 Fidelity National Information 	;
+; Copyright (c) 2010-2017 Fidelity National Information 	;
 ; Services, Inc. and/or its subsidiaries. All rights reserved.	;
 ;								;
 ;	This source code contains the intellectual property	;
@@ -11,14 +11,14 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ;
-; Generated by scantypedefs.m at 17:35:46 on 2016-05-09
-; Build done with GT.M version: GT.M V6.3-000 Linux x86
+; Generated by scantypedefs.m at 10:47:32 on 2017-03-30
+; Build done with GT.M version: GT.M V6.3-000A Linux x86
 ;
 ; Environment variables during run:
-;   $gtm_dist: /usr/library/V63000/pro
-;   $gtm_exe: /usr/library/V63000A/pro
-;   $gtm_src: /usr/library/V63000A/src
-;   $gtm_inc: /usr/library/V63000A/inc
+;   $gtm_dist: /usr/library/V63000A/pro
+;   $gtm_exe: /usr/library/V63001A/pro
+;   $gtm_src: /usr/library/V63001A/src
+;   $gtm_inc: /usr/library/V63001A/inc
 ;
 ; Note this file should not be manually invoked
 ;
@@ -28,10 +28,10 @@
 ; Entry point used by gtmpcat and others to define GTM structure fields
 ;
 Init
-	Set gtmsdver="1.1.0"
+	; GT.M structure and field definitions
+	Set gtmsdver="1.2.0"
 	Set gtmsdtyp="pro"
 	;
-	; GT.M structure and field definitions
 	;
 	Set gtmtypes("ABS_TIME")="struct"
 	Set gtmtypes("ABS_TIME",0)=2
@@ -209,8 +209,8 @@ Init
 	Set gtmtypfldindx("Dev_param_pairs","pairs[0].definition")=4
 	;
 	Set gtmtypes("GT_TIMER")="struct"
-	Set gtmtypes("GT_TIMER",0)=13
-	Set gtmtypes("GT_TIMER","len")=44
+	Set gtmtypes("GT_TIMER",0)=14
+	Set gtmtypes("GT_TIMER","len")=48
 	Set gtmtypes("GT_TIMER",1,"name")="GT_TIMER.expir_time"
 	Set gtmtypes("GT_TIMER",1,"off")=0
 	Set gtmtypes("GT_TIMER",1,"len")=8
@@ -261,21 +261,26 @@ Init
 	Set gtmtypes("GT_TIMER",10,"len")=4
 	Set gtmtypes("GT_TIMER",10,"type")="int"
 	Set gtmtypfldindx("GT_TIMER","safe")=10
-	Set gtmtypes("GT_TIMER",11,"name")="GT_TIMER.hd_len_max"
+	Set gtmtypes("GT_TIMER",11,"name")="GT_TIMER.block_int"
 	Set gtmtypes("GT_TIMER",11,"off")=32
 	Set gtmtypes("GT_TIMER",11,"len")=4
 	Set gtmtypes("GT_TIMER",11,"type")="int"
-	Set gtmtypfldindx("GT_TIMER","hd_len_max")=11
-	Set gtmtypes("GT_TIMER",12,"name")="GT_TIMER.hd_len"
+	Set gtmtypfldindx("GT_TIMER","block_int")=11
+	Set gtmtypes("GT_TIMER",12,"name")="GT_TIMER.hd_len_max"
 	Set gtmtypes("GT_TIMER",12,"off")=36
 	Set gtmtypes("GT_TIMER",12,"len")=4
 	Set gtmtypes("GT_TIMER",12,"type")="int"
-	Set gtmtypfldindx("GT_TIMER","hd_len")=12
-	Set gtmtypes("GT_TIMER",13,"name")="GT_TIMER.hd_data"
+	Set gtmtypfldindx("GT_TIMER","hd_len_max")=12
+	Set gtmtypes("GT_TIMER",13,"name")="GT_TIMER.hd_len"
 	Set gtmtypes("GT_TIMER",13,"off")=40
-	Set gtmtypes("GT_TIMER",13,"len")=1
-	Set gtmtypes("GT_TIMER",13,"type")="char"
-	Set gtmtypfldindx("GT_TIMER","hd_data")=13
+	Set gtmtypes("GT_TIMER",13,"len")=4
+	Set gtmtypes("GT_TIMER",13,"type")="int"
+	Set gtmtypfldindx("GT_TIMER","hd_len")=13
+	Set gtmtypes("GT_TIMER",14,"name")="GT_TIMER.hd_data"
+	Set gtmtypes("GT_TIMER",14,"off")=44
+	Set gtmtypes("GT_TIMER",14,"len")=1
+	Set gtmtypes("GT_TIMER",14,"type")="char"
+	Set gtmtypfldindx("GT_TIMER","hd_data")=14
 	;
 	Set gtmtypes("IN_PARMS")="struct"
 	Set gtmtypes("IN_PARMS",0)=5
@@ -808,8 +813,8 @@ Init
 	Set gtmtypfldindx("cache_que_head","latch.u.parts.latch_word")=8
 	;
 	Set gtmtypes("cache_que_heads")="struct"
-	Set gtmtypes("cache_que_heads",0)=49
-	Set gtmtypes("cache_que_heads","len")=152
+	Set gtmtypes("cache_que_heads",0)=52
+	Set gtmtypes("cache_que_heads","len")=292
 	Set gtmtypes("cache_que_heads",1,"name")="cache_que_heads.cacheq_wip"
 	Set gtmtypes("cache_que_heads",1,"off")=0
 	Set gtmtypes("cache_que_heads",1,"len")=16
@@ -902,7 +907,7 @@ Init
 	Set gtmtypfldindx("cache_que_heads","cacheq_active.latch.u.parts.latch_word")=18
 	Set gtmtypes("cache_que_heads",19,"name")="cache_que_heads.cache_array"
 	Set gtmtypes("cache_que_heads",19,"off")=32
-	Set gtmtypes("cache_que_heads",19,"len")=120
+	Set gtmtypes("cache_que_heads",19,"len")=260
 	Set gtmtypes("cache_que_heads",19,"type")="cache_rec"
 	Set gtmtypfldindx("cache_que_heads","cache_array")=19
 	Set gtmtypes("cache_que_heads",20,"name")="cache_que_heads.cache_array[0].blkque"
@@ -1000,65 +1005,80 @@ Init
 	Set gtmtypes("cache_que_heads",38,"len")=4
 	Set gtmtypes("cache_que_heads",38,"type")="unsigned-int"
 	Set gtmtypfldindx("cache_que_heads","cache_array[0].jnl_addr")=38
-	Set gtmtypes("cache_que_heads",39,"name")="cache_que_heads.cache_array[0].rip_latch"
+	Set gtmtypes("cache_que_heads",39,"name")="cache_que_heads.cache_array[0].stopped"
 	Set gtmtypes("cache_que_heads",39,"off")=104
-	Set gtmtypes("cache_que_heads",39,"len")=8
-	Set gtmtypes("cache_que_heads",39,"type")="global_latch_t"
-	Set gtmtypfldindx("cache_que_heads","cache_array[0].rip_latch")=39
-	Set gtmtypes("cache_que_heads",40,"name")="cache_que_heads.cache_array[0].image_count"
-	Set gtmtypes("cache_que_heads",40,"off")=112
-	Set gtmtypes("cache_que_heads",40,"len")=4
-	Set gtmtypes("cache_que_heads",40,"type")="int"
-	Set gtmtypfldindx("cache_que_heads","cache_array[0].image_count")=40
-	Set gtmtypes("cache_que_heads",41,"name")="cache_que_heads.cache_array[0].epid"
+	Set gtmtypes("cache_que_heads",39,"len")=4
+	Set gtmtypes("cache_que_heads",39,"type")="unsigned-int"
+	Set gtmtypfldindx("cache_que_heads","cache_array[0].stopped")=39
+	Set gtmtypes("cache_que_heads",40,"name")="cache_que_heads.cache_array[0].rip_latch"
+	Set gtmtypes("cache_que_heads",40,"off")=108
+	Set gtmtypes("cache_que_heads",40,"len")=8
+	Set gtmtypes("cache_que_heads",40,"type")="global_latch_t"
+	Set gtmtypfldindx("cache_que_heads","cache_array[0].rip_latch")=40
+	Set gtmtypes("cache_que_heads",41,"name")="cache_que_heads.cache_array[0].data_invalid"
 	Set gtmtypes("cache_que_heads",41,"off")=116
 	Set gtmtypes("cache_que_heads",41,"len")=4
-	Set gtmtypes("cache_que_heads",41,"type")="int"
-	Set gtmtypfldindx("cache_que_heads","cache_array[0].epid")=41
-	Set gtmtypes("cache_que_heads",42,"name")="cache_que_heads.cache_array[0].cycle"
+	Set gtmtypes("cache_que_heads",41,"type")="unsigned-int"
+	Set gtmtypfldindx("cache_que_heads","cache_array[0].data_invalid")=41
+	Set gtmtypes("cache_que_heads",42,"name")="cache_que_heads.cache_array[0].epid"
 	Set gtmtypes("cache_que_heads",42,"off")=120
 	Set gtmtypes("cache_que_heads",42,"len")=4
 	Set gtmtypes("cache_que_heads",42,"type")="int"
-	Set gtmtypfldindx("cache_que_heads","cache_array[0].cycle")=42
-	Set gtmtypes("cache_que_heads",43,"name")="cache_que_heads.cache_array[0].r_epid"
+	Set gtmtypfldindx("cache_que_heads","cache_array[0].epid")=42
+	Set gtmtypes("cache_que_heads",43,"name")="cache_que_heads.cache_array[0].cycle"
 	Set gtmtypes("cache_que_heads",43,"off")=124
 	Set gtmtypes("cache_que_heads",43,"len")=4
 	Set gtmtypes("cache_que_heads",43,"type")="int"
-	Set gtmtypfldindx("cache_que_heads","cache_array[0].r_epid")=43
-	Set gtmtypes("cache_que_heads",44,"name")="cache_que_heads.cache_array[0].read_in_progress"
+	Set gtmtypfldindx("cache_que_heads","cache_array[0].cycle")=43
+	Set gtmtypes("cache_que_heads",44,"name")="cache_que_heads.cache_array[0].r_epid"
 	Set gtmtypes("cache_que_heads",44,"off")=128
 	Set gtmtypes("cache_que_heads",44,"len")=4
 	Set gtmtypes("cache_que_heads",44,"type")="int"
-	Set gtmtypfldindx("cache_que_heads","cache_array[0].read_in_progress")=44
-	Set gtmtypes("cache_que_heads",45,"name")="cache_que_heads.cache_array[0].in_tend"
+	Set gtmtypfldindx("cache_que_heads","cache_array[0].r_epid")=44
+	Set gtmtypes("cache_que_heads",45,"name")="cache_que_heads.cache_array[0].aiocb"
 	Set gtmtypes("cache_que_heads",45,"off")=132
-	Set gtmtypes("cache_que_heads",45,"len")=4
-	Set gtmtypes("cache_que_heads",45,"type")="unsigned-int"
-	Set gtmtypfldindx("cache_que_heads","cache_array[0].in_tend")=45
-	Set gtmtypes("cache_que_heads",46,"name")="cache_que_heads.cache_array[0].in_cw_set"
-	Set gtmtypes("cache_que_heads",46,"off")=136
+	Set gtmtypes("cache_que_heads",45,"len")=144
+	Set gtmtypes("cache_que_heads",45,"type")="struct"
+	Set gtmtypfldindx("cache_que_heads","cache_array[0].aiocb")=45
+	Set gtmtypes("cache_que_heads",46,"name")="cache_que_heads.cache_array[0].read_in_progress"
+	Set gtmtypes("cache_que_heads",46,"off")=276
 	Set gtmtypes("cache_que_heads",46,"len")=4
-	Set gtmtypes("cache_que_heads",46,"type")="unsigned-int"
-	Set gtmtypfldindx("cache_que_heads","cache_array[0].in_cw_set")=46
-	Set gtmtypes("cache_que_heads",47,"name")="cache_que_heads.cache_array[0].data_invalid"
-	Set gtmtypes("cache_que_heads",47,"off")=140
+	Set gtmtypes("cache_que_heads",46,"type")="int"
+	Set gtmtypfldindx("cache_que_heads","cache_array[0].read_in_progress")=46
+	Set gtmtypes("cache_que_heads",47,"name")="cache_que_heads.cache_array[0].in_tend"
+	Set gtmtypes("cache_que_heads",47,"off")=280
 	Set gtmtypes("cache_que_heads",47,"len")=4
 	Set gtmtypes("cache_que_heads",47,"type")="unsigned-int"
-	Set gtmtypfldindx("cache_que_heads","cache_array[0].data_invalid")=47
-	Set gtmtypes("cache_que_heads",48,"name")="cache_que_heads.cache_array[0].stopped"
-	Set gtmtypes("cache_que_heads",48,"off")=144
+	Set gtmtypfldindx("cache_que_heads","cache_array[0].in_tend")=47
+	Set gtmtypes("cache_que_heads",48,"name")="cache_que_heads.cache_array[0].in_cw_set"
+	Set gtmtypes("cache_que_heads",48,"off")=284
 	Set gtmtypes("cache_que_heads",48,"len")=4
-	Set gtmtypes("cache_que_heads",48,"type")="boolean_t"
-	Set gtmtypfldindx("cache_que_heads","cache_array[0].stopped")=48
-	Set gtmtypes("cache_que_heads",49,"name")="cache_que_heads.cache_array[0].wip_stopped"
-	Set gtmtypes("cache_que_heads",49,"off")=148
-	Set gtmtypes("cache_que_heads",49,"len")=4
-	Set gtmtypes("cache_que_heads",49,"type")="boolean_t"
-	Set gtmtypfldindx("cache_que_heads","cache_array[0].wip_stopped")=49
+	Set gtmtypes("cache_que_heads",48,"type")="unsigned-int"
+	Set gtmtypfldindx("cache_que_heads","cache_array[0].in_cw_set")=48
+	Set gtmtypes("cache_que_heads",49,"name")="cache_que_heads.cache_array[0].wip_is_encr_buf"
+	Set gtmtypes("cache_que_heads",49,"off")=288
+	Set gtmtypes("cache_que_heads",49,"len")=1
+	Set gtmtypes("cache_que_heads",49,"type")="char"
+	Set gtmtypfldindx("cache_que_heads","cache_array[0].wip_is_encr_buf")=49
+	Set gtmtypes("cache_que_heads",50,"name")="cache_que_heads.cache_array[0].backup_cr_is_twin"
+	Set gtmtypes("cache_que_heads",50,"off")=289
+	Set gtmtypes("cache_que_heads",50,"len")=1
+	Set gtmtypes("cache_que_heads",50,"type")="char"
+	Set gtmtypfldindx("cache_que_heads","cache_array[0].backup_cr_is_twin")=50
+	Set gtmtypes("cache_que_heads",51,"name")="cache_que_heads.cache_array[0].aio_issued"
+	Set gtmtypes("cache_que_heads",51,"off")=290
+	Set gtmtypes("cache_que_heads",51,"len")=1
+	Set gtmtypes("cache_que_heads",51,"type")="char"
+	Set gtmtypfldindx("cache_que_heads","cache_array[0].aio_issued")=51
+	Set gtmtypes("cache_que_heads",52,"name")="cache_que_heads.cache_array[0].filler4bytealign"
+	Set gtmtypes("cache_que_heads",52,"off")=291
+	Set gtmtypes("cache_que_heads",52,"len")=1
+	Set gtmtypes("cache_que_heads",52,"type")="char"
+	Set gtmtypfldindx("cache_que_heads","cache_array[0].filler4bytealign")=52
 	;
 	Set gtmtypes("cache_rec")="struct"
-	Set gtmtypes("cache_rec",0)=35
-	Set gtmtypes("cache_rec","len")=120
+	Set gtmtypes("cache_rec",0)=38
+	Set gtmtypes("cache_rec","len")=260
 	Set gtmtypes("cache_rec",1,"name")="cache_rec.blkque"
 	Set gtmtypes("cache_rec",1,"off")=0
 	Set gtmtypes("cache_rec",1,"len")=8
@@ -1154,90 +1174,105 @@ Init
 	Set gtmtypes("cache_rec",19,"len")=4
 	Set gtmtypes("cache_rec",19,"type")="unsigned-int"
 	Set gtmtypfldindx("cache_rec","jnl_addr")=19
-	Set gtmtypes("cache_rec",20,"name")="cache_rec.rip_latch"
+	Set gtmtypes("cache_rec",20,"name")="cache_rec.stopped"
 	Set gtmtypes("cache_rec",20,"off")=72
-	Set gtmtypes("cache_rec",20,"len")=8
-	Set gtmtypes("cache_rec",20,"type")="global_latch_t"
-	Set gtmtypfldindx("cache_rec","rip_latch")=20
-	Set gtmtypes("cache_rec",21,"name")="cache_rec.rip_latch.u"
-	Set gtmtypes("cache_rec",21,"off")=72
+	Set gtmtypes("cache_rec",20,"len")=4
+	Set gtmtypes("cache_rec",20,"type")="unsigned-int"
+	Set gtmtypfldindx("cache_rec","stopped")=20
+	Set gtmtypes("cache_rec",21,"name")="cache_rec.rip_latch"
+	Set gtmtypes("cache_rec",21,"off")=76
 	Set gtmtypes("cache_rec",21,"len")=8
-	Set gtmtypes("cache_rec",21,"type")="union"
-	Set gtmtypfldindx("cache_rec","rip_latch.u")=21
-	Set gtmtypes("cache_rec",22,"name")="cache_rec.rip_latch.u.pid_imgcnt"
-	Set gtmtypes("cache_rec",22,"off")=72
+	Set gtmtypes("cache_rec",21,"type")="global_latch_t"
+	Set gtmtypfldindx("cache_rec","rip_latch")=21
+	Set gtmtypes("cache_rec",22,"name")="cache_rec.rip_latch.u"
+	Set gtmtypes("cache_rec",22,"off")=76
 	Set gtmtypes("cache_rec",22,"len")=8
-	Set gtmtypes("cache_rec",22,"type")="uint64_t"
-	Set gtmtypfldindx("cache_rec","rip_latch.u.pid_imgcnt")=22
-	Set gtmtypes("cache_rec",23,"name")="cache_rec.rip_latch.u.parts"
-	Set gtmtypes("cache_rec",23,"off")=72
+	Set gtmtypes("cache_rec",22,"type")="union"
+	Set gtmtypfldindx("cache_rec","rip_latch.u")=22
+	Set gtmtypes("cache_rec",23,"name")="cache_rec.rip_latch.u.pid_imgcnt"
+	Set gtmtypes("cache_rec",23,"off")=76
 	Set gtmtypes("cache_rec",23,"len")=8
-	Set gtmtypes("cache_rec",23,"type")="struct"
-	Set gtmtypfldindx("cache_rec","rip_latch.u.parts")=23
-	Set gtmtypes("cache_rec",24,"name")="cache_rec.rip_latch.u.parts.latch_pid"
-	Set gtmtypes("cache_rec",24,"off")=72
-	Set gtmtypes("cache_rec",24,"len")=4
-	Set gtmtypes("cache_rec",24,"type")="int"
-	Set gtmtypfldindx("cache_rec","rip_latch.u.parts.latch_pid")=24
-	Set gtmtypes("cache_rec",25,"name")="cache_rec.rip_latch.u.parts.latch_word"
+	Set gtmtypes("cache_rec",23,"type")="uint64_t"
+	Set gtmtypfldindx("cache_rec","rip_latch.u.pid_imgcnt")=23
+	Set gtmtypes("cache_rec",24,"name")="cache_rec.rip_latch.u.parts"
+	Set gtmtypes("cache_rec",24,"off")=76
+	Set gtmtypes("cache_rec",24,"len")=8
+	Set gtmtypes("cache_rec",24,"type")="struct"
+	Set gtmtypfldindx("cache_rec","rip_latch.u.parts")=24
+	Set gtmtypes("cache_rec",25,"name")="cache_rec.rip_latch.u.parts.latch_pid"
 	Set gtmtypes("cache_rec",25,"off")=76
 	Set gtmtypes("cache_rec",25,"len")=4
 	Set gtmtypes("cache_rec",25,"type")="int"
-	Set gtmtypfldindx("cache_rec","rip_latch.u.parts.latch_word")=25
-	Set gtmtypes("cache_rec",26,"name")="cache_rec.image_count"
+	Set gtmtypfldindx("cache_rec","rip_latch.u.parts.latch_pid")=25
+	Set gtmtypes("cache_rec",26,"name")="cache_rec.rip_latch.u.parts.latch_word"
 	Set gtmtypes("cache_rec",26,"off")=80
 	Set gtmtypes("cache_rec",26,"len")=4
 	Set gtmtypes("cache_rec",26,"type")="int"
-	Set gtmtypfldindx("cache_rec","image_count")=26
-	Set gtmtypes("cache_rec",27,"name")="cache_rec.epid"
+	Set gtmtypfldindx("cache_rec","rip_latch.u.parts.latch_word")=26
+	Set gtmtypes("cache_rec",27,"name")="cache_rec.data_invalid"
 	Set gtmtypes("cache_rec",27,"off")=84
 	Set gtmtypes("cache_rec",27,"len")=4
-	Set gtmtypes("cache_rec",27,"type")="int"
-	Set gtmtypfldindx("cache_rec","epid")=27
-	Set gtmtypes("cache_rec",28,"name")="cache_rec.cycle"
+	Set gtmtypes("cache_rec",27,"type")="unsigned-int"
+	Set gtmtypfldindx("cache_rec","data_invalid")=27
+	Set gtmtypes("cache_rec",28,"name")="cache_rec.epid"
 	Set gtmtypes("cache_rec",28,"off")=88
 	Set gtmtypes("cache_rec",28,"len")=4
 	Set gtmtypes("cache_rec",28,"type")="int"
-	Set gtmtypfldindx("cache_rec","cycle")=28
-	Set gtmtypes("cache_rec",29,"name")="cache_rec.r_epid"
+	Set gtmtypfldindx("cache_rec","epid")=28
+	Set gtmtypes("cache_rec",29,"name")="cache_rec.cycle"
 	Set gtmtypes("cache_rec",29,"off")=92
 	Set gtmtypes("cache_rec",29,"len")=4
 	Set gtmtypes("cache_rec",29,"type")="int"
-	Set gtmtypfldindx("cache_rec","r_epid")=29
-	Set gtmtypes("cache_rec",30,"name")="cache_rec.read_in_progress"
+	Set gtmtypfldindx("cache_rec","cycle")=29
+	Set gtmtypes("cache_rec",30,"name")="cache_rec.r_epid"
 	Set gtmtypes("cache_rec",30,"off")=96
 	Set gtmtypes("cache_rec",30,"len")=4
 	Set gtmtypes("cache_rec",30,"type")="int"
-	Set gtmtypfldindx("cache_rec","read_in_progress")=30
-	Set gtmtypes("cache_rec",31,"name")="cache_rec.in_tend"
+	Set gtmtypfldindx("cache_rec","r_epid")=30
+	Set gtmtypes("cache_rec",31,"name")="cache_rec.aiocb"
 	Set gtmtypes("cache_rec",31,"off")=100
-	Set gtmtypes("cache_rec",31,"len")=4
-	Set gtmtypes("cache_rec",31,"type")="unsigned-int"
-	Set gtmtypfldindx("cache_rec","in_tend")=31
-	Set gtmtypes("cache_rec",32,"name")="cache_rec.in_cw_set"
-	Set gtmtypes("cache_rec",32,"off")=104
+	Set gtmtypes("cache_rec",31,"len")=144
+	Set gtmtypes("cache_rec",31,"type")="struct"
+	Set gtmtypfldindx("cache_rec","aiocb")=31
+	Set gtmtypes("cache_rec",32,"name")="cache_rec.read_in_progress"
+	Set gtmtypes("cache_rec",32,"off")=244
 	Set gtmtypes("cache_rec",32,"len")=4
-	Set gtmtypes("cache_rec",32,"type")="unsigned-int"
-	Set gtmtypfldindx("cache_rec","in_cw_set")=32
-	Set gtmtypes("cache_rec",33,"name")="cache_rec.data_invalid"
-	Set gtmtypes("cache_rec",33,"off")=108
+	Set gtmtypes("cache_rec",32,"type")="int"
+	Set gtmtypfldindx("cache_rec","read_in_progress")=32
+	Set gtmtypes("cache_rec",33,"name")="cache_rec.in_tend"
+	Set gtmtypes("cache_rec",33,"off")=248
 	Set gtmtypes("cache_rec",33,"len")=4
 	Set gtmtypes("cache_rec",33,"type")="unsigned-int"
-	Set gtmtypfldindx("cache_rec","data_invalid")=33
-	Set gtmtypes("cache_rec",34,"name")="cache_rec.stopped"
-	Set gtmtypes("cache_rec",34,"off")=112
+	Set gtmtypfldindx("cache_rec","in_tend")=33
+	Set gtmtypes("cache_rec",34,"name")="cache_rec.in_cw_set"
+	Set gtmtypes("cache_rec",34,"off")=252
 	Set gtmtypes("cache_rec",34,"len")=4
-	Set gtmtypes("cache_rec",34,"type")="boolean_t"
-	Set gtmtypfldindx("cache_rec","stopped")=34
-	Set gtmtypes("cache_rec",35,"name")="cache_rec.wip_stopped"
-	Set gtmtypes("cache_rec",35,"off")=116
-	Set gtmtypes("cache_rec",35,"len")=4
-	Set gtmtypes("cache_rec",35,"type")="boolean_t"
-	Set gtmtypfldindx("cache_rec","wip_stopped")=35
+	Set gtmtypes("cache_rec",34,"type")="unsigned-int"
+	Set gtmtypfldindx("cache_rec","in_cw_set")=34
+	Set gtmtypes("cache_rec",35,"name")="cache_rec.wip_is_encr_buf"
+	Set gtmtypes("cache_rec",35,"off")=256
+	Set gtmtypes("cache_rec",35,"len")=1
+	Set gtmtypes("cache_rec",35,"type")="char"
+	Set gtmtypfldindx("cache_rec","wip_is_encr_buf")=35
+	Set gtmtypes("cache_rec",36,"name")="cache_rec.backup_cr_is_twin"
+	Set gtmtypes("cache_rec",36,"off")=257
+	Set gtmtypes("cache_rec",36,"len")=1
+	Set gtmtypes("cache_rec",36,"type")="char"
+	Set gtmtypfldindx("cache_rec","backup_cr_is_twin")=36
+	Set gtmtypes("cache_rec",37,"name")="cache_rec.aio_issued"
+	Set gtmtypes("cache_rec",37,"off")=258
+	Set gtmtypes("cache_rec",37,"len")=1
+	Set gtmtypes("cache_rec",37,"type")="char"
+	Set gtmtypfldindx("cache_rec","aio_issued")=37
+	Set gtmtypes("cache_rec",38,"name")="cache_rec.filler4bytealign"
+	Set gtmtypes("cache_rec",38,"off")=259
+	Set gtmtypes("cache_rec",38,"len")=1
+	Set gtmtypes("cache_rec",38,"type")="char"
+	Set gtmtypfldindx("cache_rec","filler4bytealign")=38
 	;
 	Set gtmtypes("cache_state_rec")="struct"
-	Set gtmtypes("cache_state_rec",0)=32
-	Set gtmtypes("cache_state_rec","len")=112
+	Set gtmtypes("cache_state_rec",0)=35
+	Set gtmtypes("cache_state_rec","len")=252
 	Set gtmtypes("cache_state_rec",1,"name")="cache_state_rec.state_que"
 	Set gtmtypes("cache_state_rec",1,"off")=0
 	Set gtmtypes("cache_state_rec",1,"len")=8
@@ -1318,86 +1353,101 @@ Init
 	Set gtmtypes("cache_state_rec",16,"len")=4
 	Set gtmtypes("cache_state_rec",16,"type")="unsigned-int"
 	Set gtmtypfldindx("cache_state_rec","jnl_addr")=16
-	Set gtmtypes("cache_state_rec",17,"name")="cache_state_rec.rip_latch"
+	Set gtmtypes("cache_state_rec",17,"name")="cache_state_rec.stopped"
 	Set gtmtypes("cache_state_rec",17,"off")=64
-	Set gtmtypes("cache_state_rec",17,"len")=8
-	Set gtmtypes("cache_state_rec",17,"type")="global_latch_t"
-	Set gtmtypfldindx("cache_state_rec","rip_latch")=17
-	Set gtmtypes("cache_state_rec",18,"name")="cache_state_rec.rip_latch.u"
-	Set gtmtypes("cache_state_rec",18,"off")=64
+	Set gtmtypes("cache_state_rec",17,"len")=4
+	Set gtmtypes("cache_state_rec",17,"type")="boolean_t"
+	Set gtmtypfldindx("cache_state_rec","stopped")=17
+	Set gtmtypes("cache_state_rec",18,"name")="cache_state_rec.rip_latch"
+	Set gtmtypes("cache_state_rec",18,"off")=68
 	Set gtmtypes("cache_state_rec",18,"len")=8
-	Set gtmtypes("cache_state_rec",18,"type")="union"
-	Set gtmtypfldindx("cache_state_rec","rip_latch.u")=18
-	Set gtmtypes("cache_state_rec",19,"name")="cache_state_rec.rip_latch.u.pid_imgcnt"
-	Set gtmtypes("cache_state_rec",19,"off")=64
+	Set gtmtypes("cache_state_rec",18,"type")="global_latch_t"
+	Set gtmtypfldindx("cache_state_rec","rip_latch")=18
+	Set gtmtypes("cache_state_rec",19,"name")="cache_state_rec.rip_latch.u"
+	Set gtmtypes("cache_state_rec",19,"off")=68
 	Set gtmtypes("cache_state_rec",19,"len")=8
-	Set gtmtypes("cache_state_rec",19,"type")="uint64_t"
-	Set gtmtypfldindx("cache_state_rec","rip_latch.u.pid_imgcnt")=19
-	Set gtmtypes("cache_state_rec",20,"name")="cache_state_rec.rip_latch.u.parts"
-	Set gtmtypes("cache_state_rec",20,"off")=64
+	Set gtmtypes("cache_state_rec",19,"type")="union"
+	Set gtmtypfldindx("cache_state_rec","rip_latch.u")=19
+	Set gtmtypes("cache_state_rec",20,"name")="cache_state_rec.rip_latch.u.pid_imgcnt"
+	Set gtmtypes("cache_state_rec",20,"off")=68
 	Set gtmtypes("cache_state_rec",20,"len")=8
-	Set gtmtypes("cache_state_rec",20,"type")="struct"
-	Set gtmtypfldindx("cache_state_rec","rip_latch.u.parts")=20
-	Set gtmtypes("cache_state_rec",21,"name")="cache_state_rec.rip_latch.u.parts.latch_pid"
-	Set gtmtypes("cache_state_rec",21,"off")=64
-	Set gtmtypes("cache_state_rec",21,"len")=4
-	Set gtmtypes("cache_state_rec",21,"type")="int"
-	Set gtmtypfldindx("cache_state_rec","rip_latch.u.parts.latch_pid")=21
-	Set gtmtypes("cache_state_rec",22,"name")="cache_state_rec.rip_latch.u.parts.latch_word"
+	Set gtmtypes("cache_state_rec",20,"type")="uint64_t"
+	Set gtmtypfldindx("cache_state_rec","rip_latch.u.pid_imgcnt")=20
+	Set gtmtypes("cache_state_rec",21,"name")="cache_state_rec.rip_latch.u.parts"
+	Set gtmtypes("cache_state_rec",21,"off")=68
+	Set gtmtypes("cache_state_rec",21,"len")=8
+	Set gtmtypes("cache_state_rec",21,"type")="struct"
+	Set gtmtypfldindx("cache_state_rec","rip_latch.u.parts")=21
+	Set gtmtypes("cache_state_rec",22,"name")="cache_state_rec.rip_latch.u.parts.latch_pid"
 	Set gtmtypes("cache_state_rec",22,"off")=68
 	Set gtmtypes("cache_state_rec",22,"len")=4
 	Set gtmtypes("cache_state_rec",22,"type")="int"
-	Set gtmtypfldindx("cache_state_rec","rip_latch.u.parts.latch_word")=22
-	Set gtmtypes("cache_state_rec",23,"name")="cache_state_rec.image_count"
+	Set gtmtypfldindx("cache_state_rec","rip_latch.u.parts.latch_pid")=22
+	Set gtmtypes("cache_state_rec",23,"name")="cache_state_rec.rip_latch.u.parts.latch_word"
 	Set gtmtypes("cache_state_rec",23,"off")=72
 	Set gtmtypes("cache_state_rec",23,"len")=4
 	Set gtmtypes("cache_state_rec",23,"type")="int"
-	Set gtmtypfldindx("cache_state_rec","image_count")=23
-	Set gtmtypes("cache_state_rec",24,"name")="cache_state_rec.epid"
+	Set gtmtypfldindx("cache_state_rec","rip_latch.u.parts.latch_word")=23
+	Set gtmtypes("cache_state_rec",24,"name")="cache_state_rec.data_invalid"
 	Set gtmtypes("cache_state_rec",24,"off")=76
 	Set gtmtypes("cache_state_rec",24,"len")=4
-	Set gtmtypes("cache_state_rec",24,"type")="int"
-	Set gtmtypfldindx("cache_state_rec","epid")=24
-	Set gtmtypes("cache_state_rec",25,"name")="cache_state_rec.cycle"
+	Set gtmtypes("cache_state_rec",24,"type")="unsigned-int"
+	Set gtmtypfldindx("cache_state_rec","data_invalid")=24
+	Set gtmtypes("cache_state_rec",25,"name")="cache_state_rec.epid"
 	Set gtmtypes("cache_state_rec",25,"off")=80
 	Set gtmtypes("cache_state_rec",25,"len")=4
 	Set gtmtypes("cache_state_rec",25,"type")="int"
-	Set gtmtypfldindx("cache_state_rec","cycle")=25
-	Set gtmtypes("cache_state_rec",26,"name")="cache_state_rec.r_epid"
+	Set gtmtypfldindx("cache_state_rec","epid")=25
+	Set gtmtypes("cache_state_rec",26,"name")="cache_state_rec.cycle"
 	Set gtmtypes("cache_state_rec",26,"off")=84
 	Set gtmtypes("cache_state_rec",26,"len")=4
 	Set gtmtypes("cache_state_rec",26,"type")="int"
-	Set gtmtypfldindx("cache_state_rec","r_epid")=26
-	Set gtmtypes("cache_state_rec",27,"name")="cache_state_rec.read_in_progress"
+	Set gtmtypfldindx("cache_state_rec","cycle")=26
+	Set gtmtypes("cache_state_rec",27,"name")="cache_state_rec.r_epid"
 	Set gtmtypes("cache_state_rec",27,"off")=88
 	Set gtmtypes("cache_state_rec",27,"len")=4
 	Set gtmtypes("cache_state_rec",27,"type")="int"
-	Set gtmtypfldindx("cache_state_rec","read_in_progress")=27
-	Set gtmtypes("cache_state_rec",28,"name")="cache_state_rec.in_tend"
+	Set gtmtypfldindx("cache_state_rec","r_epid")=27
+	Set gtmtypes("cache_state_rec",28,"name")="cache_state_rec.aiocb"
 	Set gtmtypes("cache_state_rec",28,"off")=92
-	Set gtmtypes("cache_state_rec",28,"len")=4
-	Set gtmtypes("cache_state_rec",28,"type")="unsigned-int"
-	Set gtmtypfldindx("cache_state_rec","in_tend")=28
-	Set gtmtypes("cache_state_rec",29,"name")="cache_state_rec.in_cw_set"
-	Set gtmtypes("cache_state_rec",29,"off")=96
+	Set gtmtypes("cache_state_rec",28,"len")=144
+	Set gtmtypes("cache_state_rec",28,"type")="struct"
+	Set gtmtypfldindx("cache_state_rec","aiocb")=28
+	Set gtmtypes("cache_state_rec",29,"name")="cache_state_rec.read_in_progress"
+	Set gtmtypes("cache_state_rec",29,"off")=236
 	Set gtmtypes("cache_state_rec",29,"len")=4
-	Set gtmtypes("cache_state_rec",29,"type")="unsigned-int"
-	Set gtmtypfldindx("cache_state_rec","in_cw_set")=29
-	Set gtmtypes("cache_state_rec",30,"name")="cache_state_rec.data_invalid"
-	Set gtmtypes("cache_state_rec",30,"off")=100
+	Set gtmtypes("cache_state_rec",29,"type")="int"
+	Set gtmtypfldindx("cache_state_rec","read_in_progress")=29
+	Set gtmtypes("cache_state_rec",30,"name")="cache_state_rec.in_tend"
+	Set gtmtypes("cache_state_rec",30,"off")=240
 	Set gtmtypes("cache_state_rec",30,"len")=4
 	Set gtmtypes("cache_state_rec",30,"type")="unsigned-int"
-	Set gtmtypfldindx("cache_state_rec","data_invalid")=30
-	Set gtmtypes("cache_state_rec",31,"name")="cache_state_rec.stopped"
-	Set gtmtypes("cache_state_rec",31,"off")=104
+	Set gtmtypfldindx("cache_state_rec","in_tend")=30
+	Set gtmtypes("cache_state_rec",31,"name")="cache_state_rec.in_cw_set"
+	Set gtmtypes("cache_state_rec",31,"off")=244
 	Set gtmtypes("cache_state_rec",31,"len")=4
-	Set gtmtypes("cache_state_rec",31,"type")="boolean_t"
-	Set gtmtypfldindx("cache_state_rec","stopped")=31
-	Set gtmtypes("cache_state_rec",32,"name")="cache_state_rec.wip_stopped"
-	Set gtmtypes("cache_state_rec",32,"off")=108
-	Set gtmtypes("cache_state_rec",32,"len")=4
-	Set gtmtypes("cache_state_rec",32,"type")="boolean_t"
-	Set gtmtypfldindx("cache_state_rec","wip_stopped")=32
+	Set gtmtypes("cache_state_rec",31,"type")="unsigned-int"
+	Set gtmtypfldindx("cache_state_rec","in_cw_set")=31
+	Set gtmtypes("cache_state_rec",32,"name")="cache_state_rec.wip_is_encr_buf"
+	Set gtmtypes("cache_state_rec",32,"off")=248
+	Set gtmtypes("cache_state_rec",32,"len")=1
+	Set gtmtypes("cache_state_rec",32,"type")="char"
+	Set gtmtypfldindx("cache_state_rec","wip_is_encr_buf")=32
+	Set gtmtypes("cache_state_rec",33,"name")="cache_state_rec.backup_cr_is_twin"
+	Set gtmtypes("cache_state_rec",33,"off")=249
+	Set gtmtypes("cache_state_rec",33,"len")=1
+	Set gtmtypes("cache_state_rec",33,"type")="char"
+	Set gtmtypfldindx("cache_state_rec","backup_cr_is_twin")=33
+	Set gtmtypes("cache_state_rec",34,"name")="cache_state_rec.aio_issued"
+	Set gtmtypes("cache_state_rec",34,"off")=250
+	Set gtmtypes("cache_state_rec",34,"len")=1
+	Set gtmtypes("cache_state_rec",34,"type")="char"
+	Set gtmtypfldindx("cache_state_rec","aio_issued")=34
+	Set gtmtypes("cache_state_rec",35,"name")="cache_state_rec.filler4bytealign"
+	Set gtmtypes("cache_state_rec",35,"off")=251
+	Set gtmtypes("cache_state_rec",35,"len")=1
+	Set gtmtypes("cache_state_rec",35,"type")="char"
+	Set gtmtypfldindx("cache_state_rec","filler4bytealign")=35
 	;
 	Set gtmtypes("callin_entry_list")="struct"
 	Set gtmtypes("callin_entry_list",0)=14
@@ -2692,8 +2742,8 @@ Init
 	Set gtmtypfldindx("d_mt_struct","stream")=32
 	;
 	Set gtmtypes("d_rm_struct")="struct"
-	Set gtmtypes("d_rm_struct",0)=88
-	Set gtmtypes("d_rm_struct","len")=856
+	Set gtmtypes("d_rm_struct",0)=90
+	Set gtmtypes("d_rm_struct","len")=356
 	Set gtmtypes("d_rm_struct",1,"name")="d_rm_struct.fixed"
 	Set gtmtypes("d_rm_struct",1,"off")=0
 	Set gtmtypes("d_rm_struct",1,"len")=4
@@ -3000,145 +3050,155 @@ Init
 	Set gtmtypes("d_rm_struct",61,"len")=4
 	Set gtmtypes("d_rm_struct",61,"type")="long"
 	Set gtmtypfldindx("d_rm_struct","pipe_buff_size")=61
-	Set gtmtypes("d_rm_struct",62,"name")="d_rm_struct.utf_tmp_buffer"
+	Set gtmtypes("d_rm_struct",62,"name")="d_rm_struct.tmp_buffer"
 	Set gtmtypes("d_rm_struct",62,"off")=256
-	Set gtmtypes("d_rm_struct",62,"len")=512
-	Set gtmtypes("d_rm_struct",62,"type")="char"
-	Set gtmtypfldindx("d_rm_struct","utf_tmp_buffer")=62
-	Set gtmtypes("d_rm_struct",63,"name")="d_rm_struct.utf_tot_bytes_in_buffer"
-	Set gtmtypes("d_rm_struct",63,"off")=768
+	Set gtmtypes("d_rm_struct",62,"len")=4
+	Set gtmtypes("d_rm_struct",62,"type")="addr"
+	Set gtmtypfldindx("d_rm_struct","tmp_buffer")=62
+	Set gtmtypes("d_rm_struct",63,"name")="d_rm_struct.tot_bytes_in_buffer"
+	Set gtmtypes("d_rm_struct",63,"off")=260
 	Set gtmtypes("d_rm_struct",63,"len")=4
 	Set gtmtypes("d_rm_struct",63,"type")="int"
-	Set gtmtypfldindx("d_rm_struct","utf_tot_bytes_in_buffer")=63
-	Set gtmtypes("d_rm_struct",64,"name")="d_rm_struct.utf_start_pos"
-	Set gtmtypes("d_rm_struct",64,"off")=772
+	Set gtmtypfldindx("d_rm_struct","tot_bytes_in_buffer")=63
+	Set gtmtypes("d_rm_struct",64,"name")="d_rm_struct.start_pos"
+	Set gtmtypes("d_rm_struct",64,"off")=264
 	Set gtmtypes("d_rm_struct",64,"len")=4
 	Set gtmtypes("d_rm_struct",64,"type")="int"
-	Set gtmtypfldindx("d_rm_struct","utf_start_pos")=64
+	Set gtmtypfldindx("d_rm_struct","start_pos")=64
 	Set gtmtypes("d_rm_struct",65,"name")="d_rm_struct.write_occurred"
-	Set gtmtypes("d_rm_struct",65,"off")=776
+	Set gtmtypes("d_rm_struct",65,"off")=268
 	Set gtmtypes("d_rm_struct",65,"len")=4
 	Set gtmtypes("d_rm_struct",65,"type")="boolean_t"
 	Set gtmtypfldindx("d_rm_struct","write_occurred")=65
 	Set gtmtypes("d_rm_struct",66,"name")="d_rm_struct.read_occurred"
-	Set gtmtypes("d_rm_struct",66,"off")=780
+	Set gtmtypes("d_rm_struct",66,"off")=272
 	Set gtmtypes("d_rm_struct",66,"len")=4
 	Set gtmtypes("d_rm_struct",66,"type")="boolean_t"
 	Set gtmtypfldindx("d_rm_struct","read_occurred")=66
 	Set gtmtypes("d_rm_struct",67,"name")="d_rm_struct.input_encrypted"
-	Set gtmtypes("d_rm_struct",67,"off")=784
+	Set gtmtypes("d_rm_struct",67,"off")=276
 	Set gtmtypes("d_rm_struct",67,"len")=4
 	Set gtmtypes("d_rm_struct",67,"type")="boolean_t"
 	Set gtmtypfldindx("d_rm_struct","input_encrypted")=67
 	Set gtmtypes("d_rm_struct",68,"name")="d_rm_struct.output_encrypted"
-	Set gtmtypes("d_rm_struct",68,"off")=788
+	Set gtmtypes("d_rm_struct",68,"off")=280
 	Set gtmtypes("d_rm_struct",68,"len")=4
 	Set gtmtypes("d_rm_struct",68,"type")="boolean_t"
 	Set gtmtypfldindx("d_rm_struct","output_encrypted")=68
 	Set gtmtypes("d_rm_struct",69,"name")="d_rm_struct.input_iv"
-	Set gtmtypes("d_rm_struct",69,"off")=792
+	Set gtmtypes("d_rm_struct",69,"off")=284
 	Set gtmtypes("d_rm_struct",69,"len")=12
 	Set gtmtypes("d_rm_struct",69,"type")="mstr"
 	Set gtmtypfldindx("d_rm_struct","input_iv")=69
 	Set gtmtypes("d_rm_struct",70,"name")="d_rm_struct.input_iv.char_len"
-	Set gtmtypes("d_rm_struct",70,"off")=792
+	Set gtmtypes("d_rm_struct",70,"off")=284
 	Set gtmtypes("d_rm_struct",70,"len")=4
 	Set gtmtypes("d_rm_struct",70,"type")="unsigned-int"
 	Set gtmtypfldindx("d_rm_struct","input_iv.char_len")=70
 	Set gtmtypes("d_rm_struct",71,"name")="d_rm_struct.input_iv.len"
-	Set gtmtypes("d_rm_struct",71,"off")=796
+	Set gtmtypes("d_rm_struct",71,"off")=288
 	Set gtmtypes("d_rm_struct",71,"len")=4
 	Set gtmtypes("d_rm_struct",71,"type")="int"
 	Set gtmtypfldindx("d_rm_struct","input_iv.len")=71
 	Set gtmtypes("d_rm_struct",72,"name")="d_rm_struct.input_iv.addr"
-	Set gtmtypes("d_rm_struct",72,"off")=800
+	Set gtmtypes("d_rm_struct",72,"off")=292
 	Set gtmtypes("d_rm_struct",72,"len")=4
 	Set gtmtypes("d_rm_struct",72,"type")="addr"
 	Set gtmtypfldindx("d_rm_struct","input_iv.addr")=72
 	Set gtmtypes("d_rm_struct",73,"name")="d_rm_struct.output_iv"
-	Set gtmtypes("d_rm_struct",73,"off")=804
+	Set gtmtypes("d_rm_struct",73,"off")=296
 	Set gtmtypes("d_rm_struct",73,"len")=12
 	Set gtmtypes("d_rm_struct",73,"type")="mstr"
 	Set gtmtypfldindx("d_rm_struct","output_iv")=73
 	Set gtmtypes("d_rm_struct",74,"name")="d_rm_struct.output_iv.char_len"
-	Set gtmtypes("d_rm_struct",74,"off")=804
+	Set gtmtypes("d_rm_struct",74,"off")=296
 	Set gtmtypes("d_rm_struct",74,"len")=4
 	Set gtmtypes("d_rm_struct",74,"type")="unsigned-int"
 	Set gtmtypfldindx("d_rm_struct","output_iv.char_len")=74
 	Set gtmtypes("d_rm_struct",75,"name")="d_rm_struct.output_iv.len"
-	Set gtmtypes("d_rm_struct",75,"off")=808
+	Set gtmtypes("d_rm_struct",75,"off")=300
 	Set gtmtypes("d_rm_struct",75,"len")=4
 	Set gtmtypes("d_rm_struct",75,"type")="int"
 	Set gtmtypfldindx("d_rm_struct","output_iv.len")=75
 	Set gtmtypes("d_rm_struct",76,"name")="d_rm_struct.output_iv.addr"
-	Set gtmtypes("d_rm_struct",76,"off")=812
+	Set gtmtypes("d_rm_struct",76,"off")=304
 	Set gtmtypes("d_rm_struct",76,"len")=4
 	Set gtmtypes("d_rm_struct",76,"type")="addr"
 	Set gtmtypfldindx("d_rm_struct","output_iv.addr")=76
 	Set gtmtypes("d_rm_struct",77,"name")="d_rm_struct.input_key"
-	Set gtmtypes("d_rm_struct",77,"off")=816
+	Set gtmtypes("d_rm_struct",77,"off")=308
 	Set gtmtypes("d_rm_struct",77,"len")=12
 	Set gtmtypes("d_rm_struct",77,"type")="mstr"
 	Set gtmtypfldindx("d_rm_struct","input_key")=77
 	Set gtmtypes("d_rm_struct",78,"name")="d_rm_struct.input_key.char_len"
-	Set gtmtypes("d_rm_struct",78,"off")=816
+	Set gtmtypes("d_rm_struct",78,"off")=308
 	Set gtmtypes("d_rm_struct",78,"len")=4
 	Set gtmtypes("d_rm_struct",78,"type")="unsigned-int"
 	Set gtmtypfldindx("d_rm_struct","input_key.char_len")=78
 	Set gtmtypes("d_rm_struct",79,"name")="d_rm_struct.input_key.len"
-	Set gtmtypes("d_rm_struct",79,"off")=820
+	Set gtmtypes("d_rm_struct",79,"off")=312
 	Set gtmtypes("d_rm_struct",79,"len")=4
 	Set gtmtypes("d_rm_struct",79,"type")="int"
 	Set gtmtypfldindx("d_rm_struct","input_key.len")=79
 	Set gtmtypes("d_rm_struct",80,"name")="d_rm_struct.input_key.addr"
-	Set gtmtypes("d_rm_struct",80,"off")=824
+	Set gtmtypes("d_rm_struct",80,"off")=316
 	Set gtmtypes("d_rm_struct",80,"len")=4
 	Set gtmtypes("d_rm_struct",80,"type")="addr"
 	Set gtmtypfldindx("d_rm_struct","input_key.addr")=80
 	Set gtmtypes("d_rm_struct",81,"name")="d_rm_struct.output_key"
-	Set gtmtypes("d_rm_struct",81,"off")=828
+	Set gtmtypes("d_rm_struct",81,"off")=320
 	Set gtmtypes("d_rm_struct",81,"len")=12
 	Set gtmtypes("d_rm_struct",81,"type")="mstr"
 	Set gtmtypfldindx("d_rm_struct","output_key")=81
 	Set gtmtypes("d_rm_struct",82,"name")="d_rm_struct.output_key.char_len"
-	Set gtmtypes("d_rm_struct",82,"off")=828
+	Set gtmtypes("d_rm_struct",82,"off")=320
 	Set gtmtypes("d_rm_struct",82,"len")=4
 	Set gtmtypes("d_rm_struct",82,"type")="unsigned-int"
 	Set gtmtypfldindx("d_rm_struct","output_key.char_len")=82
 	Set gtmtypes("d_rm_struct",83,"name")="d_rm_struct.output_key.len"
-	Set gtmtypes("d_rm_struct",83,"off")=832
+	Set gtmtypes("d_rm_struct",83,"off")=324
 	Set gtmtypes("d_rm_struct",83,"len")=4
 	Set gtmtypes("d_rm_struct",83,"type")="int"
 	Set gtmtypfldindx("d_rm_struct","output_key.len")=83
 	Set gtmtypes("d_rm_struct",84,"name")="d_rm_struct.output_key.addr"
-	Set gtmtypes("d_rm_struct",84,"off")=836
+	Set gtmtypes("d_rm_struct",84,"off")=328
 	Set gtmtypes("d_rm_struct",84,"len")=4
 	Set gtmtypes("d_rm_struct",84,"type")="addr"
 	Set gtmtypfldindx("d_rm_struct","output_key.addr")=84
 	Set gtmtypes("d_rm_struct",85,"name")="d_rm_struct.input_cipher_handle"
-	Set gtmtypes("d_rm_struct",85,"off")=840
+	Set gtmtypes("d_rm_struct",85,"off")=332
 	Set gtmtypes("d_rm_struct",85,"len")=4
 	Set gtmtypes("d_rm_struct",85,"type")="addr"
 	Set gtmtypfldindx("d_rm_struct","input_cipher_handle")=85
 	Set gtmtypes("d_rm_struct",86,"name")="d_rm_struct.output_cipher_handle"
-	Set gtmtypes("d_rm_struct",86,"off")=844
+	Set gtmtypes("d_rm_struct",86,"off")=336
 	Set gtmtypes("d_rm_struct",86,"len")=4
 	Set gtmtypes("d_rm_struct",86,"type")="addr"
 	Set gtmtypfldindx("d_rm_struct","output_cipher_handle")=86
-	Set gtmtypes("d_rm_struct",87,"name")="d_rm_struct.fsblock_buffer_size"
-	Set gtmtypes("d_rm_struct",87,"off")=848
+	Set gtmtypes("d_rm_struct",87,"name")="d_rm_struct.ichset_utf16_variant"
+	Set gtmtypes("d_rm_struct",87,"off")=340
 	Set gtmtypes("d_rm_struct",87,"len")=4
-	Set gtmtypes("d_rm_struct",87,"type")="unsigned-int"
-	Set gtmtypfldindx("d_rm_struct","fsblock_buffer_size")=87
-	Set gtmtypes("d_rm_struct",88,"name")="d_rm_struct.fsblock_buffer"
-	Set gtmtypes("d_rm_struct",88,"off")=852
+	Set gtmtypes("d_rm_struct",87,"type")="int"
+	Set gtmtypfldindx("d_rm_struct","ichset_utf16_variant")=87
+	Set gtmtypes("d_rm_struct",88,"name")="d_rm_struct.ochset_utf16_variant"
+	Set gtmtypes("d_rm_struct",88,"off")=344
 	Set gtmtypes("d_rm_struct",88,"len")=4
-	Set gtmtypes("d_rm_struct",88,"type")="addr"
-	Set gtmtypfldindx("d_rm_struct","fsblock_buffer")=88
+	Set gtmtypes("d_rm_struct",88,"type")="int"
+	Set gtmtypfldindx("d_rm_struct","ochset_utf16_variant")=88
+	Set gtmtypes("d_rm_struct",89,"name")="d_rm_struct.fsblock_buffer_size"
+	Set gtmtypes("d_rm_struct",89,"off")=348
+	Set gtmtypes("d_rm_struct",89,"len")=4
+	Set gtmtypes("d_rm_struct",89,"type")="unsigned-int"
+	Set gtmtypfldindx("d_rm_struct","fsblock_buffer_size")=89
+	Set gtmtypes("d_rm_struct",90,"name")="d_rm_struct.fsblock_buffer"
+	Set gtmtypes("d_rm_struct",90,"off")=352
+	Set gtmtypes("d_rm_struct",90,"len")=4
+	Set gtmtypes("d_rm_struct",90,"type")="addr"
+	Set gtmtypfldindx("d_rm_struct","fsblock_buffer")=90
 	;
 	Set gtmtypes("d_socket_struct")="struct"
-	Set gtmtypes("d_socket_struct",0)=17
-	Set gtmtypes("d_socket_struct","len")=68
+	Set gtmtypes("d_socket_struct",0)=19
+	Set gtmtypes("d_socket_struct","len")=76
 	Set gtmtypes("d_socket_struct",1,"name")="d_socket_struct.sock_save_state"
 	Set gtmtypes("d_socket_struct",1,"off")=0
 	Set gtmtypes("d_socket_struct",1,"len")=36
@@ -3214,16 +3274,26 @@ Init
 	Set gtmtypes("d_socket_struct",15,"len")=4
 	Set gtmtypes("d_socket_struct",15,"type")="boolean_t"
 	Set gtmtypfldindx("d_socket_struct","ochset_specified")=15
-	Set gtmtypes("d_socket_struct",16,"name")="d_socket_struct.iod"
+	Set gtmtypes("d_socket_struct",16,"name")="d_socket_struct.ichset_utf16_variant"
 	Set gtmtypes("d_socket_struct",16,"off")=60
 	Set gtmtypes("d_socket_struct",16,"len")=4
-	Set gtmtypes("d_socket_struct",16,"type")="addr"
-	Set gtmtypfldindx("d_socket_struct","iod")=16
-	Set gtmtypes("d_socket_struct",17,"name")="d_socket_struct.gtm_socket"
+	Set gtmtypes("d_socket_struct",16,"type")="int"
+	Set gtmtypfldindx("d_socket_struct","ichset_utf16_variant")=16
+	Set gtmtypes("d_socket_struct",17,"name")="d_socket_struct.ochset_utf16_variant"
 	Set gtmtypes("d_socket_struct",17,"off")=64
 	Set gtmtypes("d_socket_struct",17,"len")=4
-	Set gtmtypes("d_socket_struct",17,"type")="addr"
-	Set gtmtypfldindx("d_socket_struct","gtm_socket")=17
+	Set gtmtypes("d_socket_struct",17,"type")="int"
+	Set gtmtypfldindx("d_socket_struct","ochset_utf16_variant")=17
+	Set gtmtypes("d_socket_struct",18,"name")="d_socket_struct.iod"
+	Set gtmtypes("d_socket_struct",18,"off")=68
+	Set gtmtypes("d_socket_struct",18,"len")=4
+	Set gtmtypes("d_socket_struct",18,"type")="addr"
+	Set gtmtypfldindx("d_socket_struct","iod")=18
+	Set gtmtypes("d_socket_struct",19,"name")="d_socket_struct.gtm_socket"
+	Set gtmtypes("d_socket_struct",19,"off")=72
+	Set gtmtypes("d_socket_struct",19,"len")=4
+	Set gtmtypes("d_socket_struct",19,"type")="addr"
+	Set gtmtypfldindx("d_socket_struct","gtm_socket")=19
 	;
 	Set gtmtypes("d_tt_struct")="struct"
 	Set gtmtypes("d_tt_struct",0)=48
@@ -3888,6 +3958,25 @@ Init
 	Set gtmtypes("dev_dispatch_struct",16,"type")="addr"
 	Set gtmtypfldindx("dev_dispatch_struct","dlr_zkey")=16
 	;
+	Set gtmtypes("dio_buff_t")="struct"
+	Set gtmtypes("dio_buff_t",0)=3
+	Set gtmtypes("dio_buff_t","len")=12
+	Set gtmtypes("dio_buff_t",1,"name")="dio_buff_t.unaligned_size"
+	Set gtmtypes("dio_buff_t",1,"off")=0
+	Set gtmtypes("dio_buff_t",1,"len")=4
+	Set gtmtypes("dio_buff_t",1,"type")="int"
+	Set gtmtypfldindx("dio_buff_t","unaligned_size")=1
+	Set gtmtypes("dio_buff_t",2,"name")="dio_buff_t.unaligned"
+	Set gtmtypes("dio_buff_t",2,"off")=4
+	Set gtmtypes("dio_buff_t",2,"len")=4
+	Set gtmtypes("dio_buff_t",2,"type")="addr"
+	Set gtmtypfldindx("dio_buff_t","unaligned")=2
+	Set gtmtypes("dio_buff_t",3,"name")="dio_buff_t.aligned"
+	Set gtmtypes("dio_buff_t",3,"off")=8
+	Set gtmtypes("dio_buff_t",3,"len")=4
+	Set gtmtypes("dio_buff_t",3,"type")="addr"
+	Set gtmtypfldindx("dio_buff_t","aligned")=3
+	;
 	Set gtmtypes("dollar_ecode_struct")="struct"
 	Set gtmtypes("dollar_ecode_struct",0)=4
 	Set gtmtypes("dollar_ecode_struct","len")=12
@@ -4276,7 +4365,7 @@ Init
 	Set gtmtypfldindx("fdinfo_t","is_db")=2
 	;
 	Set gtmtypes("file_control")="struct"
-	Set gtmtypes("file_control",0)=6
+	Set gtmtypes("file_control",0)=5
 	Set gtmtypes("file_control","len")=24
 	Set gtmtypes("file_control",1,"name")="file_control.op_buff"
 	Set gtmtypes("file_control",1,"off")=0
@@ -4298,16 +4387,11 @@ Init
 	Set gtmtypes("file_control",4,"len")=4
 	Set gtmtypes("file_control",4,"type")="addr"
 	Set gtmtypfldindx("file_control","file_info")=4
-	Set gtmtypes("file_control",5,"name")="file_control.file_type"
+	Set gtmtypes("file_control",5,"name")="file_control.op"
 	Set gtmtypes("file_control",5,"off")=20
 	Set gtmtypes("file_control",5,"len")=1
 	Set gtmtypes("file_control",5,"type")="char"
-	Set gtmtypfldindx("file_control","file_type")=5
-	Set gtmtypes("file_control",6,"name")="file_control.op"
-	Set gtmtypes("file_control",6,"off")=21
-	Set gtmtypes("file_control",6,"len")=1
-	Set gtmtypes("file_control",6,"type")="char"
-	Set gtmtypfldindx("file_control","op")=6
+	Set gtmtypfldindx("file_control","op")=5
 	;
 	Set gtmtypes("file_info")="struct"
 	Set gtmtypes("file_info",0)=5
@@ -4678,7 +4762,7 @@ Init
 	Set gtmtypes("gcall_args",6,"dim")=32
 	;
 	Set gtmtypes("gd_addr")="struct"
-	Set gtmtypes("gd_addr",0)=17
+	Set gtmtypes("gd_addr",0)=20
 	Set gtmtypes("gd_addr","len")=76
 	Set gtmtypes("gd_addr",1,"name")="gd_addr.local_locks"
 	Set gtmtypes("gd_addr",1,"off")=0
@@ -4760,11 +4844,26 @@ Init
 	Set gtmtypes("gd_addr",16,"len")=4
 	Set gtmtypes("gd_addr",16,"type")="unsigned-int"
 	Set gtmtypfldindx("gd_addr","has_span_gbls")=16
-	Set gtmtypes("gd_addr",17,"name")="gd_addr.filler"
+	Set gtmtypes("gd_addr",17,"name")="gd_addr.ygs_map_entry_changed"
 	Set gtmtypes("gd_addr",17,"off")=64
-	Set gtmtypes("gd_addr",17,"len")=12
+	Set gtmtypes("gd_addr",17,"len")=1
 	Set gtmtypes("gd_addr",17,"type")="char"
-	Set gtmtypfldindx("gd_addr","filler")=17
+	Set gtmtypfldindx("gd_addr","ygs_map_entry_changed")=17
+	Set gtmtypes("gd_addr",18,"name")="gd_addr.is_dummy_gbldir"
+	Set gtmtypes("gd_addr",18,"off")=65
+	Set gtmtypes("gd_addr",18,"len")=1
+	Set gtmtypes("gd_addr",18,"type")="char"
+	Set gtmtypfldindx("gd_addr","is_dummy_gbldir")=18
+	Set gtmtypes("gd_addr",19,"name")="gd_addr.filler"
+	Set gtmtypes("gd_addr",19,"off")=66
+	Set gtmtypes("gd_addr",19,"len")=6
+	Set gtmtypes("gd_addr",19,"type")="char"
+	Set gtmtypfldindx("gd_addr","filler")=19
+	Set gtmtypes("gd_addr",20,"name")="gd_addr.thread_gdi"
+	Set gtmtypes("gd_addr",20,"off")=72
+	Set gtmtypes("gd_addr",20,"len")=4
+	Set gtmtypes("gd_addr",20,"type")="addr"
+	Set gtmtypfldindx("gd_addr","thread_gdi")=20
 	;
 	Set gtmtypes("gd_binding")="struct"
 	Set gtmtypes("gd_binding",0)=8
@@ -4830,8 +4929,8 @@ Init
 	Set gtmtypfldindx("gd_gblname","ver")=3
 	;
 	Set gtmtypes("gd_region")="struct"
-	Set gtmtypes("gd_region",0)=38
-	Set gtmtypes("gd_region","len")=372
+	Set gtmtypes("gd_region",0)=44
+	Set gtmtypes("gd_region","len")=412
 	Set gtmtypes("gd_region",1,"name")="gd_region.rname_len"
 	Set gtmtypes("gd_region",1,"off")=0
 	Set gtmtypes("gd_region",1,"len")=2
@@ -5012,16 +5111,46 @@ Init
 	Set gtmtypes("gd_region",36,"len")=4
 	Set gtmtypes("gd_region",36,"type")="unsigned-int"
 	Set gtmtypfldindx("gd_region","is_spanned")=36
-	Set gtmtypes("gd_region",37,"name")="gd_region.epoch_taper"
+	Set gtmtypes("gd_region",37,"name")="gd_region.statsDB_reg_index"
 	Set gtmtypes("gd_region",37,"off")=360
-	Set gtmtypes("gd_region",37,"len")=1
-	Set gtmtypes("gd_region",37,"type")="char"
-	Set gtmtypfldindx("gd_region","epoch_taper")=37
-	Set gtmtypes("gd_region",38,"name")="gd_region.filler"
-	Set gtmtypes("gd_region",38,"off")=361
-	Set gtmtypes("gd_region",38,"len")=11
+	Set gtmtypes("gd_region",37,"len")=4
+	Set gtmtypes("gd_region",37,"type")="unsigned-int"
+	Set gtmtypfldindx("gd_region","statsDB_reg_index")=37
+	Set gtmtypes("gd_region",38,"name")="gd_region.epoch_taper"
+	Set gtmtypes("gd_region",38,"off")=364
+	Set gtmtypes("gd_region",38,"len")=1
 	Set gtmtypes("gd_region",38,"type")="char"
-	Set gtmtypfldindx("gd_region","filler")=38
+	Set gtmtypfldindx("gd_region","epoch_taper")=38
+	Set gtmtypes("gd_region",39,"name")="gd_region.reservedDBFlags"
+	Set gtmtypes("gd_region",39,"off")=365
+	Set gtmtypes("gd_region",39,"len")=1
+	Set gtmtypes("gd_region",39,"type")="char"
+	Set gtmtypfldindx("gd_region","reservedDBFlags")=39
+	Set gtmtypes("gd_region",40,"name")="gd_region.lock_crit_with_db"
+	Set gtmtypes("gd_region",40,"off")=366
+	Set gtmtypes("gd_region",40,"len")=1
+	Set gtmtypes("gd_region",40,"type")="char"
+	Set gtmtypfldindx("gd_region","lock_crit_with_db")=40
+	Set gtmtypes("gd_region",41,"name")="gd_region.statsDB_setup_started"
+	Set gtmtypes("gd_region",41,"off")=367
+	Set gtmtypes("gd_region",41,"len")=1
+	Set gtmtypes("gd_region",41,"type")="char"
+	Set gtmtypfldindx("gd_region","statsDB_setup_started")=41
+	Set gtmtypes("gd_region",42,"name")="gd_region.owning_gd"
+	Set gtmtypes("gd_region",42,"off")=368
+	Set gtmtypes("gd_region",42,"len")=4
+	Set gtmtypes("gd_region",42,"type")="addr"
+	Set gtmtypfldindx("gd_region","owning_gd")=42
+	Set gtmtypes("gd_region",43,"name")="gd_region.statsDB_setup_completed"
+	Set gtmtypes("gd_region",43,"off")=372
+	Set gtmtypes("gd_region",43,"len")=1
+	Set gtmtypes("gd_region",43,"type")="char"
+	Set gtmtypfldindx("gd_region","statsDB_setup_completed")=43
+	Set gtmtypes("gd_region",44,"name")="gd_region.filler"
+	Set gtmtypes("gd_region",44,"off")=373
+	Set gtmtypes("gd_region",44,"len")=39
+	Set gtmtypes("gd_region",44,"type")="char"
+	Set gtmtypfldindx("gd_region","filler")=44
 	;
 	Set gtmtypes("gd_seg_addr")="union"
 	Set gtmtypes("gd_seg_addr",0)=2
@@ -5038,8 +5167,8 @@ Init
 	Set gtmtypfldindx("gd_seg_addr","addr")=2
 	;
 	Set gtmtypes("gd_segment")="struct"
-	Set gtmtypes("gd_segment",0)=23
-	Set gtmtypes("gd_segment","len")=364
+	Set gtmtypes("gd_segment",0)=24
+	Set gtmtypes("gd_segment","len")=368
 	Set gtmtypes("gd_segment",1,"name")="gd_segment.sname_len"
 	Set gtmtypes("gd_segment",1,"off")=0
 	Set gtmtypes("gd_segment",1,"len")=2
@@ -5150,11 +5279,16 @@ Init
 	Set gtmtypes("gd_segment",22,"len")=4
 	Set gtmtypes("gd_segment",22,"type")="unsigned-int"
 	Set gtmtypfldindx("gd_segment","is_encrypted")=22
-	Set gtmtypes("gd_segment",23,"name")="gd_segment.filler"
+	Set gtmtypes("gd_segment",23,"name")="gd_segment.asyncio"
 	Set gtmtypes("gd_segment",23,"off")=348
-	Set gtmtypes("gd_segment",23,"len")=16
-	Set gtmtypes("gd_segment",23,"type")="char"
-	Set gtmtypfldindx("gd_segment","filler")=23
+	Set gtmtypes("gd_segment",23,"len")=4
+	Set gtmtypes("gd_segment",23,"type")="boolean_t"
+	Set gtmtypfldindx("gd_segment","asyncio")=23
+	Set gtmtypes("gd_segment",24,"name")="gd_segment.filler"
+	Set gtmtypes("gd_segment",24,"off")=352
+	Set gtmtypes("gd_segment",24,"len")=16
+	Set gtmtypes("gd_segment",24,"type")="char"
+	Set gtmtypfldindx("gd_segment","filler")=24
 	;
 	Set gtmtypes("gdr_name")="struct"
 	Set gtmtypes("gdr_name",0)=10
@@ -6365,8 +6499,8 @@ Init
 	Set gtmtypfldindx("gtmrecv_options_t","autorollback_verbose")=29
 	;
 	Set gtmtypes("gtmsecshr_mesg")="struct"
-	Set gtmtypes("gtmsecshr_mesg",0)=15
-	Set gtmtypes("gtmsecshr_mesg","len")=4140
+	Set gtmtypes("gtmsecshr_mesg",0)=16
+	Set gtmtypes("gtmsecshr_mesg","len")=4144
 	Set gtmtypes("gtmsecshr_mesg",1,"name")="gtmsecshr_mesg.code"
 	Set gtmtypes("gtmsecshr_mesg",1,"off")=0
 	Set gtmtypes("gtmsecshr_mesg",1,"len")=4
@@ -6394,7 +6528,7 @@ Init
 	Set gtmtypfldindx("gtmsecshr_mesg","seqno")=5
 	Set gtmtypes("gtmsecshr_mesg",6,"name")="gtmsecshr_mesg.mesg"
 	Set gtmtypes("gtmsecshr_mesg",6,"off")=20
-	Set gtmtypes("gtmsecshr_mesg",6,"len")=4120
+	Set gtmtypes("gtmsecshr_mesg",6,"len")=4124
 	Set gtmtypes("gtmsecshr_mesg",6,"type")="union"
 	Set gtmtypfldindx("gtmsecshr_mesg","mesg")=6
 	Set gtmtypes("gtmsecshr_mesg",7,"name")="gtmsecshr_mesg.mesg.id"
@@ -6409,39 +6543,44 @@ Init
 	Set gtmtypfldindx("gtmsecshr_mesg","mesg.path")=8
 	Set gtmtypes("gtmsecshr_mesg",9,"name")="gtmsecshr_mesg.mesg.db_ipcs"
 	Set gtmtypes("gtmsecshr_mesg",9,"off")=20
-	Set gtmtypes("gtmsecshr_mesg",9,"len")=4120
+	Set gtmtypes("gtmsecshr_mesg",9,"len")=4124
 	Set gtmtypes("gtmsecshr_mesg",9,"type")="ipcs_mesg"
 	Set gtmtypfldindx("gtmsecshr_mesg","mesg.db_ipcs")=9
-	Set gtmtypes("gtmsecshr_mesg",10,"name")="gtmsecshr_mesg.mesg.db_ipcs.semid"
+	Set gtmtypes("gtmsecshr_mesg",10,"name")="gtmsecshr_mesg.mesg.db_ipcs.open_fd_with_o_direct"
 	Set gtmtypes("gtmsecshr_mesg",10,"off")=20
 	Set gtmtypes("gtmsecshr_mesg",10,"len")=4
-	Set gtmtypes("gtmsecshr_mesg",10,"type")="int"
-	Set gtmtypfldindx("gtmsecshr_mesg","mesg.db_ipcs.semid")=10
-	Set gtmtypes("gtmsecshr_mesg",11,"name")="gtmsecshr_mesg.mesg.db_ipcs.shmid"
+	Set gtmtypes("gtmsecshr_mesg",10,"type")="boolean_t"
+	Set gtmtypfldindx("gtmsecshr_mesg","mesg.db_ipcs.open_fd_with_o_direct")=10
+	Set gtmtypes("gtmsecshr_mesg",11,"name")="gtmsecshr_mesg.mesg.db_ipcs.semid"
 	Set gtmtypes("gtmsecshr_mesg",11,"off")=24
 	Set gtmtypes("gtmsecshr_mesg",11,"len")=4
 	Set gtmtypes("gtmsecshr_mesg",11,"type")="int"
-	Set gtmtypfldindx("gtmsecshr_mesg","mesg.db_ipcs.shmid")=11
-	Set gtmtypes("gtmsecshr_mesg",12,"name")="gtmsecshr_mesg.mesg.db_ipcs.gt_sem_ctime"
+	Set gtmtypfldindx("gtmsecshr_mesg","mesg.db_ipcs.semid")=11
+	Set gtmtypes("gtmsecshr_mesg",12,"name")="gtmsecshr_mesg.mesg.db_ipcs.shmid"
 	Set gtmtypes("gtmsecshr_mesg",12,"off")=28
 	Set gtmtypes("gtmsecshr_mesg",12,"len")=4
-	Set gtmtypes("gtmsecshr_mesg",12,"type")="time_t"
-	Set gtmtypfldindx("gtmsecshr_mesg","mesg.db_ipcs.gt_sem_ctime")=12
-	Set gtmtypes("gtmsecshr_mesg",13,"name")="gtmsecshr_mesg.mesg.db_ipcs.gt_shm_ctime"
+	Set gtmtypes("gtmsecshr_mesg",12,"type")="int"
+	Set gtmtypfldindx("gtmsecshr_mesg","mesg.db_ipcs.shmid")=12
+	Set gtmtypes("gtmsecshr_mesg",13,"name")="gtmsecshr_mesg.mesg.db_ipcs.gt_sem_ctime"
 	Set gtmtypes("gtmsecshr_mesg",13,"off")=32
 	Set gtmtypes("gtmsecshr_mesg",13,"len")=4
 	Set gtmtypes("gtmsecshr_mesg",13,"type")="time_t"
-	Set gtmtypfldindx("gtmsecshr_mesg","mesg.db_ipcs.gt_shm_ctime")=13
-	Set gtmtypes("gtmsecshr_mesg",14,"name")="gtmsecshr_mesg.mesg.db_ipcs.fn_len"
+	Set gtmtypfldindx("gtmsecshr_mesg","mesg.db_ipcs.gt_sem_ctime")=13
+	Set gtmtypes("gtmsecshr_mesg",14,"name")="gtmsecshr_mesg.mesg.db_ipcs.gt_shm_ctime"
 	Set gtmtypes("gtmsecshr_mesg",14,"off")=36
 	Set gtmtypes("gtmsecshr_mesg",14,"len")=4
-	Set gtmtypes("gtmsecshr_mesg",14,"type")="unsigned-int"
-	Set gtmtypfldindx("gtmsecshr_mesg","mesg.db_ipcs.fn_len")=14
-	Set gtmtypes("gtmsecshr_mesg",15,"name")="gtmsecshr_mesg.mesg.db_ipcs.fn"
+	Set gtmtypes("gtmsecshr_mesg",14,"type")="time_t"
+	Set gtmtypfldindx("gtmsecshr_mesg","mesg.db_ipcs.gt_shm_ctime")=14
+	Set gtmtypes("gtmsecshr_mesg",15,"name")="gtmsecshr_mesg.mesg.db_ipcs.fn_len"
 	Set gtmtypes("gtmsecshr_mesg",15,"off")=40
-	Set gtmtypes("gtmsecshr_mesg",15,"len")=4097
-	Set gtmtypes("gtmsecshr_mesg",15,"type")="char"
-	Set gtmtypfldindx("gtmsecshr_mesg","mesg.db_ipcs.fn")=15
+	Set gtmtypes("gtmsecshr_mesg",15,"len")=4
+	Set gtmtypes("gtmsecshr_mesg",15,"type")="unsigned-int"
+	Set gtmtypfldindx("gtmsecshr_mesg","mesg.db_ipcs.fn_len")=15
+	Set gtmtypes("gtmsecshr_mesg",16,"name")="gtmsecshr_mesg.mesg.db_ipcs.fn"
+	Set gtmtypes("gtmsecshr_mesg",16,"off")=44
+	Set gtmtypes("gtmsecshr_mesg",16,"len")=4097
+	Set gtmtypes("gtmsecshr_mesg",16,"type")="char"
+	Set gtmtypfldindx("gtmsecshr_mesg","mesg.db_ipcs.fn")=16
 	;
 	Set gtmtypes("gtmsiginfo_t")="struct"
 	Set gtmtypes("gtmsiginfo_t",0)=8
@@ -6985,6 +7124,22 @@ Init
 	Set gtmtypes("gv_key",4,"type")="unsigned-char"
 	Set gtmtypfldindx("gv_key","base")=4
 	;
+	Set gtmtypes("gv_name_and_subscripts")="union"
+	Set gtmtypes("gv_name_and_subscripts",0)=2
+	Set gtmtypes("gv_name_and_subscripts","len")=140
+	Set gtmtypes("gv_name_and_subscripts",1,"name")="gv_name_and_subscripts.lv"
+	Set gtmtypes("gv_name_and_subscripts",1,"off")=0
+	Set gtmtypes("gv_name_and_subscripts",1,"len")=140
+	Set gtmtypes("gv_name_and_subscripts",1,"type")="int"
+	Set gtmtypfldindx("gv_name_and_subscripts","lv")=1
+	Set gtmtypes("gv_name_and_subscripts",1,"dim")=35
+	Set gtmtypes("gv_name_and_subscripts",2,"name")="gv_name_and_subscripts.gv"
+	Set gtmtypes("gv_name_and_subscripts",2,"off")=0
+	Set gtmtypes("gv_name_and_subscripts",2,"len")=140
+	Set gtmtypes("gv_name_and_subscripts",2,"type")="int"
+	Set gtmtypfldindx("gv_name_and_subscripts","gv")=2
+	Set gtmtypes("gv_name_and_subscripts",2,"dim")=35
+	;
 	Set gtmtypes("gv_namehead")="struct"
 	Set gtmtypes("gv_namehead",0)=41
 	Set gtmtypes("gv_namehead","len")=568
@@ -7539,8 +7694,8 @@ Init
 	Set gtmtypfldindx("gvsavtarg_t","end")=8
 	;
 	Set gtmtypes("gvstats_rec_t")="struct"
-	Set gtmtypes("gvstats_rec_t",0)=58
-	Set gtmtypes("gvstats_rec_t","len")=464
+	Set gtmtypes("gvstats_rec_t",0)=59
+	Set gtmtypes("gvstats_rec_t","len")=472
 	Set gtmtypes("gvstats_rec_t",1,"name")="gvstats_rec_t.n_set"
 	Set gtmtypes("gvstats_rec_t",1,"off")=0
 	Set gtmtypes("gvstats_rec_t",1,"len")=8
@@ -7831,6 +7986,11 @@ Init
 	Set gtmtypes("gvstats_rec_t",58,"len")=8
 	Set gtmtypes("gvstats_rec_t",58,"type")="uint64_t"
 	Set gtmtypfldindx("gvstats_rec_t","n_crit_yields")=58
+	Set gtmtypes("gvstats_rec_t",59,"name")="gvstats_rec_t.n_clean2dirty"
+	Set gtmtypes("gvstats_rec_t",59,"off")=464
+	Set gtmtypes("gvstats_rec_t",59,"len")=8
+	Set gtmtypes("gvstats_rec_t",59,"type")="uint64_t"
+	Set gtmtypfldindx("gvstats_rec_t","n_clean2dirty")=59
 	;
 	Set gtmtypes("gvt_container")="struct"
 	Set gtmtypes("gvt_container",0)=4
@@ -9435,38 +9595,43 @@ Init
 	Set gtmtypfldindx("iosb","dev_dep_info")=3
 	;
 	Set gtmtypes("ipcs_mesg")="struct"
-	Set gtmtypes("ipcs_mesg",0)=6
-	Set gtmtypes("ipcs_mesg","len")=4120
-	Set gtmtypes("ipcs_mesg",1,"name")="ipcs_mesg.semid"
+	Set gtmtypes("ipcs_mesg",0)=7
+	Set gtmtypes("ipcs_mesg","len")=4124
+	Set gtmtypes("ipcs_mesg",1,"name")="ipcs_mesg.open_fd_with_o_direct"
 	Set gtmtypes("ipcs_mesg",1,"off")=0
 	Set gtmtypes("ipcs_mesg",1,"len")=4
-	Set gtmtypes("ipcs_mesg",1,"type")="int"
-	Set gtmtypfldindx("ipcs_mesg","semid")=1
-	Set gtmtypes("ipcs_mesg",2,"name")="ipcs_mesg.shmid"
+	Set gtmtypes("ipcs_mesg",1,"type")="boolean_t"
+	Set gtmtypfldindx("ipcs_mesg","open_fd_with_o_direct")=1
+	Set gtmtypes("ipcs_mesg",2,"name")="ipcs_mesg.semid"
 	Set gtmtypes("ipcs_mesg",2,"off")=4
 	Set gtmtypes("ipcs_mesg",2,"len")=4
 	Set gtmtypes("ipcs_mesg",2,"type")="int"
-	Set gtmtypfldindx("ipcs_mesg","shmid")=2
-	Set gtmtypes("ipcs_mesg",3,"name")="ipcs_mesg.gt_sem_ctime"
+	Set gtmtypfldindx("ipcs_mesg","semid")=2
+	Set gtmtypes("ipcs_mesg",3,"name")="ipcs_mesg.shmid"
 	Set gtmtypes("ipcs_mesg",3,"off")=8
 	Set gtmtypes("ipcs_mesg",3,"len")=4
-	Set gtmtypes("ipcs_mesg",3,"type")="time_t"
-	Set gtmtypfldindx("ipcs_mesg","gt_sem_ctime")=3
-	Set gtmtypes("ipcs_mesg",4,"name")="ipcs_mesg.gt_shm_ctime"
+	Set gtmtypes("ipcs_mesg",3,"type")="int"
+	Set gtmtypfldindx("ipcs_mesg","shmid")=3
+	Set gtmtypes("ipcs_mesg",4,"name")="ipcs_mesg.gt_sem_ctime"
 	Set gtmtypes("ipcs_mesg",4,"off")=12
 	Set gtmtypes("ipcs_mesg",4,"len")=4
 	Set gtmtypes("ipcs_mesg",4,"type")="time_t"
-	Set gtmtypfldindx("ipcs_mesg","gt_shm_ctime")=4
-	Set gtmtypes("ipcs_mesg",5,"name")="ipcs_mesg.fn_len"
+	Set gtmtypfldindx("ipcs_mesg","gt_sem_ctime")=4
+	Set gtmtypes("ipcs_mesg",5,"name")="ipcs_mesg.gt_shm_ctime"
 	Set gtmtypes("ipcs_mesg",5,"off")=16
 	Set gtmtypes("ipcs_mesg",5,"len")=4
-	Set gtmtypes("ipcs_mesg",5,"type")="unsigned-int"
-	Set gtmtypfldindx("ipcs_mesg","fn_len")=5
-	Set gtmtypes("ipcs_mesg",6,"name")="ipcs_mesg.fn"
+	Set gtmtypes("ipcs_mesg",5,"type")="time_t"
+	Set gtmtypfldindx("ipcs_mesg","gt_shm_ctime")=5
+	Set gtmtypes("ipcs_mesg",6,"name")="ipcs_mesg.fn_len"
 	Set gtmtypes("ipcs_mesg",6,"off")=20
-	Set gtmtypes("ipcs_mesg",6,"len")=4097
-	Set gtmtypes("ipcs_mesg",6,"type")="char"
-	Set gtmtypfldindx("ipcs_mesg","fn")=6
+	Set gtmtypes("ipcs_mesg",6,"len")=4
+	Set gtmtypes("ipcs_mesg",6,"type")="unsigned-int"
+	Set gtmtypfldindx("ipcs_mesg","fn_len")=6
+	Set gtmtypes("ipcs_mesg",7,"name")="ipcs_mesg.fn"
+	Set gtmtypes("ipcs_mesg",7,"off")=24
+	Set gtmtypes("ipcs_mesg",7,"len")=4097
+	Set gtmtypes("ipcs_mesg",7,"type")="char"
+	Set gtmtypfldindx("ipcs_mesg","fn")=7
 	;
 	Set gtmtypes("jext_heap_elem_t")="struct"
 	Set gtmtypes("jext_heap_elem_t",0)=2
@@ -10246,7 +10411,7 @@ Init
 	Set gtmtypfldindx("jnl_fence_control","strm_seqno")=4
 	;
 	Set gtmtypes("jnl_file_header")="struct"
-	Set gtmtypes("jnl_file_header",0)=66
+	Set gtmtypes("jnl_file_header",0)=67
 	Set gtmtypes("jnl_file_header","len")=2048
 	Set gtmtypes("jnl_file_header",1,"name")="jnl_file_header.label"
 	Set gtmtypes("jnl_file_header",1,"off")=0
@@ -10575,11 +10740,16 @@ Init
 	Set gtmtypes("jnl_file_header",65,"len")=4
 	Set gtmtypes("jnl_file_header",65,"type")="boolean_t"
 	Set gtmtypfldindx("jnl_file_header","last_eof_written")=65
-	Set gtmtypes("jnl_file_header",66,"name")="jnl_file_header.filler"
+	Set gtmtypes("jnl_file_header",66,"name")="jnl_file_header.is_not_latest_jnl"
 	Set gtmtypes("jnl_file_header",66,"off")=1612
-	Set gtmtypes("jnl_file_header",66,"len")=436
-	Set gtmtypes("jnl_file_header",66,"type")="char"
-	Set gtmtypfldindx("jnl_file_header","filler")=66
+	Set gtmtypes("jnl_file_header",66,"len")=4
+	Set gtmtypes("jnl_file_header",66,"type")="boolean_t"
+	Set gtmtypfldindx("jnl_file_header","is_not_latest_jnl")=66
+	Set gtmtypes("jnl_file_header",67,"name")="jnl_file_header.filler"
+	Set gtmtypes("jnl_file_header",67,"off")=1616
+	Set gtmtypes("jnl_file_header",67,"len")=432
+	Set gtmtypes("jnl_file_header",67,"type")="char"
+	Set gtmtypfldindx("jnl_file_header","filler")=67
 	;
 	Set gtmtypes("jnl_format_buffer")="struct"
 	Set gtmtypes("jnl_format_buffer",0)=14
@@ -10765,8 +10935,8 @@ Init
 	Set gtmtypfldindx("jnl_gbls_t","mur_update")=21
 	;
 	Set gtmtypes("jnl_private_control")="struct"
-	Set gtmtypes("jnl_private_control",0)=23
-	Set gtmtypes("jnl_private_control","len")=100
+	Set gtmtypes("jnl_private_control",0)=24
+	Set gtmtypes("jnl_private_control","len")=104
 	Set gtmtypes("jnl_private_control",1,"name")="jnl_private_control.jnl_buff"
 	Set gtmtypes("jnl_private_control",1,"off")=0
 	Set gtmtypes("jnl_private_control",1,"len")=4
@@ -10882,6 +11052,11 @@ Init
 	Set gtmtypes("jnl_private_control",23,"len")=4
 	Set gtmtypes("jnl_private_control",23,"type")="unsigned-int"
 	Set gtmtypfldindx("jnl_private_control","cycle")=23
+	Set gtmtypes("jnl_private_control",24,"name")="jnl_private_control.err_str"
+	Set gtmtypes("jnl_private_control",24,"off")=100
+	Set gtmtypes("jnl_private_control",24,"len")=4
+	Set gtmtypes("jnl_private_control",24,"type")="addr"
+	Set gtmtypfldindx("jnl_private_control","err_str")=24
 	;
 	Set gtmtypes("jnl_process_vector")="struct"
 	Set gtmtypes("jnl_process_vector",0)=10
@@ -13201,8 +13376,8 @@ Init
 	Set gtmtypfldindx("mline","table")=6
 	;
 	Set gtmtypes("mliteral")="struct"
-	Set gtmtypes("mliteral",0)=11
-	Set gtmtypes("mliteral","len")=44
+	Set gtmtypes("mliteral",0)=12
+	Set gtmtypes("mliteral","len")=48
 	Set gtmtypes("mliteral",1,"name")="mliteral.que"
 	Set gtmtypes("mliteral",1,"off")=0
 	Set gtmtypes("mliteral",1,"len")=8
@@ -13223,42 +13398,47 @@ Init
 	Set gtmtypes("mliteral",4,"len")=4
 	Set gtmtypes("mliteral",4,"type")="intptr_t"
 	Set gtmtypfldindx("mliteral","rt_addr")=4
-	Set gtmtypes("mliteral",5,"name")="mliteral.v"
+	Set gtmtypes("mliteral",5,"name")="mliteral.reference_count"
 	Set gtmtypes("mliteral",5,"off")=12
-	Set gtmtypes("mliteral",5,"len")=32
-	Set gtmtypes("mliteral",5,"type")="mval"
-	Set gtmtypfldindx("mliteral","v")=5
-	Set gtmtypes("mliteral",6,"name")="mliteral.v.mvtype"
-	Set gtmtypes("mliteral",6,"off")=12
-	Set gtmtypes("mliteral",6,"len")=2
-	Set gtmtypes("mliteral",6,"type")="unsigned-short"
-	Set gtmtypfldindx("mliteral","v.mvtype")=6
-	Set gtmtypes("mliteral",7,"name")="mliteral.v.fnpc_indx"
-	Set gtmtypes("mliteral",7,"off")=15
-	Set gtmtypes("mliteral",7,"len")=1
-	Set gtmtypes("mliteral",7,"type")="unsigned-char"
-	Set gtmtypfldindx("mliteral","v.fnpc_indx")=7
-	Set gtmtypes("mliteral",8,"name")="mliteral.v.utfcgr_indx"
-	Set gtmtypes("mliteral",8,"off")=16
-	Set gtmtypes("mliteral",8,"len")=4
-	Set gtmtypes("mliteral",8,"type")="unsigned-int"
-	Set gtmtypfldindx("mliteral","v.utfcgr_indx")=8
-	Set gtmtypes("mliteral",9,"name")="mliteral.v.filler2"
+	Set gtmtypes("mliteral",5,"len")=4
+	Set gtmtypes("mliteral",5,"type")="int"
+	Set gtmtypfldindx("mliteral","reference_count")=5
+	Set gtmtypes("mliteral",6,"name")="mliteral.v"
+	Set gtmtypes("mliteral",6,"off")=16
+	Set gtmtypes("mliteral",6,"len")=32
+	Set gtmtypes("mliteral",6,"type")="mval"
+	Set gtmtypfldindx("mliteral","v")=6
+	Set gtmtypes("mliteral",7,"name")="mliteral.v.mvtype"
+	Set gtmtypes("mliteral",7,"off")=16
+	Set gtmtypes("mliteral",7,"len")=2
+	Set gtmtypes("mliteral",7,"type")="unsigned-short"
+	Set gtmtypfldindx("mliteral","v.mvtype")=7
+	Set gtmtypes("mliteral",8,"name")="mliteral.v.fnpc_indx"
+	Set gtmtypes("mliteral",8,"off")=19
+	Set gtmtypes("mliteral",8,"len")=1
+	Set gtmtypes("mliteral",8,"type")="unsigned-char"
+	Set gtmtypfldindx("mliteral","v.fnpc_indx")=8
+	Set gtmtypes("mliteral",9,"name")="mliteral.v.utfcgr_indx"
 	Set gtmtypes("mliteral",9,"off")=20
 	Set gtmtypes("mliteral",9,"len")=4
 	Set gtmtypes("mliteral",9,"type")="unsigned-int"
-	Set gtmtypfldindx("mliteral","v.filler2")=9
-	Set gtmtypes("mliteral",10,"name")="mliteral.v.m"
+	Set gtmtypfldindx("mliteral","v.utfcgr_indx")=9
+	Set gtmtypes("mliteral",10,"name")="mliteral.v.filler2"
 	Set gtmtypes("mliteral",10,"off")=24
-	Set gtmtypes("mliteral",10,"len")=8
-	Set gtmtypes("mliteral",10,"type")="int"
-	Set gtmtypfldindx("mliteral","v.m")=10
-	Set gtmtypes("mliteral",10,"dim")=2
-	Set gtmtypes("mliteral",11,"name")="mliteral.v.str"
-	Set gtmtypes("mliteral",11,"off")=32
-	Set gtmtypes("mliteral",11,"len")=12
-	Set gtmtypes("mliteral",11,"type")="mstr"
-	Set gtmtypfldindx("mliteral","v.str")=11
+	Set gtmtypes("mliteral",10,"len")=4
+	Set gtmtypes("mliteral",10,"type")="unsigned-int"
+	Set gtmtypfldindx("mliteral","v.filler2")=10
+	Set gtmtypes("mliteral",11,"name")="mliteral.v.m"
+	Set gtmtypes("mliteral",11,"off")=28
+	Set gtmtypes("mliteral",11,"len")=8
+	Set gtmtypes("mliteral",11,"type")="int"
+	Set gtmtypfldindx("mliteral","v.m")=11
+	Set gtmtypes("mliteral",11,"dim")=2
+	Set gtmtypes("mliteral",12,"name")="mliteral.v.str"
+	Set gtmtypes("mliteral",12,"off")=36
+	Set gtmtypes("mliteral",12,"len")=12
+	Set gtmtypes("mliteral",12,"type")="mstr"
+	Set gtmtypfldindx("mliteral","v.str")=12
 	;
 	Set gtmtypes("mlk_ctldata")="struct"
 	Set gtmtypes("mlk_ctldata",0)=12
@@ -16764,8 +16944,8 @@ Init
 	Set gtmtypfldindx("nametabent","name")=2
 	;
 	Set gtmtypes("node_local")="struct"
-	Set gtmtypes("node_local",0)=210
-	Set gtmtypes("node_local","len")=51152
+	Set gtmtypes("node_local",0)=249
+	Set gtmtypes("node_local","len")=104768
 	Set gtmtypes("node_local",1,"name")="node_local.label"
 	Set gtmtypes("node_local",1,"off")=0
 	Set gtmtypes("node_local",1,"len")=12
@@ -17037,795 +17217,991 @@ Init
 	Set gtmtypes("node_local",54,"len")=28
 	Set gtmtypes("node_local",54,"type")="char"
 	Set gtmtypfldindx("node_local","fill_cacheline9")=54
-	Set gtmtypes("node_local",55,"name")="node_local.mm_extender_pid"
+	Set gtmtypes("node_local",55,"name")="node_local.wcs_wip_lvl"
 	Set gtmtypes("node_local",55,"off")=960
 	Set gtmtypes("node_local",55,"len")=4
 	Set gtmtypes("node_local",55,"type")="int"
-	Set gtmtypfldindx("node_local","mm_extender_pid")=55
-	Set gtmtypes("node_local",56,"name")="node_local.highest_lbm_blk_changed"
+	Set gtmtypfldindx("node_local","wcs_wip_lvl")=55
+	Set gtmtypes("node_local",56,"name")="node_local.fill_cacheline10"
 	Set gtmtypes("node_local",56,"off")=964
-	Set gtmtypes("node_local",56,"len")=4
-	Set gtmtypes("node_local",56,"type")="int"
-	Set gtmtypfldindx("node_local","highest_lbm_blk_changed")=56
-	Set gtmtypes("node_local",57,"name")="node_local.nbb"
-	Set gtmtypes("node_local",57,"off")=968
+	Set gtmtypes("node_local",56,"len")=28
+	Set gtmtypes("node_local",56,"type")="char"
+	Set gtmtypfldindx("node_local","fill_cacheline10")=56
+	Set gtmtypes("node_local",57,"name")="node_local.wtfini_in_prog"
+	Set gtmtypes("node_local",57,"off")=992
 	Set gtmtypes("node_local",57,"len")=4
 	Set gtmtypes("node_local",57,"type")="int"
-	Set gtmtypfldindx("node_local","nbb")=57
-	Set gtmtypes("node_local",58,"name")="node_local.lockhist_idx"
-	Set gtmtypes("node_local",58,"off")=972
+	Set gtmtypfldindx("node_local","wtfini_in_prog")=57
+	Set gtmtypes("node_local",58,"name")="node_local.freezer_waited_for_kip"
+	Set gtmtypes("node_local",58,"off")=996
 	Set gtmtypes("node_local",58,"len")=4
-	Set gtmtypes("node_local",58,"type")="int"
-	Set gtmtypfldindx("node_local","lockhist_idx")=58
-	Set gtmtypes("node_local",59,"name")="node_local.crit_ops_index"
-	Set gtmtypes("node_local",59,"off")=976
+	Set gtmtypes("node_local",58,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","freezer_waited_for_kip")=58
+	Set gtmtypes("node_local",59,"name")="node_local.mm_extender_pid"
+	Set gtmtypes("node_local",59,"off")=1000
 	Set gtmtypes("node_local",59,"len")=4
 	Set gtmtypes("node_local",59,"type")="int"
-	Set gtmtypfldindx("node_local","crit_ops_index")=59
-	Set gtmtypes("node_local",60,"name")="node_local.dskread_ops_index"
-	Set gtmtypes("node_local",60,"off")=980
+	Set gtmtypfldindx("node_local","mm_extender_pid")=59
+	Set gtmtypes("node_local",60,"name")="node_local.highest_lbm_blk_changed"
+	Set gtmtypes("node_local",60,"off")=1004
 	Set gtmtypes("node_local",60,"len")=4
 	Set gtmtypes("node_local",60,"type")="int"
-	Set gtmtypfldindx("node_local","dskread_ops_index")=60
-	Set gtmtypes("node_local",61,"name")="node_local.ftok_ops_index"
-	Set gtmtypes("node_local",61,"off")=984
+	Set gtmtypfldindx("node_local","highest_lbm_blk_changed")=60
+	Set gtmtypes("node_local",61,"name")="node_local.nbb"
+	Set gtmtypes("node_local",61,"off")=1008
 	Set gtmtypes("node_local",61,"len")=4
 	Set gtmtypes("node_local",61,"type")="int"
-	Set gtmtypfldindx("node_local","ftok_ops_index")=61
-	Set gtmtypes("node_local",62,"name")="node_local.lockhists"
-	Set gtmtypes("node_local",62,"off")=988
-	Set gtmtypes("node_local",62,"len")=10240
-	Set gtmtypes("node_local",62,"type")="lockhist"
-	Set gtmtypfldindx("node_local","lockhists")=62
-	Set gtmtypes("node_local",62,"dim")=512
-	Set gtmtypes("node_local",63,"name")="node_local.lockhists[0].lock_addr"
-	Set gtmtypes("node_local",63,"off")=988
+	Set gtmtypfldindx("node_local","nbb")=61
+	Set gtmtypes("node_local",62,"name")="node_local.lockhist_idx"
+	Set gtmtypes("node_local",62,"off")=1012
+	Set gtmtypes("node_local",62,"len")=4
+	Set gtmtypes("node_local",62,"type")="int"
+	Set gtmtypfldindx("node_local","lockhist_idx")=62
+	Set gtmtypes("node_local",63,"name")="node_local.crit_ops_index"
+	Set gtmtypes("node_local",63,"off")=1016
 	Set gtmtypes("node_local",63,"len")=4
-	Set gtmtypes("node_local",63,"type")="addr"
-	Set gtmtypfldindx("node_local","lockhists[0].lock_addr")=63
-	Set gtmtypes("node_local",64,"name")="node_local.lockhists[0].lock_callr"
-	Set gtmtypes("node_local",64,"off")=992
+	Set gtmtypes("node_local",63,"type")="int"
+	Set gtmtypfldindx("node_local","crit_ops_index")=63
+	Set gtmtypes("node_local",64,"name")="node_local.dskread_ops_index"
+	Set gtmtypes("node_local",64,"off")=1020
 	Set gtmtypes("node_local",64,"len")=4
-	Set gtmtypes("node_local",64,"type")="caddr_t"
-	Set gtmtypfldindx("node_local","lockhists[0].lock_callr")=64
-	Set gtmtypes("node_local",65,"name")="node_local.lockhists[0].lock_pid"
-	Set gtmtypes("node_local",65,"off")=996
+	Set gtmtypes("node_local",64,"type")="int"
+	Set gtmtypfldindx("node_local","dskread_ops_index")=64
+	Set gtmtypes("node_local",65,"name")="node_local.ftok_ops_index"
+	Set gtmtypes("node_local",65,"off")=1024
 	Set gtmtypes("node_local",65,"len")=4
 	Set gtmtypes("node_local",65,"type")="int"
-	Set gtmtypfldindx("node_local","lockhists[0].lock_pid")=65
-	Set gtmtypes("node_local",66,"name")="node_local.lockhists[0].loop_cnt"
-	Set gtmtypes("node_local",66,"off")=1000
+	Set gtmtypfldindx("node_local","ftok_ops_index")=65
+	Set gtmtypes("node_local",66,"name")="node_local.wcs_ops_index"
+	Set gtmtypes("node_local",66,"off")=1028
 	Set gtmtypes("node_local",66,"len")=4
 	Set gtmtypes("node_local",66,"type")="int"
-	Set gtmtypfldindx("node_local","lockhists[0].loop_cnt")=66
-	Set gtmtypes("node_local",67,"name")="node_local.lockhists[0].lock_op"
-	Set gtmtypes("node_local",67,"off")=1004
+	Set gtmtypfldindx("node_local","wcs_ops_index")=66
+	Set gtmtypes("node_local",67,"name")="node_local.filler_8byte_align2"
+	Set gtmtypes("node_local",67,"off")=1032
 	Set gtmtypes("node_local",67,"len")=4
-	Set gtmtypes("node_local",67,"type")="char"
-	Set gtmtypfldindx("node_local","lockhists[0].lock_op")=67
-	Set gtmtypes("node_local",68,"name")="node_local.crit_ops_array"
-	Set gtmtypes("node_local",68,"off")=11228
+	Set gtmtypes("node_local",67,"type")="int"
+	Set gtmtypfldindx("node_local","filler_8byte_align2")=67
+	Set gtmtypes("node_local",68,"name")="node_local.lockhists"
+	Set gtmtypes("node_local",68,"off")=1036
 	Set gtmtypes("node_local",68,"len")=10240
-	Set gtmtypes("node_local",68,"type")="crit_trace"
-	Set gtmtypfldindx("node_local","crit_ops_array")=68
+	Set gtmtypes("node_local",68,"type")="lockhist"
+	Set gtmtypfldindx("node_local","lockhists")=68
 	Set gtmtypes("node_local",68,"dim")=512
-	Set gtmtypes("node_local",69,"name")="node_local.crit_ops_array[0].call_from"
-	Set gtmtypes("node_local",69,"off")=11228
+	Set gtmtypes("node_local",69,"name")="node_local.lockhists[0].lock_addr"
+	Set gtmtypes("node_local",69,"off")=1036
 	Set gtmtypes("node_local",69,"len")=4
-	Set gtmtypes("node_local",69,"type")="caddr_t"
-	Set gtmtypfldindx("node_local","crit_ops_array[0].call_from")=69
-	Set gtmtypes("node_local",70,"name")="node_local.crit_ops_array[0].crit_act"
-	Set gtmtypes("node_local",70,"off")=11232
+	Set gtmtypes("node_local",69,"type")="addr"
+	Set gtmtypfldindx("node_local","lockhists[0].lock_addr")=69
+	Set gtmtypes("node_local",70,"name")="node_local.lockhists[0].lock_callr"
+	Set gtmtypes("node_local",70,"off")=1040
 	Set gtmtypes("node_local",70,"len")=4
-	Set gtmtypes("node_local",70,"type")="int"
-	Set gtmtypfldindx("node_local","crit_ops_array[0].crit_act")=70
-	Set gtmtypes("node_local",71,"name")="node_local.crit_ops_array[0].epid"
-	Set gtmtypes("node_local",71,"off")=11236
+	Set gtmtypes("node_local",70,"type")="caddr_t"
+	Set gtmtypfldindx("node_local","lockhists[0].lock_callr")=70
+	Set gtmtypes("node_local",71,"name")="node_local.lockhists[0].lock_pid"
+	Set gtmtypes("node_local",71,"off")=1044
 	Set gtmtypes("node_local",71,"len")=4
 	Set gtmtypes("node_local",71,"type")="int"
-	Set gtmtypfldindx("node_local","crit_ops_array[0].epid")=71
-	Set gtmtypes("node_local",72,"name")="node_local.crit_ops_array[0].curr_tn"
-	Set gtmtypes("node_local",72,"off")=11240
-	Set gtmtypes("node_local",72,"len")=8
-	Set gtmtypes("node_local",72,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","crit_ops_array[0].curr_tn")=72
-	Set gtmtypes("node_local",73,"name")="node_local.dskread_ops_array"
-	Set gtmtypes("node_local",73,"off")=21468
-	Set gtmtypes("node_local",73,"len")=12288
-	Set gtmtypes("node_local",73,"type")="dskread_trace"
-	Set gtmtypfldindx("node_local","dskread_ops_array")=73
-	Set gtmtypes("node_local",73,"dim")=512
-	Set gtmtypes("node_local",74,"name")="node_local.dskread_ops_array[0].cr_off"
-	Set gtmtypes("node_local",74,"off")=21468
-	Set gtmtypes("node_local",74,"len")=4
-	Set gtmtypes("node_local",74,"type")="intptr_t"
-	Set gtmtypfldindx("node_local","dskread_ops_array[0].cr_off")=74
-	Set gtmtypes("node_local",75,"name")="node_local.dskread_ops_array[0].cr_tn"
-	Set gtmtypes("node_local",75,"off")=21472
-	Set gtmtypes("node_local",75,"len")=8
-	Set gtmtypes("node_local",75,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","dskread_ops_array[0].cr_tn")=75
-	Set gtmtypes("node_local",76,"name")="node_local.dskread_ops_array[0].process_id"
-	Set gtmtypes("node_local",76,"off")=21480
+	Set gtmtypfldindx("node_local","lockhists[0].lock_pid")=71
+	Set gtmtypes("node_local",72,"name")="node_local.lockhists[0].loop_cnt"
+	Set gtmtypes("node_local",72,"off")=1048
+	Set gtmtypes("node_local",72,"len")=4
+	Set gtmtypes("node_local",72,"type")="int"
+	Set gtmtypfldindx("node_local","lockhists[0].loop_cnt")=72
+	Set gtmtypes("node_local",73,"name")="node_local.lockhists[0].lock_op"
+	Set gtmtypes("node_local",73,"off")=1052
+	Set gtmtypes("node_local",73,"len")=4
+	Set gtmtypes("node_local",73,"type")="char"
+	Set gtmtypfldindx("node_local","lockhists[0].lock_op")=73
+	Set gtmtypes("node_local",74,"name")="node_local.crit_ops_array"
+	Set gtmtypes("node_local",74,"off")=11276
+	Set gtmtypes("node_local",74,"len")=10240
+	Set gtmtypes("node_local",74,"type")="crit_trace"
+	Set gtmtypfldindx("node_local","crit_ops_array")=74
+	Set gtmtypes("node_local",74,"dim")=512
+	Set gtmtypes("node_local",75,"name")="node_local.crit_ops_array[0].call_from"
+	Set gtmtypes("node_local",75,"off")=11276
+	Set gtmtypes("node_local",75,"len")=4
+	Set gtmtypes("node_local",75,"type")="caddr_t"
+	Set gtmtypfldindx("node_local","crit_ops_array[0].call_from")=75
+	Set gtmtypes("node_local",76,"name")="node_local.crit_ops_array[0].crit_act"
+	Set gtmtypes("node_local",76,"off")=11280
 	Set gtmtypes("node_local",76,"len")=4
-	Set gtmtypes("node_local",76,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","dskread_ops_array[0].process_id")=76
-	Set gtmtypes("node_local",77,"name")="node_local.dskread_ops_array[0].blk"
-	Set gtmtypes("node_local",77,"off")=21484
+	Set gtmtypes("node_local",76,"type")="int"
+	Set gtmtypfldindx("node_local","crit_ops_array[0].crit_act")=76
+	Set gtmtypes("node_local",77,"name")="node_local.crit_ops_array[0].epid"
+	Set gtmtypes("node_local",77,"off")=11284
 	Set gtmtypes("node_local",77,"len")=4
 	Set gtmtypes("node_local",77,"type")="int"
-	Set gtmtypfldindx("node_local","dskread_ops_array[0].blk")=77
-	Set gtmtypes("node_local",78,"name")="node_local.dskread_ops_array[0].cycle"
-	Set gtmtypes("node_local",78,"off")=21488
-	Set gtmtypes("node_local",78,"len")=4
-	Set gtmtypes("node_local",78,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","dskread_ops_array[0].cycle")=78
-	Set gtmtypes("node_local",79,"name")="node_local.unique_id"
-	Set gtmtypes("node_local",79,"off")=33756
-	Set gtmtypes("node_local",79,"len")=20
-	Set gtmtypes("node_local",79,"type")="unique_file_id"
-	Set gtmtypfldindx("node_local","unique_id")=79
-	Set gtmtypes("node_local",80,"name")="node_local.unique_id.uid"
-	Set gtmtypes("node_local",80,"off")=33756
-	Set gtmtypes("node_local",80,"len")=20
-	Set gtmtypes("node_local",80,"type")="unix_file_id"
-	Set gtmtypfldindx("node_local","unique_id.uid")=80
-	Set gtmtypes("node_local",81,"name")="node_local.unique_id.file_id"
-	Set gtmtypes("node_local",81,"off")=33756
-	Set gtmtypes("node_local",81,"len")=20
-	Set gtmtypes("node_local",81,"type")="char"
-	Set gtmtypfldindx("node_local","unique_id.file_id")=81
-	Set gtmtypes("node_local",82,"name")="node_local.owner_node"
-	Set gtmtypes("node_local",82,"off")=33776
+	Set gtmtypfldindx("node_local","crit_ops_array[0].epid")=77
+	Set gtmtypes("node_local",78,"name")="node_local.crit_ops_array[0].curr_tn"
+	Set gtmtypes("node_local",78,"off")=11288
+	Set gtmtypes("node_local",78,"len")=8
+	Set gtmtypes("node_local",78,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","crit_ops_array[0].curr_tn")=78
+	Set gtmtypes("node_local",79,"name")="node_local.dskread_ops_array"
+	Set gtmtypes("node_local",79,"off")=21516
+	Set gtmtypes("node_local",79,"len")=12288
+	Set gtmtypes("node_local",79,"type")="dskread_trace"
+	Set gtmtypfldindx("node_local","dskread_ops_array")=79
+	Set gtmtypes("node_local",79,"dim")=512
+	Set gtmtypes("node_local",80,"name")="node_local.dskread_ops_array[0].cr_off"
+	Set gtmtypes("node_local",80,"off")=21516
+	Set gtmtypes("node_local",80,"len")=4
+	Set gtmtypes("node_local",80,"type")="intptr_t"
+	Set gtmtypfldindx("node_local","dskread_ops_array[0].cr_off")=80
+	Set gtmtypes("node_local",81,"name")="node_local.dskread_ops_array[0].cr_tn"
+	Set gtmtypes("node_local",81,"off")=21520
+	Set gtmtypes("node_local",81,"len")=8
+	Set gtmtypes("node_local",81,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","dskread_ops_array[0].cr_tn")=81
+	Set gtmtypes("node_local",82,"name")="node_local.dskread_ops_array[0].process_id"
+	Set gtmtypes("node_local",82,"off")=21528
 	Set gtmtypes("node_local",82,"len")=4
 	Set gtmtypes("node_local",82,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","owner_node")=82
-	Set gtmtypes("node_local",83,"name")="node_local.wcsflu_pid"
-	Set gtmtypes("node_local",83,"off")=33780
+	Set gtmtypfldindx("node_local","dskread_ops_array[0].process_id")=82
+	Set gtmtypes("node_local",83,"name")="node_local.dskread_ops_array[0].blk"
+	Set gtmtypes("node_local",83,"off")=21532
 	Set gtmtypes("node_local",83,"len")=4
 	Set gtmtypes("node_local",83,"type")="int"
-	Set gtmtypfldindx("node_local","wcsflu_pid")=83
-	Set gtmtypes("node_local",84,"name")="node_local.creation_date_time4"
-	Set gtmtypes("node_local",84,"off")=33784
+	Set gtmtypfldindx("node_local","dskread_ops_array[0].blk")=83
+	Set gtmtypes("node_local",84,"name")="node_local.dskread_ops_array[0].cycle"
+	Set gtmtypes("node_local",84,"off")=21536
 	Set gtmtypes("node_local",84,"len")=4
-	Set gtmtypes("node_local",84,"type")="int"
-	Set gtmtypfldindx("node_local","creation_date_time4")=84
-	Set gtmtypes("node_local",85,"name")="node_local.inhibit_kills"
-	Set gtmtypes("node_local",85,"off")=33788
-	Set gtmtypes("node_local",85,"len")=4
-	Set gtmtypes("node_local",85,"type")="int"
-	Set gtmtypfldindx("node_local","inhibit_kills")=85
-	Set gtmtypes("node_local",86,"name")="node_local.remove_shm"
-	Set gtmtypes("node_local",86,"off")=33792
-	Set gtmtypes("node_local",86,"len")=4
-	Set gtmtypes("node_local",86,"type")="boolean_t"
-	Set gtmtypfldindx("node_local","remove_shm")=86
-	Set gtmtypes("node_local",87,"name")="node_local.jnl_file"
-	Set gtmtypes("node_local",87,"off")=33796
-	Set gtmtypes("node_local",87,"len")=28
-	Set gtmtypes("node_local",87,"type")="union"
-	Set gtmtypfldindx("node_local","jnl_file")=87
-	Set gtmtypes("node_local",88,"name")="node_local.jnl_file.jnl_file_id"
-	Set gtmtypes("node_local",88,"off")=33796
-	Set gtmtypes("node_local",88,"len")=28
-	Set gtmtypes("node_local",88,"type")="gds_file_id"
-	Set gtmtypfldindx("node_local","jnl_file.jnl_file_id")=88
-	Set gtmtypes("node_local",89,"name")="node_local.jnl_file.jnl_file_id.dvi"
-	Set gtmtypes("node_local",89,"off")=33796
-	Set gtmtypes("node_local",89,"len")=16
-	Set gtmtypes("node_local",89,"type")="char"
-	Set gtmtypfldindx("node_local","jnl_file.jnl_file_id.dvi")=89
-	Set gtmtypes("node_local",90,"name")="node_local.jnl_file.jnl_file_id.did"
-	Set gtmtypes("node_local",90,"off")=33812
-	Set gtmtypes("node_local",90,"len")=6
-	Set gtmtypes("node_local",90,"type")="unsigned-short"
-	Set gtmtypfldindx("node_local","jnl_file.jnl_file_id.did")=90
-	Set gtmtypes("node_local",90,"dim")=3
-	Set gtmtypes("node_local",91,"name")="node_local.jnl_file.jnl_file_id.fid"
-	Set gtmtypes("node_local",91,"off")=33818
-	Set gtmtypes("node_local",91,"len")=6
-	Set gtmtypes("node_local",91,"type")="unsigned-short"
-	Set gtmtypfldindx("node_local","jnl_file.jnl_file_id.fid")=91
-	Set gtmtypes("node_local",91,"dim")=3
-	Set gtmtypes("node_local",92,"name")="node_local.jnl_file.u"
-	Set gtmtypes("node_local",92,"off")=33796
-	Set gtmtypes("node_local",92,"len")=20
-	Set gtmtypes("node_local",92,"type")="unix_file_id"
-	Set gtmtypfldindx("node_local","jnl_file.u")=92
-	Set gtmtypes("node_local",93,"name")="node_local.jnl_file.u.inode"
-	Set gtmtypes("node_local",93,"off")=33796
-	Set gtmtypes("node_local",93,"len")=8
-	Set gtmtypes("node_local",93,"type")="ino_t"
-	Set gtmtypfldindx("node_local","jnl_file.u.inode")=93
-	Set gtmtypes("node_local",94,"name")="node_local.jnl_file.u.device"
-	Set gtmtypes("node_local",94,"off")=33804
+	Set gtmtypes("node_local",84,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","dskread_ops_array[0].cycle")=84
+	Set gtmtypes("node_local",85,"name")="node_local.wcs_ops_array"
+	Set gtmtypes("node_local",85,"off")=33804
+	Set gtmtypes("node_local",85,"len")=53248
+	Set gtmtypes("node_local",85,"type")="wcs_ops_trace_t"
+	Set gtmtypfldindx("node_local","wcs_ops_array")=85
+	Set gtmtypes("node_local",85,"dim")=1024
+	Set gtmtypes("node_local",86,"name")="node_local.wcs_ops_array[0].db_tn"
+	Set gtmtypes("node_local",86,"off")=33804
+	Set gtmtypes("node_local",86,"len")=8
+	Set gtmtypes("node_local",86,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","wcs_ops_array[0].db_tn")=86
+	Set gtmtypes("node_local",87,"name")="node_local.wcs_ops_array[0].process_id"
+	Set gtmtypes("node_local",87,"off")=33812
+	Set gtmtypes("node_local",87,"len")=4
+	Set gtmtypes("node_local",87,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","wcs_ops_array[0].process_id")=87
+	Set gtmtypes("node_local",88,"name")="node_local.wcs_ops_array[0].wc_in_free"
+	Set gtmtypes("node_local",88,"off")=33816
+	Set gtmtypes("node_local",88,"len")=4
+	Set gtmtypes("node_local",88,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","wcs_ops_array[0].wc_in_free")=88
+	Set gtmtypes("node_local",89,"name")="node_local.wcs_ops_array[0].wcs_active_lvl"
+	Set gtmtypes("node_local",89,"off")=33820
+	Set gtmtypes("node_local",89,"len")=4
+	Set gtmtypes("node_local",89,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","wcs_ops_array[0].wcs_active_lvl")=89
+	Set gtmtypes("node_local",90,"name")="node_local.wcs_ops_array[0].wcs_wip_lvl"
+	Set gtmtypes("node_local",90,"off")=33824
+	Set gtmtypes("node_local",90,"len")=4
+	Set gtmtypes("node_local",90,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","wcs_ops_array[0].wcs_wip_lvl")=90
+	Set gtmtypes("node_local",91,"name")="node_local.wcs_ops_array[0].type"
+	Set gtmtypes("node_local",91,"off")=33828
+	Set gtmtypes("node_local",91,"len")=4
+	Set gtmtypes("node_local",91,"type")="int"
+	Set gtmtypfldindx("node_local","wcs_ops_array[0].type")=91
+	Set gtmtypes("node_local",92,"name")="node_local.wcs_ops_array[0].blk"
+	Set gtmtypes("node_local",92,"off")=33832
+	Set gtmtypes("node_local",92,"len")=4
+	Set gtmtypes("node_local",92,"type")="int"
+	Set gtmtypfldindx("node_local","wcs_ops_array[0].blk")=92
+	Set gtmtypes("node_local",93,"name")="node_local.wcs_ops_array[0].cr_off"
+	Set gtmtypes("node_local",93,"off")=33836
+	Set gtmtypes("node_local",93,"len")=4
+	Set gtmtypes("node_local",93,"type")="intptr_t"
+	Set gtmtypfldindx("node_local","wcs_ops_array[0].cr_off")=93
+	Set gtmtypes("node_local",94,"name")="node_local.wcs_ops_array[0].cr_dirty"
+	Set gtmtypes("node_local",94,"off")=33840
 	Set gtmtypes("node_local",94,"len")=8
-	Set gtmtypes("node_local",94,"type")="dev_t"
-	Set gtmtypfldindx("node_local","jnl_file.u.device")=94
-	Set gtmtypes("node_local",95,"name")="node_local.jnl_file.u.st_gen"
-	Set gtmtypes("node_local",95,"off")=33812
+	Set gtmtypes("node_local",94,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","wcs_ops_array[0].cr_dirty")=94
+	Set gtmtypes("node_local",95,"name")="node_local.wcs_ops_array[0].detail1"
+	Set gtmtypes("node_local",95,"off")=33848
 	Set gtmtypes("node_local",95,"len")=4
 	Set gtmtypes("node_local",95,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","jnl_file.u.st_gen")=95
-	Set gtmtypes("node_local",96,"name")="node_local.donotflush_dbjnl"
-	Set gtmtypes("node_local",96,"off")=33824
+	Set gtmtypfldindx("node_local","wcs_ops_array[0].detail1")=95
+	Set gtmtypes("node_local",96,"name")="node_local.wcs_ops_array[0].detail2"
+	Set gtmtypes("node_local",96,"off")=33852
 	Set gtmtypes("node_local",96,"len")=4
-	Set gtmtypes("node_local",96,"type")="boolean_t"
-	Set gtmtypfldindx("node_local","donotflush_dbjnl")=96
-	Set gtmtypes("node_local",97,"name")="node_local.n_pre_read"
-	Set gtmtypes("node_local",97,"off")=33828
-	Set gtmtypes("node_local",97,"len")=4
-	Set gtmtypes("node_local",97,"type")="int"
-	Set gtmtypfldindx("node_local","n_pre_read")=97
-	Set gtmtypes("node_local",98,"name")="node_local.replinstfilename"
-	Set gtmtypes("node_local",98,"off")=33832
-	Set gtmtypes("node_local",98,"len")=256
-	Set gtmtypes("node_local",98,"type")="char"
-	Set gtmtypfldindx("node_local","replinstfilename")=98
-	Set gtmtypes("node_local",99,"name")="node_local.secshr_ops_index"
-	Set gtmtypes("node_local",99,"off")=34088
-	Set gtmtypes("node_local",99,"len")=4
-	Set gtmtypes("node_local",99,"type")="int"
-	Set gtmtypfldindx("node_local","secshr_ops_index")=99
-	Set gtmtypes("node_local",100,"name")="node_local.secshr_ops_array"
-	Set gtmtypes("node_local",100,"off")=34092
-	Set gtmtypes("node_local",100,"len")=8184
-	Set gtmtypes("node_local",100,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","secshr_ops_array")=100
-	Set gtmtypes("node_local",100,"dim")=1023
-	Set gtmtypes("node_local",101,"name")="node_local.gvstats_rec"
-	Set gtmtypes("node_local",101,"off")=42276
-	Set gtmtypes("node_local",101,"len")=464
-	Set gtmtypes("node_local",101,"type")="gvstats_rec_t"
-	Set gtmtypfldindx("node_local","gvstats_rec")=101
-	Set gtmtypes("node_local",102,"name")="node_local.gvstats_rec.n_set"
-	Set gtmtypes("node_local",102,"off")=42276
-	Set gtmtypes("node_local",102,"len")=8
-	Set gtmtypes("node_local",102,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_set")=102
-	Set gtmtypes("node_local",103,"name")="node_local.gvstats_rec.n_kill"
-	Set gtmtypes("node_local",103,"off")=42284
-	Set gtmtypes("node_local",103,"len")=8
-	Set gtmtypes("node_local",103,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_kill")=103
-	Set gtmtypes("node_local",104,"name")="node_local.gvstats_rec.n_get"
-	Set gtmtypes("node_local",104,"off")=42292
-	Set gtmtypes("node_local",104,"len")=8
-	Set gtmtypes("node_local",104,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_get")=104
-	Set gtmtypes("node_local",105,"name")="node_local.gvstats_rec.n_data"
-	Set gtmtypes("node_local",105,"off")=42300
-	Set gtmtypes("node_local",105,"len")=8
-	Set gtmtypes("node_local",105,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_data")=105
-	Set gtmtypes("node_local",106,"name")="node_local.gvstats_rec.n_order"
-	Set gtmtypes("node_local",106,"off")=42308
-	Set gtmtypes("node_local",106,"len")=8
-	Set gtmtypes("node_local",106,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_order")=106
-	Set gtmtypes("node_local",107,"name")="node_local.gvstats_rec.n_zprev"
-	Set gtmtypes("node_local",107,"off")=42316
-	Set gtmtypes("node_local",107,"len")=8
-	Set gtmtypes("node_local",107,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_zprev")=107
-	Set gtmtypes("node_local",108,"name")="node_local.gvstats_rec.n_query"
-	Set gtmtypes("node_local",108,"off")=42324
-	Set gtmtypes("node_local",108,"len")=8
-	Set gtmtypes("node_local",108,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_query")=108
-	Set gtmtypes("node_local",109,"name")="node_local.gvstats_rec.n_lock_success"
-	Set gtmtypes("node_local",109,"off")=42332
-	Set gtmtypes("node_local",109,"len")=8
-	Set gtmtypes("node_local",109,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_lock_success")=109
-	Set gtmtypes("node_local",110,"name")="node_local.gvstats_rec.n_lock_fail"
-	Set gtmtypes("node_local",110,"off")=42340
-	Set gtmtypes("node_local",110,"len")=8
-	Set gtmtypes("node_local",110,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_lock_fail")=110
-	Set gtmtypes("node_local",111,"name")="node_local.gvstats_rec.db_curr_tn"
-	Set gtmtypes("node_local",111,"off")=42348
+	Set gtmtypes("node_local",96,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","wcs_ops_array[0].detail2")=96
+	Set gtmtypes("node_local",97,"name")="node_local.unique_id"
+	Set gtmtypes("node_local",97,"off")=87052
+	Set gtmtypes("node_local",97,"len")=20
+	Set gtmtypes("node_local",97,"type")="unique_file_id"
+	Set gtmtypfldindx("node_local","unique_id")=97
+	Set gtmtypes("node_local",98,"name")="node_local.unique_id.uid"
+	Set gtmtypes("node_local",98,"off")=87052
+	Set gtmtypes("node_local",98,"len")=20
+	Set gtmtypes("node_local",98,"type")="unix_file_id"
+	Set gtmtypfldindx("node_local","unique_id.uid")=98
+	Set gtmtypes("node_local",99,"name")="node_local.unique_id.file_id"
+	Set gtmtypes("node_local",99,"off")=87052
+	Set gtmtypes("node_local",99,"len")=20
+	Set gtmtypes("node_local",99,"type")="char"
+	Set gtmtypfldindx("node_local","unique_id.file_id")=99
+	Set gtmtypes("node_local",100,"name")="node_local.owner_node"
+	Set gtmtypes("node_local",100,"off")=87072
+	Set gtmtypes("node_local",100,"len")=4
+	Set gtmtypes("node_local",100,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","owner_node")=100
+	Set gtmtypes("node_local",101,"name")="node_local.wcsflu_pid"
+	Set gtmtypes("node_local",101,"off")=87076
+	Set gtmtypes("node_local",101,"len")=4
+	Set gtmtypes("node_local",101,"type")="int"
+	Set gtmtypfldindx("node_local","wcsflu_pid")=101
+	Set gtmtypes("node_local",102,"name")="node_local.creation_date_time4"
+	Set gtmtypes("node_local",102,"off")=87080
+	Set gtmtypes("node_local",102,"len")=4
+	Set gtmtypes("node_local",102,"type")="int"
+	Set gtmtypfldindx("node_local","creation_date_time4")=102
+	Set gtmtypes("node_local",103,"name")="node_local.inhibit_kills"
+	Set gtmtypes("node_local",103,"off")=87084
+	Set gtmtypes("node_local",103,"len")=4
+	Set gtmtypes("node_local",103,"type")="int"
+	Set gtmtypfldindx("node_local","inhibit_kills")=103
+	Set gtmtypes("node_local",104,"name")="node_local.remove_shm"
+	Set gtmtypes("node_local",104,"off")=87088
+	Set gtmtypes("node_local",104,"len")=4
+	Set gtmtypes("node_local",104,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","remove_shm")=104
+	Set gtmtypes("node_local",105,"name")="node_local.jnl_file"
+	Set gtmtypes("node_local",105,"off")=87092
+	Set gtmtypes("node_local",105,"len")=28
+	Set gtmtypes("node_local",105,"type")="union"
+	Set gtmtypfldindx("node_local","jnl_file")=105
+	Set gtmtypes("node_local",106,"name")="node_local.jnl_file.jnl_file_id"
+	Set gtmtypes("node_local",106,"off")=87092
+	Set gtmtypes("node_local",106,"len")=28
+	Set gtmtypes("node_local",106,"type")="gds_file_id"
+	Set gtmtypfldindx("node_local","jnl_file.jnl_file_id")=106
+	Set gtmtypes("node_local",107,"name")="node_local.jnl_file.jnl_file_id.dvi"
+	Set gtmtypes("node_local",107,"off")=87092
+	Set gtmtypes("node_local",107,"len")=16
+	Set gtmtypes("node_local",107,"type")="char"
+	Set gtmtypfldindx("node_local","jnl_file.jnl_file_id.dvi")=107
+	Set gtmtypes("node_local",108,"name")="node_local.jnl_file.jnl_file_id.did"
+	Set gtmtypes("node_local",108,"off")=87108
+	Set gtmtypes("node_local",108,"len")=6
+	Set gtmtypes("node_local",108,"type")="unsigned-short"
+	Set gtmtypfldindx("node_local","jnl_file.jnl_file_id.did")=108
+	Set gtmtypes("node_local",108,"dim")=3
+	Set gtmtypes("node_local",109,"name")="node_local.jnl_file.jnl_file_id.fid"
+	Set gtmtypes("node_local",109,"off")=87114
+	Set gtmtypes("node_local",109,"len")=6
+	Set gtmtypes("node_local",109,"type")="unsigned-short"
+	Set gtmtypfldindx("node_local","jnl_file.jnl_file_id.fid")=109
+	Set gtmtypes("node_local",109,"dim")=3
+	Set gtmtypes("node_local",110,"name")="node_local.jnl_file.u"
+	Set gtmtypes("node_local",110,"off")=87092
+	Set gtmtypes("node_local",110,"len")=20
+	Set gtmtypes("node_local",110,"type")="unix_file_id"
+	Set gtmtypfldindx("node_local","jnl_file.u")=110
+	Set gtmtypes("node_local",111,"name")="node_local.jnl_file.u.inode"
+	Set gtmtypes("node_local",111,"off")=87092
 	Set gtmtypes("node_local",111,"len")=8
-	Set gtmtypes("node_local",111,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.db_curr_tn")=111
-	Set gtmtypes("node_local",112,"name")="node_local.gvstats_rec.n_dsk_read"
-	Set gtmtypes("node_local",112,"off")=42356
+	Set gtmtypes("node_local",111,"type")="ino_t"
+	Set gtmtypfldindx("node_local","jnl_file.u.inode")=111
+	Set gtmtypes("node_local",112,"name")="node_local.jnl_file.u.device"
+	Set gtmtypes("node_local",112,"off")=87100
 	Set gtmtypes("node_local",112,"len")=8
-	Set gtmtypes("node_local",112,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_dsk_read")=112
-	Set gtmtypes("node_local",113,"name")="node_local.gvstats_rec.n_dsk_write"
-	Set gtmtypes("node_local",113,"off")=42364
-	Set gtmtypes("node_local",113,"len")=8
-	Set gtmtypes("node_local",113,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_dsk_write")=113
-	Set gtmtypes("node_local",114,"name")="node_local.gvstats_rec.n_nontp_readwrite"
-	Set gtmtypes("node_local",114,"off")=42372
-	Set gtmtypes("node_local",114,"len")=8
-	Set gtmtypes("node_local",114,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_nontp_readwrite")=114
-	Set gtmtypes("node_local",115,"name")="node_local.gvstats_rec.n_nontp_readonly"
-	Set gtmtypes("node_local",115,"off")=42380
-	Set gtmtypes("node_local",115,"len")=8
-	Set gtmtypes("node_local",115,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_nontp_readonly")=115
-	Set gtmtypes("node_local",116,"name")="node_local.gvstats_rec.n_nontp_blkwrite"
-	Set gtmtypes("node_local",116,"off")=42388
-	Set gtmtypes("node_local",116,"len")=8
-	Set gtmtypes("node_local",116,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_nontp_blkwrite")=116
-	Set gtmtypes("node_local",117,"name")="node_local.gvstats_rec.n_nontp_blkread"
-	Set gtmtypes("node_local",117,"off")=42396
-	Set gtmtypes("node_local",117,"len")=8
-	Set gtmtypes("node_local",117,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_nontp_blkread")=117
-	Set gtmtypes("node_local",118,"name")="node_local.gvstats_rec.n_nontp_retries_0"
-	Set gtmtypes("node_local",118,"off")=42404
-	Set gtmtypes("node_local",118,"len")=8
-	Set gtmtypes("node_local",118,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_nontp_retries_0")=118
-	Set gtmtypes("node_local",119,"name")="node_local.gvstats_rec.n_nontp_retries_1"
-	Set gtmtypes("node_local",119,"off")=42412
-	Set gtmtypes("node_local",119,"len")=8
+	Set gtmtypes("node_local",112,"type")="dev_t"
+	Set gtmtypfldindx("node_local","jnl_file.u.device")=112
+	Set gtmtypes("node_local",113,"name")="node_local.jnl_file.u.st_gen"
+	Set gtmtypes("node_local",113,"off")=87108
+	Set gtmtypes("node_local",113,"len")=4
+	Set gtmtypes("node_local",113,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","jnl_file.u.st_gen")=113
+	Set gtmtypes("node_local",114,"name")="node_local.donotflush_dbjnl"
+	Set gtmtypes("node_local",114,"off")=87120
+	Set gtmtypes("node_local",114,"len")=4
+	Set gtmtypes("node_local",114,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","donotflush_dbjnl")=114
+	Set gtmtypes("node_local",115,"name")="node_local.n_pre_read"
+	Set gtmtypes("node_local",115,"off")=87124
+	Set gtmtypes("node_local",115,"len")=4
+	Set gtmtypes("node_local",115,"type")="int"
+	Set gtmtypfldindx("node_local","n_pre_read")=115
+	Set gtmtypes("node_local",116,"name")="node_local.replinstfilename"
+	Set gtmtypes("node_local",116,"off")=87128
+	Set gtmtypes("node_local",116,"len")=256
+	Set gtmtypes("node_local",116,"type")="char"
+	Set gtmtypfldindx("node_local","replinstfilename")=116
+	Set gtmtypes("node_local",117,"name")="node_local.statsdb_fname"
+	Set gtmtypes("node_local",117,"off")=87384
+	Set gtmtypes("node_local",117,"len")=256
+	Set gtmtypes("node_local",117,"type")="char"
+	Set gtmtypfldindx("node_local","statsdb_fname")=117
+	Set gtmtypes("node_local",118,"name")="node_local.secshr_ops_index"
+	Set gtmtypes("node_local",118,"off")=87640
+	Set gtmtypes("node_local",118,"len")=4
+	Set gtmtypes("node_local",118,"type")="int"
+	Set gtmtypfldindx("node_local","secshr_ops_index")=118
+	Set gtmtypes("node_local",119,"name")="node_local.secshr_ops_array"
+	Set gtmtypes("node_local",119,"off")=87644
+	Set gtmtypes("node_local",119,"len")=8184
 	Set gtmtypes("node_local",119,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_nontp_retries_1")=119
-	Set gtmtypes("node_local",120,"name")="node_local.gvstats_rec.n_nontp_retries_2"
-	Set gtmtypes("node_local",120,"off")=42420
-	Set gtmtypes("node_local",120,"len")=8
-	Set gtmtypes("node_local",120,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_nontp_retries_2")=120
-	Set gtmtypes("node_local",121,"name")="node_local.gvstats_rec.n_nontp_retries_3"
-	Set gtmtypes("node_local",121,"off")=42428
+	Set gtmtypfldindx("node_local","secshr_ops_array")=119
+	Set gtmtypes("node_local",119,"dim")=1023
+	Set gtmtypes("node_local",120,"name")="node_local.gvstats_rec"
+	Set gtmtypes("node_local",120,"off")=95828
+	Set gtmtypes("node_local",120,"len")=472
+	Set gtmtypes("node_local",120,"type")="gvstats_rec_t"
+	Set gtmtypfldindx("node_local","gvstats_rec")=120
+	Set gtmtypes("node_local",121,"name")="node_local.gvstats_rec.n_set"
+	Set gtmtypes("node_local",121,"off")=95828
 	Set gtmtypes("node_local",121,"len")=8
 	Set gtmtypes("node_local",121,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_nontp_retries_3")=121
-	Set gtmtypes("node_local",122,"name")="node_local.gvstats_rec.n_tp_readwrite"
-	Set gtmtypes("node_local",122,"off")=42436
+	Set gtmtypfldindx("node_local","gvstats_rec.n_set")=121
+	Set gtmtypes("node_local",122,"name")="node_local.gvstats_rec.n_kill"
+	Set gtmtypes("node_local",122,"off")=95836
 	Set gtmtypes("node_local",122,"len")=8
 	Set gtmtypes("node_local",122,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_readwrite")=122
-	Set gtmtypes("node_local",123,"name")="node_local.gvstats_rec.n_tp_readonly"
-	Set gtmtypes("node_local",123,"off")=42444
+	Set gtmtypfldindx("node_local","gvstats_rec.n_kill")=122
+	Set gtmtypes("node_local",123,"name")="node_local.gvstats_rec.n_get"
+	Set gtmtypes("node_local",123,"off")=95844
 	Set gtmtypes("node_local",123,"len")=8
 	Set gtmtypes("node_local",123,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_readonly")=123
-	Set gtmtypes("node_local",124,"name")="node_local.gvstats_rec.n_tp_rolledback"
-	Set gtmtypes("node_local",124,"off")=42452
+	Set gtmtypfldindx("node_local","gvstats_rec.n_get")=123
+	Set gtmtypes("node_local",124,"name")="node_local.gvstats_rec.n_data"
+	Set gtmtypes("node_local",124,"off")=95852
 	Set gtmtypes("node_local",124,"len")=8
 	Set gtmtypes("node_local",124,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_rolledback")=124
-	Set gtmtypes("node_local",125,"name")="node_local.gvstats_rec.n_tp_blkwrite"
-	Set gtmtypes("node_local",125,"off")=42460
+	Set gtmtypfldindx("node_local","gvstats_rec.n_data")=124
+	Set gtmtypes("node_local",125,"name")="node_local.gvstats_rec.n_order"
+	Set gtmtypes("node_local",125,"off")=95860
 	Set gtmtypes("node_local",125,"len")=8
 	Set gtmtypes("node_local",125,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_blkwrite")=125
-	Set gtmtypes("node_local",126,"name")="node_local.gvstats_rec.n_tp_blkread"
-	Set gtmtypes("node_local",126,"off")=42468
+	Set gtmtypfldindx("node_local","gvstats_rec.n_order")=125
+	Set gtmtypes("node_local",126,"name")="node_local.gvstats_rec.n_zprev"
+	Set gtmtypes("node_local",126,"off")=95868
 	Set gtmtypes("node_local",126,"len")=8
 	Set gtmtypes("node_local",126,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_blkread")=126
-	Set gtmtypes("node_local",127,"name")="node_local.gvstats_rec.n_tp_tot_retries_0"
-	Set gtmtypes("node_local",127,"off")=42476
+	Set gtmtypfldindx("node_local","gvstats_rec.n_zprev")=126
+	Set gtmtypes("node_local",127,"name")="node_local.gvstats_rec.n_query"
+	Set gtmtypes("node_local",127,"off")=95876
 	Set gtmtypes("node_local",127,"len")=8
 	Set gtmtypes("node_local",127,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_tot_retries_0")=127
-	Set gtmtypes("node_local",128,"name")="node_local.gvstats_rec.n_tp_tot_retries_1"
-	Set gtmtypes("node_local",128,"off")=42484
+	Set gtmtypfldindx("node_local","gvstats_rec.n_query")=127
+	Set gtmtypes("node_local",128,"name")="node_local.gvstats_rec.n_lock_success"
+	Set gtmtypes("node_local",128,"off")=95884
 	Set gtmtypes("node_local",128,"len")=8
 	Set gtmtypes("node_local",128,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_tot_retries_1")=128
-	Set gtmtypes("node_local",129,"name")="node_local.gvstats_rec.n_tp_tot_retries_2"
-	Set gtmtypes("node_local",129,"off")=42492
+	Set gtmtypfldindx("node_local","gvstats_rec.n_lock_success")=128
+	Set gtmtypes("node_local",129,"name")="node_local.gvstats_rec.n_lock_fail"
+	Set gtmtypes("node_local",129,"off")=95892
 	Set gtmtypes("node_local",129,"len")=8
 	Set gtmtypes("node_local",129,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_tot_retries_2")=129
-	Set gtmtypes("node_local",130,"name")="node_local.gvstats_rec.n_tp_tot_retries_3"
-	Set gtmtypes("node_local",130,"off")=42500
+	Set gtmtypfldindx("node_local","gvstats_rec.n_lock_fail")=129
+	Set gtmtypes("node_local",130,"name")="node_local.gvstats_rec.db_curr_tn"
+	Set gtmtypes("node_local",130,"off")=95900
 	Set gtmtypes("node_local",130,"len")=8
 	Set gtmtypes("node_local",130,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_tot_retries_3")=130
-	Set gtmtypes("node_local",131,"name")="node_local.gvstats_rec.n_tp_tot_retries_4"
-	Set gtmtypes("node_local",131,"off")=42508
+	Set gtmtypfldindx("node_local","gvstats_rec.db_curr_tn")=130
+	Set gtmtypes("node_local",131,"name")="node_local.gvstats_rec.n_dsk_read"
+	Set gtmtypes("node_local",131,"off")=95908
 	Set gtmtypes("node_local",131,"len")=8
 	Set gtmtypes("node_local",131,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_tot_retries_4")=131
-	Set gtmtypes("node_local",132,"name")="node_local.gvstats_rec.n_tp_cnflct_retries_0"
-	Set gtmtypes("node_local",132,"off")=42516
+	Set gtmtypfldindx("node_local","gvstats_rec.n_dsk_read")=131
+	Set gtmtypes("node_local",132,"name")="node_local.gvstats_rec.n_dsk_write"
+	Set gtmtypes("node_local",132,"off")=95916
 	Set gtmtypes("node_local",132,"len")=8
 	Set gtmtypes("node_local",132,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_cnflct_retries_0")=132
-	Set gtmtypes("node_local",133,"name")="node_local.gvstats_rec.n_tp_cnflct_retries_1"
-	Set gtmtypes("node_local",133,"off")=42524
+	Set gtmtypfldindx("node_local","gvstats_rec.n_dsk_write")=132
+	Set gtmtypes("node_local",133,"name")="node_local.gvstats_rec.n_nontp_readwrite"
+	Set gtmtypes("node_local",133,"off")=95924
 	Set gtmtypes("node_local",133,"len")=8
 	Set gtmtypes("node_local",133,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_cnflct_retries_1")=133
-	Set gtmtypes("node_local",134,"name")="node_local.gvstats_rec.n_tp_cnflct_retries_2"
-	Set gtmtypes("node_local",134,"off")=42532
+	Set gtmtypfldindx("node_local","gvstats_rec.n_nontp_readwrite")=133
+	Set gtmtypes("node_local",134,"name")="node_local.gvstats_rec.n_nontp_readonly"
+	Set gtmtypes("node_local",134,"off")=95932
 	Set gtmtypes("node_local",134,"len")=8
 	Set gtmtypes("node_local",134,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_cnflct_retries_2")=134
-	Set gtmtypes("node_local",135,"name")="node_local.gvstats_rec.n_tp_cnflct_retries_3"
-	Set gtmtypes("node_local",135,"off")=42540
+	Set gtmtypfldindx("node_local","gvstats_rec.n_nontp_readonly")=134
+	Set gtmtypes("node_local",135,"name")="node_local.gvstats_rec.n_nontp_blkwrite"
+	Set gtmtypes("node_local",135,"off")=95940
 	Set gtmtypes("node_local",135,"len")=8
 	Set gtmtypes("node_local",135,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_cnflct_retries_3")=135
-	Set gtmtypes("node_local",136,"name")="node_local.gvstats_rec.n_tp_cnflct_retries_4"
-	Set gtmtypes("node_local",136,"off")=42548
+	Set gtmtypfldindx("node_local","gvstats_rec.n_nontp_blkwrite")=135
+	Set gtmtypes("node_local",136,"name")="node_local.gvstats_rec.n_nontp_blkread"
+	Set gtmtypes("node_local",136,"off")=95948
 	Set gtmtypes("node_local",136,"len")=8
 	Set gtmtypes("node_local",136,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_cnflct_retries_4")=136
-	Set gtmtypes("node_local",137,"name")="node_local.gvstats_rec.n_ztrigger"
-	Set gtmtypes("node_local",137,"off")=42556
+	Set gtmtypfldindx("node_local","gvstats_rec.n_nontp_blkread")=136
+	Set gtmtypes("node_local",137,"name")="node_local.gvstats_rec.n_nontp_retries_0"
+	Set gtmtypes("node_local",137,"off")=95956
 	Set gtmtypes("node_local",137,"len")=8
 	Set gtmtypes("node_local",137,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_ztrigger")=137
-	Set gtmtypes("node_local",138,"name")="node_local.gvstats_rec.n_db_flush"
-	Set gtmtypes("node_local",138,"off")=42564
+	Set gtmtypfldindx("node_local","gvstats_rec.n_nontp_retries_0")=137
+	Set gtmtypes("node_local",138,"name")="node_local.gvstats_rec.n_nontp_retries_1"
+	Set gtmtypes("node_local",138,"off")=95964
 	Set gtmtypes("node_local",138,"len")=8
 	Set gtmtypes("node_local",138,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_db_flush")=138
-	Set gtmtypes("node_local",139,"name")="node_local.gvstats_rec.n_db_fsync"
-	Set gtmtypes("node_local",139,"off")=42572
+	Set gtmtypfldindx("node_local","gvstats_rec.n_nontp_retries_1")=138
+	Set gtmtypes("node_local",139,"name")="node_local.gvstats_rec.n_nontp_retries_2"
+	Set gtmtypes("node_local",139,"off")=95972
 	Set gtmtypes("node_local",139,"len")=8
 	Set gtmtypes("node_local",139,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_db_fsync")=139
-	Set gtmtypes("node_local",140,"name")="node_local.gvstats_rec.n_jnl_flush"
-	Set gtmtypes("node_local",140,"off")=42580
+	Set gtmtypfldindx("node_local","gvstats_rec.n_nontp_retries_2")=139
+	Set gtmtypes("node_local",140,"name")="node_local.gvstats_rec.n_nontp_retries_3"
+	Set gtmtypes("node_local",140,"off")=95980
 	Set gtmtypes("node_local",140,"len")=8
 	Set gtmtypes("node_local",140,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_jnl_flush")=140
-	Set gtmtypes("node_local",141,"name")="node_local.gvstats_rec.n_jnl_fsync"
-	Set gtmtypes("node_local",141,"off")=42588
+	Set gtmtypfldindx("node_local","gvstats_rec.n_nontp_retries_3")=140
+	Set gtmtypes("node_local",141,"name")="node_local.gvstats_rec.n_tp_readwrite"
+	Set gtmtypes("node_local",141,"off")=95988
 	Set gtmtypes("node_local",141,"len")=8
 	Set gtmtypes("node_local",141,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_jnl_fsync")=141
-	Set gtmtypes("node_local",142,"name")="node_local.gvstats_rec.n_jbuff_bytes"
-	Set gtmtypes("node_local",142,"off")=42596
+	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_readwrite")=141
+	Set gtmtypes("node_local",142,"name")="node_local.gvstats_rec.n_tp_readonly"
+	Set gtmtypes("node_local",142,"off")=95996
 	Set gtmtypes("node_local",142,"len")=8
 	Set gtmtypes("node_local",142,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_jbuff_bytes")=142
-	Set gtmtypes("node_local",143,"name")="node_local.gvstats_rec.n_jfile_bytes"
-	Set gtmtypes("node_local",143,"off")=42604
+	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_readonly")=142
+	Set gtmtypes("node_local",143,"name")="node_local.gvstats_rec.n_tp_rolledback"
+	Set gtmtypes("node_local",143,"off")=96004
 	Set gtmtypes("node_local",143,"len")=8
 	Set gtmtypes("node_local",143,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_jfile_bytes")=143
-	Set gtmtypes("node_local",144,"name")="node_local.gvstats_rec.n_jfile_writes"
-	Set gtmtypes("node_local",144,"off")=42612
+	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_rolledback")=143
+	Set gtmtypes("node_local",144,"name")="node_local.gvstats_rec.n_tp_blkwrite"
+	Set gtmtypes("node_local",144,"off")=96012
 	Set gtmtypes("node_local",144,"len")=8
 	Set gtmtypes("node_local",144,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_jfile_writes")=144
-	Set gtmtypes("node_local",145,"name")="node_local.gvstats_rec.n_jrec_logical"
-	Set gtmtypes("node_local",145,"off")=42620
+	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_blkwrite")=144
+	Set gtmtypes("node_local",145,"name")="node_local.gvstats_rec.n_tp_blkread"
+	Set gtmtypes("node_local",145,"off")=96020
 	Set gtmtypes("node_local",145,"len")=8
 	Set gtmtypes("node_local",145,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_jrec_logical")=145
-	Set gtmtypes("node_local",146,"name")="node_local.gvstats_rec.n_jrec_pblk"
-	Set gtmtypes("node_local",146,"off")=42628
+	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_blkread")=145
+	Set gtmtypes("node_local",146,"name")="node_local.gvstats_rec.n_tp_tot_retries_0"
+	Set gtmtypes("node_local",146,"off")=96028
 	Set gtmtypes("node_local",146,"len")=8
 	Set gtmtypes("node_local",146,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_jrec_pblk")=146
-	Set gtmtypes("node_local",147,"name")="node_local.gvstats_rec.n_jrec_epoch_regular"
-	Set gtmtypes("node_local",147,"off")=42636
+	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_tot_retries_0")=146
+	Set gtmtypes("node_local",147,"name")="node_local.gvstats_rec.n_tp_tot_retries_1"
+	Set gtmtypes("node_local",147,"off")=96036
 	Set gtmtypes("node_local",147,"len")=8
 	Set gtmtypes("node_local",147,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_jrec_epoch_regular")=147
-	Set gtmtypes("node_local",148,"name")="node_local.gvstats_rec.n_jrec_epoch_idle"
-	Set gtmtypes("node_local",148,"off")=42644
+	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_tot_retries_1")=147
+	Set gtmtypes("node_local",148,"name")="node_local.gvstats_rec.n_tp_tot_retries_2"
+	Set gtmtypes("node_local",148,"off")=96044
 	Set gtmtypes("node_local",148,"len")=8
 	Set gtmtypes("node_local",148,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_jrec_epoch_idle")=148
-	Set gtmtypes("node_local",149,"name")="node_local.gvstats_rec.n_jrec_other"
-	Set gtmtypes("node_local",149,"off")=42652
+	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_tot_retries_2")=148
+	Set gtmtypes("node_local",149,"name")="node_local.gvstats_rec.n_tp_tot_retries_3"
+	Set gtmtypes("node_local",149,"off")=96052
 	Set gtmtypes("node_local",149,"len")=8
 	Set gtmtypes("node_local",149,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_jrec_other")=149
-	Set gtmtypes("node_local",150,"name")="node_local.gvstats_rec.n_jnl_extends"
-	Set gtmtypes("node_local",150,"off")=42660
+	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_tot_retries_3")=149
+	Set gtmtypes("node_local",150,"name")="node_local.gvstats_rec.n_tp_tot_retries_4"
+	Set gtmtypes("node_local",150,"off")=96060
 	Set gtmtypes("node_local",150,"len")=8
 	Set gtmtypes("node_local",150,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_jnl_extends")=150
-	Set gtmtypes("node_local",151,"name")="node_local.gvstats_rec.n_db_extends"
-	Set gtmtypes("node_local",151,"off")=42668
+	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_tot_retries_4")=150
+	Set gtmtypes("node_local",151,"name")="node_local.gvstats_rec.n_tp_cnflct_retries_0"
+	Set gtmtypes("node_local",151,"off")=96068
 	Set gtmtypes("node_local",151,"len")=8
 	Set gtmtypes("node_local",151,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_db_extends")=151
-	Set gtmtypes("node_local",152,"name")="node_local.gvstats_rec.n_crit_success"
-	Set gtmtypes("node_local",152,"off")=42676
+	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_cnflct_retries_0")=151
+	Set gtmtypes("node_local",152,"name")="node_local.gvstats_rec.n_tp_cnflct_retries_1"
+	Set gtmtypes("node_local",152,"off")=96076
 	Set gtmtypes("node_local",152,"len")=8
 	Set gtmtypes("node_local",152,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_crit_success")=152
-	Set gtmtypes("node_local",153,"name")="node_local.gvstats_rec.n_crits_in_epch"
-	Set gtmtypes("node_local",153,"off")=42684
+	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_cnflct_retries_1")=152
+	Set gtmtypes("node_local",153,"name")="node_local.gvstats_rec.n_tp_cnflct_retries_2"
+	Set gtmtypes("node_local",153,"off")=96084
 	Set gtmtypes("node_local",153,"len")=8
 	Set gtmtypes("node_local",153,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_crits_in_epch")=153
-	Set gtmtypes("node_local",154,"name")="node_local.gvstats_rec.sq_crit_failed"
-	Set gtmtypes("node_local",154,"off")=42692
+	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_cnflct_retries_2")=153
+	Set gtmtypes("node_local",154,"name")="node_local.gvstats_rec.n_tp_cnflct_retries_3"
+	Set gtmtypes("node_local",154,"off")=96092
 	Set gtmtypes("node_local",154,"len")=8
 	Set gtmtypes("node_local",154,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.sq_crit_failed")=154
-	Set gtmtypes("node_local",155,"name")="node_local.gvstats_rec.n_crit_failed"
-	Set gtmtypes("node_local",155,"off")=42700
+	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_cnflct_retries_3")=154
+	Set gtmtypes("node_local",155,"name")="node_local.gvstats_rec.n_tp_cnflct_retries_4"
+	Set gtmtypes("node_local",155,"off")=96100
 	Set gtmtypes("node_local",155,"len")=8
 	Set gtmtypes("node_local",155,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_crit_failed")=155
-	Set gtmtypes("node_local",156,"name")="node_local.gvstats_rec.sq_crit_que_slps"
-	Set gtmtypes("node_local",156,"off")=42708
+	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_cnflct_retries_4")=155
+	Set gtmtypes("node_local",156,"name")="node_local.gvstats_rec.n_ztrigger"
+	Set gtmtypes("node_local",156,"off")=96108
 	Set gtmtypes("node_local",156,"len")=8
 	Set gtmtypes("node_local",156,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.sq_crit_que_slps")=156
-	Set gtmtypes("node_local",157,"name")="node_local.gvstats_rec.n_crit_que_slps"
-	Set gtmtypes("node_local",157,"off")=42716
+	Set gtmtypfldindx("node_local","gvstats_rec.n_ztrigger")=156
+	Set gtmtypes("node_local",157,"name")="node_local.gvstats_rec.n_db_flush"
+	Set gtmtypes("node_local",157,"off")=96116
 	Set gtmtypes("node_local",157,"len")=8
 	Set gtmtypes("node_local",157,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_crit_que_slps")=157
-	Set gtmtypes("node_local",158,"name")="node_local.gvstats_rec.sq_crit_yields"
-	Set gtmtypes("node_local",158,"off")=42724
+	Set gtmtypfldindx("node_local","gvstats_rec.n_db_flush")=157
+	Set gtmtypes("node_local",158,"name")="node_local.gvstats_rec.n_db_fsync"
+	Set gtmtypes("node_local",158,"off")=96124
 	Set gtmtypes("node_local",158,"len")=8
 	Set gtmtypes("node_local",158,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.sq_crit_yields")=158
-	Set gtmtypes("node_local",159,"name")="node_local.gvstats_rec.n_crit_yields"
-	Set gtmtypes("node_local",159,"off")=42732
+	Set gtmtypfldindx("node_local","gvstats_rec.n_db_fsync")=158
+	Set gtmtypes("node_local",159,"name")="node_local.gvstats_rec.n_jnl_flush"
+	Set gtmtypes("node_local",159,"off")=96132
 	Set gtmtypes("node_local",159,"len")=8
 	Set gtmtypes("node_local",159,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_crit_yields")=159
-	Set gtmtypes("node_local",160,"name")="node_local.last_wcsflu_tn"
-	Set gtmtypes("node_local",160,"off")=42740
+	Set gtmtypfldindx("node_local","gvstats_rec.n_jnl_flush")=159
+	Set gtmtypes("node_local",160,"name")="node_local.gvstats_rec.n_jnl_fsync"
+	Set gtmtypes("node_local",160,"off")=96140
 	Set gtmtypes("node_local",160,"len")=8
 	Set gtmtypes("node_local",160,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","last_wcsflu_tn")=160
-	Set gtmtypes("node_local",161,"name")="node_local.encrypt_glo_buff_off"
-	Set gtmtypes("node_local",161,"off")=42748
-	Set gtmtypes("node_local",161,"len")=4
-	Set gtmtypes("node_local",161,"type")="intptr_t"
-	Set gtmtypfldindx("node_local","encrypt_glo_buff_off")=161
-	Set gtmtypes("node_local",162,"name")="node_local.snapshot_crit_latch"
-	Set gtmtypes("node_local",162,"off")=42752
+	Set gtmtypfldindx("node_local","gvstats_rec.n_jnl_fsync")=160
+	Set gtmtypes("node_local",161,"name")="node_local.gvstats_rec.n_jbuff_bytes"
+	Set gtmtypes("node_local",161,"off")=96148
+	Set gtmtypes("node_local",161,"len")=8
+	Set gtmtypes("node_local",161,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","gvstats_rec.n_jbuff_bytes")=161
+	Set gtmtypes("node_local",162,"name")="node_local.gvstats_rec.n_jfile_bytes"
+	Set gtmtypes("node_local",162,"off")=96156
 	Set gtmtypes("node_local",162,"len")=8
-	Set gtmtypes("node_local",162,"type")="global_latch_t"
-	Set gtmtypfldindx("node_local","snapshot_crit_latch")=162
-	Set gtmtypes("node_local",163,"name")="node_local.snapshot_crit_latch.u"
-	Set gtmtypes("node_local",163,"off")=42752
+	Set gtmtypes("node_local",162,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","gvstats_rec.n_jfile_bytes")=162
+	Set gtmtypes("node_local",163,"name")="node_local.gvstats_rec.n_jfile_writes"
+	Set gtmtypes("node_local",163,"off")=96164
 	Set gtmtypes("node_local",163,"len")=8
-	Set gtmtypes("node_local",163,"type")="union"
-	Set gtmtypfldindx("node_local","snapshot_crit_latch.u")=163
-	Set gtmtypes("node_local",164,"name")="node_local.snapshot_crit_latch.u.pid_imgcnt"
-	Set gtmtypes("node_local",164,"off")=42752
+	Set gtmtypes("node_local",163,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","gvstats_rec.n_jfile_writes")=163
+	Set gtmtypes("node_local",164,"name")="node_local.gvstats_rec.n_jrec_logical"
+	Set gtmtypes("node_local",164,"off")=96172
 	Set gtmtypes("node_local",164,"len")=8
 	Set gtmtypes("node_local",164,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","snapshot_crit_latch.u.pid_imgcnt")=164
-	Set gtmtypes("node_local",165,"name")="node_local.snapshot_crit_latch.u.parts"
-	Set gtmtypes("node_local",165,"off")=42752
+	Set gtmtypfldindx("node_local","gvstats_rec.n_jrec_logical")=164
+	Set gtmtypes("node_local",165,"name")="node_local.gvstats_rec.n_jrec_pblk"
+	Set gtmtypes("node_local",165,"off")=96180
 	Set gtmtypes("node_local",165,"len")=8
-	Set gtmtypes("node_local",165,"type")="struct"
-	Set gtmtypfldindx("node_local","snapshot_crit_latch.u.parts")=165
-	Set gtmtypes("node_local",166,"name")="node_local.snapshot_crit_latch.u.parts.latch_pid"
-	Set gtmtypes("node_local",166,"off")=42752
-	Set gtmtypes("node_local",166,"len")=4
-	Set gtmtypes("node_local",166,"type")="int"
-	Set gtmtypfldindx("node_local","snapshot_crit_latch.u.parts.latch_pid")=166
-	Set gtmtypes("node_local",167,"name")="node_local.snapshot_crit_latch.u.parts.latch_word"
-	Set gtmtypes("node_local",167,"off")=42756
-	Set gtmtypes("node_local",167,"len")=4
-	Set gtmtypes("node_local",167,"type")="int"
-	Set gtmtypfldindx("node_local","snapshot_crit_latch.u.parts.latch_word")=167
-	Set gtmtypes("node_local",168,"name")="node_local.ss_shmid"
-	Set gtmtypes("node_local",168,"off")=42760
-	Set gtmtypes("node_local",168,"len")=4
-	Set gtmtypes("node_local",168,"type")="long"
-	Set gtmtypfldindx("node_local","ss_shmid")=168
-	Set gtmtypes("node_local",169,"name")="node_local.ss_shmcycle"
-	Set gtmtypes("node_local",169,"off")=42764
-	Set gtmtypes("node_local",169,"len")=4
-	Set gtmtypes("node_local",169,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","ss_shmcycle")=169
-	Set gtmtypes("node_local",170,"name")="node_local.snapshot_in_prog"
-	Set gtmtypes("node_local",170,"off")=42768
-	Set gtmtypes("node_local",170,"len")=4
-	Set gtmtypes("node_local",170,"type")="boolean_t"
-	Set gtmtypfldindx("node_local","snapshot_in_prog")=170
-	Set gtmtypes("node_local",171,"name")="node_local.num_snapshots_in_effect"
-	Set gtmtypes("node_local",171,"off")=42772
-	Set gtmtypes("node_local",171,"len")=4
-	Set gtmtypes("node_local",171,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","num_snapshots_in_effect")=171
-	Set gtmtypes("node_local",172,"name")="node_local.wbox_test_seq_num"
-	Set gtmtypes("node_local",172,"off")=42776
-	Set gtmtypes("node_local",172,"len")=4
-	Set gtmtypes("node_local",172,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","wbox_test_seq_num")=172
-	Set gtmtypes("node_local",173,"name")="node_local.filler_8byte_align"
-	Set gtmtypes("node_local",173,"off")=42780
-	Set gtmtypes("node_local",173,"len")=4
-	Set gtmtypes("node_local",173,"type")="int"
-	Set gtmtypfldindx("node_local","filler_8byte_align")=173
-	Set gtmtypes("node_local",174,"name")="node_local.kip_pid_array"
-	Set gtmtypes("node_local",174,"off")=42784
-	Set gtmtypes("node_local",174,"len")=32
-	Set gtmtypes("node_local",174,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","kip_pid_array")=174
-	Set gtmtypes("node_local",174,"dim")=8
-	Set gtmtypes("node_local",175,"name")="node_local.sec_size"
-	Set gtmtypes("node_local",175,"off")=42816
+	Set gtmtypes("node_local",165,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","gvstats_rec.n_jrec_pblk")=165
+	Set gtmtypes("node_local",166,"name")="node_local.gvstats_rec.n_jrec_epoch_regular"
+	Set gtmtypes("node_local",166,"off")=96188
+	Set gtmtypes("node_local",166,"len")=8
+	Set gtmtypes("node_local",166,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","gvstats_rec.n_jrec_epoch_regular")=166
+	Set gtmtypes("node_local",167,"name")="node_local.gvstats_rec.n_jrec_epoch_idle"
+	Set gtmtypes("node_local",167,"off")=96196
+	Set gtmtypes("node_local",167,"len")=8
+	Set gtmtypes("node_local",167,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","gvstats_rec.n_jrec_epoch_idle")=167
+	Set gtmtypes("node_local",168,"name")="node_local.gvstats_rec.n_jrec_other"
+	Set gtmtypes("node_local",168,"off")=96204
+	Set gtmtypes("node_local",168,"len")=8
+	Set gtmtypes("node_local",168,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","gvstats_rec.n_jrec_other")=168
+	Set gtmtypes("node_local",169,"name")="node_local.gvstats_rec.n_jnl_extends"
+	Set gtmtypes("node_local",169,"off")=96212
+	Set gtmtypes("node_local",169,"len")=8
+	Set gtmtypes("node_local",169,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","gvstats_rec.n_jnl_extends")=169
+	Set gtmtypes("node_local",170,"name")="node_local.gvstats_rec.n_db_extends"
+	Set gtmtypes("node_local",170,"off")=96220
+	Set gtmtypes("node_local",170,"len")=8
+	Set gtmtypes("node_local",170,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","gvstats_rec.n_db_extends")=170
+	Set gtmtypes("node_local",171,"name")="node_local.gvstats_rec.n_crit_success"
+	Set gtmtypes("node_local",171,"off")=96228
+	Set gtmtypes("node_local",171,"len")=8
+	Set gtmtypes("node_local",171,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","gvstats_rec.n_crit_success")=171
+	Set gtmtypes("node_local",172,"name")="node_local.gvstats_rec.n_crits_in_epch"
+	Set gtmtypes("node_local",172,"off")=96236
+	Set gtmtypes("node_local",172,"len")=8
+	Set gtmtypes("node_local",172,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","gvstats_rec.n_crits_in_epch")=172
+	Set gtmtypes("node_local",173,"name")="node_local.gvstats_rec.sq_crit_failed"
+	Set gtmtypes("node_local",173,"off")=96244
+	Set gtmtypes("node_local",173,"len")=8
+	Set gtmtypes("node_local",173,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","gvstats_rec.sq_crit_failed")=173
+	Set gtmtypes("node_local",174,"name")="node_local.gvstats_rec.n_crit_failed"
+	Set gtmtypes("node_local",174,"off")=96252
+	Set gtmtypes("node_local",174,"len")=8
+	Set gtmtypes("node_local",174,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","gvstats_rec.n_crit_failed")=174
+	Set gtmtypes("node_local",175,"name")="node_local.gvstats_rec.sq_crit_que_slps"
+	Set gtmtypes("node_local",175,"off")=96260
 	Set gtmtypes("node_local",175,"len")=8
 	Set gtmtypes("node_local",175,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","sec_size")=175
-	Set gtmtypes("node_local",176,"name")="node_local.jnlpool_shmid"
-	Set gtmtypes("node_local",176,"off")=42824
-	Set gtmtypes("node_local",176,"len")=4
-	Set gtmtypes("node_local",176,"type")="int"
-	Set gtmtypfldindx("node_local","jnlpool_shmid")=176
-	Set gtmtypes("node_local",177,"name")="node_local.lockspacefull_logged"
-	Set gtmtypes("node_local",177,"off")=42828
-	Set gtmtypes("node_local",177,"len")=4
-	Set gtmtypes("node_local",177,"type")="boolean_t"
-	Set gtmtypfldindx("node_local","lockspacefull_logged")=177
-	Set gtmtypes("node_local",178,"name")="node_local.trunc_pid"
-	Set gtmtypes("node_local",178,"off")=42832
-	Set gtmtypes("node_local",178,"len")=4
-	Set gtmtypes("node_local",178,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","trunc_pid")=178
-	Set gtmtypes("node_local",179,"name")="node_local.highest_lbm_with_busy_blk"
-	Set gtmtypes("node_local",179,"off")=42836
-	Set gtmtypes("node_local",179,"len")=4
-	Set gtmtypes("node_local",179,"type")="int"
-	Set gtmtypfldindx("node_local","highest_lbm_with_busy_blk")=179
-	Set gtmtypes("node_local",180,"name")="node_local.ftok_ops_array"
-	Set gtmtypes("node_local",180,"off")=42840
-	Set gtmtypes("node_local",180,"len")=8192
-	Set gtmtypes("node_local",180,"type")="ftokhist"
-	Set gtmtypfldindx("node_local","ftok_ops_array")=180
-	Set gtmtypes("node_local",180,"dim")=512
-	Set gtmtypes("node_local",181,"name")="node_local.ftok_ops_array[0].ftok_oper"
-	Set gtmtypes("node_local",181,"off")=42840
-	Set gtmtypes("node_local",181,"len")=4
-	Set gtmtypes("node_local",181,"type")="int"
-	Set gtmtypfldindx("node_local","ftok_ops_array[0].ftok_oper")=181
-	Set gtmtypes("node_local",182,"name")="node_local.ftok_ops_array[0].process_id"
-	Set gtmtypes("node_local",182,"off")=42844
+	Set gtmtypfldindx("node_local","gvstats_rec.sq_crit_que_slps")=175
+	Set gtmtypes("node_local",176,"name")="node_local.gvstats_rec.n_crit_que_slps"
+	Set gtmtypes("node_local",176,"off")=96268
+	Set gtmtypes("node_local",176,"len")=8
+	Set gtmtypes("node_local",176,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","gvstats_rec.n_crit_que_slps")=176
+	Set gtmtypes("node_local",177,"name")="node_local.gvstats_rec.sq_crit_yields"
+	Set gtmtypes("node_local",177,"off")=96276
+	Set gtmtypes("node_local",177,"len")=8
+	Set gtmtypes("node_local",177,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","gvstats_rec.sq_crit_yields")=177
+	Set gtmtypes("node_local",178,"name")="node_local.gvstats_rec.n_crit_yields"
+	Set gtmtypes("node_local",178,"off")=96284
+	Set gtmtypes("node_local",178,"len")=8
+	Set gtmtypes("node_local",178,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","gvstats_rec.n_crit_yields")=178
+	Set gtmtypes("node_local",179,"name")="node_local.gvstats_rec.n_clean2dirty"
+	Set gtmtypes("node_local",179,"off")=96292
+	Set gtmtypes("node_local",179,"len")=8
+	Set gtmtypes("node_local",179,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","gvstats_rec.n_clean2dirty")=179
+	Set gtmtypes("node_local",180,"name")="node_local.last_wcsflu_tn"
+	Set gtmtypes("node_local",180,"off")=96300
+	Set gtmtypes("node_local",180,"len")=8
+	Set gtmtypes("node_local",180,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","last_wcsflu_tn")=180
+	Set gtmtypes("node_local",181,"name")="node_local.last_wcs_recover_tn"
+	Set gtmtypes("node_local",181,"off")=96308
+	Set gtmtypes("node_local",181,"len")=8
+	Set gtmtypes("node_local",181,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","last_wcs_recover_tn")=181
+	Set gtmtypes("node_local",182,"name")="node_local.encrypt_glo_buff_off"
+	Set gtmtypes("node_local",182,"off")=96316
 	Set gtmtypes("node_local",182,"len")=4
-	Set gtmtypes("node_local",182,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","ftok_ops_array[0].process_id")=182
-	Set gtmtypes("node_local",183,"name")="node_local.ftok_ops_array[0].cr_tn"
-	Set gtmtypes("node_local",183,"off")=42848
+	Set gtmtypes("node_local",182,"type")="intptr_t"
+	Set gtmtypfldindx("node_local","encrypt_glo_buff_off")=182
+	Set gtmtypes("node_local",183,"name")="node_local.snapshot_crit_latch"
+	Set gtmtypes("node_local",183,"off")=96320
 	Set gtmtypes("node_local",183,"len")=8
-	Set gtmtypes("node_local",183,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","ftok_ops_array[0].cr_tn")=183
-	Set gtmtypes("node_local",184,"name")="node_local.root_search_cycle"
-	Set gtmtypes("node_local",184,"off")=51032
-	Set gtmtypes("node_local",184,"len")=4
-	Set gtmtypes("node_local",184,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","root_search_cycle")=184
-	Set gtmtypes("node_local",185,"name")="node_local.onln_rlbk_cycle"
-	Set gtmtypes("node_local",185,"off")=51036
-	Set gtmtypes("node_local",185,"len")=4
-	Set gtmtypes("node_local",185,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","onln_rlbk_cycle")=185
-	Set gtmtypes("node_local",186,"name")="node_local.db_onln_rlbkd_cycle"
-	Set gtmtypes("node_local",186,"off")=51040
-	Set gtmtypes("node_local",186,"len")=4
-	Set gtmtypes("node_local",186,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","db_onln_rlbkd_cycle")=186
-	Set gtmtypes("node_local",187,"name")="node_local.onln_rlbk_pid"
-	Set gtmtypes("node_local",187,"off")=51044
+	Set gtmtypes("node_local",183,"type")="global_latch_t"
+	Set gtmtypfldindx("node_local","snapshot_crit_latch")=183
+	Set gtmtypes("node_local",184,"name")="node_local.snapshot_crit_latch.u"
+	Set gtmtypes("node_local",184,"off")=96320
+	Set gtmtypes("node_local",184,"len")=8
+	Set gtmtypes("node_local",184,"type")="union"
+	Set gtmtypfldindx("node_local","snapshot_crit_latch.u")=184
+	Set gtmtypes("node_local",185,"name")="node_local.snapshot_crit_latch.u.pid_imgcnt"
+	Set gtmtypes("node_local",185,"off")=96320
+	Set gtmtypes("node_local",185,"len")=8
+	Set gtmtypes("node_local",185,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","snapshot_crit_latch.u.pid_imgcnt")=185
+	Set gtmtypes("node_local",186,"name")="node_local.snapshot_crit_latch.u.parts"
+	Set gtmtypes("node_local",186,"off")=96320
+	Set gtmtypes("node_local",186,"len")=8
+	Set gtmtypes("node_local",186,"type")="struct"
+	Set gtmtypfldindx("node_local","snapshot_crit_latch.u.parts")=186
+	Set gtmtypes("node_local",187,"name")="node_local.snapshot_crit_latch.u.parts.latch_pid"
+	Set gtmtypes("node_local",187,"off")=96320
 	Set gtmtypes("node_local",187,"len")=4
-	Set gtmtypes("node_local",187,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","onln_rlbk_pid")=187
-	Set gtmtypes("node_local",188,"name")="node_local.dbrndwn_ftok_skip"
-	Set gtmtypes("node_local",188,"off")=51048
+	Set gtmtypes("node_local",187,"type")="int"
+	Set gtmtypfldindx("node_local","snapshot_crit_latch.u.parts.latch_pid")=187
+	Set gtmtypes("node_local",188,"name")="node_local.snapshot_crit_latch.u.parts.latch_word"
+	Set gtmtypes("node_local",188,"off")=96324
 	Set gtmtypes("node_local",188,"len")=4
-	Set gtmtypes("node_local",188,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","dbrndwn_ftok_skip")=188
-	Set gtmtypes("node_local",189,"name")="node_local.dbrndwn_access_skip"
-	Set gtmtypes("node_local",189,"off")=51052
+	Set gtmtypes("node_local",188,"type")="int"
+	Set gtmtypfldindx("node_local","snapshot_crit_latch.u.parts.latch_word")=188
+	Set gtmtypes("node_local",189,"name")="node_local.ss_shmid"
+	Set gtmtypes("node_local",189,"off")=96328
 	Set gtmtypes("node_local",189,"len")=4
-	Set gtmtypes("node_local",189,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","dbrndwn_access_skip")=189
-	Set gtmtypes("node_local",190,"name")="node_local.fastinteg_in_prog"
-	Set gtmtypes("node_local",190,"off")=51056
+	Set gtmtypes("node_local",189,"type")="long"
+	Set gtmtypfldindx("node_local","ss_shmid")=189
+	Set gtmtypes("node_local",190,"name")="node_local.ss_shmcycle"
+	Set gtmtypes("node_local",190,"off")=96332
 	Set gtmtypes("node_local",190,"len")=4
-	Set gtmtypes("node_local",190,"type")="boolean_t"
-	Set gtmtypfldindx("node_local","fastinteg_in_prog")=190
-	Set gtmtypes("node_local",191,"name")="node_local.wtstart_errcnt"
-	Set gtmtypes("node_local",191,"off")=51060
+	Set gtmtypes("node_local",190,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","ss_shmcycle")=190
+	Set gtmtypes("node_local",191,"name")="node_local.snapshot_in_prog"
+	Set gtmtypes("node_local",191,"off")=96336
 	Set gtmtypes("node_local",191,"len")=4
-	Set gtmtypes("node_local",191,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","wtstart_errcnt")=191
-	Set gtmtypes("node_local",192,"name")="node_local.fake_db_enospc"
-	Set gtmtypes("node_local",192,"off")=51064
+	Set gtmtypes("node_local",191,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","snapshot_in_prog")=191
+	Set gtmtypes("node_local",192,"name")="node_local.num_snapshots_in_effect"
+	Set gtmtypes("node_local",192,"off")=96340
 	Set gtmtypes("node_local",192,"len")=4
-	Set gtmtypes("node_local",192,"type")="boolean_t"
-	Set gtmtypfldindx("node_local","fake_db_enospc")=192
-	Set gtmtypes("node_local",193,"name")="node_local.fake_jnl_enospc"
-	Set gtmtypes("node_local",193,"off")=51068
+	Set gtmtypes("node_local",192,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","num_snapshots_in_effect")=192
+	Set gtmtypes("node_local",193,"name")="node_local.wbox_test_seq_num"
+	Set gtmtypes("node_local",193,"off")=96344
 	Set gtmtypes("node_local",193,"len")=4
-	Set gtmtypes("node_local",193,"type")="boolean_t"
-	Set gtmtypfldindx("node_local","fake_jnl_enospc")=193
-	Set gtmtypes("node_local",194,"name")="node_local.doing_epoch"
-	Set gtmtypes("node_local",194,"off")=51072
+	Set gtmtypes("node_local",193,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","wbox_test_seq_num")=193
+	Set gtmtypes("node_local",194,"name")="node_local.filler_8byte_align3"
+	Set gtmtypes("node_local",194,"off")=96348
 	Set gtmtypes("node_local",194,"len")=4
-	Set gtmtypes("node_local",194,"type")="boolean_t"
-	Set gtmtypfldindx("node_local","doing_epoch")=194
-	Set gtmtypes("node_local",195,"name")="node_local.epoch_taper_start_dbuffs"
-	Set gtmtypes("node_local",195,"off")=51076
-	Set gtmtypes("node_local",195,"len")=4
+	Set gtmtypes("node_local",194,"type")="int"
+	Set gtmtypfldindx("node_local","filler_8byte_align3")=194
+	Set gtmtypes("node_local",195,"name")="node_local.kip_pid_array"
+	Set gtmtypes("node_local",195,"off")=96352
+	Set gtmtypes("node_local",195,"len")=32
 	Set gtmtypes("node_local",195,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","epoch_taper_start_dbuffs")=195
-	Set gtmtypes("node_local",196,"name")="node_local.epoch_taper_need_fsync"
-	Set gtmtypes("node_local",196,"off")=51080
-	Set gtmtypes("node_local",196,"len")=4
-	Set gtmtypes("node_local",196,"type")="boolean_t"
-	Set gtmtypfldindx("node_local","epoch_taper_need_fsync")=196
-	Set gtmtypes("node_local",197,"name")="node_local.wt_pid_array"
-	Set gtmtypes("node_local",197,"off")=51084
-	Set gtmtypes("node_local",197,"len")=16
-	Set gtmtypes("node_local",197,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","wt_pid_array")=197
-	Set gtmtypes("node_local",197,"dim")=4
-	Set gtmtypes("node_local",198,"name")="node_local.reorg_encrypt_pid"
-	Set gtmtypes("node_local",198,"off")=51100
+	Set gtmtypfldindx("node_local","kip_pid_array")=195
+	Set gtmtypes("node_local",195,"dim")=8
+	Set gtmtypes("node_local",196,"name")="node_local.sec_size"
+	Set gtmtypes("node_local",196,"off")=96384
+	Set gtmtypes("node_local",196,"len")=8
+	Set gtmtypes("node_local",196,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","sec_size")=196
+	Set gtmtypes("node_local",197,"name")="node_local.jnlpool_shmid"
+	Set gtmtypes("node_local",197,"off")=96392
+	Set gtmtypes("node_local",197,"len")=4
+	Set gtmtypes("node_local",197,"type")="int"
+	Set gtmtypfldindx("node_local","jnlpool_shmid")=197
+	Set gtmtypes("node_local",198,"name")="node_local.lockspacefull_logged"
+	Set gtmtypes("node_local",198,"off")=96396
 	Set gtmtypes("node_local",198,"len")=4
-	Set gtmtypes("node_local",198,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","reorg_encrypt_pid")=198
-	Set gtmtypes("node_local",199,"name")="node_local.reorg_encrypt_cycle"
-	Set gtmtypes("node_local",199,"off")=51104
+	Set gtmtypes("node_local",198,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","lockspacefull_logged")=198
+	Set gtmtypes("node_local",199,"name")="node_local.trunc_pid"
+	Set gtmtypes("node_local",199,"off")=96400
 	Set gtmtypes("node_local",199,"len")=4
 	Set gtmtypes("node_local",199,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","reorg_encrypt_cycle")=199
-	Set gtmtypes("node_local",200,"name")="node_local.mupip_extract_count"
-	Set gtmtypes("node_local",200,"off")=51108
+	Set gtmtypfldindx("node_local","trunc_pid")=199
+	Set gtmtypes("node_local",200,"name")="node_local.highest_lbm_with_busy_blk"
+	Set gtmtypes("node_local",200,"off")=96404
 	Set gtmtypes("node_local",200,"len")=4
-	Set gtmtypes("node_local",200,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","mupip_extract_count")=200
-	Set gtmtypes("node_local",201,"name")="node_local.saved_acc_meth"
-	Set gtmtypes("node_local",201,"off")=51112
-	Set gtmtypes("node_local",201,"len")=4
-	Set gtmtypes("node_local",201,"type")="int"
-	Set gtmtypfldindx("node_local","saved_acc_meth")=201
-	Set gtmtypes("node_local",202,"name")="node_local.saved_blk_size"
-	Set gtmtypes("node_local",202,"off")=51116
+	Set gtmtypes("node_local",200,"type")="int"
+	Set gtmtypfldindx("node_local","highest_lbm_with_busy_blk")=200
+	Set gtmtypes("node_local",201,"name")="node_local.ftok_ops_array"
+	Set gtmtypes("node_local",201,"off")=96408
+	Set gtmtypes("node_local",201,"len")=8192
+	Set gtmtypes("node_local",201,"type")="ftokhist"
+	Set gtmtypfldindx("node_local","ftok_ops_array")=201
+	Set gtmtypes("node_local",201,"dim")=512
+	Set gtmtypes("node_local",202,"name")="node_local.ftok_ops_array[0].ftok_oper"
+	Set gtmtypes("node_local",202,"off")=96408
 	Set gtmtypes("node_local",202,"len")=4
 	Set gtmtypes("node_local",202,"type")="int"
-	Set gtmtypfldindx("node_local","saved_blk_size")=202
-	Set gtmtypes("node_local",203,"name")="node_local.saved_lock_space_size"
-	Set gtmtypes("node_local",203,"off")=51120
+	Set gtmtypfldindx("node_local","ftok_ops_array[0].ftok_oper")=202
+	Set gtmtypes("node_local",203,"name")="node_local.ftok_ops_array[0].process_id"
+	Set gtmtypes("node_local",203,"off")=96412
 	Set gtmtypes("node_local",203,"len")=4
 	Set gtmtypes("node_local",203,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","saved_lock_space_size")=203
-	Set gtmtypes("node_local",204,"name")="node_local.saved_jnl_buffer_size"
-	Set gtmtypes("node_local",204,"off")=51124
-	Set gtmtypes("node_local",204,"len")=4
-	Set gtmtypes("node_local",204,"type")="int"
-	Set gtmtypfldindx("node_local","saved_jnl_buffer_size")=204
-	Set gtmtypes("node_local",205,"name")="node_local.lastwriterbypas_msg_issued"
-	Set gtmtypes("node_local",205,"off")=51128
+	Set gtmtypfldindx("node_local","ftok_ops_array[0].process_id")=203
+	Set gtmtypes("node_local",204,"name")="node_local.ftok_ops_array[0].cr_tn"
+	Set gtmtypes("node_local",204,"off")=96416
+	Set gtmtypes("node_local",204,"len")=8
+	Set gtmtypes("node_local",204,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","ftok_ops_array[0].cr_tn")=204
+	Set gtmtypes("node_local",205,"name")="node_local.root_search_cycle"
+	Set gtmtypes("node_local",205,"off")=104600
 	Set gtmtypes("node_local",205,"len")=4
-	Set gtmtypes("node_local",205,"type")="boolean_t"
-	Set gtmtypfldindx("node_local","lastwriterbypas_msg_issued")=205
-	Set gtmtypes("node_local",206,"name")="node_local.first_writer_seen"
-	Set gtmtypes("node_local",206,"off")=51132
+	Set gtmtypes("node_local",205,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","root_search_cycle")=205
+	Set gtmtypes("node_local",206,"name")="node_local.onln_rlbk_cycle"
+	Set gtmtypes("node_local",206,"off")=104604
 	Set gtmtypes("node_local",206,"len")=4
-	Set gtmtypes("node_local",206,"type")="boolean_t"
-	Set gtmtypfldindx("node_local","first_writer_seen")=206
-	Set gtmtypes("node_local",207,"name")="node_local.first_nonbypas_writer_seen"
-	Set gtmtypes("node_local",207,"off")=51136
+	Set gtmtypes("node_local",206,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","onln_rlbk_cycle")=206
+	Set gtmtypes("node_local",207,"name")="node_local.db_onln_rlbkd_cycle"
+	Set gtmtypes("node_local",207,"off")=104608
 	Set gtmtypes("node_local",207,"len")=4
-	Set gtmtypes("node_local",207,"type")="boolean_t"
-	Set gtmtypfldindx("node_local","first_nonbypas_writer_seen")=207
-	Set gtmtypes("node_local",208,"name")="node_local.ftok_counter_halted"
-	Set gtmtypes("node_local",208,"off")=51140
+	Set gtmtypes("node_local",207,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","db_onln_rlbkd_cycle")=207
+	Set gtmtypes("node_local",208,"name")="node_local.onln_rlbk_pid"
+	Set gtmtypes("node_local",208,"off")=104612
 	Set gtmtypes("node_local",208,"len")=4
-	Set gtmtypes("node_local",208,"type")="boolean_t"
-	Set gtmtypfldindx("node_local","ftok_counter_halted")=208
-	Set gtmtypes("node_local",209,"name")="node_local.access_counter_halted"
-	Set gtmtypes("node_local",209,"off")=51144
+	Set gtmtypes("node_local",208,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","onln_rlbk_pid")=208
+	Set gtmtypes("node_local",209,"name")="node_local.dbrndwn_ftok_skip"
+	Set gtmtypes("node_local",209,"off")=104616
 	Set gtmtypes("node_local",209,"len")=4
-	Set gtmtypes("node_local",209,"type")="boolean_t"
-	Set gtmtypfldindx("node_local","access_counter_halted")=209
-	Set gtmtypes("node_local",210,"name")="node_local.filler_8byte_align1"
-	Set gtmtypes("node_local",210,"off")=51148
+	Set gtmtypes("node_local",209,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","dbrndwn_ftok_skip")=209
+	Set gtmtypes("node_local",210,"name")="node_local.dbrndwn_access_skip"
+	Set gtmtypes("node_local",210,"off")=104620
 	Set gtmtypes("node_local",210,"len")=4
 	Set gtmtypes("node_local",210,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","filler_8byte_align1")=210
+	Set gtmtypfldindx("node_local","dbrndwn_access_skip")=210
+	Set gtmtypes("node_local",211,"name")="node_local.fastinteg_in_prog"
+	Set gtmtypes("node_local",211,"off")=104624
+	Set gtmtypes("node_local",211,"len")=4
+	Set gtmtypes("node_local",211,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","fastinteg_in_prog")=211
+	Set gtmtypes("node_local",212,"name")="node_local.wtstart_errcnt"
+	Set gtmtypes("node_local",212,"off")=104628
+	Set gtmtypes("node_local",212,"len")=4
+	Set gtmtypes("node_local",212,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","wtstart_errcnt")=212
+	Set gtmtypes("node_local",213,"name")="node_local.fake_db_enospc"
+	Set gtmtypes("node_local",213,"off")=104632
+	Set gtmtypes("node_local",213,"len")=4
+	Set gtmtypes("node_local",213,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","fake_db_enospc")=213
+	Set gtmtypes("node_local",214,"name")="node_local.fake_jnl_enospc"
+	Set gtmtypes("node_local",214,"off")=104636
+	Set gtmtypes("node_local",214,"len")=4
+	Set gtmtypes("node_local",214,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","fake_jnl_enospc")=214
+	Set gtmtypes("node_local",215,"name")="node_local.doing_epoch"
+	Set gtmtypes("node_local",215,"off")=104640
+	Set gtmtypes("node_local",215,"len")=4
+	Set gtmtypes("node_local",215,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","doing_epoch")=215
+	Set gtmtypes("node_local",216,"name")="node_local.epoch_taper_start_dbuffs"
+	Set gtmtypes("node_local",216,"off")=104644
+	Set gtmtypes("node_local",216,"len")=4
+	Set gtmtypes("node_local",216,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","epoch_taper_start_dbuffs")=216
+	Set gtmtypes("node_local",217,"name")="node_local.epoch_taper_need_fsync"
+	Set gtmtypes("node_local",217,"off")=104648
+	Set gtmtypes("node_local",217,"len")=4
+	Set gtmtypes("node_local",217,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","epoch_taper_need_fsync")=217
+	Set gtmtypes("node_local",218,"name")="node_local.wt_pid_array"
+	Set gtmtypes("node_local",218,"off")=104652
+	Set gtmtypes("node_local",218,"len")=16
+	Set gtmtypes("node_local",218,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","wt_pid_array")=218
+	Set gtmtypes("node_local",218,"dim")=4
+	Set gtmtypes("node_local",219,"name")="node_local.reorg_encrypt_pid"
+	Set gtmtypes("node_local",219,"off")=104668
+	Set gtmtypes("node_local",219,"len")=4
+	Set gtmtypes("node_local",219,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","reorg_encrypt_pid")=219
+	Set gtmtypes("node_local",220,"name")="node_local.reorg_encrypt_cycle"
+	Set gtmtypes("node_local",220,"off")=104672
+	Set gtmtypes("node_local",220,"len")=4
+	Set gtmtypes("node_local",220,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","reorg_encrypt_cycle")=220
+	Set gtmtypes("node_local",221,"name")="node_local.mupip_extract_count"
+	Set gtmtypes("node_local",221,"off")=104676
+	Set gtmtypes("node_local",221,"len")=4
+	Set gtmtypes("node_local",221,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","mupip_extract_count")=221
+	Set gtmtypes("node_local",222,"name")="node_local.saved_acc_meth"
+	Set gtmtypes("node_local",222,"off")=104680
+	Set gtmtypes("node_local",222,"len")=4
+	Set gtmtypes("node_local",222,"type")="int"
+	Set gtmtypfldindx("node_local","saved_acc_meth")=222
+	Set gtmtypes("node_local",223,"name")="node_local.saved_blk_size"
+	Set gtmtypes("node_local",223,"off")=104684
+	Set gtmtypes("node_local",223,"len")=4
+	Set gtmtypes("node_local",223,"type")="int"
+	Set gtmtypfldindx("node_local","saved_blk_size")=223
+	Set gtmtypes("node_local",224,"name")="node_local.saved_lock_space_size"
+	Set gtmtypes("node_local",224,"off")=104688
+	Set gtmtypes("node_local",224,"len")=4
+	Set gtmtypes("node_local",224,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","saved_lock_space_size")=224
+	Set gtmtypes("node_local",225,"name")="node_local.saved_jnl_buffer_size"
+	Set gtmtypes("node_local",225,"off")=104692
+	Set gtmtypes("node_local",225,"len")=4
+	Set gtmtypes("node_local",225,"type")="int"
+	Set gtmtypfldindx("node_local","saved_jnl_buffer_size")=225
+	Set gtmtypes("node_local",226,"name")="node_local.lastwriterbypas_msg_issued"
+	Set gtmtypes("node_local",226,"off")=104696
+	Set gtmtypes("node_local",226,"len")=4
+	Set gtmtypes("node_local",226,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","lastwriterbypas_msg_issued")=226
+	Set gtmtypes("node_local",227,"name")="node_local.first_writer_seen"
+	Set gtmtypes("node_local",227,"off")=104700
+	Set gtmtypes("node_local",227,"len")=4
+	Set gtmtypes("node_local",227,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","first_writer_seen")=227
+	Set gtmtypes("node_local",228,"name")="node_local.first_nonbypas_writer_seen"
+	Set gtmtypes("node_local",228,"off")=104704
+	Set gtmtypes("node_local",228,"len")=4
+	Set gtmtypes("node_local",228,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","first_nonbypas_writer_seen")=228
+	Set gtmtypes("node_local",229,"name")="node_local.ftok_counter_halted"
+	Set gtmtypes("node_local",229,"off")=104708
+	Set gtmtypes("node_local",229,"len")=4
+	Set gtmtypes("node_local",229,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","ftok_counter_halted")=229
+	Set gtmtypes("node_local",230,"name")="node_local.access_counter_halted"
+	Set gtmtypes("node_local",230,"off")=104712
+	Set gtmtypes("node_local",230,"len")=4
+	Set gtmtypes("node_local",230,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","access_counter_halted")=230
+	Set gtmtypes("node_local",231,"name")="node_local.statsdb_created"
+	Set gtmtypes("node_local",231,"off")=104716
+	Set gtmtypes("node_local",231,"len")=4
+	Set gtmtypes("node_local",231,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","statsdb_created")=231
+	Set gtmtypes("node_local",232,"name")="node_local.statsdb_fname_len"
+	Set gtmtypes("node_local",232,"off")=104720
+	Set gtmtypes("node_local",232,"len")=4
+	Set gtmtypes("node_local",232,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","statsdb_fname_len")=232
+	Set gtmtypes("node_local",233,"name")="node_local.statsdb_rundown_clean"
+	Set gtmtypes("node_local",233,"off")=104724
+	Set gtmtypes("node_local",233,"len")=4
+	Set gtmtypes("node_local",233,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","statsdb_rundown_clean")=233
+	Set gtmtypes("node_local",234,"name")="node_local.freeze_latch"
+	Set gtmtypes("node_local",234,"off")=104728
+	Set gtmtypes("node_local",234,"len")=8
+	Set gtmtypes("node_local",234,"type")="global_latch_t"
+	Set gtmtypfldindx("node_local","freeze_latch")=234
+	Set gtmtypes("node_local",235,"name")="node_local.freeze_latch.u"
+	Set gtmtypes("node_local",235,"off")=104728
+	Set gtmtypes("node_local",235,"len")=8
+	Set gtmtypes("node_local",235,"type")="union"
+	Set gtmtypfldindx("node_local","freeze_latch.u")=235
+	Set gtmtypes("node_local",236,"name")="node_local.freeze_latch.u.pid_imgcnt"
+	Set gtmtypes("node_local",236,"off")=104728
+	Set gtmtypes("node_local",236,"len")=8
+	Set gtmtypes("node_local",236,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","freeze_latch.u.pid_imgcnt")=236
+	Set gtmtypes("node_local",237,"name")="node_local.freeze_latch.u.parts"
+	Set gtmtypes("node_local",237,"off")=104728
+	Set gtmtypes("node_local",237,"len")=8
+	Set gtmtypes("node_local",237,"type")="struct"
+	Set gtmtypfldindx("node_local","freeze_latch.u.parts")=237
+	Set gtmtypes("node_local",238,"name")="node_local.freeze_latch.u.parts.latch_pid"
+	Set gtmtypes("node_local",238,"off")=104728
+	Set gtmtypes("node_local",238,"len")=4
+	Set gtmtypes("node_local",238,"type")="int"
+	Set gtmtypfldindx("node_local","freeze_latch.u.parts.latch_pid")=238
+	Set gtmtypes("node_local",239,"name")="node_local.freeze_latch.u.parts.latch_word"
+	Set gtmtypes("node_local",239,"off")=104732
+	Set gtmtypes("node_local",239,"len")=4
+	Set gtmtypes("node_local",239,"type")="int"
+	Set gtmtypfldindx("node_local","freeze_latch.u.parts.latch_word")=239
+	Set gtmtypes("node_local",240,"name")="node_local.wcs_buffs_freed"
+	Set gtmtypes("node_local",240,"off")=104736
+	Set gtmtypes("node_local",240,"len")=8
+	Set gtmtypes("node_local",240,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","wcs_buffs_freed")=240
+	Set gtmtypes("node_local",241,"name")="node_local.dskspace_next_fire"
+	Set gtmtypes("node_local",241,"off")=104744
+	Set gtmtypes("node_local",241,"len")=8
+	Set gtmtypes("node_local",241,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","dskspace_next_fire")=241
+	Set gtmtypes("node_local",242,"name")="node_local.lock_crit"
+	Set gtmtypes("node_local",242,"off")=104752
+	Set gtmtypes("node_local",242,"len")=8
+	Set gtmtypes("node_local",242,"type")="global_latch_t"
+	Set gtmtypfldindx("node_local","lock_crit")=242
+	Set gtmtypes("node_local",243,"name")="node_local.lock_crit.u"
+	Set gtmtypes("node_local",243,"off")=104752
+	Set gtmtypes("node_local",243,"len")=8
+	Set gtmtypes("node_local",243,"type")="union"
+	Set gtmtypfldindx("node_local","lock_crit.u")=243
+	Set gtmtypes("node_local",244,"name")="node_local.lock_crit.u.pid_imgcnt"
+	Set gtmtypes("node_local",244,"off")=104752
+	Set gtmtypes("node_local",244,"len")=8
+	Set gtmtypes("node_local",244,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","lock_crit.u.pid_imgcnt")=244
+	Set gtmtypes("node_local",245,"name")="node_local.lock_crit.u.parts"
+	Set gtmtypes("node_local",245,"off")=104752
+	Set gtmtypes("node_local",245,"len")=8
+	Set gtmtypes("node_local",245,"type")="struct"
+	Set gtmtypfldindx("node_local","lock_crit.u.parts")=245
+	Set gtmtypes("node_local",246,"name")="node_local.lock_crit.u.parts.latch_pid"
+	Set gtmtypes("node_local",246,"off")=104752
+	Set gtmtypes("node_local",246,"len")=4
+	Set gtmtypes("node_local",246,"type")="int"
+	Set gtmtypfldindx("node_local","lock_crit.u.parts.latch_pid")=246
+	Set gtmtypes("node_local",247,"name")="node_local.lock_crit.u.parts.latch_word"
+	Set gtmtypes("node_local",247,"off")=104756
+	Set gtmtypes("node_local",247,"len")=4
+	Set gtmtypes("node_local",247,"type")="int"
+	Set gtmtypfldindx("node_local","lock_crit.u.parts.latch_word")=247
+	Set gtmtypes("node_local",248,"name")="node_local.tp_hint"
+	Set gtmtypes("node_local",248,"off")=104760
+	Set gtmtypes("node_local",248,"len")=4
+	Set gtmtypes("node_local",248,"type")="int"
+	Set gtmtypfldindx("node_local","tp_hint")=248
+	Set gtmtypes("node_local",249,"name")="node_local.filler_8byte_align6"
+	Set gtmtypes("node_local",249,"off")=104764
+	Set gtmtypes("node_local",249,"len")=4
+	Set gtmtypes("node_local",249,"type")="int"
+	Set gtmtypfldindx("node_local","filler_8byte_align6")=249
 	;
 	Set gtmtypes("noisolation_element")="struct"
 	Set gtmtypes("noisolation_element",0)=2
@@ -17867,11 +18243,11 @@ Init
 	;
 	Set gtmtypes("octabstruct")="struct"
 	Set gtmtypes("octabstruct",0)=1
-	Set gtmtypes("octabstruct","len")=2
+	Set gtmtypes("octabstruct","len")=4
 	Set gtmtypes("octabstruct",1,"name")="octabstruct.octype"
 	Set gtmtypes("octabstruct",1,"off")=0
-	Set gtmtypes("octabstruct",1,"len")=2
-	Set gtmtypes("octabstruct",1,"type")="unsigned-short"
+	Set gtmtypes("octabstruct",1,"len")=4
+	Set gtmtypes("octabstruct",1,"type")="unsigned-int"
 	Set gtmtypfldindx("octabstruct","octype")=1
 	;
 	Set gtmtypes("omi_cl_stat")="struct"
@@ -22492,8 +22868,8 @@ Init
 	Set gtmtypfldindx("redo_root_search_context","gv_currkey")=14
 	;
 	Set gtmtypes("reg_ctl_list")="struct"
-	Set gtmtypes("reg_ctl_list",0)=59
-	Set gtmtypes("reg_ctl_list","len")=304
+	Set gtmtypes("reg_ctl_list",0)=63
+	Set gtmtypes("reg_ctl_list","len")=316
 	Set gtmtypes("reg_ctl_list",1,"name")="reg_ctl_list.db_tn"
 	Set gtmtypes("reg_ctl_list",1,"off")=0
 	Set gtmtypes("reg_ctl_list",1,"len")=8
@@ -22797,6 +23173,26 @@ Init
 	Set gtmtypes("reg_ctl_list",59,"type")="boolean_t"
 	Set gtmtypfldindx("reg_ctl_list","last_jext_logical_rec")=59
 	Set gtmtypes("reg_ctl_list",59,"dim")=3
+	Set gtmtypes("reg_ctl_list",60,"name")="reg_ctl_list.dio_buff"
+	Set gtmtypes("reg_ctl_list",60,"off")=304
+	Set gtmtypes("reg_ctl_list",60,"len")=12
+	Set gtmtypes("reg_ctl_list",60,"type")="dio_buff_t"
+	Set gtmtypfldindx("reg_ctl_list","dio_buff")=60
+	Set gtmtypes("reg_ctl_list",61,"name")="reg_ctl_list.dio_buff.unaligned_size"
+	Set gtmtypes("reg_ctl_list",61,"off")=304
+	Set gtmtypes("reg_ctl_list",61,"len")=4
+	Set gtmtypes("reg_ctl_list",61,"type")="int"
+	Set gtmtypfldindx("reg_ctl_list","dio_buff.unaligned_size")=61
+	Set gtmtypes("reg_ctl_list",62,"name")="reg_ctl_list.dio_buff.unaligned"
+	Set gtmtypes("reg_ctl_list",62,"off")=308
+	Set gtmtypes("reg_ctl_list",62,"len")=4
+	Set gtmtypes("reg_ctl_list",62,"type")="addr"
+	Set gtmtypfldindx("reg_ctl_list","dio_buff.unaligned")=62
+	Set gtmtypes("reg_ctl_list",63,"name")="reg_ctl_list.dio_buff.aligned"
+	Set gtmtypes("reg_ctl_list",63,"off")=312
+	Set gtmtypes("reg_ctl_list",63,"len")=4
+	Set gtmtypes("reg_ctl_list",63,"type")="addr"
+	Set gtmtypfldindx("reg_ctl_list","dio_buff.aligned")=63
 	;
 	Set gtmtypes("reg_jrec_info_t")="struct"
 	Set gtmtypes("reg_jrec_info_t",0)=2
@@ -25776,8 +26172,8 @@ Init
 	Set gtmtypfldindx("sgmm_addrs","filler")=1
 	;
 	Set gtmtypes("sgmnt_addrs")="struct"
-	Set gtmtypes("sgmnt_addrs",0)=142
-	Set gtmtypes("sgmnt_addrs","len")=816
+	Set gtmtypes("sgmnt_addrs",0)=153
+	Set gtmtypes("sgmnt_addrs","len")=864
 	Set gtmtypes("sgmnt_addrs",1,"name")="sgmnt_addrs.hdr"
 	Set gtmtypes("sgmnt_addrs",1,"off")=0
 	Set gtmtypes("sgmnt_addrs",1,"len")=4
@@ -25935,564 +26331,619 @@ Init
 	Set gtmtypes("sgmnt_addrs",31,"len")=4
 	Set gtmtypes("sgmnt_addrs",31,"type")="addr"
 	Set gtmtypfldindx("sgmnt_addrs","acc_meth.bg.fill1")=31
-	Set gtmtypes("sgmnt_addrs",32,"name")="sgmnt_addrs.gvstats_rec"
+	Set gtmtypes("sgmnt_addrs",32,"name")="sgmnt_addrs.gvstats_rec_p"
 	Set gtmtypes("sgmnt_addrs",32,"off")=116
-	Set gtmtypes("sgmnt_addrs",32,"len")=464
-	Set gtmtypes("sgmnt_addrs",32,"type")="gvstats_rec_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec")=32
-	Set gtmtypes("sgmnt_addrs",33,"name")="sgmnt_addrs.gvstats_rec.n_set"
-	Set gtmtypes("sgmnt_addrs",33,"off")=116
-	Set gtmtypes("sgmnt_addrs",33,"len")=8
-	Set gtmtypes("sgmnt_addrs",33,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_set")=33
-	Set gtmtypes("sgmnt_addrs",34,"name")="sgmnt_addrs.gvstats_rec.n_kill"
-	Set gtmtypes("sgmnt_addrs",34,"off")=124
+	Set gtmtypes("sgmnt_addrs",32,"len")=4
+	Set gtmtypes("sgmnt_addrs",32,"type")="addr"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec_p")=32
+	Set gtmtypes("sgmnt_addrs",33,"name")="sgmnt_addrs.gvstats_rec"
+	Set gtmtypes("sgmnt_addrs",33,"off")=120
+	Set gtmtypes("sgmnt_addrs",33,"len")=472
+	Set gtmtypes("sgmnt_addrs",33,"type")="gvstats_rec_t"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec")=33
+	Set gtmtypes("sgmnt_addrs",34,"name")="sgmnt_addrs.gvstats_rec.n_set"
+	Set gtmtypes("sgmnt_addrs",34,"off")=120
 	Set gtmtypes("sgmnt_addrs",34,"len")=8
 	Set gtmtypes("sgmnt_addrs",34,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_kill")=34
-	Set gtmtypes("sgmnt_addrs",35,"name")="sgmnt_addrs.gvstats_rec.n_get"
-	Set gtmtypes("sgmnt_addrs",35,"off")=132
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_set")=34
+	Set gtmtypes("sgmnt_addrs",35,"name")="sgmnt_addrs.gvstats_rec.n_kill"
+	Set gtmtypes("sgmnt_addrs",35,"off")=128
 	Set gtmtypes("sgmnt_addrs",35,"len")=8
 	Set gtmtypes("sgmnt_addrs",35,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_get")=35
-	Set gtmtypes("sgmnt_addrs",36,"name")="sgmnt_addrs.gvstats_rec.n_data"
-	Set gtmtypes("sgmnt_addrs",36,"off")=140
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_kill")=35
+	Set gtmtypes("sgmnt_addrs",36,"name")="sgmnt_addrs.gvstats_rec.n_get"
+	Set gtmtypes("sgmnt_addrs",36,"off")=136
 	Set gtmtypes("sgmnt_addrs",36,"len")=8
 	Set gtmtypes("sgmnt_addrs",36,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_data")=36
-	Set gtmtypes("sgmnt_addrs",37,"name")="sgmnt_addrs.gvstats_rec.n_order"
-	Set gtmtypes("sgmnt_addrs",37,"off")=148
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_get")=36
+	Set gtmtypes("sgmnt_addrs",37,"name")="sgmnt_addrs.gvstats_rec.n_data"
+	Set gtmtypes("sgmnt_addrs",37,"off")=144
 	Set gtmtypes("sgmnt_addrs",37,"len")=8
 	Set gtmtypes("sgmnt_addrs",37,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_order")=37
-	Set gtmtypes("sgmnt_addrs",38,"name")="sgmnt_addrs.gvstats_rec.n_zprev"
-	Set gtmtypes("sgmnt_addrs",38,"off")=156
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_data")=37
+	Set gtmtypes("sgmnt_addrs",38,"name")="sgmnt_addrs.gvstats_rec.n_order"
+	Set gtmtypes("sgmnt_addrs",38,"off")=152
 	Set gtmtypes("sgmnt_addrs",38,"len")=8
 	Set gtmtypes("sgmnt_addrs",38,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_zprev")=38
-	Set gtmtypes("sgmnt_addrs",39,"name")="sgmnt_addrs.gvstats_rec.n_query"
-	Set gtmtypes("sgmnt_addrs",39,"off")=164
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_order")=38
+	Set gtmtypes("sgmnt_addrs",39,"name")="sgmnt_addrs.gvstats_rec.n_zprev"
+	Set gtmtypes("sgmnt_addrs",39,"off")=160
 	Set gtmtypes("sgmnt_addrs",39,"len")=8
 	Set gtmtypes("sgmnt_addrs",39,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_query")=39
-	Set gtmtypes("sgmnt_addrs",40,"name")="sgmnt_addrs.gvstats_rec.n_lock_success"
-	Set gtmtypes("sgmnt_addrs",40,"off")=172
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_zprev")=39
+	Set gtmtypes("sgmnt_addrs",40,"name")="sgmnt_addrs.gvstats_rec.n_query"
+	Set gtmtypes("sgmnt_addrs",40,"off")=168
 	Set gtmtypes("sgmnt_addrs",40,"len")=8
 	Set gtmtypes("sgmnt_addrs",40,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_lock_success")=40
-	Set gtmtypes("sgmnt_addrs",41,"name")="sgmnt_addrs.gvstats_rec.n_lock_fail"
-	Set gtmtypes("sgmnt_addrs",41,"off")=180
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_query")=40
+	Set gtmtypes("sgmnt_addrs",41,"name")="sgmnt_addrs.gvstats_rec.n_lock_success"
+	Set gtmtypes("sgmnt_addrs",41,"off")=176
 	Set gtmtypes("sgmnt_addrs",41,"len")=8
 	Set gtmtypes("sgmnt_addrs",41,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_lock_fail")=41
-	Set gtmtypes("sgmnt_addrs",42,"name")="sgmnt_addrs.gvstats_rec.db_curr_tn"
-	Set gtmtypes("sgmnt_addrs",42,"off")=188
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_lock_success")=41
+	Set gtmtypes("sgmnt_addrs",42,"name")="sgmnt_addrs.gvstats_rec.n_lock_fail"
+	Set gtmtypes("sgmnt_addrs",42,"off")=184
 	Set gtmtypes("sgmnt_addrs",42,"len")=8
 	Set gtmtypes("sgmnt_addrs",42,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.db_curr_tn")=42
-	Set gtmtypes("sgmnt_addrs",43,"name")="sgmnt_addrs.gvstats_rec.n_dsk_read"
-	Set gtmtypes("sgmnt_addrs",43,"off")=196
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_lock_fail")=42
+	Set gtmtypes("sgmnt_addrs",43,"name")="sgmnt_addrs.gvstats_rec.db_curr_tn"
+	Set gtmtypes("sgmnt_addrs",43,"off")=192
 	Set gtmtypes("sgmnt_addrs",43,"len")=8
 	Set gtmtypes("sgmnt_addrs",43,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_dsk_read")=43
-	Set gtmtypes("sgmnt_addrs",44,"name")="sgmnt_addrs.gvstats_rec.n_dsk_write"
-	Set gtmtypes("sgmnt_addrs",44,"off")=204
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.db_curr_tn")=43
+	Set gtmtypes("sgmnt_addrs",44,"name")="sgmnt_addrs.gvstats_rec.n_dsk_read"
+	Set gtmtypes("sgmnt_addrs",44,"off")=200
 	Set gtmtypes("sgmnt_addrs",44,"len")=8
 	Set gtmtypes("sgmnt_addrs",44,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_dsk_write")=44
-	Set gtmtypes("sgmnt_addrs",45,"name")="sgmnt_addrs.gvstats_rec.n_nontp_readwrite"
-	Set gtmtypes("sgmnt_addrs",45,"off")=212
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_dsk_read")=44
+	Set gtmtypes("sgmnt_addrs",45,"name")="sgmnt_addrs.gvstats_rec.n_dsk_write"
+	Set gtmtypes("sgmnt_addrs",45,"off")=208
 	Set gtmtypes("sgmnt_addrs",45,"len")=8
 	Set gtmtypes("sgmnt_addrs",45,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_nontp_readwrite")=45
-	Set gtmtypes("sgmnt_addrs",46,"name")="sgmnt_addrs.gvstats_rec.n_nontp_readonly"
-	Set gtmtypes("sgmnt_addrs",46,"off")=220
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_dsk_write")=45
+	Set gtmtypes("sgmnt_addrs",46,"name")="sgmnt_addrs.gvstats_rec.n_nontp_readwrite"
+	Set gtmtypes("sgmnt_addrs",46,"off")=216
 	Set gtmtypes("sgmnt_addrs",46,"len")=8
 	Set gtmtypes("sgmnt_addrs",46,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_nontp_readonly")=46
-	Set gtmtypes("sgmnt_addrs",47,"name")="sgmnt_addrs.gvstats_rec.n_nontp_blkwrite"
-	Set gtmtypes("sgmnt_addrs",47,"off")=228
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_nontp_readwrite")=46
+	Set gtmtypes("sgmnt_addrs",47,"name")="sgmnt_addrs.gvstats_rec.n_nontp_readonly"
+	Set gtmtypes("sgmnt_addrs",47,"off")=224
 	Set gtmtypes("sgmnt_addrs",47,"len")=8
 	Set gtmtypes("sgmnt_addrs",47,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_nontp_blkwrite")=47
-	Set gtmtypes("sgmnt_addrs",48,"name")="sgmnt_addrs.gvstats_rec.n_nontp_blkread"
-	Set gtmtypes("sgmnt_addrs",48,"off")=236
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_nontp_readonly")=47
+	Set gtmtypes("sgmnt_addrs",48,"name")="sgmnt_addrs.gvstats_rec.n_nontp_blkwrite"
+	Set gtmtypes("sgmnt_addrs",48,"off")=232
 	Set gtmtypes("sgmnt_addrs",48,"len")=8
 	Set gtmtypes("sgmnt_addrs",48,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_nontp_blkread")=48
-	Set gtmtypes("sgmnt_addrs",49,"name")="sgmnt_addrs.gvstats_rec.n_nontp_retries_0"
-	Set gtmtypes("sgmnt_addrs",49,"off")=244
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_nontp_blkwrite")=48
+	Set gtmtypes("sgmnt_addrs",49,"name")="sgmnt_addrs.gvstats_rec.n_nontp_blkread"
+	Set gtmtypes("sgmnt_addrs",49,"off")=240
 	Set gtmtypes("sgmnt_addrs",49,"len")=8
 	Set gtmtypes("sgmnt_addrs",49,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_nontp_retries_0")=49
-	Set gtmtypes("sgmnt_addrs",50,"name")="sgmnt_addrs.gvstats_rec.n_nontp_retries_1"
-	Set gtmtypes("sgmnt_addrs",50,"off")=252
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_nontp_blkread")=49
+	Set gtmtypes("sgmnt_addrs",50,"name")="sgmnt_addrs.gvstats_rec.n_nontp_retries_0"
+	Set gtmtypes("sgmnt_addrs",50,"off")=248
 	Set gtmtypes("sgmnt_addrs",50,"len")=8
 	Set gtmtypes("sgmnt_addrs",50,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_nontp_retries_1")=50
-	Set gtmtypes("sgmnt_addrs",51,"name")="sgmnt_addrs.gvstats_rec.n_nontp_retries_2"
-	Set gtmtypes("sgmnt_addrs",51,"off")=260
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_nontp_retries_0")=50
+	Set gtmtypes("sgmnt_addrs",51,"name")="sgmnt_addrs.gvstats_rec.n_nontp_retries_1"
+	Set gtmtypes("sgmnt_addrs",51,"off")=256
 	Set gtmtypes("sgmnt_addrs",51,"len")=8
 	Set gtmtypes("sgmnt_addrs",51,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_nontp_retries_2")=51
-	Set gtmtypes("sgmnt_addrs",52,"name")="sgmnt_addrs.gvstats_rec.n_nontp_retries_3"
-	Set gtmtypes("sgmnt_addrs",52,"off")=268
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_nontp_retries_1")=51
+	Set gtmtypes("sgmnt_addrs",52,"name")="sgmnt_addrs.gvstats_rec.n_nontp_retries_2"
+	Set gtmtypes("sgmnt_addrs",52,"off")=264
 	Set gtmtypes("sgmnt_addrs",52,"len")=8
 	Set gtmtypes("sgmnt_addrs",52,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_nontp_retries_3")=52
-	Set gtmtypes("sgmnt_addrs",53,"name")="sgmnt_addrs.gvstats_rec.n_tp_readwrite"
-	Set gtmtypes("sgmnt_addrs",53,"off")=276
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_nontp_retries_2")=52
+	Set gtmtypes("sgmnt_addrs",53,"name")="sgmnt_addrs.gvstats_rec.n_nontp_retries_3"
+	Set gtmtypes("sgmnt_addrs",53,"off")=272
 	Set gtmtypes("sgmnt_addrs",53,"len")=8
 	Set gtmtypes("sgmnt_addrs",53,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_readwrite")=53
-	Set gtmtypes("sgmnt_addrs",54,"name")="sgmnt_addrs.gvstats_rec.n_tp_readonly"
-	Set gtmtypes("sgmnt_addrs",54,"off")=284
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_nontp_retries_3")=53
+	Set gtmtypes("sgmnt_addrs",54,"name")="sgmnt_addrs.gvstats_rec.n_tp_readwrite"
+	Set gtmtypes("sgmnt_addrs",54,"off")=280
 	Set gtmtypes("sgmnt_addrs",54,"len")=8
 	Set gtmtypes("sgmnt_addrs",54,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_readonly")=54
-	Set gtmtypes("sgmnt_addrs",55,"name")="sgmnt_addrs.gvstats_rec.n_tp_rolledback"
-	Set gtmtypes("sgmnt_addrs",55,"off")=292
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_readwrite")=54
+	Set gtmtypes("sgmnt_addrs",55,"name")="sgmnt_addrs.gvstats_rec.n_tp_readonly"
+	Set gtmtypes("sgmnt_addrs",55,"off")=288
 	Set gtmtypes("sgmnt_addrs",55,"len")=8
 	Set gtmtypes("sgmnt_addrs",55,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_rolledback")=55
-	Set gtmtypes("sgmnt_addrs",56,"name")="sgmnt_addrs.gvstats_rec.n_tp_blkwrite"
-	Set gtmtypes("sgmnt_addrs",56,"off")=300
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_readonly")=55
+	Set gtmtypes("sgmnt_addrs",56,"name")="sgmnt_addrs.gvstats_rec.n_tp_rolledback"
+	Set gtmtypes("sgmnt_addrs",56,"off")=296
 	Set gtmtypes("sgmnt_addrs",56,"len")=8
 	Set gtmtypes("sgmnt_addrs",56,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_blkwrite")=56
-	Set gtmtypes("sgmnt_addrs",57,"name")="sgmnt_addrs.gvstats_rec.n_tp_blkread"
-	Set gtmtypes("sgmnt_addrs",57,"off")=308
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_rolledback")=56
+	Set gtmtypes("sgmnt_addrs",57,"name")="sgmnt_addrs.gvstats_rec.n_tp_blkwrite"
+	Set gtmtypes("sgmnt_addrs",57,"off")=304
 	Set gtmtypes("sgmnt_addrs",57,"len")=8
 	Set gtmtypes("sgmnt_addrs",57,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_blkread")=57
-	Set gtmtypes("sgmnt_addrs",58,"name")="sgmnt_addrs.gvstats_rec.n_tp_tot_retries_0"
-	Set gtmtypes("sgmnt_addrs",58,"off")=316
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_blkwrite")=57
+	Set gtmtypes("sgmnt_addrs",58,"name")="sgmnt_addrs.gvstats_rec.n_tp_blkread"
+	Set gtmtypes("sgmnt_addrs",58,"off")=312
 	Set gtmtypes("sgmnt_addrs",58,"len")=8
 	Set gtmtypes("sgmnt_addrs",58,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_tot_retries_0")=58
-	Set gtmtypes("sgmnt_addrs",59,"name")="sgmnt_addrs.gvstats_rec.n_tp_tot_retries_1"
-	Set gtmtypes("sgmnt_addrs",59,"off")=324
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_blkread")=58
+	Set gtmtypes("sgmnt_addrs",59,"name")="sgmnt_addrs.gvstats_rec.n_tp_tot_retries_0"
+	Set gtmtypes("sgmnt_addrs",59,"off")=320
 	Set gtmtypes("sgmnt_addrs",59,"len")=8
 	Set gtmtypes("sgmnt_addrs",59,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_tot_retries_1")=59
-	Set gtmtypes("sgmnt_addrs",60,"name")="sgmnt_addrs.gvstats_rec.n_tp_tot_retries_2"
-	Set gtmtypes("sgmnt_addrs",60,"off")=332
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_tot_retries_0")=59
+	Set gtmtypes("sgmnt_addrs",60,"name")="sgmnt_addrs.gvstats_rec.n_tp_tot_retries_1"
+	Set gtmtypes("sgmnt_addrs",60,"off")=328
 	Set gtmtypes("sgmnt_addrs",60,"len")=8
 	Set gtmtypes("sgmnt_addrs",60,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_tot_retries_2")=60
-	Set gtmtypes("sgmnt_addrs",61,"name")="sgmnt_addrs.gvstats_rec.n_tp_tot_retries_3"
-	Set gtmtypes("sgmnt_addrs",61,"off")=340
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_tot_retries_1")=60
+	Set gtmtypes("sgmnt_addrs",61,"name")="sgmnt_addrs.gvstats_rec.n_tp_tot_retries_2"
+	Set gtmtypes("sgmnt_addrs",61,"off")=336
 	Set gtmtypes("sgmnt_addrs",61,"len")=8
 	Set gtmtypes("sgmnt_addrs",61,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_tot_retries_3")=61
-	Set gtmtypes("sgmnt_addrs",62,"name")="sgmnt_addrs.gvstats_rec.n_tp_tot_retries_4"
-	Set gtmtypes("sgmnt_addrs",62,"off")=348
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_tot_retries_2")=61
+	Set gtmtypes("sgmnt_addrs",62,"name")="sgmnt_addrs.gvstats_rec.n_tp_tot_retries_3"
+	Set gtmtypes("sgmnt_addrs",62,"off")=344
 	Set gtmtypes("sgmnt_addrs",62,"len")=8
 	Set gtmtypes("sgmnt_addrs",62,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_tot_retries_4")=62
-	Set gtmtypes("sgmnt_addrs",63,"name")="sgmnt_addrs.gvstats_rec.n_tp_cnflct_retries_0"
-	Set gtmtypes("sgmnt_addrs",63,"off")=356
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_tot_retries_3")=62
+	Set gtmtypes("sgmnt_addrs",63,"name")="sgmnt_addrs.gvstats_rec.n_tp_tot_retries_4"
+	Set gtmtypes("sgmnt_addrs",63,"off")=352
 	Set gtmtypes("sgmnt_addrs",63,"len")=8
 	Set gtmtypes("sgmnt_addrs",63,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_cnflct_retries_0")=63
-	Set gtmtypes("sgmnt_addrs",64,"name")="sgmnt_addrs.gvstats_rec.n_tp_cnflct_retries_1"
-	Set gtmtypes("sgmnt_addrs",64,"off")=364
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_tot_retries_4")=63
+	Set gtmtypes("sgmnt_addrs",64,"name")="sgmnt_addrs.gvstats_rec.n_tp_cnflct_retries_0"
+	Set gtmtypes("sgmnt_addrs",64,"off")=360
 	Set gtmtypes("sgmnt_addrs",64,"len")=8
 	Set gtmtypes("sgmnt_addrs",64,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_cnflct_retries_1")=64
-	Set gtmtypes("sgmnt_addrs",65,"name")="sgmnt_addrs.gvstats_rec.n_tp_cnflct_retries_2"
-	Set gtmtypes("sgmnt_addrs",65,"off")=372
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_cnflct_retries_0")=64
+	Set gtmtypes("sgmnt_addrs",65,"name")="sgmnt_addrs.gvstats_rec.n_tp_cnflct_retries_1"
+	Set gtmtypes("sgmnt_addrs",65,"off")=368
 	Set gtmtypes("sgmnt_addrs",65,"len")=8
 	Set gtmtypes("sgmnt_addrs",65,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_cnflct_retries_2")=65
-	Set gtmtypes("sgmnt_addrs",66,"name")="sgmnt_addrs.gvstats_rec.n_tp_cnflct_retries_3"
-	Set gtmtypes("sgmnt_addrs",66,"off")=380
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_cnflct_retries_1")=65
+	Set gtmtypes("sgmnt_addrs",66,"name")="sgmnt_addrs.gvstats_rec.n_tp_cnflct_retries_2"
+	Set gtmtypes("sgmnt_addrs",66,"off")=376
 	Set gtmtypes("sgmnt_addrs",66,"len")=8
 	Set gtmtypes("sgmnt_addrs",66,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_cnflct_retries_3")=66
-	Set gtmtypes("sgmnt_addrs",67,"name")="sgmnt_addrs.gvstats_rec.n_tp_cnflct_retries_4"
-	Set gtmtypes("sgmnt_addrs",67,"off")=388
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_cnflct_retries_2")=66
+	Set gtmtypes("sgmnt_addrs",67,"name")="sgmnt_addrs.gvstats_rec.n_tp_cnflct_retries_3"
+	Set gtmtypes("sgmnt_addrs",67,"off")=384
 	Set gtmtypes("sgmnt_addrs",67,"len")=8
 	Set gtmtypes("sgmnt_addrs",67,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_cnflct_retries_4")=67
-	Set gtmtypes("sgmnt_addrs",68,"name")="sgmnt_addrs.gvstats_rec.n_ztrigger"
-	Set gtmtypes("sgmnt_addrs",68,"off")=396
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_cnflct_retries_3")=67
+	Set gtmtypes("sgmnt_addrs",68,"name")="sgmnt_addrs.gvstats_rec.n_tp_cnflct_retries_4"
+	Set gtmtypes("sgmnt_addrs",68,"off")=392
 	Set gtmtypes("sgmnt_addrs",68,"len")=8
 	Set gtmtypes("sgmnt_addrs",68,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_ztrigger")=68
-	Set gtmtypes("sgmnt_addrs",69,"name")="sgmnt_addrs.gvstats_rec.n_db_flush"
-	Set gtmtypes("sgmnt_addrs",69,"off")=404
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_cnflct_retries_4")=68
+	Set gtmtypes("sgmnt_addrs",69,"name")="sgmnt_addrs.gvstats_rec.n_ztrigger"
+	Set gtmtypes("sgmnt_addrs",69,"off")=400
 	Set gtmtypes("sgmnt_addrs",69,"len")=8
 	Set gtmtypes("sgmnt_addrs",69,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_db_flush")=69
-	Set gtmtypes("sgmnt_addrs",70,"name")="sgmnt_addrs.gvstats_rec.n_db_fsync"
-	Set gtmtypes("sgmnt_addrs",70,"off")=412
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_ztrigger")=69
+	Set gtmtypes("sgmnt_addrs",70,"name")="sgmnt_addrs.gvstats_rec.n_db_flush"
+	Set gtmtypes("sgmnt_addrs",70,"off")=408
 	Set gtmtypes("sgmnt_addrs",70,"len")=8
 	Set gtmtypes("sgmnt_addrs",70,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_db_fsync")=70
-	Set gtmtypes("sgmnt_addrs",71,"name")="sgmnt_addrs.gvstats_rec.n_jnl_flush"
-	Set gtmtypes("sgmnt_addrs",71,"off")=420
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_db_flush")=70
+	Set gtmtypes("sgmnt_addrs",71,"name")="sgmnt_addrs.gvstats_rec.n_db_fsync"
+	Set gtmtypes("sgmnt_addrs",71,"off")=416
 	Set gtmtypes("sgmnt_addrs",71,"len")=8
 	Set gtmtypes("sgmnt_addrs",71,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jnl_flush")=71
-	Set gtmtypes("sgmnt_addrs",72,"name")="sgmnt_addrs.gvstats_rec.n_jnl_fsync"
-	Set gtmtypes("sgmnt_addrs",72,"off")=428
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_db_fsync")=71
+	Set gtmtypes("sgmnt_addrs",72,"name")="sgmnt_addrs.gvstats_rec.n_jnl_flush"
+	Set gtmtypes("sgmnt_addrs",72,"off")=424
 	Set gtmtypes("sgmnt_addrs",72,"len")=8
 	Set gtmtypes("sgmnt_addrs",72,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jnl_fsync")=72
-	Set gtmtypes("sgmnt_addrs",73,"name")="sgmnt_addrs.gvstats_rec.n_jbuff_bytes"
-	Set gtmtypes("sgmnt_addrs",73,"off")=436
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jnl_flush")=72
+	Set gtmtypes("sgmnt_addrs",73,"name")="sgmnt_addrs.gvstats_rec.n_jnl_fsync"
+	Set gtmtypes("sgmnt_addrs",73,"off")=432
 	Set gtmtypes("sgmnt_addrs",73,"len")=8
 	Set gtmtypes("sgmnt_addrs",73,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jbuff_bytes")=73
-	Set gtmtypes("sgmnt_addrs",74,"name")="sgmnt_addrs.gvstats_rec.n_jfile_bytes"
-	Set gtmtypes("sgmnt_addrs",74,"off")=444
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jnl_fsync")=73
+	Set gtmtypes("sgmnt_addrs",74,"name")="sgmnt_addrs.gvstats_rec.n_jbuff_bytes"
+	Set gtmtypes("sgmnt_addrs",74,"off")=440
 	Set gtmtypes("sgmnt_addrs",74,"len")=8
 	Set gtmtypes("sgmnt_addrs",74,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jfile_bytes")=74
-	Set gtmtypes("sgmnt_addrs",75,"name")="sgmnt_addrs.gvstats_rec.n_jfile_writes"
-	Set gtmtypes("sgmnt_addrs",75,"off")=452
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jbuff_bytes")=74
+	Set gtmtypes("sgmnt_addrs",75,"name")="sgmnt_addrs.gvstats_rec.n_jfile_bytes"
+	Set gtmtypes("sgmnt_addrs",75,"off")=448
 	Set gtmtypes("sgmnt_addrs",75,"len")=8
 	Set gtmtypes("sgmnt_addrs",75,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jfile_writes")=75
-	Set gtmtypes("sgmnt_addrs",76,"name")="sgmnt_addrs.gvstats_rec.n_jrec_logical"
-	Set gtmtypes("sgmnt_addrs",76,"off")=460
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jfile_bytes")=75
+	Set gtmtypes("sgmnt_addrs",76,"name")="sgmnt_addrs.gvstats_rec.n_jfile_writes"
+	Set gtmtypes("sgmnt_addrs",76,"off")=456
 	Set gtmtypes("sgmnt_addrs",76,"len")=8
 	Set gtmtypes("sgmnt_addrs",76,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jrec_logical")=76
-	Set gtmtypes("sgmnt_addrs",77,"name")="sgmnt_addrs.gvstats_rec.n_jrec_pblk"
-	Set gtmtypes("sgmnt_addrs",77,"off")=468
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jfile_writes")=76
+	Set gtmtypes("sgmnt_addrs",77,"name")="sgmnt_addrs.gvstats_rec.n_jrec_logical"
+	Set gtmtypes("sgmnt_addrs",77,"off")=464
 	Set gtmtypes("sgmnt_addrs",77,"len")=8
 	Set gtmtypes("sgmnt_addrs",77,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jrec_pblk")=77
-	Set gtmtypes("sgmnt_addrs",78,"name")="sgmnt_addrs.gvstats_rec.n_jrec_epoch_regular"
-	Set gtmtypes("sgmnt_addrs",78,"off")=476
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jrec_logical")=77
+	Set gtmtypes("sgmnt_addrs",78,"name")="sgmnt_addrs.gvstats_rec.n_jrec_pblk"
+	Set gtmtypes("sgmnt_addrs",78,"off")=472
 	Set gtmtypes("sgmnt_addrs",78,"len")=8
 	Set gtmtypes("sgmnt_addrs",78,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jrec_epoch_regular")=78
-	Set gtmtypes("sgmnt_addrs",79,"name")="sgmnt_addrs.gvstats_rec.n_jrec_epoch_idle"
-	Set gtmtypes("sgmnt_addrs",79,"off")=484
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jrec_pblk")=78
+	Set gtmtypes("sgmnt_addrs",79,"name")="sgmnt_addrs.gvstats_rec.n_jrec_epoch_regular"
+	Set gtmtypes("sgmnt_addrs",79,"off")=480
 	Set gtmtypes("sgmnt_addrs",79,"len")=8
 	Set gtmtypes("sgmnt_addrs",79,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jrec_epoch_idle")=79
-	Set gtmtypes("sgmnt_addrs",80,"name")="sgmnt_addrs.gvstats_rec.n_jrec_other"
-	Set gtmtypes("sgmnt_addrs",80,"off")=492
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jrec_epoch_regular")=79
+	Set gtmtypes("sgmnt_addrs",80,"name")="sgmnt_addrs.gvstats_rec.n_jrec_epoch_idle"
+	Set gtmtypes("sgmnt_addrs",80,"off")=488
 	Set gtmtypes("sgmnt_addrs",80,"len")=8
 	Set gtmtypes("sgmnt_addrs",80,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jrec_other")=80
-	Set gtmtypes("sgmnt_addrs",81,"name")="sgmnt_addrs.gvstats_rec.n_jnl_extends"
-	Set gtmtypes("sgmnt_addrs",81,"off")=500
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jrec_epoch_idle")=80
+	Set gtmtypes("sgmnt_addrs",81,"name")="sgmnt_addrs.gvstats_rec.n_jrec_other"
+	Set gtmtypes("sgmnt_addrs",81,"off")=496
 	Set gtmtypes("sgmnt_addrs",81,"len")=8
 	Set gtmtypes("sgmnt_addrs",81,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jnl_extends")=81
-	Set gtmtypes("sgmnt_addrs",82,"name")="sgmnt_addrs.gvstats_rec.n_db_extends"
-	Set gtmtypes("sgmnt_addrs",82,"off")=508
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jrec_other")=81
+	Set gtmtypes("sgmnt_addrs",82,"name")="sgmnt_addrs.gvstats_rec.n_jnl_extends"
+	Set gtmtypes("sgmnt_addrs",82,"off")=504
 	Set gtmtypes("sgmnt_addrs",82,"len")=8
 	Set gtmtypes("sgmnt_addrs",82,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_db_extends")=82
-	Set gtmtypes("sgmnt_addrs",83,"name")="sgmnt_addrs.gvstats_rec.n_crit_success"
-	Set gtmtypes("sgmnt_addrs",83,"off")=516
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jnl_extends")=82
+	Set gtmtypes("sgmnt_addrs",83,"name")="sgmnt_addrs.gvstats_rec.n_db_extends"
+	Set gtmtypes("sgmnt_addrs",83,"off")=512
 	Set gtmtypes("sgmnt_addrs",83,"len")=8
 	Set gtmtypes("sgmnt_addrs",83,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_crit_success")=83
-	Set gtmtypes("sgmnt_addrs",84,"name")="sgmnt_addrs.gvstats_rec.n_crits_in_epch"
-	Set gtmtypes("sgmnt_addrs",84,"off")=524
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_db_extends")=83
+	Set gtmtypes("sgmnt_addrs",84,"name")="sgmnt_addrs.gvstats_rec.n_crit_success"
+	Set gtmtypes("sgmnt_addrs",84,"off")=520
 	Set gtmtypes("sgmnt_addrs",84,"len")=8
 	Set gtmtypes("sgmnt_addrs",84,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_crits_in_epch")=84
-	Set gtmtypes("sgmnt_addrs",85,"name")="sgmnt_addrs.gvstats_rec.sq_crit_failed"
-	Set gtmtypes("sgmnt_addrs",85,"off")=532
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_crit_success")=84
+	Set gtmtypes("sgmnt_addrs",85,"name")="sgmnt_addrs.gvstats_rec.n_crits_in_epch"
+	Set gtmtypes("sgmnt_addrs",85,"off")=528
 	Set gtmtypes("sgmnt_addrs",85,"len")=8
 	Set gtmtypes("sgmnt_addrs",85,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.sq_crit_failed")=85
-	Set gtmtypes("sgmnt_addrs",86,"name")="sgmnt_addrs.gvstats_rec.n_crit_failed"
-	Set gtmtypes("sgmnt_addrs",86,"off")=540
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_crits_in_epch")=85
+	Set gtmtypes("sgmnt_addrs",86,"name")="sgmnt_addrs.gvstats_rec.sq_crit_failed"
+	Set gtmtypes("sgmnt_addrs",86,"off")=536
 	Set gtmtypes("sgmnt_addrs",86,"len")=8
 	Set gtmtypes("sgmnt_addrs",86,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_crit_failed")=86
-	Set gtmtypes("sgmnt_addrs",87,"name")="sgmnt_addrs.gvstats_rec.sq_crit_que_slps"
-	Set gtmtypes("sgmnt_addrs",87,"off")=548
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.sq_crit_failed")=86
+	Set gtmtypes("sgmnt_addrs",87,"name")="sgmnt_addrs.gvstats_rec.n_crit_failed"
+	Set gtmtypes("sgmnt_addrs",87,"off")=544
 	Set gtmtypes("sgmnt_addrs",87,"len")=8
 	Set gtmtypes("sgmnt_addrs",87,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.sq_crit_que_slps")=87
-	Set gtmtypes("sgmnt_addrs",88,"name")="sgmnt_addrs.gvstats_rec.n_crit_que_slps"
-	Set gtmtypes("sgmnt_addrs",88,"off")=556
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_crit_failed")=87
+	Set gtmtypes("sgmnt_addrs",88,"name")="sgmnt_addrs.gvstats_rec.sq_crit_que_slps"
+	Set gtmtypes("sgmnt_addrs",88,"off")=552
 	Set gtmtypes("sgmnt_addrs",88,"len")=8
 	Set gtmtypes("sgmnt_addrs",88,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_crit_que_slps")=88
-	Set gtmtypes("sgmnt_addrs",89,"name")="sgmnt_addrs.gvstats_rec.sq_crit_yields"
-	Set gtmtypes("sgmnt_addrs",89,"off")=564
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.sq_crit_que_slps")=88
+	Set gtmtypes("sgmnt_addrs",89,"name")="sgmnt_addrs.gvstats_rec.n_crit_que_slps"
+	Set gtmtypes("sgmnt_addrs",89,"off")=560
 	Set gtmtypes("sgmnt_addrs",89,"len")=8
 	Set gtmtypes("sgmnt_addrs",89,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.sq_crit_yields")=89
-	Set gtmtypes("sgmnt_addrs",90,"name")="sgmnt_addrs.gvstats_rec.n_crit_yields"
-	Set gtmtypes("sgmnt_addrs",90,"off")=572
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_crit_que_slps")=89
+	Set gtmtypes("sgmnt_addrs",90,"name")="sgmnt_addrs.gvstats_rec.sq_crit_yields"
+	Set gtmtypes("sgmnt_addrs",90,"off")=568
 	Set gtmtypes("sgmnt_addrs",90,"len")=8
 	Set gtmtypes("sgmnt_addrs",90,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_crit_yields")=90
-	Set gtmtypes("sgmnt_addrs",91,"name")="sgmnt_addrs.dbsync_timer_tn"
-	Set gtmtypes("sgmnt_addrs",91,"off")=580
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.sq_crit_yields")=90
+	Set gtmtypes("sgmnt_addrs",91,"name")="sgmnt_addrs.gvstats_rec.n_crit_yields"
+	Set gtmtypes("sgmnt_addrs",91,"off")=576
 	Set gtmtypes("sgmnt_addrs",91,"len")=8
 	Set gtmtypes("sgmnt_addrs",91,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","dbsync_timer_tn")=91
-	Set gtmtypes("sgmnt_addrs",92,"name")="sgmnt_addrs.fullblockwrite_len"
-	Set gtmtypes("sgmnt_addrs",92,"off")=588
-	Set gtmtypes("sgmnt_addrs",92,"len")=4
-	Set gtmtypes("sgmnt_addrs",92,"type")="size_t"
-	Set gtmtypfldindx("sgmnt_addrs","fullblockwrite_len")=92
-	Set gtmtypes("sgmnt_addrs",93,"name")="sgmnt_addrs.total_blks"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_crit_yields")=91
+	Set gtmtypes("sgmnt_addrs",92,"name")="sgmnt_addrs.gvstats_rec.n_clean2dirty"
+	Set gtmtypes("sgmnt_addrs",92,"off")=584
+	Set gtmtypes("sgmnt_addrs",92,"len")=8
+	Set gtmtypes("sgmnt_addrs",92,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_clean2dirty")=92
+	Set gtmtypes("sgmnt_addrs",93,"name")="sgmnt_addrs.dbsync_timer_tn"
 	Set gtmtypes("sgmnt_addrs",93,"off")=592
-	Set gtmtypes("sgmnt_addrs",93,"len")=4
-	Set gtmtypes("sgmnt_addrs",93,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_addrs","total_blks")=93
-	Set gtmtypes("sgmnt_addrs",94,"name")="sgmnt_addrs.prev_free_blks"
-	Set gtmtypes("sgmnt_addrs",94,"off")=596
+	Set gtmtypes("sgmnt_addrs",93,"len")=8
+	Set gtmtypes("sgmnt_addrs",93,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_addrs","dbsync_timer_tn")=93
+	Set gtmtypes("sgmnt_addrs",94,"name")="sgmnt_addrs.our_midnite"
+	Set gtmtypes("sgmnt_addrs",94,"off")=600
 	Set gtmtypes("sgmnt_addrs",94,"len")=4
-	Set gtmtypes("sgmnt_addrs",94,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_addrs","prev_free_blks")=94
-	Set gtmtypes("sgmnt_addrs",95,"name")="sgmnt_addrs.timer"
-	Set gtmtypes("sgmnt_addrs",95,"off")=600
+	Set gtmtypes("sgmnt_addrs",94,"type")="addr"
+	Set gtmtypfldindx("sgmnt_addrs","our_midnite")=94
+	Set gtmtypes("sgmnt_addrs",95,"name")="sgmnt_addrs.fullblockwrite_len"
+	Set gtmtypes("sgmnt_addrs",95,"off")=604
 	Set gtmtypes("sgmnt_addrs",95,"len")=4
-	Set gtmtypes("sgmnt_addrs",95,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_addrs","timer")=95
-	Set gtmtypes("sgmnt_addrs",96,"name")="sgmnt_addrs.in_wtstart"
-	Set gtmtypes("sgmnt_addrs",96,"off")=604
+	Set gtmtypes("sgmnt_addrs",95,"type")="size_t"
+	Set gtmtypfldindx("sgmnt_addrs","fullblockwrite_len")=95
+	Set gtmtypes("sgmnt_addrs",96,"name")="sgmnt_addrs.our_lru_cache_rec_off"
+	Set gtmtypes("sgmnt_addrs",96,"off")=608
 	Set gtmtypes("sgmnt_addrs",96,"len")=4
-	Set gtmtypes("sgmnt_addrs",96,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_addrs","in_wtstart")=96
-	Set gtmtypes("sgmnt_addrs",97,"name")="sgmnt_addrs.now_crit"
-	Set gtmtypes("sgmnt_addrs",97,"off")=608
+	Set gtmtypes("sgmnt_addrs",96,"type")="intptr_t"
+	Set gtmtypfldindx("sgmnt_addrs","our_lru_cache_rec_off")=96
+	Set gtmtypes("sgmnt_addrs",97,"name")="sgmnt_addrs.total_blks"
+	Set gtmtypes("sgmnt_addrs",97,"off")=612
 	Set gtmtypes("sgmnt_addrs",97,"len")=4
 	Set gtmtypes("sgmnt_addrs",97,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_addrs","now_crit")=97
-	Set gtmtypes("sgmnt_addrs",98,"name")="sgmnt_addrs.wbuf_dqd"
-	Set gtmtypes("sgmnt_addrs",98,"off")=612
+	Set gtmtypfldindx("sgmnt_addrs","total_blks")=97
+	Set gtmtypes("sgmnt_addrs",98,"name")="sgmnt_addrs.prev_free_blks"
+	Set gtmtypes("sgmnt_addrs",98,"off")=616
 	Set gtmtypes("sgmnt_addrs",98,"len")=4
 	Set gtmtypes("sgmnt_addrs",98,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_addrs","wbuf_dqd")=98
-	Set gtmtypes("sgmnt_addrs",99,"name")="sgmnt_addrs.stale_defer"
-	Set gtmtypes("sgmnt_addrs",99,"off")=616
+	Set gtmtypfldindx("sgmnt_addrs","prev_free_blks")=98
+	Set gtmtypes("sgmnt_addrs",99,"name")="sgmnt_addrs.timer"
+	Set gtmtypes("sgmnt_addrs",99,"off")=620
 	Set gtmtypes("sgmnt_addrs",99,"len")=4
 	Set gtmtypes("sgmnt_addrs",99,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_addrs","stale_defer")=99
-	Set gtmtypes("sgmnt_addrs",100,"name")="sgmnt_addrs.freeze"
-	Set gtmtypes("sgmnt_addrs",100,"off")=620
+	Set gtmtypfldindx("sgmnt_addrs","timer")=99
+	Set gtmtypes("sgmnt_addrs",100,"name")="sgmnt_addrs.in_wtstart"
+	Set gtmtypes("sgmnt_addrs",100,"off")=624
 	Set gtmtypes("sgmnt_addrs",100,"len")=4
-	Set gtmtypes("sgmnt_addrs",100,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_addrs","freeze")=100
-	Set gtmtypes("sgmnt_addrs",101,"name")="sgmnt_addrs.dbsync_timer"
-	Set gtmtypes("sgmnt_addrs",101,"off")=624
+	Set gtmtypes("sgmnt_addrs",100,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_addrs","in_wtstart")=100
+	Set gtmtypes("sgmnt_addrs",101,"name")="sgmnt_addrs.now_crit"
+	Set gtmtypes("sgmnt_addrs",101,"off")=628
 	Set gtmtypes("sgmnt_addrs",101,"len")=4
-	Set gtmtypes("sgmnt_addrs",101,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_addrs","dbsync_timer")=101
-	Set gtmtypes("sgmnt_addrs",102,"name")="sgmnt_addrs.reorg_last_dest"
-	Set gtmtypes("sgmnt_addrs",102,"off")=628
+	Set gtmtypes("sgmnt_addrs",101,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_addrs","now_crit")=101
+	Set gtmtypes("sgmnt_addrs",102,"name")="sgmnt_addrs.wbuf_dqd"
+	Set gtmtypes("sgmnt_addrs",102,"off")=632
 	Set gtmtypes("sgmnt_addrs",102,"len")=4
-	Set gtmtypes("sgmnt_addrs",102,"type")="int"
-	Set gtmtypfldindx("sgmnt_addrs","reorg_last_dest")=102
-	Set gtmtypes("sgmnt_addrs",103,"name")="sgmnt_addrs.jnl_before_image"
-	Set gtmtypes("sgmnt_addrs",103,"off")=632
+	Set gtmtypes("sgmnt_addrs",102,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_addrs","wbuf_dqd")=102
+	Set gtmtypes("sgmnt_addrs",103,"name")="sgmnt_addrs.stale_defer"
+	Set gtmtypes("sgmnt_addrs",103,"off")=636
 	Set gtmtypes("sgmnt_addrs",103,"len")=4
-	Set gtmtypes("sgmnt_addrs",103,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_addrs","jnl_before_image")=103
-	Set gtmtypes("sgmnt_addrs",104,"name")="sgmnt_addrs.read_write"
-	Set gtmtypes("sgmnt_addrs",104,"off")=636
+	Set gtmtypes("sgmnt_addrs",103,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_addrs","stale_defer")=103
+	Set gtmtypes("sgmnt_addrs",104,"name")="sgmnt_addrs.freeze"
+	Set gtmtypes("sgmnt_addrs",104,"off")=640
 	Set gtmtypes("sgmnt_addrs",104,"len")=4
 	Set gtmtypes("sgmnt_addrs",104,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_addrs","read_write")=104
-	Set gtmtypes("sgmnt_addrs",105,"name")="sgmnt_addrs.persistent_freeze"
-	Set gtmtypes("sgmnt_addrs",105,"off")=640
+	Set gtmtypfldindx("sgmnt_addrs","freeze")=104
+	Set gtmtypes("sgmnt_addrs",105,"name")="sgmnt_addrs.dbsync_timer"
+	Set gtmtypes("sgmnt_addrs",105,"off")=644
 	Set gtmtypes("sgmnt_addrs",105,"len")=4
 	Set gtmtypes("sgmnt_addrs",105,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_addrs","persistent_freeze")=105
-	Set gtmtypes("sgmnt_addrs",106,"name")="sgmnt_addrs.pblk_align_jrecsize"
-	Set gtmtypes("sgmnt_addrs",106,"off")=644
+	Set gtmtypfldindx("sgmnt_addrs","dbsync_timer")=105
+	Set gtmtypes("sgmnt_addrs",106,"name")="sgmnt_addrs.reorg_last_dest"
+	Set gtmtypes("sgmnt_addrs",106,"off")=648
 	Set gtmtypes("sgmnt_addrs",106,"len")=4
 	Set gtmtypes("sgmnt_addrs",106,"type")="int"
-	Set gtmtypfldindx("sgmnt_addrs","pblk_align_jrecsize")=106
-	Set gtmtypes("sgmnt_addrs",107,"name")="sgmnt_addrs.min_total_tpjnl_rec_size"
-	Set gtmtypes("sgmnt_addrs",107,"off")=648
+	Set gtmtypfldindx("sgmnt_addrs","reorg_last_dest")=106
+	Set gtmtypes("sgmnt_addrs",107,"name")="sgmnt_addrs.jnl_before_image"
+	Set gtmtypes("sgmnt_addrs",107,"off")=652
 	Set gtmtypes("sgmnt_addrs",107,"len")=4
-	Set gtmtypes("sgmnt_addrs",107,"type")="int"
-	Set gtmtypfldindx("sgmnt_addrs","min_total_tpjnl_rec_size")=107
-	Set gtmtypes("sgmnt_addrs",108,"name")="sgmnt_addrs.min_total_nontpjnl_rec_size"
-	Set gtmtypes("sgmnt_addrs",108,"off")=652
+	Set gtmtypes("sgmnt_addrs",107,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_addrs","jnl_before_image")=107
+	Set gtmtypes("sgmnt_addrs",108,"name")="sgmnt_addrs.read_write"
+	Set gtmtypes("sgmnt_addrs",108,"off")=656
 	Set gtmtypes("sgmnt_addrs",108,"len")=4
-	Set gtmtypes("sgmnt_addrs",108,"type")="int"
-	Set gtmtypfldindx("sgmnt_addrs","min_total_nontpjnl_rec_size")=108
-	Set gtmtypes("sgmnt_addrs",109,"name")="sgmnt_addrs.jnl_state"
-	Set gtmtypes("sgmnt_addrs",109,"off")=656
+	Set gtmtypes("sgmnt_addrs",108,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_addrs","read_write")=108
+	Set gtmtypes("sgmnt_addrs",109,"name")="sgmnt_addrs.orig_read_write"
+	Set gtmtypes("sgmnt_addrs",109,"off")=660
 	Set gtmtypes("sgmnt_addrs",109,"len")=4
-	Set gtmtypes("sgmnt_addrs",109,"type")="int"
-	Set gtmtypfldindx("sgmnt_addrs","jnl_state")=109
-	Set gtmtypes("sgmnt_addrs",110,"name")="sgmnt_addrs.repl_state"
-	Set gtmtypes("sgmnt_addrs",110,"off")=660
+	Set gtmtypes("sgmnt_addrs",109,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_addrs","orig_read_write")=109
+	Set gtmtypes("sgmnt_addrs",110,"name")="sgmnt_addrs.persistent_freeze"
+	Set gtmtypes("sgmnt_addrs",110,"off")=664
 	Set gtmtypes("sgmnt_addrs",110,"len")=4
-	Set gtmtypes("sgmnt_addrs",110,"type")="int"
-	Set gtmtypfldindx("sgmnt_addrs","repl_state")=110
-	Set gtmtypes("sgmnt_addrs",111,"name")="sgmnt_addrs.crit_check_cycle"
-	Set gtmtypes("sgmnt_addrs",111,"off")=664
+	Set gtmtypes("sgmnt_addrs",110,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_addrs","persistent_freeze")=110
+	Set gtmtypes("sgmnt_addrs",111,"name")="sgmnt_addrs.pblk_align_jrecsize"
+	Set gtmtypes("sgmnt_addrs",111,"off")=668
 	Set gtmtypes("sgmnt_addrs",111,"len")=4
-	Set gtmtypes("sgmnt_addrs",111,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_addrs","crit_check_cycle")=111
-	Set gtmtypes("sgmnt_addrs",112,"name")="sgmnt_addrs.backup_in_prog"
-	Set gtmtypes("sgmnt_addrs",112,"off")=668
+	Set gtmtypes("sgmnt_addrs",111,"type")="int"
+	Set gtmtypfldindx("sgmnt_addrs","pblk_align_jrecsize")=111
+	Set gtmtypes("sgmnt_addrs",112,"name")="sgmnt_addrs.min_total_tpjnl_rec_size"
+	Set gtmtypes("sgmnt_addrs",112,"off")=672
 	Set gtmtypes("sgmnt_addrs",112,"len")=4
 	Set gtmtypes("sgmnt_addrs",112,"type")="int"
-	Set gtmtypfldindx("sgmnt_addrs","backup_in_prog")=112
-	Set gtmtypes("sgmnt_addrs",113,"name")="sgmnt_addrs.snapshot_in_prog"
-	Set gtmtypes("sgmnt_addrs",113,"off")=672
+	Set gtmtypfldindx("sgmnt_addrs","min_total_tpjnl_rec_size")=112
+	Set gtmtypes("sgmnt_addrs",113,"name")="sgmnt_addrs.min_total_nontpjnl_rec_size"
+	Set gtmtypes("sgmnt_addrs",113,"off")=676
 	Set gtmtypes("sgmnt_addrs",113,"len")=4
-	Set gtmtypes("sgmnt_addrs",113,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_addrs","snapshot_in_prog")=113
-	Set gtmtypes("sgmnt_addrs",114,"name")="sgmnt_addrs.ref_cnt"
-	Set gtmtypes("sgmnt_addrs",114,"off")=676
+	Set gtmtypes("sgmnt_addrs",113,"type")="int"
+	Set gtmtypfldindx("sgmnt_addrs","min_total_nontpjnl_rec_size")=113
+	Set gtmtypes("sgmnt_addrs",114,"name")="sgmnt_addrs.jnl_state"
+	Set gtmtypes("sgmnt_addrs",114,"off")=680
 	Set gtmtypes("sgmnt_addrs",114,"len")=4
 	Set gtmtypes("sgmnt_addrs",114,"type")="int"
-	Set gtmtypfldindx("sgmnt_addrs","ref_cnt")=114
-	Set gtmtypes("sgmnt_addrs",115,"name")="sgmnt_addrs.fid_index"
-	Set gtmtypes("sgmnt_addrs",115,"off")=680
+	Set gtmtypfldindx("sgmnt_addrs","jnl_state")=114
+	Set gtmtypes("sgmnt_addrs",115,"name")="sgmnt_addrs.repl_state"
+	Set gtmtypes("sgmnt_addrs",115,"off")=684
 	Set gtmtypes("sgmnt_addrs",115,"len")=4
 	Set gtmtypes("sgmnt_addrs",115,"type")="int"
-	Set gtmtypfldindx("sgmnt_addrs","fid_index")=115
-	Set gtmtypes("sgmnt_addrs",116,"name")="sgmnt_addrs.do_fullblockwrites"
-	Set gtmtypes("sgmnt_addrs",116,"off")=684
+	Set gtmtypfldindx("sgmnt_addrs","repl_state")=115
+	Set gtmtypes("sgmnt_addrs",116,"name")="sgmnt_addrs.crit_check_cycle"
+	Set gtmtypes("sgmnt_addrs",116,"off")=688
 	Set gtmtypes("sgmnt_addrs",116,"len")=4
-	Set gtmtypes("sgmnt_addrs",116,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_addrs","do_fullblockwrites")=116
-	Set gtmtypes("sgmnt_addrs",117,"name")="sgmnt_addrs.regnum"
-	Set gtmtypes("sgmnt_addrs",117,"off")=688
+	Set gtmtypes("sgmnt_addrs",116,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_addrs","crit_check_cycle")=116
+	Set gtmtypes("sgmnt_addrs",117,"name")="sgmnt_addrs.backup_in_prog"
+	Set gtmtypes("sgmnt_addrs",117,"off")=692
 	Set gtmtypes("sgmnt_addrs",117,"len")=4
 	Set gtmtypes("sgmnt_addrs",117,"type")="int"
-	Set gtmtypfldindx("sgmnt_addrs","regnum")=117
-	Set gtmtypes("sgmnt_addrs",118,"name")="sgmnt_addrs.n_pre_read_trigger"
-	Set gtmtypes("sgmnt_addrs",118,"off")=692
+	Set gtmtypfldindx("sgmnt_addrs","backup_in_prog")=117
+	Set gtmtypes("sgmnt_addrs",118,"name")="sgmnt_addrs.snapshot_in_prog"
+	Set gtmtypes("sgmnt_addrs",118,"off")=696
 	Set gtmtypes("sgmnt_addrs",118,"len")=4
-	Set gtmtypes("sgmnt_addrs",118,"type")="int"
-	Set gtmtypfldindx("sgmnt_addrs","n_pre_read_trigger")=118
-	Set gtmtypes("sgmnt_addrs",119,"name")="sgmnt_addrs.jnlpool_validate_check"
-	Set gtmtypes("sgmnt_addrs",119,"off")=696
+	Set gtmtypes("sgmnt_addrs",118,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_addrs","snapshot_in_prog")=118
+	Set gtmtypes("sgmnt_addrs",119,"name")="sgmnt_addrs.ref_cnt"
+	Set gtmtypes("sgmnt_addrs",119,"off")=700
 	Set gtmtypes("sgmnt_addrs",119,"len")=4
-	Set gtmtypes("sgmnt_addrs",119,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_addrs","jnlpool_validate_check")=119
-	Set gtmtypes("sgmnt_addrs",120,"name")="sgmnt_addrs.regcnt"
-	Set gtmtypes("sgmnt_addrs",120,"off")=700
+	Set gtmtypes("sgmnt_addrs",119,"type")="int"
+	Set gtmtypfldindx("sgmnt_addrs","ref_cnt")=119
+	Set gtmtypes("sgmnt_addrs",120,"name")="sgmnt_addrs.fid_index"
+	Set gtmtypes("sgmnt_addrs",120,"off")=704
 	Set gtmtypes("sgmnt_addrs",120,"len")=4
 	Set gtmtypes("sgmnt_addrs",120,"type")="int"
-	Set gtmtypfldindx("sgmnt_addrs","regcnt")=120
-	Set gtmtypes("sgmnt_addrs",121,"name")="sgmnt_addrs.t_commit_crit"
-	Set gtmtypes("sgmnt_addrs",121,"off")=704
+	Set gtmtypfldindx("sgmnt_addrs","fid_index")=120
+	Set gtmtypes("sgmnt_addrs",121,"name")="sgmnt_addrs.do_fullblockwrites"
+	Set gtmtypes("sgmnt_addrs",121,"off")=708
 	Set gtmtypes("sgmnt_addrs",121,"len")=4
 	Set gtmtypes("sgmnt_addrs",121,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_addrs","t_commit_crit")=121
-	Set gtmtypes("sgmnt_addrs",122,"name")="sgmnt_addrs.wcs_pidcnt_incremented"
-	Set gtmtypes("sgmnt_addrs",122,"off")=708
+	Set gtmtypfldindx("sgmnt_addrs","do_fullblockwrites")=121
+	Set gtmtypes("sgmnt_addrs",122,"name")="sgmnt_addrs.regnum"
+	Set gtmtypes("sgmnt_addrs",122,"off")=712
 	Set gtmtypes("sgmnt_addrs",122,"len")=4
-	Set gtmtypes("sgmnt_addrs",122,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_addrs","wcs_pidcnt_incremented")=122
-	Set gtmtypes("sgmnt_addrs",123,"name")="sgmnt_addrs.incr_db_trigger_cycle"
-	Set gtmtypes("sgmnt_addrs",123,"off")=712
+	Set gtmtypes("sgmnt_addrs",122,"type")="int"
+	Set gtmtypfldindx("sgmnt_addrs","regnum")=122
+	Set gtmtypes("sgmnt_addrs",123,"name")="sgmnt_addrs.n_pre_read_trigger"
+	Set gtmtypes("sgmnt_addrs",123,"off")=716
 	Set gtmtypes("sgmnt_addrs",123,"len")=4
-	Set gtmtypes("sgmnt_addrs",123,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_addrs","incr_db_trigger_cycle")=123
-	Set gtmtypes("sgmnt_addrs",124,"name")="sgmnt_addrs.db_trigger_cycle"
-	Set gtmtypes("sgmnt_addrs",124,"off")=716
+	Set gtmtypes("sgmnt_addrs",123,"type")="int"
+	Set gtmtypfldindx("sgmnt_addrs","n_pre_read_trigger")=123
+	Set gtmtypes("sgmnt_addrs",124,"name")="sgmnt_addrs.jnlpool_validate_check"
+	Set gtmtypes("sgmnt_addrs",124,"off")=720
 	Set gtmtypes("sgmnt_addrs",124,"len")=4
 	Set gtmtypes("sgmnt_addrs",124,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_addrs","db_trigger_cycle")=124
-	Set gtmtypes("sgmnt_addrs",125,"name")="sgmnt_addrs.db_dztrigger_cycle"
-	Set gtmtypes("sgmnt_addrs",125,"off")=720
+	Set gtmtypfldindx("sgmnt_addrs","jnlpool_validate_check")=124
+	Set gtmtypes("sgmnt_addrs",125,"name")="sgmnt_addrs.regcnt"
+	Set gtmtypes("sgmnt_addrs",125,"off")=724
 	Set gtmtypes("sgmnt_addrs",125,"len")=4
-	Set gtmtypes("sgmnt_addrs",125,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_addrs","db_dztrigger_cycle")=125
-	Set gtmtypes("sgmnt_addrs",126,"name")="sgmnt_addrs.hold_onto_crit"
-	Set gtmtypes("sgmnt_addrs",126,"off")=724
+	Set gtmtypes("sgmnt_addrs",125,"type")="int"
+	Set gtmtypfldindx("sgmnt_addrs","regcnt")=125
+	Set gtmtypes("sgmnt_addrs",126,"name")="sgmnt_addrs.t_commit_crit"
+	Set gtmtypes("sgmnt_addrs",126,"off")=728
 	Set gtmtypes("sgmnt_addrs",126,"len")=4
 	Set gtmtypes("sgmnt_addrs",126,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_addrs","hold_onto_crit")=126
-	Set gtmtypes("sgmnt_addrs",127,"name")="sgmnt_addrs.dse_crit_seize_done"
-	Set gtmtypes("sgmnt_addrs",127,"off")=728
+	Set gtmtypfldindx("sgmnt_addrs","t_commit_crit")=126
+	Set gtmtypes("sgmnt_addrs",127,"name")="sgmnt_addrs.wcs_pidcnt_incremented"
+	Set gtmtypes("sgmnt_addrs",127,"off")=732
 	Set gtmtypes("sgmnt_addrs",127,"len")=4
 	Set gtmtypes("sgmnt_addrs",127,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_addrs","dse_crit_seize_done")=127
-	Set gtmtypes("sgmnt_addrs",128,"name")="sgmnt_addrs.gbuff_limit"
-	Set gtmtypes("sgmnt_addrs",128,"off")=732
+	Set gtmtypfldindx("sgmnt_addrs","wcs_pidcnt_incremented")=127
+	Set gtmtypes("sgmnt_addrs",128,"name")="sgmnt_addrs.incr_db_trigger_cycle"
+	Set gtmtypes("sgmnt_addrs",128,"off")=736
 	Set gtmtypes("sgmnt_addrs",128,"len")=4
-	Set gtmtypes("sgmnt_addrs",128,"type")="int"
-	Set gtmtypfldindx("sgmnt_addrs","gbuff_limit")=128
-	Set gtmtypes("sgmnt_addrs",129,"name")="sgmnt_addrs.our_midnite"
-	Set gtmtypes("sgmnt_addrs",129,"off")=736
+	Set gtmtypes("sgmnt_addrs",128,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_addrs","incr_db_trigger_cycle")=128
+	Set gtmtypes("sgmnt_addrs",129,"name")="sgmnt_addrs.db_trigger_cycle"
+	Set gtmtypes("sgmnt_addrs",129,"off")=740
 	Set gtmtypes("sgmnt_addrs",129,"len")=4
-	Set gtmtypes("sgmnt_addrs",129,"type")="addr"
-	Set gtmtypfldindx("sgmnt_addrs","our_midnite")=129
-	Set gtmtypes("sgmnt_addrs",130,"name")="sgmnt_addrs.root_search_cycle"
-	Set gtmtypes("sgmnt_addrs",130,"off")=740
+	Set gtmtypes("sgmnt_addrs",129,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_addrs","db_trigger_cycle")=129
+	Set gtmtypes("sgmnt_addrs",130,"name")="sgmnt_addrs.db_dztrigger_cycle"
+	Set gtmtypes("sgmnt_addrs",130,"off")=744
 	Set gtmtypes("sgmnt_addrs",130,"len")=4
 	Set gtmtypes("sgmnt_addrs",130,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_addrs","root_search_cycle")=130
-	Set gtmtypes("sgmnt_addrs",131,"name")="sgmnt_addrs.onln_rlbk_cycle"
-	Set gtmtypes("sgmnt_addrs",131,"off")=744
+	Set gtmtypfldindx("sgmnt_addrs","db_dztrigger_cycle")=130
+	Set gtmtypes("sgmnt_addrs",131,"name")="sgmnt_addrs.hold_onto_crit"
+	Set gtmtypes("sgmnt_addrs",131,"off")=748
 	Set gtmtypes("sgmnt_addrs",131,"len")=4
-	Set gtmtypes("sgmnt_addrs",131,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_addrs","onln_rlbk_cycle")=131
-	Set gtmtypes("sgmnt_addrs",132,"name")="sgmnt_addrs.db_onln_rlbkd_cycle"
-	Set gtmtypes("sgmnt_addrs",132,"off")=748
+	Set gtmtypes("sgmnt_addrs",131,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_addrs","hold_onto_crit")=131
+	Set gtmtypes("sgmnt_addrs",132,"name")="sgmnt_addrs.dse_crit_seize_done"
+	Set gtmtypes("sgmnt_addrs",132,"off")=752
 	Set gtmtypes("sgmnt_addrs",132,"len")=4
-	Set gtmtypes("sgmnt_addrs",132,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_addrs","db_onln_rlbkd_cycle")=132
-	Set gtmtypes("sgmnt_addrs",133,"name")="sgmnt_addrs.read_only_fs"
-	Set gtmtypes("sgmnt_addrs",133,"off")=752
+	Set gtmtypes("sgmnt_addrs",132,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_addrs","dse_crit_seize_done")=132
+	Set gtmtypes("sgmnt_addrs",133,"name")="sgmnt_addrs.gbuff_limit"
+	Set gtmtypes("sgmnt_addrs",133,"off")=756
 	Set gtmtypes("sgmnt_addrs",133,"len")=4
-	Set gtmtypes("sgmnt_addrs",133,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_addrs","read_only_fs")=133
-	Set gtmtypes("sgmnt_addrs",134,"name")="sgmnt_addrs.crit_probe"
-	Set gtmtypes("sgmnt_addrs",134,"off")=756
+	Set gtmtypes("sgmnt_addrs",133,"type")="int"
+	Set gtmtypfldindx("sgmnt_addrs","gbuff_limit")=133
+	Set gtmtypes("sgmnt_addrs",134,"name")="sgmnt_addrs.root_search_cycle"
+	Set gtmtypes("sgmnt_addrs",134,"off")=760
 	Set gtmtypes("sgmnt_addrs",134,"len")=4
-	Set gtmtypes("sgmnt_addrs",134,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_addrs","crit_probe")=134
-	Set gtmtypes("sgmnt_addrs",135,"name")="sgmnt_addrs.probecrit_rec"
-	Set gtmtypes("sgmnt_addrs",135,"off")=760
-	Set gtmtypes("sgmnt_addrs",135,"len")=56
-	Set gtmtypes("sgmnt_addrs",135,"type")="probecrit_rec_t"
-	Set gtmtypfldindx("sgmnt_addrs","probecrit_rec")=135
-	Set gtmtypes("sgmnt_addrs",136,"name")="sgmnt_addrs.probecrit_rec.t_get_crit"
-	Set gtmtypes("sgmnt_addrs",136,"off")=760
-	Set gtmtypes("sgmnt_addrs",136,"len")=8
-	Set gtmtypes("sgmnt_addrs",136,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","probecrit_rec.t_get_crit")=136
-	Set gtmtypes("sgmnt_addrs",137,"name")="sgmnt_addrs.probecrit_rec.p_crit_failed"
-	Set gtmtypes("sgmnt_addrs",137,"off")=768
-	Set gtmtypes("sgmnt_addrs",137,"len")=8
-	Set gtmtypes("sgmnt_addrs",137,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","probecrit_rec.p_crit_failed")=137
-	Set gtmtypes("sgmnt_addrs",138,"name")="sgmnt_addrs.probecrit_rec.p_crit_que_slps"
+	Set gtmtypes("sgmnt_addrs",134,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_addrs","root_search_cycle")=134
+	Set gtmtypes("sgmnt_addrs",135,"name")="sgmnt_addrs.onln_rlbk_cycle"
+	Set gtmtypes("sgmnt_addrs",135,"off")=764
+	Set gtmtypes("sgmnt_addrs",135,"len")=4
+	Set gtmtypes("sgmnt_addrs",135,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_addrs","onln_rlbk_cycle")=135
+	Set gtmtypes("sgmnt_addrs",136,"name")="sgmnt_addrs.db_onln_rlbkd_cycle"
+	Set gtmtypes("sgmnt_addrs",136,"off")=768
+	Set gtmtypes("sgmnt_addrs",136,"len")=4
+	Set gtmtypes("sgmnt_addrs",136,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_addrs","db_onln_rlbkd_cycle")=136
+	Set gtmtypes("sgmnt_addrs",137,"name")="sgmnt_addrs.reservedDBFlags"
+	Set gtmtypes("sgmnt_addrs",137,"off")=772
+	Set gtmtypes("sgmnt_addrs",137,"len")=4
+	Set gtmtypes("sgmnt_addrs",137,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_addrs","reservedDBFlags")=137
+	Set gtmtypes("sgmnt_addrs",138,"name")="sgmnt_addrs.read_only_fs"
 	Set gtmtypes("sgmnt_addrs",138,"off")=776
-	Set gtmtypes("sgmnt_addrs",138,"len")=8
-	Set gtmtypes("sgmnt_addrs",138,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","probecrit_rec.p_crit_que_slps")=138
-	Set gtmtypes("sgmnt_addrs",139,"name")="sgmnt_addrs.probecrit_rec.p_crit_yields"
-	Set gtmtypes("sgmnt_addrs",139,"off")=784
-	Set gtmtypes("sgmnt_addrs",139,"len")=8
-	Set gtmtypes("sgmnt_addrs",139,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","probecrit_rec.p_crit_yields")=139
-	Set gtmtypes("sgmnt_addrs",140,"name")="sgmnt_addrs.probecrit_rec.p_crit_que_full"
-	Set gtmtypes("sgmnt_addrs",140,"off")=792
-	Set gtmtypes("sgmnt_addrs",140,"len")=8
-	Set gtmtypes("sgmnt_addrs",140,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","probecrit_rec.p_crit_que_full")=140
-	Set gtmtypes("sgmnt_addrs",141,"name")="sgmnt_addrs.probecrit_rec.p_crit_que_slots"
-	Set gtmtypes("sgmnt_addrs",141,"off")=800
-	Set gtmtypes("sgmnt_addrs",141,"len")=8
-	Set gtmtypes("sgmnt_addrs",141,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","probecrit_rec.p_crit_que_slots")=141
-	Set gtmtypes("sgmnt_addrs",142,"name")="sgmnt_addrs.probecrit_rec.p_crit_success"
-	Set gtmtypes("sgmnt_addrs",142,"off")=808
+	Set gtmtypes("sgmnt_addrs",138,"len")=4
+	Set gtmtypes("sgmnt_addrs",138,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_addrs","read_only_fs")=138
+	Set gtmtypes("sgmnt_addrs",139,"name")="sgmnt_addrs.crit_probe"
+	Set gtmtypes("sgmnt_addrs",139,"off")=780
+	Set gtmtypes("sgmnt_addrs",139,"len")=4
+	Set gtmtypes("sgmnt_addrs",139,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_addrs","crit_probe")=139
+	Set gtmtypes("sgmnt_addrs",140,"name")="sgmnt_addrs.canceled_flush_timer"
+	Set gtmtypes("sgmnt_addrs",140,"off")=784
+	Set gtmtypes("sgmnt_addrs",140,"len")=4
+	Set gtmtypes("sgmnt_addrs",140,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_addrs","canceled_flush_timer")=140
+	Set gtmtypes("sgmnt_addrs",141,"name")="sgmnt_addrs.probecrit_rec"
+	Set gtmtypes("sgmnt_addrs",141,"off")=788
+	Set gtmtypes("sgmnt_addrs",141,"len")=56
+	Set gtmtypes("sgmnt_addrs",141,"type")="probecrit_rec_t"
+	Set gtmtypfldindx("sgmnt_addrs","probecrit_rec")=141
+	Set gtmtypes("sgmnt_addrs",142,"name")="sgmnt_addrs.probecrit_rec.t_get_crit"
+	Set gtmtypes("sgmnt_addrs",142,"off")=788
 	Set gtmtypes("sgmnt_addrs",142,"len")=8
 	Set gtmtypes("sgmnt_addrs",142,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","probecrit_rec.p_crit_success")=142
+	Set gtmtypfldindx("sgmnt_addrs","probecrit_rec.t_get_crit")=142
+	Set gtmtypes("sgmnt_addrs",143,"name")="sgmnt_addrs.probecrit_rec.p_crit_failed"
+	Set gtmtypes("sgmnt_addrs",143,"off")=796
+	Set gtmtypes("sgmnt_addrs",143,"len")=8
+	Set gtmtypes("sgmnt_addrs",143,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_addrs","probecrit_rec.p_crit_failed")=143
+	Set gtmtypes("sgmnt_addrs",144,"name")="sgmnt_addrs.probecrit_rec.p_crit_que_slps"
+	Set gtmtypes("sgmnt_addrs",144,"off")=804
+	Set gtmtypes("sgmnt_addrs",144,"len")=8
+	Set gtmtypes("sgmnt_addrs",144,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_addrs","probecrit_rec.p_crit_que_slps")=144
+	Set gtmtypes("sgmnt_addrs",145,"name")="sgmnt_addrs.probecrit_rec.p_crit_yields"
+	Set gtmtypes("sgmnt_addrs",145,"off")=812
+	Set gtmtypes("sgmnt_addrs",145,"len")=8
+	Set gtmtypes("sgmnt_addrs",145,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_addrs","probecrit_rec.p_crit_yields")=145
+	Set gtmtypes("sgmnt_addrs",146,"name")="sgmnt_addrs.probecrit_rec.p_crit_que_full"
+	Set gtmtypes("sgmnt_addrs",146,"off")=820
+	Set gtmtypes("sgmnt_addrs",146,"len")=8
+	Set gtmtypes("sgmnt_addrs",146,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_addrs","probecrit_rec.p_crit_que_full")=146
+	Set gtmtypes("sgmnt_addrs",147,"name")="sgmnt_addrs.probecrit_rec.p_crit_que_slots"
+	Set gtmtypes("sgmnt_addrs",147,"off")=828
+	Set gtmtypes("sgmnt_addrs",147,"len")=8
+	Set gtmtypes("sgmnt_addrs",147,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_addrs","probecrit_rec.p_crit_que_slots")=147
+	Set gtmtypes("sgmnt_addrs",148,"name")="sgmnt_addrs.probecrit_rec.p_crit_success"
+	Set gtmtypes("sgmnt_addrs",148,"off")=836
+	Set gtmtypes("sgmnt_addrs",148,"len")=8
+	Set gtmtypes("sgmnt_addrs",148,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_addrs","probecrit_rec.p_crit_success")=148
+	Set gtmtypes("sgmnt_addrs",149,"name")="sgmnt_addrs.lock_crit_with_db"
+	Set gtmtypes("sgmnt_addrs",149,"off")=844
+	Set gtmtypes("sgmnt_addrs",149,"len")=4
+	Set gtmtypes("sgmnt_addrs",149,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_addrs","lock_crit_with_db")=149
+	Set gtmtypes("sgmnt_addrs",150,"name")="sgmnt_addrs.needs_post_freeze_online_clean"
+	Set gtmtypes("sgmnt_addrs",150,"off")=848
+	Set gtmtypes("sgmnt_addrs",150,"len")=4
+	Set gtmtypes("sgmnt_addrs",150,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_addrs","needs_post_freeze_online_clean")=150
+	Set gtmtypes("sgmnt_addrs",151,"name")="sgmnt_addrs.needs_post_freeze_flushsync"
+	Set gtmtypes("sgmnt_addrs",151,"off")=852
+	Set gtmtypes("sgmnt_addrs",151,"len")=4
+	Set gtmtypes("sgmnt_addrs",151,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_addrs","needs_post_freeze_flushsync")=151
+	Set gtmtypes("sgmnt_addrs",152,"name")="sgmnt_addrs.tp_hint"
+	Set gtmtypes("sgmnt_addrs",152,"off")=856
+	Set gtmtypes("sgmnt_addrs",152,"len")=4
+	Set gtmtypes("sgmnt_addrs",152,"type")="int"
+	Set gtmtypfldindx("sgmnt_addrs","tp_hint")=152
+	Set gtmtypes("sgmnt_addrs",153,"name")="sgmnt_addrs.statsDB_setup_completed"
+	Set gtmtypes("sgmnt_addrs",153,"off")=860
+	Set gtmtypes("sgmnt_addrs",153,"len")=4
+	Set gtmtypes("sgmnt_addrs",153,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_addrs","statsDB_setup_completed")=153
 	;
 	Set gtmtypes("sgmnt_data")="struct"
-	Set gtmtypes("sgmnt_data",0)=565
+	Set gtmtypes("sgmnt_data",0)=586
 	Set gtmtypes("sgmnt_data","len")=8192
 	Set gtmtypes("sgmnt_data",1,"name")="sgmnt_data.label"
 	Set gtmtypes("sgmnt_data",1,"off")=0
@@ -26582,7 +27033,7 @@ Init
 	Set gtmtypes("sgmnt_data",18,"name")="sgmnt_data.null_subs"
 	Set gtmtypes("sgmnt_data",18,"off")=76
 	Set gtmtypes("sgmnt_data",18,"len")=4
-	Set gtmtypes("sgmnt_data",18,"type")="boolean_t"
+	Set gtmtypes("sgmnt_data",18,"type")="int"
 	Set gtmtypfldindx("sgmnt_data","null_subs")=18
 	Set gtmtypes("sgmnt_data",19,"name")="sgmnt_data.free_space"
 	Set gtmtypes("sgmnt_data",19,"off")=80
@@ -26664,11 +27115,11 @@ Init
 	Set gtmtypes("sgmnt_data",34,"len")=4
 	Set gtmtypes("sgmnt_data",34,"type")="int"
 	Set gtmtypfldindx("sgmnt_data","creation_time4")=34
-	Set gtmtypes("sgmnt_data",35,"name")="sgmnt_data.creation_filler_8byte"
+	Set gtmtypes("sgmnt_data",35,"name")="sgmnt_data.reservedDBFlags"
 	Set gtmtypes("sgmnt_data",35,"off")=188
 	Set gtmtypes("sgmnt_data",35,"len")=4
-	Set gtmtypes("sgmnt_data",35,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","creation_filler_8byte")=35
+	Set gtmtypes("sgmnt_data",35,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","reservedDBFlags")=35
 	Set gtmtypes("sgmnt_data",36,"name")="sgmnt_data.max_tn"
 	Set gtmtypes("sgmnt_data",36,"off")=192
 	Set gtmtypes("sgmnt_data",36,"len")=8
@@ -26749,2592 +27200,2697 @@ Init
 	Set gtmtypes("sgmnt_data",51,"len")=4
 	Set gtmtypes("sgmnt_data",51,"type")="int"
 	Set gtmtypfldindx("sgmnt_data","abandoned_kills")=51
-	Set gtmtypes("sgmnt_data",52,"name")="sgmnt_data.filler_320"
+	Set gtmtypes("sgmnt_data",52,"name")="sgmnt_data.freeze_online"
 	Set gtmtypes("sgmnt_data",52,"off")=312
-	Set gtmtypes("sgmnt_data",52,"len")=8
-	Set gtmtypes("sgmnt_data",52,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","filler_320")=52
-	Set gtmtypes("sgmnt_data",53,"name")="sgmnt_data.tn_upgrd_blks_0"
-	Set gtmtypes("sgmnt_data",53,"off")=320
-	Set gtmtypes("sgmnt_data",53,"len")=8
-	Set gtmtypes("sgmnt_data",53,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","tn_upgrd_blks_0")=53
-	Set gtmtypes("sgmnt_data",54,"name")="sgmnt_data.desired_db_format_tn"
-	Set gtmtypes("sgmnt_data",54,"off")=328
+	Set gtmtypes("sgmnt_data",52,"len")=4
+	Set gtmtypes("sgmnt_data",52,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","freeze_online")=52
+	Set gtmtypes("sgmnt_data",53,"name")="sgmnt_data.filler_320"
+	Set gtmtypes("sgmnt_data",53,"off")=316
+	Set gtmtypes("sgmnt_data",53,"len")=4
+	Set gtmtypes("sgmnt_data",53,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","filler_320")=53
+	Set gtmtypes("sgmnt_data",54,"name")="sgmnt_data.tn_upgrd_blks_0"
+	Set gtmtypes("sgmnt_data",54,"off")=320
 	Set gtmtypes("sgmnt_data",54,"len")=8
 	Set gtmtypes("sgmnt_data",54,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","desired_db_format_tn")=54
-	Set gtmtypes("sgmnt_data",55,"name")="sgmnt_data.reorg_db_fmt_start_tn"
-	Set gtmtypes("sgmnt_data",55,"off")=336
+	Set gtmtypfldindx("sgmnt_data","tn_upgrd_blks_0")=54
+	Set gtmtypes("sgmnt_data",55,"name")="sgmnt_data.desired_db_format_tn"
+	Set gtmtypes("sgmnt_data",55,"off")=328
 	Set gtmtypes("sgmnt_data",55,"len")=8
 	Set gtmtypes("sgmnt_data",55,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","reorg_db_fmt_start_tn")=55
-	Set gtmtypes("sgmnt_data",56,"name")="sgmnt_data.reorg_upgrd_dwngrd_restart_block"
-	Set gtmtypes("sgmnt_data",56,"off")=344
-	Set gtmtypes("sgmnt_data",56,"len")=4
-	Set gtmtypes("sgmnt_data",56,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","reorg_upgrd_dwngrd_restart_block")=56
-	Set gtmtypes("sgmnt_data",57,"name")="sgmnt_data.blks_to_upgrd"
-	Set gtmtypes("sgmnt_data",57,"off")=348
+	Set gtmtypfldindx("sgmnt_data","desired_db_format_tn")=55
+	Set gtmtypes("sgmnt_data",56,"name")="sgmnt_data.reorg_db_fmt_start_tn"
+	Set gtmtypes("sgmnt_data",56,"off")=336
+	Set gtmtypes("sgmnt_data",56,"len")=8
+	Set gtmtypes("sgmnt_data",56,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","reorg_db_fmt_start_tn")=56
+	Set gtmtypes("sgmnt_data",57,"name")="sgmnt_data.reorg_upgrd_dwngrd_restart_block"
+	Set gtmtypes("sgmnt_data",57,"off")=344
 	Set gtmtypes("sgmnt_data",57,"len")=4
 	Set gtmtypes("sgmnt_data",57,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","blks_to_upgrd")=57
-	Set gtmtypes("sgmnt_data",58,"name")="sgmnt_data.blks_to_upgrd_subzero_error"
-	Set gtmtypes("sgmnt_data",58,"off")=352
+	Set gtmtypfldindx("sgmnt_data","reorg_upgrd_dwngrd_restart_block")=57
+	Set gtmtypes("sgmnt_data",58,"name")="sgmnt_data.blks_to_upgrd"
+	Set gtmtypes("sgmnt_data",58,"off")=348
 	Set gtmtypes("sgmnt_data",58,"len")=4
 	Set gtmtypes("sgmnt_data",58,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","blks_to_upgrd_subzero_error")=58
-	Set gtmtypes("sgmnt_data",59,"name")="sgmnt_data.desired_db_format"
-	Set gtmtypes("sgmnt_data",59,"off")=356
+	Set gtmtypfldindx("sgmnt_data","blks_to_upgrd")=58
+	Set gtmtypes("sgmnt_data",59,"name")="sgmnt_data.blks_to_upgrd_subzero_error"
+	Set gtmtypes("sgmnt_data",59,"off")=352
 	Set gtmtypes("sgmnt_data",59,"len")=4
 	Set gtmtypes("sgmnt_data",59,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","desired_db_format")=59
-	Set gtmtypes("sgmnt_data",60,"name")="sgmnt_data.fully_upgraded"
-	Set gtmtypes("sgmnt_data",60,"off")=360
+	Set gtmtypfldindx("sgmnt_data","blks_to_upgrd_subzero_error")=59
+	Set gtmtypes("sgmnt_data",60,"name")="sgmnt_data.desired_db_format"
+	Set gtmtypes("sgmnt_data",60,"off")=356
 	Set gtmtypes("sgmnt_data",60,"len")=4
-	Set gtmtypes("sgmnt_data",60,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","fully_upgraded")=60
-	Set gtmtypes("sgmnt_data",61,"name")="sgmnt_data.db_got_to_v5_once"
-	Set gtmtypes("sgmnt_data",61,"off")=364
+	Set gtmtypes("sgmnt_data",60,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","desired_db_format")=60
+	Set gtmtypes("sgmnt_data",61,"name")="sgmnt_data.fully_upgraded"
+	Set gtmtypes("sgmnt_data",61,"off")=360
 	Set gtmtypes("sgmnt_data",61,"len")=4
 	Set gtmtypes("sgmnt_data",61,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","db_got_to_v5_once")=61
-	Set gtmtypes("sgmnt_data",62,"name")="sgmnt_data.opened_by_gtmv53"
-	Set gtmtypes("sgmnt_data",62,"off")=368
+	Set gtmtypfldindx("sgmnt_data","fully_upgraded")=61
+	Set gtmtypes("sgmnt_data",62,"name")="sgmnt_data.db_got_to_v5_once"
+	Set gtmtypes("sgmnt_data",62,"off")=364
 	Set gtmtypes("sgmnt_data",62,"len")=4
 	Set gtmtypes("sgmnt_data",62,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","opened_by_gtmv53")=62
-	Set gtmtypes("sgmnt_data",63,"name")="sgmnt_data.filler_384"
-	Set gtmtypes("sgmnt_data",63,"off")=372
-	Set gtmtypes("sgmnt_data",63,"len")=12
-	Set gtmtypes("sgmnt_data",63,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","filler_384")=63
-	Set gtmtypes("sgmnt_data",64,"name")="sgmnt_data.trans_hist"
-	Set gtmtypes("sgmnt_data",64,"off")=384
-	Set gtmtypes("sgmnt_data",64,"len")=56
-	Set gtmtypes("sgmnt_data",64,"type")="th_index"
-	Set gtmtypfldindx("sgmnt_data","trans_hist")=64
-	Set gtmtypes("sgmnt_data",65,"name")="sgmnt_data.trans_hist.curr_tn"
+	Set gtmtypfldindx("sgmnt_data","db_got_to_v5_once")=62
+	Set gtmtypes("sgmnt_data",63,"name")="sgmnt_data.opened_by_gtmv53"
+	Set gtmtypes("sgmnt_data",63,"off")=368
+	Set gtmtypes("sgmnt_data",63,"len")=4
+	Set gtmtypes("sgmnt_data",63,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","opened_by_gtmv53")=63
+	Set gtmtypes("sgmnt_data",64,"name")="sgmnt_data.filler_384"
+	Set gtmtypes("sgmnt_data",64,"off")=372
+	Set gtmtypes("sgmnt_data",64,"len")=12
+	Set gtmtypes("sgmnt_data",64,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","filler_384")=64
+	Set gtmtypes("sgmnt_data",65,"name")="sgmnt_data.trans_hist"
 	Set gtmtypes("sgmnt_data",65,"off")=384
-	Set gtmtypes("sgmnt_data",65,"len")=8
-	Set gtmtypes("sgmnt_data",65,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","trans_hist.curr_tn")=65
-	Set gtmtypes("sgmnt_data",66,"name")="sgmnt_data.trans_hist.early_tn"
-	Set gtmtypes("sgmnt_data",66,"off")=392
+	Set gtmtypes("sgmnt_data",65,"len")=56
+	Set gtmtypes("sgmnt_data",65,"type")="th_index"
+	Set gtmtypfldindx("sgmnt_data","trans_hist")=65
+	Set gtmtypes("sgmnt_data",66,"name")="sgmnt_data.trans_hist.curr_tn"
+	Set gtmtypes("sgmnt_data",66,"off")=384
 	Set gtmtypes("sgmnt_data",66,"len")=8
 	Set gtmtypes("sgmnt_data",66,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","trans_hist.early_tn")=66
-	Set gtmtypes("sgmnt_data",67,"name")="sgmnt_data.trans_hist.last_mm_sync"
-	Set gtmtypes("sgmnt_data",67,"off")=400
+	Set gtmtypfldindx("sgmnt_data","trans_hist.curr_tn")=66
+	Set gtmtypes("sgmnt_data",67,"name")="sgmnt_data.trans_hist.early_tn"
+	Set gtmtypes("sgmnt_data",67,"off")=392
 	Set gtmtypes("sgmnt_data",67,"len")=8
 	Set gtmtypes("sgmnt_data",67,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","trans_hist.last_mm_sync")=67
-	Set gtmtypes("sgmnt_data",68,"name")="sgmnt_data.trans_hist.filler_8byte"
-	Set gtmtypes("sgmnt_data",68,"off")=408
+	Set gtmtypfldindx("sgmnt_data","trans_hist.early_tn")=67
+	Set gtmtypes("sgmnt_data",68,"name")="sgmnt_data.trans_hist.last_mm_sync"
+	Set gtmtypes("sgmnt_data",68,"off")=400
 	Set gtmtypes("sgmnt_data",68,"len")=8
-	Set gtmtypes("sgmnt_data",68,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","trans_hist.filler_8byte")=68
-	Set gtmtypes("sgmnt_data",69,"name")="sgmnt_data.trans_hist.mm_tn"
-	Set gtmtypes("sgmnt_data",69,"off")=416
+	Set gtmtypes("sgmnt_data",68,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","trans_hist.last_mm_sync")=68
+	Set gtmtypes("sgmnt_data",69,"name")="sgmnt_data.trans_hist.filler_8byte"
+	Set gtmtypes("sgmnt_data",69,"off")=408
 	Set gtmtypes("sgmnt_data",69,"len")=8
-	Set gtmtypes("sgmnt_data",69,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","trans_hist.mm_tn")=69
-	Set gtmtypes("sgmnt_data",70,"name")="sgmnt_data.trans_hist.lock_sequence"
-	Set gtmtypes("sgmnt_data",70,"off")=424
-	Set gtmtypes("sgmnt_data",70,"len")=4
-	Set gtmtypes("sgmnt_data",70,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","trans_hist.lock_sequence")=70
-	Set gtmtypes("sgmnt_data",71,"name")="sgmnt_data.trans_hist.ccp_jnl_filesize"
-	Set gtmtypes("sgmnt_data",71,"off")=428
+	Set gtmtypes("sgmnt_data",69,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","trans_hist.filler_8byte")=69
+	Set gtmtypes("sgmnt_data",70,"name")="sgmnt_data.trans_hist.mm_tn"
+	Set gtmtypes("sgmnt_data",70,"off")=416
+	Set gtmtypes("sgmnt_data",70,"len")=8
+	Set gtmtypes("sgmnt_data",70,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","trans_hist.mm_tn")=70
+	Set gtmtypes("sgmnt_data",71,"name")="sgmnt_data.trans_hist.lock_sequence"
+	Set gtmtypes("sgmnt_data",71,"off")=424
 	Set gtmtypes("sgmnt_data",71,"len")=4
 	Set gtmtypes("sgmnt_data",71,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","trans_hist.ccp_jnl_filesize")=71
-	Set gtmtypes("sgmnt_data",72,"name")="sgmnt_data.trans_hist.total_blks"
-	Set gtmtypes("sgmnt_data",72,"off")=432
+	Set gtmtypfldindx("sgmnt_data","trans_hist.lock_sequence")=71
+	Set gtmtypes("sgmnt_data",72,"name")="sgmnt_data.trans_hist.ccp_jnl_filesize"
+	Set gtmtypes("sgmnt_data",72,"off")=428
 	Set gtmtypes("sgmnt_data",72,"len")=4
 	Set gtmtypes("sgmnt_data",72,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","trans_hist.total_blks")=72
-	Set gtmtypes("sgmnt_data",73,"name")="sgmnt_data.trans_hist.free_blocks"
-	Set gtmtypes("sgmnt_data",73,"off")=436
+	Set gtmtypfldindx("sgmnt_data","trans_hist.ccp_jnl_filesize")=72
+	Set gtmtypes("sgmnt_data",73,"name")="sgmnt_data.trans_hist.total_blks"
+	Set gtmtypes("sgmnt_data",73,"off")=432
 	Set gtmtypes("sgmnt_data",73,"len")=4
 	Set gtmtypes("sgmnt_data",73,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","trans_hist.free_blocks")=73
-	Set gtmtypes("sgmnt_data",74,"name")="sgmnt_data.filler_trans_hist"
-	Set gtmtypes("sgmnt_data",74,"off")=440
-	Set gtmtypes("sgmnt_data",74,"len")=8
-	Set gtmtypes("sgmnt_data",74,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","filler_trans_hist")=74
-	Set gtmtypes("sgmnt_data",75,"name")="sgmnt_data.flush_time"
-	Set gtmtypes("sgmnt_data",75,"off")=448
+	Set gtmtypfldindx("sgmnt_data","trans_hist.total_blks")=73
+	Set gtmtypes("sgmnt_data",74,"name")="sgmnt_data.trans_hist.free_blocks"
+	Set gtmtypes("sgmnt_data",74,"off")=436
+	Set gtmtypes("sgmnt_data",74,"len")=4
+	Set gtmtypes("sgmnt_data",74,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","trans_hist.free_blocks")=74
+	Set gtmtypes("sgmnt_data",75,"name")="sgmnt_data.filler_trans_hist"
+	Set gtmtypes("sgmnt_data",75,"off")=440
 	Set gtmtypes("sgmnt_data",75,"len")=8
-	Set gtmtypes("sgmnt_data",75,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","flush_time")=75
-	Set gtmtypes("sgmnt_data",75,"dim")=2
-	Set gtmtypes("sgmnt_data",76,"name")="sgmnt_data.flush_trigger"
-	Set gtmtypes("sgmnt_data",76,"off")=456
-	Set gtmtypes("sgmnt_data",76,"len")=4
+	Set gtmtypes("sgmnt_data",75,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","filler_trans_hist")=75
+	Set gtmtypes("sgmnt_data",76,"name")="sgmnt_data.flush_time"
+	Set gtmtypes("sgmnt_data",76,"off")=448
+	Set gtmtypes("sgmnt_data",76,"len")=8
 	Set gtmtypes("sgmnt_data",76,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","flush_trigger")=76
-	Set gtmtypes("sgmnt_data",77,"name")="sgmnt_data.n_wrt_per_flu"
-	Set gtmtypes("sgmnt_data",77,"off")=460
+	Set gtmtypfldindx("sgmnt_data","flush_time")=76
+	Set gtmtypes("sgmnt_data",76,"dim")=2
+	Set gtmtypes("sgmnt_data",77,"name")="sgmnt_data.flush_trigger"
+	Set gtmtypes("sgmnt_data",77,"off")=456
 	Set gtmtypes("sgmnt_data",77,"len")=4
 	Set gtmtypes("sgmnt_data",77,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_wrt_per_flu")=77
-	Set gtmtypes("sgmnt_data",78,"name")="sgmnt_data.wait_disk_space"
-	Set gtmtypes("sgmnt_data",78,"off")=464
+	Set gtmtypfldindx("sgmnt_data","flush_trigger")=77
+	Set gtmtypes("sgmnt_data",78,"name")="sgmnt_data.n_wrt_per_flu"
+	Set gtmtypes("sgmnt_data",78,"off")=460
 	Set gtmtypes("sgmnt_data",78,"len")=4
 	Set gtmtypes("sgmnt_data",78,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wait_disk_space")=78
-	Set gtmtypes("sgmnt_data",79,"name")="sgmnt_data.defer_time"
-	Set gtmtypes("sgmnt_data",79,"off")=468
+	Set gtmtypfldindx("sgmnt_data","n_wrt_per_flu")=78
+	Set gtmtypes("sgmnt_data",79,"name")="sgmnt_data.wait_disk_space"
+	Set gtmtypes("sgmnt_data",79,"off")=464
 	Set gtmtypes("sgmnt_data",79,"len")=4
 	Set gtmtypes("sgmnt_data",79,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","defer_time")=79
-	Set gtmtypes("sgmnt_data",80,"name")="sgmnt_data.filler_wc_blocked"
-	Set gtmtypes("sgmnt_data",80,"off")=472
+	Set gtmtypfldindx("sgmnt_data","wait_disk_space")=79
+	Set gtmtypes("sgmnt_data",80,"name")="sgmnt_data.defer_time"
+	Set gtmtypes("sgmnt_data",80,"off")=468
 	Set gtmtypes("sgmnt_data",80,"len")=4
-	Set gtmtypes("sgmnt_data",80,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","filler_wc_blocked")=80
-	Set gtmtypes("sgmnt_data",81,"name")="sgmnt_data.mumps_can_bypass"
-	Set gtmtypes("sgmnt_data",81,"off")=476
+	Set gtmtypes("sgmnt_data",80,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","defer_time")=80
+	Set gtmtypes("sgmnt_data",81,"name")="sgmnt_data.filler_wc_blocked"
+	Set gtmtypes("sgmnt_data",81,"off")=472
 	Set gtmtypes("sgmnt_data",81,"len")=4
 	Set gtmtypes("sgmnt_data",81,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","mumps_can_bypass")=81
-	Set gtmtypes("sgmnt_data",82,"name")="sgmnt_data.epoch_taper"
-	Set gtmtypes("sgmnt_data",82,"off")=480
+	Set gtmtypfldindx("sgmnt_data","filler_wc_blocked")=81
+	Set gtmtypes("sgmnt_data",82,"name")="sgmnt_data.mumps_can_bypass"
+	Set gtmtypes("sgmnt_data",82,"off")=476
 	Set gtmtypes("sgmnt_data",82,"len")=4
 	Set gtmtypes("sgmnt_data",82,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","epoch_taper")=82
-	Set gtmtypes("sgmnt_data",83,"name")="sgmnt_data.epoch_taper_time_pct"
-	Set gtmtypes("sgmnt_data",83,"off")=484
+	Set gtmtypfldindx("sgmnt_data","mumps_can_bypass")=82
+	Set gtmtypes("sgmnt_data",83,"name")="sgmnt_data.epoch_taper"
+	Set gtmtypes("sgmnt_data",83,"off")=480
 	Set gtmtypes("sgmnt_data",83,"len")=4
-	Set gtmtypes("sgmnt_data",83,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","epoch_taper_time_pct")=83
-	Set gtmtypes("sgmnt_data",84,"name")="sgmnt_data.epoch_taper_jnl_pct"
-	Set gtmtypes("sgmnt_data",84,"off")=488
+	Set gtmtypes("sgmnt_data",83,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","epoch_taper")=83
+	Set gtmtypes("sgmnt_data",84,"name")="sgmnt_data.epoch_taper_time_pct"
+	Set gtmtypes("sgmnt_data",84,"off")=484
 	Set gtmtypes("sgmnt_data",84,"len")=4
 	Set gtmtypes("sgmnt_data",84,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","epoch_taper_jnl_pct")=84
-	Set gtmtypes("sgmnt_data",85,"name")="sgmnt_data.filler_512"
-	Set gtmtypes("sgmnt_data",85,"off")=492
+	Set gtmtypfldindx("sgmnt_data","epoch_taper_time_pct")=84
+	Set gtmtypes("sgmnt_data",85,"name")="sgmnt_data.epoch_taper_jnl_pct"
+	Set gtmtypes("sgmnt_data",85,"off")=488
 	Set gtmtypes("sgmnt_data",85,"len")=4
-	Set gtmtypes("sgmnt_data",85,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","filler_512")=85
-	Set gtmtypes("sgmnt_data",86,"name")="sgmnt_data.reserved_for_upd"
-	Set gtmtypes("sgmnt_data",86,"off")=496
+	Set gtmtypes("sgmnt_data",85,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","epoch_taper_jnl_pct")=85
+	Set gtmtypes("sgmnt_data",86,"name")="sgmnt_data.asyncio"
+	Set gtmtypes("sgmnt_data",86,"off")=492
 	Set gtmtypes("sgmnt_data",86,"len")=4
-	Set gtmtypes("sgmnt_data",86,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","reserved_for_upd")=86
-	Set gtmtypes("sgmnt_data",87,"name")="sgmnt_data.avg_blks_per_100gbl"
-	Set gtmtypes("sgmnt_data",87,"off")=500
+	Set gtmtypes("sgmnt_data",86,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","asyncio")=86
+	Set gtmtypes("sgmnt_data",87,"name")="sgmnt_data.reserved_for_upd"
+	Set gtmtypes("sgmnt_data",87,"off")=496
 	Set gtmtypes("sgmnt_data",87,"len")=4
 	Set gtmtypes("sgmnt_data",87,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","avg_blks_per_100gbl")=87
-	Set gtmtypes("sgmnt_data",88,"name")="sgmnt_data.pre_read_trigger_factor"
-	Set gtmtypes("sgmnt_data",88,"off")=504
+	Set gtmtypfldindx("sgmnt_data","reserved_for_upd")=87
+	Set gtmtypes("sgmnt_data",88,"name")="sgmnt_data.avg_blks_per_100gbl"
+	Set gtmtypes("sgmnt_data",88,"off")=500
 	Set gtmtypes("sgmnt_data",88,"len")=4
 	Set gtmtypes("sgmnt_data",88,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","pre_read_trigger_factor")=88
-	Set gtmtypes("sgmnt_data",89,"name")="sgmnt_data.writer_trigger_factor"
-	Set gtmtypes("sgmnt_data",89,"off")=508
+	Set gtmtypfldindx("sgmnt_data","avg_blks_per_100gbl")=88
+	Set gtmtypes("sgmnt_data",89,"name")="sgmnt_data.pre_read_trigger_factor"
+	Set gtmtypes("sgmnt_data",89,"off")=504
 	Set gtmtypes("sgmnt_data",89,"len")=4
 	Set gtmtypes("sgmnt_data",89,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","writer_trigger_factor")=89
-	Set gtmtypes("sgmnt_data",90,"name")="sgmnt_data.semid"
-	Set gtmtypes("sgmnt_data",90,"off")=512
+	Set gtmtypfldindx("sgmnt_data","pre_read_trigger_factor")=89
+	Set gtmtypes("sgmnt_data",90,"name")="sgmnt_data.writer_trigger_factor"
+	Set gtmtypes("sgmnt_data",90,"off")=508
 	Set gtmtypes("sgmnt_data",90,"len")=4
-	Set gtmtypes("sgmnt_data",90,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","semid")=90
-	Set gtmtypes("sgmnt_data",91,"name")="sgmnt_data.shmid"
-	Set gtmtypes("sgmnt_data",91,"off")=516
+	Set gtmtypes("sgmnt_data",90,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","writer_trigger_factor")=90
+	Set gtmtypes("sgmnt_data",91,"name")="sgmnt_data.semid"
+	Set gtmtypes("sgmnt_data",91,"off")=512
 	Set gtmtypes("sgmnt_data",91,"len")=4
 	Set gtmtypes("sgmnt_data",91,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","shmid")=91
-	Set gtmtypes("sgmnt_data",92,"name")="sgmnt_data.gt_sem_ctime"
-	Set gtmtypes("sgmnt_data",92,"off")=520
-	Set gtmtypes("sgmnt_data",92,"len")=8
-	Set gtmtypes("sgmnt_data",92,"type")="gtm_time8"
-	Set gtmtypfldindx("sgmnt_data","gt_sem_ctime")=92
-	Set gtmtypes("sgmnt_data",93,"name")="sgmnt_data.gt_sem_ctime.ctime"
+	Set gtmtypfldindx("sgmnt_data","semid")=91
+	Set gtmtypes("sgmnt_data",92,"name")="sgmnt_data.shmid"
+	Set gtmtypes("sgmnt_data",92,"off")=516
+	Set gtmtypes("sgmnt_data",92,"len")=4
+	Set gtmtypes("sgmnt_data",92,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","shmid")=92
+	Set gtmtypes("sgmnt_data",93,"name")="sgmnt_data.gt_sem_ctime"
 	Set gtmtypes("sgmnt_data",93,"off")=520
-	Set gtmtypes("sgmnt_data",93,"len")=4
-	Set gtmtypes("sgmnt_data",93,"type")="time_t"
-	Set gtmtypfldindx("sgmnt_data","gt_sem_ctime.ctime")=93
-	Set gtmtypes("sgmnt_data",94,"name")="sgmnt_data.gt_sem_ctime.filler"
+	Set gtmtypes("sgmnt_data",93,"len")=8
+	Set gtmtypes("sgmnt_data",93,"type")="gtm_time8"
+	Set gtmtypfldindx("sgmnt_data","gt_sem_ctime")=93
+	Set gtmtypes("sgmnt_data",94,"name")="sgmnt_data.gt_sem_ctime.ctime"
 	Set gtmtypes("sgmnt_data",94,"off")=520
-	Set gtmtypes("sgmnt_data",94,"len")=8
-	Set gtmtypes("sgmnt_data",94,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","gt_sem_ctime.filler")=94
-	Set gtmtypes("sgmnt_data",94,"dim")=2
-	Set gtmtypes("sgmnt_data",95,"name")="sgmnt_data.gt_shm_ctime"
-	Set gtmtypes("sgmnt_data",95,"off")=528
+	Set gtmtypes("sgmnt_data",94,"len")=4
+	Set gtmtypes("sgmnt_data",94,"type")="time_t"
+	Set gtmtypfldindx("sgmnt_data","gt_sem_ctime.ctime")=94
+	Set gtmtypes("sgmnt_data",95,"name")="sgmnt_data.gt_sem_ctime.filler"
+	Set gtmtypes("sgmnt_data",95,"off")=520
 	Set gtmtypes("sgmnt_data",95,"len")=8
-	Set gtmtypes("sgmnt_data",95,"type")="gtm_time8"
-	Set gtmtypfldindx("sgmnt_data","gt_shm_ctime")=95
-	Set gtmtypes("sgmnt_data",96,"name")="sgmnt_data.gt_shm_ctime.ctime"
+	Set gtmtypes("sgmnt_data",95,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","gt_sem_ctime.filler")=95
+	Set gtmtypes("sgmnt_data",95,"dim")=2
+	Set gtmtypes("sgmnt_data",96,"name")="sgmnt_data.gt_shm_ctime"
 	Set gtmtypes("sgmnt_data",96,"off")=528
-	Set gtmtypes("sgmnt_data",96,"len")=4
-	Set gtmtypes("sgmnt_data",96,"type")="time_t"
-	Set gtmtypfldindx("sgmnt_data","gt_shm_ctime.ctime")=96
-	Set gtmtypes("sgmnt_data",97,"name")="sgmnt_data.gt_shm_ctime.filler"
+	Set gtmtypes("sgmnt_data",96,"len")=8
+	Set gtmtypes("sgmnt_data",96,"type")="gtm_time8"
+	Set gtmtypfldindx("sgmnt_data","gt_shm_ctime")=96
+	Set gtmtypes("sgmnt_data",97,"name")="sgmnt_data.gt_shm_ctime.ctime"
 	Set gtmtypes("sgmnt_data",97,"off")=528
-	Set gtmtypes("sgmnt_data",97,"len")=8
-	Set gtmtypes("sgmnt_data",97,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","gt_shm_ctime.filler")=97
-	Set gtmtypes("sgmnt_data",97,"dim")=2
-	Set gtmtypes("sgmnt_data",98,"name")="sgmnt_data.filler_unixonly"
-	Set gtmtypes("sgmnt_data",98,"off")=536
-	Set gtmtypes("sgmnt_data",98,"len")=40
-	Set gtmtypes("sgmnt_data",98,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","filler_unixonly")=98
-	Set gtmtypes("sgmnt_data",99,"name")="sgmnt_data.filler_n_retries"
-	Set gtmtypes("sgmnt_data",99,"off")=576
-	Set gtmtypes("sgmnt_data",99,"len")=20
-	Set gtmtypes("sgmnt_data",99,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","filler_n_retries")=99
-	Set gtmtypes("sgmnt_data",99,"dim")=5
-	Set gtmtypes("sgmnt_data",100,"name")="sgmnt_data.filler_n_puts"
-	Set gtmtypes("sgmnt_data",100,"off")=596
-	Set gtmtypes("sgmnt_data",100,"len")=4
+	Set gtmtypes("sgmnt_data",97,"len")=4
+	Set gtmtypes("sgmnt_data",97,"type")="time_t"
+	Set gtmtypfldindx("sgmnt_data","gt_shm_ctime.ctime")=97
+	Set gtmtypes("sgmnt_data",98,"name")="sgmnt_data.gt_shm_ctime.filler"
+	Set gtmtypes("sgmnt_data",98,"off")=528
+	Set gtmtypes("sgmnt_data",98,"len")=8
+	Set gtmtypes("sgmnt_data",98,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","gt_shm_ctime.filler")=98
+	Set gtmtypes("sgmnt_data",98,"dim")=2
+	Set gtmtypes("sgmnt_data",99,"name")="sgmnt_data.filler_unixonly"
+	Set gtmtypes("sgmnt_data",99,"off")=536
+	Set gtmtypes("sgmnt_data",99,"len")=40
+	Set gtmtypes("sgmnt_data",99,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","filler_unixonly")=99
+	Set gtmtypes("sgmnt_data",100,"name")="sgmnt_data.filler_n_retries"
+	Set gtmtypes("sgmnt_data",100,"off")=576
+	Set gtmtypes("sgmnt_data",100,"len")=20
 	Set gtmtypes("sgmnt_data",100,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","filler_n_puts")=100
-	Set gtmtypes("sgmnt_data",101,"name")="sgmnt_data.filler_n_kills"
-	Set gtmtypes("sgmnt_data",101,"off")=600
+	Set gtmtypfldindx("sgmnt_data","filler_n_retries")=100
+	Set gtmtypes("sgmnt_data",100,"dim")=5
+	Set gtmtypes("sgmnt_data",101,"name")="sgmnt_data.filler_n_puts"
+	Set gtmtypes("sgmnt_data",101,"off")=596
 	Set gtmtypes("sgmnt_data",101,"len")=4
 	Set gtmtypes("sgmnt_data",101,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","filler_n_kills")=101
-	Set gtmtypes("sgmnt_data",102,"name")="sgmnt_data.filler_n_queries"
-	Set gtmtypes("sgmnt_data",102,"off")=604
+	Set gtmtypfldindx("sgmnt_data","filler_n_puts")=101
+	Set gtmtypes("sgmnt_data",102,"name")="sgmnt_data.filler_n_kills"
+	Set gtmtypes("sgmnt_data",102,"off")=600
 	Set gtmtypes("sgmnt_data",102,"len")=4
 	Set gtmtypes("sgmnt_data",102,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","filler_n_queries")=102
-	Set gtmtypes("sgmnt_data",103,"name")="sgmnt_data.filler_n_gets"
-	Set gtmtypes("sgmnt_data",103,"off")=608
+	Set gtmtypfldindx("sgmnt_data","filler_n_kills")=102
+	Set gtmtypes("sgmnt_data",103,"name")="sgmnt_data.filler_n_queries"
+	Set gtmtypes("sgmnt_data",103,"off")=604
 	Set gtmtypes("sgmnt_data",103,"len")=4
 	Set gtmtypes("sgmnt_data",103,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","filler_n_gets")=103
-	Set gtmtypes("sgmnt_data",104,"name")="sgmnt_data.filler_n_order"
-	Set gtmtypes("sgmnt_data",104,"off")=612
+	Set gtmtypfldindx("sgmnt_data","filler_n_queries")=103
+	Set gtmtypes("sgmnt_data",104,"name")="sgmnt_data.filler_n_gets"
+	Set gtmtypes("sgmnt_data",104,"off")=608
 	Set gtmtypes("sgmnt_data",104,"len")=4
 	Set gtmtypes("sgmnt_data",104,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","filler_n_order")=104
-	Set gtmtypes("sgmnt_data",105,"name")="sgmnt_data.filler_n_zprevs"
-	Set gtmtypes("sgmnt_data",105,"off")=616
+	Set gtmtypfldindx("sgmnt_data","filler_n_gets")=104
+	Set gtmtypes("sgmnt_data",105,"name")="sgmnt_data.filler_n_order"
+	Set gtmtypes("sgmnt_data",105,"off")=612
 	Set gtmtypes("sgmnt_data",105,"len")=4
 	Set gtmtypes("sgmnt_data",105,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","filler_n_zprevs")=105
-	Set gtmtypes("sgmnt_data",106,"name")="sgmnt_data.filler_n_data"
-	Set gtmtypes("sgmnt_data",106,"off")=620
+	Set gtmtypfldindx("sgmnt_data","filler_n_order")=105
+	Set gtmtypes("sgmnt_data",106,"name")="sgmnt_data.filler_n_zprevs"
+	Set gtmtypes("sgmnt_data",106,"off")=616
 	Set gtmtypes("sgmnt_data",106,"len")=4
 	Set gtmtypes("sgmnt_data",106,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","filler_n_data")=106
-	Set gtmtypes("sgmnt_data",107,"name")="sgmnt_data.filler_n_puts_duplicate"
-	Set gtmtypes("sgmnt_data",107,"off")=624
+	Set gtmtypfldindx("sgmnt_data","filler_n_zprevs")=106
+	Set gtmtypes("sgmnt_data",107,"name")="sgmnt_data.filler_n_data"
+	Set gtmtypes("sgmnt_data",107,"off")=620
 	Set gtmtypes("sgmnt_data",107,"len")=4
-	Set gtmtypes("sgmnt_data",107,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","filler_n_puts_duplicate")=107
-	Set gtmtypes("sgmnt_data",108,"name")="sgmnt_data.filler_n_tp_updates"
-	Set gtmtypes("sgmnt_data",108,"off")=628
+	Set gtmtypes("sgmnt_data",107,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","filler_n_data")=107
+	Set gtmtypes("sgmnt_data",108,"name")="sgmnt_data.filler_n_puts_duplicate"
+	Set gtmtypes("sgmnt_data",108,"off")=624
 	Set gtmtypes("sgmnt_data",108,"len")=4
 	Set gtmtypes("sgmnt_data",108,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","filler_n_tp_updates")=108
-	Set gtmtypes("sgmnt_data",109,"name")="sgmnt_data.filler_n_tp_updates_duplicate"
-	Set gtmtypes("sgmnt_data",109,"off")=632
+	Set gtmtypfldindx("sgmnt_data","filler_n_puts_duplicate")=108
+	Set gtmtypes("sgmnt_data",109,"name")="sgmnt_data.filler_n_tp_updates"
+	Set gtmtypes("sgmnt_data",109,"off")=628
 	Set gtmtypes("sgmnt_data",109,"len")=4
 	Set gtmtypes("sgmnt_data",109,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","filler_n_tp_updates_duplicate")=109
-	Set gtmtypes("sgmnt_data",110,"name")="sgmnt_data.filler_accounting_64_align"
-	Set gtmtypes("sgmnt_data",110,"off")=636
+	Set gtmtypfldindx("sgmnt_data","filler_n_tp_updates")=109
+	Set gtmtypes("sgmnt_data",110,"name")="sgmnt_data.filler_n_tp_updates_duplicate"
+	Set gtmtypes("sgmnt_data",110,"off")=632
 	Set gtmtypes("sgmnt_data",110,"len")=4
-	Set gtmtypes("sgmnt_data",110,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","filler_accounting_64_align")=110
-	Set gtmtypes("sgmnt_data",111,"name")="sgmnt_data.staleness"
-	Set gtmtypes("sgmnt_data",111,"off")=640
-	Set gtmtypes("sgmnt_data",111,"len")=8
-	Set gtmtypes("sgmnt_data",111,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","staleness")=111
-	Set gtmtypes("sgmnt_data",111,"dim")=2
-	Set gtmtypes("sgmnt_data",112,"name")="sgmnt_data.ccp_tick_interval"
-	Set gtmtypes("sgmnt_data",112,"off")=648
+	Set gtmtypes("sgmnt_data",110,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","filler_n_tp_updates_duplicate")=110
+	Set gtmtypes("sgmnt_data",111,"name")="sgmnt_data.filler_accounting_64_align"
+	Set gtmtypes("sgmnt_data",111,"off")=636
+	Set gtmtypes("sgmnt_data",111,"len")=4
+	Set gtmtypes("sgmnt_data",111,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","filler_accounting_64_align")=111
+	Set gtmtypes("sgmnt_data",112,"name")="sgmnt_data.staleness"
+	Set gtmtypes("sgmnt_data",112,"off")=640
 	Set gtmtypes("sgmnt_data",112,"len")=8
 	Set gtmtypes("sgmnt_data",112,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","ccp_tick_interval")=112
+	Set gtmtypfldindx("sgmnt_data","staleness")=112
 	Set gtmtypes("sgmnt_data",112,"dim")=2
-	Set gtmtypes("sgmnt_data",113,"name")="sgmnt_data.ccp_quantum_interval"
-	Set gtmtypes("sgmnt_data",113,"off")=656
+	Set gtmtypes("sgmnt_data",113,"name")="sgmnt_data.ccp_tick_interval"
+	Set gtmtypes("sgmnt_data",113,"off")=648
 	Set gtmtypes("sgmnt_data",113,"len")=8
 	Set gtmtypes("sgmnt_data",113,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","ccp_quantum_interval")=113
+	Set gtmtypfldindx("sgmnt_data","ccp_tick_interval")=113
 	Set gtmtypes("sgmnt_data",113,"dim")=2
-	Set gtmtypes("sgmnt_data",114,"name")="sgmnt_data.ccp_response_interval"
-	Set gtmtypes("sgmnt_data",114,"off")=664
+	Set gtmtypes("sgmnt_data",114,"name")="sgmnt_data.ccp_quantum_interval"
+	Set gtmtypes("sgmnt_data",114,"off")=656
 	Set gtmtypes("sgmnt_data",114,"len")=8
 	Set gtmtypes("sgmnt_data",114,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","ccp_response_interval")=114
+	Set gtmtypfldindx("sgmnt_data","ccp_quantum_interval")=114
 	Set gtmtypes("sgmnt_data",114,"dim")=2
-	Set gtmtypes("sgmnt_data",115,"name")="sgmnt_data.ccp_jnl_before"
-	Set gtmtypes("sgmnt_data",115,"off")=672
-	Set gtmtypes("sgmnt_data",115,"len")=4
-	Set gtmtypes("sgmnt_data",115,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","ccp_jnl_before")=115
-	Set gtmtypes("sgmnt_data",116,"name")="sgmnt_data.clustered"
-	Set gtmtypes("sgmnt_data",116,"off")=676
+	Set gtmtypes("sgmnt_data",115,"name")="sgmnt_data.ccp_response_interval"
+	Set gtmtypes("sgmnt_data",115,"off")=664
+	Set gtmtypes("sgmnt_data",115,"len")=8
+	Set gtmtypes("sgmnt_data",115,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","ccp_response_interval")=115
+	Set gtmtypes("sgmnt_data",115,"dim")=2
+	Set gtmtypes("sgmnt_data",116,"name")="sgmnt_data.ccp_jnl_before"
+	Set gtmtypes("sgmnt_data",116,"off")=672
 	Set gtmtypes("sgmnt_data",116,"len")=4
 	Set gtmtypes("sgmnt_data",116,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","clustered")=116
-	Set gtmtypes("sgmnt_data",117,"name")="sgmnt_data.unbacked_cache"
-	Set gtmtypes("sgmnt_data",117,"off")=680
+	Set gtmtypfldindx("sgmnt_data","ccp_jnl_before")=116
+	Set gtmtypes("sgmnt_data",117,"name")="sgmnt_data.clustered"
+	Set gtmtypes("sgmnt_data",117,"off")=676
 	Set gtmtypes("sgmnt_data",117,"len")=4
 	Set gtmtypes("sgmnt_data",117,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","unbacked_cache")=117
-	Set gtmtypes("sgmnt_data",118,"name")="sgmnt_data.rc_srv_cnt"
-	Set gtmtypes("sgmnt_data",118,"off")=684
+	Set gtmtypfldindx("sgmnt_data","clustered")=117
+	Set gtmtypes("sgmnt_data",118,"name")="sgmnt_data.unbacked_cache"
+	Set gtmtypes("sgmnt_data",118,"off")=680
 	Set gtmtypes("sgmnt_data",118,"len")=4
-	Set gtmtypes("sgmnt_data",118,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","rc_srv_cnt")=118
-	Set gtmtypes("sgmnt_data",119,"name")="sgmnt_data.dsid"
-	Set gtmtypes("sgmnt_data",119,"off")=688
+	Set gtmtypes("sgmnt_data",118,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","unbacked_cache")=118
+	Set gtmtypes("sgmnt_data",119,"name")="sgmnt_data.rc_srv_cnt"
+	Set gtmtypes("sgmnt_data",119,"off")=684
 	Set gtmtypes("sgmnt_data",119,"len")=4
 	Set gtmtypes("sgmnt_data",119,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","dsid")=119
-	Set gtmtypes("sgmnt_data",120,"name")="sgmnt_data.rc_node"
-	Set gtmtypes("sgmnt_data",120,"off")=692
+	Set gtmtypfldindx("sgmnt_data","rc_srv_cnt")=119
+	Set gtmtypes("sgmnt_data",120,"name")="sgmnt_data.dsid"
+	Set gtmtypes("sgmnt_data",120,"off")=688
 	Set gtmtypes("sgmnt_data",120,"len")=4
 	Set gtmtypes("sgmnt_data",120,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","rc_node")=120
-	Set gtmtypes("sgmnt_data",121,"name")="sgmnt_data.filler_ccp_rc"
-	Set gtmtypes("sgmnt_data",121,"off")=696
-	Set gtmtypes("sgmnt_data",121,"len")=8
-	Set gtmtypes("sgmnt_data",121,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","filler_ccp_rc")=121
-	Set gtmtypes("sgmnt_data",122,"name")="sgmnt_data.reg_seqno"
-	Set gtmtypes("sgmnt_data",122,"off")=704
+	Set gtmtypfldindx("sgmnt_data","dsid")=120
+	Set gtmtypes("sgmnt_data",121,"name")="sgmnt_data.rc_node"
+	Set gtmtypes("sgmnt_data",121,"off")=692
+	Set gtmtypes("sgmnt_data",121,"len")=4
+	Set gtmtypes("sgmnt_data",121,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","rc_node")=121
+	Set gtmtypes("sgmnt_data",122,"name")="sgmnt_data.filler_ccp_rc"
+	Set gtmtypes("sgmnt_data",122,"off")=696
 	Set gtmtypes("sgmnt_data",122,"len")=8
-	Set gtmtypes("sgmnt_data",122,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","reg_seqno")=122
-	Set gtmtypes("sgmnt_data",123,"name")="sgmnt_data.pre_multisite_resync_seqno"
-	Set gtmtypes("sgmnt_data",123,"off")=712
+	Set gtmtypes("sgmnt_data",122,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","filler_ccp_rc")=122
+	Set gtmtypes("sgmnt_data",123,"name")="sgmnt_data.reg_seqno"
+	Set gtmtypes("sgmnt_data",123,"off")=704
 	Set gtmtypes("sgmnt_data",123,"len")=8
 	Set gtmtypes("sgmnt_data",123,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","pre_multisite_resync_seqno")=123
-	Set gtmtypes("sgmnt_data",124,"name")="sgmnt_data.zqgblmod_tn"
-	Set gtmtypes("sgmnt_data",124,"off")=720
+	Set gtmtypfldindx("sgmnt_data","reg_seqno")=123
+	Set gtmtypes("sgmnt_data",124,"name")="sgmnt_data.pre_multisite_resync_seqno"
+	Set gtmtypes("sgmnt_data",124,"off")=712
 	Set gtmtypes("sgmnt_data",124,"len")=8
 	Set gtmtypes("sgmnt_data",124,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","zqgblmod_tn")=124
-	Set gtmtypes("sgmnt_data",125,"name")="sgmnt_data.zqgblmod_seqno"
-	Set gtmtypes("sgmnt_data",125,"off")=728
+	Set gtmtypfldindx("sgmnt_data","pre_multisite_resync_seqno")=124
+	Set gtmtypes("sgmnt_data",125,"name")="sgmnt_data.zqgblmod_tn"
+	Set gtmtypes("sgmnt_data",125,"off")=720
 	Set gtmtypes("sgmnt_data",125,"len")=8
 	Set gtmtypes("sgmnt_data",125,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","zqgblmod_seqno")=125
-	Set gtmtypes("sgmnt_data",126,"name")="sgmnt_data.repl_state"
-	Set gtmtypes("sgmnt_data",126,"off")=736
-	Set gtmtypes("sgmnt_data",126,"len")=4
-	Set gtmtypes("sgmnt_data",126,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","repl_state")=126
-	Set gtmtypes("sgmnt_data",127,"name")="sgmnt_data.multi_site_open"
-	Set gtmtypes("sgmnt_data",127,"off")=740
+	Set gtmtypfldindx("sgmnt_data","zqgblmod_tn")=125
+	Set gtmtypes("sgmnt_data",126,"name")="sgmnt_data.zqgblmod_seqno"
+	Set gtmtypes("sgmnt_data",126,"off")=728
+	Set gtmtypes("sgmnt_data",126,"len")=8
+	Set gtmtypes("sgmnt_data",126,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","zqgblmod_seqno")=126
+	Set gtmtypes("sgmnt_data",127,"name")="sgmnt_data.repl_state"
+	Set gtmtypes("sgmnt_data",127,"off")=736
 	Set gtmtypes("sgmnt_data",127,"len")=4
-	Set gtmtypes("sgmnt_data",127,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","multi_site_open")=127
-	Set gtmtypes("sgmnt_data",128,"name")="sgmnt_data.filler_seqno"
-	Set gtmtypes("sgmnt_data",128,"off")=744
-	Set gtmtypes("sgmnt_data",128,"len")=8
-	Set gtmtypes("sgmnt_data",128,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","filler_seqno")=128
-	Set gtmtypes("sgmnt_data",129,"name")="sgmnt_data.filler_repl"
-	Set gtmtypes("sgmnt_data",129,"off")=752
-	Set gtmtypes("sgmnt_data",129,"len")=16
-	Set gtmtypes("sgmnt_data",129,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","filler_repl")=129
-	Set gtmtypes("sgmnt_data",130,"name")="sgmnt_data.filler_n_tp_retries"
-	Set gtmtypes("sgmnt_data",130,"off")=768
-	Set gtmtypes("sgmnt_data",130,"len")=48
-	Set gtmtypes("sgmnt_data",130,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","filler_n_tp_retries")=130
-	Set gtmtypes("sgmnt_data",130,"dim")=12
-	Set gtmtypes("sgmnt_data",131,"name")="sgmnt_data.filler_n_tp_retries_conflicts"
-	Set gtmtypes("sgmnt_data",131,"off")=816
+	Set gtmtypes("sgmnt_data",127,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","repl_state")=127
+	Set gtmtypes("sgmnt_data",128,"name")="sgmnt_data.multi_site_open"
+	Set gtmtypes("sgmnt_data",128,"off")=740
+	Set gtmtypes("sgmnt_data",128,"len")=4
+	Set gtmtypes("sgmnt_data",128,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","multi_site_open")=128
+	Set gtmtypes("sgmnt_data",129,"name")="sgmnt_data.filler_seqno"
+	Set gtmtypes("sgmnt_data",129,"off")=744
+	Set gtmtypes("sgmnt_data",129,"len")=8
+	Set gtmtypes("sgmnt_data",129,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","filler_seqno")=129
+	Set gtmtypes("sgmnt_data",130,"name")="sgmnt_data.filler_repl"
+	Set gtmtypes("sgmnt_data",130,"off")=752
+	Set gtmtypes("sgmnt_data",130,"len")=16
+	Set gtmtypes("sgmnt_data",130,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","filler_repl")=130
+	Set gtmtypes("sgmnt_data",131,"name")="sgmnt_data.filler_n_tp_retries"
+	Set gtmtypes("sgmnt_data",131,"off")=768
 	Set gtmtypes("sgmnt_data",131,"len")=48
 	Set gtmtypes("sgmnt_data",131,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","filler_n_tp_retries_conflicts")=131
+	Set gtmtypfldindx("sgmnt_data","filler_n_tp_retries")=131
 	Set gtmtypes("sgmnt_data",131,"dim")=12
-	Set gtmtypes("sgmnt_data",132,"name")="sgmnt_data.tp_cdb_sc_blkmod"
-	Set gtmtypes("sgmnt_data",132,"off")=864
-	Set gtmtypes("sgmnt_data",132,"len")=32
+	Set gtmtypes("sgmnt_data",132,"name")="sgmnt_data.filler_n_tp_retries_conflicts"
+	Set gtmtypes("sgmnt_data",132,"off")=816
+	Set gtmtypes("sgmnt_data",132,"len")=48
 	Set gtmtypes("sgmnt_data",132,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","tp_cdb_sc_blkmod")=132
-	Set gtmtypes("sgmnt_data",132,"dim")=8
-	Set gtmtypes("sgmnt_data",133,"name")="sgmnt_data.jnl_alq"
-	Set gtmtypes("sgmnt_data",133,"off")=896
-	Set gtmtypes("sgmnt_data",133,"len")=4
-	Set gtmtypes("sgmnt_data",133,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","jnl_alq")=133
-	Set gtmtypes("sgmnt_data",134,"name")="sgmnt_data.jnl_deq"
-	Set gtmtypes("sgmnt_data",134,"off")=900
+	Set gtmtypfldindx("sgmnt_data","filler_n_tp_retries_conflicts")=132
+	Set gtmtypes("sgmnt_data",132,"dim")=12
+	Set gtmtypes("sgmnt_data",133,"name")="sgmnt_data.tp_cdb_sc_blkmod"
+	Set gtmtypes("sgmnt_data",133,"off")=864
+	Set gtmtypes("sgmnt_data",133,"len")=32
+	Set gtmtypes("sgmnt_data",133,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","tp_cdb_sc_blkmod")=133
+	Set gtmtypes("sgmnt_data",133,"dim")=8
+	Set gtmtypes("sgmnt_data",134,"name")="sgmnt_data.jnl_alq"
+	Set gtmtypes("sgmnt_data",134,"off")=896
 	Set gtmtypes("sgmnt_data",134,"len")=4
 	Set gtmtypes("sgmnt_data",134,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","jnl_deq")=134
-	Set gtmtypes("sgmnt_data",135,"name")="sgmnt_data.jnl_buffer_size"
-	Set gtmtypes("sgmnt_data",135,"off")=904
+	Set gtmtypfldindx("sgmnt_data","jnl_alq")=134
+	Set gtmtypes("sgmnt_data",135,"name")="sgmnt_data.jnl_deq"
+	Set gtmtypes("sgmnt_data",135,"off")=900
 	Set gtmtypes("sgmnt_data",135,"len")=4
-	Set gtmtypes("sgmnt_data",135,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","jnl_buffer_size")=135
-	Set gtmtypes("sgmnt_data",136,"name")="sgmnt_data.jnl_before_image"
-	Set gtmtypes("sgmnt_data",136,"off")=908
+	Set gtmtypes("sgmnt_data",135,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","jnl_deq")=135
+	Set gtmtypes("sgmnt_data",136,"name")="sgmnt_data.jnl_buffer_size"
+	Set gtmtypes("sgmnt_data",136,"off")=904
 	Set gtmtypes("sgmnt_data",136,"len")=4
-	Set gtmtypes("sgmnt_data",136,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","jnl_before_image")=136
-	Set gtmtypes("sgmnt_data",137,"name")="sgmnt_data.jnl_state"
-	Set gtmtypes("sgmnt_data",137,"off")=912
+	Set gtmtypes("sgmnt_data",136,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","jnl_buffer_size")=136
+	Set gtmtypes("sgmnt_data",137,"name")="sgmnt_data.jnl_before_image"
+	Set gtmtypes("sgmnt_data",137,"off")=908
 	Set gtmtypes("sgmnt_data",137,"len")=4
-	Set gtmtypes("sgmnt_data",137,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","jnl_state")=137
-	Set gtmtypes("sgmnt_data",138,"name")="sgmnt_data.jnl_file_len"
-	Set gtmtypes("sgmnt_data",138,"off")=916
+	Set gtmtypes("sgmnt_data",137,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","jnl_before_image")=137
+	Set gtmtypes("sgmnt_data",138,"name")="sgmnt_data.jnl_state"
+	Set gtmtypes("sgmnt_data",138,"off")=912
 	Set gtmtypes("sgmnt_data",138,"len")=4
-	Set gtmtypes("sgmnt_data",138,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","jnl_file_len")=138
-	Set gtmtypes("sgmnt_data",139,"name")="sgmnt_data.autoswitchlimit"
-	Set gtmtypes("sgmnt_data",139,"off")=920
+	Set gtmtypes("sgmnt_data",138,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","jnl_state")=138
+	Set gtmtypes("sgmnt_data",139,"name")="sgmnt_data.jnl_file_len"
+	Set gtmtypes("sgmnt_data",139,"off")=916
 	Set gtmtypes("sgmnt_data",139,"len")=4
 	Set gtmtypes("sgmnt_data",139,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","autoswitchlimit")=139
-	Set gtmtypes("sgmnt_data",140,"name")="sgmnt_data.epoch_interval"
-	Set gtmtypes("sgmnt_data",140,"off")=924
+	Set gtmtypfldindx("sgmnt_data","jnl_file_len")=139
+	Set gtmtypes("sgmnt_data",140,"name")="sgmnt_data.autoswitchlimit"
+	Set gtmtypes("sgmnt_data",140,"off")=920
 	Set gtmtypes("sgmnt_data",140,"len")=4
-	Set gtmtypes("sgmnt_data",140,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","epoch_interval")=140
-	Set gtmtypes("sgmnt_data",141,"name")="sgmnt_data.alignsize"
-	Set gtmtypes("sgmnt_data",141,"off")=928
+	Set gtmtypes("sgmnt_data",140,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","autoswitchlimit")=140
+	Set gtmtypes("sgmnt_data",141,"name")="sgmnt_data.epoch_interval"
+	Set gtmtypes("sgmnt_data",141,"off")=924
 	Set gtmtypes("sgmnt_data",141,"len")=4
-	Set gtmtypes("sgmnt_data",141,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","alignsize")=141
-	Set gtmtypes("sgmnt_data",142,"name")="sgmnt_data.jnl_sync_io"
-	Set gtmtypes("sgmnt_data",142,"off")=932
+	Set gtmtypes("sgmnt_data",141,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","epoch_interval")=141
+	Set gtmtypes("sgmnt_data",142,"name")="sgmnt_data.alignsize"
+	Set gtmtypes("sgmnt_data",142,"off")=928
 	Set gtmtypes("sgmnt_data",142,"len")=4
-	Set gtmtypes("sgmnt_data",142,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","jnl_sync_io")=142
-	Set gtmtypes("sgmnt_data",143,"name")="sgmnt_data.yield_lmt"
-	Set gtmtypes("sgmnt_data",143,"off")=936
+	Set gtmtypes("sgmnt_data",142,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","alignsize")=142
+	Set gtmtypes("sgmnt_data",143,"name")="sgmnt_data.jnl_sync_io"
+	Set gtmtypes("sgmnt_data",143,"off")=932
 	Set gtmtypes("sgmnt_data",143,"len")=4
 	Set gtmtypes("sgmnt_data",143,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","yield_lmt")=143
-	Set gtmtypes("sgmnt_data",144,"name")="sgmnt_data.turn_around_point"
-	Set gtmtypes("sgmnt_data",144,"off")=940
+	Set gtmtypfldindx("sgmnt_data","jnl_sync_io")=143
+	Set gtmtypes("sgmnt_data",144,"name")="sgmnt_data.yield_lmt"
+	Set gtmtypes("sgmnt_data",144,"off")=936
 	Set gtmtypes("sgmnt_data",144,"len")=4
-	Set gtmtypes("sgmnt_data",144,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","turn_around_point")=144
-	Set gtmtypes("sgmnt_data",145,"name")="sgmnt_data.jnl_eovtn"
-	Set gtmtypes("sgmnt_data",145,"off")=944
-	Set gtmtypes("sgmnt_data",145,"len")=8
-	Set gtmtypes("sgmnt_data",145,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","jnl_eovtn")=145
-	Set gtmtypes("sgmnt_data",146,"name")="sgmnt_data.filler_jnl"
-	Set gtmtypes("sgmnt_data",146,"off")=952
+	Set gtmtypes("sgmnt_data",144,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","yield_lmt")=144
+	Set gtmtypes("sgmnt_data",145,"name")="sgmnt_data.turn_around_point"
+	Set gtmtypes("sgmnt_data",145,"off")=940
+	Set gtmtypes("sgmnt_data",145,"len")=4
+	Set gtmtypes("sgmnt_data",145,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","turn_around_point")=145
+	Set gtmtypes("sgmnt_data",146,"name")="sgmnt_data.jnl_eovtn"
+	Set gtmtypes("sgmnt_data",146,"off")=944
 	Set gtmtypes("sgmnt_data",146,"len")=8
-	Set gtmtypes("sgmnt_data",146,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","filler_jnl")=146
-	Set gtmtypes("sgmnt_data",147,"name")="sgmnt_data.intrpt_recov_resync_seqno"
-	Set gtmtypes("sgmnt_data",147,"off")=960
+	Set gtmtypes("sgmnt_data",146,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","jnl_eovtn")=146
+	Set gtmtypes("sgmnt_data",147,"name")="sgmnt_data.filler_jnl"
+	Set gtmtypes("sgmnt_data",147,"off")=952
 	Set gtmtypes("sgmnt_data",147,"len")=8
-	Set gtmtypes("sgmnt_data",147,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","intrpt_recov_resync_seqno")=147
-	Set gtmtypes("sgmnt_data",148,"name")="sgmnt_data.intrpt_recov_tp_resolve_time"
-	Set gtmtypes("sgmnt_data",148,"off")=968
-	Set gtmtypes("sgmnt_data",148,"len")=4
-	Set gtmtypes("sgmnt_data",148,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","intrpt_recov_tp_resolve_time")=148
-	Set gtmtypes("sgmnt_data",149,"name")="sgmnt_data.recov_interrupted"
-	Set gtmtypes("sgmnt_data",149,"off")=972
+	Set gtmtypes("sgmnt_data",147,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","filler_jnl")=147
+	Set gtmtypes("sgmnt_data",148,"name")="sgmnt_data.intrpt_recov_resync_seqno"
+	Set gtmtypes("sgmnt_data",148,"off")=960
+	Set gtmtypes("sgmnt_data",148,"len")=8
+	Set gtmtypes("sgmnt_data",148,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","intrpt_recov_resync_seqno")=148
+	Set gtmtypes("sgmnt_data",149,"name")="sgmnt_data.intrpt_recov_tp_resolve_time"
+	Set gtmtypes("sgmnt_data",149,"off")=968
 	Set gtmtypes("sgmnt_data",149,"len")=4
-	Set gtmtypes("sgmnt_data",149,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","recov_interrupted")=149
-	Set gtmtypes("sgmnt_data",150,"name")="sgmnt_data.intrpt_recov_jnl_state"
-	Set gtmtypes("sgmnt_data",150,"off")=976
+	Set gtmtypes("sgmnt_data",149,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","intrpt_recov_tp_resolve_time")=149
+	Set gtmtypes("sgmnt_data",150,"name")="sgmnt_data.recov_interrupted"
+	Set gtmtypes("sgmnt_data",150,"off")=972
 	Set gtmtypes("sgmnt_data",150,"len")=4
-	Set gtmtypes("sgmnt_data",150,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","intrpt_recov_jnl_state")=150
-	Set gtmtypes("sgmnt_data",151,"name")="sgmnt_data.intrpt_recov_repl_state"
-	Set gtmtypes("sgmnt_data",151,"off")=980
+	Set gtmtypes("sgmnt_data",150,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","recov_interrupted")=150
+	Set gtmtypes("sgmnt_data",151,"name")="sgmnt_data.intrpt_recov_jnl_state"
+	Set gtmtypes("sgmnt_data",151,"off")=976
 	Set gtmtypes("sgmnt_data",151,"len")=4
 	Set gtmtypes("sgmnt_data",151,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","intrpt_recov_repl_state")=151
-	Set gtmtypes("sgmnt_data",152,"name")="sgmnt_data.before_trunc_total_blks"
-	Set gtmtypes("sgmnt_data",152,"off")=984
+	Set gtmtypfldindx("sgmnt_data","intrpt_recov_jnl_state")=151
+	Set gtmtypes("sgmnt_data",152,"name")="sgmnt_data.intrpt_recov_repl_state"
+	Set gtmtypes("sgmnt_data",152,"off")=980
 	Set gtmtypes("sgmnt_data",152,"len")=4
-	Set gtmtypes("sgmnt_data",152,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","before_trunc_total_blks")=152
-	Set gtmtypes("sgmnt_data",153,"name")="sgmnt_data.after_trunc_total_blks"
-	Set gtmtypes("sgmnt_data",153,"off")=988
+	Set gtmtypes("sgmnt_data",152,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","intrpt_recov_repl_state")=152
+	Set gtmtypes("sgmnt_data",153,"name")="sgmnt_data.before_trunc_total_blks"
+	Set gtmtypes("sgmnt_data",153,"off")=984
 	Set gtmtypes("sgmnt_data",153,"len")=4
 	Set gtmtypes("sgmnt_data",153,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","after_trunc_total_blks")=153
-	Set gtmtypes("sgmnt_data",154,"name")="sgmnt_data.before_trunc_free_blocks"
-	Set gtmtypes("sgmnt_data",154,"off")=992
+	Set gtmtypfldindx("sgmnt_data","before_trunc_total_blks")=153
+	Set gtmtypes("sgmnt_data",154,"name")="sgmnt_data.after_trunc_total_blks"
+	Set gtmtypes("sgmnt_data",154,"off")=988
 	Set gtmtypes("sgmnt_data",154,"len")=4
 	Set gtmtypes("sgmnt_data",154,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","before_trunc_free_blocks")=154
-	Set gtmtypes("sgmnt_data",155,"name")="sgmnt_data.filler_trunc"
-	Set gtmtypes("sgmnt_data",155,"off")=996
+	Set gtmtypfldindx("sgmnt_data","after_trunc_total_blks")=154
+	Set gtmtypes("sgmnt_data",155,"name")="sgmnt_data.before_trunc_free_blocks"
+	Set gtmtypes("sgmnt_data",155,"off")=992
 	Set gtmtypes("sgmnt_data",155,"len")=4
 	Set gtmtypes("sgmnt_data",155,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","filler_trunc")=155
-	Set gtmtypes("sgmnt_data",156,"name")="sgmnt_data.filler_1k"
-	Set gtmtypes("sgmnt_data",156,"off")=1000
-	Set gtmtypes("sgmnt_data",156,"len")=24
-	Set gtmtypes("sgmnt_data",156,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","filler_1k")=156
-	Set gtmtypes("sgmnt_data",157,"name")="sgmnt_data.jnl_file_name"
-	Set gtmtypes("sgmnt_data",157,"off")=1024
-	Set gtmtypes("sgmnt_data",157,"len")=256
-	Set gtmtypes("sgmnt_data",157,"type")="unsigned-char"
-	Set gtmtypfldindx("sgmnt_data","jnl_file_name")=157
-	Set gtmtypes("sgmnt_data",158,"name")="sgmnt_data.reorg_restart_key"
-	Set gtmtypes("sgmnt_data",158,"off")=1280
+	Set gtmtypfldindx("sgmnt_data","before_trunc_free_blocks")=155
+	Set gtmtypes("sgmnt_data",156,"name")="sgmnt_data.filler_trunc"
+	Set gtmtypes("sgmnt_data",156,"off")=996
+	Set gtmtypes("sgmnt_data",156,"len")=4
+	Set gtmtypes("sgmnt_data",156,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","filler_trunc")=156
+	Set gtmtypes("sgmnt_data",157,"name")="sgmnt_data.filler_1k"
+	Set gtmtypes("sgmnt_data",157,"off")=1000
+	Set gtmtypes("sgmnt_data",157,"len")=24
+	Set gtmtypes("sgmnt_data",157,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","filler_1k")=157
+	Set gtmtypes("sgmnt_data",158,"name")="sgmnt_data.jnl_file_name"
+	Set gtmtypes("sgmnt_data",158,"off")=1024
 	Set gtmtypes("sgmnt_data",158,"len")=256
 	Set gtmtypes("sgmnt_data",158,"type")="unsigned-char"
-	Set gtmtypfldindx("sgmnt_data","reorg_restart_key")=158
-	Set gtmtypes("sgmnt_data",159,"name")="sgmnt_data.machine_name"
-	Set gtmtypes("sgmnt_data",159,"off")=1536
+	Set gtmtypfldindx("sgmnt_data","jnl_file_name")=158
+	Set gtmtypes("sgmnt_data",159,"name")="sgmnt_data.reorg_restart_key"
+	Set gtmtypes("sgmnt_data",159,"off")=1280
 	Set gtmtypes("sgmnt_data",159,"len")=256
-	Set gtmtypes("sgmnt_data",159,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","machine_name")=159
-	Set gtmtypes("sgmnt_data",160,"name")="sgmnt_data.encryption_hash"
-	Set gtmtypes("sgmnt_data",160,"off")=1792
-	Set gtmtypes("sgmnt_data",160,"len")=80
+	Set gtmtypes("sgmnt_data",159,"type")="unsigned-char"
+	Set gtmtypfldindx("sgmnt_data","reorg_restart_key")=159
+	Set gtmtypes("sgmnt_data",160,"name")="sgmnt_data.machine_name"
+	Set gtmtypes("sgmnt_data",160,"off")=1536
+	Set gtmtypes("sgmnt_data",160,"len")=256
 	Set gtmtypes("sgmnt_data",160,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","encryption_hash")=160
-	Set gtmtypes("sgmnt_data",161,"name")="sgmnt_data.encryption_hash2"
-	Set gtmtypes("sgmnt_data",161,"off")=1872
+	Set gtmtypfldindx("sgmnt_data","machine_name")=160
+	Set gtmtypes("sgmnt_data",161,"name")="sgmnt_data.encryption_hash"
+	Set gtmtypes("sgmnt_data",161,"off")=1792
 	Set gtmtypes("sgmnt_data",161,"len")=80
 	Set gtmtypes("sgmnt_data",161,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","encryption_hash2")=161
-	Set gtmtypes("sgmnt_data",162,"name")="sgmnt_data.non_null_iv"
-	Set gtmtypes("sgmnt_data",162,"off")=1952
-	Set gtmtypes("sgmnt_data",162,"len")=4
-	Set gtmtypes("sgmnt_data",162,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","non_null_iv")=162
-	Set gtmtypes("sgmnt_data",163,"name")="sgmnt_data.encryption_hash_cutoff"
-	Set gtmtypes("sgmnt_data",163,"off")=1956
+	Set gtmtypfldindx("sgmnt_data","encryption_hash")=161
+	Set gtmtypes("sgmnt_data",162,"name")="sgmnt_data.encryption_hash2"
+	Set gtmtypes("sgmnt_data",162,"off")=1872
+	Set gtmtypes("sgmnt_data",162,"len")=80
+	Set gtmtypes("sgmnt_data",162,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","encryption_hash2")=162
+	Set gtmtypes("sgmnt_data",163,"name")="sgmnt_data.non_null_iv"
+	Set gtmtypes("sgmnt_data",163,"off")=1952
 	Set gtmtypes("sgmnt_data",163,"len")=4
-	Set gtmtypes("sgmnt_data",163,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","encryption_hash_cutoff")=163
-	Set gtmtypes("sgmnt_data",164,"name")="sgmnt_data.encryption_hash2_start_tn"
-	Set gtmtypes("sgmnt_data",164,"off")=1960
-	Set gtmtypes("sgmnt_data",164,"len")=8
-	Set gtmtypes("sgmnt_data",164,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","encryption_hash2_start_tn")=164
-	Set gtmtypes("sgmnt_data",165,"name")="sgmnt_data.filler_encrypt"
-	Set gtmtypes("sgmnt_data",165,"off")=1968
-	Set gtmtypes("sgmnt_data",165,"len")=80
-	Set gtmtypes("sgmnt_data",165,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","filler_encrypt")=165
-	Set gtmtypes("sgmnt_data",166,"name")="sgmnt_data.total_buffer_flush_tn"
-	Set gtmtypes("sgmnt_data",166,"off")=2048
-	Set gtmtypes("sgmnt_data",166,"len")=8
-	Set gtmtypes("sgmnt_data",166,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","total_buffer_flush_tn")=166
-	Set gtmtypes("sgmnt_data",167,"name")="sgmnt_data.bufct_buffer_flush_tn"
-	Set gtmtypes("sgmnt_data",167,"off")=2056
+	Set gtmtypes("sgmnt_data",163,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","non_null_iv")=163
+	Set gtmtypes("sgmnt_data",164,"name")="sgmnt_data.encryption_hash_cutoff"
+	Set gtmtypes("sgmnt_data",164,"off")=1956
+	Set gtmtypes("sgmnt_data",164,"len")=4
+	Set gtmtypes("sgmnt_data",164,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","encryption_hash_cutoff")=164
+	Set gtmtypes("sgmnt_data",165,"name")="sgmnt_data.encryption_hash2_start_tn"
+	Set gtmtypes("sgmnt_data",165,"off")=1960
+	Set gtmtypes("sgmnt_data",165,"len")=8
+	Set gtmtypes("sgmnt_data",165,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","encryption_hash2_start_tn")=165
+	Set gtmtypes("sgmnt_data",166,"name")="sgmnt_data.filler_encrypt"
+	Set gtmtypes("sgmnt_data",166,"off")=1968
+	Set gtmtypes("sgmnt_data",166,"len")=80
+	Set gtmtypes("sgmnt_data",166,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","filler_encrypt")=166
+	Set gtmtypes("sgmnt_data",167,"name")="sgmnt_data.total_buffer_flush_tn"
+	Set gtmtypes("sgmnt_data",167,"off")=2048
 	Set gtmtypes("sgmnt_data",167,"len")=8
 	Set gtmtypes("sgmnt_data",167,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","bufct_buffer_flush_tn")=167
-	Set gtmtypes("sgmnt_data",168,"name")="sgmnt_data.bufct_buffer_flush_loop_tn"
-	Set gtmtypes("sgmnt_data",168,"off")=2064
+	Set gtmtypfldindx("sgmnt_data","total_buffer_flush_tn")=167
+	Set gtmtypes("sgmnt_data",168,"name")="sgmnt_data.bufct_buffer_flush_tn"
+	Set gtmtypes("sgmnt_data",168,"off")=2056
 	Set gtmtypes("sgmnt_data",168,"len")=8
 	Set gtmtypes("sgmnt_data",168,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","bufct_buffer_flush_loop_tn")=168
-	Set gtmtypes("sgmnt_data",169,"name")="sgmnt_data.wrt_calls_tn"
-	Set gtmtypes("sgmnt_data",169,"off")=2072
+	Set gtmtypfldindx("sgmnt_data","bufct_buffer_flush_tn")=168
+	Set gtmtypes("sgmnt_data",169,"name")="sgmnt_data.bufct_buffer_flush_loop_tn"
+	Set gtmtypes("sgmnt_data",169,"off")=2064
 	Set gtmtypes("sgmnt_data",169,"len")=8
 	Set gtmtypes("sgmnt_data",169,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wrt_calls_tn")=169
-	Set gtmtypes("sgmnt_data",170,"name")="sgmnt_data.wrt_count_tn"
-	Set gtmtypes("sgmnt_data",170,"off")=2080
+	Set gtmtypfldindx("sgmnt_data","bufct_buffer_flush_loop_tn")=169
+	Set gtmtypes("sgmnt_data",170,"name")="sgmnt_data.wrt_calls_tn"
+	Set gtmtypes("sgmnt_data",170,"off")=2072
 	Set gtmtypes("sgmnt_data",170,"len")=8
 	Set gtmtypes("sgmnt_data",170,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wrt_count_tn")=170
-	Set gtmtypes("sgmnt_data",171,"name")="sgmnt_data.wrt_blocked_tn"
-	Set gtmtypes("sgmnt_data",171,"off")=2088
+	Set gtmtypfldindx("sgmnt_data","wrt_calls_tn")=170
+	Set gtmtypes("sgmnt_data",171,"name")="sgmnt_data.wrt_count_tn"
+	Set gtmtypes("sgmnt_data",171,"off")=2080
 	Set gtmtypes("sgmnt_data",171,"len")=8
 	Set gtmtypes("sgmnt_data",171,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wrt_blocked_tn")=171
-	Set gtmtypes("sgmnt_data",172,"name")="sgmnt_data.wrt_busy_tn"
-	Set gtmtypes("sgmnt_data",172,"off")=2096
+	Set gtmtypfldindx("sgmnt_data","wrt_count_tn")=171
+	Set gtmtypes("sgmnt_data",172,"name")="sgmnt_data.wrt_blocked_tn"
+	Set gtmtypes("sgmnt_data",172,"off")=2088
 	Set gtmtypes("sgmnt_data",172,"len")=8
 	Set gtmtypes("sgmnt_data",172,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wrt_busy_tn")=172
-	Set gtmtypes("sgmnt_data",173,"name")="sgmnt_data.wrt_noblks_wrtn_tn"
-	Set gtmtypes("sgmnt_data",173,"off")=2104
+	Set gtmtypfldindx("sgmnt_data","wrt_blocked_tn")=172
+	Set gtmtypes("sgmnt_data",173,"name")="sgmnt_data.wrt_busy_tn"
+	Set gtmtypes("sgmnt_data",173,"off")=2096
 	Set gtmtypes("sgmnt_data",173,"len")=8
 	Set gtmtypes("sgmnt_data",173,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wrt_noblks_wrtn_tn")=173
-	Set gtmtypes("sgmnt_data",174,"name")="sgmnt_data.reserved_bgtrcrec1_tn"
-	Set gtmtypes("sgmnt_data",174,"off")=2112
+	Set gtmtypfldindx("sgmnt_data","wrt_busy_tn")=173
+	Set gtmtypes("sgmnt_data",174,"name")="sgmnt_data.wrt_noblks_wrtn_tn"
+	Set gtmtypes("sgmnt_data",174,"off")=2104
 	Set gtmtypes("sgmnt_data",174,"len")=8
 	Set gtmtypes("sgmnt_data",174,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","reserved_bgtrcrec1_tn")=174
-	Set gtmtypes("sgmnt_data",175,"name")="sgmnt_data.reserved_bgtrcrec2_tn"
-	Set gtmtypes("sgmnt_data",175,"off")=2120
+	Set gtmtypfldindx("sgmnt_data","wrt_noblks_wrtn_tn")=174
+	Set gtmtypes("sgmnt_data",175,"name")="sgmnt_data.reserved_bgtrcrec1_tn"
+	Set gtmtypes("sgmnt_data",175,"off")=2112
 	Set gtmtypes("sgmnt_data",175,"len")=8
 	Set gtmtypes("sgmnt_data",175,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","reserved_bgtrcrec2_tn")=175
-	Set gtmtypes("sgmnt_data",176,"name")="sgmnt_data.reserved_bgtrcrec3_tn"
-	Set gtmtypes("sgmnt_data",176,"off")=2128
+	Set gtmtypfldindx("sgmnt_data","reserved_bgtrcrec1_tn")=175
+	Set gtmtypes("sgmnt_data",176,"name")="sgmnt_data.reserved_bgtrcrec2_tn"
+	Set gtmtypes("sgmnt_data",176,"off")=2120
 	Set gtmtypes("sgmnt_data",176,"len")=8
 	Set gtmtypes("sgmnt_data",176,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","reserved_bgtrcrec3_tn")=176
-	Set gtmtypes("sgmnt_data",177,"name")="sgmnt_data.lost_block_recovery_tn"
-	Set gtmtypes("sgmnt_data",177,"off")=2136
+	Set gtmtypfldindx("sgmnt_data","reserved_bgtrcrec2_tn")=176
+	Set gtmtypes("sgmnt_data",177,"name")="sgmnt_data.reserved_bgtrcrec3_tn"
+	Set gtmtypes("sgmnt_data",177,"off")=2128
 	Set gtmtypes("sgmnt_data",177,"len")=8
 	Set gtmtypes("sgmnt_data",177,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","lost_block_recovery_tn")=177
-	Set gtmtypes("sgmnt_data",178,"name")="sgmnt_data.wc_blocked_onln_rlbk_tn"
-	Set gtmtypes("sgmnt_data",178,"off")=2144
+	Set gtmtypfldindx("sgmnt_data","reserved_bgtrcrec3_tn")=177
+	Set gtmtypes("sgmnt_data",178,"name")="sgmnt_data.lost_block_recovery_tn"
+	Set gtmtypes("sgmnt_data",178,"off")=2136
 	Set gtmtypes("sgmnt_data",178,"len")=8
 	Set gtmtypes("sgmnt_data",178,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_onln_rlbk_tn")=178
-	Set gtmtypes("sgmnt_data",179,"name")="sgmnt_data.stale_tn"
-	Set gtmtypes("sgmnt_data",179,"off")=2152
+	Set gtmtypfldindx("sgmnt_data","lost_block_recovery_tn")=178
+	Set gtmtypes("sgmnt_data",179,"name")="sgmnt_data.wc_blocked_onln_rlbk_tn"
+	Set gtmtypes("sgmnt_data",179,"off")=2144
 	Set gtmtypes("sgmnt_data",179,"len")=8
 	Set gtmtypes("sgmnt_data",179,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","stale_tn")=179
-	Set gtmtypes("sgmnt_data",180,"name")="sgmnt_data.starved_tn"
-	Set gtmtypes("sgmnt_data",180,"off")=2160
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_onln_rlbk_tn")=179
+	Set gtmtypes("sgmnt_data",180,"name")="sgmnt_data.stale_tn"
+	Set gtmtypes("sgmnt_data",180,"off")=2152
 	Set gtmtypes("sgmnt_data",180,"len")=8
 	Set gtmtypes("sgmnt_data",180,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","starved_tn")=180
-	Set gtmtypes("sgmnt_data",181,"name")="sgmnt_data.stale_timer_started_tn"
-	Set gtmtypes("sgmnt_data",181,"off")=2168
+	Set gtmtypfldindx("sgmnt_data","stale_tn")=180
+	Set gtmtypes("sgmnt_data",181,"name")="sgmnt_data.starved_tn"
+	Set gtmtypes("sgmnt_data",181,"off")=2160
 	Set gtmtypes("sgmnt_data",181,"len")=8
 	Set gtmtypes("sgmnt_data",181,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","stale_timer_started_tn")=181
-	Set gtmtypes("sgmnt_data",182,"name")="sgmnt_data.stale_timer_pop_tn"
-	Set gtmtypes("sgmnt_data",182,"off")=2176
+	Set gtmtypfldindx("sgmnt_data","starved_tn")=181
+	Set gtmtypes("sgmnt_data",182,"name")="sgmnt_data.stale_timer_started_tn"
+	Set gtmtypes("sgmnt_data",182,"off")=2168
 	Set gtmtypes("sgmnt_data",182,"len")=8
 	Set gtmtypes("sgmnt_data",182,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","stale_timer_pop_tn")=182
-	Set gtmtypes("sgmnt_data",183,"name")="sgmnt_data.stale_process_defer_tn"
-	Set gtmtypes("sgmnt_data",183,"off")=2184
+	Set gtmtypfldindx("sgmnt_data","stale_timer_started_tn")=182
+	Set gtmtypes("sgmnt_data",183,"name")="sgmnt_data.stale_timer_pop_tn"
+	Set gtmtypes("sgmnt_data",183,"off")=2176
 	Set gtmtypes("sgmnt_data",183,"len")=8
 	Set gtmtypes("sgmnt_data",183,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","stale_process_defer_tn")=183
-	Set gtmtypes("sgmnt_data",184,"name")="sgmnt_data.stale_defer_processed_tn"
-	Set gtmtypes("sgmnt_data",184,"off")=2192
+	Set gtmtypfldindx("sgmnt_data","stale_timer_pop_tn")=183
+	Set gtmtypes("sgmnt_data",184,"name")="sgmnt_data.stale_process_defer_tn"
+	Set gtmtypes("sgmnt_data",184,"off")=2184
 	Set gtmtypes("sgmnt_data",184,"len")=8
 	Set gtmtypes("sgmnt_data",184,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","stale_defer_processed_tn")=184
-	Set gtmtypes("sgmnt_data",185,"name")="sgmnt_data.spcfc_buffer_flush_tn"
-	Set gtmtypes("sgmnt_data",185,"off")=2200
+	Set gtmtypfldindx("sgmnt_data","stale_process_defer_tn")=184
+	Set gtmtypes("sgmnt_data",185,"name")="sgmnt_data.stale_defer_processed_tn"
+	Set gtmtypes("sgmnt_data",185,"off")=2192
 	Set gtmtypes("sgmnt_data",185,"len")=8
 	Set gtmtypes("sgmnt_data",185,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","spcfc_buffer_flush_tn")=185
-	Set gtmtypes("sgmnt_data",186,"name")="sgmnt_data.spcfc_buffer_flush_loop_tn"
-	Set gtmtypes("sgmnt_data",186,"off")=2208
+	Set gtmtypfldindx("sgmnt_data","stale_defer_processed_tn")=185
+	Set gtmtypes("sgmnt_data",186,"name")="sgmnt_data.spcfc_buffer_flush_tn"
+	Set gtmtypes("sgmnt_data",186,"off")=2200
 	Set gtmtypes("sgmnt_data",186,"len")=8
 	Set gtmtypes("sgmnt_data",186,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","spcfc_buffer_flush_loop_tn")=186
-	Set gtmtypes("sgmnt_data",187,"name")="sgmnt_data.spcfc_buffer_flush_retries_tn"
-	Set gtmtypes("sgmnt_data",187,"off")=2216
+	Set gtmtypfldindx("sgmnt_data","spcfc_buffer_flush_tn")=186
+	Set gtmtypes("sgmnt_data",187,"name")="sgmnt_data.spcfc_buffer_flush_loop_tn"
+	Set gtmtypes("sgmnt_data",187,"off")=2208
 	Set gtmtypes("sgmnt_data",187,"len")=8
 	Set gtmtypes("sgmnt_data",187,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","spcfc_buffer_flush_retries_tn")=187
-	Set gtmtypes("sgmnt_data",188,"name")="sgmnt_data.spcfc_buffer_flushed_during_lockwait_tn"
-	Set gtmtypes("sgmnt_data",188,"off")=2224
+	Set gtmtypfldindx("sgmnt_data","spcfc_buffer_flush_loop_tn")=187
+	Set gtmtypes("sgmnt_data",188,"name")="sgmnt_data.spcfc_buffer_flush_retries_tn"
+	Set gtmtypes("sgmnt_data",188,"off")=2216
 	Set gtmtypes("sgmnt_data",188,"len")=8
 	Set gtmtypes("sgmnt_data",188,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","spcfc_buffer_flushed_during_lockwait_tn")=188
-	Set gtmtypes("sgmnt_data",189,"name")="sgmnt_data.tp_crit_retries_tn"
-	Set gtmtypes("sgmnt_data",189,"off")=2232
+	Set gtmtypfldindx("sgmnt_data","spcfc_buffer_flush_retries_tn")=188
+	Set gtmtypes("sgmnt_data",189,"name")="sgmnt_data.spcfc_buffer_flushed_during_lockwait_tn"
+	Set gtmtypes("sgmnt_data",189,"off")=2224
 	Set gtmtypes("sgmnt_data",189,"len")=8
 	Set gtmtypes("sgmnt_data",189,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","tp_crit_retries_tn")=189
-	Set gtmtypes("sgmnt_data",190,"name")="sgmnt_data.db_csh_getn_flush_dirty_tn"
-	Set gtmtypes("sgmnt_data",190,"off")=2240
+	Set gtmtypfldindx("sgmnt_data","spcfc_buffer_flushed_during_lockwait_tn")=189
+	Set gtmtypes("sgmnt_data",190,"name")="sgmnt_data.tp_crit_retries_tn"
+	Set gtmtypes("sgmnt_data",190,"off")=2232
 	Set gtmtypes("sgmnt_data",190,"len")=8
 	Set gtmtypes("sgmnt_data",190,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","db_csh_getn_flush_dirty_tn")=190
-	Set gtmtypes("sgmnt_data",191,"name")="sgmnt_data.db_csh_getn_rip_wait_tn"
-	Set gtmtypes("sgmnt_data",191,"off")=2248
+	Set gtmtypfldindx("sgmnt_data","tp_crit_retries_tn")=190
+	Set gtmtypes("sgmnt_data",191,"name")="sgmnt_data.db_csh_getn_flush_dirty_tn"
+	Set gtmtypes("sgmnt_data",191,"off")=2240
 	Set gtmtypes("sgmnt_data",191,"len")=8
 	Set gtmtypes("sgmnt_data",191,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","db_csh_getn_rip_wait_tn")=191
-	Set gtmtypes("sgmnt_data",192,"name")="sgmnt_data.db_csh_getn_buf_owner_stuck_tn"
-	Set gtmtypes("sgmnt_data",192,"off")=2256
+	Set gtmtypfldindx("sgmnt_data","db_csh_getn_flush_dirty_tn")=191
+	Set gtmtypes("sgmnt_data",192,"name")="sgmnt_data.db_csh_getn_rip_wait_tn"
+	Set gtmtypes("sgmnt_data",192,"off")=2248
 	Set gtmtypes("sgmnt_data",192,"len")=8
 	Set gtmtypes("sgmnt_data",192,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","db_csh_getn_buf_owner_stuck_tn")=192
-	Set gtmtypes("sgmnt_data",193,"name")="sgmnt_data.db_csh_getn_out_of_design_tn"
-	Set gtmtypes("sgmnt_data",193,"off")=2264
+	Set gtmtypfldindx("sgmnt_data","db_csh_getn_rip_wait_tn")=192
+	Set gtmtypes("sgmnt_data",193,"name")="sgmnt_data.db_csh_getn_buf_owner_stuck_tn"
+	Set gtmtypes("sgmnt_data",193,"off")=2256
 	Set gtmtypes("sgmnt_data",193,"len")=8
 	Set gtmtypes("sgmnt_data",193,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","db_csh_getn_out_of_design_tn")=193
-	Set gtmtypes("sgmnt_data",194,"name")="sgmnt_data.t_qread_buf_owner_stuck_tn"
-	Set gtmtypes("sgmnt_data",194,"off")=2272
+	Set gtmtypfldindx("sgmnt_data","db_csh_getn_buf_owner_stuck_tn")=193
+	Set gtmtypes("sgmnt_data",194,"name")="sgmnt_data.db_csh_getn_out_of_design_tn"
+	Set gtmtypes("sgmnt_data",194,"off")=2264
 	Set gtmtypes("sgmnt_data",194,"len")=8
 	Set gtmtypes("sgmnt_data",194,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","t_qread_buf_owner_stuck_tn")=194
-	Set gtmtypes("sgmnt_data",195,"name")="sgmnt_data.t_qread_out_of_design_tn"
-	Set gtmtypes("sgmnt_data",195,"off")=2280
+	Set gtmtypfldindx("sgmnt_data","db_csh_getn_out_of_design_tn")=194
+	Set gtmtypes("sgmnt_data",195,"name")="sgmnt_data.t_qread_buf_owner_stuck_tn"
+	Set gtmtypes("sgmnt_data",195,"off")=2272
 	Set gtmtypes("sgmnt_data",195,"len")=8
 	Set gtmtypes("sgmnt_data",195,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","t_qread_out_of_design_tn")=195
-	Set gtmtypes("sgmnt_data",196,"name")="sgmnt_data.bt_put_flush_dirty_tn"
-	Set gtmtypes("sgmnt_data",196,"off")=2288
+	Set gtmtypfldindx("sgmnt_data","t_qread_buf_owner_stuck_tn")=195
+	Set gtmtypes("sgmnt_data",196,"name")="sgmnt_data.t_qread_out_of_design_tn"
+	Set gtmtypes("sgmnt_data",196,"off")=2280
 	Set gtmtypes("sgmnt_data",196,"len")=8
 	Set gtmtypes("sgmnt_data",196,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","bt_put_flush_dirty_tn")=196
-	Set gtmtypes("sgmnt_data",197,"name")="sgmnt_data.mlock_wakeups_tn"
-	Set gtmtypes("sgmnt_data",197,"off")=2296
+	Set gtmtypfldindx("sgmnt_data","t_qread_out_of_design_tn")=196
+	Set gtmtypes("sgmnt_data",197,"name")="sgmnt_data.bt_put_flush_dirty_tn"
+	Set gtmtypes("sgmnt_data",197,"off")=2288
 	Set gtmtypes("sgmnt_data",197,"len")=8
 	Set gtmtypes("sgmnt_data",197,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","mlock_wakeups_tn")=197
-	Set gtmtypes("sgmnt_data",198,"name")="sgmnt_data.wc_blocked_wcs_recover_invoked_tn"
-	Set gtmtypes("sgmnt_data",198,"off")=2304
+	Set gtmtypfldindx("sgmnt_data","bt_put_flush_dirty_tn")=197
+	Set gtmtypes("sgmnt_data",198,"name")="sgmnt_data.mlock_wakeups_tn"
+	Set gtmtypes("sgmnt_data",198,"off")=2296
 	Set gtmtypes("sgmnt_data",198,"len")=8
 	Set gtmtypes("sgmnt_data",198,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_recover_invoked_tn")=198
-	Set gtmtypes("sgmnt_data",199,"name")="sgmnt_data.wc_blocked_wcs_verify_passed_tn"
-	Set gtmtypes("sgmnt_data",199,"off")=2312
+	Set gtmtypfldindx("sgmnt_data","mlock_wakeups_tn")=198
+	Set gtmtypes("sgmnt_data",199,"name")="sgmnt_data.wc_blocked_wcs_recover_invoked_tn"
+	Set gtmtypes("sgmnt_data",199,"off")=2304
 	Set gtmtypes("sgmnt_data",199,"len")=8
 	Set gtmtypes("sgmnt_data",199,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_verify_passed_tn")=199
-	Set gtmtypes("sgmnt_data",200,"name")="sgmnt_data.wc_blocked_t_qread_db_csh_getn_invalid_blk_tn"
-	Set gtmtypes("sgmnt_data",200,"off")=2320
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_recover_invoked_tn")=199
+	Set gtmtypes("sgmnt_data",200,"name")="sgmnt_data.wc_blocked_wcs_verify_passed_tn"
+	Set gtmtypes("sgmnt_data",200,"off")=2312
 	Set gtmtypes("sgmnt_data",200,"len")=8
 	Set gtmtypes("sgmnt_data",200,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_db_csh_getn_invalid_blk_tn")=200
-	Set gtmtypes("sgmnt_data",201,"name")="sgmnt_data.wc_blocked_t_qread_db_csh_get_invalid_blk_tn"
-	Set gtmtypes("sgmnt_data",201,"off")=2328
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_verify_passed_tn")=200
+	Set gtmtypes("sgmnt_data",201,"name")="sgmnt_data.wc_blocked_t_qread_db_csh_getn_invalid_blk_tn"
+	Set gtmtypes("sgmnt_data",201,"off")=2320
 	Set gtmtypes("sgmnt_data",201,"len")=8
 	Set gtmtypes("sgmnt_data",201,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_db_csh_get_invalid_blk_tn")=201
-	Set gtmtypes("sgmnt_data",202,"name")="sgmnt_data.wc_blocked_db_csh_getn_loopexceed_tn"
-	Set gtmtypes("sgmnt_data",202,"off")=2336
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_db_csh_getn_invalid_blk_tn")=201
+	Set gtmtypes("sgmnt_data",202,"name")="sgmnt_data.wc_blocked_t_qread_db_csh_get_invalid_blk_tn"
+	Set gtmtypes("sgmnt_data",202,"off")=2328
 	Set gtmtypes("sgmnt_data",202,"len")=8
 	Set gtmtypes("sgmnt_data",202,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_db_csh_getn_loopexceed_tn")=202
-	Set gtmtypes("sgmnt_data",203,"name")="sgmnt_data.wc_blocked_db_csh_getn_wcsstarvewrt_tn"
-	Set gtmtypes("sgmnt_data",203,"off")=2344
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_db_csh_get_invalid_blk_tn")=202
+	Set gtmtypes("sgmnt_data",203,"name")="sgmnt_data.wc_blocked_db_csh_getn_loopexceed_tn"
+	Set gtmtypes("sgmnt_data",203,"off")=2336
 	Set gtmtypes("sgmnt_data",203,"len")=8
 	Set gtmtypes("sgmnt_data",203,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_db_csh_getn_wcsstarvewrt_tn")=203
-	Set gtmtypes("sgmnt_data",204,"name")="sgmnt_data.wc_blocked_db_csh_get_tn"
-	Set gtmtypes("sgmnt_data",204,"off")=2352
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_db_csh_getn_loopexceed_tn")=203
+	Set gtmtypes("sgmnt_data",204,"name")="sgmnt_data.wc_blocked_db_csh_getn_wcsstarvewrt_tn"
+	Set gtmtypes("sgmnt_data",204,"off")=2344
 	Set gtmtypes("sgmnt_data",204,"len")=8
 	Set gtmtypes("sgmnt_data",204,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_db_csh_get_tn")=204
-	Set gtmtypes("sgmnt_data",205,"name")="sgmnt_data.wc_blocked_tp_tend_wcsgetspace_tn"
-	Set gtmtypes("sgmnt_data",205,"off")=2360
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_db_csh_getn_wcsstarvewrt_tn")=204
+	Set gtmtypes("sgmnt_data",205,"name")="sgmnt_data.wc_blocked_db_csh_get_tn"
+	Set gtmtypes("sgmnt_data",205,"off")=2352
 	Set gtmtypes("sgmnt_data",205,"len")=8
 	Set gtmtypes("sgmnt_data",205,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_wcsgetspace_tn")=205
-	Set gtmtypes("sgmnt_data",206,"name")="sgmnt_data.wc_blocked_tp_tend_t1_tn"
-	Set gtmtypes("sgmnt_data",206,"off")=2368
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_db_csh_get_tn")=205
+	Set gtmtypes("sgmnt_data",206,"name")="sgmnt_data.wc_blocked_tp_tend_wcsgetspace_tn"
+	Set gtmtypes("sgmnt_data",206,"off")=2360
 	Set gtmtypes("sgmnt_data",206,"len")=8
 	Set gtmtypes("sgmnt_data",206,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_t1_tn")=206
-	Set gtmtypes("sgmnt_data",207,"name")="sgmnt_data.wc_blocked_tp_tend_bitmap_tn"
-	Set gtmtypes("sgmnt_data",207,"off")=2376
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_wcsgetspace_tn")=206
+	Set gtmtypes("sgmnt_data",207,"name")="sgmnt_data.wc_blocked_tp_tend_t1_tn"
+	Set gtmtypes("sgmnt_data",207,"off")=2368
 	Set gtmtypes("sgmnt_data",207,"len")=8
 	Set gtmtypes("sgmnt_data",207,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_bitmap_tn")=207
-	Set gtmtypes("sgmnt_data",208,"name")="sgmnt_data.wc_blocked_tp_tend_jnl_cwset_tn"
-	Set gtmtypes("sgmnt_data",208,"off")=2384
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_t1_tn")=207
+	Set gtmtypes("sgmnt_data",208,"name")="sgmnt_data.wc_blocked_tp_tend_bitmap_tn"
+	Set gtmtypes("sgmnt_data",208,"off")=2376
 	Set gtmtypes("sgmnt_data",208,"len")=8
 	Set gtmtypes("sgmnt_data",208,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_jnl_cwset_tn")=208
-	Set gtmtypes("sgmnt_data",209,"name")="sgmnt_data.wc_blocked_tp_tend_jnl_wcsflu_tn"
-	Set gtmtypes("sgmnt_data",209,"off")=2392
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_bitmap_tn")=208
+	Set gtmtypes("sgmnt_data",209,"name")="sgmnt_data.wc_blocked_tp_tend_jnl_cwset_tn"
+	Set gtmtypes("sgmnt_data",209,"off")=2384
 	Set gtmtypes("sgmnt_data",209,"len")=8
 	Set gtmtypes("sgmnt_data",209,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_jnl_wcsflu_tn")=209
-	Set gtmtypes("sgmnt_data",210,"name")="sgmnt_data.wc_blocked_t_end_hist_tn"
-	Set gtmtypes("sgmnt_data",210,"off")=2400
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_jnl_cwset_tn")=209
+	Set gtmtypes("sgmnt_data",210,"name")="sgmnt_data.wc_blocked_tp_tend_jnl_wcsflu_tn"
+	Set gtmtypes("sgmnt_data",210,"off")=2392
 	Set gtmtypes("sgmnt_data",210,"len")=8
 	Set gtmtypes("sgmnt_data",210,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_hist_tn")=210
-	Set gtmtypes("sgmnt_data",211,"name")="sgmnt_data.wc_blocked_t_end_hist1_nullbt_tn"
-	Set gtmtypes("sgmnt_data",211,"off")=2408
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_jnl_wcsflu_tn")=210
+	Set gtmtypes("sgmnt_data",211,"name")="sgmnt_data.wc_blocked_t_end_hist_tn"
+	Set gtmtypes("sgmnt_data",211,"off")=2400
 	Set gtmtypes("sgmnt_data",211,"len")=8
 	Set gtmtypes("sgmnt_data",211,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_hist1_nullbt_tn")=211
-	Set gtmtypes("sgmnt_data",212,"name")="sgmnt_data.wc_blocked_t_end_hist1_nonnullbt_tn"
-	Set gtmtypes("sgmnt_data",212,"off")=2416
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_hist_tn")=211
+	Set gtmtypes("sgmnt_data",212,"name")="sgmnt_data.wc_blocked_t_end_hist1_nullbt_tn"
+	Set gtmtypes("sgmnt_data",212,"off")=2408
 	Set gtmtypes("sgmnt_data",212,"len")=8
 	Set gtmtypes("sgmnt_data",212,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_hist1_nonnullbt_tn")=212
-	Set gtmtypes("sgmnt_data",213,"name")="sgmnt_data.wc_blocked_t_end_bitmap_nullbt_tn"
-	Set gtmtypes("sgmnt_data",213,"off")=2424
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_hist1_nullbt_tn")=212
+	Set gtmtypes("sgmnt_data",213,"name")="sgmnt_data.wc_blocked_t_end_hist1_nonnullbt_tn"
+	Set gtmtypes("sgmnt_data",213,"off")=2416
 	Set gtmtypes("sgmnt_data",213,"len")=8
 	Set gtmtypes("sgmnt_data",213,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_bitmap_nullbt_tn")=213
-	Set gtmtypes("sgmnt_data",214,"name")="sgmnt_data.wc_blocked_t_end_bitmap_nonnullbt_tn"
-	Set gtmtypes("sgmnt_data",214,"off")=2432
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_hist1_nonnullbt_tn")=213
+	Set gtmtypes("sgmnt_data",214,"name")="sgmnt_data.wc_blocked_t_end_bitmap_nullbt_tn"
+	Set gtmtypes("sgmnt_data",214,"off")=2424
 	Set gtmtypes("sgmnt_data",214,"len")=8
 	Set gtmtypes("sgmnt_data",214,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_bitmap_nonnullbt_tn")=214
-	Set gtmtypes("sgmnt_data",215,"name")="sgmnt_data.wc_blocked_t_end_jnl_cwset_tn"
-	Set gtmtypes("sgmnt_data",215,"off")=2440
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_bitmap_nullbt_tn")=214
+	Set gtmtypes("sgmnt_data",215,"name")="sgmnt_data.wc_blocked_t_end_bitmap_nonnullbt_tn"
+	Set gtmtypes("sgmnt_data",215,"off")=2432
 	Set gtmtypes("sgmnt_data",215,"len")=8
 	Set gtmtypes("sgmnt_data",215,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_jnl_cwset_tn")=215
-	Set gtmtypes("sgmnt_data",216,"name")="sgmnt_data.wc_blocked_t_end_jnl_wcsflu_tn"
-	Set gtmtypes("sgmnt_data",216,"off")=2448
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_bitmap_nonnullbt_tn")=215
+	Set gtmtypes("sgmnt_data",216,"name")="sgmnt_data.wc_blocked_t_end_jnl_cwset_tn"
+	Set gtmtypes("sgmnt_data",216,"off")=2440
 	Set gtmtypes("sgmnt_data",216,"len")=8
 	Set gtmtypes("sgmnt_data",216,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_jnl_wcsflu_tn")=216
-	Set gtmtypes("sgmnt_data",217,"name")="sgmnt_data.db_csh_get_too_many_loops_tn"
-	Set gtmtypes("sgmnt_data",217,"off")=2456
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_jnl_cwset_tn")=216
+	Set gtmtypes("sgmnt_data",217,"name")="sgmnt_data.wc_blocked_t_end_jnl_wcsflu_tn"
+	Set gtmtypes("sgmnt_data",217,"off")=2448
 	Set gtmtypes("sgmnt_data",217,"len")=8
 	Set gtmtypes("sgmnt_data",217,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","db_csh_get_too_many_loops_tn")=217
-	Set gtmtypes("sgmnt_data",218,"name")="sgmnt_data.wc_blocked_tpckh_hist1_nullbt_tn"
-	Set gtmtypes("sgmnt_data",218,"off")=2464
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_jnl_wcsflu_tn")=217
+	Set gtmtypes("sgmnt_data",218,"name")="sgmnt_data.db_csh_get_too_many_loops_tn"
+	Set gtmtypes("sgmnt_data",218,"off")=2456
 	Set gtmtypes("sgmnt_data",218,"len")=8
 	Set gtmtypes("sgmnt_data",218,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tpckh_hist1_nullbt_tn")=218
-	Set gtmtypes("sgmnt_data",219,"name")="sgmnt_data.wc_blocked_tpckh_hist1_nonnullbt_tn"
-	Set gtmtypes("sgmnt_data",219,"off")=2472
+	Set gtmtypfldindx("sgmnt_data","db_csh_get_too_many_loops_tn")=218
+	Set gtmtypes("sgmnt_data",219,"name")="sgmnt_data.wc_blocked_tpckh_hist1_nullbt_tn"
+	Set gtmtypes("sgmnt_data",219,"off")=2464
 	Set gtmtypes("sgmnt_data",219,"len")=8
 	Set gtmtypes("sgmnt_data",219,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tpckh_hist1_nonnullbt_tn")=219
-	Set gtmtypes("sgmnt_data",220,"name")="sgmnt_data.jnl_blocked_writer_lost_tn"
-	Set gtmtypes("sgmnt_data",220,"off")=2480
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tpckh_hist1_nullbt_tn")=219
+	Set gtmtypes("sgmnt_data",220,"name")="sgmnt_data.wc_blocked_tpckh_hist1_nonnullbt_tn"
+	Set gtmtypes("sgmnt_data",220,"off")=2472
 	Set gtmtypes("sgmnt_data",220,"len")=8
 	Set gtmtypes("sgmnt_data",220,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","jnl_blocked_writer_lost_tn")=220
-	Set gtmtypes("sgmnt_data",221,"name")="sgmnt_data.jnl_blocked_writer_stuck_tn"
-	Set gtmtypes("sgmnt_data",221,"off")=2488
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tpckh_hist1_nonnullbt_tn")=220
+	Set gtmtypes("sgmnt_data",221,"name")="sgmnt_data.jnl_blocked_writer_lost_tn"
+	Set gtmtypes("sgmnt_data",221,"off")=2480
 	Set gtmtypes("sgmnt_data",221,"len")=8
 	Set gtmtypes("sgmnt_data",221,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","jnl_blocked_writer_stuck_tn")=221
-	Set gtmtypes("sgmnt_data",222,"name")="sgmnt_data.jnl_blocked_writer_blocked_tn"
-	Set gtmtypes("sgmnt_data",222,"off")=2496
+	Set gtmtypfldindx("sgmnt_data","jnl_blocked_writer_lost_tn")=221
+	Set gtmtypes("sgmnt_data",222,"name")="sgmnt_data.jnl_blocked_writer_stuck_tn"
+	Set gtmtypes("sgmnt_data",222,"off")=2488
 	Set gtmtypes("sgmnt_data",222,"len")=8
 	Set gtmtypes("sgmnt_data",222,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","jnl_blocked_writer_blocked_tn")=222
-	Set gtmtypes("sgmnt_data",223,"name")="sgmnt_data.n_jnl_fsyncs_tn"
-	Set gtmtypes("sgmnt_data",223,"off")=2504
+	Set gtmtypfldindx("sgmnt_data","jnl_blocked_writer_stuck_tn")=222
+	Set gtmtypes("sgmnt_data",223,"name")="sgmnt_data.jnl_blocked_writer_blocked_tn"
+	Set gtmtypes("sgmnt_data",223,"off")=2496
 	Set gtmtypes("sgmnt_data",223,"len")=8
 	Set gtmtypes("sgmnt_data",223,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","n_jnl_fsyncs_tn")=223
-	Set gtmtypes("sgmnt_data",224,"name")="sgmnt_data.n_jnl_fsync_tries_tn"
-	Set gtmtypes("sgmnt_data",224,"off")=2512
+	Set gtmtypfldindx("sgmnt_data","jnl_blocked_writer_blocked_tn")=223
+	Set gtmtypes("sgmnt_data",224,"name")="sgmnt_data.n_jnl_fsyncs_tn"
+	Set gtmtypes("sgmnt_data",224,"off")=2504
 	Set gtmtypes("sgmnt_data",224,"len")=8
 	Set gtmtypes("sgmnt_data",224,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","n_jnl_fsync_tries_tn")=224
-	Set gtmtypes("sgmnt_data",225,"name")="sgmnt_data.n_jnl_fsync_recovers_tn"
-	Set gtmtypes("sgmnt_data",225,"off")=2520
+	Set gtmtypfldindx("sgmnt_data","n_jnl_fsyncs_tn")=224
+	Set gtmtypes("sgmnt_data",225,"name")="sgmnt_data.n_jnl_fsync_tries_tn"
+	Set gtmtypes("sgmnt_data",225,"off")=2512
 	Set gtmtypes("sgmnt_data",225,"len")=8
 	Set gtmtypes("sgmnt_data",225,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","n_jnl_fsync_recovers_tn")=225
-	Set gtmtypes("sgmnt_data",226,"name")="sgmnt_data.n_db_fsyncs_tn"
-	Set gtmtypes("sgmnt_data",226,"off")=2528
+	Set gtmtypfldindx("sgmnt_data","n_jnl_fsync_tries_tn")=225
+	Set gtmtypes("sgmnt_data",226,"name")="sgmnt_data.n_jnl_fsync_recovers_tn"
+	Set gtmtypes("sgmnt_data",226,"off")=2520
 	Set gtmtypes("sgmnt_data",226,"len")=8
 	Set gtmtypes("sgmnt_data",226,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","n_db_fsyncs_tn")=226
-	Set gtmtypes("sgmnt_data",227,"name")="sgmnt_data.n_db_fsyncs_in_crit_tn"
-	Set gtmtypes("sgmnt_data",227,"off")=2536
+	Set gtmtypfldindx("sgmnt_data","n_jnl_fsync_recovers_tn")=226
+	Set gtmtypes("sgmnt_data",227,"name")="sgmnt_data.n_db_fsyncs_tn"
+	Set gtmtypes("sgmnt_data",227,"off")=2528
 	Set gtmtypes("sgmnt_data",227,"len")=8
 	Set gtmtypes("sgmnt_data",227,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","n_db_fsyncs_in_crit_tn")=227
-	Set gtmtypes("sgmnt_data",228,"name")="sgmnt_data.n_dbsync_timers_tn"
-	Set gtmtypes("sgmnt_data",228,"off")=2544
+	Set gtmtypfldindx("sgmnt_data","n_db_fsyncs_tn")=227
+	Set gtmtypes("sgmnt_data",228,"name")="sgmnt_data.n_db_fsyncs_in_crit_tn"
+	Set gtmtypes("sgmnt_data",228,"off")=2536
 	Set gtmtypes("sgmnt_data",228,"len")=8
 	Set gtmtypes("sgmnt_data",228,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","n_dbsync_timers_tn")=228
-	Set gtmtypes("sgmnt_data",229,"name")="sgmnt_data.n_dbsync_writes_tn"
-	Set gtmtypes("sgmnt_data",229,"off")=2552
+	Set gtmtypfldindx("sgmnt_data","n_db_fsyncs_in_crit_tn")=228
+	Set gtmtypes("sgmnt_data",229,"name")="sgmnt_data.n_dbsync_timers_tn"
+	Set gtmtypes("sgmnt_data",229,"off")=2544
 	Set gtmtypes("sgmnt_data",229,"len")=8
 	Set gtmtypes("sgmnt_data",229,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","n_dbsync_writes_tn")=229
-	Set gtmtypes("sgmnt_data",230,"name")="sgmnt_data.mutex_queue_full_tn"
-	Set gtmtypes("sgmnt_data",230,"off")=2560
+	Set gtmtypfldindx("sgmnt_data","n_dbsync_timers_tn")=229
+	Set gtmtypes("sgmnt_data",230,"name")="sgmnt_data.n_dbsync_writes_tn"
+	Set gtmtypes("sgmnt_data",230,"off")=2552
 	Set gtmtypes("sgmnt_data",230,"len")=8
 	Set gtmtypes("sgmnt_data",230,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","mutex_queue_full_tn")=230
-	Set gtmtypes("sgmnt_data",231,"name")="sgmnt_data.wcb_bt_put_tn"
-	Set gtmtypes("sgmnt_data",231,"off")=2568
+	Set gtmtypfldindx("sgmnt_data","n_dbsync_writes_tn")=230
+	Set gtmtypes("sgmnt_data",231,"name")="sgmnt_data.mutex_queue_full_tn"
+	Set gtmtypes("sgmnt_data",231,"off")=2560
 	Set gtmtypes("sgmnt_data",231,"len")=8
 	Set gtmtypes("sgmnt_data",231,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_bt_put_tn")=231
-	Set gtmtypes("sgmnt_data",232,"name")="sgmnt_data.wcb_mutex_salvage_tn"
-	Set gtmtypes("sgmnt_data",232,"off")=2576
+	Set gtmtypfldindx("sgmnt_data","mutex_queue_full_tn")=231
+	Set gtmtypes("sgmnt_data",232,"name")="sgmnt_data.wcb_bt_put_tn"
+	Set gtmtypes("sgmnt_data",232,"off")=2568
 	Set gtmtypes("sgmnt_data",232,"len")=8
 	Set gtmtypes("sgmnt_data",232,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_mutex_salvage_tn")=232
-	Set gtmtypes("sgmnt_data",233,"name")="sgmnt_data.wcb_tp_grab_crit_tn"
-	Set gtmtypes("sgmnt_data",233,"off")=2584
+	Set gtmtypfldindx("sgmnt_data","wcb_bt_put_tn")=232
+	Set gtmtypes("sgmnt_data",233,"name")="sgmnt_data.wcb_mutex_salvage_tn"
+	Set gtmtypes("sgmnt_data",233,"off")=2576
 	Set gtmtypes("sgmnt_data",233,"len")=8
 	Set gtmtypes("sgmnt_data",233,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_tp_grab_crit_tn")=233
-	Set gtmtypes("sgmnt_data",234,"name")="sgmnt_data.wcb_t_end_sysops_nocr_invcr_tn"
-	Set gtmtypes("sgmnt_data",234,"off")=2592
+	Set gtmtypfldindx("sgmnt_data","wcb_mutex_salvage_tn")=233
+	Set gtmtypes("sgmnt_data",234,"name")="sgmnt_data.wcb_tp_grab_crit_tn"
+	Set gtmtypes("sgmnt_data",234,"off")=2584
 	Set gtmtypes("sgmnt_data",234,"len")=8
 	Set gtmtypes("sgmnt_data",234,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_nocr_invcr_tn")=234
-	Set gtmtypes("sgmnt_data",235,"name")="sgmnt_data.wcb_t_end_sysops_cr_invcr_tn"
-	Set gtmtypes("sgmnt_data",235,"off")=2600
+	Set gtmtypfldindx("sgmnt_data","wcb_tp_grab_crit_tn")=234
+	Set gtmtypes("sgmnt_data",235,"name")="sgmnt_data.wcb_t_end_sysops_nocr_invcr_tn"
+	Set gtmtypes("sgmnt_data",235,"off")=2592
 	Set gtmtypes("sgmnt_data",235,"len")=8
 	Set gtmtypes("sgmnt_data",235,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_cr_invcr_tn")=235
-	Set gtmtypes("sgmnt_data",236,"name")="sgmnt_data.wcb_t_end_sysops_rip_wait_tn"
-	Set gtmtypes("sgmnt_data",236,"off")=2608
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_nocr_invcr_tn")=235
+	Set gtmtypes("sgmnt_data",236,"name")="sgmnt_data.wcb_t_end_sysops_cr_invcr_tn"
+	Set gtmtypes("sgmnt_data",236,"off")=2600
 	Set gtmtypes("sgmnt_data",236,"len")=8
 	Set gtmtypes("sgmnt_data",236,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_rip_wait_tn")=236
-	Set gtmtypes("sgmnt_data",237,"name")="sgmnt_data.wcb_t_end_sysops_dirtyripwait_tn"
-	Set gtmtypes("sgmnt_data",237,"off")=2616
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_cr_invcr_tn")=236
+	Set gtmtypes("sgmnt_data",237,"name")="sgmnt_data.wcb_t_end_sysops_rip_wait_tn"
+	Set gtmtypes("sgmnt_data",237,"off")=2608
 	Set gtmtypes("sgmnt_data",237,"len")=8
 	Set gtmtypes("sgmnt_data",237,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirtyripwait_tn")=237
-	Set gtmtypes("sgmnt_data",238,"name")="sgmnt_data.wcb_gds_rundown_tn"
-	Set gtmtypes("sgmnt_data",238,"off")=2624
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_rip_wait_tn")=237
+	Set gtmtypes("sgmnt_data",238,"name")="sgmnt_data.wcb_t_end_sysops_dirtyripwait_tn"
+	Set gtmtypes("sgmnt_data",238,"off")=2616
 	Set gtmtypes("sgmnt_data",238,"len")=8
 	Set gtmtypes("sgmnt_data",238,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_gds_rundown_tn")=238
-	Set gtmtypes("sgmnt_data",239,"name")="sgmnt_data.wcb_wcs_flu1_tn"
-	Set gtmtypes("sgmnt_data",239,"off")=2632
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirtyripwait_tn")=238
+	Set gtmtypes("sgmnt_data",239,"name")="sgmnt_data.wcb_gds_rundown_tn"
+	Set gtmtypes("sgmnt_data",239,"off")=2624
 	Set gtmtypes("sgmnt_data",239,"len")=8
 	Set gtmtypes("sgmnt_data",239,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_wcs_flu1_tn")=239
-	Set gtmtypes("sgmnt_data",240,"name")="sgmnt_data.wcb_mu_back_tn"
-	Set gtmtypes("sgmnt_data",240,"off")=2640
+	Set gtmtypfldindx("sgmnt_data","wcb_gds_rundown_tn")=239
+	Set gtmtypes("sgmnt_data",240,"name")="sgmnt_data.wcb_wcs_flu1_tn"
+	Set gtmtypes("sgmnt_data",240,"off")=2632
 	Set gtmtypes("sgmnt_data",240,"len")=8
 	Set gtmtypes("sgmnt_data",240,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_mu_back_tn")=240
-	Set gtmtypes("sgmnt_data",241,"name")="sgmnt_data.wcb_t_end_sysops_dirty_invcr_tn"
-	Set gtmtypes("sgmnt_data",241,"off")=2648
+	Set gtmtypfldindx("sgmnt_data","wcb_wcs_flu1_tn")=240
+	Set gtmtypes("sgmnt_data",241,"name")="sgmnt_data.wcb_mu_back_tn"
+	Set gtmtypes("sgmnt_data",241,"off")=2640
 	Set gtmtypes("sgmnt_data",241,"len")=8
 	Set gtmtypes("sgmnt_data",241,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirty_invcr_tn")=241
-	Set gtmtypes("sgmnt_data",242,"name")="sgmnt_data.wcb_t_end_sysops_wtfini_fail_tn"
-	Set gtmtypes("sgmnt_data",242,"off")=2656
+	Set gtmtypfldindx("sgmnt_data","wcb_mu_back_tn")=241
+	Set gtmtypes("sgmnt_data",242,"name")="sgmnt_data.wcb_t_end_sysops_dirty_invcr_tn"
+	Set gtmtypes("sgmnt_data",242,"off")=2648
 	Set gtmtypes("sgmnt_data",242,"len")=8
 	Set gtmtypes("sgmnt_data",242,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_wtfini_fail_tn")=242
-	Set gtmtypes("sgmnt_data",243,"name")="sgmnt_data.wcb_t_end_sysops_twin_stuck_tn"
-	Set gtmtypes("sgmnt_data",243,"off")=2664
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirty_invcr_tn")=242
+	Set gtmtypes("sgmnt_data",243,"name")="sgmnt_data.wcb_t_end_sysops_wtfini_fail_tn"
+	Set gtmtypes("sgmnt_data",243,"off")=2656
 	Set gtmtypes("sgmnt_data",243,"len")=8
 	Set gtmtypes("sgmnt_data",243,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_twin_stuck_tn")=243
-	Set gtmtypes("sgmnt_data",244,"name")="sgmnt_data.db_csh_getn_wrt_latch_stuck_tn"
-	Set gtmtypes("sgmnt_data",244,"off")=2672
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_wtfini_fail_tn")=243
+	Set gtmtypes("sgmnt_data",244,"name")="sgmnt_data.wcb_t_end_sysops_twin_stuck_tn"
+	Set gtmtypes("sgmnt_data",244,"off")=2664
 	Set gtmtypes("sgmnt_data",244,"len")=8
 	Set gtmtypes("sgmnt_data",244,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","db_csh_getn_wrt_latch_stuck_tn")=244
-	Set gtmtypes("sgmnt_data",245,"name")="sgmnt_data.wcb_secshr_db_clnup_now_crit_tn"
-	Set gtmtypes("sgmnt_data",245,"off")=2680
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_twin_stuck_tn")=244
+	Set gtmtypes("sgmnt_data",245,"name")="sgmnt_data.db_csh_getn_wrt_latch_stuck_tn"
+	Set gtmtypes("sgmnt_data",245,"off")=2672
 	Set gtmtypes("sgmnt_data",245,"len")=8
 	Set gtmtypes("sgmnt_data",245,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_secshr_db_clnup_now_crit_tn")=245
-	Set gtmtypes("sgmnt_data",246,"name")="sgmnt_data.wc_blocked_t_qread_bad_bt_index1_tn"
-	Set gtmtypes("sgmnt_data",246,"off")=2688
+	Set gtmtypfldindx("sgmnt_data","db_csh_getn_wrt_latch_stuck_tn")=245
+	Set gtmtypes("sgmnt_data",246,"name")="sgmnt_data.wcb_secshr_db_clnup_now_crit_tn"
+	Set gtmtypes("sgmnt_data",246,"off")=2680
 	Set gtmtypes("sgmnt_data",246,"len")=8
 	Set gtmtypes("sgmnt_data",246,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_bad_bt_index1_tn")=246
-	Set gtmtypes("sgmnt_data",247,"name")="sgmnt_data.wc_blocked_t_qread_bad_bt_index2_tn"
-	Set gtmtypes("sgmnt_data",247,"off")=2696
+	Set gtmtypfldindx("sgmnt_data","wcb_secshr_db_clnup_now_crit_tn")=246
+	Set gtmtypes("sgmnt_data",247,"name")="sgmnt_data.wc_blocked_t_qread_bad_bt_index1_tn"
+	Set gtmtypes("sgmnt_data",247,"off")=2688
 	Set gtmtypes("sgmnt_data",247,"len")=8
 	Set gtmtypes("sgmnt_data",247,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_bad_bt_index2_tn")=247
-	Set gtmtypes("sgmnt_data",248,"name")="sgmnt_data.wc_blocked_t_end_crbtmismatch1_tn"
-	Set gtmtypes("sgmnt_data",248,"off")=2704
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_bad_bt_index1_tn")=247
+	Set gtmtypes("sgmnt_data",248,"name")="sgmnt_data.wc_blocked_t_qread_bad_bt_index2_tn"
+	Set gtmtypes("sgmnt_data",248,"off")=2696
 	Set gtmtypes("sgmnt_data",248,"len")=8
 	Set gtmtypes("sgmnt_data",248,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_crbtmismatch1_tn")=248
-	Set gtmtypes("sgmnt_data",249,"name")="sgmnt_data.wc_blocked_t_end_crbtmismatch2_tn"
-	Set gtmtypes("sgmnt_data",249,"off")=2712
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_bad_bt_index2_tn")=248
+	Set gtmtypes("sgmnt_data",249,"name")="sgmnt_data.wc_blocked_t_end_crbtmismatch1_tn"
+	Set gtmtypes("sgmnt_data",249,"off")=2704
 	Set gtmtypes("sgmnt_data",249,"len")=8
 	Set gtmtypes("sgmnt_data",249,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_crbtmismatch2_tn")=249
-	Set gtmtypes("sgmnt_data",250,"name")="sgmnt_data.wc_blocked_t_end_crbtmismatch3_tn"
-	Set gtmtypes("sgmnt_data",250,"off")=2720
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_crbtmismatch1_tn")=249
+	Set gtmtypes("sgmnt_data",250,"name")="sgmnt_data.wc_blocked_t_end_crbtmismatch2_tn"
+	Set gtmtypes("sgmnt_data",250,"off")=2712
 	Set gtmtypes("sgmnt_data",250,"len")=8
 	Set gtmtypes("sgmnt_data",250,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_crbtmismatch3_tn")=250
-	Set gtmtypes("sgmnt_data",251,"name")="sgmnt_data.wc_blocked_tp_tend_crbtmismatch1_tn"
-	Set gtmtypes("sgmnt_data",251,"off")=2728
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_crbtmismatch2_tn")=250
+	Set gtmtypes("sgmnt_data",251,"name")="sgmnt_data.wc_blocked_t_end_crbtmismatch3_tn"
+	Set gtmtypes("sgmnt_data",251,"off")=2720
 	Set gtmtypes("sgmnt_data",251,"len")=8
 	Set gtmtypes("sgmnt_data",251,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_crbtmismatch1_tn")=251
-	Set gtmtypes("sgmnt_data",252,"name")="sgmnt_data.wc_blocked_tp_tend_crbtmismatch2_tn"
-	Set gtmtypes("sgmnt_data",252,"off")=2736
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_crbtmismatch3_tn")=251
+	Set gtmtypes("sgmnt_data",252,"name")="sgmnt_data.wc_blocked_tp_tend_crbtmismatch1_tn"
+	Set gtmtypes("sgmnt_data",252,"off")=2728
 	Set gtmtypes("sgmnt_data",252,"len")=8
 	Set gtmtypes("sgmnt_data",252,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_crbtmismatch2_tn")=252
-	Set gtmtypes("sgmnt_data",253,"name")="sgmnt_data.wc_blocked_tp_tend_crbtmismatch3_tn"
-	Set gtmtypes("sgmnt_data",253,"off")=2744
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_crbtmismatch1_tn")=252
+	Set gtmtypes("sgmnt_data",253,"name")="sgmnt_data.wc_blocked_tp_tend_crbtmismatch2_tn"
+	Set gtmtypes("sgmnt_data",253,"off")=2736
 	Set gtmtypes("sgmnt_data",253,"len")=8
 	Set gtmtypes("sgmnt_data",253,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_crbtmismatch3_tn")=253
-	Set gtmtypes("sgmnt_data",254,"name")="sgmnt_data.wc_blocked_wcs_wtstart_bad_cr_tn"
-	Set gtmtypes("sgmnt_data",254,"off")=2752
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_crbtmismatch2_tn")=253
+	Set gtmtypes("sgmnt_data",254,"name")="sgmnt_data.wc_blocked_tp_tend_crbtmismatch3_tn"
+	Set gtmtypes("sgmnt_data",254,"off")=2744
 	Set gtmtypes("sgmnt_data",254,"len")=8
 	Set gtmtypes("sgmnt_data",254,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_wtstart_bad_cr_tn")=254
-	Set gtmtypes("sgmnt_data",255,"name")="sgmnt_data.wc_blocked_wcs_wtfini_bad_cr_tn"
-	Set gtmtypes("sgmnt_data",255,"off")=2760
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_crbtmismatch3_tn")=254
+	Set gtmtypes("sgmnt_data",255,"name")="sgmnt_data.wc_blocked_wcs_wtstart_bad_cr_tn"
+	Set gtmtypes("sgmnt_data",255,"off")=2752
 	Set gtmtypes("sgmnt_data",255,"len")=8
 	Set gtmtypes("sgmnt_data",255,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_wtfini_bad_cr_tn")=255
-	Set gtmtypes("sgmnt_data",256,"name")="sgmnt_data.wc_blocked_bt_get_tn"
-	Set gtmtypes("sgmnt_data",256,"off")=2768
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_wtstart_bad_cr_tn")=255
+	Set gtmtypes("sgmnt_data",256,"name")="sgmnt_data.wc_blocked_wcs_wtfini_bad_cr_tn"
+	Set gtmtypes("sgmnt_data",256,"off")=2760
 	Set gtmtypes("sgmnt_data",256,"len")=8
 	Set gtmtypes("sgmnt_data",256,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_bt_get_tn")=256
-	Set gtmtypes("sgmnt_data",257,"name")="sgmnt_data.wc_blocked_wcs_cdb_sc_final_retry_tn"
-	Set gtmtypes("sgmnt_data",257,"off")=2776
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_wtfini_bad_cr_tn")=256
+	Set gtmtypes("sgmnt_data",257,"name")="sgmnt_data.wc_blocked_bt_get_tn"
+	Set gtmtypes("sgmnt_data",257,"off")=2768
 	Set gtmtypes("sgmnt_data",257,"len")=8
 	Set gtmtypes("sgmnt_data",257,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_cdb_sc_final_retry_tn")=257
-	Set gtmtypes("sgmnt_data",258,"name")="sgmnt_data.wcb_bg_update_lckfail1_tn"
-	Set gtmtypes("sgmnt_data",258,"off")=2784
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_bt_get_tn")=257
+	Set gtmtypes("sgmnt_data",258,"name")="sgmnt_data.wc_blocked_wcs_cdb_sc_final_retry_tn"
+	Set gtmtypes("sgmnt_data",258,"off")=2776
 	Set gtmtypes("sgmnt_data",258,"len")=8
 	Set gtmtypes("sgmnt_data",258,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_bg_update_lckfail1_tn")=258
-	Set gtmtypes("sgmnt_data",259,"name")="sgmnt_data.wcb_bg_update_lckfail2_tn"
-	Set gtmtypes("sgmnt_data",259,"off")=2792
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_cdb_sc_final_retry_tn")=258
+	Set gtmtypes("sgmnt_data",259,"name")="sgmnt_data.wcb_bg_update_lckfail1_tn"
+	Set gtmtypes("sgmnt_data",259,"off")=2784
 	Set gtmtypes("sgmnt_data",259,"len")=8
 	Set gtmtypes("sgmnt_data",259,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_bg_update_lckfail2_tn")=259
-	Set gtmtypes("sgmnt_data",260,"name")="sgmnt_data.wcb_wtstart_lckfail1_tn"
-	Set gtmtypes("sgmnt_data",260,"off")=2800
+	Set gtmtypfldindx("sgmnt_data","wcb_bg_update_lckfail1_tn")=259
+	Set gtmtypes("sgmnt_data",260,"name")="sgmnt_data.wcb_bg_update_lckfail2_tn"
+	Set gtmtypes("sgmnt_data",260,"off")=2792
 	Set gtmtypes("sgmnt_data",260,"len")=8
 	Set gtmtypes("sgmnt_data",260,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail1_tn")=260
-	Set gtmtypes("sgmnt_data",261,"name")="sgmnt_data.wcb_wtstart_lckfail2_tn"
-	Set gtmtypes("sgmnt_data",261,"off")=2808
+	Set gtmtypfldindx("sgmnt_data","wcb_bg_update_lckfail2_tn")=260
+	Set gtmtypes("sgmnt_data",261,"name")="sgmnt_data.wcb_wtstart_lckfail1_tn"
+	Set gtmtypes("sgmnt_data",261,"off")=2800
 	Set gtmtypes("sgmnt_data",261,"len")=8
 	Set gtmtypes("sgmnt_data",261,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail2_tn")=261
-	Set gtmtypes("sgmnt_data",262,"name")="sgmnt_data.wcb_wtstart_lckfail3_tn"
-	Set gtmtypes("sgmnt_data",262,"off")=2816
+	Set gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail1_tn")=261
+	Set gtmtypes("sgmnt_data",262,"name")="sgmnt_data.wcb_wtstart_lckfail2_tn"
+	Set gtmtypes("sgmnt_data",262,"off")=2808
 	Set gtmtypes("sgmnt_data",262,"len")=8
 	Set gtmtypes("sgmnt_data",262,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail3_tn")=262
-	Set gtmtypes("sgmnt_data",263,"name")="sgmnt_data.wcb_wtstart_lckfail4_tn"
-	Set gtmtypes("sgmnt_data",263,"off")=2824
+	Set gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail2_tn")=262
+	Set gtmtypes("sgmnt_data",263,"name")="sgmnt_data.wcb_wtstart_lckfail3_tn"
+	Set gtmtypes("sgmnt_data",263,"off")=2816
 	Set gtmtypes("sgmnt_data",263,"len")=8
 	Set gtmtypes("sgmnt_data",263,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail4_tn")=263
-	Set gtmtypes("sgmnt_data",264,"name")="sgmnt_data.wcb_wtfini_lckfail1_tn"
-	Set gtmtypes("sgmnt_data",264,"off")=2832
+	Set gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail3_tn")=263
+	Set gtmtypes("sgmnt_data",264,"name")="sgmnt_data.wcb_wtstart_lckfail4_tn"
+	Set gtmtypes("sgmnt_data",264,"off")=2824
 	Set gtmtypes("sgmnt_data",264,"len")=8
 	Set gtmtypes("sgmnt_data",264,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail1_tn")=264
-	Set gtmtypes("sgmnt_data",265,"name")="sgmnt_data.wcb_wtfini_lckfail2_tn"
-	Set gtmtypes("sgmnt_data",265,"off")=2840
+	Set gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail4_tn")=264
+	Set gtmtypes("sgmnt_data",265,"name")="sgmnt_data.wcb_wtfini_lckfail1_tn"
+	Set gtmtypes("sgmnt_data",265,"off")=2832
 	Set gtmtypes("sgmnt_data",265,"len")=8
 	Set gtmtypes("sgmnt_data",265,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail2_tn")=265
-	Set gtmtypes("sgmnt_data",266,"name")="sgmnt_data.wcb_wtfini_lckfail3_tn"
-	Set gtmtypes("sgmnt_data",266,"off")=2848
+	Set gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail1_tn")=265
+	Set gtmtypes("sgmnt_data",266,"name")="sgmnt_data.wcb_wtfini_lckfail2_tn"
+	Set gtmtypes("sgmnt_data",266,"off")=2840
 	Set gtmtypes("sgmnt_data",266,"len")=8
 	Set gtmtypes("sgmnt_data",266,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail3_tn")=266
-	Set gtmtypes("sgmnt_data",267,"name")="sgmnt_data.wcb_wtfini_lckfail4_tn"
-	Set gtmtypes("sgmnt_data",267,"off")=2856
+	Set gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail2_tn")=266
+	Set gtmtypes("sgmnt_data",267,"name")="sgmnt_data.wcb_wtfini_lckfail3_tn"
+	Set gtmtypes("sgmnt_data",267,"off")=2848
 	Set gtmtypes("sgmnt_data",267,"len")=8
 	Set gtmtypes("sgmnt_data",267,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail4_tn")=267
-	Set gtmtypes("sgmnt_data",268,"name")="sgmnt_data.wcb_t_end_sysops_dirtystuck1_tn"
-	Set gtmtypes("sgmnt_data",268,"off")=2864
+	Set gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail3_tn")=267
+	Set gtmtypes("sgmnt_data",268,"name")="sgmnt_data.wcb_wtfini_lckfail4_tn"
+	Set gtmtypes("sgmnt_data",268,"off")=2856
 	Set gtmtypes("sgmnt_data",268,"len")=8
 	Set gtmtypes("sgmnt_data",268,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirtystuck1_tn")=268
-	Set gtmtypes("sgmnt_data",269,"name")="sgmnt_data.wcb_t_end_sysops_dirtystuck2_tn"
-	Set gtmtypes("sgmnt_data",269,"off")=2872
+	Set gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail4_tn")=268
+	Set gtmtypes("sgmnt_data",269,"name")="sgmnt_data.wcb_t_end_sysops_dirtystuck1_tn"
+	Set gtmtypes("sgmnt_data",269,"off")=2864
 	Set gtmtypes("sgmnt_data",269,"len")=8
 	Set gtmtypes("sgmnt_data",269,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirtystuck2_tn")=269
-	Set gtmtypes("sgmnt_data",270,"name")="sgmnt_data.wcb_secshr_db_clnup_wbuf_dqd_tn"
-	Set gtmtypes("sgmnt_data",270,"off")=2880
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirtystuck1_tn")=269
+	Set gtmtypes("sgmnt_data",270,"name")="sgmnt_data.wcb_t_end_sysops_dirtystuck2_tn"
+	Set gtmtypes("sgmnt_data",270,"off")=2872
 	Set gtmtypes("sgmnt_data",270,"len")=8
 	Set gtmtypes("sgmnt_data",270,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_secshr_db_clnup_wbuf_dqd_tn")=270
-	Set gtmtypes("sgmnt_data",271,"name")="sgmnt_data.dwngrd_refmts_syncio_tn"
-	Set gtmtypes("sgmnt_data",271,"off")=2888
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirtystuck2_tn")=270
+	Set gtmtypes("sgmnt_data",271,"name")="sgmnt_data.wcb_secshr_db_clnup_wbuf_dqd_tn"
+	Set gtmtypes("sgmnt_data",271,"off")=2880
 	Set gtmtypes("sgmnt_data",271,"len")=8
 	Set gtmtypes("sgmnt_data",271,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","dwngrd_refmts_syncio_tn")=271
-	Set gtmtypes("sgmnt_data",272,"name")="sgmnt_data.dwngrd_refmts_asyncio_tn"
-	Set gtmtypes("sgmnt_data",272,"off")=2896
+	Set gtmtypfldindx("sgmnt_data","wcb_secshr_db_clnup_wbuf_dqd_tn")=271
+	Set gtmtypes("sgmnt_data",272,"name")="sgmnt_data.dwngrd_refmts_syncio_tn"
+	Set gtmtypes("sgmnt_data",272,"off")=2888
 	Set gtmtypes("sgmnt_data",272,"len")=8
 	Set gtmtypes("sgmnt_data",272,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","dwngrd_refmts_asyncio_tn")=272
-	Set gtmtypes("sgmnt_data",273,"name")="sgmnt_data.shmpool_refmt_harvests_tn"
-	Set gtmtypes("sgmnt_data",273,"off")=2904
+	Set gtmtypfldindx("sgmnt_data","dwngrd_refmts_syncio_tn")=272
+	Set gtmtypes("sgmnt_data",273,"name")="sgmnt_data.dwngrd_refmts_asyncio_tn"
+	Set gtmtypes("sgmnt_data",273,"off")=2896
 	Set gtmtypes("sgmnt_data",273,"len")=8
 	Set gtmtypes("sgmnt_data",273,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","shmpool_refmt_harvests_tn")=273
-	Set gtmtypes("sgmnt_data",274,"name")="sgmnt_data.shmpool_recovery_tn"
-	Set gtmtypes("sgmnt_data",274,"off")=2912
+	Set gtmtypfldindx("sgmnt_data","dwngrd_refmts_asyncio_tn")=273
+	Set gtmtypes("sgmnt_data",274,"name")="sgmnt_data.shmpool_refmt_harvests_tn"
+	Set gtmtypes("sgmnt_data",274,"off")=2904
 	Set gtmtypes("sgmnt_data",274,"len")=8
 	Set gtmtypes("sgmnt_data",274,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","shmpool_recovery_tn")=274
-	Set gtmtypes("sgmnt_data",275,"name")="sgmnt_data.shmpool_blkd_by_sdc_tn"
-	Set gtmtypes("sgmnt_data",275,"off")=2920
+	Set gtmtypfldindx("sgmnt_data","shmpool_refmt_harvests_tn")=274
+	Set gtmtypes("sgmnt_data",275,"name")="sgmnt_data.shmpool_recovery_tn"
+	Set gtmtypes("sgmnt_data",275,"off")=2912
 	Set gtmtypes("sgmnt_data",275,"len")=8
 	Set gtmtypes("sgmnt_data",275,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","shmpool_blkd_by_sdc_tn")=275
-	Set gtmtypes("sgmnt_data",276,"name")="sgmnt_data.shmpool_alloc_bbflush_tn"
-	Set gtmtypes("sgmnt_data",276,"off")=2928
+	Set gtmtypfldindx("sgmnt_data","shmpool_recovery_tn")=275
+	Set gtmtypes("sgmnt_data",276,"name")="sgmnt_data.shmpool_blkd_by_sdc_tn"
+	Set gtmtypes("sgmnt_data",276,"off")=2920
 	Set gtmtypes("sgmnt_data",276,"len")=8
 	Set gtmtypes("sgmnt_data",276,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","shmpool_alloc_bbflush_tn")=276
-	Set gtmtypes("sgmnt_data",277,"name")="sgmnt_data.refmt_hvst_blk_released_replaced_tn"
-	Set gtmtypes("sgmnt_data",277,"off")=2936
+	Set gtmtypfldindx("sgmnt_data","shmpool_blkd_by_sdc_tn")=276
+	Set gtmtypes("sgmnt_data",277,"name")="sgmnt_data.shmpool_alloc_bbflush_tn"
+	Set gtmtypes("sgmnt_data",277,"off")=2928
 	Set gtmtypes("sgmnt_data",277,"len")=8
 	Set gtmtypes("sgmnt_data",277,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","refmt_hvst_blk_released_replaced_tn")=277
-	Set gtmtypes("sgmnt_data",278,"name")="sgmnt_data.refmt_hvst_blk_released_io_complete_tn"
-	Set gtmtypes("sgmnt_data",278,"off")=2944
+	Set gtmtypfldindx("sgmnt_data","shmpool_alloc_bbflush_tn")=277
+	Set gtmtypes("sgmnt_data",278,"name")="sgmnt_data.refmt_hvst_blk_released_replaced_tn"
+	Set gtmtypes("sgmnt_data",278,"off")=2936
 	Set gtmtypes("sgmnt_data",278,"len")=8
 	Set gtmtypes("sgmnt_data",278,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","refmt_hvst_blk_released_io_complete_tn")=278
-	Set gtmtypes("sgmnt_data",279,"name")="sgmnt_data.refmt_hvst_blk_kept_tn"
-	Set gtmtypes("sgmnt_data",279,"off")=2952
+	Set gtmtypfldindx("sgmnt_data","refmt_hvst_blk_released_replaced_tn")=278
+	Set gtmtypes("sgmnt_data",279,"name")="sgmnt_data.refmt_hvst_blk_released_io_complete_tn"
+	Set gtmtypes("sgmnt_data",279,"off")=2944
 	Set gtmtypes("sgmnt_data",279,"len")=8
 	Set gtmtypes("sgmnt_data",279,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","refmt_hvst_blk_kept_tn")=279
-	Set gtmtypes("sgmnt_data",280,"name")="sgmnt_data.refmt_hvst_blk_ignored_tn"
-	Set gtmtypes("sgmnt_data",280,"off")=2960
+	Set gtmtypfldindx("sgmnt_data","refmt_hvst_blk_released_io_complete_tn")=279
+	Set gtmtypes("sgmnt_data",280,"name")="sgmnt_data.refmt_hvst_blk_kept_tn"
+	Set gtmtypes("sgmnt_data",280,"off")=2952
 	Set gtmtypes("sgmnt_data",280,"len")=8
 	Set gtmtypes("sgmnt_data",280,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","refmt_hvst_blk_ignored_tn")=280
-	Set gtmtypes("sgmnt_data",281,"name")="sgmnt_data.refmt_blk_chk_blk_freed_tn"
-	Set gtmtypes("sgmnt_data",281,"off")=2968
+	Set gtmtypfldindx("sgmnt_data","refmt_hvst_blk_kept_tn")=280
+	Set gtmtypes("sgmnt_data",281,"name")="sgmnt_data.refmt_hvst_blk_ignored_tn"
+	Set gtmtypes("sgmnt_data",281,"off")=2960
 	Set gtmtypes("sgmnt_data",281,"len")=8
 	Set gtmtypes("sgmnt_data",281,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","refmt_blk_chk_blk_freed_tn")=281
-	Set gtmtypes("sgmnt_data",282,"name")="sgmnt_data.refmt_blk_chk_blk_kept_tn"
-	Set gtmtypes("sgmnt_data",282,"off")=2976
+	Set gtmtypfldindx("sgmnt_data","refmt_hvst_blk_ignored_tn")=281
+	Set gtmtypes("sgmnt_data",282,"name")="sgmnt_data.refmt_blk_chk_blk_freed_tn"
+	Set gtmtypes("sgmnt_data",282,"off")=2968
 	Set gtmtypes("sgmnt_data",282,"len")=8
 	Set gtmtypes("sgmnt_data",282,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","refmt_blk_chk_blk_kept_tn")=282
-	Set gtmtypes("sgmnt_data",283,"name")="sgmnt_data.active_lvl_trigger_tn"
-	Set gtmtypes("sgmnt_data",283,"off")=2984
+	Set gtmtypfldindx("sgmnt_data","refmt_blk_chk_blk_freed_tn")=282
+	Set gtmtypes("sgmnt_data",283,"name")="sgmnt_data.refmt_blk_chk_blk_kept_tn"
+	Set gtmtypes("sgmnt_data",283,"off")=2976
 	Set gtmtypes("sgmnt_data",283,"len")=8
 	Set gtmtypes("sgmnt_data",283,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","active_lvl_trigger_tn")=283
-	Set gtmtypes("sgmnt_data",284,"name")="sgmnt_data.new_buff_tn"
-	Set gtmtypes("sgmnt_data",284,"off")=2992
+	Set gtmtypfldindx("sgmnt_data","refmt_blk_chk_blk_kept_tn")=283
+	Set gtmtypes("sgmnt_data",284,"name")="sgmnt_data.active_lvl_trigger_tn"
+	Set gtmtypes("sgmnt_data",284,"off")=2984
 	Set gtmtypes("sgmnt_data",284,"len")=8
 	Set gtmtypes("sgmnt_data",284,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","new_buff_tn")=284
-	Set gtmtypes("sgmnt_data",285,"name")="sgmnt_data.phase2_commit_wait_sleep_in_crit_tn"
-	Set gtmtypes("sgmnt_data",285,"off")=3000
+	Set gtmtypfldindx("sgmnt_data","active_lvl_trigger_tn")=284
+	Set gtmtypes("sgmnt_data",285,"name")="sgmnt_data.new_buff_tn"
+	Set gtmtypes("sgmnt_data",285,"off")=2992
 	Set gtmtypes("sgmnt_data",285,"len")=8
 	Set gtmtypes("sgmnt_data",285,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","phase2_commit_wait_sleep_in_crit_tn")=285
-	Set gtmtypes("sgmnt_data",286,"name")="sgmnt_data.phase2_commit_wait_sleep_no_crit_tn"
-	Set gtmtypes("sgmnt_data",286,"off")=3008
+	Set gtmtypfldindx("sgmnt_data","new_buff_tn")=285
+	Set gtmtypes("sgmnt_data",286,"name")="sgmnt_data.phase2_commit_wait_sleep_in_crit_tn"
+	Set gtmtypes("sgmnt_data",286,"off")=3000
 	Set gtmtypes("sgmnt_data",286,"len")=8
 	Set gtmtypes("sgmnt_data",286,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","phase2_commit_wait_sleep_no_crit_tn")=286
-	Set gtmtypes("sgmnt_data",287,"name")="sgmnt_data.phase2_commit_wait_pidcnt_tn"
-	Set gtmtypes("sgmnt_data",287,"off")=3016
+	Set gtmtypfldindx("sgmnt_data","phase2_commit_wait_sleep_in_crit_tn")=286
+	Set gtmtypes("sgmnt_data",287,"name")="sgmnt_data.phase2_commit_wait_sleep_no_crit_tn"
+	Set gtmtypes("sgmnt_data",287,"off")=3008
 	Set gtmtypes("sgmnt_data",287,"len")=8
 	Set gtmtypes("sgmnt_data",287,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","phase2_commit_wait_pidcnt_tn")=287
-	Set gtmtypes("sgmnt_data",288,"name")="sgmnt_data.wcb_t_end_sysops_intend_wait_tn"
-	Set gtmtypes("sgmnt_data",288,"off")=3024
+	Set gtmtypfldindx("sgmnt_data","phase2_commit_wait_sleep_no_crit_tn")=287
+	Set gtmtypes("sgmnt_data",288,"name")="sgmnt_data.phase2_commit_wait_pidcnt_tn"
+	Set gtmtypes("sgmnt_data",288,"off")=3016
 	Set gtmtypes("sgmnt_data",288,"len")=8
 	Set gtmtypes("sgmnt_data",288,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_intend_wait_tn")=288
-	Set gtmtypes("sgmnt_data",289,"name")="sgmnt_data.wcb_secshr_db_clnup_phase2_clnup_tn"
-	Set gtmtypes("sgmnt_data",289,"off")=3032
+	Set gtmtypfldindx("sgmnt_data","phase2_commit_wait_pidcnt_tn")=288
+	Set gtmtypes("sgmnt_data",289,"name")="sgmnt_data.wcb_t_end_sysops_intend_wait_tn"
+	Set gtmtypes("sgmnt_data",289,"off")=3024
 	Set gtmtypes("sgmnt_data",289,"len")=8
 	Set gtmtypes("sgmnt_data",289,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_secshr_db_clnup_phase2_clnup_tn")=289
-	Set gtmtypes("sgmnt_data",290,"name")="sgmnt_data.wcb_phase2_commit_wait_tn"
-	Set gtmtypes("sgmnt_data",290,"off")=3040
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_intend_wait_tn")=289
+	Set gtmtypes("sgmnt_data",290,"name")="sgmnt_data.wcb_secshr_db_clnup_phase2_clnup_tn"
+	Set gtmtypes("sgmnt_data",290,"off")=3032
 	Set gtmtypes("sgmnt_data",290,"len")=8
 	Set gtmtypes("sgmnt_data",290,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_phase2_commit_wait_tn")=290
-	Set gtmtypes("sgmnt_data",291,"name")="sgmnt_data.recompute_upd_array_calls_tn"
-	Set gtmtypes("sgmnt_data",291,"off")=3048
+	Set gtmtypfldindx("sgmnt_data","wcb_secshr_db_clnup_phase2_clnup_tn")=290
+	Set gtmtypes("sgmnt_data",291,"name")="sgmnt_data.wcb_phase2_commit_wait_tn"
+	Set gtmtypes("sgmnt_data",291,"off")=3040
 	Set gtmtypes("sgmnt_data",291,"len")=8
 	Set gtmtypes("sgmnt_data",291,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_calls_tn")=291
-	Set gtmtypes("sgmnt_data",292,"name")="sgmnt_data.recompute_upd_array_rip_tn"
-	Set gtmtypes("sgmnt_data",292,"off")=3056
+	Set gtmtypfldindx("sgmnt_data","wcb_phase2_commit_wait_tn")=291
+	Set gtmtypes("sgmnt_data",292,"name")="sgmnt_data.recompute_upd_array_calls_tn"
+	Set gtmtypes("sgmnt_data",292,"off")=3048
 	Set gtmtypes("sgmnt_data",292,"len")=8
 	Set gtmtypes("sgmnt_data",292,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_rip_tn")=292
-	Set gtmtypes("sgmnt_data",293,"name")="sgmnt_data.recompute_upd_array_in_tend_tn"
-	Set gtmtypes("sgmnt_data",293,"off")=3064
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_calls_tn")=292
+	Set gtmtypes("sgmnt_data",293,"name")="sgmnt_data.recompute_upd_array_rip_tn"
+	Set gtmtypes("sgmnt_data",293,"off")=3056
 	Set gtmtypes("sgmnt_data",293,"len")=8
 	Set gtmtypes("sgmnt_data",293,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_in_tend_tn")=293
-	Set gtmtypes("sgmnt_data",294,"name")="sgmnt_data.recompute_upd_array_search_blk_tn"
-	Set gtmtypes("sgmnt_data",294,"off")=3072
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_rip_tn")=293
+	Set gtmtypes("sgmnt_data",294,"name")="sgmnt_data.recompute_upd_array_in_tend_tn"
+	Set gtmtypes("sgmnt_data",294,"off")=3064
 	Set gtmtypes("sgmnt_data",294,"len")=8
 	Set gtmtypes("sgmnt_data",294,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_search_blk_tn")=294
-	Set gtmtypes("sgmnt_data",295,"name")="sgmnt_data.recompute_upd_array_new_rec_tn"
-	Set gtmtypes("sgmnt_data",295,"off")=3080
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_in_tend_tn")=294
+	Set gtmtypes("sgmnt_data",295,"name")="sgmnt_data.recompute_upd_array_search_blk_tn"
+	Set gtmtypes("sgmnt_data",295,"off")=3072
 	Set gtmtypes("sgmnt_data",295,"len")=8
 	Set gtmtypes("sgmnt_data",295,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_new_rec_tn")=295
-	Set gtmtypes("sgmnt_data",296,"name")="sgmnt_data.recompute_upd_array_rec_size_tn"
-	Set gtmtypes("sgmnt_data",296,"off")=3088
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_search_blk_tn")=295
+	Set gtmtypes("sgmnt_data",296,"name")="sgmnt_data.recompute_upd_array_new_rec_tn"
+	Set gtmtypes("sgmnt_data",296,"off")=3080
 	Set gtmtypes("sgmnt_data",296,"len")=8
 	Set gtmtypes("sgmnt_data",296,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_rec_size_tn")=296
-	Set gtmtypes("sgmnt_data",297,"name")="sgmnt_data.recompute_upd_array_rec_cmpc_tn"
-	Set gtmtypes("sgmnt_data",297,"off")=3096
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_new_rec_tn")=296
+	Set gtmtypes("sgmnt_data",297,"name")="sgmnt_data.recompute_upd_array_rec_size_tn"
+	Set gtmtypes("sgmnt_data",297,"off")=3088
 	Set gtmtypes("sgmnt_data",297,"len")=8
 	Set gtmtypes("sgmnt_data",297,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_rec_cmpc_tn")=297
-	Set gtmtypes("sgmnt_data",298,"name")="sgmnt_data.recompute_upd_array_blk_fini_tn"
-	Set gtmtypes("sgmnt_data",298,"off")=3104
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_rec_size_tn")=297
+	Set gtmtypes("sgmnt_data",298,"name")="sgmnt_data.recompute_upd_array_rec_cmpc_tn"
+	Set gtmtypes("sgmnt_data",298,"off")=3096
 	Set gtmtypes("sgmnt_data",298,"len")=8
 	Set gtmtypes("sgmnt_data",298,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_blk_fini_tn")=298
-	Set gtmtypes("sgmnt_data",299,"name")="sgmnt_data.recompute_upd_array_blk_split_tn"
-	Set gtmtypes("sgmnt_data",299,"off")=3112
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_rec_cmpc_tn")=298
+	Set gtmtypes("sgmnt_data",299,"name")="sgmnt_data.recompute_upd_array_blk_fini_tn"
+	Set gtmtypes("sgmnt_data",299,"off")=3104
 	Set gtmtypes("sgmnt_data",299,"len")=8
 	Set gtmtypes("sgmnt_data",299,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_blk_split_tn")=299
-	Set gtmtypes("sgmnt_data",300,"name")="sgmnt_data.t_qread_ripsleep_cnt_tn"
-	Set gtmtypes("sgmnt_data",300,"off")=3120
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_blk_fini_tn")=299
+	Set gtmtypes("sgmnt_data",300,"name")="sgmnt_data.recompute_upd_array_blk_split_tn"
+	Set gtmtypes("sgmnt_data",300,"off")=3112
 	Set gtmtypes("sgmnt_data",300,"len")=8
 	Set gtmtypes("sgmnt_data",300,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","t_qread_ripsleep_cnt_tn")=300
-	Set gtmtypes("sgmnt_data",301,"name")="sgmnt_data.t_qread_ripsleep_nblks_tn"
-	Set gtmtypes("sgmnt_data",301,"off")=3128
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_blk_split_tn")=300
+	Set gtmtypes("sgmnt_data",301,"name")="sgmnt_data.t_qread_ripsleep_cnt_tn"
+	Set gtmtypes("sgmnt_data",301,"off")=3120
 	Set gtmtypes("sgmnt_data",301,"len")=8
 	Set gtmtypes("sgmnt_data",301,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","t_qread_ripsleep_nblks_tn")=301
-	Set gtmtypes("sgmnt_data",302,"name")="sgmnt_data.bg_trc_rec_tn_filler"
-	Set gtmtypes("sgmnt_data",302,"off")=3136
-	Set gtmtypes("sgmnt_data",302,"len")=112
-	Set gtmtypes("sgmnt_data",302,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","bg_trc_rec_tn_filler")=302
-	Set gtmtypes("sgmnt_data",303,"name")="sgmnt_data.total_buffer_flush_cntr"
-	Set gtmtypes("sgmnt_data",303,"off")=3248
-	Set gtmtypes("sgmnt_data",303,"len")=4
-	Set gtmtypes("sgmnt_data",303,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","total_buffer_flush_cntr")=303
-	Set gtmtypes("sgmnt_data",304,"name")="sgmnt_data.bufct_buffer_flush_cntr"
-	Set gtmtypes("sgmnt_data",304,"off")=3252
-	Set gtmtypes("sgmnt_data",304,"len")=4
-	Set gtmtypes("sgmnt_data",304,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","bufct_buffer_flush_cntr")=304
-	Set gtmtypes("sgmnt_data",305,"name")="sgmnt_data.bufct_buffer_flush_loop_cntr"
-	Set gtmtypes("sgmnt_data",305,"off")=3256
-	Set gtmtypes("sgmnt_data",305,"len")=4
-	Set gtmtypes("sgmnt_data",305,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","bufct_buffer_flush_loop_cntr")=305
-	Set gtmtypes("sgmnt_data",306,"name")="sgmnt_data.wrt_calls_cntr"
-	Set gtmtypes("sgmnt_data",306,"off")=3260
-	Set gtmtypes("sgmnt_data",306,"len")=4
-	Set gtmtypes("sgmnt_data",306,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wrt_calls_cntr")=306
-	Set gtmtypes("sgmnt_data",307,"name")="sgmnt_data.wrt_count_cntr"
-	Set gtmtypes("sgmnt_data",307,"off")=3264
-	Set gtmtypes("sgmnt_data",307,"len")=4
-	Set gtmtypes("sgmnt_data",307,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wrt_count_cntr")=307
-	Set gtmtypes("sgmnt_data",308,"name")="sgmnt_data.wrt_blocked_cntr"
-	Set gtmtypes("sgmnt_data",308,"off")=3268
-	Set gtmtypes("sgmnt_data",308,"len")=4
-	Set gtmtypes("sgmnt_data",308,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wrt_blocked_cntr")=308
-	Set gtmtypes("sgmnt_data",309,"name")="sgmnt_data.wrt_busy_cntr"
-	Set gtmtypes("sgmnt_data",309,"off")=3272
-	Set gtmtypes("sgmnt_data",309,"len")=4
-	Set gtmtypes("sgmnt_data",309,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wrt_busy_cntr")=309
-	Set gtmtypes("sgmnt_data",310,"name")="sgmnt_data.wrt_noblks_wrtn_cntr"
-	Set gtmtypes("sgmnt_data",310,"off")=3276
-	Set gtmtypes("sgmnt_data",310,"len")=4
-	Set gtmtypes("sgmnt_data",310,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wrt_noblks_wrtn_cntr")=310
-	Set gtmtypes("sgmnt_data",311,"name")="sgmnt_data.reserved_bgtrcrec1_cntr"
-	Set gtmtypes("sgmnt_data",311,"off")=3280
-	Set gtmtypes("sgmnt_data",311,"len")=4
-	Set gtmtypes("sgmnt_data",311,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","reserved_bgtrcrec1_cntr")=311
-	Set gtmtypes("sgmnt_data",312,"name")="sgmnt_data.reserved_bgtrcrec2_cntr"
-	Set gtmtypes("sgmnt_data",312,"off")=3284
+	Set gtmtypfldindx("sgmnt_data","t_qread_ripsleep_cnt_tn")=301
+	Set gtmtypes("sgmnt_data",302,"name")="sgmnt_data.t_qread_ripsleep_nblks_tn"
+	Set gtmtypes("sgmnt_data",302,"off")=3128
+	Set gtmtypes("sgmnt_data",302,"len")=8
+	Set gtmtypes("sgmnt_data",302,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","t_qread_ripsleep_nblks_tn")=302
+	Set gtmtypes("sgmnt_data",303,"name")="sgmnt_data.wcs_wtfini_invoked_tn"
+	Set gtmtypes("sgmnt_data",303,"off")=3136
+	Set gtmtypes("sgmnt_data",303,"len")=8
+	Set gtmtypes("sgmnt_data",303,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","wcs_wtfini_invoked_tn")=303
+	Set gtmtypes("sgmnt_data",304,"name")="sgmnt_data.wcs_wterror_invoked_tn"
+	Set gtmtypes("sgmnt_data",304,"off")=3144
+	Set gtmtypes("sgmnt_data",304,"len")=8
+	Set gtmtypes("sgmnt_data",304,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","wcs_wterror_invoked_tn")=304
+	Set gtmtypes("sgmnt_data",305,"name")="sgmnt_data.wcs_wt_restart_invoked_tn"
+	Set gtmtypes("sgmnt_data",305,"off")=3152
+	Set gtmtypes("sgmnt_data",305,"len")=8
+	Set gtmtypes("sgmnt_data",305,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","wcs_wt_restart_invoked_tn")=305
+	Set gtmtypes("sgmnt_data",306,"name")="sgmnt_data.wcs_wt_restart_eagain_tn"
+	Set gtmtypes("sgmnt_data",306,"off")=3160
+	Set gtmtypes("sgmnt_data",306,"len")=8
+	Set gtmtypes("sgmnt_data",306,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","wcs_wt_restart_eagain_tn")=306
+	Set gtmtypes("sgmnt_data",307,"name")="sgmnt_data.wcs_wt_restart_reinsert_tn"
+	Set gtmtypes("sgmnt_data",307,"off")=3168
+	Set gtmtypes("sgmnt_data",307,"len")=8
+	Set gtmtypes("sgmnt_data",307,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","wcs_wt_restart_reinsert_tn")=307
+	Set gtmtypes("sgmnt_data",308,"name")="sgmnt_data.wcs_wtstart_eagain_tn"
+	Set gtmtypes("sgmnt_data",308,"off")=3176
+	Set gtmtypes("sgmnt_data",308,"len")=8
+	Set gtmtypes("sgmnt_data",308,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","wcs_wtstart_eagain_tn")=308
+	Set gtmtypes("sgmnt_data",309,"name")="sgmnt_data.wcs_wtstart_eagain_incrit_tn"
+	Set gtmtypes("sgmnt_data",309,"off")=3184
+	Set gtmtypes("sgmnt_data",309,"len")=8
+	Set gtmtypes("sgmnt_data",309,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","wcs_wtstart_eagain_incrit_tn")=309
+	Set gtmtypes("sgmnt_data",310,"name")="sgmnt_data.async_restart_eagain_tn"
+	Set gtmtypes("sgmnt_data",310,"off")=3192
+	Set gtmtypes("sgmnt_data",310,"len")=8
+	Set gtmtypes("sgmnt_data",310,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","async_restart_eagain_tn")=310
+	Set gtmtypes("sgmnt_data",311,"name")="sgmnt_data.bg_trc_rec_tn_filler"
+	Set gtmtypes("sgmnt_data",311,"off")=3200
+	Set gtmtypes("sgmnt_data",311,"len")=48
+	Set gtmtypes("sgmnt_data",311,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","bg_trc_rec_tn_filler")=311
+	Set gtmtypes("sgmnt_data",312,"name")="sgmnt_data.total_buffer_flush_cntr"
+	Set gtmtypes("sgmnt_data",312,"off")=3248
 	Set gtmtypes("sgmnt_data",312,"len")=4
 	Set gtmtypes("sgmnt_data",312,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","reserved_bgtrcrec2_cntr")=312
-	Set gtmtypes("sgmnt_data",313,"name")="sgmnt_data.reserved_bgtrcrec3_cntr"
-	Set gtmtypes("sgmnt_data",313,"off")=3288
+	Set gtmtypfldindx("sgmnt_data","total_buffer_flush_cntr")=312
+	Set gtmtypes("sgmnt_data",313,"name")="sgmnt_data.bufct_buffer_flush_cntr"
+	Set gtmtypes("sgmnt_data",313,"off")=3252
 	Set gtmtypes("sgmnt_data",313,"len")=4
 	Set gtmtypes("sgmnt_data",313,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","reserved_bgtrcrec3_cntr")=313
-	Set gtmtypes("sgmnt_data",314,"name")="sgmnt_data.lost_block_recovery_cntr"
-	Set gtmtypes("sgmnt_data",314,"off")=3292
+	Set gtmtypfldindx("sgmnt_data","bufct_buffer_flush_cntr")=313
+	Set gtmtypes("sgmnt_data",314,"name")="sgmnt_data.bufct_buffer_flush_loop_cntr"
+	Set gtmtypes("sgmnt_data",314,"off")=3256
 	Set gtmtypes("sgmnt_data",314,"len")=4
 	Set gtmtypes("sgmnt_data",314,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","lost_block_recovery_cntr")=314
-	Set gtmtypes("sgmnt_data",315,"name")="sgmnt_data.wc_blocked_onln_rlbk_cntr"
-	Set gtmtypes("sgmnt_data",315,"off")=3296
+	Set gtmtypfldindx("sgmnt_data","bufct_buffer_flush_loop_cntr")=314
+	Set gtmtypes("sgmnt_data",315,"name")="sgmnt_data.wrt_calls_cntr"
+	Set gtmtypes("sgmnt_data",315,"off")=3260
 	Set gtmtypes("sgmnt_data",315,"len")=4
 	Set gtmtypes("sgmnt_data",315,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_onln_rlbk_cntr")=315
-	Set gtmtypes("sgmnt_data",316,"name")="sgmnt_data.stale_cntr"
-	Set gtmtypes("sgmnt_data",316,"off")=3300
+	Set gtmtypfldindx("sgmnt_data","wrt_calls_cntr")=315
+	Set gtmtypes("sgmnt_data",316,"name")="sgmnt_data.wrt_count_cntr"
+	Set gtmtypes("sgmnt_data",316,"off")=3264
 	Set gtmtypes("sgmnt_data",316,"len")=4
 	Set gtmtypes("sgmnt_data",316,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","stale_cntr")=316
-	Set gtmtypes("sgmnt_data",317,"name")="sgmnt_data.starved_cntr"
-	Set gtmtypes("sgmnt_data",317,"off")=3304
+	Set gtmtypfldindx("sgmnt_data","wrt_count_cntr")=316
+	Set gtmtypes("sgmnt_data",317,"name")="sgmnt_data.wrt_blocked_cntr"
+	Set gtmtypes("sgmnt_data",317,"off")=3268
 	Set gtmtypes("sgmnt_data",317,"len")=4
 	Set gtmtypes("sgmnt_data",317,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","starved_cntr")=317
-	Set gtmtypes("sgmnt_data",318,"name")="sgmnt_data.stale_timer_started_cntr"
-	Set gtmtypes("sgmnt_data",318,"off")=3308
+	Set gtmtypfldindx("sgmnt_data","wrt_blocked_cntr")=317
+	Set gtmtypes("sgmnt_data",318,"name")="sgmnt_data.wrt_busy_cntr"
+	Set gtmtypes("sgmnt_data",318,"off")=3272
 	Set gtmtypes("sgmnt_data",318,"len")=4
 	Set gtmtypes("sgmnt_data",318,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","stale_timer_started_cntr")=318
-	Set gtmtypes("sgmnt_data",319,"name")="sgmnt_data.stale_timer_pop_cntr"
-	Set gtmtypes("sgmnt_data",319,"off")=3312
+	Set gtmtypfldindx("sgmnt_data","wrt_busy_cntr")=318
+	Set gtmtypes("sgmnt_data",319,"name")="sgmnt_data.wrt_noblks_wrtn_cntr"
+	Set gtmtypes("sgmnt_data",319,"off")=3276
 	Set gtmtypes("sgmnt_data",319,"len")=4
 	Set gtmtypes("sgmnt_data",319,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","stale_timer_pop_cntr")=319
-	Set gtmtypes("sgmnt_data",320,"name")="sgmnt_data.stale_process_defer_cntr"
-	Set gtmtypes("sgmnt_data",320,"off")=3316
+	Set gtmtypfldindx("sgmnt_data","wrt_noblks_wrtn_cntr")=319
+	Set gtmtypes("sgmnt_data",320,"name")="sgmnt_data.reserved_bgtrcrec1_cntr"
+	Set gtmtypes("sgmnt_data",320,"off")=3280
 	Set gtmtypes("sgmnt_data",320,"len")=4
 	Set gtmtypes("sgmnt_data",320,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","stale_process_defer_cntr")=320
-	Set gtmtypes("sgmnt_data",321,"name")="sgmnt_data.stale_defer_processed_cntr"
-	Set gtmtypes("sgmnt_data",321,"off")=3320
+	Set gtmtypfldindx("sgmnt_data","reserved_bgtrcrec1_cntr")=320
+	Set gtmtypes("sgmnt_data",321,"name")="sgmnt_data.reserved_bgtrcrec2_cntr"
+	Set gtmtypes("sgmnt_data",321,"off")=3284
 	Set gtmtypes("sgmnt_data",321,"len")=4
 	Set gtmtypes("sgmnt_data",321,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","stale_defer_processed_cntr")=321
-	Set gtmtypes("sgmnt_data",322,"name")="sgmnt_data.spcfc_buffer_flush_cntr"
-	Set gtmtypes("sgmnt_data",322,"off")=3324
+	Set gtmtypfldindx("sgmnt_data","reserved_bgtrcrec2_cntr")=321
+	Set gtmtypes("sgmnt_data",322,"name")="sgmnt_data.reserved_bgtrcrec3_cntr"
+	Set gtmtypes("sgmnt_data",322,"off")=3288
 	Set gtmtypes("sgmnt_data",322,"len")=4
 	Set gtmtypes("sgmnt_data",322,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","spcfc_buffer_flush_cntr")=322
-	Set gtmtypes("sgmnt_data",323,"name")="sgmnt_data.spcfc_buffer_flush_loop_cntr"
-	Set gtmtypes("sgmnt_data",323,"off")=3328
+	Set gtmtypfldindx("sgmnt_data","reserved_bgtrcrec3_cntr")=322
+	Set gtmtypes("sgmnt_data",323,"name")="sgmnt_data.lost_block_recovery_cntr"
+	Set gtmtypes("sgmnt_data",323,"off")=3292
 	Set gtmtypes("sgmnt_data",323,"len")=4
 	Set gtmtypes("sgmnt_data",323,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","spcfc_buffer_flush_loop_cntr")=323
-	Set gtmtypes("sgmnt_data",324,"name")="sgmnt_data.spcfc_buffer_flush_retries_cntr"
-	Set gtmtypes("sgmnt_data",324,"off")=3332
+	Set gtmtypfldindx("sgmnt_data","lost_block_recovery_cntr")=323
+	Set gtmtypes("sgmnt_data",324,"name")="sgmnt_data.wc_blocked_onln_rlbk_cntr"
+	Set gtmtypes("sgmnt_data",324,"off")=3296
 	Set gtmtypes("sgmnt_data",324,"len")=4
 	Set gtmtypes("sgmnt_data",324,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","spcfc_buffer_flush_retries_cntr")=324
-	Set gtmtypes("sgmnt_data",325,"name")="sgmnt_data.spcfc_buffer_flushed_during_lockwait_cntr"
-	Set gtmtypes("sgmnt_data",325,"off")=3336
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_onln_rlbk_cntr")=324
+	Set gtmtypes("sgmnt_data",325,"name")="sgmnt_data.stale_cntr"
+	Set gtmtypes("sgmnt_data",325,"off")=3300
 	Set gtmtypes("sgmnt_data",325,"len")=4
 	Set gtmtypes("sgmnt_data",325,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","spcfc_buffer_flushed_during_lockwait_cntr")=325
-	Set gtmtypes("sgmnt_data",326,"name")="sgmnt_data.tp_crit_retries_cntr"
-	Set gtmtypes("sgmnt_data",326,"off")=3340
+	Set gtmtypfldindx("sgmnt_data","stale_cntr")=325
+	Set gtmtypes("sgmnt_data",326,"name")="sgmnt_data.starved_cntr"
+	Set gtmtypes("sgmnt_data",326,"off")=3304
 	Set gtmtypes("sgmnt_data",326,"len")=4
 	Set gtmtypes("sgmnt_data",326,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","tp_crit_retries_cntr")=326
-	Set gtmtypes("sgmnt_data",327,"name")="sgmnt_data.db_csh_getn_flush_dirty_cntr"
-	Set gtmtypes("sgmnt_data",327,"off")=3344
+	Set gtmtypfldindx("sgmnt_data","starved_cntr")=326
+	Set gtmtypes("sgmnt_data",327,"name")="sgmnt_data.stale_timer_started_cntr"
+	Set gtmtypes("sgmnt_data",327,"off")=3308
 	Set gtmtypes("sgmnt_data",327,"len")=4
 	Set gtmtypes("sgmnt_data",327,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","db_csh_getn_flush_dirty_cntr")=327
-	Set gtmtypes("sgmnt_data",328,"name")="sgmnt_data.db_csh_getn_rip_wait_cntr"
-	Set gtmtypes("sgmnt_data",328,"off")=3348
+	Set gtmtypfldindx("sgmnt_data","stale_timer_started_cntr")=327
+	Set gtmtypes("sgmnt_data",328,"name")="sgmnt_data.stale_timer_pop_cntr"
+	Set gtmtypes("sgmnt_data",328,"off")=3312
 	Set gtmtypes("sgmnt_data",328,"len")=4
 	Set gtmtypes("sgmnt_data",328,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","db_csh_getn_rip_wait_cntr")=328
-	Set gtmtypes("sgmnt_data",329,"name")="sgmnt_data.db_csh_getn_buf_owner_stuck_cntr"
-	Set gtmtypes("sgmnt_data",329,"off")=3352
+	Set gtmtypfldindx("sgmnt_data","stale_timer_pop_cntr")=328
+	Set gtmtypes("sgmnt_data",329,"name")="sgmnt_data.stale_process_defer_cntr"
+	Set gtmtypes("sgmnt_data",329,"off")=3316
 	Set gtmtypes("sgmnt_data",329,"len")=4
 	Set gtmtypes("sgmnt_data",329,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","db_csh_getn_buf_owner_stuck_cntr")=329
-	Set gtmtypes("sgmnt_data",330,"name")="sgmnt_data.db_csh_getn_out_of_design_cntr"
-	Set gtmtypes("sgmnt_data",330,"off")=3356
+	Set gtmtypfldindx("sgmnt_data","stale_process_defer_cntr")=329
+	Set gtmtypes("sgmnt_data",330,"name")="sgmnt_data.stale_defer_processed_cntr"
+	Set gtmtypes("sgmnt_data",330,"off")=3320
 	Set gtmtypes("sgmnt_data",330,"len")=4
 	Set gtmtypes("sgmnt_data",330,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","db_csh_getn_out_of_design_cntr")=330
-	Set gtmtypes("sgmnt_data",331,"name")="sgmnt_data.t_qread_buf_owner_stuck_cntr"
-	Set gtmtypes("sgmnt_data",331,"off")=3360
+	Set gtmtypfldindx("sgmnt_data","stale_defer_processed_cntr")=330
+	Set gtmtypes("sgmnt_data",331,"name")="sgmnt_data.spcfc_buffer_flush_cntr"
+	Set gtmtypes("sgmnt_data",331,"off")=3324
 	Set gtmtypes("sgmnt_data",331,"len")=4
 	Set gtmtypes("sgmnt_data",331,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","t_qread_buf_owner_stuck_cntr")=331
-	Set gtmtypes("sgmnt_data",332,"name")="sgmnt_data.t_qread_out_of_design_cntr"
-	Set gtmtypes("sgmnt_data",332,"off")=3364
+	Set gtmtypfldindx("sgmnt_data","spcfc_buffer_flush_cntr")=331
+	Set gtmtypes("sgmnt_data",332,"name")="sgmnt_data.spcfc_buffer_flush_loop_cntr"
+	Set gtmtypes("sgmnt_data",332,"off")=3328
 	Set gtmtypes("sgmnt_data",332,"len")=4
 	Set gtmtypes("sgmnt_data",332,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","t_qread_out_of_design_cntr")=332
-	Set gtmtypes("sgmnt_data",333,"name")="sgmnt_data.bt_put_flush_dirty_cntr"
-	Set gtmtypes("sgmnt_data",333,"off")=3368
+	Set gtmtypfldindx("sgmnt_data","spcfc_buffer_flush_loop_cntr")=332
+	Set gtmtypes("sgmnt_data",333,"name")="sgmnt_data.spcfc_buffer_flush_retries_cntr"
+	Set gtmtypes("sgmnt_data",333,"off")=3332
 	Set gtmtypes("sgmnt_data",333,"len")=4
 	Set gtmtypes("sgmnt_data",333,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","bt_put_flush_dirty_cntr")=333
-	Set gtmtypes("sgmnt_data",334,"name")="sgmnt_data.mlock_wakeups_cntr"
-	Set gtmtypes("sgmnt_data",334,"off")=3372
+	Set gtmtypfldindx("sgmnt_data","spcfc_buffer_flush_retries_cntr")=333
+	Set gtmtypes("sgmnt_data",334,"name")="sgmnt_data.spcfc_buffer_flushed_during_lockwait_cntr"
+	Set gtmtypes("sgmnt_data",334,"off")=3336
 	Set gtmtypes("sgmnt_data",334,"len")=4
 	Set gtmtypes("sgmnt_data",334,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","mlock_wakeups_cntr")=334
-	Set gtmtypes("sgmnt_data",335,"name")="sgmnt_data.wc_blocked_wcs_recover_invoked_cntr"
-	Set gtmtypes("sgmnt_data",335,"off")=3376
+	Set gtmtypfldindx("sgmnt_data","spcfc_buffer_flushed_during_lockwait_cntr")=334
+	Set gtmtypes("sgmnt_data",335,"name")="sgmnt_data.tp_crit_retries_cntr"
+	Set gtmtypes("sgmnt_data",335,"off")=3340
 	Set gtmtypes("sgmnt_data",335,"len")=4
 	Set gtmtypes("sgmnt_data",335,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_recover_invoked_cntr")=335
-	Set gtmtypes("sgmnt_data",336,"name")="sgmnt_data.wc_blocked_wcs_verify_passed_cntr"
-	Set gtmtypes("sgmnt_data",336,"off")=3380
+	Set gtmtypfldindx("sgmnt_data","tp_crit_retries_cntr")=335
+	Set gtmtypes("sgmnt_data",336,"name")="sgmnt_data.db_csh_getn_flush_dirty_cntr"
+	Set gtmtypes("sgmnt_data",336,"off")=3344
 	Set gtmtypes("sgmnt_data",336,"len")=4
 	Set gtmtypes("sgmnt_data",336,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_verify_passed_cntr")=336
-	Set gtmtypes("sgmnt_data",337,"name")="sgmnt_data.wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr"
-	Set gtmtypes("sgmnt_data",337,"off")=3384
+	Set gtmtypfldindx("sgmnt_data","db_csh_getn_flush_dirty_cntr")=336
+	Set gtmtypes("sgmnt_data",337,"name")="sgmnt_data.db_csh_getn_rip_wait_cntr"
+	Set gtmtypes("sgmnt_data",337,"off")=3348
 	Set gtmtypes("sgmnt_data",337,"len")=4
 	Set gtmtypes("sgmnt_data",337,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr")=337
-	Set gtmtypes("sgmnt_data",338,"name")="sgmnt_data.wc_blocked_t_qread_db_csh_get_invalid_blk_cntr"
-	Set gtmtypes("sgmnt_data",338,"off")=3388
+	Set gtmtypfldindx("sgmnt_data","db_csh_getn_rip_wait_cntr")=337
+	Set gtmtypes("sgmnt_data",338,"name")="sgmnt_data.db_csh_getn_buf_owner_stuck_cntr"
+	Set gtmtypes("sgmnt_data",338,"off")=3352
 	Set gtmtypes("sgmnt_data",338,"len")=4
 	Set gtmtypes("sgmnt_data",338,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_db_csh_get_invalid_blk_cntr")=338
-	Set gtmtypes("sgmnt_data",339,"name")="sgmnt_data.wc_blocked_db_csh_getn_loopexceed_cntr"
-	Set gtmtypes("sgmnt_data",339,"off")=3392
+	Set gtmtypfldindx("sgmnt_data","db_csh_getn_buf_owner_stuck_cntr")=338
+	Set gtmtypes("sgmnt_data",339,"name")="sgmnt_data.db_csh_getn_out_of_design_cntr"
+	Set gtmtypes("sgmnt_data",339,"off")=3356
 	Set gtmtypes("sgmnt_data",339,"len")=4
 	Set gtmtypes("sgmnt_data",339,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_db_csh_getn_loopexceed_cntr")=339
-	Set gtmtypes("sgmnt_data",340,"name")="sgmnt_data.wc_blocked_db_csh_getn_wcsstarvewrt_cntr"
-	Set gtmtypes("sgmnt_data",340,"off")=3396
+	Set gtmtypfldindx("sgmnt_data","db_csh_getn_out_of_design_cntr")=339
+	Set gtmtypes("sgmnt_data",340,"name")="sgmnt_data.t_qread_buf_owner_stuck_cntr"
+	Set gtmtypes("sgmnt_data",340,"off")=3360
 	Set gtmtypes("sgmnt_data",340,"len")=4
 	Set gtmtypes("sgmnt_data",340,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_db_csh_getn_wcsstarvewrt_cntr")=340
-	Set gtmtypes("sgmnt_data",341,"name")="sgmnt_data.wc_blocked_db_csh_get_cntr"
-	Set gtmtypes("sgmnt_data",341,"off")=3400
+	Set gtmtypfldindx("sgmnt_data","t_qread_buf_owner_stuck_cntr")=340
+	Set gtmtypes("sgmnt_data",341,"name")="sgmnt_data.t_qread_out_of_design_cntr"
+	Set gtmtypes("sgmnt_data",341,"off")=3364
 	Set gtmtypes("sgmnt_data",341,"len")=4
 	Set gtmtypes("sgmnt_data",341,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_db_csh_get_cntr")=341
-	Set gtmtypes("sgmnt_data",342,"name")="sgmnt_data.wc_blocked_tp_tend_wcsgetspace_cntr"
-	Set gtmtypes("sgmnt_data",342,"off")=3404
+	Set gtmtypfldindx("sgmnt_data","t_qread_out_of_design_cntr")=341
+	Set gtmtypes("sgmnt_data",342,"name")="sgmnt_data.bt_put_flush_dirty_cntr"
+	Set gtmtypes("sgmnt_data",342,"off")=3368
 	Set gtmtypes("sgmnt_data",342,"len")=4
 	Set gtmtypes("sgmnt_data",342,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_wcsgetspace_cntr")=342
-	Set gtmtypes("sgmnt_data",343,"name")="sgmnt_data.wc_blocked_tp_tend_t1_cntr"
-	Set gtmtypes("sgmnt_data",343,"off")=3408
+	Set gtmtypfldindx("sgmnt_data","bt_put_flush_dirty_cntr")=342
+	Set gtmtypes("sgmnt_data",343,"name")="sgmnt_data.mlock_wakeups_cntr"
+	Set gtmtypes("sgmnt_data",343,"off")=3372
 	Set gtmtypes("sgmnt_data",343,"len")=4
 	Set gtmtypes("sgmnt_data",343,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_t1_cntr")=343
-	Set gtmtypes("sgmnt_data",344,"name")="sgmnt_data.wc_blocked_tp_tend_bitmap_cntr"
-	Set gtmtypes("sgmnt_data",344,"off")=3412
+	Set gtmtypfldindx("sgmnt_data","mlock_wakeups_cntr")=343
+	Set gtmtypes("sgmnt_data",344,"name")="sgmnt_data.wc_blocked_wcs_recover_invoked_cntr"
+	Set gtmtypes("sgmnt_data",344,"off")=3376
 	Set gtmtypes("sgmnt_data",344,"len")=4
 	Set gtmtypes("sgmnt_data",344,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_bitmap_cntr")=344
-	Set gtmtypes("sgmnt_data",345,"name")="sgmnt_data.wc_blocked_tp_tend_jnl_cwset_cntr"
-	Set gtmtypes("sgmnt_data",345,"off")=3416
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_recover_invoked_cntr")=344
+	Set gtmtypes("sgmnt_data",345,"name")="sgmnt_data.wc_blocked_wcs_verify_passed_cntr"
+	Set gtmtypes("sgmnt_data",345,"off")=3380
 	Set gtmtypes("sgmnt_data",345,"len")=4
 	Set gtmtypes("sgmnt_data",345,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_jnl_cwset_cntr")=345
-	Set gtmtypes("sgmnt_data",346,"name")="sgmnt_data.wc_blocked_tp_tend_jnl_wcsflu_cntr"
-	Set gtmtypes("sgmnt_data",346,"off")=3420
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_verify_passed_cntr")=345
+	Set gtmtypes("sgmnt_data",346,"name")="sgmnt_data.wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr"
+	Set gtmtypes("sgmnt_data",346,"off")=3384
 	Set gtmtypes("sgmnt_data",346,"len")=4
 	Set gtmtypes("sgmnt_data",346,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_jnl_wcsflu_cntr")=346
-	Set gtmtypes("sgmnt_data",347,"name")="sgmnt_data.wc_blocked_t_end_hist_cntr"
-	Set gtmtypes("sgmnt_data",347,"off")=3424
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr")=346
+	Set gtmtypes("sgmnt_data",347,"name")="sgmnt_data.wc_blocked_t_qread_db_csh_get_invalid_blk_cntr"
+	Set gtmtypes("sgmnt_data",347,"off")=3388
 	Set gtmtypes("sgmnt_data",347,"len")=4
 	Set gtmtypes("sgmnt_data",347,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_hist_cntr")=347
-	Set gtmtypes("sgmnt_data",348,"name")="sgmnt_data.wc_blocked_t_end_hist1_nullbt_cntr"
-	Set gtmtypes("sgmnt_data",348,"off")=3428
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_db_csh_get_invalid_blk_cntr")=347
+	Set gtmtypes("sgmnt_data",348,"name")="sgmnt_data.wc_blocked_db_csh_getn_loopexceed_cntr"
+	Set gtmtypes("sgmnt_data",348,"off")=3392
 	Set gtmtypes("sgmnt_data",348,"len")=4
 	Set gtmtypes("sgmnt_data",348,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_hist1_nullbt_cntr")=348
-	Set gtmtypes("sgmnt_data",349,"name")="sgmnt_data.wc_blocked_t_end_hist1_nonnullbt_cntr"
-	Set gtmtypes("sgmnt_data",349,"off")=3432
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_db_csh_getn_loopexceed_cntr")=348
+	Set gtmtypes("sgmnt_data",349,"name")="sgmnt_data.wc_blocked_db_csh_getn_wcsstarvewrt_cntr"
+	Set gtmtypes("sgmnt_data",349,"off")=3396
 	Set gtmtypes("sgmnt_data",349,"len")=4
 	Set gtmtypes("sgmnt_data",349,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_hist1_nonnullbt_cntr")=349
-	Set gtmtypes("sgmnt_data",350,"name")="sgmnt_data.wc_blocked_t_end_bitmap_nullbt_cntr"
-	Set gtmtypes("sgmnt_data",350,"off")=3436
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_db_csh_getn_wcsstarvewrt_cntr")=349
+	Set gtmtypes("sgmnt_data",350,"name")="sgmnt_data.wc_blocked_db_csh_get_cntr"
+	Set gtmtypes("sgmnt_data",350,"off")=3400
 	Set gtmtypes("sgmnt_data",350,"len")=4
 	Set gtmtypes("sgmnt_data",350,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_bitmap_nullbt_cntr")=350
-	Set gtmtypes("sgmnt_data",351,"name")="sgmnt_data.wc_blocked_t_end_bitmap_nonnullbt_cntr"
-	Set gtmtypes("sgmnt_data",351,"off")=3440
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_db_csh_get_cntr")=350
+	Set gtmtypes("sgmnt_data",351,"name")="sgmnt_data.wc_blocked_tp_tend_wcsgetspace_cntr"
+	Set gtmtypes("sgmnt_data",351,"off")=3404
 	Set gtmtypes("sgmnt_data",351,"len")=4
 	Set gtmtypes("sgmnt_data",351,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_bitmap_nonnullbt_cntr")=351
-	Set gtmtypes("sgmnt_data",352,"name")="sgmnt_data.wc_blocked_t_end_jnl_cwset_cntr"
-	Set gtmtypes("sgmnt_data",352,"off")=3444
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_wcsgetspace_cntr")=351
+	Set gtmtypes("sgmnt_data",352,"name")="sgmnt_data.wc_blocked_tp_tend_t1_cntr"
+	Set gtmtypes("sgmnt_data",352,"off")=3408
 	Set gtmtypes("sgmnt_data",352,"len")=4
 	Set gtmtypes("sgmnt_data",352,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_jnl_cwset_cntr")=352
-	Set gtmtypes("sgmnt_data",353,"name")="sgmnt_data.wc_blocked_t_end_jnl_wcsflu_cntr"
-	Set gtmtypes("sgmnt_data",353,"off")=3448
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_t1_cntr")=352
+	Set gtmtypes("sgmnt_data",353,"name")="sgmnt_data.wc_blocked_tp_tend_bitmap_cntr"
+	Set gtmtypes("sgmnt_data",353,"off")=3412
 	Set gtmtypes("sgmnt_data",353,"len")=4
 	Set gtmtypes("sgmnt_data",353,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_jnl_wcsflu_cntr")=353
-	Set gtmtypes("sgmnt_data",354,"name")="sgmnt_data.db_csh_get_too_many_loops_cntr"
-	Set gtmtypes("sgmnt_data",354,"off")=3452
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_bitmap_cntr")=353
+	Set gtmtypes("sgmnt_data",354,"name")="sgmnt_data.wc_blocked_tp_tend_jnl_cwset_cntr"
+	Set gtmtypes("sgmnt_data",354,"off")=3416
 	Set gtmtypes("sgmnt_data",354,"len")=4
 	Set gtmtypes("sgmnt_data",354,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","db_csh_get_too_many_loops_cntr")=354
-	Set gtmtypes("sgmnt_data",355,"name")="sgmnt_data.wc_blocked_tpckh_hist1_nullbt_cntr"
-	Set gtmtypes("sgmnt_data",355,"off")=3456
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_jnl_cwset_cntr")=354
+	Set gtmtypes("sgmnt_data",355,"name")="sgmnt_data.wc_blocked_tp_tend_jnl_wcsflu_cntr"
+	Set gtmtypes("sgmnt_data",355,"off")=3420
 	Set gtmtypes("sgmnt_data",355,"len")=4
 	Set gtmtypes("sgmnt_data",355,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tpckh_hist1_nullbt_cntr")=355
-	Set gtmtypes("sgmnt_data",356,"name")="sgmnt_data.wc_blocked_tpckh_hist1_nonnullbt_cntr"
-	Set gtmtypes("sgmnt_data",356,"off")=3460
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_jnl_wcsflu_cntr")=355
+	Set gtmtypes("sgmnt_data",356,"name")="sgmnt_data.wc_blocked_t_end_hist_cntr"
+	Set gtmtypes("sgmnt_data",356,"off")=3424
 	Set gtmtypes("sgmnt_data",356,"len")=4
 	Set gtmtypes("sgmnt_data",356,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tpckh_hist1_nonnullbt_cntr")=356
-	Set gtmtypes("sgmnt_data",357,"name")="sgmnt_data.jnl_blocked_writer_lost_cntr"
-	Set gtmtypes("sgmnt_data",357,"off")=3464
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_hist_cntr")=356
+	Set gtmtypes("sgmnt_data",357,"name")="sgmnt_data.wc_blocked_t_end_hist1_nullbt_cntr"
+	Set gtmtypes("sgmnt_data",357,"off")=3428
 	Set gtmtypes("sgmnt_data",357,"len")=4
 	Set gtmtypes("sgmnt_data",357,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","jnl_blocked_writer_lost_cntr")=357
-	Set gtmtypes("sgmnt_data",358,"name")="sgmnt_data.jnl_blocked_writer_stuck_cntr"
-	Set gtmtypes("sgmnt_data",358,"off")=3468
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_hist1_nullbt_cntr")=357
+	Set gtmtypes("sgmnt_data",358,"name")="sgmnt_data.wc_blocked_t_end_hist1_nonnullbt_cntr"
+	Set gtmtypes("sgmnt_data",358,"off")=3432
 	Set gtmtypes("sgmnt_data",358,"len")=4
 	Set gtmtypes("sgmnt_data",358,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","jnl_blocked_writer_stuck_cntr")=358
-	Set gtmtypes("sgmnt_data",359,"name")="sgmnt_data.jnl_blocked_writer_blocked_cntr"
-	Set gtmtypes("sgmnt_data",359,"off")=3472
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_hist1_nonnullbt_cntr")=358
+	Set gtmtypes("sgmnt_data",359,"name")="sgmnt_data.wc_blocked_t_end_bitmap_nullbt_cntr"
+	Set gtmtypes("sgmnt_data",359,"off")=3436
 	Set gtmtypes("sgmnt_data",359,"len")=4
 	Set gtmtypes("sgmnt_data",359,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","jnl_blocked_writer_blocked_cntr")=359
-	Set gtmtypes("sgmnt_data",360,"name")="sgmnt_data.n_jnl_fsyncs_cntr"
-	Set gtmtypes("sgmnt_data",360,"off")=3476
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_bitmap_nullbt_cntr")=359
+	Set gtmtypes("sgmnt_data",360,"name")="sgmnt_data.wc_blocked_t_end_bitmap_nonnullbt_cntr"
+	Set gtmtypes("sgmnt_data",360,"off")=3440
 	Set gtmtypes("sgmnt_data",360,"len")=4
 	Set gtmtypes("sgmnt_data",360,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_jnl_fsyncs_cntr")=360
-	Set gtmtypes("sgmnt_data",361,"name")="sgmnt_data.n_jnl_fsync_tries_cntr"
-	Set gtmtypes("sgmnt_data",361,"off")=3480
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_bitmap_nonnullbt_cntr")=360
+	Set gtmtypes("sgmnt_data",361,"name")="sgmnt_data.wc_blocked_t_end_jnl_cwset_cntr"
+	Set gtmtypes("sgmnt_data",361,"off")=3444
 	Set gtmtypes("sgmnt_data",361,"len")=4
 	Set gtmtypes("sgmnt_data",361,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_jnl_fsync_tries_cntr")=361
-	Set gtmtypes("sgmnt_data",362,"name")="sgmnt_data.n_jnl_fsync_recovers_cntr"
-	Set gtmtypes("sgmnt_data",362,"off")=3484
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_jnl_cwset_cntr")=361
+	Set gtmtypes("sgmnt_data",362,"name")="sgmnt_data.wc_blocked_t_end_jnl_wcsflu_cntr"
+	Set gtmtypes("sgmnt_data",362,"off")=3448
 	Set gtmtypes("sgmnt_data",362,"len")=4
 	Set gtmtypes("sgmnt_data",362,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_jnl_fsync_recovers_cntr")=362
-	Set gtmtypes("sgmnt_data",363,"name")="sgmnt_data.n_db_fsyncs_cntr"
-	Set gtmtypes("sgmnt_data",363,"off")=3488
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_jnl_wcsflu_cntr")=362
+	Set gtmtypes("sgmnt_data",363,"name")="sgmnt_data.db_csh_get_too_many_loops_cntr"
+	Set gtmtypes("sgmnt_data",363,"off")=3452
 	Set gtmtypes("sgmnt_data",363,"len")=4
 	Set gtmtypes("sgmnt_data",363,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_db_fsyncs_cntr")=363
-	Set gtmtypes("sgmnt_data",364,"name")="sgmnt_data.n_db_fsyncs_in_crit_cntr"
-	Set gtmtypes("sgmnt_data",364,"off")=3492
+	Set gtmtypfldindx("sgmnt_data","db_csh_get_too_many_loops_cntr")=363
+	Set gtmtypes("sgmnt_data",364,"name")="sgmnt_data.wc_blocked_tpckh_hist1_nullbt_cntr"
+	Set gtmtypes("sgmnt_data",364,"off")=3456
 	Set gtmtypes("sgmnt_data",364,"len")=4
 	Set gtmtypes("sgmnt_data",364,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_db_fsyncs_in_crit_cntr")=364
-	Set gtmtypes("sgmnt_data",365,"name")="sgmnt_data.n_dbsync_timers_cntr"
-	Set gtmtypes("sgmnt_data",365,"off")=3496
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tpckh_hist1_nullbt_cntr")=364
+	Set gtmtypes("sgmnt_data",365,"name")="sgmnt_data.wc_blocked_tpckh_hist1_nonnullbt_cntr"
+	Set gtmtypes("sgmnt_data",365,"off")=3460
 	Set gtmtypes("sgmnt_data",365,"len")=4
 	Set gtmtypes("sgmnt_data",365,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_dbsync_timers_cntr")=365
-	Set gtmtypes("sgmnt_data",366,"name")="sgmnt_data.n_dbsync_writes_cntr"
-	Set gtmtypes("sgmnt_data",366,"off")=3500
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tpckh_hist1_nonnullbt_cntr")=365
+	Set gtmtypes("sgmnt_data",366,"name")="sgmnt_data.jnl_blocked_writer_lost_cntr"
+	Set gtmtypes("sgmnt_data",366,"off")=3464
 	Set gtmtypes("sgmnt_data",366,"len")=4
 	Set gtmtypes("sgmnt_data",366,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_dbsync_writes_cntr")=366
-	Set gtmtypes("sgmnt_data",367,"name")="sgmnt_data.mutex_queue_full_cntr"
-	Set gtmtypes("sgmnt_data",367,"off")=3504
+	Set gtmtypfldindx("sgmnt_data","jnl_blocked_writer_lost_cntr")=366
+	Set gtmtypes("sgmnt_data",367,"name")="sgmnt_data.jnl_blocked_writer_stuck_cntr"
+	Set gtmtypes("sgmnt_data",367,"off")=3468
 	Set gtmtypes("sgmnt_data",367,"len")=4
 	Set gtmtypes("sgmnt_data",367,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","mutex_queue_full_cntr")=367
-	Set gtmtypes("sgmnt_data",368,"name")="sgmnt_data.wcb_bt_put_cntr"
-	Set gtmtypes("sgmnt_data",368,"off")=3508
+	Set gtmtypfldindx("sgmnt_data","jnl_blocked_writer_stuck_cntr")=367
+	Set gtmtypes("sgmnt_data",368,"name")="sgmnt_data.jnl_blocked_writer_blocked_cntr"
+	Set gtmtypes("sgmnt_data",368,"off")=3472
 	Set gtmtypes("sgmnt_data",368,"len")=4
 	Set gtmtypes("sgmnt_data",368,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_bt_put_cntr")=368
-	Set gtmtypes("sgmnt_data",369,"name")="sgmnt_data.wcb_mutex_salvage_cntr"
-	Set gtmtypes("sgmnt_data",369,"off")=3512
+	Set gtmtypfldindx("sgmnt_data","jnl_blocked_writer_blocked_cntr")=368
+	Set gtmtypes("sgmnt_data",369,"name")="sgmnt_data.n_jnl_fsyncs_cntr"
+	Set gtmtypes("sgmnt_data",369,"off")=3476
 	Set gtmtypes("sgmnt_data",369,"len")=4
 	Set gtmtypes("sgmnt_data",369,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_mutex_salvage_cntr")=369
-	Set gtmtypes("sgmnt_data",370,"name")="sgmnt_data.wcb_tp_grab_crit_cntr"
-	Set gtmtypes("sgmnt_data",370,"off")=3516
+	Set gtmtypfldindx("sgmnt_data","n_jnl_fsyncs_cntr")=369
+	Set gtmtypes("sgmnt_data",370,"name")="sgmnt_data.n_jnl_fsync_tries_cntr"
+	Set gtmtypes("sgmnt_data",370,"off")=3480
 	Set gtmtypes("sgmnt_data",370,"len")=4
 	Set gtmtypes("sgmnt_data",370,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_tp_grab_crit_cntr")=370
-	Set gtmtypes("sgmnt_data",371,"name")="sgmnt_data.wcb_t_end_sysops_nocr_invcr_cntr"
-	Set gtmtypes("sgmnt_data",371,"off")=3520
+	Set gtmtypfldindx("sgmnt_data","n_jnl_fsync_tries_cntr")=370
+	Set gtmtypes("sgmnt_data",371,"name")="sgmnt_data.n_jnl_fsync_recovers_cntr"
+	Set gtmtypes("sgmnt_data",371,"off")=3484
 	Set gtmtypes("sgmnt_data",371,"len")=4
 	Set gtmtypes("sgmnt_data",371,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_nocr_invcr_cntr")=371
-	Set gtmtypes("sgmnt_data",372,"name")="sgmnt_data.wcb_t_end_sysops_cr_invcr_cntr"
-	Set gtmtypes("sgmnt_data",372,"off")=3524
+	Set gtmtypfldindx("sgmnt_data","n_jnl_fsync_recovers_cntr")=371
+	Set gtmtypes("sgmnt_data",372,"name")="sgmnt_data.n_db_fsyncs_cntr"
+	Set gtmtypes("sgmnt_data",372,"off")=3488
 	Set gtmtypes("sgmnt_data",372,"len")=4
 	Set gtmtypes("sgmnt_data",372,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_cr_invcr_cntr")=372
-	Set gtmtypes("sgmnt_data",373,"name")="sgmnt_data.wcb_t_end_sysops_rip_wait_cntr"
-	Set gtmtypes("sgmnt_data",373,"off")=3528
+	Set gtmtypfldindx("sgmnt_data","n_db_fsyncs_cntr")=372
+	Set gtmtypes("sgmnt_data",373,"name")="sgmnt_data.n_db_fsyncs_in_crit_cntr"
+	Set gtmtypes("sgmnt_data",373,"off")=3492
 	Set gtmtypes("sgmnt_data",373,"len")=4
 	Set gtmtypes("sgmnt_data",373,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_rip_wait_cntr")=373
-	Set gtmtypes("sgmnt_data",374,"name")="sgmnt_data.wcb_t_end_sysops_dirtyripwait_cntr"
-	Set gtmtypes("sgmnt_data",374,"off")=3532
+	Set gtmtypfldindx("sgmnt_data","n_db_fsyncs_in_crit_cntr")=373
+	Set gtmtypes("sgmnt_data",374,"name")="sgmnt_data.n_dbsync_timers_cntr"
+	Set gtmtypes("sgmnt_data",374,"off")=3496
 	Set gtmtypes("sgmnt_data",374,"len")=4
 	Set gtmtypes("sgmnt_data",374,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirtyripwait_cntr")=374
-	Set gtmtypes("sgmnt_data",375,"name")="sgmnt_data.wcb_gds_rundown_cntr"
-	Set gtmtypes("sgmnt_data",375,"off")=3536
+	Set gtmtypfldindx("sgmnt_data","n_dbsync_timers_cntr")=374
+	Set gtmtypes("sgmnt_data",375,"name")="sgmnt_data.n_dbsync_writes_cntr"
+	Set gtmtypes("sgmnt_data",375,"off")=3500
 	Set gtmtypes("sgmnt_data",375,"len")=4
 	Set gtmtypes("sgmnt_data",375,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_gds_rundown_cntr")=375
-	Set gtmtypes("sgmnt_data",376,"name")="sgmnt_data.wcb_wcs_flu1_cntr"
-	Set gtmtypes("sgmnt_data",376,"off")=3540
+	Set gtmtypfldindx("sgmnt_data","n_dbsync_writes_cntr")=375
+	Set gtmtypes("sgmnt_data",376,"name")="sgmnt_data.mutex_queue_full_cntr"
+	Set gtmtypes("sgmnt_data",376,"off")=3504
 	Set gtmtypes("sgmnt_data",376,"len")=4
 	Set gtmtypes("sgmnt_data",376,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_wcs_flu1_cntr")=376
-	Set gtmtypes("sgmnt_data",377,"name")="sgmnt_data.wcb_mu_back_cntr"
-	Set gtmtypes("sgmnt_data",377,"off")=3544
+	Set gtmtypfldindx("sgmnt_data","mutex_queue_full_cntr")=376
+	Set gtmtypes("sgmnt_data",377,"name")="sgmnt_data.wcb_bt_put_cntr"
+	Set gtmtypes("sgmnt_data",377,"off")=3508
 	Set gtmtypes("sgmnt_data",377,"len")=4
 	Set gtmtypes("sgmnt_data",377,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_mu_back_cntr")=377
-	Set gtmtypes("sgmnt_data",378,"name")="sgmnt_data.wcb_t_end_sysops_dirty_invcr_cntr"
-	Set gtmtypes("sgmnt_data",378,"off")=3548
+	Set gtmtypfldindx("sgmnt_data","wcb_bt_put_cntr")=377
+	Set gtmtypes("sgmnt_data",378,"name")="sgmnt_data.wcb_mutex_salvage_cntr"
+	Set gtmtypes("sgmnt_data",378,"off")=3512
 	Set gtmtypes("sgmnt_data",378,"len")=4
 	Set gtmtypes("sgmnt_data",378,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirty_invcr_cntr")=378
-	Set gtmtypes("sgmnt_data",379,"name")="sgmnt_data.wcb_t_end_sysops_wtfini_fail_cntr"
-	Set gtmtypes("sgmnt_data",379,"off")=3552
+	Set gtmtypfldindx("sgmnt_data","wcb_mutex_salvage_cntr")=378
+	Set gtmtypes("sgmnt_data",379,"name")="sgmnt_data.wcb_tp_grab_crit_cntr"
+	Set gtmtypes("sgmnt_data",379,"off")=3516
 	Set gtmtypes("sgmnt_data",379,"len")=4
 	Set gtmtypes("sgmnt_data",379,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_wtfini_fail_cntr")=379
-	Set gtmtypes("sgmnt_data",380,"name")="sgmnt_data.wcb_t_end_sysops_twin_stuck_cntr"
-	Set gtmtypes("sgmnt_data",380,"off")=3556
+	Set gtmtypfldindx("sgmnt_data","wcb_tp_grab_crit_cntr")=379
+	Set gtmtypes("sgmnt_data",380,"name")="sgmnt_data.wcb_t_end_sysops_nocr_invcr_cntr"
+	Set gtmtypes("sgmnt_data",380,"off")=3520
 	Set gtmtypes("sgmnt_data",380,"len")=4
 	Set gtmtypes("sgmnt_data",380,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_twin_stuck_cntr")=380
-	Set gtmtypes("sgmnt_data",381,"name")="sgmnt_data.db_csh_getn_wrt_latch_stuck_cntr"
-	Set gtmtypes("sgmnt_data",381,"off")=3560
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_nocr_invcr_cntr")=380
+	Set gtmtypes("sgmnt_data",381,"name")="sgmnt_data.wcb_t_end_sysops_cr_invcr_cntr"
+	Set gtmtypes("sgmnt_data",381,"off")=3524
 	Set gtmtypes("sgmnt_data",381,"len")=4
 	Set gtmtypes("sgmnt_data",381,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","db_csh_getn_wrt_latch_stuck_cntr")=381
-	Set gtmtypes("sgmnt_data",382,"name")="sgmnt_data.wcb_secshr_db_clnup_now_crit_cntr"
-	Set gtmtypes("sgmnt_data",382,"off")=3564
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_cr_invcr_cntr")=381
+	Set gtmtypes("sgmnt_data",382,"name")="sgmnt_data.wcb_t_end_sysops_rip_wait_cntr"
+	Set gtmtypes("sgmnt_data",382,"off")=3528
 	Set gtmtypes("sgmnt_data",382,"len")=4
 	Set gtmtypes("sgmnt_data",382,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_secshr_db_clnup_now_crit_cntr")=382
-	Set gtmtypes("sgmnt_data",383,"name")="sgmnt_data.wc_blocked_t_qread_bad_bt_index1_cntr"
-	Set gtmtypes("sgmnt_data",383,"off")=3568
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_rip_wait_cntr")=382
+	Set gtmtypes("sgmnt_data",383,"name")="sgmnt_data.wcb_t_end_sysops_dirtyripwait_cntr"
+	Set gtmtypes("sgmnt_data",383,"off")=3532
 	Set gtmtypes("sgmnt_data",383,"len")=4
 	Set gtmtypes("sgmnt_data",383,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_bad_bt_index1_cntr")=383
-	Set gtmtypes("sgmnt_data",384,"name")="sgmnt_data.wc_blocked_t_qread_bad_bt_index2_cntr"
-	Set gtmtypes("sgmnt_data",384,"off")=3572
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirtyripwait_cntr")=383
+	Set gtmtypes("sgmnt_data",384,"name")="sgmnt_data.wcb_gds_rundown_cntr"
+	Set gtmtypes("sgmnt_data",384,"off")=3536
 	Set gtmtypes("sgmnt_data",384,"len")=4
 	Set gtmtypes("sgmnt_data",384,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_bad_bt_index2_cntr")=384
-	Set gtmtypes("sgmnt_data",385,"name")="sgmnt_data.wc_blocked_t_end_crbtmismatch1_cntr"
-	Set gtmtypes("sgmnt_data",385,"off")=3576
+	Set gtmtypfldindx("sgmnt_data","wcb_gds_rundown_cntr")=384
+	Set gtmtypes("sgmnt_data",385,"name")="sgmnt_data.wcb_wcs_flu1_cntr"
+	Set gtmtypes("sgmnt_data",385,"off")=3540
 	Set gtmtypes("sgmnt_data",385,"len")=4
 	Set gtmtypes("sgmnt_data",385,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_crbtmismatch1_cntr")=385
-	Set gtmtypes("sgmnt_data",386,"name")="sgmnt_data.wc_blocked_t_end_crbtmismatch2_cntr"
-	Set gtmtypes("sgmnt_data",386,"off")=3580
+	Set gtmtypfldindx("sgmnt_data","wcb_wcs_flu1_cntr")=385
+	Set gtmtypes("sgmnt_data",386,"name")="sgmnt_data.wcb_mu_back_cntr"
+	Set gtmtypes("sgmnt_data",386,"off")=3544
 	Set gtmtypes("sgmnt_data",386,"len")=4
 	Set gtmtypes("sgmnt_data",386,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_crbtmismatch2_cntr")=386
-	Set gtmtypes("sgmnt_data",387,"name")="sgmnt_data.wc_blocked_t_end_crbtmismatch3_cntr"
-	Set gtmtypes("sgmnt_data",387,"off")=3584
+	Set gtmtypfldindx("sgmnt_data","wcb_mu_back_cntr")=386
+	Set gtmtypes("sgmnt_data",387,"name")="sgmnt_data.wcb_t_end_sysops_dirty_invcr_cntr"
+	Set gtmtypes("sgmnt_data",387,"off")=3548
 	Set gtmtypes("sgmnt_data",387,"len")=4
 	Set gtmtypes("sgmnt_data",387,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_crbtmismatch3_cntr")=387
-	Set gtmtypes("sgmnt_data",388,"name")="sgmnt_data.wc_blocked_tp_tend_crbtmismatch1_cntr"
-	Set gtmtypes("sgmnt_data",388,"off")=3588
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirty_invcr_cntr")=387
+	Set gtmtypes("sgmnt_data",388,"name")="sgmnt_data.wcb_t_end_sysops_wtfini_fail_cntr"
+	Set gtmtypes("sgmnt_data",388,"off")=3552
 	Set gtmtypes("sgmnt_data",388,"len")=4
 	Set gtmtypes("sgmnt_data",388,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_crbtmismatch1_cntr")=388
-	Set gtmtypes("sgmnt_data",389,"name")="sgmnt_data.wc_blocked_tp_tend_crbtmismatch2_cntr"
-	Set gtmtypes("sgmnt_data",389,"off")=3592
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_wtfini_fail_cntr")=388
+	Set gtmtypes("sgmnt_data",389,"name")="sgmnt_data.wcb_t_end_sysops_twin_stuck_cntr"
+	Set gtmtypes("sgmnt_data",389,"off")=3556
 	Set gtmtypes("sgmnt_data",389,"len")=4
 	Set gtmtypes("sgmnt_data",389,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_crbtmismatch2_cntr")=389
-	Set gtmtypes("sgmnt_data",390,"name")="sgmnt_data.wc_blocked_tp_tend_crbtmismatch3_cntr"
-	Set gtmtypes("sgmnt_data",390,"off")=3596
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_twin_stuck_cntr")=389
+	Set gtmtypes("sgmnt_data",390,"name")="sgmnt_data.db_csh_getn_wrt_latch_stuck_cntr"
+	Set gtmtypes("sgmnt_data",390,"off")=3560
 	Set gtmtypes("sgmnt_data",390,"len")=4
 	Set gtmtypes("sgmnt_data",390,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_crbtmismatch3_cntr")=390
-	Set gtmtypes("sgmnt_data",391,"name")="sgmnt_data.wc_blocked_wcs_wtstart_bad_cr_cntr"
-	Set gtmtypes("sgmnt_data",391,"off")=3600
+	Set gtmtypfldindx("sgmnt_data","db_csh_getn_wrt_latch_stuck_cntr")=390
+	Set gtmtypes("sgmnt_data",391,"name")="sgmnt_data.wcb_secshr_db_clnup_now_crit_cntr"
+	Set gtmtypes("sgmnt_data",391,"off")=3564
 	Set gtmtypes("sgmnt_data",391,"len")=4
 	Set gtmtypes("sgmnt_data",391,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_wtstart_bad_cr_cntr")=391
-	Set gtmtypes("sgmnt_data",392,"name")="sgmnt_data.wc_blocked_wcs_wtfini_bad_cr_cntr"
-	Set gtmtypes("sgmnt_data",392,"off")=3604
+	Set gtmtypfldindx("sgmnt_data","wcb_secshr_db_clnup_now_crit_cntr")=391
+	Set gtmtypes("sgmnt_data",392,"name")="sgmnt_data.wc_blocked_t_qread_bad_bt_index1_cntr"
+	Set gtmtypes("sgmnt_data",392,"off")=3568
 	Set gtmtypes("sgmnt_data",392,"len")=4
 	Set gtmtypes("sgmnt_data",392,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_wtfini_bad_cr_cntr")=392
-	Set gtmtypes("sgmnt_data",393,"name")="sgmnt_data.wc_blocked_bt_get_cntr"
-	Set gtmtypes("sgmnt_data",393,"off")=3608
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_bad_bt_index1_cntr")=392
+	Set gtmtypes("sgmnt_data",393,"name")="sgmnt_data.wc_blocked_t_qread_bad_bt_index2_cntr"
+	Set gtmtypes("sgmnt_data",393,"off")=3572
 	Set gtmtypes("sgmnt_data",393,"len")=4
 	Set gtmtypes("sgmnt_data",393,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_bt_get_cntr")=393
-	Set gtmtypes("sgmnt_data",394,"name")="sgmnt_data.wc_blocked_wcs_cdb_sc_final_retry_cntr"
-	Set gtmtypes("sgmnt_data",394,"off")=3612
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_bad_bt_index2_cntr")=393
+	Set gtmtypes("sgmnt_data",394,"name")="sgmnt_data.wc_blocked_t_end_crbtmismatch1_cntr"
+	Set gtmtypes("sgmnt_data",394,"off")=3576
 	Set gtmtypes("sgmnt_data",394,"len")=4
 	Set gtmtypes("sgmnt_data",394,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_cdb_sc_final_retry_cntr")=394
-	Set gtmtypes("sgmnt_data",395,"name")="sgmnt_data.wcb_bg_update_lckfail1_cntr"
-	Set gtmtypes("sgmnt_data",395,"off")=3616
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_crbtmismatch1_cntr")=394
+	Set gtmtypes("sgmnt_data",395,"name")="sgmnt_data.wc_blocked_t_end_crbtmismatch2_cntr"
+	Set gtmtypes("sgmnt_data",395,"off")=3580
 	Set gtmtypes("sgmnt_data",395,"len")=4
 	Set gtmtypes("sgmnt_data",395,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_bg_update_lckfail1_cntr")=395
-	Set gtmtypes("sgmnt_data",396,"name")="sgmnt_data.wcb_bg_update_lckfail2_cntr"
-	Set gtmtypes("sgmnt_data",396,"off")=3620
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_crbtmismatch2_cntr")=395
+	Set gtmtypes("sgmnt_data",396,"name")="sgmnt_data.wc_blocked_t_end_crbtmismatch3_cntr"
+	Set gtmtypes("sgmnt_data",396,"off")=3584
 	Set gtmtypes("sgmnt_data",396,"len")=4
 	Set gtmtypes("sgmnt_data",396,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_bg_update_lckfail2_cntr")=396
-	Set gtmtypes("sgmnt_data",397,"name")="sgmnt_data.wcb_wtstart_lckfail1_cntr"
-	Set gtmtypes("sgmnt_data",397,"off")=3624
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_crbtmismatch3_cntr")=396
+	Set gtmtypes("sgmnt_data",397,"name")="sgmnt_data.wc_blocked_tp_tend_crbtmismatch1_cntr"
+	Set gtmtypes("sgmnt_data",397,"off")=3588
 	Set gtmtypes("sgmnt_data",397,"len")=4
 	Set gtmtypes("sgmnt_data",397,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail1_cntr")=397
-	Set gtmtypes("sgmnt_data",398,"name")="sgmnt_data.wcb_wtstart_lckfail2_cntr"
-	Set gtmtypes("sgmnt_data",398,"off")=3628
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_crbtmismatch1_cntr")=397
+	Set gtmtypes("sgmnt_data",398,"name")="sgmnt_data.wc_blocked_tp_tend_crbtmismatch2_cntr"
+	Set gtmtypes("sgmnt_data",398,"off")=3592
 	Set gtmtypes("sgmnt_data",398,"len")=4
 	Set gtmtypes("sgmnt_data",398,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail2_cntr")=398
-	Set gtmtypes("sgmnt_data",399,"name")="sgmnt_data.wcb_wtstart_lckfail3_cntr"
-	Set gtmtypes("sgmnt_data",399,"off")=3632
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_crbtmismatch2_cntr")=398
+	Set gtmtypes("sgmnt_data",399,"name")="sgmnt_data.wc_blocked_tp_tend_crbtmismatch3_cntr"
+	Set gtmtypes("sgmnt_data",399,"off")=3596
 	Set gtmtypes("sgmnt_data",399,"len")=4
 	Set gtmtypes("sgmnt_data",399,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail3_cntr")=399
-	Set gtmtypes("sgmnt_data",400,"name")="sgmnt_data.wcb_wtstart_lckfail4_cntr"
-	Set gtmtypes("sgmnt_data",400,"off")=3636
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_crbtmismatch3_cntr")=399
+	Set gtmtypes("sgmnt_data",400,"name")="sgmnt_data.wc_blocked_wcs_wtstart_bad_cr_cntr"
+	Set gtmtypes("sgmnt_data",400,"off")=3600
 	Set gtmtypes("sgmnt_data",400,"len")=4
 	Set gtmtypes("sgmnt_data",400,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail4_cntr")=400
-	Set gtmtypes("sgmnt_data",401,"name")="sgmnt_data.wcb_wtfini_lckfail1_cntr"
-	Set gtmtypes("sgmnt_data",401,"off")=3640
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_wtstart_bad_cr_cntr")=400
+	Set gtmtypes("sgmnt_data",401,"name")="sgmnt_data.wc_blocked_wcs_wtfini_bad_cr_cntr"
+	Set gtmtypes("sgmnt_data",401,"off")=3604
 	Set gtmtypes("sgmnt_data",401,"len")=4
 	Set gtmtypes("sgmnt_data",401,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail1_cntr")=401
-	Set gtmtypes("sgmnt_data",402,"name")="sgmnt_data.wcb_wtfini_lckfail2_cntr"
-	Set gtmtypes("sgmnt_data",402,"off")=3644
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_wtfini_bad_cr_cntr")=401
+	Set gtmtypes("sgmnt_data",402,"name")="sgmnt_data.wc_blocked_bt_get_cntr"
+	Set gtmtypes("sgmnt_data",402,"off")=3608
 	Set gtmtypes("sgmnt_data",402,"len")=4
 	Set gtmtypes("sgmnt_data",402,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail2_cntr")=402
-	Set gtmtypes("sgmnt_data",403,"name")="sgmnt_data.wcb_wtfini_lckfail3_cntr"
-	Set gtmtypes("sgmnt_data",403,"off")=3648
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_bt_get_cntr")=402
+	Set gtmtypes("sgmnt_data",403,"name")="sgmnt_data.wc_blocked_wcs_cdb_sc_final_retry_cntr"
+	Set gtmtypes("sgmnt_data",403,"off")=3612
 	Set gtmtypes("sgmnt_data",403,"len")=4
 	Set gtmtypes("sgmnt_data",403,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail3_cntr")=403
-	Set gtmtypes("sgmnt_data",404,"name")="sgmnt_data.wcb_wtfini_lckfail4_cntr"
-	Set gtmtypes("sgmnt_data",404,"off")=3652
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_cdb_sc_final_retry_cntr")=403
+	Set gtmtypes("sgmnt_data",404,"name")="sgmnt_data.wcb_bg_update_lckfail1_cntr"
+	Set gtmtypes("sgmnt_data",404,"off")=3616
 	Set gtmtypes("sgmnt_data",404,"len")=4
 	Set gtmtypes("sgmnt_data",404,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail4_cntr")=404
-	Set gtmtypes("sgmnt_data",405,"name")="sgmnt_data.wcb_t_end_sysops_dirtystuck1_cntr"
-	Set gtmtypes("sgmnt_data",405,"off")=3656
+	Set gtmtypfldindx("sgmnt_data","wcb_bg_update_lckfail1_cntr")=404
+	Set gtmtypes("sgmnt_data",405,"name")="sgmnt_data.wcb_bg_update_lckfail2_cntr"
+	Set gtmtypes("sgmnt_data",405,"off")=3620
 	Set gtmtypes("sgmnt_data",405,"len")=4
 	Set gtmtypes("sgmnt_data",405,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirtystuck1_cntr")=405
-	Set gtmtypes("sgmnt_data",406,"name")="sgmnt_data.wcb_t_end_sysops_dirtystuck2_cntr"
-	Set gtmtypes("sgmnt_data",406,"off")=3660
+	Set gtmtypfldindx("sgmnt_data","wcb_bg_update_lckfail2_cntr")=405
+	Set gtmtypes("sgmnt_data",406,"name")="sgmnt_data.wcb_wtstart_lckfail1_cntr"
+	Set gtmtypes("sgmnt_data",406,"off")=3624
 	Set gtmtypes("sgmnt_data",406,"len")=4
 	Set gtmtypes("sgmnt_data",406,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirtystuck2_cntr")=406
-	Set gtmtypes("sgmnt_data",407,"name")="sgmnt_data.wcb_secshr_db_clnup_wbuf_dqd_cntr"
-	Set gtmtypes("sgmnt_data",407,"off")=3664
+	Set gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail1_cntr")=406
+	Set gtmtypes("sgmnt_data",407,"name")="sgmnt_data.wcb_wtstart_lckfail2_cntr"
+	Set gtmtypes("sgmnt_data",407,"off")=3628
 	Set gtmtypes("sgmnt_data",407,"len")=4
 	Set gtmtypes("sgmnt_data",407,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_secshr_db_clnup_wbuf_dqd_cntr")=407
-	Set gtmtypes("sgmnt_data",408,"name")="sgmnt_data.dwngrd_refmts_syncio_cntr"
-	Set gtmtypes("sgmnt_data",408,"off")=3668
+	Set gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail2_cntr")=407
+	Set gtmtypes("sgmnt_data",408,"name")="sgmnt_data.wcb_wtstart_lckfail3_cntr"
+	Set gtmtypes("sgmnt_data",408,"off")=3632
 	Set gtmtypes("sgmnt_data",408,"len")=4
 	Set gtmtypes("sgmnt_data",408,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","dwngrd_refmts_syncio_cntr")=408
-	Set gtmtypes("sgmnt_data",409,"name")="sgmnt_data.dwngrd_refmts_asyncio_cntr"
-	Set gtmtypes("sgmnt_data",409,"off")=3672
+	Set gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail3_cntr")=408
+	Set gtmtypes("sgmnt_data",409,"name")="sgmnt_data.wcb_wtstart_lckfail4_cntr"
+	Set gtmtypes("sgmnt_data",409,"off")=3636
 	Set gtmtypes("sgmnt_data",409,"len")=4
 	Set gtmtypes("sgmnt_data",409,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","dwngrd_refmts_asyncio_cntr")=409
-	Set gtmtypes("sgmnt_data",410,"name")="sgmnt_data.shmpool_refmt_harvests_cntr"
-	Set gtmtypes("sgmnt_data",410,"off")=3676
+	Set gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail4_cntr")=409
+	Set gtmtypes("sgmnt_data",410,"name")="sgmnt_data.wcb_wtfini_lckfail1_cntr"
+	Set gtmtypes("sgmnt_data",410,"off")=3640
 	Set gtmtypes("sgmnt_data",410,"len")=4
 	Set gtmtypes("sgmnt_data",410,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","shmpool_refmt_harvests_cntr")=410
-	Set gtmtypes("sgmnt_data",411,"name")="sgmnt_data.shmpool_recovery_cntr"
-	Set gtmtypes("sgmnt_data",411,"off")=3680
+	Set gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail1_cntr")=410
+	Set gtmtypes("sgmnt_data",411,"name")="sgmnt_data.wcb_wtfini_lckfail2_cntr"
+	Set gtmtypes("sgmnt_data",411,"off")=3644
 	Set gtmtypes("sgmnt_data",411,"len")=4
 	Set gtmtypes("sgmnt_data",411,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","shmpool_recovery_cntr")=411
-	Set gtmtypes("sgmnt_data",412,"name")="sgmnt_data.shmpool_blkd_by_sdc_cntr"
-	Set gtmtypes("sgmnt_data",412,"off")=3684
+	Set gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail2_cntr")=411
+	Set gtmtypes("sgmnt_data",412,"name")="sgmnt_data.wcb_wtfini_lckfail3_cntr"
+	Set gtmtypes("sgmnt_data",412,"off")=3648
 	Set gtmtypes("sgmnt_data",412,"len")=4
 	Set gtmtypes("sgmnt_data",412,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","shmpool_blkd_by_sdc_cntr")=412
-	Set gtmtypes("sgmnt_data",413,"name")="sgmnt_data.shmpool_alloc_bbflush_cntr"
-	Set gtmtypes("sgmnt_data",413,"off")=3688
+	Set gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail3_cntr")=412
+	Set gtmtypes("sgmnt_data",413,"name")="sgmnt_data.wcb_wtfini_lckfail4_cntr"
+	Set gtmtypes("sgmnt_data",413,"off")=3652
 	Set gtmtypes("sgmnt_data",413,"len")=4
 	Set gtmtypes("sgmnt_data",413,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","shmpool_alloc_bbflush_cntr")=413
-	Set gtmtypes("sgmnt_data",414,"name")="sgmnt_data.refmt_hvst_blk_released_replaced_cntr"
-	Set gtmtypes("sgmnt_data",414,"off")=3692
+	Set gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail4_cntr")=413
+	Set gtmtypes("sgmnt_data",414,"name")="sgmnt_data.wcb_t_end_sysops_dirtystuck1_cntr"
+	Set gtmtypes("sgmnt_data",414,"off")=3656
 	Set gtmtypes("sgmnt_data",414,"len")=4
 	Set gtmtypes("sgmnt_data",414,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","refmt_hvst_blk_released_replaced_cntr")=414
-	Set gtmtypes("sgmnt_data",415,"name")="sgmnt_data.refmt_hvst_blk_released_io_complete_cntr"
-	Set gtmtypes("sgmnt_data",415,"off")=3696
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirtystuck1_cntr")=414
+	Set gtmtypes("sgmnt_data",415,"name")="sgmnt_data.wcb_t_end_sysops_dirtystuck2_cntr"
+	Set gtmtypes("sgmnt_data",415,"off")=3660
 	Set gtmtypes("sgmnt_data",415,"len")=4
 	Set gtmtypes("sgmnt_data",415,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","refmt_hvst_blk_released_io_complete_cntr")=415
-	Set gtmtypes("sgmnt_data",416,"name")="sgmnt_data.refmt_hvst_blk_kept_cntr"
-	Set gtmtypes("sgmnt_data",416,"off")=3700
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirtystuck2_cntr")=415
+	Set gtmtypes("sgmnt_data",416,"name")="sgmnt_data.wcb_secshr_db_clnup_wbuf_dqd_cntr"
+	Set gtmtypes("sgmnt_data",416,"off")=3664
 	Set gtmtypes("sgmnt_data",416,"len")=4
 	Set gtmtypes("sgmnt_data",416,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","refmt_hvst_blk_kept_cntr")=416
-	Set gtmtypes("sgmnt_data",417,"name")="sgmnt_data.refmt_hvst_blk_ignored_cntr"
-	Set gtmtypes("sgmnt_data",417,"off")=3704
+	Set gtmtypfldindx("sgmnt_data","wcb_secshr_db_clnup_wbuf_dqd_cntr")=416
+	Set gtmtypes("sgmnt_data",417,"name")="sgmnt_data.dwngrd_refmts_syncio_cntr"
+	Set gtmtypes("sgmnt_data",417,"off")=3668
 	Set gtmtypes("sgmnt_data",417,"len")=4
 	Set gtmtypes("sgmnt_data",417,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","refmt_hvst_blk_ignored_cntr")=417
-	Set gtmtypes("sgmnt_data",418,"name")="sgmnt_data.refmt_blk_chk_blk_freed_cntr"
-	Set gtmtypes("sgmnt_data",418,"off")=3708
+	Set gtmtypfldindx("sgmnt_data","dwngrd_refmts_syncio_cntr")=417
+	Set gtmtypes("sgmnt_data",418,"name")="sgmnt_data.dwngrd_refmts_asyncio_cntr"
+	Set gtmtypes("sgmnt_data",418,"off")=3672
 	Set gtmtypes("sgmnt_data",418,"len")=4
 	Set gtmtypes("sgmnt_data",418,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","refmt_blk_chk_blk_freed_cntr")=418
-	Set gtmtypes("sgmnt_data",419,"name")="sgmnt_data.refmt_blk_chk_blk_kept_cntr"
-	Set gtmtypes("sgmnt_data",419,"off")=3712
+	Set gtmtypfldindx("sgmnt_data","dwngrd_refmts_asyncio_cntr")=418
+	Set gtmtypes("sgmnt_data",419,"name")="sgmnt_data.shmpool_refmt_harvests_cntr"
+	Set gtmtypes("sgmnt_data",419,"off")=3676
 	Set gtmtypes("sgmnt_data",419,"len")=4
 	Set gtmtypes("sgmnt_data",419,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","refmt_blk_chk_blk_kept_cntr")=419
-	Set gtmtypes("sgmnt_data",420,"name")="sgmnt_data.active_lvl_trigger_cntr"
-	Set gtmtypes("sgmnt_data",420,"off")=3716
+	Set gtmtypfldindx("sgmnt_data","shmpool_refmt_harvests_cntr")=419
+	Set gtmtypes("sgmnt_data",420,"name")="sgmnt_data.shmpool_recovery_cntr"
+	Set gtmtypes("sgmnt_data",420,"off")=3680
 	Set gtmtypes("sgmnt_data",420,"len")=4
 	Set gtmtypes("sgmnt_data",420,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","active_lvl_trigger_cntr")=420
-	Set gtmtypes("sgmnt_data",421,"name")="sgmnt_data.new_buff_cntr"
-	Set gtmtypes("sgmnt_data",421,"off")=3720
+	Set gtmtypfldindx("sgmnt_data","shmpool_recovery_cntr")=420
+	Set gtmtypes("sgmnt_data",421,"name")="sgmnt_data.shmpool_blkd_by_sdc_cntr"
+	Set gtmtypes("sgmnt_data",421,"off")=3684
 	Set gtmtypes("sgmnt_data",421,"len")=4
 	Set gtmtypes("sgmnt_data",421,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","new_buff_cntr")=421
-	Set gtmtypes("sgmnt_data",422,"name")="sgmnt_data.phase2_commit_wait_sleep_in_crit_cntr"
-	Set gtmtypes("sgmnt_data",422,"off")=3724
+	Set gtmtypfldindx("sgmnt_data","shmpool_blkd_by_sdc_cntr")=421
+	Set gtmtypes("sgmnt_data",422,"name")="sgmnt_data.shmpool_alloc_bbflush_cntr"
+	Set gtmtypes("sgmnt_data",422,"off")=3688
 	Set gtmtypes("sgmnt_data",422,"len")=4
 	Set gtmtypes("sgmnt_data",422,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","phase2_commit_wait_sleep_in_crit_cntr")=422
-	Set gtmtypes("sgmnt_data",423,"name")="sgmnt_data.phase2_commit_wait_sleep_no_crit_cntr"
-	Set gtmtypes("sgmnt_data",423,"off")=3728
+	Set gtmtypfldindx("sgmnt_data","shmpool_alloc_bbflush_cntr")=422
+	Set gtmtypes("sgmnt_data",423,"name")="sgmnt_data.refmt_hvst_blk_released_replaced_cntr"
+	Set gtmtypes("sgmnt_data",423,"off")=3692
 	Set gtmtypes("sgmnt_data",423,"len")=4
 	Set gtmtypes("sgmnt_data",423,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","phase2_commit_wait_sleep_no_crit_cntr")=423
-	Set gtmtypes("sgmnt_data",424,"name")="sgmnt_data.phase2_commit_wait_pidcnt_cntr"
-	Set gtmtypes("sgmnt_data",424,"off")=3732
+	Set gtmtypfldindx("sgmnt_data","refmt_hvst_blk_released_replaced_cntr")=423
+	Set gtmtypes("sgmnt_data",424,"name")="sgmnt_data.refmt_hvst_blk_released_io_complete_cntr"
+	Set gtmtypes("sgmnt_data",424,"off")=3696
 	Set gtmtypes("sgmnt_data",424,"len")=4
 	Set gtmtypes("sgmnt_data",424,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","phase2_commit_wait_pidcnt_cntr")=424
-	Set gtmtypes("sgmnt_data",425,"name")="sgmnt_data.wcb_t_end_sysops_intend_wait_cntr"
-	Set gtmtypes("sgmnt_data",425,"off")=3736
+	Set gtmtypfldindx("sgmnt_data","refmt_hvst_blk_released_io_complete_cntr")=424
+	Set gtmtypes("sgmnt_data",425,"name")="sgmnt_data.refmt_hvst_blk_kept_cntr"
+	Set gtmtypes("sgmnt_data",425,"off")=3700
 	Set gtmtypes("sgmnt_data",425,"len")=4
 	Set gtmtypes("sgmnt_data",425,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_intend_wait_cntr")=425
-	Set gtmtypes("sgmnt_data",426,"name")="sgmnt_data.wcb_secshr_db_clnup_phase2_clnup_cntr"
-	Set gtmtypes("sgmnt_data",426,"off")=3740
+	Set gtmtypfldindx("sgmnt_data","refmt_hvst_blk_kept_cntr")=425
+	Set gtmtypes("sgmnt_data",426,"name")="sgmnt_data.refmt_hvst_blk_ignored_cntr"
+	Set gtmtypes("sgmnt_data",426,"off")=3704
 	Set gtmtypes("sgmnt_data",426,"len")=4
 	Set gtmtypes("sgmnt_data",426,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_secshr_db_clnup_phase2_clnup_cntr")=426
-	Set gtmtypes("sgmnt_data",427,"name")="sgmnt_data.wcb_phase2_commit_wait_cntr"
-	Set gtmtypes("sgmnt_data",427,"off")=3744
+	Set gtmtypfldindx("sgmnt_data","refmt_hvst_blk_ignored_cntr")=426
+	Set gtmtypes("sgmnt_data",427,"name")="sgmnt_data.refmt_blk_chk_blk_freed_cntr"
+	Set gtmtypes("sgmnt_data",427,"off")=3708
 	Set gtmtypes("sgmnt_data",427,"len")=4
 	Set gtmtypes("sgmnt_data",427,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_phase2_commit_wait_cntr")=427
-	Set gtmtypes("sgmnt_data",428,"name")="sgmnt_data.recompute_upd_array_calls_cntr"
-	Set gtmtypes("sgmnt_data",428,"off")=3748
+	Set gtmtypfldindx("sgmnt_data","refmt_blk_chk_blk_freed_cntr")=427
+	Set gtmtypes("sgmnt_data",428,"name")="sgmnt_data.refmt_blk_chk_blk_kept_cntr"
+	Set gtmtypes("sgmnt_data",428,"off")=3712
 	Set gtmtypes("sgmnt_data",428,"len")=4
 	Set gtmtypes("sgmnt_data",428,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_calls_cntr")=428
-	Set gtmtypes("sgmnt_data",429,"name")="sgmnt_data.recompute_upd_array_rip_cntr"
-	Set gtmtypes("sgmnt_data",429,"off")=3752
+	Set gtmtypfldindx("sgmnt_data","refmt_blk_chk_blk_kept_cntr")=428
+	Set gtmtypes("sgmnt_data",429,"name")="sgmnt_data.active_lvl_trigger_cntr"
+	Set gtmtypes("sgmnt_data",429,"off")=3716
 	Set gtmtypes("sgmnt_data",429,"len")=4
 	Set gtmtypes("sgmnt_data",429,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_rip_cntr")=429
-	Set gtmtypes("sgmnt_data",430,"name")="sgmnt_data.recompute_upd_array_in_tend_cntr"
-	Set gtmtypes("sgmnt_data",430,"off")=3756
+	Set gtmtypfldindx("sgmnt_data","active_lvl_trigger_cntr")=429
+	Set gtmtypes("sgmnt_data",430,"name")="sgmnt_data.new_buff_cntr"
+	Set gtmtypes("sgmnt_data",430,"off")=3720
 	Set gtmtypes("sgmnt_data",430,"len")=4
 	Set gtmtypes("sgmnt_data",430,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_in_tend_cntr")=430
-	Set gtmtypes("sgmnt_data",431,"name")="sgmnt_data.recompute_upd_array_search_blk_cntr"
-	Set gtmtypes("sgmnt_data",431,"off")=3760
+	Set gtmtypfldindx("sgmnt_data","new_buff_cntr")=430
+	Set gtmtypes("sgmnt_data",431,"name")="sgmnt_data.phase2_commit_wait_sleep_in_crit_cntr"
+	Set gtmtypes("sgmnt_data",431,"off")=3724
 	Set gtmtypes("sgmnt_data",431,"len")=4
 	Set gtmtypes("sgmnt_data",431,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_search_blk_cntr")=431
-	Set gtmtypes("sgmnt_data",432,"name")="sgmnt_data.recompute_upd_array_new_rec_cntr"
-	Set gtmtypes("sgmnt_data",432,"off")=3764
+	Set gtmtypfldindx("sgmnt_data","phase2_commit_wait_sleep_in_crit_cntr")=431
+	Set gtmtypes("sgmnt_data",432,"name")="sgmnt_data.phase2_commit_wait_sleep_no_crit_cntr"
+	Set gtmtypes("sgmnt_data",432,"off")=3728
 	Set gtmtypes("sgmnt_data",432,"len")=4
 	Set gtmtypes("sgmnt_data",432,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_new_rec_cntr")=432
-	Set gtmtypes("sgmnt_data",433,"name")="sgmnt_data.recompute_upd_array_rec_size_cntr"
-	Set gtmtypes("sgmnt_data",433,"off")=3768
+	Set gtmtypfldindx("sgmnt_data","phase2_commit_wait_sleep_no_crit_cntr")=432
+	Set gtmtypes("sgmnt_data",433,"name")="sgmnt_data.phase2_commit_wait_pidcnt_cntr"
+	Set gtmtypes("sgmnt_data",433,"off")=3732
 	Set gtmtypes("sgmnt_data",433,"len")=4
 	Set gtmtypes("sgmnt_data",433,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_rec_size_cntr")=433
-	Set gtmtypes("sgmnt_data",434,"name")="sgmnt_data.recompute_upd_array_rec_cmpc_cntr"
-	Set gtmtypes("sgmnt_data",434,"off")=3772
+	Set gtmtypfldindx("sgmnt_data","phase2_commit_wait_pidcnt_cntr")=433
+	Set gtmtypes("sgmnt_data",434,"name")="sgmnt_data.wcb_t_end_sysops_intend_wait_cntr"
+	Set gtmtypes("sgmnt_data",434,"off")=3736
 	Set gtmtypes("sgmnt_data",434,"len")=4
 	Set gtmtypes("sgmnt_data",434,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_rec_cmpc_cntr")=434
-	Set gtmtypes("sgmnt_data",435,"name")="sgmnt_data.recompute_upd_array_blk_fini_cntr"
-	Set gtmtypes("sgmnt_data",435,"off")=3776
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_intend_wait_cntr")=434
+	Set gtmtypes("sgmnt_data",435,"name")="sgmnt_data.wcb_secshr_db_clnup_phase2_clnup_cntr"
+	Set gtmtypes("sgmnt_data",435,"off")=3740
 	Set gtmtypes("sgmnt_data",435,"len")=4
 	Set gtmtypes("sgmnt_data",435,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_blk_fini_cntr")=435
-	Set gtmtypes("sgmnt_data",436,"name")="sgmnt_data.recompute_upd_array_blk_split_cntr"
-	Set gtmtypes("sgmnt_data",436,"off")=3780
+	Set gtmtypfldindx("sgmnt_data","wcb_secshr_db_clnup_phase2_clnup_cntr")=435
+	Set gtmtypes("sgmnt_data",436,"name")="sgmnt_data.wcb_phase2_commit_wait_cntr"
+	Set gtmtypes("sgmnt_data",436,"off")=3744
 	Set gtmtypes("sgmnt_data",436,"len")=4
 	Set gtmtypes("sgmnt_data",436,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_blk_split_cntr")=436
-	Set gtmtypes("sgmnt_data",437,"name")="sgmnt_data.t_qread_ripsleep_cnt_cntr"
-	Set gtmtypes("sgmnt_data",437,"off")=3784
+	Set gtmtypfldindx("sgmnt_data","wcb_phase2_commit_wait_cntr")=436
+	Set gtmtypes("sgmnt_data",437,"name")="sgmnt_data.recompute_upd_array_calls_cntr"
+	Set gtmtypes("sgmnt_data",437,"off")=3748
 	Set gtmtypes("sgmnt_data",437,"len")=4
 	Set gtmtypes("sgmnt_data",437,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","t_qread_ripsleep_cnt_cntr")=437
-	Set gtmtypes("sgmnt_data",438,"name")="sgmnt_data.t_qread_ripsleep_nblks_cntr"
-	Set gtmtypes("sgmnt_data",438,"off")=3788
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_calls_cntr")=437
+	Set gtmtypes("sgmnt_data",438,"name")="sgmnt_data.recompute_upd_array_rip_cntr"
+	Set gtmtypes("sgmnt_data",438,"off")=3752
 	Set gtmtypes("sgmnt_data",438,"len")=4
 	Set gtmtypes("sgmnt_data",438,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","t_qread_ripsleep_nblks_cntr")=438
-	Set gtmtypes("sgmnt_data",439,"name")="sgmnt_data.bg_trc_rec_cntr_filler"
-	Set gtmtypes("sgmnt_data",439,"off")=3792
-	Set gtmtypes("sgmnt_data",439,"len")=56
-	Set gtmtypes("sgmnt_data",439,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","bg_trc_rec_cntr_filler")=439
-	Set gtmtypes("sgmnt_data",440,"name")="sgmnt_data.n_gvcst_srches"
-	Set gtmtypes("sgmnt_data",440,"off")=3848
-	Set gtmtypes("sgmnt_data",440,"len")=8
-	Set gtmtypes("sgmnt_data",440,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("sgmnt_data","n_gvcst_srches")=440
-	Set gtmtypes("sgmnt_data",441,"name")="sgmnt_data.n_gvcst_srches.curr_count"
-	Set gtmtypes("sgmnt_data",441,"off")=3848
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_rip_cntr")=438
+	Set gtmtypes("sgmnt_data",439,"name")="sgmnt_data.recompute_upd_array_in_tend_cntr"
+	Set gtmtypes("sgmnt_data",439,"off")=3756
+	Set gtmtypes("sgmnt_data",439,"len")=4
+	Set gtmtypes("sgmnt_data",439,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_in_tend_cntr")=439
+	Set gtmtypes("sgmnt_data",440,"name")="sgmnt_data.recompute_upd_array_search_blk_cntr"
+	Set gtmtypes("sgmnt_data",440,"off")=3760
+	Set gtmtypes("sgmnt_data",440,"len")=4
+	Set gtmtypes("sgmnt_data",440,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_search_blk_cntr")=440
+	Set gtmtypes("sgmnt_data",441,"name")="sgmnt_data.recompute_upd_array_new_rec_cntr"
+	Set gtmtypes("sgmnt_data",441,"off")=3764
 	Set gtmtypes("sgmnt_data",441,"len")=4
 	Set gtmtypes("sgmnt_data",441,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_gvcst_srches.curr_count")=441
-	Set gtmtypes("sgmnt_data",442,"name")="sgmnt_data.n_gvcst_srches.cumul_count"
-	Set gtmtypes("sgmnt_data",442,"off")=3852
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_new_rec_cntr")=441
+	Set gtmtypes("sgmnt_data",442,"name")="sgmnt_data.recompute_upd_array_rec_size_cntr"
+	Set gtmtypes("sgmnt_data",442,"off")=3768
 	Set gtmtypes("sgmnt_data",442,"len")=4
 	Set gtmtypes("sgmnt_data",442,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_gvcst_srches.cumul_count")=442
-	Set gtmtypes("sgmnt_data",443,"name")="sgmnt_data.n_gvcst_srch_clues"
-	Set gtmtypes("sgmnt_data",443,"off")=3856
-	Set gtmtypes("sgmnt_data",443,"len")=8
-	Set gtmtypes("sgmnt_data",443,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("sgmnt_data","n_gvcst_srch_clues")=443
-	Set gtmtypes("sgmnt_data",444,"name")="sgmnt_data.n_gvcst_srch_clues.curr_count"
-	Set gtmtypes("sgmnt_data",444,"off")=3856
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_rec_size_cntr")=442
+	Set gtmtypes("sgmnt_data",443,"name")="sgmnt_data.recompute_upd_array_rec_cmpc_cntr"
+	Set gtmtypes("sgmnt_data",443,"off")=3772
+	Set gtmtypes("sgmnt_data",443,"len")=4
+	Set gtmtypes("sgmnt_data",443,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_rec_cmpc_cntr")=443
+	Set gtmtypes("sgmnt_data",444,"name")="sgmnt_data.recompute_upd_array_blk_fini_cntr"
+	Set gtmtypes("sgmnt_data",444,"off")=3776
 	Set gtmtypes("sgmnt_data",444,"len")=4
 	Set gtmtypes("sgmnt_data",444,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_gvcst_srch_clues.curr_count")=444
-	Set gtmtypes("sgmnt_data",445,"name")="sgmnt_data.n_gvcst_srch_clues.cumul_count"
-	Set gtmtypes("sgmnt_data",445,"off")=3860
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_blk_fini_cntr")=444
+	Set gtmtypes("sgmnt_data",445,"name")="sgmnt_data.recompute_upd_array_blk_split_cntr"
+	Set gtmtypes("sgmnt_data",445,"off")=3780
 	Set gtmtypes("sgmnt_data",445,"len")=4
 	Set gtmtypes("sgmnt_data",445,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_gvcst_srch_clues.cumul_count")=445
-	Set gtmtypes("sgmnt_data",446,"name")="sgmnt_data.n_clue_used_head"
-	Set gtmtypes("sgmnt_data",446,"off")=3864
-	Set gtmtypes("sgmnt_data",446,"len")=8
-	Set gtmtypes("sgmnt_data",446,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("sgmnt_data","n_clue_used_head")=446
-	Set gtmtypes("sgmnt_data",447,"name")="sgmnt_data.n_clue_used_head.curr_count"
-	Set gtmtypes("sgmnt_data",447,"off")=3864
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_blk_split_cntr")=445
+	Set gtmtypes("sgmnt_data",446,"name")="sgmnt_data.t_qread_ripsleep_cnt_cntr"
+	Set gtmtypes("sgmnt_data",446,"off")=3784
+	Set gtmtypes("sgmnt_data",446,"len")=4
+	Set gtmtypes("sgmnt_data",446,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","t_qread_ripsleep_cnt_cntr")=446
+	Set gtmtypes("sgmnt_data",447,"name")="sgmnt_data.t_qread_ripsleep_nblks_cntr"
+	Set gtmtypes("sgmnt_data",447,"off")=3788
 	Set gtmtypes("sgmnt_data",447,"len")=4
 	Set gtmtypes("sgmnt_data",447,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_clue_used_head.curr_count")=447
-	Set gtmtypes("sgmnt_data",448,"name")="sgmnt_data.n_clue_used_head.cumul_count"
-	Set gtmtypes("sgmnt_data",448,"off")=3868
+	Set gtmtypfldindx("sgmnt_data","t_qread_ripsleep_nblks_cntr")=447
+	Set gtmtypes("sgmnt_data",448,"name")="sgmnt_data.wcs_wtfini_invoked_cntr"
+	Set gtmtypes("sgmnt_data",448,"off")=3792
 	Set gtmtypes("sgmnt_data",448,"len")=4
 	Set gtmtypes("sgmnt_data",448,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_clue_used_head.cumul_count")=448
-	Set gtmtypes("sgmnt_data",449,"name")="sgmnt_data.n_clue_used_same"
-	Set gtmtypes("sgmnt_data",449,"off")=3872
-	Set gtmtypes("sgmnt_data",449,"len")=8
-	Set gtmtypes("sgmnt_data",449,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("sgmnt_data","n_clue_used_same")=449
-	Set gtmtypes("sgmnt_data",450,"name")="sgmnt_data.n_clue_used_same.curr_count"
-	Set gtmtypes("sgmnt_data",450,"off")=3872
+	Set gtmtypfldindx("sgmnt_data","wcs_wtfini_invoked_cntr")=448
+	Set gtmtypes("sgmnt_data",449,"name")="sgmnt_data.wcs_wterror_invoked_cntr"
+	Set gtmtypes("sgmnt_data",449,"off")=3796
+	Set gtmtypes("sgmnt_data",449,"len")=4
+	Set gtmtypes("sgmnt_data",449,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","wcs_wterror_invoked_cntr")=449
+	Set gtmtypes("sgmnt_data",450,"name")="sgmnt_data.wcs_wt_restart_invoked_cntr"
+	Set gtmtypes("sgmnt_data",450,"off")=3800
 	Set gtmtypes("sgmnt_data",450,"len")=4
 	Set gtmtypes("sgmnt_data",450,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_clue_used_same.curr_count")=450
-	Set gtmtypes("sgmnt_data",451,"name")="sgmnt_data.n_clue_used_same.cumul_count"
-	Set gtmtypes("sgmnt_data",451,"off")=3876
+	Set gtmtypfldindx("sgmnt_data","wcs_wt_restart_invoked_cntr")=450
+	Set gtmtypes("sgmnt_data",451,"name")="sgmnt_data.wcs_wt_restart_eagain_cntr"
+	Set gtmtypes("sgmnt_data",451,"off")=3804
 	Set gtmtypes("sgmnt_data",451,"len")=4
 	Set gtmtypes("sgmnt_data",451,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_clue_used_same.cumul_count")=451
-	Set gtmtypes("sgmnt_data",452,"name")="sgmnt_data.n_clue_used_tail"
-	Set gtmtypes("sgmnt_data",452,"off")=3880
-	Set gtmtypes("sgmnt_data",452,"len")=8
-	Set gtmtypes("sgmnt_data",452,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("sgmnt_data","n_clue_used_tail")=452
-	Set gtmtypes("sgmnt_data",453,"name")="sgmnt_data.n_clue_used_tail.curr_count"
-	Set gtmtypes("sgmnt_data",453,"off")=3880
+	Set gtmtypfldindx("sgmnt_data","wcs_wt_restart_eagain_cntr")=451
+	Set gtmtypes("sgmnt_data",452,"name")="sgmnt_data.wcs_wt_restart_reinsert_cntr"
+	Set gtmtypes("sgmnt_data",452,"off")=3808
+	Set gtmtypes("sgmnt_data",452,"len")=4
+	Set gtmtypes("sgmnt_data",452,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","wcs_wt_restart_reinsert_cntr")=452
+	Set gtmtypes("sgmnt_data",453,"name")="sgmnt_data.wcs_wtstart_eagain_cntr"
+	Set gtmtypes("sgmnt_data",453,"off")=3812
 	Set gtmtypes("sgmnt_data",453,"len")=4
 	Set gtmtypes("sgmnt_data",453,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_clue_used_tail.curr_count")=453
-	Set gtmtypes("sgmnt_data",454,"name")="sgmnt_data.n_clue_used_tail.cumul_count"
-	Set gtmtypes("sgmnt_data",454,"off")=3884
+	Set gtmtypfldindx("sgmnt_data","wcs_wtstart_eagain_cntr")=453
+	Set gtmtypes("sgmnt_data",454,"name")="sgmnt_data.wcs_wtstart_eagain_incrit_cntr"
+	Set gtmtypes("sgmnt_data",454,"off")=3816
 	Set gtmtypes("sgmnt_data",454,"len")=4
 	Set gtmtypes("sgmnt_data",454,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_clue_used_tail.cumul_count")=454
-	Set gtmtypes("sgmnt_data",455,"name")="sgmnt_data.n_t_qreads"
-	Set gtmtypes("sgmnt_data",455,"off")=3888
-	Set gtmtypes("sgmnt_data",455,"len")=8
-	Set gtmtypes("sgmnt_data",455,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("sgmnt_data","n_t_qreads")=455
-	Set gtmtypes("sgmnt_data",456,"name")="sgmnt_data.n_t_qreads.curr_count"
-	Set gtmtypes("sgmnt_data",456,"off")=3888
-	Set gtmtypes("sgmnt_data",456,"len")=4
-	Set gtmtypes("sgmnt_data",456,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_t_qreads.curr_count")=456
-	Set gtmtypes("sgmnt_data",457,"name")="sgmnt_data.n_t_qreads.cumul_count"
-	Set gtmtypes("sgmnt_data",457,"off")=3892
-	Set gtmtypes("sgmnt_data",457,"len")=4
-	Set gtmtypes("sgmnt_data",457,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_t_qreads.cumul_count")=457
-	Set gtmtypes("sgmnt_data",458,"name")="sgmnt_data.unused_dsk_reads"
-	Set gtmtypes("sgmnt_data",458,"off")=3896
-	Set gtmtypes("sgmnt_data",458,"len")=8
-	Set gtmtypes("sgmnt_data",458,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("sgmnt_data","unused_dsk_reads")=458
-	Set gtmtypes("sgmnt_data",459,"name")="sgmnt_data.unused_dsk_reads.curr_count"
-	Set gtmtypes("sgmnt_data",459,"off")=3896
+	Set gtmtypfldindx("sgmnt_data","wcs_wtstart_eagain_incrit_cntr")=454
+	Set gtmtypes("sgmnt_data",455,"name")="sgmnt_data.async_restart_eagain_cntr"
+	Set gtmtypes("sgmnt_data",455,"off")=3820
+	Set gtmtypes("sgmnt_data",455,"len")=4
+	Set gtmtypes("sgmnt_data",455,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","async_restart_eagain_cntr")=455
+	Set gtmtypes("sgmnt_data",456,"name")="sgmnt_data.bg_trc_rec_cntr_filler"
+	Set gtmtypes("sgmnt_data",456,"off")=3824
+	Set gtmtypes("sgmnt_data",456,"len")=24
+	Set gtmtypes("sgmnt_data",456,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","bg_trc_rec_cntr_filler")=456
+	Set gtmtypes("sgmnt_data",457,"name")="sgmnt_data.n_gvcst_srches"
+	Set gtmtypes("sgmnt_data",457,"off")=3848
+	Set gtmtypes("sgmnt_data",457,"len")=8
+	Set gtmtypes("sgmnt_data",457,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("sgmnt_data","n_gvcst_srches")=457
+	Set gtmtypes("sgmnt_data",458,"name")="sgmnt_data.n_gvcst_srches.curr_count"
+	Set gtmtypes("sgmnt_data",458,"off")=3848
+	Set gtmtypes("sgmnt_data",458,"len")=4
+	Set gtmtypes("sgmnt_data",458,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_gvcst_srches.curr_count")=458
+	Set gtmtypes("sgmnt_data",459,"name")="sgmnt_data.n_gvcst_srches.cumul_count"
+	Set gtmtypes("sgmnt_data",459,"off")=3852
 	Set gtmtypes("sgmnt_data",459,"len")=4
 	Set gtmtypes("sgmnt_data",459,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","unused_dsk_reads.curr_count")=459
-	Set gtmtypes("sgmnt_data",460,"name")="sgmnt_data.unused_dsk_reads.cumul_count"
-	Set gtmtypes("sgmnt_data",460,"off")=3900
-	Set gtmtypes("sgmnt_data",460,"len")=4
-	Set gtmtypes("sgmnt_data",460,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","unused_dsk_reads.cumul_count")=460
-	Set gtmtypes("sgmnt_data",461,"name")="sgmnt_data.n_bgmm_updates"
-	Set gtmtypes("sgmnt_data",461,"off")=3904
-	Set gtmtypes("sgmnt_data",461,"len")=8
-	Set gtmtypes("sgmnt_data",461,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("sgmnt_data","n_bgmm_updates")=461
-	Set gtmtypes("sgmnt_data",462,"name")="sgmnt_data.n_bgmm_updates.curr_count"
-	Set gtmtypes("sgmnt_data",462,"off")=3904
+	Set gtmtypfldindx("sgmnt_data","n_gvcst_srches.cumul_count")=459
+	Set gtmtypes("sgmnt_data",460,"name")="sgmnt_data.n_gvcst_srch_clues"
+	Set gtmtypes("sgmnt_data",460,"off")=3856
+	Set gtmtypes("sgmnt_data",460,"len")=8
+	Set gtmtypes("sgmnt_data",460,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("sgmnt_data","n_gvcst_srch_clues")=460
+	Set gtmtypes("sgmnt_data",461,"name")="sgmnt_data.n_gvcst_srch_clues.curr_count"
+	Set gtmtypes("sgmnt_data",461,"off")=3856
+	Set gtmtypes("sgmnt_data",461,"len")=4
+	Set gtmtypes("sgmnt_data",461,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_gvcst_srch_clues.curr_count")=461
+	Set gtmtypes("sgmnt_data",462,"name")="sgmnt_data.n_gvcst_srch_clues.cumul_count"
+	Set gtmtypes("sgmnt_data",462,"off")=3860
 	Set gtmtypes("sgmnt_data",462,"len")=4
 	Set gtmtypes("sgmnt_data",462,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_bgmm_updates.curr_count")=462
-	Set gtmtypes("sgmnt_data",463,"name")="sgmnt_data.n_bgmm_updates.cumul_count"
-	Set gtmtypes("sgmnt_data",463,"off")=3908
-	Set gtmtypes("sgmnt_data",463,"len")=4
-	Set gtmtypes("sgmnt_data",463,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_bgmm_updates.cumul_count")=463
-	Set gtmtypes("sgmnt_data",464,"name")="sgmnt_data.unused_dsk_writes"
-	Set gtmtypes("sgmnt_data",464,"off")=3912
-	Set gtmtypes("sgmnt_data",464,"len")=8
-	Set gtmtypes("sgmnt_data",464,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("sgmnt_data","unused_dsk_writes")=464
-	Set gtmtypes("sgmnt_data",465,"name")="sgmnt_data.unused_dsk_writes.curr_count"
-	Set gtmtypes("sgmnt_data",465,"off")=3912
+	Set gtmtypfldindx("sgmnt_data","n_gvcst_srch_clues.cumul_count")=462
+	Set gtmtypes("sgmnt_data",463,"name")="sgmnt_data.n_clue_used_head"
+	Set gtmtypes("sgmnt_data",463,"off")=3864
+	Set gtmtypes("sgmnt_data",463,"len")=8
+	Set gtmtypes("sgmnt_data",463,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("sgmnt_data","n_clue_used_head")=463
+	Set gtmtypes("sgmnt_data",464,"name")="sgmnt_data.n_clue_used_head.curr_count"
+	Set gtmtypes("sgmnt_data",464,"off")=3864
+	Set gtmtypes("sgmnt_data",464,"len")=4
+	Set gtmtypes("sgmnt_data",464,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_clue_used_head.curr_count")=464
+	Set gtmtypes("sgmnt_data",465,"name")="sgmnt_data.n_clue_used_head.cumul_count"
+	Set gtmtypes("sgmnt_data",465,"off")=3868
 	Set gtmtypes("sgmnt_data",465,"len")=4
 	Set gtmtypes("sgmnt_data",465,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","unused_dsk_writes.curr_count")=465
-	Set gtmtypes("sgmnt_data",466,"name")="sgmnt_data.unused_dsk_writes.cumul_count"
-	Set gtmtypes("sgmnt_data",466,"off")=3916
-	Set gtmtypes("sgmnt_data",466,"len")=4
-	Set gtmtypes("sgmnt_data",466,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","unused_dsk_writes.cumul_count")=466
-	Set gtmtypes("sgmnt_data",467,"name")="sgmnt_data.n_bg_update_creates"
-	Set gtmtypes("sgmnt_data",467,"off")=3920
-	Set gtmtypes("sgmnt_data",467,"len")=8
-	Set gtmtypes("sgmnt_data",467,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("sgmnt_data","n_bg_update_creates")=467
-	Set gtmtypes("sgmnt_data",468,"name")="sgmnt_data.n_bg_update_creates.curr_count"
-	Set gtmtypes("sgmnt_data",468,"off")=3920
+	Set gtmtypfldindx("sgmnt_data","n_clue_used_head.cumul_count")=465
+	Set gtmtypes("sgmnt_data",466,"name")="sgmnt_data.n_clue_used_same"
+	Set gtmtypes("sgmnt_data",466,"off")=3872
+	Set gtmtypes("sgmnt_data",466,"len")=8
+	Set gtmtypes("sgmnt_data",466,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("sgmnt_data","n_clue_used_same")=466
+	Set gtmtypes("sgmnt_data",467,"name")="sgmnt_data.n_clue_used_same.curr_count"
+	Set gtmtypes("sgmnt_data",467,"off")=3872
+	Set gtmtypes("sgmnt_data",467,"len")=4
+	Set gtmtypes("sgmnt_data",467,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_clue_used_same.curr_count")=467
+	Set gtmtypes("sgmnt_data",468,"name")="sgmnt_data.n_clue_used_same.cumul_count"
+	Set gtmtypes("sgmnt_data",468,"off")=3876
 	Set gtmtypes("sgmnt_data",468,"len")=4
 	Set gtmtypes("sgmnt_data",468,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_bg_update_creates.curr_count")=468
-	Set gtmtypes("sgmnt_data",469,"name")="sgmnt_data.n_bg_update_creates.cumul_count"
-	Set gtmtypes("sgmnt_data",469,"off")=3924
-	Set gtmtypes("sgmnt_data",469,"len")=4
-	Set gtmtypes("sgmnt_data",469,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_bg_update_creates.cumul_count")=469
-	Set gtmtypes("sgmnt_data",470,"name")="sgmnt_data.n_db_csh_getns"
-	Set gtmtypes("sgmnt_data",470,"off")=3928
-	Set gtmtypes("sgmnt_data",470,"len")=8
-	Set gtmtypes("sgmnt_data",470,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("sgmnt_data","n_db_csh_getns")=470
-	Set gtmtypes("sgmnt_data",471,"name")="sgmnt_data.n_db_csh_getns.curr_count"
-	Set gtmtypes("sgmnt_data",471,"off")=3928
+	Set gtmtypfldindx("sgmnt_data","n_clue_used_same.cumul_count")=468
+	Set gtmtypes("sgmnt_data",469,"name")="sgmnt_data.n_clue_used_tail"
+	Set gtmtypes("sgmnt_data",469,"off")=3880
+	Set gtmtypes("sgmnt_data",469,"len")=8
+	Set gtmtypes("sgmnt_data",469,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("sgmnt_data","n_clue_used_tail")=469
+	Set gtmtypes("sgmnt_data",470,"name")="sgmnt_data.n_clue_used_tail.curr_count"
+	Set gtmtypes("sgmnt_data",470,"off")=3880
+	Set gtmtypes("sgmnt_data",470,"len")=4
+	Set gtmtypes("sgmnt_data",470,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_clue_used_tail.curr_count")=470
+	Set gtmtypes("sgmnt_data",471,"name")="sgmnt_data.n_clue_used_tail.cumul_count"
+	Set gtmtypes("sgmnt_data",471,"off")=3884
 	Set gtmtypes("sgmnt_data",471,"len")=4
 	Set gtmtypes("sgmnt_data",471,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_db_csh_getns.curr_count")=471
-	Set gtmtypes("sgmnt_data",472,"name")="sgmnt_data.n_db_csh_getns.cumul_count"
-	Set gtmtypes("sgmnt_data",472,"off")=3932
-	Set gtmtypes("sgmnt_data",472,"len")=4
-	Set gtmtypes("sgmnt_data",472,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_db_csh_getns.cumul_count")=472
-	Set gtmtypes("sgmnt_data",473,"name")="sgmnt_data.n_db_csh_getn_lcnt"
-	Set gtmtypes("sgmnt_data",473,"off")=3936
-	Set gtmtypes("sgmnt_data",473,"len")=8
-	Set gtmtypes("sgmnt_data",473,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("sgmnt_data","n_db_csh_getn_lcnt")=473
-	Set gtmtypes("sgmnt_data",474,"name")="sgmnt_data.n_db_csh_getn_lcnt.curr_count"
-	Set gtmtypes("sgmnt_data",474,"off")=3936
+	Set gtmtypfldindx("sgmnt_data","n_clue_used_tail.cumul_count")=471
+	Set gtmtypes("sgmnt_data",472,"name")="sgmnt_data.n_t_qreads"
+	Set gtmtypes("sgmnt_data",472,"off")=3888
+	Set gtmtypes("sgmnt_data",472,"len")=8
+	Set gtmtypes("sgmnt_data",472,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("sgmnt_data","n_t_qreads")=472
+	Set gtmtypes("sgmnt_data",473,"name")="sgmnt_data.n_t_qreads.curr_count"
+	Set gtmtypes("sgmnt_data",473,"off")=3888
+	Set gtmtypes("sgmnt_data",473,"len")=4
+	Set gtmtypes("sgmnt_data",473,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_t_qreads.curr_count")=473
+	Set gtmtypes("sgmnt_data",474,"name")="sgmnt_data.n_t_qreads.cumul_count"
+	Set gtmtypes("sgmnt_data",474,"off")=3892
 	Set gtmtypes("sgmnt_data",474,"len")=4
 	Set gtmtypes("sgmnt_data",474,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_db_csh_getn_lcnt.curr_count")=474
-	Set gtmtypes("sgmnt_data",475,"name")="sgmnt_data.n_db_csh_getn_lcnt.cumul_count"
-	Set gtmtypes("sgmnt_data",475,"off")=3940
-	Set gtmtypes("sgmnt_data",475,"len")=4
-	Set gtmtypes("sgmnt_data",475,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_db_csh_getn_lcnt.cumul_count")=475
-	Set gtmtypes("sgmnt_data",476,"name")="sgmnt_data.db_csh_acct_rec_filler_4k"
-	Set gtmtypes("sgmnt_data",476,"off")=3944
-	Set gtmtypes("sgmnt_data",476,"len")=152
-	Set gtmtypes("sgmnt_data",476,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","db_csh_acct_rec_filler_4k")=476
-	Set gtmtypes("sgmnt_data",477,"name")="sgmnt_data.gvstats_rec"
-	Set gtmtypes("sgmnt_data",477,"off")=4096
-	Set gtmtypes("sgmnt_data",477,"len")=464
-	Set gtmtypes("sgmnt_data",477,"type")="gvstats_rec_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec")=477
-	Set gtmtypes("sgmnt_data",478,"name")="sgmnt_data.gvstats_rec.n_set"
-	Set gtmtypes("sgmnt_data",478,"off")=4096
+	Set gtmtypfldindx("sgmnt_data","n_t_qreads.cumul_count")=474
+	Set gtmtypes("sgmnt_data",475,"name")="sgmnt_data.unused_dsk_reads"
+	Set gtmtypes("sgmnt_data",475,"off")=3896
+	Set gtmtypes("sgmnt_data",475,"len")=8
+	Set gtmtypes("sgmnt_data",475,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("sgmnt_data","unused_dsk_reads")=475
+	Set gtmtypes("sgmnt_data",476,"name")="sgmnt_data.unused_dsk_reads.curr_count"
+	Set gtmtypes("sgmnt_data",476,"off")=3896
+	Set gtmtypes("sgmnt_data",476,"len")=4
+	Set gtmtypes("sgmnt_data",476,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","unused_dsk_reads.curr_count")=476
+	Set gtmtypes("sgmnt_data",477,"name")="sgmnt_data.unused_dsk_reads.cumul_count"
+	Set gtmtypes("sgmnt_data",477,"off")=3900
+	Set gtmtypes("sgmnt_data",477,"len")=4
+	Set gtmtypes("sgmnt_data",477,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","unused_dsk_reads.cumul_count")=477
+	Set gtmtypes("sgmnt_data",478,"name")="sgmnt_data.n_bgmm_updates"
+	Set gtmtypes("sgmnt_data",478,"off")=3904
 	Set gtmtypes("sgmnt_data",478,"len")=8
-	Set gtmtypes("sgmnt_data",478,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_set")=478
-	Set gtmtypes("sgmnt_data",479,"name")="sgmnt_data.gvstats_rec.n_kill"
-	Set gtmtypes("sgmnt_data",479,"off")=4104
-	Set gtmtypes("sgmnt_data",479,"len")=8
-	Set gtmtypes("sgmnt_data",479,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_kill")=479
-	Set gtmtypes("sgmnt_data",480,"name")="sgmnt_data.gvstats_rec.n_get"
-	Set gtmtypes("sgmnt_data",480,"off")=4112
-	Set gtmtypes("sgmnt_data",480,"len")=8
-	Set gtmtypes("sgmnt_data",480,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_get")=480
-	Set gtmtypes("sgmnt_data",481,"name")="sgmnt_data.gvstats_rec.n_data"
-	Set gtmtypes("sgmnt_data",481,"off")=4120
+	Set gtmtypes("sgmnt_data",478,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("sgmnt_data","n_bgmm_updates")=478
+	Set gtmtypes("sgmnt_data",479,"name")="sgmnt_data.n_bgmm_updates.curr_count"
+	Set gtmtypes("sgmnt_data",479,"off")=3904
+	Set gtmtypes("sgmnt_data",479,"len")=4
+	Set gtmtypes("sgmnt_data",479,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_bgmm_updates.curr_count")=479
+	Set gtmtypes("sgmnt_data",480,"name")="sgmnt_data.n_bgmm_updates.cumul_count"
+	Set gtmtypes("sgmnt_data",480,"off")=3908
+	Set gtmtypes("sgmnt_data",480,"len")=4
+	Set gtmtypes("sgmnt_data",480,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_bgmm_updates.cumul_count")=480
+	Set gtmtypes("sgmnt_data",481,"name")="sgmnt_data.unused_dsk_writes"
+	Set gtmtypes("sgmnt_data",481,"off")=3912
 	Set gtmtypes("sgmnt_data",481,"len")=8
-	Set gtmtypes("sgmnt_data",481,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_data")=481
-	Set gtmtypes("sgmnt_data",482,"name")="sgmnt_data.gvstats_rec.n_order"
-	Set gtmtypes("sgmnt_data",482,"off")=4128
-	Set gtmtypes("sgmnt_data",482,"len")=8
-	Set gtmtypes("sgmnt_data",482,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_order")=482
-	Set gtmtypes("sgmnt_data",483,"name")="sgmnt_data.gvstats_rec.n_zprev"
-	Set gtmtypes("sgmnt_data",483,"off")=4136
-	Set gtmtypes("sgmnt_data",483,"len")=8
-	Set gtmtypes("sgmnt_data",483,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_zprev")=483
-	Set gtmtypes("sgmnt_data",484,"name")="sgmnt_data.gvstats_rec.n_query"
-	Set gtmtypes("sgmnt_data",484,"off")=4144
+	Set gtmtypes("sgmnt_data",481,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("sgmnt_data","unused_dsk_writes")=481
+	Set gtmtypes("sgmnt_data",482,"name")="sgmnt_data.unused_dsk_writes.curr_count"
+	Set gtmtypes("sgmnt_data",482,"off")=3912
+	Set gtmtypes("sgmnt_data",482,"len")=4
+	Set gtmtypes("sgmnt_data",482,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","unused_dsk_writes.curr_count")=482
+	Set gtmtypes("sgmnt_data",483,"name")="sgmnt_data.unused_dsk_writes.cumul_count"
+	Set gtmtypes("sgmnt_data",483,"off")=3916
+	Set gtmtypes("sgmnt_data",483,"len")=4
+	Set gtmtypes("sgmnt_data",483,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","unused_dsk_writes.cumul_count")=483
+	Set gtmtypes("sgmnt_data",484,"name")="sgmnt_data.n_bg_update_creates"
+	Set gtmtypes("sgmnt_data",484,"off")=3920
 	Set gtmtypes("sgmnt_data",484,"len")=8
-	Set gtmtypes("sgmnt_data",484,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_query")=484
-	Set gtmtypes("sgmnt_data",485,"name")="sgmnt_data.gvstats_rec.n_lock_success"
-	Set gtmtypes("sgmnt_data",485,"off")=4152
-	Set gtmtypes("sgmnt_data",485,"len")=8
-	Set gtmtypes("sgmnt_data",485,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_lock_success")=485
-	Set gtmtypes("sgmnt_data",486,"name")="sgmnt_data.gvstats_rec.n_lock_fail"
-	Set gtmtypes("sgmnt_data",486,"off")=4160
-	Set gtmtypes("sgmnt_data",486,"len")=8
-	Set gtmtypes("sgmnt_data",486,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_lock_fail")=486
-	Set gtmtypes("sgmnt_data",487,"name")="sgmnt_data.gvstats_rec.db_curr_tn"
-	Set gtmtypes("sgmnt_data",487,"off")=4168
+	Set gtmtypes("sgmnt_data",484,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("sgmnt_data","n_bg_update_creates")=484
+	Set gtmtypes("sgmnt_data",485,"name")="sgmnt_data.n_bg_update_creates.curr_count"
+	Set gtmtypes("sgmnt_data",485,"off")=3920
+	Set gtmtypes("sgmnt_data",485,"len")=4
+	Set gtmtypes("sgmnt_data",485,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_bg_update_creates.curr_count")=485
+	Set gtmtypes("sgmnt_data",486,"name")="sgmnt_data.n_bg_update_creates.cumul_count"
+	Set gtmtypes("sgmnt_data",486,"off")=3924
+	Set gtmtypes("sgmnt_data",486,"len")=4
+	Set gtmtypes("sgmnt_data",486,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_bg_update_creates.cumul_count")=486
+	Set gtmtypes("sgmnt_data",487,"name")="sgmnt_data.n_db_csh_getns"
+	Set gtmtypes("sgmnt_data",487,"off")=3928
 	Set gtmtypes("sgmnt_data",487,"len")=8
-	Set gtmtypes("sgmnt_data",487,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.db_curr_tn")=487
-	Set gtmtypes("sgmnt_data",488,"name")="sgmnt_data.gvstats_rec.n_dsk_read"
-	Set gtmtypes("sgmnt_data",488,"off")=4176
-	Set gtmtypes("sgmnt_data",488,"len")=8
-	Set gtmtypes("sgmnt_data",488,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_dsk_read")=488
-	Set gtmtypes("sgmnt_data",489,"name")="sgmnt_data.gvstats_rec.n_dsk_write"
-	Set gtmtypes("sgmnt_data",489,"off")=4184
-	Set gtmtypes("sgmnt_data",489,"len")=8
-	Set gtmtypes("sgmnt_data",489,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_dsk_write")=489
-	Set gtmtypes("sgmnt_data",490,"name")="sgmnt_data.gvstats_rec.n_nontp_readwrite"
-	Set gtmtypes("sgmnt_data",490,"off")=4192
+	Set gtmtypes("sgmnt_data",487,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("sgmnt_data","n_db_csh_getns")=487
+	Set gtmtypes("sgmnt_data",488,"name")="sgmnt_data.n_db_csh_getns.curr_count"
+	Set gtmtypes("sgmnt_data",488,"off")=3928
+	Set gtmtypes("sgmnt_data",488,"len")=4
+	Set gtmtypes("sgmnt_data",488,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_db_csh_getns.curr_count")=488
+	Set gtmtypes("sgmnt_data",489,"name")="sgmnt_data.n_db_csh_getns.cumul_count"
+	Set gtmtypes("sgmnt_data",489,"off")=3932
+	Set gtmtypes("sgmnt_data",489,"len")=4
+	Set gtmtypes("sgmnt_data",489,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_db_csh_getns.cumul_count")=489
+	Set gtmtypes("sgmnt_data",490,"name")="sgmnt_data.n_db_csh_getn_lcnt"
+	Set gtmtypes("sgmnt_data",490,"off")=3936
 	Set gtmtypes("sgmnt_data",490,"len")=8
-	Set gtmtypes("sgmnt_data",490,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_readwrite")=490
-	Set gtmtypes("sgmnt_data",491,"name")="sgmnt_data.gvstats_rec.n_nontp_readonly"
-	Set gtmtypes("sgmnt_data",491,"off")=4200
-	Set gtmtypes("sgmnt_data",491,"len")=8
-	Set gtmtypes("sgmnt_data",491,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_readonly")=491
-	Set gtmtypes("sgmnt_data",492,"name")="sgmnt_data.gvstats_rec.n_nontp_blkwrite"
-	Set gtmtypes("sgmnt_data",492,"off")=4208
-	Set gtmtypes("sgmnt_data",492,"len")=8
-	Set gtmtypes("sgmnt_data",492,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_blkwrite")=492
-	Set gtmtypes("sgmnt_data",493,"name")="sgmnt_data.gvstats_rec.n_nontp_blkread"
-	Set gtmtypes("sgmnt_data",493,"off")=4216
-	Set gtmtypes("sgmnt_data",493,"len")=8
-	Set gtmtypes("sgmnt_data",493,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_blkread")=493
-	Set gtmtypes("sgmnt_data",494,"name")="sgmnt_data.gvstats_rec.n_nontp_retries_0"
-	Set gtmtypes("sgmnt_data",494,"off")=4224
-	Set gtmtypes("sgmnt_data",494,"len")=8
-	Set gtmtypes("sgmnt_data",494,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_retries_0")=494
-	Set gtmtypes("sgmnt_data",495,"name")="sgmnt_data.gvstats_rec.n_nontp_retries_1"
-	Set gtmtypes("sgmnt_data",495,"off")=4232
+	Set gtmtypes("sgmnt_data",490,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("sgmnt_data","n_db_csh_getn_lcnt")=490
+	Set gtmtypes("sgmnt_data",491,"name")="sgmnt_data.n_db_csh_getn_lcnt.curr_count"
+	Set gtmtypes("sgmnt_data",491,"off")=3936
+	Set gtmtypes("sgmnt_data",491,"len")=4
+	Set gtmtypes("sgmnt_data",491,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_db_csh_getn_lcnt.curr_count")=491
+	Set gtmtypes("sgmnt_data",492,"name")="sgmnt_data.n_db_csh_getn_lcnt.cumul_count"
+	Set gtmtypes("sgmnt_data",492,"off")=3940
+	Set gtmtypes("sgmnt_data",492,"len")=4
+	Set gtmtypes("sgmnt_data",492,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_db_csh_getn_lcnt.cumul_count")=492
+	Set gtmtypes("sgmnt_data",493,"name")="sgmnt_data.db_csh_acct_rec_filler_4k"
+	Set gtmtypes("sgmnt_data",493,"off")=3944
+	Set gtmtypes("sgmnt_data",493,"len")=152
+	Set gtmtypes("sgmnt_data",493,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","db_csh_acct_rec_filler_4k")=493
+	Set gtmtypes("sgmnt_data",494,"name")="sgmnt_data.gvstats_rec"
+	Set gtmtypes("sgmnt_data",494,"off")=4096
+	Set gtmtypes("sgmnt_data",494,"len")=472
+	Set gtmtypes("sgmnt_data",494,"type")="gvstats_rec_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec")=494
+	Set gtmtypes("sgmnt_data",495,"name")="sgmnt_data.gvstats_rec.n_set"
+	Set gtmtypes("sgmnt_data",495,"off")=4096
 	Set gtmtypes("sgmnt_data",495,"len")=8
 	Set gtmtypes("sgmnt_data",495,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_retries_1")=495
-	Set gtmtypes("sgmnt_data",496,"name")="sgmnt_data.gvstats_rec.n_nontp_retries_2"
-	Set gtmtypes("sgmnt_data",496,"off")=4240
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_set")=495
+	Set gtmtypes("sgmnt_data",496,"name")="sgmnt_data.gvstats_rec.n_kill"
+	Set gtmtypes("sgmnt_data",496,"off")=4104
 	Set gtmtypes("sgmnt_data",496,"len")=8
 	Set gtmtypes("sgmnt_data",496,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_retries_2")=496
-	Set gtmtypes("sgmnt_data",497,"name")="sgmnt_data.gvstats_rec.n_nontp_retries_3"
-	Set gtmtypes("sgmnt_data",497,"off")=4248
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_kill")=496
+	Set gtmtypes("sgmnt_data",497,"name")="sgmnt_data.gvstats_rec.n_get"
+	Set gtmtypes("sgmnt_data",497,"off")=4112
 	Set gtmtypes("sgmnt_data",497,"len")=8
 	Set gtmtypes("sgmnt_data",497,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_retries_3")=497
-	Set gtmtypes("sgmnt_data",498,"name")="sgmnt_data.gvstats_rec.n_tp_readwrite"
-	Set gtmtypes("sgmnt_data",498,"off")=4256
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_get")=497
+	Set gtmtypes("sgmnt_data",498,"name")="sgmnt_data.gvstats_rec.n_data"
+	Set gtmtypes("sgmnt_data",498,"off")=4120
 	Set gtmtypes("sgmnt_data",498,"len")=8
 	Set gtmtypes("sgmnt_data",498,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_readwrite")=498
-	Set gtmtypes("sgmnt_data",499,"name")="sgmnt_data.gvstats_rec.n_tp_readonly"
-	Set gtmtypes("sgmnt_data",499,"off")=4264
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_data")=498
+	Set gtmtypes("sgmnt_data",499,"name")="sgmnt_data.gvstats_rec.n_order"
+	Set gtmtypes("sgmnt_data",499,"off")=4128
 	Set gtmtypes("sgmnt_data",499,"len")=8
 	Set gtmtypes("sgmnt_data",499,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_readonly")=499
-	Set gtmtypes("sgmnt_data",500,"name")="sgmnt_data.gvstats_rec.n_tp_rolledback"
-	Set gtmtypes("sgmnt_data",500,"off")=4272
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_order")=499
+	Set gtmtypes("sgmnt_data",500,"name")="sgmnt_data.gvstats_rec.n_zprev"
+	Set gtmtypes("sgmnt_data",500,"off")=4136
 	Set gtmtypes("sgmnt_data",500,"len")=8
 	Set gtmtypes("sgmnt_data",500,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_rolledback")=500
-	Set gtmtypes("sgmnt_data",501,"name")="sgmnt_data.gvstats_rec.n_tp_blkwrite"
-	Set gtmtypes("sgmnt_data",501,"off")=4280
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_zprev")=500
+	Set gtmtypes("sgmnt_data",501,"name")="sgmnt_data.gvstats_rec.n_query"
+	Set gtmtypes("sgmnt_data",501,"off")=4144
 	Set gtmtypes("sgmnt_data",501,"len")=8
 	Set gtmtypes("sgmnt_data",501,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_blkwrite")=501
-	Set gtmtypes("sgmnt_data",502,"name")="sgmnt_data.gvstats_rec.n_tp_blkread"
-	Set gtmtypes("sgmnt_data",502,"off")=4288
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_query")=501
+	Set gtmtypes("sgmnt_data",502,"name")="sgmnt_data.gvstats_rec.n_lock_success"
+	Set gtmtypes("sgmnt_data",502,"off")=4152
 	Set gtmtypes("sgmnt_data",502,"len")=8
 	Set gtmtypes("sgmnt_data",502,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_blkread")=502
-	Set gtmtypes("sgmnt_data",503,"name")="sgmnt_data.gvstats_rec.n_tp_tot_retries_0"
-	Set gtmtypes("sgmnt_data",503,"off")=4296
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_lock_success")=502
+	Set gtmtypes("sgmnt_data",503,"name")="sgmnt_data.gvstats_rec.n_lock_fail"
+	Set gtmtypes("sgmnt_data",503,"off")=4160
 	Set gtmtypes("sgmnt_data",503,"len")=8
 	Set gtmtypes("sgmnt_data",503,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_tot_retries_0")=503
-	Set gtmtypes("sgmnt_data",504,"name")="sgmnt_data.gvstats_rec.n_tp_tot_retries_1"
-	Set gtmtypes("sgmnt_data",504,"off")=4304
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_lock_fail")=503
+	Set gtmtypes("sgmnt_data",504,"name")="sgmnt_data.gvstats_rec.db_curr_tn"
+	Set gtmtypes("sgmnt_data",504,"off")=4168
 	Set gtmtypes("sgmnt_data",504,"len")=8
 	Set gtmtypes("sgmnt_data",504,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_tot_retries_1")=504
-	Set gtmtypes("sgmnt_data",505,"name")="sgmnt_data.gvstats_rec.n_tp_tot_retries_2"
-	Set gtmtypes("sgmnt_data",505,"off")=4312
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.db_curr_tn")=504
+	Set gtmtypes("sgmnt_data",505,"name")="sgmnt_data.gvstats_rec.n_dsk_read"
+	Set gtmtypes("sgmnt_data",505,"off")=4176
 	Set gtmtypes("sgmnt_data",505,"len")=8
 	Set gtmtypes("sgmnt_data",505,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_tot_retries_2")=505
-	Set gtmtypes("sgmnt_data",506,"name")="sgmnt_data.gvstats_rec.n_tp_tot_retries_3"
-	Set gtmtypes("sgmnt_data",506,"off")=4320
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_dsk_read")=505
+	Set gtmtypes("sgmnt_data",506,"name")="sgmnt_data.gvstats_rec.n_dsk_write"
+	Set gtmtypes("sgmnt_data",506,"off")=4184
 	Set gtmtypes("sgmnt_data",506,"len")=8
 	Set gtmtypes("sgmnt_data",506,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_tot_retries_3")=506
-	Set gtmtypes("sgmnt_data",507,"name")="sgmnt_data.gvstats_rec.n_tp_tot_retries_4"
-	Set gtmtypes("sgmnt_data",507,"off")=4328
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_dsk_write")=506
+	Set gtmtypes("sgmnt_data",507,"name")="sgmnt_data.gvstats_rec.n_nontp_readwrite"
+	Set gtmtypes("sgmnt_data",507,"off")=4192
 	Set gtmtypes("sgmnt_data",507,"len")=8
 	Set gtmtypes("sgmnt_data",507,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_tot_retries_4")=507
-	Set gtmtypes("sgmnt_data",508,"name")="sgmnt_data.gvstats_rec.n_tp_cnflct_retries_0"
-	Set gtmtypes("sgmnt_data",508,"off")=4336
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_readwrite")=507
+	Set gtmtypes("sgmnt_data",508,"name")="sgmnt_data.gvstats_rec.n_nontp_readonly"
+	Set gtmtypes("sgmnt_data",508,"off")=4200
 	Set gtmtypes("sgmnt_data",508,"len")=8
 	Set gtmtypes("sgmnt_data",508,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_cnflct_retries_0")=508
-	Set gtmtypes("sgmnt_data",509,"name")="sgmnt_data.gvstats_rec.n_tp_cnflct_retries_1"
-	Set gtmtypes("sgmnt_data",509,"off")=4344
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_readonly")=508
+	Set gtmtypes("sgmnt_data",509,"name")="sgmnt_data.gvstats_rec.n_nontp_blkwrite"
+	Set gtmtypes("sgmnt_data",509,"off")=4208
 	Set gtmtypes("sgmnt_data",509,"len")=8
 	Set gtmtypes("sgmnt_data",509,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_cnflct_retries_1")=509
-	Set gtmtypes("sgmnt_data",510,"name")="sgmnt_data.gvstats_rec.n_tp_cnflct_retries_2"
-	Set gtmtypes("sgmnt_data",510,"off")=4352
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_blkwrite")=509
+	Set gtmtypes("sgmnt_data",510,"name")="sgmnt_data.gvstats_rec.n_nontp_blkread"
+	Set gtmtypes("sgmnt_data",510,"off")=4216
 	Set gtmtypes("sgmnt_data",510,"len")=8
 	Set gtmtypes("sgmnt_data",510,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_cnflct_retries_2")=510
-	Set gtmtypes("sgmnt_data",511,"name")="sgmnt_data.gvstats_rec.n_tp_cnflct_retries_3"
-	Set gtmtypes("sgmnt_data",511,"off")=4360
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_blkread")=510
+	Set gtmtypes("sgmnt_data",511,"name")="sgmnt_data.gvstats_rec.n_nontp_retries_0"
+	Set gtmtypes("sgmnt_data",511,"off")=4224
 	Set gtmtypes("sgmnt_data",511,"len")=8
 	Set gtmtypes("sgmnt_data",511,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_cnflct_retries_3")=511
-	Set gtmtypes("sgmnt_data",512,"name")="sgmnt_data.gvstats_rec.n_tp_cnflct_retries_4"
-	Set gtmtypes("sgmnt_data",512,"off")=4368
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_retries_0")=511
+	Set gtmtypes("sgmnt_data",512,"name")="sgmnt_data.gvstats_rec.n_nontp_retries_1"
+	Set gtmtypes("sgmnt_data",512,"off")=4232
 	Set gtmtypes("sgmnt_data",512,"len")=8
 	Set gtmtypes("sgmnt_data",512,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_cnflct_retries_4")=512
-	Set gtmtypes("sgmnt_data",513,"name")="sgmnt_data.gvstats_rec.n_ztrigger"
-	Set gtmtypes("sgmnt_data",513,"off")=4376
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_retries_1")=512
+	Set gtmtypes("sgmnt_data",513,"name")="sgmnt_data.gvstats_rec.n_nontp_retries_2"
+	Set gtmtypes("sgmnt_data",513,"off")=4240
 	Set gtmtypes("sgmnt_data",513,"len")=8
 	Set gtmtypes("sgmnt_data",513,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_ztrigger")=513
-	Set gtmtypes("sgmnt_data",514,"name")="sgmnt_data.gvstats_rec.n_db_flush"
-	Set gtmtypes("sgmnt_data",514,"off")=4384
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_retries_2")=513
+	Set gtmtypes("sgmnt_data",514,"name")="sgmnt_data.gvstats_rec.n_nontp_retries_3"
+	Set gtmtypes("sgmnt_data",514,"off")=4248
 	Set gtmtypes("sgmnt_data",514,"len")=8
 	Set gtmtypes("sgmnt_data",514,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_db_flush")=514
-	Set gtmtypes("sgmnt_data",515,"name")="sgmnt_data.gvstats_rec.n_db_fsync"
-	Set gtmtypes("sgmnt_data",515,"off")=4392
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_retries_3")=514
+	Set gtmtypes("sgmnt_data",515,"name")="sgmnt_data.gvstats_rec.n_tp_readwrite"
+	Set gtmtypes("sgmnt_data",515,"off")=4256
 	Set gtmtypes("sgmnt_data",515,"len")=8
 	Set gtmtypes("sgmnt_data",515,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_db_fsync")=515
-	Set gtmtypes("sgmnt_data",516,"name")="sgmnt_data.gvstats_rec.n_jnl_flush"
-	Set gtmtypes("sgmnt_data",516,"off")=4400
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_readwrite")=515
+	Set gtmtypes("sgmnt_data",516,"name")="sgmnt_data.gvstats_rec.n_tp_readonly"
+	Set gtmtypes("sgmnt_data",516,"off")=4264
 	Set gtmtypes("sgmnt_data",516,"len")=8
 	Set gtmtypes("sgmnt_data",516,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jnl_flush")=516
-	Set gtmtypes("sgmnt_data",517,"name")="sgmnt_data.gvstats_rec.n_jnl_fsync"
-	Set gtmtypes("sgmnt_data",517,"off")=4408
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_readonly")=516
+	Set gtmtypes("sgmnt_data",517,"name")="sgmnt_data.gvstats_rec.n_tp_rolledback"
+	Set gtmtypes("sgmnt_data",517,"off")=4272
 	Set gtmtypes("sgmnt_data",517,"len")=8
 	Set gtmtypes("sgmnt_data",517,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jnl_fsync")=517
-	Set gtmtypes("sgmnt_data",518,"name")="sgmnt_data.gvstats_rec.n_jbuff_bytes"
-	Set gtmtypes("sgmnt_data",518,"off")=4416
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_rolledback")=517
+	Set gtmtypes("sgmnt_data",518,"name")="sgmnt_data.gvstats_rec.n_tp_blkwrite"
+	Set gtmtypes("sgmnt_data",518,"off")=4280
 	Set gtmtypes("sgmnt_data",518,"len")=8
 	Set gtmtypes("sgmnt_data",518,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jbuff_bytes")=518
-	Set gtmtypes("sgmnt_data",519,"name")="sgmnt_data.gvstats_rec.n_jfile_bytes"
-	Set gtmtypes("sgmnt_data",519,"off")=4424
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_blkwrite")=518
+	Set gtmtypes("sgmnt_data",519,"name")="sgmnt_data.gvstats_rec.n_tp_blkread"
+	Set gtmtypes("sgmnt_data",519,"off")=4288
 	Set gtmtypes("sgmnt_data",519,"len")=8
 	Set gtmtypes("sgmnt_data",519,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jfile_bytes")=519
-	Set gtmtypes("sgmnt_data",520,"name")="sgmnt_data.gvstats_rec.n_jfile_writes"
-	Set gtmtypes("sgmnt_data",520,"off")=4432
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_blkread")=519
+	Set gtmtypes("sgmnt_data",520,"name")="sgmnt_data.gvstats_rec.n_tp_tot_retries_0"
+	Set gtmtypes("sgmnt_data",520,"off")=4296
 	Set gtmtypes("sgmnt_data",520,"len")=8
 	Set gtmtypes("sgmnt_data",520,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jfile_writes")=520
-	Set gtmtypes("sgmnt_data",521,"name")="sgmnt_data.gvstats_rec.n_jrec_logical"
-	Set gtmtypes("sgmnt_data",521,"off")=4440
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_tot_retries_0")=520
+	Set gtmtypes("sgmnt_data",521,"name")="sgmnt_data.gvstats_rec.n_tp_tot_retries_1"
+	Set gtmtypes("sgmnt_data",521,"off")=4304
 	Set gtmtypes("sgmnt_data",521,"len")=8
 	Set gtmtypes("sgmnt_data",521,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jrec_logical")=521
-	Set gtmtypes("sgmnt_data",522,"name")="sgmnt_data.gvstats_rec.n_jrec_pblk"
-	Set gtmtypes("sgmnt_data",522,"off")=4448
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_tot_retries_1")=521
+	Set gtmtypes("sgmnt_data",522,"name")="sgmnt_data.gvstats_rec.n_tp_tot_retries_2"
+	Set gtmtypes("sgmnt_data",522,"off")=4312
 	Set gtmtypes("sgmnt_data",522,"len")=8
 	Set gtmtypes("sgmnt_data",522,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jrec_pblk")=522
-	Set gtmtypes("sgmnt_data",523,"name")="sgmnt_data.gvstats_rec.n_jrec_epoch_regular"
-	Set gtmtypes("sgmnt_data",523,"off")=4456
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_tot_retries_2")=522
+	Set gtmtypes("sgmnt_data",523,"name")="sgmnt_data.gvstats_rec.n_tp_tot_retries_3"
+	Set gtmtypes("sgmnt_data",523,"off")=4320
 	Set gtmtypes("sgmnt_data",523,"len")=8
 	Set gtmtypes("sgmnt_data",523,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jrec_epoch_regular")=523
-	Set gtmtypes("sgmnt_data",524,"name")="sgmnt_data.gvstats_rec.n_jrec_epoch_idle"
-	Set gtmtypes("sgmnt_data",524,"off")=4464
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_tot_retries_3")=523
+	Set gtmtypes("sgmnt_data",524,"name")="sgmnt_data.gvstats_rec.n_tp_tot_retries_4"
+	Set gtmtypes("sgmnt_data",524,"off")=4328
 	Set gtmtypes("sgmnt_data",524,"len")=8
 	Set gtmtypes("sgmnt_data",524,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jrec_epoch_idle")=524
-	Set gtmtypes("sgmnt_data",525,"name")="sgmnt_data.gvstats_rec.n_jrec_other"
-	Set gtmtypes("sgmnt_data",525,"off")=4472
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_tot_retries_4")=524
+	Set gtmtypes("sgmnt_data",525,"name")="sgmnt_data.gvstats_rec.n_tp_cnflct_retries_0"
+	Set gtmtypes("sgmnt_data",525,"off")=4336
 	Set gtmtypes("sgmnt_data",525,"len")=8
 	Set gtmtypes("sgmnt_data",525,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jrec_other")=525
-	Set gtmtypes("sgmnt_data",526,"name")="sgmnt_data.gvstats_rec.n_jnl_extends"
-	Set gtmtypes("sgmnt_data",526,"off")=4480
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_cnflct_retries_0")=525
+	Set gtmtypes("sgmnt_data",526,"name")="sgmnt_data.gvstats_rec.n_tp_cnflct_retries_1"
+	Set gtmtypes("sgmnt_data",526,"off")=4344
 	Set gtmtypes("sgmnt_data",526,"len")=8
 	Set gtmtypes("sgmnt_data",526,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jnl_extends")=526
-	Set gtmtypes("sgmnt_data",527,"name")="sgmnt_data.gvstats_rec.n_db_extends"
-	Set gtmtypes("sgmnt_data",527,"off")=4488
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_cnflct_retries_1")=526
+	Set gtmtypes("sgmnt_data",527,"name")="sgmnt_data.gvstats_rec.n_tp_cnflct_retries_2"
+	Set gtmtypes("sgmnt_data",527,"off")=4352
 	Set gtmtypes("sgmnt_data",527,"len")=8
 	Set gtmtypes("sgmnt_data",527,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_db_extends")=527
-	Set gtmtypes("sgmnt_data",528,"name")="sgmnt_data.gvstats_rec.n_crit_success"
-	Set gtmtypes("sgmnt_data",528,"off")=4496
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_cnflct_retries_2")=527
+	Set gtmtypes("sgmnt_data",528,"name")="sgmnt_data.gvstats_rec.n_tp_cnflct_retries_3"
+	Set gtmtypes("sgmnt_data",528,"off")=4360
 	Set gtmtypes("sgmnt_data",528,"len")=8
 	Set gtmtypes("sgmnt_data",528,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_crit_success")=528
-	Set gtmtypes("sgmnt_data",529,"name")="sgmnt_data.gvstats_rec.n_crits_in_epch"
-	Set gtmtypes("sgmnt_data",529,"off")=4504
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_cnflct_retries_3")=528
+	Set gtmtypes("sgmnt_data",529,"name")="sgmnt_data.gvstats_rec.n_tp_cnflct_retries_4"
+	Set gtmtypes("sgmnt_data",529,"off")=4368
 	Set gtmtypes("sgmnt_data",529,"len")=8
 	Set gtmtypes("sgmnt_data",529,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_crits_in_epch")=529
-	Set gtmtypes("sgmnt_data",530,"name")="sgmnt_data.gvstats_rec.sq_crit_failed"
-	Set gtmtypes("sgmnt_data",530,"off")=4512
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_cnflct_retries_4")=529
+	Set gtmtypes("sgmnt_data",530,"name")="sgmnt_data.gvstats_rec.n_ztrigger"
+	Set gtmtypes("sgmnt_data",530,"off")=4376
 	Set gtmtypes("sgmnt_data",530,"len")=8
 	Set gtmtypes("sgmnt_data",530,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.sq_crit_failed")=530
-	Set gtmtypes("sgmnt_data",531,"name")="sgmnt_data.gvstats_rec.n_crit_failed"
-	Set gtmtypes("sgmnt_data",531,"off")=4520
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_ztrigger")=530
+	Set gtmtypes("sgmnt_data",531,"name")="sgmnt_data.gvstats_rec.n_db_flush"
+	Set gtmtypes("sgmnt_data",531,"off")=4384
 	Set gtmtypes("sgmnt_data",531,"len")=8
 	Set gtmtypes("sgmnt_data",531,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_crit_failed")=531
-	Set gtmtypes("sgmnt_data",532,"name")="sgmnt_data.gvstats_rec.sq_crit_que_slps"
-	Set gtmtypes("sgmnt_data",532,"off")=4528
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_db_flush")=531
+	Set gtmtypes("sgmnt_data",532,"name")="sgmnt_data.gvstats_rec.n_db_fsync"
+	Set gtmtypes("sgmnt_data",532,"off")=4392
 	Set gtmtypes("sgmnt_data",532,"len")=8
 	Set gtmtypes("sgmnt_data",532,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.sq_crit_que_slps")=532
-	Set gtmtypes("sgmnt_data",533,"name")="sgmnt_data.gvstats_rec.n_crit_que_slps"
-	Set gtmtypes("sgmnt_data",533,"off")=4536
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_db_fsync")=532
+	Set gtmtypes("sgmnt_data",533,"name")="sgmnt_data.gvstats_rec.n_jnl_flush"
+	Set gtmtypes("sgmnt_data",533,"off")=4400
 	Set gtmtypes("sgmnt_data",533,"len")=8
 	Set gtmtypes("sgmnt_data",533,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_crit_que_slps")=533
-	Set gtmtypes("sgmnt_data",534,"name")="sgmnt_data.gvstats_rec.sq_crit_yields"
-	Set gtmtypes("sgmnt_data",534,"off")=4544
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jnl_flush")=533
+	Set gtmtypes("sgmnt_data",534,"name")="sgmnt_data.gvstats_rec.n_jnl_fsync"
+	Set gtmtypes("sgmnt_data",534,"off")=4408
 	Set gtmtypes("sgmnt_data",534,"len")=8
 	Set gtmtypes("sgmnt_data",534,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.sq_crit_yields")=534
-	Set gtmtypes("sgmnt_data",535,"name")="sgmnt_data.gvstats_rec.n_crit_yields"
-	Set gtmtypes("sgmnt_data",535,"off")=4552
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jnl_fsync")=534
+	Set gtmtypes("sgmnt_data",535,"name")="sgmnt_data.gvstats_rec.n_jbuff_bytes"
+	Set gtmtypes("sgmnt_data",535,"off")=4416
 	Set gtmtypes("sgmnt_data",535,"len")=8
 	Set gtmtypes("sgmnt_data",535,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_crit_yields")=535
-	Set gtmtypes("sgmnt_data",536,"name")="sgmnt_data.gvstats_rec_filler_4k_plus_512"
-	Set gtmtypes("sgmnt_data",536,"off")=4560
-	Set gtmtypes("sgmnt_data",536,"len")=48
-	Set gtmtypes("sgmnt_data",536,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec_filler_4k_plus_512")=536
-	Set gtmtypes("sgmnt_data",537,"name")="sgmnt_data.filler_4k_plus_512"
-	Set gtmtypes("sgmnt_data",537,"off")=4608
-	Set gtmtypes("sgmnt_data",537,"len")=368
-	Set gtmtypes("sgmnt_data",537,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","filler_4k_plus_512")=537
-	Set gtmtypes("sgmnt_data",538,"name")="sgmnt_data.intrpt_recov_resync_strm_seqno"
-	Set gtmtypes("sgmnt_data",538,"off")=4976
-	Set gtmtypes("sgmnt_data",538,"len")=128
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jbuff_bytes")=535
+	Set gtmtypes("sgmnt_data",536,"name")="sgmnt_data.gvstats_rec.n_jfile_bytes"
+	Set gtmtypes("sgmnt_data",536,"off")=4424
+	Set gtmtypes("sgmnt_data",536,"len")=8
+	Set gtmtypes("sgmnt_data",536,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jfile_bytes")=536
+	Set gtmtypes("sgmnt_data",537,"name")="sgmnt_data.gvstats_rec.n_jfile_writes"
+	Set gtmtypes("sgmnt_data",537,"off")=4432
+	Set gtmtypes("sgmnt_data",537,"len")=8
+	Set gtmtypes("sgmnt_data",537,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jfile_writes")=537
+	Set gtmtypes("sgmnt_data",538,"name")="sgmnt_data.gvstats_rec.n_jrec_logical"
+	Set gtmtypes("sgmnt_data",538,"off")=4440
+	Set gtmtypes("sgmnt_data",538,"len")=8
 	Set gtmtypes("sgmnt_data",538,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","intrpt_recov_resync_strm_seqno")=538
-	Set gtmtypes("sgmnt_data",538,"dim")=16
-	Set gtmtypes("sgmnt_data",539,"name")="sgmnt_data.creation_db_ver"
-	Set gtmtypes("sgmnt_data",539,"off")=5104
-	Set gtmtypes("sgmnt_data",539,"len")=4
-	Set gtmtypes("sgmnt_data",539,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","creation_db_ver")=539
-	Set gtmtypes("sgmnt_data",540,"name")="sgmnt_data.creation_mdb_ver"
-	Set gtmtypes("sgmnt_data",540,"off")=5108
-	Set gtmtypes("sgmnt_data",540,"len")=4
-	Set gtmtypes("sgmnt_data",540,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","creation_mdb_ver")=540
-	Set gtmtypes("sgmnt_data",541,"name")="sgmnt_data.certified_for_upgrade_to"
-	Set gtmtypes("sgmnt_data",541,"off")=5112
-	Set gtmtypes("sgmnt_data",541,"len")=4
-	Set gtmtypes("sgmnt_data",541,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","certified_for_upgrade_to")=541
-	Set gtmtypes("sgmnt_data",542,"name")="sgmnt_data.filler_5k"
-	Set gtmtypes("sgmnt_data",542,"off")=5116
-	Set gtmtypes("sgmnt_data",542,"len")=4
-	Set gtmtypes("sgmnt_data",542,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","filler_5k")=542
-	Set gtmtypes("sgmnt_data",543,"name")="sgmnt_data.secshr_ops_index_filler"
-	Set gtmtypes("sgmnt_data",543,"off")=5120
-	Set gtmtypes("sgmnt_data",543,"len")=4
-	Set gtmtypes("sgmnt_data",543,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","secshr_ops_index_filler")=543
-	Set gtmtypes("sgmnt_data",544,"name")="sgmnt_data.secshr_ops_array_filler"
-	Set gtmtypes("sgmnt_data",544,"off")=5124
-	Set gtmtypes("sgmnt_data",544,"len")=1020
-	Set gtmtypes("sgmnt_data",544,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","secshr_ops_array_filler")=544
-	Set gtmtypes("sgmnt_data",544,"dim")=255
-	Set gtmtypes("sgmnt_data",545,"name")="sgmnt_data.next_upgrd_warn"
-	Set gtmtypes("sgmnt_data",545,"off")=6144
-	Set gtmtypes("sgmnt_data",545,"len")=24
-	Set gtmtypes("sgmnt_data",545,"type")="compswap_time_field"
-	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn")=545
-	Set gtmtypes("sgmnt_data",546,"name")="sgmnt_data.next_upgrd_warn.time_latch"
-	Set gtmtypes("sgmnt_data",546,"off")=6144
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jrec_logical")=538
+	Set gtmtypes("sgmnt_data",539,"name")="sgmnt_data.gvstats_rec.n_jrec_pblk"
+	Set gtmtypes("sgmnt_data",539,"off")=4448
+	Set gtmtypes("sgmnt_data",539,"len")=8
+	Set gtmtypes("sgmnt_data",539,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jrec_pblk")=539
+	Set gtmtypes("sgmnt_data",540,"name")="sgmnt_data.gvstats_rec.n_jrec_epoch_regular"
+	Set gtmtypes("sgmnt_data",540,"off")=4456
+	Set gtmtypes("sgmnt_data",540,"len")=8
+	Set gtmtypes("sgmnt_data",540,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jrec_epoch_regular")=540
+	Set gtmtypes("sgmnt_data",541,"name")="sgmnt_data.gvstats_rec.n_jrec_epoch_idle"
+	Set gtmtypes("sgmnt_data",541,"off")=4464
+	Set gtmtypes("sgmnt_data",541,"len")=8
+	Set gtmtypes("sgmnt_data",541,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jrec_epoch_idle")=541
+	Set gtmtypes("sgmnt_data",542,"name")="sgmnt_data.gvstats_rec.n_jrec_other"
+	Set gtmtypes("sgmnt_data",542,"off")=4472
+	Set gtmtypes("sgmnt_data",542,"len")=8
+	Set gtmtypes("sgmnt_data",542,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jrec_other")=542
+	Set gtmtypes("sgmnt_data",543,"name")="sgmnt_data.gvstats_rec.n_jnl_extends"
+	Set gtmtypes("sgmnt_data",543,"off")=4480
+	Set gtmtypes("sgmnt_data",543,"len")=8
+	Set gtmtypes("sgmnt_data",543,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jnl_extends")=543
+	Set gtmtypes("sgmnt_data",544,"name")="sgmnt_data.gvstats_rec.n_db_extends"
+	Set gtmtypes("sgmnt_data",544,"off")=4488
+	Set gtmtypes("sgmnt_data",544,"len")=8
+	Set gtmtypes("sgmnt_data",544,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_db_extends")=544
+	Set gtmtypes("sgmnt_data",545,"name")="sgmnt_data.gvstats_rec.n_crit_success"
+	Set gtmtypes("sgmnt_data",545,"off")=4496
+	Set gtmtypes("sgmnt_data",545,"len")=8
+	Set gtmtypes("sgmnt_data",545,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_crit_success")=545
+	Set gtmtypes("sgmnt_data",546,"name")="sgmnt_data.gvstats_rec.n_crits_in_epch"
+	Set gtmtypes("sgmnt_data",546,"off")=4504
 	Set gtmtypes("sgmnt_data",546,"len")=8
-	Set gtmtypes("sgmnt_data",546,"type")="global_latch_t"
-	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch")=546
-	Set gtmtypes("sgmnt_data",547,"name")="sgmnt_data.next_upgrd_warn.time_latch.u"
-	Set gtmtypes("sgmnt_data",547,"off")=6144
+	Set gtmtypes("sgmnt_data",546,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_crits_in_epch")=546
+	Set gtmtypes("sgmnt_data",547,"name")="sgmnt_data.gvstats_rec.sq_crit_failed"
+	Set gtmtypes("sgmnt_data",547,"off")=4512
 	Set gtmtypes("sgmnt_data",547,"len")=8
-	Set gtmtypes("sgmnt_data",547,"type")="union"
-	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch.u")=547
-	Set gtmtypes("sgmnt_data",548,"name")="sgmnt_data.next_upgrd_warn.time_latch.u.pid_imgcnt"
-	Set gtmtypes("sgmnt_data",548,"off")=6144
+	Set gtmtypes("sgmnt_data",547,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.sq_crit_failed")=547
+	Set gtmtypes("sgmnt_data",548,"name")="sgmnt_data.gvstats_rec.n_crit_failed"
+	Set gtmtypes("sgmnt_data",548,"off")=4520
 	Set gtmtypes("sgmnt_data",548,"len")=8
 	Set gtmtypes("sgmnt_data",548,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch.u.pid_imgcnt")=548
-	Set gtmtypes("sgmnt_data",549,"name")="sgmnt_data.next_upgrd_warn.time_latch.u.parts"
-	Set gtmtypes("sgmnt_data",549,"off")=6144
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_crit_failed")=548
+	Set gtmtypes("sgmnt_data",549,"name")="sgmnt_data.gvstats_rec.sq_crit_que_slps"
+	Set gtmtypes("sgmnt_data",549,"off")=4528
 	Set gtmtypes("sgmnt_data",549,"len")=8
-	Set gtmtypes("sgmnt_data",549,"type")="struct"
-	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch.u.parts")=549
-	Set gtmtypes("sgmnt_data",550,"name")="sgmnt_data.next_upgrd_warn.time_latch.u.parts.latch_pid"
-	Set gtmtypes("sgmnt_data",550,"off")=6144
-	Set gtmtypes("sgmnt_data",550,"len")=4
-	Set gtmtypes("sgmnt_data",550,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch.u.parts.latch_pid")=550
-	Set gtmtypes("sgmnt_data",551,"name")="sgmnt_data.next_upgrd_warn.time_latch.u.parts.latch_word"
-	Set gtmtypes("sgmnt_data",551,"off")=6148
-	Set gtmtypes("sgmnt_data",551,"len")=4
-	Set gtmtypes("sgmnt_data",551,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch.u.parts.latch_word")=551
-	Set gtmtypes("sgmnt_data",552,"name")="sgmnt_data.next_upgrd_warn.hp_latch_space"
-	Set gtmtypes("sgmnt_data",552,"off")=6152
-	Set gtmtypes("sgmnt_data",552,"len")=16
-	Set gtmtypes("sgmnt_data",552,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.hp_latch_space")=552
-	Set gtmtypes("sgmnt_data",552,"dim")=4
-	Set gtmtypes("sgmnt_data",553,"name")="sgmnt_data.is_encrypted"
-	Set gtmtypes("sgmnt_data",553,"off")=6168
-	Set gtmtypes("sgmnt_data",553,"len")=4
-	Set gtmtypes("sgmnt_data",553,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","is_encrypted")=553
-	Set gtmtypes("sgmnt_data",554,"name")="sgmnt_data.db_trigger_cycle"
-	Set gtmtypes("sgmnt_data",554,"off")=6172
-	Set gtmtypes("sgmnt_data",554,"len")=4
-	Set gtmtypes("sgmnt_data",554,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","db_trigger_cycle")=554
-	Set gtmtypes("sgmnt_data",555,"name")="sgmnt_data.strm_reg_seqno"
-	Set gtmtypes("sgmnt_data",555,"off")=6176
-	Set gtmtypes("sgmnt_data",555,"len")=128
-	Set gtmtypes("sgmnt_data",555,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","strm_reg_seqno")=555
-	Set gtmtypes("sgmnt_data",555,"dim")=16
-	Set gtmtypes("sgmnt_data",556,"name")="sgmnt_data.save_strm_reg_seqno"
-	Set gtmtypes("sgmnt_data",556,"off")=6304
+	Set gtmtypes("sgmnt_data",549,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.sq_crit_que_slps")=549
+	Set gtmtypes("sgmnt_data",550,"name")="sgmnt_data.gvstats_rec.n_crit_que_slps"
+	Set gtmtypes("sgmnt_data",550,"off")=4536
+	Set gtmtypes("sgmnt_data",550,"len")=8
+	Set gtmtypes("sgmnt_data",550,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_crit_que_slps")=550
+	Set gtmtypes("sgmnt_data",551,"name")="sgmnt_data.gvstats_rec.sq_crit_yields"
+	Set gtmtypes("sgmnt_data",551,"off")=4544
+	Set gtmtypes("sgmnt_data",551,"len")=8
+	Set gtmtypes("sgmnt_data",551,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.sq_crit_yields")=551
+	Set gtmtypes("sgmnt_data",552,"name")="sgmnt_data.gvstats_rec.n_crit_yields"
+	Set gtmtypes("sgmnt_data",552,"off")=4552
+	Set gtmtypes("sgmnt_data",552,"len")=8
+	Set gtmtypes("sgmnt_data",552,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_crit_yields")=552
+	Set gtmtypes("sgmnt_data",553,"name")="sgmnt_data.gvstats_rec.n_clean2dirty"
+	Set gtmtypes("sgmnt_data",553,"off")=4560
+	Set gtmtypes("sgmnt_data",553,"len")=8
+	Set gtmtypes("sgmnt_data",553,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_clean2dirty")=553
+	Set gtmtypes("sgmnt_data",554,"name")="sgmnt_data.gvstats_rec_filler_4k_plus_512"
+	Set gtmtypes("sgmnt_data",554,"off")=4568
+	Set gtmtypes("sgmnt_data",554,"len")=40
+	Set gtmtypes("sgmnt_data",554,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec_filler_4k_plus_512")=554
+	Set gtmtypes("sgmnt_data",555,"name")="sgmnt_data.filler_4k_plus_512"
+	Set gtmtypes("sgmnt_data",555,"off")=4608
+	Set gtmtypes("sgmnt_data",555,"len")=368
+	Set gtmtypes("sgmnt_data",555,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","filler_4k_plus_512")=555
+	Set gtmtypes("sgmnt_data",556,"name")="sgmnt_data.intrpt_recov_resync_strm_seqno"
+	Set gtmtypes("sgmnt_data",556,"off")=4976
 	Set gtmtypes("sgmnt_data",556,"len")=128
 	Set gtmtypes("sgmnt_data",556,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","save_strm_reg_seqno")=556
+	Set gtmtypfldindx("sgmnt_data","intrpt_recov_resync_strm_seqno")=556
 	Set gtmtypes("sgmnt_data",556,"dim")=16
-	Set gtmtypes("sgmnt_data",557,"name")="sgmnt_data.freeze_on_fail"
-	Set gtmtypes("sgmnt_data",557,"off")=6432
+	Set gtmtypes("sgmnt_data",557,"name")="sgmnt_data.creation_db_ver"
+	Set gtmtypes("sgmnt_data",557,"off")=5104
 	Set gtmtypes("sgmnt_data",557,"len")=4
-	Set gtmtypes("sgmnt_data",557,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","freeze_on_fail")=557
-	Set gtmtypes("sgmnt_data",558,"name")="sgmnt_data.span_node_absent"
-	Set gtmtypes("sgmnt_data",558,"off")=6436
+	Set gtmtypes("sgmnt_data",557,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","creation_db_ver")=557
+	Set gtmtypes("sgmnt_data",558,"name")="sgmnt_data.creation_mdb_ver"
+	Set gtmtypes("sgmnt_data",558,"off")=5108
 	Set gtmtypes("sgmnt_data",558,"len")=4
-	Set gtmtypes("sgmnt_data",558,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","span_node_absent")=558
-	Set gtmtypes("sgmnt_data",559,"name")="sgmnt_data.maxkeysz_assured"
-	Set gtmtypes("sgmnt_data",559,"off")=6440
+	Set gtmtypes("sgmnt_data",558,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","creation_mdb_ver")=558
+	Set gtmtypes("sgmnt_data",559,"name")="sgmnt_data.certified_for_upgrade_to"
+	Set gtmtypes("sgmnt_data",559,"off")=5112
 	Set gtmtypes("sgmnt_data",559,"len")=4
-	Set gtmtypes("sgmnt_data",559,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","maxkeysz_assured")=559
-	Set gtmtypes("sgmnt_data",560,"name")="sgmnt_data.hasht_upgrade_needed"
-	Set gtmtypes("sgmnt_data",560,"off")=6444
+	Set gtmtypes("sgmnt_data",559,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","certified_for_upgrade_to")=559
+	Set gtmtypes("sgmnt_data",560,"name")="sgmnt_data.filler_5k"
+	Set gtmtypes("sgmnt_data",560,"off")=5116
 	Set gtmtypes("sgmnt_data",560,"len")=4
-	Set gtmtypes("sgmnt_data",560,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","hasht_upgrade_needed")=560
-	Set gtmtypes("sgmnt_data",561,"name")="sgmnt_data.defer_allocate"
-	Set gtmtypes("sgmnt_data",561,"off")=6448
+	Set gtmtypes("sgmnt_data",560,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","filler_5k")=560
+	Set gtmtypes("sgmnt_data",561,"name")="sgmnt_data.secshr_ops_index_filler"
+	Set gtmtypes("sgmnt_data",561,"off")=5120
 	Set gtmtypes("sgmnt_data",561,"len")=4
-	Set gtmtypes("sgmnt_data",561,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","defer_allocate")=561
-	Set gtmtypes("sgmnt_data",562,"name")="sgmnt_data.filler_ftok_counter_halted"
-	Set gtmtypes("sgmnt_data",562,"off")=6452
-	Set gtmtypes("sgmnt_data",562,"len")=4
-	Set gtmtypes("sgmnt_data",562,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","filler_ftok_counter_halted")=562
-	Set gtmtypes("sgmnt_data",563,"name")="sgmnt_data.filler_access_counter_halted"
-	Set gtmtypes("sgmnt_data",563,"off")=6456
-	Set gtmtypes("sgmnt_data",563,"len")=4
-	Set gtmtypes("sgmnt_data",563,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","filler_access_counter_halted")=563
-	Set gtmtypes("sgmnt_data",564,"name")="sgmnt_data.filler_7k"
-	Set gtmtypes("sgmnt_data",564,"off")=6460
-	Set gtmtypes("sgmnt_data",564,"len")=708
-	Set gtmtypes("sgmnt_data",564,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","filler_7k")=564
-	Set gtmtypes("sgmnt_data",565,"name")="sgmnt_data.filler_8k"
-	Set gtmtypes("sgmnt_data",565,"off")=7168
-	Set gtmtypes("sgmnt_data",565,"len")=1024
-	Set gtmtypes("sgmnt_data",565,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","filler_8k")=565
+	Set gtmtypes("sgmnt_data",561,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","secshr_ops_index_filler")=561
+	Set gtmtypes("sgmnt_data",562,"name")="sgmnt_data.secshr_ops_array_filler"
+	Set gtmtypes("sgmnt_data",562,"off")=5124
+	Set gtmtypes("sgmnt_data",562,"len")=1020
+	Set gtmtypes("sgmnt_data",562,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","secshr_ops_array_filler")=562
+	Set gtmtypes("sgmnt_data",562,"dim")=255
+	Set gtmtypes("sgmnt_data",563,"name")="sgmnt_data.next_upgrd_warn"
+	Set gtmtypes("sgmnt_data",563,"off")=6144
+	Set gtmtypes("sgmnt_data",563,"len")=24
+	Set gtmtypes("sgmnt_data",563,"type")="compswap_time_field"
+	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn")=563
+	Set gtmtypes("sgmnt_data",564,"name")="sgmnt_data.next_upgrd_warn.time_latch"
+	Set gtmtypes("sgmnt_data",564,"off")=6144
+	Set gtmtypes("sgmnt_data",564,"len")=8
+	Set gtmtypes("sgmnt_data",564,"type")="global_latch_t"
+	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch")=564
+	Set gtmtypes("sgmnt_data",565,"name")="sgmnt_data.next_upgrd_warn.time_latch.u"
+	Set gtmtypes("sgmnt_data",565,"off")=6144
+	Set gtmtypes("sgmnt_data",565,"len")=8
+	Set gtmtypes("sgmnt_data",565,"type")="union"
+	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch.u")=565
+	Set gtmtypes("sgmnt_data",566,"name")="sgmnt_data.next_upgrd_warn.time_latch.u.pid_imgcnt"
+	Set gtmtypes("sgmnt_data",566,"off")=6144
+	Set gtmtypes("sgmnt_data",566,"len")=8
+	Set gtmtypes("sgmnt_data",566,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch.u.pid_imgcnt")=566
+	Set gtmtypes("sgmnt_data",567,"name")="sgmnt_data.next_upgrd_warn.time_latch.u.parts"
+	Set gtmtypes("sgmnt_data",567,"off")=6144
+	Set gtmtypes("sgmnt_data",567,"len")=8
+	Set gtmtypes("sgmnt_data",567,"type")="struct"
+	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch.u.parts")=567
+	Set gtmtypes("sgmnt_data",568,"name")="sgmnt_data.next_upgrd_warn.time_latch.u.parts.latch_pid"
+	Set gtmtypes("sgmnt_data",568,"off")=6144
+	Set gtmtypes("sgmnt_data",568,"len")=4
+	Set gtmtypes("sgmnt_data",568,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch.u.parts.latch_pid")=568
+	Set gtmtypes("sgmnt_data",569,"name")="sgmnt_data.next_upgrd_warn.time_latch.u.parts.latch_word"
+	Set gtmtypes("sgmnt_data",569,"off")=6148
+	Set gtmtypes("sgmnt_data",569,"len")=4
+	Set gtmtypes("sgmnt_data",569,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch.u.parts.latch_word")=569
+	Set gtmtypes("sgmnt_data",570,"name")="sgmnt_data.next_upgrd_warn.hp_latch_space"
+	Set gtmtypes("sgmnt_data",570,"off")=6152
+	Set gtmtypes("sgmnt_data",570,"len")=16
+	Set gtmtypes("sgmnt_data",570,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.hp_latch_space")=570
+	Set gtmtypes("sgmnt_data",570,"dim")=4
+	Set gtmtypes("sgmnt_data",571,"name")="sgmnt_data.is_encrypted"
+	Set gtmtypes("sgmnt_data",571,"off")=6168
+	Set gtmtypes("sgmnt_data",571,"len")=4
+	Set gtmtypes("sgmnt_data",571,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","is_encrypted")=571
+	Set gtmtypes("sgmnt_data",572,"name")="sgmnt_data.db_trigger_cycle"
+	Set gtmtypes("sgmnt_data",572,"off")=6172
+	Set gtmtypes("sgmnt_data",572,"len")=4
+	Set gtmtypes("sgmnt_data",572,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","db_trigger_cycle")=572
+	Set gtmtypes("sgmnt_data",573,"name")="sgmnt_data.strm_reg_seqno"
+	Set gtmtypes("sgmnt_data",573,"off")=6176
+	Set gtmtypes("sgmnt_data",573,"len")=128
+	Set gtmtypes("sgmnt_data",573,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","strm_reg_seqno")=573
+	Set gtmtypes("sgmnt_data",573,"dim")=16
+	Set gtmtypes("sgmnt_data",574,"name")="sgmnt_data.save_strm_reg_seqno"
+	Set gtmtypes("sgmnt_data",574,"off")=6304
+	Set gtmtypes("sgmnt_data",574,"len")=128
+	Set gtmtypes("sgmnt_data",574,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","save_strm_reg_seqno")=574
+	Set gtmtypes("sgmnt_data",574,"dim")=16
+	Set gtmtypes("sgmnt_data",575,"name")="sgmnt_data.freeze_on_fail"
+	Set gtmtypes("sgmnt_data",575,"off")=6432
+	Set gtmtypes("sgmnt_data",575,"len")=4
+	Set gtmtypes("sgmnt_data",575,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","freeze_on_fail")=575
+	Set gtmtypes("sgmnt_data",576,"name")="sgmnt_data.span_node_absent"
+	Set gtmtypes("sgmnt_data",576,"off")=6436
+	Set gtmtypes("sgmnt_data",576,"len")=4
+	Set gtmtypes("sgmnt_data",576,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","span_node_absent")=576
+	Set gtmtypes("sgmnt_data",577,"name")="sgmnt_data.maxkeysz_assured"
+	Set gtmtypes("sgmnt_data",577,"off")=6440
+	Set gtmtypes("sgmnt_data",577,"len")=4
+	Set gtmtypes("sgmnt_data",577,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","maxkeysz_assured")=577
+	Set gtmtypes("sgmnt_data",578,"name")="sgmnt_data.hasht_upgrade_needed"
+	Set gtmtypes("sgmnt_data",578,"off")=6444
+	Set gtmtypes("sgmnt_data",578,"len")=4
+	Set gtmtypes("sgmnt_data",578,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","hasht_upgrade_needed")=578
+	Set gtmtypes("sgmnt_data",579,"name")="sgmnt_data.defer_allocate"
+	Set gtmtypes("sgmnt_data",579,"off")=6448
+	Set gtmtypes("sgmnt_data",579,"len")=4
+	Set gtmtypes("sgmnt_data",579,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","defer_allocate")=579
+	Set gtmtypes("sgmnt_data",580,"name")="sgmnt_data.filler_ftok_counter_halted"
+	Set gtmtypes("sgmnt_data",580,"off")=6452
+	Set gtmtypes("sgmnt_data",580,"len")=4
+	Set gtmtypes("sgmnt_data",580,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","filler_ftok_counter_halted")=580
+	Set gtmtypes("sgmnt_data",581,"name")="sgmnt_data.filler_access_counter_halted"
+	Set gtmtypes("sgmnt_data",581,"off")=6456
+	Set gtmtypes("sgmnt_data",581,"len")=4
+	Set gtmtypes("sgmnt_data",581,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","filler_access_counter_halted")=581
+	Set gtmtypes("sgmnt_data",582,"name")="sgmnt_data.lock_crit_with_db"
+	Set gtmtypes("sgmnt_data",582,"off")=6460
+	Set gtmtypes("sgmnt_data",582,"len")=4
+	Set gtmtypes("sgmnt_data",582,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","lock_crit_with_db")=582
+	Set gtmtypes("sgmnt_data",583,"name")="sgmnt_data.basedb_fname_len"
+	Set gtmtypes("sgmnt_data",583,"off")=6464
+	Set gtmtypes("sgmnt_data",583,"len")=4
+	Set gtmtypes("sgmnt_data",583,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","basedb_fname_len")=583
+	Set gtmtypes("sgmnt_data",584,"name")="sgmnt_data.basedb_fname"
+	Set gtmtypes("sgmnt_data",584,"off")=6468
+	Set gtmtypes("sgmnt_data",584,"len")=256
+	Set gtmtypes("sgmnt_data",584,"type")="unsigned-char"
+	Set gtmtypfldindx("sgmnt_data","basedb_fname")=584
+	Set gtmtypes("sgmnt_data",585,"name")="sgmnt_data.filler_7k"
+	Set gtmtypes("sgmnt_data",585,"off")=6724
+	Set gtmtypes("sgmnt_data",585,"len")=444
+	Set gtmtypes("sgmnt_data",585,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","filler_7k")=585
+	Set gtmtypes("sgmnt_data",586,"name")="sgmnt_data.filler_8k"
+	Set gtmtypes("sgmnt_data",586,"off")=7168
+	Set gtmtypes("sgmnt_data",586,"len")=1024
+	Set gtmtypes("sgmnt_data",586,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","filler_8k")=586
 	;
 	Set gtmtypes("shm_forw_multi_t")="struct"
 	Set gtmtypes("shm_forw_multi_t",0)=20
@@ -29511,7 +30067,7 @@ Init
 	Set gtmtypes("shm_reg_ctl_t",9,"dim")=3
 	;
 	Set gtmtypes("shm_snapshot_t")="struct"
-	Set gtmtypes("shm_snapshot_t",0)=587
+	Set gtmtypes("shm_snapshot_t",0)=608
 	Set gtmtypes("shm_snapshot_t","len")=12360
 	Set gtmtypes("shm_snapshot_t",1,"name")="shm_snapshot_t.ss_info"
 	Set gtmtypes("shm_snapshot_t",1,"off")=0
@@ -29711,7 +30267,7 @@ Init
 	Set gtmtypes("shm_snapshot_t",40,"name")="shm_snapshot_t.shadow_file_header.null_subs"
 	Set gtmtypes("shm_snapshot_t",40,"off")=4244
 	Set gtmtypes("shm_snapshot_t",40,"len")=4
-	Set gtmtypes("shm_snapshot_t",40,"type")="boolean_t"
+	Set gtmtypes("shm_snapshot_t",40,"type")="int"
 	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.null_subs")=40
 	Set gtmtypes("shm_snapshot_t",41,"name")="shm_snapshot_t.shadow_file_header.free_space"
 	Set gtmtypes("shm_snapshot_t",41,"off")=4248
@@ -29793,11 +30349,11 @@ Init
 	Set gtmtypes("shm_snapshot_t",56,"len")=4
 	Set gtmtypes("shm_snapshot_t",56,"type")="int"
 	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.creation_time4")=56
-	Set gtmtypes("shm_snapshot_t",57,"name")="shm_snapshot_t.shadow_file_header.creation_filler_8byte"
+	Set gtmtypes("shm_snapshot_t",57,"name")="shm_snapshot_t.shadow_file_header.reservedDBFlags"
 	Set gtmtypes("shm_snapshot_t",57,"off")=4356
 	Set gtmtypes("shm_snapshot_t",57,"len")=4
-	Set gtmtypes("shm_snapshot_t",57,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.creation_filler_8byte")=57
+	Set gtmtypes("shm_snapshot_t",57,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reservedDBFlags")=57
 	Set gtmtypes("shm_snapshot_t",58,"name")="shm_snapshot_t.shadow_file_header.max_tn"
 	Set gtmtypes("shm_snapshot_t",58,"off")=4360
 	Set gtmtypes("shm_snapshot_t",58,"len")=8
@@ -29878,2592 +30434,2697 @@ Init
 	Set gtmtypes("shm_snapshot_t",73,"len")=4
 	Set gtmtypes("shm_snapshot_t",73,"type")="int"
 	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.abandoned_kills")=73
-	Set gtmtypes("shm_snapshot_t",74,"name")="shm_snapshot_t.shadow_file_header.filler_320"
+	Set gtmtypes("shm_snapshot_t",74,"name")="shm_snapshot_t.shadow_file_header.freeze_online"
 	Set gtmtypes("shm_snapshot_t",74,"off")=4480
-	Set gtmtypes("shm_snapshot_t",74,"len")=8
-	Set gtmtypes("shm_snapshot_t",74,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_320")=74
-	Set gtmtypes("shm_snapshot_t",75,"name")="shm_snapshot_t.shadow_file_header.tn_upgrd_blks_0"
-	Set gtmtypes("shm_snapshot_t",75,"off")=4488
-	Set gtmtypes("shm_snapshot_t",75,"len")=8
-	Set gtmtypes("shm_snapshot_t",75,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.tn_upgrd_blks_0")=75
-	Set gtmtypes("shm_snapshot_t",76,"name")="shm_snapshot_t.shadow_file_header.desired_db_format_tn"
-	Set gtmtypes("shm_snapshot_t",76,"off")=4496
+	Set gtmtypes("shm_snapshot_t",74,"len")=4
+	Set gtmtypes("shm_snapshot_t",74,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.freeze_online")=74
+	Set gtmtypes("shm_snapshot_t",75,"name")="shm_snapshot_t.shadow_file_header.filler_320"
+	Set gtmtypes("shm_snapshot_t",75,"off")=4484
+	Set gtmtypes("shm_snapshot_t",75,"len")=4
+	Set gtmtypes("shm_snapshot_t",75,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_320")=75
+	Set gtmtypes("shm_snapshot_t",76,"name")="shm_snapshot_t.shadow_file_header.tn_upgrd_blks_0"
+	Set gtmtypes("shm_snapshot_t",76,"off")=4488
 	Set gtmtypes("shm_snapshot_t",76,"len")=8
 	Set gtmtypes("shm_snapshot_t",76,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.desired_db_format_tn")=76
-	Set gtmtypes("shm_snapshot_t",77,"name")="shm_snapshot_t.shadow_file_header.reorg_db_fmt_start_tn"
-	Set gtmtypes("shm_snapshot_t",77,"off")=4504
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.tn_upgrd_blks_0")=76
+	Set gtmtypes("shm_snapshot_t",77,"name")="shm_snapshot_t.shadow_file_header.desired_db_format_tn"
+	Set gtmtypes("shm_snapshot_t",77,"off")=4496
 	Set gtmtypes("shm_snapshot_t",77,"len")=8
 	Set gtmtypes("shm_snapshot_t",77,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reorg_db_fmt_start_tn")=77
-	Set gtmtypes("shm_snapshot_t",78,"name")="shm_snapshot_t.shadow_file_header.reorg_upgrd_dwngrd_restart_block"
-	Set gtmtypes("shm_snapshot_t",78,"off")=4512
-	Set gtmtypes("shm_snapshot_t",78,"len")=4
-	Set gtmtypes("shm_snapshot_t",78,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reorg_upgrd_dwngrd_restart_block")=78
-	Set gtmtypes("shm_snapshot_t",79,"name")="shm_snapshot_t.shadow_file_header.blks_to_upgrd"
-	Set gtmtypes("shm_snapshot_t",79,"off")=4516
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.desired_db_format_tn")=77
+	Set gtmtypes("shm_snapshot_t",78,"name")="shm_snapshot_t.shadow_file_header.reorg_db_fmt_start_tn"
+	Set gtmtypes("shm_snapshot_t",78,"off")=4504
+	Set gtmtypes("shm_snapshot_t",78,"len")=8
+	Set gtmtypes("shm_snapshot_t",78,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reorg_db_fmt_start_tn")=78
+	Set gtmtypes("shm_snapshot_t",79,"name")="shm_snapshot_t.shadow_file_header.reorg_upgrd_dwngrd_restart_block"
+	Set gtmtypes("shm_snapshot_t",79,"off")=4512
 	Set gtmtypes("shm_snapshot_t",79,"len")=4
 	Set gtmtypes("shm_snapshot_t",79,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.blks_to_upgrd")=79
-	Set gtmtypes("shm_snapshot_t",80,"name")="shm_snapshot_t.shadow_file_header.blks_to_upgrd_subzero_error"
-	Set gtmtypes("shm_snapshot_t",80,"off")=4520
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reorg_upgrd_dwngrd_restart_block")=79
+	Set gtmtypes("shm_snapshot_t",80,"name")="shm_snapshot_t.shadow_file_header.blks_to_upgrd"
+	Set gtmtypes("shm_snapshot_t",80,"off")=4516
 	Set gtmtypes("shm_snapshot_t",80,"len")=4
 	Set gtmtypes("shm_snapshot_t",80,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.blks_to_upgrd_subzero_error")=80
-	Set gtmtypes("shm_snapshot_t",81,"name")="shm_snapshot_t.shadow_file_header.desired_db_format"
-	Set gtmtypes("shm_snapshot_t",81,"off")=4524
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.blks_to_upgrd")=80
+	Set gtmtypes("shm_snapshot_t",81,"name")="shm_snapshot_t.shadow_file_header.blks_to_upgrd_subzero_error"
+	Set gtmtypes("shm_snapshot_t",81,"off")=4520
 	Set gtmtypes("shm_snapshot_t",81,"len")=4
 	Set gtmtypes("shm_snapshot_t",81,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.desired_db_format")=81
-	Set gtmtypes("shm_snapshot_t",82,"name")="shm_snapshot_t.shadow_file_header.fully_upgraded"
-	Set gtmtypes("shm_snapshot_t",82,"off")=4528
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.blks_to_upgrd_subzero_error")=81
+	Set gtmtypes("shm_snapshot_t",82,"name")="shm_snapshot_t.shadow_file_header.desired_db_format"
+	Set gtmtypes("shm_snapshot_t",82,"off")=4524
 	Set gtmtypes("shm_snapshot_t",82,"len")=4
-	Set gtmtypes("shm_snapshot_t",82,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.fully_upgraded")=82
-	Set gtmtypes("shm_snapshot_t",83,"name")="shm_snapshot_t.shadow_file_header.db_got_to_v5_once"
-	Set gtmtypes("shm_snapshot_t",83,"off")=4532
+	Set gtmtypes("shm_snapshot_t",82,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.desired_db_format")=82
+	Set gtmtypes("shm_snapshot_t",83,"name")="shm_snapshot_t.shadow_file_header.fully_upgraded"
+	Set gtmtypes("shm_snapshot_t",83,"off")=4528
 	Set gtmtypes("shm_snapshot_t",83,"len")=4
 	Set gtmtypes("shm_snapshot_t",83,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_got_to_v5_once")=83
-	Set gtmtypes("shm_snapshot_t",84,"name")="shm_snapshot_t.shadow_file_header.opened_by_gtmv53"
-	Set gtmtypes("shm_snapshot_t",84,"off")=4536
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.fully_upgraded")=83
+	Set gtmtypes("shm_snapshot_t",84,"name")="shm_snapshot_t.shadow_file_header.db_got_to_v5_once"
+	Set gtmtypes("shm_snapshot_t",84,"off")=4532
 	Set gtmtypes("shm_snapshot_t",84,"len")=4
 	Set gtmtypes("shm_snapshot_t",84,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.opened_by_gtmv53")=84
-	Set gtmtypes("shm_snapshot_t",85,"name")="shm_snapshot_t.shadow_file_header.filler_384"
-	Set gtmtypes("shm_snapshot_t",85,"off")=4540
-	Set gtmtypes("shm_snapshot_t",85,"len")=12
-	Set gtmtypes("shm_snapshot_t",85,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_384")=85
-	Set gtmtypes("shm_snapshot_t",86,"name")="shm_snapshot_t.shadow_file_header.trans_hist"
-	Set gtmtypes("shm_snapshot_t",86,"off")=4552
-	Set gtmtypes("shm_snapshot_t",86,"len")=56
-	Set gtmtypes("shm_snapshot_t",86,"type")="th_index"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist")=86
-	Set gtmtypes("shm_snapshot_t",87,"name")="shm_snapshot_t.shadow_file_header.trans_hist.curr_tn"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_got_to_v5_once")=84
+	Set gtmtypes("shm_snapshot_t",85,"name")="shm_snapshot_t.shadow_file_header.opened_by_gtmv53"
+	Set gtmtypes("shm_snapshot_t",85,"off")=4536
+	Set gtmtypes("shm_snapshot_t",85,"len")=4
+	Set gtmtypes("shm_snapshot_t",85,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.opened_by_gtmv53")=85
+	Set gtmtypes("shm_snapshot_t",86,"name")="shm_snapshot_t.shadow_file_header.filler_384"
+	Set gtmtypes("shm_snapshot_t",86,"off")=4540
+	Set gtmtypes("shm_snapshot_t",86,"len")=12
+	Set gtmtypes("shm_snapshot_t",86,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_384")=86
+	Set gtmtypes("shm_snapshot_t",87,"name")="shm_snapshot_t.shadow_file_header.trans_hist"
 	Set gtmtypes("shm_snapshot_t",87,"off")=4552
-	Set gtmtypes("shm_snapshot_t",87,"len")=8
-	Set gtmtypes("shm_snapshot_t",87,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.curr_tn")=87
-	Set gtmtypes("shm_snapshot_t",88,"name")="shm_snapshot_t.shadow_file_header.trans_hist.early_tn"
-	Set gtmtypes("shm_snapshot_t",88,"off")=4560
+	Set gtmtypes("shm_snapshot_t",87,"len")=56
+	Set gtmtypes("shm_snapshot_t",87,"type")="th_index"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist")=87
+	Set gtmtypes("shm_snapshot_t",88,"name")="shm_snapshot_t.shadow_file_header.trans_hist.curr_tn"
+	Set gtmtypes("shm_snapshot_t",88,"off")=4552
 	Set gtmtypes("shm_snapshot_t",88,"len")=8
 	Set gtmtypes("shm_snapshot_t",88,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.early_tn")=88
-	Set gtmtypes("shm_snapshot_t",89,"name")="shm_snapshot_t.shadow_file_header.trans_hist.last_mm_sync"
-	Set gtmtypes("shm_snapshot_t",89,"off")=4568
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.curr_tn")=88
+	Set gtmtypes("shm_snapshot_t",89,"name")="shm_snapshot_t.shadow_file_header.trans_hist.early_tn"
+	Set gtmtypes("shm_snapshot_t",89,"off")=4560
 	Set gtmtypes("shm_snapshot_t",89,"len")=8
 	Set gtmtypes("shm_snapshot_t",89,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.last_mm_sync")=89
-	Set gtmtypes("shm_snapshot_t",90,"name")="shm_snapshot_t.shadow_file_header.trans_hist.filler_8byte"
-	Set gtmtypes("shm_snapshot_t",90,"off")=4576
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.early_tn")=89
+	Set gtmtypes("shm_snapshot_t",90,"name")="shm_snapshot_t.shadow_file_header.trans_hist.last_mm_sync"
+	Set gtmtypes("shm_snapshot_t",90,"off")=4568
 	Set gtmtypes("shm_snapshot_t",90,"len")=8
-	Set gtmtypes("shm_snapshot_t",90,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.filler_8byte")=90
-	Set gtmtypes("shm_snapshot_t",91,"name")="shm_snapshot_t.shadow_file_header.trans_hist.mm_tn"
-	Set gtmtypes("shm_snapshot_t",91,"off")=4584
+	Set gtmtypes("shm_snapshot_t",90,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.last_mm_sync")=90
+	Set gtmtypes("shm_snapshot_t",91,"name")="shm_snapshot_t.shadow_file_header.trans_hist.filler_8byte"
+	Set gtmtypes("shm_snapshot_t",91,"off")=4576
 	Set gtmtypes("shm_snapshot_t",91,"len")=8
-	Set gtmtypes("shm_snapshot_t",91,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.mm_tn")=91
-	Set gtmtypes("shm_snapshot_t",92,"name")="shm_snapshot_t.shadow_file_header.trans_hist.lock_sequence"
-	Set gtmtypes("shm_snapshot_t",92,"off")=4592
-	Set gtmtypes("shm_snapshot_t",92,"len")=4
-	Set gtmtypes("shm_snapshot_t",92,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.lock_sequence")=92
-	Set gtmtypes("shm_snapshot_t",93,"name")="shm_snapshot_t.shadow_file_header.trans_hist.ccp_jnl_filesize"
-	Set gtmtypes("shm_snapshot_t",93,"off")=4596
+	Set gtmtypes("shm_snapshot_t",91,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.filler_8byte")=91
+	Set gtmtypes("shm_snapshot_t",92,"name")="shm_snapshot_t.shadow_file_header.trans_hist.mm_tn"
+	Set gtmtypes("shm_snapshot_t",92,"off")=4584
+	Set gtmtypes("shm_snapshot_t",92,"len")=8
+	Set gtmtypes("shm_snapshot_t",92,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.mm_tn")=92
+	Set gtmtypes("shm_snapshot_t",93,"name")="shm_snapshot_t.shadow_file_header.trans_hist.lock_sequence"
+	Set gtmtypes("shm_snapshot_t",93,"off")=4592
 	Set gtmtypes("shm_snapshot_t",93,"len")=4
 	Set gtmtypes("shm_snapshot_t",93,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.ccp_jnl_filesize")=93
-	Set gtmtypes("shm_snapshot_t",94,"name")="shm_snapshot_t.shadow_file_header.trans_hist.total_blks"
-	Set gtmtypes("shm_snapshot_t",94,"off")=4600
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.lock_sequence")=93
+	Set gtmtypes("shm_snapshot_t",94,"name")="shm_snapshot_t.shadow_file_header.trans_hist.ccp_jnl_filesize"
+	Set gtmtypes("shm_snapshot_t",94,"off")=4596
 	Set gtmtypes("shm_snapshot_t",94,"len")=4
 	Set gtmtypes("shm_snapshot_t",94,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.total_blks")=94
-	Set gtmtypes("shm_snapshot_t",95,"name")="shm_snapshot_t.shadow_file_header.trans_hist.free_blocks"
-	Set gtmtypes("shm_snapshot_t",95,"off")=4604
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.ccp_jnl_filesize")=94
+	Set gtmtypes("shm_snapshot_t",95,"name")="shm_snapshot_t.shadow_file_header.trans_hist.total_blks"
+	Set gtmtypes("shm_snapshot_t",95,"off")=4600
 	Set gtmtypes("shm_snapshot_t",95,"len")=4
 	Set gtmtypes("shm_snapshot_t",95,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.free_blocks")=95
-	Set gtmtypes("shm_snapshot_t",96,"name")="shm_snapshot_t.shadow_file_header.filler_trans_hist"
-	Set gtmtypes("shm_snapshot_t",96,"off")=4608
-	Set gtmtypes("shm_snapshot_t",96,"len")=8
-	Set gtmtypes("shm_snapshot_t",96,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_trans_hist")=96
-	Set gtmtypes("shm_snapshot_t",97,"name")="shm_snapshot_t.shadow_file_header.flush_time"
-	Set gtmtypes("shm_snapshot_t",97,"off")=4616
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.total_blks")=95
+	Set gtmtypes("shm_snapshot_t",96,"name")="shm_snapshot_t.shadow_file_header.trans_hist.free_blocks"
+	Set gtmtypes("shm_snapshot_t",96,"off")=4604
+	Set gtmtypes("shm_snapshot_t",96,"len")=4
+	Set gtmtypes("shm_snapshot_t",96,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.free_blocks")=96
+	Set gtmtypes("shm_snapshot_t",97,"name")="shm_snapshot_t.shadow_file_header.filler_trans_hist"
+	Set gtmtypes("shm_snapshot_t",97,"off")=4608
 	Set gtmtypes("shm_snapshot_t",97,"len")=8
-	Set gtmtypes("shm_snapshot_t",97,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.flush_time")=97
-	Set gtmtypes("shm_snapshot_t",97,"dim")=2
-	Set gtmtypes("shm_snapshot_t",98,"name")="shm_snapshot_t.shadow_file_header.flush_trigger"
-	Set gtmtypes("shm_snapshot_t",98,"off")=4624
-	Set gtmtypes("shm_snapshot_t",98,"len")=4
+	Set gtmtypes("shm_snapshot_t",97,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_trans_hist")=97
+	Set gtmtypes("shm_snapshot_t",98,"name")="shm_snapshot_t.shadow_file_header.flush_time"
+	Set gtmtypes("shm_snapshot_t",98,"off")=4616
+	Set gtmtypes("shm_snapshot_t",98,"len")=8
 	Set gtmtypes("shm_snapshot_t",98,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.flush_trigger")=98
-	Set gtmtypes("shm_snapshot_t",99,"name")="shm_snapshot_t.shadow_file_header.n_wrt_per_flu"
-	Set gtmtypes("shm_snapshot_t",99,"off")=4628
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.flush_time")=98
+	Set gtmtypes("shm_snapshot_t",98,"dim")=2
+	Set gtmtypes("shm_snapshot_t",99,"name")="shm_snapshot_t.shadow_file_header.flush_trigger"
+	Set gtmtypes("shm_snapshot_t",99,"off")=4624
 	Set gtmtypes("shm_snapshot_t",99,"len")=4
 	Set gtmtypes("shm_snapshot_t",99,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_wrt_per_flu")=99
-	Set gtmtypes("shm_snapshot_t",100,"name")="shm_snapshot_t.shadow_file_header.wait_disk_space"
-	Set gtmtypes("shm_snapshot_t",100,"off")=4632
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.flush_trigger")=99
+	Set gtmtypes("shm_snapshot_t",100,"name")="shm_snapshot_t.shadow_file_header.n_wrt_per_flu"
+	Set gtmtypes("shm_snapshot_t",100,"off")=4628
 	Set gtmtypes("shm_snapshot_t",100,"len")=4
 	Set gtmtypes("shm_snapshot_t",100,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wait_disk_space")=100
-	Set gtmtypes("shm_snapshot_t",101,"name")="shm_snapshot_t.shadow_file_header.defer_time"
-	Set gtmtypes("shm_snapshot_t",101,"off")=4636
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_wrt_per_flu")=100
+	Set gtmtypes("shm_snapshot_t",101,"name")="shm_snapshot_t.shadow_file_header.wait_disk_space"
+	Set gtmtypes("shm_snapshot_t",101,"off")=4632
 	Set gtmtypes("shm_snapshot_t",101,"len")=4
 	Set gtmtypes("shm_snapshot_t",101,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.defer_time")=101
-	Set gtmtypes("shm_snapshot_t",102,"name")="shm_snapshot_t.shadow_file_header.filler_wc_blocked"
-	Set gtmtypes("shm_snapshot_t",102,"off")=4640
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wait_disk_space")=101
+	Set gtmtypes("shm_snapshot_t",102,"name")="shm_snapshot_t.shadow_file_header.defer_time"
+	Set gtmtypes("shm_snapshot_t",102,"off")=4636
 	Set gtmtypes("shm_snapshot_t",102,"len")=4
-	Set gtmtypes("shm_snapshot_t",102,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_wc_blocked")=102
-	Set gtmtypes("shm_snapshot_t",103,"name")="shm_snapshot_t.shadow_file_header.mumps_can_bypass"
-	Set gtmtypes("shm_snapshot_t",103,"off")=4644
+	Set gtmtypes("shm_snapshot_t",102,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.defer_time")=102
+	Set gtmtypes("shm_snapshot_t",103,"name")="shm_snapshot_t.shadow_file_header.filler_wc_blocked"
+	Set gtmtypes("shm_snapshot_t",103,"off")=4640
 	Set gtmtypes("shm_snapshot_t",103,"len")=4
 	Set gtmtypes("shm_snapshot_t",103,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.mumps_can_bypass")=103
-	Set gtmtypes("shm_snapshot_t",104,"name")="shm_snapshot_t.shadow_file_header.epoch_taper"
-	Set gtmtypes("shm_snapshot_t",104,"off")=4648
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_wc_blocked")=103
+	Set gtmtypes("shm_snapshot_t",104,"name")="shm_snapshot_t.shadow_file_header.mumps_can_bypass"
+	Set gtmtypes("shm_snapshot_t",104,"off")=4644
 	Set gtmtypes("shm_snapshot_t",104,"len")=4
 	Set gtmtypes("shm_snapshot_t",104,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.epoch_taper")=104
-	Set gtmtypes("shm_snapshot_t",105,"name")="shm_snapshot_t.shadow_file_header.epoch_taper_time_pct"
-	Set gtmtypes("shm_snapshot_t",105,"off")=4652
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.mumps_can_bypass")=104
+	Set gtmtypes("shm_snapshot_t",105,"name")="shm_snapshot_t.shadow_file_header.epoch_taper"
+	Set gtmtypes("shm_snapshot_t",105,"off")=4648
 	Set gtmtypes("shm_snapshot_t",105,"len")=4
-	Set gtmtypes("shm_snapshot_t",105,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.epoch_taper_time_pct")=105
-	Set gtmtypes("shm_snapshot_t",106,"name")="shm_snapshot_t.shadow_file_header.epoch_taper_jnl_pct"
-	Set gtmtypes("shm_snapshot_t",106,"off")=4656
+	Set gtmtypes("shm_snapshot_t",105,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.epoch_taper")=105
+	Set gtmtypes("shm_snapshot_t",106,"name")="shm_snapshot_t.shadow_file_header.epoch_taper_time_pct"
+	Set gtmtypes("shm_snapshot_t",106,"off")=4652
 	Set gtmtypes("shm_snapshot_t",106,"len")=4
 	Set gtmtypes("shm_snapshot_t",106,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.epoch_taper_jnl_pct")=106
-	Set gtmtypes("shm_snapshot_t",107,"name")="shm_snapshot_t.shadow_file_header.filler_512"
-	Set gtmtypes("shm_snapshot_t",107,"off")=4660
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.epoch_taper_time_pct")=106
+	Set gtmtypes("shm_snapshot_t",107,"name")="shm_snapshot_t.shadow_file_header.epoch_taper_jnl_pct"
+	Set gtmtypes("shm_snapshot_t",107,"off")=4656
 	Set gtmtypes("shm_snapshot_t",107,"len")=4
-	Set gtmtypes("shm_snapshot_t",107,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_512")=107
-	Set gtmtypes("shm_snapshot_t",108,"name")="shm_snapshot_t.shadow_file_header.reserved_for_upd"
-	Set gtmtypes("shm_snapshot_t",108,"off")=4664
+	Set gtmtypes("shm_snapshot_t",107,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.epoch_taper_jnl_pct")=107
+	Set gtmtypes("shm_snapshot_t",108,"name")="shm_snapshot_t.shadow_file_header.asyncio"
+	Set gtmtypes("shm_snapshot_t",108,"off")=4660
 	Set gtmtypes("shm_snapshot_t",108,"len")=4
-	Set gtmtypes("shm_snapshot_t",108,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reserved_for_upd")=108
-	Set gtmtypes("shm_snapshot_t",109,"name")="shm_snapshot_t.shadow_file_header.avg_blks_per_100gbl"
-	Set gtmtypes("shm_snapshot_t",109,"off")=4668
+	Set gtmtypes("shm_snapshot_t",108,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.asyncio")=108
+	Set gtmtypes("shm_snapshot_t",109,"name")="shm_snapshot_t.shadow_file_header.reserved_for_upd"
+	Set gtmtypes("shm_snapshot_t",109,"off")=4664
 	Set gtmtypes("shm_snapshot_t",109,"len")=4
 	Set gtmtypes("shm_snapshot_t",109,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.avg_blks_per_100gbl")=109
-	Set gtmtypes("shm_snapshot_t",110,"name")="shm_snapshot_t.shadow_file_header.pre_read_trigger_factor"
-	Set gtmtypes("shm_snapshot_t",110,"off")=4672
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reserved_for_upd")=109
+	Set gtmtypes("shm_snapshot_t",110,"name")="shm_snapshot_t.shadow_file_header.avg_blks_per_100gbl"
+	Set gtmtypes("shm_snapshot_t",110,"off")=4668
 	Set gtmtypes("shm_snapshot_t",110,"len")=4
 	Set gtmtypes("shm_snapshot_t",110,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.pre_read_trigger_factor")=110
-	Set gtmtypes("shm_snapshot_t",111,"name")="shm_snapshot_t.shadow_file_header.writer_trigger_factor"
-	Set gtmtypes("shm_snapshot_t",111,"off")=4676
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.avg_blks_per_100gbl")=110
+	Set gtmtypes("shm_snapshot_t",111,"name")="shm_snapshot_t.shadow_file_header.pre_read_trigger_factor"
+	Set gtmtypes("shm_snapshot_t",111,"off")=4672
 	Set gtmtypes("shm_snapshot_t",111,"len")=4
 	Set gtmtypes("shm_snapshot_t",111,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.writer_trigger_factor")=111
-	Set gtmtypes("shm_snapshot_t",112,"name")="shm_snapshot_t.shadow_file_header.semid"
-	Set gtmtypes("shm_snapshot_t",112,"off")=4680
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.pre_read_trigger_factor")=111
+	Set gtmtypes("shm_snapshot_t",112,"name")="shm_snapshot_t.shadow_file_header.writer_trigger_factor"
+	Set gtmtypes("shm_snapshot_t",112,"off")=4676
 	Set gtmtypes("shm_snapshot_t",112,"len")=4
-	Set gtmtypes("shm_snapshot_t",112,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.semid")=112
-	Set gtmtypes("shm_snapshot_t",113,"name")="shm_snapshot_t.shadow_file_header.shmid"
-	Set gtmtypes("shm_snapshot_t",113,"off")=4684
+	Set gtmtypes("shm_snapshot_t",112,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.writer_trigger_factor")=112
+	Set gtmtypes("shm_snapshot_t",113,"name")="shm_snapshot_t.shadow_file_header.semid"
+	Set gtmtypes("shm_snapshot_t",113,"off")=4680
 	Set gtmtypes("shm_snapshot_t",113,"len")=4
 	Set gtmtypes("shm_snapshot_t",113,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmid")=113
-	Set gtmtypes("shm_snapshot_t",114,"name")="shm_snapshot_t.shadow_file_header.gt_sem_ctime"
-	Set gtmtypes("shm_snapshot_t",114,"off")=4688
-	Set gtmtypes("shm_snapshot_t",114,"len")=8
-	Set gtmtypes("shm_snapshot_t",114,"type")="gtm_time8"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gt_sem_ctime")=114
-	Set gtmtypes("shm_snapshot_t",115,"name")="shm_snapshot_t.shadow_file_header.gt_sem_ctime.ctime"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.semid")=113
+	Set gtmtypes("shm_snapshot_t",114,"name")="shm_snapshot_t.shadow_file_header.shmid"
+	Set gtmtypes("shm_snapshot_t",114,"off")=4684
+	Set gtmtypes("shm_snapshot_t",114,"len")=4
+	Set gtmtypes("shm_snapshot_t",114,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmid")=114
+	Set gtmtypes("shm_snapshot_t",115,"name")="shm_snapshot_t.shadow_file_header.gt_sem_ctime"
 	Set gtmtypes("shm_snapshot_t",115,"off")=4688
-	Set gtmtypes("shm_snapshot_t",115,"len")=4
-	Set gtmtypes("shm_snapshot_t",115,"type")="time_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gt_sem_ctime.ctime")=115
-	Set gtmtypes("shm_snapshot_t",116,"name")="shm_snapshot_t.shadow_file_header.gt_sem_ctime.filler"
+	Set gtmtypes("shm_snapshot_t",115,"len")=8
+	Set gtmtypes("shm_snapshot_t",115,"type")="gtm_time8"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gt_sem_ctime")=115
+	Set gtmtypes("shm_snapshot_t",116,"name")="shm_snapshot_t.shadow_file_header.gt_sem_ctime.ctime"
 	Set gtmtypes("shm_snapshot_t",116,"off")=4688
-	Set gtmtypes("shm_snapshot_t",116,"len")=8
-	Set gtmtypes("shm_snapshot_t",116,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gt_sem_ctime.filler")=116
-	Set gtmtypes("shm_snapshot_t",116,"dim")=2
-	Set gtmtypes("shm_snapshot_t",117,"name")="shm_snapshot_t.shadow_file_header.gt_shm_ctime"
-	Set gtmtypes("shm_snapshot_t",117,"off")=4696
+	Set gtmtypes("shm_snapshot_t",116,"len")=4
+	Set gtmtypes("shm_snapshot_t",116,"type")="time_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gt_sem_ctime.ctime")=116
+	Set gtmtypes("shm_snapshot_t",117,"name")="shm_snapshot_t.shadow_file_header.gt_sem_ctime.filler"
+	Set gtmtypes("shm_snapshot_t",117,"off")=4688
 	Set gtmtypes("shm_snapshot_t",117,"len")=8
-	Set gtmtypes("shm_snapshot_t",117,"type")="gtm_time8"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gt_shm_ctime")=117
-	Set gtmtypes("shm_snapshot_t",118,"name")="shm_snapshot_t.shadow_file_header.gt_shm_ctime.ctime"
+	Set gtmtypes("shm_snapshot_t",117,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gt_sem_ctime.filler")=117
+	Set gtmtypes("shm_snapshot_t",117,"dim")=2
+	Set gtmtypes("shm_snapshot_t",118,"name")="shm_snapshot_t.shadow_file_header.gt_shm_ctime"
 	Set gtmtypes("shm_snapshot_t",118,"off")=4696
-	Set gtmtypes("shm_snapshot_t",118,"len")=4
-	Set gtmtypes("shm_snapshot_t",118,"type")="time_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gt_shm_ctime.ctime")=118
-	Set gtmtypes("shm_snapshot_t",119,"name")="shm_snapshot_t.shadow_file_header.gt_shm_ctime.filler"
+	Set gtmtypes("shm_snapshot_t",118,"len")=8
+	Set gtmtypes("shm_snapshot_t",118,"type")="gtm_time8"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gt_shm_ctime")=118
+	Set gtmtypes("shm_snapshot_t",119,"name")="shm_snapshot_t.shadow_file_header.gt_shm_ctime.ctime"
 	Set gtmtypes("shm_snapshot_t",119,"off")=4696
-	Set gtmtypes("shm_snapshot_t",119,"len")=8
-	Set gtmtypes("shm_snapshot_t",119,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gt_shm_ctime.filler")=119
-	Set gtmtypes("shm_snapshot_t",119,"dim")=2
-	Set gtmtypes("shm_snapshot_t",120,"name")="shm_snapshot_t.shadow_file_header.filler_unixonly"
-	Set gtmtypes("shm_snapshot_t",120,"off")=4704
-	Set gtmtypes("shm_snapshot_t",120,"len")=40
-	Set gtmtypes("shm_snapshot_t",120,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_unixonly")=120
-	Set gtmtypes("shm_snapshot_t",121,"name")="shm_snapshot_t.shadow_file_header.filler_n_retries"
-	Set gtmtypes("shm_snapshot_t",121,"off")=4744
-	Set gtmtypes("shm_snapshot_t",121,"len")=20
-	Set gtmtypes("shm_snapshot_t",121,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_retries")=121
-	Set gtmtypes("shm_snapshot_t",121,"dim")=5
-	Set gtmtypes("shm_snapshot_t",122,"name")="shm_snapshot_t.shadow_file_header.filler_n_puts"
-	Set gtmtypes("shm_snapshot_t",122,"off")=4764
-	Set gtmtypes("shm_snapshot_t",122,"len")=4
+	Set gtmtypes("shm_snapshot_t",119,"len")=4
+	Set gtmtypes("shm_snapshot_t",119,"type")="time_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gt_shm_ctime.ctime")=119
+	Set gtmtypes("shm_snapshot_t",120,"name")="shm_snapshot_t.shadow_file_header.gt_shm_ctime.filler"
+	Set gtmtypes("shm_snapshot_t",120,"off")=4696
+	Set gtmtypes("shm_snapshot_t",120,"len")=8
+	Set gtmtypes("shm_snapshot_t",120,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gt_shm_ctime.filler")=120
+	Set gtmtypes("shm_snapshot_t",120,"dim")=2
+	Set gtmtypes("shm_snapshot_t",121,"name")="shm_snapshot_t.shadow_file_header.filler_unixonly"
+	Set gtmtypes("shm_snapshot_t",121,"off")=4704
+	Set gtmtypes("shm_snapshot_t",121,"len")=40
+	Set gtmtypes("shm_snapshot_t",121,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_unixonly")=121
+	Set gtmtypes("shm_snapshot_t",122,"name")="shm_snapshot_t.shadow_file_header.filler_n_retries"
+	Set gtmtypes("shm_snapshot_t",122,"off")=4744
+	Set gtmtypes("shm_snapshot_t",122,"len")=20
 	Set gtmtypes("shm_snapshot_t",122,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_puts")=122
-	Set gtmtypes("shm_snapshot_t",123,"name")="shm_snapshot_t.shadow_file_header.filler_n_kills"
-	Set gtmtypes("shm_snapshot_t",123,"off")=4768
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_retries")=122
+	Set gtmtypes("shm_snapshot_t",122,"dim")=5
+	Set gtmtypes("shm_snapshot_t",123,"name")="shm_snapshot_t.shadow_file_header.filler_n_puts"
+	Set gtmtypes("shm_snapshot_t",123,"off")=4764
 	Set gtmtypes("shm_snapshot_t",123,"len")=4
 	Set gtmtypes("shm_snapshot_t",123,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_kills")=123
-	Set gtmtypes("shm_snapshot_t",124,"name")="shm_snapshot_t.shadow_file_header.filler_n_queries"
-	Set gtmtypes("shm_snapshot_t",124,"off")=4772
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_puts")=123
+	Set gtmtypes("shm_snapshot_t",124,"name")="shm_snapshot_t.shadow_file_header.filler_n_kills"
+	Set gtmtypes("shm_snapshot_t",124,"off")=4768
 	Set gtmtypes("shm_snapshot_t",124,"len")=4
 	Set gtmtypes("shm_snapshot_t",124,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_queries")=124
-	Set gtmtypes("shm_snapshot_t",125,"name")="shm_snapshot_t.shadow_file_header.filler_n_gets"
-	Set gtmtypes("shm_snapshot_t",125,"off")=4776
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_kills")=124
+	Set gtmtypes("shm_snapshot_t",125,"name")="shm_snapshot_t.shadow_file_header.filler_n_queries"
+	Set gtmtypes("shm_snapshot_t",125,"off")=4772
 	Set gtmtypes("shm_snapshot_t",125,"len")=4
 	Set gtmtypes("shm_snapshot_t",125,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_gets")=125
-	Set gtmtypes("shm_snapshot_t",126,"name")="shm_snapshot_t.shadow_file_header.filler_n_order"
-	Set gtmtypes("shm_snapshot_t",126,"off")=4780
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_queries")=125
+	Set gtmtypes("shm_snapshot_t",126,"name")="shm_snapshot_t.shadow_file_header.filler_n_gets"
+	Set gtmtypes("shm_snapshot_t",126,"off")=4776
 	Set gtmtypes("shm_snapshot_t",126,"len")=4
 	Set gtmtypes("shm_snapshot_t",126,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_order")=126
-	Set gtmtypes("shm_snapshot_t",127,"name")="shm_snapshot_t.shadow_file_header.filler_n_zprevs"
-	Set gtmtypes("shm_snapshot_t",127,"off")=4784
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_gets")=126
+	Set gtmtypes("shm_snapshot_t",127,"name")="shm_snapshot_t.shadow_file_header.filler_n_order"
+	Set gtmtypes("shm_snapshot_t",127,"off")=4780
 	Set gtmtypes("shm_snapshot_t",127,"len")=4
 	Set gtmtypes("shm_snapshot_t",127,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_zprevs")=127
-	Set gtmtypes("shm_snapshot_t",128,"name")="shm_snapshot_t.shadow_file_header.filler_n_data"
-	Set gtmtypes("shm_snapshot_t",128,"off")=4788
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_order")=127
+	Set gtmtypes("shm_snapshot_t",128,"name")="shm_snapshot_t.shadow_file_header.filler_n_zprevs"
+	Set gtmtypes("shm_snapshot_t",128,"off")=4784
 	Set gtmtypes("shm_snapshot_t",128,"len")=4
 	Set gtmtypes("shm_snapshot_t",128,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_data")=128
-	Set gtmtypes("shm_snapshot_t",129,"name")="shm_snapshot_t.shadow_file_header.filler_n_puts_duplicate"
-	Set gtmtypes("shm_snapshot_t",129,"off")=4792
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_zprevs")=128
+	Set gtmtypes("shm_snapshot_t",129,"name")="shm_snapshot_t.shadow_file_header.filler_n_data"
+	Set gtmtypes("shm_snapshot_t",129,"off")=4788
 	Set gtmtypes("shm_snapshot_t",129,"len")=4
-	Set gtmtypes("shm_snapshot_t",129,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_puts_duplicate")=129
-	Set gtmtypes("shm_snapshot_t",130,"name")="shm_snapshot_t.shadow_file_header.filler_n_tp_updates"
-	Set gtmtypes("shm_snapshot_t",130,"off")=4796
+	Set gtmtypes("shm_snapshot_t",129,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_data")=129
+	Set gtmtypes("shm_snapshot_t",130,"name")="shm_snapshot_t.shadow_file_header.filler_n_puts_duplicate"
+	Set gtmtypes("shm_snapshot_t",130,"off")=4792
 	Set gtmtypes("shm_snapshot_t",130,"len")=4
 	Set gtmtypes("shm_snapshot_t",130,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_tp_updates")=130
-	Set gtmtypes("shm_snapshot_t",131,"name")="shm_snapshot_t.shadow_file_header.filler_n_tp_updates_duplicate"
-	Set gtmtypes("shm_snapshot_t",131,"off")=4800
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_puts_duplicate")=130
+	Set gtmtypes("shm_snapshot_t",131,"name")="shm_snapshot_t.shadow_file_header.filler_n_tp_updates"
+	Set gtmtypes("shm_snapshot_t",131,"off")=4796
 	Set gtmtypes("shm_snapshot_t",131,"len")=4
 	Set gtmtypes("shm_snapshot_t",131,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_tp_updates_duplicate")=131
-	Set gtmtypes("shm_snapshot_t",132,"name")="shm_snapshot_t.shadow_file_header.filler_accounting_64_align"
-	Set gtmtypes("shm_snapshot_t",132,"off")=4804
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_tp_updates")=131
+	Set gtmtypes("shm_snapshot_t",132,"name")="shm_snapshot_t.shadow_file_header.filler_n_tp_updates_duplicate"
+	Set gtmtypes("shm_snapshot_t",132,"off")=4800
 	Set gtmtypes("shm_snapshot_t",132,"len")=4
-	Set gtmtypes("shm_snapshot_t",132,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_accounting_64_align")=132
-	Set gtmtypes("shm_snapshot_t",133,"name")="shm_snapshot_t.shadow_file_header.staleness"
-	Set gtmtypes("shm_snapshot_t",133,"off")=4808
-	Set gtmtypes("shm_snapshot_t",133,"len")=8
-	Set gtmtypes("shm_snapshot_t",133,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.staleness")=133
-	Set gtmtypes("shm_snapshot_t",133,"dim")=2
-	Set gtmtypes("shm_snapshot_t",134,"name")="shm_snapshot_t.shadow_file_header.ccp_tick_interval"
-	Set gtmtypes("shm_snapshot_t",134,"off")=4816
+	Set gtmtypes("shm_snapshot_t",132,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_tp_updates_duplicate")=132
+	Set gtmtypes("shm_snapshot_t",133,"name")="shm_snapshot_t.shadow_file_header.filler_accounting_64_align"
+	Set gtmtypes("shm_snapshot_t",133,"off")=4804
+	Set gtmtypes("shm_snapshot_t",133,"len")=4
+	Set gtmtypes("shm_snapshot_t",133,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_accounting_64_align")=133
+	Set gtmtypes("shm_snapshot_t",134,"name")="shm_snapshot_t.shadow_file_header.staleness"
+	Set gtmtypes("shm_snapshot_t",134,"off")=4808
 	Set gtmtypes("shm_snapshot_t",134,"len")=8
 	Set gtmtypes("shm_snapshot_t",134,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.ccp_tick_interval")=134
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.staleness")=134
 	Set gtmtypes("shm_snapshot_t",134,"dim")=2
-	Set gtmtypes("shm_snapshot_t",135,"name")="shm_snapshot_t.shadow_file_header.ccp_quantum_interval"
-	Set gtmtypes("shm_snapshot_t",135,"off")=4824
+	Set gtmtypes("shm_snapshot_t",135,"name")="shm_snapshot_t.shadow_file_header.ccp_tick_interval"
+	Set gtmtypes("shm_snapshot_t",135,"off")=4816
 	Set gtmtypes("shm_snapshot_t",135,"len")=8
 	Set gtmtypes("shm_snapshot_t",135,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.ccp_quantum_interval")=135
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.ccp_tick_interval")=135
 	Set gtmtypes("shm_snapshot_t",135,"dim")=2
-	Set gtmtypes("shm_snapshot_t",136,"name")="shm_snapshot_t.shadow_file_header.ccp_response_interval"
-	Set gtmtypes("shm_snapshot_t",136,"off")=4832
+	Set gtmtypes("shm_snapshot_t",136,"name")="shm_snapshot_t.shadow_file_header.ccp_quantum_interval"
+	Set gtmtypes("shm_snapshot_t",136,"off")=4824
 	Set gtmtypes("shm_snapshot_t",136,"len")=8
 	Set gtmtypes("shm_snapshot_t",136,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.ccp_response_interval")=136
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.ccp_quantum_interval")=136
 	Set gtmtypes("shm_snapshot_t",136,"dim")=2
-	Set gtmtypes("shm_snapshot_t",137,"name")="shm_snapshot_t.shadow_file_header.ccp_jnl_before"
-	Set gtmtypes("shm_snapshot_t",137,"off")=4840
-	Set gtmtypes("shm_snapshot_t",137,"len")=4
-	Set gtmtypes("shm_snapshot_t",137,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.ccp_jnl_before")=137
-	Set gtmtypes("shm_snapshot_t",138,"name")="shm_snapshot_t.shadow_file_header.clustered"
-	Set gtmtypes("shm_snapshot_t",138,"off")=4844
+	Set gtmtypes("shm_snapshot_t",137,"name")="shm_snapshot_t.shadow_file_header.ccp_response_interval"
+	Set gtmtypes("shm_snapshot_t",137,"off")=4832
+	Set gtmtypes("shm_snapshot_t",137,"len")=8
+	Set gtmtypes("shm_snapshot_t",137,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.ccp_response_interval")=137
+	Set gtmtypes("shm_snapshot_t",137,"dim")=2
+	Set gtmtypes("shm_snapshot_t",138,"name")="shm_snapshot_t.shadow_file_header.ccp_jnl_before"
+	Set gtmtypes("shm_snapshot_t",138,"off")=4840
 	Set gtmtypes("shm_snapshot_t",138,"len")=4
 	Set gtmtypes("shm_snapshot_t",138,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.clustered")=138
-	Set gtmtypes("shm_snapshot_t",139,"name")="shm_snapshot_t.shadow_file_header.unbacked_cache"
-	Set gtmtypes("shm_snapshot_t",139,"off")=4848
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.ccp_jnl_before")=138
+	Set gtmtypes("shm_snapshot_t",139,"name")="shm_snapshot_t.shadow_file_header.clustered"
+	Set gtmtypes("shm_snapshot_t",139,"off")=4844
 	Set gtmtypes("shm_snapshot_t",139,"len")=4
 	Set gtmtypes("shm_snapshot_t",139,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.unbacked_cache")=139
-	Set gtmtypes("shm_snapshot_t",140,"name")="shm_snapshot_t.shadow_file_header.rc_srv_cnt"
-	Set gtmtypes("shm_snapshot_t",140,"off")=4852
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.clustered")=139
+	Set gtmtypes("shm_snapshot_t",140,"name")="shm_snapshot_t.shadow_file_header.unbacked_cache"
+	Set gtmtypes("shm_snapshot_t",140,"off")=4848
 	Set gtmtypes("shm_snapshot_t",140,"len")=4
-	Set gtmtypes("shm_snapshot_t",140,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.rc_srv_cnt")=140
-	Set gtmtypes("shm_snapshot_t",141,"name")="shm_snapshot_t.shadow_file_header.dsid"
-	Set gtmtypes("shm_snapshot_t",141,"off")=4856
+	Set gtmtypes("shm_snapshot_t",140,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.unbacked_cache")=140
+	Set gtmtypes("shm_snapshot_t",141,"name")="shm_snapshot_t.shadow_file_header.rc_srv_cnt"
+	Set gtmtypes("shm_snapshot_t",141,"off")=4852
 	Set gtmtypes("shm_snapshot_t",141,"len")=4
 	Set gtmtypes("shm_snapshot_t",141,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.dsid")=141
-	Set gtmtypes("shm_snapshot_t",142,"name")="shm_snapshot_t.shadow_file_header.rc_node"
-	Set gtmtypes("shm_snapshot_t",142,"off")=4860
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.rc_srv_cnt")=141
+	Set gtmtypes("shm_snapshot_t",142,"name")="shm_snapshot_t.shadow_file_header.dsid"
+	Set gtmtypes("shm_snapshot_t",142,"off")=4856
 	Set gtmtypes("shm_snapshot_t",142,"len")=4
 	Set gtmtypes("shm_snapshot_t",142,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.rc_node")=142
-	Set gtmtypes("shm_snapshot_t",143,"name")="shm_snapshot_t.shadow_file_header.filler_ccp_rc"
-	Set gtmtypes("shm_snapshot_t",143,"off")=4864
-	Set gtmtypes("shm_snapshot_t",143,"len")=8
-	Set gtmtypes("shm_snapshot_t",143,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_ccp_rc")=143
-	Set gtmtypes("shm_snapshot_t",144,"name")="shm_snapshot_t.shadow_file_header.reg_seqno"
-	Set gtmtypes("shm_snapshot_t",144,"off")=4872
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.dsid")=142
+	Set gtmtypes("shm_snapshot_t",143,"name")="shm_snapshot_t.shadow_file_header.rc_node"
+	Set gtmtypes("shm_snapshot_t",143,"off")=4860
+	Set gtmtypes("shm_snapshot_t",143,"len")=4
+	Set gtmtypes("shm_snapshot_t",143,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.rc_node")=143
+	Set gtmtypes("shm_snapshot_t",144,"name")="shm_snapshot_t.shadow_file_header.filler_ccp_rc"
+	Set gtmtypes("shm_snapshot_t",144,"off")=4864
 	Set gtmtypes("shm_snapshot_t",144,"len")=8
-	Set gtmtypes("shm_snapshot_t",144,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reg_seqno")=144
-	Set gtmtypes("shm_snapshot_t",145,"name")="shm_snapshot_t.shadow_file_header.pre_multisite_resync_seqno"
-	Set gtmtypes("shm_snapshot_t",145,"off")=4880
+	Set gtmtypes("shm_snapshot_t",144,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_ccp_rc")=144
+	Set gtmtypes("shm_snapshot_t",145,"name")="shm_snapshot_t.shadow_file_header.reg_seqno"
+	Set gtmtypes("shm_snapshot_t",145,"off")=4872
 	Set gtmtypes("shm_snapshot_t",145,"len")=8
 	Set gtmtypes("shm_snapshot_t",145,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.pre_multisite_resync_seqno")=145
-	Set gtmtypes("shm_snapshot_t",146,"name")="shm_snapshot_t.shadow_file_header.zqgblmod_tn"
-	Set gtmtypes("shm_snapshot_t",146,"off")=4888
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reg_seqno")=145
+	Set gtmtypes("shm_snapshot_t",146,"name")="shm_snapshot_t.shadow_file_header.pre_multisite_resync_seqno"
+	Set gtmtypes("shm_snapshot_t",146,"off")=4880
 	Set gtmtypes("shm_snapshot_t",146,"len")=8
 	Set gtmtypes("shm_snapshot_t",146,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.zqgblmod_tn")=146
-	Set gtmtypes("shm_snapshot_t",147,"name")="shm_snapshot_t.shadow_file_header.zqgblmod_seqno"
-	Set gtmtypes("shm_snapshot_t",147,"off")=4896
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.pre_multisite_resync_seqno")=146
+	Set gtmtypes("shm_snapshot_t",147,"name")="shm_snapshot_t.shadow_file_header.zqgblmod_tn"
+	Set gtmtypes("shm_snapshot_t",147,"off")=4888
 	Set gtmtypes("shm_snapshot_t",147,"len")=8
 	Set gtmtypes("shm_snapshot_t",147,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.zqgblmod_seqno")=147
-	Set gtmtypes("shm_snapshot_t",148,"name")="shm_snapshot_t.shadow_file_header.repl_state"
-	Set gtmtypes("shm_snapshot_t",148,"off")=4904
-	Set gtmtypes("shm_snapshot_t",148,"len")=4
-	Set gtmtypes("shm_snapshot_t",148,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.repl_state")=148
-	Set gtmtypes("shm_snapshot_t",149,"name")="shm_snapshot_t.shadow_file_header.multi_site_open"
-	Set gtmtypes("shm_snapshot_t",149,"off")=4908
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.zqgblmod_tn")=147
+	Set gtmtypes("shm_snapshot_t",148,"name")="shm_snapshot_t.shadow_file_header.zqgblmod_seqno"
+	Set gtmtypes("shm_snapshot_t",148,"off")=4896
+	Set gtmtypes("shm_snapshot_t",148,"len")=8
+	Set gtmtypes("shm_snapshot_t",148,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.zqgblmod_seqno")=148
+	Set gtmtypes("shm_snapshot_t",149,"name")="shm_snapshot_t.shadow_file_header.repl_state"
+	Set gtmtypes("shm_snapshot_t",149,"off")=4904
 	Set gtmtypes("shm_snapshot_t",149,"len")=4
-	Set gtmtypes("shm_snapshot_t",149,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.multi_site_open")=149
-	Set gtmtypes("shm_snapshot_t",150,"name")="shm_snapshot_t.shadow_file_header.filler_seqno"
-	Set gtmtypes("shm_snapshot_t",150,"off")=4912
-	Set gtmtypes("shm_snapshot_t",150,"len")=8
-	Set gtmtypes("shm_snapshot_t",150,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_seqno")=150
-	Set gtmtypes("shm_snapshot_t",151,"name")="shm_snapshot_t.shadow_file_header.filler_repl"
-	Set gtmtypes("shm_snapshot_t",151,"off")=4920
-	Set gtmtypes("shm_snapshot_t",151,"len")=16
-	Set gtmtypes("shm_snapshot_t",151,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_repl")=151
-	Set gtmtypes("shm_snapshot_t",152,"name")="shm_snapshot_t.shadow_file_header.filler_n_tp_retries"
-	Set gtmtypes("shm_snapshot_t",152,"off")=4936
-	Set gtmtypes("shm_snapshot_t",152,"len")=48
-	Set gtmtypes("shm_snapshot_t",152,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_tp_retries")=152
-	Set gtmtypes("shm_snapshot_t",152,"dim")=12
-	Set gtmtypes("shm_snapshot_t",153,"name")="shm_snapshot_t.shadow_file_header.filler_n_tp_retries_conflicts"
-	Set gtmtypes("shm_snapshot_t",153,"off")=4984
+	Set gtmtypes("shm_snapshot_t",149,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.repl_state")=149
+	Set gtmtypes("shm_snapshot_t",150,"name")="shm_snapshot_t.shadow_file_header.multi_site_open"
+	Set gtmtypes("shm_snapshot_t",150,"off")=4908
+	Set gtmtypes("shm_snapshot_t",150,"len")=4
+	Set gtmtypes("shm_snapshot_t",150,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.multi_site_open")=150
+	Set gtmtypes("shm_snapshot_t",151,"name")="shm_snapshot_t.shadow_file_header.filler_seqno"
+	Set gtmtypes("shm_snapshot_t",151,"off")=4912
+	Set gtmtypes("shm_snapshot_t",151,"len")=8
+	Set gtmtypes("shm_snapshot_t",151,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_seqno")=151
+	Set gtmtypes("shm_snapshot_t",152,"name")="shm_snapshot_t.shadow_file_header.filler_repl"
+	Set gtmtypes("shm_snapshot_t",152,"off")=4920
+	Set gtmtypes("shm_snapshot_t",152,"len")=16
+	Set gtmtypes("shm_snapshot_t",152,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_repl")=152
+	Set gtmtypes("shm_snapshot_t",153,"name")="shm_snapshot_t.shadow_file_header.filler_n_tp_retries"
+	Set gtmtypes("shm_snapshot_t",153,"off")=4936
 	Set gtmtypes("shm_snapshot_t",153,"len")=48
 	Set gtmtypes("shm_snapshot_t",153,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_tp_retries_conflicts")=153
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_tp_retries")=153
 	Set gtmtypes("shm_snapshot_t",153,"dim")=12
-	Set gtmtypes("shm_snapshot_t",154,"name")="shm_snapshot_t.shadow_file_header.tp_cdb_sc_blkmod"
-	Set gtmtypes("shm_snapshot_t",154,"off")=5032
-	Set gtmtypes("shm_snapshot_t",154,"len")=32
+	Set gtmtypes("shm_snapshot_t",154,"name")="shm_snapshot_t.shadow_file_header.filler_n_tp_retries_conflicts"
+	Set gtmtypes("shm_snapshot_t",154,"off")=4984
+	Set gtmtypes("shm_snapshot_t",154,"len")=48
 	Set gtmtypes("shm_snapshot_t",154,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.tp_cdb_sc_blkmod")=154
-	Set gtmtypes("shm_snapshot_t",154,"dim")=8
-	Set gtmtypes("shm_snapshot_t",155,"name")="shm_snapshot_t.shadow_file_header.jnl_alq"
-	Set gtmtypes("shm_snapshot_t",155,"off")=5064
-	Set gtmtypes("shm_snapshot_t",155,"len")=4
-	Set gtmtypes("shm_snapshot_t",155,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_alq")=155
-	Set gtmtypes("shm_snapshot_t",156,"name")="shm_snapshot_t.shadow_file_header.jnl_deq"
-	Set gtmtypes("shm_snapshot_t",156,"off")=5068
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_tp_retries_conflicts")=154
+	Set gtmtypes("shm_snapshot_t",154,"dim")=12
+	Set gtmtypes("shm_snapshot_t",155,"name")="shm_snapshot_t.shadow_file_header.tp_cdb_sc_blkmod"
+	Set gtmtypes("shm_snapshot_t",155,"off")=5032
+	Set gtmtypes("shm_snapshot_t",155,"len")=32
+	Set gtmtypes("shm_snapshot_t",155,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.tp_cdb_sc_blkmod")=155
+	Set gtmtypes("shm_snapshot_t",155,"dim")=8
+	Set gtmtypes("shm_snapshot_t",156,"name")="shm_snapshot_t.shadow_file_header.jnl_alq"
+	Set gtmtypes("shm_snapshot_t",156,"off")=5064
 	Set gtmtypes("shm_snapshot_t",156,"len")=4
 	Set gtmtypes("shm_snapshot_t",156,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_deq")=156
-	Set gtmtypes("shm_snapshot_t",157,"name")="shm_snapshot_t.shadow_file_header.jnl_buffer_size"
-	Set gtmtypes("shm_snapshot_t",157,"off")=5072
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_alq")=156
+	Set gtmtypes("shm_snapshot_t",157,"name")="shm_snapshot_t.shadow_file_header.jnl_deq"
+	Set gtmtypes("shm_snapshot_t",157,"off")=5068
 	Set gtmtypes("shm_snapshot_t",157,"len")=4
-	Set gtmtypes("shm_snapshot_t",157,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_buffer_size")=157
-	Set gtmtypes("shm_snapshot_t",158,"name")="shm_snapshot_t.shadow_file_header.jnl_before_image"
-	Set gtmtypes("shm_snapshot_t",158,"off")=5076
+	Set gtmtypes("shm_snapshot_t",157,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_deq")=157
+	Set gtmtypes("shm_snapshot_t",158,"name")="shm_snapshot_t.shadow_file_header.jnl_buffer_size"
+	Set gtmtypes("shm_snapshot_t",158,"off")=5072
 	Set gtmtypes("shm_snapshot_t",158,"len")=4
-	Set gtmtypes("shm_snapshot_t",158,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_before_image")=158
-	Set gtmtypes("shm_snapshot_t",159,"name")="shm_snapshot_t.shadow_file_header.jnl_state"
-	Set gtmtypes("shm_snapshot_t",159,"off")=5080
+	Set gtmtypes("shm_snapshot_t",158,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_buffer_size")=158
+	Set gtmtypes("shm_snapshot_t",159,"name")="shm_snapshot_t.shadow_file_header.jnl_before_image"
+	Set gtmtypes("shm_snapshot_t",159,"off")=5076
 	Set gtmtypes("shm_snapshot_t",159,"len")=4
-	Set gtmtypes("shm_snapshot_t",159,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_state")=159
-	Set gtmtypes("shm_snapshot_t",160,"name")="shm_snapshot_t.shadow_file_header.jnl_file_len"
-	Set gtmtypes("shm_snapshot_t",160,"off")=5084
+	Set gtmtypes("shm_snapshot_t",159,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_before_image")=159
+	Set gtmtypes("shm_snapshot_t",160,"name")="shm_snapshot_t.shadow_file_header.jnl_state"
+	Set gtmtypes("shm_snapshot_t",160,"off")=5080
 	Set gtmtypes("shm_snapshot_t",160,"len")=4
-	Set gtmtypes("shm_snapshot_t",160,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_file_len")=160
-	Set gtmtypes("shm_snapshot_t",161,"name")="shm_snapshot_t.shadow_file_header.autoswitchlimit"
-	Set gtmtypes("shm_snapshot_t",161,"off")=5088
+	Set gtmtypes("shm_snapshot_t",160,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_state")=160
+	Set gtmtypes("shm_snapshot_t",161,"name")="shm_snapshot_t.shadow_file_header.jnl_file_len"
+	Set gtmtypes("shm_snapshot_t",161,"off")=5084
 	Set gtmtypes("shm_snapshot_t",161,"len")=4
 	Set gtmtypes("shm_snapshot_t",161,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.autoswitchlimit")=161
-	Set gtmtypes("shm_snapshot_t",162,"name")="shm_snapshot_t.shadow_file_header.epoch_interval"
-	Set gtmtypes("shm_snapshot_t",162,"off")=5092
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_file_len")=161
+	Set gtmtypes("shm_snapshot_t",162,"name")="shm_snapshot_t.shadow_file_header.autoswitchlimit"
+	Set gtmtypes("shm_snapshot_t",162,"off")=5088
 	Set gtmtypes("shm_snapshot_t",162,"len")=4
-	Set gtmtypes("shm_snapshot_t",162,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.epoch_interval")=162
-	Set gtmtypes("shm_snapshot_t",163,"name")="shm_snapshot_t.shadow_file_header.alignsize"
-	Set gtmtypes("shm_snapshot_t",163,"off")=5096
+	Set gtmtypes("shm_snapshot_t",162,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.autoswitchlimit")=162
+	Set gtmtypes("shm_snapshot_t",163,"name")="shm_snapshot_t.shadow_file_header.epoch_interval"
+	Set gtmtypes("shm_snapshot_t",163,"off")=5092
 	Set gtmtypes("shm_snapshot_t",163,"len")=4
-	Set gtmtypes("shm_snapshot_t",163,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.alignsize")=163
-	Set gtmtypes("shm_snapshot_t",164,"name")="shm_snapshot_t.shadow_file_header.jnl_sync_io"
-	Set gtmtypes("shm_snapshot_t",164,"off")=5100
+	Set gtmtypes("shm_snapshot_t",163,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.epoch_interval")=163
+	Set gtmtypes("shm_snapshot_t",164,"name")="shm_snapshot_t.shadow_file_header.alignsize"
+	Set gtmtypes("shm_snapshot_t",164,"off")=5096
 	Set gtmtypes("shm_snapshot_t",164,"len")=4
-	Set gtmtypes("shm_snapshot_t",164,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_sync_io")=164
-	Set gtmtypes("shm_snapshot_t",165,"name")="shm_snapshot_t.shadow_file_header.yield_lmt"
-	Set gtmtypes("shm_snapshot_t",165,"off")=5104
+	Set gtmtypes("shm_snapshot_t",164,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.alignsize")=164
+	Set gtmtypes("shm_snapshot_t",165,"name")="shm_snapshot_t.shadow_file_header.jnl_sync_io"
+	Set gtmtypes("shm_snapshot_t",165,"off")=5100
 	Set gtmtypes("shm_snapshot_t",165,"len")=4
 	Set gtmtypes("shm_snapshot_t",165,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.yield_lmt")=165
-	Set gtmtypes("shm_snapshot_t",166,"name")="shm_snapshot_t.shadow_file_header.turn_around_point"
-	Set gtmtypes("shm_snapshot_t",166,"off")=5108
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_sync_io")=165
+	Set gtmtypes("shm_snapshot_t",166,"name")="shm_snapshot_t.shadow_file_header.yield_lmt"
+	Set gtmtypes("shm_snapshot_t",166,"off")=5104
 	Set gtmtypes("shm_snapshot_t",166,"len")=4
-	Set gtmtypes("shm_snapshot_t",166,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.turn_around_point")=166
-	Set gtmtypes("shm_snapshot_t",167,"name")="shm_snapshot_t.shadow_file_header.jnl_eovtn"
-	Set gtmtypes("shm_snapshot_t",167,"off")=5112
-	Set gtmtypes("shm_snapshot_t",167,"len")=8
-	Set gtmtypes("shm_snapshot_t",167,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_eovtn")=167
-	Set gtmtypes("shm_snapshot_t",168,"name")="shm_snapshot_t.shadow_file_header.filler_jnl"
-	Set gtmtypes("shm_snapshot_t",168,"off")=5120
+	Set gtmtypes("shm_snapshot_t",166,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.yield_lmt")=166
+	Set gtmtypes("shm_snapshot_t",167,"name")="shm_snapshot_t.shadow_file_header.turn_around_point"
+	Set gtmtypes("shm_snapshot_t",167,"off")=5108
+	Set gtmtypes("shm_snapshot_t",167,"len")=4
+	Set gtmtypes("shm_snapshot_t",167,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.turn_around_point")=167
+	Set gtmtypes("shm_snapshot_t",168,"name")="shm_snapshot_t.shadow_file_header.jnl_eovtn"
+	Set gtmtypes("shm_snapshot_t",168,"off")=5112
 	Set gtmtypes("shm_snapshot_t",168,"len")=8
-	Set gtmtypes("shm_snapshot_t",168,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_jnl")=168
-	Set gtmtypes("shm_snapshot_t",169,"name")="shm_snapshot_t.shadow_file_header.intrpt_recov_resync_seqno"
-	Set gtmtypes("shm_snapshot_t",169,"off")=5128
+	Set gtmtypes("shm_snapshot_t",168,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_eovtn")=168
+	Set gtmtypes("shm_snapshot_t",169,"name")="shm_snapshot_t.shadow_file_header.filler_jnl"
+	Set gtmtypes("shm_snapshot_t",169,"off")=5120
 	Set gtmtypes("shm_snapshot_t",169,"len")=8
-	Set gtmtypes("shm_snapshot_t",169,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.intrpt_recov_resync_seqno")=169
-	Set gtmtypes("shm_snapshot_t",170,"name")="shm_snapshot_t.shadow_file_header.intrpt_recov_tp_resolve_time"
-	Set gtmtypes("shm_snapshot_t",170,"off")=5136
-	Set gtmtypes("shm_snapshot_t",170,"len")=4
-	Set gtmtypes("shm_snapshot_t",170,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.intrpt_recov_tp_resolve_time")=170
-	Set gtmtypes("shm_snapshot_t",171,"name")="shm_snapshot_t.shadow_file_header.recov_interrupted"
-	Set gtmtypes("shm_snapshot_t",171,"off")=5140
+	Set gtmtypes("shm_snapshot_t",169,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_jnl")=169
+	Set gtmtypes("shm_snapshot_t",170,"name")="shm_snapshot_t.shadow_file_header.intrpt_recov_resync_seqno"
+	Set gtmtypes("shm_snapshot_t",170,"off")=5128
+	Set gtmtypes("shm_snapshot_t",170,"len")=8
+	Set gtmtypes("shm_snapshot_t",170,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.intrpt_recov_resync_seqno")=170
+	Set gtmtypes("shm_snapshot_t",171,"name")="shm_snapshot_t.shadow_file_header.intrpt_recov_tp_resolve_time"
+	Set gtmtypes("shm_snapshot_t",171,"off")=5136
 	Set gtmtypes("shm_snapshot_t",171,"len")=4
-	Set gtmtypes("shm_snapshot_t",171,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recov_interrupted")=171
-	Set gtmtypes("shm_snapshot_t",172,"name")="shm_snapshot_t.shadow_file_header.intrpt_recov_jnl_state"
-	Set gtmtypes("shm_snapshot_t",172,"off")=5144
+	Set gtmtypes("shm_snapshot_t",171,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.intrpt_recov_tp_resolve_time")=171
+	Set gtmtypes("shm_snapshot_t",172,"name")="shm_snapshot_t.shadow_file_header.recov_interrupted"
+	Set gtmtypes("shm_snapshot_t",172,"off")=5140
 	Set gtmtypes("shm_snapshot_t",172,"len")=4
-	Set gtmtypes("shm_snapshot_t",172,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.intrpt_recov_jnl_state")=172
-	Set gtmtypes("shm_snapshot_t",173,"name")="shm_snapshot_t.shadow_file_header.intrpt_recov_repl_state"
-	Set gtmtypes("shm_snapshot_t",173,"off")=5148
+	Set gtmtypes("shm_snapshot_t",172,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recov_interrupted")=172
+	Set gtmtypes("shm_snapshot_t",173,"name")="shm_snapshot_t.shadow_file_header.intrpt_recov_jnl_state"
+	Set gtmtypes("shm_snapshot_t",173,"off")=5144
 	Set gtmtypes("shm_snapshot_t",173,"len")=4
 	Set gtmtypes("shm_snapshot_t",173,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.intrpt_recov_repl_state")=173
-	Set gtmtypes("shm_snapshot_t",174,"name")="shm_snapshot_t.shadow_file_header.before_trunc_total_blks"
-	Set gtmtypes("shm_snapshot_t",174,"off")=5152
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.intrpt_recov_jnl_state")=173
+	Set gtmtypes("shm_snapshot_t",174,"name")="shm_snapshot_t.shadow_file_header.intrpt_recov_repl_state"
+	Set gtmtypes("shm_snapshot_t",174,"off")=5148
 	Set gtmtypes("shm_snapshot_t",174,"len")=4
-	Set gtmtypes("shm_snapshot_t",174,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.before_trunc_total_blks")=174
-	Set gtmtypes("shm_snapshot_t",175,"name")="shm_snapshot_t.shadow_file_header.after_trunc_total_blks"
-	Set gtmtypes("shm_snapshot_t",175,"off")=5156
+	Set gtmtypes("shm_snapshot_t",174,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.intrpt_recov_repl_state")=174
+	Set gtmtypes("shm_snapshot_t",175,"name")="shm_snapshot_t.shadow_file_header.before_trunc_total_blks"
+	Set gtmtypes("shm_snapshot_t",175,"off")=5152
 	Set gtmtypes("shm_snapshot_t",175,"len")=4
 	Set gtmtypes("shm_snapshot_t",175,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.after_trunc_total_blks")=175
-	Set gtmtypes("shm_snapshot_t",176,"name")="shm_snapshot_t.shadow_file_header.before_trunc_free_blocks"
-	Set gtmtypes("shm_snapshot_t",176,"off")=5160
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.before_trunc_total_blks")=175
+	Set gtmtypes("shm_snapshot_t",176,"name")="shm_snapshot_t.shadow_file_header.after_trunc_total_blks"
+	Set gtmtypes("shm_snapshot_t",176,"off")=5156
 	Set gtmtypes("shm_snapshot_t",176,"len")=4
 	Set gtmtypes("shm_snapshot_t",176,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.before_trunc_free_blocks")=176
-	Set gtmtypes("shm_snapshot_t",177,"name")="shm_snapshot_t.shadow_file_header.filler_trunc"
-	Set gtmtypes("shm_snapshot_t",177,"off")=5164
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.after_trunc_total_blks")=176
+	Set gtmtypes("shm_snapshot_t",177,"name")="shm_snapshot_t.shadow_file_header.before_trunc_free_blocks"
+	Set gtmtypes("shm_snapshot_t",177,"off")=5160
 	Set gtmtypes("shm_snapshot_t",177,"len")=4
 	Set gtmtypes("shm_snapshot_t",177,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_trunc")=177
-	Set gtmtypes("shm_snapshot_t",178,"name")="shm_snapshot_t.shadow_file_header.filler_1k"
-	Set gtmtypes("shm_snapshot_t",178,"off")=5168
-	Set gtmtypes("shm_snapshot_t",178,"len")=24
-	Set gtmtypes("shm_snapshot_t",178,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_1k")=178
-	Set gtmtypes("shm_snapshot_t",179,"name")="shm_snapshot_t.shadow_file_header.jnl_file_name"
-	Set gtmtypes("shm_snapshot_t",179,"off")=5192
-	Set gtmtypes("shm_snapshot_t",179,"len")=256
-	Set gtmtypes("shm_snapshot_t",179,"type")="unsigned-char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_file_name")=179
-	Set gtmtypes("shm_snapshot_t",180,"name")="shm_snapshot_t.shadow_file_header.reorg_restart_key"
-	Set gtmtypes("shm_snapshot_t",180,"off")=5448
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.before_trunc_free_blocks")=177
+	Set gtmtypes("shm_snapshot_t",178,"name")="shm_snapshot_t.shadow_file_header.filler_trunc"
+	Set gtmtypes("shm_snapshot_t",178,"off")=5164
+	Set gtmtypes("shm_snapshot_t",178,"len")=4
+	Set gtmtypes("shm_snapshot_t",178,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_trunc")=178
+	Set gtmtypes("shm_snapshot_t",179,"name")="shm_snapshot_t.shadow_file_header.filler_1k"
+	Set gtmtypes("shm_snapshot_t",179,"off")=5168
+	Set gtmtypes("shm_snapshot_t",179,"len")=24
+	Set gtmtypes("shm_snapshot_t",179,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_1k")=179
+	Set gtmtypes("shm_snapshot_t",180,"name")="shm_snapshot_t.shadow_file_header.jnl_file_name"
+	Set gtmtypes("shm_snapshot_t",180,"off")=5192
 	Set gtmtypes("shm_snapshot_t",180,"len")=256
 	Set gtmtypes("shm_snapshot_t",180,"type")="unsigned-char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reorg_restart_key")=180
-	Set gtmtypes("shm_snapshot_t",181,"name")="shm_snapshot_t.shadow_file_header.machine_name"
-	Set gtmtypes("shm_snapshot_t",181,"off")=5704
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_file_name")=180
+	Set gtmtypes("shm_snapshot_t",181,"name")="shm_snapshot_t.shadow_file_header.reorg_restart_key"
+	Set gtmtypes("shm_snapshot_t",181,"off")=5448
 	Set gtmtypes("shm_snapshot_t",181,"len")=256
-	Set gtmtypes("shm_snapshot_t",181,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.machine_name")=181
-	Set gtmtypes("shm_snapshot_t",182,"name")="shm_snapshot_t.shadow_file_header.encryption_hash"
-	Set gtmtypes("shm_snapshot_t",182,"off")=5960
-	Set gtmtypes("shm_snapshot_t",182,"len")=80
+	Set gtmtypes("shm_snapshot_t",181,"type")="unsigned-char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reorg_restart_key")=181
+	Set gtmtypes("shm_snapshot_t",182,"name")="shm_snapshot_t.shadow_file_header.machine_name"
+	Set gtmtypes("shm_snapshot_t",182,"off")=5704
+	Set gtmtypes("shm_snapshot_t",182,"len")=256
 	Set gtmtypes("shm_snapshot_t",182,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.encryption_hash")=182
-	Set gtmtypes("shm_snapshot_t",183,"name")="shm_snapshot_t.shadow_file_header.encryption_hash2"
-	Set gtmtypes("shm_snapshot_t",183,"off")=6040
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.machine_name")=182
+	Set gtmtypes("shm_snapshot_t",183,"name")="shm_snapshot_t.shadow_file_header.encryption_hash"
+	Set gtmtypes("shm_snapshot_t",183,"off")=5960
 	Set gtmtypes("shm_snapshot_t",183,"len")=80
 	Set gtmtypes("shm_snapshot_t",183,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.encryption_hash2")=183
-	Set gtmtypes("shm_snapshot_t",184,"name")="shm_snapshot_t.shadow_file_header.non_null_iv"
-	Set gtmtypes("shm_snapshot_t",184,"off")=6120
-	Set gtmtypes("shm_snapshot_t",184,"len")=4
-	Set gtmtypes("shm_snapshot_t",184,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.non_null_iv")=184
-	Set gtmtypes("shm_snapshot_t",185,"name")="shm_snapshot_t.shadow_file_header.encryption_hash_cutoff"
-	Set gtmtypes("shm_snapshot_t",185,"off")=6124
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.encryption_hash")=183
+	Set gtmtypes("shm_snapshot_t",184,"name")="shm_snapshot_t.shadow_file_header.encryption_hash2"
+	Set gtmtypes("shm_snapshot_t",184,"off")=6040
+	Set gtmtypes("shm_snapshot_t",184,"len")=80
+	Set gtmtypes("shm_snapshot_t",184,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.encryption_hash2")=184
+	Set gtmtypes("shm_snapshot_t",185,"name")="shm_snapshot_t.shadow_file_header.non_null_iv"
+	Set gtmtypes("shm_snapshot_t",185,"off")=6120
 	Set gtmtypes("shm_snapshot_t",185,"len")=4
-	Set gtmtypes("shm_snapshot_t",185,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.encryption_hash_cutoff")=185
-	Set gtmtypes("shm_snapshot_t",186,"name")="shm_snapshot_t.shadow_file_header.encryption_hash2_start_tn"
-	Set gtmtypes("shm_snapshot_t",186,"off")=6128
-	Set gtmtypes("shm_snapshot_t",186,"len")=8
-	Set gtmtypes("shm_snapshot_t",186,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.encryption_hash2_start_tn")=186
-	Set gtmtypes("shm_snapshot_t",187,"name")="shm_snapshot_t.shadow_file_header.filler_encrypt"
-	Set gtmtypes("shm_snapshot_t",187,"off")=6136
-	Set gtmtypes("shm_snapshot_t",187,"len")=80
-	Set gtmtypes("shm_snapshot_t",187,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_encrypt")=187
-	Set gtmtypes("shm_snapshot_t",188,"name")="shm_snapshot_t.shadow_file_header.total_buffer_flush_tn"
-	Set gtmtypes("shm_snapshot_t",188,"off")=6216
-	Set gtmtypes("shm_snapshot_t",188,"len")=8
-	Set gtmtypes("shm_snapshot_t",188,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.total_buffer_flush_tn")=188
-	Set gtmtypes("shm_snapshot_t",189,"name")="shm_snapshot_t.shadow_file_header.bufct_buffer_flush_tn"
-	Set gtmtypes("shm_snapshot_t",189,"off")=6224
+	Set gtmtypes("shm_snapshot_t",185,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.non_null_iv")=185
+	Set gtmtypes("shm_snapshot_t",186,"name")="shm_snapshot_t.shadow_file_header.encryption_hash_cutoff"
+	Set gtmtypes("shm_snapshot_t",186,"off")=6124
+	Set gtmtypes("shm_snapshot_t",186,"len")=4
+	Set gtmtypes("shm_snapshot_t",186,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.encryption_hash_cutoff")=186
+	Set gtmtypes("shm_snapshot_t",187,"name")="shm_snapshot_t.shadow_file_header.encryption_hash2_start_tn"
+	Set gtmtypes("shm_snapshot_t",187,"off")=6128
+	Set gtmtypes("shm_snapshot_t",187,"len")=8
+	Set gtmtypes("shm_snapshot_t",187,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.encryption_hash2_start_tn")=187
+	Set gtmtypes("shm_snapshot_t",188,"name")="shm_snapshot_t.shadow_file_header.filler_encrypt"
+	Set gtmtypes("shm_snapshot_t",188,"off")=6136
+	Set gtmtypes("shm_snapshot_t",188,"len")=80
+	Set gtmtypes("shm_snapshot_t",188,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_encrypt")=188
+	Set gtmtypes("shm_snapshot_t",189,"name")="shm_snapshot_t.shadow_file_header.total_buffer_flush_tn"
+	Set gtmtypes("shm_snapshot_t",189,"off")=6216
 	Set gtmtypes("shm_snapshot_t",189,"len")=8
 	Set gtmtypes("shm_snapshot_t",189,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bufct_buffer_flush_tn")=189
-	Set gtmtypes("shm_snapshot_t",190,"name")="shm_snapshot_t.shadow_file_header.bufct_buffer_flush_loop_tn"
-	Set gtmtypes("shm_snapshot_t",190,"off")=6232
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.total_buffer_flush_tn")=189
+	Set gtmtypes("shm_snapshot_t",190,"name")="shm_snapshot_t.shadow_file_header.bufct_buffer_flush_tn"
+	Set gtmtypes("shm_snapshot_t",190,"off")=6224
 	Set gtmtypes("shm_snapshot_t",190,"len")=8
 	Set gtmtypes("shm_snapshot_t",190,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bufct_buffer_flush_loop_tn")=190
-	Set gtmtypes("shm_snapshot_t",191,"name")="shm_snapshot_t.shadow_file_header.wrt_calls_tn"
-	Set gtmtypes("shm_snapshot_t",191,"off")=6240
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bufct_buffer_flush_tn")=190
+	Set gtmtypes("shm_snapshot_t",191,"name")="shm_snapshot_t.shadow_file_header.bufct_buffer_flush_loop_tn"
+	Set gtmtypes("shm_snapshot_t",191,"off")=6232
 	Set gtmtypes("shm_snapshot_t",191,"len")=8
 	Set gtmtypes("shm_snapshot_t",191,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_calls_tn")=191
-	Set gtmtypes("shm_snapshot_t",192,"name")="shm_snapshot_t.shadow_file_header.wrt_count_tn"
-	Set gtmtypes("shm_snapshot_t",192,"off")=6248
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bufct_buffer_flush_loop_tn")=191
+	Set gtmtypes("shm_snapshot_t",192,"name")="shm_snapshot_t.shadow_file_header.wrt_calls_tn"
+	Set gtmtypes("shm_snapshot_t",192,"off")=6240
 	Set gtmtypes("shm_snapshot_t",192,"len")=8
 	Set gtmtypes("shm_snapshot_t",192,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_count_tn")=192
-	Set gtmtypes("shm_snapshot_t",193,"name")="shm_snapshot_t.shadow_file_header.wrt_blocked_tn"
-	Set gtmtypes("shm_snapshot_t",193,"off")=6256
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_calls_tn")=192
+	Set gtmtypes("shm_snapshot_t",193,"name")="shm_snapshot_t.shadow_file_header.wrt_count_tn"
+	Set gtmtypes("shm_snapshot_t",193,"off")=6248
 	Set gtmtypes("shm_snapshot_t",193,"len")=8
 	Set gtmtypes("shm_snapshot_t",193,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_blocked_tn")=193
-	Set gtmtypes("shm_snapshot_t",194,"name")="shm_snapshot_t.shadow_file_header.wrt_busy_tn"
-	Set gtmtypes("shm_snapshot_t",194,"off")=6264
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_count_tn")=193
+	Set gtmtypes("shm_snapshot_t",194,"name")="shm_snapshot_t.shadow_file_header.wrt_blocked_tn"
+	Set gtmtypes("shm_snapshot_t",194,"off")=6256
 	Set gtmtypes("shm_snapshot_t",194,"len")=8
 	Set gtmtypes("shm_snapshot_t",194,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_busy_tn")=194
-	Set gtmtypes("shm_snapshot_t",195,"name")="shm_snapshot_t.shadow_file_header.wrt_noblks_wrtn_tn"
-	Set gtmtypes("shm_snapshot_t",195,"off")=6272
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_blocked_tn")=194
+	Set gtmtypes("shm_snapshot_t",195,"name")="shm_snapshot_t.shadow_file_header.wrt_busy_tn"
+	Set gtmtypes("shm_snapshot_t",195,"off")=6264
 	Set gtmtypes("shm_snapshot_t",195,"len")=8
 	Set gtmtypes("shm_snapshot_t",195,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_noblks_wrtn_tn")=195
-	Set gtmtypes("shm_snapshot_t",196,"name")="shm_snapshot_t.shadow_file_header.reserved_bgtrcrec1_tn"
-	Set gtmtypes("shm_snapshot_t",196,"off")=6280
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_busy_tn")=195
+	Set gtmtypes("shm_snapshot_t",196,"name")="shm_snapshot_t.shadow_file_header.wrt_noblks_wrtn_tn"
+	Set gtmtypes("shm_snapshot_t",196,"off")=6272
 	Set gtmtypes("shm_snapshot_t",196,"len")=8
 	Set gtmtypes("shm_snapshot_t",196,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reserved_bgtrcrec1_tn")=196
-	Set gtmtypes("shm_snapshot_t",197,"name")="shm_snapshot_t.shadow_file_header.reserved_bgtrcrec2_tn"
-	Set gtmtypes("shm_snapshot_t",197,"off")=6288
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_noblks_wrtn_tn")=196
+	Set gtmtypes("shm_snapshot_t",197,"name")="shm_snapshot_t.shadow_file_header.reserved_bgtrcrec1_tn"
+	Set gtmtypes("shm_snapshot_t",197,"off")=6280
 	Set gtmtypes("shm_snapshot_t",197,"len")=8
 	Set gtmtypes("shm_snapshot_t",197,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reserved_bgtrcrec2_tn")=197
-	Set gtmtypes("shm_snapshot_t",198,"name")="shm_snapshot_t.shadow_file_header.reserved_bgtrcrec3_tn"
-	Set gtmtypes("shm_snapshot_t",198,"off")=6296
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reserved_bgtrcrec1_tn")=197
+	Set gtmtypes("shm_snapshot_t",198,"name")="shm_snapshot_t.shadow_file_header.reserved_bgtrcrec2_tn"
+	Set gtmtypes("shm_snapshot_t",198,"off")=6288
 	Set gtmtypes("shm_snapshot_t",198,"len")=8
 	Set gtmtypes("shm_snapshot_t",198,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reserved_bgtrcrec3_tn")=198
-	Set gtmtypes("shm_snapshot_t",199,"name")="shm_snapshot_t.shadow_file_header.lost_block_recovery_tn"
-	Set gtmtypes("shm_snapshot_t",199,"off")=6304
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reserved_bgtrcrec2_tn")=198
+	Set gtmtypes("shm_snapshot_t",199,"name")="shm_snapshot_t.shadow_file_header.reserved_bgtrcrec3_tn"
+	Set gtmtypes("shm_snapshot_t",199,"off")=6296
 	Set gtmtypes("shm_snapshot_t",199,"len")=8
 	Set gtmtypes("shm_snapshot_t",199,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.lost_block_recovery_tn")=199
-	Set gtmtypes("shm_snapshot_t",200,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_onln_rlbk_tn"
-	Set gtmtypes("shm_snapshot_t",200,"off")=6312
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reserved_bgtrcrec3_tn")=199
+	Set gtmtypes("shm_snapshot_t",200,"name")="shm_snapshot_t.shadow_file_header.lost_block_recovery_tn"
+	Set gtmtypes("shm_snapshot_t",200,"off")=6304
 	Set gtmtypes("shm_snapshot_t",200,"len")=8
 	Set gtmtypes("shm_snapshot_t",200,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_onln_rlbk_tn")=200
-	Set gtmtypes("shm_snapshot_t",201,"name")="shm_snapshot_t.shadow_file_header.stale_tn"
-	Set gtmtypes("shm_snapshot_t",201,"off")=6320
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.lost_block_recovery_tn")=200
+	Set gtmtypes("shm_snapshot_t",201,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_onln_rlbk_tn"
+	Set gtmtypes("shm_snapshot_t",201,"off")=6312
 	Set gtmtypes("shm_snapshot_t",201,"len")=8
 	Set gtmtypes("shm_snapshot_t",201,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_tn")=201
-	Set gtmtypes("shm_snapshot_t",202,"name")="shm_snapshot_t.shadow_file_header.starved_tn"
-	Set gtmtypes("shm_snapshot_t",202,"off")=6328
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_onln_rlbk_tn")=201
+	Set gtmtypes("shm_snapshot_t",202,"name")="shm_snapshot_t.shadow_file_header.stale_tn"
+	Set gtmtypes("shm_snapshot_t",202,"off")=6320
 	Set gtmtypes("shm_snapshot_t",202,"len")=8
 	Set gtmtypes("shm_snapshot_t",202,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.starved_tn")=202
-	Set gtmtypes("shm_snapshot_t",203,"name")="shm_snapshot_t.shadow_file_header.stale_timer_started_tn"
-	Set gtmtypes("shm_snapshot_t",203,"off")=6336
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_tn")=202
+	Set gtmtypes("shm_snapshot_t",203,"name")="shm_snapshot_t.shadow_file_header.starved_tn"
+	Set gtmtypes("shm_snapshot_t",203,"off")=6328
 	Set gtmtypes("shm_snapshot_t",203,"len")=8
 	Set gtmtypes("shm_snapshot_t",203,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_timer_started_tn")=203
-	Set gtmtypes("shm_snapshot_t",204,"name")="shm_snapshot_t.shadow_file_header.stale_timer_pop_tn"
-	Set gtmtypes("shm_snapshot_t",204,"off")=6344
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.starved_tn")=203
+	Set gtmtypes("shm_snapshot_t",204,"name")="shm_snapshot_t.shadow_file_header.stale_timer_started_tn"
+	Set gtmtypes("shm_snapshot_t",204,"off")=6336
 	Set gtmtypes("shm_snapshot_t",204,"len")=8
 	Set gtmtypes("shm_snapshot_t",204,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_timer_pop_tn")=204
-	Set gtmtypes("shm_snapshot_t",205,"name")="shm_snapshot_t.shadow_file_header.stale_process_defer_tn"
-	Set gtmtypes("shm_snapshot_t",205,"off")=6352
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_timer_started_tn")=204
+	Set gtmtypes("shm_snapshot_t",205,"name")="shm_snapshot_t.shadow_file_header.stale_timer_pop_tn"
+	Set gtmtypes("shm_snapshot_t",205,"off")=6344
 	Set gtmtypes("shm_snapshot_t",205,"len")=8
 	Set gtmtypes("shm_snapshot_t",205,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_process_defer_tn")=205
-	Set gtmtypes("shm_snapshot_t",206,"name")="shm_snapshot_t.shadow_file_header.stale_defer_processed_tn"
-	Set gtmtypes("shm_snapshot_t",206,"off")=6360
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_timer_pop_tn")=205
+	Set gtmtypes("shm_snapshot_t",206,"name")="shm_snapshot_t.shadow_file_header.stale_process_defer_tn"
+	Set gtmtypes("shm_snapshot_t",206,"off")=6352
 	Set gtmtypes("shm_snapshot_t",206,"len")=8
 	Set gtmtypes("shm_snapshot_t",206,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_defer_processed_tn")=206
-	Set gtmtypes("shm_snapshot_t",207,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flush_tn"
-	Set gtmtypes("shm_snapshot_t",207,"off")=6368
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_process_defer_tn")=206
+	Set gtmtypes("shm_snapshot_t",207,"name")="shm_snapshot_t.shadow_file_header.stale_defer_processed_tn"
+	Set gtmtypes("shm_snapshot_t",207,"off")=6360
 	Set gtmtypes("shm_snapshot_t",207,"len")=8
 	Set gtmtypes("shm_snapshot_t",207,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flush_tn")=207
-	Set gtmtypes("shm_snapshot_t",208,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flush_loop_tn"
-	Set gtmtypes("shm_snapshot_t",208,"off")=6376
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_defer_processed_tn")=207
+	Set gtmtypes("shm_snapshot_t",208,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flush_tn"
+	Set gtmtypes("shm_snapshot_t",208,"off")=6368
 	Set gtmtypes("shm_snapshot_t",208,"len")=8
 	Set gtmtypes("shm_snapshot_t",208,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flush_loop_tn")=208
-	Set gtmtypes("shm_snapshot_t",209,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flush_retries_tn"
-	Set gtmtypes("shm_snapshot_t",209,"off")=6384
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flush_tn")=208
+	Set gtmtypes("shm_snapshot_t",209,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flush_loop_tn"
+	Set gtmtypes("shm_snapshot_t",209,"off")=6376
 	Set gtmtypes("shm_snapshot_t",209,"len")=8
 	Set gtmtypes("shm_snapshot_t",209,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flush_retries_tn")=209
-	Set gtmtypes("shm_snapshot_t",210,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flushed_during_lockwait_tn"
-	Set gtmtypes("shm_snapshot_t",210,"off")=6392
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flush_loop_tn")=209
+	Set gtmtypes("shm_snapshot_t",210,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flush_retries_tn"
+	Set gtmtypes("shm_snapshot_t",210,"off")=6384
 	Set gtmtypes("shm_snapshot_t",210,"len")=8
 	Set gtmtypes("shm_snapshot_t",210,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flushed_during_lockwait_tn")=210
-	Set gtmtypes("shm_snapshot_t",211,"name")="shm_snapshot_t.shadow_file_header.tp_crit_retries_tn"
-	Set gtmtypes("shm_snapshot_t",211,"off")=6400
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flush_retries_tn")=210
+	Set gtmtypes("shm_snapshot_t",211,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flushed_during_lockwait_tn"
+	Set gtmtypes("shm_snapshot_t",211,"off")=6392
 	Set gtmtypes("shm_snapshot_t",211,"len")=8
 	Set gtmtypes("shm_snapshot_t",211,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.tp_crit_retries_tn")=211
-	Set gtmtypes("shm_snapshot_t",212,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_flush_dirty_tn"
-	Set gtmtypes("shm_snapshot_t",212,"off")=6408
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flushed_during_lockwait_tn")=211
+	Set gtmtypes("shm_snapshot_t",212,"name")="shm_snapshot_t.shadow_file_header.tp_crit_retries_tn"
+	Set gtmtypes("shm_snapshot_t",212,"off")=6400
 	Set gtmtypes("shm_snapshot_t",212,"len")=8
 	Set gtmtypes("shm_snapshot_t",212,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_flush_dirty_tn")=212
-	Set gtmtypes("shm_snapshot_t",213,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_rip_wait_tn"
-	Set gtmtypes("shm_snapshot_t",213,"off")=6416
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.tp_crit_retries_tn")=212
+	Set gtmtypes("shm_snapshot_t",213,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_flush_dirty_tn"
+	Set gtmtypes("shm_snapshot_t",213,"off")=6408
 	Set gtmtypes("shm_snapshot_t",213,"len")=8
 	Set gtmtypes("shm_snapshot_t",213,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_rip_wait_tn")=213
-	Set gtmtypes("shm_snapshot_t",214,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_buf_owner_stuck_tn"
-	Set gtmtypes("shm_snapshot_t",214,"off")=6424
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_flush_dirty_tn")=213
+	Set gtmtypes("shm_snapshot_t",214,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_rip_wait_tn"
+	Set gtmtypes("shm_snapshot_t",214,"off")=6416
 	Set gtmtypes("shm_snapshot_t",214,"len")=8
 	Set gtmtypes("shm_snapshot_t",214,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_buf_owner_stuck_tn")=214
-	Set gtmtypes("shm_snapshot_t",215,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_out_of_design_tn"
-	Set gtmtypes("shm_snapshot_t",215,"off")=6432
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_rip_wait_tn")=214
+	Set gtmtypes("shm_snapshot_t",215,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_buf_owner_stuck_tn"
+	Set gtmtypes("shm_snapshot_t",215,"off")=6424
 	Set gtmtypes("shm_snapshot_t",215,"len")=8
 	Set gtmtypes("shm_snapshot_t",215,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_out_of_design_tn")=215
-	Set gtmtypes("shm_snapshot_t",216,"name")="shm_snapshot_t.shadow_file_header.t_qread_buf_owner_stuck_tn"
-	Set gtmtypes("shm_snapshot_t",216,"off")=6440
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_buf_owner_stuck_tn")=215
+	Set gtmtypes("shm_snapshot_t",216,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_out_of_design_tn"
+	Set gtmtypes("shm_snapshot_t",216,"off")=6432
 	Set gtmtypes("shm_snapshot_t",216,"len")=8
 	Set gtmtypes("shm_snapshot_t",216,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_buf_owner_stuck_tn")=216
-	Set gtmtypes("shm_snapshot_t",217,"name")="shm_snapshot_t.shadow_file_header.t_qread_out_of_design_tn"
-	Set gtmtypes("shm_snapshot_t",217,"off")=6448
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_out_of_design_tn")=216
+	Set gtmtypes("shm_snapshot_t",217,"name")="shm_snapshot_t.shadow_file_header.t_qread_buf_owner_stuck_tn"
+	Set gtmtypes("shm_snapshot_t",217,"off")=6440
 	Set gtmtypes("shm_snapshot_t",217,"len")=8
 	Set gtmtypes("shm_snapshot_t",217,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_out_of_design_tn")=217
-	Set gtmtypes("shm_snapshot_t",218,"name")="shm_snapshot_t.shadow_file_header.bt_put_flush_dirty_tn"
-	Set gtmtypes("shm_snapshot_t",218,"off")=6456
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_buf_owner_stuck_tn")=217
+	Set gtmtypes("shm_snapshot_t",218,"name")="shm_snapshot_t.shadow_file_header.t_qread_out_of_design_tn"
+	Set gtmtypes("shm_snapshot_t",218,"off")=6448
 	Set gtmtypes("shm_snapshot_t",218,"len")=8
 	Set gtmtypes("shm_snapshot_t",218,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bt_put_flush_dirty_tn")=218
-	Set gtmtypes("shm_snapshot_t",219,"name")="shm_snapshot_t.shadow_file_header.mlock_wakeups_tn"
-	Set gtmtypes("shm_snapshot_t",219,"off")=6464
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_out_of_design_tn")=218
+	Set gtmtypes("shm_snapshot_t",219,"name")="shm_snapshot_t.shadow_file_header.bt_put_flush_dirty_tn"
+	Set gtmtypes("shm_snapshot_t",219,"off")=6456
 	Set gtmtypes("shm_snapshot_t",219,"len")=8
 	Set gtmtypes("shm_snapshot_t",219,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.mlock_wakeups_tn")=219
-	Set gtmtypes("shm_snapshot_t",220,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_recover_invoked_tn"
-	Set gtmtypes("shm_snapshot_t",220,"off")=6472
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bt_put_flush_dirty_tn")=219
+	Set gtmtypes("shm_snapshot_t",220,"name")="shm_snapshot_t.shadow_file_header.mlock_wakeups_tn"
+	Set gtmtypes("shm_snapshot_t",220,"off")=6464
 	Set gtmtypes("shm_snapshot_t",220,"len")=8
 	Set gtmtypes("shm_snapshot_t",220,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_recover_invoked_tn")=220
-	Set gtmtypes("shm_snapshot_t",221,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_verify_passed_tn"
-	Set gtmtypes("shm_snapshot_t",221,"off")=6480
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.mlock_wakeups_tn")=220
+	Set gtmtypes("shm_snapshot_t",221,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_recover_invoked_tn"
+	Set gtmtypes("shm_snapshot_t",221,"off")=6472
 	Set gtmtypes("shm_snapshot_t",221,"len")=8
 	Set gtmtypes("shm_snapshot_t",221,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_verify_passed_tn")=221
-	Set gtmtypes("shm_snapshot_t",222,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_tn"
-	Set gtmtypes("shm_snapshot_t",222,"off")=6488
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_recover_invoked_tn")=221
+	Set gtmtypes("shm_snapshot_t",222,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_verify_passed_tn"
+	Set gtmtypes("shm_snapshot_t",222,"off")=6480
 	Set gtmtypes("shm_snapshot_t",222,"len")=8
 	Set gtmtypes("shm_snapshot_t",222,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_tn")=222
-	Set gtmtypes("shm_snapshot_t",223,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_tn"
-	Set gtmtypes("shm_snapshot_t",223,"off")=6496
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_verify_passed_tn")=222
+	Set gtmtypes("shm_snapshot_t",223,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_tn"
+	Set gtmtypes("shm_snapshot_t",223,"off")=6488
 	Set gtmtypes("shm_snapshot_t",223,"len")=8
 	Set gtmtypes("shm_snapshot_t",223,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_tn")=223
-	Set gtmtypes("shm_snapshot_t",224,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_db_csh_getn_loopexceed_tn"
-	Set gtmtypes("shm_snapshot_t",224,"off")=6504
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_tn")=223
+	Set gtmtypes("shm_snapshot_t",224,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_tn"
+	Set gtmtypes("shm_snapshot_t",224,"off")=6496
 	Set gtmtypes("shm_snapshot_t",224,"len")=8
 	Set gtmtypes("shm_snapshot_t",224,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_db_csh_getn_loopexceed_tn")=224
-	Set gtmtypes("shm_snapshot_t",225,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_tn"
-	Set gtmtypes("shm_snapshot_t",225,"off")=6512
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_tn")=224
+	Set gtmtypes("shm_snapshot_t",225,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_db_csh_getn_loopexceed_tn"
+	Set gtmtypes("shm_snapshot_t",225,"off")=6504
 	Set gtmtypes("shm_snapshot_t",225,"len")=8
 	Set gtmtypes("shm_snapshot_t",225,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_tn")=225
-	Set gtmtypes("shm_snapshot_t",226,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_db_csh_get_tn"
-	Set gtmtypes("shm_snapshot_t",226,"off")=6520
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_db_csh_getn_loopexceed_tn")=225
+	Set gtmtypes("shm_snapshot_t",226,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_tn"
+	Set gtmtypes("shm_snapshot_t",226,"off")=6512
 	Set gtmtypes("shm_snapshot_t",226,"len")=8
 	Set gtmtypes("shm_snapshot_t",226,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_db_csh_get_tn")=226
-	Set gtmtypes("shm_snapshot_t",227,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_wcsgetspace_tn"
-	Set gtmtypes("shm_snapshot_t",227,"off")=6528
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_tn")=226
+	Set gtmtypes("shm_snapshot_t",227,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_db_csh_get_tn"
+	Set gtmtypes("shm_snapshot_t",227,"off")=6520
 	Set gtmtypes("shm_snapshot_t",227,"len")=8
 	Set gtmtypes("shm_snapshot_t",227,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_wcsgetspace_tn")=227
-	Set gtmtypes("shm_snapshot_t",228,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_t1_tn"
-	Set gtmtypes("shm_snapshot_t",228,"off")=6536
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_db_csh_get_tn")=227
+	Set gtmtypes("shm_snapshot_t",228,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_wcsgetspace_tn"
+	Set gtmtypes("shm_snapshot_t",228,"off")=6528
 	Set gtmtypes("shm_snapshot_t",228,"len")=8
 	Set gtmtypes("shm_snapshot_t",228,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_t1_tn")=228
-	Set gtmtypes("shm_snapshot_t",229,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_bitmap_tn"
-	Set gtmtypes("shm_snapshot_t",229,"off")=6544
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_wcsgetspace_tn")=228
+	Set gtmtypes("shm_snapshot_t",229,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_t1_tn"
+	Set gtmtypes("shm_snapshot_t",229,"off")=6536
 	Set gtmtypes("shm_snapshot_t",229,"len")=8
 	Set gtmtypes("shm_snapshot_t",229,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_bitmap_tn")=229
-	Set gtmtypes("shm_snapshot_t",230,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_jnl_cwset_tn"
-	Set gtmtypes("shm_snapshot_t",230,"off")=6552
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_t1_tn")=229
+	Set gtmtypes("shm_snapshot_t",230,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_bitmap_tn"
+	Set gtmtypes("shm_snapshot_t",230,"off")=6544
 	Set gtmtypes("shm_snapshot_t",230,"len")=8
 	Set gtmtypes("shm_snapshot_t",230,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_jnl_cwset_tn")=230
-	Set gtmtypes("shm_snapshot_t",231,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_tn"
-	Set gtmtypes("shm_snapshot_t",231,"off")=6560
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_bitmap_tn")=230
+	Set gtmtypes("shm_snapshot_t",231,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_jnl_cwset_tn"
+	Set gtmtypes("shm_snapshot_t",231,"off")=6552
 	Set gtmtypes("shm_snapshot_t",231,"len")=8
 	Set gtmtypes("shm_snapshot_t",231,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_tn")=231
-	Set gtmtypes("shm_snapshot_t",232,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_hist_tn"
-	Set gtmtypes("shm_snapshot_t",232,"off")=6568
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_jnl_cwset_tn")=231
+	Set gtmtypes("shm_snapshot_t",232,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_tn"
+	Set gtmtypes("shm_snapshot_t",232,"off")=6560
 	Set gtmtypes("shm_snapshot_t",232,"len")=8
 	Set gtmtypes("shm_snapshot_t",232,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_hist_tn")=232
-	Set gtmtypes("shm_snapshot_t",233,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_hist1_nullbt_tn"
-	Set gtmtypes("shm_snapshot_t",233,"off")=6576
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_tn")=232
+	Set gtmtypes("shm_snapshot_t",233,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_hist_tn"
+	Set gtmtypes("shm_snapshot_t",233,"off")=6568
 	Set gtmtypes("shm_snapshot_t",233,"len")=8
 	Set gtmtypes("shm_snapshot_t",233,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_hist1_nullbt_tn")=233
-	Set gtmtypes("shm_snapshot_t",234,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_tn"
-	Set gtmtypes("shm_snapshot_t",234,"off")=6584
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_hist_tn")=233
+	Set gtmtypes("shm_snapshot_t",234,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_hist1_nullbt_tn"
+	Set gtmtypes("shm_snapshot_t",234,"off")=6576
 	Set gtmtypes("shm_snapshot_t",234,"len")=8
 	Set gtmtypes("shm_snapshot_t",234,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_tn")=234
-	Set gtmtypes("shm_snapshot_t",235,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_bitmap_nullbt_tn"
-	Set gtmtypes("shm_snapshot_t",235,"off")=6592
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_hist1_nullbt_tn")=234
+	Set gtmtypes("shm_snapshot_t",235,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_tn"
+	Set gtmtypes("shm_snapshot_t",235,"off")=6584
 	Set gtmtypes("shm_snapshot_t",235,"len")=8
 	Set gtmtypes("shm_snapshot_t",235,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_bitmap_nullbt_tn")=235
-	Set gtmtypes("shm_snapshot_t",236,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_tn"
-	Set gtmtypes("shm_snapshot_t",236,"off")=6600
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_tn")=235
+	Set gtmtypes("shm_snapshot_t",236,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_bitmap_nullbt_tn"
+	Set gtmtypes("shm_snapshot_t",236,"off")=6592
 	Set gtmtypes("shm_snapshot_t",236,"len")=8
 	Set gtmtypes("shm_snapshot_t",236,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_tn")=236
-	Set gtmtypes("shm_snapshot_t",237,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_jnl_cwset_tn"
-	Set gtmtypes("shm_snapshot_t",237,"off")=6608
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_bitmap_nullbt_tn")=236
+	Set gtmtypes("shm_snapshot_t",237,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_tn"
+	Set gtmtypes("shm_snapshot_t",237,"off")=6600
 	Set gtmtypes("shm_snapshot_t",237,"len")=8
 	Set gtmtypes("shm_snapshot_t",237,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_jnl_cwset_tn")=237
-	Set gtmtypes("shm_snapshot_t",238,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_jnl_wcsflu_tn"
-	Set gtmtypes("shm_snapshot_t",238,"off")=6616
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_tn")=237
+	Set gtmtypes("shm_snapshot_t",238,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_jnl_cwset_tn"
+	Set gtmtypes("shm_snapshot_t",238,"off")=6608
 	Set gtmtypes("shm_snapshot_t",238,"len")=8
 	Set gtmtypes("shm_snapshot_t",238,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_jnl_wcsflu_tn")=238
-	Set gtmtypes("shm_snapshot_t",239,"name")="shm_snapshot_t.shadow_file_header.db_csh_get_too_many_loops_tn"
-	Set gtmtypes("shm_snapshot_t",239,"off")=6624
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_jnl_cwset_tn")=238
+	Set gtmtypes("shm_snapshot_t",239,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_jnl_wcsflu_tn"
+	Set gtmtypes("shm_snapshot_t",239,"off")=6616
 	Set gtmtypes("shm_snapshot_t",239,"len")=8
 	Set gtmtypes("shm_snapshot_t",239,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_get_too_many_loops_tn")=239
-	Set gtmtypes("shm_snapshot_t",240,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tpckh_hist1_nullbt_tn"
-	Set gtmtypes("shm_snapshot_t",240,"off")=6632
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_jnl_wcsflu_tn")=239
+	Set gtmtypes("shm_snapshot_t",240,"name")="shm_snapshot_t.shadow_file_header.db_csh_get_too_many_loops_tn"
+	Set gtmtypes("shm_snapshot_t",240,"off")=6624
 	Set gtmtypes("shm_snapshot_t",240,"len")=8
 	Set gtmtypes("shm_snapshot_t",240,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tpckh_hist1_nullbt_tn")=240
-	Set gtmtypes("shm_snapshot_t",241,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_tn"
-	Set gtmtypes("shm_snapshot_t",241,"off")=6640
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_get_too_many_loops_tn")=240
+	Set gtmtypes("shm_snapshot_t",241,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tpckh_hist1_nullbt_tn"
+	Set gtmtypes("shm_snapshot_t",241,"off")=6632
 	Set gtmtypes("shm_snapshot_t",241,"len")=8
 	Set gtmtypes("shm_snapshot_t",241,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_tn")=241
-	Set gtmtypes("shm_snapshot_t",242,"name")="shm_snapshot_t.shadow_file_header.jnl_blocked_writer_lost_tn"
-	Set gtmtypes("shm_snapshot_t",242,"off")=6648
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tpckh_hist1_nullbt_tn")=241
+	Set gtmtypes("shm_snapshot_t",242,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_tn"
+	Set gtmtypes("shm_snapshot_t",242,"off")=6640
 	Set gtmtypes("shm_snapshot_t",242,"len")=8
 	Set gtmtypes("shm_snapshot_t",242,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_blocked_writer_lost_tn")=242
-	Set gtmtypes("shm_snapshot_t",243,"name")="shm_snapshot_t.shadow_file_header.jnl_blocked_writer_stuck_tn"
-	Set gtmtypes("shm_snapshot_t",243,"off")=6656
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_tn")=242
+	Set gtmtypes("shm_snapshot_t",243,"name")="shm_snapshot_t.shadow_file_header.jnl_blocked_writer_lost_tn"
+	Set gtmtypes("shm_snapshot_t",243,"off")=6648
 	Set gtmtypes("shm_snapshot_t",243,"len")=8
 	Set gtmtypes("shm_snapshot_t",243,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_blocked_writer_stuck_tn")=243
-	Set gtmtypes("shm_snapshot_t",244,"name")="shm_snapshot_t.shadow_file_header.jnl_blocked_writer_blocked_tn"
-	Set gtmtypes("shm_snapshot_t",244,"off")=6664
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_blocked_writer_lost_tn")=243
+	Set gtmtypes("shm_snapshot_t",244,"name")="shm_snapshot_t.shadow_file_header.jnl_blocked_writer_stuck_tn"
+	Set gtmtypes("shm_snapshot_t",244,"off")=6656
 	Set gtmtypes("shm_snapshot_t",244,"len")=8
 	Set gtmtypes("shm_snapshot_t",244,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_blocked_writer_blocked_tn")=244
-	Set gtmtypes("shm_snapshot_t",245,"name")="shm_snapshot_t.shadow_file_header.n_jnl_fsyncs_tn"
-	Set gtmtypes("shm_snapshot_t",245,"off")=6672
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_blocked_writer_stuck_tn")=244
+	Set gtmtypes("shm_snapshot_t",245,"name")="shm_snapshot_t.shadow_file_header.jnl_blocked_writer_blocked_tn"
+	Set gtmtypes("shm_snapshot_t",245,"off")=6664
 	Set gtmtypes("shm_snapshot_t",245,"len")=8
 	Set gtmtypes("shm_snapshot_t",245,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_jnl_fsyncs_tn")=245
-	Set gtmtypes("shm_snapshot_t",246,"name")="shm_snapshot_t.shadow_file_header.n_jnl_fsync_tries_tn"
-	Set gtmtypes("shm_snapshot_t",246,"off")=6680
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_blocked_writer_blocked_tn")=245
+	Set gtmtypes("shm_snapshot_t",246,"name")="shm_snapshot_t.shadow_file_header.n_jnl_fsyncs_tn"
+	Set gtmtypes("shm_snapshot_t",246,"off")=6672
 	Set gtmtypes("shm_snapshot_t",246,"len")=8
 	Set gtmtypes("shm_snapshot_t",246,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_jnl_fsync_tries_tn")=246
-	Set gtmtypes("shm_snapshot_t",247,"name")="shm_snapshot_t.shadow_file_header.n_jnl_fsync_recovers_tn"
-	Set gtmtypes("shm_snapshot_t",247,"off")=6688
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_jnl_fsyncs_tn")=246
+	Set gtmtypes("shm_snapshot_t",247,"name")="shm_snapshot_t.shadow_file_header.n_jnl_fsync_tries_tn"
+	Set gtmtypes("shm_snapshot_t",247,"off")=6680
 	Set gtmtypes("shm_snapshot_t",247,"len")=8
 	Set gtmtypes("shm_snapshot_t",247,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_jnl_fsync_recovers_tn")=247
-	Set gtmtypes("shm_snapshot_t",248,"name")="shm_snapshot_t.shadow_file_header.n_db_fsyncs_tn"
-	Set gtmtypes("shm_snapshot_t",248,"off")=6696
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_jnl_fsync_tries_tn")=247
+	Set gtmtypes("shm_snapshot_t",248,"name")="shm_snapshot_t.shadow_file_header.n_jnl_fsync_recovers_tn"
+	Set gtmtypes("shm_snapshot_t",248,"off")=6688
 	Set gtmtypes("shm_snapshot_t",248,"len")=8
 	Set gtmtypes("shm_snapshot_t",248,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_fsyncs_tn")=248
-	Set gtmtypes("shm_snapshot_t",249,"name")="shm_snapshot_t.shadow_file_header.n_db_fsyncs_in_crit_tn"
-	Set gtmtypes("shm_snapshot_t",249,"off")=6704
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_jnl_fsync_recovers_tn")=248
+	Set gtmtypes("shm_snapshot_t",249,"name")="shm_snapshot_t.shadow_file_header.n_db_fsyncs_tn"
+	Set gtmtypes("shm_snapshot_t",249,"off")=6696
 	Set gtmtypes("shm_snapshot_t",249,"len")=8
 	Set gtmtypes("shm_snapshot_t",249,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_fsyncs_in_crit_tn")=249
-	Set gtmtypes("shm_snapshot_t",250,"name")="shm_snapshot_t.shadow_file_header.n_dbsync_timers_tn"
-	Set gtmtypes("shm_snapshot_t",250,"off")=6712
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_fsyncs_tn")=249
+	Set gtmtypes("shm_snapshot_t",250,"name")="shm_snapshot_t.shadow_file_header.n_db_fsyncs_in_crit_tn"
+	Set gtmtypes("shm_snapshot_t",250,"off")=6704
 	Set gtmtypes("shm_snapshot_t",250,"len")=8
 	Set gtmtypes("shm_snapshot_t",250,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_dbsync_timers_tn")=250
-	Set gtmtypes("shm_snapshot_t",251,"name")="shm_snapshot_t.shadow_file_header.n_dbsync_writes_tn"
-	Set gtmtypes("shm_snapshot_t",251,"off")=6720
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_fsyncs_in_crit_tn")=250
+	Set gtmtypes("shm_snapshot_t",251,"name")="shm_snapshot_t.shadow_file_header.n_dbsync_timers_tn"
+	Set gtmtypes("shm_snapshot_t",251,"off")=6712
 	Set gtmtypes("shm_snapshot_t",251,"len")=8
 	Set gtmtypes("shm_snapshot_t",251,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_dbsync_writes_tn")=251
-	Set gtmtypes("shm_snapshot_t",252,"name")="shm_snapshot_t.shadow_file_header.mutex_queue_full_tn"
-	Set gtmtypes("shm_snapshot_t",252,"off")=6728
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_dbsync_timers_tn")=251
+	Set gtmtypes("shm_snapshot_t",252,"name")="shm_snapshot_t.shadow_file_header.n_dbsync_writes_tn"
+	Set gtmtypes("shm_snapshot_t",252,"off")=6720
 	Set gtmtypes("shm_snapshot_t",252,"len")=8
 	Set gtmtypes("shm_snapshot_t",252,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.mutex_queue_full_tn")=252
-	Set gtmtypes("shm_snapshot_t",253,"name")="shm_snapshot_t.shadow_file_header.wcb_bt_put_tn"
-	Set gtmtypes("shm_snapshot_t",253,"off")=6736
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_dbsync_writes_tn")=252
+	Set gtmtypes("shm_snapshot_t",253,"name")="shm_snapshot_t.shadow_file_header.mutex_queue_full_tn"
+	Set gtmtypes("shm_snapshot_t",253,"off")=6728
 	Set gtmtypes("shm_snapshot_t",253,"len")=8
 	Set gtmtypes("shm_snapshot_t",253,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_bt_put_tn")=253
-	Set gtmtypes("shm_snapshot_t",254,"name")="shm_snapshot_t.shadow_file_header.wcb_mutex_salvage_tn"
-	Set gtmtypes("shm_snapshot_t",254,"off")=6744
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.mutex_queue_full_tn")=253
+	Set gtmtypes("shm_snapshot_t",254,"name")="shm_snapshot_t.shadow_file_header.wcb_bt_put_tn"
+	Set gtmtypes("shm_snapshot_t",254,"off")=6736
 	Set gtmtypes("shm_snapshot_t",254,"len")=8
 	Set gtmtypes("shm_snapshot_t",254,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_mutex_salvage_tn")=254
-	Set gtmtypes("shm_snapshot_t",255,"name")="shm_snapshot_t.shadow_file_header.wcb_tp_grab_crit_tn"
-	Set gtmtypes("shm_snapshot_t",255,"off")=6752
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_bt_put_tn")=254
+	Set gtmtypes("shm_snapshot_t",255,"name")="shm_snapshot_t.shadow_file_header.wcb_mutex_salvage_tn"
+	Set gtmtypes("shm_snapshot_t",255,"off")=6744
 	Set gtmtypes("shm_snapshot_t",255,"len")=8
 	Set gtmtypes("shm_snapshot_t",255,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_tp_grab_crit_tn")=255
-	Set gtmtypes("shm_snapshot_t",256,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_nocr_invcr_tn"
-	Set gtmtypes("shm_snapshot_t",256,"off")=6760
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_mutex_salvage_tn")=255
+	Set gtmtypes("shm_snapshot_t",256,"name")="shm_snapshot_t.shadow_file_header.wcb_tp_grab_crit_tn"
+	Set gtmtypes("shm_snapshot_t",256,"off")=6752
 	Set gtmtypes("shm_snapshot_t",256,"len")=8
 	Set gtmtypes("shm_snapshot_t",256,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_nocr_invcr_tn")=256
-	Set gtmtypes("shm_snapshot_t",257,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_cr_invcr_tn"
-	Set gtmtypes("shm_snapshot_t",257,"off")=6768
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_tp_grab_crit_tn")=256
+	Set gtmtypes("shm_snapshot_t",257,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_nocr_invcr_tn"
+	Set gtmtypes("shm_snapshot_t",257,"off")=6760
 	Set gtmtypes("shm_snapshot_t",257,"len")=8
 	Set gtmtypes("shm_snapshot_t",257,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_cr_invcr_tn")=257
-	Set gtmtypes("shm_snapshot_t",258,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_rip_wait_tn"
-	Set gtmtypes("shm_snapshot_t",258,"off")=6776
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_nocr_invcr_tn")=257
+	Set gtmtypes("shm_snapshot_t",258,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_cr_invcr_tn"
+	Set gtmtypes("shm_snapshot_t",258,"off")=6768
 	Set gtmtypes("shm_snapshot_t",258,"len")=8
 	Set gtmtypes("shm_snapshot_t",258,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_rip_wait_tn")=258
-	Set gtmtypes("shm_snapshot_t",259,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirtyripwait_tn"
-	Set gtmtypes("shm_snapshot_t",259,"off")=6784
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_cr_invcr_tn")=258
+	Set gtmtypes("shm_snapshot_t",259,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_rip_wait_tn"
+	Set gtmtypes("shm_snapshot_t",259,"off")=6776
 	Set gtmtypes("shm_snapshot_t",259,"len")=8
 	Set gtmtypes("shm_snapshot_t",259,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirtyripwait_tn")=259
-	Set gtmtypes("shm_snapshot_t",260,"name")="shm_snapshot_t.shadow_file_header.wcb_gds_rundown_tn"
-	Set gtmtypes("shm_snapshot_t",260,"off")=6792
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_rip_wait_tn")=259
+	Set gtmtypes("shm_snapshot_t",260,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirtyripwait_tn"
+	Set gtmtypes("shm_snapshot_t",260,"off")=6784
 	Set gtmtypes("shm_snapshot_t",260,"len")=8
 	Set gtmtypes("shm_snapshot_t",260,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_gds_rundown_tn")=260
-	Set gtmtypes("shm_snapshot_t",261,"name")="shm_snapshot_t.shadow_file_header.wcb_wcs_flu1_tn"
-	Set gtmtypes("shm_snapshot_t",261,"off")=6800
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirtyripwait_tn")=260
+	Set gtmtypes("shm_snapshot_t",261,"name")="shm_snapshot_t.shadow_file_header.wcb_gds_rundown_tn"
+	Set gtmtypes("shm_snapshot_t",261,"off")=6792
 	Set gtmtypes("shm_snapshot_t",261,"len")=8
 	Set gtmtypes("shm_snapshot_t",261,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wcs_flu1_tn")=261
-	Set gtmtypes("shm_snapshot_t",262,"name")="shm_snapshot_t.shadow_file_header.wcb_mu_back_tn"
-	Set gtmtypes("shm_snapshot_t",262,"off")=6808
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_gds_rundown_tn")=261
+	Set gtmtypes("shm_snapshot_t",262,"name")="shm_snapshot_t.shadow_file_header.wcb_wcs_flu1_tn"
+	Set gtmtypes("shm_snapshot_t",262,"off")=6800
 	Set gtmtypes("shm_snapshot_t",262,"len")=8
 	Set gtmtypes("shm_snapshot_t",262,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_mu_back_tn")=262
-	Set gtmtypes("shm_snapshot_t",263,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirty_invcr_tn"
-	Set gtmtypes("shm_snapshot_t",263,"off")=6816
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wcs_flu1_tn")=262
+	Set gtmtypes("shm_snapshot_t",263,"name")="shm_snapshot_t.shadow_file_header.wcb_mu_back_tn"
+	Set gtmtypes("shm_snapshot_t",263,"off")=6808
 	Set gtmtypes("shm_snapshot_t",263,"len")=8
 	Set gtmtypes("shm_snapshot_t",263,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirty_invcr_tn")=263
-	Set gtmtypes("shm_snapshot_t",264,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_wtfini_fail_tn"
-	Set gtmtypes("shm_snapshot_t",264,"off")=6824
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_mu_back_tn")=263
+	Set gtmtypes("shm_snapshot_t",264,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirty_invcr_tn"
+	Set gtmtypes("shm_snapshot_t",264,"off")=6816
 	Set gtmtypes("shm_snapshot_t",264,"len")=8
 	Set gtmtypes("shm_snapshot_t",264,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_wtfini_fail_tn")=264
-	Set gtmtypes("shm_snapshot_t",265,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_twin_stuck_tn"
-	Set gtmtypes("shm_snapshot_t",265,"off")=6832
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirty_invcr_tn")=264
+	Set gtmtypes("shm_snapshot_t",265,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_wtfini_fail_tn"
+	Set gtmtypes("shm_snapshot_t",265,"off")=6824
 	Set gtmtypes("shm_snapshot_t",265,"len")=8
 	Set gtmtypes("shm_snapshot_t",265,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_twin_stuck_tn")=265
-	Set gtmtypes("shm_snapshot_t",266,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_wrt_latch_stuck_tn"
-	Set gtmtypes("shm_snapshot_t",266,"off")=6840
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_wtfini_fail_tn")=265
+	Set gtmtypes("shm_snapshot_t",266,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_twin_stuck_tn"
+	Set gtmtypes("shm_snapshot_t",266,"off")=6832
 	Set gtmtypes("shm_snapshot_t",266,"len")=8
 	Set gtmtypes("shm_snapshot_t",266,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_wrt_latch_stuck_tn")=266
-	Set gtmtypes("shm_snapshot_t",267,"name")="shm_snapshot_t.shadow_file_header.wcb_secshr_db_clnup_now_crit_tn"
-	Set gtmtypes("shm_snapshot_t",267,"off")=6848
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_twin_stuck_tn")=266
+	Set gtmtypes("shm_snapshot_t",267,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_wrt_latch_stuck_tn"
+	Set gtmtypes("shm_snapshot_t",267,"off")=6840
 	Set gtmtypes("shm_snapshot_t",267,"len")=8
 	Set gtmtypes("shm_snapshot_t",267,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_secshr_db_clnup_now_crit_tn")=267
-	Set gtmtypes("shm_snapshot_t",268,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_bad_bt_index1_tn"
-	Set gtmtypes("shm_snapshot_t",268,"off")=6856
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_wrt_latch_stuck_tn")=267
+	Set gtmtypes("shm_snapshot_t",268,"name")="shm_snapshot_t.shadow_file_header.wcb_secshr_db_clnup_now_crit_tn"
+	Set gtmtypes("shm_snapshot_t",268,"off")=6848
 	Set gtmtypes("shm_snapshot_t",268,"len")=8
 	Set gtmtypes("shm_snapshot_t",268,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_bad_bt_index1_tn")=268
-	Set gtmtypes("shm_snapshot_t",269,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_bad_bt_index2_tn"
-	Set gtmtypes("shm_snapshot_t",269,"off")=6864
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_secshr_db_clnup_now_crit_tn")=268
+	Set gtmtypes("shm_snapshot_t",269,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_bad_bt_index1_tn"
+	Set gtmtypes("shm_snapshot_t",269,"off")=6856
 	Set gtmtypes("shm_snapshot_t",269,"len")=8
 	Set gtmtypes("shm_snapshot_t",269,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_bad_bt_index2_tn")=269
-	Set gtmtypes("shm_snapshot_t",270,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_crbtmismatch1_tn"
-	Set gtmtypes("shm_snapshot_t",270,"off")=6872
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_bad_bt_index1_tn")=269
+	Set gtmtypes("shm_snapshot_t",270,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_bad_bt_index2_tn"
+	Set gtmtypes("shm_snapshot_t",270,"off")=6864
 	Set gtmtypes("shm_snapshot_t",270,"len")=8
 	Set gtmtypes("shm_snapshot_t",270,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_crbtmismatch1_tn")=270
-	Set gtmtypes("shm_snapshot_t",271,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_crbtmismatch2_tn"
-	Set gtmtypes("shm_snapshot_t",271,"off")=6880
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_bad_bt_index2_tn")=270
+	Set gtmtypes("shm_snapshot_t",271,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_crbtmismatch1_tn"
+	Set gtmtypes("shm_snapshot_t",271,"off")=6872
 	Set gtmtypes("shm_snapshot_t",271,"len")=8
 	Set gtmtypes("shm_snapshot_t",271,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_crbtmismatch2_tn")=271
-	Set gtmtypes("shm_snapshot_t",272,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_crbtmismatch3_tn"
-	Set gtmtypes("shm_snapshot_t",272,"off")=6888
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_crbtmismatch1_tn")=271
+	Set gtmtypes("shm_snapshot_t",272,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_crbtmismatch2_tn"
+	Set gtmtypes("shm_snapshot_t",272,"off")=6880
 	Set gtmtypes("shm_snapshot_t",272,"len")=8
 	Set gtmtypes("shm_snapshot_t",272,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_crbtmismatch3_tn")=272
-	Set gtmtypes("shm_snapshot_t",273,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_tn"
-	Set gtmtypes("shm_snapshot_t",273,"off")=6896
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_crbtmismatch2_tn")=272
+	Set gtmtypes("shm_snapshot_t",273,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_crbtmismatch3_tn"
+	Set gtmtypes("shm_snapshot_t",273,"off")=6888
 	Set gtmtypes("shm_snapshot_t",273,"len")=8
 	Set gtmtypes("shm_snapshot_t",273,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_tn")=273
-	Set gtmtypes("shm_snapshot_t",274,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_tn"
-	Set gtmtypes("shm_snapshot_t",274,"off")=6904
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_crbtmismatch3_tn")=273
+	Set gtmtypes("shm_snapshot_t",274,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_tn"
+	Set gtmtypes("shm_snapshot_t",274,"off")=6896
 	Set gtmtypes("shm_snapshot_t",274,"len")=8
 	Set gtmtypes("shm_snapshot_t",274,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_tn")=274
-	Set gtmtypes("shm_snapshot_t",275,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_tn"
-	Set gtmtypes("shm_snapshot_t",275,"off")=6912
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_tn")=274
+	Set gtmtypes("shm_snapshot_t",275,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_tn"
+	Set gtmtypes("shm_snapshot_t",275,"off")=6904
 	Set gtmtypes("shm_snapshot_t",275,"len")=8
 	Set gtmtypes("shm_snapshot_t",275,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_tn")=275
-	Set gtmtypes("shm_snapshot_t",276,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_tn"
-	Set gtmtypes("shm_snapshot_t",276,"off")=6920
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_tn")=275
+	Set gtmtypes("shm_snapshot_t",276,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_tn"
+	Set gtmtypes("shm_snapshot_t",276,"off")=6912
 	Set gtmtypes("shm_snapshot_t",276,"len")=8
 	Set gtmtypes("shm_snapshot_t",276,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_tn")=276
-	Set gtmtypes("shm_snapshot_t",277,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_tn"
-	Set gtmtypes("shm_snapshot_t",277,"off")=6928
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_tn")=276
+	Set gtmtypes("shm_snapshot_t",277,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_tn"
+	Set gtmtypes("shm_snapshot_t",277,"off")=6920
 	Set gtmtypes("shm_snapshot_t",277,"len")=8
 	Set gtmtypes("shm_snapshot_t",277,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_tn")=277
-	Set gtmtypes("shm_snapshot_t",278,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_bt_get_tn"
-	Set gtmtypes("shm_snapshot_t",278,"off")=6936
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_tn")=277
+	Set gtmtypes("shm_snapshot_t",278,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_tn"
+	Set gtmtypes("shm_snapshot_t",278,"off")=6928
 	Set gtmtypes("shm_snapshot_t",278,"len")=8
 	Set gtmtypes("shm_snapshot_t",278,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_bt_get_tn")=278
-	Set gtmtypes("shm_snapshot_t",279,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_tn"
-	Set gtmtypes("shm_snapshot_t",279,"off")=6944
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_tn")=278
+	Set gtmtypes("shm_snapshot_t",279,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_bt_get_tn"
+	Set gtmtypes("shm_snapshot_t",279,"off")=6936
 	Set gtmtypes("shm_snapshot_t",279,"len")=8
 	Set gtmtypes("shm_snapshot_t",279,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_tn")=279
-	Set gtmtypes("shm_snapshot_t",280,"name")="shm_snapshot_t.shadow_file_header.wcb_bg_update_lckfail1_tn"
-	Set gtmtypes("shm_snapshot_t",280,"off")=6952
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_bt_get_tn")=279
+	Set gtmtypes("shm_snapshot_t",280,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_tn"
+	Set gtmtypes("shm_snapshot_t",280,"off")=6944
 	Set gtmtypes("shm_snapshot_t",280,"len")=8
 	Set gtmtypes("shm_snapshot_t",280,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_bg_update_lckfail1_tn")=280
-	Set gtmtypes("shm_snapshot_t",281,"name")="shm_snapshot_t.shadow_file_header.wcb_bg_update_lckfail2_tn"
-	Set gtmtypes("shm_snapshot_t",281,"off")=6960
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_tn")=280
+	Set gtmtypes("shm_snapshot_t",281,"name")="shm_snapshot_t.shadow_file_header.wcb_bg_update_lckfail1_tn"
+	Set gtmtypes("shm_snapshot_t",281,"off")=6952
 	Set gtmtypes("shm_snapshot_t",281,"len")=8
 	Set gtmtypes("shm_snapshot_t",281,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_bg_update_lckfail2_tn")=281
-	Set gtmtypes("shm_snapshot_t",282,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail1_tn"
-	Set gtmtypes("shm_snapshot_t",282,"off")=6968
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_bg_update_lckfail1_tn")=281
+	Set gtmtypes("shm_snapshot_t",282,"name")="shm_snapshot_t.shadow_file_header.wcb_bg_update_lckfail2_tn"
+	Set gtmtypes("shm_snapshot_t",282,"off")=6960
 	Set gtmtypes("shm_snapshot_t",282,"len")=8
 	Set gtmtypes("shm_snapshot_t",282,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail1_tn")=282
-	Set gtmtypes("shm_snapshot_t",283,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail2_tn"
-	Set gtmtypes("shm_snapshot_t",283,"off")=6976
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_bg_update_lckfail2_tn")=282
+	Set gtmtypes("shm_snapshot_t",283,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail1_tn"
+	Set gtmtypes("shm_snapshot_t",283,"off")=6968
 	Set gtmtypes("shm_snapshot_t",283,"len")=8
 	Set gtmtypes("shm_snapshot_t",283,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail2_tn")=283
-	Set gtmtypes("shm_snapshot_t",284,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail3_tn"
-	Set gtmtypes("shm_snapshot_t",284,"off")=6984
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail1_tn")=283
+	Set gtmtypes("shm_snapshot_t",284,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail2_tn"
+	Set gtmtypes("shm_snapshot_t",284,"off")=6976
 	Set gtmtypes("shm_snapshot_t",284,"len")=8
 	Set gtmtypes("shm_snapshot_t",284,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail3_tn")=284
-	Set gtmtypes("shm_snapshot_t",285,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail4_tn"
-	Set gtmtypes("shm_snapshot_t",285,"off")=6992
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail2_tn")=284
+	Set gtmtypes("shm_snapshot_t",285,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail3_tn"
+	Set gtmtypes("shm_snapshot_t",285,"off")=6984
 	Set gtmtypes("shm_snapshot_t",285,"len")=8
 	Set gtmtypes("shm_snapshot_t",285,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail4_tn")=285
-	Set gtmtypes("shm_snapshot_t",286,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail1_tn"
-	Set gtmtypes("shm_snapshot_t",286,"off")=7000
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail3_tn")=285
+	Set gtmtypes("shm_snapshot_t",286,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail4_tn"
+	Set gtmtypes("shm_snapshot_t",286,"off")=6992
 	Set gtmtypes("shm_snapshot_t",286,"len")=8
 	Set gtmtypes("shm_snapshot_t",286,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail1_tn")=286
-	Set gtmtypes("shm_snapshot_t",287,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail2_tn"
-	Set gtmtypes("shm_snapshot_t",287,"off")=7008
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail4_tn")=286
+	Set gtmtypes("shm_snapshot_t",287,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail1_tn"
+	Set gtmtypes("shm_snapshot_t",287,"off")=7000
 	Set gtmtypes("shm_snapshot_t",287,"len")=8
 	Set gtmtypes("shm_snapshot_t",287,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail2_tn")=287
-	Set gtmtypes("shm_snapshot_t",288,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail3_tn"
-	Set gtmtypes("shm_snapshot_t",288,"off")=7016
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail1_tn")=287
+	Set gtmtypes("shm_snapshot_t",288,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail2_tn"
+	Set gtmtypes("shm_snapshot_t",288,"off")=7008
 	Set gtmtypes("shm_snapshot_t",288,"len")=8
 	Set gtmtypes("shm_snapshot_t",288,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail3_tn")=288
-	Set gtmtypes("shm_snapshot_t",289,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail4_tn"
-	Set gtmtypes("shm_snapshot_t",289,"off")=7024
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail2_tn")=288
+	Set gtmtypes("shm_snapshot_t",289,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail3_tn"
+	Set gtmtypes("shm_snapshot_t",289,"off")=7016
 	Set gtmtypes("shm_snapshot_t",289,"len")=8
 	Set gtmtypes("shm_snapshot_t",289,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail4_tn")=289
-	Set gtmtypes("shm_snapshot_t",290,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirtystuck1_tn"
-	Set gtmtypes("shm_snapshot_t",290,"off")=7032
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail3_tn")=289
+	Set gtmtypes("shm_snapshot_t",290,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail4_tn"
+	Set gtmtypes("shm_snapshot_t",290,"off")=7024
 	Set gtmtypes("shm_snapshot_t",290,"len")=8
 	Set gtmtypes("shm_snapshot_t",290,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirtystuck1_tn")=290
-	Set gtmtypes("shm_snapshot_t",291,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirtystuck2_tn"
-	Set gtmtypes("shm_snapshot_t",291,"off")=7040
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail4_tn")=290
+	Set gtmtypes("shm_snapshot_t",291,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirtystuck1_tn"
+	Set gtmtypes("shm_snapshot_t",291,"off")=7032
 	Set gtmtypes("shm_snapshot_t",291,"len")=8
 	Set gtmtypes("shm_snapshot_t",291,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirtystuck2_tn")=291
-	Set gtmtypes("shm_snapshot_t",292,"name")="shm_snapshot_t.shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_tn"
-	Set gtmtypes("shm_snapshot_t",292,"off")=7048
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirtystuck1_tn")=291
+	Set gtmtypes("shm_snapshot_t",292,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirtystuck2_tn"
+	Set gtmtypes("shm_snapshot_t",292,"off")=7040
 	Set gtmtypes("shm_snapshot_t",292,"len")=8
 	Set gtmtypes("shm_snapshot_t",292,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_tn")=292
-	Set gtmtypes("shm_snapshot_t",293,"name")="shm_snapshot_t.shadow_file_header.dwngrd_refmts_syncio_tn"
-	Set gtmtypes("shm_snapshot_t",293,"off")=7056
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirtystuck2_tn")=292
+	Set gtmtypes("shm_snapshot_t",293,"name")="shm_snapshot_t.shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_tn"
+	Set gtmtypes("shm_snapshot_t",293,"off")=7048
 	Set gtmtypes("shm_snapshot_t",293,"len")=8
 	Set gtmtypes("shm_snapshot_t",293,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.dwngrd_refmts_syncio_tn")=293
-	Set gtmtypes("shm_snapshot_t",294,"name")="shm_snapshot_t.shadow_file_header.dwngrd_refmts_asyncio_tn"
-	Set gtmtypes("shm_snapshot_t",294,"off")=7064
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_tn")=293
+	Set gtmtypes("shm_snapshot_t",294,"name")="shm_snapshot_t.shadow_file_header.dwngrd_refmts_syncio_tn"
+	Set gtmtypes("shm_snapshot_t",294,"off")=7056
 	Set gtmtypes("shm_snapshot_t",294,"len")=8
 	Set gtmtypes("shm_snapshot_t",294,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.dwngrd_refmts_asyncio_tn")=294
-	Set gtmtypes("shm_snapshot_t",295,"name")="shm_snapshot_t.shadow_file_header.shmpool_refmt_harvests_tn"
-	Set gtmtypes("shm_snapshot_t",295,"off")=7072
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.dwngrd_refmts_syncio_tn")=294
+	Set gtmtypes("shm_snapshot_t",295,"name")="shm_snapshot_t.shadow_file_header.dwngrd_refmts_asyncio_tn"
+	Set gtmtypes("shm_snapshot_t",295,"off")=7064
 	Set gtmtypes("shm_snapshot_t",295,"len")=8
 	Set gtmtypes("shm_snapshot_t",295,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_refmt_harvests_tn")=295
-	Set gtmtypes("shm_snapshot_t",296,"name")="shm_snapshot_t.shadow_file_header.shmpool_recovery_tn"
-	Set gtmtypes("shm_snapshot_t",296,"off")=7080
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.dwngrd_refmts_asyncio_tn")=295
+	Set gtmtypes("shm_snapshot_t",296,"name")="shm_snapshot_t.shadow_file_header.shmpool_refmt_harvests_tn"
+	Set gtmtypes("shm_snapshot_t",296,"off")=7072
 	Set gtmtypes("shm_snapshot_t",296,"len")=8
 	Set gtmtypes("shm_snapshot_t",296,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_recovery_tn")=296
-	Set gtmtypes("shm_snapshot_t",297,"name")="shm_snapshot_t.shadow_file_header.shmpool_blkd_by_sdc_tn"
-	Set gtmtypes("shm_snapshot_t",297,"off")=7088
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_refmt_harvests_tn")=296
+	Set gtmtypes("shm_snapshot_t",297,"name")="shm_snapshot_t.shadow_file_header.shmpool_recovery_tn"
+	Set gtmtypes("shm_snapshot_t",297,"off")=7080
 	Set gtmtypes("shm_snapshot_t",297,"len")=8
 	Set gtmtypes("shm_snapshot_t",297,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_blkd_by_sdc_tn")=297
-	Set gtmtypes("shm_snapshot_t",298,"name")="shm_snapshot_t.shadow_file_header.shmpool_alloc_bbflush_tn"
-	Set gtmtypes("shm_snapshot_t",298,"off")=7096
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_recovery_tn")=297
+	Set gtmtypes("shm_snapshot_t",298,"name")="shm_snapshot_t.shadow_file_header.shmpool_blkd_by_sdc_tn"
+	Set gtmtypes("shm_snapshot_t",298,"off")=7088
 	Set gtmtypes("shm_snapshot_t",298,"len")=8
 	Set gtmtypes("shm_snapshot_t",298,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_alloc_bbflush_tn")=298
-	Set gtmtypes("shm_snapshot_t",299,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_released_replaced_tn"
-	Set gtmtypes("shm_snapshot_t",299,"off")=7104
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_blkd_by_sdc_tn")=298
+	Set gtmtypes("shm_snapshot_t",299,"name")="shm_snapshot_t.shadow_file_header.shmpool_alloc_bbflush_tn"
+	Set gtmtypes("shm_snapshot_t",299,"off")=7096
 	Set gtmtypes("shm_snapshot_t",299,"len")=8
 	Set gtmtypes("shm_snapshot_t",299,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_released_replaced_tn")=299
-	Set gtmtypes("shm_snapshot_t",300,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_released_io_complete_tn"
-	Set gtmtypes("shm_snapshot_t",300,"off")=7112
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_alloc_bbflush_tn")=299
+	Set gtmtypes("shm_snapshot_t",300,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_released_replaced_tn"
+	Set gtmtypes("shm_snapshot_t",300,"off")=7104
 	Set gtmtypes("shm_snapshot_t",300,"len")=8
 	Set gtmtypes("shm_snapshot_t",300,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_released_io_complete_tn")=300
-	Set gtmtypes("shm_snapshot_t",301,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_kept_tn"
-	Set gtmtypes("shm_snapshot_t",301,"off")=7120
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_released_replaced_tn")=300
+	Set gtmtypes("shm_snapshot_t",301,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_released_io_complete_tn"
+	Set gtmtypes("shm_snapshot_t",301,"off")=7112
 	Set gtmtypes("shm_snapshot_t",301,"len")=8
 	Set gtmtypes("shm_snapshot_t",301,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_kept_tn")=301
-	Set gtmtypes("shm_snapshot_t",302,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_ignored_tn"
-	Set gtmtypes("shm_snapshot_t",302,"off")=7128
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_released_io_complete_tn")=301
+	Set gtmtypes("shm_snapshot_t",302,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_kept_tn"
+	Set gtmtypes("shm_snapshot_t",302,"off")=7120
 	Set gtmtypes("shm_snapshot_t",302,"len")=8
 	Set gtmtypes("shm_snapshot_t",302,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_ignored_tn")=302
-	Set gtmtypes("shm_snapshot_t",303,"name")="shm_snapshot_t.shadow_file_header.refmt_blk_chk_blk_freed_tn"
-	Set gtmtypes("shm_snapshot_t",303,"off")=7136
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_kept_tn")=302
+	Set gtmtypes("shm_snapshot_t",303,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_ignored_tn"
+	Set gtmtypes("shm_snapshot_t",303,"off")=7128
 	Set gtmtypes("shm_snapshot_t",303,"len")=8
 	Set gtmtypes("shm_snapshot_t",303,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_blk_chk_blk_freed_tn")=303
-	Set gtmtypes("shm_snapshot_t",304,"name")="shm_snapshot_t.shadow_file_header.refmt_blk_chk_blk_kept_tn"
-	Set gtmtypes("shm_snapshot_t",304,"off")=7144
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_ignored_tn")=303
+	Set gtmtypes("shm_snapshot_t",304,"name")="shm_snapshot_t.shadow_file_header.refmt_blk_chk_blk_freed_tn"
+	Set gtmtypes("shm_snapshot_t",304,"off")=7136
 	Set gtmtypes("shm_snapshot_t",304,"len")=8
 	Set gtmtypes("shm_snapshot_t",304,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_blk_chk_blk_kept_tn")=304
-	Set gtmtypes("shm_snapshot_t",305,"name")="shm_snapshot_t.shadow_file_header.active_lvl_trigger_tn"
-	Set gtmtypes("shm_snapshot_t",305,"off")=7152
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_blk_chk_blk_freed_tn")=304
+	Set gtmtypes("shm_snapshot_t",305,"name")="shm_snapshot_t.shadow_file_header.refmt_blk_chk_blk_kept_tn"
+	Set gtmtypes("shm_snapshot_t",305,"off")=7144
 	Set gtmtypes("shm_snapshot_t",305,"len")=8
 	Set gtmtypes("shm_snapshot_t",305,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.active_lvl_trigger_tn")=305
-	Set gtmtypes("shm_snapshot_t",306,"name")="shm_snapshot_t.shadow_file_header.new_buff_tn"
-	Set gtmtypes("shm_snapshot_t",306,"off")=7160
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_blk_chk_blk_kept_tn")=305
+	Set gtmtypes("shm_snapshot_t",306,"name")="shm_snapshot_t.shadow_file_header.active_lvl_trigger_tn"
+	Set gtmtypes("shm_snapshot_t",306,"off")=7152
 	Set gtmtypes("shm_snapshot_t",306,"len")=8
 	Set gtmtypes("shm_snapshot_t",306,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.new_buff_tn")=306
-	Set gtmtypes("shm_snapshot_t",307,"name")="shm_snapshot_t.shadow_file_header.phase2_commit_wait_sleep_in_crit_tn"
-	Set gtmtypes("shm_snapshot_t",307,"off")=7168
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.active_lvl_trigger_tn")=306
+	Set gtmtypes("shm_snapshot_t",307,"name")="shm_snapshot_t.shadow_file_header.new_buff_tn"
+	Set gtmtypes("shm_snapshot_t",307,"off")=7160
 	Set gtmtypes("shm_snapshot_t",307,"len")=8
 	Set gtmtypes("shm_snapshot_t",307,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.phase2_commit_wait_sleep_in_crit_tn")=307
-	Set gtmtypes("shm_snapshot_t",308,"name")="shm_snapshot_t.shadow_file_header.phase2_commit_wait_sleep_no_crit_tn"
-	Set gtmtypes("shm_snapshot_t",308,"off")=7176
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.new_buff_tn")=307
+	Set gtmtypes("shm_snapshot_t",308,"name")="shm_snapshot_t.shadow_file_header.phase2_commit_wait_sleep_in_crit_tn"
+	Set gtmtypes("shm_snapshot_t",308,"off")=7168
 	Set gtmtypes("shm_snapshot_t",308,"len")=8
 	Set gtmtypes("shm_snapshot_t",308,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.phase2_commit_wait_sleep_no_crit_tn")=308
-	Set gtmtypes("shm_snapshot_t",309,"name")="shm_snapshot_t.shadow_file_header.phase2_commit_wait_pidcnt_tn"
-	Set gtmtypes("shm_snapshot_t",309,"off")=7184
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.phase2_commit_wait_sleep_in_crit_tn")=308
+	Set gtmtypes("shm_snapshot_t",309,"name")="shm_snapshot_t.shadow_file_header.phase2_commit_wait_sleep_no_crit_tn"
+	Set gtmtypes("shm_snapshot_t",309,"off")=7176
 	Set gtmtypes("shm_snapshot_t",309,"len")=8
 	Set gtmtypes("shm_snapshot_t",309,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.phase2_commit_wait_pidcnt_tn")=309
-	Set gtmtypes("shm_snapshot_t",310,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_intend_wait_tn"
-	Set gtmtypes("shm_snapshot_t",310,"off")=7192
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.phase2_commit_wait_sleep_no_crit_tn")=309
+	Set gtmtypes("shm_snapshot_t",310,"name")="shm_snapshot_t.shadow_file_header.phase2_commit_wait_pidcnt_tn"
+	Set gtmtypes("shm_snapshot_t",310,"off")=7184
 	Set gtmtypes("shm_snapshot_t",310,"len")=8
 	Set gtmtypes("shm_snapshot_t",310,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_intend_wait_tn")=310
-	Set gtmtypes("shm_snapshot_t",311,"name")="shm_snapshot_t.shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_tn"
-	Set gtmtypes("shm_snapshot_t",311,"off")=7200
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.phase2_commit_wait_pidcnt_tn")=310
+	Set gtmtypes("shm_snapshot_t",311,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_intend_wait_tn"
+	Set gtmtypes("shm_snapshot_t",311,"off")=7192
 	Set gtmtypes("shm_snapshot_t",311,"len")=8
 	Set gtmtypes("shm_snapshot_t",311,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_tn")=311
-	Set gtmtypes("shm_snapshot_t",312,"name")="shm_snapshot_t.shadow_file_header.wcb_phase2_commit_wait_tn"
-	Set gtmtypes("shm_snapshot_t",312,"off")=7208
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_intend_wait_tn")=311
+	Set gtmtypes("shm_snapshot_t",312,"name")="shm_snapshot_t.shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_tn"
+	Set gtmtypes("shm_snapshot_t",312,"off")=7200
 	Set gtmtypes("shm_snapshot_t",312,"len")=8
 	Set gtmtypes("shm_snapshot_t",312,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_phase2_commit_wait_tn")=312
-	Set gtmtypes("shm_snapshot_t",313,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_calls_tn"
-	Set gtmtypes("shm_snapshot_t",313,"off")=7216
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_tn")=312
+	Set gtmtypes("shm_snapshot_t",313,"name")="shm_snapshot_t.shadow_file_header.wcb_phase2_commit_wait_tn"
+	Set gtmtypes("shm_snapshot_t",313,"off")=7208
 	Set gtmtypes("shm_snapshot_t",313,"len")=8
 	Set gtmtypes("shm_snapshot_t",313,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_calls_tn")=313
-	Set gtmtypes("shm_snapshot_t",314,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_rip_tn"
-	Set gtmtypes("shm_snapshot_t",314,"off")=7224
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_phase2_commit_wait_tn")=313
+	Set gtmtypes("shm_snapshot_t",314,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_calls_tn"
+	Set gtmtypes("shm_snapshot_t",314,"off")=7216
 	Set gtmtypes("shm_snapshot_t",314,"len")=8
 	Set gtmtypes("shm_snapshot_t",314,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_rip_tn")=314
-	Set gtmtypes("shm_snapshot_t",315,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_in_tend_tn"
-	Set gtmtypes("shm_snapshot_t",315,"off")=7232
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_calls_tn")=314
+	Set gtmtypes("shm_snapshot_t",315,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_rip_tn"
+	Set gtmtypes("shm_snapshot_t",315,"off")=7224
 	Set gtmtypes("shm_snapshot_t",315,"len")=8
 	Set gtmtypes("shm_snapshot_t",315,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_in_tend_tn")=315
-	Set gtmtypes("shm_snapshot_t",316,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_search_blk_tn"
-	Set gtmtypes("shm_snapshot_t",316,"off")=7240
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_rip_tn")=315
+	Set gtmtypes("shm_snapshot_t",316,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_in_tend_tn"
+	Set gtmtypes("shm_snapshot_t",316,"off")=7232
 	Set gtmtypes("shm_snapshot_t",316,"len")=8
 	Set gtmtypes("shm_snapshot_t",316,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_search_blk_tn")=316
-	Set gtmtypes("shm_snapshot_t",317,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_new_rec_tn"
-	Set gtmtypes("shm_snapshot_t",317,"off")=7248
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_in_tend_tn")=316
+	Set gtmtypes("shm_snapshot_t",317,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_search_blk_tn"
+	Set gtmtypes("shm_snapshot_t",317,"off")=7240
 	Set gtmtypes("shm_snapshot_t",317,"len")=8
 	Set gtmtypes("shm_snapshot_t",317,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_new_rec_tn")=317
-	Set gtmtypes("shm_snapshot_t",318,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_rec_size_tn"
-	Set gtmtypes("shm_snapshot_t",318,"off")=7256
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_search_blk_tn")=317
+	Set gtmtypes("shm_snapshot_t",318,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_new_rec_tn"
+	Set gtmtypes("shm_snapshot_t",318,"off")=7248
 	Set gtmtypes("shm_snapshot_t",318,"len")=8
 	Set gtmtypes("shm_snapshot_t",318,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_rec_size_tn")=318
-	Set gtmtypes("shm_snapshot_t",319,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_rec_cmpc_tn"
-	Set gtmtypes("shm_snapshot_t",319,"off")=7264
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_new_rec_tn")=318
+	Set gtmtypes("shm_snapshot_t",319,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_rec_size_tn"
+	Set gtmtypes("shm_snapshot_t",319,"off")=7256
 	Set gtmtypes("shm_snapshot_t",319,"len")=8
 	Set gtmtypes("shm_snapshot_t",319,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_rec_cmpc_tn")=319
-	Set gtmtypes("shm_snapshot_t",320,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_blk_fini_tn"
-	Set gtmtypes("shm_snapshot_t",320,"off")=7272
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_rec_size_tn")=319
+	Set gtmtypes("shm_snapshot_t",320,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_rec_cmpc_tn"
+	Set gtmtypes("shm_snapshot_t",320,"off")=7264
 	Set gtmtypes("shm_snapshot_t",320,"len")=8
 	Set gtmtypes("shm_snapshot_t",320,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_blk_fini_tn")=320
-	Set gtmtypes("shm_snapshot_t",321,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_blk_split_tn"
-	Set gtmtypes("shm_snapshot_t",321,"off")=7280
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_rec_cmpc_tn")=320
+	Set gtmtypes("shm_snapshot_t",321,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_blk_fini_tn"
+	Set gtmtypes("shm_snapshot_t",321,"off")=7272
 	Set gtmtypes("shm_snapshot_t",321,"len")=8
 	Set gtmtypes("shm_snapshot_t",321,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_blk_split_tn")=321
-	Set gtmtypes("shm_snapshot_t",322,"name")="shm_snapshot_t.shadow_file_header.t_qread_ripsleep_cnt_tn"
-	Set gtmtypes("shm_snapshot_t",322,"off")=7288
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_blk_fini_tn")=321
+	Set gtmtypes("shm_snapshot_t",322,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_blk_split_tn"
+	Set gtmtypes("shm_snapshot_t",322,"off")=7280
 	Set gtmtypes("shm_snapshot_t",322,"len")=8
 	Set gtmtypes("shm_snapshot_t",322,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_ripsleep_cnt_tn")=322
-	Set gtmtypes("shm_snapshot_t",323,"name")="shm_snapshot_t.shadow_file_header.t_qread_ripsleep_nblks_tn"
-	Set gtmtypes("shm_snapshot_t",323,"off")=7296
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_blk_split_tn")=322
+	Set gtmtypes("shm_snapshot_t",323,"name")="shm_snapshot_t.shadow_file_header.t_qread_ripsleep_cnt_tn"
+	Set gtmtypes("shm_snapshot_t",323,"off")=7288
 	Set gtmtypes("shm_snapshot_t",323,"len")=8
 	Set gtmtypes("shm_snapshot_t",323,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_ripsleep_nblks_tn")=323
-	Set gtmtypes("shm_snapshot_t",324,"name")="shm_snapshot_t.shadow_file_header.bg_trc_rec_tn_filler"
-	Set gtmtypes("shm_snapshot_t",324,"off")=7304
-	Set gtmtypes("shm_snapshot_t",324,"len")=112
-	Set gtmtypes("shm_snapshot_t",324,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bg_trc_rec_tn_filler")=324
-	Set gtmtypes("shm_snapshot_t",325,"name")="shm_snapshot_t.shadow_file_header.total_buffer_flush_cntr"
-	Set gtmtypes("shm_snapshot_t",325,"off")=7416
-	Set gtmtypes("shm_snapshot_t",325,"len")=4
-	Set gtmtypes("shm_snapshot_t",325,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.total_buffer_flush_cntr")=325
-	Set gtmtypes("shm_snapshot_t",326,"name")="shm_snapshot_t.shadow_file_header.bufct_buffer_flush_cntr"
-	Set gtmtypes("shm_snapshot_t",326,"off")=7420
-	Set gtmtypes("shm_snapshot_t",326,"len")=4
-	Set gtmtypes("shm_snapshot_t",326,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bufct_buffer_flush_cntr")=326
-	Set gtmtypes("shm_snapshot_t",327,"name")="shm_snapshot_t.shadow_file_header.bufct_buffer_flush_loop_cntr"
-	Set gtmtypes("shm_snapshot_t",327,"off")=7424
-	Set gtmtypes("shm_snapshot_t",327,"len")=4
-	Set gtmtypes("shm_snapshot_t",327,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bufct_buffer_flush_loop_cntr")=327
-	Set gtmtypes("shm_snapshot_t",328,"name")="shm_snapshot_t.shadow_file_header.wrt_calls_cntr"
-	Set gtmtypes("shm_snapshot_t",328,"off")=7428
-	Set gtmtypes("shm_snapshot_t",328,"len")=4
-	Set gtmtypes("shm_snapshot_t",328,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_calls_cntr")=328
-	Set gtmtypes("shm_snapshot_t",329,"name")="shm_snapshot_t.shadow_file_header.wrt_count_cntr"
-	Set gtmtypes("shm_snapshot_t",329,"off")=7432
-	Set gtmtypes("shm_snapshot_t",329,"len")=4
-	Set gtmtypes("shm_snapshot_t",329,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_count_cntr")=329
-	Set gtmtypes("shm_snapshot_t",330,"name")="shm_snapshot_t.shadow_file_header.wrt_blocked_cntr"
-	Set gtmtypes("shm_snapshot_t",330,"off")=7436
-	Set gtmtypes("shm_snapshot_t",330,"len")=4
-	Set gtmtypes("shm_snapshot_t",330,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_blocked_cntr")=330
-	Set gtmtypes("shm_snapshot_t",331,"name")="shm_snapshot_t.shadow_file_header.wrt_busy_cntr"
-	Set gtmtypes("shm_snapshot_t",331,"off")=7440
-	Set gtmtypes("shm_snapshot_t",331,"len")=4
-	Set gtmtypes("shm_snapshot_t",331,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_busy_cntr")=331
-	Set gtmtypes("shm_snapshot_t",332,"name")="shm_snapshot_t.shadow_file_header.wrt_noblks_wrtn_cntr"
-	Set gtmtypes("shm_snapshot_t",332,"off")=7444
-	Set gtmtypes("shm_snapshot_t",332,"len")=4
-	Set gtmtypes("shm_snapshot_t",332,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_noblks_wrtn_cntr")=332
-	Set gtmtypes("shm_snapshot_t",333,"name")="shm_snapshot_t.shadow_file_header.reserved_bgtrcrec1_cntr"
-	Set gtmtypes("shm_snapshot_t",333,"off")=7448
-	Set gtmtypes("shm_snapshot_t",333,"len")=4
-	Set gtmtypes("shm_snapshot_t",333,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reserved_bgtrcrec1_cntr")=333
-	Set gtmtypes("shm_snapshot_t",334,"name")="shm_snapshot_t.shadow_file_header.reserved_bgtrcrec2_cntr"
-	Set gtmtypes("shm_snapshot_t",334,"off")=7452
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_ripsleep_cnt_tn")=323
+	Set gtmtypes("shm_snapshot_t",324,"name")="shm_snapshot_t.shadow_file_header.t_qread_ripsleep_nblks_tn"
+	Set gtmtypes("shm_snapshot_t",324,"off")=7296
+	Set gtmtypes("shm_snapshot_t",324,"len")=8
+	Set gtmtypes("shm_snapshot_t",324,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_ripsleep_nblks_tn")=324
+	Set gtmtypes("shm_snapshot_t",325,"name")="shm_snapshot_t.shadow_file_header.wcs_wtfini_invoked_tn"
+	Set gtmtypes("shm_snapshot_t",325,"off")=7304
+	Set gtmtypes("shm_snapshot_t",325,"len")=8
+	Set gtmtypes("shm_snapshot_t",325,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wtfini_invoked_tn")=325
+	Set gtmtypes("shm_snapshot_t",326,"name")="shm_snapshot_t.shadow_file_header.wcs_wterror_invoked_tn"
+	Set gtmtypes("shm_snapshot_t",326,"off")=7312
+	Set gtmtypes("shm_snapshot_t",326,"len")=8
+	Set gtmtypes("shm_snapshot_t",326,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wterror_invoked_tn")=326
+	Set gtmtypes("shm_snapshot_t",327,"name")="shm_snapshot_t.shadow_file_header.wcs_wt_restart_invoked_tn"
+	Set gtmtypes("shm_snapshot_t",327,"off")=7320
+	Set gtmtypes("shm_snapshot_t",327,"len")=8
+	Set gtmtypes("shm_snapshot_t",327,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wt_restart_invoked_tn")=327
+	Set gtmtypes("shm_snapshot_t",328,"name")="shm_snapshot_t.shadow_file_header.wcs_wt_restart_eagain_tn"
+	Set gtmtypes("shm_snapshot_t",328,"off")=7328
+	Set gtmtypes("shm_snapshot_t",328,"len")=8
+	Set gtmtypes("shm_snapshot_t",328,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wt_restart_eagain_tn")=328
+	Set gtmtypes("shm_snapshot_t",329,"name")="shm_snapshot_t.shadow_file_header.wcs_wt_restart_reinsert_tn"
+	Set gtmtypes("shm_snapshot_t",329,"off")=7336
+	Set gtmtypes("shm_snapshot_t",329,"len")=8
+	Set gtmtypes("shm_snapshot_t",329,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wt_restart_reinsert_tn")=329
+	Set gtmtypes("shm_snapshot_t",330,"name")="shm_snapshot_t.shadow_file_header.wcs_wtstart_eagain_tn"
+	Set gtmtypes("shm_snapshot_t",330,"off")=7344
+	Set gtmtypes("shm_snapshot_t",330,"len")=8
+	Set gtmtypes("shm_snapshot_t",330,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wtstart_eagain_tn")=330
+	Set gtmtypes("shm_snapshot_t",331,"name")="shm_snapshot_t.shadow_file_header.wcs_wtstart_eagain_incrit_tn"
+	Set gtmtypes("shm_snapshot_t",331,"off")=7352
+	Set gtmtypes("shm_snapshot_t",331,"len")=8
+	Set gtmtypes("shm_snapshot_t",331,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wtstart_eagain_incrit_tn")=331
+	Set gtmtypes("shm_snapshot_t",332,"name")="shm_snapshot_t.shadow_file_header.async_restart_eagain_tn"
+	Set gtmtypes("shm_snapshot_t",332,"off")=7360
+	Set gtmtypes("shm_snapshot_t",332,"len")=8
+	Set gtmtypes("shm_snapshot_t",332,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.async_restart_eagain_tn")=332
+	Set gtmtypes("shm_snapshot_t",333,"name")="shm_snapshot_t.shadow_file_header.bg_trc_rec_tn_filler"
+	Set gtmtypes("shm_snapshot_t",333,"off")=7368
+	Set gtmtypes("shm_snapshot_t",333,"len")=48
+	Set gtmtypes("shm_snapshot_t",333,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bg_trc_rec_tn_filler")=333
+	Set gtmtypes("shm_snapshot_t",334,"name")="shm_snapshot_t.shadow_file_header.total_buffer_flush_cntr"
+	Set gtmtypes("shm_snapshot_t",334,"off")=7416
 	Set gtmtypes("shm_snapshot_t",334,"len")=4
 	Set gtmtypes("shm_snapshot_t",334,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reserved_bgtrcrec2_cntr")=334
-	Set gtmtypes("shm_snapshot_t",335,"name")="shm_snapshot_t.shadow_file_header.reserved_bgtrcrec3_cntr"
-	Set gtmtypes("shm_snapshot_t",335,"off")=7456
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.total_buffer_flush_cntr")=334
+	Set gtmtypes("shm_snapshot_t",335,"name")="shm_snapshot_t.shadow_file_header.bufct_buffer_flush_cntr"
+	Set gtmtypes("shm_snapshot_t",335,"off")=7420
 	Set gtmtypes("shm_snapshot_t",335,"len")=4
 	Set gtmtypes("shm_snapshot_t",335,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reserved_bgtrcrec3_cntr")=335
-	Set gtmtypes("shm_snapshot_t",336,"name")="shm_snapshot_t.shadow_file_header.lost_block_recovery_cntr"
-	Set gtmtypes("shm_snapshot_t",336,"off")=7460
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bufct_buffer_flush_cntr")=335
+	Set gtmtypes("shm_snapshot_t",336,"name")="shm_snapshot_t.shadow_file_header.bufct_buffer_flush_loop_cntr"
+	Set gtmtypes("shm_snapshot_t",336,"off")=7424
 	Set gtmtypes("shm_snapshot_t",336,"len")=4
 	Set gtmtypes("shm_snapshot_t",336,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.lost_block_recovery_cntr")=336
-	Set gtmtypes("shm_snapshot_t",337,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_onln_rlbk_cntr"
-	Set gtmtypes("shm_snapshot_t",337,"off")=7464
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bufct_buffer_flush_loop_cntr")=336
+	Set gtmtypes("shm_snapshot_t",337,"name")="shm_snapshot_t.shadow_file_header.wrt_calls_cntr"
+	Set gtmtypes("shm_snapshot_t",337,"off")=7428
 	Set gtmtypes("shm_snapshot_t",337,"len")=4
 	Set gtmtypes("shm_snapshot_t",337,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_onln_rlbk_cntr")=337
-	Set gtmtypes("shm_snapshot_t",338,"name")="shm_snapshot_t.shadow_file_header.stale_cntr"
-	Set gtmtypes("shm_snapshot_t",338,"off")=7468
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_calls_cntr")=337
+	Set gtmtypes("shm_snapshot_t",338,"name")="shm_snapshot_t.shadow_file_header.wrt_count_cntr"
+	Set gtmtypes("shm_snapshot_t",338,"off")=7432
 	Set gtmtypes("shm_snapshot_t",338,"len")=4
 	Set gtmtypes("shm_snapshot_t",338,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_cntr")=338
-	Set gtmtypes("shm_snapshot_t",339,"name")="shm_snapshot_t.shadow_file_header.starved_cntr"
-	Set gtmtypes("shm_snapshot_t",339,"off")=7472
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_count_cntr")=338
+	Set gtmtypes("shm_snapshot_t",339,"name")="shm_snapshot_t.shadow_file_header.wrt_blocked_cntr"
+	Set gtmtypes("shm_snapshot_t",339,"off")=7436
 	Set gtmtypes("shm_snapshot_t",339,"len")=4
 	Set gtmtypes("shm_snapshot_t",339,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.starved_cntr")=339
-	Set gtmtypes("shm_snapshot_t",340,"name")="shm_snapshot_t.shadow_file_header.stale_timer_started_cntr"
-	Set gtmtypes("shm_snapshot_t",340,"off")=7476
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_blocked_cntr")=339
+	Set gtmtypes("shm_snapshot_t",340,"name")="shm_snapshot_t.shadow_file_header.wrt_busy_cntr"
+	Set gtmtypes("shm_snapshot_t",340,"off")=7440
 	Set gtmtypes("shm_snapshot_t",340,"len")=4
 	Set gtmtypes("shm_snapshot_t",340,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_timer_started_cntr")=340
-	Set gtmtypes("shm_snapshot_t",341,"name")="shm_snapshot_t.shadow_file_header.stale_timer_pop_cntr"
-	Set gtmtypes("shm_snapshot_t",341,"off")=7480
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_busy_cntr")=340
+	Set gtmtypes("shm_snapshot_t",341,"name")="shm_snapshot_t.shadow_file_header.wrt_noblks_wrtn_cntr"
+	Set gtmtypes("shm_snapshot_t",341,"off")=7444
 	Set gtmtypes("shm_snapshot_t",341,"len")=4
 	Set gtmtypes("shm_snapshot_t",341,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_timer_pop_cntr")=341
-	Set gtmtypes("shm_snapshot_t",342,"name")="shm_snapshot_t.shadow_file_header.stale_process_defer_cntr"
-	Set gtmtypes("shm_snapshot_t",342,"off")=7484
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_noblks_wrtn_cntr")=341
+	Set gtmtypes("shm_snapshot_t",342,"name")="shm_snapshot_t.shadow_file_header.reserved_bgtrcrec1_cntr"
+	Set gtmtypes("shm_snapshot_t",342,"off")=7448
 	Set gtmtypes("shm_snapshot_t",342,"len")=4
 	Set gtmtypes("shm_snapshot_t",342,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_process_defer_cntr")=342
-	Set gtmtypes("shm_snapshot_t",343,"name")="shm_snapshot_t.shadow_file_header.stale_defer_processed_cntr"
-	Set gtmtypes("shm_snapshot_t",343,"off")=7488
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reserved_bgtrcrec1_cntr")=342
+	Set gtmtypes("shm_snapshot_t",343,"name")="shm_snapshot_t.shadow_file_header.reserved_bgtrcrec2_cntr"
+	Set gtmtypes("shm_snapshot_t",343,"off")=7452
 	Set gtmtypes("shm_snapshot_t",343,"len")=4
 	Set gtmtypes("shm_snapshot_t",343,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_defer_processed_cntr")=343
-	Set gtmtypes("shm_snapshot_t",344,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flush_cntr"
-	Set gtmtypes("shm_snapshot_t",344,"off")=7492
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reserved_bgtrcrec2_cntr")=343
+	Set gtmtypes("shm_snapshot_t",344,"name")="shm_snapshot_t.shadow_file_header.reserved_bgtrcrec3_cntr"
+	Set gtmtypes("shm_snapshot_t",344,"off")=7456
 	Set gtmtypes("shm_snapshot_t",344,"len")=4
 	Set gtmtypes("shm_snapshot_t",344,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flush_cntr")=344
-	Set gtmtypes("shm_snapshot_t",345,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flush_loop_cntr"
-	Set gtmtypes("shm_snapshot_t",345,"off")=7496
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reserved_bgtrcrec3_cntr")=344
+	Set gtmtypes("shm_snapshot_t",345,"name")="shm_snapshot_t.shadow_file_header.lost_block_recovery_cntr"
+	Set gtmtypes("shm_snapshot_t",345,"off")=7460
 	Set gtmtypes("shm_snapshot_t",345,"len")=4
 	Set gtmtypes("shm_snapshot_t",345,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flush_loop_cntr")=345
-	Set gtmtypes("shm_snapshot_t",346,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flush_retries_cntr"
-	Set gtmtypes("shm_snapshot_t",346,"off")=7500
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.lost_block_recovery_cntr")=345
+	Set gtmtypes("shm_snapshot_t",346,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_onln_rlbk_cntr"
+	Set gtmtypes("shm_snapshot_t",346,"off")=7464
 	Set gtmtypes("shm_snapshot_t",346,"len")=4
 	Set gtmtypes("shm_snapshot_t",346,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flush_retries_cntr")=346
-	Set gtmtypes("shm_snapshot_t",347,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flushed_during_lockwait_cntr"
-	Set gtmtypes("shm_snapshot_t",347,"off")=7504
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_onln_rlbk_cntr")=346
+	Set gtmtypes("shm_snapshot_t",347,"name")="shm_snapshot_t.shadow_file_header.stale_cntr"
+	Set gtmtypes("shm_snapshot_t",347,"off")=7468
 	Set gtmtypes("shm_snapshot_t",347,"len")=4
 	Set gtmtypes("shm_snapshot_t",347,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flushed_during_lockwait_cntr")=347
-	Set gtmtypes("shm_snapshot_t",348,"name")="shm_snapshot_t.shadow_file_header.tp_crit_retries_cntr"
-	Set gtmtypes("shm_snapshot_t",348,"off")=7508
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_cntr")=347
+	Set gtmtypes("shm_snapshot_t",348,"name")="shm_snapshot_t.shadow_file_header.starved_cntr"
+	Set gtmtypes("shm_snapshot_t",348,"off")=7472
 	Set gtmtypes("shm_snapshot_t",348,"len")=4
 	Set gtmtypes("shm_snapshot_t",348,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.tp_crit_retries_cntr")=348
-	Set gtmtypes("shm_snapshot_t",349,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_flush_dirty_cntr"
-	Set gtmtypes("shm_snapshot_t",349,"off")=7512
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.starved_cntr")=348
+	Set gtmtypes("shm_snapshot_t",349,"name")="shm_snapshot_t.shadow_file_header.stale_timer_started_cntr"
+	Set gtmtypes("shm_snapshot_t",349,"off")=7476
 	Set gtmtypes("shm_snapshot_t",349,"len")=4
 	Set gtmtypes("shm_snapshot_t",349,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_flush_dirty_cntr")=349
-	Set gtmtypes("shm_snapshot_t",350,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_rip_wait_cntr"
-	Set gtmtypes("shm_snapshot_t",350,"off")=7516
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_timer_started_cntr")=349
+	Set gtmtypes("shm_snapshot_t",350,"name")="shm_snapshot_t.shadow_file_header.stale_timer_pop_cntr"
+	Set gtmtypes("shm_snapshot_t",350,"off")=7480
 	Set gtmtypes("shm_snapshot_t",350,"len")=4
 	Set gtmtypes("shm_snapshot_t",350,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_rip_wait_cntr")=350
-	Set gtmtypes("shm_snapshot_t",351,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_buf_owner_stuck_cntr"
-	Set gtmtypes("shm_snapshot_t",351,"off")=7520
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_timer_pop_cntr")=350
+	Set gtmtypes("shm_snapshot_t",351,"name")="shm_snapshot_t.shadow_file_header.stale_process_defer_cntr"
+	Set gtmtypes("shm_snapshot_t",351,"off")=7484
 	Set gtmtypes("shm_snapshot_t",351,"len")=4
 	Set gtmtypes("shm_snapshot_t",351,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_buf_owner_stuck_cntr")=351
-	Set gtmtypes("shm_snapshot_t",352,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_out_of_design_cntr"
-	Set gtmtypes("shm_snapshot_t",352,"off")=7524
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_process_defer_cntr")=351
+	Set gtmtypes("shm_snapshot_t",352,"name")="shm_snapshot_t.shadow_file_header.stale_defer_processed_cntr"
+	Set gtmtypes("shm_snapshot_t",352,"off")=7488
 	Set gtmtypes("shm_snapshot_t",352,"len")=4
 	Set gtmtypes("shm_snapshot_t",352,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_out_of_design_cntr")=352
-	Set gtmtypes("shm_snapshot_t",353,"name")="shm_snapshot_t.shadow_file_header.t_qread_buf_owner_stuck_cntr"
-	Set gtmtypes("shm_snapshot_t",353,"off")=7528
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_defer_processed_cntr")=352
+	Set gtmtypes("shm_snapshot_t",353,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flush_cntr"
+	Set gtmtypes("shm_snapshot_t",353,"off")=7492
 	Set gtmtypes("shm_snapshot_t",353,"len")=4
 	Set gtmtypes("shm_snapshot_t",353,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_buf_owner_stuck_cntr")=353
-	Set gtmtypes("shm_snapshot_t",354,"name")="shm_snapshot_t.shadow_file_header.t_qread_out_of_design_cntr"
-	Set gtmtypes("shm_snapshot_t",354,"off")=7532
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flush_cntr")=353
+	Set gtmtypes("shm_snapshot_t",354,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flush_loop_cntr"
+	Set gtmtypes("shm_snapshot_t",354,"off")=7496
 	Set gtmtypes("shm_snapshot_t",354,"len")=4
 	Set gtmtypes("shm_snapshot_t",354,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_out_of_design_cntr")=354
-	Set gtmtypes("shm_snapshot_t",355,"name")="shm_snapshot_t.shadow_file_header.bt_put_flush_dirty_cntr"
-	Set gtmtypes("shm_snapshot_t",355,"off")=7536
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flush_loop_cntr")=354
+	Set gtmtypes("shm_snapshot_t",355,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flush_retries_cntr"
+	Set gtmtypes("shm_snapshot_t",355,"off")=7500
 	Set gtmtypes("shm_snapshot_t",355,"len")=4
 	Set gtmtypes("shm_snapshot_t",355,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bt_put_flush_dirty_cntr")=355
-	Set gtmtypes("shm_snapshot_t",356,"name")="shm_snapshot_t.shadow_file_header.mlock_wakeups_cntr"
-	Set gtmtypes("shm_snapshot_t",356,"off")=7540
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flush_retries_cntr")=355
+	Set gtmtypes("shm_snapshot_t",356,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flushed_during_lockwait_cntr"
+	Set gtmtypes("shm_snapshot_t",356,"off")=7504
 	Set gtmtypes("shm_snapshot_t",356,"len")=4
 	Set gtmtypes("shm_snapshot_t",356,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.mlock_wakeups_cntr")=356
-	Set gtmtypes("shm_snapshot_t",357,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_recover_invoked_cntr"
-	Set gtmtypes("shm_snapshot_t",357,"off")=7544
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flushed_during_lockwait_cntr")=356
+	Set gtmtypes("shm_snapshot_t",357,"name")="shm_snapshot_t.shadow_file_header.tp_crit_retries_cntr"
+	Set gtmtypes("shm_snapshot_t",357,"off")=7508
 	Set gtmtypes("shm_snapshot_t",357,"len")=4
 	Set gtmtypes("shm_snapshot_t",357,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_recover_invoked_cntr")=357
-	Set gtmtypes("shm_snapshot_t",358,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_verify_passed_cntr"
-	Set gtmtypes("shm_snapshot_t",358,"off")=7548
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.tp_crit_retries_cntr")=357
+	Set gtmtypes("shm_snapshot_t",358,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_flush_dirty_cntr"
+	Set gtmtypes("shm_snapshot_t",358,"off")=7512
 	Set gtmtypes("shm_snapshot_t",358,"len")=4
 	Set gtmtypes("shm_snapshot_t",358,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_verify_passed_cntr")=358
-	Set gtmtypes("shm_snapshot_t",359,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr"
-	Set gtmtypes("shm_snapshot_t",359,"off")=7552
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_flush_dirty_cntr")=358
+	Set gtmtypes("shm_snapshot_t",359,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_rip_wait_cntr"
+	Set gtmtypes("shm_snapshot_t",359,"off")=7516
 	Set gtmtypes("shm_snapshot_t",359,"len")=4
 	Set gtmtypes("shm_snapshot_t",359,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr")=359
-	Set gtmtypes("shm_snapshot_t",360,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_cntr"
-	Set gtmtypes("shm_snapshot_t",360,"off")=7556
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_rip_wait_cntr")=359
+	Set gtmtypes("shm_snapshot_t",360,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_buf_owner_stuck_cntr"
+	Set gtmtypes("shm_snapshot_t",360,"off")=7520
 	Set gtmtypes("shm_snapshot_t",360,"len")=4
 	Set gtmtypes("shm_snapshot_t",360,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_cntr")=360
-	Set gtmtypes("shm_snapshot_t",361,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_db_csh_getn_loopexceed_cntr"
-	Set gtmtypes("shm_snapshot_t",361,"off")=7560
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_buf_owner_stuck_cntr")=360
+	Set gtmtypes("shm_snapshot_t",361,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_out_of_design_cntr"
+	Set gtmtypes("shm_snapshot_t",361,"off")=7524
 	Set gtmtypes("shm_snapshot_t",361,"len")=4
 	Set gtmtypes("shm_snapshot_t",361,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_db_csh_getn_loopexceed_cntr")=361
-	Set gtmtypes("shm_snapshot_t",362,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_cntr"
-	Set gtmtypes("shm_snapshot_t",362,"off")=7564
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_out_of_design_cntr")=361
+	Set gtmtypes("shm_snapshot_t",362,"name")="shm_snapshot_t.shadow_file_header.t_qread_buf_owner_stuck_cntr"
+	Set gtmtypes("shm_snapshot_t",362,"off")=7528
 	Set gtmtypes("shm_snapshot_t",362,"len")=4
 	Set gtmtypes("shm_snapshot_t",362,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_cntr")=362
-	Set gtmtypes("shm_snapshot_t",363,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_db_csh_get_cntr"
-	Set gtmtypes("shm_snapshot_t",363,"off")=7568
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_buf_owner_stuck_cntr")=362
+	Set gtmtypes("shm_snapshot_t",363,"name")="shm_snapshot_t.shadow_file_header.t_qread_out_of_design_cntr"
+	Set gtmtypes("shm_snapshot_t",363,"off")=7532
 	Set gtmtypes("shm_snapshot_t",363,"len")=4
 	Set gtmtypes("shm_snapshot_t",363,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_db_csh_get_cntr")=363
-	Set gtmtypes("shm_snapshot_t",364,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_wcsgetspace_cntr"
-	Set gtmtypes("shm_snapshot_t",364,"off")=7572
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_out_of_design_cntr")=363
+	Set gtmtypes("shm_snapshot_t",364,"name")="shm_snapshot_t.shadow_file_header.bt_put_flush_dirty_cntr"
+	Set gtmtypes("shm_snapshot_t",364,"off")=7536
 	Set gtmtypes("shm_snapshot_t",364,"len")=4
 	Set gtmtypes("shm_snapshot_t",364,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_wcsgetspace_cntr")=364
-	Set gtmtypes("shm_snapshot_t",365,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_t1_cntr"
-	Set gtmtypes("shm_snapshot_t",365,"off")=7576
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bt_put_flush_dirty_cntr")=364
+	Set gtmtypes("shm_snapshot_t",365,"name")="shm_snapshot_t.shadow_file_header.mlock_wakeups_cntr"
+	Set gtmtypes("shm_snapshot_t",365,"off")=7540
 	Set gtmtypes("shm_snapshot_t",365,"len")=4
 	Set gtmtypes("shm_snapshot_t",365,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_t1_cntr")=365
-	Set gtmtypes("shm_snapshot_t",366,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_bitmap_cntr"
-	Set gtmtypes("shm_snapshot_t",366,"off")=7580
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.mlock_wakeups_cntr")=365
+	Set gtmtypes("shm_snapshot_t",366,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_recover_invoked_cntr"
+	Set gtmtypes("shm_snapshot_t",366,"off")=7544
 	Set gtmtypes("shm_snapshot_t",366,"len")=4
 	Set gtmtypes("shm_snapshot_t",366,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_bitmap_cntr")=366
-	Set gtmtypes("shm_snapshot_t",367,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_jnl_cwset_cntr"
-	Set gtmtypes("shm_snapshot_t",367,"off")=7584
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_recover_invoked_cntr")=366
+	Set gtmtypes("shm_snapshot_t",367,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_verify_passed_cntr"
+	Set gtmtypes("shm_snapshot_t",367,"off")=7548
 	Set gtmtypes("shm_snapshot_t",367,"len")=4
 	Set gtmtypes("shm_snapshot_t",367,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_jnl_cwset_cntr")=367
-	Set gtmtypes("shm_snapshot_t",368,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_cntr"
-	Set gtmtypes("shm_snapshot_t",368,"off")=7588
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_verify_passed_cntr")=367
+	Set gtmtypes("shm_snapshot_t",368,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr"
+	Set gtmtypes("shm_snapshot_t",368,"off")=7552
 	Set gtmtypes("shm_snapshot_t",368,"len")=4
 	Set gtmtypes("shm_snapshot_t",368,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_cntr")=368
-	Set gtmtypes("shm_snapshot_t",369,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_hist_cntr"
-	Set gtmtypes("shm_snapshot_t",369,"off")=7592
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr")=368
+	Set gtmtypes("shm_snapshot_t",369,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_cntr"
+	Set gtmtypes("shm_snapshot_t",369,"off")=7556
 	Set gtmtypes("shm_snapshot_t",369,"len")=4
 	Set gtmtypes("shm_snapshot_t",369,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_hist_cntr")=369
-	Set gtmtypes("shm_snapshot_t",370,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_hist1_nullbt_cntr"
-	Set gtmtypes("shm_snapshot_t",370,"off")=7596
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_cntr")=369
+	Set gtmtypes("shm_snapshot_t",370,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_db_csh_getn_loopexceed_cntr"
+	Set gtmtypes("shm_snapshot_t",370,"off")=7560
 	Set gtmtypes("shm_snapshot_t",370,"len")=4
 	Set gtmtypes("shm_snapshot_t",370,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_hist1_nullbt_cntr")=370
-	Set gtmtypes("shm_snapshot_t",371,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_cntr"
-	Set gtmtypes("shm_snapshot_t",371,"off")=7600
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_db_csh_getn_loopexceed_cntr")=370
+	Set gtmtypes("shm_snapshot_t",371,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_cntr"
+	Set gtmtypes("shm_snapshot_t",371,"off")=7564
 	Set gtmtypes("shm_snapshot_t",371,"len")=4
 	Set gtmtypes("shm_snapshot_t",371,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_cntr")=371
-	Set gtmtypes("shm_snapshot_t",372,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_bitmap_nullbt_cntr"
-	Set gtmtypes("shm_snapshot_t",372,"off")=7604
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_cntr")=371
+	Set gtmtypes("shm_snapshot_t",372,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_db_csh_get_cntr"
+	Set gtmtypes("shm_snapshot_t",372,"off")=7568
 	Set gtmtypes("shm_snapshot_t",372,"len")=4
 	Set gtmtypes("shm_snapshot_t",372,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_bitmap_nullbt_cntr")=372
-	Set gtmtypes("shm_snapshot_t",373,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_cntr"
-	Set gtmtypes("shm_snapshot_t",373,"off")=7608
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_db_csh_get_cntr")=372
+	Set gtmtypes("shm_snapshot_t",373,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_wcsgetspace_cntr"
+	Set gtmtypes("shm_snapshot_t",373,"off")=7572
 	Set gtmtypes("shm_snapshot_t",373,"len")=4
 	Set gtmtypes("shm_snapshot_t",373,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_cntr")=373
-	Set gtmtypes("shm_snapshot_t",374,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_jnl_cwset_cntr"
-	Set gtmtypes("shm_snapshot_t",374,"off")=7612
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_wcsgetspace_cntr")=373
+	Set gtmtypes("shm_snapshot_t",374,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_t1_cntr"
+	Set gtmtypes("shm_snapshot_t",374,"off")=7576
 	Set gtmtypes("shm_snapshot_t",374,"len")=4
 	Set gtmtypes("shm_snapshot_t",374,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_jnl_cwset_cntr")=374
-	Set gtmtypes("shm_snapshot_t",375,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_jnl_wcsflu_cntr"
-	Set gtmtypes("shm_snapshot_t",375,"off")=7616
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_t1_cntr")=374
+	Set gtmtypes("shm_snapshot_t",375,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_bitmap_cntr"
+	Set gtmtypes("shm_snapshot_t",375,"off")=7580
 	Set gtmtypes("shm_snapshot_t",375,"len")=4
 	Set gtmtypes("shm_snapshot_t",375,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_jnl_wcsflu_cntr")=375
-	Set gtmtypes("shm_snapshot_t",376,"name")="shm_snapshot_t.shadow_file_header.db_csh_get_too_many_loops_cntr"
-	Set gtmtypes("shm_snapshot_t",376,"off")=7620
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_bitmap_cntr")=375
+	Set gtmtypes("shm_snapshot_t",376,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_jnl_cwset_cntr"
+	Set gtmtypes("shm_snapshot_t",376,"off")=7584
 	Set gtmtypes("shm_snapshot_t",376,"len")=4
 	Set gtmtypes("shm_snapshot_t",376,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_get_too_many_loops_cntr")=376
-	Set gtmtypes("shm_snapshot_t",377,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tpckh_hist1_nullbt_cntr"
-	Set gtmtypes("shm_snapshot_t",377,"off")=7624
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_jnl_cwset_cntr")=376
+	Set gtmtypes("shm_snapshot_t",377,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_cntr"
+	Set gtmtypes("shm_snapshot_t",377,"off")=7588
 	Set gtmtypes("shm_snapshot_t",377,"len")=4
 	Set gtmtypes("shm_snapshot_t",377,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tpckh_hist1_nullbt_cntr")=377
-	Set gtmtypes("shm_snapshot_t",378,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_cntr"
-	Set gtmtypes("shm_snapshot_t",378,"off")=7628
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_cntr")=377
+	Set gtmtypes("shm_snapshot_t",378,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_hist_cntr"
+	Set gtmtypes("shm_snapshot_t",378,"off")=7592
 	Set gtmtypes("shm_snapshot_t",378,"len")=4
 	Set gtmtypes("shm_snapshot_t",378,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_cntr")=378
-	Set gtmtypes("shm_snapshot_t",379,"name")="shm_snapshot_t.shadow_file_header.jnl_blocked_writer_lost_cntr"
-	Set gtmtypes("shm_snapshot_t",379,"off")=7632
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_hist_cntr")=378
+	Set gtmtypes("shm_snapshot_t",379,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_hist1_nullbt_cntr"
+	Set gtmtypes("shm_snapshot_t",379,"off")=7596
 	Set gtmtypes("shm_snapshot_t",379,"len")=4
 	Set gtmtypes("shm_snapshot_t",379,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_blocked_writer_lost_cntr")=379
-	Set gtmtypes("shm_snapshot_t",380,"name")="shm_snapshot_t.shadow_file_header.jnl_blocked_writer_stuck_cntr"
-	Set gtmtypes("shm_snapshot_t",380,"off")=7636
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_hist1_nullbt_cntr")=379
+	Set gtmtypes("shm_snapshot_t",380,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_cntr"
+	Set gtmtypes("shm_snapshot_t",380,"off")=7600
 	Set gtmtypes("shm_snapshot_t",380,"len")=4
 	Set gtmtypes("shm_snapshot_t",380,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_blocked_writer_stuck_cntr")=380
-	Set gtmtypes("shm_snapshot_t",381,"name")="shm_snapshot_t.shadow_file_header.jnl_blocked_writer_blocked_cntr"
-	Set gtmtypes("shm_snapshot_t",381,"off")=7640
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_cntr")=380
+	Set gtmtypes("shm_snapshot_t",381,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_bitmap_nullbt_cntr"
+	Set gtmtypes("shm_snapshot_t",381,"off")=7604
 	Set gtmtypes("shm_snapshot_t",381,"len")=4
 	Set gtmtypes("shm_snapshot_t",381,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_blocked_writer_blocked_cntr")=381
-	Set gtmtypes("shm_snapshot_t",382,"name")="shm_snapshot_t.shadow_file_header.n_jnl_fsyncs_cntr"
-	Set gtmtypes("shm_snapshot_t",382,"off")=7644
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_bitmap_nullbt_cntr")=381
+	Set gtmtypes("shm_snapshot_t",382,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_cntr"
+	Set gtmtypes("shm_snapshot_t",382,"off")=7608
 	Set gtmtypes("shm_snapshot_t",382,"len")=4
 	Set gtmtypes("shm_snapshot_t",382,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_jnl_fsyncs_cntr")=382
-	Set gtmtypes("shm_snapshot_t",383,"name")="shm_snapshot_t.shadow_file_header.n_jnl_fsync_tries_cntr"
-	Set gtmtypes("shm_snapshot_t",383,"off")=7648
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_cntr")=382
+	Set gtmtypes("shm_snapshot_t",383,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_jnl_cwset_cntr"
+	Set gtmtypes("shm_snapshot_t",383,"off")=7612
 	Set gtmtypes("shm_snapshot_t",383,"len")=4
 	Set gtmtypes("shm_snapshot_t",383,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_jnl_fsync_tries_cntr")=383
-	Set gtmtypes("shm_snapshot_t",384,"name")="shm_snapshot_t.shadow_file_header.n_jnl_fsync_recovers_cntr"
-	Set gtmtypes("shm_snapshot_t",384,"off")=7652
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_jnl_cwset_cntr")=383
+	Set gtmtypes("shm_snapshot_t",384,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_jnl_wcsflu_cntr"
+	Set gtmtypes("shm_snapshot_t",384,"off")=7616
 	Set gtmtypes("shm_snapshot_t",384,"len")=4
 	Set gtmtypes("shm_snapshot_t",384,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_jnl_fsync_recovers_cntr")=384
-	Set gtmtypes("shm_snapshot_t",385,"name")="shm_snapshot_t.shadow_file_header.n_db_fsyncs_cntr"
-	Set gtmtypes("shm_snapshot_t",385,"off")=7656
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_jnl_wcsflu_cntr")=384
+	Set gtmtypes("shm_snapshot_t",385,"name")="shm_snapshot_t.shadow_file_header.db_csh_get_too_many_loops_cntr"
+	Set gtmtypes("shm_snapshot_t",385,"off")=7620
 	Set gtmtypes("shm_snapshot_t",385,"len")=4
 	Set gtmtypes("shm_snapshot_t",385,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_fsyncs_cntr")=385
-	Set gtmtypes("shm_snapshot_t",386,"name")="shm_snapshot_t.shadow_file_header.n_db_fsyncs_in_crit_cntr"
-	Set gtmtypes("shm_snapshot_t",386,"off")=7660
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_get_too_many_loops_cntr")=385
+	Set gtmtypes("shm_snapshot_t",386,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tpckh_hist1_nullbt_cntr"
+	Set gtmtypes("shm_snapshot_t",386,"off")=7624
 	Set gtmtypes("shm_snapshot_t",386,"len")=4
 	Set gtmtypes("shm_snapshot_t",386,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_fsyncs_in_crit_cntr")=386
-	Set gtmtypes("shm_snapshot_t",387,"name")="shm_snapshot_t.shadow_file_header.n_dbsync_timers_cntr"
-	Set gtmtypes("shm_snapshot_t",387,"off")=7664
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tpckh_hist1_nullbt_cntr")=386
+	Set gtmtypes("shm_snapshot_t",387,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_cntr"
+	Set gtmtypes("shm_snapshot_t",387,"off")=7628
 	Set gtmtypes("shm_snapshot_t",387,"len")=4
 	Set gtmtypes("shm_snapshot_t",387,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_dbsync_timers_cntr")=387
-	Set gtmtypes("shm_snapshot_t",388,"name")="shm_snapshot_t.shadow_file_header.n_dbsync_writes_cntr"
-	Set gtmtypes("shm_snapshot_t",388,"off")=7668
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_cntr")=387
+	Set gtmtypes("shm_snapshot_t",388,"name")="shm_snapshot_t.shadow_file_header.jnl_blocked_writer_lost_cntr"
+	Set gtmtypes("shm_snapshot_t",388,"off")=7632
 	Set gtmtypes("shm_snapshot_t",388,"len")=4
 	Set gtmtypes("shm_snapshot_t",388,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_dbsync_writes_cntr")=388
-	Set gtmtypes("shm_snapshot_t",389,"name")="shm_snapshot_t.shadow_file_header.mutex_queue_full_cntr"
-	Set gtmtypes("shm_snapshot_t",389,"off")=7672
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_blocked_writer_lost_cntr")=388
+	Set gtmtypes("shm_snapshot_t",389,"name")="shm_snapshot_t.shadow_file_header.jnl_blocked_writer_stuck_cntr"
+	Set gtmtypes("shm_snapshot_t",389,"off")=7636
 	Set gtmtypes("shm_snapshot_t",389,"len")=4
 	Set gtmtypes("shm_snapshot_t",389,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.mutex_queue_full_cntr")=389
-	Set gtmtypes("shm_snapshot_t",390,"name")="shm_snapshot_t.shadow_file_header.wcb_bt_put_cntr"
-	Set gtmtypes("shm_snapshot_t",390,"off")=7676
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_blocked_writer_stuck_cntr")=389
+	Set gtmtypes("shm_snapshot_t",390,"name")="shm_snapshot_t.shadow_file_header.jnl_blocked_writer_blocked_cntr"
+	Set gtmtypes("shm_snapshot_t",390,"off")=7640
 	Set gtmtypes("shm_snapshot_t",390,"len")=4
 	Set gtmtypes("shm_snapshot_t",390,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_bt_put_cntr")=390
-	Set gtmtypes("shm_snapshot_t",391,"name")="shm_snapshot_t.shadow_file_header.wcb_mutex_salvage_cntr"
-	Set gtmtypes("shm_snapshot_t",391,"off")=7680
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_blocked_writer_blocked_cntr")=390
+	Set gtmtypes("shm_snapshot_t",391,"name")="shm_snapshot_t.shadow_file_header.n_jnl_fsyncs_cntr"
+	Set gtmtypes("shm_snapshot_t",391,"off")=7644
 	Set gtmtypes("shm_snapshot_t",391,"len")=4
 	Set gtmtypes("shm_snapshot_t",391,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_mutex_salvage_cntr")=391
-	Set gtmtypes("shm_snapshot_t",392,"name")="shm_snapshot_t.shadow_file_header.wcb_tp_grab_crit_cntr"
-	Set gtmtypes("shm_snapshot_t",392,"off")=7684
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_jnl_fsyncs_cntr")=391
+	Set gtmtypes("shm_snapshot_t",392,"name")="shm_snapshot_t.shadow_file_header.n_jnl_fsync_tries_cntr"
+	Set gtmtypes("shm_snapshot_t",392,"off")=7648
 	Set gtmtypes("shm_snapshot_t",392,"len")=4
 	Set gtmtypes("shm_snapshot_t",392,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_tp_grab_crit_cntr")=392
-	Set gtmtypes("shm_snapshot_t",393,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_nocr_invcr_cntr"
-	Set gtmtypes("shm_snapshot_t",393,"off")=7688
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_jnl_fsync_tries_cntr")=392
+	Set gtmtypes("shm_snapshot_t",393,"name")="shm_snapshot_t.shadow_file_header.n_jnl_fsync_recovers_cntr"
+	Set gtmtypes("shm_snapshot_t",393,"off")=7652
 	Set gtmtypes("shm_snapshot_t",393,"len")=4
 	Set gtmtypes("shm_snapshot_t",393,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_nocr_invcr_cntr")=393
-	Set gtmtypes("shm_snapshot_t",394,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_cr_invcr_cntr"
-	Set gtmtypes("shm_snapshot_t",394,"off")=7692
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_jnl_fsync_recovers_cntr")=393
+	Set gtmtypes("shm_snapshot_t",394,"name")="shm_snapshot_t.shadow_file_header.n_db_fsyncs_cntr"
+	Set gtmtypes("shm_snapshot_t",394,"off")=7656
 	Set gtmtypes("shm_snapshot_t",394,"len")=4
 	Set gtmtypes("shm_snapshot_t",394,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_cr_invcr_cntr")=394
-	Set gtmtypes("shm_snapshot_t",395,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_rip_wait_cntr"
-	Set gtmtypes("shm_snapshot_t",395,"off")=7696
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_fsyncs_cntr")=394
+	Set gtmtypes("shm_snapshot_t",395,"name")="shm_snapshot_t.shadow_file_header.n_db_fsyncs_in_crit_cntr"
+	Set gtmtypes("shm_snapshot_t",395,"off")=7660
 	Set gtmtypes("shm_snapshot_t",395,"len")=4
 	Set gtmtypes("shm_snapshot_t",395,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_rip_wait_cntr")=395
-	Set gtmtypes("shm_snapshot_t",396,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirtyripwait_cntr"
-	Set gtmtypes("shm_snapshot_t",396,"off")=7700
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_fsyncs_in_crit_cntr")=395
+	Set gtmtypes("shm_snapshot_t",396,"name")="shm_snapshot_t.shadow_file_header.n_dbsync_timers_cntr"
+	Set gtmtypes("shm_snapshot_t",396,"off")=7664
 	Set gtmtypes("shm_snapshot_t",396,"len")=4
 	Set gtmtypes("shm_snapshot_t",396,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirtyripwait_cntr")=396
-	Set gtmtypes("shm_snapshot_t",397,"name")="shm_snapshot_t.shadow_file_header.wcb_gds_rundown_cntr"
-	Set gtmtypes("shm_snapshot_t",397,"off")=7704
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_dbsync_timers_cntr")=396
+	Set gtmtypes("shm_snapshot_t",397,"name")="shm_snapshot_t.shadow_file_header.n_dbsync_writes_cntr"
+	Set gtmtypes("shm_snapshot_t",397,"off")=7668
 	Set gtmtypes("shm_snapshot_t",397,"len")=4
 	Set gtmtypes("shm_snapshot_t",397,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_gds_rundown_cntr")=397
-	Set gtmtypes("shm_snapshot_t",398,"name")="shm_snapshot_t.shadow_file_header.wcb_wcs_flu1_cntr"
-	Set gtmtypes("shm_snapshot_t",398,"off")=7708
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_dbsync_writes_cntr")=397
+	Set gtmtypes("shm_snapshot_t",398,"name")="shm_snapshot_t.shadow_file_header.mutex_queue_full_cntr"
+	Set gtmtypes("shm_snapshot_t",398,"off")=7672
 	Set gtmtypes("shm_snapshot_t",398,"len")=4
 	Set gtmtypes("shm_snapshot_t",398,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wcs_flu1_cntr")=398
-	Set gtmtypes("shm_snapshot_t",399,"name")="shm_snapshot_t.shadow_file_header.wcb_mu_back_cntr"
-	Set gtmtypes("shm_snapshot_t",399,"off")=7712
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.mutex_queue_full_cntr")=398
+	Set gtmtypes("shm_snapshot_t",399,"name")="shm_snapshot_t.shadow_file_header.wcb_bt_put_cntr"
+	Set gtmtypes("shm_snapshot_t",399,"off")=7676
 	Set gtmtypes("shm_snapshot_t",399,"len")=4
 	Set gtmtypes("shm_snapshot_t",399,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_mu_back_cntr")=399
-	Set gtmtypes("shm_snapshot_t",400,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirty_invcr_cntr"
-	Set gtmtypes("shm_snapshot_t",400,"off")=7716
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_bt_put_cntr")=399
+	Set gtmtypes("shm_snapshot_t",400,"name")="shm_snapshot_t.shadow_file_header.wcb_mutex_salvage_cntr"
+	Set gtmtypes("shm_snapshot_t",400,"off")=7680
 	Set gtmtypes("shm_snapshot_t",400,"len")=4
 	Set gtmtypes("shm_snapshot_t",400,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirty_invcr_cntr")=400
-	Set gtmtypes("shm_snapshot_t",401,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_wtfini_fail_cntr"
-	Set gtmtypes("shm_snapshot_t",401,"off")=7720
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_mutex_salvage_cntr")=400
+	Set gtmtypes("shm_snapshot_t",401,"name")="shm_snapshot_t.shadow_file_header.wcb_tp_grab_crit_cntr"
+	Set gtmtypes("shm_snapshot_t",401,"off")=7684
 	Set gtmtypes("shm_snapshot_t",401,"len")=4
 	Set gtmtypes("shm_snapshot_t",401,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_wtfini_fail_cntr")=401
-	Set gtmtypes("shm_snapshot_t",402,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_twin_stuck_cntr"
-	Set gtmtypes("shm_snapshot_t",402,"off")=7724
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_tp_grab_crit_cntr")=401
+	Set gtmtypes("shm_snapshot_t",402,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_nocr_invcr_cntr"
+	Set gtmtypes("shm_snapshot_t",402,"off")=7688
 	Set gtmtypes("shm_snapshot_t",402,"len")=4
 	Set gtmtypes("shm_snapshot_t",402,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_twin_stuck_cntr")=402
-	Set gtmtypes("shm_snapshot_t",403,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_wrt_latch_stuck_cntr"
-	Set gtmtypes("shm_snapshot_t",403,"off")=7728
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_nocr_invcr_cntr")=402
+	Set gtmtypes("shm_snapshot_t",403,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_cr_invcr_cntr"
+	Set gtmtypes("shm_snapshot_t",403,"off")=7692
 	Set gtmtypes("shm_snapshot_t",403,"len")=4
 	Set gtmtypes("shm_snapshot_t",403,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_wrt_latch_stuck_cntr")=403
-	Set gtmtypes("shm_snapshot_t",404,"name")="shm_snapshot_t.shadow_file_header.wcb_secshr_db_clnup_now_crit_cntr"
-	Set gtmtypes("shm_snapshot_t",404,"off")=7732
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_cr_invcr_cntr")=403
+	Set gtmtypes("shm_snapshot_t",404,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_rip_wait_cntr"
+	Set gtmtypes("shm_snapshot_t",404,"off")=7696
 	Set gtmtypes("shm_snapshot_t",404,"len")=4
 	Set gtmtypes("shm_snapshot_t",404,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_secshr_db_clnup_now_crit_cntr")=404
-	Set gtmtypes("shm_snapshot_t",405,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_bad_bt_index1_cntr"
-	Set gtmtypes("shm_snapshot_t",405,"off")=7736
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_rip_wait_cntr")=404
+	Set gtmtypes("shm_snapshot_t",405,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirtyripwait_cntr"
+	Set gtmtypes("shm_snapshot_t",405,"off")=7700
 	Set gtmtypes("shm_snapshot_t",405,"len")=4
 	Set gtmtypes("shm_snapshot_t",405,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_bad_bt_index1_cntr")=405
-	Set gtmtypes("shm_snapshot_t",406,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_bad_bt_index2_cntr"
-	Set gtmtypes("shm_snapshot_t",406,"off")=7740
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirtyripwait_cntr")=405
+	Set gtmtypes("shm_snapshot_t",406,"name")="shm_snapshot_t.shadow_file_header.wcb_gds_rundown_cntr"
+	Set gtmtypes("shm_snapshot_t",406,"off")=7704
 	Set gtmtypes("shm_snapshot_t",406,"len")=4
 	Set gtmtypes("shm_snapshot_t",406,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_bad_bt_index2_cntr")=406
-	Set gtmtypes("shm_snapshot_t",407,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_crbtmismatch1_cntr"
-	Set gtmtypes("shm_snapshot_t",407,"off")=7744
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_gds_rundown_cntr")=406
+	Set gtmtypes("shm_snapshot_t",407,"name")="shm_snapshot_t.shadow_file_header.wcb_wcs_flu1_cntr"
+	Set gtmtypes("shm_snapshot_t",407,"off")=7708
 	Set gtmtypes("shm_snapshot_t",407,"len")=4
 	Set gtmtypes("shm_snapshot_t",407,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_crbtmismatch1_cntr")=407
-	Set gtmtypes("shm_snapshot_t",408,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_crbtmismatch2_cntr"
-	Set gtmtypes("shm_snapshot_t",408,"off")=7748
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wcs_flu1_cntr")=407
+	Set gtmtypes("shm_snapshot_t",408,"name")="shm_snapshot_t.shadow_file_header.wcb_mu_back_cntr"
+	Set gtmtypes("shm_snapshot_t",408,"off")=7712
 	Set gtmtypes("shm_snapshot_t",408,"len")=4
 	Set gtmtypes("shm_snapshot_t",408,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_crbtmismatch2_cntr")=408
-	Set gtmtypes("shm_snapshot_t",409,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_crbtmismatch3_cntr"
-	Set gtmtypes("shm_snapshot_t",409,"off")=7752
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_mu_back_cntr")=408
+	Set gtmtypes("shm_snapshot_t",409,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirty_invcr_cntr"
+	Set gtmtypes("shm_snapshot_t",409,"off")=7716
 	Set gtmtypes("shm_snapshot_t",409,"len")=4
 	Set gtmtypes("shm_snapshot_t",409,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_crbtmismatch3_cntr")=409
-	Set gtmtypes("shm_snapshot_t",410,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_cntr"
-	Set gtmtypes("shm_snapshot_t",410,"off")=7756
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirty_invcr_cntr")=409
+	Set gtmtypes("shm_snapshot_t",410,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_wtfini_fail_cntr"
+	Set gtmtypes("shm_snapshot_t",410,"off")=7720
 	Set gtmtypes("shm_snapshot_t",410,"len")=4
 	Set gtmtypes("shm_snapshot_t",410,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_cntr")=410
-	Set gtmtypes("shm_snapshot_t",411,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_cntr"
-	Set gtmtypes("shm_snapshot_t",411,"off")=7760
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_wtfini_fail_cntr")=410
+	Set gtmtypes("shm_snapshot_t",411,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_twin_stuck_cntr"
+	Set gtmtypes("shm_snapshot_t",411,"off")=7724
 	Set gtmtypes("shm_snapshot_t",411,"len")=4
 	Set gtmtypes("shm_snapshot_t",411,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_cntr")=411
-	Set gtmtypes("shm_snapshot_t",412,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_cntr"
-	Set gtmtypes("shm_snapshot_t",412,"off")=7764
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_twin_stuck_cntr")=411
+	Set gtmtypes("shm_snapshot_t",412,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_wrt_latch_stuck_cntr"
+	Set gtmtypes("shm_snapshot_t",412,"off")=7728
 	Set gtmtypes("shm_snapshot_t",412,"len")=4
 	Set gtmtypes("shm_snapshot_t",412,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_cntr")=412
-	Set gtmtypes("shm_snapshot_t",413,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_cntr"
-	Set gtmtypes("shm_snapshot_t",413,"off")=7768
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_wrt_latch_stuck_cntr")=412
+	Set gtmtypes("shm_snapshot_t",413,"name")="shm_snapshot_t.shadow_file_header.wcb_secshr_db_clnup_now_crit_cntr"
+	Set gtmtypes("shm_snapshot_t",413,"off")=7732
 	Set gtmtypes("shm_snapshot_t",413,"len")=4
 	Set gtmtypes("shm_snapshot_t",413,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_cntr")=413
-	Set gtmtypes("shm_snapshot_t",414,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_cntr"
-	Set gtmtypes("shm_snapshot_t",414,"off")=7772
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_secshr_db_clnup_now_crit_cntr")=413
+	Set gtmtypes("shm_snapshot_t",414,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_bad_bt_index1_cntr"
+	Set gtmtypes("shm_snapshot_t",414,"off")=7736
 	Set gtmtypes("shm_snapshot_t",414,"len")=4
 	Set gtmtypes("shm_snapshot_t",414,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_cntr")=414
-	Set gtmtypes("shm_snapshot_t",415,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_bt_get_cntr"
-	Set gtmtypes("shm_snapshot_t",415,"off")=7776
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_bad_bt_index1_cntr")=414
+	Set gtmtypes("shm_snapshot_t",415,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_bad_bt_index2_cntr"
+	Set gtmtypes("shm_snapshot_t",415,"off")=7740
 	Set gtmtypes("shm_snapshot_t",415,"len")=4
 	Set gtmtypes("shm_snapshot_t",415,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_bt_get_cntr")=415
-	Set gtmtypes("shm_snapshot_t",416,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_cntr"
-	Set gtmtypes("shm_snapshot_t",416,"off")=7780
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_bad_bt_index2_cntr")=415
+	Set gtmtypes("shm_snapshot_t",416,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_crbtmismatch1_cntr"
+	Set gtmtypes("shm_snapshot_t",416,"off")=7744
 	Set gtmtypes("shm_snapshot_t",416,"len")=4
 	Set gtmtypes("shm_snapshot_t",416,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_cntr")=416
-	Set gtmtypes("shm_snapshot_t",417,"name")="shm_snapshot_t.shadow_file_header.wcb_bg_update_lckfail1_cntr"
-	Set gtmtypes("shm_snapshot_t",417,"off")=7784
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_crbtmismatch1_cntr")=416
+	Set gtmtypes("shm_snapshot_t",417,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_crbtmismatch2_cntr"
+	Set gtmtypes("shm_snapshot_t",417,"off")=7748
 	Set gtmtypes("shm_snapshot_t",417,"len")=4
 	Set gtmtypes("shm_snapshot_t",417,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_bg_update_lckfail1_cntr")=417
-	Set gtmtypes("shm_snapshot_t",418,"name")="shm_snapshot_t.shadow_file_header.wcb_bg_update_lckfail2_cntr"
-	Set gtmtypes("shm_snapshot_t",418,"off")=7788
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_crbtmismatch2_cntr")=417
+	Set gtmtypes("shm_snapshot_t",418,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_crbtmismatch3_cntr"
+	Set gtmtypes("shm_snapshot_t",418,"off")=7752
 	Set gtmtypes("shm_snapshot_t",418,"len")=4
 	Set gtmtypes("shm_snapshot_t",418,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_bg_update_lckfail2_cntr")=418
-	Set gtmtypes("shm_snapshot_t",419,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail1_cntr"
-	Set gtmtypes("shm_snapshot_t",419,"off")=7792
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_crbtmismatch3_cntr")=418
+	Set gtmtypes("shm_snapshot_t",419,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_cntr"
+	Set gtmtypes("shm_snapshot_t",419,"off")=7756
 	Set gtmtypes("shm_snapshot_t",419,"len")=4
 	Set gtmtypes("shm_snapshot_t",419,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail1_cntr")=419
-	Set gtmtypes("shm_snapshot_t",420,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail2_cntr"
-	Set gtmtypes("shm_snapshot_t",420,"off")=7796
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_cntr")=419
+	Set gtmtypes("shm_snapshot_t",420,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_cntr"
+	Set gtmtypes("shm_snapshot_t",420,"off")=7760
 	Set gtmtypes("shm_snapshot_t",420,"len")=4
 	Set gtmtypes("shm_snapshot_t",420,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail2_cntr")=420
-	Set gtmtypes("shm_snapshot_t",421,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail3_cntr"
-	Set gtmtypes("shm_snapshot_t",421,"off")=7800
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_cntr")=420
+	Set gtmtypes("shm_snapshot_t",421,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_cntr"
+	Set gtmtypes("shm_snapshot_t",421,"off")=7764
 	Set gtmtypes("shm_snapshot_t",421,"len")=4
 	Set gtmtypes("shm_snapshot_t",421,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail3_cntr")=421
-	Set gtmtypes("shm_snapshot_t",422,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail4_cntr"
-	Set gtmtypes("shm_snapshot_t",422,"off")=7804
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_cntr")=421
+	Set gtmtypes("shm_snapshot_t",422,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_cntr"
+	Set gtmtypes("shm_snapshot_t",422,"off")=7768
 	Set gtmtypes("shm_snapshot_t",422,"len")=4
 	Set gtmtypes("shm_snapshot_t",422,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail4_cntr")=422
-	Set gtmtypes("shm_snapshot_t",423,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail1_cntr"
-	Set gtmtypes("shm_snapshot_t",423,"off")=7808
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_cntr")=422
+	Set gtmtypes("shm_snapshot_t",423,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_cntr"
+	Set gtmtypes("shm_snapshot_t",423,"off")=7772
 	Set gtmtypes("shm_snapshot_t",423,"len")=4
 	Set gtmtypes("shm_snapshot_t",423,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail1_cntr")=423
-	Set gtmtypes("shm_snapshot_t",424,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail2_cntr"
-	Set gtmtypes("shm_snapshot_t",424,"off")=7812
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_cntr")=423
+	Set gtmtypes("shm_snapshot_t",424,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_bt_get_cntr"
+	Set gtmtypes("shm_snapshot_t",424,"off")=7776
 	Set gtmtypes("shm_snapshot_t",424,"len")=4
 	Set gtmtypes("shm_snapshot_t",424,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail2_cntr")=424
-	Set gtmtypes("shm_snapshot_t",425,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail3_cntr"
-	Set gtmtypes("shm_snapshot_t",425,"off")=7816
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_bt_get_cntr")=424
+	Set gtmtypes("shm_snapshot_t",425,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_cntr"
+	Set gtmtypes("shm_snapshot_t",425,"off")=7780
 	Set gtmtypes("shm_snapshot_t",425,"len")=4
 	Set gtmtypes("shm_snapshot_t",425,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail3_cntr")=425
-	Set gtmtypes("shm_snapshot_t",426,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail4_cntr"
-	Set gtmtypes("shm_snapshot_t",426,"off")=7820
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_cntr")=425
+	Set gtmtypes("shm_snapshot_t",426,"name")="shm_snapshot_t.shadow_file_header.wcb_bg_update_lckfail1_cntr"
+	Set gtmtypes("shm_snapshot_t",426,"off")=7784
 	Set gtmtypes("shm_snapshot_t",426,"len")=4
 	Set gtmtypes("shm_snapshot_t",426,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail4_cntr")=426
-	Set gtmtypes("shm_snapshot_t",427,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirtystuck1_cntr"
-	Set gtmtypes("shm_snapshot_t",427,"off")=7824
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_bg_update_lckfail1_cntr")=426
+	Set gtmtypes("shm_snapshot_t",427,"name")="shm_snapshot_t.shadow_file_header.wcb_bg_update_lckfail2_cntr"
+	Set gtmtypes("shm_snapshot_t",427,"off")=7788
 	Set gtmtypes("shm_snapshot_t",427,"len")=4
 	Set gtmtypes("shm_snapshot_t",427,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirtystuck1_cntr")=427
-	Set gtmtypes("shm_snapshot_t",428,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirtystuck2_cntr"
-	Set gtmtypes("shm_snapshot_t",428,"off")=7828
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_bg_update_lckfail2_cntr")=427
+	Set gtmtypes("shm_snapshot_t",428,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail1_cntr"
+	Set gtmtypes("shm_snapshot_t",428,"off")=7792
 	Set gtmtypes("shm_snapshot_t",428,"len")=4
 	Set gtmtypes("shm_snapshot_t",428,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirtystuck2_cntr")=428
-	Set gtmtypes("shm_snapshot_t",429,"name")="shm_snapshot_t.shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_cntr"
-	Set gtmtypes("shm_snapshot_t",429,"off")=7832
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail1_cntr")=428
+	Set gtmtypes("shm_snapshot_t",429,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail2_cntr"
+	Set gtmtypes("shm_snapshot_t",429,"off")=7796
 	Set gtmtypes("shm_snapshot_t",429,"len")=4
 	Set gtmtypes("shm_snapshot_t",429,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_cntr")=429
-	Set gtmtypes("shm_snapshot_t",430,"name")="shm_snapshot_t.shadow_file_header.dwngrd_refmts_syncio_cntr"
-	Set gtmtypes("shm_snapshot_t",430,"off")=7836
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail2_cntr")=429
+	Set gtmtypes("shm_snapshot_t",430,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail3_cntr"
+	Set gtmtypes("shm_snapshot_t",430,"off")=7800
 	Set gtmtypes("shm_snapshot_t",430,"len")=4
 	Set gtmtypes("shm_snapshot_t",430,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.dwngrd_refmts_syncio_cntr")=430
-	Set gtmtypes("shm_snapshot_t",431,"name")="shm_snapshot_t.shadow_file_header.dwngrd_refmts_asyncio_cntr"
-	Set gtmtypes("shm_snapshot_t",431,"off")=7840
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail3_cntr")=430
+	Set gtmtypes("shm_snapshot_t",431,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail4_cntr"
+	Set gtmtypes("shm_snapshot_t",431,"off")=7804
 	Set gtmtypes("shm_snapshot_t",431,"len")=4
 	Set gtmtypes("shm_snapshot_t",431,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.dwngrd_refmts_asyncio_cntr")=431
-	Set gtmtypes("shm_snapshot_t",432,"name")="shm_snapshot_t.shadow_file_header.shmpool_refmt_harvests_cntr"
-	Set gtmtypes("shm_snapshot_t",432,"off")=7844
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail4_cntr")=431
+	Set gtmtypes("shm_snapshot_t",432,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail1_cntr"
+	Set gtmtypes("shm_snapshot_t",432,"off")=7808
 	Set gtmtypes("shm_snapshot_t",432,"len")=4
 	Set gtmtypes("shm_snapshot_t",432,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_refmt_harvests_cntr")=432
-	Set gtmtypes("shm_snapshot_t",433,"name")="shm_snapshot_t.shadow_file_header.shmpool_recovery_cntr"
-	Set gtmtypes("shm_snapshot_t",433,"off")=7848
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail1_cntr")=432
+	Set gtmtypes("shm_snapshot_t",433,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail2_cntr"
+	Set gtmtypes("shm_snapshot_t",433,"off")=7812
 	Set gtmtypes("shm_snapshot_t",433,"len")=4
 	Set gtmtypes("shm_snapshot_t",433,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_recovery_cntr")=433
-	Set gtmtypes("shm_snapshot_t",434,"name")="shm_snapshot_t.shadow_file_header.shmpool_blkd_by_sdc_cntr"
-	Set gtmtypes("shm_snapshot_t",434,"off")=7852
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail2_cntr")=433
+	Set gtmtypes("shm_snapshot_t",434,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail3_cntr"
+	Set gtmtypes("shm_snapshot_t",434,"off")=7816
 	Set gtmtypes("shm_snapshot_t",434,"len")=4
 	Set gtmtypes("shm_snapshot_t",434,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_blkd_by_sdc_cntr")=434
-	Set gtmtypes("shm_snapshot_t",435,"name")="shm_snapshot_t.shadow_file_header.shmpool_alloc_bbflush_cntr"
-	Set gtmtypes("shm_snapshot_t",435,"off")=7856
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail3_cntr")=434
+	Set gtmtypes("shm_snapshot_t",435,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail4_cntr"
+	Set gtmtypes("shm_snapshot_t",435,"off")=7820
 	Set gtmtypes("shm_snapshot_t",435,"len")=4
 	Set gtmtypes("shm_snapshot_t",435,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_alloc_bbflush_cntr")=435
-	Set gtmtypes("shm_snapshot_t",436,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_released_replaced_cntr"
-	Set gtmtypes("shm_snapshot_t",436,"off")=7860
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail4_cntr")=435
+	Set gtmtypes("shm_snapshot_t",436,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirtystuck1_cntr"
+	Set gtmtypes("shm_snapshot_t",436,"off")=7824
 	Set gtmtypes("shm_snapshot_t",436,"len")=4
 	Set gtmtypes("shm_snapshot_t",436,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_released_replaced_cntr")=436
-	Set gtmtypes("shm_snapshot_t",437,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_released_io_complete_cntr"
-	Set gtmtypes("shm_snapshot_t",437,"off")=7864
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirtystuck1_cntr")=436
+	Set gtmtypes("shm_snapshot_t",437,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirtystuck2_cntr"
+	Set gtmtypes("shm_snapshot_t",437,"off")=7828
 	Set gtmtypes("shm_snapshot_t",437,"len")=4
 	Set gtmtypes("shm_snapshot_t",437,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_released_io_complete_cntr")=437
-	Set gtmtypes("shm_snapshot_t",438,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_kept_cntr"
-	Set gtmtypes("shm_snapshot_t",438,"off")=7868
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirtystuck2_cntr")=437
+	Set gtmtypes("shm_snapshot_t",438,"name")="shm_snapshot_t.shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_cntr"
+	Set gtmtypes("shm_snapshot_t",438,"off")=7832
 	Set gtmtypes("shm_snapshot_t",438,"len")=4
 	Set gtmtypes("shm_snapshot_t",438,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_kept_cntr")=438
-	Set gtmtypes("shm_snapshot_t",439,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_ignored_cntr"
-	Set gtmtypes("shm_snapshot_t",439,"off")=7872
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_cntr")=438
+	Set gtmtypes("shm_snapshot_t",439,"name")="shm_snapshot_t.shadow_file_header.dwngrd_refmts_syncio_cntr"
+	Set gtmtypes("shm_snapshot_t",439,"off")=7836
 	Set gtmtypes("shm_snapshot_t",439,"len")=4
 	Set gtmtypes("shm_snapshot_t",439,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_ignored_cntr")=439
-	Set gtmtypes("shm_snapshot_t",440,"name")="shm_snapshot_t.shadow_file_header.refmt_blk_chk_blk_freed_cntr"
-	Set gtmtypes("shm_snapshot_t",440,"off")=7876
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.dwngrd_refmts_syncio_cntr")=439
+	Set gtmtypes("shm_snapshot_t",440,"name")="shm_snapshot_t.shadow_file_header.dwngrd_refmts_asyncio_cntr"
+	Set gtmtypes("shm_snapshot_t",440,"off")=7840
 	Set gtmtypes("shm_snapshot_t",440,"len")=4
 	Set gtmtypes("shm_snapshot_t",440,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_blk_chk_blk_freed_cntr")=440
-	Set gtmtypes("shm_snapshot_t",441,"name")="shm_snapshot_t.shadow_file_header.refmt_blk_chk_blk_kept_cntr"
-	Set gtmtypes("shm_snapshot_t",441,"off")=7880
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.dwngrd_refmts_asyncio_cntr")=440
+	Set gtmtypes("shm_snapshot_t",441,"name")="shm_snapshot_t.shadow_file_header.shmpool_refmt_harvests_cntr"
+	Set gtmtypes("shm_snapshot_t",441,"off")=7844
 	Set gtmtypes("shm_snapshot_t",441,"len")=4
 	Set gtmtypes("shm_snapshot_t",441,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_blk_chk_blk_kept_cntr")=441
-	Set gtmtypes("shm_snapshot_t",442,"name")="shm_snapshot_t.shadow_file_header.active_lvl_trigger_cntr"
-	Set gtmtypes("shm_snapshot_t",442,"off")=7884
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_refmt_harvests_cntr")=441
+	Set gtmtypes("shm_snapshot_t",442,"name")="shm_snapshot_t.shadow_file_header.shmpool_recovery_cntr"
+	Set gtmtypes("shm_snapshot_t",442,"off")=7848
 	Set gtmtypes("shm_snapshot_t",442,"len")=4
 	Set gtmtypes("shm_snapshot_t",442,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.active_lvl_trigger_cntr")=442
-	Set gtmtypes("shm_snapshot_t",443,"name")="shm_snapshot_t.shadow_file_header.new_buff_cntr"
-	Set gtmtypes("shm_snapshot_t",443,"off")=7888
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_recovery_cntr")=442
+	Set gtmtypes("shm_snapshot_t",443,"name")="shm_snapshot_t.shadow_file_header.shmpool_blkd_by_sdc_cntr"
+	Set gtmtypes("shm_snapshot_t",443,"off")=7852
 	Set gtmtypes("shm_snapshot_t",443,"len")=4
 	Set gtmtypes("shm_snapshot_t",443,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.new_buff_cntr")=443
-	Set gtmtypes("shm_snapshot_t",444,"name")="shm_snapshot_t.shadow_file_header.phase2_commit_wait_sleep_in_crit_cntr"
-	Set gtmtypes("shm_snapshot_t",444,"off")=7892
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_blkd_by_sdc_cntr")=443
+	Set gtmtypes("shm_snapshot_t",444,"name")="shm_snapshot_t.shadow_file_header.shmpool_alloc_bbflush_cntr"
+	Set gtmtypes("shm_snapshot_t",444,"off")=7856
 	Set gtmtypes("shm_snapshot_t",444,"len")=4
 	Set gtmtypes("shm_snapshot_t",444,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.phase2_commit_wait_sleep_in_crit_cntr")=444
-	Set gtmtypes("shm_snapshot_t",445,"name")="shm_snapshot_t.shadow_file_header.phase2_commit_wait_sleep_no_crit_cntr"
-	Set gtmtypes("shm_snapshot_t",445,"off")=7896
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_alloc_bbflush_cntr")=444
+	Set gtmtypes("shm_snapshot_t",445,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_released_replaced_cntr"
+	Set gtmtypes("shm_snapshot_t",445,"off")=7860
 	Set gtmtypes("shm_snapshot_t",445,"len")=4
 	Set gtmtypes("shm_snapshot_t",445,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.phase2_commit_wait_sleep_no_crit_cntr")=445
-	Set gtmtypes("shm_snapshot_t",446,"name")="shm_snapshot_t.shadow_file_header.phase2_commit_wait_pidcnt_cntr"
-	Set gtmtypes("shm_snapshot_t",446,"off")=7900
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_released_replaced_cntr")=445
+	Set gtmtypes("shm_snapshot_t",446,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_released_io_complete_cntr"
+	Set gtmtypes("shm_snapshot_t",446,"off")=7864
 	Set gtmtypes("shm_snapshot_t",446,"len")=4
 	Set gtmtypes("shm_snapshot_t",446,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.phase2_commit_wait_pidcnt_cntr")=446
-	Set gtmtypes("shm_snapshot_t",447,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_intend_wait_cntr"
-	Set gtmtypes("shm_snapshot_t",447,"off")=7904
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_released_io_complete_cntr")=446
+	Set gtmtypes("shm_snapshot_t",447,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_kept_cntr"
+	Set gtmtypes("shm_snapshot_t",447,"off")=7868
 	Set gtmtypes("shm_snapshot_t",447,"len")=4
 	Set gtmtypes("shm_snapshot_t",447,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_intend_wait_cntr")=447
-	Set gtmtypes("shm_snapshot_t",448,"name")="shm_snapshot_t.shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_cntr"
-	Set gtmtypes("shm_snapshot_t",448,"off")=7908
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_kept_cntr")=447
+	Set gtmtypes("shm_snapshot_t",448,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_ignored_cntr"
+	Set gtmtypes("shm_snapshot_t",448,"off")=7872
 	Set gtmtypes("shm_snapshot_t",448,"len")=4
 	Set gtmtypes("shm_snapshot_t",448,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_cntr")=448
-	Set gtmtypes("shm_snapshot_t",449,"name")="shm_snapshot_t.shadow_file_header.wcb_phase2_commit_wait_cntr"
-	Set gtmtypes("shm_snapshot_t",449,"off")=7912
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_ignored_cntr")=448
+	Set gtmtypes("shm_snapshot_t",449,"name")="shm_snapshot_t.shadow_file_header.refmt_blk_chk_blk_freed_cntr"
+	Set gtmtypes("shm_snapshot_t",449,"off")=7876
 	Set gtmtypes("shm_snapshot_t",449,"len")=4
 	Set gtmtypes("shm_snapshot_t",449,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_phase2_commit_wait_cntr")=449
-	Set gtmtypes("shm_snapshot_t",450,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_calls_cntr"
-	Set gtmtypes("shm_snapshot_t",450,"off")=7916
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_blk_chk_blk_freed_cntr")=449
+	Set gtmtypes("shm_snapshot_t",450,"name")="shm_snapshot_t.shadow_file_header.refmt_blk_chk_blk_kept_cntr"
+	Set gtmtypes("shm_snapshot_t",450,"off")=7880
 	Set gtmtypes("shm_snapshot_t",450,"len")=4
 	Set gtmtypes("shm_snapshot_t",450,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_calls_cntr")=450
-	Set gtmtypes("shm_snapshot_t",451,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_rip_cntr"
-	Set gtmtypes("shm_snapshot_t",451,"off")=7920
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_blk_chk_blk_kept_cntr")=450
+	Set gtmtypes("shm_snapshot_t",451,"name")="shm_snapshot_t.shadow_file_header.active_lvl_trigger_cntr"
+	Set gtmtypes("shm_snapshot_t",451,"off")=7884
 	Set gtmtypes("shm_snapshot_t",451,"len")=4
 	Set gtmtypes("shm_snapshot_t",451,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_rip_cntr")=451
-	Set gtmtypes("shm_snapshot_t",452,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_in_tend_cntr"
-	Set gtmtypes("shm_snapshot_t",452,"off")=7924
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.active_lvl_trigger_cntr")=451
+	Set gtmtypes("shm_snapshot_t",452,"name")="shm_snapshot_t.shadow_file_header.new_buff_cntr"
+	Set gtmtypes("shm_snapshot_t",452,"off")=7888
 	Set gtmtypes("shm_snapshot_t",452,"len")=4
 	Set gtmtypes("shm_snapshot_t",452,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_in_tend_cntr")=452
-	Set gtmtypes("shm_snapshot_t",453,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_search_blk_cntr"
-	Set gtmtypes("shm_snapshot_t",453,"off")=7928
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.new_buff_cntr")=452
+	Set gtmtypes("shm_snapshot_t",453,"name")="shm_snapshot_t.shadow_file_header.phase2_commit_wait_sleep_in_crit_cntr"
+	Set gtmtypes("shm_snapshot_t",453,"off")=7892
 	Set gtmtypes("shm_snapshot_t",453,"len")=4
 	Set gtmtypes("shm_snapshot_t",453,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_search_blk_cntr")=453
-	Set gtmtypes("shm_snapshot_t",454,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_new_rec_cntr"
-	Set gtmtypes("shm_snapshot_t",454,"off")=7932
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.phase2_commit_wait_sleep_in_crit_cntr")=453
+	Set gtmtypes("shm_snapshot_t",454,"name")="shm_snapshot_t.shadow_file_header.phase2_commit_wait_sleep_no_crit_cntr"
+	Set gtmtypes("shm_snapshot_t",454,"off")=7896
 	Set gtmtypes("shm_snapshot_t",454,"len")=4
 	Set gtmtypes("shm_snapshot_t",454,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_new_rec_cntr")=454
-	Set gtmtypes("shm_snapshot_t",455,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_rec_size_cntr"
-	Set gtmtypes("shm_snapshot_t",455,"off")=7936
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.phase2_commit_wait_sleep_no_crit_cntr")=454
+	Set gtmtypes("shm_snapshot_t",455,"name")="shm_snapshot_t.shadow_file_header.phase2_commit_wait_pidcnt_cntr"
+	Set gtmtypes("shm_snapshot_t",455,"off")=7900
 	Set gtmtypes("shm_snapshot_t",455,"len")=4
 	Set gtmtypes("shm_snapshot_t",455,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_rec_size_cntr")=455
-	Set gtmtypes("shm_snapshot_t",456,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_rec_cmpc_cntr"
-	Set gtmtypes("shm_snapshot_t",456,"off")=7940
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.phase2_commit_wait_pidcnt_cntr")=455
+	Set gtmtypes("shm_snapshot_t",456,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_intend_wait_cntr"
+	Set gtmtypes("shm_snapshot_t",456,"off")=7904
 	Set gtmtypes("shm_snapshot_t",456,"len")=4
 	Set gtmtypes("shm_snapshot_t",456,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_rec_cmpc_cntr")=456
-	Set gtmtypes("shm_snapshot_t",457,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_blk_fini_cntr"
-	Set gtmtypes("shm_snapshot_t",457,"off")=7944
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_intend_wait_cntr")=456
+	Set gtmtypes("shm_snapshot_t",457,"name")="shm_snapshot_t.shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_cntr"
+	Set gtmtypes("shm_snapshot_t",457,"off")=7908
 	Set gtmtypes("shm_snapshot_t",457,"len")=4
 	Set gtmtypes("shm_snapshot_t",457,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_blk_fini_cntr")=457
-	Set gtmtypes("shm_snapshot_t",458,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_blk_split_cntr"
-	Set gtmtypes("shm_snapshot_t",458,"off")=7948
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_cntr")=457
+	Set gtmtypes("shm_snapshot_t",458,"name")="shm_snapshot_t.shadow_file_header.wcb_phase2_commit_wait_cntr"
+	Set gtmtypes("shm_snapshot_t",458,"off")=7912
 	Set gtmtypes("shm_snapshot_t",458,"len")=4
 	Set gtmtypes("shm_snapshot_t",458,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_blk_split_cntr")=458
-	Set gtmtypes("shm_snapshot_t",459,"name")="shm_snapshot_t.shadow_file_header.t_qread_ripsleep_cnt_cntr"
-	Set gtmtypes("shm_snapshot_t",459,"off")=7952
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_phase2_commit_wait_cntr")=458
+	Set gtmtypes("shm_snapshot_t",459,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_calls_cntr"
+	Set gtmtypes("shm_snapshot_t",459,"off")=7916
 	Set gtmtypes("shm_snapshot_t",459,"len")=4
 	Set gtmtypes("shm_snapshot_t",459,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_ripsleep_cnt_cntr")=459
-	Set gtmtypes("shm_snapshot_t",460,"name")="shm_snapshot_t.shadow_file_header.t_qread_ripsleep_nblks_cntr"
-	Set gtmtypes("shm_snapshot_t",460,"off")=7956
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_calls_cntr")=459
+	Set gtmtypes("shm_snapshot_t",460,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_rip_cntr"
+	Set gtmtypes("shm_snapshot_t",460,"off")=7920
 	Set gtmtypes("shm_snapshot_t",460,"len")=4
 	Set gtmtypes("shm_snapshot_t",460,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_ripsleep_nblks_cntr")=460
-	Set gtmtypes("shm_snapshot_t",461,"name")="shm_snapshot_t.shadow_file_header.bg_trc_rec_cntr_filler"
-	Set gtmtypes("shm_snapshot_t",461,"off")=7960
-	Set gtmtypes("shm_snapshot_t",461,"len")=56
-	Set gtmtypes("shm_snapshot_t",461,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bg_trc_rec_cntr_filler")=461
-	Set gtmtypes("shm_snapshot_t",462,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srches"
-	Set gtmtypes("shm_snapshot_t",462,"off")=8016
-	Set gtmtypes("shm_snapshot_t",462,"len")=8
-	Set gtmtypes("shm_snapshot_t",462,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srches")=462
-	Set gtmtypes("shm_snapshot_t",463,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srches.curr_count"
-	Set gtmtypes("shm_snapshot_t",463,"off")=8016
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_rip_cntr")=460
+	Set gtmtypes("shm_snapshot_t",461,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_in_tend_cntr"
+	Set gtmtypes("shm_snapshot_t",461,"off")=7924
+	Set gtmtypes("shm_snapshot_t",461,"len")=4
+	Set gtmtypes("shm_snapshot_t",461,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_in_tend_cntr")=461
+	Set gtmtypes("shm_snapshot_t",462,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_search_blk_cntr"
+	Set gtmtypes("shm_snapshot_t",462,"off")=7928
+	Set gtmtypes("shm_snapshot_t",462,"len")=4
+	Set gtmtypes("shm_snapshot_t",462,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_search_blk_cntr")=462
+	Set gtmtypes("shm_snapshot_t",463,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_new_rec_cntr"
+	Set gtmtypes("shm_snapshot_t",463,"off")=7932
 	Set gtmtypes("shm_snapshot_t",463,"len")=4
 	Set gtmtypes("shm_snapshot_t",463,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srches.curr_count")=463
-	Set gtmtypes("shm_snapshot_t",464,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srches.cumul_count"
-	Set gtmtypes("shm_snapshot_t",464,"off")=8020
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_new_rec_cntr")=463
+	Set gtmtypes("shm_snapshot_t",464,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_rec_size_cntr"
+	Set gtmtypes("shm_snapshot_t",464,"off")=7936
 	Set gtmtypes("shm_snapshot_t",464,"len")=4
 	Set gtmtypes("shm_snapshot_t",464,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srches.cumul_count")=464
-	Set gtmtypes("shm_snapshot_t",465,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srch_clues"
-	Set gtmtypes("shm_snapshot_t",465,"off")=8024
-	Set gtmtypes("shm_snapshot_t",465,"len")=8
-	Set gtmtypes("shm_snapshot_t",465,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srch_clues")=465
-	Set gtmtypes("shm_snapshot_t",466,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srch_clues.curr_count"
-	Set gtmtypes("shm_snapshot_t",466,"off")=8024
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_rec_size_cntr")=464
+	Set gtmtypes("shm_snapshot_t",465,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_rec_cmpc_cntr"
+	Set gtmtypes("shm_snapshot_t",465,"off")=7940
+	Set gtmtypes("shm_snapshot_t",465,"len")=4
+	Set gtmtypes("shm_snapshot_t",465,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_rec_cmpc_cntr")=465
+	Set gtmtypes("shm_snapshot_t",466,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_blk_fini_cntr"
+	Set gtmtypes("shm_snapshot_t",466,"off")=7944
 	Set gtmtypes("shm_snapshot_t",466,"len")=4
 	Set gtmtypes("shm_snapshot_t",466,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srch_clues.curr_count")=466
-	Set gtmtypes("shm_snapshot_t",467,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srch_clues.cumul_count"
-	Set gtmtypes("shm_snapshot_t",467,"off")=8028
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_blk_fini_cntr")=466
+	Set gtmtypes("shm_snapshot_t",467,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_blk_split_cntr"
+	Set gtmtypes("shm_snapshot_t",467,"off")=7948
 	Set gtmtypes("shm_snapshot_t",467,"len")=4
 	Set gtmtypes("shm_snapshot_t",467,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srch_clues.cumul_count")=467
-	Set gtmtypes("shm_snapshot_t",468,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_head"
-	Set gtmtypes("shm_snapshot_t",468,"off")=8032
-	Set gtmtypes("shm_snapshot_t",468,"len")=8
-	Set gtmtypes("shm_snapshot_t",468,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_head")=468
-	Set gtmtypes("shm_snapshot_t",469,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_head.curr_count"
-	Set gtmtypes("shm_snapshot_t",469,"off")=8032
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_blk_split_cntr")=467
+	Set gtmtypes("shm_snapshot_t",468,"name")="shm_snapshot_t.shadow_file_header.t_qread_ripsleep_cnt_cntr"
+	Set gtmtypes("shm_snapshot_t",468,"off")=7952
+	Set gtmtypes("shm_snapshot_t",468,"len")=4
+	Set gtmtypes("shm_snapshot_t",468,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_ripsleep_cnt_cntr")=468
+	Set gtmtypes("shm_snapshot_t",469,"name")="shm_snapshot_t.shadow_file_header.t_qread_ripsleep_nblks_cntr"
+	Set gtmtypes("shm_snapshot_t",469,"off")=7956
 	Set gtmtypes("shm_snapshot_t",469,"len")=4
 	Set gtmtypes("shm_snapshot_t",469,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_head.curr_count")=469
-	Set gtmtypes("shm_snapshot_t",470,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_head.cumul_count"
-	Set gtmtypes("shm_snapshot_t",470,"off")=8036
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_ripsleep_nblks_cntr")=469
+	Set gtmtypes("shm_snapshot_t",470,"name")="shm_snapshot_t.shadow_file_header.wcs_wtfini_invoked_cntr"
+	Set gtmtypes("shm_snapshot_t",470,"off")=7960
 	Set gtmtypes("shm_snapshot_t",470,"len")=4
 	Set gtmtypes("shm_snapshot_t",470,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_head.cumul_count")=470
-	Set gtmtypes("shm_snapshot_t",471,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_same"
-	Set gtmtypes("shm_snapshot_t",471,"off")=8040
-	Set gtmtypes("shm_snapshot_t",471,"len")=8
-	Set gtmtypes("shm_snapshot_t",471,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_same")=471
-	Set gtmtypes("shm_snapshot_t",472,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_same.curr_count"
-	Set gtmtypes("shm_snapshot_t",472,"off")=8040
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wtfini_invoked_cntr")=470
+	Set gtmtypes("shm_snapshot_t",471,"name")="shm_snapshot_t.shadow_file_header.wcs_wterror_invoked_cntr"
+	Set gtmtypes("shm_snapshot_t",471,"off")=7964
+	Set gtmtypes("shm_snapshot_t",471,"len")=4
+	Set gtmtypes("shm_snapshot_t",471,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wterror_invoked_cntr")=471
+	Set gtmtypes("shm_snapshot_t",472,"name")="shm_snapshot_t.shadow_file_header.wcs_wt_restart_invoked_cntr"
+	Set gtmtypes("shm_snapshot_t",472,"off")=7968
 	Set gtmtypes("shm_snapshot_t",472,"len")=4
 	Set gtmtypes("shm_snapshot_t",472,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_same.curr_count")=472
-	Set gtmtypes("shm_snapshot_t",473,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_same.cumul_count"
-	Set gtmtypes("shm_snapshot_t",473,"off")=8044
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wt_restart_invoked_cntr")=472
+	Set gtmtypes("shm_snapshot_t",473,"name")="shm_snapshot_t.shadow_file_header.wcs_wt_restart_eagain_cntr"
+	Set gtmtypes("shm_snapshot_t",473,"off")=7972
 	Set gtmtypes("shm_snapshot_t",473,"len")=4
 	Set gtmtypes("shm_snapshot_t",473,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_same.cumul_count")=473
-	Set gtmtypes("shm_snapshot_t",474,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_tail"
-	Set gtmtypes("shm_snapshot_t",474,"off")=8048
-	Set gtmtypes("shm_snapshot_t",474,"len")=8
-	Set gtmtypes("shm_snapshot_t",474,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_tail")=474
-	Set gtmtypes("shm_snapshot_t",475,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_tail.curr_count"
-	Set gtmtypes("shm_snapshot_t",475,"off")=8048
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wt_restart_eagain_cntr")=473
+	Set gtmtypes("shm_snapshot_t",474,"name")="shm_snapshot_t.shadow_file_header.wcs_wt_restart_reinsert_cntr"
+	Set gtmtypes("shm_snapshot_t",474,"off")=7976
+	Set gtmtypes("shm_snapshot_t",474,"len")=4
+	Set gtmtypes("shm_snapshot_t",474,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wt_restart_reinsert_cntr")=474
+	Set gtmtypes("shm_snapshot_t",475,"name")="shm_snapshot_t.shadow_file_header.wcs_wtstart_eagain_cntr"
+	Set gtmtypes("shm_snapshot_t",475,"off")=7980
 	Set gtmtypes("shm_snapshot_t",475,"len")=4
 	Set gtmtypes("shm_snapshot_t",475,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_tail.curr_count")=475
-	Set gtmtypes("shm_snapshot_t",476,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_tail.cumul_count"
-	Set gtmtypes("shm_snapshot_t",476,"off")=8052
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wtstart_eagain_cntr")=475
+	Set gtmtypes("shm_snapshot_t",476,"name")="shm_snapshot_t.shadow_file_header.wcs_wtstart_eagain_incrit_cntr"
+	Set gtmtypes("shm_snapshot_t",476,"off")=7984
 	Set gtmtypes("shm_snapshot_t",476,"len")=4
 	Set gtmtypes("shm_snapshot_t",476,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_tail.cumul_count")=476
-	Set gtmtypes("shm_snapshot_t",477,"name")="shm_snapshot_t.shadow_file_header.n_t_qreads"
-	Set gtmtypes("shm_snapshot_t",477,"off")=8056
-	Set gtmtypes("shm_snapshot_t",477,"len")=8
-	Set gtmtypes("shm_snapshot_t",477,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_t_qreads")=477
-	Set gtmtypes("shm_snapshot_t",478,"name")="shm_snapshot_t.shadow_file_header.n_t_qreads.curr_count"
-	Set gtmtypes("shm_snapshot_t",478,"off")=8056
-	Set gtmtypes("shm_snapshot_t",478,"len")=4
-	Set gtmtypes("shm_snapshot_t",478,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_t_qreads.curr_count")=478
-	Set gtmtypes("shm_snapshot_t",479,"name")="shm_snapshot_t.shadow_file_header.n_t_qreads.cumul_count"
-	Set gtmtypes("shm_snapshot_t",479,"off")=8060
-	Set gtmtypes("shm_snapshot_t",479,"len")=4
-	Set gtmtypes("shm_snapshot_t",479,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_t_qreads.cumul_count")=479
-	Set gtmtypes("shm_snapshot_t",480,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_reads"
-	Set gtmtypes("shm_snapshot_t",480,"off")=8064
-	Set gtmtypes("shm_snapshot_t",480,"len")=8
-	Set gtmtypes("shm_snapshot_t",480,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_reads")=480
-	Set gtmtypes("shm_snapshot_t",481,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_reads.curr_count"
-	Set gtmtypes("shm_snapshot_t",481,"off")=8064
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wtstart_eagain_incrit_cntr")=476
+	Set gtmtypes("shm_snapshot_t",477,"name")="shm_snapshot_t.shadow_file_header.async_restart_eagain_cntr"
+	Set gtmtypes("shm_snapshot_t",477,"off")=7988
+	Set gtmtypes("shm_snapshot_t",477,"len")=4
+	Set gtmtypes("shm_snapshot_t",477,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.async_restart_eagain_cntr")=477
+	Set gtmtypes("shm_snapshot_t",478,"name")="shm_snapshot_t.shadow_file_header.bg_trc_rec_cntr_filler"
+	Set gtmtypes("shm_snapshot_t",478,"off")=7992
+	Set gtmtypes("shm_snapshot_t",478,"len")=24
+	Set gtmtypes("shm_snapshot_t",478,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bg_trc_rec_cntr_filler")=478
+	Set gtmtypes("shm_snapshot_t",479,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srches"
+	Set gtmtypes("shm_snapshot_t",479,"off")=8016
+	Set gtmtypes("shm_snapshot_t",479,"len")=8
+	Set gtmtypes("shm_snapshot_t",479,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srches")=479
+	Set gtmtypes("shm_snapshot_t",480,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srches.curr_count"
+	Set gtmtypes("shm_snapshot_t",480,"off")=8016
+	Set gtmtypes("shm_snapshot_t",480,"len")=4
+	Set gtmtypes("shm_snapshot_t",480,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srches.curr_count")=480
+	Set gtmtypes("shm_snapshot_t",481,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srches.cumul_count"
+	Set gtmtypes("shm_snapshot_t",481,"off")=8020
 	Set gtmtypes("shm_snapshot_t",481,"len")=4
 	Set gtmtypes("shm_snapshot_t",481,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_reads.curr_count")=481
-	Set gtmtypes("shm_snapshot_t",482,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_reads.cumul_count"
-	Set gtmtypes("shm_snapshot_t",482,"off")=8068
-	Set gtmtypes("shm_snapshot_t",482,"len")=4
-	Set gtmtypes("shm_snapshot_t",482,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_reads.cumul_count")=482
-	Set gtmtypes("shm_snapshot_t",483,"name")="shm_snapshot_t.shadow_file_header.n_bgmm_updates"
-	Set gtmtypes("shm_snapshot_t",483,"off")=8072
-	Set gtmtypes("shm_snapshot_t",483,"len")=8
-	Set gtmtypes("shm_snapshot_t",483,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bgmm_updates")=483
-	Set gtmtypes("shm_snapshot_t",484,"name")="shm_snapshot_t.shadow_file_header.n_bgmm_updates.curr_count"
-	Set gtmtypes("shm_snapshot_t",484,"off")=8072
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srches.cumul_count")=481
+	Set gtmtypes("shm_snapshot_t",482,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srch_clues"
+	Set gtmtypes("shm_snapshot_t",482,"off")=8024
+	Set gtmtypes("shm_snapshot_t",482,"len")=8
+	Set gtmtypes("shm_snapshot_t",482,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srch_clues")=482
+	Set gtmtypes("shm_snapshot_t",483,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srch_clues.curr_count"
+	Set gtmtypes("shm_snapshot_t",483,"off")=8024
+	Set gtmtypes("shm_snapshot_t",483,"len")=4
+	Set gtmtypes("shm_snapshot_t",483,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srch_clues.curr_count")=483
+	Set gtmtypes("shm_snapshot_t",484,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srch_clues.cumul_count"
+	Set gtmtypes("shm_snapshot_t",484,"off")=8028
 	Set gtmtypes("shm_snapshot_t",484,"len")=4
 	Set gtmtypes("shm_snapshot_t",484,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bgmm_updates.curr_count")=484
-	Set gtmtypes("shm_snapshot_t",485,"name")="shm_snapshot_t.shadow_file_header.n_bgmm_updates.cumul_count"
-	Set gtmtypes("shm_snapshot_t",485,"off")=8076
-	Set gtmtypes("shm_snapshot_t",485,"len")=4
-	Set gtmtypes("shm_snapshot_t",485,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bgmm_updates.cumul_count")=485
-	Set gtmtypes("shm_snapshot_t",486,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_writes"
-	Set gtmtypes("shm_snapshot_t",486,"off")=8080
-	Set gtmtypes("shm_snapshot_t",486,"len")=8
-	Set gtmtypes("shm_snapshot_t",486,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_writes")=486
-	Set gtmtypes("shm_snapshot_t",487,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_writes.curr_count"
-	Set gtmtypes("shm_snapshot_t",487,"off")=8080
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srch_clues.cumul_count")=484
+	Set gtmtypes("shm_snapshot_t",485,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_head"
+	Set gtmtypes("shm_snapshot_t",485,"off")=8032
+	Set gtmtypes("shm_snapshot_t",485,"len")=8
+	Set gtmtypes("shm_snapshot_t",485,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_head")=485
+	Set gtmtypes("shm_snapshot_t",486,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_head.curr_count"
+	Set gtmtypes("shm_snapshot_t",486,"off")=8032
+	Set gtmtypes("shm_snapshot_t",486,"len")=4
+	Set gtmtypes("shm_snapshot_t",486,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_head.curr_count")=486
+	Set gtmtypes("shm_snapshot_t",487,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_head.cumul_count"
+	Set gtmtypes("shm_snapshot_t",487,"off")=8036
 	Set gtmtypes("shm_snapshot_t",487,"len")=4
 	Set gtmtypes("shm_snapshot_t",487,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_writes.curr_count")=487
-	Set gtmtypes("shm_snapshot_t",488,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_writes.cumul_count"
-	Set gtmtypes("shm_snapshot_t",488,"off")=8084
-	Set gtmtypes("shm_snapshot_t",488,"len")=4
-	Set gtmtypes("shm_snapshot_t",488,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_writes.cumul_count")=488
-	Set gtmtypes("shm_snapshot_t",489,"name")="shm_snapshot_t.shadow_file_header.n_bg_update_creates"
-	Set gtmtypes("shm_snapshot_t",489,"off")=8088
-	Set gtmtypes("shm_snapshot_t",489,"len")=8
-	Set gtmtypes("shm_snapshot_t",489,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bg_update_creates")=489
-	Set gtmtypes("shm_snapshot_t",490,"name")="shm_snapshot_t.shadow_file_header.n_bg_update_creates.curr_count"
-	Set gtmtypes("shm_snapshot_t",490,"off")=8088
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_head.cumul_count")=487
+	Set gtmtypes("shm_snapshot_t",488,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_same"
+	Set gtmtypes("shm_snapshot_t",488,"off")=8040
+	Set gtmtypes("shm_snapshot_t",488,"len")=8
+	Set gtmtypes("shm_snapshot_t",488,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_same")=488
+	Set gtmtypes("shm_snapshot_t",489,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_same.curr_count"
+	Set gtmtypes("shm_snapshot_t",489,"off")=8040
+	Set gtmtypes("shm_snapshot_t",489,"len")=4
+	Set gtmtypes("shm_snapshot_t",489,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_same.curr_count")=489
+	Set gtmtypes("shm_snapshot_t",490,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_same.cumul_count"
+	Set gtmtypes("shm_snapshot_t",490,"off")=8044
 	Set gtmtypes("shm_snapshot_t",490,"len")=4
 	Set gtmtypes("shm_snapshot_t",490,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bg_update_creates.curr_count")=490
-	Set gtmtypes("shm_snapshot_t",491,"name")="shm_snapshot_t.shadow_file_header.n_bg_update_creates.cumul_count"
-	Set gtmtypes("shm_snapshot_t",491,"off")=8092
-	Set gtmtypes("shm_snapshot_t",491,"len")=4
-	Set gtmtypes("shm_snapshot_t",491,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bg_update_creates.cumul_count")=491
-	Set gtmtypes("shm_snapshot_t",492,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getns"
-	Set gtmtypes("shm_snapshot_t",492,"off")=8096
-	Set gtmtypes("shm_snapshot_t",492,"len")=8
-	Set gtmtypes("shm_snapshot_t",492,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getns")=492
-	Set gtmtypes("shm_snapshot_t",493,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getns.curr_count"
-	Set gtmtypes("shm_snapshot_t",493,"off")=8096
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_same.cumul_count")=490
+	Set gtmtypes("shm_snapshot_t",491,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_tail"
+	Set gtmtypes("shm_snapshot_t",491,"off")=8048
+	Set gtmtypes("shm_snapshot_t",491,"len")=8
+	Set gtmtypes("shm_snapshot_t",491,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_tail")=491
+	Set gtmtypes("shm_snapshot_t",492,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_tail.curr_count"
+	Set gtmtypes("shm_snapshot_t",492,"off")=8048
+	Set gtmtypes("shm_snapshot_t",492,"len")=4
+	Set gtmtypes("shm_snapshot_t",492,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_tail.curr_count")=492
+	Set gtmtypes("shm_snapshot_t",493,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_tail.cumul_count"
+	Set gtmtypes("shm_snapshot_t",493,"off")=8052
 	Set gtmtypes("shm_snapshot_t",493,"len")=4
 	Set gtmtypes("shm_snapshot_t",493,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getns.curr_count")=493
-	Set gtmtypes("shm_snapshot_t",494,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getns.cumul_count"
-	Set gtmtypes("shm_snapshot_t",494,"off")=8100
-	Set gtmtypes("shm_snapshot_t",494,"len")=4
-	Set gtmtypes("shm_snapshot_t",494,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getns.cumul_count")=494
-	Set gtmtypes("shm_snapshot_t",495,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getn_lcnt"
-	Set gtmtypes("shm_snapshot_t",495,"off")=8104
-	Set gtmtypes("shm_snapshot_t",495,"len")=8
-	Set gtmtypes("shm_snapshot_t",495,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getn_lcnt")=495
-	Set gtmtypes("shm_snapshot_t",496,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getn_lcnt.curr_count"
-	Set gtmtypes("shm_snapshot_t",496,"off")=8104
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_tail.cumul_count")=493
+	Set gtmtypes("shm_snapshot_t",494,"name")="shm_snapshot_t.shadow_file_header.n_t_qreads"
+	Set gtmtypes("shm_snapshot_t",494,"off")=8056
+	Set gtmtypes("shm_snapshot_t",494,"len")=8
+	Set gtmtypes("shm_snapshot_t",494,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_t_qreads")=494
+	Set gtmtypes("shm_snapshot_t",495,"name")="shm_snapshot_t.shadow_file_header.n_t_qreads.curr_count"
+	Set gtmtypes("shm_snapshot_t",495,"off")=8056
+	Set gtmtypes("shm_snapshot_t",495,"len")=4
+	Set gtmtypes("shm_snapshot_t",495,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_t_qreads.curr_count")=495
+	Set gtmtypes("shm_snapshot_t",496,"name")="shm_snapshot_t.shadow_file_header.n_t_qreads.cumul_count"
+	Set gtmtypes("shm_snapshot_t",496,"off")=8060
 	Set gtmtypes("shm_snapshot_t",496,"len")=4
 	Set gtmtypes("shm_snapshot_t",496,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getn_lcnt.curr_count")=496
-	Set gtmtypes("shm_snapshot_t",497,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getn_lcnt.cumul_count"
-	Set gtmtypes("shm_snapshot_t",497,"off")=8108
-	Set gtmtypes("shm_snapshot_t",497,"len")=4
-	Set gtmtypes("shm_snapshot_t",497,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getn_lcnt.cumul_count")=497
-	Set gtmtypes("shm_snapshot_t",498,"name")="shm_snapshot_t.shadow_file_header.db_csh_acct_rec_filler_4k"
-	Set gtmtypes("shm_snapshot_t",498,"off")=8112
-	Set gtmtypes("shm_snapshot_t",498,"len")=152
-	Set gtmtypes("shm_snapshot_t",498,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_acct_rec_filler_4k")=498
-	Set gtmtypes("shm_snapshot_t",499,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec"
-	Set gtmtypes("shm_snapshot_t",499,"off")=8264
-	Set gtmtypes("shm_snapshot_t",499,"len")=464
-	Set gtmtypes("shm_snapshot_t",499,"type")="gvstats_rec_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec")=499
-	Set gtmtypes("shm_snapshot_t",500,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_set"
-	Set gtmtypes("shm_snapshot_t",500,"off")=8264
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_t_qreads.cumul_count")=496
+	Set gtmtypes("shm_snapshot_t",497,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_reads"
+	Set gtmtypes("shm_snapshot_t",497,"off")=8064
+	Set gtmtypes("shm_snapshot_t",497,"len")=8
+	Set gtmtypes("shm_snapshot_t",497,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_reads")=497
+	Set gtmtypes("shm_snapshot_t",498,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_reads.curr_count"
+	Set gtmtypes("shm_snapshot_t",498,"off")=8064
+	Set gtmtypes("shm_snapshot_t",498,"len")=4
+	Set gtmtypes("shm_snapshot_t",498,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_reads.curr_count")=498
+	Set gtmtypes("shm_snapshot_t",499,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_reads.cumul_count"
+	Set gtmtypes("shm_snapshot_t",499,"off")=8068
+	Set gtmtypes("shm_snapshot_t",499,"len")=4
+	Set gtmtypes("shm_snapshot_t",499,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_reads.cumul_count")=499
+	Set gtmtypes("shm_snapshot_t",500,"name")="shm_snapshot_t.shadow_file_header.n_bgmm_updates"
+	Set gtmtypes("shm_snapshot_t",500,"off")=8072
 	Set gtmtypes("shm_snapshot_t",500,"len")=8
-	Set gtmtypes("shm_snapshot_t",500,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_set")=500
-	Set gtmtypes("shm_snapshot_t",501,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_kill"
-	Set gtmtypes("shm_snapshot_t",501,"off")=8272
-	Set gtmtypes("shm_snapshot_t",501,"len")=8
-	Set gtmtypes("shm_snapshot_t",501,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_kill")=501
-	Set gtmtypes("shm_snapshot_t",502,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_get"
-	Set gtmtypes("shm_snapshot_t",502,"off")=8280
-	Set gtmtypes("shm_snapshot_t",502,"len")=8
-	Set gtmtypes("shm_snapshot_t",502,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_get")=502
-	Set gtmtypes("shm_snapshot_t",503,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_data"
-	Set gtmtypes("shm_snapshot_t",503,"off")=8288
+	Set gtmtypes("shm_snapshot_t",500,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bgmm_updates")=500
+	Set gtmtypes("shm_snapshot_t",501,"name")="shm_snapshot_t.shadow_file_header.n_bgmm_updates.curr_count"
+	Set gtmtypes("shm_snapshot_t",501,"off")=8072
+	Set gtmtypes("shm_snapshot_t",501,"len")=4
+	Set gtmtypes("shm_snapshot_t",501,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bgmm_updates.curr_count")=501
+	Set gtmtypes("shm_snapshot_t",502,"name")="shm_snapshot_t.shadow_file_header.n_bgmm_updates.cumul_count"
+	Set gtmtypes("shm_snapshot_t",502,"off")=8076
+	Set gtmtypes("shm_snapshot_t",502,"len")=4
+	Set gtmtypes("shm_snapshot_t",502,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bgmm_updates.cumul_count")=502
+	Set gtmtypes("shm_snapshot_t",503,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_writes"
+	Set gtmtypes("shm_snapshot_t",503,"off")=8080
 	Set gtmtypes("shm_snapshot_t",503,"len")=8
-	Set gtmtypes("shm_snapshot_t",503,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_data")=503
-	Set gtmtypes("shm_snapshot_t",504,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_order"
-	Set gtmtypes("shm_snapshot_t",504,"off")=8296
-	Set gtmtypes("shm_snapshot_t",504,"len")=8
-	Set gtmtypes("shm_snapshot_t",504,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_order")=504
-	Set gtmtypes("shm_snapshot_t",505,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_zprev"
-	Set gtmtypes("shm_snapshot_t",505,"off")=8304
-	Set gtmtypes("shm_snapshot_t",505,"len")=8
-	Set gtmtypes("shm_snapshot_t",505,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_zprev")=505
-	Set gtmtypes("shm_snapshot_t",506,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_query"
-	Set gtmtypes("shm_snapshot_t",506,"off")=8312
+	Set gtmtypes("shm_snapshot_t",503,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_writes")=503
+	Set gtmtypes("shm_snapshot_t",504,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_writes.curr_count"
+	Set gtmtypes("shm_snapshot_t",504,"off")=8080
+	Set gtmtypes("shm_snapshot_t",504,"len")=4
+	Set gtmtypes("shm_snapshot_t",504,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_writes.curr_count")=504
+	Set gtmtypes("shm_snapshot_t",505,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_writes.cumul_count"
+	Set gtmtypes("shm_snapshot_t",505,"off")=8084
+	Set gtmtypes("shm_snapshot_t",505,"len")=4
+	Set gtmtypes("shm_snapshot_t",505,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_writes.cumul_count")=505
+	Set gtmtypes("shm_snapshot_t",506,"name")="shm_snapshot_t.shadow_file_header.n_bg_update_creates"
+	Set gtmtypes("shm_snapshot_t",506,"off")=8088
 	Set gtmtypes("shm_snapshot_t",506,"len")=8
-	Set gtmtypes("shm_snapshot_t",506,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_query")=506
-	Set gtmtypes("shm_snapshot_t",507,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_lock_success"
-	Set gtmtypes("shm_snapshot_t",507,"off")=8320
-	Set gtmtypes("shm_snapshot_t",507,"len")=8
-	Set gtmtypes("shm_snapshot_t",507,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_lock_success")=507
-	Set gtmtypes("shm_snapshot_t",508,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_lock_fail"
-	Set gtmtypes("shm_snapshot_t",508,"off")=8328
-	Set gtmtypes("shm_snapshot_t",508,"len")=8
-	Set gtmtypes("shm_snapshot_t",508,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_lock_fail")=508
-	Set gtmtypes("shm_snapshot_t",509,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.db_curr_tn"
-	Set gtmtypes("shm_snapshot_t",509,"off")=8336
+	Set gtmtypes("shm_snapshot_t",506,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bg_update_creates")=506
+	Set gtmtypes("shm_snapshot_t",507,"name")="shm_snapshot_t.shadow_file_header.n_bg_update_creates.curr_count"
+	Set gtmtypes("shm_snapshot_t",507,"off")=8088
+	Set gtmtypes("shm_snapshot_t",507,"len")=4
+	Set gtmtypes("shm_snapshot_t",507,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bg_update_creates.curr_count")=507
+	Set gtmtypes("shm_snapshot_t",508,"name")="shm_snapshot_t.shadow_file_header.n_bg_update_creates.cumul_count"
+	Set gtmtypes("shm_snapshot_t",508,"off")=8092
+	Set gtmtypes("shm_snapshot_t",508,"len")=4
+	Set gtmtypes("shm_snapshot_t",508,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bg_update_creates.cumul_count")=508
+	Set gtmtypes("shm_snapshot_t",509,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getns"
+	Set gtmtypes("shm_snapshot_t",509,"off")=8096
 	Set gtmtypes("shm_snapshot_t",509,"len")=8
-	Set gtmtypes("shm_snapshot_t",509,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.db_curr_tn")=509
-	Set gtmtypes("shm_snapshot_t",510,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_dsk_read"
-	Set gtmtypes("shm_snapshot_t",510,"off")=8344
-	Set gtmtypes("shm_snapshot_t",510,"len")=8
-	Set gtmtypes("shm_snapshot_t",510,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_dsk_read")=510
-	Set gtmtypes("shm_snapshot_t",511,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_dsk_write"
-	Set gtmtypes("shm_snapshot_t",511,"off")=8352
-	Set gtmtypes("shm_snapshot_t",511,"len")=8
-	Set gtmtypes("shm_snapshot_t",511,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_dsk_write")=511
-	Set gtmtypes("shm_snapshot_t",512,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_readwrite"
-	Set gtmtypes("shm_snapshot_t",512,"off")=8360
+	Set gtmtypes("shm_snapshot_t",509,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getns")=509
+	Set gtmtypes("shm_snapshot_t",510,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getns.curr_count"
+	Set gtmtypes("shm_snapshot_t",510,"off")=8096
+	Set gtmtypes("shm_snapshot_t",510,"len")=4
+	Set gtmtypes("shm_snapshot_t",510,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getns.curr_count")=510
+	Set gtmtypes("shm_snapshot_t",511,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getns.cumul_count"
+	Set gtmtypes("shm_snapshot_t",511,"off")=8100
+	Set gtmtypes("shm_snapshot_t",511,"len")=4
+	Set gtmtypes("shm_snapshot_t",511,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getns.cumul_count")=511
+	Set gtmtypes("shm_snapshot_t",512,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getn_lcnt"
+	Set gtmtypes("shm_snapshot_t",512,"off")=8104
 	Set gtmtypes("shm_snapshot_t",512,"len")=8
-	Set gtmtypes("shm_snapshot_t",512,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_readwrite")=512
-	Set gtmtypes("shm_snapshot_t",513,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_readonly"
-	Set gtmtypes("shm_snapshot_t",513,"off")=8368
-	Set gtmtypes("shm_snapshot_t",513,"len")=8
-	Set gtmtypes("shm_snapshot_t",513,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_readonly")=513
-	Set gtmtypes("shm_snapshot_t",514,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_blkwrite"
-	Set gtmtypes("shm_snapshot_t",514,"off")=8376
-	Set gtmtypes("shm_snapshot_t",514,"len")=8
-	Set gtmtypes("shm_snapshot_t",514,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_blkwrite")=514
-	Set gtmtypes("shm_snapshot_t",515,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_blkread"
-	Set gtmtypes("shm_snapshot_t",515,"off")=8384
-	Set gtmtypes("shm_snapshot_t",515,"len")=8
-	Set gtmtypes("shm_snapshot_t",515,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_blkread")=515
-	Set gtmtypes("shm_snapshot_t",516,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_retries_0"
-	Set gtmtypes("shm_snapshot_t",516,"off")=8392
-	Set gtmtypes("shm_snapshot_t",516,"len")=8
-	Set gtmtypes("shm_snapshot_t",516,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_retries_0")=516
-	Set gtmtypes("shm_snapshot_t",517,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_retries_1"
-	Set gtmtypes("shm_snapshot_t",517,"off")=8400
+	Set gtmtypes("shm_snapshot_t",512,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getn_lcnt")=512
+	Set gtmtypes("shm_snapshot_t",513,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getn_lcnt.curr_count"
+	Set gtmtypes("shm_snapshot_t",513,"off")=8104
+	Set gtmtypes("shm_snapshot_t",513,"len")=4
+	Set gtmtypes("shm_snapshot_t",513,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getn_lcnt.curr_count")=513
+	Set gtmtypes("shm_snapshot_t",514,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getn_lcnt.cumul_count"
+	Set gtmtypes("shm_snapshot_t",514,"off")=8108
+	Set gtmtypes("shm_snapshot_t",514,"len")=4
+	Set gtmtypes("shm_snapshot_t",514,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getn_lcnt.cumul_count")=514
+	Set gtmtypes("shm_snapshot_t",515,"name")="shm_snapshot_t.shadow_file_header.db_csh_acct_rec_filler_4k"
+	Set gtmtypes("shm_snapshot_t",515,"off")=8112
+	Set gtmtypes("shm_snapshot_t",515,"len")=152
+	Set gtmtypes("shm_snapshot_t",515,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_acct_rec_filler_4k")=515
+	Set gtmtypes("shm_snapshot_t",516,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec"
+	Set gtmtypes("shm_snapshot_t",516,"off")=8264
+	Set gtmtypes("shm_snapshot_t",516,"len")=472
+	Set gtmtypes("shm_snapshot_t",516,"type")="gvstats_rec_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec")=516
+	Set gtmtypes("shm_snapshot_t",517,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_set"
+	Set gtmtypes("shm_snapshot_t",517,"off")=8264
 	Set gtmtypes("shm_snapshot_t",517,"len")=8
 	Set gtmtypes("shm_snapshot_t",517,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_retries_1")=517
-	Set gtmtypes("shm_snapshot_t",518,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_retries_2"
-	Set gtmtypes("shm_snapshot_t",518,"off")=8408
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_set")=517
+	Set gtmtypes("shm_snapshot_t",518,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_kill"
+	Set gtmtypes("shm_snapshot_t",518,"off")=8272
 	Set gtmtypes("shm_snapshot_t",518,"len")=8
 	Set gtmtypes("shm_snapshot_t",518,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_retries_2")=518
-	Set gtmtypes("shm_snapshot_t",519,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_retries_3"
-	Set gtmtypes("shm_snapshot_t",519,"off")=8416
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_kill")=518
+	Set gtmtypes("shm_snapshot_t",519,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_get"
+	Set gtmtypes("shm_snapshot_t",519,"off")=8280
 	Set gtmtypes("shm_snapshot_t",519,"len")=8
 	Set gtmtypes("shm_snapshot_t",519,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_retries_3")=519
-	Set gtmtypes("shm_snapshot_t",520,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_readwrite"
-	Set gtmtypes("shm_snapshot_t",520,"off")=8424
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_get")=519
+	Set gtmtypes("shm_snapshot_t",520,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_data"
+	Set gtmtypes("shm_snapshot_t",520,"off")=8288
 	Set gtmtypes("shm_snapshot_t",520,"len")=8
 	Set gtmtypes("shm_snapshot_t",520,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_readwrite")=520
-	Set gtmtypes("shm_snapshot_t",521,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_readonly"
-	Set gtmtypes("shm_snapshot_t",521,"off")=8432
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_data")=520
+	Set gtmtypes("shm_snapshot_t",521,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_order"
+	Set gtmtypes("shm_snapshot_t",521,"off")=8296
 	Set gtmtypes("shm_snapshot_t",521,"len")=8
 	Set gtmtypes("shm_snapshot_t",521,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_readonly")=521
-	Set gtmtypes("shm_snapshot_t",522,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_rolledback"
-	Set gtmtypes("shm_snapshot_t",522,"off")=8440
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_order")=521
+	Set gtmtypes("shm_snapshot_t",522,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_zprev"
+	Set gtmtypes("shm_snapshot_t",522,"off")=8304
 	Set gtmtypes("shm_snapshot_t",522,"len")=8
 	Set gtmtypes("shm_snapshot_t",522,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_rolledback")=522
-	Set gtmtypes("shm_snapshot_t",523,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_blkwrite"
-	Set gtmtypes("shm_snapshot_t",523,"off")=8448
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_zprev")=522
+	Set gtmtypes("shm_snapshot_t",523,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_query"
+	Set gtmtypes("shm_snapshot_t",523,"off")=8312
 	Set gtmtypes("shm_snapshot_t",523,"len")=8
 	Set gtmtypes("shm_snapshot_t",523,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_blkwrite")=523
-	Set gtmtypes("shm_snapshot_t",524,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_blkread"
-	Set gtmtypes("shm_snapshot_t",524,"off")=8456
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_query")=523
+	Set gtmtypes("shm_snapshot_t",524,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_lock_success"
+	Set gtmtypes("shm_snapshot_t",524,"off")=8320
 	Set gtmtypes("shm_snapshot_t",524,"len")=8
 	Set gtmtypes("shm_snapshot_t",524,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_blkread")=524
-	Set gtmtypes("shm_snapshot_t",525,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_tot_retries_0"
-	Set gtmtypes("shm_snapshot_t",525,"off")=8464
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_lock_success")=524
+	Set gtmtypes("shm_snapshot_t",525,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_lock_fail"
+	Set gtmtypes("shm_snapshot_t",525,"off")=8328
 	Set gtmtypes("shm_snapshot_t",525,"len")=8
 	Set gtmtypes("shm_snapshot_t",525,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_tot_retries_0")=525
-	Set gtmtypes("shm_snapshot_t",526,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_tot_retries_1"
-	Set gtmtypes("shm_snapshot_t",526,"off")=8472
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_lock_fail")=525
+	Set gtmtypes("shm_snapshot_t",526,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.db_curr_tn"
+	Set gtmtypes("shm_snapshot_t",526,"off")=8336
 	Set gtmtypes("shm_snapshot_t",526,"len")=8
 	Set gtmtypes("shm_snapshot_t",526,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_tot_retries_1")=526
-	Set gtmtypes("shm_snapshot_t",527,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_tot_retries_2"
-	Set gtmtypes("shm_snapshot_t",527,"off")=8480
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.db_curr_tn")=526
+	Set gtmtypes("shm_snapshot_t",527,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_dsk_read"
+	Set gtmtypes("shm_snapshot_t",527,"off")=8344
 	Set gtmtypes("shm_snapshot_t",527,"len")=8
 	Set gtmtypes("shm_snapshot_t",527,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_tot_retries_2")=527
-	Set gtmtypes("shm_snapshot_t",528,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_tot_retries_3"
-	Set gtmtypes("shm_snapshot_t",528,"off")=8488
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_dsk_read")=527
+	Set gtmtypes("shm_snapshot_t",528,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_dsk_write"
+	Set gtmtypes("shm_snapshot_t",528,"off")=8352
 	Set gtmtypes("shm_snapshot_t",528,"len")=8
 	Set gtmtypes("shm_snapshot_t",528,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_tot_retries_3")=528
-	Set gtmtypes("shm_snapshot_t",529,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_tot_retries_4"
-	Set gtmtypes("shm_snapshot_t",529,"off")=8496
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_dsk_write")=528
+	Set gtmtypes("shm_snapshot_t",529,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_readwrite"
+	Set gtmtypes("shm_snapshot_t",529,"off")=8360
 	Set gtmtypes("shm_snapshot_t",529,"len")=8
 	Set gtmtypes("shm_snapshot_t",529,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_tot_retries_4")=529
-	Set gtmtypes("shm_snapshot_t",530,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_0"
-	Set gtmtypes("shm_snapshot_t",530,"off")=8504
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_readwrite")=529
+	Set gtmtypes("shm_snapshot_t",530,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_readonly"
+	Set gtmtypes("shm_snapshot_t",530,"off")=8368
 	Set gtmtypes("shm_snapshot_t",530,"len")=8
 	Set gtmtypes("shm_snapshot_t",530,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_0")=530
-	Set gtmtypes("shm_snapshot_t",531,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_1"
-	Set gtmtypes("shm_snapshot_t",531,"off")=8512
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_readonly")=530
+	Set gtmtypes("shm_snapshot_t",531,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_blkwrite"
+	Set gtmtypes("shm_snapshot_t",531,"off")=8376
 	Set gtmtypes("shm_snapshot_t",531,"len")=8
 	Set gtmtypes("shm_snapshot_t",531,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_1")=531
-	Set gtmtypes("shm_snapshot_t",532,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_2"
-	Set gtmtypes("shm_snapshot_t",532,"off")=8520
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_blkwrite")=531
+	Set gtmtypes("shm_snapshot_t",532,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_blkread"
+	Set gtmtypes("shm_snapshot_t",532,"off")=8384
 	Set gtmtypes("shm_snapshot_t",532,"len")=8
 	Set gtmtypes("shm_snapshot_t",532,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_2")=532
-	Set gtmtypes("shm_snapshot_t",533,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_3"
-	Set gtmtypes("shm_snapshot_t",533,"off")=8528
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_blkread")=532
+	Set gtmtypes("shm_snapshot_t",533,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_retries_0"
+	Set gtmtypes("shm_snapshot_t",533,"off")=8392
 	Set gtmtypes("shm_snapshot_t",533,"len")=8
 	Set gtmtypes("shm_snapshot_t",533,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_3")=533
-	Set gtmtypes("shm_snapshot_t",534,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_4"
-	Set gtmtypes("shm_snapshot_t",534,"off")=8536
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_retries_0")=533
+	Set gtmtypes("shm_snapshot_t",534,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_retries_1"
+	Set gtmtypes("shm_snapshot_t",534,"off")=8400
 	Set gtmtypes("shm_snapshot_t",534,"len")=8
 	Set gtmtypes("shm_snapshot_t",534,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_4")=534
-	Set gtmtypes("shm_snapshot_t",535,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_ztrigger"
-	Set gtmtypes("shm_snapshot_t",535,"off")=8544
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_retries_1")=534
+	Set gtmtypes("shm_snapshot_t",535,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_retries_2"
+	Set gtmtypes("shm_snapshot_t",535,"off")=8408
 	Set gtmtypes("shm_snapshot_t",535,"len")=8
 	Set gtmtypes("shm_snapshot_t",535,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_ztrigger")=535
-	Set gtmtypes("shm_snapshot_t",536,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_db_flush"
-	Set gtmtypes("shm_snapshot_t",536,"off")=8552
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_retries_2")=535
+	Set gtmtypes("shm_snapshot_t",536,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_retries_3"
+	Set gtmtypes("shm_snapshot_t",536,"off")=8416
 	Set gtmtypes("shm_snapshot_t",536,"len")=8
 	Set gtmtypes("shm_snapshot_t",536,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_db_flush")=536
-	Set gtmtypes("shm_snapshot_t",537,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_db_fsync"
-	Set gtmtypes("shm_snapshot_t",537,"off")=8560
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_retries_3")=536
+	Set gtmtypes("shm_snapshot_t",537,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_readwrite"
+	Set gtmtypes("shm_snapshot_t",537,"off")=8424
 	Set gtmtypes("shm_snapshot_t",537,"len")=8
 	Set gtmtypes("shm_snapshot_t",537,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_db_fsync")=537
-	Set gtmtypes("shm_snapshot_t",538,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jnl_flush"
-	Set gtmtypes("shm_snapshot_t",538,"off")=8568
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_readwrite")=537
+	Set gtmtypes("shm_snapshot_t",538,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_readonly"
+	Set gtmtypes("shm_snapshot_t",538,"off")=8432
 	Set gtmtypes("shm_snapshot_t",538,"len")=8
 	Set gtmtypes("shm_snapshot_t",538,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jnl_flush")=538
-	Set gtmtypes("shm_snapshot_t",539,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jnl_fsync"
-	Set gtmtypes("shm_snapshot_t",539,"off")=8576
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_readonly")=538
+	Set gtmtypes("shm_snapshot_t",539,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_rolledback"
+	Set gtmtypes("shm_snapshot_t",539,"off")=8440
 	Set gtmtypes("shm_snapshot_t",539,"len")=8
 	Set gtmtypes("shm_snapshot_t",539,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jnl_fsync")=539
-	Set gtmtypes("shm_snapshot_t",540,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jbuff_bytes"
-	Set gtmtypes("shm_snapshot_t",540,"off")=8584
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_rolledback")=539
+	Set gtmtypes("shm_snapshot_t",540,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_blkwrite"
+	Set gtmtypes("shm_snapshot_t",540,"off")=8448
 	Set gtmtypes("shm_snapshot_t",540,"len")=8
 	Set gtmtypes("shm_snapshot_t",540,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jbuff_bytes")=540
-	Set gtmtypes("shm_snapshot_t",541,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jfile_bytes"
-	Set gtmtypes("shm_snapshot_t",541,"off")=8592
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_blkwrite")=540
+	Set gtmtypes("shm_snapshot_t",541,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_blkread"
+	Set gtmtypes("shm_snapshot_t",541,"off")=8456
 	Set gtmtypes("shm_snapshot_t",541,"len")=8
 	Set gtmtypes("shm_snapshot_t",541,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jfile_bytes")=541
-	Set gtmtypes("shm_snapshot_t",542,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jfile_writes"
-	Set gtmtypes("shm_snapshot_t",542,"off")=8600
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_blkread")=541
+	Set gtmtypes("shm_snapshot_t",542,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_tot_retries_0"
+	Set gtmtypes("shm_snapshot_t",542,"off")=8464
 	Set gtmtypes("shm_snapshot_t",542,"len")=8
 	Set gtmtypes("shm_snapshot_t",542,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jfile_writes")=542
-	Set gtmtypes("shm_snapshot_t",543,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jrec_logical"
-	Set gtmtypes("shm_snapshot_t",543,"off")=8608
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_tot_retries_0")=542
+	Set gtmtypes("shm_snapshot_t",543,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_tot_retries_1"
+	Set gtmtypes("shm_snapshot_t",543,"off")=8472
 	Set gtmtypes("shm_snapshot_t",543,"len")=8
 	Set gtmtypes("shm_snapshot_t",543,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jrec_logical")=543
-	Set gtmtypes("shm_snapshot_t",544,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jrec_pblk"
-	Set gtmtypes("shm_snapshot_t",544,"off")=8616
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_tot_retries_1")=543
+	Set gtmtypes("shm_snapshot_t",544,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_tot_retries_2"
+	Set gtmtypes("shm_snapshot_t",544,"off")=8480
 	Set gtmtypes("shm_snapshot_t",544,"len")=8
 	Set gtmtypes("shm_snapshot_t",544,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jrec_pblk")=544
-	Set gtmtypes("shm_snapshot_t",545,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jrec_epoch_regular"
-	Set gtmtypes("shm_snapshot_t",545,"off")=8624
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_tot_retries_2")=544
+	Set gtmtypes("shm_snapshot_t",545,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_tot_retries_3"
+	Set gtmtypes("shm_snapshot_t",545,"off")=8488
 	Set gtmtypes("shm_snapshot_t",545,"len")=8
 	Set gtmtypes("shm_snapshot_t",545,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jrec_epoch_regular")=545
-	Set gtmtypes("shm_snapshot_t",546,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jrec_epoch_idle"
-	Set gtmtypes("shm_snapshot_t",546,"off")=8632
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_tot_retries_3")=545
+	Set gtmtypes("shm_snapshot_t",546,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_tot_retries_4"
+	Set gtmtypes("shm_snapshot_t",546,"off")=8496
 	Set gtmtypes("shm_snapshot_t",546,"len")=8
 	Set gtmtypes("shm_snapshot_t",546,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jrec_epoch_idle")=546
-	Set gtmtypes("shm_snapshot_t",547,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jrec_other"
-	Set gtmtypes("shm_snapshot_t",547,"off")=8640
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_tot_retries_4")=546
+	Set gtmtypes("shm_snapshot_t",547,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_0"
+	Set gtmtypes("shm_snapshot_t",547,"off")=8504
 	Set gtmtypes("shm_snapshot_t",547,"len")=8
 	Set gtmtypes("shm_snapshot_t",547,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jrec_other")=547
-	Set gtmtypes("shm_snapshot_t",548,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jnl_extends"
-	Set gtmtypes("shm_snapshot_t",548,"off")=8648
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_0")=547
+	Set gtmtypes("shm_snapshot_t",548,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_1"
+	Set gtmtypes("shm_snapshot_t",548,"off")=8512
 	Set gtmtypes("shm_snapshot_t",548,"len")=8
 	Set gtmtypes("shm_snapshot_t",548,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jnl_extends")=548
-	Set gtmtypes("shm_snapshot_t",549,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_db_extends"
-	Set gtmtypes("shm_snapshot_t",549,"off")=8656
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_1")=548
+	Set gtmtypes("shm_snapshot_t",549,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_2"
+	Set gtmtypes("shm_snapshot_t",549,"off")=8520
 	Set gtmtypes("shm_snapshot_t",549,"len")=8
 	Set gtmtypes("shm_snapshot_t",549,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_db_extends")=549
-	Set gtmtypes("shm_snapshot_t",550,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_crit_success"
-	Set gtmtypes("shm_snapshot_t",550,"off")=8664
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_2")=549
+	Set gtmtypes("shm_snapshot_t",550,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_3"
+	Set gtmtypes("shm_snapshot_t",550,"off")=8528
 	Set gtmtypes("shm_snapshot_t",550,"len")=8
 	Set gtmtypes("shm_snapshot_t",550,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_crit_success")=550
-	Set gtmtypes("shm_snapshot_t",551,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_crits_in_epch"
-	Set gtmtypes("shm_snapshot_t",551,"off")=8672
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_3")=550
+	Set gtmtypes("shm_snapshot_t",551,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_4"
+	Set gtmtypes("shm_snapshot_t",551,"off")=8536
 	Set gtmtypes("shm_snapshot_t",551,"len")=8
 	Set gtmtypes("shm_snapshot_t",551,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_crits_in_epch")=551
-	Set gtmtypes("shm_snapshot_t",552,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.sq_crit_failed"
-	Set gtmtypes("shm_snapshot_t",552,"off")=8680
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_4")=551
+	Set gtmtypes("shm_snapshot_t",552,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_ztrigger"
+	Set gtmtypes("shm_snapshot_t",552,"off")=8544
 	Set gtmtypes("shm_snapshot_t",552,"len")=8
 	Set gtmtypes("shm_snapshot_t",552,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.sq_crit_failed")=552
-	Set gtmtypes("shm_snapshot_t",553,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_crit_failed"
-	Set gtmtypes("shm_snapshot_t",553,"off")=8688
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_ztrigger")=552
+	Set gtmtypes("shm_snapshot_t",553,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_db_flush"
+	Set gtmtypes("shm_snapshot_t",553,"off")=8552
 	Set gtmtypes("shm_snapshot_t",553,"len")=8
 	Set gtmtypes("shm_snapshot_t",553,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_crit_failed")=553
-	Set gtmtypes("shm_snapshot_t",554,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.sq_crit_que_slps"
-	Set gtmtypes("shm_snapshot_t",554,"off")=8696
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_db_flush")=553
+	Set gtmtypes("shm_snapshot_t",554,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_db_fsync"
+	Set gtmtypes("shm_snapshot_t",554,"off")=8560
 	Set gtmtypes("shm_snapshot_t",554,"len")=8
 	Set gtmtypes("shm_snapshot_t",554,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.sq_crit_que_slps")=554
-	Set gtmtypes("shm_snapshot_t",555,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_crit_que_slps"
-	Set gtmtypes("shm_snapshot_t",555,"off")=8704
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_db_fsync")=554
+	Set gtmtypes("shm_snapshot_t",555,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jnl_flush"
+	Set gtmtypes("shm_snapshot_t",555,"off")=8568
 	Set gtmtypes("shm_snapshot_t",555,"len")=8
 	Set gtmtypes("shm_snapshot_t",555,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_crit_que_slps")=555
-	Set gtmtypes("shm_snapshot_t",556,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.sq_crit_yields"
-	Set gtmtypes("shm_snapshot_t",556,"off")=8712
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jnl_flush")=555
+	Set gtmtypes("shm_snapshot_t",556,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jnl_fsync"
+	Set gtmtypes("shm_snapshot_t",556,"off")=8576
 	Set gtmtypes("shm_snapshot_t",556,"len")=8
 	Set gtmtypes("shm_snapshot_t",556,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.sq_crit_yields")=556
-	Set gtmtypes("shm_snapshot_t",557,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_crit_yields"
-	Set gtmtypes("shm_snapshot_t",557,"off")=8720
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jnl_fsync")=556
+	Set gtmtypes("shm_snapshot_t",557,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jbuff_bytes"
+	Set gtmtypes("shm_snapshot_t",557,"off")=8584
 	Set gtmtypes("shm_snapshot_t",557,"len")=8
 	Set gtmtypes("shm_snapshot_t",557,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_crit_yields")=557
-	Set gtmtypes("shm_snapshot_t",558,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec_filler_4k_plus_512"
-	Set gtmtypes("shm_snapshot_t",558,"off")=8728
-	Set gtmtypes("shm_snapshot_t",558,"len")=48
-	Set gtmtypes("shm_snapshot_t",558,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec_filler_4k_plus_512")=558
-	Set gtmtypes("shm_snapshot_t",559,"name")="shm_snapshot_t.shadow_file_header.filler_4k_plus_512"
-	Set gtmtypes("shm_snapshot_t",559,"off")=8776
-	Set gtmtypes("shm_snapshot_t",559,"len")=368
-	Set gtmtypes("shm_snapshot_t",559,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_4k_plus_512")=559
-	Set gtmtypes("shm_snapshot_t",560,"name")="shm_snapshot_t.shadow_file_header.intrpt_recov_resync_strm_seqno"
-	Set gtmtypes("shm_snapshot_t",560,"off")=9144
-	Set gtmtypes("shm_snapshot_t",560,"len")=128
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jbuff_bytes")=557
+	Set gtmtypes("shm_snapshot_t",558,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jfile_bytes"
+	Set gtmtypes("shm_snapshot_t",558,"off")=8592
+	Set gtmtypes("shm_snapshot_t",558,"len")=8
+	Set gtmtypes("shm_snapshot_t",558,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jfile_bytes")=558
+	Set gtmtypes("shm_snapshot_t",559,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jfile_writes"
+	Set gtmtypes("shm_snapshot_t",559,"off")=8600
+	Set gtmtypes("shm_snapshot_t",559,"len")=8
+	Set gtmtypes("shm_snapshot_t",559,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jfile_writes")=559
+	Set gtmtypes("shm_snapshot_t",560,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jrec_logical"
+	Set gtmtypes("shm_snapshot_t",560,"off")=8608
+	Set gtmtypes("shm_snapshot_t",560,"len")=8
 	Set gtmtypes("shm_snapshot_t",560,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.intrpt_recov_resync_strm_seqno")=560
-	Set gtmtypes("shm_snapshot_t",560,"dim")=16
-	Set gtmtypes("shm_snapshot_t",561,"name")="shm_snapshot_t.shadow_file_header.creation_db_ver"
-	Set gtmtypes("shm_snapshot_t",561,"off")=9272
-	Set gtmtypes("shm_snapshot_t",561,"len")=4
-	Set gtmtypes("shm_snapshot_t",561,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.creation_db_ver")=561
-	Set gtmtypes("shm_snapshot_t",562,"name")="shm_snapshot_t.shadow_file_header.creation_mdb_ver"
-	Set gtmtypes("shm_snapshot_t",562,"off")=9276
-	Set gtmtypes("shm_snapshot_t",562,"len")=4
-	Set gtmtypes("shm_snapshot_t",562,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.creation_mdb_ver")=562
-	Set gtmtypes("shm_snapshot_t",563,"name")="shm_snapshot_t.shadow_file_header.certified_for_upgrade_to"
-	Set gtmtypes("shm_snapshot_t",563,"off")=9280
-	Set gtmtypes("shm_snapshot_t",563,"len")=4
-	Set gtmtypes("shm_snapshot_t",563,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.certified_for_upgrade_to")=563
-	Set gtmtypes("shm_snapshot_t",564,"name")="shm_snapshot_t.shadow_file_header.filler_5k"
-	Set gtmtypes("shm_snapshot_t",564,"off")=9284
-	Set gtmtypes("shm_snapshot_t",564,"len")=4
-	Set gtmtypes("shm_snapshot_t",564,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_5k")=564
-	Set gtmtypes("shm_snapshot_t",565,"name")="shm_snapshot_t.shadow_file_header.secshr_ops_index_filler"
-	Set gtmtypes("shm_snapshot_t",565,"off")=9288
-	Set gtmtypes("shm_snapshot_t",565,"len")=4
-	Set gtmtypes("shm_snapshot_t",565,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.secshr_ops_index_filler")=565
-	Set gtmtypes("shm_snapshot_t",566,"name")="shm_snapshot_t.shadow_file_header.secshr_ops_array_filler"
-	Set gtmtypes("shm_snapshot_t",566,"off")=9292
-	Set gtmtypes("shm_snapshot_t",566,"len")=1020
-	Set gtmtypes("shm_snapshot_t",566,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.secshr_ops_array_filler")=566
-	Set gtmtypes("shm_snapshot_t",566,"dim")=255
-	Set gtmtypes("shm_snapshot_t",567,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn"
-	Set gtmtypes("shm_snapshot_t",567,"off")=10312
-	Set gtmtypes("shm_snapshot_t",567,"len")=24
-	Set gtmtypes("shm_snapshot_t",567,"type")="compswap_time_field"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn")=567
-	Set gtmtypes("shm_snapshot_t",568,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch"
-	Set gtmtypes("shm_snapshot_t",568,"off")=10312
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jrec_logical")=560
+	Set gtmtypes("shm_snapshot_t",561,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jrec_pblk"
+	Set gtmtypes("shm_snapshot_t",561,"off")=8616
+	Set gtmtypes("shm_snapshot_t",561,"len")=8
+	Set gtmtypes("shm_snapshot_t",561,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jrec_pblk")=561
+	Set gtmtypes("shm_snapshot_t",562,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jrec_epoch_regular"
+	Set gtmtypes("shm_snapshot_t",562,"off")=8624
+	Set gtmtypes("shm_snapshot_t",562,"len")=8
+	Set gtmtypes("shm_snapshot_t",562,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jrec_epoch_regular")=562
+	Set gtmtypes("shm_snapshot_t",563,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jrec_epoch_idle"
+	Set gtmtypes("shm_snapshot_t",563,"off")=8632
+	Set gtmtypes("shm_snapshot_t",563,"len")=8
+	Set gtmtypes("shm_snapshot_t",563,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jrec_epoch_idle")=563
+	Set gtmtypes("shm_snapshot_t",564,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jrec_other"
+	Set gtmtypes("shm_snapshot_t",564,"off")=8640
+	Set gtmtypes("shm_snapshot_t",564,"len")=8
+	Set gtmtypes("shm_snapshot_t",564,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jrec_other")=564
+	Set gtmtypes("shm_snapshot_t",565,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jnl_extends"
+	Set gtmtypes("shm_snapshot_t",565,"off")=8648
+	Set gtmtypes("shm_snapshot_t",565,"len")=8
+	Set gtmtypes("shm_snapshot_t",565,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jnl_extends")=565
+	Set gtmtypes("shm_snapshot_t",566,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_db_extends"
+	Set gtmtypes("shm_snapshot_t",566,"off")=8656
+	Set gtmtypes("shm_snapshot_t",566,"len")=8
+	Set gtmtypes("shm_snapshot_t",566,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_db_extends")=566
+	Set gtmtypes("shm_snapshot_t",567,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_crit_success"
+	Set gtmtypes("shm_snapshot_t",567,"off")=8664
+	Set gtmtypes("shm_snapshot_t",567,"len")=8
+	Set gtmtypes("shm_snapshot_t",567,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_crit_success")=567
+	Set gtmtypes("shm_snapshot_t",568,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_crits_in_epch"
+	Set gtmtypes("shm_snapshot_t",568,"off")=8672
 	Set gtmtypes("shm_snapshot_t",568,"len")=8
-	Set gtmtypes("shm_snapshot_t",568,"type")="global_latch_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch")=568
-	Set gtmtypes("shm_snapshot_t",569,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch.u"
-	Set gtmtypes("shm_snapshot_t",569,"off")=10312
+	Set gtmtypes("shm_snapshot_t",568,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_crits_in_epch")=568
+	Set gtmtypes("shm_snapshot_t",569,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.sq_crit_failed"
+	Set gtmtypes("shm_snapshot_t",569,"off")=8680
 	Set gtmtypes("shm_snapshot_t",569,"len")=8
-	Set gtmtypes("shm_snapshot_t",569,"type")="union"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch.u")=569
-	Set gtmtypes("shm_snapshot_t",570,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch.u.pid_imgcnt"
-	Set gtmtypes("shm_snapshot_t",570,"off")=10312
+	Set gtmtypes("shm_snapshot_t",569,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.sq_crit_failed")=569
+	Set gtmtypes("shm_snapshot_t",570,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_crit_failed"
+	Set gtmtypes("shm_snapshot_t",570,"off")=8688
 	Set gtmtypes("shm_snapshot_t",570,"len")=8
 	Set gtmtypes("shm_snapshot_t",570,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch.u.pid_imgcnt")=570
-	Set gtmtypes("shm_snapshot_t",571,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch.u.parts"
-	Set gtmtypes("shm_snapshot_t",571,"off")=10312
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_crit_failed")=570
+	Set gtmtypes("shm_snapshot_t",571,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.sq_crit_que_slps"
+	Set gtmtypes("shm_snapshot_t",571,"off")=8696
 	Set gtmtypes("shm_snapshot_t",571,"len")=8
-	Set gtmtypes("shm_snapshot_t",571,"type")="struct"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch.u.parts")=571
-	Set gtmtypes("shm_snapshot_t",572,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_pid"
-	Set gtmtypes("shm_snapshot_t",572,"off")=10312
-	Set gtmtypes("shm_snapshot_t",572,"len")=4
-	Set gtmtypes("shm_snapshot_t",572,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_pid")=572
-	Set gtmtypes("shm_snapshot_t",573,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_word"
-	Set gtmtypes("shm_snapshot_t",573,"off")=10316
-	Set gtmtypes("shm_snapshot_t",573,"len")=4
-	Set gtmtypes("shm_snapshot_t",573,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_word")=573
-	Set gtmtypes("shm_snapshot_t",574,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.hp_latch_space"
-	Set gtmtypes("shm_snapshot_t",574,"off")=10320
-	Set gtmtypes("shm_snapshot_t",574,"len")=16
-	Set gtmtypes("shm_snapshot_t",574,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.hp_latch_space")=574
-	Set gtmtypes("shm_snapshot_t",574,"dim")=4
-	Set gtmtypes("shm_snapshot_t",575,"name")="shm_snapshot_t.shadow_file_header.is_encrypted"
-	Set gtmtypes("shm_snapshot_t",575,"off")=10336
-	Set gtmtypes("shm_snapshot_t",575,"len")=4
-	Set gtmtypes("shm_snapshot_t",575,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.is_encrypted")=575
-	Set gtmtypes("shm_snapshot_t",576,"name")="shm_snapshot_t.shadow_file_header.db_trigger_cycle"
-	Set gtmtypes("shm_snapshot_t",576,"off")=10340
-	Set gtmtypes("shm_snapshot_t",576,"len")=4
-	Set gtmtypes("shm_snapshot_t",576,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_trigger_cycle")=576
-	Set gtmtypes("shm_snapshot_t",577,"name")="shm_snapshot_t.shadow_file_header.strm_reg_seqno"
-	Set gtmtypes("shm_snapshot_t",577,"off")=10344
-	Set gtmtypes("shm_snapshot_t",577,"len")=128
-	Set gtmtypes("shm_snapshot_t",577,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.strm_reg_seqno")=577
-	Set gtmtypes("shm_snapshot_t",577,"dim")=16
-	Set gtmtypes("shm_snapshot_t",578,"name")="shm_snapshot_t.shadow_file_header.save_strm_reg_seqno"
-	Set gtmtypes("shm_snapshot_t",578,"off")=10472
+	Set gtmtypes("shm_snapshot_t",571,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.sq_crit_que_slps")=571
+	Set gtmtypes("shm_snapshot_t",572,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_crit_que_slps"
+	Set gtmtypes("shm_snapshot_t",572,"off")=8704
+	Set gtmtypes("shm_snapshot_t",572,"len")=8
+	Set gtmtypes("shm_snapshot_t",572,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_crit_que_slps")=572
+	Set gtmtypes("shm_snapshot_t",573,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.sq_crit_yields"
+	Set gtmtypes("shm_snapshot_t",573,"off")=8712
+	Set gtmtypes("shm_snapshot_t",573,"len")=8
+	Set gtmtypes("shm_snapshot_t",573,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.sq_crit_yields")=573
+	Set gtmtypes("shm_snapshot_t",574,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_crit_yields"
+	Set gtmtypes("shm_snapshot_t",574,"off")=8720
+	Set gtmtypes("shm_snapshot_t",574,"len")=8
+	Set gtmtypes("shm_snapshot_t",574,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_crit_yields")=574
+	Set gtmtypes("shm_snapshot_t",575,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_clean2dirty"
+	Set gtmtypes("shm_snapshot_t",575,"off")=8728
+	Set gtmtypes("shm_snapshot_t",575,"len")=8
+	Set gtmtypes("shm_snapshot_t",575,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_clean2dirty")=575
+	Set gtmtypes("shm_snapshot_t",576,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec_filler_4k_plus_512"
+	Set gtmtypes("shm_snapshot_t",576,"off")=8736
+	Set gtmtypes("shm_snapshot_t",576,"len")=40
+	Set gtmtypes("shm_snapshot_t",576,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec_filler_4k_plus_512")=576
+	Set gtmtypes("shm_snapshot_t",577,"name")="shm_snapshot_t.shadow_file_header.filler_4k_plus_512"
+	Set gtmtypes("shm_snapshot_t",577,"off")=8776
+	Set gtmtypes("shm_snapshot_t",577,"len")=368
+	Set gtmtypes("shm_snapshot_t",577,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_4k_plus_512")=577
+	Set gtmtypes("shm_snapshot_t",578,"name")="shm_snapshot_t.shadow_file_header.intrpt_recov_resync_strm_seqno"
+	Set gtmtypes("shm_snapshot_t",578,"off")=9144
 	Set gtmtypes("shm_snapshot_t",578,"len")=128
 	Set gtmtypes("shm_snapshot_t",578,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.save_strm_reg_seqno")=578
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.intrpt_recov_resync_strm_seqno")=578
 	Set gtmtypes("shm_snapshot_t",578,"dim")=16
-	Set gtmtypes("shm_snapshot_t",579,"name")="shm_snapshot_t.shadow_file_header.freeze_on_fail"
-	Set gtmtypes("shm_snapshot_t",579,"off")=10600
+	Set gtmtypes("shm_snapshot_t",579,"name")="shm_snapshot_t.shadow_file_header.creation_db_ver"
+	Set gtmtypes("shm_snapshot_t",579,"off")=9272
 	Set gtmtypes("shm_snapshot_t",579,"len")=4
-	Set gtmtypes("shm_snapshot_t",579,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.freeze_on_fail")=579
-	Set gtmtypes("shm_snapshot_t",580,"name")="shm_snapshot_t.shadow_file_header.span_node_absent"
-	Set gtmtypes("shm_snapshot_t",580,"off")=10604
+	Set gtmtypes("shm_snapshot_t",579,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.creation_db_ver")=579
+	Set gtmtypes("shm_snapshot_t",580,"name")="shm_snapshot_t.shadow_file_header.creation_mdb_ver"
+	Set gtmtypes("shm_snapshot_t",580,"off")=9276
 	Set gtmtypes("shm_snapshot_t",580,"len")=4
-	Set gtmtypes("shm_snapshot_t",580,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.span_node_absent")=580
-	Set gtmtypes("shm_snapshot_t",581,"name")="shm_snapshot_t.shadow_file_header.maxkeysz_assured"
-	Set gtmtypes("shm_snapshot_t",581,"off")=10608
+	Set gtmtypes("shm_snapshot_t",580,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.creation_mdb_ver")=580
+	Set gtmtypes("shm_snapshot_t",581,"name")="shm_snapshot_t.shadow_file_header.certified_for_upgrade_to"
+	Set gtmtypes("shm_snapshot_t",581,"off")=9280
 	Set gtmtypes("shm_snapshot_t",581,"len")=4
-	Set gtmtypes("shm_snapshot_t",581,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.maxkeysz_assured")=581
-	Set gtmtypes("shm_snapshot_t",582,"name")="shm_snapshot_t.shadow_file_header.hasht_upgrade_needed"
-	Set gtmtypes("shm_snapshot_t",582,"off")=10612
+	Set gtmtypes("shm_snapshot_t",581,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.certified_for_upgrade_to")=581
+	Set gtmtypes("shm_snapshot_t",582,"name")="shm_snapshot_t.shadow_file_header.filler_5k"
+	Set gtmtypes("shm_snapshot_t",582,"off")=9284
 	Set gtmtypes("shm_snapshot_t",582,"len")=4
-	Set gtmtypes("shm_snapshot_t",582,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.hasht_upgrade_needed")=582
-	Set gtmtypes("shm_snapshot_t",583,"name")="shm_snapshot_t.shadow_file_header.defer_allocate"
-	Set gtmtypes("shm_snapshot_t",583,"off")=10616
+	Set gtmtypes("shm_snapshot_t",582,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_5k")=582
+	Set gtmtypes("shm_snapshot_t",583,"name")="shm_snapshot_t.shadow_file_header.secshr_ops_index_filler"
+	Set gtmtypes("shm_snapshot_t",583,"off")=9288
 	Set gtmtypes("shm_snapshot_t",583,"len")=4
-	Set gtmtypes("shm_snapshot_t",583,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.defer_allocate")=583
-	Set gtmtypes("shm_snapshot_t",584,"name")="shm_snapshot_t.shadow_file_header.filler_ftok_counter_halted"
-	Set gtmtypes("shm_snapshot_t",584,"off")=10620
-	Set gtmtypes("shm_snapshot_t",584,"len")=4
-	Set gtmtypes("shm_snapshot_t",584,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_ftok_counter_halted")=584
-	Set gtmtypes("shm_snapshot_t",585,"name")="shm_snapshot_t.shadow_file_header.filler_access_counter_halted"
-	Set gtmtypes("shm_snapshot_t",585,"off")=10624
-	Set gtmtypes("shm_snapshot_t",585,"len")=4
-	Set gtmtypes("shm_snapshot_t",585,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_access_counter_halted")=585
-	Set gtmtypes("shm_snapshot_t",586,"name")="shm_snapshot_t.shadow_file_header.filler_7k"
-	Set gtmtypes("shm_snapshot_t",586,"off")=10628
-	Set gtmtypes("shm_snapshot_t",586,"len")=708
-	Set gtmtypes("shm_snapshot_t",586,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_7k")=586
-	Set gtmtypes("shm_snapshot_t",587,"name")="shm_snapshot_t.shadow_file_header.filler_8k"
-	Set gtmtypes("shm_snapshot_t",587,"off")=11336
-	Set gtmtypes("shm_snapshot_t",587,"len")=1024
-	Set gtmtypes("shm_snapshot_t",587,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_8k")=587
+	Set gtmtypes("shm_snapshot_t",583,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.secshr_ops_index_filler")=583
+	Set gtmtypes("shm_snapshot_t",584,"name")="shm_snapshot_t.shadow_file_header.secshr_ops_array_filler"
+	Set gtmtypes("shm_snapshot_t",584,"off")=9292
+	Set gtmtypes("shm_snapshot_t",584,"len")=1020
+	Set gtmtypes("shm_snapshot_t",584,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.secshr_ops_array_filler")=584
+	Set gtmtypes("shm_snapshot_t",584,"dim")=255
+	Set gtmtypes("shm_snapshot_t",585,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn"
+	Set gtmtypes("shm_snapshot_t",585,"off")=10312
+	Set gtmtypes("shm_snapshot_t",585,"len")=24
+	Set gtmtypes("shm_snapshot_t",585,"type")="compswap_time_field"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn")=585
+	Set gtmtypes("shm_snapshot_t",586,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch"
+	Set gtmtypes("shm_snapshot_t",586,"off")=10312
+	Set gtmtypes("shm_snapshot_t",586,"len")=8
+	Set gtmtypes("shm_snapshot_t",586,"type")="global_latch_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch")=586
+	Set gtmtypes("shm_snapshot_t",587,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch.u"
+	Set gtmtypes("shm_snapshot_t",587,"off")=10312
+	Set gtmtypes("shm_snapshot_t",587,"len")=8
+	Set gtmtypes("shm_snapshot_t",587,"type")="union"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch.u")=587
+	Set gtmtypes("shm_snapshot_t",588,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch.u.pid_imgcnt"
+	Set gtmtypes("shm_snapshot_t",588,"off")=10312
+	Set gtmtypes("shm_snapshot_t",588,"len")=8
+	Set gtmtypes("shm_snapshot_t",588,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch.u.pid_imgcnt")=588
+	Set gtmtypes("shm_snapshot_t",589,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch.u.parts"
+	Set gtmtypes("shm_snapshot_t",589,"off")=10312
+	Set gtmtypes("shm_snapshot_t",589,"len")=8
+	Set gtmtypes("shm_snapshot_t",589,"type")="struct"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch.u.parts")=589
+	Set gtmtypes("shm_snapshot_t",590,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_pid"
+	Set gtmtypes("shm_snapshot_t",590,"off")=10312
+	Set gtmtypes("shm_snapshot_t",590,"len")=4
+	Set gtmtypes("shm_snapshot_t",590,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_pid")=590
+	Set gtmtypes("shm_snapshot_t",591,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_word"
+	Set gtmtypes("shm_snapshot_t",591,"off")=10316
+	Set gtmtypes("shm_snapshot_t",591,"len")=4
+	Set gtmtypes("shm_snapshot_t",591,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_word")=591
+	Set gtmtypes("shm_snapshot_t",592,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.hp_latch_space"
+	Set gtmtypes("shm_snapshot_t",592,"off")=10320
+	Set gtmtypes("shm_snapshot_t",592,"len")=16
+	Set gtmtypes("shm_snapshot_t",592,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.hp_latch_space")=592
+	Set gtmtypes("shm_snapshot_t",592,"dim")=4
+	Set gtmtypes("shm_snapshot_t",593,"name")="shm_snapshot_t.shadow_file_header.is_encrypted"
+	Set gtmtypes("shm_snapshot_t",593,"off")=10336
+	Set gtmtypes("shm_snapshot_t",593,"len")=4
+	Set gtmtypes("shm_snapshot_t",593,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.is_encrypted")=593
+	Set gtmtypes("shm_snapshot_t",594,"name")="shm_snapshot_t.shadow_file_header.db_trigger_cycle"
+	Set gtmtypes("shm_snapshot_t",594,"off")=10340
+	Set gtmtypes("shm_snapshot_t",594,"len")=4
+	Set gtmtypes("shm_snapshot_t",594,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_trigger_cycle")=594
+	Set gtmtypes("shm_snapshot_t",595,"name")="shm_snapshot_t.shadow_file_header.strm_reg_seqno"
+	Set gtmtypes("shm_snapshot_t",595,"off")=10344
+	Set gtmtypes("shm_snapshot_t",595,"len")=128
+	Set gtmtypes("shm_snapshot_t",595,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.strm_reg_seqno")=595
+	Set gtmtypes("shm_snapshot_t",595,"dim")=16
+	Set gtmtypes("shm_snapshot_t",596,"name")="shm_snapshot_t.shadow_file_header.save_strm_reg_seqno"
+	Set gtmtypes("shm_snapshot_t",596,"off")=10472
+	Set gtmtypes("shm_snapshot_t",596,"len")=128
+	Set gtmtypes("shm_snapshot_t",596,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.save_strm_reg_seqno")=596
+	Set gtmtypes("shm_snapshot_t",596,"dim")=16
+	Set gtmtypes("shm_snapshot_t",597,"name")="shm_snapshot_t.shadow_file_header.freeze_on_fail"
+	Set gtmtypes("shm_snapshot_t",597,"off")=10600
+	Set gtmtypes("shm_snapshot_t",597,"len")=4
+	Set gtmtypes("shm_snapshot_t",597,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.freeze_on_fail")=597
+	Set gtmtypes("shm_snapshot_t",598,"name")="shm_snapshot_t.shadow_file_header.span_node_absent"
+	Set gtmtypes("shm_snapshot_t",598,"off")=10604
+	Set gtmtypes("shm_snapshot_t",598,"len")=4
+	Set gtmtypes("shm_snapshot_t",598,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.span_node_absent")=598
+	Set gtmtypes("shm_snapshot_t",599,"name")="shm_snapshot_t.shadow_file_header.maxkeysz_assured"
+	Set gtmtypes("shm_snapshot_t",599,"off")=10608
+	Set gtmtypes("shm_snapshot_t",599,"len")=4
+	Set gtmtypes("shm_snapshot_t",599,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.maxkeysz_assured")=599
+	Set gtmtypes("shm_snapshot_t",600,"name")="shm_snapshot_t.shadow_file_header.hasht_upgrade_needed"
+	Set gtmtypes("shm_snapshot_t",600,"off")=10612
+	Set gtmtypes("shm_snapshot_t",600,"len")=4
+	Set gtmtypes("shm_snapshot_t",600,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.hasht_upgrade_needed")=600
+	Set gtmtypes("shm_snapshot_t",601,"name")="shm_snapshot_t.shadow_file_header.defer_allocate"
+	Set gtmtypes("shm_snapshot_t",601,"off")=10616
+	Set gtmtypes("shm_snapshot_t",601,"len")=4
+	Set gtmtypes("shm_snapshot_t",601,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.defer_allocate")=601
+	Set gtmtypes("shm_snapshot_t",602,"name")="shm_snapshot_t.shadow_file_header.filler_ftok_counter_halted"
+	Set gtmtypes("shm_snapshot_t",602,"off")=10620
+	Set gtmtypes("shm_snapshot_t",602,"len")=4
+	Set gtmtypes("shm_snapshot_t",602,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_ftok_counter_halted")=602
+	Set gtmtypes("shm_snapshot_t",603,"name")="shm_snapshot_t.shadow_file_header.filler_access_counter_halted"
+	Set gtmtypes("shm_snapshot_t",603,"off")=10624
+	Set gtmtypes("shm_snapshot_t",603,"len")=4
+	Set gtmtypes("shm_snapshot_t",603,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_access_counter_halted")=603
+	Set gtmtypes("shm_snapshot_t",604,"name")="shm_snapshot_t.shadow_file_header.lock_crit_with_db"
+	Set gtmtypes("shm_snapshot_t",604,"off")=10628
+	Set gtmtypes("shm_snapshot_t",604,"len")=4
+	Set gtmtypes("shm_snapshot_t",604,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.lock_crit_with_db")=604
+	Set gtmtypes("shm_snapshot_t",605,"name")="shm_snapshot_t.shadow_file_header.basedb_fname_len"
+	Set gtmtypes("shm_snapshot_t",605,"off")=10632
+	Set gtmtypes("shm_snapshot_t",605,"len")=4
+	Set gtmtypes("shm_snapshot_t",605,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.basedb_fname_len")=605
+	Set gtmtypes("shm_snapshot_t",606,"name")="shm_snapshot_t.shadow_file_header.basedb_fname"
+	Set gtmtypes("shm_snapshot_t",606,"off")=10636
+	Set gtmtypes("shm_snapshot_t",606,"len")=256
+	Set gtmtypes("shm_snapshot_t",606,"type")="unsigned-char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.basedb_fname")=606
+	Set gtmtypes("shm_snapshot_t",607,"name")="shm_snapshot_t.shadow_file_header.filler_7k"
+	Set gtmtypes("shm_snapshot_t",607,"off")=10892
+	Set gtmtypes("shm_snapshot_t",607,"len")=444
+	Set gtmtypes("shm_snapshot_t",607,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_7k")=607
+	Set gtmtypes("shm_snapshot_t",608,"name")="shm_snapshot_t.shadow_file_header.filler_8k"
+	Set gtmtypes("shm_snapshot_t",608,"off")=11336
+	Set gtmtypes("shm_snapshot_t",608,"len")=1024
+	Set gtmtypes("shm_snapshot_t",608,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_8k")=608
 	;
 	Set gtmtypes("shmpool_blk_hdr")="struct"
 	Set gtmtypes("shmpool_blk_hdr",0)=11
@@ -32525,7 +33186,7 @@ Init
 	Set gtmtypfldindx("shmpool_blk_hdr","image_count")=11
 	;
 	Set gtmtypes("shmpool_buff_hdr")="struct"
-	Set gtmtypes("shmpool_buff_hdr",0)=594
+	Set gtmtypes("shmpool_buff_hdr",0)=615
 	Set gtmtypes("shmpool_buff_hdr","len")=8544
 	Set gtmtypes("shmpool_buff_hdr",1,"name")="shmpool_buff_hdr.shmpool_crit_latch"
 	Set gtmtypes("shmpool_buff_hdr",1,"off")=0
@@ -32760,7 +33421,7 @@ Init
 	Set gtmtypes("shmpool_buff_hdr",47,"name")="shmpool_buff_hdr.shadow_file_header.null_subs"
 	Set gtmtypes("shmpool_buff_hdr",47,"off")=428
 	Set gtmtypes("shmpool_buff_hdr",47,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",47,"type")="boolean_t"
+	Set gtmtypes("shmpool_buff_hdr",47,"type")="int"
 	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.null_subs")=47
 	Set gtmtypes("shmpool_buff_hdr",48,"name")="shmpool_buff_hdr.shadow_file_header.free_space"
 	Set gtmtypes("shmpool_buff_hdr",48,"off")=432
@@ -32842,11 +33503,11 @@ Init
 	Set gtmtypes("shmpool_buff_hdr",63,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",63,"type")="int"
 	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.creation_time4")=63
-	Set gtmtypes("shmpool_buff_hdr",64,"name")="shmpool_buff_hdr.shadow_file_header.creation_filler_8byte"
+	Set gtmtypes("shmpool_buff_hdr",64,"name")="shmpool_buff_hdr.shadow_file_header.reservedDBFlags"
 	Set gtmtypes("shmpool_buff_hdr",64,"off")=540
 	Set gtmtypes("shmpool_buff_hdr",64,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",64,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.creation_filler_8byte")=64
+	Set gtmtypes("shmpool_buff_hdr",64,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reservedDBFlags")=64
 	Set gtmtypes("shmpool_buff_hdr",65,"name")="shmpool_buff_hdr.shadow_file_header.max_tn"
 	Set gtmtypes("shmpool_buff_hdr",65,"off")=544
 	Set gtmtypes("shmpool_buff_hdr",65,"len")=8
@@ -32927,2592 +33588,2697 @@ Init
 	Set gtmtypes("shmpool_buff_hdr",80,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",80,"type")="int"
 	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.abandoned_kills")=80
-	Set gtmtypes("shmpool_buff_hdr",81,"name")="shmpool_buff_hdr.shadow_file_header.filler_320"
+	Set gtmtypes("shmpool_buff_hdr",81,"name")="shmpool_buff_hdr.shadow_file_header.freeze_online"
 	Set gtmtypes("shmpool_buff_hdr",81,"off")=664
-	Set gtmtypes("shmpool_buff_hdr",81,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",81,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_320")=81
-	Set gtmtypes("shmpool_buff_hdr",82,"name")="shmpool_buff_hdr.shadow_file_header.tn_upgrd_blks_0"
-	Set gtmtypes("shmpool_buff_hdr",82,"off")=672
-	Set gtmtypes("shmpool_buff_hdr",82,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",82,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.tn_upgrd_blks_0")=82
-	Set gtmtypes("shmpool_buff_hdr",83,"name")="shmpool_buff_hdr.shadow_file_header.desired_db_format_tn"
-	Set gtmtypes("shmpool_buff_hdr",83,"off")=680
+	Set gtmtypes("shmpool_buff_hdr",81,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",81,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.freeze_online")=81
+	Set gtmtypes("shmpool_buff_hdr",82,"name")="shmpool_buff_hdr.shadow_file_header.filler_320"
+	Set gtmtypes("shmpool_buff_hdr",82,"off")=668
+	Set gtmtypes("shmpool_buff_hdr",82,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",82,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_320")=82
+	Set gtmtypes("shmpool_buff_hdr",83,"name")="shmpool_buff_hdr.shadow_file_header.tn_upgrd_blks_0"
+	Set gtmtypes("shmpool_buff_hdr",83,"off")=672
 	Set gtmtypes("shmpool_buff_hdr",83,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",83,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.desired_db_format_tn")=83
-	Set gtmtypes("shmpool_buff_hdr",84,"name")="shmpool_buff_hdr.shadow_file_header.reorg_db_fmt_start_tn"
-	Set gtmtypes("shmpool_buff_hdr",84,"off")=688
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.tn_upgrd_blks_0")=83
+	Set gtmtypes("shmpool_buff_hdr",84,"name")="shmpool_buff_hdr.shadow_file_header.desired_db_format_tn"
+	Set gtmtypes("shmpool_buff_hdr",84,"off")=680
 	Set gtmtypes("shmpool_buff_hdr",84,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",84,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reorg_db_fmt_start_tn")=84
-	Set gtmtypes("shmpool_buff_hdr",85,"name")="shmpool_buff_hdr.shadow_file_header.reorg_upgrd_dwngrd_restart_block"
-	Set gtmtypes("shmpool_buff_hdr",85,"off")=696
-	Set gtmtypes("shmpool_buff_hdr",85,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",85,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reorg_upgrd_dwngrd_restart_block")=85
-	Set gtmtypes("shmpool_buff_hdr",86,"name")="shmpool_buff_hdr.shadow_file_header.blks_to_upgrd"
-	Set gtmtypes("shmpool_buff_hdr",86,"off")=700
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.desired_db_format_tn")=84
+	Set gtmtypes("shmpool_buff_hdr",85,"name")="shmpool_buff_hdr.shadow_file_header.reorg_db_fmt_start_tn"
+	Set gtmtypes("shmpool_buff_hdr",85,"off")=688
+	Set gtmtypes("shmpool_buff_hdr",85,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",85,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reorg_db_fmt_start_tn")=85
+	Set gtmtypes("shmpool_buff_hdr",86,"name")="shmpool_buff_hdr.shadow_file_header.reorg_upgrd_dwngrd_restart_block"
+	Set gtmtypes("shmpool_buff_hdr",86,"off")=696
 	Set gtmtypes("shmpool_buff_hdr",86,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",86,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.blks_to_upgrd")=86
-	Set gtmtypes("shmpool_buff_hdr",87,"name")="shmpool_buff_hdr.shadow_file_header.blks_to_upgrd_subzero_error"
-	Set gtmtypes("shmpool_buff_hdr",87,"off")=704
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reorg_upgrd_dwngrd_restart_block")=86
+	Set gtmtypes("shmpool_buff_hdr",87,"name")="shmpool_buff_hdr.shadow_file_header.blks_to_upgrd"
+	Set gtmtypes("shmpool_buff_hdr",87,"off")=700
 	Set gtmtypes("shmpool_buff_hdr",87,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",87,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.blks_to_upgrd_subzero_error")=87
-	Set gtmtypes("shmpool_buff_hdr",88,"name")="shmpool_buff_hdr.shadow_file_header.desired_db_format"
-	Set gtmtypes("shmpool_buff_hdr",88,"off")=708
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.blks_to_upgrd")=87
+	Set gtmtypes("shmpool_buff_hdr",88,"name")="shmpool_buff_hdr.shadow_file_header.blks_to_upgrd_subzero_error"
+	Set gtmtypes("shmpool_buff_hdr",88,"off")=704
 	Set gtmtypes("shmpool_buff_hdr",88,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",88,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.desired_db_format")=88
-	Set gtmtypes("shmpool_buff_hdr",89,"name")="shmpool_buff_hdr.shadow_file_header.fully_upgraded"
-	Set gtmtypes("shmpool_buff_hdr",89,"off")=712
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.blks_to_upgrd_subzero_error")=88
+	Set gtmtypes("shmpool_buff_hdr",89,"name")="shmpool_buff_hdr.shadow_file_header.desired_db_format"
+	Set gtmtypes("shmpool_buff_hdr",89,"off")=708
 	Set gtmtypes("shmpool_buff_hdr",89,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",89,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.fully_upgraded")=89
-	Set gtmtypes("shmpool_buff_hdr",90,"name")="shmpool_buff_hdr.shadow_file_header.db_got_to_v5_once"
-	Set gtmtypes("shmpool_buff_hdr",90,"off")=716
+	Set gtmtypes("shmpool_buff_hdr",89,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.desired_db_format")=89
+	Set gtmtypes("shmpool_buff_hdr",90,"name")="shmpool_buff_hdr.shadow_file_header.fully_upgraded"
+	Set gtmtypes("shmpool_buff_hdr",90,"off")=712
 	Set gtmtypes("shmpool_buff_hdr",90,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",90,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_got_to_v5_once")=90
-	Set gtmtypes("shmpool_buff_hdr",91,"name")="shmpool_buff_hdr.shadow_file_header.opened_by_gtmv53"
-	Set gtmtypes("shmpool_buff_hdr",91,"off")=720
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.fully_upgraded")=90
+	Set gtmtypes("shmpool_buff_hdr",91,"name")="shmpool_buff_hdr.shadow_file_header.db_got_to_v5_once"
+	Set gtmtypes("shmpool_buff_hdr",91,"off")=716
 	Set gtmtypes("shmpool_buff_hdr",91,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",91,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.opened_by_gtmv53")=91
-	Set gtmtypes("shmpool_buff_hdr",92,"name")="shmpool_buff_hdr.shadow_file_header.filler_384"
-	Set gtmtypes("shmpool_buff_hdr",92,"off")=724
-	Set gtmtypes("shmpool_buff_hdr",92,"len")=12
-	Set gtmtypes("shmpool_buff_hdr",92,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_384")=92
-	Set gtmtypes("shmpool_buff_hdr",93,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist"
-	Set gtmtypes("shmpool_buff_hdr",93,"off")=736
-	Set gtmtypes("shmpool_buff_hdr",93,"len")=56
-	Set gtmtypes("shmpool_buff_hdr",93,"type")="th_index"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist")=93
-	Set gtmtypes("shmpool_buff_hdr",94,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.curr_tn"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_got_to_v5_once")=91
+	Set gtmtypes("shmpool_buff_hdr",92,"name")="shmpool_buff_hdr.shadow_file_header.opened_by_gtmv53"
+	Set gtmtypes("shmpool_buff_hdr",92,"off")=720
+	Set gtmtypes("shmpool_buff_hdr",92,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",92,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.opened_by_gtmv53")=92
+	Set gtmtypes("shmpool_buff_hdr",93,"name")="shmpool_buff_hdr.shadow_file_header.filler_384"
+	Set gtmtypes("shmpool_buff_hdr",93,"off")=724
+	Set gtmtypes("shmpool_buff_hdr",93,"len")=12
+	Set gtmtypes("shmpool_buff_hdr",93,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_384")=93
+	Set gtmtypes("shmpool_buff_hdr",94,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist"
 	Set gtmtypes("shmpool_buff_hdr",94,"off")=736
-	Set gtmtypes("shmpool_buff_hdr",94,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",94,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.curr_tn")=94
-	Set gtmtypes("shmpool_buff_hdr",95,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.early_tn"
-	Set gtmtypes("shmpool_buff_hdr",95,"off")=744
+	Set gtmtypes("shmpool_buff_hdr",94,"len")=56
+	Set gtmtypes("shmpool_buff_hdr",94,"type")="th_index"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist")=94
+	Set gtmtypes("shmpool_buff_hdr",95,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.curr_tn"
+	Set gtmtypes("shmpool_buff_hdr",95,"off")=736
 	Set gtmtypes("shmpool_buff_hdr",95,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",95,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.early_tn")=95
-	Set gtmtypes("shmpool_buff_hdr",96,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.last_mm_sync"
-	Set gtmtypes("shmpool_buff_hdr",96,"off")=752
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.curr_tn")=95
+	Set gtmtypes("shmpool_buff_hdr",96,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.early_tn"
+	Set gtmtypes("shmpool_buff_hdr",96,"off")=744
 	Set gtmtypes("shmpool_buff_hdr",96,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",96,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.last_mm_sync")=96
-	Set gtmtypes("shmpool_buff_hdr",97,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.filler_8byte"
-	Set gtmtypes("shmpool_buff_hdr",97,"off")=760
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.early_tn")=96
+	Set gtmtypes("shmpool_buff_hdr",97,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.last_mm_sync"
+	Set gtmtypes("shmpool_buff_hdr",97,"off")=752
 	Set gtmtypes("shmpool_buff_hdr",97,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",97,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.filler_8byte")=97
-	Set gtmtypes("shmpool_buff_hdr",98,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.mm_tn"
-	Set gtmtypes("shmpool_buff_hdr",98,"off")=768
+	Set gtmtypes("shmpool_buff_hdr",97,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.last_mm_sync")=97
+	Set gtmtypes("shmpool_buff_hdr",98,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.filler_8byte"
+	Set gtmtypes("shmpool_buff_hdr",98,"off")=760
 	Set gtmtypes("shmpool_buff_hdr",98,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",98,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.mm_tn")=98
-	Set gtmtypes("shmpool_buff_hdr",99,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.lock_sequence"
-	Set gtmtypes("shmpool_buff_hdr",99,"off")=776
-	Set gtmtypes("shmpool_buff_hdr",99,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",99,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.lock_sequence")=99
-	Set gtmtypes("shmpool_buff_hdr",100,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.ccp_jnl_filesize"
-	Set gtmtypes("shmpool_buff_hdr",100,"off")=780
+	Set gtmtypes("shmpool_buff_hdr",98,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.filler_8byte")=98
+	Set gtmtypes("shmpool_buff_hdr",99,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.mm_tn"
+	Set gtmtypes("shmpool_buff_hdr",99,"off")=768
+	Set gtmtypes("shmpool_buff_hdr",99,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",99,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.mm_tn")=99
+	Set gtmtypes("shmpool_buff_hdr",100,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.lock_sequence"
+	Set gtmtypes("shmpool_buff_hdr",100,"off")=776
 	Set gtmtypes("shmpool_buff_hdr",100,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",100,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.ccp_jnl_filesize")=100
-	Set gtmtypes("shmpool_buff_hdr",101,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.total_blks"
-	Set gtmtypes("shmpool_buff_hdr",101,"off")=784
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.lock_sequence")=100
+	Set gtmtypes("shmpool_buff_hdr",101,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.ccp_jnl_filesize"
+	Set gtmtypes("shmpool_buff_hdr",101,"off")=780
 	Set gtmtypes("shmpool_buff_hdr",101,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",101,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.total_blks")=101
-	Set gtmtypes("shmpool_buff_hdr",102,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.free_blocks"
-	Set gtmtypes("shmpool_buff_hdr",102,"off")=788
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.ccp_jnl_filesize")=101
+	Set gtmtypes("shmpool_buff_hdr",102,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.total_blks"
+	Set gtmtypes("shmpool_buff_hdr",102,"off")=784
 	Set gtmtypes("shmpool_buff_hdr",102,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",102,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.free_blocks")=102
-	Set gtmtypes("shmpool_buff_hdr",103,"name")="shmpool_buff_hdr.shadow_file_header.filler_trans_hist"
-	Set gtmtypes("shmpool_buff_hdr",103,"off")=792
-	Set gtmtypes("shmpool_buff_hdr",103,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",103,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_trans_hist")=103
-	Set gtmtypes("shmpool_buff_hdr",104,"name")="shmpool_buff_hdr.shadow_file_header.flush_time"
-	Set gtmtypes("shmpool_buff_hdr",104,"off")=800
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.total_blks")=102
+	Set gtmtypes("shmpool_buff_hdr",103,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.free_blocks"
+	Set gtmtypes("shmpool_buff_hdr",103,"off")=788
+	Set gtmtypes("shmpool_buff_hdr",103,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",103,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.free_blocks")=103
+	Set gtmtypes("shmpool_buff_hdr",104,"name")="shmpool_buff_hdr.shadow_file_header.filler_trans_hist"
+	Set gtmtypes("shmpool_buff_hdr",104,"off")=792
 	Set gtmtypes("shmpool_buff_hdr",104,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",104,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.flush_time")=104
-	Set gtmtypes("shmpool_buff_hdr",104,"dim")=2
-	Set gtmtypes("shmpool_buff_hdr",105,"name")="shmpool_buff_hdr.shadow_file_header.flush_trigger"
-	Set gtmtypes("shmpool_buff_hdr",105,"off")=808
-	Set gtmtypes("shmpool_buff_hdr",105,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",104,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_trans_hist")=104
+	Set gtmtypes("shmpool_buff_hdr",105,"name")="shmpool_buff_hdr.shadow_file_header.flush_time"
+	Set gtmtypes("shmpool_buff_hdr",105,"off")=800
+	Set gtmtypes("shmpool_buff_hdr",105,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",105,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.flush_trigger")=105
-	Set gtmtypes("shmpool_buff_hdr",106,"name")="shmpool_buff_hdr.shadow_file_header.n_wrt_per_flu"
-	Set gtmtypes("shmpool_buff_hdr",106,"off")=812
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.flush_time")=105
+	Set gtmtypes("shmpool_buff_hdr",105,"dim")=2
+	Set gtmtypes("shmpool_buff_hdr",106,"name")="shmpool_buff_hdr.shadow_file_header.flush_trigger"
+	Set gtmtypes("shmpool_buff_hdr",106,"off")=808
 	Set gtmtypes("shmpool_buff_hdr",106,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",106,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_wrt_per_flu")=106
-	Set gtmtypes("shmpool_buff_hdr",107,"name")="shmpool_buff_hdr.shadow_file_header.wait_disk_space"
-	Set gtmtypes("shmpool_buff_hdr",107,"off")=816
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.flush_trigger")=106
+	Set gtmtypes("shmpool_buff_hdr",107,"name")="shmpool_buff_hdr.shadow_file_header.n_wrt_per_flu"
+	Set gtmtypes("shmpool_buff_hdr",107,"off")=812
 	Set gtmtypes("shmpool_buff_hdr",107,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",107,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wait_disk_space")=107
-	Set gtmtypes("shmpool_buff_hdr",108,"name")="shmpool_buff_hdr.shadow_file_header.defer_time"
-	Set gtmtypes("shmpool_buff_hdr",108,"off")=820
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_wrt_per_flu")=107
+	Set gtmtypes("shmpool_buff_hdr",108,"name")="shmpool_buff_hdr.shadow_file_header.wait_disk_space"
+	Set gtmtypes("shmpool_buff_hdr",108,"off")=816
 	Set gtmtypes("shmpool_buff_hdr",108,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",108,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.defer_time")=108
-	Set gtmtypes("shmpool_buff_hdr",109,"name")="shmpool_buff_hdr.shadow_file_header.filler_wc_blocked"
-	Set gtmtypes("shmpool_buff_hdr",109,"off")=824
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wait_disk_space")=108
+	Set gtmtypes("shmpool_buff_hdr",109,"name")="shmpool_buff_hdr.shadow_file_header.defer_time"
+	Set gtmtypes("shmpool_buff_hdr",109,"off")=820
 	Set gtmtypes("shmpool_buff_hdr",109,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",109,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_wc_blocked")=109
-	Set gtmtypes("shmpool_buff_hdr",110,"name")="shmpool_buff_hdr.shadow_file_header.mumps_can_bypass"
-	Set gtmtypes("shmpool_buff_hdr",110,"off")=828
+	Set gtmtypes("shmpool_buff_hdr",109,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.defer_time")=109
+	Set gtmtypes("shmpool_buff_hdr",110,"name")="shmpool_buff_hdr.shadow_file_header.filler_wc_blocked"
+	Set gtmtypes("shmpool_buff_hdr",110,"off")=824
 	Set gtmtypes("shmpool_buff_hdr",110,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",110,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.mumps_can_bypass")=110
-	Set gtmtypes("shmpool_buff_hdr",111,"name")="shmpool_buff_hdr.shadow_file_header.epoch_taper"
-	Set gtmtypes("shmpool_buff_hdr",111,"off")=832
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_wc_blocked")=110
+	Set gtmtypes("shmpool_buff_hdr",111,"name")="shmpool_buff_hdr.shadow_file_header.mumps_can_bypass"
+	Set gtmtypes("shmpool_buff_hdr",111,"off")=828
 	Set gtmtypes("shmpool_buff_hdr",111,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",111,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.epoch_taper")=111
-	Set gtmtypes("shmpool_buff_hdr",112,"name")="shmpool_buff_hdr.shadow_file_header.epoch_taper_time_pct"
-	Set gtmtypes("shmpool_buff_hdr",112,"off")=836
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.mumps_can_bypass")=111
+	Set gtmtypes("shmpool_buff_hdr",112,"name")="shmpool_buff_hdr.shadow_file_header.epoch_taper"
+	Set gtmtypes("shmpool_buff_hdr",112,"off")=832
 	Set gtmtypes("shmpool_buff_hdr",112,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",112,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.epoch_taper_time_pct")=112
-	Set gtmtypes("shmpool_buff_hdr",113,"name")="shmpool_buff_hdr.shadow_file_header.epoch_taper_jnl_pct"
-	Set gtmtypes("shmpool_buff_hdr",113,"off")=840
+	Set gtmtypes("shmpool_buff_hdr",112,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.epoch_taper")=112
+	Set gtmtypes("shmpool_buff_hdr",113,"name")="shmpool_buff_hdr.shadow_file_header.epoch_taper_time_pct"
+	Set gtmtypes("shmpool_buff_hdr",113,"off")=836
 	Set gtmtypes("shmpool_buff_hdr",113,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",113,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.epoch_taper_jnl_pct")=113
-	Set gtmtypes("shmpool_buff_hdr",114,"name")="shmpool_buff_hdr.shadow_file_header.filler_512"
-	Set gtmtypes("shmpool_buff_hdr",114,"off")=844
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.epoch_taper_time_pct")=113
+	Set gtmtypes("shmpool_buff_hdr",114,"name")="shmpool_buff_hdr.shadow_file_header.epoch_taper_jnl_pct"
+	Set gtmtypes("shmpool_buff_hdr",114,"off")=840
 	Set gtmtypes("shmpool_buff_hdr",114,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",114,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_512")=114
-	Set gtmtypes("shmpool_buff_hdr",115,"name")="shmpool_buff_hdr.shadow_file_header.reserved_for_upd"
-	Set gtmtypes("shmpool_buff_hdr",115,"off")=848
+	Set gtmtypes("shmpool_buff_hdr",114,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.epoch_taper_jnl_pct")=114
+	Set gtmtypes("shmpool_buff_hdr",115,"name")="shmpool_buff_hdr.shadow_file_header.asyncio"
+	Set gtmtypes("shmpool_buff_hdr",115,"off")=844
 	Set gtmtypes("shmpool_buff_hdr",115,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",115,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reserved_for_upd")=115
-	Set gtmtypes("shmpool_buff_hdr",116,"name")="shmpool_buff_hdr.shadow_file_header.avg_blks_per_100gbl"
-	Set gtmtypes("shmpool_buff_hdr",116,"off")=852
+	Set gtmtypes("shmpool_buff_hdr",115,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.asyncio")=115
+	Set gtmtypes("shmpool_buff_hdr",116,"name")="shmpool_buff_hdr.shadow_file_header.reserved_for_upd"
+	Set gtmtypes("shmpool_buff_hdr",116,"off")=848
 	Set gtmtypes("shmpool_buff_hdr",116,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",116,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.avg_blks_per_100gbl")=116
-	Set gtmtypes("shmpool_buff_hdr",117,"name")="shmpool_buff_hdr.shadow_file_header.pre_read_trigger_factor"
-	Set gtmtypes("shmpool_buff_hdr",117,"off")=856
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reserved_for_upd")=116
+	Set gtmtypes("shmpool_buff_hdr",117,"name")="shmpool_buff_hdr.shadow_file_header.avg_blks_per_100gbl"
+	Set gtmtypes("shmpool_buff_hdr",117,"off")=852
 	Set gtmtypes("shmpool_buff_hdr",117,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",117,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.pre_read_trigger_factor")=117
-	Set gtmtypes("shmpool_buff_hdr",118,"name")="shmpool_buff_hdr.shadow_file_header.writer_trigger_factor"
-	Set gtmtypes("shmpool_buff_hdr",118,"off")=860
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.avg_blks_per_100gbl")=117
+	Set gtmtypes("shmpool_buff_hdr",118,"name")="shmpool_buff_hdr.shadow_file_header.pre_read_trigger_factor"
+	Set gtmtypes("shmpool_buff_hdr",118,"off")=856
 	Set gtmtypes("shmpool_buff_hdr",118,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",118,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.writer_trigger_factor")=118
-	Set gtmtypes("shmpool_buff_hdr",119,"name")="shmpool_buff_hdr.shadow_file_header.semid"
-	Set gtmtypes("shmpool_buff_hdr",119,"off")=864
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.pre_read_trigger_factor")=118
+	Set gtmtypes("shmpool_buff_hdr",119,"name")="shmpool_buff_hdr.shadow_file_header.writer_trigger_factor"
+	Set gtmtypes("shmpool_buff_hdr",119,"off")=860
 	Set gtmtypes("shmpool_buff_hdr",119,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",119,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.semid")=119
-	Set gtmtypes("shmpool_buff_hdr",120,"name")="shmpool_buff_hdr.shadow_file_header.shmid"
-	Set gtmtypes("shmpool_buff_hdr",120,"off")=868
+	Set gtmtypes("shmpool_buff_hdr",119,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.writer_trigger_factor")=119
+	Set gtmtypes("shmpool_buff_hdr",120,"name")="shmpool_buff_hdr.shadow_file_header.semid"
+	Set gtmtypes("shmpool_buff_hdr",120,"off")=864
 	Set gtmtypes("shmpool_buff_hdr",120,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",120,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmid")=120
-	Set gtmtypes("shmpool_buff_hdr",121,"name")="shmpool_buff_hdr.shadow_file_header.gt_sem_ctime"
-	Set gtmtypes("shmpool_buff_hdr",121,"off")=872
-	Set gtmtypes("shmpool_buff_hdr",121,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",121,"type")="gtm_time8"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gt_sem_ctime")=121
-	Set gtmtypes("shmpool_buff_hdr",122,"name")="shmpool_buff_hdr.shadow_file_header.gt_sem_ctime.ctime"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.semid")=120
+	Set gtmtypes("shmpool_buff_hdr",121,"name")="shmpool_buff_hdr.shadow_file_header.shmid"
+	Set gtmtypes("shmpool_buff_hdr",121,"off")=868
+	Set gtmtypes("shmpool_buff_hdr",121,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",121,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmid")=121
+	Set gtmtypes("shmpool_buff_hdr",122,"name")="shmpool_buff_hdr.shadow_file_header.gt_sem_ctime"
 	Set gtmtypes("shmpool_buff_hdr",122,"off")=872
-	Set gtmtypes("shmpool_buff_hdr",122,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",122,"type")="time_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gt_sem_ctime.ctime")=122
-	Set gtmtypes("shmpool_buff_hdr",123,"name")="shmpool_buff_hdr.shadow_file_header.gt_sem_ctime.filler"
+	Set gtmtypes("shmpool_buff_hdr",122,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",122,"type")="gtm_time8"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gt_sem_ctime")=122
+	Set gtmtypes("shmpool_buff_hdr",123,"name")="shmpool_buff_hdr.shadow_file_header.gt_sem_ctime.ctime"
 	Set gtmtypes("shmpool_buff_hdr",123,"off")=872
-	Set gtmtypes("shmpool_buff_hdr",123,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",123,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gt_sem_ctime.filler")=123
-	Set gtmtypes("shmpool_buff_hdr",123,"dim")=2
-	Set gtmtypes("shmpool_buff_hdr",124,"name")="shmpool_buff_hdr.shadow_file_header.gt_shm_ctime"
-	Set gtmtypes("shmpool_buff_hdr",124,"off")=880
+	Set gtmtypes("shmpool_buff_hdr",123,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",123,"type")="time_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gt_sem_ctime.ctime")=123
+	Set gtmtypes("shmpool_buff_hdr",124,"name")="shmpool_buff_hdr.shadow_file_header.gt_sem_ctime.filler"
+	Set gtmtypes("shmpool_buff_hdr",124,"off")=872
 	Set gtmtypes("shmpool_buff_hdr",124,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",124,"type")="gtm_time8"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gt_shm_ctime")=124
-	Set gtmtypes("shmpool_buff_hdr",125,"name")="shmpool_buff_hdr.shadow_file_header.gt_shm_ctime.ctime"
+	Set gtmtypes("shmpool_buff_hdr",124,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gt_sem_ctime.filler")=124
+	Set gtmtypes("shmpool_buff_hdr",124,"dim")=2
+	Set gtmtypes("shmpool_buff_hdr",125,"name")="shmpool_buff_hdr.shadow_file_header.gt_shm_ctime"
 	Set gtmtypes("shmpool_buff_hdr",125,"off")=880
-	Set gtmtypes("shmpool_buff_hdr",125,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",125,"type")="time_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gt_shm_ctime.ctime")=125
-	Set gtmtypes("shmpool_buff_hdr",126,"name")="shmpool_buff_hdr.shadow_file_header.gt_shm_ctime.filler"
+	Set gtmtypes("shmpool_buff_hdr",125,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",125,"type")="gtm_time8"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gt_shm_ctime")=125
+	Set gtmtypes("shmpool_buff_hdr",126,"name")="shmpool_buff_hdr.shadow_file_header.gt_shm_ctime.ctime"
 	Set gtmtypes("shmpool_buff_hdr",126,"off")=880
-	Set gtmtypes("shmpool_buff_hdr",126,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",126,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gt_shm_ctime.filler")=126
-	Set gtmtypes("shmpool_buff_hdr",126,"dim")=2
-	Set gtmtypes("shmpool_buff_hdr",127,"name")="shmpool_buff_hdr.shadow_file_header.filler_unixonly"
-	Set gtmtypes("shmpool_buff_hdr",127,"off")=888
-	Set gtmtypes("shmpool_buff_hdr",127,"len")=40
-	Set gtmtypes("shmpool_buff_hdr",127,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_unixonly")=127
-	Set gtmtypes("shmpool_buff_hdr",128,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_retries"
-	Set gtmtypes("shmpool_buff_hdr",128,"off")=928
-	Set gtmtypes("shmpool_buff_hdr",128,"len")=20
-	Set gtmtypes("shmpool_buff_hdr",128,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_retries")=128
-	Set gtmtypes("shmpool_buff_hdr",128,"dim")=5
-	Set gtmtypes("shmpool_buff_hdr",129,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_puts"
-	Set gtmtypes("shmpool_buff_hdr",129,"off")=948
-	Set gtmtypes("shmpool_buff_hdr",129,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",126,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",126,"type")="time_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gt_shm_ctime.ctime")=126
+	Set gtmtypes("shmpool_buff_hdr",127,"name")="shmpool_buff_hdr.shadow_file_header.gt_shm_ctime.filler"
+	Set gtmtypes("shmpool_buff_hdr",127,"off")=880
+	Set gtmtypes("shmpool_buff_hdr",127,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",127,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gt_shm_ctime.filler")=127
+	Set gtmtypes("shmpool_buff_hdr",127,"dim")=2
+	Set gtmtypes("shmpool_buff_hdr",128,"name")="shmpool_buff_hdr.shadow_file_header.filler_unixonly"
+	Set gtmtypes("shmpool_buff_hdr",128,"off")=888
+	Set gtmtypes("shmpool_buff_hdr",128,"len")=40
+	Set gtmtypes("shmpool_buff_hdr",128,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_unixonly")=128
+	Set gtmtypes("shmpool_buff_hdr",129,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_retries"
+	Set gtmtypes("shmpool_buff_hdr",129,"off")=928
+	Set gtmtypes("shmpool_buff_hdr",129,"len")=20
 	Set gtmtypes("shmpool_buff_hdr",129,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_puts")=129
-	Set gtmtypes("shmpool_buff_hdr",130,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_kills"
-	Set gtmtypes("shmpool_buff_hdr",130,"off")=952
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_retries")=129
+	Set gtmtypes("shmpool_buff_hdr",129,"dim")=5
+	Set gtmtypes("shmpool_buff_hdr",130,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_puts"
+	Set gtmtypes("shmpool_buff_hdr",130,"off")=948
 	Set gtmtypes("shmpool_buff_hdr",130,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",130,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_kills")=130
-	Set gtmtypes("shmpool_buff_hdr",131,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_queries"
-	Set gtmtypes("shmpool_buff_hdr",131,"off")=956
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_puts")=130
+	Set gtmtypes("shmpool_buff_hdr",131,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_kills"
+	Set gtmtypes("shmpool_buff_hdr",131,"off")=952
 	Set gtmtypes("shmpool_buff_hdr",131,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",131,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_queries")=131
-	Set gtmtypes("shmpool_buff_hdr",132,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_gets"
-	Set gtmtypes("shmpool_buff_hdr",132,"off")=960
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_kills")=131
+	Set gtmtypes("shmpool_buff_hdr",132,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_queries"
+	Set gtmtypes("shmpool_buff_hdr",132,"off")=956
 	Set gtmtypes("shmpool_buff_hdr",132,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",132,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_gets")=132
-	Set gtmtypes("shmpool_buff_hdr",133,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_order"
-	Set gtmtypes("shmpool_buff_hdr",133,"off")=964
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_queries")=132
+	Set gtmtypes("shmpool_buff_hdr",133,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_gets"
+	Set gtmtypes("shmpool_buff_hdr",133,"off")=960
 	Set gtmtypes("shmpool_buff_hdr",133,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",133,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_order")=133
-	Set gtmtypes("shmpool_buff_hdr",134,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_zprevs"
-	Set gtmtypes("shmpool_buff_hdr",134,"off")=968
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_gets")=133
+	Set gtmtypes("shmpool_buff_hdr",134,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_order"
+	Set gtmtypes("shmpool_buff_hdr",134,"off")=964
 	Set gtmtypes("shmpool_buff_hdr",134,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",134,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_zprevs")=134
-	Set gtmtypes("shmpool_buff_hdr",135,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_data"
-	Set gtmtypes("shmpool_buff_hdr",135,"off")=972
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_order")=134
+	Set gtmtypes("shmpool_buff_hdr",135,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_zprevs"
+	Set gtmtypes("shmpool_buff_hdr",135,"off")=968
 	Set gtmtypes("shmpool_buff_hdr",135,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",135,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_data")=135
-	Set gtmtypes("shmpool_buff_hdr",136,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_puts_duplicate"
-	Set gtmtypes("shmpool_buff_hdr",136,"off")=976
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_zprevs")=135
+	Set gtmtypes("shmpool_buff_hdr",136,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_data"
+	Set gtmtypes("shmpool_buff_hdr",136,"off")=972
 	Set gtmtypes("shmpool_buff_hdr",136,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",136,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_puts_duplicate")=136
-	Set gtmtypes("shmpool_buff_hdr",137,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_tp_updates"
-	Set gtmtypes("shmpool_buff_hdr",137,"off")=980
+	Set gtmtypes("shmpool_buff_hdr",136,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_data")=136
+	Set gtmtypes("shmpool_buff_hdr",137,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_puts_duplicate"
+	Set gtmtypes("shmpool_buff_hdr",137,"off")=976
 	Set gtmtypes("shmpool_buff_hdr",137,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",137,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_tp_updates")=137
-	Set gtmtypes("shmpool_buff_hdr",138,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_tp_updates_duplicate"
-	Set gtmtypes("shmpool_buff_hdr",138,"off")=984
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_puts_duplicate")=137
+	Set gtmtypes("shmpool_buff_hdr",138,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_tp_updates"
+	Set gtmtypes("shmpool_buff_hdr",138,"off")=980
 	Set gtmtypes("shmpool_buff_hdr",138,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",138,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_tp_updates_duplicate")=138
-	Set gtmtypes("shmpool_buff_hdr",139,"name")="shmpool_buff_hdr.shadow_file_header.filler_accounting_64_align"
-	Set gtmtypes("shmpool_buff_hdr",139,"off")=988
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_tp_updates")=138
+	Set gtmtypes("shmpool_buff_hdr",139,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_tp_updates_duplicate"
+	Set gtmtypes("shmpool_buff_hdr",139,"off")=984
 	Set gtmtypes("shmpool_buff_hdr",139,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",139,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_accounting_64_align")=139
-	Set gtmtypes("shmpool_buff_hdr",140,"name")="shmpool_buff_hdr.shadow_file_header.staleness"
-	Set gtmtypes("shmpool_buff_hdr",140,"off")=992
-	Set gtmtypes("shmpool_buff_hdr",140,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",140,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.staleness")=140
-	Set gtmtypes("shmpool_buff_hdr",140,"dim")=2
-	Set gtmtypes("shmpool_buff_hdr",141,"name")="shmpool_buff_hdr.shadow_file_header.ccp_tick_interval"
-	Set gtmtypes("shmpool_buff_hdr",141,"off")=1000
+	Set gtmtypes("shmpool_buff_hdr",139,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_tp_updates_duplicate")=139
+	Set gtmtypes("shmpool_buff_hdr",140,"name")="shmpool_buff_hdr.shadow_file_header.filler_accounting_64_align"
+	Set gtmtypes("shmpool_buff_hdr",140,"off")=988
+	Set gtmtypes("shmpool_buff_hdr",140,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",140,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_accounting_64_align")=140
+	Set gtmtypes("shmpool_buff_hdr",141,"name")="shmpool_buff_hdr.shadow_file_header.staleness"
+	Set gtmtypes("shmpool_buff_hdr",141,"off")=992
 	Set gtmtypes("shmpool_buff_hdr",141,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",141,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.ccp_tick_interval")=141
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.staleness")=141
 	Set gtmtypes("shmpool_buff_hdr",141,"dim")=2
-	Set gtmtypes("shmpool_buff_hdr",142,"name")="shmpool_buff_hdr.shadow_file_header.ccp_quantum_interval"
-	Set gtmtypes("shmpool_buff_hdr",142,"off")=1008
+	Set gtmtypes("shmpool_buff_hdr",142,"name")="shmpool_buff_hdr.shadow_file_header.ccp_tick_interval"
+	Set gtmtypes("shmpool_buff_hdr",142,"off")=1000
 	Set gtmtypes("shmpool_buff_hdr",142,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",142,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.ccp_quantum_interval")=142
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.ccp_tick_interval")=142
 	Set gtmtypes("shmpool_buff_hdr",142,"dim")=2
-	Set gtmtypes("shmpool_buff_hdr",143,"name")="shmpool_buff_hdr.shadow_file_header.ccp_response_interval"
-	Set gtmtypes("shmpool_buff_hdr",143,"off")=1016
+	Set gtmtypes("shmpool_buff_hdr",143,"name")="shmpool_buff_hdr.shadow_file_header.ccp_quantum_interval"
+	Set gtmtypes("shmpool_buff_hdr",143,"off")=1008
 	Set gtmtypes("shmpool_buff_hdr",143,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",143,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.ccp_response_interval")=143
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.ccp_quantum_interval")=143
 	Set gtmtypes("shmpool_buff_hdr",143,"dim")=2
-	Set gtmtypes("shmpool_buff_hdr",144,"name")="shmpool_buff_hdr.shadow_file_header.ccp_jnl_before"
-	Set gtmtypes("shmpool_buff_hdr",144,"off")=1024
-	Set gtmtypes("shmpool_buff_hdr",144,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",144,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.ccp_jnl_before")=144
-	Set gtmtypes("shmpool_buff_hdr",145,"name")="shmpool_buff_hdr.shadow_file_header.clustered"
-	Set gtmtypes("shmpool_buff_hdr",145,"off")=1028
+	Set gtmtypes("shmpool_buff_hdr",144,"name")="shmpool_buff_hdr.shadow_file_header.ccp_response_interval"
+	Set gtmtypes("shmpool_buff_hdr",144,"off")=1016
+	Set gtmtypes("shmpool_buff_hdr",144,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",144,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.ccp_response_interval")=144
+	Set gtmtypes("shmpool_buff_hdr",144,"dim")=2
+	Set gtmtypes("shmpool_buff_hdr",145,"name")="shmpool_buff_hdr.shadow_file_header.ccp_jnl_before"
+	Set gtmtypes("shmpool_buff_hdr",145,"off")=1024
 	Set gtmtypes("shmpool_buff_hdr",145,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",145,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.clustered")=145
-	Set gtmtypes("shmpool_buff_hdr",146,"name")="shmpool_buff_hdr.shadow_file_header.unbacked_cache"
-	Set gtmtypes("shmpool_buff_hdr",146,"off")=1032
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.ccp_jnl_before")=145
+	Set gtmtypes("shmpool_buff_hdr",146,"name")="shmpool_buff_hdr.shadow_file_header.clustered"
+	Set gtmtypes("shmpool_buff_hdr",146,"off")=1028
 	Set gtmtypes("shmpool_buff_hdr",146,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",146,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unbacked_cache")=146
-	Set gtmtypes("shmpool_buff_hdr",147,"name")="shmpool_buff_hdr.shadow_file_header.rc_srv_cnt"
-	Set gtmtypes("shmpool_buff_hdr",147,"off")=1036
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.clustered")=146
+	Set gtmtypes("shmpool_buff_hdr",147,"name")="shmpool_buff_hdr.shadow_file_header.unbacked_cache"
+	Set gtmtypes("shmpool_buff_hdr",147,"off")=1032
 	Set gtmtypes("shmpool_buff_hdr",147,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",147,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.rc_srv_cnt")=147
-	Set gtmtypes("shmpool_buff_hdr",148,"name")="shmpool_buff_hdr.shadow_file_header.dsid"
-	Set gtmtypes("shmpool_buff_hdr",148,"off")=1040
+	Set gtmtypes("shmpool_buff_hdr",147,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unbacked_cache")=147
+	Set gtmtypes("shmpool_buff_hdr",148,"name")="shmpool_buff_hdr.shadow_file_header.rc_srv_cnt"
+	Set gtmtypes("shmpool_buff_hdr",148,"off")=1036
 	Set gtmtypes("shmpool_buff_hdr",148,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",148,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.dsid")=148
-	Set gtmtypes("shmpool_buff_hdr",149,"name")="shmpool_buff_hdr.shadow_file_header.rc_node"
-	Set gtmtypes("shmpool_buff_hdr",149,"off")=1044
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.rc_srv_cnt")=148
+	Set gtmtypes("shmpool_buff_hdr",149,"name")="shmpool_buff_hdr.shadow_file_header.dsid"
+	Set gtmtypes("shmpool_buff_hdr",149,"off")=1040
 	Set gtmtypes("shmpool_buff_hdr",149,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",149,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.rc_node")=149
-	Set gtmtypes("shmpool_buff_hdr",150,"name")="shmpool_buff_hdr.shadow_file_header.filler_ccp_rc"
-	Set gtmtypes("shmpool_buff_hdr",150,"off")=1048
-	Set gtmtypes("shmpool_buff_hdr",150,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",150,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_ccp_rc")=150
-	Set gtmtypes("shmpool_buff_hdr",151,"name")="shmpool_buff_hdr.shadow_file_header.reg_seqno"
-	Set gtmtypes("shmpool_buff_hdr",151,"off")=1056
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.dsid")=149
+	Set gtmtypes("shmpool_buff_hdr",150,"name")="shmpool_buff_hdr.shadow_file_header.rc_node"
+	Set gtmtypes("shmpool_buff_hdr",150,"off")=1044
+	Set gtmtypes("shmpool_buff_hdr",150,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",150,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.rc_node")=150
+	Set gtmtypes("shmpool_buff_hdr",151,"name")="shmpool_buff_hdr.shadow_file_header.filler_ccp_rc"
+	Set gtmtypes("shmpool_buff_hdr",151,"off")=1048
 	Set gtmtypes("shmpool_buff_hdr",151,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",151,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reg_seqno")=151
-	Set gtmtypes("shmpool_buff_hdr",152,"name")="shmpool_buff_hdr.shadow_file_header.pre_multisite_resync_seqno"
-	Set gtmtypes("shmpool_buff_hdr",152,"off")=1064
+	Set gtmtypes("shmpool_buff_hdr",151,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_ccp_rc")=151
+	Set gtmtypes("shmpool_buff_hdr",152,"name")="shmpool_buff_hdr.shadow_file_header.reg_seqno"
+	Set gtmtypes("shmpool_buff_hdr",152,"off")=1056
 	Set gtmtypes("shmpool_buff_hdr",152,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",152,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.pre_multisite_resync_seqno")=152
-	Set gtmtypes("shmpool_buff_hdr",153,"name")="shmpool_buff_hdr.shadow_file_header.zqgblmod_tn"
-	Set gtmtypes("shmpool_buff_hdr",153,"off")=1072
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reg_seqno")=152
+	Set gtmtypes("shmpool_buff_hdr",153,"name")="shmpool_buff_hdr.shadow_file_header.pre_multisite_resync_seqno"
+	Set gtmtypes("shmpool_buff_hdr",153,"off")=1064
 	Set gtmtypes("shmpool_buff_hdr",153,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",153,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.zqgblmod_tn")=153
-	Set gtmtypes("shmpool_buff_hdr",154,"name")="shmpool_buff_hdr.shadow_file_header.zqgblmod_seqno"
-	Set gtmtypes("shmpool_buff_hdr",154,"off")=1080
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.pre_multisite_resync_seqno")=153
+	Set gtmtypes("shmpool_buff_hdr",154,"name")="shmpool_buff_hdr.shadow_file_header.zqgblmod_tn"
+	Set gtmtypes("shmpool_buff_hdr",154,"off")=1072
 	Set gtmtypes("shmpool_buff_hdr",154,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",154,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.zqgblmod_seqno")=154
-	Set gtmtypes("shmpool_buff_hdr",155,"name")="shmpool_buff_hdr.shadow_file_header.repl_state"
-	Set gtmtypes("shmpool_buff_hdr",155,"off")=1088
-	Set gtmtypes("shmpool_buff_hdr",155,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",155,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.repl_state")=155
-	Set gtmtypes("shmpool_buff_hdr",156,"name")="shmpool_buff_hdr.shadow_file_header.multi_site_open"
-	Set gtmtypes("shmpool_buff_hdr",156,"off")=1092
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.zqgblmod_tn")=154
+	Set gtmtypes("shmpool_buff_hdr",155,"name")="shmpool_buff_hdr.shadow_file_header.zqgblmod_seqno"
+	Set gtmtypes("shmpool_buff_hdr",155,"off")=1080
+	Set gtmtypes("shmpool_buff_hdr",155,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",155,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.zqgblmod_seqno")=155
+	Set gtmtypes("shmpool_buff_hdr",156,"name")="shmpool_buff_hdr.shadow_file_header.repl_state"
+	Set gtmtypes("shmpool_buff_hdr",156,"off")=1088
 	Set gtmtypes("shmpool_buff_hdr",156,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",156,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.multi_site_open")=156
-	Set gtmtypes("shmpool_buff_hdr",157,"name")="shmpool_buff_hdr.shadow_file_header.filler_seqno"
-	Set gtmtypes("shmpool_buff_hdr",157,"off")=1096
-	Set gtmtypes("shmpool_buff_hdr",157,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",157,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_seqno")=157
-	Set gtmtypes("shmpool_buff_hdr",158,"name")="shmpool_buff_hdr.shadow_file_header.filler_repl"
-	Set gtmtypes("shmpool_buff_hdr",158,"off")=1104
-	Set gtmtypes("shmpool_buff_hdr",158,"len")=16
-	Set gtmtypes("shmpool_buff_hdr",158,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_repl")=158
-	Set gtmtypes("shmpool_buff_hdr",159,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_tp_retries"
-	Set gtmtypes("shmpool_buff_hdr",159,"off")=1120
-	Set gtmtypes("shmpool_buff_hdr",159,"len")=48
-	Set gtmtypes("shmpool_buff_hdr",159,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_tp_retries")=159
-	Set gtmtypes("shmpool_buff_hdr",159,"dim")=12
-	Set gtmtypes("shmpool_buff_hdr",160,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_tp_retries_conflicts"
-	Set gtmtypes("shmpool_buff_hdr",160,"off")=1168
+	Set gtmtypes("shmpool_buff_hdr",156,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.repl_state")=156
+	Set gtmtypes("shmpool_buff_hdr",157,"name")="shmpool_buff_hdr.shadow_file_header.multi_site_open"
+	Set gtmtypes("shmpool_buff_hdr",157,"off")=1092
+	Set gtmtypes("shmpool_buff_hdr",157,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",157,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.multi_site_open")=157
+	Set gtmtypes("shmpool_buff_hdr",158,"name")="shmpool_buff_hdr.shadow_file_header.filler_seqno"
+	Set gtmtypes("shmpool_buff_hdr",158,"off")=1096
+	Set gtmtypes("shmpool_buff_hdr",158,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",158,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_seqno")=158
+	Set gtmtypes("shmpool_buff_hdr",159,"name")="shmpool_buff_hdr.shadow_file_header.filler_repl"
+	Set gtmtypes("shmpool_buff_hdr",159,"off")=1104
+	Set gtmtypes("shmpool_buff_hdr",159,"len")=16
+	Set gtmtypes("shmpool_buff_hdr",159,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_repl")=159
+	Set gtmtypes("shmpool_buff_hdr",160,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_tp_retries"
+	Set gtmtypes("shmpool_buff_hdr",160,"off")=1120
 	Set gtmtypes("shmpool_buff_hdr",160,"len")=48
 	Set gtmtypes("shmpool_buff_hdr",160,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_tp_retries_conflicts")=160
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_tp_retries")=160
 	Set gtmtypes("shmpool_buff_hdr",160,"dim")=12
-	Set gtmtypes("shmpool_buff_hdr",161,"name")="shmpool_buff_hdr.shadow_file_header.tp_cdb_sc_blkmod"
-	Set gtmtypes("shmpool_buff_hdr",161,"off")=1216
-	Set gtmtypes("shmpool_buff_hdr",161,"len")=32
+	Set gtmtypes("shmpool_buff_hdr",161,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_tp_retries_conflicts"
+	Set gtmtypes("shmpool_buff_hdr",161,"off")=1168
+	Set gtmtypes("shmpool_buff_hdr",161,"len")=48
 	Set gtmtypes("shmpool_buff_hdr",161,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.tp_cdb_sc_blkmod")=161
-	Set gtmtypes("shmpool_buff_hdr",161,"dim")=8
-	Set gtmtypes("shmpool_buff_hdr",162,"name")="shmpool_buff_hdr.shadow_file_header.jnl_alq"
-	Set gtmtypes("shmpool_buff_hdr",162,"off")=1248
-	Set gtmtypes("shmpool_buff_hdr",162,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",162,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_alq")=162
-	Set gtmtypes("shmpool_buff_hdr",163,"name")="shmpool_buff_hdr.shadow_file_header.jnl_deq"
-	Set gtmtypes("shmpool_buff_hdr",163,"off")=1252
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_tp_retries_conflicts")=161
+	Set gtmtypes("shmpool_buff_hdr",161,"dim")=12
+	Set gtmtypes("shmpool_buff_hdr",162,"name")="shmpool_buff_hdr.shadow_file_header.tp_cdb_sc_blkmod"
+	Set gtmtypes("shmpool_buff_hdr",162,"off")=1216
+	Set gtmtypes("shmpool_buff_hdr",162,"len")=32
+	Set gtmtypes("shmpool_buff_hdr",162,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.tp_cdb_sc_blkmod")=162
+	Set gtmtypes("shmpool_buff_hdr",162,"dim")=8
+	Set gtmtypes("shmpool_buff_hdr",163,"name")="shmpool_buff_hdr.shadow_file_header.jnl_alq"
+	Set gtmtypes("shmpool_buff_hdr",163,"off")=1248
 	Set gtmtypes("shmpool_buff_hdr",163,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",163,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_deq")=163
-	Set gtmtypes("shmpool_buff_hdr",164,"name")="shmpool_buff_hdr.shadow_file_header.jnl_buffer_size"
-	Set gtmtypes("shmpool_buff_hdr",164,"off")=1256
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_alq")=163
+	Set gtmtypes("shmpool_buff_hdr",164,"name")="shmpool_buff_hdr.shadow_file_header.jnl_deq"
+	Set gtmtypes("shmpool_buff_hdr",164,"off")=1252
 	Set gtmtypes("shmpool_buff_hdr",164,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",164,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_buffer_size")=164
-	Set gtmtypes("shmpool_buff_hdr",165,"name")="shmpool_buff_hdr.shadow_file_header.jnl_before_image"
-	Set gtmtypes("shmpool_buff_hdr",165,"off")=1260
+	Set gtmtypes("shmpool_buff_hdr",164,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_deq")=164
+	Set gtmtypes("shmpool_buff_hdr",165,"name")="shmpool_buff_hdr.shadow_file_header.jnl_buffer_size"
+	Set gtmtypes("shmpool_buff_hdr",165,"off")=1256
 	Set gtmtypes("shmpool_buff_hdr",165,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",165,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_before_image")=165
-	Set gtmtypes("shmpool_buff_hdr",166,"name")="shmpool_buff_hdr.shadow_file_header.jnl_state"
-	Set gtmtypes("shmpool_buff_hdr",166,"off")=1264
+	Set gtmtypes("shmpool_buff_hdr",165,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_buffer_size")=165
+	Set gtmtypes("shmpool_buff_hdr",166,"name")="shmpool_buff_hdr.shadow_file_header.jnl_before_image"
+	Set gtmtypes("shmpool_buff_hdr",166,"off")=1260
 	Set gtmtypes("shmpool_buff_hdr",166,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",166,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_state")=166
-	Set gtmtypes("shmpool_buff_hdr",167,"name")="shmpool_buff_hdr.shadow_file_header.jnl_file_len"
-	Set gtmtypes("shmpool_buff_hdr",167,"off")=1268
+	Set gtmtypes("shmpool_buff_hdr",166,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_before_image")=166
+	Set gtmtypes("shmpool_buff_hdr",167,"name")="shmpool_buff_hdr.shadow_file_header.jnl_state"
+	Set gtmtypes("shmpool_buff_hdr",167,"off")=1264
 	Set gtmtypes("shmpool_buff_hdr",167,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",167,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_file_len")=167
-	Set gtmtypes("shmpool_buff_hdr",168,"name")="shmpool_buff_hdr.shadow_file_header.autoswitchlimit"
-	Set gtmtypes("shmpool_buff_hdr",168,"off")=1272
+	Set gtmtypes("shmpool_buff_hdr",167,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_state")=167
+	Set gtmtypes("shmpool_buff_hdr",168,"name")="shmpool_buff_hdr.shadow_file_header.jnl_file_len"
+	Set gtmtypes("shmpool_buff_hdr",168,"off")=1268
 	Set gtmtypes("shmpool_buff_hdr",168,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",168,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.autoswitchlimit")=168
-	Set gtmtypes("shmpool_buff_hdr",169,"name")="shmpool_buff_hdr.shadow_file_header.epoch_interval"
-	Set gtmtypes("shmpool_buff_hdr",169,"off")=1276
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_file_len")=168
+	Set gtmtypes("shmpool_buff_hdr",169,"name")="shmpool_buff_hdr.shadow_file_header.autoswitchlimit"
+	Set gtmtypes("shmpool_buff_hdr",169,"off")=1272
 	Set gtmtypes("shmpool_buff_hdr",169,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",169,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.epoch_interval")=169
-	Set gtmtypes("shmpool_buff_hdr",170,"name")="shmpool_buff_hdr.shadow_file_header.alignsize"
-	Set gtmtypes("shmpool_buff_hdr",170,"off")=1280
+	Set gtmtypes("shmpool_buff_hdr",169,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.autoswitchlimit")=169
+	Set gtmtypes("shmpool_buff_hdr",170,"name")="shmpool_buff_hdr.shadow_file_header.epoch_interval"
+	Set gtmtypes("shmpool_buff_hdr",170,"off")=1276
 	Set gtmtypes("shmpool_buff_hdr",170,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",170,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.alignsize")=170
-	Set gtmtypes("shmpool_buff_hdr",171,"name")="shmpool_buff_hdr.shadow_file_header.jnl_sync_io"
-	Set gtmtypes("shmpool_buff_hdr",171,"off")=1284
+	Set gtmtypes("shmpool_buff_hdr",170,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.epoch_interval")=170
+	Set gtmtypes("shmpool_buff_hdr",171,"name")="shmpool_buff_hdr.shadow_file_header.alignsize"
+	Set gtmtypes("shmpool_buff_hdr",171,"off")=1280
 	Set gtmtypes("shmpool_buff_hdr",171,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",171,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_sync_io")=171
-	Set gtmtypes("shmpool_buff_hdr",172,"name")="shmpool_buff_hdr.shadow_file_header.yield_lmt"
-	Set gtmtypes("shmpool_buff_hdr",172,"off")=1288
+	Set gtmtypes("shmpool_buff_hdr",171,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.alignsize")=171
+	Set gtmtypes("shmpool_buff_hdr",172,"name")="shmpool_buff_hdr.shadow_file_header.jnl_sync_io"
+	Set gtmtypes("shmpool_buff_hdr",172,"off")=1284
 	Set gtmtypes("shmpool_buff_hdr",172,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",172,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.yield_lmt")=172
-	Set gtmtypes("shmpool_buff_hdr",173,"name")="shmpool_buff_hdr.shadow_file_header.turn_around_point"
-	Set gtmtypes("shmpool_buff_hdr",173,"off")=1292
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_sync_io")=172
+	Set gtmtypes("shmpool_buff_hdr",173,"name")="shmpool_buff_hdr.shadow_file_header.yield_lmt"
+	Set gtmtypes("shmpool_buff_hdr",173,"off")=1288
 	Set gtmtypes("shmpool_buff_hdr",173,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",173,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.turn_around_point")=173
-	Set gtmtypes("shmpool_buff_hdr",174,"name")="shmpool_buff_hdr.shadow_file_header.jnl_eovtn"
-	Set gtmtypes("shmpool_buff_hdr",174,"off")=1296
-	Set gtmtypes("shmpool_buff_hdr",174,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",174,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_eovtn")=174
-	Set gtmtypes("shmpool_buff_hdr",175,"name")="shmpool_buff_hdr.shadow_file_header.filler_jnl"
-	Set gtmtypes("shmpool_buff_hdr",175,"off")=1304
+	Set gtmtypes("shmpool_buff_hdr",173,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.yield_lmt")=173
+	Set gtmtypes("shmpool_buff_hdr",174,"name")="shmpool_buff_hdr.shadow_file_header.turn_around_point"
+	Set gtmtypes("shmpool_buff_hdr",174,"off")=1292
+	Set gtmtypes("shmpool_buff_hdr",174,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",174,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.turn_around_point")=174
+	Set gtmtypes("shmpool_buff_hdr",175,"name")="shmpool_buff_hdr.shadow_file_header.jnl_eovtn"
+	Set gtmtypes("shmpool_buff_hdr",175,"off")=1296
 	Set gtmtypes("shmpool_buff_hdr",175,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",175,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_jnl")=175
-	Set gtmtypes("shmpool_buff_hdr",176,"name")="shmpool_buff_hdr.shadow_file_header.intrpt_recov_resync_seqno"
-	Set gtmtypes("shmpool_buff_hdr",176,"off")=1312
+	Set gtmtypes("shmpool_buff_hdr",175,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_eovtn")=175
+	Set gtmtypes("shmpool_buff_hdr",176,"name")="shmpool_buff_hdr.shadow_file_header.filler_jnl"
+	Set gtmtypes("shmpool_buff_hdr",176,"off")=1304
 	Set gtmtypes("shmpool_buff_hdr",176,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",176,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.intrpt_recov_resync_seqno")=176
-	Set gtmtypes("shmpool_buff_hdr",177,"name")="shmpool_buff_hdr.shadow_file_header.intrpt_recov_tp_resolve_time"
-	Set gtmtypes("shmpool_buff_hdr",177,"off")=1320
-	Set gtmtypes("shmpool_buff_hdr",177,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",177,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.intrpt_recov_tp_resolve_time")=177
-	Set gtmtypes("shmpool_buff_hdr",178,"name")="shmpool_buff_hdr.shadow_file_header.recov_interrupted"
-	Set gtmtypes("shmpool_buff_hdr",178,"off")=1324
+	Set gtmtypes("shmpool_buff_hdr",176,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_jnl")=176
+	Set gtmtypes("shmpool_buff_hdr",177,"name")="shmpool_buff_hdr.shadow_file_header.intrpt_recov_resync_seqno"
+	Set gtmtypes("shmpool_buff_hdr",177,"off")=1312
+	Set gtmtypes("shmpool_buff_hdr",177,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",177,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.intrpt_recov_resync_seqno")=177
+	Set gtmtypes("shmpool_buff_hdr",178,"name")="shmpool_buff_hdr.shadow_file_header.intrpt_recov_tp_resolve_time"
+	Set gtmtypes("shmpool_buff_hdr",178,"off")=1320
 	Set gtmtypes("shmpool_buff_hdr",178,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",178,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recov_interrupted")=178
-	Set gtmtypes("shmpool_buff_hdr",179,"name")="shmpool_buff_hdr.shadow_file_header.intrpt_recov_jnl_state"
-	Set gtmtypes("shmpool_buff_hdr",179,"off")=1328
+	Set gtmtypes("shmpool_buff_hdr",178,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.intrpt_recov_tp_resolve_time")=178
+	Set gtmtypes("shmpool_buff_hdr",179,"name")="shmpool_buff_hdr.shadow_file_header.recov_interrupted"
+	Set gtmtypes("shmpool_buff_hdr",179,"off")=1324
 	Set gtmtypes("shmpool_buff_hdr",179,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",179,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.intrpt_recov_jnl_state")=179
-	Set gtmtypes("shmpool_buff_hdr",180,"name")="shmpool_buff_hdr.shadow_file_header.intrpt_recov_repl_state"
-	Set gtmtypes("shmpool_buff_hdr",180,"off")=1332
+	Set gtmtypes("shmpool_buff_hdr",179,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recov_interrupted")=179
+	Set gtmtypes("shmpool_buff_hdr",180,"name")="shmpool_buff_hdr.shadow_file_header.intrpt_recov_jnl_state"
+	Set gtmtypes("shmpool_buff_hdr",180,"off")=1328
 	Set gtmtypes("shmpool_buff_hdr",180,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",180,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.intrpt_recov_repl_state")=180
-	Set gtmtypes("shmpool_buff_hdr",181,"name")="shmpool_buff_hdr.shadow_file_header.before_trunc_total_blks"
-	Set gtmtypes("shmpool_buff_hdr",181,"off")=1336
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.intrpt_recov_jnl_state")=180
+	Set gtmtypes("shmpool_buff_hdr",181,"name")="shmpool_buff_hdr.shadow_file_header.intrpt_recov_repl_state"
+	Set gtmtypes("shmpool_buff_hdr",181,"off")=1332
 	Set gtmtypes("shmpool_buff_hdr",181,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",181,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.before_trunc_total_blks")=181
-	Set gtmtypes("shmpool_buff_hdr",182,"name")="shmpool_buff_hdr.shadow_file_header.after_trunc_total_blks"
-	Set gtmtypes("shmpool_buff_hdr",182,"off")=1340
+	Set gtmtypes("shmpool_buff_hdr",181,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.intrpt_recov_repl_state")=181
+	Set gtmtypes("shmpool_buff_hdr",182,"name")="shmpool_buff_hdr.shadow_file_header.before_trunc_total_blks"
+	Set gtmtypes("shmpool_buff_hdr",182,"off")=1336
 	Set gtmtypes("shmpool_buff_hdr",182,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",182,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.after_trunc_total_blks")=182
-	Set gtmtypes("shmpool_buff_hdr",183,"name")="shmpool_buff_hdr.shadow_file_header.before_trunc_free_blocks"
-	Set gtmtypes("shmpool_buff_hdr",183,"off")=1344
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.before_trunc_total_blks")=182
+	Set gtmtypes("shmpool_buff_hdr",183,"name")="shmpool_buff_hdr.shadow_file_header.after_trunc_total_blks"
+	Set gtmtypes("shmpool_buff_hdr",183,"off")=1340
 	Set gtmtypes("shmpool_buff_hdr",183,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",183,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.before_trunc_free_blocks")=183
-	Set gtmtypes("shmpool_buff_hdr",184,"name")="shmpool_buff_hdr.shadow_file_header.filler_trunc"
-	Set gtmtypes("shmpool_buff_hdr",184,"off")=1348
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.after_trunc_total_blks")=183
+	Set gtmtypes("shmpool_buff_hdr",184,"name")="shmpool_buff_hdr.shadow_file_header.before_trunc_free_blocks"
+	Set gtmtypes("shmpool_buff_hdr",184,"off")=1344
 	Set gtmtypes("shmpool_buff_hdr",184,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",184,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_trunc")=184
-	Set gtmtypes("shmpool_buff_hdr",185,"name")="shmpool_buff_hdr.shadow_file_header.filler_1k"
-	Set gtmtypes("shmpool_buff_hdr",185,"off")=1352
-	Set gtmtypes("shmpool_buff_hdr",185,"len")=24
-	Set gtmtypes("shmpool_buff_hdr",185,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_1k")=185
-	Set gtmtypes("shmpool_buff_hdr",186,"name")="shmpool_buff_hdr.shadow_file_header.jnl_file_name"
-	Set gtmtypes("shmpool_buff_hdr",186,"off")=1376
-	Set gtmtypes("shmpool_buff_hdr",186,"len")=256
-	Set gtmtypes("shmpool_buff_hdr",186,"type")="unsigned-char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_file_name")=186
-	Set gtmtypes("shmpool_buff_hdr",187,"name")="shmpool_buff_hdr.shadow_file_header.reorg_restart_key"
-	Set gtmtypes("shmpool_buff_hdr",187,"off")=1632
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.before_trunc_free_blocks")=184
+	Set gtmtypes("shmpool_buff_hdr",185,"name")="shmpool_buff_hdr.shadow_file_header.filler_trunc"
+	Set gtmtypes("shmpool_buff_hdr",185,"off")=1348
+	Set gtmtypes("shmpool_buff_hdr",185,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",185,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_trunc")=185
+	Set gtmtypes("shmpool_buff_hdr",186,"name")="shmpool_buff_hdr.shadow_file_header.filler_1k"
+	Set gtmtypes("shmpool_buff_hdr",186,"off")=1352
+	Set gtmtypes("shmpool_buff_hdr",186,"len")=24
+	Set gtmtypes("shmpool_buff_hdr",186,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_1k")=186
+	Set gtmtypes("shmpool_buff_hdr",187,"name")="shmpool_buff_hdr.shadow_file_header.jnl_file_name"
+	Set gtmtypes("shmpool_buff_hdr",187,"off")=1376
 	Set gtmtypes("shmpool_buff_hdr",187,"len")=256
 	Set gtmtypes("shmpool_buff_hdr",187,"type")="unsigned-char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reorg_restart_key")=187
-	Set gtmtypes("shmpool_buff_hdr",188,"name")="shmpool_buff_hdr.shadow_file_header.machine_name"
-	Set gtmtypes("shmpool_buff_hdr",188,"off")=1888
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_file_name")=187
+	Set gtmtypes("shmpool_buff_hdr",188,"name")="shmpool_buff_hdr.shadow_file_header.reorg_restart_key"
+	Set gtmtypes("shmpool_buff_hdr",188,"off")=1632
 	Set gtmtypes("shmpool_buff_hdr",188,"len")=256
-	Set gtmtypes("shmpool_buff_hdr",188,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.machine_name")=188
-	Set gtmtypes("shmpool_buff_hdr",189,"name")="shmpool_buff_hdr.shadow_file_header.encryption_hash"
-	Set gtmtypes("shmpool_buff_hdr",189,"off")=2144
-	Set gtmtypes("shmpool_buff_hdr",189,"len")=80
+	Set gtmtypes("shmpool_buff_hdr",188,"type")="unsigned-char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reorg_restart_key")=188
+	Set gtmtypes("shmpool_buff_hdr",189,"name")="shmpool_buff_hdr.shadow_file_header.machine_name"
+	Set gtmtypes("shmpool_buff_hdr",189,"off")=1888
+	Set gtmtypes("shmpool_buff_hdr",189,"len")=256
 	Set gtmtypes("shmpool_buff_hdr",189,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.encryption_hash")=189
-	Set gtmtypes("shmpool_buff_hdr",190,"name")="shmpool_buff_hdr.shadow_file_header.encryption_hash2"
-	Set gtmtypes("shmpool_buff_hdr",190,"off")=2224
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.machine_name")=189
+	Set gtmtypes("shmpool_buff_hdr",190,"name")="shmpool_buff_hdr.shadow_file_header.encryption_hash"
+	Set gtmtypes("shmpool_buff_hdr",190,"off")=2144
 	Set gtmtypes("shmpool_buff_hdr",190,"len")=80
 	Set gtmtypes("shmpool_buff_hdr",190,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.encryption_hash2")=190
-	Set gtmtypes("shmpool_buff_hdr",191,"name")="shmpool_buff_hdr.shadow_file_header.non_null_iv"
-	Set gtmtypes("shmpool_buff_hdr",191,"off")=2304
-	Set gtmtypes("shmpool_buff_hdr",191,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",191,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.non_null_iv")=191
-	Set gtmtypes("shmpool_buff_hdr",192,"name")="shmpool_buff_hdr.shadow_file_header.encryption_hash_cutoff"
-	Set gtmtypes("shmpool_buff_hdr",192,"off")=2308
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.encryption_hash")=190
+	Set gtmtypes("shmpool_buff_hdr",191,"name")="shmpool_buff_hdr.shadow_file_header.encryption_hash2"
+	Set gtmtypes("shmpool_buff_hdr",191,"off")=2224
+	Set gtmtypes("shmpool_buff_hdr",191,"len")=80
+	Set gtmtypes("shmpool_buff_hdr",191,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.encryption_hash2")=191
+	Set gtmtypes("shmpool_buff_hdr",192,"name")="shmpool_buff_hdr.shadow_file_header.non_null_iv"
+	Set gtmtypes("shmpool_buff_hdr",192,"off")=2304
 	Set gtmtypes("shmpool_buff_hdr",192,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",192,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.encryption_hash_cutoff")=192
-	Set gtmtypes("shmpool_buff_hdr",193,"name")="shmpool_buff_hdr.shadow_file_header.encryption_hash2_start_tn"
-	Set gtmtypes("shmpool_buff_hdr",193,"off")=2312
-	Set gtmtypes("shmpool_buff_hdr",193,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",193,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.encryption_hash2_start_tn")=193
-	Set gtmtypes("shmpool_buff_hdr",194,"name")="shmpool_buff_hdr.shadow_file_header.filler_encrypt"
-	Set gtmtypes("shmpool_buff_hdr",194,"off")=2320
-	Set gtmtypes("shmpool_buff_hdr",194,"len")=80
-	Set gtmtypes("shmpool_buff_hdr",194,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_encrypt")=194
-	Set gtmtypes("shmpool_buff_hdr",195,"name")="shmpool_buff_hdr.shadow_file_header.total_buffer_flush_tn"
-	Set gtmtypes("shmpool_buff_hdr",195,"off")=2400
-	Set gtmtypes("shmpool_buff_hdr",195,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",195,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.total_buffer_flush_tn")=195
-	Set gtmtypes("shmpool_buff_hdr",196,"name")="shmpool_buff_hdr.shadow_file_header.bufct_buffer_flush_tn"
-	Set gtmtypes("shmpool_buff_hdr",196,"off")=2408
+	Set gtmtypes("shmpool_buff_hdr",192,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.non_null_iv")=192
+	Set gtmtypes("shmpool_buff_hdr",193,"name")="shmpool_buff_hdr.shadow_file_header.encryption_hash_cutoff"
+	Set gtmtypes("shmpool_buff_hdr",193,"off")=2308
+	Set gtmtypes("shmpool_buff_hdr",193,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",193,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.encryption_hash_cutoff")=193
+	Set gtmtypes("shmpool_buff_hdr",194,"name")="shmpool_buff_hdr.shadow_file_header.encryption_hash2_start_tn"
+	Set gtmtypes("shmpool_buff_hdr",194,"off")=2312
+	Set gtmtypes("shmpool_buff_hdr",194,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",194,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.encryption_hash2_start_tn")=194
+	Set gtmtypes("shmpool_buff_hdr",195,"name")="shmpool_buff_hdr.shadow_file_header.filler_encrypt"
+	Set gtmtypes("shmpool_buff_hdr",195,"off")=2320
+	Set gtmtypes("shmpool_buff_hdr",195,"len")=80
+	Set gtmtypes("shmpool_buff_hdr",195,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_encrypt")=195
+	Set gtmtypes("shmpool_buff_hdr",196,"name")="shmpool_buff_hdr.shadow_file_header.total_buffer_flush_tn"
+	Set gtmtypes("shmpool_buff_hdr",196,"off")=2400
 	Set gtmtypes("shmpool_buff_hdr",196,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",196,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bufct_buffer_flush_tn")=196
-	Set gtmtypes("shmpool_buff_hdr",197,"name")="shmpool_buff_hdr.shadow_file_header.bufct_buffer_flush_loop_tn"
-	Set gtmtypes("shmpool_buff_hdr",197,"off")=2416
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.total_buffer_flush_tn")=196
+	Set gtmtypes("shmpool_buff_hdr",197,"name")="shmpool_buff_hdr.shadow_file_header.bufct_buffer_flush_tn"
+	Set gtmtypes("shmpool_buff_hdr",197,"off")=2408
 	Set gtmtypes("shmpool_buff_hdr",197,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",197,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bufct_buffer_flush_loop_tn")=197
-	Set gtmtypes("shmpool_buff_hdr",198,"name")="shmpool_buff_hdr.shadow_file_header.wrt_calls_tn"
-	Set gtmtypes("shmpool_buff_hdr",198,"off")=2424
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bufct_buffer_flush_tn")=197
+	Set gtmtypes("shmpool_buff_hdr",198,"name")="shmpool_buff_hdr.shadow_file_header.bufct_buffer_flush_loop_tn"
+	Set gtmtypes("shmpool_buff_hdr",198,"off")=2416
 	Set gtmtypes("shmpool_buff_hdr",198,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",198,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_calls_tn")=198
-	Set gtmtypes("shmpool_buff_hdr",199,"name")="shmpool_buff_hdr.shadow_file_header.wrt_count_tn"
-	Set gtmtypes("shmpool_buff_hdr",199,"off")=2432
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bufct_buffer_flush_loop_tn")=198
+	Set gtmtypes("shmpool_buff_hdr",199,"name")="shmpool_buff_hdr.shadow_file_header.wrt_calls_tn"
+	Set gtmtypes("shmpool_buff_hdr",199,"off")=2424
 	Set gtmtypes("shmpool_buff_hdr",199,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",199,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_count_tn")=199
-	Set gtmtypes("shmpool_buff_hdr",200,"name")="shmpool_buff_hdr.shadow_file_header.wrt_blocked_tn"
-	Set gtmtypes("shmpool_buff_hdr",200,"off")=2440
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_calls_tn")=199
+	Set gtmtypes("shmpool_buff_hdr",200,"name")="shmpool_buff_hdr.shadow_file_header.wrt_count_tn"
+	Set gtmtypes("shmpool_buff_hdr",200,"off")=2432
 	Set gtmtypes("shmpool_buff_hdr",200,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",200,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_blocked_tn")=200
-	Set gtmtypes("shmpool_buff_hdr",201,"name")="shmpool_buff_hdr.shadow_file_header.wrt_busy_tn"
-	Set gtmtypes("shmpool_buff_hdr",201,"off")=2448
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_count_tn")=200
+	Set gtmtypes("shmpool_buff_hdr",201,"name")="shmpool_buff_hdr.shadow_file_header.wrt_blocked_tn"
+	Set gtmtypes("shmpool_buff_hdr",201,"off")=2440
 	Set gtmtypes("shmpool_buff_hdr",201,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",201,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_busy_tn")=201
-	Set gtmtypes("shmpool_buff_hdr",202,"name")="shmpool_buff_hdr.shadow_file_header.wrt_noblks_wrtn_tn"
-	Set gtmtypes("shmpool_buff_hdr",202,"off")=2456
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_blocked_tn")=201
+	Set gtmtypes("shmpool_buff_hdr",202,"name")="shmpool_buff_hdr.shadow_file_header.wrt_busy_tn"
+	Set gtmtypes("shmpool_buff_hdr",202,"off")=2448
 	Set gtmtypes("shmpool_buff_hdr",202,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",202,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_noblks_wrtn_tn")=202
-	Set gtmtypes("shmpool_buff_hdr",203,"name")="shmpool_buff_hdr.shadow_file_header.reserved_bgtrcrec1_tn"
-	Set gtmtypes("shmpool_buff_hdr",203,"off")=2464
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_busy_tn")=202
+	Set gtmtypes("shmpool_buff_hdr",203,"name")="shmpool_buff_hdr.shadow_file_header.wrt_noblks_wrtn_tn"
+	Set gtmtypes("shmpool_buff_hdr",203,"off")=2456
 	Set gtmtypes("shmpool_buff_hdr",203,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",203,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reserved_bgtrcrec1_tn")=203
-	Set gtmtypes("shmpool_buff_hdr",204,"name")="shmpool_buff_hdr.shadow_file_header.reserved_bgtrcrec2_tn"
-	Set gtmtypes("shmpool_buff_hdr",204,"off")=2472
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_noblks_wrtn_tn")=203
+	Set gtmtypes("shmpool_buff_hdr",204,"name")="shmpool_buff_hdr.shadow_file_header.reserved_bgtrcrec1_tn"
+	Set gtmtypes("shmpool_buff_hdr",204,"off")=2464
 	Set gtmtypes("shmpool_buff_hdr",204,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",204,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reserved_bgtrcrec2_tn")=204
-	Set gtmtypes("shmpool_buff_hdr",205,"name")="shmpool_buff_hdr.shadow_file_header.reserved_bgtrcrec3_tn"
-	Set gtmtypes("shmpool_buff_hdr",205,"off")=2480
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reserved_bgtrcrec1_tn")=204
+	Set gtmtypes("shmpool_buff_hdr",205,"name")="shmpool_buff_hdr.shadow_file_header.reserved_bgtrcrec2_tn"
+	Set gtmtypes("shmpool_buff_hdr",205,"off")=2472
 	Set gtmtypes("shmpool_buff_hdr",205,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",205,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reserved_bgtrcrec3_tn")=205
-	Set gtmtypes("shmpool_buff_hdr",206,"name")="shmpool_buff_hdr.shadow_file_header.lost_block_recovery_tn"
-	Set gtmtypes("shmpool_buff_hdr",206,"off")=2488
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reserved_bgtrcrec2_tn")=205
+	Set gtmtypes("shmpool_buff_hdr",206,"name")="shmpool_buff_hdr.shadow_file_header.reserved_bgtrcrec3_tn"
+	Set gtmtypes("shmpool_buff_hdr",206,"off")=2480
 	Set gtmtypes("shmpool_buff_hdr",206,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",206,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.lost_block_recovery_tn")=206
-	Set gtmtypes("shmpool_buff_hdr",207,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_onln_rlbk_tn"
-	Set gtmtypes("shmpool_buff_hdr",207,"off")=2496
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reserved_bgtrcrec3_tn")=206
+	Set gtmtypes("shmpool_buff_hdr",207,"name")="shmpool_buff_hdr.shadow_file_header.lost_block_recovery_tn"
+	Set gtmtypes("shmpool_buff_hdr",207,"off")=2488
 	Set gtmtypes("shmpool_buff_hdr",207,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",207,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_onln_rlbk_tn")=207
-	Set gtmtypes("shmpool_buff_hdr",208,"name")="shmpool_buff_hdr.shadow_file_header.stale_tn"
-	Set gtmtypes("shmpool_buff_hdr",208,"off")=2504
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.lost_block_recovery_tn")=207
+	Set gtmtypes("shmpool_buff_hdr",208,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_onln_rlbk_tn"
+	Set gtmtypes("shmpool_buff_hdr",208,"off")=2496
 	Set gtmtypes("shmpool_buff_hdr",208,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",208,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_tn")=208
-	Set gtmtypes("shmpool_buff_hdr",209,"name")="shmpool_buff_hdr.shadow_file_header.starved_tn"
-	Set gtmtypes("shmpool_buff_hdr",209,"off")=2512
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_onln_rlbk_tn")=208
+	Set gtmtypes("shmpool_buff_hdr",209,"name")="shmpool_buff_hdr.shadow_file_header.stale_tn"
+	Set gtmtypes("shmpool_buff_hdr",209,"off")=2504
 	Set gtmtypes("shmpool_buff_hdr",209,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",209,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.starved_tn")=209
-	Set gtmtypes("shmpool_buff_hdr",210,"name")="shmpool_buff_hdr.shadow_file_header.stale_timer_started_tn"
-	Set gtmtypes("shmpool_buff_hdr",210,"off")=2520
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_tn")=209
+	Set gtmtypes("shmpool_buff_hdr",210,"name")="shmpool_buff_hdr.shadow_file_header.starved_tn"
+	Set gtmtypes("shmpool_buff_hdr",210,"off")=2512
 	Set gtmtypes("shmpool_buff_hdr",210,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",210,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_timer_started_tn")=210
-	Set gtmtypes("shmpool_buff_hdr",211,"name")="shmpool_buff_hdr.shadow_file_header.stale_timer_pop_tn"
-	Set gtmtypes("shmpool_buff_hdr",211,"off")=2528
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.starved_tn")=210
+	Set gtmtypes("shmpool_buff_hdr",211,"name")="shmpool_buff_hdr.shadow_file_header.stale_timer_started_tn"
+	Set gtmtypes("shmpool_buff_hdr",211,"off")=2520
 	Set gtmtypes("shmpool_buff_hdr",211,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",211,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_timer_pop_tn")=211
-	Set gtmtypes("shmpool_buff_hdr",212,"name")="shmpool_buff_hdr.shadow_file_header.stale_process_defer_tn"
-	Set gtmtypes("shmpool_buff_hdr",212,"off")=2536
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_timer_started_tn")=211
+	Set gtmtypes("shmpool_buff_hdr",212,"name")="shmpool_buff_hdr.shadow_file_header.stale_timer_pop_tn"
+	Set gtmtypes("shmpool_buff_hdr",212,"off")=2528
 	Set gtmtypes("shmpool_buff_hdr",212,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",212,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_process_defer_tn")=212
-	Set gtmtypes("shmpool_buff_hdr",213,"name")="shmpool_buff_hdr.shadow_file_header.stale_defer_processed_tn"
-	Set gtmtypes("shmpool_buff_hdr",213,"off")=2544
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_timer_pop_tn")=212
+	Set gtmtypes("shmpool_buff_hdr",213,"name")="shmpool_buff_hdr.shadow_file_header.stale_process_defer_tn"
+	Set gtmtypes("shmpool_buff_hdr",213,"off")=2536
 	Set gtmtypes("shmpool_buff_hdr",213,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",213,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_defer_processed_tn")=213
-	Set gtmtypes("shmpool_buff_hdr",214,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flush_tn"
-	Set gtmtypes("shmpool_buff_hdr",214,"off")=2552
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_process_defer_tn")=213
+	Set gtmtypes("shmpool_buff_hdr",214,"name")="shmpool_buff_hdr.shadow_file_header.stale_defer_processed_tn"
+	Set gtmtypes("shmpool_buff_hdr",214,"off")=2544
 	Set gtmtypes("shmpool_buff_hdr",214,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",214,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flush_tn")=214
-	Set gtmtypes("shmpool_buff_hdr",215,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flush_loop_tn"
-	Set gtmtypes("shmpool_buff_hdr",215,"off")=2560
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_defer_processed_tn")=214
+	Set gtmtypes("shmpool_buff_hdr",215,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flush_tn"
+	Set gtmtypes("shmpool_buff_hdr",215,"off")=2552
 	Set gtmtypes("shmpool_buff_hdr",215,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",215,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flush_loop_tn")=215
-	Set gtmtypes("shmpool_buff_hdr",216,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flush_retries_tn"
-	Set gtmtypes("shmpool_buff_hdr",216,"off")=2568
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flush_tn")=215
+	Set gtmtypes("shmpool_buff_hdr",216,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flush_loop_tn"
+	Set gtmtypes("shmpool_buff_hdr",216,"off")=2560
 	Set gtmtypes("shmpool_buff_hdr",216,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",216,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flush_retries_tn")=216
-	Set gtmtypes("shmpool_buff_hdr",217,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flushed_during_lockwait_tn"
-	Set gtmtypes("shmpool_buff_hdr",217,"off")=2576
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flush_loop_tn")=216
+	Set gtmtypes("shmpool_buff_hdr",217,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flush_retries_tn"
+	Set gtmtypes("shmpool_buff_hdr",217,"off")=2568
 	Set gtmtypes("shmpool_buff_hdr",217,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",217,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flushed_during_lockwait_tn")=217
-	Set gtmtypes("shmpool_buff_hdr",218,"name")="shmpool_buff_hdr.shadow_file_header.tp_crit_retries_tn"
-	Set gtmtypes("shmpool_buff_hdr",218,"off")=2584
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flush_retries_tn")=217
+	Set gtmtypes("shmpool_buff_hdr",218,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flushed_during_lockwait_tn"
+	Set gtmtypes("shmpool_buff_hdr",218,"off")=2576
 	Set gtmtypes("shmpool_buff_hdr",218,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",218,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.tp_crit_retries_tn")=218
-	Set gtmtypes("shmpool_buff_hdr",219,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_flush_dirty_tn"
-	Set gtmtypes("shmpool_buff_hdr",219,"off")=2592
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flushed_during_lockwait_tn")=218
+	Set gtmtypes("shmpool_buff_hdr",219,"name")="shmpool_buff_hdr.shadow_file_header.tp_crit_retries_tn"
+	Set gtmtypes("shmpool_buff_hdr",219,"off")=2584
 	Set gtmtypes("shmpool_buff_hdr",219,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",219,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_flush_dirty_tn")=219
-	Set gtmtypes("shmpool_buff_hdr",220,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_rip_wait_tn"
-	Set gtmtypes("shmpool_buff_hdr",220,"off")=2600
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.tp_crit_retries_tn")=219
+	Set gtmtypes("shmpool_buff_hdr",220,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_flush_dirty_tn"
+	Set gtmtypes("shmpool_buff_hdr",220,"off")=2592
 	Set gtmtypes("shmpool_buff_hdr",220,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",220,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_rip_wait_tn")=220
-	Set gtmtypes("shmpool_buff_hdr",221,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_buf_owner_stuck_tn"
-	Set gtmtypes("shmpool_buff_hdr",221,"off")=2608
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_flush_dirty_tn")=220
+	Set gtmtypes("shmpool_buff_hdr",221,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_rip_wait_tn"
+	Set gtmtypes("shmpool_buff_hdr",221,"off")=2600
 	Set gtmtypes("shmpool_buff_hdr",221,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",221,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_buf_owner_stuck_tn")=221
-	Set gtmtypes("shmpool_buff_hdr",222,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_out_of_design_tn"
-	Set gtmtypes("shmpool_buff_hdr",222,"off")=2616
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_rip_wait_tn")=221
+	Set gtmtypes("shmpool_buff_hdr",222,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_buf_owner_stuck_tn"
+	Set gtmtypes("shmpool_buff_hdr",222,"off")=2608
 	Set gtmtypes("shmpool_buff_hdr",222,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",222,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_out_of_design_tn")=222
-	Set gtmtypes("shmpool_buff_hdr",223,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_buf_owner_stuck_tn"
-	Set gtmtypes("shmpool_buff_hdr",223,"off")=2624
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_buf_owner_stuck_tn")=222
+	Set gtmtypes("shmpool_buff_hdr",223,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_out_of_design_tn"
+	Set gtmtypes("shmpool_buff_hdr",223,"off")=2616
 	Set gtmtypes("shmpool_buff_hdr",223,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",223,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_buf_owner_stuck_tn")=223
-	Set gtmtypes("shmpool_buff_hdr",224,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_out_of_design_tn"
-	Set gtmtypes("shmpool_buff_hdr",224,"off")=2632
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_out_of_design_tn")=223
+	Set gtmtypes("shmpool_buff_hdr",224,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_buf_owner_stuck_tn"
+	Set gtmtypes("shmpool_buff_hdr",224,"off")=2624
 	Set gtmtypes("shmpool_buff_hdr",224,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",224,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_out_of_design_tn")=224
-	Set gtmtypes("shmpool_buff_hdr",225,"name")="shmpool_buff_hdr.shadow_file_header.bt_put_flush_dirty_tn"
-	Set gtmtypes("shmpool_buff_hdr",225,"off")=2640
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_buf_owner_stuck_tn")=224
+	Set gtmtypes("shmpool_buff_hdr",225,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_out_of_design_tn"
+	Set gtmtypes("shmpool_buff_hdr",225,"off")=2632
 	Set gtmtypes("shmpool_buff_hdr",225,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",225,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bt_put_flush_dirty_tn")=225
-	Set gtmtypes("shmpool_buff_hdr",226,"name")="shmpool_buff_hdr.shadow_file_header.mlock_wakeups_tn"
-	Set gtmtypes("shmpool_buff_hdr",226,"off")=2648
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_out_of_design_tn")=225
+	Set gtmtypes("shmpool_buff_hdr",226,"name")="shmpool_buff_hdr.shadow_file_header.bt_put_flush_dirty_tn"
+	Set gtmtypes("shmpool_buff_hdr",226,"off")=2640
 	Set gtmtypes("shmpool_buff_hdr",226,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",226,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.mlock_wakeups_tn")=226
-	Set gtmtypes("shmpool_buff_hdr",227,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_recover_invoked_tn"
-	Set gtmtypes("shmpool_buff_hdr",227,"off")=2656
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bt_put_flush_dirty_tn")=226
+	Set gtmtypes("shmpool_buff_hdr",227,"name")="shmpool_buff_hdr.shadow_file_header.mlock_wakeups_tn"
+	Set gtmtypes("shmpool_buff_hdr",227,"off")=2648
 	Set gtmtypes("shmpool_buff_hdr",227,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",227,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_recover_invoked_tn")=227
-	Set gtmtypes("shmpool_buff_hdr",228,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_verify_passed_tn"
-	Set gtmtypes("shmpool_buff_hdr",228,"off")=2664
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.mlock_wakeups_tn")=227
+	Set gtmtypes("shmpool_buff_hdr",228,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_recover_invoked_tn"
+	Set gtmtypes("shmpool_buff_hdr",228,"off")=2656
 	Set gtmtypes("shmpool_buff_hdr",228,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",228,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_verify_passed_tn")=228
-	Set gtmtypes("shmpool_buff_hdr",229,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_tn"
-	Set gtmtypes("shmpool_buff_hdr",229,"off")=2672
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_recover_invoked_tn")=228
+	Set gtmtypes("shmpool_buff_hdr",229,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_verify_passed_tn"
+	Set gtmtypes("shmpool_buff_hdr",229,"off")=2664
 	Set gtmtypes("shmpool_buff_hdr",229,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",229,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_tn")=229
-	Set gtmtypes("shmpool_buff_hdr",230,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_tn"
-	Set gtmtypes("shmpool_buff_hdr",230,"off")=2680
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_verify_passed_tn")=229
+	Set gtmtypes("shmpool_buff_hdr",230,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_tn"
+	Set gtmtypes("shmpool_buff_hdr",230,"off")=2672
 	Set gtmtypes("shmpool_buff_hdr",230,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",230,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_tn")=230
-	Set gtmtypes("shmpool_buff_hdr",231,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_db_csh_getn_loopexceed_tn"
-	Set gtmtypes("shmpool_buff_hdr",231,"off")=2688
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_tn")=230
+	Set gtmtypes("shmpool_buff_hdr",231,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_tn"
+	Set gtmtypes("shmpool_buff_hdr",231,"off")=2680
 	Set gtmtypes("shmpool_buff_hdr",231,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",231,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_db_csh_getn_loopexceed_tn")=231
-	Set gtmtypes("shmpool_buff_hdr",232,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_tn"
-	Set gtmtypes("shmpool_buff_hdr",232,"off")=2696
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_tn")=231
+	Set gtmtypes("shmpool_buff_hdr",232,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_db_csh_getn_loopexceed_tn"
+	Set gtmtypes("shmpool_buff_hdr",232,"off")=2688
 	Set gtmtypes("shmpool_buff_hdr",232,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",232,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_tn")=232
-	Set gtmtypes("shmpool_buff_hdr",233,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_db_csh_get_tn"
-	Set gtmtypes("shmpool_buff_hdr",233,"off")=2704
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_db_csh_getn_loopexceed_tn")=232
+	Set gtmtypes("shmpool_buff_hdr",233,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_tn"
+	Set gtmtypes("shmpool_buff_hdr",233,"off")=2696
 	Set gtmtypes("shmpool_buff_hdr",233,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",233,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_db_csh_get_tn")=233
-	Set gtmtypes("shmpool_buff_hdr",234,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_wcsgetspace_tn"
-	Set gtmtypes("shmpool_buff_hdr",234,"off")=2712
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_tn")=233
+	Set gtmtypes("shmpool_buff_hdr",234,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_db_csh_get_tn"
+	Set gtmtypes("shmpool_buff_hdr",234,"off")=2704
 	Set gtmtypes("shmpool_buff_hdr",234,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",234,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_wcsgetspace_tn")=234
-	Set gtmtypes("shmpool_buff_hdr",235,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_t1_tn"
-	Set gtmtypes("shmpool_buff_hdr",235,"off")=2720
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_db_csh_get_tn")=234
+	Set gtmtypes("shmpool_buff_hdr",235,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_wcsgetspace_tn"
+	Set gtmtypes("shmpool_buff_hdr",235,"off")=2712
 	Set gtmtypes("shmpool_buff_hdr",235,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",235,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_t1_tn")=235
-	Set gtmtypes("shmpool_buff_hdr",236,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_bitmap_tn"
-	Set gtmtypes("shmpool_buff_hdr",236,"off")=2728
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_wcsgetspace_tn")=235
+	Set gtmtypes("shmpool_buff_hdr",236,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_t1_tn"
+	Set gtmtypes("shmpool_buff_hdr",236,"off")=2720
 	Set gtmtypes("shmpool_buff_hdr",236,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",236,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_bitmap_tn")=236
-	Set gtmtypes("shmpool_buff_hdr",237,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_jnl_cwset_tn"
-	Set gtmtypes("shmpool_buff_hdr",237,"off")=2736
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_t1_tn")=236
+	Set gtmtypes("shmpool_buff_hdr",237,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_bitmap_tn"
+	Set gtmtypes("shmpool_buff_hdr",237,"off")=2728
 	Set gtmtypes("shmpool_buff_hdr",237,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",237,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_jnl_cwset_tn")=237
-	Set gtmtypes("shmpool_buff_hdr",238,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_tn"
-	Set gtmtypes("shmpool_buff_hdr",238,"off")=2744
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_bitmap_tn")=237
+	Set gtmtypes("shmpool_buff_hdr",238,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_jnl_cwset_tn"
+	Set gtmtypes("shmpool_buff_hdr",238,"off")=2736
 	Set gtmtypes("shmpool_buff_hdr",238,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",238,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_tn")=238
-	Set gtmtypes("shmpool_buff_hdr",239,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_hist_tn"
-	Set gtmtypes("shmpool_buff_hdr",239,"off")=2752
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_jnl_cwset_tn")=238
+	Set gtmtypes("shmpool_buff_hdr",239,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_tn"
+	Set gtmtypes("shmpool_buff_hdr",239,"off")=2744
 	Set gtmtypes("shmpool_buff_hdr",239,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",239,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_hist_tn")=239
-	Set gtmtypes("shmpool_buff_hdr",240,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_hist1_nullbt_tn"
-	Set gtmtypes("shmpool_buff_hdr",240,"off")=2760
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_tn")=239
+	Set gtmtypes("shmpool_buff_hdr",240,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_hist_tn"
+	Set gtmtypes("shmpool_buff_hdr",240,"off")=2752
 	Set gtmtypes("shmpool_buff_hdr",240,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",240,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_hist1_nullbt_tn")=240
-	Set gtmtypes("shmpool_buff_hdr",241,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_tn"
-	Set gtmtypes("shmpool_buff_hdr",241,"off")=2768
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_hist_tn")=240
+	Set gtmtypes("shmpool_buff_hdr",241,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_hist1_nullbt_tn"
+	Set gtmtypes("shmpool_buff_hdr",241,"off")=2760
 	Set gtmtypes("shmpool_buff_hdr",241,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",241,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_tn")=241
-	Set gtmtypes("shmpool_buff_hdr",242,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_bitmap_nullbt_tn"
-	Set gtmtypes("shmpool_buff_hdr",242,"off")=2776
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_hist1_nullbt_tn")=241
+	Set gtmtypes("shmpool_buff_hdr",242,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_tn"
+	Set gtmtypes("shmpool_buff_hdr",242,"off")=2768
 	Set gtmtypes("shmpool_buff_hdr",242,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",242,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_bitmap_nullbt_tn")=242
-	Set gtmtypes("shmpool_buff_hdr",243,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_tn"
-	Set gtmtypes("shmpool_buff_hdr",243,"off")=2784
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_tn")=242
+	Set gtmtypes("shmpool_buff_hdr",243,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_bitmap_nullbt_tn"
+	Set gtmtypes("shmpool_buff_hdr",243,"off")=2776
 	Set gtmtypes("shmpool_buff_hdr",243,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",243,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_tn")=243
-	Set gtmtypes("shmpool_buff_hdr",244,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_jnl_cwset_tn"
-	Set gtmtypes("shmpool_buff_hdr",244,"off")=2792
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_bitmap_nullbt_tn")=243
+	Set gtmtypes("shmpool_buff_hdr",244,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_tn"
+	Set gtmtypes("shmpool_buff_hdr",244,"off")=2784
 	Set gtmtypes("shmpool_buff_hdr",244,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",244,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_jnl_cwset_tn")=244
-	Set gtmtypes("shmpool_buff_hdr",245,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_jnl_wcsflu_tn"
-	Set gtmtypes("shmpool_buff_hdr",245,"off")=2800
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_tn")=244
+	Set gtmtypes("shmpool_buff_hdr",245,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_jnl_cwset_tn"
+	Set gtmtypes("shmpool_buff_hdr",245,"off")=2792
 	Set gtmtypes("shmpool_buff_hdr",245,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",245,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_jnl_wcsflu_tn")=245
-	Set gtmtypes("shmpool_buff_hdr",246,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_get_too_many_loops_tn"
-	Set gtmtypes("shmpool_buff_hdr",246,"off")=2808
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_jnl_cwset_tn")=245
+	Set gtmtypes("shmpool_buff_hdr",246,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_jnl_wcsflu_tn"
+	Set gtmtypes("shmpool_buff_hdr",246,"off")=2800
 	Set gtmtypes("shmpool_buff_hdr",246,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",246,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_get_too_many_loops_tn")=246
-	Set gtmtypes("shmpool_buff_hdr",247,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tpckh_hist1_nullbt_tn"
-	Set gtmtypes("shmpool_buff_hdr",247,"off")=2816
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_jnl_wcsflu_tn")=246
+	Set gtmtypes("shmpool_buff_hdr",247,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_get_too_many_loops_tn"
+	Set gtmtypes("shmpool_buff_hdr",247,"off")=2808
 	Set gtmtypes("shmpool_buff_hdr",247,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",247,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tpckh_hist1_nullbt_tn")=247
-	Set gtmtypes("shmpool_buff_hdr",248,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_tn"
-	Set gtmtypes("shmpool_buff_hdr",248,"off")=2824
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_get_too_many_loops_tn")=247
+	Set gtmtypes("shmpool_buff_hdr",248,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tpckh_hist1_nullbt_tn"
+	Set gtmtypes("shmpool_buff_hdr",248,"off")=2816
 	Set gtmtypes("shmpool_buff_hdr",248,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",248,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_tn")=248
-	Set gtmtypes("shmpool_buff_hdr",249,"name")="shmpool_buff_hdr.shadow_file_header.jnl_blocked_writer_lost_tn"
-	Set gtmtypes("shmpool_buff_hdr",249,"off")=2832
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tpckh_hist1_nullbt_tn")=248
+	Set gtmtypes("shmpool_buff_hdr",249,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_tn"
+	Set gtmtypes("shmpool_buff_hdr",249,"off")=2824
 	Set gtmtypes("shmpool_buff_hdr",249,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",249,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_blocked_writer_lost_tn")=249
-	Set gtmtypes("shmpool_buff_hdr",250,"name")="shmpool_buff_hdr.shadow_file_header.jnl_blocked_writer_stuck_tn"
-	Set gtmtypes("shmpool_buff_hdr",250,"off")=2840
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_tn")=249
+	Set gtmtypes("shmpool_buff_hdr",250,"name")="shmpool_buff_hdr.shadow_file_header.jnl_blocked_writer_lost_tn"
+	Set gtmtypes("shmpool_buff_hdr",250,"off")=2832
 	Set gtmtypes("shmpool_buff_hdr",250,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",250,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_blocked_writer_stuck_tn")=250
-	Set gtmtypes("shmpool_buff_hdr",251,"name")="shmpool_buff_hdr.shadow_file_header.jnl_blocked_writer_blocked_tn"
-	Set gtmtypes("shmpool_buff_hdr",251,"off")=2848
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_blocked_writer_lost_tn")=250
+	Set gtmtypes("shmpool_buff_hdr",251,"name")="shmpool_buff_hdr.shadow_file_header.jnl_blocked_writer_stuck_tn"
+	Set gtmtypes("shmpool_buff_hdr",251,"off")=2840
 	Set gtmtypes("shmpool_buff_hdr",251,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",251,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_blocked_writer_blocked_tn")=251
-	Set gtmtypes("shmpool_buff_hdr",252,"name")="shmpool_buff_hdr.shadow_file_header.n_jnl_fsyncs_tn"
-	Set gtmtypes("shmpool_buff_hdr",252,"off")=2856
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_blocked_writer_stuck_tn")=251
+	Set gtmtypes("shmpool_buff_hdr",252,"name")="shmpool_buff_hdr.shadow_file_header.jnl_blocked_writer_blocked_tn"
+	Set gtmtypes("shmpool_buff_hdr",252,"off")=2848
 	Set gtmtypes("shmpool_buff_hdr",252,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",252,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_jnl_fsyncs_tn")=252
-	Set gtmtypes("shmpool_buff_hdr",253,"name")="shmpool_buff_hdr.shadow_file_header.n_jnl_fsync_tries_tn"
-	Set gtmtypes("shmpool_buff_hdr",253,"off")=2864
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_blocked_writer_blocked_tn")=252
+	Set gtmtypes("shmpool_buff_hdr",253,"name")="shmpool_buff_hdr.shadow_file_header.n_jnl_fsyncs_tn"
+	Set gtmtypes("shmpool_buff_hdr",253,"off")=2856
 	Set gtmtypes("shmpool_buff_hdr",253,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",253,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_jnl_fsync_tries_tn")=253
-	Set gtmtypes("shmpool_buff_hdr",254,"name")="shmpool_buff_hdr.shadow_file_header.n_jnl_fsync_recovers_tn"
-	Set gtmtypes("shmpool_buff_hdr",254,"off")=2872
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_jnl_fsyncs_tn")=253
+	Set gtmtypes("shmpool_buff_hdr",254,"name")="shmpool_buff_hdr.shadow_file_header.n_jnl_fsync_tries_tn"
+	Set gtmtypes("shmpool_buff_hdr",254,"off")=2864
 	Set gtmtypes("shmpool_buff_hdr",254,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",254,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_jnl_fsync_recovers_tn")=254
-	Set gtmtypes("shmpool_buff_hdr",255,"name")="shmpool_buff_hdr.shadow_file_header.n_db_fsyncs_tn"
-	Set gtmtypes("shmpool_buff_hdr",255,"off")=2880
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_jnl_fsync_tries_tn")=254
+	Set gtmtypes("shmpool_buff_hdr",255,"name")="shmpool_buff_hdr.shadow_file_header.n_jnl_fsync_recovers_tn"
+	Set gtmtypes("shmpool_buff_hdr",255,"off")=2872
 	Set gtmtypes("shmpool_buff_hdr",255,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",255,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_fsyncs_tn")=255
-	Set gtmtypes("shmpool_buff_hdr",256,"name")="shmpool_buff_hdr.shadow_file_header.n_db_fsyncs_in_crit_tn"
-	Set gtmtypes("shmpool_buff_hdr",256,"off")=2888
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_jnl_fsync_recovers_tn")=255
+	Set gtmtypes("shmpool_buff_hdr",256,"name")="shmpool_buff_hdr.shadow_file_header.n_db_fsyncs_tn"
+	Set gtmtypes("shmpool_buff_hdr",256,"off")=2880
 	Set gtmtypes("shmpool_buff_hdr",256,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",256,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_fsyncs_in_crit_tn")=256
-	Set gtmtypes("shmpool_buff_hdr",257,"name")="shmpool_buff_hdr.shadow_file_header.n_dbsync_timers_tn"
-	Set gtmtypes("shmpool_buff_hdr",257,"off")=2896
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_fsyncs_tn")=256
+	Set gtmtypes("shmpool_buff_hdr",257,"name")="shmpool_buff_hdr.shadow_file_header.n_db_fsyncs_in_crit_tn"
+	Set gtmtypes("shmpool_buff_hdr",257,"off")=2888
 	Set gtmtypes("shmpool_buff_hdr",257,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",257,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_dbsync_timers_tn")=257
-	Set gtmtypes("shmpool_buff_hdr",258,"name")="shmpool_buff_hdr.shadow_file_header.n_dbsync_writes_tn"
-	Set gtmtypes("shmpool_buff_hdr",258,"off")=2904
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_fsyncs_in_crit_tn")=257
+	Set gtmtypes("shmpool_buff_hdr",258,"name")="shmpool_buff_hdr.shadow_file_header.n_dbsync_timers_tn"
+	Set gtmtypes("shmpool_buff_hdr",258,"off")=2896
 	Set gtmtypes("shmpool_buff_hdr",258,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",258,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_dbsync_writes_tn")=258
-	Set gtmtypes("shmpool_buff_hdr",259,"name")="shmpool_buff_hdr.shadow_file_header.mutex_queue_full_tn"
-	Set gtmtypes("shmpool_buff_hdr",259,"off")=2912
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_dbsync_timers_tn")=258
+	Set gtmtypes("shmpool_buff_hdr",259,"name")="shmpool_buff_hdr.shadow_file_header.n_dbsync_writes_tn"
+	Set gtmtypes("shmpool_buff_hdr",259,"off")=2904
 	Set gtmtypes("shmpool_buff_hdr",259,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",259,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.mutex_queue_full_tn")=259
-	Set gtmtypes("shmpool_buff_hdr",260,"name")="shmpool_buff_hdr.shadow_file_header.wcb_bt_put_tn"
-	Set gtmtypes("shmpool_buff_hdr",260,"off")=2920
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_dbsync_writes_tn")=259
+	Set gtmtypes("shmpool_buff_hdr",260,"name")="shmpool_buff_hdr.shadow_file_header.mutex_queue_full_tn"
+	Set gtmtypes("shmpool_buff_hdr",260,"off")=2912
 	Set gtmtypes("shmpool_buff_hdr",260,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",260,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_bt_put_tn")=260
-	Set gtmtypes("shmpool_buff_hdr",261,"name")="shmpool_buff_hdr.shadow_file_header.wcb_mutex_salvage_tn"
-	Set gtmtypes("shmpool_buff_hdr",261,"off")=2928
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.mutex_queue_full_tn")=260
+	Set gtmtypes("shmpool_buff_hdr",261,"name")="shmpool_buff_hdr.shadow_file_header.wcb_bt_put_tn"
+	Set gtmtypes("shmpool_buff_hdr",261,"off")=2920
 	Set gtmtypes("shmpool_buff_hdr",261,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",261,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_mutex_salvage_tn")=261
-	Set gtmtypes("shmpool_buff_hdr",262,"name")="shmpool_buff_hdr.shadow_file_header.wcb_tp_grab_crit_tn"
-	Set gtmtypes("shmpool_buff_hdr",262,"off")=2936
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_bt_put_tn")=261
+	Set gtmtypes("shmpool_buff_hdr",262,"name")="shmpool_buff_hdr.shadow_file_header.wcb_mutex_salvage_tn"
+	Set gtmtypes("shmpool_buff_hdr",262,"off")=2928
 	Set gtmtypes("shmpool_buff_hdr",262,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",262,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_tp_grab_crit_tn")=262
-	Set gtmtypes("shmpool_buff_hdr",263,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_nocr_invcr_tn"
-	Set gtmtypes("shmpool_buff_hdr",263,"off")=2944
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_mutex_salvage_tn")=262
+	Set gtmtypes("shmpool_buff_hdr",263,"name")="shmpool_buff_hdr.shadow_file_header.wcb_tp_grab_crit_tn"
+	Set gtmtypes("shmpool_buff_hdr",263,"off")=2936
 	Set gtmtypes("shmpool_buff_hdr",263,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",263,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_nocr_invcr_tn")=263
-	Set gtmtypes("shmpool_buff_hdr",264,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_cr_invcr_tn"
-	Set gtmtypes("shmpool_buff_hdr",264,"off")=2952
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_tp_grab_crit_tn")=263
+	Set gtmtypes("shmpool_buff_hdr",264,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_nocr_invcr_tn"
+	Set gtmtypes("shmpool_buff_hdr",264,"off")=2944
 	Set gtmtypes("shmpool_buff_hdr",264,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",264,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_cr_invcr_tn")=264
-	Set gtmtypes("shmpool_buff_hdr",265,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_rip_wait_tn"
-	Set gtmtypes("shmpool_buff_hdr",265,"off")=2960
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_nocr_invcr_tn")=264
+	Set gtmtypes("shmpool_buff_hdr",265,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_cr_invcr_tn"
+	Set gtmtypes("shmpool_buff_hdr",265,"off")=2952
 	Set gtmtypes("shmpool_buff_hdr",265,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",265,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_rip_wait_tn")=265
-	Set gtmtypes("shmpool_buff_hdr",266,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirtyripwait_tn"
-	Set gtmtypes("shmpool_buff_hdr",266,"off")=2968
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_cr_invcr_tn")=265
+	Set gtmtypes("shmpool_buff_hdr",266,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_rip_wait_tn"
+	Set gtmtypes("shmpool_buff_hdr",266,"off")=2960
 	Set gtmtypes("shmpool_buff_hdr",266,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",266,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirtyripwait_tn")=266
-	Set gtmtypes("shmpool_buff_hdr",267,"name")="shmpool_buff_hdr.shadow_file_header.wcb_gds_rundown_tn"
-	Set gtmtypes("shmpool_buff_hdr",267,"off")=2976
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_rip_wait_tn")=266
+	Set gtmtypes("shmpool_buff_hdr",267,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirtyripwait_tn"
+	Set gtmtypes("shmpool_buff_hdr",267,"off")=2968
 	Set gtmtypes("shmpool_buff_hdr",267,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",267,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_gds_rundown_tn")=267
-	Set gtmtypes("shmpool_buff_hdr",268,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wcs_flu1_tn"
-	Set gtmtypes("shmpool_buff_hdr",268,"off")=2984
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirtyripwait_tn")=267
+	Set gtmtypes("shmpool_buff_hdr",268,"name")="shmpool_buff_hdr.shadow_file_header.wcb_gds_rundown_tn"
+	Set gtmtypes("shmpool_buff_hdr",268,"off")=2976
 	Set gtmtypes("shmpool_buff_hdr",268,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",268,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wcs_flu1_tn")=268
-	Set gtmtypes("shmpool_buff_hdr",269,"name")="shmpool_buff_hdr.shadow_file_header.wcb_mu_back_tn"
-	Set gtmtypes("shmpool_buff_hdr",269,"off")=2992
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_gds_rundown_tn")=268
+	Set gtmtypes("shmpool_buff_hdr",269,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wcs_flu1_tn"
+	Set gtmtypes("shmpool_buff_hdr",269,"off")=2984
 	Set gtmtypes("shmpool_buff_hdr",269,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",269,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_mu_back_tn")=269
-	Set gtmtypes("shmpool_buff_hdr",270,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirty_invcr_tn"
-	Set gtmtypes("shmpool_buff_hdr",270,"off")=3000
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wcs_flu1_tn")=269
+	Set gtmtypes("shmpool_buff_hdr",270,"name")="shmpool_buff_hdr.shadow_file_header.wcb_mu_back_tn"
+	Set gtmtypes("shmpool_buff_hdr",270,"off")=2992
 	Set gtmtypes("shmpool_buff_hdr",270,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",270,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirty_invcr_tn")=270
-	Set gtmtypes("shmpool_buff_hdr",271,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_wtfini_fail_tn"
-	Set gtmtypes("shmpool_buff_hdr",271,"off")=3008
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_mu_back_tn")=270
+	Set gtmtypes("shmpool_buff_hdr",271,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirty_invcr_tn"
+	Set gtmtypes("shmpool_buff_hdr",271,"off")=3000
 	Set gtmtypes("shmpool_buff_hdr",271,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",271,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_wtfini_fail_tn")=271
-	Set gtmtypes("shmpool_buff_hdr",272,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_twin_stuck_tn"
-	Set gtmtypes("shmpool_buff_hdr",272,"off")=3016
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirty_invcr_tn")=271
+	Set gtmtypes("shmpool_buff_hdr",272,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_wtfini_fail_tn"
+	Set gtmtypes("shmpool_buff_hdr",272,"off")=3008
 	Set gtmtypes("shmpool_buff_hdr",272,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",272,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_twin_stuck_tn")=272
-	Set gtmtypes("shmpool_buff_hdr",273,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_wrt_latch_stuck_tn"
-	Set gtmtypes("shmpool_buff_hdr",273,"off")=3024
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_wtfini_fail_tn")=272
+	Set gtmtypes("shmpool_buff_hdr",273,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_twin_stuck_tn"
+	Set gtmtypes("shmpool_buff_hdr",273,"off")=3016
 	Set gtmtypes("shmpool_buff_hdr",273,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",273,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_wrt_latch_stuck_tn")=273
-	Set gtmtypes("shmpool_buff_hdr",274,"name")="shmpool_buff_hdr.shadow_file_header.wcb_secshr_db_clnup_now_crit_tn"
-	Set gtmtypes("shmpool_buff_hdr",274,"off")=3032
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_twin_stuck_tn")=273
+	Set gtmtypes("shmpool_buff_hdr",274,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_wrt_latch_stuck_tn"
+	Set gtmtypes("shmpool_buff_hdr",274,"off")=3024
 	Set gtmtypes("shmpool_buff_hdr",274,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",274,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_secshr_db_clnup_now_crit_tn")=274
-	Set gtmtypes("shmpool_buff_hdr",275,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_bad_bt_index1_tn"
-	Set gtmtypes("shmpool_buff_hdr",275,"off")=3040
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_wrt_latch_stuck_tn")=274
+	Set gtmtypes("shmpool_buff_hdr",275,"name")="shmpool_buff_hdr.shadow_file_header.wcb_secshr_db_clnup_now_crit_tn"
+	Set gtmtypes("shmpool_buff_hdr",275,"off")=3032
 	Set gtmtypes("shmpool_buff_hdr",275,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",275,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_bad_bt_index1_tn")=275
-	Set gtmtypes("shmpool_buff_hdr",276,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_bad_bt_index2_tn"
-	Set gtmtypes("shmpool_buff_hdr",276,"off")=3048
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_secshr_db_clnup_now_crit_tn")=275
+	Set gtmtypes("shmpool_buff_hdr",276,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_bad_bt_index1_tn"
+	Set gtmtypes("shmpool_buff_hdr",276,"off")=3040
 	Set gtmtypes("shmpool_buff_hdr",276,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",276,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_bad_bt_index2_tn")=276
-	Set gtmtypes("shmpool_buff_hdr",277,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_crbtmismatch1_tn"
-	Set gtmtypes("shmpool_buff_hdr",277,"off")=3056
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_bad_bt_index1_tn")=276
+	Set gtmtypes("shmpool_buff_hdr",277,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_bad_bt_index2_tn"
+	Set gtmtypes("shmpool_buff_hdr",277,"off")=3048
 	Set gtmtypes("shmpool_buff_hdr",277,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",277,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_crbtmismatch1_tn")=277
-	Set gtmtypes("shmpool_buff_hdr",278,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_crbtmismatch2_tn"
-	Set gtmtypes("shmpool_buff_hdr",278,"off")=3064
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_bad_bt_index2_tn")=277
+	Set gtmtypes("shmpool_buff_hdr",278,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_crbtmismatch1_tn"
+	Set gtmtypes("shmpool_buff_hdr",278,"off")=3056
 	Set gtmtypes("shmpool_buff_hdr",278,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",278,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_crbtmismatch2_tn")=278
-	Set gtmtypes("shmpool_buff_hdr",279,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_crbtmismatch3_tn"
-	Set gtmtypes("shmpool_buff_hdr",279,"off")=3072
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_crbtmismatch1_tn")=278
+	Set gtmtypes("shmpool_buff_hdr",279,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_crbtmismatch2_tn"
+	Set gtmtypes("shmpool_buff_hdr",279,"off")=3064
 	Set gtmtypes("shmpool_buff_hdr",279,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",279,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_crbtmismatch3_tn")=279
-	Set gtmtypes("shmpool_buff_hdr",280,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_tn"
-	Set gtmtypes("shmpool_buff_hdr",280,"off")=3080
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_crbtmismatch2_tn")=279
+	Set gtmtypes("shmpool_buff_hdr",280,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_crbtmismatch3_tn"
+	Set gtmtypes("shmpool_buff_hdr",280,"off")=3072
 	Set gtmtypes("shmpool_buff_hdr",280,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",280,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_tn")=280
-	Set gtmtypes("shmpool_buff_hdr",281,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_tn"
-	Set gtmtypes("shmpool_buff_hdr",281,"off")=3088
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_crbtmismatch3_tn")=280
+	Set gtmtypes("shmpool_buff_hdr",281,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_tn"
+	Set gtmtypes("shmpool_buff_hdr",281,"off")=3080
 	Set gtmtypes("shmpool_buff_hdr",281,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",281,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_tn")=281
-	Set gtmtypes("shmpool_buff_hdr",282,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_tn"
-	Set gtmtypes("shmpool_buff_hdr",282,"off")=3096
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_tn")=281
+	Set gtmtypes("shmpool_buff_hdr",282,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_tn"
+	Set gtmtypes("shmpool_buff_hdr",282,"off")=3088
 	Set gtmtypes("shmpool_buff_hdr",282,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",282,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_tn")=282
-	Set gtmtypes("shmpool_buff_hdr",283,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_tn"
-	Set gtmtypes("shmpool_buff_hdr",283,"off")=3104
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_tn")=282
+	Set gtmtypes("shmpool_buff_hdr",283,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_tn"
+	Set gtmtypes("shmpool_buff_hdr",283,"off")=3096
 	Set gtmtypes("shmpool_buff_hdr",283,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",283,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_tn")=283
-	Set gtmtypes("shmpool_buff_hdr",284,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_tn"
-	Set gtmtypes("shmpool_buff_hdr",284,"off")=3112
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_tn")=283
+	Set gtmtypes("shmpool_buff_hdr",284,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_tn"
+	Set gtmtypes("shmpool_buff_hdr",284,"off")=3104
 	Set gtmtypes("shmpool_buff_hdr",284,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",284,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_tn")=284
-	Set gtmtypes("shmpool_buff_hdr",285,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_bt_get_tn"
-	Set gtmtypes("shmpool_buff_hdr",285,"off")=3120
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_tn")=284
+	Set gtmtypes("shmpool_buff_hdr",285,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_tn"
+	Set gtmtypes("shmpool_buff_hdr",285,"off")=3112
 	Set gtmtypes("shmpool_buff_hdr",285,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",285,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_bt_get_tn")=285
-	Set gtmtypes("shmpool_buff_hdr",286,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_tn"
-	Set gtmtypes("shmpool_buff_hdr",286,"off")=3128
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_tn")=285
+	Set gtmtypes("shmpool_buff_hdr",286,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_bt_get_tn"
+	Set gtmtypes("shmpool_buff_hdr",286,"off")=3120
 	Set gtmtypes("shmpool_buff_hdr",286,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",286,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_tn")=286
-	Set gtmtypes("shmpool_buff_hdr",287,"name")="shmpool_buff_hdr.shadow_file_header.wcb_bg_update_lckfail1_tn"
-	Set gtmtypes("shmpool_buff_hdr",287,"off")=3136
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_bt_get_tn")=286
+	Set gtmtypes("shmpool_buff_hdr",287,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_tn"
+	Set gtmtypes("shmpool_buff_hdr",287,"off")=3128
 	Set gtmtypes("shmpool_buff_hdr",287,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",287,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_bg_update_lckfail1_tn")=287
-	Set gtmtypes("shmpool_buff_hdr",288,"name")="shmpool_buff_hdr.shadow_file_header.wcb_bg_update_lckfail2_tn"
-	Set gtmtypes("shmpool_buff_hdr",288,"off")=3144
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_tn")=287
+	Set gtmtypes("shmpool_buff_hdr",288,"name")="shmpool_buff_hdr.shadow_file_header.wcb_bg_update_lckfail1_tn"
+	Set gtmtypes("shmpool_buff_hdr",288,"off")=3136
 	Set gtmtypes("shmpool_buff_hdr",288,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",288,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_bg_update_lckfail2_tn")=288
-	Set gtmtypes("shmpool_buff_hdr",289,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail1_tn"
-	Set gtmtypes("shmpool_buff_hdr",289,"off")=3152
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_bg_update_lckfail1_tn")=288
+	Set gtmtypes("shmpool_buff_hdr",289,"name")="shmpool_buff_hdr.shadow_file_header.wcb_bg_update_lckfail2_tn"
+	Set gtmtypes("shmpool_buff_hdr",289,"off")=3144
 	Set gtmtypes("shmpool_buff_hdr",289,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",289,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail1_tn")=289
-	Set gtmtypes("shmpool_buff_hdr",290,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail2_tn"
-	Set gtmtypes("shmpool_buff_hdr",290,"off")=3160
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_bg_update_lckfail2_tn")=289
+	Set gtmtypes("shmpool_buff_hdr",290,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail1_tn"
+	Set gtmtypes("shmpool_buff_hdr",290,"off")=3152
 	Set gtmtypes("shmpool_buff_hdr",290,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",290,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail2_tn")=290
-	Set gtmtypes("shmpool_buff_hdr",291,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail3_tn"
-	Set gtmtypes("shmpool_buff_hdr",291,"off")=3168
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail1_tn")=290
+	Set gtmtypes("shmpool_buff_hdr",291,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail2_tn"
+	Set gtmtypes("shmpool_buff_hdr",291,"off")=3160
 	Set gtmtypes("shmpool_buff_hdr",291,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",291,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail3_tn")=291
-	Set gtmtypes("shmpool_buff_hdr",292,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail4_tn"
-	Set gtmtypes("shmpool_buff_hdr",292,"off")=3176
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail2_tn")=291
+	Set gtmtypes("shmpool_buff_hdr",292,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail3_tn"
+	Set gtmtypes("shmpool_buff_hdr",292,"off")=3168
 	Set gtmtypes("shmpool_buff_hdr",292,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",292,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail4_tn")=292
-	Set gtmtypes("shmpool_buff_hdr",293,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail1_tn"
-	Set gtmtypes("shmpool_buff_hdr",293,"off")=3184
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail3_tn")=292
+	Set gtmtypes("shmpool_buff_hdr",293,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail4_tn"
+	Set gtmtypes("shmpool_buff_hdr",293,"off")=3176
 	Set gtmtypes("shmpool_buff_hdr",293,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",293,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail1_tn")=293
-	Set gtmtypes("shmpool_buff_hdr",294,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail2_tn"
-	Set gtmtypes("shmpool_buff_hdr",294,"off")=3192
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail4_tn")=293
+	Set gtmtypes("shmpool_buff_hdr",294,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail1_tn"
+	Set gtmtypes("shmpool_buff_hdr",294,"off")=3184
 	Set gtmtypes("shmpool_buff_hdr",294,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",294,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail2_tn")=294
-	Set gtmtypes("shmpool_buff_hdr",295,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail3_tn"
-	Set gtmtypes("shmpool_buff_hdr",295,"off")=3200
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail1_tn")=294
+	Set gtmtypes("shmpool_buff_hdr",295,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail2_tn"
+	Set gtmtypes("shmpool_buff_hdr",295,"off")=3192
 	Set gtmtypes("shmpool_buff_hdr",295,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",295,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail3_tn")=295
-	Set gtmtypes("shmpool_buff_hdr",296,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail4_tn"
-	Set gtmtypes("shmpool_buff_hdr",296,"off")=3208
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail2_tn")=295
+	Set gtmtypes("shmpool_buff_hdr",296,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail3_tn"
+	Set gtmtypes("shmpool_buff_hdr",296,"off")=3200
 	Set gtmtypes("shmpool_buff_hdr",296,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",296,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail4_tn")=296
-	Set gtmtypes("shmpool_buff_hdr",297,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirtystuck1_tn"
-	Set gtmtypes("shmpool_buff_hdr",297,"off")=3216
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail3_tn")=296
+	Set gtmtypes("shmpool_buff_hdr",297,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail4_tn"
+	Set gtmtypes("shmpool_buff_hdr",297,"off")=3208
 	Set gtmtypes("shmpool_buff_hdr",297,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",297,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirtystuck1_tn")=297
-	Set gtmtypes("shmpool_buff_hdr",298,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirtystuck2_tn"
-	Set gtmtypes("shmpool_buff_hdr",298,"off")=3224
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail4_tn")=297
+	Set gtmtypes("shmpool_buff_hdr",298,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirtystuck1_tn"
+	Set gtmtypes("shmpool_buff_hdr",298,"off")=3216
 	Set gtmtypes("shmpool_buff_hdr",298,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",298,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirtystuck2_tn")=298
-	Set gtmtypes("shmpool_buff_hdr",299,"name")="shmpool_buff_hdr.shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_tn"
-	Set gtmtypes("shmpool_buff_hdr",299,"off")=3232
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirtystuck1_tn")=298
+	Set gtmtypes("shmpool_buff_hdr",299,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirtystuck2_tn"
+	Set gtmtypes("shmpool_buff_hdr",299,"off")=3224
 	Set gtmtypes("shmpool_buff_hdr",299,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",299,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_tn")=299
-	Set gtmtypes("shmpool_buff_hdr",300,"name")="shmpool_buff_hdr.shadow_file_header.dwngrd_refmts_syncio_tn"
-	Set gtmtypes("shmpool_buff_hdr",300,"off")=3240
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirtystuck2_tn")=299
+	Set gtmtypes("shmpool_buff_hdr",300,"name")="shmpool_buff_hdr.shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_tn"
+	Set gtmtypes("shmpool_buff_hdr",300,"off")=3232
 	Set gtmtypes("shmpool_buff_hdr",300,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",300,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.dwngrd_refmts_syncio_tn")=300
-	Set gtmtypes("shmpool_buff_hdr",301,"name")="shmpool_buff_hdr.shadow_file_header.dwngrd_refmts_asyncio_tn"
-	Set gtmtypes("shmpool_buff_hdr",301,"off")=3248
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_tn")=300
+	Set gtmtypes("shmpool_buff_hdr",301,"name")="shmpool_buff_hdr.shadow_file_header.dwngrd_refmts_syncio_tn"
+	Set gtmtypes("shmpool_buff_hdr",301,"off")=3240
 	Set gtmtypes("shmpool_buff_hdr",301,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",301,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.dwngrd_refmts_asyncio_tn")=301
-	Set gtmtypes("shmpool_buff_hdr",302,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_refmt_harvests_tn"
-	Set gtmtypes("shmpool_buff_hdr",302,"off")=3256
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.dwngrd_refmts_syncio_tn")=301
+	Set gtmtypes("shmpool_buff_hdr",302,"name")="shmpool_buff_hdr.shadow_file_header.dwngrd_refmts_asyncio_tn"
+	Set gtmtypes("shmpool_buff_hdr",302,"off")=3248
 	Set gtmtypes("shmpool_buff_hdr",302,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",302,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_refmt_harvests_tn")=302
-	Set gtmtypes("shmpool_buff_hdr",303,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_recovery_tn"
-	Set gtmtypes("shmpool_buff_hdr",303,"off")=3264
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.dwngrd_refmts_asyncio_tn")=302
+	Set gtmtypes("shmpool_buff_hdr",303,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_refmt_harvests_tn"
+	Set gtmtypes("shmpool_buff_hdr",303,"off")=3256
 	Set gtmtypes("shmpool_buff_hdr",303,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",303,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_recovery_tn")=303
-	Set gtmtypes("shmpool_buff_hdr",304,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_blkd_by_sdc_tn"
-	Set gtmtypes("shmpool_buff_hdr",304,"off")=3272
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_refmt_harvests_tn")=303
+	Set gtmtypes("shmpool_buff_hdr",304,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_recovery_tn"
+	Set gtmtypes("shmpool_buff_hdr",304,"off")=3264
 	Set gtmtypes("shmpool_buff_hdr",304,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",304,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_blkd_by_sdc_tn")=304
-	Set gtmtypes("shmpool_buff_hdr",305,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_alloc_bbflush_tn"
-	Set gtmtypes("shmpool_buff_hdr",305,"off")=3280
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_recovery_tn")=304
+	Set gtmtypes("shmpool_buff_hdr",305,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_blkd_by_sdc_tn"
+	Set gtmtypes("shmpool_buff_hdr",305,"off")=3272
 	Set gtmtypes("shmpool_buff_hdr",305,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",305,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_alloc_bbflush_tn")=305
-	Set gtmtypes("shmpool_buff_hdr",306,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_released_replaced_tn"
-	Set gtmtypes("shmpool_buff_hdr",306,"off")=3288
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_blkd_by_sdc_tn")=305
+	Set gtmtypes("shmpool_buff_hdr",306,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_alloc_bbflush_tn"
+	Set gtmtypes("shmpool_buff_hdr",306,"off")=3280
 	Set gtmtypes("shmpool_buff_hdr",306,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",306,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_released_replaced_tn")=306
-	Set gtmtypes("shmpool_buff_hdr",307,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_released_io_complete_tn"
-	Set gtmtypes("shmpool_buff_hdr",307,"off")=3296
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_alloc_bbflush_tn")=306
+	Set gtmtypes("shmpool_buff_hdr",307,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_released_replaced_tn"
+	Set gtmtypes("shmpool_buff_hdr",307,"off")=3288
 	Set gtmtypes("shmpool_buff_hdr",307,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",307,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_released_io_complete_tn")=307
-	Set gtmtypes("shmpool_buff_hdr",308,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_kept_tn"
-	Set gtmtypes("shmpool_buff_hdr",308,"off")=3304
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_released_replaced_tn")=307
+	Set gtmtypes("shmpool_buff_hdr",308,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_released_io_complete_tn"
+	Set gtmtypes("shmpool_buff_hdr",308,"off")=3296
 	Set gtmtypes("shmpool_buff_hdr",308,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",308,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_kept_tn")=308
-	Set gtmtypes("shmpool_buff_hdr",309,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_ignored_tn"
-	Set gtmtypes("shmpool_buff_hdr",309,"off")=3312
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_released_io_complete_tn")=308
+	Set gtmtypes("shmpool_buff_hdr",309,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_kept_tn"
+	Set gtmtypes("shmpool_buff_hdr",309,"off")=3304
 	Set gtmtypes("shmpool_buff_hdr",309,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",309,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_ignored_tn")=309
-	Set gtmtypes("shmpool_buff_hdr",310,"name")="shmpool_buff_hdr.shadow_file_header.refmt_blk_chk_blk_freed_tn"
-	Set gtmtypes("shmpool_buff_hdr",310,"off")=3320
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_kept_tn")=309
+	Set gtmtypes("shmpool_buff_hdr",310,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_ignored_tn"
+	Set gtmtypes("shmpool_buff_hdr",310,"off")=3312
 	Set gtmtypes("shmpool_buff_hdr",310,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",310,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_blk_chk_blk_freed_tn")=310
-	Set gtmtypes("shmpool_buff_hdr",311,"name")="shmpool_buff_hdr.shadow_file_header.refmt_blk_chk_blk_kept_tn"
-	Set gtmtypes("shmpool_buff_hdr",311,"off")=3328
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_ignored_tn")=310
+	Set gtmtypes("shmpool_buff_hdr",311,"name")="shmpool_buff_hdr.shadow_file_header.refmt_blk_chk_blk_freed_tn"
+	Set gtmtypes("shmpool_buff_hdr",311,"off")=3320
 	Set gtmtypes("shmpool_buff_hdr",311,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",311,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_blk_chk_blk_kept_tn")=311
-	Set gtmtypes("shmpool_buff_hdr",312,"name")="shmpool_buff_hdr.shadow_file_header.active_lvl_trigger_tn"
-	Set gtmtypes("shmpool_buff_hdr",312,"off")=3336
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_blk_chk_blk_freed_tn")=311
+	Set gtmtypes("shmpool_buff_hdr",312,"name")="shmpool_buff_hdr.shadow_file_header.refmt_blk_chk_blk_kept_tn"
+	Set gtmtypes("shmpool_buff_hdr",312,"off")=3328
 	Set gtmtypes("shmpool_buff_hdr",312,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",312,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.active_lvl_trigger_tn")=312
-	Set gtmtypes("shmpool_buff_hdr",313,"name")="shmpool_buff_hdr.shadow_file_header.new_buff_tn"
-	Set gtmtypes("shmpool_buff_hdr",313,"off")=3344
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_blk_chk_blk_kept_tn")=312
+	Set gtmtypes("shmpool_buff_hdr",313,"name")="shmpool_buff_hdr.shadow_file_header.active_lvl_trigger_tn"
+	Set gtmtypes("shmpool_buff_hdr",313,"off")=3336
 	Set gtmtypes("shmpool_buff_hdr",313,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",313,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.new_buff_tn")=313
-	Set gtmtypes("shmpool_buff_hdr",314,"name")="shmpool_buff_hdr.shadow_file_header.phase2_commit_wait_sleep_in_crit_tn"
-	Set gtmtypes("shmpool_buff_hdr",314,"off")=3352
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.active_lvl_trigger_tn")=313
+	Set gtmtypes("shmpool_buff_hdr",314,"name")="shmpool_buff_hdr.shadow_file_header.new_buff_tn"
+	Set gtmtypes("shmpool_buff_hdr",314,"off")=3344
 	Set gtmtypes("shmpool_buff_hdr",314,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",314,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.phase2_commit_wait_sleep_in_crit_tn")=314
-	Set gtmtypes("shmpool_buff_hdr",315,"name")="shmpool_buff_hdr.shadow_file_header.phase2_commit_wait_sleep_no_crit_tn"
-	Set gtmtypes("shmpool_buff_hdr",315,"off")=3360
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.new_buff_tn")=314
+	Set gtmtypes("shmpool_buff_hdr",315,"name")="shmpool_buff_hdr.shadow_file_header.phase2_commit_wait_sleep_in_crit_tn"
+	Set gtmtypes("shmpool_buff_hdr",315,"off")=3352
 	Set gtmtypes("shmpool_buff_hdr",315,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",315,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.phase2_commit_wait_sleep_no_crit_tn")=315
-	Set gtmtypes("shmpool_buff_hdr",316,"name")="shmpool_buff_hdr.shadow_file_header.phase2_commit_wait_pidcnt_tn"
-	Set gtmtypes("shmpool_buff_hdr",316,"off")=3368
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.phase2_commit_wait_sleep_in_crit_tn")=315
+	Set gtmtypes("shmpool_buff_hdr",316,"name")="shmpool_buff_hdr.shadow_file_header.phase2_commit_wait_sleep_no_crit_tn"
+	Set gtmtypes("shmpool_buff_hdr",316,"off")=3360
 	Set gtmtypes("shmpool_buff_hdr",316,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",316,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.phase2_commit_wait_pidcnt_tn")=316
-	Set gtmtypes("shmpool_buff_hdr",317,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_intend_wait_tn"
-	Set gtmtypes("shmpool_buff_hdr",317,"off")=3376
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.phase2_commit_wait_sleep_no_crit_tn")=316
+	Set gtmtypes("shmpool_buff_hdr",317,"name")="shmpool_buff_hdr.shadow_file_header.phase2_commit_wait_pidcnt_tn"
+	Set gtmtypes("shmpool_buff_hdr",317,"off")=3368
 	Set gtmtypes("shmpool_buff_hdr",317,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",317,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_intend_wait_tn")=317
-	Set gtmtypes("shmpool_buff_hdr",318,"name")="shmpool_buff_hdr.shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_tn"
-	Set gtmtypes("shmpool_buff_hdr",318,"off")=3384
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.phase2_commit_wait_pidcnt_tn")=317
+	Set gtmtypes("shmpool_buff_hdr",318,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_intend_wait_tn"
+	Set gtmtypes("shmpool_buff_hdr",318,"off")=3376
 	Set gtmtypes("shmpool_buff_hdr",318,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",318,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_tn")=318
-	Set gtmtypes("shmpool_buff_hdr",319,"name")="shmpool_buff_hdr.shadow_file_header.wcb_phase2_commit_wait_tn"
-	Set gtmtypes("shmpool_buff_hdr",319,"off")=3392
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_intend_wait_tn")=318
+	Set gtmtypes("shmpool_buff_hdr",319,"name")="shmpool_buff_hdr.shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_tn"
+	Set gtmtypes("shmpool_buff_hdr",319,"off")=3384
 	Set gtmtypes("shmpool_buff_hdr",319,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",319,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_phase2_commit_wait_tn")=319
-	Set gtmtypes("shmpool_buff_hdr",320,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_calls_tn"
-	Set gtmtypes("shmpool_buff_hdr",320,"off")=3400
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_tn")=319
+	Set gtmtypes("shmpool_buff_hdr",320,"name")="shmpool_buff_hdr.shadow_file_header.wcb_phase2_commit_wait_tn"
+	Set gtmtypes("shmpool_buff_hdr",320,"off")=3392
 	Set gtmtypes("shmpool_buff_hdr",320,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",320,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_calls_tn")=320
-	Set gtmtypes("shmpool_buff_hdr",321,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_rip_tn"
-	Set gtmtypes("shmpool_buff_hdr",321,"off")=3408
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_phase2_commit_wait_tn")=320
+	Set gtmtypes("shmpool_buff_hdr",321,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_calls_tn"
+	Set gtmtypes("shmpool_buff_hdr",321,"off")=3400
 	Set gtmtypes("shmpool_buff_hdr",321,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",321,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_rip_tn")=321
-	Set gtmtypes("shmpool_buff_hdr",322,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_in_tend_tn"
-	Set gtmtypes("shmpool_buff_hdr",322,"off")=3416
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_calls_tn")=321
+	Set gtmtypes("shmpool_buff_hdr",322,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_rip_tn"
+	Set gtmtypes("shmpool_buff_hdr",322,"off")=3408
 	Set gtmtypes("shmpool_buff_hdr",322,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",322,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_in_tend_tn")=322
-	Set gtmtypes("shmpool_buff_hdr",323,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_search_blk_tn"
-	Set gtmtypes("shmpool_buff_hdr",323,"off")=3424
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_rip_tn")=322
+	Set gtmtypes("shmpool_buff_hdr",323,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_in_tend_tn"
+	Set gtmtypes("shmpool_buff_hdr",323,"off")=3416
 	Set gtmtypes("shmpool_buff_hdr",323,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",323,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_search_blk_tn")=323
-	Set gtmtypes("shmpool_buff_hdr",324,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_new_rec_tn"
-	Set gtmtypes("shmpool_buff_hdr",324,"off")=3432
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_in_tend_tn")=323
+	Set gtmtypes("shmpool_buff_hdr",324,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_search_blk_tn"
+	Set gtmtypes("shmpool_buff_hdr",324,"off")=3424
 	Set gtmtypes("shmpool_buff_hdr",324,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",324,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_new_rec_tn")=324
-	Set gtmtypes("shmpool_buff_hdr",325,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_rec_size_tn"
-	Set gtmtypes("shmpool_buff_hdr",325,"off")=3440
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_search_blk_tn")=324
+	Set gtmtypes("shmpool_buff_hdr",325,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_new_rec_tn"
+	Set gtmtypes("shmpool_buff_hdr",325,"off")=3432
 	Set gtmtypes("shmpool_buff_hdr",325,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",325,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_rec_size_tn")=325
-	Set gtmtypes("shmpool_buff_hdr",326,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_rec_cmpc_tn"
-	Set gtmtypes("shmpool_buff_hdr",326,"off")=3448
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_new_rec_tn")=325
+	Set gtmtypes("shmpool_buff_hdr",326,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_rec_size_tn"
+	Set gtmtypes("shmpool_buff_hdr",326,"off")=3440
 	Set gtmtypes("shmpool_buff_hdr",326,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",326,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_rec_cmpc_tn")=326
-	Set gtmtypes("shmpool_buff_hdr",327,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_blk_fini_tn"
-	Set gtmtypes("shmpool_buff_hdr",327,"off")=3456
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_rec_size_tn")=326
+	Set gtmtypes("shmpool_buff_hdr",327,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_rec_cmpc_tn"
+	Set gtmtypes("shmpool_buff_hdr",327,"off")=3448
 	Set gtmtypes("shmpool_buff_hdr",327,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",327,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_blk_fini_tn")=327
-	Set gtmtypes("shmpool_buff_hdr",328,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_blk_split_tn"
-	Set gtmtypes("shmpool_buff_hdr",328,"off")=3464
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_rec_cmpc_tn")=327
+	Set gtmtypes("shmpool_buff_hdr",328,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_blk_fini_tn"
+	Set gtmtypes("shmpool_buff_hdr",328,"off")=3456
 	Set gtmtypes("shmpool_buff_hdr",328,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",328,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_blk_split_tn")=328
-	Set gtmtypes("shmpool_buff_hdr",329,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_ripsleep_cnt_tn"
-	Set gtmtypes("shmpool_buff_hdr",329,"off")=3472
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_blk_fini_tn")=328
+	Set gtmtypes("shmpool_buff_hdr",329,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_blk_split_tn"
+	Set gtmtypes("shmpool_buff_hdr",329,"off")=3464
 	Set gtmtypes("shmpool_buff_hdr",329,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",329,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_ripsleep_cnt_tn")=329
-	Set gtmtypes("shmpool_buff_hdr",330,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_ripsleep_nblks_tn"
-	Set gtmtypes("shmpool_buff_hdr",330,"off")=3480
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_blk_split_tn")=329
+	Set gtmtypes("shmpool_buff_hdr",330,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_ripsleep_cnt_tn"
+	Set gtmtypes("shmpool_buff_hdr",330,"off")=3472
 	Set gtmtypes("shmpool_buff_hdr",330,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",330,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_ripsleep_nblks_tn")=330
-	Set gtmtypes("shmpool_buff_hdr",331,"name")="shmpool_buff_hdr.shadow_file_header.bg_trc_rec_tn_filler"
-	Set gtmtypes("shmpool_buff_hdr",331,"off")=3488
-	Set gtmtypes("shmpool_buff_hdr",331,"len")=112
-	Set gtmtypes("shmpool_buff_hdr",331,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bg_trc_rec_tn_filler")=331
-	Set gtmtypes("shmpool_buff_hdr",332,"name")="shmpool_buff_hdr.shadow_file_header.total_buffer_flush_cntr"
-	Set gtmtypes("shmpool_buff_hdr",332,"off")=3600
-	Set gtmtypes("shmpool_buff_hdr",332,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",332,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.total_buffer_flush_cntr")=332
-	Set gtmtypes("shmpool_buff_hdr",333,"name")="shmpool_buff_hdr.shadow_file_header.bufct_buffer_flush_cntr"
-	Set gtmtypes("shmpool_buff_hdr",333,"off")=3604
-	Set gtmtypes("shmpool_buff_hdr",333,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",333,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bufct_buffer_flush_cntr")=333
-	Set gtmtypes("shmpool_buff_hdr",334,"name")="shmpool_buff_hdr.shadow_file_header.bufct_buffer_flush_loop_cntr"
-	Set gtmtypes("shmpool_buff_hdr",334,"off")=3608
-	Set gtmtypes("shmpool_buff_hdr",334,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",334,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bufct_buffer_flush_loop_cntr")=334
-	Set gtmtypes("shmpool_buff_hdr",335,"name")="shmpool_buff_hdr.shadow_file_header.wrt_calls_cntr"
-	Set gtmtypes("shmpool_buff_hdr",335,"off")=3612
-	Set gtmtypes("shmpool_buff_hdr",335,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",335,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_calls_cntr")=335
-	Set gtmtypes("shmpool_buff_hdr",336,"name")="shmpool_buff_hdr.shadow_file_header.wrt_count_cntr"
-	Set gtmtypes("shmpool_buff_hdr",336,"off")=3616
-	Set gtmtypes("shmpool_buff_hdr",336,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",336,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_count_cntr")=336
-	Set gtmtypes("shmpool_buff_hdr",337,"name")="shmpool_buff_hdr.shadow_file_header.wrt_blocked_cntr"
-	Set gtmtypes("shmpool_buff_hdr",337,"off")=3620
-	Set gtmtypes("shmpool_buff_hdr",337,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",337,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_blocked_cntr")=337
-	Set gtmtypes("shmpool_buff_hdr",338,"name")="shmpool_buff_hdr.shadow_file_header.wrt_busy_cntr"
-	Set gtmtypes("shmpool_buff_hdr",338,"off")=3624
-	Set gtmtypes("shmpool_buff_hdr",338,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",338,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_busy_cntr")=338
-	Set gtmtypes("shmpool_buff_hdr",339,"name")="shmpool_buff_hdr.shadow_file_header.wrt_noblks_wrtn_cntr"
-	Set gtmtypes("shmpool_buff_hdr",339,"off")=3628
-	Set gtmtypes("shmpool_buff_hdr",339,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",339,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_noblks_wrtn_cntr")=339
-	Set gtmtypes("shmpool_buff_hdr",340,"name")="shmpool_buff_hdr.shadow_file_header.reserved_bgtrcrec1_cntr"
-	Set gtmtypes("shmpool_buff_hdr",340,"off")=3632
-	Set gtmtypes("shmpool_buff_hdr",340,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",340,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reserved_bgtrcrec1_cntr")=340
-	Set gtmtypes("shmpool_buff_hdr",341,"name")="shmpool_buff_hdr.shadow_file_header.reserved_bgtrcrec2_cntr"
-	Set gtmtypes("shmpool_buff_hdr",341,"off")=3636
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_ripsleep_cnt_tn")=330
+	Set gtmtypes("shmpool_buff_hdr",331,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_ripsleep_nblks_tn"
+	Set gtmtypes("shmpool_buff_hdr",331,"off")=3480
+	Set gtmtypes("shmpool_buff_hdr",331,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",331,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_ripsleep_nblks_tn")=331
+	Set gtmtypes("shmpool_buff_hdr",332,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wtfini_invoked_tn"
+	Set gtmtypes("shmpool_buff_hdr",332,"off")=3488
+	Set gtmtypes("shmpool_buff_hdr",332,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",332,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wtfini_invoked_tn")=332
+	Set gtmtypes("shmpool_buff_hdr",333,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wterror_invoked_tn"
+	Set gtmtypes("shmpool_buff_hdr",333,"off")=3496
+	Set gtmtypes("shmpool_buff_hdr",333,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",333,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wterror_invoked_tn")=333
+	Set gtmtypes("shmpool_buff_hdr",334,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wt_restart_invoked_tn"
+	Set gtmtypes("shmpool_buff_hdr",334,"off")=3504
+	Set gtmtypes("shmpool_buff_hdr",334,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",334,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wt_restart_invoked_tn")=334
+	Set gtmtypes("shmpool_buff_hdr",335,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wt_restart_eagain_tn"
+	Set gtmtypes("shmpool_buff_hdr",335,"off")=3512
+	Set gtmtypes("shmpool_buff_hdr",335,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",335,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wt_restart_eagain_tn")=335
+	Set gtmtypes("shmpool_buff_hdr",336,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wt_restart_reinsert_tn"
+	Set gtmtypes("shmpool_buff_hdr",336,"off")=3520
+	Set gtmtypes("shmpool_buff_hdr",336,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",336,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wt_restart_reinsert_tn")=336
+	Set gtmtypes("shmpool_buff_hdr",337,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wtstart_eagain_tn"
+	Set gtmtypes("shmpool_buff_hdr",337,"off")=3528
+	Set gtmtypes("shmpool_buff_hdr",337,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",337,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wtstart_eagain_tn")=337
+	Set gtmtypes("shmpool_buff_hdr",338,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wtstart_eagain_incrit_tn"
+	Set gtmtypes("shmpool_buff_hdr",338,"off")=3536
+	Set gtmtypes("shmpool_buff_hdr",338,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",338,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wtstart_eagain_incrit_tn")=338
+	Set gtmtypes("shmpool_buff_hdr",339,"name")="shmpool_buff_hdr.shadow_file_header.async_restart_eagain_tn"
+	Set gtmtypes("shmpool_buff_hdr",339,"off")=3544
+	Set gtmtypes("shmpool_buff_hdr",339,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",339,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.async_restart_eagain_tn")=339
+	Set gtmtypes("shmpool_buff_hdr",340,"name")="shmpool_buff_hdr.shadow_file_header.bg_trc_rec_tn_filler"
+	Set gtmtypes("shmpool_buff_hdr",340,"off")=3552
+	Set gtmtypes("shmpool_buff_hdr",340,"len")=48
+	Set gtmtypes("shmpool_buff_hdr",340,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bg_trc_rec_tn_filler")=340
+	Set gtmtypes("shmpool_buff_hdr",341,"name")="shmpool_buff_hdr.shadow_file_header.total_buffer_flush_cntr"
+	Set gtmtypes("shmpool_buff_hdr",341,"off")=3600
 	Set gtmtypes("shmpool_buff_hdr",341,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",341,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reserved_bgtrcrec2_cntr")=341
-	Set gtmtypes("shmpool_buff_hdr",342,"name")="shmpool_buff_hdr.shadow_file_header.reserved_bgtrcrec3_cntr"
-	Set gtmtypes("shmpool_buff_hdr",342,"off")=3640
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.total_buffer_flush_cntr")=341
+	Set gtmtypes("shmpool_buff_hdr",342,"name")="shmpool_buff_hdr.shadow_file_header.bufct_buffer_flush_cntr"
+	Set gtmtypes("shmpool_buff_hdr",342,"off")=3604
 	Set gtmtypes("shmpool_buff_hdr",342,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",342,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reserved_bgtrcrec3_cntr")=342
-	Set gtmtypes("shmpool_buff_hdr",343,"name")="shmpool_buff_hdr.shadow_file_header.lost_block_recovery_cntr"
-	Set gtmtypes("shmpool_buff_hdr",343,"off")=3644
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bufct_buffer_flush_cntr")=342
+	Set gtmtypes("shmpool_buff_hdr",343,"name")="shmpool_buff_hdr.shadow_file_header.bufct_buffer_flush_loop_cntr"
+	Set gtmtypes("shmpool_buff_hdr",343,"off")=3608
 	Set gtmtypes("shmpool_buff_hdr",343,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",343,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.lost_block_recovery_cntr")=343
-	Set gtmtypes("shmpool_buff_hdr",344,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_onln_rlbk_cntr"
-	Set gtmtypes("shmpool_buff_hdr",344,"off")=3648
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bufct_buffer_flush_loop_cntr")=343
+	Set gtmtypes("shmpool_buff_hdr",344,"name")="shmpool_buff_hdr.shadow_file_header.wrt_calls_cntr"
+	Set gtmtypes("shmpool_buff_hdr",344,"off")=3612
 	Set gtmtypes("shmpool_buff_hdr",344,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",344,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_onln_rlbk_cntr")=344
-	Set gtmtypes("shmpool_buff_hdr",345,"name")="shmpool_buff_hdr.shadow_file_header.stale_cntr"
-	Set gtmtypes("shmpool_buff_hdr",345,"off")=3652
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_calls_cntr")=344
+	Set gtmtypes("shmpool_buff_hdr",345,"name")="shmpool_buff_hdr.shadow_file_header.wrt_count_cntr"
+	Set gtmtypes("shmpool_buff_hdr",345,"off")=3616
 	Set gtmtypes("shmpool_buff_hdr",345,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",345,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_cntr")=345
-	Set gtmtypes("shmpool_buff_hdr",346,"name")="shmpool_buff_hdr.shadow_file_header.starved_cntr"
-	Set gtmtypes("shmpool_buff_hdr",346,"off")=3656
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_count_cntr")=345
+	Set gtmtypes("shmpool_buff_hdr",346,"name")="shmpool_buff_hdr.shadow_file_header.wrt_blocked_cntr"
+	Set gtmtypes("shmpool_buff_hdr",346,"off")=3620
 	Set gtmtypes("shmpool_buff_hdr",346,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",346,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.starved_cntr")=346
-	Set gtmtypes("shmpool_buff_hdr",347,"name")="shmpool_buff_hdr.shadow_file_header.stale_timer_started_cntr"
-	Set gtmtypes("shmpool_buff_hdr",347,"off")=3660
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_blocked_cntr")=346
+	Set gtmtypes("shmpool_buff_hdr",347,"name")="shmpool_buff_hdr.shadow_file_header.wrt_busy_cntr"
+	Set gtmtypes("shmpool_buff_hdr",347,"off")=3624
 	Set gtmtypes("shmpool_buff_hdr",347,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",347,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_timer_started_cntr")=347
-	Set gtmtypes("shmpool_buff_hdr",348,"name")="shmpool_buff_hdr.shadow_file_header.stale_timer_pop_cntr"
-	Set gtmtypes("shmpool_buff_hdr",348,"off")=3664
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_busy_cntr")=347
+	Set gtmtypes("shmpool_buff_hdr",348,"name")="shmpool_buff_hdr.shadow_file_header.wrt_noblks_wrtn_cntr"
+	Set gtmtypes("shmpool_buff_hdr",348,"off")=3628
 	Set gtmtypes("shmpool_buff_hdr",348,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",348,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_timer_pop_cntr")=348
-	Set gtmtypes("shmpool_buff_hdr",349,"name")="shmpool_buff_hdr.shadow_file_header.stale_process_defer_cntr"
-	Set gtmtypes("shmpool_buff_hdr",349,"off")=3668
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_noblks_wrtn_cntr")=348
+	Set gtmtypes("shmpool_buff_hdr",349,"name")="shmpool_buff_hdr.shadow_file_header.reserved_bgtrcrec1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",349,"off")=3632
 	Set gtmtypes("shmpool_buff_hdr",349,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",349,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_process_defer_cntr")=349
-	Set gtmtypes("shmpool_buff_hdr",350,"name")="shmpool_buff_hdr.shadow_file_header.stale_defer_processed_cntr"
-	Set gtmtypes("shmpool_buff_hdr",350,"off")=3672
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reserved_bgtrcrec1_cntr")=349
+	Set gtmtypes("shmpool_buff_hdr",350,"name")="shmpool_buff_hdr.shadow_file_header.reserved_bgtrcrec2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",350,"off")=3636
 	Set gtmtypes("shmpool_buff_hdr",350,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",350,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_defer_processed_cntr")=350
-	Set gtmtypes("shmpool_buff_hdr",351,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flush_cntr"
-	Set gtmtypes("shmpool_buff_hdr",351,"off")=3676
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reserved_bgtrcrec2_cntr")=350
+	Set gtmtypes("shmpool_buff_hdr",351,"name")="shmpool_buff_hdr.shadow_file_header.reserved_bgtrcrec3_cntr"
+	Set gtmtypes("shmpool_buff_hdr",351,"off")=3640
 	Set gtmtypes("shmpool_buff_hdr",351,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",351,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flush_cntr")=351
-	Set gtmtypes("shmpool_buff_hdr",352,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flush_loop_cntr"
-	Set gtmtypes("shmpool_buff_hdr",352,"off")=3680
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reserved_bgtrcrec3_cntr")=351
+	Set gtmtypes("shmpool_buff_hdr",352,"name")="shmpool_buff_hdr.shadow_file_header.lost_block_recovery_cntr"
+	Set gtmtypes("shmpool_buff_hdr",352,"off")=3644
 	Set gtmtypes("shmpool_buff_hdr",352,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",352,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flush_loop_cntr")=352
-	Set gtmtypes("shmpool_buff_hdr",353,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flush_retries_cntr"
-	Set gtmtypes("shmpool_buff_hdr",353,"off")=3684
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.lost_block_recovery_cntr")=352
+	Set gtmtypes("shmpool_buff_hdr",353,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_onln_rlbk_cntr"
+	Set gtmtypes("shmpool_buff_hdr",353,"off")=3648
 	Set gtmtypes("shmpool_buff_hdr",353,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",353,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flush_retries_cntr")=353
-	Set gtmtypes("shmpool_buff_hdr",354,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flushed_during_lockwait_cntr"
-	Set gtmtypes("shmpool_buff_hdr",354,"off")=3688
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_onln_rlbk_cntr")=353
+	Set gtmtypes("shmpool_buff_hdr",354,"name")="shmpool_buff_hdr.shadow_file_header.stale_cntr"
+	Set gtmtypes("shmpool_buff_hdr",354,"off")=3652
 	Set gtmtypes("shmpool_buff_hdr",354,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",354,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flushed_during_lockwait_cntr")=354
-	Set gtmtypes("shmpool_buff_hdr",355,"name")="shmpool_buff_hdr.shadow_file_header.tp_crit_retries_cntr"
-	Set gtmtypes("shmpool_buff_hdr",355,"off")=3692
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_cntr")=354
+	Set gtmtypes("shmpool_buff_hdr",355,"name")="shmpool_buff_hdr.shadow_file_header.starved_cntr"
+	Set gtmtypes("shmpool_buff_hdr",355,"off")=3656
 	Set gtmtypes("shmpool_buff_hdr",355,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",355,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.tp_crit_retries_cntr")=355
-	Set gtmtypes("shmpool_buff_hdr",356,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_flush_dirty_cntr"
-	Set gtmtypes("shmpool_buff_hdr",356,"off")=3696
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.starved_cntr")=355
+	Set gtmtypes("shmpool_buff_hdr",356,"name")="shmpool_buff_hdr.shadow_file_header.stale_timer_started_cntr"
+	Set gtmtypes("shmpool_buff_hdr",356,"off")=3660
 	Set gtmtypes("shmpool_buff_hdr",356,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",356,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_flush_dirty_cntr")=356
-	Set gtmtypes("shmpool_buff_hdr",357,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_rip_wait_cntr"
-	Set gtmtypes("shmpool_buff_hdr",357,"off")=3700
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_timer_started_cntr")=356
+	Set gtmtypes("shmpool_buff_hdr",357,"name")="shmpool_buff_hdr.shadow_file_header.stale_timer_pop_cntr"
+	Set gtmtypes("shmpool_buff_hdr",357,"off")=3664
 	Set gtmtypes("shmpool_buff_hdr",357,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",357,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_rip_wait_cntr")=357
-	Set gtmtypes("shmpool_buff_hdr",358,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_buf_owner_stuck_cntr"
-	Set gtmtypes("shmpool_buff_hdr",358,"off")=3704
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_timer_pop_cntr")=357
+	Set gtmtypes("shmpool_buff_hdr",358,"name")="shmpool_buff_hdr.shadow_file_header.stale_process_defer_cntr"
+	Set gtmtypes("shmpool_buff_hdr",358,"off")=3668
 	Set gtmtypes("shmpool_buff_hdr",358,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",358,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_buf_owner_stuck_cntr")=358
-	Set gtmtypes("shmpool_buff_hdr",359,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_out_of_design_cntr"
-	Set gtmtypes("shmpool_buff_hdr",359,"off")=3708
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_process_defer_cntr")=358
+	Set gtmtypes("shmpool_buff_hdr",359,"name")="shmpool_buff_hdr.shadow_file_header.stale_defer_processed_cntr"
+	Set gtmtypes("shmpool_buff_hdr",359,"off")=3672
 	Set gtmtypes("shmpool_buff_hdr",359,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",359,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_out_of_design_cntr")=359
-	Set gtmtypes("shmpool_buff_hdr",360,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_buf_owner_stuck_cntr"
-	Set gtmtypes("shmpool_buff_hdr",360,"off")=3712
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_defer_processed_cntr")=359
+	Set gtmtypes("shmpool_buff_hdr",360,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flush_cntr"
+	Set gtmtypes("shmpool_buff_hdr",360,"off")=3676
 	Set gtmtypes("shmpool_buff_hdr",360,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",360,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_buf_owner_stuck_cntr")=360
-	Set gtmtypes("shmpool_buff_hdr",361,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_out_of_design_cntr"
-	Set gtmtypes("shmpool_buff_hdr",361,"off")=3716
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flush_cntr")=360
+	Set gtmtypes("shmpool_buff_hdr",361,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flush_loop_cntr"
+	Set gtmtypes("shmpool_buff_hdr",361,"off")=3680
 	Set gtmtypes("shmpool_buff_hdr",361,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",361,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_out_of_design_cntr")=361
-	Set gtmtypes("shmpool_buff_hdr",362,"name")="shmpool_buff_hdr.shadow_file_header.bt_put_flush_dirty_cntr"
-	Set gtmtypes("shmpool_buff_hdr",362,"off")=3720
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flush_loop_cntr")=361
+	Set gtmtypes("shmpool_buff_hdr",362,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flush_retries_cntr"
+	Set gtmtypes("shmpool_buff_hdr",362,"off")=3684
 	Set gtmtypes("shmpool_buff_hdr",362,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",362,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bt_put_flush_dirty_cntr")=362
-	Set gtmtypes("shmpool_buff_hdr",363,"name")="shmpool_buff_hdr.shadow_file_header.mlock_wakeups_cntr"
-	Set gtmtypes("shmpool_buff_hdr",363,"off")=3724
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flush_retries_cntr")=362
+	Set gtmtypes("shmpool_buff_hdr",363,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flushed_during_lockwait_cntr"
+	Set gtmtypes("shmpool_buff_hdr",363,"off")=3688
 	Set gtmtypes("shmpool_buff_hdr",363,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",363,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.mlock_wakeups_cntr")=363
-	Set gtmtypes("shmpool_buff_hdr",364,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_recover_invoked_cntr"
-	Set gtmtypes("shmpool_buff_hdr",364,"off")=3728
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flushed_during_lockwait_cntr")=363
+	Set gtmtypes("shmpool_buff_hdr",364,"name")="shmpool_buff_hdr.shadow_file_header.tp_crit_retries_cntr"
+	Set gtmtypes("shmpool_buff_hdr",364,"off")=3692
 	Set gtmtypes("shmpool_buff_hdr",364,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",364,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_recover_invoked_cntr")=364
-	Set gtmtypes("shmpool_buff_hdr",365,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_verify_passed_cntr"
-	Set gtmtypes("shmpool_buff_hdr",365,"off")=3732
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.tp_crit_retries_cntr")=364
+	Set gtmtypes("shmpool_buff_hdr",365,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_flush_dirty_cntr"
+	Set gtmtypes("shmpool_buff_hdr",365,"off")=3696
 	Set gtmtypes("shmpool_buff_hdr",365,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",365,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_verify_passed_cntr")=365
-	Set gtmtypes("shmpool_buff_hdr",366,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr"
-	Set gtmtypes("shmpool_buff_hdr",366,"off")=3736
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_flush_dirty_cntr")=365
+	Set gtmtypes("shmpool_buff_hdr",366,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_rip_wait_cntr"
+	Set gtmtypes("shmpool_buff_hdr",366,"off")=3700
 	Set gtmtypes("shmpool_buff_hdr",366,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",366,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr")=366
-	Set gtmtypes("shmpool_buff_hdr",367,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_cntr"
-	Set gtmtypes("shmpool_buff_hdr",367,"off")=3740
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_rip_wait_cntr")=366
+	Set gtmtypes("shmpool_buff_hdr",367,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_buf_owner_stuck_cntr"
+	Set gtmtypes("shmpool_buff_hdr",367,"off")=3704
 	Set gtmtypes("shmpool_buff_hdr",367,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",367,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_cntr")=367
-	Set gtmtypes("shmpool_buff_hdr",368,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_db_csh_getn_loopexceed_cntr"
-	Set gtmtypes("shmpool_buff_hdr",368,"off")=3744
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_buf_owner_stuck_cntr")=367
+	Set gtmtypes("shmpool_buff_hdr",368,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_out_of_design_cntr"
+	Set gtmtypes("shmpool_buff_hdr",368,"off")=3708
 	Set gtmtypes("shmpool_buff_hdr",368,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",368,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_db_csh_getn_loopexceed_cntr")=368
-	Set gtmtypes("shmpool_buff_hdr",369,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_cntr"
-	Set gtmtypes("shmpool_buff_hdr",369,"off")=3748
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_out_of_design_cntr")=368
+	Set gtmtypes("shmpool_buff_hdr",369,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_buf_owner_stuck_cntr"
+	Set gtmtypes("shmpool_buff_hdr",369,"off")=3712
 	Set gtmtypes("shmpool_buff_hdr",369,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",369,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_cntr")=369
-	Set gtmtypes("shmpool_buff_hdr",370,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_db_csh_get_cntr"
-	Set gtmtypes("shmpool_buff_hdr",370,"off")=3752
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_buf_owner_stuck_cntr")=369
+	Set gtmtypes("shmpool_buff_hdr",370,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_out_of_design_cntr"
+	Set gtmtypes("shmpool_buff_hdr",370,"off")=3716
 	Set gtmtypes("shmpool_buff_hdr",370,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",370,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_db_csh_get_cntr")=370
-	Set gtmtypes("shmpool_buff_hdr",371,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_wcsgetspace_cntr"
-	Set gtmtypes("shmpool_buff_hdr",371,"off")=3756
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_out_of_design_cntr")=370
+	Set gtmtypes("shmpool_buff_hdr",371,"name")="shmpool_buff_hdr.shadow_file_header.bt_put_flush_dirty_cntr"
+	Set gtmtypes("shmpool_buff_hdr",371,"off")=3720
 	Set gtmtypes("shmpool_buff_hdr",371,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",371,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_wcsgetspace_cntr")=371
-	Set gtmtypes("shmpool_buff_hdr",372,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_t1_cntr"
-	Set gtmtypes("shmpool_buff_hdr",372,"off")=3760
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bt_put_flush_dirty_cntr")=371
+	Set gtmtypes("shmpool_buff_hdr",372,"name")="shmpool_buff_hdr.shadow_file_header.mlock_wakeups_cntr"
+	Set gtmtypes("shmpool_buff_hdr",372,"off")=3724
 	Set gtmtypes("shmpool_buff_hdr",372,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",372,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_t1_cntr")=372
-	Set gtmtypes("shmpool_buff_hdr",373,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_bitmap_cntr"
-	Set gtmtypes("shmpool_buff_hdr",373,"off")=3764
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.mlock_wakeups_cntr")=372
+	Set gtmtypes("shmpool_buff_hdr",373,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_recover_invoked_cntr"
+	Set gtmtypes("shmpool_buff_hdr",373,"off")=3728
 	Set gtmtypes("shmpool_buff_hdr",373,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",373,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_bitmap_cntr")=373
-	Set gtmtypes("shmpool_buff_hdr",374,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_jnl_cwset_cntr"
-	Set gtmtypes("shmpool_buff_hdr",374,"off")=3768
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_recover_invoked_cntr")=373
+	Set gtmtypes("shmpool_buff_hdr",374,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_verify_passed_cntr"
+	Set gtmtypes("shmpool_buff_hdr",374,"off")=3732
 	Set gtmtypes("shmpool_buff_hdr",374,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",374,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_jnl_cwset_cntr")=374
-	Set gtmtypes("shmpool_buff_hdr",375,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_cntr"
-	Set gtmtypes("shmpool_buff_hdr",375,"off")=3772
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_verify_passed_cntr")=374
+	Set gtmtypes("shmpool_buff_hdr",375,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr"
+	Set gtmtypes("shmpool_buff_hdr",375,"off")=3736
 	Set gtmtypes("shmpool_buff_hdr",375,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",375,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_cntr")=375
-	Set gtmtypes("shmpool_buff_hdr",376,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_hist_cntr"
-	Set gtmtypes("shmpool_buff_hdr",376,"off")=3776
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr")=375
+	Set gtmtypes("shmpool_buff_hdr",376,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_cntr"
+	Set gtmtypes("shmpool_buff_hdr",376,"off")=3740
 	Set gtmtypes("shmpool_buff_hdr",376,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",376,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_hist_cntr")=376
-	Set gtmtypes("shmpool_buff_hdr",377,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_hist1_nullbt_cntr"
-	Set gtmtypes("shmpool_buff_hdr",377,"off")=3780
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_cntr")=376
+	Set gtmtypes("shmpool_buff_hdr",377,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_db_csh_getn_loopexceed_cntr"
+	Set gtmtypes("shmpool_buff_hdr",377,"off")=3744
 	Set gtmtypes("shmpool_buff_hdr",377,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",377,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_hist1_nullbt_cntr")=377
-	Set gtmtypes("shmpool_buff_hdr",378,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_cntr"
-	Set gtmtypes("shmpool_buff_hdr",378,"off")=3784
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_db_csh_getn_loopexceed_cntr")=377
+	Set gtmtypes("shmpool_buff_hdr",378,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",378,"off")=3748
 	Set gtmtypes("shmpool_buff_hdr",378,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",378,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_cntr")=378
-	Set gtmtypes("shmpool_buff_hdr",379,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_bitmap_nullbt_cntr"
-	Set gtmtypes("shmpool_buff_hdr",379,"off")=3788
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_cntr")=378
+	Set gtmtypes("shmpool_buff_hdr",379,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_db_csh_get_cntr"
+	Set gtmtypes("shmpool_buff_hdr",379,"off")=3752
 	Set gtmtypes("shmpool_buff_hdr",379,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",379,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_bitmap_nullbt_cntr")=379
-	Set gtmtypes("shmpool_buff_hdr",380,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_cntr"
-	Set gtmtypes("shmpool_buff_hdr",380,"off")=3792
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_db_csh_get_cntr")=379
+	Set gtmtypes("shmpool_buff_hdr",380,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_wcsgetspace_cntr"
+	Set gtmtypes("shmpool_buff_hdr",380,"off")=3756
 	Set gtmtypes("shmpool_buff_hdr",380,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",380,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_cntr")=380
-	Set gtmtypes("shmpool_buff_hdr",381,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_jnl_cwset_cntr"
-	Set gtmtypes("shmpool_buff_hdr",381,"off")=3796
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_wcsgetspace_cntr")=380
+	Set gtmtypes("shmpool_buff_hdr",381,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_t1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",381,"off")=3760
 	Set gtmtypes("shmpool_buff_hdr",381,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",381,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_jnl_cwset_cntr")=381
-	Set gtmtypes("shmpool_buff_hdr",382,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_jnl_wcsflu_cntr"
-	Set gtmtypes("shmpool_buff_hdr",382,"off")=3800
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_t1_cntr")=381
+	Set gtmtypes("shmpool_buff_hdr",382,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_bitmap_cntr"
+	Set gtmtypes("shmpool_buff_hdr",382,"off")=3764
 	Set gtmtypes("shmpool_buff_hdr",382,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",382,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_jnl_wcsflu_cntr")=382
-	Set gtmtypes("shmpool_buff_hdr",383,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_get_too_many_loops_cntr"
-	Set gtmtypes("shmpool_buff_hdr",383,"off")=3804
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_bitmap_cntr")=382
+	Set gtmtypes("shmpool_buff_hdr",383,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_jnl_cwset_cntr"
+	Set gtmtypes("shmpool_buff_hdr",383,"off")=3768
 	Set gtmtypes("shmpool_buff_hdr",383,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",383,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_get_too_many_loops_cntr")=383
-	Set gtmtypes("shmpool_buff_hdr",384,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tpckh_hist1_nullbt_cntr"
-	Set gtmtypes("shmpool_buff_hdr",384,"off")=3808
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_jnl_cwset_cntr")=383
+	Set gtmtypes("shmpool_buff_hdr",384,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_cntr"
+	Set gtmtypes("shmpool_buff_hdr",384,"off")=3772
 	Set gtmtypes("shmpool_buff_hdr",384,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",384,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tpckh_hist1_nullbt_cntr")=384
-	Set gtmtypes("shmpool_buff_hdr",385,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_cntr"
-	Set gtmtypes("shmpool_buff_hdr",385,"off")=3812
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_cntr")=384
+	Set gtmtypes("shmpool_buff_hdr",385,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_hist_cntr"
+	Set gtmtypes("shmpool_buff_hdr",385,"off")=3776
 	Set gtmtypes("shmpool_buff_hdr",385,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",385,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_cntr")=385
-	Set gtmtypes("shmpool_buff_hdr",386,"name")="shmpool_buff_hdr.shadow_file_header.jnl_blocked_writer_lost_cntr"
-	Set gtmtypes("shmpool_buff_hdr",386,"off")=3816
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_hist_cntr")=385
+	Set gtmtypes("shmpool_buff_hdr",386,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_hist1_nullbt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",386,"off")=3780
 	Set gtmtypes("shmpool_buff_hdr",386,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",386,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_blocked_writer_lost_cntr")=386
-	Set gtmtypes("shmpool_buff_hdr",387,"name")="shmpool_buff_hdr.shadow_file_header.jnl_blocked_writer_stuck_cntr"
-	Set gtmtypes("shmpool_buff_hdr",387,"off")=3820
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_hist1_nullbt_cntr")=386
+	Set gtmtypes("shmpool_buff_hdr",387,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",387,"off")=3784
 	Set gtmtypes("shmpool_buff_hdr",387,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",387,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_blocked_writer_stuck_cntr")=387
-	Set gtmtypes("shmpool_buff_hdr",388,"name")="shmpool_buff_hdr.shadow_file_header.jnl_blocked_writer_blocked_cntr"
-	Set gtmtypes("shmpool_buff_hdr",388,"off")=3824
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_cntr")=387
+	Set gtmtypes("shmpool_buff_hdr",388,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_bitmap_nullbt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",388,"off")=3788
 	Set gtmtypes("shmpool_buff_hdr",388,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",388,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_blocked_writer_blocked_cntr")=388
-	Set gtmtypes("shmpool_buff_hdr",389,"name")="shmpool_buff_hdr.shadow_file_header.n_jnl_fsyncs_cntr"
-	Set gtmtypes("shmpool_buff_hdr",389,"off")=3828
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_bitmap_nullbt_cntr")=388
+	Set gtmtypes("shmpool_buff_hdr",389,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",389,"off")=3792
 	Set gtmtypes("shmpool_buff_hdr",389,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",389,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_jnl_fsyncs_cntr")=389
-	Set gtmtypes("shmpool_buff_hdr",390,"name")="shmpool_buff_hdr.shadow_file_header.n_jnl_fsync_tries_cntr"
-	Set gtmtypes("shmpool_buff_hdr",390,"off")=3832
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_cntr")=389
+	Set gtmtypes("shmpool_buff_hdr",390,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_jnl_cwset_cntr"
+	Set gtmtypes("shmpool_buff_hdr",390,"off")=3796
 	Set gtmtypes("shmpool_buff_hdr",390,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",390,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_jnl_fsync_tries_cntr")=390
-	Set gtmtypes("shmpool_buff_hdr",391,"name")="shmpool_buff_hdr.shadow_file_header.n_jnl_fsync_recovers_cntr"
-	Set gtmtypes("shmpool_buff_hdr",391,"off")=3836
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_jnl_cwset_cntr")=390
+	Set gtmtypes("shmpool_buff_hdr",391,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_jnl_wcsflu_cntr"
+	Set gtmtypes("shmpool_buff_hdr",391,"off")=3800
 	Set gtmtypes("shmpool_buff_hdr",391,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",391,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_jnl_fsync_recovers_cntr")=391
-	Set gtmtypes("shmpool_buff_hdr",392,"name")="shmpool_buff_hdr.shadow_file_header.n_db_fsyncs_cntr"
-	Set gtmtypes("shmpool_buff_hdr",392,"off")=3840
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_jnl_wcsflu_cntr")=391
+	Set gtmtypes("shmpool_buff_hdr",392,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_get_too_many_loops_cntr"
+	Set gtmtypes("shmpool_buff_hdr",392,"off")=3804
 	Set gtmtypes("shmpool_buff_hdr",392,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",392,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_fsyncs_cntr")=392
-	Set gtmtypes("shmpool_buff_hdr",393,"name")="shmpool_buff_hdr.shadow_file_header.n_db_fsyncs_in_crit_cntr"
-	Set gtmtypes("shmpool_buff_hdr",393,"off")=3844
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_get_too_many_loops_cntr")=392
+	Set gtmtypes("shmpool_buff_hdr",393,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tpckh_hist1_nullbt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",393,"off")=3808
 	Set gtmtypes("shmpool_buff_hdr",393,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",393,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_fsyncs_in_crit_cntr")=393
-	Set gtmtypes("shmpool_buff_hdr",394,"name")="shmpool_buff_hdr.shadow_file_header.n_dbsync_timers_cntr"
-	Set gtmtypes("shmpool_buff_hdr",394,"off")=3848
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tpckh_hist1_nullbt_cntr")=393
+	Set gtmtypes("shmpool_buff_hdr",394,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",394,"off")=3812
 	Set gtmtypes("shmpool_buff_hdr",394,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",394,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_dbsync_timers_cntr")=394
-	Set gtmtypes("shmpool_buff_hdr",395,"name")="shmpool_buff_hdr.shadow_file_header.n_dbsync_writes_cntr"
-	Set gtmtypes("shmpool_buff_hdr",395,"off")=3852
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_cntr")=394
+	Set gtmtypes("shmpool_buff_hdr",395,"name")="shmpool_buff_hdr.shadow_file_header.jnl_blocked_writer_lost_cntr"
+	Set gtmtypes("shmpool_buff_hdr",395,"off")=3816
 	Set gtmtypes("shmpool_buff_hdr",395,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",395,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_dbsync_writes_cntr")=395
-	Set gtmtypes("shmpool_buff_hdr",396,"name")="shmpool_buff_hdr.shadow_file_header.mutex_queue_full_cntr"
-	Set gtmtypes("shmpool_buff_hdr",396,"off")=3856
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_blocked_writer_lost_cntr")=395
+	Set gtmtypes("shmpool_buff_hdr",396,"name")="shmpool_buff_hdr.shadow_file_header.jnl_blocked_writer_stuck_cntr"
+	Set gtmtypes("shmpool_buff_hdr",396,"off")=3820
 	Set gtmtypes("shmpool_buff_hdr",396,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",396,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.mutex_queue_full_cntr")=396
-	Set gtmtypes("shmpool_buff_hdr",397,"name")="shmpool_buff_hdr.shadow_file_header.wcb_bt_put_cntr"
-	Set gtmtypes("shmpool_buff_hdr",397,"off")=3860
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_blocked_writer_stuck_cntr")=396
+	Set gtmtypes("shmpool_buff_hdr",397,"name")="shmpool_buff_hdr.shadow_file_header.jnl_blocked_writer_blocked_cntr"
+	Set gtmtypes("shmpool_buff_hdr",397,"off")=3824
 	Set gtmtypes("shmpool_buff_hdr",397,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",397,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_bt_put_cntr")=397
-	Set gtmtypes("shmpool_buff_hdr",398,"name")="shmpool_buff_hdr.shadow_file_header.wcb_mutex_salvage_cntr"
-	Set gtmtypes("shmpool_buff_hdr",398,"off")=3864
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_blocked_writer_blocked_cntr")=397
+	Set gtmtypes("shmpool_buff_hdr",398,"name")="shmpool_buff_hdr.shadow_file_header.n_jnl_fsyncs_cntr"
+	Set gtmtypes("shmpool_buff_hdr",398,"off")=3828
 	Set gtmtypes("shmpool_buff_hdr",398,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",398,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_mutex_salvage_cntr")=398
-	Set gtmtypes("shmpool_buff_hdr",399,"name")="shmpool_buff_hdr.shadow_file_header.wcb_tp_grab_crit_cntr"
-	Set gtmtypes("shmpool_buff_hdr",399,"off")=3868
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_jnl_fsyncs_cntr")=398
+	Set gtmtypes("shmpool_buff_hdr",399,"name")="shmpool_buff_hdr.shadow_file_header.n_jnl_fsync_tries_cntr"
+	Set gtmtypes("shmpool_buff_hdr",399,"off")=3832
 	Set gtmtypes("shmpool_buff_hdr",399,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",399,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_tp_grab_crit_cntr")=399
-	Set gtmtypes("shmpool_buff_hdr",400,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_nocr_invcr_cntr"
-	Set gtmtypes("shmpool_buff_hdr",400,"off")=3872
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_jnl_fsync_tries_cntr")=399
+	Set gtmtypes("shmpool_buff_hdr",400,"name")="shmpool_buff_hdr.shadow_file_header.n_jnl_fsync_recovers_cntr"
+	Set gtmtypes("shmpool_buff_hdr",400,"off")=3836
 	Set gtmtypes("shmpool_buff_hdr",400,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",400,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_nocr_invcr_cntr")=400
-	Set gtmtypes("shmpool_buff_hdr",401,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_cr_invcr_cntr"
-	Set gtmtypes("shmpool_buff_hdr",401,"off")=3876
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_jnl_fsync_recovers_cntr")=400
+	Set gtmtypes("shmpool_buff_hdr",401,"name")="shmpool_buff_hdr.shadow_file_header.n_db_fsyncs_cntr"
+	Set gtmtypes("shmpool_buff_hdr",401,"off")=3840
 	Set gtmtypes("shmpool_buff_hdr",401,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",401,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_cr_invcr_cntr")=401
-	Set gtmtypes("shmpool_buff_hdr",402,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_rip_wait_cntr"
-	Set gtmtypes("shmpool_buff_hdr",402,"off")=3880
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_fsyncs_cntr")=401
+	Set gtmtypes("shmpool_buff_hdr",402,"name")="shmpool_buff_hdr.shadow_file_header.n_db_fsyncs_in_crit_cntr"
+	Set gtmtypes("shmpool_buff_hdr",402,"off")=3844
 	Set gtmtypes("shmpool_buff_hdr",402,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",402,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_rip_wait_cntr")=402
-	Set gtmtypes("shmpool_buff_hdr",403,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirtyripwait_cntr"
-	Set gtmtypes("shmpool_buff_hdr",403,"off")=3884
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_fsyncs_in_crit_cntr")=402
+	Set gtmtypes("shmpool_buff_hdr",403,"name")="shmpool_buff_hdr.shadow_file_header.n_dbsync_timers_cntr"
+	Set gtmtypes("shmpool_buff_hdr",403,"off")=3848
 	Set gtmtypes("shmpool_buff_hdr",403,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",403,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirtyripwait_cntr")=403
-	Set gtmtypes("shmpool_buff_hdr",404,"name")="shmpool_buff_hdr.shadow_file_header.wcb_gds_rundown_cntr"
-	Set gtmtypes("shmpool_buff_hdr",404,"off")=3888
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_dbsync_timers_cntr")=403
+	Set gtmtypes("shmpool_buff_hdr",404,"name")="shmpool_buff_hdr.shadow_file_header.n_dbsync_writes_cntr"
+	Set gtmtypes("shmpool_buff_hdr",404,"off")=3852
 	Set gtmtypes("shmpool_buff_hdr",404,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",404,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_gds_rundown_cntr")=404
-	Set gtmtypes("shmpool_buff_hdr",405,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wcs_flu1_cntr"
-	Set gtmtypes("shmpool_buff_hdr",405,"off")=3892
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_dbsync_writes_cntr")=404
+	Set gtmtypes("shmpool_buff_hdr",405,"name")="shmpool_buff_hdr.shadow_file_header.mutex_queue_full_cntr"
+	Set gtmtypes("shmpool_buff_hdr",405,"off")=3856
 	Set gtmtypes("shmpool_buff_hdr",405,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",405,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wcs_flu1_cntr")=405
-	Set gtmtypes("shmpool_buff_hdr",406,"name")="shmpool_buff_hdr.shadow_file_header.wcb_mu_back_cntr"
-	Set gtmtypes("shmpool_buff_hdr",406,"off")=3896
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.mutex_queue_full_cntr")=405
+	Set gtmtypes("shmpool_buff_hdr",406,"name")="shmpool_buff_hdr.shadow_file_header.wcb_bt_put_cntr"
+	Set gtmtypes("shmpool_buff_hdr",406,"off")=3860
 	Set gtmtypes("shmpool_buff_hdr",406,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",406,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_mu_back_cntr")=406
-	Set gtmtypes("shmpool_buff_hdr",407,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirty_invcr_cntr"
-	Set gtmtypes("shmpool_buff_hdr",407,"off")=3900
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_bt_put_cntr")=406
+	Set gtmtypes("shmpool_buff_hdr",407,"name")="shmpool_buff_hdr.shadow_file_header.wcb_mutex_salvage_cntr"
+	Set gtmtypes("shmpool_buff_hdr",407,"off")=3864
 	Set gtmtypes("shmpool_buff_hdr",407,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",407,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirty_invcr_cntr")=407
-	Set gtmtypes("shmpool_buff_hdr",408,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_wtfini_fail_cntr"
-	Set gtmtypes("shmpool_buff_hdr",408,"off")=3904
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_mutex_salvage_cntr")=407
+	Set gtmtypes("shmpool_buff_hdr",408,"name")="shmpool_buff_hdr.shadow_file_header.wcb_tp_grab_crit_cntr"
+	Set gtmtypes("shmpool_buff_hdr",408,"off")=3868
 	Set gtmtypes("shmpool_buff_hdr",408,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",408,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_wtfini_fail_cntr")=408
-	Set gtmtypes("shmpool_buff_hdr",409,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_twin_stuck_cntr"
-	Set gtmtypes("shmpool_buff_hdr",409,"off")=3908
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_tp_grab_crit_cntr")=408
+	Set gtmtypes("shmpool_buff_hdr",409,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_nocr_invcr_cntr"
+	Set gtmtypes("shmpool_buff_hdr",409,"off")=3872
 	Set gtmtypes("shmpool_buff_hdr",409,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",409,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_twin_stuck_cntr")=409
-	Set gtmtypes("shmpool_buff_hdr",410,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_wrt_latch_stuck_cntr"
-	Set gtmtypes("shmpool_buff_hdr",410,"off")=3912
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_nocr_invcr_cntr")=409
+	Set gtmtypes("shmpool_buff_hdr",410,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_cr_invcr_cntr"
+	Set gtmtypes("shmpool_buff_hdr",410,"off")=3876
 	Set gtmtypes("shmpool_buff_hdr",410,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",410,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_wrt_latch_stuck_cntr")=410
-	Set gtmtypes("shmpool_buff_hdr",411,"name")="shmpool_buff_hdr.shadow_file_header.wcb_secshr_db_clnup_now_crit_cntr"
-	Set gtmtypes("shmpool_buff_hdr",411,"off")=3916
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_cr_invcr_cntr")=410
+	Set gtmtypes("shmpool_buff_hdr",411,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_rip_wait_cntr"
+	Set gtmtypes("shmpool_buff_hdr",411,"off")=3880
 	Set gtmtypes("shmpool_buff_hdr",411,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",411,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_secshr_db_clnup_now_crit_cntr")=411
-	Set gtmtypes("shmpool_buff_hdr",412,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_bad_bt_index1_cntr"
-	Set gtmtypes("shmpool_buff_hdr",412,"off")=3920
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_rip_wait_cntr")=411
+	Set gtmtypes("shmpool_buff_hdr",412,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirtyripwait_cntr"
+	Set gtmtypes("shmpool_buff_hdr",412,"off")=3884
 	Set gtmtypes("shmpool_buff_hdr",412,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",412,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_bad_bt_index1_cntr")=412
-	Set gtmtypes("shmpool_buff_hdr",413,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_bad_bt_index2_cntr"
-	Set gtmtypes("shmpool_buff_hdr",413,"off")=3924
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirtyripwait_cntr")=412
+	Set gtmtypes("shmpool_buff_hdr",413,"name")="shmpool_buff_hdr.shadow_file_header.wcb_gds_rundown_cntr"
+	Set gtmtypes("shmpool_buff_hdr",413,"off")=3888
 	Set gtmtypes("shmpool_buff_hdr",413,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",413,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_bad_bt_index2_cntr")=413
-	Set gtmtypes("shmpool_buff_hdr",414,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_crbtmismatch1_cntr"
-	Set gtmtypes("shmpool_buff_hdr",414,"off")=3928
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_gds_rundown_cntr")=413
+	Set gtmtypes("shmpool_buff_hdr",414,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wcs_flu1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",414,"off")=3892
 	Set gtmtypes("shmpool_buff_hdr",414,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",414,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_crbtmismatch1_cntr")=414
-	Set gtmtypes("shmpool_buff_hdr",415,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_crbtmismatch2_cntr"
-	Set gtmtypes("shmpool_buff_hdr",415,"off")=3932
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wcs_flu1_cntr")=414
+	Set gtmtypes("shmpool_buff_hdr",415,"name")="shmpool_buff_hdr.shadow_file_header.wcb_mu_back_cntr"
+	Set gtmtypes("shmpool_buff_hdr",415,"off")=3896
 	Set gtmtypes("shmpool_buff_hdr",415,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",415,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_crbtmismatch2_cntr")=415
-	Set gtmtypes("shmpool_buff_hdr",416,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_crbtmismatch3_cntr"
-	Set gtmtypes("shmpool_buff_hdr",416,"off")=3936
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_mu_back_cntr")=415
+	Set gtmtypes("shmpool_buff_hdr",416,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirty_invcr_cntr"
+	Set gtmtypes("shmpool_buff_hdr",416,"off")=3900
 	Set gtmtypes("shmpool_buff_hdr",416,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",416,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_crbtmismatch3_cntr")=416
-	Set gtmtypes("shmpool_buff_hdr",417,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_cntr"
-	Set gtmtypes("shmpool_buff_hdr",417,"off")=3940
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirty_invcr_cntr")=416
+	Set gtmtypes("shmpool_buff_hdr",417,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_wtfini_fail_cntr"
+	Set gtmtypes("shmpool_buff_hdr",417,"off")=3904
 	Set gtmtypes("shmpool_buff_hdr",417,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",417,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_cntr")=417
-	Set gtmtypes("shmpool_buff_hdr",418,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_cntr"
-	Set gtmtypes("shmpool_buff_hdr",418,"off")=3944
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_wtfini_fail_cntr")=417
+	Set gtmtypes("shmpool_buff_hdr",418,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_twin_stuck_cntr"
+	Set gtmtypes("shmpool_buff_hdr",418,"off")=3908
 	Set gtmtypes("shmpool_buff_hdr",418,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",418,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_cntr")=418
-	Set gtmtypes("shmpool_buff_hdr",419,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_cntr"
-	Set gtmtypes("shmpool_buff_hdr",419,"off")=3948
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_twin_stuck_cntr")=418
+	Set gtmtypes("shmpool_buff_hdr",419,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_wrt_latch_stuck_cntr"
+	Set gtmtypes("shmpool_buff_hdr",419,"off")=3912
 	Set gtmtypes("shmpool_buff_hdr",419,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",419,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_cntr")=419
-	Set gtmtypes("shmpool_buff_hdr",420,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_cntr"
-	Set gtmtypes("shmpool_buff_hdr",420,"off")=3952
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_wrt_latch_stuck_cntr")=419
+	Set gtmtypes("shmpool_buff_hdr",420,"name")="shmpool_buff_hdr.shadow_file_header.wcb_secshr_db_clnup_now_crit_cntr"
+	Set gtmtypes("shmpool_buff_hdr",420,"off")=3916
 	Set gtmtypes("shmpool_buff_hdr",420,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",420,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_cntr")=420
-	Set gtmtypes("shmpool_buff_hdr",421,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_cntr"
-	Set gtmtypes("shmpool_buff_hdr",421,"off")=3956
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_secshr_db_clnup_now_crit_cntr")=420
+	Set gtmtypes("shmpool_buff_hdr",421,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_bad_bt_index1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",421,"off")=3920
 	Set gtmtypes("shmpool_buff_hdr",421,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",421,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_cntr")=421
-	Set gtmtypes("shmpool_buff_hdr",422,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_bt_get_cntr"
-	Set gtmtypes("shmpool_buff_hdr",422,"off")=3960
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_bad_bt_index1_cntr")=421
+	Set gtmtypes("shmpool_buff_hdr",422,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_bad_bt_index2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",422,"off")=3924
 	Set gtmtypes("shmpool_buff_hdr",422,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",422,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_bt_get_cntr")=422
-	Set gtmtypes("shmpool_buff_hdr",423,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_cntr"
-	Set gtmtypes("shmpool_buff_hdr",423,"off")=3964
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_bad_bt_index2_cntr")=422
+	Set gtmtypes("shmpool_buff_hdr",423,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_crbtmismatch1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",423,"off")=3928
 	Set gtmtypes("shmpool_buff_hdr",423,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",423,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_cntr")=423
-	Set gtmtypes("shmpool_buff_hdr",424,"name")="shmpool_buff_hdr.shadow_file_header.wcb_bg_update_lckfail1_cntr"
-	Set gtmtypes("shmpool_buff_hdr",424,"off")=3968
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_crbtmismatch1_cntr")=423
+	Set gtmtypes("shmpool_buff_hdr",424,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_crbtmismatch2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",424,"off")=3932
 	Set gtmtypes("shmpool_buff_hdr",424,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",424,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_bg_update_lckfail1_cntr")=424
-	Set gtmtypes("shmpool_buff_hdr",425,"name")="shmpool_buff_hdr.shadow_file_header.wcb_bg_update_lckfail2_cntr"
-	Set gtmtypes("shmpool_buff_hdr",425,"off")=3972
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_crbtmismatch2_cntr")=424
+	Set gtmtypes("shmpool_buff_hdr",425,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_crbtmismatch3_cntr"
+	Set gtmtypes("shmpool_buff_hdr",425,"off")=3936
 	Set gtmtypes("shmpool_buff_hdr",425,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",425,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_bg_update_lckfail2_cntr")=425
-	Set gtmtypes("shmpool_buff_hdr",426,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail1_cntr"
-	Set gtmtypes("shmpool_buff_hdr",426,"off")=3976
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_crbtmismatch3_cntr")=425
+	Set gtmtypes("shmpool_buff_hdr",426,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",426,"off")=3940
 	Set gtmtypes("shmpool_buff_hdr",426,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",426,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail1_cntr")=426
-	Set gtmtypes("shmpool_buff_hdr",427,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail2_cntr"
-	Set gtmtypes("shmpool_buff_hdr",427,"off")=3980
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_cntr")=426
+	Set gtmtypes("shmpool_buff_hdr",427,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",427,"off")=3944
 	Set gtmtypes("shmpool_buff_hdr",427,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",427,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail2_cntr")=427
-	Set gtmtypes("shmpool_buff_hdr",428,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail3_cntr"
-	Set gtmtypes("shmpool_buff_hdr",428,"off")=3984
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_cntr")=427
+	Set gtmtypes("shmpool_buff_hdr",428,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_cntr"
+	Set gtmtypes("shmpool_buff_hdr",428,"off")=3948
 	Set gtmtypes("shmpool_buff_hdr",428,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",428,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail3_cntr")=428
-	Set gtmtypes("shmpool_buff_hdr",429,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail4_cntr"
-	Set gtmtypes("shmpool_buff_hdr",429,"off")=3988
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_cntr")=428
+	Set gtmtypes("shmpool_buff_hdr",429,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_cntr"
+	Set gtmtypes("shmpool_buff_hdr",429,"off")=3952
 	Set gtmtypes("shmpool_buff_hdr",429,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",429,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail4_cntr")=429
-	Set gtmtypes("shmpool_buff_hdr",430,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail1_cntr"
-	Set gtmtypes("shmpool_buff_hdr",430,"off")=3992
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_cntr")=429
+	Set gtmtypes("shmpool_buff_hdr",430,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_cntr"
+	Set gtmtypes("shmpool_buff_hdr",430,"off")=3956
 	Set gtmtypes("shmpool_buff_hdr",430,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",430,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail1_cntr")=430
-	Set gtmtypes("shmpool_buff_hdr",431,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail2_cntr"
-	Set gtmtypes("shmpool_buff_hdr",431,"off")=3996
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_cntr")=430
+	Set gtmtypes("shmpool_buff_hdr",431,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_bt_get_cntr"
+	Set gtmtypes("shmpool_buff_hdr",431,"off")=3960
 	Set gtmtypes("shmpool_buff_hdr",431,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",431,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail2_cntr")=431
-	Set gtmtypes("shmpool_buff_hdr",432,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail3_cntr"
-	Set gtmtypes("shmpool_buff_hdr",432,"off")=4000
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_bt_get_cntr")=431
+	Set gtmtypes("shmpool_buff_hdr",432,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_cntr"
+	Set gtmtypes("shmpool_buff_hdr",432,"off")=3964
 	Set gtmtypes("shmpool_buff_hdr",432,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",432,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail3_cntr")=432
-	Set gtmtypes("shmpool_buff_hdr",433,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail4_cntr"
-	Set gtmtypes("shmpool_buff_hdr",433,"off")=4004
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_cntr")=432
+	Set gtmtypes("shmpool_buff_hdr",433,"name")="shmpool_buff_hdr.shadow_file_header.wcb_bg_update_lckfail1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",433,"off")=3968
 	Set gtmtypes("shmpool_buff_hdr",433,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",433,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail4_cntr")=433
-	Set gtmtypes("shmpool_buff_hdr",434,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirtystuck1_cntr"
-	Set gtmtypes("shmpool_buff_hdr",434,"off")=4008
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_bg_update_lckfail1_cntr")=433
+	Set gtmtypes("shmpool_buff_hdr",434,"name")="shmpool_buff_hdr.shadow_file_header.wcb_bg_update_lckfail2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",434,"off")=3972
 	Set gtmtypes("shmpool_buff_hdr",434,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",434,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirtystuck1_cntr")=434
-	Set gtmtypes("shmpool_buff_hdr",435,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirtystuck2_cntr"
-	Set gtmtypes("shmpool_buff_hdr",435,"off")=4012
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_bg_update_lckfail2_cntr")=434
+	Set gtmtypes("shmpool_buff_hdr",435,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",435,"off")=3976
 	Set gtmtypes("shmpool_buff_hdr",435,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",435,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirtystuck2_cntr")=435
-	Set gtmtypes("shmpool_buff_hdr",436,"name")="shmpool_buff_hdr.shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_cntr"
-	Set gtmtypes("shmpool_buff_hdr",436,"off")=4016
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail1_cntr")=435
+	Set gtmtypes("shmpool_buff_hdr",436,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",436,"off")=3980
 	Set gtmtypes("shmpool_buff_hdr",436,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",436,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_cntr")=436
-	Set gtmtypes("shmpool_buff_hdr",437,"name")="shmpool_buff_hdr.shadow_file_header.dwngrd_refmts_syncio_cntr"
-	Set gtmtypes("shmpool_buff_hdr",437,"off")=4020
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail2_cntr")=436
+	Set gtmtypes("shmpool_buff_hdr",437,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail3_cntr"
+	Set gtmtypes("shmpool_buff_hdr",437,"off")=3984
 	Set gtmtypes("shmpool_buff_hdr",437,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",437,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.dwngrd_refmts_syncio_cntr")=437
-	Set gtmtypes("shmpool_buff_hdr",438,"name")="shmpool_buff_hdr.shadow_file_header.dwngrd_refmts_asyncio_cntr"
-	Set gtmtypes("shmpool_buff_hdr",438,"off")=4024
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail3_cntr")=437
+	Set gtmtypes("shmpool_buff_hdr",438,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail4_cntr"
+	Set gtmtypes("shmpool_buff_hdr",438,"off")=3988
 	Set gtmtypes("shmpool_buff_hdr",438,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",438,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.dwngrd_refmts_asyncio_cntr")=438
-	Set gtmtypes("shmpool_buff_hdr",439,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_refmt_harvests_cntr"
-	Set gtmtypes("shmpool_buff_hdr",439,"off")=4028
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail4_cntr")=438
+	Set gtmtypes("shmpool_buff_hdr",439,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",439,"off")=3992
 	Set gtmtypes("shmpool_buff_hdr",439,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",439,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_refmt_harvests_cntr")=439
-	Set gtmtypes("shmpool_buff_hdr",440,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_recovery_cntr"
-	Set gtmtypes("shmpool_buff_hdr",440,"off")=4032
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail1_cntr")=439
+	Set gtmtypes("shmpool_buff_hdr",440,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",440,"off")=3996
 	Set gtmtypes("shmpool_buff_hdr",440,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",440,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_recovery_cntr")=440
-	Set gtmtypes("shmpool_buff_hdr",441,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_blkd_by_sdc_cntr"
-	Set gtmtypes("shmpool_buff_hdr",441,"off")=4036
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail2_cntr")=440
+	Set gtmtypes("shmpool_buff_hdr",441,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail3_cntr"
+	Set gtmtypes("shmpool_buff_hdr",441,"off")=4000
 	Set gtmtypes("shmpool_buff_hdr",441,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",441,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_blkd_by_sdc_cntr")=441
-	Set gtmtypes("shmpool_buff_hdr",442,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_alloc_bbflush_cntr"
-	Set gtmtypes("shmpool_buff_hdr",442,"off")=4040
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail3_cntr")=441
+	Set gtmtypes("shmpool_buff_hdr",442,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail4_cntr"
+	Set gtmtypes("shmpool_buff_hdr",442,"off")=4004
 	Set gtmtypes("shmpool_buff_hdr",442,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",442,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_alloc_bbflush_cntr")=442
-	Set gtmtypes("shmpool_buff_hdr",443,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_released_replaced_cntr"
-	Set gtmtypes("shmpool_buff_hdr",443,"off")=4044
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail4_cntr")=442
+	Set gtmtypes("shmpool_buff_hdr",443,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirtystuck1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",443,"off")=4008
 	Set gtmtypes("shmpool_buff_hdr",443,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",443,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_released_replaced_cntr")=443
-	Set gtmtypes("shmpool_buff_hdr",444,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_released_io_complete_cntr"
-	Set gtmtypes("shmpool_buff_hdr",444,"off")=4048
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirtystuck1_cntr")=443
+	Set gtmtypes("shmpool_buff_hdr",444,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirtystuck2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",444,"off")=4012
 	Set gtmtypes("shmpool_buff_hdr",444,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",444,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_released_io_complete_cntr")=444
-	Set gtmtypes("shmpool_buff_hdr",445,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_kept_cntr"
-	Set gtmtypes("shmpool_buff_hdr",445,"off")=4052
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirtystuck2_cntr")=444
+	Set gtmtypes("shmpool_buff_hdr",445,"name")="shmpool_buff_hdr.shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_cntr"
+	Set gtmtypes("shmpool_buff_hdr",445,"off")=4016
 	Set gtmtypes("shmpool_buff_hdr",445,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",445,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_kept_cntr")=445
-	Set gtmtypes("shmpool_buff_hdr",446,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_ignored_cntr"
-	Set gtmtypes("shmpool_buff_hdr",446,"off")=4056
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_cntr")=445
+	Set gtmtypes("shmpool_buff_hdr",446,"name")="shmpool_buff_hdr.shadow_file_header.dwngrd_refmts_syncio_cntr"
+	Set gtmtypes("shmpool_buff_hdr",446,"off")=4020
 	Set gtmtypes("shmpool_buff_hdr",446,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",446,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_ignored_cntr")=446
-	Set gtmtypes("shmpool_buff_hdr",447,"name")="shmpool_buff_hdr.shadow_file_header.refmt_blk_chk_blk_freed_cntr"
-	Set gtmtypes("shmpool_buff_hdr",447,"off")=4060
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.dwngrd_refmts_syncio_cntr")=446
+	Set gtmtypes("shmpool_buff_hdr",447,"name")="shmpool_buff_hdr.shadow_file_header.dwngrd_refmts_asyncio_cntr"
+	Set gtmtypes("shmpool_buff_hdr",447,"off")=4024
 	Set gtmtypes("shmpool_buff_hdr",447,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",447,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_blk_chk_blk_freed_cntr")=447
-	Set gtmtypes("shmpool_buff_hdr",448,"name")="shmpool_buff_hdr.shadow_file_header.refmt_blk_chk_blk_kept_cntr"
-	Set gtmtypes("shmpool_buff_hdr",448,"off")=4064
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.dwngrd_refmts_asyncio_cntr")=447
+	Set gtmtypes("shmpool_buff_hdr",448,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_refmt_harvests_cntr"
+	Set gtmtypes("shmpool_buff_hdr",448,"off")=4028
 	Set gtmtypes("shmpool_buff_hdr",448,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",448,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_blk_chk_blk_kept_cntr")=448
-	Set gtmtypes("shmpool_buff_hdr",449,"name")="shmpool_buff_hdr.shadow_file_header.active_lvl_trigger_cntr"
-	Set gtmtypes("shmpool_buff_hdr",449,"off")=4068
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_refmt_harvests_cntr")=448
+	Set gtmtypes("shmpool_buff_hdr",449,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_recovery_cntr"
+	Set gtmtypes("shmpool_buff_hdr",449,"off")=4032
 	Set gtmtypes("shmpool_buff_hdr",449,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",449,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.active_lvl_trigger_cntr")=449
-	Set gtmtypes("shmpool_buff_hdr",450,"name")="shmpool_buff_hdr.shadow_file_header.new_buff_cntr"
-	Set gtmtypes("shmpool_buff_hdr",450,"off")=4072
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_recovery_cntr")=449
+	Set gtmtypes("shmpool_buff_hdr",450,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_blkd_by_sdc_cntr"
+	Set gtmtypes("shmpool_buff_hdr",450,"off")=4036
 	Set gtmtypes("shmpool_buff_hdr",450,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",450,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.new_buff_cntr")=450
-	Set gtmtypes("shmpool_buff_hdr",451,"name")="shmpool_buff_hdr.shadow_file_header.phase2_commit_wait_sleep_in_crit_cntr"
-	Set gtmtypes("shmpool_buff_hdr",451,"off")=4076
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_blkd_by_sdc_cntr")=450
+	Set gtmtypes("shmpool_buff_hdr",451,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_alloc_bbflush_cntr"
+	Set gtmtypes("shmpool_buff_hdr",451,"off")=4040
 	Set gtmtypes("shmpool_buff_hdr",451,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",451,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.phase2_commit_wait_sleep_in_crit_cntr")=451
-	Set gtmtypes("shmpool_buff_hdr",452,"name")="shmpool_buff_hdr.shadow_file_header.phase2_commit_wait_sleep_no_crit_cntr"
-	Set gtmtypes("shmpool_buff_hdr",452,"off")=4080
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_alloc_bbflush_cntr")=451
+	Set gtmtypes("shmpool_buff_hdr",452,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_released_replaced_cntr"
+	Set gtmtypes("shmpool_buff_hdr",452,"off")=4044
 	Set gtmtypes("shmpool_buff_hdr",452,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",452,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.phase2_commit_wait_sleep_no_crit_cntr")=452
-	Set gtmtypes("shmpool_buff_hdr",453,"name")="shmpool_buff_hdr.shadow_file_header.phase2_commit_wait_pidcnt_cntr"
-	Set gtmtypes("shmpool_buff_hdr",453,"off")=4084
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_released_replaced_cntr")=452
+	Set gtmtypes("shmpool_buff_hdr",453,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_released_io_complete_cntr"
+	Set gtmtypes("shmpool_buff_hdr",453,"off")=4048
 	Set gtmtypes("shmpool_buff_hdr",453,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",453,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.phase2_commit_wait_pidcnt_cntr")=453
-	Set gtmtypes("shmpool_buff_hdr",454,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_intend_wait_cntr"
-	Set gtmtypes("shmpool_buff_hdr",454,"off")=4088
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_released_io_complete_cntr")=453
+	Set gtmtypes("shmpool_buff_hdr",454,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_kept_cntr"
+	Set gtmtypes("shmpool_buff_hdr",454,"off")=4052
 	Set gtmtypes("shmpool_buff_hdr",454,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",454,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_intend_wait_cntr")=454
-	Set gtmtypes("shmpool_buff_hdr",455,"name")="shmpool_buff_hdr.shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_cntr"
-	Set gtmtypes("shmpool_buff_hdr",455,"off")=4092
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_kept_cntr")=454
+	Set gtmtypes("shmpool_buff_hdr",455,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_ignored_cntr"
+	Set gtmtypes("shmpool_buff_hdr",455,"off")=4056
 	Set gtmtypes("shmpool_buff_hdr",455,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",455,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_cntr")=455
-	Set gtmtypes("shmpool_buff_hdr",456,"name")="shmpool_buff_hdr.shadow_file_header.wcb_phase2_commit_wait_cntr"
-	Set gtmtypes("shmpool_buff_hdr",456,"off")=4096
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_ignored_cntr")=455
+	Set gtmtypes("shmpool_buff_hdr",456,"name")="shmpool_buff_hdr.shadow_file_header.refmt_blk_chk_blk_freed_cntr"
+	Set gtmtypes("shmpool_buff_hdr",456,"off")=4060
 	Set gtmtypes("shmpool_buff_hdr",456,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",456,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_phase2_commit_wait_cntr")=456
-	Set gtmtypes("shmpool_buff_hdr",457,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_calls_cntr"
-	Set gtmtypes("shmpool_buff_hdr",457,"off")=4100
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_blk_chk_blk_freed_cntr")=456
+	Set gtmtypes("shmpool_buff_hdr",457,"name")="shmpool_buff_hdr.shadow_file_header.refmt_blk_chk_blk_kept_cntr"
+	Set gtmtypes("shmpool_buff_hdr",457,"off")=4064
 	Set gtmtypes("shmpool_buff_hdr",457,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",457,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_calls_cntr")=457
-	Set gtmtypes("shmpool_buff_hdr",458,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_rip_cntr"
-	Set gtmtypes("shmpool_buff_hdr",458,"off")=4104
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_blk_chk_blk_kept_cntr")=457
+	Set gtmtypes("shmpool_buff_hdr",458,"name")="shmpool_buff_hdr.shadow_file_header.active_lvl_trigger_cntr"
+	Set gtmtypes("shmpool_buff_hdr",458,"off")=4068
 	Set gtmtypes("shmpool_buff_hdr",458,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",458,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_rip_cntr")=458
-	Set gtmtypes("shmpool_buff_hdr",459,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_in_tend_cntr"
-	Set gtmtypes("shmpool_buff_hdr",459,"off")=4108
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.active_lvl_trigger_cntr")=458
+	Set gtmtypes("shmpool_buff_hdr",459,"name")="shmpool_buff_hdr.shadow_file_header.new_buff_cntr"
+	Set gtmtypes("shmpool_buff_hdr",459,"off")=4072
 	Set gtmtypes("shmpool_buff_hdr",459,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",459,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_in_tend_cntr")=459
-	Set gtmtypes("shmpool_buff_hdr",460,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_search_blk_cntr"
-	Set gtmtypes("shmpool_buff_hdr",460,"off")=4112
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.new_buff_cntr")=459
+	Set gtmtypes("shmpool_buff_hdr",460,"name")="shmpool_buff_hdr.shadow_file_header.phase2_commit_wait_sleep_in_crit_cntr"
+	Set gtmtypes("shmpool_buff_hdr",460,"off")=4076
 	Set gtmtypes("shmpool_buff_hdr",460,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",460,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_search_blk_cntr")=460
-	Set gtmtypes("shmpool_buff_hdr",461,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_new_rec_cntr"
-	Set gtmtypes("shmpool_buff_hdr",461,"off")=4116
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.phase2_commit_wait_sleep_in_crit_cntr")=460
+	Set gtmtypes("shmpool_buff_hdr",461,"name")="shmpool_buff_hdr.shadow_file_header.phase2_commit_wait_sleep_no_crit_cntr"
+	Set gtmtypes("shmpool_buff_hdr",461,"off")=4080
 	Set gtmtypes("shmpool_buff_hdr",461,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",461,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_new_rec_cntr")=461
-	Set gtmtypes("shmpool_buff_hdr",462,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_rec_size_cntr"
-	Set gtmtypes("shmpool_buff_hdr",462,"off")=4120
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.phase2_commit_wait_sleep_no_crit_cntr")=461
+	Set gtmtypes("shmpool_buff_hdr",462,"name")="shmpool_buff_hdr.shadow_file_header.phase2_commit_wait_pidcnt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",462,"off")=4084
 	Set gtmtypes("shmpool_buff_hdr",462,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",462,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_rec_size_cntr")=462
-	Set gtmtypes("shmpool_buff_hdr",463,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_rec_cmpc_cntr"
-	Set gtmtypes("shmpool_buff_hdr",463,"off")=4124
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.phase2_commit_wait_pidcnt_cntr")=462
+	Set gtmtypes("shmpool_buff_hdr",463,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_intend_wait_cntr"
+	Set gtmtypes("shmpool_buff_hdr",463,"off")=4088
 	Set gtmtypes("shmpool_buff_hdr",463,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",463,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_rec_cmpc_cntr")=463
-	Set gtmtypes("shmpool_buff_hdr",464,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_blk_fini_cntr"
-	Set gtmtypes("shmpool_buff_hdr",464,"off")=4128
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_intend_wait_cntr")=463
+	Set gtmtypes("shmpool_buff_hdr",464,"name")="shmpool_buff_hdr.shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_cntr"
+	Set gtmtypes("shmpool_buff_hdr",464,"off")=4092
 	Set gtmtypes("shmpool_buff_hdr",464,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",464,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_blk_fini_cntr")=464
-	Set gtmtypes("shmpool_buff_hdr",465,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_blk_split_cntr"
-	Set gtmtypes("shmpool_buff_hdr",465,"off")=4132
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_cntr")=464
+	Set gtmtypes("shmpool_buff_hdr",465,"name")="shmpool_buff_hdr.shadow_file_header.wcb_phase2_commit_wait_cntr"
+	Set gtmtypes("shmpool_buff_hdr",465,"off")=4096
 	Set gtmtypes("shmpool_buff_hdr",465,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",465,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_blk_split_cntr")=465
-	Set gtmtypes("shmpool_buff_hdr",466,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_ripsleep_cnt_cntr"
-	Set gtmtypes("shmpool_buff_hdr",466,"off")=4136
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_phase2_commit_wait_cntr")=465
+	Set gtmtypes("shmpool_buff_hdr",466,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_calls_cntr"
+	Set gtmtypes("shmpool_buff_hdr",466,"off")=4100
 	Set gtmtypes("shmpool_buff_hdr",466,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",466,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_ripsleep_cnt_cntr")=466
-	Set gtmtypes("shmpool_buff_hdr",467,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_ripsleep_nblks_cntr"
-	Set gtmtypes("shmpool_buff_hdr",467,"off")=4140
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_calls_cntr")=466
+	Set gtmtypes("shmpool_buff_hdr",467,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_rip_cntr"
+	Set gtmtypes("shmpool_buff_hdr",467,"off")=4104
 	Set gtmtypes("shmpool_buff_hdr",467,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",467,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_ripsleep_nblks_cntr")=467
-	Set gtmtypes("shmpool_buff_hdr",468,"name")="shmpool_buff_hdr.shadow_file_header.bg_trc_rec_cntr_filler"
-	Set gtmtypes("shmpool_buff_hdr",468,"off")=4144
-	Set gtmtypes("shmpool_buff_hdr",468,"len")=56
-	Set gtmtypes("shmpool_buff_hdr",468,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bg_trc_rec_cntr_filler")=468
-	Set gtmtypes("shmpool_buff_hdr",469,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srches"
-	Set gtmtypes("shmpool_buff_hdr",469,"off")=4200
-	Set gtmtypes("shmpool_buff_hdr",469,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",469,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srches")=469
-	Set gtmtypes("shmpool_buff_hdr",470,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srches.curr_count"
-	Set gtmtypes("shmpool_buff_hdr",470,"off")=4200
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_rip_cntr")=467
+	Set gtmtypes("shmpool_buff_hdr",468,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_in_tend_cntr"
+	Set gtmtypes("shmpool_buff_hdr",468,"off")=4108
+	Set gtmtypes("shmpool_buff_hdr",468,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",468,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_in_tend_cntr")=468
+	Set gtmtypes("shmpool_buff_hdr",469,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_search_blk_cntr"
+	Set gtmtypes("shmpool_buff_hdr",469,"off")=4112
+	Set gtmtypes("shmpool_buff_hdr",469,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",469,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_search_blk_cntr")=469
+	Set gtmtypes("shmpool_buff_hdr",470,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_new_rec_cntr"
+	Set gtmtypes("shmpool_buff_hdr",470,"off")=4116
 	Set gtmtypes("shmpool_buff_hdr",470,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",470,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srches.curr_count")=470
-	Set gtmtypes("shmpool_buff_hdr",471,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srches.cumul_count"
-	Set gtmtypes("shmpool_buff_hdr",471,"off")=4204
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_new_rec_cntr")=470
+	Set gtmtypes("shmpool_buff_hdr",471,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_rec_size_cntr"
+	Set gtmtypes("shmpool_buff_hdr",471,"off")=4120
 	Set gtmtypes("shmpool_buff_hdr",471,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",471,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srches.cumul_count")=471
-	Set gtmtypes("shmpool_buff_hdr",472,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srch_clues"
-	Set gtmtypes("shmpool_buff_hdr",472,"off")=4208
-	Set gtmtypes("shmpool_buff_hdr",472,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",472,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srch_clues")=472
-	Set gtmtypes("shmpool_buff_hdr",473,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srch_clues.curr_count"
-	Set gtmtypes("shmpool_buff_hdr",473,"off")=4208
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_rec_size_cntr")=471
+	Set gtmtypes("shmpool_buff_hdr",472,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_rec_cmpc_cntr"
+	Set gtmtypes("shmpool_buff_hdr",472,"off")=4124
+	Set gtmtypes("shmpool_buff_hdr",472,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",472,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_rec_cmpc_cntr")=472
+	Set gtmtypes("shmpool_buff_hdr",473,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_blk_fini_cntr"
+	Set gtmtypes("shmpool_buff_hdr",473,"off")=4128
 	Set gtmtypes("shmpool_buff_hdr",473,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",473,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srch_clues.curr_count")=473
-	Set gtmtypes("shmpool_buff_hdr",474,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srch_clues.cumul_count"
-	Set gtmtypes("shmpool_buff_hdr",474,"off")=4212
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_blk_fini_cntr")=473
+	Set gtmtypes("shmpool_buff_hdr",474,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_blk_split_cntr"
+	Set gtmtypes("shmpool_buff_hdr",474,"off")=4132
 	Set gtmtypes("shmpool_buff_hdr",474,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",474,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srch_clues.cumul_count")=474
-	Set gtmtypes("shmpool_buff_hdr",475,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_head"
-	Set gtmtypes("shmpool_buff_hdr",475,"off")=4216
-	Set gtmtypes("shmpool_buff_hdr",475,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",475,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_head")=475
-	Set gtmtypes("shmpool_buff_hdr",476,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_head.curr_count"
-	Set gtmtypes("shmpool_buff_hdr",476,"off")=4216
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_blk_split_cntr")=474
+	Set gtmtypes("shmpool_buff_hdr",475,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_ripsleep_cnt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",475,"off")=4136
+	Set gtmtypes("shmpool_buff_hdr",475,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",475,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_ripsleep_cnt_cntr")=475
+	Set gtmtypes("shmpool_buff_hdr",476,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_ripsleep_nblks_cntr"
+	Set gtmtypes("shmpool_buff_hdr",476,"off")=4140
 	Set gtmtypes("shmpool_buff_hdr",476,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",476,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_head.curr_count")=476
-	Set gtmtypes("shmpool_buff_hdr",477,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_head.cumul_count"
-	Set gtmtypes("shmpool_buff_hdr",477,"off")=4220
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_ripsleep_nblks_cntr")=476
+	Set gtmtypes("shmpool_buff_hdr",477,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wtfini_invoked_cntr"
+	Set gtmtypes("shmpool_buff_hdr",477,"off")=4144
 	Set gtmtypes("shmpool_buff_hdr",477,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",477,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_head.cumul_count")=477
-	Set gtmtypes("shmpool_buff_hdr",478,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_same"
-	Set gtmtypes("shmpool_buff_hdr",478,"off")=4224
-	Set gtmtypes("shmpool_buff_hdr",478,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",478,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_same")=478
-	Set gtmtypes("shmpool_buff_hdr",479,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_same.curr_count"
-	Set gtmtypes("shmpool_buff_hdr",479,"off")=4224
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wtfini_invoked_cntr")=477
+	Set gtmtypes("shmpool_buff_hdr",478,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wterror_invoked_cntr"
+	Set gtmtypes("shmpool_buff_hdr",478,"off")=4148
+	Set gtmtypes("shmpool_buff_hdr",478,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",478,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wterror_invoked_cntr")=478
+	Set gtmtypes("shmpool_buff_hdr",479,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wt_restart_invoked_cntr"
+	Set gtmtypes("shmpool_buff_hdr",479,"off")=4152
 	Set gtmtypes("shmpool_buff_hdr",479,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",479,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_same.curr_count")=479
-	Set gtmtypes("shmpool_buff_hdr",480,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_same.cumul_count"
-	Set gtmtypes("shmpool_buff_hdr",480,"off")=4228
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wt_restart_invoked_cntr")=479
+	Set gtmtypes("shmpool_buff_hdr",480,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wt_restart_eagain_cntr"
+	Set gtmtypes("shmpool_buff_hdr",480,"off")=4156
 	Set gtmtypes("shmpool_buff_hdr",480,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",480,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_same.cumul_count")=480
-	Set gtmtypes("shmpool_buff_hdr",481,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_tail"
-	Set gtmtypes("shmpool_buff_hdr",481,"off")=4232
-	Set gtmtypes("shmpool_buff_hdr",481,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",481,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_tail")=481
-	Set gtmtypes("shmpool_buff_hdr",482,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_tail.curr_count"
-	Set gtmtypes("shmpool_buff_hdr",482,"off")=4232
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wt_restart_eagain_cntr")=480
+	Set gtmtypes("shmpool_buff_hdr",481,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wt_restart_reinsert_cntr"
+	Set gtmtypes("shmpool_buff_hdr",481,"off")=4160
+	Set gtmtypes("shmpool_buff_hdr",481,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",481,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wt_restart_reinsert_cntr")=481
+	Set gtmtypes("shmpool_buff_hdr",482,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wtstart_eagain_cntr"
+	Set gtmtypes("shmpool_buff_hdr",482,"off")=4164
 	Set gtmtypes("shmpool_buff_hdr",482,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",482,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_tail.curr_count")=482
-	Set gtmtypes("shmpool_buff_hdr",483,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_tail.cumul_count"
-	Set gtmtypes("shmpool_buff_hdr",483,"off")=4236
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wtstart_eagain_cntr")=482
+	Set gtmtypes("shmpool_buff_hdr",483,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wtstart_eagain_incrit_cntr"
+	Set gtmtypes("shmpool_buff_hdr",483,"off")=4168
 	Set gtmtypes("shmpool_buff_hdr",483,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",483,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_tail.cumul_count")=483
-	Set gtmtypes("shmpool_buff_hdr",484,"name")="shmpool_buff_hdr.shadow_file_header.n_t_qreads"
-	Set gtmtypes("shmpool_buff_hdr",484,"off")=4240
-	Set gtmtypes("shmpool_buff_hdr",484,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",484,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_t_qreads")=484
-	Set gtmtypes("shmpool_buff_hdr",485,"name")="shmpool_buff_hdr.shadow_file_header.n_t_qreads.curr_count"
-	Set gtmtypes("shmpool_buff_hdr",485,"off")=4240
-	Set gtmtypes("shmpool_buff_hdr",485,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",485,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_t_qreads.curr_count")=485
-	Set gtmtypes("shmpool_buff_hdr",486,"name")="shmpool_buff_hdr.shadow_file_header.n_t_qreads.cumul_count"
-	Set gtmtypes("shmpool_buff_hdr",486,"off")=4244
-	Set gtmtypes("shmpool_buff_hdr",486,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",486,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_t_qreads.cumul_count")=486
-	Set gtmtypes("shmpool_buff_hdr",487,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_reads"
-	Set gtmtypes("shmpool_buff_hdr",487,"off")=4248
-	Set gtmtypes("shmpool_buff_hdr",487,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",487,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_reads")=487
-	Set gtmtypes("shmpool_buff_hdr",488,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_reads.curr_count"
-	Set gtmtypes("shmpool_buff_hdr",488,"off")=4248
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wtstart_eagain_incrit_cntr")=483
+	Set gtmtypes("shmpool_buff_hdr",484,"name")="shmpool_buff_hdr.shadow_file_header.async_restart_eagain_cntr"
+	Set gtmtypes("shmpool_buff_hdr",484,"off")=4172
+	Set gtmtypes("shmpool_buff_hdr",484,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",484,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.async_restart_eagain_cntr")=484
+	Set gtmtypes("shmpool_buff_hdr",485,"name")="shmpool_buff_hdr.shadow_file_header.bg_trc_rec_cntr_filler"
+	Set gtmtypes("shmpool_buff_hdr",485,"off")=4176
+	Set gtmtypes("shmpool_buff_hdr",485,"len")=24
+	Set gtmtypes("shmpool_buff_hdr",485,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bg_trc_rec_cntr_filler")=485
+	Set gtmtypes("shmpool_buff_hdr",486,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srches"
+	Set gtmtypes("shmpool_buff_hdr",486,"off")=4200
+	Set gtmtypes("shmpool_buff_hdr",486,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",486,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srches")=486
+	Set gtmtypes("shmpool_buff_hdr",487,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srches.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",487,"off")=4200
+	Set gtmtypes("shmpool_buff_hdr",487,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",487,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srches.curr_count")=487
+	Set gtmtypes("shmpool_buff_hdr",488,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srches.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",488,"off")=4204
 	Set gtmtypes("shmpool_buff_hdr",488,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",488,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_reads.curr_count")=488
-	Set gtmtypes("shmpool_buff_hdr",489,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_reads.cumul_count"
-	Set gtmtypes("shmpool_buff_hdr",489,"off")=4252
-	Set gtmtypes("shmpool_buff_hdr",489,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",489,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_reads.cumul_count")=489
-	Set gtmtypes("shmpool_buff_hdr",490,"name")="shmpool_buff_hdr.shadow_file_header.n_bgmm_updates"
-	Set gtmtypes("shmpool_buff_hdr",490,"off")=4256
-	Set gtmtypes("shmpool_buff_hdr",490,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",490,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bgmm_updates")=490
-	Set gtmtypes("shmpool_buff_hdr",491,"name")="shmpool_buff_hdr.shadow_file_header.n_bgmm_updates.curr_count"
-	Set gtmtypes("shmpool_buff_hdr",491,"off")=4256
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srches.cumul_count")=488
+	Set gtmtypes("shmpool_buff_hdr",489,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srch_clues"
+	Set gtmtypes("shmpool_buff_hdr",489,"off")=4208
+	Set gtmtypes("shmpool_buff_hdr",489,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",489,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srch_clues")=489
+	Set gtmtypes("shmpool_buff_hdr",490,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srch_clues.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",490,"off")=4208
+	Set gtmtypes("shmpool_buff_hdr",490,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",490,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srch_clues.curr_count")=490
+	Set gtmtypes("shmpool_buff_hdr",491,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srch_clues.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",491,"off")=4212
 	Set gtmtypes("shmpool_buff_hdr",491,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",491,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bgmm_updates.curr_count")=491
-	Set gtmtypes("shmpool_buff_hdr",492,"name")="shmpool_buff_hdr.shadow_file_header.n_bgmm_updates.cumul_count"
-	Set gtmtypes("shmpool_buff_hdr",492,"off")=4260
-	Set gtmtypes("shmpool_buff_hdr",492,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",492,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bgmm_updates.cumul_count")=492
-	Set gtmtypes("shmpool_buff_hdr",493,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_writes"
-	Set gtmtypes("shmpool_buff_hdr",493,"off")=4264
-	Set gtmtypes("shmpool_buff_hdr",493,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",493,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_writes")=493
-	Set gtmtypes("shmpool_buff_hdr",494,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_writes.curr_count"
-	Set gtmtypes("shmpool_buff_hdr",494,"off")=4264
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srch_clues.cumul_count")=491
+	Set gtmtypes("shmpool_buff_hdr",492,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_head"
+	Set gtmtypes("shmpool_buff_hdr",492,"off")=4216
+	Set gtmtypes("shmpool_buff_hdr",492,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",492,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_head")=492
+	Set gtmtypes("shmpool_buff_hdr",493,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_head.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",493,"off")=4216
+	Set gtmtypes("shmpool_buff_hdr",493,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",493,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_head.curr_count")=493
+	Set gtmtypes("shmpool_buff_hdr",494,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_head.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",494,"off")=4220
 	Set gtmtypes("shmpool_buff_hdr",494,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",494,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_writes.curr_count")=494
-	Set gtmtypes("shmpool_buff_hdr",495,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_writes.cumul_count"
-	Set gtmtypes("shmpool_buff_hdr",495,"off")=4268
-	Set gtmtypes("shmpool_buff_hdr",495,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",495,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_writes.cumul_count")=495
-	Set gtmtypes("shmpool_buff_hdr",496,"name")="shmpool_buff_hdr.shadow_file_header.n_bg_update_creates"
-	Set gtmtypes("shmpool_buff_hdr",496,"off")=4272
-	Set gtmtypes("shmpool_buff_hdr",496,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",496,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bg_update_creates")=496
-	Set gtmtypes("shmpool_buff_hdr",497,"name")="shmpool_buff_hdr.shadow_file_header.n_bg_update_creates.curr_count"
-	Set gtmtypes("shmpool_buff_hdr",497,"off")=4272
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_head.cumul_count")=494
+	Set gtmtypes("shmpool_buff_hdr",495,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_same"
+	Set gtmtypes("shmpool_buff_hdr",495,"off")=4224
+	Set gtmtypes("shmpool_buff_hdr",495,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",495,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_same")=495
+	Set gtmtypes("shmpool_buff_hdr",496,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_same.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",496,"off")=4224
+	Set gtmtypes("shmpool_buff_hdr",496,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",496,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_same.curr_count")=496
+	Set gtmtypes("shmpool_buff_hdr",497,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_same.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",497,"off")=4228
 	Set gtmtypes("shmpool_buff_hdr",497,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",497,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bg_update_creates.curr_count")=497
-	Set gtmtypes("shmpool_buff_hdr",498,"name")="shmpool_buff_hdr.shadow_file_header.n_bg_update_creates.cumul_count"
-	Set gtmtypes("shmpool_buff_hdr",498,"off")=4276
-	Set gtmtypes("shmpool_buff_hdr",498,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",498,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bg_update_creates.cumul_count")=498
-	Set gtmtypes("shmpool_buff_hdr",499,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getns"
-	Set gtmtypes("shmpool_buff_hdr",499,"off")=4280
-	Set gtmtypes("shmpool_buff_hdr",499,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",499,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getns")=499
-	Set gtmtypes("shmpool_buff_hdr",500,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getns.curr_count"
-	Set gtmtypes("shmpool_buff_hdr",500,"off")=4280
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_same.cumul_count")=497
+	Set gtmtypes("shmpool_buff_hdr",498,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_tail"
+	Set gtmtypes("shmpool_buff_hdr",498,"off")=4232
+	Set gtmtypes("shmpool_buff_hdr",498,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",498,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_tail")=498
+	Set gtmtypes("shmpool_buff_hdr",499,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_tail.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",499,"off")=4232
+	Set gtmtypes("shmpool_buff_hdr",499,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",499,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_tail.curr_count")=499
+	Set gtmtypes("shmpool_buff_hdr",500,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_tail.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",500,"off")=4236
 	Set gtmtypes("shmpool_buff_hdr",500,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",500,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getns.curr_count")=500
-	Set gtmtypes("shmpool_buff_hdr",501,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getns.cumul_count"
-	Set gtmtypes("shmpool_buff_hdr",501,"off")=4284
-	Set gtmtypes("shmpool_buff_hdr",501,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",501,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getns.cumul_count")=501
-	Set gtmtypes("shmpool_buff_hdr",502,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getn_lcnt"
-	Set gtmtypes("shmpool_buff_hdr",502,"off")=4288
-	Set gtmtypes("shmpool_buff_hdr",502,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",502,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getn_lcnt")=502
-	Set gtmtypes("shmpool_buff_hdr",503,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getn_lcnt.curr_count"
-	Set gtmtypes("shmpool_buff_hdr",503,"off")=4288
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_tail.cumul_count")=500
+	Set gtmtypes("shmpool_buff_hdr",501,"name")="shmpool_buff_hdr.shadow_file_header.n_t_qreads"
+	Set gtmtypes("shmpool_buff_hdr",501,"off")=4240
+	Set gtmtypes("shmpool_buff_hdr",501,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",501,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_t_qreads")=501
+	Set gtmtypes("shmpool_buff_hdr",502,"name")="shmpool_buff_hdr.shadow_file_header.n_t_qreads.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",502,"off")=4240
+	Set gtmtypes("shmpool_buff_hdr",502,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",502,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_t_qreads.curr_count")=502
+	Set gtmtypes("shmpool_buff_hdr",503,"name")="shmpool_buff_hdr.shadow_file_header.n_t_qreads.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",503,"off")=4244
 	Set gtmtypes("shmpool_buff_hdr",503,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",503,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getn_lcnt.curr_count")=503
-	Set gtmtypes("shmpool_buff_hdr",504,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getn_lcnt.cumul_count"
-	Set gtmtypes("shmpool_buff_hdr",504,"off")=4292
-	Set gtmtypes("shmpool_buff_hdr",504,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",504,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getn_lcnt.cumul_count")=504
-	Set gtmtypes("shmpool_buff_hdr",505,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_acct_rec_filler_4k"
-	Set gtmtypes("shmpool_buff_hdr",505,"off")=4296
-	Set gtmtypes("shmpool_buff_hdr",505,"len")=152
-	Set gtmtypes("shmpool_buff_hdr",505,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_acct_rec_filler_4k")=505
-	Set gtmtypes("shmpool_buff_hdr",506,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec"
-	Set gtmtypes("shmpool_buff_hdr",506,"off")=4448
-	Set gtmtypes("shmpool_buff_hdr",506,"len")=464
-	Set gtmtypes("shmpool_buff_hdr",506,"type")="gvstats_rec_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec")=506
-	Set gtmtypes("shmpool_buff_hdr",507,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_set"
-	Set gtmtypes("shmpool_buff_hdr",507,"off")=4448
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_t_qreads.cumul_count")=503
+	Set gtmtypes("shmpool_buff_hdr",504,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_reads"
+	Set gtmtypes("shmpool_buff_hdr",504,"off")=4248
+	Set gtmtypes("shmpool_buff_hdr",504,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",504,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_reads")=504
+	Set gtmtypes("shmpool_buff_hdr",505,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_reads.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",505,"off")=4248
+	Set gtmtypes("shmpool_buff_hdr",505,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",505,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_reads.curr_count")=505
+	Set gtmtypes("shmpool_buff_hdr",506,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_reads.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",506,"off")=4252
+	Set gtmtypes("shmpool_buff_hdr",506,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",506,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_reads.cumul_count")=506
+	Set gtmtypes("shmpool_buff_hdr",507,"name")="shmpool_buff_hdr.shadow_file_header.n_bgmm_updates"
+	Set gtmtypes("shmpool_buff_hdr",507,"off")=4256
 	Set gtmtypes("shmpool_buff_hdr",507,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",507,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_set")=507
-	Set gtmtypes("shmpool_buff_hdr",508,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_kill"
-	Set gtmtypes("shmpool_buff_hdr",508,"off")=4456
-	Set gtmtypes("shmpool_buff_hdr",508,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",508,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_kill")=508
-	Set gtmtypes("shmpool_buff_hdr",509,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_get"
-	Set gtmtypes("shmpool_buff_hdr",509,"off")=4464
-	Set gtmtypes("shmpool_buff_hdr",509,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",509,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_get")=509
-	Set gtmtypes("shmpool_buff_hdr",510,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_data"
-	Set gtmtypes("shmpool_buff_hdr",510,"off")=4472
+	Set gtmtypes("shmpool_buff_hdr",507,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bgmm_updates")=507
+	Set gtmtypes("shmpool_buff_hdr",508,"name")="shmpool_buff_hdr.shadow_file_header.n_bgmm_updates.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",508,"off")=4256
+	Set gtmtypes("shmpool_buff_hdr",508,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",508,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bgmm_updates.curr_count")=508
+	Set gtmtypes("shmpool_buff_hdr",509,"name")="shmpool_buff_hdr.shadow_file_header.n_bgmm_updates.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",509,"off")=4260
+	Set gtmtypes("shmpool_buff_hdr",509,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",509,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bgmm_updates.cumul_count")=509
+	Set gtmtypes("shmpool_buff_hdr",510,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_writes"
+	Set gtmtypes("shmpool_buff_hdr",510,"off")=4264
 	Set gtmtypes("shmpool_buff_hdr",510,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",510,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_data")=510
-	Set gtmtypes("shmpool_buff_hdr",511,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_order"
-	Set gtmtypes("shmpool_buff_hdr",511,"off")=4480
-	Set gtmtypes("shmpool_buff_hdr",511,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",511,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_order")=511
-	Set gtmtypes("shmpool_buff_hdr",512,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_zprev"
-	Set gtmtypes("shmpool_buff_hdr",512,"off")=4488
-	Set gtmtypes("shmpool_buff_hdr",512,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",512,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_zprev")=512
-	Set gtmtypes("shmpool_buff_hdr",513,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_query"
-	Set gtmtypes("shmpool_buff_hdr",513,"off")=4496
+	Set gtmtypes("shmpool_buff_hdr",510,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_writes")=510
+	Set gtmtypes("shmpool_buff_hdr",511,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_writes.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",511,"off")=4264
+	Set gtmtypes("shmpool_buff_hdr",511,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",511,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_writes.curr_count")=511
+	Set gtmtypes("shmpool_buff_hdr",512,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_writes.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",512,"off")=4268
+	Set gtmtypes("shmpool_buff_hdr",512,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",512,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_writes.cumul_count")=512
+	Set gtmtypes("shmpool_buff_hdr",513,"name")="shmpool_buff_hdr.shadow_file_header.n_bg_update_creates"
+	Set gtmtypes("shmpool_buff_hdr",513,"off")=4272
 	Set gtmtypes("shmpool_buff_hdr",513,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",513,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_query")=513
-	Set gtmtypes("shmpool_buff_hdr",514,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_lock_success"
-	Set gtmtypes("shmpool_buff_hdr",514,"off")=4504
-	Set gtmtypes("shmpool_buff_hdr",514,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",514,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_lock_success")=514
-	Set gtmtypes("shmpool_buff_hdr",515,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_lock_fail"
-	Set gtmtypes("shmpool_buff_hdr",515,"off")=4512
-	Set gtmtypes("shmpool_buff_hdr",515,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",515,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_lock_fail")=515
-	Set gtmtypes("shmpool_buff_hdr",516,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.db_curr_tn"
-	Set gtmtypes("shmpool_buff_hdr",516,"off")=4520
+	Set gtmtypes("shmpool_buff_hdr",513,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bg_update_creates")=513
+	Set gtmtypes("shmpool_buff_hdr",514,"name")="shmpool_buff_hdr.shadow_file_header.n_bg_update_creates.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",514,"off")=4272
+	Set gtmtypes("shmpool_buff_hdr",514,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",514,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bg_update_creates.curr_count")=514
+	Set gtmtypes("shmpool_buff_hdr",515,"name")="shmpool_buff_hdr.shadow_file_header.n_bg_update_creates.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",515,"off")=4276
+	Set gtmtypes("shmpool_buff_hdr",515,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",515,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bg_update_creates.cumul_count")=515
+	Set gtmtypes("shmpool_buff_hdr",516,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getns"
+	Set gtmtypes("shmpool_buff_hdr",516,"off")=4280
 	Set gtmtypes("shmpool_buff_hdr",516,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",516,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.db_curr_tn")=516
-	Set gtmtypes("shmpool_buff_hdr",517,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_dsk_read"
-	Set gtmtypes("shmpool_buff_hdr",517,"off")=4528
-	Set gtmtypes("shmpool_buff_hdr",517,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",517,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_dsk_read")=517
-	Set gtmtypes("shmpool_buff_hdr",518,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_dsk_write"
-	Set gtmtypes("shmpool_buff_hdr",518,"off")=4536
-	Set gtmtypes("shmpool_buff_hdr",518,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",518,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_dsk_write")=518
-	Set gtmtypes("shmpool_buff_hdr",519,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_readwrite"
-	Set gtmtypes("shmpool_buff_hdr",519,"off")=4544
+	Set gtmtypes("shmpool_buff_hdr",516,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getns")=516
+	Set gtmtypes("shmpool_buff_hdr",517,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getns.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",517,"off")=4280
+	Set gtmtypes("shmpool_buff_hdr",517,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",517,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getns.curr_count")=517
+	Set gtmtypes("shmpool_buff_hdr",518,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getns.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",518,"off")=4284
+	Set gtmtypes("shmpool_buff_hdr",518,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",518,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getns.cumul_count")=518
+	Set gtmtypes("shmpool_buff_hdr",519,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getn_lcnt"
+	Set gtmtypes("shmpool_buff_hdr",519,"off")=4288
 	Set gtmtypes("shmpool_buff_hdr",519,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",519,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_readwrite")=519
-	Set gtmtypes("shmpool_buff_hdr",520,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_readonly"
-	Set gtmtypes("shmpool_buff_hdr",520,"off")=4552
-	Set gtmtypes("shmpool_buff_hdr",520,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",520,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_readonly")=520
-	Set gtmtypes("shmpool_buff_hdr",521,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_blkwrite"
-	Set gtmtypes("shmpool_buff_hdr",521,"off")=4560
-	Set gtmtypes("shmpool_buff_hdr",521,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",521,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_blkwrite")=521
-	Set gtmtypes("shmpool_buff_hdr",522,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_blkread"
-	Set gtmtypes("shmpool_buff_hdr",522,"off")=4568
-	Set gtmtypes("shmpool_buff_hdr",522,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",522,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_blkread")=522
-	Set gtmtypes("shmpool_buff_hdr",523,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_retries_0"
-	Set gtmtypes("shmpool_buff_hdr",523,"off")=4576
-	Set gtmtypes("shmpool_buff_hdr",523,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",523,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_retries_0")=523
-	Set gtmtypes("shmpool_buff_hdr",524,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_retries_1"
-	Set gtmtypes("shmpool_buff_hdr",524,"off")=4584
+	Set gtmtypes("shmpool_buff_hdr",519,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getn_lcnt")=519
+	Set gtmtypes("shmpool_buff_hdr",520,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getn_lcnt.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",520,"off")=4288
+	Set gtmtypes("shmpool_buff_hdr",520,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",520,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getn_lcnt.curr_count")=520
+	Set gtmtypes("shmpool_buff_hdr",521,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getn_lcnt.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",521,"off")=4292
+	Set gtmtypes("shmpool_buff_hdr",521,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",521,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getn_lcnt.cumul_count")=521
+	Set gtmtypes("shmpool_buff_hdr",522,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_acct_rec_filler_4k"
+	Set gtmtypes("shmpool_buff_hdr",522,"off")=4296
+	Set gtmtypes("shmpool_buff_hdr",522,"len")=152
+	Set gtmtypes("shmpool_buff_hdr",522,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_acct_rec_filler_4k")=522
+	Set gtmtypes("shmpool_buff_hdr",523,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec"
+	Set gtmtypes("shmpool_buff_hdr",523,"off")=4448
+	Set gtmtypes("shmpool_buff_hdr",523,"len")=472
+	Set gtmtypes("shmpool_buff_hdr",523,"type")="gvstats_rec_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec")=523
+	Set gtmtypes("shmpool_buff_hdr",524,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_set"
+	Set gtmtypes("shmpool_buff_hdr",524,"off")=4448
 	Set gtmtypes("shmpool_buff_hdr",524,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",524,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_retries_1")=524
-	Set gtmtypes("shmpool_buff_hdr",525,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_retries_2"
-	Set gtmtypes("shmpool_buff_hdr",525,"off")=4592
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_set")=524
+	Set gtmtypes("shmpool_buff_hdr",525,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_kill"
+	Set gtmtypes("shmpool_buff_hdr",525,"off")=4456
 	Set gtmtypes("shmpool_buff_hdr",525,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",525,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_retries_2")=525
-	Set gtmtypes("shmpool_buff_hdr",526,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_retries_3"
-	Set gtmtypes("shmpool_buff_hdr",526,"off")=4600
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_kill")=525
+	Set gtmtypes("shmpool_buff_hdr",526,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_get"
+	Set gtmtypes("shmpool_buff_hdr",526,"off")=4464
 	Set gtmtypes("shmpool_buff_hdr",526,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",526,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_retries_3")=526
-	Set gtmtypes("shmpool_buff_hdr",527,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_readwrite"
-	Set gtmtypes("shmpool_buff_hdr",527,"off")=4608
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_get")=526
+	Set gtmtypes("shmpool_buff_hdr",527,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_data"
+	Set gtmtypes("shmpool_buff_hdr",527,"off")=4472
 	Set gtmtypes("shmpool_buff_hdr",527,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",527,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_readwrite")=527
-	Set gtmtypes("shmpool_buff_hdr",528,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_readonly"
-	Set gtmtypes("shmpool_buff_hdr",528,"off")=4616
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_data")=527
+	Set gtmtypes("shmpool_buff_hdr",528,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_order"
+	Set gtmtypes("shmpool_buff_hdr",528,"off")=4480
 	Set gtmtypes("shmpool_buff_hdr",528,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",528,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_readonly")=528
-	Set gtmtypes("shmpool_buff_hdr",529,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_rolledback"
-	Set gtmtypes("shmpool_buff_hdr",529,"off")=4624
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_order")=528
+	Set gtmtypes("shmpool_buff_hdr",529,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_zprev"
+	Set gtmtypes("shmpool_buff_hdr",529,"off")=4488
 	Set gtmtypes("shmpool_buff_hdr",529,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",529,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_rolledback")=529
-	Set gtmtypes("shmpool_buff_hdr",530,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_blkwrite"
-	Set gtmtypes("shmpool_buff_hdr",530,"off")=4632
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_zprev")=529
+	Set gtmtypes("shmpool_buff_hdr",530,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_query"
+	Set gtmtypes("shmpool_buff_hdr",530,"off")=4496
 	Set gtmtypes("shmpool_buff_hdr",530,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",530,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_blkwrite")=530
-	Set gtmtypes("shmpool_buff_hdr",531,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_blkread"
-	Set gtmtypes("shmpool_buff_hdr",531,"off")=4640
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_query")=530
+	Set gtmtypes("shmpool_buff_hdr",531,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_lock_success"
+	Set gtmtypes("shmpool_buff_hdr",531,"off")=4504
 	Set gtmtypes("shmpool_buff_hdr",531,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",531,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_blkread")=531
-	Set gtmtypes("shmpool_buff_hdr",532,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_tot_retries_0"
-	Set gtmtypes("shmpool_buff_hdr",532,"off")=4648
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_lock_success")=531
+	Set gtmtypes("shmpool_buff_hdr",532,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_lock_fail"
+	Set gtmtypes("shmpool_buff_hdr",532,"off")=4512
 	Set gtmtypes("shmpool_buff_hdr",532,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",532,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_tot_retries_0")=532
-	Set gtmtypes("shmpool_buff_hdr",533,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_tot_retries_1"
-	Set gtmtypes("shmpool_buff_hdr",533,"off")=4656
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_lock_fail")=532
+	Set gtmtypes("shmpool_buff_hdr",533,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.db_curr_tn"
+	Set gtmtypes("shmpool_buff_hdr",533,"off")=4520
 	Set gtmtypes("shmpool_buff_hdr",533,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",533,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_tot_retries_1")=533
-	Set gtmtypes("shmpool_buff_hdr",534,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_tot_retries_2"
-	Set gtmtypes("shmpool_buff_hdr",534,"off")=4664
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.db_curr_tn")=533
+	Set gtmtypes("shmpool_buff_hdr",534,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_dsk_read"
+	Set gtmtypes("shmpool_buff_hdr",534,"off")=4528
 	Set gtmtypes("shmpool_buff_hdr",534,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",534,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_tot_retries_2")=534
-	Set gtmtypes("shmpool_buff_hdr",535,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_tot_retries_3"
-	Set gtmtypes("shmpool_buff_hdr",535,"off")=4672
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_dsk_read")=534
+	Set gtmtypes("shmpool_buff_hdr",535,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_dsk_write"
+	Set gtmtypes("shmpool_buff_hdr",535,"off")=4536
 	Set gtmtypes("shmpool_buff_hdr",535,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",535,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_tot_retries_3")=535
-	Set gtmtypes("shmpool_buff_hdr",536,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_tot_retries_4"
-	Set gtmtypes("shmpool_buff_hdr",536,"off")=4680
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_dsk_write")=535
+	Set gtmtypes("shmpool_buff_hdr",536,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_readwrite"
+	Set gtmtypes("shmpool_buff_hdr",536,"off")=4544
 	Set gtmtypes("shmpool_buff_hdr",536,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",536,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_tot_retries_4")=536
-	Set gtmtypes("shmpool_buff_hdr",537,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_0"
-	Set gtmtypes("shmpool_buff_hdr",537,"off")=4688
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_readwrite")=536
+	Set gtmtypes("shmpool_buff_hdr",537,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_readonly"
+	Set gtmtypes("shmpool_buff_hdr",537,"off")=4552
 	Set gtmtypes("shmpool_buff_hdr",537,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",537,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_0")=537
-	Set gtmtypes("shmpool_buff_hdr",538,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_1"
-	Set gtmtypes("shmpool_buff_hdr",538,"off")=4696
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_readonly")=537
+	Set gtmtypes("shmpool_buff_hdr",538,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_blkwrite"
+	Set gtmtypes("shmpool_buff_hdr",538,"off")=4560
 	Set gtmtypes("shmpool_buff_hdr",538,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",538,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_1")=538
-	Set gtmtypes("shmpool_buff_hdr",539,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_2"
-	Set gtmtypes("shmpool_buff_hdr",539,"off")=4704
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_blkwrite")=538
+	Set gtmtypes("shmpool_buff_hdr",539,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_blkread"
+	Set gtmtypes("shmpool_buff_hdr",539,"off")=4568
 	Set gtmtypes("shmpool_buff_hdr",539,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",539,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_2")=539
-	Set gtmtypes("shmpool_buff_hdr",540,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_3"
-	Set gtmtypes("shmpool_buff_hdr",540,"off")=4712
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_blkread")=539
+	Set gtmtypes("shmpool_buff_hdr",540,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_retries_0"
+	Set gtmtypes("shmpool_buff_hdr",540,"off")=4576
 	Set gtmtypes("shmpool_buff_hdr",540,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",540,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_3")=540
-	Set gtmtypes("shmpool_buff_hdr",541,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_4"
-	Set gtmtypes("shmpool_buff_hdr",541,"off")=4720
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_retries_0")=540
+	Set gtmtypes("shmpool_buff_hdr",541,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_retries_1"
+	Set gtmtypes("shmpool_buff_hdr",541,"off")=4584
 	Set gtmtypes("shmpool_buff_hdr",541,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",541,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_4")=541
-	Set gtmtypes("shmpool_buff_hdr",542,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_ztrigger"
-	Set gtmtypes("shmpool_buff_hdr",542,"off")=4728
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_retries_1")=541
+	Set gtmtypes("shmpool_buff_hdr",542,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_retries_2"
+	Set gtmtypes("shmpool_buff_hdr",542,"off")=4592
 	Set gtmtypes("shmpool_buff_hdr",542,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",542,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_ztrigger")=542
-	Set gtmtypes("shmpool_buff_hdr",543,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_db_flush"
-	Set gtmtypes("shmpool_buff_hdr",543,"off")=4736
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_retries_2")=542
+	Set gtmtypes("shmpool_buff_hdr",543,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_retries_3"
+	Set gtmtypes("shmpool_buff_hdr",543,"off")=4600
 	Set gtmtypes("shmpool_buff_hdr",543,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",543,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_db_flush")=543
-	Set gtmtypes("shmpool_buff_hdr",544,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_db_fsync"
-	Set gtmtypes("shmpool_buff_hdr",544,"off")=4744
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_retries_3")=543
+	Set gtmtypes("shmpool_buff_hdr",544,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_readwrite"
+	Set gtmtypes("shmpool_buff_hdr",544,"off")=4608
 	Set gtmtypes("shmpool_buff_hdr",544,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",544,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_db_fsync")=544
-	Set gtmtypes("shmpool_buff_hdr",545,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jnl_flush"
-	Set gtmtypes("shmpool_buff_hdr",545,"off")=4752
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_readwrite")=544
+	Set gtmtypes("shmpool_buff_hdr",545,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_readonly"
+	Set gtmtypes("shmpool_buff_hdr",545,"off")=4616
 	Set gtmtypes("shmpool_buff_hdr",545,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",545,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jnl_flush")=545
-	Set gtmtypes("shmpool_buff_hdr",546,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jnl_fsync"
-	Set gtmtypes("shmpool_buff_hdr",546,"off")=4760
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_readonly")=545
+	Set gtmtypes("shmpool_buff_hdr",546,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_rolledback"
+	Set gtmtypes("shmpool_buff_hdr",546,"off")=4624
 	Set gtmtypes("shmpool_buff_hdr",546,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",546,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jnl_fsync")=546
-	Set gtmtypes("shmpool_buff_hdr",547,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jbuff_bytes"
-	Set gtmtypes("shmpool_buff_hdr",547,"off")=4768
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_rolledback")=546
+	Set gtmtypes("shmpool_buff_hdr",547,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_blkwrite"
+	Set gtmtypes("shmpool_buff_hdr",547,"off")=4632
 	Set gtmtypes("shmpool_buff_hdr",547,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",547,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jbuff_bytes")=547
-	Set gtmtypes("shmpool_buff_hdr",548,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jfile_bytes"
-	Set gtmtypes("shmpool_buff_hdr",548,"off")=4776
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_blkwrite")=547
+	Set gtmtypes("shmpool_buff_hdr",548,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_blkread"
+	Set gtmtypes("shmpool_buff_hdr",548,"off")=4640
 	Set gtmtypes("shmpool_buff_hdr",548,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",548,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jfile_bytes")=548
-	Set gtmtypes("shmpool_buff_hdr",549,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jfile_writes"
-	Set gtmtypes("shmpool_buff_hdr",549,"off")=4784
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_blkread")=548
+	Set gtmtypes("shmpool_buff_hdr",549,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_tot_retries_0"
+	Set gtmtypes("shmpool_buff_hdr",549,"off")=4648
 	Set gtmtypes("shmpool_buff_hdr",549,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",549,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jfile_writes")=549
-	Set gtmtypes("shmpool_buff_hdr",550,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jrec_logical"
-	Set gtmtypes("shmpool_buff_hdr",550,"off")=4792
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_tot_retries_0")=549
+	Set gtmtypes("shmpool_buff_hdr",550,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_tot_retries_1"
+	Set gtmtypes("shmpool_buff_hdr",550,"off")=4656
 	Set gtmtypes("shmpool_buff_hdr",550,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",550,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jrec_logical")=550
-	Set gtmtypes("shmpool_buff_hdr",551,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jrec_pblk"
-	Set gtmtypes("shmpool_buff_hdr",551,"off")=4800
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_tot_retries_1")=550
+	Set gtmtypes("shmpool_buff_hdr",551,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_tot_retries_2"
+	Set gtmtypes("shmpool_buff_hdr",551,"off")=4664
 	Set gtmtypes("shmpool_buff_hdr",551,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",551,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jrec_pblk")=551
-	Set gtmtypes("shmpool_buff_hdr",552,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jrec_epoch_regular"
-	Set gtmtypes("shmpool_buff_hdr",552,"off")=4808
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_tot_retries_2")=551
+	Set gtmtypes("shmpool_buff_hdr",552,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_tot_retries_3"
+	Set gtmtypes("shmpool_buff_hdr",552,"off")=4672
 	Set gtmtypes("shmpool_buff_hdr",552,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",552,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jrec_epoch_regular")=552
-	Set gtmtypes("shmpool_buff_hdr",553,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jrec_epoch_idle"
-	Set gtmtypes("shmpool_buff_hdr",553,"off")=4816
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_tot_retries_3")=552
+	Set gtmtypes("shmpool_buff_hdr",553,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_tot_retries_4"
+	Set gtmtypes("shmpool_buff_hdr",553,"off")=4680
 	Set gtmtypes("shmpool_buff_hdr",553,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",553,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jrec_epoch_idle")=553
-	Set gtmtypes("shmpool_buff_hdr",554,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jrec_other"
-	Set gtmtypes("shmpool_buff_hdr",554,"off")=4824
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_tot_retries_4")=553
+	Set gtmtypes("shmpool_buff_hdr",554,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_0"
+	Set gtmtypes("shmpool_buff_hdr",554,"off")=4688
 	Set gtmtypes("shmpool_buff_hdr",554,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",554,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jrec_other")=554
-	Set gtmtypes("shmpool_buff_hdr",555,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jnl_extends"
-	Set gtmtypes("shmpool_buff_hdr",555,"off")=4832
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_0")=554
+	Set gtmtypes("shmpool_buff_hdr",555,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_1"
+	Set gtmtypes("shmpool_buff_hdr",555,"off")=4696
 	Set gtmtypes("shmpool_buff_hdr",555,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",555,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jnl_extends")=555
-	Set gtmtypes("shmpool_buff_hdr",556,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_db_extends"
-	Set gtmtypes("shmpool_buff_hdr",556,"off")=4840
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_1")=555
+	Set gtmtypes("shmpool_buff_hdr",556,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_2"
+	Set gtmtypes("shmpool_buff_hdr",556,"off")=4704
 	Set gtmtypes("shmpool_buff_hdr",556,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",556,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_db_extends")=556
-	Set gtmtypes("shmpool_buff_hdr",557,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_crit_success"
-	Set gtmtypes("shmpool_buff_hdr",557,"off")=4848
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_2")=556
+	Set gtmtypes("shmpool_buff_hdr",557,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_3"
+	Set gtmtypes("shmpool_buff_hdr",557,"off")=4712
 	Set gtmtypes("shmpool_buff_hdr",557,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",557,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_crit_success")=557
-	Set gtmtypes("shmpool_buff_hdr",558,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_crits_in_epch"
-	Set gtmtypes("shmpool_buff_hdr",558,"off")=4856
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_3")=557
+	Set gtmtypes("shmpool_buff_hdr",558,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_4"
+	Set gtmtypes("shmpool_buff_hdr",558,"off")=4720
 	Set gtmtypes("shmpool_buff_hdr",558,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",558,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_crits_in_epch")=558
-	Set gtmtypes("shmpool_buff_hdr",559,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.sq_crit_failed"
-	Set gtmtypes("shmpool_buff_hdr",559,"off")=4864
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_4")=558
+	Set gtmtypes("shmpool_buff_hdr",559,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_ztrigger"
+	Set gtmtypes("shmpool_buff_hdr",559,"off")=4728
 	Set gtmtypes("shmpool_buff_hdr",559,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",559,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.sq_crit_failed")=559
-	Set gtmtypes("shmpool_buff_hdr",560,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_crit_failed"
-	Set gtmtypes("shmpool_buff_hdr",560,"off")=4872
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_ztrigger")=559
+	Set gtmtypes("shmpool_buff_hdr",560,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_db_flush"
+	Set gtmtypes("shmpool_buff_hdr",560,"off")=4736
 	Set gtmtypes("shmpool_buff_hdr",560,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",560,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_crit_failed")=560
-	Set gtmtypes("shmpool_buff_hdr",561,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.sq_crit_que_slps"
-	Set gtmtypes("shmpool_buff_hdr",561,"off")=4880
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_db_flush")=560
+	Set gtmtypes("shmpool_buff_hdr",561,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_db_fsync"
+	Set gtmtypes("shmpool_buff_hdr",561,"off")=4744
 	Set gtmtypes("shmpool_buff_hdr",561,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",561,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.sq_crit_que_slps")=561
-	Set gtmtypes("shmpool_buff_hdr",562,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_crit_que_slps"
-	Set gtmtypes("shmpool_buff_hdr",562,"off")=4888
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_db_fsync")=561
+	Set gtmtypes("shmpool_buff_hdr",562,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jnl_flush"
+	Set gtmtypes("shmpool_buff_hdr",562,"off")=4752
 	Set gtmtypes("shmpool_buff_hdr",562,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",562,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_crit_que_slps")=562
-	Set gtmtypes("shmpool_buff_hdr",563,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.sq_crit_yields"
-	Set gtmtypes("shmpool_buff_hdr",563,"off")=4896
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jnl_flush")=562
+	Set gtmtypes("shmpool_buff_hdr",563,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jnl_fsync"
+	Set gtmtypes("shmpool_buff_hdr",563,"off")=4760
 	Set gtmtypes("shmpool_buff_hdr",563,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",563,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.sq_crit_yields")=563
-	Set gtmtypes("shmpool_buff_hdr",564,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_crit_yields"
-	Set gtmtypes("shmpool_buff_hdr",564,"off")=4904
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jnl_fsync")=563
+	Set gtmtypes("shmpool_buff_hdr",564,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jbuff_bytes"
+	Set gtmtypes("shmpool_buff_hdr",564,"off")=4768
 	Set gtmtypes("shmpool_buff_hdr",564,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",564,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_crit_yields")=564
-	Set gtmtypes("shmpool_buff_hdr",565,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec_filler_4k_plus_512"
-	Set gtmtypes("shmpool_buff_hdr",565,"off")=4912
-	Set gtmtypes("shmpool_buff_hdr",565,"len")=48
-	Set gtmtypes("shmpool_buff_hdr",565,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec_filler_4k_plus_512")=565
-	Set gtmtypes("shmpool_buff_hdr",566,"name")="shmpool_buff_hdr.shadow_file_header.filler_4k_plus_512"
-	Set gtmtypes("shmpool_buff_hdr",566,"off")=4960
-	Set gtmtypes("shmpool_buff_hdr",566,"len")=368
-	Set gtmtypes("shmpool_buff_hdr",566,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_4k_plus_512")=566
-	Set gtmtypes("shmpool_buff_hdr",567,"name")="shmpool_buff_hdr.shadow_file_header.intrpt_recov_resync_strm_seqno"
-	Set gtmtypes("shmpool_buff_hdr",567,"off")=5328
-	Set gtmtypes("shmpool_buff_hdr",567,"len")=128
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jbuff_bytes")=564
+	Set gtmtypes("shmpool_buff_hdr",565,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jfile_bytes"
+	Set gtmtypes("shmpool_buff_hdr",565,"off")=4776
+	Set gtmtypes("shmpool_buff_hdr",565,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",565,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jfile_bytes")=565
+	Set gtmtypes("shmpool_buff_hdr",566,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jfile_writes"
+	Set gtmtypes("shmpool_buff_hdr",566,"off")=4784
+	Set gtmtypes("shmpool_buff_hdr",566,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",566,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jfile_writes")=566
+	Set gtmtypes("shmpool_buff_hdr",567,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jrec_logical"
+	Set gtmtypes("shmpool_buff_hdr",567,"off")=4792
+	Set gtmtypes("shmpool_buff_hdr",567,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",567,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.intrpt_recov_resync_strm_seqno")=567
-	Set gtmtypes("shmpool_buff_hdr",567,"dim")=16
-	Set gtmtypes("shmpool_buff_hdr",568,"name")="shmpool_buff_hdr.shadow_file_header.creation_db_ver"
-	Set gtmtypes("shmpool_buff_hdr",568,"off")=5456
-	Set gtmtypes("shmpool_buff_hdr",568,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",568,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.creation_db_ver")=568
-	Set gtmtypes("shmpool_buff_hdr",569,"name")="shmpool_buff_hdr.shadow_file_header.creation_mdb_ver"
-	Set gtmtypes("shmpool_buff_hdr",569,"off")=5460
-	Set gtmtypes("shmpool_buff_hdr",569,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",569,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.creation_mdb_ver")=569
-	Set gtmtypes("shmpool_buff_hdr",570,"name")="shmpool_buff_hdr.shadow_file_header.certified_for_upgrade_to"
-	Set gtmtypes("shmpool_buff_hdr",570,"off")=5464
-	Set gtmtypes("shmpool_buff_hdr",570,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",570,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.certified_for_upgrade_to")=570
-	Set gtmtypes("shmpool_buff_hdr",571,"name")="shmpool_buff_hdr.shadow_file_header.filler_5k"
-	Set gtmtypes("shmpool_buff_hdr",571,"off")=5468
-	Set gtmtypes("shmpool_buff_hdr",571,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",571,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_5k")=571
-	Set gtmtypes("shmpool_buff_hdr",572,"name")="shmpool_buff_hdr.shadow_file_header.secshr_ops_index_filler"
-	Set gtmtypes("shmpool_buff_hdr",572,"off")=5472
-	Set gtmtypes("shmpool_buff_hdr",572,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",572,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.secshr_ops_index_filler")=572
-	Set gtmtypes("shmpool_buff_hdr",573,"name")="shmpool_buff_hdr.shadow_file_header.secshr_ops_array_filler"
-	Set gtmtypes("shmpool_buff_hdr",573,"off")=5476
-	Set gtmtypes("shmpool_buff_hdr",573,"len")=1020
-	Set gtmtypes("shmpool_buff_hdr",573,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.secshr_ops_array_filler")=573
-	Set gtmtypes("shmpool_buff_hdr",573,"dim")=255
-	Set gtmtypes("shmpool_buff_hdr",574,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn"
-	Set gtmtypes("shmpool_buff_hdr",574,"off")=6496
-	Set gtmtypes("shmpool_buff_hdr",574,"len")=24
-	Set gtmtypes("shmpool_buff_hdr",574,"type")="compswap_time_field"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn")=574
-	Set gtmtypes("shmpool_buff_hdr",575,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch"
-	Set gtmtypes("shmpool_buff_hdr",575,"off")=6496
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jrec_logical")=567
+	Set gtmtypes("shmpool_buff_hdr",568,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jrec_pblk"
+	Set gtmtypes("shmpool_buff_hdr",568,"off")=4800
+	Set gtmtypes("shmpool_buff_hdr",568,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",568,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jrec_pblk")=568
+	Set gtmtypes("shmpool_buff_hdr",569,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jrec_epoch_regular"
+	Set gtmtypes("shmpool_buff_hdr",569,"off")=4808
+	Set gtmtypes("shmpool_buff_hdr",569,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",569,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jrec_epoch_regular")=569
+	Set gtmtypes("shmpool_buff_hdr",570,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jrec_epoch_idle"
+	Set gtmtypes("shmpool_buff_hdr",570,"off")=4816
+	Set gtmtypes("shmpool_buff_hdr",570,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",570,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jrec_epoch_idle")=570
+	Set gtmtypes("shmpool_buff_hdr",571,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jrec_other"
+	Set gtmtypes("shmpool_buff_hdr",571,"off")=4824
+	Set gtmtypes("shmpool_buff_hdr",571,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",571,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jrec_other")=571
+	Set gtmtypes("shmpool_buff_hdr",572,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jnl_extends"
+	Set gtmtypes("shmpool_buff_hdr",572,"off")=4832
+	Set gtmtypes("shmpool_buff_hdr",572,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",572,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jnl_extends")=572
+	Set gtmtypes("shmpool_buff_hdr",573,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_db_extends"
+	Set gtmtypes("shmpool_buff_hdr",573,"off")=4840
+	Set gtmtypes("shmpool_buff_hdr",573,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",573,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_db_extends")=573
+	Set gtmtypes("shmpool_buff_hdr",574,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_crit_success"
+	Set gtmtypes("shmpool_buff_hdr",574,"off")=4848
+	Set gtmtypes("shmpool_buff_hdr",574,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",574,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_crit_success")=574
+	Set gtmtypes("shmpool_buff_hdr",575,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_crits_in_epch"
+	Set gtmtypes("shmpool_buff_hdr",575,"off")=4856
 	Set gtmtypes("shmpool_buff_hdr",575,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",575,"type")="global_latch_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch")=575
-	Set gtmtypes("shmpool_buff_hdr",576,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch.u"
-	Set gtmtypes("shmpool_buff_hdr",576,"off")=6496
+	Set gtmtypes("shmpool_buff_hdr",575,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_crits_in_epch")=575
+	Set gtmtypes("shmpool_buff_hdr",576,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.sq_crit_failed"
+	Set gtmtypes("shmpool_buff_hdr",576,"off")=4864
 	Set gtmtypes("shmpool_buff_hdr",576,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",576,"type")="union"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch.u")=576
-	Set gtmtypes("shmpool_buff_hdr",577,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch.u.pid_imgcnt"
-	Set gtmtypes("shmpool_buff_hdr",577,"off")=6496
+	Set gtmtypes("shmpool_buff_hdr",576,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.sq_crit_failed")=576
+	Set gtmtypes("shmpool_buff_hdr",577,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_crit_failed"
+	Set gtmtypes("shmpool_buff_hdr",577,"off")=4872
 	Set gtmtypes("shmpool_buff_hdr",577,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",577,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch.u.pid_imgcnt")=577
-	Set gtmtypes("shmpool_buff_hdr",578,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch.u.parts"
-	Set gtmtypes("shmpool_buff_hdr",578,"off")=6496
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_crit_failed")=577
+	Set gtmtypes("shmpool_buff_hdr",578,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.sq_crit_que_slps"
+	Set gtmtypes("shmpool_buff_hdr",578,"off")=4880
 	Set gtmtypes("shmpool_buff_hdr",578,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",578,"type")="struct"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch.u.parts")=578
-	Set gtmtypes("shmpool_buff_hdr",579,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_pid"
-	Set gtmtypes("shmpool_buff_hdr",579,"off")=6496
-	Set gtmtypes("shmpool_buff_hdr",579,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",579,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_pid")=579
-	Set gtmtypes("shmpool_buff_hdr",580,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_word"
-	Set gtmtypes("shmpool_buff_hdr",580,"off")=6500
-	Set gtmtypes("shmpool_buff_hdr",580,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",580,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_word")=580
-	Set gtmtypes("shmpool_buff_hdr",581,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.hp_latch_space"
-	Set gtmtypes("shmpool_buff_hdr",581,"off")=6504
-	Set gtmtypes("shmpool_buff_hdr",581,"len")=16
-	Set gtmtypes("shmpool_buff_hdr",581,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.hp_latch_space")=581
-	Set gtmtypes("shmpool_buff_hdr",581,"dim")=4
-	Set gtmtypes("shmpool_buff_hdr",582,"name")="shmpool_buff_hdr.shadow_file_header.is_encrypted"
-	Set gtmtypes("shmpool_buff_hdr",582,"off")=6520
-	Set gtmtypes("shmpool_buff_hdr",582,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",582,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.is_encrypted")=582
-	Set gtmtypes("shmpool_buff_hdr",583,"name")="shmpool_buff_hdr.shadow_file_header.db_trigger_cycle"
-	Set gtmtypes("shmpool_buff_hdr",583,"off")=6524
-	Set gtmtypes("shmpool_buff_hdr",583,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",583,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_trigger_cycle")=583
-	Set gtmtypes("shmpool_buff_hdr",584,"name")="shmpool_buff_hdr.shadow_file_header.strm_reg_seqno"
-	Set gtmtypes("shmpool_buff_hdr",584,"off")=6528
-	Set gtmtypes("shmpool_buff_hdr",584,"len")=128
-	Set gtmtypes("shmpool_buff_hdr",584,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.strm_reg_seqno")=584
-	Set gtmtypes("shmpool_buff_hdr",584,"dim")=16
-	Set gtmtypes("shmpool_buff_hdr",585,"name")="shmpool_buff_hdr.shadow_file_header.save_strm_reg_seqno"
-	Set gtmtypes("shmpool_buff_hdr",585,"off")=6656
+	Set gtmtypes("shmpool_buff_hdr",578,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.sq_crit_que_slps")=578
+	Set gtmtypes("shmpool_buff_hdr",579,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_crit_que_slps"
+	Set gtmtypes("shmpool_buff_hdr",579,"off")=4888
+	Set gtmtypes("shmpool_buff_hdr",579,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",579,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_crit_que_slps")=579
+	Set gtmtypes("shmpool_buff_hdr",580,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.sq_crit_yields"
+	Set gtmtypes("shmpool_buff_hdr",580,"off")=4896
+	Set gtmtypes("shmpool_buff_hdr",580,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",580,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.sq_crit_yields")=580
+	Set gtmtypes("shmpool_buff_hdr",581,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_crit_yields"
+	Set gtmtypes("shmpool_buff_hdr",581,"off")=4904
+	Set gtmtypes("shmpool_buff_hdr",581,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",581,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_crit_yields")=581
+	Set gtmtypes("shmpool_buff_hdr",582,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_clean2dirty"
+	Set gtmtypes("shmpool_buff_hdr",582,"off")=4912
+	Set gtmtypes("shmpool_buff_hdr",582,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",582,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_clean2dirty")=582
+	Set gtmtypes("shmpool_buff_hdr",583,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec_filler_4k_plus_512"
+	Set gtmtypes("shmpool_buff_hdr",583,"off")=4920
+	Set gtmtypes("shmpool_buff_hdr",583,"len")=40
+	Set gtmtypes("shmpool_buff_hdr",583,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec_filler_4k_plus_512")=583
+	Set gtmtypes("shmpool_buff_hdr",584,"name")="shmpool_buff_hdr.shadow_file_header.filler_4k_plus_512"
+	Set gtmtypes("shmpool_buff_hdr",584,"off")=4960
+	Set gtmtypes("shmpool_buff_hdr",584,"len")=368
+	Set gtmtypes("shmpool_buff_hdr",584,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_4k_plus_512")=584
+	Set gtmtypes("shmpool_buff_hdr",585,"name")="shmpool_buff_hdr.shadow_file_header.intrpt_recov_resync_strm_seqno"
+	Set gtmtypes("shmpool_buff_hdr",585,"off")=5328
 	Set gtmtypes("shmpool_buff_hdr",585,"len")=128
 	Set gtmtypes("shmpool_buff_hdr",585,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.save_strm_reg_seqno")=585
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.intrpt_recov_resync_strm_seqno")=585
 	Set gtmtypes("shmpool_buff_hdr",585,"dim")=16
-	Set gtmtypes("shmpool_buff_hdr",586,"name")="shmpool_buff_hdr.shadow_file_header.freeze_on_fail"
-	Set gtmtypes("shmpool_buff_hdr",586,"off")=6784
+	Set gtmtypes("shmpool_buff_hdr",586,"name")="shmpool_buff_hdr.shadow_file_header.creation_db_ver"
+	Set gtmtypes("shmpool_buff_hdr",586,"off")=5456
 	Set gtmtypes("shmpool_buff_hdr",586,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",586,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.freeze_on_fail")=586
-	Set gtmtypes("shmpool_buff_hdr",587,"name")="shmpool_buff_hdr.shadow_file_header.span_node_absent"
-	Set gtmtypes("shmpool_buff_hdr",587,"off")=6788
+	Set gtmtypes("shmpool_buff_hdr",586,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.creation_db_ver")=586
+	Set gtmtypes("shmpool_buff_hdr",587,"name")="shmpool_buff_hdr.shadow_file_header.creation_mdb_ver"
+	Set gtmtypes("shmpool_buff_hdr",587,"off")=5460
 	Set gtmtypes("shmpool_buff_hdr",587,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",587,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.span_node_absent")=587
-	Set gtmtypes("shmpool_buff_hdr",588,"name")="shmpool_buff_hdr.shadow_file_header.maxkeysz_assured"
-	Set gtmtypes("shmpool_buff_hdr",588,"off")=6792
+	Set gtmtypes("shmpool_buff_hdr",587,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.creation_mdb_ver")=587
+	Set gtmtypes("shmpool_buff_hdr",588,"name")="shmpool_buff_hdr.shadow_file_header.certified_for_upgrade_to"
+	Set gtmtypes("shmpool_buff_hdr",588,"off")=5464
 	Set gtmtypes("shmpool_buff_hdr",588,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",588,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.maxkeysz_assured")=588
-	Set gtmtypes("shmpool_buff_hdr",589,"name")="shmpool_buff_hdr.shadow_file_header.hasht_upgrade_needed"
-	Set gtmtypes("shmpool_buff_hdr",589,"off")=6796
+	Set gtmtypes("shmpool_buff_hdr",588,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.certified_for_upgrade_to")=588
+	Set gtmtypes("shmpool_buff_hdr",589,"name")="shmpool_buff_hdr.shadow_file_header.filler_5k"
+	Set gtmtypes("shmpool_buff_hdr",589,"off")=5468
 	Set gtmtypes("shmpool_buff_hdr",589,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",589,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.hasht_upgrade_needed")=589
-	Set gtmtypes("shmpool_buff_hdr",590,"name")="shmpool_buff_hdr.shadow_file_header.defer_allocate"
-	Set gtmtypes("shmpool_buff_hdr",590,"off")=6800
+	Set gtmtypes("shmpool_buff_hdr",589,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_5k")=589
+	Set gtmtypes("shmpool_buff_hdr",590,"name")="shmpool_buff_hdr.shadow_file_header.secshr_ops_index_filler"
+	Set gtmtypes("shmpool_buff_hdr",590,"off")=5472
 	Set gtmtypes("shmpool_buff_hdr",590,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",590,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.defer_allocate")=590
-	Set gtmtypes("shmpool_buff_hdr",591,"name")="shmpool_buff_hdr.shadow_file_header.filler_ftok_counter_halted"
-	Set gtmtypes("shmpool_buff_hdr",591,"off")=6804
-	Set gtmtypes("shmpool_buff_hdr",591,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",591,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_ftok_counter_halted")=591
-	Set gtmtypes("shmpool_buff_hdr",592,"name")="shmpool_buff_hdr.shadow_file_header.filler_access_counter_halted"
-	Set gtmtypes("shmpool_buff_hdr",592,"off")=6808
-	Set gtmtypes("shmpool_buff_hdr",592,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",592,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_access_counter_halted")=592
-	Set gtmtypes("shmpool_buff_hdr",593,"name")="shmpool_buff_hdr.shadow_file_header.filler_7k"
-	Set gtmtypes("shmpool_buff_hdr",593,"off")=6812
-	Set gtmtypes("shmpool_buff_hdr",593,"len")=708
-	Set gtmtypes("shmpool_buff_hdr",593,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_7k")=593
-	Set gtmtypes("shmpool_buff_hdr",594,"name")="shmpool_buff_hdr.shadow_file_header.filler_8k"
-	Set gtmtypes("shmpool_buff_hdr",594,"off")=7520
-	Set gtmtypes("shmpool_buff_hdr",594,"len")=1024
-	Set gtmtypes("shmpool_buff_hdr",594,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_8k")=594
+	Set gtmtypes("shmpool_buff_hdr",590,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.secshr_ops_index_filler")=590
+	Set gtmtypes("shmpool_buff_hdr",591,"name")="shmpool_buff_hdr.shadow_file_header.secshr_ops_array_filler"
+	Set gtmtypes("shmpool_buff_hdr",591,"off")=5476
+	Set gtmtypes("shmpool_buff_hdr",591,"len")=1020
+	Set gtmtypes("shmpool_buff_hdr",591,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.secshr_ops_array_filler")=591
+	Set gtmtypes("shmpool_buff_hdr",591,"dim")=255
+	Set gtmtypes("shmpool_buff_hdr",592,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn"
+	Set gtmtypes("shmpool_buff_hdr",592,"off")=6496
+	Set gtmtypes("shmpool_buff_hdr",592,"len")=24
+	Set gtmtypes("shmpool_buff_hdr",592,"type")="compswap_time_field"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn")=592
+	Set gtmtypes("shmpool_buff_hdr",593,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch"
+	Set gtmtypes("shmpool_buff_hdr",593,"off")=6496
+	Set gtmtypes("shmpool_buff_hdr",593,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",593,"type")="global_latch_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch")=593
+	Set gtmtypes("shmpool_buff_hdr",594,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch.u"
+	Set gtmtypes("shmpool_buff_hdr",594,"off")=6496
+	Set gtmtypes("shmpool_buff_hdr",594,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",594,"type")="union"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch.u")=594
+	Set gtmtypes("shmpool_buff_hdr",595,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch.u.pid_imgcnt"
+	Set gtmtypes("shmpool_buff_hdr",595,"off")=6496
+	Set gtmtypes("shmpool_buff_hdr",595,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",595,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch.u.pid_imgcnt")=595
+	Set gtmtypes("shmpool_buff_hdr",596,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch.u.parts"
+	Set gtmtypes("shmpool_buff_hdr",596,"off")=6496
+	Set gtmtypes("shmpool_buff_hdr",596,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",596,"type")="struct"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch.u.parts")=596
+	Set gtmtypes("shmpool_buff_hdr",597,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_pid"
+	Set gtmtypes("shmpool_buff_hdr",597,"off")=6496
+	Set gtmtypes("shmpool_buff_hdr",597,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",597,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_pid")=597
+	Set gtmtypes("shmpool_buff_hdr",598,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_word"
+	Set gtmtypes("shmpool_buff_hdr",598,"off")=6500
+	Set gtmtypes("shmpool_buff_hdr",598,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",598,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_word")=598
+	Set gtmtypes("shmpool_buff_hdr",599,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.hp_latch_space"
+	Set gtmtypes("shmpool_buff_hdr",599,"off")=6504
+	Set gtmtypes("shmpool_buff_hdr",599,"len")=16
+	Set gtmtypes("shmpool_buff_hdr",599,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.hp_latch_space")=599
+	Set gtmtypes("shmpool_buff_hdr",599,"dim")=4
+	Set gtmtypes("shmpool_buff_hdr",600,"name")="shmpool_buff_hdr.shadow_file_header.is_encrypted"
+	Set gtmtypes("shmpool_buff_hdr",600,"off")=6520
+	Set gtmtypes("shmpool_buff_hdr",600,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",600,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.is_encrypted")=600
+	Set gtmtypes("shmpool_buff_hdr",601,"name")="shmpool_buff_hdr.shadow_file_header.db_trigger_cycle"
+	Set gtmtypes("shmpool_buff_hdr",601,"off")=6524
+	Set gtmtypes("shmpool_buff_hdr",601,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",601,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_trigger_cycle")=601
+	Set gtmtypes("shmpool_buff_hdr",602,"name")="shmpool_buff_hdr.shadow_file_header.strm_reg_seqno"
+	Set gtmtypes("shmpool_buff_hdr",602,"off")=6528
+	Set gtmtypes("shmpool_buff_hdr",602,"len")=128
+	Set gtmtypes("shmpool_buff_hdr",602,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.strm_reg_seqno")=602
+	Set gtmtypes("shmpool_buff_hdr",602,"dim")=16
+	Set gtmtypes("shmpool_buff_hdr",603,"name")="shmpool_buff_hdr.shadow_file_header.save_strm_reg_seqno"
+	Set gtmtypes("shmpool_buff_hdr",603,"off")=6656
+	Set gtmtypes("shmpool_buff_hdr",603,"len")=128
+	Set gtmtypes("shmpool_buff_hdr",603,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.save_strm_reg_seqno")=603
+	Set gtmtypes("shmpool_buff_hdr",603,"dim")=16
+	Set gtmtypes("shmpool_buff_hdr",604,"name")="shmpool_buff_hdr.shadow_file_header.freeze_on_fail"
+	Set gtmtypes("shmpool_buff_hdr",604,"off")=6784
+	Set gtmtypes("shmpool_buff_hdr",604,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",604,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.freeze_on_fail")=604
+	Set gtmtypes("shmpool_buff_hdr",605,"name")="shmpool_buff_hdr.shadow_file_header.span_node_absent"
+	Set gtmtypes("shmpool_buff_hdr",605,"off")=6788
+	Set gtmtypes("shmpool_buff_hdr",605,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",605,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.span_node_absent")=605
+	Set gtmtypes("shmpool_buff_hdr",606,"name")="shmpool_buff_hdr.shadow_file_header.maxkeysz_assured"
+	Set gtmtypes("shmpool_buff_hdr",606,"off")=6792
+	Set gtmtypes("shmpool_buff_hdr",606,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",606,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.maxkeysz_assured")=606
+	Set gtmtypes("shmpool_buff_hdr",607,"name")="shmpool_buff_hdr.shadow_file_header.hasht_upgrade_needed"
+	Set gtmtypes("shmpool_buff_hdr",607,"off")=6796
+	Set gtmtypes("shmpool_buff_hdr",607,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",607,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.hasht_upgrade_needed")=607
+	Set gtmtypes("shmpool_buff_hdr",608,"name")="shmpool_buff_hdr.shadow_file_header.defer_allocate"
+	Set gtmtypes("shmpool_buff_hdr",608,"off")=6800
+	Set gtmtypes("shmpool_buff_hdr",608,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",608,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.defer_allocate")=608
+	Set gtmtypes("shmpool_buff_hdr",609,"name")="shmpool_buff_hdr.shadow_file_header.filler_ftok_counter_halted"
+	Set gtmtypes("shmpool_buff_hdr",609,"off")=6804
+	Set gtmtypes("shmpool_buff_hdr",609,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",609,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_ftok_counter_halted")=609
+	Set gtmtypes("shmpool_buff_hdr",610,"name")="shmpool_buff_hdr.shadow_file_header.filler_access_counter_halted"
+	Set gtmtypes("shmpool_buff_hdr",610,"off")=6808
+	Set gtmtypes("shmpool_buff_hdr",610,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",610,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_access_counter_halted")=610
+	Set gtmtypes("shmpool_buff_hdr",611,"name")="shmpool_buff_hdr.shadow_file_header.lock_crit_with_db"
+	Set gtmtypes("shmpool_buff_hdr",611,"off")=6812
+	Set gtmtypes("shmpool_buff_hdr",611,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",611,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.lock_crit_with_db")=611
+	Set gtmtypes("shmpool_buff_hdr",612,"name")="shmpool_buff_hdr.shadow_file_header.basedb_fname_len"
+	Set gtmtypes("shmpool_buff_hdr",612,"off")=6816
+	Set gtmtypes("shmpool_buff_hdr",612,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",612,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.basedb_fname_len")=612
+	Set gtmtypes("shmpool_buff_hdr",613,"name")="shmpool_buff_hdr.shadow_file_header.basedb_fname"
+	Set gtmtypes("shmpool_buff_hdr",613,"off")=6820
+	Set gtmtypes("shmpool_buff_hdr",613,"len")=256
+	Set gtmtypes("shmpool_buff_hdr",613,"type")="unsigned-char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.basedb_fname")=613
+	Set gtmtypes("shmpool_buff_hdr",614,"name")="shmpool_buff_hdr.shadow_file_header.filler_7k"
+	Set gtmtypes("shmpool_buff_hdr",614,"off")=7076
+	Set gtmtypes("shmpool_buff_hdr",614,"len")=444
+	Set gtmtypes("shmpool_buff_hdr",614,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_7k")=614
+	Set gtmtypes("shmpool_buff_hdr",615,"name")="shmpool_buff_hdr.shadow_file_header.filler_8k"
+	Set gtmtypes("shmpool_buff_hdr",615,"off")=7520
+	Set gtmtypes("shmpool_buff_hdr",615,"len")=1024
+	Set gtmtypes("shmpool_buff_hdr",615,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_8k")=615
 	;
 	Set gtmtypes("show_reply")="struct"
 	Set gtmtypes("show_reply",0)=2
@@ -36415,8 +37181,8 @@ Init
 	Set gtmtypfldindx("span_subs","b_sec")=3
 	;
 	Set gtmtypes("spdesc")="struct"
-	Set gtmtypes("spdesc",0)=5
-	Set gtmtypes("spdesc","len")=20
+	Set gtmtypes("spdesc",0)=6
+	Set gtmtypes("spdesc","len")=24
 	Set gtmtypes("spdesc",1,"name")="spdesc.base"
 	Set gtmtypes("spdesc",1,"off")=0
 	Set gtmtypes("spdesc",1,"len")=4
@@ -36442,6 +37208,11 @@ Init
 	Set gtmtypes("spdesc",5,"len")=1
 	Set gtmtypes("spdesc",5,"type")="unsigned-char"
 	Set gtmtypfldindx("spdesc","prvprt")=5
+	Set gtmtypes("spdesc",6,"name")="spdesc.invokestpgcollevel"
+	Set gtmtypes("spdesc",6,"off")=20
+	Set gtmtypes("spdesc",6,"len")=4
+	Set gtmtypes("spdesc",6,"type")="addr"
+	Set gtmtypfldindx("spdesc","invokestpgcollevel")=6
 	;
 	Set gtmtypes("src_line_struct")="struct"
 	Set gtmtypes("src_line_struct",0)=8
@@ -36763,6 +37534,25 @@ Init
 	Set gtmtypes("stack_frame",14,"type")="addr"
 	Set gtmtypfldindx("stack_frame","ret_value")=14
 	;
+	Set gtmtypes("statsDB_deferred_init_que_elem")="struct"
+	Set gtmtypes("statsDB_deferred_init_que_elem",0)=3
+	Set gtmtypes("statsDB_deferred_init_que_elem","len")=12
+	Set gtmtypes("statsDB_deferred_init_que_elem",1,"name")="statsDB_deferred_init_que_elem.next"
+	Set gtmtypes("statsDB_deferred_init_que_elem",1,"off")=0
+	Set gtmtypes("statsDB_deferred_init_que_elem",1,"len")=4
+	Set gtmtypes("statsDB_deferred_init_que_elem",1,"type")="addr"
+	Set gtmtypfldindx("statsDB_deferred_init_que_elem","next")=1
+	Set gtmtypes("statsDB_deferred_init_que_elem",2,"name")="statsDB_deferred_init_que_elem.baseDBreg"
+	Set gtmtypes("statsDB_deferred_init_que_elem",2,"off")=4
+	Set gtmtypes("statsDB_deferred_init_que_elem",2,"len")=4
+	Set gtmtypes("statsDB_deferred_init_que_elem",2,"type")="addr"
+	Set gtmtypfldindx("statsDB_deferred_init_que_elem","baseDBreg")=2
+	Set gtmtypes("statsDB_deferred_init_que_elem",3,"name")="statsDB_deferred_init_que_elem.statsDBreg"
+	Set gtmtypes("statsDB_deferred_init_que_elem",3,"off")=8
+	Set gtmtypes("statsDB_deferred_init_que_elem",3,"len")=4
+	Set gtmtypes("statsDB_deferred_init_que_elem",3,"type")="addr"
+	Set gtmtypfldindx("statsDB_deferred_init_que_elem","statsDBreg")=3
+	;
 	Set gtmtypes("storElem")="struct"
 	Set gtmtypes("storElem",0)=10
 	Set gtmtypes("storElem","len")=16
@@ -39246,11 +40036,11 @@ Init
 	Set gtmtypfldindx("unique_file_id","file_id")=5
 	;
 	Set gtmtypes("unix_db_info")="struct"
-	Set gtmtypes("unix_db_info",0)=156
-	Set gtmtypes("unix_db_info","len")=876
+	Set gtmtypes("unix_db_info",0)=169
+	Set gtmtypes("unix_db_info","len")=932
 	Set gtmtypes("unix_db_info",1,"name")="unix_db_info.s_addrs"
 	Set gtmtypes("unix_db_info",1,"off")=0
-	Set gtmtypes("unix_db_info",1,"len")=816
+	Set gtmtypes("unix_db_info",1,"len")=864
 	Set gtmtypes("unix_db_info",1,"type")="sgmnt_addrs"
 	Set gtmtypfldindx("unix_db_info","s_addrs")=1
 	Set gtmtypes("unix_db_info",2,"name")="unix_db_info.s_addrs.hdr"
@@ -39410,626 +40200,691 @@ Init
 	Set gtmtypes("unix_db_info",32,"len")=4
 	Set gtmtypes("unix_db_info",32,"type")="addr"
 	Set gtmtypfldindx("unix_db_info","s_addrs.acc_meth.bg.fill1")=32
-	Set gtmtypes("unix_db_info",33,"name")="unix_db_info.s_addrs.gvstats_rec"
+	Set gtmtypes("unix_db_info",33,"name")="unix_db_info.s_addrs.gvstats_rec_p"
 	Set gtmtypes("unix_db_info",33,"off")=116
-	Set gtmtypes("unix_db_info",33,"len")=464
-	Set gtmtypes("unix_db_info",33,"type")="gvstats_rec_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec")=33
-	Set gtmtypes("unix_db_info",34,"name")="unix_db_info.s_addrs.gvstats_rec.n_set"
-	Set gtmtypes("unix_db_info",34,"off")=116
-	Set gtmtypes("unix_db_info",34,"len")=8
-	Set gtmtypes("unix_db_info",34,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_set")=34
-	Set gtmtypes("unix_db_info",35,"name")="unix_db_info.s_addrs.gvstats_rec.n_kill"
-	Set gtmtypes("unix_db_info",35,"off")=124
+	Set gtmtypes("unix_db_info",33,"len")=4
+	Set gtmtypes("unix_db_info",33,"type")="addr"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec_p")=33
+	Set gtmtypes("unix_db_info",34,"name")="unix_db_info.s_addrs.gvstats_rec"
+	Set gtmtypes("unix_db_info",34,"off")=120
+	Set gtmtypes("unix_db_info",34,"len")=472
+	Set gtmtypes("unix_db_info",34,"type")="gvstats_rec_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec")=34
+	Set gtmtypes("unix_db_info",35,"name")="unix_db_info.s_addrs.gvstats_rec.n_set"
+	Set gtmtypes("unix_db_info",35,"off")=120
 	Set gtmtypes("unix_db_info",35,"len")=8
 	Set gtmtypes("unix_db_info",35,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_kill")=35
-	Set gtmtypes("unix_db_info",36,"name")="unix_db_info.s_addrs.gvstats_rec.n_get"
-	Set gtmtypes("unix_db_info",36,"off")=132
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_set")=35
+	Set gtmtypes("unix_db_info",36,"name")="unix_db_info.s_addrs.gvstats_rec.n_kill"
+	Set gtmtypes("unix_db_info",36,"off")=128
 	Set gtmtypes("unix_db_info",36,"len")=8
 	Set gtmtypes("unix_db_info",36,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_get")=36
-	Set gtmtypes("unix_db_info",37,"name")="unix_db_info.s_addrs.gvstats_rec.n_data"
-	Set gtmtypes("unix_db_info",37,"off")=140
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_kill")=36
+	Set gtmtypes("unix_db_info",37,"name")="unix_db_info.s_addrs.gvstats_rec.n_get"
+	Set gtmtypes("unix_db_info",37,"off")=136
 	Set gtmtypes("unix_db_info",37,"len")=8
 	Set gtmtypes("unix_db_info",37,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_data")=37
-	Set gtmtypes("unix_db_info",38,"name")="unix_db_info.s_addrs.gvstats_rec.n_order"
-	Set gtmtypes("unix_db_info",38,"off")=148
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_get")=37
+	Set gtmtypes("unix_db_info",38,"name")="unix_db_info.s_addrs.gvstats_rec.n_data"
+	Set gtmtypes("unix_db_info",38,"off")=144
 	Set gtmtypes("unix_db_info",38,"len")=8
 	Set gtmtypes("unix_db_info",38,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_order")=38
-	Set gtmtypes("unix_db_info",39,"name")="unix_db_info.s_addrs.gvstats_rec.n_zprev"
-	Set gtmtypes("unix_db_info",39,"off")=156
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_data")=38
+	Set gtmtypes("unix_db_info",39,"name")="unix_db_info.s_addrs.gvstats_rec.n_order"
+	Set gtmtypes("unix_db_info",39,"off")=152
 	Set gtmtypes("unix_db_info",39,"len")=8
 	Set gtmtypes("unix_db_info",39,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_zprev")=39
-	Set gtmtypes("unix_db_info",40,"name")="unix_db_info.s_addrs.gvstats_rec.n_query"
-	Set gtmtypes("unix_db_info",40,"off")=164
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_order")=39
+	Set gtmtypes("unix_db_info",40,"name")="unix_db_info.s_addrs.gvstats_rec.n_zprev"
+	Set gtmtypes("unix_db_info",40,"off")=160
 	Set gtmtypes("unix_db_info",40,"len")=8
 	Set gtmtypes("unix_db_info",40,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_query")=40
-	Set gtmtypes("unix_db_info",41,"name")="unix_db_info.s_addrs.gvstats_rec.n_lock_success"
-	Set gtmtypes("unix_db_info",41,"off")=172
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_zprev")=40
+	Set gtmtypes("unix_db_info",41,"name")="unix_db_info.s_addrs.gvstats_rec.n_query"
+	Set gtmtypes("unix_db_info",41,"off")=168
 	Set gtmtypes("unix_db_info",41,"len")=8
 	Set gtmtypes("unix_db_info",41,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_lock_success")=41
-	Set gtmtypes("unix_db_info",42,"name")="unix_db_info.s_addrs.gvstats_rec.n_lock_fail"
-	Set gtmtypes("unix_db_info",42,"off")=180
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_query")=41
+	Set gtmtypes("unix_db_info",42,"name")="unix_db_info.s_addrs.gvstats_rec.n_lock_success"
+	Set gtmtypes("unix_db_info",42,"off")=176
 	Set gtmtypes("unix_db_info",42,"len")=8
 	Set gtmtypes("unix_db_info",42,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_lock_fail")=42
-	Set gtmtypes("unix_db_info",43,"name")="unix_db_info.s_addrs.gvstats_rec.db_curr_tn"
-	Set gtmtypes("unix_db_info",43,"off")=188
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_lock_success")=42
+	Set gtmtypes("unix_db_info",43,"name")="unix_db_info.s_addrs.gvstats_rec.n_lock_fail"
+	Set gtmtypes("unix_db_info",43,"off")=184
 	Set gtmtypes("unix_db_info",43,"len")=8
 	Set gtmtypes("unix_db_info",43,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.db_curr_tn")=43
-	Set gtmtypes("unix_db_info",44,"name")="unix_db_info.s_addrs.gvstats_rec.n_dsk_read"
-	Set gtmtypes("unix_db_info",44,"off")=196
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_lock_fail")=43
+	Set gtmtypes("unix_db_info",44,"name")="unix_db_info.s_addrs.gvstats_rec.db_curr_tn"
+	Set gtmtypes("unix_db_info",44,"off")=192
 	Set gtmtypes("unix_db_info",44,"len")=8
 	Set gtmtypes("unix_db_info",44,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_dsk_read")=44
-	Set gtmtypes("unix_db_info",45,"name")="unix_db_info.s_addrs.gvstats_rec.n_dsk_write"
-	Set gtmtypes("unix_db_info",45,"off")=204
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.db_curr_tn")=44
+	Set gtmtypes("unix_db_info",45,"name")="unix_db_info.s_addrs.gvstats_rec.n_dsk_read"
+	Set gtmtypes("unix_db_info",45,"off")=200
 	Set gtmtypes("unix_db_info",45,"len")=8
 	Set gtmtypes("unix_db_info",45,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_dsk_write")=45
-	Set gtmtypes("unix_db_info",46,"name")="unix_db_info.s_addrs.gvstats_rec.n_nontp_readwrite"
-	Set gtmtypes("unix_db_info",46,"off")=212
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_dsk_read")=45
+	Set gtmtypes("unix_db_info",46,"name")="unix_db_info.s_addrs.gvstats_rec.n_dsk_write"
+	Set gtmtypes("unix_db_info",46,"off")=208
 	Set gtmtypes("unix_db_info",46,"len")=8
 	Set gtmtypes("unix_db_info",46,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_nontp_readwrite")=46
-	Set gtmtypes("unix_db_info",47,"name")="unix_db_info.s_addrs.gvstats_rec.n_nontp_readonly"
-	Set gtmtypes("unix_db_info",47,"off")=220
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_dsk_write")=46
+	Set gtmtypes("unix_db_info",47,"name")="unix_db_info.s_addrs.gvstats_rec.n_nontp_readwrite"
+	Set gtmtypes("unix_db_info",47,"off")=216
 	Set gtmtypes("unix_db_info",47,"len")=8
 	Set gtmtypes("unix_db_info",47,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_nontp_readonly")=47
-	Set gtmtypes("unix_db_info",48,"name")="unix_db_info.s_addrs.gvstats_rec.n_nontp_blkwrite"
-	Set gtmtypes("unix_db_info",48,"off")=228
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_nontp_readwrite")=47
+	Set gtmtypes("unix_db_info",48,"name")="unix_db_info.s_addrs.gvstats_rec.n_nontp_readonly"
+	Set gtmtypes("unix_db_info",48,"off")=224
 	Set gtmtypes("unix_db_info",48,"len")=8
 	Set gtmtypes("unix_db_info",48,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_nontp_blkwrite")=48
-	Set gtmtypes("unix_db_info",49,"name")="unix_db_info.s_addrs.gvstats_rec.n_nontp_blkread"
-	Set gtmtypes("unix_db_info",49,"off")=236
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_nontp_readonly")=48
+	Set gtmtypes("unix_db_info",49,"name")="unix_db_info.s_addrs.gvstats_rec.n_nontp_blkwrite"
+	Set gtmtypes("unix_db_info",49,"off")=232
 	Set gtmtypes("unix_db_info",49,"len")=8
 	Set gtmtypes("unix_db_info",49,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_nontp_blkread")=49
-	Set gtmtypes("unix_db_info",50,"name")="unix_db_info.s_addrs.gvstats_rec.n_nontp_retries_0"
-	Set gtmtypes("unix_db_info",50,"off")=244
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_nontp_blkwrite")=49
+	Set gtmtypes("unix_db_info",50,"name")="unix_db_info.s_addrs.gvstats_rec.n_nontp_blkread"
+	Set gtmtypes("unix_db_info",50,"off")=240
 	Set gtmtypes("unix_db_info",50,"len")=8
 	Set gtmtypes("unix_db_info",50,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_nontp_retries_0")=50
-	Set gtmtypes("unix_db_info",51,"name")="unix_db_info.s_addrs.gvstats_rec.n_nontp_retries_1"
-	Set gtmtypes("unix_db_info",51,"off")=252
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_nontp_blkread")=50
+	Set gtmtypes("unix_db_info",51,"name")="unix_db_info.s_addrs.gvstats_rec.n_nontp_retries_0"
+	Set gtmtypes("unix_db_info",51,"off")=248
 	Set gtmtypes("unix_db_info",51,"len")=8
 	Set gtmtypes("unix_db_info",51,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_nontp_retries_1")=51
-	Set gtmtypes("unix_db_info",52,"name")="unix_db_info.s_addrs.gvstats_rec.n_nontp_retries_2"
-	Set gtmtypes("unix_db_info",52,"off")=260
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_nontp_retries_0")=51
+	Set gtmtypes("unix_db_info",52,"name")="unix_db_info.s_addrs.gvstats_rec.n_nontp_retries_1"
+	Set gtmtypes("unix_db_info",52,"off")=256
 	Set gtmtypes("unix_db_info",52,"len")=8
 	Set gtmtypes("unix_db_info",52,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_nontp_retries_2")=52
-	Set gtmtypes("unix_db_info",53,"name")="unix_db_info.s_addrs.gvstats_rec.n_nontp_retries_3"
-	Set gtmtypes("unix_db_info",53,"off")=268
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_nontp_retries_1")=52
+	Set gtmtypes("unix_db_info",53,"name")="unix_db_info.s_addrs.gvstats_rec.n_nontp_retries_2"
+	Set gtmtypes("unix_db_info",53,"off")=264
 	Set gtmtypes("unix_db_info",53,"len")=8
 	Set gtmtypes("unix_db_info",53,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_nontp_retries_3")=53
-	Set gtmtypes("unix_db_info",54,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_readwrite"
-	Set gtmtypes("unix_db_info",54,"off")=276
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_nontp_retries_2")=53
+	Set gtmtypes("unix_db_info",54,"name")="unix_db_info.s_addrs.gvstats_rec.n_nontp_retries_3"
+	Set gtmtypes("unix_db_info",54,"off")=272
 	Set gtmtypes("unix_db_info",54,"len")=8
 	Set gtmtypes("unix_db_info",54,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_readwrite")=54
-	Set gtmtypes("unix_db_info",55,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_readonly"
-	Set gtmtypes("unix_db_info",55,"off")=284
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_nontp_retries_3")=54
+	Set gtmtypes("unix_db_info",55,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_readwrite"
+	Set gtmtypes("unix_db_info",55,"off")=280
 	Set gtmtypes("unix_db_info",55,"len")=8
 	Set gtmtypes("unix_db_info",55,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_readonly")=55
-	Set gtmtypes("unix_db_info",56,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_rolledback"
-	Set gtmtypes("unix_db_info",56,"off")=292
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_readwrite")=55
+	Set gtmtypes("unix_db_info",56,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_readonly"
+	Set gtmtypes("unix_db_info",56,"off")=288
 	Set gtmtypes("unix_db_info",56,"len")=8
 	Set gtmtypes("unix_db_info",56,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_rolledback")=56
-	Set gtmtypes("unix_db_info",57,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_blkwrite"
-	Set gtmtypes("unix_db_info",57,"off")=300
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_readonly")=56
+	Set gtmtypes("unix_db_info",57,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_rolledback"
+	Set gtmtypes("unix_db_info",57,"off")=296
 	Set gtmtypes("unix_db_info",57,"len")=8
 	Set gtmtypes("unix_db_info",57,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_blkwrite")=57
-	Set gtmtypes("unix_db_info",58,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_blkread"
-	Set gtmtypes("unix_db_info",58,"off")=308
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_rolledback")=57
+	Set gtmtypes("unix_db_info",58,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_blkwrite"
+	Set gtmtypes("unix_db_info",58,"off")=304
 	Set gtmtypes("unix_db_info",58,"len")=8
 	Set gtmtypes("unix_db_info",58,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_blkread")=58
-	Set gtmtypes("unix_db_info",59,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_tot_retries_0"
-	Set gtmtypes("unix_db_info",59,"off")=316
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_blkwrite")=58
+	Set gtmtypes("unix_db_info",59,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_blkread"
+	Set gtmtypes("unix_db_info",59,"off")=312
 	Set gtmtypes("unix_db_info",59,"len")=8
 	Set gtmtypes("unix_db_info",59,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_tot_retries_0")=59
-	Set gtmtypes("unix_db_info",60,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_tot_retries_1"
-	Set gtmtypes("unix_db_info",60,"off")=324
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_blkread")=59
+	Set gtmtypes("unix_db_info",60,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_tot_retries_0"
+	Set gtmtypes("unix_db_info",60,"off")=320
 	Set gtmtypes("unix_db_info",60,"len")=8
 	Set gtmtypes("unix_db_info",60,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_tot_retries_1")=60
-	Set gtmtypes("unix_db_info",61,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_tot_retries_2"
-	Set gtmtypes("unix_db_info",61,"off")=332
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_tot_retries_0")=60
+	Set gtmtypes("unix_db_info",61,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_tot_retries_1"
+	Set gtmtypes("unix_db_info",61,"off")=328
 	Set gtmtypes("unix_db_info",61,"len")=8
 	Set gtmtypes("unix_db_info",61,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_tot_retries_2")=61
-	Set gtmtypes("unix_db_info",62,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_tot_retries_3"
-	Set gtmtypes("unix_db_info",62,"off")=340
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_tot_retries_1")=61
+	Set gtmtypes("unix_db_info",62,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_tot_retries_2"
+	Set gtmtypes("unix_db_info",62,"off")=336
 	Set gtmtypes("unix_db_info",62,"len")=8
 	Set gtmtypes("unix_db_info",62,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_tot_retries_3")=62
-	Set gtmtypes("unix_db_info",63,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_tot_retries_4"
-	Set gtmtypes("unix_db_info",63,"off")=348
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_tot_retries_2")=62
+	Set gtmtypes("unix_db_info",63,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_tot_retries_3"
+	Set gtmtypes("unix_db_info",63,"off")=344
 	Set gtmtypes("unix_db_info",63,"len")=8
 	Set gtmtypes("unix_db_info",63,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_tot_retries_4")=63
-	Set gtmtypes("unix_db_info",64,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_cnflct_retries_0"
-	Set gtmtypes("unix_db_info",64,"off")=356
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_tot_retries_3")=63
+	Set gtmtypes("unix_db_info",64,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_tot_retries_4"
+	Set gtmtypes("unix_db_info",64,"off")=352
 	Set gtmtypes("unix_db_info",64,"len")=8
 	Set gtmtypes("unix_db_info",64,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_cnflct_retries_0")=64
-	Set gtmtypes("unix_db_info",65,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_cnflct_retries_1"
-	Set gtmtypes("unix_db_info",65,"off")=364
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_tot_retries_4")=64
+	Set gtmtypes("unix_db_info",65,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_cnflct_retries_0"
+	Set gtmtypes("unix_db_info",65,"off")=360
 	Set gtmtypes("unix_db_info",65,"len")=8
 	Set gtmtypes("unix_db_info",65,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_cnflct_retries_1")=65
-	Set gtmtypes("unix_db_info",66,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_cnflct_retries_2"
-	Set gtmtypes("unix_db_info",66,"off")=372
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_cnflct_retries_0")=65
+	Set gtmtypes("unix_db_info",66,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_cnflct_retries_1"
+	Set gtmtypes("unix_db_info",66,"off")=368
 	Set gtmtypes("unix_db_info",66,"len")=8
 	Set gtmtypes("unix_db_info",66,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_cnflct_retries_2")=66
-	Set gtmtypes("unix_db_info",67,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_cnflct_retries_3"
-	Set gtmtypes("unix_db_info",67,"off")=380
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_cnflct_retries_1")=66
+	Set gtmtypes("unix_db_info",67,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_cnflct_retries_2"
+	Set gtmtypes("unix_db_info",67,"off")=376
 	Set gtmtypes("unix_db_info",67,"len")=8
 	Set gtmtypes("unix_db_info",67,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_cnflct_retries_3")=67
-	Set gtmtypes("unix_db_info",68,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_cnflct_retries_4"
-	Set gtmtypes("unix_db_info",68,"off")=388
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_cnflct_retries_2")=67
+	Set gtmtypes("unix_db_info",68,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_cnflct_retries_3"
+	Set gtmtypes("unix_db_info",68,"off")=384
 	Set gtmtypes("unix_db_info",68,"len")=8
 	Set gtmtypes("unix_db_info",68,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_cnflct_retries_4")=68
-	Set gtmtypes("unix_db_info",69,"name")="unix_db_info.s_addrs.gvstats_rec.n_ztrigger"
-	Set gtmtypes("unix_db_info",69,"off")=396
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_cnflct_retries_3")=68
+	Set gtmtypes("unix_db_info",69,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_cnflct_retries_4"
+	Set gtmtypes("unix_db_info",69,"off")=392
 	Set gtmtypes("unix_db_info",69,"len")=8
 	Set gtmtypes("unix_db_info",69,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_ztrigger")=69
-	Set gtmtypes("unix_db_info",70,"name")="unix_db_info.s_addrs.gvstats_rec.n_db_flush"
-	Set gtmtypes("unix_db_info",70,"off")=404
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_cnflct_retries_4")=69
+	Set gtmtypes("unix_db_info",70,"name")="unix_db_info.s_addrs.gvstats_rec.n_ztrigger"
+	Set gtmtypes("unix_db_info",70,"off")=400
 	Set gtmtypes("unix_db_info",70,"len")=8
 	Set gtmtypes("unix_db_info",70,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_db_flush")=70
-	Set gtmtypes("unix_db_info",71,"name")="unix_db_info.s_addrs.gvstats_rec.n_db_fsync"
-	Set gtmtypes("unix_db_info",71,"off")=412
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_ztrigger")=70
+	Set gtmtypes("unix_db_info",71,"name")="unix_db_info.s_addrs.gvstats_rec.n_db_flush"
+	Set gtmtypes("unix_db_info",71,"off")=408
 	Set gtmtypes("unix_db_info",71,"len")=8
 	Set gtmtypes("unix_db_info",71,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_db_fsync")=71
-	Set gtmtypes("unix_db_info",72,"name")="unix_db_info.s_addrs.gvstats_rec.n_jnl_flush"
-	Set gtmtypes("unix_db_info",72,"off")=420
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_db_flush")=71
+	Set gtmtypes("unix_db_info",72,"name")="unix_db_info.s_addrs.gvstats_rec.n_db_fsync"
+	Set gtmtypes("unix_db_info",72,"off")=416
 	Set gtmtypes("unix_db_info",72,"len")=8
 	Set gtmtypes("unix_db_info",72,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jnl_flush")=72
-	Set gtmtypes("unix_db_info",73,"name")="unix_db_info.s_addrs.gvstats_rec.n_jnl_fsync"
-	Set gtmtypes("unix_db_info",73,"off")=428
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_db_fsync")=72
+	Set gtmtypes("unix_db_info",73,"name")="unix_db_info.s_addrs.gvstats_rec.n_jnl_flush"
+	Set gtmtypes("unix_db_info",73,"off")=424
 	Set gtmtypes("unix_db_info",73,"len")=8
 	Set gtmtypes("unix_db_info",73,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jnl_fsync")=73
-	Set gtmtypes("unix_db_info",74,"name")="unix_db_info.s_addrs.gvstats_rec.n_jbuff_bytes"
-	Set gtmtypes("unix_db_info",74,"off")=436
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jnl_flush")=73
+	Set gtmtypes("unix_db_info",74,"name")="unix_db_info.s_addrs.gvstats_rec.n_jnl_fsync"
+	Set gtmtypes("unix_db_info",74,"off")=432
 	Set gtmtypes("unix_db_info",74,"len")=8
 	Set gtmtypes("unix_db_info",74,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jbuff_bytes")=74
-	Set gtmtypes("unix_db_info",75,"name")="unix_db_info.s_addrs.gvstats_rec.n_jfile_bytes"
-	Set gtmtypes("unix_db_info",75,"off")=444
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jnl_fsync")=74
+	Set gtmtypes("unix_db_info",75,"name")="unix_db_info.s_addrs.gvstats_rec.n_jbuff_bytes"
+	Set gtmtypes("unix_db_info",75,"off")=440
 	Set gtmtypes("unix_db_info",75,"len")=8
 	Set gtmtypes("unix_db_info",75,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jfile_bytes")=75
-	Set gtmtypes("unix_db_info",76,"name")="unix_db_info.s_addrs.gvstats_rec.n_jfile_writes"
-	Set gtmtypes("unix_db_info",76,"off")=452
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jbuff_bytes")=75
+	Set gtmtypes("unix_db_info",76,"name")="unix_db_info.s_addrs.gvstats_rec.n_jfile_bytes"
+	Set gtmtypes("unix_db_info",76,"off")=448
 	Set gtmtypes("unix_db_info",76,"len")=8
 	Set gtmtypes("unix_db_info",76,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jfile_writes")=76
-	Set gtmtypes("unix_db_info",77,"name")="unix_db_info.s_addrs.gvstats_rec.n_jrec_logical"
-	Set gtmtypes("unix_db_info",77,"off")=460
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jfile_bytes")=76
+	Set gtmtypes("unix_db_info",77,"name")="unix_db_info.s_addrs.gvstats_rec.n_jfile_writes"
+	Set gtmtypes("unix_db_info",77,"off")=456
 	Set gtmtypes("unix_db_info",77,"len")=8
 	Set gtmtypes("unix_db_info",77,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jrec_logical")=77
-	Set gtmtypes("unix_db_info",78,"name")="unix_db_info.s_addrs.gvstats_rec.n_jrec_pblk"
-	Set gtmtypes("unix_db_info",78,"off")=468
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jfile_writes")=77
+	Set gtmtypes("unix_db_info",78,"name")="unix_db_info.s_addrs.gvstats_rec.n_jrec_logical"
+	Set gtmtypes("unix_db_info",78,"off")=464
 	Set gtmtypes("unix_db_info",78,"len")=8
 	Set gtmtypes("unix_db_info",78,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jrec_pblk")=78
-	Set gtmtypes("unix_db_info",79,"name")="unix_db_info.s_addrs.gvstats_rec.n_jrec_epoch_regular"
-	Set gtmtypes("unix_db_info",79,"off")=476
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jrec_logical")=78
+	Set gtmtypes("unix_db_info",79,"name")="unix_db_info.s_addrs.gvstats_rec.n_jrec_pblk"
+	Set gtmtypes("unix_db_info",79,"off")=472
 	Set gtmtypes("unix_db_info",79,"len")=8
 	Set gtmtypes("unix_db_info",79,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jrec_epoch_regular")=79
-	Set gtmtypes("unix_db_info",80,"name")="unix_db_info.s_addrs.gvstats_rec.n_jrec_epoch_idle"
-	Set gtmtypes("unix_db_info",80,"off")=484
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jrec_pblk")=79
+	Set gtmtypes("unix_db_info",80,"name")="unix_db_info.s_addrs.gvstats_rec.n_jrec_epoch_regular"
+	Set gtmtypes("unix_db_info",80,"off")=480
 	Set gtmtypes("unix_db_info",80,"len")=8
 	Set gtmtypes("unix_db_info",80,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jrec_epoch_idle")=80
-	Set gtmtypes("unix_db_info",81,"name")="unix_db_info.s_addrs.gvstats_rec.n_jrec_other"
-	Set gtmtypes("unix_db_info",81,"off")=492
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jrec_epoch_regular")=80
+	Set gtmtypes("unix_db_info",81,"name")="unix_db_info.s_addrs.gvstats_rec.n_jrec_epoch_idle"
+	Set gtmtypes("unix_db_info",81,"off")=488
 	Set gtmtypes("unix_db_info",81,"len")=8
 	Set gtmtypes("unix_db_info",81,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jrec_other")=81
-	Set gtmtypes("unix_db_info",82,"name")="unix_db_info.s_addrs.gvstats_rec.n_jnl_extends"
-	Set gtmtypes("unix_db_info",82,"off")=500
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jrec_epoch_idle")=81
+	Set gtmtypes("unix_db_info",82,"name")="unix_db_info.s_addrs.gvstats_rec.n_jrec_other"
+	Set gtmtypes("unix_db_info",82,"off")=496
 	Set gtmtypes("unix_db_info",82,"len")=8
 	Set gtmtypes("unix_db_info",82,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jnl_extends")=82
-	Set gtmtypes("unix_db_info",83,"name")="unix_db_info.s_addrs.gvstats_rec.n_db_extends"
-	Set gtmtypes("unix_db_info",83,"off")=508
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jrec_other")=82
+	Set gtmtypes("unix_db_info",83,"name")="unix_db_info.s_addrs.gvstats_rec.n_jnl_extends"
+	Set gtmtypes("unix_db_info",83,"off")=504
 	Set gtmtypes("unix_db_info",83,"len")=8
 	Set gtmtypes("unix_db_info",83,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_db_extends")=83
-	Set gtmtypes("unix_db_info",84,"name")="unix_db_info.s_addrs.gvstats_rec.n_crit_success"
-	Set gtmtypes("unix_db_info",84,"off")=516
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jnl_extends")=83
+	Set gtmtypes("unix_db_info",84,"name")="unix_db_info.s_addrs.gvstats_rec.n_db_extends"
+	Set gtmtypes("unix_db_info",84,"off")=512
 	Set gtmtypes("unix_db_info",84,"len")=8
 	Set gtmtypes("unix_db_info",84,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_crit_success")=84
-	Set gtmtypes("unix_db_info",85,"name")="unix_db_info.s_addrs.gvstats_rec.n_crits_in_epch"
-	Set gtmtypes("unix_db_info",85,"off")=524
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_db_extends")=84
+	Set gtmtypes("unix_db_info",85,"name")="unix_db_info.s_addrs.gvstats_rec.n_crit_success"
+	Set gtmtypes("unix_db_info",85,"off")=520
 	Set gtmtypes("unix_db_info",85,"len")=8
 	Set gtmtypes("unix_db_info",85,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_crits_in_epch")=85
-	Set gtmtypes("unix_db_info",86,"name")="unix_db_info.s_addrs.gvstats_rec.sq_crit_failed"
-	Set gtmtypes("unix_db_info",86,"off")=532
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_crit_success")=85
+	Set gtmtypes("unix_db_info",86,"name")="unix_db_info.s_addrs.gvstats_rec.n_crits_in_epch"
+	Set gtmtypes("unix_db_info",86,"off")=528
 	Set gtmtypes("unix_db_info",86,"len")=8
 	Set gtmtypes("unix_db_info",86,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.sq_crit_failed")=86
-	Set gtmtypes("unix_db_info",87,"name")="unix_db_info.s_addrs.gvstats_rec.n_crit_failed"
-	Set gtmtypes("unix_db_info",87,"off")=540
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_crits_in_epch")=86
+	Set gtmtypes("unix_db_info",87,"name")="unix_db_info.s_addrs.gvstats_rec.sq_crit_failed"
+	Set gtmtypes("unix_db_info",87,"off")=536
 	Set gtmtypes("unix_db_info",87,"len")=8
 	Set gtmtypes("unix_db_info",87,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_crit_failed")=87
-	Set gtmtypes("unix_db_info",88,"name")="unix_db_info.s_addrs.gvstats_rec.sq_crit_que_slps"
-	Set gtmtypes("unix_db_info",88,"off")=548
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.sq_crit_failed")=87
+	Set gtmtypes("unix_db_info",88,"name")="unix_db_info.s_addrs.gvstats_rec.n_crit_failed"
+	Set gtmtypes("unix_db_info",88,"off")=544
 	Set gtmtypes("unix_db_info",88,"len")=8
 	Set gtmtypes("unix_db_info",88,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.sq_crit_que_slps")=88
-	Set gtmtypes("unix_db_info",89,"name")="unix_db_info.s_addrs.gvstats_rec.n_crit_que_slps"
-	Set gtmtypes("unix_db_info",89,"off")=556
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_crit_failed")=88
+	Set gtmtypes("unix_db_info",89,"name")="unix_db_info.s_addrs.gvstats_rec.sq_crit_que_slps"
+	Set gtmtypes("unix_db_info",89,"off")=552
 	Set gtmtypes("unix_db_info",89,"len")=8
 	Set gtmtypes("unix_db_info",89,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_crit_que_slps")=89
-	Set gtmtypes("unix_db_info",90,"name")="unix_db_info.s_addrs.gvstats_rec.sq_crit_yields"
-	Set gtmtypes("unix_db_info",90,"off")=564
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.sq_crit_que_slps")=89
+	Set gtmtypes("unix_db_info",90,"name")="unix_db_info.s_addrs.gvstats_rec.n_crit_que_slps"
+	Set gtmtypes("unix_db_info",90,"off")=560
 	Set gtmtypes("unix_db_info",90,"len")=8
 	Set gtmtypes("unix_db_info",90,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.sq_crit_yields")=90
-	Set gtmtypes("unix_db_info",91,"name")="unix_db_info.s_addrs.gvstats_rec.n_crit_yields"
-	Set gtmtypes("unix_db_info",91,"off")=572
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_crit_que_slps")=90
+	Set gtmtypes("unix_db_info",91,"name")="unix_db_info.s_addrs.gvstats_rec.sq_crit_yields"
+	Set gtmtypes("unix_db_info",91,"off")=568
 	Set gtmtypes("unix_db_info",91,"len")=8
 	Set gtmtypes("unix_db_info",91,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_crit_yields")=91
-	Set gtmtypes("unix_db_info",92,"name")="unix_db_info.s_addrs.dbsync_timer_tn"
-	Set gtmtypes("unix_db_info",92,"off")=580
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.sq_crit_yields")=91
+	Set gtmtypes("unix_db_info",92,"name")="unix_db_info.s_addrs.gvstats_rec.n_crit_yields"
+	Set gtmtypes("unix_db_info",92,"off")=576
 	Set gtmtypes("unix_db_info",92,"len")=8
 	Set gtmtypes("unix_db_info",92,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.dbsync_timer_tn")=92
-	Set gtmtypes("unix_db_info",93,"name")="unix_db_info.s_addrs.fullblockwrite_len"
-	Set gtmtypes("unix_db_info",93,"off")=588
-	Set gtmtypes("unix_db_info",93,"len")=4
-	Set gtmtypes("unix_db_info",93,"type")="size_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.fullblockwrite_len")=93
-	Set gtmtypes("unix_db_info",94,"name")="unix_db_info.s_addrs.total_blks"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_crit_yields")=92
+	Set gtmtypes("unix_db_info",93,"name")="unix_db_info.s_addrs.gvstats_rec.n_clean2dirty"
+	Set gtmtypes("unix_db_info",93,"off")=584
+	Set gtmtypes("unix_db_info",93,"len")=8
+	Set gtmtypes("unix_db_info",93,"type")="uint64_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_clean2dirty")=93
+	Set gtmtypes("unix_db_info",94,"name")="unix_db_info.s_addrs.dbsync_timer_tn"
 	Set gtmtypes("unix_db_info",94,"off")=592
-	Set gtmtypes("unix_db_info",94,"len")=4
-	Set gtmtypes("unix_db_info",94,"type")="unsigned-int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.total_blks")=94
-	Set gtmtypes("unix_db_info",95,"name")="unix_db_info.s_addrs.prev_free_blks"
-	Set gtmtypes("unix_db_info",95,"off")=596
+	Set gtmtypes("unix_db_info",94,"len")=8
+	Set gtmtypes("unix_db_info",94,"type")="uint64_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.dbsync_timer_tn")=94
+	Set gtmtypes("unix_db_info",95,"name")="unix_db_info.s_addrs.our_midnite"
+	Set gtmtypes("unix_db_info",95,"off")=600
 	Set gtmtypes("unix_db_info",95,"len")=4
-	Set gtmtypes("unix_db_info",95,"type")="unsigned-int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.prev_free_blks")=95
-	Set gtmtypes("unix_db_info",96,"name")="unix_db_info.s_addrs.timer"
-	Set gtmtypes("unix_db_info",96,"off")=600
+	Set gtmtypes("unix_db_info",95,"type")="addr"
+	Set gtmtypfldindx("unix_db_info","s_addrs.our_midnite")=95
+	Set gtmtypes("unix_db_info",96,"name")="unix_db_info.s_addrs.fullblockwrite_len"
+	Set gtmtypes("unix_db_info",96,"off")=604
 	Set gtmtypes("unix_db_info",96,"len")=4
-	Set gtmtypes("unix_db_info",96,"type")="unsigned-int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.timer")=96
-	Set gtmtypes("unix_db_info",97,"name")="unix_db_info.s_addrs.in_wtstart"
-	Set gtmtypes("unix_db_info",97,"off")=604
+	Set gtmtypes("unix_db_info",96,"type")="size_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.fullblockwrite_len")=96
+	Set gtmtypes("unix_db_info",97,"name")="unix_db_info.s_addrs.our_lru_cache_rec_off"
+	Set gtmtypes("unix_db_info",97,"off")=608
 	Set gtmtypes("unix_db_info",97,"len")=4
-	Set gtmtypes("unix_db_info",97,"type")="unsigned-int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.in_wtstart")=97
-	Set gtmtypes("unix_db_info",98,"name")="unix_db_info.s_addrs.now_crit"
-	Set gtmtypes("unix_db_info",98,"off")=608
+	Set gtmtypes("unix_db_info",97,"type")="intptr_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.our_lru_cache_rec_off")=97
+	Set gtmtypes("unix_db_info",98,"name")="unix_db_info.s_addrs.total_blks"
+	Set gtmtypes("unix_db_info",98,"off")=612
 	Set gtmtypes("unix_db_info",98,"len")=4
 	Set gtmtypes("unix_db_info",98,"type")="unsigned-int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.now_crit")=98
-	Set gtmtypes("unix_db_info",99,"name")="unix_db_info.s_addrs.wbuf_dqd"
-	Set gtmtypes("unix_db_info",99,"off")=612
+	Set gtmtypfldindx("unix_db_info","s_addrs.total_blks")=98
+	Set gtmtypes("unix_db_info",99,"name")="unix_db_info.s_addrs.prev_free_blks"
+	Set gtmtypes("unix_db_info",99,"off")=616
 	Set gtmtypes("unix_db_info",99,"len")=4
 	Set gtmtypes("unix_db_info",99,"type")="unsigned-int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.wbuf_dqd")=99
-	Set gtmtypes("unix_db_info",100,"name")="unix_db_info.s_addrs.stale_defer"
-	Set gtmtypes("unix_db_info",100,"off")=616
+	Set gtmtypfldindx("unix_db_info","s_addrs.prev_free_blks")=99
+	Set gtmtypes("unix_db_info",100,"name")="unix_db_info.s_addrs.timer"
+	Set gtmtypes("unix_db_info",100,"off")=620
 	Set gtmtypes("unix_db_info",100,"len")=4
 	Set gtmtypes("unix_db_info",100,"type")="unsigned-int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.stale_defer")=100
-	Set gtmtypes("unix_db_info",101,"name")="unix_db_info.s_addrs.freeze"
-	Set gtmtypes("unix_db_info",101,"off")=620
+	Set gtmtypfldindx("unix_db_info","s_addrs.timer")=100
+	Set gtmtypes("unix_db_info",101,"name")="unix_db_info.s_addrs.in_wtstart"
+	Set gtmtypes("unix_db_info",101,"off")=624
 	Set gtmtypes("unix_db_info",101,"len")=4
-	Set gtmtypes("unix_db_info",101,"type")="boolean_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.freeze")=101
-	Set gtmtypes("unix_db_info",102,"name")="unix_db_info.s_addrs.dbsync_timer"
-	Set gtmtypes("unix_db_info",102,"off")=624
+	Set gtmtypes("unix_db_info",101,"type")="unsigned-int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.in_wtstart")=101
+	Set gtmtypes("unix_db_info",102,"name")="unix_db_info.s_addrs.now_crit"
+	Set gtmtypes("unix_db_info",102,"off")=628
 	Set gtmtypes("unix_db_info",102,"len")=4
-	Set gtmtypes("unix_db_info",102,"type")="boolean_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.dbsync_timer")=102
-	Set gtmtypes("unix_db_info",103,"name")="unix_db_info.s_addrs.reorg_last_dest"
-	Set gtmtypes("unix_db_info",103,"off")=628
+	Set gtmtypes("unix_db_info",102,"type")="unsigned-int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.now_crit")=102
+	Set gtmtypes("unix_db_info",103,"name")="unix_db_info.s_addrs.wbuf_dqd"
+	Set gtmtypes("unix_db_info",103,"off")=632
 	Set gtmtypes("unix_db_info",103,"len")=4
-	Set gtmtypes("unix_db_info",103,"type")="int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.reorg_last_dest")=103
-	Set gtmtypes("unix_db_info",104,"name")="unix_db_info.s_addrs.jnl_before_image"
-	Set gtmtypes("unix_db_info",104,"off")=632
+	Set gtmtypes("unix_db_info",103,"type")="unsigned-int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.wbuf_dqd")=103
+	Set gtmtypes("unix_db_info",104,"name")="unix_db_info.s_addrs.stale_defer"
+	Set gtmtypes("unix_db_info",104,"off")=636
 	Set gtmtypes("unix_db_info",104,"len")=4
-	Set gtmtypes("unix_db_info",104,"type")="boolean_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.jnl_before_image")=104
-	Set gtmtypes("unix_db_info",105,"name")="unix_db_info.s_addrs.read_write"
-	Set gtmtypes("unix_db_info",105,"off")=636
+	Set gtmtypes("unix_db_info",104,"type")="unsigned-int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.stale_defer")=104
+	Set gtmtypes("unix_db_info",105,"name")="unix_db_info.s_addrs.freeze"
+	Set gtmtypes("unix_db_info",105,"off")=640
 	Set gtmtypes("unix_db_info",105,"len")=4
 	Set gtmtypes("unix_db_info",105,"type")="boolean_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.read_write")=105
-	Set gtmtypes("unix_db_info",106,"name")="unix_db_info.s_addrs.persistent_freeze"
-	Set gtmtypes("unix_db_info",106,"off")=640
+	Set gtmtypfldindx("unix_db_info","s_addrs.freeze")=105
+	Set gtmtypes("unix_db_info",106,"name")="unix_db_info.s_addrs.dbsync_timer"
+	Set gtmtypes("unix_db_info",106,"off")=644
 	Set gtmtypes("unix_db_info",106,"len")=4
 	Set gtmtypes("unix_db_info",106,"type")="boolean_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.persistent_freeze")=106
-	Set gtmtypes("unix_db_info",107,"name")="unix_db_info.s_addrs.pblk_align_jrecsize"
-	Set gtmtypes("unix_db_info",107,"off")=644
+	Set gtmtypfldindx("unix_db_info","s_addrs.dbsync_timer")=106
+	Set gtmtypes("unix_db_info",107,"name")="unix_db_info.s_addrs.reorg_last_dest"
+	Set gtmtypes("unix_db_info",107,"off")=648
 	Set gtmtypes("unix_db_info",107,"len")=4
 	Set gtmtypes("unix_db_info",107,"type")="int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.pblk_align_jrecsize")=107
-	Set gtmtypes("unix_db_info",108,"name")="unix_db_info.s_addrs.min_total_tpjnl_rec_size"
-	Set gtmtypes("unix_db_info",108,"off")=648
+	Set gtmtypfldindx("unix_db_info","s_addrs.reorg_last_dest")=107
+	Set gtmtypes("unix_db_info",108,"name")="unix_db_info.s_addrs.jnl_before_image"
+	Set gtmtypes("unix_db_info",108,"off")=652
 	Set gtmtypes("unix_db_info",108,"len")=4
-	Set gtmtypes("unix_db_info",108,"type")="int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.min_total_tpjnl_rec_size")=108
-	Set gtmtypes("unix_db_info",109,"name")="unix_db_info.s_addrs.min_total_nontpjnl_rec_size"
-	Set gtmtypes("unix_db_info",109,"off")=652
+	Set gtmtypes("unix_db_info",108,"type")="boolean_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.jnl_before_image")=108
+	Set gtmtypes("unix_db_info",109,"name")="unix_db_info.s_addrs.read_write"
+	Set gtmtypes("unix_db_info",109,"off")=656
 	Set gtmtypes("unix_db_info",109,"len")=4
-	Set gtmtypes("unix_db_info",109,"type")="int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.min_total_nontpjnl_rec_size")=109
-	Set gtmtypes("unix_db_info",110,"name")="unix_db_info.s_addrs.jnl_state"
-	Set gtmtypes("unix_db_info",110,"off")=656
+	Set gtmtypes("unix_db_info",109,"type")="boolean_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.read_write")=109
+	Set gtmtypes("unix_db_info",110,"name")="unix_db_info.s_addrs.orig_read_write"
+	Set gtmtypes("unix_db_info",110,"off")=660
 	Set gtmtypes("unix_db_info",110,"len")=4
-	Set gtmtypes("unix_db_info",110,"type")="int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.jnl_state")=110
-	Set gtmtypes("unix_db_info",111,"name")="unix_db_info.s_addrs.repl_state"
-	Set gtmtypes("unix_db_info",111,"off")=660
+	Set gtmtypes("unix_db_info",110,"type")="boolean_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.orig_read_write")=110
+	Set gtmtypes("unix_db_info",111,"name")="unix_db_info.s_addrs.persistent_freeze"
+	Set gtmtypes("unix_db_info",111,"off")=664
 	Set gtmtypes("unix_db_info",111,"len")=4
-	Set gtmtypes("unix_db_info",111,"type")="int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.repl_state")=111
-	Set gtmtypes("unix_db_info",112,"name")="unix_db_info.s_addrs.crit_check_cycle"
-	Set gtmtypes("unix_db_info",112,"off")=664
+	Set gtmtypes("unix_db_info",111,"type")="boolean_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.persistent_freeze")=111
+	Set gtmtypes("unix_db_info",112,"name")="unix_db_info.s_addrs.pblk_align_jrecsize"
+	Set gtmtypes("unix_db_info",112,"off")=668
 	Set gtmtypes("unix_db_info",112,"len")=4
-	Set gtmtypes("unix_db_info",112,"type")="unsigned-int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.crit_check_cycle")=112
-	Set gtmtypes("unix_db_info",113,"name")="unix_db_info.s_addrs.backup_in_prog"
-	Set gtmtypes("unix_db_info",113,"off")=668
+	Set gtmtypes("unix_db_info",112,"type")="int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.pblk_align_jrecsize")=112
+	Set gtmtypes("unix_db_info",113,"name")="unix_db_info.s_addrs.min_total_tpjnl_rec_size"
+	Set gtmtypes("unix_db_info",113,"off")=672
 	Set gtmtypes("unix_db_info",113,"len")=4
 	Set gtmtypes("unix_db_info",113,"type")="int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.backup_in_prog")=113
-	Set gtmtypes("unix_db_info",114,"name")="unix_db_info.s_addrs.snapshot_in_prog"
-	Set gtmtypes("unix_db_info",114,"off")=672
+	Set gtmtypfldindx("unix_db_info","s_addrs.min_total_tpjnl_rec_size")=113
+	Set gtmtypes("unix_db_info",114,"name")="unix_db_info.s_addrs.min_total_nontpjnl_rec_size"
+	Set gtmtypes("unix_db_info",114,"off")=676
 	Set gtmtypes("unix_db_info",114,"len")=4
-	Set gtmtypes("unix_db_info",114,"type")="boolean_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.snapshot_in_prog")=114
-	Set gtmtypes("unix_db_info",115,"name")="unix_db_info.s_addrs.ref_cnt"
-	Set gtmtypes("unix_db_info",115,"off")=676
+	Set gtmtypes("unix_db_info",114,"type")="int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.min_total_nontpjnl_rec_size")=114
+	Set gtmtypes("unix_db_info",115,"name")="unix_db_info.s_addrs.jnl_state"
+	Set gtmtypes("unix_db_info",115,"off")=680
 	Set gtmtypes("unix_db_info",115,"len")=4
 	Set gtmtypes("unix_db_info",115,"type")="int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.ref_cnt")=115
-	Set gtmtypes("unix_db_info",116,"name")="unix_db_info.s_addrs.fid_index"
-	Set gtmtypes("unix_db_info",116,"off")=680
+	Set gtmtypfldindx("unix_db_info","s_addrs.jnl_state")=115
+	Set gtmtypes("unix_db_info",116,"name")="unix_db_info.s_addrs.repl_state"
+	Set gtmtypes("unix_db_info",116,"off")=684
 	Set gtmtypes("unix_db_info",116,"len")=4
 	Set gtmtypes("unix_db_info",116,"type")="int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.fid_index")=116
-	Set gtmtypes("unix_db_info",117,"name")="unix_db_info.s_addrs.do_fullblockwrites"
-	Set gtmtypes("unix_db_info",117,"off")=684
+	Set gtmtypfldindx("unix_db_info","s_addrs.repl_state")=116
+	Set gtmtypes("unix_db_info",117,"name")="unix_db_info.s_addrs.crit_check_cycle"
+	Set gtmtypes("unix_db_info",117,"off")=688
 	Set gtmtypes("unix_db_info",117,"len")=4
-	Set gtmtypes("unix_db_info",117,"type")="boolean_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.do_fullblockwrites")=117
-	Set gtmtypes("unix_db_info",118,"name")="unix_db_info.s_addrs.regnum"
-	Set gtmtypes("unix_db_info",118,"off")=688
+	Set gtmtypes("unix_db_info",117,"type")="unsigned-int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.crit_check_cycle")=117
+	Set gtmtypes("unix_db_info",118,"name")="unix_db_info.s_addrs.backup_in_prog"
+	Set gtmtypes("unix_db_info",118,"off")=692
 	Set gtmtypes("unix_db_info",118,"len")=4
 	Set gtmtypes("unix_db_info",118,"type")="int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.regnum")=118
-	Set gtmtypes("unix_db_info",119,"name")="unix_db_info.s_addrs.n_pre_read_trigger"
-	Set gtmtypes("unix_db_info",119,"off")=692
+	Set gtmtypfldindx("unix_db_info","s_addrs.backup_in_prog")=118
+	Set gtmtypes("unix_db_info",119,"name")="unix_db_info.s_addrs.snapshot_in_prog"
+	Set gtmtypes("unix_db_info",119,"off")=696
 	Set gtmtypes("unix_db_info",119,"len")=4
-	Set gtmtypes("unix_db_info",119,"type")="int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.n_pre_read_trigger")=119
-	Set gtmtypes("unix_db_info",120,"name")="unix_db_info.s_addrs.jnlpool_validate_check"
-	Set gtmtypes("unix_db_info",120,"off")=696
+	Set gtmtypes("unix_db_info",119,"type")="boolean_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.snapshot_in_prog")=119
+	Set gtmtypes("unix_db_info",120,"name")="unix_db_info.s_addrs.ref_cnt"
+	Set gtmtypes("unix_db_info",120,"off")=700
 	Set gtmtypes("unix_db_info",120,"len")=4
-	Set gtmtypes("unix_db_info",120,"type")="unsigned-int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.jnlpool_validate_check")=120
-	Set gtmtypes("unix_db_info",121,"name")="unix_db_info.s_addrs.regcnt"
-	Set gtmtypes("unix_db_info",121,"off")=700
+	Set gtmtypes("unix_db_info",120,"type")="int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.ref_cnt")=120
+	Set gtmtypes("unix_db_info",121,"name")="unix_db_info.s_addrs.fid_index"
+	Set gtmtypes("unix_db_info",121,"off")=704
 	Set gtmtypes("unix_db_info",121,"len")=4
 	Set gtmtypes("unix_db_info",121,"type")="int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.regcnt")=121
-	Set gtmtypes("unix_db_info",122,"name")="unix_db_info.s_addrs.t_commit_crit"
-	Set gtmtypes("unix_db_info",122,"off")=704
+	Set gtmtypfldindx("unix_db_info","s_addrs.fid_index")=121
+	Set gtmtypes("unix_db_info",122,"name")="unix_db_info.s_addrs.do_fullblockwrites"
+	Set gtmtypes("unix_db_info",122,"off")=708
 	Set gtmtypes("unix_db_info",122,"len")=4
 	Set gtmtypes("unix_db_info",122,"type")="boolean_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.t_commit_crit")=122
-	Set gtmtypes("unix_db_info",123,"name")="unix_db_info.s_addrs.wcs_pidcnt_incremented"
-	Set gtmtypes("unix_db_info",123,"off")=708
+	Set gtmtypfldindx("unix_db_info","s_addrs.do_fullblockwrites")=122
+	Set gtmtypes("unix_db_info",123,"name")="unix_db_info.s_addrs.regnum"
+	Set gtmtypes("unix_db_info",123,"off")=712
 	Set gtmtypes("unix_db_info",123,"len")=4
-	Set gtmtypes("unix_db_info",123,"type")="boolean_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.wcs_pidcnt_incremented")=123
-	Set gtmtypes("unix_db_info",124,"name")="unix_db_info.s_addrs.incr_db_trigger_cycle"
-	Set gtmtypes("unix_db_info",124,"off")=712
+	Set gtmtypes("unix_db_info",123,"type")="int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.regnum")=123
+	Set gtmtypes("unix_db_info",124,"name")="unix_db_info.s_addrs.n_pre_read_trigger"
+	Set gtmtypes("unix_db_info",124,"off")=716
 	Set gtmtypes("unix_db_info",124,"len")=4
-	Set gtmtypes("unix_db_info",124,"type")="boolean_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.incr_db_trigger_cycle")=124
-	Set gtmtypes("unix_db_info",125,"name")="unix_db_info.s_addrs.db_trigger_cycle"
-	Set gtmtypes("unix_db_info",125,"off")=716
+	Set gtmtypes("unix_db_info",124,"type")="int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.n_pre_read_trigger")=124
+	Set gtmtypes("unix_db_info",125,"name")="unix_db_info.s_addrs.jnlpool_validate_check"
+	Set gtmtypes("unix_db_info",125,"off")=720
 	Set gtmtypes("unix_db_info",125,"len")=4
 	Set gtmtypes("unix_db_info",125,"type")="unsigned-int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.db_trigger_cycle")=125
-	Set gtmtypes("unix_db_info",126,"name")="unix_db_info.s_addrs.db_dztrigger_cycle"
-	Set gtmtypes("unix_db_info",126,"off")=720
+	Set gtmtypfldindx("unix_db_info","s_addrs.jnlpool_validate_check")=125
+	Set gtmtypes("unix_db_info",126,"name")="unix_db_info.s_addrs.regcnt"
+	Set gtmtypes("unix_db_info",126,"off")=724
 	Set gtmtypes("unix_db_info",126,"len")=4
-	Set gtmtypes("unix_db_info",126,"type")="unsigned-int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.db_dztrigger_cycle")=126
-	Set gtmtypes("unix_db_info",127,"name")="unix_db_info.s_addrs.hold_onto_crit"
-	Set gtmtypes("unix_db_info",127,"off")=724
+	Set gtmtypes("unix_db_info",126,"type")="int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.regcnt")=126
+	Set gtmtypes("unix_db_info",127,"name")="unix_db_info.s_addrs.t_commit_crit"
+	Set gtmtypes("unix_db_info",127,"off")=728
 	Set gtmtypes("unix_db_info",127,"len")=4
 	Set gtmtypes("unix_db_info",127,"type")="boolean_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.hold_onto_crit")=127
-	Set gtmtypes("unix_db_info",128,"name")="unix_db_info.s_addrs.dse_crit_seize_done"
-	Set gtmtypes("unix_db_info",128,"off")=728
+	Set gtmtypfldindx("unix_db_info","s_addrs.t_commit_crit")=127
+	Set gtmtypes("unix_db_info",128,"name")="unix_db_info.s_addrs.wcs_pidcnt_incremented"
+	Set gtmtypes("unix_db_info",128,"off")=732
 	Set gtmtypes("unix_db_info",128,"len")=4
 	Set gtmtypes("unix_db_info",128,"type")="boolean_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.dse_crit_seize_done")=128
-	Set gtmtypes("unix_db_info",129,"name")="unix_db_info.s_addrs.gbuff_limit"
-	Set gtmtypes("unix_db_info",129,"off")=732
+	Set gtmtypfldindx("unix_db_info","s_addrs.wcs_pidcnt_incremented")=128
+	Set gtmtypes("unix_db_info",129,"name")="unix_db_info.s_addrs.incr_db_trigger_cycle"
+	Set gtmtypes("unix_db_info",129,"off")=736
 	Set gtmtypes("unix_db_info",129,"len")=4
-	Set gtmtypes("unix_db_info",129,"type")="int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gbuff_limit")=129
-	Set gtmtypes("unix_db_info",130,"name")="unix_db_info.s_addrs.our_midnite"
-	Set gtmtypes("unix_db_info",130,"off")=736
+	Set gtmtypes("unix_db_info",129,"type")="boolean_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.incr_db_trigger_cycle")=129
+	Set gtmtypes("unix_db_info",130,"name")="unix_db_info.s_addrs.db_trigger_cycle"
+	Set gtmtypes("unix_db_info",130,"off")=740
 	Set gtmtypes("unix_db_info",130,"len")=4
-	Set gtmtypes("unix_db_info",130,"type")="addr"
-	Set gtmtypfldindx("unix_db_info","s_addrs.our_midnite")=130
-	Set gtmtypes("unix_db_info",131,"name")="unix_db_info.s_addrs.root_search_cycle"
-	Set gtmtypes("unix_db_info",131,"off")=740
+	Set gtmtypes("unix_db_info",130,"type")="unsigned-int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.db_trigger_cycle")=130
+	Set gtmtypes("unix_db_info",131,"name")="unix_db_info.s_addrs.db_dztrigger_cycle"
+	Set gtmtypes("unix_db_info",131,"off")=744
 	Set gtmtypes("unix_db_info",131,"len")=4
 	Set gtmtypes("unix_db_info",131,"type")="unsigned-int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.root_search_cycle")=131
-	Set gtmtypes("unix_db_info",132,"name")="unix_db_info.s_addrs.onln_rlbk_cycle"
-	Set gtmtypes("unix_db_info",132,"off")=744
+	Set gtmtypfldindx("unix_db_info","s_addrs.db_dztrigger_cycle")=131
+	Set gtmtypes("unix_db_info",132,"name")="unix_db_info.s_addrs.hold_onto_crit"
+	Set gtmtypes("unix_db_info",132,"off")=748
 	Set gtmtypes("unix_db_info",132,"len")=4
-	Set gtmtypes("unix_db_info",132,"type")="unsigned-int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.onln_rlbk_cycle")=132
-	Set gtmtypes("unix_db_info",133,"name")="unix_db_info.s_addrs.db_onln_rlbkd_cycle"
-	Set gtmtypes("unix_db_info",133,"off")=748
+	Set gtmtypes("unix_db_info",132,"type")="boolean_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.hold_onto_crit")=132
+	Set gtmtypes("unix_db_info",133,"name")="unix_db_info.s_addrs.dse_crit_seize_done"
+	Set gtmtypes("unix_db_info",133,"off")=752
 	Set gtmtypes("unix_db_info",133,"len")=4
-	Set gtmtypes("unix_db_info",133,"type")="unsigned-int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.db_onln_rlbkd_cycle")=133
-	Set gtmtypes("unix_db_info",134,"name")="unix_db_info.s_addrs.read_only_fs"
-	Set gtmtypes("unix_db_info",134,"off")=752
+	Set gtmtypes("unix_db_info",133,"type")="boolean_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.dse_crit_seize_done")=133
+	Set gtmtypes("unix_db_info",134,"name")="unix_db_info.s_addrs.gbuff_limit"
+	Set gtmtypes("unix_db_info",134,"off")=756
 	Set gtmtypes("unix_db_info",134,"len")=4
-	Set gtmtypes("unix_db_info",134,"type")="boolean_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.read_only_fs")=134
-	Set gtmtypes("unix_db_info",135,"name")="unix_db_info.s_addrs.crit_probe"
-	Set gtmtypes("unix_db_info",135,"off")=756
+	Set gtmtypes("unix_db_info",134,"type")="int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gbuff_limit")=134
+	Set gtmtypes("unix_db_info",135,"name")="unix_db_info.s_addrs.root_search_cycle"
+	Set gtmtypes("unix_db_info",135,"off")=760
 	Set gtmtypes("unix_db_info",135,"len")=4
-	Set gtmtypes("unix_db_info",135,"type")="boolean_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.crit_probe")=135
-	Set gtmtypes("unix_db_info",136,"name")="unix_db_info.s_addrs.probecrit_rec"
-	Set gtmtypes("unix_db_info",136,"off")=760
-	Set gtmtypes("unix_db_info",136,"len")=56
-	Set gtmtypes("unix_db_info",136,"type")="probecrit_rec_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.probecrit_rec")=136
-	Set gtmtypes("unix_db_info",137,"name")="unix_db_info.s_addrs.probecrit_rec.t_get_crit"
-	Set gtmtypes("unix_db_info",137,"off")=760
-	Set gtmtypes("unix_db_info",137,"len")=8
-	Set gtmtypes("unix_db_info",137,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.probecrit_rec.t_get_crit")=137
-	Set gtmtypes("unix_db_info",138,"name")="unix_db_info.s_addrs.probecrit_rec.p_crit_failed"
-	Set gtmtypes("unix_db_info",138,"off")=768
-	Set gtmtypes("unix_db_info",138,"len")=8
-	Set gtmtypes("unix_db_info",138,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.probecrit_rec.p_crit_failed")=138
-	Set gtmtypes("unix_db_info",139,"name")="unix_db_info.s_addrs.probecrit_rec.p_crit_que_slps"
+	Set gtmtypes("unix_db_info",135,"type")="unsigned-int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.root_search_cycle")=135
+	Set gtmtypes("unix_db_info",136,"name")="unix_db_info.s_addrs.onln_rlbk_cycle"
+	Set gtmtypes("unix_db_info",136,"off")=764
+	Set gtmtypes("unix_db_info",136,"len")=4
+	Set gtmtypes("unix_db_info",136,"type")="unsigned-int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.onln_rlbk_cycle")=136
+	Set gtmtypes("unix_db_info",137,"name")="unix_db_info.s_addrs.db_onln_rlbkd_cycle"
+	Set gtmtypes("unix_db_info",137,"off")=768
+	Set gtmtypes("unix_db_info",137,"len")=4
+	Set gtmtypes("unix_db_info",137,"type")="unsigned-int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.db_onln_rlbkd_cycle")=137
+	Set gtmtypes("unix_db_info",138,"name")="unix_db_info.s_addrs.reservedDBFlags"
+	Set gtmtypes("unix_db_info",138,"off")=772
+	Set gtmtypes("unix_db_info",138,"len")=4
+	Set gtmtypes("unix_db_info",138,"type")="unsigned-int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.reservedDBFlags")=138
+	Set gtmtypes("unix_db_info",139,"name")="unix_db_info.s_addrs.read_only_fs"
 	Set gtmtypes("unix_db_info",139,"off")=776
-	Set gtmtypes("unix_db_info",139,"len")=8
-	Set gtmtypes("unix_db_info",139,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.probecrit_rec.p_crit_que_slps")=139
-	Set gtmtypes("unix_db_info",140,"name")="unix_db_info.s_addrs.probecrit_rec.p_crit_yields"
-	Set gtmtypes("unix_db_info",140,"off")=784
-	Set gtmtypes("unix_db_info",140,"len")=8
-	Set gtmtypes("unix_db_info",140,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.probecrit_rec.p_crit_yields")=140
-	Set gtmtypes("unix_db_info",141,"name")="unix_db_info.s_addrs.probecrit_rec.p_crit_que_full"
-	Set gtmtypes("unix_db_info",141,"off")=792
-	Set gtmtypes("unix_db_info",141,"len")=8
-	Set gtmtypes("unix_db_info",141,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.probecrit_rec.p_crit_que_full")=141
-	Set gtmtypes("unix_db_info",142,"name")="unix_db_info.s_addrs.probecrit_rec.p_crit_que_slots"
-	Set gtmtypes("unix_db_info",142,"off")=800
-	Set gtmtypes("unix_db_info",142,"len")=8
-	Set gtmtypes("unix_db_info",142,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.probecrit_rec.p_crit_que_slots")=142
-	Set gtmtypes("unix_db_info",143,"name")="unix_db_info.s_addrs.probecrit_rec.p_crit_success"
-	Set gtmtypes("unix_db_info",143,"off")=808
+	Set gtmtypes("unix_db_info",139,"len")=4
+	Set gtmtypes("unix_db_info",139,"type")="boolean_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.read_only_fs")=139
+	Set gtmtypes("unix_db_info",140,"name")="unix_db_info.s_addrs.crit_probe"
+	Set gtmtypes("unix_db_info",140,"off")=780
+	Set gtmtypes("unix_db_info",140,"len")=4
+	Set gtmtypes("unix_db_info",140,"type")="boolean_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.crit_probe")=140
+	Set gtmtypes("unix_db_info",141,"name")="unix_db_info.s_addrs.canceled_flush_timer"
+	Set gtmtypes("unix_db_info",141,"off")=784
+	Set gtmtypes("unix_db_info",141,"len")=4
+	Set gtmtypes("unix_db_info",141,"type")="boolean_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.canceled_flush_timer")=141
+	Set gtmtypes("unix_db_info",142,"name")="unix_db_info.s_addrs.probecrit_rec"
+	Set gtmtypes("unix_db_info",142,"off")=788
+	Set gtmtypes("unix_db_info",142,"len")=56
+	Set gtmtypes("unix_db_info",142,"type")="probecrit_rec_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.probecrit_rec")=142
+	Set gtmtypes("unix_db_info",143,"name")="unix_db_info.s_addrs.probecrit_rec.t_get_crit"
+	Set gtmtypes("unix_db_info",143,"off")=788
 	Set gtmtypes("unix_db_info",143,"len")=8
 	Set gtmtypes("unix_db_info",143,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.probecrit_rec.p_crit_success")=143
-	Set gtmtypes("unix_db_info",144,"name")="unix_db_info.fn"
-	Set gtmtypes("unix_db_info",144,"off")=816
-	Set gtmtypes("unix_db_info",144,"len")=4
-	Set gtmtypes("unix_db_info",144,"type")="addr"
-	Set gtmtypfldindx("unix_db_info","fn")=144
-	Set gtmtypes("unix_db_info",145,"name")="unix_db_info.fd"
-	Set gtmtypes("unix_db_info",145,"off")=820
-	Set gtmtypes("unix_db_info",145,"len")=4
-	Set gtmtypes("unix_db_info",145,"type")="int"
-	Set gtmtypfldindx("unix_db_info","fd")=145
-	Set gtmtypes("unix_db_info",146,"name")="unix_db_info.fileid"
-	Set gtmtypes("unix_db_info",146,"off")=824
-	Set gtmtypes("unix_db_info",146,"len")=20
-	Set gtmtypes("unix_db_info",146,"type")="unix_file_id"
-	Set gtmtypfldindx("unix_db_info","fileid")=146
-	Set gtmtypes("unix_db_info",147,"name")="unix_db_info.fileid.inode"
-	Set gtmtypes("unix_db_info",147,"off")=824
+	Set gtmtypfldindx("unix_db_info","s_addrs.probecrit_rec.t_get_crit")=143
+	Set gtmtypes("unix_db_info",144,"name")="unix_db_info.s_addrs.probecrit_rec.p_crit_failed"
+	Set gtmtypes("unix_db_info",144,"off")=796
+	Set gtmtypes("unix_db_info",144,"len")=8
+	Set gtmtypes("unix_db_info",144,"type")="uint64_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.probecrit_rec.p_crit_failed")=144
+	Set gtmtypes("unix_db_info",145,"name")="unix_db_info.s_addrs.probecrit_rec.p_crit_que_slps"
+	Set gtmtypes("unix_db_info",145,"off")=804
+	Set gtmtypes("unix_db_info",145,"len")=8
+	Set gtmtypes("unix_db_info",145,"type")="uint64_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.probecrit_rec.p_crit_que_slps")=145
+	Set gtmtypes("unix_db_info",146,"name")="unix_db_info.s_addrs.probecrit_rec.p_crit_yields"
+	Set gtmtypes("unix_db_info",146,"off")=812
+	Set gtmtypes("unix_db_info",146,"len")=8
+	Set gtmtypes("unix_db_info",146,"type")="uint64_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.probecrit_rec.p_crit_yields")=146
+	Set gtmtypes("unix_db_info",147,"name")="unix_db_info.s_addrs.probecrit_rec.p_crit_que_full"
+	Set gtmtypes("unix_db_info",147,"off")=820
 	Set gtmtypes("unix_db_info",147,"len")=8
-	Set gtmtypes("unix_db_info",147,"type")="ino_t"
-	Set gtmtypfldindx("unix_db_info","fileid.inode")=147
-	Set gtmtypes("unix_db_info",148,"name")="unix_db_info.fileid.device"
-	Set gtmtypes("unix_db_info",148,"off")=832
+	Set gtmtypes("unix_db_info",147,"type")="uint64_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.probecrit_rec.p_crit_que_full")=147
+	Set gtmtypes("unix_db_info",148,"name")="unix_db_info.s_addrs.probecrit_rec.p_crit_que_slots"
+	Set gtmtypes("unix_db_info",148,"off")=828
 	Set gtmtypes("unix_db_info",148,"len")=8
-	Set gtmtypes("unix_db_info",148,"type")="dev_t"
-	Set gtmtypfldindx("unix_db_info","fileid.device")=148
-	Set gtmtypes("unix_db_info",149,"name")="unix_db_info.fileid.st_gen"
-	Set gtmtypes("unix_db_info",149,"off")=840
-	Set gtmtypes("unix_db_info",149,"len")=4
-	Set gtmtypes("unix_db_info",149,"type")="unsigned-int"
-	Set gtmtypfldindx("unix_db_info","fileid.st_gen")=149
-	Set gtmtypes("unix_db_info",150,"name")="unix_db_info.semid"
+	Set gtmtypes("unix_db_info",148,"type")="uint64_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.probecrit_rec.p_crit_que_slots")=148
+	Set gtmtypes("unix_db_info",149,"name")="unix_db_info.s_addrs.probecrit_rec.p_crit_success"
+	Set gtmtypes("unix_db_info",149,"off")=836
+	Set gtmtypes("unix_db_info",149,"len")=8
+	Set gtmtypes("unix_db_info",149,"type")="uint64_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.probecrit_rec.p_crit_success")=149
+	Set gtmtypes("unix_db_info",150,"name")="unix_db_info.s_addrs.lock_crit_with_db"
 	Set gtmtypes("unix_db_info",150,"off")=844
 	Set gtmtypes("unix_db_info",150,"len")=4
-	Set gtmtypes("unix_db_info",150,"type")="int"
-	Set gtmtypfldindx("unix_db_info","semid")=150
-	Set gtmtypes("unix_db_info",151,"name")="unix_db_info.gt_sem_ctime"
+	Set gtmtypes("unix_db_info",150,"type")="boolean_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.lock_crit_with_db")=150
+	Set gtmtypes("unix_db_info",151,"name")="unix_db_info.s_addrs.needs_post_freeze_online_clean"
 	Set gtmtypes("unix_db_info",151,"off")=848
 	Set gtmtypes("unix_db_info",151,"len")=4
-	Set gtmtypes("unix_db_info",151,"type")="time_t"
-	Set gtmtypfldindx("unix_db_info","gt_sem_ctime")=151
-	Set gtmtypes("unix_db_info",152,"name")="unix_db_info.shmid"
+	Set gtmtypes("unix_db_info",151,"type")="boolean_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.needs_post_freeze_online_clean")=151
+	Set gtmtypes("unix_db_info",152,"name")="unix_db_info.s_addrs.needs_post_freeze_flushsync"
 	Set gtmtypes("unix_db_info",152,"off")=852
 	Set gtmtypes("unix_db_info",152,"len")=4
-	Set gtmtypes("unix_db_info",152,"type")="int"
-	Set gtmtypfldindx("unix_db_info","shmid")=152
-	Set gtmtypes("unix_db_info",153,"name")="unix_db_info.gt_shm_ctime"
+	Set gtmtypes("unix_db_info",152,"type")="boolean_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.needs_post_freeze_flushsync")=152
+	Set gtmtypes("unix_db_info",153,"name")="unix_db_info.s_addrs.tp_hint"
 	Set gtmtypes("unix_db_info",153,"off")=856
 	Set gtmtypes("unix_db_info",153,"len")=4
-	Set gtmtypes("unix_db_info",153,"type")="time_t"
-	Set gtmtypfldindx("unix_db_info","gt_shm_ctime")=153
-	Set gtmtypes("unix_db_info",154,"name")="unix_db_info.ftok_semid"
+	Set gtmtypes("unix_db_info",153,"type")="int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.tp_hint")=153
+	Set gtmtypes("unix_db_info",154,"name")="unix_db_info.s_addrs.statsDB_setup_completed"
 	Set gtmtypes("unix_db_info",154,"off")=860
 	Set gtmtypes("unix_db_info",154,"len")=4
-	Set gtmtypes("unix_db_info",154,"type")="int"
-	Set gtmtypfldindx("unix_db_info","ftok_semid")=154
-	Set gtmtypes("unix_db_info",155,"name")="unix_db_info.key"
-	Set gtmtypes("unix_db_info",155,"off")=868
+	Set gtmtypes("unix_db_info",154,"type")="boolean_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.statsDB_setup_completed")=154
+	Set gtmtypes("unix_db_info",155,"name")="unix_db_info.fn"
+	Set gtmtypes("unix_db_info",155,"off")=864
 	Set gtmtypes("unix_db_info",155,"len")=4
-	Set gtmtypes("unix_db_info",155,"type")="key_t"
-	Set gtmtypfldindx("unix_db_info","key")=155
-	Set gtmtypes("unix_db_info",156,"name")="unix_db_info.raw"
-	Set gtmtypes("unix_db_info",156,"off")=872
+	Set gtmtypes("unix_db_info",155,"type")="addr"
+	Set gtmtypfldindx("unix_db_info","fn")=155
+	Set gtmtypes("unix_db_info",156,"name")="unix_db_info.fd"
+	Set gtmtypes("unix_db_info",156,"off")=868
 	Set gtmtypes("unix_db_info",156,"len")=4
-	Set gtmtypes("unix_db_info",156,"type")="boolean_t"
-	Set gtmtypfldindx("unix_db_info","raw")=156
+	Set gtmtypes("unix_db_info",156,"type")="int"
+	Set gtmtypfldindx("unix_db_info","fd")=156
+	Set gtmtypes("unix_db_info",157,"name")="unix_db_info.owning_gd"
+	Set gtmtypes("unix_db_info",157,"off")=872
+	Set gtmtypes("unix_db_info",157,"len")=4
+	Set gtmtypes("unix_db_info",157,"type")="addr"
+	Set gtmtypfldindx("unix_db_info","owning_gd")=157
+	Set gtmtypes("unix_db_info",158,"name")="unix_db_info.fileid"
+	Set gtmtypes("unix_db_info",158,"off")=876
+	Set gtmtypes("unix_db_info",158,"len")=20
+	Set gtmtypes("unix_db_info",158,"type")="unix_file_id"
+	Set gtmtypfldindx("unix_db_info","fileid")=158
+	Set gtmtypes("unix_db_info",159,"name")="unix_db_info.fileid.inode"
+	Set gtmtypes("unix_db_info",159,"off")=876
+	Set gtmtypes("unix_db_info",159,"len")=8
+	Set gtmtypes("unix_db_info",159,"type")="ino_t"
+	Set gtmtypfldindx("unix_db_info","fileid.inode")=159
+	Set gtmtypes("unix_db_info",160,"name")="unix_db_info.fileid.device"
+	Set gtmtypes("unix_db_info",160,"off")=884
+	Set gtmtypes("unix_db_info",160,"len")=8
+	Set gtmtypes("unix_db_info",160,"type")="dev_t"
+	Set gtmtypfldindx("unix_db_info","fileid.device")=160
+	Set gtmtypes("unix_db_info",161,"name")="unix_db_info.fileid.st_gen"
+	Set gtmtypes("unix_db_info",161,"off")=892
+	Set gtmtypes("unix_db_info",161,"len")=4
+	Set gtmtypes("unix_db_info",161,"type")="unsigned-int"
+	Set gtmtypfldindx("unix_db_info","fileid.st_gen")=161
+	Set gtmtypes("unix_db_info",162,"name")="unix_db_info.semid"
+	Set gtmtypes("unix_db_info",162,"off")=896
+	Set gtmtypes("unix_db_info",162,"len")=4
+	Set gtmtypes("unix_db_info",162,"type")="int"
+	Set gtmtypfldindx("unix_db_info","semid")=162
+	Set gtmtypes("unix_db_info",163,"name")="unix_db_info.gt_sem_ctime"
+	Set gtmtypes("unix_db_info",163,"off")=900
+	Set gtmtypes("unix_db_info",163,"len")=4
+	Set gtmtypes("unix_db_info",163,"type")="time_t"
+	Set gtmtypfldindx("unix_db_info","gt_sem_ctime")=163
+	Set gtmtypes("unix_db_info",164,"name")="unix_db_info.shmid"
+	Set gtmtypes("unix_db_info",164,"off")=904
+	Set gtmtypes("unix_db_info",164,"len")=4
+	Set gtmtypes("unix_db_info",164,"type")="int"
+	Set gtmtypfldindx("unix_db_info","shmid")=164
+	Set gtmtypes("unix_db_info",165,"name")="unix_db_info.gt_shm_ctime"
+	Set gtmtypes("unix_db_info",165,"off")=908
+	Set gtmtypes("unix_db_info",165,"len")=4
+	Set gtmtypes("unix_db_info",165,"type")="time_t"
+	Set gtmtypfldindx("unix_db_info","gt_shm_ctime")=165
+	Set gtmtypes("unix_db_info",166,"name")="unix_db_info.ftok_semid"
+	Set gtmtypes("unix_db_info",166,"off")=912
+	Set gtmtypes("unix_db_info",166,"len")=4
+	Set gtmtypes("unix_db_info",166,"type")="int"
+	Set gtmtypfldindx("unix_db_info","ftok_semid")=166
+	Set gtmtypes("unix_db_info",167,"name")="unix_db_info.key"
+	Set gtmtypes("unix_db_info",167,"off")=916
+	Set gtmtypes("unix_db_info",167,"len")=4
+	Set gtmtypes("unix_db_info",167,"type")="key_t"
+	Set gtmtypfldindx("unix_db_info","key")=167
+	Set gtmtypes("unix_db_info",168,"name")="unix_db_info.raw"
+	Set gtmtypes("unix_db_info",168,"off")=920
+	Set gtmtypes("unix_db_info",168,"len")=4
+	Set gtmtypes("unix_db_info",168,"type")="boolean_t"
+	Set gtmtypfldindx("unix_db_info","raw")=168
+	Set gtmtypes("unix_db_info",169,"name")="unix_db_info.db_fs_block_size"
+	Set gtmtypes("unix_db_info",169,"off")=924
+	Set gtmtypes("unix_db_info",169,"len")=4
+	Set gtmtypes("unix_db_info",169,"type")="unsigned-int"
+	Set gtmtypfldindx("unix_db_info","db_fs_block_size")=169
 	;
 	Set gtmtypes("unix_file_id")="struct"
 	Set gtmtypes("unix_file_id",0)=3
@@ -40596,6 +41451,84 @@ Init
 	Set gtmtypes("wcs_conflict_trace_t",3,"type")="int"
 	Set gtmtypfldindx("wcs_conflict_trace_t","fsync_in_prog_pid")=3
 	;
+	Set gtmtypes("wcs_ops_trace_t")="struct"
+	Set gtmtypes("wcs_ops_trace_t",0)=11
+	Set gtmtypes("wcs_ops_trace_t","len")=52
+	Set gtmtypes("wcs_ops_trace_t",1,"name")="wcs_ops_trace_t.db_tn"
+	Set gtmtypes("wcs_ops_trace_t",1,"off")=0
+	Set gtmtypes("wcs_ops_trace_t",1,"len")=8
+	Set gtmtypes("wcs_ops_trace_t",1,"type")="uint64_t"
+	Set gtmtypfldindx("wcs_ops_trace_t","db_tn")=1
+	Set gtmtypes("wcs_ops_trace_t",2,"name")="wcs_ops_trace_t.process_id"
+	Set gtmtypes("wcs_ops_trace_t",2,"off")=8
+	Set gtmtypes("wcs_ops_trace_t",2,"len")=4
+	Set gtmtypes("wcs_ops_trace_t",2,"type")="unsigned-int"
+	Set gtmtypfldindx("wcs_ops_trace_t","process_id")=2
+	Set gtmtypes("wcs_ops_trace_t",3,"name")="wcs_ops_trace_t.wc_in_free"
+	Set gtmtypes("wcs_ops_trace_t",3,"off")=12
+	Set gtmtypes("wcs_ops_trace_t",3,"len")=4
+	Set gtmtypes("wcs_ops_trace_t",3,"type")="unsigned-int"
+	Set gtmtypfldindx("wcs_ops_trace_t","wc_in_free")=3
+	Set gtmtypes("wcs_ops_trace_t",4,"name")="wcs_ops_trace_t.wcs_active_lvl"
+	Set gtmtypes("wcs_ops_trace_t",4,"off")=16
+	Set gtmtypes("wcs_ops_trace_t",4,"len")=4
+	Set gtmtypes("wcs_ops_trace_t",4,"type")="unsigned-int"
+	Set gtmtypfldindx("wcs_ops_trace_t","wcs_active_lvl")=4
+	Set gtmtypes("wcs_ops_trace_t",5,"name")="wcs_ops_trace_t.wcs_wip_lvl"
+	Set gtmtypes("wcs_ops_trace_t",5,"off")=20
+	Set gtmtypes("wcs_ops_trace_t",5,"len")=4
+	Set gtmtypes("wcs_ops_trace_t",5,"type")="unsigned-int"
+	Set gtmtypfldindx("wcs_ops_trace_t","wcs_wip_lvl")=5
+	Set gtmtypes("wcs_ops_trace_t",6,"name")="wcs_ops_trace_t.type"
+	Set gtmtypes("wcs_ops_trace_t",6,"off")=24
+	Set gtmtypes("wcs_ops_trace_t",6,"len")=4
+	Set gtmtypes("wcs_ops_trace_t",6,"type")="int"
+	Set gtmtypfldindx("wcs_ops_trace_t","type")=6
+	Set gtmtypes("wcs_ops_trace_t",7,"name")="wcs_ops_trace_t.blk"
+	Set gtmtypes("wcs_ops_trace_t",7,"off")=28
+	Set gtmtypes("wcs_ops_trace_t",7,"len")=4
+	Set gtmtypes("wcs_ops_trace_t",7,"type")="int"
+	Set gtmtypfldindx("wcs_ops_trace_t","blk")=7
+	Set gtmtypes("wcs_ops_trace_t",8,"name")="wcs_ops_trace_t.cr_off"
+	Set gtmtypes("wcs_ops_trace_t",8,"off")=32
+	Set gtmtypes("wcs_ops_trace_t",8,"len")=4
+	Set gtmtypes("wcs_ops_trace_t",8,"type")="intptr_t"
+	Set gtmtypfldindx("wcs_ops_trace_t","cr_off")=8
+	Set gtmtypes("wcs_ops_trace_t",9,"name")="wcs_ops_trace_t.cr_dirty"
+	Set gtmtypes("wcs_ops_trace_t",9,"off")=36
+	Set gtmtypes("wcs_ops_trace_t",9,"len")=8
+	Set gtmtypes("wcs_ops_trace_t",9,"type")="uint64_t"
+	Set gtmtypfldindx("wcs_ops_trace_t","cr_dirty")=9
+	Set gtmtypes("wcs_ops_trace_t",10,"name")="wcs_ops_trace_t.detail1"
+	Set gtmtypes("wcs_ops_trace_t",10,"off")=44
+	Set gtmtypes("wcs_ops_trace_t",10,"len")=4
+	Set gtmtypes("wcs_ops_trace_t",10,"type")="unsigned-int"
+	Set gtmtypfldindx("wcs_ops_trace_t","detail1")=10
+	Set gtmtypes("wcs_ops_trace_t",11,"name")="wcs_ops_trace_t.detail2"
+	Set gtmtypes("wcs_ops_trace_t",11,"off")=48
+	Set gtmtypes("wcs_ops_trace_t",11,"len")=4
+	Set gtmtypes("wcs_ops_trace_t",11,"type")="unsigned-int"
+	Set gtmtypfldindx("wcs_ops_trace_t","detail2")=11
+	;
+	Set gtmtypes("wtstart_cr_list_t")="struct"
+	Set gtmtypes("wtstart_cr_list_t",0)=3
+	Set gtmtypes("wtstart_cr_list_t","len")=12
+	Set gtmtypes("wtstart_cr_list_t",1,"name")="wtstart_cr_list_t.numcrs"
+	Set gtmtypes("wtstart_cr_list_t",1,"off")=0
+	Set gtmtypes("wtstart_cr_list_t",1,"len")=4
+	Set gtmtypes("wtstart_cr_list_t",1,"type")="int"
+	Set gtmtypfldindx("wtstart_cr_list_t","numcrs")=1
+	Set gtmtypes("wtstart_cr_list_t",2,"name")="wtstart_cr_list_t.listsize"
+	Set gtmtypes("wtstart_cr_list_t",2,"off")=4
+	Set gtmtypes("wtstart_cr_list_t",2,"len")=4
+	Set gtmtypes("wtstart_cr_list_t",2,"type")="int"
+	Set gtmtypfldindx("wtstart_cr_list_t","listsize")=2
+	Set gtmtypes("wtstart_cr_list_t",3,"name")="wtstart_cr_list_t.listcrs"
+	Set gtmtypes("wtstart_cr_list_t",3,"off")=8
+	Set gtmtypes("wtstart_cr_list_t",3,"len")=4
+	Set gtmtypes("wtstart_cr_list_t",3,"type")="addr"
+	Set gtmtypfldindx("wtstart_cr_list_t","listcrs")=3
+	;
 	Set gtmtypes("z_records")="struct"
 	Set gtmtypes("z_records",0)=3
 	Set gtmtypes("z_records","len")=12
@@ -41245,6 +42178,7 @@ Init
 	Set gtmstructs("srch_blk_status_struct")="srch_blk_status"
 	Set gtmstructs("st_timer_alloc")="st_timer_alloc"
 	Set gtmstructs("stack_frame_struct")="stack_frame"
+	Set gtmstructs("statsDB_diqe")="statsDB_deferred_init_que_elem"
 	Set gtmstructs("storElemStruct")="storElem"
 	Set gtmstructs("struct_spanode_integ")="span_node_integ"
 	Set gtmstructs("symval_struct")="symval"
@@ -41273,6 +42207,7 @@ Init
 	Set gtmstructs("util_snapshot_struct")="util_snapshot_t"
 	Set gtmstructs("vms_lock_sb_struct")="vms_lock_sb"
 	Set gtmstructs("wcs_conflict_trace_struct")="wcs_conflict_trace_t"
+	Set gtmstructs("wtstart_cr_list_struct")="wtstart_cr_list_t"
 	Set gtmstructs("zro_ent_type")="zro_ent"
 	Set gtmstructs("zshow_out_struct")="zshow_out"
 	Set gtmstructs("zwr_alias_var_struct")="zwr_alias_var"
diff --git a/sr_i386/cmerrors_ctl.c b/sr_i386/cmerrors_ctl.c
index 5e6fa3b..3d09df6 100644
--- a/sr_i386/cmerrors_ctl.c
+++ b/sr_i386/cmerrors_ctl.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information 	*
+ * Copyright (c) 2001-2017 Fidelity National Information 	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
diff --git a/sr_i386/cmierrors_ctl.c b/sr_i386/cmierrors_ctl.c
index 43d69d2..4ff26bf 100644
--- a/sr_i386/cmierrors_ctl.c
+++ b/sr_i386/cmierrors_ctl.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information 	*
+ * Copyright (c) 2001-2017 Fidelity National Information 	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
diff --git a/sr_i386/emit_code.c b/sr_i386/emit_code.c
index aade6e1..4958076 100644
--- a/sr_i386/emit_code.c
+++ b/sr_i386/emit_code.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -94,7 +95,7 @@ void trip_gen(triple *ct)
 {
 	oprtype		**sopr, *opr;	/* triple operand */
 	oprtype		*saved_opr[MAX_ARGS];
-	unsigned short	oct;
+	uint4		oct;
 	short		tp;	/* template pointer */
 	short		*tsp;	/* template short pointer */
 	triple		*ttp;	/* temp triple pointer */
diff --git a/sr_i386/gdeerrors_ctl.c b/sr_i386/gdeerrors_ctl.c
index 11a983b..a7a8ef2 100644
--- a/sr_i386/gdeerrors_ctl.c
+++ b/sr_i386/gdeerrors_ctl.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information 	*
+ * Copyright (c) 2001-2017 Fidelity National Information 	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -68,7 +68,7 @@ LITDEF	err_msg gdeerrors[] = {
 	{ "INVGBLDIR", "Invalid Global Directory spec: !AD.!/Continuing with !AD", 4 },
 	{ "WRITEERROR", "Cannot exit because of write failure.  Reason for failure: !AD", 2 },
 	{ "NONASCII", "!AD is illegal for a !AD as it contains non-ASCII characters", 4 },
-	{ "CRYPTNOMM", "!AD is an encrypted database. Cannot support MM access method.", 2 },
+	{ "GDECRYPTNOMM", "!AD segment has encryption turned on. Cannot support MM access method.", 2 },
 	{ "JNLALLOCGROW", "Increased Journal ALLOCATION from [!AD blocks] to [!AD blocks] to match AUTOSWITCHLIMIT for !AD !AD", 8 },
 	{ "KEYFORBLK", "But block size !AD and reserved bytes !AD limit key size to !AD", 6 },
 	{ "STRMISSQUOTE", "Missing double-quote at end of string specification !AD", 2 },
@@ -97,6 +97,8 @@ LITDEF	err_msg gdeerrors[] = {
 	{ "GBLNAMCOLLRANGE", "Collation sequence #!UL is out of range (0 thru 255)", 3 },
 	{ "STDNULLCOLLREQ", "Region !AD needs Standard Null Collation enabled because global !AD spans through it", 4 },
 	{ "GBLNAMCOLLVER", "Global directory indicates GBLNAME !AD has collation sequence #!UL with a version #!UL but shared library reports different version #!UL", 5 },
+	{ "GDEASYNCIONOMM", "!AD segment has ASYNCIO turned on. Cannot support MM access method.", 2 },
+	{ "NOPERCENTY", "^%Y* is a reserved global name in GT.M", 0 },
 };
 
 LITDEF	int GDE_BLKSIZ512 = 150503435;
@@ -154,7 +156,7 @@ LITDEF	int GDE_GDNOTSET = 150503843;
 LITDEF	int GDE_INVGBLDIR = 150503851;
 LITDEF	int GDE_WRITEERROR = 150503859;
 LITDEF	int GDE_NONASCII = 150503866;
-LITDEF	int GDE_CRYPTNOMM = 150503874;
+LITDEF	int GDE_GDECRYPTNOMM = 150503874;
 LITDEF	int GDE_JNLALLOCGROW = 150503883;
 LITDEF	int GDE_KEYFORBLK = 150503891;
 LITDEF	int GDE_STRMISSQUOTE = 150503898;
@@ -183,9 +185,11 @@ LITDEF	int GDE_NAMGVSUBOFLOW = 150504074;
 LITDEF	int GDE_GBLNAMCOLLRANGE = 150504082;
 LITDEF	int GDE_STDNULLCOLLREQ = 150504091;
 LITDEF	int GDE_GBLNAMCOLLVER = 150504098;
+LITDEF	int GDE_GDEASYNCIONOMM = 150504106;
+LITDEF	int GDE_NOPERCENTY = 150504114;
 
 GBLDEF	err_ctl gdeerrors_ctl = {
 	248,
 	"GDE",
 	&gdeerrors[0],
-	84};
+	86};
diff --git a/sr_i386/merrors_ansi.h b/sr_i386/merrors_ansi.h
index 9dee92b..ddf134a 100644
--- a/sr_i386/merrors_ansi.h
+++ b/sr_i386/merrors_ansi.h
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information 	*
+ * Copyright (c) 2001-2017 Fidelity National Information 	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -608,8 +608,8 @@ const static readonly int error_ansi[] = {
 	   0,	/* MEMORYRECURSIVE */
 	   0,	/* FREEZEID */
 	   0,	/* BLKWRITERR */
-	   0,	/* STOPTIMEOUT */
-	   0,	/* UNUSEDMSG777 */
+	   0,	/* UNUSEDMSG776 */
+	   0,	/* PINENTRYERR */
 	   0,	/* BCKUPBUFLUSH */
 	   0,	/* NOFORKCORE */
 	   0,	/* JNLREAD */
@@ -1359,7 +1359,7 @@ const static readonly int error_ansi[] = {
 	   0,	/* GETNAMEINFO */
 	   0,	/* SOCKBIND */
 	   0,	/* INSTFRZDEFER */
-	   0,	/* REGOPENRETRY */
+	   0,	/* UNUSEDMSG1529 */
 	   0,	/* REGOPENFAIL */
 	   0,	/* REPLINSTNOSHM */
 	   0,	/* DEVPARMTOOSMALL */
@@ -1369,8 +1369,8 @@ const static readonly int error_ansi[] = {
 	   0,	/* GBLNOMAPTOREG */
 	   0,	/* ISSPANGBL */
 	   0,	/* TPNOSUPPORT */
-	   0,	/* GVSUBSERR */
-	   0,	/* UNUSEDMSG1540 */
+	   0,	/* UNUSEDMSG1539 */
+	   0,	/* ZATRANSERR */
 	   0,	/* FILTERTIMEDOUT */
 	   0,	/* TLSDLLNOOPEN */
 	   0,	/* TLSINIT */
@@ -1451,4 +1451,44 @@ const static readonly int error_ansi[] = {
 	   0,	/* ENCRYPTCONFLT */
 	   0,	/* JNLPOOLRECOVERY */
 	   0,	/* LOCKTIMINGINTP */
+	   0,	/* PBNUNSUPTYPE */
+	   0,	/* DBFHEADLRU */
+	   0,	/* ASYNCIONOV4 */
+	   0,	/* AIOCANCELTIMEOUT */
+	   0,	/* DBGLDMISMATCH */
+	   0,	/* DBBLKSIZEALIGN */
+	   0,	/* ASYNCIONOMM */
+	   0,	/* RESYNCSEQLOW */
+	   0,	/* DBNULCOL */
+	   0,	/* UTF16ENDIAN */
+	   0,	/* OFRZACTIVE */
+	   0,	/* OFRZAUTOREL */
+	   0,	/* OFRZCRITREL */
+	   0,	/* OFRZCRITSTUCK */
+	   0,	/* OFRZNOTHELD */
+	   0,	/* AIOBUFSTUCK */
+	   0,	/* DBDUPNULCOL */
+	   0,	/* CHANGELOGINTERVAL */
+	   0,	/* DBNONUMSUBS */
+	   0,	/* AUTODBCREFAIL */
+	   0,	/* RNDWNSTATSDBFAIL */
+	   0,	/* STATSDBNOTSUPP */
+	   0,	/* TPNOSTATSHARE */
+	   0,	/* FNTRANSERROR */
+	   0,	/* NOCRENETFILE */
+	   0,	/* DSKSPCCHK */
+	   0,	/* NOCREMMBIJ */
+	   0,	/* FILECREERR */
+	   0,	/* RAWDEVUNSUP */
+	   0,	/* DBFILECREATED */
+	   0,	/* PCTYRESERVED */
+	   0,	/* REGFILENOTFOUND */
+	   0,	/* DRVLONGJMP */
+	   0,	/* INVSTATSDB */
+	   0,	/* STATSDBERR */
+	   0,	/* STATSDBINUSE */
+	   0,	/* STATSDBFNERR */
+	   0,	/* JNLSWITCHRETRY */
+	   0,	/* JNLSWITCHFAIL */
+	   0,	/* CLISTRTOOLONG */
 	};
diff --git a/sr_i386/merrors_ctl.c b/sr_i386/merrors_ctl.c
index 2afc71f..47f0528 100644
--- a/sr_i386/merrors_ctl.c
+++ b/sr_i386/merrors_ctl.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information 	*
+ * Copyright (c) 2001-2017 Fidelity National Information 	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -414,7 +414,7 @@ LITDEF	err_msg merrors[] = {
 	{ "ZWRSPONE", "Subscript patterns in ZWRITE are atomic; Invalid delimiter", 0 },
 	{ "FILEDEL", "File !AD successfully deleted", 2 },
 	{ "JNLBADLABEL", "Journal file !AD has a bad GT.M Journal File Label. Expected !AD. Found !AD.", 6 },
-	{ "JNLREADEOF", "End of journal file encountered for !AD", 2 },
+	{ "JNLREADEOF", "End of journal file encountered", 0 },
 	{ "JNLRECFMT", "Journal file record format error encountered", 0 },
 	{ "BLKTOODEEP", "Block level too deep", 0 },
 	{ "NESTFORMP", "Formal parameter list cannot be combined with nested line", 0 },
@@ -551,8 +551,8 @@ LITDEF	err_msg merrors[] = {
 	{ "INVACCMETHOD", "Invalid access method", 0 },
 	{ "JNLOPNERR", "Error opening journal file !AD!/  for database !AD", 4 },
 	{ "JNLRECTYPE", "Journal record type does not match expected type", 0 },
-	{ "JNLTRANSGTR", "Transaction number in journal is greater than in database", 0 },
-	{ "JNLTRANSLSS", "Transaction number in journal is less than in database", 0 },
+	{ "JNLTRANSGTR", "Transaction number !@UQ in journal header is greater than !@UQ in database header", 2 },
+	{ "JNLTRANSLSS", "Transaction number !@UQ in journal header is less than !@UQ in database header", 2 },
 	{ "JNLWRERR", "Error writing journal file !AD.  Unable to update header.", 2 },
 	{ "FILEIDMATCH", "Saved File ID does not match the current ID - the file appears to have been moved", 0 },
 	{ "EXTSRCLIN", "!_!AD!/!_!AD", 4 },
@@ -610,8 +610,8 @@ LITDEF	err_msg merrors[] = {
 	{ "MEMORYRECURSIVE", "Memory Subsystem called recursively", 0 },
 	{ "FREEZEID", "Cache !AD on !AD by freeze id 0x!XL with match 0x!XL from 0x!XJ", 7 },
 	{ "BLKWRITERR", "Unable to queue disk write for block 0x!XL.  Will keep trying.", 1 },
-	{ "STOPTIMEOUT", "Waited too long for stopped process to release.  Region: !AD.", 2 },
-	{ "UNUSEDMSG777", "TRIGMODINTP last used in V6.2-000", 0 },
+	{ "UNUSEDMSG776", "STOPTIMEOUT last used in V6.3-000A", 0 },
+	{ "PINENTRYERR", "Custom pinentry program failure", 0 },
 	{ "BCKUPBUFLUSH", "Unable to flush buffer for online backup", 0 },
 	{ "NOFORKCORE", "Unable to fork off process to create core.  Core creation postponed.", 0 },
 	{ "JNLREAD", "Error reading from journal file !AD at offset [0x!XL]", 3 },
@@ -797,7 +797,7 @@ LITDEF	err_msg merrors[] = {
 	{ "DBSVBNMIN", "!AD Start VBN smaller than possible", 2 },
 	{ "DBTTLBLK0", "!AD Total blocks equal zero", 2 },
 	{ "DBNOTDB", "!AD File does not have a valid GDS file header", 2 },
-	{ "DBTOTBLK", "Total blocks should be 0x!XL, is 0x!XL", 2 },
+	{ "DBTOTBLK", "File header indicates total blocks is 0x!XL but file size indicates total blocks would be 0x!XL", 2 },
 	{ "DBTN", "Block TN is 0x!16 at XQ", 1 },
 	{ "DBNOREGION", "None of the database regions accessible", 0 },
 	{ "DBTNRESETINC", "WARNING: tn_reset for database is incomplete due to integrity errors", 0 },
@@ -1090,7 +1090,7 @@ LITDEF	err_msg merrors[] = {
 	{ "REPLINSTSEQORD", "!AD has seqno [0x!16 at XQ] which is less than last record seqno [0x!16 at XQ] in replication instance file !AD", 6 },
 	{ "REPLINSTSTNDALN", "Could not get exclusive access to replication instance file !AD", 2 },
 	{ "REPLREQROLLBACK", "Replication instance file !AD indicates abnormal shutdown or an incomplete ROLLBACK. Run MUPIP JOURNAL ROLLBACK first", 2 },
-	{ "REQROLLBACK", "Error accessing database !AD.  Run MUPIP JOURNAL ROLLBACK on cluster node !AD.", 4 },
+	{ "REQROLLBACK", "Error accessing database !AD.  Run MUPIP JOURNAL -ROLLBACK -NOONLINE on cluster node !AD.", 4 },
 	{ "INVOBJFILE", "Cannot ZLINK object file !AD due to unexpected format", 2 },
 	{ "SRCSRVEXISTS", "Source server for secondary instance !AD is already running with pid !UL", 3 },
 	{ "SRCSRVNOTEXIST", "Source server for secondary instance !AD is not alive", 2 },
@@ -1105,7 +1105,7 @@ LITDEF	err_msg merrors[] = {
 	{ "DLRCILLEGAL", "!_!AD!/!_!_!_Illegal $CHAR() value !UL", 3 },
 	{ "NONUTF8LOCALE", "Locale has character encoding (!AD) which is not compatible with UTF-8 character set", 2 },
 	{ "INVDLRCVAL", "Invalid $CHAR() value !UL", 1 },
-	{ "DBMISALIGN", "Database file !AD has !UL blocks which does not match alignment rules. Reconstruct the database from a backup or extend it by at least !UL blocks.", 4 },
+	{ "DBMISALIGN", "File header indicates total blocks is 0x!XL but file size indicates total blocks would be between 0x!XL and 0x!XL. Reconstruct the database from a backup or extend it by at least !UL blocks.", 4 },
 	{ "LOADINVCHSET", "Extract file CHSET (!AD) is incompatible with gtm_chset", 2 },
 	{ "DLLCHSETM", "Routine !AD in library !AD was compiled with CHSET=M which is different from $ZCHSET. Recompile with CHSET=UTF-8 and re-link.", 4 },
 	{ "DLLCHSETUTF8", "Routine !AD in library !AD was compiled with CHSET=UTF-8 which is different from $ZCHSET. Recompile with CHSET=M and re-link.", 4 },
@@ -1277,7 +1277,7 @@ LITDEF	err_msg merrors[] = {
 	{ "SRVLCKWT2LNG", "PID !UL is holding the source server lock. Waited for !UL minute(s). Now exiting", 2 },
 	{ "IGNBMPMRKFREE", "Ignoring bitmap free-up operation for region !AD (!AD) due to concurrent ONLINE ROLLBACK", 4 },
 	{ "PERMGENFAIL", "Failed to determine access permissions to use for creation of !AD for file !AD", 4 },
-	{ "PERMGENDIAG", "Permissions: Proc(uid:!UL,gid:!UL), DB File(uid:!UL,gid:!UL,perm:!AD), Lib File(gid:!UL,perm:!AD), Group Mem(opener:!UL,owner:!UL)", 11 },
+	{ "PERMGENDIAG", "Permissions: Proc(uid:!UL,gid:!UL!AD), DB File(uid:!UL,gid:!UL,perm:!AD), Lib File(gid:!UL,perm:!AD)", 11 },
 	{ "MUTRUNC1ATIME", "Process with PID !UL already performing truncate in region !AD", 3 },
 	{ "MUTRUNCBACKINPROG", "Truncate detected concurrent backup in progress for region !AD", 2 },
 	{ "MUTRUNCERROR", "Truncate of region !AD encountered service error !AD", 4 },
@@ -1361,7 +1361,7 @@ LITDEF	err_msg merrors[] = {
 	{ "GETNAMEINFO", "Error in getting name info", 0 },
 	{ "SOCKBIND", "Error in binding socket", 0 },
 	{ "INSTFRZDEFER", "Instance Freeze initiated by !AD error on region !AD deferred due to critical resource conflict", 4 },
-	{ "REGOPENRETRY", "Attempt to open region !AD (!AD) using startup shortcut failed due to conflicting database shutdown. Retrying...", 4 },
+	{ "UNUSEDMSG1529", "REGOPENRETRY last used in V6.3-000A", 0 },
 	{ "REGOPENFAIL", "Failed to open region !AD (!AD) due to conflicting database shutdown activity", 4 },
 	{ "REPLINSTNOSHM", "Database !AD has no active connection to a replication journal pool", 2 },
 	{ "DEVPARMTOOSMALL", "Deviceparameter must be greater than zero (0)", 0 },
@@ -1371,8 +1371,8 @@ LITDEF	err_msg merrors[] = {
 	{ "GBLNOMAPTOREG", "Global !AD does not map to region !AD in current global directory", 4 },
 	{ "ISSPANGBL", "Operation cannot be performed on global ^!AD as it spans multiple regions in current global directory", 2 },
 	{ "TPNOSUPPORT", "Operation cannot be performed while inside of a TP transaction", 0 },
-	{ "GVSUBSERR", "Invalid subscripted global name specification in $VIEW() function", 0 },
-	{ "UNUSEDMSG1540", "TRIGNOSPANBL : Last used in V6.2-000", 0 },
+	{ "UNUSEDMSG1539", "GVSUBSERR last used in V6.3-000A", 0 },
+	{ "ZATRANSERR", "The input string is too long to convert", 0 },
 	{ "FILTERTIMEDOUT", "Replication server timed out attempting to read seqno !16 at XQ from external filter", 1 },
 	{ "TLSDLLNOOPEN", "Failed to load GT.M TLS/SSL library for secure communication", 0 },
 	{ "TLSINIT", "Failed to initialize GT.M TLS/SSL library for secure communication", 0 },
@@ -1393,7 +1393,7 @@ LITDEF	err_msg merrors[] = {
 	{ "DSENOTOPEN", "DSE could not open region !AD - see DSE startup error message for cause", 2 },
 	{ "ZSOCKETATTR", "Attribute \"!AD\" invalid for $ZSOCKET function", 2 },
 	{ "ZSOCKETNOTSOCK", "$ZSOCKET function called but device is not a socket", 0 },
-	{ "CHSETALREADY", "CHSET !AD already specified for socket device", 2 },
+	{ "CHSETALREADY", "Socket device already contains sockets with iCHSET=!AD, oCHSET=!AD", 4 },
 	{ "DSEMAXBLKSAV", "DSE cannot SAVE another block as it already has the maximum of !UL", 1 },
 	{ "BLKINVALID", "!XL is not a valid block as database file !AD has !XL total blocks", 4 },
 	{ "CANTBITMAP", "Can't perform this operation on a bit map (block at a 200 hexadecimal boundary)", 0 },
@@ -1453,6 +1453,46 @@ LITDEF	err_msg merrors[] = {
 	{ "ENCRYPTCONFLT", "MUPIP REORG -ENCRYPT and MUPIP EXTRACT -FORMAT=BIN cannot run concurrently - skipping !AD on region: !AD, file: !AD", 6 },
 	{ "JNLPOOLRECOVERY", "The size of the data written to the journal pool (!UL) does not match the size of the data in the journal record (!UL) for the replication instance file !AZ. The journal pool has been recovered.", 3 },
 	{ "LOCKTIMINGINTP", "A LOCK at !AD within a TP transaction is waiting in a final TP retry, which may lead to a general response gap", 2 },
+	{ "PBNUNSUPTYPE", "$ZPEEK() does not support type !AD", 2 },
+	{ "DBFHEADLRU", "Database file !AD LRU pointer: 0x!16 at XQ is outside of range: 0x!16 at XQ to 0x!16 at XQ or misaligned", 5 },
+	{ "ASYNCIONOV4", "!AD database has !AD; cannot !AD", 6 },
+	{ "AIOCANCELTIMEOUT", "Pid [0x!XL] timed out waiting for pending async io to complete/cancel in database file !AD", 3 },
+	{ "DBGLDMISMATCH", "Database file !AD has !AZ whereas !AZ !AD in global directory !AD has !AZ", 9 },
+	{ "DBBLKSIZEALIGN", "Database file !AD has AIO=ON and block_size=!UL which is not a multiple of filesystem block size !UL", 4 },
+	{ "ASYNCIONOMM", "Database file !AD!AD cannot !AD", 6 },
+	{ "RESYNCSEQLOW", "MUPIP JOURNAL -ROLLBACK -FORWARD -RESYNC=!@ZQ [0x!16 at XQ] requested is lower than !@ZQ [0x!16 at XQ] which is the starting sequence number of the instance", 4 },
+	{ "DBNULCOL", "NULL collation representation for record !UL in block !UL is !AD which differs from the database file header settings of !AD", 6 },
+	{ "UTF16ENDIAN", "The device previously set UTF-16 endianness to !AD and cannot change to !AD", 4 },
+	{ "OFRZACTIVE", "Region !AD has an Online Freeze", 2 },
+	{ "OFRZAUTOREL", "Online Freeze automatically released for region !AD", 2 },
+	{ "OFRZCRITREL", "Proceeding with a write to region !AD after Online Freeze while holding crit", 2 },
+	{ "OFRZCRITSTUCK", "Unable to proceed with a write to region !AD with Online Freeze while holding crit. Region stuck until freeze is removed.", 2 },
+	{ "OFRZNOTHELD", "Online Freeze had been automatically released for at least one region", 0 },
+	{ "AIOBUFSTUCK", "Waited !UL minutes for PID: !UL to finish AIO disk write of block: !UL [0x!XL] aio_error=!UL", 5 },
+	{ "DBDUPNULCOL", "Discarding !AD=!AD key due to duplicate null collation record", 4 },
+	{ "CHANGELOGINTERVAL", "!AD Server now logging to !AD with a !UL second interval", 5 },
+	{ "DBNONUMSUBS", "!AD key contains a numeric form of subscript in a global defined to collate all subscripts as strings", 2 },
+	{ "AUTODBCREFAIL", "Automatic creation of database file !AD associated with region !AD failed; see associated messages for details", 4 },
+	{ "RNDWNSTATSDBFAIL", "Rundown of statistics database region !AD (DB !AD) failed at/in !AD with following error: !AD", 8 },
+	{ "STATSDBNOTSUPP", "Attempted operation is not supported on statistics database file !AD", 2 },
+	{ "TPNOSTATSHARE", "VIEW \"[NO]STATSHARE\" is not allowed inside a TP transaction", 0 },
+	{ "FNTRANSERROR", "Buffer too small error occurred trying to translate filename !AD", 2 },
+	{ "NOCRENETFILE", "Database file !AD not created; cannot create across network", 2 },
+	{ "DSKSPCCHK", "Error while checking for available disk space to create file !AD", 2 },
+	{ "NOCREMMBIJ", "MM access method not compatible with BEFORE image journaling; Database file !AD not created", 2 },
+	{ "FILECREERR", "Error !AD for file !AD during DB creation", 4 },
+	{ "RAWDEVUNSUP", "RAW device for region !AD is not supported", 2 },
+	{ "DBFILECREATED", "Database file !AD created", 2 },
+	{ "PCTYRESERVED", "Attempted operation not supported on ^%Y* namespace", 0 },
+	{ "REGFILENOTFOUND", "Database file !AD corresponding to region !AD cannot be found", 4 },
+	{ "DRVLONGJMP", "Fake internal error that drives longjmp()", 0 },
+	{ "INVSTATSDB", "Database file !AD associated with statistics database region !AD is not a valid statistics database", 4 },
+	{ "STATSDBERR", "Error in/at !AD attempting to use a statistics database: !AD", 4 },
+	{ "STATSDBINUSE", "Statistics database !AD is in use with database !AD so cannot also be used with database !AD", 6 },
+	{ "STATSDBFNERR", "This database has no accessible statistics database due to the following error: !AD", 2 },
+	{ "JNLSWITCHRETRY", "Retrying previously abandoned switch of journal file !AD for database !AD", 4 },
+	{ "JNLSWITCHFAIL", "Failed to switch journal file !AD for database file !AD", 4 },
+	{ "CLISTRTOOLONG", "!AZ specified is !UL bytes long which is greater than the allowed maximum of !UL bytes", 3 },
 };
 
 LITDEF	int ERR_ACK = 150372361;
@@ -2052,8 +2092,8 @@ LITDEF	int ERR_KRNLKILL = 150377108;
 LITDEF	int ERR_MEMORYRECURSIVE = 150377116;
 LITDEF	int ERR_FREEZEID = 150377123;
 LITDEF	int ERR_BLKWRITERR = 150377131;
-LITDEF	int ERR_STOPTIMEOUT = 150377138;
-LITDEF	int ERR_UNUSEDMSG777 = 150377146;
+LITDEF	int ERR_UNUSEDMSG776 = 150377138;
+LITDEF	int ERR_PINENTRYERR = 150377146;
 LITDEF	int ERR_BCKUPBUFLUSH = 150377154;
 LITDEF	int ERR_NOFORKCORE = 150377160;
 LITDEF	int ERR_JNLREAD = 150377170;
@@ -2803,7 +2843,7 @@ LITDEF	int ERR_GETADDRINFO = 150383114;
 LITDEF	int ERR_GETNAMEINFO = 150383122;
 LITDEF	int ERR_SOCKBIND = 150383130;
 LITDEF	int ERR_INSTFRZDEFER = 150383139;
-LITDEF	int ERR_REGOPENRETRY = 150383147;
+LITDEF	int ERR_UNUSEDMSG1529 = 150383146;
 LITDEF	int ERR_REGOPENFAIL = 150383154;
 LITDEF	int ERR_REPLINSTNOSHM = 150383162;
 LITDEF	int ERR_DEVPARMTOOSMALL = 150383170;
@@ -2813,8 +2853,8 @@ LITDEF	int ERR_ACTCOLLMISMTCH = 150383194;
 LITDEF	int ERR_GBLNOMAPTOREG = 150383202;
 LITDEF	int ERR_ISSPANGBL = 150383210;
 LITDEF	int ERR_TPNOSUPPORT = 150383218;
-LITDEF	int ERR_GVSUBSERR = 150383226;
-LITDEF	int ERR_UNUSEDMSG1540 = 150383234;
+LITDEF	int ERR_UNUSEDMSG1539 = 150383226;
+LITDEF	int ERR_ZATRANSERR = 150383234;
 LITDEF	int ERR_FILTERTIMEDOUT = 150383242;
 LITDEF	int ERR_TLSDLLNOOPEN = 150383250;
 LITDEF	int ERR_TLSINIT = 150383258;
@@ -2895,9 +2935,49 @@ LITDEF	int ERR_MUREENCRYPTV4NOALLOW = 150383850;
 LITDEF	int ERR_ENCRYPTCONFLT = 150383858;
 LITDEF	int ERR_JNLPOOLRECOVERY = 150383866;
 LITDEF	int ERR_LOCKTIMINGINTP = 150383872;
+LITDEF	int ERR_PBNUNSUPTYPE = 150383882;
+LITDEF	int ERR_DBFHEADLRU = 150383891;
+LITDEF	int ERR_ASYNCIONOV4 = 150383898;
+LITDEF	int ERR_AIOCANCELTIMEOUT = 150383906;
+LITDEF	int ERR_DBGLDMISMATCH = 150383914;
+LITDEF	int ERR_DBBLKSIZEALIGN = 150383922;
+LITDEF	int ERR_ASYNCIONOMM = 150383930;
+LITDEF	int ERR_RESYNCSEQLOW = 150383938;
+LITDEF	int ERR_DBNULCOL = 150383946;
+LITDEF	int ERR_UTF16ENDIAN = 150383954;
+LITDEF	int ERR_OFRZACTIVE = 150383960;
+LITDEF	int ERR_OFRZAUTOREL = 150383968;
+LITDEF	int ERR_OFRZCRITREL = 150383976;
+LITDEF	int ERR_OFRZCRITSTUCK = 150383984;
+LITDEF	int ERR_OFRZNOTHELD = 150383992;
+LITDEF	int ERR_AIOBUFSTUCK = 150384002;
+LITDEF	int ERR_DBDUPNULCOL = 150384010;
+LITDEF	int ERR_CHANGELOGINTERVAL = 150384019;
+LITDEF	int ERR_DBNONUMSUBS = 150384026;
+LITDEF	int ERR_AUTODBCREFAIL = 150384034;
+LITDEF	int ERR_RNDWNSTATSDBFAIL = 150384042;
+LITDEF	int ERR_STATSDBNOTSUPP = 150384050;
+LITDEF	int ERR_TPNOSTATSHARE = 150384058;
+LITDEF	int ERR_FNTRANSERROR = 150384066;
+LITDEF	int ERR_NOCRENETFILE = 150384074;
+LITDEF	int ERR_DSKSPCCHK = 150384082;
+LITDEF	int ERR_NOCREMMBIJ = 150384090;
+LITDEF	int ERR_FILECREERR = 150384098;
+LITDEF	int ERR_RAWDEVUNSUP = 150384106;
+LITDEF	int ERR_DBFILECREATED = 150384115;
+LITDEF	int ERR_PCTYRESERVED = 150384122;
+LITDEF	int ERR_REGFILENOTFOUND = 150384131;
+LITDEF	int ERR_DRVLONGJMP = 150384138;
+LITDEF	int ERR_INVSTATSDB = 150384146;
+LITDEF	int ERR_STATSDBERR = 150384154;
+LITDEF	int ERR_STATSDBINUSE = 150384162;
+LITDEF	int ERR_STATSDBFNERR = 150384170;
+LITDEF	int ERR_JNLSWITCHRETRY = 150384179;
+LITDEF	int ERR_JNLSWITCHFAIL = 150384186;
+LITDEF	int ERR_CLISTRTOOLONG = 150384194;
 
 GBLDEF	err_ctl merrors_ctl = {
 	246,
 	"GTM",
 	&merrors[0],
-	1440};
+	1480};
diff --git a/sr_i386/ttt.c b/sr_i386/ttt.c
index d9b731e..3ec10e6 100644
--- a/sr_i386/ttt.c
+++ b/sr_i386/ttt.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information 	*
+ * Copyright (c) 2001-2017 Fidelity National Information 	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -14,686 +14,693 @@
 #include "vxi.h"
 #include "vxt.h"
 #include "xfer_enum.h"
-LITDEF short ttt[4275] = {
+LITDEF short ttt[4318] = {
 
-/*    0 */	0,0,0,0,326,3427,2868,550,
-/*    8 */	2246,2853,2883,1927,404,3377,2039,3001,
-/*   16 */	2122,2110,3610,3647,2083,2092,2164,2104,
-/*   24 */	2155,2134,2062,750,777,765,804,816,
-/*   32 */	828,846,888,906,924,945,974,1004,
-/*   40 */	1019,1034,1049,1067,1079,2971,2986,1151,
-/*   48 */	1184,1217,1256,1319,1370,1646,1661,1676,
-/*   56 */	1706,1745,1757,1781,1808,1829,1847,3442,
-/*   64 */	3464,0,0,0,0,565,0,506,
-/*   72 */	0,1913,0,2957,0,0,0,0,
-/*   80 */	0,0,358,416,2224,2230,2645,2672,
-/*   88 */	2690,2793,2731,2722,2808,3516,3600,2904,
-/*   96 */	0,2936,3067,3030,3015,3045,3391,3243,
-/*  104 */	3309,3522,3534,3549,3573,3582,3567,3558,
-/*  112 */	3342,3643,3656,3678,3715,3727,3748,3772,
-/*  120 */	3838,0,0,2841,2206,3119,4224,638,
-/*  128 */	4227,692,2702,3085,520,526,4230,2309,
-/*  136 */	2396,2296,473,2332,2416,2071,2354,2426,
-/*  144 */	4233,2191,2182,4237,1388,1406,4238,354,
-/*  152 */	350,3333,428,4242,4245,4248,2922,4251,
-/*  160 */	4254,4257,4260,4263,4266,3413,0,2817,
-/*  168 */	2485,2463,1625,2454,2242,2053,2768,1948,
-/*  176 */	717,2758,0,0,2261,3591,3619,1601,
-/*  184 */	3543,2344,1941,535,3739,1793,2173,1304,
-/*  192 */	341,3071,604,670,588,648,3703,1199,
-/*  200 */	1238,3671,2897,2200,2832,2911,620,1091,
-/*  208 */	2772,4269,2406,3790,3808,3823,497,2787,
-/*  216 */	3063,1886,3859,3850,1442,3405,579,1691,
-/*  224 */	1733,2369,4272,3476,2442,726,864,3102,
-/*  232 */	3631,3500,3486,3493,3482,702,959,2319,
-/*  240 */	1133,2283,1121,2143,1106,1166,2381,1571,
-/*  248 */	1514,1499,1553,1469,1481,1526,1454,1538,
-/*  256 */	1586,0,3363,0,983,992,3222,3288,
-/*  264 */	1820,3201,3267,2270,3895,3865,3871,3883,
-/*  272 */	3905,1343,1355,1277,1289,1331,3454,1721,
-/*  280 */	1859,3919,3934,3970,3997,3952,3129,3141,
-/*  288 */	3153,3165,2681,2696,1613,437,792,1424,
-/*  296 */	629,3177,3189,3982,3988,0,0,0,
-/*  304 */	0,3694,4012,4023,4035,4044,4058,4071,
-/*  312 */	4081,4098,4110,4119,4131,4143,4155,4170,
-/*  320 */	4182,0,0,4191,4212,1874,VXI_PUSHAB,VXT_VAL,
-/*  328 */	0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,
-/*  336 */	VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_add,VXT_END,
-/*  341 */	VXT_IREPL,VXT_VAL,2,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_bindparm,
-/*  349 */	VXT_END,
-/*  350 */	VXI_INCL,VXT_VAL,1,VXT_END,
-/*  354 */	VXI_CLRL,VXT_VAL,0,VXT_END,
-/*  358 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_break,VXT_END,
-/*  362 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_callb,VXI_BRB,VXT_JMP,1,VXT_END,
-/*  369 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_calll,VXI_JMP,VXT_JMP,1,VXT_END,
-/*  376 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_callw,VXI_BRW,VXT_JMP,1,VXT_END,
-/*  383 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_callspb,VXI_BRB,VXT_JMP,1,VXT_END,
-/*  390 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_callspl,VXI_JMP,VXT_JMP,1,VXT_END,
-/*  397 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_callspw,VXI_BRW,VXT_JMP,1,VXT_END,
-/*  404 */	VXT_IREPAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_VAL,
-/*  412 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_cat,VXT_END,
-/*  416 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/*  424 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_close,VXT_END,
-/*  428 */	VXI_BICB2,VXT_LIT,1,VXT_REG,0x5A,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_dt_false,
-/*  436 */	VXT_END,
-/*  437 */	VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_clralsvars,
-/*  445 */	VXT_END,
-/*  446 */	VXI_TSTL,VXT_VAL,1,VXT_END,
-/*  450 */	VXI_MOVAB,VXT_VAL,1,VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_mval2bool,
-/*  458 */	VXT_END,
-/*  459 */	VXI_MOVAB,VXT_VAL,1,VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_mval2mint,
-/*  467 */	VXI_MOVL,VXT_REG,0x50,VXT_VAL,0,VXT_END,
-/*  473 */	VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_JSB,VXT_XFER,
-/*  481 */	SIZEOF(char *) * (short int)xf_commarg,VXT_END,
-/*  483 */	VXI_MOVAB,VXT_VAL,0,VXT_REG,0x50,VXI_MOVL,VXT_VAL,1,
-/*  491 */	VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_mint2mval,VXT_END,
-/*  497 */	VXI_MOVAB,VXT_VAL,1,VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_mval2num,
-/*  505 */	VXT_END,
-/*  506 */	VXI_MOVAB,VXT_VAL,1,VXT_REG,0x50,VXI_MOVAB,VXT_VAL,2,
-/*  514 */	VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_contain,VXT_END,
-/*  520 */	VXI_MOVL,VXT_REG,0x6C,VXT_ADDR,0,VXT_END,
-/*  526 */	VXI_MOVAB,VXT_VAL,0,VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_currtn,
-/*  534 */	VXT_END,
-/*  535 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHL,VXT_VAL,
-/*  543 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_cvtparm,VXT_END,
-/*  550 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
-/*  558 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_div,VXT_END,
-/*  565 */	VXI_MOVAB,VXT_VAL,2,VXT_REG,0x51,VXI_MOVAB,VXT_VAL,1,
-/*  573 */	VXT_REG,0x50,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_equ,VXT_END,
-/*  579 */	VXI_MOVAB,VXT_VAL,1,VXT_REG,0x50,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_equnul,
-/*  587 */	VXT_END,
-/*  588 */	VXT_IREPAB,VXT_VAL,4,VXI_PUSHL,VXT_VAL,3,VXI_PUSHL,VXT_VAL,
-/*  596 */	2,VXI_PUSHL,VXT_LIT,0,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_exfun,VXT_END,
-/*  604 */	VXT_IREPAB,VXT_VAL,4,VXI_PUSHL,VXT_VAL,3,VXI_PUSHL,VXT_VAL,
-/*  612 */	2,VXI_PUSHAB,VXT_VAL,0,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_exfun,VXT_END,
-/*  620 */	VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_exfunret,
-/*  628 */	VXT_END,
-/*  629 */	VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_exfunretals,
-/*  637 */	VXT_END,
-/*  638 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_JSB,VXT_XFER,
-/*  646 */	SIZEOF(char *) * (short int)xf_extcall,VXT_END,
-/*  648 */	VXT_IREPAB,VXT_VAL,5,VXI_PUSHL,VXT_VAL,4,VXI_PUSHL,VXT_VAL,
-/*  656 */	3,VXI_PUSHL,VXT_LIT,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,
-/*  664 */	VXT_VAL,1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_extexfun,VXT_END,
-/*  670 */	VXT_IREPAB,VXT_VAL,5,VXI_PUSHL,VXT_VAL,4,VXI_PUSHL,VXT_VAL,
-/*  678 */	3,VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,
-/*  686 */	VXT_VAL,1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_extexfun,VXT_END,
-/*  692 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_JSB,VXT_XFER,
-/*  700 */	SIZEOF(char *) * (short int)xf_extjmp,VXT_END,
-/*  702 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
-/*  710 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_exp,VXT_END,
-/*  717 */	VXT_IREPL,VXT_VAL,2,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_fetch,
-/*  725 */	VXT_END,
-/*  726 */	VXT_IREPAB,VXT_VAL,6,VXI_PUSHL,VXT_VAL,5,VXI_PUSHL,VXT_VAL,
-/*  734 */	4,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHL,
-/*  742 */	VXT_LIT,0,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_fnfgncal,VXT_END,
-/*  750 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHL,VXT_VAL,
-/*  758 */	2,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnascii,VXT_END,
-/*  765 */	VXT_IREPL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_VAL,
-/*  773 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_fnchar,VXT_END,
-/*  777 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHL,VXT_VAL,
-/*  785 */	2,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzascii,VXT_END,
-/*  792 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/*  800 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzahandle,VXT_END,
-/*  804 */	VXT_IREPL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_VAL,
-/*  812 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzchar,VXT_END,
-/*  816 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/*  824 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fndata,VXT_END,
-/*  828 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHL,VXT_VAL,
-/*  836 */	2,VXI_PUSHL,VXT_VAL,3,VXI_CALLS,VXT_LIT,4,VXT_XFER,
-/*  844 */	SIZEOF(char *) * (short int)xf_fnextract,VXT_END,
-/*  846 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHL,VXT_VAL,
-/*  854 */	2,VXI_PUSHL,VXT_VAL,3,VXI_CALLS,VXT_LIT,4,VXT_XFER,
-/*  862 */	SIZEOF(char *) * (short int)xf_fnzextract,VXT_END,
-/*  864 */	VXT_IREPAB,VXT_VAL,6,VXI_PUSHL,VXT_VAL,5,VXI_PUSHL,VXT_VAL,
-/*  872 */	4,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,
-/*  880 */	VXT_VAL,0,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_fnfgncal,VXT_END,
-/*  888 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,
-/*  896 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
-/*  904 */	SIZEOF(char *) * (short int)xf_fnfind,VXT_END,
-/*  906 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,
-/*  914 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
-/*  922 */	SIZEOF(char *) * (short int)xf_fnzfind,VXT_END,
-/*  924 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,4,VXI_PUSHL,VXT_VAL,
-/*  932 */	3,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,
-/*  940 */	VXT_LIT,5,VXT_XFER,SIZEOF(char *) * (short int)xf_fnfnumber,VXT_END,
-/*  945 */	VXI_MOVAB,VXT_VAL,1,VXT_REG,0x51,VXI_MOVAB,VXT_VAL,0,
-/*  953 */	VXT_REG,0x50,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_fnget,VXT_END,
-/*  959 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
-/*  967 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnget2,VXT_END,
-/*  974 */	VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_fngvget,
-/*  982 */	VXT_END,
-/*  983 */	VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_fngvget1,
-/*  991 */	VXT_END,
-/*  992 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 1000 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnget1,VXT_END,
-/* 1004 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
-/* 1012 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnincr,VXT_END,
-/* 1019 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
-/* 1027 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnj2,VXT_END,
-/* 1034 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
-/* 1042 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzj2,VXT_END,
-/* 1049 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,3,VXI_PUSHL,VXT_VAL,
-/* 1057 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
-/* 1065 */	SIZEOF(char *) * (short int)xf_fnj3,VXT_END,
-/* 1067 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 1075 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnlength,VXT_END,
-/* 1079 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 1087 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzlength,VXT_END,
-/* 1091 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
-/* 1099 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnlvname,VXT_END,
-/* 1106 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,
-/* 1114 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnlvnameo2,VXT_END,
-/* 1121 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 1129 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnlvprvname,VXT_END,
-/* 1133 */	VXT_IREPAB,VXT_VAL,4,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHL,VXT_VAL,
-/* 1141 */	3,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_VAL,2,VXT_XFER,
-/* 1149 */	SIZEOF(char *) * (short int)xf_fnname,VXT_END,
-/* 1151 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
-/* 1159 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnnext,VXT_END,
-/* 1166 */	VXI_PUSHAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,
-/* 1174 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
-/* 1182 */	SIZEOF(char *) * (short int)xf_fno2,VXT_END,
-/* 1184 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
-/* 1192 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnorder,VXT_END,
-/* 1199 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,3,VXI_PUSHL,VXT_VAL,
-/* 1207 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
-/* 1215 */	SIZEOF(char *) * (short int)xf_fnp1,VXT_END,
-/* 1217 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,4,VXI_PUSHL,VXT_VAL,
-/* 1225 */	3,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,
-/* 1233 */	VXT_LIT,5,VXT_XFER,SIZEOF(char *) * (short int)xf_fnpiece,VXT_END,
-/* 1238 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,3,VXI_PUSHL,VXT_VAL,
-/* 1246 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
-/* 1254 */	SIZEOF(char *) * (short int)xf_fnzp1,VXT_END,
-/* 1256 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,4,VXI_PUSHL,VXT_VAL,
-/* 1264 */	3,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,
-/* 1272 */	VXT_LIT,5,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzpiece,VXT_END,
-/* 1277 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 1285 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnqlength,VXT_END,
-/* 1289 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
-/* 1297 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnqsubscript,VXT_END,
-/* 1304 */	VXT_IREPAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
-/* 1312 */	0,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_fnquery,VXT_END,
-/* 1319 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 1327 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnrandom,VXT_END,
-/* 1331 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 1339 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnreverse,VXT_END,
-/* 1343 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 1351 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnstack1,VXT_END,
-/* 1355 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHL,VXT_VAL,
-/* 1363 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnstack2,VXT_END,
-/* 1370 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHL,VXT_VAL,
-/* 1378 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
-/* 1386 */	SIZEOF(char *) * (short int)xf_fntext,VXT_END,
-/* 1388 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,
-/* 1396 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
-/* 1404 */	SIZEOF(char *) * (short int)xf_fntranslate,VXT_END,
-/* 1406 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,
-/* 1414 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
-/* 1422 */	SIZEOF(char *) * (short int)xf_fnztranslate,VXT_END,
-/* 1424 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,
-/* 1432 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
-/* 1440 */	SIZEOF(char *) * (short int)xf_fnztrigger,VXT_END,
-/* 1442 */	VXT_IREPAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_VAL,
-/* 1450 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_fnview,VXT_END,
-/* 1454 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,
-/* 1462 */	0,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzbitand,VXT_END,
-/* 1469 */	VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,
-/* 1477 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzbitcoun,VXT_END,
-/* 1481 */	VXI_PUSHL,VXT_VAL,3,VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
-/* 1489 */	1,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,4,VXT_XFER,
-/* 1497 */	SIZEOF(char *) * (short int)xf_fnzbitfind,VXT_END,
-/* 1499 */	VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,
-/* 1507 */	0,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzbitget,VXT_END,
-/* 1514 */	VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,
-/* 1522 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzbitlen,VXT_END,
-/* 1526 */	VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,
-/* 1534 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzbitnot,VXT_END,
-/* 1538 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,
-/* 1546 */	0,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzbitor,VXT_END,
-/* 1553 */	VXI_PUSHL,VXT_VAL,3,VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
-/* 1561 */	1,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,4,VXT_XFER,
-/* 1569 */	SIZEOF(char *) * (short int)xf_fnzbitset,VXT_END,
-/* 1571 */	VXI_PUSHL,VXT_VAL,2,VXI_PUSHL,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,
-/* 1579 */	0,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzbitstr,VXT_END,
-/* 1586 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,
-/* 1594 */	0,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzbitxor,VXT_END,
-/* 1601 */	VXT_IREPAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_VAL,
-/* 1609 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzcall,VXT_END,
-/* 1613 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 1621 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzdata,VXT_END,
-/* 1625 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,4,VXI_PUSHAB,VXT_VAL,
-/* 1633 */	3,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,
-/* 1641 */	VXT_LIT,5,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzdate,VXT_END,
-/* 1646 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
-/* 1654 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzfile,VXT_END,
-/* 1661 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
-/* 1669 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fngetdvi,VXT_END,
-/* 1676 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHL,VXT_VAL,
-/* 1684 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fngetjpi,VXT_END,
-/* 1691 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHL,VXT_VAL,
-/* 1699 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fngetlki,VXT_END,
-/* 1706 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
-/* 1714 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fngetsyi,VXT_END,
-/* 1721 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 1729 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzjobexam,VXT_END,
-/* 1733 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 1741 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzlkid,VXT_END,
-/* 1745 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 1753 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzm,VXT_END,
-/* 1757 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,5,VXI_PUSHAB,VXT_VAL,
-/* 1765 */	4,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,
-/* 1773 */	VXT_VAL,1,VXI_CALLS,VXT_LIT,6,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzparse,VXT_END,
-/* 1781 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 1789 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzpid,VXT_END,
-/* 1793 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
-/* 1801 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzprevious,VXT_END,
-/* 1808 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 1816 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzpriv,VXT_END,
-/* 1820 */	VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzqgblmod,
-/* 1828 */	VXT_END,
-/* 1829 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,3,VXI_PUSHL,VXT_VAL,
-/* 1837 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
-/* 1845 */	SIZEOF(char *) * (short int)xf_fnzsearch,VXT_END,
-/* 1847 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 1855 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzsetprv,VXT_END,
-/* 1859 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,2,VXI_PUSHL,VXT_VAL,
-/* 1867 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzsigproc,VXT_END,
-/* 1874 */	VXT_IREPAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_VAL,
-/* 1882 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzsocket,VXT_END,
-/* 1886 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,6,VXI_PUSHAB,VXT_VAL,
-/* 1894 */	5,VXI_PUSHAB,VXT_VAL,4,VXI_PUSHL,VXT_VAL,3,VXI_PUSHAB,
-/* 1902 */	VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,7,
-/* 1910 */	VXT_XFER,SIZEOF(char *) * (short int)xf_fnztrnlnm,VXT_END,
-/* 1913 */	VXI_MOVAB,VXT_VAL,1,VXT_REG,0x50,VXI_MOVAB,VXT_VAL,2,
-/* 1921 */	VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_follow,VXT_END,
-/* 1927 */	VXI_MOVAB,VXT_VAL,0,VXT_REG,0x50,VXI_MOVAB,VXT_VAL,1,
-/* 1935 */	VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_forcenum,VXT_END,
-/* 1941 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_forchk1,VXT_END,
-/* 1948 */	VXI_PUSHAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
-/* 1956 */	1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_forinit,VXT_END,
-/* 1961 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_forlcldob,VXI_BRB,VXT_JMP,1,VXT_END,
-/* 1968 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_forlcldol,VXI_JMP,VXT_JMP,1,VXT_END,
-/* 1975 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_forlcldow,VXI_BRW,VXT_JMP,1,VXT_END,
-/* 1982 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHAB,VXT_JMP,1,VXI_PUSHAB,VXT_VAL,
-/* 1990 */	4,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,2,VXI_JSB,
-/* 1998 */	VXT_XFER,SIZEOF(char *) * (short int)xf_forloop,VXT_END,
-/* 2001 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHAB,VXT_JMP,1,VXI_PUSHAB,VXT_VAL,
-/* 2009 */	4,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,2,VXI_JSB,
-/* 2017 */	VXT_XFER,SIZEOF(char *) * (short int)xf_forloop,VXT_END,
-/* 2020 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHAB,VXT_JMP,1,VXI_PUSHAB,VXT_VAL,
-/* 2028 */	4,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,2,VXI_JSB,
-/* 2036 */	VXT_XFER,SIZEOF(char *) * (short int)xf_forloop,VXT_END,
-/* 2039 */	VXT_IREPAB,VXT_VAL,2,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_getindx,
-/* 2047 */	VXI_MOVL,VXT_REG,0x50,VXT_ADDR,0,VXT_END,
-/* 2053 */	VXI_MOVAB,VXT_VAL,0,VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_gettruth,
-/* 2061 */	VXT_END,
-/* 2062 */	VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_gvdata,
-/* 2070 */	VXT_END,
-/* 2071 */	VXT_IREPAB,VXT_VAL,3,VXI_PUSHL,VXT_VAL,2,VXI_CALLS,VXT_VAL,
-/* 2079 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_gvextnam,VXT_END,
-/* 2083 */	VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_gvget,
-/* 2091 */	VXT_END,
-/* 2092 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_CALLS,VXT_LIT,
-/* 2100 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_gvincr,VXT_END,
-/* 2104 */	VXI_CALLS,VXT_LIT,0,VXT_XFER,SIZEOF(char *) * (short int)xf_gvkill,VXT_END,
-/* 2110 */	VXT_IREPAB,VXT_VAL,3,VXI_PUSHL,VXT_VAL,2,VXI_CALLS,VXT_VAL,
-/* 2118 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_gvnaked,VXT_END,
-/* 2122 */	VXT_IREPAB,VXT_VAL,3,VXI_PUSHL,VXT_VAL,2,VXI_CALLS,VXT_VAL,
-/* 2130 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_gvname,VXT_END,
-/* 2134 */	VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_gvnext,
-/* 2142 */	VXT_END,
-/* 2143 */	VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,
-/* 2151 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_gvo2,VXT_END,
-/* 2155 */	VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_gvorder,
-/* 2163 */	VXT_END,
-/* 2164 */	VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_gvput,
-/* 2172 */	VXT_END,
-/* 2173 */	VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_gvquery,
-/* 2181 */	VXT_END,
-/* 2182 */	VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_gvrectarg,
-/* 2190 */	VXT_END,
-/* 2191 */	VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_gvsavtarg,
-/* 2199 */	VXT_END,
-/* 2200 */	VXI_CALLS,VXT_LIT,0,VXT_XFER,SIZEOF(char *) * (short int)xf_gvzwithdraw,VXT_END,
-/* 2206 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXT_IREPAB,VXT_VAL,4,VXI_PUSHL,VXT_VAL,
-/* 2214 */	3,VXI_PUSHL,VXT_VAL,2,VXI_CALLS,VXT_VAL,1,VXT_XFER,
-/* 2222 */	SIZEOF(char *) * (short int)xf_gvzwrite,VXT_END,
-/* 2224 */	VXI_CALLS,VXT_LIT,0,VXT_XFER,SIZEOF(char *) * (short int)xf_halt,VXT_END,
-/* 2230 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 2238 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_hang,VXT_END,
-/* 2242 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_hardret,VXT_END,
-/* 2246 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
-/* 2254 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_idiv,VXT_END,
-/* 2261 */	VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_igetsrc,
-/* 2269 */	VXT_END,
-/* 2270 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
-/* 2278 */	1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_inddevparms,VXT_END,
-/* 2283 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,
-/* 2291 */	0,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_indfnname,VXT_END,
-/* 2296 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
-/* 2304 */	1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_indfun,VXT_END,
-/* 2309 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_JSB,VXT_XFER,
-/* 2317 */	SIZEOF(char *) * (short int)xf_indglvn,VXT_END,
-/* 2319 */	VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
-/* 2327 */	0,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_indincr,VXT_END,
-/* 2332 */	VXI_PUSHAB,VXT_VAL,1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_indlvadr,VXI_MOVL,VXT_REG,
-/* 2340 */	0x50,VXT_ADDR,0,VXT_END,
-/* 2344 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_JSB,VXT_XFER,
-/* 2352 */	SIZEOF(char *) * (short int)xf_indlvarg,VXT_END,
-/* 2354 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,
-/* 2362 */	0,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_indname,VXT_END,
-/* 2369 */	VXI_PUSHAB,VXT_VAL,1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_indlvnamadr,VXI_MOVL,VXT_REG,
-/* 2377 */	0x50,VXT_ADDR,0,VXT_END,
-/* 2381 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,
-/* 2389 */	0,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_indo2,VXT_END,
-/* 2396 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_JSB,VXT_XFER,
-/* 2404 */	SIZEOF(char *) * (short int)xf_indpat,VXT_END,
-/* 2406 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_JSB,VXT_XFER,
-/* 2414 */	SIZEOF(char *) * (short int)xf_indrzshow,VXT_END,
-/* 2416 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_JSB,VXT_XFER,
-/* 2424 */	SIZEOF(char *) * (short int)xf_indset,VXT_END,
-/* 2426 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHL,VXT_VAL,
-/* 2434 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_indtext,VXT_END,
-/* 2442 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXT_IREPAB,VXT_VAL,2,VXI_CALLS,VXT_VAL,
-/* 2450 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_iocontrol,VXT_END,
-/* 2454 */	VXI_MOVAB,VXT_VAL,1,VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_iretmvad,
-/* 2462 */	VXT_END,
-/* 2463 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_JSB,VXT_XFER,
-/* 2471 */	SIZEOF(char *) * (short int)xf_iretmval,VXT_END,
-/* 2473 */	VXI_BRB,VXT_JMP,1,VXT_END,
-/* 2477 */	VXI_JMP,VXT_JMP,1,VXT_END,
-/* 2481 */	VXI_BRW,VXT_JMP,1,VXT_END,
-/* 2485 */	VXI_JMP,VXT_VAL,1,VXT_END,
-/* 2489 */	VXI_BEQL,VXT_JMP,1,VXT_END,
-/* 2493 */	VXI_BNEQ,VXT_LIT,6,VXI_JMP,VXT_JMP,1,VXT_END,
-/* 2500 */	VXI_BNEQ,VXT_LIT,3,VXI_BRW,VXT_JMP,1,VXT_END,
-/* 2507 */	VXI_BGEQ,VXT_JMP,1,VXT_END,
-/* 2511 */	VXI_BLSS,VXT_LIT,6,VXI_JMP,VXT_JMP,1,VXT_END,
-/* 2518 */	VXI_BLSS,VXT_LIT,3,VXI_BRW,VXT_JMP,1,VXT_END,
-/* 2525 */	VXI_BGTR,VXT_JMP,1,VXT_END,
-/* 2529 */	VXI_BLEQ,VXT_LIT,6,VXI_JMP,VXT_JMP,1,VXT_END,
-/* 2536 */	VXI_BLEQ,VXT_LIT,3,VXI_BRW,VXT_JMP,1,VXT_END,
-/* 2543 */	VXI_BLEQ,VXT_JMP,1,VXT_END,
-/* 2547 */	VXI_BGTR,VXT_LIT,6,VXI_JMP,VXT_JMP,1,VXT_END,
-/* 2554 */	VXI_BGTR,VXT_LIT,3,VXI_BRW,VXT_JMP,1,VXT_END,
-/* 2561 */	VXI_BLSS,VXT_JMP,1,VXT_END,
-/* 2565 */	VXI_BGEQ,VXT_LIT,6,VXI_JMP,VXT_JMP,1,VXT_END,
-/* 2572 */	VXI_BGEQ,VXT_LIT,3,VXI_BRW,VXT_JMP,1,VXT_END,
-/* 2579 */	VXI_BNEQ,VXT_JMP,1,VXT_END,
-/* 2583 */	VXI_BNEQ,VXT_LIT,6,VXI_JMP,VXT_JMP,1,VXT_END,
-/* 2590 */	VXI_BEQL,VXT_LIT,3,VXI_BRW,VXT_JMP,1,VXT_END,
-/* 2597 */	VXI_BLBC,VXT_REG,0x5A,VXT_JMP,1,VXT_END,
-/* 2603 */	VXI_BLBS,VXT_REG,0x5A,VXT_LIT,6,VXI_JMP,VXT_JMP,1,
-/* 2611 */	VXT_END,
-/* 2612 */	VXI_BLBS,VXT_REG,0x5A,VXT_LIT,3,VXI_BRW,VXT_JMP,1,
-/* 2620 */	VXT_END,
-/* 2621 */	VXI_BLBS,VXT_REG,0x5A,VXT_JMP,1,VXT_END,
-/* 2627 */	VXI_BLBC,VXT_REG,0x5A,VXT_LIT,6,VXI_JMP,VXT_JMP,1,
-/* 2635 */	VXT_END,
-/* 2636 */	VXI_BLBC,VXT_REG,0x5A,VXT_LIT,3,VXI_BRW,VXT_JMP,1,
-/* 2644 */	VXT_END,
-/* 2645 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXT_IREPAB,VXT_VAL,7,VXI_PUSHL,VXT_VAL,
-/* 2653 */	6,VXI_PUSHAB,VXT_VAL,5,VXI_PUSHAB,VXT_VAL,4,VXI_PUSHL,
-/* 2661 */	VXT_VAL,3,VXI_PUSHAB,VXT_VAL,2,VXI_CALLS,VXT_VAL,1,
-/* 2669 */	VXT_XFER,SIZEOF(char *) * (short int)xf_job,VXT_END,
-/* 2672 */	VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_kill,
-/* 2680 */	VXT_END,
-/* 2681 */	VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_killalias,
-/* 2689 */	VXT_END,
-/* 2690 */	VXI_CALLS,VXT_LIT,0,VXT_XFER,SIZEOF(char *) * (short int)xf_killall,VXT_END,
-/* 2696 */	VXI_CALLS,VXT_LIT,0,VXT_XFER,SIZEOF(char *) * (short int)xf_killaliasall,VXT_END,
-/* 2702 */	VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,
-/* 2710 */	3,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_labaddr,VXI_MOVL,VXT_REG,
-/* 2718 */	0x50,VXT_ADDR,0,VXT_END,
-/* 2722 */	VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_lckdecr,
-/* 2730 */	VXT_END,
-/* 2731 */	VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_lckincr,
-/* 2739 */	VXT_END,
-/* 2740 */	VXI_MOVAB,VXT_JMP,1,VXT_ADDR,0,VXT_END,
-/* 2746 */	VXI_MOVAB,VXT_JMP,1,VXT_ADDR,0,VXT_END,
-/* 2752 */	VXI_MOVAB,VXT_JMP,1,VXT_ADDR,0,VXT_END,
-/* 2758 */	VXT_IREPL,VXT_VAL,2,VXI_PUSHL,VXT_VAL,1,VXI_JSB,VXT_XFER,
-/* 2766 */	SIZEOF(char *) * (short int)xf_linefetch,VXT_END,
-/* 2768 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_linestart,VXT_END,
-/* 2772 */	VXT_IREPAB,VXT_VAL,4,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,
-/* 2780 */	2,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_lkname,VXT_END,
-/* 2787 */	VXI_CALLS,VXT_LIT,0,VXT_XFER,SIZEOF(char *) * (short int)xf_lkinit,VXT_END,
-/* 2793 */	VXT_IREPAB,VXT_VAL,4,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHL,VXT_VAL,
-/* 2801 */	2,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_lkname,VXT_END,
-/* 2808 */	VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_lock,
-/* 2816 */	VXT_END,
-/* 2817 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXT_IREPAB,VXT_VAL,3,VXI_PUSHL,VXT_VAL,
-/* 2825 */	2,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_lvpatwrite,VXT_END,
-/* 2832 */	VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_lvzwithdraw,
-/* 2840 */	VXT_END,
-/* 2841 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXT_IREPAB,VXT_VAL,2,VXI_CALLS,VXT_VAL,
-/* 2849 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_lvzwrite,VXT_END,
-/* 2853 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
-/* 2861 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_flt_mod,VXT_END,
-/* 2868 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
-/* 2876 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_mul,VXT_END,
-/* 2883 */	VXI_MOVAB,VXT_VAL,0,VXT_REG,0x50,VXI_MOVAB,VXT_VAL,1,
-/* 2891 */	VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_neg,VXT_END,
-/* 2897 */	VXI_PUSHL,VXT_VAL,1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_newintrinsic,VXT_END,
-/* 2904 */	VXI_PUSHL,VXT_VAL,1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_newvar,VXT_END,
-/* 2911 */	VXI_CALLS,VXT_LIT,0,VXT_XFER,SIZEOF(char *) * (short int)xf_nullexp,VXI_MOVL,VXT_REG,0x50,
-/* 2919 */	VXT_ADDR,0,VXT_END,
-/* 2922 */	VXI_MOVAB,VXT_VAL,1,VXT_REG,0x50,VXI_MOVAB,VXT_VAL,2,
-/* 2930 */	VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_numcmp,VXT_END,
-/* 2936 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHAB,VXT_VAL,4,VXI_PUSHL,VXT_VAL,
-/* 2944 */	3,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,
-/* 2952 */	VXT_LIT,4,VXT_XFER,SIZEOF(char *) * (short int)xf_open,VXT_END,
-/* 2957 */	VXI_MOVAB,VXT_VAL,1,VXT_REG,0x50,VXI_MOVAB,VXT_VAL,2,
-/* 2965 */	VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_pattern,VXT_END,
-/* 2971 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
-/* 2979 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnpopulation,VXT_END,
-/* 2986 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
-/* 2994 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzpopulation,VXT_END,
-/* 3001 */	VXT_IREPAB,VXT_VAL,2,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_putindx,
-/* 3009 */	VXI_MOVL,VXT_REG,0x50,VXT_ADDR,0,VXT_END,
-/* 3015 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHL,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,
-/* 3023 */	0,VXI_CALLS,VXT_LIT,2,VXT_XFER,SIZEOF(char *) * (short int)xf_rdone,VXT_END,
-/* 3030 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHL,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,
-/* 3038 */	0,VXI_CALLS,VXT_LIT,2,VXT_XFER,SIZEOF(char *) * (short int)xf_read,VXT_END,
-/* 3045 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHL,VXT_VAL,2,VXI_PUSHL,VXT_VAL,
-/* 3053 */	1,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,3,VXT_XFER,
-/* 3061 */	SIZEOF(char *) * (short int)xf_readfl,VXT_END,
-/* 3063 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXT_END,
-/* 3067 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_ret,VXT_END,
-/* 3071 */	VXI_MOVAB,VXT_VAL,1,VXT_REG,0x50,VXI_MOVL,VXT_VAL,2,
-/* 3079 */	VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_retarg,VXT_END,
-/* 3085 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 3093 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_rhdaddr,VXI_MOVL,VXT_REG,0x50,VXT_ADDR,0,
-/* 3101 */	VXT_END,
-/* 3102 */	VXI_PUSHL,VXT_LIT,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 3110 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_rhdaddr,VXI_MOVL,VXT_REG,0x50,VXT_ADDR,0,
-/* 3118 */	VXT_END,
-/* 3119 */	VXI_PUSHL,VXT_VAL,2,VXI_PUSHL,VXT_VAL,1,VXI_JSB,VXT_XFER,
-/* 3127 */	SIZEOF(char *) * (short int)xf_rterror,VXT_END,
-/* 3129 */	VXI_PUSHL,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,2,VXI_CALLS,VXT_LIT,
-/* 3137 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_setals2als,VXT_END,
-/* 3141 */	VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,2,VXI_CALLS,VXT_LIT,
-/* 3149 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_setalsin2alsct,VXT_END,
-/* 3153 */	VXI_PUSHL,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,2,VXI_CALLS,VXT_LIT,
-/* 3161 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_setalsctin2als,VXT_END,
-/* 3165 */	VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,2,VXI_CALLS,VXT_LIT,
-/* 3173 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_setalsct2alsct,VXT_END,
-/* 3177 */	VXI_PUSHL,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,2,VXI_CALLS,VXT_LIT,
-/* 3185 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_setfnretin2als,VXT_END,
-/* 3189 */	VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,2,VXI_CALLS,VXT_LIT,
-/* 3197 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_setfnretin2alsct,VXT_END,
-/* 3201 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,3,VXI_PUSHL,VXT_VAL,
-/* 3209 */	2,VXI_PUSHAB,VXT_VAL,4,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,
-/* 3217 */	VXT_LIT,5,VXT_XFER,SIZEOF(char *) * (short int)xf_setextract,VXT_END,
-/* 3222 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,
-/* 3230 */	4,VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,
-/* 3238 */	VXT_LIT,5,VXT_XFER,SIZEOF(char *) * (short int)xf_setp1,VXT_END,
-/* 3243 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,4,VXI_PUSHL,VXT_VAL,
-/* 3251 */	3,VXI_PUSHAB,VXT_VAL,5,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,
-/* 3259 */	VXT_VAL,1,VXI_CALLS,VXT_LIT,6,VXT_XFER,SIZEOF(char *) * (short int)xf_setpiece,VXT_END,
-/* 3267 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,3,VXI_PUSHL,VXT_VAL,
-/* 3275 */	2,VXI_PUSHAB,VXT_VAL,4,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,
-/* 3283 */	VXT_LIT,5,VXT_XFER,SIZEOF(char *) * (short int)xf_setzextract,VXT_END,
-/* 3288 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,
-/* 3296 */	4,VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,
-/* 3304 */	VXT_LIT,5,VXT_XFER,SIZEOF(char *) * (short int)xf_setzp1,VXT_END,
-/* 3309 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,4,VXI_PUSHL,VXT_VAL,
-/* 3317 */	3,VXI_PUSHAB,VXT_VAL,5,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,
-/* 3325 */	VXT_VAL,1,VXI_CALLS,VXT_LIT,6,VXT_XFER,SIZEOF(char *) * (short int)xf_setzpiece,VXT_END,
-/* 3333 */	VXI_BISB2,VXT_LIT,1,VXT_REG,0x5A,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_dt_true,
-/* 3341 */	VXT_END,
-/* 3342 */	VXI_PUSHL,VXT_VAL,5,VXI_PUSHAB,VXT_VAL,4,VXI_PUSHL,VXT_VAL,
-/* 3350 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,3,VXI_CALLS,
-/* 3358 */	VXT_LIT,5,VXT_XFER,SIZEOF(char *) * (short int)xf_setzbrk,VXT_END,
-/* 3363 */	VXI_MOVAB,VXT_VAL,1,VXT_REG,0x50,VXI_MOVAB,VXT_VAL,2,
-/* 3371 */	VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_sorts_after,VXT_END,
-/* 3377 */	VXT_IREPAB,VXT_VAL,2,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_srchindx,
-/* 3385 */	VXI_MOVL,VXT_REG,0x50,VXT_ADDR,0,VXT_END,
-/* 3391 */	VXI_MOVAB,VXT_VAL,2,VXT_REG,0x51,VXI_MOVAB,VXT_VAL,1,
-/* 3399 */	VXT_REG,0x50,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_sto,VXT_END,
-/* 3405 */	VXI_MOVC3,VXT_LIT,16,VXT_VAL,2,VXT_VAL,1,VXT_END,
-/* 3413 */	VXI_MOVAB,VXT_VAL,1,VXT_REG,0x51,VXI_MOVAB,VXT_VAL,0,
-/* 3421 */	VXT_REG,0x50,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_sto,VXT_END,
-/* 3427 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
-/* 3435 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_sub,VXT_END,
-/* 3442 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 3450 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_svget,VXT_END,
-/* 3454 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHL,VXT_VAL,1,VXI_JSB,VXT_XFER,
-/* 3462 */	SIZEOF(char *) * (short int)xf_psvput,VXT_END,
-/* 3464 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 3472 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_svput,VXT_END,
-/* 3476 */	VXI_MOVL,VXT_REG,0x50,VXT_REG,0x5A,VXT_END,
-/* 3482 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_tcommit,VXT_END,
-/* 3486 */	VXI_PUSHL,VXT_VAL,1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_trollback,VXT_END,
-/* 3493 */	VXI_PUSHL,VXT_VAL,1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_trestart,VXT_END,
-/* 3500 */	VXT_IREPAB,VXT_VAL,4,VXI_PUSHL,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,
-/* 3508 */	2,VXI_PUSHL,VXT_VAL,1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_tstart,VXT_END,
-/* 3516 */	VXI_CALLS,VXT_LIT,0,VXT_XFER,SIZEOF(char *) * (short int)xf_unlock,VXT_END,
-/* 3522 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 3530 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_use,VXT_END,
-/* 3534 */	VXT_IREPAB,VXT_VAL,2,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_view,
-/* 3542 */	VXT_END,
-/* 3543 */	VXI_CMPL,VXT_VAL,1,VXT_VAL,2,VXT_END,
-/* 3549 */	VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_write,
-/* 3557 */	VXT_END,
-/* 3558 */	VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_wteol,
-/* 3566 */	VXT_END,
-/* 3567 */	VXI_CALLS,VXT_LIT,0,VXT_XFER,SIZEOF(char *) * (short int)xf_wtff,VXT_END,
-/* 3573 */	VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_wtone,
-/* 3581 */	VXT_END,
-/* 3582 */	VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_wttab,
-/* 3590 */	VXT_END,
-/* 3591 */	VXT_IREPAB,VXT_VAL,2,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_xkill,
-/* 3599 */	VXT_END,
-/* 3600 */	VXT_IREPAB,VXT_VAL,2,VXI_PUSHL,VXT_VAL,1,VXI_JSB,VXT_XFER,
-/* 3608 */	SIZEOF(char *) * (short int)xf_xnew,VXT_END,
-/* 3610 */	VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_zallocate,
-/* 3618 */	VXT_END,
-/* 3619 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 3627 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_zattach,VXT_END,
-/* 3631 */	VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 3639 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_zcompile,VXT_END,
-/* 3643 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_zcont,VXT_END,
-/* 3647 */	VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_zdeallocate,
-/* 3655 */	VXT_END,
-/* 3656 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
-/* 3664 */	1,VXI_CALLS,VXT_LIT,2,VXT_XFER,SIZEOF(char *) * (short int)xf_zedit,VXT_END,
-/* 3671 */	VXI_PUSHL,VXT_VAL,1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_zg1,VXT_END,
-/* 3678 */	VXI_PUSHL,VXT_VAL,1,VXI_PUSHL,VXT_VAL,4,VXI_PUSHAB,VXT_VAL,
-/* 3686 */	3,VXI_PUSHAB,VXT_VAL,2,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_zgoto,VXT_END,
-/* 3694 */	VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_zhalt,
-/* 3702 */	VXT_END,
-/* 3703 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 3711 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_zhelp,VXT_END,
-/* 3715 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 3723 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_zlink,VXT_END,
-/* 3727 */	VXT_IREPAB,VXT_VAL,3,VXI_PUSHL,VXT_VAL,2,VXI_CALLS,VXT_VAL,
-/* 3735 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_zmess,VXT_END,
-/* 3739 */	VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_zprevious,
-/* 3747 */	VXT_END,
-/* 3748 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHL,VXT_VAL,5,VXI_PUSHAB,VXT_VAL,
-/* 3756 */	4,VXI_PUSHL,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,
-/* 3764 */	VXT_VAL,1,VXI_CALLS,VXT_LIT,5,VXT_XFER,SIZEOF(char *) * (short int)xf_zprint,VXT_END,
-/* 3772 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHL,VXT_LIT,0,VXI_PUSHL,VXT_VAL,
-/* 3780 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,3,VXT_XFER,
-/* 3788 */	SIZEOF(char *) * (short int)xf_zshow,VXT_END,
-/* 3790 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHL,VXT_VAL,
-/* 3798 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,3,VXT_XFER,
-/* 3806 */	SIZEOF(char *) * (short int)xf_zshow,VXT_END,
-/* 3808 */	VXI_PUSHL,VXT_LIT,0,VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 3816 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_zstep,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_zcont,VXT_END,
-/* 3823 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 3831 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_zstep,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_zcont,VXT_END,
-/* 3838 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 3846 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_zsystem,VXT_END,
-/* 3850 */	VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_ztcommit,
-/* 3858 */	VXT_END,
-/* 3859 */	VXI_CALLS,VXT_LIT,0,VXT_XFER,SIZEOF(char *) * (short int)xf_ztstart,VXT_END,
-/* 3865 */	VXI_CALLS,VXT_LIT,0,VXT_XFER,SIZEOF(char *) * (short int)xf_merge,VXT_END,
-/* 3871 */	VXI_PUSHL,VXT_LIT,0,VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 3879 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_merge_arg,VXT_END,
-/* 3883 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 3891 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_merge_arg,VXT_END,
-/* 3895 */	VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,2,VXI_JSB,VXT_XFER,
-/* 3903 */	SIZEOF(char *) * (short int)xf_indmerge,VXT_END,
-/* 3905 */	VXT_IREPAB,VXT_VAL,2,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_m_srchindx,
-/* 3913 */	VXI_MOVL,VXT_REG,0x50,VXT_ADDR,0,VXT_END,
-/* 3919 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
-/* 3927 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzconvert2,VXT_END,
-/* 3934 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,
-/* 3942 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
-/* 3950 */	SIZEOF(char *) * (short int)xf_fnzconvert3,VXT_END,
-/* 3952 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,3,VXI_PUSHL,VXT_VAL,
-/* 3960 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
-/* 3968 */	SIZEOF(char *) * (short int)xf_fnzsubstr,VXT_END,
-/* 3970 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 3978 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzwidth,VXT_END,
-/* 3982 */	VXI_CALLS,VXT_LIT,0,VXT_XFER,SIZEOF(char *) * (short int)xf_ztrigger,VXT_END,
-/* 3988 */	VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_zwritesvn,
-/* 3996 */	VXT_END,
-/* 3997 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHL,VXT_VAL,
-/* 4005 */	2,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzwrite,VXT_END,
-/* 4012 */	VXI_CALLS,VXT_LIT,0,VXT_XFER,SIZEOF(char *) * (short int)xf_igetdst,VXI_MOVL,VXT_REG,0x50,
-/* 4020 */	VXT_ADDR,0,VXT_END,
-/* 4023 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 4031 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_indget1,VXT_END,
-/* 4035 */	VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_glvnpop,
-/* 4043 */	VXT_END,
-/* 4044 */	VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_glvnslot,
-/* 4052 */	VXI_MOVL,VXT_REG,0x50,VXT_ADDR,0,VXT_END,
-/* 4058 */	VXI_PUSHL,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
-/* 4066 */	1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_indsavglvn,VXT_END,
-/* 4071 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_JSB,VXT_XFER,
-/* 4079 */	SIZEOF(char *) * (short int)xf_indsavlvn,VXT_END,
-/* 4081 */	VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 4089 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_rfrshlvn,VXI_MOVL,VXT_REG,0x50,VXT_ADDR,0,
-/* 4097 */	VXT_END,
-/* 4098 */	VXT_IREPAB,VXT_VAL,3,VXI_PUSHL,VXT_VAL,2,VXI_CALLS,VXT_VAL,
-/* 4106 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_savgvn,VXT_END,
-/* 4110 */	VXT_IREPAB,VXT_VAL,2,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_savlvn,
-/* 4118 */	VXT_END,
-/* 4119 */	VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 4127 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_shareslot,VXT_END,
-/* 4131 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 4139 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_stoglvn,VXT_END,
-/* 4143 */	VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 4151 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_rfrshgvn,VXT_END,
-/* 4155 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,
-/* 4163 */	0,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_indfnname2,VXT_END,
-/* 4170 */	VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,
-/* 4178 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_indget2,VXT_END,
-/* 4182 */	VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_indmerge2,
-/* 4190 */	VXT_END,
-/* 4191 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,4,VXI_PUSHL,VXT_VAL,
-/* 4199 */	3,VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,
-/* 4207 */	VXT_LIT,5,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzpeek,VXT_END,
-/* 4212 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 4220 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzsyslog,VXT_END,
-/* 4224 */	362,376,369,2473,2481,2477,2740,2752,
-/* 4232 */	2746,0,0,0,483,459,450,0,
-/* 4240 */	0,446,1982,2020,2001,2621,2636,2627,
-/* 4248 */	2597,2612,2603,2489,2500,2493,2579,2590,
-/* 4256 */	2583,2525,2536,2529,2543,2554,2547,2561,
-/* 4264 */	2572,2565,2507,2518,2511,1961,1975,1968,
-/* 4272 */	383,397,390};
+/*    0 */	0,0,0,0,330,3431,2872,554,
+/*    8 */	2250,2857,2887,1931,408,3381,2043,3005,
+/*   16 */	2126,2114,3614,3651,2087,2096,2168,2108,
+/*   24 */	2159,2138,2066,754,781,769,808,820,
+/*   32 */	832,850,892,910,928,949,978,1008,
+/*   40 */	1023,1038,1053,1071,1083,2975,2990,1155,
+/*   48 */	1188,1221,1260,1323,1374,1650,1665,1680,
+/*   56 */	1710,1749,1761,1785,1812,1833,1851,3446,
+/*   64 */	3468,0,0,0,0,569,0,510,
+/*   72 */	0,1917,0,2961,0,0,0,0,
+/*   80 */	0,0,362,420,2228,2234,2649,2676,
+/*   88 */	2694,2797,2735,2726,2812,3520,3604,2908,
+/*   96 */	0,2940,3071,3034,3019,3049,3395,3247,
+/*  104 */	3313,3526,3538,3553,3577,3586,3571,3562,
+/*  112 */	3346,3647,3660,3682,3719,3731,3752,3776,
+/*  120 */	3842,0,0,2845,2210,3123,4267,642,
+/*  128 */	4270,696,2706,3089,524,530,4273,2313,
+/*  136 */	2400,2300,477,2336,2420,2075,2358,2430,
+/*  144 */	4276,2195,2186,4280,1392,1410,4281,358,
+/*  152 */	354,3337,432,4285,4288,4291,2926,4294,
+/*  160 */	4297,4300,4303,4306,4309,3417,0,2821,
+/*  168 */	2489,2467,1629,2458,2246,2057,2772,1952,
+/*  176 */	721,2762,0,0,2265,3595,3623,1605,
+/*  184 */	3547,2348,1945,539,3743,1797,2177,1308,
+/*  192 */	345,3075,608,674,592,652,3707,1203,
+/*  200 */	1242,3675,2901,2204,2836,2915,624,1095,
+/*  208 */	2776,4312,2410,3794,3812,3827,501,2791,
+/*  216 */	3067,1890,3863,3854,1446,3409,583,1695,
+/*  224 */	1737,2373,4315,3480,2446,730,868,3106,
+/*  232 */	3635,3504,3490,3497,3486,706,963,2323,
+/*  240 */	1137,2287,1125,2147,1110,1170,2385,1575,
+/*  248 */	1518,1503,1557,1473,1485,1530,1458,1542,
+/*  256 */	1590,0,3367,0,987,996,3226,3292,
+/*  264 */	1824,3205,3271,2274,3899,3869,3875,3887,
+/*  272 */	3909,1347,1359,1281,1293,1335,3458,1725,
+/*  280 */	1863,3944,3959,4013,4040,3995,3133,3145,
+/*  288 */	3157,3169,2685,2700,1617,441,796,1428,
+/*  296 */	633,3181,3193,4025,4031,0,0,0,
+/*  304 */	0,3698,4055,4066,4078,4087,4101,4114,
+/*  312 */	4124,4141,4153,4162,4174,4186,4198,4213,
+/*  320 */	4225,0,0,4234,4255,1878,3977,3923,
+/*  328 */	0,0,VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,
+/*  336 */	VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_add,
+/*  344 */	VXT_END,
+/*  345 */	VXT_IREPL,VXT_VAL,2,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_bindparm,
+/*  353 */	VXT_END,
+/*  354 */	VXI_INCL,VXT_VAL,1,VXT_END,
+/*  358 */	VXI_CLRL,VXT_VAL,0,VXT_END,
+/*  362 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_break,VXT_END,
+/*  366 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_callb,VXI_BRB,VXT_JMP,1,VXT_END,
+/*  373 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_calll,VXI_JMP,VXT_JMP,1,VXT_END,
+/*  380 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_callw,VXI_BRW,VXT_JMP,1,VXT_END,
+/*  387 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_callspb,VXI_BRB,VXT_JMP,1,VXT_END,
+/*  394 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_callspl,VXI_JMP,VXT_JMP,1,VXT_END,
+/*  401 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_callspw,VXI_BRW,VXT_JMP,1,VXT_END,
+/*  408 */	VXT_IREPAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_VAL,
+/*  416 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_cat,VXT_END,
+/*  420 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/*  428 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_close,VXT_END,
+/*  432 */	VXI_BICB2,VXT_LIT,1,VXT_REG,0x5A,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_dt_false,
+/*  440 */	VXT_END,
+/*  441 */	VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_clralsvars,
+/*  449 */	VXT_END,
+/*  450 */	VXI_TSTL,VXT_VAL,1,VXT_END,
+/*  454 */	VXI_MOVAB,VXT_VAL,1,VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_mval2bool,
+/*  462 */	VXT_END,
+/*  463 */	VXI_MOVAB,VXT_VAL,1,VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_mval2mint,
+/*  471 */	VXI_MOVL,VXT_REG,0x50,VXT_VAL,0,VXT_END,
+/*  477 */	VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_JSB,VXT_XFER,
+/*  485 */	SIZEOF(char *) * (short int)xf_commarg,VXT_END,
+/*  487 */	VXI_MOVAB,VXT_VAL,0,VXT_REG,0x50,VXI_MOVL,VXT_VAL,1,
+/*  495 */	VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_mint2mval,VXT_END,
+/*  501 */	VXI_MOVAB,VXT_VAL,1,VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_mval2num,
+/*  509 */	VXT_END,
+/*  510 */	VXI_MOVAB,VXT_VAL,1,VXT_REG,0x50,VXI_MOVAB,VXT_VAL,2,
+/*  518 */	VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_contain,VXT_END,
+/*  524 */	VXI_MOVL,VXT_REG,0x6C,VXT_ADDR,0,VXT_END,
+/*  530 */	VXI_MOVAB,VXT_VAL,0,VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_currtn,
+/*  538 */	VXT_END,
+/*  539 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHL,VXT_VAL,
+/*  547 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_cvtparm,VXT_END,
+/*  554 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/*  562 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_div,VXT_END,
+/*  569 */	VXI_MOVAB,VXT_VAL,2,VXT_REG,0x51,VXI_MOVAB,VXT_VAL,1,
+/*  577 */	VXT_REG,0x50,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_equ,VXT_END,
+/*  583 */	VXI_MOVAB,VXT_VAL,1,VXT_REG,0x50,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_equnul,
+/*  591 */	VXT_END,
+/*  592 */	VXT_IREPAB,VXT_VAL,4,VXI_PUSHL,VXT_VAL,3,VXI_PUSHL,VXT_VAL,
+/*  600 */	2,VXI_PUSHL,VXT_LIT,0,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_exfun,VXT_END,
+/*  608 */	VXT_IREPAB,VXT_VAL,4,VXI_PUSHL,VXT_VAL,3,VXI_PUSHL,VXT_VAL,
+/*  616 */	2,VXI_PUSHAB,VXT_VAL,0,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_exfun,VXT_END,
+/*  624 */	VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_exfunret,
+/*  632 */	VXT_END,
+/*  633 */	VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_exfunretals,
+/*  641 */	VXT_END,
+/*  642 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_JSB,VXT_XFER,
+/*  650 */	SIZEOF(char *) * (short int)xf_extcall,VXT_END,
+/*  652 */	VXT_IREPAB,VXT_VAL,5,VXI_PUSHL,VXT_VAL,4,VXI_PUSHL,VXT_VAL,
+/*  660 */	3,VXI_PUSHL,VXT_LIT,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,
+/*  668 */	VXT_VAL,1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_extexfun,VXT_END,
+/*  674 */	VXT_IREPAB,VXT_VAL,5,VXI_PUSHL,VXT_VAL,4,VXI_PUSHL,VXT_VAL,
+/*  682 */	3,VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,
+/*  690 */	VXT_VAL,1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_extexfun,VXT_END,
+/*  696 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_JSB,VXT_XFER,
+/*  704 */	SIZEOF(char *) * (short int)xf_extjmp,VXT_END,
+/*  706 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/*  714 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_exp,VXT_END,
+/*  721 */	VXT_IREPL,VXT_VAL,2,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_fetch,
+/*  729 */	VXT_END,
+/*  730 */	VXT_IREPAB,VXT_VAL,6,VXI_PUSHL,VXT_VAL,5,VXI_PUSHL,VXT_VAL,
+/*  738 */	4,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHL,
+/*  746 */	VXT_LIT,0,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_fnfgncal,VXT_END,
+/*  754 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHL,VXT_VAL,
+/*  762 */	2,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnascii,VXT_END,
+/*  769 */	VXT_IREPL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_VAL,
+/*  777 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_fnchar,VXT_END,
+/*  781 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHL,VXT_VAL,
+/*  789 */	2,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzascii,VXT_END,
+/*  796 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/*  804 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzahandle,VXT_END,
+/*  808 */	VXT_IREPL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_VAL,
+/*  816 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzchar,VXT_END,
+/*  820 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/*  828 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fndata,VXT_END,
+/*  832 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHL,VXT_VAL,
+/*  840 */	2,VXI_PUSHL,VXT_VAL,3,VXI_CALLS,VXT_LIT,4,VXT_XFER,
+/*  848 */	SIZEOF(char *) * (short int)xf_fnextract,VXT_END,
+/*  850 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHL,VXT_VAL,
+/*  858 */	2,VXI_PUSHL,VXT_VAL,3,VXI_CALLS,VXT_LIT,4,VXT_XFER,
+/*  866 */	SIZEOF(char *) * (short int)xf_fnzextract,VXT_END,
+/*  868 */	VXT_IREPAB,VXT_VAL,6,VXI_PUSHL,VXT_VAL,5,VXI_PUSHL,VXT_VAL,
+/*  876 */	4,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,
+/*  884 */	VXT_VAL,0,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_fnfgncal,VXT_END,
+/*  892 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,
+/*  900 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
+/*  908 */	SIZEOF(char *) * (short int)xf_fnfind,VXT_END,
+/*  910 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,
+/*  918 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
+/*  926 */	SIZEOF(char *) * (short int)xf_fnzfind,VXT_END,
+/*  928 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,4,VXI_PUSHL,VXT_VAL,
+/*  936 */	3,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,
+/*  944 */	VXT_LIT,5,VXT_XFER,SIZEOF(char *) * (short int)xf_fnfnumber,VXT_END,
+/*  949 */	VXI_MOVAB,VXT_VAL,1,VXT_REG,0x51,VXI_MOVAB,VXT_VAL,0,
+/*  957 */	VXT_REG,0x50,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_fnget,VXT_END,
+/*  963 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/*  971 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnget2,VXT_END,
+/*  978 */	VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_fngvget,
+/*  986 */	VXT_END,
+/*  987 */	VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_fngvget1,
+/*  995 */	VXT_END,
+/*  996 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 1004 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnget1,VXT_END,
+/* 1008 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 1016 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnincr,VXT_END,
+/* 1023 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 1031 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnj2,VXT_END,
+/* 1038 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 1046 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzj2,VXT_END,
+/* 1053 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,3,VXI_PUSHL,VXT_VAL,
+/* 1061 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
+/* 1069 */	SIZEOF(char *) * (short int)xf_fnj3,VXT_END,
+/* 1071 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 1079 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnlength,VXT_END,
+/* 1083 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 1091 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzlength,VXT_END,
+/* 1095 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 1103 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnlvname,VXT_END,
+/* 1110 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,
+/* 1118 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnlvnameo2,VXT_END,
+/* 1125 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 1133 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnlvprvname,VXT_END,
+/* 1137 */	VXT_IREPAB,VXT_VAL,4,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHL,VXT_VAL,
+/* 1145 */	3,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_VAL,2,VXT_XFER,
+/* 1153 */	SIZEOF(char *) * (short int)xf_fnname,VXT_END,
+/* 1155 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 1163 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnnext,VXT_END,
+/* 1170 */	VXI_PUSHAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,
+/* 1178 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
+/* 1186 */	SIZEOF(char *) * (short int)xf_fno2,VXT_END,
+/* 1188 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 1196 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnorder,VXT_END,
+/* 1203 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,3,VXI_PUSHL,VXT_VAL,
+/* 1211 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
+/* 1219 */	SIZEOF(char *) * (short int)xf_fnp1,VXT_END,
+/* 1221 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,4,VXI_PUSHL,VXT_VAL,
+/* 1229 */	3,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,
+/* 1237 */	VXT_LIT,5,VXT_XFER,SIZEOF(char *) * (short int)xf_fnpiece,VXT_END,
+/* 1242 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,3,VXI_PUSHL,VXT_VAL,
+/* 1250 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
+/* 1258 */	SIZEOF(char *) * (short int)xf_fnzp1,VXT_END,
+/* 1260 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,4,VXI_PUSHL,VXT_VAL,
+/* 1268 */	3,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,
+/* 1276 */	VXT_LIT,5,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzpiece,VXT_END,
+/* 1281 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 1289 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnqlength,VXT_END,
+/* 1293 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 1301 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnqsubscript,VXT_END,
+/* 1308 */	VXT_IREPAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 1316 */	0,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_fnquery,VXT_END,
+/* 1323 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 1331 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnrandom,VXT_END,
+/* 1335 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 1343 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnreverse,VXT_END,
+/* 1347 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 1355 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnstack1,VXT_END,
+/* 1359 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHL,VXT_VAL,
+/* 1367 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnstack2,VXT_END,
+/* 1374 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHL,VXT_VAL,
+/* 1382 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
+/* 1390 */	SIZEOF(char *) * (short int)xf_fntext,VXT_END,
+/* 1392 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,
+/* 1400 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
+/* 1408 */	SIZEOF(char *) * (short int)xf_fntranslate,VXT_END,
+/* 1410 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,
+/* 1418 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
+/* 1426 */	SIZEOF(char *) * (short int)xf_fnztranslate,VXT_END,
+/* 1428 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,
+/* 1436 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
+/* 1444 */	SIZEOF(char *) * (short int)xf_fnztrigger,VXT_END,
+/* 1446 */	VXT_IREPAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_VAL,
+/* 1454 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_fnview,VXT_END,
+/* 1458 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,
+/* 1466 */	0,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzbitand,VXT_END,
+/* 1473 */	VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,
+/* 1481 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzbitcoun,VXT_END,
+/* 1485 */	VXI_PUSHL,VXT_VAL,3,VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 1493 */	1,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,4,VXT_XFER,
+/* 1501 */	SIZEOF(char *) * (short int)xf_fnzbitfind,VXT_END,
+/* 1503 */	VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,
+/* 1511 */	0,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzbitget,VXT_END,
+/* 1518 */	VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,
+/* 1526 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzbitlen,VXT_END,
+/* 1530 */	VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,
+/* 1538 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzbitnot,VXT_END,
+/* 1542 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,
+/* 1550 */	0,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzbitor,VXT_END,
+/* 1557 */	VXI_PUSHL,VXT_VAL,3,VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 1565 */	1,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,4,VXT_XFER,
+/* 1573 */	SIZEOF(char *) * (short int)xf_fnzbitset,VXT_END,
+/* 1575 */	VXI_PUSHL,VXT_VAL,2,VXI_PUSHL,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,
+/* 1583 */	0,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzbitstr,VXT_END,
+/* 1590 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,
+/* 1598 */	0,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzbitxor,VXT_END,
+/* 1605 */	VXT_IREPAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_VAL,
+/* 1613 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzcall,VXT_END,
+/* 1617 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 1625 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzdata,VXT_END,
+/* 1629 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,4,VXI_PUSHAB,VXT_VAL,
+/* 1637 */	3,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,
+/* 1645 */	VXT_LIT,5,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzdate,VXT_END,
+/* 1650 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 1658 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzfile,VXT_END,
+/* 1665 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 1673 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fngetdvi,VXT_END,
+/* 1680 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHL,VXT_VAL,
+/* 1688 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fngetjpi,VXT_END,
+/* 1695 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHL,VXT_VAL,
+/* 1703 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fngetlki,VXT_END,
+/* 1710 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 1718 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fngetsyi,VXT_END,
+/* 1725 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 1733 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzjobexam,VXT_END,
+/* 1737 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 1745 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzlkid,VXT_END,
+/* 1749 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 1757 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzm,VXT_END,
+/* 1761 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,5,VXI_PUSHAB,VXT_VAL,
+/* 1769 */	4,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,
+/* 1777 */	VXT_VAL,1,VXI_CALLS,VXT_LIT,6,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzparse,VXT_END,
+/* 1785 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 1793 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzpid,VXT_END,
+/* 1797 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 1805 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzprevious,VXT_END,
+/* 1812 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 1820 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzpriv,VXT_END,
+/* 1824 */	VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzqgblmod,
+/* 1832 */	VXT_END,
+/* 1833 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,3,VXI_PUSHL,VXT_VAL,
+/* 1841 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
+/* 1849 */	SIZEOF(char *) * (short int)xf_fnzsearch,VXT_END,
+/* 1851 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 1859 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzsetprv,VXT_END,
+/* 1863 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,2,VXI_PUSHL,VXT_VAL,
+/* 1871 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzsigproc,VXT_END,
+/* 1878 */	VXT_IREPAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_VAL,
+/* 1886 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzsocket,VXT_END,
+/* 1890 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,6,VXI_PUSHAB,VXT_VAL,
+/* 1898 */	5,VXI_PUSHAB,VXT_VAL,4,VXI_PUSHL,VXT_VAL,3,VXI_PUSHAB,
+/* 1906 */	VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,7,
+/* 1914 */	VXT_XFER,SIZEOF(char *) * (short int)xf_fnztrnlnm,VXT_END,
+/* 1917 */	VXI_MOVAB,VXT_VAL,1,VXT_REG,0x50,VXI_MOVAB,VXT_VAL,2,
+/* 1925 */	VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_follow,VXT_END,
+/* 1931 */	VXI_MOVAB,VXT_VAL,0,VXT_REG,0x50,VXI_MOVAB,VXT_VAL,1,
+/* 1939 */	VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_forcenum,VXT_END,
+/* 1945 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_forchk1,VXT_END,
+/* 1952 */	VXI_PUSHAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 1960 */	1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_forinit,VXT_END,
+/* 1965 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_forlcldob,VXI_BRB,VXT_JMP,1,VXT_END,
+/* 1972 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_forlcldol,VXI_JMP,VXT_JMP,1,VXT_END,
+/* 1979 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_forlcldow,VXI_BRW,VXT_JMP,1,VXT_END,
+/* 1986 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHAB,VXT_JMP,1,VXI_PUSHAB,VXT_VAL,
+/* 1994 */	4,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,2,VXI_JSB,
+/* 2002 */	VXT_XFER,SIZEOF(char *) * (short int)xf_forloop,VXT_END,
+/* 2005 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHAB,VXT_JMP,1,VXI_PUSHAB,VXT_VAL,
+/* 2013 */	4,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,2,VXI_JSB,
+/* 2021 */	VXT_XFER,SIZEOF(char *) * (short int)xf_forloop,VXT_END,
+/* 2024 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHAB,VXT_JMP,1,VXI_PUSHAB,VXT_VAL,
+/* 2032 */	4,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,2,VXI_JSB,
+/* 2040 */	VXT_XFER,SIZEOF(char *) * (short int)xf_forloop,VXT_END,
+/* 2043 */	VXT_IREPAB,VXT_VAL,2,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_getindx,
+/* 2051 */	VXI_MOVL,VXT_REG,0x50,VXT_ADDR,0,VXT_END,
+/* 2057 */	VXI_MOVAB,VXT_VAL,0,VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_gettruth,
+/* 2065 */	VXT_END,
+/* 2066 */	VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_gvdata,
+/* 2074 */	VXT_END,
+/* 2075 */	VXT_IREPAB,VXT_VAL,3,VXI_PUSHL,VXT_VAL,2,VXI_CALLS,VXT_VAL,
+/* 2083 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_gvextnam,VXT_END,
+/* 2087 */	VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_gvget,
+/* 2095 */	VXT_END,
+/* 2096 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_CALLS,VXT_LIT,
+/* 2104 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_gvincr,VXT_END,
+/* 2108 */	VXI_CALLS,VXT_LIT,0,VXT_XFER,SIZEOF(char *) * (short int)xf_gvkill,VXT_END,
+/* 2114 */	VXT_IREPAB,VXT_VAL,3,VXI_PUSHL,VXT_VAL,2,VXI_CALLS,VXT_VAL,
+/* 2122 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_gvnaked,VXT_END,
+/* 2126 */	VXT_IREPAB,VXT_VAL,3,VXI_PUSHL,VXT_VAL,2,VXI_CALLS,VXT_VAL,
+/* 2134 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_gvname,VXT_END,
+/* 2138 */	VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_gvnext,
+/* 2146 */	VXT_END,
+/* 2147 */	VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,
+/* 2155 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_gvo2,VXT_END,
+/* 2159 */	VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_gvorder,
+/* 2167 */	VXT_END,
+/* 2168 */	VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_gvput,
+/* 2176 */	VXT_END,
+/* 2177 */	VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_gvquery,
+/* 2185 */	VXT_END,
+/* 2186 */	VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_gvrectarg,
+/* 2194 */	VXT_END,
+/* 2195 */	VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_gvsavtarg,
+/* 2203 */	VXT_END,
+/* 2204 */	VXI_CALLS,VXT_LIT,0,VXT_XFER,SIZEOF(char *) * (short int)xf_gvzwithdraw,VXT_END,
+/* 2210 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXT_IREPAB,VXT_VAL,4,VXI_PUSHL,VXT_VAL,
+/* 2218 */	3,VXI_PUSHL,VXT_VAL,2,VXI_CALLS,VXT_VAL,1,VXT_XFER,
+/* 2226 */	SIZEOF(char *) * (short int)xf_gvzwrite,VXT_END,
+/* 2228 */	VXI_CALLS,VXT_LIT,0,VXT_XFER,SIZEOF(char *) * (short int)xf_halt,VXT_END,
+/* 2234 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 2242 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_hang,VXT_END,
+/* 2246 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_hardret,VXT_END,
+/* 2250 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 2258 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_idiv,VXT_END,
+/* 2265 */	VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_igetsrc,
+/* 2273 */	VXT_END,
+/* 2274 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 2282 */	1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_inddevparms,VXT_END,
+/* 2287 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,
+/* 2295 */	0,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_indfnname,VXT_END,
+/* 2300 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 2308 */	1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_indfun,VXT_END,
+/* 2313 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_JSB,VXT_XFER,
+/* 2321 */	SIZEOF(char *) * (short int)xf_indglvn,VXT_END,
+/* 2323 */	VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 2331 */	0,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_indincr,VXT_END,
+/* 2336 */	VXI_PUSHAB,VXT_VAL,1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_indlvadr,VXI_MOVL,VXT_REG,
+/* 2344 */	0x50,VXT_ADDR,0,VXT_END,
+/* 2348 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_JSB,VXT_XFER,
+/* 2356 */	SIZEOF(char *) * (short int)xf_indlvarg,VXT_END,
+/* 2358 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,
+/* 2366 */	0,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_indname,VXT_END,
+/* 2373 */	VXI_PUSHAB,VXT_VAL,1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_indlvnamadr,VXI_MOVL,VXT_REG,
+/* 2381 */	0x50,VXT_ADDR,0,VXT_END,
+/* 2385 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,
+/* 2393 */	0,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_indo2,VXT_END,
+/* 2400 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_JSB,VXT_XFER,
+/* 2408 */	SIZEOF(char *) * (short int)xf_indpat,VXT_END,
+/* 2410 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_JSB,VXT_XFER,
+/* 2418 */	SIZEOF(char *) * (short int)xf_indrzshow,VXT_END,
+/* 2420 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_JSB,VXT_XFER,
+/* 2428 */	SIZEOF(char *) * (short int)xf_indset,VXT_END,
+/* 2430 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHL,VXT_VAL,
+/* 2438 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_indtext,VXT_END,
+/* 2446 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXT_IREPAB,VXT_VAL,2,VXI_CALLS,VXT_VAL,
+/* 2454 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_iocontrol,VXT_END,
+/* 2458 */	VXI_MOVAB,VXT_VAL,1,VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_iretmvad,
+/* 2466 */	VXT_END,
+/* 2467 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_JSB,VXT_XFER,
+/* 2475 */	SIZEOF(char *) * (short int)xf_iretmval,VXT_END,
+/* 2477 */	VXI_BRB,VXT_JMP,1,VXT_END,
+/* 2481 */	VXI_JMP,VXT_JMP,1,VXT_END,
+/* 2485 */	VXI_BRW,VXT_JMP,1,VXT_END,
+/* 2489 */	VXI_JMP,VXT_VAL,1,VXT_END,
+/* 2493 */	VXI_BEQL,VXT_JMP,1,VXT_END,
+/* 2497 */	VXI_BNEQ,VXT_LIT,6,VXI_JMP,VXT_JMP,1,VXT_END,
+/* 2504 */	VXI_BNEQ,VXT_LIT,3,VXI_BRW,VXT_JMP,1,VXT_END,
+/* 2511 */	VXI_BGEQ,VXT_JMP,1,VXT_END,
+/* 2515 */	VXI_BLSS,VXT_LIT,6,VXI_JMP,VXT_JMP,1,VXT_END,
+/* 2522 */	VXI_BLSS,VXT_LIT,3,VXI_BRW,VXT_JMP,1,VXT_END,
+/* 2529 */	VXI_BGTR,VXT_JMP,1,VXT_END,
+/* 2533 */	VXI_BLEQ,VXT_LIT,6,VXI_JMP,VXT_JMP,1,VXT_END,
+/* 2540 */	VXI_BLEQ,VXT_LIT,3,VXI_BRW,VXT_JMP,1,VXT_END,
+/* 2547 */	VXI_BLEQ,VXT_JMP,1,VXT_END,
+/* 2551 */	VXI_BGTR,VXT_LIT,6,VXI_JMP,VXT_JMP,1,VXT_END,
+/* 2558 */	VXI_BGTR,VXT_LIT,3,VXI_BRW,VXT_JMP,1,VXT_END,
+/* 2565 */	VXI_BLSS,VXT_JMP,1,VXT_END,
+/* 2569 */	VXI_BGEQ,VXT_LIT,6,VXI_JMP,VXT_JMP,1,VXT_END,
+/* 2576 */	VXI_BGEQ,VXT_LIT,3,VXI_BRW,VXT_JMP,1,VXT_END,
+/* 2583 */	VXI_BNEQ,VXT_JMP,1,VXT_END,
+/* 2587 */	VXI_BNEQ,VXT_LIT,6,VXI_JMP,VXT_JMP,1,VXT_END,
+/* 2594 */	VXI_BEQL,VXT_LIT,3,VXI_BRW,VXT_JMP,1,VXT_END,
+/* 2601 */	VXI_BLBC,VXT_REG,0x5A,VXT_JMP,1,VXT_END,
+/* 2607 */	VXI_BLBS,VXT_REG,0x5A,VXT_LIT,6,VXI_JMP,VXT_JMP,1,
+/* 2615 */	VXT_END,
+/* 2616 */	VXI_BLBS,VXT_REG,0x5A,VXT_LIT,3,VXI_BRW,VXT_JMP,1,
+/* 2624 */	VXT_END,
+/* 2625 */	VXI_BLBS,VXT_REG,0x5A,VXT_JMP,1,VXT_END,
+/* 2631 */	VXI_BLBC,VXT_REG,0x5A,VXT_LIT,6,VXI_JMP,VXT_JMP,1,
+/* 2639 */	VXT_END,
+/* 2640 */	VXI_BLBC,VXT_REG,0x5A,VXT_LIT,3,VXI_BRW,VXT_JMP,1,
+/* 2648 */	VXT_END,
+/* 2649 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXT_IREPAB,VXT_VAL,7,VXI_PUSHL,VXT_VAL,
+/* 2657 */	6,VXI_PUSHAB,VXT_VAL,5,VXI_PUSHAB,VXT_VAL,4,VXI_PUSHL,
+/* 2665 */	VXT_VAL,3,VXI_PUSHAB,VXT_VAL,2,VXI_CALLS,VXT_VAL,1,
+/* 2673 */	VXT_XFER,SIZEOF(char *) * (short int)xf_job,VXT_END,
+/* 2676 */	VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_kill,
+/* 2684 */	VXT_END,
+/* 2685 */	VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_killalias,
+/* 2693 */	VXT_END,
+/* 2694 */	VXI_CALLS,VXT_LIT,0,VXT_XFER,SIZEOF(char *) * (short int)xf_killall,VXT_END,
+/* 2700 */	VXI_CALLS,VXT_LIT,0,VXT_XFER,SIZEOF(char *) * (short int)xf_killaliasall,VXT_END,
+/* 2706 */	VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,
+/* 2714 */	3,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_labaddr,VXI_MOVL,VXT_REG,
+/* 2722 */	0x50,VXT_ADDR,0,VXT_END,
+/* 2726 */	VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_lckdecr,
+/* 2734 */	VXT_END,
+/* 2735 */	VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_lckincr,
+/* 2743 */	VXT_END,
+/* 2744 */	VXI_MOVAB,VXT_JMP,1,VXT_ADDR,0,VXT_END,
+/* 2750 */	VXI_MOVAB,VXT_JMP,1,VXT_ADDR,0,VXT_END,
+/* 2756 */	VXI_MOVAB,VXT_JMP,1,VXT_ADDR,0,VXT_END,
+/* 2762 */	VXT_IREPL,VXT_VAL,2,VXI_PUSHL,VXT_VAL,1,VXI_JSB,VXT_XFER,
+/* 2770 */	SIZEOF(char *) * (short int)xf_linefetch,VXT_END,
+/* 2772 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_linestart,VXT_END,
+/* 2776 */	VXT_IREPAB,VXT_VAL,4,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,
+/* 2784 */	2,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_lkname,VXT_END,
+/* 2791 */	VXI_CALLS,VXT_LIT,0,VXT_XFER,SIZEOF(char *) * (short int)xf_lkinit,VXT_END,
+/* 2797 */	VXT_IREPAB,VXT_VAL,4,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHL,VXT_VAL,
+/* 2805 */	2,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_lkname,VXT_END,
+/* 2812 */	VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_lock,
+/* 2820 */	VXT_END,
+/* 2821 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXT_IREPAB,VXT_VAL,3,VXI_PUSHL,VXT_VAL,
+/* 2829 */	2,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_lvpatwrite,VXT_END,
+/* 2836 */	VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_lvzwithdraw,
+/* 2844 */	VXT_END,
+/* 2845 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXT_IREPAB,VXT_VAL,2,VXI_CALLS,VXT_VAL,
+/* 2853 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_lvzwrite,VXT_END,
+/* 2857 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 2865 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_flt_mod,VXT_END,
+/* 2872 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 2880 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_mul,VXT_END,
+/* 2887 */	VXI_MOVAB,VXT_VAL,0,VXT_REG,0x50,VXI_MOVAB,VXT_VAL,1,
+/* 2895 */	VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_neg,VXT_END,
+/* 2901 */	VXI_PUSHL,VXT_VAL,1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_newintrinsic,VXT_END,
+/* 2908 */	VXI_PUSHL,VXT_VAL,1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_newvar,VXT_END,
+/* 2915 */	VXI_CALLS,VXT_LIT,0,VXT_XFER,SIZEOF(char *) * (short int)xf_nullexp,VXI_MOVL,VXT_REG,0x50,
+/* 2923 */	VXT_ADDR,0,VXT_END,
+/* 2926 */	VXI_MOVAB,VXT_VAL,1,VXT_REG,0x50,VXI_MOVAB,VXT_VAL,2,
+/* 2934 */	VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_numcmp,VXT_END,
+/* 2940 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHAB,VXT_VAL,4,VXI_PUSHL,VXT_VAL,
+/* 2948 */	3,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,
+/* 2956 */	VXT_LIT,4,VXT_XFER,SIZEOF(char *) * (short int)xf_open,VXT_END,
+/* 2961 */	VXI_MOVAB,VXT_VAL,1,VXT_REG,0x50,VXI_MOVAB,VXT_VAL,2,
+/* 2969 */	VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_pattern,VXT_END,
+/* 2975 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 2983 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnpopulation,VXT_END,
+/* 2990 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 2998 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzpopulation,VXT_END,
+/* 3005 */	VXT_IREPAB,VXT_VAL,2,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_putindx,
+/* 3013 */	VXI_MOVL,VXT_REG,0x50,VXT_ADDR,0,VXT_END,
+/* 3019 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHL,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,
+/* 3027 */	0,VXI_CALLS,VXT_LIT,2,VXT_XFER,SIZEOF(char *) * (short int)xf_rdone,VXT_END,
+/* 3034 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHL,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,
+/* 3042 */	0,VXI_CALLS,VXT_LIT,2,VXT_XFER,SIZEOF(char *) * (short int)xf_read,VXT_END,
+/* 3049 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHL,VXT_VAL,2,VXI_PUSHL,VXT_VAL,
+/* 3057 */	1,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,3,VXT_XFER,
+/* 3065 */	SIZEOF(char *) * (short int)xf_readfl,VXT_END,
+/* 3067 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXT_END,
+/* 3071 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_ret,VXT_END,
+/* 3075 */	VXI_MOVAB,VXT_VAL,1,VXT_REG,0x50,VXI_MOVL,VXT_VAL,2,
+/* 3083 */	VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_retarg,VXT_END,
+/* 3089 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 3097 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_rhdaddr,VXI_MOVL,VXT_REG,0x50,VXT_ADDR,0,
+/* 3105 */	VXT_END,
+/* 3106 */	VXI_PUSHL,VXT_LIT,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 3114 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_rhdaddr,VXI_MOVL,VXT_REG,0x50,VXT_ADDR,0,
+/* 3122 */	VXT_END,
+/* 3123 */	VXI_PUSHL,VXT_VAL,2,VXI_PUSHL,VXT_VAL,1,VXI_JSB,VXT_XFER,
+/* 3131 */	SIZEOF(char *) * (short int)xf_rterror,VXT_END,
+/* 3133 */	VXI_PUSHL,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,2,VXI_CALLS,VXT_LIT,
+/* 3141 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_setals2als,VXT_END,
+/* 3145 */	VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,2,VXI_CALLS,VXT_LIT,
+/* 3153 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_setalsin2alsct,VXT_END,
+/* 3157 */	VXI_PUSHL,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,2,VXI_CALLS,VXT_LIT,
+/* 3165 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_setalsctin2als,VXT_END,
+/* 3169 */	VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,2,VXI_CALLS,VXT_LIT,
+/* 3177 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_setalsct2alsct,VXT_END,
+/* 3181 */	VXI_PUSHL,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,2,VXI_CALLS,VXT_LIT,
+/* 3189 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_setfnretin2als,VXT_END,
+/* 3193 */	VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,2,VXI_CALLS,VXT_LIT,
+/* 3201 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_setfnretin2alsct,VXT_END,
+/* 3205 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,3,VXI_PUSHL,VXT_VAL,
+/* 3213 */	2,VXI_PUSHAB,VXT_VAL,4,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,
+/* 3221 */	VXT_LIT,5,VXT_XFER,SIZEOF(char *) * (short int)xf_setextract,VXT_END,
+/* 3226 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,
+/* 3234 */	4,VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,
+/* 3242 */	VXT_LIT,5,VXT_XFER,SIZEOF(char *) * (short int)xf_setp1,VXT_END,
+/* 3247 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,4,VXI_PUSHL,VXT_VAL,
+/* 3255 */	3,VXI_PUSHAB,VXT_VAL,5,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,
+/* 3263 */	VXT_VAL,1,VXI_CALLS,VXT_LIT,6,VXT_XFER,SIZEOF(char *) * (short int)xf_setpiece,VXT_END,
+/* 3271 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,3,VXI_PUSHL,VXT_VAL,
+/* 3279 */	2,VXI_PUSHAB,VXT_VAL,4,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,
+/* 3287 */	VXT_LIT,5,VXT_XFER,SIZEOF(char *) * (short int)xf_setzextract,VXT_END,
+/* 3292 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,
+/* 3300 */	4,VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,
+/* 3308 */	VXT_LIT,5,VXT_XFER,SIZEOF(char *) * (short int)xf_setzp1,VXT_END,
+/* 3313 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,4,VXI_PUSHL,VXT_VAL,
+/* 3321 */	3,VXI_PUSHAB,VXT_VAL,5,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,
+/* 3329 */	VXT_VAL,1,VXI_CALLS,VXT_LIT,6,VXT_XFER,SIZEOF(char *) * (short int)xf_setzpiece,VXT_END,
+/* 3337 */	VXI_BISB2,VXT_LIT,1,VXT_REG,0x5A,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_dt_true,
+/* 3345 */	VXT_END,
+/* 3346 */	VXI_PUSHL,VXT_VAL,5,VXI_PUSHAB,VXT_VAL,4,VXI_PUSHL,VXT_VAL,
+/* 3354 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,3,VXI_CALLS,
+/* 3362 */	VXT_LIT,5,VXT_XFER,SIZEOF(char *) * (short int)xf_setzbrk,VXT_END,
+/* 3367 */	VXI_MOVAB,VXT_VAL,1,VXT_REG,0x50,VXI_MOVAB,VXT_VAL,2,
+/* 3375 */	VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_sorts_after,VXT_END,
+/* 3381 */	VXT_IREPAB,VXT_VAL,2,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_srchindx,
+/* 3389 */	VXI_MOVL,VXT_REG,0x50,VXT_ADDR,0,VXT_END,
+/* 3395 */	VXI_MOVAB,VXT_VAL,2,VXT_REG,0x51,VXI_MOVAB,VXT_VAL,1,
+/* 3403 */	VXT_REG,0x50,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_sto,VXT_END,
+/* 3409 */	VXI_MOVC3,VXT_LIT,16,VXT_VAL,2,VXT_VAL,1,VXT_END,
+/* 3417 */	VXI_MOVAB,VXT_VAL,1,VXT_REG,0x51,VXI_MOVAB,VXT_VAL,0,
+/* 3425 */	VXT_REG,0x50,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_sto,VXT_END,
+/* 3431 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 3439 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_sub,VXT_END,
+/* 3446 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 3454 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_svget,VXT_END,
+/* 3458 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHL,VXT_VAL,1,VXI_JSB,VXT_XFER,
+/* 3466 */	SIZEOF(char *) * (short int)xf_psvput,VXT_END,
+/* 3468 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 3476 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_svput,VXT_END,
+/* 3480 */	VXI_MOVL,VXT_REG,0x50,VXT_REG,0x5A,VXT_END,
+/* 3486 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_tcommit,VXT_END,
+/* 3490 */	VXI_PUSHL,VXT_VAL,1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_trollback,VXT_END,
+/* 3497 */	VXI_PUSHL,VXT_VAL,1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_trestart,VXT_END,
+/* 3504 */	VXT_IREPAB,VXT_VAL,4,VXI_PUSHL,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,
+/* 3512 */	2,VXI_PUSHL,VXT_VAL,1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_tstart,VXT_END,
+/* 3520 */	VXI_CALLS,VXT_LIT,0,VXT_XFER,SIZEOF(char *) * (short int)xf_unlock,VXT_END,
+/* 3526 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 3534 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_use,VXT_END,
+/* 3538 */	VXT_IREPAB,VXT_VAL,2,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_view,
+/* 3546 */	VXT_END,
+/* 3547 */	VXI_CMPL,VXT_VAL,1,VXT_VAL,2,VXT_END,
+/* 3553 */	VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_write,
+/* 3561 */	VXT_END,
+/* 3562 */	VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_wteol,
+/* 3570 */	VXT_END,
+/* 3571 */	VXI_CALLS,VXT_LIT,0,VXT_XFER,SIZEOF(char *) * (short int)xf_wtff,VXT_END,
+/* 3577 */	VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_wtone,
+/* 3585 */	VXT_END,
+/* 3586 */	VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_wttab,
+/* 3594 */	VXT_END,
+/* 3595 */	VXT_IREPAB,VXT_VAL,2,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_xkill,
+/* 3603 */	VXT_END,
+/* 3604 */	VXT_IREPAB,VXT_VAL,2,VXI_PUSHL,VXT_VAL,1,VXI_JSB,VXT_XFER,
+/* 3612 */	SIZEOF(char *) * (short int)xf_xnew,VXT_END,
+/* 3614 */	VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_zallocate,
+/* 3622 */	VXT_END,
+/* 3623 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 3631 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_zattach,VXT_END,
+/* 3635 */	VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 3643 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_zcompile,VXT_END,
+/* 3647 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_zcont,VXT_END,
+/* 3651 */	VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_zdeallocate,
+/* 3659 */	VXT_END,
+/* 3660 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 3668 */	1,VXI_CALLS,VXT_LIT,2,VXT_XFER,SIZEOF(char *) * (short int)xf_zedit,VXT_END,
+/* 3675 */	VXI_PUSHL,VXT_VAL,1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_zg1,VXT_END,
+/* 3682 */	VXI_PUSHL,VXT_VAL,1,VXI_PUSHL,VXT_VAL,4,VXI_PUSHAB,VXT_VAL,
+/* 3690 */	3,VXI_PUSHAB,VXT_VAL,2,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_zgoto,VXT_END,
+/* 3698 */	VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_zhalt,
+/* 3706 */	VXT_END,
+/* 3707 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 3715 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_zhelp,VXT_END,
+/* 3719 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 3727 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_zlink,VXT_END,
+/* 3731 */	VXT_IREPAB,VXT_VAL,3,VXI_PUSHL,VXT_VAL,2,VXI_CALLS,VXT_VAL,
+/* 3739 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_zmess,VXT_END,
+/* 3743 */	VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_zprevious,
+/* 3751 */	VXT_END,
+/* 3752 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHL,VXT_VAL,5,VXI_PUSHAB,VXT_VAL,
+/* 3760 */	4,VXI_PUSHL,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,
+/* 3768 */	VXT_VAL,1,VXI_CALLS,VXT_LIT,5,VXT_XFER,SIZEOF(char *) * (short int)xf_zprint,VXT_END,
+/* 3776 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHL,VXT_LIT,0,VXI_PUSHL,VXT_VAL,
+/* 3784 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,3,VXT_XFER,
+/* 3792 */	SIZEOF(char *) * (short int)xf_zshow,VXT_END,
+/* 3794 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHL,VXT_VAL,
+/* 3802 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,3,VXT_XFER,
+/* 3810 */	SIZEOF(char *) * (short int)xf_zshow,VXT_END,
+/* 3812 */	VXI_PUSHL,VXT_LIT,0,VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 3820 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_zstep,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_zcont,VXT_END,
+/* 3827 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 3835 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_zstep,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_zcont,VXT_END,
+/* 3842 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 3850 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_zsystem,VXT_END,
+/* 3854 */	VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_ztcommit,
+/* 3862 */	VXT_END,
+/* 3863 */	VXI_CALLS,VXT_LIT,0,VXT_XFER,SIZEOF(char *) * (short int)xf_ztstart,VXT_END,
+/* 3869 */	VXI_CALLS,VXT_LIT,0,VXT_XFER,SIZEOF(char *) * (short int)xf_merge,VXT_END,
+/* 3875 */	VXI_PUSHL,VXT_LIT,0,VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 3883 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_merge_arg,VXT_END,
+/* 3887 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 3895 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_merge_arg,VXT_END,
+/* 3899 */	VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,2,VXI_JSB,VXT_XFER,
+/* 3907 */	SIZEOF(char *) * (short int)xf_indmerge,VXT_END,
+/* 3909 */	VXT_IREPAB,VXT_VAL,2,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_m_srchindx,
+/* 3917 */	VXI_MOVL,VXT_REG,0x50,VXT_ADDR,0,VXT_END,
+/* 3923 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,4,VXI_PUSHL,VXT_VAL,
+/* 3931 */	3,VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,
+/* 3939 */	VXT_LIT,5,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzatransform,VXT_END,
+/* 3944 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 3952 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzconvert2,VXT_END,
+/* 3959 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,
+/* 3967 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
+/* 3975 */	SIZEOF(char *) * (short int)xf_fnzconvert3,VXT_END,
+/* 3977 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,3,VXI_PUSHL,VXT_VAL,
+/* 3985 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
+/* 3993 */	SIZEOF(char *) * (short int)xf_fnzcollate,VXT_END,
+/* 3995 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,3,VXI_PUSHL,VXT_VAL,
+/* 4003 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
+/* 4011 */	SIZEOF(char *) * (short int)xf_fnzsubstr,VXT_END,
+/* 4013 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 4021 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzwidth,VXT_END,
+/* 4025 */	VXI_CALLS,VXT_LIT,0,VXT_XFER,SIZEOF(char *) * (short int)xf_ztrigger,VXT_END,
+/* 4031 */	VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_zwritesvn,
+/* 4039 */	VXT_END,
+/* 4040 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHL,VXT_VAL,
+/* 4048 */	2,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzwrite,VXT_END,
+/* 4055 */	VXI_CALLS,VXT_LIT,0,VXT_XFER,SIZEOF(char *) * (short int)xf_igetdst,VXI_MOVL,VXT_REG,0x50,
+/* 4063 */	VXT_ADDR,0,VXT_END,
+/* 4066 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 4074 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_indget1,VXT_END,
+/* 4078 */	VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_glvnpop,
+/* 4086 */	VXT_END,
+/* 4087 */	VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_glvnslot,
+/* 4095 */	VXI_MOVL,VXT_REG,0x50,VXT_ADDR,0,VXT_END,
+/* 4101 */	VXI_PUSHL,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 4109 */	1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_indsavglvn,VXT_END,
+/* 4114 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_JSB,VXT_XFER,
+/* 4122 */	SIZEOF(char *) * (short int)xf_indsavlvn,VXT_END,
+/* 4124 */	VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 4132 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_rfrshlvn,VXI_MOVL,VXT_REG,0x50,VXT_ADDR,0,
+/* 4140 */	VXT_END,
+/* 4141 */	VXT_IREPAB,VXT_VAL,3,VXI_PUSHL,VXT_VAL,2,VXI_CALLS,VXT_VAL,
+/* 4149 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_savgvn,VXT_END,
+/* 4153 */	VXT_IREPAB,VXT_VAL,2,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_savlvn,
+/* 4161 */	VXT_END,
+/* 4162 */	VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 4170 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_shareslot,VXT_END,
+/* 4174 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 4182 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_stoglvn,VXT_END,
+/* 4186 */	VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 4194 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_rfrshgvn,VXT_END,
+/* 4198 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,
+/* 4206 */	0,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_indfnname2,VXT_END,
+/* 4213 */	VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,
+/* 4221 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_indget2,VXT_END,
+/* 4225 */	VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_indmerge2,
+/* 4233 */	VXT_END,
+/* 4234 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,4,VXI_PUSHL,VXT_VAL,
+/* 4242 */	3,VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,
+/* 4250 */	VXT_LIT,5,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzpeek,VXT_END,
+/* 4255 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 4263 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzsyslog,VXT_END,
+/* 4267 */	366,380,373,2477,2485,2481,2744,2756,
+/* 4275 */	2750,0,0,0,487,463,454,0,
+/* 4283 */	0,450,1986,2024,2005,2625,2640,2631,
+/* 4291 */	2601,2616,2607,2493,2504,2497,2583,2594,
+/* 4299 */	2587,2529,2540,2533,2547,2558,2551,2565,
+/* 4307 */	2576,2569,2511,2522,2515,1965,1979,1972,
+/* 4315 */	387,401,394};
diff --git a/sr_linux/gtm_env_sp.csh b/sr_linux/gtm_env_sp.csh
index fd20e94..e5489a6 100755
--- a/sr_linux/gtm_env_sp.csh
+++ b/sr_linux/gtm_env_sp.csh
@@ -1,6 +1,6 @@
 #################################################################
 #								#
-# Copyright (c) 2001-2016 Fidelity National Information		#
+# Copyright (c) 2001-2017 Fidelity National Information		#
 # Services, Inc. and/or its subsidiaries. All rights reserved.	#
 #								#
 #	This source code contains the intellectual property	#
@@ -209,12 +209,12 @@ if ( $?gtm_version_change == "1" ) then
 	# -ffloat-store for consistent results avoiding rounding differences
 	# -fno-omit-frame-pointer so %rbp always gets set up (required by caller_id()). Default changed in gcc 4.6.
 	if ( "ia64" != $mach_type ) then
-		setenv	gt_cc_option_optimize	"-O2 -fno-defer-pop -fno-strict-aliasing -ffloat-store"
+		setenv	gt_cc_option_optimize	"-O2 -fno-defer-pop -fno-strict-aliasing -ffloat-store -fno-omit-frame-pointer"
 		if ( "32" == $gt_build_type ) then
 			# applies to 32bit x86_64, ia32 and cygwin
 			# Compile 32-bit x86 GT.M using 586 instruction set rather than 686 as the new Intel Quark
 			# low power system-on-a-chip uses the 586 instruction set rather than the 686 instruction set
-			setenv  gt_cc_option_optimize "$gt_cc_option_optimize -fno-omit-frame-pointer -march=i586"
+			setenv  gt_cc_option_optimize "$gt_cc_option_optimize -march=i586"
 		endif
 	endif
 	# -g	generate debugging information for dbx (no longer overrides -O)
@@ -228,7 +228,8 @@ if ( $?gtm_version_change == "1" ) then
 
 	# -M		generate link map onto standard output
 	setenv	gt_ld_options_common	"-Wl,-M"
-	setenv 	gt_ld_options_gtmshr	"-Wl,-u,gtm_filename_to_id -Wl,--version-script,gtmshr_symbols.export"
+	setenv 	gt_ld_options_gtmshr	"-Wl,-u,accumulate -Wl,-u,is_big_endian -Wl,-u,to_ulong"
+	setenv 	gt_ld_options_gtmshr	"$gt_ld_options_gtmshr -Wl,-u,gtm_filename_to_id -Wl,--version-script,gtmshr_symbols.export"
 	setenv 	gt_ld_options_all_exe	"-rdynamic -Wl,-u,gtm_filename_to_id -Wl,-u,gtm_zstatus"
 	setenv	gt_ld_options_all_exe	"$gt_ld_options_all_exe -Wl,--version-script,gtmexe_symbols.export"
 
diff --git a/sr_linux/platform.cmake b/sr_linux/platform.cmake
index e989ae0..94579ee 100644
--- a/sr_linux/platform.cmake
+++ b/sr_linux/platform.cmake
@@ -1,6 +1,7 @@
 #################################################################
 #								#
-#	Copyright 2013, 2014 Fidelity Information Services, Inc	#
+# Copyright (c) 2013-2016 Fidelity National Information		#
+# Services, Inc. and/or its subsidiaries. All rights reserved.	#
 #								#
 #	This source code contains the intellectual property	#
 #	of its copyright holder(s), and is made available	#
@@ -67,7 +68,8 @@ add_definitions(
 set(gtm_link  "-Wl,-u,gtm_filename_to_id -Wl,-u,gtm_zstatus -Wl,--version-script,\"${GTM_BINARY_DIR}/gtmexe_symbols.export\"")
 set(gtm_dep   "${GTM_BINARY_DIR}/gtmexe_symbols.export")
 
-set(libgtmshr_link "-Wl,-u,gtm_ci -Wl,-u,gtm_filename_to_id -Wl,--version-script,\"${GTM_BINARY_DIR}/gtmshr_symbols.export\"")
+set(libgtmshr_link "-Wl,-u,gtm_ci -Wl,-u,gtm_filename_to_id -Wl,-u,gtm_is_main_thread")
+set(libgtmshr_link "${libgtmshr_link} -Wl,--version-script,\"${GTM_BINARY_DIR}/gtmshr_symbols.export\"")
 set(libgtmshr_dep  "${GTM_BINARY_DIR}/gtmexe_symbols.export")
 
 if(${bits} EQUAL 32)
diff --git a/sr_linux/release_name.h b/sr_linux/release_name.h
index 4478cb4..cc00975 100644
--- a/sr_linux/release_name.h
+++ b/sr_linux/release_name.h
@@ -11,15 +11,15 @@
  ****************************************************************/
 
 #ifdef __CYGWIN__
-#define GTM_RELEASE_NAME 	"GT.M V6.3-000A CYGWIN x86"
+#define GTM_RELEASE_NAME 	"GT.M V6.3-001A CYGWIN x86"
 #elif defined(__ia64)
-#define GTM_RELEASE_NAME 	"GT.M V6.3-000A Linux IA64"
+#define GTM_RELEASE_NAME 	"GT.M V6.3-001A Linux IA64"
 #elif defined(__x86_64__)
-#define GTM_RELEASE_NAME 	"GT.M V6.3-000A Linux x86_64"
+#define GTM_RELEASE_NAME 	"GT.M V6.3-001A Linux x86_64"
 #elif defined(__s390__)
-#define GTM_RELEASE_NAME 	"GT.M V6.3-000A Linux S390X"
+#define GTM_RELEASE_NAME 	"GT.M V6.3-001A Linux S390X"
 #else
-#define GTM_RELEASE_NAME 	"GT.M V6.3-000A Linux x86"
+#define GTM_RELEASE_NAME 	"GT.M V6.3-001A Linux x86"
 #endif
 #define GTM_PRODUCT 		"GT.M"
 #define GTM_VERSION		"V6.3"
diff --git a/sr_port/advancewindow.c b/sr_port/advancewindow.c
old mode 100755
new mode 100644
index bbc39e7..096db21
--- a/sr_port/advancewindow.c
+++ b/sr_port/advancewindow.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information 	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -26,7 +26,6 @@
 #include "gtm_icu_api.h"	/* U_ISPRINT() needs this header */
 #endif
 
-GBLREF	unsigned char	*source_buffer;
 GBLREF	int		source_column;
 GBLREF	spdesc		stringpool;
 GBLREF	boolean_t	gtm_utf8_mode;
@@ -51,7 +50,7 @@ static readonly unsigned char apos_ok[] =
 
 void advancewindow(void)
 {
-	unsigned char	*cp1, *cp2, *cp3, *cptr;
+	unsigned char	*cp1, *cp2, *cp3, *cptop, *cptr;
 	unsigned char	*error, errtxt[(3 + 1) UNICODE_ONLY(* GTM_MB_LEN_MAX)], x;	/* up to 3 digits/byte & a comma */
 	char		*tmp;
 	int		y, charlen;
@@ -62,7 +61,7 @@ void advancewindow(void)
 
 	SETUP_THREADGBL_ACCESS;
 	TREF(last_source_column) = source_column;
-	source_column = (unsigned char *)TREF(lexical_ptr) - source_buffer + 1;
+	source_column = (TREF(lexical_ptr) - (TREF(source_buffer)).addr + 1);
 	TREF(window_token) = TREF(director_token);
 	TREF(window_mval) = TREF(director_mval);
 	(TREF(director_mval)).mvtype = 0; /* keeps mval from being GC'd since it is not useful until re-used */
@@ -72,31 +71,38 @@ void advancewindow(void)
 	x = *TREF(lexical_ptr);
 	switch (y = ctypetab[x])
 	{
+	case TK_CR:
+		y = ctypetab[*(++(TREF(lexical_ptr)))];
+		if (TK_EOL != y)
+		{	/* Not looking like a <CR><LF>, so it's an error */
+			y = TK_ERROR;
+			break;
+		}	/* WARNING fall through - it is a <CR><LF>*/
 	case TK_EOL:
 		TREF(director_token) = TK_EOL;
 		return;		/* if next character is terminator, avoid incrementing past it */
 	case TK_QUOTE:
-		ENSURE_STP_FREE_SPACE(TREF(max_advancewindow_line));
-		cp1 = (unsigned char *)TREF(lexical_ptr) + 1;
+		ENSURE_STP_FREE_SPACE((TREF(source_buffer)).len);
+		cptop = (unsigned char *)((TREF(source_buffer)).addr + (TREF(source_buffer)).len - 1);
 		cp2 = cp3 = stringpool.free;
-		for (;;)
+		for (cp1 = (unsigned char *)TREF(lexical_ptr) + 1; cp1 <= cptop;)
 		{
 #			ifdef UNICODE_SUPPORTED
 			if (gtm_utf8_mode)
-				cptr = (unsigned char *)UTF8_MBTOWC((sm_uc_ptr_t)cp1, source_buffer + TREF(max_advancewindow_line),
-								    ch);
+				cptr = (unsigned char *)UTF8_MBTOWC((sm_uc_ptr_t)cp1, (TREF(source_buffer)).addr
+					+ (TREF(source_buffer)).len, ch);
 #			endif
 			x = *cp1++;
 			if ((SP > x) UNICODE_ONLY(|| (gtm_utf8_mode && !(U_ISPRINT(ch)))))
 			{
-				TREF(last_source_column) = cp1 - source_buffer;
-				if ('\0' == x)
-				{
-					TREF(director_token) = TREF(window_token) = TK_ERROR;
-					return;
-				}
+				TREF(last_source_column) = (cp1 - (unsigned char*)((TREF(source_buffer)).addr));
 				if (!run_time)
 				{
+					if ('\0' == x)
+					{
+						TREF(director_token) = TREF(window_token) = TK_ERROR;
+						return;
+					}
 					show_source_line(TRUE);
 					if (!gtm_utf8_mode)
 						charlen = 1;			/* always one character in M mode */
@@ -135,6 +141,12 @@ void advancewindow(void)
 #			endif
 			assert(cp2 <= stringpool.top);
 		}
+		if (cp1 > cptop)
+		{
+			TREF(last_source_column) = (TREF(source_buffer)).len;
+			TREF(director_token) = TREF(window_token) = TK_ERROR;
+			return;
+		}
 		TREF(lexical_ptr) = (char *)cp1;
 		TREF(director_token) = TK_STRLIT;
 		(TREF(director_mval)).mvtype = MV_STR;
@@ -180,7 +192,7 @@ void advancewindow(void)
 			break;
 	case TK_DIGIT:
 		(TREF(director_mval)).str.addr = TREF(lexical_ptr);
-		(TREF(director_mval)).str.len = TREF(max_advancewindow_line);
+		(TREF(director_mval)).str.len = (TREF(source_buffer)).len;
 		(TREF(director_mval)).mvtype = MV_STR;
 		CLEAR_MVAL_BITS(TADR(director_mval));
 		TREF(lexical_ptr) = (char *)s2n(&(TREF(director_mval)));
diff --git a/sr_port/aio_shim.h b/sr_port/aio_shim.h
new file mode 100644
index 0000000..6628b61
--- /dev/null
+++ b/sr_port/aio_shim.h
@@ -0,0 +1,102 @@
+/****************************************************************
+ *								*
+ * Copyright (c) 2016 Fidelity National Information		*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
+ *								*
+ *	This source code contains the intellectual property	*
+ *	of its copyright holder(s), and is made available	*
+ *	under a license.  If you do not know the terms of	*
+ *	the license, please stop and do not read further.	*
+ *								*
+ ****************************************************************/
+#ifndef AIO_SHIM_H_INCLUDED
+#define AIO_SHIM_H_INCLUDED
+
+#include "gtm_libaio.h"
+
+#ifndef USE_LIBAIO
+#define AIO_SHIM_WRITE(UNUSED, AIOCBP, RET)	MBSTART { RET = aio_write(AIOCBP); } MBEND
+#define AIO_SHIM_RETURN(AIOCBP, RET)	 	MBSTART { RET = aio_return(AIOCBP);} MBEND
+#define AIO_SHIM_ERROR(AIOCBP, RET)		MBSTART { RET = aio_error(AIOCBP); } MBEND
+#define SIGNAL_ERROR_IN_WORKER_THREAD(gdi, err_str, errno)	/* no-op, N/A */
+#define CHECK_ERROR_IN_WORKER_THREAD(reg, udi)			/* no-op, N/A */
+
+#else /* USE_LIBAIO */
+
+#include "memcoherency.h"
+
+error_def(ERR_DBFILERR);
+error_def(ERR_SYSCALL);
+
+void 	aio_shim_destroy(gd_addr *gd);
+int 	aio_shim_write(gd_region *reg, struct aiocb *aiocbp);
+
+#define AIO_SHIM_WRITE(REG, AIOCBP, RET) 	MBSTART { RET = aio_shim_write(REG, AIOCBP); } MBEND
+#define AIO_SHIM_ERROR(AIOCBP, RET) 		MBSTART { RET = (AIOCBP)->status; } MBEND
+#define AIO_SHIM_RETURN(AIOCBP, RET) 		MBSTART { SHM_READ_MEMORY_BARRIER; RET = (AIOCBP)->res; } MBEND
+							/* Need a memory barrier here so that we can
+							 * enforce publication safety of aiocbp->res
+							 * after the status has been set by the
+							 * AIOCBP_SET_FLDS macro.
+							 */
+#define AIOCBP_SET_FLDS(AIOCBP, RES, RES2)								\
+MBSTART	{												\
+	/* Note the user may not call aio_return before aio_error has a non-EINPROGRESS value.		\
+	 * This means as long as aiocbp->res gets set before aiocbp->status, we are correctly		\
+	 * adhering to the spec.									\
+	 */												\
+	aiocbp->res = RES;										\
+	/* to enforce publication safety here and in aio_shim_return() */				\
+	SHM_WRITE_MEMORY_BARRIER;									\
+	aiocbp->status = RES2;										\
+} MBEND
+
+/* We will exit the worker thread and notify the main thread that an error
+ * has occurred. This is so that we don't rts_error() at the same time that
+ * commit logic is occurring, crashing and possibly causing database damage.
+ * The next time a process calls wcs_wtfini() or aio_shim_write() the
+ * database can safely issue an error.
+ */
+#define RECORD_ERROR_IN_WORKER_THREAD_AND_EXIT(gdi, err_str, errno)	\
+MBSTART {								\
+	gdi->err_syscall = err_str;					\
+	SHM_WRITE_MEMORY_BARRIER;					\
+	gdi->save_errno = errno;					\
+	pthread_exit(NULL);						\
+} MBEND
+
+/* If there was an error in the worker thread, we should rts_error() */
+#define CHECK_ERROR_IN_WORKER_THREAD(reg, udi)										\
+MBSTART {														\
+	struct gd_info 	*gdi, tmp;											\
+															\
+	gdi = udi->owning_gd->thread_gdi;										\
+	if ((NULL != gdi) && (gdi->save_errno != 0))									\
+	{	/* We close everything related to the worker thread, in hopes that when it is retried later there	\
+		 * will be no more error										\
+		 */													\
+		SHM_READ_MEMORY_BARRIER;										\
+		tmp = *gdi;												\
+		aio_shim_destroy(udi->owning_gd);									\
+		rts_error_csa(CSA_ARG(&udi->s_addrs) VARLSTCNT(12) ERR_DBFILERR, 2, DB_LEN_STR(reg), ERR_SYSCALL, 5,	\
+			LEN_AND_STR(tmp.err_syscall), CALLFROM, tmp.save_errno);					\
+	}														\
+} MBEND
+
+struct gd_info
+{
+	pthread_t	pt;
+	int		exit_efd;	/* eventfd notifies on thread shutdown   */
+	int		laio_efd;	/* eventfd notifies on libaio completion */
+	aio_context_t 	ctx;		/* kernel context associated with AIO    */
+	volatile int	num_ios;	/* Number of IOs in flight 		 */
+
+	/* Note that errno must be set before what */
+	volatile char 	*err_syscall;	/* If an error occurred, what was it? 	 */
+	volatile int	save_errno;
+};
+
+
+#endif /* USE_LIBAIO */
+
+#endif /* AIO_SHIM_H_INCLUDED */
diff --git a/sr_port/anticipatory_freeze.h b/sr_port/anticipatory_freeze.h
index 18a5fbf..7983538 100644
--- a/sr_port/anticipatory_freeze.h
+++ b/sr_port/anticipatory_freeze.h
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2012-2016 Fidelity National Information	*
+ * Copyright (c) 2012-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -130,12 +130,15 @@ error_def(ERR_TEXT);
  * 	the specified database.
  * INST_FREEZE_ON_NOSPC_ENABLED() determines whether an out-of-space condition associated with the specified database should
  * 	trigger an instance freeze.
+ * Note that it is possible for these macros to be invoked while in "gvcst_cre_autoDB" in which case CSA->nl would be NULL
+ *	hence the check for NULL before trying to access onln_rlbk_pid.
  */
 #define INSTANCE_FREEZE_HONORED(CSA)		(DBG_ASSERT(NULL != CSA)							\
 							((NULL != jnlpool.jnlpool_ctl)						\
 								&& ((REPL_ALLOWED(((sgmnt_addrs *)CSA)->hdr))			\
 									|| mupip_jnl_recover	/* recover or rollback */	\
-									|| ((sgmnt_addrs *)CSA)->nl->onln_rlbk_pid)))
+									|| (NULL != ((sgmnt_addrs *)CSA)->nl)			\
+										&& (((sgmnt_addrs *)CSA)->nl->onln_rlbk_pid))))
 #define INST_FREEZE_ON_ERROR_ENABLED(CSA)	(INSTANCE_FREEZE_HONORED(CSA)							\
 							&& CUSTOM_ERRORS_LOADED							\
 							&& (((sgmnt_addrs *)CSA)->hdr->freeze_on_fail))
@@ -172,7 +175,7 @@ error_def(ERR_TEXT);
 
 /* This is a version of the macro which waits for the instance freeze to be lifted off assuming the process has
  * already attached to the journal pool. We need to wait for the freeze only if the input database cares about
- * anticipatory freeze. Examples of those databases that dont care are non-replicated databases, databases with
+ * anticipatory freeze. Examples of those databases that don't care are non-replicated databases, databases with
  * "freeze_on_fail" field set to FALSE in the file header etc. Hence the use of INST_FREEZE_ON_ERROR_ENABLED below.
  * Note: Do not use "hiber_start" as that uses timers and if we are already in a timer handler now, nested timers
  * wont work. Since SHORT_SLEEP allows a max of 1000, we use 500 (half a second) for now.
@@ -247,10 +250,10 @@ error_def(ERR_TEXT);
 		WAIT_FOR_REPL_INST_UNFREEZE_NOCSA;	\
 }
 
-/* GTM_DB_FSYNC/GTM_JNL_FSYNC are similar to GTM_FSYNC except that we dont do the fsync
+/* GTM_DB_FSYNC/GTM_JNL_FSYNC are similar to GTM_FSYNC except that we don't do the fsync
  * (but instead hang) if we detect the instance is frozen. We proceed with the fsync once the freeze clears.
  * CSA is a parameter indicating which database it is that we want to fsync.
- * GTM_REPL_INST_FSYNC is different in that we currently dont care about instance freeze for replication
+ * GTM_REPL_INST_FSYNC is different in that we currently don't care about instance freeze for replication
  * instance file writes.
  */
 #define GTM_DB_FSYNC(CSA, FD, RC)						\
@@ -287,13 +290,15 @@ error_def(ERR_TEXT);
 
 #define GTM_REPL_INST_FSYNC(FD, RC)	GTM_FSYNC(FD, RC)
 
-#define	LSEEKWRITE_IS_TO_NONE		0
-#define	LSEEKWRITE_IS_TO_DB		1
-#define	LSEEKWRITE_IS_TO_JNL		2
+#define	LSEEKWRITE_IS_TO_NONE			0
+#define	LSEEKWRITE_IS_TO_DB			1
+#define	LSEEKWRITE_IS_TO_JNL			2
+#define	LSEEKWRITE_IS_TO_DB_ASYNC		3
+#define	LSEEKWRITE_IS_TO_DB_ASYNC_RESTART	4
 
 #ifdef DEBUG
 #define	FAKE_ENOSPC(CSA, FAKE_WHICH_ENOSPC, LSEEKWRITE_TARGET, LCL_STATUS)							\
-{																\
+MBSTART {															\
 	GBLREF	jnlpool_addrs		jnlpool;										\
 	GBLREF	boolean_t		multi_thread_in_use;									\
 																\
@@ -318,7 +323,7 @@ error_def(ERR_TEXT);
 			lseekwrite_target = LSEEKWRITE_TARGET;									\
 		}														\
 	}															\
-}
+} MBEND
 
 void clear_fake_enospc_if_master_dead(void);
 
@@ -329,29 +334,81 @@ void clear_fake_enospc_if_master_dead(void);
 #endif
 
 /* #GTM_THREAD_SAFE : The below macro (DB_LSEEKWRITE) is thread-safe */
-#define	DB_LSEEKWRITE(csa, db_fn, fd, new_eof, buff, size, status)							\
-	DO_LSEEKWRITE(csa, db_fn, fd, new_eof, buff, size, status, fake_db_enospc, LSEEKWRITE_IS_TO_DB)
-
-#define	JNL_LSEEKWRITE(csa, jnl_fn, fd, new_eof, buff, size, status)							\
-	DO_LSEEKWRITE(csa, jnl_fn, fd, new_eof, buff, size, status, fake_jnl_enospc, LSEEKWRITE_IS_TO_JNL)
+#define	DB_LSEEKWRITE(CSA, UDI, DB_FN, FD, OFFSET, BUFF, SIZE, STATUS)							\
+MBSTART {														\
+	GBLREF	uint4	process_id;											\
+	sgmnt_addrs	*CSA_LOCAL = CSA;										\
+															\
+	assert(!CSA_LOCAL || !CSA_LOCAL->region || FILE_INFO(CSA_LOCAL->region)->grabbed_access_sem			\
+			|| !FROZEN_CHILLED(CSA_LOCAL->hdr) || !(CSA_LOCAL)->nl || FREEZE_LATCH_HELD(CSA_LOCAL));	\
+	DBG_CHECK_DIO_ALIGNMENT(UDI, OFFSET, BUFF, SIZE);								\
+	DO_LSEEKWRITE(CSA_LOCAL, DB_FN, FD, OFFSET, BUFF, SIZE, STATUS, fake_db_enospc, LSEEKWRITE_IS_TO_DB);		\
+} MBEND
+
+/* This is similar to DB_LSEEKWRITE except that this is used by GTMSECSHR and since that is root-owned we do not want
+ * to pull in a lot of unnecessary things from the instance-freeze scheme so we directly invoke LSEEKWRITE instead of
+ * going through DO_LSEEKWRITE.
+ */
+#define	GTMSECSHR_DB_LSEEKWRITE(UDI, FD, OFFSET, BUFF, SIZE, STATUS)			\
+MBSTART {										\
+	DBG_CHECK_DIO_ALIGNMENT(UDI, OFFSET, BUFF, SIZE);				\
+	LSEEKWRITE(FD, OFFSET, BUFF, SIZE, STATUS);					\
+} MBEND
+
+/* #GTM_THREAD_SAFE : The below macro (DB_LSEEKWRITEASYNCSTART) is thread-safe */
+#define	DB_LSEEKWRITEASYNCSTART(CSA, UDI, DB_FN, FD, OFFSET, BUFF, SIZE, CR, STATUS)					\
+MBSTART {														\
+	DBG_CHECK_DIO_ALIGNMENT(UDI, OFFSET, BUFF, SIZE);								\
+	DO_LSEEKWRITEASYNC(CSA, DB_FN, FD, OFFSET, BUFF, SIZE, CR, STATUS, fake_db_enospc, LSEEKWRITE_IS_TO_DB_ASYNC);	\
+} MBEND
+
+/* #GTM_THREAD_SAFE : The below macro (DB_LSEEKWRITEASYNCRESTART) is thread-safe */
+#define	DB_LSEEKWRITEASYNCRESTART(CSA, UDI, DB_FN, FD, BUFF, CR, STATUS)						\
+MBSTART {														\
+	DBG_CHECK_DIO_ALIGNMENT(UDI, CR->aiocb.aio_offset, BUFF, CR->aiocb.aio_nbytes);					\
+	DO_LSEEKWRITEASYNC(CSA, DB_FN, FD, 0, BUFF, 0, CR, STATUS, fake_db_enospc, LSEEKWRITE_IS_TO_DB_ASYNC_RESTART);	\
+} MBEND
+
+/* #GTM_THREAD_SAFE : The below macro (JNL_LSEEKWRITE) is thread-safe */
+#define	JNL_LSEEKWRITE(CSA, JNL_FN, FD, OFFSET, BUFF, SIZE, STATUS)							\
+	DO_LSEEKWRITE(CSA, JNL_FN, FD, OFFSET, BUFF, SIZE, STATUS, fake_jnl_enospc, LSEEKWRITE_IS_TO_JNL)
 
 /* #GTM_THREAD_SAFE : The below macro (DO_LSEEKWRITE) is thread-safe */
-#define DO_LSEEKWRITE(csa, fnptr, fd, new_eof, buff, size, status, FAKE_WHICH_ENOSPC, LSEEKWRITE_TARGET)			\
-{																\
+#define DO_LSEEKWRITE(CSA, FNPTR, FD, OFFSET, BUFF, SIZE, STATUS, FAKE_WHICH_ENOSPC, LSEEKWRITE_TARGET)				\
+MBSTART {															\
 	int	lcl_status;													\
 																\
-	if (NULL != csa)													\
-		WAIT_FOR_REPL_INST_UNFREEZE_SAFE(csa);										\
-	LSEEKWRITE(fd, new_eof, buff, size, lcl_status);									\
-	FAKE_ENOSPC(csa, FAKE_WHICH_ENOSPC, LSEEKWRITE_TARGET, lcl_status);							\
+	if (NULL != CSA)													\
+		WAIT_FOR_REPL_INST_UNFREEZE_SAFE(CSA);										\
+	LSEEKWRITE(FD, OFFSET, BUFF, SIZE, lcl_status);										\
+	FAKE_ENOSPC(CSA, FAKE_WHICH_ENOSPC, LSEEKWRITE_TARGET, lcl_status);							\
 	if (ENOSPC == lcl_status)												\
 	{															\
-		wait_for_disk_space(csa, (char *)fnptr, fd, (off_t)new_eof, (char *)buff, (size_t)size, &lcl_status);		\
-		assert((NULL == csa) || (NULL == ((sgmnt_addrs *)csa)->nl) || !((sgmnt_addrs *)csa)->nl->FAKE_WHICH_ENOSPC	\
+		wait_for_disk_space(CSA, (char *)FNPTR, FD, (off_t)OFFSET, (char *)BUFF, (size_t)SIZE, &lcl_status);		\
+		assert((NULL == CSA) || (NULL == ((sgmnt_addrs *)CSA)->nl) || !((sgmnt_addrs *)CSA)->nl->FAKE_WHICH_ENOSPC	\
 		       || (ENOSPC != lcl_status));										\
 	}															\
-	status = lcl_status;													\
-}
+	STATUS = lcl_status;													\
+} MBEND
+
+/* #GTM_THREAD_SAFE : The below macro (DO_LSEEKWRITEASYNC) is thread-safe */
+#define DO_LSEEKWRITEASYNC(CSA, FNPTR, FD, OFFSET, BUFF, SIZE, CR, STATUS, FAKE_WHICH_ENOSPC, LSEEKWRITE_TARGET)		\
+MBSTART {															\
+	if (NULL != CSA)													\
+		WAIT_FOR_REPL_INST_UNFREEZE_SAFE(CSA);										\
+	switch (LSEEKWRITE_TARGET)												\
+	{															\
+		case LSEEKWRITE_IS_TO_DB_ASYNC:											\
+			LSEEKWRITEASYNCSTART(CSA, FD, OFFSET, BUFF, SIZE, CR, STATUS);						\
+			break;													\
+		case LSEEKWRITE_IS_TO_DB_ASYNC_RESTART:										\
+			LSEEKWRITEASYNCRESTART(CSA, FD, BUFF, CR, STATUS);							\
+			break;													\
+		default:													\
+			assert(FALSE);												\
+			break;													\
+	}															\
+} MBEND
 
 /* Currently, writes to replication instance files do NOT trigger instance freeze behavior.
  * Neither does a pre-existing instance freeze affect replication instance file writes.
diff --git a/sr_port/backup_block.c b/sr_port/backup_block.c
index 62f8dfa..b9d11cc 100755
--- a/sr_port/backup_block.c
+++ b/sr_port/backup_block.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -41,10 +41,14 @@ boolean_t backup_block(sgmnt_addrs *csa, block_id blk, cache_rec_ptr_t backup_cr
 #	ifdef DEBUG
 	char			*backup_encrypt_hash_ptr, *db_encrypt_hash_ptr;
 	boolean_t		backup_uses_new_key, db_uses_new_key, backup_was_encrypted, db_was_encrypted;
-	sgmnt_data_ptr_t	backup_csd;
 #	endif
+	sgmnt_data_ptr_t	backup_csd;
 
 	csd = csa->hdr;
+	sbufh_p = csa->shmpool_buffer;
+	backup_csd = &sbufh_p->shadow_file_header;
+	if (backup_csd->trans_hist.total_blks <= blk)
+		return TRUE;	/* Block to be backed up was created AFTER the backup started. So no need to backup. */
 	is_bg = (dba_bg == csd->acc_meth);
 	assert(is_bg || (dba_mm == csd->acc_meth));
 	/* Should have EITHER backup cr (BG mode) or buffer pointer (MM mode) */
@@ -57,7 +61,6 @@ boolean_t backup_block(sgmnt_addrs *csa, block_id blk, cache_rec_ptr_t backup_cr
 		backup_blk_p = GDS_ANY_REL2ABS(csa, backup_cr->buffaddr);
 	}
 	bsiz = ((blk_hdr_ptr_t)(backup_blk_p))->bsiz;
-	sbufh_p = csa->shmpool_buffer;
 	assert(bsiz <= sbufh_p->blk_size);
 
 	/* Obtain block from shared memory pool. If we can't get the block, then backup will be effectively terminated. */
@@ -94,7 +97,6 @@ boolean_t backup_block(sgmnt_addrs *csa, block_id blk, cache_rec_ptr_t backup_cr
 	{
 #		ifdef DEBUG
 		DBG_ENSURE_PTR_IS_VALID_GLOBUFF(csa, csd, backup_blk_p);
-		backup_csd = &sbufh_p->shadow_file_header;
 		backup_uses_new_key = NEEDS_NEW_KEY(backup_csd, bkp_tn);
 		db_uses_new_key = NEEDS_NEW_KEY(csd, bkp_tn);
 		backup_was_encrypted = IS_ENCRYPTED(backup_csd->is_encrypted);
diff --git a/sr_port/bm_find_blk.c b/sr_port/bm_find_blk.c
index 7e8f944..c7d2dd1 100755
--- a/sr_port/bm_find_blk.c
+++ b/sr_port/bm_find_blk.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2007 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -182,5 +183,5 @@ int4 bm_find_blk(int4 hint, sm_uc_ptr_t base_addr, int4 total_bits, boolean_t *u
 			}
 		}
 	}
-	return -1;
+	return NO_FREE_SPACE;
 }
diff --git a/sr_port/bm_getfree.c b/sr_port/bm_getfree.c
index 6faf3e1..bd0d411 100755
--- a/sr_port/bm_getfree.c
+++ b/sr_port/bm_getfree.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -70,11 +71,11 @@ GBLREF unsigned int	t_tries;
 error_def(ERR_DBBADFREEBLKCTR);
 error_def(ERR_DBMBMINCFREFIXED);
 
-block_id bm_getfree(block_id orig_hint, boolean_t *blk_used, unsigned int cw_work, cw_set_element *cs, int *cw_depth_ptr)
+block_id bm_getfree(block_id hint, boolean_t *blk_used, unsigned int cw_work, cw_set_element *cs, int *cw_depth_ptr)
 {
 	cw_set_element	*cs1;
 	sm_uc_ptr_t	bmp;
-	block_id	bml, hint, hint_cycled, hint_limit;
+	block_id	bml, hint_cycled, hint_limit;
 	block_id_ptr_t	b_ptr;
 	int		cw_set_top, depth, lcnt;
 	unsigned int	local_maps, map_size, n_decrements = 0, total_blks;
@@ -85,13 +86,12 @@ block_id bm_getfree(block_id orig_hint, boolean_t *blk_used, unsigned int cw_wor
 	srch_blk_status	blkhist;
 
 	total_blks = (dba_mm == cs_data->acc_meth) ? cs_addrs->total_blks : cs_addrs->ti->total_blks;
-	if (orig_hint >= total_blks)		/* for TP, hint can be > total_blks */
-		orig_hint = 1;
-	hint = orig_hint;
+	if (hint >= total_blks)            /* for TP, hint can be > total_blks */
+		hint = 1;
 	hint_cycled = DIVIDE_ROUND_UP(total_blks, BLKS_PER_LMAP);
-	hint_limit = DIVIDE_ROUND_DOWN(orig_hint, BLKS_PER_LMAP);
+	hint_limit = DIVIDE_ROUND_DOWN(hint, BLKS_PER_LMAP);
 	local_maps = hint_cycled + 2;	/* for (up to) 2 wraps */
-	for (lcnt = 0; lcnt <= local_maps; lcnt++)
+	for (lcnt = local_maps + 1; lcnt ; lcnt--) /* loop control counts down for slight efficiency */
 	{
 		bml = bmm_find_free(hint / BLKS_PER_LMAP, (sm_uc_ptr_t)MM_ADDR(cs_data), local_maps);
 		if ((NO_FREE_SPACE == bml) || (bml >= hint_cycled))
@@ -114,11 +114,11 @@ block_id bm_getfree(block_id orig_hint, boolean_t *blk_used, unsigned int cw_wor
 			 * note that you can make an optimization of not going back over the whole database and going over
 			 * only the extended section. but since it is very unlikely that a free block won't be found
 			 * in the extended section and the fact that we are starting from the extended section in either
-			 * approach and the fact that we have a GTMASSERT to check that we don't have a lot of
+			 * approach and the fact that we have an assertpro to check that we don't have a lot of
 			 * free blocks while doing an extend and the fact that it is very easy to make the change to do
 			 * a full-pass, the full-pass solution is currently being implemented
 			 */
-			lcnt = -1;	/* allow it one extra pass to ensure that it can take advantage of the entension */
+			lcnt = local_maps + 2;	/* allow it one extra pass to ensure that it can take advantage of the entension */
 			n_decrements++;	/* used only for debugging purposes */
 			continue;
 		}
@@ -215,7 +215,7 @@ block_id bm_getfree(block_id orig_hint, boolean_t *blk_used, unsigned int cw_wor
 	 */
 	if ((map_size <= (uint4)free_bit) && (CDB_STAGNATE <= t_tries))
 	{	/* Bad free bit. */
-		assert((NO_FREE_SPACE == free_bit) && (lcnt > local_maps));	/* All maps full, should have extended */
+		assert((NO_FREE_SPACE == free_bit) && (!lcnt));	/* All maps full, should have extended */
 		assertpro(FALSE);
 	}
 	if (0 != depth)
diff --git a/sr_port/bml_init.c b/sr_port/bml_init.c
index 6e61c12..92dfb07 100755
--- a/sr_port/bml_init.c
+++ b/sr_port/bml_init.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2008 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -11,13 +12,7 @@
 
 #include "mdef.h"
 
-#ifdef UNIX
-#include <errno.h>		/* for DSK_WRITE macro */
-#elif defined(VMS)
-#include "efn.h"		/* for DSK_WRITE macro */
-#else
-#error UNSUPPORTED PLATFORM
-#endif
+#include <errno.h>		/* for DSK_WRITE_NOCACHE macro */
 
 #include "gdsroot.h"
 #include "gdsbt.h"
@@ -42,7 +37,7 @@ int4 bml_init(block_id bml)
 	trans_num	blktn;
 
 	size = BM_SIZE(cs_data->bplmap);
-	/* Allocate full block .. bml_newmap will set the write size, dsk_write will write part or all of it as appropriate. */
+	/* Allocate full block. bml_newmap will set the write size. DSK_WRITE_NOCACHE will write part or all of it as appropriate */
 	ptr = (blk_hdr_ptr_t)malloc(cs_addrs->hdr->blk_size);
 	/* We are about to create a local bitmap. Setting its block transaction number to the current database transaction
 	 * number gives us a clear history of when this bitmap got created. There are two exceptions.
@@ -63,7 +58,7 @@ int4 bml_init(block_id bml)
 		blktn = cs_data->trans_hist.curr_tn;
 
 	bml_newmap(ptr, size, blktn);
-	/* status holds the status of any error return from dsk_write */
+	/* status holds the status of any error return from DSK_WRITE_NOCACHE */
 	DSK_WRITE_NOCACHE(gv_cur_region, bml, (sm_uc_ptr_t)ptr, cs_data->desired_db_format, status);
 	free(ptr);
 	return status;
diff --git a/sr_port/bml_newmap.c b/sr_port/bml_newmap.c
index c22577a..983aa92 100755
--- a/sr_port/bml_newmap.c
+++ b/sr_port/bml_newmap.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -26,7 +26,6 @@ void bml_newmap(blk_hdr_ptr_t ptr, uint4 size, trans_num curr_tn)
 {
 	sm_uc_ptr_t bptr;
 
-	/* --- similar logic exists in mupip_restore.c, which need to pick up any new updates here --- */
 	ptr->bver = GDSVCURR;
 	ptr->bsiz = size;
 	ptr->levl = LCL_MAP_LEVL;
diff --git a/sr_port/bool_expr.c b/sr_port/bool_expr.c
index d4b2845..4f3ecd1 100755
--- a/sr_port/bool_expr.c
+++ b/sr_port/bool_expr.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2012 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -12,11 +13,26 @@
 #include "mdef.h"
 #include "gtm_string.h"		/* needed by INCREMENT_EXPR_DEPTH */
 #include "compiler.h"
+#include "mdq.h"
+#include "mmemory.h"
 #include "opcode.h"
+#include "stringpool.h"
 
-int bool_expr(boolean_t op, oprtype *addr)
+LITREF octabstruct	oc_tab[];
+
+int bool_expr(boolean_t sense, oprtype *addr)
+/*
+ * invoked to resolve expresions that are by definition coerced to Boolean, which include
+ * IF arguments, $SELECT() arguments, and postconditionals for both commands and arguments
+ * IF is the only one that comes in with the "TRUE" sense
+ * *addr winds up as an pointer to a jump operand, which the caller fills in
+ */
 {
-	oprtype x;
+	boolean_t	is_com, tv;
+	uint4		bexprs;
+	opctype		c;
+	oprtype		x;
+	triple		*bitrip, *t, *t0, *t1, *t2;
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
@@ -26,9 +42,67 @@ int bool_expr(boolean_t op, oprtype *addr)
 		DECREMENT_EXPR_DEPTH;
 		return FALSE;
 	}
+	UNARY_TAIL(&x);
+	if (OC_LIT == (x.oprval.tref)->opcode)
+	{	/* if its just a literal don't waste time */
+		DECREMENT_EXPR_DEPTH;
+		return TRUE;
+	}
 	assert(TRIP_REF == x.oprclass);
 	coerce(&x, OCT_BOOL);
-	bx_tail(x.oprval.tref, op, addr);
+	t = x.oprval.tref;
+	for (t1 = t; ; t1 = t2)
+	{
+		assert(TRIP_REF == t1->operand[0].oprclass);
+		t2 = t1->operand[0].oprval.tref;
+		if (!(oc_tab[t2->opcode].octype & OCT_BOOL))
+			break;
+	}
+	if (OC_INDGLVN == t2->opcode)
+		t1 = t2;	/* because of how we process indirection, can't insert a NOOP between COBOOL and INDGLGN */
+	bitrip = maketriple(OC_BOOLINIT);						/* a marker we'll delete later */
+	dqins(t1->exorder.bl, exorder, bitrip);
+	assert(TREF(curtchain) ==  t->exorder.fl);
+	(TREF(curtchain))->operand[0] = put_tref(bitrip);
+	bx_tail(t, sense, addr);
+	(TREF(curtchain))->operand[0].oprclass = NO_REF;
+	assert(t == x.oprval.tref);
 	DECREMENT_EXPR_DEPTH;
+	for (bexprs = 0, t0 = t; bitrip != t0; t0 = t0->exorder.bl)
+	{
+		if (OCT_JUMP & oc_tab[c = t0->opcode].octype)				/* WARNING assignment */
+		{
+			switch (t0->opcode)
+			{
+				case OC_JMPFALSE:
+				case OC_JMPTRUE:
+					assert(INDR_REF == t0->operand[0].oprclass);
+					t0->opcode = (OC_JMPTRUE == t0->opcode) ? OC_NOOP : OC_JMP;
+					t0->operand[0].oprclass = (OC_NOOP ==  t0->opcode) ? NO_REF : INDR_REF;
+					if (!bexprs++)
+						t = t0;
+					break;
+				default:
+					bexprs += 2;
+			}
+		}
+	}
+	bitrip->opcode = OC_NOOP;							/* ditch it after it served us */
+	if (1 == bexprs)
+	{	/* if there is just a one JMP TRUE / FALSE turn it into a literal */
+		assert((OC_NOOP ==  t->opcode) || (OC_JMP ==  t->opcode));
+		PUT_LITERAL_TRUTH((OC_NOOP == t->opcode) ^ sense, t);
+		t->opcode = OC_LIT;
+	} else if (!bexprs && (OC_COBOOL == t->opcode) && (OC_LIT == (t0 = t->operand[0].oprval.tref)->opcode)
+		&& ((OC_JMPEQU == t->exorder.fl->opcode) || (OC_JMPNEQ == t->exorder.fl->opcode)))
+	{	/* just one jump based on a literal, so resolve it */
+		t->opcode = OC_NOOP;
+		t->operand[0].oprclass = NO_REF;
+		t = t->exorder.fl;
+		dqdel(t, exorder);
+		unuse_literal(&t0->operand[0].oprval.mlit->v);
+		tv = (((0 == t0->operand[0].oprval.mlit->v.m[1]) ? OC_JMPNEQ : OC_JMPEQU) == t->opcode) ^ sense;
+		PUT_LITERAL_TRUTH(tv, t0);
+	}
 	return TRUE;
 }
diff --git a/sr_port/bt_put.c b/sr_port/bt_put.c
index c1c7a2d..72a1fc3 100755
--- a/sr_port/bt_put.c
+++ b/sr_port/bt_put.c
@@ -71,9 +71,8 @@ bt_rec_ptr_t bt_put(gd_region *reg, int4 block)
 					BG_TRACE_PRO_ANY(csa, bt_put_flush_dirty);
 					if (FALSE == wcs_get_space(reg, 0, cr))
 					{
-						assert(csa->nl->wc_blocked);	/* only reason we currently know
-										 * why wcs_get_space could fail */
-						assert(gtm_white_box_test_case_enabled);
+						/* only reason we currently know why wcs_get_space could fail */
+						assert(csa->nl->wc_blocked || gtm_white_box_test_case_enabled);
 						BG_TRACE_PRO_ANY(csa, wcb_bt_put);
 						send_msg(VARLSTCNT(8) ERR_WCBLOCKED, 6, LEN_AND_LIT("wcb_bt_put"),
 							process_id, &lcl_tn, DB_LEN_STR(reg));
diff --git a/sr_port/bx_boollit.c b/sr_port/bx_boollit.c
new file mode 100644
index 0000000..db25227
--- /dev/null
+++ b/sr_port/bx_boollit.c
@@ -0,0 +1,230 @@
+
+/****************************************************************
+ *								*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
+ *								*
+ *	This source code contains the intellectual property	*
+ *	of its copyright holder(s), and is made available	*
+ *	under a license.  If you do not know the terms of	*
+ *	the license, please stop and do not read further.	*
+ *								*
+ ****************************************************************/
+
+#include "mdef.h"
+#include "gtm_string.h"
+#include "compiler.h"
+#include "opcode.h"
+#include "mdq.h"
+#include "mmemory.h"
+#include <emit_code.h>
+#include "fullbool.h"
+#include "matchc.h"
+#include "numcmp.h"
+#include "patcode.h"
+#include "sorts_after.h"
+#include "stringpool.h"
+
+LITREF octabstruct	oc_tab[];
+
+STATICFNDEF void bx_boollit_tail(triple *t, boolean_t jmp_type_one, boolean_t jmp_to_next, boolean_t sense, oprtype *addr);
+
+void bx_boollit(triple *t, boolean_t sense, oprtype *addr)
+{	/* an interface hybrid of bx_tail and bx_boolop that allows calls in and recursive calls */
+	opctype		c;
+
+	if (OCT_NEGATED & oc_tab[(c = t->opcode)].octype)				/* WARNING assignment */
+		sense ^= 1;
+	if ((OC_OR == c) || (OC_NOR == c))
+		bx_boollit_tail(t, TRUE, !sense, sense, addr);
+	else
+		bx_boollit_tail(t, FALSE, sense, sense, addr);
+}
+
+void bx_boollit_tail(triple *t, boolean_t jmp_type_one, boolean_t jmp_to_next, boolean_t sense, oprtype *addr)
+/* search the Boolean in t (recursively) for literal leaves; the logic is similar to bx_tail
+ * the rest of the arguments parallel those in bx_boolop and used primarily handling basic Boolean operations (ON, NOR, AND, NAND)
+ * to get the jump target and sense right for the left-hand operand of the operation
+ * jmp_type_one gives the sense of the jump associated with the first operand
+ * jmp_to_next gives whether we need a second jump to complete the operation
+ * sense gives the sense of the requested operation
+ * *addr points the operand for the jump and is eventually used by logic back in the invocation stack to fill in a target location
+ */
+{
+	boolean_t	sin[ARRAYSIZE(t->operand)], tv[ARRAYSIZE(t->operand)];
+	int		com, comval, dummy, j, neg, num, tvr;
+	mval		*mv, *v[ARRAYSIZE(t->operand)];
+	opctype		c;
+	oprtype		*i, *p;
+	triple		*cob[ARRAYSIZE(t->operand)], *ref0, *tl[ARRAYSIZE(t->operand)];
+
+	assert(OCT_BOOL & oc_tab[t->opcode].octype);
+	assert(TRIP_REF == t->operand[0].oprclass);
+	assert((OC_COBOOL != t->opcode) && (OC_COM != t->opcode) || (TRIP_REF == t->operand[1].oprclass));
+	for (i = t->operand, j = 0; i < ARRAYTOP(t->operand); i++, j++)
+	{	/* checkout an operand to see if we can simplify it */
+		p = i;
+		com = 0;
+		for (tl[j] = i->oprval.tref; OCT_UNARY & oc_tab[(c = tl[j]->opcode)].octype; tl[j] = p->oprval.tref)
+		{	/* find the real object of affection; WARNING assignment above */
+			assert((TRIP_REF == tl[j]->operand[0].oprclass) && (NO_REF == tl[j]->operand[1].oprclass));
+			com ^= (OC_COM == c);	/* if we make a recursive call below, COM matters, but NEG and FORCENUM don't */
+			p = &tl[j]->operand[0];
+		}
+		if (OCT_ARITH & oc_tab[c].octype)
+			ex_tail(p);								/* chained arithmetic */
+		else if (OCT_BOOL & oc_tab[c].octype)
+		{	/* recursively check an operand */
+			sin[j] = sense;
+			p = addr;
+			if (!j && !(OCT_REL & oc_tab[t->opcode].octype))
+			{	/* left hand operand of parent */
+				sin[j] = jmp_type_one;
+				if (jmp_to_next)
+				{	/* left operands need extra attention to decide between jump next or to the end */
+					p = (oprtype *)mcalloc(SIZEOF(oprtype));
+					*p = put_tjmp(t);
+				}
+			}
+			bx_boollit(tl[j], sin[j] ^ com, p);
+		}
+		if ((OC_JMPTRUE != tl[j]->opcode) && (OC_JMPFALSE != tl[j]->opcode) && (OC_LIT != tl[j]->opcode))
+			return;									/* this operation doesn't qualify */
+		com = comval = neg = num = 0;
+		cob[j] = NULL;
+		for (ref0 = i->oprval.tref; OCT_UNARY & oc_tab[(c = ref0->opcode)].octype; ref0 = ref0->operand[0].oprval.tref)
+		{       /* we may be able to clean up this operand; WARNING assignment above */
+			assert((TRIP_REF == ref0->operand[0].oprclass) && (NO_REF == ref0->operand[1].oprclass));
+			num += (OC_FORCENUM == c);
+			com += (OC_COM == c);
+			if (!com)								/* "outside" com renders neg mute */
+				neg ^= (OC_NEG == c);
+			if (!comval && (NULL == cob[j]))
+			{
+				if (comval = (OC_COMVAL == c))					/* WARNING assignment */
+				{
+					if (ref0 != t->operand[j].oprval.tref)
+						dqdel(t->operand[j].oprval.tref, exorder);
+					t->operand[j].oprval.tref = tl[j];			/* need mval: no COBOOL needed */
+				}
+				else if (OC_COBOOL == c)
+				{	/* the operand needs a COBOOL in case its operator remains unresolved */
+					cob[j] = t->operand[j].oprval.tref;
+					if (ref0 == cob[j])
+						continue;					/* already where it belongs */
+					cob[j]->opcode = OC_COBOOL;
+					cob[j]->operand[0].oprval.tref = tl[j];
+				} else if (ref0 == t->operand[j].oprval.tref)
+					continue;
+			}
+			dqdel(ref0, exorder);
+		}
+		assert(ref0 == tl[j]);
+		if (!comval && (NULL == cob[j]) && (tl[j] != t->operand[j].oprval.tref))
+		{	/* left room for a COBOOL, but there's no need */
+			dqdel(t->operand[j].oprval.tref, exorder);
+			t->operand[j].oprval.tref = tl[j];
+		}
+		if ((OC_JMPTRUE == ref0->opcode) || (OC_JMPFALSE == ref0->opcode))
+		{	/* switch to a literal representation of TRUE / FALSE */
+			assert(INDR_REF == ref0->operand[0].oprclass);
+			ref0->operand[1] = ref0->operand[0];					/* track info as we switch opcode */
+			PUT_LITERAL_TRUTH((sin[j] ? OC_JMPFALSE : OC_JMPTRUE) == ref0->opcode, ref0);
+			ref0->opcode = OC_LIT;
+			com = 0;								/* already accounted for by sin */
+		}
+		assert((OC_LIT == ref0->opcode) && (MLIT_REF == ref0->operand[0].oprclass));
+		v[j] = &ref0->operand[0].oprval.mlit->v;
+		if (com)
+		{       /* any complement reduces the literal value to [unsigned] 1 or 0 */
+			unuse_literal(v[j]);
+			tv[j] = (0 == v[j]->m[1]);
+			assert(ref0 == tl[j]);
+			PUT_LITERAL_TRUTH(tv[j], ref0);
+			v[j] = &ref0->operand[0].oprval.mlit->v;
+			num = 0;								/* any complement trumps num */
+		}
+		if (neg || num)
+		{	/* get literal into uniform state */
+			unuse_literal(v[j]);
+			mv = (mval *)mcalloc(SIZEOF(mval));
+			*mv = *v[j];
+			if (neg)
+			{
+				if (MV_INT & mv->mvtype)
+				{
+					if (0 != mv->m[1])
+						mv->m[1] = -mv->m[1];
+					else
+						mv->sgn = 0;
+				} else if (MV_NM & mv->mvtype)
+					mv->sgn = !mv->sgn;
+			} else
+				s2n(mv);
+			n2s(mv);
+			v[j] = mv;
+			assert(ref0 == tl[j]);
+			put_lit_s(v[j], ref0);
+		}
+	}
+	assert(tl[0] != tl[1]);									/* start processing a live one */
+	for (tvr = j, j = 0;  j < tvr; j++)
+	{	/* both arguments are literals, so do the operation at compile time */
+		if (NULL != cob[j])
+			dqdel(cob[j], exorder);
+		v[j] = &tl[j]->operand[0].oprval.mlit->v;
+		tv[j] = (0 != v[j]->m[1]);
+		unuse_literal(v[j]);
+		tl[j]->opcode = OC_NOOP;
+		tl[j]->operand[0].oprclass = NO_REF;
+	}
+	t->operand[1].oprclass = NO_REF;
+	switch (c = t->opcode)									/* WARNING assignment */
+	{	/* optimize the Boolean operations here */
+		case OC_NAND:
+		case OC_AND:
+			tvr = (tv[0] && tv[1]);
+			break;
+		case OC_NOR:
+		case OC_OR:
+			tvr = (tv[0] || tv[1]);
+			break;
+		case OC_NCONTAIN:
+		case OC_CONTAIN:
+			tvr = 1;
+			(void)matchc(v[1]->str.len, (unsigned char *)v[1]->str.addr, v[0]->str.len,
+				(unsigned char *)v[0]->str.addr, &dummy, &tvr);
+			tvr ^= 1;
+			break;
+		case OC_NEQU:
+		case OC_EQU:
+			tvr = is_equ(v[0], v[1]);
+			break;
+		case OC_NFOLLOW:
+		case OC_FOLLOW:
+			tvr = 0 < memvcmp(v[0]->str.addr, v[0]->str.len, v[1]->str.addr, v[1]->str.len);
+			break;
+		case OC_NGT:
+		case OC_GT:
+			tvr = 0 < numcmp(v[0], v[1]);
+			break;
+		case OC_NLT:
+		case OC_LT:
+			tvr = 0 > numcmp(v[0], v[1]);
+			break;
+		case OC_NPATTERN:
+		case OC_PATTERN:
+			tvr = !(*(uint4 *)v[1]->str.addr) ? do_pattern(v[0], v[1]) : do_patfixed(v[0], v[1]);
+			break;
+		case OC_NSORTS_AFTER:
+		case OC_SORTS_AFTER:
+			tvr = 0 < sorts_after(v[0], v[1]);
+			break;
+		default:
+			assertpro(FALSE);
+	}
+	tvr ^= !sense;
+	t->operand[0] = put_indr(addr);
+	t->opcode = tvr ? OC_JMPFALSE : OC_JMPTRUE;
+	return;
+}
diff --git a/sr_port/bx_boolop.c b/sr_port/bx_boolop.c
index 98170e6..50b1b6d 100644
--- a/sr_port/bx_boolop.c
+++ b/sr_port/bx_boolop.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information 	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -11,6 +11,7 @@
  ****************************************************************/
 
 #include "mdef.h"
+#include "gtm_string.h"
 #include "cmd_qlf.h"
 #include "compiler.h"
 #include "opcode.h"
@@ -18,22 +19,23 @@
 #include "mmemory.h"
 #include <emit_code.h>
 #include "fullbool.h"
+#include "stringpool.h"
 
-LITREF		octabstruct	oc_tab[];
+LITREF octabstruct	oc_tab[];
 
 GBLREF boolean_t		run_time;
 GBLREF command_qualifier	cmd_qlf;
 
 #define STOTEMP_IF_NEEDED(REF0, I, T1, OPND)											\
-{	/* Input:														\
-	 * --- REF0:	a boolean triple, which may have either 1 input (OC_COBOOL) or 2 (other opcodes).			\
-	 * --- I:	whichever operand of REF0 we are STOTEMPing								\
-	 * --- T1:	STOTEMP triple. NOOPed if not needed									\
-	 * --- OPND:	operand referring to value we need need to pass as input into boolean operation				\
-	 * If OPND refers to a variable (OC_VAR), we need to STOTEMP it to protect it from subsequent side effects.		\
-	 * If it refers to a literal, and dynamic literals are enabled, we need to insert an OC_LITC anyway. Doing it		\
-	 * here in bx_boolop is convenient and ensures the OC_LITC is not skipped at run time.					\
-	 */															\
+MBSTART {	/* Input:													\
+		 * --- REF0:	a boolean triple, which may have either 1 input (OC_COBOOL) or 2 (other opcodes)		\
+		 * --- I:	whichever operand of REF0 we are STOTEMPing							\
+		 * --- T1:	STOTEMP triple. NOOPed if not needed								\
+		 * --- OPND:	operand referring to value we need need to pass as input into boolean operation			\
+		 * If OPND refers to a variable (OC_VAR), we need to STOTEMP it to protect it from subsequent side effects.	\
+		 * If it refers to a literal, and dynamic literals are enabled, we need to insert an OC_LITC anyway. Doing it	\
+		 * here in bx_boolop is convenient and ensures the OC_LITC is not skipped at run time.				\
+		 */														\
 	assert(TRIP_REF == OPND.oprclass);											\
 	switch (OPND.oprval.tref->opcode)											\
 	{															\
@@ -55,28 +57,41 @@ GBLREF command_qualifier	cmd_qlf;
 			T1->operand[0].oprclass = NO_REF;									\
 			REF0->operand[I] = put_tref(OPND.oprval.tref);								\
 	}															\
-}
+} MBEND
 
 #define TRACK_JMP_TARGET(T, REF0)												\
-{ 	/* T is triple to tag; REF0 is the new target with which it's tagged */						\
+MBSTART {	/* T is triple to tag; REF0 is the new target triple with which it's tagged */					\
 	tripbp = &T->jmplist;						/* borrow jmplist to track jmp targets */		\
 	assert(NULL == tripbp->bpt);												\
 	assert((tripbp == tripbp->que.fl) && (tripbp == tripbp->que.bl));							\
 	tripbp->bpt = REF0;						/* point to the new location */				\
 	dqins(TREF(bool_targ_ptr), que, tripbp);			/* queue jmplist for clean-up */			\
-}
+} MBEND
 
 void bx_boolop(triple *t, boolean_t jmp_type_one, boolean_t jmp_to_next, boolean_t sense, oprtype *addr)
+/* process the operations into a chain of mostly conditional jumps
+ * *t points to the Boolean operation
+ * jmp_type_one gives the sense of the jump associated with the first operand
+ * jmp_to_next gives whether we need a second jump to complete the operation
+ * sense gives the sense of the requested operation
+ * *addr points the operand for the jump and is eventually used by logic back in the invocation stack to fill in a target location
+ */
 {
 	boolean_t	expr_fini;
+	opctype		c;
 	oprtype		*adj_addr, *i, *p;
 	tbp		*tripbp;
 	triple		*ref0, *ref1, *ref2, *t0, *t1, *tb, *tj;
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
+	assert(OCT_BOOL & oc_tab[t->opcode].octype);
 	assert(((1 & sense) == sense) && ((1 & jmp_to_next) == jmp_to_next) && ((1 & jmp_type_one) == jmp_type_one));
 	assert((TRIP_REF == t->operand[0].oprclass) && (TRIP_REF == t->operand[1].oprclass));
+	if ((OC_JMPTRUE == t->opcode) || (OC_JMPFALSE == t->opcode))
+		return;
+	assert(OCT_BOOL & oc_tab[t->opcode].octype);
+	assert((TRIP_REF == t->operand[0].oprclass) && (TRIP_REF == t->operand[1].oprclass));
 	if (jmp_to_next)
 	{
 		p = (oprtype *)mcalloc(SIZEOF(oprtype));
@@ -88,7 +103,7 @@ void bx_boolop(triple *t, boolean_t jmp_type_one, boolean_t jmp_to_next, boolean
 		assert(NULL == TREF(boolchain_ptr));
 		bx_tail(t->operand[0].oprval.tref, jmp_type_one, p);
 		bx_tail(t->operand[1].oprval.tref, sense, addr);
-		t->opcode = OC_NOOP;
+		t->opcode = OC_NOOP;				/* must not delete as this can be a jmp target */
 		t->operand[0].oprclass = t->operand[1].oprclass = NO_REF;
 		return;
 	}
@@ -108,7 +123,7 @@ void bx_boolop(triple *t, boolean_t jmp_type_one, boolean_t jmp_to_next, boolean
 		TREF(boolchain_ptr) = &(TREF(boolchain));
 		dqinit(TREF(boolchain_ptr), exorder);
 		t0 = t->exorder.fl;
-		TREF(bool_targ_ptr) = &(TREF(bool_targ_anchor));	/* mcalloc won't persist over multiple complies */
+		TREF(bool_targ_ptr) = &(TREF(bool_targ_anchor));		/* mcalloc won't persist over multiple complies */
 		dqinit(TREF(bool_targ_ptr), que);
 		/* ex_tail wraps bools that produce a value with OC_BOOLINIT (clr) and OC_BOOLFINI (set) */
 		assert((OC_BOOLFINI != t0->opcode)
@@ -123,7 +138,7 @@ void bx_boolop(triple *t, boolean_t jmp_type_one, boolean_t jmp_to_next, boolean
 		else
 		{	/* operand[1] */
 			bx_tail(tb, sense, addr);				/* do normal transform */
-			if (!expr_fini)
+			if (!expr_fini)						/* leaving ref0 same as for operand 0 */
 				break;						/* only need to relocate last operand[1] */
 		}
 		if (OC_NOOP == tb->opcode)
@@ -133,26 +148,37 @@ void bx_boolop(triple *t, boolean_t jmp_type_one, boolean_t jmp_to_next, boolean
 				tb = tb->exorder.bl;
 				assert(TREF(curtchain) != tb->exorder.bl);
 			} while (OC_NOOP == tb->opcode);
-			if ((oc_tab[tb->opcode].octype & OCT_JUMP) && (OC_JMPTSET != tb->opcode) && (OC_JMPTCLR != tb->opcode))
-				tb = tb->exorder.bl;
-			if (OC_NOOP == tb->opcode)
+			if (OCT_JUMP & oc_tab[tb->opcode].octype)
 			{
-				for (tb = i->oprval.tref; OC_NOOP == tb->opcode; tb = tb->exorder.fl)
-					assert(TREF(curtchain) != tb->exorder.fl);
+				switch (tb->opcode)
+				{
+				case OC_JMP:
+				case OC_JMPTCLR:
+				case OC_JMPTSET:
+				case OC_JMPFALSE:
+				case OC_JMPTRUE:
+					break;
+				default:
+					tb = tb->exorder.bl;
+					if (OC_NOOP == tb->opcode)
+					{
+						for (tb = i->oprval.tref; OC_NOOP == tb->opcode; tb = tb->exorder.fl)
+							assert(TREF(curtchain) != tb->exorder.fl);
+					}
+					break;
+				}
 			}
 		}
 		assert(OC_NOOP != tb->opcode);
-		assert((oc_tab[tb->exorder.fl->opcode].octype & OCT_JUMP)
-			|| (OC_JMPTSET != tb->exorder.fl->opcode) || (OC_JMPTCLR != tb->exorder.fl->opcode));
 		ref0 = maketriple(tb->opcode);					/* copy operation for place in new ladder */
-		ref1 = (TREF(boolchain_ptr))->exorder.bl;			/* common setup for above op insert */
+		ref1 = (TREF(boolchain_ptr))->exorder.bl;			/* common setup for coming copy of this op */
 		switch (tb->opcode)
 		{								/* time to subvert original jump ladder entry */
 			case OC_COBOOL:
 				/* insert COBOOL and copy of following JMP in boolchain; overlay them with STOTEMP and NOOP  */
 				assert(TRIP_REF == tb->operand[0].oprclass);
 				dqins(ref1, exorder, ref0);
-				if (oc_tab[tb->operand[0].oprval.tref->opcode].octype & OCT_MVAL)
+				if (OCT_MVAL & oc_tab[tb->operand[0].oprval.tref->opcode].octype)
 				{						/* do we need a STOTEMP? */
 					STOTEMP_IF_NEEDED(ref0, 0, tb, tb->operand[0]);
 				} else
@@ -161,6 +187,7 @@ void bx_boolop(triple *t, boolean_t jmp_type_one, boolean_t jmp_to_next, boolean
 					ref0->operand[0] = put_tref(tb);	/* new COBOOL points to this OC_COMVAL  */
 				}
 				t1 = tb->exorder.fl;
+				assert(OCT_JUMP & oc_tab[t1->opcode].octype);
 				tj = maketriple(t1->opcode);			/* create new jmp on result of coerce */
 				tj->operand[0] = t1->operand[0];
 				t1->opcode = OC_NOOP;				/* wipe out original jmp */
@@ -172,24 +199,28 @@ void bx_boolop(triple *t, boolean_t jmp_type_one, boolean_t jmp_to_next, boolean
 			case OC_NUMCMP:
 			case OC_PATTERN:
 			case OC_SORTS_AFTER:
-				/* insert copies of orig OC and following JMP in boolchain & overly originals with STOTEMPs */
+				/* insert copies of orig OC and following JMP in boolchain & overlay originals with STOTEMPs */
 				assert(TRIP_REF == tb->operand[0].oprclass);
 				assert(TRIP_REF == tb->operand[1].oprclass);
 				dqins(ref1, exorder, ref0);
 				STOTEMP_IF_NEEDED(ref0, 0, tb, tb->operand[0]);
 				t1 = tb->exorder.fl;
+				assert(OCT_JUMP & oc_tab[t1->opcode].octype);
 				tj = maketriple(t1->opcode);			/* copy jmp */
 				tj->operand[0] = t1->operand[0];
 				STOTEMP_IF_NEEDED(ref0, 1, t1, tb->operand[1]);
 				if (OC_NOOP == tb->opcode)			/* does op[0] need cleanup? */
 					tb->operand[0].oprclass = tb->operand[1].oprclass = NO_REF;
 				break;
-			case OC_JMPTSET:
+			case OC_JMPFALSE:
 			case OC_JMPTCLR:
+			case OC_JMPTSET:
+			case OC_JMPTRUE:
 				t1 = tb;					/* move copy of jmp to boolchain and NOOP it */
 				tj = ref0;
-				tj->operand[0] = t1->operand[0];		/* new jmpt gets old target */
-				ref2 = maketriple(OC_NOOP);			/* insert a NOOP in new chain in place of COBOOL */
+				tj->operand[0] = t1->operand[0];		/* new jmp gets old target */
+				assert(INDR_REF == tj->operand[0].oprclass);
+				ref2 = maketriple(OC_NOOP);			/* insert NOOP rather than COBOOL in new chain */
 				dqins(ref1, exorder, ref2);
 				t1->opcode = OC_NOOP;				/* wipe out original jmp */
 				t1->operand[0].oprclass = NO_REF;
@@ -199,7 +230,7 @@ void bx_boolop(triple *t, boolean_t jmp_type_one, boolean_t jmp_to_next, boolean
 		}
 		assert((OC_STOTEMP == t1->opcode) || (OC_NOOP == t1->opcode) || (OC_COMVAL == t1->opcode)
 			  || (OC_LITC == t1->opcode));
-		assert(oc_tab[tj->opcode].octype & OCT_JUMP);
+		assert(OCT_JUMP & oc_tab[tj->opcode].octype);
 		ref1 = (TREF(boolchain_ptr))->exorder.bl;
 		dqins(ref1, exorder, tj);					/* common insert for new jmp */
 		TRACK_JMP_TARGET(tb, ref0);
@@ -207,7 +238,7 @@ void bx_boolop(triple *t, boolean_t jmp_type_one, boolean_t jmp_to_next, boolean
 	assert(oc_tab[t->opcode].octype & OCT_BOOL);
 	t->opcode = OC_NOOP;							/* wipe out the original boolean op */
 	t->operand[0].oprclass = t->operand[1].oprclass = NO_REF;
-	TRACK_JMP_TARGET(t, jmp_to_next ? (TREF(boolchain_ptr))->exorder.bl : ref0);	/* point at op[1] or op[0] respectively */
+	TRACK_JMP_TARGET(t, (jmp_to_next ? (TREF(boolchain_ptr))->exorder.bl : ref0));	/* point at op[1] or op[0] respectively */
 	if (!expr_fini)
 		return;
 	/* time to deal with new jump ladder */
@@ -216,68 +247,84 @@ void bx_boolop(triple *t, boolean_t jmp_type_one, boolean_t jmp_to_next, boolean
 	assert(TREF(bool_targ_ptr) != (TREF(bool_targ_ptr))->que.fl);
 	assert(t0->exorder.bl == t);
 	assert(t0 == t->exorder.fl);
-	dqadd(t, TREF(boolchain_ptr), exorder);				/* insert the new jump ladder */
+	dqadd(t, TREF(boolchain_ptr), exorder);					/* insert the new jump ladder */
 	ref0 = (TREF(boolchain_ptr))->exorder.bl->exorder.fl;
 	if (ref0 == TREF(curtchain))
-	{									/* add a safe target */
-		newtriple(OC_NOOP);
-		ref0 = (TREF(curtchain))->exorder.bl;
-	}
+		ref0 = newtriple(OC_NOOP);					/* add a safe target */
 	t0 = t->exorder.fl;
 	assert((OC_COBOOL == t0->opcode) || (OC_JMPTSET != t0->opcode) || (OC_JMPTCLR != t0->opcode)) ;
 	t0 = t0->exorder.fl;
-	assert(oc_tab[t0->opcode].octype & OCT_JUMP);
-	for (; (t0 != ref0) && oc_tab[t0->opcode].octype & OCT_JUMP; t0 = t0->exorder.fl)
+	assert(OCT_JUMP & oc_tab[t0->opcode].octype);
+	for (; (t0 != ref0) && (OCT_JUMP & oc_tab[t0->opcode].octype); t0 = t0->exorder.fl)
 	{									/* process replacement jmps */
 		adj_addr = &t0->operand[0];
-		assert(INDR_REF == adj_addr->oprclass);
-		if (NULL != (t1 = (adj_addr = adj_addr->oprval.indr)->oprval.tref))
-		{								/*  need to adjust target; NOTE assignments above */
-			if (TNXT_REF == adj_addr->oprclass)				/* TNXT requires a different adjustment */
-			{
-				for (ref1 = t1->exorder.fl; ref1 != ref0; ref1 = ref1->exorder.fl)
+		switch (t0->opcode)
+		{
+		case OC_JMPTRUE:
+			t0->opcode = OC_NOOP;							/* TRUE item: NOOP it */
+			t0->operand[0].oprclass = NO_REF;
+			t0->operand[0].oprval.tref = (triple *)-1;				/* with a flag */
+			break;
+		case OC_JMPFALSE:								/* FALSE item: unconditional JMP */
+			t0->opcode = OC_JMP;
+			t0->operand[0].oprclass = INDR_REF;					/* WARNING fallthrough */
+		default:
+			if (NULL != (t1 = (adj_addr = adj_addr->oprval.indr)->oprval.tref))	/* WARNING assignment */
+			{								/*  need to adjust target */
+				if (TNXT_REF == adj_addr->oprclass)			/* TNXT requires a different adjustment */
 				{
-					if (NULL != ref1->jmplist.bpt)			/* find 1st recorded target after TNXT */
+					for (ref1 = t1->exorder.fl; ref1 != ref0; ref1 = ref1->exorder.fl)
 					{
-						assert((OC_NOOP == ref1->opcode) || (OC_STOTEMP == ref1->opcode));
-						ref1 = ref1->jmplist.bpt;		/* should point to appropriate new target */
-						assert((oc_tab[ref1->opcode].octype & OCT_BOOL) || (OC_NOOP == ref1->opcode));
-						break;
+						if (NULL != ref1->jmplist.bpt)		/* find 1st recorded target after TNXT */
+						{
+							assert((OC_NOOP == ref1->opcode) || (OC_STOTEMP == ref1->opcode));
+							ref1 = ref1->jmplist.bpt;	/* should point to appropriate new target */
+							assert((OCT_BOOL & oc_tab[ref1->opcode].octype)
+								|| (OC_NOOP == ref1->opcode));
+							break;
+						}
+					}
+				} else
+				{
+					assert(TJMP_REF == adj_addr->oprclass);
+					if ((t == t1) || (t1 == ref0))
+						ref1 = ref0;				/* adjust to end of boolean expression */
+					else
+					{	/* old target should have jmplist entry */
+						/* from the jmp jmplisted in the old target we move past the next test (or NOOP)
+						 * and jmp which correspond to the old target and pick the subsequent test (or NOOP)
+						 * and jmp which correspond to those that originally followed the logic after the
+						 * old target and are therefore the appropriate new target for this jmp
+						 */
+						assert(OC_NOOP == t1->opcode);
+						assert(&(t1->jmplist) != t1->jmplist.que.fl);
+						assert(NULL != t1->jmplist.bpt);
+						assert(OCT_JUMP & oc_tab[t1->jmplist.bpt->opcode].octype);
+						ref1 = t1->jmplist.bpt->exorder.fl;
+						assert((OCT_BOOL & oc_tab[ref1->opcode].octype) || (OC_NOOP == ref1->opcode));
+						ref1 = ref1->exorder.fl->exorder.fl;
+						while ((triple *)-1 == ref1->exorder.fl->operand[0].oprval.tref)
+						{	/* avoid jumping to a "dead" TRUE item */
+							assert(OC_JMP == ref1->exorder.fl->opcode);
+							ref1 = ref1->exorder.fl->exorder.fl;
+							assert(INDR_REF == ref1->operand[0].oprclass);
+						}
+						assert((OCT_BOOL & oc_tab[(c = ref1->opcode)].octype)	/* WARNING assignments */
+							|| (OC_BOOLFINI == c)
+								|| ((OC_NOOP == c) && ((TREF(curtchain) == ref1->exorder.fl)
+								|| ((OC_JMP == (c = ref1->exorder.fl->opcode)) || (OC_JMPTCLR == c)
+								|| (OC_JMPTSET == c) || (OC_JMPFALSE == c) || (OC_JMPTRUE == c))
+								&& (INDR_REF == ref1->exorder.fl->operand[0].oprclass))));
 					}
 				}
-			} else
-			{
-				assert(TJMP_REF == adj_addr->oprclass);
-				if ((t == t1) || (t1 == ref0))
-					ref1 = ref0;				/* adjust to end of boolean expression */
-				else
-				{						/* old target should have jmplist entry */
-					/* from the jmp jmplisted in the old target we move past the next
-					 * test (or NOOP) and jmp which correspond to the old target and pick
-					 * the subsequent test (or NOOP) and jmp which correspond to those that originally followed
-					 * the logic after the old target and are therefore the appropriate new target for this jmp
-					 */
-					assert(OC_NOOP == t1->opcode);
-					assert(&(t1->jmplist) != t1->jmplist.que.fl);
-					assert(NULL != t1->jmplist.bpt);
-					assert(oc_tab[t1->jmplist.bpt->opcode].octype & OCT_JUMP);
-					ref1 = t1->jmplist.bpt->exorder.fl;
-					assert((oc_tab[ref1->opcode].octype & OCT_BOOL) || (OC_NOOP == ref1->opcode));
-					assert(oc_tab[ref1->exorder.fl->opcode].octype & OCT_JUMP);
-					ref1 = ref1->exorder.fl->exorder.fl;
-					assert((oc_tab[ref1->opcode].octype & OCT_BOOL) || (OC_BOOLFINI == ref1->opcode)
-						|| ((OC_NOOP == ref1->opcode) && ((OC_JMPTCLR == ref1->exorder.fl->opcode)
-						|| (OC_JMPTSET == ref1->exorder.fl->opcode)
-						|| (TREF(curtchain) == ref1->exorder.fl))));
-				}
+				t0->operand[0] = put_tjmp(ref1);		/* no indirection simplifies later interations */
 			}
-			t0->operand[0] = put_tjmp(ref1);		/* no indirection simplifies later interations */
 		}
 		t0 = t0->exorder.fl;
 		if ((OC_BOOLFINI == t0->opcode) || (TREF(curtchain) == t0->exorder.fl))
 			break;
-		assert((oc_tab[t0->opcode].octype & OCT_BOOL)
-			|| (OC_JMPTSET == t0->exorder.fl->opcode) || (OC_JMPTCLR == t0->exorder.fl->opcode));
+		assert((OCT_BOOL & oc_tab[t0->opcode].octype) || (OC_JMP == (c = t0->exorder.fl->opcode)) || (OC_JMPTSET == c)
+			|| (OC_JMPTCLR == c) || (OC_JMPFALSE == c) || (OC_JMPTRUE == c));		/* WARNING assignment */
 	}
 	dqloop(TREF(bool_targ_ptr), que, tripbp)				/* clean up borrowed jmplist entries */
 	{
diff --git a/sr_port/bx_relop.c b/sr_port/bx_relop.c
index 260eab3..2e83d8d 100755
--- a/sr_port/bx_relop.c
+++ b/sr_port/bx_relop.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001 Sanchez Computer Associates, Inc.	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -13,7 +14,14 @@
 #include "compiler.h"
 #include "mdq.h"
 
+LITREF octabstruct	oc_tab[];
+
 void bx_relop(triple *t, opctype cmp, opctype tst, oprtype *addr)
+/* work Boolean relational arguments
+ * *t points to the Boolean operation
+ * cmp and tst give (respectively) the opcode and the associated jump
+ * *addr points the operand for the jump and is eventually used by logic back in the invocation stack to fill in a target location
+ */
 {
 	triple *ref;
 
diff --git a/sr_port/bx_tail.c b/sr_port/bx_tail.c
index f8cae7a..7b42162 100755
--- a/sr_port/bx_tail.c
+++ b/sr_port/bx_tail.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2012 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -14,8 +15,11 @@
 #include "opcode.h"
 #include "mdq.h"
 #include "mmemory.h"
+#include "fullbool.h"
+#include "stringpool.h"
 
-LITREF octabstruct oc_tab[];
+LITREF mval		literal_zero, literal_one;
+LITREF octabstruct	oc_tab[];
 
 /*	structure of jmps is as follows:
  *
@@ -34,97 +38,112 @@ LITREF octabstruct oc_tab[];
 
 void bx_tail(triple *t, boolean_t sense, oprtype *addr)
 /*
- * triple	  *t;		triple to be processed
- *boolean_t sense;	code to be generated is jmpt or jmpf
- *oprtype	  *addr;	address to jmp
+ * work a Boolean expression along to final form
+ * triple	*t;	triple to be processed
+ * boolean_t	sense;	code to be generated is jmpt or jmpf
+ * oprtype	*addr;	address to jmp
  */
 {
-	triple *ref;
-	oprtype *p;
+	boolean_t	tv;
+	opctype		c;
+	oprtype		*p;
+	triple		*ref, *ref1, *ref2;
+	DCL_THREADGBL_ACCESS;
 
+	SETUP_THREADGBL_ACCESS;
+	if (OC_LIT == t->opcode)
+	{	/* bx_boollit/ex_tail left literal operand, but this invocation indicates we need a JMP form, so adjust and leave */
+		t->opcode = ((0 != t->operand[0].oprval.mlit->v.m[1]) ^ sense) ? OC_JMPTRUE : OC_JMPFALSE;
+		assert(INDR_REF == t->operand[1].oprclass);
+		t->operand[0] = t->operand[1];
+		return;
+	}
 	assert((1 & sense) == sense);
-	assert(oc_tab[t->opcode].octype & OCT_BOOL);
+	assert(OCT_BOOL & oc_tab[t->opcode].octype);
 	assert(TRIP_REF == t->operand[0].oprclass);
 	assert((TRIP_REF == t->operand[1].oprclass) || (NO_REF == t->operand[1].oprclass));
-	switch (t->opcode)
+	if ((OC_COBOOL != (c = t->opcode)) && (OC_COM != c))				/* WARNING assignment */
+		bx_boollit(t, sense, addr);
+	if ((OC_JMPTRUE != (c = t->opcode)) && (OC_JMPFALSE != c))			/* WARNING assignment */
 	{
-	case OC_COBOOL:
-		ex_tail(&t->operand[0]);
-		if (OC_GETTRUTH == t->operand[0].oprval.tref->opcode)
+		if (OCT_NEGATED & oc_tab[t->opcode].octype)
+			sense ^= 1;
+		switch (c)
 		{
-			dqdel(t->operand[0].oprval.tref, exorder);
-			t->opcode = sense ? OC_JMPTSET : OC_JMPTCLR;
-			t->operand[0] = put_indr(addr);
+		case OC_COBOOL:
+			ex_tail(&t->operand[0]);
+			if (OC_GETTRUTH == t->operand[0].oprval.tref->opcode)
+			{
+				dqdel(t->operand[0].oprval.tref, exorder);
+				t->opcode = sense ? OC_JMPTSET : OC_JMPTCLR;
+				t->operand[0] = put_indr(addr);
+				return;
+			}
+			ref = maketriple(sense ? OC_JMPNEQ : OC_JMPEQU);
+			ref->operand[0] = put_indr(addr);
+			dqins(t, exorder, ref);
+			return;
+		case OC_COM:
+			bx_tail(t->operand[0].oprval.tref, !sense, addr);		/* WARNING assignment below */
+			if ((OC_JMPTRUE == (ref = t->operand[0].oprval.tref)->opcode) || (OC_JMPFALSE == ref->opcode))
+			{	/* maybe operand or target, so slide over, rather than dqdel the com */
+				t->opcode = ref->opcode;
+				t->operand[0] = ref->operand[0];
+				t->operand[1] = ref->operand[1];
+				dqdel(ref, exorder);
+			} else
+			{	/* even if we are just done with it, NOOP rather than dqdel for reason above */
+				t->opcode = OC_NOOP;
+				t->operand[0].oprclass = NO_REF;
+			}
 			return;
+		case OC_NEQU:
+		case OC_EQU:
+			bx_relop(t, OC_EQU, sense ? OC_JMPNEQ : OC_JMPEQU, addr);
+			break;
+		case OC_NPATTERN:
+		case OC_PATTERN:
+			bx_relop(t, OC_PATTERN, sense ? OC_JMPNEQ : OC_JMPEQU, addr);
+			break;
+		case OC_NFOLLOW:
+		case OC_FOLLOW:
+			bx_relop(t, OC_FOLLOW, sense ? OC_JMPGTR : OC_JMPLEQ, addr);
+			break;
+		case OC_NSORTS_AFTER:
+		case OC_SORTS_AFTER:
+			bx_relop(t, OC_SORTS_AFTER, sense ? OC_JMPGTR : OC_JMPLEQ, addr);
+			break;
+		case OC_NCONTAIN:
+		case OC_CONTAIN:
+			bx_relop(t, OC_CONTAIN, sense ? OC_JMPNEQ : OC_JMPEQU, addr);
+			break;
+		case OC_NGT:
+		case OC_GT:
+			bx_relop(t, OC_NUMCMP, sense ? OC_JMPGTR : OC_JMPLEQ, addr);
+			break;
+		case OC_NLT:
+		case OC_LT:
+			bx_relop(t, OC_NUMCMP, sense ? OC_JMPLSS : OC_JMPGEQ, addr);
+			break;
+		case OC_NAND:
+		case OC_AND:
+			bx_boolop(t, FALSE, sense, sense, addr);
+			break;
+		case OC_NOR:
+		case OC_OR:
+			bx_boolop(t, TRUE, !sense, sense, addr);
+			break;
+		case OC_NUMCMP:
+			break;								/* already processed by bx_boollit */
+		default:
+			assertpro(t->opcode && FALSE);
 		}
-		ref = maketriple(sense ? OC_JMPNEQ : OC_JMPEQU);
-		ref->operand[0] = put_indr(addr);
-		dqins(t, exorder, ref);
-		return;
-	case OC_COM:
-		bx_tail(t->operand[0].oprval.tref, !sense, addr);
-		t->opcode = OC_NOOP;
-		t->operand[0].oprclass = NO_REF;
-		return;
-	case OC_NEQU:
-		sense = !sense;
-		/* caution: fall through */
-	case OC_EQU:
-		bx_relop(t, OC_EQU, sense ? OC_JMPNEQ : OC_JMPEQU, addr);
-		break;
-	case OC_NPATTERN:
-		sense = !sense;
-		/* caution: fall through */
-	case OC_PATTERN:
-		bx_relop(t, OC_PATTERN, sense ? OC_JMPNEQ : OC_JMPEQU, addr);
-		break;
-	case OC_NFOLLOW:
-		sense = !sense;
-		/* caution: fall through */
-	case OC_FOLLOW:
-		bx_relop(t, OC_FOLLOW, sense ? OC_JMPGTR : OC_JMPLEQ, addr);
-		break;
-	case OC_NSORTS_AFTER:
-		sense = !sense;
-		/* caution: fall through */
-	case OC_SORTS_AFTER:
-		bx_relop(t, OC_SORTS_AFTER, sense ? OC_JMPGTR : OC_JMPLEQ, addr);
-		break;
-	case OC_NCONTAIN:
-		sense = !sense;
-		/* caution: fall through */
-	case OC_CONTAIN:
-		bx_relop(t, OC_CONTAIN, sense ? OC_JMPNEQ : OC_JMPEQU, addr);
-		break;
-	case OC_NGT:
-		sense = !sense;
-		/* caution: fall through */
-	case OC_GT:
-		bx_relop(t, OC_NUMCMP, sense ? OC_JMPGTR : OC_JMPLEQ, addr);
-		break;
-	case OC_NLT:
-		sense = !sense;
-		/* caution: fall through */
-	case OC_LT:
-		bx_relop(t, OC_NUMCMP, sense ? OC_JMPLSS : OC_JMPGEQ, addr);
-		break;
-	case OC_NAND:
-		sense = !sense;
-		/* caution: fall through */
-	case OC_AND:
-		bx_boolop(t, FALSE, sense, sense, addr);
-		return;
-	case OC_NOR:
-		sense = !sense;
-		/* caution: fall through */
-	case OC_OR:
-		bx_boolop(t, TRUE, !sense, sense, addr);
-		return;
-	default:
-		GTMASSERT;
 	}
-	for (p = t->operand ; p < ARRAYTOP(t->operand); p++)
-		if (TRIP_REF == p->oprclass)
-			ex_tail(p);
+	if (OCT_REL & oc_tab[c].octype)
+	{
+		for (p = t->operand ; p < ARRAYTOP(t->operand); p++)
+			if (TRIP_REF == p->oprclass)
+				ex_tail(p);
+	}
 	return;
 }
diff --git a/sr_port/cdb_sc.h b/sr_port/cdb_sc.h
index 5eba2da..a80e36d 100755
--- a/sr_port/cdb_sc.h
+++ b/sr_port/cdb_sc.h
@@ -42,6 +42,15 @@ GBLREF	boolean_t	is_final_retry_code_lchar[];
 			? is_final_retry_code_uchar[STATUS - 'A']	/* upper case */	\
 			: is_final_retry_code_lchar[STATUS - 'a'])))	/* lower case */
 
+/* This macro is used in places that don't rely on t_retry() to handle the possibility of a retry in the final try.
+ * For example, database trigger handling code assumes that a structural issue with a trigger global is due to a
+ * concurrent update and not a broken entry in the DB. Once the final retry has been exhausted, the trigger code
+ * path issues a TRIGDEFBAD error. IS_FINAL_RETRY_CODE enhances that check against CDB_STAGNATE to ensure that the
+ * final retry has truly been exhausted.
+ */
+#define UPDATE_CAN_RETRY(TRIES, CURRSTATUS)							\
+	((CDB_STAGNATE > TRIES) || (IS_FINAL_RETRY_CODE(CURRSTATUS)))
+
 #define TP_TRACE_HIST_MOD(BLK_NUM, BLK_TARGET, N, CSD, HISTTN, BTTN, LEVEL)						\
 {															\
 	GBLREF	block_id		t_fail_hist_blk[];								\
diff --git a/sr_port/cdb_sc_table.h b/sr_port/cdb_sc_table.h
index 3975f62..4013589 100755
--- a/sr_port/cdb_sc_table.h
+++ b/sr_port/cdb_sc_table.h
@@ -1,6 +1,6 @@
 /****************************************************************
  *                                                              *
- * Copyright (c) 2003-2016 Fidelity National Information	*
+ * Copyright (c) 2003-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *                                                              *
  *      This source code contains the intellectual property     *
@@ -49,17 +49,16 @@
  *	cdb_sc_onln_rlbk2
  *	cdb_sc_instancefreeze
  *	cdb_sc_gvtrootmod2
+ *	cdb_sc_gvtrootnonzero
  *	cdb_sc_reorg_encrypt
  *	cdb_sc_optrestart
  */
 
 CDB_SC_NUM_ENTRY(  cdb_sc_normal,           FALSE,          0) /*  0   success */
 CDB_SC_NUM_ENTRY(  cdb_sc_endtree,          FALSE,          1) /*  1   gvcst_lftsib or gvcst_rtsib searched past end of tree */
-CDB_SC_NUM_ENTRY(  cdb_sc_delete_parent,    FALSE,          2) /*  2   gvcst_kill_blk succeeded, but signals gvcst_kill
-								*		that block was completely deleted */
+CDB_SC_NUM_ENTRY(  cdb_sc_delete_parent,    FALSE,          2) /*  2   gvcst_kill_blk succeeded, but signals gvcst_kill that block was completely deleted */
 CDB_SC_NUM_ENTRY(  cdb_sc_nolock,           FALSE,          3) /*  3   mutex_lockwim was unable to obtain a lock */
-CDB_SC_NUM_ENTRY(  cdb_sc_needcrit,         TRUE,           4) /*  4   on 4th attempt and need crit for this region -- restart transaction
-								*		no penalty */
+CDB_SC_NUM_ENTRY(  cdb_sc_needcrit,         TRUE,           4) /*  4   on 4th attempt and need crit for this region -- restart transaction no penalty */
 CDB_SC_NUM_ENTRY(  cdb_sc_helpedout,        TRUE,           5) /*  5   wcs_blocked when t_tries >= CDB_STAGNATE */
 CDB_SC_NUM_ENTRY(  cdb_sc_gbloflow,         FALSE,          6) /*  6   t_end or tp_tend found database full and could not be extended */
 CDB_SC_NUM_ENTRY(  cdb_sc_oprnotneeded,     FALSE,          7) /*  7   reorg operation was not required */
@@ -67,7 +66,7 @@ CDB_SC_NUM_ENTRY(  cdb_sc_starrecord,       FALSE,          8) /*  8   star reco
 CDB_SC_NUM_ENTRY(  cdb_sc_extend,           FALSE,          9) /*  9   extend requested when none seemed needed - from gdsfilext */
 CDB_SC_NUM_ENTRY(  cdb_sc_jnlclose,         TRUE,          10) /* 10   journal file has been closed */
 
-CDB_SC_UCHAR_ENTRY(cdb_sc_rmisalign1,       FALSE, FALSE, 'A') /* 'A'  gvcst_get found record misaligned */
+CDB_SC_UCHAR_ENTRY(cdb_sc_wcs_recover,      FALSE, FALSE, 'A') /* 'A'  tp_hist/t_end found concurrent "wcs_recover" invocation */
 CDB_SC_UCHAR_ENTRY(cdb_sc_keyoflow,         FALSE, FALSE, 'B') /* 'B'  gvcst_expand_key or gvcst_search (3) found key overflow */
 CDB_SC_UCHAR_ENTRY(cdb_sc_rmisalign,        FALSE, FALSE, 'C') /* 'C'  Record misaligned from nearly everyone */
 CDB_SC_UCHAR_ENTRY(cdb_sc_r2small,          FALSE, FALSE, 'D') /* 'D'  gvcst_expand_key found record too small */
@@ -75,58 +74,42 @@ CDB_SC_UCHAR_ENTRY(cdb_sc_losthist,         FALSE, TRUE,  'E') /* 'E'  t_end/tp_
 CDB_SC_UCHAR_ENTRY(cdb_sc_mapfail,          FALSE, FALSE, 'F') /* 'F'  t_end or op_tcommit (from bm_getfree) failed to acquire new block */
 CDB_SC_UCHAR_ENTRY(cdb_sc_lostcr,           FALSE, TRUE,  'G') /* 'G'  gvcst_...sib, t_end/tp_tend/tp_hist - found cache buffer modified */
 CDB_SC_UCHAR_ENTRY(cdb_sc_mkblk,            FALSE, FALSE, 'H') /* 'H'  Composing a local block failed, from gvcst_kill(3) gvcst_put(14) */
-CDB_SC_UCHAR_ENTRY(cdb_sc_rdfail,           FALSE, FALSE, 'I') /* 'I'  t_qread found block number requested is outside size of file
-								*		as described by fileheader */
-CDB_SC_UCHAR_ENTRY(cdb_sc_badlvl,           FALSE, FALSE, 'J') /* 'J'  gvcst_search found a child block didn't have the next block level
-								*		below its parent */
+CDB_SC_UCHAR_ENTRY(cdb_sc_rdfail,           FALSE, FALSE, 'I') /* 'I'  t_qread found block number requested is outside size of file as described by fileheader */
+CDB_SC_UCHAR_ENTRY(cdb_sc_badlvl,           FALSE, FALSE, 'J') /* 'J'  gvcst_search found a child block didn't have the next block level below its parent */
 CDB_SC_UCHAR_ENTRY(cdb_sc_cacheprob,        FALSE, TRUE,  'K') /* 'K'  db_csh_get, ... found a cache control problem */
 CDB_SC_UCHAR_ENTRY(cdb_sc_blkmod,           FALSE, FALSE, 'L') /* 'L'  t_end, or tp_tend found block modified */
 CDB_SC_UCHAR_ENTRY(cdb_sc_uperr,            FALSE, FALSE, 'M') /* 'M'  t_ch received an unpredicatable error */
 CDB_SC_UCHAR_ENTRY(cdb_sc_comfail,          FALSE, FALSE, 'N') /* 'N'  Commit failed used in t_end_sysops (8) by (?) */
-CDB_SC_UCHAR_ENTRY(cdb_sc_lostbefor,        FALSE, TRUE,  'O') /* 'O'  t_end or tp_tend found the before image needed for journaling was
-								*		removed from the cache */
+CDB_SC_UCHAR_ENTRY(cdb_sc_lostbefor,        FALSE, TRUE,  'O') /* 'O'  t_end or tp_tend found the before image needed for journaling was removed from the cache */
 CDB_SC_UCHAR_ENTRY(cdb_sc_committfail,      FALSE, FALSE, 'P') /* 'P'  t_commit_cleanup found a partially committed block split */
-CDB_SC_UCHAR_ENTRY(cdb_sc_dbccerr,          FALSE, FALSE, 'Q') /* 'Q'  mutex found (in 1 of 3 places) an interlock instruction failure
-								*		in critical mechanism */
-CDB_SC_UCHAR_ENTRY(cdb_sc_critreset,        FALSE, FALSE, 'R') /* 'R'  mutex found (in 1 of 6 places) that the segment crit crash count
-								*		has been incremented */
-CDB_SC_UCHAR_ENTRY(cdb_sc_maxlvl,           FALSE, FALSE, 'S') /* 'S'  t_write_root or gvcst_search found maximum legal block level for
-								*		database exceeded */
-CDB_SC_UCHAR_ENTRY(cdb_sc_blockflush,       FALSE, FALSE, 'T') /* 'T'  t_end (hist, or bitmap) found an to update a buffer that is being
-								*		flushed (GT.CX) */
-CDB_SC_UCHAR_ENTRY(cdb_sc_cyclefail,        FALSE, TRUE,  'U') /* 'U'  t_end or tp_tend found a buffer in read(only) set was overwritten
-								*		though tn static */
+CDB_SC_UCHAR_ENTRY(cdb_sc_dbccerr,          FALSE, FALSE, 'Q') /* 'Q'  mutex found (in 1 of 3 places) an interlock instruction failure in critical mechanism */
+CDB_SC_UCHAR_ENTRY(cdb_sc_critreset,        FALSE, FALSE, 'R') /* 'R'  mutex found (in 1 of 6 places) that the segment crit crash count has been incremented */
+CDB_SC_UCHAR_ENTRY(cdb_sc_maxlvl,           FALSE, FALSE, 'S') /* 'S'  t_write_root or gvcst_search found maximum legal block level for database exceeded */
+CDB_SC_UCHAR_ENTRY(cdb_sc_blockflush,       FALSE, FALSE, 'T') /* 'T'  t_end (hist, or bitmap) found an to update a buffer that is being flushed (GT.CX) */
+CDB_SC_UCHAR_ENTRY(cdb_sc_cyclefail,        FALSE, TRUE,  'U') /* 'U'  t_end or tp_tend found a buffer in read(only) set was overwritten though tn static */
 CDB_SC_UCHAR_ENTRY(cdb_sc_optrestart,       TRUE,  FALSE, 'V') /* 'V'  TP restart explicitly signaled by the TRESTART command */
-CDB_SC_UCHAR_ENTRY(cdb_sc_future_read,      FALSE, FALSE, 'W') /* 'W'  dsk_read return to t_qread indicated block transaction exceeds
-								*		curr_tn (GT.CX) */
+CDB_SC_UCHAR_ENTRY(cdb_sc_future_read,      FALSE, FALSE, 'W') /* 'W'  dsk_read return to t_qread indicated block transaction exceeds curr_tn (GT.CX) */
 CDB_SC_UCHAR_ENTRY(cdb_sc_badbitmap,        FALSE, FALSE, 'X') /* 'X'  bm_getfree found bitmap had bad size or level */
-CDB_SC_UCHAR_ENTRY(cdb_sc_badoffset,        FALSE, FALSE, 'Y') /* 'Y'  gvcst_blk_search (in gvcst_search_blk or gvcst_search_tail) found
-								*		a bad record offset */
-CDB_SC_UCHAR_ENTRY(cdb_sc_blklenerr,        FALSE, FALSE, 'Z') /* 'Z'  gvcst_blk_search (in gvcst_search_blk or gvcst_search_tail) reached
-								*		the end with no match */
+CDB_SC_UCHAR_ENTRY(cdb_sc_badoffset,        FALSE, FALSE, 'Y') /* 'Y'  gvcst_blk_search (in gvcst_search_blk or gvcst_search_tail) found a bad record offset */
+CDB_SC_UCHAR_ENTRY(cdb_sc_blklenerr,        FALSE, FALSE, 'Z') /* 'Z'  gvcst_blk_search (in gvcst_search_blk or gvcst_search_tail) reached the end with no match */
 
 CDB_SC_LCHAR_ENTRY(cdb_sc_bmlmod,           FALSE, FALSE, 'a') /* 'a'  t_end or tp_tend (mm or bg) found bit_map modified */
 CDB_SC_LCHAR_ENTRY(cdb_sc_lostbmlhist,      FALSE, TRUE,  'b') /* 'b'  t_end or tp_tend (bg) - tn could not be verified from history */
 CDB_SC_LCHAR_ENTRY(cdb_sc_lostbmlcr,        FALSE, TRUE,  'c') /* 'c'  t_end or tp_tend (bg) - found cache buffer modified */
-CDB_SC_LCHAR_ENTRY(cdb_sc_lostoldblk,       FALSE, FALSE, 'd') /* 'd'  t_qread or op_tcommit (tp and before image) - old_block of a used
-								*		block is NULL */
+CDB_SC_LCHAR_ENTRY(cdb_sc_lostoldblk,       FALSE, FALSE, 'd') /* 'd'  t_qread or op_tcommit (tp and before image) - old_block of a used block is NULL */
 CDB_SC_LCHAR_ENTRY(cdb_sc_blknumerr,        FALSE, FALSE, 'e') /* 'e'  t_qread or op_tcommit - block number is impossible */
 CDB_SC_LCHAR_ENTRY(cdb_sc_blksplit,         FALSE, FALSE, 'f') /* 'f'  recompute_upd_array recognized that the block needs to be split */
 CDB_SC_LCHAR_ENTRY(cdb_sc_toomanyrecompute, FALSE, FALSE, 'g') /* 'g'  more than 25% of the blocks in read-set need to be recomputed */
-CDB_SC_LCHAR_ENTRY(cdb_sc_jnlstatemod,      TRUE,  FALSE, 'h') /* 'h'  csd->jnl_state changed or csd->jnl_before_image changed since start
-								*		of the transaction */
-CDB_SC_LCHAR_ENTRY(cdb_sc_needlock,         FALSE, FALSE, 'i') /* 'i'  on final retry and need to wait for M-lock - restart transaction
-								*		- allow for max of 16 such restarts */
-CDB_SC_LCHAR_ENTRY(cdb_sc_bkupss_statemod,  FALSE, FALSE, 'j') /* 'j'  t_end/tp_tend found that either online-backup-in-progress or
-								*		snapshot state changed since start of transaction */
+CDB_SC_LCHAR_ENTRY(cdb_sc_jnlstatemod,      TRUE,  FALSE, 'h') /* 'h'  csd->jnl_state changed or csd->jnl_before_image changed since start of the transaction */
+CDB_SC_LCHAR_ENTRY(cdb_sc_needlock,         FALSE, FALSE, 'i') /* 'i'  on final retry and need to wait for M-lock - restart transaction - allow for max of 16 such restarts */
+CDB_SC_LCHAR_ENTRY(cdb_sc_bkupss_statemod,  FALSE, FALSE, 'j') /* 'j'  t_end/tp_tend found that either online-backup-in-progress or snapshot state changed since start of transaction */
 CDB_SC_LCHAR_ENTRY(cdb_sc_crbtmismatch,     FALSE, TRUE,  'k') /* 'k'  cr->blk and bt->blk does not match */
 CDB_SC_LCHAR_ENTRY(cdb_sc_phase2waitfail,   FALSE, TRUE,  'l') /* 'l'  wcs_phase2_commit_wait timed out when called from t_qread */
 CDB_SC_LCHAR_ENTRY(cdb_sc_inhibitkills,     FALSE, FALSE, 'm') /* 'm'  t_end/tp_tend found inhibit_kills counter greater than zero */
 CDB_SC_LCHAR_ENTRY(cdb_sc_triggermod,       FALSE, FALSE, 'n') /* 'n'  csd->db_trigger_cycle changed since start of of transaction */
 CDB_SC_LCHAR_ENTRY(cdb_sc_onln_rlbk1,       TRUE,  FALSE, 'o') /* 'o'  csa->onln_rlbk_cycle changed since start of transaction */
 CDB_SC_LCHAR_ENTRY(cdb_sc_onln_rlbk2,       TRUE,  FALSE, 'p') /* 'p'  csa->db_onln_rlbkd_cycle changed since start of transaction */
-CDB_SC_LCHAR_ENTRY(cdb_sc_truncate,         FALSE, FALSE, 'q') /* 'q'  t_qread tried to read a block beyond the end of a database
-								*		that has been concurrently truncated */
+CDB_SC_LCHAR_ENTRY(cdb_sc_truncate,         FALSE, FALSE, 'q') /* 'q'  t_qread tried to read a block beyond the end of a database that has been concurrently truncated */
 CDB_SC_LCHAR_ENTRY(cdb_sc_gvtrootmod,       FALSE, FALSE, 'r') /* 'r'  gvcst_kill found a need to redo the gvcst_root_search */
 CDB_SC_LCHAR_ENTRY(cdb_sc_instancefreeze,   TRUE,  FALSE, 's') /* 's'  instance freeze detected in t_end/tp_tend, requires retry */
 CDB_SC_LCHAR_ENTRY(cdb_sc_gvtrootmod2,      TRUE,  FALSE, 't') /* 't'  t_end/tp_tend detected root blocks moved by reorg */
@@ -134,3 +117,4 @@ CDB_SC_LCHAR_ENTRY(cdb_sc_spansize,         FALSE, FALSE, 'u') /* 'u'  chunks of
 CDB_SC_LCHAR_ENTRY(cdb_sc_restarted,        FALSE, FALSE, 'v') /* 'v'  return value indicating t_retry has already happened */
 CDB_SC_LCHAR_ENTRY(cdb_sc_tqreadnowait,     FALSE, FALSE, 'w') /* 'w'  update helper returning from t_qread instead of sleeping */
 CDB_SC_LCHAR_ENTRY(cdb_sc_reorg_encrypt,    TRUE,  FALSE, 'x') /* 'x'  cnl->reorg_encrypt_cycle changed since start of transaction */
+CDB_SC_LCHAR_ENTRY(cdb_sc_gvtrootnonzero,   TRUE,  FALSE, 'y') /* 'y'  gvcst_put2 found a need to redo the gvcst_root_search */
diff --git a/sr_port/cdbg_dump.c b/sr_port/cdbg_dump.c
index 21de39e..9c20992 100755
--- a/sr_port/cdbg_dump.c
+++ b/sr_port/cdbg_dump.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information 	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -326,7 +326,7 @@ void cdbg_dump_mstr(int indent, mstr *ms)
 	 * in the mvals to offsets. De-offset them if they don't point into the (indirect)
 	 * stringpool. This *ONLY* happens during an indirect compilation.
 	 */
-	assert(TREF(compile_time) || indr_stringpool.base != indr_stringpool.free);
+	assert(TREF(compile_time) || indr_stringpool.base <= indr_stringpool.free);
 	if (!TREF(compile_time) && strp < indr_stringpool.base)
 		strp += (UINTPTR_T)(indr_stringpool.base - SIZEOF(ihdtyp) - PADLEN(SIZEOF(ihdtyp), NATIVE_WSIZE));
 #	endif
diff --git a/sr_port/ceprep_file.c b/sr_port/ceprep_file.c
index 7323a54..2fc7792 100755
--- a/sr_port/ceprep_file.c
+++ b/sr_port/ceprep_file.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2009 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -27,7 +28,6 @@ static struct RAB	ceprep_rab;	/* record access block for compiler escape preproc
 
 #define CEPREP_OPEN_TIMEOUT 30
 
-GBLREF unsigned char		source_buffer[];
 GBLREF mident			module_name;
 GBLREF io_pair			io_curr_device;
 GBLREF command_qualifier	cmd_qlf;
@@ -38,10 +38,6 @@ void open_ceprep_file(void)
 {
 #ifdef VMS
 /* stub except for VMS */
-#ifdef __ALPHA
-# pragma member_alignment save
-# pragma nomember_alignment
-#endif
 	static readonly struct
 	{
 		unsigned char	newversion;
@@ -57,9 +53,6 @@ void open_ceprep_file(void)
 		(int4)		MAX_SRCLINE,
 		(unsigned char)	iop_eol
 	};
-#ifdef __ALPHA
-# pragma member_alignment restore
-#endif
 	int		mname_len;
 	uint4		status;
 	char		charspace, ceprep_name_buff[MAX_MIDENT_LEN + SIZEOF(".MCI") - 1], fname[255];
@@ -93,7 +86,7 @@ void open_ceprep_file(void)
 	ceprep_fab.fab$l_nam = &ceprep_nam;
 	ceprep_fab.fab$l_fop = FAB$M_NAM;
 	if (RMS$_NORMAL != (status = sys$parse(&ceprep_fab, 0, 0)))
-		rts_error(VARLSTCNT(1) status);
+		rts_error_csa(NULL VARLSTCNT(1) status);
 	file.mvtype = params.mvtype = MV_STR;
 	file.str.len = ceprep_nam.nam$b_esl;
 	file.str.addr = fname;
@@ -133,10 +126,12 @@ void put_ceprep_line(void)
 #ifdef VMS
 /* stub except for VMS */
 	mval	out;
+	DCL_THREADGBL_ACCESS;
 
+	SETUP_THREADGBL_ACCESS;
 	out.mvtype = MV_STR;
-	out.str.len = strlen((char *)source_buffer);
-	out.str.addr = source_buffer;
+	out.str.len = (TREF(source_buffer)).len - 1;
+	out.str.addr = (TREF(source_buffer)).addr;
 	op_write(&out);
 	op_wteol(1);
 #endif
diff --git a/sr_port/cert_blk.c b/sr_port/cert_blk.c
index 0b2db03..df90bb9 100644
--- a/sr_port/cert_blk.c
+++ b/sr_port/cert_blk.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -35,6 +35,8 @@
 #include "gtm_ffs.h"
 #include "cert_blk.h"
 #include "gtm_ctype.h"
+#include "collseq.h"
+#include "format_targ_key.h"
 #ifdef GTM_TRIGGER
 #include <rtnhdr.h>
 #include "gv_trigger.h"
@@ -73,6 +75,9 @@ error_def(ERR_DBMAXNRSUBS); /* same error as ERR_MAXNRSUBSCRIPTS, but has a stri
 error_def(ERR_DBINVGBL);
 error_def(ERR_DBBDBALLOC);
 error_def(ERR_GVINVALID);
+error_def(ERR_DBNULCOL);
+error_def(ERR_NULSUBSC);
+error_def(ERR_DBNONUMSUBS);
 
 #define BITS_PER_UCHAR	8
 #define BLKS_PER_UINT4	((SIZEOF(uint4) / SIZEOF(unsigned char)) * BITS_PER_UCHAR) / BML_BITS_PER_BLK
@@ -89,15 +94,16 @@ error_def(ERR_GVINVALID);
 #define	RTS_ERROR_FUNC(CSA, ERR, BUFF)									\
 {													\
 	if (gtmassert_on_error)										\
-		assertpro(0 != ERR);										\
+		assertpro(0 == ERR);										\
 	rts_error_csa(CSA_ARG(CSA) VARLSTCNT(4) MAKE_MSG_INFO(ERR), 2, LEN_AND_STR((char_ptr_t)BUFF));	\
 }
 
-int cert_blk (gd_region *reg, block_id blk, blk_hdr_ptr_t bp, block_id root, boolean_t gtmassert_on_error)
+int cert_blk (gd_region *reg, block_id blk, blk_hdr_ptr_t bp, block_id root,
+			boolean_t gtmassert_on_error, gv_namehead *gvt)
 {
 	block_id		child, prev_child;
 	rec_hdr_ptr_t		rp, r_top;
-	int			num_subscripts;
+	int			num_subscripts, fmtd_key_len;
 	uint4			bplmap, mask1, offset, rec_offset, rec_size;
 	sm_uint_ptr_t		chunk_p;			/* Value is unaligned so will be assigned to chunk */
 	uint4			chunk, blk_size;
@@ -105,6 +111,8 @@ int cert_blk (gd_region *reg, block_id blk, blk_hdr_ptr_t bp, block_id root, boo
 	unsigned short		rec_cmpc, min_cmpc;	/* the minimum cmpc expected in any record (except star-key) in a gvt */
 	int			tmp_cmpc;
 	unsigned char		ch, prior_expkey[MAX_KEY_SZ + 1];
+	unsigned char		subscript;
+	unsigned char		*r_ptr;
 	unsigned int		prior_expkeylen;
 	unsigned short		temp_ushort;
 	int			blk_levl;
@@ -115,6 +123,11 @@ int cert_blk (gd_region *reg, block_id blk, blk_hdr_ptr_t bp, block_id root, boo
 	sgmnt_addrs		*csa;
 	sgmnt_data_ptr_t	csd;
 	boolean_t		is_gvt, is_directory, first_key, full, prev_char_is_delimiter;
+	unsigned int            null_subscript_cnt;
+	unsigned int		rec_num;
+	unsigned char		key_buffer[MAX_ZWR_KEY_SZ];
+	unsigned char		*temp;
+	gv_key			*tmp_gvkey = NULL;
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
@@ -137,7 +150,6 @@ int cert_blk (gd_region *reg, block_id blk, blk_hdr_ptr_t bp, block_id root, boo
 	MEMCPY_LIT(&util_buff[util_len], TEXT2);
 	util_len += SIZEOF(TEXT2) - 1;
 	util_buff[util_len] = 0;
-
 	chain = *(off_chain *)&blk;
 	/* Assert that if at all chain.flag is non-zero (i.e. a created block), we are in TP and not yet in the commit logic.
 	 * The only exception to this rule is if we are in TP and inside phase1 of the commit logic and trying to certify a
@@ -264,9 +276,10 @@ int cert_blk (gd_region *reg, block_id blk, blk_hdr_ptr_t bp, block_id root, boo
 	prior_expkey[0] = prior_expkey[1] = 0;	/* double NUL also works for memvcmp test for key order */
 	next_tp_child_ptr = NULL;
 	prev_child = 0;
-
+	rec_num = 0;
 	for (rp = (rec_hdr_ptr_t)((sm_uc_ptr_t)bp + SIZEOF(blk_hdr)) ;  rp < (rec_hdr_ptr_t)blk_top ;  rp = r_top)
 	{
+		rec_num++;
 		GET_RSIZ(rec_size, rp);
 		rec_offset = (uint4)((sm_ulong_t)rp - (sm_ulong_t)bp);
 		/*add util_buff here*/
@@ -419,6 +432,70 @@ int cert_blk (gd_region *reg, block_id blk, blk_hdr_ptr_t bp, block_id root, boo
 			}
 			memcpy(prior_expkey + rec_cmpc, key_base, key_size);
 			prior_expkeylen = rec_cmpc + key_size;
+			null_subscript_cnt = 0;
+			if (is_gvt && (0 == blk_levl))
+			{
+				for (r_ptr = prior_expkey; *r_ptr != KEY_DELIMITER; r_ptr++)
+					;
+				for(;;)
+				{
+					if ((r_ptr - prior_expkey) > prior_expkeylen)
+						break;
+					if (KEY_DELIMITER == *r_ptr++)
+					{
+						subscript = *r_ptr;
+						if (KEY_DELIMITER == subscript)
+							break;
+						if ((NULL != gvt) && ((SUBSCRIPT_ZERO == subscript)
+								|| (KEY_DELIMITER != *(r_ptr + 1))))
+						{
+							if (1 == gvt->nct && STR_SUB_PREFIX != subscript)
+							{
+								assert(NULL == tmp_gvkey);
+								GVKEY_INIT(tmp_gvkey, DBKEYSIZE(MAX_KEY_SZ));
+								memcpy(tmp_gvkey->base, prior_expkey, prior_expkeylen);
+								tmp_gvkey->end = prior_expkeylen - 1;
+								temp = (unsigned char*)format_targ_key(key_buffer,
+									MAX_ZWR_KEY_SZ, tmp_gvkey, TRUE);
+								fmtd_key_len = (int)(temp - key_buffer);
+								key_buffer[fmtd_key_len] = '\0';
+								rts_error_csa(CSA_ARG(csa) VARLSTCNT(4)
+									MAKE_MSG_INFO(ERR_DBNONUMSUBS), 2,
+									LEN_AND_STR(key_buffer));
+								GVKEY_FREE_IF_NEEDED(tmp_gvkey);
+							}
+						}
+						if ((SUBSCRIPT_ZERO == subscript) || (KEY_DELIMITER != *(r_ptr + 1)))
+						{
+							r_ptr++;
+							continue;
+						}
+						if ((subscript == SUBSCRIPT_STDCOL_NULL) || (subscript == STR_SUB_PREFIX))
+								null_subscript_cnt++;
+						if (csd->null_subs)
+						{
+							if ((0 == csd->std_null_coll) ? (SUBSCRIPT_STDCOL_NULL == subscript) :
+								(STR_SUB_PREFIX == subscript))
+							{
+								if (csd->std_null_coll)
+									rts_error_csa(CSA_ARG(csa) VARLSTCNT(8)
+										MAKE_MSG_INFO(ERR_DBNULCOL), 6, rec_num, blk,
+										LEN_AND_STR(GTM_NULL_TEXT),
+										LEN_AND_STR(STD_NULL_TEXT));
+								else
+									rts_error_csa(CSA_ARG(csa) VARLSTCNT(8)
+										MAKE_MSG_INFO(ERR_DBNULCOL), 6, rec_num, blk,
+										LEN_AND_STR(STD_NULL_TEXT),
+										LEN_AND_STR(GTM_NULL_TEXT));
+							}
+						}
+					}
+				}
+				if (0 < null_subscript_cnt && !csd->null_subs)
+				{
+					RTS_ERROR_FUNC(csa, ERR_NULSUBSC, util_buff);
+				}
+			}
 		}
 		/* Check for proper child block numbers */
 		if ((0 != blk_levl) || (0 != is_directory))
diff --git a/sr_port/cert_blk.h b/sr_port/cert_blk.h
index 29bd8fd..2291293 100755
--- a/sr_port/cert_blk.h
+++ b/sr_port/cert_blk.h
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2003, 2010 Fidelity Information Services, Inc	*
+ * Copyright (c) 2003-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -13,13 +14,14 @@
 
 #define CERT_BLK_DEFINED
 
-int cert_blk(gd_region *reg, block_id blk, blk_hdr_ptr_t bp, block_id root, boolean_t gtmassert_on_error);
+int cert_blk(gd_region *reg, block_id blk, blk_hdr_ptr_t bp, block_id root,
+			boolean_t gtmassert_on_error, gv_namehead *gv_target);
 
 #define	CERT_BLK_IF_NEEDED(certify_all_blocks, gv_cur_region, cs, blk_ptr, gv_target)				\
 {														\
 	assert(gds_t_create != cs->mode); /* should have morphed into gds_t_acquired before getting here */	\
 	if (certify_all_blocks)											\
-	{	/* GTMASSERT on integ error */									\
+	{	/* assertpro on integ error */									\
 		/* If cs->mode is of type kill_t_create, then it would have been assigned an arbitrary block#	\
 		 * inside of the transaction which could match a real block # in the database at this point.	\
 		 * For example, it could be identical to the root block of the global in which case cert_blk	\
@@ -28,8 +30,9 @@ int cert_blk(gd_region *reg, block_id blk, blk_hdr_ptr_t bp, block_id root, bool
 		 */												\
 		cert_blk(gv_cur_region,										\
 			((kill_t_create != cs->mode) ? cs->blk : GDS_CREATE_BLK_MAX), (blk_hdr_ptr_t)blk_ptr,	\
-				dollar_tlevel ? ((NULL != cs->blk_target) ? cs->blk_target->root : 0)	\
-							: ((NULL != gv_target) ? gv_target->root : 0), TRUE);	\
+				dollar_tlevel ? ((NULL != cs->blk_target) ? cs->blk_target->root : 0)		\
+							: ((NULL != gv_target) ? gv_target->root : 0), TRUE,	\
+								gv_target);					\
 	}													\
 }
 
diff --git a/sr_port/cmd.c b/sr_port/cmd.c
old mode 100755
new mode 100644
index 0802dde..0d9b744
--- a/sr_port/cmd.c
+++ b/sr_port/cmd.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2014 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -48,7 +49,8 @@ error_def(ERR_PCONDEXPECTED);
 error_def(ERR_SPOREOL);
 
 int cmd(void)
-{	/* All the commands are listed here. Two pairs of entries in general.
+{	/* module driving parsing of commands */
+	/* All the commands are listed here. Two pairs of entries in general.
 	 * One for full command and one for short-hand notation.
 	 * For example, B and and BREAK.
 	 */
@@ -205,11 +207,11 @@ LITDEF struct
 		,{m_zwrite, 1, 1, ALL_SYS}, {m_zwrite, 1, 1, ALL_SYS}
 	};
 
-	triple		*temp_expr_start, *ref0, *ref1, *fetch0, *triptr;
+	boolean_t	sense, shifting;
 	char		*c;
 	int		rval, x;
 	oprtype		*cr;
-	boolean_t	shifting;
+	triple		*fetch0, *oldchain, *ref0, *ref1, *temp_expr_start, tmpchain, *triptr;
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
@@ -218,7 +220,7 @@ LITDEF struct
 		DECREMENT_EXPR_DEPTH;				/* in case of prior errors */
 	(TREF(side_effect_base))[0] = FALSE;
 	TREF(temp_subs) = FALSE;
-	CHKTCHAIN(TREF(curtchain));
+	CHKTCHAIN(TREF(curtchain), exorder, FALSE);
 	TREF(pos_in_chain) = *TREF(curtchain);
 	if (TREF(window_token) != TK_IDENT)
 	{
@@ -233,23 +235,24 @@ LITDEF struct
 		return FALSE;
 	}
 	if (0 > (x = namelook(cmd_index, cmd_names, c, (TREF(window_ident)).len)))
-	{
+	{	/* if there's a postconditional, use ZINVCMD to let us peal off any arguments and get to the rest of the line */
 		if ((TK_COLON != TREF(director_token)) || (0 > (x = namelook(cmd_index, cmd_names, "ZINVCMD", 7))))
 		{	/* the 2nd term of the above if should perform the assignment, but never be true - we're just paranoid */
 			stx_error(MAKE_MSG_TYPE(ERR_INVCMD, ERROR));	/* force INVCMD to an error so stx_error sees it as hard */
 			return FALSE;
 		}
-		stx_error(ERR_INVCMD);				/* the warning form so stx_error treats it as provisional */
+		stx_error(ERR_INVCMD);					/* use warning form so stx_error treats it as provisional */
 	}
 	if (!VALID_CMD(x) )
 	{
 	    	stx_error(ERR_CNOTONSYS);
 		return FALSE;
 	}
+	oldchain = NULL;
 	advancewindow();
 	if ((TK_COLON != TREF(window_token)) || !cmd_data[x].pcnd_ok)
 	{
-		assert((m_zinvcmd != cmd_data[x].fcn));
+		assert(m_zinvcmd != cmd_data[x].fcn);
 		cr = NULL;
 		shifting = FALSE;
 	} else
@@ -261,6 +264,20 @@ LITDEF struct
 			stx_error(ERR_PCONDEXPECTED);
 			return FALSE;
 		}
+		/* the next block could be simpler if done earlier, but doing it here picks up any Boolean optimizations  */
+		triptr = (TREF(curtchain))->exorder.bl;
+		while (OC_NOOP == triptr->opcode)
+			triptr = triptr->exorder.bl;
+		if (OC_LIT == triptr->opcode)
+		{
+			if (0 == triptr->operand[0].oprval.mlit->v.m[1])
+			{	/* it's FALSE, so no need for this parse - get ready to discard it */
+				dqinit(&tmpchain, exorder);
+				oldchain = setcurtchain(&tmpchain);
+			}
+			unuse_literal(&triptr->operand[0].oprval.mlit->v);
+			dqdel(triptr, exorder);				/* if it's TRUE, so just pretend it never appeared */
+		}
 		if (shifting = ((TREF(expr_start) != TREF(expr_start_orig)) && (OC_NOOP != (TREF(expr_start))->opcode)))
 		{	/* NOTE - assignent above */
 			temp_expr_start = TREF(expr_start);
@@ -289,6 +306,11 @@ LITDEF struct
 			}
 		}
 	}
+	if (NULL != oldchain)
+	{	/* for a literal 0 postconditional, we just throw the command & args away and return happiness */
+		setcurtchain(oldchain);
+		return TRUE;
+	}
 	if ((EXPR_FAIL != rval) && cr)
 	{
 		if (fetch0 != curr_fetch_trip)
@@ -298,7 +320,7 @@ LITDEF struct
 		} else
 		{
 			if (shifting)
-			{
+			{	/* the following appears to be a hack ensuring emit_code doesn't find any unmatched OC_GVRECTARG */
 				ref0 = newtriple(OC_JMP);
 				ref1 = newtriple(OC_GVRECTARG);
 				ref1->operand[0] = put_tref(temp_expr_start);
diff --git a/sr_port/cmd.h b/sr_port/cmd.h
index 519b243..174ae99 100755
--- a/sr_port/cmd.h
+++ b/sr_port/cmd.h
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2014 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -20,6 +21,7 @@ int m_else(void);
 int m_xecute(void);
 int m_for(void);
 int m_goto(void);
+int m_goto_postcond(triple *oldchain, triple *tmpchain);
 int m_halt(void);
 int m_hang(void);
 int m_hcmd(void);
diff --git a/sr_port/coerce.c b/sr_port/coerce.c
index 95000cc..0aaccc1 100755
--- a/sr_port/coerce.c
+++ b/sr_port/coerce.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2011 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -22,14 +23,15 @@ GBLREF hash_table_str	*complits_hashtab;
 LITREF octabstruct	oc_tab[];
 
 void coerce(oprtype *a,unsigned short new_type)
+/* ensure operand (*a) is of the desired type new_type */
 {
 
+	boolean_t	litdltd;
+	ht_ent_str	*litent;
 	mliteral 	*lit;
 	opctype		conv, old_op;
-	triple		*ref, *coerc;
 	stringkey	litkey;
-	ht_ent_str	*litent;
-	boolean_t	litdltd;
+	triple		*coerc, *ref;
 
 	assert (new_type == OCT_MVAL || new_type == OCT_MINT || new_type == OCT_BOOL);
 	assert (a->oprclass == TRIP_REF);
@@ -37,13 +39,19 @@ void coerce(oprtype *a,unsigned short new_type)
 	old_op = ref->opcode;
 	if (new_type & oc_tab[old_op].octype)
 		return;
-	if (old_op == OC_COMVAL || old_op == OC_COMINT)
+	if ((OC_COMVAL == old_op) || (OC_COMINT == old_op) || (OC_FORCENUM == old_op))
 	{
-		dqdel(ref,exorder);
-		ref = ref->operand[0].oprval.tref;
-		old_op = ref->opcode;
-		if (new_type & oc_tab[old_op].octype)
-			return;
+		assert(TRIP_REF == ref->operand[0].oprclass);
+		if ((OC_FORCENUM != old_op) || (OC_LIT == ref->operand[0].oprval.tref->opcode))
+		{	/* because compiler generated literals include their numeric form, we don't need to coerce */
+			assert(MV_NM & ref->operand[0].oprval.tref->operand[0].oprval.mlit->v.mvtype);
+			assert(ref->operand[0].oprval.tref == ref->exorder.bl);
+			dqdel(ref, exorder);
+			ref = ref->operand[0].oprval.tref;
+			old_op = ref->opcode;
+			if (new_type & oc_tab[old_op].octype)
+				return;
+		}
 	} else if (OC_LIT == old_op && OCT_MINT == new_type)
 	{
 		lit = ref->operand[0].oprval.mlit;
diff --git a/sr_port/collseq.h b/sr_port/collseq.h
index 3cfec12..33a3f99 100755
--- a/sr_port/collseq.h
+++ b/sr_port/collseq.h
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -18,6 +19,8 @@
 #define MIN_COLLTYPE	0
 #define XFORM	0
 #define XBACK	1
+#define	GTM_NULL_TEXT "GTM NULL COLL"
+#define STD_NULL_TEXT "STD NULL COLL"
 
 #define ALLOC_XFORM_BUFF(STR1LEN)									\
 {													\
diff --git a/sr_port/common_startup_init.c b/sr_port/common_startup_init.c
index d148733..13bb3fe 100644
--- a/sr_port/common_startup_init.c
+++ b/sr_port/common_startup_init.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2014-2015 Fidelity National Information	*
+ * Copyright (c) 2014-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -41,7 +41,9 @@ void	common_startup_init(enum gtmImageTypes img_type)
 	boolean_t		is_gtcm;
 	char			*dist;
 	int			len;
+	DCL_THREADGBL_ACCESS;
 
+	SETUP_THREADGBL_ACCESS;
 	/* First set the global variable image_type. */
 	image_type = img_type;
 	/* Get the process ID. */
@@ -80,16 +82,20 @@ void	common_startup_init(enum gtmImageTypes img_type)
 	if (is_gtcm || (GTM_IMAGE == img_type))
 	{
 		is_replicator = TRUE; /* can go through t_end() and write jnl records to the jnlpool for replicated db */
+		TREF(ok_to_see_statsdb_regs) = TRUE;
 		run_time = TRUE;
 	} else if (DSE_IMAGE == img_type)
 	{
 		dse_running = TRUE;
 		write_after_image = TRUE; /* if block change is done, after image of the block needs to be written */
-	}
-#	ifdef UNIX
-	else if (MUPIP_IMAGE == img_type)
+		TREF(ok_to_see_statsdb_regs) = TRUE;
+	} else if (MUPIP_IMAGE == img_type)
+	{
 		run_time = FALSE;
-#	endif
+		TREF(ok_to_see_statsdb_regs) = FALSE;	/* In general, MUPIP commands should not even see the statsdb regions.
+							 * Specific MUPIP commands will override this later.
+							 */
+	}
 	return;
 }
 
diff --git a/sr_port/common_startup_init.h b/sr_port/common_startup_init.h
index 389d24b..aa6292b 100644
--- a/sr_port/common_startup_init.h
+++ b/sr_port/common_startup_init.h
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2014 Fidelity Information Services, Inc	*
+ * Copyright (c) 2014-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -14,4 +15,44 @@
 
 void	common_startup_init(enum gtmImageTypes img_type);
 
+#if (defined(DEBUG) || defined(TIMER_DEBUGGING))
+#	include "jnl_file_close_timer.h"
+GBLREF void		(*jnl_file_close_timer_ptr)(void);
+#	define	INIT_JNL_FILE_CLOSE_TIMER_FNPTR	jnl_file_close_timer_ptr = &jnl_file_close_timer
+#else
+#	define	INIT_JNL_FILE_CLOSE_TIMER_FNPTR
+#endif
+
+#ifdef TIMER_DEBUGGING
+#	include "fake_enospc.h"
+#	include "gt_timer.h"
+GBLREF void		(*fake_enospc_ptr)(void);
+GBLREF void		(*simple_timeout_timer_ptr)(TID tid, int4 hd_len, boolean_t **timedout);
+#	define	INIT_FAKE_ENOSPC_FNPTR		fake_enospc_ptr = &fake_enospc
+#	define	INIT_SIMPLE_TIMEOUT_TIMER_FNPTR	simple_timeout_timer_ptr = &simple_timeout_timer
+#else
+#	define	INIT_FAKE_ENOSPC_FNPTR
+#	define	INIT_SIMPLE_TIMEOUT_TIMER_FNPTR
+#endif
+
+#ifdef DEBUG
+#	include "error.h"
+GBLREF ch_ret_type	(*t_ch_fnptr)();		/* Function pointer to t_ch */
+GBLREF ch_ret_type	(*dbinit_ch_fnptr)();		/* Function pointer to dbinit_ch */
+#	define	INIT_DBINIT_CH_FNPTR		dbinit_ch_fnptr = &dbinit_ch
+#	define	INIT_T_CH_FNPTR			t_ch_fnptr = &t_ch
+#else
+#	define	INIT_DBINIT_CH_FNPTR
+#	define	INIT_T_CH_FNPTR
+#endif
+
+#define	INIT_FNPTR_GLOBAL_VARIABLES			\
+MBSTART {						\
+	INIT_JNL_FILE_CLOSE_TIMER_FNPTR;		\
+	INIT_FAKE_ENOSPC_FNPTR;				\
+	INIT_SIMPLE_TIMEOUT_TIMER_FNPTR;		\
+	INIT_DBINIT_CH_FNPTR;				\
+	INIT_T_CH_FNPTR;				\
+} MBEND
+
 #endif
diff --git a/sr_port/comp_fini.c b/sr_port/comp_fini.c
index 724afde..23800ed 100644
--- a/sr_port/comp_fini.c
+++ b/sr_port/comp_fini.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2014 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -30,7 +31,6 @@
 GBLREF spdesc		stringpool, rts_stringpool, indr_stringpool;
 GBLREF int		source_column;
 GBLREF char		cg_phase;
-GBLREF unsigned char	*source_buffer;
 
 error_def(ERR_INDEXTRACHARS);
 error_def(ERR_INDRCOMPFAIL);
diff --git a/sr_port/comp_init.c b/sr_port/comp_init.c
index ca0d96a..e265f71 100644
--- a/sr_port/comp_init.c
+++ b/sr_port/comp_init.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information 	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -27,12 +27,11 @@
  *	(indr_stringpool).  comp_fini changes it back from indr_stringpool to
  *	rts_stringpool when the compilation is finished.
  */
-GBLREF spdesc stringpool,rts_stringpool;
-GBLREF spdesc indr_stringpool;
-GBLREF unsigned char *source_buffer;
-GBLREF int4 curr_fetch_count;
-GBLREF triple *curr_fetch_trip;
-GBLREF char cg_phase;
+GBLREF char	cg_phase;
+GBLREF int4	aligned_source_buffer, curr_fetch_count;
+GBLREF spdesc	stringpool,rts_stringpool;
+GBLREF spdesc	indr_stringpool;
+GBLREF triple	*curr_fetch_trip;
 
 error_def(ERR_INDRMAXLEN);
 
@@ -41,10 +40,11 @@ void comp_init(mstr *src, oprtype *dst)
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
-	if ((unsigned)src->len >= TREF(max_advancewindow_line))
-		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(3) ERR_INDRMAXLEN, 1, TREF(max_advancewindow_line));
-	memcpy(source_buffer,src->addr,src->len);
-	source_buffer[src->len + 1] = source_buffer[src->len] = 0;
+	if ((MAX_SRCLINE <= (unsigned)src->len) && ((TREF(source_buffer)).addr == (char *)&aligned_source_buffer))
+		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(3) ERR_INDRMAXLEN, 1, MAX_SRCLINE);	/* no error if it's ojchildparms */
+	memcpy((TREF(source_buffer)).addr,src->addr,src->len);
+	(TREF(source_buffer)).len = src->len + 1;
+	*((TREF(source_buffer)).addr + src->len) = *((TREF(source_buffer)).addr + src->len + 1) = '\0';
 	TREF(compile_time) = TRUE;
 	TREF(transform) = FALSE;
 	cg_phase = CGP_PARSE;
diff --git a/sr_port/compile_pattern.c b/sr_port/compile_pattern.c
index de684f9..a875545 100755
--- a/sr_port/compile_pattern.c
+++ b/sr_port/compile_pattern.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -23,7 +23,6 @@
 #include "fullbool.h"
 
 GBLREF spdesc		stringpool;
-GBLREF unsigned char	*source_buffer;
 GBLREF int		source_column;
 
 int compile_pattern(oprtype *opr, boolean_t is_indirect)
@@ -60,10 +59,10 @@ int compile_pattern(oprtype *opr, boolean_t is_indirect)
 		return TRUE;
 	} else
 	{
-		instr.addr = (char *)&source_buffer[source_column - 1];
+		instr.addr = ((TREF(source_buffer)).addr + source_column - 1);
 		instr.len = STRLEN(instr.addr);
 		status = patstr(&instr, &retstr, NULL);
-		TREF(last_source_column) = (short int)(instr.addr - (char *)source_buffer);
+		TREF(last_source_column) = (short int)(instr.addr - (TREF(source_buffer)).addr);
 		assert(TREF(last_source_column));
 		if (status)
 		{	/* status == syntax error when non-zero */
diff --git a/sr_port/compiler.h b/sr_port/compiler.h
index 2a4aa20..4ccbb2f 100755
--- a/sr_port/compiler.h
+++ b/sr_port/compiler.h
@@ -88,6 +88,7 @@ typedef struct	mliteralstruct
 					*bl;
 	}			que;
 	INTPTR_T       		rt_addr;
+	int			reference_count;	/* Used in the hash table to track references */
 	mval			v;
 } mliteral;
 
@@ -152,7 +153,7 @@ typedef struct	tripletype
 
 typedef struct
 {
-	unsigned short		octype;
+	uint4		octype;
 } octabstruct;
 
 /* Values for octype */
@@ -167,6 +168,10 @@ typedef struct
 #define OCT_EXPRLEAF	64
 #define OCT_CGSKIP	128
 #define OCT_COERCE	256
+#define OCT_ARITH	512
+#define OCT_UNARY	1024
+#define OCT_NEGATED	2048
+#define OCT_REL	4096
 
 typedef struct
 {
@@ -529,6 +534,31 @@ typedef struct
 	UNICODE_ONLY((mvalptr)->utfcgr_indx = 0xff);	\
 }
 
+/* Macro to put a literal truth value as an operand */
+#define PUT_LITERAL_TRUTH(TV, TRIP_REF)									\
+MBSTART {												\
+	LITREF mval		literal_zero, literal_one;						\
+													\
+	mval	*V;											\
+													\
+	V = (mval *)mcalloc(SIZEOF(mval));								\
+	*V = (TV) ? literal_one : literal_zero;								\
+	assert((1 == literal_one.str.len) && (1 == literal_zero.str.len));				\
+	ENSURE_STP_FREE_SPACE(1);									\
+	*(char *)stringpool.free = *V->str.addr;							\
+	V->str.addr = (char *)stringpool.free;								\
+	stringpool.free += 1;										\
+	put_lit_s(V, TRIP_REF);										\
+} MBEND
+
+/* Macro to decide whether an invocation of unary tail has any promise */
+#define UNARY_TAIL(OPR)											\
+MBSTART {												\
+	assert(TRIP_REF == (OPR)->oprclass);								\
+	if (OCT_UNARY & oc_tab[(OPR)->oprval.tref->opcode].octype)					\
+		unary_tail(OPR);									\
+} MBEND
+
 /* Autorelink enabled platforms pass a different argument to glue code when calling a non-local M
  * routine. Use put_cdlt() to pass addresses of the items and use put_cdidx() when passing an ofset
  * into the linkage table where the items reside. Also macroize the opcode to use.
@@ -544,7 +574,8 @@ typedef struct
 #endif
 
 int		actuallist(oprtype *opr);
-int		bool_expr(boolean_t op, oprtype *addr);
+int		bool_expr(boolean_t sense, oprtype *addr);
+void		bx_boollit(triple *t, boolean_t sense, oprtype *addr);
 void		bx_boolop(triple *t, boolean_t jmp_type_one, boolean_t jmp_to_next, boolean_t sense, oprtype *addr);
 void		bx_relop(triple *t, opctype cmp, opctype tst, oprtype *addr);
 void		bx_tail(triple *t, boolean_t sense, oprtype *addr);
@@ -600,8 +631,10 @@ int		f_two_mstrs(oprtype *a, opctype op);
 int		f_two_mval(oprtype *a, opctype op);
 int		f_view(oprtype *a, opctype op);
 int		f_zahandle(oprtype *a, opctype op);
+int		f_zatransform(oprtype *a, opctype op);
 int		f_zcall(oprtype *a, opctype op);
 int		f_zchar(oprtype *a, opctype op);
+int		f_zcollate(oprtype *a, opctype op);
 int		f_zconvert(oprtype *a, opctype op);
 int		f_zdate(oprtype *a, opctype op);
 int		f_zdebug(oprtype *a, opctype op);
@@ -662,9 +695,11 @@ oprtype		put_str(char *pt, mstr_len_t n);
 oprtype		put_tjmp(triple *x);
 oprtype		put_tnxt(triple *x);
 oprtype		put_tref(triple *x);
+boolean_t	resolve_optimize(triple *curtrip);
 int		resolve_ref(int errknt);
 void		resolve_tref(triple *, oprtype *);
 triple		*setcurtchain(triple *x);
+void		unary_tail(oprtype *opr);
 /* VMS uses same code generator as USHBIN so treat as USHBIN for these compiler routines */
 #		if defined(USHBIN_SUPPORTED) || defined(VMS)
 void		shrink_trips(void);
@@ -676,6 +711,7 @@ void		start_fetches(opctype op);
 void		start_for_fetches(void);
 void		tnxtarg(oprtype *a);
 void		tripinit(void);
+boolean_t	unuse_literal(mval *x);
 void		walktree(mvar *n,void (*f)(),char *arg);
 void		wrtcatopt(triple *r, triple ***lpx, triple **lptop);
 int		zlcompile(unsigned char len, unsigned char *addr);		/***type int added***/
diff --git a/sr_port/compiler_startup.c b/sr_port/compiler_startup.c
index 28d7094..ea5abdf 100644
--- a/sr_port/compiler_startup.c
+++ b/sr_port/compiler_startup.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -38,7 +38,6 @@ GBLREF short int source_line;
 GBLREF int	source_column;
 
 GBLREF unsigned char		source_file_name[];
-GBLREF unsigned char 		*source_buffer;
 GBLREF src_line_struct 		src_head;
 GBLREF triple			t_orig, *curr_fetch_trip, *curr_fetch_opr;
 GBLREF int4			curr_fetch_count;
@@ -119,23 +118,23 @@ boolean_t compiler_startup(void)
 	{
 		if (-1 == (n = read_source_file()))
 			break;
-		rtn_src_chksum_line(&checksum_ctx, source_buffer, n);
+		rtn_src_chksum_line(&checksum_ctx, (TREF(source_buffer)).addr, n);
 		/* Save the source lines; a check later determines whether to include them in the object file */
 		/* Accumulate list of M source lines */
 		sl = (src_line_struct *)mcalloc(SIZEOF(src_line_struct));
 		dqrins(&src_head, que, sl);
-		sl->str.addr = mcalloc(n + 1);	/* +1 for zero termination */
+		sl->str.addr = mcalloc(n + 1);		/* +1 for zero termination */
 		sl->str.len = n;
 		sl->line = source_line;
-		memcpy(sl->str.addr, source_buffer, n + 1);
+		memcpy(sl->str.addr, (TREF(source_buffer)).addr, n + 1);
 		total_source_len += n;
+		cp = (unsigned char *)((TREF(source_buffer)).addr + n - 1);
+		NEWLINE_TO_NULL(*cp); /* avoid SPOREOL errors due to trailing newlines */
 		if (need_source_lines && creating_list_file && !(cmd_qlf.qlf & CQ_MACHINE_CODE))
 		{	/* list now. for machine_code we intersperse machine code and M code, thus can't list M code yet */
-			NEWLINE_TO_NULL(source_buffer[n - 1]);
 			list_line_number();
-			list_line((char *)source_buffer);
+			list_line((TREF(source_buffer)).addr);
 		}
-		NEWLINE_TO_NULL(source_buffer[n - 1]); /* compiler doesn't like trailing newlines (gives SPOREOL errors) */
 		TREF(source_error_found) = 0;
 		lb_init();
 		if (cmd_qlf.qlf & CQ_CE_PREPROCESS)
diff --git a/sr_port/cre_jnl_file.c b/sr_port/cre_jnl_file.c
index be169f6..1fdb66e 100755
--- a/sr_port/cre_jnl_file.c
+++ b/sr_port/cre_jnl_file.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2003-2016 Fidelity National Information	*
+ * Copyright (c) 2003-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -89,10 +89,10 @@ GBLREF	boolean_t		mupip_jnl_recover;
 GBLREF	jnl_process_vector	*prc_vec;
 
 ZOS_ONLY(error_def(ERR_BADTAG);)
+error_def(ERR_FILENAMETOOLONG);
 error_def(ERR_FILERENAME);
 error_def(ERR_JNLCRESTATUS);
 error_def(ERR_JNLFNF);
-error_def(ERR_PERMGENFAIL);
 error_def(ERR_PREMATEOF);
 error_def(ERR_RENAMEFAIL);
 error_def(ERR_TEXT);
@@ -105,13 +105,14 @@ uint4	cre_jnl_file(jnl_create_info *info)
 {
 	mstr 		filestr;
 	int 		org_fn_len, rename_fn_len, fstat;
-	char		*org_fn, rename_fn[MAX_FN_LEN];
+	char		*org_fn, rename_fn[MAX_FN_LEN + 1];
 	boolean_t	no_rename;
 
 	assert(0 != jgbl.gbl_jrec_time);
 	if (!info->no_rename)	/* ***MAYBE*** rename is required */
 	{
 		no_rename = FALSE;
+		rename_fn_len = ARRAYSIZE(rename_fn);
 		if (SS_NORMAL != (info->status = prepare_unique_name((char *)info->jnl, info->jnl_len, "", "",
 				rename_fn, &rename_fn_len, jgbl.gbl_jrec_time, &info->status2)))
 		{
@@ -144,6 +145,11 @@ uint4	cre_jnl_file(jnl_create_info *info)
 		if (no_rename)
 		{
 			STATUS_MSG(info);
+			if (ERR_FILENAMETOOLONG == info->status)
+				return EXIT_ERR;
+			/* Else it is an error from "gtm_file_stat" (invoked from "prepare_unique_name" above).
+			 * It usually means the rename we originally wanted is no longer required. So continue.
+			 */
 			info->status = info->status2 = SS_NORMAL;
 			info->no_rename = TRUE; /* We wanted to rename, but not required anymore */
 			info->no_prev_link = TRUE;	/* No rename => no prev_link */
@@ -161,7 +167,7 @@ uint4 cre_jnl_file_common(jnl_create_info *info, char *rename_fn, int rename_fn_
 	struct_jrec_pini	*pini_record;
 	struct_jrec_epoch	*epoch_record;
 	struct_jrec_eof		*eof_record;
-	unsigned char		*create_fn, fn_buff[MAX_FN_LEN];
+	unsigned char		*create_fn, fn_buff[MAX_FN_LEN + STR_LIT_LEN(EXT_NEW) + 1];
 	int			create_fn_len, cre_jnl_rec_size, status, write_size, jrecbufbase_size;
 	fd_type			channel;
 	char            	*jrecbuf, *jrecbuf_base;
@@ -174,6 +180,7 @@ uint4 cre_jnl_file_common(jnl_create_info *info, char *rename_fn, int rename_fn_
 	int			group_id;
 	struct stat		sb;
 	int			perm;
+	struct perm_diag_data	pdd;
 	int			idx;
 	trans_num		db_tn;
 	uint4			temp_offset, temp_checksum, pfin_offset, eof_offset;
@@ -199,6 +206,7 @@ uint4 cre_jnl_file_common(jnl_create_info *info, char *rename_fn, int rename_fn_
 		if (NULL != csa)
 			cre_jnl_file_intrpt_rename(csa);	/* deal with *_new.mjl files */
 		create_fn = &fn_buff[0];
+		create_fn_len = ARRAYSIZE(fn_buff);
 		if (SS_NORMAL != (info->status = prepare_unique_name((char *)info->jnl, (int)info->jnl_len, "", EXT_NEW,
 								     (char *)create_fn, &create_fn_len, 0, &info->status2)))
 		{
@@ -235,7 +243,22 @@ uint4 cre_jnl_file_common(jnl_create_info *info, char *rename_fn, int rename_fn_
 		return EXIT_ERR;
 	}
 	/* Setup new group and permissions if indicated by the security rules */
-	gtm_permissions(&sb, &user_id, &group_id, &perm, PERM_FILE);
+	if (!gtm_permissions(&sb, &user_id, &group_id, &perm, PERM_FILE, &pdd))
+	{
+		send_msg_csa(CSA_ARG(info->csa) VARLSTCNT(6+PERMGENDIAG_ARG_COUNT)
+			ERR_PERMGENFAIL, 4, RTS_ERROR_STRING("journal file"), RTS_ERROR_STRING(info->fn),
+			PERMGENDIAG_ARGS(pdd));
+		if (IS_GTM_IMAGE)
+			rts_error_csa(CSA_ARG(info->csa) VARLSTCNT(6+PERMGENDIAG_ARG_COUNT)
+				ERR_PERMGENFAIL, 4, RTS_ERROR_STRING("journal file"), RTS_ERROR_STRING(info->fn),
+				PERMGENDIAG_ARGS(pdd));
+		else
+			gtm_putmsg_csa(CSA_ARG(info->csa) VARLSTCNT(6+PERMGENDIAG_ARG_COUNT)
+				ERR_PERMGENFAIL, 4, RTS_ERROR_STRING("journal file"), RTS_ERROR_STRING(info->fn),
+				PERMGENDIAG_ARGS(pdd));
+		F_CLOSE(channel, status);
+		return EXIT_ERR;
+	}
 	/* if group not the same then change group of temporary file */
 	if ((((INVALID_UID != user_id) && (user_id != stat_buf.st_uid))
 			|| ((INVALID_GID != group_id) && (group_id != stat_buf.st_gid)))
@@ -302,46 +325,36 @@ uint4 cre_jnl_file_common(jnl_create_info *info, char *rename_fn, int rename_fn_
 	temp_offset = JNL_HDR_LEN;
 	ADJUST_CHECKSUM(temp_checksum, temp_offset, temp_checksum);
 	ADJUST_CHECKSUM(temp_checksum, info->checksum, pini_record->prefix.checksum);
-	/* EPOCHs are written unconditionally in Unix */
-	if (JNL_HAS_EPOCH(info))
-	{
-		epoch_record = (struct_jrec_epoch *)&jrecbuf[PINI_RECLEN];
-		epoch_record->prefix.jrec_type = JRT_EPOCH;
-		epoch_record->prefix.forwptr = epoch_record->suffix.backptr = EPOCH_RECLEN;
-		epoch_record->prefix.tn = db_tn;
-		epoch_record->prefix.pini_addr = JNL_HDR_LEN;
-		epoch_record->prefix.time = jgbl.gbl_jrec_time;
-		epoch_record->blks_to_upgrd = info->blks_to_upgrd;
-		epoch_record->free_blocks   = info->free_blocks;
-		epoch_record->total_blks    = info->total_blks;
-		epoch_record->fully_upgraded = info->csd->fully_upgraded;
-		epoch_record->suffix.suffix_code = JNL_REC_SUFFIX_CODE;
-		epoch_record->jnl_seqno = info->reg_seqno;
-		for (idx = 0; idx < MAX_SUPPL_STRMS; idx++)
-			epoch_record->strm_seqno[idx] = info->csd->strm_reg_seqno[idx];
-		if (jgbl.forw_phase_recovery)
-		{	/* If MUPIP JOURNAL -ROLLBACK, might need some adjustment. See macro definition for comments */
-			MUR_ADJUST_STRM_REG_SEQNO_IF_NEEDED(info->csd, epoch_record->strm_seqno);
-		}
-		epoch_record->filler = 0;
-		epoch_record->prefix.checksum = INIT_CHECKSUM_SEED;
-		temp_checksum = compute_checksum(INIT_CHECKSUM_SEED, (unsigned char *)epoch_record, SIZEOF(struct_jrec_epoch));
-		temp_offset = JNL_HDR_LEN + PINI_RECLEN;
-		ADJUST_CHECKSUM(temp_checksum, temp_offset, temp_checksum);
-		ADJUST_CHECKSUM(temp_checksum, info->checksum, epoch_record->prefix.checksum);
-		pfin_record = (struct_jrec_pfin *)&jrecbuf[PINI_RECLEN + EPOCH_RECLEN];
-		pfin_offset = JNL_HDR_LEN + PINI_RECLEN + EPOCH_RECLEN;
-		eof_record = (struct_jrec_eof *)&jrecbuf[PINI_RECLEN + EPOCH_RECLEN + PFIN_RECLEN];
-		eof_offset = JNL_HDR_LEN + PINI_RECLEN + EPOCH_RECLEN + PFIN_RECLEN;
-		cre_jnl_rec_size = PINI_RECLEN + EPOCH_RECLEN + PFIN_RECLEN + EOF_RECLEN;
-	} else
-	{
-		pfin_record = (struct_jrec_pfin *)&jrecbuf[PINI_RECLEN];
-		pfin_offset = JNL_HDR_LEN + PINI_RECLEN;
-		eof_record = (struct_jrec_eof *)&jrecbuf[PINI_RECLEN + PFIN_RECLEN];
-		eof_offset = JNL_HDR_LEN + PINI_RECLEN + PFIN_RECLEN;
-		cre_jnl_rec_size = PINI_RECLEN + PFIN_RECLEN + EOF_RECLEN;
+	/* EPOCHs are written unconditionally even for NOBEFORE_IMAGE journaling */
+	epoch_record = (struct_jrec_epoch *)&jrecbuf[PINI_RECLEN];
+	epoch_record->prefix.jrec_type = JRT_EPOCH;
+	epoch_record->prefix.forwptr = epoch_record->suffix.backptr = EPOCH_RECLEN;
+	epoch_record->prefix.tn = db_tn;
+	epoch_record->prefix.pini_addr = JNL_HDR_LEN;
+	epoch_record->prefix.time = jgbl.gbl_jrec_time;
+	epoch_record->blks_to_upgrd = info->blks_to_upgrd;
+	epoch_record->free_blocks   = info->free_blocks;
+	epoch_record->total_blks    = info->total_blks;
+	epoch_record->fully_upgraded = info->csd->fully_upgraded;
+	epoch_record->suffix.suffix_code = JNL_REC_SUFFIX_CODE;
+	epoch_record->jnl_seqno = info->reg_seqno;
+	for (idx = 0; idx < MAX_SUPPL_STRMS; idx++)
+		epoch_record->strm_seqno[idx] = info->csd->strm_reg_seqno[idx];
+	if (jgbl.forw_phase_recovery)
+	{	/* If MUPIP JOURNAL -ROLLBACK, might need some adjustment. See macro definition for comments */
+		MUR_ADJUST_STRM_REG_SEQNO_IF_NEEDED(info->csd, epoch_record->strm_seqno);
 	}
+	epoch_record->filler = 0;
+	epoch_record->prefix.checksum = INIT_CHECKSUM_SEED;
+	temp_checksum = compute_checksum(INIT_CHECKSUM_SEED, (unsigned char *)epoch_record, SIZEOF(struct_jrec_epoch));
+	temp_offset = JNL_HDR_LEN + PINI_RECLEN;
+	ADJUST_CHECKSUM(temp_checksum, temp_offset, temp_checksum);
+	ADJUST_CHECKSUM(temp_checksum, info->checksum, epoch_record->prefix.checksum);
+	pfin_record = (struct_jrec_pfin *)&jrecbuf[PINI_RECLEN + EPOCH_RECLEN];
+	pfin_offset = JNL_HDR_LEN + PINI_RECLEN + EPOCH_RECLEN;
+	eof_record = (struct_jrec_eof *)&jrecbuf[PINI_RECLEN + EPOCH_RECLEN + PFIN_RECLEN];
+	eof_offset = JNL_HDR_LEN + PINI_RECLEN + EPOCH_RECLEN + PFIN_RECLEN;
+	cre_jnl_rec_size = PINI_RECLEN + EPOCH_RECLEN + PFIN_RECLEN + EOF_RECLEN;
 	pfin_record->prefix.jrec_type = JRT_PFIN;
 	pfin_record->prefix.forwptr = pfin_record->suffix.backptr = PFIN_RECLEN;
 	pfin_record->prefix.tn = db_tn;
@@ -384,7 +397,7 @@ uint4 cre_jnl_file_common(jnl_create_info *info, char *rename_fn, int rename_fn_
 	JNL_DO_FILE_WRITE(csa, create_fn, channel, JNL_HDR_LEN, jrecbuf, write_size, info->status, info->status2);
 	STATUS_MSG(info);
 	RETURN_ON_ERROR(info);
-	UNIX_ONLY(GTM_JNL_FSYNC(csa, channel, status);)
+	GTM_JNL_FSYNC(csa, channel, status);
 	F_CLOSE(channel, status);	/* resets "channel" to FD_INVALID */
 	/* Now that EOF record has been written, keep csa->jnl->jnl_buff->prev_jrec_time up to date.
 	 * One exception is if journaling is not yet turned on but is being turned on by the current caller.
@@ -443,13 +456,13 @@ uint4 cre_jnl_file_common(jnl_create_info *info, char *rename_fn, int rename_fn_
 	else
 		gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT (6) ERR_FILERENAME, 4, info->jnl_len, info->jnl, rename_fn_len,
 				rename_fn);
-#		ifdef DEBUG
-		if (gtm_white_box_test_case_enabled && (WBTEST_JNL_CREATE_INTERRUPT == gtm_white_box_test_case_number))
-		{
-			UNIX_ONLY(DBGFPF((stderr, "CRE_JNL_FILE: started a wait\n")));	/* this white-box test is for UNIX */
-			LONG_SLEEP(600);
-			assert(FALSE); /* Should be killed before that */
-		}
-#		endif
+#	ifdef DEBUG
+	if (gtm_white_box_test_case_enabled && (WBTEST_JNL_CREATE_INTERRUPT == gtm_white_box_test_case_number))
+	{
+		DBGFPF((stderr, "CRE_JNL_FILE: started a wait\n"));
+		LONG_SLEEP(600);
+		assert(FALSE); /* Should be killed before that */
+	}
+#	endif
 	return EXIT_NRM;
 }
diff --git a/sr_port/cre_jnl_file_intrpt_rename.c b/sr_port/cre_jnl_file_intrpt_rename.c
index 2bc736b..836f48b 100755
--- a/sr_port/cre_jnl_file_intrpt_rename.c
+++ b/sr_port/cre_jnl_file_intrpt_rename.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2003, 2014 Fidelity Information Services, Inc	*
+ * Copyright (c) 2003-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -41,20 +42,24 @@ void cre_jnl_file_intrpt_rename(sgmnt_addrs *csa)
 	mstr 		filestr;
 	int		status1, status2, ext_new_jnl_fn_len;
 	uint4		status, ustatus;
-	unsigned char	ext_new_jnl_fn[MAX_FN_LEN];
+	unsigned char	ext_new_jnl_fn[MAX_FN_LEN + STR_LIT_LEN(EXT_NEW) + 1];
 
 	assert(csa);
-	UNIX_ONLY(assert(csa->hdr));		/* csa->hdr may not be set, e.g. on VMS for MUPIP SET /JOURNAL */
+	assert(csa->hdr);
 	/* We need either crit or standalone to ensure that there are no concurrent switch attempts. */
-	UNIX_ONLY(assert(csa->now_crit || (gv_cur_region && FILE_INFO(gv_cur_region)->grabbed_access_sem)));
+	assert(csa->now_crit || (gv_cur_region && FILE_INFO(gv_cur_region)->grabbed_access_sem));
 	if (!csa->hdr)
 		return;
 	fn = csa->hdr->jnl_file_name;
 	fn_len = csa->hdr->jnl_file_len;
 	filestr.addr = (char *)fn;
 	filestr.len = fn_len;
-	prepare_unique_name((char *)fn, fn_len, "", EXT_NEW, (char *)ext_new_jnl_fn, &ext_new_jnl_fn_len, 0, &ustatus);
-	assert(SS_NORMAL == ustatus);
+	ext_new_jnl_fn_len = ARRAYSIZE(ext_new_jnl_fn);
+	status = prepare_unique_name((char *)fn, fn_len, "", EXT_NEW, (char *)ext_new_jnl_fn, &ext_new_jnl_fn_len, 0, &ustatus);
+	/* We have allocated enough space in ext_new_jnl_fn array to store EXT_NEW suffix.
+	 * So no way the above "prepare_unique_name" call can fail. Hence the below assert.
+	 */
+	assert(SS_NORMAL == status);
 	status1 = gtm_file_stat(&filestr, NULL, NULL, FALSE, &ustatus);
 	if (FILE_STAT_ERROR == status1)
 	{
@@ -83,18 +88,11 @@ void cre_jnl_file_intrpt_rename(sgmnt_addrs *csa)
 			if (SYSCALL_ERROR(status))
 			{
 				if (IS_GTM_IMAGE)
-				{
-					VMS_ONLY(send_msg_csa(CSA_ARG(csa) VARLSTCNT(8) ERR_RENAMEFAIL, 4, filestr.len,
-								filestr.addr, fn_len, fn, status, ustatus));
-					UNIX_ONLY(send_msg_csa(CSA_ARG(csa) VARLSTCNT(7) ERR_RENAMEFAIL, 4, filestr.len,
-								filestr.addr, fn_len, fn, status));
-				} else
-				{
-					VMS_ONLY(gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(8) ERR_RENAMEFAIL, 4, filestr.len,
-									filestr.addr, fn_len, fn, status, ustatus));
-					UNIX_ONLY(gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(7) ERR_RENAMEFAIL, 4, filestr.len,
-									filestr.addr, fn_len, fn, status));
-				}
+					send_msg_csa(CSA_ARG(csa) VARLSTCNT(7) ERR_RENAMEFAIL, 4, filestr.len,
+								filestr.addr, fn_len, fn, status);
+				else
+					gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(7) ERR_RENAMEFAIL, 4, filestr.len,
+									filestr.addr, fn_len, fn, status);
 			} else
 			{
 				if (IS_GTM_IMAGE)
@@ -113,18 +111,11 @@ void cre_jnl_file_intrpt_rename(sgmnt_addrs *csa)
 			if (SYSCALL_ERROR(status))
 			{
 				if (IS_GTM_IMAGE)
-				{
-					VMS_ONLY(send_msg_csa(CSA_ARG(csa) VARLSTCNT(6) ERR_FILEDELFAIL, 2, filestr.len,
-							filestr.addr, status, ustatus));
-					UNIX_ONLY(send_msg_csa(CSA_ARG(csa) VARLSTCNT(5) ERR_FILEDELFAIL, 2, filestr.len,
-							filestr.addr, status));
-				} else
-				{
-					VMS_ONLY(gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(6) ERR_FILEDELFAIL, 2, filestr.len,
-								filestr.addr, status, ustatus));
-					UNIX_ONLY(gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(5) ERR_FILEDELFAIL, 2, filestr.len,
-								filestr.addr, status));
-				}
+					send_msg_csa(CSA_ARG(csa) VARLSTCNT(5) ERR_FILEDELFAIL, 2, filestr.len,
+							filestr.addr, status);
+				else
+					gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(5) ERR_FILEDELFAIL, 2, filestr.len,
+								filestr.addr, status);
 			} else
 			{
 				if (IS_GTM_IMAGE)
diff --git a/sr_port/create_dummy_gbldir.c b/sr_port/create_dummy_gbldir.c
index 7339081..254223d 100755
--- a/sr_port/create_dummy_gbldir.c
+++ b/sr_port/create_dummy_gbldir.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -12,6 +13,7 @@
 #include "mdef.h"
 
 #include <errno.h>
+
 #include "gtm_string.h"
 #include "gtm_stdio.h"
 #include "gtm_fcntl.h"
@@ -28,34 +30,90 @@
 #include "gbldirnam.h"
 #include "hashtab_mname.h"
 #include "hashtab.h"
+#include "dpgbldir.h"
+
+#define	DUMMY_GLD_ADD_MAP(MAP, MAPKEY_PTR, REG, WHICH_MAP)					\
+MBSTART {											\
+	MAP->gvkey.addr = MAPKEY_PTR;								\
+	MEMCPY_LIT(MAPKEY_PTR, WHICH_MAP);							\
+	MAP->reg.addr = REG;									\
+	MAP->gvname_len = DUMMY_GBLDIR_MAP_GVN_SIZE(WHICH_MAP);					\
+	MAP->gvkey_len =  DUMMY_GBLDIR_MAP_KEY_SIZE(WHICH_MAP) - 1;				\
+	MAPKEY_PTR += MAP->gvkey_len;								\
+	MAP++;											\
+} MBEND
 
-static gdr_name	*gdr_name_head;
+#define	GLD_REG_INIT(REG, RNAME, ADDR)		\
+MBSTART {					\
+	REG->rname_len = STR_LIT_LEN(RNAME);	\
+	MEMCPY_LIT(REG->rname, RNAME);		\
+	REG->owning_gd = ADDR;			\
+} MBEND
 
+/* C function to create a dummy gld structure in memory. This code is very similar to M code in GDE
+ * so the two need to be maintained in parallel. Currently the only caller of this function is "mu_gv_cur_reg_init"
+ * and so the below code is simplified to work only with that caller. As more callers need this functionality, the
+ * below code can be enhanced to be more generalized.
+ */
 gd_addr *create_dummy_gbldir(void)
 {
-	header_struct	*header;
 	gd_addr		*addr;
-	gdr_name	*name;
-	gd_region	*region;
-	gd_region	*region_top;
-	gd_segment	*segment;
-	uint4		size;
-
-	DUMMY_GLD_INIT(header, addr, region, segment, size, RELATIVE_OFFSET_FALSE);
-		/* the above macro invocation initializes "header", "addr", "region", "segment" and "size" */
+	gd_region	*basedb_reg, *statsdb_reg;
+	gd_segment	*basedb_seg, *statsdb_seg;
+	gd_binding	*map;
+	char		*mapkey_ptr;
+#	ifdef DEBUG
+	gd_binding	*map_top;
+#	endif
+
+	/* The below code might need corresponding changes if ever the gld format changes hence the GDE_LABEL_LITERAL assert */
+	GTM64_ONLY(assert(!MEMCMP_LIT(GDE_LABEL_LITERAL, "GTCGBDUNX111"));)
+	NON_GTM64_ONLY(assert(!MEMCMP_LIT(GDE_LABEL_LITERAL, "GTCGBDUNX011"));)
+	addr = (gd_addr *)malloc(DUMMY_GBLDIR_SIZE);
+	memset(addr, 0, DUMMY_GBLDIR_SIZE);
+	addr->max_rec_size = 256;
+	addr->maps = (gd_binding *)((UINTPTR_T)addr + SIZEOF(gd_addr));
+	addr->var_maps_len = DUMMY_GBLDIR_VAR_MAP_SIZE;
+	addr->n_maps = DUMMY_GBLDIR_N_MAPS;
+	addr->n_regions = DUMMY_GBLDIR_N_REGS;
+	addr->n_segments = DUMMY_GBLDIR_N_REGS;
+	addr->n_gblnames = 0;
+	addr->link = 0;
+	addr->is_dummy_gbldir = TRUE;
+	addr->local_locks = 0;
+	basedb_reg = (gd_region *)((char *)addr + SIZEOF(gd_addr) + DUMMY_GBLDIR_TOT_MAP_SIZE);
+	statsdb_reg = basedb_reg + 1;
+	addr->regions = basedb_reg;
+	basedb_seg = (gd_segment *)((INTPTR_T)(basedb_reg + DUMMY_GBLDIR_N_REGS));
+	statsdb_seg = basedb_seg + 1;
+	addr->segments = basedb_seg;
+	basedb_reg->dyn.addr = basedb_seg;
+	basedb_reg->statsDB_reg_index = 1;
+	basedb_reg->reservedDBFlags = RDBF_NOSTATS;	/* Keep statsdb region invisible at start by default. If opened db
+							 * indicates it is enabled for statsdb, then start using statsdb reg.
+							 */
+	statsdb_reg->dyn.addr = statsdb_seg;
+	statsdb_reg->statsDB_reg_index = 0;
+	statsdb_reg->reservedDBFlags = RDBF_STATSDB_MASK;
+	/* Start MAPS section initialization */
+	mapkey_ptr = (char *)((UINTPTR_T)addr + SIZEOF(gd_addr) + DUMMY_GBLDIR_FIX_MAP_SIZE);
+	map = (gd_binding *)((UINTPTR_T)addr + SIZEOF(gd_addr));
+	DEBUG_ONLY(map_top = map + DUMMY_GBLDIR_N_MAPS);
+	DUMMY_GLD_ADD_MAP(map, mapkey_ptr, basedb_reg, DUMMY_GBLDIR_FIRST_MAP);   /* add map "#)" */
+	DUMMY_GLD_ADD_MAP(map, mapkey_ptr, basedb_reg, DUMMY_GBLDIR_SECOND_MAP);  /* add map "%" */
+	DUMMY_GLD_ADD_MAP(map, mapkey_ptr, basedb_reg, DUMMY_GBLDIR_THIRD_MAP);   /* add map "%Y" */
+	DUMMY_GLD_ADD_MAP(map, mapkey_ptr, statsdb_reg, DUMMY_GBLDIR_FOURTH_MAP); /* add map "%Z" */
+	DUMMY_GLD_ADD_MAP(map, mapkey_ptr, basedb_reg, DUMMY_GBLDIR_FIFTH_MAP);   /* add map ".." */
+	assert(map == map_top);
+	/* MAPS sections (Fixed and Variable) initialization complete */
+	basedb_seg->acc_meth = dba_bg;
+	statsdb_seg->acc_meth = dba_mm;
+	addr->end = (UINTPTR_T)(basedb_seg + DUMMY_GBLDIR_N_REGS);
+	GLD_REG_INIT(basedb_reg, "DEFAULT", addr);	/* basedb region */
+	GLD_REG_INIT(statsdb_reg, "default", addr);	/* statsdb region */
 	addr->id = (gd_id *)malloc(SIZEOF(gd_id));
 	memset(addr->id, 0, SIZEOF(gd_id));
-
 	addr->tab_ptr = (hash_table_mname *)malloc(SIZEOF(hash_table_mname));
 	init_hashtab_mname((hash_table_mname *)addr->tab_ptr, 0, HASHTAB_NO_COMPACT, HASHTAB_NO_SPARE_TABLE );
-
-	name = (gdr_name *)malloc(SIZEOF(gdr_name));
-	MALLOC_CPY_LIT(name->name.addr, "DUMMY.GLD");
-	if (gdr_name_head)
-		name->link = (gdr_name *)gdr_name_head;
-	else
-		name->link = 0;
-	gdr_name_head = name;
-	gdr_name_head->gd_ptr = addr;
 	return addr;
 }
diff --git a/sr_port/db_auto_upgrade.c b/sr_port/db_auto_upgrade.c
index 4c00f9f..715e5a7 100644
--- a/sr_port/db_auto_upgrade.c
+++ b/sr_port/db_auto_upgrade.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -11,7 +11,9 @@
  ****************************************************************/
 
 #include "mdef.h"
+
 #include "gtm_string.h"
+
 #include "gdsroot.h"
 #include "gtm_facility.h"
 #include "fileinfo.h"
@@ -26,6 +28,7 @@
 #include "mutex.h"
 #include "wcs_phase2_commit_wait.h"
 #include "gvcst_protos.h"	/* for gvcst_init_sysops prototype */
+#include "db_write_eof_block.h"
 
 GBLREF  boolean_t       dse_running;
 
@@ -36,10 +39,16 @@ void db_auto_upgrade(gd_region *reg)
 	/* detect unitialized file header fields for this version of GT.M and do a mini auto-upgrade, initializing such fields
 	 * to default values in the new GT.M version
 	 */
-
 	sgmnt_addrs		*csa;
 	sgmnt_data_ptr_t	csd;
+	off_t			new_eof;
+	unix_db_info		*udi;
+#	ifdef DEBUG
+	gtm_uint64_t		file_size;
+#	endif
+	DCL_THREADGBL_ACCESS;
 
+	SETUP_THREADGBL_ACCESS;
 	assert(NULL != reg);
 	if (NULL == reg)
 		return;
@@ -127,28 +136,28 @@ void db_auto_upgrade(gd_region *reg)
 				/* GT.M V55000 introduced strm_reg_seqno, save_strm_reg_seqno, intrpt_recov_resync_strm_seqno
 				 * AND obsoleted dualsite_resync_seqno. For new fields, we are guaranteed they are
 				 * zero (in formerly unused sections of the file header) so no need for any initialization.
-				 * For obsoleted fields, it would be good to clear them here so we dont run into issues later.
+				 * For obsoleted fields, it would be good to clear them here so we don't run into issues later.
 				 */
-				UNIX_ONLY(csd->filler_seqno = 0;)	/* was "dualsite_resync_seqno" in pre-V55000 versions */
+				csd->filler_seqno = 0;	/* was "dualsite_resync_seqno" in pre-V55000 versions */
 				/* In addition, V55000 introduced before_trunc_total_blks for MUPIP REORG -TRUNCATE.
 				 * Since it is a new field no initialization necessary.
 				 */
 			case GDSMV55000:
-				UNIX_ONLY(csd->freeze_on_fail = FALSE;)
-				UNIX_ONLY(csd->span_node_absent = TRUE;)
-				UNIX_ONLY(csd->maxkeysz_assured = FALSE;)
+				csd->freeze_on_fail = FALSE;
+				csd->span_node_absent = TRUE;
+				csd->maxkeysz_assured = FALSE;
 			case GDSMV60000:
 			case GDSMV60001:
 				/* GT.M V60002 introduced mutex_spin_parms.mutex_que_entry_space_size */
 				NUM_CRIT_ENTRY(csd) = DEFAULT_NUM_CRIT_ENTRY;
 			case GDSMV60002:
 				/* GT.M V62001 introduced ^#t upgrade. Record this pending event in filehdr. */
-				UNIX_ONLY(csd->hasht_upgrade_needed = TRUE;)
+				csd->hasht_upgrade_needed = TRUE;
 			case GDSMV62001:
 				/* GT.M V62002 introduced database file preallocation. */
 				csd->defer_allocate = TRUE;
 				/* GT.M V62002 incremented ^#t label. Record this pending event in filehdr. */
-				UNIX_ONLY(csd->hasht_upgrade_needed = TRUE;)
+				csd->hasht_upgrade_needed = TRUE;
 				/* GT.M V62002 introduced epoch taper */
 				csd->epoch_taper = TRUE;
 		        	csd->epoch_taper_time_pct = EPOCH_TAPER_TIME_PCT_DEFAULT;
@@ -161,11 +170,25 @@ void db_auto_upgrade(gd_region *reg)
 				 memset(csd->encryption_hash2, 0, GTMCRYPT_RESERVED_HASH_LEN);
 				 SPIN_SLEEP_MASK(csd) = 0;	/* previously unused, but was 7FF and it should now default to 0 */
 			case GDSMV63000:
-				/* GT.M V63001 moved ftok_counter_halted and access_counter_halted from filehdr to node_local */
+				/* GT.M V63000A moved ftok_counter_halted and access_counter_halted from filehdr to node_local */
 				csd->filler_ftok_counter_halted = FALSE;
 				csd->filler_access_counter_halted = FALSE;
-				break;
 			case GDSMV63000A:
+				/* GT.M V63001 introduced asyncio but csd->asyncio could be set to TRUE by a MUPIP SET -ASYNCIO
+				 * command which did not come through here (because it needs standalone access). Therefore
+				 * do not set csd->asyncio to FALSE like is normally done for any newly introduced field.
+				 *	csd->asyncio = FALSE;
+				 */
+				 /* The database file would have a 512-byte EOF block. Enlarge it to be a GDS-block instead. */
+				udi = FILE_INFO(reg);
+				new_eof = (off_t)BLK_ZERO_OFF(csd->start_vbn) + (off_t)csd->trans_hist.total_blks * csd->blk_size;
+				DEBUG_ONLY(file_size = gds_file_size(reg->dyn.addr->file_cntl);)
+				assert((file_size * DISK_BLOCK_SIZE) == (new_eof + DISK_BLOCK_SIZE));
+				db_write_eof_block(udi, udi->fd, csd->blk_size, new_eof, &TREF(dio_buff));
+				/* GT.M V63001 introduced reservedDBFlags */
+				csd->reservedDBFlags = 0; /* RDBF_AUTODB = FALSE, RDBF_NOSTATS = FALSE, RDBF_STATSDB = FALSE */
+				break;
+			case GDSMV63001:
 				/* Nothing to do for this version since it is GDSMVCURR for now. */
 				assert(FALSE);		/* When this assert fails, it means a new GDSMV* was created, */
 				break;			/* 	so a new "case" needs to be added BEFORE the assert. */
diff --git a/sr_port/db_common_init.c b/sr_port/db_common_init.c
index e02c002..40823d7 100755
--- a/sr_port/db_common_init.c
+++ b/sr_port/db_common_init.c
@@ -46,6 +46,7 @@ void	db_common_init(gd_region *reg, sgmnt_addrs *csa, sgmnt_data_ptr_t csd)
 	reg->jnl_deq = csd->jnl_deq;
 	reg->jnl_buffer_size = csd->jnl_buffer_size;
 	reg->jnl_before_image = csd->jnl_before_image;
+	assert(!IS_AIO_DBGLDMISMATCH(reg->dyn.addr, csd));	/* Or else "gvcst_init" should have reopened the file */
 	bt_init(csa);
 	/* Initialization of prc_vec is done even for no journaling. gtcm uses this always. Others might need it too. */
 	if (NULL == prc_vec)
diff --git a/sr_port/db_csh_getn.c b/sr_port/db_csh_getn.c
index 66b5c2f..d23eece 100644
--- a/sr_port/db_csh_getn.c
+++ b/sr_port/db_csh_getn.c
@@ -46,11 +46,11 @@
 #include "memcoherency.h"
 #include "gtm_c_stack_trace.h"
 #include "anticipatory_freeze.h"
+#include "wcs_wt.h"
 
 GBLREF sgmnt_addrs	*cs_addrs;
 GBLREF gd_region	*gv_cur_region;
 GBLREF uint4		process_id;
-GBLREF uint4		image_count;
 GBLREF unsigned int	t_tries;
 GBLREF uint4		dollar_tlevel;
 GBLREF sgm_info		*sgm_info_ptr;
@@ -73,10 +73,18 @@ GBLREF jnlpool_addrs	jnlpool;
 error_def(ERR_BUFRDTIMEOUT);
 error_def(ERR_INVALIDRIP);
 
+/* Note: does not check cr against bounds of cache, i.e. against [start_cr..midnite) */
+#define WITHIN_POOLLIMIT_BOUNDS(cr, our_midnite, start_cr, gbuff_limit, max_ent)	\
+	((((our_midnite - gbuff_limit < start_cr)					\
+			/* there is a wrap so must check if cr is in the tail */	\
+			&& (cr >= our_midnite - gbuff_limit + max_ent)))		\
+		|| ((cr < our_midnite) && (cr >= our_midnite - gbuff_limit)))
+
 cache_rec_ptr_t	db_csh_getn(block_id block)
 {
-	cache_rec_ptr_t		cr, hdr, midnite, our_midnite, q0, start_cr;
+	cache_rec_ptr_t		cr, hdr, midnite, our_midnite, q0, start_cr, poollimit_cr;
 	bt_rec_ptr_t		bt;
+	gd_region		*reg;
 	unsigned int		lcnt, ocnt;
 	int			max_ent, pass0, pass0cnt, pass1, pass2, pass3, rip;
 	int4			flsh_trigger;
@@ -85,8 +93,11 @@ cache_rec_ptr_t	db_csh_getn(block_id block)
 	sgmnt_data_ptr_t	csd;
 	srch_blk_status		*tp_srch_status;
 	ht_ent_int4		*tabent;
-	boolean_t		dont_flush_buff;
+	boolean_t		asyncio, dont_flush_buff;
 	intrpt_state_t		prev_intrpt_state;
+#	ifdef DEBUG
+	cache_rec_ptr_t		cr_old;
+#	endif
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
@@ -94,7 +105,8 @@ cache_rec_ptr_t	db_csh_getn(block_id block)
 	csd = csa->hdr;
 	assert(dba_mm != csd->acc_meth);
 	assert(csa->now_crit);
-	assert(csa == &FILE_INFO(gv_cur_region)->s_addrs);
+	reg = gv_cur_region;
+	assert(csa == &FILE_INFO(reg)->s_addrs);
 	/* If this is an encrypted database, make sure our private cycle matches the shared cycle. Or else
 	 * if we need to call "wcs_wtstart" below, it cannot flush dirty buffers and will create a wc_blocked
 	 * situation (which is best avoided).
@@ -104,7 +116,9 @@ cache_rec_ptr_t	db_csh_getn(block_id block)
 	hdr = csa->acc_meth.bg.cache_state->cache_array + (block % csd->bt_buckets);
 	start_cr = csa->acc_meth.bg.cache_state->cache_array + csd->bt_buckets;
 	pass0 = csa->gbuff_limit;		/* gbuff_limit set by VIEW "POOLLIMIT":<region> */
-	pass0cnt = (0 == pass0) ? 0 : 2;	/* used both as a flag we are limiting and a counter for 2 limited trips */
+	pass0cnt = (0 == pass0) ? 0 : 3;	/* Used both as a flag we are limiting and a counter for 2 limited trips,
+						 * over 3 passes in total.
+						 */
 	pass1 = max_ent;			/* skip referred or dirty or read-into cache records */
 	pass2 = 2 * max_ent;			/* skip referred cache records */
 	pass3 = 3 * max_ent;			/* skip nothing */
@@ -113,16 +127,21 @@ cache_rec_ptr_t	db_csh_getn(block_id block)
 	if (pass0cnt)
 	{
 		our_midnite = csa->our_midnite;		/* local copy of private "hand" for efficiency - only used if pass0cnt */
-		cr = our_midnite - pass0;		/* direct this process to an area behind our chosen spot */
-		if (cr < start_cr)
-			cr += max_ent;			/* we have to wrap before we use our_midnite */
-		else
+		assert(start_cr < our_midnite);
+		/* Try starting where we left off from the last invocation of db_csh_getn */
+		poollimit_cr = cr = (cache_rec_ptr_t)GDS_REL2ABS(csa->our_lru_cache_rec_off);
+		assert(WITHIN_POOLLIMIT_BOUNDS(cr, our_midnite, start_cr, pass0, max_ent));
+		if (cr < our_midnite)
+		{	/* We can only set midnite = our_midnite if our interval is not wrapped, or if it is wrapped cr must be
+			 * before our_midnite (i.e. we wrapped previously). In either case, cr < our_midnite.
+			 */
 			midnite = our_midnite;
+		}
 	}
 	assert((start_cr <= cr) && ((start_cr + max_ent) > cr));
-	dont_flush_buff = gv_cur_region->read_only
-		 UNIX_ONLY(|| (!(dollar_tlevel ? sgm_info_ptr->update_trans : update_trans) && IS_REPL_INST_FROZEN));
+	dont_flush_buff = reg->read_only || (!(dollar_tlevel ? sgm_info_ptr->update_trans : update_trans) && IS_REPL_INST_FROZEN);
 	INCR_DB_CSH_COUNTER(csa, n_db_csh_getns, 1);
+	asyncio = csd->asyncio;
 	DEFER_INTERRUPTS(INTRPT_IN_DB_CSH_GETN, prev_intrpt_state);
 	for (lcnt = 0;  ; lcnt++)
 	{
@@ -133,7 +152,7 @@ cache_rec_ptr_t	db_csh_getn(block_id block)
 			break;
 		}
 		cr++;
-		if (cr == midnite)
+		if (cr >= midnite)	/* == should work but >= is slightly safer and no more expensive */
 		{
 			cr = start_cr;
 			if (pass0cnt)
@@ -143,26 +162,59 @@ cache_rec_ptr_t	db_csh_getn(block_id block)
 					assert((start_cr + max_ent) == midnite);
 					midnite = our_midnite;
 				} else
-				{	/* the end of our restricted area */
-					if (--pass0cnt)
-					{	/* if limiting and in pass0, do a 2nd scan of the limit area */
+				{	/* Here we perform retries on the local pool:
+					 * pass0cnt == 3: We start from where we last left off, walk to our_midnite
+					 * pass0cnt == 2: We start from our_midnite - pass0, and walk to our_midnite
+					 * pass0cnt == 1: We start from our_midnite - pass0, and walk to where we
+					 *                last left off (where we started in pass0cnt == 3).
+					 * This way we end up doing two full passes over the entire local pool.
+					 */
+					pass0cnt--;
+					if (2 == pass0cnt)
+					{
 						cr = our_midnite - pass0;		/* in our restricted area */
 						if (cr < start_cr)
 						{	/* wrap before our_midnite */
 							cr += max_ent;
 							midnite = start_cr + max_ent;
 						}
+					} else if (1 == pass0cnt)
+					{
+						cr = our_midnite - pass0;
+						our_midnite = poollimit_cr + 1;
+						if (cr < start_cr)
+						{
+							cr += max_ent;
+							midnite = cr > poollimit_cr ? start_cr + max_ent : our_midnite;
+						} else
+							midnite = our_midnite;
+						assert(cr < midnite);
+						/* we must have already restarted the search from our_midnite - pass0
+						 * (in pass0cnt == 2)
+						 */
+						assert(lcnt == pass0);
 					} else
 					{	/* or the limited area did not suffice - adopt the normal clock */
 						cr = (cache_rec_ptr_t)GDS_REL2ABS(csa->nl->cur_lru_cache_rec_off);
 						midnite = start_cr + max_ent;
 					}
-					assert((pass0cnt + lcnt) == pass0);
 					lcnt = 0;
 				}
 			}
 		}
 		assert((start_cr <= cr) && ((start_cr + max_ent) > cr));
+		/* If ASYNCIO is enabled, once in a while check if there is anything in the wip queue ready to be freed.
+		 * A call to "wcs_wtfini" does just that. Note that "wcs_wtfini" can return FALSE in case of some queue
+		 * interlock issues. But in that case it would have set "cnl->wc_blocked" to TRUE and a cache recovery
+		 * will be issued by the next process that gets crit. We do not rely on the success of the "wcs_wtfini"
+		 * cleanup so proceed even in case of a FALSE return. Hence not checking the return value.
+		 */
+		if (asyncio && ((lcnt == pass1) || (lcnt == pass2)))
+		{
+			DEBUG_ONLY(dbg_wtfini_lcnt = dbg_wtfini_db_csh_getn);	/* used by "wcs_wtfini" */
+			/* do not do heavyweight "is_proc_alive" check inside crit */
+			wcs_wtfini(reg, CHECK_IS_PROC_ALIVE_FALSE, NULL);
+		}
 		if (cr->refer && (lcnt < pass2))
 		{	/* in passes 1 & 2, set refer to FALSE and skip; in the third pass attempt reuse even if TRUE == refer */
 			cr->refer = FALSE;
@@ -213,7 +265,7 @@ cache_rec_ptr_t	db_csh_getn(block_id block)
 			{	/* About to reuse a buffer that is part of the read-set of the current TP transaction.
 				 * Reset clue as otherwise the next global reference of that global will use an outofdate clue.
 				 * Even though tp_srch_status is available after the sgm_info_ptr->blks_in_use hashtable check,
-				 * we dont want to reset the clue in case the cw_stagnate hashtable check causes the same cr
+				 * we don't want to reset the clue in case the cw_stagnate hashtable check causes the same cr
 				 * to be skipped from reuse. Hence the placement of this reset logic AFTER the cw_stagnate check.
 				 */
 				tp_srch_status->blk_target->clue.end = 0;
@@ -235,8 +287,24 @@ cache_rec_ptr_t	db_csh_getn(block_id block)
 				continue;
 			if (lcnt < pass1)
 				continue;
+#			ifdef DEBUG
+			/* If this cr is a newer twin check that the older twin has a 0 value of "in_cw_set" (bg_update_phase2
+			 * should have ensured this). If this condition is not met, it is possible for
+			 * "wcs_get_space/wcs_wtstart_fini/wcs_wtstart/wcs_wtfini" to go into a livelock while trying to
+			 * flush the newer twin as that requires the older twin to be flushed and that cannot be cleaned
+			 * up (even if the async IO is complete) because of the non-zero "in_cw_set", particularly if
+			 * the non-zero value matches "process_id".
+			 */
+			if (cr->twin && cr->bt_index)
+			{
+				assert(TWINNING_ON(csd));
+				cr_old = (cache_rec_ptr_t)GDS_ANY_REL2ABS(csa, cr->twin);	/* get old twin */
+				assert(!cr_old->bt_index);
+				assert(process_id != cr_old->in_cw_set);
+			}
+#			endif
 			BG_TRACE_PRO(db_csh_getn_flush_dirty);
-			if (FALSE == wcs_get_space(gv_cur_region, 0, cr))
+			if (FALSE == wcs_get_space(reg, 0, cr))
 			{	/* failed to flush it out - force a rebuild */
 				BG_TRACE_PRO(wc_blocked_db_csh_getn_wcsstarvewrt);
 				assert(csa->nl->wc_blocked); /* only reason we currently know why wcs_get_space could fail */
@@ -249,9 +317,9 @@ cache_rec_ptr_t	db_csh_getn(block_id block)
 		 * This resetting is done by "wcs_wtstart" which is out-of-crit. Therefore, we need to
 		 * 	wait for this value to be LATCH_CLEAR before reusing this cache-record.
 		 * Note that we are examining the write-latch-value without holding the interlock. It is ok to do
-		 * 	this because the only two routines that modify the latch value are "bg_update" and
-		 * 	"wcs_wtstart". The former cannot be concurrently executing because we are in crit.
-		 * 	The latter will not update the latch value unless this cache-record is dirty. But in this
+		 * 	this because the only two routines that modify the latch value are "bg_update_phase1", "wcs_wtfini"
+		 * 	and "wcs_wtstart". The first two cannot be concurrently executing because we are in crit.
+		 * 	The last one will not update the latch value unless this cache-record is dirty. But in this
 		 * 	case we would have most likely gone through the if (cr->dirty) check above. Most likely
 		 * 	because there is one rare possibility where a concurrent "wcs_wtstart" has set cr->dirty
 		 * 	to 0 but not yet cleared the latch. In that case we wait for the latch to be cleared.
@@ -295,19 +363,19 @@ cache_rec_ptr_t	db_csh_getn(block_id block)
 				RELEASE_BUFF_READ_LOCK(cr);
 				/* The owner has been unable to complete the read - check for some things before going to sleep.
 				 * Since cr->r_epid can be changing concurrently, take a local copy before using it below,
-				 * particularly before calling is_proc_alive as we dont want to call it with a 0 r_epid.
+				 * particularly before calling is_proc_alive as we don't want to call it with a 0 r_epid.
 				 */
 				latest_r_epid = cr->r_epid;
 				if (cr->read_in_progress < -1)
 				{
 					BG_TRACE_PRO(db_csh_getn_out_of_design);  /* outside of design; clear to known state */
-					send_msg_csa(CSA_ARG(csa) VARLSTCNT(4) ERR_INVALIDRIP, 2, DB_LEN_STR(gv_cur_region));
+					send_msg_csa(CSA_ARG(csa) VARLSTCNT(4) ERR_INVALIDRIP, 2, DB_LEN_STR(reg));
 					assert(cr->r_epid == 0);
 					cr->r_epid = 0;
 					INTERLOCK_INIT(cr);
 				} else  if (0 != latest_r_epid)
 				{
-					if (is_proc_alive(latest_r_epid, cr->image_count))
+					if (is_proc_alive(latest_r_epid, 0))
 					{
 #						ifdef DEBUG
 						if ((BUF_OWNER_STUCK / 2) == ocnt)
@@ -335,7 +403,7 @@ cache_rec_ptr_t	db_csh_getn(block_id block)
 								DEBUG_ONLY(TWICE) PRO_ONLY(ONCE));
 					RELEASE_BUFF_READ_LOCK(cr);
 					send_msg_csa(CSA_ARG(csa) VARLSTCNT(8) ERR_BUFRDTIMEOUT, 6, process_id,
-						 cr->blk, cr, first_r_epid, DB_LEN_STR(gv_cur_region));
+						 cr->blk, cr, first_r_epid, DB_LEN_STR(reg));
 					continue;
 				}
 				cr->r_epid = 0;
@@ -360,7 +428,6 @@ cache_rec_ptr_t	db_csh_getn(block_id block)
 		assert(NULL == TREF(block_now_locked));
 		TREF(block_now_locked) = cr;
 		cr->r_epid = process_id;	/* establish ownership */
-		cr->image_count = image_count;
 		cr->blk = block;
 		/* We want cr->read_in_progress to be locked BEFORE cr->cycle is incremented. t_qread relies on this order.
 		 * Enforce this order with a write memory barrier. Not doing so might cause the incremented cr->cycle to be
@@ -376,7 +443,10 @@ cache_rec_ptr_t	db_csh_getn(block_id block)
 		cr->jnl_addr = 0;
 		cr->refer = TRUE;
 		if (cr->bt_index != 0)
-		{
+		{	/* Link between "cr" and "bt" was established at the time this "cr" was dirtied first and continued
+			 * to stay even when cr->dirty became 0. But now that this "cr" is going to point to a different block
+			 * (i.e. cr->blk is no longer the same as bt->blk) remove the link.
+			 */
 			bt = (bt_rec_ptr_t)GDS_REL2ABS(cr->bt_index);
 			bt->cache_index = CR_NOTVALID;
 			cr->bt_index = 0;
@@ -386,6 +456,13 @@ cache_rec_ptr_t	db_csh_getn(block_id block)
 		assert(0 == cr->dirty);
 		if (!pass0cnt)
 			csa->nl->cur_lru_cache_rec_off = GDS_ABS2REL(cr);
+		if (pass0 && pass0cnt)
+		{	/* pass0cnt != 0 implies we found a cr within our POOLLIMIT bounds. Assert that and update
+			 * our_lru_cache_rec_off in this case. If we fell through to the general pool, then never mind.
+			 */
+			assert(WITHIN_POOLLIMIT_BOUNDS(cr, csa->our_midnite, start_cr, pass0, max_ent));
+			csa->our_lru_cache_rec_off = GDS_ABS2REL(cr);
+		}
 		if (lcnt > pass1)
 			csa->nl->cache_hits = 0;
 		csa->nl->cache_hits++;
diff --git a/sr_port/db_csh_ref.c b/sr_port/db_csh_ref.c
index ad9175b..6d67872 100755
--- a/sr_port/db_csh_ref.c
+++ b/sr_port/db_csh_ref.c
@@ -89,7 +89,7 @@ void	db_csh_ref(sgmnt_addrs *csa, boolean_t init)
 		 * cache but do not do the longset (above), bt_index can be a non-zero value. Assert that and set it to zero since
 		 * we are invalidating the cache record anyways.
 		 */
-		assert((0 == cr->bt_index) UNIX_ONLY(|| jgbl.onlnrlbk));
+		assert((0 == cr->bt_index) || jgbl.onlnrlbk);
 		cr->bt_index = 0;
 		if (init)
 		{
diff --git a/sr_port/dbcertify_certify_phase.c b/sr_port/dbcertify_certify_phase.c
index 50dbc26..2714b43 100755
--- a/sr_port/dbcertify_certify_phase.c
+++ b/sr_port/dbcertify_certify_phase.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2005-2015 Fidelity National Information	*
+ * Copyright (c) 2005-2016 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -158,10 +158,10 @@ void dbcertify_certify_phase(void)
 				  ERR_TEXT, 2, RTS_ERROR_STRING(errmsg));
 		}
 	}
-#ifdef __MVS__
+#	ifdef __MVS__
 	if (-1 == gtm_zos_tag_to_policy(psa->outfd, TAG_BINARY, &realfiletag))
 		TAG_POLICY_GTM_PUTMSG((char_ptr_t)psa->outfn, errno, realfiletag, TAG_BINARY);
-#endif
+#	endif
 	dbc_read_p1out(psa, &psa->ofhdr, SIZEOF(p1hdr));		/* Read phase 1 output file header */
 	if (0 != memcmp(psa->ofhdr.p1hdr_tag, P1HDR_TAG, SIZEOF(psa->ofhdr.p1hdr_tag)))
 		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_DBCBADFILE, 2, RTS_ERROR_STRING((char_ptr_t)psa->outfn));
@@ -196,13 +196,9 @@ void dbcertify_certify_phase(void)
 	len = STRLEN((char_ptr_t)psa->ofhdr.dbfn);
 	strcpy((char_ptr_t)psa->dbc_gv_cur_region->dyn.addr->fname, (char_ptr_t)dbfn);
 	psa->dbc_gv_cur_region->dyn.addr->fname_len = len;
-
 	FILE_CNTL_INIT(psa->dbc_gv_cur_region->dyn.addr);
-	psa->dbc_gv_cur_region->dyn.addr->file_cntl->file_type = dba_bg;
-
 	psa->dbc_cs_data = malloc(SIZEOF(*psa->dbc_cs_data));
 	fc = psa->fc = psa->dbc_gv_cur_region->dyn.addr->file_cntl;
-	fc->file_type = psa->dbc_gv_cur_region->dyn.addr->acc_meth = dba_bg;	/* Always treat as BG mode */
 
 	/* Initialize for db processing - open and read in file-header, get "real" filename for comparison */
 	dbc_init_db(psa);
@@ -500,7 +496,7 @@ boolean_t dbc_split_blk(phase_static_area *psa, block_id blk_num, enum gdsblk_ty
 		blk_index = dbc_read_dbblk(psa, blk_ptr, tmp_blk_type);
 		/* Note that we cannot do a "tmp_blk_levl--" here but instead should get the child block level from the block
 		 * header. This is because it is possible the block we started out with is no longer marked BUSY in the bitmap
-		 * (because of updates after the "dbcertify scan" but before the "dbcertify certify"). Since we dont check
+		 * (because of updates after the "dbcertify scan" but before the "dbcertify certify"). Since we don't check
 		 * a block's bitmap status first (to avoid performance overhead of reading bitmap for every block that is
 		 * processed by certify), we need to add robustness within dbcertify to handle that.
 		 */
diff --git a/sr_port/dbcertify_scan_phase.c b/sr_port/dbcertify_scan_phase.c
index 428732b..355c900 100755
--- a/sr_port/dbcertify_scan_phase.c
+++ b/sr_port/dbcertify_scan_phase.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2005-2015 Fidelity National Information	*
+ * Copyright (c) 2005-2016 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -218,7 +218,6 @@ void dbcertify_scan_phase(void)
 	strcpy((char_ptr_t)psa->dbc_gv_cur_region->dyn.addr->fname, (char_ptr_t)dbfn);
 	psa->dbc_gv_cur_region->dyn.addr->fname_len = (unsigned short)len;
 	FILE_CNTL_INIT(psa->dbc_gv_cur_region->dyn.addr);
-	psa->dbc_gv_cur_region->dyn.addr->file_cntl->file_type = dba_bg;
 	psa->dbc_cs_data = malloc(SIZEOF(*psa->dbc_cs_data));
 	/* Initialize for db processing - open and read in file-header */
 	psa->fc = psa->dbc_gv_cur_region->dyn.addr->file_cntl;
@@ -268,7 +267,7 @@ void dbcertify_scan_phase(void)
 	psa->curr_lbmap_buff= malloc(psa->dbc_cs_data->blk_size);	/* Current local bit map cache */
 	psa->local_bit_map_cnt = (psa->dbc_cs_data->trans_hist.total_blks + psa->dbc_cs_data->bplmap - 1)
 		/ psa->dbc_cs_data->bplmap;
-	dbptr = (psa->dbc_cs_data->start_vbn - 1) * DISK_BLOCK_SIZE;
+	dbptr = BLK_ZERO_OFF(psa->dbc_cs_data->start_vbn);
 	blk_num = 0;
 	/* Loop to process every local bit map in the database. Since the flag tells us only
 	 * (0) it is full or (1) it is not full, we have to completely process each local bit map.
@@ -322,7 +321,7 @@ void dbcertify_scan_phase(void)
 				if (bitmap_blk_num != last_bitmap_blk_num)
 				{
 					psa->fc->op_buff = psa->curr_lbmap_buff;
-					dbptr = ((psa->dbc_cs_data->start_vbn - 1) * DISK_BLOCK_SIZE)
+					dbptr = BLK_ZERO_OFF((psa->dbc_cs_data->start_vbn))
 						+ psa->dbc_cs_data->free_space
 						+ ((gtm_off_t)psa->dbc_cs_data->blk_size * bitmap_blk_num);
 					psa->fc->op_pos = (dbptr / DISK_BLOCK_SIZE) + 1;
@@ -330,7 +329,7 @@ void dbcertify_scan_phase(void)
 					last_bitmap_blk_num = bitmap_blk_num;
 				}
 				lm_offset = (blk_num - bitmap_blk_num) * 2;
-				dbptr = ((psa->dbc_cs_data->start_vbn - 1) * DISK_BLOCK_SIZE) + psa->dbc_cs_data->free_space
+				dbptr = BLK_ZERO_OFF((psa->dbc_cs_data->start_vbn)) + psa->dbc_cs_data->free_space
 					+ ((gtm_off_t)psa->dbc_cs_data->blk_size * blk_num);
 				if (gvcst_blk_is_allocated(psa->curr_lbmap_buff + SIZEOF(v15_blk_hdr), lm_offset))
 					/* This block is in use -- process it */
diff --git a/sr_port/desired_db_format_set.c b/sr_port/desired_db_format_set.c
old mode 100755
new mode 100644
index 75a07fb..0452e2e
--- a/sr_port/desired_db_format_set.c
+++ b/sr_port/desired_db_format_set.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2005-2016 Fidelity National Information	*
+ * Copyright (c) 2005-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -42,6 +42,7 @@ GBLREF	jnl_gbls_t		jgbl;
 GBLREF	uint4			process_id;
 GBLREF	inctn_detail_t		inctn_detail;			/* holds detail to fill in to inctn jnl record */
 
+error_def(ERR_ASYNCIONOV4);
 error_def(ERR_COMMITWAITSTUCK);
 error_def(ERR_CRYPTNOV4);
 error_def(ERR_DBDSRDFMTCHNG);
@@ -75,20 +76,25 @@ int4	desired_db_format_set(gd_region *reg, enum db_ver new_db_format, char *comm
 		gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(4) ERR_CRYPTNOV4, 2, DB_LEN_STR(reg));
 		return ERR_CRYPTNOV4;
 	}
-	GTM_SNAPSHOT_ONLY(
-		/* We don't allow databases to be downgraded when snapshots are in progress */
-		if (SNAPSHOTS_IN_PROG(csa->nl) && (GDSV4 == new_db_format))
-		{
-			gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(5) ERR_SNAPSHOTNOV4,
-				3, csa->nl->num_snapshots_in_effect, DB_LEN_STR(reg));
-			return ERR_SNAPSHOTNOV4;
-		}
-	)
+	/* We do not allow databases in ASYNCIO mode if the block format is V4 */
+	if (csd->asyncio && (GDSV4 == new_db_format))
+	{
+		gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(8) ERR_ASYNCIONOV4, 6, DB_LEN_STR(reg),
+			LEN_AND_LIT("ASYNCIO enabled"), LEN_AND_LIT("downgrade to V4"));
+		return ERR_ASYNCIONOV4;
+	}
+	/* We don't allow databases to be downgraded when snapshots are in progress */
+	if (SNAPSHOTS_IN_PROG(csa->nl) && (GDSV4 == new_db_format))
+	{
+		gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(5) ERR_SNAPSHOTNOV4,
+			3, csa->nl->num_snapshots_in_effect, DB_LEN_STR(reg));
+		return ERR_SNAPSHOTNOV4;
+	}
 	was_crit = csa->now_crit;
 	if (FALSE == was_crit)
 		grab_crit(reg);
 	/* if MM and desired_db_format is not V5, gvcst_init would have issued MMNODYNDWNGRD error. assert that. */
-	assert(dba_bg == csd->acc_meth || (dba_mm == csd->acc_meth) && (GDSV6 == csd->desired_db_format));
+	assert((dba_bg == csd->acc_meth) || ((dba_mm == csd->acc_meth) && (GDSV6 == csd->desired_db_format)));
 	if (csd->desired_db_format == new_db_format)
 	{	/* no change in db_format. fix max_tn_warn if necessary and return right away. */
 		status = ERR_MUNOACTION;
@@ -146,7 +152,7 @@ int4	desired_db_format_set(gd_region *reg, enum db_ver new_db_format, char *comm
 		 * (if it decides to switch to a new journal file)
 		 */
 		ADJUST_GBL_JREC_TIME(jgbl, jbp);
-		jnl_status = jnl_ensure_open();
+		jnl_status = jnl_ensure_open(reg, csa);
 		if (0 == jnl_status)
 		{
 			save_inctn_opcode = inctn_opcode;
diff --git a/sr_port/dpgbldir.c b/sr_port/dpgbldir.c
index 8df6ef8..bcbe296 100644
--- a/sr_port/dpgbldir.c
+++ b/sr_port/dpgbldir.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -13,8 +13,12 @@
 #include "mdef.h"
 
 #include "gtm_string.h"
+#ifdef DEBUG
+#include "gtm_ctype.h"
+#endif
 
 #include "gdsroot.h"
+#include "gdsblk.h"
 #include "gtm_facility.h"
 #include "fileinfo.h"
 #include "gdsbt.h"
@@ -24,17 +28,16 @@
 #include "iosize.h"
 #include "probe.h"
 #include "dpgbldir.h"
-#ifdef UNIX
+#include "filestruct.h"
+#include "aio_shim.h"
 #include "gtmio.h"
-#elif defined(VMS)
-#include <fab.h>
-#else
-#error unsupported platform
-#endif
 #include "dpgbldir_sysops.h"
 #include "targ_alloc.h"
 #include "gtm_logicals.h"
 #include "zshow.h"
+#ifdef DEBUG
+#include "gtm_caseconv.h"
+#endif
 
 GBLREF	gd_addr		*gd_header;
 GBLREF	gv_namehead	*gv_target_list;
@@ -167,8 +170,8 @@ gd_addr *gd_load(mstr *v)
 	void			*file_ptr; /* is a temporary structure as the file open and manipulations are currently stubs */
 	header_struct		*header, temp_head, disp_head;
 	gd_addr			*table, *gd_addr_ptr;
-	gd_binding		*map, *map_top;
-	gd_region		*reg, *reg_top;
+	gd_binding		*map, *map_top, *next_stats_map;
+	gd_region		*reg, *reg_top, *first_stats_reg;
 	uint4			t_offset, size;
 	gd_gblname		*gnam, *gnam_top;
 	int			i, n_regions, arraysize, disp_len;
@@ -176,6 +179,9 @@ gd_addr *gd_load(mstr *v)
 #	ifdef DEBUG
 	boolean_t		prevMapIsSpanning, currMapIsSpanning, gdHasSpanGbls;
 	boolean_t		isSpannedReg[256];	/* currently we allow for a max of 256 regions in this dbg code */
+	gd_region		*base_reg, *stats_reg;
+	uint4			reg_index;
+	unsigned char		regname[MAX_MIDENT_LEN + 1];
 #	endif
 	DCL_THREADGBL_ACCESS;
 
@@ -223,7 +229,9 @@ gd_addr *gd_load(mstr *v)
 		assert((reg - table->regions) < ARRAYSIZE(isSpannedReg));
 		isSpannedReg[reg - table->regions] = FALSE;
 #		endif
+		reg->owning_gd = table; /* set backpointer from region to owning gbldir */
 	}
+	IF_LIBAIO(table->thread_gdi = NULL;)
 #	ifdef DEBUG
 	prevMapIsSpanning = FALSE;
 	currMapIsSpanning = FALSE;
@@ -251,7 +259,43 @@ gd_addr *gd_load(mstr *v)
 #	ifdef DEBUG
 	assert(table->has_span_gbls == gdHasSpanGbls);
 	for (reg = table->regions, reg_top = reg + n_regions; reg < reg_top; reg++)
+	{
 		assert(reg->is_spanned == isSpannedReg[reg - table->regions]);
+		/* Validate "reg->statsDB_reg_index" */
+		reg_index = reg->statsDB_reg_index;
+		assert((INVALID_STATSDB_REG_INDEX != reg_index) && (reg_index < n_regions));
+		if (IS_STATSDB_REGNAME(reg))
+		{	/* is a statsDB reg */
+			stats_reg = reg;
+			base_reg = &table->regions[reg_index];
+		} else
+		{	/* is a base reg */
+			base_reg = reg;
+			stats_reg = &table->regions[reg_index];
+		}
+		assert(IS_BASEDB_REGNAME(base_reg));
+		assert(IS_STATSDB_REGNAME(stats_reg));
+		assert(base_reg->statsDB_reg_index == (stats_reg - table->regions));
+		assert(stats_reg->statsDB_reg_index == (base_reg - table->regions));
+		assert(base_reg->rname_len == stats_reg->rname_len);
+		assert(ARRAYSIZE(regname) > base_reg->rname_len);
+		upper_to_lower(regname, REG_STR_LEN(base_reg));
+		assert(!memcmp(regname, (stats_reg)->rname, (stats_reg)->rname_len));	/* BYPASSOK */
+		/* Since a statsdb region points to an MM database, setting defer_time=0 in that segment
+		 * automatically disables flush timers (wcs_stale) from being set up. GDE should have ensured this.
+		 */
+		assert(0 == stats_reg->dyn.addr->defer_time);
+		/* The below assert is relied upon by "gvcst_init". If it fails, it most likely means SIZEOF("gvstats_rec_t")
+		 * has increased enough to cause GDE to calculate the statsdb blk size as 1536 instead. Fix macro accordingly.
+		 */
+		assert(STATSDB_BLK_SIZE == stats_reg->dyn.addr->blk_size);
+		/* Similar asserts for a few other critical fields that are initialized in GDE & GT.M ("gvcst_init") */
+		assert(STATSDB_ALLOCATION == stats_reg->dyn.addr->allocation);
+		assert(STATSDB_EXTENSION == stats_reg->dyn.addr->ext_blk_count);
+		assert(STATSDB_MAX_KEY_SIZE == stats_reg->max_key_size);
+		assert(STATSDB_MAX_REC_SIZE == stats_reg->max_rec_size);
+		assert(stats_reg->mumps_can_bypass);
+	}
 	for (gnam = table->gblnames, gnam_top = gnam + table->n_gblnames; gnam < gnam_top; gnam++)
 	{
 		assert(SIZEOF(gnam->gblname) == (MAX_MIDENT_LEN + 1));
@@ -259,11 +303,58 @@ gd_addr *gd_load(mstr *v)
 	}
 #	endif
 	table->link = gd_addr_head;
+	table->is_dummy_gbldir = FALSE;
 	gd_addr_head = table;
 	fill_gd_addr_id(gd_addr_head, file_ptr);
 	close_gd_file(file_ptr);
 	table->tab_ptr = (hash_table_mname *)malloc(SIZEOF(hash_table_mname));
 	init_hashtab_mname(table->tab_ptr, 0, HASHTAB_NO_COMPACT, HASHTAB_NO_SPARE_TABLE);
+	/* For most MUPIP commands (except those that can do logical database updates ("is_replicator" == TRUE)
+	 * or MUPIP RUNDOWN or MUPIP CREATE, hide the statsdb regions so the commands do not even know about them
+	 * let alone operate on them. All of them would have set TREF(ok_to_see_statsdb_regs) appropriately.
+	 */
+	if (!TREF(ok_to_see_statsdb_regs))
+	{
+		first_stats_reg = NULL;
+		/* Coalesce the regions first given that at least one stats region will always exist (GDE ensures this) */
+		for (reg = table->regions, reg_top = reg + n_regions; reg < reg_top; reg++)
+		{
+			reg->reservedDBFlags |= RDBF_NOSTATS;
+			if ((NULL == first_stats_reg) && IS_STATSDB_REGNAME(reg))
+			{
+				first_stats_reg = reg;
+				break;
+			}
+		}
+		if (NULL != first_stats_reg)
+		{
+#			ifdef DEBUG
+			/* Once a stats reg has been seen, all following regions should be stats regions. Assert that */
+			for (reg = first_stats_reg; reg < reg_top; reg++)
+				assert(IS_STATSDB_REGNAME(reg));
+#			endif
+			n_regions = table->n_regions = first_stats_reg - table->regions;
+			/* Coalesce the maps next. Move the non-statsdb-maps into one contiguous array */
+			map = table->maps;
+			map_top = map + table->n_maps;
+			assert(IS_BASEDB_REGNAME(map->reg.addr));		/* first map entry should be a nonstats region */
+			assert(IS_BASEDB_REGNAME(map_top[-1].reg.addr));	/* last map entry should be a nonstats region */
+			next_stats_map = NULL;
+			for ( ;  map < map_top; map++)
+			{
+				reg = map->reg.addr;
+				if (IS_BASEDB_REGNAME(reg))
+				{
+					if (NULL != next_stats_map)
+						*next_stats_map++ = *map;
+				} else if (NULL == next_stats_map)
+					next_stats_map = map;
+			}
+			assert(NULL != next_stats_map);
+			assert(next_stats_map < map_top);
+			table->n_maps = next_stats_map - table->maps;
+		}
+	}
 	if (table->has_span_gbls && (TREF(gd_targ_reg_array_size) < n_regions))
 	{
 		array = TREF(gd_targ_reg_array);
@@ -273,8 +364,10 @@ gd_addr *gd_load(mstr *v)
 		array = malloc(arraysize);
 		memset(array, 0, arraysize);
 		TREF(gd_targ_reg_array) = array;
-		TREF(gd_targ_reg_array_size) = arraysize;
+		TREF(gd_targ_reg_array_size) = n_regions;
 	}
+	/* Assert that all runtime-only fields are null-initialized by GDE */
+	assert(!table->ygs_map_entry_changed);
 	return table;
 }
 
diff --git a/sr_port/dpgbldir.h b/sr_port/dpgbldir.h
index 753dd62..e8d4dec 100755
--- a/sr_port/dpgbldir.h
+++ b/sr_port/dpgbldir.h
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -41,4 +41,37 @@ void		*open_gd_file(mstr *v);
 void		gd_rundown(void);
 void 		gd_ht_kill(struct hash_table_mname_struct *table, boolean_t contents);
 
+GBLREF	mstr			extnam_str;
+GBLREF	mval			dollar_zgbldir;
+
+#define GET_CURR_GLD_NAME(GLDNAME)					\
+MBSTART {								\
+	GLDNAME = extnam_str.len ? &extnam_str : &dollar_zgbldir.str;	\
+} MBEND
+
+/* Define constants for a dummy gld file */
+#define	IMPOS_GBLNAME_7			"\xFF\xFF\xFF\xFF\xFF\xFF\xFF"	/* 7-bytes of 0xFF */
+#define	IMPOS_GBLNAME_8			IMPOS_GBLNAME_7 "\xFF"		/* 8-bytes of 0xFF */
+#define	IMPOSSIBLE_GBLNAME_31		IMPOS_GBLNAME_8 IMPOS_GBLNAME_8 IMPOS_GBLNAME_8 IMPOS_GBLNAME_7
+#define	DUMMY_GBLDIR_N_REGS		2		/* one for "DEFAULT" region and one for "default" (statsdb region) */
+#define	DUMMY_GBLDIR_N_MAPS		5		/* one each for local locks "#)", "%", "%Y", "%Z" and 0xFFFFFF... */
+#define DUMMY_GBLDIR_FIRST_MAP		"#)"		/* local locks */
+#define DUMMY_GBLDIR_SECOND_MAP		"%"		/* start of valid global name */
+#define DUMMY_GBLDIR_THIRD_MAP		"%Y"		/* map for non-%Y global name */
+#define DUMMY_GBLDIR_FOURTH_MAP		"%Z"		/* map for %Y global name */
+#define DUMMY_GBLDIR_FIFTH_MAP		IMPOSSIBLE_GBLNAME_31 /* last map always corresponds to impossible global name */
+#define	DUMMY_GBLDIR_MAP_GVN_SIZE(KEY)	(SIZEOF(KEY)-1)	/* SIZEOF already counts the null byte in the literal so remove it */
+#define	DUMMY_GBLDIR_MAP_KEY_SIZE(KEY)	(SIZEOF(KEY)+1)	/* +1 for second null byte (SIZEOF already counts the 1st null byte) */
+#define	DUMMY_GBLDIR_VAR_MAP_SIZE	ROUND_UP2(DUMMY_GBLDIR_MAP_KEY_SIZE(DUMMY_GBLDIR_FIRST_MAP)		\
+							+ DUMMY_GBLDIR_MAP_KEY_SIZE(DUMMY_GBLDIR_SECOND_MAP)	\
+							+ DUMMY_GBLDIR_MAP_KEY_SIZE(DUMMY_GBLDIR_THIRD_MAP)	\
+							+ DUMMY_GBLDIR_MAP_KEY_SIZE(DUMMY_GBLDIR_FOURTH_MAP)	\
+							+ DUMMY_GBLDIR_MAP_KEY_SIZE(DUMMY_GBLDIR_FIFTH_MAP), 8)
+#define	DUMMY_GBLDIR_FIX_MAP_SIZE	(DUMMY_GBLDIR_N_MAPS * SIZEOF(gd_binding))
+#define	DUMMY_GBLDIR_TOT_MAP_SIZE	(DUMMY_GBLDIR_FIX_MAP_SIZE + DUMMY_GBLDIR_VAR_MAP_SIZE)
+/* Note: The below definition of DUMMY_GBLDIR_SIZE does not include SIZEOF(header_struct) that is there in the actual gld file */
+#define	DUMMY_GBLDIR_SIZE		(SIZEOF(gd_addr) + DUMMY_GBLDIR_TOT_MAP_SIZE			\
+							 + DUMMY_GBLDIR_N_REGS * SIZEOF(gd_region)	\
+							 + DUMMY_GBLDIR_N_REGS * SIZEOF(gd_segment))
+
 #endif
diff --git a/sr_port/dse.h b/sr_port/dse.h
index 5df50ba..3a93280 100644
--- a/sr_port/dse.h
+++ b/sr_port/dse.h
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -264,7 +264,6 @@ void		dse_help(void);
 void		dse_integ(void);
 boolean_t	dse_is_blk_free(block_id blk, sm_int_ptr_t cycle, cache_rec_ptr_ptr_t cr);
 int		dse_is_blk_in(sm_uc_ptr_t rp, sm_uc_ptr_t r_top, short size);
-int		dse_key_srch(block_id srch, block_id_ptr_t pp, int4 *off, char *targ_key, int targ_len);
 int		dse_ksrch(block_id srch, block_id_ptr_t pp, int4 *off, char *targ_key, int targ_len);
 int4		dse_lm_blk_free(int4 blk, sm_uc_ptr_t base_addr);
 void		dse_m_rest(block_id blk, unsigned char *bml_list, int4 bml_size, sm_vuint_ptr_t blks_ptr, bool in_dir_tree);
diff --git a/sr_port/dse.hlp b/sr_port/dse.hlp
index e44b0b2..e51fd8c 100755
--- a/sr_port/dse.hlp
+++ b/sr_port/dse.hlp
@@ -1216,8 +1216,8 @@
 
      o With -ALL specified, DSE includes all region of the current global
        directory for cache recovery.
-     o Attempt DSE -RECOVER only if a DSE CACHE -VERIFY commands reports the
-       cache is "NOT clean".
+     o Attempt DSE CACHE -RECOVER only if a DSE CACHE -VERIFY commands
+       reports the cache is "NOT clean".
 
    -SH[OW]
 
@@ -1551,11 +1551,11 @@
    File            /home/jdoe/.fis-gtm/V6.1-000_x86_64/g/gtm.dat
    Region          DEFAULT
    Date/Time       27-JAN-2014 03:13:40 [$H = 63214,11620]
-     Access method                          BG  Global Buffers                1024
+     Access method                          MM  Global Buffers                1024
      Reserved Bytes                          0  Block size (in bytes)         1024
      Maximum record size                   256  Starting VBN                   513
-     Maximum key size                       64  Total blocks            0x000000C9
-     Null subscripts                     NEVER  Free blocks             0x00000056
+     Maximum key size                       64  Total blocks            0x00000065
+     Null subscripts                     NEVER  Free blocks             0x0000005E
      Standard Null Collation             FALSE  Free space              0x00000000
      Last Record Backup     0x0000000000000001  Extension Count                100
      Last Database Backup   0x0000000000000001  Number of local maps             1
@@ -1563,18 +1563,14 @@
      In critical section            0x00000000  Timers pending                   0
      Cache freeze id                0x00000000  Flush timer            00:00:01:00
      Freeze match                   0x00000000  Flush trigger                  960
-     Current transaction    0x0000000000002712  No. of writes/flush              7
+     Freeze online                       FALSE  Freeze online autorelease    FALSE
+     Current transaction    0x0000000000000006  No. of writes/flush              7
      Maximum TN             0xFFFFFFFF83FFFFFF  Certified for Upgrade to        V6
      Maximum TN Warn        0xFFFFFFFD93FFFFFF  Desired DB Format               V6
      Master Bitmap Size                    496  Blocks to Upgrade       0x00000000
      Create in progress                  FALSE  Modified cache blocks            0
      Reference count                         1  Wait Disk                        0
-     Journal State               [inactive] ON  Journal Before imaging        TRUE
-     Journal Allocation                   2048  Journal Extension             2048
-     Journal Buffer Size                  2308  Journal Alignsize             4096
-     Journal AutoSwitchLimit           8386560  Journal Epoch Interval          30
-     Journal Yield Limit                     8  Journal Sync IO              FALSE
-     Journal File: /home/jdoe/.fis-gtm/V6.1-000_x86_64/g/gtm.mjl
+     Journal State                    DISABLED
      Mutex Hard Spin Count                 128  Mutex Sleep Spin Count         128
      Mutex Queue Slots                    1024  KILLs in progress                0
      Replication State                     OFF  Region Seqno    0x0000000000000001
@@ -1582,6 +1578,10 @@
      Endian Format                      LITTLE  Commit Wait Spin Count          16
      Database file encrypted             FALSE  Inst Freeze on Error         FALSE
      Spanning Node Absent                 TRUE  Maximum Key Size Assured      TRUE
+     Defer allocation                     TRUE  Spin sleep time mask    0x00000000
+     Async IO                              OFF  WIP queue cache blocks           0
+     DB is auto-created                  FALSE  DB shares gvstats             TRUE
+     LOCK shares DB critical section     FALSE
 
    Note that the certain fileheader elements appear depending on the current
    state of database. For example, if Journaling is not enabled in the
@@ -2941,7 +2941,7 @@
 1 Copyright
    Copyright
 
-   Copyright 2016
+   Copyright 2017
 
    Fidelity National Information Services, Inc. and/or its subsidiaries. All
    rights reserved.
@@ -2963,7 +2963,7 @@
 
    **Note**
 
-   This help file is a concise representation of revision V6.3-000 of the
+   This help file is a concise representation of revision V6.3-001 of the
    UNIX Administration and Operations Guide. To obtain a copy of the current
    revision, go to www.fis-gtm.com and then click on the User Documentation
    tab.
diff --git a/sr_port/dse_all.c b/sr_port/dse_all.c
index ed650c8..d7c8166 100755
--- a/sr_port/dse_all.c
+++ b/sr_port/dse_all.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -126,14 +126,15 @@ void dse_all(void)
 	region_list = NULL;
 	for (i = 0, reg = original_header->regions; i < original_header->n_regions; i++, reg++)
 	{
-		if ((dba_bg != REG_ACC_METH(reg)) && (dba_mm != REG_ACC_METH(reg)))
+		if (!IS_REG_BG_OR_MM(reg))
 		{
 			util_out_print("Skipping region !AD: not BG or MM access", TRUE, REG_LEN_STR(reg));
 			continue;
 		}
 		if (!reg->open)
 		{
-			util_out_print("Skipping region !AD as it is not bound to any namespace.", TRUE, REG_LEN_STR(reg));
+			if (!IS_STATSDB_REG(reg))
+				util_out_print("Skipping region !AD as it is not bound to any namespace.", TRUE, REG_LEN_STR(reg));
 			continue;
 		}
 		if (dump)
@@ -144,17 +145,15 @@ void dse_all(void)
 			dse_dmp_fhead();
 			assert(!dse_all_dump);	/* should have been reset by "dse_dmp_fhead" */
 		} else
-		{	/* put on region list in order of ftok value so processed in same order that crits are obtained */
-			csa = &FILE_INFO(reg)->s_addrs;
+			/* put on region list in order of ftok value so processed in same order that crits are obtained */
 			insert_region(reg, &(region_list), NULL, SIZEOF(tp_region));
-		}
 	}
 	if (!dump)
 	{	/* Now run the list of regions in the sorted ftok order to execute the desired commands */
 		for (rg = region_list; NULL != rg; rg = rg->fPtr)
 		{
 			gv_cur_region = rg->reg;
-			assert((dba_bg == REG_ACC_METH(gv_cur_region)) || (dba_mm == REG_ACC_METH(gv_cur_region)));
+			assert(IS_REG_BG_OR_MM(gv_cur_region));
 			cs_addrs = &FILE_INFO(gv_cur_region)->s_addrs;
 			csd = cs_addrs->hdr;
 			patch_curr_blk = get_dir_root();
@@ -170,7 +169,7 @@ void dse_all(void)
 				crash_count = cs_addrs->critical->crashcnt;
 			if (freeze)
 			{
-				while (REG_ALREADY_FROZEN == region_freeze(gv_cur_region, TRUE, override, FALSE))
+				while (REG_ALREADY_FROZEN == region_freeze(gv_cur_region, TRUE, override, FALSE, FALSE, FALSE))
 				{
 					hiber_start(1000);
 					if (util_interrupt)
@@ -179,8 +178,10 @@ void dse_all(void)
                         	                break;
 					}
 				}
-				if (freeze != !(csd->freeze))
+				if (freeze != !(FROZEN(csd)))
+				{
 					util_out_print("Region !AD is now FROZEN", TRUE, REG_LEN_STR(gv_cur_region));
+				}
 			}
 			was_crit = cs_addrs->now_crit;
 			if (seize)
@@ -217,7 +218,7 @@ void dse_all(void)
 			}
 			if (nofreeze)
 			{
-				if (REG_ALREADY_FROZEN == region_freeze(gv_cur_region, FALSE, override, FALSE))
+				if (REG_ALREADY_FROZEN == region_freeze(gv_cur_region, FALSE, override, FALSE, FALSE, FALSE))
 					util_out_print("Region: !AD is frozen by another user, not releasing freeze", TRUE,
 						REG_LEN_STR(gv_cur_region));
 				else
diff --git a/sr_port/dse_chng_bhead.c b/sr_port/dse_chng_bhead.c
index b54362a..bb5aa7d 100755
--- a/sr_port/dse_chng_bhead.c
+++ b/sr_port/dse_chng_bhead.c
@@ -46,7 +46,7 @@
 #include "gtmmsg.h"
 #include "gtmcrypt.h"
 
-GBLREF	cache_rec		*cr_array[((MAX_BT_DEPTH * 2) - 1) * 2]; /* Maximum number of blocks that can be in transaction */
+GBLREF	cache_rec_ptr_t		cr_array[]; /* Maximum number of blocks that can be in transaction */
 GBLREF	char			*update_array, *update_array_ptr;
 GBLREF	cw_set_element		cw_set[];
 GBLREF	gd_region		*gv_cur_region;
diff --git a/sr_port/dse_chng_fhead.c b/sr_port/dse_chng_fhead.c
index 0fbd9d3..626ba21 100644
--- a/sr_port/dse_chng_fhead.c
+++ b/sr_port/dse_chng_fhead.c
@@ -100,7 +100,7 @@ void dse_chng_fhead(void)
 		cs_data->image_count != image_count) && !override)
 #	endif
 #	ifdef UNIX
-	if (cs_data->freeze && (cs_data->image_count != process_id)
+	if (FROZEN(cs_data) && (cs_data->image_count != process_id)
 		&& !override)
 #	endif
 	{
@@ -529,7 +529,7 @@ void dse_chng_fhead(void)
 		x = cli_t_f_n("FREEZE");
 		if (1 == x)
 		{
-			while (REG_ALREADY_FROZEN == region_freeze(gv_cur_region, TRUE, override, FALSE))
+			while (REG_ALREADY_FROZEN == region_freeze(gv_cur_region, TRUE, override, FALSE, FALSE, FALSE))
 			{
 				hiber_start(1000);
 				if (util_interrupt)
@@ -541,14 +541,13 @@ void dse_chng_fhead(void)
 		}
 		else if (0 == x)
 		{
-			if (REG_ALREADY_FROZEN == region_freeze(gv_cur_region, FALSE, override, FALSE))
+			if (REG_ALREADY_FROZEN == region_freeze(gv_cur_region, FALSE, override, FALSE, FALSE, FALSE))
 			{
 				util_out_print("Region: !AD  is frozen by another user, not releasing freeze.",
 					TRUE, REG_LEN_STR(gv_cur_region));
 			}
-
 		}
-		if (x != !(cs_data->freeze))
+		if (x != !(FROZEN(cs_data)))
 			util_out_print("Region !AD is now !AD", TRUE, REG_LEN_STR(gv_cur_region), LEN_AND_STR(freeze_msg[x]));
 		cs_addrs->persistent_freeze = x;	/* secshr_db_clnup() shouldn't clear the freeze up */
 	}
diff --git a/sr_port/dse_dmp_fhead.c b/sr_port/dse_dmp_fhead.c
index 8a876a4..611effd 100755
--- a/sr_port/dse_dmp_fhead.c
+++ b/sr_port/dse_dmp_fhead.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -45,9 +45,7 @@
 #include "op.h"
 #include "shmpool.h"	/* Needed for the shmpool structures */
 #include "mutex.h"
-#ifdef GTM_SNAPSHOT
 #include "db_snapshot.h"
-#endif
 
 #define MAX_UTIL_LEN    	64
 #define NEXT_EPOCH_TIME_SPACES	"                   " /* 19 spaces, we have 19 character field width to output Next Epoch Time */
@@ -88,9 +86,9 @@ LITREF	char		*gtm_dbversion_table[];
 
 void dse_dmp_fhead (void)
 {
-	boolean_t		jnl_buff_open;
+	boolean_t		is_mm, jnl_buff_open;
 	unsigned char		util_buff[MAX_UTIL_LEN], buffer[MAXNUMLEN];
-	int			util_len, rectype, time_len, index;
+	int			util_len, rectype, time_len, index, activeque_cnt, freeque_cnt, wipque_cnt;
 	uint4			jnl_status;
 	enum jnl_state_codes	jnl_state;
 	gds_file_id		zero_fid;
@@ -106,8 +104,7 @@ void dse_dmp_fhead (void)
 	uint4			pid;
 	boolean_t		new_line;
 	unsigned char		outbuf[GTMCRYPT_HASH_HEX_LEN + 1];
-	GTM_SNAPSHOT_ONLY(
-		shm_snapshot_t	*ss_shm_ptr;)
+	shm_snapshot_t		*ss_shm_ptr;
 
 	is_dse_all = dse_all_dump;
 	dse_all_dump = FALSE;
@@ -116,6 +113,9 @@ void dse_dmp_fhead (void)
 	cnl = csa->nl;
         jnl_state = (enum jnl_state_codes)csd->jnl_state;
 	jnl_buff_open = (0 != cnl->jnl_file.u.inode);
+	activeque_cnt = cnl->wcs_active_lvl;
+	wipque_cnt = cnl->wcs_wip_lvl;
+	freeque_cnt = cnl->wc_in_free;
 	if (is_dse_all || (CLI_NEGATED != cli_present("BASIC")))
 	{
 		util_out_print("!/File            !AD", TRUE, gv_cur_region->dyn.addr->fname_len,
@@ -124,8 +124,8 @@ void dse_dmp_fhead (void)
 		GET_CURR_TIME_IN_DOLLARH_AND_ZDATE(dollarh_mval, dollarh_buffer, zdate_mval, zdate_buffer);
 		util_out_print("Date/Time       !AD [$H = !AD]", TRUE, zdate_mval.str.len, zdate_mval.str.addr,
 				dollarh_mval.str.len, dollarh_mval.str.addr);
-		util_out_print("  Access method                          !AD", FALSE,
-			2, (csd->acc_meth == dba_mm) ? "MM" : "BG");
+		is_mm = (csd->acc_meth == dba_mm);
+		util_out_print("  Access method                          !AD", FALSE, 2, is_mm ? "MM" : "BG");
 		util_out_print("  Global Buffers        !12UL", TRUE, csd->n_bts);
 		util_out_print("  Reserved Bytes        !19UL", FALSE, csd->reserved_bytes);
 		util_out_print("  Block size (in bytes) !12UL", TRUE, csd->blk_size);
@@ -165,6 +165,10 @@ void dse_dmp_fhead (void)
 		dse_puttime(csd->flush_time, "  Flush timer            !AD", TRUE);
 		util_out_print("  Freeze match                   0x!XL", FALSE, csd->image_count ? csd->image_count : 0);
 		util_out_print("  Flush trigger         !12UL", TRUE, csd->flush_trigger);
+		util_out_print("  Freeze online                 !AD", FALSE, 11,
+					(csd->freeze_online) ? "       TRUE" : "      FALSE");
+		util_out_print("  Freeze online autorelease    !AD", TRUE, 5,
+					(csd->freeze_online & CHILLED_AUTORELEASE_MASK) ? " TRUE" : "FALSE");
 		util_out_print("  Current transaction    0x!16 at XQ", FALSE, &csa->ti->curr_tn);
 		util_out_print("  No. of writes/flush   !12UL", TRUE, csd->n_wrt_per_flu);
 		util_out_print("  Maximum TN             0x!16 at XQ", FALSE, &csd->max_tn);
@@ -188,13 +192,7 @@ void dse_dmp_fhead (void)
 		}
 		util_out_print("  Create in progress           !AD", FALSE, 12, (csd->createinprogress) ?
 			"        TRUE" : "       FALSE");
-
-#		ifdef CNTR_WORD_32
-		util_out_print("  Modified cache blocks !12UL", TRUE, cnl->wcs_active_lvl);
-#		else
-		util_out_print("  Modified cache blocks !12UW", TRUE, cnl->wcs_active_lvl);
-#		endif
-
+		util_out_print("  Modified cache blocks !12UL", TRUE, activeque_cnt);
 		util_out_print("  Reference count       !19UL", FALSE, cnl->ref_cnt);
 		util_out_print("  Wait Disk             !12UL", TRUE, csd->wait_disk_space);
 		util_out_print("  Journal State               !AD", (jnl_notallowed == jnl_state), 13,
@@ -238,6 +236,14 @@ void dse_dmp_fhead (void)
 		util_out_print("  Maximum Key Size Assured     !AD", TRUE, 5, csd->maxkeysz_assured ? " TRUE" : "FALSE");
 		util_out_print("  Defer allocation                    !AD", FALSE, 5, csd->defer_allocate ? " TRUE" : "FALSE");
 		util_out_print("  Spin sleep time mask    0x!8XL", TRUE, SPIN_SLEEP_MASK(csd));
+		util_out_print("  Async IO                              !AD", FALSE, 3, csd->asyncio ? " ON" : "OFF");
+		assert(!is_mm || (0 == (activeque_cnt + wipque_cnt + freeque_cnt)));
+		util_out_print("  WIP queue cache blocks!12UL", TRUE, wipque_cnt);
+		util_out_print("  DB is auto-created                  !AD", FALSE, 5,
+				  (RDBF_AUTODB & csd->reservedDBFlags) ? " TRUE" : "FALSE");
+		util_out_print("  DB shares gvstats            !AD", TRUE, 5,
+				  ! (RDBF_NOSTATS & csd->reservedDBFlags) ? " TRUE" : "FALSE");
+		util_out_print("  LOCK shares DB critical section     !AD", TRUE, 5, csd->lock_crit_with_db ? " TRUE" : "FALSE");
 	}
 	if (CLI_PRESENT == cli_present("ALL"))
 	{	/* Only dump if -/ALL as if part of above display */
@@ -254,7 +260,7 @@ void dse_dmp_fhead (void)
                 util_out_print(0, TRUE);
 		util_out_print("  Total Global Buffers           0x!XL", FALSE, csd->n_bts);
 		util_out_print("  Phase2 commit pid count 0x!XL", TRUE, cnl->wcs_phase2_commit_pidcnt);
-		util_out_print("  Dirty Global Buffers           0x!XL", FALSE, cnl->wcs_active_lvl);
+		util_out_print("  Dirty Global Buffers           0x!XL", FALSE, activeque_cnt);
 		util_out_print("  Write cache timer count 0x!XL", TRUE, cnl->wcs_timers);
 		new_line = FALSE;
 		for (index = 0; MAX_WT_PID_SLOTS > index; index++)
@@ -268,7 +274,7 @@ void dse_dmp_fhead (void)
 			}
 		}
 		util_out_print(0, new_line);
-		util_out_print("  Free Global Buffers            0x!XL", FALSE, cnl->wc_in_free);
+		util_out_print("  Free Global Buffers            0x!XL", FALSE, freeque_cnt);
 		util_out_print("  wcs_wtstart pid count   0x!XL", TRUE, cnl->in_wtstart);
 		util_out_print("  Write Cache is Blocked              !AD", FALSE, 5, (cnl->wc_blocked ? " TRUE" : "FALSE"));
 		util_out_print("  wcs_wtstart intent cnt  0x!XL", TRUE, cnl->intent_wtstart);
@@ -279,7 +285,7 @@ void dse_dmp_fhead (void)
 		util_out_print("  FTOK counter halted          !AD", TRUE, 5, cnl->ftok_counter_halted ? " TRUE" : "FALSE");
 		util_out_print("  Access control rundown bypasses !9UL", FALSE, cnl->dbrndwn_access_skip);
 		util_out_print("  FTOK rundown bypasses   !10UL", TRUE, cnl->dbrndwn_ftok_skip);
-		util_out_print("  Epoch taper    !AD", TRUE, 5, (csd->epoch_taper ? " TRUE" : "FALSE"));
+		util_out_print("  Epoch taper                         !AD", TRUE, 5, (csd->epoch_taper ? " TRUE" : "FALSE"));
 		new_line = FALSE;
 		for (index = 0; MAX_WTSTART_PID_SLOTS > index; index++)
 		{
@@ -295,8 +301,8 @@ void dse_dmp_fhead (void)
 		util_out_print(0, TRUE);
 		util_out_print("  Actual kills in progress     !12UL", FALSE, csd->kill_in_prog);
 		util_out_print("  Abandoned Kills       !12UL", TRUE, csd->abandoned_kills);
-		util_out_print("  Process(es) inhibiting KILLs        !5UL", TRUE, cnl->inhibit_kills);
-
+		util_out_print("  Process(es) inhibiting KILLs        !5UL", FALSE, cnl->inhibit_kills);
+		util_out_print("  DB is a StatsDB              !AD", TRUE, 5, IS_RDBF_STATSDB(csd) ? " TRUE" : "FALSE");
 		util_out_print(0, TRUE);
 		util_out_print("  DB Trigger cycle of ^#t      !12UL", TRUE, csd->db_trigger_cycle);
 		util_out_print(0, TRUE);
@@ -501,7 +507,6 @@ void dse_dmp_fhead (void)
 		util_out_print("  Pre read trigger factor [% upd rsrvd] !3UL", FALSE, csd->pre_read_trigger_factor);
 		util_out_print("  Upd writer trigger [%flshTrgr] !3UL", TRUE, csd->writer_trigger_factor);
 	}
-#	ifdef GTM_SNAPSHOT
 	if (NEED_TO_DUMP("SNAPSHOT"))
 	{
 		util_out_print(0, TRUE);
@@ -522,6 +527,5 @@ void dse_dmp_fhead (void)
 		util_out_print("  Snapshot shared memory identifier          !12SL", TRUE, ss_shm_ptr->ss_info.ss_shmid);
 		util_out_print("  Snapshot file name                   !AD", TRUE, LEN_AND_STR(ss_shm_ptr->ss_info.shadow_file));
 	}
-#	endif
         return;
 }
diff --git a/sr_port/dse_f_key.c b/sr_port/dse_f_key.c
index ace7252..b7ec194 100755
--- a/sr_port/dse_f_key.c
+++ b/sr_port/dse_f_key.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -53,7 +54,7 @@ STATICFNDEF void print_reg_if_mismatch(char *key, int keylen)
 	 */
 	if (!IS_GVKEY_HASHT_GBLNAME(keylen -2, key))
 	{
-		map = gv_srch_map(original_header, key, keylen - 2); /* -2 to remove two trailing 0s */
+		map = gv_srch_map(original_header, key, keylen - 2, SKIP_BASEDB_OPEN_FALSE); /* -2 to remove two trailing 0s */
 		reg = map->reg.addr;
 		if (gv_cur_region != reg)
 		{
@@ -93,7 +94,7 @@ void dse_f_key(void)
 	UNIX_ONLY(nogbldir_present = (CLI_NEGATED == cli_present("GBLDIR"));)
 	VMS_ONLY(nogbldir_present = TRUE;)
 	DSE_GRAB_CRIT_AS_APPROPRIATE(was_crit, was_hold_onto_crit, nocrit_present, cs_addrs, gv_cur_region);
-	if (!dse_key_srch(root_path[0], &root_path[1], &root_offset[0], &targ_key_root[0], size_root))
+	if (!dse_ksrch(root_path[0], &root_path[1], &root_offset[0], &targ_key_root[0], size_root))
 	{
 		util_out_print("!/Key not found, no root present.", TRUE);
 		if (!nogbldir_present)
@@ -106,7 +107,7 @@ void dse_f_key(void)
 	patch_path_count = 1;
 	path[0] = ksrch_root;
 	patch_find_root_search = FALSE;
-	if (!dse_key_srch(path[0], &path[1], &offset[0], &targ_key[0], size))
+	if (!dse_ksrch(path[0], &path[1], &offset[0], &targ_key[0], size))
 	{	memcpy(util_buff, "!/Key not found, would be in block  ", 36);
 		util_len = 36;
 		util_len += i2hex_nofill(path[patch_path_count - 2], (uchar_ptr_t)&util_buff[util_len], 8);
diff --git a/sr_port/dse_f_reg.c b/sr_port/dse_f_reg.c
index 3e5803c..2625353 100755
--- a/sr_port/dse_f_reg.c
+++ b/sr_port/dse_f_reg.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2014 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -23,6 +24,7 @@
 #include "cli.h"
 #include "dse.h"
 #include "gtmmsg.h"
+#include "gvcst_protos.h"
 
 GBLREF block_id		patch_curr_blk;
 GBLREF gd_region	*gv_cur_region;
@@ -45,7 +47,7 @@ void dse_f_reg(void)
 	unsigned short	rnlen;
 	int		i;
 	boolean_t	found;
-	gd_region	*ptr;
+	gd_region	*regptr, *statsDBreg;
 
 	rnlen = SIZEOF(rn);
 	if (!cli_get_str("REGION", rn, &rnlen))
@@ -53,10 +55,10 @@ void dse_f_reg(void)
 	if (('*' == rn[0]) && (1 == rnlen))
 	{
 		util_out_print("List of global directory:!_!AD!/", TRUE, dollar_zgbldir.str.len, dollar_zgbldir.str.addr);
-		for (i = 0, ptr = original_header->regions; i < original_header->n_regions; i++, ptr++)
+		for (i = 0, regptr = original_header->regions; i < original_header->n_regions; i++, regptr++)
 		{
-			util_out_print("!/File  !_!AD", TRUE, ptr->dyn.addr->fname_len, &ptr->dyn.addr->fname[0]);
-			util_out_print("Region!_!AD", TRUE, REG_LEN_STR(ptr));
+			util_out_print("!/File  !_!AD", TRUE, regptr->dyn.addr->fname_len, &regptr->dyn.addr->fname[0]);
+			util_out_print("Region!_!AD", TRUE, REG_LEN_STR(regptr));
 		}
 		return;
 	}
@@ -64,9 +66,9 @@ void dse_f_reg(void)
 	for (i = 0; i < rnlen; i++)				/* Region names are always upper-case ASCII */
 		rn[i] = TOUPPER(rn[i]);
 	found = FALSE;
-	for (i = 0, ptr = original_header->regions; i < original_header->n_regions ;i++, ptr++)
+	for (i = 0, regptr = original_header->regions; i < original_header->n_regions ;i++, regptr++)
 	{
-		if (found = !memcmp(&ptr->rname[0], &rn[0], MAX_RN_LEN))
+		if (found = !memcmp(&regptr->rname[0], &rn[0], MAX_RN_LEN))
 			break;
 	}
 	if (!found)
@@ -74,37 +76,46 @@ void dse_f_reg(void)
 		gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_NOREGION, 2, rnlen, rn);
 		return;
 	}
-	if (ptr == gv_cur_region)
+	assert(!IS_STATSDB_REG(regptr));
+	if (CLI_PRESENT == cli_present("STATS"))
+	{	/* Go to corresponding STATSDB if present */
+		if (!(RDBF_NOSTATS & regptr->reservedDBFlags))
+		{
+			BASEDBREG_TO_STATSDBREG(regptr, statsDBreg);
+			assert(NULL != statsDBreg);
+			if (!statsDBreg->open)
+				gv_init_reg(statsDBreg);
+			regptr = statsDBreg;
+		} else
+		{
+			util_out_print("Error:  Region: !AD does not have an associated stats region", TRUE, REG_LEN_STR(regptr));
+			return;
+		}
+	}
+	if (regptr == gv_cur_region)
 	{
 		util_out_print("Error:  already in region: !AD", TRUE, REG_LEN_STR(gv_cur_region));
 		return;
 	}
 	/* reg_cmcheck would have already been called for ALL regions at region_init time. In Unix, this would have set
 	 * reg->dyn.addr->acc_meth to dba_cm if it is remote database. So we can safely use this to check if the region
-	 * is dba_cm or not. In VMS though reg_cmcheck does not modify acc_meth so we call reg_cmcheck in that case.
+	 * is dba_cm or not.
 	 */
-	if (UNIX_ONLY(dba_cm == ptr->dyn.addr->acc_meth) VMS_ONLY(reg_cmcheck(ptr)))
+	if (dba_cm == regptr->dyn.addr->acc_meth)
 	{
-		gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_NOGTCMDB, 4, LEN_AND_LIT("DSE"), rnlen, rn);	/* no VMS test */
-		return;
-	}
-#	ifdef VMS
-	if (dba_usr == REG_ACC_METH(ptr))
-	{	/* VMS only; no test */
-		gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_NOUSERDB, 4, LEN_AND_LIT("DSE"), rnlen, rn);
+		gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_NOGTCMDB, 4, LEN_AND_LIT("DSE"), rnlen, rn);
 		return;
 	}
-#	endif
-	if (!ptr->open)
+	if (!regptr->open)
 	{
 		gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_DSENOTOPEN, 2, rnlen, rn);
 		return;
 	}
 	if (cs_addrs->now_crit)
 		util_out_print("Warning:  now leaving region in critical section: !AD", TRUE, REG_LEN_STR(gv_cur_region));
-	gv_cur_region = ptr;
+	gv_cur_region = regptr;
 	gv_target = NULL;	/* to prevent out-of-sync situations between gv_target and cs_addrs */
-	assert((dba_mm == REG_ACC_METH(gv_cur_region)) || (dba_bg == REG_ACC_METH(gv_cur_region)));
+	assert(IS_REG_BG_OR_MM(gv_cur_region));
 	cs_addrs = &FILE_INFO(gv_cur_region)->s_addrs;
 	cs_data = cs_addrs->hdr;
 	if (cs_addrs && cs_addrs->critical)
diff --git a/sr_port/dse_find_gvt.c b/sr_port/dse_find_gvt.c
index e33b129..4e9760b 100644
--- a/sr_port/dse_find_gvt.c
+++ b/sr_port/dse_find_gvt.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2013-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -36,7 +37,7 @@ gv_namehead *dse_find_gvt(gd_region *reg, char *name, int name_len)
 	sgmnt_addrs		*csa;
 
 	assert(reg->open);
-	assert((dba_mm == REG_ACC_METH(reg)) || (dba_bg == REG_ACC_METH(reg)));
+	assert(IS_REG_BG_OR_MM(reg));
 	csa = &FILE_INFO(reg)->s_addrs;
 	gvt_hashtab = (hash_table_mname *)csa->miscptr;
 	if (NULL == gvt_hashtab)
diff --git a/sr_port/dse_flush.c b/sr_port/dse_flush.c
index 3dacd96..8f11f1d 100755
--- a/sr_port/dse_flush.c
+++ b/sr_port/dse_flush.c
@@ -32,8 +32,6 @@ error_def(ERR_DSEONLYBGMM);
 
 void dse_flush(void)
 {
-	boolean_t	was_crit;
-
 	if (gv_cur_region->read_only)
 		rts_error_csa(CSA_ARG(cs_addrs) VARLSTCNT(4) ERR_DBRDONLY, 2, DB_LEN_STR(gv_cur_region));
 
@@ -43,12 +41,7 @@ void dse_flush(void)
 	case dba_mm:
 		if (cs_addrs->critical)
 			crash_count = cs_addrs->critical->crashcnt;
-		was_crit = cs_addrs->now_crit;
-		if (!was_crit)
-			grab_crit_encr_cycle_sync(gv_cur_region);
 		wcs_flu(WCSFLU_FLUSH_HDR | WCSFLU_WRITE_EPOCH | WCSFLU_SYNC_EPOCH);
-		if (!was_crit)
-			rel_crit(gv_cur_region);
 		break;
 	default:
 		rts_error_csa(CSA_ARG(cs_addrs) VARLSTCNT(4) ERR_DSEONLYBGMM, 2, LEN_AND_LIT("BUFFER_FLUSH"));
diff --git a/sr_port/dse_integ.c b/sr_port/dse_integ.c
index 18a3c2e..f9f63fd 100755
--- a/sr_port/dse_integ.c
+++ b/sr_port/dse_integ.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2014 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -43,6 +44,10 @@ void dse_integ(void)
 	int		util_len;
 	int4		dummy_int, nocrit_present;
 	sm_uc_ptr_t	bp;
+	unsigned char	*r_ptr;
+	char		key_buff[MAX_KEY_SZ + 1];
+	int		key_len;
+	gv_namehead	*gvt = NULL;
 
 	if (BADDSEBLK == (blk = dse_getblk("BLOCK", DSEBMLOK, DSEBLKCUR)))		/* WARNING: assignment */
 		return;
@@ -58,7 +63,14 @@ void dse_integ(void)
 	DSE_GRAB_CRIT_AS_APPROPRIATE(was_crit, was_hold_onto_crit, nocrit_present, cs_addrs, gv_cur_region);
 	if (!(bp = t_qread(blk, &dummy_int, &dummy_cr)))
 		rts_error_csa(CSA_ARG(cs_addrs) VARLSTCNT(1) ERR_DSEBLKRDFAIL);
-	if (TRUE == cert_blk(gv_cur_region, blk, (blk_hdr_ptr_t)bp, 0, FALSE))
+	if (0 == ((blk_hdr_ptr_t)bp)->levl)
+	{
+		r_ptr = (unsigned char *)((sm_uc_ptr_t)bp + SIZEOF(blk_hdr)) + SIZEOF(rec_hdr);
+		for (key_len = 0; KEY_DELIMITER != *r_ptr; r_ptr++)
+			key_buff[key_len++] = *r_ptr;;
+		gvt = dse_find_gvt(gv_cur_region, (char *)key_buff, (key_len));
+	}
+	if (TRUE == cert_blk(gv_cur_region, blk, (blk_hdr_ptr_t)bp, 0, FALSE, gvt))
 		util_out_print("!/  No errors detected.!/", TRUE);
 	else
 		util_out_print(NULL, TRUE);
diff --git a/sr_port/dse_ksrch.c b/sr_port/dse_ksrch.c
index c5d248e..e27aa2a 100644
--- a/sr_port/dse_ksrch.c
+++ b/sr_port/dse_ksrch.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -116,31 +116,3 @@ int dse_ksrch(block_id srch,
 		return TRUE;
 	return FALSE;
 }
-
-int dse_key_srch(block_id srch, block_id_ptr_t key_path, int4 *off, char *targ_key, int targ_len)
-{
-	int	status;
-
-	status = dse_ksrch(srch, key_path, off, targ_key, targ_len);
-	if (status)
-		return status;
-	else if(!patch_find_root_search)
-	{	/* We are not searching for the global name in the directory tree and search for the regular-key
-		 * has failed. So, adjust to the input key with special subscript to indicate it as a spanning node key.
-		 * call dse_ksrch() again.
-		 */
-		targ_len -= 1;		/* back off 1 to overlay terminator */
-		SPAN_INITSUBS((span_subs *)(targ_key + targ_len), 0);
-		targ_len += SPAN_SUBS_LEN;
-		targ_key[targ_len++] = KEY_DELIMITER;
-		targ_key[targ_len++] = KEY_DELIMITER;
-		patch_path_count = 1; 	/*This indicates the length of the path of node in gvtree*/
-		patch_find_root_search = FALSE;
-		status = dse_ksrch(srch, key_path, off, targ_key, targ_len);
-		/* Undo updates to "targ_key" */
-		targ_len -= (SPAN_SUBS_LEN + 2);
-		targ_key[targ_len] = KEY_DELIMITER;
-		return status;
-	}
-	return FALSE;
-}
diff --git a/sr_port/dse_wcreinit.c b/sr_port/dse_wcreinit.c
index c468b99..a4b1201 100755
--- a/sr_port/dse_wcreinit.c
+++ b/sr_port/dse_wcreinit.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -55,7 +55,7 @@ void dse_wcreinit (void)
 	if (cs_addrs->critical)
 		crash_count = cs_addrs->critical->crashcnt;
 	GET_CONFIRM_AND_HANDLE_NEG_RESPONSE
-	if (cs_addrs->hdr->acc_meth != dba_bg && cs_addrs->hdr->acc_meth != dba_mm)
+	if (!IS_CSD_BG_OR_MM(cs_addrs->hdr))
 	{
 		rts_error_csa(CSA_ARG(cs_addrs) VARLSTCNT(4) ERR_DSEONLYBGMM, 2, LEN_AND_LIT("WCINIT"));
 		return;
diff --git a/sr_port/dumpfhead.mpt b/sr_port/dumpfhead.mpt
new file mode 100644
index 0000000..9375fce
--- /dev/null
+++ b/sr_port/dumpfhead.mpt
@@ -0,0 +1,180 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;								;
+; Copyright (c) 2016-2017 Fidelity National Information		;
+; Services, Inc. and/or its subsidiaries. All rights reserved.	;
+;								;
+;	This source code contains the intellectual property	;
+;	of its copyright holder(s), and is made available	;
+;	under a license.  If you do not know the terms of	;
+;	the license, please stop and do not read further.	;
+;								;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;
+; Routine to demonstrate reading of fileheader fields.
+;
+dumpfhead(dbname)
+	new $etrap
+	new (dbname,debug)
+	set $etrap="quit"	; defer error handling to the caller
+	if '$data(debug) new debug set debug=0
+	do getfields(.record,dbname)
+	zwrite record
+	quit
+
+;
+; Routine to grab the fields and return them in the passed-in array
+;
+getfields(fldarray,dbname)
+	new $etrap
+	set $etrap="quit:$quit """" quit"		; Defer error handling to the caller
+	new BigEndian,Endian,FALSE,Hex,HexDigits,LittleEndian,NullChar,TRUE
+	new endian,fhead,fldstring,flddim,fldidx,fldlen,fldname,fldnum,fldoff
+	new fldraw,fldtype,gtmhdwr,gtmos,gtmver,gtmzv,label,offset,platformendian,saveIO
+	new skey,typeconvert,x,$zgbldir
+	kill fldarray			; Clean array for new insertions
+	;
+	; Initialize field type translation to simple types
+	;
+	set typeconvert("boolean_t")="int"
+	set typeconvert("char")="string"
+	set typeconvert("int")="int"
+	set typeconvert("int1")="int"
+	set typeconvert("int2")="int"
+	set typeconvert("int4")="int"
+	set typeconvert("int64_t")="hex"
+	set typeconvert("long")="hex"
+	set typeconvert("short")="int"
+	set typeconvert("size_t")="hex"
+	set typeconvert("ssize_t")="hex"
+	set typeconvert("uint1")="uint"
+	set typeconvert("uint2")="uint"
+	set typeconvert("uint64_t")="hex"
+	set typeconvert("unsigned")="uint"
+	set typeconvert("unsigned-char")="string"
+	set typeconvert("unsigned-int")="uint"
+	set typeconvert("unsigned-int1")="uint"
+	set typeconvert("unsigned-long")="hex"
+	set typeconvert("unsigned-short")="uint"
+	;
+	; Other initializations
+	;
+	set Hex(0)=1
+	for x=1:1:16 set Hex(x)=Hex(x-1)*16
+	set HexDigits="0123456789ABCDEF"
+	set TRUE=1,FALSE=0,BigEndian=1,LittleEndian=0
+	set platformendian("AIX","RS6000")=BigEndian
+	set platformendian("Linux","x86")=LittleEndian
+	set platformendian("Linux","x86_64")=LittleEndian
+	set platformendian("Solaris","SPARC")=BigEndian
+	set gtmzv=$ZVersion,gtmver=$ZPiece(gtmzv," ",2),gtmos=$ZPiece(gtmzv," ",3),gtmhdwr=$ZPiece(gtmzv," ",4)
+	set Endian=platformendian(gtmos,gtmhdwr)
+	set NullChar=$zchar(0)			; 0x00
+	;
+	; Read database fileheader
+	;
+	set saveIO=$IO
+	open dbname:(readonly:fixed:recordsize=8192:chset="M":nowrap:exception="do badopen")
+	use dbname:exception="goto eof:$zeof,filerr"
+	read fhead#8192			; Read 8K of fileheader
+	close dbname
+	use saveIO
+	if $zlength(fhead)'=8192 do
+	. write "GETFIELDS: Error - unable to read fileheader from ",dbname,!
+	. write:0'=$data(fhead) "GETFIELDS: Read only ",$zlength(fhead)," bytes",!
+	. zhalt 1
+	;
+	; Determine if this is a valid database header. Note that we don't
+	; even need to go into the ^gtmtypes database because the header is
+	; always at offset 0, with len=12
+	;
+	set label=$$formatfld($zextract(fhead,1,12),"char")
+	if (label'["GDSDYNUNX02")&(label'["GDSDYNUNX03") do
+	. write "GETFIELDS: Error - invalid fileheader format from ",dbname,!
+	. zhalt 1
+	;
+	; Now parse out the fields
+	;
+	set $zgbldir="$gtm_dist/gtmhelp.gld"
+	set skey="sgmnt_data"
+	for fldnum=1:1:^gtmtypes(skey,0) do
+	. set fldtype=^gtmtypes(skey,fldnum,"type")
+	. quit:(0=$data(typeconvert(fldtype)))		; Ignore unknown types (likely a sub-struct header)
+	. set fldname=^gtmtypes(skey,fldnum,"name")
+	. quit:(fldname["filler")
+	. set fldoff=^gtmtypes(skey,fldnum,"off")
+	. set fldlen=^gtmtypes(skey,fldnum,"len")
+	. set flddim=$get(^gtmtypes(skey,fldnum,"dim"),1)
+	. if (1=flddim) do
+	. . set fldarray(fldname)=$$formatfld($zextract(fhead,fldoff+1,fldoff+fldlen),fldtype)
+	. else  do  ; array handling, made to be similar to %PEEKBYNAME() output
+	. . set fldlen=fldlen\flddim
+	. . set fldstring=$$formatfld($zextract(fhead,fldoff+1,fldoff+fldlen),fldtype)
+	. . for fldidx=1:1:flddim-1 do
+	. . . set offset=fldoff+(fldlen*fldidx)
+	. . . set fldstring=fldstring_","_$$formatfld($zextract(fhead,offset+1,offset+fldlen),fldtype)
+	. . set fldarray(fldname)=fldstring
+	quit:$quit "" quit
+
+eof
+	close dbname
+badopen
+	write "The file """,dbname,""" had error: "
+	zmessage +$zstatus
+	zhalt 1
+
+;
+; Routine to format fields into their proper format.
+;
+formatfld(fldval,fldtype)
+	set fldtype=typeconvert(fldtype)
+	quit:("int"=fldtype) $$BinToSInt(fldval)
+	quit:("uint"=fldtype) $$BinToUInt(fldval)
+	quit:("hex"=fldtype) $$BinToHex(fldval)
+	quit fldval
+
+;
+; Convert binary data of indeterminate length to a (printable) unsigned decimal value
+;
+BinToUInt(bin)
+	new num,i,binlen
+	set num=0,binlen=$ZLength(bin)
+	if Endian=BigEndian for i=binlen:-1:1 set num=$zascii(bin,i)*Hex((binlen-i)*2)+num
+	else  for i=1:1:binlen set num=$zascii(bin,i)*Hex((i-1)*2)+num
+	quit num
+
+;
+; Convert binary data of indeterminate length to a (printable) unsigned decimal value
+;
+BinToSInt(bin)
+	new num,i,binlen,sgntst,sign,fix
+	set num=0,binlen=$zlength(bin),sign=1,fix=0
+	set sgntst=NullChar_bin
+	if Endian=BigEndian do  ; See if we need to deal with a sign
+	. do:($zbitget(sgntst,1))
+	. . ;
+	. . ; Sign is set, need to generate twos-complement and remember to add "-" sign. Since we can't actually do the
+	. . ; +1 required by twos complement right now, remember to do it later after we do the numeric conversion.
+	. . ;
+	. . set bin=$zextract($zbitnot(sgntst),2,binlen+1)
+	. . set sign=-1,fix=1
+	. for i=binlen:-1:1 set num=$zascii(bin,i)*Hex((binlen-i)*2)+num
+	else  do
+	. do:($zbitget(sgntst,((binlen-1)*8)+1))  ; Sign is set, twos-complement and sign fixup.
+	. . set bin=$zextract($zbitnot(sgntst),2,binlen+1)
+	. . set sign=-1,fix=1
+	. for i=1:1:binlen set num=$zascii(bin,i)*Hex((i-1)*2)+num
+	quit (num+fix)*sign	       ; Important to apply fix before sign
+
+;
+; Convert binary data of indeterminate length to a (printable) hexadecimal value
+;
+BinToHex(bin,noendian)
+	new hex,i,binlen,num
+	set hex="",binlen=$zlength(bin)
+	if ((Endian=BigEndian)!($get(noendian,FALSE))) do
+	. for i=binlen:-1:1 do
+	. . set num=$zascii(bin,i),hex=$zextract(HexDigits,(num#16)+1)_hex,num=num\16,hex=$zextract(HexDigits,num+1)_hex
+	else  do
+	. for i=1:1:binlen do
+	. . set num=$zascii(bin,i),hex=$zextract(HexDigits,(num#16)+1)_hex,num=num\16,hex=$zextract(HexDigits,num+1)_hex
+	quit "0x"_hex
diff --git a/sr_port/emit_code.c b/sr_port/emit_code.c
index bd83aec..b9038c0 100644
--- a/sr_port/emit_code.c
+++ b/sr_port/emit_code.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information 	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -98,6 +98,7 @@ GBLDEF int		code_reference;	/* Offset from pgm start to current loc */
  * in both APPROX_ADDR and MACHINE phase. the variable  force_32 is used for this purpose.
  */
 X86_64_ONLY(GBLDEF boolean_t force_32 = FALSE;)
+X86_64_ONLY(GBLDEF emit_base_info_struct emit_base_info;)
 
 GBLREF int		curr_addr;
 GBLREF char		cg_phase;	/* code generation phase */
@@ -124,11 +125,14 @@ error_def(ERR_MAXARGCNT);
 error_def(ERR_SRCNAM);
 error_def(ERR_UNIMPLOP);
 
+/* Create generated intermediate code (similar to VAX instructions) for the given triple and then,
+ * ultimately, the corresponding native platform generated code.
+ */
 void trip_gen(triple *ct)
 {
 	oprtype		**sopr, *opr;	/* triple operand */
 	oprtype		*saved_opr[MAX_ARGS];
-	unsigned short	oct;
+	uint4		oct;
 	short		tp;		/* template pointer */
 	const short	*tsp;		/* template short pointer */
 	triple		*ttp;		/* temp triple pointer */
@@ -144,9 +148,9 @@ void trip_gen(triple *ct)
 	DEBUG_ONLY(opcode_emitted = FALSE);
 	current_triple = ct;	/* save for possible use by internal rtns */
 	tp = ttt[ct->opcode];
-	if (tp <= 0)
+	if (0 >= tp)
 	{
-		assert(FALSE);
+		assert(FALSE && ct->opcode);
 		stx_error(ERR_UNIMPLOP);
 		return;
 	}
@@ -156,7 +160,7 @@ void trip_gen(triple *ct)
 	if (cg_phase_last != cg_phase)
 	{
 		cg_phase_last = cg_phase;
-		if (cg_phase == CGP_APPROX_ADDR)
+		if (CGP_APPROX_ADDR == cg_phase)
 			push_list_init();
 		else
 			reset_push_list_ptr();
@@ -169,26 +173,27 @@ void trip_gen(triple *ct)
 	{
 		if (opr->oprclass)
 		{
-			if (opr->oprclass == TRIP_REF && opr->oprval.tref->opcode == OC_PARAMETER)
+			if ((TRIP_REF == opr->oprclass) && (OC_PARAMETER == opr->oprval.tref->opcode))
 			{
 				ttp = opr->oprval.tref;
 				opr = ttp->operand;
 				continue;
 			}
 			*sopr++ = opr;
-			if (sopr >= ARRAYTOP(saved_opr))	/* user-visible max args is MAX_ARGS - 3 */
+			if (ARRAYTOP(saved_opr) <= sopr)	/* user-visible max args is MAX_ARGS - 3 */
 				rts_error_csa(CSA_ARG(NULL) VARLSTCNT(3) ERR_MAXARGCNT, 1, MAX_ARGS - 3);
 		}
 		opr++;
 	}
 	*sopr = 0;
 	jmp_offset = 0;
-	if (oct & OCT_JUMP || ct->opcode == OC_LDADDR || ct->opcode == OC_FORLOOP)
+	if ((OCT_JUMP & oct) || (OC_LDADDR == ct->opcode) || (OC_FORLOOP == ct->opcode))
 	{
-		if (ct->operand[0].oprval.tref->rtaddr == 0)		/* forward reference */
+		assert(ct->operand[0].oprval.tref);
+		if (0 == ct->operand[0].oprval.tref->rtaddr)		/* forward reference */
 		{
 			jmp_offset = LONG_JUMP_OFFSET;
-			assert(cg_phase == CGP_APPROX_ADDR);
+			assert(CGP_APPROX_ADDR == cg_phase);
 		} else
 			jmp_offset = ct->operand[0].oprval.tref->rtaddr - ct->rtaddr;
 
@@ -199,30 +204,30 @@ void trip_gen(triple *ct)
 			case OC_CALLSP:
 #				ifdef __x86_64__
 				tsp = (short *)&ttt[ttt[tp]];
-				if (-128 <= tsp[CALL_4LCLDO_XFER] && 127 >= tsp[CALL_4LCLDO_XFER])
+				if ((-128 <= tsp[CALL_4LCLDO_XFER]) && (127 >= tsp[CALL_4LCLDO_XFER]))
 					off = jmp_offset - XFER_BYTE_INST_SIZE;
 				else
 					off = jmp_offset - XFER_LONG_INST_SIZE;
-				if (-128 <= (off - BRB_INST_SIZE) && 127 >= (off - BRB_INST_SIZE))
+				if ((-128 <= (off - BRB_INST_SIZE)) && (127 >= (off - BRB_INST_SIZE)))
 					call_4lcldo_variant = BRB_INST_SIZE;	/* used by emit_jmp */
 				else
 				{
 					call_4lcldo_variant = JMP_LONG_INST_SIZE;	/* used by emit_jmp */
 					tsp = (short *)&ttt[ttt[tp + 1]];
-					if (-128 <= tsp[CALL_4LCLDO_XFER] && 127 >= tsp[CALL_4LCLDO_XFER])
+					if ((-128 <= tsp[CALL_4LCLDO_XFER]) && (127 >= tsp[CALL_4LCLDO_XFER]))
 						off = jmp_offset - XFER_BYTE_INST_SIZE;
 					else
 						off = jmp_offset - XFER_LONG_INST_SIZE;
-					if (-32768 > (off - JMP_LONG_INST_SIZE) &&
-						32767 < (off - JMP_LONG_INST_SIZE))
+					if ((-32768 > (off - JMP_LONG_INST_SIZE)) &&
+						(32767 < (off - JMP_LONG_INST_SIZE)))
 						tsp = (short *)&ttt[ttt[tp + 2]];
 				}
 				break;
 #				else
 				off = (jmp_offset - CALL_INST_SIZE)/INST_SIZE;	/* [kmk] */
-				if (off >= -128 && off <= 127)
+				if ((-128 <= off) && (127 >= off))
 					tsp = &ttt[ttt[tp]];
-				else if (off >= -32768 && off <= 32767)
+				else if ((-32768 <= off) && (32767 >= off))
 					tsp = &ttt[ttt[tp + 1]];
 				else
 					tsp = &ttt[ttt[tp + 2]];
@@ -244,7 +249,7 @@ void trip_gen(triple *ct)
 			default:
 				assertpro(FALSE && ct->opcode);
 		}
-	} else if (oct & OCT_COERCE)
+	} else if (OCT_COERCE & oct)
 	{
 		switch (oc_tab[ct->operand[0].oprval.tref->opcode].octype & (OCT_VALUE | OCT_BOOL))
 		{
@@ -266,18 +271,18 @@ void trip_gen(triple *ct)
 		tsp = &ttt[tp];
 	for (;  *tsp != VXT_END;)
 	{
-		if (*tsp == VXT_IREPAB || *tsp == VXT_IREPL)
+		if ((VXT_IREPAB == *tsp) || (VXT_IREPL == *tsp))
 		{
 			repl = tsp;
 			repl += 2;
 			repcnt = *repl++;
-			assert(repcnt != 1);
+			assert(1 != repcnt);
 			for (irep_index = repcnt, irep_opr = &ct->operand[1];  irep_index > 2;  --irep_index)
 			{
-				assert(irep_opr->oprclass == TRIP_REF);
+				assert(TRIP_REF == irep_opr->oprclass);
 				irep_opr = &irep_opr->oprval.tref->operand[1];
 			}
-			if (irep_opr->oprclass == TRIP_REF)
+			if (TRIP_REF == irep_opr->oprclass)
 			{
 				repl = tsp;
 				do
@@ -285,7 +290,7 @@ void trip_gen(triple *ct)
 					tsp = repl;
 					tsp = emit_vax_inst((short *)tsp, &saved_opr[0], --sopr);
 #					ifdef DEBUG
-					if (cg_phase == CGP_ASSEMBLY)
+					if (CGP_ASSEMBLY == cg_phase)
 						emit_asmlist(ct);
 #					endif
 				} while (sopr > &saved_opr[repcnt]);
@@ -296,20 +301,21 @@ void trip_gen(triple *ct)
 			}
 		} else
 		{
-			assert(*tsp > 0 && *tsp <= 511);
+			assert((0 < tsp) && (511 >= *tsp));
 			tsp = emit_vax_inst((short *)tsp, &saved_opr[0], sopr);
 #			ifdef DEBUG
-			if (cg_phase == CGP_ASSEMBLY)
+			if (CGP_ASSEMBLY == cg_phase)
 				emit_asmlist(ct);
 #			endif
 		} /* else */
 	} /* for */
-	if (cg_phase == CGP_APPROX_ADDR)
-		if (vax_pushes_seen > 0)
+	if (CGP_APPROX_ADDR == cg_phase)
+		if (0 < vax_pushes_seen)
 			add_to_vax_push_list(vax_pushes_seen);
 }
 
 #ifdef DEBUG
+/* Create assembler listing for given triple showing both intermediate (VAX) code and generated native code */
 void emit_asmlist(triple *ct)
 {
 	int		offset;
@@ -321,7 +327,7 @@ void emit_asmlist(triple *ct)
 	{
 		opcode_emitted = TRUE;
 		offset = (int)(&outbuf[0] + 60 - obpt);
-		if (offset >= 1)
+		if (1 <= offset)
 		{	/* tab to position 60 */
 			memset(obpt, ' ', offset);
 			obpt += offset;
@@ -340,7 +346,7 @@ void emit_asmlist(triple *ct)
 
 void emit_eoi (void)
 {
-	IA64_ONLY(if (asm_mode == 0) {)
+	IA64_ONLY(if (0 == asm_mode) {)
 		*obpt++ = '\0';
 		list_tab();
 		list_line((char *)outbuf);
@@ -349,8 +355,9 @@ void emit_eoi (void)
 }
 #endif
 
+/* Create generated code for the given intermediate language opcodes (similar to VAX instructions) */
 short *emit_vax_inst (short *inst, oprtype **fst_opr, oprtype **lst_opr)
-{
+{	/* fst_opr and lst_opr are triple operands */
 	static short	last_vax_inst = 0;
 	short		sav_in, save_inst;
 	boolean_t	oc_int;
@@ -369,7 +376,7 @@ short *emit_vax_inst (short *inst, oprtype **fst_opr, oprtype **lst_opr)
 			memset(obpt, SP, SIZEOF(outbuf));
 			i2asc((uchar_ptr_t)obpt, vaxi_cnt++);
 			obpt += 7;
-			if (VXT_IREPAB != *inst && VXT_IREPL != *inst)
+			if ((VXT_IREPAB != *inst) && (VXT_IREPL != *inst))
 				instr = *inst;
 			else
 				instr = (*inst == VXT_IREPAB) ? VXI_PUSHAB : VXI_PUSHL;
@@ -404,17 +411,17 @@ short *emit_vax_inst (short *inst, oprtype **fst_opr, oprtype **lst_opr)
 					break;
 				case VXI_BLBC:
 				case VXI_BLBS:
-					assert(*inst == VXT_REG);
+					assert(VXT_REG == *inst);
 					inst++;
 #					ifdef TRUTH_IN_REG
 					reg = GTM_REG_CODEGEN_TEMP;
-					NON_GTM64_ONLY(GEN_LOAD_WORD(reg, gtm_reg(*inst++), 0);)
-					GTM64_ONLY(  GEN_LOAD_WORD_4(reg, gtm_reg(*inst++), 0);)
+					NON_GTM64_ONLY(GEN_LOAD_WORD(reg, gtm_reg(*inst++), 0));
+					GTM64_ONLY(  GEN_LOAD_WORD_4(reg, gtm_reg(*inst++), 0));
 #					else
 					/* For platforms, where the $TRUTH value is not carried in a register and
 					 * must be fetched from a global variable by subroutine call.
 					 */
-					assert(*inst == 0x5a);		/* VAX r10 or $TEST register */
+					assert(0x5a == *inst);		/* VAX r10 or $TEST register */
 					inst++;
 					emit_call_xfer(SIZEOF(intszofptr_t) * xf_dt_get);
 					reg = GTM_REG_R0;	/* function return value */
@@ -422,16 +429,17 @@ short *emit_vax_inst (short *inst, oprtype **fst_opr, oprtype **lst_opr)
 					/* Generate a cmp instruction using the return value of the previous call,
 					 * which will be in EAX.
 					 */
-					X86_64_ONLY(GEN_CMP_EAX_IMM32(0);)
+					X86_64_ONLY(GEN_CMP_EAX_IMM32(0));
 
-					if (sav_in == VXI_BLBC)
-						X86_64_ONLY(emit_jmp(GENERIC_OPCODE_BEQ, &inst, 0);)
-						NON_X86_64_ONLY(emit_jmp(GENERIC_OPCODE_BLBC, &inst, reg);)
-					else
+					if (VXI_BLBC == sav_in)
+					{
+						X86_64_ONLY(emit_jmp(GENERIC_OPCODE_BEQ, &inst, 0));
+						NON_X86_64_ONLY(emit_jmp(GENERIC_OPCODE_BLBC, &inst, reg));
+					} else
 					{
-						assert(sav_in == VXI_BLBS);
-						X86_64_ONLY(emit_jmp(GENERIC_OPCODE_BNE, &inst, 0);)
-						NON_X86_64_ONLY(emit_jmp(GENERIC_OPCODE_BLBS, &inst, reg);)
+						assert(VXI_BLBS == sav_in);
+						X86_64_ONLY(emit_jmp(GENERIC_OPCODE_BNE, &inst, 0));
+						NON_X86_64_ONLY(emit_jmp(GENERIC_OPCODE_BLBS, &inst, reg));
 					}
 					break;
 				case VXI_BRB:
@@ -444,11 +452,11 @@ short *emit_vax_inst (short *inst, oprtype **fst_opr, oprtype **lst_opr)
 #					ifdef TRUTH_IN_REG
 					GEN_CLEAR_TRUTH;
 #					endif
-					assert(*inst == VXT_LIT);
+					assert(VXT_LIT == *inst);
 					inst++;
-					assert(*inst == 1);
+					assert(1 == *inst);
 					inst++;
-					assert(*inst == VXT_REG);
+					assert(VXT_REG == *inst);
 					inst++;
 					inst++;
 					break;
@@ -456,26 +464,26 @@ short *emit_vax_inst (short *inst, oprtype **fst_opr, oprtype **lst_opr)
 #					ifdef TRUTH_IN_REG
 					GEN_SET_TRUTH;
 #					endif
-					assert(*inst == VXT_LIT);
+					assert(VXT_LIT == *inst);
 					inst++;
-					assert(*inst == 1);
+					assert(1 == *inst);
 					inst++;
-					assert(*inst == VXT_REG);
+					assert(VXT_REG == *inst);
 					inst++;
 					inst++;
 					break;
 				case VXI_CALLS:
 					oc_int = TRUE;
-					if (*inst == VXT_LIT)
+					if (VXT_LIT == *inst)
 					{
 						inst++;
 						cnt = (int4)*inst++;
 					} else
 					{
-						assert(*inst == VXT_VAL);
+						assert(VXT_VAL == *inst);
 						inst++;
 						opr = *(fst_opr + *inst);
-						assert(opr->oprclass == TRIP_REF);
+						assert(TRIP_REF == opr->oprclass);
 						ct = opr->oprval.tref;
 						if (ct->destination.oprclass)
 							opr = &ct->destination;
@@ -483,9 +491,9 @@ short *emit_vax_inst (short *inst, oprtype **fst_opr, oprtype **lst_opr)
 						/* This is a case where VMS puts the argument count in a special register so
 						 * handle that differently here.
 						 */
-						if (opr->oprclass == TRIP_REF)
+						if (TRIP_REF == opr->oprclass)
 						{
-							assert(ct->opcode == OC_ILIT);
+							assert(OC_ILIT == ct->opcode);
 							cnt = ct->operand[0].oprval.ilit;
 							code_buf[code_idx++] = ALPHA_INS_LDA
 								| ALPHA_REG_AI << ALPHA_SHIFT_RA
@@ -494,7 +502,7 @@ short *emit_vax_inst (short *inst, oprtype **fst_opr, oprtype **lst_opr)
 							inst++;
 						} else
 						{
-							assert(opr->oprclass == TINT_REF);
+							assert(TINT_REF == opr->oprclass);
 							oc_int = FALSE;
 							opr = *(fst_opr + *inst++);
 							reg = get_arg_reg();
@@ -505,18 +513,18 @@ short *emit_vax_inst (short *inst, oprtype **fst_opr, oprtype **lst_opr)
 						/* All other platforms put argument counts in normal parameter
 						 * registers and go through this path instead.
 						 */
-						if (opr->oprclass == TRIP_REF)
+						if (TRIP_REF == opr->oprclass)
 						{
-							assert(ct->opcode == OC_ILIT);
+							assert(OC_ILIT == ct->opcode);
 							cnt = ct->operand[0].oprval.ilit;
 							reg = get_arg_reg();
-							IA64_ONLY(LOAD_IMM14(reg, cnt);)
-							NON_IA64_ONLY(GEN_LOAD_IMMED(reg, cnt);)
+							IA64_ONLY(LOAD_IMM14(reg, cnt));
+							NON_IA64_ONLY(GEN_LOAD_IMMED(reg, cnt));
 							cnt++;
 							inst++;
 						} else
 						{
-							assert(opr->oprclass == TINT_REF);
+							assert(TINT_REF == opr->oprclass);
 							oc_int = FALSE;
 							opr = *(fst_opr + *inst++);
 							reg = get_arg_reg();
@@ -525,12 +533,12 @@ short *emit_vax_inst (short *inst, oprtype **fst_opr, oprtype **lst_opr)
 						emit_push(reg);
 #						endif
 					}
-					assert(*inst == VXT_XFER);
+					assert(VXT_XFER == *inst);
 					inst++;
 					emit_call_xfer((int)*inst++);
 					if (oc_int)
 					{
-						if (cnt != 0)
+						if (0 != cnt)
 							emit_pop(cnt);
 					} else
 					{	/* During the commonization of emit_code.c I discovered that TINT_REF is
@@ -543,25 +551,23 @@ short *emit_vax_inst (short *inst, oprtype **fst_opr, oprtype **lst_opr)
 					}
 					break;
 				case VXI_CLRL:
-					assert(*inst == VXT_VAL);
+					assert(VXT_VAL == *inst);
 					inst++;
 					GEN_CLEAR_WORD_EMIT(CLRL_REG);
 					break;
 				case VXI_CMPL:
-					assert(*inst == VXT_VAL);
+					assert(VXT_VAL == *inst);
 					inst++;
 					GEN_LOAD_WORD_EMIT(CMPL_TEMP_REG);
-					assert(*inst == VXT_VAL);
+					assert(VXT_VAL == *inst);
 					inst++;
-
-					X86_64_ONLY(GEN_LOAD_WORD_EMIT(GTM_REG_CODEGEN_TEMP);)
-					NON_X86_64_ONLY(GEN_LOAD_WORD_EMIT(GTM_REG_COND_CODE);)
-
-					X86_64_ONLY(GEN_CMP_REGS(CMPL_TEMP_REG, GTM_REG_CODEGEN_TEMP))
-					NON_X86_64_ONLY(GEN_SUBTRACT_REGS(CMPL_TEMP_REG, GTM_REG_COND_CODE, GTM_REG_COND_CODE);)
+					X86_64_ONLY(GEN_LOAD_WORD_EMIT(GTM_REG_CODEGEN_TEMP));
+					NON_X86_64_ONLY(GEN_LOAD_WORD_EMIT(GTM_REG_COND_CODE));
+					X86_64_ONLY(GEN_CMP_REGS(CMPL_TEMP_REG, GTM_REG_CODEGEN_TEMP));
+					NON_X86_64_ONLY(GEN_SUBTRACT_REGS(CMPL_TEMP_REG, GTM_REG_COND_CODE, GTM_REG_COND_CODE));
 					break;
 				case VXI_INCL:
-					assert(*inst == VXT_VAL);
+					assert(VXT_VAL == *inst);
 					inst++;
 					save_inst = *inst++;
 					emit_trip(*(fst_opr + save_inst), TRUE, GENERIC_OPCODE_LOAD, GTM_REG_ACCUM);
@@ -569,7 +575,7 @@ short *emit_vax_inst (short *inst, oprtype **fst_opr, oprtype **lst_opr)
 					emit_trip(*(fst_opr + save_inst), TRUE, GENERIC_OPCODE_STORE, GTM_REG_ACCUM);
 					break;
 				case VXI_JMP:
-					if (*inst == VXT_VAL)
+					if (VXT_VAL == *inst)
 					{
 						inst++;
 						emit_trip(*(fst_opr + *inst++), FALSE, GENERIC_OPCODE_LOAD, GTM_REG_CODEGEN_TEMP);
@@ -578,30 +584,29 @@ short *emit_vax_inst (short *inst, oprtype **fst_opr, oprtype **lst_opr)
 						emit_jmp(GENERIC_OPCODE_BR, &inst, 0);
 					break;
 				case VXI_JSB:
-					assert(*inst == VXT_XFER);
+					assert(VXT_XFER == *inst);
 					inst++;
 					emit_call_xfer((int)*inst++);
 					/* Callee may have popped some values so we can't count on anything left on the stack. */
 					stack_depth = 0;
 					break;
 				case VXI_MOVAB:
-					if (*inst == VXT_JMP)
+					if (VXT_JMP == *inst)
 					{
 						inst += 2;
 						emit_pcrel();
 						NON_RISC_ONLY(IGEN_LOAD_ADDR_REG(GTM_REG_ACCUM))
-						RISC_ONLY(code_buf[code_idx++] |= IGEN_LOAD_ADDR_REG(GTM_REG_ACCUM);)
-						assert(*inst == VXT_ADDR);
+						RISC_ONLY(code_buf[code_idx++] |= IGEN_LOAD_ADDR_REG(GTM_REG_ACCUM));
+						assert(VXT_ADDR == *inst);
 						inst++;
 						emit_trip(*(fst_opr + *inst++), FALSE, GENERIC_OPCODE_STORE, GTM_REG_ACCUM);
-					} else if (*inst == VXT_ADDR || *inst == VXT_VAL)
+					} else if ((VXT_ADDR == *inst) || (VXT_VAL == *inst))
 					{
 						boolean_t	addr;
-
-						addr = (*inst == VXT_VAL);
+						addr = (VXT_VAL == *inst);
 						inst++;
 						save_inst = *inst++;
-						assert(*inst == VXT_REG);
+						assert(VXT_REG == *inst);
 						inst++;
 						emit_trip(*(fst_opr + save_inst), addr, GENERIC_OPCODE_LDA, gtm_reg(*inst++));
 					} else
@@ -609,32 +614,36 @@ short *emit_vax_inst (short *inst, oprtype **fst_opr, oprtype **lst_opr)
 					break;
 				case VXI_MOVC3:
 					/* The MOVC3 instruction is only used to copy an mval from one place to another
-					 * so that is the expansion we will generate. The most efficient expansion is to
-					 * generate a series of load and store instructions. Do the loads first then the
-					 * stores to keep the pipelines flowing and not stall waiting for any given load
-					 * or store to complete. Because some platforms (notably HPPA) do not have enough
-					 * argument registers to contain an entire MVAL and because an mval may grow from
-					 * its present size and affect other platforms some day, We put the whole code gen
-					 * thing in a loop so we can do this regardless of how big it gets.
+					 * so that is the expansion we will generate.
 					 */
-					assert(*inst == VXT_LIT);
+					assert(VXT_LIT == *inst);
 					inst += 2;
-					assert(*inst == VXT_VAL);
+					assert(VXT_VAL == *inst);
 					inst++;
 					emit_trip(*(fst_opr + *inst++), TRUE, GENERIC_OPCODE_LDA, MOVC3_SRC_REG);
-					assert(*inst == VXT_VAL);
+					assert(VXT_VAL == *inst);
 					inst++;
 					emit_trip(*(fst_opr + *inst++), TRUE, GENERIC_OPCODE_LDA, MOVC3_TRG_REG);
 #					if defined(__MVS__) || defined(Linux390)
 					/* The MVC instruction on zSeries facilitates memory copy(mval in this case) in a single
 					 * instruction instead of multiple 8/4 byte copies.
-					 *
-					 * TODO: Revisit other platforms using generic emit_code and verify if the below
-					 * logic of multiple copies can be replaced with more efficient instruction(s)
-					 * available on that particular platform.
 					 */
 					GEN_MVAL_COPY(MOVC3_SRC_REG, MOVC3_TRG_REG, SIZEOF(mval));
+#					elif defined(__linux) && defined(__x86_64__)
+					/* The latest x86-64 processors have optimized REP MOVSQ to be the fastest way to move
+					 * medium/small strings (like mvals which are always at least 8 byte aligned). This also
+					 * significantly reduces the codegen.
+					 */
+					GEN_MVAL_COPY(MOVC3_SRC_REG, MOVC3_TRG_REG, MVAL_QWORD_SIZE);
 #					else
+					/* For any non-special-cased platforms, the most efficient expansion is to generate a
+					 * series of load and store instructions. Do the loads first then the stores to keep the
+					 * pipelines flowing and not stall waiting for any given load or store to complete. Because
+					 * some platforms do not have enough argument registers to contain an entire MVAL and
+					 * because an mval may grow from its present size and affect other platforms some day,
+					 * we put the whole mval copy code gen thing in a loop so we can do this regardless of how
+					 * big it gets.
+					 */
 					for (words_to_move = MVAL_INT_SIZE, reg_offset = 0; words_to_move;)
 					{
 						reg = MACHINE_FIRST_ARG_REG;
@@ -642,65 +651,65 @@ short *emit_vax_inst (short *inst, oprtype **fst_opr, oprtype **lst_opr)
 						for (cnt = 0, cnttop = MIN(words_to_move, MACHINE_REG_ARGS) ;  cnt < cnttop;
 							cnt++, reg_offset += SIZEOF(UINTPTR_T))
 						{
-							X86_64_ONLY(targ_reg = GET_ARG_REG(cnt);)
-							NON_X86_64_ONLY(targ_reg = reg + cnt;)
-							NON_GTM64_ONLY(GEN_LOAD_WORD(targ_reg, MOVC3_SRC_REG, reg_offset);)
-							GTM64_ONLY(GEN_LOAD_WORD_8(targ_reg, MOVC3_SRC_REG, reg_offset);)
+							X86_64_ONLY(targ_reg = GET_ARG_REG(cnt));
+							NON_X86_64_ONLY(targ_reg = reg + cnt);
+							NON_GTM64_ONLY(GEN_LOAD_WORD(targ_reg, MOVC3_SRC_REG, reg_offset));
+							GTM64_ONLY(GEN_LOAD_WORD_8(targ_reg, MOVC3_SRC_REG, reg_offset));
 						}
 						reg = MACHINE_FIRST_ARG_REG;
 						for (cnt = 0;
 							cnt < cnttop;
 							cnt++, save_reg_offset += SIZEOF(UINTPTR_T), words_to_move--)
 						{
-							X86_64_ONLY(targ_reg = GET_ARG_REG(cnt);)
-							NON_X86_64_ONLY(targ_reg = reg + cnt;)
-							NON_GTM64_ONLY(GEN_STORE_WORD(targ_reg, MOVC3_TRG_REG, save_reg_offset);)
-							GTM64_ONLY(GEN_STORE_WORD_8(targ_reg, MOVC3_TRG_REG, save_reg_offset);)
+							X86_64_ONLY(targ_reg = GET_ARG_REG(cnt));
+							NON_X86_64_ONLY(targ_reg = reg + cnt);
+							NON_GTM64_ONLY(GEN_STORE_WORD(targ_reg, MOVC3_TRG_REG, save_reg_offset));
+							GTM64_ONLY(GEN_STORE_WORD_8(targ_reg, MOVC3_TRG_REG, save_reg_offset));
 						}
 					}
 #					endif
 					break;
 				case VXI_MOVL:
-					if (*inst == VXT_REG)
+					if (VXT_REG == *inst)
 					{
 						inst++;
-						if (*inst > 0x5f)	/* OC_CURRHD:  any mode >= 6 (deferred), any register */
+						if (0x5f < *inst)	/* OC_CURRHD:  any mode >= 6 (deferred), any register */
 						{
 							inst++;
-							NON_GTM64_ONLY(GEN_LOAD_WORD(GTM_REG_ACCUM, GTM_REG_FRAME_POINTER, 0);)
-							GTM64_ONLY(GEN_LOAD_WORD_8(GTM_REG_ACCUM, GTM_REG_FRAME_POINTER, 0);)
-							assert(*inst == VXT_ADDR);
+							NON_GTM64_ONLY(GEN_LOAD_WORD(GTM_REG_ACCUM, GTM_REG_FRAME_POINTER, 0));
+							GTM64_ONLY(GEN_LOAD_WORD_8(GTM_REG_ACCUM, GTM_REG_FRAME_POINTER, 0));
+							assert(VXT_ADDR == *inst);
 							inst++;
 							emit_trip(*(fst_opr + *inst++), FALSE, GENERIC_OPCODE_STORE, GTM_REG_ACCUM);
 						} else
 						{
 							boolean_t addr;
 
-							assert(*inst == 0x50);  /* register mode: (from) r0 */
+							assert(0x50 == *inst);  /* register mode: (from) r0 */
 							inst++;
-							if (*inst == VXT_VAL || *inst == VXT_ADDR)
+							if ((VXT_VAL == *inst) || (VXT_ADDR == *inst))
 							{
-								addr = (*inst == VXT_VAL);
+								addr = (VXT_VAL == *inst);
 								inst++;
 								emit_trip(*(fst_opr + *inst++), addr, GENERIC_OPCODE_STORE,
 									  MOVL_RETVAL_REG);
-							} else if (*inst == VXT_REG)
+							} else if (VXT_REG == *inst)
 							{
 								inst++;
 
 #								ifdef TRUTH_IN_REG
-								if (*inst == 0x5a)	/* to VAX r10 or $TEST */
+								if (0x5a == *inst)	/* to VAX r10 or $TEST */
 								{
 									NON_GTM64_ONLY(GEN_STORE_WORD(MOVL_RETVAL_REG,
-													GTM_REG_DOLLAR_TRUTH, 0);)
+													GTM_REG_DOLLAR_TRUTH, 0));
 									GTM64_ONLY(GEN_STORE_WORD_4(MOVL_RETVAL_REG,
-													GTM_REG_DOLLAR_TRUTH, 0);)
+													GTM_REG_DOLLAR_TRUTH, 0));
 								} else
 								{
 									GEN_MOVE_REG(gtm_reg(*inst), MOVL_RETVAL_REG);
 								}
 #								else
-								if (*inst == 0x5a)	/* to VAX r10 or $TEST */
+								if (0x5a == *inst)	/* to VAX r10 or $TEST */
 								{
 									reg = get_arg_reg();
 									GEN_MOVE_REG(reg, MOVL_RETVAL_REG);
@@ -715,20 +724,20 @@ short *emit_vax_inst (short *inst, oprtype **fst_opr, oprtype **lst_opr)
 							} else
 								assertpro(FALSE && *inst);
 						}
-					} else if (*inst == VXT_VAL)
+					} else if (VXT_VAL == *inst)
 					{
 						inst++;
 						save_inst = *inst++;
-						assert(*inst == VXT_REG);
+						assert(VXT_REG == *inst);
 						inst++;
-						assert(*inst == 0x51);  /* register mode: R1 */
+						assert(0x51 == *inst);  /* register mode: R1 */
 						inst++;
 						emit_trip(*(fst_opr + save_inst), TRUE, GENERIC_OPCODE_LOAD, MOVL_REG_R1);
 					} else
 						assertpro(FALSE && *inst);
 					break;
 				case VXT_IREPAB:
-					assert(*inst == VXT_VAL);
+					assert(VXT_VAL == *inst);
 					inst += 2;
 					reg = get_arg_reg();
 					emit_trip(*lst_opr, TRUE, GENERIC_OPCODE_LDA, reg);
@@ -736,13 +745,13 @@ short *emit_vax_inst (short *inst, oprtype **fst_opr, oprtype **lst_opr)
 					break;
 				case VXI_PUSHAB:
 					reg = get_arg_reg();
-					if (*inst == VXT_JMP)
+					if (VXT_JMP == *inst)
 					{
 						inst += 2;
 						emit_pcrel();
 						NON_RISC_ONLY(IGEN_LOAD_ADDR_REG(reg))
-						RISC_ONLY(code_buf[code_idx++] |= IGEN_LOAD_ADDR_REG(reg);)
-					} else if (*inst == VXT_VAL  ||  *inst == VXT_GREF)
+						RISC_ONLY(code_buf[code_idx++] |= IGEN_LOAD_ADDR_REG(reg));
+					} else if ((VXT_VAL == *inst) || (VXT_GREF == *inst))
 					{
 						inst++;
 						emit_trip(*(fst_opr + *inst++), TRUE, GENERIC_OPCODE_LDA, reg);
@@ -751,7 +760,7 @@ short *emit_vax_inst (short *inst, oprtype **fst_opr, oprtype **lst_opr)
 					emit_push(reg);
 					break;
 				case VXT_IREPL:
-					assert(*inst == VXT_VAL);
+					assert(VXT_VAL == *inst);
 					inst += 2;
 					reg = get_arg_reg();
 					emit_trip(*lst_opr, TRUE, GENERIC_OPCODE_LOAD, reg);
@@ -759,16 +768,16 @@ short *emit_vax_inst (short *inst, oprtype **fst_opr, oprtype **lst_opr)
 					break;
 				case VXI_PUSHL:
 					reg = get_arg_reg();
-					if (*inst == VXT_LIT)
+					if (VXT_LIT == *inst)
 					{
 						inst++;
 						GEN_LOAD_IMMED(reg, *inst);
 						inst++;
-					} else if (*inst == VXT_ADDR)
+					} else if (VXT_ADDR == *inst)
 					{
 						inst++;
 						emit_trip(*(fst_opr + *inst++), FALSE, GENERIC_OPCODE_LOAD, reg);
-					} else if (*inst == VXT_VAL)
+					} else if (VXT_VAL == *inst)
 					{
 						inst++;
 						emit_trip(*(fst_opr + *inst++), TRUE, GENERIC_OPCODE_LOAD, reg);
@@ -777,21 +786,21 @@ short *emit_vax_inst (short *inst, oprtype **fst_opr, oprtype **lst_opr)
 					emit_push(reg);
 					break;
 				case VXI_TSTL:
-					assert(*inst == VXT_VAL || *inst == VXT_REG);
-					if (*inst == VXT_VAL)
+					assert((VXT_VAL == *inst) || (VXT_REG == *inst));
+					if (VXT_VAL == *inst)
 					{
 						inst++;
 						emit_trip(
 							*(fst_opr + *inst++), TRUE, GENERIC_OPCODE_LOAD,
 							X86_64_ONLY(GTM_REG_CODEGEN_TEMP) NON_X86_64_ONLY(GTM_REG_COND_CODE)
 						);
-						X86_64_ONLY(GEN_CMP_IMM32(GTM_REG_CODEGEN_TEMP, 0))
-					} else if (*inst == VXT_REG)
+						X86_64_ONLY(GEN_CMP_IMM32(GTM_REG_CODEGEN_TEMP, 0));
+					} else if (VXT_REG == *inst)
 					{
 						inst++;
-						X86_64_ONLY(assert(gtm_reg(*inst) == I386_REG_RAX); /* Same as R0 */)
-						X86_64_ONLY(GEN_CMP_EAX_IMM32(0);)
-						NON_X86_64_ONLY(GEN_MOVE_REG(GTM_REG_COND_CODE, gtm_reg(*inst));)
+						X86_64_ONLY(assert(I386_REG_RAX == gtm_reg(*inst)); /* Same as R0 */)
+						X86_64_ONLY(GEN_CMP_EAX_IMM32(0));
+						NON_X86_64_ONLY(GEN_MOVE_REG(GTM_REG_COND_CODE, gtm_reg(*inst)));
 						inst++;
 					}
 					break;
@@ -804,25 +813,25 @@ short *emit_vax_inst (short *inst, oprtype **fst_opr, oprtype **lst_opr)
 			assertpro(FALSE && cg_phase);
 			break;
 	}
-	assert(code_idx < NUM_BUFFERRED_INSTRUCTIONS);
-	if (cg_phase == CGP_MACHINE)
+	assert(NUM_BUFFERRED_INSTRUCTIONS > code_idx);
+	if (CGP_MACHINE == cg_phase)
 	{
 		generated_code_size += code_idx;
 #		ifdef DEBUG
-		if (generated_count < MAX_CODE_COUNT)
+		if (MAX_CODE_COUNT > generated_count)
 		{
 			generated_details[generated_count].size = code_idx;
 			generated_details[generated_count++].sav_in = sav_in;
 		}
 #		endif /* DEBUG */
 		emit_immed ((char *)&code_buf[0], (uint4)(INST_SIZE * code_idx));
-	} else if (cg_phase != CGP_ASSEMBLY)
+	} else if (CGP_ASSEMBLY != cg_phase)
 	{
-		if (cg_phase == CGP_APPROX_ADDR)
+		if (CGP_APPROX_ADDR == cg_phase)
 		{
 			calculated_code_size += code_idx;
 #			ifdef DEBUG
-			if (calculated_count < MAX_CODE_COUNT)
+			if (MAX_CODE_COUNT > calculated_count)
 			{
 				calculated_details[calculated_count].size = code_idx;
 				calculated_details[calculated_count++].sav_in = sav_in;
@@ -854,7 +863,7 @@ void emit_jmp(uint4 branchop, short **instp, int reg)
 	jmp_offset -= (int)((char *)&code_buf[code_idx] - (char *)&code_buf[0]);
 #	if !(defined(__MVS__) || defined(Linux390))
 	/* The code_buff on zSeries is filled with 2 byte chunks */
-	assert((jmp_offset & 3) == 0);
+	assert(0 == (jmp_offset & 3));
 #	endif
 	branch_offset = jmp_offset / INST_SIZE;
 	/* Some platforms have a different origin for the offset */
@@ -968,16 +977,16 @@ void emit_jmp(uint4 branchop, short **instp, int reg)
 					}
 					GEN_PCREL;
 					emit_base_offset(GTM_REG_CODEGEN_TEMP, (INST_SIZE * branch_offset));
-					RISC_ONLY(code_buf[code_idx++] |= IGEN_LOAD_ADDR_REG(GTM_REG_CODEGEN_TEMP);)
+					RISC_ONLY(code_buf[code_idx++] |= IGEN_LOAD_ADDR_REG(GTM_REG_CODEGEN_TEMP));
 					NON_RISC_ONLY(IGEN_LOAD_ADDR_REG(GTM_REG_CODEGEN_TEMP))
 					GEN_JUMP_REG(GTM_REG_CODEGEN_TEMP);
 				}
-				if (skip_idx != -1)
+				if (-1 != skip_idx)
 				{	/* Fill in the offset from our opposite jump instruction to here .. the
 					 * place to bypass the jump.
 					 */
 					branch_offset = BRANCH_OFFSET_FROM_IDX(skip_idx, code_idx);
-					RISC_ONLY(code_buf[skip_idx] |= IGEN_COND_BRANCH_OFFSET(branch_offset);)
+					RISC_ONLY(code_buf[skip_idx] |= IGEN_COND_BRANCH_OFFSET(branch_offset));
 
 					NON_RISC_ONLY(
 						tmp_code_idx = code_idx;
@@ -1040,7 +1049,7 @@ void emit_trip(oprtype *opr, boolean_t val_output, uint4 generic_inst, int trg_r
 	triple		*ct;
 	int		low, extra, high;
 	GTM64_ONLY(int	next_ptr_offset = 8;)
-	if (opr->oprclass == TRIP_REF)
+	if (TRIP_REF == opr->oprclass)
 	{
 		ct = opr->oprval.tref;
 		if (ct->destination.oprclass)
@@ -1055,12 +1064,12 @@ void emit_trip(oprtype *opr, boolean_t val_output, uint4 generic_inst, int trg_r
 			switch (opr->oprclass)
 			{
 				case TRIP_REF:
-					assert(ct->destination.oprclass == 0);
+					assert(0 == ct->destination.oprclass);
 					assert(val_output);
 					switch (ct->opcode)
 					{
 						case OC_LIT:
-							assert(ct->operand[0].oprclass == MLIT_REF);
+							assert(MLIT_REF == ct->operand[0].oprclass);
 							if (run_time)
 								reg = GTM_REG_PV;
 							else
@@ -1073,21 +1082,21 @@ void emit_trip(oprtype *opr, boolean_t val_output, uint4 generic_inst, int trg_r
 								 */
 								offset = literal_offset(ct->operand[0].oprval.mlit->rt_addr);
 								/* Need non-zero base reg for AIX */
-								X86_64_ONLY(force_32 = TRUE;)
+								X86_64_ONLY(force_32 = TRUE);
 								emit_base_offset(reg, offset);
-								X86_64_ONLY(force_32 = FALSE;)
+								X86_64_ONLY(force_32 = FALSE);
 							} else
 							{
 								/* Gross expansion ok first time through */
 								/* Non-0 base reg for AIX */
-								X86_64_ONLY(force_32 = TRUE;)
+								X86_64_ONLY(force_32 = TRUE);
 								emit_base_offset(reg, LONG_JUMP_OFFSET);
-								X86_64_ONLY(force_32 = FALSE;)
+								X86_64_ONLY(force_32 = FALSE);
 							}
 
 							X86_64_ONLY(IGEN_LOAD_ADDR_REG(trg_reg))
 #							if !(defined(__MVS__) || defined(Linux390))
-							NON_X86_64_ONLY(code_idx++;)
+							NON_X86_64_ONLY(code_idx++);
 #							else
 							IGEN_LOAD_ADDR_REG(trg_reg);
 #							endif
@@ -1097,14 +1106,14 @@ void emit_trip(oprtype *opr, boolean_t val_output, uint4 generic_inst, int trg_r
 							emit_base_offset(GTM_REG_PV, find_linkage(ct->operand[0].oprval.cdlt));
 							if (GENERIC_OPCODE_LDA == generic_inst)
 							{
-								RISC_ONLY(code_buf[code_idx++] |= IGEN_LOAD_LINKAGE(trg_reg);)
-								NON_RISC_ONLY(IGEN_LOAD_LINKAGE(trg_reg);)
+								RISC_ONLY(code_buf[code_idx++] |= IGEN_LOAD_LINKAGE(trg_reg));
+								NON_RISC_ONLY(IGEN_LOAD_LINKAGE(trg_reg));
 								inst_emitted = TRUE;
 							} else
 							{
 								RISC_ONLY(code_buf[code_idx++]
-									  |= IGEN_LOAD_LINKAGE(GTM_REG_CODEGEN_TEMP);)
-								NON_RISC_ONLY(IGEN_LOAD_LINKAGE(GTM_REG_CODEGEN_TEMP);)
+									  |= IGEN_LOAD_LINKAGE(GTM_REG_CODEGEN_TEMP));
+								NON_RISC_ONLY(IGEN_LOAD_LINKAGE(GTM_REG_CODEGEN_TEMP));
 								emit_base_offset(GTM_REG_CODEGEN_TEMP, 0);
 							}
 							break;
@@ -1146,13 +1155,13 @@ void emit_trip(oprtype *opr, boolean_t val_output, uint4 generic_inst, int trg_r
 					offset = sa_temps_offset[opr->oprclass];
 					offset -= (sa_temps[opr->oprclass] - opr->oprval.temp) * sa_class_sizes[opr->oprclass];
 					GTM64_ONLY(
-						if ( sa_class_sizes[opr->oprclass] == 4 )
+						if (4 == sa_class_sizes[opr->oprclass])
 						{
 							next_ptr_offset = 4;
 							REVERT_GENERICINST_TO_WORD(generic_inst);
 						}
 					)
-					NON_GTM64_ONLY(assertpro((0 <= offset) &&  (MAX_OFFSET >= offset));)
+					NON_GTM64_ONLY(assertpro((0 <= offset) &&  (MAX_OFFSET >= offset)));
 					emit_base_offset(GTM_REG_FRAME_TMP_PTR, offset);
 					break;
 
@@ -1162,14 +1171,14 @@ void emit_trip(oprtype *opr, boolean_t val_output, uint4 generic_inst, int trg_r
 					offset = sa_temps_offset[opr->oprclass];
 					offset -= (sa_temps[opr->oprclass] - opr->oprval.temp) * sa_class_sizes[opr->oprclass];
 					GTM64_ONLY(
-						if ( sa_class_sizes[opr->oprclass] == 4 )
+						if (4 == sa_class_sizes[opr->oprclass])
 						{
 							next_ptr_offset = 4;
 							REVERT_GENERICINST_TO_WORD(generic_inst);
 						}
 					)
-					NON_GTM64_ONLY(assertpro((0 <= offset) &&  (MAX_OFFSET >= offset));)
-					if (opr->oprclass == TVAR_REF)
+					NON_GTM64_ONLY(assertpro((0 <= offset) &&  (MAX_OFFSET >= offset)));
+					if (TVAR_REF == opr->oprclass)
 						reg = GTM_REG_FRAME_VAR_PTR;
 					else
 						reg = GTM_REG_FRAME_TMP_PTR;
@@ -1178,20 +1187,20 @@ void emit_trip(oprtype *opr, boolean_t val_output, uint4 generic_inst, int trg_r
 					{
 						if (GENERIC_OPCODE_LDA == generic_inst)
 						{
-							NON_RISC_ONLY(IGEN_LOAD_NATIVE_REG(trg_reg))
-							RISC_ONLY(code_buf[code_idx++] |= IGEN_LOAD_NATIVE_REG(trg_reg);)
-							if (opr->oprclass == TVAR_REF)
+							NON_RISC_ONLY(IGEN_LOAD_NATIVE_REG(trg_reg));
+							RISC_ONLY(code_buf[code_idx++] |= IGEN_LOAD_NATIVE_REG(trg_reg));
+							if (TVAR_REF == opr->oprclass)
 							{
 								emit_base_offset(trg_reg, offsetof(ht_ent_mname, value));
-								NON_RISC_ONLY(IGEN_LOAD_NATIVE_REG(trg_reg))
-								RISC_ONLY(code_buf[code_idx++] |= IGEN_LOAD_NATIVE_REG(trg_reg);)
+								NON_RISC_ONLY(IGEN_LOAD_NATIVE_REG(trg_reg));
+								RISC_ONLY(code_buf[code_idx++] |= IGEN_LOAD_NATIVE_REG(trg_reg));
 							}
 							inst_emitted = TRUE;
 						} else
 						{
-							NON_RISC_ONLY(IGEN_LOAD_NATIVE_REG(GTM_REG_CODEGEN_TEMP))
+							NON_RISC_ONLY(IGEN_LOAD_NATIVE_REG(GTM_REG_CODEGEN_TEMP));
 							RISC_ONLY(code_buf[code_idx++]
-									|= IGEN_LOAD_NATIVE_REG(GTM_REG_CODEGEN_TEMP);)
+									|= IGEN_LOAD_NATIVE_REG(GTM_REG_CODEGEN_TEMP));
 							emit_base_offset(GTM_REG_CODEGEN_TEMP, 0);
 						}
 					}
@@ -1224,9 +1233,10 @@ void emit_trip(oprtype *opr, boolean_t val_output, uint4 generic_inst, int trg_r
 					assert(FALSE && opr->oprclass);
 					break;						/* NOTREACHED */
 			}
-			if (!inst_emitted) {
-				NON_RISC_ONLY(IGEN_GENERIC_REG(generic_inst, trg_reg))
-				RISC_ONLY(code_buf[code_idx++] |= IGEN_GENERIC_REG(generic_inst, trg_reg);)
+			if (!inst_emitted)
+			{
+				NON_RISC_ONLY(IGEN_GENERIC_REG(generic_inst, trg_reg));
+				RISC_ONLY(code_buf[code_idx++] |= IGEN_GENERIC_REG(generic_inst, trg_reg));
 			}
 			break;
 #		ifdef DEBUG
@@ -1235,12 +1245,12 @@ void emit_trip(oprtype *opr, boolean_t val_output, uint4 generic_inst, int trg_r
 			switch (opr->oprclass)
 			{
 				case TRIP_REF:
-					assert(ct->destination.oprclass == 0);
+					assert(0 == ct->destination.oprclass);
 					assert(val_output);
 					switch (ct->opcode)
 					{
 						case OC_LIT:
-							assert(ct->operand[0].oprclass == MLIT_REF);
+							assert(MLIT_REF == ct->operand[0].oprclass);
 							offset = literal_offset(ct->operand[0].oprval.mlit->rt_addr);
 							memcpy(obpt, &vdat_def[0], VDAT_DEF_SIZE);
 							obpt += VDAT_DEF_SIZE;
@@ -1254,11 +1264,11 @@ void emit_trip(oprtype *opr, boolean_t val_output, uint4 generic_inst, int trg_r
 								reg = GTM_REG_PV;
 							else
 								reg = GTM_REG_LITERAL_BASE;
-							X86_64_ONLY(force_32 = TRUE;)
+							X86_64_ONLY(force_32 = TRUE);
 							emit_base_offset(reg, offset);
-							X86_64_ONLY(force_32 = FALSE;)
+							X86_64_ONLY(force_32 = FALSE);
 							NON_RISC_ONLY(IGEN_LOAD_ADDR_REG(trg_reg))
-							RISC_ONLY(code_buf[code_idx++] |= IGEN_LOAD_ADDR_REG(trg_reg);)
+							RISC_ONLY(code_buf[code_idx++] |= IGEN_LOAD_ADDR_REG(trg_reg));
 							inst_emitted = TRUE;
 							break;
 						case OC_CDLIT:
@@ -1279,8 +1289,8 @@ void emit_trip(oprtype *opr, boolean_t val_output, uint4 generic_inst, int trg_r
 							} else
 							{
 								RISC_ONLY(code_buf[code_idx++]
-										|= IGEN_LOAD_LINKAGE(GTM_REG_CODEGEN_TEMP);)
-								NON_RISC_ONLY(IGEN_LOAD_LINKAGE(GTM_REG_CODEGEN_TEMP);)
+										|= IGEN_LOAD_LINKAGE(GTM_REG_CODEGEN_TEMP));
+								NON_RISC_ONLY(IGEN_LOAD_LINKAGE(GTM_REG_CODEGEN_TEMP));
 								emit_base_offset(GTM_REG_CODEGEN_TEMP, 0);
 							}
 							break;
@@ -1320,8 +1330,8 @@ void emit_trip(oprtype *opr, boolean_t val_output, uint4 generic_inst, int trg_r
 					assert(val_output);
 					offset = sa_temps_offset[opr->oprclass];
 					offset -= (sa_temps[opr->oprclass] - opr->oprval.temp) * sa_class_sizes[opr->oprclass];
-					NON_GTM64_ONLY(assertpro((0 <= offset) &&  (MAX_OFFSET >= offset));)
-					if (offset < 127)
+					NON_GTM64_ONLY(assertpro((0 <= offset) &&  (MAX_OFFSET >= offset)));
+					if (127 > offset)
 					{
 						memcpy(obpt, &vdat_bdisp[0], VDAT_BDISP_SIZE);
 						obpt += VDAT_BDISP_SIZE;
@@ -1340,7 +1350,7 @@ void emit_trip(oprtype *opr, boolean_t val_output, uint4 generic_inst, int trg_r
 					 * changed to ldw/stw(4 byte load/stores)
 					 */
 					GTM64_ONLY(
-						if (sa_class_sizes[opr->oprclass] == 4)
+						if (4 == sa_class_sizes[opr->oprclass])
 						{
 							next_ptr_offset = 4;
 							REVERT_GENERICINST_TO_WORD(generic_inst);
@@ -1358,7 +1368,7 @@ void emit_trip(oprtype *opr, boolean_t val_output, uint4 generic_inst, int trg_r
 						memcpy(obpt, &vdat_def[0], VDAT_DEF_SIZE);
 						obpt += VDAT_DEF_SIZE;
 					}
-					if (offset < 127)
+					if (127 > offset)
 					{
 						memcpy(obpt, &vdat_bdisp[0], VDAT_BDISP_SIZE);
 						obpt += VDAT_BDISP_SIZE;
@@ -1368,7 +1378,7 @@ void emit_trip(oprtype *opr, boolean_t val_output, uint4 generic_inst, int trg_r
 						obpt += VDAT_WDISP_SIZE;
 					}
 					obpt = i2asc((uchar_ptr_t)obpt, offset);
-					if (opr->oprclass == TVAR_REF)
+					if (TVAR_REF == opr->oprclass)
 					{
 						memcpy(obpt, &vdat_r8[0], VDAT_R8_SIZE);
 						obpt += VDAT_R8_SIZE;
@@ -1377,13 +1387,13 @@ void emit_trip(oprtype *opr, boolean_t val_output, uint4 generic_inst, int trg_r
 						memcpy(obpt, &vdat_r9[0], VDAT_R9_SIZE);
 						obpt += VDAT_R9_SIZE;
 					}
-					NON_GTM64_ONLY(assertpro((0 <= offset) &&  (MAX_OFFSET >= offset));)
-					if (opr->oprclass == TVAR_REF)
+					NON_GTM64_ONLY(assertpro((0 <= offset) &&  (MAX_OFFSET >= offset)));
+					if (TVAR_REF == opr->oprclass)
 						reg = GTM_REG_FRAME_VAR_PTR;
 					else
 						reg = GTM_REG_FRAME_TMP_PTR;
 					GTM64_ONLY(
-						if (sa_class_sizes[opr->oprclass] == 4)
+						if (4 == sa_class_sizes[opr->oprclass])
 						{
 							next_ptr_offset = 4;
 							REVERT_GENERICINST_TO_WORD(generic_inst);
@@ -1395,20 +1405,20 @@ void emit_trip(oprtype *opr, boolean_t val_output, uint4 generic_inst, int trg_r
 
 						if (GENERIC_OPCODE_LDA == generic_inst)
 						{
-							RISC_ONLY(code_buf[code_idx++] |= IGEN_LOAD_NATIVE_REG(trg_reg);)
-							NON_RISC_ONLY(IGEN_LOAD_NATIVE_REG(trg_reg))
-							if (opr->oprclass == TVAR_REF)
+							RISC_ONLY(code_buf[code_idx++] |= IGEN_LOAD_NATIVE_REG(trg_reg));
+							NON_RISC_ONLY(IGEN_LOAD_NATIVE_REG(trg_reg));
+							if (TVAR_REF == opr->oprclass)
 							{
 								emit_base_offset(trg_reg, offsetof(ht_ent_mname, value));
-								NON_RISC_ONLY(IGEN_LOAD_NATIVE_REG(trg_reg))
-								RISC_ONLY(code_buf[code_idx++] |= IGEN_LOAD_NATIVE_REG(trg_reg);)
+								NON_RISC_ONLY(IGEN_LOAD_NATIVE_REG(trg_reg));
+								RISC_ONLY(code_buf[code_idx++] |= IGEN_LOAD_NATIVE_REG(trg_reg));
 							}
 							inst_emitted = TRUE;
 						} else
 						{
 							RISC_ONLY(code_buf[code_idx++]
-									|= IGEN_LOAD_NATIVE_REG(GTM_REG_CODEGEN_TEMP);)
-							NON_RISC_ONLY(IGEN_LOAD_NATIVE_REG(GTM_REG_CODEGEN_TEMP))
+									|= IGEN_LOAD_NATIVE_REG(GTM_REG_CODEGEN_TEMP));
+							NON_RISC_ONLY(IGEN_LOAD_NATIVE_REG(GTM_REG_CODEGEN_TEMP));
 							emit_base_offset(GTM_REG_CODEGEN_TEMP, 0);
 						}
 					}
@@ -1427,9 +1437,10 @@ void emit_trip(oprtype *opr, boolean_t val_output, uint4 generic_inst, int trg_r
 					assertpro(FALSE && opr->oprclass);
 					break;
 			}
-			if (!inst_emitted) {
-				RISC_ONLY(code_buf[code_idx++] |= IGEN_GENERIC_REG(generic_inst, trg_reg);)
-				NON_RISC_ONLY(IGEN_GENERIC_REG(generic_inst, trg_reg))
+			if (!inst_emitted)
+			{
+				RISC_ONLY(code_buf[code_idx++] |= IGEN_GENERIC_REG(generic_inst, trg_reg));
+				NON_RISC_ONLY(IGEN_GENERIC_REG(generic_inst, trg_reg));
 			}
 			*obpt++ = ',';
 			*obpt++ = ' ';
@@ -1439,36 +1450,36 @@ void emit_trip(oprtype *opr, boolean_t val_output, uint4 generic_inst, int trg_r
 			switch (opr->oprclass)
 			{
 				case TRIP_REF:
-					assert(ct->destination.oprclass == 0);
+					assert(0 == ct->destination.oprclass);
 					assert(val_output);
 					switch (ct->opcode)
 					{
 						case OC_LIT:
-							assert(ct->operand[0].oprclass == MLIT_REF);
+							assert(MLIT_REF == ct->operand[0].oprclass);
 							offset = literal_offset(ct->operand[0].oprval.mlit->rt_addr);
 							if (run_time)
 								reg = GTM_REG_PV;
 							else
 								reg = GTM_REG_LITERAL_BASE;
-							X86_64_ONLY(force_32 = TRUE;)
+							X86_64_ONLY(force_32 = TRUE);
 							emit_base_offset(reg, offset);
-							X86_64_ONLY(force_32 = FALSE;)
-							RISC_ONLY(code_buf[code_idx++] |= IGEN_LOAD_ADDR_REG(trg_reg);)
-							NON_RISC_ONLY(IGEN_LOAD_ADDR_REG(trg_reg);)
+							X86_64_ONLY(force_32 = FALSE);
+							RISC_ONLY(code_buf[code_idx++] |= IGEN_LOAD_ADDR_REG(trg_reg));
+							NON_RISC_ONLY(IGEN_LOAD_ADDR_REG(trg_reg));
 							inst_emitted = TRUE;
 							break;
 						case OC_CDLIT:
 							emit_base_offset(GTM_REG_PV, find_linkage(ct->operand[0].oprval.cdlt));
 							if (GENERIC_OPCODE_LDA == generic_inst)
 							{
-								RISC_ONLY(code_buf[code_idx++] |= IGEN_LOAD_LINKAGE(trg_reg);)
-								NON_RISC_ONLY(IGEN_LOAD_LINKAGE(trg_reg);)
+								RISC_ONLY(code_buf[code_idx++] |= IGEN_LOAD_LINKAGE(trg_reg));
+								NON_RISC_ONLY(IGEN_LOAD_LINKAGE(trg_reg));
 								inst_emitted = TRUE;
 							} else
 							{
 	 							RISC_ONLY(code_buf[code_idx++]
-										|= IGEN_LOAD_LINKAGE(GTM_REG_CODEGEN_TEMP);)
-								NON_RISC_ONLY(IGEN_LOAD_LINKAGE(GTM_REG_CODEGEN_TEMP);)
+										|= IGEN_LOAD_LINKAGE(GTM_REG_CODEGEN_TEMP));
+								NON_RISC_ONLY(IGEN_LOAD_LINKAGE(GTM_REG_CODEGEN_TEMP));
 								emit_base_offset(GTM_REG_CODEGEN_TEMP, 0);
 							}
 							break;
@@ -1509,13 +1520,13 @@ void emit_trip(oprtype *opr, boolean_t val_output, uint4 generic_inst, int trg_r
 					offset = sa_temps_offset[opr->oprclass];
 					offset -= (sa_temps[opr->oprclass] - opr->oprval.temp) * sa_class_sizes[opr->oprclass];
 					GTM64_ONLY(
-						if ( sa_class_sizes[opr->oprclass] == 4 )
+						if (4 == sa_class_sizes[opr->oprclass])
 						{
 							next_ptr_offset = 4;
 							REVERT_GENERICINST_TO_WORD(generic_inst);
 						}
 					)
-					NON_GTM64_ONLY(assertpro((0 <= offset) &&  (MAX_OFFSET >= offset));)
+					NON_GTM64_ONLY(assertpro((0 <= offset) &&  (MAX_OFFSET >= offset)));
 					emit_base_offset(GTM_REG_FRAME_TMP_PTR, offset);
 					break;
 				case TCAD_REF:
@@ -1524,14 +1535,14 @@ void emit_trip(oprtype *opr, boolean_t val_output, uint4 generic_inst, int trg_r
 					offset = sa_temps_offset[opr->oprclass];
 					offset -= (sa_temps[opr->oprclass] - opr->oprval.temp) * sa_class_sizes[opr->oprclass];
 					GTM64_ONLY(
-						if (sa_class_sizes[opr->oprclass] == 4)
+						if (4 == sa_class_sizes[opr->oprclass])
 						{
 							next_ptr_offset = 4;
 							REVERT_GENERICINST_TO_WORD(generic_inst);
 						}
 					)
-					NON_GTM64_ONLY(assertpro((0 <= offset) &&  (MAX_OFFSET >= offset));)
-					if (opr->oprclass == TVAR_REF)
+					NON_GTM64_ONLY(assertpro((0 <= offset) &&  (MAX_OFFSET >= offset)));
+					if (TVAR_REF == opr->oprclass)
 						reg = GTM_REG_FRAME_VAR_PTR;
 					else
 						reg = GTM_REG_FRAME_TMP_PTR;
@@ -1540,20 +1551,20 @@ void emit_trip(oprtype *opr, boolean_t val_output, uint4 generic_inst, int trg_r
 					{
 						if (GENERIC_OPCODE_LDA == generic_inst)
 						{
-							RISC_ONLY(code_buf[code_idx++] |= IGEN_LOAD_NATIVE_REG(trg_reg);)
-							NON_RISC_ONLY(IGEN_LOAD_NATIVE_REG(trg_reg))
-							if (opr->oprclass == TVAR_REF)
+							RISC_ONLY(code_buf[code_idx++] |= IGEN_LOAD_NATIVE_REG(trg_reg));
+							NON_RISC_ONLY(IGEN_LOAD_NATIVE_REG(trg_reg));
+							if (TVAR_REF == opr->oprclass)
 							{
 								emit_base_offset(trg_reg, offsetof(ht_ent_mname, value));
-								NON_RISC_ONLY(IGEN_LOAD_NATIVE_REG(trg_reg))
-								RISC_ONLY(code_buf[code_idx++] |= IGEN_LOAD_NATIVE_REG(trg_reg);)
+								NON_RISC_ONLY(IGEN_LOAD_NATIVE_REG(trg_reg));
+								RISC_ONLY(code_buf[code_idx++] |= IGEN_LOAD_NATIVE_REG(trg_reg));
 							}
 							inst_emitted = TRUE;
 						} else
 						{
 							RISC_ONLY(code_buf[code_idx++]
-									|= IGEN_LOAD_NATIVE_REG(GTM_REG_CODEGEN_TEMP);)
-							NON_RISC_ONLY(IGEN_LOAD_NATIVE_REG(GTM_REG_CODEGEN_TEMP);)
+									|= IGEN_LOAD_NATIVE_REG(GTM_REG_CODEGEN_TEMP));
+							NON_RISC_ONLY(IGEN_LOAD_NATIVE_REG(GTM_REG_CODEGEN_TEMP));
 							emit_base_offset(GTM_REG_CODEGEN_TEMP, 0);
 						}
 					}
@@ -1572,9 +1583,10 @@ void emit_trip(oprtype *opr, boolean_t val_output, uint4 generic_inst, int trg_r
 					break;
 			}
 			/* If we haven't emitted a finished instruction already, finish it now */
-			if (!inst_emitted) {
-				RISC_ONLY(code_buf[code_idx++] |= IGEN_GENERIC_REG(generic_inst, trg_reg);)
-				NON_RISC_ONLY(IGEN_GENERIC_REG(generic_inst, trg_reg))
+			if (!inst_emitted)
+			{
+				RISC_ONLY(code_buf[code_idx++] |= IGEN_GENERIC_REG(generic_inst, trg_reg));
+				NON_RISC_ONLY(IGEN_GENERIC_REG(generic_inst, trg_reg));
 			}
 			break;
 		default:
@@ -1623,16 +1635,16 @@ int get_arg_reg(void)
 	{
 		case	CGP_APPROX_ADDR:
 		case	CGP_ADDR_OPT:
-			if (vax_pushes_seen < MACHINE_REG_ARGS)
+			if (MACHINE_REG_ARGS > vax_pushes_seen)
 				arg_reg_i = GET_ARG_REG(vax_pushes_seen);
 			else
 				arg_reg_i = GTM_REG_ACCUM;
 			break;
 		case	CGP_ASSEMBLY:
 		case	CGP_MACHINE:
-			if (vax_pushes_seen == 0)	/* first push of a series */
+			if (0 == vax_pushes_seen)	/* first push of a series */
 				vax_number_of_arguments = next_vax_push_list();
-			if (vax_number_of_arguments <= MACHINE_REG_ARGS)
+			if (MACHINE_REG_ARGS >= vax_number_of_arguments)
 				arg_reg_i = GET_ARG_REG(vax_number_of_arguments - 1);
 			else
 				arg_reg_i = GTM_REG_ACCUM;
@@ -1681,7 +1693,7 @@ int gtm_reg(int vax_reg)
 			reg = GTM_REG_FRAME_POINTER;
 			break;	/* VMS ap */
 		default:
-			assertpro(FALSE && (vax_reg & 0x0f));
+			assertpro(FALSE && (0x0f & vax_reg));
 			break;
 	}
 	return reg;
@@ -1696,11 +1708,11 @@ void emit_push(int reg)
 	{
 		case CGP_APPROX_ADDR:
 		case CGP_ADDR_OPT:
-			if (vax_pushes_seen >= MACHINE_REG_ARGS)
+			if (MACHINE_REG_ARGS <= vax_pushes_seen)
 			{
-				RISC_ONLY(code_idx++;)	/* for STORE instruction */
+				RISC_ONLY(code_idx++);	/* for STORE instruction */
 				NON_RISC_ONLY(
-					assert(reg == GTM_REG_ACCUM);
+					assert(GTM_REG_ACCUM == reg);
 					stack_offset = STACK_ARG_OFFSET((vax_number_of_arguments - MACHINE_REG_ARGS - 1));
 					GEN_STORE_ARG(reg, stack_offset);	/* Store arg on stack */
 				)
@@ -1708,11 +1720,11 @@ void emit_push(int reg)
 			break;
 		case CGP_ASSEMBLY:
 		case CGP_MACHINE:
-			if (vax_number_of_arguments <= MACHINE_REG_ARGS)
+			if (MACHINE_REG_ARGS >= vax_number_of_arguments)
 				assert(reg == GET_ARG_REG(vax_number_of_arguments - 1));
 			else
 			{
-				assert(reg == GTM_REG_ACCUM);
+				assert(GTM_REG_ACCUM == reg);
 				stack_offset = STACK_ARG_OFFSET((vax_number_of_arguments - MACHINE_REG_ARGS - 1));
 				GEN_STORE_ARG(reg, stack_offset);	/* Store arg on stack */
 			}
@@ -1721,10 +1733,10 @@ void emit_push(int reg)
 			assertpro(FALSE && cg_phase);
 			break;
 	}
-	if (cg_phase == CGP_MACHINE || cg_phase == CGP_ASSEMBLY)
+	if ((CGP_MACHINE == cg_phase) || (CGP_ASSEMBLY == cg_phase))
 	{
 		vax_number_of_arguments--;		/* actually, it's the number of arguments remaining */
-		assert(vax_number_of_arguments >= 0);
+		assert(0 <= vax_number_of_arguments);
 	}
 	vax_pushes_seen++;
 	stack_depth++;
@@ -1738,20 +1750,20 @@ void emit_pop(int count)
 	assert(stack_depth >= count);
 	stack_depth -= count;
 	/* It's possible we lost count after a jsb (see VXI_JSB). */
-	if (stack_depth < 0)
+	if (0 > stack_depth)
 		stack_depth = 0;
 	return;
 }
 
 void add_to_vax_push_list(int pushes_seen)
 {	/* Make sure there's enough room */
-	if (pushes_seen > MAX_ARGS)	/* user-visible max args is MAX_ARGS - 3 */
+	if (MAX_ARGS < pushes_seen)	/* user-visible max args is MAX_ARGS - 3 */
 		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(3) ERR_MAXARGCNT, 1, MAX_ARGS - 3);
 	push_list_index++;
-	if (push_list_index >= PUSH_LIST_SIZE)
+	if (PUSH_LIST_SIZE <= push_list_index)
 	{
 		push_list_index = 0;
-		if (current_push_list_ptr->next == 0 )
+		if (0 == current_push_list_ptr->next)
 		{
 			current_push_list_ptr->next = (struct push_list *)malloc(SIZEOF(*current_push_list_ptr));
 			current_push_list_ptr->next->next = 0;
@@ -1764,7 +1776,7 @@ void add_to_vax_push_list(int pushes_seen)
 int next_vax_push_list(void)
 {
 	push_list_index++;
-	if (push_list_index >= PUSH_LIST_SIZE)
+	if (PUSH_LIST_SIZE <= push_list_index)
 	{
 		push_list_index=0;
 		assertpro(current_push_list_ptr->next);
@@ -1776,7 +1788,7 @@ int next_vax_push_list(void)
 void push_list_init(void)
 {
 	push_list_index = -1;
-	if (push_list_start_ptr == 0)
+	if (0 == push_list_start_ptr)
 	{
 		push_list_start_ptr = (struct push_list *)malloc(SIZEOF(*current_push_list_ptr));
 		push_list_start_ptr->next = 0;
@@ -1790,6 +1802,7 @@ void reset_push_list_ptr(void)
 	current_push_list_ptr = push_list_start_ptr;
 }
 
+/* Generate code for a transfer table (xfer_table) call into the (shared) runtime library */
 void emit_call_xfer(int xfer)
 {
 	int		offset;
@@ -1800,7 +1813,7 @@ void emit_call_xfer(int xfer)
 	{
 		memcpy(obpt, &vdat_def[0], VDAT_DEF_SIZE);
 		obpt += VDAT_DEF_SIZE;
-		if (xfer < 127)
+		if (127 > xfer)
 		{
 			memcpy(obpt, &vdat_bdisp[0], VDAT_BDISP_SIZE);
 			obpt += VDAT_BDISP_SIZE;
@@ -1867,10 +1880,9 @@ void emit_call_xfer(int xfer)
 	 * triple shrink phase, the triple distances can vary widely and cause the codegen to change
 	 * sizes. Note this still allows an assert fail for 0 if a negative number was being produced.
 	 */
-	if (CGP_MACHINE == cg_phase || CGP_ASSEMBLY == cg_phase)
-	{
+	if ((CGP_MACHINE == cg_phase) || (CGP_ASSEMBLY == cg_phase))
 		assert(0 <= offset && MAX_BRANCH_CODEGEN_SIZE > offset);
-	} else
+	else
 		offset = MAX(0, MIN(128, offset));
 	ocnt_ref_opr->oprval.offset = offset;
 	ocnt_ref_seen = FALSE;
diff --git a/sr_port/error.h b/sr_port/error.h
index b3c42fa..23593e1 100755
--- a/sr_port/error.h
+++ b/sr_port/error.h
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information 	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -28,9 +28,7 @@ typedef struct err_ctl_struct
 	int		msg_cnt;
 } err_ctl;
 
-#ifdef UNIX
 #include "wbox_test_init.h"	/* needed for DUMPABLE macro which uses WBTEST_ENABLED */
-#endif
 #include "errorsp.h"
 
 #define ERROR_RETURN		error_return
@@ -58,7 +56,7 @@ typedef struct err_ctl_struct
 #define	SET_ERROR_CONDITION(MSGID)							\
 {											\
 	error_condition = MSGID;							\
-	UNIX_ONLY(severity = (NULL == err_check(MSGID)) ? ERROR : SEVMASK(MSGID);)	\
+	severity = (NULL == err_check(MSGID)) ? ERROR : SEVMASK(MSGID);			\
 }
 
 /* Macro used intermittently to trace various error handling invocations */
@@ -85,9 +83,7 @@ CONDITION_HANDLER(dse_f_blk_ch);
 CONDITION_HANDLER(exi_ch);
 CONDITION_HANDLER(fgncal_ch);
 CONDITION_HANDLER(fntext_ch);
-#ifdef UNIX
 CONDITION_HANDLER(fnzsrch_ch);
-#endif
 CONDITION_HANDLER(gds_rundown_ch);
 CONDITION_HANDLER(gtcm_ch);
 CONDITION_HANDLER(gtcm_exi_ch);
@@ -99,6 +95,9 @@ CONDITION_HANDLER(gtmrecv_fetchresync_ch);
 CONDITION_HANDLER(gtmsource_ch);
 CONDITION_HANDLER(gvcmy_open_ch);
 CONDITION_HANDLER(gvcmz_netopen_ch);
+CONDITION_HANDLER(gvcst_remove_statsDB_linkage_ch);
+CONDITION_HANDLER(gvcst_statsDB_init_ch);
+CONDITION_HANDLER(gvcst_statsDB_open_ch);
 CONDITION_HANDLER(gvzwrite_ch);
 CONDITION_HANDLER(hashtab_rehash_ch);
 CONDITION_HANDLER(io_init_ch);
@@ -107,11 +106,6 @@ CONDITION_HANDLER(iomt_ch);
 CONDITION_HANDLER(jnl_file_autoswitch_ch);
 CONDITION_HANDLER(job_init_ch);
 CONDITION_HANDLER(jobexam_dump_ch);
-#ifdef VMS
-CONDITION_HANDLER(lastchance1);
-CONDITION_HANDLER(lastchance2);
-CONDITION_HANDLER(lastchance3);
-#endif
 CONDITION_HANDLER(mdb_condition_handler);
 CONDITION_HANDLER(mu_freeze_ch);
 CONDITION_HANDLER(mu_int_ch);
@@ -132,11 +126,11 @@ CONDITION_HANDLER(trans_code_ch);
 CONDITION_HANDLER(updproc_ch);
 CONDITION_HANDLER(util_base_ch);
 CONDITION_HANDLER(util_ch);
-#ifdef UNIX
 CONDITION_HANDLER(zro_ins_rec_fail_ch);
-#endif
 CONDITION_HANDLER(zshow_ch);
 CONDITION_HANDLER(zyerr_ch);
+CONDITION_HANDLER(op_fnzatransform_ch);
+CONDITION_HANDLER(gvn2gds_ch);
 
 void mum_tstart();
 
diff --git a/sr_port/eval_expr.c b/sr_port/eval_expr.c
index 0f4e6ee..80163b1 100755
--- a/sr_port/eval_expr.c
+++ b/sr_port/eval_expr.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -33,7 +33,6 @@ LITREF octabstruct oc_tab[];
 LITREF toktabtype tokentable[];
 
 GBLREF  spdesc          stringpool;
-GBLREF boolean_t        gtm_utf8_mode;
 
 /**
  * Given a start token that represents a non-unary operation, consumes tokens and constructs an appropriate triple tree.
@@ -46,6 +45,7 @@ GBLREF boolean_t        gtm_utf8_mode;
  *  - Calls ins_triple, which adds triples to the execution chain
  */
 int eval_expr(oprtype *a)
+/* process an expression into the operand at *a */
 {
 	boolean_t	ind_pat, saw_local, saw_se, se_warn, replaced;
 	int		op_count, se_handling;
@@ -117,9 +117,12 @@ int eval_expr(oprtype *a)
 					memcpy(tmp_mval.str.addr, m1->v.str.addr, m1->v.str.len);
 					memcpy(tmp_mval.str.addr + m1->v.str.len, m2->v.str.addr, m2->v.str.len);
 					stringpool.free = (unsigned char *)tmp_mval.str.addr + tmp_mval.str.len;
+					s2n(&tmp_mval);		/* things rely on the compiler doing literals with complete types */
 					ref1->operand[0] = put_lit(&tmp_mval);
 					optyp_1 = ref1->operand[0];
 					replaced = TRUE;
+					unuse_literal(&m1->v);
+					unuse_literal(&m2->v);
 					op_count--;
 				} else
 				{
@@ -159,6 +162,7 @@ int eval_expr(oprtype *a)
 						saw_local = FALSE;	/* just clear the backptrs - shut off other processing */
 					/* This code checks to see if the only parameter for this OC_CAT is a string literal,
 						and if it is, then it simply returns the literal*/
+					assert(1 < op_count);
 					if ((2 == op_count) && (OC_PARAMETER == ref1->opcode)
 						&& (TRIP_REF == ref1->operand[0].oprclass)
 						&& (OC_LIT == ref1->operand[0].oprval.tref->opcode))
diff --git a/sr_port/ex_tail.c b/sr_port/ex_tail.c
index a9d1bea..7a46c56 100755
--- a/sr_port/ex_tail.c
+++ b/sr_port/ex_tail.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2012 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -10,58 +11,233 @@
  ****************************************************************/
 
 #include "mdef.h"
+#include "gtm_string.h"
 #include "compiler.h"
 #include "mdq.h"
+#include "mmemory.h"
+#include "op.h"
 #include "opcode.h"
+#include "fullbool.h"
+#include "stringpool.h"
 #include "toktyp.h"
-#include "mmemory.h"
+#include "flt_mod.h"
+
+LITREF mval		literal_minusone, literal_one, literal_zero;
+LITREF octabstruct	oc_tab[];
 
 void ex_tail(oprtype *opr)
+/* work a non-leaf operand toward final form
+ * contains code to do arthimetic on literals at compile time
+ * and code to bracket Boolean expressions with BOOLINIT and BOOLFINI
+ */
 {
-	LITREF octabstruct oc_tab[];
-	triple *t, *t1, *t2, *bitrip;
-	oprtype *i;
-	opctype c;
-	unsigned short w;
+	boolean_t	stop, tv;
+	mval		*v, *v0, *v1;
+	opctype		c;
+	oprtype		*i;
+	triple		pos_in_chain, *bftrip, *bitrip, *t, *t0, *t1, *t2;
+	uint		bexprs, j, oct;
+	DCL_THREADGBL_ACCESS;
 
+	SETUP_THREADGBL_ACCESS;
 	assert(TRIP_REF == opr->oprclass);
+	UNARY_TAIL(opr);	/* this is first because it can change opr and thus whether we should even process the tail */
 	t = opr->oprval.tref;
 	c = t->opcode;
-	w = oc_tab[c].octype;
-	if (w & OCT_EXPRLEAF)
+	oct = oc_tab[c].octype;
+	if (OCT_EXPRLEAF & oct)
 		return;
 	assert(TRIP_REF == t->operand[0].oprclass);
 	assert((TRIP_REF == t->operand[1].oprclass) || (NO_REF == t->operand[1].oprclass));
-	if (!(w & OCT_BOOL))
+	if (!(OCT_BOOL & oct))
 	{
 		for (i = t->operand; ARRAYTOP(t->operand) > i; i++)
 			if (TRIP_REF == i->oprclass)
+				UNARY_TAIL(i);
+                while (OCT_ARITH & oct)                                 /* really a sneaky if that allows us to use breaks */
+                {       /* binary arithmetic operations might be on literals, which can be performed at compile time */
+			for (i = t->operand, j = 0; ARRAYTOP(t->operand) > i; i++, j++)
+			{
+				if (((OCT_BOOL | OCT_ARITH | OCT_UNARY) & oc_tab[i->oprval.tref->opcode].octype))
+					ex_tail(i);			/* chained Boolean or arithmetic */
+				if (OC_LIT != t->operand[j].oprval.tref->opcode)
+					break;				/* from for */
+			}
+			if (ARRAYTOP(t->operand) > i)
+				break;					/* from while */
+			pos_in_chain = TREF(pos_in_chain);
+			TREF(pos_in_chain) = *(TREF(curtchain));
+			for (t0 = t; TRIP_REF == t0->operand[0].oprclass; t0 = t0->operand[0].oprval.tref)
+				if (t0 != t)
+					dqdel(t0, exorder);
+			for (t1 = t->operand[1].oprval.tref; TRIP_REF == t1->operand[0].oprclass; t1 = t1->operand[0].oprval.tref)
+					dqdel(t1, exorder);
+			v0 = &t0->operand[0].oprval.mlit->v;
+			assert(MV_NM & v0->mvtype);
+			v1 = &t1->operand[0].oprval.mlit->v;
+			assert(MV_NM & v1->mvtype);
+			v = (mval *)mcalloc(SIZEOF(mval));
+			switch (c)
+			{
+			case OC_ADD:
+				op_add(v0, v1, v);
+				break;
+			case OC_DIV:
+			case OC_IDIV:
+				if (!(MV_NM & v1->mvtype) || (0 != v1->m[1]))
+				{
+					if (OC_DIV == c)
+						op_div(v0, v1, v);
+					else
+						op_idiv(v0, v1, v);
+				} else				/* divide by literal 0 is a technique so let it go to run time*/
+					v = NULL;		/* flag value to get out of nested switch */
+				break;
+			case OC_EXP:
+				op_exp(v0, v1, v);
+				break;
+			case OC_MOD:
+				flt_mod(v0, v1, v);
+				break;
+			case OC_MUL:
+				op_mul(v0, v1, v);
+				break;
+			case OC_SUB:
+				op_sub(v0, v1, v);
+				break;
+			default:
+				assertpro(FALSE && t1->opcode);
+				break;
+			}
+			if (NULL == v)				/* leaving divide by literal 0 to create a run time error */
+				break;				/* from while */
+			unuse_literal(v0);			/* drop original literals only after deciding whether to defer */
+			unuse_literal(v1);
+			dqdel(t0, exorder);
+			dqdel(t1, exorder);
+			n2s(v);
+			s2n(v);					/* compiler must leave literals with both numeric and string */
+			t->opcode = OC_LIT;			/* replace the original operator triple with new literal */
+			put_lit_s(v, t);
+			t->operand[1].oprclass = NO_REF;
+			assert(opr->oprval.tref == t);
+			TREF(pos_in_chain) = pos_in_chain;
+			return;
+		}
+		for (i = t->operand; ARRAYTOP(t->operand) > i; i++)
+			if (TRIP_REF == i->oprclass)
 				ex_tail(i);
-		if ((OC_COMINT == c) && (OC_BOOLINIT == (t1 = t->operand[0].oprval.tref)->opcode))	/* NOTE assignment */
-			opr->oprval.tref = t1;
-	} else
+		if ((OC_COMINT == c) && (OC_BOOLINIT == (t0 = t->operand[0].oprval.tref)->opcode))	/* WARNING assignment */
+			opr->oprval.tref = t0;
+		return;
+	}
+	/* the following code deals with Booleans where the expression is not managing flow - those go through bool_expr */
+	for (t1 = t; ; t1 = t2)
 	{
-		for (t1 = t; ; t1 = t2)
+		assert(TRIP_REF == t1->operand[0].oprclass);
+		t2 = t1->operand[0].oprval.tref;
+		if (!(oc_tab[t2->opcode].octype & OCT_BOOL))
+			break;
+	}
+	bitrip = maketriple(OC_BOOLINIT);
+	dqins(t1->exorder.bl, exorder, bitrip);
+	opr->oprval.tref = bitrip;
+	t2 = t->exorder.fl;
+	assert(&t2->operand[0] == opr);
+	assert((OC_COMVAL == t2->opcode) || (OC_COMINT == t2->opcode));
+	if (OC_COMINT == t2->opcode)
+		dqdel(t2, exorder);
+	bftrip = maketriple(OC_BOOLFINI);
+	bftrip->operand[0] = put_tref(bitrip);
+	dqins(t, exorder, bftrip);
+	i = (oprtype *)mcalloc(SIZEOF(oprtype));
+	bx_tail(t, FALSE, i);
+	*i = put_tnxt(bftrip);
+	/* the following logic is analogous to that in bool_expr, but there are material differences */
+	if (TREF(curtchain) == bftrip->exorder.fl->exorder.fl)
+		newtriple(OC_NOOP);
+	for (t0 = t; OC_NOOP == t->opcode; t = t->exorder.bl)
+		;
+	if (OC_BOOLINIT == t->opcode)
+		t = t0;											/* we want our NOOP back */
+	for (bexprs = 0; bitrip != t0; t0 = t0->exorder.bl)
+	{	/* find out if we are down to a single evaluation, and replace the JMP TRUE / FALSE while at it */
+		if (OCT_JUMP & oc_tab[t0->opcode].octype)
 		{
-			assert(TRIP_REF == t1->operand[0].oprclass);
-			t2 = t1->operand[0].oprval.tref;
-			if (!(oc_tab[t2->opcode].octype & OCT_BOOL))
-				break;
+			if ((OC_JMPTRUE == t0->opcode) || (OC_JMPFALSE == t0->opcode))
+			{	/* JMPTRUE better than NOOP while processing Booleans, but that's done, so replace it & JMPFALSE */
+				assert(INDR_REF == t0->operand[0].oprclass);
+				t0->opcode = (OC_JMPTRUE == t0->opcode) ? OC_NOOP : OC_JMP;
+				t0->operand[0].oprclass = (OC_NOOP ==  t0->opcode) ? NO_REF : INDR_REF;
+				if (!bexprs)
+					t = t0;
+			}
+			bexprs++;
+		}
+	}
+	t0 = bftrip->exorder.fl;
+	assert(TREF(curtchain) != t0->exorder.fl);
+	if (1 < bexprs)
+		return;
+	switch (t->opcode)
+	{	/* this separates cases where we are left with a literal from others (not left with a literal) */
+	case OC_LIT:	/* this case deals with the possibility of junk left from a concatenation collapse to a literal */
+		if ((OC_JMP != (t1 = bftrip->exorder.bl)->opcode) && (OC_NOOP != t1->opcode))	/* WARNING assignment */
+			break;
+		for (t1 = t1->exorder.bl; bitrip != t1; t1 = t1->exorder.bl)
+			if ((OC_LIT != t1->opcode) && (OC_PARAMETER != t1->opcode) && (OC_PASSTHRU != t1->opcode))
+				return;
+		t = bftrip->exorder.bl;									/* WARNING fallthrough */
+	case OC_JMP:
+	case OC_NOOP:
+		dqdel(bftrip, exorder);
+		bitrip->opcode = OC_NOOP;
+		bitrip->operand[0].oprclass = NO_REF;
+		tv = (OC_NOOP == t->opcode) ? TRUE : FALSE;
+		if (OC_COMVAL == t0->opcode)
+		{	/* we need an mval rather than a jmp, so clean up */
+			dqdel(t, exorder);
+			if (OCT_UNARY & oc_tab[t0->exorder.fl->opcode].octype)
+			{	/* a unary has this as an operand, so use that rather than this OC_COMVAL as new value */
+				assert(OC_COBOOL != t0->exorder.fl->opcode);
+				assert(t0->exorder.fl->operand[0].oprval.tref == t0);
+				assert(NO_REF == t->operand[1].oprclass);
+				i->oprval.tref = t = t0->exorder.fl;
+				dqdel(t0, exorder);
+				if (OC_COM == t->opcode)
+					tv ^= 1;						/* complement */
+				else if (tv && (OC_NEG == t->opcode))
+				{	/* better to do the negation now */
+					v = (mval *)mcalloc(SIZEOF(mval));
+					*v = literal_minusone;
+					ENSURE_STP_FREE_SPACE(v->str.len);
+					memcpy((char *)stringpool.free, v->str.addr, v->str.len);
+					v->str.addr = (char *)stringpool.free;
+					stringpool.free += v->str.len;
+					t->opcode = OC_LIT;
+					put_lit_s(v, t);
+					break;
+				}
+			} else
+				i->oprval.tref = t = t0;
+		} else if (OC_COMINT == t2->opcode)
+		{
+			dqins(t, exorder, t2);
+			dqdel(t, exorder);
+			i->oprval.tref = t = t2;
 		}
-		bitrip = maketriple(OC_BOOLINIT);
-		dqins(t1->exorder.bl, exorder, bitrip);
-		t2 = t->exorder.fl;
-		assert(&t2->operand[0] == opr);
-		assert((OC_COMVAL == t2->opcode) || (OC_COMINT == t2->opcode));
-		if (OC_COMINT == t2->opcode)
-			dqdel(t2, exorder);
-		t1 = maketriple(OC_BOOLFINI);
-		t1->operand[0] = put_tref(bitrip);
-		opr->oprval.tref = bitrip;
-		dqins(t, exorder, t1);
-		i = (oprtype *)mcalloc(SIZEOF(oprtype));
-		bx_tail(t, FALSE, i);
-		*i = put_tnxt(t1);
+		PUT_LITERAL_TRUTH(tv, t);							/* turn known result into literal */
+		t->opcode = OC_LIT;
+		break;
+	case OC_JMPEQU:
+	case OC_JMPNEQ:
+		assert((OC_COBOOL != t->exorder.bl->opcode)					/* only non literals remain */
+			|| (OC_LIT != t->exorder.bl->operand[0].oprval.tref->opcode));
+		break;
+	case OC_JMPTCLR:									/* can't optimize these */
+	case OC_JMPTSET:
+	default:
+		break;
 	}
 	return;
 }
diff --git a/sr_port/expritem.c b/sr_port/expritem.c
index 12f58fb..eb05536 100755
--- a/sr_port/expritem.c
+++ b/sr_port/expritem.c
@@ -11,6 +11,7 @@
  ****************************************************************/
 
 #include "mdef.h"
+#include "gtm_string.h"
 #include "compiler.h"
 #include "mdq.h"
 #include "opcode.h"
@@ -23,6 +24,7 @@
 #include "namelook.h"
 #include "fullbool.h"
 #include "show_source_line.h"
+#include "op.h"
 
 GBLREF	bool		devctlexp;
 GBLREF	boolean_t	run_time;
@@ -40,16 +42,12 @@ LITREF	toktabtype	tokentable[];
 LITREF	mval		literal_null;
 LITREF	octabstruct	oc_tab[];
 
-#ifndef UNICODE_SUPPORTED
-#define f_char f_zchar
-#endif
-
 /* note that svn_index array provides indexes into this array for each letter of the
  * alphabet so changes here should be reflected there.
  */
 LITDEF nametabent svn_names[] =
 {
-         { 1, "D" }, { 6, "DEVICE" }
+	 { 1, "D" }, { 6, "DEVICE" }
 	,{ 2, "EC" }, { 5, "ECODE" }
 	,{ 2, "ES" }, { 6, "ESTACK" }
 	,{ 2, "ET" }, { 5, "ETRAP" }
@@ -246,6 +244,7 @@ LITDEF nametabent fun_names[] =
 	,{1, "V*"}
 	,{2, "ZA"}, {6, "ZASCII"}
 	,{3, "ZAH"}, {8, "ZAHANDLE"}
+	,{4, "ZATR"}, {8, "ZATRANSF*"}
 	,{7, "ZBITAND"}
 	,{8, "ZBITCOUN*"}
 	,{8, "ZBITFIND"}
@@ -259,6 +258,7 @@ LITDEF nametabent fun_names[] =
 	,{2, "ZC"}, {5, "ZCALL"}
 	,{3, "ZCH"}, {5, "ZCHAR"}
 	,{3, "ZCO"}, {8, "ZCONVERT"}
+	,{4, "ZCOL"}, {8, "ZCOLLATE"}
 	,{2, "ZD"}
 	,{5, "ZDATA"}
 	,{5, "ZDATE"}
@@ -300,14 +300,14 @@ LITDEF unsigned char fun_index[27] =
 {
 	 0,  2,  2,  4,  6,  8, 12, 14, 14,	/* a b c d e f g h i */
 	17, 19, 19, 21, 21, 25, 27, 29, 35,	/* j k l m n o p q r */
-	39, 43, 47, 47, 48, 48, 48, 48, 118	/* s t u v w x y z ~ */
+	39, 43, 47, 47, 48, 48, 48, 48, 122	/* s t u v w x y z ~ */
 };
 
 /* Each entry corresponds to an entry in fun_names */
 LITDEF fun_data_type fun_data[] =
 {
 	 { OC_FNASCII, ALL_SYS }, { OC_FNASCII, ALL_SYS }
-        ,{ OC_FNCHAR, ALL_SYS }, { OC_FNCHAR, ALL_SYS }
+	,{ OC_FNCHAR, ALL_SYS }, { OC_FNCHAR, ALL_SYS }
 	,{ OC_FNDATA, ALL_SYS }, { OC_FNDATA, ALL_SYS }
 	,{ OC_FNEXTRACT, ALL_SYS }, { OC_FNEXTRACT, ALL_SYS }
 	,{ OC_FNFIND, ALL_SYS }, { OC_FNFIND, ALL_SYS }
@@ -326,13 +326,14 @@ LITDEF fun_data_type fun_data[] =
 	,{ OC_FNQUERY, ALL_SYS }, { OC_FNQUERY, ALL_SYS }
 	,{ OC_FNRANDOM, ALL_SYS }, { OC_FNRANDOM, ALL_SYS }
 	,{ OC_FNREVERSE, ALL_SYS }, { OC_FNREVERSE, ALL_SYS }
-	,{ OC_PASSTHRU, ALL_SYS }, { OC_PASSTHRU, ALL_SYS }
+	,{ OC_PASSTHRU, ALL_SYS }, { OC_PASSTHRU, ALL_SYS }	/* f_select creates a STOTEMP and STOs anchored by a PASSTHRU */
 	,{ OC_FNSTACK1, ALL_SYS }, { OC_FNSTACK1, ALL_SYS }
 	,{ OC_FNTEXT, ALL_SYS }, { OC_FNTEXT, ALL_SYS }
 	,{ OC_FNTRANSLATE, ALL_SYS }, { OC_FNTRANSLATE, ALL_SYS }
 	,{ OC_FNVIEW, ALL_SYS }
 	,{ OC_FNZASCII, ALL_SYS }, { OC_FNZASCII, ALL_SYS }
 	,{ OC_FNZAHANDLE, ALL_SYS }, { OC_FNZAHANDLE, ALL_SYS }
+	,{ OC_FNZATRANSFORM, ALL_SYS }, { OC_FNZATRANSFORM, ALL_SYS }
 	,{ OC_FNZBITAND, ALL_SYS }
 	,{ OC_FNZBITCOUN, ALL_SYS }
 	,{ OC_FNZBITFIND, ALL_SYS }
@@ -346,6 +347,7 @@ LITDEF fun_data_type fun_data[] =
 	,{ OC_FNZCALL, VMS_OS }, { OC_FNZCALL, VMS_OS }
 	,{ OC_FNZCHAR, ALL_SYS }, { OC_FNZCHAR, ALL_SYS }
 	,{ OC_FNZCONVERT2, UNIX_OS }, { OC_FNZCONVERT2, UNIX_OS }
+	,{ OC_FNZCOLLATE, UNIX_OS }, { OC_FNZCOLLATE, UNIX_OS }
 	,{ OC_FNZDATE, ALL_SYS }
 	,{ OC_FNZDATA, ALL_SYS }
 	,{ OC_FNZDATE, ALL_SYS }
@@ -412,6 +414,7 @@ GBLDEF int (*fun_parse[])(oprtype *, opctype) =		/* contains addresses so can't
 	f_view,
 	f_ascii, f_ascii,
 	f_zahandle, f_zahandle,
+	f_zatransform, f_zatransform,
 	f_two_mval,
 	f_one_mval,
 	f_fnzbitfind,
@@ -425,6 +428,7 @@ GBLDEF int (*fun_parse[])(oprtype *, opctype) =		/* contains addresses so can't
 	f_zcall, f_zcall,
 	f_zchar, f_zchar,
 	f_zconvert, f_zconvert,
+	f_zcollate, f_zcollate,
 	f_zdate,
 	f_data,				/* $ZDATA reuses parser for $DATA since only runtime execution differs */
 	f_zdate,
@@ -462,10 +466,12 @@ GBLDEF int (*fun_parse[])(oprtype *, opctype) =		/* contains addresses so can't
 };
 
 int expritem(oprtype *a)
+/* process an expression item into the operand at *a */
 {
 	boolean_t	parse_warn, saw_local, saw_se, se_warn;
-	oprtype 	*j, *k, x1;
 	int		i, index, sv_opcode;
+	mval		v;
+	oprtype		*j, *k, x1;
 	tbp		argbp, *funcbp, *tripbp;
 	triple		*argtrip, *functrip, *ref, *t1, *t2, *t3;
 	unsigned char	type;
@@ -541,6 +547,34 @@ int expritem(oprtype *a)
 			if (TK_LPAREN == TREF(director_token))
 			{
 				index = namelook(fun_index, fun_names, (TREF(window_ident)).addr, (TREF(window_ident)).len);
+				if (!gtm_utf8_mode)
+				{	/** When possible, update opcodes rather than mess with xfer table */
+					switch (fun_data[index].opcode)
+					{
+					case OC_FNASCII:
+						index = namelook(fun_index, fun_names, "zascii", 6);
+						break;
+					case OC_FNCHAR:
+						index = namelook(fun_index, fun_names, "zchar", 5);
+						break;
+					case OC_FNEXTRACT:
+						index = namelook(fun_index, fun_names, "zextract", 8);
+						break;
+					case OC_FNFIND:
+						index = namelook(fun_index, fun_names, "zfind", 5);
+						break;
+					case OC_FNLENGTH:
+						index = namelook(fun_index, fun_names, "zlength", 7);
+						break;
+					case OC_FNPIECE:
+						index = namelook(fun_index, fun_names, "zpiece", 6);
+						break;
+					case OC_FNTRANSLATE:
+						index = namelook(fun_index, fun_names, "ztranslate", 10);
+						break;
+					default: break;
+					}
+				}
 				if (index < 0)
 				{
 					STX_ERROR_WARN(ERR_INVFCN);	/* sets "parse_warn" to TRUE */
@@ -572,8 +606,7 @@ int expritem(oprtype *a)
 				} else
 				{
 					*a = put_lit((mval *)&literal_null);
-					/* Parse the remaining arguments until the corresponding RIGHT-PAREN/SPACE/EOL
-					   is reached */
+					/* Parse remaining arguments until reaching the corresponding RIGHT-PAREN/SPACE/EOL */
 					if (!parse_until_rparen_or_space())
 						return FALSE;
 				}
@@ -602,15 +635,29 @@ int expritem(oprtype *a)
 				{
 					sv_opcode = svn_data[index].opcode;
 					assert(SV_NUM_SV > sv_opcode);
-					if (SV_TEST == sv_opcode)
-						*a = put_tref(newtriple(OC_GETTRUTH));
-					else
+					switch (sv_opcode)
 					{
-						if (sv_opcode == SV_X || sv_opcode == SV_Y)
-							devctlexp = TRUE;
-						ref = newtriple(OC_SVGET);
-						ref->operand[0] = put_ilit(sv_opcode);
-						*a = put_tref(ref);
+						case SV_TEST:
+							*a = put_tref(newtriple(OC_GETTRUTH));
+							break;
+						case SV_ZVERSION:	/* making these literals at compile time assumes code is */
+						case SV_ZCHSET:		/* generated for/in the environment where it runs, which */
+							op_svget(sv_opcode, &v);	/* relies on appropriate code management */
+							assert(MVTYPE_IS_NUMERIC(v.mvtype) && MVTYPE_IS_STRING(v.mvtype));
+							ENSURE_STP_FREE_SPACE(v.str.len);
+							memcpy((char *)stringpool.free, v.str.addr, v.str.len);
+							v.str.addr = (char *)stringpool.free;
+							stringpool.free += v.str.len;
+							*a = put_lit(&v);
+							break;
+						case SV_X:
+						case SV_Y:
+							devctlexp = TRUE;		/* WARNING fallthrough */
+						default:
+							ref = newtriple(OC_SVGET);
+							ref->operand[0] = put_ilit(sv_opcode);
+							*a = put_tref(ref);
+							break;
 					}
 				} else
 					*a = put_lit((mval *)&literal_null);
@@ -680,7 +727,7 @@ int expritem(oprtype *a)
 				t2 = (oc_tab[t3->opcode].octype & OCT_COERCE) ? t3->operand[0].oprval.tref : t3;
 				if ((OC_VAR == t2->opcode) || (OC_GETINDX == t2->opcode))
 				{	/* it's an lvn */
-					if ((t3 != t2) || ((ARRAYTOP(argtrip->operand) - 1) == (&(argtrip->operand[i]))))
+					if ((t3 != t2) || ((ARRAYTOP(argtrip->operand) - 1) == j))
 						continue;		/* but if it's the last or there's a coerce */
 					saw_local = TRUE;		/* left operand may need protection */
 				}
diff --git a/sr_port/extern_func.c b/sr_port/extern_func.c
index da1d3f3..44bffc9 100755
--- a/sr_port/extern_func.c
+++ b/sr_port/extern_func.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2011-2015 Fidelity National Information	*
+ * Copyright (c) 2011-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -16,8 +16,6 @@
 #include "toktyp.h"
 #include "advancewindow.h"
 
-GBLREF unsigned char *source_buffer;
-
 error_def(ERR_RTNNAME);
 
 /* Maximum size of external routine reference of the form label^routine */
@@ -38,7 +36,7 @@ int extern_func(oprtype *a)
 	assert(TK_AMPERSAND == TREF(window_token));
 	advancewindow();
 	cnt = 0;
-	extref = (char *)&source_buffer[TREF(last_source_column) - 1];
+	extref = ((TREF(source_buffer)).addr + TREF(last_source_column) - 1);
 	package.len = 0;
 	package.addr = NULL;
 	if (have_ident = (TK_IDENT == TREF(window_token)))			/* NOTE assignment */
@@ -69,7 +67,7 @@ int extern_func(oprtype *a)
 		stx_error(ERR_RTNNAME);
 		return FALSE;
 	}
-	extentry.len = INTCAST((char *)&source_buffer[TREF(last_source_column) - 1] - extref);
+	extentry.len = INTCAST((TREF(source_buffer)).addr + TREF(last_source_column) - 1 - extref);
 	extentry.len = INTCAST(extentry.len > MAX_EXTREF ? MAX_EXTREF : extentry.len);
 	extentry.addr = extref;
 	calltrip = maketriple(a ? OC_FNFGNCAL : OC_FGNCAL);
diff --git a/sr_port/f_incr.c b/sr_port/f_incr.c
index b497673..4263482 100755
--- a/sr_port/f_incr.c
+++ b/sr_port/f_incr.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -80,8 +81,8 @@ int f_incr(oprtype *a, opctype op)
 			setcurtchain(oldchain);
 			return FALSE;
 		}
-		dqadd(&targchain, &incrchain, exorder);	/* dir before targ - this is a violation of info hiding */
 		setcurtchain(&targchain);
+		dqadd(&targchain, &incrchain, exorder);	/* dir before targ - this is a violation of info hiding */
 	}
 	coerce(increment, OCT_MVAL);
 	ins_triple(r);
diff --git a/sr_port/f_select.c b/sr_port/f_select.c
index 47d60c3..00a24ec 100755
--- a/sr_port/f_select.c
+++ b/sr_port/f_select.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information 	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -19,6 +19,7 @@
 #include "mmemory.h"
 #include "advancewindow.h"
 #include "fullbool.h"
+#include "stringpool.h"
 
 error_def(ERR_COLON);
 error_def(ERR_SELECTFALSE);
@@ -34,39 +35,48 @@ LITREF octabstruct oc_tab[];
 }
 
 int f_select(oprtype *a, opctype op)
+/* drive parsing for the $select function
+ * a is an operand the caller places to access the result
+ * op is actuallly an OC_PASSTHRU to anchor the list of Boolean controlled jumps around STOs of associated values
+ * the return is TRUE for success and FALSE for a failure
+ */
 {
-	boolean_t	first_time, save_saw_side, saw_se_in_select, *save_se_base, save_shift, shifting, gvn_or_indir_in_select;
+	boolean_t	first_time, got_true, save_saw_side, saw_se_in_select, *save_se_base, save_shift, shifting, throwing;
 	opctype		old_op;
 	oprtype		*cnd, endtrip, target, tmparg;
-	triple		*oldchain, *r, *ref, *save_start, *save_start_orig, tmpchain, *triptr;
+	triple		dmpchain, *oldchain, *r, *ref, *savechain, *save_start, *save_start_orig, tmpchain, *triptr;
 	uint4		save_expr_depth, save_se_depth;
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
 	save_expr_depth = TREF(expr_depth);
-	save_start = TREF(expr_start);
-	save_start_orig = TREF(expr_start_orig);
 	save_saw_side = TREF(saw_side_effect);
 	save_shift = TREF(shift_side_effects);
-	save_se_base = TREF(side_effect_base);
 	save_se_depth = TREF(side_effect_depth);
-	TREF(expr_depth) = 0;
+	save_se_base = TREF(side_effect_base);
+	save_start = TREF(expr_start);
+#	ifdef DEBUG
+	if (NULL != save_start)
+		CHKTCHAIN(save_start, exorder, FALSE);
+#	endif
+	save_start_orig = TREF(expr_start_orig);
 	TREF(expr_start) = TREF(expr_start_orig) = NULL;
+	TREF(expr_depth) = 0;
 	TREF(saw_side_effect) = FALSE;
+	TREF(shift_side_effects) = FALSE;
 	TREF(side_effect_depth) = INITIAL_SIDE_EFFECT_DEPTH;
 	TREF(side_effect_base) = malloc(SIZEOF(boolean_t) * TREF(side_effect_depth));
 	memset((char *)(TREF(side_effect_base)), 0, SIZEOF(boolean_t) * TREF(side_effect_depth));
-	if (shifting = (save_shift && (!save_saw_side || (GTM_BOOL == TREF(gtm_fullbool)))))	/* NOTE assignment */
+	if (shifting = (save_shift && (!save_saw_side || (GTM_BOOL == TREF(gtm_fullbool)))))	/* WARNING assignment */
 	{
 		dqinit(&tmpchain, exorder);
 		oldchain = setcurtchain(&tmpchain);
 		INCREMENT_EXPR_DEPTH;	/* Don't want to hit bottom with each expression, so start at 1 rather than 0 */
 		TREF(expr_start) = TREF(expr_start_orig) = &tmpchain;
-		TREF(shift_side_effects) = TRUE;
-	} else
-		TREF(shift_side_effects) = FALSE;
+	}
 	r = maketriple(op);
 	first_time = TRUE;
+	got_true = throwing = FALSE;
 	endtrip = put_tjmp(r);
 	for (;;)
 	{
@@ -87,6 +97,23 @@ int f_select(oprtype *a, opctype op)
 			return FALSE;
 		}
 		advancewindow();
+		for (triptr = (TREF(curtchain))->exorder.bl; OC_NOOP == triptr->opcode; triptr = triptr->exorder.bl)
+			;
+		if (!got_true && OC_LIT == triptr->opcode)
+		{	/* it is a literal not following an already optimizing TRUE, so optimize it */
+			dqdel(triptr, exorder);
+			unuse_literal(&triptr->operand[0].oprval.mlit->v);
+			dqinit(&dmpchain, exorder);
+			if (0 == triptr->operand[0].oprval.mlit->v.m[1])
+			{	/* it's FALSE: discard the corresponding value */
+				throwing = TRUE;
+				savechain = setcurtchain(&dmpchain);
+			} else
+			{	/* it's TRUE: take this argument and disregard any following */
+				got_true = TRUE;
+				savechain = NULL;
+			}
+		}
 		if (EXPR_FAIL == expr(&tmparg, MUMPS_EXPR))
 		{
 			SELECT_CLEANUP;
@@ -95,6 +122,16 @@ int f_select(oprtype *a, opctype op)
 			return FALSE;
 		}
 		assert(TRIP_REF == tmparg.oprclass);
+		if (throwing)
+		{	/* finished with the false argument so put things back to normal */
+			assert(savechain);
+			setcurtchain(savechain);
+			throwing = FALSE;
+			if (TK_COMMA != TREF(window_token))
+				break;
+			advancewindow();
+			continue;
+		}
 		old_op = tmparg.oprval.tref->opcode;
 		if (first_time)
 		{
@@ -119,23 +156,39 @@ int f_select(oprtype *a, opctype op)
 				ref->operand[1] = put_tref(tmparg.oprval.tref->operand[0].oprval.tref);
 			}
 		}
-		ref = newtriple(OC_JMP);
-		ref->operand[0] = endtrip;
-		tnxtarg(cnd);
+		if (!got_true && !throwing)
+		{	/* jump to the end in case the run time value should turn out to be (the first) TRUE */
+			ref = newtriple(OC_JMP);
+			ref->operand[0] = endtrip;
+			tnxtarg(cnd);
+		}
 		if (TK_COMMA != TREF(window_token))
 			break;
 		advancewindow();
+		if (got_true && (NULL == savechain))
+			savechain = setcurtchain(&dmpchain);	/* discard arguments after a compile time TRUE */
+	}
+	if (got_true)
+	{
+		if (NULL != savechain)
+			setcurtchain(savechain);		/* if we discarded things return the chain to normal */
+	} else
+	{	/* if we didn't find a TRUE at compile time, then insert a possible error in case there's no TRUE at run time */
+		tmparg = put_ilit(ERR_SELECTFALSE);
+		if (first_time)
+		{	/* if all values were literals and FALSE, supply a dummy evaluation so we reach the error gracefully */
+			PUT_LITERAL_TRUTH(FALSE, r);
+			r->opcode = OC_LIT;
+		}
+		ref = newtriple(OC_RTERROR);
+		ref->operand[0] = tmparg;
+		ref->operand[1] = put_ilit(FALSE);		/* Not a subroutine reference */
 	}
-	tmparg = put_ilit(ERR_SELECTFALSE);
-	ref = newtriple(OC_RTERROR);
-	ref->operand[0] = tmparg;
-	ref->operand[1] = put_ilit(FALSE);	/* Not a subroutine reference */
 	ins_triple(r);
-	saw_se_in_select = TREF(saw_side_effect);	/* note this down before it gets reset by DECREMENT_EXPR_DEPTH */
+	saw_se_in_select = TREF(saw_side_effect);		/* note this down before it gets reset by DECREMENT_EXPR_DEPTH */
 	if (shifting)
-		DECREMENT_EXPR_DEPTH;		/* Clean up */
+		DECREMENT_EXPR_DEPTH;				/* clean up */
 	assert(!TREF(expr_depth));
-	gvn_or_indir_in_select = (TREF(expr_start) != TREF(expr_start_orig));
 	TREF(expr_start) = save_start;
 	TREF(expr_start_orig) = save_start_orig;
 	TREF(shift_side_effects) = save_shift;
@@ -144,26 +197,19 @@ int f_select(oprtype *a, opctype op)
 	SELECT_CLEANUP;	/* restores TREF(expr_depth), TREF(side_effect_base) and TREF(side_effect_depth) */
 	if (shifting)
 	{
-		if (!gvn_or_indir_in_select && ((GTM_BOOL == TREF(gtm_fullbool)) || !saw_se_in_select))
-		{
-			setcurtchain(oldchain);
-			triptr = (TREF(curtchain))->exorder.bl;
-			dqadd(triptr, &tmpchain, exorder);	/* this is a violation of info hiding */
-		} else
-		{
-			shifting = ((TREF(expr_start) != TREF(expr_start_orig)) && (OC_NOOP != (TREF(expr_start))->opcode));
-			newtriple(shifting ? OC_GVSAVTARG : OC_NOOP);	/* must have one of these two at expr_start */
-			setcurtchain(oldchain);
-			assert(NULL != TREF(expr_start));
-			dqadd(TREF(expr_start), &tmpchain, exorder);
-			TREF(expr_start) = tmpchain.exorder.bl;
-			if (shifting)
-			{	/* only play this game if something else started it */
-				assert(OC_GVSAVTARG == (TREF(expr_start))->opcode);
-				triptr = newtriple(OC_GVRECTARG);
-				triptr->operand[0] = put_tref(TREF(expr_start));
-			}
+		shifting = ((1 < TREF(expr_depth)) || ((save_start != save_start_orig) && (OC_NOOP != save_start->opcode)));
+		newtriple(shifting ? OC_GVSAVTARG : OC_NOOP);	/* must have one of these two at expr_start */
+		setcurtchain(oldchain);
+		assert(NULL != save_start);
+		dqadd(save_start, &tmpchain, exorder);
+		save_start = tmpchain.exorder.bl;
+		if (shifting)
+		{	/* only play this game if something else started it */
+			assert(OC_GVSAVTARG == save_start->opcode);
+			triptr = newtriple(OC_GVRECTARG);
+			triptr->operand[0] = put_tref(save_start);
 		}
+				TREF(expr_start) = save_start;
 	}
 	*a = put_tref(r);
 	return TRUE;
diff --git a/sr_port/f_zatransform.c b/sr_port/f_zatransform.c
new file mode 100644
index 0000000..e7b1bb3
--- /dev/null
+++ b/sr_port/f_zatransform.c
@@ -0,0 +1,78 @@
+/****************************************************************
+ *								*
+ * Copyright (c) 2006-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
+ *								*
+ *	This source code contains the intellectual property	*
+ *	of its copyright holder(s), and is made available	*
+ *	under a license.  If you do not know the terms of	*
+ *	the license, please stop and do not read further.	*
+ *								*
+ ****************************************************************/
+
+#include "mdef.h"
+#include "compiler.h"
+#include "opcode.h"
+#include "toktyp.h"
+#include "stringpool.h"
+#include "advancewindow.h"
+
+/* $ZATRANSFORM(strexp, int1, int2)
+ * Convert an MVAL to it's GDS internal collated form for comparison using either the follows or sorts-after operators
+ *
+ * Has the following input parameters:
+ *
+ * 	expr	- REQUIRED - an expression containing valid MVAL or an MVAL in database internal key format (GDS).
+ * 	int1	- REQUIRED - collation algorithm index.
+ * 	int2    - OPTIONAL - if not specified or 0 translation is from MVAL to GDS. Else, translation is from GDS to
+ * 				MVAL.
+ * 	int3    - OPTIONAL - if not specified or 0 treat the a canonical numeric strexpr as if it were a numeric
+ *				subscript; else treat it only as a string
+ *
+ * Return value - the converted string
+ *
+ * Note this function is meant as a proxy to mval2subs to convert a string to/from an internal subscript representation
+ * Note that if the collation isn't available, we raise a COLLATIONUNDEF error.
+ */
+int f_zatransform(oprtype *a, opctype op)
+{
+	triple 	*gvn, *coll, *optional;
+	DCL_THREADGBL_ACCESS;
+
+	SETUP_THREADGBL_ACCESS;
+	gvn = maketriple(op);
+	if (EXPR_FAIL == expr(&(gvn->operand[0]), MUMPS_STR))
+	    return FALSE;
+	if (TK_COMMA != TREF(window_token))
+	    return FALSE;
+	advancewindow();
+	/* 2nd parameter (required) */
+	coll = newtriple(OC_PARAMETER);
+	gvn->operand[1] = put_tref(coll);
+	if (EXPR_FAIL == expr(&(coll->operand[0]), MUMPS_INT))
+	    return FALSE;
+	/* 3rd parameter (optional), defaults to 0 */
+	optional = newtriple(OC_PARAMETER);
+	coll->operand[1] = put_tref(optional);
+	if (TK_COMMA != TREF(window_token))
+		optional->operand[0] = put_ilit(0);
+	else
+	{
+		advancewindow();
+		if (EXPR_FAIL == expr(&(optional->operand[0]), MUMPS_INT))
+			return FALSE;
+	}
+	/* 4th parameter (optional), defaults to 0 */
+	if (TK_COMMA != TREF(window_token))
+		optional->operand[1] = put_ilit(0);
+	else
+	{
+		advancewindow();
+		if (EXPR_FAIL == expr(&(optional->operand[1]), MUMPS_INT))
+			return FALSE;
+	}
+	ins_triple(gvn);
+	*a = put_tref(gvn);
+	return TRUE;
+}
+
diff --git a/sr_port/f_zcollate.c b/sr_port/f_zcollate.c
new file mode 100644
index 0000000..f9c7a14
--- /dev/null
+++ b/sr_port/f_zcollate.c
@@ -0,0 +1,62 @@
+/****************************************************************
+ *								*
+ * Copyright (c) 2006-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
+ *								*
+ *	This source code contains the intellectual property	*
+ *	of its copyright holder(s), and is made available	*
+ *	under a license.  If you do not know the terms of	*
+ *	the license, please stop and do not read further.	*
+ *								*
+ ****************************************************************/
+
+#include "mdef.h"
+#include "compiler.h"
+#include "opcode.h"
+#include "toktyp.h"
+#include "stringpool.h"
+#include "advancewindow.h"
+
+/* $ZCOLLATE(strexp, int1, int2)
+ *
+ * Parameters:
+ *
+ * 	strexpr - string experssion containing global variable name (GVN) or a GVN in database internal key format (GDS).
+ * 	int1	- collatio algorithm index.
+ * 	int2    - if not specified or 0 translation is from GVN to GDS. Else, translation is from GDS to GVN.
+ *
+ * Return value - the converted name.
+ *
+ * Note that GDS is the internal database key format and GVN is a formatted global variable name with subscripts.
+ * Note that if the collation isn't available, we raise a COLLATIONUNDEF error.
+ */
+int f_zcollate(oprtype *a, opctype op)
+{
+	triple 	*gvn, *coll;
+	DCL_THREADGBL_ACCESS;
+
+	SETUP_THREADGBL_ACCESS;
+	gvn = maketriple(op);
+	if (EXPR_FAIL == expr(&(gvn->operand[0]), MUMPS_STR))
+	    return FALSE;
+	if (TK_COMMA != TREF(window_token))
+	    return FALSE;
+	advancewindow();
+	/* 2nd parameter (required) */
+	coll = newtriple(OC_PARAMETER);
+	gvn->operand[1] = put_tref(coll);
+	if (EXPR_FAIL == expr(&(coll->operand[0]), MUMPS_INT))
+	    return FALSE;
+	/* 3rd parameter (optional), defaults to 0 */
+	if (TK_COMMA != TREF(window_token))
+		coll->operand[1] = put_ilit(0);
+	else
+	{
+		advancewindow();
+		if (EXPR_FAIL == expr(&(coll->operand[1]), MUMPS_INT))
+			return FALSE;
+	}
+	ins_triple(gvn);
+	*a = put_tref(gvn);
+	return TRUE;
+}
diff --git a/sr_port/file_head_write.h b/sr_port/file_head_write.h
index 5e52cef..37d65f9 100755
--- a/sr_port/file_head_write.h
+++ b/sr_port/file_head_write.h
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2003, 2012 Fidelity Information Services, Inc	*
+ * Copyright (c) 2003-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -13,6 +14,5 @@
 #define FILE_HEAD_WRITE_INCLUDED
 
 boolean_t file_head_write(char *, sgmnt_data_ptr_t, int4);
-boolean_t file_head_write_secshr(char *, sgmnt_data_ptr_t, int4);
 
 #endif /* FILE_HEAD_WRITE_INCLUDED */
diff --git a/sr_port/format_targ_key.c b/sr_port/format_targ_key.c
index 3be5050..a3a877c 100755
--- a/sr_port/format_targ_key.c
+++ b/sr_port/format_targ_key.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2014 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -26,29 +27,23 @@ unsigned char *format_targ_key(unsigned char *out_char_ptr, int4 max_size, gv_ke
 	unsigned char			ch, *gvkey_char_ptr, *out_top, *work_char_ptr, work_buff[MAX_ZWR_KEY_SZ], *work_top;
 	boolean_t			is_string;
 	mstr				opstr;
-	DEBUG_ONLY(unsigned char	*gvkey_top_ptr;)
+	unsigned char			*gvkey_top_ptr;
 
 	assert(12 < max_size);
 	out_top = out_char_ptr + max_size - 2;	/* - 2, as could add comma left-paren or TWO double quotes between checks */
 	gvkey_char_ptr = key->base;
-	DEBUG_ONLY(gvkey_top_ptr = gvkey_char_ptr + key->end;)
+	gvkey_top_ptr = gvkey_char_ptr + key->end;
 	/* Ensure input key is well-formed (i.e. double null terminated) */
 	assert(KEY_DELIMITER == *(gvkey_top_ptr - 1));
 	assert(KEY_DELIMITER == *gvkey_top_ptr);
-	/* The following assert (in the for loop) assumes that a global name will be able to fit in completely into any key.
-	 * But that is not true. For exmaple I can have a maxkeysize of 10 and try to set a global variable name of length 20.
-	 * That will have issues below. Until C9J10-003204 is fixed to handle long global names and small maxkeysizes, we
-	 * let the below code stay as it is (asserts only) to avoid overheads (of if checks for whether end is reached) in pro.
-	 * When that is fixed, it is possible, we see the key terminate before even the global name is finished. In that case,
-	 * we should return without '(' or ')' in the formatted buffer. The caller will know this is a case of too long global name.
-	 */
-	for (*out_char_ptr++ = '^'; (*out_char_ptr = *gvkey_char_ptr++); out_char_ptr++)
-		assert(gvkey_char_ptr <= gvkey_top_ptr);
+	for (*out_char_ptr++ = '^'; (*out_char_ptr = *gvkey_char_ptr++) && (gvkey_char_ptr <= gvkey_top_ptr); out_char_ptr++)
+		;
+	/* The following asserts (in the for loop) assume that a global name will be able to fit in completely into any key. */
 	assert(gvkey_char_ptr <= gvkey_top_ptr);
 	if (0 == *gvkey_char_ptr)		/* no subscipts */
 		return (out_char_ptr);
 	*out_char_ptr++ = '(';
-	for ( ; ; )
+	for ( ; gvkey_char_ptr <= gvkey_top_ptr; )
 	{
 		assert(gvkey_char_ptr <= gvkey_top_ptr);
 		if (0x01 == *gvkey_char_ptr)	/* this must be a null string which was adjusted by op_gvorder */
@@ -110,15 +105,24 @@ unsigned char *format_targ_key(unsigned char *out_char_ptr, int4 max_size, gv_ke
 			assert(FALSE);
 			return (NULL);
 		}
-		for ( ; *gvkey_char_ptr++; )
-			assert(gvkey_char_ptr <= gvkey_top_ptr);
-		assert(gvkey_char_ptr <= gvkey_top_ptr);
+		/* Advance until next null separator */
+		for ( ; *gvkey_char_ptr++ && (gvkey_char_ptr <= gvkey_top_ptr); )
+			;
+		if (gvkey_char_ptr > gvkey_top_ptr)
+		{
+			assert(FALSE);
+			return (NULL);
+		}
 		if (*gvkey_char_ptr)
 			*out_char_ptr++ = ',';
 		else
 			break;
 	}
+	if((out_char_ptr >= out_top) || (gvkey_char_ptr > gvkey_top_ptr))
+	{
+		assert(FALSE);
+		return (NULL);
+	}
 	*out_char_ptr++ = ')';
-	assert(gvkey_char_ptr <= gvkey_top_ptr);
 	return (out_char_ptr);
 }
diff --git a/sr_port/gbldefs.c b/sr_port/gbldefs.c
index 0492600..766bf52 100644
--- a/sr_port/gbldefs.c
+++ b/sr_port/gbldefs.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -128,8 +128,12 @@
 #include "gv_trigger.h"
 #include "gtm_trigger.h"
 #endif
+#ifdef DEBUG
+#include "wcs_wt.h"
+#endif
 #define DEFAULT_ZERROR_STR	"Unprocessed $ZERROR, see $ZSTATUS"
 #define DEFAULT_ZERROR_LEN	(SIZEOF(DEFAULT_ZERROR_STR) - 1)
+#include "gtm_libaio.h"
 
 GBLDEF	gd_region		*db_init_region;
 GBLDEF	sgmnt_data_ptr_t	cs_data;
@@ -187,7 +191,6 @@ GBLDEF	VSIG_ATOMIC_T	forced_exit;		/* Asynchronous signal/interrupt handler sets
 						 */
 GBLDEF	intrpt_state_t	intrpt_ok_state = INTRPT_OK_TO_INTERRUPT;	/* any other value implies it is not ok to interrupt */
 GBLDEF	unsigned char	*msp,
-			*mubbuf,
 			*restart_ctxt,
 			*stackbase,
 			*stacktop,
@@ -281,7 +284,6 @@ GBLDEF	boolean_t	block_saved;
 GBLDEF	gtm_chset_t	dse_over_chset = CHSET_M;
 LITDEF	MIDENT_DEF(zero_ident, 0, NULL);		/* the null mident */
 GBLDEF	int4		aligned_source_buffer[MAX_SRCLINE / SIZEOF(int4) + 1];
-GBLDEF	unsigned char	*source_buffer = (unsigned char *)aligned_source_buffer;
 GBLDEF	src_line_struct	src_head;
 GBLDEF	short int	source_line;
 GBLDEF	int		source_column;
@@ -301,8 +303,7 @@ GBLDEF	char		**cmd_arg;
 #ifdef __osf__
 #pragma pointer_size (restore)
 #endif
-GBLDEF	volatile uint4	heartbeat_counter;
-GBLDEF	boolean_t	heartbeat_started;
+GBLDEF	boolean_t	oldjnlclose_started;
 /* DEFERRED EVENTS */
 GBLDEF	bool		licensed = TRUE;
 
@@ -319,7 +320,11 @@ GBLDEF	void			(*tp_timeout_action_ptr)(void) = tp_timeout_action_dummy;
 GBLDEF	void			(*ctrlc_handler_ptr)() = ctrlc_handler_dummy;
 GBLDEF	int			(*op_open_ptr)(mval *v, mval *p, int t, mval *mspace) = op_open_dummy;
 GBLDEF	void			(*unw_prof_frame_ptr)(void) = unw_prof_frame_dummy;
-GBLDEF	void			(*heartbeat_timer_ptr)(void);	/* Initialized only in gtm_startup() */
+/* Initialized only in gtm_startup() */
+GBLDEF	void			(*jnl_file_close_timer_ptr)(void);
+GBLDEF	void			(*fake_enospc_ptr)(void);
+GBLDEF	void			(*simple_timeout_timer_ptr)(TID tid, int4 hd_len, boolean_t **timedout);
+
 #ifdef UNICODE_SUPPORTED
 GBLDEF	u_casemap_t 		gtm_strToTitle_ptr;		/* Function pointer for gtm_strToTitle */
 #endif
@@ -395,7 +400,6 @@ GBLDEF	char			*cli_err_str_ptr;
 GBLDEF	boolean_t		gtm_pipe_child;
 GBLDEF	io_desc			*gtm_err_dev;
 /* this array is indexed by file descriptor */
-GBLDEF	boolean_t		*lseekIoInProgress_flags;
 /* Latch variable for Unix implementations. Used in SUN and HP */
 GBLDEF	global_latch_t		defer_latch;
 GBLDEF	int			num_additional_processors;
@@ -857,6 +861,10 @@ GBLDEF	void		(*cache_table_relobjs)(void);   /* Function pointer to call cache_t
 GBLDEF	ch_ret_type	(*ht_rhash_ch)();		/* Function pointer to hashtab_rehash_ch */
 GBLDEF	ch_ret_type	(*jbxm_dump_ch)();		/* Function pointer to jobexam_dump_ch */
 GBLDEF	ch_ret_type	(*stpgc_ch)();			/* Function pointer to stp_gcol_ch */
+#ifdef DEBUG
+GBLDEF	ch_ret_type	(*t_ch_fnptr)();		/* Function pointer to t_ch */
+GBLDEF	ch_ret_type	(*dbinit_ch_fnptr)();		/* Function pointer to dbinit_ch */
+#endif
 GBLDEF	cache_rec_ptr_t	pin_fail_cr;			/* Pointer to the cache-record that we failed while pinning */
 GBLDEF	cache_rec	pin_fail_cr_contents;		/* Contents of the cache-record that we failed while pinning */
 GBLDEF	cache_rec_ptr_t	pin_fail_twin_cr;		/* Pointer to twin of the cache-record that we failed to pin */
@@ -900,6 +908,11 @@ GBLDEF	sigset_t	blockalrm;
 GBLDEF	sigset_t	block_ttinout;
 GBLDEF	sigset_t	block_sigsent;	/* block all signals that can be sent externally
 					  (SIGINT, SIGQUIT, SIGTERM, SIGTSTP, SIGCONT) */
+GBLDEF  sigset_t	block_worker;	/* block all signals for use by the linux AIO worker thread, except for a few
+					 * fatal signals that can be internally generated inside the thread. This way
+					 * any signal externally sent always gets handled by the main process and not
+					 * by the worker thread.
+					 */
 GBLDEF  char            *gtm_core_file;
 GBLDEF  char            *gtm_core_putenv;
 #ifdef __MVS__
@@ -931,7 +944,7 @@ GBLDEF	boolean_t	stringpool_unexpandable;	/* Set to TRUE by any function for a s
 							 * collections or expansions.
 							 */
 GBLDEF	boolean_t	donot_INVOKE_MUMTSTART;		/* Set to TRUE whenever an implicit TSTART is done in gvcst_put/kill as
-							 * part of an explicit + trigger update. In this situation, we dont expect
+							 * part of an explicit + trigger update. In this situation, we don't expect
 							 * MUM_TSTART macro to be invoked at all (see skip_INVOKE_RESTART below
 							 * for description on why this is needed). So we keep this debug-only
 							 * flag turned on throughout the gvcst_put/kill. An assert in
@@ -967,9 +980,9 @@ GBLDEF	mval		*dollar_ztdata,
 GBLDEF	int		tprestart_state;		/* When triggers restart, multiple states possible. See tp_restart.h */
 GBLDEF	boolean_t	skip_INVOKE_RESTART;		/* set to TRUE if caller of op_tcommit/t_retry does not want it to
 							 * use the INVOKE_RESTART macro (which uses an rts_error to trigger
-							 * the restart) instead return code. The reason we dont want to do
+							 * the restart) instead return code. The reason we don't want to do
 							 * rts_error is that this is an implicit tstart situation where we
-							 * did not do opp_tstart.s so we dont want control to be transferred
+							 * did not do opp_tstart.s so we don't want control to be transferred
 							 * using the MUM_TSTART macro by mdb_condition_handler (which assumes
 							 * opp_tstart.s invocation).
 							 */
@@ -1015,7 +1028,7 @@ GBLDEF	boolean_t	in_mu_rndwn_file;		/* TRUE if we are in mu_rndwn_file (holding
 #endif
 GBLDEF	char		gvcst_search_clue;
 /* The following are replication related global variables. Ideally if we had a repl_gbls_t structure (like jnl_gbls_t)
- * this would be a member in that. But since we dont have one and since we need to initialize this specificially to a
+ * this would be a member in that. But since we don't have one and since we need to initialize this specificially to a
  * non-zero value (whereas usually everything else accepts a 0 default value), this is better kept as a separate global
  * variable instead of inside a global variable structure.
  */
@@ -1040,12 +1053,12 @@ GBLDEF  repl_conn_info_t        *this_side, *remote_side;
 GBLDEF	seq_num			gtmsource_save_read_jnl_seqno;
 GBLDEF	gtmsource_state_t	gtmsource_state = GTMSOURCE_DUMMY_STATE;
 GBLDEF	boolean_t	gv_play_duplicate_kills;	/* A TRUE value implies KILLs of non-existent nodes will continue to
-							 * write jnl records and increment the db curr_tn even though they dont
+							 * write jnl records and increment the db curr_tn even though they don't
 							 * touch any GDS blocks in the db (i.e. treat it as a duplicate kill).
 							 * Set to TRUE for the update process & journal recovery currently.
 							 * Set to FALSE otherwise.
 							 */
-GBLDEF	boolean_t	donot_fflush_NULL;		/* Set to TRUE whenever we dont want gtm_putmsg to fflush(NULL). BYPASSOK
+GBLDEF	boolean_t	donot_fflush_NULL;		/* Set to TRUE whenever we don't want gtm_putmsg to fflush(NULL). BYPASSOK
 							 * As of Jan 2012, mu_rndwn_all is the only user of this functionality.
 							 */
 GBLDEF	boolean_t	jnlpool_init_needed;		/* TRUE if jnlpool_init should be done at database init time (eg., for
@@ -1066,7 +1079,10 @@ GBLDEF	boolean_t	in_jnl_file_autoswitch;		/* Set to TRUE for a short window insi
 							 * to autoswitch; used by jnl_write. */
 #ifdef GTM_PTHREAD
 GBLDEF	pthread_t	gtm_main_thread_id;		/* ID of the main GT.M thread. */
-GBLDEF	boolean_t	gtm_main_thread_id_set;		/* Indicates whether the thread ID is set. */
+GBLDEF	boolean_t	gtm_main_thread_id_set;		/* Indicates whether the thread ID is set. This is not set just for a jvm
+							 * process but also otherwise. This is necessary now for the linux kernel
+							 * interface to AIO.
+							 */
 GBLDEF	boolean_t	gtm_jvm_process;		/* Indicates whether we are running with JVM or stand-alone. */
 #endif
 GBLDEF	size_t		gtm_max_storalloc;		/* Maximum that GTM allows to be allocated - used for testing */
@@ -1076,6 +1092,10 @@ GBLDEF	boolean_t	ipv4_only;			/* If TRUE, only use AF_INET. Reflects the value o
 GBLDEF void (*stx_error_fptr)(int in_error, ...);	/* Function pointer for stx_error() so gtm_utf8.c can avoid pulling
 							 * stx_error() into gtmsecshr, and thus just about everything else as well.
 							 */
+GBLDEF void (*stx_error_va_fptr)(int in_error, va_list args);	/* Function pointer for stx_error() so rts_error can avoid pulling
+								 * stx_error() into gtmsecshr, and thus just about everything else
+								 * as well.
+								 */
 GBLDEF void (*show_source_line_fptr)(boolean_t warn);	/* Func pointer for show_source_line() - same purpose as stx_error_fptr */
 #ifdef GTM_TLS
 GBLDEF	gtm_tls_ctx_t	*tls_ctx;			/* Process private pointer to SSL/TLS context. Any SSL/TLS connections that
@@ -1138,4 +1158,33 @@ GBLDEF	int		gtm_db_counter_sem_incr;	/* Value used to bump the counter semaphore
 							 * Default is 1. Higher values exercise the ERANGE code better
 							 * when the ftok/access/jnlpool counter semaphore overflows.
 							 */
+GBLDEF	boolean_t	forw_recov_lgtrig_only;		/* TRUE if jgbl.forw_phase_recovery is TRUE AND the current TP transaction
+							 * being played consists of only *LGTRIG* records (no SET/KILL etc.)
+							 * Used by an assert in op_tcommit.
+							 */
+GBLDEF	boolean_t	in_mu_cre_file;			/* TRUE only if inside "mu_cre_file" function (used by an assert).
+							 * This is MUPIP CREATE only (db does not exist at that point and so
+							 * threads are unlikely there) AND is dbg-only and hence okay to be a
+							 * gbldef instead of a threadgbldef.
+							 */
+GBLDEF	enum dbg_wtfini_lcnt_t	dbg_wtfini_lcnt;	/* "lcnt" value for WCS_OPS_TRACE tracking purposes. This is dbg-only
+							 * and hence it is okay to be a gbldef instead of a threadgbldef.
+							 */
+#endif
+GBLDEF	sgm_info	*sgm_info_ptr;
+GBLDEF	tp_region	*tp_reg_free_list;	/* Ptr to list of tp_regions that are unused */
+GBLDEF  tp_region	*tp_reg_list;		/* Ptr to list of tp_regions for this transaction */
+
+#ifdef USE_LIBAIO
+GBLDEF  char 		*aio_shim_errstr;	/* If an error occurred (mostly but not limited to EAGAIN),
+						 * what triggered it?
+						 */
+GBLDEF	char		io_setup_errstr[IO_SETUP_ERRSTR_ARRAYSIZE];
+							/* The original nr_events used by the client is necessary
+							 * to understand why io_setup() failed on occasion. We set
+							 * up an error string of the form io_setup(nr_events).
+							 */
 #endif
+GBLDEF	void		(*mupip_exit_fp)(int4 errnum);	/* Function pointer to mupip_exit() in MUPIP but points to a routine
+							 * that assert fails if run from non-MUPIP builds.
+							 */
diff --git a/sr_port/gde.hlp b/sr_port/gde.hlp
index db4a78a..b0d0e95 100755
--- a/sr_port/gde.hlp
+++ b/sr_port/gde.hlp
@@ -132,59 +132,55 @@
 
    A Global Directory looks like this:
 
-                         *** TEMPLATES ***
+                                   *** TEMPLATES ***
                                                                              Std      Inst
-                                                Def     Rec   Key Null       Null     Freeze   Qdb      Epoch
-    Region                                     Coll    Size  Size Subs       Coll Jnl on Error Rndwn    Taper
-    -----------------------------------------------------------------------------------------------------------
-    <default>                                     0    4080   255 NEVER      Y    Y   DISABLED DISABLED ENABLED
-                     Jnl File (def ext: .mjl)  Before  Buff      Alloc      Exten   AutoSwitch
-    ------------------------------------------------------------------------------------------
-    <default>        <based on DB file-spec>   Y       2308       2048       2048      8386560
+                                                Def      Rec   Key Null      Null     Freeze Qdb   Epoch              LOCK
+    Region                                     Coll     Size  Size Subs      Coll Jnl on Err Rndwn Taper AutoDB Stats Crit
+    ----------------------------------------------------------------------------------------------------------------------
+   <default>                                     0      256    64 NEVER     N    N   N      N     Y     N      Y     Sep
     Segment          Active              Acc Typ Block      Alloc Exten Options
     ------------------------------------------------------------------------------
-    <default>          *                 BG  DYN  4096       5000 10000 GLOB =1000
-                                                                        LOCK = 40
+   <default>         *                 BG  DYN  4096        100   100 GLOB =1024
+                                                                        LOCK =  40
                                                                         RES  =   0
                                                                         ENCR = OFF
                                                                         MSLT =1024
-    <default>                            MM  DYN  4096       5000 10000 DEFER
-                                                                        LOCK = 40
+                                                                        DALL = YES
+                                                                        AIO  = OFF
+    <default>                            MM  DYN  4096        100   100 DEFER
+                                                                        LOCK =  40
                                                                         MSLT =1024
+                                                                        DALL = YES
             *** NAMES ***
     Global                             Region
     ------------------------------------------------------------------------------
     *                                  DEFAULT
                                    *** REGIONS ***
-                                                                                                   Std      Inst
-                                    Dynamic                          Def      Rec   Key Null       Null     Freeze   Qdb      Epoch
-    Region                          Segment                         Coll     Size  Size Subs       Coll Jnl on Error Rndwn    Taper
-    ---------------------------------------------------------------------------------------------------------------------------------
-    DEFAULT                         DEFAULT                            0     4080   255 NEVER      Y    Y   DISABLED DISABLED ENABLED
-                             *** JOURNALING INFORMATION ***
-    Region                          Jnl File (def ext: .mjl)  Before Buff      Alloc      Exten   AutoSwitch
-    --------------------------------------------------------------------------------------------------------
-    DEFAULT                         $gtmdir/$gtmver/g/gtm.mjl
-                                                              Y      2308       2048       2048      8386560
+                                                                                                  Std      Inst
+                                    Dynamic                          Def      Rec   Key Null      Null     Freeze Qdb   Epoch              LOCK
+    Region                          Segment                         Coll     Size  Size Subs      Coll Jnl on Err Rndwn Taper AutoDB Stats Crit
+    -------------------------------------------------------------------------------------------------------------------------------------------
+    DEFAULT                         DEFAULT                            0      256    64 NEVER     N    N   N      N     Y     N      Y     Sep
                                    *** SEGMENTS ***
     Segment                         File (def ext: .dat)Acc Typ Block      Alloc Exten Options
     -------------------------------------------------------------------------------------------
-    DEFAULT                         $gtmdir/$gtmver/g/gtm.dat
-                                                        BG  DYN  4096       5000 10000 GLOB=1000
+    DEFAULT                         mumps.dat           BG  DYN  4096        100   100 GLOB=1024
                                                                                        LOCK=  40
                                                                                        RES =   0
-                                                                                       ENCR=OFF
+                                                                                       ENCR= OFF
                                                                                        MSLT=1024
+                                                                                       DALL= YES
+                                                                                       AIO = OFF
                                      *** MAP ***
       -  -  -  -  -  -  -  -  -  - Names -  -  - -  -  -  -  -  -  -
     From                            Up to                            Region / Segment / File(def ext: .dat)
     --------------------------------------------------------------------------------------------------------------------------
     %                               ...                              REG = DEFAULT
                                                                      SEG = DEFAULT
-                                                                     FILE = $gtmdir/$gtmver/g/gtm.dat
+                                                                     FILE = mumps.dat
     LOCAL LOCKS                                                      REG = DEFAULT
                                                                      SEG = DEFAULT
-                                                                     FILE = $gtmdir/$gtmver/g/gtm.dat
+                                                                     FILE = mumps.dat
 
    There are five primary sections in a Global Directory:
 
@@ -259,27 +255,34 @@
    qualifiers, see "GDE Command Summary".
 
    Abbreviation           Full Form
-   Acc                    ACCESS_METHOD
-   Alloc                  ALLOCATION
-   AutoSwitch             AUTOSWITCHLIMIT
-   Block                  BLOCK_SIZE
-   Buff                   BUFFER_SIZE
-   Def Coll               COLLATION_DEFAULT
-   Exten                  EXTENSION_COUNT
-   File                   FILE_NAME
-   GLOB                   GLOBAL_BUFFER_COUNT
-   Inst Freeze On Error   INST_FREEZE_ON_ERROR
-   JNL                    JOURNAL
-   KeySize                KEY_SIZE
-   LOCK                   LOCK_SPACE
-   MSLT                   MUTEX_SLOTS
-   Null Subs              NULL_SUBSCRIPTS
-   Qdb Rndwn              QDBRUNDOWN
-   Std Null Coll          STDNULLCOLL
-   Rec Size               RECORD_SIZE
-   RES                    RESERVED_BYTES
-   Region                 REGION
-   Typ                    DYNAMIC_SEGMENT
+   --------------------------------------------------
+   Acc                    -ACCESS_METHOD
+   AIO                    -[NO]ASYNCIO
+   Alloc                  -ALLOCATION
+   AutoDB                 -[NO]AUTODB
+   AutoSwitch             -AUTOSWITCHLIMIT
+   Block                  -BLOCK_SIZE
+   Buff                   -BUFFER_SIZE
+   Dall                   -[NO]DEFER_ALLOCATE
+   Def Coll               -COLLATION_DEFAULT
+   Epoch Taper            -[NO]EPOCHTAPER
+   Exten                  -EXTENSION_COUNT
+   File                   -FILE_NAME
+   GLOB                   -GLOBAL_BUFFER_COUNT
+   Inst Freeze On Error   -[NO]INST_FREEZE_ON_ERROR
+   JNL                    -[NO]JOURNAL
+   Key Size               -KEY_SIZE
+   LOCK                   -LOCK_SPACE
+   LOCK Crit              -[NO]LOCK_CRIT
+   MSLT                   -MUTEX_SLOTS
+   Null Subs              -[HO]NULL_SUBSCRIPTS
+   Qdb Rndwn              -[NO]QDBRUNDOWN
+   Std Null Coll          -[NO]STDNULLCOLL
+   Rec Size               -RECORD_SIZE
+   RES                    -RESERVED_BYTES
+   Region                 -REGION
+   Stats                  -[NO[STATS
+   Typ                    -DYNAMIC_SEGMENT
 
 2 Customizing_a_Global_Directory
    Customizing a Global Directory
@@ -1176,6 +1179,18 @@
    The following -REGION qualifiers can be used with the ADD, CHANGE, or
    TEMPLATE commands.
 
+   -[NO]AU[TODB]
+
+   Specifies whether GT.M should implicitly create a database file for the
+   region if none exists when a process attempts to access it. Because it
+   carries lower operational risk and provides better operational control,
+   the common practice is to create database files with MUPIP CREATE.
+   However, AUTODB may simplify operations when you have scratch or temporary
+   databases which are best deleted and recreated as a part of standard
+   operation procedures.
+
+   The default is NOAUTODB.
+
    -C[OLLATION_DEFAULT]=number
 
    Specifies the number of the collation sequence definition to be used as
@@ -1316,7 +1331,19 @@
 
    For example, the key ^ACN ("Name", "Type") internally occupies 17 bytes.
 
-   By default, GDE uses a KEY_SIZE of 64 bytes.
+   By default, GDE uses a KEY_SIZE of 64 bytes
+
+   -[NO]L[OCK_CRIT]
+
+   Specifies whether GT.M should share the resource management between a
+   database and its corresponding LOCKs or use separate and different
+   resource management for the two. Because, in the current implementation,
+   FIS has not identified any reason to share resource management between
+   LOCKs and database actions, we have no recommendations other than to
+   choose what seems to work better for your application.
+
+   By default, GDE uses NOLOCK_CRIT-Sep(arate) resource management for LOCKs
+   and database actions.
 
    -[NO]N[ULL_SUBSCRIPTS]=[ALWAYS|NEVER|EXISTING]
 
@@ -1387,7 +1414,17 @@
 
    By default, GDE uses a RECORD_SIZE of 256 bytes.
 
-   -[NO]STDNULLCOLL
+   -[NO][STA[TS]
+
+   Specifies whether GT.M should permit processes to share their database
+   access statistics for other processes to monitor. There may be operational
+   or security reasons to prohibit sharing of statistics. For example, GT.M
+   does not share statistics on database files that exist solely to support
+   GT.M features.
+
+   By default, GDE uses STATS.
+
+   -[NO]STD[NULLCOLL]
 
    Determines whether GT.M null subscripts collate in conformance to the M
    standard.
@@ -1410,6 +1447,8 @@
  |-----------------------------------------------------------------------------|
  |                 QUALIFIER                  | DEFAULT  | MINIMUM |  MAXIMUM  |
  |--------------------------------------------+----------+---------+-----------|
+ |-[NO]AU[TODB]                               |Disabled  |-        |-          |
+ |--------------------------------------------+----------+---------+-----------|
  |-C[OLLATION_DEFAULT]=number (integer)       |0         |0        |255        |
  |--------------------------------------------+----------+---------+-----------|
  |-D[YNAMIC_SEGMENT] =segment-name (char)     |-         |1        |16         |
@@ -1422,14 +1461,20 @@
  |--------------------------------------------+----------+---------+-----------|
  |-K[EY_SIZE]=size in bytes (integer)         |64        |3        |1,019      |
  |--------------------------------------------+----------+---------+-----------|
+ |                                            |Disabled  |         |           |
+ |-[NO]L[OCK_CRIT]                            |(not      |-        |-          |
+ |                                            |shared)   |         |           |
+ |--------------------------------------------+----------+---------+-----------|
  |-N[ULL_SUBSCRIPTS]=[ALWAYS|NEVER|EXISTING]  |NEVER     |-        |-          |
  |--------------------------------------------+----------+---------+-----------|
+ |-[NO]Q[DBRNWDWN]                            |Disabled  |-        |-          |
+ |--------------------------------------------+----------+---------+-----------|
  |-R[ECORD_SIZE]=size in bytes (integer)      |256       |7        |1,048,576  |
  |                                            |          |         |(1 MiB)    |
  |--------------------------------------------+----------+---------+-----------|
- |-[NO]Q[DBRUNDOWN]                           |DISABLED  |-        |-          |
+ |-[NO]STA[TS]                                |ENABLED   |-        |-          |
  |--------------------------------------------+----------+---------+-----------|
- |-[NO]STDNULLCOLL                            |N         |-        |-          |
+ |-[NO]STD[NULLCOLL]                          |No        |-        |-          |
  +-----------------------------------------------------------------------------+
 
 2 Segment_Qualifiers
@@ -1460,10 +1505,10 @@
        is a greater reliance on the OS/file system for database performance.
 
           * MM supports NOBEFORE_IMAGE journaling only. GT.M issues an error
-            if you use MM with BEFORE_IMAGE Journaling. MM also supports
-            MUPIP JOURNAL -RECOVER -FORWARD. MM does not support MUPIP
-            JOURNAL -RECOVER -BACKWARD and only supports MUPIP JOURNAL
-            -ROLLBACK to generate lost and broken transaction files.
+            if you use MM with BEFORE_IMAGE Journaling. MM supports MUPIP
+            JOURNAL -RECOVER -FORWARD and MUPIP JOURNAL -ROLLBACK -FORWARD.
+            With MM, MUPIP JOURNAL -RECOVER -BACKWARD only generates lost and
+            broken transaction files but cannot recover the database.
           * Depending on your file system, MM may be an option when you need
             performance advantage in situations where the above restrictions
             are acceptable.
@@ -1498,6 +1543,92 @@
        file for a length of time consistent with your UNIX file
        reorganization schedule.
 
+   --[NO]AS[YNCIO]
+
+   Determines whether an access method BG database file uses asynchronous I/O
+   rather than using synchronous I/O through the file system cache.
+
+   The performance characteristics of asynchronous IO are likely to be quite
+   different from the traditional sequential IO. Although asynchronous IO in
+   theory should be more efficient than synchronous IO by eliminating the
+   need for the UNIX file buffer cache and eliminating certain filesystem
+   locks, in practice asynchronous IO is likely to emerge from the starting
+   gate under-performing synchronous IO because of the years that synchronous
+   IO has been the common IO model operating systems and filesystems have had
+   used by applications. So, you should anticipate extensive benchmarking and
+   tuning for your application to achieve the best performance it can with
+   asynchronous IO. Some notes and observations that we have to share:
+
+     o As asynchronous IO dispenses with the UNIX file buffer cache, GT.M
+       global buffers are the sole caching mechanism. To make asynchronous IO
+       perform well, you will likely need to increase the number of global
+       buffers considerably. With GT.M's limit of 2GiB per shared memory
+       segment, a database segment with 4KiB blocks has a limit of almost two
+       million global buffers.
+     o A large number of global buffers potentially implies a large number of
+       dirty global buffers to be flushed at an epoch. You should investigate
+       the impact on application response time of GT.M epoch tapering vs.
+       turning off epoch tapering and using a separate stand-alone process
+       that executes a line of code such as: for set x="" for set
+       x=$view("gvnext",x) quit:""=x view "dbflush":x,"dbsync":x,"epoch":x
+       hang n where n is a number that causes each region to be flushed at an
+       appropriate interval. If you choose this option, remember to turn off
+       epoch tapering, and to set the epoch interval in the file header to be
+       large enough to prevent application processes from performing epochs,
+       and consider scripted timely switching of journal files by other than
+       application processes (switching journal files involves an epoch).
+     o On AIX, consider mounting file systems with the CIO mount option. The
+       CIO mount option drops support for the file buffer cache (unused by
+       asynchronous IO), and also eliminates a lock that is a potential
+       bottleneck to GT.M performance on the AIX jfs2 filesystem.
+     o For Linux x86_64, the gtm_aio_nr_events environment variable controls
+       the number of structures a process has per global directory to manage
+       asynchronous writes, and therefore determines the number of concurrent
+       writes a process can manage across all regions within a global
+       directory. If not specified, the value controlled by gtm_aio_nr_events
+       defaults to 128. If a process encounters a situation where it needs to
+       perform an asynchronous write, but has no available slots with which
+       to manage an additional one, it either falls back to synchronous
+       writing if the write is blocking other actions, and otherwise defers
+       the write until a slot becomes available as other writes complete.
+       Linux allocates the structures on a system-wide basis with the setting
+       of /proc/sys/fs/aio-max-nr. Therefore you should configure this
+       parameter to account for the needs (as determined by gtm_aio_nr_events
+       or the default) of all processes using asynchronous I/O. When
+       processes use multiple global directories with asynchronous I/O, their
+       need for the system resources increases accordingly. For example, if
+       an environment runs 10,000 processes each of which open two global
+       directories and /proc/sys/fs/aio-max-nr is set to a value of 200,000
+       then gtm_aio_nr_events needs to be set to a value <= 200,000 / (10,000
+       * 2) = 10. Conversely if gtm_aio_nr_events is set to a value of 20,
+       then aio-max-nr needs to be bumped up to (10,000 * 2 * 20) = 400,000.
+       GT.M captures the number of errors encountered when attempting to
+       write database blocks for a region, and, barring problems with the
+       storage subsystem, hitting an asynchronous write limit would
+       constitute primary (probably only) contribution to that value, which
+       you can access with the following:
+
+       $$^%PEEKBYNAME("sgmnt_data.wcs_wterror_invoked_cntr",<region>)
+
+     o Limited experience with solid-state storage (SSDs) on Linux in the
+       GT.M development environment suggests a considerable difference in
+       asynchronous IO performance on the same underlying hardware, with f2fs
+       performing better than xfs, which in turn performed better than ext4.
+
+   In GT.M development, we have not benchmarked asynchronous IO on the types
+   of storage commonly used for enterprise scale applications (as workloads
+   vary widely, we do not routinely benchmark workloads in development).
+   Please consider the above observations in this light.
+
+   By default GDE uses NOASYNCIO. On segments with an access method of MM,
+   GT.M ignores this setting.
+
+   -[NO]ENcryption
+
+   Specifies whether or not the database file for a segment is flagged for
+   encryption. Note that MUPIP CREATE acquires an encryption key for this
+   file and puts a cryptographic hash of the key in the database file header.
+
    -BL[OCK_SIZE]=size
 
    Specifies the size, in bytes, of each database block in the file system.
@@ -1737,9 +1868,15 @@
    |-----------------------------+-----------+-------+----------------------|
    | -AL[LOCATION]=size (blocks) | 100       | 10    | 1,040,187,392(992Mi) |
    |-----------------------------+-----------+-------+----------------------|
+   | -[NO]AS[YNCIO]              | FALSE     | -     | -                    |
+   |-----------------------------+-----------+-------+----------------------|
    | -BL[OCK_SIZE]=size (bytes)  | 1,024     | 512   | 65,024               |
    |-----------------------------+-----------+-------+----------------------|
-   | -[NO]EN[CRYPTION]           | 0         |       |                      |
+   | -[NO]DEFER_ALLOCATE         | TRUE      | -     | -                    |
+   |-----------------------------+-----------+-------+----------------------|
+   | -[NO]ENCRYPTION             | FALSE     | -     | -                    |
+   |-----------------------------+-----------+-------+----------------------|
+   | -[NO]EPOCHTAPER             | TRUE      | -     | -                    |
    |-----------------------------+-----------+-------+----------------------|
    | -EX[TENSION_COUNT]=size     | 100       | 0     | 65,535               |
    | (blocks)                    |           |       |                      |
@@ -1937,12 +2074,22 @@
    |--------------------------------------------+-------+-------+----------------------+-----+-----+-----|
    |-AL[LOCATION]=size(blocks)                  |100    |10     |1,040,187,392(992Mi)  |-    |-    |X    |
    |--------------------------------------------+-------+-------+----------------------+-----+-----+-----|
+   |-[NO]AS[YNCIO]                              |FALSE  |-      |-                     |-    |-    |X    |
+   |--------------------------------------------+-------+-------+----------------------+-----+-----+-----|
+   |-[NO]AU[TODB]                               |FALSE  |-      |-                     |-    |X    |-    |
+   |--------------------------------------------+-------+-------+----------------------+-----+-----+-----|
    |-BL[OCK_SIZE]=size(bytes)                   |1024   |512    |65024                 |-    |-    |X    |
    |--------------------------------------------+-------+-------+----------------------+-----+-----+-----|
    |-C[OLLATION_DEFAULT]=id-number (integer)    |0      |0      |255                   |-    |X    |-    |
    |--------------------------------------------+-------+-------+----------------------+-----+-----+-----|
+   |-[NO]DEFER_ALLOCATE                         |TRUE   |-      |-                     |-    |-    |X    |
+   |--------------------------------------------+-------+-------+----------------------+-----+-----+-----|
    |-D[YNAMIC_SEGMENT]=segment-name (chars)     |*      |1A     |16A/N                 |-    |X    |-    |
    |--------------------------------------------+-------+-------+----------------------+-----+-----+-----|
+   |-[NO]ENCRYPTION                             |FALSE  |-      |-                     |-    |-    |X    |
+   |--------------------------------------------+-------+-------+----------------------+-----+-----+-----|
+   |-[NO]EPOCHTAPER                             |TRUE   |-      |-                     |-    |-    |X    |
+   |--------------------------------------------+-------+-------+----------------------+-----+-----+-----|
    |-EX[TENSION_COUNT]=size (blks)              |100    |0      |65535                 |-    |-    |X    |
    |--------------------------------------------+-------+-------+----------------------+-----+-----+-----|
    |-F[ILE_NAME]=file-name (chars)              |**     |1A     |255A/N                |-    |-    |X    |
@@ -1952,6 +2099,8 @@
    |--------------------------------------------+-------+-------+----------------------+-----+-----+-----|
    |-K[EY_SIZE]=size (bytes)                    |64     |3      |1,019                 |-    |X    |-    |
    |--------------------------------------------+-------+-------+----------------------+-----+-----+-----|
+   |-[NO]L[OCK_CRIT]                            |FALSE  |-      |-                     |-    |X    |-    |
+   |--------------------------------------------+-------+-------+----------------------+-----+-----+-----|
    |-L[OCK_SPACE]=size (pages)                  |40     |10     |65,536                |-    |-    |X    |
    |--------------------------------------------+-------+-------+----------------------+-----+-----+-----|
    |-M[UTEX_SLOTS]=integer                      |1,024  |1,024  |32,768                |-    |-    |X    |
@@ -1977,7 +2126,7 @@
 1 Copyright
    Copyright
 
-   Copyright 2016
+   Copyright 2017
 
    Fidelity National Information Services, Inc. and/or its subsidiaries. All
    rights reserved.
@@ -1999,7 +2148,7 @@
 
    **Note**
 
-   This help file is a concise representation of revision V6.3-000 of the
+   This help file is a concise representation of revision V6.3-001 of the
    UNIX Administration and Operations Guide. To obtain a copy of the current
    revision, go to www.fis-gtm.com and then click on the User Documentation
    tab.
diff --git a/sr_port/gde.m b/sr_port/gde.m
index 56071a0..16d944f 100755
--- a/sr_port/gde.m
+++ b/sr_port/gde.m
@@ -1,6 +1,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;								;
-;	Copyright 2001, 2013 Fidelity Information Services, Inc	;
+; Copyright (c) 2001-2016 Fidelity National Information		;
+; Services, Inc. and/or its subsidiaries. All rights reserved.	;
 ;								;
 ;	This source code contains the intellectual property	;
 ;	of its copyright holder(s), and is made available	;
@@ -24,10 +25,9 @@ DBG:	;transfer point for DEBUG and "runtime" %gde
 	; Prepare special $etrap to issue error in case VIEW "YLCT" call to set local collation fails below
 	; Need to use this instead of the gde $etrap (set a few lines later below) as that expects some initialization
 	; to have happened whereas we are not yet there since setting local collation is a prerequisite for that init.
-	i $zver'["VMS" s $et="w !,$p($zs,"","",3,999) s $ecode="""" zm 150503603:$zparse(""$gtmgbldir"","""",""*.gld"") quit"
-	else           s $et="w !,$p($zs,"","",3,999) s $ecode="""" zm 150503603:$zparse(""GTM$GBLDIR"","""",""*.GLD"") quit"
+	s $et="w !,$p($zs,"","",3,999) s $ecode="""" zm 150503603:$zparse(""$gtmgbldir"","""",""*.gld"") quit"
 	v "YLCT":0:1:0		; sets local variable alternate collation = 0, null collation = 1, numeric collation = 0
-	; since GDE creates null subscripts, we dont want user level setting of gtm_lvnullsubs to affect us in any way
+	; since GDE creates null subscripts, we don't want user level setting of gtm_lvnullsubs to affect us in any way
 	s gdeEntryState("nullsubs")=$v("LVNULLSUBS")
 	v "LVNULLSUBS"
 	s gdeEntryState("zlevel")=$zlevel-1
@@ -49,7 +49,7 @@ comline:
 	f cp=1:1 s c=$e(comline,cp) q:(c'=" ")&(c'=TAB)	 ; remove extraneous whitespace at beginning of line
 	s ntoken="",ntoktype="TKEOL" s:runtime comline="/"_comline
 	d GETTOK^GDESCAN
-	i ntoktype="TKEOL" q	 ; if comline begins with a ! dont even bother parsing this line anymore
+	i ntoktype="TKEOL" q	 ; if comline begins with a ! don't even bother parsing this line anymore
 	i log u @uself w comline,! u @useio
 	i runtime n NAME,REGION,SEGMENT,gqual,lquals zg:"/QUIT"[$tr(comline,lower,upper) combase-1 d SHOW^GDEPARSE q
 	i ntoktype="TKAT" s resume(comlevel+1)=$zl d comfile q
@@ -60,7 +60,9 @@ CTRL
 	. i comlevel>0 d comeof ; if we take a ctrl-c in a command file then get out of that command file
 	i $p($zs,",",3,999)["%GTM-E-CTRAP, Character trap $C(25) encountered" d GETOUT^GDEEXIT h
 	i $p($zs,",",3,999)["%GTM-E-CTRAP, Character trap $C(26) encountered" d EXIT^GDEEXIT
-	i $p($zs,",",3,999)="%GTM-E-IOEOF, Attempt to read past an end-of-file" d comexit
+	i $p($zs,",",3,999)="%GTM-E-IOEOF, Attempt to read past an end-of-file" d
+	. s $ecode=""	; clear IOEOF condition (not an error) so later GDE can exit with 0 status
+	. d comexit
 	i $zeof d EXIT^GDEEXIT
 	d ABORT
 	;
@@ -87,6 +89,7 @@ comeof	c comfile s comlevel=$select(comlevel>1:comlevel-1,1:0)
 	i comlevel>0 s comfile=comfile(comlevel) zm gdeerr("EXECOM"):comfile
 	e  u @useio
 	i $p($zs,",",3)'["%GTM-E-IOEOF",$p($zs,",",3)'["FILENOTFND" w !,$p($zs,",",3,9999),!
+	e  s $ecode=""	; clear IOEOF condition (not an error) so later GDE can exit with 0 status
 	q
 SCRIPT:
 	s comlevel=comlevel+1
@@ -103,7 +106,7 @@ ABORT
         o abort:(newversion:noreadonly) u abort zsh "*" c abort
         u @useio
 	; make GDECHECK error fatal except native UNIX
-        i $d(gdeerr) zm gdeerr("GDECHECK") Write $ZMessage($Select($ZVersion'["VMS"&(256>abortzs):+abortzs,1:+abortzs\8*8+4)),!
+        i $d(gdeerr) zm gdeerr("GDECHECK") Write $ZMessage($Select((256>abortzs):+abortzs,1:+abortzs\8*8+4)),!
         e  w $zs
         d GETOUT^GDEEXIT
 	h
diff --git a/sr_port/gdeerrors.msg b/sr_port/gdeerrors.msg
index 94278f1..462ddb7 100755
--- a/sr_port/gdeerrors.msg
+++ b/sr_port/gdeerrors.msg
@@ -1,6 +1,7 @@
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !								!
-!	Copyright 2001, 2013 Fidelity Information Services, Inc	!
+! Copyright (c) 2001-2017 Fidelity National Information		!
+! Services, Inc. and/or its subsidiaries. All rights reserved.	!
 !								!
 !	This source code contains the intellectual property	!
 !	of its copyright holder(s), and is made available	!
@@ -67,7 +68,7 @@ GDNOTSET	<Global Directory not changed because the current GD cannot be written>
 INVGBLDIR	<Invalid Global Directory spec: !AD.!/Continuing with !AD>/info/fao=4
 WRITEERROR	<Cannot exit because of write failure.  Reason for failure: !AD>/info/fao=2
 NONASCII	<!AD is illegal for a !AD as it contains non-ASCII characters>/error/fao=4
-CRYPTNOMM	<!AD is an encrypted database. Cannot support MM access method.>/error/fao=2
+GDECRYPTNOMM	<!AD segment has encryption turned on. Cannot support MM access method.>/error/fao=2
 JNLALLOCGROW	<Increased Journal ALLOCATION from [!AD blocks] to [!AD blocks] to match AUTOSWITCHLIMIT for !AD !AD>/info/fao=8
 KEYFORBLK	<But block size !AD and reserved bytes !AD limit key size to !AD>/info/fao=6
 STRMISSQUOTE	<Missing double-quote at end of string specification !AD>/error/fao=2
@@ -96,4 +97,6 @@ NAMGVSUBOFLOW	<Subscripted name !AD...!AD is too long to represent in the databa
 GBLNAMCOLLRANGE	<Collation sequence #!UL is out of range (0 thru 255)>/error/fao=3
 STDNULLCOLLREQ	<Region !AD needs Standard Null Collation enabled because global !AD spans through it>/info/fao=4
 GBLNAMCOLLVER	<Global directory indicates GBLNAME !AD has collation sequence #!UL with a version #!UL but shared library reports different version #!UL>/error/fao=5
+GDEASYNCIONOMM	<!AD segment has ASYNCIO turned on. Cannot support MM access method.>/error/fao=2
+NOPERCENTY	<^%Y* is a reserved global name in GT.M>/error/fao=0
 	.end
diff --git a/sr_port/gdeexit.m b/sr_port/gdeexit.m
index aa41dbb..5ef4600 100755
--- a/sr_port/gdeexit.m
+++ b/sr_port/gdeexit.m
@@ -1,6 +1,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;								;
-;	Copyright 2001, 2013 Fidelity Information Services, Inc	;
+; Copyright (c) 2001-2016 Fidelity National Information		;
+; Services, Inc. and/or its subsidiaries. All rights reserved.	;
 ;								;
 ;	This source code contains the intellectual property	;
 ;	of its copyright holder(s), and is made available	;
@@ -34,5 +35,7 @@ GETOUT	; Routine executed just before exiting from GDE. This tries to restore th
 	s gdeEntryStateZlvl=+gdeEntryState("zlevel")
 	k (gdeEntryStateZlvl,gdeEntryStateAct,gdeEntryStateNcol,gdeEntryStateNct)
 	i $$set^%LCLCOL(gdeEntryStateAct,gdeEntryStateNcol,gdeEntryStateNct) ; restores local variable collation characteristics
+	; If GDE was invoked from the shell, exit to shell with proper exit status else use ZGOTO to go to parent mumps invocation
+	if gdeEntryStateZlvl=0 zhalt $select($ecode'="":+$zstatus,1:0)
 	zg gdeEntryStateZlvl ; this should exit GDE and return control to parent mumps process invocation
 	h  ; to be safe in case control ever reaches here
diff --git a/sr_port/gdeinit.m b/sr_port/gdeinit.m
index 0e33df1..ebd85db 100755
--- a/sr_port/gdeinit.m
+++ b/sr_port/gdeinit.m
@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;								;
-; Copyright (c) 2001-2015 Fidelity National Information 	;
+; Copyright (c) 2001-2017 Fidelity National Information		;
 ; Services, Inc. and/or its subsidiaries. All rights reserved.	;
 ;								;
 ;	This source code contains the intellectual property	;
@@ -11,12 +11,10 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 gdeinit: ;set up local variables and arrays
 GDEINIT
-	i $ZVER'["VMS" view "BADCHAR"
+	view "BADCHAR"
 	s renpref=""
 	s log=0,logfile="GDELOG.LOG",BOL=""
 	s ZERO=$c(0),ONE=$c(1),TRUE=ONE,FALSE=ZERO,TAB=$c(9)
-	s endian("VAX","VMS")=FALSE,glo("VMS")=1024
-	s endian("AXP","VMS")=FALSE,endian("AXP","OSF1")=FALSE,glo("VMS")=1024,glo("OSF1")=1024
 	s endian("x86","SCO")=FALSE,endian("x86","UWIN")=FALSE,endian("x86","Linux")=FALSE,endian("x86","CYGWIN")=FALSE
 	s endian("x86_64","Linux")=FALSE
 	s glo("SCO")=384,glo("UWIN")=1024,glo("Linux")=1024,glo("CYGWIN")=1024
@@ -84,8 +82,7 @@ GDEINIT
 	s typevalue("STR2NUM","TACCMETH","BG")=0
 	s typevalue("STR2NUM","TACCMETH","MM")=1
 	s nommbi=1              ; this is used in GDEVERIF and should be removed along with the code when support is added
-	d UNIX:ver'="VMS"
-	d VMS:ver="VMS"
+	d UNIX
 	d syntabi
 ;
 	; Explanation of some of the SIZEOF local variable subscripts.
@@ -97,36 +94,26 @@ GDEINIT
 	. s SIZEOF("gd_header")=16		; --> 16-byte header structure at offset 0 of .gld (12 byte label, 4-byte filesize)
 	. s SIZEOF("gd_contents")=76		; --> size of the "gd_addr" structure (defined in gdsfhead.h)
 	. s SIZEOF("gd_map")=16			; --> size of the "gd_binding" structure (defined in gdsfhead.h)
-	. if ver'="VMS" d
-	. . s SIZEOF("gd_region")=372		; --> size of the "gd_region"  structure (defined in gdsfhead.h)
-	. . s SIZEOF("gd_region_padding")=0	; --> padding at end of "gd_region" structure (4-bytes for 64-bit platforms)
-	. . s SIZEOF("gd_segment")=364		; --> size of the "gd_segment" structure (defined in gdsfhead.h)
-	. e  d
-	. . s SIZEOF("gd_region")=348		; --> size of the "gd_region"  structure (defined in gdsfhead.h)
-	. . ; SIZEOF("gd_region_padding")	 is not used in VMS
-	. . s SIZEOF("gd_segment")=356		; --> size of the "gd_segment" structure (defined in gdsfhead.h)
+	. s SIZEOF("gd_region")=412		; --> size of the "gd_region"  structure (defined in gdsfhead.h)
+	. s SIZEOF("gd_region_padding")=0	; --> padding at end of "gd_region" structure (4-bytes for 64-bit platforms)
+	. s SIZEOF("gd_segment")=368		; --> size of the "gd_segment" structure (defined in gdsfhead.h)
 	e  d
 	. s SIZEOF("am_offset")=340		; --> offset of "acc_meth" field in the "gd_segment" structure
 	. s SIZEOF("file_spec")=256		; --> maximum size (in bytes) of a file name specified in gde command line
 	. s SIZEOF("gd_header")=16		; --> 16-byte header structure at offset 0 of .gld (12 byte label, 4-byte filesize)
 	. s SIZEOF("gd_contents")=112		; --> size of the "gd_addr" structure (defined in gdsfhead.h)
 	. s SIZEOF("gd_map")=24			; --> size of the "gd_binding" structure (defined in gdsfhead.h)
-	. s SIZEOF("gd_region")=384		; --> size of the "gd_region"  structure (defined in gdsfhead.h)
+	. s SIZEOF("gd_region")=424		; --> size of the "gd_region"  structure (defined in gdsfhead.h)
 	. s SIZEOF("gd_region_padding")=4	; --> padding at end of "gd_region" structure (4-bytes for 64-bit platforms)
 	. s SIZEOF("gd_segment")=384		; --> size of the "gd_segment" structure (defined in gdsfhead.h)
+	d Init^GDEINITSZ			; --> current gvstats size comes from routine generated by scantypedefs
 	s SIZEOF("gd_gblname")=40
 	s SIZEOF("mident")=32
 	s SIZEOF("blk_hdr")=16
-	i ver'="VMS" d
-	. s SIZEOF("rec_hdr")=4	;GTM-6941
-	e  d
-	. s SIZEOF("rec_hdr")=3
+	s SIZEOF("rec_hdr")=4	;GTM-6941
 	s SIZEOF("dsk_blk")=512
-	i ver'="VMS" d
-	. s SIZEOF("max_str")=1048576
-	e  d
-	. s SIZEOF("max_str")=32767
-	s SIZEOF("reg_jnl_deq")=4				; not used on VMS
+	s SIZEOF("max_str")=1048576
+	s SIZEOF("reg_jnl_deq")=4
 	s MAXNAMLN=SIZEOF("mident")-1,MAXREGLN=32,MAXSEGLN=32	; maximum name length allowed is 31 characters
 	s PARNAMLN=31,PARREGLN=31,PARSEGLN=31
 	s MAXSTRLEN=(2**20)					; needs to be equal to MAX_STRLEN in mdef.h at all times
@@ -142,69 +129,67 @@ GDEINIT
 	s tokens("(")="TKLPAREN",tokens("TKLPAREN")="left parenthesis"
 	s tokens(")")="TKRPAREN",tokens("TKRPAREN")="right parenthesis"
 	s tokens("!")="TKEXCLAM",tokens("TKEXCLAM")="exclamation point"
-	i ver'="VMS" s tokens("-")="TKDASH",tokens("TKDASH")="dash"
-	e            s tokens("/")="TKSLASH",tokens("TKSLASH")="slash"
+	s tokens("-")="TKDASH",tokens("TKDASH")="dash"
 	s tokens("")="TKEOL"	; for parsing purposes
 ; tokendelim is used for parsing; it is defined for all characters that can terminate a valid token during parsing
 	for c=" ",TAB,"=",",",")","" s tokendelim(c)=""
-	; in case of VMS, we want the "/" qualifier separator to be treated as a delimiter even if not preceded by white space
-	; this is how VMS tools work. Whereas in the Unix shell command line, space is by default the separator for multiple
-	; qualifiers. Hence GDE also is similarly different between Unix vs VMS in terms of separator handling ("-" vs "/").
-	i ver="VMS" s tokendelim("/")=""
+	; In the Unix shell command line, space is by default the separator for multiple qualifiers.
+	; GDE handles separators similarly.
 ; spacedelim is used for parsing when we want to terminate token parsing only if we see a white space (a subset of "tokendelim")
-; this is needed in case we are parsing say a filename and we dont want a "-" or "=" in the file name to terminate the parse.
+; this is needed in case we are parsing say a filename and we don't want a "-" or "=" in the file name to terminate the parse.
 	for c=" ",TAB,"" s spacedelim(c)=""
-	i ver="VMS" s spacedelim("/")=""
 	k c
 ; maximums and mimimums
 ; gblname
 	s mingnam("COLLATION")=0
 	s maxgnam("COLLATION")=255
 ; region
-	s minreg("ALLOCATION")=$s(ver'="VMS":200,1:10)
+	s minreg("ALLOCATION")=200
 	s minreg("BEFORE_IMAGE")=0,minreg("COLLATION_DEFAULT")=0,minreg("STDNULLCOLL")=0
 	s minreg("EXTENSION")=0
-	i ver'="VMS" d
-	. s minreg("AUTOSWITCHLIMIT")=16384
-	. s minreg("ALIGNSIZE")=4096			; geq RECORD_SIZE
-	. s minreg("EPOCH_INTERVAL")=1
-	. s minreg("SYNC_IO")=0
-	. s minreg("YIELD_LIMIT")=0
-	. s minreg("INST_FREEZE_ON_ERROR")=0
-	. s minreg("BUFFER_SIZE")=2307
-	. s minreg("QDBRUNDOWN")=0
-	. s minreg("EPOCHTAPER")=0
-	. s minreg("RECORD_SIZE")=0
-	e  d
-	. s minreg("RECORD_SIZE")=SIZEOF("rec_hdr")+4
+	s minreg("AUTOSWITCHLIMIT")=16384
+	s minreg("ALIGNSIZE")=4096			; geq RECORD_SIZE
+	s minreg("EPOCH_INTERVAL")=1
+	s minreg("SYNC_IO")=0
+	s minreg("YIELD_LIMIT")=0
+	s minreg("INST_FREEZE_ON_ERROR")=0
+	s minreg("BUFFER_SIZE")=2307
+	s minreg("QDBRUNDOWN")=0
+	s minreg("EPOCHTAPER")=0
+	s minreg("AUTODB")=0
+	s minreg("STATS")=0
+	s minreg("LOCK_CRIT")=0
+	s minreg("RECORD_SIZE")=0
 	s minreg("JOURNAL")=0,minreg("KEY_SIZE")=3,minreg("NULL_SUBSCRIPTS")=0
 	s maxreg("ALLOCATION")=TWO(24),maxreg("BEFORE_IMAGE")=1
 	s maxreg("COLLATION_DEFAULT")=255,maxreg("STDNULLCOLL")=1
-	i ver="VMS" do
-	. s maxreg("EXTENSION")=HEX(4)-1
-	. s maxreg("BUFFER_SIZE")=2000
-	. s maxreg("KEY_SIZE")=255
-	e  d
-	. s maxreg("EXTENSION")=1073741823
-	. s maxreg("AUTOSWITCHLIMIT")=8388607
-	. s maxreg("ALIGNSIZE")=4194304
-	. s maxreg("EPOCH_INTERVAL")=32767
-	. s maxreg("SYNC_IO")=1
-	. s maxreg("YIELD_LIMIT")=2048
-	. s maxreg("INST_FREEZE_ON_ERROR")=1
-	. s maxreg("BUFFER_SIZE")=32768
-	. s maxreg("QDBRUNDOWN")=1
-	. s maxreg("EPOCHTAPER")=1
-	. s maxreg("KEY_SIZE")=1019	; = max value of KEY->end that returns TRUE for CAN_APPEND_HIDDEN_SUBS(KEY) in gdsfhead.h
+	s maxreg("EXTENSION")=1073741823
+	s maxreg("AUTOSWITCHLIMIT")=8388607
+	s maxreg("ALIGNSIZE")=4194304
+	s maxreg("EPOCH_INTERVAL")=32767
+	s maxreg("SYNC_IO")=1
+	s maxreg("YIELD_LIMIT")=2048
+	s maxreg("INST_FREEZE_ON_ERROR")=1
+	s maxreg("BUFFER_SIZE")=32768
+	s maxreg("QDBRUNDOWN")=1
+	s maxreg("EPOCHTAPER")=1
+	s maxreg("AUTODB")=1
+	s maxreg("STATS")=1
+	s maxreg("LOCK_CRIT")=1
+	s maxreg("KEY_SIZE")=1019	; = max value of KEY->end that returns TRUE for CAN_APPEND_HIDDEN_SUBS(KEY) in gdsfhead.h
 	s maxreg("JOURNAL")=1,maxreg("NULL_SUBSCRIPTS")=2
 	s maxreg("RECORD_SIZE")=SIZEOF("max_str")
+	; Store defaults in "dflreg". "tmpreg" serves this purpose for the most part but it is user-editable (using the
+	; TEMPLATE command) but for things where we want to use the GT.M-default value (not user-edited default value)
+	; we use "dflreg". Currently the only parameter we care about is KEY_SIZE which is used for setting statsdb characteristics
+	s dflreg("KEY_SIZE")=64	; should be maintained in parallel with STATSDB_KEY_SIZE in gdsfhead.h
 ; segments
 	; First define segment characteristics (minimum and maximum) that are identical to BG and MM access methods
 	; Then define overrides specific to BG and MM
 	n minsegcommon,maxsegcommon
 	s minsegcommon("ALLOCATION")=10
 	s maxsegcommon("ALLOCATION")=TWO(27)
-	i ver'="VMS" s maxsegcommon("ALLOCATION")=TWO(30)-TWO(25) ; supports 992M blocks for UNIX only
+	s maxsegcommon("ALLOCATION")=TWO(30)-TWO(25) ; supports 992M blocks
 	s minsegcommon("BLOCK_SIZE")=SIZEOF("dsk_blk")
 	s maxsegcommon("BLOCK_SIZE")=HEX(4)-SIZEOF("dsk_blk")
 	s minsegcommon("EXTENSION_COUNT")=0
@@ -232,7 +217,7 @@ GDEINIT
 	; This is particularly needed for fields that are only available in more recent .gld formats
 	; So if we are reading an older format .gld file, we can use these as the default values.
 	s defseg("ALLOCATION")=100
-	s defseg("BLOCK_SIZE")=1024
+	s defseg("BLOCK_SIZE")=4096
 	s defseg("BUCKET_SIZE")=""
 	s defseg("DEFER_ALLOCATE")=1
 	s defseg("EXTENSION_COUNT")=100
@@ -241,7 +226,8 @@ GDEINIT
 	s defseg("RESERVED_BYTES")=0
 	s defseg("LOCK_SPACE")=40
 	s defseg("WINDOW_SIZE")=""
-	i ver'="VMS" s defseg("ENCRYPTION_FLAG")=0
+	s defseg("ENCRYPTION_FLAG")=0
+	s defseg("ASYNCIO")=0
 	q
 
 ;-----------------------------------------------------------------------------------------------------------------------------------
@@ -260,8 +246,11 @@ syntabi:
 	s syntab("ADD","REGION","STDNULLCOLL")="NEGATABLE"
 	s syntab("ADD","REGION","DYNAMIC_SEGMENT")="REQUIRED"
 	s syntab("ADD","REGION","DYNAMIC_SEGMENT","TYPE")="TSEGMENT"
-	i ver'="VMS" s syntab("ADD","REGION","EPOCHTAPER")="NEGATABLE"
-	i ver'="VMS" s syntab("ADD","REGION","INST_FREEZE_ON_ERROR")="NEGATABLE"
+	s syntab("ADD","REGION","EPOCHTAPER")="NEGATABLE"
+	s syntab("ADD","REGION","AUTODB")="NEGATABLE"
+	s syntab("ADD","REGION","STATS")="NEGATABLE"
+	s syntab("ADD","REGION","LOCK_CRIT")="NEGATABLE"
+	s syntab("ADD","REGION","INST_FREEZE_ON_ERROR")="NEGATABLE"
 	s syntab("ADD","REGION","JOURNAL")="NEGATABLE,REQUIRED,LIST"
 	s syntab("ADD","REGION","JOURNAL","ALLOCATION")="REQUIRED"
 	s syntab("ADD","REGION","JOURNAL","ALLOCATION","TYPE")="TNUMBER"
@@ -278,7 +267,7 @@ syntabi:
 	s syntab("ADD","REGION","KEY_SIZE","TYPE")="TNUMBER"
 	s syntab("ADD","REGION","NULL_SUBSCRIPTS")="NEGATABLE,REQUIRED"
 	s syntab("ADD","REGION","NULL_SUBSCRIPTS","TYPE")="TNULLSUB"
-	i ver'="VMS" s syntab("ADD","REGION","QDBRUNDOWN")="NEGATABLE"
+	s syntab("ADD","REGION","QDBRUNDOWN")="NEGATABLE"
 	s syntab("ADD","REGION","RECORD_SIZE")="REQUIRED"
 	s syntab("ADD","REGION","RECORD_SIZE","TYPE")="TNUMBER"
 	s syntab("ADD","SEGMENT")=""
@@ -286,13 +275,14 @@ syntabi:
 	s syntab("ADD","SEGMENT","ACCESS_METHOD","TYPE")="TACCMETH"
 	s syntab("ADD","SEGMENT","ALLOCATION")="REQUIRED"
 	s syntab("ADD","SEGMENT","ALLOCATION","TYPE")="TNUMBER"
+	s syntab("ADD","SEGMENT","ASYNCIO")="NEGATABLE"
 	s syntab("ADD","SEGMENT","BLOCK_SIZE")="REQUIRED"
 	s syntab("ADD","SEGMENT","BLOCK_SIZE","TYPE")="TNUMBER"
 	s syntab("ADD","SEGMENT","BUCKET_SIZE")="REQUIRED"
 	s syntab("ADD","SEGMENT","BUCKET_SIZE","TYPE")="TNUMBER"
 	s syntab("ADD","SEGMENT","DEFER")="NEGATABLE"
 	s syntab("ADD","SEGMENT","DEFER_ALLOCATE")="NEGATABLE"
- 	i ver'="VMS" s syntab("ADD","SEGMENT","ENCRYPTION_FLAG")="NEGATABLE"
+ 	s syntab("ADD","SEGMENT","ENCRYPTION_FLAG")="NEGATABLE"
 	s syntab("ADD","SEGMENT","EXTENSION_COUNT")="REQUIRED"
 	s syntab("ADD","SEGMENT","EXTENSION_COUNT","TYPE")="TNUMBER"
 	s syntab("ADD","SEGMENT","FILE_NAME")="REQUIRED"
@@ -319,8 +309,11 @@ syntabi:
 	s syntab("CHANGE","REGION","STDNULLCOLL")="NEGATABLE"
 	s syntab("CHANGE","REGION","DYNAMIC_SEGMENT")="REQUIRED"
 	s syntab("CHANGE","REGION","DYNAMIC_SEGMENT","TYPE")="TSEGMENT"
-	i ver'="VMS" s syntab("CHANGE","REGION","EPOCHTAPER")="NEGATABLE"
-	i ver'="VMS" s syntab("CHANGE","REGION","INST_FREEZE_ON_ERROR")="NEGATABLE"
+	s syntab("CHANGE","REGION","EPOCHTAPER")="NEGATABLE"
+	s syntab("CHANGE","REGION","AUTODB")="NEGATABLE"
+	s syntab("CHANGE","REGION","STATS")="NEGATABLE"
+	s syntab("CHANGE","REGION","LOCK_CRIT")="NEGATABLE"
+	s syntab("CHANGE","REGION","INST_FREEZE_ON_ERROR")="NEGATABLE"
 	s syntab("CHANGE","REGION","JOURNAL")="NEGATABLE,REQUIRED,LIST"
 	s syntab("CHANGE","REGION","JOURNAL","ALLOCATION")="REQUIRED"
 	s syntab("CHANGE","REGION","JOURNAL","ALLOCATION","TYPE")="TNUMBER"
@@ -337,7 +330,7 @@ syntabi:
 	s syntab("CHANGE","REGION","KEY_SIZE","TYPE")="TNUMBER"
 	s syntab("CHANGE","REGION","NULL_SUBSCRIPTS")="NEGATABLE,REQUIRED"
 	s syntab("CHANGE","REGION","NULL_SUBSCRIPTS","TYPE")="TNULLSUB"
-	i ver'="VMS" s syntab("CHANGE","REGION","QDBRUNDOWN")="NEGATABLE"
+	s syntab("CHANGE","REGION","QDBRUNDOWN")="NEGATABLE"
 	s syntab("CHANGE","REGION","RECORD_SIZE")="REQUIRED"
 	s syntab("CHANGE","REGION","RECORD_SIZE","TYPE")="TNUMBER"
 	s syntab("CHANGE","SEGMENT")=""
@@ -345,13 +338,14 @@ syntabi:
 	s syntab("CHANGE","SEGMENT","ACCESS_METHOD","TYPE")="TACCMETH"
 	s syntab("CHANGE","SEGMENT","ALLOCATION")="REQUIRED"
 	s syntab("CHANGE","SEGMENT","ALLOCATION","TYPE")="TNUMBER"
+	s syntab("CHANGE","SEGMENT","ASYNCIO")="NEGATABLE"
 	s syntab("CHANGE","SEGMENT","BLOCK_SIZE")="REQUIRED"
 	s syntab("CHANGE","SEGMENT","BLOCK_SIZE","TYPE")="TNUMBER"
 	s syntab("CHANGE","SEGMENT","BUCKET_SIZE")="REQUIRED"
 	s syntab("CHANGE","SEGMENT","BUCKET_SIZE","TYPE")="TNUMBER"
 	s syntab("CHANGE","SEGMENT","DEFER")="NEGATABLE"
 	s syntab("CHANGE","SEGMENT","DEFER_ALLOCATE")="NEGATABLE"
-	i ver'="VMS" s syntab("CHANGE","SEGMENT","ENCRYPTION_FLAG")="NEGATABLE"
+	s syntab("CHANGE","SEGMENT","ENCRYPTION_FLAG")="NEGATABLE"
 	s syntab("CHANGE","SEGMENT","EXTENSION_COUNT")="REQUIRED"
 	s syntab("CHANGE","SEGMENT","EXTENSION_COUNT","TYPE")="TNUMBER"
 	s syntab("CHANGE","SEGMENT","FILE_NAME")="REQUIRED"
@@ -375,14 +369,16 @@ syntabi:
 	s syntab("TEMPLATE","REGION","JOURNAL")="NEGATABLE,REQUIRED,LIST"
 	s syntab("TEMPLATE","REGION","JOURNAL","ALLOCATION")="REQUIRED"
 	s syntab("TEMPLATE","REGION","JOURNAL","ALLOCATION","TYPE")="TNUMBER"
-	i ver'="VMS" d
-	. s syntab("TEMPLATE","REGION","INST_FREEZE_ON_ERROR")="NEGATABLE"
-	. s syntab("TEMPLATE","REGION","JOURNAL","AUTOSWITCHLIMIT")="REQUIRED"
-	. s syntab("TEMPLATE","REGION","JOURNAL","AUTOSWITCHLIMIT","TYPE")="TNUMBER"
+	s syntab("TEMPLATE","REGION","INST_FREEZE_ON_ERROR")="NEGATABLE"
+	s syntab("TEMPLATE","REGION","JOURNAL","AUTOSWITCHLIMIT")="REQUIRED"
+	s syntab("TEMPLATE","REGION","JOURNAL","AUTOSWITCHLIMIT","TYPE")="TNUMBER"
 	s syntab("TEMPLATE","REGION","JOURNAL","BUFFER_SIZE")="REQUIRED"
 	s syntab("TEMPLATE","REGION","JOURNAL","BUFFER_SIZE","TYPE")="TNUMBER"
 	s syntab("TEMPLATE","REGION","JOURNAL","BEFORE_IMAGE")="NEGATABLE"
-	i ver'="VMS" s syntab("TEMPLATE","REGION","EPOCHTAPER")="NEGATABLE"
+	s syntab("TEMPLATE","REGION","EPOCHTAPER")="NEGATABLE"
+	s syntab("TEMPLATE","REGION","AUTODB")="NEGATABLE"
+	s syntab("TEMPLATE","REGION","STATS")="NEGATABLE"
+	s syntab("TEMPLATE","REGION","LOCK_CRIT")="NEGATABLE"
 	s syntab("TEMPLATE","REGION","JOURNAL","EXTENSION")="REQUIRED"
 	s syntab("TEMPLATE","REGION","JOURNAL","EXTENSION","TYPE")="TNUMBER"
 	s syntab("TEMPLATE","REGION","JOURNAL","FILE_NAME")="REQUIRED"
@@ -391,7 +387,7 @@ syntabi:
 	s syntab("TEMPLATE","REGION","KEY_SIZE","TYPE")="TNUMBER"
 	s syntab("TEMPLATE","REGION","NULL_SUBSCRIPTS")="NEGATABLE,REQUIRED"
 	s syntab("TEMPLATE","REGION","NULL_SUBSCRIPTS","TYPE")="TNULLSUB"
-	i ver'="VMS" s syntab("TEMPLATE","REGION","QDBRUNDOWN")="NEGATABLE"
+	s syntab("TEMPLATE","REGION","QDBRUNDOWN")="NEGATABLE"
 	s syntab("TEMPLATE","REGION","RECORD_SIZE")="REQUIRED"
 	s syntab("TEMPLATE","REGION","RECORD_SIZE","TYPE")="TNUMBER"
 	s syntab("TEMPLATE","SEGMENT")=""
@@ -399,13 +395,14 @@ syntabi:
 	s syntab("TEMPLATE","SEGMENT","ACCESS_METHOD","TYPE")="TACCMETH"
 	s syntab("TEMPLATE","SEGMENT","ALLOCATION")="REQUIRED"
 	s syntab("TEMPLATE","SEGMENT","ALLOCATION","TYPE")="TNUMBER"
+	s syntab("TEMPLATE","SEGMENT","ASYNCIO")="NEGATABLE"
 	s syntab("TEMPLATE","SEGMENT","BLOCK_SIZE")="REQUIRED"
 	s syntab("TEMPLATE","SEGMENT","BLOCK_SIZE","TYPE")="TNUMBER"
 	s syntab("TEMPLATE","SEGMENT","BUCKET_SIZE")="REQUIRED"
 	s syntab("TEMPLATE","SEGMENT","BUCKET_SIZE","TYPE")="TNUMBER"
 	s syntab("TEMPLATE","SEGMENT","DEFER")="NEGATABLE"
 	s syntab("TEMPLATE","SEGMENT","DEFER_ALLOCATE")="NEGATABLE"
-	i ver'="VMS" s syntab("TEMPLATE","SEGMENT","ENCRYPTION_FLAG")="NEGATABLE"
+	s syntab("TEMPLATE","SEGMENT","ENCRYPTION_FLAG")="NEGATABLE"
 	s syntab("TEMPLATE","SEGMENT","EXTENSION_COUNT")="REQUIRED"
 	s syntab("TEMPLATE","SEGMENT","EXTENSION_COUNT","TYPE")="TNUMBER"
 	s syntab("TEMPLATE","SEGMENT","FILE_NAME")="REQUIRED"
@@ -461,25 +458,9 @@ syntabi:
 	s syntab("VERIFY","SEGMENT")=""
 	s syntab("VERIFY","TEMPLATE")=""
 	q
-VMS
-	s endian=FALSE
-	s hdrlab="GTCGBLDIR010"		; must be concurrently maintained in gbldirnam.h!!!
-	s tfile="GTM$GBLDIR"
-	s accmeth="\BG\MM\USER"
-	s typevalue("STR2NUM","TACCMETH","USER")=2
-	s helpfile="GTM$HELP:GDE.HLB"
-	s defdb="MUMPS"
-	s defgld="MUMPS.GLD",defgldext=".GLD"
-	s defreg="$DEFAULT"
-	s defseg="$DEFAULT"
-	s dbfilpar=".1AN.1""-"".1""_"".1"":"".1""$"".1""["".1""]"".1""<"".1"">"".1""."".1"";"""
-	s filexfm="$tr(filespec,lower,upper)"
-	s sep="TKSLASH"
-	q
-
 UNIX:
-	s hdrlab="GTCGBDUNX010"         ; must be concurrently maintained in gbldirnam.h!!!
-	i (gtm64=TRUE) s hdrlab="GTCGBDUNX110" ; the high order digit is a 64-bit flag
+	s hdrlab="GTCGBDUNX011"         ; must be concurrently maintained in gbldirnam.h!!!
+	i (gtm64=TRUE) s hdrlab="GTCGBDUNX111" ; the high order digit is a 64-bit flag
 	s tfile="$gtmgbldir"
 	s accmeth="\BG\MM"
 	s helpfile="$gtm_dist/gdehelp.gld"
diff --git a/sr_port/gdemap.m b/sr_port/gdemap.m
index e47ec58..6dd1b07 100755
--- a/sr_port/gdemap.m
+++ b/sr_port/gdemap.m
@@ -1,6 +1,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;								;
-;	Copyright 2010, 2013 Fidelity Information Services, Inc	;
+; Copyright (c) 2010-2017 Fidelity National Information		;
+; Services, Inc. and/or its subsidiaries. All rights reserved.	;
 ;								;
 ;	This source code contains the intellectual property	;
 ;	of its copyright holder(s), and is made available	;
@@ -104,7 +105,7 @@ MAP2NAM(list1)
 	. s map="" f  s map=$o(mapisplusplus(lvl,map),-1) q:map=""  d
 	. . s mapLen=list(map,"MAPLEN"),currReg=list(map)
 	. . s gblname=$ze(map,1,list(map,"GBLNAMEOFF")),coll=+$g(gnams(gblname,"COLLATION"))
-	. . s key=$ze(map,1,mapLen-1),namSpc=$view("YGDS2GVN",key_ZERO_ZERO,coll) d add2nams(namSpc,currReg,"POINT")
+	. . s key=$ze(map,1,mapLen-1),namSpc=$zcollate(key_ZERO_ZERO,coll,1) d add2nams(namSpc,currReg,"POINT")
 	. . i '$d(list(key)) m list(key)=list(map)  s mapsublvl(lvl,key)="",list(key,"MAPLEN")=list(key,"MAPLEN")-1
 	. . e  d
 	. . . ; if we reach here, this means we are going to remove a ++ map entry and did not add anything instead in "list"
@@ -128,7 +129,7 @@ MAP2NAM(list1)
 	. . . i nextReg=prevReg q  ; x(1) and x(1,2:) map to same region
 	. . . ; add range x(1,2:)
 	. . . s mapLen=list(map,"MAPLEN")
-	. . . s key=$ze(map,1,mapLen),namSpc=$view("YGDS2GVN",key_ZERO_ZERO,coll)
+	. . . s key=$ze(map,1,mapLen),namSpc=$zcollate(key_ZERO_ZERO,coll,1)
 	. . . s nullsub="""""",namSpc=$ze(namSpc,1,$zl(namSpc)-1)_":"_nullsub_")"
 	. . . d add2nams(namSpc,nextReg,"RANGE")
 	. . s prevMap=$o(list(map),-1)
@@ -141,10 +142,10 @@ MAP2NAM(list1)
 	. . . ; Similar to the "trailingrange" case, we can check if the parent level map entry maps to same region as the current
 	. . . ; range and if so skip this range altogether.
 	. . . i list($o(list(parentMap)))'=currReg d
-	. . . . s prevMapLen=list(prevMap,"MAPLEN"),namSpc=$view("YGDS2GVN",prevMap_ZERO_ZERO,coll)
+	. . . . s prevMapLen=list(prevMap,"MAPLEN"),namSpc=$zcollate(prevMap_ZERO_ZERO,coll,1)
 	. . . . n lastSubs
 	. . . . s mapLen=list(map,"MAPLEN"),lastSubs=$ze(map,prfxoff2,mapLen)
-	. . . . s key=gblname_lastSubs,namSpc2=$view("YGDS2GVN",key_ZERO_ZERO,coll)
+	. . . . s key=gblname_lastSubs,namSpc2=$zcollate(key_ZERO_ZERO,coll,1)
 	. . . . s namSpc2=$ze(namSpc2,$zl(gblname)+3,$zl(namSpc2)-1) ; extract out the last/ONLY subscript
 	. . . . s namSpc=$ze(namSpc,1,$zl(namSpc)-1)_":"_namSpc2_")"
 	. . . . d add2nams(namSpc,currReg,"RANGE")
@@ -183,7 +184,7 @@ MAP2NAM(list1)
 	. . . ; the MAP x(1) already existed and we are about to delete the MAP x(1,2).
 	. . . ; check if the MAP after x(1,2) maps to same region as MAP x(1). If so, MAP x(1) can be removed
 	. . . d killPrevMapIfPossible(.list,map)
-	. . s namSpc=$view("YGDS2GVN",parentMap_ZERO_ZERO,coll)
+	. . s namSpc=$zcollate(parentMap_ZERO_ZERO,coll,1)
 	. . d add2nams(namSpc,currReg,"POINT")	; add NAMESPACE x(1)
 	. . d killmap(.list,map)		; delete MAP x(1,2)
 	; ------------------------------------------------------------------------------
@@ -309,7 +310,7 @@ MAP2NAM(list1)
 	s nams("#")=list("#)"),nams=nams+1
 	q 1
 ;----------------------------------------------------------------------------------------------------------------------------------
-add2nams:(nam,reg,type)
+add2nams(nam,reg,type)
 	; add a subscripted namespace to "nams" array
 	n nsubs,len,c,quotestate,start,i,isrange,gvnprefixoff
 	s nsubs=0,len=$zl(nam),start=1,quotestate=0,nam=$ze(nam,2,len)	; remove "^" from beginning of "nam"
@@ -437,7 +438,7 @@ gvn2gds(gvn,coll)
 	s savetrap=$etrap
 	n $etrap
 	s $etrap="goto gvsuboflowerr"
-	s key=$view("YGVN2GDS",gvn,coll)
+	s key=$zcollate(gvn,coll)
 	q key
 gvsuboflowerr
 	n len
diff --git a/sr_port/gdemsgin.m b/sr_port/gdemsgin.m
index 642dc2b..19d867d 100755
--- a/sr_port/gdemsgin.m
+++ b/sr_port/gdemsgin.m
@@ -1,6 +1,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;								;
-;	Copyright 2001, 2013 Fidelity Information Services, Inc	;
+; Copyright (c) 2001-2017 Fidelity National Information		;
+; Services, Inc. and/or its subsidiaries. All rights reserved.	;
 ;								;
 ;	This source code contains the intellectual property	;
 ;	of its copyright holder(s), and is made available	;
@@ -65,7 +66,8 @@ GDEMSGIN
 	s gdeerr("INVGBLDIR")=150503851
 	s gdeerr("WRITEERROR")=150503859
 	s gdeerr("NONASCII")=150503866
-	s gdeerr("CRYPTNOMM")=150503874
+	s gdeerr("GDECRYPTNOMM")=150503874
+	s gdeerr("GDEASYNCIONOMM")=150504106
 	s gdeerr("JNLALLOCGROW")=150503883
 	s gdeerr("KEYFORBLK")=150503891
 	s gdeerr("STRMISSQUOTE")=150503898
@@ -94,4 +96,5 @@ GDEMSGIN
 	s gdeerr("GBLNAMCOLLRANGE")=150504082
 	s gdeerr("STDNULLCOLLREQ")=150504091
 	s gdeerr("GBLNAMCOLLVER")=150504098
+	s gdeerr("NOPERCENTY")=150504114
 	q
diff --git a/sr_port/gdeparse.m b/sr_port/gdeparse.m
index 9861ef6..36d17b5 100755
--- a/sr_port/gdeparse.m
+++ b/sr_port/gdeparse.m
@@ -1,6 +1,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;								;
-;	Copyright 2010, 2013 Fidelity Information Services, Inc	;
+; Copyright (c) 2010-2017 Fidelity National Information		;
+; Services, Inc. and/or its subsidiaries. All rights reserved.	;
 ;								;
 ;	This source code contains the intellectual property	;
 ;	of its copyright holder(s), and is made available	;
@@ -63,10 +64,8 @@ TFSPECP						; scan filespec token by token
 	; first undo any whitespace that was skipped
 	f i=1:1 s c=$ze(comline,cp-i) q:(c'=" ")&(c'=TAB)
 	s cp1=cp-(i-1)-$zl(ntoken)
-	i ver'="VMS" s i=$zl(comline)-cp1+1 ; in Unix any byte is considered acceptable in the file name at the end of the line
-	i ver="VMS" f i=0:1 s c=$ze(comline,cp1+i) q:c'?@dbfilpar!'$zl(c)
+	s i=$zl(comline)-cp1+1 ; in Unix any byte is considered acceptable in the file name at the end of the line
 	s filespec=$ze(comline,cp1,cp1+i-1),cp=cp1+i
-	i ver="VMS" d skipwhitespace^GDESCAN	; in VMS, spaces at the end of the file name are not part of the file so skip them
 	q
 TACCMETH
 	d GETTOK^GDESCAN
@@ -105,6 +104,7 @@ NAME
 	s type=NAMEtype		; before GETTOK overwrites it
 	d GETTOK^GDESCAN
 	s tokname=token
+	i "%Y"=$ze(tokname,1,2) zm gdeerr("NOPERCENTY")
 	i (MAXGVSUBS<(nsubs-1-$select(type="RANGE":1,1:0))) zm gdeerr("NAMGVSUBSMAX"):tokname:MAXGVSUBS
 	; parse subscripted tokname (potentially with ranges) to ensure individual pieces are well-formatted
 	; One would be tempted to use $NAME to do automatic parsing of subscripts for well-formedness, but there are issues
@@ -123,7 +123,6 @@ NAME
 	i (j-2)>PARNAMLN zm gdeerr("VALTOOLONG"):gblname:PARNAMLN:"name"
 	i j=(len+2) s NAME("NSUBS")=0 q  ; no subscripts to process. done.
 	; have subscripts to process
-	i ver="VMS" zm gdeerr("VALUEBAD"):tokname:"name"	; currently VMS does not support subscripts in namespaces
 	i type="STAR" zm gdeerr("NAMSTARSUBSMIX"):tokname
 	i $ze(tokname,len)'=")" zm gdeerr("NAMENDBAD"):tokname
 	s NAME=NAME_"("
@@ -232,7 +231,7 @@ namerangeoverlapcheck2:(nam1,reg1,nam2,coll)
 	n keylo1,keyhi1,keylo2,keyhi2,range,reg2,maxkey,keylo1inbetween,keyhi1inbetween,overlap
 	s reg2=nam2
 	s range=nam1("GVNPREFIX")
-	i range'=nam2("GVNPREFIX") q  ; if subscripts dont match before the range, there is no chance of a range overlap issue
+	i range'=nam2("GVNPREFIX") q  ; if subscripts don't match before the range, there is no chance of a range overlap issue
 	i '$data(coll) s coll=+$g(gnams(nam1("SUBS",0),"COLLATION"))
 	d getrangelohikey(.nam1,.keylo1,.keyhi1,coll,range)
 	d getrangelohikey(.nam2,.keylo2,.keyhi2,coll,range)
@@ -299,7 +298,7 @@ chkcoll(coll,gblname,collver)
 	. . i $view("YCOLLATE",coll,ver) zm gdeerr("GBLNAMCOLLVER"):gblname:coll:collver:ver
 	q
 collundeferr
-	i $zstatus'["COLLATIONUNDEF" q  ; dont know how a non-COLLATIONUNDEF error can occur.
+	i $zstatus'["COLLATIONUNDEF" q  ; don't know how a non-COLLATIONUNDEF error can occur.
 					; let parent frame handle this like any other error
 	s $ecode=""
 	s $etrap=savetrap
@@ -428,7 +427,7 @@ SEGMENT
 	q
 prefixbaderr:(name,str)
 	n namestr
-	s namestr=$s(ver="VMS":"name (other than $DEFAULT)",1:"name")
+	s namestr="name"
 	zm gdeerr("PREFIXBAD"):name:renpref_str:namestr
 	q
 matchtok:(tok,ent)
diff --git a/sr_port/gdeshow.m b/sr_port/gdeshow.m
index f8afdff..86a0e84 100755
--- a/sr_port/gdeshow.m
+++ b/sr_port/gdeshow.m
@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;								;
-; Copyright (c) 2001-2015 Fidelity National Information 	;
+; Copyright (c) 2001-2017 Fidelity National Information		;
 ; Services, Inc. and/or its subsidiaries. All rights reserved.	;
 ;								;
 ;	This source code contains the intellectual property	;
@@ -22,7 +22,7 @@ COMMANDS
 	m tmpseg=tmpseg2
 	k tmpreg2,tmpseg2
 	s BOL="!"
-	set delim=$select("VMS"=ver:"/",1:"-")
+	set delim="-"
 	; show NAMES after GBLNAME to avoid potential NAMRANGEORDER errors in case of non-zero collation
 	i '$l($get(cfile)) d
 	. f i="@useio",$s(log:"@uself",1:"") q:'$l(i)  u @i d templatec,regionc,segmentc,gblnamec,namec
@@ -118,24 +118,27 @@ r1:	d regionhd s jnl=0,s=""
 	i jnl d jnlhd s s="" f  s s=$o(regs(s)) q:'$l(s)  i regs(s,"JOURNAL") d onejnl
 	q
 onereg:
-	w !,BOL,?x(1),s,?x(2),regs(s,"DYNAMIC_SEGMENT"),?x(3),$j(regs(s,"COLLATION_DEFAULT"),4)
-	i ver'="VMS" w ?x(4),$j(regs(s,"RECORD_SIZE"),7)
-	e  w ?x(4),$j(regs(s,"RECORD_SIZE"),5)
+	w !,BOL,?x(1),s
+	w ?x(2),regs(s,"DYNAMIC_SEGMENT")
+	w ?x(3),$j(regs(s,"COLLATION_DEFAULT"),4)
+	w ?x(4),$j(regs(s,"RECORD_SIZE"),7)
 	w ?x(5),$j(regs(s,"KEY_SIZE"),5)
 	w ?x(6),$s(regs(s,"NULL_SUBSCRIPTS")=1:"ALWAYS",regs(s,"NULL_SUBSCRIPTS")=2:"EXISTING",1:"NEVER")
 	w ?x(7),$s(regs(s,"STDNULLCOLL"):"Y",1:"N")
 	w ?x(8),$s(regs(s,"JOURNAL"):"Y",1:"N")
-	i ver'="VMS" w ?x(9),$s(regs(s,"INST_FREEZE_ON_ERROR"):"ENABLED",1:"DISABLED")
-	i ver'="VMS" w ?x(10),$s(regs(s,"QDBRUNDOWN"):"ENABLED",1:"DISABLED")
-	i ver'="VMS" w ?x(11),$s(regs(s,"EPOCHTAPER"):"ENABLED",1:"DISABLED")
+	w ?x(9),$s(regs(s,"INST_FREEZE_ON_ERROR"):"Y",1:"N")
+	w ?x(10),$s(regs(s,"QDBRUNDOWN"):"Y",1:"N")
+	w ?x(11),$s(regs(s,"EPOCHTAPER"):"Y",1:"N")
+	w ?x(12),$s(regs(s,"AUTODB"):"Y",1:"N")
+	w ?x(13),$s(regs(s,"STATS"):"Y",1:"N")
+	w ?x(14),$s(regs(s,"LOCK_CRIT"):"Sep",1:"DB")
 	q
 onejnl:
 	w !,BOL,?x(1),s,?x(2),$s($zl(regs(s,"FILE_NAME")):$$namedisp(regs(s,"FILE_NAME"),1),1:"<based on DB file-spec>")
 	i $x'<(x(3)-1) w !,BOL
 	w ?x(3),$s(regs(s,"BEFORE_IMAGE"):"Y",1:"N"),?x(4),$j(regs(s,"BUFFER_SIZE"),5)
 	w ?x(5),$j(regs(s,"ALLOCATION"),10)
-	i ver="VMS" w ?x(6),$j(regs(s,"EXTENSION"),5)
-	e  w ?x(6),$j(regs(s,"EXTENSION"),10),?x(7),$j(regs(s,"AUTOSWITCHLIMIT"),13)
+	w ?x(6),$j(regs(s,"EXTENSION"),10),?x(7),$j(regs(s,"AUTOSWITCHLIMIT"),13)
 	w !,BOL
 	q
 regionc:
@@ -214,17 +217,18 @@ oneseg:
 BG	w ?x(8),"GLOB=",$j(segs(s,"GLOBAL_BUFFER_COUNT"),4)
 	w !,BOL,?x(8),"LOCK=",$j(segs(s,"LOCK_SPACE"),4)
 	w !,BOL,?x(8),"RES =",$j(segs(s,"RESERVED_BYTES"),4)
-	; For non-encryption platforms, always show FLAG as OFF. For VMS dont even display this line
-	i $ZVersion'["VMS" w !,BOL,?x(8),"ENCR=",$S((encsupportedplat=TRUE&segs(s,"ENCRYPTION_FLAG")):"ON",1:"OFF")
+	; For non-encryption platforms, always show FLAG as OFF.
+	w !,BOL,?x(8),"ENCR=",$s((encsupportedplat=TRUE&segs(s,"ENCRYPTION_FLAG")):"  ON",1:" OFF")
 	w !,BOL,?x(8),"MSLT=",$j(segs(s,"MUTEX_SLOTS"),4)
-	w !,BOL,?x(8),"DALL=",$s(segs(s,"DEFER_ALLOCATE"):"YES",1:"NO")
+	w !,BOL,?x(8),"DALL=",$s(segs(s,"DEFER_ALLOCATE"):" YES",1:"  NO")
+	w !,BOL,?x(8),"AIO =",$s(segs(s,"ASYNCIO"):"  ON",1:" OFF")
 	q
 MM	w ?x(8),$s(segs(s,"DEFER"):"DEFER",1:"NODEFER")
 	w !,BOL,?x(8),"LOCK=",$j(segs(s,"LOCK_SPACE"),4)
 	w !,BOL,?x(8),"RES =",$j(segs(s,"RESERVED_BYTES"),4)
-	i $ZVersion'["VMS" w !,BOL,?x(8),"ENCR=OFF"
+	w !,BOL,?x(8),"ENCR= OFF"
 	w !,BOL,?x(8),"MSLT=",$j(segs(s,"MUTEX_SLOTS"),4)
-	w !,BOL,?x(8),"DALL=",$s(segs(s,"DEFER_ALLOCATE"):"YES",1:"NO")
+	w !,BOL,?x(8),"DALL=",$s(segs(s,"DEFER_ALLOCATE"):" YES",1:"  NO")
 	q
 segmentc:
 	n s,q,val,synval,tmpval,type,am
@@ -281,42 +285,53 @@ TEMPLATE
 	i log s BOL="!" u @uself w BOL d t1 w ! u @useio s BOL=""
 	q
 t1:	d tmpreghd
-	w !,BOL,?x(1),"<default>",?x(3),$j(tmpreg("COLLATION_DEFAULT"),4)
-	i ver'="VMS" w ?x(4),$j(tmpreg("RECORD_SIZE"),7)
-	e  w ?x(4),$j(tmpreg("RECORD_SIZE"),5)
+	w !,BOL,?x(1),"<default>"
+	w ?x(3),$j(tmpreg("COLLATION_DEFAULT"),4)
+	w ?x(4),$j(tmpreg("RECORD_SIZE"),7)
 	w ?x(5),$j(tmpreg("KEY_SIZE"),5)
 	w ?x(6),$s(tmpreg("NULL_SUBSCRIPTS")=1:"ALWAYS",tmpreg("NULL_SUBSCRIPTS")=2:"EXISTING",1:"NEVER")
 	w ?x(7),$s(tmpreg("STDNULLCOLL"):"Y",1:"N")
 	w ?x(8),$s(tmpreg("JOURNAL"):"Y",1:"N")
-	i ver'="VMS" w ?x(9),$s(tmpreg("INST_FREEZE_ON_ERROR"):"ENABLED",1:"DISABLED")
-	i ver'="VMS" w ?x(10),$s(tmpreg("QDBRUNDOWN"):"ENABLED",1:"DISABLED")
-	i ver'="VMS" w ?x(11),$s(tmpreg("EPOCHTAPER"):"ENABLED",1:"DISABLED")
+	w ?x(9),$s(tmpreg("INST_FREEZE_ON_ERROR"):"Y",1:"N")
+	w ?x(10),$s(tmpreg("QDBRUNDOWN"):"Y",1:"N")
+	w ?x(11),$s(tmpreg("EPOCHTAPER"):"Y",1:"N")
+	w ?x(12),$s(tmpreg("AUTODB"):"Y",1:"N")
+	w ?x(13),$s(tmpreg("STATS"):"Y",1:"N")
+	w ?x(14),$s(tmpreg("LOCK_CRIT"):"Sep",1:"DB")
 	i tmpreg("JOURNAL") d tmpjnlhd,tmpjnlbd
 	d tmpseghd
-	w !,BOL,?x(1),"<default>",?x(2),$s(tmpacc="BG":"  *",1:""),?x(3),"BG"
-	w ?x(4),$s(tmpseg("BG","FILE_TYPE")="DYNAMIC":"DYN",1:"STA"),?x(5),$j(tmpseg("BG","BLOCK_SIZE"),5)
-	w ?x(6),$j(tmpseg("BG","ALLOCATION"),10),?x(7),$j(tmpseg("BG","EXTENSION_COUNT"),5)
-	w ?x(8),"GLOB =",$j(tmpseg("BG","GLOBAL_BUFFER_COUNT"),3)
-	w !,BOL,?x(8),"LOCK =",$j(tmpseg("BG","LOCK_SPACE"),3)
+	w !,BOL,?x(1),"<default>"
+	w ?x(2),$s(tmpacc="BG":"  *",1:"")
+	w ?x(3),"BG"
+	w ?x(4),$s(tmpseg("BG","FILE_TYPE")="DYNAMIC":"DYN",1:"STA")
+	w ?x(5),$j(tmpseg("BG","BLOCK_SIZE"),5)
+	w ?x(6),$j(tmpseg("BG","ALLOCATION"),10)
+	w ?x(7),$j(tmpseg("BG","EXTENSION_COUNT"),5)
+	w ?x(8),"GLOB =",$j(tmpseg("BG","GLOBAL_BUFFER_COUNT"),4)
+	w !,BOL,?x(8),"LOCK =",$j(tmpseg("BG","LOCK_SPACE"),4)
 	w !,BOL,?x(8),"RES  =",$j(tmpseg("BG","RESERVED_BYTES"),4)
-	i $ZVersion'["VMS" w !,BOL,?x(8),"ENCR = ",$s((encsupportedplat=TRUE&tmpseg("BG","ENCRYPTION_FLAG")):"ON",1:"OFF")
+	w !,BOL,?x(8),"ENCR =",$s((encsupportedplat=TRUE&tmpseg("BG","ENCRYPTION_FLAG")):"  ON",1:" OFF")
 	w !,BOL,?x(8),"MSLT =",$j(tmpseg("BG","MUTEX_SLOTS"),4)
-	w !,BOL,?x(8),"DALL=",$s(tmpseg("BG","DEFER_ALLOCATE"):"YES",1:"NO")
-	w !,BOL,?x(1),"<default>",?x(2),$s(tmpacc="MM":"   *",1:""),?x(3),"MM"
-	w ?x(4),$s(tmpseg("MM","FILE_TYPE")="DYNAMIC":"DYN",1:"STA"),?x(5),$j(tmpseg("MM","BLOCK_SIZE"),5)
-	w ?x(6),$j(tmpseg("MM","ALLOCATION"),10),?x(7),$j(tmpseg("MM","EXTENSION_COUNT"),5)
+	w !,BOL,?x(8),"DALL =",$s(tmpseg("BG","DEFER_ALLOCATE"):" YES",1:"  NO")
+	w !,BOL,?x(8),"AIO  =",$s(tmpseg("BG","ASYNCIO"):"  ON",1:" OFF")
+	w !,BOL,?x(1),"<default>"
+	w ?x(2),$s(tmpacc="MM":"   *",1:"")
+	w ?x(3),"MM"
+	w ?x(4),$s(tmpseg("MM","FILE_TYPE")="DYNAMIC":"DYN",1:"STA")
+	w ?x(5),$j(tmpseg("MM","BLOCK_SIZE"),5)
+	w ?x(6),$j(tmpseg("MM","ALLOCATION"),10)
+	w ?x(7),$j(tmpseg("MM","EXTENSION_COUNT"),5)
 	w ?x(8),$s(tmpseg("MM","DEFER"):"DEFER",1:"NODEFER")
-	w !,BOL,?x(8),"LOCK =",$j(tmpseg("MM","LOCK_SPACE"),3)
-	w !,BOL,?x(8),"MSLT =",$j(tmpseg("MM","MUTEX_SLOTS"),3)
-	w !,BOL,?x(8),"DALL=",$s(tmpseg("MM","DEFER_ALLOCATE"):"YES",1:"NO")
+	w !,BOL,?x(8),"LOCK =",$j(tmpseg("MM","LOCK_SPACE"),4)
+	w !,BOL,?x(8),"MSLT =",$j(tmpseg("MM","MUTEX_SLOTS"),4)
+	w !,BOL,?x(8),"DALL =",$s(tmpseg("MM","DEFER_ALLOCATE"):" YES",1:"  NO")
 	q
 tmpjnlbd:
 	w !,BOL,?x(1),"<default>",?x(2),$s($zl(tmpreg("FILE_NAME")):$$namedisp(tmpreg("FILE_NAME"),1),1:"<based on DB file-spec>")
 	i $x'<(x(3)-1) w !,BOL
 	w ?x(3),$s(tmpreg("BEFORE_IMAGE"):"Y",1:"N"),?x(4),$j(tmpreg("BUFFER_SIZE"),5)
 	w ?x(5),$j(tmpreg("ALLOCATION"),10)
-	i ver="VMS" w ?x(6),$j(tmpreg("EXTENSION"),5)
-	e  w ?x(6),$j(tmpreg("EXTENSION"),10),?x(7),$j(tmpreg("AUTOSWITCHLIMIT"),13)
+	w ?x(6),$j(tmpreg("EXTENSION"),10),?x(7),$j(tmpreg("AUTOSWITCHLIMIT"),13)
 	w !,BOL
 	q
 templatec:
@@ -423,37 +438,43 @@ gblnamehd:
 	q
 regionhd:
 	s x(0)=32,x(1)=1,x(2)=33,x(3)=65,x(4)=71
-	i ver'="VMS" s x(5)=79,x(6)=85,x(7)=96,x(8)=101,x(9)=105,x(10)=114,x(11)=123
-	e  s x(5)=77,x(6)=83,x(7)=94,x(8)=104
+	s x(5)=79,x(6)=85,x(7)=95,x(8)=100,x(9)=104,x(10)=111,x(11)=117,x(12)=123,x(13)=130,x(14)=136,x(15)=141
 	w !,BOL,!,BOL,?x(0),"*** REGIONS ***"
 	w !,BOL,?x(7),"Std"
-	i ver'="VMS" w ?x(9),"Inst"
-	w !,BOL,?x(2),"Dynamic",?x(3),$j("Def",4)
-	i ver'="VMS" w ?x(4),$j("Rec",7)
-	e  w ?x(4),$j("Rec",5)
-	w ?x(5),$j("Key",5),?x(6),"Null",?x(7),"Null"
-	i ver'="VMS" w ?x(9),"Freeze"
-	i ver'="VMS" w ?x(10),"Qdb"
-	i ver'="VMS" w ?x(11),"Epoch"
-	w !,BOL,?x(1),"Region",?x(2),"Segment",?x(3),$j("Coll",4)
-	if ver'="VMS" w ?x(4),$j("Size",7)
-	e  w ?x(4),$j("Size",5)
-	w ?x(5),$j("Size",5)
-	w ?x(6),"Subs",?x(7),"Coll",?x(8),"Jnl"
-	i ver'="VMS" w ?x(9),"on Error"
-	i ver'="VMS" w ?x(10),"Rndwn"
-	i ver'="VMS" w ?x(11),"Taper"
-	i ver'="VMS" w !,BOL,?x(1),$tr($j("",130)," ","-")
-	e  w !,BOL,?x(1),$tr($j("",107)," ","-")
+	w ?x(9),"Inst"
+	w !,BOL,?x(2),"Dynamic",?x(3)," Def"
+	w ?x(4),"    Rec"
+	w ?x(5),"  Key"
+	w ?x(6),"Null"
+	w ?x(7),"Null"
+	w ?x(9),"Freeze"
+	w ?x(10),"Qdb"
+	w ?x(11),"Epoch"
+	w ?x(14),"LOCK"
+	w !,BOL
+	w ?x(1),"Region"
+	w ?x(2),"Segment"
+	w ?x(3),"Coll"
+	w ?x(4),"   Size"
+	w ?x(5)," Size"
+	w ?x(6),"Subs"
+	w ?x(7),"Coll"
+	w ?x(8),"Jnl"
+	w ?x(9),"on Err"
+	w ?x(10),"Rndwn"
+	w ?x(11),"Taper"
+	w ?x(12),"AutoDB"
+	w ?x(13),"Stats"
+	w ?x(14),"Crit"
+	w !,BOL,?x(1),$tr($j("",139)," ","-")
 	q
 jnlhd:
-	s x(0)=26,x(1)=1,x(2)=33,x(3)=59,x(4)=65,x(5)=71,x(6)=82,x(7)=$s(ver="VMS":88,1:91)
+	s x(0)=26,x(1)=1,x(2)=33,x(3)=59,x(4)=65,x(5)=71,x(6)=82,x(7)=91
 	w !,BOL,!,BOL,?x(0),"*** JOURNALING INFORMATION ***"
 	w !,BOL,?x(1),"Region",?x(2),"Jnl File (def ext: .mjl)"
 	w ?x(3),"Before",?x(4),$j("Buff",5),?x(5),$j("Alloc",10)
-	i ver="VMS" w ?x(6),"Exten" 									;?x(7),"Stop"
-	e  w ?x(6),$j("Exten",10),?x(7),$j("AutoSwitch",13)
-	w !,BOL,?x(1),$tr($j("",$s(ver="VMS":87,1:104))," ","-")
+	w ?x(6),$j("Exten",10),?x(7),$j("AutoSwitch",13)
+	w !,BOL,?x(1),$tr($j("",104)," ","-")
 	q
 seghd:
 	s x(0)=32,x(1)=1,x(2)=33,x(3)=53,x(4)=57,x(5)=61,x(6)=67,x(7)=78,x(8)=84
@@ -472,38 +493,42 @@ maphd:
 	w !,BOL,?x(1),$tr($j("",$s(x(3)=66:122,1:x(3)+38))," ","-")
 	q
 tmpreghd:
-	s x(0)=31,x(1)=1,x(2)=19,x(3)=44,x(4)=49
-	i ver'="VMS" s x(5)=57,x(6)=63,x(7)=74,x(8)=79,x(9)=83,x(10)=92,x(11)=101
-	e  s x(5)=55,x(6)=61,x(7)=72,x(8)=82
+	s x(0)=32,x(1)=1,x(2)=19,x(3)=44,x(4)=50
+	s x(5)=58,x(6)=64,x(7)=74,x(8)=79,x(9)=83,x(10)=90,x(11)=96,x(12)=102,x(13)=109,x(14)=115,x(15)=120
 	w !,BOL,!,BOL,?x(0),"*** TEMPLATES ***"
 	w !,BOL,?x(7),"Std"
-	i ver'="VMS" w ?x(9),"Inst"
-	w !,BOL,?x(3),$j("Def",4)
-	i ver'="VMS" w ?x(4),$j("Rec",7)
-	e  w ?x(4),$j("Rec",5)
-	w ?x(5),$j("Key",5),?x(6),"Null",?x(7),"Null"
-	i ver'="VMS" w ?x(9),"Freeze"
-	i ver'="VMS" w ?x(10),"Qdb"
-	i ver'="VMS" w ?x(11),"Epoch"
-	w !,BOL,?x(1),"Region",?x(3),$j("Coll",4)
-	i ver'="VMS" w ?x(4),$j("Size",7)
-	e  w ?x(4),$j("Size",5)
+	w ?x(9),"Inst"
+	w !,BOL
+	w ?x(3),$j("Def",4)
+	w ?x(4),$j("Rec",7)
+	w ?x(5),$j("Key",5)
+	w ?x(6),"Null"
+	w ?x(7),"Null"
+	w ?x(9),"Freeze"
+	w ?x(10),"Qdb"
+	w ?x(11),"Epoch"
+	w ?x(14),"LOCK"
+	w !,BOL,?x(1),"Region"
+	w ?x(3),$j("Coll",4)
+	w ?x(4),$j("Size",7)
 	w ?x(5),$j("Size",5)
-	w ?x(6),"Subs",?x(7),"Coll",?x(8),"Jnl"
-	i ver'="VMS" w ?x(9),"on Error"
-	i ver'="VMS" w ?x(10),"Rndwn"
-	i ver'="VMS" w ?x(11),"Taper"
-	i ver'="VMS" w !,BOL,?x(1),$tr($j("",107)," ","-")
-	e  w !,BOL,?x(1),$tr($j("",85)," ","-")
+	w ?x(6),"Subs"
+	w ?x(7),"Coll"
+	w ?x(8),"Jnl"
+	w ?x(9),"on Err"
+	w ?x(10),"Rndwn"
+	w ?x(11),"Taper"
+	w ?x(12),"AutoDB"
+	w ?x(13),"Stats"
+	w ?x(14),"Crit"
+	w !,BOL,?x(1),$tr($j("",118)," ","-")
 	q
 tmpjnlhd:
 	s x(0)=26,x(1)=1,x(2)=18,x(3)=44,x(4)=51,x(5)=57,x(6)=68,x(7)=74
 	w !,BOL,?x(2),"Jnl File (def ext: .mjl)"
 	w ?x(3),"Before",?x(4),$j("Buff",5),?x(5),$j("Alloc",10)
-	i ver="VMS" w ?x(6),"Exten"
-	e  w ?x(6),$j("Exten",10),?x(7),$j("AutoSwitch",13)
-	i ver="VMS" w !,BOL,?x(1),$tr($j("",78)," ","-")
-	e  w !,BOL,?x(1),$tr($j("",90)," ","-")
+	w ?x(6),$j("Exten",10),?x(7),$j("AutoSwitch",13)
+	w !,BOL,?x(1),$tr($j("",90)," ","-")
 	q
 tmpseghd:
 	s x(0)=32,x(1)=1,x(2)=18,x(3)=38,x(4)=42,x(5)=46,x(6)=52,x(7)=63,x(8)=69
@@ -588,7 +613,7 @@ mapdispcalc:
 	. s gblname=$ze(m,1,offset-2),coll=+$g(gnams(gblname,"COLLATION")),mlen=$zl(m)
 	. s isplusplus=$$isplusplus^GDEMAP(m,mlen)
 	. s mtmp=$s(isplusplus:$ze(m,1,mlen-1),1:m)  ; if ++ type map entry, remove last 01 byte before converting it into gvn
-	. s name=$view("YGDS2GVN",mtmp_ZERO_ZERO,coll)
+	. s name=$zcollate(mtmp_ZERO_ZERO,coll,1)
 	. i isplusplus s name=name_"++"
 	. s namelen=$zl(name),name=$ze(name,2,namelen) ; remove '^' at start of name
 	. s namedisp=$$namedisp(name,0)
diff --git a/sr_port/gds_blk_downgrade.c b/sr_port/gds_blk_downgrade.c
index 43b2b7a..0b9fa68 100755
--- a/sr_port/gds_blk_downgrade.c
+++ b/sr_port/gds_blk_downgrade.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2005, 2009 Fidelity Information Services, Inc	*
+ * Copyright (c) 2005-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -27,9 +28,6 @@
 #include "iottdef.h"
 #include "iomtdef.h"
 #include "gds_blk_downgrade.h"
-#ifdef VMS
-#include "copy.h"
-#endif
 
 #define SPACE_NEEDED (SIZEOF(blk_hdr) - SIZEOF(v15_blk_hdr))
 
@@ -44,18 +42,26 @@ void gds_blk_downgrade(v15_blk_hdr_ptr_t gds_blk_trg, blk_hdr_ptr_t gds_blk_src)
 	int		movesize;
 
 	/* Note that this routine is written in such a fashion that it is possible for the
-	   source and target blocks to point to the same area.
-	*/
+	 * source and target blocks to point to the same area.
+	 */
 	assert(gds_blk_trg);
 	assert(gds_blk_src);
-	assert(SIZEOF(v15_blk_hdr) > gds_blk_src->bver);	/* Check it is a GDSVCURR blk to begin with */
+	bsiz = gds_blk_src->bsiz;
+	assert(MAX_BLK_SZ >= bsiz);
+	if (SIZEOF(blk_hdr) > bsiz)
+	{	/* Input block size is lower than this function can handle. Return right away.
+		 * See comment in wcs_wtstart.c against similar assert (as below) for when this is possible.
+		 */
+		assert(0 == bsiz);
+		assert(gtm_white_box_test_case_enabled
+			&& (WBTEST_CRASH_SHUTDOWN_EXPECTED == gtm_white_box_test_case_number));
+		return;
+	}
+	assert(GDSVCURR == gds_blk_src->bver);
 	assert(0 == ((long)gds_blk_trg & 0x7));			/* Buffer alignment checks (8 byte) */
 	assert(0 == ((long)gds_blk_src & 0x7));
 	trg_p = (sm_uc_ptr_t)gds_blk_trg + SIZEOF(v15_blk_hdr);
 	src_p = (sm_uc_ptr_t)gds_blk_src + SIZEOF(blk_hdr);
-	bsiz = gds_blk_src->bsiz;
-	assert(MAX_BLK_SZ >= bsiz);
-	assert(SIZEOF(blk_hdr) <= bsiz);
 	tn = gds_blk_src->tn;
 	assert((MAX_TN_V4 >= tn) || dse_running);
 	levl = gds_blk_src->levl;
@@ -78,6 +84,5 @@ void gds_blk_downgrade(v15_blk_hdr_ptr_t gds_blk_trg, blk_hdr_ptr_t gds_blk_src)
 	gds_blk_trg->bsiz = bsiz - SPACE_NEEDED;
 	gds_blk_trg->levl = levl;
 	v15tn = (v15_trans_num) tn;
-	UNIX_ONLY(gds_blk_trg->tn = v15tn);
-	VMS_ONLY(PUT_ULONG(&gds_blk_trg->tn, v15tn));
+	gds_blk_trg->tn = v15tn;
 }
diff --git a/sr_port/gds_map_moved.c b/sr_port/gds_map_moved.c
index d93a362..d2b101b 100755
--- a/sr_port/gds_map_moved.c
+++ b/sr_port/gds_map_moved.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -27,19 +27,20 @@
 #include "gds_map_moved.h"
 #include "hashtab_mname.h"
 
+GBLREF gd_region		*gv_cur_region;
 GBLREF	sgmnt_addrs		*cs_addrs;
 GBLREF	sgmnt_data_ptr_t	cs_data;
 GBLREF	gv_namehead             *gv_target_list;
 
-
 void gds_map_moved(sm_uc_ptr_t new_base, sm_uc_ptr_t old_base, sm_uc_ptr_t old_top, size_t mmap_sz)
 {
 	int		hist_index;
 	sm_long_t	adj;
 	srch_hist	*hist, *hist1, *hist2;
+	gd_region	*baseDBreg, *reg;
 	gv_namehead	*gvt;
-	sgmnt_addrs	*csa;
-	sm_uc_ptr_t	buffaddr;
+	sgmnt_addrs	*baseDBcsa, *csa;
+	sm_uc_ptr_t	buffaddr, gvstats_rec_p;
 
 	csa = cs_addrs;
 	assert(csa->now_crit);
@@ -80,5 +81,22 @@ void gds_map_moved(sm_uc_ptr_t new_base, sm_uc_ptr_t old_base, sm_uc_ptr_t old_t
 			}
 		}
 	}
+	reg = gv_cur_region;
+	assert(&FILE_INFO(reg)->s_addrs == csa);
+	if (IS_STATSDB_REGNAME(reg))
+	{	/* This is a statsdb. Adjust the baseDB's gvstats_rec_p pointer to the stats record in this statsdb */
+		STATSDBREG_TO_BASEDBREG(reg, baseDBreg);
+		assert(baseDBreg->open);
+		if (baseDBreg->open)	/* be safe in pro even though we have an assert above */
+		{
+			baseDBcsa = &FILE_INFO(baseDBreg)->s_addrs;
+			gvstats_rec_p = (sm_uc_ptr_t)baseDBcsa->gvstats_rec_p;
+			if ((old_base <= gvstats_rec_p) && (old_top > gvstats_rec_p))
+			{
+				gvstats_rec_p += adj;
+				baseDBcsa->gvstats_rec_p = (gvstats_rec_t *)gvstats_rec_p;
+			}
+		}
+	}
 	return;
 }
diff --git a/sr_port/gds_rundown.h b/sr_port/gds_rundown.h
old mode 100755
new mode 100644
index f7553b3..b4165dc
--- a/sr_port/gds_rundown.h
+++ b/sr_port/gds_rundown.h
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -13,15 +13,17 @@
 #ifndef GDS_RUNDOWN_INCLUDED
 #define GDS_RUNDOWN_INCLUDED
 
-#ifdef UNIX
-int4 gds_rundown(void);
+#define	CLEANUP_UDI_FALSE	FALSE
+#define	CLEANUP_UDI_TRUE	TRUE
+
+int4 gds_rundown(boolean_t cleanup_udi);
 
 #define CAN_BYPASS(SEMVAL, CSD, INST_IS_FROZEN)										\
-	(INST_IS_FROZEN													\
+	(INST_IS_FROZEN || FROZEN_CHILLED(CSD)										\
 		|| (IS_GTM_IMAGE && CSD->mumps_can_bypass && (PROC_FACTOR * (num_additional_processors + 1) < SEMVAL))	\
 		|| (((2 * DB_COUNTER_SEM_INCR) < SEMVAL) && (IS_LKE_IMAGE || IS_DSE_IMAGE)))
 
-#define CANCEL_DB_TIMERS(region, csa, cancelled_timer, cancelled_dbsync_timer)	\
+#define CANCEL_DB_TIMERS(region, csa, cancelled_dbsync_timer)			\
 {										\
 	if (csa->timer)								\
 	{									\
@@ -31,7 +33,7 @@ int4 gds_rundown(void);
 			DECR_CNT(&csa->nl->wcs_timers, &csa->nl->wc_var_lock);	\
 			REMOVE_WT_PID(csa);					\
 		}								\
-		cancelled_timer = TRUE;						\
+		csa->canceled_flush_timer = TRUE;				\
 		csa->timer = FALSE;						\
 	}									\
 	if (csa->dbsync_timer)							\
@@ -48,8 +50,4 @@ int4 gds_rundown(void);
 #	define PROC_FACTOR	20
 #endif
 
-#else
-void gds_rundown(void);
-#endif
-
 #endif /* GDS_RUNDOWN_INCLUDED */
diff --git a/sr_port/gdsbgtr.h b/sr_port/gdsbgtr.h
index ed25755..0d8ef91 100755
--- a/sr_port/gdsbgtr.h
+++ b/sr_port/gdsbgtr.h
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2005, 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2005-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -18,7 +19,6 @@
  * for trends from these numbers anyway, not exact counts.
  */
 
-
 #define BG_TRACE_PRO_ANY(C, X)	{C->hdr->X##_cntr++; C->hdr->X##_tn = C->hdr->trans_hist.curr_tn ;}
 #define BG_TRACE_PRO(Q) 	BG_TRACE_PRO_ANY(cs_addrs, Q)
 
diff --git a/sr_port/gdsblk.h b/sr_port/gdsblk.h
index 96613be..ce9b54f 100755
--- a/sr_port/gdsblk.h
+++ b/sr_port/gdsblk.h
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -40,7 +40,6 @@
 #define MIN_EXTN_COUNT          0
 #define	MAX_DB_BLK_SIZE		((1 << 16) - 512)	/* 64Kb - 512 (- 512 to take care of VMS's max I/O capabilities) */
 
-
 /* Note: EVAL_CMPC not to be confused with the previously existing GET_CMPC macro in mu_reorg.h!
  * The maximum key size in V5 was 255 bytes, including the two null bytes at the end. Two distinct keys
  * could have a common prefix of at most 252.The 255 limit was imposed because the record header was
diff --git a/sr_port/gdsbml.h b/sr_port/gdsbml.h
index 00f05c8..1618ed1 100755
--- a/sr_port/gdsbml.h
+++ b/sr_port/gdsbml.h
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -64,7 +65,6 @@
 
 #define NO_FREE_SPACE		-1
 
-/* MAP_RD_FAIL is hard coded into the file BML_GET_FREE.MAR */
 #define MAP_RD_FAIL		-2
 #define EXTEND_SUSPECT		-3
 #define FILE_EXTENDED		-4
diff --git a/sr_port/gdsbt.h b/sr_port/gdsbt.h
index eb804fa..af5cd81 100644
--- a/sr_port/gdsbt.h
+++ b/sr_port/gdsbt.h
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -214,6 +214,45 @@ typedef struct
 	uint4		cycle;
 } dskread_trace;
 
+enum wcs_ops_trace_t
+{
+	wcs_ops_flu1,
+	wcs_ops_flu2,
+	wcs_ops_flu3,
+	wcs_ops_flu4,
+	wcs_ops_flu5,
+	wcs_ops_flu6,
+	wcs_ops_flu7,
+	wcs_ops_wtstart1,
+	wcs_ops_wtstart2,
+	wcs_ops_wtstart3,
+	wcs_ops_wtstart4,
+	wcs_ops_wtstart5,
+	wcs_ops_wtstart6,
+	wcs_ops_wtstart7,
+	wcs_ops_wtstart8,
+	wcs_ops_wtfini1,
+	wcs_ops_wtfini2,
+	wcs_ops_wtfini3,
+	wcs_ops_wtfini4,
+	wcs_ops_getspace1
+};
+
+typedef struct
+{
+	trans_num		db_tn;
+	uint4			process_id;
+	uint4			wc_in_free;
+	uint4			wcs_active_lvl;
+	uint4			wcs_wip_lvl;
+	enum wcs_ops_trace_t	type;
+	block_id		blk;
+	sm_off_t		cr_off;
+	trans_num		cr_dirty;
+	uint4			detail1;
+	uint4			detail2;
+} wcs_ops_trace_t;
+
 #define OP_LOCK_SIZE	4
 
 /* Structure to hold lock history */
@@ -239,7 +278,8 @@ typedef struct
 	trans_num       cr_tn;
 } ftokhist;
 
-#define	DSKREAD_OPS_ARRAY_SIZE	 512
+#define	DSKREAD_OPS_ARRAY_SIZE		 512
+#define	WCS_OPS_ARRAY_SIZE		1024
 #define	CRIT_OPS_ARRAY_SIZE		 512
 #define	LOCKHIST_ARRAY_SIZE		 512
 #define	SECSHR_OPS_ARRAY_SIZE		1023		/* 1 less than 1K to accommodate the variable secshr_ops_index */
@@ -549,6 +589,10 @@ typedef struct node_local_struct
 	CACHELINE_PAD(4, 8)
 	volatile CNTR4DCL(wcs_phase2_commit_pidcnt, 7);		/* number of processes actively finishing phase2 commit */
 	CACHELINE_PAD(4, 9)
+	volatile CNTR4DCL(wcs_wip_lvl, 8);			/* number of entries in wip queue */
+	CACHELINE_PAD(4, 10)
+	volatile int4	wtfini_in_prog;				/* whether wcs_wtfini() is in progress at this time */
+	boolean_t	freezer_waited_for_kip;			/* currently used only in dbg code */
 	int4            mm_extender_pid;			/* pid of the process executing gdsfilext in MM mode */
 	int4            highest_lbm_blk_changed;                /* Records highest local bit map block that
 									changed so we know how much of master bit
@@ -558,9 +602,12 @@ typedef struct node_local_struct
 	int4		crit_ops_index;				/* "circular" index into crit_ops_array */
 	int4		dskread_ops_index;			/* "circular" index into dskread_ops_array */
 	int4		ftok_ops_index;				/* "circular" index into ftok_ops_array */
+	int4		wcs_ops_index;				/* "circular" index into wcs_ops_array */
+	NON_GTM64_ONLY(int4 filler_8byte_align2;) /* To align the following member at an 8-byte boundary on 32-bit platforms */
 	lockhist	lockhists[LOCKHIST_ARRAY_SIZE];		/* Keep lock histories here */
 	crit_trace	crit_ops_array[CRIT_OPS_ARRAY_SIZE];	/* space for CRIT_TRACE macro to record info */
 	dskread_trace	dskread_ops_array[DSKREAD_OPS_ARRAY_SIZE];	/* space for DSKREAD_TRACE macro to record info */
+	wcs_ops_trace_t	wcs_ops_array[WCS_OPS_ARRAY_SIZE];	/* space for WCS_OPS_TRACE macro to record info */
 	unique_file_id	unique_id;
 	uint4		owner_node;
 	volatile int4   wcsflu_pid;				/* pid of the process executing wcs_flu in BG mode */
@@ -579,13 +626,15 @@ typedef struct node_local_struct
 			 */
 	boolean_t	donotflush_dbjnl; /* whether database and journal can be flushed to disk or not (TRUE for mupip recover) */
 	int4		n_pre_read;
-	char		replinstfilename[MAX_FN_LEN + 1];/* 256 : Name of the replication instance file corresponding to this db.
-							  *       In VMS, this is the name of the corresponding global directory.
-							  */
+	char		replinstfilename[MAX_FN_LEN + 1];/* 256 : Name of the replication instance file corresponding to this db */
+	char		statsdb_fname[MAX_FN_LEN + 1];	/* Is empty-string if IS_RDBF_STATSDB(csd) is FALSE.
+							 * Is name of the statsdb corresponding to this basedb otherwise.
+							 */
 	int4		secshr_ops_index;
 	gtm_uint64_t	secshr_ops_array[SECSHR_OPS_ARRAY_SIZE]; /* taking up 8K */
 	gvstats_rec_t	gvstats_rec;
 	trans_num	last_wcsflu_tn;			/* curr_tn when last wcs_flu was done on this database */
+	trans_num	last_wcs_recover_tn;		/* csa->ti->curr_tn of most recent "wcs_recover" */
 	sm_off_t	encrypt_glo_buff_off;	/* offset from unencrypted global buffer to its encrypted counterpart */
 	global_latch_t	snapshot_crit_latch;	/* To be acquired by any process that wants to clean up an orphaned snapshot or
 						 * initiate a new snapshot
@@ -597,7 +646,7 @@ typedef struct node_local_struct
 	boolean_t	snapshot_in_prog;	 /* Tells GT.M if any snapshots are in progress */
 	uint4		num_snapshots_in_effect; /* how many snapshots are currently in place for this region */
 	uint4		wbox_test_seq_num;	 /* used to coordinate with sequential testing steps */
-	NON_GTM64_ONLY(int4 filler_8byte_align;) /* To align the following member at an 8-byte boundary on 32-bit platforms */
+	NON_GTM64_ONLY(int4 filler_8byte_align3;) /* To align the following member at an 8-byte boundary on 32-bit platforms */
 	uint4		kip_pid_array[MAX_KIP_PID_SLOTS];	/* Processes actively doing kill (0 denotes empty slots) */
 	gtm_uint64_t	sec_size;	/* Upon going to larger shared memory sizes, we realized that this does not	*/
 					/* need	to be in the file header but the node local since it can be calculated	*/
@@ -651,29 +700,88 @@ typedef struct node_local_struct
 	boolean_t	first_nonbypas_writer_seen;	/* TRUE when first writer is seen that also does not bypass ftok/access */
 	boolean_t	ftok_counter_halted;		/* The ftok semaphore counter reached 32K at some point in time */
 	boolean_t	access_counter_halted;		/* The access semaphore counter reached 32K at some point in time */
-	uint4		filler_8byte_align1;
+	boolean_t	statsdb_created;		/* TRUE if a statsdb has been created for this basedb */
+	uint4		statsdb_fname_len;		/* length of "cnl->statsdb_fname" */
+	boolean_t	statsdb_rundown_clean;		/* TRUE if statsdb "gds_rundown"/"mu_rndwn_file" was clean.
+							 *      This means statsdb file can be removed on a clean basedb rundown.
+							 */
 #	ifdef GTM_CRYPT_UPDATES_REPORT
 	blk_info	blk_infos[BLK_INFO_ARRAY_SIZE];
 	uint4		blk_info_cnt;
-	int4		filler_8byte_align2;
+	int4		filler_8byte_align5;
 #	endif
+	global_latch_t	freeze_latch;		/* Protect freeze/freeze_online field updates */
+	gtm_uint64_t	wcs_buffs_freed; /* this is a count of the number of buffers transitioned to the free "queue" */
+	volatile gtm_uint64_t	dskspace_next_fire;
+	global_latch_t	lock_crit;		/* mutex for LOCK processing */
+	volatile block_id	tp_hint;
+	int4		filler_8byte_align6;
 } node_local;
 
+#define	COPY_STATSDB_FNAME_INTO_STATSREG(statsDBreg, statsDBfname, statsDBfname_len)				\
+MBSTART {													\
+	unsigned int		fnameLen;									\
+														\
+	assert(ARRAYSIZE(statsDBreg->dyn.addr->fname) >= ARRAYSIZE(statsDBfname));				\
+	fnameLen = MIN(statsDBfname_len, ARRAYSIZE(statsDBreg->dyn.addr->fname) - 1);				\
+	assert('\0' == statsDBfname[fnameLen]);									\
+	memcpy(statsDBreg->dyn.addr->fname, statsDBfname, fnameLen + 1);	/* copy trailing '\0' too */	\
+	statsDBreg->dyn.addr->fname_len = fnameLen;								\
+} MBEND
+
+#define	COPY_BASEDB_FNAME_INTO_STATSDB_HDR(statsDBreg, baseDBreg, statsDBcsd)						\
+MBSTART {														\
+	unsigned int		fname_len;										\
+															\
+	assert(IS_STATSDB_REG(statsDBreg));										\
+	assert(ARRAYSIZE(baseDBreg->dyn.addr->fname) <= ARRAYSIZE(statsDBcsd->basedb_fname));				\
+	fname_len = MIN(baseDBreg->dyn.addr->fname_len, ARRAYSIZE(baseDBreg->dyn.addr->fname) - 1);			\
+	assert(fname_len);												\
+	assert('\0' == baseDBreg->dyn.addr->fname[fname_len]);								\
+	memcpy(statsDBcsd->basedb_fname, baseDBreg->dyn.addr->fname, fname_len + 1);	/* copy trailing '\0' too */	\
+	statsDBcsd->basedb_fname_len = fname_len;									\
+} MBEND
+
+#define	UNLINK_STATSDB_AT_BASEDB_RUNDOWN(CNL)										\
+MBSTART {														\
+	if (CNL->statsdb_created && CNL->statsdb_rundown_clean)								\
+	{														\
+		assert(CNL->statsdb_fname_len);	/* "gvcst_init" would not have set CNL->statsdb_created otherwise */	\
+		assert('\0' == CNL->statsdb_fname[CNL->statsdb_fname_len]);						\
+		rc = UNLINK(CNL->statsdb_fname);									\
+		/* If error removing statsdb, ignore as we want to continue rundown of basedb (more important) */	\
+		CNL->statsdb_created = FALSE;										\
+	}														\
+} MBEND
+
+#define ADD_ENT_TO_ACTIVE_QUE_CNT(CNL)		(INCR_CNT((sm_int_ptr_t)(&CNL->wcs_active_lvl),			\
+								(sm_global_latch_ptr_t)(&CNL->wc_var_lock)))
+#define SUB_ENT_FROM_ACTIVE_QUE_CNT(CNL)	(DECR_CNT((sm_int_ptr_t)(&CNL->wcs_active_lvl),			\
+								(sm_global_latch_ptr_t)(&CNL->wc_var_lock)))
+#define ADD_ENT_TO_WIP_QUE_CNT(CNL)		(INCR_CNT((sm_int_ptr_t)(&CNL->wcs_wip_lvl),			\
+								(sm_global_latch_ptr_t)(&CNL->wc_var_lock)))
+#define SUB_ENT_FROM_WIP_QUE_CNT(CNL)		(DECR_CNT((sm_int_ptr_t)(&CNL->wcs_wip_lvl),			\
+								(sm_global_latch_ptr_t)(&CNL->wc_var_lock)))
+#define ADD_ENT_TO_FREE_QUE_CNT(CNL)		(INCR_CNT((sm_int_ptr_t)(&CNL->wc_in_free),			\
+								(sm_global_latch_ptr_t)(&CNL->wc_var_lock)))
+#define SUB_ENT_FROM_FREE_QUE_CNT(CNL)		(DECR_CNT((sm_int_ptr_t)(&CNL->wc_in_free),			\
+								(sm_global_latch_ptr_t)(&CNL->wc_var_lock)))
+
 #define DSKREAD_TRACE(CSA, CR_OFF, CR_TN, PID, BLK, CYCLE)		\
-{									\
+MBSTART {								\
 	int4			doidx;					\
 	node_local_ptr_t	cnl;					\
 	assert((NULL != CSA)&& (NULL != (CSA->nl)));			\
 	cnl = CSA->nl;							\
 	doidx = ++cnl->dskread_ops_index;				\
 	if (DSKREAD_OPS_ARRAY_SIZE <= doidx)				\
-		doidx = cnl->dskread_ops_index = 0;			\
+		cnl->dskread_ops_index = doidx = 0;			\
 	cnl->dskread_ops_array[doidx].cr_off = CR_OFF;			\
 	cnl->dskread_ops_array[doidx].cr_tn = CR_TN;			\
 	cnl->dskread_ops_array[doidx].process_id = PID;			\
 	cnl->dskread_ops_array[doidx].blk = BLK;			\
 	cnl->dskread_ops_array[doidx].cycle = CYCLE;			\
-}
+} MBEND
 
 #ifdef DEBUG
 /* The following macro does not use a separate semaphore to protect its maintenance of the shared memory
@@ -682,7 +790,7 @@ typedef struct node_local_struct
  * and before rel_crit. Also we will increment the index first and cache it so we can shorten our exposure window.
  */
 #define CRIT_TRACE(X)							\
-{									\
+MBSTART {								\
 	int4			coidx;					\
 	node_local_ptr_t	cnl;					\
 	boolean_t		in_ast;					\
@@ -692,13 +800,13 @@ typedef struct node_local_struct
 	cnl = csa->nl;							\
 	coidx = ++cnl->crit_ops_index;					\
 	if (CRIT_OPS_ARRAY_SIZE <= coidx)				\
-		coidx = cnl->crit_ops_index = 0;			\
+		cnl->crit_ops_index = coidx = 0;			\
 	cnl->crit_ops_array[coidx].call_from = (caddr_t)caller_id();	\
 	cnl->crit_ops_array[coidx].epid = process_id;			\
 	cnl->crit_ops_array[coidx].crit_act = (X);			\
 	cnl->crit_ops_array[coidx].curr_tn = (NULL != csa->hdr) ?	\
 		csa->hdr->trans_hist.curr_tn  : 0;			\
-}
+} MBEND
 
 /* The following macro checks that curr_tn and early_tn are equal right before beginning a transaction commit.
  * The only exception we know of is if a process in the midst of commit had been killed (kill -9 or STOP/ID)
@@ -710,12 +818,12 @@ typedef struct node_local_struct
  *	b) the immediately previous crit operation should NOT be a release crit crit_ops_rw but instead should be a crit_ops_gw
  *	c) there are two exceptions to this and they are
  *		(i) that there could be one or more crit_ops_nocrit actions from processes that tried releasing crit
- *			even though they dont own it (cases we know of are in gds_rundown and in t_end/tp_tend if
+ *			even though they don't own it (cases we know of are in gds_rundown and in t_end/tp_tend if
  *			t_commit_cleanup completes the transaction after a mid-commit error).
  *		(ii) there could be one or more crit_ops_gw/crit_ops_rw pair of operations by a pid in between.
  */
 #define	ASSERT_CURR_TN_EQUALS_EARLY_TN(csa, currtn)						\
-{												\
+MBSTART {											\
 	GBLREF	uint4 			process_id;						\
 												\
 	assert((currtn) == csa->ti->curr_tn);							\
@@ -753,7 +861,7 @@ typedef struct node_local_struct
 		}										\
 		assert(CRIT_OPS_ARRAY_SIZE > lcnt); /* assert if did not find lone grab-crit */	\
 	}											\
-}
+} MBEND
 
 /*
  * The following macro places lock history entries in an array for debugging.
@@ -763,7 +871,7 @@ typedef struct node_local_struct
  * If "locknl" is non-NULL, it is used to store the lock history. If not only then is gv_cur_region used.
  */
 #define LOCK_HIST(OP, LOC, ID, CNT)					\
-{									\
+MBSTART {								\
 	GBLREF	node_local_ptr_t	locknl;				\
 									\
 	int			lockidx;				\
@@ -778,25 +886,53 @@ typedef struct node_local_struct
 		lcknl = locknl;						\
 	lockidx = ++lcknl->lockhist_idx;				\
 	if (LOCKHIST_ARRAY_SIZE <= lockidx)				\
-		lockidx = lcknl->lockhist_idx = 0;			\
+		lcknl->lockhist_idx = lockidx = 0;			\
 	GET_LONGP(&lcknl->lockhists[lockidx].lock_op[0], (OP));		\
 	lcknl->lockhists[lockidx].lock_addr = (sm_int_ptr_t)(LOC);	\
 	lcknl->lockhists[lockidx].lock_callr = (caddr_t)caller_id();	\
 	lcknl->lockhists[lockidx].lock_pid = (int4)(ID);		\
 	lcknl->lockhists[lockidx].loop_cnt = (int4)(CNT);		\
-}
+} MBEND
 
+#define WCS_OPS_TRACE(CSA, PID, TYPE, BLK, CR_OFF, CR_DIRTY, DETAIL1, DETAIL2)		\
+MBSTART {										\
+	int4			wtidx;							\
+	node_local_ptr_t	cnl;							\
+	boolean_t		donotflush_dbjnl;					\
+											\
+	assert((NULL != CSA) && (NULL != (CSA->nl)));					\
+	cnl = CSA->nl;									\
+	donotflush_dbjnl = cnl->donotflush_dbjnl;					\
+	assert((FALSE == cnl->donotflush_dbjnl) || (TRUE == cnl->donotflush_dbjnl));	\
+	wtidx = ++cnl->wcs_ops_index;							\
+	if (WCS_OPS_ARRAY_SIZE <= wtidx)						\
+		cnl->wcs_ops_index = wtidx = 0;						\
+	cnl->wcs_ops_array[wtidx].db_tn = CSA->ti->curr_tn;				\
+	cnl->wcs_ops_array[wtidx].process_id = PID;					\
+	cnl->wcs_ops_array[wtidx].wc_in_free = cnl->wc_in_free;				\
+	cnl->wcs_ops_array[wtidx].wcs_active_lvl = cnl->wcs_active_lvl;			\
+	cnl->wcs_ops_array[wtidx].wcs_wip_lvl = cnl->wcs_wip_lvl;			\
+	cnl->wcs_ops_array[wtidx].type = TYPE;						\
+	cnl->wcs_ops_array[wtidx].blk = BLK;						\
+	cnl->wcs_ops_array[wtidx].cr_off = CR_OFF;					\
+	cnl->wcs_ops_array[wtidx].cr_dirty = CR_DIRTY;					\
+	cnl->wcs_ops_array[wtidx].detail1 = DETAIL1;					\
+	cnl->wcs_ops_array[wtidx].detail2 = DETAIL2;					\
+	assert((FALSE == cnl->donotflush_dbjnl) || (TRUE == cnl->donotflush_dbjnl));	\
+	assert(donotflush_dbjnl == cnl->donotflush_dbjnl);				\
+} MBEND
 
 #define DUMP_LOCKHIST() dump_lockhist()
 #else
 #define CRIT_TRACE(X)
 #define	ASSERT_CURR_TN_EQUALS_EARLY_TN(csa, currtn)
 #define LOCK_HIST(OP, LOC, ID, CNT)
+#define WCS_OPS_TRACE(CSA, PID, TYPE, BLK, CR_OFF, CR_TN, DETAIL1, DETAIL2)
 #define DUMP_LOCKHIST()
 #endif
 
 #define FTOK_TRACE(CSA, CR_TN, FTOK_OPER, PID)				\
-{									\
+MBSTART {								\
 	node_local_ptr_t        cnl;                                    \
 	int4 			foindx;					\
 	assert(NULL != CSA);						\
@@ -809,7 +945,7 @@ typedef struct node_local_struct
 		cnl->ftok_ops_array[foindx].cr_tn = CR_TN;		\
 		cnl->ftok_ops_array[foindx].ftok_oper = FTOK_OPER;	\
 	}								\
-}
+} MBEND
 
 #define BT_NOT_ALIGNED(bt, bt_base)		(!IS_PTR_ALIGNED((bt), (bt_base), SIZEOF(bt_rec)))
 #define BT_NOT_IN_RANGE(bt, bt_lo, bt_hi)	(!IS_PTR_IN_RANGE((bt), (bt_lo), (bt_hi)))
@@ -835,7 +971,8 @@ typedef struct node_local_struct
 #define NODE_LOCAL_SIZE_DBS			(ROUND_UP(SIZEOF(node_local), DISK_BLOCK_SIZE))
 
 #define INIT_NUM_CRIT_ENTRY_IF_NEEDED(CSD)											\
-{	/* The layout of shared memory depends on the number of mutex queue entries specified in the file header. Thus in	\
+MBSTART {															\
+	/* The layout of shared memory depends on the number of mutex queue entries specified in the file header. Thus in	\
 	 * order to set, for example, csa->critical or csa->shmpool_buffer, we need to know this number. However, this		\
 	 * number can be zero if we have not yet done db_auto_upgrade. So go ahead and upgrade to the value that will		\
 	 * eventually be used, which is DEFAULT_NUM_CRIT_ENTRY.									\
@@ -843,7 +980,7 @@ typedef struct node_local_struct
 	/* Be safe in PRO and check if we need to initialize crit entries, even for GDSMV60002 and later. */			\
 	if (0 == NUM_CRIT_ENTRY(CSD))												\
 		NUM_CRIT_ENTRY(CSD) = DEFAULT_NUM_CRIT_ENTRY;									\
-}
+} MBEND
 
 #define ETGENTLE  2
 #define ETSLOW    8
diff --git a/sr_port/gdsdbver_sp.h b/sr_port/gdsdbver_sp.h
index d39ee8d..8d3348d 100644
--- a/sr_port/gdsdbver_sp.h
+++ b/sr_port/gdsdbver_sp.h
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2015-2016 Fidelity National Information	*
+ * Copyright (c) 2015-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -32,4 +32,5 @@ ENUM_ENTRY(GDSMV62001),		/* New field hasht_upgrade_needed for ^#t upgrade */
 ENUM_ENTRY(GDSMV62002),		/* New field defer_allocate needed for database file preallocation and ^#t upgrade */
 ENUM_ENTRY(GDSMV63000),		/* New field non_null_iv to indicate IV mode for encrypted blocks */
 ENUM_ENTRY(GDSMV63000A),	/* Move fields ftok_counter_halted and access_counter_halted from fileheader to nodelocal */
+ENUM_ENTRY(GDSMV63001),		/* New "asyncio" option; New reservedDBFlags field */
 ENUM_ENTRY(GDSMVLAST)
diff --git a/sr_port/gdsfhead.h b/sr_port/gdsfhead.h
index b429f92..f0a3d01 100644
--- a/sr_port/gdsfhead.h
+++ b/sr_port/gdsfhead.h
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -24,13 +24,10 @@
 #include "gtm_string.h"
 #include "send_msg.h"
 #include "iosp.h"
-#ifdef UNIX
 #include "repl_instance.h"
-#endif
-#ifdef VMS
-#include "iosb_disk.h"
-#endif
 #include "gtmcrypt.h" /* for gtmcrypt_key_t */
+#include "gtm_libaio.h"
+#include "gtm_reservedDB.h"
 
 #define CACHE_STATE_OFF SIZEOF(que_ent)
 
@@ -39,10 +36,14 @@ error_def(ERR_DBCRERR);
 error_def(ERR_DBENDIAN);
 error_def(ERR_DBFLCORRP);
 error_def(ERR_DBROLLEDBACK);
+error_def(ERR_ERRCALL);
 error_def(ERR_GVIS);
 error_def(ERR_GVSUBOFLOW);
 error_def(ERR_MMFILETOOLARGE);
 error_def(ERR_NCTCOLLSPGBL);
+error_def(ERR_OFRZAUTOREL);
+error_def(ERR_OFRZCRITREL);
+error_def(ERR_OFRZCRITSTUCK);
 error_def(ERR_REPLINSTMISMTCH);
 error_def(ERR_REPLINSTNOSHM);
 error_def(ERR_REPLREQROLLBACK);
@@ -85,31 +86,59 @@ typedef struct cache_rec_struct
 					 * mu_rndwn_file wcs_recover, secshr_db_clnup, wr_wrtfin_all and extensively by the ccp */
 	trans_num	flushed_dirty_tn;	/* value of dirty at the time of flushing */
 	trans_num	tn;
-	sm_off_t	bt_index;	/* offset to bt_rec */
+	sm_off_t	bt_index;	/* offset to corresponding bt_rec when this cache-record was last modified (bt->blk
+					 *	and cr->blk would be identical). Maintained as a non-zero value even if cr->dirty
+					 *	becomes non-zero later (due to a flush). Additionally, if this cache-record is a
+					 *	twin, cr->bt_index helps distinguish the OLDER and NEWER twins. bt_index is
+					 *	ZERO for the OLDER twin and NON-ZERO for the newer TWIN.
+					 */
 	sm_off_t	buffaddr;	/* offset to buffer holding actual data */
-	sm_off_t	twin;		/* (Unix & VMS) offset to cache_rec holding before-image for wcs_recover to backup */
+	sm_off_t	twin;		/* If non-zero, this points to another cache-record which contains the same block but
+					 * a different state of the block. A twin for a block is created if a
+					 * process holding crit and attempting to commit updates to a block finds that block
+					 * being concurrently written to disk. If asyncio=OFF, this field is mostly zero.
+					 * In addition to the above, this field is also non-zero in an exception case where
+					 * cr->stopped is TRUE in which case the "twin" points to the cache_rec holding the
+					 * before-image for wcs_recover to backup.
+					 */
 	off_jnl_t	jnl_addr;	/* offset from bg_update to prevent wcs_wtstart from writing a block ahead of the journal */
+	uint4		stopped;	/* non-zero indicates to wcs_recover the pid that built the block using secshr_db_clnup */
 	global_latch_t	rip_latch;	/* for read_in_progress - note contains extra 16 bytes for HPPA. Usage note: this
 					   latch is used on those platforms where read_in_progress is not directly updated
 					   by atomic routines/instructions. As such there needs be no cache line padding between
 					   this field and read_in_progress.
 					 */
-	/* and now the rest */
-	int4		image_count;	/* maintained with r_epid in vms to ensure that the process has stayed in gt.m */
-	int4		epid;		/* set by wcs_wtstart to id the write initiator; cleared by wcs_wtfini
+	uint4		data_invalid;	/* non-zero pid from bg_update indicates we are in the middle of a "gvcst_blk_build"
+					 * and so the block contents are not clean. secshr_db_clnup/wcs_recover check this
+					 * field and take appropriate action to recover this cr.
+					 */
+	int4		epid;		/* set by wcs_wtstart to id the write initiator; cleared by wcs_wtstart/wcs_wtfini
 					 * used by t_commit_cleanup, secshr_db_clnup and wcs_recover */
 	int4		cycle;		/* relative stamp indicates changing versions of the block for concurrency checking */
 	int4		r_epid;		/* set by db_csh_getn, cleared by t_qread, bg_update, wcs_recover or secshr_db_clnup
 					 * used to check for process leaving without releasing the buffer
 					 * must be word aligned on the VAX */
+	struct aiocb	aiocb;		/* Used for asynchronous I/O if BG access method and csd->asyncio is TRUE */
 	CNTR4DCL(read_in_progress, 10);	/* -1 for normal and 0 for rip used by t_qread and checked by others */
 	uint4		in_tend;	/* non-zero pid from bg_update indicates secshr_db_clnup should finish update */
 	uint4		in_cw_set;	/* non-zero pid from t_end, tp_tend or bg_update protects block from db_csh_getn;
 					 * returned to 0 by t_end, tp_tend or t_commit_cleanup */
-	uint4		data_invalid;	/* non-zero pid from bg_update indicates t_commit_cleanup/wcs_recover should invalidate */
-	boolean_t	stopped;	/* TRUE indicates to wcs_recover that secshr_db_clnup built the block */
-	boolean_t	wip_stopped;	/* TRUE indicates to wcs_recover, wcs_wtfini, wcs_get_blk and gds_rundown
-					 * that secshr_db_clnup cancelled the qio */
+	bool		wip_is_encr_buf;/* TRUE if cache-record is WIP (write-in-progress) and its encrypted global buffer
+					 * (not unencrypted global buffer) was used to issue the write in "wcs_wtstart".
+					 * Used by "wcs_wtfini" to reissue the write. This field is not maintained
+					 * when the cr is not in WIP status i.e. this is used only by the
+					 * DB_LSEEKWRITEASYNCSTART and DB_LSEEKWRITEASYNCRESTART macros.
+					 */
+	bool		backup_cr_is_twin;	/* TRUE if cr corresponding to the before-image (used by BG_BACKUP_BLOCK)
+						 * is the twin of this cache-record.
+						 */
+	bool		aio_issued;	/* set to TRUE after the asyncio has been issued in wcs_wtstart.
+					 * set to FALSE before cr->epid is set to a non-zero value in wcs_wtstart.
+					 * ONLY if epid is non-zero AND aio_issued is TRUE, can the write be considered
+					 * in progress. This is used by wcs_recover to decide whether to place a cr into
+					 * the active or wip queue.
+					 */
+	bool		filler4bytealign[1];	/* Note: Make sure any changes here are reflected in "cache_state_rec" too */
 } cache_rec;
 
 /* A note about cache line separation of the latches contained in these blocks. Because this block is duplicated
@@ -147,39 +176,56 @@ typedef struct
 					 * mu_rndwn_file wcs_recover, secshr_db_clnup, wr_wrtfin_all and extensively by the ccp */
 	trans_num	flushed_dirty_tn;	/* value of dirty at the time of flushing */
 	trans_num	tn;
-	sm_off_t	bt_index;	/* offset to bt_rec */
+	sm_off_t	bt_index;	/* offset to corresponding bt_rec when this cache-record was last modified (bt->blk
+					 *	and cr->blk would be identical). Maintained as a non-zero value even if cr->dirty
+					 *	becomes non-zero later (due to a flush). Additionally, if this cache-record is a
+					 *	twin, cr->bt_index helps distinguish the OLDER and NEWER twins. bt_index is
+					 *	ZERO for the OLDER twin and NON-ZERO for the newer TWIN.
+					 */
 	sm_off_t	buffaddr;	/* offset to buffer holding actual data*/
-	sm_off_t	twin;		/* (VMS) offset to cache_rec of another copy of the same block from bg_update & wcs_wt_all
-					 * (Unix & VMS) offset to cache_rec holding before-image for wcs_recover to backup */
-#ifdef VMS
-	sm_off_t	shmpool_blk_off; /* Offset to shmpool block containing the reformat buffer for this CR */
-	int4		backup_cr_off;   /* Offset to backup_cr (set/used by bg_update_phase1/2 routines) */
-#endif
+	sm_off_t	twin;		/* If non-zero, this points to another cache-record which contains the same block but
+					 * a different state of the block. A twin for a block is created if a
+					 * process holding crit and attempting to commit updates to a block finds that block
+					 * being concurrently written to disk. If asyncio=OFF, this field is mostly zero.
+					 * In addition to the above, this field is also non-zero in an exception case where
+					 * cr->stopped is TRUE in which case the "twin" points to the cache_rec holding the
+					 * before-image for wcs_recover to backup.
+					 */
 	off_jnl_t	jnl_addr;	/* offset from bg_update to prevent wcs_wtstart from writing a block ahead of the journal */
+	boolean_t	stopped;	/* TRUE indicates to wcs_recover that secshr_db_clnup built the block */
 	global_latch_t	rip_latch;	/* for read_in_progress - note contains extra 16 bytes for HPPA. Usage note: this
 					   latch is used on those platforms where read_in_progress is not directly updated
 					   by atomic routines/instructions. As such there needs be no cache line padding between
 					   this field and read_in_progress.
 					 */
-	/* and now the rest */
-	int4		image_count;	/* maintained with r_epid in vms to ensure that the process has stayed in gt.m */
-	int4		epid;		/* set by wcs_start to id the write initiator; cleared by wcs_wtfini
+	uint4		data_invalid;	/* non-zero pid from bg_update indicates t_commit_cleanup/wcs_recover should invalidate */
+	int4		epid;		/* set by wcs_start to id the write initiator; cleared by wcs_wtstart/wcs_wtfini
 					 * used by t_commit_cleanup, secshr_db_clnup and wcs_recover */
 	int4		cycle;		/* relative stamp indicates changing versions of the block for concurrency checking */
 	int4		r_epid;		/* set by db_csh_getn, cleared by t_qread, bg_update, wcs_recover or secshr_db_clnup
 					 * used to check for process leaving without releasing the buffer
 					 * must be word aligned on the VAX */
-#ifdef VMS
-	io_status_block_disk	iosb;	/* used on VMS write */
-#endif
+	struct aiocb	aiocb;		/* Used for asynchronous I/O if BG access method and csd->asyncio is TRUE */
 	CNTR4DCL(read_in_progress, 10);	/* -1 for normal and 0 for rip used by t_qread and checked by others */
 	uint4		in_tend;	/* non-zero pid from bg_update indicates secshr_db_clnup should finish update */
 	uint4		in_cw_set;	/* non-zero pid from t_end, tp_tend or bg_update protects block from db_csh_getn;
 					 * returned to 0 by t_end, tp_tend or t_commit_cleanup */
-	uint4		data_invalid;	/* non-zero pid from bg_update indicates t_commit_cleanup/wcs_recover should invalidate */
-	boolean_t	stopped;	/* TRUE indicates to wcs_recover that secshr_db_clnup built the block */
-	boolean_t	wip_stopped;	/* TRUE indicates to wcs_recover, wcs_wtfini, wcs_get_blk and gds_rundown
-					 * that secshr_db_clnup cancelled the qio */
+	bool		wip_is_encr_buf;/* TRUE if cache-record is WIP (write-in-progress) and its encrypted global buffer
+					 * (not unencrypted global buffer) was used to issue the write in "wcs_wtstart".
+					 * Used by "wcs_wtfini" to reissue the write. This field is not maintained
+					 * when the cr is not in WIP status i.e. this is used only by the
+					 * DB_LSEEKWRITEASYNCSTART and DB_LSEEKWRITEASYNCRESTART macros.
+					 */
+	bool		backup_cr_is_twin;	/* TRUE if cr corresponding to the before-image (used by BG_BACKUP_BLOCK)
+						 * is the twin of this cache-record.
+						 */
+	bool		aio_issued;	/* set to TRUE after the asyncio has been issued in wcs_wtstart.
+					 * set to FALSE before cr->epid is set to a non-zero value in wcs_wtstart.
+					 * ONLY if epid is non-zero AND aio_issued is TRUE, can the write be considered
+					 * in progress. This is used by wcs_recover to decide whether to place a cr into
+					 * the active or wip queue.
+					 */
+	bool		filler4bytealign[1];	/* Note: Make sure any changes here are reflected in "cache_state_rec" too */
 } cache_state_rec;
 
 #define		CR_BLKEMPTY		-1
@@ -190,7 +236,7 @@ typedef struct
 
 typedef struct
 {
-	cache_que_head	cacheq_wip,	/* write-in-progress queue -- unused in Unix */
+	cache_que_head	cacheq_wip,	/* write-in-progress queue */
 			cacheq_active;	/* active queue */
 	cache_rec	cache_array[1];	/*the first cache record*/
 } cache_que_heads;
@@ -229,11 +275,10 @@ gtm_uint64_t verify_queue(que_head_ptr_t qhdr);
 #define VERIFY_QUEUE_LOCK(base,latch)
 #endif
 
-#define BLK_ZERO_OFF(CSD)			((CSD->start_vbn - 1) * DISK_BLOCK_SIZE)
-#ifdef UNIX
-# ifdef GTM64
+#define BLK_ZERO_OFF(start_vbn)			((start_vbn - 1) * DISK_BLOCK_SIZE)
+#ifdef GTM64
 #  define CHECK_LARGEFILE_MMAP(REG, MMAP_SZ)
-# else
+#else
 #  define CHECK_LARGEFILE_MMAP(REG, MMAP_SZ)										\
 {															\
 	assert(SIZEOF(gtm_uint64_t) == SIZEOF(MMAP_SZ));								\
@@ -256,58 +301,58 @@ gtm_uint64_t verify_queue(que_head_ptr_t qhdr);
 #  define MEM_MAP_SYSCALL "mmap()"
 #  define MEM_UNMAP_SYSCALL "munmap()"
 # endif
-#else
-# define MM_BASE_ADDR(CSA)			(sm_uc_ptr_t)CSA->acc_meth.mm.base_addr
-# define SET_MM_BASE_ADDR(CSA, CSD)											\
-{															\
-	CSA->acc_meth.mm.base_addr = (sm_uc_ptr_t)((sm_long_t)CSD + (off_t)(CSD->start_vbn - 1) * DISK_BLOCK_SIZE);	\
-}
-#endif
 
-#define	GVKEY_INIT(GVKEY, KEYSIZE)						\
-{										\
-	GBLREF gv_key	*gv_altkey;						\
-	GBLREF gv_key	*gv_currkey;						\
-	gv_key		*new_KEY, *old_KEY;					\
-	int4		keySZ;							\
-										\
-	old_KEY = GVKEY;							\
-	keySZ = KEYSIZE;							\
-	/* KEYSIZE should have been the output of a DBKEYSIZE command so	\
-	 * should be a multiple of 4. Assert that.				\
-	 */									\
-	assert(ROUND_UP2(keySZ, 4) == keySZ);					\
-	new_KEY = (gv_key *)malloc(SIZEOF(gv_key) - 1 + keySZ);			\
-	assert((DBKEYSIZE(MAX_KEY_SZ) == KEYSIZE)				\
-		|| ((GVKEY != gv_currkey) && (GVKEY != gv_altkey)));		\
-	if (NULL != old_KEY)							\
-	{									\
-		assert(FALSE);	/* dont call GVKEY_INIT twice for same key */	\
-		assert(KEYSIZE >= old_KEY->top);				\
-		assert(old_KEY->top > old_KEY->end);				\
-		memcpy(new_KEY, old_KEY, SIZEOF(gv_key) + old_KEY->end);	\
-		free(old_KEY);							\
-	} else									\
-	{									\
-		new_KEY->base[0] = '\0';					\
-		new_KEY->end = 0;						\
-		new_KEY->prev = 0;						\
-	}									\
-	new_KEY->top = keySZ;							\
-	GVKEY = new_KEY;							\
-}
+#define	GVKEY_INIT(GVKEY, KEYSIZE)							\
+MBSTART {										\
+	GBLREF gv_key	*gv_altkey;							\
+	GBLREF gv_key	*gv_currkey;							\
+	gv_key		*new_KEY, *old_KEY;						\
+	int4		keySZ;								\
+	DEBUG_ONLY(DCL_THREADGBL_ACCESS);						\
+											\
+	DEBUG_ONLY(SETUP_THREADGBL_ACCESS);						\
+	old_KEY = GVKEY;								\
+	keySZ = KEYSIZE;								\
+	/* KEYSIZE should have been the output of a DBKEYSIZE command so		\
+	 * should be a multiple of 4. Assert that.					\
+	 */										\
+	assert(ROUND_UP2(keySZ, 4) == keySZ);						\
+	new_KEY = (gv_key *)malloc(SIZEOF(gv_key) - 1 + keySZ);				\
+	assert((DBKEYSIZE(MAX_KEY_SZ) == KEYSIZE)					\
+		|| ((GVKEY != gv_currkey) && (GVKEY != gv_altkey)));			\
+	if (NULL != old_KEY)								\
+	{										\
+		/* Don't call GVKEY_INIT twice for same key. The only exception		\
+		 * is if we are called from COPY_PREV_KEY_TO_GVT_CLUE in a		\
+		 * restartable situation but TREF(donot_commit) should have		\
+		 * been set to a special value then so check that.			\
+		 */									\
+		assert(TREF(donot_commit) | DONOTCOMMIT_COPY_PREV_KEY_TO_GVT_CLUE);	\
+		assert(KEYSIZE >= old_KEY->top);					\
+		assert(old_KEY->top > old_KEY->end);					\
+		memcpy(new_KEY, old_KEY, SIZEOF(gv_key) + old_KEY->end);		\
+		free(old_KEY);								\
+	} else										\
+	{										\
+		new_KEY->base[0] = '\0';						\
+		new_KEY->end = 0;							\
+		new_KEY->prev = 0;							\
+	}										\
+	new_KEY->top = keySZ;								\
+	GVKEY = new_KEY;								\
+} MBEND
 
 #define	GVKEY_FREE_IF_NEEDED(GVKEY)	\
-{					\
+MBSTART {				\
 	if (NULL != GVKEY)		\
 	{				\
 		free(GVKEY);		\
 		GVKEY = NULL;		\
 	}				\
-}
+} MBEND
 
 #define	GVKEYSIZE_INIT_IF_NEEDED									\
-{													\
+MBSTART {												\
 	int		keySIZE;									\
 													\
 	GBLREF int4	gv_keysize;									\
@@ -332,13 +377,13 @@ gtm_uint64_t verify_queue(que_head_ptr_t qhdr);
 			&& (DBKEYSIZE(MAX_KEY_SZ) == gv_keysize)					\
 			&& (gv_keysize == gv_currkey->top) && (gv_keysize == gv_altkey->top));		\
 	}												\
-}
+} MBEND
 
 /* Transform KEY to look at the immediately next key at the same subscript level as input KEY (like $order(KEY)).
  * For example if input KEY is ^x(1,2), come up with a key ^x(1,2++).
  */
 #define	GVKEY_INCREMENT_ORDER(KEY)			\
-{							\
+MBSTART {						\
 	int		end;				\
 	unsigned char 	*base = KEY->base;		\
 							\
@@ -349,11 +394,11 @@ gtm_uint64_t verify_queue(que_head_ptr_t qhdr);
 	base[end - 1] = 1;				\
 	base[end + 1] = KEY_DELIMITER;			\
 	KEY->end = end + 1;				\
-}
+} MBEND
 
 /* Undo work done by GVKEY_INCREMENT_ORDER */
 #define	GVKEY_UNDO_INCREMENT_ORDER(KEY)			\
-{							\
+MBSTART {						\
 	int	end;					\
 							\
 	assert(1 < KEY->end);				\
@@ -365,13 +410,13 @@ gtm_uint64_t verify_queue(que_head_ptr_t qhdr);
 	KEY->base[end - 1] = KEY_DELIMITER;		\
 	KEY->base[end + 0] = KEY_DELIMITER;		\
 	KEY->end = end;					\
-}
+} MBEND
 
 /* Transform KEY to look at the immediately previous key at the same subscript level as input KEY (like $order(KEY)).
  * For example if input KEY is ^x(1,2), come up with a key ^x(1,2--).
  */
 #define	GVKEY_DECREMENT_ORDER(KEY)			\
-{							\
+MBSTART {						\
 	int	end;					\
 							\
 	end = KEY->end;					\
@@ -384,11 +429,11 @@ gtm_uint64_t verify_queue(que_head_ptr_t qhdr);
 	KEY->base[end - 1] = 0xFF;			\
 	KEY->base[end + 1] = KEY_DELIMITER;		\
 	KEY->end = end + 1;				\
-}
+} MBEND
 
 /* Undo work done by GVKEY_DECREMENT_ORDER */
 #define	GVKEY_UNDO_DECREMENT_ORDER(KEY)			\
-{							\
+MBSTART {						\
 	int	end;					\
 							\
 	assert(2 < KEY->end);				\
@@ -401,12 +446,13 @@ gtm_uint64_t verify_queue(que_head_ptr_t qhdr);
 	KEY->base[end - 2] += 1;			\
 	KEY->base[end - 1] = KEY_DELIMITER;		\
 	KEY->end = end;					\
-}
+} MBEND
+
 /* Transform KEY to look at the immediately next KEY at any subscript level (like $query(KEY)).
  * For example if input KEY is ^x(1,2), come up with a key ^x(1,2,1) assuming that is the next node.
  */
 #define	GVKEY_INCREMENT_QUERY(KEY)			\
-{							\
+MBSTART {						\
 	int	end;					\
 							\
 	end = KEY->end;					\
@@ -417,13 +463,13 @@ gtm_uint64_t verify_queue(que_head_ptr_t qhdr);
 	KEY->base[end + 1] = KEY_DELIMITER;		\
 	KEY->base[end + 2] = KEY_DELIMITER;		\
 	KEY->end += 2;					\
-}
+} MBEND
 
 /* Transform KEY to look at the immediately previous key at the PREVIOUS subscript level as input KEY.
  * For example if input KEY is ^x(1,2), come up with a key ^x(1++).
  */
 #define	GVKEY_INCREMENT_PREVSUBS_ORDER(KEY)			\
-{								\
+MBSTART {							\
 	assert(KEY->prev);					\
 	assert(KEY->end > KEY->prev);				\
 	assert(KEY_DELIMITER == KEY->base[KEY->prev - 1]);	\
@@ -432,11 +478,11 @@ gtm_uint64_t verify_queue(que_head_ptr_t qhdr);
 	assert(KEY_DELIMITER == KEY->base[KEY->end]);		\
 	assert(KEY->end + 1 <= KEY->top);			\
 	KEY->base[KEY->prev - 1] = 1;				\
-}
+} MBEND
 
 /* Undo work done by GVKEY_INCREMENT_PREVSUBS_ORDER */
 #define	GVKEY_UNDO_INCREMENT_PREVSUBS_ORDER(KEY)		\
-{								\
+MBSTART {							\
 	assert(KEY->prev);					\
 	assert(KEY->end > KEY->prev);				\
 	assert(1 == KEY->base[KEY->prev - 1]);			\
@@ -445,13 +491,13 @@ gtm_uint64_t verify_queue(que_head_ptr_t qhdr);
 	assert(KEY_DELIMITER == KEY->base[KEY->end]);		\
 	assert(KEY->end + 1 <= KEY->top);			\
 	KEY->base[KEY->prev - 1] = KEY_DELIMITER;		\
-}
+} MBEND
 
 /* Transform KEY to look at the "" subscript at same subscript level as input KEY.
  * For example if input KEY is ^x(1,2), come up with a key ^x(1,"").
  */
 #define	GVKEY_SET_SUBS_ZPREVIOUS(KEY, SAVECH)			\
-{								\
+MBSTART {							\
 	assert(KEY->prev);					\
 	assert(KEY->end > KEY->prev);				\
 	assert(KEY_DELIMITER == KEY->base[KEY->prev - 1]);	\
@@ -461,11 +507,11 @@ gtm_uint64_t verify_queue(que_head_ptr_t qhdr);
 	assert(KEY->end + 1 <= KEY->top);			\
 	SAVECH = KEY->base[KEY->prev];				\
 	KEY->base[KEY->prev] = 1;				\
-}
+} MBEND
 
 /* Undo work done by GVKEY_SET_SUBS_ZPREVIOUS */
 #define	GVKEY_UNDO_SET_SUBS_ZPREVIOUS(KEY, SAVECH)		\
-{								\
+MBSTART {							\
 	assert(KEY->prev);					\
 	assert(KEY->end > KEY->prev);				\
 	assert(1 == KEY->base[KEY->prev]);			\
@@ -474,7 +520,7 @@ gtm_uint64_t verify_queue(que_head_ptr_t qhdr);
 	assert(KEY_DELIMITER == KEY->base[KEY->end]);		\
 	assert(KEY->end + 1 <= KEY->top);			\
 	KEY->base[KEY->prev] = SAVECH;				\
-}
+} MBEND
 
 /* This macro is used whenever we have found a MAP where a key KEYBASE maps to (using "gv_srch_map*" functions).
  * If the MAP entry one before EXACTLY matches the KEY, then some callers might want to see MAP-1 instead of MAP.
@@ -482,18 +528,77 @@ gtm_uint64_t verify_queue(que_head_ptr_t qhdr);
  * this macro to get MAP-1 in that special case.
  */
 #define	BACK_OFF_ONE_MAP_ENTRY_IF_EDGECASE(KEYBASE, KEYLEN, MAP)				\
-{												\
+MBSTART {											\
 	if (!memcmp(KEYBASE, ((MAP) - 1)->gvkey.addr, KEYLEN))					\
 	{	/* KEYBASE starts at "MAP" which means, all keys of interest (just one before	\
 		 * the incremented key) can never map to "MAP" so back off one map entry.	\
 		 */										\
 		(MAP)--;									\
+		OPEN_BASEREG_IF_STATSREG(MAP);							\
 	}											\
+} MBEND
+
+/* The below macro is invoked whenever we are about to return a map entry that corresponds to a statsdb region.
+ * This means the caller is about to use this map entry to access a statsdb region. But it is possible this statsdb
+ * region does not map to a real database file (e.g. if the corresponding baseDBreg has NOSTATS defined in the .gld
+ * OR if the basedb has NOSTATS defined in its file header). In all such cases, we do not want the caller to error out
+ * so we repoint the statsdb map entry to point to a basedb and since we don't expect to see ^%YGS nodes in the basedb
+ * the access will return without any error (e.g. $GET will return "" etc. but no error).
+ */
+#define	OPEN_BASEREG_IF_STATSREG(MAP)										\
+{														\
+	gd_region	*baseDBreg, *statsDBreg;								\
+														\
+	statsDBreg = MAP->reg.addr;										\
+	if (IS_STATSDB_REGNAME(statsDBreg))									\
+	{													\
+		STATSDBREG_TO_BASEDBREG(statsDBreg, baseDBreg);							\
+		if (!baseDBreg->open)										\
+			gv_init_reg(baseDBreg);									\
+		if (!statsDBreg->open)										\
+		{	/* statsDB did not get opened as part of baseDB open above. Possible if gtm_statshare	\
+			 * is not set to 1. But user could still do a ZWR ^%YGS which would try to open		\
+			 * statsDB in caller (who is not equipped to handle errors) so do the open of the	\
+			 * statsDB now and silently handle errors like is done in "gvcst_init".	Any errors	\
+			 * will cause the baseDB to have NOSTATS set which would make the map entry point to	\
+			 * the baseDB thereby avoiding any user-visible errors even if they do ZWR ^%YGS.	\
+			 * Indicate we want to do just "gvcst_init" of the statsDB, not the ^%YGS addition	\
+			 * by passing DO_STATSDB_INIT_FALSE.							\
+			 */											\
+			gvcst_init_statsDB(baseDBreg, DO_STATSDB_INIT_FALSE);					\
+		}												\
+		/* If baseDB has NOSTATS defined in its file header, repoint map entry to non-statsDB region.	\
+		 * This will prevent FILENOTFOUND errors on the statsdb file (.gst file) on access to ^%YGS	\
+		 * nodes that map to non-existent statsdb regions.						\
+		 */												\
+		if (RDBF_NOSTATS & baseDBreg->reservedDBFlags)							\
+			MAP->reg.addr = baseDBreg;								\
+	}													\
+}
+
+/* The below macro is modeled pretty much like OPEN_BASEREG_IF_STATSREG except that this asserts that the
+ * other macro is not needed. And that whatever that macro sets up is already set up that way.
+ */
+#ifdef DEBUG
+#define	ASSERT_BASEREG_OPEN_IF_STATSREG(MAP)				\
+{									\
+	gd_region	*baseDBreg, *statsDBreg;			\
+									\
+	statsDBreg = MAP->reg.addr;					\
+	if (IS_STATSDB_REGNAME(statsDBreg))				\
+	{								\
+		STATSDBREG_TO_BASEDBREG(statsDBreg, baseDBreg);		\
+		assert(baseDBreg->open);				\
+		assert(statsDBreg->open);				\
+	}								\
 }
+#else
+#define	ASSERT_BASEREG_OPEN_IF_STATSREG(MAP)
+#endif
 
 /* Calculate the # of subscripts in "KEY" and stores that in "NSUBS" */
 #define	GET_NSUBS_IN_GVKEY(PTR, LEN, NSUBS)							\
-{												\
+MBSTART {											\
 	unsigned char	*ptr, *ptrtop;								\
 	int		nSubs;									\
 												\
@@ -505,7 +610,7 @@ gtm_uint64_t verify_queue(que_head_ptr_t qhdr);
 		if (KEY_DELIMITER == *ptr)							\
 			nSubs++;								\
 	NSUBS = nSubs;										\
-}
+} MBEND
 
 #define WAS_OPEN_TRUE		TRUE
 #define WAS_OPEN_FALSE		FALSE
@@ -515,7 +620,7 @@ gtm_uint64_t verify_queue(que_head_ptr_t qhdr);
  * invokes GVKEYSIZE_INIT_IF_NEEDED to allocate gv_currkey/gv_altkey if not already done.
  */
 #define SET_REGION_OPEN_TRUE(REG, WAS_OPEN)									\
-{														\
+MBSTART {													\
 	DEBUG_ONLY(GBLREF int4	gv_keysize;)									\
 														\
 	assert(!REG->was_open);											\
@@ -525,26 +630,30 @@ gtm_uint64_t verify_queue(que_head_ptr_t qhdr);
 	if (WAS_OPEN)												\
 	{													\
 		REG->was_open = TRUE;										\
+		TREF(was_open_reg_seen) = TRUE;									\
 		assert(DBKEYSIZE(REG->max_key_size) <= gv_keysize);						\
 	} else													\
 		GVKEYSIZE_INIT_IF_NEEDED; /* sets up "gv_keysize", "gv_currkey" and "gv_altkey" in sync */	\
-}
+} MBEND
 
-#define	REG_ACC_METH(REG)	(REG->dyn.addr->acc_meth)
+#define	REG_ACC_METH(REG)		(REG->dyn.addr->acc_meth)
+#define	IS_REG_BG_OR_MM(REG)		IS_ACC_METH_BG_OR_MM(REG_ACC_METH(REG))
+#define	IS_CSD_BG_OR_MM(CSD)		IS_ACC_METH_BG_OR_MM(CSD->acc_meth)
+#define	IS_ACC_METH_BG_OR_MM(ACC_METH)	((dba_bg == ACC_METH) || (dba_mm == ACC_METH))
 
 #define	SET_CSA_DIR_TREE(csa, keysize, reg)							\
-{												\
+MBSTART {											\
 	if (NULL == csa->dir_tree)								\
 	{											\
-		assert((dba_bg == REG_ACC_METH(reg)) || (dba_mm == REG_ACC_METH(reg)));		\
+		assert(IS_REG_BG_OR_MM(reg));							\
 		csa->dir_tree = targ_alloc(keysize, NULL, reg);					\
 		GTMTRIG_ONLY(assert(NULL == csa->hasht_tree));					\
 	} else											\
 		assert((csa->dir_tree->gd_csa == csa) && (DIR_ROOT == csa->dir_tree->root));	\
-}
+} MBEND
 
 #define	FREE_CSA_DIR_TREE(csa)							\
-{										\
+MBSTART {									\
 	sgmnt_addrs	*lcl_csa;						\
 	gv_namehead	*dir_tree, *hasht_tree;					\
 										\
@@ -566,20 +675,20 @@ gtm_uint64_t verify_queue(que_head_ptr_t qhdr);
 	assert(1 == dir_tree->regcnt);						\
 	TARG_FREE_IF_NEEDED(dir_tree);						\
 	lcl_csa->dir_tree = NULL;						\
-}
+} MBEND
 
 #define	ADD_TO_GVT_PENDING_LIST_IF_REG_NOT_OPEN(REG, GVT_PTR, GVT_PTR2)					\
-{													\
+MBSTART {												\
 	gvt_container		*gvtc;									\
 	DEBUG_ONLY(gv_namehead	*gvt;)									\
 													\
 	GBLREF	buddy_list	*gvt_pending_buddy_list;						\
 	GBLREF	gvt_container	*gvt_pending_list;							\
 													\
-	/* For dba_cm or dba_user, dont add to pending list because those regions			\
+	/* For dba_cm or dba_user, don't add to pending list because those regions			\
 	 * will never be opened by the client process (this process).					\
 	 */												\
-	if (!REG->open && ((dba_bg == REG_ACC_METH(REG)) || (dba_mm == REG_ACC_METH(REG))))		\
+	if (!REG->open && IS_REG_BG_OR_MM(REG))								\
 	{	/* Record list of all gv_targets that have been allocated BEFORE the			\
 		 * region has been opened. Once the region gets opened, we will re-examine		\
 		 * this list and reallocate them (if needed) since they have now been			\
@@ -597,10 +706,10 @@ gtm_uint64_t verify_queue(que_head_ptr_t qhdr);
 		gvtc->next_gvtc = (struct gvt_container_struct *)gvt_pending_list;			\
 		gvt_pending_list = gvtc;								\
 	}												\
-}
+} MBEND
 
 #define	PROCESS_GVT_PENDING_LIST(GREG, CSA)								\
-{													\
+MBSTART {												\
 	GBLREF	gvt_container	*gvt_pending_list;							\
 													\
 	if (NULL != gvt_pending_list)									\
@@ -609,14 +718,14 @@ gtm_uint64_t verify_queue(que_head_ptr_t qhdr);
 		 */											\
 		process_gvt_pending_list(GREG, CSA);							\
 	}												\
-}
+} MBEND
 
 #define	TARG_FREE_IF_NEEDED(GVT)		\
-{						\
+MBSTART {					\
 	GVT->regcnt--;				\
 	if (!GVT->regcnt)			\
 		targ_free(GVT);			\
-}
+} MBEND
 
 #define		T_COMMIT_CRIT_PHASE1	1	/* csa->t_commit_crit gets set to this in during bg_update_phase1 */
 #define		T_COMMIT_CRIT_PHASE2	2	/* csa->t_commit_crit gets set to this in during bg_update_phase2 */
@@ -631,6 +740,13 @@ gtm_uint64_t verify_queue(que_head_ptr_t qhdr);
  */
 #define		T_IN_CRIT_OR_COMMIT_OR_WRITE(CSA)	(T_IN_CRIT_OR_COMMIT(CSA) || (CSA)->in_wtstart)
 
+/* Macro to check if we are committing (with or without crit) or are in wcs_wtstart for this region. This is used in timer
+ * handling code to determine if it is ok to interrupt. We do not want to interrupt if we are in the midst of commit or
+ * in wcs_wtstart (in the second case, we could be causing another process HOLDING CRIT on the region to wait in
+ * bg_update_phase1 if we hold the write interlock).
+ */
+#define         T_IN_COMMIT_OR_WRITE(CSA)       ((CSA)->t_commit_crit || (CSA)->in_wtstart)
+
 /* macro to check if a database commit is past the point where it can be successfully rolled back */
 #define		T_UPDATE_UNDERWAY(CSA)	((CSA)->t_commit_crit)
 
@@ -647,7 +763,7 @@ gtm_uint64_t verify_queue(que_head_ptr_t qhdr);
 
 #ifdef DEBUG
 #define DBG_ENSURE_PTR_IS_VALID_GLOBUFF(CSA, CSD, PTR)					\
-{											\
+MBSTART {										\
 	cache_rec_ptr_t			cache_start;					\
 	long				bufindx;					\
 	sm_uc_ptr_t			bufstart;					\
@@ -659,9 +775,9 @@ gtm_uint64_t verify_queue(que_head_ptr_t qhdr);
 	bufindx = (PTR - bufstart) / CSD->blk_size;					\
 	assert(bufindx < CSD->n_bts);							\
 	assert((bufstart + (bufindx * CSD->blk_size)) == (PTR));			\
-}
+} MBEND
 #define DBG_ENSURE_PTR_IS_VALID_ENCTWINGLOBUFF(CSA, CSD, PTR)				\
-{											\
+MBSTART {										\
 	cache_rec_ptr_t			cache_start;					\
 	long				bufindx;					\
 	sm_uc_ptr_t			bufstart;					\
@@ -674,10 +790,10 @@ gtm_uint64_t verify_queue(que_head_ptr_t qhdr);
 	bufindx = (PTR - bufstart) / CSD->blk_size;					\
 	assert(bufindx < CSD->n_bts);							\
 	assert((bufstart + (bufindx * (gtm_uint64_t)CSD->blk_size)) == (PTR));		\
-}
+} MBEND
 
 #define	DBG_ENSURE_OLD_BLOCK_IS_VALID(cse, is_mm, csa, csd)								\
-{															\
+MBSTART {														\
 	cache_rec_ptr_t		cache_start;										\
 	long			bufindx;										\
 	sm_uc_ptr_t		bufstart;										\
@@ -699,14 +815,14 @@ gtm_uint64_t verify_queue(que_head_ptr_t qhdr);
 		} else													\
 			assert(cse->old_block == MM_BASE_ADDR(csa) + (off_t)cse->blk * csd->blk_size);			\
 	}														\
-}
+} MBEND
 
 /* Check if a given address corresponds to a global buffer (BG) in database shared memory AND if
  * we are in phase2 of commit. If so check whether the corresponding cache-record is pinned.
- * Used by gvcst_blk_build to ensure the update array points to valid contents even though we dont hold crit.
+ * Used by gvcst_blk_build to ensure the update array points to valid contents even though we don't hold crit.
  */
 #define	DBG_BG_PHASE2_CHECK_CR_IS_PINNED(csa, seg)								\
-{														\
+MBSTART {													\
 	cache_rec_ptr_t		cache_start;									\
 	long			bufindx;									\
 	sm_uc_ptr_t		bufstart, bufend, bufaddr;							\
@@ -729,54 +845,57 @@ gtm_uint64_t verify_queue(que_head_ptr_t qhdr);
 			assert(process_id == cache_start[bufindx].in_cw_set);					\
 		}												\
 	}													\
-}
+} MBEND
 
 /* Macro to check that we have not pinned any more buffers than we are updating.
  * This check is done only for BG access method and in dbg mode.
  * This is invoked by t_end/tp_tend just before beginning phase2 of commit.
  */
-#define	DBG_CHECK_PINNED_CR_ARRAY_CONTENTS(is_mm, crarray, crarrayindex, bplmap)				\
-{														\
+#define	DBG_CHECK_PINNED_CR_ARRAY_CONTENTS(csd, is_mm, crarray, crarrayindex)					\
+MBSTART {													\
 	GBLREF	boolean_t	write_after_image;								\
+	cache_rec		*cr;										\
+	int4			crindex, bplmap;								\
 														\
 	if (!is_mm)												\
 	{													\
-		int4		crindex;									\
-														\
+		bplmap = csd->bplmap;										\
 		for (crindex = 0; crindex < crarrayindex; crindex++)						\
 		{												\
-			if (process_id == crarray[crindex]->in_cw_set)						\
+			cr = crarray[crindex];									\
+			if (process_id == cr->in_cw_set)							\
 			{	/* We have pinned that cache-record implies we are planning on updating it	\
-				 * (so should have set in_tend).						\
+				 * (so should have set in_tend). There are 2 exceptions though.			\
 				 *										\
-				 * Since bitmap blocks are done with phase2 inside of crit, they should not	\
+				 * a) Since bitmap blocks are done with phase2 inside of crit, they should not	\
 				 * show up in the pinned array list at end of phase1 for GT.M. But DSE is an	\
 				 * exception as it could operate on a bitmap block as if it is updating a	\
 				 * non-bitmap block (i.e. without invoking gvcst_map_build). MUPIP JOURNAL	\
-				 * RECOVER also could do the same thing while applying an AIMG record.		\
+				 * RECOVER also could do the same thing while applying an AIMG record. In both	\
+				 * cases, "write_after_image" would be TRUE.					\
 				 * 										\
-				 * In addition, VMS has an exception in case this is a twinned cache-record.	\
-				 * In that case, for the older twin in_cw_set will be set to non-zero, but	\
-				 * in_tend will be set to FALSE. Since we are outside of crit at this point,	\
-				 * it is possible cr->twin field might be 0 (could have gotten cleared by	\
-				 * wcs_wtfini concurrently) so we cannot assert on the twin field but		\
-				 * cr->bt_index should still be 0 since we have not yet finished the		\
-				 * update on the newer twin so we can check on that.				\
+				 * b) In case this is a twinned cache-record, for the older twin "in_cw_set"	\
+				 * will be set to non-zero, but "in_tend" will be set to FALSE. Since we are	\
+				 * outside of crit at this point, it is possible cr->twin field might be 0	\
+				 * (could have gotten cleared by wcs_wtfini concurrently) so we cannot assert	\
+				 * on the twin field but "cr->bt_index" should still be 0 since we have not	\
+				 * yet finished the update on the newer twin so use that instead. Also twinning	\
+				 * is enabled only if csd->asyncio is TRUE so check that as well.		\
 				 */										\
-				assert(crarray[crindex]->in_tend						\
-					&& ((0 != crarray[crindex]->blk % bplmap) || write_after_image)		\
-					VMS_ONLY(|| !crarray[crindex]->bt_index));				\
+				assert((process_id == cr->in_tend)						\
+					|| ((0 == (cr->blk % bplmap)) && write_after_image)			\
+					|| (csd->asyncio && !cr->bt_index));					\
 			}											\
 		}												\
 	}													\
-}
+} MBEND
 
 #else
 #define DBG_ENSURE_PTR_IS_VALID_GLOBUFF(CSA, CSD, PTR)
 #define DBG_ENSURE_PTR_IS_VALID_ENCTWINGLOBUFF(CSA, CSD, PTR)
 #define DBG_ENSURE_OLD_BLOCK_IS_VALID(cse, is_mm, csa, csd)
 #define DBG_BG_PHASE2_CHECK_CR_IS_PINNED(csa, bufaddr)
-#define	DBG_CHECK_PINNED_CR_ARRAY_CONTENTS(is_mm, crarray, crarrayindex, bplmap)
+#define	DBG_CHECK_PINNED_CR_ARRAY_CONTENTS(csd, is_mm, crarray, crarrayindex)
 #endif
 
 /* The TP_CHANGE_REG macro is a replica of the tp_change_reg() routine to be used for performance considerations.
@@ -786,7 +905,7 @@ gtm_uint64_t verify_queue(que_head_ptr_t qhdr);
  *	and use the TP_CHANGE_REG macro only.
  */
 #define	TP_CHANGE_REG(reg)									\
-{												\
+MBSTART {											\
 	gv_cur_region = reg;									\
 	if (NULL == gv_cur_region || FALSE == gv_cur_region->open)				\
 	{											\
@@ -811,10 +930,10 @@ gtm_uint64_t verify_queue(que_head_ptr_t qhdr);
 				break;								\
 		}										\
 	}											\
-}
+} MBEND
 
 #define	TP_CHANGE_REG_IF_NEEDED(reg)								\
-{												\
+MBSTART {											\
 	assert(reg);										\
 	if (reg != gv_cur_region)								\
 	{											\
@@ -839,22 +958,22 @@ gtm_uint64_t verify_queue(que_head_ptr_t qhdr);
 				break;								\
 		}										\
 	}											\
-}
+} MBEND
 
 #define PUSH_GV_CUR_REGION(reg, sav_reg, sav_cs_addrs, sav_cs_data)				\
-{												\
+MBSTART {											\
 	sav_reg = gv_cur_region;								\
 	sav_cs_addrs = cs_addrs;								\
 	sav_cs_data = cs_data;									\
-	TP_CHANGE_REG(reg)									\
-}
+	TP_CHANGE_REG(reg);									\
+} MBEND
 
 #define POP_GV_CUR_REGION(sav_reg, sav_cs_addrs, sav_cs_data)					\
-{												\
+MBSTART {											\
 	gv_cur_region = sav_reg;								\
 	cs_addrs = sav_cs_addrs;								\
 	cs_data = sav_cs_data;									\
-}
+} MBEND
 
 /* The TP_TEND_CHANGE_REG macro is a special macro used in tp_tend.c to optimize out the unnecessary checks in
  * the TP_CHANGE_REG_IF_NEEDED macro. Also it sets cs_addrs and cs_data to precomputed values instead of recomputing
@@ -863,14 +982,14 @@ gtm_uint64_t verify_queue(que_head_ptr_t qhdr);
  * is not worth the additional unconditional sets.
  */
 #define	TP_TEND_CHANGE_REG(si)				\
-{							\
+MBSTART {						\
 	gv_cur_region = si->gv_cur_region;		\
 	cs_addrs = si->tp_csa;				\
 	cs_data = si->tp_csd;				\
-}
+} MBEND
 
 #define	GTCM_CHANGE_REG(reghead)										\
-{														\
+MBSTART {													\
 	GBLREF cm_region_head	*curr_cm_reg_head;								\
 	GBLREF gd_region	*gv_cur_region;									\
 	GBLREF sgmnt_data	*cs_data;									\
@@ -878,14 +997,14 @@ gtm_uint64_t verify_queue(que_head_ptr_t qhdr);
 														\
 	curr_cm_reg_head = (reghead);										\
 	gv_cur_region = curr_cm_reg_head->reg;									\
-	assert((dba_bg == REG_ACC_METH(gv_cur_region)) || (dba_mm == REG_ACC_METH(gv_cur_region)));		\
+	assert(IS_REG_BG_OR_MM(gv_cur_region));									\
 	cs_addrs = &FILE_INFO(gv_cur_region)->s_addrs;								\
 	cs_data = cs_addrs->hdr;										\
-}
+} MBEND
 
 /* Macro to be used whenever cr->data_invalid needs to be set */
 #define	SET_DATA_INVALID(cr)										\
-{													\
+MBSTART {												\
 	uint4	in_tend, data_invalid;									\
 													\
 	DEBUG_ONLY(in_tend = cr->in_tend);								\
@@ -894,25 +1013,25 @@ gtm_uint64_t verify_queue(que_head_ptr_t qhdr);
 	assert((0 == in_tend)										\
 		|| (process_id == in_tend) && ((0 == data_invalid) || (process_id == data_invalid)));	\
 	cr->data_invalid = process_id;									\
-}
+} MBEND
 
 /* Macro to be used whenever cr->data_invalid needs to be re-set */
 #define	RESET_DATA_INVALID(cr)				\
-{							\
+MBSTART {						\
 	uint4	data_invalid;				\
 							\
 	DEBUG_ONLY(data_invalid = cr->data_invalid);	\
 	assert(process_id == data_invalid);		\
 	cr->data_invalid = 0;				\
-}
+} MBEND
 
 /* Macro to be used whenever cr->in_cw_set needs to be set (PIN) inside a TP transaction */
 #define	TP_PIN_CACHE_RECORD(cr, si)					\
-{									\
+MBSTART {								\
 	assert(0 <= si->cr_array_index);				\
 	assert(si->cr_array_index < si->cr_array_size);			\
 	PIN_CACHE_RECORD(cr, si->cr_array, si->cr_array_index);		\
-}
+} MBEND
 
 GBLREF	cache_rec_ptr_t	pin_fail_cr;			/* Pointer to the cache-record that we failed while pinning */
 GBLREF	cache_rec	pin_fail_cr_contents;		/* Contents of the cache-record that we failed while pinning */
@@ -928,7 +1047,7 @@ GBLREF	int4		pin_fail_in_wtstart;		/* Count of processes in wcs_wtstart when we
 GBLREF	int4		pin_fail_phase2_commit_pidcnt;	/* Number of processes in phase2 commit when we failed to pin */
 /* Macro to be used whenever cr->in_cw_set needs to be set (PIN) outside of a TP transaction */
 #define	PIN_CACHE_RECORD(cr, crarray, crarrayindex)							\
-{													\
+MBSTART {												\
 	uint4	in_tend, data_invalid, in_cw_set;							\
 													\
 	DEBUG_ONLY(in_tend = cr->in_tend);								\
@@ -958,17 +1077,17 @@ GBLREF	int4		pin_fail_phase2_commit_pidcnt;	/* Number of processes in phase2 com
 		pin_fail_phase2_commit_pidcnt	= cs_addrs->nl->wcs_phase2_commit_pidcnt;		\
 		assertpro(0 == in_cw_set);								\
 	}												\
-	/* In VMS we should never set in_cw_set on an OLDER twin. */					\
-	VMS_ONLY(assert(!cr->twin || cr->bt_index));							\
+	/* If twinning, we should never set in_cw_set on an OLDER twin. Assert that. */			\
+	assert(!cr->twin || cr->bt_index);								\
 	/* stuff it in the array before setting in_cw_set */						\
 	crarray[crarrayindex] = cr;									\
 	crarrayindex++;											\
 	cr->in_cw_set = process_id;									\
-}
+} MBEND
 
 /* Macro to be used whenever cr->in_cw_set needs to be re-set (UNPIN) in TP or non-TP) */
 #define	UNPIN_CACHE_RECORD(cr)								\
-{											\
+MBSTART {										\
 	uint4	in_tend, data_invalid, in_cw_set;					\
 											\
 	in_cw_set = cr->in_cw_set;							\
@@ -980,11 +1099,11 @@ GBLREF	int4		pin_fail_phase2_commit_pidcnt;	/* Number of processes in phase2 com
 		assert((process_id == data_invalid) || (0 == data_invalid));		\
 		cr->in_cw_set = 0;							\
 	}										\
-}
+} MBEND
 
 /* Macro to reset cr->in_cw_set for the entire cr_array in case of a retry (TP or non-TP) */
 #define	UNPIN_CR_ARRAY_ON_RETRY(crarray, crarrayindex)				\
-{										\
+MBSTART {									\
 	int4			lcl_crarrayindex;				\
 	cache_rec_ptr_ptr_t	cr_ptr;						\
 	cache_rec_ptr_t		cr;						\
@@ -1008,63 +1127,68 @@ GBLREF	int4		pin_fail_phase2_commit_pidcnt;	/* Number of processes in phase2 com
 		}								\
 		crarrayindex = 0;						\
 	}									\
-}
+} MBEND
 
-/* Macro to reset cr->in_cw_set (UNPIN) for the entire cr_array in case of a commit (TP or non-TP).
- * Usually in_cw_set is set for all cache-records that we are planning on updating before we start phase1.
- * After updating each cse in phase2, we reset the corresponding cse->cr->in_cw_set.
- * Therefore on a successful commit, after completing all cses in phase2, we dont expect any pinned cr->in_cw_set at all.
- * This is true for Unix but in VMS where we could have twins, both the older and newer twins have the in_cw_set set in
- * phase1 while only the newer twin's in_cw_set gets reset in phase2 (since only this cr will be stored in cse->cr).
- * Therefore there could be a few cache-records which need to be unpinned even after all cses are done in phase2.
- * The following macro unpins those. It is structured such a way that in Unix, it only checks that all have been reset
- * while it actually does the reset only in VMS.
+#define	RESET_CR_IN_TEND_AFTER_PHASE2_COMMIT(CR)										\
+{																\
+	cache_rec_ptr_t		cr_old;												\
+																\
+	GBLREF	uint4		process_id;											\
+																\
+	if (CR->backup_cr_is_twin)												\
+	{	/* We created a twin in "bg_update_phase1". If we had pinned the older twin (Note: it is possible in some cases	\
+		 * that we do not pin the older twin (e.g. in tp_tend if cse->new_buff is non-NULL), let us unpin the older twin\
+		 * before unpinning the newer twin. Not doing so could cause "db_csh_getn" to identify the new twin as a buffer	\
+		 * ready for replacement but "wcs_get_space/wcs_wtstart_fini/wcs_wtstart/wcs_wtfini" would not be able to flush	\
+		 * the new twin until the old twin has its "in_cw_set" cleared resulting in a livelock.				\
+		 */														\
+		assert(TWINNING_ON(csd));											\
+		cr_old = (cache_rec_ptr_t)GDS_ANY_REL2ABS(csa, CR->twin);	/* get old twin */				\
+		assert(!cr_old->bt_index);											\
+		assert(!cr_old->in_cw_set || cr_old->dirty);									\
+		assert(CR->bt_index);												\
+		assert((process_id == cr_old->in_cw_set) || (0 == cr_old->in_cw_set));						\
+		UNPIN_CACHE_RECORD(cr_old);											\
+	}															\
+	/* A concurrent process reading this block will wait for in_tend to become FALSE and then proceed with its		\
+	 * database operation. Later it will reach t_end/tp_tend doing validations at which point it will need to set in_cw_set.\
+	 * It expects in_cw_set to be 0 at that point. Therefore in_cw_set needs to be reset to 0 BEFORE resetting in_tend.	\
+	 * Need a write memory barrier to ensure that these two updates are seen in that order by any other concurrent process.	\
+	 */															\
+	assert(process_id == CR->in_cw_set);											\
+	UNPIN_CACHE_RECORD(CR);													\
+	assert(!CR->in_cw_set);													\
+	SHM_WRITE_MEMORY_BARRIER;												\
+	assert(process_id == CR->in_tend);	/* should still be valid */							\
+	CR->in_tend = 0;													\
+}
+
+/* Macro to check that UNPIN of cr is complete (i.e. cr->in_cw_set has been reset to 0) for the entire cr_array in case of a
+ * commit (TP or non-TP). Usually in_cw_set is set for all cache-records that we are planning on updating before we start phase1.
+ * After updating each cse in phase2, we reset the corresponding cse->cr->in_cw_set. Therefore on a successful commit, after
+ * completing all cses in phase2, we don't expect any pinned cr->in_cw_set at all.
  */
-#if defined(VMS)
-#define UNPIN_CR_ARRAY_ON_COMMIT(crarray, crarrayindex)				\
-{										\
-	int4			lcl_crarrayindex;				\
-	cache_rec_ptr_ptr_t	cr_ptr;						\
-	cache_rec_ptr_t		cr;						\
-										\
-	lcl_crarrayindex = crarrayindex;					\
-	if (lcl_crarrayindex)							\
-	{									\
-		cr_ptr = (cache_rec_ptr_ptr_t)&crarray[lcl_crarrayindex-1];	\
-		while (lcl_crarrayindex--)					\
-		{								\
-			cr = *cr_ptr;						\
-			UNPIN_CACHE_RECORD(cr);					\
-			cr_ptr--;						\
-		}								\
-		crarrayindex = 0;						\
-	}									\
-}
-#elif defined(UNIX)
-#	ifdef DEBUG
-#	define UNPIN_CR_ARRAY_ON_COMMIT(crarray, crarrayindex)				\
-	{										\
-		int4			lcl_crarrayindex;				\
-		cache_rec_ptr_ptr_t	cr_ptr;						\
-		cache_rec_ptr_t		cr;						\
+#ifdef DEBUG
+#define ASSERT_CR_ARRAY_IS_UNPINNED(CSD, CRARRAY, CRARRAYINDEX)				\
+MBSTART {										\
+	int4			lcl_crarrayindex;					\
+	cache_rec_ptr_ptr_t	cr_ptr, cr_start;					\
+	cache_rec_ptr_t		cr;							\
 											\
-		lcl_crarrayindex = crarrayindex;					\
-		if (lcl_crarrayindex)							\
+	lcl_crarrayindex = CRARRAYINDEX;						\
+	if (lcl_crarrayindex)								\
+	{										\
+		cr_ptr = (cache_rec_ptr_ptr_t)&CRARRAY[lcl_crarrayindex];		\
+		cr_start = &CRARRAY[0];							\
+		while (--cr_ptr >= cr_start)						\
 		{									\
-			cr_ptr = (cache_rec_ptr_ptr_t)&crarray[lcl_crarrayindex-1];	\
-			while (lcl_crarrayindex--)					\
-			{								\
-				cr = *cr_ptr;						\
-				assert(process_id != cr->in_cw_set);			\
-				cr_ptr--;						\
-			}								\
-			crarrayindex = 0;						\
+			cr = *cr_ptr;							\
+			assert(process_id != cr->in_cw_set);				\
 		}									\
-	}
-#	else
-#	define UNPIN_CR_ARRAY_ON_COMMIT(crarray, crarrayindex)				\
-		crarrayindex = 0;
-#	endif
+	}										\
+} MBEND
+#else
+#define ASSERT_CR_ARRAY_IS_UNPINNED(CSD, CRARRAY, CRARRAYINDEX)
 #endif
 
 /* Every process that initializes journal pool has two aspects of validation.
@@ -1086,7 +1210,7 @@ GBLREF	int4		pin_fail_phase2_commit_pidcnt;	/* Number of processes in phase2 com
 #define SCNDDBNOUPD_CHECK_TRUE		0x01
 
 #define VALIDATE_INITIALIZED_JNLPOOL(CSA, CNL, REG, JNLPOOL_USER, SCNDDBNOUPD_CHECK_NEEDED)					\
-{																\
+MBSTART {															\
 	GBLREF	jnlpool_ctl_ptr_t	jnlpool_ctl;										\
 	GBLREF	boolean_t		is_updproc;										\
 	GBLREF	jnlpool_addrs		jnlpool;										\
@@ -1118,8 +1242,7 @@ GBLREF	int4		pin_fail_phase2_commit_pidcnt;	/* Number of processes in phase2 com
 		}														\
 		if (do_REPLINSTMISMTCH_check)											\
 		{														\
-			UNIX_ONLY(jnlpool_instfilename = (sm_uc_ptr_t)jnlpool_ctl->jnlpool_id.instfilename;)			\
-			VMS_ONLY(jnlpool_instfilename = (sm_uc_ptr_t)jnlpool_ctl->jnlpool_id.gtmgbldir;)			\
+			jnlpool_instfilename = (sm_uc_ptr_t)jnlpool_ctl->jnlpool_id.instfilename;				\
 			if (STRCMP(CNL->replinstfilename, jnlpool_instfilename)							\
 				UNIX_ONLY(|| (CNL->jnlpool_shmid != jnlpool.repl_inst_filehdr->jnlpool_shmid)))			\
 			{													\
@@ -1128,7 +1251,6 @@ GBLREF	int4		pin_fail_phase2_commit_pidcnt;	/* Number of processes in phase2 com
 				 *	from the instance file name used by the current process.				\
 				 * (b) Database has already been bound with a jnlpool shmid and another jnlpool is about to	\
 				 *	be bound with the same database. Disallow this mixing of multiple jnlpools.		\
-				 * Note that (b) is Unix-only. In VMS, we dont check the shmids currently.			\
 				 * Issue error. But before that detach from journal pool.					\
 				 * Copy replication instance file name in journal pool to temporary memory before detaching.	\
 				 * Actually case (b) subsumes (a) so we assert that below. But in pro we handle both cases	\
@@ -1136,11 +1258,9 @@ GBLREF	int4		pin_fail_phase2_commit_pidcnt;	/* Number of processes in phase2 com
 				 */												\
 				UNIX_ONLY(assert(CNL->jnlpool_shmid != jnlpool.repl_inst_filehdr->jnlpool_shmid);)		\
 				UNIX_ONLY(assert(SIZEOF(instfilename_copy) == SIZEOF(jnlpool_ctl->jnlpool_id.instfilename)));	\
-				VMS_ONLY(assert(SIZEOF(instfilename_copy) == SIZEOF(jnlpool_ctl->jnlpool_id.gtmgbldir)));	\
 				memcpy(&instfilename_copy[0], jnlpool_instfilename, SIZEOF(instfilename_copy));			\
 				assert(SIZEOF(jnlpool_shmid) == SIZEOF(CNL->jnlpool_shmid));					\
-				UNIX_ONLY(jnlpool_shmid = jnlpool.repl_inst_filehdr->jnlpool_shmid;)				\
-				VMS_ONLY(jnlpool_shmid = 0;)	/* print shmid of 0 for VMS as it is actually a string */	\
+				jnlpool_shmid = jnlpool.repl_inst_filehdr->jnlpool_shmid;					\
 				assert(NULL != jnlpool.jnlpool_ctl);								\
 				jnlpool_detach();										\
 				assert(NULL == jnlpool.jnlpool_ctl);								\
@@ -1155,10 +1275,10 @@ GBLREF	int4		pin_fail_phase2_commit_pidcnt;	/* Number of processes in phase2 com
 			CSA->jnlpool_validate_check |= REPLINSTMISMTCH_CHECK_DONE;						\
 		}														\
 	}															\
-}
+} MBEND
 
 #define	JNLPOOL_INIT_IF_NEEDED(CSA, CSD, CNL)											\
-{																\
+MBSTART {															\
 	GBLREF	boolean_t		is_replicator;										\
 	GBLREF	boolean_t		pool_init;										\
 	GBLREF	gd_region		*gv_cur_region;										\
@@ -1170,10 +1290,10 @@ GBLREF	int4		pin_fail_phase2_commit_pidcnt;	/* Number of processes in phase2 com
 		assert(pool_init);												\
 		VALIDATE_INITIALIZED_JNLPOOL(CSA, CNL, gv_cur_region, GTMPROC, SCNDDBNOUPD_CHECK_TRUE);				\
 	}															\
-}
+} MBEND
 
 #define ASSERT_VALID_JNLPOOL(CSA)										\
-{														\
+MBSTART {													\
 	GBLREF	jnlpool_ctl_ptr_t	jnlpool_ctl;								\
 	GBLREF	jnlpool_addrs		jnlpool;								\
 														\
@@ -1191,7 +1311,7 @@ GBLREF	int4		pin_fail_phase2_commit_pidcnt;	/* Number of processes in phase2 com
 			+ jnlpool_ctl->srclcl_array_off));							\
 	assert(jnlpool.gtmsource_local_array == (gtmsource_local_ptr_t)((sm_uc_ptr_t)jnlpool_ctl		\
 					+ jnlpool_ctl->sourcelocal_array_off));					\
-}
+} MBEND
 
 /* Explanation for why we need the following macro.
  *
@@ -1201,7 +1321,7 @@ GBLREF	int4		pin_fail_phase2_commit_pidcnt;	/* Number of processes in phase2 com
  * is defined. This macro compares transaction numbers directly from the buffer instead of
  * going through the bt or blk queues. This is done to speed up processing. One consequence
  * is that we might encounter a situation where the buffer's contents hasn't been modified,
- * but the block might actually have been changed i.e. in VMS a twin buffer might have been
+ * but the block might actually have been changed e.g. if asyncio=ON, a twin buffer might have been
  * created or the "blk" field in the cache-record corresponding to this buffer might have
  * been made CR_BLKEMPTY etc. In these cases, we rely on the fact that the cycle for the
  * buffer would have been incremented thereby saving us in the cdb_sc_lostcr check which will
@@ -1240,12 +1360,8 @@ GBLREF	int4		pin_fail_phase2_commit_pidcnt;	/* Number of processes in phase2 com
 #define	TP_IS_CDB_SC_BLKMOD3(cr, t1, blktn) (((NULL != (cr)) && (cr)->in_tend) || ((t1)->tn <= blktn))
 
 #define MM_ADDR(SGD)		((sm_uc_ptr_t)(((sgmnt_data_ptr_t)SGD) + 1))
-#ifdef VMS
-#define MASTER_MAP_BLOCKS_DFLT		64				/* 64 gives 128M possible blocks */
-#else
 #define MASTER_MAP_BLOCKS_DFLT		496				/* 496 gives 992M possible blocks */
 #define MASTER_MAP_BLOCKS_V5		112				/* 112 gives 224M possible blocks */
-#endif
 #define MASTER_MAP_BLOCKS_V4		32				/* 32 gives 64M possible blocks  */
 #define MASTER_MAP_BLOCKS_MAX		MASTER_MAP_BLOCKS_DFLT		/* 496 gives 992M possible blocks  */
 #define MASTER_MAP_BLOCKS_V5_OLD	64				/* V5 database previous master map block size */
@@ -1264,8 +1380,8 @@ GBLREF	int4		pin_fail_phase2_commit_pidcnt;	/* Number of processes in phase2 com
 #define MM_BLOCK		(SGMNT_HDR_LEN / DISK_BLOCK_SIZE + 1)	/* gt.m numbers blocks from 1 */
 #define TH_BLOCK	 	1
 
-#define JNL_NAME_SIZE	        256        /* possibly expanded when opened */
-#define JNL_NAME_EXP_SIZE	1024       /* MAXPATHLEN, before jnl_buffer in shared memory */
+#define JNL_NAME_SIZE	        256  /* possibly expanded when opened. Macro value should not change as it is used in db file hdr */
+#define JNL_NAME_EXP_SIZE	1024 /* MAXPATHLEN, before jnl_buffer in shared memory */
 
 #define BLKS_PER_LMAP		512
 #define MAXTOTALBLKS_V4		(MASTER_MAP_SIZE_V4 * 8 * BLKS_PER_LMAP)
@@ -1274,11 +1390,9 @@ GBLREF	int4		pin_fail_phase2_commit_pidcnt;	/* Number of processes in phase2 com
 #define MAXTOTALBLKS_MAX	(MASTER_MAP_SIZE_MAX * 8 * BLKS_PER_LMAP)
 #define MAXTOTALBLKS(SGD)	(MASTER_MAP_SIZE(SGD) * 8 * BLKS_PER_LMAP)
 #define	IS_BITMAP_BLK(blk)	(ROUND_DOWN2(blk, BLKS_PER_LMAP) == blk)	/* TRUE if blk is a bitmap */
-/* UNIX -
- * 	V6 - 8K fileheader (= 16 blocks) + 248K mastermap (= 496 blocks) + 1
+/* 	V6 - 8K fileheader (= 16 blocks) + 248K mastermap (= 496 blocks) + 1
  * 	V5 - 8K fileheader (= 16 blocks) + 56K mastermap (= 112 blocks) + 1
  * 	V4 - 8K fileheader (= 16 blocks) + 16K mastermap (= 32 blocks) + 1
- * VMS  - 8K fileheader (= 16 blocks) + 32K mastermap (= 64 blocks) + 24K padding (= 48 blocks) + 1
  */
 #define START_VBN_V6		513
 #define START_VBN_V5		129
@@ -1298,53 +1412,32 @@ GBLREF	int4		pin_fail_phase2_commit_pidcnt;	/* Number of processes in phase2 com
 #  define DEBUG_DYNGRD_ONLY(X)
 #endif
 
-#ifdef VMS
-/* RET is a dummy that is not really used on VMS */
-#define	DCLAST_WCS_WTSTART(reg, num_bufs, RET)				\
-{									\
-	unsigned int	status;						\
-									\
-	if (SS$_NORMAL != (status = sys$dclast(wcs_wtstart, reg, 0)))	\
-	{								\
-		assert(FALSE);						\
-		status = DISABLE_AST;					\
-		wcs_wtstart(reg);					\
-		if (SS$_WASSET == status)				\
-			ENABLE_AST;					\
-	}								\
-}
-#elif defined(UNIX)
-#define	DCLAST_WCS_WTSTART(reg, num_bufs, RET)	RET = wcs_wtstart(reg, num_bufs);
-#else
-#error UNSUPPORTED PLATFORM
-#endif
-
 #define SAVE_WTSTART_PID(cnl, pid, index)			\
-{								\
+MBSTART {							\
 	for (index = 0; index < MAX_WTSTART_PID_SLOTS; index++)	\
 		if (0 == cnl->wtstart_pid[index])		\
 			break;					\
 	if (MAX_WTSTART_PID_SLOTS > index)			\
 		cnl->wtstart_pid[index] = pid;			\
-}
+} MBEND
 
 #define CLEAR_WTSTART_PID(cnl, index)				\
-{								\
+MBSTART {							\
 	if (MAX_WTSTART_PID_SLOTS > index)			\
 		cnl->wtstart_pid[index] = 0;			\
-}
+} MBEND
 
 #define	WRITERS_ACTIVE(cnl)	((0 < cnl->intent_wtstart) || (0 < cnl->in_wtstart))
 
 #define	SIGNAL_WRITERS_TO_STOP(cnl)								\
-{												\
+MBSTART {											\
 	SET_TRACEABLE_VAR((cnl)->wc_blocked, TRUE);	/* to stop all active writers */	\
 	/* memory barrier needed to broadcast this information to other processors */		\
 	SHM_WRITE_MEMORY_BARRIER;								\
-}
+} MBEND
 
 #define	WAIT_FOR_WRITERS_TO_STOP(cnl, lcnt, maxiters)						\
-{	/* We need to ensure that an uptodate value of cnl->intent_wtstart is read in the	\
+MBSTART {	/* We need to ensure that an uptodate value of cnl->intent_wtstart is read in the\
 	 * WRITERS_ACTIVE macro every iteration of the loop hence the read memory barrier.	\
 	 */											\
 	SHM_READ_MEMORY_BARRIER;								\
@@ -1353,17 +1446,17 @@ GBLREF	int4		pin_fail_phase2_commit_pidcnt;	/* Number of processes in phase2 com
 		wcs_sleep(lcnt);								\
 		SHM_READ_MEMORY_BARRIER;							\
 	}											\
-}
+} MBEND
 
 #define	SIGNAL_WRITERS_TO_RESUME(cnl)								\
-{												\
+MBSTART {											\
 	SET_TRACEABLE_VAR((cnl)->wc_blocked, FALSE); /* to let active writers resume */	\
 	/* memory barrier needed to broadcast this information to other processors */		\
 	SHM_WRITE_MEMORY_BARRIER;								\
-}
+} MBEND
 
 #define	INCR_INTENT_WTSTART(cnl)									\
-{													\
+MBSTART {												\
 	INCR_CNT(&cnl->intent_wtstart, &cnl->wc_var_lock); /* signal intent to enter wcs_wtstart */	\
 	if (0 >= cnl->intent_wtstart)									\
 	{	/* possible if wcs_verify had reset this flag */					\
@@ -1372,24 +1465,24 @@ GBLREF	int4		pin_fail_phase2_commit_pidcnt;	/* Number of processes in phase2 com
 		 * after wcs_recover waits for a maximum of 1 minute (for this flag to become zero)	\
 		 * before giving up. Therefore for that to happen, we should have been context		\
 		 * switched out for 1 minute after the second INCR_CNT but before the below assert)	\
-		 * We believe that is an extremely unlikely condition so dont do anything about it.	\
+		 * We believe that is an extremely unlikely condition so don't do anything about it.	\
 		 * In the worst case this will get reset to 0 by the next wcs_verify or INCR_CNT	\
 		 * (may need multiple INCR_CNTs depending on how negative a value this is) whichever	\
 		 * happens sooner.									\
 		 */											\
 		assert(0 < cnl->intent_wtstart);							\
 	}												\
-}
+} MBEND
 
 #define	DECR_INTENT_WTSTART(cnl)					\
-{									\
+MBSTART {								\
 	if (0 < cnl->intent_wtstart)					\
 		DECR_CNT(&cnl->intent_wtstart, &cnl->wc_var_lock);	\
 	/* else possible if wcs_verify had reset this flag */		\
-}
+} MBEND
 
 #define ENSURE_JNL_OPEN(csa, reg)                                                 					\
-{                                                                               					\
+MBSTART {                                                                               				\
 	boolean_t		was_crit;                                               				\
 	jnl_private_control	*jpc;											\
 	sgmnt_data_ptr_t	csd;											\
@@ -1404,7 +1497,7 @@ GBLREF	int4		pin_fail_phase2_commit_pidcnt;	/* Number of processes in phase2 com
 		was_crit = csa->now_crit;                                         					\
 		if (!was_crit)                                                  					\
 			grab_crit(reg);                                         					\
-		jnl_status = JNL_ENABLED(csd) ? jnl_ensure_open() : 0;    	                             		\
+		jnl_status = JNL_ENABLED(csd) ? jnl_ensure_open(reg, csa) : 0;    	                             	\
 		if (!was_crit)                                                  					\
 			rel_crit(reg);                                          					\
 		if (0 != jnl_status)											\
@@ -1419,14 +1512,19 @@ GBLREF	int4		pin_fail_phase2_commit_pidcnt;	/* Number of processes in phase2 com
 						DB_LEN_STR(gv_cur_region));						\
 		}													\
 	}                                                                       					\
-}
+} MBEND
 
 /* the RET is meaningful only on UNIX */
-#define JNL_ENSURE_OPEN_WCS_WTSTART(csa, reg, num_bufs, RET)    \
-{                                                               \
-	ENSURE_JNL_OPEN(csa, reg);                              \
-	DCLAST_WCS_WTSTART(reg, num_bufs, RET);			\
-}
+#define JNL_ENSURE_OPEN_WCS_WTSTART(csa, reg, num_bufs, cr2flush, CHILLWAIT, RET)		\
+MBSTART {       										\
+	if ((CHILLWAIT) && !FREEZE_LATCH_HELD(csa))						\
+		WAIT_FOR_REGION_TO_UNCHILL(csa, csa->hdr);					\
+	ENSURE_JNL_OPEN(csa, reg);                              				\
+	if (csa->hdr->asyncio)									\
+		RET = wcs_wtstart_fini(reg, num_bufs, cr2flush);				\
+	else											\
+		RET = wcs_wtstart(reg, num_bufs, NULL, cr2flush);				\
+} MBEND
 
 /* Macros to effect changes in the blks_to_upgrd field of the file-header.
  * We should hold crit on the region in all cases except for one when we are in MUPIP CREATE (but we are still standalone here).
@@ -1435,7 +1533,7 @@ GBLREF	int4		pin_fail_phase2_commit_pidcnt;	/* Number of processes in phase2 com
  * Use local variables to record shared memory information doe debugging purposes in case of an assert failure.
  */
 #define INCR_BLKS_TO_UPGRD(csa, csd, delta)						\
-{											\
+MBSTART {										\
 	int4	new_blks_to_upgrd;							\
 	int4	cur_blks_to_upgrd;							\
 	int4	cur_delta;								\
@@ -1463,7 +1561,7 @@ GBLREF	int4		pin_fail_phase2_commit_pidcnt;	/* Number of processes in phase2 com
 		}									\
 	} else										\
 		(csd)->fully_upgraded = FALSE;						\
-}
+} MBEND
 #define DECR_BLKS_TO_UPGRD(csa, csd, delta)	INCR_BLKS_TO_UPGRD((csa), (csd), -(delta))
 
 /* Interlocked queue instruction constants ... */
@@ -1496,16 +1594,38 @@ n_db_csh_acct_rec_types
 #include "probecrit_rec.h"
 #endif
 
-#define	GVSTATS_SET_CSA_STATISTIC(csa, counter, value)		\
-{								\
-	csa->gvstats_rec.counter = value;			\
-}
+#define	GVSTATS_SET_CSA_STATISTIC(CSA, COUNTER, VALUE)							\
+MBSTART {												\
+	if (0 == (RDBF_NOSTATS & (CSA)->reservedDBFlags))						\
+		(CSA)->gvstats_rec_p->COUNTER = VALUE;							\
+} MBEND
 
-#define	INCR_GVSTATS_COUNTER(csa, cnl, counter, increment)			\
-{										\
-	csa->gvstats_rec.counter += increment;	/* process private stats */	\
-	cnl->gvstats_rec.counter += increment;	/* database stats */		\
-}
+#define	INCR_GVSTATS_COUNTER(CSA, CNL, COUNTER, INCREMENT)						\
+MBSTART {												\
+	if (0 == (RDBF_NOSTATS & (CSA)->reservedDBFlags))						\
+	{												\
+		(CSA)->gvstats_rec_p->COUNTER += INCREMENT;		/* private or shared stats */	\
+		(CNL)->gvstats_rec.COUNTER += INCREMENT;		/* database stats */ 		\
+	}												\
+} MBEND
+
+#define	SYNC_RESERVEDDBFLAGS_REG_CSA_CSD(REG, CSA, CSD, CNL)								\
+MBSTART {														\
+	uint4			reservedDBFlags;									\
+															\
+	if (TREF(ok_to_see_statsdb_regs))										\
+	{														\
+		reservedDBFlags = CSD->reservedDBFlags;	/* sgmnt_data is flag authority */				\
+		/* If this is a base DB (i.e. not a statsdb), but we could not successfully create the statsdb		\
+		 * (e.g. $gtm_statsdir issues etc.) then disable RDBF_STATSDB in the region. So this db continues	\
+		 * without statistics gathering.									\
+		 */													\
+		if (!IS_RDBF_STATSDB(CSD) && (NULL != CNL) && !CNL->statsdb_fname_len)					\
+			reservedDBFlags &= (~RDBF_STATSDB);								\
+		REG->reservedDBFlags = CSA->reservedDBFlags = reservedDBFlags;						\
+	}														\
+	/* else : "gd_load" would have already set RDBF_NOSTATS etc. so don't override that */				\
+} MBEND
 
 /* Clear everything from the end of the encryption section up to the ntrpt_recov_resync_strm_seqno array, which includes all
  * bg_trc_rec_tn, all bg_trc_rec_cntr, all db_csh_acct_rec, all gvstats as well as any intervening filler; also clear
@@ -1515,7 +1635,7 @@ n_db_csh_acct_rec_types
  * nor move either of those end points without appropriately adjusting this macro.
  */
 #define	CLRGVSTATS(CSA)									\
-{											\
+MBSTART {										\
 	char			*CHPTR;							\
 	int			CLRLEN;							\
 	sgmnt_data_ptr_t	CSD;							\
@@ -1526,8 +1646,7 @@ n_db_csh_acct_rec_types
 	memset(CHPTR, 0, CLRLEN);							\
 	gvstats_rec_csd2cnl(CSA);	/* we update gvstats in cnl */			\
 	memset((char *)&CSD->tp_cdb_sc_blkmod, 0, SIZEOF(CSD->tp_cdb_sc_blkmod));	\
-}
-
+} MBEND
 
 #if defined(DEBUG) || defined(DEBUG_DB_CSH_COUNTER)
 #	define	INCR_DB_CSH_COUNTER(csa, counter, increment)				\
@@ -1567,23 +1686,24 @@ enum tp_ntp_blkmod_type		/* used for accounting in cs_data->tp_cdb_sc_blkmod[] *
 /* Below is a list of macro bitmasks used to set the global variable "donot_commit". This variable should normally be 0.
  * But in rare cases, we could end up in situations where we know it is a restartable situation but decide not to
  * restart right away (because of interface issues that the function where this is detected cannot signal a restart
- * or because we dont want to take a performance hit to check this restartable situation in highly frequented code if
+ * or because we don't want to take a performance hit to check this restartable situation in highly frequented code if
  * the restart will anyway be detected before commit. In this cases, this variable will take on non-zero values.
  * The commit logic will assert that this variable is indeed zero after validation but before proceeding with commit.
  */
-#define	DONOTCOMMIT_TPHIST_BLKTARGET_MISMATCH		(1 << 0) /* Restartable situation encountered in tp_hist */
-#define	DONOTCOMMIT_GVCST_DELETE_BLK_CSE_TLEVEL		(1 << 1) /* Restartable situation encountered in gvcst_delete_blk */
-#define	DONOTCOMMIT_JNLGETCHECKSUM_NULL_CR		(1 << 2) /* Restartable situation encountered in jnl_get_checksum.h */
-#define	DONOTCOMMIT_GVCST_KILL_ZERO_TRIGGERS		(1 << 3) /* Restartable situation encountered in gvcst_kill */
-#define	DONOTCOMMIT_GVCST_BLK_BUILD_TPCHAIN		(1 << 4) /* Restartable situation encountered in gvcst_blk_build */
+#define	DONOTCOMMIT_TPHIST_BLKTARGET_MISMATCH		(1 << 0) /* Restartable situation seen in tp_hist */
+#define	DONOTCOMMIT_GVCST_DELETE_BLK_CSE_TLEVEL		(1 << 1) /* Restartable situation seen in gvcst_delete_blk */
+#define	DONOTCOMMIT_JNLGETCHECKSUM_NULL_CR		(1 << 2) /* Restartable situation seen in jnl_get_checksum.h */
+#define	DONOTCOMMIT_GVCST_KILL_ZERO_TRIGGERS		(1 << 3) /* Restartable situation seen in gvcst_kill */
+#define	DONOTCOMMIT_GVCST_BLK_BUILD_TPCHAIN		(1 << 4) /* Restartable situation seen in gvcst_blk_build */
 #define	DONOTCOMMIT_T_QREAD_BAD_PVT_BUILD		(1 << 5) /* Restartable situation due to bad private build in t_qread */
-#define	DONOTCOMMIT_GVCST_SEARCH_LEAF_BUFFADR_NOTSYNC	(1 << 6) /* Restartable situation encountered in gvcst_search */
-#define	DONOTCOMMIT_GVCST_SEARCH_BLKTARGET_MISMATCH	(1 << 7) /* Restartable situation encountered in gvcst_search */
-#define DONOTCOMMIT_REALLOCATE_BITMAP_BMLMOD		(1 << 8) /* Restartable situation encountered in reallocate_bitmap */
-#define DONOTCOMMIT_T_WRITE_CSE_DONE			(1 << 9) /* Restartable situation encountered in t_write */
-#define DONOTCOMMIT_T_WRITE_CSE_MODE			(1 << 10) /* Restartable situation encountered in t_write */
-#define DONOTCOMMIT_TRIGGER_SELECT_XECUTE		(1 << 11) /* Restartable situation encountered in trigger_select */
-#define DONOTCOMMIT_JNL_FORMAT				(1 << 12) /* Restartable situation encountered in jnl_format */
+#define	DONOTCOMMIT_GVCST_SEARCH_LEAF_BUFFADR_NOTSYNC	(1 << 6) /* Restartable situation seen in gvcst_search */
+#define	DONOTCOMMIT_GVCST_SEARCH_BLKTARGET_MISMATCH	(1 << 7) /* Restartable situation seen in gvcst_search */
+#define DONOTCOMMIT_GVCST_PUT_SPLIT_TO_RIGHT		(1 << 8) /* Restartable situation seen in gvcst_put */
+#define DONOTCOMMIT_T_WRITE_CSE_DONE			(1 << 9) /* Restartable situation seen in t_write */
+#define DONOTCOMMIT_T_WRITE_CSE_MODE			(1 << 10) /* Restartable situation seen in t_write */
+#define DONOTCOMMIT_TRIGGER_SELECT_XECUTE		(1 << 11) /* Restartable situation seen in trigger_select */
+#define DONOTCOMMIT_JNL_FORMAT				(1 << 12) /* Restartable situation seen in jnl_format */
+#define DONOTCOMMIT_COPY_PREV_KEY_TO_GVT_CLUE		(1 << 13) /* Restartable situation seen in COPY_PREV_KEY_TO_GVT_CLUE */
 
 #define TAB_BG_TRC_REC(A,B)	B,
 enum bg_trc_rec_type
@@ -1615,13 +1735,46 @@ typedef union
 #endif
 
 #define CHECK_DB_ENDIAN(CSD,FNLEN,FNNAME)								\
-{													\
+MBSTART {												\
 	endian32_struct	check_endian;									\
 	check_endian.word32 = (CSD)->minor_dbver;							\
 	if (!check_endian.shorts.ENDIANCHECKTHIS)							\
 		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_DBENDIAN, 4, FNLEN, FNNAME, ENDIANOTHER,	\
 				ENDIANTHIS);								\
-}
+} MBEND
+
+#define FROZEN(CSD)				((CSD)->freeze || FALSE)
+#define FROZEN_HARD(CSD)			((CSD)->freeze && !(CSD)->freeze_online)
+#define FROZEN_CHILLED(CSD)			((CSD)->freeze && (CSD)->freeze_online)
+#define FREEZE_LATCH_HELD(CSA)			(process_id == (CSA)->nl->freeze_latch.u.parts.latch_pid)
+#define FREEZE_LATCH_TIMEOUT			(60 * 5)
+#define CHILLED_AUTORELEASE_MASK		0x02
+#define CHILLED_AUTORELEASE_REPORT_MASK		0x04
+#define CHILLED_AUTORELEASE(CSD)		(((CSD)->freeze_online & CHILLED_AUTORELEASE_MASK) || FALSE)
+#define CHILLED_AUTORELEASE_REPORTED(CSD)	(((CSD)->freeze_online & CHILLED_AUTORELEASE_REPORT_MASK) || FALSE)
+#define DO_CHILLED_AUTORELEASE(CSA, CSD)										\
+MBSTART {														\
+	GBLREF uint4	process_id;											\
+	boolean_t	was_latch;											\
+															\
+	if (CHILLED_AUTORELEASE(CSD) && !CHILLED_AUTORELEASE_REPORTED(CSD))						\
+	{														\
+		was_latch = FREEZE_LATCH_HELD(CSA);									\
+		if (!was_latch)												\
+			while(!grab_latch(&(CSA)->nl->freeze_latch, FREEZE_LATCH_TIMEOUT))				\
+				assert(FREEZE_LATCH_HELD(CSA));								\
+		if (CHILLED_AUTORELEASE(CSD) && !CHILLED_AUTORELEASE_REPORTED(CSD))					\
+		{													\
+			(CSD)->freeze = FALSE;										\
+			(CSD)->image_count = 0;										\
+			(CSD)->freeze_online = CHILLED_AUTORELEASE_MASK | CHILLED_AUTORELEASE_REPORT_MASK;		\
+			send_msg_csa(CSA_ARG(CSA) VARLSTCNT(9) ERR_OFRZAUTOREL, 2, REG_LEN_STR((CSA)->region),		\
+					ERR_ERRCALL, 3, CALLFROM);							\
+		}													\
+		if (!was_latch)												\
+			rel_latch(&(CSA)->nl->freeze_latch);								\
+	}														\
+} MBEND
 
 /* This is the structure describing a segment. It is used as a database file header (for MM or BG access methods).
  * The overloaded fields for MM and BG are n_bts, bt_buckets. */
@@ -1650,7 +1803,7 @@ typedef struct sgmnt_data_struct
 	uint4		def_coll_ver;		/* Default collation type version */
 	boolean_t	std_null_coll;		/* 0 -> GT.M null collation,i,e, null subs collate between numeric and string
 						 * 1-> standard null collation i.e. null subs collate before numeric and string */
-	boolean_t	null_subs;
+	int		null_subs;
 	uint4		free_space;		/* Space in file header not being used */
 	mutex_spin_parms_struct	mutex_spin_parms;
 	int4		max_update_array_size;	/* maximum size of update array needed for one non-TP set/kill */
@@ -1673,7 +1826,7 @@ typedef struct sgmnt_data_struct
 	char		filler_created[52];	/* Now unused .. was "file_info created" */
 	boolean_t	createinprogress;	/* TRUE only if MUPIP CREATE is in progress. FALSE otherwise */
 	int4		creation_time4;		/* Lower order 4-bytes of time when the database file was created */
-	int4		creation_filler_8byte;
+	uint4		reservedDBFlags;	/* Bit mask field containing the reserved DB flags (field copied from gd_region) */
 
 	/************* FIELDS USED BY TN WARN PROCESSING *************************/
 	trans_num	max_tn;			/* Hardstop TN for this database */
@@ -1699,7 +1852,8 @@ typedef struct sgmnt_data_struct
 	uint4		freeze;			/* for db freezing. Set to "getuid"     on Unix and "process_id"  on VMS */
 	int4		kill_in_prog;		/* counter for multi-crit kills that are not done yet */
 	int4		abandoned_kills;
-	char		filler_320[8];
+	uint4		freeze_online;		/* for online db freezing, a.k.a. chill.  */
+	char		filler_320[4];
 	/************* FIELDS USED IN V4 <==> V5 COMPATIBILITY MODE ****************/
 	trans_num	tn_upgrd_blks_0;	/* TN when blks_to_upgrd becomes 0.
 						 *	 Never set = 0 => we have not achieved this yet,
@@ -1749,12 +1903,13 @@ typedef struct sgmnt_data_struct
 						 */
 	volatile boolean_t filler_wc_blocked;	/* Now moved to node_local */
 	boolean_t	mumps_can_bypass;	/* Allow mumps processes to bypass flushing, access control, and ftok semaphore
-						 * in gds_rundown(). This was done to improve shutdown performance.
+						 * in "gds_rundown". This was done to improve shutdown performance.
 						 */
-	boolean_t	epoch_taper;		/* Should GT.M try to reduce dirty buffers as epoch approach */
+	boolean_t	epoch_taper;		/* If TRUE, GT.M tries to reduce dirty buffers as epoch approaches */
 	uint4		epoch_taper_time_pct;	/* in the last pct we start tapering for time */
 	uint4		epoch_taper_jnl_pct;	/* in the last pct we start tapering for jnl */
-	char		filler_512[4];
+	boolean_t	asyncio;		/* If TRUE, GT.M uses async I/O */
+	/* char		filler_512[0]; */
 	/************* FIELDS Used for update process performance improvement. Some may go away in later releases ********/
 	uint4		reserved_for_upd;	/* Percentage (%) of blocks reserved for update process disk read */
 	uint4		avg_blks_per_100gbl;	/* Number of blocks read on average for 100 global key read */
@@ -1795,15 +1950,6 @@ typedef struct sgmnt_data_struct
 	int4		rc_node;
 	char		filler_ccp_rc[8];	/* to ensure this section has 64-byte multiple size */
 	/************* REPLICATION RELATED FIELDS ****************/
-	/* VMS does not yet have multi-site replication functionality. Hence the two sets of fields in this section. */
-#ifdef VMS
-	seq_num		reg_seqno;		/* the jnl seqno of the last update to this region -- 8-byte aligned */
-	seq_num		resync_seqno;		/* the resync-seqno to be sent to the secondary */
-	trans_num	resync_tn;		/* db tn corresponding to resync_seqno - used in losttrans handling */
-	seq_num		old_resync_seqno;	/* to find out if transactions were sent from primary to secondary */
-	int4		repl_state;		/* state of replication whether open/closed/was_open */
-	char		filler_repl[28];		/* to ensure this section has 64-byte multiple size */
-#else
 	seq_num		reg_seqno;		/* the jnl seqno of the last update to this region -- 8-byte aligned */
 	seq_num		pre_multisite_resync_seqno;	/* previous resync-seqno field now moved to the replication instance file */
 	trans_num	zqgblmod_tn;		/* db tn corresponding to zqgblmod_seqno - used in losttrans handling */
@@ -1815,7 +1961,6 @@ typedef struct sgmnt_data_struct
 						 * a GT.M version that supports multi-site replication. FALSE until then */
 	seq_num		filler_seqno;		/* formerly dualsite_resync_seqno but removed once dual-site support was dropped */
 	char		filler_repl[16];	/* to ensure this section has 64-byte multiple size */
-#endif
 	/************* TP RELATED FIELDS ********************/
 	int4		filler_n_tp_retries[12];		/* Now moved to TAB_GVSTATS_REC section */
 	int4		filler_n_tp_retries_conflicts[12];	/* Now moved to TAB_GVSTATS_REC section */
@@ -1833,7 +1978,6 @@ typedef struct sgmnt_data_struct
 	int4		epoch_interval;		/* Time between successive epochs in epoch-seconds */
 	uint4		alignsize;		/* alignment size for JRT_ALIGN */
 	int4		jnl_sync_io;		/* drives sync I/O ('direct' if applicable) for journals, if set (UNIX) */
-						/* writers open NOCACHING to bypass XFC cache, if set (VMS) */
 	int4		yield_lmt;		/* maximum number of times a process yields to get optimal jnl writes */
 	boolean_t	turn_around_point;
 	trans_num	jnl_eovtn;		/* last tn for a closed jnl; otherwise epoch tn from the epoch before last */
@@ -1850,7 +1994,7 @@ typedef struct sgmnt_data_struct
 	uint4		before_trunc_free_blocks;
 	uint4		filler_trunc;			/* Previously before_trunc_file_size, which is no longer used */
 	char		filler_1k[24];
-	/************* HUGE CHARACTER ARRAYS **************/
+	/************* POTENTIALLY LARGE CHARACTER ARRAYS **************/
 	unsigned char	jnl_file_name[JNL_NAME_SIZE];	/* journal file name */
 	unsigned char	reorg_restart_key[OLD_MAX_KEY_SZ + 1];	/* 1st key of a leaf block where reorg was done last time.
 								 * Note: In mu_reorg we don't save keys longer than OLD_MAX_KEY_SZ
@@ -1931,7 +2075,10 @@ typedef struct sgmnt_data_struct
 	boolean_t	defer_allocate;		/* If FALSE: Use fallocate() preallocate space from the disk */
 	boolean_t	filler_ftok_counter_halted;	/* Used only in V6.3-000. Kept as a filler just to be safe */
 	boolean_t	filler_access_counter_halted;	/* Used only in V6.3-000. Kept as a filler just to be safe */
-	char		filler_7k[708];
+	boolean_t	lock_crit_with_db;		/* flag controlling LOCK crit mechanism; see interlock.h */
+	uint4		basedb_fname_len;		/* byte length of filename stored in "basedb_fname[]" */
+	unsigned char	basedb_fname[256]; /* full path filaneme of corresponding baseDB if this is a statsDB */
+	char		filler_7k[444];
 	char		filler_8k[1024];
 	/********************************************************/
 	/* Master bitmap immediately follows. Tells whether the local bitmaps have any free blocks or not. */
@@ -1961,11 +2108,7 @@ typedef struct
 
 typedef struct
 {
-#	ifdef VMS
-	FILL8DCL(sm_uc_ptr_t, base_addr, 1);
-#	else
 	int 	filler;
-#	endif
 } sgmm_addrs;
 
 #define MAX_NM_LEN	MAX_MIDENT_LEN
@@ -1983,9 +2126,20 @@ typedef struct
 #define SUBSCRIPT_BIAS  0x0BE
 #define NEG_MNTSSA_END  0x0FF
 #define KEY_DELIMITER   0X00
-#define MIN_DB_BLOCKS	10	/* this should be maintained in conjunction with the mimimum allocation in GDEINIT.M */
-#define MIN_GBUFF_LIMIT	32	/* minimum gbuff limit */
-#define REORG_GBUFF_LIMIT "64"	/* default gbuff_limit for REORG */
+#ifdef BIGENDIAN
+typedef struct
+{	unsigned int	two : 4;
+	unsigned int	one : 4;
+} sub_num;
+#else
+typedef struct
+{	unsigned int	one : 4;
+	unsigned int	two : 4;
+} sub_num;
+#endif
+#define MIN_DB_BLOCKS	10	/* this should be maintained in conjunction with the mimimum allocation in GDEINIT.M */
+#define MIN_GBUFF_LIMIT	32	/* minimum gbuff limit */
+#define REORG_GBUFF_LIMIT "64"	/* default gbuff_limit for REORG */
 
 /* definition for NULL_SUBSCRIPTS */
 #define NEVER		0
@@ -2000,7 +2154,7 @@ typedef struct
 #define FC_CLOSE 3
 
 #define DO_BADDBVER_CHK(REG, TSD)								\
-{												\
+MBSTART {											\
 	if (MEMCMP_LIT(TSD->label, GDS_LABEL))							\
 	{											\
 		if (memcmp(TSD->label, GDS_LABEL, GDS_LABEL_SZ - 3))				\
@@ -2010,10 +2164,10 @@ typedef struct
 			rts_error_csa(CSA_ARG(REG2CSA(REG)) VARLSTCNT(4) ERR_BADDBVER, 2,	\
 					DB_LEN_STR(REG));					\
 	}											\
-}
+} MBEND
 
 #define DO_DB_HDR_CHECK(REG, TSD)								\
-{												\
+MBSTART {											\
 	GBLREF	boolean_t	mupip_jnl_recover;						\
 	uint4			gtm_errcode = 0;						\
 												\
@@ -2034,7 +2188,7 @@ typedef struct
 			rts_error_csa(CSA_ARG(REG2CSA(REG)) VARLSTCNT(4) gtm_errcode, 2,	\
 					DB_LEN_STR(REG));					\
 	}											\
-}
+} MBEND
 
 #define REG2CSA(REG)	(((REG) && (REG)->dyn.addr && (REG)->dyn.addr->file_cntl) ? (&FILE_INFO(REG)->s_addrs) : NULL)
 #define JCTL2CSA(JCTL)	(((JCTL) && (JCTL->reg_ctl)) ? (JCTL->reg_ctl->csa) : NULL)
@@ -2061,7 +2215,7 @@ typedef struct
 
 /* Macro to copy the encryption information into an enc_info_t structure. */
 #define COPY_ENC_INFO_INT(SRC, DST, REORG_ENCRYPT_CYCLE)						\
-{													\
+MBSTART {												\
 	(DST)->reorg_encrypt_cycle = REORG_ENCRYPT_CYCLE;						\
 	(DST)->is_encrypted = (SRC)->is_encrypted;							\
 	(DST)->non_null_iv = (SRC)->non_null_iv;							\
@@ -2070,11 +2224,11 @@ typedef struct
 	memcpy((DST)->encryption_hash, (SRC)->encryption_hash, GTMCRYPT_HASH_LEN);			\
 	memcpy((DST)->encryption_hash2, (SRC)->encryption_hash2, GTMCRYPT_HASH_LEN);			\
 	DEBUG_ONLY((DST)->filler = 0;)									\
-}													\
+} MBEND													\
 
 /* Macro to copy the encryption information into an enc_info_t structure. */
 #define COPY_ENC_INFO(SRC, DST, REORG_ENCRYPT_CYCLE)							\
-{													\
+MBSTART {												\
 	DEBUG_ONLY(enc_info_t	before);								\
 													\
 	DEBUG_ONLY(COPY_ENC_INFO_INT(SRC, &before, REORG_ENCRYPT_CYCLE));				\
@@ -2090,10 +2244,12 @@ typedef struct
 	 */												\
 	DEBUG_ONLY(before.encryption_hash_cutoff = DST->encryption_hash_cutoff;)			\
 	DEBUG_ONLY(assert(!memcmp(&before, DST, SIZEOF(enc_info_t))));					\
-}													\
+} MBEND													\
 
-#define	INITIALIZE_CSA_ENCR_PTR(CSA, CSD, UDI, DO_CRYPT_INIT, CRYPT_WARNING)						\
-{															\
+#define	INITIALIZE_CSA_ENCR_PTR(CSA, CSD, UDI, DO_CRYPT_INIT, CRYPT_WARNING, DEFER_COPY)				\
+MBSTART {														\
+	GBLREF bool	in_mupip_freeze;										\
+															\
 	if (DO_CRYPT_INIT)												\
 	{														\
 		CSA->encr_ptr = (enc_info_t *)malloc(SIZEOF(enc_info_t));						\
@@ -2102,16 +2258,25 @@ typedef struct
 		 * a live (non-standalone) database before changing things. But the caller of this macro is expected to	\
 		 * hold either the ftok access control semaphore (udi->grabbed_fotk_sem) OR the database access control	\
 		 * semaphore (udi->grabbed_access_sem) in case of standalone access. This ensures a safe copy. The only	\
-		 * exception is if caller is "db_init" and we are DSE or LKE as they can bypass getting the ftok	\
-		 * semaphore, but in those cases we do not rely much on the encryption settings and in the places where	\
-		 * we do rely, we expect the users know what they are doing with these admin tools. Assert accordingly.	\
+		 * exception is if caller is "db_init" and we are DSE, LKE, or MUPIP FREEZE, as they can bypass getting	\
+		 * the ftok semaphore, but in those cases we do not rely much on the encryption settings and in the	\
+		 * places where we do rely, we expect the users know what they are doing with these admin tools.	\
+		 * Assert accordingly.											\
 		 */													\
-		assert(UDI->grabbed_ftok_sem || UDI->grabbed_access_sem || IS_DSE_IMAGE || IS_LKE_IMAGE);		\
-		COPY_ENC_INFO(CSD, CSA->encr_ptr, CSA->nl->reorg_encrypt_cycle);					\
-		CSA->encr_ptr->issued_db_init_crypt_warning = CRYPT_WARNING;						\
+		assert(UDI->grabbed_ftok_sem || UDI->grabbed_access_sem || IS_DSE_IMAGE || IS_LKE_IMAGE			\
+			|| (IS_MUPIP_IMAGE && in_mupip_freeze));							\
+		if (!(DEFER_COPY))											\
+		{													\
+			COPY_ENC_INFO(CSD, CSA->encr_ptr, CSA->nl->reorg_encrypt_cycle);				\
+			CSA->encr_ptr->issued_db_init_crypt_warning = CRYPT_WARNING;					\
+		} else													\
+		{	/* Defer the copy until needed later, as detected by a mismatch in reorg_encrypt_cycle.	*/	\
+			memset(CSA->encr_ptr, 0, SIZEOF(enc_info_t));							\
+			CSA->encr_ptr->reorg_encrypt_cycle = -1;							\
+		}													\
 	} else														\
 		CSA->encr_ptr = NULL;											\
-}
+} MBEND
 
 /* Encryption key reinitialization cannot be safely done if we are in the middle of a TP transaction that has already
  * done some updates to a journaled database (old keys would have been used for prior calls to "jnl_format" in this
@@ -2131,22 +2296,21 @@ typedef struct
 #define IS_NOT_SAFE_TO_SYNC_NEW_KEYS(DOLLAR_TLEVEL, UPDATE_TRANS)	(DOLLAR_TLEVEL || UPDATE_TRANS)
 
 #define SIGNAL_REORG_ENCRYPT_RESTART(REORG_ENCRYPT_IN_PROG, REORG_ENCRYPT_CSA, CNL, CSA, CSD, STATUS, PID)	\
-{														\
+MBSTART {													\
 	assert(!REORG_ENCRYPT_IN_PROG);										\
 	DBG_RECORD_BLOCK_RETRY(CSD, CSA, CNL, PID);								\
 	COPY_ENC_INFO(CSD, (CSA)->encr_ptr, (CNL)->reorg_encrypt_cycle);					\
 	assert(NULL == REORG_ENCRYPT_CSA);									\
 	REORG_ENCRYPT_CSA = CSA;										\
 	STATUS = cdb_sc_reorg_encrypt;										\
-}
+} MBEND
 
 typedef struct	file_control_struct
 {
 	sm_uc_ptr_t	op_buff;
-	UNIX_ONLY(gtm_int64_t) VMS_ONLY(int4)	op_pos;
+	gtm_int64_t	op_pos;
 	int		op_len;
 	void		*file_info;   /* Pointer for OS specific struct */
-	char		file_type;
 	char		op;
 } file_control;
 
@@ -2184,7 +2348,16 @@ typedef struct	gd_addr_struct
 	gd_id				*id;
 	UINTPTR_T			end;
 	uint4				has_span_gbls;	/* has at least one global which spans multiple regions */
-	char				filler[12];	/* filler to store runtime structures without changing gdeget/gdeput.m */
+	bool				ygs_map_entry_changed;	/* used by "gvcst_init_statsDB" */
+	bool				is_dummy_gbldir;	/* TRUE if this structure is created by "create_dummy_gbldir".
+								 * FALSE if this structure is created by "gd_load".
+								 */
+#ifdef GTM64
+	char				filler[2];	/* filler to store runtime structures without changing gdeget/gdeput.m */
+#else
+	char				filler[6];
+#endif
+	struct gd_info			*thread_gdi;	/* has information on the multiplexing thread - only used on linux AIO */
 } gd_addr;
 typedef gd_addr *(*gd_addr_fn_ptr)();
 
@@ -2212,6 +2385,7 @@ typedef struct	gd_segment_struct
 	file_control		*file_cntl;
 	struct gd_region_struct	*repl_list;
 	uint4			is_encrypted;
+	boolean_t		asyncio;	/* copied over to csd->asyncio at db creation time */
 	char			filler[16];	/* filler to store runtime structures without changing gdeget/gdeput.m */
 } gd_segment;
 
@@ -2234,20 +2408,14 @@ typedef struct	gd_region_struct
 	char            	null_subs;	/* 0 ->NEVER(previous NO), 1->ALWAYS(previous YES), 2->ALLOWEXISTING
 						* i.e. will allow read null subs but prohibit set */
 	unsigned char 		jnl_state;
-
 	/* deleted gbl_lk_root and lcl_lk_root, obsolete fields */
-
 	uint4			jnl_alq;
-#ifdef UNIX
 	uint4			jnl_deq;
 	uint4			jnl_autoswitchlimit;
 	uint4			jnl_alignsize;		/* not used, reserved */
 	int4			jnl_epoch_interval;	/* not used, reserved */
 	int4			jnl_sync_io;		/* not used, reserved */
 	int4			jnl_yield_lmt;		/* not used, reserved */
-#else
-	unsigned short		jnl_deq;
-#endif
 	unsigned short		jnl_buffer_size;
 	bool			jnl_before_image;
 	bool			opening;
@@ -2258,23 +2426,30 @@ typedef struct	gd_region_struct
 	bool			std_null_coll;	/* 0 -> GT.M null collation,i,e, null subs collate between numeric and string
 						 * 1-> standard null collation i.e. null subs collate before numeric and string
 						 */
-#ifdef UNIX
 	bool			freeze_on_fail;
 	bool			mumps_can_bypass; /* Allow mumps processes to bypass flushing, access control, and ftok semaphore
-						   * in gds_rundown(). This was done to improve shutdown performance.
+						   * in "gds_rundown". This was done to improve shutdown performance.
 						   */
-#endif
 	unsigned char		jnl_file_len;
 	unsigned char		jnl_file_name[JNL_NAME_SIZE];
-
-	/* VMS file id struct goes to OS specific struct */
-	/* VMS lock structure for reference goes to OS specific struct */
-
 	int4			node;
 	int4			sec_size;
-	uint4			is_spanned;	/* this is one of the regions that some spanning global maps to */
+	uint4			is_spanned;		/* This is one of the regions that some spanning global maps to */
+	uint4			statsDB_reg_index;	/* If this is a base region, this is the region index of the
+							 *	corresponding statsDB region.
+							 * If this is a statsDB region, this is the region index of the
+							 *	corresponding base region.
+							 */
 	bool			epoch_taper;
-	char			filler[11];	/* filler to store runtime structures without changing gdeget/gdeput.m */
+	bool			reservedDBFlags; 	/* Flags for reservedDB types and/or features */
+	bool			lock_crit_with_db;	/* controls whether LOCK crit is separate (0) or shared with DB (1) */
+	/* All fields before this point are relied upon by GDE. All fields after this point are relied upon only by
+	 * the runtime logic (i.e. it is one big filler/padding area as far as GDE is concerned).
+	 */
+	bool			statsDB_setup_started;
+	gd_addr			*owning_gd;
+	bool			statsDB_setup_completed;
+	char			filler[39];	/* filler to store runtime structures without changing gdeget/gdeput.m */
 } gd_region;
 
 typedef struct	sgmnt_addrs_struct
@@ -2319,22 +2494,25 @@ typedef struct	sgmnt_addrs_struct
 	gtmcrypt_key_t				encr_key_handle;
 	gtmcrypt_key_t				encr_key_handle2;
 	enc_info_t				*encr_ptr;	/* Copy of encryption info from the database file header */
-#	ifdef GTM_SNAPSHOT
-	struct snapshot_context_struct 	*ss_ctx;
-#	endif
+	struct snapshot_context_struct 		*ss_ctx;
 	union
 	{
 		sgmm_addrs	mm;
 		sgbg_addrs	bg;
 		/* May add new pointers here for other methods or change to void ptr */
 	} acc_meth;
+	gvstats_rec_t		*gvstats_rec_p;	/* Pointer to either the stats in this structure or the stats in a shared
+						 * global gvstats_rec_t. All access to process stats should be through this ptr.
+						 */
 	gvstats_rec_t		gvstats_rec;
 	trans_num		dbsync_timer_tn;/* copy of csa->ti->curr_tn when csa->dbsync_timer became TRUE.
 						 * used to check if any updates happened in between when we flushed all
 						 * dirty buffers to disk and when the idle flush timer (5 seconds) popped.
 						 */
 	/* 8-byte aligned at this point on all platforms (32-bit, 64-bit or Tru64 which is a mix of 32-bit and 64-bit pointers) */
+	cache_rec_ptr_t	our_midnite;		/* anchor if we are using a gbuff_limit */
 	size_t		fullblockwrite_len;	/* Length of a full block write */
+	sm_off_t 	our_lru_cache_rec_off;	/* last used cache pointer for when we are using a gbuff_limit */
 	uint4		total_blks;		/* Last we knew, file was this big. Used to signal MM processing file was
 						 * extended and needs to be remapped. In V55000 was used with BG to detect
 						 * file truncates. It is no longer used for that purpose: it was not necessary
@@ -2356,6 +2534,9 @@ typedef struct	sgmnt_addrs_struct
 	block_id	reorg_last_dest;	/* last destinition block used for swap */
 	boolean_t	jnl_before_image;
 	boolean_t	read_write;
+	boolean_t	orig_read_write;	/* copy of "csa->read_write" at dbfilopn time (needed at gds_rundown time
+						 * to know real permissions in case csa->read_write gets reset (e.g. for statsdb)
+						 */
 	boolean_t	persistent_freeze;	/* if true secshr_db_clnup() won't unfreeze this region */
 	/* The following 3 fields are in cs_addrs instead of in the file-header since they are a function
 	 * of the journal-record sizes that can change with journal-version-numbers (for the same database).
@@ -2406,15 +2587,22 @@ typedef struct	sgmnt_addrs_struct
 						 * rely on this variable
 						 */
 	int4		gbuff_limit;		/* desired limit on global buffers; see db_csh_getn, op_view and op_fnview */
-	cache_rec_ptr_t	our_midnite;		/* anchor if we are using a gbuff_limit */
-#	ifdef UNIX
 	uint4		root_search_cycle;	/* local copy of cnl->root_search_cycle */
 	uint4		onln_rlbk_cycle;	/* local copy of cnl->onln_rlbk_cycle */
 	uint4		db_onln_rlbkd_cycle;	/* local copy of cnl->db_onln_rlbkd_cycle */
+	uint4		reservedDBFlags;	/* Bit mask field containing the reserved DB flags (field copied from gd_region) */
 	boolean_t	read_only_fs;		/* TRUE if the region is read_only and the header was not updated due to EROFS */
 	boolean_t	crit_probe;		/* flag for indicating the process is doing a crit probe on this region */
+	boolean_t	canceled_flush_timer;	/* a flush timer was canceled even though dirty buffers might still exist */
 	probecrit_rec_t	probecrit_rec;		/* fields defined in tab_probecrit_rec.h and initialized in probecrit_rec.h */
-#	endif
+	boolean_t	lock_crit_with_db;	/* copy of sgmnt_data field controlling LOCK crit mechanizm - see interlock.h */
+	boolean_t	needs_post_freeze_online_clean;	/* Perform cleanup of online freeze */
+	boolean_t	needs_post_freeze_flushsync;	/* Perform post-freeze flush/sync */
+	block_id	tp_hint;		/* last tp (allocation) hint for this process in this region */
+	boolean_t	statsDB_setup_completed;	/* TRUE if ^%YGS node has been added to this statsDB file.
+							 * Is a copy of reg->statsDB_setup_completed but is present in "csa"
+							 * too to handle was_open regions.
+							 */
 } sgmnt_addrs;
 
 typedef struct gd_binding_struct
@@ -2442,133 +2630,14 @@ typedef struct gd_gblname_struct
         uint4           ver;	/* version of collation library used at gld creation time */
 } gd_gblname;
 
-/* Define constants for a dummy gld file. This is used by dtgbldir.c and create_dummy_gbldir.c */
-#define	IMPOS_GBLNAME_7			"\xFF\xFF\xFF\xFF\xFF\xFF\xFF"	/* 7-bytes of 0xFF */
-#define	IMPOS_GBLNAME_8			IMPOS_GBLNAME_7 "\xFF"		/* 8-bytes of 0xFF */
-#define	IMPOSSIBLE_GBLNAME_31		IMPOS_GBLNAME_8 IMPOS_GBLNAME_8 IMPOS_GBLNAME_8 IMPOS_GBLNAME_7
-#define	DUMMY_GBLDIR_N_MAPS		3		/* one for local locks "#)", one for "%" and one for 0xFFFFFF... */
-#define DUMMY_GBLDIR_FIRST_MAP		"#)"		/* local locks */
-#define DUMMY_GBLDIR_SECOND_MAP		"%"		/* start of valid global name */
-#define DUMMY_GBLDIR_THIRD_MAP		IMPOSSIBLE_GBLNAME_31 /* last map always corresponds to impossible global name */
-#define	DUMMY_GBLDIR_MAP_GVN_SIZE(KEY)	(SIZEOF(KEY)-1)	/* SIZEOF already counts the null byte in the literal so remove it */
-#define	DUMMY_GBLDIR_MAP_KEY_SIZE(KEY)	(SIZEOF(KEY)+1)	/* +1 for second null byte (SIZEOF already counts the 1st null byte) */
-#define	DUMMY_GBLDIR_VAR_MAP_SIZE	ROUND_UP2(DUMMY_GBLDIR_MAP_KEY_SIZE(DUMMY_GBLDIR_FIRST_MAP)		\
-							+ DUMMY_GBLDIR_MAP_KEY_SIZE(DUMMY_GBLDIR_SECOND_MAP)	\
-							+ DUMMY_GBLDIR_MAP_KEY_SIZE(DUMMY_GBLDIR_THIRD_MAP), 8)
-#define	DUMMY_GBLDIR_FIX_MAP_SIZE	(DUMMY_GBLDIR_N_MAPS * SIZEOF(gd_binding))
-#define	DUMMY_GBLDIR_TOT_MAP_SIZE	(DUMMY_GBLDIR_FIX_MAP_SIZE + DUMMY_GBLDIR_VAR_MAP_SIZE)
-#define	DUMMY_GBLDIR_SIZE		(SIZEOF(header_struct) + SIZEOF(gd_addr)			\
-						+ DUMMY_GBLDIR_TOT_MAP_SIZE				\
-						+ 1 * SIZEOF(gd_region) + 1 * SIZEOF(gd_segment))
-
-#define	RELATIVE_OFFSET_FALSE		FALSE
-#define	RELATIVE_OFFSET_TRUE		TRUE
-
-#define	DUMMY_GLD_MAP_INIT(ADDR, RELATIVE, REG)							\
-{												\
-	char		*mapkey_ptr;								\
-	uint4		reg_offset;								\
-												\
-	if (RELATIVE)										\
-		ADDR->maps = (gd_binding *)(SIZEOF(gd_addr));					\
-	else											\
-		ADDR->maps = (gd_binding *)((UINTPTR_T)ADDR + SIZEOF(gd_addr));			\
-	ADDR->var_maps_len = DUMMY_GBLDIR_VAR_MAP_SIZE;						\
-	ADDR->n_maps = DUMMY_GBLDIR_N_MAPS;							\
-	ADDR->n_regions = 1;									\
-	ADDR->n_segments = 1;									\
-	ADDR->n_gblnames = 0;									\
-	ADDR->link = 0;										\
-	ADDR->tab_ptr = 0;									\
-	ADDR->id = 0;										\
-	ADDR->local_locks = 0;									\
-	mapkey_ptr = (char *)((UINTPTR_T)ADDR + SIZEOF(gd_addr) + DUMMY_GBLDIR_FIX_MAP_SIZE);	\
-	reg_offset = (INTPTR_T)(SIZEOF(gd_addr)) + DUMMY_GBLDIR_TOT_MAP_SIZE;			\
-	/* Start MAPS section initialization */							\
-	map = (gd_binding *)((UINTPTR_T)ADDR + SIZEOF(gd_addr));				\
-	/* This is the map for local locks which stores the name "#)" */			\
-	map->gvkey.addr = mapkey_ptr;								\
-	MEMCPY_LIT(mapkey_ptr, DUMMY_GBLDIR_FIRST_MAP);						\
-	if (NULL == REG)									\
-		map->reg.offset = reg_offset;							\
-	else											\
-		map->reg.addr = REG;								\
-	map->gvname_len = DUMMY_GBLDIR_MAP_GVN_SIZE(DUMMY_GBLDIR_FIRST_MAP);			\
-	map->gvkey_len =  DUMMY_GBLDIR_MAP_KEY_SIZE(DUMMY_GBLDIR_FIRST_MAP) - 1;		\
-	mapkey_ptr += map->gvkey_len;								\
-	map++;											\
-	/* This is the map for "%" */								\
-	map->gvkey.addr = mapkey_ptr;								\
-	MEMCPY_LIT(mapkey_ptr, DUMMY_GBLDIR_SECOND_MAP);					\
-	if (NULL == REG)									\
-		map->reg.offset = reg_offset;							\
-	else											\
-		map->reg.addr = REG;								\
-	map->gvname_len = DUMMY_GBLDIR_MAP_GVN_SIZE(DUMMY_GBLDIR_SECOND_MAP);			\
-	map->gvkey_len =  DUMMY_GBLDIR_MAP_KEY_SIZE(DUMMY_GBLDIR_SECOND_MAP) - 1;		\
-	mapkey_ptr += map->gvkey_len;								\
-	map++;											\
-	/* This is the map for the 31-byte '0xFF' byte global name (impossible) */		\
-	map->gvkey.addr = mapkey_ptr;								\
-	MEMCPY_LIT(mapkey_ptr, DUMMY_GBLDIR_THIRD_MAP);						\
-	if (NULL == REG)									\
-		map->reg.offset = reg_offset;							\
-	else											\
-		map->reg.addr = REG;								\
-	map->gvname_len = DUMMY_GBLDIR_MAP_GVN_SIZE(DUMMY_GBLDIR_THIRD_MAP);			\
-	map->gvkey_len =  DUMMY_GBLDIR_MAP_KEY_SIZE(DUMMY_GBLDIR_THIRD_MAP) - 1;		\
-	mapkey_ptr += map->gvkey_len;								\
-	/* MAPS sections (Fixed and Variable) initialization complete */			\
-}
+#define	INVALID_STATSDB_REG_INDEX	(MAXUINT4)	/* this has to be maintained in parallel with TWO(32)-1 in gdeput.m  */
 
-#define	DUMMY_GLD_INIT(header, addr, region, segment, size, relative)				\
-{												\
-	gd_binding	*map, *map_top;								\
-	gd_region	*region_top;								\
-	uint4		t_offset;								\
-												\
-	size = DUMMY_GBLDIR_SIZE;								\
-	header = (header_struct *)malloc(ROUND_UP(size, DISK_BLOCK_SIZE));			\
-	memset(header, 0, ROUND_UP(size, DISK_BLOCK_SIZE));					\
-	header->filesize = size;								\
-	size = ROUND_UP(size, DISK_BLOCK_SIZE);							\
-	MEMCPY_LIT(header->label, GDE_LABEL_LITERAL);						\
-	addr = (gd_addr *)((char *)header + SIZEOF(header_struct));				\
-	addr->max_rec_size = 256;								\
-	DUMMY_GLD_MAP_INIT(addr, relative, NULL);						\
-	addr->regions = (gd_region *)((INTPTR_T)(addr->maps) + DUMMY_GBLDIR_TOT_MAP_SIZE);	\
-	addr->segments = (gd_segment *)((INTPTR_T)(addr->regions) + SIZEOF(gd_region));		\
-	addr->end = (UINTPTR_T)(addr->segments) + SIZEOF(gd_segment);				\
-	region = (gd_region *)(addr->regions);							\
-	segment = (gd_segment *)(addr->segments);						\
-	region->rname_len = STR_LIT_LEN("DEFAULT");						\
-	MEMCPY_LIT(region->rname,"DEFAULT");							\
-	if (!relative)										\
-	{											\
-		for (map = addr->maps, map_top = map + addr->n_maps; map < map_top ; map++)	\
-		{										\
-			t_offset = map->reg.offset;						\
-			map->reg.addr = (gd_region *)((char *)addr + t_offset);			\
-		}										\
-		for (region = addr->regions, region_top = region + addr->n_regions;		\
-			region < region_top ; region++)						\
-		{										\
-			t_offset = region->dyn.offset;						\
-			region->dyn.addr = (gd_segment *)((char *)addr + t_offset);		\
-		}										\
-	} else											\
-	{											\
-		region = (gd_region *)((char *)addr + (INTPTR_T)(addr->regions));		\
-		for (region_top = region + addr->n_regions; region < region_top ; region++)	\
-		{										\
-			t_offset = region->dyn.offset;						\
-			region->dyn.addr = (gd_segment *)(INTPTR_T)t_offset;			\
-		}										\
-		region = region_top - addr->n_regions;	/* Restore "region" to point to		\
-							 * start of region array. */		\
-		segment = (gd_segment*)((char *)addr + (INTPTR_T)(addr->segments));		\
-	}											\
-}
+/* Define macros that provide a connection between statsdb initialization code in GDE & GT.M */
+#define	STATSDB_BLK_SIZE	1024	/* the BLK_SIZE computed by GDE for every statsdb region */
+#define	STATSDB_ALLOCATION	2050	/* the ALLOCATION computed by GDE for every statsdb region */
+#define	STATSDB_EXTENSION	2050	/* the EXTENSION computed by GDE for every statsdb region */
+#define	STATSDB_MAX_KEY_SIZE	64	/* the MAX_KEY_SIZE computed by GDE for every statsdb region */
+#define	STATSDB_MAX_REC_SIZE	(STATSDB_BLK_SIZE - SIZEOF(blk_hdr)) /* the MAX_REC_SIZE computed by GDE for every statsdb region */
 
 typedef struct
 {
@@ -2631,7 +2700,7 @@ typedef struct
 } super_srch_hist;
 
 #define MERGE_SUPER_HIST(SUPER_HIST, HIST1, HIST2)								\
-{	/* Possible enhancement: do memcpy instead of loop */							\
+MBSTART {	/* Possible enhancement: do memcpy instead of loop */						\
 	srch_hist 	*hist;											\
 	srch_blk_status	*t0, *t1;										\
 														\
@@ -2647,7 +2716,7 @@ typedef struct
 		}												\
 	}													\
 	t0->blk_num = 0;											\
-}
+} MBEND
 
 typedef struct	gv_key_struct
 {
@@ -2773,75 +2842,77 @@ typedef struct	gvnh_reg_struct
 						 *	the unsubscripted global name was found.
 						 */
 	gvnh_spanreg_t	*gvspan;		/* Pointer to a structure containing details of what regions are spanned
-						 *	by this global name. Set to NULL for globals that dont span regions.
+						 *	by this global name. Set to NULL for globals that don't span regions.
 						 */
 	uint4		act;			/* Copy of alternative collation SEQUENCE defined in GBLNAMES section of gbldir */
 	uint4		ver;			/* Copy of collation library VERSION defined in GBLNAMES section of gbldir */
 } gvnh_reg_t;
 
-#define	GVNH_REG_INIT(ADDR, HASHTAB, GD_MAP, GVT, REG, GVNH_REG, TABENT)					\
-{														\
-	boolean_t	added, gbl_spans_regions;								\
-	char		*gvent_name;										\
-	gd_binding	*spanmap;										\
-	int		res, gvent_len;										\
-														\
-	GBLREF	jnl_gbls_t	jgbl;										\
-														\
-	GVNH_REG = (gvnh_reg_t *)malloc(SIZEOF(gvnh_reg_t));							\
-	GVNH_REG->gvt = GVT;											\
-	GVNH_REG->gd_reg = REG;											\
-	/* If GD_MAP is NULL, it implies callers like MUPIP JOURNAL -RECOVER or GT.CM GNP server		\
-	 * which dont have a .gld context to map input global names to regions, but instead know		\
-	 * which regions to play input updates. If GD_MAP is non-NULL, it implies the caller has		\
-	 * a .gld with map entries and wants to do more initialization inside this macro if the			\
-	 * input global spans multiple regions. Note that it is possible that even though GD_MAP is NULL,	\
-	 * ADDR could be non-NULL. This is necessary in case we need the gld file for GBLNAME section like	\
-	 * for MUPIP JOURNAL -RECOVER even though it operates on a per-region basis only. The GBLNAME section	\
-	 * is necessary to set correct collation properties in the directory tree if journal recover creates	\
-	 * the directory tree.											\
-	 */													\
-	assert((NULL != ADDR) || (NULL == GD_MAP));								\
-	if (NULL != GD_MAP)											\
-	{	/* check if global spans multiple regions and if so initialize "gvnh_reg->gvspan" */		\
-		gvnh_spanreg_init(GVNH_REG, ADDR, GD_MAP);							\
-		gbl_spans_regions = (NULL != GVNH_REG->gvspan);							\
-	} else													\
-	{	/* GT.CM GNP or MUPIP JOURNAL -RECOVER/ROLLBACK */						\
-		GVNH_REG->gvspan = NULL;									\
-		/* If GT.CM GNP, value of ADDR will be NULL so no need to search the global directory.		\
-		 * Otherwise (i.e. if MUPIP JOURNAL RECOVER/ROLLBACK), find from the gld whether the global	\
-		 * name spans regions. This is necessary to do unconditional collation initialization (as if	\
-		 * the gld specified it) for globals that span multiple regions inside the			\
-		 * COPY_ACT_FROM_GLD_TO_GVNH_REG_AND_GVT macro.	An exception is ^#t (actually all globals that	\
-		 * begin with ^# but ^#t is the only one currently). This does not map to a single region in	\
-		 * the gld map and so gv_srch_map should never be invoked for such globals. This global can	\
-		 * never span regions so treat it accordingly.							\
-		 */												\
-		if ((NULL == ADDR) || IS_MNAME_HASHT_GBLNAME(GVT->gvname.var_name))				\
-			gbl_spans_regions = FALSE;								\
-		else												\
-		{												\
-			assert(jgbl.forw_phase_recovery);							\
-			gvent_name = GVT->gvname.var_name.addr;							\
-			gvent_len = GVT->gvname.var_name.len;							\
-			spanmap = gv_srch_map(ADDR, gvent_name, gvent_len);					\
-			res = memcmp(gvent_name, &(spanmap->gvkey.addr[0]), gvent_len);				\
-			assert((0 != res) || (gvent_len <= spanmap->gvname_len));				\
-			gbl_spans_regions = !((0 > res) || ((0 == res) && (gvent_len < spanmap->gvname_len)));	\
-		}												\
-	}													\
-	COPY_ACT_FROM_GLD_TO_GVNH_REG_AND_GVT(ADDR, GVT, gbl_spans_regions, GVNH_REG, REG);			\
-	/* Add to hash table after all potential error conditions have been checked. If it was the other way	\
-	 * around, we could end up in a situation where an error is issued but pointers are set up incorrectly	\
-	 * so a future global reference will no longer error out and will accept out-of-design updates.		\
-	 * The only drawback of this approach is it might have a memory leak since allocated structures will	\
-	 * no longer have a pointer but that is considered acceptable since these errors are very unlikely	\
-	 * and the alternative (to set up condition handlers etc.) is not considered worth the effort now.	\
-	 */													\
-	added = add_hashtab_mname((hash_table_mname *)HASHTAB, &GVT->gvname, GVNH_REG, &TABENT);		\
-	assert(added);												\
-}
+#define	GVNH_REG_INIT(ADDR, HASHTAB, GD_MAP, GVT, REG, GVNH_REG, TABENT)							\
+MBSTART {															\
+	boolean_t	added, gbl_spans_regions;										\
+	char		*gvent_name;												\
+	gd_binding	*spanmap;												\
+	int		res, gvent_len;												\
+																\
+	GBLREF	jnl_gbls_t	jgbl;												\
+	GBLREF	gv_key		*gv_currkey;											\
+																\
+	GVNH_REG = (gvnh_reg_t *)malloc(SIZEOF(gvnh_reg_t));									\
+	GVNH_REG->gvt = GVT;													\
+	GVNH_REG->gd_reg = REG;													\
+	/* If GD_MAP is NULL, it implies callers like MUPIP JOURNAL -RECOVER or GT.CM GNP server				\
+	 * which don't have a .gld context to map input global names to regions, but instead know				\
+	 * which regions to play input updates. If GD_MAP is non-NULL, it implies the caller has				\
+	 * a .gld with map entries and wants to do more initialization inside this macro if the					\
+	 * input global spans multiple regions. Note that it is possible that even though GD_MAP is NULL,			\
+	 * ADDR could be non-NULL. This is necessary in case we need the gld file for GBLNAME section like			\
+	 * for MUPIP JOURNAL -RECOVER even though it operates on a per-region basis only. The GBLNAME section			\
+	 * is necessary to set correct collation properties in the directory tree if journal recover creates			\
+	 * the directory tree.													\
+	 */															\
+	assert((NULL != ADDR) || (NULL == GD_MAP));										\
+	if (NULL != GD_MAP)													\
+	{	/* check if global spans multiple regions and if so initialize "gvnh_reg->gvspan" */				\
+		gvnh_spanreg_init(GVNH_REG, ADDR, GD_MAP);									\
+		gbl_spans_regions = (NULL != GVNH_REG->gvspan);									\
+	} else															\
+	{	/* GT.CM GNP or MUPIP JOURNAL -RECOVER/ROLLBACK */								\
+		GVNH_REG->gvspan = NULL;											\
+		/* If GT.CM GNP, value of ADDR will be NULL so no need to search the global directory.				\
+		 * Otherwise (i.e. if MUPIP JOURNAL RECOVER/ROLLBACK), find from the gld whether the global			\
+		 * name spans regions. This is necessary to do unconditional collation initialization (as if			\
+		 * the gld specified it) for globals that span multiple regions inside the					\
+		 * COPY_ACT_FROM_GLD_TO_GVNH_REG_AND_GVT macro.	An exception is ^#t (actually all globals that			\
+		 * begin with ^# but ^#t is the only one currently). This does not map to a single region in			\
+		 * the gld map and so gv_srch_map should never be invoked for such globals. This global can			\
+		 * never span regions so treat it accordingly.									\
+		 */														\
+		if ((NULL == ADDR) || IS_MNAME_HASHT_GBLNAME(GVT->gvname.var_name))						\
+			gbl_spans_regions = FALSE;										\
+		else														\
+		{														\
+			assert(jgbl.forw_phase_recovery);									\
+			gvent_name = GVT->gvname.var_name.addr;									\
+			gvent_len = GVT->gvname.var_name.len;									\
+			spanmap = gv_srch_map(ADDR, gvent_name, gvent_len, SKIP_BASEDB_OPEN_FALSE);				\
+			res = memcmp(gvent_name, &(spanmap->gvkey.addr[0]), gvent_len);						\
+			assert((0 != res) || (gvent_len <= spanmap->gvname_len));						\
+			gbl_spans_regions = !((0 > res) || ((0 == res) && (gvent_len < spanmap->gvname_len)));			\
+		}														\
+	}															\
+	COPY_ACT_FROM_GLD_TO_GVNH_REG_AND_GVT(ADDR, GVT, gbl_spans_regions, GVNH_REG, REG);					\
+	/* Add to hash table after all potential error conditions have been checked. If it was the other way			\
+	 * around, we could end up in a situation where an error is issued but pointers are set up incorrectly			\
+	 * so a future global reference will no longer error out and will accept out-of-design updates.				\
+	 * The only drawback of this approach is it might have a memory leak since allocated structures will			\
+	 * no longer have a pointer but that is considered acceptable since these errors are very unlikely			\
+	 * and the alternative (to set up condition handlers etc.) is not considered worth the effort now.			\
+	 */															\
+	added = add_hashtab_mname((hash_table_mname *)HASHTAB, &GVT->gvname, GVNH_REG, &TABENT);				\
+	assert(added || (IS_STATSDB_REG(REG) && (STATSDB_GBLNAME_LEN == GVT->gvname.var_name.len)				\
+				&& (0 == memcmp(GVT->gvname.var_name.addr, STATSDB_GBLNAME, STATSDB_GBLNAME_LEN))));		\
+} MBEND
 
 /* Below macro is used whenever we need to print region of interest in case of a global that spans multiple regions */
 #define	SPANREG_REGION_LIT	" (region "
@@ -2898,20 +2969,21 @@ typedef struct gvsavtarg_struct
 						 */
 
 #define RESET_GV_TARGET(GVT_GVKEY_CHECK)							\
-{												\
+MBSTART {											\
 	assert(INVALID_GV_TARGET != reset_gv_target);						\
 	gv_target = reset_gv_target;								\
 	reset_gv_target = INVALID_GV_TARGET;							\
-	DEBUG_ONLY(										\
-		if (GVT_GVKEY_CHECK)								\
-			DBG_CHECK_GVTARGET_GVCURRKEY_IN_SYNC(CHECK_CSA_TRUE);			\
-	)											\
-}
+	if (GVT_GVKEY_CHECK)									\
+		DBG_CHECK_GVTARGET_GVCURRKEY_IN_SYNC(CHECK_CSA_TRUE);				\
+} MBEND
 
-#define RESET_GV_TARGET_LCL(SAVE_TARG)	gv_target = SAVE_TARG;
+#define RESET_GV_TARGET_LCL(SAVE_TARG)									\
+MBSTART {												\
+	gv_target = SAVE_TARG;										\
+} MBEND
 
 #define RESET_GV_TARGET_LCL_AND_CLR_GBL(SAVE_TARG, GVT_GVKEY_CHECK)							\
-{															\
+MBSTART {														\
 	GBLREF	uint4			dollar_tlevel;									\
 															\
 	gv_target = SAVE_TARG;												\
@@ -2931,7 +3003,7 @@ typedef struct gvsavtarg_struct
 		)													\
 		reset_gv_target = INVALID_GV_TARGET;									\
 	}														\
-}
+} MBEND
 
 
 /* No point doing the gvtarget-gvcurrkey in-sync check or the gvtarget-csaddrs in-sync check if we are anyways going to exit.
@@ -2945,17 +3017,17 @@ GBLREF	gv_namehead	*gvt_tp_list;
 #define	RESET_FIRST_TP_SRCH_STATUS_TRUE		TRUE
 
 #define	GVT_CLEAR_FIRST_TP_SRCH_STATUS(GVT)								\
-{													\
+MBSTART {												\
 	srch_blk_status	*srch_status;									\
 													\
 	assert(GVT->clue.end);	/* or else first_tp_srch_status will be reset as part of traversal */	\
 	assert(GVT->read_local_tn != local_tn);								\
 	for (srch_status = &(GVT)->hist.h[0]; HIST_TERMINATOR != srch_status->blk_num; srch_status++)	\
 		srch_status->first_tp_srch_status = NULL;						\
-}
+} MBEND
 
 #define	ADD_TO_GVT_TP_LIST(GVT, RESET_FIRST_TP_SRCH_STATUS)									\
-{																\
+MBSTART {															\
 	if (GVT->read_local_tn != local_tn)											\
 	{	/* Set read_local_tn to local_tn; Also add GVT to list of gvtargets referenced in this TP transaction. */	\
 		if (GVT->clue.end && RESET_FIRST_TP_SRCH_STATUS)								\
@@ -2967,7 +3039,7 @@ GBLREF	gv_namehead	*gvt_tp_list;
 	{	/* Check that GVT is already part of the list of gvtargets referenced in this TP transaction */			\
 		DBG_CHECK_IN_GVT_TP_LIST(GVT, TRUE);	/* TRUE => we check that GVT IS present in the gvt_tp_list */		\
 	}															\
-}
+} MBEND
 
 /* Although the below macros are used only in DBG code, they are passed as parameters so need to be defined for pro code too */
 #define	CHECK_CSA_FALSE		FALSE
@@ -2975,7 +3047,7 @@ GBLREF	gv_namehead	*gvt_tp_list;
 
 #ifdef DEBUG
 #define	DBG_CHECK_IN_GVT_TP_LIST(gvt, present)						\
-{											\
+MBSTART {										\
 	gv_namehead	*gvtarg;							\
 											\
 	GBLREF gv_namehead	*gvt_tp_list;						\
@@ -2988,10 +3060,10 @@ GBLREF	gv_namehead	*gvt_tp_list;
 	}										\
 	assert(!present || (NULL != gvtarg));						\
 	assert(present || (NULL == gvtarg) || (process_exiting && !dollar_tlevel));	\
-}
+} MBEND
 
 #define	DBG_CHECK_GVT_IN_GVTARGETLIST(gvt)								\
-{													\
+MBSTART {												\
 	gv_namehead	*gvtarg;									\
 													\
 	GBLREF gd_region	*gv_cur_region;								\
@@ -3010,7 +3082,7 @@ GBLREF	gv_namehead	*gvt_tp_list;
 	assert((NULL != gvtarg) || (dba_cm == REG_ACC_METH(gv_cur_region))				\
 		|| (dba_usr == REG_ACC_METH(gv_cur_region))						\
 		|| ((FALSE == gv_cur_region->open) && (dba_bg == REG_ACC_METH(gv_cur_region))));	\
-}
+} MBEND
 
 /* If CHECK_CSADDRS input parameter is CHECK_CSA_TRUE, then check that GV_CURRKEY, GV_TARGET and CS_ADDRS are all in sync.
  * If CHECK_CSADDRS input parameter is CHECK_CSA_FALSE, then only check GV_CURRKEY and GV_TARGET are in sync (skip CS_ADDRS check).
@@ -3028,25 +3100,26 @@ GBLREF	gv_namehead	*gvt_tp_list;
  * ensuring the below anywhere, it should be okay to remove it then.
  */
 #define	DBG_CHECK_GVTARGET_GVCURRKEY_IN_SYNC(CHECK_CSADDRS)									\
-{																\
+MBSTART {															\
 	mname_entry		*gvent;												\
 	mstr			*varname;											\
 	int			varlen;												\
 	unsigned short		keyend;												\
 	unsigned char		*keybase;											\
 																\
-	GBLREF int4	gv_keysize;												\
+	GBLREF int4		gv_keysize;											\
 																\
 	GBLREF gv_key		*gv_currkey;											\
 	GBLREF gv_namehead	*reset_gv_target;										\
 																\
 	assert((NULL != gv_currkey) || (NULL == gv_target));									\
-	/* make sure gv_currkey->top always reflects the maximum keysize across all dbs that we opened until now */		\
+	/* Make sure gv_currkey->top always reflects the maximum keysize across all dbs that we opened until now */		\
 	assert((NULL == gv_currkey) || (gv_currkey->top == gv_keysize));							\
 	if (!process_exiting)													\
 	{															\
 		keybase = &gv_currkey->base[0];											\
-		if ((NULL != gv_currkey) && (0 != keybase[0]) && (INVALID_GV_TARGET == reset_gv_target))			\
+		if ((NULL != gv_currkey) && (0 != keybase[0]) && (0 != gv_currkey->end)						\
+				&& (INVALID_GV_TARGET == reset_gv_target))							\
 		{														\
 			assert(NULL != gv_target);										\
 			gvent = &gv_target->gvname;										\
@@ -3066,7 +3139,7 @@ GBLREF	gv_namehead	*gvt_tp_list;
 		if ((NULL != gv_target) && (NULL != gv_target->gd_csa))								\
 			DBG_CHECK_GVTARGET_INTEGRITY(gv_target);								\
 	}															\
-}
+} MBEND
 
 /* Do checks on the integrity of various fields in gv_target. targ_alloc initializes these and they are supposed to
  * stay that way. The following code is very similar to that in targ_alloc so needs to be maintained in sync. This
@@ -3074,28 +3147,31 @@ GBLREF	gv_namehead	*gvt_tp_list;
  * should ensure they do not invoke it in case of NULL gd_csa.
  */
 #define	DBG_CHECK_GVTARGET_INTEGRITY(GVT)											\
-{																\
+MBSTART {															\
 	int			keysize, partial_size;										\
 	GBLREF	boolean_t	dse_running;											\
 																\
-	keysize = GVT->gd_csa->hdr->max_key_size;										\
-	keysize = DBKEYSIZE(keysize);												\
-	partial_size = SIZEOF(gv_namehead) + 2 * SIZEOF(gv_key) + 3 * keysize;							\
-	/* DSE could change the max_key_size dynamically so account for it in the below assert */				\
-	if (!dse_running)													\
-	{															\
-		assert(GVT->gvname.var_name.addr == (char *)GVT + partial_size);						\
-		assert((char *)GVT->first_rec == ((char *)&GVT->clue + SIZEOF(gv_key) + keysize));				\
-		assert((char *)GVT->last_rec  == ((char *)GVT->first_rec + SIZEOF(gv_key) + keysize));				\
-		assert(GVT->clue.top == keysize);										\
+	if (NULL != GVT->gd_csa->nl)												\
+	{	/* csa->nl is cleared when a statsDB is closed due to opt-out so use as flag if DB is open or not */		\
+		keysize = GVT->gd_csa->hdr->max_key_size;									\
+		keysize = DBKEYSIZE(keysize);											\
+		partial_size = SIZEOF(gv_namehead) + 2 * SIZEOF(gv_key) + 3 * keysize;						\
+		/* DSE could change the max_key_size dynamically so account for it in the below assert */			\
+		if (!dse_running)												\
+		{														\
+			assert(GVT->gvname.var_name.addr == (char *)GVT + partial_size);					\
+			assert((char *)GVT->first_rec == ((char *)&GVT->clue + SIZEOF(gv_key) + keysize));			\
+			assert((char *)GVT->last_rec  == ((char *)GVT->first_rec + SIZEOF(gv_key) + keysize));			\
+			assert(GVT->clue.top == keysize);									\
+		}														\
+		assert(GVT->clue.top == GVT->first_rec->top);									\
+		assert(GVT->clue.top == GVT->last_rec->top);									\
 	}															\
-	assert(GVT->clue.top == GVT->first_rec->top);										\
-	assert(GVT->clue.top == GVT->last_rec->top);										\
-}
+} MBEND
 
 /* Do checks on the integrity of GVKEY */
 #	define	DBG_CHECK_GVKEY_VALID(GVKEY)					\
-{										\
+MBSTART {									\
 	unsigned char	ch, prevch, *ptr, *pend;				\
 										\
 	assert(GVKEY->end < GVKEY->top);					\
@@ -3111,7 +3187,7 @@ GBLREF	gv_namehead	*gvt_tp_list;
 		prevch = ch;							\
 	}									\
 	/* Do not check GVKEY->prev as it is usually not set. */		\
-}
+} MBEND
 
 #else
 #	define	DBG_CHECK_IN_GVT_TP_LIST(gvt, present)
@@ -3128,7 +3204,7 @@ GBLREF	sgmnt_addrs	*cs_addrs;
 
 /* Indicate incompleteness of (potentially subscripted) global name by adding a "*" (without closing ")") at the end */
 #define	GV_SET_LAST_SUBSCRIPT_INCOMPLETE(BUFF, END)			\
-{									\
+MBSTART {								\
 	if (NULL == (char *)(END))					\
 	{	/* The buffer passed to format_targ_key was not enough	\
 		 * for the transformation. We don't expect this. Handle	\
@@ -3150,13 +3226,13 @@ GBLREF	sgmnt_addrs	*cs_addrs;
 		assert((char *)(END) + 1 <= ((char *)ARRAYTOP(BUFF)));	\
 		*(END)++ = '*';						\
 	}								\
-}
+} MBEND
 
 #define	KEY_COMPLETE_FALSE	FALSE
 #define	KEY_COMPLETE_TRUE	TRUE
 
 #define	ISSUE_GVSUBOFLOW_ERROR(GVKEY, IS_KEY_COMPLETE)							\
-{													\
+MBSTART {												\
 	GBLREF	gv_key	*gv_currkey;									\
 	unsigned char	*endBuff, fmtBuff[MAX_ZWR_KEY_SZ];						\
 													\
@@ -3169,10 +3245,10 @@ GBLREF	sgmnt_addrs	*cs_addrs;
 		gv_currkey->end = 0;	/* to show the key is not valid */				\
 	rts_error_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_GVSUBOFLOW, 0, ERR_GVIS, 2,			\
 			endBuff - fmtBuff, fmtBuff);							\
-}
+} MBEND
 
 #define COPY_SUBS_TO_GVCURRKEY(mvarg, reg, gv_currkey, was_null, is_null)					\
-{														\
+MBSTART {													\
 	GBLREF mv_stent		*mv_chain;									\
 	GBLREF unsigned char	*msp, *stackwarn, *stacktop;							\
 	mval			temp;										\
@@ -3215,7 +3291,7 @@ GBLREF	sgmnt_addrs	*cs_addrs;
 		mval2subsc(mvarg, gv_currkey, reg->std_null_coll);						\
 		is_null = (MV_IS_STRING(mvarg) && (0 == mvarg->str.len));					\
 	}													\
-}
+} MBEND
 
 #define	EXPAND_PREV_KEY_FALSE	FALSE
 #define	EXPAND_PREV_KEY_TRUE	TRUE
@@ -3226,7 +3302,7 @@ GBLREF	sgmnt_addrs	*cs_addrs;
 #define	PREV_KEY_NOT_COMPUTED	DBKEYSIZE(MAX_KEY_SZ)
 
 #define	COPY_PREV_KEY_TO_GVT_CLUE(GVT, EXPAND_PREV_KEY)							\
-{													\
+MBSTART {												\
 	GBLREF gv_key	*gv_altkey;									\
 													\
 	if (EXPAND_PREV_KEY)										\
@@ -3234,8 +3310,13 @@ GBLREF	sgmnt_addrs	*cs_addrs;
 		if (NULL == GVT->prev_key)								\
 			GVKEY_INIT(GVT->prev_key, GVT->clue.top);					\
 		if (gv_altkey->end >= GVT->prev_key->top)						\
-		{											\
-			assert(FALSE);	/* this means we have GVSUBOFLOW integ error */			\
+		{	/* Note that this is possible in case of concurrency issues (i.e. we are in	\
+			 * a restartable situation (see comment at bottom of gvcst_expand_key.c which	\
+			 * talks about a well-formed key. Since we cannot easily signal a restart here,	\
+			 * we reallocate to ensure the COPY_KEY does not cause a buffer overflow and	\
+			 * the caller will eventually do the restart.					\
+			 */										\
+			DEBUG_ONLY(TREF(donot_commit) |= DONOTCOMMIT_COPY_PREV_KEY_TO_GVT_CLUE;)	\
 			GVKEY_INIT(GVT->prev_key, DBKEYSIZE(gv_altkey->end));				\
 		}											\
 		COPY_KEY(GVT->prev_key, gv_altkey);							\
@@ -3244,13 +3325,13 @@ GBLREF	sgmnt_addrs	*cs_addrs;
 		assert(PREV_KEY_NOT_COMPUTED < (1 << (SIZEOF(gv_altkey->end) * 8)));			\
 		GVT->prev_key->end = PREV_KEY_NOT_COMPUTED;						\
 	}												\
-}
+} MBEND
 
 /* Copy GVKEY to GVT->CLUE. Take care NOT to copy cluekey->top to GVKEY->top as they correspond
  * to the allocation sizes of two different memory locations and should stay untouched.
  */
 #define	COPY_CURR_AND_PREV_KEY_TO_GVTARGET_CLUE(GVT, GVKEY, EXPAND_PREV_KEY)				\
-{													\
+MBSTART {												\
 	GBLREF gv_key	*gv_altkey;									\
 	int		keyend;										\
 	DCL_THREADGBL_ACCESS;										\
@@ -3280,22 +3361,22 @@ GBLREF	sgmnt_addrs	*cs_addrs;
 	/* No need to maintain unused GVT->clue.prev */							\
 	COPY_PREV_KEY_TO_GVT_CLUE(GVT, EXPAND_PREV_KEY);						\
 	DBG_CHECK_GVTARGET_INTEGRITY(GVT);								\
-}
+} MBEND
 
 /* If SRC_KEY->end == 0, make sure to copy the first byte of SRC_KEY->base */
 #define MEMCPY_KEY(TARG_KEY, SRC_KEY)								\
-{												\
+MBSTART {											\
 	memcpy((TARG_KEY), (SRC_KEY), OFFSETOF(gv_key, base[0]) + (SRC_KEY)->end + 1);		\
-}
+} MBEND
 #define COPY_KEY(TARG_KEY, SRC_KEY)												\
-{																\
+MBSTART {															\
 	assert(TARG_KEY->top >= SRC_KEY->end);											\
 	/* ensure proper alignment before dereferencing SRC_KEY->end */								\
 	assert(0 == (((UINTPTR_T)(SRC_KEY)) % SIZEOF(SRC_KEY->end)));								\
 	/* WARNING: depends on the first two bytes of gv_key structure being key top field */					\
 	assert((2 == SIZEOF(TARG_KEY->top)) && ((sm_uc_ptr_t)(TARG_KEY) == (sm_uc_ptr_t)(&TARG_KEY->top)));			\
 	memcpy(((sm_uc_ptr_t)(TARG_KEY) + 2), ((sm_uc_ptr_t)(SRC_KEY) + 2), OFFSETOF(gv_key, base[0]) + (SRC_KEY)->end - 1);	\
-}
+} MBEND
 
 /* Macro to denote special value of first_rec when it is no longer reliable */
 #define	GVT_CLUE_FIRST_REC_UNRELIABLE	(short)0xffff
@@ -3308,10 +3389,10 @@ GBLREF	sgmnt_addrs	*cs_addrs;
  * Note that [clue, last_rec] is still a valid keyrange and can be used by gvcst_search.
  */
 #define	GVT_CLUE_INVALIDATE_FIRST_REC(GVT)						\
-{											\
+MBSTART {										\
 	assert(GVT->clue.end);								\
 	*((short *)GVT->first_rec->base) = GVT_CLUE_FIRST_REC_UNRELIABLE;		\
-}
+} MBEND
 
 #ifdef DEBUG
 /* Macro to check that the clue is valid. Basically check that first_rec <= clue <= last_rec. Also check that
@@ -3319,7 +3400,7 @@ GBLREF	sgmnt_addrs	*cs_addrs;
  * checks implies the possibility of DBKEYORD errors (e.g. C9905-001119 in VMS).
  */
 #define	DEBUG_GVT_CLUE_VALIDATE(GVT)											\
-{															\
+MBSTART {														\
 	mname_entry		*gvent;											\
 	unsigned short		klen;											\
 	gv_namehead		*gvt;											\
@@ -3349,7 +3430,7 @@ GBLREF	sgmnt_addrs	*cs_addrs;
 				&& (KEY_DELIMITER == gvt->last_rec->base[gvent->var_name.len]));			\
 		}													\
 	}														\
-}
+} MBEND
 #else
 #define	DEBUG_GVT_CLUE_VALIDATE(GVT)
 #endif
@@ -3358,7 +3439,7 @@ GBLREF	sgmnt_addrs	*cs_addrs;
  * that could exist in the database for this global name.
  */
 #define GVZPREVIOUS_APPEND_MAX_SUBS_KEY(GVKEY, GVT)						\
-{												\
+MBSTART {											\
 	int		lastsubslen, keysize;							\
 	unsigned char	*ptr;									\
 												\
@@ -3383,7 +3464,7 @@ GBLREF	sgmnt_addrs	*cs_addrs;
 	assert(GVKEY->end == (ptr - &GVKEY->base[0]));						\
 	if (NULL != gv_target->gd_csa)								\
 		DBG_CHECK_GVTARGET_INTEGRITY(GVT);						\
-}
+} MBEND
 
 /* Bit masks for the update_trans & si->update_trans variables */
 #define	UPDTRNS_DB_UPDATED_MASK		(1 << 0)	/* 1 if this region was updated by this non-TP/TP transaction */
@@ -3455,7 +3536,7 @@ typedef enum
  * if not possible, it issues TNTOOLARGE error.
  */
 #define CHECK_TN(CSA, CSD, TN)												\
-{															\
+MBSTART {														\
 	assert((CSA)->hdr == (CSD));											\
 	assert((TN) <= (CSD)->max_tn_warn);										\
 	assert((CSD)->max_tn_warn <= (CSD)->max_tn);									\
@@ -3478,18 +3559,18 @@ typedef enum
 		assert((TN) < (CSD)->max_tn_warn);									\
 		assert((CSD)->max_tn_warn <= (CSD)->max_tn);								\
 	}														\
-}
+} MBEND
 
 #define	INCREMENT_CURR_TN(CSD)							\
-{										\
+MBSTART {									\
 	assert((CSD)->trans_hist.curr_tn < (CSD)->max_tn_warn);			\
 	assert((CSD)->max_tn_warn <= (CSD)->max_tn);				\
 	(CSD)->trans_hist.curr_tn++;						\
 	assert((CSD)->trans_hist.curr_tn == (CSD)->trans_hist.early_tn);	\
-}
+} MBEND
 
 #define SET_TN_WARN(CSD, ret_warn_tn)									\
-{													\
+MBSTART {												\
 	trans_num	headroom;									\
 													\
 	headroom = (gtm_uint64_t)(GDSV4 == (CSD)->desired_db_format ? TN_HEADROOM_V4 : TN_HEADROOM_V6);	\
@@ -3499,7 +3580,7 @@ typedef enum
 		(ret_warn_tn) = (CSD)->max_tn - headroom;						\
 	assert((CSD)->trans_hist.curr_tn <= (ret_warn_tn));						\
 	assert((ret_warn_tn) <= (CSD)->max_tn);								\
-}
+} MBEND
 
 #define HIST_TERMINATOR		0
 #define HIST_SIZE(h)		( (SIZEOF(int4) * 2) + (SIZEOF(srch_blk_status) * ((h).depth + 1)) )
@@ -3523,23 +3604,14 @@ typedef enum
 
 OS_PAGE_SIZE_DECLARE
 
-#ifdef VMS
-#define MAX_NAME_LEN		31	/* Size of a repl resource name on vvms */
-#endif
 /* structure to identify a given system wide shared section to be ours (replic section) */
 typedef struct
 {
 	unsigned char	label[GDS_LABEL_SZ];
 	char		pool_type;
 	char		now_running[MAX_REL_NAME];
-#ifdef VMS
-	char		repl_pool_key[MAX_NAME_LEN + 1];	/* resource name for the section */
-	char 		filler[7];			/* makes sure the size of the structure is a multiple of 8 */
-	char		gtmgbldir[MAX_FN_LEN + 1];	/* Identify which instance of this shared pool corresponds to */
-#else
 	int4		repl_pool_key_filler;		/* makes sure the size of the structure is a multiple of 8 */
 	char		instfilename[MAX_FN_LEN + 1];	/* Identify which instance file this shared pool corresponds to */
-#endif
 } replpool_identifier;
 
 #if defined(__osf__) && defined(__alpha)
@@ -3557,37 +3629,37 @@ typedef replpool_identifier 	*replpool_id_ptr_t;
  * This is invoked just BEFORE starting phase1 of the commit.
  */
 #define	INCR_WCS_PHASE2_COMMIT_PIDCNT(csa, cnl)				\
-{									\
+MBSTART {								\
 	assert(!csa->wcs_pidcnt_incremented);				\
 	INCR_CNT(&cnl->wcs_phase2_commit_pidcnt, &cnl->wc_var_lock);	\
 	csa->wcs_pidcnt_incremented = TRUE;				\
-}
+} MBEND
 
 /* Macro to decrement the count of processes that are doing two phase commit.
  * This is invoked just AFTER finishing phase2 of the commit.
  */
 #define	DECR_WCS_PHASE2_COMMIT_PIDCNT(csa, cnl)				\
-{									\
+MBSTART {								\
 	assert(csa->wcs_pidcnt_incremented);				\
 	csa->wcs_pidcnt_incremented = FALSE;				\
 	DECR_CNT(&cnl->wcs_phase2_commit_pidcnt, &cnl->wc_var_lock);	\
-}
+} MBEND
 
 /* The PROBE_DECR_WCS_PHASE2_COMMIT_PIDCNT macro is the same as the DECR_WCS_PHASE2_COMMIT_PIDCNT macro
  * except that it uses PROBE_DECR_CNT instead of DECR_CNT. This does alignment checks and is needed by
  * secshr_db_clnup as it runs in kernel mode in VMS. The two macros should be maintained in parallel.
  */
 #define	PROBE_DECR_WCS_PHASE2_COMMIT_PIDCNT(csa, cnl)				\
-{										\
+MBSTART {									\
 	assert(csa->wcs_pidcnt_incremented);					\
 	csa->wcs_pidcnt_incremented = FALSE;					\
 	PROBE_DECR_CNT(&cnl->wcs_phase2_commit_pidcnt, &cnl->wc_var_lock);	\
-}
+} MBEND
 
 #ifdef UNIX
 /* Insert the process_id into the list of process ids actively doing a kill */
 #define INSERT_KIP_PID(local_csa)						\
-{										\
+MBSTART {									\
 	int		idx;							\
 	uint4		pid;							\
 	uint4		*kip_pid_arr_ptr;					\
@@ -3604,10 +3676,10 @@ typedef replpool_identifier 	*replpool_id_ptr_t;
 			break;							\
 		}								\
 	}									\
-}
+} MBEND
 /* Remove the process_id from the list of process ids actively doing a kill */
 #define REMOVE_KIP_PID(local_csa)						\
-{										\
+MBSTART {									\
 	int		idx;							\
 	uint4		*kip_pid_arr_ptr;					\
 	GBLREF uint4	process_id;						\
@@ -3621,7 +3693,7 @@ typedef replpool_identifier 	*replpool_id_ptr_t;
 			break;							\
 		}								\
 	}									\
-}
+} MBEND
 /* Insert the process_id into the list of process ids with active wcs_timers
  * Note: Unreliable - For Diagnostic Purposes Only
  */
@@ -3666,7 +3738,7 @@ MBSTART {									\
 #endif
 
 #define DECR_KIP(CSD, CSA, KIP_CSA)						\
-{										\
+MBSTART {									\
 	sgmnt_data_ptr_t	local_csd;					\
 	sgmnt_addrs		*local_csa;					\
 										\
@@ -3682,10 +3754,10 @@ MBSTART {									\
 	KIP_CSA = NULL;								\
 	DECR_CNT(&local_csd->kill_in_prog, &local_csa->nl->wc_var_lock);	\
 	REMOVE_KIP_PID(local_csa);						\
-}
+} MBEND
 /* Note that the INCR_KIP and PROBE_INCR_KIP macros should be maintained in parallel */
 #define INCR_KIP(CSD, CSA, KIP_CSA)						\
-{										\
+MBSTART {									\
 	sgmnt_data_ptr_t	local_csd;					\
 	sgmnt_addrs		*local_csa;					\
 										\
@@ -3695,13 +3767,13 @@ MBSTART {									\
 	INCR_CNT(&local_csd->kill_in_prog, &local_csa->nl->wc_var_lock);	\
 	INSERT_KIP_PID(local_csa);						\
 	KIP_CSA = CSA;								\
-}
+} MBEND
 /* The PROBE_INCR_KIP macro is the same as the INCR_KIP macro except that it uses PROBE_INCR_CNT instead of INCR_CNT.
  * This does alignment checks and is needed by secshr_db_clnup as it runs in kernel mode in VMS.
  * The INCR_KIP and PROBE_INCR_KIP macros should be maintained in parallel.
  */
 #define PROBE_INCR_KIP(CSD, CSA, KIP_CSA)						\
-{											\
+MBSTART {										\
 	sgmnt_data_ptr_t	local_csd;						\
 	sgmnt_addrs		*local_csa;						\
 											\
@@ -3711,9 +3783,9 @@ MBSTART {									\
 	PROBE_INCR_CNT(&local_csd->kill_in_prog, &local_csa->nl->wc_var_lock);	\
 	INSERT_KIP_PID(local_csa);							\
 	KIP_CSA = CSA;									\
-}
+} MBEND
 #define PROBE_DECR_KIP(CSD, CSA, KIP_CSA)						\
-{											\
+MBSTART {										\
 	sgmnt_data_ptr_t	local_csd;						\
 	sgmnt_addrs		*local_csa;						\
 											\
@@ -3723,32 +3795,32 @@ MBSTART {									\
 	KIP_CSA = NULL;									\
 	PROBE_DECR_CNT(&local_csd->kill_in_prog, &local_csa->nl->wc_var_lock);	\
 	REMOVE_KIP_PID(local_csa);							\
-}
+} MBEND
 /* Since abandoned_kills counter is only incremented in secshr_db_clnup it does not have its equivalent DECR_ABANDONED_KILLS */
 #define PROBE_INCR_ABANDONED_KILLS(CSD, CSA)				\
-{									\
+MBSTART {								\
         PROBE_INCR_CNT(&CSD->abandoned_kills, &CSA->nl->wc_var_lock);	\
-}
+} MBEND
 
 #define INCR_INHIBIT_KILLS(CNL)					\
-{								\
+MBSTART {							\
 	INCR_CNT(&CNL->inhibit_kills, &CNL->wc_var_lock);	\
-}
+} MBEND
 
 #define DECR_INHIBIT_KILLS(CNL)						\
-{									\
+MBSTART {								\
 	if (0 < CNL->inhibit_kills)					\
 		DECR_CNT(&CNL->inhibit_kills, &CNL->wc_var_lock);	\
-}
+} MBEND
 
 /* Unless the pipeline architecture of the machine precludes it, there is a chance for another process to slip in between the IF and
  * the decrement, but this macro would only be used in relatively unlikely circumstances.
  */
 #define CAREFUL_DECR_CNT(CNT,LATCH)			\
-{							\
+MBSTART {						\
 	if (0 < CNT)					\
 		DECR_CNT(&CNT, &LATCH);			\
-}
+} MBEND
 
 /* Commands like MUPIP BACKUP, MUPIP INTEG -REG or MUPIP FREEZE wait for kills-in-prog flag to become zero.
  * While these process wait for ongoing block-freeing KILLs (or reorg actions that free up blocks) to complete,
@@ -3758,7 +3830,7 @@ MBSTART {									\
  * the inhibit_kills was orphaned (i.e. the process that set it got killed before it got a chance to reset).
  */
 #define	WAIT_ON_INHIBIT_KILLS(CNL, MAXKILLINHIBITWAIT)				\
-{										\
+MBSTART {									\
 	int4			sleep_counter;					\
 										\
 	GBLREF	boolean_t	need_kip_incr;					\
@@ -3775,56 +3847,84 @@ MBSTART {									\
 		}								\
 		wcs_sleep(sleep_counter);					\
 	}									\
-}
+} MBEND
 
-/* Wait for a region freeze to be turned off. Note that we dont hold CRIT at this point. Ideally we would have
+/* Wait for a region freeze to be turned off. Note that we don't hold CRIT at this point. Ideally we would have
  * READ memory barriers between each iterations of sleep to try and get the latest value of the "freeze" field from
  * the concurrently updated database shared memory. But since region-freeze is a perceivably rare event, we choose
  * not to do the memory barriers. The consequence of this decision is that it might take more iterations for us to
  * see updates to the "freeze" field than it would have if we did the memory barrier each iteration. But since we
- * dont hold crit at this point AND since freeze is a rare event, we dont mind the extra wait.
+ * don't hold crit at this point AND since freeze is a rare event, we don't mind the extra wait.
  */
 #define MAXHARDCRITS		31
 
 #define	WAIT_FOR_REGION_TO_UNFREEZE(CSA, CSD)		\
-{							\
+MBSTART {						\
 	int	lcnt1;					\
 							\
 	assert(CSA->hdr == CSD);			\
 	assert(!CSA->now_crit);				\
 	for (lcnt1 = 1; ; lcnt1++)			\
 	{						\
-		if (!CSD->freeze)			\
+		if (!FROZEN_HARD(CSD))			\
 			break;				\
 		if (MAXHARDCRITS < lcnt1)       	\
 			wcs_backoff(lcnt1);     	\
 	}						\
-}
+} MBEND
+
+#define	WAIT_FOR_REGION_TO_UNCHILL(CSA, CSD)										\
+MBSTART {														\
+	int		lcnt1;												\
+	boolean_t	crit_stuck = FALSE;										\
+															\
+	assert((CSA)->hdr == (CSD));											\
+	for (lcnt1 = 1; ; lcnt1++)											\
+	{														\
+		if (!FROZEN_CHILLED(CSD))										\
+			break;												\
+		if (CHILLED_AUTORELEASE(CSD))										\
+		{													\
+			DO_CHILLED_AUTORELEASE(CSA, CSD);								\
+			break;												\
+		}													\
+		else if ((CSA)->now_crit && !crit_stuck)								\
+		{													\
+			send_msg_csa(CSA_ARG(CSA) VARLSTCNT(4) ERR_OFRZCRITSTUCK, 2, REG_LEN_STR((CSA)->region));	\
+			crit_stuck = TRUE;										\
+		}													\
+		if (MAXHARDCRITS < lcnt1)       									\
+			wcs_backoff(lcnt1);     									\
+	}														\
+	if (crit_stuck)													\
+		send_msg_csa(CSA_ARG(CSA) VARLSTCNT(4) ERR_OFRZCRITREL, 2, REG_LEN_STR((CSA)->region));			\
+} MBEND
 
 /* Since this macro is called from "t_retry", we need to ensure encryption cycles are synced as part of
  * the grab_crit, hence the "grab_crit_encr_cycle_sync" usage. Other callers of this macro like "mupip_extend"
- * dont need that functionality but it does not hurt them so we leave it at that instead of forking this
+ * don't need that functionality but it does not hurt them so we leave it at that instead of forking this
  * macro into two versions (one using "grab_crit" and another using "grab_crit_encr_cycle_sync").
  */
 #define	GRAB_UNFROZEN_CRIT(reg, csa, csd)				\
-{									\
+MBSTART {								\
 	int	lcnt;							\
 									\
 	assert(&FILE_INFO(reg)->s_addrs == csa && csa->hdr == csd);	\
 	assert(csa->now_crit);						\
 	for (lcnt = 0; ; lcnt++)					\
 	{								\
-		if (!csd->freeze)					\
+		if (!FROZEN_HARD(csd))					\
 			break;						\
 		rel_crit(reg);						\
 		WAIT_FOR_REGION_TO_UNFREEZE(csa, csd);			\
 		grab_crit_encr_cycle_sync(reg);				\
 	}								\
-	assert(!csd->freeze && csa->now_crit);				\
-}
+	assert(!FROZEN_HARD(csd) && csa->now_crit);			\
+} MBEND
+
 /* remove "csa" from list of open regions (cs_addrs_list) */
 #define	REMOVE_CSA_FROM_CSADDRSLIST(CSA)						\
-{											\
+MBSTART {										\
 	GBLREF	sgmnt_addrs	*cs_addrs_list;						\
 											\
 	sgmnt_addrs	*tmpcsa, *prevcsa;						\
@@ -3851,37 +3951,31 @@ MBSTART {									\
 		else									\
 			cs_addrs_list = CSA->next_csa;					\
 	}										\
-}
-
-#ifdef VMS
-#define NEW_DBINIT_SHM_IPC_MASK		(1 << 0)	/* 1 if db_init created a new shared memory (no pre-existing one) */
-#define NEW_DBINIT_SEM_IPC_MASK		(1 << 1)	/* 1 if db_init created a new access control semaphore */
-#endif
+} MBEND
 
 #define RESET_SHMID_CTIME(X)			\
-{						\
+MBSTART {					\
 	(X)->shmid = INVALID_SHMID;		\
 	(X)->gt_shm_ctime.ctime = 0;		\
-}
+} MBEND
 
 #define RESET_SEMID_CTIME(X)			\
-{						\
+MBSTART {					\
 	(X)->semid = INVALID_SEMID;		\
 	(X)->gt_sem_ctime.ctime = 0;		\
-}
+} MBEND
 
 #define RESET_IPC_FIELDS(X)		\
-{					\
+MBSTART {				\
 	RESET_SHMID_CTIME(X);		\
 	RESET_SEMID_CTIME(X);		\
-}
+} MBEND
 
-#if defined(UNIX)
 GBLREF	boolean_t	multi_thread_in_use;		/* TRUE => threads are in use. FALSE => not in use */
 
 /* #GTM_THREAD_SAFE : The below macro (DB_FSYNC) is thread-safe */
 #define DB_FSYNC(reg, udi, csa, db_fsync_in_prog, save_errno)						\
-{													\
+MBSTART {												\
 	int	rc;											\
 													\
 	BG_TRACE_PRO_ANY(csa, n_db_fsyncs);								\
@@ -3900,18 +3994,11 @@ GBLREF	boolean_t	multi_thread_in_use;		/* TRUE => threads are in use. FALSE => n
 	if (!multi_thread_in_use)									\
 		db_fsync_in_prog--;									\
 	assert(0 <= db_fsync_in_prog);									\
-}
+} MBEND
 
 #define STANDALONE(x) mu_rndwn_file(x, TRUE)
 #define DBFILOP_FAIL_MSG(status, msg)	gtm_putmsg_csa(CSA_ARG(REG2CSA(gv_cur_region)) VARLSTCNT(5) msg, 2,			\
 							DB_LEN_STR(gv_cur_region), status);
-#elif defined(VMS)
-#define STANDALONE(x) mu_rndwn_file(TRUE)	/* gv_cur_region needs to be equal to "x" */
-#define DBFILOP_FAIL_MSG(status, msg)	gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(6) msg, 2, DB_LEN_STR(gv_cur_region), status,	\
-						   FILE_INFO(gv_cur_region)->fab->fab$l_stv);
-#else
-#error unsupported platform
-#endif
 
 #define CR_NOT_ALIGNED(cr, cr_base)		(!IS_PTR_ALIGNED((cr), (cr_base), SIZEOF(cache_rec)))
 #define CR_NOT_IN_RANGE(cr, cr_lo, cr_hi)	(!IS_PTR_IN_RANGE((cr), (cr_lo), (cr_hi)))
@@ -3920,17 +4007,17 @@ GBLREF	boolean_t	multi_thread_in_use;		/* TRUE => threads are in use. FALSE => n
  * recomputing from the cache_array.
  * NOTE: We rely on bt_buckets, n_bts and blk_size fields of file header being correct/not corrupt */
 #define CR_BUFFER_CHECK(reg, csa, csd, cr)							\
-{												\
+MBSTART {											\
 	cache_rec_ptr_t		cr_lo, cr_hi;							\
 												\
 	cr_lo = (cache_rec_ptr_t)csa->acc_meth.bg.cache_state->cache_array + csd->bt_buckets;	\
 	cr_hi = cr_lo + csd->n_bts;								\
 	CR_BUFFER_CHECK1(reg, csa, csd, cr, cr_lo, cr_hi);					\
-}
+} MBEND
 
 /* A more efficient macro than CR_BUFFER_CHECK when we have cr_lo and cr_hi already available */
 #define CR_BUFFER_CHECK1(reg, csa, csd, cr, cr_lo, cr_hi)					\
-{												\
+MBSTART {											\
 	INTPTR_T bp, bp_lo, bp_top, cr_top;							\
 												\
 	cr_top = GDS_ANY_ABS2REL(csa, cr_hi);							\
@@ -3945,13 +4032,12 @@ GBLREF	boolean_t	multi_thread_in_use;		/* TRUE => threads are in use. FALSE => n
 	}											\
 	DEBUG_ONLY(bp_top = bp_lo + (gtm_uint64_t)csd->n_bts * csd->blk_size;)			\
 	assert(IS_PTR_IN_RANGE(bp, bp_lo, bp_top) && IS_PTR_ALIGNED(bp, bp_lo, csd->blk_size));	\
-}
-
-#define DB_INFO	UNIX_ONLY(unix_db_info)VMS_ONLY(vms_gds_info)
+} MBEND
 
 #define FILE_CNTL_INIT_IF_NULL(SEG)								\
-{												\
+MBSTART {											\
 	file_control	*lcl_fc;								\
+	sgmnt_addrs	*csa;									\
 												\
 	lcl_fc = SEG->file_cntl;								\
 	if (NULL == lcl_fc)									\
@@ -3961,18 +4047,43 @@ GBLREF	boolean_t	multi_thread_in_use;		/* TRUE => threads are in use. FALSE => n
 	}											\
 	if (NULL == lcl_fc->file_info)								\
 	{											\
-		MALLOC_INIT(lcl_fc->file_info, SIZEOF(DB_INFO));				\
+		MALLOC_INIT(lcl_fc->file_info, SIZEOF(unix_db_info));				\
 		SEG->file_cntl->file_info = lcl_fc->file_info;					\
+		csa = &((unix_db_info *)(lcl_fc->file_info))->s_addrs;				\
+		csa->gvstats_rec_p = &csa->gvstats_rec;						\
 	}											\
-}
-#define FILE_CNTL_INIT(SEG)									\
-{												\
-	file_control	*lcl_fc;								\
-												\
-	MALLOC_INIT(lcl_fc, SIZEOF(file_control));						\
-	MALLOC_INIT(lcl_fc->file_info, SIZEOF(DB_INFO));					\
-	SEG->file_cntl = lcl_fc;								\
-}
+} MBEND
+
+#define FILE_CNTL_INIT(SEG)						\
+MBSTART {								\
+	file_control	*lcl_fc;					\
+	sgmnt_addrs	*csa;						\
+									\
+	MALLOC_INIT(lcl_fc, SIZEOF(file_control));			\
+	MALLOC_INIT(lcl_fc->file_info, SIZEOF(unix_db_info));		\
+	SEG->file_cntl = lcl_fc;					\
+	csa = &((unix_db_info *)(lcl_fc->file_info))->s_addrs;		\
+	csa->gvstats_rec_p = &csa->gvstats_rec;				\
+} MBEND
+
+#define	FILE_CNTL_FREE(SEG)						\
+MBSTART {								\
+	file_control	*lcl_fc;					\
+	unix_db_info	*udi;						\
+									\
+	lcl_fc = SEG->file_cntl;					\
+	if (NULL != lcl_fc)						\
+	{								\
+		udi = (unix_db_info *)lcl_fc->file_info;		\
+		if (NULL != udi)					\
+		{							\
+			free(udi);					\
+			lcl_fc->file_info = NULL;			\
+		}							\
+		free(lcl_fc);						\
+		SEG->file_cntl = NULL;					\
+	}								\
+} MBEND
 
 #define	IS_DOLLAR_INCREMENT			((is_dollar_incr) && (ERR_GVPUTFAIL == t_err))
 
@@ -3985,13 +4096,12 @@ GBLREF	boolean_t	multi_thread_in_use;		/* TRUE => threads are in use. FALSE => n
 
 #define SET_SNAPSHOTS_IN_PROG(X)	((X)->snapshot_in_prog = TRUE)
 #define CLEAR_SNAPSHOTS_IN_PROG(X)	((X)->snapshot_in_prog = FALSE)
-#ifdef GTM_SNAPSHOT
 # define SNAPSHOTS_IN_PROG(X)	((X)->snapshot_in_prog)
 /* Creates a new snapshot context. Called by GT.M (or utilities like update process, MUPIP LOAD which uses
  * GT.M runtime. As a side effect sets csa->snapshot_in_prog to TRUE if the context creation went fine.
  */
 # define SS_INIT_IF_NEEDED(CSA, CNL)											\
-{															\
+MBSTART {														\
 	int			ss_shmcycle;										\
 	boolean_t		status;											\
 	snapshot_context_ptr_t	lcl_ss_ctx;										\
@@ -4028,11 +4138,11 @@ GBLREF	boolean_t	multi_thread_in_use;		/* TRUE => threads are in use. FALSE => n
 		 */													\
 		CLEAR_SNAPSHOTS_IN_PROG(CSA);										\
 	}														\
-}
+} MBEND
 
 #ifdef DEBUG
 # define DBG_ENSURE_SNAPSHOT_GOOD_TO_GO(LCL_SS_CTX, CNL)				\
-{											\
+MBSTART {										\
 	shm_snapshot_ptr_t		ss_shm_ptr;					\
 											\
 	assert(SNAPSHOTS_IN_PROG(CNL));							\
@@ -4046,7 +4156,7 @@ GBLREF	boolean_t	multi_thread_in_use;		/* TRUE => threads are in use. FALSE => n
 	assert(NULL != LCL_SS_CTX->start_shmaddr);					\
 	assert(0 == STRCMP(LCL_SS_CTX->shadow_file, ss_shm_ptr->ss_info.shadow_file));	\
 	assert(-1 != LCL_SS_CTX->shdw_fd);						\
-}
+} MBEND
 #else
 # define DBG_ENSURE_SNAPSHOT_GOOD_TO_GO(LCL_SS_CTX, CNL)
 #endif
@@ -4055,7 +4165,7 @@ GBLREF	boolean_t	multi_thread_in_use;		/* TRUE => threads are in use. FALSE => n
  * to FALSE if the context is destroyed
  */
 # define SS_RELEASE_IF_NEEDED(CSA, CNL)							\
-{											\
+MBSTART {										\
 	int			ss_shmcycle;						\
 	snapshot_context_ptr_t	lcl_ss_ctx;						\
 											\
@@ -4067,7 +4177,7 @@ GBLREF	boolean_t	multi_thread_in_use;		/* TRUE => threads are in use. FALSE => n
 		ss_destroy_context(lcl_ss_ctx);						\
 		CLEAR_SNAPSHOTS_IN_PROG(CSA);						\
 	}										\
-}
+} MBEND
 
 /* No need to write before-image in case the block is FREE. In case the database had never been fully upgraded from V4 to V5 format
  * (after the MUPIP UPGRADE), all RECYCLED blocks can basically be considered FREE (i.e. no need to write before-images since
@@ -4082,14 +4192,14 @@ GBLREF	boolean_t	multi_thread_in_use;		/* TRUE => threads are in use. FALSE => n
  * accordingly. For now, INTEG is the only snapshot initiator.
  */
 # define BEFORE_IMAGE_NEEDED(read_before_image, CS, csa, csd, blk_no, retval)				 		\
-{													 		\
+MBSTART {													 	\
 	retval = (read_before_image && csd->db_got_to_v5_once);								\
 	retval = retval && (!WAS_FREE(CS->blk_prior_state) || SNAPSHOTS_IN_PROG(csa));				\
 	retval = retval && (!ONLY_SS_BEFORE_IMAGES(csa) || !ss_chk_shdw_bitmap(csa, SS_CTX_CAST(csa->ss_ctx), blk_no));\
-}
+} MBEND
 
 # define CHK_AND_UPDATE_SNAPSHOT_STATE_IF_NEEDED(CSA, CNL, SS_NEED_TO_RESTART)							\
-{																\
+MBSTART {															\
 	GBLREF	uint4		process_id;											\
 																\
 	uint4			lcl_failure_errno;										\
@@ -4164,10 +4274,10 @@ GBLREF	boolean_t	multi_thread_in_use;		/* TRUE => threads are in use. FALSE => n
 		} else /* A new snapshot has started after we grabbed crit in t_end. Need to restart */				\
 			SS_NEED_TO_RESTART = TRUE;										\
 	}															\
-}
+} MBEND
 
 # define WRITE_SNAPSHOT_BLOCK(csa, cr, mm_blk_ptr, blkid, lcl_ss_ctx)			\
-{											\
+MBSTART {										\
 	assert(NULL != lcl_ss_ctx);							\
 	/* write this block to the snapshot shadow file only if this was not already	\
 	 * before imaged. If error happens while writing to the snapshot file, then	\
@@ -4178,58 +4288,29 @@ GBLREF	boolean_t	multi_thread_in_use;		/* TRUE => threads are in use. FALSE => n
 	if (!ss_chk_shdw_bitmap(csa, lcl_ss_ctx, blkid))				\
 		if (!ss_write_block(csa, blkid, cr, mm_blk_ptr, lcl_ss_ctx))		\
 			assert(FALSE);							\
-}
-#else
-/* GTM_SNAPSHOT is not defined */
-# define SNAPSHOTS_IN_PROG(X)	(FALSE)
-# define WRITE_SNAPSHOT_BLOCK(csa, cr, mm_blk_ptr, blkid, lcl_ss_ctx)
-# define SS_INIT_IF_NEEDED(CSA, CNL)
-# define SS_RELEASE_IF_NEEDED(CSA, CNL)
-/* No need to write before-image in case the block is FREE. In case the database had never been fully upgraded from V4 to V5 format
- * (after the MUPIP UPGRADE), all RECYCLED blocks can basically be considered FREE (i.e. no need to write before-images since
- * backward journal recovery will never be expected to take the database to a point BEFORE the mupip upgrade).
- */
-# define BEFORE_IMAGE_NEEDED(read_before_image, CS, csa, csd, blk_no, retval)		\
-	retval = (read_before_image && csd->db_got_to_v5_once && !WAS_FREE(CS->blk_prior_state));
-#endif
+} MBEND
 
 /* Determine if the state of 'backup in progress' has changed since we grabbed crit in t_end.c/tp_tend.c */
 #define CHK_AND_UPDATE_BKUP_STATE_IF_NEEDED(CNL, CSA, NEW_BKUP_STARTED)				\
-{												\
+MBSTART {											\
 	if (CSA->backup_in_prog != (BACKUP_NOT_IN_PROGRESS != CNL->nbb))			\
 	{											\
 		if (!CSA->backup_in_prog)							\
 			NEW_BKUP_STARTED = TRUE;						\
 		CSA->backup_in_prog = !CSA->backup_in_prog;					\
 	}											\
-}
+} MBEND
 
 #define BLK_HDR_EMPTY(bp) ((0 == (bp)->bsiz) && (0 == (bp)->tn))
 
-#ifdef GTM_TRUNCATE
-/* Reduction in free blocks after truncating from a to b total blocks: a = old_total (larger), b = new_total */
-# define DELTA_FREE_BLOCKS(a, b)	((a - b) - (DIVIDE_ROUND_UP(a, BLKS_PER_LMAP) - DIVIDE_ROUND_UP(b, BLKS_PER_LMAP)))
-/* #GTM_THREAD_SAFE : The below macro (WRITE_EOF_BLOCK) is thread-safe */
-# define WRITE_EOF_BLOCK(reg, csd, new_total, status)								\
-{														\
-	off_t		new_eof;										\
-	char		buff[DISK_BLOCK_SIZE];									\
-	sgmnt_addrs	*csa;											\
-	unix_db_info    *udi;											\
-														\
-	new_eof = ((off_t)(csd->start_vbn - 1) * DISK_BLOCK_SIZE) + ((off_t)new_total * csd->blk_size);		\
-	memset(buff, 0, DISK_BLOCK_SIZE);									\
-	udi = FILE_INFO(reg);											\
-	csa = &udi->s_addrs;											\
-	DB_LSEEKWRITE(csa, udi->fn, udi->fd, new_eof, buff, DISK_BLOCK_SIZE, status);				\
-}
-#endif
-
 typedef enum
 {
 	REG_FREEZE_SUCCESS,
 	REG_ALREADY_FROZEN,
-	REG_HAS_KIP
+	REG_HAS_KIP,
+	REG_FLUSH_ERROR,
+	REG_JNL_OPEN_ERROR,
+	REG_JNL_SWITCH_ERROR
 } freeze_status;
 
 #ifdef UNIX
@@ -4254,7 +4335,7 @@ typedef struct redo_root_search_context_struct
 #endif
 
 #define SET_GV_CURRKEY_FROM_GVT(GVT)						\
-{										\
+MBSTART {									\
 	mname_entry		*gvent;						\
 	int			end;						\
 										\
@@ -4269,10 +4350,10 @@ typedef struct redo_root_search_context_struct
 	gv_currkey->end = end;							\
 	gv_currkey->base[end - 1] = 0;						\
 	gv_currkey->base[end] = 0;						\
-}
+} MBEND
 
 #define SET_WANT_ROOT_SEARCH(CDB_STATUS, WANT_ROOT_SEARCH)								\
-{															\
+MBSTART {														\
 	GBLREF	uint4			t_tries;									\
 	GBLREF	gv_namehead		*gv_target;									\
 															\
@@ -4300,10 +4381,10 @@ typedef struct redo_root_search_context_struct
 		default:												\
 			break;												\
 	}														\
-}
+} MBEND
 
 #define REDO_ROOT_SEARCH_IF_NEEDED(WANT_ROOT_SEARCH, CDB_STATUS)							\
-{															\
+MBSTART {														\
 	DEBUG_ONLY(GBLREF tp_frame	*tp_pointer;)									\
 	GBLREF uint4			t_err;										\
 	GBLREF uint4			update_trans;									\
@@ -4328,19 +4409,19 @@ typedef struct redo_root_search_context_struct
 		if (cdb_sc_normal == CDB_STATUS)									\
 			WANT_ROOT_SEARCH = FALSE;									\
 	}														\
-}
+} MBEND
 
 #define ASSERT_BEGIN_OF_FRESH_TP_TRANS												\
-{																\
+MBSTART {															\
 	GBLREF	sgm_info	*first_sgm_info;										\
 	GBLREF	sgm_info	*sgm_info_ptr;											\
 																\
 	assert((NULL == first_sgm_info) || ((sgm_info_ptr == first_sgm_info) && (NULL == first_sgm_info->next_sgm_info)));	\
 	assert((NULL == first_sgm_info) || (0 == sgm_info_ptr->num_of_blks));							\
-}
+} MBEND
 
 #define GVCST_ROOT_SEARCH							\
-{	/* gvcst_root_search is invoked to establish the root block of a 	\
+MBSTART {	/* gvcst_root_search is invoked to establish the root block of a \
 	 * given global (pointed to by gv_target). We always expect the root	\
 	 * block of the directory tree to be 1 and so must never come here	\
 	 * with gv_target pointing to directory tree. Assert that.		\
@@ -4350,21 +4431,22 @@ typedef struct redo_root_search_context_struct
 	assert((NULL != gv_target) && (DIR_ROOT != gv_target->root));		\
 	if (!gv_target->root)							\
 		gvcst_root_search(FALSE);					\
-}
+} MBEND
 
 /* Same as GVCST_ROOT_SEARCH, but tells gvcst_root_search NOT to restart but to return the status code back to the caller */
 #define GVCST_ROOT_SEARCH_DONOT_RESTART(STATUS)					\
-{										\
+MBSTART {									\
 	GBLREF gv_namehead	*gv_target;					\
 										\
 	assert((NULL != gv_target) && (DIR_ROOT != gv_target->root));		\
 	STATUS = cdb_sc_normal;							\
 	if (!gv_target->root)							\
 		STATUS = gvcst_root_search(TRUE);				\
-}
+} MBEND
 
 #define GVCST_ROOT_SEARCH_AND_PREP(est_first_pass)								\
-{	/* Before beginning a spanning node (gvcst_xxx) or spanning region (gvcst_spr_xxx) try in a gvcst	\
+MBSTART {													\
+	/* Before beginning a spanning node (gvcst_xxx) or spanning region (gvcst_spr_xxx) try in a gvcst	\
 	 * routine, make sure the root is established. If we've restarted issue DBROLLEDBACK appropriately.	\
 	 */													\
 	GBLREF	unsigned char		t_fail_hist[CDB_MAX_TRIES]; /* for LAST_RESTART_CODE */			\
@@ -4380,12 +4462,12 @@ typedef struct redo_root_search_context_struct
 		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(1) ERR_DBROLLEDBACK);					\
 	tp_set_sgm();												\
 	GVCST_ROOT_SEARCH;											\
-}
+} MBEND
 
 #define GV_BIND_NAME_ONLY(ADDR, TARG, GVNH_REG)		GVNH_REG = gv_bind_name(ADDR, TARG)
 
 #define GV_BIND_NAME_AND_ROOT_SEARCH(ADDR, TARG, GVNH_REG)					\
-{												\
+MBSTART {											\
 	enum db_acc_method	acc_meth;							\
 												\
 	GBLREF gd_region	*gv_cur_region;							\
@@ -4398,7 +4480,7 @@ typedef struct redo_root_search_context_struct
 	if (NULL == GVNH_REG->gvspan)								\
 	{											\
 		acc_meth = REG_ACC_METH(gv_cur_region);						\
-		if ((dba_bg == acc_meth) || (dba_mm == acc_meth))				\
+		if (IS_ACC_METH_BG_OR_MM(acc_meth))						\
 			GVCST_ROOT_SEARCH;							\
 	} else if (!gv_target->root && gv_target->act_specified_in_gld && gv_target->act)	\
 	{	/* gv_target->root is ZERO which means we have still not done a			\
@@ -4409,18 +4491,18 @@ typedef struct redo_root_search_context_struct
 		 */										\
 		act_in_gvt(gv_target); /* note: this could issue COLLTYPVERSION error */	\
 	}											\
-}
+} MBEND
 
 #define	GET_REG_INDEX(ADDR, REG_START, REG, REG_INDEX)				\
-{										\
+MBSTART {									\
 	assert((REG >= REG_START) && (REG < &ADDR->regions[ADDR->n_regions]));	\
 	REG_INDEX = REG - REG_START;						\
-}
+} MBEND
 
 #define	ACT_NOT_SPECIFIED	(MAXUINT4)
 
 #define	DO_NCT_CHECK_FOR_SPANGBLS(GVT, GVNH_REG, REG)								\
-{														\
+MBSTART {													\
 	if ((NULL != GVNH_REG->gvspan) && !GVT->nct_must_be_zero)						\
 	{													\
 		if (GVT->nct)											\
@@ -4428,11 +4510,11 @@ typedef struct redo_root_search_context_struct
 					GVT->gvname.var_name.len, GVT->gvname.var_name.addr);			\
 		GVT->nct_must_be_zero = TRUE;									\
 	}													\
-}
+} MBEND
 
 /* Copy "act" from the .gld file (GBLNAME section) to the GVNH_REG structure and in turn the GVT structure */
 #define	COPY_ACT_FROM_GLD_TO_GVNH_REG_AND_GVT(ADDR, GVT, GBL_SPANS_REG, GVNH_REG, REG)			\
-{													\
+MBSTART {												\
 	gd_gblname	*gname;										\
 													\
 	if ((NULL != ADDR) && (((gd_addr *)ADDR)->n_gblnames))						\
@@ -4463,15 +4545,15 @@ typedef struct redo_root_search_context_struct
 	} else												\
 		GVNH_REG->act = ACT_NOT_SPECIFIED;							\
 	COPY_ACT_FROM_GVNH_REG_TO_GVT(GVNH_REG, GVT, REG);						\
-}
+} MBEND
 
 /* Copy "act" from the GVNH_REG structure to the GVT structure.
- * Currently the GLD (and in turn GVNH_REG) dont have a way to set "nct" for a gblname.
+ * Currently the GLD (and in turn GVNH_REG) don't have a way to set "nct" for a gblname.
  * Therefore only "act" gets copied over currently. This macro needs to change if/when
  * "nct" support for gblname gets added to the gld.
  */
 #define	COPY_ACT_FROM_GVNH_REG_TO_GVT(GVNH_REG, GVT, REG)						\
-{													\
+MBSTART {												\
 	uint4	gldact;											\
 													\
 	DO_NCT_CHECK_FOR_SPANGBLS(GVT, GVNH_REG, REG);							\
@@ -4498,13 +4580,13 @@ typedef struct redo_root_search_context_struct
 		GVT->ver = GVNH_REG->ver;								\
 	}												\
 	GVT->nct_must_be_zero = (NULL != GVNH_REG->gvspan);						\
-}
+} MBEND
 
 /* This macro finishes the task of GV_BIND_NAME_AND_ROOT_SEARCH (in terms of setting gv_cur_region)
  * in case the global spans multiple regions.
  */
 #define	GV_BIND_SUBSNAME_IF_GVSPAN(GVNH_REG, GD_HEADER, GVKEY, REG)			\
-{											\
+MBSTART {										\
 	GBLREF gd_region	*gv_cur_region;						\
 											\
 	assert(NULL != GVNH_REG);							\
@@ -4513,10 +4595,10 @@ typedef struct redo_root_search_context_struct
 		GV_BIND_SUBSNAME(GVNH_REG, GD_HEADER, GVKEY, REG);			\
 	} else										\
 		TREF(gd_targ_gvnh_reg) = NULL;						\
-}
+} MBEND
 
 #define	GV_BIND_SUBSNAME_FROM_GVNH_REG_IF_GVSPAN(GVNH_REG, GD_HEADER, GVKEY)						\
-{															\
+MBSTART {														\
 	gvnh_reg_t			*gvnhReg; /* use unique name to avoid name collisions with macro caller */	\
 	DEBUG_ONLY(													\
 		ht_ent_mname		*tabent;									\
@@ -4539,11 +4621,11 @@ typedef struct redo_root_search_context_struct
 	assert((NULL == gvnhReg) || (TREF(spangbl_seen) && (NULL != gvnhReg->gvspan)));					\
 	if (NULL != gvnhReg)												\
 		gv_bind_subsname(GD_HEADER, GVKEY, GVNH_REG);								\
-}
+} MBEND
 
 /* This macro is similar to GV_BIND_SUBSNAME_IF_GVSPAN except we know for sure this is a spanning global */
 #define	GV_BIND_SUBSNAME(GVNH_REG, GD_HEADER, GVKEY, REG)					\
-{	/* This is a global that spans multiple regions. Re-bind the subscripted reference			\
+MBSTART {	/* This is a global that spans multiple regions. Re-bind the subscripted reference		\
 	 * just in case this maps to a different region than the unsubscripted global name.			\
 	 */													\
 	TREF(gd_targ_gvnh_reg) = GVNH_REG;									\
@@ -4551,13 +4633,13 @@ typedef struct redo_root_search_context_struct
 	/* gv_target/gv_cur_region/cs_addrs/cs_data are now initialized even for non-NULL gvnh_reg->gvspan */	\
 	/* In addition TREF(gd_targ_map) is set as well */							\
 	REG = gv_cur_region;	/* adjust "REG" in case gv_cur_region was modified in the above call */		\
-}
+} MBEND
 
 /* sets gv_target to correspond to REG region of spanning global. also sets gv_target->root if not already non-zero.
  * also sets global variables gv_cur_region/cs_addrs/cs_data to correspond to input region.
  */
 #define	GV_BIND_SUBSREG(ADDR, REG, GVNH_REG)						\
-{											\
+MBSTART {										\
 	gv_namehead			*gvt;						\
 	gvnh_spanreg_t			*gvspan;					\
 	int				min_reg_index, reg_index;			\
@@ -4592,9 +4674,9 @@ typedef struct redo_root_search_context_struct
 	gv_cur_region = REG;								\
 	change_reg();									\
 	DEBUG_ONLY(acc_meth = REG_ACC_METH(gv_cur_region);)				\
-	assert((dba_bg == acc_meth) || (dba_mm == acc_meth));				\
+	assert(IS_ACC_METH_BG_OR_MM(acc_meth));						\
 	GVCST_ROOT_SEARCH;								\
-}
+} MBEND
 
 /* When invoking grab_lock or grab_gtmsource_srv_latch, use one of the following parameters.
  * GRAB_LOCK_ONLY			: use when code expects an online rollback, but handles it separately (like updproc.c)
@@ -4611,7 +4693,7 @@ typedef struct redo_root_search_context_struct
 /* caller should have THREADGBL_ACCESS and gbl access to t_tries and t_fail_hist */
 # define LAST_RESTART_CODE			( (0 < t_tries) ? t_fail_hist[TREF(prev_t_tries)] : (enum cdb_sc)cdb_sc_normal )
 # define SYNC_ONLN_RLBK_CYCLES													\
-{																\
+MBSTART {															\
 	GBLREF	sgmnt_addrs		*cs_addrs_list;										\
 	GBLREF	jnlpool_addrs		jnlpool;										\
 	GBLREF	boolean_t		mu_reorg_process;									\
@@ -4626,6 +4708,7 @@ typedef struct redo_root_search_context_struct
 		{														\
 			lcl_csa->onln_rlbk_cycle = lcl_csa->nl->onln_rlbk_cycle;						\
 			lcl_csa->db_onln_rlbkd_cycle = lcl_csa->nl->db_onln_rlbkd_cycle;					\
+			/* Online rollback increments csa->hdr->db_trigger_cycle forcing a mismatch to reload triggers */	\
 			lcl_csa->db_trigger_cycle = lcl_csa->hdr->db_trigger_cycle;						\
 		}														\
 		if (NULL != jnlpool.jnlpool_ctl)										\
@@ -4634,9 +4717,9 @@ typedef struct redo_root_search_context_struct
 			lcl_csa->onln_rlbk_cycle = jnlpool.jnlpool_ctl->onln_rlbk_cycle;					\
 		}														\
 	}															\
-}
+} MBEND
 # define SYNC_ROOT_CYCLES(CSA)													\
-{	/* NULL CSA acts as a flag to do all regions */										\
+MBSTART {	/* NULL CSA acts as a flag to do all regions */									\
 	GBLREF  sgmnt_addrs             *cs_addrs_list;										\
 	GBLREF	boolean_t		mu_reorg_process;									\
 																\
@@ -4647,13 +4730,13 @@ typedef struct redo_root_search_context_struct
 	for (lcl_csa = cs_addrs_list; NULL != lcl_csa; lcl_csa = lcl_csa->next_csa)						\
 		if (NULL == (CSA) || (CSA) == lcl_csa)										\
 			lcl_csa->root_search_cycle = lcl_csa->nl->root_search_cycle;						\
-}
+} MBEND
 # define MISMATCH_ROOT_CYCLES(CSA, CNL)		((CSA)->root_search_cycle != (CNL)->root_search_cycle)
 # define MISMATCH_ONLN_RLBK_CYCLES(CSA, CNL)	((CSA)->onln_rlbk_cycle != (CNL)->onln_rlbk_cycle)
 # define ONLN_RLBK_STATUS(CSA, CNL)												\
 	(((CSA)->db_onln_rlbkd_cycle != (CNL)->db_onln_rlbkd_cycle) ? cdb_sc_onln_rlbk2 : cdb_sc_onln_rlbk1)
 # define ABORT_TRANS_IF_GBL_EXIST_NOMORE(LCL_T_TRIES, TN_ABORTED)								\
-{																\
+MBSTART {															\
 	DEBUG_ONLY(GBLREF unsigned int		t_tries;)									\
 	DEBUG_ONLY(GBLREF unsigned char		t_fail_hist[CDB_MAX_TRIES];)							\
 	GBLREF	gd_region			*gv_cur_region;									\
@@ -4679,13 +4762,13 @@ typedef struct redo_root_search_context_struct
 		t_abort(gv_cur_region, cs_addrs);										\
 		TN_ABORTED = TRUE;												\
 	}															\
-}
+} MBEND
 #else
 # define ABORT_TRANS_IF_GBL_EXIST_NOMORE(LCL_T_TRIES, TN_ABORTED)
 #endif
 
 #define	SET_GV_ALTKEY_TO_GBLNAME_FROM_GV_CURRKEY				\
-{										\
+MBSTART {									\
 	uchar_ptr_t		dst_ptr, src_ptr;				\
 										\
 	GBLREF	gv_key		*gv_currkey, *gv_altkey;			\
@@ -4702,7 +4785,7 @@ typedef struct redo_root_search_context_struct
 	*dst_ptr = 0;								\
 	gv_altkey->end = dst_ptr - gv_altkey->base;				\
 	assert(gv_altkey->end < gv_altkey->top);				\
-}
+} MBEND
 
 typedef struct span_subs_struct {
 	unsigned char	b_ctrl;
@@ -4737,12 +4820,12 @@ typedef struct span_subs_struct {
  * needs to be fixed accordingly.
  */
 #define SPAN_SUBSCOPY_SRC2DST(DST, SRC) 						\
-{											\
+MBSTART {										\
 	assert(SPAN_SUBS_LEN == 3);							\
 	*((DST) + 0) = *((SRC) + 0); 							\
 	*((DST) + 1) = *((SRC) + 1); 							\
 	*((DST) + 2) = *((SRC) + 2);							\
-}
+} MBEND
 
 /*#include "mv_stent.h"*/
 typedef struct
@@ -4779,15 +4862,15 @@ typedef struct
 /* Check if the value of a primary node is a dummy value: $c(0). If so, it might be a spanning node */
 # define IS_SN_DUMMY(len, addr) ((1 == (len)) && ('\0' == *(unsigned char *)(addr)))
 # define RTS_ERROR_IF_SN_DISALLOWED											\
-{															\
+MBSTART {														\
 	GBLREF	boolean_t 		span_nodes_disallowed;								\
 															\
 	if (span_nodes_disallowed)											\
 		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_UNIMPLOP, 0,	ERR_TEXT, 2,				\
 					LEN_AND_LIT("GT.CM Server does not support spanning nodes"));			\
-}
+} MBEND
 # define IF_SN_DISALLOWED_AND_NO_SPAN_IN_DB(STATEMENT)									\
-{	/* We've encountered a spanning node dummy value. Check if spanning nodes are disallowed (e.g., GT.CM).		\
+MBSTART {	/* We've encountered a spanning node dummy value. Check if spanning nodes are disallowed (e.g., GT.CM).	\
 	 * If csd->span_node_absent is TRUE we know the value really is $c(0) and we return that. Otherwise,		\
 	 * this is potentially a spanning node. We cannot do an op_tstart to check so we issue an error instead.	\
 	 */														\
@@ -4804,7 +4887,7 @@ typedef struct
 			STATEMENT;											\
 		}													\
 	}														\
-}
+} MBEND
 #else
 # define DEFINE_NSB_CONDITION_HANDLER(gvcst_xxx_ch)
 # define IF_NSB_DUMMY_RETURN
@@ -4818,7 +4901,7 @@ typedef struct
 /* Control node value is 6 bytes, 2 for unsigned short numsubs, 4 for uint4 gblsize. Each is little-endian. */
 #ifdef	BIGENDIAN
 # define PUT_NSBCTRL(BYTES, NUMSUBS, GBLSIZE)					\
-{										\
+MBSTART {									\
 	unsigned short	swap_numsubs;						\
 	uint4		swap_gblsize;						\
 										\
@@ -4826,9 +4909,9 @@ typedef struct
 	swap_gblsize = GTM_BYTESWAP_32(GBLSIZE);				\
 	PUT_USHORT((unsigned char *)BYTES, swap_numsubs);			\
 	PUT_ULONG((unsigned char *)BYTES + 2, swap_gblsize);			\
-}
+} MBEND
 # define GET_NSBCTRL(BYTES, NUMSUBS, GBLSIZE)					\
-{										\
+MBSTART {									\
 	unsigned short	swap_numsubs;						\
 	uint4		swap_gblsize;						\
 										\
@@ -4836,22 +4919,22 @@ typedef struct
 	GET_ULONG(swap_gblsize, (unsigned char *)BYTES + 2);			\
 	NUMSUBS = GTM_BYTESWAP_16(swap_numsubs);				\
 	GBLSIZE = GTM_BYTESWAP_32(swap_gblsize);				\
-}
+} MBEND
 #else
 # define PUT_NSBCTRL(BYTES, NUMSUBS, GBLSIZE)					\
-{										\
+MBSTART {									\
 	PUT_USHORT((unsigned char *)BYTES, NUMSUBS);				\
 	PUT_ULONG((unsigned char *)BYTES + 2, GBLSIZE);				\
-}
+} MBEND
 # define GET_NSBCTRL(BYTES, NUMSUBS, GBLSIZE)					\
-{										\
+MBSTART {									\
 	GET_USHORT(NUMSUBS, (unsigned char *)BYTES);				\
 	GET_ULONG(GBLSIZE, (unsigned char *)BYTES + 2);				\
-}
+} MBEND
 #endif
 
 #define	CHECK_HIDDEN_SUBSCRIPT_AND_RETURN(found, gv_altkey, is_hidden)		\
-{										\
+MBSTART {									\
 	if (found)								\
 	{									\
 		CHECK_HIDDEN_SUBSCRIPT(gv_altkey, is_hidden);			\
@@ -4859,19 +4942,9 @@ typedef struct
 			return found;						\
 	} else									\
 		return found;							\
-}
-#define CHECK_HIDDEN_SUBSCRIPT_AND_BREAK(found, gv_altkey, is_hidden)		\
-{										\
-	if (found)								\
-	{									\
-		CHECK_HIDDEN_SUBSCRIPT(gv_altkey, is_hidden);			\
-		if (!is_hidden)							\
-			break;							\
-	} else									\
-		break;								\
-}
+} MBEND
 #define CHECK_HIDDEN_SUBSCRIPT(KEY, IS_HIDDEN)					\
-{										\
+MBSTART {									\
 	sm_uc_ptr_t	keyloc;							\
 										\
 	keyloc = (KEY)->base + (KEY)->end - 5;					\
@@ -4879,44 +4952,55 @@ typedef struct
 		IS_HIDDEN = TRUE;						\
 	else									\
 		IS_HIDDEN = FALSE;						\
-}
+} MBEND
 #define SAVE_GV_CURRKEY(SAVE_KEY)						\
-{										\
+MBSTART {									\
 	assert(NULL != gv_currkey);						\
 	assert((SIZEOF(gv_key) + gv_currkey->end) <= SIZEOF(SAVE_KEY));		\
 	memcpy(&SAVE_KEY[0], gv_currkey, SIZEOF(gv_key) + gv_currkey->end);	\
-}
+} MBEND
 #define RESTORE_GV_CURRKEY(SAVE_KEY)						\
-{										\
+MBSTART {									\
 	assert(gv_currkey->top == SAVE_KEY[0].top);				\
 	memcpy(gv_currkey, &SAVE_KEY[0], SIZEOF(gv_key) + SAVE_KEY[0].end);	\
-}
+} MBEND
+#define SAVE_GV_ALTKEY(SAVE_KEY)						\
+MBSTART {									\
+	assert(NULL != gv_altkey);						\
+	assert((SIZEOF(gv_key) + gv_altkey->end) <= SIZEOF(SAVE_KEY));		\
+	memcpy(&SAVE_KEY[0], gv_altkey, SIZEOF(gv_key) + gv_altkey->end);	\
+} MBEND
+#define RESTORE_GV_ALTKEY(SAVE_KEY)						\
+MBSTART {									\
+	assert(gv_altkey->top == SAVE_KEY[0].top);				\
+	memcpy(gv_altkey, &SAVE_KEY[0], SIZEOF(gv_key) + SAVE_KEY[0].end);	\
+} MBEND
 #define SAVE_GV_CURRKEY_LAST_SUBSCRIPT(SAVE_KEY, PREV, OLDEND)				\
-{											\
+MBSTART {										\
 	PREV = gv_currkey->prev;							\
 	OLDEND = gv_currkey->end;							\
 	assert('\0' == gv_currkey->base[oldend]);					\
 	if (PREV <= OLDEND)								\
 		memcpy(&SAVE_KEY[0], &gv_currkey->base[PREV], OLDEND - PREV + 1);	\
-}
+} MBEND
 #define RESTORE_GV_CURRKEY_LAST_SUBSCRIPT(SAVE_KEY, PREV, OLDEND)			\
-{											\
+MBSTART {										\
 	gv_currkey->prev = PREV;							\
 	gv_currkey->end = OLDEND;							\
 	if (PREV <= OLDEND)								\
 		memcpy(&gv_currkey->base[PREV], &SAVE_KEY[0], OLDEND - PREV + 1);	\
 	assert('\0' == gv_currkey->base[OLDEND]);					\
-}
+} MBEND
 
 #define CAN_APPEND_HIDDEN_SUBS(KEY)	(((KEY)->end + 5 <= MAX_KEY_SZ) && ((KEY)->end + 5 <= (KEY)->top))
 #define APPEND_HIDDEN_SUB(KEY)			\
-{						\
+MBSTART {					\
 	assert(CAN_APPEND_HIDDEN_SUBS(KEY));	\
 	(KEY)->end += 4;			\
 	REPLACE_HIDDEN_SUB_TO_LOWEST(KEY, KEY);	\
-}
+} MBEND
 #define	REPLACE_HIDDEN_SUB_TO_LOWEST(KEY1, KEY2)	\
-{							\
+MBSTART {						\
 	int	end;					\
 							\
 	end = (KEY1)->end;				\
@@ -4927,9 +5011,9 @@ typedef struct
 	(KEY2)->base[end - 0] = 0;			\
 	assert(end < (KEY2)->top);			\
 	(KEY2)->end = end;				\
-}
+} MBEND
 #define	REPLACE_HIDDEN_SUB_TO_HIGHEST(KEY1, KEY2)	\
-{							\
+MBSTART {						\
 	int	end;					\
 	end = (KEY1)->end;				\
 	(KEY2)->base[end - 4] = 2;			\
@@ -4940,10 +5024,10 @@ typedef struct
 	(KEY2)->base[end + 1] = 0;			\
 	assert((end + 1) < (KEY2)->top);		\
 	(KEY2)->end = end + 1;				\
-}
+} MBEND
 
 #define NEXT_HIDDEN_SUB(KEY, I)				\
-{							\
+MBSTART {						\
 	int	end;					\
 							\
 	end = gv_currkey->end - 4;			\
@@ -4952,25 +5036,118 @@ typedef struct
 	(KEY)->base[end++] = 1 + ((I + 1) % 0xFF);	\
 	(KEY)->base[end++] = 0;				\
 	(KEY)->base[end] = 0;				\
-}
+} MBEND
 #define RESTORE_CURRKEY(KEY, OLDEND)			\
-{							\
+MBSTART {						\
 	(KEY)->end = OLDEND;				\
 	(KEY)->base[OLDEND - 1] = 0; 			\
 	(KEY)->base[OLDEND] = 0;			\
-}
+} MBEND
 #define COMPUTE_CHUNK_SIZE(KEY, BLKSZ, RESERVED)					\
 	(BLKSZ - RESERVED - ((KEY)->end + 1) - SIZEOF(blk_hdr) - SIZEOF(rec_hdr))
 
-/* in MM mode, AIX increases native DB file size to adjust to the next nearest multiple of OS_PAGE_SIZE if the file is mapped
+/* In MM mode, AIX increases native DB file size to adjust to the next nearest multiple of OS_PAGE_SIZE if the file is mapped
  * using shmat() and last portion of the file is accessed. To take into account this adjustment, following macro adjust the
  * value of DB file size determined using block count, constant DB HEADER SIZE and constant MASTER MAP size and EOF block.
- * Since We can change the DB access method using MUPIP SET and we can move the dabtabase from AIX to non-AIX platfrom,
+ * Since we can change the DB access method using MUPIP SET and we can move the database from AIX to non-AIX platfrom,
  * following macro is not just AIX specific.
  */
 #define ALIGN_DBFILE_SIZE_IF_NEEDED(SZ, NATIVE_SZ)						\
 		SZ = (SZ == NATIVE_SZ) ? SZ : ROUND_UP(SZ, (OS_PAGE_SIZE / DISK_BLOCK_SIZE));
 
+#define	SYNCIO_MORPH_SUCCESS	-1	/* a special negative value to indicate an asyncio was morphed into a syncio
+					 * because the asyncio returned EAGAIN inside crit and we wanted to get the io done.
+					 */
+
+#define	ASYNCIO_ON		"ASYNCIO=ON"
+#define	ASYNCIO_OFF		"ASYNCIO=OFF"
+#define	TWINNING_ON(CSD)	(CSD->asyncio)	/* twinning is turned ON only when asyncio is ON */
+
+/* Sets udi->owning_gd to the right value at db open time. */
+#define SYNC_OWNING_GD(reg)									\
+MBSTART {											\
+	/* Either udi->owning_gd was already set to the right value, or it is NULL.		\
+	 * This could be because gvcst_init() was called previously, as in mupip_set()		\
+	 */											\
+	assert((NULL != reg->owning_gd) && (NULL == FILE_INFO(reg)->owning_gd)			\
+			|| (FILE_INFO(reg)->owning_gd == reg->owning_gd)			\
+			|| IS_STATSDB_REG(reg));						\
+	FILE_INFO(reg)->owning_gd = reg->owning_gd;						\
+} MBEND
+
+/* Wait for wip queue to be cleared or a specific CR to become non-dirty. RET is non-zero if "wcs_wtfini"
+ * returns a non-zero value in any iteration. We wait a max of 1 minute if we do not see any progress in
+ * the WIP queue count. If there is evidence of progress, time waited till now does not count towards the 1
+ * minute timeout i.e. the 1 minute wait is started afresh.
+ */
+#define	WAIT_FOR_WIP_QUEUE_TO_CLEAR(CNL, CRWIPQ, CR, REG, RET)						\
+MBSTART {												\
+	unsigned int	lcnt;										\
+	int		active_cnt, wip_cnt;								\
+													\
+	RET = 0; /* initialize RET in case we do not invoke "wcs_wtfini" below */			\
+	DEBUG_ONLY(active_cnt = CNL->wcs_active_lvl;)	/* for debugging purposes */			\
+	wip_cnt = CNL->wcs_wip_lvl;									\
+	for (lcnt = 1; lcnt < (MAX_WIP_QWAIT AIX_ONLY(* 4)); lcnt++)					\
+	{												\
+		if (!CRWIPQ->fl)									\
+			break;										\
+		DEBUG_ONLY(dbg_wtfini_lcnt = lcnt);     /* used by "wcs_wtfini" */			\
+		RET = wcs_wtfini(REG, CHECK_IS_PROC_ALIVE_TRUE_OR_FALSE(lcnt, BUF_OWNER_STUCK), CR);	\
+		if (RET || (CR && (0 == CR->dirty)))							\
+			break;										\
+		wcs_sleep(lcnt);									\
+		if ((wip_cnt != CNL->wcs_wip_lvl) && (NULL == CR)) /* only for non-specific crs */	\
+		{	/* Change in WIP queue size. Restart wait. Note that "CNL->wcs_wip_lvl" could	\
+			 * have even increased since we last noted it in "wip_cnt". This is because	\
+			 * a concurrent process in "wcs_wtstart" could have moved some more records	\
+			 * from the active queue to the wip queue. Restart wait even in that case.	\
+			 */										\
+			lcnt = 1;									\
+			wip_cnt = CNL->wcs_wip_lvl;							\
+		}											\
+	}												\
+} MBEND
+
+#define	IS_AIO_ON(X)			(X->asyncio)
+#define	IS_AIO_ON_SEG(SEG)		IS_AIO_ON(SEG)
+#define	IS_AIO_ON_CSD(CSD)		IS_AIO_ON(CSD)
+#define	IS_AIO_DBGLDMISMATCH(SEG, TSD)	(SEG->asyncio != TSD->asyncio)
+/* This macro is invoked to avoid a DBGLDMISMATCH error. Main purpose is to copy the asyncio setting */
+#define	COPY_AIO_SETTINGS(DST, SRC)	DST->asyncio = SRC->asyncio
+
+/* Wait a max of 1 minute for pending async ios on a FD (e.g. database file) to be cleared.
+ * Set TIMEDOUT variable to TRUE if we timed out. If not (i.e. async io cancellation is success) set it to FALSE.
+ */
+#define	WAIT_FOR_AIO_TO_BE_DONE(FD, TIMEDOUT)								\
+MBSTART {												\
+	unsigned int	lcnt, ret, save_errno;								\
+													\
+	TIMEDOUT = TRUE;										\
+	for (lcnt = 1; lcnt < SLEEP_ONE_MIN; lcnt++)							\
+	{												\
+		ret = aio_cancel(FD, NULL);								\
+		save_errno = errno;									\
+		assertpro(-1 != ret);									\
+		assert((AIO_NOTCANCELED == ret) || (AIO_CANCELED == ret) || (AIO_ALLDONE == ret));	\
+		if (AIO_NOTCANCELED != ret)								\
+		{											\
+			TIMEDOUT = FALSE;								\
+			break;										\
+		}											\
+		wcs_sleep(lcnt);									\
+	}												\
+} MBEND
+
+#define	OK_FOR_WCS_RECOVER_FALSE	FALSE
+#define	OK_FOR_WCS_RECOVER_TRUE		TRUE
+
+#define	LOG_ERROR_FALSE			FALSE
+#define	LOG_ERROR_TRUE			TRUE
+
+#define	SKIP_BASEDB_OPEN_FALSE		FALSE
+#define	SKIP_BASEDB_OPEN_TRUE		TRUE
+
 void		assert_jrec_member_offsets(void);
 bt_rec_ptr_t	bt_put(gd_region *r, int4 block);
 void		bt_que_refresh(gd_region *greg);
@@ -4980,35 +5157,30 @@ void		bt_refresh(sgmnt_addrs *csa, boolean_t init);
 void		db_common_init(gd_region *reg, sgmnt_addrs *csa, sgmnt_data_ptr_t csd);
 void		grab_crit(gd_region *reg);
 boolean_t	grab_crit_encr_cycle_sync(gd_region *reg);
-boolean_t	grab_crit_immediate(gd_region *reg);
+boolean_t	grab_crit_immediate(gd_region *reg, boolean_t ok_for_wcs_recover);
 boolean_t	grab_lock(gd_region *reg, boolean_t is_blocking_wait, uint4 onln_rlbk_action);
 void		gv_init_reg(gd_region *reg);
 void		gvcst_init(gd_region *greg);
 enum cdb_sc	gvincr_compute_post_incr(srch_blk_status *bh);
 enum cdb_sc	gvincr_recompute_upd_array(srch_blk_status *bh, struct cw_set_element_struct *cse, cache_rec_ptr_t cr);
-boolean_t	mupfndfil(gd_region *reg, mstr *mstr_addr);
+boolean_t	mupfndfil(gd_region *reg, mstr *mstr_addr, boolean_t log_error);
 boolean_t	region_init(bool cm_regions);
-freeze_status	region_freeze(gd_region *region, boolean_t freeze, boolean_t override, boolean_t wait_for_kip);
+freeze_status	region_freeze(gd_region *region, boolean_t freeze, boolean_t override, boolean_t wait_for_kip,
+				uint4 online, boolean_t flush_sync);
+freeze_status	region_freeze_main(gd_region *region, boolean_t freeze, boolean_t override, boolean_t wait_for_kip,
+					uint4 online, boolean_t flush_sync);
+freeze_status	region_freeze_post(gd_region *region);
 void		rel_crit(gd_region *reg);
 void		rel_lock(gd_region *reg);
 boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_is_wcs_recover);
-bool		wcs_wtfini(gd_region *reg);
 void		wcs_stale(TID tid, int4 hd_len, gd_region **region);
 
-#ifdef VMS
-int4 wcs_wtstart(gd_region *region);
-#elif defined(UNIX)
-int4 wcs_wtstart(gd_region *region, int4 writes);
-#else
-#error Undefined Platform
-#endif
-
 void bmm_init(void);
 int4 bmm_find_free(uint4 hint, uchar_ptr_t base_addr, uint4 total_bits);
 
 bool reg_cmcheck(gd_region *reg);
 
-gd_binding	*gv_srch_map(gd_addr *addr, char *key, int key_len);
+gd_binding	*gv_srch_map(gd_addr *addr, char *key, int key_len, boolean_t skip_basedb_open);
 gd_binding	*gv_srch_map_linear(gd_binding *start_map, char *key, int key_len);
 gd_binding	*gv_srch_map_linear_backward(gd_binding *start_map, char *key, int key_len);
 gd_gblname	*gv_srch_gblname(gd_addr *addr, char *key, int key_len);
diff --git a/sr_port/gdskill.h b/sr_port/gdskill.h
index cce6536..64af3bc 100755
--- a/sr_port/gdskill.h
+++ b/sr_port/gdskill.h
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2012 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
diff --git a/sr_port/get_fs_block_size.c b/sr_port/get_fs_block_size.c
index f605a0c..8357f16 100644
--- a/sr_port/get_fs_block_size.c
+++ b/sr_port/get_fs_block_size.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2010, 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2010-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -14,33 +15,31 @@
 #include "have_crit.h"
 #include "eintr_wrappers.h"
 #include "get_fs_block_size.h"
-
-#ifndef VMS
 #include "gtm_statvfs.h"
+#ifdef DEBUG
+#include "is_fstype_nfs.h"
 #endif
 
+OS_PAGE_SIZE_DECLARE
+
 uint4	get_fs_block_size(int fd)
 {
-#	ifndef VMS
 	struct statvfs		bufvfs;
 	int			status;
-#	endif
 	uint4			gtm_fs_block_size;
 	unsigned long		sys_fs_block_size;
 
-#	if defined(__vms)
-	sys_fs_block_size = DISK_BLOCK_SIZE;
-#	else
 	FSTATVFS(fd, &bufvfs, status);
 	assert(-1 != status);
 	assert(SIZEOF(sys_fs_block_size) == SIZEOF(bufvfs.f_frsize));
-	/* If fstatvfs call fails, we dont know what the underlying filesystem size is.
+	/* If fstatvfs call fails, we don't know what the underlying filesystem size is.
 	 * We found some NFS implementations return bufvfs.f.frsize values that are inappropriate.
-	 * Instead of erroring out at this point, we assume a safe value (4K) and continue as much as we can.
+	 * Instead of erroring out at this point, we assume a safe value (the OS page size) and continue as much as we can.
 	 */
-	sys_fs_block_size = ((-1 == status) || (MAX_IO_BLOCK_SIZE < bufvfs.f_frsize)
-		|| (DISK_BLOCK_SIZE > bufvfs.f_frsize)) ? 4096 : bufvfs.f_frsize;
-#	endif
+	assert(DISK_BLOCK_SIZE <= bufvfs.f_frsize);
+	assert((OS_PAGE_SIZE >= bufvfs.f_frsize) || is_fstype_nfs(fd));
+	sys_fs_block_size = ((-1 == status) || (OS_PAGE_SIZE < bufvfs.f_frsize)
+			|| (DISK_BLOCK_SIZE > bufvfs.f_frsize)) ? OS_PAGE_SIZE : bufvfs.f_frsize;
 	/* Fit file system block size in a 4-byte unsigned integer as that is the size in jnl_buffer.
 	 * Assert that we never get a block size > what can be held in a 4-byte unsigned integer.
 	 */
diff --git a/sr_port/get_log_name.c b/sr_port/get_log_name.c
index 4952d2e..f9989c1 100755
--- a/sr_port/get_log_name.c
+++ b/sr_port/get_log_name.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2009 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -19,6 +20,8 @@
 
 GBLREF io_log_name *io_root_log_name;
 
+error_def(ERR_INVSTRLEN);
+
 #define LOGNAME_LEN 255
 
 io_log_name *get_log_name(mstr *v, bool insert)
@@ -26,7 +29,6 @@ io_log_name *get_log_name(mstr *v, bool insert)
         io_log_name	*l, *prev, *new;
         int4		index, stat, v_len;
         unsigned char	buf[LOGNAME_LEN];
-        error_def	(ERR_INVSTRLEN);
 
         assert (io_root_log_name != 0);
         assert(io_root_log_name->len == 0);
@@ -34,10 +36,15 @@ io_log_name *get_log_name(mstr *v, bool insert)
         if (v_len == 0)
 	return io_root_log_name;
         if (v_len > LOGNAME_LEN)
-        	rts_error(VARLSTCNT(4) ERR_INVSTRLEN, 2, v_len, LOGNAME_LEN);
+        	rts_error_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_INVSTRLEN, 2, v_len, LOGNAME_LEN);
 	CONVERT_IDENT(buf, v->addr, v_len);
-        for (prev = io_root_log_name, l = prev->next;  l != 0;  prev = l, l = l->next)
+        for (prev = io_root_log_name, l = prev->next;  NULL != l;  prev = l, l = l->next)
         {
+		if ((NULL != l->iod) && (n_io_dev_types == l->iod->type))
+		{
+			assert(FALSE);
+			continue;       /* skip it on pro */
+		}
                	stat = memvcmp(l->dollar_io, l->len, buf, v_len);
         	if (stat == 0)
         		return l;
diff --git a/sr_port/get_symb_line.c b/sr_port/get_symb_line.c
index b7d70de..7a8d028 100644
--- a/sr_port/get_symb_line.c
+++ b/sr_port/get_symb_line.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2010 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -15,11 +16,17 @@
 
 #include <rtnhdr.h>
 #include "stack_frame.h"
-#include "error_trap.h"		/* for error_ret()/error_ret_vms() declaration */
+#include "error_trap.h"		/* for error_ret() declaration */
+#include "gtmimagename.h"
+
+#define PROCESS_EXITING		"-EXITING"
 
 GBLREF stack_frame		*frame_pointer;
 GBLREF stack_frame		*error_frame;
 GBLREF dollar_ecode_type	dollar_ecode;			/* structure containing $ECODE related information */
+GBLREF int			process_exiting;
+
+LITREF gtmImageName		gtmImageNames[];
 
 unsigned char *get_symb_line(unsigned char *out, unsigned char **b_line, unsigned char **ctxt)
 {
@@ -32,29 +39,49 @@ unsigned char *get_symb_line(unsigned char *out, unsigned char **b_line, unsigne
 	for (fp = frame_pointer; fp; fp = fp->old_frame_pointer)
 	{
 #		ifdef GTM_TRIGGER
-		if (NULL == fp->old_frame_pointer && (fp->type & SFT_TRIGR))
+		if ((NULL == fp->old_frame_pointer) && (fp->type & SFT_TRIGR))
 			/* Have a trigger baseframe, pick up stack continuation frame_pointer stored by base_frame() */
-				fp = *(stack_frame **)(fp + 1);
+			fp = *(stack_frame **)(fp + 1);
 #		endif
 		fpmpc = fp->mpc;
 		fpctxt = fp->ctxt;
 		if (ADDR_IN_CODE(fpmpc, fp->rvector))
 		{
-			if (ctxt != 0)
+			if (NULL != ctxt)
 				*ctxt = fpctxt;
 			if (line_reset)
 				addr = fpmpc + 1;
 			else
 				addr = fpmpc;
 			out_addr = symb_line(addr, out, b_line, fp->rvector);
-			assert (out < out_addr);
+			assert(out < out_addr);
 			return out_addr;
 		} else
 		{
-			if (fp->type & SFT_ZTRAP || fp->type & SFT_DEV_ACT)
+			if ((fp->type & SFT_ZTRAP) || (fp->type & SFT_DEV_ACT))
 				line_reset = TRUE;
 		}
 	}
-	GTMASSERT;
-	return NULL;
+	/* At this point, we were unable to discover what was executing from the M stack. It is possible this error
+	 * occurred either while GT.M was shutting down thus the stack could be completely unwound. Or this may not
+	 * even be a mumps process (could be update process driving a trigger). Or this could have nothing to do with
+	 * generated code and could occur in most any of the utility modules - especially replication processes. Do
+	 * what we can to indicate where the problem occurred.
+	 */
+	if (process_exiting || !IS_MCODE_RUNNING)
+	{	/* Show which image is running */
+		memcpy(out, gtmImageNames[image_type].imageName, gtmImageNames[image_type].imageNameLen);
+		out_addr = out + gtmImageNames[image_type].imageNameLen;
+		if (process_exiting)
+		{	/* Add the information that this process was exiting */
+			MEMCPY_LIT(out_addr, PROCESS_EXITING);
+			out_addr += STR_LIT_LEN(PROCESS_EXITING);
+		}
+		return out_addr;
+	}
+	/* At this point we know the process was not exiting, was executing M code, but we *still* couldn't find where
+	 * on the M stack. This is an out of design situation so we cause an assert failure.
+	 */
+	assertpro(fp);
+	return NULL;	/* For the compiler */
 }
diff --git a/sr_port/gi.mpt b/sr_port/gi.mpt
index 83fdfce..393592b 100755
--- a/sr_port/gi.mpt
+++ b/sr_port/gi.mpt
@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;								;
-; Copyright (c) 1991-2015 Fidelity National Information		;
+; Copyright (c) 1991-2016 Fidelity National Information		;
 ; Services, Inc. and/or its subsidiaries. All rights reserved.	;
 ;								;
 ;	This source code contains the intellectual property	;
@@ -105,9 +105,9 @@ read()	; concatenate reads that fill the buffer; also centralize the USE and dos
 	. if $principal=$io read "> ",x(i),!
 	. else  read x(i)
 	. if $zeof,$increment(e) quit
-	. quit:""=x(i)
+	. if ""=x(i),$increment(e) quit
 	. if 0=i#2,$increment(e) set saveread=x(i) quit
 	. set x=x_x(i)
 	. if 2044'=$zlength(x(i)),$increment(e) quit
 	set:dos x=$extract(x,1,$length(x)-1)
-	quit x
\ No newline at end of file
+	quit x
diff --git a/sr_port/gsel.mpt b/sr_port/gsel.mpt
index e058241..402fe5b 100755
--- a/sr_port/gsel.mpt
+++ b/sr_port/gsel.mpt
@@ -1,6 +1,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;								;
-;	Copyright 1987, 2006 Fidelity Information Services, Inc	;
+; Copyright (c) 1987-2017 Fidelity National Information		;
+; Services, Inc. and/or its subsidiaries. All rights reserved.	;
 ;								;
 ;	This source code contains the intellectual property	;
 ;	of its copyright holder(s), and is made available	;
diff --git a/sr_port/gtm_common_defs.h b/sr_port/gtm_common_defs.h
index f80d01d..44371bf 100644
--- a/sr_port/gtm_common_defs.h
+++ b/sr_port/gtm_common_defs.h
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2012, 2014 Fidelity Information Services, Inc	*
+ * Copyright (c) 2012-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -106,10 +107,11 @@
 #define ROUND_UP(VALUE, MODULUS)		(DIVIDE_ROUND_UP(VALUE, MODULUS) * (MODULUS))
 #define ROUND_DOWN(VALUE, MODULUS)		(DIVIDE_ROUND_DOWN(VALUE, MODULUS) * (MODULUS))
 
-/* Macros to enable block macros to be used in any context taking a single statement.
- * See MALLOC_* macros below for examples of use.
- * Note that if the macro block does a break or continue and expects it to transfer control
- * to the calling context, these cannot be used.
+/* Macros to enable block macros to be used in any context taking a single statement. See MALLOC_* macros below for examples of use.
+ * Note that if the macro block does a "break" or "continue" and expects it to transfer control to the calling context
+ * (i.e. OUTSIDE the macro block because a for/while/switch exists outside the macro block), these macros should not be used.
+ * This means that a "break" or "continue" inside a for/while/switch statement in the macro block which transfers control to
+ * within the macro block is not an issue.
  */
 #define MBSTART		do
 #define MBEND		while (FALSE)
@@ -151,4 +153,7 @@ MBSTART {					\
 	DST = lcl_ptr;				\
 } MBEND
 
+/* Shared between GT.M and external plugins */
+#define EXT_NEW 		"_%YGTM"
+
 #endif /* GTM_COMMON_DEFS_H */
diff --git a/sr_port/gtm_fetch.c b/sr_port/gtm_fetch.c
index 703ad34..2a4f069 100644
--- a/sr_port/gtm_fetch.c
+++ b/sr_port/gtm_fetch.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2009-2015 Fidelity National Information 	*
+ * Copyright (c) 2009-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
diff --git a/sr_port/gtm_libaio.h b/sr_port/gtm_libaio.h
new file mode 100644
index 0000000..68c4b17
--- /dev/null
+++ b/sr_port/gtm_libaio.h
@@ -0,0 +1,85 @@
+/****************************************************************
+ *								*
+ * Copyright (c) 2016 Fidelity National Information		*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
+ *								*
+ *	This source code contains the intellectual property	*
+ *	of its copyright holder(s), and is made available	*
+ *	under a license.  If you do not know the terms of	*
+ *	the license, please stop and do not read further.	*
+ *								*
+ ****************************************************************/
+#ifndef GTM_LIBAIO_H_INCLUDED
+#define GTM_LIBAIO_H_INCLUDED
+
+/* Enable LIBAIO only on 64-bit linux. We disable LIBAIO on 32-bit linux
+ * for non-technical reasons.
+ */
+#if defined(__linux__) && defined(__x86_64__)
+#define USE_LIBAIO
+#endif
+
+#ifndef USE_LIBAIO
+#include <aio.h>
+#define IF_LIBAIO(x) /* NONE */
+#define IF_LIBAIO_ELSE(x, y) y
+#else	/* USE_LIBAIO */
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+#include <sys/syscall.h>
+#include <errno.h>
+#include <unistd.h>
+#include <string.h>
+#include <fcntl.h>
+#include <linux/aio_abi.h>
+
+#define	GTM_AIO_NR_EVENTS_DEFAULT 	128	/* Represents the default queue size for in-flight IO's
+						 * used by the kernel.
+						 */
+
+#define IO_SETUP_ERRSTR_ARRAYSIZE (MAX_TRANS_NAME_LEN + 11)
+	/* We add 12 to the MAX_TRANS_NAME_LEN to make space for the
+	 * message, "io_setup(%d)\x00", where "%d" represents a
+	 * number that was parsed by trans_numeric(), hence the
+	 * MAX_TRANS_NAME_LEN usage.
+	 */
+#define IO_SETUP_FMT "io_setup(%d)"
+
+/* This struct mimics the structure of struct iocb, but adds a few fields
+ * to the end for our own use. See <linux/aio_abi.h>::struct iocb.
+ */
+struct aiocb {
+	/* kernel-internel structure, mirrors struct iocb */
+	__u64	aio_data;
+	__u32	PADDED(aio_key, aio_reserved1);
+	__u16	aio_lio_opcode;
+	__s16	aio_reqprio;
+	__u32	aio_fildes;
+	__u64	aio_buf;
+	__u64	aio_nbytes;
+	__s64	aio_offset;
+	__u64	aio_reserved2;
+	__u32	aio_flags;
+	__u32	aio_resfd;
+
+	/* personal implementation-specific definitions */
+	volatile int res;	/* If status is not EINPROGRESS, then denotes the
+				 * return value of the IO that just finished. The
+				 * return value is analagous to that of the return
+				 * value for a synchronous read()/write() syscall.
+				 */
+	volatile int status;	/* status of the IO in flight */
+};
+
+#define IF_LIBAIO(x) x
+#define IF_LIBAIO_ELSE(x,y) x
+
+/* linux/aio_abi.h provides PADDED to define the above struct, but this collides with
+ * our personal #define which means something completely different.
+ */
+#undef PADDED
+#endif	/* USE_LIBAIO */
+
+#endif	/* GTM_LIBAIO_H_INCLUDED  */
diff --git a/sr_port/gtm_memcpy_validate_and_execute.c b/sr_port/gtm_memcpy_validate_and_execute.c
index b1de195..20091d9 100644
--- a/sr_port/gtm_memcpy_validate_and_execute.c
+++ b/sr_port/gtm_memcpy_validate_and_execute.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2012 Fidelity Information Services, Inc	*
+ * Copyright (c) 2012-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -10,12 +11,15 @@
  ****************************************************************/
 
 #include "mdef.h"
+
 #define BYPASS_MEMCPY_OVERRIDE	/* Want to run original system memcpy() here */
 #include "gtm_string.h"
 
+#include "gtmdbglvl.h"
 #include "gtm_memcpy_validate_and_execute.h"
 
 #ifdef DEBUG	/* Is only a debugging routine - nothing to see here for a production build - move along */
+GBLREF uint4	gtmDebugLevel;
 
 /* Identify memcpy() invocations that should be memmove() instead. If this routine assert fails, the arguments
  * overlap so should be converted to memmove(). One exception to that rule which is currently bypassed is when
@@ -25,7 +29,8 @@
  */
 void *gtm_memcpy_validate_and_execute(void *target, const void *src, size_t len)
 {
-	assert((0 <= (signed)len) && (len <= MAXPOSINT4));	/* nothing beyond max positive int4 allowed */
+	/* Unless specifically bypassed, in DEBUG, disallow memcpy() larger than max positive integer (2GB) */
+	assert((GDL_AllowLargeMemcpy & gtmDebugLevel) || ((0 <= (signed)len) && (MAXPOSINT4 >= len)));
 	if (target == src)	/* Allow special case to go through but avoid actual memcpy() call */
 		return target;
 	assert(((char *)(target) > (char *)(src))
diff --git a/sr_port/gtm_rename.h b/sr_port/gtm_rename.h
index f99ce86..04ef296 100755
--- a/sr_port/gtm_rename.h
+++ b/sr_port/gtm_rename.h
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2003, 2014 Fidelity Information Services, Inc	*
+ * Copyright (c) 2003-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -17,16 +18,12 @@
 #define RENAME_NOT_REQD 1
 #define RENAME_FAILED 2
 
-#ifdef UNIX
-# define JNLSWITCH_TM_FMT 	"_%Y%j%H%M%S"   	/* yearjuliandayhoursminutesseconds */
-#else
-# define JNLSWITCH_TM_FMT	"|!Y4|!H04!M0!S0|"	/* 'julian' day is added by append_time_stamp() explicitly */
-#endif
+#define JNLSWITCH_TM_FMT 	"_%Y%j%H%M%S"   /* yearjuliandayhoursminutesseconds */
+#define JNLSWITCH_TM_FMT_LEN 	14   		/* SIZE of string produced by STRFTIME(JNLSWITCH_TM_FNT) */
 
 int 	rename_file_if_exists(char *org_fn, int org_fn_len, char *rename_fn, int *rename_fn_len, uint4 *ustatus);
 uint4 	gtm_rename(char *org_fn, int org_fn_len, char *rename_fn, int rename_len, uint4 *ustatus);
 uint4 	prepare_unique_name(char *org_fn, int org_fn_len, char *prefix, char *suffix, char *rename_fn, int *rename_fn_len,
 				jnl_tm_t now, uint4 *ustatus);
-uint4 	append_time_stamp(char *fn, int *fn_len, jnl_tm_t now);
 
 #endif
diff --git a/sr_port/gtm_repl.h b/sr_port/gtm_repl.h
index 46bdf89..bde2eb4 100644
--- a/sr_port/gtm_repl.h
+++ b/sr_port/gtm_repl.h
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2013-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -52,9 +53,8 @@ error_def(ERR_TLSCLOSE);
 	if (0 < gtmsource_options.renegotiate_interval)										\
 	{															\
 		repl_tls.renegotiate_state = REPLTLS_WAITING_FOR_RENEG_TIMEOUT;							\
-		NEXT_RENEG_HRTBT = heartbeat_counter + gtmsource_options.renegotiate_interval;					\
-		gtmsource_local->next_renegotiate_time = (uint4)time(NULL)							\
-							+ gtmsource_options.renegotiate_interval * HEARTBEAT_INTERVAL_IN_SECS;	\
+		TIMEOUT_DONE_NOCH(NEXT_RENEG_HRTBT);										\
+		TIMEOUT_INIT_NOCH(NEXT_RENEG_HRTBT, gtmsource_options.renegotiate_interval * MILLISECS_IN_SEC);			\
 	}															\
 }
 
diff --git a/sr_port/gtm_reservedDB.h b/sr_port/gtm_reservedDB.h
new file mode 100644
index 0000000..4c4a6e1
--- /dev/null
+++ b/sr_port/gtm_reservedDB.h
@@ -0,0 +1,121 @@
+/****************************************************************
+ *								*
+ * Copyright (c) 2016-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
+ *								*
+ *	This source code contains the intellectual property	*
+ *	of its copyright holder(s), and is made available	*
+ *	under a license.  If you do not know the terms of	*
+ *	the license, please stop and do not read further.	*
+ *								*
+ ****************************************************************/
+
+/* Header file for things relating to reserved databases (e.g. statsDB) that are created when they are opened and
+ * are deleted when the last user closes it.
+ */
+#ifndef GTM_RESERVEDDB_H
+#define GTM_RESERVEDDB_H
+
+/* ReservedDB flags applicable to gd_region->reservedDBFlags */
+enum
+{
+	RDBF_AUTODB  = 0x01,			/* This DB is auto-created */
+	RDBF_NOSTATS = 0x02,			/* This DB does not collect global stats so has no statsDB */
+	RDBF_STATSDB = 0x04			/* This is a statsDB (must have AUTODB and NOSTATS also) */
+};
+#define RDBF_STATSDB_MASK (RDBF_AUTODB | RDBF_NOSTATS | RDBF_STATSDB)	/* This is a statsDB */
+
+/* Possible errors we encounter that prevent us from setting baseDBnl->statsdb_fnname[.len] */
+enum
+{
+	FNERR_NOERR = 0,			/* No error recorded */
+	FNERR_NOSTATS,				/* BaseDB has NOSTATS set - (should never happen) */
+	FNERR_STATSDIR_TRNFAIL,			/* Unable to translate $gtm_statsdir (should never happen) */
+	FNERR_STATSDIR_TRN2LONG,		/* Translation of $gtm_statsdir too long (should never happen) */
+	FNERR_INV_BASEDBFN,			/* BaseDBfn had no '/' making parse fail (should never happen) */
+	FNERR_FTOK_FAIL,			/* The STAT() in gtm_ftok() failed (no rc) (should never hapen) */
+	FNERR_FNAMEBUF_OVERFLOW			/* Not enough space to add the statsdb fname to fname buffer */
+};
+#define FNERR_NOSTATS_TEXT 		"The base database has NOSTATS set - should not be trying to open statistics database"
+#define FNERR_STATSDIR_TRNFAIL_TEXT	"Error attempting to translate $gtm_statsdir"
+#define FNERR_STATSDIR_TRN2LONG_TEXT	"Translation of $gtm_statsdir was too long to fit in buffer"
+#define FNERR_INV_BASEDBFN_TEXT		"Unable to parse the base database filename"
+#define FNERR_FTOK_FAIL_TEXT		"Failure generating FTOK value for $gtm_statsdir"
+#define FNERR_FNAMEBUF_OVERFLOW_TEXT	"Buffer overflow detected adding statistics database filename (hash.<dbname>.gst) to " \
+					"filename buffer"
+
+/* Global name used for shared global stats in statsDB MM database */
+#define STATSDB_GBLNAME		"%YGS"
+#define STATSDB_GBLNAME_LEN	(SIZEOF(STATSDB_GBLNAME) - 1)
+#define	STATSDB_FNAME_SUFFIX	".gst"
+#define RESERVED_NAMESPACE	"%Y"
+#define RESERVED_NAMESPACE_LEN	(SIZEOF(RESERVED_NAMESPACE) - 1)
+
+/* The maximum size of $gtm_statsdir is MAX_FN_LEN minus a minimal statsDB fname */
+#define MAX_STATSDIR_LEN	(MAX_FN_LEN - 8 /* hash */ - STRLEN(".a.dat") - STRLEN(STATSDB_FNAME_SUFFIX))
+
+/* Size of the minimum additional record that can fit in a statsDB block after a record has been added to it. Use this
+ * value to pad the first record in the block to prevent another record from being added. The '3' being added in is for
+ * the single byte difference in the key that must exist plus the two NULL bytes that end the key following it.
+ */
+#define MIN_STATSDB_REC (SIZEOF(rec_hdr) + 3 + SIZEOF(gvstats_rec_t))
+
+/* Macroize statsDB identification so we can change how it is defined in the future */
+#define IS_STATSDB_REG(REG) (RDBF_STATSDB_MASK == (REG)->reservedDBFlags)
+#define IS_STATSDB_CSA(CSA) (RDBF_STATSDB_MASK == (CSA)->reservedDBFlags)
+#define	IS_RDBF_STATSDB(X)  (RDBF_STATSDB & (X)->reservedDBFlags)		/* X can be REG or CSA or CSD */
+/* Macroize autoDB identification */
+#define IS_AUTODB_REG(REG)  (RDBF_AUTODB & (REG)->reservedDBFlags)
+
+/* Identify if a region name is lower-case (and thus for a statsDB) by just checking the first character of the region.
+ * No need to check the entire region name as a region name is always all upper or all lower.
+ */
+#define IS_STATSDB_REGNAME(REGPTR) (ISLOWER_ASCII((REGPTR)->rname[0]))
+#define IS_BASEDB_REGNAME(REGPTR)  (ISUPPER_ASCII((REGPTR)->rname[0]))
+
+/* Macros to "find" the statsDBreg from a baseDBreg or vice versa. We use two different names for the two directions
+ * but they are the same code because of how the indexes are set up. The name difference is just to make clear what
+ * is happening where the macros are being used.
+ */
+#define STATSDBREG_TO_BASEDBREG(STATSDBREG, BASEDBREG)						\
+MBSTART {											\
+	int	dbindx;										\
+	gd_addr	*owningGd;									\
+												\
+	dbindx = (STATSDBREG)->statsDB_reg_index;						\
+	owningGd = (STATSDBREG)->owning_gd;							\
+	assert(NULL != owningGd);								\
+	assert(INVALID_STATSDB_REG_INDEX != dbindx);						\
+	/* If TREF(ok_to_see_statsdb_regs) is FALSE, "gd_load" would have squished "n_regions"	\
+	 * into half of the original (by removing the stats regions) so account for that below.	\
+	 */											\
+	assert(dbindx < (2 * owningGd->n_regions));						\
+	BASEDBREG = &(STATSDBREG)->owning_gd->regions[dbindx];					\
+} MBEND
+#define BASEDBREG_TO_STATSDBREG(BASEDBREG, STATSDBREG) STATSDBREG_TO_BASEDBREG(BASEDBREG, STATSDBREG)
+
+/* If an attempt to initialize a statsDB occurs inside a transaction (dollar_tlevel is non-zero), allocate one of these
+ * blocks and queue it to defer initialization until the transaction (outer-most level) is committed or abandoned.
+ */
+typedef struct statsDB_diqe				/* Deferred init queue element */
+{
+	struct statsDB_diqe	*next;			/* Next of these blocks on queue */
+	struct gd_region_struct	*baseDBreg;		/* base region ptr */
+	struct gd_region_struct	*statsDBreg;		/* statsDB region ptr */
+} statsDB_deferred_init_que_elem;
+
+/* To enable debugging macro (output to console) uncomment the following #define */
+/* #define DEBUG_RESERVEDDB */
+#ifdef DEBUG_RESERVEDDB
+# define DBGRDB(x) DBGFPF(x)
+# define DBGRDB_ONLY(x) x
+#else
+# define DBGRDB(x)
+# define DBGRDB_ONLY(x)
+#endif
+/* Debugging macro that supresses unlink/recreate of statsDB file if fail to create it (orphaned file). To use this,
+ * uncomment define below.
+ */
+/* #define BYPASS_UNLINK_RECREATE_STATSDB */
+
+#endif
diff --git a/sr_port/gtm_threadgbl_defs.h b/sr_port/gtm_threadgbl_defs.h
index 7e0c782..7d6ac0c 100644
--- a/sr_port/gtm_threadgbl_defs.h
+++ b/sr_port/gtm_threadgbl_defs.h
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2010-2016 Fidelity National Information	*
+ * Copyright (c) 2010-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -62,7 +62,6 @@ THREADGBLDEF(last_source_column,		int)				/* parser tracker */
 THREADGBLDEF(lexical_ptr,			char *)				/* parser character position */
 THREADGBLDEF(linkage_first,			struct linkage_entry *)		/* Start of linkage (extern) list this routine */
 THREADGBLDEF(linkage_last,			struct linkage_entry *)		/* Last added entry */
-THREADGBLDEF(max_advancewindow_line,		int4)				/* the maximum source line length */
 #ifdef USHBIN_SUPPORTED
 THREADGBLDEF(objhash_state,			hash128_state_t)		/* Seed value - progressive hash of object file */
 #endif
@@ -76,6 +75,7 @@ THREADGBLDEF(side_effect_base,			boolean_t *)			/* anchor side effect array: bin
 THREADGBLDEF(side_effect_depth,			uint4)				/* current high water of side effect expr array */
 THREADGBLDEF(side_effect_handling,		int)				/* side effect handling in actuallists, function
 										 * args & non-boolean binary operator operands */
+THREADGBLDEF(source_buffer,			mstr)				/* source line buffer control */
 THREADGBLDEF(source_error_found,		int4)				/* flag to partially defer compiler error */
 THREADGBLDEF(temp_subs,				boolean_t)			/* flag temp storing of subscripts to preserve
 										 * current evaluation */
@@ -85,9 +85,8 @@ THREADGBLDEF(window_mval,			mval)				/* current scanner mval from advancewindow
 THREADGBLDEF(window_token,			char)				/* current scanner token from advancewindow */
 
 /* Database */
-THREADGBLDEF(dbinit_max_hrtbt_delta,		uint4)				/* max heartbeats before we bail out in db_init */
+THREADGBLDEF(dbinit_max_delta_secs,		uint4)				/* max time before we bail out in db_init */
 THREADGBLDEF(dollar_zmaxtptime, 		int4)				/* tp timeout in seconds */
-THREADGBLDEF(donot_commit,			boolean_t)			/* debug-only - see gdsfhead.h for purpose */
 THREADGBLDEF(donot_write_inctn_in_wcs_recover,	boolean_t)			/* TRUE if wcs_recover should NOT write INCTN */
 THREADGBLDEF(gbuff_limit,			mval)				/* holds a GTM_POOLLIMIT value for REORG or DBG */
 THREADGBLDEF(gd_targ_tn,			trans_num)			/* number that is incremented for every gvcst_spr*
@@ -102,6 +101,8 @@ THREADGBLDEF(gd_targ_reg_array,			trans_num *)			/* Indicates which regions are
 THREADGBLDEF(gd_targ_reg_array_size,		uint4)				/* Size of current gd_targ_reg_array allocation.
 										 * Non-zero only if at least one spanning global
 										 * has been seen at time of gld open.
+										 * Note: the dimension is the # of regions involved
+										 * and not the # of bytes allocated in the array.
 										 */
 THREADGBLDEF(gd_targ_addr,			gd_addr *)			/* current global directory reference. Needed by
 										 * name level $order or $zprevious to know inside
@@ -241,6 +242,7 @@ THREADGBLDEF(gtmprompt,				mstr)				/* mstr pointing to prombuf containing the G
 										 * prompt */
 THREADGBLDEF(gtmsecshr_comkey,			unsigned int)			/* Hashed version key for gtmsecshr communications
 										 * eliminates cross-version issues */
+THREADGBLDEF(gvcst_statsDB_open_ch_active,	boolean_t)			/* Condition handler is active */
 THREADGBLDEF(in_zwrite,				boolean_t)			/* ZWrite is active */
 THREADGBLDEF(lab_lnr,				lnr_tabent **)			/* Passes address from op_rhd_ext to op_extcall etc.
 										 * Points into either lab_proxy or linkage table
@@ -270,6 +272,7 @@ THREADGBLDEF(mprof_reclaim_cnt,			int)				/* Amount of mem to reclaim after unw_
 THREADGBLDEF(mprof_stack_curr_frame, 		mprof_stack_frame *)		/* Pointer to the last frame on the mprof stack */
 THREADGBLDEF(mprof_stack_next_frame, 		mprof_stack_frame *)		/* Pointer to the next frame to be put on the
 										 * mprof stack */
+THREADGBLDEF(mu_cre_file_openrc,		int)				/* 0 if success otherwise holds errno after open */
 #ifdef AUTORELINK_SUPPORTED
 THREADGBLDEF(open_relinkctl_list,		open_relinkctl_sgm *)		/* Anchor for open relinkctl list; similar to
 										 * open_shlib_root */
@@ -281,6 +284,7 @@ THREADGBLDEF(gtm_autorelink_keeprtn,		boolean_t)			/* do not let go of objects i
 THREADGBLDEF(open_shlib_root,			open_shlib *)			/* Anchor for open shared library list */
 THREADGBLDEF(parm_pool_ptr,			parm_pool *)			/* Pointer to the parameter pool */
 THREADGBLDEF(parms_cnt,                         unsigned int)                   /* Parameters count */
+THREADGBLDEF(statsdb_fnerr_reason,		int)				/* Failure code for "gvcst_set_statsdb_fname" */
 THREADGBLAR1DEF(zpeek_regname,			char,		NAME_ENTRY_SZ)	/* Last $ZPEEK() region specified */
 THREADGBLDEF(zpeek_regname_len,			int)				/* Length of zpeekop_regname */
 THREADGBLDEF(zpeek_reg_ptr,			gd_region *)			/* Resolved pointer for zpeekop_regname */
@@ -295,6 +299,8 @@ THREADGBLDEF(save_zhist,			zro_hist *)			/* Temp storage for zro_hist blk so con
 THREADGBLDEF(set_zroutines_cycle,		uint4)				/* Informs us if we changed $ZROUTINES between
 										 * linking a routine and invoking it
 										 */
+THREADGBLDEF(statsDB_init_defer_anchor,		statsDB_deferred_init_que_elem *) /* Anchor point for deferred init of statsDBs */
+THREADGBLDEF(statshare_opted_in,		boolean_t)			/* Flag when true shared stats collection active */
 THREADGBLDEF(trans_code_pop,			mval *)				/* trans_code holder for $ZTRAP popping */
 THREADGBLDEF(view_ydirt_str,			char *)				/* op_view working storage for ydir* ops */
 THREADGBLDEF(view_ydirt_str_len,		int4)				/* Part of op_view working storage for ydir* ops */
@@ -402,6 +408,16 @@ THREADGBLDEF(expand_prev_key,			boolean_t)	/* Want gvcst_search_blk/gvcst_search
 								 * "gvcst_expand_key" to determine prev_key after the search.
 								 */
 THREADGBLDEF(gtm_autorelink_ctlmax,		uint4)		/* Maximum number of routines allowed for auterelink */
+/* Each process that opens a database file with O_DIRECT (which happens if asyncio=TRUE) needs to do
+ * writes from a buffer that is aligned at the filesystem-blocksize level. We ensure this in database shared
+ * memory global buffers where each buffer is guaranteed aligned at OS_PAGE_SIZE as private memory buffers that are
+ * used (e.g. dbfilop etc.). All the private memory usages will use the global variable "dio_buff.aligned".
+ * It is guaranteed to be OS_PAGE_SIZE aligned. "dio_buff.unaligned_size" holds the size of the allocated buffer
+ * and it has enough space to hold one GDS block (max db blocksize across ALL dbs opened by this process till now)
+ * with OS_PAGE_SIZE padding. "dio_buff.unaligned" points to the beginning of this unaligned buffer and
+ * "dio_buff.aligned" points to an offset within this unaligned buffer that is also OS_PAGE_SIZE aligned.
+ */
+THREADGBLDEF(dio_buff,				dio_buff_t)
 #ifdef GTM_TRIGGER
 THREADGBLDEF(gvt_triggers_read_this_tn,		boolean_t)			/* if non-zero, indicates triggers were read for
 										 * at least one gv_target in this transaction.
@@ -427,8 +443,23 @@ THREADGBLDEF(ztrigbuffLen,			int)				/* Length of used ztrigbuff buffer */
 THREADGBLDEF(ztrig_use_io_curr_device,		boolean_t)	/* Use current IO device instead of stderr/util_out_print */
 #endif
 
+THREADGBLDEF(in_ext_call,			boolean_t)	/* Indicates we are in an external call */
+
+/* linux AIO related data */
+#ifdef 	USE_LIBAIO
+THREADGBLDEF(gtm_aio_nr_events,			uint4)		/* Indicates the value of the nr_events parameter suggested for
+								 * use by io_setup().
+								 */
+#endif
+
+THREADGBLDEF(crit_reg_count,			int4)		/* A count of the number of regions/jnlpools where this process
+								 * has crit
+								 */
+THREADGBLDEF(ok_to_see_statsdb_regs,		boolean_t)	/* FALSE implies statsdb regions are hidden at "gd_load" time */
+THREADGBLDEF(was_open_reg_seen,			boolean_t)	/* TRUE => there is at least one region with reg->was_open = TRUE */
 /* Debug values */
 #ifdef DEBUG
+THREADGBLDEF(donot_commit,			boolean_t)			/* debug-only - see gdsfhead.h for purpose */
 THREADGBLDEF(continue_proc_cnt,			int)				/* Used by whitebox secshr test to count time
 										 * process was continued. */
 THREADGBLDEF(gtm_test_fake_enospc,		boolean_t)			/*  DEBUG-only option to enable/disable anticipatory
@@ -467,3 +498,9 @@ THREADGBLDEF(fork_without_child_wait,		boolean_t)	/*  we did a FORK but did not
 								 *  inherited shm so shm_nattch could be higher than we expect.
 								 */
 #endif	/* #ifdef DEBUG */
+
+/* (DEBUG_ONLY relevant points reproduced from the comment at the top of this file)
+ *   5. It is important for ANY DEBUG_ONLY fields to go at the VERY END. Failure to do this breaks gtmpcat.
+ *   6. If a DEBUG_ONLY array is declared whose dimension is a macro, then it is necessary, for gtmpcat to work,
+ *      that the macro shouldn't be defined as DEBUG_ONLY.
+ */
diff --git a/sr_port/gtm_threadgbl_init.c b/sr_port/gtm_threadgbl_init.c
index 2fc3fa5..97dd1b4 100644
--- a/sr_port/gtm_threadgbl_init.c
+++ b/sr_port/gtm_threadgbl_init.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2010-2016 Fidelity National Information	*
+ * Copyright (c) 2010-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -108,6 +108,7 @@
 #include "parm_pool.h"
 #include "util.h"		/* for util_outbuff manipulations */
 #include "nametabtyp.h"
+#include "gtm_reservedDB.h"
 
 /* FOR REPLICATION RELATED GLOBALS */
 #include "repl_msg.h"
@@ -183,6 +184,7 @@ typedef struct
 
 GBLDEF gtm_threadgbl_true_t	*gtm_threadgbl_true;
 
+GBLREF int4 			*aligned_source_buffer;
 /* This routine allocates the thread global structure and for now, since GTM is not yet threaded,
  * anchors it in a global variable. This still improves access to global variables even in this
  * paradym because the 3 step global dereference only need happen once per module.
@@ -231,5 +233,6 @@ void gtm_threadgbl_init(void)
 	ASSERT_SAFE_TO_UPDATE_THREAD_GBLS;
 	TREF(util_outbuff_ptr) = TADR(util_outbuff);	/* Point util_outbuff_ptr to the beginning of util_outbuff at first. */
 	TREF(util_outptr) = TREF(util_outbuff_ptr);
-	TREF(max_advancewindow_line) = MAX_SRCLINE;
+	(TREF(source_buffer)).addr = (char *)&aligned_source_buffer;
+	(TREF(source_buffer)).len = MAX_SRCLINE;
 }
diff --git a/sr_port/gtmdbglvl.h b/sr_port/gtmdbglvl.h
index 8562e72..a00fb11 100755
--- a/sr_port/gtmdbglvl.h
+++ b/sr_port/gtmdbglvl.h
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information 	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -31,7 +31,7 @@
 #define	GDL_SmStorHog		0x00000200	/* (512) Each piece of storage allocated is allocated in an element twice \
 						   the desired size to provide glorious amounts of backfill for \
 						   overrun checking. */
-#define GDL_DumpOnStackOFlow	0x00000400	/* (1024) When get a stack overflow, generate a core */
+#define GDL_DumpOnStackOFlow	0x00000400	/* (1024) When get a stack overflow or out-of-memory error, generate a core */
 #define GDL_ZSHOWDumpOnSignal	0x00000800	/* (2048) Don't supress GTM_FATAL file creation when get a signal */
 #define GDL_PrintIndCacheStats	0x00001000	/* (4096) Print indirect cacheing stats */
 #define GDL_PrintCacheStats	0x00002000	/* (8192) Print stats on $Piece and UTF8 cacheing (debug only) */
@@ -43,4 +43,5 @@
 #define GDL_PrintPipeIntStats	0x00080000	/* (524288) Print Pipe/Fifo(rm) interrupt stats on exit */
 #define GDL_IgnoreAvailSpace	0x00100000	/* (1048576) Allow gdsfilext/mu_cre_file (UNIX) to ignore available space */
 #define GDL_PrintPMAPStats	0x00200000	/* (2097152) Print process memory map on exit (using pmap or procmap utility) */
+#define GDL_AllowLargeMemcpy	0x00400000	/* (4194304) Bypass the 1GB sanity check in gtm_memcpy_validate_and_execute() */
 #endif
diff --git a/sr_port/gtmrecv_changelog.c b/sr_port/gtmrecv_changelog.c
index 86e36d1..a9ef9a4 100755
--- a/sr_port/gtmrecv_changelog.c
+++ b/sr_port/gtmrecv_changelog.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -42,15 +42,36 @@
 GBLREF	recvpool_addrs		recvpool;
 GBLREF	gtmrecv_options_t	gtmrecv_options;
 error_def(ERR_REPLLOGOPN);
+error_def(ERR_CHANGELOGINTERVAL);
 
 int gtmrecv_changelog(void)
 {
-	uint4	changelog_desired = 0, changelog_accepted = 0;
+	uint4	changelog_accepted = 0;
 	int     log_fd = 0; /*used to indicate whether the new specified log file is writable*/
 	int     close_status = 0; /*used to indicate if log file is successfully closed*/
 	char*   err_code;
-	int     save_errno;
+	int     save_errno = 0;
+	int	retry_count = 5;
 
+	if (0 != recvpool.gtmrecv_local->changelog)
+	{
+		while (0 != retry_count--)
+		{
+			LONG_SLEEP(5);
+			if (!recvpool.gtmrecv_local->changelog)
+				break;
+		}
+	}
+	if (0 != recvpool.upd_proc_local->changelog)
+	{
+		retry_count = 5;
+		while (0 != retry_count--)
+		{
+			LONG_SLEEP(5);
+			if (!recvpool.upd_proc_local->changelog)
+				break;
+		}
+	}
 	/* Grab the recvpool jnlpool option write lock */
 	if (0 > grab_sem(RECV, RECV_SERV_OPTIONS_SEM))
 	{
@@ -65,7 +86,6 @@ int gtmrecv_changelog(void)
 	}
 	if ('\0' != gtmrecv_options.log_file[0]) /* trigger change in log file (for both receiver and update process) */
 	{
-		changelog_desired |= REPLIC_CHANGE_LOGFILE;
 		if (0 != strcmp(recvpool.gtmrecv_local->log_file, gtmrecv_options.log_file))
 		{
 #ifdef UNIX
@@ -76,10 +96,16 @@ int gtmrecv_changelog(void)
 			{
 				save_errno = ERRNO;
 				err_code = STRERROR(save_errno);
-				gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(8) ERR_REPLLOGOPN, 6,
-						   LEN_AND_STR(gtmrecv_options.log_file),
-						   LEN_AND_STR(err_code),
-						   LEN_AND_STR(NULL_DEVICE));
+				if ('\0' != recvpool.gtmrecv_local->log_file[0])
+					gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(8) ERR_REPLLOGOPN, 6,
+						LEN_AND_STR(gtmrecv_options.log_file),
+						LEN_AND_STR(err_code),
+						LEN_AND_STR(recvpool.gtmrecv_local->log_file));
+				else
+					gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(8) ERR_REPLLOGOPN, 6,
+						LEN_AND_STR(gtmrecv_options.log_file),
+						LEN_AND_STR(err_code),
+						LEN_AND_STR(NULL_DEVICE));
 			} else {
 				CLOSEFILE_IF_OPEN(log_fd, close_status);
 				assert(close_status==0);
@@ -98,19 +124,20 @@ int gtmrecv_changelog(void)
 	}
 	if (0 != gtmrecv_options.rcvr_log_interval) /* trigger change in receiver log interval */
 	{
-		changelog_desired |= REPLIC_CHANGE_LOGINTERVAL;
 		if (gtmrecv_options.rcvr_log_interval != recvpool.gtmrecv_local->log_interval)
 		{
 			changelog_accepted |= REPLIC_CHANGE_LOGINTERVAL;
 			recvpool.gtmrecv_local->log_interval = gtmrecv_options.rcvr_log_interval;
-			util_out_print("Change initiated with receiver log interval !UL", TRUE, gtmrecv_options.rcvr_log_interval);
+			gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(7) ERR_CHANGELOGINTERVAL, 5,
+					   LEN_AND_LIT("Receiver"),
+					   LEN_AND_STR(recvpool.gtmrecv_local->log_file),
+					   gtmrecv_options.rcvr_log_interval);
 		} else
 			util_out_print("Receiver log interval is already !UL. Not initiating change in log interval", TRUE,
 					gtmrecv_options.rcvr_log_interval);
 	}
 	if (0 != gtmrecv_options.upd_log_interval) /* trigger change in update process log interval */
 	{
-		changelog_desired |= REPLIC_CHANGE_UPD_LOGINTERVAL;
 		if (gtmrecv_options.upd_log_interval != recvpool.upd_proc_local->log_interval)
 		{
 			changelog_accepted |= REPLIC_CHANGE_UPD_LOGINTERVAL;
@@ -126,5 +153,5 @@ int gtmrecv_changelog(void)
 	else
 		util_out_print("No change to log file or log interval", TRUE);
 	rel_sem(RECV, RECV_SERV_OPTIONS_SEM);
-	return ((0 != changelog_accepted && changelog_accepted == changelog_desired) ? NORMAL_SHUTDOWN : ABNORMAL_SHUTDOWN);
+	return (0 != save_errno) ? ABNORMAL_SHUTDOWN : NORMAL_SHUTDOWN;
 }
diff --git a/sr_port/gtmsource_ctl_init.c b/sr_port/gtmsource_ctl_init.c
index 33602fd..e82e89f 100644
--- a/sr_port/gtmsource_ctl_init.c
+++ b/sr_port/gtmsource_ctl_init.c
@@ -248,7 +248,7 @@ int repl_ctl_create(repl_ctl_element **ctl, gd_region *reg, int jnl_fn_len, char
 			/* replication is allowed and has not gone into the WAS_ON state so journaling is expected to be ON*/
 			assert(JNL_ENABLED(csd));
 			did_jnl_ensure_open = TRUE;
-			jnl_status = jnl_ensure_open();
+			jnl_status = jnl_ensure_open(reg, csa);
 			if (0 != jnl_status)
 			{
 				if (!was_crit)
@@ -342,7 +342,9 @@ int repl_ctl_create(repl_ctl_element **ctl, gd_region *reg, int jnl_fn_len, char
 		F_COPY_GDID(tmp_ctl->repl_buff->fc->id, JNL_GDID_PVT(csa));
 		/* reset jpc->channel (would have been updated by jnl_ensure_open) as that corresponds to an
 		 * actively updated journal file and is only for GT.M and never for source server which only
-		 * READS from journal files. Source server anyways has a copy of the fd in tmp_ctl->repl_buff->fc->fd.
+		 * READS from journal files for the most part (it can do a jnl_flush rarely (in case GT.M failed
+		 * to do one) using GTMSRC_DO_JNL_FLUSH_IF_POSSIBLE macro). Source server anyways has a copy of
+		 * the fd in tmp_ctl->repl_buff->fc->fd.
 		 */
 		jpc->channel = NOJNL;
 	} else
@@ -497,16 +499,15 @@ int gtmsource_ctl_close(void)
 
 int gtmsource_set_lookback(void)
 {
-	/* Scan all the region ctl's and set lookback to TRUE if ctl has to be
-	 * repositioned for a transaction read from the past */
-
+	/* Scan all the region ctl's and set lookback to TRUE if ctl has to be repositioned for a transaction read from the past.
+	 * In all other cases, reset it to FALSE.
+	 */
 	repl_ctl_element	*ctl;
 
 	for (ctl = repl_ctl_list->next; NULL != ctl; ctl = ctl->next)
 	{
-		if ((JNL_FILE_OPEN == ctl->file_state ||
-		     JNL_FILE_CLOSED == ctl->file_state) &&
-		    QWLE(jnlpool.gtmsource_local->read_jnl_seqno, ctl->seqno))
+		if (((JNL_FILE_OPEN == ctl->file_state) || (JNL_FILE_CLOSED == ctl->file_state))
+				&& QWLE(jnlpool.gtmsource_local->read_jnl_seqno, ctl->seqno))
 			ctl->lookback = TRUE;
 		else
 			ctl->lookback = FALSE;
diff --git a/sr_port/gtmsource_poll_actions.c b/sr_port/gtmsource_poll_actions.c
index 72f12a0..955f008 100755
--- a/sr_port/gtmsource_poll_actions.c
+++ b/sr_port/gtmsource_poll_actions.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information 	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
diff --git a/sr_port/gv_bind_name.c b/sr_port/gv_bind_name.c
index 1d78ee5..59a3c86 100755
--- a/sr_port/gv_bind_name.c
+++ b/sr_port/gv_bind_name.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -12,7 +13,10 @@
 #include "mdef.h"
 
 #include <errno.h>
+#include "gtm_stdio.h"
 #include "gtm_string.h"
+
+#include "gtmio.h"
 #include "gdsroot.h"
 #include "gdskill.h"
 #include "gtm_facility.h"
@@ -35,6 +39,7 @@
 #include "gtmimagename.h"
 #include "gvnh_spanreg.h"
 #include "gv_trigger_common.h"	/* for *HASHT* macros used inside GVNH_REG_INIT macro */
+#include "io.h"
 
 GBLREF gv_namehead	*gv_target;
 GBLREF gv_key		*gv_currkey;
@@ -47,16 +52,55 @@ error_def(ERR_GVIS);
 gvnh_reg_t *gv_bind_name(gd_addr *addr, mname_entry *gvname)
 {
 	gd_binding		*map;
-	ht_ent_mname		*tabent;
+	ht_ent_mname		*tabent, *tabent1;
 	gd_region		*reg;
 	gvnh_reg_t		*gvnh_reg;
-	int			keylen;
+	int			keylen, count;
 	char			format_key[MAX_MIDENT_LEN + 1];	/* max key length + 1 byte for '^' */
 	gv_namehead		*tmp_gvt;
 	sgmnt_addrs		*csa;
+	hash_table_mname	*tab_ptr;
 
 	assert(MAX_MIDENT_LEN >= gvname->var_name.len);
-	if (NULL != (tabent = lookup_hashtab_mname((hash_table_mname *)addr->tab_ptr, gvname)))
+	tab_ptr = addr->tab_ptr;
+	if (NULL == (tabent = lookup_hashtab_mname((hash_table_mname *)tab_ptr, gvname)))
+	{
+		count = tab_ptr->count;	/* Note down current # of valid entries in hash table */
+		map = gv_srch_map(addr, gvname->var_name.addr, gvname->var_name.len, SKIP_BASEDB_OPEN_FALSE);
+		reg = map->reg.addr;
+		if (!reg->open)
+			gv_init_reg(reg);
+		if (IS_STATSDB_REG(reg))
+		{	/* In case of a statsDB, it is possible that "gv_srch_map" or "gv_init_reg" calls above end up doing
+			 * a "op_gvname/gv_bind_name" if they in turn invoke "gvcst_init_statsDB". In that case, the hash table
+			 * could have been updated since we did the "lookup_hashtab_mname" call above. So redo the lookup.
+			 */
+			tabent = lookup_hashtab_mname((hash_table_mname *)tab_ptr, gvname);
+		} else
+		{	/* If not a statsDB, then the above calls to "gv_srch_map" or "gv_init_reg" should not have changed
+			 * the hashtable status of "gvname". There is an exception in that if gvname is "%YGS" (STATSDB_GBLNAME),
+			 * then it is possible that the open of the statsDB failed (e.g. gtm_statsdir env var too long etc.) in
+			 * which case the gvname would have been dynamically remapped to the baseDB. Assert that.
+			 * Since we want to avoid a memcmp against STATSDB_GBLNAME, we check if the hashtable count has changed
+			 * since we noted it down at function entry and if so redo the lookup hashtab in pro. Since only additions
+			 * happen in this particular hashtable, it is enough to check for "count < tab_ptr->count".
+			 */
+#			ifdef DEBUG
+			tabent1 = lookup_hashtab_mname((hash_table_mname *)tab_ptr, gvname);
+			assert((tabent1 == tabent)
+				|| ((gvname->var_name.len == STATSDB_GBLNAME_LEN)
+					&& (0 == memcmp(gvname->var_name.addr, STATSDB_GBLNAME, STATSDB_GBLNAME_LEN))
+					&& (count < tab_ptr->count)));
+#			endif
+			if (count < tab_ptr->count)
+				tabent = lookup_hashtab_mname((hash_table_mname *)tab_ptr, gvname);
+		}
+	}
+	if (NULL == tabent)
+	{
+		tmp_gvt = targ_alloc(reg->max_key_size, gvname, reg);
+		GVNH_REG_INIT(addr, tab_ptr, map, tmp_gvt, reg, gvnh_reg, tabent);
+	} else
 	{
 		gvnh_reg = (gvnh_reg_t *)tabent->value;
 		assert(NULL != gvnh_reg);
@@ -64,17 +108,9 @@ gvnh_reg_t *gv_bind_name(gd_addr *addr, mname_entry *gvname)
 		if (!reg->open)
 		{
 			gv_init_reg(reg);	/* could modify gvnh_reg->gvt if multiple regions map to same db file */
-			assert(0 == gvnh_reg->gvt->clue.end);
+			assert((0 == gvnh_reg->gvt->clue.end) || IS_STATSDB_REG(reg)); /* A statsDB open writes to itself */
 		}
 		tmp_gvt = gvnh_reg->gvt;
-	} else
-	{
-		map = gv_srch_map(addr, gvname->var_name.addr, gvname->var_name.len);
-		reg = map->reg.addr;
-		if (!reg->open)
-			gv_init_reg(reg);
-		tmp_gvt = targ_alloc(reg->max_key_size, gvname, reg);
-		GVNH_REG_INIT(addr, addr->tab_ptr, map, tmp_gvt, reg, gvnh_reg, tabent);
 	}
 	if (((keylen = gvname->var_name.len) + 2) > reg->max_key_size)	/* caution: embedded assignment of "keylen" */
 	{
@@ -82,6 +118,7 @@ gvnh_reg_t *gv_bind_name(gd_addr *addr, mname_entry *gvname)
 		format_key[0] = '^';
 		memcpy(&format_key[1], gvname->var_name.addr, gvname->var_name.len);
 		csa = &FILE_INFO(reg)->s_addrs;
+		gv_currkey->end = 0;
 		rts_error_csa(CSA_ARG(csa) VARLSTCNT(10) ERR_KEY2BIG, 4, keylen + 2, (int4)reg->max_key_size,
 			REG_LEN_STR(reg), ERR_GVIS, 2, 1 + gvname->var_name.len, format_key);
 	}
diff --git a/sr_port/gv_bind_subsname.c b/sr_port/gv_bind_subsname.c
index d80c357..eacb169 100644
--- a/sr_port/gv_bind_subsname.c
+++ b/sr_port/gv_bind_subsname.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2013-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -11,6 +12,9 @@
 
 #include "mdef.h"
 
+#include "gtm_stdio.h"
+
+#include "gtmio.h"
 #include "gdsroot.h"
 #include "gtm_facility.h"
 #include "fileinfo.h"
@@ -21,6 +25,7 @@
 #include "change_reg.h"
 #include "gvcst_protos.h"	/* for gvcst_root_search prototype used in GV_BIND_SUBSREG macro */
 #include "gtmimagename.h"
+#include "io.h"
 
 GBLREF gd_region	*gv_cur_region;
 GBLREF gv_key		*gv_currkey;
@@ -33,7 +38,7 @@ void gv_bind_subsname(gd_addr *addr, gv_key *key, gvnh_reg_t *gvnh_reg)
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
-	map = gv_srch_map(addr, (char *)&key->base[0], key->end - 1);
+	map = gv_srch_map(addr, (char *)&key->base[0], key->end - 1, SKIP_BASEDB_OPEN_FALSE);
 	TREF(gd_targ_map) = map;
 	reg = map->reg.addr;
 	GV_BIND_SUBSREG(addr, reg, gvnh_reg);	/* sets gv_target/gv_cur_region/cs_addrs */
diff --git a/sr_port/gv_rundown.c b/sr_port/gv_rundown.c
index d02e2a1..e0b69c7 100755
--- a/sr_port/gv_rundown.c
+++ b/sr_port/gv_rundown.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -13,10 +13,6 @@
 #include "mdef.h"
 
 #include <errno.h>
-#ifdef VMS
-#include <descrip.h>	/* Required for gtmsource.h */
-#include <nam.h>	/* Required for the nam$l_esa members */
-#endif
 
 #include "gtm_inet.h"	/* Required for gtmsource.h */
 #include "gdsroot.h"
@@ -39,13 +35,10 @@
 #include "gtmsource.h"
 #include "gtmrecv.h"
 #include "error.h"
-#ifdef UNIX
 #include "io.h"
 #include "gtmsecshr.h"
 #include "mutex.h"
 #include "ftok_sems.h"
-#endif
-
 #include "tp_change_reg.h"
 #include "gds_rundown.h"
 #include "dpgbldir.h"
@@ -53,9 +46,10 @@
 #include "rc_cpt_ops.h"
 #include "gv_rundown.h"
 #include "targ_alloc.h"
-#if defined(DEBUG) && defined(UNIX)
+#ifdef DEBUG
 #include "anticipatory_freeze.h"
 #endif
+#include "aio_shim.h"
 
 GBLREF	gd_region		*gv_cur_region;
 GBLREF	sgmnt_addrs		*cs_addrs;
@@ -64,8 +58,7 @@ GBLREF	jnlpool_addrs		jnlpool;
 GBLREF	recvpool_addrs		recvpool;
 GBLREF	jnlpool_ctl_ptr_t      	jnlpool_ctl;
 GBLREF	gd_region		*ftok_sem_reg;
-
-#if defined(DEBUG) && defined(UNIX)
+#ifdef DEBUG
 GBLREF	boolean_t		is_jnlpool_creator;
 error_def(ERR_TEXT);
 #endif
@@ -77,34 +70,29 @@ void gv_rundown(void)
 	gd_addr		*addr_ptr;
 	sgm_info	*si;
 	int4		rundown_status = EXIT_NRM;			/* if gds_rundown went smoothly */
-#	ifdef VMS
-	vms_gds_info	*gds_info;
-#	elif UNIX
 	unix_db_info	*udi;
-#	endif
-#if defined(DEBUG) && defined(UNIX)
-	sgmnt_addrs		*csa;
+#	ifdef DEBUG
+	sgmnt_addrs	*csa;
 #	endif
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
-
 	r_save = gv_cur_region;		/* Save for possible core dump */
 	gvcmy_rundown();
 	ENABLE_AST
-
 	if (pool_init)
 		rel_lock(jnlpool.jnlpool_dummy_reg);
 	for (addr_ptr = get_next_gdr(NULL); addr_ptr; addr_ptr = get_next_gdr(addr_ptr))
 	{
 		for (r_local = addr_ptr->regions, r_top = r_local + addr_ptr->n_regions; r_local < r_top; r_local++)
 		{
-			if (r_local->open && !r_local->was_open && dba_cm != r_local->dyn.addr->acc_meth)
-			{	/* Rundown has already occurred for GT.CM client regions through gvcmy_rundown() above.
+			if (r_local->open && (dba_cm != r_local->dyn.addr->acc_meth))
+			{
+				/* Rundown has already occurred for GT.CM client regions through gvcmy_rundown() above.
 			 	 * Hence the (dba_cm != ...) check in the if above. Note that for GT.CM client regions,
 				 * region->open is TRUE although cs_addrs is NULL.
 			 	 */
-#				if defined(DEBUG) && defined(UNIX)
+#				ifdef DEBUG
 				if (is_jnlpool_creator
 					&& INST_FREEZE_ON_NOSPC_ENABLED(REG2CSA(r_local)) && TREF(gtm_test_fake_enospc))
 				{	/* Clear ENOSPC faking now that we are running down */
@@ -120,77 +108,7 @@ void gv_rundown(void)
 #				endif
 				gv_cur_region = r_local;
 			        tp_change_reg();
-				UNIX_ONLY(rundown_status |=) gds_rundown();
-
-				/* Now that gds_rundown is done, free up the memory associated with the region.
-				 * Ideally the following memory freeing code should go to gds_rundown, but
-				 * GT.CM calls gds_rundown() and we want to reuse memory for GT.CM.
-				 */
-				if (NULL != cs_addrs)
-				{
-					if (NULL != cs_addrs->dir_tree)
-						FREE_CSA_DIR_TREE(cs_addrs);
-					if (cs_addrs->sgm_info_ptr)
-					{
-						si = cs_addrs->sgm_info_ptr;
-						/* It is possible we got interrupted before initializing all fields of "si"
-						 * completely so account for NULL values while freeing/releasing those fields.
-						 */
-						assert((si->tp_csa == cs_addrs) || (NULL == si->tp_csa));
-						if (si->jnl_tail)
-						{
-							PROBE_FREEUP_BUDDY_LIST(si->format_buff_list);
-							PROBE_FREEUP_BUDDY_LIST(si->jnl_list);
-						}
-						PROBE_FREEUP_BUDDY_LIST(si->recompute_list);
-						PROBE_FREEUP_BUDDY_LIST(si->new_buff_list);
-						PROBE_FREEUP_BUDDY_LIST(si->tlvl_info_list);
-						PROBE_FREEUP_BUDDY_LIST(si->tlvl_cw_set_list);
-						PROBE_FREEUP_BUDDY_LIST(si->cw_set_list);
-						if (NULL != si->blks_in_use)
-						{
-							free_hashtab_int4(si->blks_in_use);
-							free(si->blks_in_use);
-							si->blks_in_use = NULL;
-						}
-						if (si->cr_array_size)
-						{
-							assert(NULL != si->cr_array);
-							if (NULL != si->cr_array)
-								free(si->cr_array);
-						}
-						if (NULL != si->first_tp_hist)
-							free(si->first_tp_hist);
-						free(si);
-					}
-					if (cs_addrs->jnl)
-					{
-						assert(&FILE_INFO(cs_addrs->jnl->region)->s_addrs == cs_addrs);
-						if (cs_addrs->jnl->jnllsb)
-						{
-							UNIX_ONLY(assert(FALSE));
-							free(cs_addrs->jnl->jnllsb);
-						}
-						free(cs_addrs->jnl);
-					}
-				}
-				assert(gv_cur_region->dyn.addr->file_cntl->file_info);
-#				ifdef VMS
-				gds_info = (vms_gds_info *)gv_cur_region->dyn.addr->file_cntl->file_info;
-				if (gds_info->xabpro)
-					free(gds_info->xabpro);
-				if (gds_info->xabfhc)
-					free(gds_info->xabfhc);
-				if (gds_info->nam)
-				{
-					free(gds_info->nam->nam$l_esa);
-					free(gds_info->nam);
-				}
-				if (gds_info->fab)
-					free(gds_info->fab);
-#				endif
-				free(gv_cur_region->dyn.addr->file_cntl->file_info);
-				free(gv_cur_region->dyn.addr->file_cntl);
+				rundown_status |= gds_rundown(CLEANUP_UDI_TRUE);
 			}
 			r_local->open = r_local->was_open = FALSE;
 		}
@@ -198,14 +116,11 @@ void gv_rundown(void)
 	rc_close_section();
 	gv_cur_region = r_save;		/* Restore value for dumps but this region is now closed and is otherwise defunct */
 	cs_addrs = NULL;
-#ifdef UNIX
 	gtmsecshr_sock_cleanup(CLIENT);
-#ifndef MUTEX_MSEM_WAKE
+#	ifndef MUTEX_MSEM_WAKE
 	mutex_sock_cleanup();
-#endif
-#endif
+#	endif
 	jnlpool_detach();
-#	ifdef UNIX
 	/* Clean up any left-over ftok semaphores. This part of the code can be reached by almost all of the exit handling routines.
 	 * If the ftok semaphore is grabbed, but not released, ftok_sem_reg will have a non-null value and grabbed_ftok_sem will be
 	 * TRUE. We cannot rely on gv_cur_region always as it is used in so many places in so many ways.
@@ -241,8 +156,6 @@ void gv_rundown(void)
 		if (udi->grabbed_ftok_sem)
 			ftok_sem_release(recvpool.recvpool_dummy_reg, FALSE, TRUE);
 	}
-#	endif
-
 	if (EXIT_NRM != rundown_status)
 		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(1) ERR_NOTALLDBRNDWN);
 }
diff --git a/sr_port/gv_select.c b/sr_port/gv_select.c
index 829600a..f091e6b 100755
--- a/sr_port/gv_select.c
+++ b/sr_port/gv_select.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information 	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -12,6 +12,8 @@
 
 #include "mdef.h"
 
+#include "gtm_stdio.h"
+
 #include "gtm_string.h"
 #include "gdsroot.h"
 #include "gdsblk.h"
@@ -46,6 +48,8 @@
 #include "hashtab_mname.h"
 #include "gvnh_spanreg.h"
 #include "change_reg.h"
+#include "io.h"
+#include "gtmio.h"
 
 #ifdef EXTRACT_HASHT_GLOBAL
 # include "gv_trigger_common.h"	/* for IS_GVKEY_HASHT_GBLNAME and HASHT_GBL_CHAR1 macros */
@@ -269,6 +273,8 @@ void gv_select(char *cli_buff, int n_len, boolean_t freeze, char opname[], glist
 					gvinit();
 				for (reg = gd_header->regions, r_top = reg + gd_header->n_regions; reg < r_top; reg++)
 				{
+					if (IS_STATSDB_REGNAME(reg))
+						continue;
 					GVTR_SWITCH_REG_AND_HASHT_BIND_NAME(reg);
 					csa = cs_addrs;
 					if (NULL == csa)	/* not BG or MM access method */
@@ -281,7 +287,7 @@ void gv_select(char *cli_buff, int n_len, boolean_t freeze, char opname[], glist
 #			endif
 			COMPUTE_HASH_MSTR(curr_gbl_name.str, hash_code);
 			op_gvname_fast(VARLSTCNT(2) hash_code, &curr_gbl_name);
-			assert((dba_bg == REG_ACC_METH(gv_cur_region)) || (dba_mm == REG_ACC_METH(gv_cur_region)));
+			assert(IS_REG_BG_OR_MM(gv_cur_region));
 				/* for dba_cm or dba_usr, op_gvname_fast/gv_bind_name/gv_init_reg would have errored out */
 			gvname.hash_code = hash_code;
 			gvname.var_name = curr_gbl_name.str;
@@ -375,7 +381,7 @@ STATICFNDEF void gv_select_reg(void *ext_hash, boolean_t freeze, int *reg_max_re
 	        NON_GTM64_ONLY(if (add_hashtab_int4((hash_table_int4 *)ext_hash, (uint4 *)&gv_cur_region,
 											HT_VALUE_DUMMY, &tabent)))
                 {
-                        if (cs_addrs->hdr->freeze)
+                        if (FROZEN(cs_addrs->hdr))
                         {
                                 gtm_putmsg_csa(CSA_ARG(cs_addrs) VARLSTCNT(4) ERR_FREEZE, 2, REG_LEN_STR(gv_cur_region));
                                 mupip_exit(ERR_MUNOFINISH);
@@ -388,7 +394,7 @@ STATICFNDEF void gv_select_reg(void *ext_hash, boolean_t freeze, int *reg_max_re
 					DB_LEN_STR(gv_cur_region));
 				mupip_exit(ERR_MUNOFINISH);
 			}
-			while (REG_ALREADY_FROZEN == region_freeze(gv_cur_region, TRUE, FALSE, FALSE))
+			while (REG_ALREADY_FROZEN == region_freeze(gv_cur_region, TRUE, FALSE, FALSE, FALSE, TRUE))
 			{
 				hiber_start(1000);
 				if (mu_ctrly_occurred || mu_ctrlc_occurred)
@@ -397,7 +403,6 @@ STATICFNDEF void gv_select_reg(void *ext_hash, boolean_t freeze, int *reg_max_re
                                 	mupip_exit(ERR_MUNOFINISH);
 				}
 			}
-			wcs_flu(WCSFLU_FLUSH_HDR | WCSFLU_WRITE_EPOCH | WCSFLU_SYNC_EPOCH);
                 }
         }
 	if (*reg_max_rec < cs_data->max_rec_size)
diff --git a/sr_port/gv_srch_map.c b/sr_port/gv_srch_map.c
index aa65778..a88124d 100644
--- a/sr_port/gv_srch_map.c
+++ b/sr_port/gv_srch_map.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2013-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -14,18 +15,23 @@
 #include "gdsroot.h"
 #include "gdsbt.h"
 #include "gdsfhead.h"
+#include "gvcst_protos.h"	/* needed by OPEN_BASEREG_IF_STATSREG */
 
 /* Searches a global directory map array for which map entry an input "key" falls in.
  * "key" could be an unsubscripted or subscripted global reference.
+ * "skip_basedb_open" is set to TRUE in a special case from a call in "gvcst_init_statsDB" and is FALSE otherwise.
+ *	In that special case, the caller knows to set the ^%YGS map entry to point to the appropriate statsdb region
+ *	so we do not need to do unnecessary opens of other basedb regions. But otherwise this function ensures that
+ *	if ever a map entry is returned that points to a statsdb region, the corresponding basedb region has been opened.
  */
-gd_binding *gv_srch_map(gd_addr *addr, char *key, int key_len)
+gd_binding *gv_srch_map(gd_addr *addr, char *key, int key_len, boolean_t skip_basedb_open)
 {
 	int		res;
 	int		low, high, mid;
 	gd_binding	*map_start, *map;
-	DEBUG_ONLY(
-		int	dbg_match;
-	)
+#	ifdef DEBUG
+	int		dbg_match;
+#	endif
 
 	map_start = addr->maps;
 	assert(('%' == map_start[1].gvkey.addr[0]) && (1 == map_start[1].gvname_len));
@@ -42,7 +48,10 @@ gd_binding *gv_srch_map(gd_addr *addr, char *key, int key_len)
 		if (low == high)
 		{
 			assert((-1 == dbg_match) || (low == dbg_match));
-			return &map_start[low];
+			map = &map_start[low];
+			if (!skip_basedb_open)
+				OPEN_BASEREG_IF_STATSREG(map);	/* can modify map->reg.addr if statsDBReg */
+			return map;
 		}
 		assert(low < high);
 		mid = (low + high) / 2;
@@ -60,8 +69,14 @@ gd_binding *gv_srch_map(gd_addr *addr, char *key, int key_len)
 		{
 			assert(key_len == (map->gvkey_len - 1));
 			low = mid + 1;
-			DEBUG_ONLY(dbg_match = low;)
-			PRO_ONLY(return &map_start[low];)
+#			ifdef DEBUG
+			dbg_match = low;
+#			else
+			map = &map_start[low];
+			if (!skip_basedb_open)
+				OPEN_BASEREG_IF_STATSREG(map);	/* can modify map->reg.addr if statsDBReg */
+			return map;
+#			endif
 		}
 	} while (TRUE);
 }
@@ -87,6 +102,14 @@ gd_binding *gv_srch_map_linear(gd_binding *start_map, char *key, int key_len)
 	)
 	for ( ; ; map++)
 	{
+		/* Currently, the only callers of this function are gvcst_spr_* functions (e.g. "gvcst_spr_data" etc.).
+		 * And most of them (except gvcst_spr_query/gvcst_start_queryget) start an implicit TP transaction right
+		 * after this call. And since statsDB init is deferred once in TP, it is preferable to do the init before
+		 * the TP begins. So we include the OPEN_BASEREG_IF_STATSREG macro call here instead of in each of the
+		 * caller. This can be moved back to the individual callers if new callers of this function happen which
+		 * don't need this macro.
+		 */
+		OPEN_BASEREG_IF_STATSREG(map);	/* can modify map->reg.addr if statsDBReg */
 		assert(map < &addr->maps[addr->n_maps]);
 		res = memcmp(key, &map->gvkey.addr[0], key_len);
 		if (0 < res)
@@ -100,6 +123,7 @@ gd_binding *gv_srch_map_linear(gd_binding *start_map, char *key, int key_len)
 		map++;
 		break;
 	}
+	OPEN_BASEREG_IF_STATSREG(map);	/* can modify map->reg.addr if statsDBReg */
 	return map;
 }
 
@@ -121,6 +145,13 @@ gd_binding *gv_srch_map_linear_backward(gd_binding *start_map, char *key, int ke
 	)
 	for ( ; ; map--)
 	{
+		/* Currently, the only caller of this function is "gvcst_spr_zprevious". And it starts an implicit TP transaction
+		 * right after this call. And since statsDB init is deferred once in TP, it is preferable to do the init before
+		 * the TP begins. So we include the OPEN_BASEREG_IF_STATSREG macro call here instead of in each of the
+		 * caller. This can be moved back to the individual callers if new callers of this function happen which
+		 * don't need this macro.
+		 */
+		OPEN_BASEREG_IF_STATSREG(map);	/* can modify map->reg.addr if statsDBReg */
 		assert(map >= addr->maps);
 		res = memcmp(key, &map->gvkey.addr[0], key_len);
 		if (0 < res)
@@ -135,5 +166,6 @@ gd_binding *gv_srch_map_linear_backward(gd_binding *start_map, char *key, int ke
 	}
 	map++;
 	assert(map > addr->maps);
+	OPEN_BASEREG_IF_STATSREG(map);	/* can modify map->reg.addr if statsDBReg */
 	return map;
 }
diff --git a/sr_port/gvcst_blk_build.c b/sr_port/gvcst_blk_build.c
index 1a0371c..30aa122 100755
--- a/sr_port/gvcst_blk_build.c
+++ b/sr_port/gvcst_blk_build.c
@@ -124,13 +124,13 @@ void gvcst_blk_build(cw_set_element *cse, sm_uc_ptr_t base_addr, trans_num ctn)
 	 *	d) For acquired blocks, it is possible that some process had read in the uninitialized block from disk
 	 *		outside of crit (due to concurrency issues). Therefore the buffer could contain garbage. So we cannot
 	 *		rely on the buffer contents to determine the block's transaction number.
-	 *	e) For VMS, if a twin is created, we explicitly set its buffer tn to be equal to ctn in phase1.
+	 *	e) If a twin is created, we explicitly set its buffer tn to be equal to ctn in phase1.
 	 *		But since we are not passed the "cr" in this routine, it is not easily possible to check that.
-	 *		Hence in case of VMS, we relax the check so buffertn == ctn is allowed.
+	 *		Hence in case of twinning, we relax the check so buffertn == ctn is allowed.
 	 */
 	DEBUG_ONLY(blktn = ((blk_hdr_ptr_t)base_addr)->tn);
 	assert(!IS_MCODE_RUNNING || !cs_addrs->t_commit_crit || (dba_bg != cs_data->acc_meth) || (n_gds_t_op < cse->mode)
-	       || (cse->mode == gds_t_acquired) || (blktn UNIX_ONLY(<) VMS_ONLY(<=) ctn));
+	       || (cse->mode == gds_t_acquired) || ((!cs_data->asyncio && (blktn < ctn)) || (cs_data->asyncio && (blktn <= ctn))));
 	/* With memory instruction reordering (currently possible only on AIX with the POWER architecture) it is possible
 	 * the early_tn we read in the assert below gets executed BEFORE the curr_tn read that happens a few lines above.
 	 * That could then fail this assert (GTM-8523). Account for that with the AIX_ONLY condition below.
diff --git a/sr_port/gvcst_bmp_mark_free.c b/sr_port/gvcst_bmp_mark_free.c
index f90bd20..85e5f10 100755
--- a/sr_port/gvcst_bmp_mark_free.c
+++ b/sr_port/gvcst_bmp_mark_free.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -164,7 +165,6 @@ trans_num gvcst_bmp_mark_free(kill_set *ks)
 					ret_tn = 0;
 					break;
 				}
-#				ifdef GTM_SNAPSHOT
 				/* if this is freeing a level-0 directory tree block, we need to transition the block to free
 				 * right away and write its before-image thereby enabling fast integ to avoid writing level-0
 				 * block before-images altogether. It is possible the fast integ hasn't started at this stage,
@@ -195,7 +195,6 @@ trans_num gvcst_bmp_mark_free(kill_set *ks)
 					mark_level_as_special = TRUE;
 				} else
 					mark_level_as_special = FALSE;
-#				endif
 				bmphist.blk_num = bit_map;
 				if (NULL == (bmphist.buffaddr = t_qread(bmphist.blk_num, (sm_int_ptr_t)&bmphist.cycle,
 									&bmphist.cr)))
@@ -204,7 +203,6 @@ trans_num gvcst_bmp_mark_free(kill_set *ks)
 					continue;
 				}
 				t_write_map(&bmphist, (uchar_ptr_t)update_array, ctn, -(int4)(nextblk - blk));
-#				ifdef GTM_SNAPSHOT
 				if (mark_level_as_special)
 				{
 					/* The special level value will be used later in gvcst_map_build to set the block to be
@@ -212,11 +210,9 @@ trans_num gvcst_bmp_mark_free(kill_set *ks)
 					 */
 					cw_set[cw_set_depth-1].level = CSE_LEVEL_DRT_LVL0_FREE;
 				}
-#				endif
-				UNIX_ONLY(DEBUG_ONLY(lcl_t_tries = t_tries));
+				DEBUG_ONLY(lcl_t_tries = t_tries);
 				if ((trans_num)0 == (ret_tn = t_end(&alt_hist, NULL, TN_NOT_SPECIFIED)))
 				{
-#					ifdef UNIX
 					assert((CDB_STAGNATE == t_tries) || (lcl_t_tries == t_tries - 1));
 					status = LAST_RESTART_CODE;
 					if ((cdb_sc_onln_rlbk1 == status) || (cdb_sc_onln_rlbk2 == status)
@@ -230,7 +226,6 @@ trans_num gvcst_bmp_mark_free(kill_set *ks)
 						t_abort(gv_cur_region, cs_addrs);
 						return ret_tn; /* actually 0 */
 					}
-#					endif
 					continue;
 				}
 				break;
@@ -328,7 +323,6 @@ trans_num gvcst_bmp_mark_free(kill_set *ks)
 				continue;
 			}
 			t_write_map(&bmphist, (uchar_ptr_t)update_array, ctn, -1);
-#			ifdef GTM_SNAPSHOT
 			if ((MUSWP_FREE_BLK == TREF(in_mu_swap_root_state)) && blk->level)
 			{
 				assert(1 == ks->used);
@@ -338,11 +332,9 @@ trans_num gvcst_bmp_mark_free(kill_set *ks)
 				 * snapshot file without checking whether it belongs to DIR or GV tree
 				 */
 			}
-#			endif
 			UNIX_ONLY(DEBUG_ONLY(lcl_t_tries = t_tries));
 			if ((trans_num)0 == (ret_tn = t_end(&alt_hist, NULL, TN_NOT_SPECIFIED)))
 			{
-#				ifdef UNIX
 				assert((CDB_STAGNATE == t_tries) || (lcl_t_tries == t_tries - 1));
 				assert(0 < t_tries);
 				DEBUG_ONLY(status = LAST_RESTART_CODE); /* get the recent restart code */
@@ -350,7 +342,6 @@ trans_num gvcst_bmp_mark_free(kill_set *ks)
 				 * upgraded. This means, online rollback cannot even start (it issues ORLBKNOV4BLK). Assert that.
 				 */
 				assert((cdb_sc_onln_rlbk1 != status) && (cdb_sc_onln_rlbk2 != status));
-#				endif
 				continue;
 			}
 			break;
diff --git a/sr_port/gvcst_dataget.c b/sr_port/gvcst_dataget.c
index b38f582..b05a81b 100644
--- a/sr_port/gvcst_dataget.c
+++ b/sr_port/gvcst_dataget.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2010, 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2010-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -223,7 +224,7 @@ enum cdb_sc gvcst_dataget2(mint *dollar_data, mval *val, unsigned char *sn_ptr)
 		if ((0 > data_len) || ((sm_uc_ptr_t)rp + rsiz > b_top))
 		{
 			assert(CDB_STAGNATE > t_tries);
-			status = cdb_sc_rmisalign1;
+			status = cdb_sc_rmisalign;
 			return status;
 		} else if (DG_DATAONLY != dg2_info)
 		{
diff --git a/sr_port/gvcst_expand_free_subtree.c b/sr_port/gvcst_expand_free_subtree.c
index 3a144b4..9747519 100755
--- a/sr_port/gvcst_expand_free_subtree.c
+++ b/sr_port/gvcst_expand_free_subtree.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -36,6 +36,7 @@
 #include "gvcst_expand_free_subtree.h"
 #include "rc_cpt_ops.h"
 #include "wcs_phase2_commit_wait.h"
+#include "min_max.h"
 
 GBLREF	gd_region		*gv_cur_region;
 GBLREF	sgmnt_addrs		*cs_addrs;
@@ -63,20 +64,23 @@ void	gvcst_expand_free_subtree(kill_set *ks_head)
     	off_chain		chain;
 	rec_hdr_ptr_t		rp, rp1, rtop;
 	uint4			save_update_trans;
-	sm_uc_ptr_t		temp_buff;
+	unsigned char		temp_buff[MAX_DB_BLK_SIZE];
 	sgmnt_addrs		*csa;
 	sgmnt_data_ptr_t	csd;
 	unsigned short		temp_ushort;
 	trans_num		ret_tn;
 	inctn_opcode_t		save_inctn_opcode;
 	bt_rec_ptr_t		bt;
-	unsigned int		level;
+	unsigned int		bsiz, level;
+#	ifdef DEBUG
+	uint4			save_dollar_tlevel;
+#	endif
 
 	csa = cs_addrs;
 	csd = cs_data;
 	/* If ever the following assert is removed, "flush_cache" shouldn't be set to FALSE unconditionally as it is now */
 	assert(!csd->dsid);	/* see related comment in gvcst_kill before the call to this routine */
-	temp_buff = (unsigned char *)malloc(cs_data->blk_size);
+	assert(MAX_DB_BLK_SIZE >= cs_data->blk_size);
 	for (ks = ks_head; NULL != ks; ks = ks->next_kill_set)
 	{
 		for (cnt = 0; cnt < ks->used; ++cnt)
@@ -93,7 +97,6 @@ void	gvcst_expand_free_subtree(kill_set *ks_head)
 					 * haven't sync'ed the cycles, the next tranasction commit will detect the online rollback
 					 * and the restart logic will handle it appropriately.
 					 */
-					free(temp_buff);
 					rel_crit(gv_cur_region);
 					send_msg_csa(CSA_ARG(csa) VARLSTCNT(6) ERR_IGNBMPMRKFREE, 4, REG_LEN_STR(gv_cur_region),
 							DB_LEN_STR(gv_cur_region));
@@ -111,7 +114,6 @@ void	gvcst_expand_free_subtree(kill_set *ks_head)
 					blk = ksb->block;
 				if (!(bp = (blk_hdr_ptr_t)t_qread(blk, (sm_int_ptr_t)&cycle, &cr)))
 				{	/* This should have worked because t_qread was done in crit */
-					free(temp_buff);
 					rts_error_csa(CSA_ARG(csa) VARLSTCNT(4) ERR_GVKILLFAIL, 2, 1, &rdfail_detail);
 				}
 				if (NULL != cr)
@@ -131,13 +133,13 @@ void	gvcst_expand_free_subtree(kill_set *ks_head)
 						|| (CR_NOTVALID == bt->cache_index)
 						|| (cr == (cache_rec_ptr_t)GDS_REL2ABS(bt->cache_index)) && (0 == cr->in_tend));
 				}
-				memcpy(temp_buff, bp, bp->bsiz);
+				assert(MAX_DB_BLK_SIZE >= bp->bsiz);
+				bsiz = MIN(bp->bsiz, MAX_DB_BLK_SIZE);	/* avoid buffer overflows */
+				memcpy(temp_buff, bp, bsiz);
 				if (!was_crit)
 					rel_crit(gv_cur_region);
-				for (rp = (rec_hdr_ptr_t)(temp_buff + SIZEOF(blk_hdr)),
-					rtop = (rec_hdr_ptr_t)(temp_buff + ((blk_hdr_ptr_t)temp_buff)->bsiz);
-				     rp < rtop;
-				     rp = rp1)
+				for (rp = (rec_hdr_ptr_t)(temp_buff + SIZEOF(blk_hdr)), rtop = (rec_hdr_ptr_t)(temp_buff + bsiz);
+					rp < rtop; rp = rp1)
 				{
 					GET_USHORT(temp_ushort, &rp->rsiz);
 					rp1 = (rec_hdr_ptr_t)((sm_uc_ptr_t)rp + temp_ushort);
@@ -145,7 +147,6 @@ void	gvcst_expand_free_subtree(kill_set *ks_head)
 					{	/* This should have worked because a local copy was made while crit */
 						assert(FALSE);
 						kill_error = cdb_sc_rmisalign;
-						free(temp_buff);
 						rts_error_csa(CSA_ARG(csa) VARLSTCNT(4) ERR_GVKILLFAIL, 2, 1, &kill_error);
 					}
 					GET_LONG(temp_long, (block_id_ptr_t)((sm_uc_ptr_t)rp1 - SIZEOF(block_id)));
@@ -171,6 +172,7 @@ void	gvcst_expand_free_subtree(kill_set *ks_head)
 		}
 		gvcst_kill_sort(ks);
 		assert(!bml_save_dollar_tlevel);
+		DEBUG_ONLY(save_dollar_tlevel = dollar_tlevel);
 		bml_save_dollar_tlevel = dollar_tlevel;
 		/* Resetting and restoring of update_trans is necessary to avoid blowing an assert in t_begin that it is 0. */
 		save_update_trans = update_trans;
@@ -180,7 +182,7 @@ void	gvcst_expand_free_subtree(kill_set *ks_head)
 		GVCST_BMP_MARK_FREE(ks, ret_tn, inctn_invalid_op, inctn_bmp_mark_free_gtm, inctn_opcode, csa)
 		update_trans = save_update_trans;
 		dollar_tlevel = bml_save_dollar_tlevel;
+		assert(dollar_tlevel == save_dollar_tlevel);
 		bml_save_dollar_tlevel = 0;
 	}
-	free(temp_buff);
 }
diff --git a/sr_port/gvcst_expand_key.h b/sr_port/gvcst_expand_key.h
index e7f0f45..6ad2632 100755
--- a/sr_port/gvcst_expand_key.h
+++ b/sr_port/gvcst_expand_key.h
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information 	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -130,7 +130,6 @@ GBLREF	sgmnt_data_ptr_t	cs_data;
 #	endif
 		src = ((sm_uc_ptr_t)(rp + 1)) + (match - tmpCmpc);
 		dstTop--;	/* to check for double KEY_DELIMITER byte sequence without exceeding buffer allocation bounds */
-		assert((dstEnd == dstBase) || (KEY_DELIMITER != *(dstEnd - 1)) || ((match == tmpCmpc) && !match_adjusted));
 		for ( ; ; )
 		{
 			if (dstEnd >= dstTop)
diff --git a/sr_port/gvcst_gblmod.c b/sr_port/gvcst_gblmod.c
index 72d4122..9f34696 100755
--- a/sr_port/gvcst_gblmod.c
+++ b/sr_port/gvcst_gblmod.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -83,7 +84,7 @@ boolean_t	gvcst_gblmod(mval *v)
 				{
 					if ((0 > data_len) || ((sm_uc_ptr_t)rp + rsiz > b_top))
 					{
-						status = cdb_sc_rmisalign1;
+						status = cdb_sc_rmisalign;
 						t_retry(status);
 						continue;
 					}
diff --git a/sr_port/gvcst_get.c b/sr_port/gvcst_get.c
old mode 100755
new mode 100644
index 903f322..4603739
--- a/sr_port/gvcst_get.c
+++ b/sr_port/gvcst_get.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -29,13 +30,11 @@
 #include "buddy_list.h"		/* needed for tp.h */
 #include "hashtab_int4.h"	/* needed for tp.h */
 #include "tp.h"			/* needed for T_BEGIN_READ_NONTP_OR_TP macro */
-#ifdef UNIX			/* needed for frame_pointer in GVCST_ROOT_SEARCH_AND_PREP macro */
-# include "repl_msg.h"
-# include "gtmsource.h"
-# include "rtnhdr.h"
-# include "stack_frame.h"
-# include "wbox_test_init.h"
-#endif
+#include "repl_msg.h"
+#include "gtmsource.h"
+#include <rtnhdr.h>
+#include "stack_frame.h"
+#include "wbox_test_init.h"
 
 #include "t_end.h"		/* prototypes */
 #include "t_retry.h"
@@ -78,7 +77,6 @@ boolean_t gvcst_get(mval *v)
 
 	DEBUG_ONLY(save_dollar_tlevel = dollar_tlevel);
 	gotit = gvcst_get2(v, NULL);
-#	ifdef UNIX
 	DEBUG_ONLY(debug_len = (int)v->str.len); /* Ensure v isn't garbage pointer by actually accessing it */
 	if (gotit && IS_SN_DUMMY(v->str.len, v->str.addr))
 	{	/* Start TP transaction to piece together value */
@@ -151,7 +149,6 @@ boolean_t gvcst_get(mval *v)
 		gotit = gotspan || gotdummy;
 	}
 	assert(save_dollar_tlevel == dollar_tlevel);
-#	endif
 	return gotit;
 }
 
@@ -182,8 +179,9 @@ boolean_t gvcst_get2(mval *v, unsigned char *sn_ptr)
 	assert(t_tries < CDB_STAGNATE || cs_addrs->now_crit);	/* we better hold crit in the final retry (TP & non-TP) */
 	for (;;)
 	{
-#		if defined(DEBUG) && defined(UNIX)
-		if (gtm_white_box_test_case_enabled && (WBTEST_ANTIFREEZE_GVGETFAIL == gtm_white_box_test_case_number))
+#		if defined(DEBUG)
+		if (gtm_white_box_test_case_enabled && (WBTEST_ANTIFREEZE_GVGETFAIL == gtm_white_box_test_case_number)
+			&& !IS_STATSDB_REG(gv_cur_region))
 		{
 			status = cdb_sc_blknumerr;
 			t_retry(status);
@@ -206,7 +204,7 @@ boolean_t gvcst_get2(mval *v, unsigned char *sn_ptr)
 				if ((0 > data_len) || ((sm_uc_ptr_t)rp + rsiz > b_top))
 				{
 					assert(CDB_STAGNATE > t_tries);
-					status = cdb_sc_rmisalign1;
+					status = cdb_sc_rmisalign;
 				} else
 				{
 					if (!sn_ptr)
diff --git a/sr_port/gvcst_init.c b/sr_port/gvcst_init.c
index b0396b8..9caca60 100755
--- a/sr_port/gvcst_init.c
+++ b/sr_port/gvcst_init.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -13,9 +13,10 @@
 #include "mdef.h"
 
 #include <stddef.h>		/* for offsetof macro */
-
 #include "gtm_string.h"
 #include "gtm_time.h"
+#include "gtm_fcntl.h"
+#include "gtm_stdio.h"
 
 #include "cdb_sc.h"
 #include "gdsroot.h"
@@ -58,21 +59,25 @@
 #include "gvt_hashtab.h"
 #include "gtmmsg.h"
 #include "op.h"
-#include "set_gbuff_limit.h"	/* Needed for set_gbuff_limit() */
-#ifdef UNIX
-#include "heartbeat_timer.h"
+#include "set_gbuff_limit.h"
+#include "gtm_reservedDB.h"
 #include "anticipatory_freeze.h"
 #include "wbox_test_init.h"
-
-#define MAX_DBINIT_RETRY	4
-#endif
+#include "ftok_sems.h"
+#include "util.h"
+#include "getzposition.h"
+#include "gtmio.h"
+#include "io.h"
 
 #ifdef	GTM_FD_TRACE
 #include "gtm_dbjnl_dupfd_check.h"
 #endif
 
 GBLREF	boolean_t		mu_reorg_process;
-GBLREF	gd_region		*gv_cur_region, *db_init_region;
+GBLREF	boolean_t		created_core, dont_want_core;
+GBLREF  gd_region               *gv_cur_region;
+GBLREF	gv_key			*gv_currkey;
+GBLREF	gv_namehead		*gv_target;
 GBLREF	sgmnt_addrs		*cs_addrs_list;
 GBLREF	boolean_t		gtcm_connection;
 GBLREF	bool			licensed;
@@ -82,6 +87,7 @@ GBLREF	uint4			update_array_size, cumul_update_array_size;
 GBLREF	ua_list			*first_ua, *curr_ua;
 GBLREF	short			crash_count;
 GBLREF	uint4			dollar_tlevel;
+GBLREF	uint4			dollar_trestart;
 GBLREF	jnl_format_buffer	*non_tp_jfb_ptr;
 GBLREF	boolean_t		mupip_jnl_recover;
 GBLREF	buddy_list		*global_tlvl_info_list;
@@ -97,25 +103,49 @@ GBLREF	volatile int		reformat_buffer_in_use;	/* used only in DEBUG mode */
 GBLREF	volatile int4		fast_lock_count;
 GBLREF	boolean_t		dse_running;
 GBLREF	jnl_gbls_t		jgbl;
-#ifdef UNIX
 GBLREF	boolean_t		pool_init;
 GBLREF	boolean_t		jnlpool_init_needed;
 GBLREF	jnlpool_addrs		jnlpool;
-#endif
-#ifdef DEBUG
 GBLREF	uint4			process_id;
-#endif
 LITREF char			gtm_release_name[];
 LITREF int4			gtm_release_name_len;
+LITREF mval			literal_statsDB_gblname;
+
+#define MAX_DBINIT_RETRY	3
+#define MAX_DBFILOPN_RETRY_CNT	4
+
+/* In code below to (re)create a statsDB file, we are doing a number of operations under lock. Rather than deal with
+ * getting out of the lock before the error, handle the possible errors after we are out from under the lock. These
+ * values are the possible errors we need may need to raise.
+ */
+typedef enum {
+	STATSDB_NOERR = 0,
+	STATSDB_NOTEEXIST,
+	STATSDB_OPNERR,
+	STATSDB_READERR,
+	STATSDB_NOTSTATSDB,
+	STATSDB_NOTOURS,
+	STATSDB_UNLINKERR,
+	STATSDB_RECREATEERR,
+	STATSDB_CLOSEERR
+} statsdb_recreate_errors;
 
 error_def(ERR_BADDBVER);
 error_def(ERR_DBCREINCOMP);
 error_def(ERR_DBFLCORRP);
+error_def(ERR_DBGLDMISMATCH);
 error_def(ERR_DBNOTGDS);
+error_def(ERR_DBOPNERR);
+error_def(ERR_DBROLLEDBACK);
 error_def(ERR_DBVERPERFWARN1);
 error_def(ERR_DBVERPERFWARN2);
+error_def(ERR_DRVLONGJMP);	/* Generic internal only error used to drive longjump() in a queued condition handler */
+error_def(ERR_INVSTATSDB);
 error_def(ERR_MMNODYNUPGRD);
 error_def(ERR_REGOPENFAIL);
+error_def(ERR_STATSDBERR);
+error_def(ERR_STATSDBFNERR);
+error_def(ERR_STATSDBINUSE);
 
 static readonly mval literal_poollimit =
 	DEFINE_MVAL_LITERAL(MV_STR | MV_NUM_APPROX, 0, 0, (SIZEOF("POOLLIMIT") - 1), "POOLLIMIT", 0, 0);
@@ -126,16 +156,15 @@ void	assert_jrec_member_offsets(void)
 	assert(JNL_HDR_LEN % DISK_BLOCK_SIZE == 0);
 	/* We currently assume that the journal file header size is aligned relative to the filesystem block size.
 	 * which is currently assumed to be a 2-power (e.g. 512 bytes, 1K, 2K, 4K etc.) but never more than 64K
-	 * (MAX_IO_BLOCK_SIZE). Given this, we keep the journal file header size at 64K for Unix and 512-byte aligned
-	 * for VMS. This way any process updating the file header will hold crit and do aligned writes. Any process
+	 * (MAX_IO_BLOCK_SIZE). Given this, we keep the journal file header size at 64K for Unix.
+	 * This way any process updating the file header will hold crit and do aligned writes. Any process
 	 * writing the journal file data (journal records) on disk will hold the qio lock and can safely do so without
 	 * ever touching the journal file header area. If ever MAX_IO_BLOCK_SIZE changes (say because some filesystem
 	 * block size changes to 128K) such that JNL_HDR_LEN is no longer aligned to that, we want to know hence this assert.
 	 */
 	assert(JNL_HDR_LEN % MAX_IO_BLOCK_SIZE == 0);
 	assert(REAL_JNL_HDR_LEN == SIZEOF(jnl_file_header));
-	UNIX_ONLY(assert(REAL_JNL_HDR_LEN <= JNL_HDR_LEN);)
-	VMS_ONLY(assert(REAL_JNL_HDR_LEN == JNL_HDR_LEN);)
+	assert(REAL_JNL_HDR_LEN <= JNL_HDR_LEN);
 	assert(JNL_HDR_LEN == JNL_FILE_FIRST_RECORD);
 	assert(DISK_BLOCK_SIZE >= PINI_RECLEN + EPOCH_RECLEN + PFIN_RECLEN + EOF_RECLEN);
 	assert((JNL_ALLOC_MIN * DISK_BLOCK_SIZE) > JNL_HDR_LEN);
@@ -204,153 +233,398 @@ void	assert_jrec_member_offsets(void)
 	assert(SIZEOF(token_split_t) == SIZEOF(token_build));   /* Required for TOKEN_SET macro */
 }
 
-void gvcst_init(gd_region *greg)
+void gvcst_init(gd_region *reg)
 {
-	sgmnt_addrs		*csa, *prevcsa, *regcsa;
+	gd_segment		*seg;
+	sgmnt_addrs		*baseDBcsa, *csa, *prevcsa, *regcsa;
 	sgmnt_data_ptr_t	csd;
-#	ifdef VMS
-	char			cs_data_buff[ROUND_UP(SGMNT_HDR_LEN, DISK_BLOCK_SIZE)];
-	sgmnt_data_ptr_t	temp_cs_data;
-#	endif
+	sgmnt_data		statsDBcsd;
 	uint4			segment_update_array_size;
-	int4			bsize;
-	boolean_t		realloc_alt_buff;
+	int4			bsize, padsize;
+	boolean_t		is_statsDB, realloc_alt_buff, retry_dbinit;
 	file_control		*fc;
-	gd_region		*prev_reg, *reg_top;
+	gd_region		*prev_reg, *reg_top, *baseDBreg, *statsDBreg;
 #	ifdef DEBUG
 	cache_rec_ptr_t		cr;
 	bt_rec_ptr_t		bt;
 	blk_ident		tmp_blk;
 #	endif
-	int			max_fid_index;
+	int			db_init_ret, loopcnt, max_fid_index, fd, rc, save_errno, errrsn_text_len;
 	mstr			log_nam, trans_log_nam;
-	mval			reg_nam_mval = DEFINE_MVAL_STRING(MV_STR, 0 , 0 , SIZEOF(MAX_RN_LEN), 0, 0, 0);
-	char			trans_buff[MAX_FN_LEN + 1];
-	unique_file_id		*greg_fid, *reg_fid;
+	char			trans_buff[MAX_FN_LEN + 1], statsdb_path[MAX_FN_LEN + 1], *errrsn_text;
+	unique_file_id		*reg_fid, *tmp_reg_fid;
 	tp_region		*tr;
 	ua_list			*tmp_ua;
 	time_t			curr_time;
 	uint4			curr_time_uint4, next_warn_uint4;
 	unsigned int            minus1 = (unsigned)-1;
-	enum db_acc_method	greg_acc_meth;
+	enum db_acc_method	reg_acc_meth;
 	boolean_t		onln_rlbk_cycle_mismatch = FALSE;
 	intrpt_state_t		save_intrpt_ok_state;
 	replpool_identifier	replpool_id;
 	unsigned int		full_len;
 	int4			db_init_retry;
 	intrpt_state_t		prev_intrpt_state;
+	srch_blk_status		*bh;
+	mstr			*gld_str;
+	node_local_ptr_t	baseDBnl;
+	unsigned char		cstatus;
+	statsdb_recreate_errors	statsdb_rcerr;
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
 	UNSUPPORTED_PLATFORM_CHECK;
+	/* If this is a statsDB, then open its baseDB first (if not already open). Most of the times the baseDB would be open.
+	 * In rare cases like direct use of ^%YGS global, it is possible baseDB is not open.
+	 */
+	assert(!reg->open);
+	is_statsDB = IS_STATSDB_REG(reg);
+	if (is_statsDB)
+	{
+		STATSDBREG_TO_BASEDBREG(reg, baseDBreg);
+		if (!baseDBreg->open)
+		{
+			DBGRDB((stderr, "gvcst_init: !baseDBreg->open (NOT open)\n"));
+			gvcst_init(baseDBreg);
+			assert(baseDBreg->open);
+			if (reg->open)	/* statsDB was opened as part of opening baseDB. No need to do anything more here */
+			{
+				DBGRDB((stderr, "gvcst_init: reg->open return\n"));
+				return;
+			}
+			/* At this point, the baseDB is open but the statsDB is not automatically opened. This is possible if
+			 *	a) TREF(statshare_opted_in) is FALSE. In that case, this call to "gvcst_init" is coming through
+			 *		a direct reference to the statsDB (e.g. ZWR ^%YGS). OR
+			 *	b) baseDBreg->was_open is TRUE. In that case, the statsDB open would have been short-circuited
+			 *		in "gvcst_init".
+			 *	c) Neither (a) nor (b). This means an open of the statsDB was attempted as part of the baseDB
+			 *		"gvcst_init" done above. Since it did not, that means some sort of error occurred that
+			 *		has sent messages to the user console or syslog so return right away to the caller which
+			 *		would silently adjust gld map entries so they do not point to this statsDB anymore
+			 *		(NOSTATS should already be set in the baseDB in this case, assert that).
+			 */
+			if (TREF(statshare_opted_in) && !baseDBreg->was_open)
+			{
+				assert(RDBF_NOSTATS & baseDBreg->reservedDBFlags);
+				return;
+			}
+		} else if (RDBF_NOSTATS & baseDBreg->reservedDBFlags)
+		{	/* The baseDB was already open and the statsDB was NOT open. This could be because of either the baseDB
+			 * has NOSTATS set in it or it could be that NOSTATS was set when we attempted before to open the statsDB
+			 * but failed for whatever reason (privs, noexistant directory, space, etc). In either case, return
+			 * right away (for same reason as described before the "if" block above).
+			 */
+			return;
+		}
+		baseDBcsa = &FILE_INFO(baseDBreg)->s_addrs;
+		baseDBnl = baseDBcsa->nl;
+		if (0 == baseDBnl->statsdb_fname_len)
+		{	/* This can only be true if it was set that way in gvcst_set_statsdb_fname(). Each error case sets a
+			 * reason value in TREF(statsdb_fnerr_reason) so use that to give a useful error message.
+			 */
+			switch(TREF(statsdb_fnerr_reason))
+			{
+				case FNERR_NOSTATS:
+					errrsn_text = FNERR_NOSTATS_TEXT;
+					errrsn_text_len = SIZEOF(FNERR_NOSTATS_TEXT) - 1;
+					break;
+				case FNERR_STATSDIR_TRNFAIL:
+					errrsn_text = FNERR_STATSDIR_TRNFAIL_TEXT;
+					errrsn_text_len = SIZEOF(FNERR_STATSDIR_TRNFAIL_TEXT) - 1;
+					break;
+				case FNERR_STATSDIR_TRN2LONG:
+					errrsn_text = FNERR_STATSDIR_TRN2LONG_TEXT;
+					errrsn_text_len = SIZEOF(FNERR_STATSDIR_TRN2LONG_TEXT) - 1;
+					break;
+				case FNERR_INV_BASEDBFN:
+					errrsn_text = FNERR_INV_BASEDBFN_TEXT;
+					errrsn_text_len = SIZEOF(FNERR_INV_BASEDBFN_TEXT) - 1;
+					break;
+				case FNERR_FTOK_FAIL:
+					errrsn_text = FNERR_FTOK_FAIL_TEXT;
+					errrsn_text_len = SIZEOF(FNERR_FTOK_FAIL_TEXT) - 1;
+					break;
+				case FNERR_FNAMEBUF_OVERFLOW:
+					errrsn_text = FNERR_FNAMEBUF_OVERFLOW_TEXT;
+					errrsn_text_len = SIZEOF(FNERR_FNAMEBUF_OVERFLOW_TEXT) - 1;
+					break;
+				case FNERR_NOERR:
+				default:
+					assertpro(FALSE);
+			}
+			assert(TREF(gvcst_statsDB_open_ch_active));	/* so the below error goes to syslog and not to user */
+			baseDBreg->reservedDBFlags |= RDBF_NOSTATS;	/* Disable STATS in base DB */
+			baseDBcsa->reservedDBFlags |= RDBF_NOSTATS;
+			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(8) ERR_DBFILERR, 2, DB_LEN_STR(baseDBreg), ERR_STATSDBFNERR, 2,
+				      errrsn_text_len, errrsn_text);
+		}
+		COPY_STATSDB_FNAME_INTO_STATSREG(reg, baseDBnl->statsdb_fname, baseDBnl->statsdb_fname_len);
+		seg = reg->dyn.addr;
+		if (!seg->blk_size)
+		{	/* This is a region/segment created by "mu_gv_cur_reg_init" (which sets most of reg/seg fields to 0).
+			 * Now that we need a non-zero blk_size, do what GDE did to calculate the statsdb block-size.
+			 * But since we cannot duplicate that code here, we set this to the same value effectively but
+			 * add an assert that the two are the same in "gd_load" function.
+			 * Take this opportunity to initialize other seg/reg fields for statsdbs like what GDE would have done.
+			 */
+			seg->blk_size = STATSDB_BLK_SIZE;
+			/* Similar code for a few other critical fields that need initialization before "mu_cre_file" */
+			seg->allocation = STATSDB_ALLOCATION;
+			seg->ext_blk_count = STATSDB_EXTENSION;
+			reg->max_key_size = STATSDB_MAX_KEY_SIZE;
+			reg->max_rec_size = STATSDB_MAX_REC_SIZE;
+			/* The below is directly inherited from the base db so no macro/assert like above fields */
+			seg->mutex_slots = NUM_CRIT_ENTRY(baseDBcsa->hdr);
+			reg->mumps_can_bypass = TRUE;
+		}
+		/* Before "dbfilopn" of a statsdb, check if it has been created. If not, create it (as it is an autodb).
+		 * Use FTOK of the base db as a lock, the same lock that is obtained when statsdb is auto deleted.
+		 */
+		if (!baseDBnl->statsdb_created)
+		{
+			/* Disable interrupts for the time we hold the ftok lock as it is otherwise possible we get a SIG-15
+			 * and go to exit handling and try a nested "ftok_sem_lock" on the same basedb and that could pose
+			 * multiple issues (e.g. ftok_sem_lock starts a timer while waiting in the "semop" call and we will
+			 * have the same timer-id added twice due to the nested call).
+			 */
+			DBGRDB((stderr, "gvcst_init: !baseDBnl->statsdb_created\n"));
+			if (IS_TP_AND_FINAL_RETRY && baseDBcsa->now_crit)
+			{	/* If this is a TP transaction and in the final retry, we are about to request the ftok
+				 * sem lock on baseDBreg while already holding crit on baseDBReg. That is an out-of-order
+				 * request which can lead to crit/ftok deadlocks so release crit before requesting it.
+				 * This code is similar to the TPNOTACID_CHECK macro with the below exceptions.
+				 *	a) We do not want to issue the TPNOTACID syslog message since there is no ACID
+				 *		violation here AND
+				 *	b) We have to check for baseDBcsa->now_crit in addition to IS_TP_AND_FINAL_RETRY
+				 *		as it is possible this call comes from "tp_restart -> gv_init_reg -> gvcst_init"
+				 *		AND t_tries is still 3 but we do not hold crit on any region at that point
+				 *		(i.e. "tp_crit_all_regions" call is not yet done) and in that case we should
+				 *		not decrement t_tries (TP_FINAL_RETRY_DECREMENT_T_TRIES_IF_OK call below)
+				 *		as it would result in we later starting the final retry with t_tries = 2 but
+				 *		holding crit on all regions which is an out-of-design situation.
+				 */
+				TP_REL_CRIT_ALL_REG;
+				assert(!baseDBcsa->now_crit);
+				assert(!mupip_jnl_recover);
+				TP_FINAL_RETRY_DECREMENT_T_TRIES_IF_OK;
+			}
+			DEFER_INTERRUPTS(INTRPT_IN_GVCST_INIT, prev_intrpt_state);
+			if (!ftok_sem_lock(baseDBreg, FALSE))
+			{
+				ENABLE_INTERRUPTS(INTRPT_IN_GVCST_INIT, prev_intrpt_state);
+				assert(FALSE);
+				rts_error_csa(CSA_ARG(baseDBcsa) VARLSTCNT(4) ERR_DBFILERR, 2, DB_LEN_STR(baseDBreg));
+			}
+			/* Now that we have the lock, check if the db is still not created. */
+			if (!baseDBnl->statsdb_created)
+			{	/* File still not created. Do it now under the ftok lock. */
+				DBGRDB((stderr, "gvcst_init: !baseDBnl->statsdb_created (under lock)\n"));
+				cstatus = gvcst_cre_autoDB(reg);
+				if (EXIT_NRM != cstatus)
+				{	/* File failed to create - if this is a case where the file exists (but was not supposed
+					 * to exist), we should remove/recreate the file. Otherwise, we have a real error -
+					 * probably a missing directory or permissions or some such. In that case, turn off stats
+					 * and unwind the failed open.
+					 */
+					statsdb_rcerr = STATSDB_NOERR;		/* Assume no error to occur */
+					save_errno = TREF(mu_cre_file_openrc);	/* Save the errno that stopped our recreate */
+					DBGRDB((stderr, "gvcst_init: Create of statsDB failed - rc = %d\n", save_errno));
+					if (EEXIST != TREF(mu_cre_file_openrc))
+						statsdb_rcerr = STATSDB_NOTEEXIST;
+					else
+					{	/* See if this statsdb file is really supposed to be linked to the baseDB we
+						 * also just opened. To do this, we need to open the statsdb temporarily, read
+						 * its fileheader and then close it to get the file-header field we want. Note
+						 * this is a very quick operation so we don't use the normal DB utilities on it.
+						 * We just want to read the file header and get out. Since we have the lock, no
+						 * other processes will have this database open unless we are illegitimately
+						 * opening it. This is an infrequent issue so the overhead is not relevant.
+						 */
+						DBGRDB((stderr, "gvcst_init: Test to see if file is 'ours'\n"));
+						memcpy(statsdb_path, reg->dyn.addr->fname, reg->dyn.addr->fname_len);
+						statsdb_path[reg->dyn.addr->fname_len] = '\0';	/* Rebuffer fn to include null */
+						fd = OPEN(statsdb_path, O_RDONLY);
+						if (0 > fd)
+						{	/* Some sort of open error occurred */
+							statsdb_rcerr = STATSDB_OPNERR;
+							save_errno = errno;
+						} else
+						{	/* Open worked - read file header from it*/
+							LSEEKREAD(fd, 0, (char *)&statsDBcsd, SIZEOF(sgmnt_data), rc);
+							if (0 > rc)
+								/* Wasn't enough data to be a file header - not a statsDB */
+								statsdb_rcerr = STATSDB_NOTSTATSDB;
+							else if (0 < rc)
+							{	/* Unknown error while doing read */
+								statsdb_rcerr = STATSDB_READERR;
+								save_errno = rc;
+							} else  /* if (0 == rc) */
+							{	/* Read worked - check if these two files are a proper pair */
+								if ((baseDBreg->dyn.addr->fname_len != statsDBcsd.basedb_fname_len)
+								    || (0 != memcmp(baseDBreg->dyn.addr->fname,
+										    statsDBcsd.basedb_fname,
+										    statsDBcsd.basedb_fname_len)))
+								{	/* This file is in use by another database */
+									statsdb_rcerr = STATSDB_NOTOURS;
+								} else
+								{	/* This file was for us - unlink and recreate */
+									DBGRDB((stderr, "gvcst_init: File is ours - unlink and "
+										"recreate it\n"));
+#									ifdef BYPASS_UNLINK_RECREATE_STATSDB
+									baseDBnl->statsdb_created = TRUE;
+#									else
+									rc = unlink(statsdb_path);
+									if (0 > rc)
+									{	/* Unlink failed - may not have permissions */
+										statsdb_rcerr = STATSDB_UNLINKERR;
+										save_errno = errno;
+									} else
+									{	/* Unlink succeeded - recreate now */
+										cstatus = gvcst_cre_autoDB(reg);
+										if (EXIT_NRM != cstatus)
+										{	/* Recreate failed */
+											statsdb_rcerr = STATSDB_RECREATEERR;
+											save_errno = TREF(mu_cre_file_openrc);
+										} else
+											baseDBnl->statsdb_created = TRUE;
+									}
+#									endif
+								}
+							}
+							CLOSEFILE(fd, rc);
+							if (0 < rc)
+							{	/* Close failed */
+								statsdb_rcerr = STATSDB_CLOSEERR;
+								save_errno = rc;
+							}
+						}
+					}
+					if (STATSDB_NOERR != statsdb_rcerr)
+					{	/* If we could not create or recreate the file, finish our error processing here */
+						assert(TREF(gvcst_statsDB_open_ch_active));	/* so the below rts_error_csa calls
+												 * go to syslog and not to user.
+												 */
+						baseDBreg->reservedDBFlags |= RDBF_NOSTATS;	/* Disable STATS in base DB */
+						baseDBcsa->reservedDBFlags |= RDBF_NOSTATS;
+						if (!ftok_sem_release(baseDBreg, FALSE, FALSE))
+						{	/* Release the lock before unwinding back */
+							assert(FALSE);
+							ENABLE_INTERRUPTS(INTRPT_IN_GVCST_INIT, prev_intrpt_state);
+							rts_error_csa(CSA_ARG(baseDBcsa) VARLSTCNT(4) ERR_DBFILERR, 2,
+								      DB_LEN_STR(baseDBreg));
+						}
+						/* For those errors that need a special error message, take care of that here
+						 * now that we've released the lock.
+						 */
+						switch(statsdb_rcerr)
+						{
+							case STATSDB_NOTEEXIST:		/* Some error occurred handled elsewhere */
+								break;
+							case STATSDB_NOTOURS:		/* This statsdb already in use elsewhere */
+								/* We are trying to attach a statsDB to our baseDB should not be
+								 * associated with that baseDB. First check if this IS a statsdb.
+								 */
+								ENABLE_INTERRUPTS(INTRPT_IN_GVCST_INIT, prev_intrpt_state);
+								if (IS_RDBF_STATSDB(&statsDBcsd))
+									rts_error_csa(CSA_ARG(NULL) VARLSTCNT(8) ERR_STATSDBINUSE,
+										      6, DB_LEN_STR(reg),
+										      statsDBcsd.basedb_fname_len,
+										      statsDBcsd.basedb_fname,
+										      DB_LEN_STR(baseDBreg));
+								else
+									rts_error_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_INVSTATSDB,
+										      4, DB_LEN_STR(reg), REG_LEN_STR(reg));
+								break;			/* For the compiler */
+							case STATSDB_OPNERR:
+								ENABLE_INTERRUPTS(INTRPT_IN_GVCST_INIT, prev_intrpt_state);
+								rts_error_csa(CSA_ARG(NULL) VARLSTCNT(5) ERR_DBOPNERR, 2,
+									      DB_LEN_STR(reg), save_errno);
+								break;			/* For the compiler */
+							case STATSDB_READERR:
+								ENABLE_INTERRUPTS(INTRPT_IN_GVCST_INIT, prev_intrpt_state);
+								rts_error_csa(CSA_ARG(NULL) VARLSTCNT(5) ERR_DBFILERR, 2,
+									      DB_LEN_STR(reg), save_errno);
+								break;			/* For the compiler */
+							case STATSDB_NOTSTATSDB:
+								ENABLE_INTERRUPTS(INTRPT_IN_GVCST_INIT, prev_intrpt_state);
+								rts_error_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_INVSTATSDB, 4,
+									      DB_LEN_STR(reg), REG_LEN_STR(reg));
+								break;			/* For the compiler */
+							case STATSDB_UNLINKERR:
+								ENABLE_INTERRUPTS(INTRPT_IN_GVCST_INIT, prev_intrpt_state);
+								rts_error_csa(CSA_ARG(NULL) VARLSTCNT(8) ERR_SYSCALL, 5,
+									      LEN_AND_LIT("unlink()"), CALLFROM, save_errno);
+								break;			/* For the compiler */
+							case STATSDB_RECREATEERR:
+								ENABLE_INTERRUPTS(INTRPT_IN_GVCST_INIT, prev_intrpt_state);
+								rts_error_csa(CSA_ARG(NULL) VARLSTCNT(5) ERR_DBOPNERR, 2,
+									      DB_LEN_STR(reg), save_errno);
+								break;			/* For the compiler */
+							case STATSDB_CLOSEERR:
+								ENABLE_INTERRUPTS(INTRPT_IN_GVCST_INIT, prev_intrpt_state);
+								rts_error_csa(CSA_ARG(NULL) VARLSTCNT(8) ERR_SYSCALL, 5,
+									      LEN_AND_LIT("close()"), CALLFROM, save_errno);
+								break;			/* For the compiler */
+							default:
+								assertpro(FALSE);
+						}
+						if (TREF(gvcst_statsDB_open_ch_active))
+						{	/* Unwind back to ESTABLISH_NORET where did gvcst_init() call to open this
+							 * statsDB which now won't open.
+							 */
+							ENABLE_INTERRUPTS(INTRPT_IN_GVCST_INIT, prev_intrpt_state);
+							rts_error_csa(CSA_ARG(NULL) VARLSTCNT(1) ERR_DRVLONGJMP);
+						} else
+						{	/* We are not nested so can give the appropriate error ourselves */
+							ENABLE_INTERRUPTS(INTRPT_IN_GVCST_INIT, prev_intrpt_state);
+							rts_error_csa(CSA_ARG(NULL) VARLSTCNT(8) ERR_DBFILERR, 2,
+								      DB_LEN_STR(reg), ERR_TEXT, 2,
+								      RTS_ERROR_TEXT("See preceding errors written to syserr"
+										     " and/or syslog for details"));
+						}
+					}
+				} else
+					baseDBnl->statsdb_created = TRUE;
+			}
+			if (!ftok_sem_release(baseDBreg, FALSE, FALSE))
+			{
+				ENABLE_INTERRUPTS(INTRPT_IN_GVCST_INIT, prev_intrpt_state);
+				assert(FALSE);
+				rts_error_csa(CSA_ARG(baseDBcsa) VARLSTCNT(4) ERR_DBFILERR, 2, DB_LEN_STR(baseDBreg));
+			}
+			ENABLE_INTERRUPTS(INTRPT_IN_GVCST_INIT, prev_intrpt_state);
+		}
+	}
+#	ifdef DEBUG
+	else
+	{
+		BASEDBREG_TO_STATSDBREG(reg, statsDBreg);
+		assert(!statsDBreg->open);
+	}
+#	endif
 	assert(!jgbl.forw_phase_recovery);
 	CWS_INIT;	/* initialize the cw_stagnate hash-table */
 	/* check the header design assumptions */
 	assert(SIZEOF(th_rec) == (SIZEOF(bt_rec) - SIZEOF(bt->blkque)));
 	assert(SIZEOF(cache_rec) == (SIZEOF(cache_state_rec) + SIZEOF(cr->blkque)));
-	DEBUG_ONLY(assert_jrec_member_offsets();)
+	DEBUG_ONLY(assert_jrec_member_offsets());
 	assert(MAX_DB_BLK_SIZE < (1 << NEXT_OFF_MAX_BITS));	/* Ensure a off_chain record's next_off member
 								 * can work with all possible block sizes */
-        set_num_additional_processors();
-	DEBUG_ONLY(
-		/* Note that the "block" member in the blk_ident structure in gdskill.h has 30 bits.
-		 * Currently, the maximum number of blocks is 2**30. If ever this increases, something
-		 * has to be correspondingly done to the "block" member to increase its capacity.
-		 * The following assert checks that we always have space in the "block" member
-		 * to represent a GDS block number.
-		 */
-		tmp_blk.block = minus1;
-		assert(MAXTOTALBLKS_MAX - 1 <= tmp_blk.block);
-	)
+	set_num_additional_processors();
+#	ifdef DEBUG
+	/* Note that the "block" member in the blk_ident structure in gdskill.h has 30 bits.
+	 * Currently, the maximum number of blocks is 2**30. If ever this increases, something
+	 * has to be correspondingly done to the "block" member to increase its capacity.
+	 * The following assert checks that we always have space in the "block" member
+	 * to represent a GDS block number.
+	 */
+	tmp_blk.block = minus1;
+	assert(MAXTOTALBLKS_MAX - 1 <= tmp_blk.block);
+#	endif
 	/* TH_BLOCK is currently a hardcoded constant as basing it on the offsetof macro does not work with the VMS compiler.
 	 * Therefore assert that TH_BLOCK points to the 512-byte block where the "trans_hist" member lies in the fileheader.
 	 */
 	assert(DIVIDE_ROUND_UP(offsetof(sgmnt_data, trans_hist), DISK_BLOCK_SIZE) == TH_BLOCK);
-	if ((prev_reg = dbfilopn(greg)) != greg)
-	{
-		if (NULL == prev_reg || (gd_region *)-1L == prev_reg) /* (gd_region *)-1 == prev_reg => cm region open attempted */
-			return;
-		/* Found same database already open - prev_reg contains addr of originally opened region */
-		greg->dyn.addr->file_cntl = prev_reg->dyn.addr->file_cntl;
-		memcpy(greg->dyn.addr->fname, prev_reg->dyn.addr->fname, prev_reg->dyn.addr->fname_len);
-		greg->dyn.addr->fname_len = prev_reg->dyn.addr->fname_len;
-		csa = (sgmnt_addrs *)&FILE_INFO(greg)->s_addrs;
-		if (NULL == csa->gvt_hashtab)
-			gvt_hashtab_init(csa);	/* populate csa->gvt_hashtab; need to do this BEFORE PROCESS_GVT_PENDING_LIST */
-		PROCESS_GVT_PENDING_LIST(greg, csa);
-		csd = csa->hdr;
-		greg->max_rec_size = csd->max_rec_size;
-		greg->max_key_size = csd->max_key_size;
-	 	greg->null_subs = csd->null_subs;
-		greg->std_null_coll = csd->std_null_coll;
-		greg->jnl_state = csd->jnl_state;
-		greg->jnl_file_len = csd->jnl_file_len;		/* journal file name length */
-		memcpy(greg->jnl_file_name, csd->jnl_file_name, greg->jnl_file_len);	/* journal file name */
-		greg->jnl_alq = csd->jnl_alq;
-		greg->jnl_deq = csd->jnl_deq;
-		greg->jnl_buffer_size = csd->jnl_buffer_size;
-		greg->jnl_before_image = csd->jnl_before_image;
-		SET_REGION_OPEN_TRUE(greg, WAS_OPEN_TRUE);
-		assert(1 <= csa->regcnt);
-		csa->regcnt++;	/* Increment # of regions that point to this csa */
-		return;
-	}
-	GTM_FD_TRACE_ONLY(gtm_dbjnl_dupfd_check();)	/* check if any of db or jnl fds collide (D9I11-002714) */
-	greg->was_open = FALSE;
-	/* We shouldn't have crit on any region unless we are in TP and in the final retry or we are in mupip_set_journal trying to
-	 * switch journals across all regions. WBTEST_HOLD_CRIT_ENABLED is an exception because it exercises a deadlock situation so
-	 * it needs to hold multiple crits at the same time. Currently, there is no fine-granular checking for mupip_set_journal,
-	 * hence a coarse MUPIP_IMAGE check for image_type.
-	 */
-	assert(dollar_tlevel && (CDB_STAGNATE <= t_tries) || IS_MUPIP_IMAGE || (0 == have_crit(CRIT_HAVE_ANY_REG))
-	       || WBTEST_ENABLED(WBTEST_HOLD_CRIT_ENABLED));
-	if (dollar_tlevel && (0 != have_crit(CRIT_HAVE_ANY_REG)))
-	{	/* To avoid deadlocks with currently holding crits and the DLM lock request to be done in db_init(),
-		 * we should insert this region in the tp_reg_list and tp_restart should do the gvcst_init after
-		 * having released crit on all regions. Note that this check should be done AFTER checking if the
-		 * region has already been opened (i.e. greg->was_open = TRUE logic above) since in that case we dont
-		 * do any heavyweight processing (like db_init which involves crit/DLM locks) and so dont need to restart.
-		 */
-		insert_region(greg, &tp_reg_list, &tp_reg_free_list, SIZEOF(tp_region));
-		t_retry(cdb_sc_needcrit);
-		assert(FALSE);	/* we should never reach here since t_retry should have unwound the M-stack and restarted the TP */
-	}
-	csa = (sgmnt_addrs *)&FILE_INFO(greg)->s_addrs;
-
-#ifdef	NOLICENSE
-	licensed = TRUE;
-#else
-	CRYPT_CHKSYSTEM;
-#endif
-	db_init_region = greg;	/* initialized for dbinit_ch */
-	csa->hdr = NULL;
-        csa->nl = NULL;
-        csa->jnl = NULL;
-	csa->gbuff_limit = 0;
-	csa->our_midnite = NULL;
-	csa->persistent_freeze = FALSE;	/* want secshr_db_clnup() to clear an incomplete freeze/unfreeze codepath */
-	csa->regcnt = 1;	/* At this point, only one region points to this csa */
-	csa->db_addrs[0] = csa->db_addrs[1] = NULL;
-	csa->lock_addrs[0] = csa->lock_addrs[1] = NULL;
-#	ifdef VMS
-	greg_acc_meth = REG_ACC_METH(greg);
-	assert(dba_cm != greg_acc_meth);
-	temp_cs_data = (sgmnt_data_ptr_t)cs_data_buff;
-	fc = greg->dyn.addr->file_cntl;
-	fc->file_type = greg_acc_meth;
-	fc->op = FC_READ;
-	fc->op_buff = (sm_uc_ptr_t)temp_cs_data;
-	fc->op_len = SIZEOF(*temp_cs_data);
-	fc->op_pos = 1;
-	dbfilop(fc);
-	DO_BADDBVER_CHK(greg, temp_cs_data);
-	DO_DB_HDR_CHECK(greg, temp_cs_data); /* Basic sanity check on the file header fields */
-	if (greg_acc_meth != temp_cs_data->acc_meth)
-	{
-		greg_acc_meth = temp_cs_data->acc_meth;
-		REG_ACC_METH(greg) = greg_acc_meth;
-	}
-#	endif
 	/* Here's the shared memory layout:
 	 *
 	 * low address
@@ -415,47 +689,144 @@ void gvcst_init(gd_region *greg)
 	assert(268 == OFFSETOF(node_local, now_running[0]));
  	assert(36 == SIZEOF(((node_local *)NULL)->now_running));
 	assert(36 == MAX_REL_NAME);
-#	ifdef UNIX
-	START_HEARTBEAT_IF_NEEDED;
-	if (!pool_init && jnlpool_init_needed && CUSTOM_ERRORS_AVAILABLE && REPL_INST_AVAILABLE)
-		jnlpool_init(GTMRELAXED, (boolean_t)FALSE, (boolean_t *)NULL);
-	/* Any LSEEKWRITEs hence forth will wait if the instance is frozen. To aid in printing the region information before
-	 * and after the wait, csa->region is referenced. Since it is NULL at this point, set it to greg. This is a safe
-	 * thing to do since csa->region is anyways set in db_common_init (few lines below).
-	 */
-	csa->region = greg;
-#	endif
-	/* Protect the db_init and the code below until we set greg->open to TRUE. This is needed as otherwise,
-	 * if a MUPIP STOP is issued to this process at a time-window when db_init is completed but greg->open
-	 * is NOT set to TRUE, will cause gds_rundown NOT to clean up the shared memory created by db_init and
-	 * thus would be left over in the system.
-	 */
-	DEFER_INTERRUPTS(INTRPT_IN_GVCST_INIT, prev_intrpt_state);
-	assert(INTRPT_OK_TO_INTERRUPT == prev_intrpt_state);	/* relied upon by ENABLE_INTERRUPTS in dbinit_ch */
-	VMS_ONLY(db_init(greg, temp_cs_data));
-#	ifdef UNIX
-	db_init_retry = 0;
-	GTM_WHITE_BOX_TEST(WBTEST_HOLD_FTOK_UNTIL_BYPASS, db_init_retry, 3);
-	for (; db_init_retry < MAX_DBINIT_RETRY; db_init_retry++)
+	for (loopcnt = 0; loopcnt < MAX_DBFILOPN_RETRY_CNT; loopcnt++)
 	{
-		if (0 == db_init(greg))
+		prev_reg = dbfilopn(reg);
+		if (prev_reg != reg)
+		{	/* (gd_region *)-1 == prev_reg => cm region open attempted */
+			if (NULL == prev_reg || (gd_region *)-1L == prev_reg)
+				return;
+			/* Found same database already open - prev_reg contains addr of originally opened region */
+			reg->dyn.addr->file_cntl = prev_reg->dyn.addr->file_cntl;
+			memcpy(reg->dyn.addr->fname, prev_reg->dyn.addr->fname, prev_reg->dyn.addr->fname_len);
+			reg->dyn.addr->fname_len = prev_reg->dyn.addr->fname_len;
+			csa = (sgmnt_addrs *)&FILE_INFO(reg)->s_addrs;
+			if (NULL == csa->gvt_hashtab)
+				gvt_hashtab_init(csa);	/* populate csa->gvt_hashtab; needed BEFORE PROCESS_GVT_PENDING_LIST */
+			PROCESS_GVT_PENDING_LIST(reg, csa);
+			csd = csa->hdr;
+			reg->max_rec_size = csd->max_rec_size;
+			reg->max_key_size = csd->max_key_size;
+			reg->null_subs = csd->null_subs;
+			reg->std_null_coll = csd->std_null_coll;
+			reg->jnl_state = csd->jnl_state;
+			reg->jnl_file_len = csd->jnl_file_len;		/* journal file name length */
+			memcpy(reg->jnl_file_name, csd->jnl_file_name, reg->jnl_file_len);	/* journal file name */
+			reg->jnl_alq = csd->jnl_alq;
+			reg->jnl_deq = csd->jnl_deq;
+			reg->jnl_buffer_size = csd->jnl_buffer_size;
+			reg->jnl_before_image = csd->jnl_before_image;
+			reg->dyn.addr->asyncio = csd->asyncio;
+			assert(csa->reservedDBFlags == csd->reservedDBFlags);	/* Should be same already */
+			SYNC_RESERVEDDBFLAGS_REG_CSA_CSD(reg, csa, csd, ((node_local_ptr_t)NULL));
+			SET_REGION_OPEN_TRUE(reg, WAS_OPEN_TRUE);
+			assert(1 <= csa->regcnt);
+			csa->regcnt++;	/* Increment # of regions that point to this csa */
+			return;
+		}
+		/* Note that if we are opening a statsDB, it is possible baseDBreg->was_open is TRUE at this point. */
+		reg->was_open = FALSE;
+		/* We shouldn't have crit on any region unless we are in TP and in the final retry or we are in mupip_set_journal
+		 * trying to switch journals across all regions. WBTEST_HOLD_CRIT_ENABLED is an exception because it exercises a
+		 * deadlock situation so it needs to hold multiple crits at the same time. Currently, there is no fine-granular
+		 * checking for mupip_set_journal, hence a coarse MUPIP_IMAGE check for image_type.
+		 */
+		assert(dollar_tlevel && (CDB_STAGNATE <= t_tries) || IS_MUPIP_IMAGE || (0 == have_crit(CRIT_HAVE_ANY_REG))
+		       || WBTEST_ENABLED(WBTEST_HOLD_CRIT_ENABLED));
+		if (dollar_tlevel && (0 != have_crit(CRIT_HAVE_ANY_REG)))
+		{	/* To avoid deadlocks with currently holding crits and the DLM lock request to be done in "db_init",
+			 * we should insert this region in the tp_reg_list and tp_restart should do the gvcst_init after
+			 * having released crit on all regions.
+			 */
+			insert_region(reg, &tp_reg_list, &tp_reg_free_list, SIZEOF(tp_region));
+			t_retry(cdb_sc_needcrit);
+			assert(FALSE);	/* should never reach here since t_retry should have unwound the M-stack and restarted TP */
+		}
+		csa = (sgmnt_addrs *)&FILE_INFO(reg)->s_addrs;
+#		ifdef NOLICENSE
+		licensed = TRUE;
+#		else
+		CRYPT_CHKSYSTEM;
+#		endif
+		csa->hdr = NULL;
+		csa->nl = NULL;
+		csa->jnl = NULL;
+		csa->gbuff_limit = 0;
+		csa->our_midnite = NULL;
+		csa->our_lru_cache_rec_off = 0;
+		csa->persistent_freeze = FALSE;	/* want secshr_db_clnup() to clear an incomplete freeze/unfreeze codepath */
+		csa->regcnt = 1;	/* At this point, only one region points to this csa */
+		csa->db_addrs[0] = csa->db_addrs[1] = NULL;
+		csa->lock_addrs[0] = csa->lock_addrs[1] = NULL;
+		if (!pool_init && jnlpool_init_needed && CUSTOM_ERRORS_AVAILABLE && REPL_INST_AVAILABLE)
+			jnlpool_init(GTMRELAXED, (boolean_t)FALSE, (boolean_t *)NULL);
+		/* Any LSEEKWRITEs hence forth will wait if the instance is frozen. To aid in printing the region information before
+		 * and after the wait, csa->region is referenced. Since it is NULL at this point, set it to reg. This is a safe
+		 * thing to do since csa->region is anyways set in db_common_init (few lines below).
+		 */
+		csa->region = reg;
+		/* Protect the db_init and the code below until we set reg->open to TRUE. This is needed as otherwise,
+		 * if a MUPIP STOP is issued to this process at a time-window when db_init is completed but reg->open
+		 * is NOT set to TRUE, will cause gds_rundown NOT to clean up the shared memory created by db_init and
+		 * thus would be left over in the system.
+		 */
+		DEFER_INTERRUPTS(INTRPT_IN_GVCST_INIT, prev_intrpt_state);
+		assert(INTRPT_OK_TO_INTERRUPT == prev_intrpt_state);	/* relied upon by ENABLE_INTERRUPTS in dbinit_ch */
+		/* Do a loop of "db_init". This is to account for the fact that "db_init" can return an error in some cases.
+		 * e.g. If DSE does "db_init" first time with OK_TO_BYPASS_TRUE and somewhere in the middle of "db_init" it
+		 * notices that a concurrent mumps process has deleted the semid/shmid since it was the last process attached
+		 * to the db. In this case we retry the "db_init" a few times and the last time we retry with OK_TO_BYPASS_FALSE
+		 * even if this is DSE.
+		 */
+		db_init_retry = 0;
+		GTM_WHITE_BOX_TEST(WBTEST_HOLD_FTOK_UNTIL_BYPASS, db_init_retry, MAX_DBINIT_RETRY);
+		do
+		{
+			db_init_ret = db_init(reg, (MAX_DBINIT_RETRY == db_init_retry) ? OK_TO_BYPASS_FALSE : OK_TO_BYPASS_TRUE);
+			if (0 == db_init_ret)
+				break;
+			if (-1 == db_init_ret)
+			{
+				assert(MAX_DBINIT_RETRY > db_init_retry);
+				retry_dbinit = TRUE;
+			} else
+			{	/* Set "retry_dbinit" to FALSE that way "db_init_err_cleanup" call below takes care of
+				 * closing udi->fd opened in "dbfilopn" call early in this iteration. This avoids fd leak
+				 * since another call to "dbfilopn" in the next iteration would not know about the previous fd.
+				 */
+				retry_dbinit = FALSE;
+			}
+			db_init_err_cleanup(retry_dbinit);
+			if (!retry_dbinit)
+				break;
+		} while (MAX_DBINIT_RETRY >= ++db_init_retry);
+		assert(-1 != db_init_ret);
+		if (0 == db_init_ret)
 			break;
-		db_init_err_cleanup(MAX_DBINIT_RETRY >  (db_init_retry + 1));
+		if (ERR_DBGLDMISMATCH == db_init_ret)
+		{	/* "db_init" would have adjusted seg->asyncio to reflect the db file header's asyncio settings.
+			 * Retry but do not count this try towards the total tries as otherwise it is theoretically possible
+			 * for the db fileheader to be recreated with just the opposite asyncio setting in each try and
+			 * we might eventually error out when "loopcnt" is exhausted. Not counting this try implies we
+			 * might loop indefinitely but the chances are infinitesimally small. And since this error is never
+			 * issued, the user should never expect to see this and hence this error is not documented.
+			 */
+			loopcnt--;
+		}
 	}
-	if (MAX_DBINIT_RETRY == db_init_retry) /* We retried enough. Error out. */
+	if (db_init_ret)
 	{
-		assert(IS_LKE_IMAGE || IS_DSE_IMAGE);
-		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_REGOPENFAIL, 4, REG_LEN_STR(greg), DB_LEN_STR(greg));
+		assert(FALSE);	/* we don't know of a practical way to get errors in each of the for-loop attempts above */
+		/* "db_init" returned with an unexpected error. Issue a generic error to note this out-of-design state */
+		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_REGOPENFAIL, 4, REG_LEN_STR(reg), DB_LEN_STR(reg));
 	}
-
-#	endif
 	/* At this point, we have initialized the database, but haven't yet set reg->open to TRUE. If any rts_errors happen in
 	 * the meantime, there are no condition handlers established to handle the rts_error. More importantly, it is non-trivial
 	 * to add logic to such a condition handler to undo the effects of db_init. Also, in some cases, the rts_error can can
 	 * confuse future calls of db_init. By invoking DBG_MARK_RTS_ERROR_UNUSABLE, we can catch any rts_errors in future and
 	 * eliminate it on a case by case basis.
 	 */
-	UNIX_ONLY(DBG_MARK_RTS_ERROR_UNUSABLE);
+	DBG_MARK_RTS_ERROR_UNUSABLE;
 	crash_count = csa->critical->crashcnt;
 	csa->regnum = ++region_open_count;
 	csd = csa->hdr;
@@ -466,16 +837,15 @@ void gvcst_init(gd_region *greg)
 	csa->db_trigger_cycle = csd->db_trigger_cycle;
 #	endif
 	/* set csd and fill in selected fields */
-	assert(REG_ACC_METH(greg) == csd->acc_meth); /* db_init should have made sure this assert holds good */
-	greg_acc_meth = csd->acc_meth;
+	assert(REG_ACC_METH(reg) == csd->acc_meth); /* db_init should have made sure this assert holds good */
+	reg_acc_meth = csd->acc_meth;
 	/* It is necessary that we do the pending gv_target list reallocation BEFORE db_common_init as the latter resets
-	 * greg->max_key_size to be equal to the csd->max_key_size and hence process_gvt_pending_list might wrongly conclude
-	 * that NO reallocation (since it checks greg->max_key_size with csd->max_key_size) is needed when in fact a
+	 * reg->max_key_size to be equal to the csd->max_key_size and hence process_gvt_pending_list might wrongly conclude
+	 * that NO reallocation (since it checks reg->max_key_size with csd->max_key_size) is needed when in fact a
 	 * reallocation might be necessary (if the user changed max_key_size AFTER database creation)
 	 */
-	PROCESS_GVT_PENDING_LIST(greg, csa);
-	db_common_init(greg, csa, csd);	/* do initialization common to db_init() and mu_rndwn_file() */
-
+	PROCESS_GVT_PENDING_LIST(reg, csa);
+	db_common_init(reg, csa, csd);	/* do initialization common to db_init() and mu_rndwn_file() */
 	/* If we are not fully upgraded, see if we need to send a warning to the operator console about
 	   performance. Compatibility mode is a known performance drain. Actually, we can send one of two
 	   messages. If the desired_db_format is for an earlier release than the current release, we send
@@ -491,31 +861,32 @@ void gvcst_init(gd_region *greg)
 	    && COMPSWAP_LOCK(&csd->next_upgrd_warn.time_latch, next_warn_uint4, 0, (curr_time_uint4 + UPGRD_WARN_INTERVAL), 0))
 	{	/* The msg is due and we have successfully updated the next time interval */
 		if (GDSVCURR != csd->desired_db_format)
-			send_msg_csa(CSA_ARG(csa) VARLSTCNT(4) ERR_DBVERPERFWARN1, 2, DB_LEN_STR(greg));
+			send_msg_csa(CSA_ARG(csa) VARLSTCNT(4) ERR_DBVERPERFWARN1, 2, DB_LEN_STR(reg));
 		else
-			send_msg_csa(CSA_ARG(csa) VARLSTCNT(4) ERR_DBVERPERFWARN2, 2, DB_LEN_STR(greg));
+			send_msg_csa(CSA_ARG(csa) VARLSTCNT(4) ERR_DBVERPERFWARN2, 2, DB_LEN_STR(reg));
 	}
-
+	csa->lock_crit_with_db = csd->lock_crit_with_db;	/* put a copy in csa where it's cheaper for mlk* to access */
 	/* Compute the maximum journal space requirements for a PBLK (including possible ALIGN record).
 	 * Use this variable in the TOTAL_TPJNL_REC_SIZE and TOTAL_NONTP_JNL_REC_SIZE macros instead of recomputing.
 	 */
 	csa->pblk_align_jrecsize = (int4)MIN_PBLK_RECLEN + csd->blk_size + (int4)MIN_ALIGN_RECLEN;
 	segment_update_array_size = UA_SIZE(csd);
-	assert(!greg->was_open);
-	SET_REGION_OPEN_TRUE(greg, WAS_OPEN_FALSE);
+	assert(!reg->was_open);
+	SET_REGION_OPEN_TRUE(reg, WAS_OPEN_FALSE);
+	GTM_FD_TRACE_ONLY(gtm_dbjnl_dupfd_check());	/* check if any of db or jnl fds collide (D9I11-002714) */
 	if (NULL != csa->dir_tree)
 	{	/* It is possible that dir_tree has already been targ_alloc'ed. This is because GT.CM or VMS DAL
 		 * calls can run down regions without the process halting out. We don't want to double malloc.
 		 */
 		csa->dir_tree->clue.end = 0;
 	}
-	SET_CSA_DIR_TREE(csa, greg->max_key_size, greg);
+	SET_CSA_DIR_TREE(csa, reg->max_key_size, reg);
 	/* Now that reg->open is set to TRUE and directory tree is initialized, go ahead and set rts_error back to being usable */
-	UNIX_ONLY(DBG_MARK_RTS_ERROR_USABLE);
+	DBG_MARK_RTS_ERROR_USABLE;
 	/* gds_rundown if invoked from now on will take care of cleaning up the shared memory segment */
 	/* The below code, until the ENABLE_INTERRUPTS(INTRPT_IN_GVCST_INIT, prev_intrpt_state), can do mallocs which in turn
 	 * can issue a GTM-E-MEMORY error which would invoke rts_error. Hence these have to be done AFTER the
-	 * UNIX_ONLY(DBG_MARK_RTS_ERROR_USABLE) call. Since these are only private memory initializations, it is safe to
+	 * DBG_MARK_RTS_ERROR_USABLE call. Since these are only private memory initializations, it is safe to
 	 * do these after reg->open is set. Any rts_errors from now on still do the needful cleanup of shared memory in
 	 * gds_rundown since reg->open is already TRUE.
 	 */
@@ -601,14 +972,14 @@ void gvcst_init(gd_region *greg)
 		csa->min_total_nontpjnl_rec_size = PINI_RECLEN + MIN_ALIGN_RECLEN;
 	}
 	if (tp_in_use || !IS_GTM_IMAGE)
-		gvcst_tp_init(greg);	/* Initialize TP structures, else postpone till TP is used (only if GTM) */
+		gvcst_tp_init(reg);	/* Initialize TP structures, else postpone till TP is used (only if GTM) */
 	if (!global_tlvl_info_list)
 	{
 		global_tlvl_info_list = (buddy_list *)malloc(SIZEOF(buddy_list));
 		initialize_list(global_tlvl_info_list, SIZEOF(global_tlvl_info), GBL_TLVL_INFO_LIST_INIT_ALLOC);
 	}
 	ENABLE_INTERRUPTS(INTRPT_IN_GVCST_INIT, prev_intrpt_state);
-	if (dba_bg == greg_acc_meth)
+	if (dba_bg == reg_acc_meth)
 	{	/* Check if (a) this region has non-upgraded blocks and if so, (b) the reformat buffer exists and
 		 * (c) if it is big enough to deal with this region. If the region does not have any non-upgraded
 		 * block (blks_to_upgrd is 0) we will not allocate the buffer at this time. Note that this opens up
@@ -628,12 +999,12 @@ void gvcst_init(gd_region *greg)
 			 * the decrement of fast_lock_count should be done AFTER decrementing reformat_buffer_in_use.
 			 */
 			assert(0 == reformat_buffer_in_use);
-			DEBUG_ONLY(reformat_buffer_in_use++;)
+			DEBUG_ONLY(reformat_buffer_in_use++);
 			if (reformat_buffer)
 				free(reformat_buffer);	/* Different blksized databases in use .. keep only largest one */
 			reformat_buffer = malloc(csd->blk_size);
 			reformat_buffer_len = csd->blk_size;
-			DEBUG_ONLY(reformat_buffer_in_use--;)
+			DEBUG_ONLY(reformat_buffer_in_use--);
 			assert(0 == reformat_buffer_in_use);
 			--fast_lock_count;
 		}
@@ -644,8 +1015,26 @@ void gvcst_init(gd_region *greg)
 			(TREF(gbuff_limit)).str.addr = malloc(SIZEOF(REORG_GBUFF_LIMIT));
 			memcpy((TREF(gbuff_limit)).str.addr, REORG_GBUFF_LIMIT, SIZEOF(REORG_GBUFF_LIMIT));
 		}
+		if ((mu_reorg_process DEBUG_ONLY(|| IS_GTM_IMAGE)) && (0 != (TREF(gbuff_limit)).str.len))
+		{	/* if reorg or dbg apply env var */
+			set_gbuff_limit(&csa, &csd, &(TREF(gbuff_limit)));
+#			ifdef DEBUG
+			if ((process_id & 2) && (process_id & (csd->n_bts - 1)))		/* also randomize our_midnite */
+			{
+				csa->our_midnite = csa->acc_meth.bg.cache_state->cache_array + csd->bt_buckets;
+				csa->our_midnite += (process_id & (csd->n_bts - 1));
+				assert((csa->acc_meth.bg.cache_state->cache_array + csd->bt_buckets + csd->n_bts)
+				       > csa->our_midnite);
+				cr = csa->our_midnite - csa->gbuff_limit;
+				if (cr < csa->acc_meth.bg.cache_state->cache_array + csd->bt_buckets)
+					cr += csd->n_bts;
+				csa->our_lru_cache_rec_off = GDS_ANY_ABS2REL(csa, cr);
+			}
+			assert((csa->acc_meth.bg.cache_state->cache_array + csd->bt_buckets) < csa->our_midnite);
+#			endif
+		}
 	}
-	if ((dba_bg == greg_acc_meth) || (dba_mm == greg_acc_meth))
+	if (IS_ACC_METH_BG_OR_MM(reg_acc_meth))
 	{
 		/* Determine fid_index of current region's file_id across sorted file_ids of all regions open until now.
 		 * All regions which have a file_id lesser than that of current region will have no change to their fid_index
@@ -658,16 +1047,15 @@ void gvcst_init(gd_region *greg)
 		 * hence they will not be sorted.
 		 */
 		prevcsa = NULL;
-		greg_fid = &(csa->nl->unique_id);
+		reg_fid = &(csa->nl->unique_id);
 		max_fid_index = 1;
 		for (regcsa = cs_addrs_list; NULL != regcsa; regcsa = regcsa->next_csa)
 		{
-			UNIX_ONLY(onln_rlbk_cycle_mismatch |= (regcsa->db_onln_rlbkd_cycle != regcsa->nl->db_onln_rlbkd_cycle));
+			onln_rlbk_cycle_mismatch |= (regcsa->db_onln_rlbkd_cycle != regcsa->nl->db_onln_rlbkd_cycle);
 			if ((NULL != prevcsa) && (regcsa->fid_index < prevcsa->fid_index))
 				continue;
-			reg_fid = &((regcsa)->nl->unique_id);
-			VMS_ONLY(if (0 < memcmp(&(greg_fid->file_id), (char *)&(reg_fid->file_id), SIZEOF(gd_id))))
-			UNIX_ONLY(if (0 < gdid_cmp(&(greg_fid->uid), &(reg_fid->uid))))
+			tmp_reg_fid = &((regcsa)->nl->unique_id);
+			if (0 < gdid_cmp(&(reg_fid->uid), &(tmp_reg_fid->uid)))
 			{
 				if ((NULL == prevcsa) || (regcsa->fid_index > prevcsa->fid_index))
 					prevcsa = regcsa;
@@ -684,14 +1072,15 @@ void gvcst_init(gd_region *greg)
 			csa->fid_index = prevcsa->fid_index + 1;
 			max_fid_index = MAX(max_fid_index, csa->fid_index);
 		}
-		UNIX_ONLY(
-			if (onln_rlbk_cycle_mismatch)
+		if (onln_rlbk_cycle_mismatch)
+		{
+			csa->root_search_cycle--;
+			if (REPL_ALLOWED(csd))
 			{
-				csa->root_search_cycle--;
 				csa->onln_rlbk_cycle--;
 				csa->db_onln_rlbkd_cycle--;
 			}
-		)
+		}
 		/* Add current csa into list of open csas */
 		csa->next_csa = cs_addrs_list;
 		cs_addrs_list = csa;
@@ -701,22 +1090,6 @@ void gvcst_init(gd_region *greg)
 		DBG_CHECK_TP_REG_LIST_SORTING(tp_reg_list);
 		TREF(max_fid_index) = max_fid_index;
 	}
-	if ((mu_reorg_process DEBUG_ONLY(|| IS_GTM_IMAGE)) && (0 != (TREF(gbuff_limit)).str.len) )
-	{	/* if reorg or dbg apply env var */
-		reg_nam_mval.str.len = greg->rname_len;
-		reg_nam_mval.str.addr = (char *)&greg->rname;
-		set_gbuff_limit(&csa, &csd, &(TREF(gbuff_limit)));
-#		ifdef DEBUG
-		if (process_id & 2)		/* also randomize our_midnite */
-		{
-			csa->our_midnite = csa->acc_meth.bg.cache_state->cache_array + csd->bt_buckets;
-			csa->our_midnite += (process_id & (csd->n_bts - 1));
-			assert((csa->acc_meth.bg.cache_state->cache_array + csd->bt_buckets + csd->n_bts)
-				> csa->our_midnite);
-		}
-#		endif
-	}
-#	ifdef UNIX
 	if (pool_init && REPL_ALLOWED(csd) && jnlpool_init_needed)
 	{
 		/* Last parameter to VALIDATE_INITIALIZED_JNLPOOL is TRUE if the process does logical updates and FALSE otherwise.
@@ -729,8 +1102,78 @@ void gvcst_init(gd_region *greg)
 		 * SCNDDBNOUPD error message here. But, eventually when this process goes to gvcst_{put,kill} or op_ztrigger,
 		 * SCNDDBNOUPD is issued.
 		 */
-		VALIDATE_INITIALIZED_JNLPOOL(csa, csa->nl, greg, GTMRELAXED, SCNDDBNOUPD_CHECK_FALSE);
+		VALIDATE_INITIALIZED_JNLPOOL(csa, csa->nl, reg, GTMRELAXED, SCNDDBNOUPD_CHECK_FALSE);
+	}
+	/* At this point, the database is officially open but one of two condition can exist here where we need to do more work:
+	 *   1. This was a normal database open and this process has opted-in for global shared stats so we need to also open
+	 *      the associated statsDB (IF the baseDB does not have the NOSTATS qualifier).
+	 *   2. We are opening a statsDB in which case we are guaranteed the baseDB has already been open (assert at start of
+	 *	this function). The baseDB open would have done the needed initialization for the statsDB in a lot of cases.
+	 *	But in case it did not (e.g. TREF(statshare_opted_in) is FALSE), keep the statsDB open read-only until the
+	 *	initialization happens later (when TREF(statshare_opted_in) becomes TRUE again).
+	 * Note since this database is officially opened and has gone through db_init(), the current reservedDBFlags in all of
+	 * region, sgmnt_addrs, and sgmnt_data are sync'd to the value that was in sgmnt_data (fileheader).
+	 */
+	if (!IS_DSE_IMAGE)
+	{	/* DSE does not open statsdb automatically. It does it only when asked to */
+		if (TREF(statshare_opted_in))
+		{
+			if (!is_statsDB)
+			{	/* This is a baseDB - so long as NOSTATS is *not* turned on, we should initialize the statsDB */
+				if (!(RDBF_NOSTATS & reg->reservedDBFlags))
+				{
+					BASEDBREG_TO_STATSDBREG(reg, statsDBreg);
+					assert(NULL != statsDBreg);
+					if (!statsDBreg->statsDB_setup_started)
+					{       /* The associated statsDB may or may not be open but it hasn't been initialized
+						 * so take care of that now. Put a handler around it so if the open of the statsDB
+						 * file fails for whatever reason, we can ignore it and just keep going.
+						 */
+						statsDBreg->statsDB_setup_started = TRUE;
+						gvcst_init_statsDB(reg, DO_STATSDB_INIT_TRUE);
+					}
+				}
+			}
+		} else if (is_statsDB)
+		{	/* We are opening a statsDB file but not as a statsDB (i.e. not opted-in) but we still need to set the
+			 * database to R/O mode so it is only updated by GTM's C code and never in M mode which could lead to
+			 * too-small records being added that would cause the gvstats records to move which must never happen.
+			 * For DSE, we want it to open the db R/W (in case we need some repair of the statsdb).
+			 * So skip this R/O setting for DSE.
+			 */
+			assert(!reg->was_open);
+			reg->read_only = TRUE;
+			csa->read_write = FALSE;	/* Maintain read_only/read_write in parallel */
+		}
 	}
-#	endif
 	return;
 }
+
+/* Simplistic handler for when errors occur during open of statsDB. The ESTABLISH_NORET is a place-holder for the
+ * setjmp/longjmp sequence used to recover quietly from errors opening* the statsDB. So if the error is the magic
+ * ERR_DRVLONGJMP, do just that (longjmp() via the UNWIND() macro). If the error is otherwise, capture the error
+ * and where it was raised and send the STATSDBERR to the syslog before we unwind back to the ESTABLISH_NORET.
+ */
+CONDITION_HANDLER(gvcst_statsDB_open_ch)
+{
+	char	buffer[OUT_BUFF_SIZE];
+	int	msglen;
+	mval	zpos;
+
+	START_CH(TRUE);
+	assert(ERR_DBROLLEDBACK != arg);	/* A statsDB region should never participate in rollback */
+	if (DUMPABLE)
+		NEXTCH;				/* Bubble down till handled properly in mdb_condition_handler() */
+	if ((SUCCESS == SEVERITY) || (INFO == SEVERITY))
+		CONTINUE;			/* Keep going for non-error issues */
+	if (ERR_DRVLONGJMP != arg)
+	{	/* Need to reflect the current error to the syslog - First save message that got us here */
+		msglen = TREF(util_outptr) - TREF(util_outbuff_ptr);
+		assert(OUT_BUFF_SIZE > msglen);
+		memcpy(buffer, TREF(util_outbuff_ptr), msglen);
+		getzposition(&zpos);
+		/* Send whole thing to syslog */
+		send_msg_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_STATSDBERR, 4, zpos.str.len, zpos.str.addr, msglen, buffer);
+	}
+	UNWIND(NULL, NULL);			/* Return back to where ESTABLISH_NORET was done */
+}
diff --git a/sr_port/gvcst_kill.c b/sr_port/gvcst_kill.c
index 23465a4..b464ac0 100644
--- a/sr_port/gvcst_kill.c
+++ b/sr_port/gvcst_kill.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -18,10 +18,7 @@
 #include "gtm_stdio.h"
 #include "gtm_inet.h"	/* Required for gtmsource.h */
 
-#ifdef VMS
-#include <descrip.h> /* Required for gtmsource.h */
-#endif
-
+#include "gtmio.h"
 #include "cdb_sc.h"
 #include "gdsroot.h"
 #include "gdskill.h"
@@ -44,13 +41,12 @@
 #include "interlock.h"
 #include <rtnhdr.h>
 #include "stack_frame.h"
-#ifdef GTM_TRIGGER
-# include "gv_trigger.h"
-# include "gtm_trigger.h"
-# include "gv_trigger_protos.h"
-# include "mv_stent.h"
-# include "stringpool.h"
-#endif
+#include "gv_trigger.h"
+#include "gtm_trigger.h"
+#include "gv_trigger_protos.h"
+#include "mv_stent.h"
+#include "stringpool.h"
+#include "gtm_trigger_trc.h"
 #include "tp_frame.h"
 #include "tp_restart.h"
 
@@ -111,7 +107,7 @@ GBLREF	uint4			update_array_size; /* needed for the ENSURE_UPDATE_ARRAY_SPACE ma
 GBLREF	jnl_gbls_t		jgbl;
 GBLREF	boolean_t		donot_INVOKE_MUMTSTART;
 #endif
-UNIX_ONLY(GBLREF	boolean_t 		span_nodes_disallowed;)
+GBLREF	boolean_t 		span_nodes_disallowed;
 
 error_def(ERR_TPRETRY);
 error_def(ERR_GVKILLFAIL);
@@ -155,9 +151,15 @@ void	gvcst_kill(boolean_t do_subtree)
 		if (!spanstat)
 			return;
 	}
-	VMS_ONLY(assert(FALSE));
-#	ifdef UNIX
 	RTS_ERROR_IF_SN_DISALLOWED;
+#	ifdef DEBUG
+	/* ^%Y* should never be killed (op_gvkill/op_gvzwithdraw would have issued a ERR_PCTYRESERVED error in that case).
+	 * The only exception is if we are removing a ^%YGS record from the statsdb (caller "gvcst_remove_statsDB_linkage"
+	 * but in that case we would have reg->read_only set to FALSE for a statsdb region name. Account for that.
+	 */
+	assert((RESERVED_NAMESPACE_LEN > gv_currkey->end) || (0 != MEMCMP_LIT(gv_currkey->base, RESERVED_NAMESPACE))
+		|| (IS_STATSDB_REGNAME(gv_cur_region) && !gv_cur_region->read_only));
+#	endif
 	oldend = gv_currkey->end;
 	/* Almost certainly have a spanning node to zkill. So start a TP transaction to deal with it. */
 	if (!dollar_tlevel)
@@ -188,7 +190,6 @@ void	gvcst_kill(boolean_t do_subtree)
 		REVERT; /* remove our condition handler */
 	}
 	assert(save_dollar_tlevel == dollar_tlevel);
-#	endif
 }
 
 void	gvcst_kill2(boolean_t do_subtree, boolean_t *span_status, boolean_t killing_chunks)
@@ -457,7 +458,7 @@ void	gvcst_kill2(boolean_t do_subtree, boolean_t *span_status, boolean_t killing
 research:
 		if (gvt_root)
 		{
-#if defined(DEBUG) && defined(UNIX)
+			#if defined(DEBUG)
 			if (gtm_white_box_test_case_enabled && (WBTEST_ANTIFREEZE_GVKILLFAIL == gtm_white_box_test_case_number))
 			{
 				cdb_status = cdb_sc_blknumerr;
@@ -466,7 +467,7 @@ research:
 				 */
 				GOTO_RETRY(cdb_status, SKIP_ASSERT_TRUE);
 			}
-#endif
+			#endif
 			if (cdb_sc_normal != (cdb_status = gvcst_search(gv_currkey, NULL)))
 				GOTO_RETRY(cdb_status, SKIP_ASSERT_FALSE);
 			assert(gv_altkey->top == gv_currkey->top);
@@ -482,7 +483,6 @@ research:
 				base[++end] = KEY_DELIMITER;
 			} else
 			{
-#				ifdef UNIX
 				target_key_size = gv_currkey->end + 1;
 				bh = &gv_target->hist.h[0];
 				key_exists = (target_key_size == bh->curr_rec.match);
@@ -525,7 +525,6 @@ research:
 						}
 					}
 				}
-#				endif
 				if (killing_chunks)
 				{	/* Second call of gvcst_kill2 within TP transaction in gvcst_kill
 					 * Kill all hidden subscripts...
diff --git a/sr_port/gvcst_protos.h b/sr_port/gvcst_protos.h
index dc3f312..7d41934 100755
--- a/sr_port/gvcst_protos.h
+++ b/sr_port/gvcst_protos.h
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2004-2015 Fidelity National Information 	*
+ * Copyright (c) 2004-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -15,25 +15,30 @@
 #ifndef GVCST_PROTOS_H_INCLUDED
 #define GVCST_PROTOS_H_INCLUDED
 
+#define		OK_TO_BYPASS_FALSE	FALSE
+#define		OK_TO_BYPASS_TRUE	TRUE
+#define		DO_STATSDB_INIT_FALSE	FALSE
+#define		DO_STATSDB_INIT_TRUE	TRUE
+
 void		db_auto_upgrade(gd_region *reg);
-#ifdef VMS
-void		db_init(gd_region *reg, sgmnt_data_ptr_t tsd);
-#else
-int		db_init(gd_region *reg);
+int		db_init(gd_region *reg, boolean_t ok_to_bypass);
 void		db_init_err_cleanup(boolean_t retry_dbinit);
 void		gvcst_redo_root_search(void);
-#endif
 gd_region	*dbfilopn (gd_region *reg);
 void		dbsecspc(gd_region *reg, sgmnt_data_ptr_t csd, gtm_uint64_t *sec_size);
+unsigned char	gvcst_cre_autoDB(gd_region *reg);
 mint		gvcst_data(void);
 mint		gvcst_data2(void);
 enum cdb_sc	gvcst_dataget(mint *dollar_data, mval *val);
 enum cdb_sc	gvcst_dataget2(mint *dollar_data, mval *val, unsigned char *sn_ptr);
+void		gvcst_deferred_init_statsDB(void);
+void		gvcst_set_statsdb_fname(sgmnt_data_ptr_t csd, gd_region *baseDBreg, char *statsdb_fname, uint4 *statsdb_fname_len);
 boolean_t	gvcst_gblmod(mval *v);
 boolean_t	gvcst_get(mval *v);
 boolean_t	gvcst_get2(mval *v, unsigned char *sn_ptr);
 void		gvcst_incr(mval *increment, mval *result);
 void		gvcst_init(gd_region *greg);
+void		gvcst_init_statsDB(gd_region *baseDBreg, boolean_t do_statsdb_init);
 void		gvcst_kill(boolean_t do_subtree);
 void		gvcst_kill2(boolean_t do_subtree, boolean_t *span_status, boolean_t killing_chunks);
 enum cdb_sc	gvcst_lftsib(srch_hist *full_hist);
@@ -45,6 +50,9 @@ boolean_t	gvcst_query(void);
 boolean_t	gvcst_query2(void);
 boolean_t	gvcst_queryget(mval *val);
 boolean_t	gvcst_queryget2(mval *val, unsigned char *sn_ptr);
+void		gvcst_remove_statsDB_linkage(gd_region *baseDBreg);
+void		gvcst_remove_statsDB_linkage_all(void);
+void		gvcst_remove_statsDB_linkage_wrapper(gd_region *baseDBreg, gd_region *statsDBreg);
 enum cdb_sc	gvcst_root_search(boolean_t donot_restart);
 enum cdb_sc	gvcst_rtsib(srch_hist *full_hist, int level);
 enum cdb_sc	gvcst_search(gv_key *pKey, srch_hist *pHist);
@@ -53,7 +61,6 @@ enum cdb_sc	gvcst_search_blk_expand_prevkey(gv_key *pKey, srch_blk_status *pStat
 enum cdb_sc	gvcst_search_tail(gv_key *pKey, srch_blk_status *pStat, gv_key *pOldKey);
 enum cdb_sc	gvcst_search_tail_expand_prevkey(gv_key *pKey, srch_blk_status *pStat, gv_key *pOldKey);
 
-#ifdef UNIX
 mint		gvcst_spr_data(void);
 void		gvcst_spr_kill(void);
 boolean_t	gvcst_spr_order(void);
@@ -66,10 +73,9 @@ boolean_t	gvcst_spr_queryget(mval *cumul_val);
 	assert(NULL != GVNH_REG->gvspan);		\
 	STATEMENT;					\
 }
-#else
-# define INVOKE_GVCST_SPR_XXX(GVNH_REG, STMT)	assert(FALSE)
-#endif
 
+void		gvcst_statshare_optin(void);
+void		gvcst_statshare_optout(void);
 void		gvcst_tp_init(gd_region *);
 boolean_t	gvcst_zprevious(void);
 boolean_t	gvcst_zprevious2(void);
@@ -80,18 +86,19 @@ boolean_t	gvcst_zprevious2(void);
 #define DG_DATAGET	4
 #define DG_GETSNDATA	5
 
-#define	INCREMENT_GD_TARG_TN(LCL_TN)								\
-{												\
-	(TREF(gd_targ_tn))++;									\
-	LCL_TN = TREF(gd_targ_tn);								\
-	if (0 == LCL_TN)									\
-	{	/* We have wrapped around after 2**64 increments. Reset gd_targ_reg_array to	\
-		 * avoid incorrect matches of tn (the pre-wrapped tn with the post-wrapped tn).	\
-		 */										\
-		memset(TREF(gd_targ_reg_array), 0, TREF(gd_targ_reg_array_size));		\
-		LCL_TN++;									\
-		TREF(gd_targ_tn) = LCL_TN;							\
-	}											\
+#define	INCREMENT_GD_TARG_TN(LCL_TN)									\
+{													\
+	(TREF(gd_targ_tn))++;										\
+	LCL_TN = TREF(gd_targ_tn);									\
+	if (0 == LCL_TN)										\
+	{	/* We have wrapped around after 2**64 increments. Reset gd_targ_reg_array to		\
+		 * avoid incorrect matches of tn (the pre-wrapped tn with the post-wrapped tn).		\
+		 */											\
+	 	assert(SIZEOF(trans_num) == SIZEOF((TREF(gd_targ_reg_array))[0]));			\
+		memset(TREF(gd_targ_reg_array), 0, TREF(gd_targ_reg_array_size) * SIZEOF(trans_num));	\
+		LCL_TN++;										\
+		TREF(gd_targ_tn) = LCL_TN;								\
+	}												\
 }
 
 GBLREF	boolean_t	gv_play_duplicate_kills;
@@ -111,4 +118,5 @@ GBLREF	boolean_t	gv_play_duplicate_kills;
 			|| jgbl.mur_options_forward)									\
 	(GVT->root || (gv_play_duplicate_kills GTMTRIG_ONLY(&& IS_EXPLICIT_UPDATE_NOASSERT)))				\
 )
+
 #endif
diff --git a/sr_port/gvcst_put.c b/sr_port/gvcst_put.c
index b30af63..9a18afc 100644
--- a/sr_port/gvcst_put.c
+++ b/sr_port/gvcst_put.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -18,10 +18,7 @@
 #include "gtm_string.h"
 #include "gtm_inet.h"	/* Required for gtmsource.h */
 
-#ifdef VMS
-#include <descrip.h> /* Required for gtmsource.h */
-#endif
-
+#include "gtmio.h"
 #include "gdsroot.h"
 #include "gdskill.h"
 #include "gdsblk.h"
@@ -45,13 +42,12 @@
 #include <rtnhdr.h>
 #include "stack_frame.h"
 #include "mv_stent.h"
-#ifdef GTM_TRIGGER
-# include "gv_trigger.h"
-# include "gtm_trigger.h"
-# include "gv_trigger_protos.h"
-# include "subscript.h"
-# include "stringpool.h"
-#endif
+#include "gv_trigger.h"
+#include "gtm_trigger.h"
+#include "gv_trigger_protos.h"
+#include "subscript.h"
+#include "stringpool.h"
+#include "gtm_trigger_trc.h"
 #include "tp_frame.h"
 #include "tp_restart.h"
 
@@ -73,9 +69,7 @@
 #include "have_crit.h"
 #include "error.h"
 #include "gtmimagename.h" /* for spanning nodes */
-#ifdef UNIX
 #include "preemptive_db_clnup.h"
-#endif
 #include "spec_type.h"
 #include "collseq.h"
 #ifdef DEBUG
@@ -141,8 +135,8 @@ GBLREF	mval			increment_delta_mval;
 GBLREF	sgm_info		*sgm_info_ptr;
 GBLREF	sgmnt_addrs		*cs_addrs;
 GBLREF	sgmnt_data_ptr_t	cs_data;
-UNIX_ONLY(GBLREF	enum gtmImageTypes	image_type;)
-UNIX_ONLY(GBLREF	boolean_t 		span_nodes_disallowed;)
+GBLREF	enum gtmImageTypes	image_type;
+GBLREF	boolean_t 		span_nodes_disallowed;
 
 error_def(ERR_DBROLLEDBACK);
 error_def(ERR_GVINCRISOLATION);
@@ -166,10 +160,11 @@ error_def(ERR_UNIMPLOP);
 {																\
 	if (dollar_tlevel)													\
 		ADD_TO_GVT_TP_LIST(GVT, RESET_FIRST_TP_SRCH_STATUS_FALSE); /* note: macro updates read_local_tn if necessary */	\
-	if (VMS_ONLY(gv_currkey->end + 1 + SIZEOF(rec_hdr) +) value.len > gv_cur_region->max_rec_size)				\
+	if (value.len > gv_cur_region->max_rec_size)										\
 	{															\
 		if (0 == (end = format_targ_key(buff, MAX_ZWR_KEY_SZ, gv_currkey, TRUE)))					\
 			end = &buff[MAX_ZWR_KEY_SZ - 1];									\
+		gv_currkey->end = 0;												\
 		rts_error_csa(CSA_ARG(cs_addrs) VARLSTCNT(10) ERR_REC2BIG, 4, VMS_ONLY(gv_currkey->end + 1 + SIZEOF(rec_hdr) +)	\
 			  value.len, (int4)gv_cur_region->max_rec_size,								\
 			  REG_LEN_STR(gv_cur_region), ERR_GVIS, 2, end - buff, buff);						\
@@ -287,8 +282,7 @@ void	gvcst_put(mval *val)
 	parms.enable_trigger_read_and_fire = TRUE;
 	parms.enable_jnl_format = TRUE;
 	lcl_root = gv_target->root;
-	VMS_ONLY(gvcst_put2(val, &parms));
-#	ifdef UNIX /* deal with possibility of spanning nodes */
+	/* deal with possibility of spanning nodes */
 	DEBUG_ONLY(save_dollar_tlevel = dollar_tlevel);
 	fits = RECORD_FITS_IN_A_BLOCK(val, gv_currkey, cs_data->blk_size, parms.blk_reserved_bytes);
 	save_in_gvcst_incr = in_gvcst_incr;
@@ -418,7 +412,6 @@ void	gvcst_put(mval *val)
 		REVERT; /* remove our condition handler */
 	}
 	assert(save_dollar_tlevel == dollar_tlevel);
-#	endif /* ifdef UNIX */
 }
 
 void	gvcst_put2(mval *val, span_parms *parms)
@@ -429,14 +422,14 @@ void	gvcst_put2(mval *val, span_parms *parms)
 	int4			blk_size, blk_fill_size, blk_reserved_bytes;
 	const uint4		zeroes4byte = 0;
 	const gtm_uint64_t	zeroes8byte = 0;
-	boolean_t		jnl_format_done, is_dummy, needfmtjnl, fits, lcl_span_status;
+	boolean_t		jnl_format_done, is_dummy, needfmtjnl, fits, lcl_span_status, want_root_search = FALSE;
 	blk_segment		*bs1, *bs_ptr, *new_blk_bs;
 	block_id		allocation_clue, tp_root, gvt_for_root, blk_num, last_split_blk_num[MAX_BT_DEPTH];
 	block_index		left_hand_index, ins_chain_index, root_blk_cw_index, next_blk_index;
 	block_offset		next_offset, first_offset, ins_off1, ins_off2, old_curr_chain_next_off;
 	cw_set_element		*cse, *cse_new, *old_cse;
 	gv_namehead		*save_targ, *split_targ, *dir_tree;
-	enum cdb_sc		status;
+	enum cdb_sc		status, status2;
 	gv_key			*temp_key, *src_key;
 	static gv_key		*gv_altkey2;
 	uchar_ptr_t		subrec_ptr;
@@ -469,6 +462,15 @@ void	gvcst_put2(mval *val, span_parms *parms)
 	sgm_info		*si;
 	uint4			nodeflags;
 	boolean_t		write_logical_jnlrecs, can_write_logical_jnlrecs, blk_match, is_split_dir_left;
+	boolean_t		split_to_right;	/* FALSE if a block split creates a new block on the left of the split point.
+						 *	In this case, a "t_create" is needed for the new block on the left
+						 *	and a "t_write" is needed for the current block (right side of split).
+						 * TRUE if a block split creates a new block on the right of the split point.
+						 *	In this case, the pre-split block is untouched (i.e. no "t_write" needed)
+						 *	and serves as the left side of the split AND a new block is created on the
+						 *	right ("t_create" is needed for that).
+						 */
+	boolean_t		prev_split_to_right; /* copy of "split_to_right" after child level split (used in parent split) */
 	int			split_depth;
 	mval			*ja_val;
 	int			rc;
@@ -582,6 +584,14 @@ void	gvcst_put2(mval *val, span_parms *parms)
 		skip_hasht_read = FALSE;
 	)
 	assert(('\0' != gv_currkey->base[0]) && gv_currkey->end);
+#	ifdef DEBUG
+	/* ^%Y* should never be set (op_gvput would have issued a ERR_PCTYRESERVED error in that case).
+	 * The only exception is if we are adding a ^%YGS record into the statsdb from "gvcst_init_statsDB" but in that
+	 * case we would have reg->read_only set to FALSE for a statsdb region name. Account for that.
+	 */
+	assert((RESERVED_NAMESPACE_LEN > gv_currkey->end) || (0 != MEMCMP_LIT(gv_currkey->base, RESERVED_NAMESPACE))
+		|| (IS_STATSDB_REGNAME(gv_cur_region) && !gv_cur_region->read_only && csa->orig_read_write));
+#	endif
 	DBG_CHECK_GVTARGET_GVCURRKEY_IN_SYNC(CHECK_CSA_TRUE);
 	/* this needs to be initialized before any code that does a "goto retry" since this gets used there */
 	save_targ = gv_target;
@@ -669,6 +679,15 @@ tn_restart:
 			}
 		}
 	}
+	REDO_ROOT_SEARCH_IF_NEEDED(want_root_search, status2);
+	if (cdb_sc_normal != status2)
+	{	/* gvcst_root_search invoked from REDO_ROOT_SEARCH_IF_NEEDED ended up with a restart situation but did not
+		 * actually invoke t_retry. Instead, it returned control back to us asking us to restart.
+		 * Cannot enable assert (which has an assert about t_tries < CDB_STAGNATE) because it is possible for us
+		 * to get cdb_sc_gvtrootnonzero restart when t_tries == CDB_STAGNATE. Pass GOTO_RETRY parameter accordingly.
+		 */
+		GOTO_RETRY;
+	}
 #	endif
 	assert(csd == cs_data);	/* assert csd is in sync with cs_data even if there were MM db file extensions */
 	si = sgm_info_ptr;	/* Cannot be moved before GVTR_INIT_AND_TPWRAP_IF_NEEDED macro since we could enter gvcst_put
@@ -750,6 +769,26 @@ tn_restart:
 			}
 			assert(0 == gv_target->root);
 			gv_target->root = tp_root;
+			if (tp_root)
+			{	/* root block was 0 at start of this function but became non-zero midway.
+				 * Need to do a "gvcst_root_search" to confirm all error scenarios (e.g. ACTCOLLMISMTCH)
+				 * are taken care of. Handle that by signaling a restart. The "t_retry" call
+				 * will take care of doing the GVCST_ROOT_SEARCH in case we are not in TP.
+				 * If we are in an explicit TP, a "tp_restart" will take care of redoing the transaction
+				 * which will redo the GVCST_ROOT_SEARCH (as part of the op_gvname before invoking
+				 * op_gvput/gvcst_put/gvcst_pu2 again). If we are in an implicit TP (possible with
+				 * triggers), then control will stay inside "gvcst_put2" so we need to explicitly do
+				 * the "gvcst_root_search". But we can only do a "gvcst_redo_root_search" and that too
+				 * after the "t_retry" happened and at the beginning of the next try. This is done through
+				 * setting "want_root_search" to TRUE at the end of the current try and using this variable
+				 * to invoke the "REDO_ROOT_SEARCH_IF_NEEDED" macro at the beginning of the next try.
+				 * The reason we cannot do the REDO_ROOT_SEARCH_IF_NEEDED until after the
+				 * GVTR_INIT_AND_TPWRAP_IF_NEEDED macro is invoked in the next try is because that macro
+				 * expects no other db activity to have happened until it is done.
+				 */
+				status = cdb_sc_gvtrootnonzero;
+				GOTO_RETRY;
+			}
 		}
 	}
 	blk_reserved_size = blk_size - blk_reserved_bytes;
@@ -849,7 +888,7 @@ tn_restart:
 			 */
 			no_4byte_collhdr = 0;
 		} else
-#		if defined(DEBUG) && defined(UNIX)
+#		if defined(DEBUG)
 		{	/* Starting V6.1, newly created nodes in the directory tree (DT) leaf block have a 4-byte collation header
 			 * unconditionally but in order to test the code below for correctness on pre-existing DT leaf block
 			 * records which might not contain a 4-byte collation header, we randomly enable the 4-byte collation
@@ -867,12 +906,8 @@ tn_restart:
 				no_4byte_collhdr = MV_FORCE_INT(random_mval);
 			}
 		}
-#		elif defined(UNIX)
-			no_4byte_collhdr = 0;	/* for Unix pro, add the 4-byte collation header even for "act" = 0 */
-#		elif defined(VMS)
-			no_4byte_collhdr = 1;	/* for VMS (pro and dbg) unconditionally disable the 4-byte collation header.
-						 * as otherwise it means fixing test reference files to account for new 4-bytes
-						 */
+#		else
+			no_4byte_collhdr = 0;	/* for pro, add the 4-byte collation header even for "act" = 0 */
 #		endif
 		if (no_4byte_collhdr)
 		{	/* No 4-byte collation header */
@@ -914,8 +949,9 @@ tn_restart:
 				GOTO_RETRY;
 		}
 #		endif
-#		if defined(DEBUG) && defined(UNIX)
-		if (gtm_white_box_test_case_enabled && (WBTEST_ANTIFREEZE_GVINCRPUTFAIL == gtm_white_box_test_case_number))
+#		if defined(DEBUG)
+		if (gtm_white_box_test_case_enabled && (WBTEST_ANTIFREEZE_GVINCRPUTFAIL == gtm_white_box_test_case_number)
+			&& !IS_STATSDB_REG(gv_cur_region))
 		{
 			status = cdb_sc_blknumerr;
 			GOTO_RETRY;
@@ -926,7 +962,6 @@ tn_restart:
 		target_key_size = gv_currkey->end + 1;
 		bh = &gv_target->hist.h[0];
 		key_exists = (target_key_size == bh->curr_rec.match);
-#		ifdef UNIX
 		if (key_exists)
 		{	/* check for spanning node dummy value: a single zero byte */
 			rp = (rec_hdr_ptr_t)((sm_uc_ptr_t)bh->buffaddr + bh->curr_rec.offset);
@@ -977,7 +1012,6 @@ tn_restart:
 				return;
 			}
 		}
-#		endif
 		if (is_dollar_incr)
 		{
 			if (key_exists)
@@ -1016,6 +1050,7 @@ tn_restart:
 	 * --------------------------------------------------------------------------------------------
 	 */
 	need_extra_block_split = FALSE; /* Assume we don't require an additional block split (most common case) */
+	split_to_right = FALSE;
 	duplicate_set = FALSE; /* Assume this is NOT a duplicate set (most common case) */
 	split_depth = 0;
 	split_targ = gv_target;
@@ -1168,6 +1203,7 @@ tn_restart:
 		 * In those cases, we will go into the non-block-split case but eventually we will restart.
 		 */
 		assert((new_blk_size >= new_blk_size_single) || (CDB_STAGNATE > t_tries));
+		prev_split_to_right = split_to_right;	/* note down "split_to_right" corresponding to one lower level */
 		if ((new_blk_size <= blk_fill_size) || (new_blk_size <= new_blk_size_single))
 		{	/* Update can be done without overflowing the block's fillfactor OR the record to be updated
 			 * is the only record in the new block. Do not split block in either case. This means we might
@@ -1175,8 +1211,11 @@ tn_restart:
 			 * but in this case we are guaranteed the block has room for the current reserved bytes.
 			 */
 			if (no_pointers)	/* level zero (normal) data block: no deferred pointer chains */
+			{
+				assert(!prev_split_to_right);
 				ins_chain_offset = 0;
-			else			/* index or directory level block */
+				assert(0 == ins_chain_index);
+			} else			/* index or directory level block */
 			{	/* In case a new GVT is being created, it is possible 4-byte collation information is being
 				 * added to the leaf level directory tree record for this global name (after the 4-byte block_id).
 				 * Irrespective of the collation header, make sure ins_chain_offset points to the block_id part.
@@ -1210,20 +1249,39 @@ tn_restart:
 					if (new_rec)
 					{
 						BLK_ADDR(next_rec_hdr, SIZEOF(rec_hdr), rec_hdr);
-						next_rec_hdr->rsiz = rec_size - next_rec_shrink;
+						tmp_rsiz = rec_size - next_rec_shrink;
+						next_rec_hdr->rsiz = tmp_rsiz;
 						SET_CMPC(next_rec_hdr, curr_rec_match);
 						BLK_SEG(bs_ptr, (sm_uc_ptr_t)next_rec_hdr, SIZEOF(rec_hdr));
 						next_rec_shrink += SIZEOF(rec_hdr);
 					}
-					if (n >= next_rec_shrink)
-					{
-						BLK_SEG(bs_ptr, (sm_uc_ptr_t)rp + next_rec_shrink, n - next_rec_shrink);
-					} else
+					if (n < next_rec_shrink)
 					{
 						assert(CDB_STAGNATE > t_tries);
 						status = cdb_sc_mkblk;
 						GOTO_RETRY;
 					}
+					BLK_SEG(bs_ptr, (sm_uc_ptr_t)rp + next_rec_shrink, n - next_rec_shrink);
+					if (prev_split_to_right)
+					{	/* This is an index block where a lower level block had a block split
+						 * to the right. The newly inserted record will be added before the
+						 * split point at this level. But the new block # created at the lower
+						 * level will be inserted in next_rec and the newly inserted record
+						 * will inherit the block number already there in "next_rec". Do those
+						 * adjustments here.
+						 */
+						assert(new_rec);	/* this is to ensure "tmp_rsiz" would have been set above
+									 * and that "rp" & rec_size are still in sync.
+									 */
+						ins_chain_offset += tmp_rsiz;
+						assert(value.len);	/* so "va" would be initialized by the
+									 * "BLK_ADDR(va, ...)" call above.
+									 */
+						assert(((sm_uc_ptr_t)rp + rec_size) <= (buffaddr + cur_blk_size));
+							/* or else we would have restarted above with "cdb_sc_mkblk" */
+						assert(SIZEOF(block_id) == value.len);
+						memcpy(va, ((sm_uc_ptr_t)rp + rec_size) - value.len, value.len);
+					}
 				}
 			} else
 			{	/* With GT.M TRIGGERS, it is not clear how the RC protocol will work. The below assert is to
@@ -1258,11 +1316,26 @@ tn_restart:
 				GOTO_RETRY;
 			}
 			assert(bs1[0].len <= blk_reserved_size); /* Assert that new block has space for reserved bytes */
+			/* If we had a block split to right in a lower level, we need to disable the indexmod optimization
+			 * (see gdscc.h for a description of that optimization) at this level. Below is an example describing why.
+			 * Let us say Blk6 is a level-1 index block with a *-record pointing to a level-0 block Blk5 that has say
+			 * a record ^a(1). Let us say process P1 does a SET of ^a(2) to a value too big to fit in Blk5. And
+			 * the split_to_right scheme kicks in placing this record in a new block Blk7 (right sibling of Blk5).
+			 * Just before P1 commits this, let us say another process P2 does a SET of ^a(3) to a value that is
+			 * small enough to fit in Blk5. Since P1 has not yet committed its changes, Blk6 still contains a *-record
+			 * and so P2 descends that into Blk5 and finds ^a(3) can fit in and computes its update array based on that.
+			 * When P2 goes to commit time though, it finds Blk6 changed (by P1's commit). But P1 did not touch Blk5
+			 * because it used the split_to_right scheme. Therefore P2 incorrectly goes ahead with the commit even
+			 * though the index block (Blk6) has changed. This is because of the indexmod optimization. This will result
+			 * in Blk5 containins ^a(1),^a(3) and a right sibling block Blk7 containing ^a(2). Effectively a
+			 * DBKEYGTIND integrity error. Hence the GDS_WRITE_KILLTN usage below.
+			 */
 			cse = t_write(bh, (unsigned char *)bs1, ins_chain_offset, ins_chain_index, bh_level,
-				FALSE, FALSE, GDS_WRITE_PLAIN);
+						FALSE, FALSE, (!prev_split_to_right ? GDS_WRITE_PLAIN : GDS_WRITE_KILLTN));
 			assert(!dollar_tlevel || !cse->high_tlevel);
 			if ((0 != ins_chain_offset) && (NULL != cse) && (0 != cse->first_off))
 			{	/* formerly tp_offset_chain - inserts a new_entry in the chain */
+				assert(dollar_tlevel && !prev_split_to_right);
 				assert((NULL != cse->new_buff) || horiz_growth && cse->low_tlevel->new_buff
 									&& (buffaddr == cse->low_tlevel->new_buff));
 				assert(0 == cse->next_off);
@@ -1422,6 +1495,7 @@ tn_restart:
 				 * We use that as the heuristic to identify the direction of data loading and do the
 				 * splits accordingly for future updates.
 				 */
+				assert(!level_0 || !IS_STATSDB_CSA(csa));
 				last_split_dir = (enum split_dir)gv_target->last_split_direction[bh_level];
 				if (NEWREC_DIR_FORCED == last_split_dir)
 				{	/* dont have prior information to use heuristic. choose whichever side is less full.
@@ -1483,49 +1557,92 @@ tn_restart:
 				new_rec_goes_to_right = (NEWREC_DIR_RIGHT == last_split_dir);
 			}
 			last_split_direction[bh_level] = (char)last_split_dir;
+			assert(!prev_split_to_right || !level_0);
 			if (new_rec_goes_to_right)
-			{	/* Left side of this block will be split off into a new block.
-				 * The new record and the right side of this block will remain in this block.
-				 */
-				/* prepare new block */
-				BLK_INIT(bs_ptr, bs1);
-				if (level_0)
-				{
-					BLK_SEG(bs_ptr, buffaddr + SIZEOF(blk_hdr), curr_rec_offset - SIZEOF(blk_hdr));
+			{
+				if (!new_rec || (new_blk_size_r != new_blk_size_single) || dollar_tlevel)
+				{	/* Left side of this block will be split off into a new block.
+					 * The new record and the right side of this block will remain in this block.
+					 */
+					split_to_right = FALSE;
+					/* Prepare new (left-side) block */
+					BLK_INIT(bs_ptr, bs1);
+					if (level_0)
+					{	/* If this is a statsdb, it means we are potentially about to move an existing
+						 * leaf-level ^%YGS node from one block to another (a no-no). Assert accordingly.
+						 */
+#						ifdef DEBUG
+						if (IS_STATSDB_CSA(csa))
+							TREF(donot_commit) |= DONOTCOMMIT_GVCST_PUT_SPLIT_TO_RIGHT;
+#						endif
+						BLK_SEG(bs_ptr, buffaddr + SIZEOF(blk_hdr), curr_rec_offset - SIZEOF(blk_hdr));
+					} else
+					{	/* for index records, the record before the split becomes a new *-key */
+						/* Note:  If the block split was caused by our appending the new record
+						 * to the end of the block, this code causes the record PRIOR to the
+						 * current *-key to become the new *-key.
+						 */
+						BLK_SEG(bs_ptr, buffaddr + SIZEOF(blk_hdr), prev_rec_offset - SIZEOF(blk_hdr));
+						BLK_ADDR(new_star_hdr, SIZEOF(rec_hdr), rec_hdr);
+						new_star_hdr->rsiz = BSTAR_REC_SIZE;
+						SET_CMPC(new_star_hdr, 0);
+						BLK_SEG(bs_ptr, (sm_uc_ptr_t)new_star_hdr, SIZEOF(rec_hdr));
+						BLK_SEG(bs_ptr, (sm_uc_ptr_t)rp - SIZEOF(block_id), SIZEOF(block_id));
+					}
+					new_blk_bs = bs1;
+					if (0 == BLK_FINI(bs_ptr, bs1))
+					{
+						assert(CDB_STAGNATE > t_tries);
+						status = cdb_sc_mkblk;
+						GOTO_RETRY;
+					}
+					/* We want to assert that the left block has enough space for reserved bytes but
+					 * it is possible that it DOES NOT have enough space for reserved bytes if the pre-split
+					 * block was previously populated with a very low reserved bytes setting and if the current
+					 * reserved bytes setting is much higher than what the chosen split point would free up.
+					 * This is an issue waiting to be fixed by GTM-6522. Until then the following assert
+					 * has to remain commented out.
+					 *
+					 * assert(bs1[0].len <= blk_reserved_size);
+					 */
+					ins_chain_offset = no_pointers
+								? 0 : (int)(SIZEOF(blk_hdr) + SIZEOF(rec_hdr) + target_key_size);
+					left_hand_offset = left_hand_index = 0;
+					/* Prepare the right-side block (is an existing block) */
+					BLK_INIT(bs_ptr, bs1);
 				} else
-				{	/* for index records, the record before the split becomes a new *-key */
-					/* Note:  If the block split was caused by our appending the new record
-					 * to the end of the block, this code causes the record PRIOR to the
-					 * current *-key to become the new *-key.
+				{	/* The to-be inserted key is the only one on the right side and is non-existent.
+					 * No point moving all the current content of the existing block into a new left side block
+					 * and inserting the new record in the current block. It is less node motion to create
+					 * a new block and insert the new record there and leave the current block untouched.
+					 * Note that this is necessary for statsDB where a ^%YGS node once added in a particular
+					 * block offset is assumed to stay there irrespective of block splits in surrounding
+					 * nodes/blocks by other concurrent processes.
 					 */
-					BLK_SEG(bs_ptr, buffaddr + SIZEOF(blk_hdr), prev_rec_offset - SIZEOF(blk_hdr));
-					BLK_ADDR(new_star_hdr, SIZEOF(rec_hdr), rec_hdr);
-					new_star_hdr->rsiz = BSTAR_REC_SIZE;
-					SET_CMPC(new_star_hdr, 0);
-					BLK_SEG(bs_ptr, (sm_uc_ptr_t)new_star_hdr, SIZEOF(rec_hdr));
-					BLK_SEG(bs_ptr, (sm_uc_ptr_t)rp - SIZEOF(block_id), SIZEOF(block_id));
-				}
-				new_blk_bs = bs1;
-				if (0 == BLK_FINI(bs_ptr,bs1))
-				{
-					assert(CDB_STAGNATE > t_tries);
-					status = cdb_sc_mkblk;
-					GOTO_RETRY;
+					split_to_right = TRUE;
+					/* Since we come here only if "new_blk_size_r == new_blk_size_single", it is not possible
+					 * to come here in case of an index block since there will always be a *-key in that
+					 * case and that will be to the right of the newly inserted record so "new_blk_size_r"
+					 * would always be greater than "new_blk_size_single" in that case. But in case of a
+					 * restartable situation it is possible to come here. Assert accordingly using the
+					 * TREF(donot_commit) scheme.
+					 */
+#					ifdef DEBUG
+					if (!level_0)
+						TREF(donot_commit) |= DONOTCOMMIT_GVCST_PUT_SPLIT_TO_RIGHT;
+#					endif
+					/* Since the "t_create" call (for the new block) below relies on "left_hand_index" and
+					 * "left_hand_offset" to be set, initialize them even though the newly created block
+					 * is actually the right side block (not the left side).
+					 */
+					left_hand_offset = no_pointers
+								? 0 : (int)(SIZEOF(blk_hdr) + SIZEOF(rec_hdr) + target_key_size);
+					left_hand_index = ins_chain_index;
+					ins_chain_index = ins_chain_offset = 0;
+					/* Prepare the right-side block (is a newly created block) */
+					BLK_INIT(bs_ptr, bs1);
+					new_blk_bs = bs1;
 				}
-				/* We want to assert that the left block has enough space for reserved bytes but
-				 * it is possible that it DOES NOT have enough space for reserved bytes if the pre-split
-				 * block was previously populated with a very low reserved bytes setting and if the current
-				 * reserved bytes setting is much higher than what the chosen split point would free up.
-				 * This is an issue waiting to be fixed by C9K01-003221. Until then the following assert
-				 * has to remain commented out.
-				 *
-				 * assert(bs1[0].len <= blk_reserved_size);
-				 */
-				/* prepare the existing block */
-				BLK_INIT(bs_ptr, bs1);
-				ins_chain_offset = no_pointers ? 0 : (int)(SIZEOF(blk_hdr) + SIZEOF(rec_hdr) + target_key_size);
-				left_hand_offset = left_hand_index
-						 = 0;
 				if (!new_rec)
 					rp = (rec_hdr_ptr_t)((sm_uc_ptr_t)rp + rec_size);
 				BLK_ADDR(curr_rec_hdr, SIZEOF(rec_hdr), rec_hdr);
@@ -1543,9 +1660,11 @@ tn_restart:
 				}
 				if (buffaddr + cur_blk_size > (sm_uc_ptr_t)rp)
 				{
+					assert(!split_to_right);
 					BLK_ADDR(next_rec_hdr, SIZEOF(rec_hdr), rec_hdr);
-					GET_USHORT(next_rec_hdr->rsiz, &rp->rsiz);
-					next_rec_hdr->rsiz -= next_rec_shrink;
+					GET_USHORT(tmp_rsiz, &rp->rsiz);
+					tmp_rsiz -= next_rec_shrink;
+					next_rec_hdr->rsiz = tmp_rsiz;
 					SET_CMPC(next_rec_hdr, new_rec ? curr_rec_match : EVAL_CMPC(rp));
 					BLK_SEG(bs_ptr, (sm_uc_ptr_t)next_rec_hdr, SIZEOF(rec_hdr));
 					next_rec_shrink += SIZEOF(rec_hdr);
@@ -1557,6 +1676,18 @@ tn_restart:
 						GOTO_RETRY;
 					}
 					BLK_SEG(bs_ptr, (sm_uc_ptr_t)rp + next_rec_shrink, n);
+					if (prev_split_to_right)
+					{	/* Do block# adjustment like done above (search for "if (split_to_right)") */
+						assert(new_rec);	/* ensure "rp" & rec_size are still in sync */
+						ins_chain_offset += tmp_rsiz;
+						assert(value.len);	/* so "va" would be initialized by the
+									 * "BLK_ADDR(va, ...)" call above.
+									 */
+						assert(((sm_uc_ptr_t)rp + rec_size) <= (buffaddr + cur_blk_size));
+							/* or else we would have restarted above with "cdb_sc_mkblk" */
+						assert(SIZEOF(block_id) == value.len);
+						memcpy(va, ((sm_uc_ptr_t)rp + rec_size) - value.len, value.len);
+					}
 				}
 				if (0 == BLK_FINI(bs_ptr, bs1))
 				{
@@ -1564,7 +1695,8 @@ tn_restart:
 					status = cdb_sc_mkblk;
 					GOTO_RETRY;
 				}
-				assert(bs1[0].len <= blk_reserved_size); /* Assert that right block has space for reserved bytes */
+				/* Assert that right block has space for reserved bytes */
+				assert(bs1[0].len <= blk_reserved_size);
 				assert(gv_altkey->top == gv_currkey->top);
 				assert(gv_altkey->end < gv_altkey->top);
 				if (temp_key != gv_altkey)
@@ -1583,6 +1715,7 @@ tn_restart:
 					GOTO_RETRY;
 			} else
 			{	/* Insert in left hand (new) block */
+				split_to_right = FALSE;
 				if (!level_0)
 				{	/* In case of an index block, as long as the current record is not a *-record
 					 * (i.e. last record in the block) and copying an extra record into the left
@@ -1595,10 +1728,8 @@ tn_restart:
 					copy_extra_record = ((BSTAR_REC_SIZE != rec_size)
 									&& ((new_blk_size_l + BSTAR_REC_SIZE) <= blk_fill_size));
 				} else
-				{
 					copy_extra_record = ((0 == prev_rec_offset) && (NEWREC_DIR_LEFT == last_split_dir)
 								&& new_rec && (SIZEOF(blk_hdr) < cur_blk_size));
-				}
 				BLK_INIT(bs_ptr, bs1);
 				if (no_pointers)
 					left_hand_offset = 0;
@@ -1684,6 +1815,15 @@ tn_restart:
 						BLK_ADDR(va, value.len, char);
 						memcpy(va, value.addr, value.len);
 						BLK_SEG(bs_ptr, (unsigned char *)va, value.len);
+						/* Do "prev_split_to_right" processing for "copy_extra_record" case */
+						if (prev_split_to_right)
+						{	/* Do block# adjustment like done above (searchstr "if (split_to_right)") */
+							left_hand_offset += BSTAR_REC_SIZE;
+							assert(((sm_uc_ptr_t)rp + rec_size) <= (buffaddr + cur_blk_size));
+								/* or else we would have restarted above with "cdb_sc_mkblk" */
+							assert(SIZEOF(block_id) == value.len);
+							memcpy(va, ((sm_uc_ptr_t)rp + rec_size) - value.len, value.len);
+						}
 						new_blk_size_l += BSTAR_REC_SIZE;
 					} else
 						new_blk_size_l = curr_rec_offset + BSTAR_REC_SIZE;
@@ -1692,8 +1832,24 @@ tn_restart:
 					SET_CMPC(new_star_hdr, 0);
 					BLK_SEG(bs_ptr, (sm_uc_ptr_t)new_star_hdr, SIZEOF(rec_hdr));
 					if (!copy_extra_record)
-					{
-						BLK_SEG(bs_ptr, (unsigned char *)&zeroes4byte, SIZEOF(block_id));
+					{	/* Do "prev_split_to_right" processing for "!copy_extra_record" case */
+						if (prev_split_to_right)
+						{	/* Do block# adjustment like done above (searchstr "if (split_to_right)").
+							 * The newly inserted record is going in the left block whereas the record
+							 * to its right is going into the right block after the split at this level.
+							 * Adjust accordingly.
+							 */
+							ins_chain_index = left_hand_index;
+							ins_chain_offset = SIZEOF(blk_hdr) + rec_size + rec_cmpc - SIZEOF(block_id);
+							left_hand_index = left_hand_offset = 0;
+							assert(SIZEOF(block_id) == value.len);
+							BLK_ADDR(va, value.len, char);
+							assert(((sm_uc_ptr_t)rp + rec_size) <= (buffaddr + cur_blk_size));
+								/* or else we would have restarted above with "cdb_sc_mkblk" */
+							memcpy(va, ((sm_uc_ptr_t)rp + rec_size) - value.len, value.len);
+							BLK_SEG(bs_ptr, (unsigned char *)va, value.len);
+						} else
+							BLK_SEG(bs_ptr, (unsigned char *)&zeroes4byte, SIZEOF(block_id));
 					} else
 						BLK_SEG(bs_ptr, (sm_uc_ptr_t)rp + rec_size - SIZEOF(block_id), SIZEOF(block_id));
 				}
@@ -1779,6 +1935,13 @@ tn_restart:
 				 */
 			}
 			next_blk_index = t_create(blk_num, (uchar_ptr_t)new_blk_bs, left_hand_offset, left_hand_index, bh_level);
+			/* If "split_to_right" is TRUE, the existing block is untouched so no need to worry about any tp
+			 * chains that could be split due to the block-split. So we can safely skip the below chain stuff.
+			 * But currently if "dollar_tlevel" is TRUE, then we are guaranteed "split_to_right" is FALSE so
+			 * we do not need a "&& !split_to_right" check below. We will need it though if/when "split_to_right"
+			 * functionality is enabled even for TP.
+			 */
+			assert(!dollar_tlevel || !split_to_right);
 			if (!no_pointers && dollar_tlevel)
 			{	/* there may be chains */
 				assert(new_rec);
@@ -1812,7 +1975,7 @@ tn_restart:
 					GET_LONGP(&curr_chain, curr);
 					assert(1 == curr_chain.flag);
 					/* Determine "last_possible_left_offset" and "extra_record_blkid_off" */
-					copy_extra_record = !new_rec_goes_to_right && copy_extra_record;
+					copy_extra_record = (!new_rec_goes_to_right && copy_extra_record);
 					if (copy_extra_record)
 					{
 						assert(!new_rec_goes_to_right);
@@ -2135,15 +2298,14 @@ tn_restart:
 			} else
 				last_split_blk_num[bh_level] = blk_num;
 			assert(temp_key == gv_altkey);
-			/* If new_rec_goes_to_right is TRUE, then it almost always implies that the left side of
-			 * the block is almost full (i.e. adding the new record there caused it to exceed the fill
-			 * factor) therefore direct all future updates to keys in between (which lie between the
-			 * last key of the left block and the first key of the right block) to the right block.
-			 *
+			/* If new_rec_goes_to_right is TRUE (of which "split_to_right"=TRUE is a subset), then it most likely
+			 * implies that the left side of the block is almost full (i.e. adding the new record there caused it
+			 * to exceed the fill factor) therefore direct all future updates to keys in between (which lie between
+			 * the last key of the left block and the first key of the right block) to the right block.
 			 * If not, direct those updates to the left block thereby preventing it from staying at a
 			 * low capacity for a long period of time.
 			 *
-			 * This direction of future updates is implemented by controlling what key gets passed for
+			 * The direction of future updates is implemented by controlling what key gets passed for
 			 * record addition into the parent index block. For directing all in-between updates to the
 			 * right block, pass in the last key of the left block to the parent index block. For directing
 			 * all in-between updates to the left block, back off 1 spot from the first key of the right
@@ -2277,17 +2439,23 @@ tn_restart:
 			{	/* Not root;  write blocks and continue */
 				if (cdb_sc_normal != (status = gvcst_search_blk(temp_key, bq)))
 					GOTO_RETRY;
-				/* It's necessary to disable the indexmod optimization for splits of index blocks. Refer to
-				 * GTM-7353, C9B11-001813 (GTM-3984), and C9H12-002934 (GTM-6104).
-				 */
-				cse = t_write(bh, (unsigned char *)bs1, ins_chain_offset, ins_chain_index, bh_level,
-							TRUE, FALSE, (level_0) ? GDS_WRITE_PLAIN : GDS_WRITE_KILLTN);
-				assert(!dollar_tlevel || !cse->high_tlevel);
-				if (cse)
-				{
-					assert(dollar_tlevel);
-					cse->write_type |= GDS_WRITE_BLOCK_SPLIT;
+				if (!split_to_right)
+				{	/* It's necessary to disable the indexmod optimization for splits of index blocks.
+					 * Hence the GDS_WRITE_KILLTN use below. Refer to GTM-7353, C9B11-001813 (GTM-3984),
+					 * and C9H12-002934 (GTM-6104) for more details.
+					 */
+					cse = t_write(bh, (unsigned char *)bs1, ins_chain_offset, ins_chain_index, bh_level,
+								TRUE, FALSE, level_0 ? GDS_WRITE_PLAIN : GDS_WRITE_KILLTN);
+					assert(!dollar_tlevel || !cse->high_tlevel);
+					if (cse)
+					{
+						assert(dollar_tlevel);
+						cse->write_type |= GDS_WRITE_BLOCK_SPLIT;
+					}
 				}
+				/* else left-side (i.e. current) block was untouched and new contents went into right block
+				 * so no need to invoke "t_write".
+				 */
 				value.len = SIZEOF(block_id);
 				value.addr = (char *)&zeroes4byte;
 				++bh;
@@ -2773,6 +2941,13 @@ retry:
 		jnl_format_done = !needfmtjnl;	/* need to reformat jnl records unconditionally in case of TP */
 		tp_set_sgm();	/* set sgm_info_ptr & first_sgm_info for TP start */
 		T_BEGIN_SETORKILL_NONTP_OR_TP(ERR_GVPUTFAIL);	/* set update_trans and t_err for wrapped TP */
+		if (cdb_sc_gvtrootnonzero == status)
+		{	/* This is an implicit TP and gv_target->root became non-zero midway in previous try but was
+			 * reset to 0 before the "t_retry" call. Read it afresh during start of next try.
+			 * Setting "want_root_search" to TRUE achieves that.
+			 */
+			want_root_search = TRUE;
+		}
 	} else if (is_dollar_incr)
 		jnl_format_done = !needfmtjnl;	/* need to reformat jnl records for $INCR even in case of non-TP */
 	assert(dollar_tlevel || update_trans);
diff --git a/sr_port/gvcst_query.c b/sr_port/gvcst_query.c
index bc353f5..962ff5d 100755
--- a/sr_port/gvcst_query.c
+++ b/sr_port/gvcst_query.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information 	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -63,7 +63,7 @@ error_def(ERR_GVQUERYFAIL);
 DEFINE_NSB_CONDITION_HANDLER(gvcst_query_ch)
 
 boolean_t	gvcst_query(void)
-{	/* Similar to gvcst_order and gvcst_zprevious. In each case we skip over hidden subscripts as needed.
+{	/* Similar to gvcst_order. In each case we skip over hidden subscripts as needed.
 	 *
 	 *     1  2  3  NULL                           <--- order/zprev...
 	 *     1  2  3  NULL  NULL
@@ -100,7 +100,13 @@ boolean_t	gvcst_query(void)
 	{
 		INCR_GVSTATS_COUNTER(cs_addrs, cs_addrs->nl, n_query, (gtm_uint64_t) -1);
 		found = gvcst_query2();
-		CHECK_HIDDEN_SUBSCRIPT_AND_BREAK(found, gv_altkey, is_hidden);
+		if (found)
+		{
+			CHECK_HIDDEN_SUBSCRIPT(gv_altkey, is_hidden);
+			if (!is_hidden)
+				break;
+		} else
+			break;
 		assert(found && is_hidden);
 		/* Replace last subscript to be the highest possible hidden subscript so another
 		 * gvcst_query2 will give us the next non-hidden subscript.
diff --git a/sr_port/gvcst_queryget.c b/sr_port/gvcst_queryget.c
index e2b4f48..1cb8c05 100755
--- a/sr_port/gvcst_queryget.c
+++ b/sr_port/gvcst_queryget.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information 	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -187,7 +187,7 @@ boolean_t gvcst_queryget2(mval *val, unsigned char *sn_ptr)
 				if (data_len < 0  || (sm_uc_ptr_t)rp + rsiz > (sm_uc_ptr_t)bp + ((blk_hdr_ptr_t)bp)->bsiz)
 				{
 					assert(CDB_STAGNATE > t_tries);
-					t_retry(cdb_sc_rmisalign1);
+					t_retry(cdb_sc_rmisalign);
 					continue;
 				}
 				ENSURE_STP_FREE_SPACE(data_len);
diff --git a/sr_port/gvcst_reservedDB_funcs.c b/sr_port/gvcst_reservedDB_funcs.c
new file mode 100644
index 0000000..9e86e94
--- /dev/null
+++ b/sr_port/gvcst_reservedDB_funcs.c
@@ -0,0 +1,859 @@
+/****************************************************************
+ *								*
+ * Copyright (c) 2016-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
+ *								*
+ *	This source code contains the intellectual property	*
+ *	of its copyright holder(s), and is made available	*
+ *	under a license.  If you do not know the terms of	*
+ *	the license, please stop and do not read further.	*
+ *								*
+ ****************************************************************/
+
+#include "mdef.h"
+
+#include "gtm_stdio.h"
+#include "gtm_string.h"
+#include "gtm_ipc.h"
+
+#include "gdsroot.h"
+#include "gtm_facility.h"
+#include "fileinfo.h"
+#include "gdsbt.h"
+#include "gdsfhead.h"
+#include "dpgbldir.h"
+#include "filestruct.h"
+#include "gvcst_protos.h"
+#include "mvalconv.h"
+#include "op.h"
+#include "gdsblk.h"
+#include "gtm_reservedDB.h"
+#include "gvn2gds.h"
+#include "mu_cre_file.h"
+#include "gds_rundown.h"
+#include "min_max.h"
+#include "gtm_caseconv.h"
+#include "hashtab_mname.h"
+#include "send_msg.h"
+#include "error.h"
+#include "gtm_logicals.h"
+#include "trans_log_name.h"
+#include "iosp.h"
+#include "parse_file.h"
+#include "getzposition.h"
+#include "util.h"
+
+LITREF mval		literal_statsDB_gblname;
+
+GBLREF sgmnt_addrs	*cs_addrs;
+GBLREF sgmnt_data	*cs_data;
+GBLREF uint4		process_id;
+GBLREF uint4		dollar_tlevel;
+GBLREF gd_region	*gv_cur_region;
+GBLREF gv_key		*gv_altkey, *gv_currkey;
+GBLREF gv_namehead	*reset_gv_target;
+GBLREF boolean_t	need_core;
+GBLREF boolean_t	created_core;
+GBLREF boolean_t	dont_want_core;
+GBLREF gd_addr		*gd_header;
+DEBUG_ONLY(GBLREF boolean_t    ok_to_UNWIND_in_exit_handling;)
+
+static gd_region	*save_statsDBreg;	/* For use in condition handler */
+
+/* Macro to restore the values that were saved at the start of the routine */
+#define RESTORE_SAVED_VALUES					\
+MBSTART {							\
+	TP_CHANGE_REG(save_cur_region);				\
+	gv_target = save_gv_target;				\
+	reset_gv_target = save_reset_gv_target;			\
+	RESTORE_GV_ALTKEY(save_altkey);				\
+	RESTORE_GV_CURRKEY(save_currkey);			\
+	TREF(gd_targ_gvnh_reg) = save_gd_targ_gvnh_reg;		\
+	TREF(gd_targ_map) = save_gd_targ_map;			\
+	TREF(gd_targ_addr) = save_gd_targ_addr;			\
+	TREF(gv_last_subsc_null) = save_gv_last_subsc_null;	\
+	TREF(gv_some_subsc_null) = save_gv_some_subsc_null;	\
+	gd_header = save_gd_header;				\
+} MBEND
+
+error_def(ERR_DBPRIVERR);
+error_def(ERR_RNDWNSTATSDBFAIL);
+
+/* This routine is a wrapper for mu_cre_file() when called from GTM. The issue is mu_cre_file() was written to run
+ * largely stand-alone and then quit. So it uses stack vars for all the needed database structures and initializes only
+ * what it needs leaving those structures largely unusable for functions that come later. That's fine when it is called
+ * from mupip_create() but not good when called to create an auto-created DB from within mumps or other executables.
+ * What we do here is buffer the current region (pointed to by the parameter region) and the dyn.addr segment it points
+ * with stack variables, then call mu_cre_file() before throwing it all away when we return.
+ *
+ * Parameter(s):
+ *
+ *   reg - gd_region * of region to be created
+ *
+ * Return value:
+ *   File creation return code
+ */
+unsigned char gvcst_cre_autoDB(gd_region *reg)
+{
+	gd_region	*save_cur_region;
+	gd_region	cur_region;
+	gd_segment	cur_segment;
+	unsigned char	cstatus;
+
+	assert(RDBF_AUTODB & reg->reservedDBFlags);
+	save_cur_region = gv_cur_region;
+	memcpy((char *)&cur_region, reg, SIZEOF(gd_region));
+	memcpy((char *)&cur_segment, reg->dyn.addr, SIZEOF(gd_segment));
+	gv_cur_region = &cur_region;
+	gv_cur_region->dyn.addr = &cur_segment;
+	cstatus = mu_cre_file();
+	TP_CHANGE_REG(save_cur_region);
+	return cstatus;
+}
+
+/* Initialize a statsDB database. This includes the following steps:
+ *   1. Locate and open the statsDB related to the region parameter passed in.
+ *   2. Write the initial gvstats_rec_t record for the input region and the current process. The writing of
+ *      the stats record involves a bit of work:
+ *        a. All statsDB records are written with two things in mind:
+ *             i.  Records in memory must be written such that the gvstats_rec_t part of the record is 8 byte aligned.
+ *             ii. Records must be of sufficient size in the block to prevent another record from being added to the
+ *	           block that might cause the earlier record to move. Records must NOT move because they are being
+ *	           updated directly (outside of database APIs).
+ *        b. So need to compute two types of padding that is written before the gvstats_rec_t structure. The M user
+ *	     program accesses the gvstats_rec_t as the last (SIZEOF(gvstats_rec_t)) bytes in the record.
+ *        c. Need to copy the existing stats from cs_addrs into the shared record.
+ *	  d. Write the gvstats_rec_t record.
+ *   3. Once the stats record is written, mark the file R/O to prevent further updates (from this process).
+ *   4. Need to point the cs_addrs pointer to the stats in the newly written record (after locating it via fields
+ *      in gv_target.
+ *
+ * The call to op_gvname() sets up gv_currkey for our op_gvput() call also giving us the key length we need for
+ * the alignment pad calculation.
+ *
+ * Parameter(s):
+ *   baseDBreg  - gd_region* address of base (not hidden) database whose statsDB database we are to initialize.
+ */
+void gvcst_init_statsDB(gd_region *baseDBreg, boolean_t do_statsdb_init)
+{
+	mval				pid_mval, baseDBreg_nam_mval;
+	mval				statsDBrec_mval, statsDBget_mval;
+	gd_region			*statsDBreg, *statsDBreg_located, *save_cur_region;
+	gv_namehead			*save_gv_target, *save_reset_gv_target;
+	srch_blk_status 		*bh;
+	char				statsDBinitrec[SIZEOF(gvstats_rec_t) * 2];	/* Gives chunk large enuf to hold pad */
+	int				sizewkey, sizewkeyrnd, padsize, freespace, datasize;
+	gv_key				save_altkey[DBKEYALLOC(MAX_KEY_SZ)], save_currkey[DBKEYALLOC(MAX_KEY_SZ)];
+	sgmnt_addrs			*baseDBcsa, *statsDBcsa;
+	statsDB_deferred_init_que_elem	*sdiqeptr;
+	gvnh_reg_t			*save_gd_targ_gvnh_reg;
+	gd_binding			*save_gd_targ_map;
+	gd_addr				*save_gd_targ_addr, *save_gd_header;
+	boolean_t			save_gv_last_subsc_null, save_gv_some_subsc_null, longjmp_done1, longjmp_done2;
+	boolean_t			save_gvcst_statsDB_open_ch_active;
+	gd_binding			*ygs_map;
+	mname_entry			gvname;
+	ht_ent_mname			*tabent;
+	gvnh_reg_t			*gvnh_reg;
+	DCL_THREADGBL_ACCESS;
+
+	SETUP_THREADGBL_ACCESS;
+	BASEDBREG_TO_STATSDBREG(baseDBreg, statsDBreg_located);
+	assert(!statsDBreg_located->statsDB_setup_completed);
+	assert(baseDBreg->open);
+	assert(dba_cm != baseDBreg->dyn.addr->acc_meth);
+	baseDBcsa = &FILE_INFO(baseDBreg)->s_addrs;
+	save_gvcst_statsDB_open_ch_active = TREF(gvcst_statsDB_open_ch_active);	/* note down in case this function recurses */
+	TREF(gvcst_statsDB_open_ch_active) = TRUE;
+	longjmp_done2 = FALSE;	/* initialize this variable BEFORE "setjmp" done in first ESTABLISH_NORET below so it is
+				 * initialized even if we break out of the for loop due to an error even before
+				 * this variable got initialized as part of the second ESTABLISH_NORET below.
+				 */
+	ESTABLISH_NORET(gvcst_statsDB_open_ch, longjmp_done1);
+	for ( ; !longjmp_done1; )	/* have a dummy for loop to be able to use "break" for various codepaths below */
+	{
+		if (!do_statsdb_init)
+		{	/* Want to open statsDB region but do not want statsdb init (^%YGS addition etc.). This is a call from
+			 * OPEN_BASEREG_IF_STATSREG. All the macro cares about is the statsDB be open. Not that a statsDB init
+			 * happen. So do just that. The reason we need to do it here is because errors are better handled here
+			 * (user-invisible) and the caller will modify gld map entries and/or switch baseDB to NOSTATS if any
+			 * errors occur thereby preventing future access to this statsDB database file.
+			 */
+			gvcst_init(statsDBreg_located);
+			if (statsDBreg_located->open)		/* do the check just in case */
+			{
+				statsDBcsa = &FILE_INFO(statsDBreg_located)->s_addrs;
+				/* Database was opened read/only as this process has no privs to write to it.
+				 * Even though we do not need to do the statsdb init now, we know we cannot do the init
+				 * successfully and since the caller in this case is in a better position to turn off
+				 * stats in the gld (OPEN_BASEREG_IF_STATSREG) use this opportunity to raise an error.
+				 */
+				if (!statsDBcsa->orig_read_write)
+					rts_error_csa(CSA_ARG(statsDBcsa) VARLSTCNT(4) ERR_DBPRIVERR, 2,
+											DB_LEN_STR(statsDBreg_located));
+			}
+			break;
+		}
+		if (0 < dollar_tlevel)
+		{	/* We are inside a transaction. We cannot do this inside a transaction for two reasons:
+			 *
+			 *   1. Were we to write the initialization record, there's a chance the record could be unwound as
+			 *      part of a TP rollback and no mechanism exists to rewrite it.
+			 *   2. We actually don't write the gvstats record to the database until the commit so there's no
+			 *      mechanism to find where the record was written, locate it and set up non-DB-API access to
+			 *      it as we do with non-TP initializations.
+			 *
+			 * Solution is to defer the initialization until the transaction is exited - either by commiting
+			 * or by aborting the transaction.
+			 */
+			sdiqeptr = malloc(SIZEOF(statsDB_deferred_init_que_elem));
+			sdiqeptr->baseDBreg = baseDBreg;
+			sdiqeptr->statsDBreg = statsDBreg_located;
+			sdiqeptr->next = TREF(statsDB_init_defer_anchor);
+			TREF(statsDB_init_defer_anchor) = sdiqeptr;
+			/* Although we did not open the statsDB as a statsDB, we still need to open the region and see if
+			 * there are any errors before returning to the caller. This is because callers like "gvcst_init"
+			 * and "OPEN_BASEREG_IF_STATSREG" rely on this open to happen here (and catch errors) so they
+			 * can take appropriate action (see comment in OPEN_BASEREG_IF_STATSREG for example reason).
+			 */
+			gvcst_init(statsDBreg_located);
+			break;
+		}
+		save_cur_region = gv_cur_region;
+		save_gv_target = gv_target;
+		save_reset_gv_target = reset_gv_target;
+		SAVE_GV_CURRKEY(save_currkey);
+		/* It is possible we end up here with the following function call trace starting from name-level $order.
+		 *    op_gvorder -> op_gvdata -> gvcst_spr_data -> op_tcommit -> gvcst_deferred_init_statsDB -> gvcst_init_statsDB
+		 * In that case, the op_gvorder would be relying on "gv_altkey" which we could modify as part of the following call
+		 * to set up the ^%YGS global name.
+		 *    op_gvname -> op_gvname_common -> gv_bind_subsname -> gvcst_root_search
+		 * 								-> SET_GV_ALTKEY_TO_GBLNAME_FROM_GV_CURRKEY
+		 * Therefore, we need to save/restore "gv_altkey" too.
+		 */
+		SAVE_GV_ALTKEY(save_altkey);
+		/* Below save is similar to that done in op_gvsavtarg/op_gvrectarg */
+		save_gd_targ_gvnh_reg = TREF(gd_targ_gvnh_reg);
+		save_gd_targ_map = TREF(gd_targ_map);
+		save_gd_targ_addr = TREF(gd_targ_addr);
+		save_gv_last_subsc_null = TREF(gv_last_subsc_null);
+		save_gv_some_subsc_null = TREF(gv_some_subsc_null);
+		save_gd_header = gd_header;	/* save "gd_header" before tampering with global variable */
+		gd_header = baseDBreg->owning_gd; /* direct "op_gvname" to search for maps in this gld */
+		/* Must have baseDB open and be opted in to be here */
+		assert(TREF(statshare_opted_in));
+		assert(!IS_DSE_IMAGE);	/* DSE opens a statsdb only directly (never through a base DB) */
+		/* Create a condition handler so the above saved items can be undone on an error to restore the environment */
+		ESTABLISH_NORET(gvcst_statsDB_init_ch, longjmp_done2);
+		if (longjmp_done2)
+		{	/* We returned here due to an error encountered somewhere below.
+			 * Restore the things that were saved, then REVERT our handler.
+			 */
+			REVERT;
+			RESTORE_SAVED_VALUES;
+			break;
+		}
+		/* If this statsDB was previously opened by direct references to ^%YGS, gvcst_init() will have set the DB
+		 * to R/O mode so if it was previously opened, we need to set it back to write-mode to add the needed
+		 * gvstats record.
+		 */
+		if (statsDBreg_located->open)
+		{	/* This statsDB was already open so we have to reset the R/O flags so we can add the process record */
+			assert(!statsDBreg_located->statsDB_setup_completed);
+			statsDBcsa = &FILE_INFO(statsDBreg_located)->s_addrs;
+			assert(statsDBcsa->orig_read_write);
+			statsDBreg_located->read_only = FALSE;			/* Maintain read_only/read_write in parallel */
+			statsDBcsa->read_write = TRUE;				/* Maintain reg->read_only simultaneously */
+		}
+		/* Create mvals with region name and processid in them to feed to op_gvname */
+		memset((char *)&baseDBreg_nam_mval, 0, SIZEOF(mval));
+		baseDBreg_nam_mval.mvtype = MV_STR;
+		baseDBreg_nam_mval.str.len = baseDBreg->rname_len;
+		baseDBreg_nam_mval.str.addr = (char *)&baseDBreg->rname;
+		/* Init parts of the gvstats record mval not dependent on further calculations */
+		statsDBrec_mval.mvtype = MV_STR;
+		statsDBrec_mval.str.addr = statsDBinitrec;
+		/* Step 1: The very first thing that needs to happen when a statsDB is freshly opened is that we need to write
+		 *         a special record ^%YGS(region,INT_MAX) that must be there to prevent left hand block splits that
+		 *         can cause a process gvstats record to be moved to a new block. We can't check it until we do the
+		 *         first op_gvname that opens the proper DB and makes sure cs_addrs is populated, etc. Since most of
+		 *         the time, processes won't need to do this, we go ahead and do the op_gvname that most processes
+		 *         need which is for the ^%YGS(region,pid) record. If we then check and find the max record not written,
+		 *         we'll redo the op_gvname to setup for the max record instead.
+		 */
+		i2mval(&pid_mval, process_id);
+		/* We have already saved gv_currkey at function entry and are tampering with it in this function.
+		 * The "op_gvname" call does a DBG_CHECK_GVTARGET_GVCURRKEY_IN_SYNC check which would cross-check gv_currkey
+		 * & gv_target. That check could fail if this function was called when the two were not in sync (possible for
+		 * example if the call stack is "op_gvorder -> gv_init_reg -> gvcst_init -> gvcst_init_statsDB". So bypass that
+		 * check by clearing the key.
+		 */
+		DEBUG_ONLY(gv_currkey->base[0] = KEY_DELIMITER;) /* to bypass DBG_CHECK_GVTARGET_GVCURRKEY_IN_SYNC in op_gvname */
+		/* Note that "op_gvname" of ^%YGS is going to first open the region corresponding to the unsubscripted name %YGS.
+		 * That is guaranteed (by GDE) to be a statsDB region. If it happens to be different from "statsDBreg_located",
+		 * then we need to open that region first and that in turn means we first need to open its associated baseDB region
+		 * (Design assumption : statsDB region is never opened until its corresponding baseDB region is opened). To avoid
+		 * these unnecessary database opens, we modify the gld map so the unsubscripted %YGS name maps to
+		 * "statsDBreg_located". This way we don't need any opens of baseDB as we know "baseDBreg" (baseDB region of
+		 * "statsDBreg_located") is already open at this point. And we avoid doing this map modification more than once
+		 * per gld using the "ygs_map_entry_changed" flag in the gld.
+		 */
+		if (!gd_header->ygs_map_entry_changed)
+		{
+			ygs_map = gv_srch_map(gd_header, STATSDB_GBLNAME, STATSDB_GBLNAME_LEN, SKIP_BASEDB_OPEN_TRUE);
+				/* SKIP_BASEDB_OPEN_TRUE is to signal "gv_srch_map" to not invoke OPEN_BASEREG_IF_STATSREG.
+				 * See comment about "skip_basedb_open" in function prototype of "gv_srch_map" for details.
+				 */
+			assert(IS_STATSDB_REG(statsDBreg_located));
+			ygs_map->reg.addr = statsDBreg_located;
+			gvname.var_name.addr = STATSDB_GBLNAME;
+			gvname.var_name.len = STATSDB_GBLNAME_LEN;
+			COMPUTE_HASH_MSTR(gvname.var_name, gvname.hash_code);
+			tabent = lookup_hashtab_mname((hash_table_mname *)gd_header->tab_ptr, &gvname);
+			if (NULL != tabent)
+			{	/* Repoint ^%YGS hashtable entry to point unsubscripted global name to new statsdb region */
+				gvnh_reg = (gvnh_reg_t *)tabent->value;
+				assert(NULL != gvnh_reg);
+				gvnh_reg->gd_reg = statsDBreg_located;
+			}
+			gd_header->ygs_map_entry_changed = TRUE;
+		}
+		op_gvname(3, (mval *)&literal_statsDB_gblname, &baseDBreg_nam_mval, &pid_mval);
+		assert(NULL != gv_currkey);
+		assert(0 != gv_currkey->end);
+		statsDBreg = gv_cur_region;
+		if (statsDBreg != statsDBreg_located)
+		{	/* For some reason the statsDB was not opened or is not available - mark it NOSTATS and we are done */
+			baseDBreg->reservedDBFlags |= RDBF_NOSTATS;
+			baseDBcsa->reservedDBFlags |= RDBF_NOSTATS;
+			REVERT;
+			RESTORE_SAVED_VALUES;
+			break;
+		}
+		statsDBcsa = &FILE_INFO(statsDBreg)->s_addrs;
+		if (!statsDBcsa->orig_read_write)
+			/* Database was opened read/only as this process has no privs to write to it - raise error */
+			rts_error_csa(CSA_ARG(statsDBcsa) VARLSTCNT(4) ERR_DBPRIVERR, 2, DB_LEN_STR(statsDBreg));
+		assert(!statsDBreg->statsDB_setup_completed);
+		if (!statsDBcsa->statsDB_setup_completed)
+		{	/* If initialization was never completed, do it now */
+			assert(IS_STATSDB_REG(statsDBreg));
+			/* Step 2: Now figure out the alignment pad size needed to make record fields align in memory */
+			sizewkey = SIZEOF(blk_hdr) + SIZEOF(rec_hdr) + gv_currkey->end + 1;
+			sizewkeyrnd = ROUND_UP2(sizewkey, SIZEOF(gtm_uint64_t));
+			padsize = sizewkeyrnd - sizewkey;
+			/* Now to figure out the padding to prevent additional records in this block. Find how much space in this
+			 * block remains unused after this record. Use this space to increase the pad size by the needed amount.
+			 */
+			freespace = cs_data->blk_size - sizewkeyrnd - SIZEOF(gvstats_rec_t);
+			padsize += (freespace >= MIN_STATSDB_REC) ? (((freespace - MIN_STATSDB_REC) / 8) + 1) * 8 : 0;
+			if (0 < padsize)
+				memset(statsDBinitrec, 0, padsize);		/* Initialize prefix pad area with NULLs */
+			/* Move the current stats in cs_addrs to the shared rec we are about to write */
+			memcpy(statsDBinitrec + padsize, cs_addrs->gvstats_rec_p, SIZEOF(gvstats_rec_t));
+			memset((char *)&statsDBrec_mval, 0, SIZEOF(mval));
+			statsDBrec_mval.mvtype = MV_STR;
+			statsDBrec_mval.str.addr = statsDBinitrec;
+			statsDBrec_mval.str.len = padsize + SIZEOF(gvstats_rec_t);
+			op_gvput(&statsDBrec_mval);
+			/* Step 3: Now we have written a record - set the DB to R/O */
+			assert(statsDBcsa == &FILE_INFO(statsDBreg)->s_addrs);
+			assert(statsDBcsa->orig_read_write);
+			/* Step 4: Locate the newly written record and update the csa->gvstats_rec_p so new stats updates occur
+			 *         in shared memory instead of process-private.
+			 */
+			bh = gv_target->hist.h;
+			/* "op_gvput" could have returned a 0 value in case it was the one creating the GVT. To make sure we have
+			 * a clean history - fetch back the record we just wrote.
+			 */
+			gvcst_get(&statsDBget_mval);    /* This should call "gvcst_search" which should fill in "bh->curr_rec" */
+			assert(0 < bh->curr_rec.offset);
+			assert((gv_currkey->end + 1) == bh->curr_rec.match);
+			assert(SIZEOF(blk_hdr) == bh->curr_rec.offset); 			/* Should find 1st record in blk */
+			baseDBcsa->gvstats_rec_p = (gvstats_rec_t *)(bh->buffaddr + sizewkey + padsize);
+												/* ==> Start of gvstats_rec_t */
+			assert(0 == (((UINTPTR_T)baseDBcsa->gvstats_rec_p) & 0x7));		/* Verify 8 byte alignment */
+			statsDBcsa->statsDB_setup_completed = TRUE;
+		}
+		statsDBreg->read_only = TRUE;
+		statsDBcsa->read_write = FALSE;				/* Maintain read_only/read_write in parallel */
+		statsDBreg->statsDB_setup_completed = TRUE;
+		REVERT;
+		/* Restore previous region's setup */
+		RESTORE_SAVED_VALUES;
+		break;
+	}
+	REVERT;
+	TREF(gvcst_statsDB_open_ch_active) = save_gvcst_statsDB_open_ch_active;
+	/* Now that we have restored the environment as it was at function entry, check if there were any errors
+	 * inside any of the two ESTABLISH_NORETs done above. If so, handle them appropriately.
+	 */
+	if (longjmp_done2 || longjmp_done1)
+	{
+		assert(0 != error_condition);
+		/* Check if we got a TPRETRY (an internal error) in "gvcst_init" above. If so drive parent condition handler to
+		 * trigger restart. For any other error conditions, do not do anything more as we want statsdb open to silently
+		 * switch to nostats in that case.
+		 */
+		assert(0 != error_condition);
+		if (ERR_TPRETRY == error_condition)
+			DRIVECH(error_condition);	/* Drive lower level handlers with same error we had */
+		/* Since we got an error while trying to open the statsDB, silently set NOSTATS on baseDB */
+		baseDBreg->reservedDBFlags |= RDBF_NOSTATS;
+		baseDBcsa->reservedDBFlags |= RDBF_NOSTATS;
+	}
+	return;
+}
+
+/* Condition handler for gvcst_statsDB_init() - all we need to do is unwind back to where the ESTABLISH_NORET() is done
+ * as the code at that point can do the needful in the frame of reference it needs to be done.
+ */
+CONDITION_HANDLER(gvcst_statsDB_init_ch)
+{
+	START_CH(TRUE);
+	if (DUMPABLE)
+		NEXTCH;				/* Bubble down till handled properly in mdb_condition_handler() */
+	if ((SUCCESS == SEVERITY) || (INFO == SEVERITY))
+		CONTINUE;			/* Keep going for non-error issues */
+	DEBUG_ONLY(ok_to_UNWIND_in_exit_handling = TRUE);
+	UNWIND(NULL, NULL);			/* Return back to where ESTABLISH_NORET was done */
+}
+
+/* Routine to remove the process's gvstats_rec from the statsDB database associated with a given baseDB. This also
+ * entails copying the shared stats record back into cs_addrs of the baseDB and resetting it's stats pointer. This
+ * "unlinks" the two databases.
+ *
+ * Parameter(s):
+ *   baseDBreg  - gd_region* of baseDB whose stats we are "unsharing".
+ */
+void gvcst_remove_statsDB_linkage(gd_region *baseDBreg)
+{
+	mval		pid_mval, baseDBreg_nam_mval;
+	mval		statsDBrec_mval, statsDBget_mval;
+	gd_region	*statsDBreg, *save_cur_region;
+	gv_namehead	*save_gv_target, *save_reset_gv_target;
+	char		statsDBinitrec[SIZEOF(gvstats_rec_t) * 2];	/* Gives us a chunk large enuf to hold padding */
+	gv_key		save_currkey[DBKEYALLOC(MAX_KEY_SZ)];
+	sgmnt_addrs	*baseDBcsa, *statsDBcsa;
+	gvstats_rec_t	*gvstats_rec_p;
+	gvnh_reg_t	*save_gd_targ_gvnh_reg;
+	gd_binding	*save_gd_targ_map;
+	gd_addr		*save_gd_targ_addr, *save_gd_header;
+	boolean_t	save_gv_last_subsc_null, save_gv_some_subsc_null;
+#	ifdef DEBUG
+	mval		stats_rec;
+	srch_blk_status *bh;
+	uint4		recsize;
+	rec_hdr		*recptr;
+	gd_region	*statsDBreg_located;
+#	endif
+	DCL_THREADGBL_ACCESS;
+
+	SETUP_THREADGBL_ACCESS;
+	assert(dba_cm != baseDBreg->dyn.addr->acc_meth);
+	save_cur_region = gv_cur_region;
+	save_gv_target = gv_target;
+	save_reset_gv_target = reset_gv_target;
+	SAVE_GV_CURRKEY(save_currkey);
+	/* Below save is similar to that done in op_gvsavtarg/op_gvrectarg */
+	save_gd_targ_gvnh_reg = TREF(gd_targ_gvnh_reg);
+	save_gd_targ_map = TREF(gd_targ_map);
+	save_gd_targ_addr = TREF(gd_targ_addr);
+	save_gv_last_subsc_null = TREF(gv_last_subsc_null);
+	save_gv_some_subsc_null = TREF(gv_some_subsc_null);
+	/* The baseDB does not have to be open but if it is, stats will be unshared */
+	assert(TREF(statshare_opted_in));
+	/* Create mvals with region name and processid in them to feed to op_gvname */
+	memset((char *)&baseDBreg_nam_mval, 0, SIZEOF(mval));
+	baseDBreg_nam_mval.mvtype = MV_STR;
+	baseDBreg_nam_mval.str.len = baseDBreg->rname_len;
+	baseDBreg_nam_mval.str.addr = (char *)&baseDBreg->rname;
+	i2mval(&pid_mval, process_id);
+	/* Step 1: Locate the existing ^%YGS(region,pid) node. This locates the existing record for us so we can
+	 *         copy the gvstats_rec data back to private storage in cs_addrs but also sets up the key for the
+	 *	   "op_gvkill" call to kill that record.
+	 */
+	save_gd_header = gd_header;	/* save "gd_header" before tampering with global variable */
+	gd_header = baseDBreg->owning_gd; /* direct "op_gvname" to search for maps in this gld */
+	op_gvname(3, (mval *)&literal_statsDB_gblname, &baseDBreg_nam_mval, &pid_mval);
+	assert(NULL != gv_currkey);
+	assert(0 != gv_currkey->end);
+	statsDBreg = gv_cur_region;
+	statsDBcsa = &FILE_INFO(statsDBreg)->s_addrs;
+	DEBUG_ONLY(BASEDBREG_TO_STATSDBREG(baseDBreg, statsDBreg_located));
+	assert(statsDBreg == statsDBreg_located);
+	assert(IS_STATSDB_REG(statsDBreg));
+	assert(statsDBreg->statsDB_setup_completed);
+	/* Step 2: Need to switch the database back to R/W so we can do the KILL */
+	assert(statsDBcsa == &FILE_INFO(statsDBreg)->s_addrs);
+	/* Note that if multiple statsDB regions map to the same statsDB file, it is possible to have
+	 * statsDBreg->statsDB_setup_completed TRUE for more than one such region in which case all of them
+	 * would map to the same statsDBcsa and might end up calling this function more than once for the same statsDBcsa.
+	 * In that case, do the removal of ^%YGS node only once. The below check accomplishes that.
+	 */
+	statsDBreg->read_only = FALSE;
+	if (statsDBcsa->statsDB_setup_completed)
+	{
+		statsDBcsa->read_write = TRUE;				/* Maintain read_only/read_write in parallel */
+		assert(statsDBcsa->orig_read_write);
+		/* Step 3: Copy the shared gvstats_rec_t data back to private and for debug, verify record address in DEBUG but only
+		 *         if the baseDB is actually still open.
+		 */
+		if (baseDBreg->open)
+		{
+			baseDBcsa = &FILE_INFO(baseDBreg)->s_addrs;
+#			ifdef DEBUG
+			gvcst_get(&stats_rec);				/* Fetch record to set history for DEBUG mode validation */
+			bh = gv_target->hist.h;
+			assert(0 != bh->curr_rec.match);		/* Shouldn't be possible to create a GVT with this call */
+			assert((gv_currkey->end + 1) == bh->curr_rec.match);
+			assert(SIZEOF(blk_hdr) == bh->curr_rec.offset); 	/* We should find 1st record in block */
+			recptr = (rec_hdr *)(bh->buffaddr + SIZEOF(blk_hdr));
+			recsize = recptr->rsiz;
+			/* The gvstats_rec_t part of the record is the last part of the record */
+			gvstats_rec_p = (gvstats_rec_t *)((char *)recptr + (recsize - SIZEOF(gvstats_rec_t)));
+			assert(gvstats_rec_p == baseDBcsa->gvstats_rec_p);
+#			else
+			gvstats_rec_p = baseDBcsa->gvstats_rec_p;
+#			endif
+			memcpy(&baseDBcsa->gvstats_rec, gvstats_rec_p, SIZEOF(gvstats_rec_t));
+			baseDBcsa->gvstats_rec_p = &baseDBcsa->gvstats_rec;	/* ==> Reset start of gvstats_rec_t to private */
+		}
+		/* Step 4: Kill the record */
+		op_gvkill();
+		statsDBcsa->statsDB_setup_completed = FALSE;
+	}
+	statsDBreg->statsDB_setup_started = FALSE;
+	statsDBreg->statsDB_setup_completed = FALSE;
+	/* Restore previous region's setup */
+	TP_CHANGE_REG(save_cur_region);
+	gv_target = save_gv_target;
+	reset_gv_target = save_reset_gv_target;
+	RESTORE_GV_CURRKEY(save_currkey);
+	TREF(gd_targ_gvnh_reg) = save_gd_targ_gvnh_reg;
+	TREF(gd_targ_map) = save_gd_targ_map;
+	TREF(gd_targ_addr) = save_gd_targ_addr;
+	TREF(gv_last_subsc_null) = save_gv_last_subsc_null;
+	TREF(gv_some_subsc_null) = save_gv_some_subsc_null;
+	gd_header = save_gd_header;
+}
+
+/* Routine to opt-in opening statsDB for all open databases */
+void gvcst_statshare_optin(void)
+{
+	gd_addr		*gdhdr_addr;
+	gd_region	*r_save, *r_top;
+	gd_region	*baseDBreg, *statsDBreg;
+	DCL_THREADGBL_ACCESS;
+
+	SETUP_THREADGBL_ACCESS;
+	assert(0 == dollar_tlevel);
+	TREF(statshare_opted_in) = TRUE;
+	for (gdhdr_addr = get_next_gdr(NULL); NULL != gdhdr_addr; gdhdr_addr = get_next_gdr(gdhdr_addr))
+	{	/* For each global directory */
+		for (baseDBreg = gdhdr_addr->regions, r_top = baseDBreg + gdhdr_addr->n_regions; baseDBreg < r_top; baseDBreg++)
+		{	/* For each region */
+			if (!IS_REG_BG_OR_MM(baseDBreg) || IS_STATSDB_REG(baseDBreg))
+				continue;
+			if (RDBF_NOSTATS & baseDBreg->reservedDBFlags)
+				continue;
+			if (baseDBreg->open)
+			{	/* Initialize statsDB for the given baseDB region */
+				BASEDBREG_TO_STATSDBREG(baseDBreg, statsDBreg);
+				statsDBreg->statsDB_setup_started = TRUE;
+				gvcst_init_statsDB(baseDBreg, DO_STATSDB_INIT_TRUE);
+			}
+		}
+	}
+}
+
+/* Routine to opt-out running down statsDBs for all open databases */
+void gvcst_statshare_optout(void)
+{
+	gd_addr		*gdhdr_addr;
+	gd_region	*r_top, *r_save, *baseDBreg, *statsDBreg;
+	DCL_THREADGBL_ACCESS;
+
+	SETUP_THREADGBL_ACCESS;
+	assert(0 == dollar_tlevel);
+	for (gdhdr_addr = get_next_gdr(NULL); gdhdr_addr; gdhdr_addr = get_next_gdr(gdhdr_addr))
+	{	/* For each global directory */
+		for (baseDBreg = gdhdr_addr->regions, r_top = baseDBreg + gdhdr_addr->n_regions; baseDBreg < r_top; baseDBreg++)
+		{	/* For each region */
+			if (!IS_REG_BG_OR_MM(baseDBreg) || IS_STATSDB_REG(baseDBreg))
+				continue;
+			if (RDBF_NOSTATS & baseDBreg->reservedDBFlags)
+				continue;
+			if (baseDBreg->open)
+			{
+				BASEDBREG_TO_STATSDBREG(baseDBreg, statsDBreg);
+				if (statsDBreg->open && statsDBreg->statsDB_setup_completed)
+					gvcst_remove_statsDB_linkage(baseDBreg);
+			}
+		}
+	}
+	TREF(statshare_opted_in) = FALSE;
+}
+
+/* Routine to remove the statsDB linkages between the statsDB databases and the baseDBs for all open statsDBs.
+ * General purpose of this routine is to run the regions, find the statsDBs, locate the associated baseDBs,
+ * and call a routine to cleanup one baseDB/statsDB region at a time using a condition handler wrapper so
+ * we can report (via operator log messages) but then largely ignore errors so we can process each region
+ * appropriately. We are doing this in the exit handler so error handling capability is at a minimum.
+ */
+void gvcst_remove_statsDB_linkage_all(void)
+{
+	gd_addr		*gdhdr_addr;
+	gd_region	*r_top, *r_save, *statsDBreg, *baseDBreg;
+	DCL_THREADGBL_ACCESS;
+
+	SETUP_THREADGBL_ACCESS;
+	assert(0 == dollar_tlevel);
+	for (gdhdr_addr = get_next_gdr(NULL); gdhdr_addr; gdhdr_addr = get_next_gdr(gdhdr_addr))
+	{	/* For each global directory */
+		for (statsDBreg = gdhdr_addr->regions, r_top = statsDBreg + gdhdr_addr->n_regions; statsDBreg < r_top; statsDBreg++)
+		{
+			if (statsDBreg->open && IS_STATSDB_REG(statsDBreg) && statsDBreg->statsDB_setup_completed)
+			{	/* We really are an OPEN and initialized statsDB - remove the link */
+				STATSDBREG_TO_BASEDBREG(statsDBreg, baseDBreg);
+				assert(NULL != baseDBreg);
+				gvcst_remove_statsDB_linkage_wrapper(baseDBreg, statsDBreg);
+			}
+		}
+	}
+}
+
+/* Routine to provide and condition handler wrapper for gvcst_remove_statsDB_linkage() when called from the exit handler.
+ * This is because we can't tolerate much error handling in the exit handler so any errors we do get, we report and
+ * unwind (ignore). Since we are taking things apart here, the ramifications of ignoring an error aren't bad. Worst
+ * risk is not deleting the process record we created.
+ *
+ * Parameter(s):
+ *   baseDBreg  - gd_region* of baseDB we want to unlink
+ *   statsDBreg - gd_region* of statsDB we want to unlink
+ */
+void gvcst_remove_statsDB_linkage_wrapper(gd_region *baseDBreg, gd_region *statsDBreg)
+{
+	ESTABLISH(gvcst_remove_statsDB_linkage_ch);
+	save_statsDBreg = statsDBreg;						/* Save for use in condition handler */
+	gvcst_remove_statsDB_linkage(baseDBreg);				/* If fails, we unwind and go to next one */
+	REVERT;
+}
+
+/* Routine to handle deferred statsDB initializations. These are initializations that were deferred because they occurred
+ * inside a TP transaction. We are now (or should be) free of that transaction so the initializations can be performed. Any
+ * regions deferred are in a queue. Process them now and release the blocks that recorded them (this is a one time thing
+ * so no reason exists to hold or queue the free blocks).
+ */
+void gvcst_deferred_init_statsDB(void)
+{
+	statsDB_deferred_init_que_elem	*sdiqeptr, *sdiqeptr_next;
+	gd_region			*baseDBreg, *statsDBreg;
+	DCL_THREADGBL_ACCESS;
+
+	SETUP_THREADGBL_ACCESS;
+	if (process_exiting)		/* No sense opening anything if we are exiting. Like driven by exit handler's rollback */
+		return;
+	assert(0 == dollar_tlevel);
+	assert(NULL != TREF(statsDB_init_defer_anchor));
+	for (sdiqeptr = TREF(statsDB_init_defer_anchor), sdiqeptr_next = sdiqeptr->next; sdiqeptr; sdiqeptr = sdiqeptr_next)
+	{	/* For each statsDB on the queue, perform initialization and free the deferred init block */
+		sdiqeptr_next = sdiqeptr->next;					/* Next entry on queue or NULL */
+		/* We wanted to initialize it earlier but couldn't because we were in a transaction. Now the baseDB
+		 * still needs to be open and not re-opened and we can't have completed initialization elsewhere.
+		 */
+		baseDBreg = sdiqeptr->baseDBreg;
+		statsDBreg = sdiqeptr->statsDBreg;
+		assert(baseDBreg->open);
+		if (!statsDBreg->statsDB_setup_completed)
+			gvcst_init_statsDB(sdiqeptr->baseDBreg, DO_STATSDB_INIT_TRUE);
+		TREF(statsDB_init_defer_anchor) = sdiqeptr_next;		/* Remove current entry from queue */
+		free(sdiqeptr);
+	}
+}
+
+/* Condition handler for gvcst_remove_statsDB_linkage_wrapper */
+CONDITION_HANDLER(gvcst_remove_statsDB_linkage_ch)
+{
+	char	buffer[OUT_BUFF_SIZE];
+	int	msglen;
+	mval	zpos;
+
+	START_CH(TRUE);
+	PRN_ERROR;
+	if (DUMPABLE && !SUPPRESS_DUMP)
+	{
+		need_core = TRUE;
+		gtm_fork_n_core();
+	}
+	/* Save error that brought us here */
+	msglen = TREF(util_outptr) - TREF(util_outbuff_ptr);
+	assert(OUT_BUFF_SIZE > msglen);
+	memcpy(buffer, TREF(util_outbuff_ptr), msglen);
+	getzposition(&zpos);	/* Find out where it occurred */
+	/* Send whole thing to syslog */
+	send_msg_csa(CSA_ARG(NULL) VARLSTCNT(8) ERR_RNDWNSTATSDBFAIL, 10, REG_LEN_STR(save_statsDBreg),
+		     DB_LEN_STR(save_statsDBreg), zpos.str.len, zpos.str.addr, msglen, buffer);
+	DEBUG_ONLY(ok_to_UNWIND_in_exit_handling = TRUE);
+	UNWIND(NULL, NULL);		/* This returns back to gvcst_remove_statsDB_linkage_all() to do next region */
+}
+
+/* For a given input basedb file name "fname", this function determines the corresponding "statsdb" filename and sets it
+ * in the 2nd and 3rd parameters (name & byte-length). If no statsdb file name can be determined, *statsdb_fname_len is set to 0.
+ * *statsdb_fname_len, at function entry time, is set to the allocated length of the statsdb_fname char array.
+ */
+void	gvcst_set_statsdb_fname(sgmnt_data_ptr_t csd, gd_region *baseDBreg, char *statsdb_fname, uint4 *statsdb_fname_len)
+{
+	boolean_t	fname_changed, statsdb_off;
+	char		*basedb_fname, *baseBuf, *baseTop, *statsBuf, *statsTop;
+	char		tmp_fname[MAX_FN_LEN + 1], save_basedb_fname[MAX_FN_LEN + 1];
+	int		baseBufLen, save_basedb_fname_len, statsBufLen;
+	int		int_status;
+	key_t		hash_ftok;
+	gd_segment	*baseDBseg;
+	mstr		dbfile, trans, val;
+	parse_blk	pblk;
+	DCL_THREADGBL_ACCESS;
+
+	SETUP_THREADGBL_ACCESS;
+	/* Database file name could be relative path (e.g. mupip rundown -file mumps.dat or other mupip commands
+	 * that require standalone access which specify a relative file name). Convert it to absolute path if possible.
+	 * The ftok of the path to the basedb is needed by in order to derive the statsdb file name .
+	 * Ignore any error exit status. In that case, continue with relative path.
+	 */
+	baseDBseg = baseDBreg->dyn.addr;
+	basedb_fname = (char *)baseDBseg->fname;
+	assert('\0' != basedb_fname[0]);
+	if ('/' != basedb_fname[0])
+	{
+		fname_changed = TRUE;
+		/* We need to make baseDBreg->dyn.addr->fname an absolute path temporarily. Save a copy and restore later */
+		assert(ARRAYSIZE(save_basedb_fname) >= ARRAYSIZE(baseDBseg->fname));
+		save_basedb_fname_len = baseDBseg->fname_len;
+		assert(ARRAYSIZE(save_basedb_fname) > save_basedb_fname_len);
+		memcpy(save_basedb_fname, baseDBseg->fname, save_basedb_fname_len + 1);	/* copy trailing '\0' too */
+		mupfndfil(baseDBreg, NULL, LOG_ERROR_FALSE);	/* this will modify baseDBreg->dyn.addr->fname */
+	} else
+		fname_changed = FALSE;
+	assert(ARRAYSIZE(tmp_fname) <= *statsdb_fname_len);	/* caller should have initialized it */
+	statsdb_off = FALSE;
+	TREF(statsdb_fnerr_reason) = FNERR_NOERR;
+	for ( ; ; )	/* have a dummy for loop to be able to use "break" for various codepaths below */
+	{
+		if (RDBF_NOSTATS & csd->reservedDBFlags)
+		{
+			TREF(statsdb_fnerr_reason) = FNERR_NOSTATS;
+			statsdb_off = TRUE;	/* This db does not have stats turned on (e.g. statsdb) */
+			break;
+		}
+		/* This db has stats turned on. Store the full path name of the stats db when base db shm is created.
+		 * The stats db file name is of the form "$gtm_statsdir/<hash>.BASEDB-FILE-NAME.gst" where "$gtm_statsdir"
+		 * evaluates to a directory, <hash> is the ftok of the BASEDB-ABSOLUTE-PATH and BASEDB-FILE-NAME is the
+		 * file name minus the path. For example, if the basedb is "/a/a.dat", the corresponding statsdb file name
+		 * is "$gtm_statsdir/<hash>.a.dat.gst" where <hash> is the ftok of the directory "/a".
+		 * Note: The stats db will be created later when it actually needs to be opened by a process that has
+		 * opted in (VIEW STATSHARE or $gtm_statshare env var set).
+		 */
+		val.addr = GTM_STATSDIR;
+		val.len = SIZEOF(GTM_STATSDIR) - 1;
+		statsBuf = &tmp_fname[0];
+		/* Note: "gtm_env_init_sp" already processed GTM_STATSDIR to make it default to GTM_TMP_ENV etc. */
+		int_status = TRANS_LOG_NAME(&val, &trans, statsBuf, MAX_STATSDIR_LEN, do_sendmsg_on_log2long);
+		if (SS_NORMAL != int_status)
+		{
+			assert(FALSE);	/* Same TRANS_LOG_NAME in "gtm_env_init_sp" succeeded so this cannot fail */
+			TREF(statsdb_fnerr_reason) = FNERR_STATSDIR_TRNFAIL;
+			statsdb_off = TRUE;
+			break;
+		}
+		statsTop = statsBuf + MAX_FN_LEN;	/* leave room for '\0' at end (hence not "MAX_FN_LEN + 1") */
+		statsBuf += trans.len;
+		if ((statsBuf + 1) >= statsTop)
+		{	/* Not enough space to store full-path file name of statsdb in basedb shm */
+			assert(FALSE);
+			TREF(statsdb_fnerr_reason) = FNERR_STATSDIR_TRN2LONG;
+			statsdb_off = TRUE;
+			break;
+		}
+		*statsBuf++ = '/';
+		/* Now find the base db file name (minus the path) */
+		baseBuf = strrchr(basedb_fname, '/');
+		if (NULL == baseBuf)
+		{
+			assert(FALSE);	/* Since db file name is an absolute path, we should see at least one '/' */
+			TREF(statsdb_fnerr_reason) = FNERR_INV_BASEDBFN;
+			statsdb_off = TRUE;
+			break;
+		}
+		*baseBuf = '\0';	/* temporarily modify basedb name to include just the directory */
+		hash_ftok = FTOK(basedb_fname, GTM_ID);
+		*baseBuf++ = '/';	/* restore basedb full path name */
+		if (-1 == hash_ftok)
+		{
+			assert(FALSE);	/* possible only if parent dir of base db was deleted midway in db init */
+			TREF(statsdb_fnerr_reason) = FNERR_FTOK_FAIL;
+			statsdb_off = TRUE;
+			break;
+		}
+		/* Now add the hash to the statsdb file name */
+		if ((statsBuf + 9) >= statsTop)	/* 8 bytes for hex display of 4-byte ftok/hash, 1 byte for '.' */
+		{	/* Not enough space to store full-path file name of statsdb in basedb shm */
+			TREF(statsdb_fnerr_reason) = FNERR_FNAMEBUF_OVERFLOW;
+			statsdb_off = TRUE;
+			break;
+		}
+		SPRINTF(statsBuf, "%x", hash_ftok);
+		statsBuf += 8;
+		*statsBuf++ = '.';
+		/* Now add the basedb file name + ".gst" extension to the statsdb file name */
+		baseBufLen = STRLEN(baseBuf);
+		if ((statsBuf + baseBufLen + STR_LIT_LEN(STATSDB_FNAME_SUFFIX)) > statsTop)
+		{	/* Not enough space to store full-path file name of statsdb in basedb shm */
+			TREF(statsdb_fnerr_reason) = FNERR_FNAMEBUF_OVERFLOW;
+			statsdb_off = TRUE;
+			break;
+		}
+		memcpy(statsBuf, baseBuf, baseBufLen);
+		statsBuf += baseBufLen;
+		MEMCPY_LIT(statsBuf, STATSDB_FNAME_SUFFIX);
+		statsBuf += STR_LIT_LEN(STATSDB_FNAME_SUFFIX);
+		*statsBuf = '\0';
+		assert(statsBuf <= statsTop);
+		statsBufLen = statsBuf - tmp_fname;
+		statsBuf = &tmp_fname[0];
+		/* Now call "parse_file" to translate any "." or ".." usages in the path */
+		memcpy(tmp_fname, statsBuf, statsBufLen);
+		dbfile.addr = tmp_fname;
+		dbfile.len = statsBufLen;
+		memset(&pblk, 0, SIZEOF(pblk));
+		pblk.buffer = statsdb_fname;
+		pblk.buff_size = (unsigned char)(MAX_FN_LEN);/* Pass buffersize - 1 (standard protocol for parse_file) */
+		pblk.def1_buf = STATSDB_FNAME_SUFFIX;
+		pblk.def1_size = STR_LIT_LEN(STATSDB_FNAME_SUFFIX);
+		pblk.fop = F_SYNTAXO;			/* Syntax check only - bypass directory / file existence check. */
+		int_status = parse_file(&dbfile, &pblk);
+		if (!(int_status & 1))
+		{	/* Some error in "parse_file". Likely not enough space to store full-path file name of statsdb. */
+			assert(FALSE);
+			TREF(statsdb_fnerr_reason) = FNERR_FNAMEBUF_OVERFLOW;
+			statsdb_off = TRUE;
+			break;
+		}
+		assert(pblk.b_esl < *statsdb_fname_len);
+		*statsdb_fname_len = pblk.b_esl;
+		pblk.buffer[pblk.b_esl] = 0;	/* null terminate "cnl->statsdb_fname" */
+		break;
+	}
+	if (statsdb_off)
+	{
+		assert(0 < *statsdb_fname_len);
+		*statsdb_fname_len = 0;
+		statsdb_fname[0] = '\0';	/* turn off stats gathering for this base db */
+	}
+	if (fname_changed)
+	{	/* Restore baseDBseg->fname and baseDBseg->fname_len */
+		memcpy(baseDBseg->fname, save_basedb_fname, save_basedb_fname_len + 1);
+		baseDBseg->fname_len = save_basedb_fname_len;
+	}
+	return;
+}
diff --git a/sr_port/gvcst_root_search.c b/sr_port/gvcst_root_search.c
index fede4e1..289d068 100755
--- a/sr_port/gvcst_root_search.c
+++ b/sr_port/gvcst_root_search.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -13,7 +13,9 @@
 #include "mdef.h"
 
 #include "gtm_string.h"
+#include "gtm_stdio.h"
 
+#include "gtmio.h"
 #include "gdsroot.h"
 #include "gdsblk.h"
 #include "gtm_facility.h"
@@ -42,6 +44,7 @@
 #ifdef UNIX
 #include "error.h"
 #endif
+#include "io.h"
 
 GBLREF	gv_key		*gv_currkey, *gv_altkey;
 GBLREF	int4		gv_keysize;
@@ -230,7 +233,7 @@ enum cdb_sc gvcst_root_search(boolean_t donot_restart)
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
-	assert((dba_bg == REG_ACC_METH(gv_cur_region)) || (dba_mm == REG_ACC_METH(gv_cur_region)));
+	assert(IS_REG_BG_OR_MM(gv_cur_region));
 	SET_GV_ALTKEY_TO_GBLNAME_FROM_GV_CURRKEY;	/* set up gv_altkey to be just the gblname */
 	save_targ = gv_target;
 	/* Check if "gv_target->gvname" matches "gv_altkey->base". If not, there is a name mismatch (out-of-design situation).
diff --git a/sr_port/gvcst_zprevious.c b/sr_port/gvcst_zprevious.c
index 76c20cd..efb95de 100755
--- a/sr_port/gvcst_zprevious.c
+++ b/sr_port/gvcst_zprevious.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information 	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -64,53 +64,29 @@ error_def(ERR_GVORDERFAIL);
 DEFINE_NSB_CONDITION_HANDLER(gvcst_zprevious_ch)
 
 boolean_t	gvcst_zprevious(void)
-{	/* See gvcst_query.c */
-	boolean_t	found, is_hidden, sn_tpwrapped;
-	boolean_t	est_first_pass;
-	gv_key		save_currkey[DBKEYALLOC(MAX_KEY_SZ)];
-	int		prev, oldend;
-	int		save_dollar_tlevel;
+{
+	boolean_t	found, is_hidden;
 
-	DEBUG_ONLY(save_dollar_tlevel = dollar_tlevel);
-	found = gvcst_zprevious2();
-#	ifdef UNIX
-	assert(save_dollar_tlevel == dollar_tlevel);
-	CHECK_HIDDEN_SUBSCRIPT_AND_RETURN(found, gv_altkey, is_hidden);
-	assert(found && is_hidden);
-	IF_SN_DISALLOWED_AND_NO_SPAN_IN_DB(return found);
-	SAVE_GV_CURRKEY_LAST_SUBSCRIPT(save_currkey, prev, oldend);
-	if (!dollar_tlevel)
-	{
-		sn_tpwrapped = TRUE;
-		op_tstart((IMPLICIT_TSTART), TRUE, &literal_batch, 0);
-		ESTABLISH_NORET(gvcst_zprevious_ch, est_first_pass);
-		GVCST_ROOT_SEARCH_AND_PREP(est_first_pass);
-	} else
-		sn_tpwrapped = FALSE;
-	INCR_GVSTATS_COUNTER(cs_addrs, cs_addrs->nl, n_zprev, (gtm_uint64_t) -1);
+#	ifdef DEBUG
+	CHECK_HIDDEN_SUBSCRIPT(gv_currkey, is_hidden);
+	assert(!is_hidden);
+#	endif
 	found = gvcst_zprevious2();
 	if (found)
-	{
+	{	/* If the previous subscript found is a hidden subscript, it is possible there is a null subscript
+		 * ("" in standard null collation representation) before this hidden subscript in which case that needs
+		 * to be returned. But that will require one more call to "gvcst_zprevious2". But even if the null
+		 * subscript does exist and we return "found" as TRUE with the null subscript, the caller (op_zprevious)
+		 * is going to return an empty string in both cases (whether or not a null subscript was found behind
+		 * the hidden subscript). Therefore, we avoid the second call and return "found" as FALSE in both cases.
+		 */
 		CHECK_HIDDEN_SUBSCRIPT(gv_altkey, is_hidden);
 		if (is_hidden)
-		{	/* Replace last subscript to be the lowest possible hidden subscript so another
-			 * gvcst_zprevious2 will give us the previous non-hidden subscript.
-			 */
-			REPLACE_HIDDEN_SUB_TO_LOWEST(gv_altkey, gv_currkey);	/* uses gv_altkey to modify gv_currkey */
-			/* fix up since it should only be externally counted as one $zprevious */
-			INCR_GVSTATS_COUNTER(cs_addrs, cs_addrs->nl, n_zprev, (gtm_uint64_t) -1);
-			found = gvcst_zprevious2();
-		}
-	}
-	if (sn_tpwrapped)
-	{
-		op_tcommit();
-		REVERT; /* remove our condition handler */
-	}
-	RESTORE_GV_CURRKEY_LAST_SUBSCRIPT(save_currkey, prev, oldend);
-	assert(save_dollar_tlevel == dollar_tlevel);
-#	endif
-	return found;
+			return FALSE;
+		else
+			return TRUE;
+	} else
+		return FALSE;
 }
 
 boolean_t	gvcst_zprevious2(void)
@@ -119,11 +95,13 @@ boolean_t	gvcst_zprevious2(void)
 	enum cdb_sc	status;
 	srch_blk_status	*bh;
 	srch_hist	*lft_history;
+	unsigned int	currkey_prev, currkey_end, altkey_end, prev_rec_match;
+	unsigned char	*c, *ctop;
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
 	T_BEGIN_READ_NONTP_OR_TP(ERR_GVORDERFAIL);
-	TREF(expand_prev_key) = TRUE;
+	TREF(expand_prev_key) = TRUE;	/* this will cause "gv_altkey" to contain fully expanded previous key */
 	/* Note that "t_retry" usage below could transfer control out of this function if dollar_tlevel > 0. If so,
 	 * we need to remember to reset TREF(expand_prev_key) to FALSE since this zprevious action has terminated.
 	 * We do that reset in tp_restart.
@@ -132,7 +110,7 @@ boolean_t	gvcst_zprevious2(void)
 	{
 		assert(t_tries < CDB_STAGNATE || cs_addrs->now_crit);	/* we better hold crit in the final retry (TP & non-TP) */
 		two_histories = FALSE;
-		if (cdb_sc_normal == (status = gvcst_search(gv_currkey, NULL)))
+		if (cdb_sc_normal == (status = gvcst_search(gv_currkey, NULL)))	/* will set "gv_altkey" to contain previous key */
 		{
 			found = TRUE;
 			bh = gv_target->hist.h;
@@ -163,8 +141,39 @@ boolean_t	gvcst_zprevious2(void)
 			assert(gv_altkey->top == gv_keysize);
 			assert(gv_currkey->end < gv_currkey->top);
 			assert(gv_altkey->end < gv_altkey->top);
-			if ((gv_altkey->end < gv_currkey->end) && (gv_altkey->end <= gv_currkey->prev))
+			currkey_prev   = gv_currkey->prev;
+			currkey_end    = gv_currkey->end;
+			altkey_end     = gv_altkey->end;
+			prev_rec_match = bh->prev_rec.match;
+			if (((altkey_end < currkey_end) && (altkey_end <= currkey_prev)) || (prev_rec_match < currkey_prev))
 				found = FALSE;
+			else
+			{	/* Truncate gv_altkey to same subscript level/depth as gv_currkey */
+				c = gv_altkey->base;
+				ctop = c + altkey_end;
+				c += prev_rec_match;
+				for (;;)
+				{
+					if (c >= ctop)
+					{
+						assert(CDB_STAGNATE > t_tries);
+						status = cdb_sc_rmisalign;
+						break;
+					}
+ 					if (0 == *c++)
+					{
+						*c = 0;
+						break;
+					}
+				}
+				if (cdb_sc_normal != status)
+				{
+					t_retry(status);
+					continue;
+				}
+				gv_altkey->end = c - gv_altkey->base;
+				assert(gv_altkey->end < gv_altkey->top);
+			}
 			if (!dollar_tlevel)
 			{
 				if ((trans_num)0 == t_end(&gv_target->hist, two_histories ? lft_history : NULL, TN_NOT_SPECIFIED))
@@ -181,7 +190,7 @@ boolean_t	gvcst_zprevious2(void)
 			assert(cs_data == cs_addrs->hdr);
 			INCR_GVSTATS_COUNTER(cs_addrs, cs_addrs->nl, n_zprev, 1);
 			TREF(expand_prev_key) = FALSE;
-			return (found && (bh->prev_rec.match >= gv_currkey->prev));
+			return found;
 		}
 		t_retry(status);
 	}
diff --git a/sr_port/gvn2gds.c b/sr_port/gvn2gds.c
new file mode 100644
index 0000000..05ede3c
--- /dev/null
+++ b/sr_port/gvn2gds.c
@@ -0,0 +1,340 @@
+/****************************************************************
+ *								*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
+ *								*
+ *	This source code contains the intellectual property	*
+ *	of its copyright holder(s), and is made available	*
+ *	under a license.  If you do not know the terms of	*
+ *	the license, please stop and do not read further.	*
+ *								*
+ ****************************************************************/
+
+#include "mdef.h"
+
+#include <stdarg.h>
+#include "gtm_string.h"
+#include "gtm_stdio.h"
+
+#include "gtmio.h"
+#include "gdsroot.h"
+#include "gtm_facility.h"
+#include "gdsbt.h"
+#include "gdsfhead.h"
+#include "stringpool.h"
+#include "collseq.h"
+#include "error.h"
+#include "op.h"
+#include "patcode.h"
+#include "mvalconv.h"
+#include "lv_val.h"
+#include "alias.h"
+#include "gtmimagename.h"
+#include "format_targ_key.h"
+#include "gtm_ctype.h"		/* for ISDIGIT_ASCII macro */
+#include "gvn2gds.h"
+#include "is_canonic_name.h"
+#include "zshow.h"
+#include "io.h"
+
+GBLREF gd_region	*gv_cur_region;
+GBLREF gv_namehead	*gv_target;
+GBLREF gv_namehead	*reset_gv_target;
+
+error_def(ERR_COLLATIONUNDEF);
+error_def(ERR_NOCANONICNAME);
+
+STATICDEF boolean_t	save_transform;
+STATICDEF gd_region	*save_gv_cur_region;
+
+/* Restore global variables "gv_cur_region", "gv_target" and "transform" */
+#define	RESTORE_GBL_VARS_BEFORE_FUN_RETURN										\
+MBSTART {														\
+	/* Restore global variables "gv_cur_region", "gv_target" and "transform" back to their original state */	\
+	gv_cur_region = save_gv_cur_region;										\
+	RESET_GV_TARGET(DO_GVT_GVKEY_CHECK);										\
+	TREF(transform) = save_transform;										\
+} MBEND
+
+CONDITION_HANDLER(gvn2gds_ch)
+{
+	START_CH(TRUE);
+	RESTORE_GBL_VARS_BEFORE_FUN_RETURN;
+	NEXTCH;
+}
+
+#define MAX_LEN_FOR_CHAR_FUNC 6
+
+boolean_t convert_key_to_db(mval *gvn, int start, int stop, gv_key *gvkey, unsigned char **key);
+
+/*
+ * -----------------------------------------------
+ * gvn2gds()
+ * Converts a global variable name (GVN) into its internal database repesentation (GDS)
+ *
+ * Arguments:
+ *	gvn	      - Pointer to Source Name string mval. Must be in GVN form.
+ *	buf	      - Pointer to a buffer large enough to fit the whole GDS of the passed in GVN.
+ *	col	      - Collation number.
+ * Return:
+ *	unsigned char - Pointer to the end of the GDS written to gvkey.
+ * -----------------------------------------------
+ */
+unsigned char *gvn2gds(mval *gvn, gv_key *gvkey, int act)
+{
+	boolean_t	est_first_pass, retn;
+	collseq 	*csp;
+	gd_region	tmpreg;
+	gv_namehead	temp_gv_target;
+	unsigned char 	*key, *key_top, *key_start;
+	int		subscript, i, contains_env;
+	int		*start, *stop;
+	gv_name_and_subscripts 	start_buff, stop_buff;
+	DCL_THREADGBL_ACCESS;
+
+	SETUP_THREADGBL_ACCESS;
+	/* determine which buffer to use */
+	DETERMINE_BUFFER(gvn, start_buff, stop_buff, start, stop);
+	if (0 != act)
+	{
+		csp = ready_collseq(act);
+		if (NULL == csp)
+			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(3) ERR_COLLATIONUNDEF, 1, act);
+	} else
+		csp = NULL;	/* Do not issue COLLATIONUNDEF for 0 collation */
+	retn = TRUE;
+	assert(MV_IS_STRING(gvn));
+	key_start = &gvkey->base[0];
+	key = key_start;
+	gvkey->prev = 0;
+	gvkey->top = DBKEYSIZE(MAX_KEY_SZ);
+	key_top = key_start + gvkey->top;
+	/* We will parse all of the components up front. */
+	if (!parse_gv_name_and_subscripts(gvn, &subscript, start, stop, &contains_env))
+		NOCANONICNAME_ERROR(gvn);
+	if (stop[contains_env] - start[contains_env] > gvkey->top)
+		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(1) ERR_GVSUBOFLOW);
+ 	memcpy(key, gvn->str.addr + start[contains_env], stop[contains_env] - start[contains_env]);
+	key += stop[contains_env] - start[contains_env];
+	*key++ = KEY_DELIMITER;
+	gvkey->end = key - key_start;
+	/* Temporarily repoint global variables "gv_cur_region", "gv_target" and "transform".
+	 * They are needed by mval2subsc for the following
+	 *	"transform", "gv_target->nct", "gv_target->collseq" and "gv_cur_region->std_null_coll"
+	 * Note that transform is usually ON, specifying that collation transformation is "enabled",
+	 * and is only shut off for minor periods when something is being critically formatted (like
+	 * we're doing here). Note that mval2subsc could issue an rts_error, so we establish a
+	 * condition handler to restore the above.
+	 */
+	save_transform = TREF(transform);
+	assert(save_transform);
+	TREF(transform) = TRUE;
+	reset_gv_target = gv_target;
+	gv_target = &temp_gv_target;
+	memset(gv_target, 0, SIZEOF(gv_namehead));
+	gv_target->collseq = csp;
+	memset(&tmpreg, 0, SIZEOF(gd_region));
+	/* Assign "gv_cur_region" only after tmpreg has been fully initialized or timer interrupts can look at inconsistent copy */
+	save_gv_cur_region = gv_cur_region;
+	gv_cur_region = &tmpreg;
+	gv_cur_region->std_null_coll = TRUE;
+	ESTABLISH_NORET(gvn2gds_ch, est_first_pass);
+	/* we know the number of subscripts, so we convert them all */
+	for (i = 1 + contains_env; i <= contains_env + subscript; ++i)
+	{
+		if (!(retn = convert_key_to_db(gvn, start[i], stop[i], gvkey, &key)))
+			break;
+	}
+	REVERT;
+	RESTORE_GBL_VARS_BEFORE_FUN_RETURN;
+	if (!retn || !CAN_APPEND_HIDDEN_SUBS(gvkey))
+		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(1) ERR_GVSUBOFLOW);
+	*key++ = KEY_DELIMITER;	/* add double terminating null byte */
+	assert(key <= key_top);
+	return key;
+}
+
+/* given the bounds of a particular subscript (assumed correct), we convert the subscript into
+ * a form that mimics the GDS representation of that subscript
+ */
+boolean_t convert_key_to_db(mval *gvn, int start, int stop, gv_key *gvkey, unsigned char **key)
+{
+	mval 		tmpval, *mvptr, dollarcharmval;
+	int 		isrc;
+	char		strbuff[MAX_KEY_SZ + 1], *str, *str_top;
+	char 		fnname[MAX_LEN_FOR_CHAR_FUNC], *c;
+	boolean_t	is_zchar;
+	int4		num;
+	DCL_THREADGBL_ACCESS;
+
+	SETUP_THREADGBL_ACCESS;
+	if (ISDIGIT_ASCII(gvn->str.addr[start]) ||
+		'-' == gvn->str.addr[start] || '+' == gvn->str.addr[start] || '.' == gvn->str.addr[start])
+	{	/* convert a number */
+		tmpval.str.addr = &gvn->str.addr[start];
+		tmpval.str.len 	= stop - start;
+		tmpval.mvtype = MV_STR;
+		mvptr = &tmpval;
+		MV_FORCE_NUM(mvptr);
+		if (MVTYPE_IS_NUM_APPROX(tmpval.mvtype))
+			return FALSE;
+		mval2subsc(&tmpval, gvkey, gv_cur_region->std_null_coll);
+	} else
+	{	/* It's a string. We need to accept strings, $CHAR args, and $ZCHAR args. */
+		str = &strbuff[0];
+		str_top = &strbuff[0] + MAX_KEY_SZ + 1;
+		/* MV_NUM_APPROX needed by mval2subsc to skip val_iscan call */
+		tmpval.mvtype = (MV_STR | MV_NUM_APPROX);
+		for (isrc = start; isrc < stop; )
+		{
+			if ('_' == gvn->str.addr[isrc])
+			{	/* We can skip this case, since we're already "appending"
+				 * the strings on the lhs to the string on the rhs. */
+				isrc++;
+			} else if ('$' == gvn->str.addr[isrc])
+			{	/* We determine if what comes after is a Char or a ZCHar,
+				 * and copy over accordingly */
+				c = &fnname[0];
+				isrc++; /* skip the '$' */
+				while ('(' != gvn->str.addr[isrc])
+					*c++ = TOUPPER(gvn->str.addr[isrc++]);
+				*c = '\0';
+				assert(strlen(c) <= MAX_LEN_FOR_CHAR_FUNC - 1);
+				if (!MEMCMP_LIT(fnname, "ZCHAR") || !MEMCMP_LIT(fnname, "ZCH"))
+					is_zchar = TRUE;
+				else if (!MEMCMP_LIT(fnname, "CHAR") || !MEMCMP_LIT(fnname, "C"))
+					is_zchar = FALSE;
+				else
+					assert(FALSE);
+				/* Parse the arguments */
+				isrc++; /* skip the '(' */
+				while (TRUE)
+				{	/* Inside the argument list for $[Z]CHAR */
+					/* STRTOUL will stop at the ',' or ')' */
+					num = (int4)STRTOUL(&gvn->str.addr[isrc], NULL, 10);
+#					ifdef UNICODE_SUPPORTED
+					if (!is_zchar && is_gtm_chset_utf8)
+						op_fnchar(2, &dollarcharmval, num);
+					else
+#					endif
+						op_fnzchar(2, &dollarcharmval, num);
+					assert(MV_IS_STRING(&dollarcharmval));
+					if (dollarcharmval.str.len)
+					{
+						if (str + dollarcharmval.str.len > str_top)
+							/* String overflows capacity. */
+							return FALSE;
+						memcpy(str, dollarcharmval.str.addr, dollarcharmval.str.len);
+						str += dollarcharmval.str.len;
+					}
+					/* move on to the next argument */
+					while (',' != gvn->str.addr[isrc] && ')' != gvn->str.addr[isrc])
+						isrc++;
+					if (',' == gvn->str.addr[isrc])
+						isrc++;
+					else
+					{
+						assert(')' == gvn->str.addr[isrc]);
+						isrc++; /* skip ')' */
+						break;
+					}
+				}
+			} else if ('"' == gvn->str.addr[isrc])
+			{	/* Assume valid string. */
+				isrc++;
+				while (isrc < stop && !('"' == gvn->str.addr[isrc] && '"' != gvn->str.addr[isrc+1]))
+				{
+					if (str == str_top)
+						/* String overflows capacity. */
+						return FALSE;
+					if ('"' == gvn->str.addr[isrc] && '"' == gvn->str.addr[isrc+1])
+					{
+						*str++ = '"';
+						isrc += 2;
+					} else
+						*str++ = gvn->str.addr[isrc++];
+				}
+				isrc++; /* skip over '"' */
+			} else
+				assert(FALSE);
+		}
+		tmpval.str.addr = strbuff;
+		tmpval.str.len 	= str - strbuff;
+		DEBUG_ONLY(TREF(skip_mv_num_approx_assert) = TRUE;)
+		mval2subsc(&tmpval, gvkey, gv_cur_region->std_null_coll);
+		DEBUG_ONLY(TREF(skip_mv_num_approx_assert) = FALSE;)
+	}
+	assert(gvkey->end < gvkey->top); /* else GVSUBOFLOW error would have been issued */
+	*key = &gvkey->base[gvkey->end];
+	return TRUE;
+}
+
+/*
+ * -----------------------------------------------
+ * gds2gvn()
+ * Converts a key in internal database representation form to a global variable name (GVN).
+ *
+ * Arguments:
+ *	gds	      - Pointer to Source Name string mval. Must be in GDS form.
+ *	buf	      - Pointer to a buffer large enough to fit the whole GVN of the passed in GDS.
+ *	col	      - Collation number.
+ * Return:
+ *	unsigned char - Pointer to the end of the GVN written to buff.
+ * -----------------------------------------------
+ */
+unsigned char *gds2gvn(mval *gds, unsigned char *buff, int col)
+{
+	collseq 	*csp;
+	unsigned char 	*key;
+	gv_key 		save_currkey[DBKEYALLOC(MAX_KEY_SZ)];
+	gv_key 		*gvkey;
+	gd_region	tmpreg, *save_gv_cur_region;
+	gv_namehead	temp_gv_target;
+	boolean_t	est_first_pass;
+	DCL_THREADGBL_ACCESS;
+
+	SETUP_THREADGBL_ACCESS;
+	key = &buff[0];
+	if (0 != col)
+	{
+		csp = ready_collseq(col);
+		if (NULL == csp)
+			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(3) ERR_COLLATIONUNDEF, 1, col);
+	} else
+		csp = NULL; /* Do not issue COLLATIONUNDEF for 0 collation */
+	/* Temporarily repoint global variables "gv_target" and "transform".
+	 * They are needed by format_targ_key/gvsub2str "transform" and "gv_target->collseq".
+	 * Note that transform is usually ON, specifying that collation transformation is "enabled",
+	 * and is only shut off for minor periods when something is being critically formatted (like
+	 * we're doing here). While there should be no need for a condition handler, there is a
+	 * a possible rts_error from gvsub2str in format_target_key, so we establish one.
+	 */
+	save_transform = TREF(transform);
+	assert(save_transform);
+	TREF(transform) = TRUE;
+	reset_gv_target = gv_target;
+	gv_target = &temp_gv_target;
+	memset(gv_target, 0, SIZEOF(gv_namehead));
+	gv_target->collseq = csp;
+	assert(MV_IS_STRING(gds));
+	gvkey = &save_currkey[0];
+	gvkey->prev = 0;
+	gvkey->top = DBKEYSIZE(MAX_KEY_SZ);
+	if ((gvkey->top < gds->str.len) || (2 > gds->str.len)
+			|| (KEY_DELIMITER != gds->str.addr[gds->str.len-1])
+			|| (KEY_DELIMITER != gds->str.addr[gds->str.len-2]))
+		*key++ = '\0';
+	else
+	{
+		memcpy(&gvkey->base[0], gds->str.addr, gds->str.len);
+		gvkey->end = gds->str.len - 1;
+		ESTABLISH_NORET(gvn2gds_ch, est_first_pass);	/* format_targ_key calls gvsub2str which has an rts_error */
+		if (0 == (key = format_targ_key(&buff[0], MAX_ZWR_KEY_SZ, gvkey, FALSE)))
+			key = &buff[MAX_ZWR_KEY_SZ - 1];
+		REVERT;
+	}
+	/* Restore global variables "gv_target" and "transform" back to their original state */
+	RESET_GV_TARGET(DO_GVT_GVKEY_CHECK);
+	TREF(transform) = save_transform;
+	return key;
+}
diff --git a/sr_port/gvn2gds.h b/sr_port/gvn2gds.h
new file mode 100644
index 0000000..c5bc21e
--- /dev/null
+++ b/sr_port/gvn2gds.h
@@ -0,0 +1,32 @@
+/****************************************************************
+ *                                                              *
+ * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
+ *                                                              *
+ *    This source code contains the intellectual property       *
+ *    of its copyright holder(s), and is made available         *
+ *    under a license.  If you do not know the terms of         *
+ *    the license, please stop and do not read further.         *
+ *                                                              *
+ ****************************************************************/
+
+#ifndef GVN2GDS_included
+#define GVN2GDS_included
+
+#include "mdef.h"
+
+#include <stdarg.h>
+#include "gtm_string.h"
+
+#include "gdsroot.h"
+#include "gtm_facility.h"
+#include "fileinfo.h"
+#include "gdsbt.h"
+#include "gdsfhead.h"
+
+unsigned char *gvn2gds(mval *gvn, gv_key *gvkey, int act);
+
+/* Assumes that buff is of size MAX_ZWR_KEY_SZ. Reverses the operation done by gvn2gds */
+unsigned char *gds2gvn(mval *gds, unsigned char *buff, int col);
+
+#endif
diff --git a/sr_port/gvname_env_restore.c b/sr_port/gvname_env_restore.c
index fd595b3..f9bf4b9 100755
--- a/sr_port/gvname_env_restore.c
+++ b/sr_port/gvname_env_restore.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -46,7 +47,7 @@ void gvname_env_restore(gvname_info *curr_gvname_info)
 	SETUP_THREADGBL_ACCESS;
 	gv_target = curr_gvname_info->s_gv_target;
 	gv_cur_region = curr_gvname_info->s_gv_cur_region;
-	DEBUG_ONLY(is_bg_or_mm = (dba_bg == REG_ACC_METH(gv_cur_region) || dba_mm == REG_ACC_METH(gv_cur_region));)
+	DEBUG_ONLY(is_bg_or_mm = IS_REG_BG_OR_MM(gv_cur_region);)
 	cs_addrs = curr_gvname_info->s_cs_addrs;
 	assert((is_bg_or_mm && cs_addrs)
 		|| (dba_cm == REG_ACC_METH(gv_cur_region)) || (dba_usr == REG_ACC_METH(gv_cur_region)));
diff --git a/sr_port/gvname_env_save.c b/sr_port/gvname_env_save.c
index 82b9d34..1afcb29 100755
--- a/sr_port/gvname_env_save.c
+++ b/sr_port/gvname_env_save.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -44,7 +45,7 @@ void gvname_env_save(gvname_info *curr_gvname_info)
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
-	DEBUG_ONLY(is_bg_or_mm = (dba_mm == REG_ACC_METH(gv_cur_region) || dba_bg == REG_ACC_METH(gv_cur_region));)
+	DEBUG_ONLY(is_bg_or_mm = IS_REG_BG_OR_MM(gv_cur_region);)
 	curr_gvname_info->s_gv_target = gv_target;
 	curr_gvname_info->s_gv_cur_region = gv_cur_region;
 	assert((is_bg_or_mm && cs_addrs->hdr == cs_data)
diff --git a/sr_port/gvnh_spanreg_init.c b/sr_port/gvnh_spanreg_init.c
index 04c1bf3..0e40f51 100644
--- a/sr_port/gvnh_spanreg_init.c
+++ b/sr_port/gvnh_spanreg_init.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2013-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -36,6 +37,7 @@ void gvnh_spanreg_init(gvnh_reg_t *gvnh_reg, gd_addr *addr, gd_binding *gvmap_st
 	unsigned int	min_reg_index, max_reg_index;
 	gd_region	*reg, *reg_start;
 #	ifdef DEBUG
+	boolean_t	min_reg_index_adjusted = FALSE;
 	gd_region	*reg_top;
 	gd_binding	*gdmap_top;
 	trans_num	gd_targ_tn, *tn_array;
@@ -91,6 +93,14 @@ void gvnh_spanreg_init(gvnh_reg_t *gvnh_reg, gd_addr *addr, gd_binding *gvmap_st
 		return;
 	}
 	TREF(spangbl_seen) = TRUE;	/* we found at least one global that spans multiple regions */
+	/* If global name is ^%YGS, the map entries for ^%YGS might change with time (see OPEN_BASEREG_IF_STATSREG macro
+	 * AND ygs_map->reg.addr in "gvcst_init_statsDB"). So keep min_reg_index as lowest possible value.
+	 */
+	if ((gvent_len == STATSDB_GBLNAME_LEN) && (0 == memcmp(gvent_name, STATSDB_GBLNAME, STATSDB_GBLNAME_LEN)))
+	{
+		DEBUG_ONLY(min_reg_index_adjusted = TRUE;)
+		min_reg_index = 0;
+	}
 	/* Allocate and initialize a gvnh_spanreg_t structure and link it to gvnh_reg.
 	 * Note gvt_array[] size is max_reg_index - min_reg_index + 1.
 	 */
@@ -109,7 +119,8 @@ void gvnh_spanreg_init(gvnh_reg_t *gvnh_reg, gd_addr *addr, gd_binding *gvmap_st
 	 */
 	memset(&gvspan->gvt_array[0], 0, gvspan_size + SIZEOF(gvspan->gvt_array[0]));
 #	ifdef DEBUG
-		/* Initialize the region slots that are not spanned to by this global with a distinct "invalid" value */
+	if (!min_reg_index_adjusted)
+	{	/* Initialize the region slots that are not spanned to by this global with a distinct "invalid" value */
 		assert(tn_array[min_reg_index] == gd_targ_tn);
 		assert(tn_array[max_reg_index] == gd_targ_tn);
 		for (reg_index = min_reg_index; reg_index <= max_reg_index; reg_index++)
@@ -117,6 +128,7 @@ void gvnh_spanreg_init(gvnh_reg_t *gvnh_reg, gd_addr *addr, gd_binding *gvmap_st
 			if (tn_array[reg_index] != gd_targ_tn)
 				gvspan->gvt_array[reg_index - min_reg_index] = INVALID_GV_TARGET;
 		}
+	}
 #	endif
 	gvnh_reg->gvspan = gvspan;
 	/* Initialize gvt for the region that the unsubscripted global name maps to */
diff --git a/sr_port/gvnh_spanreg_subs_gvt_init.c b/sr_port/gvnh_spanreg_subs_gvt_init.c
index 5a1d199..6aa6342 100644
--- a/sr_port/gvnh_spanreg_subs_gvt_init.c
+++ b/sr_port/gvnh_spanreg_subs_gvt_init.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2013-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -11,6 +12,9 @@
 
 #include "mdef.h"
 
+#include "gtm_stdio.h"
+
+#include "gtmio.h"
 #include "gdsroot.h"
 #include "gtm_facility.h"
 #include "fileinfo.h"
@@ -25,6 +29,7 @@
 #include "gvcst_protos.h"	/* for gvcst_root_search prototype */
 #include "process_gvt_pending_list.h"	/* for "is_gvt_in_pending_list" prototype used in ADD_TO_GVT_PENDING_LIST_IF_REG_NOT_OPEN */
 #include "gtmimagename.h"
+#include "io.h"
 
 GBLREF	gd_region			*gv_cur_region;
 
@@ -45,9 +50,9 @@ void gvnh_spanreg_subs_gvt_init(gvnh_reg_t *gvnh_reg, gd_addr *addr, viewparm *p
 	gv_namehead		*gvt, *name_gvt;
 	gvnh_spanreg_t		*gvspan;
 	int			min_reg_index, reg_index;
-	DEBUG_ONLY(
-		gd_binding	*gd_map_top;
-	)
+#	ifdef DEBUG
+	gd_binding		*gd_map_top;
+#	endif
 
 	assert(NULL != gvnh_reg->gvt);
 	gvspan = gvnh_reg->gvspan;
@@ -60,6 +65,11 @@ void gvnh_spanreg_subs_gvt_init(gvnh_reg_t *gvnh_reg, gd_addr *addr, viewparm *p
 	gd_reg_start = &addr->regions[0];
 	min_reg_index = gvspan->min_reg_index;
 	name_gvt = gvnh_reg->gvt;
+#	ifdef DEBUG
+	/* ^%Y* should never be invoked here (callers would have issued ERR_PCTYRESERVED error in that case). Assert accordingly. */
+	assert((RESERVED_NAMESPACE_LEN > name_gvt->gvname.var_name.len)
+		|| (0 != MEMCMP_LIT(name_gvt->gvname.var_name.addr, RESERVED_NAMESPACE)));
+#	endif
 	save_reg = gv_cur_region;
 	for ( ; map < map_top; map++)
 	{
diff --git a/sr_port/gvsub2str.c b/sr_port/gvsub2str.c
index 6052949..0dcda59 100755
--- a/sr_port/gvsub2str.c
+++ b/sr_port/gvsub2str.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2014 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -134,10 +135,10 @@ unsigned char *gvsub2str(unsigned char *sub, mstr *opstr, boolean_t xlat_flg)
 				;
 			for (rev_num = 0; num > 0; rev_num = (rev_num * DECIMAL_BASE + num % DECIMAL_BASE), num /= DECIMAL_BASE)
 				;
-			for (; rev_num > 0 && targ < targ_end;
+			for (; (rev_num > 0) && (targ < targ_end);
 				*targ++ = (rev_num % DECIMAL_BASE + ASCII_0), rev_num /= DECIMAL_BASE)
 				;
-			for (; trail_zero > 0 && targ < targ_end; *targ++ = '0', trail_zero--);
+			for (; (trail_zero > 0) && (targ < targ_end); *targ++ = '0', trail_zero--);
 			if (*sub != 0)
 				*targ++ = '*';
 		}
@@ -145,7 +146,7 @@ unsigned char *gvsub2str(unsigned char *sub, mstr *opstr, boolean_t xlat_flg)
 		{
 			tbl_ptr = (unsigned short *)&dpos[0] - 1;
 			trail_ch = KEY_DELIMITER;
-			if (0 <= (signed char)ch && targ < targ_end)
+			if ((0 <= (signed char)ch) && (targ < targ_end))
 			{	/* Bit 7 of the exponent is set for positive numbers; must be negative */
 				trail_ch = NEG_MNTSSA_END;
 				tbl_ptr = (unsigned short *)dneg;
@@ -161,13 +162,13 @@ unsigned char *gvsub2str(unsigned char *sub, mstr *opstr, boolean_t xlat_flg)
 				*targ++ = '.';
 					/* generate leading 0's */
 				do *targ++ = '0';
-				while ((signed char)ch-- > 0 && targ < targ_end)
+				while (((signed char)ch-- > 0) && (targ < targ_end))
 					;
 					/* make expon. really large to avoid
 					 * generating extra dots */
 				expon = LARGE_EXP;
 			}
-			while ((ch = *sub++) && ch != trail_ch)
+			while ((ch = *sub++) && (ch != trail_ch) && (targ < targ_end))
 			{	/* Convert digits loop */
 					/* adjust dcm. point */
 				if (0 >= (expon -= 2))
diff --git a/sr_port/gvzwrite_clnup.c b/sr_port/gvzwrite_clnup.c
index 0df5462..3f25c91 100755
--- a/sr_port/gvzwrite_clnup.c
+++ b/sr_port/gvzwrite_clnup.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -12,7 +13,9 @@
 #include "mdef.h"
 
 #include "gtm_string.h"
+#include "gtm_stdio.h"
 
+#include "gtmio.h"
 #include "gdsroot.h"
 #include "gtm_facility.h"
 #include "fileinfo.h"
@@ -25,6 +28,7 @@
 #include "filestruct.h"
 #include "gdscc.h"
 #include "jnl.h"
+#include "io.h"
 
 GBLREF gv_namehead	*gv_target;
 GBLREF gv_namehead	*reset_gv_target;
diff --git a/sr_port/have_crit.h b/sr_port/have_crit.h
index 7d18a17..2a21e7c 100755
--- a/sr_port/have_crit.h
+++ b/sr_port/have_crit.h
@@ -76,6 +76,7 @@ typedef enum
 	INTRPT_IN_MKSTEMP,		/* Deferring interrupts while in mkstemp */
 	INTRPT_IN_CRYPT_RECONFIG,	/* Deferring interrupts during reconfiguration of the encryption state. */
 	INTRPT_IN_UNLINK_AND_CLEAR,	/* Deferring interrupts around unlink and clearing the filename being unlinked */
+	INTRPT_IN_GETC,			/* Deferring interrupts around GETC() call */
 	INTRPT_NUM_STATES		/* Should be the *last* one in the enum. */
 } intrpt_state_t;
 
diff --git a/sr_port/indir.h b/sr_port/indir.h
index 67b68c8..5ca28d5 100755
--- a/sr_port/indir.h
+++ b/sr_port/indir.h
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -9,7 +9,6 @@
  *	the license, please stop and do not read further.	*
  *								*
  ****************************************************************/
-
 /* The third column represents the opcodes for functions to be used by op_indfun().
  * The one parameter version of $name can probably be folded into op_indfun, but at a later time.
  * Note: ***	Please add new entries to end of list so as not to cause execution problems for
diff --git a/sr_port/indirection.c b/sr_port/indirection.c
index eebec1f..67740e0 100755
--- a/sr_port/indirection.c
+++ b/sr_port/indirection.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information 	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -23,7 +23,6 @@
 
 GBLREF	boolean_t	run_time;
 GBLREF	spdesc		stringpool;
-GBLREF	unsigned char	*source_buffer;
 GBLREF	int		source_column;
 
 error_def(ERR_EXPR);
@@ -77,7 +76,7 @@ int indirection(oprtype *a)
 				stx_error(ERR_RPARENMISSING);
 				return FALSE;
 			}
-			end = (char *)source_buffer + (INTPTR_T)source_column - 1;	/* lexical_ptr before last advancewindow */
+			end = ((TREF(source_buffer)).addr + (INTPTR_T)source_column - 1); /* lexical_ptr b4 last advancewindow */
 			len = INTCAST(end - start);
 			oldlen = (TREF(indirection_mval)).str.len;
 			ENSURE_STP_FREE_SPACE(oldlen + len);
diff --git a/sr_port/ins_triple.c b/sr_port/ins_triple.c
index 8330fed..6862970 100755
--- a/sr_port/ins_triple.c
+++ b/sr_port/ins_triple.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2011 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -25,5 +26,4 @@ void ins_triple(triple *x)
 	 */
 	y = (TREF(curtchain))->exorder.bl;
 	dqins(y,exorder,x);
-	CHKTCHAIN(TREF(curtchain));
 }
diff --git a/sr_port/insert_region.c b/sr_port/insert_region.c
index 8930f0a..7512124 100755
--- a/sr_port/insert_region.c
+++ b/sr_port/insert_region.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -80,7 +80,7 @@ tp_region	*insert_region(	gd_region	*reg,
 		csa = (sgmnt_addrs *)&FILE_INFO(reg)->s_addrs;
 	if (!reg->open)
 	{
-		if (!mupfndfil(reg, NULL))
+		if (!mupfndfil(reg, NULL, LOG_ERROR_TRUE))
 			return NULL;
 		if (SS_NORMAL != (save_errno = filename_to_id(&local_id.uid, (char *)reg->dyn.addr->fname)))
 		{	/* WARNING: assignment above */
@@ -163,7 +163,7 @@ tp_region	*insert_region(	gd_region	*reg,
 		 * 	tp_restart() (invoked through t_retry from gvcst_init) will open "reg" as well as get crit on it for us.
 		 */
 		DEBUG_ONLY(TREF(ok_to_call_wcs_recover) = TRUE;)
-		t_retry_needed = (FALSE == grab_crit_immediate(reg));		/* Attempt lockdown now */
+		t_retry_needed = (FALSE == grab_crit_immediate(reg, OK_FOR_WCS_RECOVER_TRUE));	/* Attempt lockdown now */
 		if (!t_retry_needed)
 		{	/* The "grab_crit_immediate" returned successfully. Check if encryption cycles match.
 			 * If they dont, we need to do "grab_crit_encr_cycle_check" but that uses grab_crit and
diff --git a/sr_port/io.h b/sr_port/io.h
index 0d3179a..c881d82 100644
--- a/sr_port/io.h
+++ b/sr_port/io.h
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information 	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -33,6 +33,7 @@
 #endif
 
 error_def(ERR_BADCHSET);
+error_def(ERR_UTF16ENDIAN);
 
 #define INSERT			TRUE
 #define NO_INSERT		FALSE
@@ -421,6 +422,40 @@ LITREF unsigned char ebcdic_spaces_block[];
 }
 #define SET_ENCODING(CHSET, CHSET_MSTR)	SET_ENCODING_VALIDATE(CHSET, CHSET_MSTR,)
 
+#define GET_ADDR_AND_LEN(ADDR, LEN)												\
+{																\
+	ADDR = (char *)(pp->str.addr + p_offset + 1);										\
+	LEN = (int)(*(pp->str.addr + p_offset));										\
+}
+
+/* Set the UTF-16 variant IFF not already set. Use the UTF16 variant to set the new CHSET (for SOCKET devices) */
+#define CHECK_UTF16_VARIANT_AND_SET_CHSET_SOCKET(VARIANT, DEV_CHSET, TMP_CHSET, ASSERT_SOCKETPTR_NULL)				\
+{																\
+	DEBUG_ONLY(														\
+	if (IS_UTF16_CHSET(VARIANT)												\
+		&& (IS_UTF16_CHSET(DEV_CHSET) && (CHSET_UTF16 != DEV_CHSET)))							\
+		assert(VARIANT == DEV_CHSET);											\
+	)															\
+	if (IS_UTF16_CHSET(TMP_CHSET) && (CHSET_UTF16 != TMP_CHSET))								\
+	{															\
+		if (!IS_UTF16_CHSET(VARIANT))											\
+			VARIANT = TMP_CHSET;											\
+		else if (TMP_CHSET != VARIANT)											\
+		{														\
+			ASSERT_SOCKETPTR_NULL;											\
+			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_UTF16ENDIAN, 4, chset_names[VARIANT].len,			\
+				chset_names[VARIANT].addr, chset_names[TMP_CHSET].len, chset_names[TMP_CHSET].addr);		\
+		}														\
+	}															\
+	if (IS_UTF16_CHSET(TMP_CHSET) && IS_UTF16_CHSET(VARIANT))								\
+		DEV_CHSET = VARIANT;												\
+	else															\
+		DEV_CHSET = TMP_CHSET;												\
+}
+/* Set the UTF-16 variant IFF not already set. Use the UTF16 variant to set the new CHSET (for IORM*) */
+#define CHECK_UTF16_VARIANT_AND_SET_CHSET(VARIANT, DEV_CHSET, TMP_CHSET) 	\
+		CHECK_UTF16_VARIANT_AND_SET_CHSET_SOCKET(VARIANT, DEV_CHSET, TMP_CHSET,)
+
 /* Establish a GT.M I/O condition handler if one is not already active and the principal device is the current one. */
 #define ESTABLISH_GTMIO_CH(IOD, SET_CH)												\
 {																\
diff --git a/sr_port/io_rundown.c b/sr_port/io_rundown.c
old mode 100755
new mode 100644
index e8f375d..7dbe550
--- a/sr_port/io_rundown.c
+++ b/sr_port/io_rundown.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2014 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -22,46 +23,70 @@ GBLREF io_pair		io_std_device;
 GBLREF bool		prin_in_dev_failure;
 GBLREF bool		prin_out_dev_failure;
 
-void io_dev_close (io_log_name *d);
+void io_dev_close(io_log_name *d);
 
 void io_rundown (int rundown_type)
 {
 	io_log_name	*l;		/* logical name pointer	*/
 
-	if (io_root_log_name == 0)
+	if (NULL == io_root_log_name)
 		return;
-	for (l = io_root_log_name;  l != 0; l = io_root_log_name)
+	for (l = io_root_log_name;  NULL != l; l = io_root_log_name)
 	{
 		io_root_log_name = l->next;
-		if (l->iod != 0)
+		if ((NULL != l->iod) && (n_io_dev_types == l->iod->type))
+		{	/* Device setup has started but did not complete (e.g. SIG-15 during device set up took us to exit handler)
+			 * Not much can be done in terms of rundown of this device so skip it.
+			 */
+			continue;
+		}
+		if (NULL != l->iod)
 		{
-			if ((NORMAL_RUNDOWN == rundown_type) ||
-			   ((RUNDOWN_EXCEPT_STD == rundown_type) &&
-				((l->iod->pair.in != io_std_device.in) && (l->iod->pair.out != io_std_device.out))))
+			if ((NORMAL_RUNDOWN == rundown_type)
+				|| ((RUNDOWN_EXCEPT_STD == rundown_type)
+					&& ((l->iod->pair.in != io_std_device.in) && (l->iod->pair.out != io_std_device.out))))
 				io_dev_close(l);
 		}
 	}
 }
 
-
 void io_dev_close (io_log_name *d)
 {
 	static readonly unsigned char	p[] = {iop_rundown, iop_eol};
+	io_desc				*iod;
 	mval				pp;
+#	ifdef DEBUG
+	int				close_called;
+#	endif
 
-	if (d->iod->pair.in == io_std_device.in  &&  d->iod->pair.out == io_std_device.out)
+	iod = d->iod;
+	if (iod->pair.in == io_std_device.in  &&  iod->pair.out == io_std_device.out)
 	{
 		if (prin_in_dev_failure || prin_out_dev_failure)
 			return;
 	}
-
-	VMS_ONLY(ESTABLISH(lastchance3);)
 	pp.mvtype = MV_STR;
 	pp.str.addr = (char *) p;
 	pp.str.len = SIZEOF(p);
-	if (d->iod->pair.in && d->iod->pair.in->state == dev_open)
-		(d->iod->pair.in->disp_ptr->close)(d->iod->pair.in, &pp);
-	if (d->iod->pair.out && d->iod->pair.out->state == dev_open)
-		(d->iod->pair.out->disp_ptr->close)(d->iod->pair.out, &pp);
-	VMS_ONLY(REVERT;)
+	DEBUG_ONLY(close_called = 0;)
+	if (iod->pair.in && (iod->pair.in->state == dev_open))
+	{
+		DEBUG_ONLY(close_called = __LINE__;)
+		(iod->pair.in->disp_ptr->close)(iod->pair.in, &pp);
+	}
+	if (iod->pair.out && (iod->pair.out->state == dev_open))
+	{
+		DEBUG_ONLY(close_called = __LINE__;)
+		(iod->pair.out->disp_ptr->close)(iod->pair.out, &pp);
+	}
+	if (iod->newly_created)
+	{
+		assert(0 == close_called);
+		if (gtmsocket == iod->type)
+			iosocket_destroy(iod);
+		else if (rm == iod->type)
+			remove_rms(iod);
+		else
+			assert(FALSE);	/* Not sure what to cleanup */
+	}
 }
diff --git a/sr_port/iop.h b/sr_port/iop.h
index 18659c9..de17929 100755
--- a/sr_port/iop.h
+++ b/sr_port/iop.h
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -179,8 +179,8 @@ IOP_DESC(160, iop_ioerror, IOP_VAR_SIZE, IOP_OPEN_OK | IOP_USE_OK, IOP_SRC_STR),
 IOP_DESC(161, iop_attach, IOP_VAR_SIZE, IOP_OPEN_OK | IOP_USE_OK, IOP_SRC_STR),
 IOP_DESC(162, iop_detach, IOP_VAR_SIZE, IOP_USE_OK, IOP_SRC_STR),
 IOP_DESC(163, iop_zlisten, IOP_VAR_SIZE, IOP_OPEN_OK | IOP_USE_OK, IOP_SRC_STR),
-IOP_DESC(164, iop_ipchset, IOP_VAR_SIZE, IOP_OPEN_OK, IOP_SRC_STR),
-IOP_DESC(165, iop_opchset, IOP_VAR_SIZE, IOP_OPEN_OK, IOP_SRC_STR),
+IOP_DESC(164, iop_ipchset, IOP_VAR_SIZE, IOP_OPEN_OK | IOP_USE_OK, IOP_SRC_STR),
+IOP_DESC(165, iop_opchset, IOP_VAR_SIZE, IOP_OPEN_OK | IOP_USE_OK, IOP_SRC_STR),
 IOP_DESC(166, iop_nodelimiter, 0, IOP_OPEN_OK | IOP_USE_OK, 0),
 IOP_DESC(167, iop_zdelay, 0, IOP_OPEN_OK | IOP_USE_OK, 0),
 IOP_DESC(168, iop_znodelay, 0, IOP_OPEN_OK | IOP_USE_OK, 0),
@@ -201,7 +201,7 @@ IOP_DESC(182, iop_utf16, 0, IOP_OPEN_OK, 0),
 IOP_DESC(183, iop_utf16be, 0, IOP_OPEN_OK, 0),
 IOP_DESC(184, iop_utf16le, 0, IOP_OPEN_OK, 0),
 IOP_DESC(185, iop_pad, SIZEOF(int4), IOP_OPEN_OK, IOP_SRC_INT),
-IOP_DESC(186, iop_chset, IOP_VAR_SIZE, IOP_OPEN_OK, IOP_SRC_STR),
+IOP_DESC(186, iop_chset, IOP_VAR_SIZE, IOP_OPEN_OK | IOP_USE_OK, IOP_SRC_STR),
 IOP_DESC(187, iop_morereadtime, SIZEOF(int4), IOP_OPEN_OK | IOP_USE_OK, IOP_SRC_INT),
 IOP_DESC(188, iop_shell, IOP_VAR_SIZE, IOP_OPEN_OK, IOP_SRC_STR),
 IOP_DESC(189, iop_command, IOP_VAR_SIZE, IOP_OPEN_OK, IOP_SRC_STR),
diff --git a/sr_port/iosocket_close.c b/sr_port/iosocket_close.c
index 594add9..a740907 100755
--- a/sr_port/iosocket_close.c
+++ b/sr_port/iosocket_close.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information 	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -145,6 +145,12 @@ void iosocket_close(io_desc *iod, mval *pp)
 		end = 0;
 	}
 	iosocket_close_range(dsocketptr, start, end, socket_delete, socket_specified);
+	/* "forget" the UTF-16 CHSET variant if no sockets are connected */
+	if (0 >= dsocketptr->n_socket)
+	{
+		dsocketptr->ichset_utf16_variant = iod->ichset = 0;
+		dsocketptr->ochset_utf16_variant = iod->ochset = 0;
+	}
 	if (!socket_specified)
 	{
 		iod->state = dev_closed;
diff --git a/sr_port/iosocket_delimiter.c b/sr_port/iosocket_delimiter.c
index aa9a23c..38bd724 100755
--- a/sr_port/iosocket_delimiter.c
+++ b/sr_port/iosocket_delimiter.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -120,36 +121,81 @@ boolean_t iosocket_delimiter(unsigned char *delimiter_buffer, int4 delimiter_len
 	return TRUE;
 }
 
-void iosocket_delim_conv(socket_struct *socketptr, gtm_chset_t to_chset)
+void iosocket_idelim_conv(socket_struct *socketptr, gtm_chset_t to_chset)
 {
 	static char	*conv_buff = NULL;
 	int		conv_len, delim_index, new_delim_len;
 
 	assert(0 != socketptr->n_delimiter);
-	assert(CHSET_UTF16BE == to_chset || CHSET_UTF16LE == to_chset);
 	assert(gtm_utf8_mode);
 
-	if (NULL == conv_buff)
-		conv_buff = malloc(MAX_DELIM_LEN);
-	for (delim_index = 0; delim_index < socketptr->n_delimiter; delim_index++)
-	{
+	if (IS_UTF16_CHSET(to_chset))
+	{	/* Convert idelimiter[] to UTF-16 */
+		assert(CHSET_UTF16BE == to_chset || CHSET_UTF16LE == to_chset);
+		if (NULL == conv_buff)
+			conv_buff = malloc(MAX_DELIM_LEN);
+		for (delim_index = 0; delim_index < socketptr->n_delimiter; delim_index++)
+		{
+			conv_len = MAX_DELIM_LEN;
+			new_delim_len = gtm_conv(chset_desc[CHSET_UTF8], chset_desc[to_chset], &socketptr->delimiter[delim_index],
+						 conv_buff, &conv_len);
+			assert(MAX_DELIM_LEN > new_delim_len);
+			if (MAX_DELIM_LEN < new_delim_len)
+			{
+				rts_error_csa(CSA_ARG(NULL) VARLSTCNT(1) ERR_DELIMSIZNA);
+				return;
+			}
+			socketptr->idelimiter[delim_index].len = new_delim_len;
+			UNICODE_ONLY(socketptr->idelimiter[delim_index].char_len = socketptr->delimiter[delim_index].char_len);
+			socketptr->idelimiter[delim_index].addr = malloc(new_delim_len);
+			memcpy(socketptr->idelimiter[delim_index].addr, conv_buff, new_delim_len);
+		}
+	} else
+	{	/* Free up the converted idelimiter[] strings */
+		for (delim_index = 0; delim_index < socketptr->n_delimiter; delim_index++)
+		{
+			assert(socketptr->idelimiter[delim_index].addr != socketptr->delimiter[delim_index].addr);
+			if (socketptr->idelimiter[delim_index].addr != socketptr->delimiter[delim_index].addr)
+				free(socketptr->idelimiter[delim_index].addr);
+			socketptr->idelimiter[delim_index] = socketptr->delimiter[delim_index];
+		}
+	}
+	return;
+}
+
+void iosocket_odelim_conv(socket_struct *socketptr, gtm_chset_t to_chset)
+{
+	static char	*conv_buff = NULL;
+	int		conv_len, delim_index, new_len;
+
+	assert(0 != socketptr->n_delimiter);
+	assert(gtm_utf8_mode);
+
+	if (IS_UTF16_CHSET(to_chset))
+	{	/* Convert odelimiter0 to UTF-16 */
+		assert(CHSET_UTF16BE == to_chset || CHSET_UTF16LE == to_chset);
+		if (NULL == conv_buff)
+			conv_buff = malloc(MAX_DELIM_LEN);
 		conv_len = MAX_DELIM_LEN;
-		new_delim_len = gtm_conv(chset_desc[CHSET_UTF8], chset_desc[to_chset], &socketptr->delimiter[delim_index],
-					 conv_buff, &conv_len);
-		assert(MAX_DELIM_LEN > new_delim_len);
-		if (MAX_DELIM_LEN < new_delim_len)
+		new_len = gtm_conv(chset_desc[CHSET_UTF8], chset_desc[to_chset], &socketptr->delimiter[0], conv_buff, &conv_len);
+		assert(MAX_DELIM_LEN > new_len);
+		if (MAX_DELIM_LEN < new_len)
 		{
 			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(1) ERR_DELIMSIZNA);
 			return;
 		}
-		socketptr->idelimiter[delim_index].len = new_delim_len;
-		UNICODE_ONLY(socketptr->idelimiter[delim_index].char_len = socketptr->delimiter[delim_index].char_len);
-		socketptr->idelimiter[delim_index].addr = malloc(new_delim_len);
-		memcpy(socketptr->idelimiter[delim_index].addr, conv_buff, new_delim_len);
+		socketptr->odelimiter0.len = new_len;
+		UNICODE_ONLY(socketptr->odelimiter0.char_len = socketptr->delimiter[0].char_len);
+		socketptr->odelimiter0.addr = malloc(new_len);
+		memcpy(socketptr->odelimiter0.addr, conv_buff, new_len);
+	} else
+	{	/* Free up the converted odelimiter0 string */
+		assert(socketptr->odelimiter0.addr != socketptr->delimiter[0].addr);
+		if (socketptr->odelimiter0.addr != socketptr->delimiter[0].addr)
+			free(socketptr->odelimiter0.addr);
+		socketptr->odelimiter0 = socketptr->delimiter[0];
 	}
-	return;
 }
-
 void iosocket_delimiter_copy(socket_struct *from, socket_struct *to)
 {
 	int	delim_index;
diff --git a/sr_port/iosocket_destroy.c b/sr_port/iosocket_destroy.c
index c312767..c562f0b 100644
--- a/sr_port/iosocket_destroy.c
+++ b/sr_port/iosocket_destroy.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2012, 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2012-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -28,9 +29,14 @@ void iosocket_destroy (io_desc *ciod)
 	assertpro(ciod->type == gtmsocket);
 	assertpro(ciod->state == dev_closed);
 	dsocketptr = (d_socket_struct *) ciod->dev_sp;
-	assertpro(dsocketptr != NULL);
+	assertpro(NULL != dsocketptr);
 	for (lpp = &io_root_log_name, lp = *lpp; lp; lp = *lpp)
 	{
+		if ((NULL != lp->iod) && (n_io_dev_types == lp->iod->type))
+		{
+			assert(FALSE);
+			continue;       /* skip it on pro */
+		}
 		if (lp->iod->pair.in == ciod)
 		{
 			/* The only device that may be "split" is the principal device. Since it is permanently open,
diff --git a/sr_port/iosocket_open.c b/sr_port/iosocket_open.c
index 6fa92d2..022a0a8 100755
--- a/sr_port/iosocket_open.c
+++ b/sr_port/iosocket_open.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2012-2015 Fidelity National Information 	*
+ * Copyright (c) 2012-2016 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -52,6 +52,7 @@ LITREF	mstr			chset_names[];
 error_def(ERR_ABNCOMPTINC);
 error_def(ERR_ADDRTOOLONG);
 error_def(ERR_CHSETALREADY);
+error_def(ERR_CURRSOCKOFR);
 error_def(ERR_DELIMSIZNA);
 error_def(ERR_DELIMWIDTH);
 error_def(ERR_DEVPARINAP);
@@ -67,37 +68,27 @@ error_def(ERR_ZINTRECURSEIO);
 
 #define ESTABLISHED		"ESTABLISHED"
 
-#ifdef UNICODE_SUPPORTED
-#define CHECK_CHSETALREADY(CURRCHSET)						\
-	if ((0 < newdsocket->n_socket) && (chset_idx != CURRCHSET))		\
-		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_CHSETALREADY, 2,	\
-			chset_names[CURRCHSET].len, chset_names[CURRCHSET].addr);
-#define CHECK_CHSETALREADY2(CURRCHSET,NEWCHSET)						\
-	if ((0 < newdsocket->n_socket) && (NEWCHSET != CURRCHSET))		\
-		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_CHSETALREADY, 2,	\
-			chset_names[CURRCHSET].len, chset_names[CURRCHSET].addr);
-#endif
-
 short	iosocket_open(io_log_name *dev, mval *pp, int file_des, mval *mspace, int4 timepar)
 {
 	char			addr[SA_MAXLITLEN], *errptr, sockaddr[SA_MAXLITLEN],
 		                temp_addr[SA_MAXLITLEN], dev_type[MAX_DEV_TYPE_LEN];
+	static char		*conv_buff = NULL;
 	unsigned char		ch, *c, *start, *next, *top;
-	int			handle_len, moreread_timeout, len;
+	int			new_ozff_len, conv_len, handle_len, moreread_timeout, len;
 	unsigned short		port;
 	int4			errlen, msec_timeout, real_errno, p_offset = 0, zff_len, delimiter_len;
-	int			d_socket_struct_len;
+	int			d_socket_struct_len, soc_cnt;
 	ABS_TIME		cur_time, end_time;
 	io_desc			*ioptr;
 	fd_set			tcp_fd;
 	uint4			bfsize = DEFAULT_SOCKET_BUFFER_SIZE, ibfsize;
         d_socket_struct         *dsocketptr;
-	socket_struct		*socketptr = NULL;
+	socket_struct		*curr_socketptr = NULL, *socketptr = NULL, *localsocketptr = NULL;
 	mv_stent		*mv_zintdev;
 	boolean_t		zint_conn_restart = FALSE;
 	socket_interrupt	*sockintr;
 	mstr			chset_mstr;
-	gtm_chset_t		default_chset;
+	gtm_chset_t		default_chset, temp_ichset, temp_ochset;
 	boolean_t		attach_specified = FALSE,
 		                listen_specified = FALSE,
 		                connect_specified = FALSE,
@@ -177,14 +168,23 @@ short	iosocket_open(io_log_name *dev, mval *pp, int file_des, mval *mspace, int4
 		if (mv_zintdev && mv_zintdev->mv_st_cont.mvs_zintdev.buffer_valid)
 		{	/* mupintr will be reset and mvstent popped in iosocket_connect */
 			connect_specified = TRUE;
+			listen_specified = FALSE;
 			ibfsize_specified = sockintr->ibfsize_specified;
 			assert(newdsocket);
 			assert(newdsocket == sockintr->newdsocket);
 			memcpy(newdsocket, (d_socket_struct *)mv_zintdev->mv_st_cont.mvs_zintdev.curr_sp_buffer.addr,
 					d_socket_struct_len);
 			socketptr = newdsocket->socket[newdsocket->current_socket];
+			ichset_specified = newdsocket->ichset_specified;
+			ochset_specified = newdsocket->ochset_specified;
+			temp_ichset = ioptr->ichset;
+			temp_ochset = ioptr->ochset;
 			assert(socketptr == (socket_struct *)mv_zintdev->mv_st_cont.mvs_zintdev.socketptr);
 			zint_conn_restart = TRUE;	/* skip what we already did, state == dev_closed */
+		} else
+		{
+			ichset_specified = ochset_specified = FALSE;
+			temp_ichset = temp_ochset = CHSET_M;
 		}
 	} else
 	{
@@ -216,10 +216,8 @@ short	iosocket_open(io_log_name *dev, mval *pp, int file_des, mval *mspace, int4
 					UNICODE_ONLY(
 						if (gtm_utf8_mode)
 					        {	/* Only change ipchset if in UTF8 mode */
-							chset_mstr.addr = (char *)(pp->str.addr + p_offset + 1);
-							chset_mstr.len = *(pp->str.addr + p_offset);
-							SET_ENCODING_VALIDATE(ioptr->ichset, &chset_mstr,
-								CHECK_CHSETALREADY(ioptr->ichset));
+							GET_ADDR_AND_LEN(chset_mstr.addr, chset_mstr.len);
+							SET_ENCODING(temp_ichset, &chset_mstr)
 							ichset_specified = TRUE;
 						}
 					);
@@ -228,10 +226,8 @@ short	iosocket_open(io_log_name *dev, mval *pp, int file_des, mval *mspace, int4
 					UNICODE_ONLY(
 						if (gtm_utf8_mode)
 		 				{       /* Only change ipchset if in UTF8 mode */
-							chset_mstr.addr = (char *)(pp->str.addr + p_offset + 1);
-							chset_mstr.len = *(pp->str.addr + p_offset);
-							SET_ENCODING_VALIDATE(ioptr->ochset, &chset_mstr,
-								CHECK_CHSETALREADY(ioptr->ochset));
+							GET_ADDR_AND_LEN(chset_mstr.addr, chset_mstr.len);
+							SET_ENCODING(temp_ochset, &chset_mstr)
 							ochset_specified = TRUE;
 						}
 					);
@@ -240,12 +236,9 @@ short	iosocket_open(io_log_name *dev, mval *pp, int file_des, mval *mspace, int4
 					UNICODE_ONLY(
 						if (gtm_utf8_mode)
 						{       /* Only change ipchset/opchset if in UTF8 mode */
-							chset_mstr.addr = (char *)(pp->str.addr + p_offset + 1);
-							chset_mstr.len = *(pp->str.addr + p_offset);
-							SET_ENCODING_VALIDATE(ioptr->ichset, &chset_mstr,
-								CHECK_CHSETALREADY(ioptr->ichset));
-							CHECK_CHSETALREADY2(ioptr->ochset, ioptr->ichset);
-							ioptr->ochset = ioptr->ichset;
+							GET_ADDR_AND_LEN(chset_mstr.addr, chset_mstr.len);
+							SET_ENCODING(temp_ichset, &chset_mstr)
+							temp_ochset = temp_ichset;
 							ichset_specified = ochset_specified = TRUE;
                                         	}
 					);
@@ -255,9 +248,7 @@ short	iosocket_open(io_log_name *dev, mval *pp, int file_des, mval *mspace, int4
 			*/
 				case iop_m:
 					UNICODE_ONLY(
-						CHECK_CHSETALREADY2(ioptr->ichset, CHSET_M);
-						CHECK_CHSETALREADY2(ioptr->ochset, CHSET_M);
-						ioptr->ichset = ioptr->ochset = CHSET_M;
+						temp_ichset = temp_ochset = CHSET_M;
 						ichset_specified = ochset_specified = TRUE;
 					);
 					break;
@@ -265,9 +256,7 @@ short	iosocket_open(io_log_name *dev, mval *pp, int file_des, mval *mspace, int4
 					UNICODE_ONLY(
 						if (gtm_utf8_mode)
 						{       /* Only change chset if in UTF8 mode */
-							CHECK_CHSETALREADY2(ioptr->ichset, CHSET_UTF16);
-							CHECK_CHSETALREADY2(ioptr->ochset, CHSET_UTF16);
-							ioptr->ichset = ioptr->ochset = CHSET_UTF16;
+							temp_ichset = temp_ochset = CHSET_UTF16;
 							ichset_specified = ochset_specified = TRUE;
 						}
 					);
@@ -276,9 +265,7 @@ short	iosocket_open(io_log_name *dev, mval *pp, int file_des, mval *mspace, int4
 					UNICODE_ONLY(
 						if (gtm_utf8_mode)
 						{       /* Only change chset if in UTF8 mode */
-							CHECK_CHSETALREADY2(ioptr->ichset, CHSET_UTF16BE);
-							CHECK_CHSETALREADY2(ioptr->ochset, CHSET_UTF16BE);
-							ioptr->ichset = ioptr->ochset = CHSET_UTF16BE;
+							temp_ichset = temp_ochset = CHSET_UTF16BE;
 							ichset_specified = ochset_specified = TRUE;
 						}
 					);
@@ -287,9 +274,7 @@ short	iosocket_open(io_log_name *dev, mval *pp, int file_des, mval *mspace, int4
 					UNICODE_ONLY(
 						if (gtm_utf8_mode)
 						{       /* Only change chset if in UTF8 mode */
-							CHECK_CHSETALREADY2(ioptr->ichset, CHSET_UTF16LE);
-							CHECK_CHSETALREADY2(ioptr->ochset, CHSET_UTF16LE);
-							ioptr->ichset = ioptr->ochset = CHSET_UTF16LE;
+							temp_ichset = temp_ochset = CHSET_UTF16LE;
 							ichset_specified = ochset_specified = TRUE;
 						}
 					);
@@ -439,7 +424,15 @@ short	iosocket_open(io_log_name *dev, mval *pp, int file_des, mval *mspace, int4
 			return FALSE;
 		}
 		if (listen_specified || connect_specified || is_principal)
-		{
+		{	/* CHSET cannot be specified when opening a new socket, if there already are open sockets. */
+			if (0 < dsocketptr->n_socket && ((ochset_specified && (temp_ochset != ioptr->ochset))
+				|| (ichset_specified && (temp_ichset != ioptr->ichset))))
+			{
+				rts_error_csa(CSA_ARG(NULL) VARLSTCNT(10) ERR_CHSETALREADY, 8,
+					chset_names[ioptr->ichset].len, chset_names[ioptr->ichset].addr,
+					chset_names[ioptr->ochset].len, chset_names[ioptr->ochset].addr);
+				return FALSE;
+			}
 			if (NULL == (socketptr = iosocket_create(sockaddr, bfsize, is_principal ? file_des : -1, listen_specified)))
 			{
 				REVERT_GTMIO_CH(&ioptr->pair, ch_set);
@@ -483,47 +476,70 @@ short	iosocket_open(io_log_name *dev, mval *pp, int file_des, mval *mspace, int4
 				iosocket_handle(sock_handle, &handle_len, TRUE, dsocketptr);
 			socketptr->handle_len = handle_len;
 			memcpy(socketptr->handle, sock_handle, handle_len);
-                	/* parse the delimiter: delimiter_buffer ==> socketptr->delimiter[...] */
-			if (0 <= delimiter_len)
-				iosocket_delimiter(delimiter_buffer, delimiter_len, socketptr, (0 == delimiter_len));
-			if (ioptr->wrap && 0 != socketptr->n_delimiter && ioptr->width < socketptr->delimiter[0].len)
-			{
-				socketptr_delim_len = socketptr->delimiter[0].len;
-				SOCKET_FREE(socketptr);
-				rts_error_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_DELIMWIDTH, 2, ioptr->width, socketptr_delim_len);
-				assert(FALSE);
-			}
 			/* connects newdsocket and socketptr (the new socket) */
 			if (gtm_max_sockets <= newdsocket->n_socket)
 			{
 				assert(ioptr->newly_created == FALSE);
 				if (FD_INVALID != socketptr->temp_sd)
-					close(socketptr->temp_sd);
-				SOCKET_FREE(socketptr);
-				rts_error_csa(CSA_ARG(NULL) VARLSTCNT(3) ERR_SOCKMAX, 1, gtm_max_sockets);
-				return FALSE;
-			}
+						close(socketptr->temp_sd);
+					SOCKET_FREE(socketptr);
+					rts_error_csa(CSA_ARG(NULL) VARLSTCNT(3) ERR_SOCKMAX, 1, gtm_max_sockets);
+					return FALSE;
+				}
 			socketptr->dev = newdsocket;
 			newdsocket->socket[newdsocket->n_socket++] = socketptr;
 			newdsocket->current_socket = newdsocket->n_socket - 1;
 		}
-		if (socketptr && (0 <= zff_len) && /* ZFF or ZNOFF specified */
-		    (0 < (socketptr->zff.len = zff_len))) /* assign the new ZFF len, might be 0 from ZNOFF, or ZFF="" */
+		/* set curr_socketptr to the new socket, if created, or the existing current socket.
+		 * curr_socketptr will be used to set the values of delimiter, ZFF. */
+		if (!socketptr)
+		{	/* If new socket not created, then use the existing (current) socket from the socket device */
+ 			if (dsocketptr->n_socket <= dsocketptr->current_socket)
+	 		{
+				assert(FALSE);
+				rts_error_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_CURRSOCKOFR, 2, dsocketptr->current_socket,
+						dsocketptr->n_socket);
+ 				return FALSE;
+			}
+			if (-1 != dsocketptr->current_socket)
+				curr_socketptr = dsocketptr->socket[dsocketptr->current_socket];
+		} else	/* Set to the newly created socket */
+			curr_socketptr = socketptr;
+		/* parse the delimiter: delimiter_buffer ==> socketptr->delimiter[...] */
+		if ((0 <= delimiter_len) && (curr_socketptr))
+				iosocket_delimiter(delimiter_buffer, delimiter_len, curr_socketptr, (0 == delimiter_len));
+		if (ioptr->wrap && curr_socketptr && (0 != curr_socketptr->n_delimiter)
+			&& (ioptr->width < curr_socketptr->delimiter[0].len))
+		{
+			socketptr_delim_len = curr_socketptr->delimiter[0].len;
+			SOCKET_FREE(curr_socketptr);
+			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_DELIMWIDTH, 2, ioptr->width, socketptr_delim_len);
+			assert(FALSE);
+		}
+		if (curr_socketptr && (0 <= zff_len) && /* ZFF or ZNOFF specified */
+		    (0 < (curr_socketptr->zff.len = zff_len))) /* assign the new ZFF len, might be 0 from ZNOFF, or ZFF="" */
 		{ /* ZFF="non-zero-len-string" specified */
 			if (gtm_utf8_mode) /* Check if ZFF has any invalid UTF-8 character */
 			{ /* Note: the ZFF string originates from the source program, so is in UTF-8 mode or M mode regardless
 		   	   * of OCHSET of this device. ZFF is output on WRITE # command, and MUST contain valid UTF-8 sequence. */
 				utf8_len_strict(zff_buffer, zff_len); /* triggers badchar error for invalid sequence */
 			}
-			if (NULL == socketptr->zff.addr) /* we rely on socketptr->zff.addr being set to 0 in iosocket_create() */
-				socketptr->zff.addr = (char *)malloc(MAX_ZFF_LEN);
-			else if (socketptr->zff.addr != socketptr->ozff.addr)
+			 /* we rely on curr_socketptr->zff.addr being set to 0 in iosocket_create() */
+			if (NULL == curr_socketptr->zff.addr)
+				curr_socketptr->zff.addr = (char *)malloc(MAX_ZFF_LEN);
+			else if (curr_socketptr->zff.addr != curr_socketptr->ozff.addr)
 			{
-				assert(NULL != socketptr->ozff.addr);
-				free(socketptr->ozff.addr);	/* prevent leak of prior converted form */
+				assert(NULL != curr_socketptr->ozff.addr);
+				free(curr_socketptr->ozff.addr);	/* prevent leak of prior converted form */
 			}
-			memcpy(socketptr->zff.addr, zff_buffer, zff_len);
-			socketptr->ozff = socketptr->zff;	/* will contain converted UTF-16 form if needed */
+			memcpy(curr_socketptr->zff.addr, zff_buffer, zff_len);
+			curr_socketptr->ozff = curr_socketptr->zff;	/* will contain converted UTF-16 form if needed */
+		} else if (curr_socketptr && (0 == zff_len))
+		{
+			/* CHSET can change as part of reOPEN, hence changing the converted zff */
+			if ((NULL != curr_socketptr->ozff.addr) && (curr_socketptr->ozff.addr != curr_socketptr->zff.addr))
+				free(curr_socketptr->ozff.addr);	/* previously converted */
+			curr_socketptr->ozff = curr_socketptr->zff;	/* will contain converted UTF-16 form if needed */
 		}
 	}
 	/* action */
@@ -569,20 +585,97 @@ short	iosocket_open(io_log_name *dev, mval *pp, int file_des, mval *mspace, int4
 	}
 	/* commit the changes to the list */
 	if (0 >= dsocketptr->n_socket)		/* before any new socket added */
-	{	/* don't change chset if this is not the first socket */
+	{	/* Set default CHSET in case none supplied */
 		default_chset = (gtm_utf8_mode) ? CHSET_UTF8 : CHSET_M;
 		if (!ichset_specified && !IS_UTF16_CHSET(ioptr->ichset))
 			ioptr->ichset = default_chset;
 		if (!ochset_specified && !IS_UTF16_CHSET(ioptr->ochset))
 			ioptr->ochset = default_chset;
-		if (CHSET_M != ioptr->ichset && CHSET_UTF16 != ioptr->ichset)
-			get_chset_desc(&chset_names[ioptr->ichset]);
-		if (CHSET_M != ioptr->ochset && CHSET_UTF16 != ioptr->ochset)
-			get_chset_desc(&chset_names[ioptr->ochset]);
+	}
+	/* These parameters are to be set every time CHSET changes */
+	if (ichset_specified)
+	{
+		CHECK_UTF16_VARIANT_AND_SET_CHSET_SOCKET(dsocketptr->ichset_utf16_variant, ioptr->ichset, temp_ichset,
+								assert(!socketptr));
+		newdsocket->ichset_utf16_variant = dsocketptr->ichset_utf16_variant;
+		newdsocket->ichset_specified = dsocketptr->ichset_specified = TRUE;
+	}
+	if (ochset_specified)
+	{
+		CHECK_UTF16_VARIANT_AND_SET_CHSET_SOCKET(dsocketptr->ochset_utf16_variant, ioptr->ochset, temp_ochset,
+								assert(!socketptr));
+		newdsocket->ochset_utf16_variant = dsocketptr->ochset_utf16_variant;
+		newdsocket->ochset_specified = dsocketptr->ochset_specified = TRUE;
+	}
+	if ((CHSET_M != ioptr->ichset) && (CHSET_UTF16 != ioptr->ichset) && (CHSET_MAX_IDX > ioptr->ichset))
+		get_chset_desc(&chset_names[ioptr->ichset]);
+	if ((CHSET_M != ioptr->ochset) && (CHSET_UTF16 != ioptr->ochset) && (CHSET_MAX_IDX > ioptr->ichset))
+		get_chset_desc(&chset_names[ioptr->ochset]);
+	if (gtm_utf8_mode)
+	{
+		/* If CHSET is being changed to UTF-16, and delimitors are not converted, convert them
+		 * But only if the UTF16 variant has already been determined.
+		 * If CHSET is being changed to non-UTF-16, and delims are converted, free them
+		 * Do this delimiter conversion for all sockets in the currect device.
+		 */
 		if (ichset_specified)
-			newdsocket->ichset_specified = TRUE;
+			for (soc_cnt=0; soc_cnt < dsocketptr->n_socket; soc_cnt++)
+			{
+				localsocketptr = dsocketptr->socket[soc_cnt];
+				if (!(localsocketptr && (0 < localsocketptr->n_delimiter)))
+					continue;
+				if (((localsocketptr->delimiter[0].addr == localsocketptr->idelimiter[0].addr) &&
+						 IS_UTF16_CHSET(ioptr->ichset) && IS_UTF16_CHSET(dsocketptr->ichset_utf16_variant))
+					|| ((localsocketptr->delimiter[0].addr != localsocketptr->idelimiter[0].addr)
+						&& !IS_UTF16_CHSET(ioptr->ichset)))
+							iosocket_idelim_conv(localsocketptr, ioptr->ichset);
+			}
+		if (ochset_specified)
+			for (soc_cnt=0; soc_cnt < dsocketptr->n_socket; soc_cnt++)
+			{
+				localsocketptr = dsocketptr->socket[soc_cnt];
+				if (!(localsocketptr && (0 < localsocketptr->n_delimiter)))
+					continue;
+				if (((localsocketptr->delimiter[0].addr == localsocketptr->odelimiter0.addr) &&
+						IS_UTF16_CHSET(ioptr->ochset) && IS_UTF16_CHSET(dsocketptr->ochset_utf16_variant))
+					|| ((localsocketptr->delimiter[0].addr != localsocketptr->odelimiter0.addr)
+						&& !IS_UTF16_CHSET(ioptr->ochset)))
+							iosocket_odelim_conv(localsocketptr, ioptr->ochset);
+			}
+		/* Now convert the ZFFs */
 		if (ochset_specified)
-			newdsocket->ochset_specified = TRUE;
+		{
+			if (!IS_UTF16_CHSET(ioptr->ochset))
+			{	/* Changed to a non-UTF16 CHSET. free all converted ZFFs */
+				for (soc_cnt=0; soc_cnt < dsocketptr->n_socket; soc_cnt++)
+				{
+					localsocketptr = dsocketptr->socket[soc_cnt];
+					if (localsocketptr && (NULL != localsocketptr->ozff.addr) && (0 < localsocketptr->zff.len)
+						&& (localsocketptr->ozff.addr != localsocketptr->zff.addr))
+						free(localsocketptr->ozff.addr);	/* previously converted */
+					localsocketptr->ozff = localsocketptr->zff;	/* contains converted UTF-16 form */
+				}
+			} else if (IS_UTF16_CHSET(dsocketptr->ochset_utf16_variant))
+			{	/* Changed to UTF-16 CHSET. convert all ZFFs */
+				conv_buff = malloc(MAX_ZFF_LEN);
+				for (soc_cnt=0; soc_cnt < dsocketptr->n_socket; soc_cnt++)
+				{
+					localsocketptr = dsocketptr->socket[soc_cnt];
+					if (localsocketptr && (NULL != localsocketptr->zff.addr) && (0 < localsocketptr->zff.len)
+						 && (localsocketptr->ozff.addr == localsocketptr->zff.addr))
+					{
+						conv_len = MAX_ZFF_LEN;
+						new_ozff_len = gtm_conv(chset_desc[CHSET_UTF8], chset_desc[ioptr->ochset],
+									 &localsocketptr->zff, conv_buff, &conv_len);
+						assert(MAX_ZFF_LEN > new_ozff_len);
+						localsocketptr->ozff.len = new_ozff_len;
+						localsocketptr->ozff.addr = malloc(new_ozff_len);
+						memcpy(localsocketptr->ozff.addr, conv_buff, new_ozff_len);
+						memset(conv_buff, 0, MAX_ZFF_LEN);	/* Reset to be reused. */
+					}
+				}
+			}
+		}
 	}
 	if (listen_specified || connect_specified || is_principal)
 	{
diff --git a/sr_port/iosocket_readfl.c b/sr_port/iosocket_readfl.c
index 17ec59d..a746e1a 100644
--- a/sr_port/iosocket_readfl.c
+++ b/sr_port/iosocket_readfl.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information 	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -328,9 +328,13 @@ int	iosocket_readfl(mval *v, int4 width, int4 timeout)
 	ret = TRUE;
 	has_delimiter = (0 < socketptr->n_delimiter);
 	do_delim_conv = FALSE;
-	if (has_delimiter && IS_UTF16_CHSET(iod->ichset))
-	{
-		if (socketptr->delimiter[0].addr == socketptr->idelimiter[0].addr)
+	if (has_delimiter && gtm_utf8_mode)
+	{	/* CHSET can be switched b/w M/UTF-8/UTF-16* in UTF-8 mode. Convert the delimitor accordingly *
+		 * 1. delimiter[] == idelimiter[] (i.e. it's not been converted) && IS_UTF16_CHSET
+		 * 2. delimiter[] != idelimiter (i.e. it's been converted to UTF-16) && CHSET is NOT UTF-16
+		 */
+		if (((socketptr->delimiter[0].addr == socketptr->idelimiter[0].addr) && IS_UTF16_CHSET(ichset))
+			|| ((socketptr->delimiter[0].addr != socketptr->idelimiter[0].addr) && !IS_UTF16_CHSET(ichset)))
 			do_delim_conv = TRUE;
 	}
 	need_get_chset = FALSE;		/* if we change ichset, make sure converter available */
@@ -553,6 +557,16 @@ int	iosocket_readfl(mval *v, int4 width, int4 timeout)
 			bytes_read += (int)status;
 			UNIX_ONLY(if (iod == io_std_device.out)
 					  prin_in_dev_failure = FALSE);
+			/* In case the CHSET changes from non-UTF-16 to UTF-16 and a read has already been done, there's no way to
+			 * read the BOM bytes & to determine the variant. So default to UTF-16BE, if not already determined.
+			 */
+			if (!socketptr->first_read &&
+				((CHSET_UTF16 == ichset) && (!IS_UTF16_CHSET(dsocketptr->ichset_utf16_variant))))
+			{
+				DBGSOCK2((stdout, "socrfl: UTF16BE BOM assumed\n"));
+				iod->ichset = ichset = dsocketptr->ichset_utf16_variant = CHSET_UTF16BE;
+				need_get_chset = TRUE;
+			}
 			if (socketptr->first_read && (CHSET_M != ichset))	/* May have a BOM to defuse */
 			{
 				if (CHSET_UTF8 != ichset)
@@ -576,6 +590,7 @@ int	iosocket_readfl(mval *v, int4 width, int4 timeout)
 							} else
 							{
 								iod->ichset = ichset = CHSET_UTF16BE;
+								dsocketptr->ichset_utf16_variant = CHSET_UTF16BE;
 								need_get_chset = TRUE;
 								bytes_read -= UTF16BE_BOM_LEN;	/* Throw way BOM */
 								DBGSOCK2((stdout, "socrfl: UTF16BE BOM detected\n"));
@@ -593,6 +608,7 @@ int	iosocket_readfl(mval *v, int4 width, int4 timeout)
 							} else
 							{
                                                                 iod->ichset = ichset = CHSET_UTF16LE;
+								dsocketptr->ichset_utf16_variant = CHSET_UTF16LE;
 								need_get_chset = TRUE;
 								bytes_read -= UTF16BE_BOM_LEN;	/* Throw away BOM */
                                                                 DBGSOCK2((stdout, "socrfl: UTF16LE BOM detected\n"));
@@ -605,6 +621,7 @@ int	iosocket_readfl(mval *v, int4 width, int4 timeout)
 							{
 								DBGSOCK2((stdout, "socrfl: UTF16BE BOM assumed\n"));
 								iod->ichset = ichset = CHSET_UTF16BE;
+								dsocketptr->ichset_utf16_variant = CHSET_UTF16BE;
 								need_get_chset = TRUE;
 							}
 						}
@@ -615,7 +632,7 @@ int	iosocket_readfl(mval *v, int4 width, int4 timeout)
 						if (CHSET_UTF16 == ichset)
 						{
 							DBGSOCK2((stdout, "socrfl: UTF16BE BOM assumed\n"));
-							iod->ichset = ichset = CHSET_UTF16BE;
+							iod->ichset = ichset = dsocketptr->ichset_utf16_variant = CHSET_UTF16BE;
 							need_get_chset = TRUE;
 						}
 					}
@@ -637,7 +654,7 @@ int	iosocket_readfl(mval *v, int4 width, int4 timeout)
 			}
 			if (do_delim_conv)
 			{
-				iosocket_delim_conv(socketptr, ichset);
+				iosocket_idelim_conv(socketptr, ichset);
 				do_delim_conv = FALSE;
 			}
 			if (bytes_read && has_delimiter)
@@ -653,12 +670,16 @@ int	iosocket_readfl(mval *v, int4 width, int4 timeout)
 					{
 						terminator = TRUE;
 						match_delim = ii;
-						memcpy(iod->dollar.zb, socketptr->idelimiter[ii].addr,
-						       MIN(socketptr->idelimiter[ii].len, ESC_LEN - 1));
-						iod->dollar.zb[MIN(socketptr->idelimiter[ii].len, ESC_LEN - 1)] = '\0';
-						memcpy(iod->dollar.key, socketptr->idelimiter[ii].addr,
-						       MIN(socketptr->idelimiter[ii].len, DD_BUFLEN - 1));
-						iod->dollar.key[MIN(socketptr->idelimiter[ii].len, DD_BUFLEN - 1)] = '\0';
+						/* since idelimiter contains the converted value for UTF-16, $ZB and $KEY will have
+						 * a UTF-16 value instead of UTF-8 which is the chset used for strings.
+						 * Hence use delimiter instead of idelimiter.
+						 */
+						memcpy(iod->dollar.zb, socketptr->delimiter[ii].addr,
+						       MIN(socketptr->delimiter[ii].len, ESC_LEN - 1));
+						iod->dollar.zb[MIN(socketptr->delimiter[ii].len, ESC_LEN - 1)] = '\0';
+						memcpy(iod->dollar.key, socketptr->delimiter[ii].addr,
+						       MIN(socketptr->delimiter[ii].len, DD_BUFLEN - 1));
+						iod->dollar.key[MIN(socketptr->delimiter[ii].len, DD_BUFLEN - 1)] = '\0';
 						break;
 					}
 				}
diff --git a/sr_port/iosocket_use.c b/sr_port/iosocket_use.c
index 62138e3..fd59a20 100755
--- a/sr_port/iosocket_use.c
+++ b/sr_port/iosocket_use.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2013-2015 Fidelity National Information 	*
+ * Copyright (c) 2013-2016 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -52,6 +52,7 @@ LITREF	mstr			chset_names[];
 error_def(ERR_ABNCOMPTINC);
 error_def(ERR_ACOMPTBINC);
 error_def(ERR_ADDRTOOLONG);
+error_def(ERR_CHSETALREADY);
 error_def(ERR_ANCOMPTINC);
 error_def(ERR_CURRSOCKOFR);
 error_def(ERR_DELIMSIZNA);
@@ -72,10 +73,11 @@ error_def(ERR_ZINTRECURSEIO);
 void	iosocket_use(io_desc *iod, mval *pp)
 {
 	unsigned char	ch, len;
-	int		handled_len, handlea_len, handles_len, int_len;
+	static char	*conv_buff = NULL;
+	int		new_ozff_len, conv_len, handled_len, handlea_len, handles_len, int_len, soc_cnt;
 	int4		length, width, new_len;
 	d_socket_struct *dsocketptr;
-	socket_struct	*socketptr, newsocket;
+	socket_struct	*socketptr, newsocket, *localsocketptr;
 	char		handlea[MAX_HANDLE_LEN], handles[MAX_HANDLE_LEN], handled[MAX_HANDLE_LEN];
  	char            addr[SA_MAXLITLEN], *errptr, sockaddr[SA_MAXLITLEN],
 		        temp_addr[SA_MAXLITLEN], ioerror, *free_ozff = NULL;
@@ -90,6 +92,8 @@ void	iosocket_use(io_desc *iod, mval *pp)
 		        delay_specified = FALSE,
 		        nodelay_specified = FALSE,
 		        bfsize_specified = FALSE,
+			ochset_specified = FALSE,
+			ichset_specified = FALSE,
 		        ibfsize_specified = FALSE,
 		        moreread_specified = FALSE,
 		        flush_specified = FALSE,
@@ -99,6 +103,8 @@ void	iosocket_use(io_desc *iod, mval *pp)
 	uint4		bfsize = DEFAULT_SOCKET_BUFFER_SIZE, ibfsize;
 	char		*tab;
 	int		save_errno;
+	mstr		chset_mstr;
+	gtm_chset_t	temp_ochset, temp_ichset;
 	size_t		d_socket_struct_len;
 	boolean_t	ch_set;
 
@@ -254,6 +260,11 @@ void	iosocket_use(io_desc *iod, mval *pp)
 				if (DEFAULT_CODE_SET != iod->in_code_set)
 					ICONV_OPEN_CD(iod->input_conv_cd, INSIDE_CH_SET, (char *)(pp->str.addr + p_offset + 1));
 #endif
+				GET_ADDR_AND_LEN(chset_mstr.addr, chset_mstr.len);
+				SET_ENCODING(temp_ichset, &chset_mstr);
+				if (!gtm_utf8_mode && IS_UTF_CHSET(temp_ichset))
+					break;	/* ignore UTF chsets if not utf8_mode */
+				ichset_specified = TRUE;
 				break;
 			case iop_opchset:
 #if defined(KEEP_zOS_EBCDIC) || defined(VMS)
@@ -263,6 +274,20 @@ void	iosocket_use(io_desc *iod, mval *pp)
 				if (DEFAULT_CODE_SET != iod->out_code_set)
 					ICONV_OPEN_CD(iod->output_conv_cd, (char *)(pp->str.addr + p_offset + 1), INSIDE_CH_SET);
 #endif
+				GET_ADDR_AND_LEN(chset_mstr.addr, chset_mstr.len);
+				SET_ENCODING(temp_ochset, &chset_mstr);
+				if (!gtm_utf8_mode && IS_UTF_CHSET(temp_ochset))
+					break;	/* ignore UTF chsets if not utf8_mode */
+				ochset_specified = TRUE;
+				break;
+			case iop_chset:
+				GET_ADDR_AND_LEN(chset_mstr.addr, chset_mstr.len);
+				SET_ENCODING(temp_ochset, &chset_mstr);
+				SET_ENCODING(temp_ichset, &chset_mstr);
+				if (!gtm_utf8_mode && IS_UTF_CHSET(temp_ichset))
+					break;	/* ignore UTF chsets if not utf8_mode */
+				ochset_specified = TRUE;
+				ichset_specified = TRUE;
 				break;
 			case iop_zff:
 				if (MAX_ZFF_LEN >= (zff_len = (int4)(unsigned char)*(pp->str.addr + p_offset)))
@@ -341,6 +366,16 @@ void	iosocket_use(io_desc *iod, mval *pp)
 				 LEN_AND_LIT("USE"));
 		return;
 	}
+	if ((ichset_specified || ochset_specified) && (listen_specified || connect_specified))
+	{	/* CHSET cannot be specified when opening a new socket, if there already are open sockets. */
+		if (0 < dsocketptr->n_socket && ((temp_ochset != iod->ochset) || (temp_ichset != iod->ichset)))
+		{
+			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(10) ERR_CHSETALREADY, 8,
+				chset_names[iod->ichset].len, chset_names[iod->ichset].addr,
+				chset_names[iod->ochset].len, chset_names[iod->ochset].addr);
+			return;
+		}
+	}
 	if (delay_specified && nodelay_specified)
 	{
 		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(8) ERR_ABNCOMPTINC, 6, LEN_AND_LIT("DELAY"), LEN_AND_LIT("NODELAY"),
@@ -474,6 +509,25 @@ void	iosocket_use(io_desc *iod, mval *pp)
 	}
 	if (iod->wrap && 0 != newsocket.n_delimiter && iod->width < newsocket.delimiter[0].len)
 		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_DELIMWIDTH, 2, iod->width, newsocket.delimiter[0].len);
+	/* Process the CHSET changes */
+	if (ichset_specified)
+	{
+		CHECK_UTF16_VARIANT_AND_SET_CHSET_SOCKET(dsocketptr->ichset_utf16_variant, iod->ichset, temp_ichset,
+								assert(!socketptr));
+		newdsocket->ichset_utf16_variant = dsocketptr->ichset_utf16_variant;
+		newdsocket->ichset_specified = dsocketptr->ichset_specified = TRUE;
+	}
+	if (ochset_specified)
+	{
+		CHECK_UTF16_VARIANT_AND_SET_CHSET_SOCKET(dsocketptr->ochset_utf16_variant, iod->ochset, temp_ochset,
+								assert(!socketptr));
+		newdsocket->ochset_utf16_variant = dsocketptr->ochset_utf16_variant;
+		newdsocket->ochset_specified = dsocketptr->ochset_specified = TRUE;
+	}
+	if ((CHSET_M != iod->ichset) && (CHSET_UTF16 != iod->ichset) && (CHSET_MAX_IDX > iod->ichset))
+		get_chset_desc(&chset_names[iod->ichset]);
+	if ((CHSET_M != iod->ochset) && (CHSET_UTF16 != iod->ochset) && (CHSET_MAX_IDX > iod->ichset))
+		get_chset_desc(&chset_names[iod->ochset]);
 	if (0 <= zff_len && /* ZFF or ZNOFF specified */
 	    0 < (newsocket.zff.len = zff_len)) /* assign the new ZFF len, might be 0 from ZNOFF, or ZFF="" */
 	{	/* ZFF="non-zero-len-string" specified */
@@ -498,7 +552,75 @@ void	iosocket_use(io_desc *iod, mval *pp)
 		if ((NULL != newsocket.ozff.addr) && (socketptr->ozff.addr != socketptr->zff.addr))
 			free_ozff = newsocket.ozff.addr;	/* previously converted */
 		newsocket.ozff = newsocket.zff;
-
+	}
+	if (gtm_utf8_mode)
+	{
+		/* If CHSET is being changed to UTF-16, and delimitors are not converted, convert them
+		 * 	But only if the UTF16 variant has already been determined.
+		 * If CHSET is being changed to non-UTF-16, and delims are converted, free them
+		 */
+		if (ichset_specified)
+			for (soc_cnt=0; soc_cnt < dsocketptr->n_socket; soc_cnt++)
+			{
+				localsocketptr = dsocketptr->socket[soc_cnt];
+				if (!(localsocketptr && (0 < localsocketptr->n_delimiter)))
+					continue;
+				if (((localsocketptr->delimiter[0].addr == localsocketptr->idelimiter[0].addr) &&
+						IS_UTF16_CHSET(iod->ichset) && IS_UTF16_CHSET(dsocketptr->ichset_utf16_variant))
+					|| ((localsocketptr->delimiter[0].addr != localsocketptr->idelimiter[0].addr)
+						&& !IS_UTF16_CHSET(iod->ichset)))
+							iosocket_idelim_conv(localsocketptr, iod->ichset);
+			}
+		if (ochset_specified)
+			for (soc_cnt=0; soc_cnt < dsocketptr->n_socket; soc_cnt++)
+			{
+				localsocketptr = dsocketptr->socket[soc_cnt];
+				if (!(localsocketptr && (0 < localsocketptr->n_delimiter)))
+					continue;
+				if (((localsocketptr->delimiter[0].addr == localsocketptr->odelimiter0.addr) &&
+						IS_UTF16_CHSET(iod->ochset) && IS_UTF16_CHSET(dsocketptr->ochset_utf16_variant))
+					|| ((localsocketptr->delimiter[0].addr != localsocketptr->odelimiter0.addr)
+						&& !IS_UTF16_CHSET(iod->ochset)))
+							iosocket_odelim_conv(localsocketptr, iod->ochset);
+			}
+		/* Now convert the ZFFs */
+		if (ochset_specified)
+		{
+			if (!IS_UTF16_CHSET(iod->ochset))
+			{	/* Changed to a non-UTF16 CHSET. free all converted ZFFs */
+				for (soc_cnt=0; soc_cnt < dsocketptr->n_socket; soc_cnt++)
+				{
+					localsocketptr = dsocketptr->socket[soc_cnt];
+					if (localsocketptr && (NULL != localsocketptr->ozff.addr) && (0 < localsocketptr->zff.len)
+						&& (localsocketptr->ozff.addr != localsocketptr->zff.addr))
+					{
+						if (localsocketptr->ozff.addr == free_ozff)
+							free_ozff = NULL;		/* Prevent double free of free_ozff */
+						free(localsocketptr->ozff.addr);	/* previously converted */
+					}
+					localsocketptr->ozff = localsocketptr->zff;	/* contains converted UTF-16 form */
+				}
+			} else if (IS_UTF16_CHSET(dsocketptr->ochset_utf16_variant))
+			{	/* Changed to UTF-16 CHSET. convert all ZFFs */
+				conv_buff = malloc(MAX_ZFF_LEN);
+				for (soc_cnt=0; soc_cnt < dsocketptr->n_socket; soc_cnt++)
+				{
+					localsocketptr = dsocketptr->socket[soc_cnt];
+					if (localsocketptr && (NULL != localsocketptr->zff.addr) && (0 < localsocketptr->zff.len)
+						&& (localsocketptr->ozff.addr == localsocketptr->zff.addr))
+					{
+						conv_len = MAX_ZFF_LEN;
+						new_ozff_len = gtm_conv(chset_desc[CHSET_UTF8], chset_desc[iod->ochset],
+									&localsocketptr->zff, conv_buff, &conv_len);
+						assert(MAX_ZFF_LEN > new_ozff_len);
+						localsocketptr->ozff.len = new_ozff_len;
+						localsocketptr->ozff.addr = malloc(new_ozff_len);
+						memcpy(localsocketptr->ozff.addr, conv_buff, new_ozff_len);
+						memset(conv_buff, 0, MAX_ZFF_LEN);	/* Reset to be reused. */
+					}
+				}
+			}
+		}
 	}
 	if (ioerror_specified)
 		newsocket.ioerror = ('T' == ioerror || 't' == ioerror);
diff --git a/sr_port/iosocket_write.c b/sr_port/iosocket_write.c
index 73b3f43..4d57483 100644
--- a/sr_port/iosocket_write.c
+++ b/sr_port/iosocket_write.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information 	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -414,6 +414,14 @@ void	iosocket_write_real(mstr *v, boolean_t convert_output)
 #endif
 	tempv = *v;
 	socketptr->lastop = TCP_WRITE;
+	/* In case the CHSET changes from non-UTF-16 to UTF-16 and a read has already been done,
+	 * there's no way to read the BOM bytes & to determine the variant. So default to UTF-16BE.
+	 */
+	if (!socketptr->first_write && (!IS_UTF16_CHSET(dsocketptr->ochset_utf16_variant) && (CHSET_UTF16 == iod->ochset)))
+	{
+		iod->ochset = dsocketptr->ochset_utf16_variant = CHSET_UTF16BE;
+		get_chset_desc(&chset_names[iod->ochset]);
+	}
 	if (socketptr->first_write)
 	{ /* First WRITE, do following
 	     Transition to UTF16BE if ochset is UTF16 and WRITE a BOM
@@ -423,6 +431,7 @@ void	iosocket_write_real(mstr *v, boolean_t convert_output)
 			DBGSOCK2((stdout, "socwrite: First write UTF16 -- writing BOM\n"));
 			iod->ochset = CHSET_UTF16BE; /* per Unicode standard, assume big endian when endian
 							format is unspecified */
+			dsocketptr->ochset_utf16_variant = iod->ochset;
 			get_chset_desc(&chset_names[iod->ochset]);
 			DOTCPSEND(socketptr, UTF16BE_BOM, UTF16BE_BOM_LEN, flags, status);
 			DBGSOCK2((stdout, "socwrite: TCP send of BOM-BE with rc %d\n", status));
@@ -455,22 +464,20 @@ void	iosocket_write_real(mstr *v, boolean_t convert_output)
 			if (tempv.addr == socketptr->zff.addr)
 				tempv = socketptr->ozff;	/* from iosocket_wtff so use converted form */
 		}
-		if ((0 < socketptr->n_delimiter) && (socketptr->odelimiter0.addr == socketptr->delimiter[0].addr))
-		{	/* Convert DELIMITER 0 to OCHSET format to avoid repeated conversions of DELIM0 on output */
-			new_len = gtm_conv(chset_desc[CHSET_UTF8], chset_desc[iod->ochset],
-							&socketptr->delimiter[0], NULL, NULL);
-			if (MAX_DELIM_LEN < new_len)
-			{
-				rts_error_csa(CSA_ARG(NULL) VARLSTCNT(1) ERR_DELIMSIZNA);
-				return;
-			}
-			socketptr->odelimiter0.len = new_len;
-			UNICODE_ONLY(socketptr->odelimiter0.char_len = socketptr->delimiter[0].char_len);
-			socketptr->odelimiter0.addr = malloc(new_len);
-			memcpy(socketptr->odelimiter0.addr, stringpool.free, new_len);
-			if (tempv.addr == socketptr->delimiter[0].addr)
-				tempv = socketptr->odelimiter0;	/* from iosocket_wteol so use converted form */
-		}
+	}
+	/* Convert DELIMITER 0 to OCHSET format to avoid repeated conversions of DELIM0 on output.
+	 * CHSET can be switched b/w M/UTF-8/UTF-16* in UTF-8 mode. Convert the odelimitor0 accordingly
+	 * 1. odelimiter0 == idelimiter[0] (i.e. it's not been converted) && IS_UTF16_CHSET
+	 * 2. odelimiter0 != idelimiter[0] (i.e. it's been converted to UTF-16) && CHSET is NOT UTF-16
+	 */
+	if (gtm_utf8_mode && (0 < socketptr->n_delimiter))
+	{
+		if (((socketptr->delimiter[0].addr == socketptr->odelimiter0.addr) && IS_UTF16_CHSET(iod->ochset))
+			|| ((socketptr->delimiter[0].addr != socketptr->odelimiter0.addr) && !IS_UTF16_CHSET(iod->ochset)))
+			iosocket_odelim_conv(socketptr, iod->ochset);
+
+		if (tempv.addr == socketptr->delimiter[0].addr)
+			tempv = socketptr->odelimiter0;	/* from iosocket_wteol so use converted form */
 	}
 	memcpy(iod->dollar.device, "0", SIZEOF("0"));
 	if (CHSET_M != iod->ochset)
diff --git a/sr_port/iosocketdef.h b/sr_port/iosocketdef.h
index 4983414..dcc5635 100755
--- a/sr_port/iosocketdef.h
+++ b/sr_port/iosocketdef.h
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2014 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -387,6 +388,8 @@ typedef struct d_socket_struct_type
 	uint4				waitcycle;			/* count waits */
 	boolean_t			ichset_specified;
 	boolean_t			ochset_specified;
+	gtm_chset_t			ichset_utf16_variant;		/* Save the UTF-16 variant (BE/LE) for reuse */
+	gtm_chset_t			ochset_utf16_variant;		/* Save the UTF-16 variant (BE/LE) for reuse */
 	struct io_desc_struct		*iod;				/* Point back to main IO descriptor block */
 	struct socket_struct_type 	*socket[1];			/* Array size determined by gtm_max_sockets */
 } d_socket_struct;
@@ -394,7 +397,8 @@ typedef struct d_socket_struct_type
 boolean_t iosocket_bind(socket_struct *socketptr, int4 timepar, boolean_t update_bufsiz, boolean_t newversion);
 boolean_t iosocket_connect(socket_struct *socketptr, int4 timepar, boolean_t update_bufsiz);
 boolean_t iosocket_delimiter(unsigned char *delimiter_buffer, int4 delimiter_len, socket_struct *socketptr, boolean_t rm);
-void iosocket_delim_conv(socket_struct *socketptr, gtm_chset_t to_chset);
+void iosocket_idelim_conv(socket_struct *socketptr, gtm_chset_t to_chset);
+void iosocket_odelim_conv(socket_struct *socketptr, gtm_chset_t to_chset);
 void iosocket_delimiter_copy(socket_struct *from, socket_struct *to);
 boolean_t iosocket_switch(char *handle, int handle_len, d_socket_struct *from, d_socket_struct *to);
 int4 iosocket_handle(char *handle, int *len, boolean_t newhandle, d_socket_struct *dsocketptr);
diff --git a/sr_port/is_canonic_name.c b/sr_port/is_canonic_name.c
index efa774a..38bec92 100755
--- a/sr_port/is_canonic_name.c
+++ b/sr_port/is_canonic_name.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -27,7 +28,6 @@ error_def(ERR_BADCHAR);
  * -----------------------------------------------
  * is_canonic_name()
  * validate a variable name (unsubscripted or subscripted).
- * Note: This code is very similar to "gvn2gds()" in op_fnview.c. With some effort, they might even be merged into one.
  *
  * Arguments:
  *	src	   - Pointer to Source Name string mval
@@ -39,99 +39,156 @@ error_def(ERR_BADCHAR);
  * -----------------------------------------------
  */
 boolean_t is_canonic_name(mval *src, int *subscripts, int *start_off, int *stop_off)
-{	/* subscripts is overloaded - out to op_fnqlength, which doesn't use the last 2 arguments & in from op_fnqsubscript */
+{
+	gv_name_and_subscripts 	start_buff, stop_buff;
+	int			seq, contains_env, i;
+	int 			*start, *stop;
+
+	/* determine which buffer to use */
+	DETERMINE_BUFFER(src, start_buff, stop_buff, start, stop);
+	seq = *subscripts;
+	if (parse_gv_name_and_subscripts(src, subscripts, start, stop, &contains_env))
+	{
+#		ifdef DEBUG
+		/* Check that the sequence of start[i] and stop[i] is
+		 * always increasing. There should never be a case where
+		 * a subscript starts at an offset into src greater than
+		 * where it stops.
+		 */
+		for (i = 0; i <= contains_env + *subscripts; i++)
+			assert(start[i] < stop[i]);
+#		endif
+		/* Make sure the user isn't trying to index too far into the
+		 * array or trying to index a negative offset.
+		 * Remember contains_env is 1 if there is an environment,
+		 * and {start,stop}[0] contain the bounds for the environment.
+		 */
+		if ((0 > contains_env + seq) || (*subscripts < seq))
+			*start_off = *stop_off = 0;
+		else
+		{
+			*start_off = start[contains_env + seq];
+			*stop_off = stop[contains_env + seq];
+		}
+		if ('"' == src->str.addr[*start_off])
+			*start_off++;
+		if ((0 < *stop_off) && ('"' == src->str.addr[*stop_off - 1]))
+			*stop_off--;
+		return TRUE;
+	}
+	return FALSE;
+}
+
+/*
+ * -----------------------------------------------
+ * parse_gv_name_and_subscripts()
+ * Validates a global variable name and returns all the corresponding subscripts (unsubscripted or subscripted).
+ *
+ * Arguments:
+ *	src	     - Pointer to Source Name string mval.
+ *	subscripts   - Pointer returns the subscript count.
+ *	start        - Assumed to be an array of length [MAX_[L,G]VSUBSCRIPTS + 1 + 2], returns the start
+ *		       of every subscript. If contains_env is true, the index 0 corresponds to the
+ *		       first environment subscript, 1 corresponds to the name, and 2 -> *subscripts
+ *		       corresponds to the keys.
+ *	stop         - Assumed to be an array of length [MAX_[L,G]VSUBSCRIPTS + 1 + 2], returns the end
+ *		       of every subscript, corresponding to each entry in start.
+ *	contains_env - Pointer returns whether there was an environment or not. This is an integer
+ *		       for ease of indexing into the start and stop arrays, i.e. start[contains_env]
+ *		       will always return the start of the name.
+ * Return:
+ *	boolean_t    - TRUE indicates good name; FALSE indicates defective
+ * -----------------------------------------------
+ */
+boolean_t parse_gv_name_and_subscripts(mval *src, int *subscripts, int *start, int *stop, int *contains_env)
+{
 	char		term;
 	int		envpart;
 	boolean_t	instring;
 	int		isrc;
-	boolean_t	keep_quotes;
 	char		letter;
 	int		point;
 	char		previous;
 	int		seq;
-	int		start;
 	int		state;
-	int		stop;
 	int		subs_count;
 	int		utf8_len;
+	int		subs_max;
+	boolean_t 	gvn;
+	enum
+	{
+		BEFORE_NAME,
+		CHECK_FOR_ENVIRONMENT,
+		DISPATCH_FOR_STARTING_COMPONENT,
+		IN_STRING,
+		IN_NUMBER,
+		EXPECT_FIRST_LETTER_OF_NAME,
+		EXPECT_NEXT_LETTER_OF_NAME,
+		IN_CHAR_FUNC,
+		END_OF_PROCESSING
+	};
 
-	/* state:
-	 *    0      before start of name
-	 *    1      found ^ allow environment
-	 *    2      dispatch for starting a component
-	 *    3      in string
-	 *    4      in number
-	 *    5      expect first letter of name
-	 *    6      expect next letter of name
-	 *    7      in $CHAR()
-	 *    8      at end of processing
-	 */
-
+	gvn = ((0 < src->str.len) && ('^' == src->str.addr[0]));
 	MV_FORCE_STR(src);
 	seq = *subscripts;
-	keep_quotes = FALSE;
-	start = stop = 0;
-	state = 0;
+	state = BEFORE_NAME;
 	subs_count = -1;
-	for (isrc = 0; isrc < src->str.len; )
+	*contains_env = 0;
+	subs_max = gvn ? MAX_GVSUBSCRIPTS : MAX_LVSUBSCRIPTS;
+	for (isrc = 0; (isrc < src->str.len) && (subs_count < subs_max);)
 	{
 		letter = src->str.addr[isrc];
 		switch (state)
 		{
-			case 0:		/* start of name */
+			case BEFORE_NAME:		/* start of name */
 				if ('^' == letter)	/* before start of name */
 				{
-					state = 1;	/* check for environment */
+					state = CHECK_FOR_ENVIRONMENT;	/* check for environment */
 					break;
 				}
 				if (('%' == letter) || ISALPHA_ASCII(letter))
 				{
-					if (0 == seq)
-						start = isrc;
-					state = 6;	/* rest of name */
+					*start++ = isrc;
+					state = EXPECT_NEXT_LETTER_OF_NAME;	/* rest of name */
 					break;
 				}
 				return FALSE;
-			case 1:		/* global name */
+			case CHECK_FOR_ENVIRONMENT:		/* global name */
 				if (('%' == letter) ||ISALPHA_ASCII(letter))	/* found ^ allow environment */
 				{	/* found ^ allow environment */
-					if (0 == seq)
-						start = isrc;
-					state = 6;	/* rest of name */
+					*start++ = isrc;
+					state = EXPECT_NEXT_LETTER_OF_NAME;	/* rest of name */
 					break;
 				}
 				if (('|' == letter) || ('[' == letter))
 				{
+					*contains_env = 1;
 					term = (letter == '[') ? ']' : letter;
 					envpart = 0;
-					if (subs_count == seq)
-						start = isrc + 1;
-					state = 2;	/* process environment */
+					state = DISPATCH_FOR_STARTING_COMPONENT;	/* process environment */
 					break;
 				}
 				return FALSE;
-			case 2:		 /* dispatch for starting a component */
+			case DISPATCH_FOR_STARTING_COMPONENT:		 /* dispatch for starting a component */
 				point = 0;
 				instring = FALSE;
-				if (envpart > 1)
+				if (1 < envpart)
 					return FALSE;	/* too many environment components */
 				if (')' == term)
 					subs_count++;	/* new subscript */
 				else
 					envpart++;	/* next environment component */
-				if ((subs_count == seq) && (0 == stop))
-					start = isrc;
+				if ((0 < subs_count) || (1 == envpart))
+					*start++ = isrc;
 				if ('"' == letter)
 				{
-					if ((subs_count == seq) && (1 == envpart))
-						start++;
 					instring = TRUE;
-					state = 3;	/* string */
+					state = IN_STRING;	/* string */
 					break;
 				}
 				if ('$' ==letter)
 				{
-					state = 7;	/* $[z]char() */
+					state = IN_CHAR_FUNC;	/* $[z]char() */
 					break;
 				}
 				if ('0' == letter) /* Canonic number cannot start with 0 unless is single char */
@@ -141,11 +198,11 @@ boolean_t is_canonic_name(mval *src, int *subscripts, int *start_off, int *stop_
 					else
 						return FALSE;	/* Cannot end with "0" */
 					if (term == letter)
-						state = (')' == term) ? 8 : 5;		/* end or name */
+						/* end or name */
+						state = (')' == term) ? END_OF_PROCESSING : EXPECT_FIRST_LETTER_OF_NAME;
 					else if (',' != letter)
 						return FALSE;	/* Not a single char number */
-					if ((subs_count == seq) && (0 == stop))
-						stop = isrc;
+					*stop++ = isrc;
 					break;
 				}
 				if (('-' == letter) || ('.' == letter) || ISDIGIT_ASCII(letter))
@@ -153,11 +210,11 @@ boolean_t is_canonic_name(mval *src, int *subscripts, int *start_off, int *stop_
 					if ('.' == letter)
 						point++;
 					previous = letter;
-					state = 4;	/* numeric */
+					state = IN_NUMBER;	/* numeric */
 					break;
 				}
 				return FALSE;
-			case 3:		/* [quoted] string */
+			case IN_STRING:		/* [quoted] string */
 				if ('"' == letter)	/* in string */
 				{
 					instring = !instring;
@@ -174,23 +231,23 @@ boolean_t is_canonic_name(mval *src, int *subscripts, int *start_off, int *stop_
 						return FALSE;
 					if ('$' != letter)
 						return FALSE;
-					state = 7;	/* $[z]char() */
+					state = IN_CHAR_FUNC;	/* $[z]char() */
 					break;
 				}
 				if (!instring)
 				{
 					if (',' == letter)
-						state = 2;	/* on to next */
+						state = DISPATCH_FOR_STARTING_COMPONENT;	/* on to next */
 					else if (term == letter)
-						state = (')' == term) ? 8 : 5;	/* end or name */
+						/* end or name */
+						state = (')' == term) ? END_OF_PROCESSING : EXPECT_FIRST_LETTER_OF_NAME;
 					else
 						return FALSE;
-					if ((subs_count == seq) && (0 == stop))
-						/* Not returning 2nd env part - maybe problem */
-						stop = isrc - (keep_quotes ? 0 : 1);
+					if ((0 < subs_count) || (1 == envpart))
+						*stop++ = isrc;
 				}
 				break;
-			case 4:		/* numeric */
+			case IN_NUMBER:		/* numeric */
 				if (ISDIGIT_ASCII(letter))	/* in number */
 				{
 					if (('-' == previous) && ('0' == letter))
@@ -208,45 +265,43 @@ boolean_t is_canonic_name(mval *src, int *subscripts, int *start_off, int *stop_
 				if (point && ('0' == previous))
 					return FALSE;
 				if (',' == letter)
-					state = 2;	/* next */
+					state = DISPATCH_FOR_STARTING_COMPONENT;	/* next */
 				else if (term == letter)
-					state = (')' == term) ? 8 : 5;		/* end or name */
+					/* end or name */
+					state = (')' == term) ? END_OF_PROCESSING : EXPECT_FIRST_LETTER_OF_NAME;
 				else
 					return FALSE;
-				if ((subs_count == seq) && (0 == stop))
-					stop = isrc;
+				if ((0 < subs_count) || (1 == envpart))
+					*stop++ = isrc;
 				previous = letter;
 				break;
-			case 5:		/* expect first letter of name */
+			case EXPECT_FIRST_LETTER_OF_NAME:		/* expect first letter of name */
 				if (('%' == letter) || ISALPHA_ASCII(letter))
 				{
-					if (0 == seq)
-						start = isrc;
-					state = 6;	/* rest of name */
+					*start++ = isrc;
+					state = EXPECT_NEXT_LETTER_OF_NAME;	/* rest of name */
 					break;
 				}
 				return FALSE;
-			case 6:		/* expect next letter of name */
+			case EXPECT_NEXT_LETTER_OF_NAME:		/* expect next letter of name */
 				if ('(' == letter)
 				{
 					term = ')';
 					envpart = 1;
 					subs_count = 0;
-					state = 2;	/* done with name */
-					if (0 == seq)
-						stop = isrc;
+					state = DISPATCH_FOR_STARTING_COMPONENT;	/* done with name */
+					*stop++ = isrc;
 				} else if (!ISALNUM_ASCII(letter))
 					return FALSE;
 				break;
-			case 7:		/* $[Z]CHAR() */
+			case IN_CHAR_FUNC:		/* $[Z]CHAR() */
 				previous = letter;	/* in $CHAR() - must be ASCII */
 				if (('Z' == letter) || ('z' == letter))
 				{	if (++isrc < src->str.len)
 						letter = src->str.addr[isrc];
 					else
 						return FALSE;
-					if ('z' == previous)
-						previous = 'Z';
+					previous = 'Z';
 				}
 				if (!(('C' == letter) || ('c' == letter)))
 					return FALSE;
@@ -270,7 +325,7 @@ boolean_t is_canonic_name(mval *src, int *subscripts, int *start_off, int *stop_
 						letter = src->str.addr[isrc];
 					else
 						return FALSE;
-					if (!('R' == letter) || ('r' == letter))
+					if (!(('R' == letter) || ('r' == letter)))
 						return FALSE;
 					if (++isrc < src->str.len)
 						letter = src->str.addr[isrc];
@@ -279,8 +334,6 @@ boolean_t is_canonic_name(mval *src, int *subscripts, int *start_off, int *stop_
 				}
 				if ('(' != letter)
 					return FALSE;
-				if (subs_count == seq)
-					keep_quotes = TRUE;
 				for (++isrc ;isrc < src->str.len; isrc++)
 				{
 					letter = src->str.addr[isrc];
@@ -311,21 +364,20 @@ boolean_t is_canonic_name(mval *src, int *subscripts, int *start_off, int *stop_
 					if ('"' != letter)
 						return FALSE;
 					instring = TRUE;
-					state = 3;	/* back to string */
+					state = IN_STRING;	/* back to string */
 					break;
 				}
 				if (',' == letter)
-					state = 2;
+					state = DISPATCH_FOR_STARTING_COMPONENT;
 				else if (term == letter)
-					state = (')' == term) ? 8 : 5;		/* end or name */
+					/* end or name */
+					state = (')' == term) ? END_OF_PROCESSING : EXPECT_FIRST_LETTER_OF_NAME;
 				else
 					return FALSE;
-				if ((subs_count == seq) && (0 == stop))
-					stop = isrc - (keep_quotes ? 0 : 1);	/* Not returning 2nd env part - maybe problem */
+				*stop++ = isrc;
 				break;
-			case 8:		/* end of subscript but no closing paren - ")" */
+			case END_OF_PROCESSING:		/* end of subscript but no closing paren - ")" */
 				return FALSE;
-				break;
 		}
 #		ifdef UNICODE_SUPPORTED
 		if (!gtm_utf8_mode || (0 == (letter & 0x80)))
@@ -341,21 +393,16 @@ boolean_t is_canonic_name(mval *src, int *subscripts, int *start_off, int *stop_
 #		endif
 		NON_UNICODE_ONLY(isrc++);
 	}
-	if ((8 != state) && (6 != state))
+	if ((END_OF_PROCESSING != state) && (EXPECT_NEXT_LETTER_OF_NAME != state))
 		return FALSE;
-	if ((0 <= seq) && (0 == stop))
-		stop = src->str.len - (8 == state ? 1 : 0);
-	if (keep_quotes && ('"' == src->str.addr[start - 1]))
-		start--;
-	assert((0 < subs_count) || ((6 == state) && (-1 == subs_count)));
-	if (6 == state)
+	assert((0 < subs_count) || ((EXPECT_NEXT_LETTER_OF_NAME == state) && (-1 == subs_count)));
+	if (EXPECT_NEXT_LETTER_OF_NAME == state)
+	{
 		subs_count = 0;
+		*stop = isrc;
+	}
 	assert((('^' == src->str.addr[0]) ? MAX_GVSUBSCRIPTS : MAX_LVSUBSCRIPTS) > subs_count);
 	assert((0 < isrc) && (isrc == src->str.len));
-	assert(stop <= isrc);
-	assert((0 <= start) && (start <= stop));
 	*subscripts = subs_count;
-	*start_off = start;
-	*stop_off = stop;
 	return TRUE;
 }
diff --git a/sr_port/is_canonic_name.h b/sr_port/is_canonic_name.h
index b927d1c..23b3d8b 100755
--- a/sr_port/is_canonic_name.h
+++ b/sr_port/is_canonic_name.h
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2010 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -9,4 +10,43 @@
  *								*
  ****************************************************************/
 
+/* Technically, MAX_LVSUBSCRIPTS and MAX_GVSUBSCRIPTS could be different, but we don't know
+ * which one to use until we determine whether src is a global or local name.
+ */
+typedef union
+{
+	int lv[MAX_LVSUBSCRIPTS + 1 + 2]; /* 1 for the name, 2 for the environment components */
+	int gv[MAX_LVSUBSCRIPTS + 1 + 2];
+} gv_name_and_subscripts;
+
+#define DETERMINE_BUFFER(src, start_buff, stop_buff, start, stop)	\
+MBSTART {								\
+	if ((0 < src->str.len) && ('^' == src->str.addr[0]))		\
+	{								\
+		start = start_buff.gv;					\
+		stop = stop_buff.gv;					\
+	} else								\
+	{								\
+		start = start_buff.lv;					\
+		stop = stop_buff.lv;					\
+	}								\
+} MBEND
+
+#define NOCANONICNAME_ERROR(MVAL) 						\
+MBSTART {									\
+	int		error_len;						\
+	unsigned char	*error_chr;						\
+										\
+	ENSURE_STP_FREE_SPACE(ZWR_EXP_RATIO((MVAL)->str.len));			\
+	DBG_MARK_STRINGPOOL_UNEXPANDABLE;					\
+	format2zwr((sm_uc_ptr_t)(MVAL)->str.addr, (MVAL)->str.len,		\
+		   (uchar_ptr_t)stringpool.free, &error_len);			\
+	DBG_MARK_STRINGPOOL_EXPANDABLE						\
+	error_chr = stringpool.free;						\
+	stringpool.free += error_len;						\
+	rts_error_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_NOCANONICNAME, 2,		\
+		      error_len, error_chr);					\
+} MBEND
+
 boolean_t is_canonic_name(mval *src, int *subscripts, int *start_off, int *stop_off);
+boolean_t parse_gv_name_and_subscripts(mval *src, int *subscripts, int *start, int *stop, int *contains_env);
diff --git a/sr_port/jfh_from_jnl_info.c b/sr_port/jfh_from_jnl_info.c
index e1446e3..708cdab 100755
--- a/sr_port/jfh_from_jnl_info.c
+++ b/sr_port/jfh_from_jnl_info.c
@@ -43,11 +43,8 @@ void jfh_from_jnl_info(jnl_create_info *info, jnl_file_header *header)
 	JNL_WHOLE_FROM_SHORT_TIME(prc_vec->jpv_time, jgbl.gbl_jrec_time);
 	memcpy(&header->who_created, (unsigned char*)prc_vec, SIZEOF(jnl_process_vector));
 	memcpy(&header->who_opened,  (unsigned char*)prc_vec, SIZEOF(jnl_process_vector));
-	/* EPOCHs are written unconditionally in Unix while they are written only for BEFORE_IMAGE in VMS */
-	if (JNL_HAS_EPOCH(info))
-		header->end_of_data = JNL_HDR_LEN + PINI_RECLEN + EPOCH_RECLEN + PFIN_RECLEN;
-	else
-		header->end_of_data = JNL_HDR_LEN + PINI_RECLEN + PFIN_RECLEN;
+	/* EPOCHs are written unconditionally even for NOBEFORE_IMAGE journaling */
+	header->end_of_data = JNL_HDR_LEN + PINI_RECLEN + EPOCH_RECLEN + PFIN_RECLEN;
 	header->max_jrec_len = info->max_jrec_len;
 	header->bov_timestamp = jgbl.gbl_jrec_time;
 	header->eov_timestamp = jgbl.gbl_jrec_time;
diff --git a/sr_port/jnl.h b/sr_port/jnl.h
index 111e9ff..ba3fad3 100644
--- a/sr_port/jnl.h
+++ b/sr_port/jnl.h
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -37,11 +37,11 @@ error_def(ERR_JNLENDIANLITTLE);
  * 	2) Add REPL_JNL_Vxx enum to repl_jnl_t typedef AND Vxx_JNL_VER #define in repl_filter.h
  * 	3) Add an entry each to repl_filter_old2cur & repl_filter_cur2old arrays in repl_filter.c.
  *	4) Bump JNL_EXTR_LABEL and JNL_DET_EXTR_LABEL as appropriate in muprec.h.
- *		This is not needed if for example the newly added jnl record types dont get extracted at all.
+ *		This is not needed if for example the newly added jnl record types don't get extracted at all.
  * If the FILTER format is also changing, then do the following as well
  * 	4) Add REPL_FILTER_Vxx enum to repl_filter_t typedef in repl_filter.h
  * 	5) Add/Edit IF_xTOy macros in repl_filter.h to transform from/to the NEW jnl format version only.
- * 		Remove all entries that dont have the new jnl format in either the from or to part of the conversion.
+ * 		Remove all entries that don't have the new jnl format in either the from or to part of the conversion.
  * 	6) Add/Edit prototype and implement functions jnl_xTOy() and jnl_yTOx() in repl_filter.c
  * 	7) Enhance repl_tr_endian_convert() to endian convert journal records from previous jnl formats to new format.
  * 		This is similar to the jnl_xTOy() filter conversion functions except that lot of byte-swaps are needed.
@@ -72,21 +72,14 @@ error_def(ERR_JNLENDIANLITTLE);
 						 */
 #define JRT_MAX_V24		JRT_ULGTRIG	/* Max jnlrec type in GDSJNL24/GDSJNL25 that can be input to replication filter */
 
-#ifdef UNIX
-#  define JNL_ALLOC_DEF		2048
-#  define JNL_ALLOC_MIN		2048
-#elif defined(VMS)
-#  define JNL_ALLOC_DEF		100
-#  define JNL_ALLOC_MIN		10
-#endif
+#define JNL_ALLOC_DEF		2048
+#define JNL_ALLOC_MIN		2048
 
-#ifdef UNIX
 /* The journal buffer size (specified in pages of size DISK_BLOCK_SIZE) should be large enough for one largest record,
  * which is equivalent to the largest possible value (of size MAX_STRLEN) and largest possible key (of size MAX_KEY_SZ),
  * plus the overhead of storing the journal records.
  */
-#  define JNL_BUFFER_MIN	((MAX_LOGI_JNL_REC_SIZE + ROUND_UP(2 * MAX_IO_BLOCK_SIZE, DISK_BLOCK_SIZE)) / DISK_BLOCK_SIZE + 1)
-#endif
+#define JNL_BUFFER_MIN		((MAX_LOGI_JNL_REC_SIZE + ROUND_UP(2 * MAX_IO_BLOCK_SIZE, DISK_BLOCK_SIZE)) / DISK_BLOCK_SIZE + 1)
 #define JNL_BUFFER_MAX		32768	/* # of 512-byte blocks = 16Mb journal buffer size */
 
 /*	JNL_EXTEND_DEF	allocation size / 10
@@ -95,13 +88,8 @@ error_def(ERR_JNLENDIANLITTLE);
 */
 
 #define JNL_EXTEND_MIN		0
-#ifdef UNIX
-#  define JNL_EXTEND_DEF	2048
-#  define JNL_EXTEND_MAX	1073741823
-#else
-#  define JNL_EXTEND_DEF	100
-#  define JNL_EXTEND_MAX	65535
-#endif
+#define JNL_EXTEND_DEF		2048
+#define JNL_EXTEND_MAX		1073741823
 #define JNL_MIN_WRITE		32768
 #define JNL_MAX_WRITE		65536
 /* FE was changed to EB because, the bit pattern there seems to vary more than the one for "FE".
@@ -111,11 +99,7 @@ error_def(ERR_JNLENDIANLITTLE);
 /* In Unix, with sync_io, we do journal writes to disk at filesystem block size boundaries.
  * In VMS, the writes are at 512-byte boundaries only.
  */
-#ifdef UNIX
-#  define JNL_WRT_START_MODULUS(jb)	jb->fs_block_size
-#elif defined(VMS)
-#  define JNL_WRT_START_MODULUS(jb)	512
-#endif
+#define JNL_WRT_START_MODULUS(jb)	jb->fs_block_size
 #define JNL_WRT_START_MASK(jb)	~(JNL_WRT_START_MODULUS(jb) - 1)	/* mask defining where the next physical write needs to
 									 * happen as follows from the size of JNL_WRT_START_MODULUS
 									 */
@@ -123,21 +107,12 @@ error_def(ERR_JNLENDIANLITTLE);
 #define	JNL_WRT_END_MODULUS	8
 #define JNL_WRT_END_MASK	((uint4)~(JNL_WRT_END_MODULUS - 1))
 
-#ifdef UNIX
-#  define JNL_MIN_ALIGNSIZE	(1 << 12)	/*    4096 disk blocks effectively    2M alignsize */
-#  define JNL_DEF_ALIGNSIZE	(1 << 12)	/*    4096 disk blocks effectively    2M alignsize */
-#else
-#  define JNL_MIN_ALIGNSIZE	(1 <<  5)	/*      32 disk blocks effectively   16K alignsize */
-#  define JNL_DEF_ALIGNSIZE	(1 <<  7)	/*     128 disk blocks effectively   64K alignsize */
-#endif
+#define JNL_MIN_ALIGNSIZE	(1 << 12)	/*    4096 disk blocks effectively    2M alignsize */
+#define JNL_DEF_ALIGNSIZE	(1 << 12)	/*    4096 disk blocks effectively    2M alignsize */
 #define	JNL_MAX_ALIGNSIZE	(1 << 22)	/* 4194304 disk blocks effectively    2G alignsize */
 #define JNL_REC_START_BNDRY	8
-#ifdef UNIX
 /* maximum logical journal record size */
-#  define MAX_LOGI_JNL_REC_SIZE		(ROUND_UP(MAX_STRLEN, DISK_BLOCK_SIZE) + ROUND_UP(MAX_KEY_SZ, DISK_BLOCK_SIZE))
-#else
-#  define MAX_LOGI_JNL_REC_SIZE		(MAX_DB_BLK_SIZE)			  /* maximum logical journal record size */
-#endif
+#define MAX_LOGI_JNL_REC_SIZE		(ROUND_UP(MAX_STRLEN, DISK_BLOCK_SIZE) + ROUND_UP(MAX_KEY_SZ, DISK_BLOCK_SIZE))
 /* one more disk-block for PBLK record header/footer */
 #define MAX_JNL_REC_SIZE		(MAX_LOGI_JNL_REC_SIZE + DISK_BLOCK_SIZE)
 /* Very large records require spanning nodes, which only happen in TP. */
@@ -170,15 +145,9 @@ error_def(ERR_JNLENDIANLITTLE);
 #define MAX_YIELD_LIMIT		2048
 #define DEFAULT_YIELD_LIMIT	8
 
-#ifdef UNIX
 /* Have a minimum jnl-file-auto-switch-limit of 4 align boundaries (currently each align boundary is 2M) */
 #define	JNL_AUTOSWITCHLIMIT_MIN	(4 * JNL_MIN_ALIGNSIZE)
 #define	JNL_AUTOSWITCHLIMIT_DEF	8386560	/* Instead of 8388607 it is adjusted for default allocation = extension = 2048 */
-#else
-/* Have a minimum jnl-file-auto-switch-limit of 128 align boundaries (currently each align boundary is 16K) */
-#define	JNL_AUTOSWITCHLIMIT_MIN	(128 * JNL_MIN_ALIGNSIZE)
-#define	JNL_AUTOSWITCHLIMIT_DEF	8388600	/* Instead of 8388607 it is adjusted for default allocation = extension = 100 */
-#endif
 
 /* options (4-bytes unsigned integer) to wcs_flu() (currently flush_hdr, write_epoch, sync_epoch) are bit-wise ored */
 #define	WCSFLU_NONE		 0
@@ -198,9 +167,6 @@ error_def(ERR_JNLENDIANLITTLE);
 #define JNL_FILE_LOST_ERRORS	1	/* Throw an rts_error. */
 #define MAX_JNL_FILE_LOST_OPT	JNL_FILE_LOST_ERRORS
 
-/* EPOCHs are written unconditionally in Unix (assuming jnl is ON) while they are written only for BEFORE_IMAGE in VMS */
-#define JNL_HAS_EPOCH(jnlfile)  UNIX_ONLY(TRUE) VMS_ONLY(jnlfile->before_images)
-
 #ifdef DEBUG
 #define	DEFAULT_EPOCH_INTERVAL_IN_SECONDS	30 /* exercise epoch-syncing code relatively more often in DBG */
 #else
@@ -257,10 +223,10 @@ error_def(ERR_JNLENDIANLITTLE);
 
 /* This macro should be used to initialize jgbl.gbl_jrec_time to the system time. The reason is that it does additional checks. */
 #define	SET_GBL_JREC_TIME				\
-{							\
+MBSTART {						\
 	assert(!jgbl.dont_reset_gbl_jrec_time);		\
 	JNL_SHORT_TIME(jgbl.gbl_jrec_time);		\
-}
+} MBEND
 
 #define	DO_GBL_JREC_TIME_CHECK_FALSE	FALSE
 #define	DO_GBL_JREC_TIME_CHECK_TRUE	TRUE
@@ -289,7 +255,7 @@ error_def(ERR_JNLENDIANLITTLE);
 }
 
 /* This macro is similar to ADJUST_GBL_JREC_TIME except that this ensures ordering of timestamps across
- * ALL replicated regions in a replicated environment. In VMS, we dont maintain this prev_jnlseqno_time
+ * ALL replicated regions in a replicated environment. In VMS, we don't maintain this prev_jnlseqno_time
  * field.
  */
 #	define	ADJUST_GBL_JREC_TIME_JNLPOOL(jgbl, jpl)		\
@@ -569,6 +535,7 @@ typedef struct jnl_private_control_struct
 	boolean_t		error_reported;		/* TRUE if jnl_file_lost already reported the journaling error */
 	uint4			status2;		/* for secondary error status, currently used only in VMS */
 	uint4			cycle;			/* private copy of the number of this journal file generation */
+	char			*err_str;		/* pointer to an extended error message */
 } jnl_private_control;
 
 typedef enum
@@ -655,7 +622,7 @@ typedef struct
 						This offset was supposed to have EOF_RECORD before recover switched journal.
 						A non-zero value means this journal was recovered and had the turn around point. */
 	off_jnl_t		virtual_size;	/* Allocation + n * Extension (in blocks). jnl_file_extend updates it */
-	boolean_t		crash;		/* crashed before jnl_file_close() completed */
+	boolean_t		crash;		/* crashed before "jnl_file_close" completed */
 	boolean_t		recover_interrupted;	/* true when recover creates the journal file; false after success. */
 	off_jnl_t		turn_around_offset;	/* At turn around point journal record's (EPOCH) offset */
 	jnl_tm_t		turn_around_time;	/* At turn around point journal record's timestamp */
@@ -666,11 +633,7 @@ typedef struct
  	uint4			autoswitchlimit;/* Limit in disk blocks (max 4GBytes) when jnl should be auto switched */
 	uint4			jnl_alq;	/* initial allocation (in blocks) */
 	uint4			jnl_deq;	/* extension (in blocks) */
-#ifdef VMS
-	boolean_t		update_disabled;/* If the secondary side has database update disabled. For rollback. */
-#else
 	boolean_t		filler_update_disabled;	/* obsoleted as part of multi-site replication changes */
-#endif
 	int4			max_jrec_len;	/* Maximum length in bytes of a journal record.
 						 * Although computed from the database block size, we need this
 						 * stored as well in case database is not available */
@@ -695,8 +658,11 @@ typedef struct
 	seq_num			strm_start_seqno[MAX_SUPPL_STRMS];
 	seq_num			strm_end_seqno[MAX_SUPPL_STRMS];
 	boolean_t		last_eof_written;	/* No more records may be written to the file due to autoswitch */
+	boolean_t		is_not_latest_jnl;	/* Set to TRUE if this jnl becomes a previous generation jnl file
+							 * at some point in time (relied upon by mur_tp_resolve_time).
+							 */
 	/* filler remaining */
-	char			filler[436];
+	char			filler[432];
 } jnl_file_header;
 
 typedef struct
@@ -806,7 +772,7 @@ typedef struct jnl_format_buff_struct
  * All variable size records are made 8-byte multiple size by run-time process */
 
 /* struct_jrec_upd for non-TP, TP or ZTP. For replication we use 8-byte jnl_seqno. Otherwise we use 8-byte token.
- * Currently we dont support ZTP + replication.
+ * Currently we don't support ZTP + replication.
  */
 typedef struct	/* variable length */
 {
@@ -1116,17 +1082,6 @@ typedef struct mu_set_reglist
 	boolean_t		before_images;
 } mu_set_rlist;
 
-/* The enum codes below correspond to code-paths that can call set_jnl_file_close() in VMS */
-typedef enum
-{
-        SET_JNL_FILE_CLOSE_BACKUP = 1,	/* just for safety a non-zero value to start with */
-	SET_JNL_FILE_CLOSE_SETJNL,
-	SET_JNL_FILE_CLOSE_EXTEND,
-	SET_JNL_FILE_CLOSE_RUNDOWN,
-	SET_JNL_FILE_CLOSE_REORG_ENCRYPT,
-        SET_JNL_FILE_CLOSE_INVALID_OP
-} set_jnl_file_close_opcode_t;
-
 typedef	void	(*pini_addr_reset_fnptr)(sgmnt_addrs *csa);
 
 typedef struct
@@ -1181,10 +1136,9 @@ typedef struct
 								 * potentially multi-region transaction. Used only by jnl recovery.
 								 */
 	boolean_t			mur_options_forward;	/* a copy of mur_options.forward to be accessible to GT.M runtime */
+	boolean_t			in_mupjnl;		/* TRUE if caller is a MUPIP JOURNAL command */
 #	endif
-#	ifdef UNIX
 	boolean_t			onlnrlbk;		/* TRUE if ONLINE ROLLBACK */
-#	endif
 	boolean_t			mur_extract;		/* a copy of mur_options.extr[0] to be accessible to GTM runtime*/
 	boolean_t			save_dont_reset_gbl_jrec_time;	/* save a copy of dont_reset_gbl_jrec_time */
 	boolean_t			mur_update;		/* a copy of mur_options.update to be accessible to GTM runtime */
@@ -1204,12 +1158,7 @@ typedef struct
 
 /* pass address of jnl_buffer to get address of expanded jnl file name */
 #define JNL_GDID_PVT(CSA)        ((CSA)->jnl->fileid)
-
-#ifdef UNIX
 #define JNL_GDID_PTR(CSA)	((gd_id_ptr_t)(&((CSA)->nl->jnl_file.u)))
-#else
-#define JNL_GDID_PTR(CSA)	((gd_id_ptr_t)(&((CSA)->nl->jnl_file.jnl_file_id)))
-#endif
 
 /* Note that since "cycle" (in jpc and jb below) can rollover the 4G limit back to 0, it should
  * only be used to do "!=" checks and never to do ordered checks like "<", ">", "<=" or ">=".
@@ -1240,10 +1189,9 @@ typedef struct
  * records (EPOCH, jfh->strm_end_seqno etc.) to write the correct strm_seqno. Not doing so will cause the strm_seqno
  * to be higher than necessary and confuse everything else (including rollback) as far as replication is concerned.
  * Note: We check for process_exiting to differentiate between calls made from mur_close_files() to before. Once we
- * reach mur_close_files, we should no longer be in an active transaction and so we dont need to make any adjustments.
+ * reach mur_close_files, we should no longer be in an active transaction and so we don't need to make any adjustments.
  * VMS does not support supplementary instances so the below macro does not apply there at all.
  */
-#ifdef UNIX
 #define	MUR_ADJUST_STRM_REG_SEQNO_IF_NEEDED(CSD, DST)							\
 {													\
 	int			strm_num;								\
@@ -1269,9 +1217,6 @@ typedef struct
 		}											\
 	}												\
 }
-#else
-#define	MUR_ADJUST_STRM_REG_SEQNO_IF_NEEDED(CSD, DST)
-#endif
 
 /* Given a journal record, GET_TN returns the tn field
  */
@@ -1307,11 +1252,7 @@ typedef struct
  * are identical in VMS where it is currently 2K.
  */
 #define	REAL_JNL_HDR_LEN	SIZEOF(jnl_file_header)
-#ifdef UNIX
-#  define	JNL_HDR_LEN	64 * 1024
-#elif defined(VMS)
-#  define	JNL_HDR_LEN	REAL_JNL_HDR_LEN
-#endif
+#define	JNL_HDR_LEN		64 * 1024
 #define	JNL_FILE_FIRST_RECORD	JNL_HDR_LEN
 
 /* Minimum possible journal file size */
@@ -1335,7 +1276,6 @@ typedef struct
 /* the following macro uses 8-byte quantities (gtm_uint64_t) to perform additions that might cause a 4G overflow */
 #define	DISK_BLOCKS_SUM(freeaddr, jrec_size)	DIVIDE_ROUND_UP((((gtm_uint64_t)(freeaddr)) + (jrec_size)), DISK_BLOCK_SIZE)
 
-#if defined(UNIX)
 /* For future portability JNLBUFF_ALLOC is defined in jnl.h instead of jnlsp.h */
 #define JPC_ALLOC(csa)								\
 {										\
@@ -1352,26 +1292,6 @@ typedef struct
 		csa->nl->jnl_file.u.inode = 0;		\
 		csa->nl->jnl_file.u.device = 0;		\
 }
-#elif defined(VMS)
-#define JPC_ALLOC(csa)								\
-{										\
-	vms_lock_sb	*tmp_jnllsb;						\
-	if (NULL == csa->jnl)							\
-	{									\
-		csa->jnl = (jnl_private_control *)malloc(SIZEOF(*csa->jnl));	\
-		memset(csa->jnl, 0, SIZEOF(*csa->jnl));				\
-		csa->jnl->jnllsb = malloc(SIZEOF(vms_lock_sb));			\
-	} else									\
-	{									\
-		tmp_jnllsb = csa->jnl->jnllsb;					\
-		memset(csa->jnl, 0, SIZEOF(*csa->jnl));				\
-		csa->jnl->jnllsb = tmp_jnllsb;					\
-	}									\
-	memset(csa->jnl->jnllsb, 0, SIZEOF(vms_lock_sb));			\
-}
-#define	ASSERT_JNLFILEID_NOT_NULL(csa) assert(0 != memcmp(csa->nl->jnl_file.jnl_file_id.fid, zero_fid, SIZEOF(zero_fid)));
-#define NULLIFY_JNL_FILE_ID(csa) memset(&csa->nl->jnl_file.jnl_file_id, 0, SIZEOF(gds_file_id))
-#endif
 #define JNL_INIT(csa, reg, csd)													\
 {																\
 	csa->jnl_state = csd->jnl_state;											\
@@ -1398,12 +1318,11 @@ typedef struct
 	 */													\
 	lcl_channel = CHANNEL;											\
 	CHANNEL = NOJNL;											\
-	F_CLOSE(lcl_channel, RC);	/* resets "lcl_channel" to FD_INVALID */				\
+	CLOSEFILE_RESET(lcl_channel, RC);	/* resets "lcl_channel" to FD_INVALID */			\
 	assert(SS_NORMAL == RC);										\
 }
 
 #define MAX_EPOCH_DELAY		30
-#define EXT_NEW 		"_new"
 #define PREFIX_ROLLED_BAK	"rolled_bak_"
 #define REC_TOKEN(jnlrec)	((struct_jrec_upd *)jnlrec)->token_seq.token
 #define REC_JNL_SEQNO(jnlrec)	((struct_jrec_upd *)jnlrec)->token_seq.jnl_seqno
@@ -1414,16 +1333,9 @@ typedef struct
  * MAX_STRLEN for the actual database record. But that only takes care of the value part of the record.
  * The key can still be MAX_KEY_SZ long. So take that into account as well.
  */
-#ifdef UNIX
 #  define	JNL_MAX_SET_KILL_RECLEN(CSD)	(uint4)ROUND_UP2((FIXED_UPD_RECLEN + JREC_SUFFIX_SIZE)			\
 						+ MAX_KEY_SZ + MAX_STRLEN						\
 						+ SIZEOF(jnl_str_len_t) + SIZEOF(mstr_len_t), JNL_REC_START_BNDRY)
-#else
-#  define	JNL_MAX_SET_KILL_RECLEN(CSD)	(uint4)ROUND_UP2(FIXED_UPD_RECLEN + JREC_SUFFIX_SIZE			\
-						+ ((CSD)->blk_size - SIZEOF(blk_hdr) - SIZEOF(rec_hdr))			\
-						+ SIZEOF(jnl_str_len_t) + SIZEOF(mstr_len_t), JNL_REC_START_BNDRY)	\
-		/* fixed size part of update record + MAX possible (key + data) len + keylen-len + datalen-len */
-#endif
 
 #define	JNL_MAX_PBLK_RECLEN(CSD)	(uint4)ROUND_UP2(MIN_PBLK_RECLEN + (CSD)->blk_size, JNL_REC_START_BNDRY)
 
@@ -1530,12 +1442,64 @@ typedef struct
 	DEST = jnl_buffer_adj_value;									\
 }
 
-#ifdef UNIX
 # define CURRENT_JNL_IO_WRITER(JB)	JB->io_in_prog_latch.u.parts.latch_pid
 # define CURRENT_JNL_FSYNC_WRITER(JB)	JB->fsync_in_prog_latch.u.parts.latch_pid
-#else
-# define CURRENT_JNL_IO_WRITER(JB)	JB->now_writer
-#endif
+
+/* This macro is invoked by callers just before grabbing crit to check if a db fsync is needed and if so do it.
+ * Note that we can do the db fsync only if we already have the journal file open. If we do not, we will end
+ * up doing this later after grabbing crit. This just minimizes the # of times db fsync happens while inside crit.
+ */
+#define	DO_DB_FSYNC_OUT_OF_CRIT_IF_NEEDED(REG, CSA, JPC, JBP)			\
+MBSTART {									\
+	assert(!CSA->now_crit);							\
+	if ((NULL != JPC) && JBP->need_db_fsync)				\
+		jnl_wait(REG);	/* Try to do db fsync outside crit */		\
+} MBEND
+
+/* The below macro is currently used by the source server but is placed here in case others want to avail it later.
+ * It does the equivalent of a "jnl_flush" but without holding crit for the most part.
+ * The only case it needs crit is if it finds we do not have access to the latest journal file.
+ * In that case it needs to do a "jnl_ensure_open" which requires crit.
+ * For the caller's benefit, this macro also returns whether a jnl_flush happened (in FLUSH_DONE)
+ * and the value of jbp->dskaddr & jbp->freeaddr before the flush (in DSKADDR & FREEADDR variables).
+ */
+#define	DO_JNL_FLUSH_IF_POSSIBLE(REG, CSA, FLUSH_DONE, DSKADDR, FREEADDR)	\
+MBSTART {									\
+	jnl_private_control	*jpc;						\
+	jnl_buffer_ptr_t	jbp;						\
+	boolean_t		was_crit;					\
+	uint4			jnl_status;					\
+										\
+	assert(JNL_ENABLED(CSA));						\
+	assert(CSA == &FILE_INFO(REG)->s_addrs);				\
+	jpc = CSA->jnl;								\
+	assert(NULL != jpc);							\
+	jbp = jpc->jnl_buff;							\
+	assert(NULL != jbp);							\
+	FLUSH_DONE = FALSE;							\
+	if (jbp->dskaddr != jbp->freeaddr)					\
+	{									\
+		was_crit = CSA->now_crit;					\
+		if (!was_crit)							\
+			grab_crit(REG);						\
+		DSKADDR = jbp->dskaddr;						\
+		FREEADDR = jbp->freeaddr;					\
+		if (JNL_ENABLED(CSA->hdr) && (DSKADDR != FREEADDR))		\
+		{								\
+			jnl_status = jnl_ensure_open(REG, CSA);			\
+			assert(0 == jnl_status);				\
+			if (0 == jnl_status)					\
+			{							\
+				FLUSH_DONE = TRUE;				\
+				jnl_status = jnl_flush(REG);			\
+				assert(SS_NORMAL == jnl_status);		\
+			}							\
+			/* In case of error, silently return for now. */	\
+		}								\
+		if (!was_crit)							\
+			rel_crit(REG);						\
+	}									\
+} MBEND
 
 /* jnl_ prototypes */
 uint4	jnl_file_extend(jnl_private_control *jpc, uint4 total_jnl_rec_size);
@@ -1548,7 +1512,7 @@ uint4	cre_jnl_file(jnl_create_info *info);
 uint4 	cre_jnl_file_common(jnl_create_info *info, char *rename_fn, int rename_fn_len);
 void	cre_jnl_file_intrpt_rename(sgmnt_addrs *csa);
 void	jfh_from_jnl_info (jnl_create_info *info, jnl_file_header *header);
-uint4	jnl_ensure_open(void);
+uint4	jnl_ensure_open(gd_region *reg, sgmnt_addrs *csa);
 void	set_jnl_info(gd_region *reg, jnl_create_info *set_jnl_info);
 void	jnl_write_epoch_rec(sgmnt_addrs *csa);
 void	jnl_write_inctn_rec(sgmnt_addrs *csa);
@@ -1562,18 +1526,11 @@ void	jnl_write_poolonly(jnl_private_control *jpc, enum jnl_record_type rectype,
 
 jnl_format_buffer	*jnl_format(jnl_action_code opcode, gv_key *key, mval *val, uint4 nodeflags);
 
-#ifdef VMS
-void	finish_active_jnl_qio(void);
-void	jnl_start_ast(jnl_private_control *jpc);
-uint4	jnl_permit_ast(jnl_private_control *jpc);
-void	jnl_qio_end(jnl_private_control *jpc);
-#endif
-
 void	wcs_defer_wipchk_ast(jnl_private_control *jpc);
-uint4	set_jnl_file_close(set_jnl_file_close_opcode_t set_jnl_file_close_opcode);
-uint4 	jnl_file_open_common(gd_region *reg, off_jnl_t os_file_size);
+uint4	set_jnl_file_close(void);
+uint4 	jnl_file_open_common(gd_region *reg, off_jnl_t os_file_size, char *err_str);
 uint4	jnl_file_open_switch(gd_region *reg, uint4 sts);
-void	jnl_file_close(gd_region *reg, bool clean, bool dummy);
+void	jnl_file_close(gd_region *reg, boolean_t clean, boolean_t in_jnl_switch);
 
 /* Consider putting followings in a mupip only header file  : Layek 2/18/2003 */
 boolean_t  mupip_set_journal_parse(set_jnl_options *jnl_options, jnl_create_info *jnl_info);
@@ -1587,5 +1544,7 @@ unsigned char *ext2jnlcvt(char *ext_buff, int4 ext_len, unsigned char **tr, int
 char	*ext2jnl(char *ptr, jnl_record *rec, seq_num saved_jnl_seqno, seq_num saved_strm_seqno);
 char	*jnl2extcvt(jnl_record *rec, int4 jnl_len, char **ext_buff, int *extract_bufsiz);
 char	*jnl2ext(char *jnl_buff, char *ext_buff);
+void	jnl_set_cur_prior(gd_region *reg, sgmnt_addrs *csa, sgmnt_data *csd);
+void	jnl_set_fd_prior(int jnl_fd, sgmnt_addrs* csa, sgmnt_data* csd, jnl_file_header *jfh);
 
 #endif /* JNL_H_INCLUDED */
diff --git a/sr_port/jnl_ensure_open.c b/sr_port/jnl_ensure_open.c
index 119e7c0..227e933 100644
--- a/sr_port/jnl_ensure_open.c
+++ b/sr_port/jnl_ensure_open.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *                                                              *
- * Copyright (c) 2010-2016 Fidelity National Information	*
+ * Copyright (c) 2010-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *                                                              *
  *      This source code contains the intellectual property     *
@@ -26,26 +26,23 @@
 #include "gtcm_jnl_switched.h"
 
 GBLREF	boolean_t		is_src_server;
-GBLREF	gd_region		*gv_cur_region;
-GBLREF	sgmnt_addrs		*cs_addrs;
-GBLREF	sgmnt_data_ptr_t	cs_data;
 
 error_def(ERR_JNLFILOPN);
 
 /* make sure that the journal file is available if appropriate */
-uint4   jnl_ensure_open(void)
+uint4   jnl_ensure_open(gd_region *reg, sgmnt_addrs *csa)
 {
 	uint4			jnl_status;
 	jnl_private_control	*jpc;
-	sgmnt_addrs		*csa;
 	sgmnt_data_ptr_t	csd;
 	boolean_t		first_open_of_jnl, need_to_open_jnl;
 	int			close_res;
 
-	csa = cs_addrs;
 	csd = csa->hdr;
 	assert(csa->now_crit);
 	jpc = csa->jnl;
+	assert(&FILE_INFO(jpc->region)->s_addrs == csa);
+	assert(&FILE_INFO(reg)->s_addrs == csa);
 	assert(NULL != jpc);
 	assert(JNL_ENABLED(csa->hdr));
 	/* The goal is to change the code below to do only one JNL_FILE_SWITCHED(jpc) check instead of the additional
@@ -69,14 +66,14 @@ uint4   jnl_ensure_open(void)
 		jpc->pini_addr = 0;
 		jpc->new_freeaddr = 0;
 		if (IS_GTCM_GNP_SERVER_IMAGE)
-			gtcm_jnl_switched(jpc->region); /* Reset pini_addr of all clients that had any older journal file open */
+			gtcm_jnl_switched(reg); /* Reset pini_addr of all clients that had any older journal file open */
 		first_open_of_jnl = (0 == csa->nl->jnl_file.u.inode);
-		jnl_status = jnl_file_open(gv_cur_region, first_open_of_jnl, NULL);
+		jnl_status = jnl_file_open(reg, first_open_of_jnl);
 	}
-	DEBUG_ONLY(
-		else
-			GTM_WHITE_BOX_TEST(WBTEST_JNL_FILE_OPEN_FAIL, jnl_status, ERR_JNLFILOPN);
-	)
+#	ifdef DEBUG
+	else
+		GTM_WHITE_BOX_TEST(WBTEST_JNL_FILE_OPEN_FAIL, jnl_status, ERR_JNLFILOPN);
+#	endif
 	assert((0 != jnl_status) || !JNL_FILE_SWITCHED(jpc) || (is_src_server && !JNL_ENABLED(csa) && REPL_WAS_ENABLED(csa)));
 	return jnl_status;
 }
diff --git a/sr_port/jnl_file_close.c b/sr_port/jnl_file_close.c
old mode 100755
new mode 100644
index aad3992..48da9d9
--- a/sr_port/jnl_file_close.c
+++ b/sr_port/jnl_file_close.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2003-2015 Fidelity National Information	*
+ * Copyright (c) 2003-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -59,7 +59,7 @@ error_def(ERR_JNLWRERR);
 error_def(ERR_PREMATEOF);
 error_def(ERR_TEXT);
 
-void	jnl_file_close(gd_region *reg, bool clean, bool dummy)
+void	jnl_file_close(gd_region *reg, boolean_t clean, boolean_t in_jnl_switch)
 {
 	jnl_file_header		*header;
 	unsigned char		hdr_base[REAL_JNL_HDR_LEN + MAX_IO_BLOCK_SIZE];
@@ -172,15 +172,14 @@ void	jnl_file_close(gd_region *reg, bool clean, bool dummy)
 				assert(header->eov_tn >= header->bov_tn);
 				header->end_seqno = eof_record.jnl_seqno;
 			}
-#			ifdef UNIX
 			for (idx = 0; idx < MAX_SUPPL_STRMS; idx++)
 				header->strm_end_seqno[idx] = csd->strm_reg_seqno[idx];
 			if (jgbl.forw_phase_recovery)
 			{	/* If MUPIP JOURNAL -ROLLBACK, might need some adjustment. See macro definition for comments */
 				MUR_ADJUST_STRM_REG_SEQNO_IF_NEEDED(csd, header->strm_end_seqno);
 			}
-#			endif
 			header->last_eof_written = jb->last_eof_written;
+			header->is_not_latest_jnl = in_jnl_switch;
 			header->crash = FALSE;
 			JNL_DO_FILE_WRITE(csa, csd->jnl_file_name, jpc->channel,
 				0, header, read_write_size, jpc->status, jpc->status2);
@@ -212,7 +211,7 @@ void	jnl_file_close(gd_region *reg, bool clean, bool dummy)
 	}
 	JNL_FD_CLOSE(jpc->channel, rc);	/* sets jpc->channel to NOJNL */
 	GTM_WHITE_BOX_TEST(WBTEST_ANTIFREEZE_JNLCLOSE, rc, EIO);
-	jpc->cycle--;	/* decrement cycle so jnl_ensure_open() knows to reopen the journal */
+	jpc->cycle--;	/* decrement cycle so "jnl_ensure_open" knows to reopen the journal */
 	jpc->pini_addr = 0;
 	if (clean && (SS_NORMAL != jpc->status || SS_NORMAL != rc))
 	{
diff --git a/sr_port/jnl_file_lost.c b/sr_port/jnl_file_lost.c
index 0ef3270..d10126e 100755
--- a/sr_port/jnl_file_lost.c
+++ b/sr_port/jnl_file_lost.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2014 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -12,13 +13,6 @@
 #include "mdef.h"
 
 #include "gtm_inet.h"
-#ifdef VMS
-#include <iodef.h>
-#include <psldef.h>
-#include <lckdef.h>
-#include <efndef.h>
-#include <descrip.h>
-#endif
 
 #include "gdsroot.h"
 #include "gtm_facility.h"
@@ -28,29 +22,20 @@
 #include "filestruct.h"
 #include "ccp.h"
 #include "jnl.h"
-#ifdef VMS
-#include "locks.h"
-#endif
 #include "send_msg.h"
 #include "repl_msg.h"
 #include "gtmsource.h"
-#ifdef UNIX
 #include "anticipatory_freeze.h"
-#endif
 
 GBLREF	jnlpool_addrs		jnlpool;
 GBLREF	gd_region		*gv_cur_region;
 GBLREF	volatile boolean_t	in_wcs_recover;
 GBLREF	int			process_exiting;
-#ifdef UNIX
 GBLREF	jnlpool_ctl_ptr_t	jnlpool_ctl;
-#endif
 
 error_def(ERR_JNLCLOSED);
 error_def(ERR_REPLJNLCLOSED);
 
-static	const	unsigned short	zero_fid[3];
-
 uint4 jnl_file_lost(jnl_private_control *jpc, uint4 jnl_stat)
 {	/* Notify operator and terminate journaling */
 	unsigned int	status;
@@ -69,24 +54,18 @@ uint4 jnl_file_lost(jnl_private_control *jpc, uint4 jnl_stat)
 		break;
 	default:
 		assertpro(FALSE && jpc->region->dyn.addr->acc_meth);
+		/* no break */
 	}
-#	ifdef VMS
-	/* The following assert has been removed as it could be FALSE if the caller is "jnl_file_extend"
-	 *	assert(0 != memcmp(csa->nl->jnl_file.jnl_file_id.fid, zero_fid, SIZEOF(zero_fid)));
-	 */
-#	endif
 	assert(csa->now_crit);
-	/* We issue an rts_error (instead of shutting off journaling) in the following cases :					{BYPASSOK}
+	/* We issue an rts_error (instead of shutting off journaling) in the following cases :				{BYPASSOK}
 	 * 1) $gtm_error_on_jnl_file_lost is set to issue runtime error (if not already issued) in case of journaling issues.
 	 * 2) The process has the given message set in $gtm_custom_errors (indicative of instance freeze on error setup)
 	 *    in which case the goal is to never shut-off journaling
 	 */
-	UNIX_ONLY(assert(jnlpool.jnlpool_ctl == jnlpool_ctl));
-	UNIX_ONLY(instfreeze_environ = INST_FREEZE_ON_MSG_ENABLED(csa, jnl_stat));
-	VMS_ONLY(instfreeze_environ = FALSE);
+	assert(jnlpool.jnlpool_ctl == jnlpool_ctl);
+	instfreeze_environ = INST_FREEZE_ON_MSG_ENABLED(csa, jnl_stat);
 	if ((JNL_FILE_LOST_ERRORS == TREF(error_on_jnl_file_lost)) || instfreeze_environ)
 	{
-		VMS_ONLY(assert(FALSE)); /* Not fully implemented / supported on VMS. */
 		if (!process_exiting || instfreeze_environ || !csa->jnl->error_reported)
 		{
 			csa->jnl->error_reported = TRUE;
@@ -114,25 +93,6 @@ uint4 jnl_file_lost(jnl_private_control *jpc, uint4 jnl_stat)
 				&jnlseqno, &jnlseqno);
 	} else
 		send_msg_csa(CSA_ARG(csa) VARLSTCNT(5) ERR_JNLCLOSED, 3, DB_LEN_STR(jpc->region), &csa->ti->curr_tn);
-#ifdef VMS
-	/* We can get a jnl_file_lost before the file is even created, so locking is done only if the lock exist */
-	if (0 != csa->jnl->jnllsb->lockid)
-	{
-		was_lockid = TRUE;
-		status = gtm_enqw(EFN$C_ENF, LCK$K_EXMODE, csa->jnl->jnllsb, LCK$M_CONVERT | LCK$M_NODLCKBLK,
-				NULL, 0, NULL, 0, NULL, PSL$C_USER, 0);
-		if (SS$_NORMAL == status)
-			status = csa->jnl->jnllsb->cond;
-	}
-	jnl_file_close(jpc->region, FALSE, FALSE);
-	if (was_lockid)
-	{
-		if (SS$_NORMAL == status)
-			status = gtm_deq(csa->jnl->jnllsb->lockid, NULL, PSL$C_USER, 0);
-		assertpro(SS$_NORMAL == status);
-	}
-# else
-	jnl_file_close(jpc->region, FALSE, FALSE);
-#endif
+	jnl_file_close(jpc->region, FALSE, TRUE);
 	return EXIT_NRM;
 }
diff --git a/sr_port/jnl_file_open_common.c b/sr_port/jnl_file_open_common.c
index bf525c2..e3d1656 100755
--- a/sr_port/jnl_file_open_common.c
+++ b/sr_port/jnl_file_open_common.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2003-2016 Fidelity National Information	*
+ * Copyright (c) 2003-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -33,6 +33,7 @@
 #include "filestruct.h"
 #include "jnl.h"
 #include "gtmio.h"
+#include "sgtm_putmsg.h"
 #include "eintr_wrappers.h"
 #include "repl_msg.h"
 #include "gtmsource.h"
@@ -50,21 +51,29 @@ GBLREF  jnl_process_vector      *prc_vec;
 GBLREF	jnl_gbls_t		jgbl;
 GBLREF	uint4			mu_reorg_encrypt_in_prog;
 
+error_def(ERR_CRYPTJNLMISMATCH);
 error_def(ERR_FILEIDMATCH);
+error_def(ERR_JNLBADRECFMT);
 error_def(ERR_JNLOPNERR);
+error_def(ERR_JNLPREVRECOV);
 error_def(ERR_JNLRDERR);
-error_def(ERR_JNLBADRECFMT);
 error_def(ERR_JNLRECTYPE);
+error_def(ERR_JNLSWITCHRETRY);
 error_def(ERR_JNLTRANSGTR);
 error_def(ERR_JNLTRANSLSS);
-error_def(ERR_JNLWRERR);
 error_def(ERR_JNLVSIZE);
+error_def(ERR_JNLWRERR);
 error_def(ERR_PREMATEOF);
-error_def(ERR_JNLPREVRECOV);
-error_def(ERR_CRYPTJNLMISMATCH);
+
+#define RETURN_AND_SET_JPC(ERR, ERR2, BUF)	\
+MBSTART {					\
+	jpc->status = ERR2;			\
+	jpc->err_str = BUF;			\
+	return ERR;				\
+} MBEND
 
 /* note: returns 0 on success */
-uint4 jnl_file_open_common(gd_region *reg, off_jnl_t os_file_size)
+uint4 jnl_file_open_common(gd_region *reg, off_jnl_t os_file_size, char *buff)
 {
 	sgmnt_addrs		*csa;
 	sgmnt_data_ptr_t	csd;
@@ -77,6 +86,7 @@ uint4 jnl_file_open_common(gd_region *reg, off_jnl_t os_file_size)
 	unsigned char		eof_rec[(DISK_BLOCK_SIZE * 2) + MAX_IO_BLOCK_SIZE];
 	off_jnl_t		adjust;
 	uint4			jnl_fs_block_size, read_write_size, read_size;
+	int4			status;
 	gtm_uint64_t		header_virtual_size;
 
 	csa = &FILE_INFO(reg)->s_addrs;
@@ -84,6 +94,7 @@ uint4 jnl_file_open_common(gd_region *reg, off_jnl_t os_file_size)
 	jpc = csa->jnl;
 	jb = jpc->jnl_buff;
 	jpc->status = jpc->status2 = SS_NORMAL;
+	assert(NULL != buff);
 	jnl_fs_block_size = get_fs_block_size(jpc->channel);
 	/* check that the filesystem block size is a power of 2 as we do a lot of calculations below assuming this is the case */
 	assert(!(jnl_fs_block_size & (jnl_fs_block_size - 1)));
@@ -107,12 +118,15 @@ uint4 jnl_file_open_common(gd_region *reg, off_jnl_t os_file_size)
 		 * entire unaligned journal file size is lesser than the aligned journal file header size.
 		 */
 		assert(ERR_PREMATEOF == jpc->status);
-		return ERR_JNLRDERR;
+		return ERR_JNLRDERR; /* Has one !AD parameter, the journal file, which jnl_send_oper() provides */
 	}
 	/* Check if the header format matches our format. Cannot access any fields inside header unless this matches */
 	CHECK_JNL_FILE_IS_USABLE(header, jpc->status, FALSE, 0, NULL);	/* FALSE => NO gtm_putmsg even if errors */
 	if (SS_NORMAL != jpc->status)
-		return ERR_JNLOPNERR;
+	{
+		sgtm_putmsg(buff, VARLSTCNT(7) ERR_JNLOPNERR, 4, JNL_LEN_STR(csd), DB_LEN_STR(reg), jpc->status);
+		RETURN_AND_SET_JPC(ERR_JNLOPNERR, jpc->status, buff);
+	}
 	adjust = header->end_of_data & (jnl_fs_block_size - 1);
 	/* Read the journal JRT_EOF at header->end_of_data offset.
 	 * Make sure the buffer being read to is big enough and that as part of the read,
@@ -123,14 +137,12 @@ uint4 jnl_file_open_common(gd_region *reg, off_jnl_t os_file_size)
 	assert(header->end_of_data - adjust >= JNL_HDR_LEN);
 	DO_FILE_READ(jpc->channel, header->end_of_data - adjust, eof_rec_buffer, read_size, jpc->status, jpc->status2);
 	if (SS_NORMAL != jpc->status)
-	{
-		return ERR_JNLRDERR;
-	}
+		return ERR_JNLRDERR; /* Has one !AD parameter, the journal file, which jnl_send_oper() provides */
 	if (header->prev_recov_end_of_data)
 	{
 		/* not possible for run time. In case it happens user must fix it */
-		jpc->status = ERR_JNLPREVRECOV;
-		return ERR_JNLOPNERR;
+		sgtm_putmsg(buff, VARLSTCNT(7) ERR_JNLOPNERR, 4, JNL_LEN_STR(csd), DB_LEN_STR(reg), ERR_JNLPREVRECOV);
+		RETURN_AND_SET_JPC(ERR_JNLOPNERR, ERR_JNLPREVRECOV, buff);
 	}
 	if (!is_gdid_file_identical(&FILE_ID(reg), (char *)header->data_file_name, header->data_file_name_length))
 	{
@@ -141,31 +153,34 @@ uint4 jnl_file_open_common(gd_region *reg, off_jnl_t os_file_size)
 	memcpy(&eof_record, (unsigned char *)eof_rec_buffer + adjust, EOF_RECLEN);
 	if (JRT_EOF != eof_record.prefix.jrec_type)
 	{
-		jpc->status = ERR_JNLRECTYPE;
-		return ERR_JNLOPNERR;
+		sgtm_putmsg(buff, VARLSTCNT(7) ERR_JNLOPNERR, 4, JNL_LEN_STR(csd), DB_LEN_STR(reg), ERR_JNLRECTYPE);
+		RETURN_AND_SET_JPC(ERR_JNLOPNERR, ERR_JNLRECTYPE, buff);
 	}
 	if (eof_record.prefix.tn != csd->trans_hist.curr_tn)
 	{
 		if (eof_record.prefix.tn < csd->trans_hist.curr_tn)
-			jpc->status = ERR_JNLTRANSLSS;
+			status = ERR_JNLTRANSLSS;
 		else
-			jpc->status = ERR_JNLTRANSGTR;
-		return ERR_JNLOPNERR;
+			status = ERR_JNLTRANSGTR;
+		sgtm_putmsg(buff, VARLSTCNT(10) ERR_JNLOPNERR, 4, JNL_LEN_STR(csd), DB_LEN_STR(reg),
+				status, 2, &eof_record.prefix.tn, &csd->trans_hist.curr_tn);
+		RETURN_AND_SET_JPC(ERR_JNLOPNERR, status, buff);
 	}
 	if (eof_record.suffix.suffix_code != JNL_REC_SUFFIX_CODE ||
 		eof_record.suffix.backptr != eof_record.prefix.forwptr)
 	{
-		jpc->status = ERR_JNLBADRECFMT;
-		return ERR_JNLOPNERR;
+		sgtm_putmsg(buff, VARLSTCNT(11) ERR_JNLOPNERR, 4, JNL_LEN_STR(csd), DB_LEN_STR(reg),
+				ERR_JNLBADRECFMT, 3, JNL_LEN_STR(csd), adjust);
+		RETURN_AND_SET_JPC(ERR_JNLOPNERR, ERR_JNLBADRECFMT, buff);
 	}
 	if (!mu_reorg_encrypt_in_prog && !SAME_ENCRYPTION_SETTINGS(header, csd))
 	{	/* We expect encryption settings in the journal to be in sync with those in the file header. The only exception is
 		 * MUPIP REORG -ENCRYPT, which switches the journal file upon changing encryption-specific fields in the file
 		 * header, thus temporarily violating this expectation.
 		 */
-		send_msg_csa(CSA_ARG(csa) VARLSTCNT(6) ERR_CRYPTJNLMISMATCH, 4, JNL_LEN_STR(csd), DB_LEN_STR(reg));
-		jpc->status = ERR_CRYPTJNLMISMATCH;
-		return ERR_JNLOPNERR;
+		sgtm_putmsg(buff, VARLSTCNT(12) ERR_JNLOPNERR, 4, JNL_LEN_STR(csd), DB_LEN_STR(reg),
+				ERR_CRYPTJNLMISMATCH, 4, JNL_LEN_STR(csd), DB_LEN_STR(reg));
+		RETURN_AND_SET_JPC(ERR_JNLOPNERR, ERR_CRYPTJNLMISMATCH, buff);
 	}
 	assert(header->eov_tn == eof_record.prefix.tn);
 	header->eov_tn = eof_record.prefix.tn;
@@ -179,10 +194,10 @@ uint4 jnl_file_open_common(gd_region *reg, off_jnl_t os_file_size)
 	if ((ROUND_UP2((header_virtual_size * DISK_BLOCK_SIZE), jnl_fs_block_size) < os_file_size)
 		|| (header->jnl_deq && 0 != ((header_virtual_size - header->jnl_alq) % header->jnl_deq)))
 	{
-		send_msg_csa(CSA_ARG(csa) VARLSTCNT(8) ERR_JNLVSIZE, 6, JNL_LEN_STR(csd), header->virtual_size,
-			 header->jnl_alq, header->jnl_deq, os_file_size, jnl_fs_block_size);
-		jpc->status = ERR_JNLVSIZE;
-		return ERR_JNLOPNERR;
+		sgtm_putmsg(buff, VARLSTCNT(14) ERR_JNLOPNERR, 4, JNL_LEN_STR(csd), DB_LEN_STR(reg),
+				ERR_JNLVSIZE, 7, JNL_LEN_STR(csd), header->virtual_size,
+					header->jnl_alq, header->jnl_deq, os_file_size, jnl_fs_block_size);
+		RETURN_AND_SET_JPC(ERR_JNLOPNERR, ERR_JNLVSIZE, buff);
 	}
 	/* For performance reasons (to be able to do aligned writes to the journal file), we need to ensure the journal buffer
 	 * address is filesystem-block-size aligned in Unix. Although this is needed only in case of sync_io/direct-io, we ensure
@@ -233,6 +248,10 @@ uint4 jnl_file_open_common(gd_region *reg, off_jnl_t os_file_size)
 	jb->next_epoch_time = (uint4)(MID_TIME(prc_vec->jpv_time) + jb->epoch_interval);
 	jb->max_jrec_len = header->max_jrec_len;
 	memcpy(&header->who_opened, prc_vec, SIZEOF(jnl_process_vector));
+	if (header->is_not_latest_jnl)
+	{	/* Magic message to indicate that we should try a switch without cutting links. */
+		RETURN_AND_SET_JPC(ERR_JNLSWITCHRETRY, 0, buff);
+	}
 	header->crash = TRUE;	/* in case this processes is crashed, this will remain TRUE */
 	JNL_DO_FILE_WRITE(csa, csd->jnl_file_name, jpc->channel, 0, header, read_write_size, jpc->status, jpc->status2);
 	if (SS_NORMAL != jpc->status)
diff --git a/sr_port/jnl_file_open_switch.c b/sr_port/jnl_file_open_switch.c
index 8cff125..5653e06 100755
--- a/sr_port/jnl_file_open_switch.c
+++ b/sr_port/jnl_file_open_switch.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2003, 2014 Fidelity Information Services, Inc	*
+ * Copyright (c) 2003-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -30,7 +31,8 @@
 GBLREF 	jnl_gbls_t		jgbl;
 
 error_def(ERR_JNLFILOPN);
-error_def(ERR_JNLINVALID);
+error_def(ERR_JNLSWITCHFAIL);
+error_def(ERR_JNLSWITCHRETRY);
 error_def(ERR_PREVJNLLINKCUT);
 
 uint4 jnl_file_open_switch(gd_region *reg, uint4 sts)
@@ -48,7 +50,8 @@ uint4 jnl_file_open_switch(gd_region *reg, uint4 sts)
 	csa = &FILE_INFO(reg)->s_addrs;
 	jpc = csa->jnl;
 	assert(sts GTMTRIG_ONLY(|| TREF(in_trigger_upgrade)));
-	assert(!sts || ((ERR_JNLFILOPN != sts) && (NOJNL != jpc->channel)) || ((ERR_JNLFILOPN == sts) && (NOJNL == jpc->channel)));
+	assert(!sts || ((ERR_JNLFILOPN != sts) && (NOJNL != jpc->channel)) || ((ERR_JNLFILOPN == sts) && (NOJNL == jpc->channel))
+			|| (ERR_JNLSWITCHRETRY == sts));
 	if (NOJNL != jpc->channel)
 		JNL_FD_CLOSE(jpc->channel, status);	/* sets jpc->channel to NOJNL */
 	if (sts)
@@ -58,7 +61,10 @@ uint4 jnl_file_open_switch(gd_region *reg, uint4 sts)
 	create.status = create.status2 = SS_NORMAL;
 	create.prev_jnl = &prev_jnl_fn[0];
 	set_jnl_info(reg, &create);
-	create.no_prev_link = TRUE;
+	/* ERR_JNLSWITCHRETRY indicates that jnl_file_open_common found that the current journal had been marked for a
+	 * switch, but the switch failed at a later point, so don't cut links in that case.
+	 */
+	create.no_prev_link = (ERR_JNLSWITCHRETRY != sts);
 	create.no_rename = FALSE;
 	assert(!jgbl.forw_phase_recovery || WBTEST_ENABLED(WBTEST_RECOVER_ENOSPC) || WBTEST_ENABLED(WBTEST_JNL_CREATE_FAIL));
 	if (!jgbl.dont_reset_gbl_jrec_time)
@@ -69,7 +75,7 @@ uint4 jnl_file_open_switch(gd_region *reg, uint4 sts)
 	{
 		jpc->status = create.status;
 		jpc->status2 = create.status2;
-		return ERR_JNLINVALID;
+		return ERR_JNLSWITCHFAIL;
 	} else
 	{
 		jpc->status = SS_NORMAL;
diff --git a/sr_port/jnl_format.c b/sr_port/jnl_format.c
index 37c2c0f..47704aa 100644
--- a/sr_port/jnl_format.c
+++ b/sr_port/jnl_format.c
@@ -66,6 +66,7 @@ GBLREF	jnl_fence_control	jnl_fence_ctl;
 GBLREF	sgm_info		*sgm_info_ptr;
 GBLREF	jnl_format_buffer	*non_tp_jfb_ptr;
 GBLREF	jnl_gbls_t		jgbl;
+GBLREF	unsigned int		t_tries;
 #ifdef GTM_TRIGGER
 GBLREF	int4			gtm_trigger_depth;
 GBLREF	int4			tstart_trigger_depth;
@@ -203,17 +204,23 @@ jnl_format_buffer *jnl_format(jnl_action_code opcode, gv_key *key, mval *val, ui
 			csa->next_fenced = jnl_fence_ctl.fence_list;
 			jnl_fence_ctl.fence_list = csa;
 		} else	/* G (or U) */
-		{	/* At least one call to "jnl_format" has occurred in this TP transaction already. We therefore
-			 * expect jgbl.tp_ztp_jnl_upd_num to be non-zero at this point. The only exception is if "jnl_format"
+		{	/* If this is a U type of record (jnl_fence_ctl.level would be 0 in that case), at least one call
+			 * to "jnl_format" has occurred in this TP transaction already. We therefore expect
+			 * jgbl.tp_ztp_jnl_upd_num to be non-zero at this point. The only exception is if "jnl_format"
 			 * had been called just once before and that was for a ZTWORM type of record in which case it would be
 			 * zero (both ZTWORM and following SET/KILL record will have the same update_num value of 1).
 			 */
-			assert(jgbl.tp_ztp_jnl_upd_num
+			assert(jnl_fence_ctl.level || jgbl.tp_ztp_jnl_upd_num
 				GTMTRIG_ONLY(|| ((jfb->prev == si->jnl_head) && (JRT_TZTWORM == jfb->prev->rectype))));
 			subcode = 3;
 		}
 		if (dollar_tlevel)
 			++subcode; /* TP */
+		else if (!jgbl.forw_phase_recovery && t_tries)
+			jgbl.tp_ztp_jnl_upd_num--;	/* If ZTP, increment this only ONCE per update, not ONCE per retry.
+							 * We do this by decrementing it if t_tries > 0 to balance the
+							 * tp_ztp_jnl_upd_num++ done a few lines below.
+							 */
 		tmp_jrec_size = FIXED_UPD_RECLEN + JREC_SUFFIX_SIZE;
 		assert(FIXED_UPD_RECLEN == FIXED_ZTWORM_RECLEN);
 		assert(FIXED_UPD_RECLEN == FIXED_LGTRIG_RECLEN);
diff --git a/sr_port/jnl_put_jrt_pfin.c b/sr_port/jnl_put_jrt_pfin.c
index 5e0851c..1bb3a74 100755
--- a/sr_port/jnl_put_jrt_pfin.c
+++ b/sr_port/jnl_put_jrt_pfin.c
@@ -33,7 +33,8 @@ void	jnl_put_jrt_pfin(sgmnt_addrs *csa)
 
 	assert(csa->now_crit);
 	jpc = csa->jnl;
-	assert(0 != jpc->pini_addr);
+	assert((0 != jpc->pini_addr) ||
+			(gtm_white_box_test_case_enabled && (WBTEST_JNL_FILE_LOST_DSKADDR == gtm_white_box_test_case_number)));
 	pfin_record.prefix.jrec_type = JRT_PFIN;
 	pfin_record.prefix.forwptr = pfin_record.suffix.backptr = PFIN_RECLEN;
 	pfin_record.suffix.suffix_code = JNL_REC_SUFFIX_CODE;
diff --git a/sr_port/jnl_send_oper.c b/sr_port/jnl_send_oper.c
index fa2774b..592cc8e 100755
--- a/sr_port/jnl_send_oper.c
+++ b/sr_port/jnl_send_oper.c
@@ -67,18 +67,18 @@ void jnl_send_oper(jnl_private_control *jpc, uint4 status)
 		SEND_CALLERID("jnl_send_oper()");
 		if (0 != status)
 		{
-			if (SS_NORMAL != jpc->status)
-			{
-				if (SS_NORMAL != jpc->status2)
-				{
-					send_msg_csa(CSA_ARG(csa) VARLSTCNT(14)
-						ERR_JNLSENDOPER, 5, process_id, status, jpc->status, jpc->status2, jb->iosb.cond,
-						status, 2, JNL_LEN_STR(csd), jpc->status, 0, jpc->status2);
-				} else
-					send_msg_csa(CSA_ARG(csa) VARLSTCNT(12)
-						ERR_JNLSENDOPER, 5, process_id, status, jpc->status, jpc->status2, jb->iosb.cond,
-						status, 2, JNL_LEN_STR(csd), jpc->status);
-			} else
+			if (NULL != jpc->err_str)
+				send_msg_csa(CSA_ARG(csa) VARLSTCNT(11) ERR_JNLSENDOPER, 5, process_id, status, jpc->status,
+					jpc->status2, jb->iosb.cond, ERR_TEXT, 2, LEN_AND_STR(jpc->err_str));
+			else if (SS_NORMAL != jpc->status2)
+				send_msg_csa(CSA_ARG(csa) VARLSTCNT(14)
+					ERR_JNLSENDOPER, 5, process_id, status, jpc->status, jpc->status2, jb->iosb.cond,
+					status, 2, JNL_LEN_STR(csd), jpc->status, 0, jpc->status2);
+			else if (SS_NORMAL != jpc->status)
+				send_msg_csa(CSA_ARG(csa) VARLSTCNT(12)
+					ERR_JNLSENDOPER, 5, process_id, status, jpc->status, jpc->status2, jb->iosb.cond,
+					status, 2, JNL_LEN_STR(csd), jpc->status);
+			else
 				send_msg_csa(CSA_ARG(csa) VARLSTCNT(11) ERR_JNLSENDOPER, 5, process_id, status, jpc->status,
 					jpc->status2, jb->iosb.cond, status, 2, JNL_LEN_STR(csd));
 		}
diff --git a/sr_port/jnl_set_cur_prior.c b/sr_port/jnl_set_cur_prior.c
new file mode 100644
index 0000000..01e0d4a
--- /dev/null
+++ b/sr_port/jnl_set_cur_prior.c
@@ -0,0 +1,67 @@
+/****************************************************************
+ *								*
+ * Copyright (c) 2017 Fidelity National Information		*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
+ *								*
+ *	This source code contains the intellectual property	*
+ *	of its copyright holder(s), and is made available	*
+ *	under a license.  If you do not know the terms of	*
+ *	the license, please stop and do not read further.	*
+ *								*
+ ****************************************************************/
+
+
+#include "mdef.h"
+#include "gdsroot.h"
+#include "gdsbt.h"
+#include "gdsfhead.h"
+#include "filestruct.h"
+#include "jnl.h"
+#include "gtmio.h"
+#include "anticipatory_freeze.h"
+
+/* For use when disabling journaling in standalone to mark the current journal file as being a prior journal file.
+ * The journal file is not always present/usable/writable, in which case we can't change it, so ignore errors.
+ */
+void jnl_set_cur_prior(gd_region *reg, sgmnt_addrs *csa, sgmnt_data *csd)
+{
+	int			jnl_fd;
+	unix_db_info		*udi;
+
+	udi = FILE_INFO(reg);
+	assert('\0' == csd->jnl_file_name[csd->jnl_file_len]);
+	assert(udi->grabbed_access_sem || (csa->now_crit && !csa->nl->jnl_file.u.inode));
+	OPENFILE((char *)csd->jnl_file_name, O_RDWR, jnl_fd);
+	if (FD_INVALID != jnl_fd)
+		jnl_set_fd_prior(jnl_fd, csa, csd, NULL);
+}
+
+/* Same as above, but for when we already have the file open.
+ * If jfh is non-NULL, it is assumed correct, updated, and written; otherwise, a fresh copy is read from the file.
+ */
+void jnl_set_fd_prior(int jnl_fd, sgmnt_addrs* csa, sgmnt_data* csd, jnl_file_header *jfh)
+{
+	int			status1, status2;
+	jnl_file_header		header, *jfh_checked = NULL;
+
+	if (NULL == jfh)
+	{
+		DO_FILE_READ(jnl_fd, 0, &header, SIZEOF(header), status1, status2);
+		assert(SS_NORMAL == status1);
+		if (SS_NORMAL == status1)
+		{
+			CHECK_JNL_FILE_IS_USABLE(&header, status1, FALSE, 0, NULL);
+			assert(SS_NORMAL == status1);
+			if ((SS_NORMAL == status1) && !header.is_not_latest_jnl)
+				jfh_checked = &header;
+		}
+	} else
+		jfh_checked = jfh;
+	if (NULL != jfh_checked)
+	{
+		jfh_checked->is_not_latest_jnl = TRUE;
+		JNL_DO_FILE_WRITE(csa, csd->jnl_file_name, jnl_fd, 0, jfh_checked, get_fs_block_size(jnl_fd), status1, status2);
+		assert(SS_NORMAL == status1);
+	}
+	JNL_FD_CLOSE(jnl_fd, status1);
+}
diff --git a/sr_port/jnl_wait.c b/sr_port/jnl_wait.c
index ef55790..e90c377 100755
--- a/sr_port/jnl_wait.c
+++ b/sr_port/jnl_wait.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2003 Sanchez Computer Associates, Inc.	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -34,10 +35,8 @@ void jnl_wait(gd_region *reg)
 		if ((TRUE == JNL_ENABLED(csa->hdr)) && (NULL != jpc))
 		{	/* wait on jnl writes for region */
 			status = jnl_write_attempt(jpc, jpc->new_freeaddr);
-			UNIX_ONLY(
-				  if (SS_NORMAL == status && !JNL_FILE_SWITCHED(jpc))
-					jnl_fsync(reg, jpc->new_freeaddr);
-				 );
+			if (SS_NORMAL == status && !JNL_FILE_SWITCHED(jpc))
+				jnl_fsync(reg, jpc->new_freeaddr);
 		}
 	}
 	return;
diff --git a/sr_port/lb_init.c b/sr_port/lb_init.c
index e0a5c98..a199c71 100755
--- a/sr_port/lb_init.c
+++ b/sr_port/lb_init.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -20,7 +20,6 @@
 #include "advancewindow.h"
 #include "lb_init.h"
 
-GBLREF	unsigned char			*source_buffer;
 GBLREF	struct ce_sentinel_desc		*ce_def_list;
 
 error_def(ERR_CETOOMANY);
@@ -33,31 +32,29 @@ void lb_init(void)
 {
 	int				num_subs, y;
 	short int			sav_last_src_col, source_col;
-	int4				source_len, skip_count;
+	int4				skip_count;
 	unsigned char			*cp, *cp1;
-	bool				possible_sentinel;
+	boolean_t			possible_sentinel;
 	struct ce_sentinel_desc		*shp;
 #	ifdef DEBUG
-	unsigned char			original_source[MAX_SRCLINE];
+	unsigned char			original_source[MAX_SRCLINE + 1];
 #	endif
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
 	if (NULL != ce_def_list)
 	{
-		for (source_len = 0; '\0' != source_buffer[source_len]; source_len++);
 #		ifdef DEBUG
-		memcpy (original_source, source_buffer, source_len + 2);	/* include terminating null characters */
+		memcpy(original_source, (TREF(source_buffer)).addr, (TREF(source_buffer)).len + 1);	/* include NUL term chars */
 #		endif
 		source_col = 1;
 		num_subs = 0;
-		cp = source_buffer;
 		possible_sentinel = TRUE;
-		while (possible_sentinel && source_buffer[source_col - 1])
+		while (possible_sentinel)
 		{
 			possible_sentinel = FALSE;
-			cp = source_buffer + source_col - 1;
-			if (DEL < *cp)
+			cp = (unsigned char *)((TREF(source_buffer)).addr + source_col - 1);
+			if (('\0' == *cp) || (DEL < *cp))
 				break;
 			if ('\"' == *cp)
 			{
@@ -138,7 +135,7 @@ void lb_init(void)
 			}
 		}
 	}
-	TREF(lexical_ptr) = (char *)source_buffer;
+	TREF(lexical_ptr) = (TREF(source_buffer)).addr;
 	advancewindow();
 	advancewindow();
 	return;
diff --git a/sr_port/line.c b/sr_port/line.c
index 7624953..93a4f5c 100755
--- a/sr_port/line.c
+++ b/sr_port/line.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -64,7 +65,7 @@ boolean_t line(uint4 *lnc)
 	curlin->line_number = *lnc;
 	*lnc = *lnc + 1;
 	curlin->table = TRUE;
-	CHKTCHAIN(TREF(curtchain));
+	CHKTCHAIN(TREF(curtchain), exorder, FALSE);
 	TREF(pos_in_chain) = *(TREF(curtchain));
 	if (TK_IDENT == TREF(window_token))
 	{
diff --git a/sr_port/lke.h b/sr_port/lke.h
index c2762a5..c1c9631 100755
--- a/sr_port/lke.h
+++ b/sr_port/lke.h
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2011 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -25,11 +26,6 @@ void lke_help(void);
 void lke_show(void);
 void lke_show_memory(mlk_shrblk_ptr_t bhead, char *prefix);
 
-#ifdef VMS
-void lke(void);
-#else
 CONDITION_HANDLER(lke_ctrlc_handler);
-#endif
-void lke_setgdr(void);
 
 #endif /* __LKE_H__ */
diff --git a/sr_port/lke.hlp b/sr_port/lke.hlp
index f63984d..e57a822 100755
--- a/sr_port/lke.hlp
+++ b/sr_port/lke.hlp
@@ -555,7 +555,7 @@
 1 Copyright
    Copyright
 
-   Copyright 2016
+   Copyright 2017
 
    Fidelity National Information Services, Inc. and/or its subsidiaries. All
    rights reserved.
@@ -577,7 +577,7 @@
 
    **Note**
 
-   This help file is a concise representation of revision V6.3-000 of the
+   This help file is a concise representation of revision V6.3-001 of the
    UNIX Administration and Operations Guide. To obtain a copy of the current
    revision, go to www.fis-gtm.com and then click on the User Documentation
    tab.
diff --git a/sr_port/lke_clear.c b/sr_port/lke_clear.c
index e80b6c2..1bae436 100755
--- a/sr_port/lke_clear.c
+++ b/sr_port/lke_clear.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -37,14 +38,14 @@
 #include "lke_getcli.h"
 #include "lke_cleartree.h"
 #include "gtmmsg.h"
+#include "interlock.h"
+#include "rel_quant.h"
 
 #define NOFLUSH 0
 #define FLUSH	1
 #define RESET	2
 
-GBLREF	gd_region	*gv_cur_region;
 GBLREF	gd_addr		*gd_header;
-GBLREF	sgmnt_addrs	*cs_addrs;
 GBLREF	short		crash_count;
 
 error_def(ERR_NOREGION);
@@ -61,74 +62,62 @@ void	lke_clear(void)
 	int		n;
 	char		regbuf[MAX_RN_LEN], nodebuf[32], one_lockbuf[MAX_KEY_SZ];
 	mlk_ctldata_ptr_t	ctl;
-	mstr		reg, node, one_lock;
+	mstr		regname, node, one_lock;
+	gd_region	*reg;
+	sgmnt_addrs	*csa;
 
 	/* Get all command parameters */
-	reg.addr = regbuf;
-	reg.len = SIZEOF(regbuf);
+	regname.addr = regbuf;
+	regname.len = SIZEOF(regbuf);
 	node.addr = nodebuf;
 	node.len = SIZEOF(nodebuf);
 	one_lock.addr = one_lockbuf;
 	one_lock.len = SIZEOF(one_lockbuf);
-
-	if (lke_getcli(&all, &wait, &interactive, &pid, &reg, &node, &one_lock, &memory, &nocrit, &exact) == 0)
+	if (lke_getcli(&all, &wait, &interactive, &pid, &regname, &node, &one_lock, &memory, &nocrit, &exact) == 0)
 		return;
-
 	/* Search all regions specified on the command line */
-	for (gv_cur_region = gd_header->regions, n = 0;
-	     n != gd_header->n_regions;
-	     ++gv_cur_region, ++n)
+	for (reg = gd_header->regions, n = 0; n != gd_header->n_regions; ++reg, ++n)
 	{	/* If region matches and is open */
-		if ((reg.len == 0  ||
-		     gv_cur_region->rname_len == reg.len  &&  memcmp(gv_cur_region->rname, reg.addr, reg.len) == 0)  &&
-		    gv_cur_region->open)
+		if ((regname.len == 0  ||
+		     reg->rname_len == regname.len  &&  memcmp(reg->rname, regname.addr, regname.len) == 0)  &&
+		    reg->open)
 		{
 			match = TRUE;
-			util_out_print("!/!AD!/", NOFLUSH, REG_LEN_STR(gv_cur_region));
+			util_out_print("!/!AD!/", NOFLUSH, REG_LEN_STR(reg));
 			/* If distributed database, the region is located on another node */
-			if (gv_cur_region->dyn.addr->acc_meth == dba_cm)
+			if (reg->dyn.addr->acc_meth == dba_cm)
 			{
 #				if defined(LKE_WORKS_OK_WITH_CM)
 				/* Remote lock clears are not supported, so LKE CLEAR -EXACT qualifier
 				 * will not be supported on GT.CM.*/
-				locks = gtcmtr_lke_clearreq(gv_cur_region->dyn.addr->cm_blk, gv_cur_region->cmx_regnum,
+				locks = gtcmtr_lke_clearreq(reg->dyn.addr->cm_blk, reg->cmx_regnum,
 							    all, interactive, pid, &node);
 #				else
 				gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(10) ERR_UNIMPLOP, 0, ERR_TEXT, 2,
 						LEN_AND_LIT("GT.CM region - locks must be cleared on the local node"),
-						ERR_TEXT, 2, REG_LEN_STR(gv_cur_region));
+						ERR_TEXT, 2, REG_LEN_STR(reg));
 				continue;
 #				endif
-			} else if ((dba_bg == gv_cur_region->dyn.addr->acc_meth) || (dba_mm == gv_cur_region->dyn.addr->acc_meth))
+			} else if (IS_REG_BG_OR_MM(reg))
 			{	/* Local region */
-				cs_addrs = &FILE_INFO(gv_cur_region)->s_addrs;
-				ctl = (mlk_ctldata_ptr_t)cs_addrs->lock_addrs[0];
+				csa = &FILE_INFO(reg)->s_addrs;
+				ctl = (mlk_ctldata_ptr_t)csa->lock_addrs[0];
 				/* Prevent any modifications of locks while we are clearing */
-				if (cs_addrs->critical != NULL)
-					crash_count = cs_addrs->critical->crashcnt;
-				was_crit = cs_addrs->now_crit;
-				if (!was_crit)
-					grab_crit(gv_cur_region);
+				GRAB_LOCK_CRIT(csa, reg, was_crit);
 				locks = ctl->blkroot == 0 ? FALSE
-							  : lke_cleartree(gv_cur_region, NULL, ctl,
+							  : lke_cleartree(reg, NULL, ctl,
 									 (mlk_shrblk_ptr_t)R2A(ctl->blkroot),
 									  all, interactive, pid, one_lock, exact);
-				if (!was_crit)
-					rel_crit(gv_cur_region);
+				REL_LOCK_CRIT(csa, reg, was_crit);
 			} else
 			{
 				gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(2) ERR_BADREGION, 0);
 				locks = TRUE;
 			}
-
 			if (!locks)
-			{
-				gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_NOLOCKMATCH, 2, REG_LEN_STR(gv_cur_region));
-			}
+				gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_NOLOCKMATCH, 2, REG_LEN_STR(reg));
 		}
 	}
-
-	if (!match  &&  reg.len != 0)
-		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_NOREGION, 2, reg.len, reg.addr);
-
+	if (!match  &&  regname.len != 0)
+		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_NOREGION, 2, regname.len, regname.addr);
 }
diff --git a/sr_port/lke_show.c b/sr_port/lke_show.c
index da71264..f3b5ae2 100755
--- a/sr_port/lke_show.c
+++ b/sr_port/lke_show.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2012 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -38,14 +39,14 @@
 #include "lke_getcli.h"
 #include "gtmmsg.h"
 #include "min_max.h"
+#include "interlock.h"
+#include "rel_quant.h"
 
 #define NOFLUSH 0
 #define FLUSH	1
 #define RESET	2
 
-GBLREF	gd_region	*gv_cur_region;
 GBLREF	gd_addr		*gd_header;
-GBLREF	sgmnt_addrs	*cs_addrs;
 GBLREF	short		crash_count;
 
 error_def(ERR_UNIMPLOP);
@@ -66,58 +67,56 @@ void	lke_show(void)
 	int			n;
 	char 			regbuf[MAX_RN_LEN], nodebuf[32], one_lockbuf[MAX_KEY_SZ];
 	mlk_ctldata_ptr_t	ctl;
-	mstr			reg, node, one_lock;
+	mstr			regname, node, one_lock;
+	gd_region		*reg;
+	sgmnt_addrs		*csa;
 	int			shr_sub_len = 0;
 	float			ls_free = 0;	/* Free space in bottleneck subspace */
+
 	/* Get all command parameters */
-	reg.addr = regbuf;
-	reg.len = SIZEOF(regbuf);
+	regname.addr = regbuf;
+	regname.len = SIZEOF(regbuf);
 	node.addr = nodebuf;
 	node.len = SIZEOF(nodebuf);
 	one_lock.addr = one_lockbuf;
 	one_lock.len = SIZEOF(one_lockbuf);
-	if (lke_getcli(&all, &wait, &interactive, &pid, &reg, &node, &one_lock, &memory, &nocrit, &exact) == 0)
+	if (lke_getcli(&all, &wait, &interactive, &pid, &regname, &node, &one_lock, &memory, &nocrit, &exact) == 0)
 		return;
-
 	/* Search all regions specified on the command line */
-	for (gv_cur_region = gd_header->regions, n = 0; n != gd_header->n_regions; ++gv_cur_region, ++n)
+	for (reg = gd_header->regions, n = 0; n != gd_header->n_regions; ++reg, ++n)
 	{
 		/* If region matches and is open */
-		if ((reg.len == 0  ||
-		     gv_cur_region->rname_len == reg.len  &&  memcmp(gv_cur_region->rname, reg.addr, reg.len) == 0)  &&
-		    gv_cur_region->open)
+		if (((0 == regname.len) || (reg->rname_len == regname.len) && !memcmp(reg->rname, regname.addr, regname.len))
+			&& reg->open)
 		{
 			match = TRUE;
-			util_out_print("!/!AD!/", NOFLUSH, REG_LEN_STR(gv_cur_region));
-
+			util_out_print("!/!AD!/", NOFLUSH, REG_LEN_STR(reg));
 			/* If distributed database, the region is located on another node */
-			if (gv_cur_region->dyn.addr->acc_meth == dba_cm)
+			if (reg->dyn.addr->acc_meth == dba_cm)
 			{
 #				if defined(LKE_WORKS_OK_WITH_CM)
 				/* Obtain lock info from the remote node */
-				locks = gtcmtr_lke_showreq(gv_cur_region->dyn.addr->cm_blk, gv_cur_region->cmx_regnum,
+				locks = gtcmtr_lke_showreq(reg->dyn.addr->cm_blk, reg->cmx_regnum,
 							   all, wait, pid, &node);
+				assert(FALSE);	/* because "csa" is not initialized here and is used below */
 #				else
-				gtm_putmsg(VARLSTCNT(10) ERR_UNIMPLOP, 0, ERR_TEXT, 2,
+				gtm_putmsg_csa(NULL, VARLSTCNT(10) ERR_UNIMPLOP, 0, ERR_TEXT, 2,
 						LEN_AND_LIT("GT.CM region - locks must be displayed on the local node"),
-						ERR_TEXT, 2, REG_LEN_STR(gv_cur_region));
+						ERR_TEXT, 2, REG_LEN_STR(reg));
 				continue;
 #				endif
-			} else if (gv_cur_region->dyn.addr->acc_meth == dba_bg  || gv_cur_region->dyn.addr->acc_meth == dba_mm)
+			} else if (IS_REG_BG_OR_MM(reg))
 			{	/* Local region */
-				cs_addrs = &FILE_INFO(gv_cur_region)->s_addrs;
-				ls_len = (size_t)(cs_addrs->lock_addrs[1] - cs_addrs->lock_addrs[0]);
+				csa = &FILE_INFO(reg)->s_addrs;
+				ls_len = (size_t)(csa->lock_addrs[1] - csa->lock_addrs[0]);
 				ctl = (mlk_ctldata_ptr_t)malloc(ls_len);
 				/* Prevent any modification of the lock space while we make a local copy of it */
-				if (cs_addrs->critical != NULL)
-					crash_count = cs_addrs->critical->crashcnt;
-				was_crit = cs_addrs->now_crit;
-				if (!nocrit && !was_crit)
-					grab_crit(gv_cur_region);
-				longcpy((uchar_ptr_t)ctl, (uchar_ptr_t)cs_addrs->lock_addrs[0], ls_len);
+				if (!nocrit)
+					GRAB_LOCK_CRIT(csa, reg, was_crit);
+				longcpy((uchar_ptr_t)ctl, (uchar_ptr_t)csa->lock_addrs[0], ls_len);
 				assert((ctl->max_blkcnt > 0) && (ctl->max_prccnt > 0) && ((ctl->subtop - ctl->subbase) > 0));
-				if (!nocrit && !was_crit)
-					rel_crit(gv_cur_region);
+				if (!nocrit)
+					REL_LOCK_CRIT(csa, reg, was_crit);
 				shr_sub_len = 0;
 				locks = ctl->blkroot == 0 ?
 						FALSE:
@@ -131,35 +130,31 @@ void	lke_show(void)
 				ls_free = MIN(1-(((float)shr_sub_len) / (ctl->subtop - ctl->subbase)), ls_free);
 				ls_free *= 100;	/* Scale to [0-100] range. (couldn't do this inside util_out_print) */
 				if (ls_free < 1) /* No memory? Notify user. */
-					gtm_putmsg(VARLSTCNT(4) ERR_LOCKSPACEFULL, 2, DB_LEN_STR(gv_cur_region));
+					gtm_putmsg_csa(NULL, VARLSTCNT(4) ERR_LOCKSPACEFULL, 2, DB_LEN_STR(reg));
 				if (ls_free < 1 || memory)
 				{
 					if (ctl->subtop > ctl->subfree)
-						gtm_putmsg(VARLSTCNT(10) ERR_LOCKSPACEINFO, 8, REG_LEN_STR(gv_cur_region),
+						gtm_putmsg_csa(NULL, VARLSTCNT(10) ERR_LOCKSPACEINFO, 8, REG_LEN_STR(reg),
 							   (ctl->max_prccnt - ctl->prccnt), ctl->max_prccnt,
 							   (ctl->max_blkcnt - ctl->blkcnt), ctl->max_blkcnt, LEN_AND_LIT(" not "));
 					else
-						gtm_putmsg(VARLSTCNT(10) ERR_LOCKSPACEINFO, 8, REG_LEN_STR(gv_cur_region),
+						gtm_putmsg_csa(NULL, VARLSTCNT(10) ERR_LOCKSPACEINFO, 8, REG_LEN_STR(reg),
 							   (ctl->max_prccnt - ctl->prccnt), ctl->max_prccnt,
 							   (ctl->max_blkcnt - ctl->blkcnt), ctl->max_blkcnt, LEN_AND_LIT(" "));
 				}
 				free(ctl);
 			} else
 			{
-				gtm_putmsg(VARLSTCNT(2) ERR_BADREGION, 0);
+				gtm_putmsg_csa(NULL, VARLSTCNT(2) ERR_BADREGION, 0);
 				locks = TRUE;
 			}
 			if (!locks)
-			{
-				gtm_putmsg(VARLSTCNT(4) ERR_NOLOCKMATCH, 2, REG_LEN_STR(gv_cur_region));
-			}
+				gtm_putmsg_csa(NULL, VARLSTCNT(4) ERR_NOLOCKMATCH, 2, REG_LEN_STR(reg));
 			assert((ls_free <= 100) && (ls_free >= 0));
-			gtm_putmsg(VARLSTCNT(4) ERR_LOCKSPACEUSE, 2, ((int)ls_free),
-				       cs_addrs->hdr->lock_space_size/OS_PAGELET_SIZE);
+			gtm_putmsg_csa(NULL, VARLSTCNT(4) ERR_LOCKSPACEUSE, 2, ((int)ls_free),
+				       csa->hdr->lock_space_size/OS_PAGELET_SIZE);
 		}
 	}
-
-	if (!match  &&  reg.len != 0)
-		rts_error(VARLSTCNT(4) ERR_NOREGION, 2, reg.len, reg.addr);
-
+	if (!match && (0 != regname.len))
+		rts_error_csa(NULL, VARLSTCNT(4) ERR_NOREGION, 2, regname.len, regname.addr);
 }
diff --git a/sr_port/lvzwr_out.c b/sr_port/lvzwr_out.c
index 68ee69c..03029e6 100644
--- a/sr_port/lvzwr_out.c
+++ b/sr_port/lvzwr_out.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -317,7 +317,7 @@ void lvzwr_out(lv_val *lvp)
 			if (!LV_IS_BASE_VAR(dst_lv))
 			{
 				LV_SBS_DEPTH(dst_lv, FALSE, sbs_depth);
-				if (MAX_LVSUBSCRIPTS < (sbs_depth + nsubs))
+				if (MAX_LVSUBSCRIPTS <= (sbs_depth + nsubs))
 					rts_error_csa(CSA_ARG(NULL) VARLSTCNT(3) ERR_MERGEINCOMPL, 0, ERR_MAXNRSUBSCRIPTS);
 			}
 			param_list.arg[0] = dst_lv;	/* this is already protected from stp_gcol by op_merge so no need to
diff --git a/sr_port/m_do.c b/sr_port/m_do.c
index ffda795..28b6162 100755
--- a/sr_port/m_do.c
+++ b/sr_port/m_do.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information 	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -25,10 +25,14 @@ GBLREF	boolean_t	run_time;
 error_def(ERR_ACTOFFSET);
 
 int m_do(void)
+/* compiler module for a DO command */
 {
 	int		opcd;
 	oprtype		*cr;
-	triple		*calltrip, *labelref, *obp, *oldchain, *ref0, *ref1, *routineref, tmpchain, *triptr, *tripsize;
+	triple		*calltrip, *labelref, *obp, *oldchain, *ref0, *ref1, *routineref, tmpchain, *triptr;
+#	ifndef __i386
+	triple		*tripsize;
+#	endif
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
@@ -38,7 +42,9 @@ int m_do(void)
 		{
 			calltrip = newtriple(OC_CALLSP);
 			calltrip->operand[0] = put_mnxl();
+#			ifndef __i386
 			calltrip->operand[1] = put_ocnt();
+#			endif
 		}
 		return TRUE;
 	} else if (TK_AMPERSAND == TREF(window_token))
@@ -60,21 +66,31 @@ int m_do(void)
 		{
 			assert(MLAB_REF == calltrip->operand[0].oprclass);
 			calltrip->opcode = OC_EXCAL;
+#			ifdef __i386
+			ref0 = calltrip;
+#			else
 			ref0 = newtriple(OC_PARAMETER);
 			calltrip->operand[1] = put_tref(ref0);
 			ref0->operand[0] = put_tsiz();	/* parm to hold size of jump codegen */
 			tripsize = ref0->operand[0].oprval.tref;
 			assert(OC_TRIPSIZE == tripsize->opcode);
+#			endif
 		} else
 		{
 			if (OC_EXTCALL == calltrip->opcode)
 			{
 				assert(TRIP_REF == calltrip->operand[1].oprclass);
+#				ifdef __i386
+				if (OC_CDLIT == calltrip->operand[1].oprval.tref->opcode)
+				{
+					assert(CDLT_REF == calltrip->operand[1].oprval.tref->operand[0].oprclass);
+#				else
 				opcd = calltrip->operand[1].oprval.tref->opcode;
 				if ((OC_CDLIT == opcd) || (OC_CDIDX == opcd))
 				{
 					DEBUG_ONLY(opcd = calltrip->operand[1].oprval.tref->operand[0].oprclass);
 					assert((CDLT_REF == opcd) || (CDIDX_REF == opcd));
+#				endif
 				} else
 				{
 					assert(OC_LABADDR == calltrip->operand[1].oprval.tref->opcode);
@@ -106,8 +122,8 @@ int m_do(void)
 						return FALSE;
 					}
 				}
-			} else		/* DO _ @dlabel actuallist */
-			{
+			} else
+			{	/* DO _ @dlabel actuallist */
 				assert(OC_COMMARG == calltrip->opcode);
 				assert(TRIP_REF == calltrip->operand[1].oprclass);
 				assert(OC_ILIT == calltrip->operand[1].oprval.tref->opcode);
@@ -137,10 +153,12 @@ int m_do(void)
 			return FALSE;
 	} else if (OC_CALL == calltrip->opcode)
 	{
+#		ifndef __i386
 		calltrip->operand[1] = put_ocnt();
-		if (TREF(for_stack_ptr) != TADR(for_stack))
+#		endif
+		if (TREF(for_stack_ptr) != (oprtype **)TADR(for_stack))
 		{
-			if (TAREF1(for_temps, (TREF(for_stack_ptr) - TADR(for_stack))))
+			if (TAREF1(for_temps, (TREF(for_stack_ptr) - (oprtype **)TADR(for_stack))))
 				calltrip->opcode = OC_FORLCLDO;
 		}
 	}
@@ -150,19 +168,49 @@ int m_do(void)
 		cr = (oprtype *)mcalloc(SIZEOF(oprtype));
 		if (!bool_expr(FALSE, cr))
 			return FALSE;
+		for (triptr = (TREF(curtchain))->exorder.bl; OC_NOOP == triptr->opcode; triptr = triptr->exorder.bl)
+			;
+		if (OC_LIT == triptr->opcode)
+		{	/* it's a literal so optimize it */
+			unuse_literal(&triptr->operand[0].oprval.mlit->v);
+			dqdel(triptr, exorder);
+			if (0 == triptr->operand[0].oprval.mlit->v.m[1])
+			{
+				setcurtchain(oldchain);		/* it's a FALSE so just discard the whole thing */
+#				ifndef __i386
+				if (OC_EXCAL == calltrip->opcode)
+					tripsize->opcode = OC_NOOP;		/* if we are abandoning this DO, clear this too */
+#				endif
+				return TRUE;
+			}					/* the code below is the same as for the no postconditional case */
+			obp = oldchain->exorder.bl;		/* it's a TRUE - just pretend it isn't even there */
+			dqadd(obp, &tmpchain, exorder);		/* this is a violation of info hiding */
+			if (OC_EXCAL == calltrip->opcode)
+			{	/* this code is the same as below for no condition */
+				triptr = newtriple(OC_JMP);
+				triptr->operand[0] = put_mfun(&calltrip->operand[0].oprval.lab->mvname);
+				calltrip->operand[0].oprclass = ILIT_REF;	/* dummy placeholder */
+#				ifndef __i386
+				tripsize->operand[0].oprval.tsize->ct = triptr;
+#				endif
+			}
+			return TRUE;
+		}
 		if ((TREF(expr_start) != TREF(expr_start_orig)) && (OC_NOOP != (TREF(expr_start))->opcode))
 		{
 			triptr = newtriple(OC_GVRECTARG);
 			triptr->operand[0] = put_tref(TREF(expr_start));
 		}
 		obp = oldchain->exorder.bl;
-		dqadd(obp, &tmpchain, exorder);   /*this is a violation of info hiding*/
+		dqadd(obp, &tmpchain, exorder);			/* this is a violation of info hiding */
 		if (OC_EXCAL == calltrip->opcode)
 		{
 			triptr = newtriple(OC_JMP);
 			triptr->operand[0] = put_mfun(&calltrip->operand[0].oprval.lab->mvname);
 			calltrip->operand[0].oprclass = ILIT_REF;	/* dummy placeholder */
+#			ifndef __i386
 			tripsize->operand[0].oprval.tsize->ct = triptr;
+#			endif
 		}
 		if ((TREF(expr_start) != TREF(expr_start_orig)) && (OC_NOOP != (TREF(expr_start))->opcode))
 		{
@@ -174,15 +222,17 @@ int m_do(void)
 		} else
 			tnxtarg(cr);
 	} else
-	{
+	{	/* the code below is the same as for the case of a postconditional known at compile time to be TRUE */
 		obp = oldchain->exorder.bl;
-		dqadd(obp, &tmpchain, exorder);   /*this is a violation of info hiding*/
+		dqadd(obp, &tmpchain, exorder);			/* this is a violation of info hiding */
 		if (OC_EXCAL == calltrip->opcode)
 		{
 			triptr = newtriple(OC_JMP);
 			triptr->operand[0] = put_mfun(&calltrip->operand[0].oprval.lab->mvname);
 			calltrip->operand[0].oprclass = ILIT_REF;	/* dummy placeholder */
+#			ifndef __i386
 			tripsize->operand[0].oprval.tsize->ct = triptr;
+#			endif
 		}
 	}
 	return TRUE;
diff --git a/sr_port/m_goto.c b/sr_port/m_goto.c
index 6121fdb..6f3f7aa 100755
--- a/sr_port/m_goto.c
+++ b/sr_port/m_goto.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2012 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -20,9 +21,9 @@
 #include "cmd.h"
 
 int m_goto(void)
+/* compiler module for (ugh!) GOTO */
 {
-	oprtype	*cr;
-	triple	*obp, *oldchain, *ref0, *ref1, tmpchain, *triptr;
+	triple	*obp, *oldchain, tmpchain;
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
@@ -35,30 +36,8 @@ int m_goto(void)
 	}
 	setcurtchain(oldchain);
 	if (TK_COLON == TREF(window_token))
-	{
-		advancewindow();
-		cr = (oprtype *)mcalloc(SIZEOF(oprtype));
-		if (!bool_expr(FALSE, cr))
-			return FALSE;
-		if ((TREF(expr_start) != TREF(expr_start_orig)) && (OC_NOOP != (TREF(expr_start))->opcode))
-		{
-			triptr = newtriple(OC_GVRECTARG);
-			triptr->operand[0] = put_tref(TREF(expr_start));
-		}
-		obp = oldchain->exorder.bl;
-		dqadd(obp, &tmpchain, exorder);   /*this is a violation of info hiding*/
-		if ((TREF(expr_start) != TREF(expr_start_orig)) && (OC_NOOP != (TREF(expr_start))->opcode))
-		{
-			ref0 = newtriple(OC_JMP);
-			ref1 = newtriple(OC_GVRECTARG);
-			ref1->operand[0] = put_tref(TREF(expr_start));
-			*cr = put_tjmp(ref1);
-			tnxtarg(&ref0->operand[0]);
-		} else
-			tnxtarg(cr);
-		return TRUE;
-	}
+		return m_goto_postcond(oldchain, &tmpchain);		/* post conditional expression */
 	obp = oldchain->exorder.bl;
-	dqadd(obp, &tmpchain, exorder);   /*this is a violation of info hiding*/
+	dqadd(obp, &tmpchain, exorder);					/*this violates info hiding*/
 	return TRUE;
 }
diff --git a/sr_port/m_goto_postcond.c b/sr_port/m_goto_postcond.c
new file mode 100644
index 0000000..1e18c6a
--- /dev/null
+++ b/sr_port/m_goto_postcond.c
@@ -0,0 +1,68 @@
+/****************************************************************
+ *								*
+ * Copyright (c) 2016 Fidelity National Information		*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
+ *								*
+ *	This source code contains the intellectual property	*
+ *	of its copyright holder(s), and is made available	*
+ *	under a license.  If you do not know the terms of	*
+ *	the license, please stop and do not read further.	*
+ *								*
+ ****************************************************************/
+#include "mdef.h"
+#include "mdq.h"
+#include "compiler.h"
+#include "opcode.h"
+#include "indir_enum.h"
+#include "toktyp.h"
+#include "mmemory.h"
+#include "advancewindow.h"
+#include "cmd.h"
+
+int m_goto_postcond(triple *oldchain, triple *tmpchain)
+/* process a postconditional for m_goto and m_zgoto */
+{
+	oprtype	*cr;
+	triple	*obp, *ref0, *ref1, *triptr;
+	DCL_THREADGBL_ACCESS;
+
+	SETUP_THREADGBL_ACCESS;
+	advancewindow();
+	cr = (oprtype *)mcalloc(SIZEOF(oprtype));
+	if (!bool_expr(FALSE, cr))
+		return FALSE;
+	for (triptr = (TREF(curtchain))->exorder.bl; OC_NOOP == triptr->opcode; triptr = triptr->exorder.bl)
+		;
+	if (OC_LIT == triptr->opcode)
+	{	/* it's a literal so optimize it */
+		unuse_literal(&triptr->operand[0].oprval.mlit->v);
+		dqdel(triptr, exorder);
+		if (0 == triptr->operand[0].oprval.mlit->v.m[1])
+			setcurtchain(oldchain);			/* it's a FALSE so just discard the argument */
+		else
+		{	/* it's TRUE so treat as if there was no argument postconditional */
+			while (TK_EOL != TREF(window_token))	/* but first discard the rest of the line - it's dead */
+				advancewindow();
+			obp = oldchain->exorder.bl;
+			dqadd(obp, tmpchain, exorder);		/* this is a violation of info hiding */
+		}
+		return TRUE;
+	}
+	if ((TREF(expr_start) != TREF(expr_start_orig)) && (OC_NOOP != (TREF(expr_start))->opcode))
+	{
+		triptr = newtriple(OC_GVRECTARG);
+		triptr->operand[0] = put_tref(TREF(expr_start));
+	}
+	obp = oldchain->exorder.bl;
+	dqadd(obp, tmpchain, exorder);				 /* this is a violation of info hiding */
+	if ((TREF(expr_start) != TREF(expr_start_orig)) && (OC_NOOP != (TREF(expr_start))->opcode))
+	{
+		ref0 = newtriple(OC_JMP);
+		ref1 = newtriple(OC_GVRECTARG);
+		ref1->operand[0] = put_tref(TREF(expr_start));
+		*cr = put_tjmp(ref1);
+		tnxtarg(&ref0->operand[0]);
+	} else
+		tnxtarg(cr);
+	return TRUE;
+}
diff --git a/sr_port/m_if.c b/sr_port/m_if.c
index 643b3b5..706c576 100755
--- a/sr_port/m_if.c
+++ b/sr_port/m_if.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2012 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -20,6 +21,8 @@
 #include "cmd.h"
 #include "fullbool.h"
 
+GBLREF	int4		pending_errtriplecode;
+
 error_def(ERR_INDEXTRACHARS);
 error_def(ERR_SPOREOL);
 
@@ -33,11 +36,13 @@ typedef struct jmpchntype
 } jmpchn;
 
 int m_if(void)
+/* compiler module for IF */
 {
-	triple		*ref0, *ref1, *ref2, *jmpref, ifpos_in_chain, *triptr;
-	oprtype		x, y, *ta_opr;
-	boolean_t	first_time, t_set, is_commarg;
+	boolean_t	first_time, is_commarg, t_set;
+	int		sense;
 	jmpchn		*jmpchain, *nxtjmp;
+	oprtype		*ta_opr, x, y;
+	triple		ifpos_in_chain, *jmpref, *ref1, *ref2, *oldchain, tmpchain, *triptr;
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
@@ -49,6 +54,7 @@ int m_if(void)
 	is_commarg = (1 == TREF(last_source_column));
 	FOR_END_OF_SCOPE(0, x);
 	assert(INDR_REF == x.oprclass);
+	oldchain = NULL;
 	if (TK_SPACE == TREF(window_token))
 	{
 		jmpref = newtriple(OC_JMPTCLR);
@@ -64,17 +70,47 @@ int m_if(void)
 			ta_opr = (oprtype *)mcalloc(SIZEOF(oprtype));
 			if (!bool_expr(TRUE, ta_opr))
 				return FALSE;
-			if (((OC_JMPNEQ == (ref0 = (TREF(curtchain))->exorder.bl)->opcode))
-				&& (OC_COBOOL == (ref1 = ref0->exorder.bl)->opcode)
+			for (triptr = (TREF(curtchain))->exorder.bl; OC_NOOP == triptr->opcode; triptr = triptr->exorder.bl)
+				;
+			if ((OC_JMPNEQ == triptr->opcode)					/* WARNING: assignments */
+				&& (OC_COBOOL == (ref1 = triptr->exorder.bl)->opcode)
 				&& (OC_INDGLVN == (ref2 = ref1->exorder.bl)->opcode))
 			{	/* short-circuit only optimization that turns a trailing INDGLVN COBOOL into separate indirect IF */
-				dqdel(ref0, exorder);
-				ref1->opcode = OC_JMPTSET;
-				ref1->operand[0] = put_indr(ta_opr);
+				triptr->opcode = OC_JMPTSET;
+				triptr->operand[0] = put_indr(ta_opr);
+				dqdel(ref1, exorder);;
 				ref2->opcode = OC_COMMARG;
 				ref2->operand[1] = put_ilit((mint)indir_if);
 			}
-			t_set = (OC_JMPTSET == (TREF(curtchain))->exorder.bl->opcode);
+			if (OC_LIT == triptr->opcode)
+			{	/* it is a literal so we optimize it */
+				dqdel(triptr, exorder);
+				unuse_literal(&triptr->operand[0].oprval.mlit->v);
+				if (t_set = (0 == triptr->operand[0].oprval.mlit->v.m[1]))	/* WARNING: assignment */
+				{	/* it's FALSE, insert clear of $TEST */
+					newtriple(OC_CLRTEST);
+					if (TK_SPACE == TREF(director_token))			/* if there are trailing spaces */
+						while (TK_SPACE == TREF(director_token))	/* eat them up */
+							advancewindow();
+					if (TK_EOL == TREF(director_token))
+						break;						/* line empty: no discard needed */
+					if (NULL == oldchain)
+					{	/* not already discarding, so get ready to discard the rest of the line */
+						dqinit(&tmpchain, exorder);
+						oldchain = setcurtchain(&tmpchain);
+					}
+				} else
+				{	/* it's TRUE so insert set of $TEST and step beyond the argument */
+					newtriple(OC_SETTEST);
+					if (TK_COMMA != TREF(window_token))
+						break;
+					if (TK_EOL == TREF(window_token))
+						return TRUE;
+					advancewindow();
+					continue;	/* leave first_time in case next arg is also a literal */
+				}
+			} else
+				t_set = (OC_JMPTSET == (TREF(curtchain))->exorder.bl->opcode);
 			if (!t_set)
 				newtriple(OC_CLRTEST);
 			if (TREF(expr_start) != TREF(expr_start_orig) && (OC_NOOP != (TREF(expr_start))->opcode))
@@ -121,6 +157,8 @@ int m_if(void)
 	}
 	if ((TK_EOL != TREF(window_token)) && (TK_SPACE != TREF(window_token)))
 	{
+		if (NULL != oldchain)
+			setcurtchain(oldchain);			/* reset from discard chain */
 		stx_error(ERR_SPOREOL);
 		return FALSE;
 	}
@@ -131,8 +169,15 @@ int m_if(void)
 			ref1 = nxtjmp->jmptrip;
 			ref1->operand[0] = x;
 		}
+		if (NULL != oldchain)
+		{	/* for a literal 0 postconditional, we just throw the command & args away along with any pending error */
+			pending_errtriplecode = 0;
+			setcurtchain(oldchain);			/* reset from discard chain */
+		}
 		TREF(pos_in_chain) = ifpos_in_chain;
 		return FALSE;
 	}
+	if (NULL != oldchain)
+		setcurtchain(oldchain);				/* reset from discard chain */
 	return TRUE;
 }
diff --git a/sr_port/m_set.c b/sr_port/m_set.c
index c55f98c..1f3e130 100755
--- a/sr_port/m_set.c
+++ b/sr_port/m_set.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information 	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -384,7 +384,6 @@ int m_set(void)
 					assert(OC_RTERROR == tmp->opcode);
 					dqdel(tmp, exorder);
 					dqins(targchain.exorder.bl, exorder, tmp);
-					CHKTCHAIN(&targchain);
 				}
 				break;
 			}
@@ -403,7 +402,6 @@ int m_set(void)
 				assert(OC_RTERROR == tmp->opcode);
 				dqdel(tmp, exorder);
 				dqins(targchain.exorder.bl, exorder, tmp);
-				CHKTCHAIN(&targchain);
 				advancewindow();	/* skip past the function name */
 				advancewindow();	/* skip past the left paren */
 				/* Parse the remaining arguments until corresponding RIGHT-PAREN/SPACE/EOL is reached */
@@ -507,7 +505,6 @@ int m_set(void)
 				s->operand[0] = put_tref(get);
 				/* Code to fetch args for target triple are on targchain. Put get there now too. */
 				dqins(targchain.exorder.bl, exorder, get);
-				CHKTCHAIN(&targchain);
 				if (!is_extract)
 				{	/* Set $[z]piece */
 					delimiter = newtriple(OC_PARAMETER);
@@ -670,7 +667,6 @@ int m_set(void)
 			{
 				dqins(targchain.exorder.bl, exorder, s);
 				dqins(targchain.exorder.bl, exorder, put);
-				CHKTCHAIN(&targchain);
 				/* Put result operand on the chain. End of chain depends on whether or not
 				 * we are calling the shortcut or the full set-piece code
 				 */
diff --git a/sr_port/m_xecute.c b/sr_port/m_xecute.c
index e944cf1..62b813b 100755
--- a/sr_port/m_xecute.c
+++ b/sr_port/m_xecute.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2012 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -20,6 +21,7 @@
 #include "cmd.h"
 
 int m_xecute(void)
+/* compiler module for XECUTE */
 {
 	oprtype *cr, x;
 	triple *obp, *oldchain, *ref0, *ref1, tmpchain, *triptr;
@@ -53,13 +55,28 @@ int m_xecute(void)
 		cr = (oprtype *)mcalloc(SIZEOF(oprtype));
 		if (!bool_expr(FALSE, cr))
 			return FALSE;
+		for (triptr = (TREF(curtchain))->exorder.bl; OC_NOOP == triptr->opcode; triptr = triptr->exorder.bl)
+			;
+		if (OC_LIT == triptr->opcode)
+		{	/* it is a literal so optimize it */
+			unuse_literal(&triptr->operand[0].oprval.mlit->v);
+			dqdel(triptr, exorder);
+			if (0 == triptr->operand[0].oprval.mlit->v.m[1])
+				setcurtchain(oldchain);	/* it's FALSE so just discard the whole thing */
+			else
+			{	/* it's TRUE so treat as if no argument postconditional */
+				obp = oldchain->exorder.bl;
+				dqadd(obp, &tmpchain, exorder);		/* violates info hiding */
+			}
+			return TRUE;
+		}
 		if ((TREF(expr_start) != TREF(expr_start_orig)) && (OC_NOOP != (TREF(expr_start))->opcode))
 		{
 			triptr = newtriple(OC_GVRECTARG);
 			triptr->operand[0] = put_tref(TREF(expr_start));
 		}
 		obp = oldchain->exorder.bl;
-		dqadd(obp,&tmpchain,exorder);		/* violates info hiding */
+		dqadd(obp, &tmpchain, exorder);				/* violates info hiding */
 		if ((TREF(expr_start) != TREF(expr_start_orig)) && (OC_NOOP != (TREF(expr_start))->opcode))
 		{
 			ref0 = newtriple(OC_JMP);
@@ -72,6 +89,6 @@ int m_xecute(void)
 		return TRUE;
 	}
 	obp = oldchain->exorder.bl;
-	dqadd(obp,&tmpchain,exorder);		/* violates info hiding */
+	dqadd(obp, &tmpchain, exorder);					/* violates info hiding */
 	return TRUE;
 }
diff --git a/sr_port/m_zgoto.c b/sr_port/m_zgoto.c
index d3c0ef1..01d3b60 100755
--- a/sr_port/m_zgoto.c
+++ b/sr_port/m_zgoto.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2010, 2012 Fidelity Information Services, Inc	*
+ * Copyright (c) 2010-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -44,7 +45,7 @@ int m_zgoto(void)
 	{	/* Only level parm supplied (no entry ref) - job for op_zg1 */
 		setcurtchain(oldchain);
 		obp = oldchain->exorder.bl;
-		dqadd(obp, &tmpchain, exorder);		/* this is a violation of info hiding */
+		dqadd(obp, &tmpchain, exorder);					/* this is a violation of info hiding */
 		ref0 = newtriple(OC_ZG1);
 		ref0->operand[0] = quits;
 		return TRUE;
@@ -59,7 +60,7 @@ int m_zgoto(void)
 		}
 		make_commarg(&quits, indir_zgoto);
 		obp = oldchain->exorder.bl;
-		dqadd(obp, &tmpchain, exorder);		/* this is a violation of info hiding */
+		dqadd(obp, &tmpchain, exorder);					/* this is a violation of info hiding */
 	 	return TRUE;
 	}
 	advancewindow();
@@ -83,30 +84,8 @@ int m_zgoto(void)
 		setcurtchain(oldchain);
 	}
 	if (TK_COLON == TREF(window_token))
-	{	/* post conditional expression */
-		advancewindow();
-		cr = (oprtype *)mcalloc(SIZEOF(oprtype));
-		if (!bool_expr(FALSE, cr))
-			return FALSE;
-		if ((TREF(expr_start) != TREF(expr_start_orig)) && (OC_NOOP != (TREF(expr_start))->opcode))
-		{
-			triptr = newtriple(OC_GVRECTARG);
-			triptr->operand[0] = put_tref(TREF(expr_start));
-		}
-		obp = oldchain->exorder.bl;
-		dqadd(obp, &tmpchain, exorder);		 /* this is a violation of info hiding */
-		if ((TREF(expr_start) != TREF(expr_start_orig)) && (OC_NOOP != (TREF(expr_start))->opcode))
-		{
-			ref0 = newtriple(OC_JMP);
-			ref1 = newtriple(OC_GVRECTARG);
-			ref1->operand[0] = put_tref(TREF(expr_start));
-			*cr = put_tjmp(ref1);
-			tnxtarg(&ref0->operand[0]);
-		} else
-			tnxtarg(cr);
-		return TRUE;
-	}
+		return m_goto_postcond(oldchain, &tmpchain);			/* post conditional expression */
 	obp = oldchain->exorder.bl;
-	dqadd(obp, &tmpchain, exorder);			/* this is a violation of info hiding */
+	dqadd(obp, &tmpchain, exorder);						/* this is a violation of info hiding */
 	return TRUE;
 }
diff --git a/sr_port/mdb_condition_handler.c b/sr_port/mdb_condition_handler.c
index 0a5fa81..dd3ef53 100644
--- a/sr_port/mdb_condition_handler.c
+++ b/sr_port/mdb_condition_handler.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information 	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -456,7 +456,7 @@ CONDITION_HANDLER(mdb_condition_handler)
 				 */
 				gv_cur_region = csa->region;
 				assert(gv_cur_region->open);
-				assert((dba_mm == REG_ACC_METH(gv_cur_region)) || (dba_bg == REG_ACC_METH(gv_cur_region)));
+				assert(IS_REG_BG_OR_MM(gv_cur_region));
 				/* The above assert is needed to ensure that change_reg/tp_change_reg (invoked below)
 				 * will set cs_addrs, cs_data etc. to non-zero values.
 				 */
@@ -474,7 +474,6 @@ CONDITION_HANDLER(mdb_condition_handler)
 				assert(NULL != cs_data);
 			}
 			/* Fix gv_currkey to null-str in case gv_target points to dir_tree (possible in case of name-level-$order).
-			 * This is similar to how we fix gv_currkey for a successful name-level-$order operation (see op_gvorder.c).
 			 * Do same in case gv_target points to cs_addrs->hasht_tree so we dont take the fast path in op_gvname
 			 * when gv_target is clearly not GVT of a user-visible global.
 			 */
@@ -1079,6 +1078,12 @@ CONDITION_HANDLER(mdb_condition_handler)
 					gtm_err_dev = err_dev;
 					err_dev = NULL;
 				}
+				if (err_dev && (n_io_dev_types == err_dev->type))
+				{
+					/* Got some error while opening the device. Clean up the structures. */
+					gtm_err_dev = err_dev;
+					err_dev = NULL;
+				}
 			}
 			MUM_TSTART_FRAME_CHECK;
 			MUM_TSTART;
@@ -1117,7 +1122,7 @@ CONDITION_HANDLER(mdb_condition_handler)
 				}
 			}
 #			endif
-			if ((dev_open != err_dev->state) && (rm == err_dev->type))
+			if (((dev_open != err_dev->state) && (rm == err_dev->type)) || (n_io_dev_types == err_dev->type))
 			{
 				remove_rms(err_dev);
 				err_dev = NULL;
diff --git a/sr_port/mdef.h b/sr_port/mdef.h
index 2446471..d4fbb48 100644
--- a/sr_port/mdef.h
+++ b/sr_port/mdef.h
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -92,11 +92,13 @@ typedef unsigned int 	uint4;		/* 4-byte unsigned integer */
 #define FIFO_PERMISSION		010666 /* fifo with RW permissions for owner, group, other */
 
 #include <inttypes.h>
+#include <stdarg.h>
 #include "mdefsa.h"
 #include "gtm_common_defs.h"
 #include <mdefsp.h>
 #include "gtm_sizeof.h"
 #include "gtm_threadgbl.h"
+
 /* Anchor for thread-global structure rather than individual global vars */
 GBLREF void	*gtm_threadgbl;		/* Accessed through TREF macro in gtm_threadgbl.h */
 
@@ -636,6 +638,7 @@ void dec_err(int4 msgnum, ...);
 #error unsupported platform
 #endif
 void stx_error(int in_error, ...);
+void stx_error_va(int in_error, va_list args);
 void ins_errtriple(int4 in_error);
 
 int4 timeout2msec(int4 timeout);
@@ -668,13 +671,13 @@ int4 timeout2msec(int4 timeout);
 #define	DB_LEN_STR(reg)			(reg)->dyn.addr->fname_len, (reg)->dyn.addr->fname
 #define	REG_STR_LEN(reg)		(reg)->rname, (reg)->rname_len
 #define	REG_LEN_STR(reg)		(reg)->rname_len, (reg)->rname
+#define	SEG_LEN_STR(seg)		(seg)->sname_len, (seg)->sname
 #define	JNL_STR_LEN(csd)		(csd)->jnl_file_name, (csd)->jnl_file_len
 #define	JNL_LEN_STR(csd)		(csd)->jnl_file_len, (csd)->jnl_file_name
 
 #define	FAB_LEN_STR(fab)		(fab)->fab$b_fns, (fab)->fab$l_fna
 /* *********************************************************************************************************** */
 
-
 #ifdef DEBUG
 /* Original debug code has been removed since it was superfluous and did not work on all platforms. SE 03/01 */
 # define SET_TRACEABLE_VAR(var,value) var = value;
@@ -693,41 +696,28 @@ void m_usleep(int useconds);
 #endif
 
 #ifdef UNIX
-#	define UNIX_ONLY(X)		X
-#	define UNIX_ONLY_COMMA(X)	X,
-#else
-#	define UNIX_ONLY(X)
-#	define UNIX_ONLY_COMMA(X)
-#endif
-
-/* z/OS is not able to have dynamic file extensions while running in MM access mode
- * If multiple processes are accessing the same mapped file, and one process needs to extend/remap the file,
- * all the other processes must also unmap the file.
- *
- * This same comment is in the test framework in set_gtm_machtype.csh.  If this comment is updated, also update the other.
- */
-#ifdef UNIX
+#	define UNIX_ONLY(X)			X
+#	define UNIX_ONLY_COMMA(X)		X,
+#	define UNSUPPORTED_PLATFORM_CHECK
+	/* z/OS is not able to have dynamic file extensions while running in MM access mode
+	 * If multiple processes are accessing the same mapped file, and one process needs to extend/remap the file,
+	 * all the other processes must also unmap the file.
+	 * This same comment is in the test framework in set_gtm_machtype.csh.  If this comment is updated, also update the other.
+	 */
 #	if !defined(__MVS__)
-#	define MM_FILE_EXT_OK
+#		define MM_FILE_EXT_OK
 #	else
-#	undef MM_FILE_EXT_OK
+#		undef MM_FILE_EXT_OK
 #	endif
-#endif
-
-#ifdef VMS
-#	define VMS_ONLY(X)		X
-#	define VMS_ONLY_COMMA(X)	X,
-#else
-#	define VMS_ONLY(X)
-#	define VMS_ONLY_COMMA(X)
-#endif
-
-#if (defined(UNIX) || defined(VMS))
-#	define UNSUPPORTED_PLATFORM_CHECK
 #else
+#	define UNIX_ONLY(X)
+#	define UNIX_ONLY_COMMA(X)
 #	define UNSUPPORTED_PLATFORM_CHECK	#error UNSUPPORTED PLATFORM
 #endif
 
+#define VMS_ONLY(X)
+#define VMS_ONLY_COMMA(X)
+
 /* Note the macros below refer to the UNIX Shared Binary Support. Because the
  * support is *specifically* for the UNIX platform, "NON_USHBIN_ONLY()" will
  * also be true for VMS even though that platform does have shared binary support
@@ -860,9 +850,9 @@ typedef struct
 #define	IS_PTR_IN_RANGE(ptr, ptr_lo, ptr_hi)								\
 	(((sm_uc_ptr_t)(ptr) >= (sm_uc_ptr_t)(ptr_lo)) && ((sm_uc_ptr_t)(ptr) < (sm_uc_ptr_t)(ptr_hi)))
 
-#define	IS_PTR_2BYTE_ALIGNED(ptr)	(0 == (((uintszofptr_t)ptr) % 2))
-#define	IS_PTR_4BYTE_ALIGNED(ptr)	(0 == (((uintszofptr_t)ptr) % 4))
-#define	IS_PTR_8BYTE_ALIGNED(ptr)	(0 == (((uintszofptr_t)ptr) % 8))
+#define	IS_PTR_2BYTE_ALIGNED(ptr)	(0 == (((uintszofptr_t)ptr) & 0x1))
+#define	IS_PTR_4BYTE_ALIGNED(ptr)	(0 == (((uintszofptr_t)ptr) & 0x3))
+#define	IS_PTR_8BYTE_ALIGNED(ptr)	(0 == (((uintszofptr_t)ptr) & 0x7))
 
 #ifdef DB64
 # ifdef __osf__
@@ -1730,19 +1720,6 @@ typedef enum
 		SPRINTF((char *)out + i, "%02X", (unsigned char)in[i/2]);	\
 }
 
-#ifdef UNIX
-#	define	GTM_SNAPSHOT
-#	define	NON_GTM_SNAPSHOT_ONLY(X)
-#	define	GTM_SNAPSHOT_ONLY(X)		X
-#else
-#	define	NON_GTM_SNAPSHOT_ONLY(X)	X
-#	define	GTM_SNAPSHOT_ONLY(X)
-#endif
-
-#define	GTM_TRUNCATE
-#define	NON_GTM_TRUNCATE_ONLY(X)
-#define	GTM_TRUNCATE_ONLY(X)		X
-
 /* Currently triggers are supported only on UNIX */
 #if defined(UNIX)
 #	define	GTM_TRIGGER
diff --git a/sr_port/mdq.h b/sr_port/mdq.h
index 079606e..b3da844 100755
--- a/sr_port/mdq.h
+++ b/sr_port/mdq.h
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2012 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -17,16 +18,16 @@
  */
 
 /* Loop through a linked list given any element as the start (q) and a var to use as loop incrementer */
-#define DQLOOP(q, n, i) for (i = (q)->n.fl; i != (q); i = (i)->n.fl)
+#define DQLOOP(q, n, i) for (i = (q)->n.fl; (i) != (q); (i) = (i)->n.fl)
 
 /* Initialize an element */
-#define DQINIT(q, n) ((q)->n.fl = (q)->n.bl = q)
+#define DQINIT(q, n) ((q)->n.fl = (q)->n.bl = (q))
 
 /* Delete one element "x" from the doubly linked list */
 #define DQDEL(x, n) ((x)->n.bl->n.fl = (x)->n.fl, (x)->n.fl->n.bl = (x)->n.bl)
 
-/* Delete a doubly-linked list of elements from "x->n.fl" to "y->n.bl" (i.e. everything in between "x" and "y" excluding them) */
-#define DQDELCHAIN(x, y, n) ((x)->n.fl = (y), (y)->n.bl = (x))
+/* Delete a doubly-linked list of elements from "q->n.fl" to "x->n.bl" (i.e. everything in between "q" and "x" excluding them) */
+#define DQDELCHAIN(q, x, n) ((q)->n.fl = (x), (x)->n.bl = (q))
 
 /* Insert one element "x" in between "q" and "q->n.fl" */
 #define DQINS(q, n, x) ((x)->n.fl = (q)->n.fl, (x)->n.bl = (q), (q)->n.fl = (x), ((x)->n.fl)->n.bl = (x))
@@ -34,8 +35,8 @@
 /* Insert one element "x" in between "q" and "q->n.bl" */
 #define DQRINS(q, n, x) ((x)->n.bl = (q)->n.bl, (x)->n.fl = (q), (q)->n.bl = (x), ((x)->n.bl)->n.fl = (x))
 
-/* Insert a doubly-linked list of elements from "n->q.fl" to "n->q.bl" in between "o" and "o->q.fl" */
-#define DQADD(o, n, q) ((o)->q.fl->q.bl = (n)->q.bl, (n)->q.bl->q.fl = (o)->q.fl, (o)->q.fl = (n)->q.fl, (n)->q.fl->q.bl = (o))
+/* Insert a doubly-linked list of elements from "x->n.fl" to "x->n.bl" in between "q" and "q->n.fl" */
+#define DQADD(q, x, n) ((q)->n.fl->n.bl = (x)->n.bl, (x)->n.bl->n.fl = (q)->n.fl, (q)->n.fl = (x)->n.fl, (x)->n.fl->n.bl = (q))
 
 /* Define macros actually used which if #define DEBUG_TRIPLES, adds debugging information. Since these macros are
  * used in several different queue types and since these debugging macros only work for the exorder field in triples,
@@ -46,47 +47,72 @@
 #define dqloop(q, n, i) DQLOOP(q, n, i)
 #define dqinit(q, n)	DQINIT(q, n)
 
-/* #define DEBUG_TRIPLES / * Uncomment this to do triple debugging */
+/*#define DEBUG_TRIPLES / * Uncomment this to do triple debugging, which is also tied to gtmdbglvl, as of this writing: 0x4000 */
 #ifndef DEBUG_TRIPLES
 #  define dqdel(x, n)		DQDEL(x, n)
-#  define dqdelchain(x, y, n)	DQDELCHAIN(x, y, n)
+#  define dqdelchain(q, x, n)	DQDELCHAIN(q, x, n)
 #  define dqins(q, n, x)	DQINS(q, n, x)
 #  define dqrins(q, n, x)	DQRINS(q, n, x)
-#  define dqadd(o, n, q)	DQADD(o, n, q)
-#  define CHKTCHAIN(x)
+#  define dqadd(q, x, n)	DQADD(q, x, n)
+#  define CHKTCHAIN(q, n, b)
 #else
 #  include "compiler.h"
-#  define CHKTCHAIN(x) chktchain((triple *)(x))
-#  define IFEXOCHN(n, c) if (0 == memcmp(#n, "exorder", 3)) c	/* memcmp() should be faster and for 3 chars, just as effective */
+#  include "gtm_string.h"
+#  include "gtmdbglvl.h"
+GBLREF	uint4		gtmDebugLevel;
+/* q: head of queue to check; n: the name of queue; b: whether to check main exorder (from curtchain) and any expr_start queue */
+#  define CHKTCHAIN(q, n, b)								\
+MBSTART {										\
+	triple	*c;									\
+	DCL_THREADGBL_ACCESS;								\
+											\
+	SETUP_THREADGBL_ACCESS;							\
+					/* memcmp() is fast and 3 chars sufficient */	\
+ 	if ((gtmDebugLevel & GDL_DebugCompiler) && (0 == memcmp(#n, "exorder", 3)))	\
+	{										\
+		if ((triple *)-1 != (triple *)q) /* to avoid post-checking deletes */	\
+			chktchain((triple *)q);					\
+		if (b)									\
+		{									\
+			c = TREF(curtchain);						\
+			chktchain(c);		/* this might be redundant, or not! */	\
+			c = TREF(expr_start);						\
+			if (NULL != c)							\
+				chktchain(c);	/* this extra has been rewarding */	\
+		}									\
+	}										\
+} MBEND
 #  define dqdel(x, n)			\
-{					\
-	IFEXOCHN(n, CHKTCHAIN(x));	\
-	DQDEL(x, n);			\
-}
-#  define dqdelchain(x, y, n)		\
-{					\
-	IFEXOCHN(n, CHKTCHAIN(x));	\
-	DQDELCHAIN(x, y, n);		\
-	IFEXOCHN(n, CHKTCHAIN(y));	\
-}
+MBSTART {				\
+	CHKTCHAIN((x), (n), FALSE);	\
+	DQDEL((x), n);			\
+	CHKTCHAIN(-1, (n), TRUE);	\
+} MBEND
+#  define dqdelchain(q, x, n)		\
+MBSTART {				\
+	CHKTCHAIN((q), (n), FALSE);	\
+	DQDELCHAIN((q), x, n);		\
+	CHKTCHAIN((q), (n), TRUE);	\
+} MBEND
 #  define dqins(q, n, x)		\
-{					\
-	IFEXOCHN(n, CHKTCHAIN(q));	\
-	DQINS(q, n, x);			\
-	IFEXOCHN(n, CHKTCHAIN(q));	\
-}
+MBSTART {				\
+	CHKTCHAIN((q), (n), FALSE);	\
+	DQINS((q), n, x);		\
+	CHKTCHAIN((q), (n), TRUE);	\
+} MBEND
 #  define dqrins(q, n, x)		\
-{					\
-	IFEXOCHN(n, CHKTCHAIN(q));	\
-	DQRINS(q, n, x);		\
-	IFEXOCHN(n, CHKTCHAIN(q));	\
-}
-#  define dqadd(o, n, q)		\
-{					\
-	IFEXOCHN(n, CHKTCHAIN(o));	\
-	DQADD(o, n, q);			\
-	IFEXOCHN(n, CHKTCHAIN(o));	\
-}
+MBSTART {				\
+	CHKTCHAIN((q), (n), FALSE);	\
+	DQRINS((q), n, x);		\
+	CHKTCHAIN((q), (n), TRUE);	\
+} MBEND
+#  define dqadd(q, x, n)		\
+MBSTART {				\
+	CHKTCHAIN((q), (n), FALSE);	\
+	CHKTCHAIN((x), (n), FALSE);	\
+	DQADD((q), x, n);		\
+	CHKTCHAIN((q), (n), TRUE);	\
+} MBEND
 #endif
 
 #endif
diff --git a/sr_port/memcoherency.h b/sr_port/memcoherency.h
index f7a2eb4..05bd7b8 100755
--- a/sr_port/memcoherency.h
+++ b/sr_port/memcoherency.h
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2003, 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2003-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -36,16 +37,9 @@
  * by a late-delivered invalidate)
  */
 #define SHM_WRITE_MEMORY_BARRIER	asm("mb")
-
 #define SHM_READ_MEMORY_BARRIER		SHM_WRITE_MEMORY_BARRIER /* same MB instruction for both read and write barriers */
-
 #define MM_WRITE_MEMORY_BARRIER
 
-#ifdef __vms
-#define SECSHR_SHM_WRITE_MEMORY_BARRIER	asm("mb")
-#define SECSHR_SHM_READ_MEMORY_BARRIER	SECSHR_SHM_WRITE_MEMORY_BARRIER
-#endif /* __vms */
-
 #elif defined(POWER) || defined(PWRPC)	/* GT.M defines POWER and PWRPC if _AIX is defined, see sr_rs6000/mdefsp.h */
 
 /* Refer to article "POWER4 and shared memory synchronization by R. William Hay and Gary R. Hook" available at
@@ -200,12 +194,4 @@ void do_isync(void);
 
 #endif
 
-#if !defined(SECSHR_SHM_WRITE_MEMORY_BARRIER)
-#define SECSHR_SHM_WRITE_MEMORY_BARRIER		SHM_WRITE_MEMORY_BARRIER	/* default definition */
-#endif
-
-#if !defined(SECSHR_SHM_READ_MEMORY_BARRIER)
-#define	SECSHR_SHM_READ_MEMORY_BARRIER		SHM_READ_MEMORY_BARRIER		/* default definition */
-#endif
-
 #endif /* MEMCOHERENCY_H_INCLUDED */
diff --git a/sr_port/merge_desc_check.c b/sr_port/merge_desc_check.c
index fa47155..ddfd5e3 100755
--- a/sr_port/merge_desc_check.c
+++ b/sr_port/merge_desc_check.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2014 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -34,6 +35,7 @@
 #include "format_targ_key.h"
 #include "ddphdr.h"
 #include "mvalconv.h"
+#include "gvcst_protos.h"	/* needed by OPEN_BASEREG_IF_STATSREG */
 
 GBLREF int              merge_args;
 GBLREF merge_glvn_ptr	mglvnp;
@@ -89,10 +91,10 @@ boolean_t merge_desc_check(void)
 			gvt2 = gblp2->s_gv_target;
 			acc_meth1 = REG_ACC_METH(reg1);
 			acc_meth2 = REG_ACC_METH(reg2);
-			assert(!(dba_bg == acc_meth1 || dba_mm == acc_meth1) || (NULL != gvt1->gd_csa));
-			assert(!(dba_bg == acc_meth2 || dba_mm == acc_meth2) || (NULL != gvt2->gd_csa));
-			assert((dba_bg == acc_meth1) || (dba_mm == acc_meth1) || (NULL == gvt1->gd_csa));
-			assert((dba_bg == acc_meth2) || (dba_mm == acc_meth2) || (NULL == gvt2->gd_csa));
+			assert(!IS_ACC_METH_BG_OR_MM(acc_meth1) || (NULL != gvt1->gd_csa));
+			assert(!IS_ACC_METH_BG_OR_MM(acc_meth2) || (NULL != gvt2->gd_csa));
+			assert(IS_ACC_METH_BG_OR_MM(acc_meth1) || (NULL == gvt1->gd_csa));
+			assert(IS_ACC_METH_BG_OR_MM(acc_meth2) || (NULL == gvt2->gd_csa));
 			gvnh_reg1 = gblp1->s_gd_targ_gvnh_reg;
 			gvnh_reg2 = gblp2->s_gd_targ_gvnh_reg;
 			/* A non-NULL value of gvnh_reg indicates a spanning global as confirmed by the asserts below */
@@ -117,9 +119,10 @@ boolean_t merge_desc_check(void)
 				/* Find list of regions corresponding to ^gvn1(subs1) */
 				base = (char *)&gvkey1->base[0];
 				addr = gblp1->s_gd_targ_addr;
-				start_map1 = gv_srch_map(addr, base, gvkey1->end - 1); /* -1 to remove trailing 0 */
+				/* -1 usage in "gv_srch_map" calls below is to remove trailing 0 */
+				start_map1 = gv_srch_map(addr, base, gvkey1->end - 1, SKIP_BASEDB_OPEN_FALSE);
 				GVKEY_INCREMENT_ORDER(gvkey1);
-				end_map1 = gv_srch_map(addr, base, gvkey1->end - 1); /* -1 to remove trailing 0 */
+				end_map1 = gv_srch_map(addr, base, gvkey1->end - 1, SKIP_BASEDB_OPEN_FALSE);
 				BACK_OFF_ONE_MAP_ENTRY_IF_EDGECASE(gvkey1->base, gvkey1->end - 1, end_map1);
 				GVKEY_UNDO_INCREMENT_ORDER(gvkey1);
 				/* Find list of regions corresponding to ^gvn2(subs2) */
@@ -127,9 +130,9 @@ boolean_t merge_desc_check(void)
 				assert(KEY_DELIMITER == gvkey2->base[gvkey2->end]);
 				base = (char *)&gvkey2->base[0];
 				addr = gblp2->s_gd_targ_addr;
-				start_map2 = gv_srch_map(addr, base, gvkey2->end - 1); /* -1 to remove trailing 0 */
+				start_map2 = gv_srch_map(addr, base, gvkey2->end - 1, SKIP_BASEDB_OPEN_FALSE);
 				GVKEY_INCREMENT_ORDER(gvkey2);
-				end_map2 = gv_srch_map(addr, base, gvkey2->end - 1); /* -1 to remove trailing 0 */
+				end_map2 = gv_srch_map(addr, base, gvkey2->end - 1, SKIP_BASEDB_OPEN_FALSE);
 				BACK_OFF_ONE_MAP_ENTRY_IF_EDGECASE(gvkey2->base, gvkey2->end - 1, end_map2);
 				GVKEY_UNDO_INCREMENT_ORDER(gvkey2);
 				/* At this point, we are sure all regions involved in ^gvn1 and ^gvn2 are dba_mm or dba_bg.
@@ -139,12 +142,14 @@ boolean_t merge_desc_check(void)
 				 */
 				for (map = start_map1; map <= end_map1; map++)
 				{
+					OPEN_BASEREG_IF_STATSREG(map);
 					reg = map->reg.addr;
 					if (!reg->open)
 						gv_init_reg(reg);
 				}
 				for (map = start_map2; map <= end_map2; map++)
 				{
+					OPEN_BASEREG_IF_STATSREG(map);
 					reg = map->reg.addr;
 					if (!reg->open)
 						gv_init_reg(reg);
diff --git a/sr_port/merrors.msg b/sr_port/merrors.msg
index af592ba..3ccc13e 100644
--- a/sr_port/merrors.msg
+++ b/sr_port/merrors.msg
@@ -1,6 +1,6 @@
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !								!
-! Copyright (c) 2001-2016 Fidelity National Information		!
+! Copyright (c) 2001-2017 Fidelity National Information		!
 ! Services, Inc. and/or its subsidiaries. All rights reserved.	!
 !								!
 !	This source code contains the intellectual property	!
@@ -577,7 +577,7 @@ TEXT		<!AD>/info/fao=2!/ansi=0
 ZWRSPONE	<Subscript patterns in ZWRITE are atomic; Invalid delimiter>/error/fao=0!/ansi=0
 FILEDEL		<File !AD successfully deleted>/info/fao=2!/ansi=0
 JNLBADLABEL	<Journal file !AD has a bad GT.M Journal File Label. Expected !AD. Found !AD.>/error/fao=6!/ansi=0
-JNLREADEOF	<End of journal file encountered for !AD>/error/fao=2!/ansi=0
+JNLREADEOF	<End of journal file encountered>/error/fao=0!/ansi=0
 JNLRECFMT	<Journal file record format error encountered>/error/fao=0!/ansi=0
 BLKTOODEEP	<Block level too deep>/error/fao=0!/ansi=0
 NESTFORMP	<Formal parameter list cannot be combined with nested line>/error/fao=0!/ansi=0
@@ -714,8 +714,8 @@ NOTERMINFODB	<No "terminfo" database.  Terminal handling problems likely.> /info
 INVACCMETHOD	<Invalid access method> /error /fao=0!/ansi=0
 JNLOPNERR	<Error opening journal file !AD!/  for database !AD>/error/fao=4!/ansi=0
 JNLRECTYPE	<Journal record type does not match expected type>/error/fao=0!/ansi=0
-JNLTRANSGTR	<Transaction number in journal is greater than in database>/error/fao=0!/ansi=0
-JNLTRANSLSS	<Transaction number in journal is less than in database>/error/fao=0!/ansi=0
+JNLTRANSGTR	<Transaction number !@UQ in journal header is greater than !@UQ in database header>/error/fao=2!/ansi=0
+JNLTRANSLSS	<Transaction number !@UQ in journal header is less than !@UQ in database header>/error/fao=2!/ansi=0
 JNLWRERR	<Error writing journal file !AD.  Unable to update header.>/error/fao=2!/ansi=0
 FILEIDMATCH	<Saved File ID does not match the current ID - the file appears to have been moved>/error/fao=0!/ansi=0
 EXTSRCLIN	<!_!AD!/!_!AD>/info/fao=4!/ansi=0
@@ -773,8 +773,8 @@ KRNLKILL	<Process was terminated by SIGDANGER signal from the system -- System s
 MEMORYRECURSIVE	<Memory Subsystem called recursively>/fatal/fao=0!/ansi=0
 FREEZEID	<Cache !AD on !AD by freeze id 0x!XL with match 0x!XL from 0x!XJ>/info/fao=7!/ansi=0
 BLKWRITERR	<Unable to queue disk write for block 0x!XL.  Will keep trying.>/info/fao=1!/ansi=0
-STOPTIMEOUT	<Waited too long for stopped process to release.  Region: !AD.>/error/fao=2!/ansi=0
-UNUSEDMSG777	<TRIGMODINTP last used in V6.2-000>/error/fao=0!/ansi=0
+UNUSEDMSG776	<STOPTIMEOUT last used in V6.3-000A>/error/fao=0!/ansi=0
+PINENTRYERR	<Custom pinentry program failure>/error/fao=0!/ansi=0
 BCKUPBUFLUSH	<Unable to flush buffer for online backup>/error/fao=0!/ansi=0
 NOFORKCORE	<Unable to fork off process to create core.  Core creation postponed.>/warning/fao=0!/ansi=0
 JNLREAD		<Error reading from journal file !AD at offset [0x!XL]>/error/fao=3!/ansi=0
@@ -960,7 +960,7 @@ DBRLEVLTONE	<!AD Root level less than one>/error/fao=2!/ansi=0
 DBSVBNMIN	<!AD Start VBN smaller than possible>/error/fao=2!/ansi=0
 DBTTLBLK0	<!AD Total blocks equal zero>/error/fao=2!/ansi=0
 DBNOTDB		<!AD File does not have a valid GDS file header>/error/fao=2!/ansi=0
-DBTOTBLK	<Total blocks should be 0x!XL, is 0x!XL>/error/fao=2!/ansi=0
+DBTOTBLK	<File header indicates total blocks is 0x!XL but file size indicates total blocks would be 0x!XL>/error/fao=2!/ansi=0
 DBTN		<Block TN is 0x!16 at XQ>/info/fao=1!/ansi=0
 DBNOREGION	<None of the database regions accessible>/error/fao=0!/ansi=0
 DBTNRESETINC	<WARNING: tn_reset for database is incomplete due to integrity errors>/warning/fao=0!/ansi=0
@@ -1253,7 +1253,7 @@ REPLINSTSECUNDF	<Secondary replication instance name not defined>/error/fao=0!/a
 REPLINSTSEQORD	<!AD has seqno [0x!16 at XQ] which is less than last record seqno [0x!16 at XQ] in replication instance file !AD>/error/fao=6!/ansi=0
 REPLINSTSTNDALN	<Could not get exclusive access to replication instance file !AD>/error/fao=2!/ansi=0
 REPLREQROLLBACK	<Replication instance file !AD indicates abnormal shutdown or an incomplete ROLLBACK. Run MUPIP JOURNAL ROLLBACK first>/error/fao=2!/ansi=0
-REQROLLBACK	<Error accessing database !AD.  Run MUPIP JOURNAL ROLLBACK on cluster node !AD.>/error/fao=4!/ansi=0
+REQROLLBACK	<Error accessing database !AD.  Run MUPIP JOURNAL -ROLLBACK -NOONLINE on cluster node !AD.>/error/fao=4!/ansi=0
 INVOBJFILE	<Cannot ZLINK object file !AD due to unexpected format>/error/fao=2!/ansi=0
 SRCSRVEXISTS	<Source server for secondary instance !AD is already running with pid !UL>/error/fao=3!/ansi=0
 SRCSRVNOTEXIST	<Source server for secondary instance !AD is not alive>/error/fao=2!/ansi=0
@@ -1268,7 +1268,7 @@ BADCHAR		<$ZCHAR(!AD) is not a valid character in the !AD encoding form>/error/f
 DLRCILLEGAL	<!_!AD!/!_!_!_Illegal $CHAR() value !UL>/error/fao=3!/ansi=0
 NONUTF8LOCALE	<Locale has character encoding (!AD) which is not compatible with UTF-8 character set>/error/fao=2!/ansi=0
 INVDLRCVAL	<Invalid $CHAR() value !UL>/error/fao=1!/ansi=0
-DBMISALIGN	<Database file !AD has !UL blocks which does not match alignment rules. Reconstruct the database from a backup or extend it by at least !UL blocks.>/error/fao=4!/ansi=0
+DBMISALIGN	<File header indicates total blocks is 0x!XL but file size indicates total blocks would be between 0x!XL and 0x!XL. Reconstruct the database from a backup or extend it by at least !UL blocks.>/error/fao=4!/ansi=0
 LOADINVCHSET	<Extract file CHSET (!AD) is incompatible with gtm_chset>/error/fao=2!/ansi=0
 DLLCHSETM	<Routine !AD in library !AD was compiled with CHSET=M which is different from $ZCHSET. Recompile with CHSET=UTF-8 and re-link.>/error/fao=4!/ansi=0
 DLLCHSETUTF8	<Routine !AD in library !AD was compiled with CHSET=UTF-8 which is different from $ZCHSET. Recompile with CHSET=M and re-link.>/error/fao=4!/ansi=0
@@ -1442,7 +1442,7 @@ REPLONLNRLBK	<ONLINE ROLLBACK detected. Starting afresh>/error/fao=0!/ansi=0
 SRVLCKWT2LNG	<PID !UL is holding the source server lock. Waited for !UL minute(s). Now exiting>/error/fao=2!/ansi=0
 IGNBMPMRKFREE	<Ignoring bitmap free-up operation for region !AD (!AD) due to concurrent ONLINE ROLLBACK>/info/fao=4!/ansi=0
 PERMGENFAIL	<Failed to determine access permissions to use for creation of !AD for file !AD>/error/fao=4!/ansi=0
-PERMGENDIAG	<Permissions: Proc(uid:!UL,gid:!UL), DB File(uid:!UL,gid:!UL,perm:!AD), Lib File(gid:!UL,perm:!AD), Group Mem(opener:!UL,owner:!UL)>/info/fao=11!/ansi=0
+PERMGENDIAG	<Permissions: Proc(uid:!UL,gid:!UL!AD), DB File(uid:!UL,gid:!UL,perm:!AD), Lib File(gid:!UL,perm:!AD)>/info/fao=11!/ansi=0
 MUTRUNC1ATIME	<Process with PID !UL already performing truncate in region !AD>/info/fao=3!/ansi=0
 MUTRUNCBACKINPROG	<Truncate detected concurrent backup in progress for region !AD>/info/fao=2!/ansi=0
 MUTRUNCERROR	<Truncate of region !AD encountered service error !AD>/error/fao=4!/ansi=0
@@ -1526,7 +1526,7 @@ GETADDRINFO	<Error in getting address info>/error/fao=0!/ansi=0
 GETNAMEINFO	<Error in getting name info>/error/fao=0!/ansi=0
 SOCKBIND	<Error in binding socket>/error/fao=0!/ansi=0
 INSTFRZDEFER	<Instance Freeze initiated by !AD error on region !AD deferred due to critical resource conflict>/info/fao=4!/ansi=0
-REGOPENRETRY	<Attempt to open region !AD (!AD) using startup shortcut failed due to conflicting database shutdown. Retrying...>/info/fao=4!/ansi=0
+UNUSEDMSG1529	<REGOPENRETRY last used in V6.3-000A>/error/fao=0!/ansi=0
 REGOPENFAIL	<Failed to open region !AD (!AD) due to conflicting database shutdown activity>/error/fao=4!/ansi=0
 REPLINSTNOSHM	<Database !AD has no active connection to a replication journal pool>/error/fao=2!/ansi=0
 DEVPARMTOOSMALL	<Deviceparameter must be greater than zero (0)>/error/fao=0!/ansi=0
@@ -1536,8 +1536,8 @@ ACTCOLLMISMTCH	<Global ^!AD inherits alternative collation sequence #!UL from gl
 GBLNOMAPTOREG	<Global !AD does not map to region !AD in current global directory>/error/fao=4!/ansi=0
 ISSPANGBL	<Operation cannot be performed on global ^!AD as it spans multiple regions in current global directory>/error/fao=2!/ansi=0
 TPNOSUPPORT	<Operation cannot be performed while inside of a TP transaction>/error/fao=0!/ansi=0
-GVSUBSERR	<Invalid subscripted global name specification in $VIEW() function>/error/fao=0!/ansi=0
-UNUSEDMSG1540	<TRIGNOSPANBL : Last used in V6.2-000>/error/fao=0!/ansi=0
+UNUSEDMSG1539	<GVSUBSERR last used in V6.3-000A>/error/fao=0!/ansi=0
+ZATRANSERR	<The input string is too long to convert>/error/fao=0!/ansi=0
 FILTERTIMEDOUT	<Replication server timed out attempting to read seqno !16 at XQ from external filter>/error/fao=1!/ansi=0
 TLSDLLNOOPEN	<Failed to load GT.M TLS/SSL library for secure communication>/error/fao=0!/ansi=0
 TLSINIT		<Failed to initialize GT.M TLS/SSL library for secure communication>/error/fao=0!/ansi=0
@@ -1558,7 +1558,7 @@ NOUSERDB	<!AD does not support operation on non-GDS format region: !AD>/error/fa
 DSENOTOPEN	<DSE could not open region !AD - see DSE startup error message for cause>/error/fao=2!/ansi=0
 ZSOCKETATTR	<Attribute "!AD" invalid for $ZSOCKET function>/error/fao=2!/ansi=0
 ZSOCKETNOTSOCK	<$ZSOCKET function called but device is not a socket>/error/fao=0!/ansi=0
-CHSETALREADY	<CHSET !AD already specified for socket device>/error/fao=2!/ansi=0
+CHSETALREADY	<Socket device already contains sockets with iCHSET=!AD, oCHSET=!AD>/error/fao=4!/ansi=0
 DSEMAXBLKSAV	<DSE cannot SAVE another block as it already has the maximum of !UL>/error/fao=1!/ansi=0
 BLKINVALID	<!XL is not a valid block as database file !AD has !XL total blocks>/error/fao=4!/ansi=0
 CANTBITMAP	<Can't perform this operation on a bit map (block at a 200 hexadecimal boundary)>/error/fao=0!/ansi=0
@@ -1618,6 +1618,46 @@ MUREENCRYPTV4NOALLOW	<Database (re)encryption supported only on fully upgraded V
 ENCRYPTCONFLT	<MUPIP REORG -ENCRYPT and MUPIP EXTRACT -FORMAT=BIN cannot run concurrently - skipping !AD on region: !AD, file: !AD>/error/fao=6!/ansi=0
 JNLPOOLRECOVERY	<The size of the data written to the journal pool (!UL) does not match the size of the data in the journal record (!UL) for the replication instance file !AZ. The journal pool has been recovered.>/error/fao=3!/ansi=0
 LOCKTIMINGINTP	<A LOCK at !AD within a TP transaction is waiting in a final TP retry, which may lead to a general response gap>/warning/fao=2!/ansi=0
+PBNUNSUPTYPE	<$ZPEEK() does not support type !AD>/error/fao=2!/ansi=0
+DBFHEADLRU	<Database file !AD LRU pointer: 0x!16 at XQ is outside of range: 0x!16 at XQ to 0x!16 at XQ or misaligned>/info/fao=5!/ansi=0
+ASYNCIONOV4	<!AD database has !AD; cannot !AD>/error/fao=6!/ansi=0
+AIOCANCELTIMEOUT	<Pid [0x!XL] timed out waiting for pending async io to complete/cancel in database file !AD>/error/fao=3!/ansi=0
+DBGLDMISMATCH	<Database file !AD has !AZ whereas !AZ !AD in global directory !AD has !AZ>/error/fao=9!/ansi=0
+DBBLKSIZEALIGN	<Database file !AD has AIO=ON and block_size=!UL which is not a multiple of filesystem block size !UL>/error/fao=4!/ansi=0
+ASYNCIONOMM	<Database file !AD!AD cannot !AD>/error/fao=6!/ansi=0
+RESYNCSEQLOW	<MUPIP JOURNAL -ROLLBACK -FORWARD -RESYNC=!@ZQ [0x!16 at XQ] requested is lower than !@ZQ [0x!16 at XQ] which is the starting sequence number of the instance>/error/fao=4!/ansi=0
+DBNULCOL	<NULL collation representation for record !UL in block !UL is !AD which differs from the database file header settings of !AD>/error/fao=6!/ansi=0
+UTF16ENDIAN	<The device previously set UTF-16 endianness to !AD and cannot change to !AD>/error/fao=4!/ansi=0
+OFRZACTIVE	<Region !AD has an Online Freeze>/warning/fao=2!/ansi=0
+OFRZAUTOREL	<Online Freeze automatically released for region !AD>/warning/fao=2!/ansi=0
+OFRZCRITREL	<Proceeding with a write to region !AD after Online Freeze while holding crit>/warning/fao=2!/ansi=0
+OFRZCRITSTUCK	<Unable to proceed with a write to region !AD with Online Freeze while holding crit. Region stuck until freeze is removed.>/warning/fao=2!/ansi=0
+OFRZNOTHELD	<Online Freeze had been automatically released for at least one region>/warning/fao=0!/ansi=0
+AIOBUFSTUCK	<Waited !UL minutes for PID: !UL to finish AIO disk write of block: !UL [0x!XL] aio_error=!UL>/error/fao=5!/ansi=0
+DBDUPNULCOL	<Discarding !AD=!AD key due to duplicate null collation record>/error/fao=4!/ansi=0
+CHANGELOGINTERVAL	<!AD Server now logging to !AD with a !UL second interval>/info/fao=5!/ansi=0
+DBNONUMSUBS	<!AD key contains a numeric form of subscript in a global defined to collate all subscripts as strings>/error/fao=2!/ansi=0
+AUTODBCREFAIL	<Automatic creation of database file !AD associated with region !AD failed; see associated messages for details>/error/fao=4!/ansi=0
+RNDWNSTATSDBFAIL	<Rundown of statistics database region !AD (DB !AD) failed at/in !AD with following error: !AD>/error/fao=8!/ansi=0
+STATSDBNOTSUPP	<Attempted operation is not supported on statistics database file !AD>/error/fao=2!/ansi=0
+TPNOSTATSHARE	<VIEW "[NO]STATSHARE" is not allowed inside a TP transaction>/error/fao=0!/ansi=0
+FNTRANSERROR	<Buffer too small error occurred trying to translate filename !AD>/error/fao=2!/ansi=0
+NOCRENETFILE	<Database file !AD not created; cannot create across network>/error/fao=2!/ansi=0
+DSKSPCCHK	<Error while checking for available disk space to create file !AD>/error/fao=2!/ansi=0
+NOCREMMBIJ	<MM access method not compatible with BEFORE image journaling; Database file !AD not created>/error/fao=2!/ansi=0
+FILECREERR	<Error !AD for file !AD during DB creation>/error/fao=4!/ansi=0
+RAWDEVUNSUP	<RAW device for region !AD is not supported>/error/fao=2!/ansi=0
+DBFILECREATED	<Database file !AD created>/info/fao=2!/ansi=0
+PCTYRESERVED	<Attempted operation not supported on ^%Y* namespace>/error/fao=0!/ansi=0
+REGFILENOTFOUND	<Database file !AD corresponding to region !AD cannot be found>/info/fao=4!/ansi=0
+DRVLONGJMP	<Fake internal error that drives longjmp()>/error/fao=0!/ansi=0
+INVSTATSDB	<Database file !AD associated with statistics database region !AD is not a valid statistics database>/error/fao=4!/ansi=0
+STATSDBERR	<Error in/at !AD attempting to use a statistics database: !AD>/error/fao=4!/ansi=0
+STATSDBINUSE	<Statistics database !AD is in use with database !AD so cannot also be used with database !AD>/error/fao=6!/ansi=0
+STATSDBFNERR	<This database has no accessible statistics database due to the following error: !AD>/error/fao=2!/ansi=0
+JNLSWITCHRETRY	<Retrying previously abandoned switch of journal file !AD for database !AD>/info/fao=4!/ansi=0
+JNLSWITCHFAIL	<Failed to switch journal file !AD for database file !AD>/error/fao=4!/ansi=0
+CLISTRTOOLONG	<!AZ specified is !UL bytes long which is greater than the allowed maximum of !UL bytes>/error/fao=3!/ansi=0
 !
 ! If there are UNUSEDMSG* lines unused for more than one year and at least two non-patch releases, use them before adding new lines.
 !
diff --git a/sr_port/mlk_lock.c b/sr_port/mlk_lock.c
index 6846363..340020b 100755
--- a/sr_port/mlk_lock.c
+++ b/sr_port/mlk_lock.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001, 2015 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -42,7 +42,8 @@
 #include "mlk_lock.h"
 #include "t_retry.h"
 #include "gvusr.h"
-
+#include "interlock.h"
+#include "rel_quant.h"
 
 #ifdef VMS
 GBLREF uint4	image_count;
@@ -87,16 +88,13 @@ uint4 mlk_lock(mlk_pvtblk *p,
 	{
 		csa = &FILE_INFO(p->region)->s_addrs;
 		ctl = p->ctlptr;
-		if (csa->critical)
-			crash_count = csa->critical->crashcnt;
 		if (dollar_tlevel)
 		{
 			assert((CDB_STAGNATE > t_tries) || csa->now_crit);
 			/* make sure this region is in the list in case we end up retrying */
 			insert_region(p->region, &tp_reg_list, &tp_reg_free_list, SIZEOF(tp_region));
 		}
-                if (FALSE == (was_crit = csa->now_crit))
-			grab_crit(p->region);
+		GRAB_LOCK_CRIT(csa, p->region, was_crit);
 		retval = ctl->wakeups;
 		assert(retval);
 		/* this calculation is size of basic mlk_shrsub blocks plus the padded value length
@@ -178,8 +176,7 @@ uint4 mlk_lock(mlk_pvtblk *p,
 					 (ctl->max_blkcnt - ctl->blkcnt), ctl->max_blkcnt, LEN_AND_LIT(" "));
 			}
 		}
-		if (FALSE == was_crit)
-			rel_crit(p->region);
+		REL_LOCK_CRIT(csa, p->region, was_crit);
 		if (!retval)
 		{
 			INCR_GVSTATS_COUNTER(csa, csa->nl, n_lock_success, 1);
diff --git a/sr_port/mlk_pvtblk_create.c b/sr_port/mlk_pvtblk_create.c
index 0ddb10e..9f1ba67 100755
--- a/sr_port/mlk_pvtblk_create.c
+++ b/sr_port/mlk_pvtblk_create.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2012 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -26,18 +27,17 @@
 #include "mlk_pvtblk_insert.h"
 #include "mlk_pvtblk_create.h"
 #include "dpgbldir.h"
-
-/*the header files below are for environment translation*/
-#ifdef UNIX
+#include "gtm_reservedDB.h"
+/* The header files below are for environment translation*/
 #include "lv_val.h"	/* needed for "fgncalsp.h" */
 #include "fgncalsp.h"
-#endif
 #include "gtm_env_xlate_init.h"
 
 GBLREF gd_addr		*gd_header;
 static mstr     	gtmgbldir_mstr;
 
 error_def(ERR_LOCKSUB2LONG);
+error_def(ERR_PCTYRESERVED);
 error_def(ERR_TEXT);
 
 /*
@@ -72,7 +72,6 @@ void	mlk_pvtblk_create (int subcnt, mval *extgbl1, va_list subptr)
 
 	/* Get count of mvals including extgbl1 */
 	assert (subcnt >= 2);
-
 	subcnt--;
 	/* compiler gives us extgbl1 always, even if the nref is not an extended ref */
 	if (NULL == extgbl1)
@@ -95,25 +94,27 @@ void	mlk_pvtblk_create (int subcnt, mval *extgbl1, va_list subptr)
 			gld = gd_header;
 		}
 	}
-
 	VAR_COPY(mp, subptr);
 	mp_temp = va_arg(mp, mval *);
 	MV_FORCE_STR(mp_temp);
+	/* If specified var name is global ^%Y*, the name is illegal to use in a LOCK command.
+	 * Ths first byte is '^' so skip it in the comparison.
+	 */
+	if ((RESERVED_NAMESPACE_LEN <= (mp_temp->str.len - 1)) && (0 == MEMCMP_LIT(mp_temp->str.addr + 1, RESERVED_NAMESPACE)))
+		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(1) ERR_PCTYRESERVED);
 	reg = mlk_region_lookup((mp_temp), gld);
-
 	/* Add up the sizes of all MVAL strings */
 	for (len = 0, rlen=0, i = 0;  i < subcnt;  mp_temp=va_arg(mp, mval *), i++)
 	{
 		MV_FORCE_STR(mp_temp);
 		if ((mp_temp)->str.len > 255)
-			rts_error(VARLSTCNT(7) ERR_LOCKSUB2LONG, 1, (mp_temp)->str.len,
-				  ERR_TEXT, 2, (mp_temp)->str.len, (mp_temp)->str.addr);
+			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(7) ERR_LOCKSUB2LONG, 1, (mp_temp)->str.len,
+				      ERR_TEXT, 2, (mp_temp)->str.len, (mp_temp)->str.addr);
 		assert((mp_temp)->mvtype & MV_STR);
 		len += (int)(mp_temp)->str.len;
 		rlen += ROUND_UP(((mp_temp)->str.len + 1), 4);
 	}
 	va_end(mp);
-
 	/*
 	 * Allocate a buffer for all mval strings.
 	 * All strings are stored one after another in the buffer.
@@ -127,7 +128,6 @@ void	mlk_pvtblk_create (int subcnt, mval *extgbl1, va_list subptr)
 	r->total_length = len + subcnt;
 	r->total_len_padded = rlen;		/* len byte already accounted for */
 	cp = &r->value[0];
-
 	/* Copy all strings into the buffer one after another */
 	for (i = 0, VAR_COPY(mp, subptr);  i < subcnt;  i++)
 	{
@@ -142,7 +142,6 @@ void	mlk_pvtblk_create (int subcnt, mval *extgbl1, va_list subptr)
 	r->region = reg;
 	sa = &FILE_INFO(r->region)->s_addrs;
 	r->ctlptr = (mlk_ctldata_ptr_t)sa->lock_addrs[0];
-
 	if (!mlk_pvtblk_insert(r))
 		free(r);
 	return;
diff --git a/sr_port/mlk_region_lookup.c b/sr_port/mlk_region_lookup.c
index ce52555..bac7259 100755
--- a/sr_port/mlk_region_lookup.c
+++ b/sr_port/mlk_region_lookup.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -67,7 +68,7 @@ gd_region *mlk_region_lookup(mval *ptr, gd_addr *addr)
 			}
 		} else
 		{
-			map = gv_srch_map(addr, gvent.var_name.addr, gvent.var_name.len);
+			map = gv_srch_map(addr, gvent.var_name.addr, gvent.var_name.len, SKIP_BASEDB_OPEN_FALSE);
 			reg = map->reg.addr;
 			if (!reg->open)
 				gv_init_reg(reg);
diff --git a/sr_port/mlk_unlock.c b/sr_port/mlk_unlock.c
index b1d2303..966ded6 100755
--- a/sr_port/mlk_unlock.c
+++ b/sr_port/mlk_unlock.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2012 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -31,6 +32,8 @@
 #include "mlk_wake_pending.h"
 #include "gvusr.h"
 #include "min_max.h"
+#include "interlock.h"
+#include "rel_quant.h"
 
 GBLREF	int4 		process_id;
 GBLREF	short		crash_count;
@@ -54,16 +57,13 @@ void mlk_unlock(mlk_pvtblk *p)
 		assert((ctl->max_blkcnt > 0) && (ctl->max_prccnt > 0) && ((ctl->subtop - ctl->subbase) > 0));
 		csa = &FILE_INFO(p->region)->s_addrs;
 		d = p->nodptr;
-		if (csa->critical)
-			crash_count = csa->critical->crashcnt;
 		if (dollar_tlevel)
 		{
 			assert((CDB_STAGNATE > t_tries) || csa->now_crit);
 			/* make sure this region is in the list in case we end up retrying */
 			insert_region(p->region, &tp_reg_list, &tp_reg_free_list, SIZEOF(tp_region));
 		}
-		if (FALSE == (was_crit = csa->now_crit))
-			grab_crit(p->region);
+		GRAB_LOCK_CRIT(csa, p->region, was_crit);
 		if (d->owner == process_id && p->sequence == d->sequence)
 		{
 			d->owner = 0;
@@ -90,8 +90,7 @@ void mlk_unlock(mlk_pvtblk *p)
 		ls_free = MIN(((float)ctl->blkcnt) / ctl->max_blkcnt, ((float)ctl->prccnt) / ctl->max_prccnt);
 		if (ls_free >= LOCK_SPACE_FULL_SYSLOG_THRESHOLD)
 			csa->nl->lockspacefull_logged = FALSE; /* Allow syslog writes if enough free space is established. */
-		if (FALSE == was_crit)
-			rel_crit(p->region);
+		REL_LOCK_CRIT(csa, p->region, was_crit);
 	} else	/* acc_meth == dba_usr */
 		gvusr_unlock(p->total_length, &p->value[0], p->region);
 	return;
diff --git a/sr_port/mlk_unpend.c b/sr_port/mlk_unpend.c
index dd10523..b9d744a 100755
--- a/sr_port/mlk_unpend.c
+++ b/sr_port/mlk_unpend.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001 Sanchez Computer Associates, Inc.	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -21,6 +22,8 @@
 /* Include prototypes */
 #include "mlk_prcblk_delete.h"
 #include "mlk_unpend.h"
+#include "interlock.h"
+#include "rel_quant.h"
 
 GBLREF int4 process_id;
 GBLREF short	crash_count;
@@ -28,21 +31,12 @@ GBLREF short	crash_count;
 void mlk_unpend(mlk_pvtblk *p)
 {
 	bool			was_crit;
-	sgmnt_addrs		*sa;
-
-	sa = &FILE_INFO(p->region)->s_addrs;
-
-	if (sa->critical)
-		crash_count = sa->critical->crashcnt;
-
-        if(FALSE == (was_crit = sa->now_crit))
-		grab_crit(p->region);
+	sgmnt_addrs		*csa;
 
+	csa = &FILE_INFO(p->region)->s_addrs;
+	GRAB_LOCK_CRIT(csa, p->region, was_crit);
 	mlk_prcblk_delete(p->ctlptr, p->nodptr, process_id);
 	p->ctlptr->wakeups++;
-
-        if(FALSE == was_crit)
-		rel_crit(p->region);
-
+	REL_LOCK_CRIT(csa, p->region, was_crit);
 	return;
 }
diff --git a/sr_port/mtables.c b/sr_port/mtables.c
index bc4f8d8..06eb907 100644
--- a/sr_port/mtables.c
+++ b/sr_port/mtables.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -38,13 +38,14 @@
 # include "trigger.h"
 # include "gv_trigger.h"
 #endif
+#include "gtm_reservedDB.h"
 #include "mtables.h"
 
 LITDEF char ctypetab[NUM_CHARS] =
 {
 	/* ASCII 0-127 */
 	TK_EOL,    TK_ERROR,        TK_ERROR,    TK_ERROR,     TK_ERROR,     TK_ERROR,    TK_ERROR,      TK_ERROR,
-	TK_ERROR,  TK_SPACE,        TK_ERROR,    TK_ERROR,     TK_EOR,       TK_ERROR,    TK_ERROR,      TK_ERROR,
+	TK_ERROR,  TK_SPACE,        TK_ERROR,    TK_ERROR,     TK_EOR,       TK_CR,       TK_ERROR,      TK_ERROR,
 	TK_ERROR,  TK_ERROR,        TK_ERROR,    TK_ERROR,     TK_ERROR,     TK_ERROR,    TK_ERROR,      TK_ERROR,
 	TK_ERROR,  TK_ERROR,        TK_ERROR,    TK_ERROR,     TK_ERROR,     TK_ERROR,    TK_ERROR,      TK_ERROR,
 	TK_SPACE,  TK_EXCLAIMATION, TK_QUOTE,    TK_HASH,      TK_DOLLAR,    TK_PERCENT,  TK_AMPERSAND,  TK_APOSTROPHE,
@@ -133,7 +134,8 @@ LITDEF toktabtype tokentable[] =
 	tokdef("TK_EXPONENT", OC_EXP, 0, OCT_MVAL),
 	tokdef("TK_SORTS_AFTER", OC_SORTS_AFTER, 0, OCT_MVAL),
 	tokdef("TK_NSORTS_AFTER", OC_NSORTS_AFTER, 0, OCT_MVAL),
-	tokdef("TK_ATHASH", 0, 0, 0)
+	tokdef("TK_ATHASH", 0, 0, 0),
+	tokdef("TK_CR", 0, 0, 0 )
 };
 
 GBLREF mv_stent *mv_chain;	/* Needed for MV_SIZE macro */
@@ -197,15 +199,16 @@ LITDEF boolean_t mvs_save[] =
 /* The address of this literal is assigned to mval pointers for arguments which are deliberately skipped in label invocations. */
 LITDEF mval skiparg		= DEFINE_MVAL_COMMON(0, 0, 0, 0, 0, 0, 0, 0);
 
-static readonly unsigned char localpool[7] = {'1', '1', '1', '0', '1', '0', '0'};
-LITDEF mval literal_zero	= DEFINE_MVAL_LITERAL(MV_STR | MV_NM | MV_INT, 0, 0, 1, (char *)&localpool[3], 0,   0);
-LITDEF mval literal_one 	= DEFINE_MVAL_LITERAL(MV_STR | MV_NM | MV_INT, 0, 0, 1, (char *)&localpool[0], 0,   1 * MV_BIAS);
-LITDEF mval literal_ten 	= DEFINE_MVAL_LITERAL(MV_STR | MV_NM | MV_INT, 0, 0, 2, (char *)&localpool[2], 0,  10 * MV_BIAS);
-LITDEF mval literal_eleven	= DEFINE_MVAL_LITERAL(MV_STR | MV_NM | MV_INT, 0, 0, 2, (char *)&localpool[0], 0,  11 * MV_BIAS);
-LITDEF mval literal_oneohoh	= DEFINE_MVAL_LITERAL(MV_STR | MV_NM | MV_INT, 0, 0, 3, (char *)&localpool[4], 0, 100 * MV_BIAS);
-LITDEF mval literal_oneohone	= DEFINE_MVAL_LITERAL(MV_STR | MV_NM | MV_INT, 0, 0, 3, (char *)&localpool[2], 0, 101 * MV_BIAS);
-LITDEF mval literal_oneten	= DEFINE_MVAL_LITERAL(MV_STR | MV_NM | MV_INT, 0, 0, 3, (char *)&localpool[1], 0, 110 * MV_BIAS);
-LITDEF mval literal_oneeleven	= DEFINE_MVAL_LITERAL(MV_STR | MV_NM | MV_INT, 0, 0, 3, (char *)&localpool[0], 0, 111 * MV_BIAS);
+static readonly unsigned char localpool[8] = {'-', '1', '1', '1', '0', '1', '0', '0'};
+LITDEF mval literal_minusone	= DEFINE_MVAL_LITERAL(MV_STR | MV_NM | MV_INT, 0, 0, 2, (char *)&localpool[0], 0,  -1 * MV_BIAS);
+LITDEF mval literal_zero	= DEFINE_MVAL_LITERAL(MV_STR | MV_NM | MV_INT, 0, 0, 1, (char *)&localpool[4], 0,   0);
+LITDEF mval literal_one 	= DEFINE_MVAL_LITERAL(MV_STR | MV_NM | MV_INT, 0, 0, 1, (char *)&localpool[1], 0,   1 * MV_BIAS);
+LITDEF mval literal_ten 	= DEFINE_MVAL_LITERAL(MV_STR | MV_NM | MV_INT, 0, 0, 2, (char *)&localpool[3], 0,  10 * MV_BIAS);
+LITDEF mval literal_eleven	= DEFINE_MVAL_LITERAL(MV_STR | MV_NM | MV_INT, 0, 0, 2, (char *)&localpool[1], 0,  11 * MV_BIAS);
+LITDEF mval literal_oneohoh	= DEFINE_MVAL_LITERAL(MV_STR | MV_NM | MV_INT, 0, 0, 3, (char *)&localpool[5], 0, 100 * MV_BIAS);
+LITDEF mval literal_oneohone	= DEFINE_MVAL_LITERAL(MV_STR | MV_NM | MV_INT, 0, 0, 3, (char *)&localpool[3], 0, 101 * MV_BIAS);
+LITDEF mval literal_oneten	= DEFINE_MVAL_LITERAL(MV_STR | MV_NM | MV_INT, 0, 0, 3, (char *)&localpool[2], 0, 110 * MV_BIAS);
+LITDEF mval literal_oneeleven	= DEFINE_MVAL_LITERAL(MV_STR | MV_NM | MV_INT, 0, 0, 3, (char *)&localpool[1], 0, 111 * MV_BIAS);
 
 /* --------------------------------------------------------------------------------------------------------------------------
  * All string mvals defined in this module using LITDEF need to have MV_NUM_APPROX bit set. This is because these mval
@@ -221,15 +224,23 @@ LITDEF mval literal_null	= DEFINE_MVAL_LITERAL(MV_STR | MV_NM | MV_INT | MV_NUM_
 LITDEF mval literal_batch       = DEFINE_MVAL_LITERAL(MV_STR | MV_NUM_APPROX, 0, 0, TP_BATCH_SHRT, (char *)TP_BATCH_ID, 0, 0);
 
 #ifdef GTM_TRIGGER
-LITDEF mval literal_curlabel	= DEFINE_MVAL_LITERAL(MV_STR | MV_NM | MV_INT, 0, 0, HASHT_GBL_CURLABEL_LEN, (char *)HASHT_GBL_CURLABEL, 0, HASHT_GBL_CURLABEL_INT * MV_BIAS);	/* BYPASSOK */
-LITDEF mval literal_hashlabel	= DEFINE_MVAL_LITERAL(MV_STR | MV_NUM_APPROX,  0, 0, LITERAL_HASHLABEL_LEN,  (char *)LITERAL_HASHLABEL, 0, 0);	/* BYPASSOK */
-LITDEF mval literal_hashcycle	= DEFINE_MVAL_LITERAL(MV_STR | MV_NUM_APPROX,  0, 0, LITERAL_HASHCYCLE_LEN,  (char *)LITERAL_HASHCYCLE, 0, 0);	/* BYPASSOK */
-LITDEF mval literal_hashcount	= DEFINE_MVAL_LITERAL(MV_STR | MV_NUM_APPROX,  0, 0, LITERAL_HASHCOUNT_LEN,  (char *)LITERAL_HASHCOUNT, 0, 0);	/* BYPASSOK */
-LITDEF mval literal_hashtrhash	= DEFINE_MVAL_LITERAL(MV_STR | MV_NUM_APPROX,  0, 0, LITERAL_HASHTRHASH_LEN, (char *)LITERAL_HASHTRHASH, 0, 0);/* BYPASSOK */
+LITDEF mval literal_curlabel	= DEFINE_MVAL_LITERAL(MV_STR | MV_NM | MV_INT, 0, 0, HASHT_GBL_CURLABEL_LEN,
+							(char *)HASHT_GBL_CURLABEL, 0, HASHT_GBL_CURLABEL_INT * MV_BIAS);
+LITDEF mval literal_hashlabel	= DEFINE_MVAL_LITERAL(MV_STR | MV_NUM_APPROX,  0, 0, LITERAL_HASHLABEL_LEN,
+							(char *)LITERAL_HASHLABEL, 0, 0);
+LITDEF mval literal_hashcycle	= DEFINE_MVAL_LITERAL(MV_STR | MV_NUM_APPROX,  0, 0, LITERAL_HASHCYCLE_LEN,
+							(char *)LITERAL_HASHCYCLE, 0, 0);
+LITDEF mval literal_hashcount	= DEFINE_MVAL_LITERAL(MV_STR | MV_NUM_APPROX,  0, 0, LITERAL_HASHCOUNT_LEN,
+							(char *)LITERAL_HASHCOUNT, 0, 0);
+LITDEF mval literal_hashtrhash	= DEFINE_MVAL_LITERAL(MV_STR | MV_NUM_APPROX,  0, 0, LITERAL_HASHTRHASH_LEN,
+							(char *)LITERAL_HASHTRHASH, 0, 0);
 
 #define TRIGGER_SUBSDEF(SUBSTYPE, SUBSNAME, LITMVALNAME, TRIGFILEQUAL, PARTOFHASH)	\
 	LITDEF mval LITMVALNAME = DEFINE_MVAL_LITERAL(MV_STR | MV_NUM_APPROX, 0, 0, STR_LIT_LEN(SUBSNAME), (char *)SUBSNAME, 0, 0);
 
+LITDEF mval literal_statsDB_gblname =
+	DEFINE_MVAL_LITERAL(MV_STR | MV_NUM_APPROX,  0, 0, STATSDB_GBLNAME_LEN,  (char *)STATSDB_GBLNAME, 0, 0);
+
 #include "trigger_subs_def.h"		/* BYPASSOK */
 #undef TRIGGER_SUBSDEF
 
diff --git a/sr_port/mu_cre_file.h b/sr_port/mu_cre_file.h
index b3229f7..43d885a 100755
--- a/sr_port/mu_cre_file.h
+++ b/sr_port/mu_cre_file.h
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001 Sanchez Computer Associates, Inc.	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
diff --git a/sr_port/mu_freeze_ch.c b/sr_port/mu_freeze_ch.c
index c57b928..4f28695 100755
--- a/sr_port/mu_freeze_ch.c
+++ b/sr_port/mu_freeze_ch.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -24,9 +25,12 @@
 #include "buddy_list.h"		/* needed for tp.h */
 #include "hashtab_int4.h"	/* needed for tp.h */
 #include "tp.h"
+#include "interlock.h"
 
 GBLREF gd_region 	*gv_cur_region;
+GBLREF sgmnt_data	*cs_data;
 GBLREF tp_region 	*grlist;
+GBLREF uint4		process_id;
 
 CONDITION_HANDLER(mu_freeze_ch)
 {
@@ -35,10 +39,12 @@ CONDITION_HANDLER(mu_freeze_ch)
 	START_CH(TRUE);
 	for (rptr1 = grlist ; rptr1 != NULL; rptr1 = rptr1->fPtr)
 	{
-		gv_cur_region = rptr1->reg;
+		TP_CHANGE_REG(rptr1->reg);
 		if (!gv_cur_region->open)
 			continue;
-		region_freeze(gv_cur_region, FALSE, FALSE, FALSE);
+		if (process_id == FILE_INFO(gv_cur_region)->s_addrs.nl->freeze_latch.u.parts.latch_pid)
+			rel_latch(&FILE_INFO(gv_cur_region)->s_addrs.nl->freeze_latch);
+		region_freeze(gv_cur_region, FALSE, FALSE, FALSE, FALSE, FALSE);
 	}
 	NEXTCH; /* should do PRN_ERROR for us */
 }
diff --git a/sr_port/mu_getlst.h b/sr_port/mu_getlst.h
index ba2d9a1..ab96bf0 100755
--- a/sr_port/mu_getlst.h
+++ b/sr_port/mu_getlst.h
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001 Sanchez Computer Associates, Inc.	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
diff --git a/sr_port/mu_gv_cur_reg_init.c b/sr_port/mu_gv_cur_reg_init.c
index 02e5caf..45a9b89 100755
--- a/sr_port/mu_gv_cur_reg_init.c
+++ b/sr_port/mu_gv_cur_reg_init.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2009 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -21,28 +22,34 @@
 #include "filestruct.h"
 #include "mu_gv_cur_reg_init.h"
 
-GBLREF gd_region	*gv_cur_region;
-#ifdef UNIX
+GBLREF	gd_region	*gv_cur_region;
 GBLREF	gd_region	*ftok_sem_reg;
-#endif
 
 void mu_gv_cur_reg_init(void)
 {
-	MALLOC_INIT(gv_cur_region, SIZEOF(gd_region));
-	MALLOC_INIT(gv_cur_region->dyn.addr, SIZEOF(gd_segment));
-	gv_cur_region->dyn.addr->acc_meth = dba_bg;
+	gd_addr		*gdhdr;
+	gd_region	*basedb_reg, *statsdb_reg;
+	gd_segment	*basedb_seg, *statsdb_seg;
 
-	FILE_CNTL_INIT(gv_cur_region->dyn.addr);
-	gv_cur_region->dyn.addr->file_cntl->file_type = dba_bg;
+	gdhdr = create_dummy_gbldir();
+	basedb_reg = gdhdr->regions;
+	basedb_seg = basedb_reg->dyn.addr;
+	statsdb_reg = basedb_reg + 1;
+	statsdb_seg = statsdb_reg->dyn.addr;
+	FILE_CNTL_INIT(basedb_seg);
+	FILE_CNTL_INIT(statsdb_seg);
+	gv_cur_region = gdhdr->regions;
 }
 
 void mu_gv_cur_reg_free(void)
 {
-	free(gv_cur_region->dyn.addr->file_cntl->file_info);
-	free(gv_cur_region->dyn.addr->file_cntl);
-	free(gv_cur_region->dyn.addr);
-	free(gv_cur_region);
-#	ifdef UNIX
+	gd_addr		*gdhdr;
+	gd_region	*basedb_reg, *statsdb_reg;
+	gd_segment	*basedb_seg, *statsdb_seg;
+
+	basedb_reg = gv_cur_region;
+	gdhdr = basedb_reg->owning_gd;
+	assert(basedb_reg == gdhdr->regions);
 	assert(gv_cur_region != ftok_sem_reg);	/* ftok_sem_release should have been done BEFORE mu_gv_cur_reg_free */
 	if (gv_cur_region == ftok_sem_reg)	/* Handle case nevertheless in pro */
 	{	/* Before resetting gv_cur_region to NULL, also reset ftok_sem_reg to NULL. Not doing so would
@@ -50,6 +57,18 @@ void mu_gv_cur_reg_free(void)
 		 */
 		ftok_sem_reg = NULL;
 	}
-#	endif
-	gv_cur_region = NULL; /* If you free it, you must not access it */
+	gv_cur_region = NULL; /* Now that gv_cur_region is going to be freed, make it inaccessible before starting the free */
+	basedb_seg = basedb_reg->dyn.addr;
+	FILE_CNTL_FREE(basedb_seg);
+	statsdb_reg = basedb_reg + 1;
+	assert(gdhdr == statsdb_reg->owning_gd);
+	statsdb_seg = statsdb_reg->dyn.addr;
+	FILE_CNTL_FREE(statsdb_seg);
+	assert(NULL != gdhdr->id);
+	if (NULL != gdhdr->id)
+	{
+		free(gdhdr->id);
+		gdhdr->id = NULL;
+	}
+	free(gdhdr);
 }
diff --git a/sr_port/mu_int_blk.c b/sr_port/mu_int_blk.c
index 87f6ff6..430b38e 100644
--- a/sr_port/mu_int_blk.c
+++ b/sr_port/mu_int_blk.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -79,7 +79,12 @@ GBLREF gv_key			*muint_start_key;
 GBLREF sgmnt_data		mu_int_data;
 GBLREF trans_num		largest_tn;
 GBLREF span_node_integ		*sndata;
-
+GBLREF boolean_t		null_coll_type_err;
+GBLREF boolean_t		null_coll_type;
+GBLREF unsigned int		rec_num;
+GBLREF block_id			blk_id;
+GBLREF boolean_t		nct_err_type;
+GBLREF int			rec_len;
 error_def(ERR_DBBADKYNM);
 error_def(ERR_DBBADNSUB);
 error_def(ERR_DBBADPNTR);
@@ -113,6 +118,9 @@ error_def(ERR_DBTN);
 error_def(ERR_DBTNTOOLG);
 error_def(ERR_DBSPANGLOINCMP);
 error_def(ERR_DBSPANCHUNKORD);
+error_def(ERR_DBNULCOL);
+error_def(ERR_NULSUBSC);
+error_def(ERR_DBNONUMSUBS);
 
 LITDEF boolean_t mu_int_possub[16][16] = {
 	{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
@@ -181,23 +189,24 @@ boolean_t mu_int_blk(
 	} sub_list;
 
 	unsigned char	buff[MAX_KEY_SZ + 1], old_buff[MAX_KEY_SZ + 1], temp_buff[MAX_MIDENT_LEN + 1], util_buff[MAX_UTIL_SIZE];
-	unsigned char	blk_levl, *c1, ch, *ctrlbytes;
+	unsigned char	blk_levl, *c1, ch, *ctrlbytes, subscript;
 	unsigned short	cc, rec_cmpc;
 	uchar_ptr_t	c0, c2, c_base, blk_base, blk_top, key_base, ptr, rec_base, rec_top, span_key;
 	unsigned short	temp_ushort;
 	boolean_t	first_key, is_top, pstar, valid_gbl, hasht_global;
-	boolean_t	muint_range_done = FALSE;
+	boolean_t	muint_range_done = FALSE, nct_checked = FALSE;
 	int		blk_size, buff_length, b_index, cmcc, comp_length, key_size, len, name_len,
-			num_len, rec_size, s_index, start_index, hdr_len, idx;
+			num_len, rec_size, s_index, start_index, sub_start_index, hdr_len, idx;
 	int		tmp_cmpc, tmp_numsubs, max_allowed_key_size;
 	block_id	child, root_pointer;
 	sub_list	mu_sub_list[MAX_GVSUBSCRIPTS + 1];
 	sub_num		check_vals;
 	trans_num	blk_tn;
-	uchar_ptr_t	subrec_ptr;
+	uchar_ptr_t	subrec_ptr, free_blk_base;
 	enum db_ver	ondsk_blkver;
 	uint4		cnt, span_curr_blk, rval_len, gblsize;
 	unsigned short	numsubs;
+	unsigned int	null_subscript_cnt;
 
 	mu_int_offset[mu_int_plen] = 0;
 	mu_int_path[mu_int_plen++] = blk;  /* Increment mu_int_plen on entry; decrement explicitly or via mu_int_err() on exit. */
@@ -207,7 +216,7 @@ boolean_t mu_int_blk(
 		mu_int_err(ERR_DBBDBALLOC, TRUE, TRUE, bot_key, bot_len, top_key, top_len, (unsigned int)(level));
 		return FALSE;
 	}
-	blk_base = mu_int_read(blk, &ondsk_blkver);	/* ondsk_blkver set to GDSV4 or GDSV6 (GDSVCURR) */
+	blk_base = mu_int_read(blk, &ondsk_blkver, &free_blk_base);	/* ondsk_blkver set to GDSV4 or GDSV6 (GDSVCURR) */
 	if (!blk_base)
 		return FALSE;	/* Only occurs on malloc failure, so don't worry about mu_int_plen. */
 	blk_size = (int)((blk_hdr_ptr_t)blk_base)->bsiz;
@@ -229,14 +238,14 @@ boolean_t mu_int_blk(
 	{
 		mu_int_err(ERR_DBBSIZMN, TRUE, TRUE, bot_key, bot_len, top_key, top_len,
 				(unsigned int)((blk_hdr_ptr_t)blk_base)->levl);
-		free(blk_base);
+		free(free_blk_base);
 		return FALSE;
 	}
 	if (blk_size > mu_int_data.blk_size)
 	{
 		mu_int_err(ERR_DBBSIZMX, TRUE, TRUE, bot_key, bot_len, top_key, top_len,
 			(unsigned int)((blk_hdr_ptr_t)blk_base)->levl);
-		free(blk_base);
+		free(free_blk_base);
 		return FALSE;
 	}
 	blk_top = blk_base + blk_size;
@@ -248,20 +257,20 @@ boolean_t mu_int_blk(
 		if (blk_levl >= MAX_BT_DEPTH)
 		{
 			mu_int_err(ERR_DBRLEVTOOHI, 0, 0, 0, 0, 0, 0, (unsigned int)blk_levl);
-			free(blk_base);
+			free(free_blk_base);
 			return FALSE;
 		}
 		if (blk_levl < 1)
 		{
 			mu_int_err(ERR_DBRLEVLTONE, 0, 0, 0, 0, 0, 0, (unsigned int)blk_levl);
-			free(blk_base);
+			free(free_blk_base);
 			return FALSE;
 		}
 		mu_int_root_level = level = blk_levl;
 	} else  if (blk_levl != level)
 	{
 		mu_int_err(ERR_DBINCLVL, TRUE, TRUE, bot_key, bot_len, top_key, top_len, (unsigned int)blk_levl);
-		free(blk_base);
+		free(free_blk_base);
 		return FALSE;
 	}
 	if (!master_dir)
@@ -291,7 +300,7 @@ boolean_t mu_int_blk(
 		if (muint_fast)
 		{
 			mu_int_plen--;
-			free(blk_base);
+			free(free_blk_base);
 			return FALSE;
 		}
 		if (blk_tn > largest_tn)
@@ -305,9 +314,11 @@ boolean_t mu_int_blk(
 	is_top = FALSE;
 	memcpy(buff, bot_key, bot_len);
 	mu_sub_list[0].index = NO_SUBSCRIPTS;
+	rec_num = 0;
 	for (rec_base = blk_base + SIZEOF(blk_hdr);  (rec_base < blk_top) && (FALSE == muint_range_done);
 		rec_base = rec_top, comp_length = buff_length)
 	{
+		rec_num++;
 		if (mu_ctrly_occurred || mu_ctrlc_occurred)
 			return FALSE;	/* Only happens on termination, so don't worry about mu_int_plen. */
 		mu_int_cum[RECS][level]++;
@@ -317,13 +328,13 @@ boolean_t mu_int_blk(
 		if (rec_size <= SIZEOF(rec_hdr))
 		{
 			mu_int_err(ERR_DBRSIZMN, TRUE, TRUE, buff, comp_length, top_key, top_len, (unsigned int)blk_levl);
-			free(blk_base);
+			free(free_blk_base);
 			return FALSE;
 		}
 		if ((rec_size > blk_top - rec_base))
 		{
 			mu_int_err(ERR_DBRSIZMX, TRUE, TRUE, buff, comp_length, top_key, top_len, (unsigned int)blk_levl);
-			free(blk_base);
+			free(free_blk_base);
 			return FALSE;
 		}
 		rec_top = rec_base + rec_size;
@@ -334,13 +345,13 @@ boolean_t mu_int_blk(
 			if (SIZEOF(rec_hdr) + SIZEOF(block_id) != rec_size)
 			{
 				mu_int_err(ERR_DBLRCINVSZ, TRUE, TRUE, buff, comp_length, top_key, top_len, (unsigned int)blk_levl);
-				free(blk_base);
+				free(free_blk_base);
 				return FALSE;
 			}
 			if (rec_cmpc)
 			{
 				mu_int_err(ERR_DBSTARCMP, TRUE, TRUE, buff, comp_length, top_key, top_len, (unsigned int)blk_levl);
-				free(blk_base);
+				free(free_blk_base);
 				return FALSE;
 			}
 			ptr = rec_base + SIZEOF(rec_hdr);
@@ -352,7 +363,7 @@ boolean_t mu_int_blk(
 				{
 					mu_int_err(ERR_DBCMPNZRO, TRUE, TRUE, buff,
 						comp_length, top_key, top_len, (unsigned int)blk_levl);
-					free(blk_base);
+					free(free_blk_base);
 					return FALSE;
 				}
 			} else  if ((rec_cmpc < name_len) && (FALSE == master_dir))
@@ -373,7 +384,7 @@ boolean_t mu_int_blk(
 			{
 				mu_int_err(ERR_DBCOMPTOOLRG, TRUE, TRUE, buff, comp_length, top_key,
 					top_len, (unsigned int)blk_levl);
-				free(blk_base);
+				free(free_blk_base);
 				return FALSE;
 			}
 			key_base = rec_base + SIZEOF(rec_hdr);
@@ -383,7 +394,7 @@ boolean_t mu_int_blk(
 				{
 					mu_int_err(ERR_DBKEYMX, TRUE, TRUE, buff, comp_length, top_key, top_len,
 							(unsigned int)blk_levl);
-					free(blk_base);
+					free(free_blk_base);
 					return FALSE;
 				}
 				if (KEY_DELIMITER == *ptr++)
@@ -411,7 +422,7 @@ boolean_t mu_int_blk(
 							{
 								mu_int_err(ERR_DBINVGBL, TRUE, TRUE, bot_key, bot_len,
 									top_key, top_len, (unsigned int)blk_levl);
-								free(blk_base);
+								free(free_blk_base);
 								return FALSE;
 							}
 						}
@@ -425,21 +436,21 @@ boolean_t mu_int_blk(
 			{
 				mu_int_err(ERR_DBKEYMN, TRUE, TRUE, buff, comp_length, top_key, top_len,
 						(unsigned int)blk_levl);
-				free(blk_base);
+				free(free_blk_base);
 				return FALSE;
 			}
 			if (key_size + rec_cmpc > MAX_KEY_SZ)
 			{	/* We'll allow index keys to be whatever length, so long as they don't exceed MAX_KEY_SZ */
 				mu_int_err(ERR_DBKGTALLW, TRUE, TRUE, buff, comp_length, top_key,
 						top_len, (unsigned int)blk_levl);
-				free(blk_base);
+				free(free_blk_base);
 				return FALSE;
 			}
 			if ((short int)rec_cmpc < buff_length && buff[rec_cmpc] == *key_base)
 			{
 				mu_int_err(ERR_DBCMPBAD, TRUE, TRUE, buff, comp_length, top_key, top_len,
 					(unsigned int)blk_levl);
-				free(blk_base);
+				free(free_blk_base);
 				return FALSE;
 			}
 			if (memvcmp(buff + rec_cmpc, comp_length - rec_cmpc, key_base, key_size) >= 0)
@@ -453,13 +464,14 @@ boolean_t mu_int_blk(
 				{
 					mu_int_err(ERR_DBKEYORD, TRUE, TRUE, buff, comp_length, top_key, top_len,
 						(unsigned int)blk_levl);
-					free(blk_base);
+					free(free_blk_base);
 					return FALSE;
 				}
 			}
 			memcpy(old_buff, buff, comp_length);
 			memcpy(buff + rec_cmpc, key_base, key_size);
 			buff_length = rec_cmpc + key_size;
+			rec_len = buff_length;
 			/* Now that we have the uncompressed global variable name, check for global name validity.
 			 * Note that it is enough to check the validity on the leaf level directory tree and not
 			 * for every block. Invalid global names in non-directory tree blocks will encounter
@@ -513,7 +525,7 @@ boolean_t mu_int_blk(
 							{
 								mu_int_cum[RECS][level]--;
 								mu_int_plen--;
-								free(blk_base);
+								free(free_blk_base);
 								return TRUE;
 							}
 						}
@@ -532,7 +544,7 @@ boolean_t mu_int_blk(
 							{
 								mu_int_cum[RECS][level]--;
 								mu_int_plen--;
-								free(blk_base);
+								free(free_blk_base);
 								return TRUE;
 							}
 						}
@@ -562,7 +574,7 @@ boolean_t mu_int_blk(
 						mu_sub_list[0].index = b_index;
 					}
 					b_index = mu_sub_list[s_index].index;
-					start_index = s_index;
+					start_index = sub_start_index = s_index;
 					while (buff[b_index])
 					{
 						if (mu_int_exponent[buff[b_index]])
@@ -583,6 +595,7 @@ boolean_t mu_int_blk(
 						mu_int_plen++;	/* continuing, so compensate for mu_int_err decrement */
 						break;
 					}
+					nct_checked = FALSE;
 					mu_sub_list[s_index].index = 0;
 					for (;  (start_index != s_index) && (0 != mu_sub_list[start_index].index);  start_index++)
 					{
@@ -600,7 +613,7 @@ boolean_t mu_int_blk(
 										mu_int_err(ERR_DBBADNSUB, TRUE, TRUE,
 											buff, comp_length, top_key, top_len,
 											(unsigned int)blk_levl);
-										free(blk_base);
+										free(free_blk_base);
 										return FALSE;
 									}
 									b_index++;
@@ -616,7 +629,7 @@ boolean_t mu_int_blk(
 										mu_int_err(ERR_DBBADNSUB, TRUE, TRUE,
 											buff, comp_length, top_key, top_len,
 											(unsigned int)blk_levl);
-										free(blk_base);
+										free(free_blk_base);
 										return FALSE;
 									}
 									b_index++;
@@ -625,12 +638,52 @@ boolean_t mu_int_blk(
 								{
 									mu_int_err(ERR_DBBADNSUB, TRUE, TRUE, buff, comp_length,
 											top_key, top_len, (unsigned int)blk_levl);
-									free(blk_base);
+									free(free_blk_base);
 									return FALSE;
 								}
 							}
+							if (!nct_checked && trees->nct)
+							{
+								nct_checked = TRUE;
+								nct_err_type = TRUE;
+								mu_int_err(ERR_DBNONUMSUBS, TRUE, TRUE, buff, comp_length, top_key,
+										top_len, (unsigned int)blk_levl);
+								mu_int_plen++;
+								nct_err_type = FALSE;
+							}
 						}
 					}
+					for (null_subscript_cnt = 0;  (sub_start_index != s_index);  sub_start_index++)
+					{
+						subscript = buff[mu_sub_list[sub_start_index].index];
+						if ((STR_SUB_PREFIX == subscript)
+							&& (KEY_DELIMITER != buff[mu_sub_list[sub_start_index].index + 1]))
+							continue;
+						if ((subscript == SUBSCRIPT_STDCOL_NULL) || (subscript == STR_SUB_PREFIX))
+							null_subscript_cnt++;
+						else
+							continue;
+						if (mu_int_data.null_subs)
+						{
+							if ((0 == mu_int_data.std_null_coll) ? (SUBSCRIPT_STDCOL_NULL == subscript)
+								: (STR_SUB_PREFIX == subscript))
+							{
+								null_coll_type_err = TRUE;
+								null_coll_type = mu_int_data.std_null_coll;
+								blk_id = blk;
+								mu_int_err(ERR_DBNULCOL, TRUE, TRUE, buff, comp_length, top_key,
+										top_len, (unsigned int)blk_levl);
+								mu_int_plen++;
+								null_coll_type_err = FALSE;
+							}
+						}
+					}
+					if (0 < null_subscript_cnt && !mu_int_data.null_subs)
+					{
+						mu_int_err(ERR_NULSUBSC, TRUE, TRUE, buff, comp_length, 0,0,
+							(unsigned int)blk_levl);
+						 mu_int_plen++;
+					}
 				}
 			}
 			if (!level && !master_dir)
@@ -640,7 +693,7 @@ boolean_t mu_int_blk(
 				{
 					mu_int_err(ERR_DBDATAMX, TRUE, TRUE, buff, comp_length,
 							top_key, top_len, (unsigned int)blk_levl);
-					free(blk_base);
+					free(free_blk_base);
 					return FALSE;
 				}
 				span_key = buff + buff_length - SPAN_SUBS_LENGTH - 1;
@@ -703,7 +756,7 @@ boolean_t mu_int_blk(
 										   sndata->key_len, top_key,
 										   top_len,
 										   (unsigned int)blk_levl);
-									free(blk_base);
+									free(free_blk_base);
 									return FALSE;
 								}
 							}
@@ -794,21 +847,21 @@ boolean_t mu_int_blk(
 			{
 				mu_int_err(ERR_DBPTRNOTPOS, TRUE, TRUE, buff, comp_length, top_key, top_len,
 						(unsigned int)blk_levl);
-				free(blk_base);
+				free(free_blk_base);
 				return FALSE;
 			}
 			if (child > mu_int_data.trans_hist.total_blks)
 			{
 				mu_int_err(ERR_DBPTRMX, TRUE, TRUE, buff, comp_length, top_key,
 						top_len, (unsigned int)blk_levl);
-				free(blk_base);
+				free(free_blk_base);
 				return FALSE;
 			}
 			if (!(child % mu_int_data.bplmap))
 			{
 				mu_int_err(ERR_DBBNPNTR, TRUE, TRUE, buff, comp_length, top_key, top_len,
 						(unsigned int)blk_levl);
-				free(blk_base);
+				free(free_blk_base);
 				return FALSE;
 			}
 			if (!muint_fast || (level > 1) || master_dir)
@@ -826,7 +879,7 @@ boolean_t mu_int_blk(
 					mu_int_err(ERR_DBBDBALLOC, TRUE, TRUE, old_buff, comp_length, buff, buff_length,
 							(unsigned int)((blk_hdr_ptr_t)ptr)->levl);
 					mu_int_plen--;				/* Revert above increment */
-					free(blk_base);
+					free(free_blk_base);
 					return FALSE;
 				}
 				mu_int_cum[BLKS][0]++;
@@ -918,12 +971,12 @@ boolean_t mu_int_blk(
 			{
 				mu_int_err(ERR_DBKEYGTIND, TRUE, TRUE, buff, comp_length, top_key, top_len,
 					(unsigned int)blk_levl);
-				free(blk_base);
+				free(free_blk_base);
 				return FALSE;
 			}
 		}
 	}
 	mu_int_plen--;
-	free(blk_base);
+	free(free_blk_base);
 	return TRUE;
 }
diff --git a/sr_port/mu_int_err.c b/sr_port/mu_int_err.c
index 854a974..e41ac59 100755
--- a/sr_port/mu_int_err.c
+++ b/sr_port/mu_int_err.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -21,6 +22,9 @@
 #include "util.h"
 #include "print_target.h"
 #include "gtmmsg.h"
+#include "collseq.h"
+#include "gdsblk.h"
+#include "format_targ_key.h"
 
 GBLREF block_id		mu_int_path[];
 GBLREF int		mu_int_plen;
@@ -30,7 +34,12 @@ GBLREF boolean_t	mu_int_err_ranges;
 GBLREF boolean_t	master_dir;
 GBLREF global_list	*trees;
 GBLREF span_node_integ	*sndata;
-
+GBLREF boolean_t	null_coll_type_err;
+GBLREF boolean_t	null_coll_type;
+GBLREF unsigned int	rec_num;
+GBLREF block_id		blk_id;
+GBLREF boolean_t	nct_err_type;
+GBLREF int		rec_len;
 #define MAX_UTIL_LEN 40
 #define BLOCK_WINDOW 8
 #define LEVEL_WINDOW 3
@@ -59,10 +68,13 @@ void	mu_int_err(
 		int has_top,
 	      	unsigned int level)
 {
-	int		i, util_len;
+	int		i, util_len, fmtd_key_len;
 	unsigned char	util_buff[MAX_UTIL_LEN];
 	unsigned char 	span_key[MAX_KEY_SZ + 1];
-
+	unsigned char	temp_bot;
+	unsigned char	key_buffer[MAX_KEY_SZ];
+	unsigned char	*temp;
+	gv_key		*tmp_gvkey = NULL;
 	if (!mu_int_errknt)
 		util_out_print("!/Block:Offset Level", TRUE);
 	mu_int_errknt++;
@@ -84,6 +96,27 @@ void	mu_int_err(
 	if (sndata->sn_type)
 		gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(5) err, 3, LEN_AND_STR((char*)util_buff),
 				(SPAN_NODE == sndata->sn_type) ? (sndata->span_prev_blk + 2) : (sndata->span_blk_cnt));
+	else if (null_coll_type_err)
+	{
+		if (null_coll_type)
+			gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(8) err, 6, rec_num, blk_id,
+					LEN_AND_STR(GTM_NULL_TEXT), LEN_AND_STR(STD_NULL_TEXT));
+		else
+			gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(8) err, 6, rec_num, blk_id,
+					LEN_AND_STR(STD_NULL_TEXT), LEN_AND_STR(GTM_NULL_TEXT));
+	} else if (nct_err_type)
+	{
+		assert(NULL == tmp_gvkey);
+		GVKEY_INIT(tmp_gvkey, DBKEYSIZE(MAX_KEY_SZ));
+		memcpy(tmp_gvkey->base, bot, rec_len);
+		tmp_gvkey->end = rec_len - 1;
+		temp = (unsigned char*)format_targ_key(key_buffer,
+				MAX_ZWR_KEY_SZ, tmp_gvkey, TRUE);
+		fmtd_key_len = (int)(temp - key_buffer);
+		key_buffer[fmtd_key_len] = '\0';
+		gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) err, 2, LEN_AND_STR(key_buffer));
+		GVKEY_FREE_IF_NEEDED(tmp_gvkey);
+	}
 	else
 		gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) err, 2, LEN_AND_STR((char*)util_buff));
 	if (do_path)
@@ -137,8 +170,10 @@ void	mu_int_err(
 			util_out_print("^", FALSE);
 			/* in the case bot is the leftmost key of the gvtree, it needs a second null to be a properly terminated
 			 * real key for print_target. since it is a simple set, we unconditionally do it for every key */
+			temp_bot = bot[has_bot];
 			bot[has_bot] = 0;
 			print_target(bot);
+			bot[has_bot] = temp_bot;
 		} else
 		{
 			assert(master_dir);	/* for a global variable tree, we better have a non-zero begin key */
diff --git a/sr_port/mu_int_fhead.c b/sr_port/mu_int_fhead.c
index 6f74766..682989a 100644
--- a/sr_port/mu_int_fhead.c
+++ b/sr_port/mu_int_fhead.c
@@ -25,9 +25,7 @@
 #include "mupint.h"
 #include "gtmmsg.h"
 #include "gtmcrypt.h"
-#ifdef GTM_SNAPSHOT
 #include "db_snapshot.h"
-#endif
 
 GBLDEF	unsigned char		*mu_int_locals;
 GBLDEF	int4			mu_int_ovrhd;
@@ -63,9 +61,8 @@ error_def(ERR_KILLABANDONED);
 error_def(ERR_MUKILLIP);
 error_def(ERR_MUTNWARN);
 
-#ifdef GTM_SNAPSHOT
-# define SET_NATIVE_SIZE(native_size)									\
-{													\
+#define SET_NATIVE_SIZE(native_size)									\
+MBSTART {												\
 	GBLREF util_snapshot_ptr_t	util_ss_ptr;							\
 	GBLREF boolean_t		ointeg_this_reg;						\
 	if (ointeg_this_reg)										\
@@ -75,19 +72,17 @@ error_def(ERR_MUTNWARN);
 		assert(0 != native_size); /* Ensure native_size is updated properly in ss_initiate */	\
 	} else												\
 		native_size = gds_file_size(gv_cur_region->dyn.addr->file_cntl);			\
-}
-#else
-# define SET_NATIVE_SIZE(native_size)	native_size = gds_file_size(gv_cur_region->dyn.addr->file_cntl);
-#endif
+} MBEND
+
 boolean_t mu_int_fhead(void)
 {
 	unsigned char		*p1;
 	unsigned int		maps, block_factor;
-	gtm_uint64_t		size, native_size;
+	gtm_uint64_t		size, native_size, delta_size;
 	trans_num		temp_tn, max_tn_warn;
 	sgmnt_data_ptr_t	mu_data;
 	gd_segment		*seg;
-	int			gtmcrypt_errno;
+	int			actual_tot_blks, should_be_tot_blks, gtmcrypt_errno;
 
 	mu_data = &mu_int_data;
 	if (MEMCMP_LIT(mu_data->label, GDS_LABEL))
@@ -145,7 +140,8 @@ boolean_t mu_int_fhead(void)
 		return FALSE;
 	}
 	/* CHECK: total_blks <> 0 */
-	if (0 == mu_data->trans_hist.total_blks)
+	actual_tot_blks = mu_data->trans_hist.total_blks;
+	if (0 == actual_tot_blks)
 	{
 		mu_int_err(ERR_DBTTLBLK0, 0, 0, 0, 0, 0, 0, 0);
 		return FALSE;
@@ -203,35 +199,10 @@ boolean_t mu_int_fhead(void)
 		default:
 			mu_int_err(ERR_DBUNDACCMT, 0, 0, 0, 0, 0, 0, 0);
 		/*** WARNING: Drop thru ***/
-#		ifdef VMS
-#		 ifdef GT_CX_DEF
-		case dba_bg:	/* necessary to do calculation in this manner to prevent double rounding causing an error */
-			if (mu_data->unbacked_cache)
-				mu_int_ovrhd = DIVIDE_ROUND_UP(SIZEOF_FILE_HDR(mu_data) + mu_data->free_space +
-					mu_data->lock_space_size, DISK_BLOCK_SIZE);
-			else
-				mu_int_ovrhd = DIVIDE_ROUND_UP(SIZEOF_FILE_HDR(mu_data) + BT_SIZE(mu_data)
-					+ mu_data->free_space + mu_data->lock_space_size, DISK_BLOCK_SIZE);
-			break;
-		case dba_mm:
-			mu_int_ovrhd = DIVIDE_ROUND_UP(SIZEOF_FILE_HDR(mu_data) + mu_data->free_space, DISK_BLOCK_SIZE);
-			break;
-#		 else
-		case dba_bg:
-		/*** WARNING: Drop thru ***/
-		case dba_mm:
-			mu_int_ovrhd = DIVIDE_ROUND_UP(SIZEOF_FILE_HDR(mu_data) + mu_data->free_space, DISK_BLOCK_SIZE);
-		break;
-#		 endif
-
-#		elif defined(UNIX)
 		case dba_bg:
 		/*** WARNING: Drop thru ***/
 		case dba_mm:
 			mu_int_ovrhd = (int4)DIVIDE_ROUND_UP(SIZEOF_FILE_HDR(mu_data) + mu_data->free_space, DISK_BLOCK_SIZE);
-#		else
-#		 error unsupported platform
-#		endif
 	}
 	assert(mu_data->blk_size == ROUND_UP(mu_data->blk_size, DISK_BLOCK_SIZE));
  	block_factor =  mu_data->blk_size / DISK_BLOCK_SIZE;
@@ -241,33 +212,29 @@ boolean_t mu_int_fhead(void)
 		mu_int_err(ERR_DBHEADINV, 0, 0, 0, 0, 0, 0, 0);
 		return FALSE;
 	}
-	size = mu_int_ovrhd + (off_t)block_factor * mu_data->trans_hist.total_blks;
+	size = (mu_int_ovrhd - 1) + (off_t)block_factor * (actual_tot_blks + 1);
 	/* If ONLINE INTEG for this region is in progress, then native_size would have been calculated in ss_initiate. */
 	SET_NATIVE_SIZE(native_size);
 	ALIGN_DBFILE_SIZE_IF_NEEDED(size, native_size);
-	/* In the following tests, the EOF block should always be 1 greater
-	 * than the actual size of the file.  This is due to the GDS being
-	 * allocated in even DISK_BLOCK_SIZE-byte blocks. */
 	if (native_size && (size != native_size))
 	{
 		if (size < native_size)
 			mu_int_err(ERR_DBFGTBC, 0, 0, 0, 0, 0, 0, 0);
 		else
 			mu_int_err(ERR_DBFSTBC, 0, 0, 0, 0, 0, 0, 0);
-		if (native_size % 2) /* Native size should be (64K + n*1K + 512) / DISK_BLOCK_SIZE , so always an odd number. */
-			gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_DBTOTBLK, 2,
-						(uint4)((native_size - mu_data->start_vbn) / block_factor),
-						mu_data->trans_hist.total_blks);
-		else
-			/* Since native_size is even and the result will be rounded down, we need to add 1 before the division so we
-			 * extend by enough blocks (ie. if current nb. of blocks is 100, and the file size gives 102.5 blocks, we
-			 * need to extend by 3 blocks, not 2). */
-			gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_DBMISALIGN, 4, DB_LEN_STR(gv_cur_region),
-				(uint4)((native_size - mu_data->start_vbn) / block_factor),
-				(uint4)(((native_size + 1 - mu_data->start_vbn) / block_factor) - mu_data->trans_hist.total_blks));
+		should_be_tot_blks = (native_size - (mu_data->start_vbn - 1)) / block_factor - 1;
+		if ((((should_be_tot_blks + 1) * block_factor) + (mu_data->start_vbn - 1)) == native_size)
+		{	/* The database file size is off but is off by N GDS blocks where N is an integer */
+			gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_DBTOTBLK, 2, actual_tot_blks, should_be_tot_blks);
+		} else
+		{	/* The database file size is off but is off by a fractional GDS block. Issue different error (alignment) */
+			gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_DBMISALIGN, 4, actual_tot_blks,
+				should_be_tot_blks, should_be_tot_blks + 1,
+				((should_be_tot_blks + 1 - actual_tot_blks) <= 0) ? 1 : (should_be_tot_blks + 1 - actual_tot_blks));
+		}
 	}
 	/* make working space for all local bitmaps */
-	maps = (mu_data->trans_hist.total_blks + mu_data->bplmap - 1) / mu_data->bplmap;
+	maps = (actual_tot_blks + mu_data->bplmap - 1) / mu_data->bplmap;
 	size = (gtm_uint64_t)(BM_SIZE(mu_data->bplmap) - SIZEOF(blk_hdr));
 	size *= maps;
 	mu_int_locals = (unsigned char *)malloc(size);
diff --git a/sr_port/mu_int_init.c b/sr_port/mu_int_init.c
index b2e26cf..ea47d14 100644
--- a/sr_port/mu_int_init.c
+++ b/sr_port/mu_int_init.c
@@ -53,11 +53,17 @@ boolean_t mu_int_init(void)
 	file_control		*fc;
 	boolean_t		standalone;
 	char			msgbuff[MSGBUF_SIZE], *msgptr;
-	int			gtmcrypt_errno;
+	int			gtmcrypt_errno, read_len;
 	gd_segment		*seg;
 	sgmnt_addrs		*csa;
+	sgmnt_data_ptr_t	tsd;
+	unix_db_info		*udi;
+	DCL_THREADGBL_ACCESS;
 
-	mu_gv_cur_reg_init();
+	SETUP_THREADGBL_ACCESS;
+	mu_gv_cur_reg_init();	/* Creates a dummy segment with seg->asyncio FALSE so no DIO alignment issues to worry about
+				 * in the FC_OPEN/FC_READ below
+				 */
 	/* get filename */
 	gv_cur_region->dyn.addr->fname_len = SIZEOF(gv_cur_region->dyn.addr->fname);
 	if (!cli_get_str("WHAT", (char *)gv_cur_region->dyn.addr->fname, &gv_cur_region->dyn.addr->fname_len))
@@ -70,7 +76,6 @@ boolean_t mu_int_init(void)
 		return (FALSE);
 	}
 	fc = gv_cur_region->dyn.addr->file_cntl;
-	fc->file_type = dba_bg;
 	fc->op = FC_OPEN;
 	status = dbfilop(fc);
 	if (SS_NORMAL != status)
@@ -88,10 +93,16 @@ boolean_t mu_int_init(void)
 	}
 	assert(SGMNT_HDR_LEN == SIZEOF(sgmnt_data));
 	fc->op = FC_READ;
-	fc->op_buff = (uchar_ptr_t)&mu_int_data;
+	/* Do aligned reads if opened with O_DIRECT */
+	udi = FC2UDI(fc);
+	tsd = udi->fd_opened_with_o_direct ? (sgmnt_data_ptr_t)(TREF(dio_buff)).aligned : &mu_int_data;
+	fc->op_buff = (uchar_ptr_t)tsd;
 	fc->op_len = SGMNT_HDR_LEN;
 	fc->op_pos = 1;
 	dbfilop(fc);
+	/* Ensure "mu_int_data" is populated even if we did not directly read into it for the O_DIRECT case */
+	if (udi->fd_opened_with_o_direct)
+		memcpy(&mu_int_data, (TREF(dio_buff)).aligned, SGMNT_HDR_LEN);
 	if (MASTER_MAP_SIZE_MAX < MASTER_MAP_SIZE(&mu_int_data) ||
 	    native_size < DIVIDE_ROUND_UP(SGMNT_HDR_LEN + MASTER_MAP_SIZE(&mu_int_data), DISK_BLOCK_SIZE) + MIN_DB_BLOCKS)
 	{
@@ -112,9 +123,20 @@ boolean_t mu_int_init(void)
 	}
 	mu_int_master = malloc(mu_int_data.master_map_len);
 	fc->op = FC_READ;
-	fc->op_buff = mu_int_master;
-	fc->op_len = MASTER_MAP_SIZE(&mu_int_data);
+	read_len = MASTER_MAP_SIZE(&mu_int_data);
+	/* Do aligned reads if opened with O_DIRECT */
+	if (udi->fd_opened_with_o_direct)
+	{
+		read_len = ROUND_UP2(read_len, DIO_ALIGNSIZE(udi));
+		DIO_BUFF_EXPAND_IF_NEEDED(udi, read_len, &(TREF(dio_buff)));
+		fc->op_buff = (sm_uc_ptr_t)(TREF(dio_buff)).aligned;
+	} else
+		fc->op_buff = mu_int_master;
+	fc->op_len = read_len;
 	fc->op_pos = DIVIDE_ROUND_UP(SGMNT_HDR_LEN + 1, DISK_BLOCK_SIZE);
 	dbfilop(fc);
+	/* Ensure "mu_int_master" is populated even if we did not directly read into it for the O_DIRECT case */
+	if (udi->fd_opened_with_o_direct)
+		memcpy(mu_int_master, (TREF(dio_buff)).aligned, mu_int_data.master_map_len);
 	return (mu_int_fhead());
 }
diff --git a/sr_port/mu_int_maps.c b/sr_port/mu_int_maps.c
index 34d74d6..7cb30f5 100755
--- a/sr_port/mu_int_maps.c
+++ b/sr_port/mu_int_maps.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -64,7 +65,7 @@ error_def(ERR_DBTN);
 void mu_int_maps(void)
 {
 	unsigned char	*local;
-	uchar_ptr_t	disk;
+	uchar_ptr_t	blk_base, free_blk_base;
 	boolean_t	agree, disk_full, local_full, master_full;
 	int		maps, mapsize, mcnt, lcnt, bcnt;
 	unsigned int	level;
@@ -85,28 +86,28 @@ void mu_int_maps(void)
 		assert(mapsize == mu_int_data.bplmap);
 		blkno = mcnt * mu_int_data.bplmap;
 		bml_busy(blkno, mu_int_locals);
-		disk = mu_int_read(blkno, &ondsk_blkver);	/* ondsk_blkver set to GDSV4 or GDSV6 (GDSVCURR) */
-		if (!disk)
+		blk_base = mu_int_read(blkno, &ondsk_blkver, &free_blk_base);	/* ondsk_blkver set to GDSV4 or GDSV6 (GDSVCURR) */
+		if (!blk_base)
 		{
 			mu_int_path[0] = blkno;
 			mu_int_plen = 1;
 			mu_int_err(ERR_DBREADBM, 0, 0, 0, 0, 0, 0, LCL_MAP_LEVL);
 			continue;
 		}
-		if (LCL_MAP_LEVL != (level = (unsigned int)((blk_hdr_ptr_t)disk)->levl))
+		if (LCL_MAP_LEVL != (level = (unsigned int)((blk_hdr_ptr_t)blk_base)->levl))
 		{
 			mu_int_path[0] = blkno;
 			mu_int_plen = 1;
 			mu_int_err(ERR_DBLVLINC, 0, 0, 0, 0, 0, 0, level);
 		}
-		if (((blk_hdr_ptr_t)disk)->bsiz < map_blk_size)
+		if (((blk_hdr_ptr_t)blk_base)->bsiz < map_blk_size)
 		{
 			mu_int_path[0] = blkno;
 			mu_int_plen = 1;
 			mu_int_err(ERR_DBMBSIZMN, 0, 0, 0, 0, 0, 0, level);
 			continue;
 		}
-		if (((blk_hdr_ptr_t)disk)->bsiz > map_blk_size)
+		if (((blk_hdr_ptr_t)blk_base)->bsiz > map_blk_size)
 		{
 			mu_int_path[0] = blkno;
 			mu_int_plen = 1;
@@ -115,13 +116,13 @@ void mu_int_maps(void)
 		}
 		if (tn_reset_this_reg)
 		{
-			((blk_hdr_ptr_t)disk)->tn = 0;
-			mu_int_write(blkno, disk);
+			((blk_hdr_ptr_t)blk_base)->tn = 0;
+			mu_int_write(blkno, blk_base);
 			if (GDSVCURR != mu_int_data.desired_db_format)
 				mu_int_blks_to_upgrd++;
 		} else if (GDSVCURR != ondsk_blkver)
 			mu_int_blks_to_upgrd++;
-		map_tn = ((blk_hdr_ptr_t)disk)->tn;
+		map_tn = ((blk_hdr_ptr_t)blk_base)->tn;
  		if (map_tn >= mu_int_data.trans_hist.curr_tn)
  		{
 			if (trans_errors < disp_trans_errors)
@@ -139,9 +140,9 @@ void mu_int_maps(void)
 		master_full = !bit_set(mcnt, mu_int_master);
 		if (last_bmp == blkno)
 			mapsize = (mu_int_data.trans_hist.total_blks - blkno);
-		disk_full = (NO_FREE_SPACE == bml_find_free(0, disk + SIZEOF(blk_hdr), mapsize));
+		disk_full = (NO_FREE_SPACE == bml_find_free(0, blk_base + SIZEOF(blk_hdr), mapsize));
 		agree = TRUE;
-		for (lcnt = 0, dskmap_p = (uint_ptr_t)(disk + SIZEOF(blk_hdr)), lmap = (uint4 *)local;
+		for (lcnt = 0, dskmap_p = (uint_ptr_t)(blk_base + SIZEOF(blk_hdr)), lmap = (uint4 *)local;
 			lcnt < mapsize;
 			lcnt += SIZEOF(int4) * BITS_PER_UCHAR / BML_BITS_PER_BLK,
 			dskmap_p++, lmap++)  /* # of bits/ bits per blk */
@@ -262,7 +263,7 @@ void mu_int_maps(void)
 			} else
 				mu_int_errknt++;
 		}
-		free(disk);
+		free(free_blk_base);
 	}
 	if (mu_map_errs >= disp_map_errors)
 	{
diff --git a/sr_port/mu_int_read.c b/sr_port/mu_int_read.c
index 83c0eb3..ab8712e 100755
--- a/sr_port/mu_int_read.c
+++ b/sr_port/mu_int_read.c
@@ -27,10 +27,8 @@
 #include "gds_blk_upgrade.h"
 #include "gtmcrypt.h"
 #include "min_max.h"
-#ifdef GTM_SNAPSHOT
 #include "shmpool.h"		/* Needed for DBG_ENSURE_PTR_WITHIN_SS_BOUNDS */
 #include "db_snapshot.h"
-#endif
 #include "mupip_exit.h"
 
 GBLREF sgmnt_data		mu_int_data;
@@ -49,7 +47,15 @@ error_def(ERR_DYNUPGRDFAIL);
 error_def(ERR_INTEGERRS);
 error_def(ERR_REGSSFAIL);
 
-uchar_ptr_t mu_int_read(block_id blk, enum db_ver *ondsk_blkver)
+/* Returns buffer containing the GDS block. "free_buff" is set to point to the start of the malloced buffer
+ * so the caller needs to use "free_buff" when doing the "free". This is necessary particularly in case of
+ * asyncio=TRUE when the file is opened with O_DIRECT and the malloced buffer is not necessarily aligned
+ * for DIO. And so we allocate with padding to get alignment. In this case the aligned buffer is returned
+ * as the GDS block but the unaligned buffer is set in "free_buff" and is the one that needs to be freed.
+ * In case asyncio=FALSE, the return value is the same as "free_buff". So in all cases, the caller is safe to
+ * do a free of "free_buff".
+ */
+uchar_ptr_t mu_int_read(block_id blk, enum db_ver *ondsk_blkver, uchar_ptr_t *free_buff)
 {
 	int4			status;
 	file_control		*fc;
@@ -61,22 +67,29 @@ uchar_ptr_t mu_int_read(block_id blk, enum db_ver *ondsk_blkver)
 	sgmnt_data_ptr_t	csd;
 	boolean_t 		have_blk;
 	sgmnt_addrs		*csa;
-	GTM_SNAPSHOT_ONLY(
-		boolean_t	read_failed;
-		shm_snapshot_t	*ss_shm_ptr;
-	)
+	unix_db_info		*udi;
+	boolean_t		read_failed;
+	shm_snapshot_t		*ss_shm_ptr;
 
 	have_blk = FALSE;
 	csa = cs_addrs;
-#	ifdef UNIX
 	if (region && csa->nl->onln_rlbk_pid)
 	{
 		gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(1) ERR_DBROLLEDBACK);
 		mupip_exit(ERR_INTEGERRS);
 	}
-#	endif
-	tmp_ptr = malloc(mu_int_data.blk_size);
-#	ifdef GTM_SNAPSHOT
+	fc = gv_cur_region->dyn.addr->file_cntl;
+	udi = FC2UDI(fc);
+	if (udi->fd_opened_with_o_direct)
+	{	/* We need aligned buffers */
+		tmp_ptr = (unsigned char *)malloc(ROUND_UP2(mu_int_data.blk_size, DIO_ALIGNSIZE(udi)) + OS_PAGE_SIZE);
+		*free_buff = tmp_ptr;
+		tmp_ptr = (unsigned char *)ROUND_UP2((UINTPTR_T)tmp_ptr, OS_PAGE_SIZE);
+	} else
+	{
+		tmp_ptr = malloc(mu_int_data.blk_size);
+		*free_buff = tmp_ptr;
+	}
 	if (ointeg_this_reg)
 	{
 		assert(NULL != csa->ss_ctx);
@@ -95,16 +108,13 @@ uchar_ptr_t mu_int_read(block_id blk, enum db_ver *ondsk_blkver)
 			mupip_exit(ERR_INTEGERRS);
 		}
 	}
-#	endif
 	if (!have_blk)
 	{
-		fc = gv_cur_region->dyn.addr->file_cntl;
 		fc->op = FC_READ;
 		fc->op_buff = tmp_ptr;
 		fc->op_len = mu_int_data.blk_size;
 		fc->op_pos = mu_int_ovrhd + ((gtm_int64_t)mu_int_data.blk_size / DISK_BLOCK_SIZE * blk);
 		dbfilop(fc); /* No return if error */
-#		ifdef GTM_SNAPSHOT
 		if (ointeg_this_reg)
 		{
 			assert(NULL != ss_shm_ptr); /* should have been initialized above */
@@ -121,7 +131,6 @@ uchar_ptr_t mu_int_read(block_id blk, enum db_ver *ondsk_blkver)
 				mupip_exit(ERR_INTEGERRS);
 			}
 		}
-#		endif
 	}
 	csd = &mu_int_data;
 	if (USES_ENCRYPTION(csd->is_encrypted))
diff --git a/sr_port/mu_int_reg.c b/sr_port/mu_int_reg.c
index bffe65b..19f4c3d 100644
--- a/sr_port/mu_int_reg.c
+++ b/sr_port/mu_int_reg.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -30,14 +30,10 @@
 #include "change_reg.h"
 #include "gtmmsg.h"
 #include "mu_int_wait_rdonly.h"
-#include "wcs_sleep.h"
-#include "wcs_flu.h"
 #include "interlock.h"
 #include "gtmcrypt.h"
-#ifdef GTM_SNAPSHOT
 #include "db_snapshot.h"
 #include "gt_timer.h"
-#endif
 #include "mupint.h"
 #include "wbox_test_init.h"
 
@@ -48,37 +44,36 @@ GBLREF gd_region		*gv_cur_region;
 GBLREF sgmnt_data		mu_int_data;
 GBLREF unsigned char		*mu_int_master;
 GBLREF uint4			mu_int_skipreg_cnt;
-#ifdef DEBUG
-GBLREF pid_t			process_id;
-#endif
 GBLREF enc_handles		mu_int_encr_handles;
 GBLREF sgmnt_addrs		*cs_addrs;
-#ifdef UNIX
 GBLREF boolean_t		jnlpool_init_needed, online_specified, preserve_snapshot;
 GBLREF util_snapshot_ptr_t	util_ss_ptr;
+#ifdef DEBUG
+GBLREF uint4			process_id;
 #endif
 
 error_def(ERR_BUFFLUFAILED);
 error_def(ERR_SSV4NOALLOW);
 error_def(ERR_SSMMNOALLOW);
 
-void mu_int_reg(gd_region *reg, boolean_t *return_value)
+void mu_int_reg(gd_region *reg, boolean_t *return_value, boolean_t return_after_open)
 {
 	boolean_t		read_only, was_crit;
 	freeze_status		status;
 	node_local_ptr_t	cnl;
 	sgmnt_addrs     	*csa;
 	sgmnt_data_ptr_t	csd;
+	sgmnt_data		*csd_copy_ptr;
+	gd_segment		*seg;
+	int			gtmcrypt_errno;
 #	ifdef DEBUG
 	boolean_t		need_to_wait = FALSE;
 	int			trynum;
 	uint4			curr_wbox_seq_num;
 #	endif
-	sgmnt_data		*csd_copy_ptr;
-	gd_segment		*seg;
-	int			gtmcrypt_errno;
+
 	*return_value = FALSE;
-	UNIX_ONLY(jnlpool_init_needed = TRUE);
+	jnlpool_init_needed = TRUE;
 	ESTABLISH(mu_int_reg_ch);
 	if (dba_usr == reg->dyn.addr->acc_meth)
 	{
@@ -99,6 +94,11 @@ void mu_int_reg(gd_region *reg, boolean_t *return_value)
 		gv_cur_region->open = FALSE;
 		return;
 	}
+	if (return_after_open)
+	{
+		*return_value = TRUE;
+		return;
+	}
 	change_reg();
 	csa = &FILE_INFO(gv_cur_region)->s_addrs;
 	cnl = csa->nl;
@@ -111,7 +111,6 @@ void mu_int_reg(gd_region *reg, boolean_t *return_value)
 	 * However, if -ONLINE is not explicitly specified but rather assumed implicitly (as default for -REG)
 	 * then turn off ONLINE INTEG for this region and continue as if -NOONLINE was specified
 	 */
-#	ifdef GTM_SNAPSHOT
 	if (!csd->fully_upgraded)
 	{
 		ointeg_this_reg = FALSE; /* Turn off ONLINE INTEG for this region */
@@ -123,34 +122,48 @@ void mu_int_reg(gd_region *reg, boolean_t *return_value)
 			return;
 		}
 	}
-#	endif
 	if (!ointeg_this_reg || read_only)
 	{
-		status = region_freeze(gv_cur_region, TRUE, FALSE, TRUE);
+		status = region_freeze(gv_cur_region, TRUE, FALSE, TRUE, FALSE, !read_only);
 		switch (status)
 		{
 			case REG_ALREADY_FROZEN:
-				UNIX_ONLY(if (csa->read_only_fs) break);
+				if (csa->read_only_fs)
+					break;
 				util_out_print("!/Database for region !AD is already frozen, not integing",
 					TRUE, REG_LEN_STR(gv_cur_region));
 				mu_int_skipreg_cnt++;
 				return;
+			case REG_FLUSH_ERROR:
+				gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(6) ERR_BUFFLUFAILED, 4, LEN_AND_LIT(MUPIP_INTEG),
+					DB_LEN_STR(gv_cur_region));
+				mu_int_skipreg_cnt++;
+				return;
 			case REG_HAS_KIP:
 				/* We have already waited for KIP to reset. This time do not wait for KIP */
-				status = region_freeze(gv_cur_region, TRUE, FALSE, FALSE);
+				status = region_freeze(gv_cur_region, TRUE, FALSE, FALSE, FALSE, !read_only);
 				if (REG_ALREADY_FROZEN == status)
 				{
-					UNIX_ONLY(if (csa->read_only_fs) break);
+					if (csa->read_only_fs)
+						break;
 					util_out_print("!/Database for region !AD is already frozen, not integing",
 						TRUE, REG_LEN_STR(gv_cur_region));
 					mu_int_skipreg_cnt++;
 					return;
+				} else if (REG_FLUSH_ERROR == status)
+				{
+					gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(6) ERR_BUFFLUFAILED, 4, LEN_AND_LIT(MUPIP_INTEG),
+						DB_LEN_STR(gv_cur_region));
+					mu_int_skipreg_cnt++;
+					return;
 				}
-				break;
+				assert(REG_FREEZE_SUCCESS == status);
+				/* no break */
 			case REG_FREEZE_SUCCESS:
 				break;
 			default:
 				assert(FALSE);
+				/* no break */
 		}
 		if (read_only && (dba_bg == csa->hdr->acc_meth) && !mu_int_wait_rdonly(csa, MUPIP_INTEG))
 		{
@@ -159,15 +172,7 @@ void mu_int_reg(gd_region *reg, boolean_t *return_value)
 		}
 	}
 	if (!ointeg_this_reg)
-	{
-		if (!read_only && !wcs_flu(WCSFLU_FLUSH_HDR | WCSFLU_WRITE_EPOCH | WCSFLU_SYNC_EPOCH))
-		{
-			gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(6) ERR_BUFFLUFAILED, 4, LEN_AND_LIT(MUPIP_INTEG),
-				DB_LEN_STR(gv_cur_region));
-			mu_int_skipreg_cnt++;
-			return;
-		}
-		/* Take a copy of the file-header. To ensure it is consistent, do it while holding crit. */
+	{	/* Take a copy of the file-header. To ensure it is consistent, do it while holding crit. */
 		was_crit = csa->now_crit;
 		if (!was_crit)
 			grab_crit(gv_cur_region);
@@ -178,7 +183,6 @@ void mu_int_reg(gd_region *reg, boolean_t *return_value)
 		csd_copy_ptr = &mu_int_data;
 	} else
 	{
-#		ifdef GTM_SNAPSHOT
 		if (!ss_initiate(gv_cur_region, util_ss_ptr, &csa->ss_ctx, preserve_snapshot, MUPIP_INTEG))
 		{
 			mu_int_skipreg_cnt++;
@@ -186,12 +190,11 @@ void mu_int_reg(gd_region *reg, boolean_t *return_value)
 			ss_release(&csa->ss_ctx);
 			ointeg_this_reg = FALSE; /* Turn off ONLINE INTEG for this region */
 			assert(process_id != cnl->in_crit); /* Ensure ss_initiate released the crit before returning */
-			assert(process_id != csd->freeze); /* Ensure region is unfrozen before returning from ss_initiate */
+			assert(!FROZEN_HARD(csd)); /* Ensure region is unfrozen before returning from ss_initiate */
 			assert(INTRPT_IN_SS_INITIATE != intrpt_ok_state); /* Ensure ss_initiate released intrpt_ok_state */
 			return;
 		}
 		assert(process_id != cnl->in_crit); /* Ensure ss_initiate released the crit before returning */
-		assert(process_id != csd->freeze); /* Ensure region is unfrozen before returning from ss_initiate */
 		assert(INTRPT_IN_SS_INITIATE != intrpt_ok_state); /* Ensure ss_initiate released intrpt_ok_state */
 		csd_copy_ptr = &csa->ss_ctx->ss_shm_ptr->shadow_file_header;
 #		if defined(DEBUG)
@@ -207,7 +210,6 @@ void mu_int_reg(gd_region *reg, boolean_t *return_value)
 			assert(trynum);
 		}
 #		endif
-#		endif
 	}
 	if (USES_ANY_KEY(csd_copy_ptr))
 	{ 	/* Initialize mu_int_encrypt_key_handle to be used in mu_int_read */
diff --git a/sr_port/mu_int_write.c b/sr_port/mu_int_write.c
index efee052..a266e05 100755
--- a/sr_port/mu_int_write.c
+++ b/sr_port/mu_int_write.c
@@ -23,6 +23,7 @@
 #include "gtmcrypt.h"
 #include "min_max.h"
 #include "mupint.h"
+#include "filestruct.h"
 
 GBLREF	sm_uc_ptr_t	reformat_buffer;
 GBLREF	int		reformat_buffer_len;
@@ -37,11 +38,15 @@ GBLREF	mstr		pvt_crypt_buf;
 
 void mu_int_write(block_id blk, uchar_ptr_t ptr)
 {
-	int		in_len, gtmcrypt_errno;
+	int		in_len, orig_write_len, write_len, gtmcrypt_errno;
 	char		*in, *out;
+	sm_uc_ptr_t	write_buff;
 	gd_segment	*seg;
 	file_control	*fc;
+	unix_db_info	*udi;
+	DCL_THREADGBL_ACCESS;
 
+	SETUP_THREADGBL_ACCESS;
 	assert(0 == fast_lock_count);
 	++fast_lock_count;		/* No interrupts across this use of reformat_buffer */
 	/* reformat_buffer_in_use should always be incremented only AFTER incrementing fast_lock_count
@@ -68,8 +73,9 @@ void mu_int_write(block_id blk, uchar_ptr_t ptr)
 	 * since we have practically altered the IV and so the ciphertext would be different as well. If, however, the block is not
 	 * encrypted, we can get away with writing only the header portion. Note that since mu_int_write is called just after
 	 * mu_int_read, the block previously read will be in the OS cache and hence will not cause performance issues due to
-	 * unaligned writes. When the database is not fully upgraded from V4 to V5, we will be writing the entrie block size. This
-	 * is due to the block upgrades between V4 and V5 that can happen in the unencrypted versions of the database.
+	 * unaligned writes. When the database is not fully upgraded from V4 to V5, we will be writing the entire block size. This
+	 * is due to the block upgrades between V4 and V5 that can happen in the unencrypted versions of the database. Also,
+	 * we will write full GDS blocks in case asyncio=ON (i.e. O_DIRECT open) to ensure filesystem-block-size aligned writes.
 	 */
 	in_len = MIN(mu_int_data.blk_size, ((blk_hdr_ptr_t)ptr)->bsiz) - SIZEOF(blk_hdr);
 	/* We disallow the use of TN_RESET when database (re)encryption is in progress. */
@@ -92,14 +98,30 @@ void mu_int_write(block_id blk, uchar_ptr_t ptr)
 			seg = gv_cur_region->dyn.addr;
 			GTMCRYPT_REPORT_ERROR(gtmcrypt_errno, rts_error, seg->fname_len, seg->fname);
 		}
-		fc->op_len = in_len + SIZEOF(blk_hdr);
-		fc->op_buff = (unsigned char *)pvt_crypt_buf.addr;
+		write_len = in_len + SIZEOF(blk_hdr);
+		write_buff = (unsigned char *)pvt_crypt_buf.addr;
 	} else
 	{
-		fc->op_len = mu_int_data.fully_upgraded ? SIZEOF(blk_hdr) : mu_int_data.blk_size;
-		fc->op_buff = ptr;
+		write_len = mu_int_data.fully_upgraded ? SIZEOF(blk_hdr) : mu_int_data.blk_size;
+		write_buff = ptr;
 	}
 	fc->op_pos = mu_int_ovrhd + ((gtm_int64_t)mu_int_data.blk_size / DISK_BLOCK_SIZE * blk);
+	/* Do aligned writes if opened with O_DIRECT */
+	udi = FC2UDI(fc);
+	if (udi->fd_opened_with_o_direct)
+	{	/* We have to write the full GDS block. Get write length including block-header & content. Note "write_len"
+		 * could contain just the block-header length in one case above and so do not use it. Recompute it.
+		 */
+		orig_write_len = in_len + SIZEOF(blk_hdr);
+		write_len = ROUND_UP2(orig_write_len, DIO_ALIGNSIZE(udi));
+		assert(write_len >= orig_write_len);
+		DIO_BUFF_EXPAND_IF_NEEDED(udi, write_len, &(TREF(dio_buff)));
+		memcpy((TREF(dio_buff)).aligned, write_buff, orig_write_len);
+		memset((TREF(dio_buff)).aligned + orig_write_len, 0, write_len - orig_write_len);
+		write_buff = (sm_uc_ptr_t)(TREF(dio_buff)).aligned;
+	}
+	fc->op_len = write_len;
+	fc->op_buff = write_buff;
 	dbfilop(fc);
 	DEBUG_ONLY(reformat_buffer_in_use--;)
 	assert(0 == reformat_buffer_in_use);
diff --git a/sr_port/mu_reorg_upgrd_dwngrd.c b/sr_port/mu_reorg_upgrd_dwngrd.c
index e3ab736..2327129 100755
--- a/sr_port/mu_reorg_upgrd_dwngrd.c
+++ b/sr_port/mu_reorg_upgrd_dwngrd.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2005-2016 Fidelity National Information	*
+ * Copyright (c) 2005-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -122,7 +122,7 @@ void	mu_reorg_upgrd_dwngrd(void)
 	boolean_t		startblk_specified, stopblk_specified, set_fully_upgraded, db_got_to_v5_once, mark_blk_free;
 	cache_rec_ptr_t		cr;
 	char			*bml_lcl_buff = NULL, *command, *reorg_command;
-	sm_uc_ptr_t		bptr = NULL;
+	sm_uc_ptr_t		bptr = NULL, buff;
 	cw_set_element		*cse;
 	enum cdb_sc		cdb_status;
 	enum db_ver		new_db_format, ondsk_blkver;
@@ -141,7 +141,10 @@ void	mu_reorg_upgrd_dwngrd(void)
 	trans_num		curr_tn;
 	unsigned char    	save_cw_set_depth;
 	uint4			lcl_update_trans;
+	unix_db_info		*udi;
+	DCL_THREADGBL_ACCESS;
 
+	SETUP_THREADGBL_ACCESS;
 	region    = (CLI_PRESENT == cli_present("REGION"));
 	upgrade   = (CLI_PRESENT == cli_present("UPGRADE"));
 	downgrade = (CLI_PRESENT == cli_present("DOWNGRADE"));
@@ -170,7 +173,7 @@ void	mu_reorg_upgrd_dwngrd(void)
 	status = SS_NORMAL;
 	error_mupip = FALSE;
 	gvinit();	/* initialize gd_header (needed by the later call to mu_getlst) */
-	mu_getlst("REG_NAME", SIZEOF(tp_region));	/* get the parameter corresponding to REGION qualifier */
+	mu_getlst("REG_NAME", SIZEOF(tp_region)); /* get the parm for the REGION qualifier */
 	if (error_mupip)
 	{
 		util_out_print("!/MUPIP REORG !AD cannot proceed with above errors!/", TRUE, LEN_AND_STR(command));
@@ -304,7 +307,11 @@ void	mu_reorg_upgrd_dwngrd(void)
 		last_bmp  = ROUND_DOWN2(stop_blk - 1, BLKS_PER_LMAP);
 		curblk = start_blk;	/* curblk is the block to be upgraded/downgraded */
 		util_out_print("Region !AD : Started processing from block number [0x!XL]", TRUE, REG_LEN_STR(reg), curblk);
-		if (NULL != bptr)
+		udi = FILE_INFO(reg);
+		if (udi->fd_opened_with_o_direct)
+		{
+			DIO_BUFF_EXPAND_IF_NEEDED(udi, blk_size, &(TREF(dio_buff)));
+		} else if (NULL != bptr)
 		{	/* malloc/free "bptr" for each region as GDS block-size can be different */
 			free(bptr);
 			bptr = NULL;
@@ -365,7 +372,7 @@ void	mu_reorg_upgrd_dwngrd(void)
 			if (NULL == bml_lcl_buff)
 				bml_lcl_buff = malloc(BM_SIZE(BLKS_PER_LMAP));
 			memcpy(bml_lcl_buff, (blk_hdr_ptr_t)bml_sm_buff, BM_SIZE(BLKS_PER_LMAP));
-			if (FALSE == cert_blk(reg, curbmp, (blk_hdr_ptr_t)bml_lcl_buff, 0, FALSE))
+			if (FALSE == cert_blk(reg, curbmp, (blk_hdr_ptr_t)bml_lcl_buff, 0, FALSE, NULL))
 			{	/* certify the block while holding crit as cert_blk uses fields from file-header (shared memory) */
 				assert(FALSE);	/* in pro, skip ugprading/downgarding all blks in this unreliable local bitmap */
 				rel_crit(reg);
@@ -392,7 +399,7 @@ void	mu_reorg_upgrd_dwngrd(void)
 					goto stop_reorg_on_this_reg;	/* goto needed because of nested FOR Loop */
 				}
 				GET_BM_STATUS(bml_lcl_buff, lcnt, bml_status);
-				assert(BLK_MAPINVALID != bml_status); /* cert_blk ran clean so we dont expect invalid entries */
+				assert(BLK_MAPINVALID != bml_status); /* cert_blk ran clean so we don't expect invalid entries */
 				if (BLK_FREE == bml_status)
 				{
 					reorg_stats.blks_skipped_free++;
@@ -403,10 +410,15 @@ void	mu_reorg_upgrd_dwngrd(void)
 				{	/* Do NOT read recycled V4 block from disk unless it is guaranteed NOT to be too full */
 					if (lcnt)
 					{	/* non-bitmap block */
-						/* read in block from disk into private buffer. dont pollute the cache yet */
-						if (NULL == bptr)
-							bptr = (sm_uc_ptr_t)malloc(blk_size);
-						status1 = dsk_read(curblk, bptr, &ondsk_blkver, FALSE);
+						/* read in block from disk into private buffer. don't pollute the cache yet */
+						if (!udi->fd_opened_with_o_direct)
+						{
+							if (NULL == bptr)
+								bptr = (sm_uc_ptr_t)malloc(blk_size);
+							buff = bptr;
+						} else
+							buff = (sm_uc_ptr_t)(TREF(dio_buff)).aligned;
+						status1 = dsk_read(curblk, buff, &ondsk_blkver, FALSE);
 						/* dsk_read on curblk could return an error (DYNUPGRDFAIL) if curblk needs to be
 						 * upgraded and if its block size was too big to allow the extra block-header space
 						 * requirements for a dynamic upgrade. a MUPIP REORG DOWNGRADE should not error out
diff --git a/sr_port/mubclnup.c b/sr_port/mubclnup.c
index a27d77c..cab7428 100755
--- a/sr_port/mubclnup.c
+++ b/sr_port/mubclnup.c
@@ -129,7 +129,7 @@ void mubclnup(backup_reg_list *curr_ptr, clnup_stage stage)
 						UNLINK(ptr->backup_tempfile);
 					}
 				} else	/* defreeze the databases */
-					region_freeze(ptr->reg, FALSE, FALSE, FALSE);
+					region_freeze(ptr->reg, FALSE, FALSE, FALSE, FALSE, FALSE);
 			}
 			ptr = ptr->fPtr;
 		}
diff --git a/sr_port/mucregini.c b/sr_port/mucregini.c
old mode 100755
new mode 100644
index d00c4d3..52473fb
--- a/sr_port/mucregini.c
+++ b/sr_port/mucregini.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information 	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -43,11 +43,27 @@
 #include "wcs_phase2_commit_wait.h"
 
 #define WCR_SIZE_PER_BUF 	0
-#define BLK_SIZE (((gd_segment*)gv_cur_region->dyn.addr)->blk_size)
+
+#define PUTMSG_WARN_CSA(MSGPARMS)			\
+MBSTART {						\
+	if (IS_MUPIP_IMAGE)				\
+		gtm_putmsg_csa MSGPARMS;		\
+	else						\
+		send_msg_csa MSGPARMS;			\
+} MBEND
+
+#define PUTMSG_ERROR_CSA(MSGPARMS)			\
+MBSTART {						\
+	if (IS_MUPIP_IMAGE)				\
+		gtm_putmsg_csa MSGPARMS;		\
+	else						\
+		rts_error_csa MSGPARMS;			\
+} MBEND
 
 GBLREF 	gd_region		*gv_cur_region;
 GBLREF 	sgmnt_data_ptr_t	cs_data;
 GBLREF 	sgmnt_addrs		*cs_addrs;
+GBLREF	void			(*mupip_exit_fp)(int4 errnum);
 
 error_def(ERR_COLLATIONUNDEF);
 error_def(ERR_COLLTYPVERSION);
@@ -67,207 +83,209 @@ void mucregini(int4 blk_init_size)
 	uint4			ustatus, reg_autoswitch;
 	mstr 			jnlfile, jnldef, tmpjnlfile;
 	time_t			ctime;
+	gd_region		*baseDBreg;
+	gd_segment		*seg;
+	sgmnt_data_ptr_t	csd;
 
-	MEMCPY_LIT(cs_data->label, GDS_LABEL);
-	cs_data->desired_db_format = GDSVCURR;
-	cs_data->fully_upgraded = TRUE;
-	cs_data->db_got_to_v5_once = TRUE;	/* no V4 format blocks that are non-upgradeable */
-	cs_data->minor_dbver = GDSMVCURR;
-	cs_data->certified_for_upgrade_to = GDSVCURR;
-	cs_data->creation_db_ver = GDSVCURR;
-	cs_data->creation_mdb_ver = GDSMVCURR;
-	cs_data->master_map_len = MASTER_MAP_SIZE_DFLT;
-	cs_data->bplmap = BLKS_PER_LMAP;
-	assert(BLK_SIZE <= MAX_DB_BLK_SIZE);
-	cs_data->blk_size = BLK_SIZE;
-	i = cs_data->trans_hist.total_blks;
-	cs_data->trans_hist.free_blocks = i - DIVIDE_ROUND_UP(i, BLKS_PER_LMAP) - 2;
-	cs_data->max_rec_size = gv_cur_region->max_rec_size;
-	cs_data->max_key_size = gv_cur_region->max_key_size;
-	cs_data->null_subs = gv_cur_region->null_subs;
-	cs_data->std_null_coll = gv_cur_region->std_null_coll;
-#ifdef UNIX
-	cs_data->freeze_on_fail = gv_cur_region->freeze_on_fail;
-	cs_data->mumps_can_bypass = gv_cur_region->mumps_can_bypass;
-	cs_data->epoch_taper = gv_cur_region->epoch_taper;
-	cs_data->epoch_taper_time_pct = EPOCH_TAPER_TIME_PCT_DEFAULT;
-	cs_data->epoch_taper_jnl_pct = EPOCH_TAPER_JNL_PCT_DEFAULT;
-#endif
-	cs_data->reserved_bytes = gv_cur_region->dyn.addr->reserved_bytes;
-	cs_data->clustered = FALSE;
-	cs_data->file_corrupt = 0;
-	if (gv_cur_region->dyn.addr->lock_space)
-		cs_data->lock_space_size = gv_cur_region->dyn.addr->lock_space * OS_PAGELET_SIZE;
+	csd = cs_data;
+	MEMCPY_LIT(csd->label, GDS_LABEL);
+	csd->desired_db_format = GDSVCURR;
+	csd->fully_upgraded = TRUE;
+	csd->db_got_to_v5_once = TRUE;	/* no V4 format blocks that are non-upgradeable */
+	csd->minor_dbver = GDSMVCURR;
+	csd->certified_for_upgrade_to = GDSVCURR;
+	csd->creation_db_ver = GDSVCURR;
+	csd->creation_mdb_ver = GDSMVCURR;
+	csd->master_map_len = MASTER_MAP_SIZE_DFLT;
+	csd->bplmap = BLKS_PER_LMAP;
+	seg = gv_cur_region->dyn.addr;
+	assert(seg->blk_size <= MAX_DB_BLK_SIZE);
+	csd->blk_size = seg->blk_size;
+	i = csd->trans_hist.total_blks;
+	csd->trans_hist.free_blocks = i - DIVIDE_ROUND_UP(i, BLKS_PER_LMAP) - 2;
+	csd->max_rec_size = gv_cur_region->max_rec_size;
+	csd->max_key_size = gv_cur_region->max_key_size;
+	csd->null_subs = gv_cur_region->null_subs;
+	csd->std_null_coll = gv_cur_region->std_null_coll;
+	csd->freeze_on_fail = gv_cur_region->freeze_on_fail;
+	csd->mumps_can_bypass = gv_cur_region->mumps_can_bypass;
+	csd->epoch_taper = gv_cur_region->epoch_taper;
+	csd->epoch_taper_time_pct = EPOCH_TAPER_TIME_PCT_DEFAULT;
+	csd->epoch_taper_jnl_pct = EPOCH_TAPER_JNL_PCT_DEFAULT;
+	csd->asyncio = IS_AIO_ON_SEG(seg);
+	csd->reserved_bytes = seg->reserved_bytes;
+	csd->clustered = FALSE;
+	csd->lock_crit_with_db = gv_cur_region->lock_crit_with_db;
+	csd->file_corrupt = 0;
+	if (seg->lock_space)
+		csd->lock_space_size = seg->lock_space * OS_PAGELET_SIZE;
 	else
-		cs_data->lock_space_size = DEF_LOCK_SIZE;
-	cs_data->staleness[0] = -300000000;	/* staleness timer = 30 seconds */
-	cs_data->staleness[1] = -1;
-	cs_data->ccp_quantum_interval[0] = -20000000;	/* 2 sec */
-	cs_data->ccp_quantum_interval[1] = -1;
-	cs_data->ccp_response_interval[0] = -600000000;	/* 1 min */
-	cs_data->ccp_response_interval[1] = -1;
-	cs_data->ccp_tick_interval[0] = -1000000;	/* 1/10 sec */
-	cs_data->ccp_tick_interval[1] = -1;
-	cs_data->last_com_backup = 1;
-	cs_data->last_inc_backup = 1;
-	cs_data->last_rec_backup = 1;
-	cs_data->defer_time = gv_cur_region->dyn.addr->defer_time;
-	cs_data->jnl_alq = gv_cur_region->jnl_alq;
-	if (cs_data->jnl_state && !cs_data->jnl_alq)
-		cs_data->jnl_alq = JNL_ALLOC_DEF;
-	cs_data->jnl_deq = gv_cur_region->jnl_deq;
-	cs_data->jnl_before_image = gv_cur_region->jnl_before_image;
-	cs_data->jnl_state = gv_cur_region->jnl_state;
-	cs_data->epoch_interval = JNL_ALLOWED(cs_data) ? DEFAULT_EPOCH_INTERVAL : 0;
-	cs_data->alignsize = JNL_ALLOWED(cs_data) ? (DISK_BLOCK_SIZE * JNL_DEF_ALIGNSIZE) : 0;
-	ROUND_UP_JNL_BUFF_SIZE(cs_data->jnl_buffer_size, gv_cur_region->jnl_buffer_size, cs_data);
-#ifdef UNIX
-	if (JNL_ALLOWED(cs_data))
+		csd->lock_space_size = DEF_LOCK_SIZE;
+	csd->staleness[0] = -300000000;	/* staleness timer = 30 seconds */
+	csd->staleness[1] = -1;
+	csd->ccp_quantum_interval[0] = -20000000;	/* 2 sec */
+	csd->ccp_quantum_interval[1] = -1;
+	csd->ccp_response_interval[0] = -600000000;	/* 1 min */
+	csd->ccp_response_interval[1] = -1;
+	csd->ccp_tick_interval[0] = -1000000;	/* 1/10 sec */
+	csd->ccp_tick_interval[1] = -1;
+	csd->last_com_backup = 1;
+	csd->last_inc_backup = 1;
+	csd->last_rec_backup = 1;
+	csd->defer_time = seg->defer_time;
+	csd->jnl_alq = gv_cur_region->jnl_alq;
+	if (csd->jnl_state && !csd->jnl_alq)
+		csd->jnl_alq = JNL_ALLOC_DEF;
+	csd->jnl_deq = gv_cur_region->jnl_deq;
+	csd->jnl_before_image = gv_cur_region->jnl_before_image;
+	csd->jnl_state = gv_cur_region->jnl_state;
+	csd->epoch_interval = JNL_ALLOWED(csd) ? DEFAULT_EPOCH_INTERVAL : 0;
+	csd->alignsize = JNL_ALLOWED(csd) ? (DISK_BLOCK_SIZE * JNL_DEF_ALIGNSIZE) : 0;
+	ROUND_UP_JNL_BUFF_SIZE(csd->jnl_buffer_size, gv_cur_region->jnl_buffer_size, csd);
+	if (JNL_ALLOWED(csd))
 	{
 		reg_autoswitch = gv_cur_region->jnl_autoswitchlimit;
-		if (cs_data->jnl_alq + cs_data->jnl_deq > reg_autoswitch)
+		if (csd->jnl_alq + csd->jnl_deq > reg_autoswitch)
 		{
-			gtm_putmsg_csa(CSA_ARG(cs_addrs) VARLSTCNT(8) ERR_JNLALLOCGROW, 6, cs_data->jnl_alq,
-					gv_cur_region->jnl_autoswitchlimit, "database file", DB_LEN_STR(gv_cur_region));
-			cs_data->autoswitchlimit = reg_autoswitch;
-			cs_data->jnl_alq = cs_data->autoswitchlimit;
+			PUTMSG_WARN_CSA((CSA_ARG(cs_addrs) VARLSTCNT(8) ERR_JNLALLOCGROW, 6, csd->jnl_alq,
+					 gv_cur_region->jnl_autoswitchlimit, "database file", DB_LEN_STR(gv_cur_region)));
+			csd->autoswitchlimit = reg_autoswitch;
+			csd->jnl_alq = csd->autoswitchlimit;
 		} else
 		{
-			cs_data->autoswitchlimit = ALIGNED_ROUND_DOWN(reg_autoswitch, cs_data->jnl_alq, cs_data->jnl_deq);
+			csd->autoswitchlimit = ALIGNED_ROUND_DOWN(reg_autoswitch, csd->jnl_alq, csd->jnl_deq);
 			/* If rounding down took us to less than the minimum autoswitch, then bump allocation to be
 			 * equal to the pre-round-down autoswitchlimit this way all values are above their respective
 			 * minimums. Note that the extension can be an arbitrary value because alloc == autoswitch.
 			 */
-			if (JNL_AUTOSWITCHLIMIT_MIN > cs_data->autoswitchlimit)
+			if (JNL_AUTOSWITCHLIMIT_MIN > csd->autoswitchlimit)
 			{
-				gtm_putmsg_csa(CSA_ARG(cs_addrs) VARLSTCNT(8) ERR_JNLALLOCGROW, 6, cs_data->jnl_alq,
-						reg_autoswitch, "database file", DB_LEN_STR(gv_cur_region));
-				cs_data->jnl_alq = reg_autoswitch;
-				cs_data->autoswitchlimit = reg_autoswitch;
+				PUTMSG_WARN_CSA((CSA_ARG(cs_addrs) VARLSTCNT(8) ERR_JNLALLOCGROW, 6, csd->jnl_alq,
+						 reg_autoswitch, "database file", DB_LEN_STR(gv_cur_region)));
+				csd->jnl_alq = reg_autoswitch;
+				csd->autoswitchlimit = reg_autoswitch;
 			}
 		}
 	} else
-		cs_data->autoswitchlimit = 0;
+		csd->autoswitchlimit = 0;
 	assert(!(MAX_IO_BLOCK_SIZE % DISK_BLOCK_SIZE));
-	if (cs_data->jnl_alq + cs_data->jnl_deq > cs_data->autoswitchlimit)
-		cs_data->jnl_alq = cs_data->autoswitchlimit;
-#else
-	cs_data->autoswitchlimit = JNL_ALLOWED(cs_data) ? ALIGNED_ROUND_DOWN(JNL_ALLOC_MAX, cs_data->jnl_alq, cs_data->jnl_deq) : 0;
-#endif
-	if (!cs_data->jnl_buffer_size)
-		ROUND_UP_JNL_BUFF_SIZE(cs_data->jnl_buffer_size, JNL_BUFFER_DEF, cs_data);
-	if (JNL_ALLOWED(cs_data))
-		if (cs_data->jnl_buffer_size < JNL_BUFF_PORT_MIN(cs_data))
+	if (csd->jnl_alq + csd->jnl_deq > csd->autoswitchlimit)
+		csd->jnl_alq = csd->autoswitchlimit;
+	if (!csd->jnl_buffer_size)
+		ROUND_UP_JNL_BUFF_SIZE(csd->jnl_buffer_size, JNL_BUFFER_DEF, csd);
+	if (JNL_ALLOWED(csd))
+		if (csd->jnl_buffer_size < JNL_BUFF_PORT_MIN(csd))
 		{
-			ROUND_UP_MIN_JNL_BUFF_SIZE(cs_data->jnl_buffer_size, cs_data);
-		} else if (cs_data->jnl_buffer_size > JNL_BUFFER_MAX)
+			ROUND_UP_MIN_JNL_BUFF_SIZE(csd->jnl_buffer_size, csd);
+		} else if (csd->jnl_buffer_size > JNL_BUFFER_MAX)
 		{
-			ROUND_DOWN_MAX_JNL_BUFF_SIZE(cs_data->jnl_buffer_size, cs_data);
+			ROUND_DOWN_MAX_JNL_BUFF_SIZE(csd->jnl_buffer_size, csd);
 		}
-	cs_data->def_coll = gv_cur_region->def_coll;
-	if (cs_data->def_coll)
+	csd->def_coll = gv_cur_region->def_coll;
+	if (csd->def_coll)
 	{
-		if (csp = ready_collseq((int)(cs_data->def_coll)))
+		if (csp = ready_collseq((int)(csd->def_coll)))
 		{
-			cs_data->def_coll_ver = (csp->version)(cs_data->def_coll);
-			if (!do_verify(csp, cs_data->def_coll, cs_data->def_coll_ver))
+			csd->def_coll_ver = (csp->version)(csd->def_coll);
+			if (!do_verify(csp, csd->def_coll, csd->def_coll_ver))
 			{
-				gtm_putmsg_csa(CSA_ARG(cs_addrs)
-					VARLSTCNT(4) ERR_COLLTYPVERSION, 2, cs_data->def_coll, cs_data->def_coll_ver);
-				mupip_exit(ERR_MUNOACTION);
+				PUTMSG_ERROR_CSA((CSA_ARG(cs_addrs)
+						  VARLSTCNT(4) ERR_COLLTYPVERSION, 2, csd->def_coll, csd->def_coll_ver));
+				assert(IS_MUPIP_IMAGE);
+				(*mupip_exit_fp)(ERR_MUNOACTION);
 			}
 		} else
 		{
-			gtm_putmsg_csa(CSA_ARG(cs_addrs) VARLSTCNT(3) ERR_COLLATIONUNDEF, 1, cs_data->def_coll);
-			mupip_exit(ERR_MUNOACTION);
+			PUTMSG_ERROR_CSA((CSA_ARG(cs_addrs) VARLSTCNT(3) ERR_COLLATIONUNDEF, 1, csd->def_coll));
+			assert(IS_MUPIP_IMAGE);
+			(*mupip_exit_fp)(ERR_MUNOACTION);
 		}
 	}
-	/* mupip_set_journal() relies on cs_data->jnl_file_len being 0 if cs_data->jnl_state is jnl_notallowed.
+	/* mupip_set_journal() relies on csd->jnl_file_len being 0 if csd->jnl_state is jnl_notallowed.
 	 * Note that even though gv_cur_region->jnl_state is jnl_notallowed, gv_cur_region->jnl_file_len can be non-zero
 	 */
-	cs_data->jnl_file_len = JNL_ALLOWED(cs_data) ? gv_cur_region->jnl_file_len : 0;
-	cs_data->reg_seqno = 1;
-	VMS_ONLY(
-		cs_data->resync_seqno = 1;
-		cs_data->old_resync_seqno = 1;
-		cs_data->resync_tn = 1;
-	)
-	UNIX_ONLY(
-		/* zqgblmod_seqno is initialized to 0 at db creation time (to ensure that $ZQGBLMOD will unconditionally return
-		 * the safe value of TRUE by default). This default value of 0 is also relied upon by the source server logic
-		 * when updating this as part of a fetchresync rollback. Initialize zqgblmod_tn to 0 to correspond to the seqno.
-		 */
-		cs_data->zqgblmod_seqno = 0;
-		cs_data->zqgblmod_tn = 0;
-		assert(!cs_data->multi_site_open);
-		cs_data->multi_site_open = TRUE;
-	)
-	cs_data->repl_state = repl_closed;              /* default */
-	if (cs_data->jnl_file_len)
+	csd->jnl_file_len = JNL_ALLOWED(csd) ? gv_cur_region->jnl_file_len : 0;
+	csd->reg_seqno = 1;
+	/* zqgblmod_seqno is initialized to 0 at db creation time (to ensure that $ZQGBLMOD will unconditionally return
+	 * the safe value of TRUE by default). This default value of 0 is also relied upon by the source server logic
+	 * when updating this as part of a fetchresync rollback. Initialize zqgblmod_tn to 0 to correspond to the seqno.
+	 */
+	csd->zqgblmod_seqno = 0;
+	csd->zqgblmod_tn = 0;
+	assert(!csd->multi_site_open);
+	csd->multi_site_open = TRUE;
+	csd->repl_state = repl_closed;              /* default */
+	if (csd->jnl_file_len)
 	{
-		tmpjnlfile.addr = (char *)cs_data->jnl_file_name;
-		tmpjnlfile.len = SIZEOF(cs_data->jnl_file_name);
+		tmpjnlfile.addr = (char *)csd->jnl_file_name;
+		tmpjnlfile.len = SIZEOF(csd->jnl_file_name);
 		jnlfile.addr = (char *)gv_cur_region->jnl_file_name;
 		jnlfile.len = gv_cur_region->jnl_file_len;
 		jnldef.addr = JNL_EXT_DEF;
 		jnldef.len = SIZEOF(JNL_EXT_DEF) - 1;
 		if (FILE_STAT_ERROR == gtm_file_stat(&jnlfile, &jnldef, &tmpjnlfile, TRUE, &ustatus))
 		{
-			gtm_putmsg_csa(CSA_ARG(cs_addrs) VARLSTCNT(5) ERR_FILEPARSE, 2, JNL_LEN_STR(gv_cur_region), ustatus);
-			mupip_exit(ERR_MUNOACTION);
+			PUTMSG_ERROR_CSA((CSA_ARG(cs_addrs) VARLSTCNT(5) ERR_FILEPARSE, 2, JNL_LEN_STR(gv_cur_region), ustatus));
+			assert(IS_MUPIP_IMAGE);
+			(*mupip_exit_fp)(ERR_MUNOACTION);
 		}
-		cs_data->jnl_file_len = tmpjnlfile.len;
+		csd->jnl_file_len = tmpjnlfile.len;
 	}
-	cs_data->reserved_for_upd = UPD_RESERVED_AREA;
-	cs_data->avg_blks_per_100gbl =  AVG_BLKS_PER_100_GBL;
-	cs_data->pre_read_trigger_factor = PRE_READ_TRIGGER_FACTOR;
-	cs_data->writer_trigger_factor = UPD_WRITER_TRIGGER_FACTOR;
-	cs_data->db_trigger_cycle = 0;
-	cs_addrs->hdr = cs_data;
-	cs_addrs->ti = &cs_data->trans_hist;
+	csd->reserved_for_upd = UPD_RESERVED_AREA;
+	csd->avg_blks_per_100gbl =  AVG_BLKS_PER_100_GBL;
+	csd->pre_read_trigger_factor = PRE_READ_TRIGGER_FACTOR;
+	csd->writer_trigger_factor = UPD_WRITER_TRIGGER_FACTOR;
+	csd->db_trigger_cycle = 0;
+	cs_addrs->hdr = csd;
+	cs_addrs->ti = &csd->trans_hist;
 	th = cs_addrs->ti;
 	th->lock_sequence = 0;
 	th->ccp_jnl_filesize = 0;
-	cs_data->max_bts = GTM64_ONLY(GTM64_WC_MAX_BUFFS) NON_GTM64_ONLY(WC_MAX_BUFFS);
-	cs_data->n_bts = BT_FACTOR(gv_cur_region->dyn.addr->global_buffers);
-	cs_data->bt_buckets = getprime(cs_data->n_bts);
+	csd->max_bts = GTM64_ONLY(GTM64_WC_MAX_BUFFS) NON_GTM64_ONLY(WC_MAX_BUFFS);
+	csd->n_bts = BT_FACTOR(seg->global_buffers);
+	csd->bt_buckets = getprime(csd->n_bts);
 
-	cs_data->n_wrt_per_flu = 7;
-	cs_data->flush_trigger = FLUSH_FACTOR(cs_data->n_bts);
+	csd->n_wrt_per_flu = 7;
+	csd->flush_trigger = FLUSH_FACTOR(csd->n_bts);
 
-	cs_data->max_update_array_size = cs_data->max_non_bm_update_array_size
-				       = (int4)ROUND_UP2(MAX_NON_BITMAP_UPDATE_ARRAY_SIZE(cs_data), UPDATE_ARRAY_ALIGN_SIZE);
-	cs_data->max_update_array_size += (int4)ROUND_UP2(MAX_BITMAP_UPDATE_ARRAY_SIZE, UPDATE_ARRAY_ALIGN_SIZE);
+	csd->max_update_array_size = csd->max_non_bm_update_array_size
+				       = (int4)ROUND_UP2(MAX_NON_BITMAP_UPDATE_ARRAY_SIZE(csd), UPDATE_ARRAY_ALIGN_SIZE);
+	csd->max_update_array_size += (int4)ROUND_UP2(MAX_BITMAP_UPDATE_ARRAY_SIZE, UPDATE_ARRAY_ALIGN_SIZE);
 	/* bt_malloc(cs_addrs) Done by db_init at file open time -- not needed here */
 	if (dba_bg == REG_ACC_METH(gv_cur_region))
-		cs_data->flush_time[0] = TIM_FLU_MOD_BG;
+		csd->flush_time[0] = TIM_FLU_MOD_BG;
 	else
-		cs_data->flush_time[0] = TIM_FLU_MOD_MM;
-	cs_data->flush_time[1] = -1;
-	cs_data->yield_lmt = DEFAULT_YIELD_LIMIT;
-	cs_data->mutex_spin_parms.mutex_hard_spin_count = MUTEX_HARD_SPIN_COUNT;
-	cs_data->mutex_spin_parms.mutex_sleep_spin_count = MUTEX_SLEEP_SPIN_COUNT;
-	cs_data->mutex_spin_parms.mutex_spin_sleep_mask = MUTEX_SPIN_SLEEP_MASK;
-	NUM_CRIT_ENTRY(cs_data) = gv_cur_region->dyn.addr->mutex_slots;
-	cs_data->wcs_phase2_commit_wait_spincnt = WCS_PHASE2_COMMIT_DEFAULT_SPINCNT;
-#	if defined(__sun) || defined(__hpux)
-	/* There is no falloc on those platforms so we silently ignore the gld setting */
-	cs_data->defer_allocate = gv_cur_region->dyn.addr->defer_allocate = TRUE;
-#	else
-	cs_data->defer_allocate = gv_cur_region->dyn.addr->defer_allocate;
-#	endif
+		csd->flush_time[0] = TIM_FLU_MOD_MM;
+	csd->flush_time[1] = -1;
+	csd->yield_lmt = DEFAULT_YIELD_LIMIT;
+	csd->mutex_spin_parms.mutex_hard_spin_count = MUTEX_HARD_SPIN_COUNT;
+	csd->mutex_spin_parms.mutex_sleep_spin_count = MUTEX_SLEEP_SPIN_COUNT;
+	csd->mutex_spin_parms.mutex_spin_sleep_mask = MUTEX_SPIN_SLEEP_MASK;
+	NUM_CRIT_ENTRY(csd) = seg->mutex_slots;
+	csd->wcs_phase2_commit_wait_spincnt = WCS_PHASE2_COMMIT_DEFAULT_SPINCNT;
+	csd->defer_allocate = seg->defer_allocate;
 	time(&ctime);
 	assert(SIZEOF(ctime) >= SIZEOF(int4));
-	cs_data->creation_time4 = (int4)ctime;	/* Need only lower order 4-bytes of current time (in case system time is 8-bytes) */
-	cs_addrs->bmm = MM_ADDR(cs_data);
+	csd->creation_time4 = (int4)ctime;	/* Need only lower order 4-bytes of current time (in case system time is 8-bytes) */
+	if (IS_STATSDB_REG(gv_cur_region))
+	{	/* Copy basedb fname into statsdb file header (needed by MUPIP RUNDOWN -FILE statsdb-file-name) */
+		STATSDBREG_TO_BASEDBREG(gv_cur_region, baseDBreg);
+		COPY_BASEDB_FNAME_INTO_STATSDB_HDR(gv_cur_region, baseDBreg, csd);
+		/* Assert that we never create a statsdb with NOSTATS in corresponding baseDB */
+		assert(baseDBreg->open);
+		assert(!(RDBF_NOSTATS & baseDBreg->reservedDBFlags));
+	}
+	csd->reservedDBFlags = gv_cur_region->reservedDBFlags;
+	cs_addrs->bmm = MM_ADDR(csd);
 	bmm_init();
-	for (i = 0; i < blk_init_size ; i += cs_data->bplmap)
+	for (i = 0; i < blk_init_size ; i += csd->bplmap)
 	{
 		status = bml_init(i);
 		if (status != SS_NORMAL)
 		{
-			gtm_putmsg_csa(CSA_ARG(cs_addrs) VARLSTCNT(5) ERR_DBFILERR, 2, DB_LEN_STR(gv_cur_region), status);
-			mupip_exit(ERR_MUNOACTION);
+			PUTMSG_ERROR_CSA((CSA_ARG(cs_addrs) VARLSTCNT(5) ERR_DBFILERR, 2, DB_LEN_STR(gv_cur_region), status));
+			assert(IS_MUPIP_IMAGE);
+			(*mupip_exit_fp)(ERR_MUNOACTION);
 		}
 	}
 	mucblkini();
@@ -277,7 +295,7 @@ void mucregini(int4 blk_init_size)
 				 * this is because the macro relies on max_tn/max_tn_warn being set and that does not happen
 				 * until a few lines later. hence keeping it simple here by doing a plain assignment of curr_tn.
 				 */
-	cs_data->max_tn = MAX_TN_V6;
-	SET_TN_WARN(cs_data, cs_data->max_tn_warn);
-	SET_LATCH_GLOBAL(&cs_data->next_upgrd_warn.time_latch, LOCK_AVAILABLE);
+	csd->max_tn = MAX_TN_V6;
+	SET_TN_WARN(csd, csd->max_tn_warn);
+	SET_LATCH_GLOBAL(&csd->next_upgrd_warn.time_latch, LOCK_AVAILABLE);
 }
diff --git a/sr_port/mumps.hlp b/sr_port/mumps.hlp
index 980fe47..4b03711 100755
--- a/sr_port/mumps.hlp
+++ b/sr_port/mumps.hlp
@@ -114,7 +114,7 @@
 2 Copyright
    Copyright
 
-   Copyright 1987 - 2003, 2013 - 2016
+   Copyright 1987 - 2003, 2013 - 2017
 
    Fidelity Information Services, Inc. All rights reserved.
 
@@ -911,7 +911,7 @@
    |------------------------+-----------------------------------------------|
    |                        | The $ZPIECE() function returns a sequence of  |
    |                        | bytes delimited by a specified byte sequence  |
-   | $ZPiece()              | made up of one or more bytes. In M, $ZPIECE() |
+   | $ZPIece()              | made up of one or more bytes. In M, $ZPIECE() |
    |                        | typically returns a logical field from a      |
    |                        | logical record.                               |
    |------------------------+-----------------------------------------------|
@@ -2454,6 +2454,11 @@
    # binary operator for modulo, that is, causes M to produce the remainder
    from integer division of the first argument by the second.
 
+   Because of the practice of using it to intentionally induce an error, GT.M
+   does not produce a DIVZERO error at compile time, only at run time, for
+   divide or integer divide by a literal expression that evaluates to zero
+   (0).
+
    Remember that precedence is left to right for all arithmetic operators.
 
    Example:
@@ -2857,7 +2862,10 @@
    commands except commands that themselves have a conditional aspect accept
    a command postconditional. Among the M standard commands, ELSE, FOR, and
    IF do not accept command postconditionals. All the GT.M command extensions
-   accept command postconditionals.
+   accept command postconditionals. When a postconditional evaluates to a
+   literal FALSE (0), GT.M discards the command and its arguments at compile
+   time, which means it does not perform any validity checking on the
+   arguments.
 
 4 Argument_Postconditionals
    Argument Postconditionals
@@ -3116,7 +3124,7 @@
 
    Example:
 
-   GTM>SET from="B",to="^A(15),x=""
+   GTM>SET from="B",to="^A(15)",x=""
    GTM>FOR SET x=$O(@from@(x)) Q:x="" S @to@(x)=@from@(x)
 
    This example uses name indirection to copy the level contents of a local
@@ -3579,6 +3587,40 @@
     SET ^ID(NEXT)=RECORD,^XID(ZIP,NEXT)=""
     TCOMMIT
 
+     * pvtmods - Is always less than or equal to blkmods. This means it can
+       be 1 only if "blkmods" is also 1. If it is 1, it means that process P1
+       was planning to UPDATE (not just READ) the block number (indicated as
+       "blk: ..." in the TPRESTART message) as part of its TP transaction.
+     * blkmods - Is either 1 or 0. 1 implies the transaction restarted
+       because this process (P1) is attempting to READ/UPDATE a block that
+       has concurrently been updated by another process (P2) since P1 access
+       the block as part of its TP transaction. This means the "code: ..."
+       output in the TPRESTART message will have L as the last letter. 0
+       implies the restart occurred because of a different reason. The "code:
+       ..." then has something other than "L" as the last letter. Note that
+       each letter in "code: ..." corresponds to the failure code in each
+       try/retry in the order of occurrence.
+     * blklvl - Is the level in the GDS structure of the block ("blk: ..."
+       field in the TPRESTART message) that caused the TP restart.
+     * type - A value of 0,1,2,4 shows the restart occurred in the TP
+       transaction BEFORE executing TCOMMIT; whether it is a 0 or 1 or 2 or 4
+       should not matter to the user. These values would typically be used
+       for debugging by Fidelity. A value of 3 shows the restart occurred at
+       TCOMMIT time.
+     * readset - The number of GDS blocks that accessed as part of this TP
+       transaction in the region containing the global ("glbl: ..." in the
+       TPRESTART message).
+     * writeset - Out of the readset number, the number of GDS blocks this
+       process was attempted to UPDATE as part of this TP transaction in the
+       region containing the global ("glbl: ..." in the TPRESTART message).
+     * local_tn - This is a never-decreasing counter (starting at 1 at
+       process startup) incremented for every new TP transaction, TP restart,
+       and TP rollback. Two TPRESTART messages by the same process should
+       never have the same value of local_tn. The difference between the
+       local_tn values of two messages from the same process indicates the
+       number of TP transactions done by that process in the time interval
+       between the two messages.
+
 1 Commands
    Commands
 
@@ -3925,7 +3967,10 @@
    the line. When IF has an argument, it updates $TEST with the truth value
    of its evaluated argument. GT.M executes the remainder of a line after an
    IF statement when $TEST is 1 (TRUE). When $TEST is 0 (FALSE), GT.M does
-   not execute the rest of the line.
+   not execute the rest of the line. When the IF argument evaluates to a
+   literal FALSE (0), GT.M discards the command and its arguments at compile
+   time, which means it does not perform any validity checking on the
+   remainder of the line.
 
    The format of the IF command is:
 
@@ -3940,9 +3985,12 @@
    An IF with more than one argument behaves as if those arguments were
    logically "ANDed." However, execution of the line ceases with the
    evaluation of the first false argument. For IF argument expressions
-   containing the "AND" operator (&), execution still ceases with the
-   evaluation of the first false argument. Any global references within the
-   expression act in sequence to maintain the naked reference.
+   containing the "AND" operator (&), by default, execution still ceases with
+   the evaluation of the first false argument, however any global references
+   within the expression act in sequence to maintain the naked reference. The
+   "FULL_BOOLEAN" and "SIDE_EFFECTS" compiler settings modify this behavior
+   if you desire GT.M to provide side effects it would otherwise bypass due
+   to short-circiuting of Boolean expressions.
 
 3 Examples
    Examples
@@ -5218,6 +5266,29 @@
    particularly useful for long running processes which would periodically
    like to restart the counting without requiring a shut down and restart.
 
+4 [NO]STATSHARE
+   [NO]STATSHARE
+
+   Opt in or out of sharing process statistics for monitoring by other
+   processes.
+
+   GT.M provides a fast and efficient mechanism for processes to share their
+   database access statistics for other processes to monitor. Processes opt
+   in or out with the VIEW "[NO]STATSHARE" command, defaulting to VIEW
+   "NOSTATSHARE". At process startup, a value of 1, or any case-independent
+   string or leading substrings of "TRUE" or "YES" in the environment
+   variable gtm_statshare provides an initial setting of VIEW "STATSHARE".
+   When a process changes whether it is opting in or out, there is no change
+   to the output of a ZSHOW "G" within that process. GT.M does not permit
+   this form of the VIEW command within a TP transaction. Monitoring the
+   statistics of other processes does not require opting-in.
+
+   Processes opted-in place their statistics as binary data in database files
+   located in the directory specified by the gtm_statsdir environment
+   variable. All processes that share statistics MUST use the same value for
+   $gtm_statsdir. The ^%YGBLSTAT utility program gathers and reports
+   statistics.
+
 4 STP_GCOL
    STP_GCOL
 
@@ -6651,6 +6722,29 @@
    DEX : # of times a process extends the database file
    [NT]B[WR] mnemonics are satisfied by either disk access or, for databases that use the BG (buffered global) access method, global buffers in shared memory.
    ZTR : # of ZTRIGGER command operations
+   DFL : # of Database FLushes
+   DFS : # of Database FSyncs
+   JFL : # of Journal FLushes
+   JFS : # of Journal FSyncs
+   JBB : # of Bytes written to Journal Buffer
+   JFB : # of Bytes written to Journal File
+   JFW : # of Journal File Writes
+   JRL : # of Logical Journal Records
+   JRP : # of Pblk Journal Records
+   JRE : # of Regular Epoch Journal Records
+   JRI : # of Idle epoch Journal Records
+   JRO : # of Other Journal Records
+   JEX : # of Journal file EXtensions
+   DEX : # of Database file EXtensions
+   CAT : # of crit acquired total successes
+   CFE : # of attempts in CFT caused by epochs
+   CFS : sum of squares grab crit failed
+   CFT : # of grab crit failures
+   CQS : sum of squares grab crit queued sleeps
+   CQT : # of grab crit queued sleeps
+   CYS : sum of squares grab crit yields
+   CYT : # of grab crit yields
+   BTD : # of Block Transitions to Dirty
 
    When $PRINCIPAL input and output are different devices, ZSHOW "D" shows
    them as separate items identified as 0 for input and 0-out for output.
@@ -6705,14 +6799,16 @@
 
    GLD:*,REG:*,SET:205,KIL:0,GET:1,DTA:0,ORD:0,ZPR:0,QRY:0,LKS:0,LKF:0,CTN:0,DRD:9,DWT:15,
    NTW:203,NTR:4,NBW:212,NBR:414,NR0:0,NR1:0,NR2:0,NR3:0,TTW:1,TTR:0,TRB:0,TBW:2,TBR:6,
-   TR0:0,TR1:0,TR2:0,TR3:0,TR4:0,TC0:0,TC1:0,TC2:0,TC3:0,TC4:0
+   TR0:0,TR1:0,TR2:0,TR3:0,TR4:0,TC0:0,TC1:0,TC2:0,TC3:0,TC4:0,ZTR:0,DFL:0,DFS:0,JFL:0,JFS:0,JBB:0,JFB:0,JFW:0,JRL:0,JRP:0,
+   JRE:0,JRI:0,JRO:0,JEX:0,DEX:0,CAT:4,CFE:0,CFS:0,CFT:0,CQS:0,CQT:0,CYS:0,CYT:0,BTD:0
    GLD:/home/gtmuser1/.fis-gtm/V5.4-002B_x86/g/mumps.gld,REG:DEFAULT,SET:205,KIL:0,GET:1,
    DTA:0,ORD:0,ZPR:0,QRY:0,LKS:0,LKF:0,CTN:411,DRD:9,DWT:15,NTW:2
    03,NTR:4,NBW:212,NBR:414,NR0:0,NR1:0,NR2:0,NR3:0,TTW:1,TTR:0,TRB:0,TBW:2,TBR:6,TR0:0,
    TR1:0,TR2:0,TR3:0,TR4:0,TC0:0,TC1:0,TC2:0,TC3:0,TC4:0
    GLD:/tmp/tst/test.gld,REG:DEFAULT,SET:205,KIL:0,GET:1,DTA:0,ORD:0,ZPR:0,QRY:0,LKS:0,LKF:0,
    CTN:411,DRD:9,DWT:15,NTW:203,NTR:4,NBW:212,NBR:414,NR0:0,NR1:0,NR2:0,NR3:0,TTW:1,TTR:0,TRB:0,
-   TBW:2,TBR:6,TR0:0,TR1:0,TR2:0,TR3:0,TR4:0,TC0:0,TC1:0,TC2:0,TC3:0,TC4:0
+   TBW:2,TBR:6,TR0:0,TR1:0,TR2:0,TR3:0,TR4:0,TC0:0,TC1:0,TC2:0,TC3:0,TC4:0,ZTR:0,DFL:0,DFS:0,JFL:0,JFS:0,JBB:0,JFB:0,JFW:0,
+   JRL:0,JRP:0,JRE:0,JRI:0,JRO:0,JEX:0,DEX:0,CAT:4,CFE:0,CFS:0,CFT:0,CQS:0,CQT:0,CYS:0,CYT:0,BTD:0
 
    Example:
 
@@ -6727,10 +6823,12 @@
    TBW:0,TBR:0,TR0:0,TR1:0,TR2:0,TR3:0,TR4:0,TC0:0,TC1:0,TC2:0,TC3:0,TC4:0
    GLD:/tmp/x1.gld,REG:REG1,SET:0,KIL:0,GET:0,DTA:0,ORD:0,ZPR:0,QRY:0,LKS:0,LKF:0,CTN:0,DRD:0,
    DWT:0,NTW:0,NTR:0,NBW:0,NBR:0,NR0:0,NR1:0,NR2:0,NR3:0,TTW:0,
-   TTR:0,TRB:0,TBW:0,TBR:0,TR0:0,TR1:0,TR2:0,TR3:0,TR4:0,TC0:0,TC1:0,TC2:0,TC3:0,TC4:0
+   TTR:0,TRB:0,TBW:0,TBR:0,TR0:0,TR1:0,TR2:0,TR3:0,TR4:0,TC0:0,TC1:0,TC2:0,TC3:0,TC4:0,ZTR:0,DFL:0,DFS:0,JFL:0,JFS:0,JBB:0,
+   JFB:0,JFW:0,JRL:0,JRP:0,JRE:0,JRI:0,JRO:0,JEX:0,DEX:0,CAT:4,CFE:0,CFS:0,CFT:0,CQS:0,CQT:0,CYS:0,CYT:0,BTD:0
    GLD:/tmp/x1.gld,REG:REG2,SET:0,KIL:0,GET:0,DTA:0,ORD:0,ZPR:0,QRY:0,LKS:0,LKF:0,CTN:0,DRD:0,
    DWT:0,NTW:0,NTR:0,NBW:0,NBR:0,NR0:0,NR1:0,NR2:0,NR3:0,TTW:0,
-   TTR:0,TRB:0,TBW:0,TBR:0,TR0:0,TR1:0,TR2:0,TR3:0,TR4:0,TC0:0,TC1:0,TC2:0,TC3:0,TC4:0
+   TTR:0,TRB:0,TBW:0,TBR:0,TR0:0,TR1:0,TR2:0,TR3:0,TR4:0,TC0:0,TC1:0,TC2:0,TC3:0,TC4:0,ZTR:0,DFL:0,DFS:0,JFL:0,JFS:0,JBB:0,
+   JFB:0,JFW:0,JRL:0,JRP:0,JRE:0,JRI:0,JRO:0,JEX:0,DEX:0,CAT:4,CFE:0,CFS:0,CFT:0,CQS:0,CQT:0,CYS:0,CYT:0,BTD:0
 
    Example:
 
@@ -6740,13 +6838,16 @@
 
    zgbl("G",0)="GLD:*,REG:*,SET:0,KIL:0,GET:0,DTA:0,ORD:0,
    ZPR:0,QRY:0,LKS:0,LKF:0,CTN:0,DRD:0,DWT:0,NTW:0,NTR:0,NBW:0,NBR:0,NR0:0,NR1:0,NR2:0,NR3:0,TTW:0,
-   TTR:0,TRB:0,TBW:0,TBR:0,TR0:0,TR1:0,TR2:0,TR3:0,TR4:0,TC0:0,TC1:0,TC2:0,TC3:0,TC4:0"
+   TTR:0,TRB:0,TBW:0,TBR:0,TR0:0,TR1:0,TR2:0,TR3:0,TR4:0,TC0:0,TC1:0,TC2:0,TC3:0,TC4:0,ZTR:0,DFL:0,DFS:0,JFL:0,JFS:0,JBB:0,
+   JFB:0,JFW:0,JRL:0,JRP:0,JRE:0,JRI:0,JRO:0,JEX:0,DEX:0,CAT:4,CFE:0,CFS:0,CFT:0,CQS:0,CQT:0,CYS:0,CYT:0,BTD:0"
    zgbl("G",1)="GLD:/tmp/x1.gld,REG:REG1,SET:0,KIL:0,GET:0,DTA:0,ORD:0,ZPR:0,QRY:0,
    LKS:0,LKF:0,CTN:0,DRD:0,DWT:0,NTW:0,NTR:0,NBW:0,NBR:0,NR0:0,NR1:0,NR2:0,
-   NR3:0,TTW:0,TTR:0,TRB:0,TBW:0,TBR:0,TR0:0,TR1:0,TR2:0,TR3:0,TR4:0,TC0:0,TC1:0,TC2:0,TC3:0,TC4:0"
+   NR3:0,TTW:0,TTR:0,TRB:0,TBW:0,TBR:0,TR0:0,TR1:0,TR2:0,TR3:0,TR4:0,TC0:0,TC1:0,TC2:0,TC3:0,TC4:0,ZTR:0,DFL:0,DFS:0,JFL:0,
+   JFS:0,JBB:0,JFB:0,JFW:0,JRL:0,JRP:0,JRE:0,JRI:0,JRO:0,JEX:0,DEX:0,CAT:4,CFE:0,CFS:0,CFT:0,CQS:0,CQT:0,CYS:0,CYT:0,BTD:0"
    zgbl("G",2)="GLD:/tmp/x1.gld,REG:REG2,SET:0,KIL:0,GET:0,DTA:0,ORD:0,ZPR:0,QRY:0,LKS:0,
    LKF:0,CTN:0,DRD:0,DWT:0,NTW:0,NTR:0,NBW:0,NBR:0,NR0:0,NR1:0,NR2:0,
-   NR3:0,TTW:0,TTR:0,TRB:0,TBW:0,TBR:0,TR0:0,TR1:0,TR2:0,TR3:0,TR4:0,TC0:0,TC1:0,TC2:0,TC3:0,TC4:0"
+   NR3:0,TTW:0,TTR:0,TRB:0,TBW:0,TBR:0,TR0:0,TR1:0,TR2:0,TR3:0,TR4:0,TC0:0,TC1:0,TC2:0,TC3:0,TC4:0,ZTR:0,DFL:0,DFS:0,JFL:0,
+   JFS:0,JBB:0,JFB:0,JFW:0,JRL:0,JRP:0,JRE:0,JRI:0,JRO:0,JEX:0,DEX:0,CAT:4,CFE:0,CFS:0,CFT:0,CQS:0,CQT:0,CYS:0,CYT:0,BTD:0"
 
    Example:
 
@@ -8492,153 +8593,270 @@
    GT.M permits modification of the factors accessible with $VIEW(), the VIEW
    command generally provides the means for effecting the change.
 
-   +----------------------------------------------------------------------------------------------------------------------------------------------------+
-   |                                                             $VIEW() Argument Keywords                                                              |
-   |----------------------------------------------------------------------------------------------------------------------------------------------------|
-   |      ARG 1      |    ARG 2     |                                                   RETURN VALUE                                                    |
-   |-----------------+--------------+-------------------------------------------------------------------------------------------------------------------|
-   |"BADCHAR"        |none          |In UTF-8 mode processes, enables or disable the generation of an error when character-oriented functions encounter |
-   |                 |              |malformed byte sequences (illegal characters). The default is 1.                                                   |
-   |-----------------+--------------+-------------------------------------------------------------------------------------------------------------------|
-   |"BREAKMSG"       |none          |Value of the break message mask; GT.M defaults this to 31.                                                         |
-   |-----------------+--------------+-------------------------------------------------------------------------------------------------------------------|
-   |"FREEBLOCKS"     |region        |Number of free database blocks in a given region.                                                                  |
-   |-----------------+--------------+-------------------------------------------------------------------------------------------------------------------|
-   |                 |              |Process-id of a process that has frozen the database associated with the region specified (using DSE or MUPIP).    |
-   |"FREEZE"         |region        |                                                                                                                   |
-   |                 |              |If the region is currently not frozen, returns zero.                                                               |
-   |-----------------+--------------+-------------------------------------------------------------------------------------------------------------------|
-   |                 |              |Returns a string describing the current compiler setting. The default is "GT.M Boolean short-circuit".             |
-   |"FULL_BOOLEAN"   |none          |$VIEW("FULL_BOOLEAN") reports "Standard Boolean evaluation side effects" when it is not explicitly set, but that   |
-   |                 |              |mode of operation is required by the setting of gtm_side_effects, and "Standard Boolean side-effect warning" when  |
-   |                 |              |warnings have been specified.                                                                                      |
-   |-----------------+--------------+-------------------------------------------------------------------------------------------------------------------|
-   |                 |              |Truth Value indicating whether Database block certification is currently enabled or disabled.                      |
-   |"GDSCERT"        |none          |                                                                                                                   |
-   |                 |              |To enable or disable Database block certification, use the VIEW "GDSCERT" command.                                 |
-   |-----------------+--------------+-------------------------------------------------------------------------------------------------------------------|
-   |"GVACCESS_METHOD"|region        |Access method of the region.                                                                                       |
-   |-----------------+--------------+-------------------------------------------------------------------------------------------------------------------|
-   |"GVFILE"         |region        |Name of the database associated with the region.                                                                   |
-   |-----------------+--------------+-------------------------------------------------------------------------------------------------------------------|
-   |"GVFIRST"        |none          |Name of the first database region in the current global directory; functionally equivalent to $VIEW("GVNEXT","").  |
-   |-----------------+--------------+-------------------------------------------------------------------------------------------------------------------|
-   |"GVNEXT"         |region        |Name of the next database region after the given one in alphabetical order (or M collation sequence); "" for region|
-   |                 |              |starts with the first region. A return value of "" means that the global directory defines no additional regions.  |
-   |-----------------+--------------+-------------------------------------------------------------------------------------------------------------------|
-   |                 |              |When                                                                                                               |
-   |                 |              |                                                                                                                   |
-   |"GVSTAT"         |region        |read-only processes are the active in a database, they cannot update the database including the file header where  |
-   |                 |              |GVSTATS are stored. Therefore their counts are only stored in associated shared memory and must be flushed to the  |
-   |                 |              |file header by a process with write access, which might be a MUPIP RUNDOWN.                                        |
-   |-----------------+--------------+-------------------------------------------------------------------------------------------------------------------|
-   |                 |              |Number of indirection cache hits since GT.M process startup.                                                       |
-   |"ICHITS"         |none          |                                                                                                                   |
-   |                 |              |Indirection cache is a pool of compiled expressions that GT.M maintains for indirection and XECUTE.                |
-   |-----------------+--------------+-------------------------------------------------------------------------------------------------------------------|
-   |"ICMISS"         |none          |Number of indirection cache misses since GT.M process startup.                                                     |
-   |-----------------+--------------+-------------------------------------------------------------------------------------------------------------------|
-   |                 |              |can return the following values:                                                                                   |
-   |                 |              |                                                                                                                   |
-   |"JNLACTIVE"      |region        |  o -1 (internal error)                                                                                            |
-   |                 |              |  o 0 journaling is disabled                                                                                       |
-   |                 |              |  o 1 journaling is enabled but closed (OFF)                                                                       |
-   |                 |              |  o 2 journaling is enabled and open (ON)                                                                          |
-   |-----------------+--------------+-------------------------------------------------------------------------------------------------------------------|
-   |"JNLFILE"        |region        |Journal file name associated with the region.                                                                      |
-   |-----------------+--------------+-------------------------------------------------------------------------------------------------------------------|
-   |"JNLTRANSACTION" |none          |Index showing how many ZTSTART transaction fences have been opened (and not closed).                               |
-   |-----------------+--------------+-------------------------------------------------------------------------------------------------------------------|
-   |"LABELS"         |none          |Truth value showing whether label case sensitivity is ON (1 for "LOWER") or OFF (0 for "UPPER"); GT.M defaults to  |
-   |                 |              |1.                                                                                                                 |
-   |-----------------+--------------+-------------------------------------------------------------------------------------------------------------------|
-   |"LINK"           |none          |Returns the current relink recursive setting of ZLINK.                                                             |
-   |-----------------+--------------+-------------------------------------------------------------------------------------------------------------------|
-   |                 |local variable|returns the number of references by alias containers to the array associated with an unsubscripted local variable  |
-   |"LV_CREF"        |name (lvn)    |name specified as a second expr (for example a quoted string); it returns a zero for a variable without any        |
-   |                 |              |associated alias container.                                                                                        |
-   |-----------------+--------------+-------------------------------------------------------------------------------------------------------------------|
-   |"LV_GCOL"        |none          |returns the number of data-spaces recovered during a local variable data-space garbage collection it triggers; such|
-   |                 |              |collections normally happen automatically at appropriate times.                                                    |
-   |-----------------+--------------+-------------------------------------------------------------------------------------------------------------------|
-   |"LV_REF"         |local variable|returns the total number of references to the data-space associated with an unsubscripted local variable name      |
-   |                 |name (lvn)    |specified as a second expr (for example a quoted string).                                                          |
-   |-----------------+--------------+-------------------------------------------------------------------------------------------------------------------|
-   |"LVNULLSUBS"     |none          |Truth value showing whether null subscripts are permitted in local arrays (1 for "LVNULLSUBS") or not (0 for       |
-   |                 |              |"NOLVNULLSUBS"); GT.M defaults to 1.                                                                               |
-   |-----------------+--------------+-------------------------------------------------------------------------------------------------------------------|
-   |                 |              |The current isolation-status of the specified global variable which must have a leading "^" in its specification.  |
-   |                 |              |                                                                                                                   |
-   |                 |              |This function returns 1 if GT.M has been instructed to not enforce the ACID property of Isolation (that is,        |
-   |"NOISOLATION"    |global        |"NOISOLATION" has been specified) and 0 otherwise.                                                                 |
-   |                 |              |                                                                                                                   |
-   |                 |              |By default, GT.M ensures Isolation, that is, a $VIEW command will return 0. The isolation-status of a global       |
-   |                 |              |variable can be turned on and off by the VIEW "NOISOLATION" command.                                               |
-   |-----------------+--------------+-------------------------------------------------------------------------------------------------------------------|
-   |"PATCODE"        |none          |Name of the active patcode table; GT.M defaults this to "M".                                                       |
-   |-----------------+--------------+-------------------------------------------------------------------------------------------------------------------|
-   |"POOLLIMIT"      |region        |The current limit on global buffers for the region .                                                               |
-   |-----------------+--------------+-------------------------------------------------------------------------------------------------------------------|
-   |"PROBECRIT"      |region        |Acquires and releases a critical section for the region (the "probe"), returning a string with the following       |
-   |                 |              |fields:                                                                                                            |
-   |-----------------+--------------+-------------------------------------------------------------------------------------------------------------------|
-   |                 |              |Name of the region(s) holding the specified gvn.                                                                   |
-   |                 |              |                                                                                                                   |
-   |                 |              |If gvn spans more than one region, this function returns region name in an order where the first region is the     |
-   |                 |              |region to which the unsubscripted global variable name maps; and other regions are in the order in which they would|
-   |"REGION"         |gvn           |be encountered by traversing the subscripts of gvn in order (with duplicates removed).                             |
-   |                 |              |                                                                                                                   |
-   |                 |              |gvn is a subscripted or unsubscripted global variable name in the same form as that generated by $NAME(). You can  |
-   |                 |              |use $NAME() inside $VIEW() to ensure that subscripts are in a correct form, for example,                           |
-   |                 |              |$VIEW("REGION",$NAME(^abcd(1,2E4))) instead of $VIEW("REGION","^abcd(1,20000)").                                   |
-   |-----------------+--------------+-------------------------------------------------------------------------------------------------------------------|
-   |"RTNCHECKSUM"    |routine name  |Source code check-sum for the most recently ZLINK'd version of the specified routine name (these check-sums use a  |
-   |                 |              |128 bit hash based on the MurmurHash3 algorithm).                                                                  |
-   |-----------------+--------------+-------------------------------------------------------------------------------------------------------------------|
-   |"RTNNEXT"        |routine name  |Name of the next routine in the image after the given one; "" (empty string) for routinename starts with the first |
-   |                 |              |routine in ASCII collating sequence and a return value of the empty string indicates the end of the list.          |
-   |-----------------+--------------+-------------------------------------------------------------------------------------------------------------------|
-   |                 |              |Number of bytes in the currently allocated as process working storage. GT.M manages this space as what is commonly |
-   |"SPSIZE"         |none          |called a heap, and uses the term stringpool to refer to it. The GT.M garbage collector reclaims unused space from  |
-   |                 |              |the stringpool from time to time, and GT.M automatically expands the stringpool as needed by the application       |
-   |                 |              |program.                                                                                                           |
-   |-----------------+--------------+-------------------------------------------------------------------------------------------------------------------|
-   |"STKSIZ"         |none          |Returns the GT.M stack size in bytes.                                                                              |
-   |-----------------+--------------+-------------------------------------------------------------------------------------------------------------------|
-   |"TOTALBLOCKS"    |region        |Total number of database blocks in a given region.                                                                 |
-   |-----------------+--------------+-------------------------------------------------------------------------------------------------------------------|
-   |                 |NULL          |Transaction ID specified in the particular level (when the transaction level is specified). The first level TSTART |
-   |                 |              |is returned if the level is not specified as second argument.                                                      |
-   |                 |or            |                                                                                                                   |
-   |"TRANSACTIONID"  |              |   **Note**                                                                                                      |
-   |                 |transaction   |                                                                                                                   |
-   |                 |level         |A NULL string is returned if the specified level (explicitly or implicitly) is greater than the current value of   |
-   |                 |              |$TLEVEL.                                                                                                           |
-   |-----------------+--------------+-------------------------------------------------------------------------------------------------------------------|
-   |"UNDEF"          |none          |Truth value showing whether undefined variables should be treated as having a null value (1 for "UNDEF"; 0 for     |
-   |                 |              |"NOUNDEF"); GT.M defaults to 0.                                                                                    |
-   |-----------------+--------------+-------------------------------------------------------------------------------------------------------------------|
-   |                 |              |Displays the database representation of gvn where gvn is a global name or a global name with subscript(s). The     |
-   |                 |              |option collnum specifies the alternate collation sequence number. If collnum is not specified, GT.M assumes the    |
-   |                 |              |default ASCII collation(collnum=0). For example:                                                                   |
-   |"YGVN2GDS"       |gvn[,collnum])|                                                                                                                   |
-   |                 |              |GTM>set x=$VIEW("YGVN2GDS","^A(1,""abcd"")") zwrite x for i=1:1:$zlength(x) write $zascii($zextract(x,i))," "      |
-   |                 |              |x="A"_$C(0)_" "_$C(17,0,255)_"abcd"_$C(0,0)                                                                        |
-   |                 |              |65 0 191 17 0 255 97 98 99 100 0 0                                                                                 |
-   |                 |              |GTM>                                                                                                               |
-   |-----------------+--------------+-------------------------------------------------------------------------------------------------------------------|
-   |                 |              |Displays the global name or a global name with subscript(s) of a database representation gds. The option collnum   |
-   |                 |              |specifies the collnum specifies the alternate collation sequence number. If collnum is not specified, GT.M assumes |
-   |                 |              |the default ASCII collation(collnum=0). This function is the inverse of the $VIEW("YGVN2GDS",<gvn>[,collnum])      |
-   |"YGDS2GVN"       |gds[,collnum])|function. For example:                                                                                             |
-   |                 |              |                                                                                                                   |
-   |                 |              |GTM>set y=$VIEW("YGDS2GVN",x) zwrite y                                                                             |
-   |                 |              |y="^A(1,""abcd"")"                                                                                                 |
-   |                 |              |GTM>                                                                                                               |
-   |-----------------+--------------+-------------------------------------------------------------------------------------------------------------------|
-   |"ZDATE_FORM"     |none          |Integer value showing whether four digit year code is active for $ZDATE(); GT.M defaults to 0 (for "YY" format).   |
-   |                 |              |Use the environment variable gtm_zdate_form to set the initial value of this factor.                               |
-   +----------------------------------------------------------------------------------------------------------------------------------------------------+
+   +------------------------------------------------------------------------+
+   |                       $VIEW() Argument Keywords                        |
+   |------------------------------------------------------------------------|
+   |       ARG 1       |    ARG 2     |            RETURN VALUE             |
+   |-------------------+--------------+-------------------------------------|
+   |                   |              | In UTF-8 mode processes, enables or |
+   |                   |              | disable the generation of an error  |
+   | "BADCHAR"         | none         | when character-oriented functions   |
+   |                   |              | encounter malformed byte sequences  |
+   |                   |              | (illegal characters). The default   |
+   |                   |              | is 1.                               |
+   |-------------------+--------------+-------------------------------------|
+   | "BREAKMSG"        | none         | Value of the break message mask;    |
+   |                   |              | GT.M defaults this to 31.           |
+   |-------------------+--------------+-------------------------------------|
+   | "FREEBLOCKS"      | region       | Number of free database blocks in a |
+   |                   |              | given region.                       |
+   |-------------------+--------------+-------------------------------------|
+   |                   |              | Process-id of a process that has    |
+   |                   |              | frozen the database associated with |
+   |                   |              | the region specified (using DSE or  |
+   | "FREEZE"          | region       | MUPIP).                             |
+   |                   |              |                                     |
+   |                   |              | If the region is currently not      |
+   |                   |              | frozen, returns zero.               |
+   |-------------------+--------------+-------------------------------------|
+   |                   |              | Returns a string describing the     |
+   |                   |              | current compiler setting. The       |
+   |                   |              | default is "GT.M Boolean            |
+   |                   |              | short-circuit".                     |
+   |                   |              | $VIEW("FULL_BOOLEAN") reports       |
+   | "FULL_BOOLEAN"    | none         | "Standard Boolean evaluation side   |
+   |                   |              | effects" when it is not explicitly  |
+   |                   |              | set, but that mode of operation is  |
+   |                   |              | required by the setting of          |
+   |                   |              | gtm_side_effects, and "Standard     |
+   |                   |              | Boolean side-effect warning" when   |
+   |                   |              | warnings have been specified.       |
+   |-------------------+--------------+-------------------------------------|
+   |                   |              | Truth Value indicating whether      |
+   |                   |              | Database block certification is     |
+   |                   |              | currently enabled or disabled.      |
+   | "GDSCERT"         | none         |                                     |
+   |                   |              | To enable or disable Database block |
+   |                   |              | certification, use the VIEW         |
+   |                   |              | "GDSCERT" command.                  |
+   |-------------------+--------------+-------------------------------------|
+   | "GVACCESS_METHOD" | region       | Access method of the region.        |
+   |-------------------+--------------+-------------------------------------|
+   | "GVFILE"          | region       | Name of the database associated     |
+   |                   |              | with the region.                    |
+   |-------------------+--------------+-------------------------------------|
+   |                   |              | Name of the first database region   |
+   | "GVFIRST"         | none         | in the current global directory;    |
+   |                   |              | functionally equivalent to          |
+   |                   |              | $VIEW("GVNEXT","").                 |
+   |-------------------+--------------+-------------------------------------|
+   |                   |              | Name of the next database region    |
+   |                   |              | after the given one in alphabetical |
+   |                   |              | order (or M collation sequence); "" |
+   | "GVNEXT"          | region       | for region starts with the first    |
+   |                   |              | region. A return value of "" means  |
+   |                   |              | that the global directory defines   |
+   |                   |              | no additional regions.              |
+   |-------------------+--------------+-------------------------------------|
+   |                   |              | When                                |
+   |                   |              |                                     |
+   |                   |              | read-only processes are the active  |
+   |                   |              | in a database, they cannot update   |
+   |                   |              | the database including the file     |
+   | "GVSTAT"          | region       | header where GVSTATS are stored.    |
+   |                   |              | Therefore their counts are only     |
+   |                   |              | stored in associated shared memory  |
+   |                   |              | and must be flushed to the file     |
+   |                   |              | header by a process with write      |
+   |                   |              | access, which might be a MUPIP      |
+   |                   |              | RUNDOWN.                            |
+   |-------------------+--------------+-------------------------------------|
+   |                   |              | Number of indirection cache hits    |
+   |                   |              | since GT.M process startup.         |
+   |                   |              |                                     |
+   | "ICHITS"          | none         | Indirection cache is a pool of      |
+   |                   |              | compiled expressions that GT.M      |
+   |                   |              | maintains for indirection and       |
+   |                   |              | XECUTE.                             |
+   |-------------------+--------------+-------------------------------------|
+   | "ICMISS"          | none         | Number of indirection cache misses  |
+   |                   |              | since GT.M process startup.         |
+   |-------------------+--------------+-------------------------------------|
+   |                   |              | can return the following values:    |
+   |                   |              |                                     |
+   |                   |              |   o -1 (internal error)             |
+   | "JNLACTIVE"       | region       |   o 0 journaling is disabled        |
+   |                   |              |   o 1 journaling is enabled but     |
+   |                   |              |     closed (OFF)                    |
+   |                   |              |   o 2 journaling is enabled and     |
+   |                   |              |     open (ON)                       |
+   |-------------------+--------------+-------------------------------------|
+   | "JNLFILE"         | region       | Journal file name associated with   |
+   |                   |              | the region.                         |
+   |-------------------+--------------+-------------------------------------|
+   |                   |              | Index showing how many ZTSTART      |
+   | "JNLTRANSACTION"  | none         | transaction fences have been opened |
+   |                   |              | (and not closed).                   |
+   |-------------------+--------------+-------------------------------------|
+   |                   |              | Truth value showing whether label   |
+   | "LABELS"          | none         | case sensitivity is ON (1 for       |
+   |                   |              | "LOWER") or OFF (0 for "UPPER");    |
+   |                   |              | GT.M defaults to 1.                 |
+   |-------------------+--------------+-------------------------------------|
+   | "LINK"            | none         | Returns the current relink          |
+   |                   |              | recursive setting of ZLINK.         |
+   |-------------------+--------------+-------------------------------------|
+   |                   |              | returns the number of references by |
+   |                   |              | alias containers to the array       |
+   |                   | local        | associated with an unsubscripted    |
+   | "LV_CREF"         | variable     | local variable name specified as a  |
+   |                   | name (lvn)   | second expr (for example a quoted   |
+   |                   |              | string); it returns a zero for a    |
+   |                   |              | variable without any associated     |
+   |                   |              | alias container.                    |
+   |-------------------+--------------+-------------------------------------|
+   |                   |              | returns the number of data-spaces   |
+   |                   |              | recovered during a local variable   |
+   | "LV_GCOL"         | none         | data-space garbage collection it    |
+   |                   |              | triggers; such collections normally |
+   |                   |              | happen automatically at appropriate |
+   |                   |              | times.                              |
+   |-------------------+--------------+-------------------------------------|
+   |                   |              | returns the total number of         |
+   |                   | local        | references to the data-space        |
+   | "LV_REF"          | variable     | associated with an unsubscripted    |
+   |                   | name (lvn)   | local variable name specified as a  |
+   |                   |              | second expr (for example a quoted   |
+   |                   |              | string).                            |
+   |-------------------+--------------+-------------------------------------|
+   |                   |              | Truth value showing whether null    |
+   |                   |              | subscripts are permitted in local   |
+   | "LVNULLSUBS"      | none         | arrays (1 for "LVNULLSUBS") or not  |
+   |                   |              | (0 for "NOLVNULLSUBS"); GT.M        |
+   |                   |              | defaults to 1.                      |
+   |-------------------+--------------+-------------------------------------|
+   |                   |              | The current isolation-status of the |
+   |                   |              | specified global variable which     |
+   |                   |              | must have a leading "^" in its      |
+   |                   |              | specification.                      |
+   |                   |              |                                     |
+   |                   |              | This function returns 1 if GT.M has |
+   |                   |              | been instructed to not enforce the  |
+   |                   |              | ACID property of Isolation (that    |
+   | "NOISOLATION"     | global       | is, "NOISOLATION" has been          |
+   |                   |              | specified) and 0 otherwise.         |
+   |                   |              |                                     |
+   |                   |              | By default, GT.M ensures Isolation, |
+   |                   |              | that is, a $VIEW command will       |
+   |                   |              | return 0. The isolation-status of a |
+   |                   |              | global variable can be turned on    |
+   |                   |              | and off by the VIEW "NOISOLATION"   |
+   |                   |              | command.                            |
+   |-------------------+--------------+-------------------------------------|
+   | "PATCODE"         | none         | Name of the active patcode table;   |
+   |                   |              | GT.M defaults this to "M".          |
+   |-------------------+--------------+-------------------------------------|
+   | "POOLLIMIT"       | region       | The current limit on global buffers |
+   |                   |              | for the region .                    |
+   |-------------------+--------------+-------------------------------------|
+   |                   |              | Acquires and releases a critical    |
+   | "PROBECRIT"       | region       | section for the region (the         |
+   |                   |              | "probe"), returning a string with   |
+   |                   |              | the following fields:               |
+   |-------------------+--------------+-------------------------------------|
+   |                   |              | Name of the region(s) holding the   |
+   |                   |              | specified gvn.                      |
+   |                   |              |                                     |
+   |                   |              | If gvn spans more than one region,  |
+   |                   |              | this function returns region name   |
+   |                   |              | in an order where the first region  |
+   |                   |              | is the region to which the          |
+   |                   |              | unsubscripted global variable name  |
+   |                   |              | maps; and other regions are in the  |
+   |                   |              | order in which they would be        |
+   |                   |              | encountered by traversing the       |
+   | "REGION"          | gvn          | subscripts of gvn in order (with    |
+   |                   |              | duplicates removed).                |
+   |                   |              |                                     |
+   |                   |              | gvn is a subscripted or             |
+   |                   |              | unsubscripted global variable name  |
+   |                   |              | in the same form as that generated  |
+   |                   |              | by $NAME(). You can use $NAME()     |
+   |                   |              | inside $VIEW() to ensure that       |
+   |                   |              | subscripts are in a correct form,   |
+   |                   |              | for example,                        |
+   |                   |              | $VIEW("REGION",$NAME(^abcd(1,2E4))) |
+   |                   |              | instead of                          |
+   |                   |              | $VIEW("REGION","^abcd(1,20000)").   |
+   |-------------------+--------------+-------------------------------------|
+   |                   |              | Source code check-sum for the most  |
+   |                   |              | recently ZLINK'd version of the     |
+   | "RTNCHECKSUM"     | routine name | specified routine name (these       |
+   |                   |              | check-sums use a 128 bit hash based |
+   |                   |              | on the MurmurHash3 algorithm).      |
+   |-------------------+--------------+-------------------------------------|
+   |                   |              | Name of the next routine in the     |
+   |                   |              | image after the given one; ""       |
+   |                   |              | (empty string) for routinename      |
+   | "RTNNEXT"         | routine name | starts with the first routine in    |
+   |                   |              | ASCII collating sequence and a      |
+   |                   |              | return value of the empty string    |
+   |                   |              | indicates the end of the list.      |
+   |-------------------+--------------+-------------------------------------|
+   |                   |              | Returns a string with three comma   |
+   |                   |              | separated values: Number of bytes   |
+   |                   |              | currently allocated as process      |
+   |                   |              | working storage: GT.M manages this  |
+   |                   |              | space as what is commonly called a  |
+   |                   |              | heap, and uses the term stringpool  |
+   |                   |              | to refer to it. The GT.M garbage    |
+   |                   |              | collector reclaims unused space     |
+   |                   |              | from the stringpool from time to    |
+   | "SPSIZE"          | none         | time, and GT.M automatically        |
+   |                   |              | expands the stringpool as needed by |
+   |                   |              | the application program; Number of  |
+   |                   |              | bytes currently used by the         |
+   |                   |              | process; Number of bytes reserved:  |
+   |                   |              | The reserved space is used to       |
+   |                   |              | reduce the active memory usage, for |
+   |                   |              | example, when a process uses a      |
+   |                   |              | large amount of memory then         |
+   |                   |              | subsequently uses a significantly   |
+   |                   |              | reduced amount.                     |
+   |-------------------+--------------+-------------------------------------|
+   | "STKSIZ"          | none         | Returns the GT.M stack size in      |
+   |                   |              | bytes.                              |
+   |-------------------+--------------+-------------------------------------|
+   | "TOTALBLOCKS"     | region       | Total number of database blocks in  |
+   |                   |              | a given region.                     |
+   |-------------------+--------------+-------------------------------------|
+   |                   |              | Transaction ID specified in the     |
+   |                   |              | particular level (when the          |
+   |                   |              | transaction level is specified).    |
+   |                   | NULL         | The first level TSTART is returned  |
+   |                   |              | if the level is not specified as    |
+   |                   | or           | second argument.                    |
+   | "TRANSACTIONID"   |              |                                     |
+   |                   | transaction  |   **Note**                        |
+   |                   | level        |                                     |
+   |                   |              | A NULL string is returned if the    |
+   |                   |              | specified level (explicitly or      |
+   |                   |              | implicitly) is greater than the     |
+   |                   |              | current value of $TLEVEL.           |
+   |-------------------+--------------+-------------------------------------|
+   |                   |              | Truth value showing whether         |
+   |                   |              | undefined variables should be       |
+   | "UNDEF"           | none         | treated as having a null value (1   |
+   |                   |              | for "UNDEF"; 0 for "NOUNDEF"); GT.M |
+   |                   |              | defaults to 0.                      |
+   |-------------------+--------------+-------------------------------------|
+   |                   |              | Integer value showing whether four  |
+   |                   |              | digit year code is active for       |
+   | "ZDATE_FORM"      | none         | $ZDATE(); GT.M defaults to 0 (for   |
+   |                   |              | "YY" format). Use the environment   |
+   |                   |              | variable gtm_zdate_form to set the  |
+   |                   |              | initial value of this factor.       |
+   +------------------------------------------------------------------------+
 
    **Important**
 
@@ -8679,9 +8897,11 @@
    Example:
 
    GTM>write $view("GVSTAT","DEFAULT")
-   SET:203,KIL:12,GET:203,DTA:2,ORD:23,ZPR:21,QRY:0,LKS:0,LKF:0,CTN:44,DRD:103,DWT:
-   59,NTW:24,NTR:55,NBW:27,NBR:138,NR0:0,NR1:0,NR2:0,NR3:0,TTW:17,TTR:5,TRB:0,TBW:3
-   2,TBR:80,TR0:0,TR1:0,TR2:0,TR3:0,TR4:0,TC0:0,TC1:0,TC2:0,TC3:0,TC4:0,ZTR:7
+   SET:203,KIL:12,GET:203,DTA:2,ORD:23,ZPR:21,QRY:0,LKS:0,LKF:0,CTN:44,DRD:103,DWT:59,
+   NTW:24,NTR:55,NBW:27,NBR:138,NR0:0,NR1:0,NR2:0,NR3:0,TTW:17,TTR:5,TRB:0,TBW:32,
+   TBR:80,TR0:0,TR1:0,TR2:0,TR3:0,TR4:0,TC0:0,TC1:0,TC2:0,TC3:0,TC4:0,ZTR:7,DFL:9,
+   DFS:0,JFL:0,JFS:0,JBB:0,JFB:0,JFW:0,JRL:0,JRP:0,JRE:0,JRI:0,JRO:0,JEX:0,DEX:0,
+   CAT:35,CFE:0,CFS:0,CFT:0,CQS:0,CQT:0,CYS:0,CYT:0,BTD:13
    GTM>
 
    Example:
@@ -8788,6 +9008,64 @@
    $ZWRTAC=""
    $
 
+2 $ZAscii()
+   $ZAscii()
+
+   Returns the numeric byte value (0 through 255) of a given sequence of
+   octets (8-bit bytes).
+
+   The format for the $ASCII function is:
+
+   $ZA[SCII](expr[,intexpr])
+
+3 Examples
+   Examples
+
+   Example:
+
+   GTM>for i=0:1:4 write !,$zascii("*",i)
+
+   -1
+   228
+   184
+   187
+   -1
+   GTM>
+
+   This UTF-8 mode example displays the result of $ZASCII() specifying a byte
+   position before, first, second and third positions, and after the sequence
+   of octets (8-bit bytes) represented by *. In the above example, 228, 184,
+   and 187 represents the numeric byte value of the three-byte in the
+   sequence of octets (8-bit bytes) represented by *.
+
+2 $ZATRansform
+   $ZATRansform
+
+   Returns the transformed representation of the first argument expr in a
+   normalized form using the alternative transform specified by the second
+   argument intexpr; the return can be used as an operand to the follows (])
+   or sorts-after (]]) operator such that, if both operands are in the
+   normalized form, the result is independent of alternative collation. The
+   format for the $ZATRANSFORM() function is:
+
+   $ZTRANSFORM(expr,intexpr[,{0|1}][,{0|1}])
+
+   Please see the section on $ZCOLLATE() for a similar alternative.
+
+3 Examples
+   Examples
+
+   Example:
+
+   GTM>write $ztransform("John Smythe",1)]$zatransform("Jane Smith",2)
+   0
+   GTM>
+
+   This example uses $ZATRANSFORM() and two (here unspecified) collation
+   definitions to compare the ordering of two (literal) expressions as GT.M
+   would collate them if there was a way to collate them together. The result
+   indicates that the first would collate before the second.
+
 2 $ZBIT_Functions
    $ZBIT Functions
 
@@ -9100,36 +9378,6 @@
    invalid bits that exist at the end of the character string. In this case
    there are zero invalid bits.
 
-2 $ZAscii()
-   $ZAscii()
-
-   Returns the numeric byte value (0 through 255) of a given sequence of
-   octets (8-bit bytes).
-
-   The format for the $ASCII function is:
-
-   $ZA[SCII](expr[,intexpr])
-
-3 Examples
-   Examples
-
-   Example:
-
-   GTM>for i=0:1:4 write !,$zascii("*",i)
-
-   -1
-   228
-   184
-   187
-   -1
-   GTM>
-
-   This UTF-8 mode example displays the result of $ZASCII() specifying a byte
-   position before, first, second and third positions, and after the sequence
-   of octets (8-bit bytes) represented by *. In the above example, 228, 184,
-   and 187 represents the numeric byte value of the three-byte in the
-   sequence of octets (8-bit bytes) represented by *.
-
 2 $ZCHar()
    $ZCHar()
 
@@ -9152,6 +9400,43 @@
    This example WRITEs the byte sequence represented by * and signals the
    terminal bell.
 
+2 $ZCOllate()
+   $ZCOllate()
+
+   Returns the transformed representation of the first argument glvn in a
+   normalized form using the alternative transform specified by the second
+   argument intexpr; the return can be used as an operand to the follows (])
+   or sorts-after (]]) operator such that, if both operands are in the
+   normalized form, the result is independent of alternative collation.
+
+   The format for the $ZCOLLATE() function is:
+
+   $ZCO[llate](glvn,intexpr[,{0|1}])
+
+   Note that because the forward transform is to the GDS global storage
+   format, the reverse transform always shows a global form. This is not
+   material when the result is used for most comparisons, but for some uses
+   the applcation might need to remove the leading up-arrow (^).
+
+   Please see the section on $ZATRANSFORM() for a similar alternative.
+
+3 Example_of_$ZCOllate()
+   Example of $ZCOllate()
+
+   Example:
+
+   GTM>write $zwrite($zcollate("A(""foo"")",0))
+   "A"_$C(0,255)_"foo"_$C(0,0)
+   GTM>write $zcollate($zcollate("A(""foo"")",0),0,1)
+   ^A("foo")
+   GTM>
+
+   The first WRITE in this example shows the readable form or the value
+   produced by the $ZCOLLATE() revealing the details of how GT.M internally
+   represents this key using default (M) collation. The second WRITE shows
+   how the combination of the transform and reverse transform restores the
+   value to the original representation.
+
 2 $ZCOnvert()
    $ZCOnvert()
 
@@ -9788,15 +10073,15 @@
    This example illustrates the output produced for each of the possible
    values for the second argument.
 
-2 $ZPiece()
-   $ZPiece()
+2 $ZPIece()
+   $ZPIece()
 
    Return a sequence of bytes delimited by a specified byte sequence made up
    of one or more bytes.
 
    The format for the $ZPIECE function is:
 
-   $ZP[IECE](expr1,expr2[,intexpr1[,intexpr2]])
+   $ZPI[ECE](expr1,expr2[,intexpr1[,intexpr2]])
 
 3 Examples
    Examples
@@ -9830,7 +10115,7 @@
 
    Example:
 
-   For p=1:1:$ZLength(x,"/") Write ?p-1*10,$ZPiece(x,"/",p)
+   For p=1:1:$ZLength(x,"/") Write ?p-1*10,$ZPIece(x,"/",p)
 
    This loop uses $ZLENGTH() and $ZPIECE() to display all the pieces of x in
    columnar format.
@@ -10499,11 +10784,11 @@
 
    $ZWRITE(expr[,intexpr])
 
-     o The first expression specifies the string to convert to or from the
+     o The first argument specifies the string to convert to or from the
        ZWRITE format.
-     o The second integer expression specifies the direction of conversion.
-       When intexpr is not specified or evaluates to zero, $zwrite() converts
-       the first argument to the ZWRITE format. When intexpr evaluates to a
+     o The second argument specifies the direction of conversion. When
+       intexpr is not specified or evaluates to zero, $zwrite() converts the
+       first argument to the ZWRITE format. When intexpr evaluates to a
        non-zero value, $ZWRITE() treats the first argument as being in ZWRITE
        format and attempts to convert it to a string with embedded
        non-graphic characters; if it is not in ZWRITE format, it returns an
@@ -10841,9 +11126,9 @@
    $Reference
 
    $R[EFERENCE] contains the last global reference. Until the first global
-   reference is made by an M program, $REFERENCE contains the empty string
-   (""). This way it is useful in determining if the usage of a naked
-   reference is valid.
+   reference is made by an M program or after a global reference with an
+   invalid key, $REFERENCE contains the empty string (""). This way it is
+   useful in determining if the usage of a naked reference is valid.
 
    A typical way of using this is:
 
@@ -11136,9 +11421,11 @@
    character set used by a GT.M process by the value of $ZCHSET. $ZCHSET can
    have only two values --"M", or "UTF-8".
 
-   GT.M only supports Unicode on certain platforms. On platforms where it is
-   not supported, the intrinsic variable $ZCHSET is always "M" ignoring the
-   value of the environment variable gtm_chset even if it is defined.
+   **Warning**
+
+   GT.M performs operations on literals at compile time and the character set
+   may have an impact on such operations. Therefore, always compile with the
+   same character set as that used at runtime.
 
    Example:
 
@@ -11465,7 +11752,7 @@
    piece is an offset in seconds to UTC. For any valid UTC time offset, the
    fourth piece is a number between -43200 (for UTC-12:00) and +50400 (for
    UTC+14:00). The value of the fourth piece remains constant all through the
-   year expect for those places that observe daylight saving time. To obtain
+   year except for those places that observe daylight saving time. To obtain
    the $HOROLOG representation of UTC, add the fourth piece to the second
    piece of $ZHOROLOG and proceed as follows:
 
@@ -11900,6 +12187,12 @@
    variable gtm_patnumeric and does not allow the process to change the
    value.
 
+   **Warning**
+
+   GT.M performs operations on literals at compile time and the pattern codes
+   settings may have an impact on such operations. Therefore, always compile
+   with the same pattern code settings as those used at runtime.
+
    For characters in Unicode, GT.M assigns patcodes based on the default
    classification of the Unicode character set by the ICU library with three
    adjustments:
@@ -12532,9 +12825,11 @@
    ZSTEP command. $ZSTEP provides the ZSTEP action only when the ZSTEP
    command does not specify an action.
 
-   $ZSTEP initially contains the string "B" to enter direct mode. $ZSTEP is a
-   read-write Intrinsic Special Variable, (i.e., it can appear on the left
-   side of the equal sign (=) in the argument to the SET command).
+   $ZSTEP initially contains the the value of the $gtm_zstep environment
+   variable or string "B" if $gtm_zstep is not defined; note that the default
+   "B" causes the process to enter direct mode. $ZSTEP is a read-write
+   Intrinsic Special Variable, (that is, it can appear on the left side of
+   the equal sign (=) in the argument to the SET command).
 
    Example:
 
@@ -12772,6 +13067,11 @@
 
    M routines cannot modify $ZVERSION.
 
+   **Warning**
+
+   GT.M treats $ZVERSION as a literal at compile time. Therefore, always
+   compile with the same version as that used at runtime.
+
    Example:
 
    GTM>w $zversion
@@ -13182,8 +13482,18 @@
    | CTRAP=expr            | U       | Controls vectoring on trapped <CTRL> |
    |                       |         | characters.                          |
    |-----------------------+---------+--------------------------------------|
+   | [NO]EDITING           | U       | Controls the editing mode for        |
+   |                       |         | $PRINCIPAL.                          |
+   |-----------------------+---------+--------------------------------------|
+   |                       |         | Control whether an "Erase" character |
+   | [NO]EMPTERM           | U       | on an empty input line should        |
+   |                       |         | terminate a READ or READ # command.  |
+   |-----------------------+---------+--------------------------------------|
    | [NO]ESCAPE            | U       | Controls escape sequence processing. |
    |-----------------------+---------+--------------------------------------|
+   | [NO]INSERT            | U       | Controls insert or overstrike on     |
+   |                       |         | input.                               |
+   |-----------------------+---------+--------------------------------------|
    |                       |         | Controls interpretation by the       |
    | [NO]PASTHRU           | U       | operating system of special control  |
    |                       |         | characters (for example <CTRL-B>).   |
@@ -13284,8 +13594,8 @@
    (LF), U+0000D (CR), U+000D followed by U+000A (CRLF), U+0085 (NEL), U+000C
    (FF), U+2028 (LS) and U+2029 (PS).
 
-3 READ_/_WRITE_Operations
-   READ / WRITE Operations
+3 READ/WRITE_Operations
+   READ/WRITE Operations
 
    The following table describes all READ and WRITE operations for STREAM,
    VARIABLE, and FIXED format sequential files having automatic record
@@ -13381,6 +13691,10 @@
        <LF> characters
      o In M mode, the last setting of RECORDSIZE or WIDTH for the device
        determines WIDTH
+     o In M Mode, a WRITE to a sequential device after setting $X to a value
+       greater than the device WIDTH or a reducing WIDTH to less than the
+       current $X acts as if the first character caused $X to exceed the
+       WIDTH induces an immediate WRAP, if WRAP is enabled
      o In UTF-8 mode, RECORDSIZE is in bytes and WIDTH is in characters and
        the smaller acts as the WIDTH limit in the table.
      o In UTF-8 mode, FIXED mode writes <SP> to the RECORDSIZE when the next
@@ -14053,7 +14367,7 @@
      for  read x quit:$zeof  use $principal write x,! use p1
      close p1
      quit
-     cont1
+   cont1
      if $zeof quit
      if a=0 set a=i/2
      set z=$za
@@ -14067,10 +14381,9 @@
      . for j=1:1:a  read x use $principal write j,"-",x,! use p1
      quit
 
-   This demonstrates WRITEs to a PIPE device with blocking. The WRITE loop
-   has no READ to force the input pipe to fill up which blocks the cat
-   output, causing cat to stop reading its input, letting the pipe acting as
-   input on the PIPE device to fill up and creating the blocked condition.
+   This demonstrates how to deal with write blocking of a PIPE device. The
+   loop doing the WRITE does not READ from the PIPE. Eventually causing the
+   output of cat to block on its output and stop reading input from the pipe.
    When the process takes the $ZTRAP to cont1 it tests $DEVICE to determine
    if the trap is caused by the full pipe. If so, it uses the for loop to
    read half the number of lines output by the main loop. It decrements i and
@@ -14078,6 +14391,175 @@
    with the WRITEs to the pipe. Depending upon the configuration of the
    environment, it may trap several times before processing all lines.
 
+   Example:
+
+   sh> mumps -run pipexample induceEAGAIN
+   The active device is pipe OPEN PIPE SHELL="/bin/bash" COMMAND="$gtm_dist/mumps -run induceEAGAIN^pipexample" STDERR="piperr"
+   $ZSTATUS="11,pipexample+9^pipexample,%SYSTEM-E-ENO11, Resource temporarily unavailable"
+
+   sh> mumps -run retry^pipexample induceEAGAIN
+   Try 0   pipe OPEN PIPE SHELL="/bin/bash" COMMAND="$gtm_dist/mumps -run induceEAGAIN^pipexample 0" STDERR="piperr"
+   ...Failed to perform non-blocked writes... Retrying write # 54
+   ...Failed to perform non-blocked writes... Retrying write # 63
+   ...Failed to perform non-blocked writes... Retrying write # 69
+   ...Failed to perform non-blocked writes... Retrying write # 78
+       Writes completed
+
+
+   This example demonstrates handling WRITE errors, like ENO11 or EAGAIN,
+   that do not terminate the PIPE device. The PIPE device does non-blocking
+   writes. If a process tries to WRITE to a full PIPE and the WRITE would
+   block, the device implicitly tries to complete the operation up to a
+   default of 10 times. GT.M sleeps 100 micro seconds between each retry.
+   When dealing with programs that can take a while to process input, it's a
+   good idea to either schedule a delay between WRITEs or come up with a
+   mechanism to back off the WRITEs when the buffer fills up.
+
+   sh> mumps -run pipexample induceEPIPE
+   The active device is pipe OPEN PIPE SHELL="/bin/bash" COMMAND="$gtm_dist/mumps -run induceEPIPE^pipexample" STDERR="piperr"
+       stdout:My PID is 12808
+       stderr:%GTM-F-FORCEDHALT, Image HALTed by MUPIP STOP
+   $ZSTATUS="32,pipexample+9^pipexample,%SYSTEM-E-ENO32, Broken pipe"
+
+   sh> mumps -run retry^pipexample induceEPIPE
+   Try 0   pipe OPEN PIPE SHELL="/bin/bash" COMMAND="$gtm_dist/mumps -run induceEPIPE^pipexample 0" STDERR="piperr"
+   ...Caught on try 0, write 49... 32,retry+13^pipexample,%SYSTEM-E-ENO32, Broken pipe
+       stdout:My PID is 16252
+       stderr:%GTM-F-FORCEDHALT, Image HALTed by MUPIP STOP
+   Try 1   pipe OPEN PIPE SHELL="/bin/bash" COMMAND="$gtm_dist/mumps -run induceEPIPE^pipexample 1" STDERR="piperr"
+   ...Caught on try 1, write 697... 32,retry+13^pipexample,%SYSTEM-E-ENO32, Broken pipe
+       stdout:My PID is 16403
+       stdout:$ZSTATUS="150373210,induceEPIPE+5^pipexample,%GTM-E-DIVZERO, Attempt to divide by zero"
+   Try 2   pipe OPEN PIPE SHELL="/bin/bash" COMMAND="$gtm_dist/mumps -run induceEPIPE^pipexample 2" STDERR="piperr"
+       Writes completed
+
+
+   This example demonstrates how to create a separate STDERR pipe device from
+   which to read the STDERR output of the program(s) inside the pipe. Reading
+   the STDERR is important when dealing with failures from Unix programs. It
+   is possible to read the errors without creating a STDERR pipe device,
+   however the error messages are commingled with the output of the programs
+   inside the pipe which could make diagnosis of the underlying problem
+   harder. Notice that GT.M writes fatal errors, GTM-F types, to STDERR, but
+   all others go to STDOUT.
+
+   Additionally, this example demonstrates handling errors that terminate the
+   PIPE device. In this example, the PIPE device is terminated when a program
+   inside the pipe terminates before reading all of the driving MUMPS
+   program's output causing an EPIPE or ENO32, a broken pipe. In such a
+   situation the MUMPS program must capture the error that caused the
+   termination and respond accordingly. The program may need to call out to
+   other programs to determine the status of a service it is using or to
+   alert the operator of an error with an external program or service. To
+   operate successfully, the program must recreate the pipe and retry the
+   operation.
+
+   Example:
+
+   ; Example program that starts another program in a pipe and traps the errors. The called
+   ; programs intentionally induce errors
+   pipexample
+     set $etrap="do readfrompipe(.pipe,.piperr) use $p zwrite $zstatus zhalt 99"
+     set pipe="pipe"
+     set piperr="piperr"
+     set writesize=1024
+     set cmd=$piece($zcmdline," ") set:'$length(cmd) cmd="induceEPIPE"
+     open pipe:(shell="/bin/bash":command="$gtm_dist/mumps -run "_cmd_"^pipexample":stderr=piperr)::"pipe"
+     zshow "D":devicelist write "The active device is ",devicelist("D",2),!
+     use pipe
+     for i=1:1:1024 write $tr($justify(i,writesize)," ","X"),!
+     close pipe
+     quit
+   ; Same as above, but without defining the PIPE's standard error
+   nostderr
+     set $etrap="do readfrompipe(.pipe) use $p zshow ""*"" zhalt 99"
+     set pipe="pipe"
+     set writesize=1024
+     set cmd=$piece($zcmdline," ",2) set:'$length(cmd) cmd="induceEAGAIN"
+     open pipe:(shell="/bin/bash":command="$gtm_dist/mumps -run "_cmd_"^pipexample")::"pipe"
+     zshow "D":devicelist write "The active device is ",devicelist("D",2),!
+     write !,!
+     use pipe
+     for i=1:1:1024 write $tr($justify(i,writesize)," ","X"),!
+     close pipe
+     quit
+   ; This routine intentionally delays reading from the pipe to induce an EAGAIN
+   induceEAGAIN
+     set $etrap="use $p zwrite $zstatus zhalt 99"
+     set hangtime=+$zcmdline set:'hangtime hangtime=5 set add=1
+     for i=1:1:1024 read x(i) quit:$zeof  do
+     . set delay(i)=1/(add+$random(hangtime))
+     . hang delay(i)
+     . set:i=30 add=10
+     halt
+   ; This routine intentionally induces an EPIPE by immediately sending a SIGTERM to itself causing
+   ; a FORCEDHALT error which goes to STDERR. Subsequently, a random DIVZERO error occurs, but this
+   ; error goes to STDOUT since it is not a fatal error
+   induceEPIPE
+     set $etrap="use $p zwrite $zstatus zhalt 99"
+     set divzero=150373210 ; DIVZERO goes to stdout
+     write "My PID is ",$job,!
+     zsystem:'$zcmdline "kill -15 "_$job  ; FORCEDHALT error goes to stderr
+     for i=1:1 read x(i) quit:$zeof  zmessage:'$random(1000) divzero
+     halt
+   ; Read the contents of the pipe on failure. Messages from the programs inside the pipe aid
+   ; in undestanding the underlying problem(s)
+   readfrompipe(pipe,piperr)
+     new i
+     new $etrap
+     set $etrap="set x=$zjobexam() zhalt 88"
+     use pipe
+     for i=1:1  read pipe(i):0 quit:'$test!$zeof
+     zkill pipe(i)
+     do:$data(piperr)
+     . use piperr
+     . for i=1:1  read piperr(i):0 quit:'$test!$zeof
+     . zkill piperr(i)
+     close pipe
+     use $p
+     for i=1:1  quit:'$data(pipe(i))  write ?4,"stdout:",pipe(i),!
+     for i=1:1  quit:'$data(piperr(i))  write ?4,"stderr:",piperr(i),!
+     quit
+   ; Example of trapping an error and retrying the operation as necessary. Error conditions
+   ; used are EPIPE, aka "Broken pipe" or ENO32, and EAGAIN, aka ENO11.
+   retry
+     set $etrap="use $p zshow ""*"" zhalt 99"
+     set pipe="pipe"
+     set piperr="piperr"
+     set writesize=1024
+     set cmd=$piece($zcmdline," ") set:'$length(cmd) cmd="induceEPIPE"
+     for try=0:1  do  quit:$get(readcomplete,0)
+     . new $etrap set $etrap="goto retryEPIPE"
+     . open pipe:(shell="/bin/bash":command="$gtm_dist/mumps -run "_cmd_"^pipexample "_try:stderr=piperr)::"pipe"
+     . zshow "D":devicelist write "Try ",try,$char(9),devicelist("D",2),!
+     . use pipe
+     . for i=1:1:1024 do
+     . . new $etrap set $etrap="goto retryEAGAIN^pipexample"
+     . . write $tr($justify(i,writesize)," ","X"),!
+     . set readcomplete=1
+     close pipe
+     use $p
+     write ?4,"Writes completed",!
+     quit
+   retryEPIPE
+     quit:$zstatus'["ENO32"
+     use $p
+     write "...Caught on try ",try,", write ",i,"... ",$zstatus,!
+     set $ecode=""
+     do readfrompipe(.pipe,.piperr)
+     quit
+   retryEAGAIN
+     quit:$zstatus'["ENO11"
+     use $p
+     write "...Failed to perform non-blocked writes... Retrying write # ",$increment(i,-1),!
+     set $ecode=""
+     hang 1+$random(5)
+     use pipe
+     quit
+
+   This example demonstrates how to handle PIPE device errors, whether with
+   the device itself or from programs inside the PIPE device.
+
 3 PIPE_Deviceparameter_Summary
    PIPE Deviceparameter Summary
 
@@ -14116,7 +14598,7 @@
    |                |   | which the created process writes any standard     |
    | STDERR=string  | o | error output. The GT.M process can USE, READ, and |
    |                |   | CLOSE it, but cannot WRITE to it. When the GT.M   |
-   |                |   | process CLOSEs the PIPE device the PIPE device    |
+   |                |   | process CLOSEs the PIPE device, the PIPE device   |
    |                |   | CLOSEs STDERR, if still OPEN.                     |
    |----------------+---+---------------------------------------------------|
    | WRITEONLY      | o | Specifies that the GT.M process may only WRITE to |
@@ -14172,7 +14654,7 @@
    From an application perspective, the transport layers used by a socket
    device are stream-oriented, with no provisions for implicit application
    messages. Therefore, the following are two common protocols used to
-   segment application messages..
+   segment application messages.
 
     1. One method is to use a, typically small, fixed length message
        containing the length of the next, variable length, message. In GT.M a
@@ -14193,8 +14675,8 @@
        application message. The protocol breaks if a message ever includes a
        delimiter as part of its content.
 
-   The SOCKET device provides a facility for recognizing delimiters to simply
-   parsing messages.
+   The SOCKET device provides a facility for recognizing delimiters to
+   simplify parsing messages.
 
 3 Socket_Read_Operation
    Socket Read Operation
@@ -14347,7 +14829,7 @@
 
    WRITE ! inserts the character(s) of the first I/O delimiter (if any) to
    the sending buffer. If "ZFF=expr" has been specified, WRITE # inserts the
-   characters of expr . Otherwise WRITE # has no effect. WRITE ! and WRITE #
+   characters of expr. Otherwise WRITE # has no effect. WRITE ! and WRITE #
    always maintain $X and $Y in a fashion that emulates a terminal cursor
    position except when the device is OPENed with a UTF CHSET because the
    units for $X and $Y for terminals are in display columns while for sockets
@@ -14364,7 +14846,7 @@
 
    /W[AIT][(timeout)]
 
-   where timeout is anumeric expression that specifies how long in seconds a
+   where timeout is a numeric expression that specifies how long in seconds a
    server waits for a connection or data to become available on one of the
    sockets in the current Socket Device.
 
@@ -14382,7 +14864,7 @@
      o If a numeric targetpid is specified, GT.M matches the value against
        the process id ($JOB) of the process receiving the sockets. GT.M uses
        a system service to perform this check on platforms that support it -
-       currently: Linux, and AIX. If the pids do not match, GT.M issues a
+       currently: Linux and AIX. If the pids do not match, GT.M issues a
        PEERPIDMISMATCH error and does not transfer the sockets.
      o If a numeric timeout is specified, GT.M sets $TEST to 1 if the
        transfer completes within the specified time, and otherwise sets $TEST
@@ -14439,38 +14921,55 @@
    socket connection itself, the socket handle, and buffered socket data (if
    any).
 
-   WRITE /TLS(option[,[timeout][,tlsid]])
+   WRITE /TLS(option[,[timeout][,tlsid[,cfg-file-options]])
 
-   SOCKET devices support encrypt connections with TLS using an encryption
+   SOCKET devices support encrypted connections with TLS using an encryption
    plugin. GT.M ships with a reference implementation of the plugin which
    uses OpenSSL; the reference implementation also supports TLS for GT.M
    replication streams. OpenSSL options are controlled by a configuration
    file. The WRITE /TLS command activates this feature for connected sockets.
 
-     o option is "server" or "client" indicating which TLS role to assume.
-       The server role requires a certificate specified in the configuration
-       file section with the label matching tlsid. The client role may
-       require a certificate depending on the OpenSSL options. If the
-       argument specifies a timeout, GT.M sets $TEST to 1 if the command
-       successfully completed or to 0 if it timed out. $DEVICE provides
-       status information in case of an error. ZSHOW "D" includes "TLS" in
-       the second line of the output for an encrypted socket.
-     o Note that SOCKET device actions may produce the following errors:
-       TLSDLLOPEN, TLSINIT, TLSCONVSOCK, TLSHANDSHAKE, TLSCONNINFO,
-       TLSIOERROR, and TLSRENEGOTIATE.
-
-   When placing the private key for a certificate at the beginning of the
-   certificate file, you may omit the "key" item from the configuration file.
-   The format of the combined file is:
-
-   -----BEGIN RSA PRIVATE KEY-----
-    [encoded key]
-    -----END RSA PRIVATE KEY-----
-    [empty line]
-    -----BEGIN CERTIFICATE-----
-    [encoded certificate]
-    -----END CERTIFICATE-----
-    [empty line]
+     o option is "server", "client", or "renegotiate". "server" or "client"
+       indicates which TLS role to assume. The server role requires a
+       certificate specified in the configuration file section with the label
+       matching tlsid. The client role may require a certificate depending on
+       the OpenSSL options. If a timeout is specified for options "client" or
+       "server", GT.M sets $TEST to 1 if the command successfully completed
+       or to 0 if it timed out. $DEVICE provides status information in case
+       of an error. ZSHOW "D" includes "TLS" in the second line of the output
+       for an encrypted socket.
+     o "renegotiate" applies only to a server socket. It allows applications
+       to request a TLS renegotiation. Renegotiation requires the suspension
+       of application communication and the application must read all pending
+       data before initiating a renegotiation. This means that in the
+       communication protocol used, both parties must be at a known state
+       when renegotiating keys. For example, in GT.M replication, one party
+       sends a renegotiation request and waits for an acknowledgement before
+       initiating the renegotiation.
+     o tlsid refers to the name of a section in the configuration file
+       specified by the gtmcrypt_config environment variable. If tlsid is not
+       specified with the "renegotiate" option and cfg-file-options are
+       specified, GT.M creates a virtual section by appending "-RENEGOTIATE"
+       to the tlsid used to enable TLS on the socket. If no section named
+       tlsid is present in the configuration file, GT.M creates a virtual
+       section with that name for the life of the process.
+     o cfg-file-options specifies configuration file options. Note
+       cfg-file-options override those options if they are already specified
+       in the configuration file except ssl-options and verify-level which
+       are merged.
+     o Supported cfg-file-options for the "renegotiate" command are
+       (case-sensitive): verify-depth, verify-level, verify-mode,
+       session-id-hex, and CAfile. WRITE /TLS ignores all other configuration
+       file options whether given on the command or in the configuration
+       file. For more information on the supported configuration options,
+       refer to the Creating a Configuration File section of the
+       Administration and Operations Guide.
+
+   **Note**
+
+   Note that SOCKET device actions may produce the following errors:
+   TLSDLLOPEN, TLSINIT, TLSCONVSOCK, TLSHANDSHAKE, TLSCONNINFO, TLSIOERROR,
+   and TLSRENEGOTIATE.
 
    GT.M buffers WRITEs to TLS enabled sockets until a subsequent USE :FLUSH,
    WRITE !, WRITE #, or an internal 400 millisecond timer expires.
@@ -14490,10 +14989,10 @@
 
    Each socket may have one or more sockets waiting for either an incoming
    connection or data available to READ (observable through $ZKEY). $ZKEY
-   contains semi-colon (";") separated list of entries detailing any waiting
+   contains semi- colon (";") separated list of entries detailing any waiting
    sockets for a current SOCKET device.
 
-   For more information on $KEY and $ZKEY, refer to Chapter 8: "ISV".
+   For more information on $KEY and $ZKEY, refer to "ISV".
 
 3 Socket_Deviceparameter_Summary
    Socket Deviceparameter Summary
@@ -14547,14 +15046,14 @@
    +------------------------------------------------------------------------+
 
    +------------------------------------------------------------------------+
-   |            Socket Establishment/Disconnect Deviceparameters            |
+   |                        Buffer Deviceparameters                         |
    |------------------------------------------------------------------------|
    | DEVICEPARAMETER  | COMMAND |                  COMMENT                  |
    |------------------+---------+-------------------------------------------|
-   | ZBFSIZE =intexpr | O       | Allocates a buffer used by GT.M when      |
+   | ZBFSIZE =intexpr | O/U     | Allocates a buffer used by GT.M when      |
    |                  |         | reading from a socket.                    |
    |------------------+---------+-------------------------------------------|
-   | ZIBFSIZE=intexpr | O       | Sets the buffer size used by the network  |
+   | ZIBFSIZE=intexpr | O/U     | Sets the buffer size used by the network  |
    |                  |         | software (setsockopt SO_RCVBUF).          |
    +------------------------------------------------------------------------+
 
@@ -14624,10 +15123,9 @@
    $gtm_dist/mumps -r start^server
 
    When start^server begins, the $PRINCIPAL device is the current device
-   connected a socket and $KEY contains
-   "ESTABLISHED|socket_handle|remote_ip_address". In most cases, a USE
-   command near the beginning of the routine sets various device parameters
-   such as delimiters.
+   connected a socket and $KEY contains "ESTABLISHED|socket_handle|
+   remote_ip_address". In most cases, a USE command near the beginning of the
+   routine sets various device parameters such as delimiters.
 
    The ZSHOW "D" command reports available information on both the local and
    remote sides of a TCP socket including local and remove addresses and
@@ -15093,11 +15591,13 @@
 5 ICHSET
    ICHSET
 
-   ICHSET=expr Applies to: All devices
+   ICHSET=expr
+
+   Applies to: All devices
 
-   Establishes the character encoding of the input device being OPENed in the
-   UTF-8 mode. The value of the expression can be M, UTF-8, UTF-16, UTF-16LE,
-   or UTF-16BE. In M mode, ICHSET has no effect.
+   Establishes the character encoding of an input device being OPENed and
+   USEed in the UTF-8 mode. The value of the expression can be M, UTF-8,
+   UTF-16, UTF-16LE, or UTF-16BE. In M mode, ICHSET has no effect.
 
    If ICHSET is not specified, GT.M assumes UTF-8 as the default character
    set for input from the device.
@@ -15108,9 +15608,9 @@
 
    **Note**
 
-   ICHSET is a deviceparameter of the OPEN command and not the USE command.
-   Since GT.M implicitly OPENs $PRINCIPAL before any application code is
-   executed, ICHSET does not apply to $Principal.
+   ICHSET is a deviceparameter of both the OPEN and USE commands. As ICHSET
+   can change the character set of an already OPENed device, it can help deal
+   with binary data intermixed with character data.
 
 5 INDEPENDENT
    INDEPENDENT
@@ -15386,8 +15886,8 @@
 
    OCHSET=expr Applies to: All devices
 
-   Establishes the character encoding of the output device being OPENed in
-   the UTF-8 mode. The value of the expression can be M, UTF-8, UTF-16,
+   Establishes the character encoding of the output device OPENed and USEed
+   in the UTF-8 mode. The value of the expression can be M, UTF-8, UTF-16,
    UTF-16LE, or UTF-16BE. In M mode, OCHSET has no effect.
 
    If *CHSET is not specified, GT.M assumes UTF-8 as the default character
@@ -15399,9 +15899,9 @@
 
    **Note**
 
-   OCHSET is a deviceparameter of the OPEN command not the USE command. Since
-   GT.M implicitly OPENs $PRINCIPAL before any application code is executed,
-   OCHSET does not apply to $Principal.
+   OCHSET is a deviceparameter of both the OPEN and USE commands. As OCHSET
+   can change the character set of an already OPENed device, it can help deal
+   with binary data intermixed with character data.
 
    Example:
 
@@ -16052,7 +16552,7 @@
    |----------------------+-----+----+------+------+------+-----|
    | [NO]EMPT[ERM]        | X   |    |      |      |      |     |
    |----------------------+-----+----+------+------+------+-----|
-   | EXCEPTION=expr       | X   | X  | X    |      | X    | X   |
+   | EXCEPTION=expr       | X   | X  | X    | X    | X    | X   |
    |----------------------+-----+----+------+------+------+-----|
    | FIFO                 |     |    | X    |      |      |     |
    |----------------------+-----+----+------+------+------+-----|
@@ -16062,16 +16562,18 @@
    |----------------------+-----+----+------+------+------+-----|
    | GROUP=expr           |     | X  | X    |      |      |     |
    |----------------------+-----+----+------+------+------+-----|
-   | KEY                  |     | X  | X    | X    |      |     |
+   | ICHSET=encoding      | X   | X  | X    | X    | X    | X   |
    |----------------------+-----+----+------+------+------+-----|
    | IKEY                 |     | X  | X    | X    |      |     |
    |----------------------+-----+----+------+------+------+-----|
-   | ICHSET=encoding      | X   | X  | X    | X    | X    | X   |
-   |----------------------+-----+----+------+------+------+-----|
    | INDEPENDENT          |     |    |      | X    |      |     |
    |----------------------+-----+----+------+------+------+-----|
    | IOERROR=expr         |     |    |      |      |      | X   |
    |----------------------+-----+----+------+------+------+-----|
+   | KEY                  |     | X  | X    | X    |      |     |
+   |----------------------+-----+----+------+------+------+-----|
+   | LISTEN=expr          |     |    |      |      |      | X   |
+   |----------------------+-----+----+------+------+------+-----|
    | [NO]NEWVERSION       |     | X  | X    |      |      |     |
    |----------------------+-----+----+------+------+------+-----|
    | OCHSET=encoding      | X   | X  | X    | X    | X    | X   |
@@ -16104,10 +16606,10 @@
    |----------------------+-----+----+------+------+------+-----|
    | WORLD=expr           |     | X  | X    |      |      |     |
    |----------------------+-----+----+------+------+------+-----|
-   | [NO]WRITEONLY        |     |    |      | X    |      |     |
-   |----------------------+-----+----+------+------+------+-----|
    | [NO]WRAP             | X   | X  | X    | X    | X    | X   |
    |----------------------+-----+----+------+------+------+-----|
+   | [NO]WRITEONLY        |     | X  | X    | X    |      |     |
+   |----------------------+-----+----+------+------+------+-----|
    | ZBFSIZE              |     |    |      |      |      | X   |
    |----------------------+-----+----+------+------+------+-----|
    | Z[NO]DELAY           |     |    |      |      |      | X   |
@@ -16115,8 +16617,6 @@
    | Z[NO]FF              |     |    |      |      |      | X   |
    |----------------------+-----+----+------+------+------+-----|
    | ZIBFSIZE             |     |    |      |      |      | X   |
-   |----------------------+-----+----+------+------+------+-----|
-   | LISTEN=expr          |     |    |      |      |      | X   |
    +------------------------------------------------------------+
 
 3 Use
@@ -16155,11 +16655,11 @@
 
    **Note**
 
-   A socket does not carry I[O]CHSET with it while being moved. Such a socket
-   uses the I[O]CHSET of the device it is ATTACHed to. If there is input
-   still buffered, this may cause unintentional consequences in the
-   application if I[O]CHSET changes. GT.M does not detect (or report) a
-   change in I[O]CHSET due to DETACH/ATTACH.
+   A socket does not carry [I|O]CHSET with it while being moved. Such a
+   socket uses the [I|O]CHSET of the device it is ATTACHed to. If there is
+   input still buffered, this may cause unintentional consequences in the
+   application if [I|O]CHSET changes. GT.M does not detect (or report) a
+   change in [I|O]CHSET due to DETACH/ATTACH.
 
 5 CANONICAL
    CANONICAL
@@ -16326,11 +16826,11 @@
    **Note**
 
    A socket can move from one device to another using DETACH/ATTACH. A socket
-   does not carry I[O]CHSET with it while being moved. Such a socket uses the
-   I[O]CHSET of the device it is ATTACHed to. If there is input still
+   does not carry [I|O]CHSET with it while being moved. Such a socket uses
+   the [I|O]CHSET of the device it is ATTACHed to. If there is input still
    buffered, this may cause unintentional consequences in the application if
-   I[O]CHSET changes. GT.M does not detect (or report) a change in I[O]CHSET
-   due to DETACH/ATTACH.
+   [I|O]CHSET changes. GT.M does not detect (or report) a change in
+   [I|O]CHSET due to DETACH/ATTACH.
 
    Example:
 
@@ -16640,6 +17140,22 @@
    SEEK. Use this deviceparameter with $PRINCIPAL when redirected from a
    file.
 
+5 INSERT
+   INSERT
+
+   [NO]INSERT Applies to: TRM
+
+   Enables or disables insert mode for the $PRINCIPAL device. If INSERT mode
+   is enabled, GT.M inserts input characters at the logical position in the
+   input stream designated by the virtual cursor as defined by $X and $Y, for
+   example in the middle of the line/record. If INSERT mode is disabled,
+   input characters overwrite the existing characters in the input stream at
+   the logical position designated by the virtual cursor. You can toggle the
+   insert mode within a direct mode line or if EDITING is enabled for a
+   single READ argument's input using the terminal's INSERT key. The INSERT
+   mode is reset to the default or what was last specified with USE at the
+   beginning of each direct mode line or READ argument.
+
 5 IOERROR
    IOERROR
 
@@ -17129,8 +17645,8 @@
 
    Note that LOCAL sockets ignore the ZIBFSIZE deviceparameter.
 
-4 Summary
-   Summary
+4 _Summary
+    Summary
 
    +-----------------------------------------------------------+
    |                   USE Deviceparameters                    |
@@ -17155,6 +17671,8 @@
    |---------------------+-----+----+------+------+------+-----|
    | [NO]CENABLE         | X   |    |      |      |      |     |
    |---------------------+-----+----+------+------+------+-----|
+   | [I|O]CHSET          | X   | X  | X    | X    | X    | X   |
+   |---------------------+-----+----+------+------+------+-----|
    | CLEARSCREEN         | X   |    |      |      |      |     |
    |---------------------+-----+----+------+------+------+-----|
    | CONNECT             |     |    |      |      |      | X   |
@@ -17169,39 +17687,37 @@
    |---------------------+-----+----+------+------+------+-----|
    | DOWNSCROLL          | X   |    |      |      |      |     |
    |---------------------+-----+----+------+------+------+-----|
-   | [NO]EBCDIC          |     |    |      |      |      |     |
-   |---------------------+-----+----+------+------+------+-----|
    | [NO]ECHO            | X   |    |      |      |      |     |
    |---------------------+-----+----+------+------+------+-----|
-   | [NO]EMPT[ERM]       | X   |    |      |      |      |     |
+   | [NO]EMPTERM         | X   |    |      |      |      |     |
    |---------------------+-----+----+------+------+------+-----|
    | ERASELINE           | X   |    |      |      |      |     |
    |---------------------+-----+----+------+------+------+-----|
-   | ERASETAPE           |     |    |      |      |      |     |
-   |---------------------+-----+----+------+------+------+-----|
    | [NO]ESCAPE          | X   |    |      |      |      |     |
    |---------------------+-----+----+------+------+------+-----|
-   | EXCEPTION=expr      | X   | X  | X    |      | X    | X   |
+   | EXCEPTION=expr      | X   | X  | X    | X    | X    | X   |
    |---------------------+-----+----+------+------+------+-----|
    | [NO]FILTER[=expr]   | X   |    |      |      | X    | X   |
    |---------------------+-----+----+------+------+------+-----|
-   | FLUSH               | X   |    |      |      |      |     |
+   | FLUSH               | X   |    |      |      |      | X   |
    |---------------------+-----+----+------+------+------+-----|
    | [NO]FOLLOW          |     | X  |      |      |      |     |
    |---------------------+-----+----+------+------+------+-----|
    | [NO]HOSTSYNC        | X   |    |      |      |      |     |
    |---------------------+-----+----+------+------+------+-----|
-   | KEY                 |     | X  | X    | X    |      |     |
-   |---------------------+-----+----+------+------+------+-----|
    | IKEY                |     | X  | X    | X    |      |     |
    |---------------------+-----+----+------+------+------+-----|
-   | IOERROR             |     |    |      |      |      | X   |
-   |---------------------+-----+----+------+------+------+-----|
    | INREWIND            |     | X  |      |      |      |     |
    |---------------------+-----+----+------+------+------+-----|
    | INSEEK              |     | X  |      |      |      |     |
    |---------------------+-----+----+------+------+------+-----|
-   | [Z]LENGTH=expr      | X   | X  | X    |      | X    | X   |
+   | IOERROR             |     |    |      |      |      | X   |
+   |---------------------+-----+----+------+------+------+-----|
+   | KEY                 |     | X  | X    | X    |      |     |
+   |---------------------+-----+----+------+------+------+-----|
+   | [Z]LENGTH=expr      | X   | X  | X    | X    | X    | X   |
+   |---------------------+-----+----+------+------+------+-----|
+   | LISTEN              |     |    |      |      |      | X   |
    |---------------------+-----+----+------+------+------+-----|
    | OKEY                |     | X  | X    | X    |      |     |
    |---------------------+-----+----+------+------+------+-----|
@@ -17211,20 +17727,12 @@
    |---------------------+-----+----+------+------+------+-----|
    | [NO]PASTHRU         | X   |    |      |      |      |     |
    |---------------------+-----+----+------+------+------+-----|
-   | [NO]RCHK            |     |    |      |      |      |     |
-   |---------------------+-----+----+------+------+------+-----|
-   | [NO]RETRY           |     |    |      |      |      |     |
-   |---------------------+-----+----+------+------+------+-----|
    | REWIND              |     | X  |      |      |      |     |
    |---------------------+-----+----+------+------+------+-----|
    | SEEK=strexpr        |     | X  |      |      |      |     |
    |---------------------+-----+----+------+------+------+-----|
-   | SKIPFILE=intexpr    |     |    |      |      |      |     |
-   |---------------------+-----+----+------+------+------+-----|
    | SOCKET              |     |    |      |      |      | X   |
    |---------------------+-----+----+------+------+------+-----|
-   | SPACE=intexpr       |     |    |      |      |      |     |
-   |---------------------+-----+----+------+------+------+-----|
    | TERMINATOR[=expr]   | X   |    |      |      |      |     |
    |---------------------+-----+----+------+------+------+-----|
    | [NO]TRUNCATE        |     | X  |      |      |      |     |
@@ -17233,16 +17741,10 @@
    |---------------------+-----+----+------+------+------+-----|
    | UPSCROLL            | X   |    |      |      |      |     |
    |---------------------+-----+----+------+------+------+-----|
-   | [NO]WCHK            |     |    |      |      |      |     |
-   |---------------------+-----+----+------+------+------+-----|
    | [Z]WIDTH=intexpr    | X   | X  | X    | X    | X    | X   |
    |---------------------+-----+----+------+------+------+-----|
    | [NO]WRAP            | X   | X  | X    | X    | X    | X   |
    |---------------------+-----+----+------+------+------+-----|
-   | WRITELB=expr        |     |    |      |      |      |     |
-   |---------------------+-----+----+------+------+------+-----|
-   | WRITETM             |     |    |      |      |      |     |
-   |---------------------+-----+----+------+------+------+-----|
    | X=intexpr           | X   |    |      |      | X    |     |
    |---------------------+-----+----+------+------+------+-----|
    | Y=intexpr           | X   |    |      |      | X    |     |
@@ -17253,9 +17755,7 @@
    |---------------------+-----+----+------+------+------+-----|
    | Z[NO]FF             |     |    |      |      |      | X   |
    |---------------------+-----+----+------+------+------+-----|
-   | ZIBUFSIZE           |     |    |      |      |      | X   |
-   |---------------------+-----+----+------+------+------+-----|
-   | LISTEN              |     |    |      |      |      | X   |
+   | ZIBFSIZE            |     |    |      |      |      | X   |
    +-----------------------------------------------------------+
 
 3 Close
@@ -17314,31 +17814,27 @@
    |                                               |
    | SOC: Valid for Socket devices                 |
    |-----------------------------------------------|
-   | DELETE                |     | X  | X    |     |
+   | DELETE                |     | X  | X    | X   |
    |-----------------------+-----+----+------+-----|
    | DESTROY               |     | X  | X    | X   |
    |-----------------------+-----+----+------+-----|
-   | ERASETAPE=expr        |     |    |      |     |
-   |-----------------------+-----+----+------+-----|
-   | EXCEPTION=expr        | X   | X  | X    | X   |
+   | EXCEPTION             | X   | X  | X    | X   |
    |-----------------------+-----+----+------+-----|
-   | GROUP=expr            |     | X  |      |     |
+   | GROUP                 |     | X  | X    |     |
    |-----------------------+-----+----+------+-----|
-   | OWNER=expr            |     | X  |      |     |
+   | OWNER                 |     | X  | X    |     |
    |-----------------------+-----+----+------+-----|
-   | RENAME=expr           |     | X  |      |     |
+   | RENAME                |     | X  | X    |     |
    |-----------------------+-----+----+------+-----|
-   | REWIND                |     |    |      |     |
+   | REWIND                |     | X  |      |     |
    |-----------------------+-----+----+------+-----|
    | SOCKET                |     |    |      | X   |
    |-----------------------+-----+----+------+-----|
-   | SPACE                 |     |    |      |     |
-   |-----------------------+-----+----+------+-----|
-   | SYSTEM=expr           |     | X  |      |     |
+   | SYSTEM                |     | X  | X    |     |
    |-----------------------+-----+----+------+-----|
-   | UIC=group name        |     | X  |      |     |
+   | UIC                   |     | X  | X    |     |
    |-----------------------+-----+----+------+-----|
-   | WORLD=expr            |     | X  |      |     |
+   | WORLD                 |     | X  | X    |     |
    +-----------------------------------------------+
 
    **Note**
@@ -17730,13 +18226,10 @@
 
    entryref: return-value routine-name (parameter, parameter, ... )
 
-   where entryref is an M entryref,
-
-   return-value is gtm_long_t, gtm_status_t, or void.
-
-   and
+   where entryref is an M entryref, return-value is gtm_long_t, gtm_status_t,
+   or void, and parameters are in the format:
 
-   parameters are in the format: direction:type [num]
+   direction:type [num]
 
    where [num] indicates a pre-allocation value explained later in this
    chapter.
@@ -19852,6 +20345,15 @@
    where tablename is the name of the patcode table within the file pointed
    to by gtm_pattern_file.
 
+   **Warning**
+
+   GT.M performs operations on literals at compile time and the pattern codes
+   settings may have an impact on such operations. Therefore, it is safest to
+   either always compile with the same pattern code settings as those used at
+   runtime. If changes to pattern codes are required at run time, "hide" any
+   patterns used on literal expressions from the compiler (which are
+   uncommon) using XECUTE commands or indirection.
+
    Within an active process, the patcode table is established using the M
    VIEW command and the %PATCODE utility. Before invoking the %PATCODE
    utility, you may use VIEW to load pattern definition files for GT.M. The
@@ -20791,6 +21293,11 @@
    region-disambiguator identifies a region which holds a trigger that is not
    mapped by $ZGBLDIR, these features treat the trigger as not found.
 
+   ZPRINT or $TEXT() of trigger code may be out-of-date if the process
+   previously loaded the code, but a $ZTRIGGER() or MUPIP TRIGGER has since
+   changed the code. In other words, execution of a trigger (not $TEXT())
+   ensures that trigger code returned with $TEXT() is current.
+
 Appendix A. M Coding Standards - Do's and Don'ts
 
 2 M_Coding_Standards_-_Do's_and_Don'ts
diff --git a/sr_port/mupfndfil.c b/sr_port/mupfndfil.c
index 60d9b37..c0fe05f 100755
--- a/sr_port/mupfndfil.c
+++ b/sr_port/mupfndfil.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2014 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -21,16 +22,13 @@
 #include "filestruct.h"
 #include "jnl.h"
 #include "util.h"
-#if defined(UNIX)
 #include "parse_file.h"
 #include "is_raw_dev.h"
-#endif
 #include "gtmmsg.h"
 #include "gtm_file_stat.h"
 
-GBLREF 	jnl_gbls_t	jgbl;
-
 error_def(ERR_NOUSERDB);
+error_def(ERR_REGFILENOTFOUND);
 
 /* mupfndfil.c
  * Description:
@@ -43,7 +41,7 @@ error_def(ERR_NOUSERDB);
  * Side Effects:
  *	reg->dyn.addr->fname_len and reg->dyn.addr->fname are updated
  */
-boolean_t mupfndfil(gd_region *reg, mstr *filestr)
+boolean_t mupfndfil(gd_region *reg, mstr *filestr, boolean_t log_error)
 {
 	char 	filename[MAX_FN_LEN];
 	mstr 	file, def, ret, *retptr;
@@ -51,21 +49,15 @@ boolean_t mupfndfil(gd_region *reg, mstr *filestr)
 
 	switch(reg->dyn.addr->acc_meth)
 	{
-	case dba_mm:
-	case dba_bg:
-		break;
-#	ifdef VMS
-	case dba_usr:
-		gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_NOUSERDB, 4, LEN_AND_LIT("specified function"), REG_LEN_STR(reg));
-		return FALSE;		/* This is currently a VMS only possibility and has no corresponding test case */
-#	endif
-	default:
-		util_out_print("REGION !AD has an unrecognized access method.", TRUE, REG_LEN_STR(reg));
-		return FALSE;
+		case dba_mm:
+		case dba_bg:
+			break;
+		default:
+			util_out_print("REGION !AD has an unrecognized access method.", TRUE, REG_LEN_STR(reg));
+			return FALSE;
 	}
 	file.addr = (char *)reg->dyn.addr->fname;
 	file.len = reg->dyn.addr->fname_len;
-#if defined(UNIX)
 	file.addr[file.len] = 0;
 	if (is_raw_dev(file.addr))
 	{
@@ -76,10 +68,6 @@ boolean_t mupfndfil(gd_region *reg, mstr *filestr)
 		def.addr = DEF_DBEXT;	/* UNIX need to pass "*.dat" but reg->dyn.addr->defext has "DAT" */
 		def.len = SIZEOF(DEF_DBEXT) - 1;
 	}
-#elif defined(VMS)
-	def.addr = (char *)reg->dyn.addr->defext;
-	def.len = SIZEOF(reg->dyn.addr->defext);
-#endif
 	if (NULL == filestr)
 	{
 		ret.len = SIZEOF(filename);
@@ -89,12 +77,9 @@ boolean_t mupfndfil(gd_region *reg, mstr *filestr)
 		retptr = filestr;
 	if (FILE_PRESENT != gtm_file_stat(&file, &def, retptr, FALSE, &ustatus))
 	{
-		if (!jgbl.mupip_journal)
-		{	/* Do not print error messages in case of call from mur_open_files().
-			 * Currently we use "jgbl.mupip_journal" to identify a call from mupip_recover code */
-			util_out_print("REGION !AD's file !AD cannot be found.", TRUE, REG_LEN_STR(reg), LEN_AND_STR(file.addr));
-			gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(1) ustatus);
-		}
+		if (log_error)
+			gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(7)
+						ERR_REGFILENOTFOUND, 4, LEN_AND_STR(file.addr), REG_LEN_STR(reg), ustatus);
 		return FALSE;
 	}
 	reg->dyn.addr->fname_len = retptr->len;
diff --git a/sr_port/mupint.h b/sr_port/mupint.h
index e1db768..c62fc92 100755
--- a/sr_port/mupint.h
+++ b/sr_port/mupint.h
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2014 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -18,6 +19,9 @@
 #define	MUINTKEY_TRUE		1 /* -subscript was specified as part of mupip integ */
 #define	MUINTKEY_NULLSUBS	2 /* -subscript was specified as part of mupip integ AND there was at least one null subscript */
 
+#define	RETURN_AFTER_DB_OPEN_FALSE	FALSE
+#define	RETURN_AFTER_DB_OPEN_TRUE	TRUE
+
 #define	NO_ONLINE_ERR_MSG	"ONLINE qualifier for this region will be ignored"
 
 #define DEFAULT_ADJACENCY 10
@@ -44,17 +48,6 @@ typedef	struct global_list_struct
 	char				key[MAX_MIDENT_LEN + 1];	/* max key length plus one for printf terminator */
 	int4				keysize;			/* length of the key */
 } global_list;
-#ifdef BIGENDIAN
-typedef struct
-{	unsigned int	two : 4;
-	unsigned int	one : 4;
-} sub_num;
-#else
-typedef struct
-{	unsigned int	one : 4;
-	unsigned int	two : 4;
-} sub_num;
-#endif
 
 enum sn_type
 {
@@ -81,9 +74,9 @@ boolean_t mu_int_blk(block_id blk, char level, boolean_t is_root, unsigned char
 	int bot_len, unsigned char *top_key, int top_len, boolean_t eb_ok);
 boolean_t mu_int_fhead(void);
 boolean_t mu_int_init(void);
-void mu_int_reg(gd_region *reg, boolean_t *return_value);
+void mu_int_reg(gd_region *reg, boolean_t *return_value, boolean_t return_after_open);
 int mu_int_getkey(unsigned char *key_buff, int keylen);
-uchar_ptr_t mu_int_read(block_id blk, enum db_ver *ondsk_blkver);
+uchar_ptr_t mu_int_read(block_id blk, enum db_ver *ondsk_blkver, uchar_ptr_t *free_buff);
 void mu_int_err(int err, boolean_t do_path, boolean_t do_range, unsigned char *bot, int has_bot,
 	unsigned char *top, int has_top, unsigned int level);
 void mu_int_maps(void);
diff --git a/sr_port/mupip.hlp b/sr_port/mupip.hlp
index 56ee7b1..5071e66 100755
--- a/sr_port/mupip.hlp
+++ b/sr_port/mupip.hlp
@@ -92,6 +92,12 @@
    on the circumstances it encounters and the qualifiers with which it is
    invoked.
 
+   **Note**
+
+   MUPIP commands that need standalone access issue a MUUSERLBK error on a
+   crashed replication-enabled database and MUUSERECOV error in case of a
+   non-replicated-but-journaled database.
+
 2 Syntax
    Syntax
 
@@ -459,7 +465,8 @@
    **Note**
 
    The replication instance file should always be backed up with the database
-   file.
+   file. The source server for the instance must be started at least once
+   before backing up the replication instance file.
 
    The format of the REPLINSTANCE qualifier is:
 
@@ -673,9 +680,25 @@
    The MUPIP DOWNGRADE command changes the file header format to V4 or V5.
    The format of the MUPIP DOWNGRADE command is:
 
-   D[OWNGRADE] -V[ERSION]={V4|V5} file-name
+   D[OWNGRADE] -V[ERSION]={V4|V5|V63000A} file-name
 
-   For V4:
+   **Note**
+
+   You must perform a GT.M database integrity check using the -noonline
+   parameter prior to downgrading a database. The integrity check verifies
+   and clears database header fields required for an orderly downgrade. If an
+   integrity check is not possible due to time constraints, please rely on a
+   rolling upgrade scheme using replication and / or take a backup prior to
+   upgrading the database.
+
+3 VERSION
+   VERSION
+
+   V4 and V5 specifies file header format. For more information on the
+   downgrade criteria for your database, refer to the release notes document
+   of your current GT.M version.
+
+   V4:
 
      o It reduces the size from 8 bytes to 4 bytes for fields like current
        transaction (CTN), maximum tn (MTN) and others that contain
@@ -685,21 +708,12 @@
        In such a case, perform a MUPIP EXTRACT -FORMAT=ZWR operation on the
        V5 database and then perform a MUPIP LOAD operation on a V4 database.
 
-3 VERSION
-   VERSION
-
-   Specifies file header format. For more information on the downgrade
-   criteria for your database, refer to the release notes document of your
-   current GT.M version.
+   V63000A:
 
-   **Note**
-
-   You must perform a GT.M database integrity check using the -noonline
-   parameter prior to downgrading a database. The integrity check verifies
-   and clears database header fields required for an orderly downgrade. If an
-   integrity check is not possible due to time constraints, please rely on a
-   rolling upgrade scheme using replication and / or take a backup prior to
-   upgrading the database.
+   V63000A downgrades to any release older than V6.3-001. All releases up to
+   V6.3-000A have an empty 512-bytes block logically after the last usable
+   database block. VERSION=V63000A changes this terminating block from having
+   the current size of a database block to 512-bytes.
 
 3 Examples
    Examples
@@ -710,6 +724,62 @@
 
    This command changes the file-header of mumps.dat to V4 format.
 
+2 DUMPFHEAD
+   DUMPFHEAD
+
+   The MUPIP DUMPFHEAD command displays information about one or more
+   database files. The format of the MUPIP DUMPFHEAD command is:
+
+   DU[MPFHEAD]  {-FI[LE] file-name |-REG[ION] region-list}
+
+3 FILE
+   FILE
+
+   Specifies the name of the database file for the MUPIP DUMPFHEAD operation.
+   -FILE does not require a Global Directory. The format of the FILE
+   qualifier is:
+
+   -FI[LE] database-file-name
+
+     o The database file name must include the absolute or relative path.
+     o The -FILE qualifier is incompatible with the -REGION qualifier.
+
+3 REGION
+   REGION
+
+   Specifies that the INTEG parameter identifies one or more regions rather
+   than a database file. The format of the REGION qualifier is:
+
+   -R[EGION] region-list
+
+     o The region-list identifies the target of DUMPFHEAD. region-list may
+       specify more than one region of the current global directory in a
+       list. Regions are case-insensitive, separated by a comma, and
+       wildcards can be used to specify them. Any region-name may include the
+       wildcard characters * and ? (remember to escape them to protect them
+       from inappropriate expansion by the shell). Any region name expansion
+       occurs in M (ASCII) collation order.
+     o The region-list argument may specify more than one region of the
+       current Global Directory in a list separated with commas. DUMPFHEAD
+       -REGION requires the environment variable gtmgbldir to specify a valid
+       Global Directory.
+     o The -REGION qualifier is incompatible with the -FILE qualifier.
+
+3 Examples
+   Examples
+
+   Example:
+
+   $ mupip dumpfhead -file mumps.dat
+
+   This command lists information about the database file mumps.dat in the
+   current working directory.
+
+   $ mupip dumpfhead -region "*"
+
+   This command lists information about all the database files mapped by the
+   global directory specified by $gtmgbldir.
+
 2 ENDIANCVT
    ENDIANCVT
 
@@ -1115,7 +1185,7 @@
 
    The format of the MUPIP FREEZE command is:
 
-   F[REEZE] {-OF[F] [-OV[ERRIDE]]|-ON [-R[ECORD]]} region-list
+   F[REEZE] {-OF[F] [-OV[ERRIDE]]|-ON [[-ONL[INE] [-[NO]AUTORELEASE]] | [-NOONL[INE]] [-R[ECORD]]]} region-list
 
      o The region-list identifies the target of the FREEZE. region-list may
        specify more than one region of the current global directory in a
@@ -1124,10 +1194,11 @@
        wildcard characters * and % (remember to escape them to protect them
        from inappropriate expansion by the shell). Any region name expansion
        occurs in M (ASCII) collation order.
-     o MUPIP FREEZE waits for one minute so that concurrent KILL or MUPIP
-       REORG operations can complete. If the KILL or MUPIP REORG commands do
-       not complete within one minute, MUPIP FREEZE terminates operations and
-       unfreezes any regions it had previously marked as frozen.
+     o MUPIP FREEZE waits for up to one minute so that concurrent KILL or
+       MUPIP REORG operations can complete. If the KILL or MUPIP REORG
+       commands do not complete within one minute, MUPIP FREEZE unfreezes any
+       regions it had previously marked as frozen and terminates with an
+       error.
      o To ensure that a copy or reorganized version of a database file
        contains a consistent set of records, concurrent MUPIP utilities, such
        as BACKUP (without the ONLINE qualifier) and EXTRACT, include
@@ -1136,11 +1207,19 @@
        qualifier with BACKUP.
      o A MUPIP FREEZE can be removed only by the user who sets the FREEZE or
        by using -OVERRIDE.
-     o After MUPIP FREEZE -ON, processes that are attempting updates "hang"
-       until the FREEZE is removed by the MUPIP FREEZE -OFF command or DSE.
-       Make sure that procedures for using MUPIP FREEZE, whether manual or
-       automated, include provisions for removing the FREEZE in all
-       appropriate cases, including when errors disrupt the normal flow.
+     o A MUPIP FREEZE -ON can specify either -NOONLINE, the default, or
+       -ONLINE, and if -ONLINE, can specify either -AUTORELEASE, the default,
+       or -NOAUTORELEASE.
+     o A FREEZE specifying -ONLINE attempts to minimize the impact of the
+       FREEZE on concurrently updating processes.
+     o A FREEZE specifying -ONLINE -AUTORELEASE allows updates to continue
+       immediately when GT.M needs to update the database file.
+     o After MUPIP FREEZE -ON -NOONLINE, processes that are attempting
+       updates "hang" until the FREEZE is removed by the MUPIP FREEZE -OFF
+       command or DSE. Make sure that procedures for using MUPIP FREEZE,
+       whether manual or automated, include provisions for removing the
+       FREEZE in all appropriate cases, including when errors disrupt the
+       normal flow.
      o A -RECOVER/-ROLLBACK for a database reverts to a prior database update
        state. Therefore, a -RECOVER/-ROLLBACK immediately after a MUPIP
        FREEZE -ON removes the freeze. However, -RECOVER/-ROLLBACK does not
@@ -1155,8 +1234,10 @@
 
    The optional qualifiers are:
 
+   -[NO]A[UTORELEASE] - only valid with -ONLINE
+   -ON[LINE] - only valid with -ON
    -OV[ERRIDE]
-   -R[ECORD]
+   -R[ECORD] - only valid with -ON
 
 3 OFf
    OFf
@@ -1167,6 +1248,10 @@
 
    OF[F]
 
+     o A FREEZE -OFF which turns off a FREEZE -ONLINE -AUTORELEASE produces a
+       OFRZNOTHELD warning to indicate that the freeze was automatically
+       released and therefore did not protect whatever concurrent actions it
+       was intended to guard.
      o When used with -OVERRIDE, -OFF stops a freeze operation set by a
        process with a different userid.
      o Incompatible with: -ON, -RECORD
@@ -1181,6 +1266,75 @@
 
    Incompatible with: -OFF, -OVERRIDE
 
+3 [NO]A[UTORELEASE
+   [NO]A[UTORELEASE
+
+   Controls the behavior of a FREEZE specified with -ONLINE when GT.M must
+   write to a database file. The format of the AUTORELEASE qualifier is:
+
+   -[NO]A[UTORELEASE]
+
+     o -AUTORELEASE, the default, causes GT.M to release the freeze if it
+       needs to update the file before a FREEZE -OFF.
+     o -NOAUTORELEASE causes GT.M to hold off actions that need to update the
+       database file until someone issues a MUPIP FREEZE -OFF.
+     o -The actions that require GT.M to write to the database file are:
+
+          o Insufficient global buffers to hold updates - GT.M must flush
+            buffers to make space to do any additional updates
+          o Insufficient space in the database to hold updates - GT.M must
+            extend the file
+          o The journal file reaches its maximum size or someone issues a
+            MUPIP SET -JOURNAL command - GT.M must create a new journal file
+          o An epoch comes due - GT.M must create a checkpoint
+          o Someone issues a MUPIP BACKUP command - GT.M must record state
+            information to mark the beginning of the backup
+
+     o When an -AUTORELEASE abandons a FREEZE, any actions that depend on the
+       stability of the database file on secondary storage, such as a
+       database copy, lose that protection and are not reliable, so they
+       likely need to be repeated at a time when an -AUTORELEASE is less
+       likely or when -NOONLINE is more appropriate.
+     o An -AUTORELEASE action produces an OFRZAUTOREL message in the operator
+       log.
+     o An -AUTORELEASE action requires a FREEZE -OFF to reestablish a normal
+       database state.
+     o Incompatible with: -OFF, -NOONLINE
+
+3 ONLine
+   ONLine
+
+   Controls the potential impact of a FREEZE on concurrently updating
+   processes. The format of the ONLINE qualifier is:
+
+   -[NO]ONL[INE]
+
+     o ON -NOONLINE, the default, causes the freeze to last until OFF, and
+       makes management of the FREEZE straightforward.
+     o ON -ONLINE, causes GT.M to attempt to minimize the impact of the
+       FREEZE on concurrently updating processesby taking a number of
+       actions, as appropriate:
+
+          o Switching journal files to provide maximum space
+          o Performing an epoch to provide maximum time to the next epoch
+          o Flushing the global buffers to make all available to hold updates
+          o Incompatible with: -AUTORELEASE, -OFF
+
+     o After performing these preparations, -ONLINE allows updating processes
+       to make updates to global buffers but defer flushing them to the
+       database file.
+     o -ONLINE cannot apply to MM databases, so a FREEZE -ONLINE skips any MM
+       regions it encounters.
+     o Refer to -AUTORELEASE above for additional information.
+     o Incompatible with: -OFF
+
+   **Note**
+
+   If a database is nearly full, and you about to use MUPIP FREEZE -ON
+   -ONLINE, you may want to use MUPIP EXTEND first as a database file
+   extension will either AUTORELEASE or "harden" the -ONLINE freeze
+   effectively into a -NOONLINE freeze.
+
 3 OVerride
    OVerride
 
@@ -1192,7 +1346,7 @@
 
      o OVERRIDE should not be necessary (and may even be dangerous) in most
        schemes.
-     o Incompatible with: -ON, -RECORD
+     o Incompatible with: -AUTORELEASE, -ON, -ONLINE -RECORD
 
 3 Record
    Record
@@ -1661,7 +1815,7 @@
    subscripts with a colon (:). -SUBSCRIPT cannot detect incorrectly marked
    busy errors. The format of the SUBSCRIPT qualifier is:
 
-   -S[UBSCRIPT]=subscript
+   -SU[BSCRIPT]=subscript
 
    Specify SUBSCRIPT only if the path to the keys in the subscript is not
    damaged. If the path is questionable or known to be damaged, use DSE to
@@ -1669,6 +1823,23 @@
 
    Incompatible with: -BLOCK, -TN_RESET
 
+3 Stats
+   Stats
+
+   Specifies INTEG to check any active statistics database associated with
+   the region(s) specified for the command. The format of the STATS qualifier
+   is:
+
+   -[NO]ST[ATS]
+
+   Specify STATS only if you have reason to understand that statistics
+   reporting is failing with database errors or reporting incorrect results.
+   Because -FILE requires standalone access and statistic databases are
+   automatically created and removed it is incompatible with -STATS. The
+   default is NOSTATS.
+
+   Incompatible with: -BLOCK, -FILE, -TN_RESET
+
 3 TN_reset
    TN_reset
 
@@ -2188,7 +2359,7 @@
     -S[ELECT]=global-name-list
     -T[RUNCATE][=percentage]
     -UP[GRADE]
-    -REG[ION]=region-list
+    -REG[ION] region-list
    ]
 
    **Note**
@@ -2319,6 +2490,15 @@
    instances, FIS recommends running this operation on replicating secondary
    instances, rather than on originating primary instances.
 
+   **Note**
+
+   MUPIP REORG -ENCRYPT does not enable switching between encryption
+   algorithms. To migrate databases from Blowfish CFB to AES CFB requires
+   that the data be extracted and loaded into newly created database files.
+   To minimize the time your application is unavailable, you can deploy your
+   application in a Logical Multi-Site (LMS) configuration, and migrate using
+   a rolling upgrade technique.
+
 3 Exclude
    Exclude
 
@@ -2433,7 +2613,7 @@
 
    The format of the REGION qualifier is:
 
-   -R[EGION]=region-list
+   -R[EGION] region-list
 
    region-list may specify more than one region of the current global
    directory in a list. Regions are case-insensitive, separated by a comma,
@@ -2676,6 +2856,9 @@
    A successful MUPIP RUNDOWN of a database region removes any current MUPIP
    FREEZE.
 
+   RUNDOWN -FILE can be directed to a statistics database file and works even
+   if the corresponding actual database file does not exist.
+
    To ensure database integrity, all system shutdown algorithms should
    include scripts that stop at GT.M processes and perform RUNDOWN on all
    database files.
@@ -2689,7 +2872,9 @@
 
    If the RUNDOWN command does not specify either -File or -Region, it checks
    all the IPC resources (shared memory) on the system and if they are
-   associated with a GT.M database, attempts to rundown that file.
+   associated with a GT.M database, attempts to rundown that file. MUPIP
+   RUNDOWN with no argument removes any statistics database file resources
+   associated with actual database file resources it can remove.
 
 3 File
    File
@@ -2761,7 +2946,8 @@
    The format of the SET command is:
 
    SE[T] {-FI[LE] file-name|-JN[LFILE] journal-file-name|-REG[ION] region-list|-REP[LICATION]={ON|OFF}}
-    -A[CCESS_METHOD]={BG|MM}
+    -AC[CESS_METHOD]={BG|MM}
+    -[NO]AS[YNCIO]
     -[NO]DE[FER_TIME][=seconds]
     -[NO]DEFER_ALLOCATE
     -E[XTENSION_COUNT]=integer(no of blocks)
@@ -2772,6 +2958,7 @@
     -K[EY_SIZE]=bytes
     -L[OCK_SPACE]=integer
     -M[UTEX_SLOTS]=integer
+    -[NO]LCK_SHARES_DB_CRIT
     -PA[RTIAL_RECOV_BYPASS]
     -[NO]Q[DBRUNDOWN]
     -REC[ORD_SIZE]=bytes
@@ -2780,7 +2967,8 @@
     -RES[ERVED_BYTES]=integer]
     -SLEE[P_SPIN_COUNT]=integer
     -SPIN[_SLEEP_LIMIT]=nanoseconds
-    -S[TANDALONENOT]
+    -STAN[DALONENOT]
+    -[NO]STAT[S]
     -V[ERSION]={V4|V6}
     -W[AIT_DISK]=integer
 
@@ -2842,14 +3030,25 @@
 
    Incompatible with: -FILE, -JNLFILE and -REGION
 
-3 Access_method
-   Access_method
+3 ACcess_method
+   ACcess_method
 
    Specifies the access method (GT.M buffering strategy) for storing and
    retrieving data from the global database file. The format of the
    ACCESS_METHOD qualifier is:
 
-   -A[CCESS_METHOD]=code
+   -AC[CESS_METHOD]=code
+
+3 ASyncIO
+   ASyncIO
+
+   Specifies whether to use asynchronous I/O for an access method BG
+   database, rather than using synchronous I/O through the file system cache.
+   ASYNCIO is incompatible with the MM access method and an attempt to
+   combine the two with MUPIP SET produces a ASYNCIONOMM error. The format of
+   the ASYNCIO qualifier is:
+
+   -[NO]AS[YNCIO]
 
 3 Defer_time
    Defer_time
@@ -3003,6 +3202,17 @@
 
    -M[UTEX_SLOTS]=integer
 
+3 Lck_shares_db_crit
+   Lck_shares_db_crit
+
+   Specifies whether LOCK actions share the same resource and management as
+   the database or use a separate resource and management. The format of the
+   LCK_SHARES_DB_CRIT qualifier is:
+
+    -[NO]LC[K_SHARES_DB_CRIT]
+
+   The default is Sep(arate)/FALSE.
+
 3 Qdbrundown
    Qdbrundown
 
@@ -3115,6 +3325,15 @@
        and unless, you have data from testing and benchmarking that
        demonstrates a benefit from a change.
 
+3 STATs
+   STATs
+
+   Specifies specifies whether GT.M should permit statistics sharing for this
+   region. This characteristic permits operational exclusion of statistics
+   sharing for a region. The format of the STATS qualifier is:
+
+   -[NO]STAT[S]
+
 3 Version
    Version
 
@@ -3240,6 +3459,12 @@
      o If -HEURISTIC is not specified, MUPIP SIZE uses the
        ARSAMPLE,SAMPLE=1000 estimation technique.
 
+   The 2 sigma column for the two sampling techniques shows the dispersion of
+   the samples (in blocks) and the probability (rounded to a whole
+   percentage) that the actual value falls farther away from the reported
+   value by more than two sigma. With the scan method the "sample" is
+   "complete," so any inaccuracy comes from concurrent updates.
+
    **Important**
 
    For large databases, MUPIP SIZE is faster than MUPIP INTEG -FAST -FULL.
@@ -5926,7 +6151,7 @@
 
    Command Syntax:
 
-   mupip replicate -instance_create -name=<instance name> [-noreplace] [-supplementary]
+   mupip replicate -instance_create -name=<instance name> [-noreplace] [-supplementary] [-noqdbrundown]
 
    Qualifiers:
 
@@ -5959,6 +6184,40 @@
    Specifies that the replication instance file is suitable for use in a
    supplementary instance.
 
+   -noqdbrundown
+
+   Permits more than 32,767 udpating processes to concurrently the
+   replication instance file and database file(s). The default
+   (-noqdbrundown) permits up to 32,767 concurrent updating processes to
+   access a database file or a replication instance file.
+
+   This permission is effected by the QDBRUNDOWN flags in database file
+   headers and in replication instance files. When an open database file or
+   replication instance file with QDBRUNDOWN set is first concurrently
+   accessed by more than 32,767 processes, GT.M:
+
+    1. logs a NOMORESEMCNT message in the system log, and
+    2. stops counting the number of attached processes. This means that GT.M
+       cannot recognize when the number of attached processes reaches zero
+       (0) in order to release the corresponding shared resources, and
+       therefore requires explicit manual clean up of resources for an
+       orderly shutdown.
+
+   Except in application configurations that require it, FIS recommends not
+   setting QDBRUNDOWN. Not setting QDBRUNDOWN allows GT.M to clean up
+   resources, instead of putting the burden on the operational procedures.
+   Where GT.M cannot perform an orderly shutdown, an explicit, clean shutdown
+   must be performed as follows:
+
+    1. Replicated instances require a mupip journal -rollback -backward "*"
+       executed after the mupip replicate -source -shutdown command (remember
+       that even instances receiving a replication stream have one or more
+       Source Servers).
+    2. Database files that are journaled but not part of a replication
+       instance require a mupip journal -recover -backward command.
+    3. For database files that are not journaled (and hence not replicated),
+       perform a mupip rundown, or if appropriate, delete and recreate them.
+
    Example:
 
    $ export gtm_repl_instance=mutisite.repl
@@ -5978,6 +6237,7 @@
     -edit[instance] {<instance-file>|-source -jnlpool}
     {-show [-detail]|-change [-offset=] [-size=] [-value=]}
     [-name=<new-name>]
+    [-[no]qdbrundown]
 
    -editinstance
 
@@ -6048,6 +6308,12 @@
    displays the content of the replication instance file. When used with
    -jnlpool, it displays the content of the journal pool.
 
+   -[no]qdbrundown
+
+   Controls the setting of the "HDR Quick database rundown is active" field
+   in a replication instance file. For more information about this setting,
+   refer to "Create instance".
+
    Example:
 
    $ mupip replicate -editinstance -show -detail multisite.repl
@@ -6137,13 +6403,13 @@
    -buffsize=<Journal Pool size in bytes>
 
    Specifies the size of the Journal Pool. The server rounds the size up or
-   down to suit its needs. Any size less than 1 MB is rounded up to 1 MB. If
-   you do not specify a qualifier, the size defaults to the GT.M default
-   value of 64 MB. Remember that you cannot exceed the system-provided
+   down to suit its needs. Any size less than 1 MiB is rounded up to 1 MiB.
+   If you do not specify a qualifier, the size defaults to the GT.M default
+   value of 64 MiB. Remember that you cannot exceed the system-provided
    maximum shared memory. For systems with high update rates, specify a
    larger buffer size to avoid the overflows and file I/O that occur when the
    Source Server reads journal records from journal files. The maximum value
-   is 4GiB - 1.
+   is 4294967288(4GiB-8).
 
    -filter=<filter command>
 
@@ -6428,12 +6694,13 @@
    must provide the compression library. The GT.M interface for compression
    libraries accepts the zlib compression libraries without any need for
    adaptation. These libraries are included in many UNIX distributions and
-   are downloadable from the zlib home page. If you prefer to use other
-   compression libraries, you need to configure or adapt them to provide the
-   same API provided by zlib. Simple instructions for compiling zlib on a
-   number of platforms follow. Although GT.M uses zlib, zlib is not FIS
-   software and FIS does not support zlib. These instructions are merely
-   provided as a convenience to you.
+   are downloadable from the zlib home page. GT.M supports the use of the IBM
+   provided zlib library for AIX. If you prefer to use other compression
+   libraries, you need to configure or adapt them to provide the same API
+   provided by zlib. Simple instructions for compiling zlib on a number of
+   platforms follow. Although GT.M uses zlib, zlib is not FIS software and
+   FIS does not support zlib. These instructions are merely provided as a
+   convenience to you.
 
    If a package for zlib is available with your operating system, FIS
    suggests that you use it rather than building your own.
@@ -6539,7 +6806,9 @@
 
    Command syntax:
 
-   mupip replicate -source -shutdown [-timeout=<timeout in seconds>]
+   mupip replicate -source -shutdown
+    [-timeout=<timeout in seconds>]
+    [-zerobacklog]
 
    Qualifiers:
 
@@ -6554,6 +6823,11 @@
    the default timeout period is 120 seconds. If you specify -timeout=0 ,
    shutdown occurs immediately.
 
+   -zerobacklog
+
+   Shuts down the Source Server either when the backlog goes to zero or the
+   timeout expires, whichever occurs first.
+
 2 Activate_Passive_Source_Server
    Activate Passive Source Server
 
@@ -7448,162 +7722,189 @@
    Summary
 
    +------------------------------------------------------------------------------+
-   |   COMMAND   |    OBJECTS     |                MAIN QUALIFIER                 |
-   |-------------+----------------+-----------------------------------------------|
-   |             |                |-BK[UPDBJNL]=DISABLE | OFF                     |
-   |             |                |-B[YTESTREAM] -NET[TIMEOUT]=seconds            |
-   |             |                |-C[OMPREHENSIVE]                               |
-   |             |                |-DA[TABASE] -REPLA[CE]                         |
-   |             |                |-DBG                                           |
-   |             |                |-I[NCREMENTAL]                                 |
-   |             |region-name     |-[NO]J[OURNAL][=journal-options-list]          |
-   |B[ACKUP]     |                |                                               |
-   |             |file-name       |-NETTIMEOUT                                    |
-   |             |                |-[NO]NEWJNLFILES[=[NO]PREVLINK],[NO]S[YNC_IO]  |
-   |             |                |-O[NLINE]                                      |
-   |             |                |-RECORD                                        |
-   |             |                |-REPLI[NSTANCE]=OFF | ON                       |
-   |             |                |-S[INCE]={DATABASE|BYTESTREAM|RECORD}          |
-   |             |                |-T[RANSACTION=hexa;transaction_number]         |
-   |-------------+----------------+-----------------------------------------------|
-   |CR[EATE]     |-               |-R[EGION]=region-name                          |
-   |-------------+----------------+-----------------------------------------------|
-   |             |                |-OUTDB=<outdb-file>                            |
-   |EN[DIANCVT]  |file-name       |                                               |
-   |             |                |-OV[ERRIDE]                                    |
-   |-------------+----------------+-----------------------------------------------|
-   |EXI[T]       |-               |-                                              |
-   |-------------+----------------+-----------------------------------------------|
-   |EXTE[ND]     |region-name     |-B[LOCKS]=blocks                               |
-   |-------------+----------------+-----------------------------------------------|
-   |             |                |-FO[RMAT]=GO|B[INARY]|Z[WR]                    |
-   |             |                |-FR[EEZE]                                      |
-   |             |                |-LA[BEL]=text                                  |
-   |EXTR[ACT]    |-               |-[NO]L[OG]                                     |
-   |             |                |-S[ELECT]=global-name-list                     |
-   |             |                |-O[CHSET]=character-set                        |
-   |             |                |-R[EGION=region-list                           |
-   |-------------+----------------+-----------------------------------------------|
-   |             |                |-DBG                                           |
-   |             |                |-OF[F]                                         |
-   |F[REEZE]     |region-list     |                                               |
-   |             |                |-OV[ERRIDE]                                    |
-   |             |                |-ON[-R[ECORD]]                                 |
-   |-------------+----------------+-----------------------------------------------|
-   |             |                |-D[B]                                          |
-   |FT[OK]       |File-name       |-J[NLPOOL]                                     |
-   |             |                |-R[ECVPOOL]                                    |
-   |-------------+----------------+-----------------------------------------------|
-   |H[ELP]       |command-option  |-                                              |
-   |-------------+----------------+-----------------------------------------------|
-   |             |                |-A[DJACENCY]=integer]                          |
-   |             |                |-BL[OCK]=hexa;block-number]                    |
-   |             |                |-BR[IEF]                                       |
-   |             |                |-FA[ST]                                        |
-   |             |                |-FI[LE]                                        |
-   |             |                |-FU[LL]                                        |
-   |             |File-name or    |                                               |
-   |I[NTEG]      |region-list     |-NO]K[EYRANGES                                 |
-   |             |                |-[NO][MAP]=integer                             |
-   |             |                |-[NO]MAXK[EYSIZE]=integer                      |
-   |             |                |-R[EGION]                                      |
-   |             |                |-S[UBSCRIPT]=subscript                         |
-   |             |                |-TN[_RESET]                                    |
-   |             |                |-[NO]TR[ANSACTION][=integer]                   |
-   |-------------+----------------+-----------------------------------------------|
-   |             |                |-EX[TRACT][=file-specification|-stdout]        |
-   |             |                |-REC[OVER] | -RO[LLBACK]                       |
-   |J[OURNAL]    |file-name       |-SH[OW][=show-option-list]                     |
-   |             |                |-[NO]V[ERIFY]                                  |
-   |             |                |-BA[CKWARD] | -FO[RWARD]                       |
-   |-------------+----------------+-----------------------------------------------|
-   |             |                |-BE[GIN]=integer                               |
-   |             |                |-BLOCK_DENSITY                                 |
-   |             |                |-E[ND]=integer                                 |
-   |L[OAD]       |file-name       |-FI[LLFACTOR]=integer                          |
-   |             |                |-FO[RMAT]=GO|B[INARY]|Z[WR]                    |
-   |             |                |-S[TDIN]                                       |
-   |             |                |-O[NERROR]                                     |
-   |-------------+----------------+-----------------------------------------------|
-   |             |                |-DOWNGRADE                                     |
-   |             |                |-E[XCLUDE]=global-name-list                    |
-   |             |                |-FI[LL_FACTOR]=integer                         |
-   |             |                |-I[NDEX_FILL_FACTOR]=integer                   |
-   |             |                |-REG[ION]                                      |
-   |             |                |-RES[UME]                                      |
-   |REO[RG]      |                |-SA[FEJNL]                                     |
-   |             |                |-S[ELECT]=global-name-list                     |
-   |             |                |-STA[RTBLK]=hexa                               |
-   |             |                |-STO[PBLK]=hexa                                |
-   |             |                |-T[RUNCATE][=percentage]                       |
-   |             |                |-UP[GRADE]                                     |
-   |             |                |-USER_DEFINED_REORG=reorg_list                 |
-   |-------------+----------------+-----------------------------------------------|
-   |             |                |-E[DITINSTANCE]                                |
-   |             |                |-I[NSTANCE_CREATE]                             |
-   |             |                |-R[ECEIVER                                     |
-   |REP[LICATE]  |file-name       |                                               |
-   |             |                |-S[OURCE]                                      |
-   |             |                |-UPDA[TEPROC]                                  |
-   |             |                |-UPDH[ELPER]                                   |
-   |-------------+----------------+-----------------------------------------------|
-   |RE[STORE]    |file-name or    |-[NO]E[XTEND]                                  |
-   |             |file-list       |                                               |
-   |-------------+----------------+-----------------------------------------------|
-   |             |                |-F[ILE]                                        |
-   |             |file-name or    |-R[EGION]                                      |
-   |RU[NDOWN]    |region-name     |                                               |
-   |             |                |-RELINKCTL [dir]                               |
-   |             |                |-OVERRIDE                                      |
-   |-------------+----------------+-----------------------------------------------|
-   |             |                |-A[CCESS_METHOD=BG|MM]                         |
-   |             |                |-B[YPASS]                                      |
-   |             |                |-DB[FILENAME]=database_file                    |
-   |             |                |-DE[FER_TIME]=seconds                          |
-   |             |                |-E[XTENSION_COUNT]=integer(no of blocks)       |
-   |             |                |-FILE                                          |
-   |             |                |-F[LUSH_TIME]= integer                         |
-   |             |                |-G[LOBAL_BUFFERS]=integer                      |
-   |             |                |-JN[LFILE]                                     |
-   |             |file-name or    |-JO[URNAL]=journal-option-list                 |
-   |SE[T]        |region-name     |                                               |
-   |             |                |-L[OCK_SPACE]=integer                          |
-   |             |                |-PA[RTIAL_RECOV_BYPASS]                        |
-   |             |                |-PR[EVJNLFILE]=jnl_file_name                   |
-   |             |                |-RE[GION]                                      |
-   |             |                |-REPLI[CATION]=ON|OFF                          |
-   |             |                |-REPL_[STATE]=ON|OFF                           |
-   |             |                |-RES[ERVED_BYTES]=integer                      |
-   |             |                |-S[TANDALONENOT]                               |
-   |             |                |-V[ERSION]=V4|V5                               |
-   |             |                |-W[AIT_DISK]=integer                           |
-   |-------------+----------------+-----------------------------------------------|
-   |             |                |-TRIG[GERFILE]=<trigger_definitions_file>      |
-   |             |                |-NOPR[OMPT]                                    |
-   |TRIGGER      |-               |                                               |
-   |             |                |-SELE[CT][=name-list|*][<select-output-file>]  |
-   |             |                |-UPGRADE                                       |
-   |-------------+----------------+-----------------------------------------------|
-   |ST[OP]       |process-id      |process-id                                     |
-   |-------------+----------------+-----------------------------------------------|
-   |UP[GRADE]    |-               |-                                              |
+   |  COMMAND  |   OBJECTS    |                  MAIN QUALIFIER                   |
+   |-----------+--------------+---------------------------------------------------|
+   |           |              |-BK[UPDBJNL]=DISABLE | OFF                         |
+   |           |              |-B[YTESTREAM] -NET[TIMEOUT]=seconds                |
+   |           |              |-C[OMPREHENSIVE]                                   |
+   |           |              |-DA[TABASE] -REPLA[CE]                             |
+   |           |              |-DBG                                               |
+   |           |              |-I[NCREMENTAL]                                     |
+   |           |region-name   |-[NO]J[OURNAL][=journal-options-list]              |
+   |B[ACKUP]   |              |                                                   |
+   |           |file-name     |-NETTIMEOUT                                        |
+   |           |              |-[NO]NEWJNLFILES[=[NO]PREVLINK],[NO]S[YNC_IO]      |
+   |           |              |-O[NLINE]                                          |
+   |           |              |-RECORD                                            |
+   |           |              |-REPLI[NSTANCE]=OFF | ON                           |
+   |           |              |-S[INCE]={DATABASE|BYTESTREAM|RECORD}              |
+   |           |              |-T[RANSACTION=hexa;transaction_number]             |
+   |-----------+--------------+---------------------------------------------------|
+   |CR[EATE]   |-             |-R[EGION]=region-name                              |
+   |-----------+--------------+---------------------------------------------------|
+   |DO[WNGRADE]|file-name     |-V[ERION]={V4|V5}                                  |
+   |-----------+--------------+---------------------------------------------------|
+   |DU[MPFHEAD]|file-name or  |-                                                  |
+   |           |region-list   |                                                   |
+   |-----------+--------------+---------------------------------------------------|
+   |           |              |-OUTDB=<outdb-file>                                |
+   |EN[DIANCVT]|file-name     |                                                   |
+   |           |              |-OV[ERRIDE]                                        |
+   |-----------+--------------+---------------------------------------------------|
+   |EXI[T]     |-             |-                                                  |
+   |-----------+--------------+---------------------------------------------------|
+   |EXTE[ND]   |region-name   |-B[LOCKS]=blocks                                   |
+   |-----------+--------------+---------------------------------------------------|
+   |           |              |-FO[RMAT]=GO|B[INARY]|Z[WR]                        |
+   |           |              |-FR[EEZE]                                          |
+   |           |              |-LA[BEL]=text                                      |
+   |EXTR[ACT]  |-             |-[NO]L[OG]                                         |
+   |           |              |-S[ELECT]=global-name-list                         |
+   |           |              |-O[CHSET]=character-set                            |
+   |           |              |-R[EGION=region-list                               |
+   |-----------+--------------+---------------------------------------------------|
+   |           |              |-DBG                                               |
+   |F[REEZE]   |region-list   |-OF[F] [-OV[ERRIDE]]                               |
+   |           |              |-ON [-[NO]ONL[INE] [-[NO]A[UTORELEASE]]            |
+   |           |              |[-R[ECORD]]]                                       |
+   |-----------+--------------+---------------------------------------------------|
+   |           |              |-D[B]                                              |
+   |FT[OK]     |File-name     |-J[NLPOOL]                                         |
+   |           |              |-R[ECVPOOL]                                        |
+   |-----------+--------------+---------------------------------------------------|
+   |H[ELP]     |command-option|-                                                  |
+   |-----------+--------------+---------------------------------------------------|
+   |           |              |-A[DJACENCY]=integer]                              |
+   |           |              |-BL[OCK]=hexa;block-number]                        |
+   |           |              |-BR[IEF]                                           |
+   |           |              |-FA[ST]                                            |
+   |           |              |-FI[LE]                                            |
+   |           |              |-FU[LL]                                            |
+   |           |File-name or  |-NO]K[EYRANGES                                     |
+   |I[NTEG]    |region-list   |                                                   |
+   |           |              |-[NO][MAP]=integer                                 |
+   |           |              |-[NO]MAXK[EYSIZE]=integer                          |
+   |           |              |-R[EGION]                                          |
+   |           |              |-[NO]ST[ATS]                                       |
+   |           |              |-SU[BSCRIPT]=subscript                             |
+   |           |              |-TN[_RESET]                                        |
+   |           |              |-[NO]TR[ANSACTION][=integer]                       |
+   |-----------+--------------+---------------------------------------------------|
+   |           |              |-EX[TRACT][=file-specification|-stdout]            |
+   |           |              |-REC[OVER] | -RO[LLBACK]                           |
+   |J[OURNAL]  |file-name     |-SH[OW][=show-option-list]                         |
+   |           |              |-[NO]V[ERIFY]                                      |
+   |           |              |-BA[CKWARD] | -FO[RWARD]                           |
+   |-----------+--------------+---------------------------------------------------|
+   |           |              |-BE[GIN]=integer                                   |
+   |           |              |-BLOCK_DENSITY                                     |
+   |           |              |-E[ND]=integer                                     |
+   |L[OAD]     |file-name     |-FI[LLFACTOR]=integer                              |
+   |           |              |-FO[RMAT]=GO|B[INARY]|Z[WR]                        |
+   |           |              |-S[TDIN]                                           |
+   |           |              |-O[NERROR]                                         |
+   |-----------+--------------+---------------------------------------------------|
+   |           |              |-ENCR[YPT]=key                                     |
+   |           |              |-E[XCLUDE]=global-name-list                        |
+   |           |              |-FI[LL_FACTOR]=integer                             |
+   |           |              |-I[NDEX_FILL_FACTOR]=integer                       |
+   |           |              |-REG[ION]                                          |
+   |REO[RG]    |              |                                                   |
+   |           |              |-R[ESUME]                                          |
+   |           |              |-S[ELECT]=global-name-list                         |
+   |           |              |-T[RUNCATE][=percentage]                           |
+   |           |              |-UP[GRADE]                                         |
+   |           |              |-REG[ION] region-list                              |
+   |-----------+--------------+---------------------------------------------------|
+   |           |              |-E[DITINSTANCE]                                    |
+   |           |              |-I[NSTANCE_CREATE]                                 |
+   |           |              |-R[ECEIVER                                         |
+   |REP[LICATE]|file-name     |                                                   |
+   |           |              |-S[OURCE]                                          |
+   |           |              |-UPDA[TEPROC]                                      |
+   |           |              |-UPDH[ELPER]                                       |
+   |-----------+--------------+---------------------------------------------------|
+   |RE[STORE]  |file-name or  |-[NO]E[XTEND]                                      |
+   |           |file-list     |                                                   |
+   |-----------+--------------+---------------------------------------------------|
+   |           |              |-F[ILE]                                            |
+   |           |file-name or  |-R[EGION]                                          |
+   |RU[NDOWN]  |region-name   |                                                   |
+   |           |              |-RELINKCTL [dir]                                   |
+   |           |              |-OVERRIDE                                          |
+   |-----------+--------------+---------------------------------------------------|
+   |           |              |SE[T] {-FI[LE] file-name|-JN[LFILE]                |
+   |           |              |journal-file-name|-REG[ION]                        |
+   |           |              |region-list|-REP[LICATION]={ON|OFF}}               |
+   |           |              |-AC[CESS_METHOD]={BG|MM}                           |
+   |           |              |-[NO]AS[YNCIO]                                     |
+   |           |              |-[NO]DE[FER_TIME][=seconds]                        |
+   |           |              |-[NO]DEFER_ALLOCATE                                |
+   |           |              |-E[XTENSION_COUNT]=integer(no of blocks)           |
+   |           |              |-F[LUSH_TIME]=integer                              |
+   |           |              |-G[LOBAL_BUFFERS]=integer                          |
+   |           |              |-[NO]INST[_FREEZE_ON_ERROR]                        |
+   |           |              |-JN[LFILE]journal-file-name                        |
+   |           |              |-K[EY_SIZE]=bytes                                  |
+   |           |              |-L[OCK_SPACE]=integer                              |
+   |           |file-name or  |                                                   |
+   |SE[T]      |region-name   |-M[UTEX_SLOTS]=integer                             |
+   |           |              |-[NO]LCK_SHARES_DB_CRIT                            |
+   |           |              |-PA[RTIAL_RECOV_BYPASS]                            |
+   |           |              |-[NO]Q[DBRUNDOWN]                                  |
+   |           |              |-REC[ORD_SIZE]=bytes                               |
+   |           |              |-REG[ION] region-list                              |
+   |           |              |-REP[LICATION]={ON|OFF}                            |
+   |           |              |-RES[ERVED_BYTES]=integer]                         |
+   |           |              |-SLEE[P_SPIN_COUNT]=integer                        |
+   |           |              |-SPIN[_SLEEP_LIMIT]=nanoseconds                    |
+   |           |              |-STAN[DALONENOT]                                   |
+   |           |              |-[NO]STAT[S]                                       |
+   |           |              |-V[ERSION]={V4|V6}                                 |
+   |           |              |-W[AIT_DISK]=integer                               |
+   |-----------+--------------+---------------------------------------------------|
+   |           |              |-TRIG[GERFILE]=<trigger_definitions_file>          |
+   |           |              |-NOPR[OMPT]                                        |
+   |TRIGGER    |-             |                                                   |
+   |           |              |-SELE[CT][=name-list|*][<select-output-file>]      |
+   |           |              |-UPGRADE                                           |
+   |-----------+--------------+---------------------------------------------------|
+   |ST[OP]     |process-id    |process-id                                         |
+   |-----------+--------------+---------------------------------------------------|
+   |UP[GRADE]  |file-name     |-                                                  |
    +------------------------------------------------------------------------------+
 
+   The following table summarizes the qualifiers.
+
    +------------------------------------------------------------------------------------------------------------+
    |            Main Qualifier            |      MUPIP Command       |            Options/Qualifiers            |
    |--------------------------------------+--------------------------+------------------------------------------|
    |                                      |                          |-CHANGE                                   |
    |                                      |                          |-DETAIL                                   |
    |                                      |                          |-OFFSET=hexa                              |
-   |-EDITINSTANCE                         |REPLICATE                 |                                          |
-   |                                      |                          |-VALUE=hexa                               |
+   |-EDITINSTANCE                         |REPLICATE                 |-VALUE=hexa                               |
    |                                      |                          |-SIZE=hexa                                |
    |                                      |                          |-VALUE=hexa                               |
+   |                                      |                          |-[NO]QDBRUNDOWN                           |
    |--------------------------------------+--------------------------+------------------------------------------|
    |                                      |                          |ALWAYS                                    |
    |-FENCES=<fence-options-list>          |JOURNAL-RECOVER-ROLLBACK  |NONE                                      |
    |                                      |                          |PROCESS                                   |
    |--------------------------------------+--------------------------+------------------------------------------|
+   |                                      |                          |-OVERRIDE                                 |
+   |-OFF                                  |FREEZE                    |                                          |
+   |                                      |                          |-RECORD                                   |
+   |--------------------------------------+--------------------------+------------------------------------------|
+   |                                      |                          |-[NO]ONLINE                               |
+   |-ON                                   |FREEZE                    |                                          |
+   |                                      |                          |-[NO]AUTORELEASE                          |
+   |--------------------------------------+--------------------------+------------------------------------------|
+   |                                      |                          |-NAME                                     |
+   |                                      |                          |-NOREPLACE                                |
+   |-INSTANCE_CREATE                      |REPLICATE                 |                                          |
+   |                                      |                          |-SUPPLEMENTARY                            |
+   |                                      |                          |-[NO]QDBRUNDOWN                           |
+   |--------------------------------------+--------------------------+------------------------------------------|
    |                                      |                          |ALIGNSIZE=integer                         |
    |                                      |                          |ALLOCATION=integer                        |
    |                                      |                          |AUTOSWITCHLIMIT=integer                   |
@@ -7630,17 +7931,23 @@
    |                                      |                          |-CMPLVL=integer                           |
    |                                      |                          |-FILTER=filter_name                       |
    |                                      |                          |-he[lpers]=[m[,n]]                        |
+   |                                      |                          |-INITIALIZE                               |
+   |                                      |                          |-CMPLVL=n                                 |
    |                                      |                          |-LISTENPORT=integer                       |
    |                                      |                          |-LOG=logfile                              |
-   |-RECEIVER                             |REPLICATE                 |-LOG_INTERVAL=integer                     |
+   |                                      |                          |-LOG_INTERVAL=integer                     |
+   |-RECEIVER                             |REPLICATE                 |-NORESYNC                                 |
+   |                                      |                          |-RESUME=strm_num                          |
+   |                                      |                          |-REUSE=instname                           |
    |                                      |                          |-SHOWBACKLOG                              |
    |                                      |                          |-SHUTDOWN                                 |
    |                                      |                          |-START                                    |
    |                                      |                          |-STATSLOG=[ON|OFF]                        |
    |                                      |                          |-STOPSOURCEFILTER                         |
    |                                      |                          |TIMEOUT=seconds                           |
+   |                                      |                          |TLSID=label                               |
    |                                      |                          |-UPDATEONLY                               |
-   |                                      |                          |-UPDATERESYNC                             |
+   |                                      |                          |-UPDATERESYNC=/path/to/bkup-orig-inst     |
    |--------------------------------------+--------------------------+------------------------------------------|
    |                                      |                          |-AFTER=time                               |
    |                                      |                          |-APPLY_AFTER_IMAGE                        |
@@ -7725,14 +8032,18 @@
    |                                      |                          |-DEACTIVATE                               |
    |                                      |                          |-DETAIL                                   |
    |                                      |                          |-FILTER=filter_name                       |
+   |                                      |                          |-FREEZE=on|off                            |
+   |                                      |                          |-[NO]COMMENT=string                       |
    |                                      |                          |-INSTSECONDARY=secondary_instance name    |
+   |                                      |                          |-NOJNLFILEONLY                            |
    |                                      |                          |-JNLPOOL-LOG=log_file                     |
    |                                      |                          |-LOG_INTERVAL=integer                     |
-   |-SO[URCE]                             |REPLICATE                 |                                          |
    |                                      |                          |-LOSTTNCOMPLETE                           |
-   |                                      |                          |-NEEDRESTART                              |
+   |-SO[URCE]                             |REPLICATE                 |-NEEDRESTART                              |
    |                                      |                          |-PASSIVE                                  |
+   |                                      |                          |-[NO]PLAINTEXTFALLBACK                    |
    |                                      |                          |-PROPAGATEPRIMARY                         |
+   |                                      |                          |-RENEGOTIATE_INTERVAL=minutes             |
    |                                      |                          |-ROOTPRIMARY                              |
    |                                      |                          |-SECONDARY=secondary_instance_name        |
    |                                      |                          |-SHOWBACKLOG                              |
@@ -7741,12 +8052,20 @@
    |                                      |                          |-STATSLOG                                 |
    |                                      |                          |-STOPSOURCEFILTER                         |
    |                                      |                          |-TIMEOUT=seconds                          |
+   |                                      |                          |-TLSID=label                              |
+   |                                      |                          |-UPDOK                                    |
+   |                                      |                          |-UPDNOTOK                                 |
+   |                                      |                          |-ZEROBACKLOG                              |
+   |--------------------------------------+--------------------------+------------------------------------------|
+   |                                      |DOWNGRADE                 |                                          |
+   |-VERSION={V4|V5}                      |                          |file-name                                 |
+   |                                      |UPGRADE                   |                                          |
    +------------------------------------------------------------------------------------------------------------+
 
 1 Copyright
    Copyright
 
-   Copyright 2016
+   Copyright 2017
 
    Fidelity National Information Services, Inc. and/or its subsidiaries. All
    rights reserved.
@@ -7768,7 +8087,7 @@
 
    **Note**
 
-   This help file is a concise representation of revision V6.3-000 of the
+   This help file is a concise representation of revision V6.3-001 of the
    UNIX Administration and Operations Guide. To obtain a copy of the current
    revision, go to www.fis-gtm.com and then click on the User Documentation
    tab.
diff --git a/sr_port/mupip_backup.c b/sr_port/mupip_backup.c
index f3ba8f4..a920278 100755
--- a/sr_port/mupip_backup.c
+++ b/sr_port/mupip_backup.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -60,7 +60,6 @@
 #include "gtmsource.h"
 #include "do_shmat.h"		/* for do_shmat() prototype */
 #include "mutex.h"
-#include "heartbeat_timer.h"
 #include "gtm_file_stat.h"
 #include "util.h"
 #include "gtm_caseconv.h"
@@ -72,6 +71,7 @@
 #include "mu_getlst.h"
 #include "mu_outofband_setup.h"
 #include "gtmmsg.h"
+#include "wcs_backoff.h"
 #include "wcs_sleep.h"
 #include "wcs_flu.h"
 #include "trans_log_name.h"
@@ -98,7 +98,6 @@ GBLREF 	bool		error_mupip;
 GBLREF 	bool		file_backed_up;
 GBLREF 	bool		incremental;
 GBLREF 	bool		online;
-GBLREF 	uchar_ptr_t	mubbuf;
 GBLREF 	int4		mubmaxblk;
 GBLREF	tp_region	*grlist;
 GBLREF 	tp_region 	*halt_ptr;
@@ -148,6 +147,7 @@ error_def(ERR_FILEPARSE);
 error_def(ERR_FREEZECTRL);
 error_def(ERR_JNLCREATE);
 error_def(ERR_JNLDISABLE);
+error_def(ERR_JNLFILOPN);
 error_def(ERR_JNLFNF);
 error_def(ERR_JNLNOCREATE);
 error_def(ERR_JNLPOOLSETUP);
@@ -159,6 +159,7 @@ error_def(ERR_MUNOSTRMBKUP);
 error_def(ERR_MUPCLIERR);
 error_def(ERR_MUSELFBKUP);
 error_def(ERR_NOTRNDMACC);
+error_def(ERR_OFRZACTIVE);
 error_def(ERR_PERMGENFAIL);
 error_def(ERR_PREVJNLLINKCUT);
 error_def(ERR_REPLJNLCNFLCT);
@@ -243,7 +244,7 @@ void mupip_backup(void)
 	jnl_tm_t		save_gbl_jrec_time;
 	gd_region		*r_save, *reg;
 	int			sync_io_status;
-	boolean_t		sync_io, sync_io_specified, wait_for_zero_kip;
+	boolean_t		sync_io, sync_io_specified;
 	boolean_t		dummy_ftok_counter_halted, repl_inst_available;
 	struct stat		stat_buf;
 	int			fstat_res, fclose_res, tmpfd;
@@ -266,6 +267,7 @@ void mupip_backup(void)
 	uint4			*kip_pids_arr_ptr;
 	seq_num			jnl_seqno;
 	char			time_str[CTIME_BEFORE_NL + 2];	/* for GET_CUR_TIME macro */
+	struct perm_diag_data	pdd;
 	ZOS_ONLY(int		realfiletag;)
 
 	/* ==================================== STEP 1. Initialization ======================================= */
@@ -517,7 +519,7 @@ void mupip_backup(void)
 		file->addr[file->len] = '\0';
 		if (mu_ctrly_occurred || mu_ctrlc_occurred)
 			break;
-		if ((dba_bg != rptr->reg->dyn.addr->acc_meth) && (dba_mm != rptr->reg->dyn.addr->acc_meth))
+		if (!IS_REG_BG_OR_MM(rptr->reg))
 		{
 			util_out_print("Region !AD is not a BG or MM databases", TRUE, REG_LEN_STR(rptr->reg));
 			rptr->not_this_time = give_up_before_create_tempfile;
@@ -652,7 +654,21 @@ void mupip_backup(void)
 			/* give temporary files the group and permissions as other shared resources - like journal files */
 			FSTAT_FILE(((unix_db_info *)(gv_cur_region->dyn.addr->file_cntl->file_info))->fd, &stat_buf, fstat_res);
 			if (-1 != fstat_res)
-				gtm_permissions(&stat_buf, &user_id, &group_id, &perm, PERM_FILE);
+				if (!gtm_permissions(&stat_buf, &user_id, &group_id, &perm, PERM_FILE, &pdd))
+				{
+					send_msg_csa(CSA_ARG(cs_addrs) VARLSTCNT(6+PERMGENDIAG_ARG_COUNT)
+						ERR_PERMGENFAIL, 4, RTS_ERROR_STRING("backup file"),
+						RTS_ERROR_STRING(
+							((unix_db_info *)(gv_cur_region->dyn.addr->file_cntl->file_info))->fn),
+						PERMGENDIAG_ARGS(pdd));
+					gtm_putmsg_csa(CSA_ARG(cs_addrs) VARLSTCNT(6+PERMGENDIAG_ARG_COUNT)
+						ERR_PERMGENFAIL, 4, RTS_ERROR_STRING("backup file"),
+						RTS_ERROR_STRING(
+							((unix_db_info *)(gv_cur_region->dyn.addr->file_cntl->file_info))->fn),
+						PERMGENDIAG_ARGS(pdd));
+					mubclnup(rptr, need_to_del_tempfile);
+					mupip_exit(EPERM);
+				}
 			/* Setup new group and permissions if indicated by the security rules.  Use
 			 * 0770 anded with current mode for the new mode if masked permission selected.
 			 */
@@ -669,7 +685,7 @@ void mupip_backup(void)
 			}
 		} else
 		{
-			while (REG_ALREADY_FROZEN == region_freeze(gv_cur_region, TRUE, FALSE, FALSE))
+			while (REG_ALREADY_FROZEN == region_freeze(gv_cur_region, TRUE, FALSE, FALSE, FALSE, FALSE))
 			{
 				hiber_start(1000);
 				if ((TRUE == mu_ctrly_occurred) || (TRUE == mu_ctrlc_occurred))
@@ -860,6 +876,18 @@ repl_inst_bkup_done1:
 				grab_crit(gv_cur_region);
 				DEBUG_ONLY(reg_count++);
 			}
+			if (FROZEN_CHILLED(cs_data))
+			{	/* While a FREEZE -ONLINE was in place, all processes exited, leaving the
+				 * shared memory up. Either autorelease, if enabled, or error out.
+				 */
+				DO_CHILLED_AUTORELEASE(cs_addrs, cs_data);
+				if (FROZEN_CHILLED(cs_data))
+				{
+					gtm_putmsg_csa(CSA_ARG(cs_addrs) VARLSTCNT(4) ERR_OFRZACTIVE, 2, DB_LEN_STR(gv_cur_region));
+					rptr->not_this_time = give_up_before_create_tempfile;
+					continue;
+				}
+			}
 			/* We will be releasing crit if KIP is set, so don't update jgbl.gbl_jrec_time now */
 			if (!kip_count)
 			{
@@ -868,18 +896,17 @@ repl_inst_bkup_done1:
 		}
 	}
 	/* If we have KILLs in progress on any of the regions, wait a maximum of 1 minute(s) for those to finish. */
-	wait_for_zero_kip = (online && kip_count);
-	for (crit_counter = 1; wait_for_zero_kip; )
-	{	/* Release all the crits before going into the wait loop */
+	for (crit_counter = 1; online && kip_count; )
+	{	/* The purpose of this loop is to wait for kip to clear on all regions, waiting for a maximum of about a minute.
+		 * This is complicated by the fact that in spite of setting INCR_INHIBIT_KILLS above, a process in crit for a
+		 * "fourth" retry may ignote that, and set the kip flag while we are waiting
+		 */
 		DEBUG_ONLY(nocritrptr = NULL;)
 		for (rptr = (backup_reg_list *)(grlist); NULL != rptr; rptr = rptr->fPtr)
-		{
+		{	/* Release all the crits before going into the wait loop */
 			if (rptr->not_this_time > keep_going)
 				continue;
 			TP_CHANGE_REG(rptr->reg);
-			/* It is possible to not hold crit on some regions if we are in the second or higher iteration
-			 * of the outer for loop (the one with the loop variable wait_for_zero_kip).
-			 */
 			if (cs_addrs->now_crit)
 			{	/* once we encountered a region in the list that we did not hold crit on, we should also
 				 * not hold crit on all later regions in the list. assert that.
@@ -894,7 +921,7 @@ repl_inst_bkup_done1:
 		}
 		/* Wait for a maximum of 1 minute on all the regions for KIP to reset */
 		for (rptr = (backup_reg_list *)(grlist); NULL != rptr; rptr = rptr->fPtr)
-		{
+		{	/* multiple regions might have kip, but waiting on any waits on all, so just do this for 1 fixed time */
 			if (rptr->not_this_time > keep_going)
 				continue;
 			TP_CHANGE_REG(rptr->reg);
@@ -910,49 +937,23 @@ repl_inst_bkup_done1:
 				GET_C_STACK_FOR_KIP(kip_pids_arr_ptr, crit_counter, MAX_CRIT_TRY, 1, MAX_KIP_PID_SLOTS);
 				wcs_sleep(crit_counter);
 			}
-		}
-		if (debug_mupip)
-		{
-			GET_CUR_TIME(time_str);
-			util_out_print("!/MUPIP INFO: !AD : Done with kill-in-prog wait on ALL databases", TRUE,
-				CTIME_BEFORE_NL, time_str);
+			if (debug_mupip)
+			{
+				GET_CUR_TIME(time_str);
+				util_out_print("!/MUPIP INFO: !AD : Done with kill-in-prog wait on !AD", TRUE,
+					CTIME_BEFORE_NL, time_str, DB_LEN_STR(gv_cur_region));
+			}
+			if (MAX_CRIT_TRY < crit_counter)
+				break;
 		}
 		/* Since we have waited a while for KIP to get reset, get current time again to make it more accurate */
 		SET_GBL_JREC_TIME;
-		/* Most code in this for-loop is similar to the previous for loop where we grab_crit;
-		 * but most of the times the second for loop will never be executed (because KIP will be
-		 * zero on all database files) and in some rare cases, it is okay to take the hit of an
-		 * extra rel_crit/wait-for-kip/grab_crit sequence.
-		 */
-		wait_for_zero_kip = (MAX_CRIT_TRY > crit_counter);
-		kip_count = 0;
-		for (rptr = (backup_reg_list *)(grlist); NULL != rptr; rptr = rptr->fPtr)
+		for (kip_count = 0, rptr = (backup_reg_list *)(grlist); NULL != rptr; rptr = rptr->fPtr)
 		{
 			if (rptr->not_this_time > keep_going)
 				continue;
 			TP_CHANGE_REG(rptr->reg);
 			grab_crit(gv_cur_region);
-			if (cs_data->kill_in_prog)
-			{	/* It is possible for this to happen in case a concurrent GT.M process is in its 4th retry.
-				 * In that case, it will not honor the inhibit_kills flag since it holds crit and therefore
-				 * could have set kill-in-prog to a non-zero value while we were outside of crit.
-				 * Check if we have waited 1 minute until now. If not, release crit and continue the wait.
-				 * If waited already, then proceed with the backup. The reasoning is that once the GT.M process
-				 * that is in the final retry finishes off the second part of the M-kill, it will not start
-				 * a new transaction in the first try which is outside of crit so will honor the inhibit-kills
-				 * flag and therefore not increment the kill_in_prog counter any more until backup is done.
-				 * So we could be waiting for at most 1 kip increment per concurrent process that is updating
-				 * the database. We expect these kills to be complete within 1 minute.
-				 */
-				if (wait_for_zero_kip)
-				{
-					kip_count++;
-					break;
-				}
-				assert(!kip_count);
-				GET_C_STACK_FOR_KIP(kip_pids_arr_ptr, crit_counter, MAX_CRIT_TRY, 2, MAX_KIP_PID_SLOTS);
-				gtm_putmsg_csa(CSA_ARG(cs_addrs) VARLSTCNT(4) ERR_BACKUPKILLIP, 2, DB_LEN_STR(gv_cur_region));
-			}
 			/* Now that we have crit, check if this region is actively journaled and if gbl_jrec_time needs to be
 			 * adjusted (to ensure time ordering of journal records within this region's journal file).
 			 * This needs to be done BEFORE writing any journal records for this region. The value of
@@ -960,9 +961,18 @@ repl_inst_bkup_done1:
 			 * regions so all regions will have same eov/bov timestamps.
 			 */
 			UPDATE_GBL_JREC_TIME;
+			if (cs_data->kill_in_prog)
+			{
+				if (MAX_CRIT_TRY < crit_counter)
+					gtm_putmsg_csa(CSA_ARG(cs_addrs) VARLSTCNT(4) ERR_BACKUPKILLIP,
+						       2, DB_LEN_STR(gv_cur_region));
+				else	/* lets wait some more */
+				{
+					kip_count++;
+					break;
+				}
+			}
 		}
-		if (0 == kip_count)
-			break;	/* all regions have zero kill-in-prog so we can break out of this loop unconditionally */
 	}
 	assert(reg_count == have_crit(CRIT_HAVE_ANY_REG | CRIT_ALL_REGIONS));
 	DEBUG_ONLY(save_gbl_jrec_time = jgbl.gbl_jrec_time;)
@@ -1039,7 +1049,7 @@ repl_inst_bkup_done1:
 					jnlpool.repl_inst_filehdr = &repl_instance;
 					assert(0 != jnl_seqno);
 					/* All the cleanup we want is exactly done by the "repl_inst_histinfo_truncate" function.
-					 * But we dont want to clean the instance file. We want to instead clean the backed up
+					 * But we don't want to clean the instance file. We want to instead clean the backed up
 					 * instance file. To that effect, temporarily change "udi->fn" to reflect the backed up
 					 * file so all the changes get flushed there. Restore it after the function call.
 					 */
@@ -1159,7 +1169,7 @@ repl_inst_bkup_done2:
 							!keep_prev_link || !JNL_ENABLED(cs_data)) ? TRUE : FALSE;
 						if (JNL_ENABLED(cs_data) && (0 != cs_addrs->nl->jnl_file.u.inode))
 						{	/* Note: following will again call wcs_flu() */
-							if (SS_NORMAL != (status = set_jnl_file_close(SET_JNL_FILE_CLOSE_BACKUP)))
+							if (SS_NORMAL != (status = set_jnl_file_close()))
 							{
 								util_out_print("!/Journal file !AD not closed:",
 									TRUE, jnl_info.jnl_len, jnl_info.jnl);
@@ -1186,6 +1196,7 @@ repl_inst_bkup_done2:
 								error_mupip = TRUE;
 								continue;
 							}
+							jnl_set_cur_prior(gv_cur_region, cs_addrs, cs_data);
 							jnl_info.no_rename = (FILE_NOT_FOUND == jnl_fstat);
 						}
 						wcs_flu(WCSFLU_FSYNC_DB | WCSFLU_FLUSH_HDR | WCSFLU_MSYNC_DB);
@@ -1268,6 +1279,9 @@ repl_inst_bkup_done2:
 									4, JNL_LEN_STR(cs_data), DB_LEN_STR(gv_cur_region));
 							fc = gv_cur_region->dyn.addr->file_cntl;
 							fc->op = FC_WRITE;
+							/* Note: cs_data points to shared memory and is already aligned
+							 * appropriately even if db was opened using O_DIRECT.
+							 */
 							fc->op_buff = (sm_uc_ptr_t)cs_data;
 							fc->op_len = SGMNT_HDR_LEN;
 							fc->op_pos = 1;
@@ -1365,9 +1379,11 @@ repl_inst_bkup_done2:
 			/*
 			 * For backed up database we want to change some file header fields.
 			 */
-			rptr->backup_hdr->freeze = 0;
+			rptr->backup_hdr->freeze = FALSE;
 			rptr->backup_hdr->image_count = 0;
-			rptr->backup_hdr->kill_in_prog = 0;
+			if (rptr->backup_hdr->kill_in_prog)
+				rptr->backup_hdr->abandoned_kills = TRUE;
+			rptr->backup_hdr->kill_in_prog = FALSE;
 			memset(rptr->backup_hdr->machine_name, 0, MAX_MCNAMELEN);
 			rptr->backup_hdr->repl_state = repl_closed;
 			rptr->backup_hdr->semid = INVALID_SEMID;
@@ -1389,7 +1405,6 @@ repl_inst_bkup_done2:
 					LEN_AND_STR(jnl_state_lit[rptr->backup_hdr->jnl_state]));
 		}
 		ENABLE_AST
-		mubbuf = (uchar_ptr_t)malloc(BACKUP_READ_SIZE);
 		for (rptr = (backup_reg_list *)(grlist);  NULL != rptr;  rptr = rptr->fPtr)
 		{
 			if (rptr->not_this_time > keep_going)
@@ -1416,7 +1431,6 @@ repl_inst_bkup_done2:
 			if (mu_ctrly_occurred || mu_ctrlc_occurred)
 				break;
 		}
-		free(mubbuf);
 	} else
 	{
 		mubclnup((backup_reg_list *)halt_ptr, need_to_rel_crit);
diff --git a/sr_port/mupip_create.c b/sr_port/mupip_create.c
index f8a35c4..99c96a2 100755
--- a/sr_port/mupip_create.c
+++ b/sr_port/mupip_create.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2014 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -21,6 +22,7 @@
 #include "fileinfo.h"
 #include "gdsblk.h"
 #include "gdsfhead.h"
+#include "filestruct.h"
 #include "cli.h"
 #include "iosp.h"
 #include "util.h"
@@ -43,8 +45,11 @@ void mupip_create(void)
 	gd_region	*reg, *reg_top;
 	int		i;
 	unsigned short	reglen;
+	DCL_THREADGBL_ACCESS;
 
+	SETUP_THREADGBL_ACCESS;
 	exit_stat = EXIT_NRM;
+	TREF(ok_to_see_statsdb_regs) = TRUE;
 	gvinit();
 	if (CLI_PRESENT == cli_present("REGION"))
 	{
@@ -69,14 +74,19 @@ void mupip_create(void)
 			gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_NOREGION, 2, reglen, buff);
 			mupip_exit(ERR_MUPCLIERR);
 		}
-		gv_cur_region = reg;
-		create_stat = mu_cre_file();
-		exit_stat |= create_stat;
+		if (!(RDBF_AUTODB & reg->reservedDBFlags))
+		{	/* Ignore MUPIP CREATE for auto-created DBs */
+			gv_cur_region = reg;
+			create_stat = mu_cre_file();
+			exit_stat |= create_stat;
+		}
 	} else
 	{
 		for (gv_cur_region = gd_header->regions, reg_top = gv_cur_region + gd_header->n_regions;
 			gv_cur_region < reg_top; gv_cur_region++)
 		{
+			if ((RDBF_AUTODB & gv_cur_region->reservedDBFlags))
+				continue;		/* Ignore MUPIP CREATE for auto-created DBs */
 			create_stat = mu_cre_file();
 			exit_stat |= create_stat;
 	       	}
diff --git a/sr_port/mupip_downgrade.c b/sr_port/mupip_downgrade.c
index aee5987..4684b3d 100755
--- a/sr_port/mupip_downgrade.c
+++ b/sr_port/mupip_downgrade.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2005-2016 Fidelity National Information	*
+ * Copyright (c) 2005-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -10,7 +10,7 @@
  *								*
  ****************************************************************/
 
-/* mupip_downgrade.c: Driver program to downgrade v5.0-000 database files to v4.x */
+/* mupip_downgrade.c: Driver program to downgrade V6.x database files to V4.x */
 
 #include "mdef.h"
 
@@ -50,6 +50,9 @@
 #include "anticipatory_freeze.h"
 #include "mu_all_version_standalone.h"
 
+#define	GTM_VER_LIT		"GT.M "
+#define	MAX_VERSION_LEN		16	/* 16 bytes enough to hold V63000A, longest -VERSION= value possible */
+
 LITREF  char     	 	gtm_release_name[];
 LITREF  int4            	gtm_release_name_len;
 
@@ -73,18 +76,19 @@ error_def(ERR_MUDWNGRDTN);
 error_def(ERR_MUDWNGRDNOTPOS);
 error_def(ERR_MUDWNGRDNRDY);
 error_def(ERR_MUSTANDALONE);
+error_def(ERR_STATSDBNOTSUPP);
 error_def(ERR_SYSCALL);
 error_def(ERR_TEXT);
-ZOS_ONLY(error_def(ERR_BADTAG);)
 
 void mupip_downgrade(void)
 {
-	char		db_fn[MAX_FN_LEN + 1], ver_spec[MAX_DB_VER_LEN + 1];
+	char		db_fn[MAX_FN_LEN + 1], ver_spec[MAX_VERSION_LEN], dwngrd_ver[MAX_VERSION_LEN + STR_LIT_LEN(GTM_VER_LIT)];
 	unsigned short	db_fn_len;	/* cli_get_str expects short */
-	unsigned short	ver_spec_len=MAX_DB_VER_LEN;
+	unsigned short	ver_spec_len;
+	char		*hdr_ptr;
 	fd_type		channel;
 	int		save_errno, csd_size, rec_size;
-	int		fstat_res, idx;
+	int		fstat_res, idx, dwngrd_ver_len;
 	int4		status, rc;
 	uint4		status2;
 	off_t 		file_size;
@@ -95,6 +99,7 @@ void mupip_downgrade(void)
 	ZOS_ONLY(int	realfiletag;)
 	unsigned char	new_master_map[MASTER_MAP_SIZE_V4];
 	enum db_ver	desired_dbver;
+	int		ftrunc_status;
 
 	/* Structure checks .. */
 	assert((24 * 1024) == SIZEOF(v15_sgmnt_data));	/* Verify V4 file header hasn't suddenly increased for some odd reason */
@@ -108,17 +113,41 @@ void mupip_downgrade(void)
 	db_fn[db_fn_len] = '\0';	/* Null terminate */
 	if (cli_present("VERSION"))
 	{
+		ver_spec_len = ARRAYSIZE(ver_spec);
 		cli_get_str("VERSION", ver_spec, &ver_spec_len);
-		ver_spec[ver_spec_len] = '\0';
 		cli_strupper(ver_spec);
 		if (0 == memcmp(ver_spec, "V4", ver_spec_len))
+		{	/* Downgrade file header to V4 format and downgrade EOF block from GDS-block to 512-byte block */
 			desired_dbver = GDSV4;
-		else  if (0 == memcmp(ver_spec, "V5", ver_spec_len))
+		} else if (0 == memcmp(ver_spec, "V5", ver_spec_len))
+		{	/* Downgrade file header to V5 format and downgrade EOF block from GDS-block to 512-byte block */
 			desired_dbver = GDSV5;
-		else
-			assertpro(FALSE);              /* CLI should prevent us ever getting here */
+		} else if (0 == memcmp(ver_spec, "V63000A", ver_spec_len))
+		{	/* No file header downgrade needed. Only EOF block downgrade needed. */
+			desired_dbver = GDSNOVER;
+		} else
+			assert(FALSE);              /* CLI should prevent us ever getting here */
 	} else
+	{
+		MEMCPY_LIT(ver_spec, "V4");
+		ver_spec_len = STR_LIT_LEN("V4");
 		desired_dbver = GDSV4;       /* really want to keep version, which has not yet been read */
+	}
+	/* Need to find out if this is a statsDB file. This necessitates opening the file to read the sgmnt_data
+	 * file header before we have the proper locks obtained for it so after checking, the file is closed again
+	 * so it can be opened under lock to prevent race conditions.
+	 */
+	if (FD_INVALID != (channel = OPEN(db_fn, O_RDONLY)))
+	{
+		DO_FILE_READ(channel, 0, &csd, SIZEOF(sgmnt_data), status, status2);
+		if ((0 == memcmp(csd.label, GDS_LABEL, STR_LIT_LEN(GDS_LABEL))) && (RDBF_STATSDB_MASK == csd.reservedDBFlags))
+		{
+			F_CLOSE(channel, rc);
+			gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_STATSDBNOTSUPP, 2, db_fn_len, db_fn);
+			mupip_exit(ERR_MUNODWNGRD);
+		}
+		F_CLOSE(channel, rc);
+	}
 	if (!mu_upgrd_dngrd_confirmed())
 	{
 		gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_TEXT, 2, LEN_AND_LIT("Downgrade canceled by user"));
@@ -126,8 +155,7 @@ void mupip_downgrade(void)
 	}
 	gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_TEXT, 2, LEN_AND_LIT("Mupip downgrade started"));
 	mu_all_version_get_standalone(db_fn, sem_inf);
-	mu_outofband_setup();	/* Will ignore user interrupts. Note that the
-				 * elapsed time for this is order of milliseconds */
+	mu_outofband_setup();	/* Will ignore user interrupts. Note that the elapsed time for this is order of milliseconds */
 	if (FD_INVALID == (channel = OPEN(db_fn, O_RDWR)))
 	{
 		save_errno = errno;
@@ -147,10 +175,10 @@ void mupip_downgrade(void)
 		mupip_exit(ERR_MUNODWNGRD);
 	}
 	file_size = stat_buf.st_size;
-#if defined(__MVS__)
+#	if defined(__MVS__)
 	if (-1 == gtm_zos_tag_to_policy(channel, TAG_BINARY, &realfiletag))
 		TAG_POLICY_GTM_PUTMSG(db_fn, errno, realfiletag, TAG_BINARY);
-#endif
+#	endif
 	csd_size = SIZEOF(sgmnt_data);
 	DO_FILE_READ(channel, 0, &csd, csd_size, status, status2);
 	if (SS_NORMAL != status)
@@ -176,7 +204,7 @@ void mupip_downgrade(void)
 				2, LEN_AND_LIT("Database creation in progress"));
 		mupip_exit(ERR_MUNODWNGRD);
 	}
-	if (csd.freeze)
+	if (FROZEN(&csd))
 	{
 		F_CLOSE(channel, rc);	/* resets "channel" to FD_INVALID */
 		gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) MAKE_MSG_TYPE(ERR_TEXT, ERROR), 2, LEN_AND_LIT("Database is frozen"));
@@ -213,7 +241,7 @@ void mupip_downgrade(void)
 				2, LEN_AND_LIT("Recovery was interrupted"));
 		mupip_exit(ERR_MUNODWNGRD);
 	}
-	if (desired_dbver == GDSV5)	/*Downgrading to V5 version*/
+	if (GDSV5 == desired_dbver)	/* Downgrading to V5 version*/
 	{
 		if ((START_VBN_V6 == csd.start_vbn) || (MASTER_MAP_BLOCKS_DFLT == csd.master_map_len))
 		{	/* DB is created with V6 version*/
@@ -262,80 +290,107 @@ void mupip_downgrade(void)
 		csd.freeze_on_fail = FALSE;
 		csd.span_node_absent = TRUE;
 		csd.maxkeysz_assured = FALSE;
+		csd.minor_dbver = GDSMV63000A;
 		gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_MUINFOUINT4, 4,
 				LEN_AND_LIT("V5 supportable record size for current DB configuration "), rec_size, rec_size);
 		gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_MUINFOUINT4, 4,
 				LEN_AND_LIT("V5 supportable max key size for current DB configuration"),
 				OLD_MAX_KEY_SZ, OLD_MAX_KEY_SZ);
-		gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(8) ERR_MUPGRDSUCC, 6, db_fn_len, db_fn,
-				RTS_ERROR_LITERAL("downgraded"), RTS_ERROR_LITERAL("GT.M V5"));
-		DB_DO_FILE_WRITE(channel, 0, &csd, csd_size, status, status2);
-		F_CLOSE(channel, rc);	/* resets "channel" to FD_INVALID */
-		mu_all_version_release_standalone(sem_inf);
-		mupip_exit(SS_NORMAL);
-	}
-	gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_MUINFOUINT4, 4, LEN_AND_LIT("Old file header size"), csd_size, csd_size);
-	gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_MUINFOUINT8, 4, LEN_AND_LIT("Old file length"), &file_size, &file_size);
-	gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_MUINFOUINT4,
-			4, LEN_AND_LIT("Old file start_vbn"), csd.start_vbn, csd.start_vbn);
-	gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_MUINFOUINT4,
-			4, LEN_AND_LIT("Old file gds blk_size"), csd.blk_size, csd.blk_size);
-	gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_MUINFOUINT4, 4, LEN_AND_LIT("Old file total_blks"),
-				csd.trans_hist.total_blks, csd.trans_hist.total_blks);
-	assert(ROUND_DOWN2(csd.blk_size, DISK_BLOCK_SIZE) == csd.blk_size);
-	assert((((off_t)csd.start_vbn - 1) * DISK_BLOCK_SIZE +
-		(off_t)csd.trans_hist.total_blks * csd.blk_size + (off_t)DISK_BLOCK_SIZE == file_size) ||
-	   (((off_t)csd.start_vbn - 1) * DISK_BLOCK_SIZE +
-		(off_t)csd.trans_hist.total_blks * csd.blk_size + (off_t)csd.blk_size == file_size));
-	if (START_VBN_V4 != csd.start_vbn)
-	{	/* start_vbn is not something that GT.M V4 can handle. signal downgrade not possible */
-		F_CLOSE(channel, rc);	/* resets "channel" to FD_INVALID */
-		gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_MUDWNGRDNOTPOS, 2, csd.start_vbn, START_VBN_V4);
-		mupip_exit(ERR_MUNODWNGRD);
-	}
-	if ((trans_num)MAX_TN_V4 < csd.trans_hist.curr_tn)
+		hdr_ptr = (char *)&csd;
+	} else if (GDSV4 == desired_dbver)	/* Downgrading to V4 version*/
 	{
-		F_CLOSE(channel, rc);	/* resets "channel" to FD_INVALID */
-		gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(5) ERR_MUDWNGRDTN, 3, &csd.trans_hist.curr_tn, db_fn_len, db_fn);
-		mupip_exit(ERR_MUNODWNGRD);
-	}
-	if (csd.blks_to_upgrd != (csd.trans_hist.total_blks - csd.trans_hist.free_blocks))
-	{
-		F_CLOSE(channel, rc);	/* resets "channel" to FD_INVALID */
-		gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(5) ERR_MUDWNGRDNRDY, 3, db_fn_len, db_fn,
-			   (csd.trans_hist.total_blks - csd.trans_hist.free_blocks - csd.blks_to_upgrd));
-		mupip_exit(ERR_MUNODWNGRD);
-	}
-	if (MASTER_MAP_SIZE_V4 < csd.master_map_len || MAXTOTALBLKS_V4 < csd.trans_hist.total_blks)
+		gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_MUINFOUINT4, 4, LEN_AND_LIT("Old file header size"),
+			csd_size, csd_size);
+		gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_MUINFOUINT8, 4, LEN_AND_LIT("Old file length"),
+			&file_size, &file_size);
+		gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_MUINFOUINT4,
+				4, LEN_AND_LIT("Old file start_vbn"), csd.start_vbn, csd.start_vbn);
+		gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_MUINFOUINT4,
+				4, LEN_AND_LIT("Old file gds blk_size"), csd.blk_size, csd.blk_size);
+		gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_MUINFOUINT4, 4, LEN_AND_LIT("Old file total_blks"),
+					csd.trans_hist.total_blks, csd.trans_hist.total_blks);
+		assert(ROUND_DOWN2(csd.blk_size, DISK_BLOCK_SIZE) == csd.blk_size);
+		assert((((off_t)csd.start_vbn - 1) * DISK_BLOCK_SIZE +
+			(off_t)csd.trans_hist.total_blks * csd.blk_size + (off_t)DISK_BLOCK_SIZE == file_size) ||
+		   (((off_t)csd.start_vbn - 1) * DISK_BLOCK_SIZE +
+			(off_t)csd.trans_hist.total_blks * csd.blk_size + (off_t)csd.blk_size == file_size));
+		if (START_VBN_V4 != csd.start_vbn)
+		{	/* start_vbn is not something that GT.M V4 can handle. signal downgrade not possible */
+			F_CLOSE(channel, rc);	/* resets "channel" to FD_INVALID */
+			gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_MUDWNGRDNOTPOS, 2, csd.start_vbn, START_VBN_V4);
+			mupip_exit(ERR_MUNODWNGRD);
+		}
+		if ((trans_num)MAX_TN_V4 < csd.trans_hist.curr_tn)
+		{
+			F_CLOSE(channel, rc);	/* resets "channel" to FD_INVALID */
+			gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(5) ERR_MUDWNGRDTN, 3, &csd.trans_hist.curr_tn, db_fn_len, db_fn);
+			mupip_exit(ERR_MUNODWNGRD);
+		}
+		if (csd.blks_to_upgrd != (csd.trans_hist.total_blks - csd.trans_hist.free_blocks))
+		{
+			F_CLOSE(channel, rc);	/* resets "channel" to FD_INVALID */
+			gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(5) ERR_MUDWNGRDNRDY, 3, db_fn_len, db_fn,
+				   (csd.trans_hist.total_blks - csd.trans_hist.free_blocks - csd.blks_to_upgrd));
+			mupip_exit(ERR_MUNODWNGRD);
+		}
+		if (MASTER_MAP_SIZE_V4 < csd.master_map_len || MAXTOTALBLKS_V4 < csd.trans_hist.total_blks)
+		{
+			F_CLOSE(channel, rc);	/* resets "channel" to FD_INVALID */
+			gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_MUINFOUINT4, 4, LEN_AND_LIT("master_map_len"),
+				   csd.master_map_len,  csd.master_map_len);
+			gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) MAKE_MSG_TYPE(ERR_TEXT, ERROR),
+					2, LEN_AND_LIT("Master map is too large"));
+			mupip_exit(ERR_MUNODWNGRD);
+		}
+		DO_FILE_READ(channel, 0, new_master_map, csd.master_map_len, status, status2);
+		if (SS_NORMAL != status)
+		{
+			gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(5) ERR_DBFILOPERR, 2, db_fn_len, db_fn, status);
+			mupip_exit(ERR_MUNODWNGRD);
+		}
+		if (csd.master_map_len < MASTER_MAP_SIZE_V4)
+			memset(new_master_map + csd.master_map_len, 0xFF, MASTER_MAP_SIZE_V4 - csd.master_map_len);
+		/* Now call mu_dwngrd_header to do file header downgrade */
+		mu_dwngrd_header(&csd, &v15_csd);
+		memcpy(v15_csd.master_map, new_master_map, MASTER_MAP_SIZE_V4);
+		hdr_ptr = (char *)&v15_csd;
+	} else
 	{
-		F_CLOSE(channel, rc);	/* resets "channel" to FD_INVALID */
-		gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_MUINFOUINT4, 4, LEN_AND_LIT("master_map_len"),
-			   csd.master_map_len,  csd.master_map_len);
-		gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) MAKE_MSG_TYPE(ERR_TEXT, ERROR),
-				2, LEN_AND_LIT("Master map is too large"));
-		mupip_exit(ERR_MUNODWNGRD);
+		assert(GDSNOVER == desired_dbver);	/* Downgrading to V4 version*/
+		csd.minor_dbver = GDSMV63000A;
+		hdr_ptr = (char *)&csd;	/* No file header downgrade for V63000A case */
 	}
-	DO_FILE_READ(channel, 0, new_master_map, csd.master_map_len, status, status2);
+	/* Write updated file header first */
+	DB_DO_FILE_WRITE(channel, 0, hdr_ptr, csd_size, status, status2);
 	if (SS_NORMAL != status)
 	{
 		gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(5) ERR_DBFILOPERR, 2, db_fn_len, db_fn, status);
 		mupip_exit(ERR_MUNODWNGRD);
 	}
-	if (csd.master_map_len < MASTER_MAP_SIZE_V4)
-		memset(new_master_map + csd.master_map_len, 0xFF, MASTER_MAP_SIZE_V4 - csd.master_map_len);
-	/* Now call mu_dwngrd_header to do file header downgrade */
-        mu_dwngrd_header(&csd, &v15_csd);
-	memcpy(v15_csd.master_map, new_master_map, MASTER_MAP_SIZE_V4);
-	DB_DO_FILE_WRITE(channel, 0, &v15_csd, csd_size, status, status2);
-	if (SS_NORMAL != status)
+	/* V6 format had a GDS block EOF block whereas V4 format has only a 512-byte EOF block. Do truncate as necessary */
+	FTRUNCATE(channel, file_size - csd.blk_size + DISK_BLOCK_SIZE, ftrunc_status);
+	if (0 != ftrunc_status)
 	{
-		gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(5) ERR_DBFILOPERR, 2, db_fn_len, db_fn, status);
+		save_errno = errno;
+		gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(8) ERR_SYSCALL, 5, RTS_ERROR_LITERAL("ftruncate()"), CALLFROM, save_errno);
 		mupip_exit(ERR_MUNODWNGRD);
 	}
 	F_CLOSE(channel, rc);	/* resets "channel" to FD_INVALID */
+	if (0 != rc)
+	{
+		save_errno = errno;
+		gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(8) ERR_SYSCALL, 5, RTS_ERROR_LITERAL("close()"), CALLFROM, save_errno);
+		mupip_exit(ERR_MUNODWNGRD);
+	}
+	/* Print success message */
+	MEMCPY_LIT(dwngrd_ver, GTM_VER_LIT);
+	dwngrd_ver_len = STR_LIT_LEN(GTM_VER_LIT);
+	memcpy(dwngrd_ver + dwngrd_ver_len, ver_spec, ver_spec_len);
+	dwngrd_ver_len += ver_spec_len;
+	assert(dwngrd_ver_len <= ARRAYSIZE(dwngrd_ver));
+	gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(8) ERR_MUPGRDSUCC, 6, db_fn_len, db_fn,
+					RTS_ERROR_LITERAL("downgraded"), dwngrd_ver_len, dwngrd_ver);
 	mu_all_version_release_standalone(sem_inf);
-	gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(8) ERR_MUPGRDSUCC, 6, db_fn_len, db_fn, RTS_ERROR_LITERAL("downgraded"),
-		   RTS_ERROR_LITERAL("GT.M V4"));
 	mupip_exit(SS_NORMAL);
 }
 
diff --git a/sr_port/mupip_extend.c b/sr_port/mupip_extend.c
index 55f1073..73613fd 100755
--- a/sr_port/mupip_extend.c
+++ b/sr_port/mupip_extend.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information 	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -28,10 +28,8 @@
 #include "stp_parms.h"
 #include "iosp.h"
 #include "jnl.h"
-#ifdef UNIX
 #include "io.h"
 #include "gtmsecshr.h"
-#endif
 #include "util.h"
 #include "cli.h"
 #include "gvcst_protos.h"	/* for gvcst_init prototype */
@@ -41,25 +39,23 @@
 #include "gdsfilext.h"
 #include "wcs_backoff.h"
 #include "gt_timer.h"
-#if defined(VMS) || defined(MM_FILE_EXT_OK)
-#define DB_IPCS_RESET(REG)
+#if defined(MM_FILE_EXT_OK)
+#	define DB_IPCS_RESET(REG)
 #else
-#include "mu_rndwn_file.h"
-#include "db_ipcs_reset.h"
-#define DB_IPCS_RESET(REG)			\
-{						\
-	if (dba_mm == REG->dyn.addr->acc_meth)	\
-		db_ipcs_reset(REG);		\
-}
+#	 include "mu_rndwn_file.h"
+#	 include "db_ipcs_reset.h"
+#	define DB_IPCS_RESET(REG)			\
+	{						\
+		if (dba_mm == REG->dyn.addr->acc_meth)	\
+			db_ipcs_reset(REG);		\
+	}
 #endif
 
 GBLREF	gd_addr			*gd_header;
 GBLREF	gd_region		*gv_cur_region;
 GBLREF	sgmnt_addrs		*cs_addrs;
 GBLREF	sgmnt_data_ptr_t	cs_data;
-#ifdef UNIX
 GBLREF	boolean_t		jnlpool_init_needed;
-#endif
 
 error_def(ERR_DBOPNERR);
 error_def(ERR_DBRDONLY);
@@ -79,7 +75,7 @@ void mupip_extend(void)
 	boolean_t	defer_alloc;
 
 	r_len = SIZEOF(regionname);
-	UNIX_ONLY(jnlpool_init_needed = TRUE);
+	jnlpool_init_needed = TRUE;
 	if (cli_get_str("REG_NAME", regionname, &r_len) == FALSE)
 		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(1) ERR_MUNODBNAME);
 	gvinit();
@@ -93,7 +89,7 @@ void mupip_extend(void)
 		gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_NOREGION, 2, r_len, regionname);
 		mupip_exit(ERR_MUNOACTION);
 	}
-	if ((dba_bg != gv_cur_region->dyn.addr->acc_meth) && (dba_mm != gv_cur_region->dyn.addr->acc_meth))
+	if (!IS_REG_BG_OR_MM(gv_cur_region))
 	{
 		util_out_print("Can only EXTEND BG and MM databases",TRUE);
 		mupip_exit(ERR_MUNOACTION);
@@ -103,7 +99,7 @@ void mupip_extend(void)
 		util_out_print("!/Can't EXTEND region !AD across network",TRUE, REG_LEN_STR(gv_cur_region));
 		mupip_exit(ERR_MUNOACTION);
 	}
-#	if !defined(MM_FILE_EXT_OK) && defined(UNIX)
+#	if !defined(MM_FILE_EXT_OK)
 	if (dba_mm == gv_cur_region->dyn.addr->acc_meth)
 	{
 		FILE_CNTL_INIT(gv_cur_region->dyn.addr);
@@ -134,6 +130,7 @@ void mupip_extend(void)
 		if ((tblocks < 0) || (defer_alloc && (tblocks == 0)))
 		{
 			util_out_print("!/BLOCKS too small, no extension done",TRUE);
+			DB_IPCS_RESET(gv_cur_region);
 			mupip_exit(ERR_MUNOACTION);
 		}
 		blocks = tblocks;
@@ -178,7 +175,7 @@ void mupip_extend(void)
 			rel_crit(gv_cur_region);
 			break;
 		default:
-			assertpro(dba_bg == gv_cur_region->dyn.addr->acc_meth || dba_mm == gv_cur_region->dyn.addr->acc_meth);
+			assertpro(IS_REG_BG_OR_MM(gv_cur_region));
 	}
 	util_out_print("Extension successful, file !AD extended by !UL blocks.  Total blocks = !UL.",TRUE,
 		DB_LEN_STR(gv_cur_region), total - old_total - bit_maps, total - DIVIDE_ROUND_UP(total, bplmap));
diff --git a/sr_port/mupip_freeze.c b/sr_port/mupip_freeze.c
index 778699f..a3b71f3 100755
--- a/sr_port/mupip_freeze.c
+++ b/sr_port/mupip_freeze.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2012 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -11,6 +12,8 @@
 
 #include "mdef.h"
 
+#include "gtm_limits.h"
+
 #include "gdsroot.h"
 #include "gtm_string.h"
 #include "gtm_facility.h"
@@ -38,6 +41,7 @@
 #include "mu_outofband_setup.h"
 #include "gtmmsg.h"
 #include "wcs_flu.h"
+#include "wcs_wt.h"
 #include "mupip_freeze.h"
 #include "interlock.h"
 #include "sleep_cnt.h"
@@ -46,44 +50,49 @@ GBLREF	bool		mu_ctrly_occurred;
 GBLREF	bool		mu_ctrlc_occurred;
 GBLREF	gd_region	*gv_cur_region;
 GBLREF	sgmnt_addrs	*cs_addrs;
+GBLREF	sgmnt_data	*cs_data;
 GBLREF	tp_region	*halt_ptr;
 GBLREF	tp_region	*grlist;
 GBLREF	bool		in_mupip_freeze;
 GBLREF	bool		error_mupip;
 GBLREF	boolean_t	debug_mupip;
-#ifdef UNIX
 GBLREF	boolean_t	jnlpool_init_needed;
-#endif
+GBLREF	jnl_gbls_t	jgbl;
 
 #define INTERRUPTED	(mu_ctrly_occurred || mu_ctrlc_occurred)
-#define PRINT_FREEZEERR 											\
-{														\
-	gtm_putmsg(VARLSTCNT(6) ERR_FREEZEERR, 4, LEN_AND_STR(msg1[freeze]), REG_LEN_STR(gv_cur_region));	\
-	status = ERR_MUNOFINISH;										\
-}
+#define PRINT_FREEZEERR 													\
+MBSTART {															\
+	gtm_putmsg_csa(CSA_ARG(REG2CSA(rptr->reg)) VARLSTCNT(6)									\
+			ERR_FREEZEERR, 4, LEN_AND_STR(msg1[freeze]), REG_LEN_STR(rptr->reg));					\
+	status = ERR_MUNOFINISH;												\
+} MBEND
 #define PRINT_UNFROZEN_MSG	util_out_print("All regions will be unfrozen", TRUE)
 
 
 error_def(ERR_BUFFLUFAILED);
 error_def(ERR_DBRDONLY);
 error_def(ERR_FREEZECTRL);
+error_def(ERR_JNLEXTEND);
+error_def(ERR_JNLFILOPN);
 error_def(ERR_MUNOACTION);
 error_def(ERR_MUPCLIERR);
 error_def(ERR_MUNOFINISH);
-error_def(ERR_MUKILLIP);
+error_def(ERR_OFRZNOTHELD);
 error_def(ERR_KILLABANDONED);
 error_def(ERR_FREEZEERR);
 
 void	mupip_freeze(void)
 {
-	int4		status;
-	bool		record;
-	tp_region	*rptr, *rptr1;
-	boolean_t	freeze, override;
-	freeze_status	freeze_ret;
-	const char 	*msg1[] = { "unfreeze", "freeze" } ;
-	const char 	*msg2[] = { "UNFROZEN", "FROZEN" } ;
-	const char 	*msg3[] = { "unfrozen", "frozen" } ;
+	int4			status;
+	bool			record;
+	tp_region		*rptr, *rptr1;
+	boolean_t		freeze, override;
+	uint4			online;
+	freeze_status		freeze_ret;
+	int			dummy_errno;
+	const char 		*msg1[] = { "unfreeze", "freeze" } ;
+	const char 		*msg2[] = { "UNFROZEN", "FROZEN" } ;
+	const char 		*msg3[] = { "unfrozen", "frozen" } ;
 
 	status = SS_NORMAL;
 	in_mupip_freeze = TRUE;
@@ -91,6 +100,9 @@ void	mupip_freeze(void)
 	mu_outofband_setup();
 	gvinit();
 	freeze = (CLI_PRESENT == cli_present("ON"));
+	online = (CLI_PRESENT == cli_present("ONLINE"));
+	if (online)
+		online |= ((!cli_negated("AUTORELEASE")) ? CHILLED_AUTORELEASE_MASK : 0);
 	if (CLI_PRESENT == cli_present("OFF"))
 	{
 		if (TRUE == freeze)
@@ -134,7 +146,7 @@ void	mupip_freeze(void)
 	{
 		if (INTERRUPTED)
 			break;
-		if ((dba_bg != rptr->reg->dyn.addr->acc_meth) && (dba_mm != rptr->reg->dyn.addr->acc_meth))
+		if (!IS_REG_BG_OR_MM(rptr->reg))
 		{
 			util_out_print("Can only FREEZE BG and MM databases", TRUE);
 			PRINT_FREEZEERR;
@@ -159,19 +171,40 @@ void	mupip_freeze(void)
 		/* Cannot flush for read-only data files */
 		if (gv_cur_region->read_only)
 		{
-			gtm_putmsg(VARLSTCNT(4) ERR_DBRDONLY, 2, gv_cur_region->dyn.addr->fname_len,
-				gv_cur_region->dyn.addr->fname);
+			gtm_putmsg_csa(CSA_ARG(cs_addrs) VARLSTCNT(4) ERR_DBRDONLY, 2, gv_cur_region->dyn.addr->fname_len,
+					gv_cur_region->dyn.addr->fname);
+			PRINT_FREEZEERR;
+			continue;
+		}
+		if (online && (dba_mm == cs_addrs->hdr->acc_meth))
+		{
+			util_out_print("FREEZE -ONLINE can't apply to MM region !AD", TRUE, REG_LEN_STR(rptr->reg));
+			cs_addrs->persistent_freeze = TRUE;	/* Prevent removal of existing freeze */
 			PRINT_FREEZEERR;
 			continue;
 		}
 		if (freeze && (0 != cs_addrs->hdr->abandoned_kills))
 		{
-			gtm_putmsg(VARLSTCNT(6) ERR_KILLABANDONED, 4, DB_LEN_STR(rptr->reg),
-				LEN_AND_LIT("database could have incorrectly marked busy integrity errors"));
+			gtm_putmsg_csa(CSA_ARG(cs_addrs) VARLSTCNT(6) ERR_KILLABANDONED, 4, DB_LEN_STR(rptr->reg),
+					LEN_AND_LIT("database could have incorrectly marked busy integrity errors"));
 			util_out_print("WARNING: The region !AD to be frozen contains abandoned kills",
 				TRUE, REG_LEN_STR(gv_cur_region));
 		}
-		while (REG_FREEZE_SUCCESS != (freeze_ret = region_freeze(gv_cur_region, freeze, override, TRUE)))
+		if (freeze && FROZEN_CHILLED(cs_data))
+		{
+			util_out_print("FREEZE region !AD already has an online freeze", TRUE, REG_LEN_STR(rptr->reg));
+			PRINT_FREEZEERR;
+			cs_addrs->persistent_freeze = TRUE;	/* Prevent removal of existing freeze */
+			continue;
+		}
+		if (!cs_data->freeze && cs_data->freeze_online)
+		{
+			util_out_print("WARNING: The region !AD had an online freeze, but it was autoreleased.",
+					TRUE, REG_LEN_STR(gv_cur_region));
+			status = ERR_OFRZNOTHELD;
+		}
+		while (REG_FREEZE_SUCCESS !=
+				(freeze_ret = region_freeze_main(gv_cur_region, freeze, override, TRUE, online, TRUE)))
 		{
 			if (REG_ALREADY_FROZEN == freeze_ret)
 			{
@@ -184,17 +217,28 @@ void	mupip_freeze(void)
 				util_out_print("Kill in progress indicator is set for database file !AD", TRUE,
 					DB_LEN_STR(gv_cur_region));
 				PRINT_UNFROZEN_MSG;
-				rts_error(VARLSTCNT(1) ERR_MUNOFINISH);
+				rts_error_csa(CSA_ARG(cs_addrs) VARLSTCNT(1) ERR_MUNOFINISH);
+			} else if (REG_FLUSH_ERROR == freeze_ret)
+			{
+				gtm_putmsg_csa(CSA_ARG(cs_addrs) VARLSTCNT(6) ERR_BUFFLUFAILED, 4, LEN_AND_LIT("MUPIP FREEZE"),
+										DB_LEN_STR(gv_cur_region));
+				PRINT_UNFROZEN_MSG;
+				rts_error_csa(CSA_ARG(cs_addrs) VARLSTCNT(1) ERR_MUNOFINISH);
+			} else if (REG_JNL_OPEN_ERROR == freeze_ret)
+			{
+				gtm_putmsg_csa(CSA_ARG(cs_addrs) VARLSTCNT(7) ERR_JNLFILOPN, 4, JNL_LEN_STR(cs_data),
+						DB_LEN_STR(gv_cur_region), cs_addrs->jnl->status);
+				PRINT_UNFROZEN_MSG;
+				rts_error_csa(CSA_ARG(cs_addrs) VARLSTCNT(1) ERR_MUNOFINISH);
+			} else if (REG_JNL_SWITCH_ERROR == freeze_ret)
+			{
+				gtm_putmsg_csa(CSA_ARG(cs_addrs) VARLSTCNT(4) ERR_JNLEXTEND, 2, JNL_LEN_STR(cs_data));
+				PRINT_UNFROZEN_MSG;
+				rts_error_csa(CSA_ARG(cs_addrs) VARLSTCNT(1) ERR_MUNOFINISH);
 			} else
 				assert(FALSE);
 		}
 		cs_addrs->persistent_freeze = freeze;	/* secshr_db_clnup() shouldn't clear the freeze up */
-		if (!wcs_flu(WCSFLU_FLUSH_HDR | WCSFLU_WRITE_EPOCH | WCSFLU_SYNC_EPOCH))
-		{
-			gtm_putmsg(VARLSTCNT(6) ERR_BUFFLUFAILED, 4, LEN_AND_LIT("MUPIP FREEZE"), DB_LEN_STR(gv_cur_region));
-			PRINT_UNFROZEN_MSG;
-			rts_error(VARLSTCNT(1) ERR_MUNOFINISH);
-		}
 		halt_ptr = rptr->fPtr;
 		if (record && gv_cur_region->open)
 			cs_addrs->hdr->last_rec_backup = cs_addrs->ti->curr_tn;
@@ -203,6 +247,34 @@ void	mupip_freeze(void)
 		else
 			PRINT_FREEZEERR;
 	}
+	for (rptr = grlist;  NULL != rptr;  rptr = rptr->fPtr)
+	{
+		gv_cur_region = rptr->reg;
+		change_reg();
+		freeze_ret = region_freeze_post(rptr->reg);
+		if (REG_FREEZE_SUCCESS != freeze_ret)
+		{
+			if (REG_FLUSH_ERROR == freeze_ret)
+			{
+				gtm_putmsg_csa(CSA_ARG(cs_addrs) VARLSTCNT(6) ERR_BUFFLUFAILED, 4, LEN_AND_LIT("MUPIP FREEZE"),
+										DB_LEN_STR(gv_cur_region));
+				PRINT_UNFROZEN_MSG;
+				rts_error_csa(CSA_ARG(cs_addrs) VARLSTCNT(1) ERR_MUNOFINISH);
+			} else if (REG_JNL_OPEN_ERROR == freeze_ret)
+			{
+				gtm_putmsg_csa(CSA_ARG(cs_addrs) VARLSTCNT(7) ERR_JNLFILOPN, 4, JNL_LEN_STR(cs_data),
+						DB_LEN_STR(gv_cur_region), cs_addrs->jnl->status);
+				PRINT_UNFROZEN_MSG;
+				rts_error_csa(CSA_ARG(cs_addrs) VARLSTCNT(1) ERR_MUNOFINISH);
+			} else if (REG_JNL_SWITCH_ERROR == freeze_ret)
+			{
+				gtm_putmsg_csa(CSA_ARG(cs_addrs) VARLSTCNT(4) ERR_JNLEXTEND, 2, JNL_LEN_STR(cs_data));
+				PRINT_UNFROZEN_MSG;
+				rts_error_csa(CSA_ARG(cs_addrs) VARLSTCNT(1) ERR_MUNOFINISH);
+			} else
+				assert(FALSE);
+		}
+	}
 	REVERT;
 	if (INTERRUPTED)
 	{
@@ -211,9 +283,9 @@ void	mupip_freeze(void)
 			gv_cur_region = rptr1->reg;
 			if (FALSE == gv_cur_region->open)
 				continue;
-			region_freeze(gv_cur_region, FALSE, FALSE, FALSE);
+			region_freeze(gv_cur_region, FALSE, FALSE, FALSE, FALSE, FALSE);
 		}
-		gtm_putmsg(VARLSTCNT(1) ERR_FREEZECTRL);
+		gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(1) ERR_FREEZECTRL);
 		status = ERR_MUNOFINISH;
 	}
 	if (SS_NORMAL == status)
diff --git a/sr_port/mupip_integ.c b/sr_port/mupip_integ.c
index 093da25..62364f0 100755
--- a/sr_port/mupip_integ.c
+++ b/sr_port/mupip_integ.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -45,9 +45,7 @@
 #include "mupip_integ.h"
 #include "gtmmsg.h"
 #include "collseq.h"
-#ifdef GTM_SNAPSHOT
 #include "db_snapshot.h"
-#endif
 #include "mupint.h"
 #include "mu_gv_cur_reg_init.h"
 
@@ -117,16 +115,20 @@ GBLDEF unsigned char		*mu_int_master;
 GBLDEF trans_num		largest_tn;
 GBLDEF int4			mu_int_blks_to_upgrd;
 GBLDEF span_node_integ		*sndata;
+GBLDEF boolean_t		null_coll_type_err = FALSE;
+GBLDEF boolean_t		null_coll_type;
+GBLDEF unsigned int		rec_num;
+GBLDEF block_id			blk_id;
+GBLDEF boolean_t		nct_err_type;
+GBLDEF int			rec_len;
 /* The following global variable is used to store the encryption information for the current database. The variable is initialized
  * in mu_int_init (mupip integ -file <file.dat>) and mu_int_reg (mupip integ -reg <reg_name>).
  */
 GBLDEF enc_handles		mu_int_encr_handles;
 GBLDEF boolean_t		ointeg_this_reg;
-GTM_SNAPSHOT_ONLY(
-	GBLDEF util_snapshot_ptr_t	util_ss_ptr;
-	GBLDEF boolean_t		preserve_snapshot;
-	GBLDEF boolean_t		online_specified;
-)
+GBLDEF util_snapshot_ptr_t	util_ss_ptr;
+GBLDEF boolean_t		preserve_snapshot;
+GBLDEF boolean_t		online_specified;
 
 GBLREF bool			mu_ctrly_occurred;
 GBLREF bool			mu_ctrlc_occurred;
@@ -152,22 +154,23 @@ error_def(ERR_DBRBNLBMN);
 error_def(ERR_DBRBNNEG);
 error_def(ERR_DBRBNTOOLRG);
 error_def(ERR_DBRDONLY);
+error_def(ERR_DBSPANCHUNKORD);
+error_def(ERR_DBSPANGLOINCMP);
 error_def(ERR_DBTNLTCTN);
-error_def(ERR_DBTNRESETINC);
 error_def(ERR_DBTNRESET);
+error_def(ERR_DBTNRESETINC);
 error_def(ERR_INTEGERRS);
 error_def(ERR_MUNOACTION);
 error_def(ERR_MUNOFINISH);
 error_def(ERR_MUNOTALLINTEG);
 error_def(ERR_MUPCLIERR);
-error_def(ERR_DBSPANGLOINCMP);
-error_def(ERR_DBSPANCHUNKORD);
+error_def(ERR_REGFILENOTFOUND);
 
 void mupip_integ(void)
 {
 	boolean_t		full, muint_all_index_blocks, retvalue_mu_int_reg, region_was_frozen;
 	boolean_t		update_filehdr, update_header_tn;
-	boolean_t		online_integ = FALSE;
+	boolean_t		online_integ = FALSE, stats_specified;
 	char			*temp, util_buff[MAX_UTIL_LEN];
 	unsigned char		dummy;
 	unsigned char		key_buff[2048];
@@ -185,11 +188,15 @@ void mupip_integ(void)
 	sgmnt_addrs		*csa;
 	sgmnt_data_ptr_t	csd;
 	span_node_integ		span_node_data;
-	GTM_SNAPSHOT_ONLY(
-		char		ss_filename[GTM_PATH_MAX];
-		unsigned short	ss_file_len = GTM_PATH_MAX;
-	)
+	char			ss_filename[GTM_PATH_MAX];
+	unsigned short		ss_file_len = GTM_PATH_MAX;
+	unix_db_info		*udi;
+	gd_region		*baseDBreg, *reg;
+	sgmnt_addrs		*baseDBcsa;
+	node_local_ptr_t	baseDBnl;
+	DCL_THREADGBL_ACCESS;
 
+	SETUP_THREADGBL_ACCESS;
 	sndata = &span_node_data;
 	error_mupip = FALSE;
 	if (NULL == gv_target)
@@ -246,8 +253,7 @@ void mupip_integ(void)
 		muint_fast = FALSE;
 	/* DBG qualifier prints extra debug messages while waiting for KIP in region freeze */
 	debug_mupip = (CLI_PRESENT == cli_present("DBG"));
-	GTM_SNAPSHOT_ONLY(online_specified = (CLI_PRESENT == cli_present("ONLINE"));)
-#	ifdef GTM_SNAPSHOT
+	online_specified = (CLI_PRESENT == cli_present("ONLINE"));
 	if (online_specified)
 	{ 	/* if MUPIP INTEG -ONLINE -ANALYZE=<filename> is given then display details about the snapshot file
 		 * and do early return
@@ -258,10 +264,22 @@ void mupip_integ(void)
 			return;
 		}
 	}
-#	endif
-	if ((CLI_PRESENT == cli_present("REGION")) GTM_SNAPSHOT_ONLY(|| online_specified))
+	stats_specified = FALSE;
+	if ((CLI_PRESENT == cli_present("REGION")) || online_specified)
 	{
+		/* MUPIP INTEG -REG -STATS should work on statsdbs. So enable statsdb region visibility in gld */
+		assert(FALSE == TREF(ok_to_see_statsdb_regs));
+		if (CLI_PRESENT == cli_present("STATS"))
+		{
+			TREF(ok_to_see_statsdb_regs) = TRUE;
+			TREF(statshare_opted_in) = FALSE;	/* Do not open statsdb automatically when basedb is opened.
+								 * This is needed in the "mu_int_reg" calls done below.
+								 */
+			stats_specified = TRUE;
+		}
 		gvinit(); /* side effect: initializes gv_altkey (used by code below) & gv_currkey (not used by below code) */
+		if (stats_specified)
+			TREF(ok_to_see_statsdb_regs) = FALSE;
 		region = TRUE;
 		mu_getlst("WHAT", SIZEOF(tp_region));
 		if (!grlist)
@@ -273,9 +291,9 @@ void mupip_integ(void)
 		rptr = grlist;
 	} else
 		GVKEY_INIT(gv_altkey, DBKEYSIZE(MAX_KEY_SZ));	/* used by code below */
-	GTM_SNAPSHOT_ONLY(online_integ = ((TRUE != cli_negated("ONLINE")) && region)); /* Default option for INTEG is -ONLINE */
-	GTM_SNAPSHOT_ONLY(preserve_snapshot = (CLI_PRESENT == cli_present("PRESERVE"))); /* Should snapshot file be preserved ? */
-	GTM_SNAPSHOT_ONLY(assert(!online_integ || (region && !tn_reset_specified)));
+	online_integ = ((TRUE != cli_negated("ONLINE")) && region); /* Default option for INTEG is -ONLINE */
+	preserve_snapshot = (CLI_PRESENT == cli_present("PRESERVE")); /* Should snapshot file be preserved ? */
+	assert(!online_integ || (region && !tn_reset_specified));
 	assert(MUINTKEY_FALSE == muint_key);
 	if (CLI_PRESENT == cli_present("SUBSCRIPT"))
 	{
@@ -304,7 +322,6 @@ void mupip_integ(void)
 	{
 		if (online_integ)
 		{
-#			ifdef GTM_SNAPSHOT
 			/* The below structure members will be assigned in ss_initiate done in mu_int_reg.
 			 * No free required as will be gone when process dies
 			 */
@@ -312,7 +329,6 @@ void mupip_integ(void)
 			util_ss_ptr->header = &mu_int_data;
 			util_ss_ptr->master_map = mu_int_master;
 			util_ss_ptr->native_size = 0;
-#			endif
 		} else /* Establish the condition handler ONLY if ONLINE INTEG was not requested */
 			ESTABLISH(mu_freeze_ch);
 	}
@@ -323,7 +339,8 @@ void mupip_integ(void)
 		if (region)
 		{
 			assert(NULL != rptr);
-			if (!mupfndfil(rptr->reg, NULL))
+			reg = rptr->reg;
+			if (!mupfndfil(reg, NULL, LOG_ERROR_TRUE))
 			{
 				mu_int_skipreg_cnt++;
 				rptr = rptr->fPtr;
@@ -348,11 +365,42 @@ void mupip_integ(void)
 		sndata->sn_type = SN_NOT;
 		if (region)
 		{
-			util_out_print("!/!/Integ of region !AD", TRUE, REG_LEN_STR(rptr->reg));
-			ointeg_this_reg = online_integ;
-			mu_int_reg(rptr->reg, &retvalue_mu_int_reg);	/* sets "gv_cur_region" */
-			region_was_frozen = !ointeg_this_reg;
-			if (TRUE != retvalue_mu_int_reg)
+			if (stats_specified)
+			{	/* -STATS has been specified. So only work on the stats region, not the base region.
+				 * "mu_getlst" would have added only the base region in the list. Replace that with
+				 * the corresponding stats region and continue integ. But first open base region db
+				 * in order to determine stats region. It is safe to do this replacement as mupip integ
+				 * does not get crit across all regions. If it did, then statsdb region cannot replace
+				 * the basedb region as ftok order across all involved regions matter in that case (and
+				 * only "insert_region" knows to insert based on that ordering but that is not possible
+				 * for statsdb region because the statsdb file location is not known at "mu_getlst" time).
+				 */
+				assert(FALSE == TREF(statshare_opted_in));	/* So we only open basedb & not statsdb */
+				mu_int_reg(reg, &retvalue_mu_int_reg, RETURN_AFTER_DB_OPEN_TRUE);	/* sets "gv_cur_region" */
+				/* Copy statsdb file name into statsdb region and then do "mupfndfil" to check if the file exists */
+				if (retvalue_mu_int_reg)
+				{
+					baseDBreg = reg;
+					baseDBcsa = &FILE_INFO(baseDBreg)->s_addrs;
+					baseDBnl = baseDBcsa->nl;
+					BASEDBREG_TO_STATSDBREG(baseDBreg, reg);
+					COPY_STATSDB_FNAME_INTO_STATSREG(reg, baseDBnl->statsdb_fname, baseDBnl->statsdb_fname_len);
+					if (!mupfndfil(reg, NULL, LOG_ERROR_FALSE))
+					{	/* statsDB does not exist. Print an info message and skip to next region */
+						gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_REGFILENOTFOUND, 4,
+											DB_LEN_STR(reg), REG_LEN_STR(reg));
+						retvalue_mu_int_reg = FALSE;
+					}
+				}
+			} else
+				retvalue_mu_int_reg = TRUE;
+			if (retvalue_mu_int_reg)
+			{
+				util_out_print("!/!/Integ of region !AD", TRUE, REG_LEN_STR(reg));
+				ointeg_this_reg = online_integ;	/* used by "mu_int_reg" if called with RETURN_AFTER_DB_OPEN_FALSE */
+				mu_int_reg(reg, &retvalue_mu_int_reg, RETURN_AFTER_DB_OPEN_FALSE); /* sets "gv_cur_region" */
+			}
+			if (!retvalue_mu_int_reg)
 			{
 				rptr = rptr->fPtr;
 				if (NULL == rptr)
@@ -364,6 +412,7 @@ void mupip_integ(void)
 			 * blks_to_upgrd, free blocks calculation. Otherwise (ONLINE INTEG) then use mu_int_data for
 			 * the verification.
 			 */
+			region_was_frozen = !ointeg_this_reg;
 			if (region_was_frozen)
 				csd = csa->hdr;
 			else
@@ -423,13 +472,16 @@ void mupip_integ(void)
 			{
 				if (region_was_frozen)
 				{
-					region_freeze(rptr->reg, FALSE, FALSE, FALSE);
-					if (!rptr->reg->read_only)
+					region_freeze(reg, FALSE, FALSE, FALSE, FALSE, FALSE);
+					if (!reg->read_only)
 					{
 						fc = gv_cur_region->dyn.addr->file_cntl;
 						fc->op = FC_WRITE;
-						fc->op_buff = (unsigned char *)FILE_INFO(rptr->reg)->s_addrs.hdr;
-						fc->op_len = ROUND_UP(SIZEOF(sgmnt_data), DISK_BLOCK_SIZE);
+						/* Note: cs_addrs->hdr points to shared memory and is already aligned
+						 * appropriately even if db was opened using O_DIRECT.
+						 */
+						fc->op_buff = (unsigned char *)FILE_INFO(reg)->s_addrs.hdr;
+						fc->op_len = SGMNT_HDR_LEN;
 						fc->op_pos = 1;
 						dbfilop(fc);
 					}
@@ -712,32 +764,30 @@ void mupip_integ(void)
 				}
 				csd->span_node_absent = (sndata->sn_cnt) ? FALSE : TRUE;
 				csd->maxkeysz_assured = (maxkey_errors) ? FALSE : TRUE;
-				region_freeze(gv_cur_region, FALSE, FALSE, FALSE);
+				region_freeze(gv_cur_region, FALSE, FALSE, FALSE, FALSE, FALSE);
 				fc = gv_cur_region->dyn.addr->file_cntl;
 				fc->op = FC_WRITE;
+				/* Note: cs_addrs->hdr points to shared memory and is already aligned
+				 * appropriately even if db was opened using O_DIRECT.
+				 */
 				fc->op_buff = (unsigned char *)FILE_INFO(gv_cur_region)->s_addrs.hdr;
-				fc->op_len = ROUND_UP(SIZEOF(sgmnt_data), DISK_BLOCK_SIZE);
+				fc->op_len = SGMNT_HDR_LEN;
 				fc->op_pos = 1;
 				dbfilop(fc);
-			}
-			else if (region_was_frozen)
-			{
-				/* If online_integ, then database is not frozen, so no need to unfreeze. */
-				region_freeze(gv_cur_region, FALSE, FALSE, FALSE);
-			}
-#			ifdef GTM_SNAPSHOT
-			else
+			} else if (region_was_frozen)
+			{	/* If online_integ, then database is not frozen, so no need to unfreeze. */
+				region_freeze(gv_cur_region, FALSE, FALSE, FALSE, FALSE, FALSE);
+			} else
 			{
 				assert(SNAPSHOTS_IN_PROG(csa));
 				assert(NULL != csa->ss_ctx);
 				ss_release(&csa->ss_ctx);
 				CLEAR_SNAPSHOTS_IN_PROG(csa);
 			}
-#			endif
 			rptr = rptr->fPtr;
 			if (NULL == rptr)
 				break;
-		} else  if (!gv_cur_region->read_only)
+		} else if (!gv_cur_region->read_only)
 		{
 			assert(!online_integ);
 			update_filehdr = FALSE;
@@ -784,12 +834,18 @@ void mupip_integ(void)
 				update_filehdr = TRUE;
 				util_out_print(MSG1, TRUE);
 			}
-			if (FALSE != update_filehdr)
+			if (update_filehdr)
 			{
 				fc = gv_cur_region->dyn.addr->file_cntl;
 				fc->op = FC_WRITE;
-				fc->op_buff = (unsigned char *)&mu_int_data;
-				fc->op_len = ROUND_UP(SIZEOF(sgmnt_data), DISK_BLOCK_SIZE);
+				udi = FC2UDI(fc);
+				if (udi->fd_opened_with_o_direct)
+				{	/* Do aligned writes if opened with O_DIRECT */
+					memcpy((TREF(dio_buff)).aligned, &mu_int_data, SGMNT_HDR_LEN);
+					fc->op_buff = (sm_uc_ptr_t)(TREF(dio_buff)).aligned;
+				} else
+					fc->op_buff = (unsigned char *)&mu_int_data;
+				fc->op_len = SGMNT_HDR_LEN;
 				fc->op_pos = 1;
 				dbfilop(fc);
 				fc->op = FC_CLOSE;
@@ -799,14 +855,12 @@ void mupip_integ(void)
 		} else
 			break;
 	}
-#	ifdef UNIX
 	if (!region)
 	{
 		db_ipcs_reset(gv_cur_region);
 		mu_gv_cur_reg_free(); /* mu_gv_cur_reg_init done in mu_int_init() */
 		REVERT;
 	}
-#	endif
 	total_errors += mu_int_errknt;
 	if (error_mupip)
 		total_errors++;
diff --git a/sr_port/mupip_recover.c b/sr_port/mupip_recover.c
index a748362..7cc8d25 100755
--- a/sr_port/mupip_recover.c
+++ b/sr_port/mupip_recover.c
@@ -90,6 +90,7 @@ error_def(ERR_MUPJNLINTERRUPT);
 error_def(ERR_REPEATERROR);
 error_def(ERR_REPLINSTDBMATCH);
 error_def(ERR_REPLINSTNOHIST);
+error_def(ERR_RESYNCSEQLOW);
 error_def(ERR_RLBKJNSEQ);
 error_def(ERR_RLBKLOSTTNONLY);
 error_def(ERR_RSYNCSTRMSUPPLONLY);
@@ -184,6 +185,7 @@ void	mupip_recover(void)
 	JNL_PUT_MSG_PROGRESS("Initial processing started");
 	mur_init();
 	mur_get_options();
+	DEBUG_ONLY(jgbl.in_mupjnl = TRUE;)
 	jgbl.mur_extract = mur_options.extr[GOOD_TN]; /* journal extract process */
 	jgbl.mur_update = mur_options.update;
 	mur_open_files_status = mur_open_files();
@@ -219,7 +221,7 @@ void	mupip_recover(void)
 		{
 			/* These journal files were created by recover so they should be BEFORE_IMAGE */
 			assertpro(jctl->jfh->before_images);
-			assertpro(!mur_options.rollback_losttnonly);	/* dont know how one can end up with NOBEFORE_IMAGE jnl
+			assertpro(!mur_options.rollback_losttnonly);	/* don't know how one can end up with NOBEFORE_IMAGE jnl
 									 * files in intrpt recovery */
 			rctl->jfh_recov_interrupted = TRUE;
 			intrrupted_recov_processing = murgbl.intrpt_recovery = TRUE;
@@ -247,10 +249,8 @@ void	mupip_recover(void)
 		}
 	} else
 		TREF(jnl_extract_nocol) = 0;
-	if (mur_options.rollback && !mur_options.forward)
-	{	/* For backward rollback, determine "max_reg_seqno".
-		 * Note: For all other cases "max_reg_seqno" is uninitialized so should be later used only if backward rollback.
-		 */
+	if (mur_options.rollback)
+	{	/* In case of rollback, determine "max_reg_seqno" */
 		max_reg_seqno = 0;
 		for (regno = 0; regno < reg_total; regno++)
 		{
@@ -357,6 +357,7 @@ void	mupip_recover(void)
 	}
 	if (mur_options.fetchresync_port)
 	{
+		assert(mur_options.rollback);	/* because "max_reg_seqno" (used below) is uninitialized otherwise */
 		JNL_PUT_MSG_PROGRESS("FETCHRESYNC processing started");
 		if (SS_NORMAL != gtmrecv_fetchresync(mur_options.fetchresync_port, &murgbl.resync_seqno, max_reg_seqno))
 			mupip_exit(ERR_MUNOACTION);
@@ -386,10 +387,10 @@ void	mupip_recover(void)
 			 * invocations which might have hidden some part of the history records in the instance file.
 			 * So before doing the rollback, make sure the input resync_seqno has a corresponding history
 			 * record. If not, issue a REPLINSTNOHIST error just like a -fetchresync rollback would have done.
-			 * For stream 0, no such hiding of history records is possible so we dont have confusion between
+			 * For stream 0, no such hiding of history records is possible so we don't have confusion between
 			 * the instance file and journal file contents (no possibility of two journal records at different
 			 * points in time having the exact same strm_seqno) so we skip this check in that case. Besides,
-			 * "repl_inst_histinfo_find_seqno" processes strm_index=0 differently and we dont want that behavior.
+			 * "repl_inst_histinfo_find_seqno" processes strm_index=0 differently and we don't want that behavior.
 			 */
 			assert(murgbl.resync_seqno);
 			status = repl_inst_histinfo_find_seqno(murgbl.resync_seqno + 1, murgbl.resync_strm_index, &local_histinfo);
@@ -408,6 +409,14 @@ void	mupip_recover(void)
 	/* Do some adjustments if -resync or -fetchresync was specified and resync_strm_index is non-zero */
 	if (murgbl.resync_seqno)
 	{
+		assert(mur_options.rollback);
+		assert(!mur_options.forward || (INVALID_SUPPL_STRM == murgbl.resync_strm_index));
+		if (mur_options.forward && (murgbl.resync_seqno < max_reg_seqno))
+		{
+			gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_RESYNCSEQLOW, 4,
+				&murgbl.resync_seqno, &murgbl.resync_seqno, &max_reg_seqno, &max_reg_seqno);
+			mupip_exit(ERR_MUNOACTION);
+		}
 		/* In case the current instance is supplementary and the remote source is also supplementary, and a
 		 * resync seqno has been agreed upon, this is the unified seqno and not the stream-specific seqno
 		 * even though "murgbl.resync_strm_index" is actually 0 in this case. In this case, do not set
@@ -426,7 +435,8 @@ void	mupip_recover(void)
 		}
 	}
 	/* PHASE 2: Create list of broken transactions for both forward and backward recovery
-	 *          In addition apply PBLK for backward recover with noverify */
+	 *          In addition apply PBLK for backward recover with noverify.
+	 */
 	apply_pblk = (mur_options.update && !mur_options.forward && !mur_options.rollback_losttnonly && !mur_options.verify);
 	murgbl.mur_state = MUR_STATE_BACKWARD;
 	murgbl.ok_to_update_db = apply_pblk;	/* Allow db to be updated by the PBLKs if we chose to apply them */
@@ -444,12 +454,11 @@ void	mupip_recover(void)
 					min_broken_time, min_broken_time);
 		min_broken_seqno = losttn_seqno = MAXUINT8;
 	} else
-	{	/* In case of -ROLLBACK -BACKWARD, mur_back_process returns with "losttn_seqno" set to a pre-resolve-seqno.
-		 * This is the earliest seqno that is possibly lost in the journal files in case of a system crash.
-		 * In case of -ROLLBACK -FORWARD, it is possible this did not get set, in case of -VERIFY.
-		 * In that case though, it will get initialized in "mur_process_seqno_table". So assert accordingly.
+	{	/* In case of -ROLLBACK -BACKWARD or -ROLLBACK -FORWARD, mur_back_process returns with "losttn_seqno" set
+		 * to a pre-resolve-seqno. This is the earliest seqno that is possibly lost in the journal files in case
+		 * of a system crash. So assert accordingly.
 		 */
-		assert((0 != losttn_seqno) || mur_options.forward);
+		assert(0 != losttn_seqno);
 	}
        	/* Multi_region TP/ZTP resolution */
 	if (!mur_options.forward)
diff --git a/sr_port/mupip_reorg.c b/sr_port/mupip_reorg.c
index 6f950c2..be8cbe0 100644
--- a/sr_port/mupip_reorg.c
+++ b/sr_port/mupip_reorg.c
@@ -1,6 +1,6 @@
 /***************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -31,20 +31,15 @@
 #include "gdsbt.h"
 #include "gdsfhead.h"
 #include "gdskill.h"
-#ifdef VMS
-#include <rms.h>		/* needed for muextr.h */
-#endif
 #include "muextr.h"
 #include "iosp.h"
 #include "cli.h"
 #include "mu_reorg.h"
 #include "util.h"
-#ifdef GTM_TRUNCATE
 #include "mu_truncate.h"
 #include "op.h"
 #include "tp_change_reg.h"
 #include "is_proc_alive.h"
-#endif
 #include "filestruct.h"
 #include "error.h"
 #include "gdscc.h"
@@ -84,30 +79,29 @@ error_def(ERR_NOEXCLUDE);
 error_def(ERR_REORGCTRLY);
 error_def(ERR_REORGINC);
 
-GBLREF bool		mu_ctrlc_occurred;
-GBLREF bool		mu_ctrly_occurred;
-GBLREF boolean_t	mu_reorg_process;
-GBLREF gd_region	*gv_cur_region;
-GBLREF gv_key           *gv_currkey_next_reorg, *gv_currkey, *gv_altkey;
-GBLREF int		gv_keysize;
-GBLREF gv_namehead	*reorg_gv_target;
-GBLREF sgmnt_data_ptr_t	cs_data;
-GBLREF sgmnt_addrs	*cs_addrs;
-GBLREF uint4		process_id;
-GBLREF tp_region	*grlist;
-GBLREF bool		error_mupip;
-GBLREF inctn_opcode_t	inctn_opcode;
-#ifdef UNIX
-GBLREF	boolean_t	jnlpool_init_needed;
-#endif
+GBLREF	bool			error_mupip;
+GBLREF	bool			mu_ctrlc_occurred;
+GBLREF	bool			mu_ctrly_occurred;
+GBLREF	boolean_t		jnlpool_init_needed;
+GBLREF	boolean_t		mu_reorg_process;
+GBLREF	gd_region		*gv_cur_region;
+GBLREF	gv_key			*gv_currkey_next_reorg, *gv_currkey, *gv_altkey;
+GBLREF	gv_namehead		*reorg_gv_target;
+GBLREF	inctn_opcode_t		inctn_opcode;
+GBLREF	int			gv_keysize;
+GBLREF	sgmnt_addrs		*cs_addrs;
+GBLREF	sgmnt_data_ptr_t	cs_data;
+GBLREF	tp_region		*grlist;
+GBLREF	uint4			process_id;
 
 static readonly mval literal_poollimit =
 	DEFINE_MVAL_LITERAL(MV_STR | MV_NUM_APPROX, 0, 0, (SIZEOF("POOLLIMIT") - 1), "POOLLIMIT", 0, 0);
+
 void mupip_reorg(void)
 {
 	boolean_t		resume, reorg_success = TRUE;
 	int			data_fill_factor, index_fill_factor;
-	int			reorg_op, reg_max_rec, reg_max_key, reg_max_blk;
+	int			reorg_op, reg_max_rec, reg_max_key, reg_max_blk, status;
 	char			cli_buff[MAX_LINE], *ptr;
 	glist			gl_head, exclude_gl_head, *gl_ptr, hasht_gl;
 	uint4			cli_status;
@@ -115,7 +109,6 @@ void mupip_reorg(void)
 	unsigned short		n_len;
 	boolean_t		truncate, cur_success, restrict_reg, arg_present;
 	int			root_swap_statistic;
-#	ifdef GTM_TRUNCATE
 	int4			truncate_percent;
 	boolean_t		gotlock;
 	sgmnt_data_ptr_t	csd;
@@ -124,19 +117,15 @@ void mupip_reorg(void)
 	trunc_region		*reg_list, *tmp_reg, *reg_iter, *prev_reg;
 	uint4			fs;
 	uint4			lcl_pid;
-#	endif
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
-	UNIX_ONLY(jnlpool_init_needed = TRUE);
+	jnlpool_init_needed = TRUE;
 	mu_outofband_setup();
 	truncate = FALSE;
-	GTM_TRUNCATE_ONLY(
-		reg_list = NULL;
-		if (CLI_PRESENT == cli_present("TRUNCATE"))
-			truncate = TRUE;
-	)
-
+	reg_list = NULL;
+	if (CLI_PRESENT == cli_present("TRUNCATE"))
+		truncate = TRUE;
 	if ((CLI_PRESENT == cli_present("UPGRADE")) || (CLI_PRESENT == cli_present("DOWNGRADE")))
 	{	/* Note that "mu_reorg_process" is not set to TRUE in case of MUPIP REORG -UPGRADE/DOWNGRADE.
 		 * This is intentional because we are not doing any REORG kind of processing.
@@ -159,7 +148,7 @@ void mupip_reorg(void)
 		error_mupip = FALSE;
 		restrict_reg = TRUE;
 		gvinit();	/* initialize gd_header (needed by the following call to mu_getlst) */
-		mu_getlst("REG_NAME", SIZEOF(tp_region));	/* get the parameter corresponding to REGION qualifier */
+		mu_getlst("REG_NAME", SIZEOF(tp_region)); /* get parm for REGION qualifier */
 		if (error_mupip)
 		{
 			util_out_print("!/MUPIP REORG cannot proceed with above errors!/", FLUSH);
@@ -203,8 +192,7 @@ void mupip_reorg(void)
 			data_fill_factor = MAX_FILLFACTOR;
 		else if (MIN_FILLFACTOR > data_fill_factor)
 			data_fill_factor = MIN_FILLFACTOR;
-	}
-	else
+	} else
 		data_fill_factor = MAX_FILLFACTOR;
 	if ((cli_status = cli_present("INDEX_FILL_FACTOR")) == CLI_PRESENT)
 	{
@@ -215,8 +203,7 @@ void mupip_reorg(void)
 			index_fill_factor = MIN_FILLFACTOR;
 		else if (MAX_FILLFACTOR < index_fill_factor)
 			index_fill_factor = MAX_FILLFACTOR;
-	}
-	else
+	} else
 		index_fill_factor = data_fill_factor;
 	util_out_print("Fill Factor:: Index blocks !UL%: Data blocks !UL%", FLUSH, index_fill_factor, data_fill_factor);
 
@@ -239,8 +226,7 @@ void mupip_reorg(void)
 	{
 		n_len = 1;
                 cli_buff[0] = '*';
-	}
-	else if (FALSE == CLI_GET_STR_ALL("SELECT", cli_buff, &n_len))
+	} else if (FALSE == CLI_GET_STR_ALL("SELECT", cli_buff, &n_len))
 	{
 		n_len = 1;
                 cli_buff[0] = '*';
@@ -295,7 +281,6 @@ void mupip_reorg(void)
 		cur_success = mu_reorg(gl_ptr, &exclude_gl_head, &resume, index_fill_factor, data_fill_factor, reorg_op);
 		reorg_success &= cur_success;
 		SET_GV_CURRKEY_FROM_GVT(reorg_gv_target);
-#		ifdef GTM_TRUNCATE
 		if (truncate)
 		{	/* No need to move root blocks unless truncating */
 			assert(gv_cur_region == gl_ptr->reg);	/* should have been set inside "mu_reorg" call done above */
@@ -341,22 +326,20 @@ void mupip_reorg(void)
 				}
 			}
 		}
-#		endif
 		if (mu_ctrlc_occurred || mu_ctrly_occurred)
 		{
 			gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(1) ERR_REORGCTRLY);
 			mupip_exit(ERR_MUNOFINISH);
 		}
 	}
+	status = SS_NORMAL;
 	if (!reorg_success)
 	{
 		inctn_opcode = inctn_invalid_op;	/* needed by assert inside "preemptive_db_clnup" called by rts_error */
 		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(1) ERR_REORGINC);
-		mupip_exit(ERR_REORGINC);
-	}
-	else if (truncate)
+		status = ERR_REORGINC;
+	} else if (truncate)
 	{
-#		ifdef GTM_TRUNCATE
 		/* Move GVT ROOT blocks of all global names AFTER doing regular reorg on ALL global names.
 		 * This way we ensure one pass of reorg -truncate is enough to produce an optimally truncated file.
 		 */
@@ -421,8 +404,6 @@ void mupip_reorg(void)
 				mupip_exit(ERR_MUNOFINISH);
 			}
 		}
-#		endif
-		mupip_exit(SS_NORMAL);
-	} else
-		mupip_exit(SS_NORMAL);
+	}
+	mupip_exit(status);
 }
diff --git a/sr_port/mupip_set.c b/sr_port/mupip_set.c
old mode 100755
new mode 100644
index 8214abc..7cc8970
--- a/sr_port/mupip_set.c
+++ b/sr_port/mupip_set.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -78,32 +78,38 @@ void mupip_set(void)
 		status = mupip_set_jnlfile(jnl_fn, SIZEOF(jnl_fn));
 		mupip_exit(status);
 	}
-	if (cli_present("ACCESS_METHOD")		== CLI_PRESENT  ||
-	    cli_present("DEFER_ALLOCATE")		== CLI_NEGATED  ||
-	    cli_present("DEFER_ALLOCATE")		== CLI_PRESENT  ||
-	    cli_present("DEFER_TIME")			== CLI_PRESENT  ||
-	    cli_present("ENCRYPTABLE")			== CLI_PRESENT  ||
-	    cli_present("ENCRYPTABLE")			== CLI_NEGATED  ||
-	    cli_present("ENCRYPTIONCOMPLETE")		== CLI_PRESENT  ||
-	    cli_present("EPOCHTAPER")			== CLI_NEGATED  ||
-	    cli_present("EPOCHTAPER")			== CLI_PRESENT  ||
-	    cli_present("EXTENSION_COUNT")		== CLI_PRESENT  ||
-	    cli_present("FLUSH_TIME")			== CLI_PRESENT  ||
-	    cli_present("GLOBAL_BUFFERS")		== CLI_PRESENT  ||
-	    cli_present("INST_FREEZE_ON_ERROR")		== CLI_NEGATED  ||
-	    cli_present("INST_FREEZE_ON_ERROR")		== CLI_PRESENT  ||
-	    cli_present("KEY_SIZE")			== CLI_PRESENT  ||
-	    cli_present("LOCK_SPACE")			== CLI_PRESENT  ||
-	    cli_present("MUTEX_SLOTS")			== CLI_PRESENT  ||
-	    cli_present("PARTIAL_RECOV_BYPASS")		== CLI_PRESENT  ||
-	    cli_present("QDBRUNDOWN")			== CLI_NEGATED  ||
-	    cli_present("QDBRUNDOWN")			== CLI_PRESENT  ||
-	    cli_present("RECORD_SIZE")			== CLI_PRESENT  ||
-	    cli_present("RESERVED_BYTES")		== CLI_PRESENT  ||
-	    cli_present("SLEEP_SPIN_COUNT")		== CLI_PRESENT  ||
-	    cli_present("SPIN_SLEEP_LIMIT")		== CLI_PRESENT  ||
-	    cli_present("VERSION")			== CLI_PRESENT  ||
-	    cli_present("WAIT_DISK")			== CLI_PRESENT)
+	if ((CLI_PRESENT == cli_present("ACCESS_METHOD"))
+		|| (CLI_PRESENT == cli_present("ASYNCIO"))
+		|| (CLI_NEGATED == cli_present("ASYNCIO"))
+		|| (CLI_NEGATED == cli_present("DEFER_ALLOCATE"))
+		|| (CLI_PRESENT == cli_present("DEFER_ALLOCATE"))
+		|| (CLI_PRESENT == cli_present("DEFER_TIME"))
+		|| (CLI_PRESENT == cli_present("ENCRYPTABLE"))
+		|| (CLI_NEGATED == cli_present("ENCRYPTABLE"))
+		|| (CLI_PRESENT == cli_present("ENCRYPTIONCOMPLETE"))
+		|| (CLI_NEGATED == cli_present("EPOCHTAPER"))
+		|| (CLI_PRESENT == cli_present("EPOCHTAPER"))
+		|| (CLI_PRESENT == cli_present("EXTENSION_COUNT"))
+		|| (CLI_PRESENT == cli_present("FLUSH_TIME"))
+		|| (CLI_PRESENT == cli_present("GLOBAL_BUFFERS"))
+		|| (CLI_NEGATED == cli_present("INST_FREEZE_ON_ERROR"))
+		|| (CLI_PRESENT == cli_present("INST_FREEZE_ON_ERROR"))
+		|| (CLI_PRESENT == cli_present("KEY_SIZE"))
+		|| (CLI_PRESENT == cli_present("LCK_SHARES_DB_CRIT"))
+		|| (CLI_NEGATED == cli_present("LCK_SHARES_DB_CRIT"))
+		|| (CLI_PRESENT == cli_present("LOCK_SPACE"))
+		|| (CLI_PRESENT == cli_present("MUTEX_SLOTS"))
+		|| (CLI_PRESENT == cli_present("PARTIAL_RECOV_BYPASS"))
+		|| (CLI_NEGATED == cli_present("QDBRUNDOWN"))
+		|| (CLI_PRESENT == cli_present("QDBRUNDOWN"))
+		|| (CLI_PRESENT == cli_present("RECORD_SIZE"))
+		|| (CLI_PRESENT == cli_present("RESERVED_BYTES"))
+		|| (CLI_PRESENT == cli_present("SLEEP_SPIN_COUNT"))
+		|| (CLI_PRESENT == cli_present("SPIN_SLEEP_LIMIT"))
+		|| (CLI_NEGATED == cli_present("STATS"))
+		|| (CLI_PRESENT == cli_present("STATS"))
+		|| (CLI_PRESENT == cli_present("VERSION"))
+		|| (CLI_PRESENT == cli_present("WAIT_DISK")))
 	{
 		if (SS_NORMAL != (status = mupip_set_file(db_fn_len, db_fn)))
 			mupip_exit(status);
diff --git a/sr_port/mupip_set_jnl_cleanup.c b/sr_port/mupip_set_jnl_cleanup.c
index 7038613..d4e5f2c 100755
--- a/sr_port/mupip_set_jnl_cleanup.c
+++ b/sr_port/mupip_set_jnl_cleanup.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2012 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -11,16 +12,6 @@
 
 #include "mdef.h"
 
-#if defined(VMS)
-#include <climsgdef.h>
-#include <fab.h>
-#include <rms.h>
-#include <errno.h>
-#include <nam.h>
-#include <psldef.h>
-#include <rmsdef.h>
-#include <descrip.h>
-#endif
 #include "gtm_unistd.h"
 
 #include "gdsroot.h"
@@ -36,9 +27,7 @@
 #include "io.h"
 #include "gtmsecshr.h"
 #include "gds_rundown.h"
-#if defined(UNIX)
 #include "db_ipcs_reset.h"
-#endif
 #include "tp_change_reg.h"
 #include "dbfilop.h"
 
@@ -51,11 +40,7 @@ void mupip_set_jnl_cleanup(void)
 {
 	mu_set_rlist		*rptr;
 	file_control		*fc;
-	int4			rundown_status = EXIT_NRM;		/* if gds_rundown went smoothly */
-	VMS_ONLY(
-		GDS_INFO	*gds_info;
-		uint4		status;
-	)
+	int4			rundown_status = EXIT_NRM;		/* if "gds_rundown" went smoothly */
 
 	for (rptr = grlist; NULL != rptr; rptr = rptr->fPtr)
 	{
@@ -82,21 +67,13 @@ void mupip_set_jnl_cleanup(void)
 			fc = gv_cur_region->dyn.addr->file_cntl;
 			fc->op = FC_CLOSE;
 			dbfilop(fc);
-			VMS_ONLY(
-				gds_info = FILE_INFO(gv_cur_region);
-				assert(gds_info->file_cntl_lsb.lockid);
-				status = gtm_deq(gds_info->file_cntl_lsb.lockid, NULL, PSL$C_USER, 0);
-				assert(SS$_NORMAL == status);
-				gds_info->file_cntl_lsb.lockid = 0;
-				sys$dassgn(gds_info->fab->fab$l_stv);
-			)
-			UNIX_ONLY(db_ipcs_reset(gv_cur_region);)
+			db_ipcs_reset(gv_cur_region);
 		} else
 		{
  			tp_change_reg();
 			assert(NULL != gv_cur_region->dyn.addr->file_cntl && NULL != rptr->sd);
 			if (NULL != gv_cur_region->dyn.addr->file_cntl && NULL != rptr->sd)
-				UNIX_ONLY(rundown_status |=) gds_rundown();
+				rundown_status |= gds_rundown(CLEANUP_UDI_TRUE);
 			/* Note: We did not allocate, so we do not deallocate rptr->sd */
 			rptr->sd = NULL;
 		}
@@ -104,5 +81,5 @@ void mupip_set_jnl_cleanup(void)
 	}
 
 	if (EXIT_NRM != rundown_status)
-		rts_error(VARLSTCNT(1) ERR_NOTALLDBRNDWN);
+		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(1) ERR_NOTALLDBRNDWN);
 }
diff --git a/sr_port/mupip_set_journal.c b/sr_port/mupip_set_journal.c
index 9042e3f..412e785 100755
--- a/sr_port/mupip_set_journal.c
+++ b/sr_port/mupip_set_journal.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -14,17 +14,6 @@
 
 #include <stddef.h>		/* for offsetof macro */
 
-#if defined(VMS)
-#include <climsgdef.h>
-#include <fab.h>
-#include <rms.h>
-#include <errno.h>
-#include <nam.h>
-#include <psldef.h>
-#include <rmsdef.h>
-#include <descrip.h>
-#include <math.h> /* needed for handling of epoch_interval (EPOCH_SECOND2SECOND macro uses ceil) */
-#endif
 #include "gtm_string.h"
 #include "gtm_time.h"
 #include "gtm_stdio.h"
@@ -56,6 +45,8 @@
 #include "send_msg.h"
 #include "gtmio.h"
 #include "is_file_identical.h"
+#include "interlock.h"
+#include "anticipatory_freeze.h"
 
 #define	DB_OR_REG_SIZE	MAX(STR_LIT_LEN(FILE_STR), STR_LIT_LEN(REG_STR)) + 1 /* trailing null byte */
 
@@ -92,13 +83,12 @@ error_def(ERR_JNLSWITCHTOOSM);
 error_def(ERR_MUNOFINISH);
 error_def(ERR_MUPCLIERR);
 error_def(ERR_MUSTANDALONE);
+error_def(ERR_OFRZACTIVE);
 error_def(ERR_PREVJNLLINKCUT);
 error_def(ERR_REPLSTATE);
 error_def(ERR_TEXT);
 error_def(ERR_UNIMPLOP);
 
-VMS_ONLY(static  const   unsigned short  zero_fid[3];)
-
 uint4	mupip_set_journal(unsigned short db_fn_len, char *db_fn)
 {
 	jnl_create_info		jnl_info;
@@ -126,17 +116,19 @@ uint4	mupip_set_journal(unsigned short db_fn_len, char *db_fn)
 	jnl_private_control	*jpc;
 	jnl_buffer_ptr_t	jbp;
 	jnl_tm_t		save_gbl_jrec_time;
-#	ifdef UNIX
 	int			jnl_fd;
 	jnl_file_header		header;
 	int4			status1;
 	uint4			status2;
 	boolean_t		header_is_usable = FALSE, noprevlink_requested;
-#	endif
 	boolean_t		jnl_buffer_updated = FALSE, jnl_buffer_invalid = FALSE;
 	int			jnl_buffer_size;
 	char			s[JNLBUFFUPDAPNDX_SIZE];	/* JNLBUFFUPDAPNDX_SIZE is defined in jnl.h */
+	unix_db_info		*udi;
+	gd_segment		*seg;
+	DCL_THREADGBL_ACCESS;
 
+	SETUP_THREADGBL_ACCESS;
 	assert(SGMNT_HDR_LEN == ROUND_UP(SIZEOF(sgmnt_data), DISK_BLOCK_SIZE));
 	memset(&jnl_info, 0, SIZEOF(jnl_info));
 	jnl_info.status = jnl_info.status2 = SS_NORMAL;
@@ -175,26 +167,25 @@ uint4	mupip_set_journal(unsigned short db_fn_len, char *db_fn)
 		rptr->sd = NULL;
 		if (region)
 		{
-			if (dba_usr == rptr->reg->dyn.addr->acc_meth)
+			seg = rptr->reg->dyn.addr;
+			if (dba_usr == seg->acc_meth)
 			{
 				gtm_putmsg_csa(CSA_ARG(REG2CSA(rptr->reg)) VARLSTCNT(6) ERR_UNIMPLOP, 0, ERR_TEXT, 2,
 					LEN_AND_LIT("Journaling is not supported for access method USR"));
 				exit_status |= EXIT_WRN;
 				continue;
 			}
-			if (!mupfndfil(rptr->reg, NULL))
+			if (!mupfndfil(rptr->reg, NULL, LOG_ERROR_TRUE))
 			{
 				exit_status |= EXIT_ERR;
 				continue;
 			}
 			gv_cur_region = rptr->reg;
-			if (NULL == gv_cur_region->dyn.addr->file_cntl)
+			if (NULL == seg->file_cntl)
 			{
-				gv_cur_region->dyn.addr->acc_meth = dba_bg;
-				gv_cur_region->dyn.addr->file_cntl =
-					(file_control *)malloc(SIZEOF(*gv_cur_region->dyn.addr->file_cntl));
-				memset(gv_cur_region->dyn.addr->file_cntl, 0, SIZEOF(*gv_cur_region->dyn.addr->file_cntl));
-				gv_cur_region->dyn.addr->file_cntl->file_type = dba_bg;
+				seg->file_cntl =
+					(file_control *)malloc(SIZEOF(*seg->file_cntl));
+				memset(seg->file_cntl, 0, SIZEOF(*seg->file_cntl));
 				gds_info = FILE_INFO(gv_cur_region);
 				gds_info = (GDS_INFO *)malloc(SIZEOF(GDS_INFO));
 				memset(gds_info, 0, SIZEOF(GDS_INFO));
@@ -202,11 +193,12 @@ uint4	mupip_set_journal(unsigned short db_fn_len, char *db_fn)
 		} else
 		{
 			mu_gv_cur_reg_init();
+			seg = gv_cur_region->dyn.addr;
 			rptr->reg = gv_cur_region;
-			gv_cur_region->dyn.addr->fname_len = db_fn_len;
-			memcpy(gv_cur_region->dyn.addr->fname, db_fn, db_fn_len);
+			seg->fname_len = db_fn_len;
+			memcpy(seg->fname, db_fn, db_fn_len);
 		}
-		fc = gv_cur_region->dyn.addr->file_cntl;
+		fc = seg->file_cntl;
 		/* open shared to see what's possible */
 		gvcst_init(gv_cur_region);
 		tp_change_reg();
@@ -221,16 +213,33 @@ uint4	mupip_set_journal(unsigned short db_fn_len, char *db_fn)
 			continue;
 		}
 		grab_crit(gv_cur_region);  /* corresponding rel_crit() is done in mupip_set_jnl_cleanup() */
+		if (FROZEN_CHILLED(cs_data))
+		{	/* While a FREEZE -ONLINE was in place, all processes exited, leaving the
+			 * shared memory up. Either autorelease, if enabled, or error out.
+			 */
+			DO_CHILLED_AUTORELEASE(cs_addrs, cs_data);
+			if (FROZEN_CHILLED(cs_data))
+			{
+				gtm_putmsg_csa(CSA_ARG(cs_addrs) VARLSTCNT(4) ERR_OFRZACTIVE, 2, DB_LEN_STR(gv_cur_region));
+				exit_status |= EXIT_WRN;
+				gds_rundown_status = gds_rundown(CLEANUP_UDI_TRUE);
+				exit_status |= gds_rundown_status;
+				rptr->sd = NULL;
+				rptr->state = NONALLOCATED;	/* This means do not call "gds_rundown" again for this region
+								 * and do not process this region anymore. */
+				continue;
+			}
+		}
 		/* Now determine new journal state, replication state and before_image for this region.
 		 * Information will be kept in "rptr", which is per region.
 		 * Note that we have done grab_crit(), so we are safe on deciding state transitions */
 		if (EXIT_NRM != (status = mupip_set_journal_newstate(&jnl_options, &jnl_info, rptr)))
 		{
 			exit_status |= status;
-			UNIX_ONLY(gds_rundown_status =) gds_rundown();
+			gds_rundown_status = gds_rundown(CLEANUP_UDI_TRUE);
 			exit_status |= gds_rundown_status;
 			rptr->sd = NULL;
-			rptr->state = NONALLOCATED;	/* This means do not call gds_rundown() again for this region
+			rptr->state = NONALLOCATED;	/* This means do not call "gds_rundown" again for this region
 							 * and do not process this region anymore. */
 			continue;
 		}
@@ -257,24 +266,25 @@ uint4	mupip_set_journal(unsigned short db_fn_len, char *db_fn)
 			(repl_closed != repl_curr_state && repl_closed == rptr->repl_new_state) ||
 			(repl_closed == repl_curr_state && repl_open == rptr->repl_new_state))
 		{
-			/* Since we did gvcst_init() and now will call mu_rndwn_file() */
-			UNIX_ONLY(gds_rundown_status =) gds_rundown();
+			/* Rundown the database file since we did "gvcst_init" and now will call "mu_rndwn_file".
+			 * Since we are going to reuse the udi etc. that was allocated, use CLEANUP_UDI_FALSE.
+			 */
+			gds_rundown_status = gds_rundown(CLEANUP_UDI_FALSE);
 			exit_status |= gds_rundown_status;
 			rptr->state = NONALLOCATED;
 			rptr->sd = csd = NULL;
 			/* WARNING: The remaining code uses gv_cur_region and others
 			 * on the assumption that gds_rundown does not deallocate the space when it closes the file */
 			assert(NULL != gv_cur_region);
-			assert(NULL != gv_cur_region->dyn.addr);
-			assert(NULL != gv_cur_region->dyn.addr->file_cntl);
-			assert(NULL != gv_cur_region->dyn.addr->file_cntl->file_info);
+			assert(NULL != seg);
+			assert(NULL != seg->file_cntl);
+			assert(NULL != seg->file_cntl->file_info);
 			if (EXIT_NRM != gds_rundown_status)		/* skip mu_rndwn_file (STANDALONE) */
 				continue;
 			if (STANDALONE(gv_cur_region))
 			{
 				rptr->exclusive = TRUE;
 				fc->op = FC_OPEN;
-				fc->file_type = dba_bg;
 				status = dbfilop(fc);
 				if (SS_NORMAL != status)
 				{
@@ -282,11 +292,16 @@ uint4	mupip_set_journal(unsigned short db_fn_len, char *db_fn)
 					exit_status |= EXIT_ERR;
 					continue;
 				}
-				/* Need to read file header again,
-				 * because mu_rndwn_file does not have an interface to return fileheader */
+				/* Need to read file header again, because mu_rndwn_file does not have an interface
+				 * to return fileheader. Note if asyncio=TRUE, file would have been opened with
+				 * O_DIRECT in which case DIO alignment needs to be ensured. So use an aligned buffer
+				 * in between to do the disk read.
+				 */
 				csd = (sgmnt_data_ptr_t)malloc(SGMNT_HDR_LEN);
+				udi = FC2UDI(fc);
 				fc->op = FC_READ;
-				fc->op_buff = (sm_uc_ptr_t)csd;
+				fc->op_buff = !udi->fd_opened_with_o_direct
+							? (sm_uc_ptr_t)csd : (sm_uc_ptr_t)(TREF(dio_buff)).aligned;
 				fc->op_len = SGMNT_HDR_LEN;
 				fc->op_pos = 1;
 				status = dbfilop(fc);
@@ -298,6 +313,8 @@ uint4	mupip_set_journal(unsigned short db_fn_len, char *db_fn)
 					exit_status |= EXIT_ERR;
 					continue; /* Later mupip_set_jnl_cleanup() will do the cleanup */
 				}
+				if (udi->fd_opened_with_o_direct)
+					memcpy(csd, (TREF(dio_buff)).aligned, SGMNT_HDR_LEN);
 				cs_addrs->hdr = cs_data = rptr->sd = csd;
 				rptr->state = ALLOCATED;
 			} else
@@ -333,14 +350,16 @@ uint4	mupip_set_journal(unsigned short db_fn_len, char *db_fn)
 		this_iter_prevlinkcut_error = do_prevlinkcut_error;
 		do_prevlinkcut_error = FALSE;
 		next_rptr = rptr->fPtr;
+		if (NULL == rptr->sd)
+			continue;
+		assert(NONALLOCATED != rptr->state);
 		gv_cur_region = rptr->reg;
 		if (gv_cur_region->read_only)
 			continue;
-		tp_change_reg(); /* cs_data and cs_addrs are used in functions called from here */
+		/* cs_data and cs_addrs are used in functions called from here */
+		cs_addrs = &FILE_INFO(gv_cur_region)->s_addrs;
+		assert(rptr->sd == cs_addrs->hdr);
 		cs_data = csd = rptr->sd;
-		assert(NULL != csd || NONALLOCATED == rptr->state);
-		if (NULL == csd)	/* Just to be safe. May be this is not necessary. */
-			continue;
 		jnl_curr_state = (enum jnl_state_codes)csd->jnl_state;
 		repl_curr_state = (enum repl_state_codes)csd->repl_state;
 		jnl_info.csd = csd;
@@ -350,9 +369,10 @@ uint4	mupip_set_journal(unsigned short db_fn_len, char *db_fn)
 		jnl_info.jnl_state = csd->jnl_state;
 		/* note that even replication on to off will create new journals */
 		newjnlfiles = (jnl_open == rptr->jnl_new_state) ?  TRUE : FALSE;
-		fc = gv_cur_region->dyn.addr->file_cntl;
-		jnl_info.fn = gv_cur_region->dyn.addr->fname;
-		jnl_info.fn_len = gv_cur_region->dyn.addr->fname_len;
+		seg = gv_cur_region->dyn.addr;
+		fc = seg->file_cntl;
+		jnl_info.fn = seg->fname;
+		jnl_info.fn_len = seg->fname_len;
 		if (region)
 		{
 			strcpy(db_or_reg, REG_STR);
@@ -455,14 +475,12 @@ uint4	mupip_set_journal(unsigned short db_fn_len, char *db_fn)
 							jnl_info.jnl_len, jnl_info.jnl);
 				exit_status |= EXIT_ERR;
 				break;
-#			ifdef UNIX
 			} else if (jnl_info.alloc + jnl_info.extend > jnl_info.autoswitchlimit
 					&& jnl_info.alloc != jnl_info.autoswitchlimit)
 			{
 				gtm_putmsg_csa(CSA_ARG(cs_addrs) VARLSTCNT(8) ERR_JNLALLOCGROW, 6, jnl_info.alloc,
 						jnl_info.autoswitchlimit, "database file", DB_LEN_STR(gv_cur_region));
 				jnl_info.alloc = jnl_info.autoswitchlimit;
-#			endif
 			} else
 			{
 				align_autoswitch = ALIGNED_ROUND_DOWN(jnl_info.autoswitchlimit, jnl_info.alloc, jnl_info.extend);
@@ -530,7 +548,6 @@ uint4	mupip_set_journal(unsigned short db_fn_len, char *db_fn)
 				}
 			} else
 				curr_stat_res = new_stat_res; /* new_stat_res is already set */
-#			ifdef UNIX
 			if (newjnlfiles)
 			{
 				jnl_points_to_db = FALSE;
@@ -540,7 +557,8 @@ uint4	mupip_set_journal(unsigned short db_fn_len, char *db_fn)
 					 */
 					assert('\0' == jnlfile.addr[jnlfile.len]);
 					jnlfile.addr[jnlfile.len] = '\0';	/* just in case above assert is FALSE */
-					OPENFILE(jnlfile.addr, O_RDONLY, jnl_fd);
+					OPENFILE(jnlfile.addr, ((FILE_READONLY & curr_stat_res) ? O_RDONLY : O_RDWR), jnl_fd);
+
 				} else if (FILE_PRESENT & new_stat_res)
 				{	/* Check if the new journal file (that we know exists) points back to this database file.
 					 * If not, the journal file prev links should be cut in the new journal file.
@@ -550,7 +568,7 @@ uint4	mupip_set_journal(unsigned short db_fn_len, char *db_fn)
 					OPENFILE((char *)jnl_info.jnl, O_RDONLY, jnl_fd);
 				} else
 					jnl_fd = FD_INVALID;
-				if (0 <= jnl_fd)
+				if (FD_INVALID != jnl_fd)
 				{
 					DO_FILE_READ(jnl_fd, 0, &header, SIZEOF(header), status1, status2);
 					if (SS_NORMAL == status1)
@@ -564,10 +582,9 @@ uint4	mupip_set_journal(unsigned short db_fn_len, char *db_fn)
 							header.data_file_name[header.data_file_name_length] = '\0';
 							assert('\0' == jnl_info.fn[jnl_info.fn_len]);
 							jnl_info.fn[jnl_info.fn_len] = '\0';
-							if (is_file_identical((char *)header.data_file_name,
-												(char *)jnl_info.fn))
+							if (is_file_identical((char *)header.data_file_name, (char *)jnl_info.fn))
 								jnl_points_to_db = TRUE;
-							UNIX_ONLY(header_is_usable = TRUE;)
+							header_is_usable = TRUE;
 						}
 					}
 				}
@@ -580,7 +597,7 @@ uint4	mupip_set_journal(unsigned short db_fn_len, char *db_fn)
 				if ((FILE_PRESENT & curr_stat_res) && !noprevlink_requested)
 				{
 					keep_prev_link = jnl_points_to_db;
-					safe_to_switch = (jnlname_same && keep_prev_link);
+					safe_to_switch = (jnlname_same && jnl_points_to_db);
 				} else if ((FILE_PRESENT & new_stat_res) && !noprevlink_requested)
 				{
 					keep_prev_link = FALSE;
@@ -592,8 +609,8 @@ uint4	mupip_set_journal(unsigned short db_fn_len, char *db_fn)
 					safe_to_switch = jnl_points_to_db;
 				} else
 				{
-					keep_prev_link = FALSE;	/* since current and new jnl file both dont exist */
-					safe_to_switch = TRUE;	/* since current and new jnl file both dont exist */
+					keep_prev_link = FALSE;	/* since current and new jnl file both don't exist */
+					safe_to_switch = TRUE;	/* since current and new jnl file both don't exist */
 				}
 				if ((FILE_PRESENT & new_stat_res) && !safe_to_switch)
 				{
@@ -605,9 +622,6 @@ uint4	mupip_set_journal(unsigned short db_fn_len, char *db_fn)
 					break;
 				}
 			}
-#			else
-			keep_prev_link = TRUE;
-#			endif
 			if (jnl_open != jnl_curr_state)
 				curr_jnl_present = FALSE;
 			else
@@ -644,10 +658,9 @@ uint4	mupip_set_journal(unsigned short db_fn_len, char *db_fn)
 				{
 					assert(NULL != cs_addrs->nl);
 					jpc = cs_addrs->jnl;
-					UNIX_ONLY(if (cs_addrs->nl->jnl_file.u.inode))
-					VMS_ONLY(if (memcmp(cs_addrs->nl->jnl_file.jnl_file_id.fid, zero_fid, SIZEOF(zero_fid))))
+					if (cs_addrs->nl->jnl_file.u.inode)
 					{
-						if (SS_NORMAL != (status = set_jnl_file_close(SET_JNL_FILE_CLOSE_SETJNL)))
+						if (SS_NORMAL != (status = set_jnl_file_close()))
 						{	/* Invoke jnl_file_lost to turn off journaling and retry journal creation
 							 * to create fresh journal files.
 							 */
@@ -656,12 +669,12 @@ uint4	mupip_set_journal(unsigned short db_fn_len, char *db_fn)
 										      * information message */
 							next_rptr = rptr;
 							continue;
-						}
-						UNIX_ONLY(header.crash = FALSE;)	/* Even if the journal was crashed, that
-											 * should be fixed now */
+						} else
+							header.crash = FALSE;	/* Even if the journal was crashed, that
+										 * should be fixed now */
 					} else
 					{	/* Ideally, no other process should have a journal file for this database open.
-						 * But, As part of C9I03-002965, we realized it is possible for processes accessing
+						 * But, as part of C9I03-002965, we realized it is possible for processes accessing
 						 * the older journal file to continue to write to it even though
 						 * csa->nl->jnl_file.u.inode field is 0. The only way to signal other proceses, that
 						 * have the jnl file open, of a concurrent journal file switch, is by incrementing
@@ -670,24 +683,31 @@ uint4	mupip_set_journal(unsigned short db_fn_len, char *db_fn)
 						 */
 						assert(NULL != jpc);
 						jpc->jnl_buff->cycle++;
+						if (header_is_usable && !(FILE_READONLY & curr_stat_res))
+						{
+							jnl_set_fd_prior(jnl_fd, cs_addrs, cs_data, &header);
+							jnl_fd = NOJNL;	/* Mark the fd as closed */
+						}
 					}
-#					ifdef UNIX
 					/* Cut the link if the journal is crashed and there is no shared memory around */
 					if (header_is_usable && header.crash)
 						keep_prev_link = FALSE;
-#					endif
-					/* For MM, set_jnl_file_close() can call wcs_flu() which can remap the file.
+					/* For MM, "set_jnl_file_close" can call wcs_flu() which can remap the file.
 					 * So reset csd and rptr->sd since their value may have changed.
 					 */
 					assert((dba_mm == cs_data->acc_meth) || (csd == cs_data));
 					rptr->sd = csd = cs_data;
 				} else if ((jnl_closed == jnl_curr_state) && (jnl_open == rptr->jnl_new_state))
-				{	/* sync db for closed->open transition. for VMS WCSFLU_FSYNC_DB is ignored */
+				{	/* sync db for closed->open transition. */
 					wcs_flu(WCSFLU_FSYNC_DB | WCSFLU_FLUSH_HDR);
 					/* In case this is MM and wcs_flu() remapped an extended database, reset csd and rptr->sd */
 					assert((dba_mm == cs_data->acc_meth) || (csd == cs_data));
 					rptr->sd = csd = cs_data;
 				}
+			} else if (curr_jnl_present && header_is_usable && !(FILE_READONLY & curr_stat_res))
+			{	/* Close out journal in standalone case */
+				jnl_set_fd_prior(jnl_fd, cs_addrs, cs_data, &header);
+				jnl_fd = NOJNL;	/* Mark the fd as closed */
 			}
 			if (newjnlfiles)
 			{
@@ -697,17 +717,6 @@ uint4	mupip_set_journal(unsigned short db_fn_len, char *db_fn)
 				{
 					if (!(jnl_info.repl_state == repl_open && repl_open != repl_curr_state))
 					{ /* record the back link */
-#						ifdef VMS
-						if (!jnlname_same && (FILE_PRESENT & new_stat_res))
-						{
-							gtm_putmsg_csa(CSA_ARG(cs_addrs) VARLSTCNT(4)
-									ERR_FILEEXISTS, 2, jnl_info.jnl_len, jnl_info.jnl);
-							gtm_putmsg_csa(CSA_ARG(cs_addrs) VARLSTCNT(4)
-									ERR_JNLNOCREATE, 2, jnl_info.jnl_len, jnl_info.jnl);
-							exit_status |= EXIT_ERR;
-							break;
-						}
-#						endif
 						if (keep_prev_link)
 						{	/* Save journal link */
 							jnl_info.prev_jnl_len = csd->jnl_file_len;
@@ -718,9 +727,9 @@ uint4	mupip_set_journal(unsigned short db_fn_len, char *db_fn)
 					}
 				}
 				if ((jnl_closed == jnl_curr_state) && (NULL != cs_addrs->nl))
-				{ /* Cleanup the jnl file info in shared memory before switching journal file.
-				     This case occurs if mupip set -journal is run after jnl_file_lost() closes
-				     journaling on a region */
+				{	/* Cleanup the jnl file info in shared memory before switching journal file. This case
+					 * occurs if mupip set -journal is run after jnl_file_lost() closes journaling on a region.
+					 */
 					NULLIFY_JNL_FILE_ID(cs_addrs);
 				}
 				jnl_info.blks_to_upgrd = csd->blks_to_upgrd;
@@ -749,7 +758,7 @@ uint4	mupip_set_journal(unsigned short db_fn_len, char *db_fn)
 						jnl_info.jnl_len, jnl_info.jnl, DB_LEN_STR(gv_cur_region));
 				}
                         }
-			/* Following jnl_before_image, jnl_state, repl_state are unique charecteristics per region */
+			/* Following jnl_before_image, jnl_state, repl_state are unique characteristics per region */
 			csd->jnl_before_image = jnl_info.before_images;
 			csd->jnl_state = rptr->jnl_new_state;
 			csd->repl_state = jnl_info.repl_state;
@@ -781,9 +790,13 @@ uint4	mupip_set_journal(unsigned short db_fn_len, char *db_fn)
 			csd->reg_seqno = jnl_info.reg_seqno;
 			if (jnl_options.sync_io_specified)
 				csd->jnl_sync_io = jnl_options.sync_io;
-			UNIX_ONLY(csd->yield_lmt = jnl_options.yield_limit;)
+			csd->yield_lmt = jnl_options.yield_limit;
 		} else
-		{	/* Journaling is to be disabled for this region. Reset all fields */
+		{	/* Journaling is to be disabled for this region. */
+			/* Mark the current journal as switched, if possible. */
+			if (jnl_open == csd->jnl_state)
+				jnl_set_cur_prior(gv_cur_region, NULL, csd);
+			/* Reset all fields */
 			csd->jnl_before_image = FALSE;
 			csd->jnl_state = jnl_notallowed;
 			csd->repl_state = repl_closed;
@@ -795,7 +808,7 @@ uint4	mupip_set_journal(unsigned short db_fn_len, char *db_fn)
 			csd->jnl_deq = 0;
 			csd->jnl_file_len = 0;
 			csd->jnl_sync_io = FALSE;
-			UNIX_ONLY(csd->yield_lmt = DEFAULT_YIELD_LIMIT;)
+			csd->yield_lmt = DEFAULT_YIELD_LIMIT;
 		}
 		if (CLI_ABSENT != jnl_options.cli_journal || CLI_ABSENT != jnl_options.cli_replic_on)
 			gtm_putmsg_csa(CSA_ARG(cs_addrs) VARLSTCNT(8) ERR_JNLSTATE, 6, db_or_reg_len, db_or_reg, db_reg_name_len,
@@ -803,9 +816,19 @@ uint4	mupip_set_journal(unsigned short db_fn_len, char *db_fn)
 		if (CLI_ABSENT != jnl_options.cli_replic_on)
 			gtm_putmsg_csa(CSA_ARG(cs_addrs) VARLSTCNT(8) ERR_REPLSTATE, 6, db_or_reg_len, db_or_reg, db_reg_name_len,
 					db_reg_name, LEN_AND_STR(repl_state_lit[jnl_info.repl_state]));
-		/* Write the updated information back to the database file */
+		/* Write the updated information back to the database file.
+		 * Note if asyncio=TRUE, file would have been opened with O_DIRECT in which case
+		 * DIO alignment needs to be ensured. So use an aligned buffer in between to do the write.
+		 */
 		fc->op = FC_WRITE;
-		fc->op_buff = (sm_uc_ptr_t)csd;
+		udi = FC2UDI(fc);
+		if (!udi->fd_opened_with_o_direct)
+			fc->op_buff = (sm_uc_ptr_t)csd;
+		else
+		{
+			memcpy((TREF(dio_buff)).aligned, csd, SGMNT_HDR_LEN);
+			fc->op_buff = (sm_uc_ptr_t)(TREF(dio_buff)).aligned;
+		}
 		fc->op_len = SGMNT_HDR_LEN;
 		fc->op_pos = 1;
 		status = dbfilop(fc);
diff --git a/sr_port/mupip_set_journal_parse.c b/sr_port/mupip_set_journal_parse.c
index 18008aa..79a6df0 100755
--- a/sr_port/mupip_set_journal_parse.c
+++ b/sr_port/mupip_set_journal_parse.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2014 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -11,11 +12,6 @@
 
 #include "mdef.h"
 
-#if defined(VMS)
-#include <climsgdef.h>
-#include <math.h> /* needed for handling of epoch_interval (EPOCH_SECOND2SECOND macro uses ceil) */
-#endif
-
 #include "gtm_string.h"		/* for memcpy() */
 
 #include "gdsroot.h"
@@ -74,7 +70,6 @@ boolean_t mupip_set_journal_parse(set_jnl_options *jnl_options, jnl_create_info
 		jnl_info->before_images = TRUE;
 	} else if (CLI_NEGATED == cli_status1)
 	{
-		VMS_ONLY(assert(CLI_PRESENT != jnl_options->cli_replic_on);)
 		jnl_options->image_type_specified = TRUE;
 		jnl_info->before_images = FALSE;
 	} else
@@ -169,19 +164,24 @@ boolean_t mupip_set_journal_parse(set_jnl_options *jnl_options, jnl_create_info
 			return FALSE;
 		}
 	}
-	temp_jnl_fn_len = jnl_info->jnl_len = MAX_FN_LEN + 1;
-	if (jnl_options->filename_specified = cli_get_str("FILENAME", (char *)jnl_info->jnl, &temp_jnl_fn_len))
-		jnl_info->jnl_len = temp_jnl_fn_len;
-	else
+	if (jnl_options->filename_specified = (CLI_PRESENT == cli_present("FILENAME")))
+	{
+		temp_jnl_fn_len = jnl_info->jnl_len = ARRAYSIZE(jnl_info->jnl) - 1;	/* leave 1 byte for null terminator */
+		jnl_info->jnl[temp_jnl_fn_len] = '\0';	/* null terminate string in case "cli_get_str" returns file name that fills
+							 * up all allocated bytes (i.e. temp_jnl_fn_len bytes long).
+							 */
+		if (cli_get_str("FILENAME", (char *)jnl_info->jnl, &temp_jnl_fn_len))
+			jnl_info->jnl_len = temp_jnl_fn_len;
+		else
+			return FALSE;
+	} else
 		jnl_info->jnl_len = 0;
-	if ((CLI_PRESENT == (cli_status1 = cli_present(UNIX_ONLY("SYNC_IO") VMS_ONLY("CACHE")))) || (CLI_NEGATED ==  cli_status1))
+	if ((CLI_PRESENT == (cli_status1 = cli_present("SYNC_IO"))) || (CLI_NEGATED ==  cli_status1))
 	{
 		jnl_options->sync_io_specified = TRUE;
-		jnl_options->sync_io = (UNIX_ONLY(CLI_PRESENT) VMS_ONLY(CLI_NEGATED) == cli_status1) ? TRUE: FALSE;
-	}
-	else
+		jnl_options->sync_io = (CLI_PRESENT == cli_status1) ? TRUE: FALSE;
+	} else
 		jnl_options->sync_io_specified = FALSE;
-	UNIX_ONLY(
 	if (jnl_options->yield_limit_specified = (CLI_PRESENT == cli_present("YIELD_LIMIT")))
 	{
 		if (!cli_get_int("YIELD_LIMIT", &jnl_options->yield_limit))
@@ -197,6 +197,5 @@ boolean_t mupip_set_journal_parse(set_jnl_options *jnl_options, jnl_create_info
 			return FALSE;
 		}
 	}
-	)
 	return TRUE;
 }
diff --git a/sr_port/mupip_upgrade.c b/sr_port/mupip_upgrade.c
index 544dce9..2f57894 100755
--- a/sr_port/mupip_upgrade.c
+++ b/sr_port/mupip_upgrade.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2005-2015 Fidelity National Information	*
+ * Copyright (c) 2005-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -15,23 +15,13 @@
  * 2) Mastermap of pre-V5.3-004 V5.x database files (max of 128M blocks) to support a new max of 224M blocks
  */
 
-
 #include "mdef.h"
 
-#ifdef UNIX
 #include "gtm_stat.h"
 #include "gtm_fcntl.h"
 #include "gtm_unistd.h"
 #include "eintr_wrappers.h"
 #include "gtm_stdlib.h"
-#else
-#include <descrip.h>
-#include <fab.h>
-#include <ssdef.h>
-#include <rms.h>
-#include <iodef.h>
-#include <efndef.h>
-#endif
 #include "gtm_string.h"
 
 #ifdef __MVS__
@@ -63,9 +53,8 @@
 #include "mu_outofband_setup.h"
 #include "gdsbml.h"
 #include "anticipatory_freeze.h"
-#ifdef UNIX
 #include "mu_all_version_standalone.h"
-#endif
+#include "db_write_eof_block.h"
 
 LITREF  char            	gtm_release_name[];
 LITREF  int4           		gtm_release_name_len;
@@ -90,14 +79,14 @@ error_def(ERR_MUNOUPGRD);
 error_def(ERR_MUPGRDSUCC);
 error_def(ERR_MUSTANDALONE);
 error_def(ERR_MUUPGRDNRDY);
+error_def(ERR_STATSDBNOTSUPP);
 error_def(ERR_SYSCALL);
 error_def(ERR_TEXT);
-ZOS_ONLY(error_def(ERR_BADTAG);)
 
 void mupip_upgrade(void)
 {
 	char		db_fn[MAX_FN_LEN + 1];
-	unsigned short	db_fn_len; 	/* cli_get_str expects short */
+	unsigned short	db_fn_len;	/* cli_get_str expects short */
 	fd_type		channel;
 	int		save_errno, v15_csd_size, max_max_rec_size;
 	int		fstat_res;
@@ -106,68 +95,57 @@ void mupip_upgrade(void)
 	off_t 		v15_file_size;
 	v15_sgmnt_data	v15_csd;
 	sgmnt_data	csd;
-#ifdef UNIX
- 	struct stat    	stat_buf;
+	struct stat	stat_buf;
 	unsigned char	new_v5_master_map[MASTER_MAP_SIZE_DFLT - MASTER_MAP_SIZE_V5_OLD];
-#elif defined(VMS)
-	struct FAB	mupfab;
-	struct XABFHC	xabfhc;
-#endif
 	ZOS_ONLY(int	realfiletag;)
 	DEBUG_ONLY(int norm_vbn;)
 	unsigned char	new_master_map[MASTER_MAP_SIZE_V4];
+	DCL_THREADGBL_ACCESS;
 
+	SETUP_THREADGBL_ACCESS;
 	/* Structure checks .. */
-#ifndef __ia64
 	assert((24 * 1024) == SIZEOF(v15_sgmnt_data));	/* Verify V4 file header hasn't suddenly increased for some odd reason */
-#endif
-
-	UNIX_ONLY(sem_inf = (sem_info *)malloc(SIZEOF(sem_info) * FTOK_ID_CNT);
-		  memset(sem_inf, 0, SIZEOF(sem_info) * FTOK_ID_CNT);
-		  atexit(mupip_upgrade_cleanup));
+	sem_inf = (sem_info *)malloc(SIZEOF(sem_info) * FTOK_ID_CNT);
+	memset(sem_inf, 0, SIZEOF(sem_info) * FTOK_ID_CNT);
+	atexit(mupip_upgrade_cleanup);
 	db_fn_len = SIZEOF(db_fn);
 	if (!cli_get_str("FILE", db_fn, &db_fn_len))
-		rts_error(VARLSTCNT(1) ERR_MUNODBNAME);
+		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(1) ERR_MUNODBNAME);
 	db_fn_len = MIN(db_fn_len, MAX_FN_LEN);
 	db_fn[db_fn_len] = '\0';	/* Null terminate */
+	/* Need to find out if this is a statsDB file. This necessitates opening the file to read the sgmnt_data
+	 * file header before we have the proper locks obtained for it so after checking, the file is closed again
+	 * so it can be opened under lock to prevent race conditions.
+	 */
+	if (FD_INVALID != (channel = OPEN(db_fn, O_RDONLY)))
+	{
+		DO_FILE_READ(channel, 0, &csd, SIZEOF(sgmnt_data), status, status2);
+		if ((0 == memcmp(csd.label, GDS_LABEL, STR_LIT_LEN(GDS_LABEL))) && (RDBF_STATSDB_MASK == csd.reservedDBFlags))
+		{
+			F_CLOSE(channel, rc);
+			gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_STATSDBNOTSUPP, 2, db_fn_len, db_fn);
+			mupip_exit(ERR_MUNOUPGRD);
+		}
+		F_CLOSE(channel, rc);
+	}
 	if (!mu_upgrd_dngrd_confirmed())
 	{
-		gtm_putmsg(VARLSTCNT(4) ERR_TEXT, 2, LEN_AND_LIT("Upgrade canceled by user"));
+		gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_TEXT, 2, LEN_AND_LIT("Upgrade canceled by user"));
 		mupip_exit(ERR_MUNOUPGRD);
 	}
-	gtm_putmsg(VARLSTCNT(4) ERR_TEXT, 2, LEN_AND_LIT("Mupip upgrade started"));
+	gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_TEXT, 2, LEN_AND_LIT("Mupip upgrade started"));
 	UNIX_ONLY(mu_all_version_get_standalone(db_fn, sem_inf));
 	mu_outofband_setup();	/* Will ignore user interrupts. Note that now the
 				 * elapsed time for this is order of milliseconds */
 	/* ??? Should we set this just before DB_DO_FILE_WRITE to have smallest time window of ignoring signal? */
-#ifdef VMS
-	mupfab = cc$rms_fab;
-	mupfab.fab$l_fna = db_fn;
-	mupfab.fab$b_fns = db_fn_len;
-	mupfab.fab$b_fac = FAB$M_GET | FAB$M_PUT | FAB$M_UPD ;
-	mupfab.fab$l_fop = FAB$M_UFO;
-	xabfhc = cc$rms_xabfhc;
-	mupfab.fab$l_xab = &xabfhc;
-	status = sys$open(&mupfab);
-	if (0 == (status & 1))
-	{
-		if (RMS$_FLK == status)
-			gtm_putmsg(VARLSTCNT(4) MAKE_MSG_TYPE(ERR_MUSTANDALONE, ERROR), 2, db_fn_len, db_fn);
-		else
-			gtm_putmsg(VARLSTCNT(6) ERR_DBOPNERR, 2, db_fn_len, db_fn, status, mupfab.fab$l_stv);
-		mupip_exit(ERR_MUNOUPGRD);
-	}
-	channel = mupfab.fab$l_stv;
-	v15_file_size =  xabfhc.xab$l_ebk;
-#else
 	if (FD_INVALID == (channel = OPEN(db_fn, O_RDWR)))
 	{
 		save_errno = errno;
 		if (FD_INVALID != (channel = OPEN(db_fn, O_RDONLY)))
-			gtm_putmsg(VARLSTCNT(10) ERR_DBRDONLY, 2, db_fn_len, db_fn, errno, 0,
+			gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(10) ERR_DBRDONLY, 2, db_fn_len, db_fn, errno, 0,
 				   MAKE_MSG_TYPE(ERR_TEXT, ERROR), 2, LEN_AND_LIT("Cannot upgrade read-only database"));
 		else
-			gtm_putmsg(VARLSTCNT(5) ERR_DBOPNERR, 2, db_fn_len, db_fn, save_errno);
+			gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(5) ERR_DBOPNERR, 2, db_fn_len, db_fn, save_errno);
 		mupip_exit(ERR_MUNOUPGRD);
 	}
 	/* get file status */
@@ -175,35 +153,32 @@ void mupip_upgrade(void)
 	if (-1 == fstat_res)
 	{
 		F_CLOSE(channel, rc); /* resets "channel" to FD_INVALID */
-		gtm_putmsg(VARLSTCNT(8) ERR_SYSCALL, 5, RTS_ERROR_LITERAL("fstat"), CALLFROM, errno);
-		gtm_putmsg(VARLSTCNT(4) ERR_DBOPNERR, 2, db_fn_len, db_fn);
+		gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(8) ERR_SYSCALL, 5, RTS_ERROR_LITERAL("fstat"), CALLFROM, errno);
+		gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_DBOPNERR, 2, db_fn_len, db_fn);
 		mupip_exit(ERR_MUNOUPGRD);
 	}
-#if defined(__MVS__)
+#	if defined(__MVS__)
 	if (-1 == gtm_zos_tag_to_policy(channel, TAG_BINARY, &realfiletag))
 		TAG_POLICY_GTM_PUTMSG(db_fn, errno, realfiletag, TAG_BINARY);
-#endif
+#	endif
 	v15_file_size = stat_buf.st_size;
-#endif
 	v15_csd_size = SIZEOF(v15_sgmnt_data);
 	DO_FILE_READ(channel, 0, &v15_csd, v15_csd_size, status, status2);
 	if (SS_NORMAL != status)
 	{
 		F_CLOSE(channel, rc); /* resets "channel" to FD_INVALID */
-		gtm_putmsg(VARLSTCNT(5) ERR_DBFILOPERR, 2, db_fn_len, db_fn, status);
+		gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(5) ERR_DBFILOPERR, 2, db_fn_len, db_fn, status);
 		mupip_exit(ERR_MUNOUPGRD);
 	}
 	if (!memcmp(v15_csd.label, GDS_LABEL, STR_LIT_LEN(GDS_LABEL)))
-	{
-	/* Check if the V5 database is old(supports only 128M blocks) if so update the V5 database to support
-	 * to 224M blocks.
-	 */
-#ifdef UNIX
+	{	/* Check if the V5 database is old(supports only 128M blocks) if so update the V5 database to support
+		 * to 224M blocks.
+		 */
 		DO_FILE_READ(channel, 0, &csd, SIZEOF(sgmnt_data), status, status2);
 		if (SS_NORMAL != status)
 		{
 			F_CLOSE(channel, rc); /* resets "channel" to FD_INVALID */
-			gtm_putmsg(VARLSTCNT(5) ERR_DBFILOPERR, 2, db_fn_len, db_fn, status);
+			gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(5) ERR_DBFILOPERR, 2, db_fn_len, db_fn, status);
 			mupip_exit(ERR_MUNOUPGRD);
 		}
 		if (MASTER_MAP_SIZE_V5_OLD == csd.master_map_len)
@@ -221,7 +196,7 @@ void mupip_upgrade(void)
 			if (SS_NORMAL != status)
 			{
 				F_CLOSE(channel, rc); /* resets "channel" to FD_INVALID */
-				gtm_putmsg(VARLSTCNT(5) ERR_DBFILOPERR, 2, db_fn_len, db_fn, status);
+				gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(5) ERR_DBFILOPERR, 2, db_fn_len, db_fn, status);
 				mupip_exit(ERR_MUNOUPGRD);
 			}
 			memset(new_v5_master_map, BMP_EIGHT_BLKS_FREE, (MASTER_MAP_SIZE_V5 - MASTER_MAP_SIZE_V5_OLD));
@@ -230,91 +205,99 @@ void mupip_upgrade(void)
 			if (SS_NORMAL != status)
 			{
 				F_CLOSE(channel, rc); /* resets "channel" to FD_INVALID */
-				gtm_putmsg(VARLSTCNT(5) ERR_DBFILOPERR, 2, db_fn_len, db_fn, status);
+				gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(5) ERR_DBFILOPERR, 2, db_fn_len, db_fn, status);
 				mupip_exit(ERR_MUNOUPGRD);
 			}
 			F_CLOSE(channel, rc);	/* resets "channel" to FD_INVALID */
 			UNIX_ONLY(mu_all_version_release_standalone(sem_inf));
-			gtm_putmsg(VARLSTCNT(4) ERR_TEXT, 2,
+			gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_TEXT, 2,
 					LEN_AND_LIT("Maximum master map size is now increased from 32K to 56K"));
-			gtm_putmsg(VARLSTCNT(8) ERR_MUPGRDSUCC, 6, db_fn_len, db_fn, RTS_ERROR_LITERAL("upgraded"),
-				   gtm_release_name_len, gtm_release_name);
+			gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(8) ERR_MUPGRDSUCC, 6, db_fn_len, db_fn,
+					RTS_ERROR_LITERAL("upgraded"), gtm_release_name_len, gtm_release_name);
 			mupip_exit(SS_NORMAL);
 		}
-#endif
 		F_CLOSE(channel, rc);	/* resets "channel" to FD_INVALID */
-		gtm_putmsg(VARLSTCNT(4) MAKE_MSG_TYPE(ERR_TEXT, ERROR), 2, LEN_AND_LIT("Database already upgraded"));
+		gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) MAKE_MSG_TYPE(ERR_TEXT, ERROR), 2,
+								LEN_AND_LIT("Database already upgraded"));
 		mupip_exit(ERR_MUNOUPGRD);
 	} else if (memcmp(v15_csd.label, V15_GDS_LABEL, STR_LIT_LEN(V15_GDS_LABEL)))
 	{ 	/* It is not a version we can upgrade, that is, not V4.0-000 to V5.0-FT01 */
 		F_CLOSE(channel, rc);	/* resets "channel" to FD_INVALID */
 		if (memcmp(v15_csd.label, GDS_LABEL, GDS_LABEL_SZ - 3))
-			gtm_putmsg(VARLSTCNT(4) ERR_DBNOTGDS, 2, db_fn_len, db_fn);
+			gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_DBNOTGDS, 2, db_fn_len, db_fn);
 		else
-			gtm_putmsg(VARLSTCNT(4) ERR_BADDBVER, 2, db_fn_len, db_fn);
+			gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_BADDBVER, 2, db_fn_len, db_fn);
 		mupip_exit(ERR_MUNOUPGRD);
 	}
 	/* It is V4.x or V5.0-FT01 version : Se proceed with upgrade */
 	if (v15_csd.createinprogress)
 	{
 		F_CLOSE(channel, rc);	/* resets "channel" to FD_INVALID */
-		gtm_putmsg(VARLSTCNT(4) MAKE_MSG_TYPE(ERR_TEXT, ERROR), 2, LEN_AND_LIT("Database creation in progress"));
+		gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) MAKE_MSG_TYPE(ERR_TEXT, ERROR), 2,
+							LEN_AND_LIT("Database creation in progress"));
 		mupip_exit(ERR_MUNOUPGRD);
 	}
 	if (v15_csd.freeze)
 	{
 		F_CLOSE(channel, rc);	/* resets "channel" to FD_INVALID */
-		gtm_putmsg(VARLSTCNT(4) MAKE_MSG_TYPE(ERR_TEXT, ERROR), 2, LEN_AND_LIT("Database is frozen"));
+		gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) MAKE_MSG_TYPE(ERR_TEXT, ERROR), 2, LEN_AND_LIT("Database is frozen"));
 		mupip_exit(ERR_MUNOUPGRD);
 	}
 	if (v15_csd.wc_blocked)
 	{
 		F_CLOSE(channel, rc);	/* resets "channel" to FD_INVALID */
-		gtm_putmsg(VARLSTCNT(4) MAKE_MSG_TYPE(ERR_TEXT, ERROR),
+		gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) MAKE_MSG_TYPE(ERR_TEXT, ERROR),
 			   2, LEN_AND_LIT("Database modifications are disallowed because wc_blocked is set"));
 		mupip_exit(ERR_MUNOUPGRD);
 	}
 	if (v15_csd.file_corrupt)
 	{
 		F_CLOSE(channel, rc);	/* resets "channel" to FD_INVALID */
-		gtm_putmsg(VARLSTCNT(4) MAKE_MSG_TYPE(ERR_TEXT, ERROR), 2, LEN_AND_LIT("Database corrupt"));
+		gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) MAKE_MSG_TYPE(ERR_TEXT, ERROR), 2, LEN_AND_LIT("Database corrupt"));
 		mupip_exit(ERR_MUNOUPGRD);
 	}
 	if (v15_csd.intrpt_recov_tp_resolve_time || v15_csd.intrpt_recov_resync_seqno || v15_csd.recov_interrupted
 	    || v15_csd.intrpt_recov_jnl_state || v15_csd.intrpt_recov_repl_state)
 	{
 		F_CLOSE(channel, rc);	/* resets "channel" to FD_INVALID */
-		gtm_putmsg(VARLSTCNT(4) MAKE_MSG_TYPE(ERR_TEXT, ERROR), 2, LEN_AND_LIT("Recovery was interrupted"));
+		gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) MAKE_MSG_TYPE(ERR_TEXT, ERROR), 2,
+								LEN_AND_LIT("Recovery was interrupted"));
 		mupip_exit(ERR_MUNOUPGRD);
 	}
 	if (GDSVCURR != v15_csd.certified_for_upgrade_to)
 	{
 		F_CLOSE(channel, rc);	/* resets "channel" to FD_INVALID */
-		gtm_putmsg(VARLSTCNT(6) ERR_MUUPGRDNRDY, 4, db_fn_len, db_fn, gtm_release_name_len, gtm_release_name);
+		gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_MUUPGRDNRDY, 4, db_fn_len, db_fn,
+								gtm_release_name_len, gtm_release_name);
 		mupip_exit(ERR_MUNOUPGRD);
 	}
 	max_max_rec_size = v15_csd.blk_size - SIZEOF(blk_hdr);
 	if (VMS_ONLY(9) UNIX_ONLY(8) > v15_csd.reserved_bytes)
 	{
 		F_CLOSE(channel, rc); /* resets "channel" to FD_INVALID */
-		gtm_putmsg(VARLSTCNT(6) ERR_DBMINRESBYTES, 4, VMS_ONLY(9) UNIX_ONLY(8), v15_csd.reserved_bytes);
+		gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_DBMINRESBYTES, 4, VMS_ONLY(9) UNIX_ONLY(8), v15_csd.reserved_bytes);
 		mupip_exit(ERR_MUNOUPGRD);
 	}
 	if (v15_csd.max_rec_size > max_max_rec_size)
 	{
 		F_CLOSE(channel, rc); /* resets "channel" to FD_INVALID */
-		rts_error(VARLSTCNT(5) ERR_DBMAXREC2BIG, 3, v15_csd.max_rec_size, v15_csd.blk_size, max_max_rec_size);
+		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(5) ERR_DBMAXREC2BIG, 3,
+				v15_csd.max_rec_size, v15_csd.blk_size, max_max_rec_size);
 		mupip_exit(ERR_MUNOUPGRD);
 	}
-	gtm_putmsg(VARLSTCNT(6) ERR_MUINFOUINT4, 4, LEN_AND_LIT("Old file header size"), v15_csd_size, v15_csd_size);
-	gtm_putmsg(VARLSTCNT(6) ERR_MUINFOUINT8, 4, LEN_AND_LIT("Old file length"), &v15_file_size, &v15_file_size);
-	gtm_putmsg(VARLSTCNT(6) ERR_MUINFOUINT4, 4, LEN_AND_LIT("Old file start_vbn"), v15_csd.start_vbn, v15_csd.start_vbn);
-	gtm_putmsg(VARLSTCNT(6) ERR_MUINFOUINT4, 4, LEN_AND_LIT("Old file gds blk_size"), v15_csd.blk_size, v15_csd.blk_size);
-	gtm_putmsg(VARLSTCNT(6) ERR_MUINFOUINT4, 4, LEN_AND_LIT("Old file total_blks"),
+	gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_MUINFOUINT4, 4, LEN_AND_LIT("Old file header size"),
+											v15_csd_size, v15_csd_size);
+	gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_MUINFOUINT8, 4, LEN_AND_LIT("Old file length"),
+											&v15_file_size, &v15_file_size);
+	gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_MUINFOUINT4, 4, LEN_AND_LIT("Old file start_vbn"),
+											v15_csd.start_vbn, v15_csd.start_vbn);
+	gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_MUINFOUINT4, 4, LEN_AND_LIT("Old file gds blk_size"),
+											v15_csd.blk_size, v15_csd.blk_size);
+	gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_MUINFOUINT4, 4, LEN_AND_LIT("Old file total_blks"),
 		   v15_csd.trans_hist.total_blks, v15_csd.trans_hist.total_blks);
 	assert(ROUND_DOWN2(v15_csd.blk_size, DISK_BLOCK_SIZE) == v15_csd.blk_size);
 	assert(((off_t)v15_csd.start_vbn) * DISK_BLOCK_SIZE +
-			(off_t)v15_csd.trans_hist.total_blks * v15_csd.blk_size == v15_file_size VMS_ONLY(* DISK_BLOCK_SIZE));
+			(off_t)v15_csd.trans_hist.total_blks * v15_csd.blk_size == v15_file_size);
 	/* Now call mu_upgrd_header() to do file header upgrade in memory */
         mu_upgrd_header(&v15_csd, &csd);
 	csd.master_map_len = MASTER_MAP_SIZE_V4;	/* V5 master map is not part of file header */
@@ -323,27 +306,27 @@ void mupip_upgrade(void)
 	if (SS_NORMAL != status)
 	{
 		F_CLOSE(channel, rc); /* resets "channel" to FD_INVALID */
-		gtm_putmsg(VARLSTCNT(5) ERR_DBFILOPERR, 2, db_fn_len, db_fn, status);
+		gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(5) ERR_DBFILOPERR, 2, db_fn_len, db_fn, status);
 		mupip_exit(ERR_MUNOUPGRD);
 	}
 	DB_DO_FILE_WRITE(channel, SIZEOF(csd), new_master_map, MASTER_MAP_SIZE_V4, status, status2);
 	if (SS_NORMAL != status)
 	{
 		F_CLOSE(channel, rc); /* resets "channel" to FD_INVALID */
-		gtm_putmsg(VARLSTCNT(5) ERR_DBFILOPERR, 2, db_fn_len, db_fn, status);
+		gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(5) ERR_DBFILOPERR, 2, db_fn_len, db_fn, status);
 		mupip_exit(ERR_MUNOUPGRD);
 	}
+	/* The V4 database file would have a 512-byte EOF block. Enlarge it to be a GDS-block instead (V6 format). */
+	db_write_eof_block(NULL, channel, v15_csd.blk_size, v15_file_size - DISK_BLOCK_SIZE, &(TREF(dio_buff)));
 	F_CLOSE(channel, rc);	/* resets "channel" to FD_INVALID */
-	UNIX_ONLY(mu_all_version_release_standalone(sem_inf));
-	gtm_putmsg(VARLSTCNT(8) ERR_MUPGRDSUCC, 6, db_fn_len, db_fn, RTS_ERROR_LITERAL("upgraded"),
-		   gtm_release_name_len, gtm_release_name);
+	mu_all_version_release_standalone(sem_inf);
+	gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(8) ERR_MUPGRDSUCC, 6, db_fn_len, db_fn, RTS_ERROR_LITERAL("upgraded"),
+		   								gtm_release_name_len, gtm_release_name);
 	mupip_exit(SS_NORMAL);
 }
 
-#ifdef UNIX
 static void mupip_upgrade_cleanup(void)
 {
 	if (sem_inf)
 		mu_all_version_release_standalone(sem_inf);
 }
-#endif
diff --git a/sr_port/muprec.h b/sr_port/muprec.h
index cba2565..b6f644c 100755
--- a/sr_port/muprec.h
+++ b/sr_port/muprec.h
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -246,7 +246,7 @@ error_def(ERR_SYSCALL);
 			}											\
 		} else												\
 		{	/* Recovery on this database was previously interrupted. Although we know which		\
-			 * stream seqno was specified for this round of rollback, we dont know which		\
+			 * stream seqno was specified for this round of rollback, we don't know which		\
 			 * streams were specified in previous interrupted rollbacks. So set all the		\
 			 * stream #s in the file header based on murgbl.resync_strm_seqno[] which has		\
 			 * already been computed taking into account ALL region file headers.			\
@@ -639,6 +639,7 @@ typedef struct reg_ctl_list_struct
 	struct jnlext_multi_struct *jnlext_shm_list[TOT_EXTR_TYPES];	/* valid only if "rctl->this_pid_is_owner" is FALSE */
 	int			extr_fn_len_orig[TOT_EXTR_TYPES];	/* fn_len before the region-name suffix was added */
 	boolean_t		last_jext_logical_rec[TOT_EXTR_TYPES];/* Whether corresponding last_jext_rec[] is logical record */
+	dio_buff_t		dio_buff;	/* Used for O_DIRECT IO in case this region has asyncio=TRUE */
 } reg_ctl_list;
 
 typedef struct redirect_list_struct
@@ -789,7 +790,7 @@ typedef struct jnlext_multi_struct
 						 * = 2*n+1 for *SET*,*KILL*,*LGTRIG*,*ZTRIG rectypes where this is the nth
 						 *	journaled update (across all regions) in this TP.
 						 * = 2*n for *ZTWORM* rectype. We need this 2n+1 vs 2n distinction because
-						 *	ZTWORM type of updates dont inherit a unique update_num at the time of
+						 *	ZTWORM type of updates don't inherit a unique update_num at the time of
 						 *	the TP transaction. They just inherit the update_num of the following
 						 *	*SET*,*KILL* rectype.
 						 * = 2**31-1 (max-possible-value) for TCOM record.
@@ -1207,21 +1208,23 @@ typedef struct {
 #define	RESOLVED_TRUE	TRUE
 
 /* The below macro is similar to code in gtm_pthread_init_key.c */
-#define	MUR_SET_MULTI_PROC_KEY(RCTL, PTR)			\
-{								\
-	gd_region	*reg;					\
-								\
-	assert(multi_proc_in_use);				\
-	reg = RCTL->gd;						\
-	if (reg->rname_len)					\
-	{							\
-		PTR = &reg->rname[0];				\
-		assert('\0' == PTR[reg->rname_len]);		\
-	} else							\
-	{							\
-		PTR = &reg->dyn.addr->fname[0];			\
-		assert('\0' == PTR[reg->dyn.addr->fname_len]);	\
-	}							\
+#define	MUR_SET_MULTI_PROC_KEY(RCTL, PTR)					\
+{										\
+	gd_region	*reg;							\
+										\
+	assert(multi_proc_in_use);						\
+	reg = RCTL->gd;								\
+	if (!reg->owning_gd->is_dummy_gbldir)					\
+	{									\
+		assert(reg->rname_len);						\
+		PTR = &reg->rname[0];						\
+		assert('\0' == PTR[reg->rname_len]);				\
+	} else									\
+	{									\
+		assert(!memcmp(reg->rname, "DEFAULT", reg->rname_len));		\
+		PTR = &reg->dyn.addr->fname[0];					\
+		assert('\0' == PTR[reg->dyn.addr->fname_len]);			\
+	}									\
 }
 
 #define	IN_MUR_CLOSE_FILES_FALSE	FALSE
diff --git a/sr_port/mur_apply_pblk.c b/sr_port/mur_apply_pblk.c
index ff25f15..5f1ff9c 100755
--- a/sr_port/mur_apply_pblk.c
+++ b/sr_port/mur_apply_pblk.c
@@ -82,9 +82,15 @@ uint4 mur_apply_pblk(reg_ctl_list *rctl)
 	jnl_record		*jnlrec;
         unix_db_info		*udi;
 
-	status = gtm_pthread_init_key(rctl->gd);
+	reg = rctl->gd;
+	status = gtm_pthread_init_key(reg);
 	if (0 != status)
 		return status;
+	udi = FILE_INFO(rctl->gd);
+	if (udi->fd_opened_with_o_direct)
+	{	/* Check if rctl->dio_buff is allocated. If not allocate it now before invoking "mur_output_pblk" */
+		DIO_BUFF_EXPAND_IF_NEEDED(udi, rctl->csd->blk_size, &rctl->dio_buff);
+	}
 	apply_intrpt_pblk = (MUR_STATE_INTRPT_RECOVERY == murgbl.mur_state);
 	if (!apply_intrpt_pblk)
 	{
@@ -144,10 +150,13 @@ uint4 mur_apply_pblk(reg_ctl_list *rctl)
 			MUR_SAVE_RESYNC_STRM_SEQNO(rctl, rctl->csd);
 			PTHREAD_MUTEX_UNLOCK_IF_NEEDED(was_holder);	/* release exclusive thread lock if needed */
 			/* flush the changed csd to disk */
-			fc = rctl->gd->dyn.addr->file_cntl;
+			fc = reg->dyn.addr->file_cntl;
 			fc->op = FC_WRITE;
+			/* Note: csd points to shared memory and is already aligned
+			 * appropriately even if db was opened using O_DIRECT.
+			 */
 			fc->op_buff = (sm_uc_ptr_t)rctl->csd;
-			fc->op_len = ROUND_UP(SGMNT_HDR_LEN, DISK_BLOCK_SIZE);
+			fc->op_len = SGMNT_HDR_LEN;
 			fc->op_pos = 1;
 			dbfilop(fc);
 		}
@@ -302,9 +311,7 @@ uint4 mur_apply_pblk(reg_ctl_list *rctl)
 		if (SS_NORMAL != mur_fread_eof_crash(jctl, jctl->jfh->end_of_data, jctl->rec_offset))
 			return ERR_JNLBADRECFMT;
 	} /* end infinite for */
-	reg = rctl->gd;
 	assert(reg == rctl->csa->region);
-	udi = FILE_INFO(reg);
 	DB_FSYNC(reg, udi, rctl->csa, db_fsync_in_prog, save_errno);
 	if (0 != save_errno)
 	{
@@ -322,7 +329,7 @@ uint4 mur_output_pblk(reg_ctl_list *rctl)
 	jnl_ctl_list		*jctl;
 	file_control		*db_ctl;
 	struct_jrec_blk		pblkrec;
-	uchar_ptr_t		pblkcontents, pblk_jrec_start;
+	uchar_ptr_t		pblkcontents, tmpbuf, pblk_jrec_start;
 	int4			fullblockwrite_len, blks_in_lmap;
 	uint4			size, fbw_size;
 	sgmnt_addrs		*csa, *repl_csa;
@@ -333,6 +340,7 @@ uint4 mur_output_pblk(reg_ctl_list *rctl)
 	blk_hdr_ptr_t		bp;
 	gd_segment		*seg;
 	boolean_t		use_new_key;
+	unix_db_info		*udi;
 
 	/* In case of a LOSTTNONLY rollback, it is still possible to reach here if one region has NOBEFORE_IMAGE
 	 * while another has BEFORE_IMAGE. Any case do NOT apply PBLKs.
@@ -420,6 +428,18 @@ uint4 mur_output_pblk(reg_ctl_list *rctl)
 		assert(MUR_BUFF_SIZE > MAX_DB_BLK_SIZE);
 	} else
 		fbw_size = size;
+	udi = FC2UDI(db_ctl);
+	if (udi->fd_opened_with_o_direct)
+	{	/* Need to align buffer before the write due to O_DIRECT. Note: We cannot use the global variable
+		 * "dio_buff.aligned" here (like in many other places) as this function needs to be multi-thread safe.
+		 * So we use a region-specific (and in turn thread-specific memory location) "rctl->dio_buff" instead.
+		 */
+		fbw_size = ROUND_UP2(fbw_size, DIO_ALIGNSIZE(udi));
+		assert(DIO_BUFF_NO_OVERFLOW(rctl->dio_buff, fbw_size));
+		tmpbuf = (uchar_ptr_t)rctl->dio_buff.aligned;
+		memcpy(tmpbuf, pblkcontents, fbw_size);
+		pblkcontents = tmpbuf;
+	}
 	db_ctl->op_buff = pblkcontents;
 	db_ctl->op_len = fbw_size;
 	bp = (blk_hdr_ptr_t)pblkcontents;
diff --git a/sr_port/mur_back_process.c b/sr_port/mur_back_process.c
index bc95a4d..8a6f589 100755
--- a/sr_port/mur_back_process.c
+++ b/sr_port/mur_back_process.c
@@ -42,9 +42,7 @@
 #include "gtmcrypt.h"
 #include "wbox_test_init.h"
 #include "timers.h"
-#ifdef GTM_TRUNCATE
 #include "gdsfilext_nojnl.h"
-#endif
 #include "have_crit.h"
 #include "gtm_multi_thread.h"
 #include "gtm_pthread_init_key.h"
@@ -283,6 +281,7 @@ uint4 mur_back_processing(jnl_tm_t alt_tp_resolve_time)
 	reg_ctl_list		*rctl, *rctl_top;
 	seq_num			rec_token_seq, save_resync_seqno, strm_seqno;
 	sgmnt_data_ptr_t	csd;
+	unix_db_info		*udi;
 
 	reg_total = murgbl.reg_total;
 	max_lvrec_time = 0;			/* To find maximum of all valid record's timestamp */
@@ -384,7 +383,7 @@ uint4 mur_back_processing(jnl_tm_t alt_tp_resolve_time)
 						gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(5) ERR_RESOLVESEQSTRM, 3, idx,
 							&murgbl.resync_strm_seqno[idx], &murgbl.resync_strm_seqno[idx]);
 				}
-				/* If -resync=<strm_seqno> is specified, we dont yet know what jnl_seqno it maps back to.
+				/* If -resync=<strm_seqno> is specified, we don't yet know what jnl_seqno it maps back to.
 				 * To facilitate that determination, set resync_seqno to maximum possible value. It will
 				 * be adjusted below based on the records we see in backward processing.
 				 */
@@ -399,7 +398,7 @@ uint4 mur_back_processing(jnl_tm_t alt_tp_resolve_time)
 				{	/* When the 'if' condition is TRUE, we apply PBLKs in mur_back_process.
 					 * Store the jgbl.mur_tp_resolve_time/murgbl.resync_seqno.
 					 * So we remember to undo PBLKs at least upto that point,
-					 * in case this recovery is interrupted/crashes.
+					 * in case this recovery is interrupted/crashed.
 					 */
 					assert(0 == iterationcnt || csd->intrpt_recov_tp_resolve_time >= jgbl.mur_tp_resolve_time);
 					csd->intrpt_recov_tp_resolve_time = jgbl.mur_tp_resolve_time;
@@ -415,8 +414,19 @@ uint4 mur_back_processing(jnl_tm_t alt_tp_resolve_time)
 					/* flush the changed csd to disk */
 					fc = rctl->gd->dyn.addr->file_cntl;
 					fc->op = FC_WRITE;
+					/* Note: csd points to shared memory and is already aligned
+					 * appropriately even if db was opened using O_DIRECT.
+					 */
 					fc->op_buff = (sm_uc_ptr_t)csd;
-					fc->op_len = (int)ROUND_UP(SIZEOF_FILE_HDR(csd), DISK_BLOCK_SIZE);
+					/* The size of the write depends on the extent to which the mastermap has changes
+					 * due to the PBLK application. Round it to the nearest filesystem-block alignment
+					 * in case of O_DIRECT.
+					 */
+					udi = FC2UDI(fc);
+					if (!udi->fd_opened_with_o_direct)
+						fc->op_len = (int)ROUND_UP(SIZEOF_FILE_HDR(csd), DISK_BLOCK_SIZE);
+					else
+						fc->op_len = (int)ROUND_UP(SIZEOF_FILE_HDR(csd), DIO_ALIGNSIZE(udi));
 					fc->op_pos = 1;
 					dbfilop(fc);
 				}
@@ -594,9 +604,9 @@ uint4	mur_back_processing_one_region(mur_back_opt_t *mur_back_options)
 	int			gtmcrypt_errno;
 	boolean_t		use_new_key;
 	char			s[TRANS_OR_SEQ_NUM_CONT_CHK_FAILED_SZ];	/* for appending sequence or transaction number */
-#	ifdef GTM_TRUNCATE
 	uint4			cur_total, old_total;
-#	endif
+	file_control		*fc;
+	unix_db_info		*udi;
 
 	jctl = mur_back_options->jctl;
 	rctl = jctl->reg_ctl;
@@ -620,6 +630,12 @@ uint4	mur_back_processing_one_region(mur_back_opt_t *mur_back_options)
 	status = mur_back_options->status;
 	this_reg_resolved = FALSE;
 	apply_pblk_this_region = mur_back_apply_pblk && !rctl->jfh_recov_interrupted;
+	fc = rctl->gd->dyn.addr->file_cntl;
+	udi = FC2UDI(fc);
+	if (udi->fd_opened_with_o_direct)
+	{	/* Check if rctl->dio_buff is allocated. If not allocate it now before invoking "mur_output_pblk" */
+		DIO_BUFF_EXPAND_IF_NEEDED(udi, rctl->csd->blk_size, &rctl->dio_buff);
+	}
 	reg_total = murgbl.reg_total;
 	last_tcom_token = 0;
 	for ( ; SS_NORMAL == status; status = mur_prev_rec(&jctl))
@@ -713,7 +729,7 @@ uint4	mur_back_processing_one_region(mur_back_opt_t *mur_back_options)
 				/* In case this journal file was crashed it is possible that we see a good PBLK at
 				 * this point in time but could find bad journal data in the journal file at an
 				 * EARLIER offset (further in backward processing). If the current recovery has been
-				 * invoked with -noverify, we dont have a separate pblk application phase. One might
+				 * invoked with -noverify, we don't have a separate pblk application phase. One might
 				 * wonder if in such a case, it is safe to apply good pblks at this point without
 				 * knowing if bad pblks could be encountered later in backward processing. Turns out
 				 * it is safe. If there were bad pblks BEFORE this good pblk, this means the good pblk
@@ -742,7 +758,6 @@ uint4	mur_back_processing_one_region(mur_back_opt_t *mur_back_options)
 			mur_output_pblk(rctl);
 			continue;
 		}
-#		ifdef GTM_TRUNCATE
 		if (JRT_TRUNC == rectype)
 		{
 			if (mur_options.forward)
@@ -756,7 +771,6 @@ uint4	mur_back_processing_one_region(mur_back_opt_t *mur_back_options)
 				MUR_BACK_PROCESS_ERROR(jctl, "File extend for JRT_TRUNC record failed");
 			continue;
 		}
-#		endif
 		rec_tn = jnlrec->prefix.tn;
 		rec_time = jnlrec->prefix.time;
 		/* In journal records token_seq field is a union of jnl_seqno and token for TP, ZTP or unfenced records.
@@ -1099,13 +1113,16 @@ uint4	mur_back_processing_one_region(mur_back_opt_t *mur_back_options)
 	assert((SS_NORMAL != status) || !mur_options.rollback || this_reg_resolved);
 	if (SS_NORMAL != status)
 	{
+		/* For mur_options.forward ERR_JNLREADBOF is not error but others are.
+		 * For mur_options.backward ERR_NOPREVLINK is not an error in some cases (based on tp_resolve_time).
+		 */
 		if (!mur_options.forward)
 		{
 			if (ERR_NOPREVLINK == status)
 			{	/* We check if there is an EPOCH with a time EQUAL to the tp_resolve_time. If so we
 				 * try not to issue the NOPREVLINK error for this boundary condition.
 				 */
-				assert(JNL_HDR_LEN ==  jctl->rec_offset);
+				assert(JNL_HDR_LEN == jctl->rec_offset);
 				if (rec_time <= jgbl.mur_tp_resolve_time)
 				{
 					jctl->rec_offset = JNL_HDR_LEN + PINI_RECLEN;
@@ -1175,8 +1192,31 @@ uint4	mur_back_processing_one_region(mur_back_opt_t *mur_back_options)
 		{
 			rctl->jctl_error = jctl;
 			return status;
+		} else if (mur_options.rollback && !this_reg_resolved)
+		{	/* Forward rollback and this region has still not been resolved. Fix it to reflect
+			 * the seqno of the earliest EPOCH in this region. Note: The below code is very
+			 * similar to the ERR_NOPREVLINK case (for backward rollback) in the above "if" block.
+			 */
+			assert(JNL_HDR_LEN == jctl->rec_offset);
+			jctl->rec_offset = JNL_HDR_LEN + PINI_RECLEN;
+			status = mur_prev(jctl, jctl->rec_offset);
+			if (SS_NORMAL != status)
+			{
+				rctl->jctl_error = jctl;
+				return status;
+			}
+			jnlrec = mur_desc->jnlrec;
+			rectype = (enum jnl_record_type)jnlrec->prefix.jrec_type;
+			rec_time = jnlrec->prefix.time;
+			assert(rec_time >= jgbl.mur_tp_resolve_time);
+			rec_token_seq = GET_JNL_SEQNO(jnlrec);
+			assert(JRT_EPOCH == rectype);
+			assert(!murgbl.resync_seqno || (rec_token_seq <= murgbl.resync_seqno));	/* else RESYNCSEQNOLOW error
+												 * would have been issued.
+												 */
+			SAVE_PRE_RESOLVE_SEQNO(rectype, rec_time, rec_token_seq);
+			this_reg_resolved = TRUE;
 		}
-		/* for mur_options.forward ERR_JNLREADBOF is not error but others are */
 	}
 	assertpro(mur_options.forward || (NULL != rctl->jctl_turn_around));
 	return SS_NORMAL;
diff --git a/sr_port/mur_block_count_correct.c b/sr_port/mur_block_count_correct.c
index 6792439..4d784fe 100755
--- a/sr_port/mur_block_count_correct.c
+++ b/sr_port/mur_block_count_correct.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -11,8 +12,9 @@
 #include "mdef.h"
 
 #include <errno.h>
+
 #include "gtm_unistd.h"
-#include <signal.h>
+#include "gtm_signal.h"
 #include "gtm_stat.h"
 #include "gtm_time.h"
 
@@ -66,13 +68,9 @@ uint4 mur_block_count_correct(reg_ctl_list *rctl)
 		default:
 			assertpro(FALSE && acc_meth);
 	}
-	mu_int_ovrhd += 1;
-	assert(mu_int_ovrhd == mu_data->start_vbn);
-	size = mu_int_ovrhd + (off_t)(mu_data->blk_size / DISK_BLOCK_SIZE) * mu_data->trans_hist.total_blks;
+	assert(mu_int_ovrhd == (mu_data->start_vbn - 1));
+	size = mu_int_ovrhd + (off_t)(mu_data->blk_size / DISK_BLOCK_SIZE) * (mu_data->trans_hist.total_blks + 1);
 	native_size = gds_file_size(gv_cur_region->dyn.addr->file_cntl);
-	/* In the following tests, the EOF block should always be 1 greater than the actual size of the file.
-	 * This is due to the GDS being allocated in even DISK_BLOCK_SIZE-byte blocks.
-	 */
 	if (native_size && (size < native_size))
 	{
 		total_blks = (dba_mm == acc_meth) ? cs_addrs->total_blks : cs_addrs->ti->total_blks;
@@ -105,7 +103,7 @@ uint4 mur_block_count_correct(reg_ctl_list *rctl)
 		jgbl.dont_reset_gbl_jrec_time = TRUE;
 #		ifdef DEBUG
 		/* Check that the filesize and blockcount in the fileheader match now after the extend */
-		size = mu_int_ovrhd + (off_t)(mu_data->blk_size / DISK_BLOCK_SIZE) * mu_data->trans_hist.total_blks;
+		size = mu_int_ovrhd + (off_t)(mu_data->blk_size / DISK_BLOCK_SIZE) * (mu_data->trans_hist.total_blks + 1);
 		native_size = gds_file_size(gv_cur_region->dyn.addr->file_cntl);
 		ALIGN_DBFILE_SIZE_IF_NEEDED(size, native_size);
 		assert(size == native_size);
diff --git a/sr_port/mur_blocks_free.c b/sr_port/mur_blocks_free.c
index 81cdac2..73225ee 100755
--- a/sr_port/mur_blocks_free.c
+++ b/sr_port/mur_blocks_free.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2011 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -47,10 +48,11 @@ int4 mur_blocks_free(reg_ctl_list *rctl)
 	int4		x;
 	block_id 	bnum;
 	int 		maps, mapsize, i, j, k, fcnt, status;
-	unsigned char 	*disk, *c, *m_ptr;
+	unsigned char 	*c, *disk, *m_ptr;
 	uint4 		*dskmap, map_blk_size;
 	file_control 	*db_ctl;
 	enum db_ver	dummy_ondskblkver;
+	unix_db_info	*udi;
 
 	db_ctl = rctl->db_ctl;
 	cs_data = rctl->csd;
@@ -58,8 +60,17 @@ int4 mur_blocks_free(reg_ctl_list *rctl)
 	fcnt = 0;
 	maps = (cs_data->trans_hist.total_blks + cs_data->bplmap - 1) / cs_data->bplmap;
 	map_blk_size = BM_SIZE(cs_data->bplmap);
-	m_ptr = (unsigned char*)malloc(cs_data->blk_size + 8);
-	disk = (unsigned char *)(((UINTPTR_T)m_ptr) + 7 & (UINTPTR_T)(-8L));
+	udi = FC2UDI(db_ctl);
+	if (udi->fd_opened_with_o_direct)
+	{	/* We need aligned buffers */
+		m_ptr = (unsigned char *)malloc(ROUND_UP2(cs_data->blk_size, DIO_ALIGNSIZE(udi)) + OS_PAGE_SIZE);
+		disk = (unsigned char *)ROUND_UP2((UINTPTR_T)m_ptr, OS_PAGE_SIZE);
+	} else
+	{
+		m_ptr = (unsigned char *)malloc(cs_data->blk_size);
+		assert(IS_PTR_8BYTE_ALIGNED(m_ptr));
+		disk = m_ptr;
+	}
 	db_ctl->op_buff = (uchar_ptr_t)disk;
 	db_ctl->op_len = cs_data->blk_size;
 	for (i = 0; i != maps; i++)
@@ -69,13 +80,13 @@ int4 mur_blocks_free(reg_ctl_list *rctl)
 		db_ctl->op_pos = cs_data->start_vbn + ((gtm_int64_t)cs_data->blk_size / DISK_BLOCK_SIZE * bnum);
 		status = dbfilop(db_ctl);
 		if (SYSCALL_ERROR(status))
-			rts_error(VARLSTCNT(5) ERR_DBRDERR, 2, DB_LEN_STR(gv_cur_region), status);
+			rts_error_csa(CSA_ARG(rctl->csa) VARLSTCNT(5) ERR_DBRDERR, 2, DB_LEN_STR(gv_cur_region), status);
 		GDS_BLK_UPGRADE_IF_NEEDED(bnum, disk, disk, cs_data, &dummy_ondskblkver, status, cs_data->fully_upgraded);
 		if (SS_NORMAL != status)
 			if (ERR_DYNUPGRDFAIL == status)
-				rts_error(VARLSTCNT(5) status, 3, bnum, DB_LEN_STR(gv_cur_region));
+				rts_error_csa(CSA_ARG(rctl->csa) VARLSTCNT(5) status, 3, bnum, DB_LEN_STR(gv_cur_region));
 			else
-				rts_error(VARLSTCNT(1) status);
+				rts_error_csa(CSA_ARG(rctl->csa) VARLSTCNT(1) status);
 		if (((blk_hdr *)disk)->bsiz != map_blk_size)
 		{
 			util_out_print("Wrong size map block", TRUE);
diff --git a/sr_port/mur_close_files.c b/sr_port/mur_close_files.c
old mode 100755
new mode 100644
index 1d19552..774eb20
--- a/sr_port/mur_close_files.c
+++ b/sr_port/mur_close_files.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2003-2016 Fidelity National Information	*
+ * Copyright (c) 2003-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -55,6 +55,7 @@
 #include "util.h"
 #include "wcs_flu.h"
 #include "gtm_sem.h"
+#include "gtm_file_stat.h"
 #ifdef DEBUG
 #include "wbox_test_init.h"
 #endif
@@ -117,16 +118,16 @@ error_def(ERR_RLBKSTRMSEQ);
 
 boolean_t mur_close_files(void)
 {
-	char 			*head_jnl_fn, *rename_fn, fn[MAX_FN_LEN + 1];
+	char 			*head_jnl_fn, *rename_fn, fn[MAX_FN_LEN + STR_LIT_LEN(PREFIX_ROLLED_BAK) + 1];
 	int			head_jnl_fn_len, wrn_count = 0, rename_fn_len;
 	reg_ctl_list		*rctl, *rctl_top;
 	jnl_ctl_list		jctl_temp, *jctl, *prev_jctl, *end_jctl;
 	gd_region		*reg;
 	sgmnt_addrs		*csa;
 	sgmnt_data		*csd, csd_temp;
-	uint4			ustatus;
+	uint4			ustatus, ustatus2;
 	int4			status;
-	int4			rundown_status = EXIT_NRM;		/* if gds_rundown went smoothly */
+	int4			rundown_status = EXIT_NRM;		/* if "gds_rundown" went smoothly */
 	int			idx, finish_err_code, save_errno;
 	const char		*fini_str = NULL;
 	const char		*termntd_str;
@@ -146,7 +147,9 @@ boolean_t mur_close_files(void)
 	jnl_private_control	*jpc;
 	jnl_buffer_ptr_t	jb;
 	uint4			jnl_status;
-	DEBUG_ONLY(int		semval;)
+#	ifdef DEBUG
+	int		semval;
+#	endif
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
@@ -157,11 +160,11 @@ boolean_t mur_close_files(void)
 	}
 	call_on_signal = NULL;	/* Do not recurs via call_on_signal if there is an error */
 	SET_PROCESS_EXITING_TRUE;	/* In case the database is encrypted, this value is used to avoid using
-					 * mur_ctl->csd in mur_fopen as it would be invalid due to the gds_rundown() done below.
+					 * mur_ctl->csd in mur_fopen as it would be invalid due to the "gds_rundown" done below.
 					 */
 	csd = &csd_temp;
 	assert(murgbl.losttn_seqno == murgbl.save_losttn_seqno);
-	/* If journaling, gds_rundown will need to write PINI/PFIN records. The timestamp of that journal record will
+	/* If journaling, "gds_rundown" will need to write PINI/PFIN records. The timestamp of that journal record will
 	 * need to be adjusted to the current system time to reflect that it is recovery itself writing that record
 	 * instead of simulating GT.M activity. Reset jgbl.dont_reset_gbl_jrec_time to allow for adjustments to gbl_jrec_time.
 	 */
@@ -212,7 +215,7 @@ boolean_t mur_close_files(void)
 		 * "mupfndfil" path (e.g. journal file names were explicitly specified for a journal extract command) so it
 		 * would not have done gvcst_init in that case. But we would have set rctl->csa to a non-NULL value in order
 		 * to be able to switch amongst regions in mur_forward. So we should check for gd->open below to know for
-		 * sure if a gvcst_init was done which in turn requires a gds_rundown to be done.
+		 * sure if a gvcst_init was done which in turn requires a "gds_rundown" to be done.
 		 */
 		if (reg->open)
 		{ 	/* gvcst_init was called */
@@ -223,7 +226,7 @@ boolean_t mur_close_files(void)
 			 * signal (say MUPIP STOP) that causes exit handling processing which invokes this function.
 			 * In this case, cs_addrs would still be set to a non-NULL value so use that instead of rctl->csa.
 			 */
-			assert((NULL != rctl->csa) && (rctl->csa == cs_addrs) || (NULL == rctl->csa) && !murgbl.clean_exit);
+			assert(((NULL != rctl->csa) && (rctl->csa == cs_addrs)) || ((NULL == rctl->csa) && !murgbl.clean_exit));
 			csa = cs_addrs;
 			csd = mur_options.forward ? &csd_temp : csa->hdr;
 			assert(NULL != csa);
@@ -239,8 +242,11 @@ boolean_t mur_close_files(void)
 			assert((!(mur_options.update ^ csa->nl->donotflush_dbjnl)) || !murgbl.clean_exit);
 			if (mur_options.update && (murgbl.clean_exit || !rctl->db_updated) && (NULL != csa->nl))
 				csa->nl->donotflush_dbjnl = FALSE;	/* shared memory is now clean for dbjnl flushing */
+			/* Note: udi/csa is used a little later after the "gds_rundown" call (e.g. by "jnl_set_cur_prior")
+			 * so pass CLEANUP_UDI_FALSE as the parameter.
+			 */
 			if (mur_options.forward)
-				rundown_status = gds_rundown();
+				rundown_status = gds_rundown(CLEANUP_UDI_FALSE);
 			if (EXIT_NRM != rundown_status)
 			{
 				wrn_count++;
@@ -248,8 +254,9 @@ boolean_t mur_close_files(void)
 			}
 			assert(!jgbl.onlnrlbk || (csa->now_crit && csa->hold_onto_crit)
 					|| (!murgbl.clean_exit && !rctl->db_updated));
-			if (jgbl.onlnrlbk)
+			if (jgbl.onlnrlbk && (repl_open == rctl->repl_state))
 			{
+				assert(!IS_STATSDB_CSA(csa));
 				if (murgbl.incr_onln_rlbk_cycle)
 				{
 					csa->nl->root_search_cycle++;
@@ -285,14 +292,14 @@ boolean_t mur_close_files(void)
 					assert(mur_options.update);
 					/* For MUPIP JOURNAL -RECOVER -FORWARD or MUPIP JOURNAL -ROLLBACK -FORWARD, we are
 					 * done "gds_rundown" at this point and so have a clean database state at this point.
-					 * For RECOVER/ROLLBACK -BACKWARD, even though we haven't done the gds_rundown yet,
+					 * For RECOVER/ROLLBACK -BACKWARD, even though we haven't done the "gds_rundown" yet,
 					 * we still hold the standalone access and so no new process can attach to the database.
 					 * For the -ONLINE version of RECOVER/ROLLBACK -BACKWARD, we haven't released the access
 					 * control lock as well as the critical section lock, so no new processes can attach to
 					 * the database and no existing process can continue from their hung state(waiting for
 					 * crit). So, in all cases, it should be okay to safely set csd->file_corrupt to FALSE.
 					 * The only issue is if we get crashed AFTER setting csd->file_corrupt to FALSE, but
-					 * before doing the gds_rundown in which case, all the processes starting up will see
+					 * before doing the "gds_rundown" in which case, all the processes starting up will see
 					 * it just like any other system crash warranting a ROLLBACK/RECOVER.
 					 */
 					csd->file_corrupt = FALSE;
@@ -346,6 +353,11 @@ boolean_t mur_close_files(void)
 								}
 							}
 						}
+						/* If we just did forward recovery, and the current journal is available,
+						 * then we are leaving journaling disabled, so mark the journal as switched.
+						 */
+						if (mur_options.forward && (jnl_open == csd->intrpt_recov_jnl_state))
+							jnl_set_cur_prior(reg, csa, csd);
 						/* Reset save_strm_reg_seqno[]. Do it even for -recover (not just for -rollback)
 						 * so a successful -recover after an interrupted -rollback clears these fields.
 						 * Take this opportunity to reset intrpt_recov_resync_strm_seqno[] as well.
@@ -411,7 +423,7 @@ boolean_t mur_close_files(void)
 				if (!was_crit)
 					grab_crit(reg);
 				assert(JNL_ENABLED(csd));
-				jnl_status = jnl_ensure_open();
+				jnl_status = jnl_ensure_open(reg, csa);
 				assert(0 == jnl_status);
 				if (0 == jnl_status)
 				{
@@ -479,6 +491,7 @@ boolean_t mur_close_files(void)
 				assert(jctl->turn_around_offset);
 				jctl->jfh->turn_around_offset = 0;
 				jctl->jfh->turn_around_time = 0;
+				jctl->jfh->is_not_latest_jnl = TRUE;
 				jctl->jfh->crash = FALSE;
 				jctl->jfh->end_of_data = jctl->turn_around_offset;
 				jctl->jfh->eov_timestamp = jctl->turn_around_time;
@@ -521,18 +534,25 @@ boolean_t mur_close_files(void)
 					JNL_DO_FILE_WRITE(NULL, NULL, end_jctl->channel, 0, end_jctl->jfh, REAL_JNL_HDR_LEN,
 						end_jctl->status, end_jctl->status2);
 					WARN_STATUS(end_jctl);
-					/* Rename journals whose entire contents have been undone with
-					 * the rolled_bak prefix. user can decide to delete these */
+					/* Rename journals whose entire contents have been undone with the rolled_bak prefix.
+					 * User can decide to delete these.
+					 */
 					rename_fn = fn;
-					prepare_unique_name((char *)end_jctl->jnl_fn, end_jctl->jnl_fn_len,
-						PREFIX_ROLLED_BAK, "", rename_fn, &rename_fn_len, 0, &ustatus);
-					WAIT_FOR_REPL_INST_UNFREEZE_SAFE(csa);
-						/* wait for instance freeze before journal file renames */
+					rename_fn_len = ARRAYSIZE(fn);
+					ustatus = prepare_unique_name((char *)end_jctl->jnl_fn, end_jctl->jnl_fn_len,
+								PREFIX_ROLLED_BAK, "", rename_fn, &rename_fn_len, 0, &ustatus2);
+					/* We have allocated enough space in rename_fn/fn array to store PREFIX_ROLLED_BAK
+					 * prefix. So no way the above "prepare_unique_name" call can fail. Hence the assert.
+					 */
+					assert(SS_NORMAL == ustatus);
+					WAIT_FOR_REPL_INST_UNFREEZE_SAFE(csa);	/* wait for instance freeze
+										 * before journal file renames.
+										 */
 					if (SS_NORMAL == gtm_rename((char *)end_jctl->jnl_fn, end_jctl->jnl_fn_len,
-									rename_fn, rename_fn_len, &ustatus))
+											rename_fn, rename_fn_len, &ustatus2))
 					{
-						gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT (6) ERR_FILERENAME, 4, end_jctl->jnl_fn_len,
-							end_jctl->jnl_fn, rename_fn_len, rename_fn);
+						gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT (6) ERR_FILERENAME, 4,
+							end_jctl->jnl_fn_len, end_jctl->jnl_fn, rename_fn_len, rename_fn);
 					} else
 					{
 						gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(6) ERR_RENAMEFAIL, 4,
@@ -734,7 +754,7 @@ boolean_t mur_close_files(void)
 		udi = (NULL != reg->dyn.addr->file_cntl) ? FILE_INFO(reg) : NULL;
 		if (reg->open)
 		{
-			assert(!mur_options.forward); /* for forward recovery, gds_rundown should have been done before */
+			assert(!mur_options.forward); /* for forward recovery, "gds_rundown" should have been done before */
 			gv_cur_region = reg;
 			TP_CHANGE_REG(reg);
 			assert(!jgbl.onlnrlbk || (cs_addrs->now_crit && cs_addrs->hold_onto_crit) || !murgbl.clean_exit);
@@ -742,18 +762,22 @@ boolean_t mur_close_files(void)
 			if (jgbl.onlnrlbk)
 			{	/* This is an online rollback. If "gtm_mupjnl_parallel" is not 1, multiple child processes were
 				 * started to operate on different regions in the forward phase. Any updates they made would not
-				 * have been flushed since the children did not go through gds_rundown. If multiple child processes
-				 * were not started, it is possible some GT.M processes (which were active before the online
-				 * rollback started) have taken over the flush timers so the rollback process could not get any
-				 * timer slots. In either case, it is better to flush the jnl records to disk right away as the
+				 * have been flushed since the children did not go through "gds_rundown". If multiple child
+				 * processes were not started, it is possible some GT.M processes (which were active before the
+				 * online rollback started) have taken over the flush timers so the rollback process could not get
+				 * any timer slots. In either case, it is better to flush the jnl records to disk right away as the
 				 * source server could be waiting for these and the sooner it gets them, the better. In the
 				 * multiple-child processes case, not doing the flush here can actually cause the source server to
 				 * timeout with a SEQNUMSEARCHTIMEOUT error (if no GT.M processes have any flush timers active and
 				 * if online rollback does not do the flush either) so it is actually necessary.
 				 */
+				assert(!FROZEN_CHILLED(cs_data));
 				wcs_flu(WCSFLU_FLUSH_HDR | WCSFLU_WRITE_EPOCH | WCSFLU_SYNC_EPOCH);
 			}
-			rundown_status = gds_rundown(); /* does the final rel_crit */
+			/* Note: udi/csa is used a little later after the "gds_rundown" call to determine if "db_ipcs_reset"
+			 * can be called so pass CLEANUP_UDI_FALSE as the parameter.
+			 */
+			rundown_status = gds_rundown(CLEANUP_UDI_FALSE); /* does the final rel_crit */
 			if (EXIT_NRM != rundown_status)
 				wrn_count++;
 			assert((EXIT_NRM != rundown_status) || !rctl->standalone
@@ -765,7 +789,7 @@ boolean_t mur_close_files(void)
 		 */
 		assert(!mur_options.update || rctl->standalone || !murgbl.clean_exit);
 		if (rctl->standalone && (EXIT_NRM == rundown_status))
-			/* Avoid db_ipcs_reset if gds_rundown did not remove shared memory */
+			/* Avoid db_ipcs_reset if "gds_rundown" did not remove shared memory */
 			if ((NULL != udi) && udi->shm_deleted && !db_ipcs_reset(reg))
 				wrn_count++;
 		rctl->standalone = FALSE;
diff --git a/sr_port/mur_db_files_from_jnllist.c b/sr_port/mur_db_files_from_jnllist.c
index c5f227a..e49dcc6 100755
--- a/sr_port/mur_db_files_from_jnllist.c
+++ b/sr_port/mur_db_files_from_jnllist.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2003-2015 Fidelity National Information	*
+ * Copyright (c) 2003-2016 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -97,7 +97,6 @@ gld_dbname_list *mur_db_files_from_jnllist(char *jnl_file_list, unsigned short j
 		memcpy(seg->fname, &db_fname[0], db_fname_len);
 		/* This code is lifted from the tail of "mu_gv_cur_reg_init". Any changes here need to be reflected there */
 		FILE_CNTL_INIT(seg);
-		seg->file_cntl->file_type = dba_bg;
 	}
 	while (cptr < ctop)
 	{
diff --git a/sr_port/mur_forward.c b/sr_port/mur_forward.c
old mode 100755
new mode 100644
index 642ce08..ebba4ed
--- a/sr_port/mur_forward.c
+++ b/sr_port/mur_forward.c
@@ -57,7 +57,6 @@
 #include "wcs_timer_start.h"
 #include "gds_rundown.h"
 #include "wcs_clean_dbsync.h"
-#include "heartbeat_timer.h"
 #include "gtmcrypt.h"
 #ifdef DEBUG
 #include "is_proc_alive.h"
@@ -80,8 +79,6 @@ GBLREF	int			mur_forw_mp_hash_buckets;	/* # of buckets in "mur_shm_hdr->hash_buc
 GBLREF	mur_shm_hdr_t		*mur_shm_hdr;	/* Pointer to mur_forward-specific header in shared memory */
 GBLREF	boolean_t		mur_forward_multi_proc_done;
 GBLREF	uint4			process_id;
-GBLREF	boolean_t		heartbeat_started;
-GBLREF	uint4			heartbeat_counter;
 
 error_def(ERR_BLKCNTEDITFAIL);
 error_def(ERR_FILENOTCREATE);
@@ -89,6 +86,8 @@ error_def(ERR_FORCEDHALT);
 error_def(ERR_JNLREADEOF);
 error_def(ERR_SYSCALL);
 
+#define STUCK_TIME	(16 * MILLISECS_IN_SEC)
+
 static	void	(* const extraction_routine[])() =
 {
 #define JNL_TABLE_ENTRY(rectype, extract_rtn, label, update, fixed_size, is_replicated)	extract_rtn,
@@ -186,7 +185,7 @@ int	mur_forward_multi_proc_init(reg_ctl_list *rctl)
 int	mur_forward_multi_proc(reg_ctl_list *rctl)
 {
 	boolean_t		multi_proc, this_reg_stuck, release_latch, ok_to_play;
-	boolean_t		cancelled_dbsync_timer, cancelled_timer;
+	boolean_t		cancelled_dbsync_timer;
 	reg_ctl_list		*rctl_top, *prev_rctl;
 	jnl_ctl_list		*jctl;
 	gd_region		*reg;
@@ -199,6 +198,7 @@ int	mur_forward_multi_proc(reg_ctl_list *rctl)
 	char			errstr[256];
 	int			i, rctl_index, save_errno, num_procs_stuck, num_reg_stuck;
 	uint4			status, regcnt_stuck, num_partners, start_hrtbt_cntr;
+	boolean_t		stuck;
 	forw_multi_struct	*forw_multi;
 	shm_forw_multi_t	*sfm;
 	multi_struct 		*multi;
@@ -235,12 +235,11 @@ int	mur_forward_multi_proc(reg_ctl_list *rctl)
 			for (rctl = mur_ctl, rctl_top = mur_ctl + murgbl.reg_total; rctl < rctl_top; rctl++)
 			{
 				assert(rctl->csa->hold_onto_crit);	/* would have been set in parent process */
-				rctl->csa->hold_onto_crit = FALSE;	/* reset since we dont own this region */
+				rctl->csa->hold_onto_crit = FALSE;	/* reset since we don't own this region */
 				assert(rctl->csa->now_crit);		/* would have been set in parent process */
-				rctl->csa->now_crit = FALSE;		/* reset since we dont own this region */
+				rctl->csa->now_crit = FALSE;		/* reset since we don't own this region */
 			}
 		}
-		START_HEARTBEAT_IF_NEEDED; /* heartbeat timer needed later (in case not already started by "gtm_multi_proc") */
 	}
 	first_shm_rctl = NULL;
 	/* Phase1 of forward recovery starts */
@@ -334,11 +333,23 @@ int	mur_forward_multi_proc(reg_ctl_list *rctl)
 		{
 			reg = rctl->gd;
 			gv_cur_region = reg;
-			tp_change_reg();	/* note : sets cs_addrs to non-NULL value even if gv_cur_region->open is FALSE
-						 * (cs_data could still be NULL). */
-			rctl->csa = cs_addrs;
-			cs_addrs->miscptr = (void *)rctl;
-			rctl->csd = cs_data;
+			tp_change_reg();	/* Note : sets cs_addrs to non-NULL value even if gv_cur_region->open is FALSE
+						 * (cs_data could still be NULL).
+						 */
+			if (NULL == rctl->csa)
+			{
+				assert(!rctl->db_present);
+				assert(!rctl->gd->open);
+				rctl->csa = cs_addrs;
+				rctl->csa->miscptr = rctl;
+			} else
+			{
+				assert(rctl->csa == cs_addrs);
+				assert((reg_ctl_list *)rctl->csa->miscptr == rctl);	/* set in "mur_open_files" and maybe
+											 * updated in "mur_sort_files".
+											 */
+			}
+			assert(rctl->csd == cs_data);
 			rctl->sgm_info_ptr = cs_addrs->sgm_info_ptr;
 			assert(!reg->open || (NULL != cs_addrs->dir_tree));
 			gv_target = cs_addrs->dir_tree;
@@ -446,12 +457,13 @@ int	mur_forward_multi_proc(reg_ctl_list *rctl)
 				 * multi-region TP transaction. If so, wait in a sleep loop. If not, we can proceed.
 				 */
 				rctl = rctl_start;
-				start_hrtbt_cntr = heartbeat_counter;
+				TIMEOUT_INIT(stuck, STUCK_TIME);
 				do
 				{
 					if (IS_FORCED_MULTI_PROC_EXIT(mp_hdr))
 					{	/* We are at a logical point. So exit if signaled by parent */
 						status = ERR_FORCEDHALT;
+						TIMEOUT_DONE(stuck);
 						goto finish;
 					}
 					forw_multi = rctl->forw_multi;
@@ -468,6 +480,7 @@ int	mur_forward_multi_proc(reg_ctl_list *rctl)
 					{	/* We are no longer stuck in this region */
 						assert(!forw_multi->no_longer_stuck);
 						forw_multi->no_longer_stuck = TRUE;
+						TIMEOUT_DONE(stuck);
 						break;
 					}
 					rctl = rctl->next_rctl;	/* Move on to the next available region */
@@ -476,10 +489,10 @@ int	mur_forward_multi_proc(reg_ctl_list *rctl)
 					{	/* We went through all regions once and are still stuck.
 						 * Sleep until at leat TWO heartbeats have elapsed after which check for deadlock.
 						 * Do this only in the child process that owns the FIRST region in the region list.
-						 * This way we dont have contention for the GRAB_MULTI_PROC_LATCH from
+						 * This way we don't have contention for the GRAB_MULTI_PROC_LATCH from
 						 * all children at more or less the same time.
 						 */
-						if ((rctl == mur_ctl) && (heartbeat_counter > (start_hrtbt_cntr + 2)))
+						if ((rctl == mur_ctl) && stuck)
 						{	/* Check if all processes are stuck for a while. If so assertpro */
 							GRAB_MULTI_PROC_LATCH_IF_NEEDED(release_latch);
 							assert(release_latch);
@@ -498,7 +511,8 @@ int	mur_forward_multi_proc(reg_ctl_list *rctl)
 							REL_MULTI_PROC_LATCH_IF_NEEDED(release_latch);
 							/* If everyone is stuck at this point, it is an out-of-design situation */
 							assertpro(num_reg_stuck < murgbl.reg_total);
-							start_hrtbt_cntr = heartbeat_counter;
+							TIMEOUT_DONE(stuck);
+							TIMEOUT_INIT(stuck, STUCK_TIME);
 						} else
 						{	/* Sleep and recheck if any region we are stuck in got resolved.
 							 * To minimize time spent sleeping, we just yield our timeslice.
@@ -725,7 +739,7 @@ finish:
 			 * clear up csa->nl->wcs_timers. (normally done by gds_rundown).
 			 */
 			if (NULL != rctl->csa)	/* rctl->csa can be NULL in case of "mupip journal -extract" etc. */
-				CANCEL_DB_TIMERS(rctl->gd, rctl->csa, cancelled_timer, cancelled_dbsync_timer);
+				CANCEL_DB_TIMERS(rctl->gd, rctl->csa, cancelled_dbsync_timer);
 			reccnt = 0;
 			for (size_ptr = &rctl->jnlext_multi_list_size[0], recstat = 0;
 								recstat < TOT_EXTR_TYPES;
@@ -746,7 +760,7 @@ finish:
 			assert(INVALID_SHMID == shm_rctl->jnlext_shmid);
 			shm_size = reccnt * SIZEOF(jnlext_multi_t);
 			/* If we are quitting because of an abnormal status OR a forced signal to terminate
-			 * OR if the parent is dead (kill -9) dont bother creating shmid to communicate back with parent.
+			 * OR if the parent is dead (kill -9) don't bother creating shmid to communicate back with parent.
 			 */
 			if (mp_hdr->parent_pid != getppid())
 			{
@@ -875,7 +889,7 @@ void mur_shm_forw_token_add(forw_multi_struct *forw_multi, reg_ctl_list *rctl, b
 		 * This is because murgbl.losttn_seqno marks the boundary between GOOD_TN and LOST_TN. And BROKEN_TN is known
 		 * in backward processing phase itself.
 		 * In case of SHOW or VERIFY (except EXTRACT), there is no need to do this processing since we are
-		 * interested only in GOOD_TN or BROKEN_TN, not LOST_TN. So dont maintain shm_forw_multi in that case too.
+		 * interested only in GOOD_TN or BROKEN_TN, not LOST_TN. So don't maintain shm_forw_multi in that case too.
 		 */
 		return;
 	}
@@ -951,7 +965,7 @@ void mur_shm_forw_token_add(forw_multi_struct *forw_multi, reg_ctl_list *rctl, b
 	assert(NULL == shm_rctl->shm_forw_multi);
 	shm_rctl->shm_forw_multi = sfm;
 	/* Adjust shm value of "recstat" based on individual region's perspective. Note that if shm value is LOST_TN
-	 * and individual region's value is GOOD_TN, then LOST_TN should prevail. Note that we dont hold a lock when doing
+	 * and individual region's value is GOOD_TN, then LOST_TN should prevail. Note that we don't hold a lock when doing
 	 * this update to sfm->recstat (a shared memory location). This is because if any update happens to sfm->recstat,
 	 * it will be for a GOOD_TN -> LOST_TN transition and it is okay if multiple processes do this overwrite at the same time.
 	 */
diff --git a/sr_port/mur_forward_play_cur_jrec.c b/sr_port/mur_forward_play_cur_jrec.c
index 97e1e5c..bd2c937 100644
--- a/sr_port/mur_forward_play_cur_jrec.c
+++ b/sr_port/mur_forward_play_cur_jrec.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2010-2016 Fidelity National Information	*
+ * Copyright (c) 2010-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -50,12 +50,15 @@
 GBLREF	gd_addr			*gd_header;
 GBLREF	gv_key			*gv_currkey;
 GBLREF	gv_namehead		*gv_target;
-GBLREF  gd_region		*gv_cur_region;
+GBLREF	gd_region		*gv_cur_region;
 GBLREF	sgmnt_addrs		*cs_addrs;
-GBLREF 	mur_gbls_t		murgbl;
+GBLREF	mur_gbls_t		murgbl;
 GBLREF	mur_opt_struct		mur_options;
 GBLREF	uint4			dollar_tlevel;
-GBLREF 	jnl_gbls_t		jgbl;
+GBLREF	jnl_gbls_t		jgbl;
+#ifdef DEBUG
+GBLREF	boolean_t		forw_recov_lgtrig_only;
+#endif
 
 error_def(ERR_DUPTN);
 error_def(ERR_FORCEDHALT);
@@ -273,6 +276,7 @@ uint4	mur_forward_play_cur_jrec(reg_ctl_list *rctl)
 			mv.str.addr = NULL;
 			op_tstart(IMPLICIT_TSTART, TRUE, &mv, -1);
 			DEBUG_ONLY(jgbl.max_tp_ztp_jnl_upd_num = 0;)
+			DEBUG_ONLY(forw_recov_lgtrig_only = TRUE;)	/* gets reset later if a non-LGTRIG record is seen */
 		}
 		tp_set_sgm();	/* needed to set "sgm_info_ptr" to correspond to "rctl" */
 	}
@@ -305,7 +309,7 @@ uint4	mur_forward_play_cur_jrec(reg_ctl_list *rctl)
 				assert(gv_cur_region->open);
 			} else
 			{
-				assert((dba_bg == REG_ACC_METH(gv_cur_region)) || (dba_mm == REG_ACC_METH(gv_cur_region)));
+				assert(IS_REG_BG_OR_MM(gv_cur_region));
 				gv_target = (gv_namehead *)targ_alloc(gv_cur_region->max_key_size, &gvent, gv_cur_region);
 				GVNH_REG_INIT(gd_header, &rctl->gvntab, NULL, gv_target, gv_cur_region, gvnh_reg, tabent);
 			}
diff --git a/sr_port/mur_merge_sort_extfmt.c b/sr_port/mur_merge_sort_extfmt.c
index 3d35097..a4478d9 100755
--- a/sr_port/mur_merge_sort_extfmt.c
+++ b/sr_port/mur_merge_sort_extfmt.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2015 Fidelity National Information 		*
+ * Copyright (c) 2015-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -264,6 +264,7 @@ int mur_merge_sort_extfmt(void)
 {
 	FILE			*fp, *fp_out, **fp_array;
 	boolean_t		extr_file_created, single_reg, skip_sort;
+	boolean_t		is_dummy_gbldir;
 	char			*buff, extr_fn[MAX_FN_LEN + 1], *fn, *fn_out;
 	char			rename_fn[MAX_FN_LEN + 1];
 	int			rename_fn_len, fn_len;
@@ -319,12 +320,16 @@ int mur_merge_sort_extfmt(void)
 				fn_len = mur_shm_hdr->extr_fn_len[recstat];
 				fn_len++;	/* for the '_' */
 				reg = rctl->gd;
-				if (reg->rname_len)
+				is_dummy_gbldir = reg->owning_gd->is_dummy_gbldir;
+				if (!is_dummy_gbldir)
+				{
+					assert(reg->rname_len);
 					fn_len += reg->rname_len;
-				else
+				} else
 				{	/* maximum # of regions is limited by MULTI_PROC_MAX_PROCS (since that is the limit
 					 * that "gtm_multi_proc" can handle. Use the byte-length of MULTI_PROC_MAX_PROCS-1.
 					 */
+					assert(!memcmp(reg->rname, "DEFAULT", reg->rname_len));
 					assert(1000 == MULTI_PROC_MAX_PROCS);
 					fn_len += 3;	/* 999 is maximum valid value and has 3 decimal digits */
 				}
@@ -339,7 +344,7 @@ int mur_merge_sort_extfmt(void)
 				tmplen = file_info->fn_len;
 				ptr = &file_info->fn[tmplen];
 				*ptr++ = '_'; tmplen++;
-				if (reg->rname_len)
+				if (!is_dummy_gbldir)
 				{
 					memcpy(ptr, reg->rname, reg->rname_len);
 					tmplen += reg->rname_len;
@@ -470,6 +475,7 @@ int mur_merge_sort_extfmt(void)
 						/* Argument journal -extract=-stdout ? */
 						if (!mur_options.extr_fn_is_stdout[recstat])
 						{
+							rename_fn_len = ARRAYSIZE(rename_fn);
 							if (RENAME_FAILED == rename_file_if_exists(fn_out, extr_fn_len,
 											rename_fn, &rename_fn_len, &status))
 							{
diff --git a/sr_port/mur_open_files.c b/sr_port/mur_open_files.c
index dd6590e..43a26a8 100755
--- a/sr_port/mur_open_files.c
+++ b/sr_port/mur_open_files.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2003-2016 Fidelity National Information	*
+ * Copyright (c) 2003-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -65,7 +65,6 @@
 #include "gtm_semutils.h"
 #include "sleep_cnt.h"
 #include "gdsbgtr.h"
-#include "heartbeat_timer.h"
 #include "gtmsource_srv_latch.h"
 #include "do_semop.h"
 #include "wcs_sleep.h"
@@ -327,7 +326,7 @@ boolean_t mur_open_files()
 				}
 			}
 		}
-		if (!mupfndfil(rctl->gd, NULL))
+		if (!mupfndfil(rctl->gd, NULL, LOG_ERROR_FALSE))
 		{
 			rctl->db_present = FALSE;
 			if (mur_options.update || star_specified)
@@ -442,7 +441,8 @@ boolean_t mur_open_files()
 				tmpcsd = tmpcsa->hdr;
 				GRAB_ACCESS_CONTROL(rl);
 				grab_crit(reg);
-				if (tmpcsd->freeze)
+				DO_CHILLED_AUTORELEASE(tmpcsa, tmpcsd);
+				if (FROZEN(tmpcsd))
 				{
 					save_rl = rl;
 					rl = rl->fPtr;	/* Increment so we release the lock we actually got */
@@ -464,7 +464,7 @@ boolean_t mur_open_files()
 				     REG_LEN_STR(save_rl->reg), DB_LEN_STR(save_rl->reg));
 			gtm_putmsg_csa(CSA_ARG(REG2CSA(save_rl->reg)) VARLSTCNT(8) ERR_ORLBKFRZPROG, 6, CTIME_BEFORE_NL, time_str,
 				       REG_LEN_STR(save_rl->reg), DB_LEN_STR(save_rl->reg));
-			while (tmpcsd->freeze)
+			while (FROZEN(tmpcsd))
 			{
 				if (MAXHARDCRITS < llcnt)
 					wcs_sleep(llcnt); /* Don't waste CPU cycles anymore */
@@ -578,7 +578,6 @@ boolean_t mur_open_files()
 									   * this shared memory until recover/rlbk cleanly exits */
 				}
 				assert(!JNL_ENABLED(csd) || 0 == csd->jnl_file_name[csd->jnl_file_len]);
-				rctl->db_ctl->file_type = rctl->gd->dyn.addr->file_cntl->file_type;
 				rctl->db_ctl->file_info = rctl->gd->dyn.addr->file_cntl->file_info;
 				rctl->recov_interrupted = csd->recov_interrupted;
 				if (mur_options.update && rctl->recov_interrupted)
@@ -649,7 +648,7 @@ boolean_t mur_open_files()
 						{	/* Replication is either OFF or WAS_ON. Journaling could be ENABLED or not.
 							 * If replication is OFF and journaling is DISABLED, there is no issue.
 							 * Any other combination (including replication being WAS_ON) is an error
-							 * as we dont have the complete set of journal records to do the rollback.
+							 * as we don't have the complete set of journal records to do the rollback.
 							 */
 							if (REPL_ALLOWED(csd) || JNL_ENABLED(csd))
 							{
@@ -683,12 +682,12 @@ boolean_t mur_open_files()
 						 * 	 below.
 						 */
 					}
-					if (csd->freeze && !jgbl.onlnrlbk)
+					if (FROZEN(csd) && !jgbl.onlnrlbk)
 					{	/* region_freeze should release freeze here. For ONLINE ROLLBACK we would have
 						 * waited for the freeze to be lifted off before
 						 */
-						reg_frz_status = region_freeze(rctl->gd, FALSE, TRUE, FALSE);
-						assert (0 == rctl->csa->hdr->freeze);
+						reg_frz_status = region_freeze(rctl->gd, FALSE, TRUE, FALSE, FALSE, FALSE);
+						assert (!FROZEN(rctl->csa->hdr));
 						assert(REG_FREEZE_SUCCESS == reg_frz_status);
 						if (REG_ALREADY_FROZEN == reg_frz_status)
 						{
@@ -713,8 +712,11 @@ boolean_t mur_open_files()
 					/* flush the changed csd to disk */
 					fc = rctl->gd->dyn.addr->file_cntl;
 					fc->op = FC_WRITE;
+					/* Note: csd points to shared memory and is already aligned
+					 * appropriately even if db was opened using O_DIRECT.
+					 */
 					fc->op_buff = (sm_uc_ptr_t)csd;
-					fc->op_len = (int)ROUND_UP(SIZEOF_FILE_HDR(csd), DISK_BLOCK_SIZE);
+					fc->op_len = SGMNT_HDR_LEN;
 					fc->op_pos = 1;
 					dbfilop(fc);
 				}
@@ -839,7 +841,7 @@ boolean_t mur_open_files()
 				return FALSE;
 			}
 			cptr++;	/* skip separator */
-			if (SS_NORMAL != mur_fopen(jctl, NULL))	/* dont know rctl yet */
+			if (SS_NORMAL != mur_fopen(jctl, NULL))	/* don't know rctl yet */
 				return FALSE;	/* mur_fopen() would have done the appropriate gtm_putmsg() */
 			for (rctl = mur_ctl, rctl_top = mur_ctl + murgbl.reg_full_total; rctl < rctl_top; rctl++)
 			{
@@ -987,6 +989,8 @@ boolean_t mur_open_files()
 	for (rctl = mur_ctl, rctl_top = mur_ctl + murgbl.reg_total; rctl < rctl_top; rctl++)
 	{
 		jctl = rctl->jctl_head;
+		if (rctl->db_present && (mur_options.update || mur_options.extr[GOOD_TN]))
+			rctl->csa->miscptr = (void *)rctl; /* needed by gdsfilext_nojnl/jnl_put_jrt_pini/mur_pini_addr_reset */
 		if (mur_options.update)
 		{
 			csd = rctl->csd;
diff --git a/sr_port/mur_output_record.c b/sr_port/mur_output_record.c
index 4f6d07f..9d0e5f7 100644
--- a/sr_port/mur_output_record.c
+++ b/sr_port/mur_output_record.c
@@ -62,14 +62,17 @@ GBLREF	boolean_t		write_after_image;
 GBLREF	gd_region		*gv_cur_region;
 GBLREF	gv_namehead		*gv_target;
 GBLREF	jnl_fence_control	jnl_fence_ctl; /* Needed to set the token, optimize jnl_write_logical for recover */
-GBLREF 	jnl_gbls_t		jgbl;
-GBLREF  jnl_process_vector	*prc_vec;
-GBLREF 	mur_gbls_t		murgbl;
-GBLREF  mur_opt_struct  	mur_options;
+GBLREF	jnl_gbls_t		jgbl;
+GBLREF	jnl_process_vector	*prc_vec;
+GBLREF	mur_gbls_t		murgbl;
+GBLREF	mur_opt_struct  	mur_options;
 GBLREF	sgmnt_addrs		*cs_addrs;
-GBLREF  sgmnt_data_ptr_t 	cs_data;
+GBLREF	sgmnt_data_ptr_t 	cs_data;
 GBLREF	struct_jrec_tcom	tcom_record;
 GBLREF	uint4			dollar_tlevel;
+#ifdef DEBUG
+GBLREF	boolean_t		forw_recov_lgtrig_only;
+#endif
 
 error_def(ERR_JNLBADRECFMT);
 error_def(ERR_TRIGLOADFAIL);
@@ -170,6 +173,10 @@ uint4	mur_output_record(reg_ctl_list *rctl)
 	assert(NULL == TREF(gd_targ_gvnh_reg));
 	if (IS_SET_KILL_ZKILL_ZTRIG(rectype))
 	{	/* TP and non-TP has same format */
+		DEBUG_ONLY(forw_recov_lgtrig_only = FALSE;)	/* now that we have seen a non-LGTRIG record, reset this global
+								 * variable which would have been set to TRUE after op_tstart
+								 * done in mur_forward_play_cur_jrec.
+								 */
 		keystr = (jnl_string *)&rec->jrec_set_kill.mumps_node;
 		if (jnl_enabled)
 		{
@@ -392,16 +399,16 @@ uint4	mur_output_record(reg_ctl_list *rctl)
 	case JRT_PFIN:
 		if (jnl_enabled)
 		{
-			if (FALSE == ((was_crit = rctl->csa->now_crit)))
+			if (FALSE == ((was_crit = csa->now_crit)))
 				grab_crit(reg);
 			/* MUPIP RECOVER should be the only one updating the database so journal state not expected to changes */
 			assert(JNL_ENABLED(csd));
-			jnl_status = jnl_ensure_open();
+			jnl_status = jnl_ensure_open(reg, csa);
 			if (0 == jnl_status)
 			{
 				assert(plst->new_pini_addr == csa->jnl->pini_addr);
 				if (0 != csa->jnl->pini_addr)
-					jnl_put_jrt_pfin(rctl->csa);
+					jnl_put_jrt_pfin(csa);
 			} else
 			{
 				if (SS_NORMAL != csa->jnl->status)
diff --git a/sr_port/mur_output_show.c b/sr_port/mur_output_show.c
index 20ba633..71aad6d 100755
--- a/sr_port/mur_output_show.c
+++ b/sr_port/mur_output_show.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2003-2016 Fidelity National Information	*
+ * Copyright (c) 2003-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -163,6 +163,8 @@ void	mur_show_header(jnl_ctl_list * jctl)
 	util_out_print(" Jnlfile Extension                !16UL [0x!XL] blocks", TRUE, DOUBLE_ARG(hdr->jnl_deq));
 	util_out_print(" Maximum Journal Record Length    !16UL [0x!XL]", TRUE, DOUBLE_ARG(hdr->max_jrec_len));
 	util_out_print(" Turn Around Point Offset               !10UL [0x!XL]", TRUE, DOUBLE_ARG(hdr->turn_around_offset));
+	util_out_print(" Last EOF Written                            !AD", TRUE, 5, (hdr->last_eof_written ? " TRUE" : "FALSE"));
+	util_out_print(" Was a Previous Generation Journal File      !AD", TRUE, 5, (hdr->is_not_latest_jnl ? " TRUE" : "FALSE"));
 	if (hdr->turn_around_time)
 		time_len = format_time(hdr->turn_around_time, time_str, SIZEOF(time_str), SHORT_TIME_FORMAT);
 	else
@@ -173,8 +175,7 @@ void	mur_show_header(jnl_ctl_list * jctl)
 	util_out_print(" Turn Around Point Time       !20AD", TRUE, time_len, time_str);
 	util_out_print(" Start Region Sequence Number !20 at UQ [0x!16 at XQ]", TRUE, &hdr->start_seqno, &hdr->start_seqno);
 	util_out_print(" End Region Sequence Number   !20 at UQ [0x!16 at XQ]", TRUE, &hdr->end_seqno, &hdr->end_seqno);
-	/* Dump stream seqnos for upto 16 streams if any are non-zero.
-	 */
+	/* Dump stream seqnos for upto 16 streams if any are non-zero */
 	for (idx = 0; idx < MAX_SUPPL_STRMS; idx++)
 	{	/* Dump stream seqnos. Dont dump them unconditionally as they will swamp the output.
 		 * We usually expect 1 or 2 streams to have non-zero values so dump it only if non-zero.
diff --git a/sr_port/mur_process_intrpt_recov.c b/sr_port/mur_process_intrpt_recov.c
old mode 100755
new mode 100644
index 2f9fb65..1764a4e
--- a/sr_port/mur_process_intrpt_recov.c
+++ b/sr_port/mur_process_intrpt_recov.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2003-2016 Fidelity National Information	*
+ * Copyright (c) 2003-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -13,17 +13,8 @@
 #include "mdef.h"
 
 #include "gtm_string.h"
-#if defined(UNIX)
 #include "gtm_unistd.h"
 #include "eintr_wrappers.h"
-#elif defined(VMS)
-#include <rms.h>
-#include <iodef.h>
-#include <psldef.h>
-#include <ssdef.h>
-#include <efndef.h>
-#include "iosb_disk.h"
-#endif
 
 #include "gdsroot.h"
 #include "gtm_rename.h"
@@ -66,7 +57,7 @@ uint4 mur_process_intrpt_recov()
 	jnl_ctl_list			*jctl, *last_jctl;
 	reg_ctl_list			*rctl, *rctl_top;
 	int				rename_fn_len, save_name_len, idx;
-	char				prev_jnl_fn[MAX_FN_LEN + 1], rename_fn[MAX_FN_LEN + 1], save_name[MAX_FN_LEN + 1];
+	char				prev_jnl_fn[MAX_FN_LEN + 1], rename_fn[MAX_FN_LEN + 1];
 	jnl_create_info			jnl_info;
 	uint4				status, status2;
 	uint4				max_autoswitchlimit, max_jnl_alq, max_jnl_deq, freeblks;
@@ -204,9 +195,9 @@ uint4 mur_process_intrpt_recov()
 				csd->save_strm_reg_seqno[idx] = csd->strm_reg_seqno[idx];
 			csd->strm_reg_seqno[idx] = jnlrec->jrec_epoch.strm_seqno[idx];
 		}
+		assert(!FROZEN_CHILLED(csd));
 		wcs_flu(WCSFLU_FLUSH_HDR | WCSFLU_FSYNC_DB);
 		assert(cs_addrs->ti->curr_tn == jctl->turn_around_tn);
-#		ifdef UNIX
 		if (jgbl.onlnrlbk)
 		{
 			if (dba_bg == cs_addrs->hdr->acc_meth)
@@ -237,12 +228,6 @@ uint4 mur_process_intrpt_recov()
 		{	/* set earliest bt TN to be the turn-around TN (taken from bt_refresh()) */
 			SET_OLDEST_HIST_TN(cs_addrs, cs_addrs->ti->curr_tn - 1);
 		}
-#		else
-		if (dba_bg == csd->acc_meth)
-		{	/* set earliest bt TN to be the turn-around TN (taken from bt_refresh()) */
-			SET_OLDEST_HIST_TN(cs_addrs, cs_addrs->ti->curr_tn - 1);
-		}
-#		endif
 		csd->turn_around_point = FALSE;
 		assert(OLDEST_HIST_TN(cs_addrs) == (cs_addrs->ti->curr_tn - 1));
 		/* In case this is MM and wcs_flu() remapped an extended database, reset rctl->csd */
@@ -271,6 +256,7 @@ uint4 mur_process_intrpt_recov()
 			;
 		assert(rctl->csd->jnl_file_len == jctl->jnl_fn_len); 			       /* latest gener file name */
 		assert(0 == memcmp(rctl->csd->jnl_file_name, jctl->jnl_fn, jctl->jnl_fn_len)); /* should match db header */
+		rename_fn_len = ARRAYSIZE(rename_fn);
 		if (SS_NORMAL != (status = prepare_unique_name((char *)jctl->jnl_fn, jctl->jnl_fn_len, "", "",
 								rename_fn, &rename_fn_len, now, &status2)))
 			return status;
@@ -377,7 +363,6 @@ uint4 mur_process_intrpt_recov()
 			gtm_putmsg_csa(CSA_ARG(rctl->csa) VARLSTCNT(4) ERR_JNLNOCREATE, 2, jnl_info.jnl_len, jnl_info.jnl);
 			return jnl_info.status;
 		}
-#		ifdef UNIX
 		if (jgbl.onlnrlbk)
 		{
 			cs_addrs = rctl->csa;
@@ -385,9 +370,8 @@ uint4 mur_process_intrpt_recov()
 			jpc = cs_addrs->jnl; /* the previous loop makes sure cs_addrs->jnl->jnl_buff is valid*/
 			NULLIFY_JNL_FILE_ID(cs_addrs);
 			jpc->jnl_buff->cycle++; /* so that, all other processes knows to switch to newer journal file */
-			jpc->cycle--; /* decrement cycle so jnl_ensure_open() knows to reopen the journal */
+			jpc->cycle--; /* decrement cycle so "jnl_ensure_open" knows to reopen the journal */
 		}
-#		endif
 		if (NULL != rctl->jctl_alt_head) /* remove the journal files created by last interrupted recover process */
 		{
 			mur_rem_jctls(rctl);
diff --git a/sr_port/mur_process_seqno_table.c b/sr_port/mur_process_seqno_table.c
index 7d76d59..bdf90ce 100755
--- a/sr_port/mur_process_seqno_table.c
+++ b/sr_port/mur_process_seqno_table.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2003-2015 Fidelity National Information	*
+ * Copyright (c) 2003-2016 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -78,14 +78,7 @@ void mur_process_seqno_table(seq_num *min_broken_seqno, seq_num *losttn_seqno)
 	}
 	assert(min_resolve_seqno <= min_brkn_seqno);
 	lcl_losttn_seqno = *losttn_seqno;	/* Note down "pre_resolve_seqno" passed in through "losttn_seqno" variable */
-	if (0 == lcl_losttn_seqno)
-	{	/* Possible only in case of MUPIP JOURNAL -ROLLBACK -FORWARD. In this case, set losttn_seqno to
-		 * earliest seqno added in the hash table (note: hash table additions happen only till the tp_resolve_time).
-		 * So the lowest hash table seqno actually gives us the losttn_seqno that "mur_back_process" would have computed.
-		 */
-		assert(mur_options.forward);
-		lcl_losttn_seqno = min_resolve_seqno;
-	}
+	assert(0 < lcl_losttn_seqno);
 	/* "lcl_losttn_seqno" is the first possible seqno at the tp-resolve-time determined in mur_back_process based on
 	 * the seqno of journal records seen BEFORE the tp-resolve-time. "min_resolve_seqno" is the earliest seqno found at
 	 * or after tp-resolve-time. It is not possible for "min_resolve_seqno" to be LESSER than "lcl_losttn_seqno" since
diff --git a/sr_port/mur_read_file.c b/sr_port/mur_read_file.c
index 578dfca..6349049 100644
--- a/sr_port/mur_read_file.c
+++ b/sr_port/mur_read_file.c
@@ -96,12 +96,7 @@ uint4 mur_prev_rec(jnl_ctl_list **jjctl)
 			jctl->rec_offset -= mur_desc->jreclen;
 			assert(jctl->rec_offset >= mur_desc->cur_buff->dskaddr);
 			assert(JNL_HDR_LEN <= jctl->rec_offset);
-			if (JRT_EOF != mur_desc->jnlrec->prefix.jrec_type)
-				return SS_NORMAL;
-			/* unexpected EOF record in the middle of the file */
-			gtm_putmsg_csa(CSA_ARG(JCTL2CSA(jctl)) VARLSTCNT(9) ERR_JNLUNXPCTERR, 3, jctl->jnl_fn_len, jctl->jnl_fn,
-					jctl->rec_offset, ERR_TEXT, 2, LEN_AND_LIT("Unexpected EOF record found [prev_rec]"));
-			status = ERR_JNLBADRECFMT;
+			return SS_NORMAL;
 		}
 		if (ERR_JNLBADRECFMT != status)
 			return status;	/* JNLBADRECFMT message already issued by mur_prev */
@@ -181,11 +176,7 @@ uint4 mur_next_rec(jnl_ctl_list **jjctl)
 		{
 			jctl->rec_offset += rec_size;
 			assert(jctl->rec_offset <= jctl->lvrec_off);
-			if (JRT_EOF != mur_desc->jnlrec->prefix.jrec_type || jctl->rec_offset == jctl->lvrec_off)
-				return SS_NORMAL;
-			gtm_putmsg_csa(CSA_ARG(JCTL2CSA(jctl)) VARLSTCNT(9) ERR_JNLUNXPCTERR, 3, jctl->jnl_fn_len, jctl->jnl_fn,
-					jctl->rec_offset, ERR_TEXT, 2, LEN_AND_LIT("Unexpected EOF record found [next_rec]"));
-			status = ERR_JNLBADRECFMT;
+			return SS_NORMAL;
 		}
 		if (ERR_JNLBADRECFMT != status)
 			return status;
@@ -987,9 +978,7 @@ uint4	mur_fopen(jnl_ctl_list *jctl, reg_ctl_list *rctl)
 			return jctl->status;	/* gtm_putmsg would have already been done by CHECK_JNL_FILE_IS_USABLE macro */
 	}
 	/* Now that we know for sure, jfh is of the format we expect it to be, we can safely access fields inside it */
-	cre_jnl_rec_size = JNL_HAS_EPOCH(jfh)
-			? PINI_RECLEN + EPOCH_RECLEN + PFIN_RECLEN + EOF_RECLEN
-			: PINI_RECLEN + PFIN_RECLEN + EOF_RECLEN;
+	cre_jnl_rec_size = PINI_RECLEN + EPOCH_RECLEN + PFIN_RECLEN + EOF_RECLEN;
 	if ((cre_jnl_rec_size + JNL_HDR_LEN) <= jctl->os_filesize)
 	{
 		DO_FILE_READ(jctl->channel, JNL_HDR_LEN, jrecbuf, cre_jnl_rec_size, jctl->status, jctl->status2);
@@ -1034,17 +1023,14 @@ uint4	mur_fopen(jnl_ctl_list *jctl, reg_ctl_list *rctl)
 		return ERR_JNLBADRECFMT;
 	}
 	/* We have at least one good record */
-	if (JNL_HAS_EPOCH(jfh))
+	jrec = (jnl_record *)((char *)jrec + PINI_RECLEN);
+	if (!IS_VALID_JNLREC(jrec, jfh) || (JRT_EPOCH != jrec->prefix.jrec_type))
 	{
-		jrec = (jnl_record *)((char *)jrec + PINI_RECLEN);
-		if (!IS_VALID_JNLREC(jrec, jfh) || JRT_EPOCH != jrec->prefix.jrec_type)
-		{
-			gtm_putmsg_csa(CSA_ARG(JCTL2CSA(jctl)) VARLSTCNT(9) ERR_JNLBADRECFMT, 3, jctl->jnl_fn_len, jctl->jnl_fn,
-					JNL_HDR_LEN + PINI_RECLEN, ERR_TEXT, 2, LEN_AND_LIT("Invalid or no EPOCH record found"));
-			return ERR_JNLBADRECFMT;
-		}
-		/* We have at least one valid EPOCH */
+		gtm_putmsg_csa(CSA_ARG(JCTL2CSA(jctl)) VARLSTCNT(9) ERR_JNLBADRECFMT, 3, jctl->jnl_fn_len, jctl->jnl_fn,
+				JNL_HDR_LEN + PINI_RECLEN, ERR_TEXT, 2, LEN_AND_LIT("Invalid or no EPOCH record found"));
+		return ERR_JNLBADRECFMT;
 	}
+	/* We have at least one valid EPOCH */
 	if (mur_options.update && jfh->bov_tn > jfh->eov_tn)
 	{
 		gtm_putmsg_csa(CSA_ARG(JCTL2CSA(jctl)) VARLSTCNT(6) ERR_BOVTNGTEOVTN, 4, jctl->jnl_fn_len, jctl->jnl_fn,
diff --git a/sr_port/mur_sort_files.c b/sr_port/mur_sort_files.c
index ac4b59e..83cd82d 100755
--- a/sr_port/mur_sort_files.c
+++ b/sr_port/mur_sort_files.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2010 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -60,7 +61,7 @@ void	mur_sort_files(void)
 				MUR_FIX_JCTL_BACK_POINTER_TO_RCTL(jctl, rctl0, rctl1, TRUE);
 				/* When fixing jctl back pointers for jctl_alt_head, do not check prev_gen being NULL.
 				 * This is because although it is non-NULL, that marks the beginning of the regular
-				 * rctl->jctl_head linked list so we dont need to do any more special processing going
+				 * rctl->jctl_head linked list so we don't need to do any more special processing going
 				 * backwards (only need to go forward from jctl_alt_head).
 				 * Hence FALSE passed as the 4th parameter to MUR_FIX_JCTL_BACK_POINTER_TO_RCTL below
 				 */
@@ -73,6 +74,11 @@ void	mur_sort_files(void)
 				jctl = rctl1->jctl_alt_head;
 				if (NULL != jctl)
 					MUR_FIX_JCTL_BACK_POINTER_TO_RCTL(jctl, rctl1, rctl0, FALSE);
+				/* Fix rctl->csa->miscptr in rctl0 and rctl1 */
+				if (NULL != rctl0->csa)
+					rctl0->csa->miscptr = (void *)rctl0;
+				if (NULL != rctl1->csa)
+					rctl1->csa->miscptr = (void *)rctl1;
 			}
 		}
 	}
diff --git a/sr_port/mur_tp_resolve_time.c b/sr_port/mur_tp_resolve_time.c
index 750752a..63f8a10 100755
--- a/sr_port/mur_tp_resolve_time.c
+++ b/sr_port/mur_tp_resolve_time.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *
- * Copyright (c) 2005-2015 Fidelity National Information	*
+ * Copyright (c) 2005-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -36,6 +36,7 @@ void mur_tp_resolve_time(jnl_tm_t max_lvrec_time)
 {
 	int 		reg_total;
 	reg_ctl_list	*rctl, *rctl_top;
+	jnl_ctl_list	*jctl;
 	jnl_tm_t	reg_tp_resolve_time;
 	boolean_t	all_reg_before_image;
 
@@ -83,18 +84,26 @@ void mur_tp_resolve_time(jnl_tm_t max_lvrec_time)
 	}
 	for (rctl = mur_ctl, rctl_top = mur_ctl + reg_total; rctl < rctl_top; rctl++)
 	{
+		jctl = rctl->jctl;
 		/* Assumption : It is guaranteed to see an EPOCH in every
-		 * "rctl->jctl->jfh->epoch_interval + MAX_EPOCH_DELAY" seconds. */
-		assert(max_lvrec_time >= rctl->jctl->jfh->epoch_interval + MAX_EPOCH_DELAY);
+		 * "jctl->jfh->epoch_interval + MAX_EPOCH_DELAY" seconds.
+		 */
+		assert(max_lvrec_time >= jctl->jfh->epoch_interval + MAX_EPOCH_DELAY);
 		/* Calculate this region's TP resolve time based on the maximum of the last valid record across regions. If the
-		 * region is properly closed (typically this means that the journal file's crash field is FALSE. But, with online
+		 * region is properly closed (typically this means that the journal file's crash field is FALSE). But, with online
 		 * rollback, crash field being TRUE, does not mean the journal file is crashed (as long as the shared memory for
 		 * that region existed when the region was opened). So, use jctl->properly_closed to determine whether the journal
 		 * file for the region is really crashed. If it is properly closed, the region's TP resolve time is the
 		 * max_lvrec_time. If not, we need to go back by an epoch interval in addition to the MAX_EPOCH_DELAY.
+		 * There is one exception to this rule and that is if the latest generation journal file of a region is properly
+		 * closed but was once a previous generation journal file (possible for example if the user moves mumps.mjl out
+		 * of the way and renames mumps.mjl_<timestamp> back as mumps.mjl). In that case, we want to treat the
+		 * tp_resolve_time for this region as the last valid record timestamp in this journal file.
 		 */
-		if (!rctl->jctl->properly_closed)
-			reg_tp_resolve_time = max_lvrec_time - rctl->jctl->jfh->epoch_interval - MAX_EPOCH_DELAY;
+		if (!jctl->properly_closed)
+			reg_tp_resolve_time = max_lvrec_time - jctl->jfh->epoch_interval - MAX_EPOCH_DELAY;
+		else if (jctl->jfh->is_not_latest_jnl)
+			reg_tp_resolve_time = rctl->lvrec_time;
 		else
 			reg_tp_resolve_time = max_lvrec_time;
 		if (rctl->lvrec_time > reg_tp_resolve_time)
diff --git a/sr_port/mutex_deadlock_check.c b/sr_port/mutex_deadlock_check.c
index edbbbf1..bc7a126 100755
--- a/sr_port/mutex_deadlock_check.c
+++ b/sr_port/mutex_deadlock_check.c
@@ -119,8 +119,9 @@ void mutex_deadlock_check(mutex_struct_ptr_t criticalPtr, sgmnt_addrs *csa)
 	if (is_replicator || mu_reorg_process)
 	{
 		++crit_deadlock_check_cycle;
-		repl_csa = ((NULL != jnlpool.jnlpool_dummy_reg) && jnlpool.jnlpool_dummy_reg->open)
-			? &FILE_INFO(jnlpool.jnlpool_dummy_reg)->s_addrs : NULL;
+		repl_csa = (NULL != jnlpool.jnlpool_dummy_reg) ? &FILE_INFO(jnlpool.jnlpool_dummy_reg)->s_addrs : NULL;
+		assert((NULL == jnlpool.jnlpool_dummy_reg) || jnlpool.jnlpool_dummy_reg->open
+			 || (repl_csa->critical != criticalPtr));
 		if (!dollar_tlevel)
 		{
 			if ((NULL != repl_csa) && (repl_csa->critical == criticalPtr))
diff --git a/sr_port/mval2subsc.c b/sr_port/mval2subsc.c
index 50ca367..ec1cc1a 100755
--- a/sr_port/mval2subsc.c
+++ b/sr_port/mval2subsc.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -74,8 +75,9 @@ unsigned char *mval2subsc(mval *in_val, gv_key *out_key, boolean_t std_null_coll
 	 * of trouble with $ORDER in a database when -1 was treated as a string. This assert is not a 100%
 	 * catchall of invalid settings but it provides at least some barrier. A full barrier would require
 	 * complete conversion which is a bit expensive to always re-do at this point - even in a dbg version.
-	 * There is an exception though and that is if the caller is op_fnview. In that case, it could set
-	 * MV_NUM_APPROX to indicate a number needs to be treated as a string subscript. Skip that in the assert.
+	 * There are exceptions though and that is if the caller is op_fnview or op_fnzatransform. In that
+	 * case, it could set MV_NUM_APPROX to indicate a number needs to be treated as a string subscript.
+	 * Skip that in the assert.
 	 */
 	assert(!(MV_NUM_APPROX & in_val->mvtype) || (NUM_DEC_DG_2L < in_val->str.len) || !val_iscan(in_val)
 		|| TREF(skip_mv_num_approx_assert));
diff --git a/sr_port/objlabel.h b/sr_port/objlabel.h
index 3948612..cf57a39 100755
--- a/sr_port/objlabel.h
+++ b/sr_port/objlabel.h
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information 	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -32,7 +32,7 @@
  * If the 32bit platform limit would be exceeded, start bumping the OBJ_PLATFORM_LABEL value - but only for 32 bit Linux.
  */
 
-#define OBJ_UNIX_LABEL	31
+#define OBJ_UNIX_LABEL	32
 #define	OBJ_PLATFORM_LABEL	0
 
 #ifdef USHBIN_SUPPORTED
diff --git a/sr_port/op.h b/sr_port/op.h
index 1660cb6..faa67f5 100644
--- a/sr_port/op.h
+++ b/sr_port/op.h
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information 	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -114,6 +114,7 @@ void	op_fnzchar(UNIX_ONLY_COMMA(int cnt) mval *dst, ...);
 void	op_fnzconvert2(mval *str, mval *kase, mval *dst);
 void	op_fnzconvert3(mval *str, mval *from_chset, mval *to_chset, mval *dst);
 #endif
+void	op_fnzcollate(mval *src, int col, int reverse, mval *dst);
 void	op_fnzdate(mval *src, mval *fmt, mval *mo_str, mval *day_str, mval *dst);
 void	op_fnzdebug(mval *cmd, mval *dst);
 void	op_fnzechar(UNIX_ONLY_COMMA(int cnt) mval *dst, ...);
@@ -154,6 +155,7 @@ void	op_fnztrnlnm(mval *name, mval *table, int4 ind, mval *mode, mval *case_blin
 void	op_fnzwidth(mval *str, mval *dst);
 #endif
 void	op_fnzwrite(boolean_t direction, mval *str, mval *dst);
+void	op_fnzatransform(mval *src, int col, int reverse, int forcenum, mval *dst);
 int	op_forchk1();
 #ifdef UNIX
 int	op_forintrrpt();
@@ -295,6 +297,7 @@ int	op_zbfetch();
 int	op_zbstart();
 void	op_zcompile(mval *v, boolean_t ignore_dollar_zcompile);
 void	op_zcont(void);
+void    op_zcollate(mval *v, int c, mval *p);
 void	op_zdealloc2(int4 timeout, UINTPTR_T auxown);
 void	op_zdeallocate(int4 timeout);
 void	op_zedit(mval *v, mval *p);
diff --git a/sr_port/op_close.c b/sr_port/op_close.c
index 3eb9bac..e409c61 100755
--- a/sr_port/op_close.c
+++ b/sr_port/op_close.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -49,12 +50,17 @@ void op_close(mval *v, mval *p)
 	        if (0 == (tl = get_log_name(&tn, NO_INSERT)))
 			return;
 		ciod = tl->iod;
-		if (0 == ciod || TRUE == ciod->perm ||
+		if ((NULL == ciod) || (TRUE == ciod->perm) ||
 		    (ciod->state != dev_open))
 			return;
 
-		for (prev = io_root_log_name, l = prev->next;  l != 0;  prev = l, l = l->next)
+		for (prev = io_root_log_name, l = prev->next; NULL != l;  prev = l, l = l->next)
 		{
+			if ((NULL != l->iod) && (n_io_dev_types == l->iod->type))
+			{
+				assert(FALSE);
+				continue;       /* skip it on pro */
+			}
 		        if (l->iod == ciod && l != tl)
 			{
 			        prev->next = l->next;
diff --git a/sr_port/op_exp.c b/sr_port/op_exp.c
index 0e41515..76a0939 100755
--- a/sr_port/op_exp.c
+++ b/sr_port/op_exp.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2014 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -66,6 +67,7 @@ void op_exp(mval *u, mval* v, mval *p)
 					return;
 				}
 				rts_error_csa(CSA_ARG(NULL) VARLSTCNT(1) ERR_DIVZERO);
+				return;
 			}
 		} else
 			assert((0 != u1_p->m[1]) || (0 != u1_p->m[0]));
diff --git a/sr_port/op_fnfnumber.c b/sr_port/op_fnfnumber.c
index 3768fd1..998115e 100644
--- a/sr_port/op_fnfnumber.c
+++ b/sr_port/op_fnfnumber.c
@@ -37,37 +37,33 @@ void op_fnfnumber(mval *src, mval *fmt, boolean_t use_fract, int fract, mval *ds
 {
 	boolean_t	comma, paren;
 	int 		ct, x, xx, y, z;
-	mval		*t_src_p;
 	unsigned char	*ch, *cp, *ff, *ff_top, fncode, sign, *t;
 
 	if (!MV_DEFINED(fmt))		/* catch this up front so noundef mode can't cause trouble - so fmt no empty context */
 		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(2) ERR_FNUMARG, 0);
-	PUSH_MV_STENT(MVST_MVAL);			/* Create a temporary on M stack so garbage collection can see it */
-	t_src_p = &mv_chain->mv_st_cont.mvs_mval;	/* Operate on copy of src so can modify without changing original */
-	*t_src_p = *src;
+	/* if the dst will be different than the src we'll build the new value in the string pool and repoint dst there,
+	 * otherwise, dst will anyway become the same as src, therefore we can safely use dst as a "temporary" copy of src
+	 */
+	*dst = *src;
 	if (use_fract)
-		op_fnj3(t_src_p, 0, fract, t_src_p);
+		op_fnj3(dst, 0, fract, dst);
 	else
 	{
-		MV_FORCE_NUM(t_src_p);
-		MV_FORCE_CANONICAL(t_src_p);	/* if the source operand is not a canonical number, force conversion */
+		MV_FORCE_NUM(dst);
+		MV_FORCE_CANONICAL(dst);	/* if the source operand is not a canonical number, force conversion */
 	}
 	assert (stringpool.free >= stringpool.base);
 	assert (stringpool.free <= stringpool.top);
 	/* assure there is adequate space for two string forms of a number as a local
 	 * version of the src must be operated upon in order to get a canonical number
 	 */
-	ENSURE_STP_FREE_SPACE(MAX_NUM_SIZE * 2);
 	MV_FORCE_STR(fmt);
-	MV_FORCE_STR(t_src_p);
+	MV_FORCE_STR(dst);
 	if (0 == fmt->str.len)
-	{
-		*dst = *t_src_p;
-		POP_MV_STENT(); 	/* Done with temporary */
 		return;
-	}
-	ch = (unsigned char *)t_src_p->str.addr;
-	ct = t_src_p->str.len;
+	ENSURE_STP_FREE_SPACE(MAX_NUM_SIZE * 2);
+	ch = (unsigned char *)dst->str.addr;
+	ct = dst->str.len;
 	cp = stringpool.free;
 	fncode = 0;
 	for (ff = (unsigned char *)fmt->str.addr, ff_top = ff + fmt->str.len; ff < ff_top;)
@@ -121,8 +117,8 @@ void op_fnfnumber(mval *src, mval *fmt, boolean_t use_fract, int fract, mval *ds
 		/* Only add '+' if > 0 */
 		if ((0 != (fncode & PLUS)) && (0 == sign))
 		{	/* Need to make into num and check for int 0 in case was preprocessed by op_fnj3() */
-			MV_FORCE_NUM(t_src_p);
-			if ((0 == (t_src_p->mvtype & MV_INT)) || (0 != t_src_p->m[1]))
+			MV_FORCE_NUM(dst);
+			if ((0 == (dst->mvtype & MV_INT)) || (0 != dst->m[1]))
 				sign = '+';
 		}
 		if ((0 != (fncode & MINUS)) && ('-' == sign))
@@ -174,7 +170,6 @@ void op_fnfnumber(mval *src, mval *fmt, boolean_t use_fract, int fract, mval *ds
 		dst->str.addr = (char *)stringpool.free;
 		dst->str.len = INTCAST(cp - stringpool.free);
 		stringpool.free = cp;
-		POP_MV_STENT(); 	/* Done with temporary */
 		return;
 	}
 	assertpro(FALSE);
diff --git a/sr_port/op_fnqlength.c b/sr_port/op_fnqlength.c
index 20899db..dc7a2c6 100755
--- a/sr_port/op_fnqlength.c
+++ b/sr_port/op_fnqlength.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2010 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -11,8 +12,12 @@
 
 #include "mdef.h"
 #include "mvalconv.h"
+#include "stringpool.h"
 #include "op.h"
 #include "is_canonic_name.h"
+#include "zshow.h"
+
+error_def(ERR_NOCANONICNAME);
 
 /*
  * -----------------------------------------------
@@ -31,10 +36,9 @@ void op_fnqlength(mval *src, mval *dst)
 	int	dummy1;
 	int	dummy2;
 	int	subscripts = -2; /* no interest in finding a particular component */
-	error_def(ERR_NOCANONICNAME);
 
 	if (!is_canonic_name(src, &subscripts, &dummy1, &dummy2))
-		rts_error(VARLSTCNT(4) ERR_NOCANONICNAME, 2, src->str.len, src->str.addr);
+		NOCANONICNAME_ERROR(src);
         MV_FORCE_MVAL(dst, subscripts);		/* is_canonic_name has to parse anyway, so take count from it */
 	return;
 }
diff --git a/sr_port/op_fnqsubscript.c b/sr_port/op_fnqsubscript.c
index 45e9b89..ddd9d03 100755
--- a/sr_port/op_fnqsubscript.c
+++ b/sr_port/op_fnqsubscript.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2010 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -15,6 +16,7 @@
 #include "op.h"
 #include "is_canonic_name.h"
 #include "gtm_ctype.h"
+#include "zshow.h"
 
 #ifdef UNICODE_SUPPORTED
 #include "gtm_utf8.h"
@@ -24,6 +26,9 @@ error_def(ERR_INVDLRCVAL);
 
 GBLREF spdesc stringpool;
 
+error_def(ERR_NOSUBSCRIPT);
+error_def(ERR_NOCANONICNAME);
+
 #ifdef UNICODE_SUPPORTED
 #define UTF_CHAR_CPY(FROM, TO, FROM_OFFSET, TO_OFFSET, UTF_LEN)			\
 {										\
@@ -69,14 +74,12 @@ void op_fnqsubscript(mval *src, int seq, mval *dst)
 	int		subs_count;
 	unsigned char	*temp_cp;
 
-	error_def(ERR_NOSUBSCRIPT);
-	error_def(ERR_NOCANONICNAME);
 
 	if (seq < -1)	/* error "Cannot return subscript number ###" */
-		rts_error(VARLSTCNT(3) ERR_NOSUBSCRIPT, 1, seq);
+		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(3) ERR_NOSUBSCRIPT, 1, seq);
 	subs_count = seq;
 	if (!is_canonic_name(src, &subs_count, &isrc, &stop))
-		rts_error(VARLSTCNT(4) ERR_NOCANONICNAME, 2, src->str.len, src->str.addr);
+		NOCANONICNAME_ERROR(src);
 	/*  is_canonic_name has to parse it all anyway so it returns a start and stop for the compenent we want
 	    because is_canonic_name has established src is of good form, we don't have to be paranoid in parsing
 	*/
diff --git a/sr_port/op_fnview.c b/sr_port/op_fnview.c
index 2643f37..5a9a3c6 100755
--- a/sr_port/op_fnview.c
+++ b/sr_port/op_fnview.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -14,7 +14,9 @@
 
 #include <stdarg.h>
 #include "gtm_string.h"
+#include "gtm_stdio.h"
 
+#include "gtmio.h"
 #include "gdsroot.h"
 #include "gtm_facility.h"
 #include "fileinfo.h"
@@ -50,6 +52,8 @@
 # include "gtmlink.h"
 #endif
 #include "gtm_ctype.h"		/* for ISDIGIT_ASCII macro */
+#include "gvn2gds.h"
+#include "io.h"
 
 GBLREF spdesc		stringpool;
 GBLREF int4		cache_hits, cache_fails;
@@ -77,7 +81,6 @@ UNIX_ONLY(GBLREF	boolean_t		dmterm_default;)
 
 error_def(ERR_COLLATIONUNDEF);
 error_def(ERR_GBLNOMAPTOREG);
-error_def(ERR_GVSUBSERR);
 error_def(ERR_VIEWFN);
 error_def(ERR_VIEWGVN);
 
@@ -85,7 +88,6 @@ LITREF	gtmImageName	gtmImageNames[];
 LITREF	mstr		relink_allowed_mstr[];
 LITREF	mval		literal_zero;
 LITREF	mval		literal_one;
-LITREF	mval		literal_null;
 
 #define		MM_RES			"MM"
 #define		BG_RES			"BG"
@@ -97,22 +99,6 @@ LITREF	mval		literal_null;
 #define		STATS_MAX_DIGITS	MAX_DIGITS_IN_INT8
 #define		STATS_KEYWD_SIZE	(3 + 1 + 1)	/* 3 character mnemonic, colon and comma */
 
-STATICFNDCL unsigned char *gvn2gds(mval *gvn, gv_key *gvkey, int act);
-
-#define	COPY_ARG_TO_STRINGPOOL(DST, KEYEND, KEYSTART)			\
-{									\
-	int	keylen;							\
-									\
-	keylen = (unsigned char *)KEYEND - (unsigned char *)(KEYSTART);	\
-	ENSURE_STP_FREE_SPACE(keylen);					\
-	assert(stringpool.top - stringpool.free >= keylen);		\
-	memcpy(stringpool.free, KEYSTART, keylen);			\
-	DST->mvtype = MV_STR;						\
-	DST->str.len = keylen;						\
-	DST->str.addr = (char *)stringpool.free;			\
-	stringpool.free += keylen;					\
-}
-
 #define STATS_PUT_PARM(TXT, CNTR, BASE)					\
 {									\
 	MEMCPY_LIT(stringpool.free, TXT);				\
@@ -207,7 +193,21 @@ void	op_fnview(UNIX_ONLY_COMMA(int numarg) mval *dst, ...)
 			n = cache_fails;
 			break;
 		case VTK_SPSIZE:
-			n = (int)(stringpool.top - stringpool.base);
+			commastr.len = 1;
+			commastr.addr = ",";
+			ENSURE_STP_FREE_SPACE((STATS_MAX_DIGITS * 3) + 2);
+			MV_FORCE_MVAL(dst, (int)(stringpool.top - stringpool.base));
+			MV_FORCE_STR(dst);
+			dst->mvtype = vtp->restype;
+			s2pool_concat(dst, &commastr);
+			arg2 = &tmpmval;
+			MV_FORCE_MVAL(arg2, (int)(stringpool.free - stringpool.base));
+			MV_FORCE_STR(arg2);
+			s2pool_concat(dst, &arg2->str);
+			s2pool_concat(dst, &commastr);
+			MV_FORCE_MVAL(arg2, (int)(stringpool.top - stringpool.invokestpgcollevel));
+			MV_FORCE_STR(arg2);
+			s2pool_concat(dst, &arg2->str);
 			break;
 		case VTK_GDSCERT:
 			if (certify_all_blocks)
@@ -291,7 +291,12 @@ void	op_fnview(UNIX_ONLY_COMMA(int numarg) mval *dst, ...)
 		case VTK_GVNEXT:
 			assert(gd_header);
 			if (arg1->str.len)
-				parmblk.gv_ptr++;
+			{
+				for (reg = parmblk.gv_ptr + 1;
+				     ((reg - gd_header->regions) < gd_header->n_regions) && IS_STATSDB_REG(reg); reg++)
+					;
+				parmblk.gv_ptr = reg;
+			}
 			if (parmblk.gv_ptr - gd_header->regions >= gd_header->n_regions)
 				dst->str.len = 0;
 			else
@@ -399,9 +404,10 @@ void	op_fnview(UNIX_ONLY_COMMA(int numarg) mval *dst, ...)
 			key = gvn2gds(arg1, gvkey, n);
 			assert(key > &gvkey->base[0]);
 			assert(gvkey->end == key - &gvkey->base[0] - 1);
-			start_map = gv_srch_map(gd_header, (char *)&gvkey->base[0], gvkey->end - 1); /* -1 to remove trailing 0 */
+			/* -1 usage in "gv_srch_map" calls below is to remove trailing 0 */
+			start_map = gv_srch_map(gd_header, (char *)&gvkey->base[0], gvkey->end - 1, SKIP_BASEDB_OPEN_FALSE);
 			GVKEY_INCREMENT_ORDER(gvkey);
-			end_map = gv_srch_map(gd_header, (char *)&gvkey->base[0], gvkey->end - 1); /* -1 to remove trailing 0 */
+			end_map = gv_srch_map(gd_header, (char *)&gvkey->base[0], gvkey->end - 1, SKIP_BASEDB_OPEN_FALSE);
 			BACK_OFF_ONE_MAP_ENTRY_IF_EDGECASE(gvkey->base, gvkey->end - 1, end_map);
 			INCREMENT_GD_TARG_TN(gd_targ_tn);	/* takes a copy of incremented "TREF(gd_targ_tn)"
 								 * into local variable "gd_targ_tn" */
@@ -413,6 +419,7 @@ void	op_fnview(UNIX_ONLY_COMMA(int numarg) mval *dst, ...)
 			commastr.addr = ",";
 			for (map = start_map; map <= end_map; map++)
 			{
+				OPEN_BASEREG_IF_STATSREG(map);
 				reg = map->reg.addr;
 				GET_REG_INDEX(gd_header, reg_start, reg, reg_index);	/* sets "reg_index" */
 				assert((NULL == tn_array) || (TREF(gd_targ_reg_array_size) > reg_index));
@@ -597,50 +604,9 @@ void	op_fnview(UNIX_ONLY_COMMA(int numarg) mval *dst, ...)
 			RESET_GV_TARGET(DO_GVT_GVKEY_CHECK);
 			break;
 		case VTK_YGDS2GVN:
-			if (NULL != arg2)
-			{
-				n = mval2i(arg2);
-				if (0 != n)
-				{
-					csp = ready_collseq(n);
-					if (NULL == csp)
-					{
-						rts_error_csa(CSA_ARG(NULL) VARLSTCNT(3) ERR_COLLATIONUNDEF, 1, n);
-						break;
-					}
-				} else
-					csp = NULL;	/* Do not issue COLLATIONUNDEF for 0 collation */
-			}
-			/* Temporarily repoint global variables "gv_target" and "transform".
-			 * They are needed by format_targ_key/gvsub2str "transform" and "gv_target->collseq".
-			 */
-			save_transform = TREF(transform);
-			assert(save_transform);
-			TREF(transform) = TRUE;
-			reset_gv_target = gv_target;
-			gv_target = &temp_gv_target;
-			memset(gv_target, 0, SIZEOF(gv_namehead));
-			if (NULL != arg2)
-				gv_target->collseq = csp;
-			assert(MV_IS_STRING(arg1));
-			gvkey = &save_currkey[0];
-			gvkey->prev = 0;
-			gvkey->top = DBKEYSIZE(MAX_KEY_SZ);
-			if ((gvkey->top < arg1->str.len) || (2 > arg1->str.len)
-					|| (KEY_DELIMITER != arg1->str.addr[arg1->str.len-1])
-					|| (KEY_DELIMITER != arg1->str.addr[arg1->str.len-2]))
-				*dst = literal_null;
-			else
-			{
-				memcpy(&gvkey->base[0], arg1->str.addr, arg1->str.len);
-				DEBUG_ONLY(gvkey->end = arg1->str.len - 1;)	/* for an assert in format_targ_key */
-				if (0 == (c = format_targ_key(&buff[0], MAX_ZWR_KEY_SZ, gvkey, FALSE)))
-					c = &buff[MAX_ZWR_KEY_SZ - 1];
-				COPY_ARG_TO_STRINGPOOL(dst, c, &buff[0]);
-			}
-			/* Restore global variables "gv_target" and "transform" back to their original state */
-			RESET_GV_TARGET(DO_GVT_GVKEY_CHECK);
-			TREF(transform) = save_transform;
+			n = (NULL != arg2) ? mval2i(arg2) : 0;
+			key = gds2gvn(arg1, &buff[0], n);
+			COPY_ARG_TO_STRINGPOOL(dst, key, &buff[0]);
 			break;
 		case VTK_YGVN2GDS:
 			n = (NULL != arg2) ? mval2i(arg2) : 0;
@@ -732,6 +698,9 @@ void	op_fnview(UNIX_ONLY_COMMA(int numarg) mval *dst, ...)
 			n = dmterm_default;
 			break;
 #		endif
+		case VTK_STATSHARE:
+			n = TREF(statshare_opted_in) ? TRUE : FALSE;
+			break;
 		default:
 			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(1) ERR_VIEWFN);
 	}
@@ -739,278 +708,3 @@ void	op_fnview(UNIX_ONLY_COMMA(int numarg) mval *dst, ...)
 	if (MV_NM == vtp->restype)
 		MV_FORCE_MVAL(dst, n);
 }
-
-/* Converts a GVN in string representation into a key in subscript representation.
- * Note: This code is very similar to "is_canonic_name()". With some effort, they might even be merged into one.
- */
-STATICFNDEF unsigned char *gvn2gds(mval *gvn, gv_key *gvkey, int act)
-{
-	boolean_t	save_transform, is_zchar;
-	collseq		*csp;
-	gd_region	tmpreg, *save_gv_cur_region;
-	gv_namehead	temp_gv_target;
-	int		quotestate, clen;
-	int4		num;
-	unsigned char	strbuff[MAX_KEY_SZ + 1], *key, *key_start, *key_top, *c, *c_top, ch, *str, *str_top, *c1, *c2, *numptr;
-	char		fnname[6];	/* to hold the function name $CHAR or $ZCHAR */
-	char		number[32];	/* to hold a codepoint numeric value for $char or $zchar; 32 digits is more than enough */
-	mval		tmpmval, *mvptr, dollarcharmval;
-	DCL_THREADGBL_ACCESS;
-
-	SETUP_THREADGBL_ACCESS;
-	if (0 != act)
-	{
-		csp = ready_collseq(act);
-		if (NULL == csp)
-			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(3) ERR_COLLATIONUNDEF, 1, act);
-	} else
-		csp = NULL;	/* Do not issue COLLATIONUNDEF for 0 collation */
-	assert(MV_IS_STRING(gvn));
-	c = (unsigned char *)gvn->str.addr;
-	c_top = c + gvn->str.len;
-	key_start = &gvkey->base[0];
-	key = key_start;
-	if ((c >= c_top) || ('^' != *c++))
-		return key;
-	gvkey->prev = 0;
-	gvkey->top = DBKEYSIZE(MAX_KEY_SZ);
-	key_top = key_start + gvkey->top;
-	/* Parse GBLNAME */
-	for ( ; (c < c_top) && (key < key_top); )
-	{
-		if ('(' == *c)
-			break;
-		*key++ = *c++;
-	}
-	if (key >= key_top)
-		return key_start;
-	if (c == c_top)
-	{
-		*key++ = KEY_DELIMITER;
-		gvkey->end = key - key_start;
-		*key++ = KEY_DELIMITER;
-		return key;
-	}
-	assert('(' == *c);
-	c++; /* skip past "(" */
-	*key++ = KEY_DELIMITER;
-	gvkey->end = key - key_start;
-	str = &strbuff[0];
-	str_top = str + ARRAYSIZE(strbuff);
-	/* Temporarily repoint global variables "gv_cur_region", "gv_target" and "transform".
-	 * They are needed by mval2subsc for the following
-	 *	"transform", "gv_target->nct", "gv_target->collseq" and "gv_cur_region->std_null_coll"
-	 */
-	save_transform = TREF(transform);
-	assert(save_transform);
-	TREF(transform) = TRUE;
-	reset_gv_target = gv_target;
-	gv_target = &temp_gv_target;
-	memset(gv_target, 0, SIZEOF(gv_namehead));
-	gv_target->collseq = csp;
-	save_gv_cur_region = gv_cur_region;
-	gv_cur_region = &tmpreg;
-	memset(gv_cur_region, 0, SIZEOF(gd_region));
-	/* Note that the primary caller of the YGVN2GDS functionality is going to be GDE for globals that
-	 * span regions. And since such globals need to reside in regions that have standard null collation
-	 * defined, we set the std_null_coll field to TRUE above.
-	 */
-	gv_cur_region->std_null_coll = TRUE;
-	/* Parse subscripts */
-	quotestate = 0;
-	for ( ; (c < c_top) && (str < str_top); c++)
-	{
-		ch = *c;
-		switch (quotestate)
-		{
-			case 0:
-			case 6:
-				if (('"' == ch) || ('$' == ch))
-				{	/* start of a string subscript */
-					if (0 == quotestate)
-					{
-						tmpmval.mvtype = (MV_STR | MV_NUM_APPROX);
-							/* MV_NUM_APPROX needed by mval2subsc to skip val_iscan call */
-						str = &strbuff[0];
-						tmpmval.str.addr = (char *)str;
-					}
-					quotestate = ('"' == ch) ? 1 : 3;
-				} else if (6 == quotestate)
-				{	/* Defer rts_error until after global variables "gv_cur_region" etc. are restored. */
-					quotestate = -1;/* error in input */
-					c = c_top;	/* do not parse remaining input as subscripted gvn is complete now */
-				} else
-				{	/* quotestate is 0, in this case this is the start of a number */
-					quotestate = 4;	/* start of a number */
-					tmpmval.mvtype = MV_STR;
-					tmpmval.str.addr = (char *)c;
-				}
-				break;
-			case 1:
-				if ('"' == ch)
-					quotestate = 2;
-				else
-					*str++ = ch;	/* and quotestate stays at 1 */
-				break;
-			case 2:
-			case 9:
-				if ((2 == quotestate) && ('"' == ch))
-				{
-					*str++ = '"';
-					quotestate = 1;
-					break;
-				} else if (')' == ch)
-					quotestate = 5;
-				else if (',' == ch)
-					quotestate = 0;
-				else if ('_' == ch)
-				{
-					quotestate = 6;
-					break;
-				} else
-				{	/* Defer rts_error until after global variables "gv_cur_region" etc. are restored. */
-					quotestate = -1;	/* error in input */
-					c = c_top;		/* force break from for loop */
-					break;
-				}
-				assert((')' == ch) || (',' == ch));
-				tmpmval.str.len = str - (unsigned char *)tmpmval.str.addr;
-				DEBUG_ONLY(TREF(skip_mv_num_approx_assert) = TRUE;)
-				mval2subsc(&tmpmval, gvkey, gv_cur_region->std_null_coll);
-				DEBUG_ONLY(TREF(skip_mv_num_approx_assert) = FALSE;)
-				assert(gvkey->end < gvkey->top); /* else GVSUBOFLOW error would have been issued */
-				key = &gvkey->base[gvkey->end];
-				break;
-			case 3:
-				/* Allow only one of $C( or $CHAR( or $ZCH( or $ZCHAR( */
-				c1 = c;
-				for ( ; (c < c_top) && ('(' != *c); c++)
-					;
-				if (c == c_top)
-					break;
-				clen = c - c1;
-				if (clen >= ARRAYSIZE(fnname))
-				{
-					c = c_top;	/* force break from for loop */
-					break;		/* bad function name. issue error after breaking from for loop */
-				}
-				for (c2 = (unsigned char *)&fnname[0]; c1 < c; c2++, c1++)
-					*c2 = TOUPPER(*c1);
-				if (!MEMCMP_LIT(fnname, "ZCHAR") || !MEMCMP_LIT(fnname, "ZCH"))
-					is_zchar = 1;
-				else if (!MEMCMP_LIT(fnname, "CHAR") || !MEMCMP_LIT(fnname, "C"))
-					is_zchar = 0;
-				else
-				{
-					c = c_top;	/* force break from for loop */
-					break;		/* bad function name. issue error after breaking from for loop */
-				}
-				assert('(' == *c);
-				quotestate = 7;
-				break;
-			case 4:
-				if (',' == ch)
-					quotestate = 0;
-				else if (')' == ch)
-					quotestate = 5;
-				else
-					break;
-				tmpmval.str.len = c - (unsigned char *)tmpmval.str.addr;
-				mvptr = &tmpmval;
-				MV_FORCE_NUM(mvptr);
-				if (MVTYPE_IS_NUM_APPROX(tmpmval.mvtype))
-				{	/* User specified either a non-numeric or an imprecise numeric.
-					 * Defer rts_error until after global variables "gv_cur_region" etc. are restored.
-					 */
-					quotestate = -1;/* error in input */
-					c = c_top;	/* do not parse remaining input as subscripted gvn is complete now */
-					break;
-				}
-				mval2subsc(&tmpmval, gvkey, gv_cur_region->std_null_coll);
-				assert(gvkey->end < gvkey->top); /* else GVSUBOFLOW error would have been issued */
-				key = &gvkey->base[gvkey->end];
-				break;
-			case 5:
-				/* Defer rts_error until after global variables "gv_cur_region" etc. are restored. */
-				quotestate = -1;/* error in input */
-				c = c_top;	/* do not parse remaining input as subscripted gvn is complete now */
-				break;
-			case 7:
-				if (!ISDIGIT_ASCII(ch))
-				{	/* Not an ascii numeric digit.
-					 * Defer rts_error until after global variables "gv_cur_region" etc. are restored.
-					 */
-					quotestate = -1;/* error in input */
-					c = c_top;	/* do not parse remaining input as subscripted gvn is complete now */
-					break;
-				}
-				numptr = c;	/* record start of number */
-				quotestate = 8;
-				break;
-			case 8:
-				if (')' == ch)
-					quotestate = 9;
-				else if (',' == ch)
-					quotestate = 7;
-				else if (!ISDIGIT_ASCII(ch))
-				{	/* Not an ascii numeric digit
-					 * Defer rts_error until after global variables "gv_cur_region" etc. are restored.
-					 */
-					quotestate = -1;/* error in input */
-					c = c_top;	/* do not parse remaining input as subscripted gvn is complete now */
-					break;
-				} else
-					break;	/* continue processing numeric argument to $c or $zch */
-				/* end of the $c() number. find its zchar value */
-				if ((c - numptr) >= ARRAYSIZE(number))
-				{	/* number specified to $c or $zch is more than 32 digits long. error out */
-					c = c_top;	/* force break from for loop */
-					break;		/* bad function name. issue error after breaking from for loop */
-				}
-				memcpy(number, numptr, c - numptr);
-				number[c - numptr] = '\0';
-				num = (int4)STRTOUL(number, NULL, 10);
-				if (0 > num)
-				{	/* number is negative. issue error */
-					c = c_top;	/* force break from for loop */
-					break;		/* bad function name. issue error after breaking from for loop */
-				}
-#				ifdef UNICODE_SUPPORTED
-				if (!is_zchar && is_gtm_chset_utf8)
-					op_fnchar(2, &dollarcharmval, num);
-				else
-#				endif
-					op_fnzchar(2, &dollarcharmval, num);
-				assert(MV_IS_STRING(&dollarcharmval));
-				if (dollarcharmval.str.len)
-				{
-					if (str + dollarcharmval.str.len > str_top)
-					{	/* String overflows capacity.
-						 * Defer rts_error until after global variables "gv_cur_region" etc. are restored.
-						 */
-						quotestate = -1;/* error in input */
-						c = c_top; /* do not parse remaining input as subscripted gvn is complete now */
-						break;
-					}
-					memcpy(str, dollarcharmval.str.addr, dollarcharmval.str.len);
-					str += dollarcharmval.str.len;
-				}
-				break;
-			default:
-				assertpro(FALSE && quotestate);
-				break;
-		}
-	}
-	/* Restore global variables "gv_cur_region", "gv_target" and "transform" back to their original state */
-	gv_cur_region = save_gv_cur_region;
-	RESET_GV_TARGET(DO_GVT_GVKEY_CHECK);
-	TREF(transform) = save_transform;
-	if ((str >= str_top) || !CAN_APPEND_HIDDEN_SUBS(gvkey))
-		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_GVSUBOFLOW, 0, ERR_GVIS, 2, gvn->str.len, gvn->str.addr);
-	if (5 == quotestate)
-		*key++ = KEY_DELIMITER;	/* add double terminating null byte */
-	else
-		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(1) ERR_GVSUBSERR);
-	assert(key <= key_top);
-	return key;
-}
diff --git a/sr_port/op_fnzatransform.c b/sr_port/op_fnzatransform.c
new file mode 100644
index 0000000..4222962
--- /dev/null
+++ b/sr_port/op_fnzatransform.c
@@ -0,0 +1,173 @@
+/****************************************************************
+ *								*
+ * Copyright (c) 2012-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
+ *								*
+ *	This source code contains the intellectual property	*
+ *	of its copyright holder(s), and is made available	*
+ *	under a license.  If you do not know the terms of	*
+ *	the license, please stop and do not read further.	*
+ *								*
+ ****************************************************************/
+
+#include "mdef.h"
+
+#include <stdarg.h>
+#include "gtm_string.h"
+#include "gtm_stdio.h"
+
+#include "gtmio.h"
+#include "gdsroot.h"
+#include "gtm_facility.h"
+#include "gdsbt.h"
+#include "gdsfhead.h"
+#include "stringpool.h"
+#include "collseq.h"
+#include "error.h"
+#include "op.h"
+#include "patcode.h"
+#include "mvalconv.h"
+#include "lv_val.h"
+#include "alias.h"
+#include "gtmimagename.h"
+#include "format_targ_key.h"
+#include "gtm_ctype.h"		/* for ISDIGIT_ASCII macro */
+#include "gvn2gds.h"
+#include "gvsub2str.h"
+#include "io.h"
+
+#define MAX_KEY_SIZE	(MAX_KEY_SZ - 4)	/* internal and external maximums differ */
+
+GBLREF gv_namehead	*gv_target;
+GBLREF gv_namehead	*reset_gv_target;
+GBLREF spdesc 		stringpool;
+LITREF mval		literal_null;
+
+STATICDEF boolean_t	save_transform;
+STATICDEF boolean_t	transform_direction;
+
+error_def(ERR_COLLATIONUNDEF);
+error_def(ERR_ZATRANSERR);
+
+CONDITION_HANDLER(op_fnzatransform_ch)
+{
+	START_CH(TRUE);
+	RESET_GV_TARGET(DO_GVT_GVKEY_CHECK);
+	TREF(transform) = save_transform;
+	if (transform_direction)
+		DEBUG_ONLY(TREF(skip_mv_num_approx_assert) = FALSE);
+	if (ERR_ZATRANSERR != SIGNAL)
+	{	/* Override downstream GVSUBOFLOW error. This should not happen because we already
+		 * limit the string lenth to less than the maximum key size.
+		 */
+		assert(FALSE);
+		SIGNAL = ERR_ZATRANSERR;
+		gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(1) ERR_ZATRANSERR);
+	}
+	NEXTCH;
+}
+
+/*
+ * -----------------------------------------------
+ * op_fnzatransform()
+ * Converts between an MVAL and database internal representation (GDS) of the MVAL using a specified collation
+ * sequence.
+ *
+ * Arguments:
+ *	msrc	 - Pointer to a string
+ * 	col	 - Collation algorithm index
+ * 	reverse	 - Specifies whether to convert msrc from GVN to GDS representation (0) or whether to convert
+ *		   from GDS to GVN representation (nonzero).
+ * 	forceStr - Force convert the mval to a string. Use this to make numbers collate like strings
+ * 	dst	 - The destination string containing the converted string.
+ * -----------------------------------------------
+ */
+void op_fnzatransform(mval *msrc, int col, int reverse, int forceStr, mval *dst)
+{
+	gv_key		save_currkey[DBKEYALLOC(MAX_KEY_SZ)];
+	gv_key		*gvkey;
+	unsigned char	*key;
+	unsigned char	buff[MAX_KEY_SZ + 1], msrcbuff[MAX_KEY_SZ + 1];
+	collseq 	*csp;
+	gv_namehead	temp_gv_target;
+	mval		*src, lcl_src;
+	mstr		opstr;
+	DCL_THREADGBL_ACCESS;
+
+	SETUP_THREADGBL_ACCESS;
+	if (0 != col)
+	{
+		csp = ready_collseq(col);
+		if (NULL == csp)
+			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(3) ERR_COLLATIONUNDEF, 1, col);
+	} else
+		csp = NULL; /* Do not issue COLLATIONUNDEF for 0 collation */
+
+	if (0 == msrc->str.len)
+	{	/* Null string, return it back */
+		*dst=*msrc;
+		return;
+	}
+	/* Temporarily repoint global variables "gv_target" and "transform".
+	 * They are needed by mval2subsc/gvsub2str "transform" and "gv_target->collseq".
+	 * Note that transform is usually ON, specifying that collation transformation is "enabled",
+	 * and is only shut off for minor periods when something is being critically formatted (like
+	 * we're doing here).
+	 */
+	save_transform = TREF(transform);
+	assert(save_transform);
+	assert(INVALID_GV_TARGET == reset_gv_target);
+	reset_gv_target = gv_target;
+	gv_target = &temp_gv_target;
+	memset(gv_target, 0, SIZEOF(gv_namehead));
+	gv_target->collseq = csp;
+	gvkey = &save_currkey[0];
+	gvkey->prev = 0;
+	gvkey->top = DBKEYSIZE(MAX_KEY_SZ);
+	gvkey->end = 0;
+	/* Avoid changing the characteristics of the caller's MVAL */
+	lcl_src = *msrc;
+	src = &lcl_src;
+	if (forceStr)
+	{
+		TREF(transform) = TRUE;
+		MV_FORCE_STR(src);
+		src->mvtype |= MV_NUM_APPROX; /* Force the mval to be treated as a string */
+	} else
+		TREF(transform) = FALSE;
+	ESTABLISH(op_fnzatransform_ch);
+	transform_direction = (0 == reverse);
+	if (transform_direction)
+	{	/* convert to subscript format; mval2subsc returns NULL in place of GVSUBOFLOW */
+		if (MAX_KEY_SIZE < src->str.len)
+			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(1) ERR_ZATRANSERR);
+		/* Setup false key in case a GVSUBOFLOW occurs where format_targ_key processes the key for printing */
+		key = gvkey->base;
+		*key++ = KEY_DELIMITER;
+		gvkey->end++;
+		DEBUG_ONLY(TREF(skip_mv_num_approx_assert) = TRUE;)
+		if (NULL == (key = mval2subsc(src, gvkey, TRUE)))
+			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(1) ERR_ZATRANSERR);
+		COPY_ARG_TO_STRINGPOOL(dst, &gvkey->base[gvkey->end], &gvkey->base[1]);
+		DEBUG_ONLY(TREF(skip_mv_num_approx_assert) = FALSE);
+
+	} else
+	{	/* convert back from subscript format; cannot exceed MAX_KEY_SZ for gvsub2str to work */
+		if (MAX_KEY_SZ < src->str.len)
+			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(1) ERR_ZATRANSERR);
+		memset(msrcbuff, 0, MAX_KEY_SZ);		/* Ensure null termination */
+		memcpy(msrcbuff, src->str.addr, src->str.len);
+		opstr.addr = (char *)buff;
+		opstr.len = MAX_KEY_SZ;
+		if (opstr.addr == (char *)(key = gvsub2str((unsigned char *)msrcbuff, &opstr, FALSE)))
+			dst = (mval *)&literal_null;
+		else
+			COPY_ARG_TO_STRINGPOOL(dst, key, &buff[0]);
+	}
+	/* Restore transform and gv_target */
+	REVERT;
+	RESET_GV_TARGET(DO_GVT_GVKEY_CHECK);
+	TREF(transform) = save_transform;
+}
+
+
diff --git a/sr_port/op_fnzcollate.c b/sr_port/op_fnzcollate.c
new file mode 100644
index 0000000..0e20f64
--- /dev/null
+++ b/sr_port/op_fnzcollate.c
@@ -0,0 +1,67 @@
+/****************************************************************
+ *								*
+ * Copyright (c) 2012-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
+ *								*
+ *	This source code contains the intellectual property	*
+ *	of its copyright holder(s), and is made available	*
+ *	under a license.  If you do not know the terms of	*
+ *	the license, please stop and do not read further.	*
+ *								*
+ ****************************************************************/
+
+#include "mdef.h"
+
+#include <stdarg.h>
+#include "gtm_string.h"
+
+#include "gdsroot.h"
+#include "gtm_facility.h"
+#include "fileinfo.h"
+#include "gdsbt.h"
+#include "gdsfhead.h"
+#include "op.h"
+#include "stringpool.h"
+#include "gvn2gds.h"
+
+GBLREF spdesc 	stringpool;
+
+/*
+ * -----------------------------------------------
+ * op_fnzcollate()
+ * Converts between global variable name (GVN) and database internal representation (GDS) using
+ * a specified collation sequence.
+ *
+ * Arguments:
+ *	src	     - Pointer to a string in Global Variable Name format, if reverse is 0, or
+ *		       a pointer to a string in database internal format if reverse is nonzero.
+ * 	col	     - Collation algorithm index.
+ * 	reverse	     - Specifies whether to convert from GVN to GDS representation (0) or whether
+ * 		       to convert from GDS to GVN representation (nonzero).
+ * 	dst	     - The destination string containing the converted string.
+ * -----------------------------------------------
+ */
+void op_fnzcollate(mval *src, int col, int reverse, mval *dst)
+{
+	gv_key			save_currkey[DBKEYALLOC(MAX_KEY_SZ)];
+	gv_key			*gvkey;
+	unsigned char		*key;
+	unsigned char		buff[MAX_ZWR_KEY_SZ];
+	DCL_THREADGBL_ACCESS;
+
+	SETUP_THREADGBL_ACCESS;
+	MV_FORCE_STR(src);
+	if (0 == reverse)
+	{	/* gvn2gds */
+		gvkey = &save_currkey[0];
+		key = gvn2gds(src, gvkey, col);
+		/* If input has error at some point, copy whatever subscripts
+		 * (+ gblname) have been successfully parsed */
+		COPY_ARG_TO_STRINGPOOL(dst, key, &gvkey->base[0]);
+	} else
+	{	/* reverse: gds2gvn */
+		key = gds2gvn(src, &buff[0], col);
+		COPY_ARG_TO_STRINGPOOL(dst, key, &buff[0]);
+	}
+}
+
diff --git a/sr_port/op_fnzqgblmod.c b/sr_port/op_fnzqgblmod.c
index f8454c1..517cb9c 100755
--- a/sr_port/op_fnzqgblmod.c
+++ b/sr_port/op_fnzqgblmod.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2011 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -38,7 +39,7 @@ void op_fnzqgblmod(mval *v)
 
 	if (NULL != gv_cur_region)
 	{
-		if (gv_cur_region->dyn.addr->acc_meth == dba_bg  ||  gv_cur_region->dyn.addr->acc_meth == dba_mm)
+		if (IS_REG_BG_OR_MM(gv_cur_region))
 		{
 			if (gv_target->root)
 				gblmod = gvcst_gblmod(v);
diff --git a/sr_port/op_gvdata.c b/sr_port/op_gvdata.c
index be7a60a..1497f61 100755
--- a/sr_port/op_gvdata.c
+++ b/sr_port/op_gvdata.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -38,7 +39,7 @@ void op_gvdata(mval *v)
 	if (TREF(gv_last_subsc_null) && NEVER == gv_cur_region->null_subs)
 		sgnl_gvnulsubsc();
 	acc_meth = REG_ACC_METH(gv_cur_region);
-	if ((dba_bg == acc_meth) || (dba_mm == acc_meth))
+	if (IS_ACC_METH_BG_OR_MM(acc_meth))
 	{
 		gvnh_reg = TREF(gd_targ_gvnh_reg);
 		if (NULL == gvnh_reg)
diff --git a/sr_port/op_gvextnam.c b/sr_port/op_gvextnam.c
index 6f73c97..970efa9 100644
--- a/sr_port/op_gvextnam.c
+++ b/sr_port/op_gvextnam.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -121,10 +121,10 @@ STATICFNDEF void op_gvextnam_common(int count, int hash_code, mval *val1, va_lis
 	assertpro(MV_IS_STRING(val));
 	gvname.var_name = val->str;
 	gvname.hash_code = hash_code;
+	TREF(gd_targ_addr) = tmpgd;		/* needed by name-level $order/$zprevious and various other functions */
 	GV_BIND_NAME_AND_ROOT_SEARCH(tmpgd, &gvname, gvnh_reg);
 	/* cs_addrs is not initialized in case gvnh_reg->gvspan is non-NULL. Assert accordingly */
 	DBG_CHECK_GVTARGET_GVCURRKEY_IN_SYNC((NULL == gvnh_reg->gvspan) ? CHECK_CSA_TRUE : CHECK_CSA_FALSE);
-	TREF(gd_targ_addr) = tmpgd;		/* needed by name-level $order/$zprevious and various other functions */
 	was_null = is_null = FALSE;
 	/* gv_cur_region will not be set in case gvnh_reg->gvspan is non-NULL. So use region from gvnh_reg */
 	reg = gvnh_reg->gd_reg;
diff --git a/sr_port/op_gvget.c b/sr_port/op_gvget.c
index f708c16..88475e7 100755
--- a/sr_port/op_gvget.c
+++ b/sr_port/op_gvget.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2011 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -43,7 +44,7 @@ boolean_t op_gvget(mval *v)
 	SETUP_THREADGBL_ACCESS;
 	if (TREF(gv_last_subsc_null) && NEVER == gv_cur_region->null_subs)
 		sgnl_gvnulsubsc();
-	if ((dba_bg == gv_cur_region->dyn.addr->acc_meth) || (dba_mm == gv_cur_region->dyn.addr->acc_meth))
+	if (IS_REG_BG_OR_MM(gv_cur_region))
 	{
 	 	if (0 == gv_target->root)		/* global does not exist */
 		{	/* Assert that if gtm_gvundef_fatal is non-zero, then we better not be about to signal a GVUNDEF */
diff --git a/sr_port/op_gvincr.c b/sr_port/op_gvincr.c
index 5391c9c..9d2551c 100755
--- a/sr_port/op_gvincr.c
+++ b/sr_port/op_gvincr.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2004, 2010 Fidelity Information Services, Inc	*
+ * Copyright (c) 2004-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -31,8 +32,9 @@ GBLREF	gv_key		*gv_currkey;
 
 error_def(ERR_DBPRIVERR);
 error_def(ERR_GVIS);
-error_def(ERR_UNIMPLOP);
+error_def(ERR_PCTYRESERVED);
 error_def(ERR_TEXT);
+error_def(ERR_UNIMPLOP);
 
 void	op_gvincr(mval *increment, mval *result)
 {
@@ -40,36 +42,35 @@ void	op_gvincr(mval *increment, mval *result)
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
-	if ((!TREF(gv_last_subsc_null) && !TREF(gv_some_subsc_null)) || (ALWAYS == gv_cur_region->null_subs))
-	{
-		if (!gv_cur_region->read_only)
-		{
-			assert(gv_currkey->end + 1 <= gv_cur_region->max_key_size);
-			MV_FORCE_NUM(increment);
-			switch (gv_cur_region->dyn.addr->acc_meth)
-			{
-				case dba_bg:
-				case dba_mm:
-					gvcst_incr(increment, result);
-					break;
-				case dba_cm:
-					gvcmx_increment(increment, result);
-					break;
-				case dba_usr:
-					/* $INCR not supported for DDP/USR access method */
-					if (0 == (end = format_targ_key(buff, MAX_ZWR_KEY_SZ, gv_currkey, TRUE)))
-						end = &buff[MAX_ZWR_KEY_SZ - 1];
-					rts_error(VARLSTCNT(10) ERR_UNIMPLOP, 0,
-						ERR_TEXT, 2, LEN_AND_LIT("GTCM DDP server does not support $INCREMENT"),
-						ERR_GVIS, 2, end - buff, buff,
-						ERR_TEXT, 2, REG_LEN_STR(gv_cur_region));
-					break;
-				default:
-					GTMASSERT;
-			}
-			assert(MV_DEFINED(result));
-		} else
-			rts_error(VARLSTCNT(4) ERR_DBPRIVERR, 2, DB_LEN_STR(gv_cur_region));
-	} else
+	/* If specified var name is global ^%Y*, the name is illegal to use in a SET or KILL command, only GETs are allowed */
+	if ((RESERVED_NAMESPACE_LEN <= gv_currkey->end) && (0 == MEMCMP_LIT(gv_currkey->base, RESERVED_NAMESPACE)))
+		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(1) ERR_PCTYRESERVED);
+	if (gv_cur_region->read_only)
+		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_DBPRIVERR, 2, DB_LEN_STR(gv_cur_region));
+	if ((TREF(gv_last_subsc_null) || TREF(gv_some_subsc_null)) && (ALWAYS != gv_cur_region->null_subs))
 		sgnl_gvnulsubsc();
+	assert(gv_currkey->end + 1 <= gv_cur_region->max_key_size);
+	MV_FORCE_NUM(increment);
+	switch (gv_cur_region->dyn.addr->acc_meth)
+	{
+		case dba_bg:
+		case dba_mm:
+			gvcst_incr(increment, result);
+			break;
+		case dba_cm:
+			gvcmx_increment(increment, result);
+			break;
+		case dba_usr:
+			/* $INCR not supported for DDP/USR access method */
+			if (0 == (end = format_targ_key(buff, MAX_ZWR_KEY_SZ, gv_currkey, TRUE)))
+				end = &buff[MAX_ZWR_KEY_SZ - 1];
+			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(10) ERR_UNIMPLOP, 0,
+				      ERR_TEXT, 2, LEN_AND_LIT("GTCM DDP server does not support $INCREMENT"),
+				      ERR_GVIS, 2, end - buff, buff,
+				      ERR_TEXT, 2, REG_LEN_STR(gv_cur_region));
+			break;
+		default:
+			assertpro(FALSE);
+	}
+	assert(MV_DEFINED(result));
 }
diff --git a/sr_port/op_gvkill.c b/sr_port/op_gvkill.c
index a6451a9..ef98b41 100755
--- a/sr_port/op_gvkill.c
+++ b/sr_port/op_gvkill.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -43,6 +44,7 @@ GBLREF	jnl_gbls_t	jgbl;
 #endif
 
 error_def(ERR_DBPRIVERR);
+error_def(ERR_PCTYRESERVED);
 
 void kill_var(void);
 
@@ -53,6 +55,13 @@ void op_gvkill(void)
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
+	/* If specified var name is global ^%Y*, the name is illegal to use in a SET or KILL command, only GETs are allowed.
+	 * The only exception is if we are removing a ^%YGS record from the statsdb (caller "gvcst_remove_statsDB_linkage"
+	 * but in that case we would have reg->read_only set to FALSE for a statsdb region name. Account for that.
+	 */
+	if (((RESERVED_NAMESPACE_LEN <= gv_currkey->end) && (0 == MEMCMP_LIT(gv_currkey->base, RESERVED_NAMESPACE)))
+			&& (!IS_STATSDB_REGNAME(gv_cur_region) || gv_cur_region->read_only))
+		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(1) ERR_PCTYRESERVED);
 	if (gv_cur_region->read_only)
 	{
 		assert(cs_addrs == &FILE_INFO(gv_cur_region)->s_addrs);
@@ -60,7 +69,7 @@ void op_gvkill(void)
 	}
 	if (TREF(gv_last_subsc_null) && NEVER == gv_cur_region->null_subs)
 		sgnl_gvnulsubsc();
-	if (REG_ACC_METH(gv_cur_region) == dba_bg || REG_ACC_METH(gv_cur_region) == dba_mm)
+	if (IS_REG_BG_OR_MM(gv_cur_region))
 	{
 		gvnh_reg = TREF(gd_targ_gvnh_reg);
 		if (NULL == gvnh_reg)
diff --git a/sr_port/op_gvnaked.c b/sr_port/op_gvnaked.c
index 86cc01d..191cf6d 100644
--- a/sr_port/op_gvnaked.c
+++ b/sr_port/op_gvnaked.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -100,7 +101,10 @@ STATICFNDEF void op_gvnaked_common(int count, int hash_code_dummy, mval *val_arg
 			if (KEY_DELIMITER == *ptr++)
 				sbs_cnt++;
 		if (MAX_GVSUBSCRIPTS < (count + sbs_cnt))
+		{
+			gv_currkey->end = 0;
 			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(1) ERR_MAXNRSUBSCRIPTS);
+		}
 	}
 	/* else naked reference will not increase number of subscripts, so do not worry about exceeding the limit */
 	reg = gv_cur_region;
@@ -138,6 +142,8 @@ STATICFNDEF void op_gvnaked_common(int count, int hash_code_dummy, mval *val_arg
 	val = val_arg;
 	is_null = FALSE;
 	was_null = TREF(gv_some_subsc_null);
+	if (!val->mvtype)
+		gv_currkey->end = 0;
 	for ( ; ; )
 	{
 		COPY_SUBS_TO_GVCURRKEY(val, reg, gv_currkey, was_null, is_null);
@@ -159,7 +165,7 @@ STATICFNDEF void op_gvnaked_common(int count, int hash_code_dummy, mval *val_arg
 	if (gv_currkey->end >= max_key)
 		ISSUE_GVSUBOFLOW_ERROR(gv_currkey, KEY_COMPLETE_TRUE);
 	DBG_CHECK_GVTARGET_GVCURRKEY_IN_SYNC(CHECK_CSA_TRUE);
-	if ((dba_bg == REG_ACC_METH(reg)) || (dba_mm == REG_ACC_METH(reg)))
+	if (IS_REG_BG_OR_MM(reg))
 	{
 		assert(INVALID_GV_TARGET != gv_target);
                 if (dollar_tlevel)
diff --git a/sr_port/op_gvname.c b/sr_port/op_gvname.c
index 94731e2..56f1673 100644
--- a/sr_port/op_gvname.c
+++ b/sr_port/op_gvname.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -87,6 +88,7 @@ STATICFNDEF void op_gvname_common(int count, int hash_code, mval *val_arg, va_li
 	mname_entry	gvname;
 	int		max_key;
 	gvnh_reg_t	*gvnh_reg;
+	char		varstr[MAX_MIDENT_LEN + 1];
 	gd_region	*reg;
 	DCL_THREADGBL_ACCESS;
 
@@ -98,13 +100,22 @@ STATICFNDEF void op_gvname_common(int count, int hash_code, mval *val_arg, va_li
 	val = val_arg;
 	count -= 2;
 	gvname.hash_code = hash_code;
-	gvname.var_name = val->str;
+	/* GV_BIND_NAME_AND_ROOT_SEARCH invokes "gv_bind_name" which does a "gv_init_reg". That could in turn invoke
+	 * "gvcst_init_statsDB" which does a "gvcst_get" and that could invoke "stp_gcol" (through the ENSURE_STP_FREE_SPACE
+	 * macro). This garbage collection could move mvals around. "val->str" would be correctly repointed since "val" is
+	 * known to "stp_gcol" but if gvname.var_name is a copy of val->str, it would not be repointed and so later usages
+	 * of "gvname" in "gv_bind_name" could point to garbage contents. Hence take a copy of the variable in the C-stack
+	 * and point to it instead of val->str.addr.
+	 */
+	gvname.var_name.len = val->str.len;
+	memcpy(varstr, val->str.addr, gvname.var_name.len);
+	gvname.var_name.addr = varstr;
+	TREF(gd_targ_addr) = gd_header;		/* needed by name-level $order/$zprevious and various other functions */
 	/* Bind the unsubscripted global name to corresponding region in the global directory map */
 	GV_BIND_NAME_AND_ROOT_SEARCH(gd_header, &gvname, gvnh_reg);
-	TREF(gd_targ_addr) = gd_header;		/* needed by name-level $order/$zprevious and various other functions */
 	/* gv_cur_region will not be set in case gvnh_reg->gvspan is non-NULL. So use region from gvnh_reg */
 	reg = gvnh_reg->gd_reg;
-	DEBUG_ONLY(bgormm = ((dba_bg == REG_ACC_METH(reg)) || (dba_mm == REG_ACC_METH(reg)));)
+	DEBUG_ONLY(bgormm = IS_REG_BG_OR_MM(reg);)
 	assert(bgormm || !dollar_tlevel);
 	assert(NULL != gv_target);
 	assert(gv_currkey->end);
diff --git a/sr_port/op_gvnext.c b/sr_port/op_gvnext.c
index d2c9ec9..cd4ddac 100755
--- a/sr_port/op_gvnext.c
+++ b/sr_port/op_gvnext.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2014 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -71,7 +72,7 @@ void op_gvnext(mval *v)
 		} else
 			*(gv_currkey->base + gv_currkey->prev) = 01;
 	}
-	if ((dba_bg == acc_meth) || (dba_mm == acc_meth))
+	if (IS_ACC_METH_BG_OR_MM(acc_meth))
 	{
 		gvnh_reg = TREF(gd_targ_gvnh_reg);
 		if (NULL == gvnh_reg)
diff --git a/sr_port/op_gvorder.c b/sr_port/op_gvorder.c
index 417ec45..a5e5978 100755
--- a/sr_port/op_gvorder.c
+++ b/sr_port/op_gvorder.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2014 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -29,31 +30,41 @@
 #include "targ_alloc.h"		/* for GV_BIND_SUBSREG macro which needs "targ_alloc" prototype */
 #include "gtmimagename.h"
 #include "mvalconv.h"
+#include "gdscc.h"			/* needed for tp.h */
+#include "gdskill.h"			/* needed for tp.h */
+#include "buddy_list.h"		/* needed for tp.h */
+#include "hashtab_int4.h"		/* needed for tp.h */
+#include "filestruct.h"		/* needed for jnl.h */
+#include "jnl.h"			/* needed for tp.h */
+#include "tp.h"
 
-GBLREF gv_namehead	*gv_target;
-GBLREF gv_key		*gv_currkey;
-GBLREF gv_key		*gv_altkey;
 GBLREF gd_region	*gv_cur_region;
+GBLREF gv_key		*gv_altkey, *gv_currkey;
+GBLREF gv_namehead	*gv_target;
 GBLREF sgmnt_addrs	*cs_addrs;
+GBLREF sgmnt_data_ptr_t	cs_data;
+GBLREF sgm_info		*sgm_info_ptr;
 GBLREF spdesc		stringpool;
 
 /* op_zprevious should generally be maintained in parallel */
 
 void op_gvorder(mval *v)
 {
-	int4			n;
-	int			min_reg_index, reg_index, res;
-	int			i, mini, maxi;
-	mname_entry		gvname;
-	mval			tmpmval, *datamval;
-	enum db_acc_method	acc_meth;
 	boolean_t		found, ok_to_change_currkey;
-	gd_binding		*gd_map_start, *map, *map_top;
+	enum db_acc_method	acc_meth;
 	gd_addr			*gd_targ;
-	gv_namehead		*gvt;
+	gd_binding		*gd_map_start, *map, *map_top;
+	gd_region		*save_gv_cur_region;
+	gv_key			save_currkey[DBKEYALLOC(MAX_KEY_SZ)];
+	gv_namehead		*gvt, *save_gv_target;
 	gvnh_reg_t		*gvnh_reg;
 	gvnh_spanreg_t		*gvspan;
+	int			i, maxi, min_reg_index, mini, reg_index, res;
+	int4			n;
+	mname_entry		gvname;
 	mstr			opstr;
+	mval			tmpmval, *datamval;
+	sgm_info		*save_sgm_info_ptr;
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
@@ -79,7 +90,7 @@ void op_gvorder(mval *v)
 	}
 	if (gv_currkey->prev)
 	{
-		if ((dba_bg == acc_meth) || (dba_mm == acc_meth))
+		if (IS_ACC_METH_BG_OR_MM(acc_meth))
 		{
 			gvnh_reg = TREF(gd_targ_gvnh_reg);
 			if (NULL == gvnh_reg)
@@ -132,101 +143,114 @@ void op_gvorder(mval *v)
 				gv_currkey->base[gv_currkey->prev] = STR_SUB_PREFIX;
 			}
 		}
-	} else	/* the following section is for $O(^gname) */
+	} else	/* the following section is for $O(^gname) : name-level $order */
 	{
 		assert(2 < gv_currkey->end);
 		assert(gv_currkey->end < (MAX_MIDENT_LEN + 3));	/* until names are not in midents */
 		assert(KEY_DELIMITER == gv_currkey->base[gv_currkey->end]);
 		assert(KEY_DELIMITER == gv_currkey->base[gv_currkey->end - 1]);
+		SAVE_REGION_INFO(save_currkey, save_gv_target, save_gv_cur_region, save_sgm_info_ptr);
+		if (STR_SUB_ESCAPE == save_currkey->base[gv_currkey->end - 2])
+			save_currkey->base[gv_currkey->end - 2] = KEY_DELIMITER;	/* strip the byte added to get past curr */
 		gd_targ = TREF(gd_targ_addr);
 		gd_map_start = gd_targ->maps;
 		map_top = gd_map_start + gd_targ->n_maps;
-		map = gv_srch_map(gd_targ, (char *)&gv_currkey->base[0], gv_currkey->end - 1);
+		map = gv_srch_map(gd_targ, (char *)&gv_currkey->base[0], gv_currkey->end - 1, SKIP_BASEDB_OPEN_FALSE);
 		for ( ; map < map_top; ++map)
 		{
 			gv_cur_region = map->reg.addr;
-			if (!gv_cur_region->open)
-				gv_init_reg(gv_cur_region);
-			change_reg();
-			acc_meth = REG_ACC_METH(gv_cur_region);
-			/* search region, entries in directory tree could have empty GVT in which case move on to next entry */
-			for ( ; ; )
-			{
-				if ((dba_bg == acc_meth) || (dba_mm == acc_meth))
+			/* If region corresponding to the map is a statsDB region (lowercase region name) then it could contain
+			 * special globals ^%Y* (e.g. ^%YGS) which we don't want to be visible in name-level $order.
+			 * So skip the region altogether.
+			 */
+			if (IS_BASEDB_REGNAME(gv_cur_region))
+			{	/* Non-statsDB region */
+				if (!gv_cur_region->open)
+					gv_init_reg(gv_cur_region);
+				change_reg();
+				/* Entries in directory tree of region could have empty GVT in which case move on to next entry */
+				acc_meth = REG_ACC_METH(gv_cur_region);
+				for ( ; ; )
 				{
-					gv_target = cs_addrs->dir_tree;
-					found = gvcst_order();
-				} else if (acc_meth == dba_cm)
-					found = gvcmx_order();
-				else
-					found = gvusr_order();
-				if (!found)
-					break;
-				/* At this point, gv_altkey contains the result of the gvcst_order */
-				assert(1 < gv_altkey->end);
-				assert((MAX_MIDENT_LEN + 2) > gv_altkey->end);	/* until names are not in midents */
-				res = memcmp(gv_altkey->base, map->gvkey.addr, gv_altkey->end);
-				assert((0 != res) || (gv_altkey->end <= map->gvkey_len));
-				if ((0 < res) || ((0 == res) && (map->gvkey_len == (map->gvname_len + 1))))
-				{	/* The global name we found is greater than the maximum value in this map OR
-					 * it is exactly equal to the upper bound of this map so this name cannot be
-					 * found in current map for sure. Move on to next map.
-					 */
-					found = FALSE;
-					break;
-				}
-				gvname.var_name.addr = (char *)&gv_altkey->base[0];
-				gvname.var_name.len = gv_altkey->end - 1;
-				if (dba_cm == acc_meth)
-					break;
-				COMPUTE_HASH_MNAME(&gvname);
-				GV_BIND_NAME_AND_ROOT_SEARCH(gd_targ, &gvname, gvnh_reg);	/* updates "gv_currkey" */
-				gvspan = gvnh_reg->gvspan;
-				assert((NULL != gvspan) || (gv_cur_region == map->reg.addr));
-				if (NULL != gvspan)
-				{	/* gv_target would NOT have been initialized by GV_BIND_NAME in this case.
-					 * So finish that initialization.
-					 */
-					datamval = &tmpmval;
-					/* The below macro finishes the task of GV_BIND_NAME_AND_ROOT_SEARCH
-					 * 	(e.g. setting gv_cur_region for spanning globals)
-					 */
-					GV_BIND_SUBSNAME_IF_GVSPAN(gvnh_reg, gd_targ, gv_currkey, gvnh_reg->gd_reg);
-					op_gvdata(datamval);
-					if (MV_FORCE_INT(datamval))
+					if (IS_ACC_METH_BG_OR_MM(acc_meth))
+					{
+						gv_target = cs_addrs->dir_tree;
+						found = gvcst_order();
+					} else if (acc_meth == dba_cm)
+						found = gvcmx_order();
+					else
+						found = gvusr_order();
+					if (!found)
 						break;
-					if (TREF(want_empty_gvts))
- 					{	/* For effective reorg truncates, we need to move empty data blocks in reorg,
-						 * so it sets want_empty_gvts before calling gv_select which then calls op_gvorder
-						 * Check if any of the spanned regions have a non-zero gv_target->root.
-						 * If so, treat it as if op_gvdata is non-zero. That is the only way truncate
-						 * can work on this empty GVT.
+					/* At this point, gv_altkey contains the result of the gvcst_order */
+					assert(1 < gv_altkey->end);
+					assert((MAX_MIDENT_LEN + 2) > gv_altkey->end);	/* until names are not in midents */
+					res = memcmp(gv_altkey->base, map->gvkey.addr, gv_altkey->end);
+					assert((0 != res) || (gv_altkey->end <= map->gvkey_len));
+					if ((0 < res) || ((0 == res) && (map->gvkey_len == (map->gvname_len + 1))))
+					{	/* The global name we found is greater than the maximum value in this map OR
+						 * it is exactly equal to the upper bound of this map so this name cannot be
+						 * found in current map for sure. Move on to next map.
 						 */
-						maxi = gvspan->max_reg_index;
-						mini = gvspan->min_reg_index;
-						for (i = mini; i <= maxi; i++)
-						{
-							assert(i >= 0);
-							assert(i < gd_targ->n_regions);
-							gvt = GET_REAL_GVT(gvspan->gvt_array[i - mini]);
-							if ((NULL != gvt) && (0 != gvt->root))
-								break;
-						}
-						if (i <= maxi)
-							break;	/* found at least one spanned region with non-zero gvt->root */
+						found = FALSE;
+						break;
 					}
-				} else
-				{	/* else gv_target->root would have been initialized by GV_BIND_NAME_AND_ROOT_SEARCH */
-					/* For effective truncates , we want to be able to move empty data blocks in reorg.
-					 * Reorg truncate calls gv_select which in turn calls op_gvorder.
-					 */
-					if ((0 != gv_target->root) && (TREF(want_empty_gvts) || (0 != gvcst_data())))
+					gvname.var_name.addr = (char *)&gv_altkey->base[0];
+					gvname.var_name.len = gv_altkey->end - 1;
+					if (dba_cm == acc_meth)
 						break;
+					COMPUTE_HASH_MNAME(&gvname);
+					GV_BIND_NAME_AND_ROOT_SEARCH(gd_targ, &gvname, gvnh_reg);	/* updates "gv_currkey" */
+					gvspan = gvnh_reg->gvspan;
+					assert((NULL != gvspan) || (gv_cur_region == map->reg.addr));
+					if (NULL != gvspan)
+					{	/* gv_target would NOT have been initialized by GV_BIND_NAME in this case.
+						 * So finish that initialization.
+						 */
+						datamval = &tmpmval;
+						/* The below macro finishes the task of GV_BIND_NAME_AND_ROOT_SEARCH
+						 * 	(e.g. setting gv_cur_region for spanning globals)
+						 */
+						GV_BIND_SUBSNAME_IF_GVSPAN(gvnh_reg, gd_targ, gv_currkey, gvnh_reg->gd_reg);
+						op_gvdata(datamval);
+						if (MV_FORCE_INT(datamval))
+							break;
+						if (TREF(want_empty_gvts))
+						{	/* For effective reorg truncates, we need to move empty data blocks in
+							 * reorg, so it sets want_empty_gvts before calling gv_select which then
+							 * calls op_gvorder. Check if any of the spanned regions have a non-zero
+							 * gv_target->root. If so, treat it as if op_gvdata is non-zero. That is
+							 * the only way truncate can work on this empty GVT.
+							 */
+							maxi = gvspan->max_reg_index;
+							mini = gvspan->min_reg_index;
+							for (i = mini; i <= maxi; i++)
+							{
+								assert(i >= 0);
+								assert(i < gd_targ->n_regions);
+								gvt = GET_REAL_GVT(gvspan->gvt_array[i - mini]);
+								if ((NULL != gvt) && (0 != gvt->root))
+									break;
+							}
+							if (i <= maxi)
+								break;	/* Found one spanned region with non-zero gvt->root */
+						}
+					} else
+					{	/* else gv_target->root would have been initialized by
+						 * GV_BIND_NAME_AND_ROOT_SEARCH.
+						 */
+						/* For effective truncates , we want to be able to move empty data blocks in reorg.
+						 * Reorg truncate calls gv_select which in turn calls op_gvorder.
+						 */
+						if ((0 != gv_target->root) && (TREF(want_empty_gvts) || (0 != gvcst_data())))
+							break;
+					}
+					GVKEY_INCREMENT_ORDER(gv_currkey);
 				}
-				GVKEY_INCREMENT_ORDER(gv_currkey);
-			}
-			if (found)
-				break;
+				if (found)
+					break;
+			} else
+				found = FALSE;	/* Skip statsDB region completely. So set found to FALSE */
 			/* do not invoke GVKEY_DECREMENT_ORDER on last map since it contains 0xFFs and will fail an assert */
 			if ((map + 1) != map_top)
 			{
@@ -239,11 +263,6 @@ void op_gvorder(mval *v)
 				GVKEY_DECREMENT_ORDER(gv_currkey); /* back off 1 spot from map */
 			}
 		}
-		/* Reset gv_currkey as we have potentially skipped one or more regions so we no
-		 * longer can expect gv_currkey/gv_cur_region/gv_target to match each other.
-		 */
-		gv_currkey->end = 0;
-		gv_currkey->base[0] = 0;
 		v->mvtype = 0; /* so stp_gcol (if invoked below) can free up space currently occupied by (BYPASSOK)
 				* this to-be-overwritten mval */
 		if (found)
@@ -264,6 +283,7 @@ void op_gvorder(mval *v)
 		} else
 			v->str.len = 0;
 		v->mvtype = MV_STR; /* initialize mvtype now that mval has been otherwise completely set up */
+		RESTORE_REGION_INFO(save_currkey, save_gv_target, save_gv_cur_region, save_sgm_info_ptr);
 	}
 	return;
 }
diff --git a/sr_port/op_gvput.c b/sr_port/op_gvput.c
index df0be49..9792231 100755
--- a/sr_port/op_gvput.c
+++ b/sr_port/op_gvput.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2012 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -33,6 +34,7 @@ GBLREF bool		gv_replopen_error;
 
 error_def(ERR_DBPRIVERR);
 error_def(ERR_GVIS);
+error_def(ERR_PCTYRESERVED);
 error_def(ERR_REC2BIG);
 
 void put_var(mval *var);
@@ -45,63 +47,66 @@ void op_gvput(mval *var)
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
-	if ((!TREF(gv_last_subsc_null) && !TREF(gv_some_subsc_null)) || (ALWAYS == gv_cur_region->null_subs))
+	/* If specified var name is global ^%Y*, the name is illegal to use in a SET or KILL command, only GETs are allowed.
+	 * The only exception is if we are adding a ^%YGS record into the statsdb from "gvcst_init_statsDB" but in that
+	 * case we would have reg->read_only set to FALSE for a statsdb region name. Account for that.
+	 */
+	if (((RESERVED_NAMESPACE_LEN <= gv_currkey->end) && (0 == MEMCMP_LIT(gv_currkey->base, RESERVED_NAMESPACE)))
+			&& (!IS_STATSDB_REGNAME(gv_cur_region) || gv_cur_region->read_only))
+		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(1) ERR_PCTYRESERVED);
+	if (gv_cur_region->read_only)
+		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_DBPRIVERR, 2, DB_LEN_STR(gv_cur_region));
+	if ((TREF(gv_last_subsc_null) || TREF(gv_some_subsc_null)) && (ALWAYS != gv_cur_region->null_subs))
+		sgnl_gvnulsubsc();
+	assert(gv_currkey->end + 1 <= gv_cur_region->max_key_size);
+	MV_FORCE_STR(var);
+	if (var->str.len <= gv_cur_region->max_rec_size)
 	{
-		if (!gv_cur_region->read_only)
+		switch (gv_cur_region->dyn.addr->acc_meth)
+		{
+			case dba_bg:
+			case dba_mm:
+				gvcst_put(var);
+				break;
+			case dba_cm:
+				gvcmx_put(var);
+				break;
+			case dba_usr:
+				gvusr_put(var);
+				break;
+			default:
+				assertpro(FALSE);
+		}
+		if (NULL == gv_cur_region->dyn.addr->repl_list)
+			return;
+		gv_replication_error = gv_replopen_error;
+		gv_replopen_error = FALSE;
+		save_reg = gv_cur_region;
+		while (gv_cur_region = gv_cur_region->dyn.addr->repl_list) /* set replicated segments */
 		{
-			assert(gv_currkey->end + 1 <= gv_cur_region->max_key_size);
-			MV_FORCE_STR(var);
-			if (VMS_ONLY(gv_currkey->end + 1 + SIZEOF(rec_hdr) +) var->str.len <= gv_cur_region->max_rec_size)
+			if (gv_cur_region->open && !gv_cur_region->read_only
+				&& ((temp = gv_currkey->end + 1) <= gv_cur_region->max_key_size)
+				&& (temp + var->str.len + SIZEOF(rec_hdr) <= gv_cur_region->max_rec_size))
 			{
-				switch (gv_cur_region->dyn.addr->acc_meth)
-				{
-					case dba_bg:
-					case dba_mm:
-						gvcst_put(var);
-						break;
-					case dba_cm:
-						gvcmx_put(var);
-						break;
-					case dba_usr:
-						gvusr_put(var);
-						break;
-					default:
-						GTMASSERT;
-				}
-				if (NULL == gv_cur_region->dyn.addr->repl_list)
-					return;
-				gv_replication_error = gv_replopen_error;
-				gv_replopen_error = FALSE;
-				save_reg = gv_cur_region;
-				while (gv_cur_region = gv_cur_region->dyn.addr->repl_list) /* set replicated segments */
-				{
-					if (gv_cur_region->open && !gv_cur_region->read_only
-						&& ((temp = gv_currkey->end + 1) <= gv_cur_region->max_key_size)
-						&& (temp + var->str.len + SIZEOF(rec_hdr) <= gv_cur_region->max_rec_size))
-					{
-						change_reg();
-						put_var(var);
-					} else
-						gv_replication_error = TRUE;
-				}
-				gv_cur_region = save_reg;
 				change_reg();
-				if (gv_replication_error)
-					sgnl_gvreplerr();
-				else
-					return;
+				put_var(var);
 			} else
-			{
-				if (0 == (end = format_targ_key(buff, MAX_ZWR_KEY_SZ, gv_currkey, TRUE)))
-					end = &buff[MAX_ZWR_KEY_SZ - 1];
-				rts_error(VARLSTCNT(10) ERR_REC2BIG, 4, VMS_ONLY(gv_currkey->end + 1 + SIZEOF(rec_hdr) +)
-					  var->str.len, (int4)gv_cur_region->max_rec_size,
-					  REG_LEN_STR(gv_cur_region), ERR_GVIS, 2, end - buff, buff);
-			}
-		} else
-			rts_error(VARLSTCNT(4) ERR_DBPRIVERR, 2, DB_LEN_STR(gv_cur_region));
+				gv_replication_error = TRUE;
+		}
+		gv_cur_region = save_reg;
+		change_reg();
+		if (gv_replication_error)
+			sgnl_gvreplerr();
+		else
+			return;
 	} else
-		sgnl_gvnulsubsc();
+	{
+		if (0 == (end = format_targ_key(buff, MAX_ZWR_KEY_SZ, gv_currkey, TRUE)))
+			end = &buff[MAX_ZWR_KEY_SZ - 1];
+		gv_currkey->end = 0;
+		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(10) ERR_REC2BIG, 4, var->str.len, (int4)gv_cur_region->max_rec_size,
+			  REG_LEN_STR(gv_cur_region), ERR_GVIS, 2, end - buff, buff);
+	}
 }
 
 void put_var(mval *var)
diff --git a/sr_port/op_gvzwithdraw.c b/sr_port/op_gvzwithdraw.c
index d63242a..b3451ae 100755
--- a/sr_port/op_gvzwithdraw.c
+++ b/sr_port/op_gvzwithdraw.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -42,6 +43,7 @@ GBLREF	jnl_gbls_t	jgbl;
 #endif
 
 error_def(ERR_DBPRIVERR);
+error_def(ERR_PCTYRESERVED);
 
 void with_var(void);
 
@@ -51,6 +53,9 @@ void op_gvzwithdraw(void)
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
+	/* If specified var name is global ^%Y*, the name is illegal to use in a SET or KILL command, only GETs are allowed */
+	if ((RESERVED_NAMESPACE_LEN <= gv_currkey->end) && (0 == MEMCMP_LIT(gv_currkey->base, RESERVED_NAMESPACE)))
+		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(1) ERR_PCTYRESERVED);
 	if (gv_cur_region->read_only)
 	{
 		assert(cs_addrs == &FILE_INFO(gv_cur_region)->s_addrs);
@@ -58,7 +63,7 @@ void op_gvzwithdraw(void)
 	}
 	if (TREF(gv_last_subsc_null) && NEVER == gv_cur_region->null_subs)
 		sgnl_gvnulsubsc();
-	if (REG_ACC_METH(gv_cur_region) == dba_bg || REG_ACC_METH(gv_cur_region) == dba_mm)
+	if (IS_REG_BG_OR_MM(gv_cur_region))
 	{
 		/* No special code needed for spanning globals here since we are in the region we want to be
 		 * and all we want to do is kill one node in this region (not a subtree underneath) even if
diff --git a/sr_port/op_hang.c b/sr_port/op_hang.c
index 28e2a4e..5496eb1 100644
--- a/sr_port/op_hang.c
+++ b/sr_port/op_hang.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information 	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -108,6 +108,10 @@ void op_hang(mval* num)
 		{
 			assert(MV_BIAS >= 1000);	/* if formats change overflow may need attention */
 			ms = num->m[1] * (1000 / MV_BIAS);
+#			ifdef _AIX	/* AIX times are a bit waobbly, so nudge any 1sec. hang aiming to landing in the next sec */
+			if (1000 == ms)		/* some apps expect a HANG 1 (1000 MS) to land in the next second */
+				ms +=2;		/* push a bit (in milliseconds) */
+#			endif
 		}
 	} else if (0 == num->sgn) 		/* if sign is not 0 it means num is negative */
 	{
diff --git a/sr_port/op_incrlock.c b/sr_port/op_incrlock.c
index b73c928..fb40a45 100755
--- a/sr_port/op_incrlock.c
+++ b/sr_port/op_incrlock.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001 Sanchez Computer Associates, Inc.	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -30,5 +31,5 @@
  */
 int op_incrlock(int timeout)
 {
-	return (op_lock2(timeout,INCREMENTAL));
+	return (op_lock2(timeout, INCREMENTAL));
 }
diff --git a/sr_port/op_indfnname2.c b/sr_port/op_indfnname2.c
index c034215..8ff03e4 100644
--- a/sr_port/op_indfnname2.c
+++ b/sr_port/op_indfnname2.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2012 Fidelity Information Services, Inc	*
+ * Copyright (c) 2012-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -14,6 +15,8 @@
 #include "mvalconv.h"
 #include "op.h"
 #include "is_canonic_name.h"
+#include "stringpool.h"
+#include "zshow.h"
 
 error_def(ERR_FNNAMENEG);
 error_def(ERR_NOCANONICNAME);
@@ -33,7 +36,7 @@ void op_indfnname2(mval *finaldst, mval *depthval, mval *prechomp)
 	MV_FORCE_STR(prechomp);
 	depth = MV_FORCE_INT(depthval);
 	if (depth < 0)
-		rts_error(VARLSTCNT(1) ERR_FNNAMENEG);
+		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(1) ERR_FNNAMENEG);
 	subscripts = depth + 1;
 	*finaldst = *prechomp;
 	if (subscripts > MAX_LVSUBSCRIPTS)
@@ -41,7 +44,7 @@ void op_indfnname2(mval *finaldst, mval *depthval, mval *prechomp)
 	if (!is_canonic_name(prechomp, &subscripts, &start, &dummy))
 	{	/* op_indfnname should have passed us a valid name */
 		assert(FALSE);
-		rts_error(VARLSTCNT(4) ERR_NOCANONICNAME, 2, prechomp->str.len, prechomp->str.addr);
+		NOCANONICNAME_ERROR(prechomp);
 	}
 	if (start)
 	{	/* indeed have subscripts to remove */
diff --git a/sr_port/op_indtext.c b/sr_port/op_indtext.c
index 57f0356..a406564 100644
--- a/sr_port/op_indtext.c
+++ b/sr_port/op_indtext.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2014 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -28,7 +29,6 @@
 #include "mv_stent.h"
 #include "stack_frame.h"
 
-GBLREF unsigned char 		*source_buffer;
 GBLREF int	 		source_column;
 GBLREF spdesc 			stringpool;
 GBLREF mv_stent			*mv_chain;
diff --git a/sr_port/op_lock.c b/sr_port/op_lock.c
index 210ebfc..0f92f8d 100755
--- a/sr_port/op_lock.c
+++ b/sr_port/op_lock.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2004 Sanchez Computer Associates, Inc.	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -16,7 +17,6 @@
 #include "cmmdef.h"
 #include "op.h"
 
-
 /*
  * -----------------------------------------------
  * Arguments:
@@ -33,5 +33,5 @@
  */
 int op_lock(int timeout)
 {
-	return (op_lock2(timeout,CM_LOCKS));
+	return (op_lock2(timeout, CM_LOCKS));
 }
diff --git a/sr_port/op_merge.c b/sr_port/op_merge.c
index e58af73..bd2ac18 100644
--- a/sr_port/op_merge.c
+++ b/sr_port/op_merge.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information 	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -151,8 +151,7 @@ void op_merge(void)
 			merge_args = 0;	/* Must reset to zero to reuse the Global */
 			return;
 		}
-		nontp_and_bgormm = ((dba_bg == REG_ACC_METH(gv_cur_region)) || (dba_mm == REG_ACC_METH(gv_cur_region)))
-				&& !dollar_tlevel;
+		nontp_and_bgormm = (!dollar_tlevel && IS_REG_BG_OR_MM(gv_cur_region));
 		if (NULL == TREF(gv_mergekey2))
 		{	/* We need to initialize gvn2 (right hand side). */
 			GVKEY_INIT(TREF(gv_mergekey2), DBKEYSIZE(MAX_KEY_SZ));
@@ -251,7 +250,7 @@ void op_merge(void)
 				assert (0 < delta2);
 				GET_NSUBS_IN_GVKEY(mkey->str.addr + org_glvn2_keysz - 2, delta2, nsubs); /* sets "nsubs" */
 				/* Check if the target node in ^gvn1 exceeds max # of subscripts */
-				if (MAX_GVSUBSCRIPTS <= (gvn1subs + gvn2subs + nsubs))
+				if (MAX_GVSUBSCRIPTS <= (gvn1subs + nsubs))
 					rts_error_csa(CSA_ARG(NULL) VARLSTCNT(3) ERR_MERGEINCOMPL, 0, ERR_MAXNRSUBSCRIPTS);
 				/* Save the new source key for next iteration. Do not use gvname_env_save since that relies
 				 * on gv_currkey holding the key to be saved which is not the case here. Also gvname_env_save
@@ -265,7 +264,9 @@ void op_merge(void)
 				{
 					if (NULL != gvnh_reg2)
 					{	/* ^gvn2 spans multiple regions. Find region where the current key was obtained */
-						map = gv_srch_map(gbl2_gd_addr, (char *)&gv_currkey->base[0], gv_currkey->end - 1);
+						map = gv_srch_map(gbl2_gd_addr,
+									(char *)&gv_currkey->base[0], gv_currkey->end - 1,
+									SKIP_BASEDB_OPEN_FALSE);
 						reg2 = map->reg.addr;
 					}
 				}
@@ -423,7 +424,7 @@ void op_merge(void)
 				do
 				{
 					LV_SBS_DEPTH(dst_lv, is_base_var, sbs_depth);
-					if (MAX_LVSUBSCRIPTS <= sbs_depth)
+					if ((MAX_LVSUBSCRIPTS - 1) <= sbs_depth)
 						rts_error_csa(CSA_ARG(NULL) VARLSTCNT(3) ERR_MERGEINCOMPL, 0, ERR_MAXNRSUBSCRIPTS);
 					opstr.addr = (char *)buff;
 					opstr.len = MAX_ZWR_KEY_SZ;
diff --git a/sr_port/op_merge_arg.c b/sr_port/op_merge_arg.c
index 7849a06..8057fee 100755
--- a/sr_port/op_merge_arg.c
+++ b/sr_port/op_merge_arg.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2014 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -103,10 +104,9 @@ void op_merge_arg(int m_opr_type, lv_val *lvp)
 		mglvnp->lclp[IND2] = lvp;
 		break;
 	case MARG2_GBL:
-		if (dba_bg  == gv_cur_region->dyn.addr->acc_meth || dba_mm == gv_cur_region->dyn.addr->acc_meth ||
-		    dba_usr == gv_cur_region->dyn.addr->acc_meth ||
-		    (dba_cm == gv_cur_region->dyn.addr->acc_meth &&
-		     ((link_info *)gv_cur_region->dyn.addr->cm_blk->usr)->query_is_queryget))
+		if (IS_REG_BG_OR_MM(gv_cur_region) || (dba_usr == gv_cur_region->dyn.addr->acc_meth)
+			|| ((dba_cm == gv_cur_region->dyn.addr->acc_meth)
+				&& ((link_info *)gv_cur_region->dyn.addr->cm_blk->usr)->query_is_queryget))
 			gvname_env_save(mglvnp->gblp[IND2]);
 		else
 		{ /* M ^LHS=^RHS where RHS resides on a remote node served by a GTCM server that does not support QUERYGET
diff --git a/sr_port/op_svget.c b/sr_port/op_svget.c
index 4449002..cf2e4b8 100644
--- a/sr_port/op_svget.c
+++ b/sr_port/op_svget.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information 	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -614,4 +614,13 @@ void op_svget(int varnum, mval *v)
 		default:
 			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(1) ERR_INVSVN);
 	}
+	if (!(MVTYPE_IS_STRING(v->mvtype)))
+	{	/* in case op_svget is called at compile time; shouldn't hurt much any time */
+		assert(MVTYPE_IS_NUMERIC(v->mvtype));
+		n2s(v);
+	} else if (!(MVTYPE_IS_NUMERIC(v->mvtype)))
+	{
+		assert(MVTYPE_IS_STRING(v->mvtype));
+		s2n(v);
+	}
 }
diff --git a/sr_port/op_svput.c b/sr_port/op_svput.c
index 4f7d2da..8ee8e44 100644
--- a/sr_port/op_svput.c
+++ b/sr_port/op_svput.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2014 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -156,6 +157,10 @@ void op_svput(int varnum, mval *v)
 					gvinit();
 				if (NULL != gv_target)
 					gv_target->clue.end = 0;
+				/* Reset any cached region-name for $zpeek since gbldir is changing and any same region name
+				 * in the new gbldir should point to a different gd_region structure (and not the cached one).
+				 */
+				TREF(zpeek_regname_len) = 0;
 			}
 			break;
 		case SV_ZMAXTPTIME:
diff --git a/sr_port/op_tcommit.c b/sr_port/op_tcommit.c
index 23ed7e4..a1ad76b 100644
--- a/sr_port/op_tcommit.c
+++ b/sr_port/op_tcommit.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -63,10 +63,9 @@
 #include "process_deferred_stale.h"
 #include "wcs_timer_start.h"
 #include "mupipbckup.h"
+#include "gvcst_protos.h"
 
-#ifdef GTM_SNAPSHOT
 #include "db_snapshot.h"
-#endif
 
 #ifdef GTM_TRIGGER
 #include <rtnhdr.h>		/* for rtn_tabent in gv_trigger.h */
@@ -103,6 +102,9 @@ GBLREF	boolean_t		skip_INVOKE_RESTART;
 GBLREF	int4			gtm_trigger_depth;
 GBLREF	int4			tstart_trigger_depth;
 #endif
+#ifdef DEBUG
+GBLREF	boolean_t		forw_recov_lgtrig_only;
+#endif
 
 error_def(ERR_GBLOFLOW);
 error_def(ERR_GVIS);
@@ -189,7 +191,7 @@ enum cdb_sc	op_tcommit(void)
 	enum cdb_sc		status;
 	cw_set_element		*cse, *last_cw_set_before_maps, *csetemp, *first_cse;
 	blk_ident		*blk, *blk_top, *next_blk;
-	block_id		bit_map, next_bm, new_blk, temp_blk;
+	block_id		bit_map, next_bm, new_blk;
 	cache_rec_ptr_t		cr;
 	kill_set		*ks;
 	off_chain		chain1;
@@ -204,7 +206,6 @@ enum cdb_sc	op_tcommit(void)
 	boolean_t		before_image_needed;
 	boolean_t		skip_invoke_restart;
 #	ifdef DEBUG
-	boolean_t		forw_recov_lgtrig_only;
 	enum cdb_sc		prev_status;
 #	endif
 	DCL_THREADGBL_ACCESS;
@@ -222,51 +223,43 @@ enum cdb_sc	op_tcommit(void)
 	assert(0 == jnl_fence_ctl.level);
 	status = cdb_sc_normal;
 	tp_kill_bitmaps = FALSE;
-	GTMTRIG_ONLY(
-		/* The value of $ztlevel at the time of the TSTART, i.e. tstart_trigger_depth, can never be GREATER than
-		 * the current $ztlevel as otherwise a TPQUIT error would have been issued as part of the QUIT of the
-		 * M frame of the TSTART (which has a deeper trigger depth). Assert that.
-		 */
-		assert(tstart_trigger_depth <= gtm_trigger_depth);
-	)
+#	ifdef GTM_TRIGGER
+	/* The value of $ztlevel at the time of the TSTART, i.e. tstart_trigger_depth, can never be GREATER than
+	 * the current $ztlevel as otherwise a TPQUIT error would have been issued as part of the QUIT of the
+	 * M frame of the TSTART (which has a deeper trigger depth). Assert that.
+	 */
+	assert(tstart_trigger_depth <= gtm_trigger_depth);
+#	endif
 	if (1 == dollar_tlevel)		/* real commit */
 	{
-		GTMTRIG_ONLY(
-			if (gtm_trigger_depth != tstart_trigger_depth)
-			{	/* TCOMMIT to $tlevel=0 is being attempted at a trigger depth which is NOT EQUAL TO the trigger
-				 * depth at the time of the TSTART. This means we have a gvcst_put/gvcst_kill frame in the
-				 * C stack that invoked us through gtm_trigger and is in an incomplete state waiting for the
-				 * trigger invocation to be done before completing the explicit (outside-trigger) update.
-				 * Cannot commit such a transaction. Issue error.
-				 */
-				rts_error_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_TRIGTCOMMIT, 2, gtm_trigger_depth,
-						tstart_trigger_depth);
-			}
-			if (tp_pointer->cannot_commit)
-			{	/* If this TP transaction was implicit, any unhandled error when crossing the trigger boundary
-				 * would have caused a rethrow of the error in the M frame that held the non-TP update which
-				 * would then have invoked "error_return" that would in turn have rolled back the implicit TP
-				 * transaction so we should never see an implicit TP inside op_tcommit.
-				 */
-				assert(!tp_pointer->implicit_tstart);
-				rts_error_csa(CSA_ARG(NULL) VARLSTCNT(1) ERR_TCOMMITDISALLOW);
-			}
-		)
+#		ifdef GTM_TRIGGER
+		if (gtm_trigger_depth != tstart_trigger_depth)
+		{	/* TCOMMIT to $tlevel=0 is being attempted at a trigger depth which is NOT EQUAL TO the trigger
+			 * depth at the time of the TSTART. This means we have a gvcst_put/gvcst_kill frame in the
+			 * C stack that invoked us through gtm_trigger and is in an incomplete state waiting for the
+			 * trigger invocation to be done before completing the explicit (outside-trigger) update.
+			 * Cannot commit such a transaction. Issue error.
+			 */
+			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_TRIGTCOMMIT, 2, gtm_trigger_depth,
+					tstart_trigger_depth);
+		}
+		if (tp_pointer->cannot_commit)
+		{	/* If this TP transaction was implicit, any unhandled error when crossing the trigger boundary
+			 * would have caused a rethrow of the error in the M frame that held the non-TP update which
+			 * would then have invoked "error_return" that would in turn have rolled back the implicit TP
+			 * transaction so we should never see an implicit TP inside op_tcommit.
+			 */
+			assert(!tp_pointer->implicit_tstart);
+			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(1) ERR_TCOMMITDISALLOW);
+		}
+#		endif
 		save_cur_region = gv_cur_region;
 #		ifdef DEBUG
-		if ((NULL != gv_currkey) && (0 != gv_currkey->base[0]) && ((NULL == gv_target) || !gv_target->gvname.var_name.len))
-		{	/* This is a case where forward recovery is playing a TLGTRIG/ULGTRIG only transaction,
-			 * no other global references. In that case, no gv_bind_name would have happened and so
-			 * gv_target could be NULL (because of a MUR_CHANGE_REG done at the start of this transaction)
-			 * or gv_target could be equal to csa->dir_tree (done in mur_forward). Assert accordingly.
-			 */
-			assert(jgbl.forw_phase_recovery);
-			forw_recov_lgtrig_only = TRUE;
-		} else
-		{
+		/* With jgbl.forw_phase_recovery, it is possible gv_currkey is non-NULL and gv_target is NULL
+		 * (due to a MUR_CHANGE_REG) so do not invoke the below macro in that case.
+		 */
+		if (!forw_recov_lgtrig_only && (!jgbl.forw_phase_recovery || (NULL != gv_target)))
 			DBG_CHECK_GVTARGET_GVCURRKEY_IN_SYNC(CHECK_CSA_TRUE);
-			forw_recov_lgtrig_only = FALSE;
-		}
 #		endif
 		if (NULL != first_sgm_info)	/* if (database work in the transaction) */
 		{
@@ -278,6 +271,7 @@ enum cdb_sc	op_tcommit(void)
 				csd = cs_data;
 				cnl = csa->nl;
 				is_mm = (dba_mm == csa->hdr->acc_meth);
+				csa->tp_hint = 0;	/* will be set to non-zero later if we invoke "bm_getfree" */
 				si->cr_array_index = 0;
 #				ifdef DEBUG
 				if (WBTEST_ENABLED(WBTEST_MM_CONCURRENT_FILE_EXTEND)
@@ -329,7 +323,6 @@ enum cdb_sc	op_tcommit(void)
 					 */
 					csa->backup_in_prog = (BACKUP_NOT_IN_PROGRESS != cnl->nbb);
 					jbp = (JNL_ENABLED(csa) && csa->jnl_before_image) ? csa->jnl->jnl_buff : NULL;
-#					ifdef GTM_SNAPSHOT
 					if (SNAPSHOTS_IN_PROG(cnl))
 					{
 						/* If snapshot context is not already created, then create one now to be used
@@ -340,7 +333,6 @@ enum cdb_sc	op_tcommit(void)
 						SS_INIT_IF_NEEDED(csa, cnl);
 					} else
 						CLEAR_SNAPSHOTS_IN_PROG(csa);
-#					endif
 					read_before_image = ((NULL != jbp) || csa->backup_in_prog || SNAPSHOTS_IN_PROG(csa));
 					/* The following section allocates new blocks required by the transaction it is done
 					 * before going crit in order to reduce the change of having to wait on a read while crit.
@@ -365,6 +357,20 @@ enum cdb_sc	op_tcommit(void)
 							TRAVERSE_TO_LATEST_CSE(first_cse);
 							old_db_addrs[0] = csa->db_addrs[0];
 							old_db_addrs[1] = csa->db_addrs[1];
+							if (0 == csa->tp_hint)
+							{	/* We are about to do a "bm_getfree" call for this database
+								 * for the first time in this TP transaction. Copy over the
+								 * allocation hint from shared memory.
+								 */
+								csa->tp_hint = cnl->tp_hint;
+							}
+							/* cse->blk could be a real block or a chain; we can't use a chain but
+							 * the following statement is unconditional because, in general, the region
+							 * hint works at least as well as the block, which is what we use in non-TP
+							 * we assign the hints in op_tcommit just before we grab crit to
+							 * maximize chances that the blocks we assign remain available in tp_tend
+							 */
+							cse->blk = ++csa->tp_hint;
 							while (FILE_EXTENDED == (new_blk = bm_getfree(cse->blk, &blk_used,
 								cw_depth, first_cse, &si->cw_set_depth)))
 							{
@@ -555,11 +561,12 @@ enum cdb_sc	op_tcommit(void)
 			}		/* for (all segments in the transaction) */
 			assert(NULL == temp_si || NULL == si->kill_set_head);
 		}	/* if (kills in the transaction) */
-		tp_clean_up(FALSE);	/* Not the rollback type of cleanup */
+		tp_clean_up(TP_COMMIT);
 		gv_cur_region = save_cur_region;
 		TP_CHANGE_REG(gv_cur_region);
 #		ifdef DEBUG
-		if (!forw_recov_lgtrig_only)
+		/* See comment in similar code before tp_tend call above */
+		if (!forw_recov_lgtrig_only && (!jgbl.forw_phase_recovery || (NULL != gv_target)))
 			DBG_CHECK_GVTARGET_GVCURRKEY_IN_SYNC(CHECK_CSA_TRUE);
 #		endif
 		/* Cancel or clear any pending TP timeout only if real commit (i.e. outermost commit) */
@@ -569,7 +576,14 @@ enum cdb_sc	op_tcommit(void)
 	assert(dollar_tlevel);
 	tp_unwind(dollar_tlevel - 1, COMMIT_INVOCATION, NULL);
 	if (!dollar_tlevel) /* real commit */
+	{
+		/* Transaction is complete as the outer transaction has been committed. Check now to see if any statsDB
+		 * region initializations were deferred and drive them now if they were.
+		 */
+		if (NULL != TREF(statsDB_init_defer_anchor))
+			gvcst_deferred_init_statsDB();
 		JOBINTR_TP_RETHROW; /* rethrow job interrupt($ZINT) if $ZTEXIT, when coerced to boolean, is true */
+	}
 	GTMTRIG_ONLY(DBGTRIGR((stderr, "op_tcommit: Return NORMAL status\n"));)
 	return cdb_sc_normal;
 }
diff --git a/sr_port/op_trollback.c b/sr_port/op_trollback.c
index b26500e..fd943e0 100755
--- a/sr_port/op_trollback.c
+++ b/sr_port/op_trollback.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -30,6 +31,7 @@
 #include "tp_unwind.h"
 #include "op.h"
 #include "jobinterrupt_process.h"
+#include "gvcst_protos.h"
 
 GBLREF	uint4			dollar_tlevel;
 GBLREF	uint4			dollar_trestart;
@@ -73,7 +75,9 @@ void	op_trollback(int rb_levels)		/* rb_levels -> # of transaction levels by whi
 	sgmnt_addrs	*csa;
 	tp_region	*tr;
 	int		tl;
+	DCL_THREADGBL_ACCESS;
 
+	SETUP_THREADGBL_ACCESS;
 	if (implicit_trollback)
 	{
 		/* Unlike the call to "op_trollback" from generated code, this invocation of "op_trollback" is from C runtime code.
@@ -101,7 +105,7 @@ void	op_trollback(int rb_levels)		/* rb_levels -> # of transaction levels by whi
 		/* Do a rollback type cleanup (invalidate gv_target clues of read as well as
 		 * updated blocks). This is typically needed for a restart.
 		 */
-		tp_clean_up(TRUE);
+		tp_clean_up(TP_ROLLBACK);
 		for (tr = tp_reg_list;  NULL != tr;  tr = tr->fPtr)
 		{
 			curreg = tr->reg;
@@ -151,6 +155,11 @@ void	op_trollback(int rb_levels)		/* rb_levels -> # of transaction levels by whi
 		dollar_trestart = 0;
 		if (!reg_reset)
 			RESTORE_GV_CUR_REGION;
+		/* Transaction is complete as the outer transaction has been rolled back. Check now to see if any statsDB
+		 * region initializations were deferred and drive them now if they were.
+		 */
+		if (NULL != TREF(statsDB_init_defer_anchor))
+			gvcst_deferred_init_statsDB();
 		JOBINTR_TP_RETHROW; /* rethrow job interrupt($ZINT) if $ZTEXIT, when coerced to boolean, is true */
 	} else
 	{
diff --git a/sr_port/op_tstart.c b/sr_port/op_tstart.c
index 8f697a5..1787e12 100644
--- a/sr_port/op_tstart.c
+++ b/sr_port/op_tstart.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -110,6 +110,7 @@ GBLREF	boolean_t		tp_has_kill_t_cse; /* cse->mode of kill_t_write or kill_t_crea
 #endif
 #ifdef DEBUG
 GBLREF	sgmnt_addrs		*reorg_encrypt_restart_csa;
+GBLREF	uint4			update_trans;
 #endif
 
 #define NORESTART -1
@@ -160,6 +161,7 @@ void	op_tstart(int implicit_flag, ...) /* value of $T when TSTART */
 	DBGFPF((stderr, "\n\nop_tstart: Entered - dollar_tlevel: %d, implicit_flag: %d, mpc: 0x"lvaddr"\n", dollar_tlevel,
 		implicit_flag, frame_pointer->mpc));
 #	endif
+	assert(dollar_tlevel || implicit_tstart || !update_trans);
 	if (implicit_tstart)
 		/* An implicit op_tstart is being done. In this case, even if we are in direct mode, we want to do
 		 * regular TPHOLD processing (no setting of tphold in the parent frame and shifting of all mv_stents).
@@ -178,8 +180,7 @@ void	op_tstart(int implicit_flag, ...) /* value of $T when TSTART */
 		{
 			for (r_local = addr_ptr->regions, r_top = r_local + addr_ptr->n_regions; r_local < r_top; r_local++)
 			{
-				if (r_local->open && !r_local->was_open &&
-				    (dba_bg == REG_ACC_METH(r_local) || dba_mm == REG_ACC_METH(r_local)))
+				if (r_local->open && !r_local->was_open && IS_REG_BG_OR_MM(r_local))
 				{	/* Let's initialize those regions but only if it came through gvcst_init_sysops
 					 * (being a bg or mm region).
 					 */
diff --git a/sr_port/op_view.c b/sr_port/op_view.c
old mode 100755
new mode 100644
index 3e11480..95d65e4
--- a/sr_port/op_view.c
+++ b/sr_port/op_view.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -20,6 +20,7 @@
 #include "gtm_stdio.h"
 
 #include "gtmio.h"
+#include "io.h"
 #include "util.h"
 #include "have_crit.h"
 #include "gdsroot.h"
@@ -76,6 +77,9 @@
 #include "gtmimagename.h"
 #include "cache.h"
 #include "set_gbuff_limit.h"	/* Needed for set_gbuff_limit() */
+#include "interlock.h"
+#include "wcs_backoff.h"
+#include "wcs_wt.h"
 
 STATICFNDCL void view_dbop(unsigned char keycode, viewparm *parmblkptr, mval *thirdarg);
 
@@ -104,7 +108,7 @@ GBLREF	uint4			gtmDebugLevel;
 GBLREF	boolean_t		lvmon_enabled;
 GBLREF	spdesc			stringpool;
 GBLREF	boolean_t		is_updproc;
-GBLREF	pid_t			process_id;
+GBLREF	uint4			process_id;
 GBLREF	uint4			dollar_tlevel;
 UNIX_ONLY(GBLREF	boolean_t		dmterm_default;)
 
@@ -116,6 +120,7 @@ error_def(ERR_GBLNOMAPTOREG);
 error_def(ERR_INVZDIRFORM);
 error_def(ERR_ISOLATIONSTSCHN);
 error_def(ERR_JNLFLUSH);
+error_def(ERR_TPNOSTATSHARE);
 error_def(ERR_PATLOAD);
 error_def(ERR_PATTABNOTFND);
 error_def(ERR_REQDVIEWPARM);
@@ -287,7 +292,7 @@ void	op_view(UNIX_ONLY_COMMA(int numarg) mval *keyword, ...)
 			break;
 #		ifndef VMS
 		case VTK_JNLERROR:
-			/* In case of update process, dont let this variable be user-controlled. We always want to error out
+			/* In case of update process, don't let this variable be user-controlled. We always want to error out
 			 * if we are about to invoke "jnl_file_lost". This way we will force the operator to fix whatever
 			 * caused the jnl_file_lost invocation (e.g. permissions, disk space issues etc.) and restart
 			 * the receiver server so replication can resume from wherever we last left. On the other hand,
@@ -371,7 +376,7 @@ void	op_view(UNIX_ONLY_COMMA(int numarg) mval *keyword, ...)
 						case dba_mm:
 						case dba_bg:
 							csa = &FILE_INFO(reg)->s_addrs;
-							memset(&csa->gvstats_rec, 0, SIZEOF(gvstats_rec_t));
+							memset((char *)csa->gvstats_rec_p, 0, SIZEOF(gvstats_rec_t));
 							break;
 						case dba_cm:
 						case dba_usr:
@@ -779,6 +784,28 @@ void	op_view(UNIX_ONLY_COMMA(int numarg) mval *keyword, ...)
 			op_wteol(1);
 			break;
 #		endif
+		case VTK_STATSHARE:
+			if (!TREF(statshare_opted_in))
+			{	/* Don't both to opt-in if already opted-in - it just confuses things */
+				if (0 < dollar_tlevel)
+				{	/* Can't do this in TP */
+					va_end(var);
+					rts_error_csa(CSA_ARG(NULL) VARLSTCNT(1) ERR_TPNOSTATSHARE);
+				}
+				gvcst_statshare_optin();
+			}
+			break;
+		case VTK_NOSTATSHARE:
+			if (TREF(statshare_opted_in))
+			{	/* Don't both to opt-out if already opted-out - it just confuses things */
+				if (0 < dollar_tlevel)
+				{	/* Can't do this in TP */
+					va_end(var);
+					rts_error_csa(CSA_ARG(NULL) VARLSTCNT(1) ERR_TPNOSTATSHARE);
+				}
+				gvcst_statshare_optout();
+			}
+			break;
 		default:
 			va_end(var);
 			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(1) ERR_VIEWCMD);
@@ -810,6 +837,8 @@ void view_dbop(unsigned char keycode, viewparm *parmblkptr, mval *thirdarg)
 		r_top = reg = parmblkptr->gv_ptr;
 	for (; reg <= r_top; reg++)
 	{
+		if (IS_STATSDB_REG(reg))
+			continue;	/* Skip statsdb regions for the VIEW command */
 		if (!reg->open)
 			gv_init_reg(reg);
 		TP_CHANGE_REG(reg);
@@ -819,7 +848,7 @@ void view_dbop(unsigned char keycode, viewparm *parmblkptr, mval *thirdarg)
 				if (!reg->read_only)
 				{
 					nbuffs = (NULL != thirdarg) ? MV_FORCE_INT(thirdarg) : cs_addrs->nl->wcs_active_lvl;
-					JNL_ENSURE_OPEN_WCS_WTSTART(cs_addrs, reg, nbuffs, dummy_errno);
+					JNL_ENSURE_OPEN_WCS_WTSTART(cs_addrs, reg, nbuffs, NULL, FALSE, dummy_errno);
 				}
 				break;
 			case VTK_DBSYNC:
@@ -840,7 +869,7 @@ void view_dbop(unsigned char keycode, viewparm *parmblkptr, mval *thirdarg)
 				break;
 			case VTK_EPOCH:
 			case VTK_FLUSH:
-				if (!reg->read_only)
+				if (!reg->read_only  && !FROZEN_CHILLED(cs_data))
 				{
 					ENSURE_JNL_OPEN(cs_addrs, gv_cur_region);
 					/* We should NOT invoke wcs_recover here because it's possible we are in the final retry
@@ -857,7 +886,8 @@ void view_dbop(unsigned char keycode, viewparm *parmblkptr, mval *thirdarg)
 				change_reg();
 				if (!reg->read_only)
 					CLRGVSTATS(cs_addrs);
-				memset((char *)&cs_addrs->gvstats_rec, 0, SIZEOF(gvstats_rec_t));	/* Always process-private */
+				/* Always reset process stats in process-private storage */
+				memset((char *)cs_addrs->gvstats_rec_p, 0, SIZEOF(gvstats_rec_t));
 				break;
 #			ifndef VMS
 			case VTK_JNLERROR:
@@ -888,7 +918,7 @@ void view_dbop(unsigned char keycode, viewparm *parmblkptr, mval *thirdarg)
 						grab_crit(reg);
 					if (JNL_ENABLED(csd))
 					{
-						jnl_status = jnl_ensure_open();
+						jnl_status = jnl_ensure_open(reg, csa);
 						if (0 == jnl_status)
 						{
 							jb = csa->jnl->jnl_buff;
diff --git a/sr_port/op_zprevious.c b/sr_port/op_zprevious.c
index d0d55a7..df2688a 100755
--- a/sr_port/op_zprevious.c
+++ b/sr_port/op_zprevious.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2014 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -28,34 +29,43 @@
 #include "gvcmx.h"
 #include "gvusr.h"
 #include "filestruct.h"
-#include "gdscc.h"
-#include "jnl.h"
 #include "hashtab_mname.h"
 #include "targ_alloc.h"		/* for GV_BIND_SUBSREG macro which needs "targ_alloc" prototype */
 #include "gtmimagename.h"
 #include "collseq.h"		/* for STD_NULL_COLL_FALSE */
 #include "mvalconv.h"
+#include "gdscc.h"			/* needed for tp.h */
+#include "gdskill.h"			/* needed for tp.h */
+#include "buddy_list.h"		/* needed for tp.h */
+#include "hashtab_int4.h"		/* needed for tp.h */
+#include "jnl.h"			/* needed for tp.h */
+#include "tp.h"
 
-GBLREF gv_namehead	*gv_target;
-GBLREF gv_key		*gv_currkey;
-GBLREF gv_key		*gv_altkey;
 GBLREF gd_region	*gv_cur_region;
+GBLREF gv_namehead	*gv_target;
+GBLREF gv_key		*gv_altkey, *gv_currkey;
 GBLREF sgmnt_addrs	*cs_addrs;
+GBLREF sgmnt_data_ptr_t	cs_data;
+GBLREF sgm_info		*sgm_info_ptr;
 GBLREF spdesc		stringpool;
 
 /* op_gvorder should generally be maintained in parallel */
 
 void op_zprevious(mval *v)
 {
-	int4			n;
-	int			min_reg_index, reg_index, res;
-	mname_entry		gvname;
-	mval			tmpmval, *datamval;
-	enum db_acc_method	acc_meth;
 	boolean_t		found, ok_to_change_currkey;
-	gd_binding		*gd_map_start, *map, *prev_map;
+	enum db_acc_method	acc_meth;
 	gd_addr			*gd_targ;
+	gd_binding		*gd_map_start, *map, *prev_map;
+	gd_region		*save_gv_cur_region;
+	gv_key			save_currkey[DBKEYALLOC(MAX_KEY_SZ)];
+	gv_namehead		*save_gv_target;
 	gvnh_reg_t		*gvnh_reg;
+	int			min_reg_index, reg_index, res;
+	int4			n;
+	mname_entry		gvname;
+	mval			tmpmval, *datamval;
+	sgm_info		*save_sgm_info_ptr;
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
@@ -87,7 +97,7 @@ void op_zprevious(mval *v)
 			assert(gv_currkey->end < gv_currkey->top); /* need "<" (not "<=") to account for terminating 0x00 */
 			GVZPREVIOUS_APPEND_MAX_SUBS_KEY(gv_currkey, gv_target);
 		}
-		if ((dba_bg == acc_meth) || (dba_mm == acc_meth))
+		if (IS_ACC_METH_BG_OR_MM(acc_meth))
 		{
 			gvnh_reg = TREF(gd_targ_gvnh_reg);
 			if (NULL == gvnh_reg)
@@ -138,14 +148,15 @@ void op_zprevious(mval *v)
 		}
 		assert(KEY_DELIMITER == gv_currkey->base[gv_currkey->end]);
 	} else
-	{	/* the following section is for $ZPREVIOUS(^gname) */
+	{	/* the following section is for $ZPREVIOUS(^gname) : name-level $zprevious */
 		assert(2 <= gv_currkey->end);
 		assert(gv_currkey->end < (MAX_MIDENT_LEN + 2));	/* until names are not in midents */
 		assert(KEY_DELIMITER == gv_currkey->base[gv_currkey->end]);
 		assert(KEY_DELIMITER == gv_currkey->base[gv_currkey->end - 1]);
+		SAVE_REGION_INFO(save_currkey, save_gv_target, save_gv_cur_region, save_sgm_info_ptr);
 		gd_targ = TREF(gd_targ_addr);
 		gd_map_start = gd_targ->maps;
-		map = gv_srch_map(gd_targ, (char *)&gv_currkey->base[0], gv_currkey->end - 1);
+		map = gv_srch_map(gd_targ, (char *)&gv_currkey->base[0], gv_currkey->end - 1, SKIP_BASEDB_OPEN_FALSE);
 		assert(map > (gd_map_start + 1));
 		/* If ^gname starts at "map" start search from map-1 since $ZPREVIOUS(^gname) is sought */
 		BACK_OFF_ONE_MAP_ENTRY_IF_EDGECASE(gv_currkey->base, gv_currkey->end - 1, map);
@@ -157,65 +168,75 @@ void op_zprevious(mval *v)
 		{
 			prev_map = map - 1;
 			gv_cur_region = map->reg.addr;
-			if (!gv_cur_region->open)
-				gv_init_reg(gv_cur_region);
-			change_reg();
-			acc_meth = REG_ACC_METH(gv_cur_region);
-			/* search region, entries in directory tree could have empty GVT in which case move on to previous entry */
-			for ( ; ; )
-			{
-				assert(0 == gv_currkey->prev);	/* or else gvcst_zprevious could get confused */
-				if ((dba_bg == acc_meth) || (dba_mm == acc_meth))
+			/* If region corresponding to the map is a statsDB region (lowercase region name) then it could contain
+			 * special globals ^%Y* (e.g. ^%YGS) which we don't want to be visible in name-level $zprevious.
+			 * So skip the region altogether.
+			 */
+			if (IS_BASEDB_REGNAME(gv_cur_region))
+			{	/* Non-statsDB region */
+				if (!gv_cur_region->open)
+					gv_init_reg(gv_cur_region);
+				change_reg();
+				/* Entries in directory tree could have empty GVT in which case move on to previous entry */
+				acc_meth = REG_ACC_METH(gv_cur_region);
+				for ( ; ; )
 				{
-					gv_target = cs_addrs->dir_tree;
-					found = gvcst_zprevious();
-				} else  if (dba_cm == acc_meth)
-					found = gvcmx_zprevious();
-				else
-					found = gvusr_zprevious();
-				if ('#' == gv_altkey->base[0]) /* don't want to give any hidden ^#* global, e.g "^#t" */
-					found = FALSE;
-				if (!found)
-					break;
-				assert(1 < gv_altkey->end);
-				assert(gv_altkey->end < (MAX_MIDENT_LEN + 2));	/* until names are not in midents */
-				res = memcmp(gv_altkey->base, prev_map->gvkey.addr, gv_altkey->end);
-				assert((0 != res) || (gv_altkey->end <= prev_map->gvkey_len));
-				if (0 > res)
-				{	/* The global name we found is less than the maximum value in the previous map
-					 * so this name is not part of the current map for sure. Move on to previous map.
-					 */
-					found = FALSE;
-					break;
-				}
-				gvname.var_name.addr = (char *)gv_altkey->base;
-				gvname.var_name.len = gv_altkey->end - 1;
-				if (dba_cm == acc_meth)
-					break;
-				COMPUTE_HASH_MNAME(&gvname);
-				GV_BIND_NAME_AND_ROOT_SEARCH(gd_targ, &gvname, gvnh_reg);	/* updates "gv_currkey" */
-				assert((NULL != gvnh_reg->gvspan) || (gv_cur_region == map->reg.addr));
-				if (NULL != gvnh_reg->gvspan)
-				{	/* gv_target would NOT have been initialized by GV_BIND_NAME in this case.
-					 * So finish that initialization.
-					 */
-					datamval = &tmpmval;
-					/* The below macro finishes the task of GV_BIND_NAME_AND_ROOT_SEARCH
-					 * 	(e.g. setting gv_cur_region for spanning globals)
-					 */
-					GV_BIND_SUBSNAME_IF_GVSPAN(gvnh_reg, gd_targ, gv_currkey, gvnh_reg->gd_reg);
-					op_gvdata(datamval);
-					if (MV_FORCE_INT(datamval))
+					assert(0 == gv_currkey->prev);	/* or else gvcst_zprevious could get confused */
+					if (IS_ACC_METH_BG_OR_MM(acc_meth))
+					{
+						gv_target = cs_addrs->dir_tree;
+						found = gvcst_zprevious();
+					} else  if (dba_cm == acc_meth)
+						found = gvcmx_zprevious();
+					else
+						found = gvusr_zprevious();
+					if ('#' == gv_altkey->base[0]) /* don't want to give any hidden ^#* global, e.g "^#t" */
+						found = FALSE;
+					if (!found)
+						break;
+					assert(1 < gv_altkey->end);
+					assert(gv_altkey->end < (MAX_MIDENT_LEN + 2));	/* until names are not in midents */
+					res = memcmp(gv_altkey->base, prev_map->gvkey.addr, gv_altkey->end);
+					assert((0 != res) || (gv_altkey->end <= prev_map->gvkey_len));
+					if (0 > res)
+					{	/* The global name we found is less than the maximum value in the previous map
+						 * so this name is not part of the current map for sure. Move on to previous map.
+						 */
+						found = FALSE;
 						break;
-				} else
-				{	/* else gv_target->root would have been initialized by GV_BIND_NAME_AND_ROOT_SEARCH */
-					if ((0 != gv_target->root) && (0 != gvcst_data()))
+					}
+					gvname.var_name.addr = (char *)gv_altkey->base;
+					gvname.var_name.len = gv_altkey->end - 1;
+					if (dba_cm == acc_meth)
 						break;
+					COMPUTE_HASH_MNAME(&gvname);
+					GV_BIND_NAME_AND_ROOT_SEARCH(gd_targ, &gvname, gvnh_reg);	/* updates "gv_currkey" */
+					assert((NULL != gvnh_reg->gvspan) || (gv_cur_region == map->reg.addr));
+					if (NULL != gvnh_reg->gvspan)
+					{	/* gv_target would NOT have been initialized by GV_BIND_NAME in this case.
+						 * So finish that initialization.
+						 */
+						datamval = &tmpmval;
+						/* The below macro finishes the task of GV_BIND_NAME_AND_ROOT_SEARCH
+						 * 	(e.g. setting gv_cur_region for spanning globals)
+						 */
+						GV_BIND_SUBSNAME_IF_GVSPAN(gvnh_reg, gd_targ, gv_currkey, gvnh_reg->gd_reg);
+						op_gvdata(datamval);
+						if (MV_FORCE_INT(datamval))
+							break;
+					} else
+					{	/* else gv_target->root would have been initialized by
+						 * GV_BIND_NAME_AND_ROOT_SEARCH
+						 */
+						if ((0 != gv_target->root) && (0 != gvcst_data()))
+							break;
+					}
 				}
-			}
-			if (found)
-				break;
-			/* If previous map corresponding to a spanning global, then do not update gv_currkey as that would
+				if (found)
+					break;
+			} else
+				found = FALSE;	/* Skip statsDB region completely. So set found to FALSE */
+			/* If previous map corresponds to a spanning global, then do not update gv_currkey as that would
 			 * effectively cause the spanning global to be skipped. If gvkey_len == gvname_len + 1 it is NOT
 			 * a spanning global map entry.
 			 */
@@ -231,11 +252,6 @@ void op_zprevious(mval *v)
 				assert(gv_currkey->top > gv_currkey->end);	/* ensure we are within allocated bounds */
 			}
 		}
-		/* Reset gv_currkey as we have potentially skipped one or more regions so we no
-		 * longer can expect gv_currkey/gv_cur_region/gv_target to match each other.
-		 */
-		gv_currkey->end = 0;
-		gv_currkey->base[0] = KEY_DELIMITER;
 		v->mvtype = 0; /* so stp_gcol (if invoked below) can free up space currently occupied (BYPASSOK)
 				* by this to-be-overwritten mval */
 		if (found)
@@ -257,6 +273,7 @@ void op_zprevious(mval *v)
 			v->str.len = 0;
 		v->mvtype = MV_STR; /* initialize mvtype now that mval has been otherwise completely set up */
 		/* No need to restore gv_currkey (to what it was at function entry) as it is already set to NULL */
+		RESTORE_REGION_INFO(save_currkey, save_gv_target, save_gv_cur_region, save_sgm_info_ptr);
 	}
 	return;
 }
diff --git a/sr_port/op_ztcommit.c b/sr_port/op_ztcommit.c
old mode 100755
new mode 100644
index 2afea86..d32d577
--- a/sr_port/op_ztcommit.c
+++ b/sr_port/op_ztcommit.c
@@ -135,7 +135,7 @@ void    op_ztcommit(int4 n)
 			 * (if it decides to switch to a new journal file)
 			 */
 			ADJUST_GBL_JREC_TIME(jgbl, jbp);
-			jnl_status = jnl_ensure_open();
+			jnl_status = jnl_ensure_open(gv_cur_region, csa);
 			if (jnl_status)
 			{
 				if (SS_NORMAL != jpc->status)
diff --git a/sr_port/opcode_def.h b/sr_port/opcode_def.h
index 2520fd5..5f00f18 100755
--- a/sr_port/opcode_def.h
+++ b/sr_port/opcode_def.h
@@ -9,7 +9,7 @@
  *	the license, please stop and do not read further.	*
  *								*
  ****************************************************************/
-
+/* defines opcodes and their associated octypes */
 
 
 
@@ -21,14 +21,14 @@ OPCODE_DEF(OC_NOOP, (OCT_CGSKIP))
 OPCODE_DEF(OC_PARAMETER, (OCT_CGSKIP))
 OPCODE_DEF(OC_VAR, (OCT_MVADDR | OCT_MVAL | OCT_CGSKIP | OCT_EXPRLEAF))
 OPCODE_DEF(OC_LIT, (OCT_MVAL | OCT_CGSKIP | OCT_EXPRLEAF))
-OPCODE_DEF(OC_ADD, (OCT_MVAL))
-OPCODE_DEF(OC_SUB, (OCT_MVAL))
-OPCODE_DEF(OC_MUL, (OCT_MVAL))
-OPCODE_DEF(OC_DIV, (OCT_MVAL))
-OPCODE_DEF(OC_IDIV, (OCT_MVAL))
-OPCODE_DEF(OC_MOD, (OCT_MVAL))
-OPCODE_DEF(OC_NEG, (OCT_MVAL))
-OPCODE_DEF(OC_FORCENUM, (OCT_MVAL))
+OPCODE_DEF(OC_ADD, (OCT_MVAL | OCT_ARITH))
+OPCODE_DEF(OC_SUB, (OCT_MVAL | OCT_ARITH))
+OPCODE_DEF(OC_MUL, (OCT_MVAL | OCT_ARITH))
+OPCODE_DEF(OC_DIV, (OCT_MVAL | OCT_ARITH))
+OPCODE_DEF(OC_IDIV, (OCT_MVAL | OCT_ARITH))
+OPCODE_DEF(OC_MOD, (OCT_MVAL | OCT_ARITH))
+OPCODE_DEF(OC_NEG, (OCT_MVAL | OCT_UNARY))
+OPCODE_DEF(OC_FORCENUM, (OCT_MVAL | OCT_UNARY))
 OPCODE_DEF(OC_CAT, (OCT_MVAL))
 OPCODE_DEF(OC_SRCHINDX, (OCT_MVADDR | OCT_MVAL | OCT_EXPRLEAF))
 OPCODE_DEF(OC_GETINDX, (OCT_MVADDR | OCT_MVAL | OCT_EXPRLEAF))
@@ -74,23 +74,23 @@ OPCODE_DEF(OC_FNZSEA, (OCT_MVAL | OCT_EXPRLEAF))
 OPCODE_DEF(OC_FNZSETPRV, (OCT_MVAL | OCT_EXPRLEAF))
 OPCODE_DEF(OC_SVGET, (OCT_MVAL | OCT_EXPRLEAF))
 OPCODE_DEF(OC_SVPUT, (OCT_NULL))
-OPCODE_DEF(OC_LT, (OCT_BOOL))
-OPCODE_DEF(OC_NLT, (OCT_BOOL))
-OPCODE_DEF(OC_GT, (OCT_BOOL))
-OPCODE_DEF(OC_NGT, (OCT_BOOL))
-OPCODE_DEF(OC_EQU, (OCT_BOOL))
-OPCODE_DEF(OC_NEQU, (OCT_BOOL))
-OPCODE_DEF(OC_CONTAIN, (OCT_BOOL))
-OPCODE_DEF(OC_NCONTAIN, (OCT_BOOL))
-OPCODE_DEF(OC_FOLLOW, (OCT_BOOL))
-OPCODE_DEF(OC_NFOLLOW, (OCT_BOOL))
-OPCODE_DEF(OC_PATTERN, (OCT_BOOL))
-OPCODE_DEF(OC_NPATTERN, (OCT_BOOL))
+OPCODE_DEF(OC_LT, (OCT_BOOL | OCT_REL))
+OPCODE_DEF(OC_NLT, (OCT_BOOL | OCT_REL | OCT_NEGATED))
+OPCODE_DEF(OC_GT, (OCT_BOOL | OCT_REL))
+OPCODE_DEF(OC_NGT, (OCT_BOOL | OCT_REL | OCT_NEGATED))
+OPCODE_DEF(OC_EQU, (OCT_BOOL | OCT_REL))
+OPCODE_DEF(OC_NEQU, (OCT_BOOL | OCT_REL | OCT_NEGATED))
+OPCODE_DEF(OC_CONTAIN, (OCT_BOOL | OCT_REL))
+OPCODE_DEF(OC_NCONTAIN, (OCT_BOOL | OCT_REL | OCT_NEGATED))
+OPCODE_DEF(OC_FOLLOW, (OCT_BOOL | OCT_REL))
+OPCODE_DEF(OC_NFOLLOW, (OCT_BOOL | OCT_REL | OCT_NEGATED))
+OPCODE_DEF(OC_PATTERN, (OCT_BOOL | OCT_REL))
+OPCODE_DEF(OC_NPATTERN, (OCT_BOOL | OCT_REL | OCT_NEGATED))
 OPCODE_DEF(OC_AND, (OCT_BOOL))
-OPCODE_DEF(OC_NAND, (OCT_BOOL))
+OPCODE_DEF(OC_NAND, (OCT_BOOL | OCT_NEGATED))
 OPCODE_DEF(OC_OR, (OCT_BOOL))
-OPCODE_DEF(OC_NOR, (OCT_BOOL))
-OPCODE_DEF(OC_COM, (OCT_BOOL))
+OPCODE_DEF(OC_NOR, (OCT_BOOL | OCT_NEGATED))
+OPCODE_DEF(OC_COM, (OCT_BOOL | OCT_UNARY))
 OPCODE_DEF(OC_BREAK, (OCT_NULL))
 OPCODE_DEF(OC_CLOSE, (OCT_NULL))
 OPCODE_DEF(OC_HALT, (OCT_NULL))
@@ -152,12 +152,12 @@ OPCODE_DEF(OC_INDSET, (OCT_NULL))
 OPCODE_DEF(OC_GVEXTNAM, (OCT_NULL))
 OPCODE_DEF(OC_INDNAME, (OCT_MVAL | OCT_EXPRLEAF))
 OPCODE_DEF(OC_INDTEXT, (OCT_MVAL | OCT_EXPRLEAF))
-OPCODE_DEF(OC_COMVAL, (OCT_MVAL | OCT_COERCE))
+OPCODE_DEF(OC_COMVAL, (OCT_MVAL | OCT_COERCE | OCT_UNARY))
 OPCODE_DEF(OC_GVSAVTARG, (OCT_MVAL))
 OPCODE_DEF(OC_GVRECTARG, (OCT_NULL))
 OPCODE_DEF(OC_COMINT, (OCT_MINT | OCT_COERCE))
 OPCODE_DEF(OC_FNTRANSLATE, (OCT_MVAL | OCT_EXPRLEAF))
-OPCODE_DEF(OC_COBOOL, (OCT_BOOL | OCT_COERCE))
+OPCODE_DEF(OC_COBOOL, (OCT_BOOL | OCT_COERCE | OCT_UNARY))
 OPCODE_DEF(OC_BOOLINIT, (OCT_MINT | OCT_EXPRLEAF))
 OPCODE_DEF(OC_BOOLFINI, (OCT_NULL))
 OPCODE_DEF(OC_SETTEST, (OCT_NULL))
@@ -243,7 +243,7 @@ OPCODE_DEF(OC_TSTART, (OCT_NULL))
 OPCODE_DEF(OC_TROLLBACK, (OCT_NULL))
 OPCODE_DEF(OC_TRESTART, (OCT_NULL))
 OPCODE_DEF(OC_TCOMMIT, (OCT_NULL))
-OPCODE_DEF(OC_EXP, (OCT_MVAL))
+OPCODE_DEF(OC_EXP, (OCT_MVAL | OCT_ARITH))
 OPCODE_DEF(OC_FNGET2, (OCT_MVAL | OCT_EXPRLEAF))
 OPCODE_DEF(OC_INDINCR, (OCT_MVAL | OCT_EXPRLEAF))
 OPCODE_DEF(OC_FNNAME, (OCT_MVAL | OCT_EXPRLEAF))
@@ -264,8 +264,8 @@ OPCODE_DEF(OC_FNZBITAND, (OCT_MVAL | OCT_EXPRLEAF))
 OPCODE_DEF(OC_FNZBITOR, (OCT_MVAL | OCT_EXPRLEAF))
 OPCODE_DEF(OC_FNZBITXOR, (OCT_MVAL | OCT_EXPRLEAF))
 OPCODE_DEF(OC_FGNLOOKUP, (OCT_CDADDR))
-OPCODE_DEF(OC_SORTS_AFTER, (OCT_BOOL))
-OPCODE_DEF(OC_NSORTS_AFTER, (OCT_BOOL))
+OPCODE_DEF(OC_SORTS_AFTER, (OCT_BOOL | OCT_REL))
+OPCODE_DEF(OC_NSORTS_AFTER, (OCT_BOOL | OCT_REL | OCT_NEGATED))
 OPCODE_DEF(OC_FNGVGET1, (OCT_MVAL | OCT_EXPRLEAF))
 OPCODE_DEF(OC_FNGET1, (OCT_MVAL | OCT_EXPRLEAF))
 OPCODE_DEF(OC_SETP1, (OCT_MVAL | OCT_EXPRLEAF))
@@ -346,3 +346,7 @@ OPCODE_DEF(OC_FNZSOCKET, (OCT_MVAL | OCT_EXPRLEAF))
 OPCODE_DEF(OC_FNZSYSLOG, (OCT_MVAL | OCT_EXPRLEAF))
 OPCODE_DEF(OC_ZRUPDATE, (OCT_NULL))
 OPCODE_DEF(OC_CDIDX, (OCT_MINT | OCT_CGSKIP | OCT_EXPRLEAF))
+OPCODE_DEF(OC_FNZCOLLATE, (OCT_MVAL | OCT_EXPRLEAF))
+OPCODE_DEF(OC_FNZATRANSFORM, (OCT_MVAL | OCT_EXPRLEAF))
+OPCODE_DEF(OC_JMPTRUE, (OCT_JUMP))
+OPCODE_DEF(OC_JMPFALSE, (OCT_JUMP))
diff --git a/sr_port/preemptive_db_clnup.c b/sr_port/preemptive_db_clnup.c
index d20501f..94fdbbe 100644
--- a/sr_port/preemptive_db_clnup.c
+++ b/sr_port/preemptive_db_clnup.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2012-2016 Fidelity National Information	*
+ * Copyright (c) 2012-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -13,7 +13,9 @@
 #include "mdef.h"
 
 #include "gtm_string.h"	/* for the RESET_GV_TARGET macro which in turn uses "memcmp" */
+#include "gtm_stdio.h"
 
+#include "gtmio.h"
 #include "gdsroot.h"
 #include "gdsbt.h"
 #include "gdsblk.h"
@@ -35,6 +37,7 @@
 #include "gtmimagename.h"
 #include "t_abort.h"
 #include "dpgbldir.h"
+#include "io.h"
 
 GBLREF	gv_namehead		*reset_gv_target;
 GBLREF	gv_namehead		*gv_target;
@@ -43,90 +46,39 @@ GBLREF	uint4			dollar_tlevel;
 GBLREF	sgmnt_addrs		*cs_addrs;
 GBLREF	sgmnt_data_ptr_t	cs_data;
 GBLREF  sgm_info                *first_sgm_info;
-GBLREF	boolean_t		need_kip_incr;
-GBLREF	uint4			update_trans;
-GBLREF	inctn_opcode_t		inctn_opcode;
-GBLREF	uint4			bml_save_dollar_tlevel;
-
-/* container for all the common chores that need to be performed on error conditions */
-
-#define CLEAR_CSE(GVNH)							\
-{									\
-	gv_namehead		*gvnh;					\
-	srch_blk_status		*s;					\
-									\
-	gvnh = GVNH;							\
-	if (NULL != gvnh)						\
-	{								\
-		for (s = &gvnh->hist.h[0]; s->blk_num; s++)		\
-			s->cse = NULL;					\
-	}								\
-}
 
+/* Function invoked to perform cleanup of an active transaction in case of an error condition */
 void preemptive_db_clnup(int preemptive_severe)
 {
 	sgmnt_addrs	*csa;
 	sgm_info	*si;
 	gd_region	*r_top, *reg;
 	gd_addr		*addr_ptr;
-	DCL_THREADGBL_ACCESS;
 
-	SETUP_THREADGBL_ACCESS;
-	/* Clear "inctn_opcode" global variable now that any in-progress transaction is aborted at this point.
-	 * Not doing so would cause future calls to "t_end" to get confused and skip writing logical jnl recs
-	 * and instead incorrectly write an INCTN record (GTM-8425).
+	/* If we are in the phase2 of an M-KILL (where "dollar_tlevel" is temporarily reset to 0), reset the global variable
+	 * "bml_save_dollar_tlevel" and restore "dollar_tlevel" now that we are going to go into error handling and unwind
+	 * from that "gvcst_expand_free_subtree" context altogether.
 	 */
-	if (bml_save_dollar_tlevel)
-	{
-		assert(!dollar_tlevel);
-		dollar_tlevel = bml_save_dollar_tlevel;
-		bml_save_dollar_tlevel = 0;
-	}
-	assert(!dollar_tlevel || (inctn_invalid_op == inctn_opcode) || (inctn_bmp_mark_free_gtm == inctn_opcode));
-	assert(dollar_tlevel || update_trans || (inctn_invalid_op == inctn_opcode));
-	inctn_opcode = inctn_invalid_op;
-	if (!dollar_tlevel && update_trans)
-	{	/* It's possible we hit an error in the middle of an update, at which point we have
-		 * a valid clue and non-NULL cse. However, this causes problems for subsequent
-		 * transactions (see comment in t_begin). In particular we could end up pinning buffers
-		 * unnecessarily. So clear the cse of any histories that may have been active during the update.
+	RESET_BML_SAVE_DOLLAR_TLEVEL;
+	t_abort_cleanup();
+	if ((INVALID_GV_TARGET != reset_gv_target) && (SUCCESS != preemptive_severe && INFO != preemptive_severe))
+	{	/* We know of a few cases in Unix where gv_target and gv_currkey could be out of sync at this point.
+		 *   a) If we are inside trigger code which in turn does an update that does
+		 *	reads of ^#t global and ends up in a restart. This restart would
+		 *	in turn do a rts_error_csa(TPRETRY) which would invoke mdb_condition_handler
+		 *	that would in turn invoke preemptive_db_clnup which invokes this macro.
+		 *	In this tp restart case though, it is ok for gv_target and gv_currkey
+		 *	to be out of sync because they are going to be reset by tp_clean_up anyways.
+		 *	So skip the dbg-only in-sync check.
+		 *   b) If we are in gvtr_init reading the ^#t global and detect an error (e.g. TRIGINVCHSET)
+		 *	gv_target after the reset would be pointing to a regular global whereas gv_currkey
+		 *	would be pointing to ^#t. It is ok to be out-of-sync since in this case, we expect
+		 *	mdb_condition_handler to be calling us. That has code to reset gv_currkey (and
+		 *	cs_addrs/cs_data etc.) to reflect gv_target (i.e. get them back in sync).
+		 * Therefore we pass SKIP_GVT_GVKEY_CHECK to skip gvtarget/gvcurrkey out-of-sync check in RESET_GV_TARGET.
 		 */
-		CLEAR_CSE(gv_target);
-		if ((NULL != gv_target) && (NULL != gv_target->gd_csa))
-		{
-			CLEAR_CSE(gv_target->gd_csa->dir_tree);
-			GTMTRIG_ONLY(CLEAR_CSE(gv_target->gd_csa->hasht_tree));
-		}
-		/* Resetting this is necessary to avoid blowing an assert in t_begin that it is 0 at the start of a transaction. */
-		update_trans = 0;
-	}
-	if (INVALID_GV_TARGET != reset_gv_target)
-	{
-		if (SUCCESS != preemptive_severe && INFO != preemptive_severe)
-		{
-			/* We know of a few cases in Unix where gv_target and gv_currkey could be out of sync at this point.
-			 *   a) If we are inside trigger code which in turn does an update that does
-			 *	reads of ^#t global and ends up in a restart. This restart would
-			 *	in turn do a rts_error_csa(TPRETRY) which would invoke mdb_condition_handler
-			 *	that would in turn invoke preemptive_db_clnup which invokes this macro.
-			 *	In this tp restart case though, it is ok for gv_target and gv_currkey
-			 *	to be out of sync because they are going to be reset by tp_clean_up anyways.
-			 *	So skip the dbg-only in-sync check.
-			 *   b) If we are in gvtr_init reading the ^#t global and detect an error (e.g. TRIGINVCHSET)
-			 *	gv_target after the reset would be pointing to a regular global whereas gv_currkey
-			 *	would be pointing to ^#t. It is ok to be out-of-sync since in this case, we expect
-			 *	mdb_condition_handler to be calling us. That has code to reset gv_currkey (and
-			 *	cs_addrs/cs_data etc.) to reflect gv_target (i.e. get them back in sync).
-			 * Therefore in Unix we pass SKIP_GVT_GVKEY_CHECK to skip the gvtarget/gvcurrkey out-of-sync check
-			 * in RESET_GV_TARGET. In VMS we pass DO_GVT_GVKEY_CHECK as we dont yet know of an out-of-sync situation.
-			 */
-			RESET_GV_TARGET(UNIX_ONLY(SKIP_GVT_GVKEY_CHECK) VMS_ONLY(DO_GVT_GVKEY_CHECK));
-		}
+		RESET_GV_TARGET(SKIP_GVT_GVKEY_CHECK);
 	}
-	need_kip_incr = FALSE;	/* in case we got an error in t_end (e.g. GBLOFLOW), dont want this global variable to get
-				 * carried over to the next non-TP transaction that this process does (e.g. inside an error trap).
-				 */
-	TREF(expand_prev_key) = FALSE;	/* reset global (in case it is TRUE) so it does not get carried over to future operations */
 	if (dollar_tlevel)
 	{
 		for (si = first_sgm_info;  si != NULL; si = si->next_sgm_info)
diff --git a/sr_port/prepare_unique_name.c b/sr_port/prepare_unique_name.c
index 2a0a649..3f23db5 100755
--- a/sr_port/prepare_unique_name.c
+++ b/sr_port/prepare_unique_name.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2003, 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2003-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -18,14 +19,12 @@
 #include "gtm_file_stat.h"
 #include "gtm_rename.h"
 #include "gtmmsg.h"
+#include "eintr_wrappers.h"
 
-#define MAX_CHARS_APPEND 10
+#define	MAX_CHARS_APPEND	10
+#define	DIR_FILE_SEPARATOR	'/'
 
-#if defined(UNIX)
-# define	DIR_FILE_SEPARATOR	'/'
-#elif defined(VMS)
-# define	DIR_FILE_SEPARATOR	']'
-#endif
+error_def(ERR_FILENAMETOOLONG);
 
 /* Given org_fn this will create rename_fn
  *	a) If prefix is not null, rename_fn = prefix + org_fn
@@ -33,6 +32,9 @@
  *	c) If prefix and suffix are both null, then
  *		rename_fn = org_fn + timestamp
  *		If rename_fn exists, add numbers to make it non-existance file
+ *      d) Note: This function cannot handle the case wehre prefix and suffix are both non-null. Callers ensure that.
+ * At function entry, "rename_fn_len" points to the allocated length of the "rename_fn" char array.
+ * On a successful function exit, "rename_fn_len" is set to the length of "rename_fn".
  */
 uint4 	prepare_unique_name(char *org_fn, int org_fn_len, char *prefix, char *suffix,
 		char *rename_fn, int *rename_fn_len, jnl_tm_t now, uint4 *ustatus)
@@ -41,18 +43,26 @@ uint4 	prepare_unique_name(char *org_fn, int org_fn_len, char *prefix, char *suf
 	char		*filename_begin, append_char[MAX_CHARS_APPEND] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9'};
 	int		prefix_len, suffix_len, cnt, length;
 	struct tm	*tm_struct;
-	int		file_stat;
+	int		file_stat, rename_alloc_len;
 	uint4		status1;
-
-	error_def(ERR_FILENAMETOOLONG);
+	boolean_t	nonnull_prefix, nonnull_suffix;
+	time_t		tt_now;
+	size_t          tm_str_len, avail_len;
+	char		*tm_str;
 
 	*ustatus = SS_NORMAL;
-	if (0 != prefix[0])
+	rename_alloc_len = *rename_fn_len;	/* Note we need space for null terminator too at end of the renamed file name */
+	assert(rename_alloc_len);	/* ensure caller has set this */
+	nonnull_prefix = (0 != prefix[0]);
+	nonnull_suffix = (0 != suffix[0]);
+	assert(!nonnull_prefix || !nonnull_suffix);	/* both prefix & suffix cannot be non-null */
+	if (nonnull_prefix)
 	{
 		prefix_len = STRLEN(prefix);
 		assert('\0' == org_fn[org_fn_len]);
+		if ((prefix_len + org_fn_len) >= rename_alloc_len)
+	 		return ERR_FILENAMETOOLONG;
 		filename_begin = strrchr(org_fn, DIR_FILE_SEPARATOR);
-		length = 0;
 		if (NULL != filename_begin)
 		{
 			length = (int4)(filename_begin - org_fn + 1);
@@ -60,56 +70,72 @@ uint4 	prepare_unique_name(char *org_fn, int org_fn_len, char *prefix, char *suf
 			memcpy(rename_fn, org_fn, length);
 			org_fn_len -= length;
 			org_fn += length;
-		}
+		} else
+			length = 0;
 		memcpy(rename_fn + length, prefix, prefix_len);
 		memcpy(rename_fn + length + prefix_len, org_fn, org_fn_len);
 		*rename_fn_len = length + prefix_len + org_fn_len;
 	}
-	if (0 != suffix[0])
+	if (nonnull_suffix)
 	{
 		suffix_len = STRLEN(suffix);
+		if ((org_fn_len + suffix_len) >= rename_alloc_len)
+	 		return ERR_FILENAMETOOLONG;
 		memcpy(rename_fn, org_fn, org_fn_len);
 		memcpy(rename_fn + org_fn_len, suffix, suffix_len);
 		*rename_fn_len = org_fn_len + suffix_len;
 	}
-	if (0 != prefix[0] || 0 != suffix[0])
+	if (nonnull_prefix || nonnull_suffix)
 	{
+		assert(*rename_fn_len < rename_alloc_len);
 		rename_fn[*rename_fn_len] = 0; /* Ensure it to be NULL terminated */
 		return SS_NORMAL;
 	}
-	memcpy(rename_fn, org_fn, org_fn_len);
+	/* Append formatted timestamp to "rename_fn" */
+	if (rename_alloc_len <= org_fn_len)
+	 	return ERR_FILENAMETOOLONG;
+	tm_str = &rename_fn[org_fn_len];
+	avail_len = rename_alloc_len - org_fn_len;
+	tt_now = (time_t)now;
+	GTM_LOCALTIME(tm_struct, &tt_now);
+	STRFTIME(tm_str, avail_len, JNLSWITCH_TM_FMT, tm_struct, tm_str_len);
+	if (!tm_str_len) /* STRFTIME can return 0 if space is not enough to store entire time string including null terminator */
+	 	return ERR_FILENAMETOOLONG;
+	assert(JNLSWITCH_TM_FMT_LEN == tm_str_len);
+	memcpy(rename_fn, org_fn, org_fn_len); /* Copy original file name to "rename_fn" */
 	filestr.addr = rename_fn;
-	filestr.len = org_fn_len;
-	rename_fn[filestr.len] = 0;
-	assert(filestr.len + 1 < MAX_FN_LEN);
-	if (SS_NORMAL != (status1 = append_time_stamp(rename_fn, &filestr.len, now)))
-		return status1;
+	filestr.len = org_fn_len + (int)tm_str_len;
+	assert(rename_alloc_len > filestr.len);
+	assert('\0' == rename_fn[filestr.len]);
 	if (FILE_PRESENT == (file_stat = gtm_file_stat(&filestr, NULL, NULL, FALSE, ustatus))) /* One already exists */
 	{	/* new name refers to an existing file - stuff numbers on the end until its unique */
-		rename_fn[filestr.len] = '_';
+		assert(rename_alloc_len > filestr.len);
+		rename_fn[filestr.len] = '_';	/* this access is safe from buffer overflow because of the above assert */
 		filestr.len += 2; /* 2 is for "_" + "append_char[]" */
-		for ( ; filestr.len < MAX_FN_LEN; filestr.len++)
+		for ( ; ; filestr.len++)
 		{
+			if (rename_alloc_len <= filestr.len)
+				return ERR_FILENAMETOOLONG;
 			rename_fn[filestr.len] = '\0';
-			filestr.len = filestr.len;
-			for (cnt = 0; cnt < MAX_CHARS_APPEND; cnt++)
+			for (cnt = 0; MAX_CHARS_APPEND > cnt; cnt++)
 			{
 				rename_fn[filestr.len - 1] = append_char[cnt];
 				if (FILE_NOT_FOUND == gtm_file_stat(&filestr, NULL, NULL, FALSE, ustatus))
 					break;
 			}
-			if (cnt < MAX_CHARS_APPEND) /* found one non existance file */
+			if (MAX_CHARS_APPEND > cnt) /* found one non-existing file */
 				break;
 		}
 		*ustatus = SS_NORMAL;
-		if (MAX_FN_LEN <= filestr.len)
-	 		return ERR_FILENAMETOOLONG;	/* no parameter for this message */
 	} else if (FILE_STAT_ERROR == file_stat)
 	{
 		status1 = *ustatus;
+		assert(SS_NORMAL != status1);
 		*ustatus = SS_NORMAL;
 	 	return status1;
 	}
+	assert(rename_alloc_len > filestr.len);
 	*rename_fn_len = filestr.len;
+	assert('\0' == rename_fn[filestr.len]);
 	return SS_NORMAL;
 }
diff --git a/sr_port/process_deferred_stale.c b/sr_port/process_deferred_stale.c
index 5757210..01bffff 100755
--- a/sr_port/process_deferred_stale.c
+++ b/sr_port/process_deferred_stale.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2005, 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2005-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -18,10 +19,6 @@
 #include "mdef.h"
 
 #include <sys/mman.h>
-#ifdef VMS
-#  include <ssdef.h>
-#  include "ast.h"
-#endif
 
 #include "gdsroot.h"
 #include "gdskill.h"
@@ -35,15 +32,13 @@
 #include "tp_change_reg.h"
 #include "dpgbldir.h"
 #include "process_deferred_stale.h"
-#ifdef UNIX
-# include "jnl.h"
-#endif
+#include "jnl.h"
+#include "wcs_wt.h"
 
 GBLREF	boolean_t	unhandled_stale_timer_pop;
 GBLREF	gd_region	*gv_cur_region;
-#ifdef UNIX
+GBLREF	int		process_exiting;
 GBLREF	jnl_gbls_t	jgbl;
-#endif
 
 void process_deferred_stale(void)
 {
@@ -53,9 +48,16 @@ void process_deferred_stale(void)
 	int4		status;
 
 	assert(unhandled_stale_timer_pop);
-
+	/* If we are already exiting, do not worry about stale timer pop handling. Doing so could cause other issues
+	 * e.g. EXIT from WAIT_FOR_REPL_INST_UNFREEZE_NOCSA macro because replication instance was frozen and we
+	 * invoked "wcs_wtstart" on a journaled region which had a timer pop and that would terminate the process
+	 * right away without doing any cleanup (e.g. csa->wbuf_dqd handling in secshr_db_clnup resulting in a
+	 * shared memory state with a dirty cache-record that is not in the active queue). It is okay to skip this stale
+	 * timer pop handling since we are anyways about to exit and will do any needed flushing as part of rundown.
+	 */
+	if (process_exiting)
+		return;
         save_gv_cur_region = gv_cur_region;
-
 	for (addr_ptr = get_next_gdr(NULL); NULL != addr_ptr; addr_ptr = get_next_gdr(addr_ptr))
 	{
 		for (r_cur = addr_ptr->regions, r_top = r_cur + addr_ptr->n_regions; r_cur < r_top; r_cur++)
@@ -66,7 +68,7 @@ void process_deferred_stale(void)
 				/* We don't expect to be in crit or commit when process_deferred_stale is invoked. The only
 				 * exceptions are :
 				 * (a) ONLINE ROLLBACK - holds the crit for the entire duration. In this case, do the flush anyways.
-				 *     While this might slowdown the online rollback run, with our current knowledge, we dont have
+				 *     While this might slowdown the online rollback run, with our current knowledge, we don't have
 				 *     any benchmarks to decide whether it is a good thing to let the buffer flush at the end (in
 				 *     gds_rundown) take care of all the updates done by rollback or do it periodically.
 				 * (b) A concurrent process in t_end detected an ONLINE ROLLBACK in the final or penultimate retry
@@ -83,11 +85,11 @@ void process_deferred_stale(void)
 					UNIX_ONLY(|| jgbl.onlnrlbk || (NULL == gv_target) || (DIR_ROOT == gv_target->root)));
 				if (UNIX_ONLY(!jgbl.onlnrlbk && )csa->now_crit)
 					continue;
-				if (csa->stale_defer)
+				if (csa->stale_defer && !FROZEN_CHILLED(csa->hdr))
 				{
 					gv_cur_region = r_cur;
 					tp_change_reg();
-					DCLAST_WCS_WTSTART(r_cur, 0, status);
+					status = wcs_wtstart(r_cur, 0, NULL, NULL);
 					csa->stale_defer = FALSE;
 					BG_TRACE_ANY(csa, stale_defer_processed);
 				}
diff --git a/sr_port/process_gvt_pending_list.c b/sr_port/process_gvt_pending_list.c
index b11da7e..4ab93ba 100644
--- a/sr_port/process_gvt_pending_list.c
+++ b/sr_port/process_gvt_pending_list.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2008, 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2008-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -88,7 +89,7 @@ void process_gvt_pending_list(gd_region *reg, sgmnt_addrs *csa)
 			 */
 			if (reg->max_key_size != db_max_key_size)
 			{	/* key sizes are different, need to reallocate */
-				assert((dba_bg == REG_ACC_METH(reg)) || (dba_mm == REG_ACC_METH(reg)));
+				assert(IS_REG_BG_OR_MM(reg));
 				new_gvt = (gv_namehead *)targ_alloc(db_max_key_size, &old_gvt->gvname, reg);
 				new_gvt->noisolation = old_gvt->noisolation;	/* Copy over noisolation status from old_gvt */
 				new_gvt->act = old_gvt->act; /* copy over act,nct,ver from old_gvt (actually from the gld file) */
diff --git a/sr_port/put_lit.c b/sr_port/put_lit.c
index d0c15ff..09eb161 100755
--- a/sr_port/put_lit.c
+++ b/sr_port/put_lit.c
@@ -58,6 +58,7 @@ oprtype put_lit_s(mval *x, triple *dst_triple)
 			{
 				a->rt_addr--;
 				ref->operand[0].oprval.mlit = a;
+				a->reference_count += 1;
 				return put_tref(ref);
 			}
 	} else
@@ -91,12 +92,15 @@ oprtype put_lit_s(mval *x, triple *dst_triple)
 			assert(a);
 			assert(MV_DEFINED(&(a->v)));
 			assert(is_equ(x, &(a->v)));
+			assert(a->reference_count);
 			a->rt_addr--;
 			ref->operand[0].oprval.mlit = a;
+			a->reference_count += 1;
 			return put_tref(ref);
 		}
 	}
 	ref->operand[0].oprval.mlit = a = (mliteral *)mcalloc(SIZEOF(mliteral));
+	a->reference_count = 1;
 	dqins(&literal_chain, que, a);
 	a->rt_addr = -1;
 	a->v = *x;
diff --git a/sr_port/read_db_files_from_gld.c b/sr_port/read_db_files_from_gld.c
index 3787b51..2a05d92 100755
--- a/sr_port/read_db_files_from_gld.c
+++ b/sr_port/read_db_files_from_gld.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2003, 2009 Fidelity Information Services, Inc	*
+ * Copyright (c) 2003-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -22,54 +23,47 @@
 #include "gtmmsg.h"
 #include "read_db_files_from_gld.h"
 #include "gtm_file_stat.h"
-#if defined(UNIX)
 #include "parse_file.h"
 #include "is_raw_dev.h"
-#elif defined(VMS)
-#define DEFDBEXT                ".dat"
-#endif
+
+error_def(ERR_FILENOTFND);
 
 gld_dbname_list *read_db_files_from_gld(gd_addr *addr)
 {
 	gd_segment 		*seg;
 	uint4			ustatus;
-	gd_region		*map_region;
-	gd_region		*map_region_top;
+	gd_region		*reg;
+	gd_region		*reg_top;
 	gld_dbname_list		head, *dblist = &head;
 	char 			filename[MAX_FN_LEN];
 	mstr 			file, def, ret, *retptr;
-	error_def(ERR_FILENOTFND);
 
 	head.next = NULL;
-	for (map_region = addr->regions, map_region_top = map_region + addr->n_regions; map_region < map_region_top; map_region++)
+	for (reg = addr->regions, reg_top = reg + addr->n_regions; reg < reg_top; reg++)
 	{
-		assert (map_region < map_region_top);
-		seg = (gd_segment *)map_region->dyn.addr;
+		assert(reg < reg_top);
+		if (IS_STATSDB_REG(reg))
+			continue;	/* Do not open statsdb regions directly. They will get opened as needed */
+		seg = (gd_segment *)reg->dyn.addr;
 		FILE_CNTL_INIT_IF_NULL(seg);
 		ret.len = SIZEOF(filename);
 		ret.addr = filename;
 		retptr = &ret;
 		file.addr = (char *)seg->fname;
 		file.len = seg->fname_len;
-#if defined(UNIX)
 		file.addr[file.len] = 0;
 		if (is_raw_dev(file.addr))
 		{
 			def.addr = DEF_NODBEXT;
 			def.len = SIZEOF(DEF_NODBEXT) - 1;
-		}
-		else
+		} else
 		{
 			def.addr = DEF_DBEXT;	/* UNIX need to pass "*.dat" but reg->dyn.addr->defext has "DAT" */
 			def.len = SIZEOF(DEF_DBEXT) - 1;
 		}
-#elif defined(VMS)
-		def.addr = DEFDBEXT;
-		def.len = SIZEOF(DEFDBEXT) - 1;
-#endif
 		if (FILE_PRESENT != gtm_file_stat(&file, &def, retptr, FALSE, &ustatus))
 		{
-			gtm_putmsg(VARLSTCNT(5) ERR_FILENOTFND, 2, file.len, file.addr, ustatus);
+			gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(5) ERR_FILENOTFND, 2, file.len, file.addr, ustatus);
 			return NULL;
 		}
 		assert(0 == filename[retptr->len]);
@@ -78,8 +72,8 @@ gld_dbname_list *read_db_files_from_gld(gd_addr *addr)
 		dblist = dblist->next
 		    = (gld_dbname_list *)malloc(SIZEOF(gld_dbname_list));
 	        memset(dblist, 0, SIZEOF(gld_dbname_list));
-		map_region->stat.addr = (void *)dblist;
-		dblist->gd = map_region;
+		reg->stat.addr = (void *)dblist;
+		dblist->gd = reg;
 	}
 	return head.next;
 }
diff --git a/sr_port/region_freeze.c b/sr_port/region_freeze.c
old mode 100755
new mode 100644
index 1a199ef..5faf8c8
--- a/sr_port/region_freeze.c
+++ b/sr_port/region_freeze.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information 	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -14,57 +14,47 @@
 
 #include "gtm_stdio.h"
 
-#ifdef VMS
-# include <descrip.h>
-# include <ssdef.h>
-#endif
-#ifdef VVMS_GTCX
-# include <iodef.h>
-# include <fab.h>
-# include <efndef.h>
-#endif
-
 #include "gdsroot.h"
 #include "gtm_facility.h"
 #include "fileinfo.h"
 #include "gdsbt.h"
 #include "gdsfhead.h"
 #include "filestruct.h"
-#ifdef VVMS_GTCX
-# include "ccp.h"
-# include "ccpact.h"
-# include "iosp.h"
-#endif
+#include "jnl.h"
 #include "send_msg.h"
 #include "caller_id.h"
 #include "sleep_cnt.h"
 #include "interlock.h"
 #include "add_inter.h"
+#include "wcs_backoff.h"
+#include "wcs_get_space.h"
 #include "wcs_sleep.h"
+#include "wcs_flu.h"
+#include "wcs_wt.h"
 #include "gtm_time.h"
 #include "gtm_string.h"
 #include "cli.h"
 #include "util.h"
 #include "wbox_test_init.h"
 #include "have_crit.h"
+#include "anticipatory_freeze.h"
+#include "gtmio.h"
 
+#ifdef DEBUG_FREEZE
 GBLREF	bool		caller_id_flag;
+#endif
 GBLREF	bool		in_mupip_freeze;
 GBLREF	uint4		process_id;
 GBLREF	boolean_t	debug_mupip;
-#ifdef UNIX
+GBLREF	jnl_gbls_t	jgbl;
+GBLREF	gd_region	*gv_cur_region;
+
 # define FREEZE_ID	((0 == user_id) ? FROZEN_BY_ROOT : user_id)
 # define FREEZE_MATCH	process_id
 # define OWNERSHIP	(in_mupip_freeze ? (csd->freeze == freeze_id) : (csd->image_count == FREEZE_MATCH))
-#elif defined VMS
-GBLREF	uint4		image_count;
-# define FREEZE_ID	process_id
-# define FREEZE_MATCH	image_count
-# define OWNERSHIP	((csd->freeze == process_id) && (in_mupip_freeze || (csd->image_count == FREEZE_MATCH)))
-#else
-# error Unsupported Platform
-#endif
+# define LATCH_WAIT_SEC	(5 * 60)
 
+#ifdef DEBUG_FREEZE
 #define SEND_FREEZEID(STATE, CSA)							\
 {											\
 	caller_id_flag = FALSE;								\
@@ -75,36 +65,74 @@ GBLREF	uint4		image_count;
 }
 
 error_def(ERR_FREEZEID);
+#endif
 
-freeze_status	region_freeze(gd_region *region, boolean_t freeze, boolean_t override, boolean_t wait_for_kip)
+error_def(ERR_DBFILERR);
+
+freeze_status	region_freeze(gd_region *region, boolean_t freeze, boolean_t override, boolean_t wait_for_kip,
+				uint4 online, boolean_t flush_sync)
+{
+	freeze_status		rval;
+
+	rval = region_freeze_main(region, freeze, override, wait_for_kip, online, flush_sync);
+
+	if (REG_FREEZE_SUCCESS == rval)
+		rval = region_freeze_post(region);
+
+	return rval;
+}
+
+freeze_status	region_freeze_main(gd_region *region, boolean_t freeze, boolean_t override, boolean_t wait_for_kip,
+					uint4 online, boolean_t flush_sync)
 {
 	uint4			freeze_id, sleep_counter;
 	sgmnt_addrs		*csa;
 	sgmnt_data_ptr_t	csd;
+	node_local_ptr_t	cnl;
+	jnl_private_control	*jpc;
+	unix_db_info    	*udi;
+	uint4			standalone;
+	uint4			jnl_status;
+	int4			epoch_interval_sav;
+	int			dummy_errno, save_errno;
+	uint4			was_online;
 	char			time_str[CTIME_BEFORE_NL + 2];       /* for GET_CUR_TIME macro */
-	boolean_t		was_crit;
+	boolean_t		cleanup_autorelease, jnl_switch_done, was_crit;
+	freeze_status		rval;
+	unsigned int		lcnt;
+
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
 	freeze_id = FREEZE_ID;
 	csa = &FILE_INFO(region)->s_addrs;
 	csd = csa->hdr;
+	cnl = csa->nl;
+	udi = FILE_INFO(region);
+	standalone = udi->grabbed_access_sem;
+	was_crit = csa->now_crit;
 	if (freeze)
 	{
-		was_crit = csa->now_crit;
 		if (!was_crit)
-			grab_crit(region);	/* really need this to be sure in UNIX, shouldn't be frequent anyway */
-		INCR_INHIBIT_KILLS(csa->nl);
+		{
+			if (online && !standalone)
+			{	/* Flush db without crit so we have less work to do while holding crit. */
+				SET_GBL_JREC_TIME;
+				JNL_ENSURE_OPEN_WCS_WTSTART(csa, region, csd->n_bts, NULL, FALSE, dummy_errno);
+			}
+			grab_crit(region);
+		}
+		INCR_INHIBIT_KILLS(cnl);
 		if (OWNERSHIP)
 		{
-			DECR_INHIBIT_KILLS(csa->nl);
+			DECR_INHIBIT_KILLS(cnl);
 			if (!was_crit)
 				rel_crit(region);
 			return REG_FREEZE_SUCCESS;
 		}
 		if (!override && csd->freeze)
 		{
-			DECR_INHIBIT_KILLS(csa->nl);
+			DECR_INHIBIT_KILLS(cnl);
 			if (!was_crit)
 				rel_crit(region);
 			return REG_ALREADY_FROZEN;
@@ -142,59 +170,169 @@ freeze_status	region_freeze(gd_region *region, boolean_t freeze, boolean_t overr
 		/* if can't ever be true when override is true. */
 		if (MAX_CRIT_TRY <= sleep_counter)
 		{
-			DECR_INHIBIT_KILLS(csa->nl);
+			DECR_INHIBIT_KILLS(cnl);
 			if (!was_crit)
 				rel_crit(region);
 			return REG_HAS_KIP;
 		}
+		if (online && !was_crit && !standalone)
+		{	/* Flush any remaining writes with crit/without latch so any wcs_flu() below doesn't have to,
+			 * so we can keep the time the latch is held to a minimum.
+			 */
+			JNL_ENSURE_OPEN_WCS_WTSTART(csa, region, csd->n_bts, NULL, FALSE, dummy_errno);
+		}
+		while (!grab_latch(&cnl->freeze_latch, LATCH_WAIT_SEC))
+			assert(FREEZE_LATCH_HELD(csa));
+		rval = REG_FREEZE_SUCCESS;
+		jnl_switch_done = FALSE;
+		jpc = csa->jnl;
+		if (online && JNL_ENABLED(csd) && !standalone)
+		{	/* We can't switch journal files while frozen, so switch up front to allow as many updates as possible
+			 * while frozen.
+			 */
+			/* Before writing to jnlfile, adjust jgbl.gbl_jrec_time if needed to maintain time order of jnl
+			 * records. This needs to be done BEFORE the jnl_ensure_open.
+			 */
+			ADJUST_GBL_JREC_TIME(jgbl, jpc->jnl_buff);
+			jnl_status = jnl_ensure_open(region, csa);
+			if (0 == jnl_status)
+			{	/* An online freeze can cause a long delay between epochs, but mur_tp_resolve_time()
+				 * assumes that we have epochs every jfh->epoch_interval, allowing MAX_EPOCH_DELAY for
+				 * wiggle room. It also assumes that this interval relates reasonably to the maximum
+				 * journal record time, so we can't just set an arbitrarily large value. Since we just
+				 * set the jgbl_rec_time above, and it should be large enough, we can use that, until
+				 * it eventually gets too large, at which time we can base it on INT_MAX.
+				 * Setting the cs_data->epoch_interval before the journal file switch causes it to
+				 * be copied to jfh->epoch_interval, and we restore it below. The restored value will
+				 * then appear in the next journal file to which we will switch on the unfreeze.
+				 */
+				epoch_interval_sav = csd->epoch_interval;
+				csd->epoch_interval = MIN(jgbl.gbl_jrec_time, INT_MAX) - MAX_EPOCH_DELAY;
+				jnl_switch_done = TRUE;
+				if (EXIT_ERR == SWITCH_JNL_FILE(jpc))
+					rval = REG_JNL_SWITCH_ERROR;
+				csd->epoch_interval = epoch_interval_sav;
+			} else
+				rval = REG_JNL_OPEN_ERROR;
+		}
+		if (REG_FREEZE_SUCCESS != rval)
+		{
+			if (!was_crit)
+				rel_crit(region);
+			rel_latch(&cnl->freeze_latch);
+			return rval;
+		}
+		SIGNAL_WRITERS_TO_STOP(cnl);
+		WAIT_FOR_WRITERS_TO_STOP(cnl, lcnt, MAXWTSTARTWAIT);
 		csd->freeze = freeze_id;		/* the order of this line and the next is important */
 		csd->image_count = FREEZE_MATCH;
 		csa->freeze = TRUE;
-		DECR_INHIBIT_KILLS(csa->nl);
-		if (!was_crit)
-			rel_crit(region);
-#		ifdef VVMS_GTCX
-		if (csd->clustered)
+		csd->freeze_online = online;
+		DEBUG_ONLY(cnl->freezer_waited_for_kip = wait_for_kip;)
+		SIGNAL_WRITERS_TO_RESUME(cnl);
+		DECR_INHIBIT_KILLS(cnl);
+		if (flush_sync)
 		{
-			unsigned short		iosb[4];
-
-			(void)sys$qiow(EFN$C_ENF, FILE_INFO(region)->fab->fab$l_stv, IO$_WRITEVBLK, iosb, NULL, 0,
-				       csd, (MM_BLOCK - 1) * DISK_BLOCK_SIZE, 1, 0, 0, 0);
+			if (!wcs_flu(WCSFLU_FLUSH_HDR | WCSFLU_WRITE_EPOCH))
+				rval = REG_FLUSH_ERROR;
+			assert((freeze_id == csd->freeze) && (FREEZE_MATCH == csd->image_count));
 		}
-#		endif
+		if (!was_crit)
+			rel_crit(region);
+		if (flush_sync)
+			DO_DB_FSYNC_OUT_OF_CRIT_IF_NEEDED(region, csa, jpc, jpc->jnl_buff); /* Do WCSFLU_SYNC_EPOCH out of crit */
 #		ifdef DEBUG_FREEZE
 		SEND_FREEZEID("FREEZE", csa);
 #		endif
-		return REG_FREEZE_SUCCESS;
+		rel_latch(&cnl->freeze_latch);
+		return rval;
 	}
-	if (0 == csd->freeze)
+	/* !freeze */
+	while (!grab_latch(&cnl->freeze_latch, LATCH_WAIT_SEC))
+		assert(FREEZE_LATCH_HELD(csa));
+	/* If there is no freeze, but there is a freeze_online, then there was an autorelease, which needs to be cleaned up
+	 * by the normal unfreeze procedure. However, we only do it in MUPIP FREEZE -OFF to ensure that the user gets a warning.
+	 */
+	cleanup_autorelease = ((0 == csd->freeze) && CHILLED_AUTORELEASE(csd) && in_mupip_freeze);
+	if ((0 == csd->freeze) && !cleanup_autorelease)
+	{
+		rel_latch(&cnl->freeze_latch);
 		return REG_FREEZE_SUCCESS;
-	if (override || OWNERSHIP)
+	}
+	if (override || OWNERSHIP || cleanup_autorelease)
 	{
+		was_online = csd->freeze_online;
 		csd->image_count = 0;		/* the order of this line and the next is important */
 		csd->freeze = 0;
+		csd->freeze_online = FALSE;
 		csa->freeze = FALSE;
-#		ifdef VVMS_GTCX
-	  	if (csd->clustered)
+		rel_latch(&cnl->freeze_latch);
+#		ifdef DEBUG_FREEZE
+		SEND_FREEZEID("UNFREEZE", csa);
+#		endif
+		rval = REG_FREEZE_SUCCESS;
+		if (was_online && !standalone)
+		{
+			csa->needs_post_freeze_online_clean = TRUE;
+		}
+		if (flush_sync && !(was_online && JNL_ENABLED(csd)))
 		{
-			ccp_action_aux_value	msg;
-			unsigned short		iosb[4];
-			void			ccp_sendmsg();
+			csa->needs_post_freeze_flushsync = TRUE;
+		}
+		return rval;
+	} else
+		rel_latch(&cnl->freeze_latch);
+	return REG_ALREADY_FROZEN;
+}
+
+freeze_status region_freeze_post(gd_region *region)
+{
+	sgmnt_addrs		*csa;
+	sgmnt_data_ptr_t	csd;
+	jnl_private_control	*jpc;
+	uint4			jnl_status;
+	int			dummy_errno;
+	boolean_t		was_crit;
+	freeze_status		rval;
 
-			(void)sys$qiow(EFN$C_ENF, FILE_INFO(region)->fab->fab$l_stv, IO$_WRITEVBLK, iosb, NULL, 0,
-				       csd, (MM_BLOCK - 1) * DISK_BLOCK_SIZE, 1, 0, 0, 0);
-			if (csa->nl->ccp_crit_blocked)
+	csa = &FILE_INFO(region)->s_addrs;
+	csd = csa->hdr;
+	was_crit = csa->now_crit;
+	rval = REG_FREEZE_SUCCESS;
+	if (csa->needs_post_freeze_online_clean)
+	{
+		SET_GBL_JREC_TIME;
+		if (!was_crit)
+		{	/* Flush db without crit before journal file switch/epoch which require crit. */
+			JNL_ENSURE_OPEN_WCS_WTSTART(csa, region, csd->n_bts, NULL, FALSE, dummy_errno);
+		}
+		if (JNL_ENABLED(csd))
+		{	/* Do an extra journal file switch to undo the epoch_interval override above. */
+			jpc = csa->jnl;
+			if (!was_crit)
+				grab_crit(region);
+			/* If another freeze managed to sneak in after we dropped the latch, skip the switch. */
+			if (!FROZEN(csd))
 			{
-				msg.exreq.fid = FILE_INFO(region)->file_id;
-				msg.exreq.cycle = csa->nl->ccp_cycle;
-				ccp_sendmsg(CCTR_EXITWM, &msg);
+				ADJUST_GBL_JREC_TIME(jgbl, jpc->jnl_buff);
+				jnl_status = jnl_ensure_open(region, csa);
+				if (0 == jnl_status)
+				{
+					if (EXIT_ERR == SWITCH_JNL_FILE(jpc))
+						rval = REG_JNL_SWITCH_ERROR;
+				} else
+					rval = REG_JNL_OPEN_ERROR;
 			}
+			if (!was_crit)
+				rel_crit(region);
 		}
-#		endif
-#		ifdef DEBUG_FREEZE
-		SEND_FREEZEID("UNFREEZE", csa);
-#		endif
-		return REG_FREEZE_SUCCESS;
+		csa->needs_post_freeze_online_clean = FALSE;
 	}
-	return REG_ALREADY_FROZEN;
+	if (csa->needs_post_freeze_flushsync)
+	{
+		if (!wcs_flu(WCSFLU_FLUSH_HDR | WCSFLU_WRITE_EPOCH | WCSFLU_SYNC_EPOCH))
+			rval = REG_FLUSH_ERROR;
+		csa->needs_post_freeze_flushsync = FALSE;
+	}
+	return rval;
 }
diff --git a/sr_port/region_init.c b/sr_port/region_init.c
index 4b6c7da..b3bcb9c 100755
--- a/sr_port/region_init.c
+++ b/sr_port/region_init.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -10,6 +11,9 @@
  ****************************************************************/
 
 #include "mdef.h"
+
+#include "gtm_stdlib.h"
+
 #include "gdsroot.h"
 #include "gtm_facility.h"
 #include "fileinfo.h"
@@ -18,6 +22,8 @@
 #include "filestruct.h"
 #include "error.h"
 #include "change_reg.h"
+#include "gtm_logicals.h"
+#include "min_max.h"
 
 GBLREF gd_addr		*gd_header;
 GBLREF gd_region	*gv_cur_region;
@@ -28,40 +34,66 @@ error_def (ERR_DBNOREGION);
 
 boolean_t region_init(bool cm_regions)
 {
-	gd_region		*region_top;
-	boolean_t		file_open, is_cm, all_files_open;
+	gd_region		*baseDBreg, *first_nonstatsdb_reg, *reg, *reg_top;
+	boolean_t		is_cm, all_files_open;
+	sgmnt_addrs		*baseDBcsa;
+	node_local_ptr_t	baseDBnl;
 
-	file_open = FALSE;
 	all_files_open = TRUE;
-	region_top = gd_header->regions + gd_header->n_regions;
-	for (gv_cur_region = gd_header->regions; gv_cur_region < region_top; gv_cur_region++)
+	first_nonstatsdb_reg = NULL;
+	reg_top = gd_header->regions + gd_header->n_regions;
+	for (gv_cur_region = gd_header->regions; gv_cur_region < reg_top; gv_cur_region++)
 	{
-		if (gv_cur_region->open == FALSE
-			&& (gv_cur_region->dyn.addr->acc_meth == dba_bg || gv_cur_region->dyn.addr->acc_meth == dba_mm))
+		if (gv_cur_region->open)
+			continue;
+		if (!IS_REG_BG_OR_MM(gv_cur_region))
+			continue;
+		if (IS_STATSDB_REG(gv_cur_region))
+			continue;			/* Bypass statsDB files */
+		is_cm = reg_cmcheck(gv_cur_region);
+		if (!is_cm || cm_regions)
 		{
-			is_cm = reg_cmcheck(gv_cur_region);
-			if (!is_cm || cm_regions)
+			region_open();
+			if (gv_cur_region->open)
 			{
-				region_open();
-				if (gv_cur_region->open)
-					file_open = TRUE;
-				else
-					all_files_open = FALSE;
-			}
+				if (NULL == first_nonstatsdb_reg)
+					first_nonstatsdb_reg = gv_cur_region;
+			} else
+				all_files_open = FALSE;
 		}
 	}
-	if (!file_open)
+	if (NULL == first_nonstatsdb_reg)
+	{
+		gv_cur_region = NULL;
 		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(1) ERR_DBNOREGION);
-
-	/* arbitrary assignment of the first region */
-	for (gv_cur_region = gd_header->regions; gv_cur_region < region_top; gv_cur_region++)
+	}
+	/* Fill in db file name of statsdb regions now that basedb has been opened in above "for" loop */
+	for (reg = gd_header->regions; reg < reg_top; reg++)
 	{
-		if (gv_cur_region->open)
+		if (reg_cmcheck(reg))
+			continue;
+		if (!IS_STATSDB_REG(reg))
+			continue;			/* Bypass statsDB files */
+		STATSDBREG_TO_BASEDBREG(reg, baseDBreg);
+		if (baseDBreg->open)
 		{
-			change_reg();
-			break;
+			baseDBcsa = &FILE_INFO(baseDBreg)->s_addrs;
+			baseDBnl = baseDBcsa->nl;
+			COPY_STATSDB_FNAME_INTO_STATSREG(reg, baseDBnl->statsdb_fname, baseDBnl->statsdb_fname_len);
+			/* If a statsdb has already been created (by some other process), then we (DSE or LKE are the only
+			 * ones that can reach here) will open the statsdb too. Otherwise we will not.
+			 */
+			assert(IS_DSE_IMAGE || IS_LKE_IMAGE);
+			if (baseDBnl->statsdb_created && !reg->open)
+			{
+				gv_cur_region = reg;
+				region_open();
+				assert(reg->open);
+			}
 		}
 	}
+	gv_cur_region = first_nonstatsdb_reg;
+	change_reg();
 	return all_files_open;
 }
 
diff --git a/sr_port/rename_file_if_exists.c b/sr_port/rename_file_if_exists.c
index 2a0a36a..238dd3a 100755
--- a/sr_port/rename_file_if_exists.c
+++ b/sr_port/rename_file_if_exists.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2003-2015 Fidelity National Information	*
+ * Copyright (c) 2003-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -45,8 +45,6 @@ int rename_file_if_exists(char *org_fn, int org_fn_len, char *rename_fn, int *re
 	int		status;
 	jnl_tm_t	now;
 
-	memcpy(rename_fn, org_fn, org_fn_len + 1); /* Ensure it to be NULL terminated */
-	*rename_fn_len = org_fn_len;
 	orgfile.addr = org_fn;
 	orgfile.len = org_fn_len;
 	if (FILE_NOT_FOUND == (status = gtm_file_stat(&orgfile, NULL, NULL, FALSE, ustatus)))
diff --git a/sr_port/repl_comm.c b/sr_port/repl_comm.c
index a417ef0..d15f33a 100644
--- a/sr_port/repl_comm.c
+++ b/sr_port/repl_comm.c
@@ -98,8 +98,8 @@ GBLREF	char			dl_err[MAX_ERRSTR_LEN];
 #define REPL_SEND_TRACE_BUFF_SIZE 65536
 #define REPL_RECV_TRACE_BUFF_SIZE 65536
 #else
-#define REPL_SEND_TRACE_BUFF_SIZE 1048576
-#define REPL_RECV_TRACE_BUFF_SIZE 1048576
+#define REPL_SEND_TRACE_BUFF_SIZE (MAX_REPL_MSGLEN * 2) /* For symmetry with the below */
+#define REPL_RECV_TRACE_BUFF_SIZE (MAX_REPL_MSGLEN * 2) /* To debug problems in the Receiver's msgbuff (gtmrecv_msgp) management */
 #endif
 #define REPL_SEND_SIZE_TRACE_SIZE 1024
 #define REPL_RECV_SIZE_TRACE_SIZE 1024
diff --git a/sr_port/repl_filter.c b/sr_port/repl_filter.c
index 0a685b5..0b70db4 100755
--- a/sr_port/repl_filter.c
+++ b/sr_port/repl_filter.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information 	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -392,8 +392,7 @@
 #define MORE_TO_TRANSFER -99
 #define DUMMY_TCOMMIT_LENGTH 3	/* A dummy commit is 09\n */
 
-#define FILTER_HALF_TIMEOUT	4			/* 4 heartbeats : 32 seconds. */
-#define FILTER_FULL_TIMEOUT	8			/* 4 heartbeats : 64 seconds. */
+#define FILTER_HALF_TIMEOUT_TIME	(32 * MILLISECS_IN_SEC)
 
 /* repl_filter_recv receive state */
 
@@ -449,10 +448,6 @@ GBLREF	int			repl_filter_bufsiz;
 GBLREF	boolean_t		is_src_server, is_rcvr_server;
 #ifdef UNIX
 GBLREF	repl_conn_info_t	*this_side, *remote_side;
-GBLREF	volatile uint4		heartbeat_counter;
-#ifdef DEBUG
-GBLREF boolean_t		heartbeat_started;
-#endif
 #endif
 GBLREF	uint4			process_id;
 GBLREF	boolean_t		err_same_as_out;
@@ -738,7 +733,7 @@ STATICFNDEF int repl_filter_recv_line(char *line, int *line_len, int max_line_le
 	struct pollfd	poll_fdlist[1];
 #endif
 	struct timeval	repl_filter_poll_interval;
-	boolean_t	half_timeout_done;
+	boolean_t	half_timeout_done, timedout;
 
 	for (; ;)
 	{
@@ -820,10 +815,9 @@ STATICFNDEF int repl_filter_recv_line(char *line, int *line_len, int max_line_le
 			 * which indicates the end of a mini-transaction or a commit record for an actual transaction.
 			 */
 			assert(-1 != repl_filter_pid);
-			assert(heartbeat_started);
 			half_timeout_done = FALSE;
 			if (send_done)
-				orig_heartbeat = heartbeat_counter;
+				TIMEOUT_INIT(timedout, FILTER_HALF_TIMEOUT_TIME);
 			do
 			{
 				r_len = read(repl_filter_srv_fd[READ_END], srv_read_end, buff_remaining);
@@ -835,20 +829,33 @@ STATICFNDEF int repl_filter_recv_line(char *line, int *line_len, int max_line_le
 				/* EINTR/ENOMEM -- check if it's time to take the stack trace. */
 				if (send_done)
 				{
-					if (!half_timeout_done && ((heartbeat_counter - orig_heartbeat) >= FILTER_HALF_TIMEOUT))
-					{
-						/* Half-timeout : take C-stack of the filter program. */
+					if (!timedout)
+						continue;
+					if (!half_timeout_done)
+					{	/* Half-timeout : take C-stack of the filter program. */
 						half_timeout_done = TRUE;
+						TIMEOUT_DONE(timedout);
+						TIMEOUT_INIT(timedout, FILTER_HALF_TIMEOUT_TIME);
 						GET_C_STACK_FROM_SCRIPT("FILTERTIMEDOUT_HALF_TIME", process_id, repl_filter_pid, 0);
-					} else if ((heartbeat_counter - orig_heartbeat) >= FILTER_FULL_TIMEOUT)
-					{
-						/* Full-timeout : take C-stack of the filter program. */
+					}
+					assert(half_timeout_done);
+					/* GET_C_STACK_FROM_SCRIPT calls gtm_system(BYPASSOK) with interrupts deferredd. If the
+					 * stack trace takes more than 32 seconds, the next timeout interrupt will be deferred
+					 * until gtm_system(BYPASSOK) returns. At which point timedout will be TRUE and there will
+					 * be no signal received by GT.M to interrupt the blocking read() at the begining of the
+					 * loop.  So we handle the timeout now and skip the second stack trace.
+					 */
+					if (half_timeout_done && timedout)
+					{	/* Full-timeout : take C-stack of the filter program. */
 						GET_C_STACK_FROM_SCRIPT("FILTERTIMEDOUT_FULL_TIME", process_id, repl_filter_pid, 1);
+						TIMEOUT_DONE(timedout);
 						return (repl_errno = EREPL_FILTERTIMEDOUT);
 					}
 					continue;
 				}
 			} while (TRUE);
+			if (send_done)
+				TIMEOUT_DONE(timedout);
 #			else
 			while (-1 == (r_len = read(repl_filter_srv_fd[READ_END], srv_read_end, buff_remaining))
 					&& (EINTR == errno || ENOMEM == errno))
diff --git a/sr_port/resolve_optimize.c b/sr_port/resolve_optimize.c
new file mode 100644
index 0000000..297e9db
--- /dev/null
+++ b/sr_port/resolve_optimize.c
@@ -0,0 +1,171 @@
+/****************************************************************
+ *								*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
+ *								*
+ *	This source code contains the intellectual property	*
+ *	of its copyright holder(s), and is made available	*
+ *	under a license.  If you do not know the terms of	*
+ *	the license, please stop and do not read further.	*
+ *								*
+ ****************************************************************/
+
+#include "mdef.h"
+
+#include "gtm_stdio.h"
+#include "gtm_string.h"
+
+#include "compiler.h"
+#include "mdq.h"
+#include "op.h"
+#include "opcode.h"
+#include "cmd_qlf.h"
+#include "mmemory.h"
+#include "resolve_lab.h"
+#include "cdbg_dump.h"
+#include "gtmdbglvl.h"
+#include "stringpool.h"
+#include "mvalconv.h"
+
+GBLREF spdesc			stringpool;
+GBLREF src_line_struct          src_head;
+GBLREF mident			routine_name;
+
+boolean_t resolve_optimize(triple *curtrip)
+{	/* a when all lines have been parsed optimization, current only applied for $TEXT() */
+	int	i;
+	mstr	*source_line;
+	mval	tmp_mval, accumulator, *mval_x, *mval_y;
+	triple	*ref, *y, *x, *triple_temp;
+	triple	*line_offset, *label, *routine;
+	src_line_struct	*cur_line;
+	boolean_t negative, optimized = FALSE;
+	/* If we are resolving indirect's or something of the sort, die sadly */
+	assert(NULL != src_head.que.fl);
+	switch (curtrip->opcode)
+	{
+	case OC_FNTEXT:
+		/* If this is a OC_FNTEXT for the current routine, we can
+			optimize it by simply inserting the text string from
+			src_line_struct.que
+		*/
+		assert(OC_LITC != curtrip->operand[0].oprval.tref->opcode);
+		routine = curtrip->operand[1].oprval.tref->operand[1].oprval.tref;
+		line_offset = curtrip->operand[1].oprval.tref->operand[0].oprval.tref;
+		label = curtrip->operand[0].oprval.tref;
+		/* TODO: there should be a routine to verify literals for a given function */
+		if (MLIT_REF != routine->operand[0].oprclass)
+			break;
+		if (!WANT_CURRENT_RTN(&routine->operand[0].oprval.mlit->v))
+			break;
+		if (MLIT_REF != label->operand[0].oprclass)
+			break;
+		if (ILIT_REF != line_offset->operand[0].oprclass)
+			break;
+		/* If we're here, we have a $TEXT with all literals for the current routine */
+		source_line = (mstr *)mcalloc(SIZEOF(mstr));
+		/* Special case; label == "" && +0 means file name */
+		if (0 == label->operand[0].oprval.mlit->v.str.len
+			&& 0 == line_offset->operand[0].oprval.ilit)
+		{	/* Get filename, replace thing */
+			/* Find last /; this is the start of the filename */
+			source_line->len = routine_name.len;
+			source_line->addr = malloc(source_line->len);
+			memcpy(source_line->addr, routine_name.addr, source_line->len);
+		} else
+		{	/* Search through strings for label; if label == "" skip */
+			cur_line = src_head.que.fl;
+			negative = (0 > line_offset->operand[0].oprval.ilit);
+			if (0 != label->operand[0].oprval.mlit->v.str.len && cur_line != cur_line->que.fl)
+			{
+				for (i = 0; cur_line != &src_head; cur_line = cur_line->que.fl)
+				{
+					if (label->operand[0].oprval.mlit->v.str.len > cur_line->str.len)
+						continue;
+					if (label->operand[0].oprval.mlit->v.str.len != cur_line->str.len)
+					{
+						switch (cur_line->str.addr[label->operand[0].oprval.mlit->v.str.len])
+						{
+							case ' ':
+							case ';':
+							case '(':
+							case ':':
+								break;
+							default:
+								/* If we get here, it means we have a superstring of the label;
+								 * i.e. searching for "a" found "abc"
+								 */
+								continue;
+						}
+					}
+					if (!strncmp(label->operand[0].oprval.mlit->v.str.addr, cur_line->str.addr,
+						label->operand[0].oprval.mlit->v.str.len))
+						break;
+				}
+				if (&src_head == cur_line)
+					break;
+					/* Error; let the runtime program deal with it for now */
+			} else
+			{	/* We need a special case to handle +0; if no label, it means start at top of file
+					and we begin counting on 1,
+					otherwise, it means the line that the label is on
+				*/
+				i = 1;
+			}
+			/* We could mod the offset by the size of the file, but hopefully no one is dumb enough to say +100000 */
+			/* Counting the number of lines in the file will be O(n), not worth it */
+			for (; i < (negative ? -1 : 1) * line_offset->operand[0].oprval.ilit && cur_line != &src_head; i++)
+			{
+				cur_line = (negative ? cur_line->que.bl : cur_line->que.fl);
+			}
+			/* If we went through all nodes and i is less than the line we are looking for, use an empty source line */
+			if (&src_head == cur_line)
+			{	/* Special case; we were counting backward, hit the end of the file, but we are done counting */
+				/* This means we should output the name of the routine */
+				if (i == (negative ? -1 : 1) * line_offset->operand[0].oprval.ilit
+					&& negative)
+				{
+					source_line->len = routine_name.len;
+					source_line->addr = malloc(source_line->len);
+					memcpy(source_line->addr, routine_name.addr, source_line->len);
+				} else
+				{
+					source_line->len = 0;
+					source_line->addr = 0;
+				}
+			} else
+			{
+				source_line->len = cur_line->str.len;
+				source_line->addr = malloc(source_line->len);
+				memcpy(source_line->addr, cur_line->str.addr, cur_line->str.len);
+			}
+		}
+		/* Insert literal into triple tree */
+		tmp_mval.mvtype = MV_STR;
+		/* Minus one so we don't copy newline character */
+		tmp_mval.str.len = (source_line->len == 0 ? 0 :
+			source_line->len - (source_line->addr[source_line->len-1] == '\n' ? 1 : 0));
+		ENSURE_STP_FREE_SPACE(tmp_mval.str.len);
+		tmp_mval.str.addr = (char *)stringpool.free;
+		memcpy(tmp_mval.str.addr, source_line->addr, tmp_mval.str.len);
+		/* Replace tab characters with spaces */
+		for (i = 0; i < tmp_mval.str.len && tmp_mval.str.addr[i] != ';'; i++)
+		{
+			if ('\t' == tmp_mval.str.addr[i])
+				tmp_mval.str.addr[i] = ' ';
+		}
+		stringpool.free += tmp_mval.str.len;
+		if (source_line->addr != 0)
+			free(source_line->addr);
+		/* Update all things that referenced this value */
+		curtrip->opcode = OC_LIT;
+		put_lit_s(&tmp_mval, curtrip);
+		label->opcode = OC_NOOP;
+		line_offset = OC_NOOP;
+		routine->opcode = OC_NOOP;
+		optimized = TRUE;
+		break;
+		/* If no cases no optimizations to perform.... yet */
+	}
+	return optimized;
+}
diff --git a/sr_port/resolve_ref.c b/sr_port/resolve_ref.c
index 40e64f3..02a4480 100755
--- a/sr_port/resolve_ref.c
+++ b/sr_port/resolve_ref.c
@@ -23,16 +23,12 @@
 #include "resolve_lab.h"
 #include "cdbg_dump.h"
 #include "gtmdbglvl.h"
-#include "stringpool.h"
 
 GBLREF boolean_t		run_time;
 GBLREF command_qualifier	cmd_qlf;
 GBLREF mlabel			*mlabtab;
 GBLREF triple			t_orig;
 GBLREF uint4			gtmDebugLevel;
-GBLREF spdesc			stringpool;
-GBLREF src_line_struct          src_head;
-GBLREF mident			routine_name;
 
 error_def(ERR_ACTLSTTOOLONG);
 error_def(ERR_FMLLSTMISSING);
@@ -40,16 +36,18 @@ error_def(ERR_LABELMISSING);
 error_def(ERR_LABELNOTFND);
 error_def(ERR_LABELUNKNOWN);
 
-STATICFNDCL bool do_optimize(triple *curtrip);
-
 int resolve_ref(int errknt)
-{
+{	/* simplify operand references where possible and make literals dynamic when in that mode */
 	int	actcnt;
-	mline	*mxl;
 	mlabel	*mlbx;
-	oprtype *j, *k, *opnd;
+	mline	*mxl;
+	oprtype *opnd;
 	tbp	*tripbp;
-	triple	*chktrip, *curtrip, *ref, *tripref, *y;
+	triple	*chktrip, *curtrip, *tripref;
+#	ifndef i386
+	oprtype *j, *k;
+	triple	*ref, *ref1;
+#	endif
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
@@ -59,16 +57,14 @@ int resolve_ref(int errknt)
 		walktree((mvar *)mlabtab, resolve_lab, (char *)&errknt);
 	} else
 	{
+#		ifndef i386
 		if (!run_time && (cmd_qlf.qlf & CQ_DYNAMIC_LITERALS))
 		{	/* OC_LIT --> OC_LITC wherever OC_LIT is actually used, i.e. not a dead end */
 			dqloop(&t_orig, exorder, curtrip)
 			{
-				if (do_optimize(curtrip))
-				{	/* Attempt optimization without checking if's; there are too many conditions to check here,
-					   and we will be adding more in the near future
-					*/
-					/* Backup the pointer so that we rescan after changing the triple */
-					curtrip = curtrip->exorder.bl;
+				if ((OC_FNTEXT == curtrip->opcode) && (resolve_optimize(curtrip)))
+				{ /* resolve_optimize now only deals with $TEXT(), but could do more by removing 1st term below */
+					curtrip = curtrip->exorder.bl;	/* Backup to rescan after changing curtrip */
 					continue;
 				}
 				switch (curtrip->opcode)
@@ -107,7 +103,7 @@ int resolve_ref(int errknt)
 						}
 						break;
 				}
-				for (j = curtrip->operand, y = curtrip; j < ARRAYTOP(y->operand); )
+				for (j = curtrip->operand, ref = curtrip; j < ARRAYTOP(ref->operand); )
 				{	/* Iterate over all parameters of the current triple */
 					k = j;
 					while (INDR_REF == k->oprclass)
@@ -117,38 +113,41 @@ int resolve_ref(int errknt)
 						tripref = k->oprval.tref;
 						if (OC_PARAMETER == tripref->opcode)
 						{
-							y = tripref;
-							j = y->operand;
+							ref = tripref;
+							j = ref->operand;
 							continue;
 						}
 						if (OC_LIT == tripref->opcode)
 						{	/* Insert an OC_LITC to relay the OC_LIT result to curtrip */
-							ref = maketriple(OC_LITC);
-							ref->src = tripref->src;
-							ref->operand[0] = put_tref(tripref);
-							dqins(curtrip->exorder.bl, exorder, ref);
-							*k = put_tref(ref);
+							ref1 = maketriple(OC_LITC);
+							ref1->src = tripref->src;
+							ref1->operand[0] = put_tref(tripref);
+							dqins(curtrip->exorder.bl, exorder, ref1);
+							*k = put_tref(ref1);
 						}
 					}
 					j++;
 				}
 			}
 		}
+#		endif
 		COMPDBG(PRINTF("\n\n\n********************* New Compilation -- Begin resolve_ref scan **********************\n"););
 		dqloop(&t_orig, exorder, curtrip)
 		{	/* If the optimization was not executed earlier */
+			COMPDBG(PRINTF(" ************************ Triple Start **********************\n"););
+			COMPDBG(cdbg_dump_triple(curtrip, 0););
+#			ifndef i386
 			if (!run_time && !(cmd_qlf.qlf & CQ_DYNAMIC_LITERALS))
 			{
-				if (do_optimize(curtrip))
-				{	/* Attempt optimization without checking if's; there are too many conditions to check here,
-					   and we will be adding more in the near future
-					*/
-					curtrip = curtrip->exorder.bl;
+#			endif
+				if ((OC_FNTEXT == curtrip->opcode) && (resolve_optimize(curtrip)))
+				{ /* resolve_optimize now only deals with $TEXT(), but could do more by removing 1st term below */
+					curtrip = curtrip->exorder.bl;	/* Backup to rescan after changing curtrip */
 					continue;
 				}
+#			ifndef i386
 			}
-			COMPDBG(PRINTF(" ************************ Triple Start **********************\n"););
-			COMPDBG(cdbg_dump_triple(curtrip, 0););
+#			endif
 			for (opnd = curtrip->operand; opnd < ARRAYTOP(curtrip->operand); opnd++)
 			{
 				if (INDR_REF == opnd->oprclass)
@@ -166,10 +165,7 @@ int resolve_ref(int errknt)
 					continue;
 				case MNXL_REF:	/* external reference to the routine (not within the routine) */
 					mxl = opnd->oprval.mlin->child;
-					if (mxl)
-						tripref = mxl->externalentry;
-					else
-						tripref = 0;
+					tripref = mxl ? mxl->externalentry : NULL;
 					if (!tripref)
 					{	/* ignore vacuous DO sp sp */
 						curtrip->opcode = OC_NOOP;
@@ -181,7 +177,7 @@ int resolve_ref(int errknt)
 				case MLAB_REF:	/* target label should have no parms; this is DO without parens or args */
 					assert(!run_time);
 					mlbx = opnd->oprval.lab;
-					tripref = mlbx->ml ? mlbx->ml->externalentry : 0;
+					tripref = mlbx->ml ? mlbx->ml->externalentry : NULL;
 					if (tripref)
 					{
 						opnd->oprclass = TJMP_REF;
@@ -194,8 +190,7 @@ int resolve_ref(int errknt)
 						tripref = newtriple(OC_RTERROR);
 						tripref->operand[0] = put_ilit(OC_JMP == curtrip->opcode
 							? ERR_LABELNOTFND : ERR_LABELUNKNOWN); /* special error for GOTO jmp */
-						/* This is a subroutine/func reference */
-						tripref->operand[1] = put_ilit(TRUE);
+						tripref->operand[1] = put_ilit(TRUE);	/* This is a subroutine/func reference */
 						opnd->oprval.tref = tripref;
 						opnd->oprclass = TJMP_REF;
 					}
@@ -209,18 +204,25 @@ int resolve_ref(int errknt)
 					chktrip = chktrip->operand[1].oprval.tref;
 					assert(OC_PARAMETER == chktrip->opcode);
 					assert(TRIP_REF == chktrip->operand[0].oprclass);
+#					ifdef __i386
+					assert(OC_ILIT == chktrip->operand[0].oprval.tref->opcode);
+					assert(ILIT_REF == chktrip->operand[0].oprval.tref->operand[0].oprclass);
+#					else
 					assert(OC_TRIPSIZE == chktrip->operand[0].oprval.tref->opcode);
 					assert(TSIZ_REF == chktrip->operand[0].oprval.tref->operand[0].oprclass);
+#					endif
 					chktrip = chktrip->operand[1].oprval.tref;
 					assert(OC_PARAMETER == chktrip->opcode);
 					assert(TRIP_REF == chktrip->operand[0].oprclass);
 					assert(OC_ILIT == chktrip->operand[0].oprval.tref->opcode);
 					assert(ILIT_REF == chktrip->operand[0].oprval.tref->operand[0].oprclass);
+#					ifndef __i386
 					chktrip = chktrip->operand[1].oprval.tref;
 					assert(OC_PARAMETER == chktrip->opcode);
 					assert(TRIP_REF == chktrip->operand[0].oprclass);
 					assert(OC_ILIT == chktrip->operand[0].oprval.tref->opcode);
 					assert(ILIT_REF == chktrip->operand[0].oprval.tref->operand[0].oprclass);
+#					endif
 					actcnt = chktrip->operand[0].oprval.tref->operand[0].oprval.ilit;
 					assert(0 <= actcnt);
 					mlbx = opnd->oprval.lab;
@@ -234,8 +236,7 @@ int resolve_ref(int errknt)
 							TREF(source_error_found) = 0;
 							tripref = newtriple(OC_RTERROR);
 							tripref->operand[0] = put_ilit(ERR_FMLLSTMISSING);
-							/* This is a subroutine/func reference */
-							tripref->operand[1] = put_ilit(TRUE);
+							tripref->operand[1] = put_ilit(TRUE);	/* subroutine/func reference */
 							opnd->oprval.tref = tripref;
 							opnd->oprclass = TJMP_REF;
 						} else if (mlbx->formalcnt < actcnt)
@@ -245,8 +246,7 @@ int resolve_ref(int errknt)
 							TREF(source_error_found) = 0;
 							tripref = newtriple(OC_RTERROR);
 							tripref->operand[0] = put_ilit(ERR_ACTLSTTOOLONG);
-							/* This is a subroutine/func reference */
-							tripref->operand[1] = put_ilit(TRUE);
+							tripref->operand[1] = put_ilit(TRUE);	/* subroutine/func reference */
 							opnd->oprval.tref = tripref;
 							opnd->oprclass = TJMP_REF;
 						} else
@@ -261,8 +261,7 @@ int resolve_ref(int errknt)
 						TREF(source_error_found) = 0;
 						tripref = newtriple(OC_RTERROR);
 						tripref->operand[0] = put_ilit(ERR_LABELUNKNOWN);
-						/* This is a subroutine/func reference */
-						tripref->operand[1] = put_ilit(TRUE);
+						tripref->operand[1] = put_ilit(TRUE);	/* subroutine/func reference */
 						opnd->oprval.tref = tripref;
 						opnd->oprclass = TJMP_REF;
 					}
@@ -301,147 +300,8 @@ void resolve_tref(triple *curtrip, oprtype *opnd)
 		} while (OC_PASSTHRU == (tripref = opnd->oprval.tref)->opcode);	/* note the assignment */
 	}
 	COMPDBG(PRINTF(" ** Passthru replacement: Operand at 0x%08lx replaced by operand at 0x%08lx\n",
-		       (long unsigned int) opnd, (long unsigned int)&tripref->operand[0]););
+		       (unsigned long)opnd, (unsigned long)&tripref->operand[0]););
 	tripbp = (tbp *)mcalloc(SIZEOF(tbp));
 	tripbp->bpt = curtrip;
 	dqins(&opnd->oprval.tref->backptr, que, tripbp);
 }
-
-STATICFNDCL bool do_optimize(triple *curtrip)
-{
-	int	i;
-	mstr	*source_line;
-	mval	tmp_mval;
-	tbp	*b;
-	triple	*ref, *y, *triple_temp;
-	triple	*line_offset, *label, *routine;
-	src_line_struct	*cur_line;
-	boolean_t negative, optimized = FALSE;
-	/* If we are resolving indirect's or something of the sort, die sadly */
-	assert(NULL != src_head.que.fl);
-	switch (curtrip->opcode)
-	{
-	case OC_FNTEXT:
-		/* If this is a OC_FNTEXT for the current routine, we can
-			optimize it by simply inserting the text string from
-			src_line_struct.que
-		*/
-		assert(OC_LITC != curtrip->operand[0].oprval.tref->opcode);
-		routine = curtrip->operand[1].oprval.tref->operand[1].oprval.tref;
-		line_offset = curtrip->operand[1].oprval.tref->operand[0].oprval.tref;
-		label = curtrip->operand[0].oprval.tref;
-		/* TODO: there should be a routine to verify literals for a given function */
-		if (MLIT_REF != routine->operand[0].oprclass)
-			break;
-		if (!WANT_CURRENT_RTN(&routine->operand[0].oprval.mlit->v))
-			break;
-		if (MLIT_REF != label->operand[0].oprclass)
-			break;
-		if (ILIT_REF != line_offset->operand[0].oprclass)
-			break;
-		/* If we're here, we have a $TEXT with all literals for the current routine */
-		source_line = (mstr *)mcalloc(SIZEOF(mstr));
-		/* Special case; label == "" && +0 means file name */
-		if (0 == label->operand[0].oprval.mlit->v.str.len
-			&& 0 == line_offset->operand[0].oprval.ilit)
-		{	/* Get filename, replace thing */
-			/* Find last /; this is the start of the filename */
-			source_line->len = routine_name.len;
-			source_line->addr = malloc(source_line->len);
-			memcpy(source_line->addr, routine_name.addr, source_line->len);
-		} else
-		{	/* Search through strings for label; if label == "" skip */
-			cur_line = src_head.que.fl;
-			negative = (0 > line_offset->operand[0].oprval.ilit);
-			if (0 != label->operand[0].oprval.mlit->v.str.len && cur_line != cur_line->que.fl)
-			{
-				for (i = 0; cur_line != &src_head; cur_line = cur_line->que.fl)
-				{
-					if (label->operand[0].oprval.mlit->v.str.len > cur_line->str.len)
-						continue;
-					if (label->operand[0].oprval.mlit->v.str.len != cur_line->str.len)
-					{
-						switch (cur_line->str.addr[label->operand[0].oprval.mlit->v.str.len])
-						{
-							case ' ':
-							case ';':
-							case '(':
-							case ':':
-								break;
-							default:
-								/* If we get here, it means we have a superstring of the label; 
-								 * i.e. searching for "a" found "abc" */
-								continue;
-						}
-					}
-					if (!strncmp(label->operand[0].oprval.mlit->v.str.addr, cur_line->str.addr,
-						label->operand[0].oprval.mlit->v.str.len))
-						break;
-				}
-				if (&src_head == cur_line)
-					break;
-					/* Error; let the runtime program deal with it for now */
-			} else
-			{	/* We need a special case to handle +0; if no label, it means start at top of file
-					and we begin counting on 1,
-					otherwise, it means the line that the label is on
-				*/
-				i = 1;
-			}
-			/* We could mod the offset by the size of the file, but hopefully no one is dumb enough to say +100000 */
-			/* Counting the number of lines in the file will be O(n), not worth it */
-			for (; i < (negative ? -1 : 1) * line_offset->operand[0].oprval.ilit && cur_line != &src_head; i++)
-			{
-				cur_line = (negative ? cur_line->que.bl : cur_line->que.fl);
-			}
-			/* If we went through all nodes and i is less than the line we are looking for, use an empty source line */
-			if (&src_head == cur_line)
-			{	/* Special case; we were counting backward, hit the end of the file, but we are done counting */
-				/* This means we should output the name of the routine */
-				if (i == (negative ? -1 : 1) * line_offset->operand[0].oprval.ilit
-					&& negative)
-				{
-					source_line->len = routine_name.len;
-					source_line->addr = malloc(source_line->len);
-					memcpy(source_line->addr, routine_name.addr, source_line->len);
-				} else
-				{
-					source_line->len = 0;
-					source_line->addr = 0;
-				}
-			} else
-			{
-				source_line->len = cur_line->str.len;
-				source_line->addr = malloc(source_line->len);
-				memcpy(source_line->addr, cur_line->str.addr, cur_line->str.len);
-			}
-		}
-		/* Insert literal into triple tree */
-		tmp_mval.mvtype = MV_STR;
-		/* Minus one so we don't copy newline character */
-		tmp_mval.str.len = (source_line->len == 0 ? 0 :
-			source_line->len - (source_line->addr[source_line->len-1] == '\n' ? 1 : 0));
-		ENSURE_STP_FREE_SPACE(tmp_mval.str.len);
-		tmp_mval.str.addr = (char *)stringpool.free;
-		memcpy(tmp_mval.str.addr, source_line->addr, tmp_mval.str.len);
-		/* Replace tab characters with spaces */
-		for (i = 0; i < tmp_mval.str.len && tmp_mval.str.addr[i] != ';'; i++)
-		{
-			if ('\t' == tmp_mval.str.addr[i])
-				tmp_mval.str.addr[i] = ' ';
-		}
-		stringpool.free += tmp_mval.str.len;
-		if (source_line->addr != 0)
-			free(source_line->addr);
-		/* Update all things that referenced this value */
-		curtrip->opcode = OC_LIT;
-		put_lit_s(&tmp_mval, curtrip);
-		label->opcode = OC_NOOP;
-		line_offset = OC_NOOP;
-		routine->opcode = OC_NOOP;
-		optimized = TRUE;
-		break;
-		/* If no cases no optimizations to perform.... yet */
-	}
-	return optimized;
-}
diff --git a/sr_port/sec_shr_map_build.c b/sr_port/sec_shr_map_build.c
index 7e11964..3e28e94 100755
--- a/sr_port/sec_shr_map_build.c
+++ b/sr_port/sec_shr_map_build.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -10,6 +11,7 @@
  ****************************************************************/
 
 #include "mdef.h"
+
 #include "gdsroot.h"
 #include "gtm_facility.h"
 #include "fileinfo.h"
@@ -21,33 +23,32 @@
 #include "probe.h"
 #include "sec_shr_map_build.h"
 #include "min_max.h"
+#include "bit_set.h"
+#include "bit_clear.h"
 
-int sec_shr_map_build(sgmnt_addrs *csa, uint4 *array, unsigned char *base_addr, cw_set_element *cs, trans_num ctn, int bplmap)
+int sec_shr_map_build(sgmnt_addrs *csa, uint4 *array, unsigned char *base_addr, cw_set_element *cs, trans_num ctn)
 {
 	uint4			setbit;
 	unsigned char		*ptr;
-	uint4			bitnum, ret, prev;
-#ifdef UNIX
+	uint4			bitnum, prev;
 	uint4			(*bml_func)();
-#else	/* gtmsecshr on VMS uses a very minimal set of modules so we dont want to pull in bml_*() functions there
-	 * and hence avoid using function pointers
-	 */
-	uint4			bml_func;
-	uint4			bml_busy = 1, bml_free = 2, bml_recycled = 3;
-#endif
-#ifdef DEBUG
+#	ifdef DEBUG
 	int4			prev_bitnum, actual_cnt = 0;
-#endif
+#	endif
+	int4			bml_full;
+	sgmnt_data_ptr_t	csd;
+	node_local_ptr_t	cnl;
+	block_id		blk;
+	unsigned int		total_blks;
+	int			bplmap;
 
-	assert(csa->now_crit || (ctn < csa->hdr->trans_hist.curr_tn));
-	assert(!csa->now_crit || (ctn == csa->hdr->trans_hist.curr_tn));
-	((blk_hdr *)base_addr)->tn = ctn;
+	blk = cs->blk;
+	assert(csa->now_crit && (ctn == csa->hdr->trans_hist.curr_tn));
+	((blk_hdr_ptr_t)base_addr)->tn = ctn;
 	base_addr += SIZEOF(blk_hdr);
-	if (!GTM_PROBE(bplmap / 8, base_addr, WRITE))
-	{
-		assert(FALSE);
-		return FALSE;
-	}
+	csd = csa->hdr;
+	cnl = csa->nl;
+	bplmap = csd->bplmap;
 	/* The following PROBE's are needed before DETERMINE_BML_FUNC, as the macro uses these pointers. */
 	if (!GTM_PROBE(SIZEOF(sgmnt_addrs), csa, READ))
 	{
@@ -74,11 +75,11 @@ int sec_shr_map_build(sgmnt_addrs *csa, uint4 *array, unsigned char *base_addr,
 			return FALSE;
 		}
 		bitnum = *array;
-		assert((uint4)bitnum < csa->hdr->bplmap);	/* check that bitnum is positive and within 0 to bplmap */
+		assert((uint4)bitnum < bplmap);	/* check that bitnum is positive and within 0 to bplmap */
 		if (0 == bitnum)
 		{
 			assert(actual_cnt == cs->reference_cnt);
-			return TRUE;
+			break;
 		}
 		assert((int4)bitnum > prev_bitnum);	/* assert that blocks are sorted in the update array */
 		DEBUG_ONLY(prev_bitnum = (int4)bitnum);
@@ -96,11 +97,11 @@ int sec_shr_map_build(sgmnt_addrs *csa, uint4 *array, unsigned char *base_addr,
 			DEBUG_ONLY(actual_cnt++);
 		} else
 		{
-			DEBUG_ONLY(
-				prev = ((*ptr >> setbit) & 1);	/* prev is 0 is block WAS busy and 0 otherwise */
-				if (!prev)
-					actual_cnt--;
-			)
+#			ifdef DEBUG
+			prev = ((*ptr >> setbit) & 1);	/* prev is 0 is block WAS busy and 0 otherwise */
+			if (!prev)
+				actual_cnt--;
+#			endif
 			if (bml_recycled == bml_func)
 				*ptr |= (3 << setbit);	/* mark block as RECYCLED (11) */
 			else
@@ -111,4 +112,18 @@ int sec_shr_map_build(sgmnt_addrs *csa, uint4 *array, unsigned char *base_addr,
 		}
 		++array;
 	}
+	/* Fix the local bitmap full/free status in the mastermap */
+	total_blks = ((csd->trans_hist.total_blks / bplmap) * bplmap == blk) ? csd->trans_hist.total_blks - blk : bplmap;
+	bml_full = bml_find_free(0, base_addr, total_blks);
+	if (NO_FREE_SPACE == bml_full)
+	{
+		bit_clear(blk / bplmap, MM_ADDR(csd));
+		if (blk > cnl->highest_lbm_blk_changed)
+			cnl->highest_lbm_blk_changed = blk;
+	} else if (!(bit_set(blk / bplmap, MM_ADDR(csd))))
+	{
+		if (blk > cnl->highest_lbm_blk_changed)
+			cnl->highest_lbm_blk_changed = blk;
+	}
+	return TRUE;
 }
diff --git a/sr_port/sec_shr_map_build.h b/sr_port/sec_shr_map_build.h
index 7f320a5..ba4a98a 100755
--- a/sr_port/sec_shr_map_build.h
+++ b/sr_port/sec_shr_map_build.h
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2007 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -12,6 +13,6 @@
 #ifndef SEC_SHR_MAP_BUILD_INCLUDED
 #define SEC_SHR_MAP_BUILD_INCLUDED
 
-int sec_shr_map_build(sgmnt_addrs *csa, uint4 *array, unsigned char *base_addr, cw_set_element *cs, trans_num ctn, int bplmap);
+int sec_shr_map_build(sgmnt_addrs *csa, uint4 *array, unsigned char *base_addr, cw_set_element *cs, trans_num ctn);
 
 #endif /* SEC_SHR_MAP_BUILD_INCLUDED */
diff --git a/sr_port/secshr_db_clnup.c b/sr_port/secshr_db_clnup.c
old mode 100755
new mode 100644
index f0a3fe1..9198d7f
--- a/sr_port/secshr_db_clnup.c
+++ b/sr_port/secshr_db_clnup.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information 	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -12,12 +12,6 @@
 
 #include "mdef.h"
 
-#ifdef VMS
-#include <ssdef.h>
-#include <psldef.h>
-#include <descrip.h>
-#endif
-
 #include "gtm_inet.h"
 #include "gtm_string.h"
 
@@ -34,9 +28,6 @@
 #include "gdsbml.h"
 #include "gdskill.h"
 #include "copy.h"
-#ifdef VMS
-#include "lockconst.h"
-#endif
 #include "interlock.h"
 #include "jnl.h"
 #include "probe.h"
@@ -51,14 +42,12 @@
 #include "aswp.h"
 #include "util.h"
 #include "compswap.h"
-#ifdef UNIX
 #include "mutex.h"
 #include "repl_instance.h"	/* needed for JNLDATA_BASE_OFF macro */
 #include "mupipbckup.h"		/* needed for backup_block prototype */
 #include "cert_blk.h"		/* for CERT_BLK_IF_NEEDED macro */
 #include "relqueopi.h"		/* for INSQTI and INSQHI macros */
 #include "caller_id.h"
-#endif
 #include "sec_shr_blk_build.h"
 #include "sec_shr_map_build.h"
 #include "add_inter.h"
@@ -68,11 +57,11 @@
 #include "memcoherency.h"
 #include "shmpool.h"
 #include "wbox_test_init.h"
-#ifdef GTM_SNAPSHOT
 #include "db_snapshot.h"
-#endif
 #include "muextr.h"
 #include "mupip_reorg.h"
+#include "t_abort.h"
+#include "op.h"
 
 /* This section documents DOs and DONTs about code used by GTMSECSHR on Alpha VMS. Any module linked into GTMSECSHR (see
  * secshrlink.axp for the current list) must follow certain rules as GTMSECSHR provides user-defined system services
@@ -109,7 +98,7 @@
 		continue;										\
 	if (!GTM_PROBE(SIZEOF(gd_segment), (reg)->dyn.addr, READ))					\
 		continue; /* would be nice to notify the world of a problem but where and how? */	\
-	if ((dba_bg != (reg)->dyn.addr->acc_meth) && (dba_mm != (reg)->dyn.addr->acc_meth))		\
+	if (!IS_REG_BG_OR_MM(reg))									\
 		continue;										\
 	if (!GTM_PROBE(SIZEOF(file_control), (reg)->dyn.addr->file_cntl, READ))				\
 		continue; /* would be nice to notify the world of a problem but where and how? */	\
@@ -126,13 +115,9 @@
 #  define DEBUG_LATCH(x)
 #endif
 
-#ifdef VMS
-/* Use compswap_secshr instead of compswap in our expansions */
-#  define compswap compswap_secshr
-#  define SALVAGE_UNIX_LATCH(X, is_exiting)
-#else
 #  define SALVAGE_UNIX_LATCH_DBCRIT(X, is_exiting, wcblocked)								\
-{	/* "wcblocked" is relevant only if X is the database crit semaphore. In this case, BEFORE salvaging crit,	\
+MBSTART {														\
+	/* "wcblocked" is relevant only if X is the database crit semaphore. In this case, BEFORE salvaging crit,	\
 	 * (but AFTER ensuring the previous holder pid is dead) we need to set cnl->wc_blocked to TRUE to		\
 	 * ensure whoever grabs crit next does a cache-recovery. This is necessary in case previous holder of crit	\
 	 * had set some cr->in_cw_set to a non-zero value. Not doing cache recovery could cause incorrect assertpro()s	\
@@ -147,28 +132,24 @@
 			SET_LATCH_GLOBAL(X, LOCK_AVAILABLE);								\
 			DEBUG_LATCH(util_out_print("Latch cleaned up", FLUSH));						\
 		}													\
-	} else if (0 != pid && FALSE == is_proc_alive(pid, UNIX_ONLY(0) VMS_ONLY((X)->u.parts.latch_image_count)))	\
+	} else if (0 != pid && FALSE == is_proc_alive(pid, 0))								\
 	{														\
 		(wcblocked) = TRUE;											\
 		DEBUG_LATCH(util_out_print("Orphaned latch cleaned up", TRUE));						\
 		COMPSWAP_UNLOCK((X), pid, (X)->u.parts.latch_image_count, LOCK_AVAILABLE, 0);				\
 	}														\
-}
+} MBEND
 
 /* The SALVAGE_UNIX_LATCH macro needs to do exactly the same thing as done by the SALVAGE_UNIX_LATCH_DBCRIT	\
- * macro except that we dont need any special set of wc_blocked to TRUE. So we pass in a dummy variable		\
+ * macro except that we don't need any special set of wc_blocked to TRUE. So we pass in a dummy variable	\
  * (instead of cnl->wc_blocked) to be set to TRUE in case the latch is salvaged.				\
  */														\
 #define	SALVAGE_UNIX_LATCH(X, is_exiting)									\
-{														\
+MBSTART {													\
 	boolean_t	dummy;											\
 														\
 	SALVAGE_UNIX_LATCH_DBCRIT(X, is_exiting, dummy);							\
-}
-
-GBLREF	uint4		process_id;	/* Used in xxx_SWAPLOCK macros .. has same value as rundown_process_id on UNIX */
-GBLREF	volatile int4	crit_count;
-#endif
+} MBEND
 
 GBLDEF gd_addr_fn_ptr	get_next_gdr_addrs;
 GBLDEF cw_set_element	*cw_set_addrs;
@@ -188,21 +169,24 @@ GBLDEF sgmnt_addrs 	**kip_csa_addrs;
 GBLDEF boolean_t	*need_kip_incr_addrs;
 GBLDEF trans_num	*start_tn_addrs;
 
-#ifdef UNIX
+GBLREF	uint4			process_id;	/* Used in xxx_SWAPLOCK macros .. has same value as rundown_process_id on UNIX */
+GBLREF	volatile int4		crit_count;
 GBLREF	short			crash_count;
 GBLREF	node_local_ptr_t	locknl;
 GBLREF	inctn_opcode_t		inctn_opcode;
 GBLREF	inctn_detail_t		inctn_detail;			/* holds detail to fill in to inctn jnl record */
 GBLREF	boolean_t		dse_running;
 GBLREF	boolean_t		certify_all_blocks;
-GBLREF	gd_region		*gv_cur_region;		/* for the LOCK_HIST macro in the RELEASE_BUFF_UPDATE_LOCK macro */
+GBLREF	gd_region		*gv_cur_region;
 GBLREF	node_local_ptr_t	locknl;			/* set explicitly before invoking RELEASE_BUFF_UPDATE_LOCK macro */
 GBLREF	int4			strm_index;
 GBLREF	jnl_gbls_t		jgbl;
-#endif
+GBLREF	cache_rec_ptr_t		cr_array[]; /* Maximum number of blocks that can be in transaction */
+GBLREF	unsigned int		cr_array_index;
+GBLREF	sgmnt_addrs		*cs_addrs;
 
 #ifdef DEBUG
-GBLREF	sgmnt_addrs		*cs_addrs;
+GBLREF	volatile boolean_t	in_wcs_recover; /* TRUE if in "wcs_recover" */
 #endif
 
 error_def(ERR_WCBLOCKED);
@@ -229,13 +213,13 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 	boolean_t		update_underway = FALSE;	/* set to TRUE if either TP or non-TP commit was underway */
 	boolean_t		set_wc_blocked = FALSE;		/* set to TRUE if cnl->wc_blocked needs to be set */
 	boolean_t		dont_reset_data_invalid;	/* set to TRUE in case cr->data_invalid was TRUE in phase2 */
-	int			max_bts;
+	int			max_bts, old_mode;
 	unsigned int		lcnt;
 	cache_rec_ptr_t		clru, cr, cr_alt, cr_top, start_cr, actual_cr;
 	cache_que_heads_ptr_t	cache_state;
 	cw_set_element		*cs, *cs_ptr, *cs_top, *first_cw_set, *nxt, *orig_cs;
 	gd_addr			*gd_header;
-	gd_region		*reg, *reg_top;
+	gd_region		*reg, *reg_top, *save_gv_cur_region;
 	jnl_buffer_ptr_t	jbp;
 	off_chain		chain;
 	sgm_info		*si, *firstsgminfo;
@@ -255,20 +239,19 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 	srch_blk_status		*t1;
 	trans_num		currtn;
 	int4			n;
-#	ifdef VMS
-	uint4			process_id;	/* needed for the UNPIN_CACHE_RECORD macro */
+	snapshot_context_ptr_t	lcl_ss_ctx;
+	cache_rec_ptr_t		snapshot_cr;
+	uint4			blk_size;
+#	ifdef DEBUG
+	cache_rec_ptr_t		*crArray;
+	unsigned int		crArrayIndex;
 #	endif
-	GTM_SNAPSHOT_ONLY(
-		snapshot_context_ptr_t	lcl_ss_ctx;
-		cache_rec_ptr_t		snapshot_cr;
-	)
-#	ifdef UNIX
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
-#	endif
 	if (NULL == get_next_gdr_addrs)
 		return;
+	save_gv_cur_region = gv_cur_region;	/* save it for use at function end in case code in between changes this variable */
 	/*
 	 * secshr_db_clnup can be called with one of the following three values for "secshr_state"
 	 *
@@ -342,9 +325,7 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 	 * If a non-TP transaction has proceeded to step (6), then "non_tp_update_underway" is set to TRUE
 	 * and the transaction cannot be rolled back but has to be committed. Otherwise the transaction is rolled back.
 	 */
-	UNIX_ONLY(assert(rundown_process_id == process_id);)
-	VMS_ONLY(assert(rundown_process_id);)
-	VMS_ONLY(process_id = rundown_process_id;)	/* used by the UNPIN_CACHE_RECORD macro */
+	assert(rundown_process_id == process_id);
 	is_exiting = (ABNORMAL_TERMINATION == secshr_state) || (NORMAL_TERMINATION == secshr_state);
 	if (GTM_PROBE(SIZEOF(*start_tn_addrs), start_tn_addrs, READ))
 		currtn = *start_tn_addrs;
@@ -479,9 +460,10 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 				{
 					if (csa->timer)
 					{
-						if (-1 < cnl->wcs_timers) /* private flag is optimistic: dont overdo */
+						if (-1 < cnl->wcs_timers) /* private flag is optimistic: don't overdo */
 							PROBE_DECR_CNT(&cnl->wcs_timers, &cnl->wc_var_lock);
 						REMOVE_WT_PID(csa);
+						csa->canceled_flush_timer = TRUE;
 						csa->timer = FALSE;
 					}
 					if (csa->read_write && csa->ref_cnt)
@@ -506,11 +488,11 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 			set_wc_blocked = FALSE;
 			if (is_bg)
 			{
-				if ((0 == cnl->sec_size) || !GTM_PROBE(cnl->sec_size VMS_ONLY(* OS_PAGELET_SIZE), cnl, WRITE))
+				if ((0 == cnl->sec_size) || !GTM_PROBE(cnl->sec_size, cnl, WRITE))
 				{
 					SECSHR_ACCOUNTING(3);
 					SECSHR_ACCOUNTING(__LINE__);
-					SECSHR_ACCOUNTING(cnl->sec_size VMS_ONLY(* OS_PAGELET_SIZE));
+					SECSHR_ACCOUNTING(cnl->sec_size);
 					assert(FALSE);
 					continue;
 				}
@@ -525,6 +507,7 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 				}
 				SALVAGE_UNIX_LATCH(&cache_state->cacheq_active.latch, is_exiting);
 				start_cr = cache_state->cache_array + csd->bt_buckets;
+				bufstart = (sm_uc_ptr_t)GDS_ANY_REL2ABS(csa, start_cr->buffaddr);
 				max_bts = csd->n_bts;
 				if (!GTM_PROBE((uint4)(max_bts * SIZEOF(cache_rec)), start_cr, WRITE))
 				{
@@ -555,21 +538,11 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 							cr->blk = CR_BLKEMPTY;
 							/* ensure no bt points to this cr for empty blk */
 							assert(0 == cr->bt_index);
-							/* don't mess with ownership the I/O may not yet be cancelled;
-							 * ownership will be cleared by whoever gets stuck waiting
-							 * for the buffer */
-						}
-					}
-#					ifdef VMS	/* though gone could potentially be an async I/O issue on other platforms */
-					for (cr = start_cr;  cr < cr_top;  cr++)
-					{	/* walk the cache looking for incomplete writes and reads issued by self */
-						if ((0 == cr->iosb.cond) && (cr->epid == rundown_process_id))
-					        {
-							cr->shmpool_blk_off = 0;	/* Cut link to reformat blk */
-							cr->wip_stopped = TRUE;
+							/* Don't mess with ownership the I/O may not yet be cancelled.
+							 * Ownership will be cleared by whoever gets stuck waiting for the buffer.
+							 */
 						}
 					}
-#					endif
 				}
 			}
 			first_cw_set = cs = NULL;
@@ -653,9 +626,9 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 					/* This is a situation where we are in non-TP and have a region that we hold
 					 * crit in and are in the midst of commit but this region was not the current
 					 * region when we entered secshr_db_clnup. This is an out-of-design situation
-					 * that we want to catch in Unix (not VMS because it runs in kernel mode).
+					 * that we want to catch.
 					 */
-					UNIX_ONLY(assertpro(non_tp_update_underway));
+					assertpro(non_tp_update_underway);
 					non_tp_update_underway = TRUE;	/* just in case */
 					update_underway = TRUE;		/* just in case */
 				}
@@ -663,12 +636,12 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 			assert(!tp_update_underway || (NULL == first_cw_set) || (NULL != si));
 			/* It is possible that we were in the midst of a non-TP commit for this region at or past stage (7)
 			 * but first_cw_set is NULL. This is a case of duplicate SET with zero cw_set_depth. In this case,
-			 * dont have any cw-set-elements to commit. The only thing remaining to do is steps (9) through (12)
+			 * don't have any cw-set-elements to commit. The only thing remaining to do is steps (9) through (12)
 			 * which are done later in this function.
 			 */
 			assert((FALSE == csa->t_commit_crit) || (T_COMMIT_CRIT_PHASE1 == csa->t_commit_crit)
 								|| (T_COMMIT_CRIT_PHASE2 == csa->t_commit_crit));
-			assert(!csa->t_commit_crit || (NULL != first_cw_set));	/* dont miss out committing a region */
+			assert(!csa->t_commit_crit || (NULL != first_cw_set));	/* don't miss out committing a region */
 			/* Skip processing region in case of a multi-region TP transaction where this region is already committed */
 			assert((NULL == first_cw_set) || csa->now_crit || csa->t_commit_crit || tp_update_underway);
 			if ((csa->now_crit || csa->t_commit_crit) && (NULL != first_cw_set))
@@ -712,7 +685,7 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 				}
 				/* Determine transaction number to use for the gvcst_*_build functions.
 				 * If not phase2, then we have crit, so it is the same as the current database transaction number.
-				 * If phase2, then we dont have crit, so use value stored in "start_tn" or "si->start_tn".
+				 * If phase2, then we don't have crit, so use value stored in "start_tn" or "si->start_tn".
 				 */
 				if (T_COMMIT_CRIT_PHASE2 != csa->t_commit_crit)
 					currtn = csd->trans_hist.curr_tn;
@@ -722,6 +695,7 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 						currtn = si->start_tn;
 					assert(currtn < csd->trans_hist.curr_tn);
 				}
+				blk_size = csd->blk_size;
 				for (; (tp_update_underway  &&  NULL != cs) || (!tp_update_underway  &&  cs < cs_top);
 					cs = tp_update_underway ? orig_cs->next_cw_set : (cs + 1))
 				{
@@ -772,28 +746,26 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 							 * pass the global variable array "cr_array" from GTM to GTMSECSHR which
 							 * is better avoided. Since anyways we have crit at this point, we are
 							 * going to set wc_blocked later which is going to trigger cache recovery
-							 * that is going to unpin all the cache-records so we dont take the
+							 * that is going to unpin all the cache-records so we don't take the
 							 * trouble to do it here.
 							 */
 						} else
 						{	/* Currently there are only two possibilities and both are in TP.
 							 * In either case, need to simulate what tp_tend would have done which
 							 * is to build a private copy right now if this is the first phase of
-							 * commit (i.e. we hold crit) as this could be needed in the 2nd phase
+							 * KILL (i.e. we hold crit) as this could be needed in the 2nd phase
 							 * of KILL.
 							 */
 							assert(tp_update_underway);
 							assert((kill_t_write == cs->mode) || (kill_t_create == cs->mode));
-							if (csa->now_crit && (!cs->done))
+							if (csa->now_crit && !cs->done)
 							{
-#								ifdef UNIX
 								/* Initialize cs->new_buff to non-NULL since sec_shr_blk_build
-								 * expects this. For VMS, tp_tend would have done this already.
+								 * expects this.
 								 */
 								if (NULL == cs->new_buff)
 									cs->new_buff = (unsigned char *)
 											get_new_free_element(si->new_buff_list);
-#								endif
 								assert(NULL != cs->new_buff);
 								blk_ptr = (sm_uc_ptr_t)cs->new_buff;
 								/* No need to probe blk_ptr as sec_shr_blk_build does that */
@@ -855,12 +827,8 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 								}
 								cs->done = TRUE;
 								assert(NULL != cs->blk_target);
-								/* cert_blk cannot be done in VMS as it is a heavyweight routine
-								 * and cannot be pulled into GTMSECSHR. Hence do it only in Unix.
-								 */
-								UNIX_ONLY(assert(NULL == gvt);)
-								UNIX_ONLY(CERT_BLK_IF_NEEDED(certify_all_blocks, gv_cur_region,
-											cs, cs->new_buff, gvt);)
+								assert(NULL == gvt);
+								CERT_BLK_IF_NEEDED(certify_all_blocks, reg, cs, cs->new_buff, gvt);
 							}
 						}
 						cs->old_mode = (int4)cs->mode;
@@ -868,9 +836,10 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 						cs->mode = gds_t_committed;
 						continue;
 					}
+					old_mode = cs->old_mode;
 					if (gds_t_committed == cs->mode)
 					{	/* already processed */
-						assert(0 < cs->old_mode);
+						assert(0 < old_mode);
 						if (T_COMMIT_CRIT_PHASE1 == csa->t_commit_crit)
 						{
 							assert(csa->now_crit);
@@ -890,9 +859,9 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 								this_reg_commit_type = REG_COMMIT_COMPLETE;
 						}
 						cr = cs->cr;
-						assert(!dlr_tlevel || (gds_t_write_root != cs->old_mode));
-						assert(gds_t_committed != cs->old_mode);
-						if (gds_t_committed > cs->old_mode)
+						assert(!dlr_tlevel || (gds_t_write_root != old_mode));
+						assert(gds_t_committed != old_mode);
+						if (gds_t_committed > old_mode)
 						{
 							if (!GTM_PROBE(SIZEOF(cache_rec), cr, WRITE))
 							{
@@ -909,10 +878,11 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 						{	/* For the kill_t_* case, cs->cr will be NULL as bg_update was not invoked
 							 * and the cw-set-elements were memset to 0 in TP. But for gds_t_write_root
 							 * and gds_t_busy2free, they are non-TP ONLY modes and cses are not
-							 * initialized so cant check for NULL cr. Thankfully "n_gds_t_op" demarcates
-							 * the boundaries between non-TP only and TP only modes. So use that.
+							 * initialized so can't check for NULL cr. Thankfully "n_gds_t_op"
+							 * demarcates the boundaries between non-TP only and TP only modes.
+							 * So use that.
 							 */
-							assert((n_gds_t_op > cs->old_mode) || (NULL == cr));
+							assert((n_gds_t_op > old_mode) || (NULL == cr));
 						}
 						continue;
 					}
@@ -931,9 +901,11 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 					}
 					if (is_bg)
 					{
-						if (T_COMMIT_CRIT_PHASE2 != csa->t_commit_crit)
-						{	/* We are not yet in phase2 which means we hold crit on this region,
-							 * so have to find out a free cache-record we can dump our updates onto.
+						assert((T_COMMIT_CRIT_PHASE2 != csa->t_commit_crit) || (0 > old_mode));
+						if (0 <= old_mode)
+						{	/* We did not yet finish phase1 of commit for this cs which means we
+							 * hold crit on this region, so have to find out a free cache-record
+							 * we can dump our updates onto.
 							 */
 							for ( ; lcnt++ < max_bts; )
 							{	/* find any available cr */
@@ -944,7 +916,7 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 									&& (0 == clru->in_cw_set)
 									&& (!clru->in_tend)
 									&& (-1 == clru->read_in_progress)
-									&& GTM_PROBE(csd->blk_size,
+									&& GTM_PROBE(blk_size,
 										GDS_ANY_REL2ABS(csa, clru->buffaddr), WRITE))
 									break;
 							}
@@ -968,7 +940,8 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 							cr->blk = cs->blk;
 							assert(CR_BLKEMPTY != cr->blk);
 							cr->jnl_addr = cs->jnl_freeaddr;
-							cr->stopped = TRUE;
+							assert(!cr->twin);
+							cr->stopped = process_id;
 							/* Keep cs->cr and t1->cr uptodate to ensure clue will be accurate */
 							cs->cr = cr;
 							cs->cycle = cr->cycle;
@@ -994,8 +967,9 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 								}
 							}
 						} else
-						{	/* We are in PHASE2 of the commit (i.e. have completed PHASE1 for ALL cses)
-							 * We have already picked out a cr for the commit. Use that.
+						{	/* "old_mode < 0" implies we are done PHASE1 of the commit for this cs
+							 * and have already picked out a cr for the commit but did not finish
+							 * phase2 yet. Use the picked out "cr" and finish phase2.
 							 */
 							cr = cs->cr;
 							if (!GTM_PROBE(SIZEOF(cache_rec), cr, WRITE))
@@ -1007,17 +981,7 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 								assert(FALSE);
 								continue;
 							}
-							if (rundown_process_id != cr->in_tend)
-							{	/* phase2 commit is already complete for this cse but we got
-								 * interrupted before setting cs->mode to gds_t_committed.
-								 * Possible that this cache-record is not placed in the active
-								 * queue properly. Any case set_wc_blocked is already set so that
-								 * should take care of invoking wcs_recover to fix the queues.
-								 */
-								assert(rundown_process_id != cr->in_cw_set);
-								assert(rundown_process_id != cr->data_invalid);
-								continue;
-							}
+							assert(rundown_process_id == cr->in_tend);
 							assert(rundown_process_id == cr->in_cw_set);
 							assert(cr->blk == cs->cr->blk);
 							if (cr->data_invalid)
@@ -1049,87 +1013,41 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 						 * blocks are not back'ed up either by secshr_db_clnup or wcs_recover.
 						 */
 						if ((SNAPSHOTS_IN_PROG(csa) || (BACKUP_NOT_IN_PROGRESS != cnl->nbb))
-							&& (NULL != cs->old_block))
+												&& (NULL != cs->old_block))
 						{
-							DEBUG_ONLY(GTM_SNAPSHOT_ONLY(snapshot_cr = NULL;)) /* Will be set below */
-							if (T_COMMIT_CRIT_PHASE2 != csa->t_commit_crit)
-							{	/* Set "cr->twin" to point to "cs->old_block". This is not normal
-								 * usage since "twin" usually points to a cache-record. But this
-								 * is a special case where we want to record the before-image
-								 * somewhere for wcs_recover to see and we are not allowed division
-								 * operations in secshr_db_clnup (which is required to find out the
-								 * corresponding cache-record). Hence we store the relative offset
-								 * of "cs->old_block". This is a special case where "cr->twin" can
-								 * be non-zero even in Unix. wcs_recover will recognize this special
-								 * usage of "twin" (since cr->stopped is non-zero as well) and fix
-								 * it. Note that in VMS, it is possible to have two other crs for
-								 * the same block cr1, cr2 which are each twinned so we could end
-								 * up with the following twin configuration.
-								 *	cr1 <---> cr2 <--- cr
-								 * Note cr->twin = cr2 is a one way link and stores "cs->old_block",
-								 * while "cr1->twin" and "cr2->twin" store each other's cacherecord
-								 * pointers.
-								 */
-#								ifdef UNIX
-								bufstart = (sm_uc_ptr_t)GDS_ANY_REL2ABS(csa, start_cr->buffaddr);
-								bufindx = (int4)(cs->old_block - bufstart) / csd->blk_size;
-								assert(0 <= bufindx);
-								assert(bufindx < csd->n_bts);
-								cr_alt = &start_cr[bufindx];
-								assert(cr_alt != cr);
-								assert(cs->blk == cr_alt->blk);
-								assert(rundown_process_id == cr_alt->in_cw_set);
-								snapshot_cr = cr_alt;
-#								endif
-								/* wcs_recover need not copy before images of FREE blocks
-								 * to the backup buffer */
-								if (!WAS_FREE(cs->blk_prior_state))
-									cr->twin = GDS_ANY_ABS2REL(csa, cs->old_block);
-							} else
-							{	/* We have to finish phase2 update.
-								 * If Unix, we backup the block right here instead of waiting for
-								 * wcs_recover to do it. If VMS, we dont need to do anything as
-								 * the block has already been backed up in phase1. See end of
-								 * bg_update_phase1 for comment on why.
-								 */
-#								ifdef UNIX
-								/* The following check is similar to the one in BG_BACKUP_BLOCK
-								 * and the one in wcs_recover (where backup_block is invoked)
+							/* If online backup is concurrently running, backup the block here */
+							blk_hdr_ptr = (blk_hdr_ptr_t)cs->old_block;
+							ASSERT_IS_WITHIN_SHM_BOUNDS((sm_uc_ptr_t)blk_hdr_ptr, csa);
+							bufindx = ((sm_uc_ptr_t)blk_hdr_ptr - bufstart) / blk_size;
+							assert(0 <= bufindx);
+							assert(bufindx < csd->n_bts);
+							cr_alt = &start_cr[bufindx];
+							assert(!cr->stopped || (cr != cr_alt));
+							/* The following check is similar to the one in BG_BACKUP_BLOCK */
+							if (!WAS_FREE(cs->blk_prior_state) && (cr_alt->blk >= cnl->nbb)
+								&& (0 == csa->shmpool_buffer->failed)
+								&& (blk_hdr_ptr->tn < csa->shmpool_buffer->backup_tn)
+								&& (blk_hdr_ptr->tn >= csa->shmpool_buffer->inc_backup_tn))
+							{
+								assert(cr->stopped || (cr == cr_alt));
+								backup_block(csa, cr_alt->blk, cr_alt, NULL);
+								/* No need for us to flush the backup buffer.
+								 * MUPIP BACKUP will anyways flush it at the end.
 								 */
-								blk_hdr_ptr = (blk_hdr_ptr_t)cs->old_block;
-								assert(GDS_ANY_REL2ABS(csa, cr->buffaddr)
-										== (sm_uc_ptr_t)blk_hdr_ptr);
-								if (!WAS_FREE(cs->blk_prior_state) && (cr->blk >= cnl->nbb)
-									&& (0 == csa->shmpool_buffer->failed)
-									&& (blk_hdr_ptr->tn < csa->shmpool_buffer->backup_tn)
-									&& (blk_hdr_ptr->tn >= csa->shmpool_buffer->inc_backup_tn))
-								{
-									backup_block(csa, cr->blk, cr, NULL);
-									/* No need for us to flush the backup buffer.
-									 * MUPIP BACKUP will anyways flush it at the end.
-									 */
-								}
-								snapshot_cr = cr;
-#								endif
 							}
-#							ifdef GTM_SNAPSHOT
 							if (SNAPSHOTS_IN_PROG(csa))
 							{
 								lcl_ss_ctx = SS_CTX_CAST(csa->ss_ctx);
+								snapshot_cr = cr_alt;
 								if (snapshot_cr->blk < lcl_ss_ctx->total_blks)
-								{
-									assert(NULL != snapshot_cr);
-									assert((snapshot_cr == cr) || (snapshot_cr == cr_alt));
 									WRITE_SNAPSHOT_BLOCK(csa, snapshot_cr, NULL,
 												snapshot_cr->blk, lcl_ss_ctx);
-								}
 							}
-#							endif
 						}
 						if (T_COMMIT_CRIT_PHASE2 != csa->t_commit_crit)
 						{	/* Adjust blks_to_upgrd counter if not already done in phase1. The value of
 							 * cs->old_mode if negative implies phase1 is complete on this cse so we
-							 * dont need to do this adjustment again. If not we do the adjustment.
+							 * don't need to do this adjustment again. If not we do the adjustment.
 							 */
 							assert((0 <= cs->old_mode) || (cs->old_mode == -cs->mode));
 							if (0 <= cs->old_mode)
@@ -1159,7 +1077,7 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 									/* actual_cr can be NULL if the block is NOT in the cache.
 									 * It can be CR_NOTVALID if the cache record originally
 									 * containing this block got reused for a different block
-									 * (i.e. cr->stopped = 1) as part of secshr_db_clnup.
+									 * (i.e. cr->stopped = non-zero) as part of secshr_db_clnup.
 									 */
 									assert((NULL == actual_cr)
 										|| ((cache_rec_ptr_t)CR_NOTVALID == actual_cr)
@@ -1191,15 +1109,15 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 						blk_ptr = (sm_uc_ptr_t)GDS_ANY_REL2ABS(csa, cr->buffaddr);
 					} else
 					{	/* access method is MM */
-						blk_ptr = MM_BASE_ADDR(csa) + (off_t)csd->blk_size * cs->blk;
-						if (!GTM_PROBE(csd->blk_size, blk_ptr, WRITE))
+						blk_ptr = MM_BASE_ADDR(csa) + (off_t)blk_size * cs->blk;
+						if (!GTM_PROBE(blk_size, blk_ptr, WRITE))
 						{
 							SECSHR_ACCOUNTING(7);
 							SECSHR_ACCOUNTING(__LINE__);
 							SECSHR_ACCOUNTING((INTPTR_T)cs);
 							SECSHR_ACCOUNTING(cs->blk);
 							SECSHR_ACCOUNTING((INTPTR_T)blk_ptr);
-							SECSHR_ACCOUNTING(csd->blk_size);
+							SECSHR_ACCOUNTING(blk_size);
 							SECSHR_ACCOUNTING((INTPTR_T)(MM_BASE_ADDR(csa)));
 							assert(FALSE);
 							continue;
@@ -1208,7 +1126,7 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 					/* The following block of code rolls forward steps (6a) and/or (13) of the commit */
 					if (cs->mode == gds_t_writemap)
 					{
-						if (!GTM_PROBE(csd->blk_size, cs->old_block, READ))
+						if (!GTM_PROBE(blk_size, cs->old_block, READ))
 						{
 							SECSHR_ACCOUNTING(11);
 							SECSHR_ACCOUNTING(__LINE__);
@@ -1220,13 +1138,12 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 							SECSHR_ACCOUNTING(cs->forward_process);
 							SECSHR_ACCOUNTING(cs->first_copy);
 							SECSHR_ACCOUNTING((INTPTR_T)cs->old_block);
-							SECSHR_ACCOUNTING(csd->blk_size);
+							SECSHR_ACCOUNTING(blk_size);
 							assert(FALSE);
 							continue;
 						}
-						memmove(blk_ptr, cs->old_block, csd->blk_size);
-						if (FALSE == sec_shr_map_build(csa, (uint4*)cs->upd_addr, blk_ptr, cs,
-							currtn, BM_SIZE(csd->bplmap)))
+						memmove(blk_ptr, cs->old_block, blk_size);
+						if (FALSE == sec_shr_map_build(csa, (uint4*)cs->upd_addr, blk_ptr, cs, currtn))
 						{
 							SECSHR_ACCOUNTING(11);
 							SECSHR_ACCOUNTING(__LINE__);
@@ -1402,14 +1319,12 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 					if (0 > cs->reference_cnt)
 					{	/* blocks were freed up */
 						assert(non_tp_update_underway);
-						UNIX_ONLY(
-							assert((&inctn_opcode == inctn_opcode_addrs)
-								&& (&inctn_detail == inctn_detail_addrs)
-								&& ((inctn_bmp_mark_free_gtm == inctn_opcode)
-									|| (inctn_bmp_mark_free_mu_reorg == inctn_opcode)
-									|| (inctn_blkmarkfree == inctn_opcode)
-									|| dse_running));
-						)
+						assert((&inctn_opcode == inctn_opcode_addrs)
+							&& (&inctn_detail == inctn_detail_addrs)
+							&& ((inctn_bmp_mark_free_gtm == inctn_opcode)
+								|| (inctn_bmp_mark_free_mu_reorg == inctn_opcode)
+								|| (inctn_blkmarkfree == inctn_opcode)
+								|| dse_running));
 						/* Check if we are freeing a V4 format block and if so decrement the
 						 * blks_to_upgrd counter. Do not do this in case MUPIP REORG UPGRADE/DOWNGRADE
 						 * is marking a recycled block as free (inctn_opcode is inctn_blkmarkfree).
@@ -1435,60 +1350,36 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 						 * right hand side of the below expression and assign the same value to the
 						 * left side, it is possible that a concurrent process holding crit could
 						 * have updated the free_blocks counter. In that case, our update would
-						 * result in incorrect values. Hence dont touch this field if phase2.
+						 * result in incorrect values. Hence don't touch this field if phase2.
 						 */
 						csd->trans_hist.free_blocks -= cs->reference_cnt;
 					}
 					cs->old_mode = (int4)cs->mode;
 					assert(0 < cs->old_mode);
 					cs->mode = gds_t_committed;	/* rolls forward step (14) */
-					UNIX_ONLY(
-						/* Do not do a cert_blk of bitmap here since it could give a DBBMMSTR error. The
-						 * bitmap block build is COMPLETE only in wcs_recover so do the cert_blk there.
-						 * Assert that the bitmap buffer will indeed go through cert_blk there.
-						 */
-						assert((cs->old_mode != gds_t_writemap) || !is_bg || cr->stopped);
-						if (cs->old_mode != gds_t_writemap)
-						{
-							assert(NULL == gvt);
-							CERT_BLK_IF_NEEDED(certify_all_blocks, reg, cs, blk_ptr, gvt);
-						}
-					)
+					assert(NULL == gvt);
+					CERT_BLK_IF_NEEDED(certify_all_blocks, reg, cs, blk_ptr, gvt);
 					if (is_bg && (rundown_process_id == cr->in_tend))
-					{	/* Reset cr->in_tend now that cr is uptodate. This way if at all wcs_recover
-						 * sees cr->in_tend set, it can be sure that was leftover from an interrupted
-						 * phase1 commit for which the complete commit happened in another cache-record
-						 * which will have cr->stopped set so the in_tend cache-record can be discarded.
+					{	/* Reset cr->in_tend now that cr is uptodate.
 						 * Take this opportunity to reset data_invalid, in_cw_set and the write interlock
 						 * as well thereby simulating exactly what bg_update_phase2 would have done.
-						 * This is easily done in Unix using the INSQ*I macros. But in VMS, these macros
-						 * will pull in extra routines (including wcs_sleep) into the privileged image
-						 * GTMSECSHR which we want to avoid. Therefore in VMS, we decide to skip the
-						 * part about re-inserting the dirty cache-record into the active queue.
-						 * The VMS version of wcs_get_space.c needs to take this into account while
-						 * it is waiting for a dirty cache-record (that it could not be in any queues).
 						 */
-						assert(T_COMMIT_CRIT_PHASE2 == csa->t_commit_crit);
 						if (!dont_reset_data_invalid)
 							cr->data_invalid = 0;
 						if (PROBE_EVEN(cr))
 						{	/* Release write interlock. The following code is very similar to that
 							 * at the end of the function "bg_update_phase2".
 							 */
-							UNIX_ONLY(
-								/* Avoid using gv_cur_region in the LOCK_HIST macro that is
-								 * used by the RELEASE_BUFF_UPDATE_LOCK macro by setting locknl
-								 */
-								locknl = cnl;
-							)
+							/* Avoid using gv_cur_region in the LOCK_HIST macro that is
+							 * used by the RELEASE_BUFF_UPDATE_LOCK macro by setting locknl
+							 */
+							locknl = cnl;
 							if (!cr->tn)
 							{
 								cr->jnl_addr = cs->jnl_freeaddr;
 								assert(LATCH_SET == WRITE_LATCH_VAL(cr));
-#								ifdef UNIX
 								/* cache-record was not dirty BEFORE this update.
-								 * insert this in the active queue. See comment above for
-								 * why this is done only in Unix and not VMS.
+								 * insert this in the active queue.
 								 */
 								n = INSQTI((que_ent_ptr_t)&cr->state_que,
 										(que_head_ptr_t)&cache_state->cacheq_active);
@@ -1503,29 +1394,16 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 									SECSHR_ACCOUNTING(cache_state->cacheq_active.bl);
 									assert(FALSE);
 								}
-								ADD_ENT_TO_ACTIVE_QUE_CNT(&cnl->wcs_active_lvl, &cnl->wc_var_lock);
-#								endif
+								ADD_ENT_TO_ACTIVE_QUE_CNT(cnl);
 							}
 							RELEASE_BUFF_UPDATE_LOCK(cr, n, &cnl->db_latch);
-							/* "n" holds the pre-release value in Unix and post-release value in VMS,
-							 * so check that we did hold the lock before releasing it above */
-							UNIX_ONLY(assert(LATCH_CONFLICT >= n);)
-							UNIX_ONLY(assert(LATCH_CLEAR < n);)
-							VMS_ONLY(assert(LATCH_SET >= n);)
-							VMS_ONLY(assert(LATCH_CLEAR <= n);)
+							/* "n" holds the pre-release value so check that we did hold the
+							 * lock before releasing it above.
+							 */
+							assert(LATCH_CONFLICT >= n);
+							assert(LATCH_CLEAR < n);
 							if (WRITER_BLOCKED_BY_PROC(n))
 							{
-								VMS_ONLY(
-									assert(LATCH_SET == WRITE_LATCH_VAL(cr));
-									RELEASE_BUFF_UPDATE_LOCK(cr, n, &cnl->db_latch);
-									assert(LATCH_CLEAR == n);
-									assert(0 != cr->epid);
-									assert(WRT_STRT_PNDNG == cr->iosb.cond);
-									cr->epid = 0;
-									cr->iosb.cond = 0;
-									cr->wip_stopped = FALSE;
-								)
-#								ifdef UNIX
 								n = INSQHI((que_ent_ptr_t)&cr->state_que,
 										(que_head_ptr_t)&cache_state->cacheq_active);
 								if (INTERLOCK_FAIL == n)
@@ -1539,16 +1417,40 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 									SECSHR_ACCOUNTING(cache_state->cacheq_active.bl);
 									assert(FALSE);
 								}
-#								endif
 							}
 						}
-						assert(process_id == cr->in_cw_set);
-						UNPIN_CACHE_RECORD(cr);
-						assert(!cr->in_cw_set);
-						SECSHR_SHM_WRITE_MEMORY_BARRIER;
-						cr->in_tend = 0;
+						RESET_CR_IN_TEND_AFTER_PHASE2_COMMIT(cr); /* resets cr->in_tend & cr->in_cw_set
+											   * (for older twin too if needed).
+											   */
 					}
 				}	/* for all cw_set entries */
+#				ifdef DEBUG
+				/* If we still hold crit, then we got a commit-time error in bg_update_phase1 which means we
+				 * would have pinned crs in t_end/tp_tend but would not have unpinned those here but instead
+				 * dumped the commits onto crs with cr->stopped a non-zero value. Accessing the original pinned
+				 * cr requires us to have access to the histories which are available in case of TP (through si)
+				 * but not easily in case of non-tp since those are passed as a parameter to t_end (and not
+				 * otherwise available through a global variable). Since we hold crit and we are going to anyways
+				 * set cnl->wc_blocked to TRUE a little later, the next process to get crit will run "wcs_recover"
+				 * which will take care of clearing the "in_cw_set". So no need to do the unpin here in that case.
+				 * On the other hand, if we don't have crit, we are done with phase1 of commit which means
+				 * all commits would go to crs that we have access to (through cs->cr) and so we should be able
+				 * to unpin exactly all of them. So assert accordingly below.
+				 */
+				if (!csa->now_crit)
+				{
+					if (tp_update_underway)
+					{
+						crArray = si->cr_array;
+						crArrayIndex = si->cr_array_index;
+					} else
+					{
+						crArray = cr_array;
+						crArrayIndex = cr_array_index;
+					}
+					ASSERT_CR_ARRAY_IS_UNPINNED(csd, crArray, crArrayIndex);
+				}
+#				endif
 				/* Check if kill_in_prog flag in file header has to be incremented. */
 				if (tp_update_underway)
 				{	/* TP : Do this only if GT.M has not already completed the commit on this region. */
@@ -1578,6 +1480,7 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 				} else
 				{	/* Non-TP. Check need_kip_incr and value pointed to by kip_csa. */
 					assert(non_tp_update_underway);
+					cr_array_index = 0; /* Take this opportunity to reset cr_array_index */
 					/* Note that *kip_csa_addrs could be NULL if we are in the
 					 * 1st phase of the M-kill and NON NULL if we are in the 2nd phase of the kill.
 					 * Only if it is NULL, should we increment the kill_in_prog flag.
@@ -1598,10 +1501,8 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 						PROBE_INCR_KIP(csd, csa, *kip_csa_addrs);
 						*need_kip_incr_addrs = FALSE;
 					}
-#					ifdef UNIX
 					if (MUSWP_INCR_ROOT_CYCLE == TREF(in_mu_swap_root_state))
 						cnl->root_search_cycle++;
-#					endif
 				}
 			}	/* if (NULL != first_cw_set) */
 			/* If the process is about to exit AND any kills are in progress (bitmap freeup phase of kill), mark
@@ -1666,31 +1567,14 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 					if (GTM_PROBE(SIZEOF(jnl_buffer), jbp, WRITE) && is_exiting)
 					{
 						SALVAGE_UNIX_LATCH(&jbp->fsync_in_prog_latch, is_exiting);
-						if (VMS_ONLY(csa->jnl->qio_active)
-							UNIX_ONLY(jbp->io_in_prog_latch.u.parts.latch_pid \
-								  == rundown_process_id))
+						if (jbp->io_in_prog_latch.u.parts.latch_pid == rundown_process_id)
 						{
 							if (csa->jnl->dsk_update_inprog)
 							{
 								jbp->dsk = csa->jnl->new_dsk;
 								jbp->dskaddr = csa->jnl->new_dskaddr;
 							}
-							VMS_ONLY(
-								bci(&jbp->io_in_prog);
-								csa->jnl->qio_active = FALSE;
-							)
-							UNIX_ONLY(RELEASE_SWAPLOCK(&jbp->io_in_prog_latch));
-						}
-						if (jbp->free_update_pid == rundown_process_id)
-						{	/* Got shot in the midst of updating freeaddr/free in jnl_write.c
-							 * Fix the values (possible only in VMS where we have kernel extension).
-							 */
-							UNIX_ONLY(assert(FALSE);)
-							assert(csa->now_crit);
-							jbp->free = csa->jnl->temp_free;
-							jbp->freeaddr = csa->jnl->new_freeaddr;
-							jbp->free_update_pid = 0;
-							DBG_CHECK_JNL_BUFF_FREEADDR(jbp);
+							RELEASE_SWAPLOCK(&jbp->io_in_prog_latch);
 						}
 						if (jbp->blocked == rundown_process_id)
 						{
@@ -1737,11 +1621,8 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 					wcblocked_ptr = WCBLOCKED_PHASE2_CLNUP_LIT;
 					BG_TRACE_PRO_ANY(csa, wcb_secshr_db_clnup_phase2_clnup);
 				}
-				UNIX_ONLY(
-					/* cannot send oplog message in VMS as privileged routines cannot do I/O */
-					send_msg_csa(CSA_ARG(csa) VARLSTCNT(8) ERR_WCBLOCKED, 6, LEN_AND_STR(wcblocked_ptr),
-						rundown_process_id, &csd->trans_hist.curr_tn, DB_LEN_STR(reg));
-				)
+				send_msg_csa(CSA_ARG(csa) VARLSTCNT(8) ERR_WCBLOCKED, 6, LEN_AND_STR(wcblocked_ptr),
+					rundown_process_id, &csd->trans_hist.curr_tn, DB_LEN_STR(reg));
 			}
 			csa->wbuf_dqd = 0;		/* We can clear the flag now */
 			if (csa->wcs_pidcnt_incremented)
@@ -1754,12 +1635,12 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 					/* for normal termination we should not have been in the midst of commit */
 					assert((NORMAL_TERMINATION != secshr_state)
 						|| WBTEST_ENABLED(WBTEST_JNL_CREATE_FAIL)
-						|| WBTEST_ENABLED(WBTEST_SLEEP_IN_WCS_WTSTART));
+						|| WBTEST_ENABLED(WBTEST_SLEEP_IN_WCS_WTSTART)
+						|| (!update_underway && in_wcs_recover));
 					DEBUG_ONLY(first_time = FALSE;)
 					if (update_underway)
-					{
 						INCREMENT_CURR_TN(csd);	/* roll forward step (8) */
-					} else
+					else
 						csd->trans_hist.early_tn = csd->trans_hist.curr_tn;
 				}
 				assert(csd->trans_hist.early_tn == csd->trans_hist.curr_tn);
@@ -1769,37 +1650,23 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 					 * process exiting as secshr_db_clnup during process exiting is always preceded by
 					 * mur_close_files which does the rel_crit anyways. Assert that.
 					 */
-					UNIX_ONLY(assert(!csa->hold_onto_crit || !jgbl.onlnrlbk || !is_exiting));
+					assert(!csa->hold_onto_crit || !jgbl.onlnrlbk || !is_exiting);
 					if (!csa->hold_onto_crit || is_exiting)
 					{ 	/* Release crit but since it involves modifying more than one field, make sure
 						 * we prevent interrupts while in this code. The global variable "crit_count"
-						 * does this for us. See similar usage in rel_crit.c. We currently use this here
-						 * only for Unix because in VMS, a global variable in GTMSHR is not accessible
-						 * in GTMSECSHR image easily unless passed through init_secshr_addrs. Since in
-						 * VMS, if we are here, we are already in a kernel level routine, we will not be
-						 * interrupted by user level timer handlers (wcs_stale or wcs_clean_dbsync_ast)
-						 * that care about the consistency of the crit values so it is okay not to
-						 * explicitly prevent interrupts using "crit_count" in VMS.
+						 * does this for us. See similar usage in rel_crit.c.
 						 */
-						UNIX_ONLY(
-							assert(0 == crit_count);
-							crit_count++;	/* prevent interrupts */
-							CRIT_TRACE(crit_ops_rw); /* see gdsbt.h for comment on placement */
-						)
+						assert(0 == crit_count);
+						crit_count++;	/* prevent interrupts */
+						CRIT_TRACE(crit_ops_rw); /* see gdsbt.h for comment on placement */
 						if (cnl->in_crit == rundown_process_id)
 							cnl->in_crit = 0;
-						UNIX_ONLY(
-							csa->hold_onto_crit = FALSE;
-							DEBUG_ONLY(locknl = cnl;)	/* for DEBUG_ONLY LOCK_HIST macro */
-							mutex_unlockw(reg, crash_count);/* roll forward step (11) */
-							assert(!csa->now_crit);
-							DEBUG_ONLY(locknl = NULL;)	/* restore "locknl" to default value */
-							crit_count = 0;
-						)
-						VMS_ONLY(
-							mutex_stoprelw(csa->critical);	/* roll forward step (11) */
-							csa->now_crit = FALSE;
-						)
+						csa->hold_onto_crit = FALSE;
+						DEBUG_ONLY(locknl = cnl;)	/* for DEBUG_ONLY LOCK_HIST macro */
+						mutex_unlockw(reg, crash_count);/* roll forward step (11) */
+						assert(!csa->now_crit);
+						DEBUG_ONLY(locknl = NULL;)	/* restore "locknl" to default value */
+						crit_count = 0;
 						UNSUPPORTED_PLATFORM_CHECK;
 					}
 				} else
@@ -1815,12 +1682,9 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 			}
 			csa->t_commit_crit = FALSE; /* ensure we don't process this region again (rolls forward step (15)) */
 			if ((NORMAL_TERMINATION == secshr_state || ABNORMAL_TERMINATION == secshr_state)
-			    && GTM_PROBE(SHMPOOL_BUFFER_SIZE, csa->shmpool_buffer, WRITE))
+						&& GTM_PROBE(SHMPOOL_BUFFER_SIZE, csa->shmpool_buffer, WRITE))
 			{
-				if ((pid = csa->shmpool_buffer->shmpool_crit_latch.u.parts.latch_pid)
-				    == rundown_process_id VMS_ONLY(&&)
-				    VMS_ONLY((imgcnt = csa->shmpool_buffer->shmpool_crit_latch.u.parts.latch_image_count) \
-					     == rundown_image_count))
+				if ((pid = csa->shmpool_buffer->shmpool_crit_latch.u.parts.latch_pid) == rundown_process_id)
 				{
 					if (is_exiting)
 					{	/* Tiz our lock. Force recovery to run and release */
@@ -1843,7 +1707,6 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 					} /* Else someone else took care of it */
 				}
 			}
-#ifdef UNIX
 			/* All releases done now. Double check latch is really cleared */
 			if (GTM_PROBE(CRIT_SPACE(NUM_CRIT_ENTRY(csd)), csa->critical, WRITE))
 			{
@@ -1854,7 +1717,6 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 				SALVAGE_UNIX_LATCH(&csa->critical->prochead.latch, is_exiting);
 				SALVAGE_UNIX_LATCH(&csa->critical->freehead.latch, is_exiting);
 			}
-#endif
 		}	/* For all regions */
 	}	/* For all glds */
 	if (jnlpool_reg_addrs && (GTM_PROBE(SIZEOF(*jnlpool_reg_addrs), jnlpool_reg_addrs, READ)))
@@ -1878,7 +1740,6 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 							/* Begin atomic stmnts. Follow same order as in t_end/tp_tend */
 							jh->jnldata_len = cumul_jnl_rec_len;
 							jh->prev_jnldata_len = jpl->lastwrite_len;
-#							ifdef UNIX
 							if (INVALID_SUPPL_STRM != strm_index)
 							{	/* Need to also update supplementary stream seqno */
 								assert(0 <= strm_index);
@@ -1886,9 +1747,8 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 								ASSERT_INST_FILE_HDR_HAS_HISTREC_FOR_STRM(strm_index);
 								jpl->strm_seqno[strm_index]++;
 							}
-#							endif
 							jpl->lastwrite_len = cumul_jnl_rec_len;
-							SECSHR_SHM_WRITE_MEMORY_BARRIER;
+							SHM_WRITE_MEMORY_BARRIER;
 							/* Emulate
 							 * jpl->write = (jpl->write + cumul_jnl_rec_len) % jsize;
 							 * See note in DOs and DONTs about using % operator
@@ -1924,31 +1784,39 @@ void secshr_db_clnup(enum secshr_db_state secshr_state)
 					 * process exiting as secshr_db_clnup during process exiting is always preceded by
 					 * mur_close_files which does the rel_crit anyways. Assert that.
 					 */
-					UNIX_ONLY(assert(!csa->hold_onto_crit || !jgbl.onlnrlbk || !is_exiting));
+					assert(!csa->hold_onto_crit || !jgbl.onlnrlbk || !is_exiting);
 					if (!csa->hold_onto_crit || is_exiting)
 					{
-						UNIX_ONLY(CRIT_TRACE(crit_ops_rw)); /* see gdsbt.h for comment on placement */
+						CRIT_TRACE(crit_ops_rw); /* see gdsbt.h for comment on placement */
 						if (cnl->in_crit == rundown_process_id)
 							cnl->in_crit = 0;
-						UNIX_ONLY(
-							csa->hold_onto_crit = FALSE;
-							DEBUG_ONLY(locknl = cnl;)	/* for DEBUG_ONLY LOCK_HIST macro */
-							mutex_unlockw(reg, 0);		/* roll forward step (12) */
-							assert(!csa->now_crit);
-							DEBUG_ONLY(locknl = NULL;)	/* restore "locknl" to default value */
-						)
-						VMS_ONLY(
-							mutex_stoprelw(csa->critical);	/* roll forward step (12) */
-							csa->now_crit = FALSE;
-						)
+						csa->hold_onto_crit = FALSE;
+						DEBUG_ONLY(locknl = cnl;)	/* for DEBUG_ONLY LOCK_HIST macro */
+						mutex_unlockw(reg, 0);		/* roll forward step (12) */
+						assert(!csa->now_crit);
+						DEBUG_ONLY(locknl = NULL;)	/* restore "locknl" to default value */
 						/* the above takes care of rolling forward step (12) of the commit flow */
 					}
 				}
 			}
 			/* as long as csa->hold_onto_crit is FALSE, we should have released crit if we held it at entry */
-			UNIX_ONLY(assert(!csa->now_crit || csa->hold_onto_crit));
+			assert(!csa->now_crit || csa->hold_onto_crit);
 		}
 	}
+	if (is_exiting)
+	{	/* It is possible we are exiting while in the middle of a transaction (e.g. called through "deferred_signal_handler"
+		 * in the DEFERRED_EXIT_HANDLING_CHECK macro). Since exit handling code can start new non-TP transactions
+		 * (e.g. for statsdb rundown you need to kill ^%YGS node, for recording mprof stats you need to set a global node)
+		 * clean up the effects of any in-progress transaction before the "t_begin" call happens.
+		 */
+		if (!dollar_tlevel)
+		{
+			assert(save_gv_cur_region == gv_cur_region);
+			if ((NULL != save_gv_cur_region) && save_gv_cur_region->open && IS_REG_BG_OR_MM(save_gv_cur_region))
+				t_abort(save_gv_cur_region, &FILE_INFO(save_gv_cur_region)->s_addrs);
+		} else
+			OP_TROLLBACK(0);
+	}
 	return;
 }
 
diff --git a/sr_port/set_gbuff_limit.c b/sr_port/set_gbuff_limit.c
index 1915c4e..d2bfece 100644
--- a/sr_port/set_gbuff_limit.c
+++ b/sr_port/set_gbuff_limit.c
@@ -28,6 +28,7 @@ void set_gbuff_limit(sgmnt_addrs **csaptr, sgmnt_data_ptr_t *csdptr, mval *pooll
 	int4			nbuffs;
 	sgmnt_addrs		*csa;
 	sgmnt_data_ptr_t	csd;
+	cache_rec_ptr_t		cr;
 
 	csa = *csaptr;
 	csd = *csdptr;
@@ -39,4 +40,8 @@ void set_gbuff_limit(sgmnt_addrs **csaptr, sgmnt_data_ptr_t *csdptr, mval *pooll
 	 * but for the first release of this always pick the end of the buffer
 	 */
 	csa->our_midnite = csa->acc_meth.bg.cache_state->cache_array + csd->bt_buckets + csd->n_bts;
+	cr = csa->our_midnite - csa->gbuff_limit;
+	if (cr < csa->acc_meth.bg.cache_state->cache_array + csd->bt_buckets)
+		cr += csd->n_bts;
+	csa->our_lru_cache_rec_off = GDS_ANY_ABS2REL(csa, cr);
 }
diff --git a/sr_port/sgnl_gvnulsubsc.c b/sr_port/sgnl_gvnulsubsc.c
index fa499c9..d13da52 100755
--- a/sr_port/sgnl_gvnulsubsc.c
+++ b/sr_port/sgnl_gvnulsubsc.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2003 Sanchez Computer Associates, Inc.	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -21,15 +22,17 @@
 GBLREF gd_region	*gv_cur_region;
 GBLREF gv_key		*gv_currkey;
 
+error_def(ERR_GVIS);
+error_def(ERR_NULSUBSC);
+
 void sgnl_gvnulsubsc(void)
 {
 	unsigned char	buff[MAX_ZWR_KEY_SZ], *end;
-	error_def(ERR_GVIS);
-	error_def(ERR_NULSUBSC);
 
 	if ((end = format_targ_key(&buff[0], MAX_ZWR_KEY_SZ, gv_currkey, TRUE)) == 0)
 	{	end = &buff[MAX_ZWR_KEY_SZ - 1];
 	}
-	rts_error(VARLSTCNT(8) ERR_NULSUBSC, 2, gv_cur_region->rname_len, &gv_cur_region->rname[0],
+	gv_currkey->end = 0;
+	rts_error_csa(NULL, VARLSTCNT(8) ERR_NULSUBSC, 2, gv_cur_region->rname_len, &gv_cur_region->rname[0],
 		ERR_GVIS, 2, end - &buff[0], &buff[0]);
 }
diff --git a/sr_port/shmpool.c b/sr_port/shmpool.c
index ecae5f8..df6ac9c 100755
--- a/sr_port/shmpool.c
+++ b/sr_port/shmpool.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2005-2015 Fidelity National Information 	*
+ * Copyright (c) 2005-2016 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -134,52 +134,6 @@ shmpool_blk_hdr_ptr_t shmpool_blk_alloc(gd_region *reg, enum shmblk_type blktype
 		/* Can only verify queue *AFTER* get the lock */
 		VERIFY_QUEUE((que_head_ptr_t)&sbufh_p->que_free);
 		/* We have the lock and fast_lock_count is incremented to prevent deadlock on interrupt */
-#ifdef VMS
-		/* Checks to make sure one mode or the other isn't over using its resources. Only important
-		   on VMS as reformat blocks do not exist on UNIX ports.
-		*/
-		if (SHMBLK_BACKUP == blktype)
-		{
-			/* See if backup has terminated itself for whatever reason */
-			if (sbufh_p->backup_errno)
-			{
-				shmpool_unlock_hdr(reg);
-				return (shmpool_blk_hdr_ptr_t)-1;
-			}
-			/* If we are in compatibility mode, backup is restricted to 50% of the buffers and must leave 1
-			   reformat buffer available */
-			if ((GDSV4 == csa->hdr->desired_db_format && (sbufh_p->total_blks / 2) < sbufh_p->backup_cnt)
-			    || (sbufh_p->total_blks - 1) <= sbufh_p->backup_cnt)
-			{	/* Too many backup blocks already in use for this type */
-				if (MAX_BACKUP_FLUSH_TRY < attempts)
-				{	/* We have tried too long .. backup errors out */
-					sbufh_p->failed = process_id;
-					sbufh_p->backup_errno = ERR_BCKUPBUFLUSH;
-					csa->nl->nbb = BACKUP_NOT_IN_PROGRESS;
-					shmpool_unlock_hdr(reg);
-					return (shmpool_blk_hdr_ptr_t)-1;
-				}
-				limit_hit = TRUE;
-			} else
-				limit_hit = FALSE;
-		} else if (SHMBLK_REFORMAT == blktype)
-		{	/* If we are in compatibility mode and backup is active, reformat is restricted to 50% of the
-			   buffers. Else  must always leave 1 backup buffer available */
-			if (((GDSV4 == csa->hdr->desired_db_format && (sbufh_p->total_blks / 2) < sbufh_p->reformat_cnt)
-			     && csa->backup_in_prog) || (sbufh_p->total_blks - 1) <= sbufh_p->reformat_cnt)
-			{	/* Too many reformat blocks already in use */
-				if (MAX_BACKUP_FLUSH_TRY < attempts)
-				{	/* We have tried too long .. return non-buffer to signal do sync IO */
-					shmpool_unlock_hdr(reg);
-					return (shmpool_blk_hdr_ptr_t)-1;
-				}
-				limit_hit = TRUE;
-			} else
-				limit_hit = FALSE;
-		} else
-			assertpro(FALSE);
-		if (!limit_hit)
-#elif defined UNIX
 		assert(SHMBLK_BACKUP == blktype);
 		if (sbufh_p->backup_errno)
 		{
@@ -192,18 +146,17 @@ shmpool_blk_hdr_ptr_t shmpool_blk_alloc(gd_region *reg, enum shmblk_type blktype
 #		endif
 		if (MAX_BACKUP_FLUSH_TRY < attempts)
 		{	/* We have tried too long .. backup errors out */
-#ifdef DEBUG
+#			ifdef DEBUG
 			GET_C_STACK_FROM_SCRIPT("BCKUPBUFLUSH", process_id, sbufh_p->shmpool_crit_latch.u.parts.latch_pid, TWICE);
-#else
+#			else
 			GET_C_STACK_FROM_SCRIPT("BCKUPBUFLUSH", process_id, sbufh_p->shmpool_crit_latch.u.parts.latch_pid, ONCE);
-#endif
+#			endif
 			sbufh_p->failed = process_id;
 			sbufh_p->backup_errno = ERR_BCKUPBUFLUSH;
 			csa->nl->nbb = BACKUP_NOT_IN_PROGRESS;
 			shmpool_unlock_hdr(reg);
 			return (shmpool_blk_hdr_ptr_t)-1L;
 		}
-#endif
 		{	/* We didn't hit the limit for this */
 			/* Get the element (if available) */
 			sblkh_p = (shmpool_blk_hdr_ptr_t)remqh(&sbufh_p->que_free);
@@ -217,19 +170,9 @@ shmpool_blk_hdr_ptr_t shmpool_blk_alloc(gd_region *reg, enum shmblk_type blktype
 				sblkh_p->blktype = blktype;
 				sblkh_p->holder_pid = process_id;
 				assert(FALSE == sblkh_p->valid_data); /* cleared when blocok was freed .. should still be free */
-				VMS_ONLY(if (SHMBLK_BACKUP == blktype))
-				{
-					insqt(&sblkh_p->sm_que, &sbufh_p->que_backup);
-					++sbufh_p->backup_cnt;
-					VERIFY_QUEUE((que_head_ptr_t)&sbufh_p->que_backup);
-#ifdef VMS
-				} else
-				{
-					insqt(&sblkh_p->sm_que, &sbufh_p->que_reformat);
-					++sbufh_p->reformat_cnt;
-					VERIFY_QUEUE((que_head_ptr_t)&sbufh_p->que_reformat);
-#endif
-				}
+				insqt(&sblkh_p->sm_que, &sbufh_p->que_backup);
+				++sbufh_p->backup_cnt;
+				VERIFY_QUEUE((que_head_ptr_t)&sbufh_p->que_backup);
 				++sbufh_p->allocs_since_chk;
 				shmpool_unlock_hdr(reg);
 				return sblkh_p;
@@ -242,38 +185,13 @@ shmpool_blk_hdr_ptr_t shmpool_blk_alloc(gd_region *reg, enum shmblk_type blktype
 		  are warranted.
 		*/
 		shmpool_unlock_hdr(reg);
-		VMS_ONLY(if (SHMBLK_BACKUP == blktype))
-		{	/* Too many backup blocks already in use */
-			BG_TRACE_PRO_ANY(csa, shmpool_alloc_bbflush);
-			if (!backup_buffer_flush(reg))
-			{	/* The lock was held by someone else, just do a micro sleep before cycling back
-				   around to try again.
-				*/
-				wcs_sleep(LOCK_SLEEP);
-			}
-#ifdef VMS
-			if ((sbufh_p->total_blks / 2) < sbufh_p->reformat_cnt)
-				/* There are too many reformat blocks in use, make sure we recover
-				   unused ones in a timely fashion.
-				*/
-				shmpool_harvest_reformatq(reg);
-		} else
-		{	/* Too many reformat blocks already in use */
-			shmpool_harvest_reformatq(reg);
-			if (attempts & 0x3)
-				/* On all but every 4th pass, do a simple rel_quant */
-				rel_quant();	/* Release processor to holder of lock (hopefully) */
-			else
-				/* On every 4th pass, we bide for awhile */
-				wcs_sleep(LOCK_SLEEP);
-			if ((sbufh_p->total_blks / 2) < sbufh_p->backup_cnt)
-			{	/* There are too many backup blocks in use, make sure we recover
-				   unused ones in a timely fashion.
-				*/
-				BG_TRACE_PRO_ANY(csa, shmpool_alloc_bbflush);
-				backup_buffer_flush(reg);
-			}
-#endif
+		/* Too many backup blocks already in use */
+		BG_TRACE_PRO_ANY(csa, shmpool_alloc_bbflush);
+		if (!backup_buffer_flush(reg))
+		{	/* The lock was held by someone else, just do a micro sleep before cycling back
+			   around to try again.
+			*/
+			wcs_sleep(LOCK_SLEEP);
 		}
 	}
 }
@@ -291,7 +209,7 @@ void shmpool_blk_free(gd_region *reg, shmpool_blk_hdr_ptr_t sblkh_p)
 	assert(sbufh_p->shmpool_crit_latch.u.parts.latch_pid == process_id);
 	/* Verify queue only *AFTER* have the lock */
 	VERIFY_QUEUE((que_head_ptr_t)&sbufh_p->que_free);
-	assert(VMS_ONLY(SHMBLK_REFORMAT == sblkh_p->blktype ||) SHMBLK_BACKUP == sblkh_p->blktype);
+	assert(SHMBLK_BACKUP == sblkh_p->blktype);
 	sblkh_p->holder_pid = 0;
 	sblkh_p->valid_data = FALSE;
 	sblkh_p2 = (shmpool_blk_hdr_ptr_t)remqt((que_ent_ptr_t)((char_ptr_t)sblkh_p + sblkh_p->sm_que.fl));
@@ -302,17 +220,7 @@ void shmpool_blk_free(gd_region *reg, shmpool_blk_hdr_ptr_t sblkh_p)
 		--sbufh_p->backup_cnt;
 		assert(0 <= sbufh_p->backup_cnt);
 		VERIFY_QUEUE((que_head_ptr_t)&sbufh_p->que_backup);
-	}
-#ifdef VMS
-	else if (SHMBLK_REFORMAT == sblkh_p->blktype)
-	{
-		--sbufh_p->reformat_cnt;
-		sblkh_p->use.rfrmt.cr_off = 0;		/* No longer queued to given CR */
-		assert(0 <= sbufh_p->reformat_cnt);
-		VERIFY_QUEUE(&(que_head_ptr_t)sbufh_p->que_reformat);
-	}
-#endif
-	else
+	} else
 		assertpro(FALSE);
 	sblkh_p->blktype = SHMBLK_FREE;
 	++sbufh_p->free_cnt;
@@ -321,88 +229,6 @@ void shmpool_blk_free(gd_region *reg, shmpool_blk_hdr_ptr_t sblkh_p)
 	return;
 }
 
-#ifdef VMS
-/* Routine to "harvest" reformat blocks that have complete IOs (VMS only). */
-void shmpool_harvest_reformatq(gd_region *reg)
-{
-	shmpool_buff_hdr_ptr_t	sbufh_p;
-	shmpool_blk_hdr_ptr_t	sblkh_p, next_sblkh_p;
-	sgmnt_addrs		*csa;
-	cache_rec_ptr_t		cr;
-	unsigned int		iosb_cond;
-
-	csa = &FILE_INFO(reg)->s_addrs;
-	BG_TRACE_PRO_ANY(csa, shmpool_refmt_harvests);
-	sbufh_p = csa->shmpool_buffer;
-	if (FALSE == shmpool_lock_hdr(reg))
-	{
-		assert(FALSE);
-		rts_error_csa(CSA_ARG(csa) VARLSTCNT(9) ERR_DBCCERR, 2, REG_LEN_STR(reg), ERR_ERRCALL, 3, CALLFROM);
-	}
-	if (0 < sbufh_p->reformat_cnt)
-	{	/* Only if there are some entries */
-		assert(0 != sbufh_p->que_reformat.fl);
-		for (sblkh_p = SBLKP_REL2ABS(&sbufh_p->que_reformat, fl);
-		     sblkh_p != (shmpool_blk_hdr_ptr_t)&sbufh_p->que_reformat;
-		     sblkh_p = next_sblkh_p)
-		{	/* Loop through the queued reformat blocks */
-			next_sblkh_p = SBLKP_REL2ABS(sblkh_p, fl);	/* Get next offset now in case remove entry */
-			/* Check cache entry to see if it is for the same block and if the pending
-			   IO is complete. */
-			if (!sblkh_p->valid_data)
-			{	/* Block is not in use yet */
-				BG_TRACE_ANY(csa, refmt_hvst_blk_ignored);
-				continue;
-			}
-			assert(SHMBLK_REFORMAT == sblkh_p->blktype);
-			cr = (cache_rec_ptr_t)GDS_ANY_REL2ABS(csa, sblkh_p->use.rfrmt.cr_off);
-			/* Check that:
-
-			   1) This block and the cr it points to are linked.
-			   2) That the cycle is the same.
-
-			   If we fail either of these, the link can be broken and this block released.
-			*/
-			if (0 == sblkh_p->use.rfrmt.cr_off
-			    || (shmpool_blk_hdr_ptr_t)GDS_ANY_REL2ABS(csa, cr->shmpool_blk_off) != sblkh_p
-			    || cr->cycle != sblkh_p->use.rfrmt.cycle)
-			{	/* Block no longer in (same) use .. release it */
-				shmpool_blk_free(reg, sblkh_p);
-				BG_TRACE_ANY(csa, refmt_hvst_blk_released_replaced);
-			} else
-			{	/* The link is intact. See if IO is done and recheck the cycle since we do not
-				   have the region critical section here to prevent the cache record from being
-				   modified while we are looking at it.
-				*/
-				SHM_READ_MEMORY_BARRIER;	/* Attempt to sync cr->* references */
-				iosb_cond = cr->iosb.cond;
-				if ((0 != iosb_cond && (WRT_STRT_PNDNG != iosb_cond))
-				    || cr->cycle != sblkh_p->use.rfrmt.cycle)
-				{	/* IO is complete or block otherwise reused. This means the IO ATTEMPT is
-					   complete. This is not entirely the same check in wcs_wtfini() which cares
-					   if the write was successful. We do not. If the write is retried, it will
-					   be with a newly reformatted buffer, not this iteration of this one. Note
-					   also that the missing part of this condition from wcs_wtfini() where an
-					   is_proc_alive check is done is not done because whether the process is
-					   alive or dead is wcs_wtfini's problem, not ours. When it clears up the
-					   cache entry, we will clear up the associated reformat buffer, if
-					   necessary.
-					*/
-					shmpool_blk_free(reg, sblkh_p);
-					BG_TRACE_ANY(csa, refmt_hvst_blk_released_io_complete);
-				} else
-				{
-					BG_TRACE_ANY(csa, refmt_hvst_blk_kept);
-				}
-			}
-		}
-	} else
-		/* Shouldn't be any queue elements either */
-		assert(0 == sbufh_p->que_reformat.fl);
-	shmpool_unlock_hdr(reg);
-}
-#endif
-
 /* Check if we have any "lost" blocks by failed (and now defunct) processes.
    There are 3 reasons this routine can be called:
 
@@ -439,8 +265,7 @@ void shmpool_abandoned_blk_chk(gd_region *reg, boolean_t force)
 	BG_TRACE_PRO_ANY(csa, shmpool_recovery);
 	sbufh_p->que_free.fl = sbufh_p->que_free.bl = 0;
 	sbufh_p->que_backup.fl = sbufh_p->que_backup.bl = 0;
-	VMS_ONLY(sbufh_p->que_reformat.fl = sbufh_p->que_reformat.bl = 0);
-	sbufh_p->free_cnt = sbufh_p->backup_cnt = VMS_ONLY(sbufh_p->reformat_cnt = ) 0;
+	sbufh_p->free_cnt = sbufh_p->backup_cnt = 0;
 	sbufh_p->allocs_since_chk = 0;	/* Restart the counter */
 	/* Rebuild the queues and counts according to:
 	   1) What the block thinks it is (free, backup or reformat.
@@ -466,21 +291,11 @@ void shmpool_abandoned_blk_chk(gd_region *reg, boolean_t force)
 			insqt(&sblkh_p->sm_que, &sbufh_p->que_backup);
 			++sbufh_p->backup_cnt;
 		} else
-		{
-#ifdef VMS
-			if (SHMBLK_REFORMAT == sblkh_p->blktype)
-			{
-				insqt(&sblkh_p->sm_que, &sbufh_p->que_reformat);
-				++sbufh_p->reformat_cnt;
-			} else
-#endif
-				assertpro(FALSE);
-		}
+			assertpro(FALSE);
 	}
 	VERIFY_QUEUE((que_head_ptr_t)&sbufh_p->que_free);
 	VERIFY_QUEUE((que_head_ptr_t)&sbufh_p->que_backup);
-	VMS_ONLY(VERIFY_QUEUE((que_head_ptr_t)&sbufh_p->que_reformat));
-	assert((sbufh_p->free_cnt + sbufh_p->backup_cnt VMS_ONLY(+ sbufh_p->reformat_cnt)) == sbufh_p->total_blks);
+	assert((sbufh_p->free_cnt + sbufh_p->backup_cnt) == sbufh_p->total_blks);
 	sbufh_p->shmpool_blocked = FALSE;
 	send_msg_csa(CSA_ARG(csa) VARLSTCNT(4) ERR_SHMPLRECOV, 2, REG_LEN_STR(reg));
 }
@@ -585,7 +400,7 @@ void shmpool_unlock_hdr(gd_region *reg)
 	/* Quickly check if our counters are as we expect them to be. If not see if we need to run
 	   our recovery procedure (shmpool_blk_abandoned_chk()).
 	*/
-	cntr_delta = sbufh_p->free_cnt + sbufh_p->backup_cnt VMS_ONLY(+ sbufh_p->reformat_cnt) - sbufh_p->total_blks;
+	cntr_delta = sbufh_p->free_cnt + sbufh_p->backup_cnt - sbufh_p->total_blks;
 	if (0 != cntr_delta)
 		shmpool_abandoned_blk_chk(reg, FALSE);
 	DEBUG_ONLY(locknl = csa->nl);
diff --git a/sr_port/show_source_line.c b/sr_port/show_source_line.c
index 5a59c96..15a433a 100755
--- a/sr_port/show_source_line.c
+++ b/sr_port/show_source_line.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -20,7 +21,6 @@
 
 GBLREF short int 	source_name_len, source_line;
 GBLREF char 		source_file_name[];
-GBLREF unsigned char	*source_buffer;
 GBLREF bool		dec_nofac;
 GBLREF boolean_t	run_time;
 
@@ -46,7 +46,7 @@ void show_source_line(boolean_t warn)
 	buf = source_line_buff;
 	buflen = SIZEOF(source_line_buff);
 	b_top = buf + buflen - STR_LIT_LEN(ARROW) - 1; /* allow room for arrow and string terminator */
-	for (c = (char *)source_buffer, b = buf, c_top = c + TREF(last_source_column) - 1; c < c_top;)
+	for (c = (TREF(source_buffer)).addr, b = buf, c_top = c + TREF(last_source_column) - 1; c < c_top;)
 	{
 		if ('\t' == *c)
 		{
@@ -100,7 +100,8 @@ void show_source_line(boolean_t warn)
 	}
 	if (warn)
 	{
-		for (c = (char *)source_buffer; c < (char *)source_buffer + STRLEN((char *)source_buffer) - 1; )
+		for (c = (TREF(source_buffer)).addr, c_top = ((TREF(source_buffer)).addr + (TREF(source_buffer)).len - 1)
+			; c < c_top; )
 		{
 			if ('\t' == *c)
 			{
@@ -114,7 +115,7 @@ void show_source_line(boolean_t warn)
 			} else
 			{
 #			ifdef UNICODE_SUPPORTED		/* funky positioning makes VMS compiler happy */
-				chlen = (int)(UTF8_MBTOWC(c, (char *)source_buffer + STRLEN((char *)source_buffer) - 1, ch)
+				chlen = (int)(UTF8_MBTOWC(c, ((TREF(source_buffer)).addr + (TREF(source_buffer)).len - 1), ch)
 						- (uchar_ptr_t)c);
 				if ((WEOF != ch) && 0 < (chwidth = UTF8_WCWIDTH(ch)))
 					line_chwidth += chwidth;
@@ -125,9 +126,11 @@ void show_source_line(boolean_t warn)
 		dec_nofac = TRUE;
 		if (MAXLINESIZEFORDISPLAY > line_chwidth)
 			if (unable_to_complete_arrow)
-				dec_err(VARLSTCNT(6) ERR_SRCLIN, 4, LEN_AND_STR((char *)source_buffer), msgstr.len, msgstr.addr);
+				dec_err(VARLSTCNT(6) ERR_SRCLIN, 4, (TREF(source_buffer)).len - 1, (TREF(source_buffer)).addr,
+					msgstr.len, msgstr.addr);
 			else
-				dec_err(VARLSTCNT(6) ERR_SRCLIN, 4, LEN_AND_STR((char *)source_buffer), b - buf, buf);
+				dec_err(VARLSTCNT(6) ERR_SRCLIN, 4, (TREF(source_buffer)).len - 1, (TREF(source_buffer)).addr,
+					b - buf, buf);
 		else
 			dec_err(VARLSTCNT(2) ERR_SRCLNNTDSP, 1, MAXLINESIZEFORDISPLAY);
 		if (!run_time)
diff --git a/sr_port/sleep_cnt.h b/sr_port/sleep_cnt.h
index d661eae..ebd9254 100644
--- a/sr_port/sleep_cnt.h
+++ b/sr_port/sleep_cnt.h
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information 	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -31,6 +31,7 @@
 #define MINSLPTIME 		1	/* min (millisec) sleep possible thru wcs_sleep. See comment above about loop usage */
 #define MAXSLPTIME 		10	/* max (millisec) sleep possible thru wcs_sleep */
 #define	SLEEP_ONE_MIN		6000	/* # of wcs_sleep iterations (each max MAXSLPTIME msec) needed to wait 1 minute */
+#define SLEEP_FIVE_SEC		5000	/* # of wcs_sleep(1) iterations needed to wait 5 seconds */
 
 #define MAXWTSTARTWAIT 		SLEEP_ONE_MIN
 #define BUF_OWNER_STUCK 	SLEEP_ONE_MIN
@@ -45,10 +46,12 @@
 #define MAX_LCK_TRIES 		SLEEP_ONE_MIN	/* vms only: wait in mu_rndwn_file */
 #define FSYNC_WAIT_TIME     	(2 * SLEEP_ONE_MIN)	/* 2 mins of wait for fsync between JNLFSYNCSTUCK complaints */
 #define FSYNC_WAIT_HALF_TIME    SLEEP_ONE_MIN	/* 1 min of wait for fsync between DEBUG JNLFSYNCSTUCK complaints */
+#define MAX_WIP_QWAIT 		SLEEP_ONE_MIN
+#define MAX_WTSTART_FINI_SLEEPS	(4 * SLEEP_ONE_MIN) /* after this many sleeps without progress request cache recovery */
 
 #define PHASE2_COMMIT_SLEEP	MAXSLPTIME	/* 10 msec inter-iteration sleep wait for active phase2 commits */
 #define	PHASE2_COMMIT_WAIT	SLEEP_ONE_MIN
-#define	PHASE2_COMMIT_WAIT_HTBT	8		/* = 8 heartbeats (each 8 seconds) = 64 seconds wait (used in Unix) */
+#define	PHASE2_COMMIT_WAIT_MS	(64 * MILLISECS_IN_SEC)
 
 #define	SLEEP_INSTFREEZEWAIT	100		/* 100-msec wait between re-checks of instance freeze status */
 #define	SLEEP_IORETRYWAIT	500		/* 500-msec wait between retries of the same write operation */
@@ -82,7 +85,7 @@
  */
 #define MAX_LOCK_SPINS(base, proc) (base + MAX(0, ((((proc - 7) * LOCK_SPINS_PER_4PROC) / 4))))
 
-/* Maximum duration (in minutes) that a process waits for the completion of read-in-progress after which
+/* Maximum duration (in minutes) that a process waits for the completion of read or write in-progress after which
  * it stops waiting but rather continue fixing the remaining cache records. This is done to avoid
  * waiting a long time in case there are many corrupt global buffers. After waiting 1 minute each for the
  * first 4 cache-records (a wait time of 4 mins in total), we might as well stop waiting more and fix
diff --git a/sr_port/stp_gcol_src.h b/sr_port/stp_gcol_src.h
index 07b832d..10af08a 100644
--- a/sr_port/stp_gcol_src.h
+++ b/sr_port/stp_gcol_src.h
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -350,13 +350,9 @@ error_def(ERR_STPEXPFAIL);
 			if (HTENT_VALID_ADDR(tabent_addr, zwr_alias_var, zav))					\
 			{											\
 				x = &zav->zwr_var;								\
-				/* Regular varnames are already accounted for in other ways so			\
-				 * we need to avoid putting this mstr into the process array twice.		\
-				 * The only var names we need worry about are $ZWRTACxxx so make		\
-				 * simple check for var names starting with '$'.				\
-				 */										\
-				if (x->len && ('$' == x->addr[0]))						\
-					MSTR_STPG_ADD(x);							\
+				/* Protect MSTRs we are using to process the zwrite */				\
+				assert(x->len); /* if it is valid it should have a non-zero length */		\
+				MSTR_STPG_ADD(x);								\
 			}											\
 		}												\
 	}													\
@@ -369,7 +365,7 @@ error_def(ERR_STPEXPFAIL);
 #else
 #define DBGSTPGCOL(x)
 #endif
-static void expand_stp(unsigned int new_size)	/* BYPASSOK */
+static void expand_stp(size_t new_size)	/* BYPASSOK */
 {
 	if (retry_if_expansion_fails)
 		ESTABLISH(stp_gcol_ch);
@@ -428,7 +424,7 @@ void stp_vfy_mval(void)
 	}
 }
 
-boolean_t is_stp_space_available(int space_needed)
+boolean_t is_stp_space_available(ssize_t space_needed)
 {
 	/* Asserts added here are tested every time any module in the codebase does stringpool space checks */
 	assert(!stringpool_unusable);
@@ -456,15 +452,16 @@ void mv_parse_tree_collect(mvar *node)
 void stp_move(char *stp_move_from, char *stp_move_to)
 #else
 /* garbage collect and create enough space for space_asked bytes */
-void stp_gcol(int space_asked)	/* BYPASSOK */
+void stp_gcol(size_t space_asked)	/* BYPASSOK */
 #endif
 {
 #	ifdef STP_MOVE
 	int			space_asked = 0, stp_move_count = 0;
 #	endif
 	unsigned char		*strpool_base, *straddr, *tmpaddr, *begaddr, *endaddr;
-	int			index, space_needed, fixup_cnt, tmplen, totspace;
-	long			space_before_compact, space_after_compact, blklen, delta, space_reclaim, padlen;
+	int			index, fixup_cnt;
+	ssize_t			space_before_compact, space_after_compact, blklen, delta, space_reclaim, padlen;
+	ssize_t			totspace, space_needed, tmplen, tmplen2;
 	io_log_name		*l;		/* logical name pointer		*/
 	lv_blk			*lv_blk_ptr;
 	lv_val			*lvp, *lvlimit;
@@ -480,7 +477,7 @@ void stp_gcol(int space_asked)	/* BYPASSOK */
 	int			*low_reclaim_passes;
 	int			*incr_factor;
 	int			killcnt;
-	long			stp_incr;
+	ssize_t			stp_incr;
 	ht_ent_objcode 		*tabent_objcode, *topent;
 	ht_ent_mname		*tabent_mname, *topent_mname;
 	ht_ent_addr		*tabent_addr, *topent_addr;
@@ -544,7 +541,7 @@ void stp_gcol(int space_asked)	/* BYPASSOK */
 #	endif	/* !STP_MOVE */
 	assert(stringpool.free >= stringpool.base);
 	assert(stringpool.free <= stringpool.top);
-	assert(stringpool.top - stringpool.free < space_asked || space_asked == 0);
+	assert(stringpool.invokestpgcollevel <= stringpool.top);
         assert(CHK_BOUNDARY_ALIGNMENT(stringpool.top) == 0);
 	/* stp_vfy_mval(); / * uncomment to debug lv corruption issues.. */
 #	ifdef STP_MOVE
@@ -683,8 +680,13 @@ void stp_gcol(int space_asked)	/* BYPASSOK */
 			LVZWRITE_BLOCK_GC(lvzwrblk);
 		}
 		ZWRHTAB_GC(zwrhtab);
-		for (l = io_root_log_name; 0 != l; l = l->next)
+		for (l = io_root_log_name; NULL != l; l = l->next)
 		{
+			if ((NULL != l->iod) && (n_io_dev_types == l->iod->type))
+			{
+				assert(FALSE);
+				continue;       /* skip it on pro */
+			}
 			if ((IO_ESC != l->dollar_io[0]) && (l->iod->trans_name == l))
 			{
 				MSTR_STPG_ADD(&l->iod->error_handler);
@@ -925,8 +927,7 @@ void stp_gcol(int space_asked)	/* BYPASSOK */
 			assert(0 < tmplen);
 			if (tmpaddr + tmplen > straddr) /* if it is not a proper substring of previous one */
 			{
-				int tmplen2;
-				tmplen2 = ((tmpaddr >= straddr) ? tmplen : (int)(tmpaddr + tmplen - straddr));
+				tmplen2 = ((tmpaddr >= straddr) ? tmplen : (ssize_t)(tmpaddr + tmplen - straddr));
 				assert(0 < tmplen2);
 				totspace += tmplen2;
 				if (mstr_native_align)
@@ -945,7 +946,7 @@ void stp_gcol(int space_asked)	/* BYPASSOK */
 	assert(mstr_native_align || space_after_compact >= space_before_compact);
 #	endif
 	space_reclaim = space_after_compact - space_before_compact; /* this can be -ve, if alignment causes expansion */
-	space_needed -= (int)space_after_compact;
+	space_needed -= (ssize_t)space_after_compact;
 	DBGSTPGCOL((stderr, "space_needed=%i\n", space_needed));
 	/* After compaction if less than 31.25% of space is avail, consider it a low reclaim pass */
 	if (STP_LOWRECLAIM_LEVEL(stringpool.top - stringpool.base) > space_after_compact) /* BYPASSOK */
@@ -995,7 +996,7 @@ void stp_gcol(int space_asked)	/* BYPASSOK */
 			expansion_failed = FALSE;	/* will be set to TRUE by condition handler if can't get memory */
 			assert((stp_incr + stringpool.top - stringpool.base) >= (space_needed + blklen));
 			DBGSTPGCOL((stderr, "incr_factor=%i stp_incr=%i space_needed=%i\n", *incr_factor, stp_incr, space_needed));
-			expand_stp((unsigned int)(stp_incr + stringpool.top - stringpool.base));
+			expand_stp((ssize_t)(stp_incr + stringpool.top - stringpool.base));
 #			ifdef DEBUG
 			/* If expansion failed and stp_gcol_ch did an UNWIND and we were already in exit handling code,
 			 * ok_to_UNWIND_in_exit_handling would have been set to avoid an assert in UNWIND macro. Now that
@@ -1093,6 +1094,12 @@ void stp_gcol(int space_asked)	/* BYPASSOK */
 	}
 	assert(stringpool.free >= stringpool.base);
 	assert(stringpool.free <= stringpool.top);
+	stringpool.invokestpgcollevel = (STP_SPACE_USED_MULTIPLIER * (space_asked + stringpool.free - stringpool.base))
+		+ stringpool.base;
+	stringpool.invokestpgcollevel = (((stringpool.invokestpgcollevel - stringpool.base) < STP_GCOL_TRIGGER_FLOOR)
+		|| (stringpool.invokestpgcollevel > stringpool.top))
+		? stringpool.top : stringpool.invokestpgcollevel;
+	assert(stringpool.invokestpgcollevel <= stringpool.top);
 #	ifndef STP_MOVE
 	assert(stringpool.top - stringpool.free >= space_asked);
 #	endif
diff --git a/sr_port/stp_init.c b/sr_port/stp_init.c
index 9383da0..3bea56e 100755
--- a/sr_port/stp_init.c
+++ b/sr_port/stp_init.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2009 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -19,7 +20,7 @@ OS_PAGE_SIZE_DECLARE
 
 static unsigned char	*lasttop = 0;
 
-void stp_init(unsigned int size)
+void stp_init(size_t size)
 {
 	unsigned char	*na_page[2];
 
@@ -29,25 +30,21 @@ void stp_init(unsigned int size)
 			   = stringpool.top + SIZEOF(char *);
 		reset_access(na_page, stringpool.prvprt);
 	}
-
 	/* Allocate the size requested plus one longword so that loops that index through the stringpool can go one
-	   iteration beyond the end of the stringpool without running off the end of the allocated memory region.
-	   After the requested size plus the extra longword, allocate an additional region two machine pages int4 in
-	   order to ensure that this additional region contains at least one aligned machine page; mark that aligned
-	   page non-accessible so that memory accesses too far beyond the intended end of the stringpool (caused by
-	   "runaway" loops, for example) will cause ACCVIO errors.
-	*/
+	 * iteration beyond the end of the stringpool without running off the end of the allocated memory region.
+	 * After the requested size plus the extra longword, allocate an additional region two machine pages int4 in
+	 * order to ensure that this additional region contains at least one aligned machine page; mark that aligned
+	 * page non-accessible so that memory accesses too far beyond the intended end of the stringpool (caused by
+	 * "runaway" loops, for example) will cause ACCVIO errors.
+	 */
 	stringpool.base = stringpool.free
                 = (unsigned char *)malloc(size + SIZEOF(char *) + 2 * OS_PAGE_SIZE);
-
         na_page[0] = na_page[1]
                    = (unsigned char *)
                 ((((UINTPTR_T)stringpool.base + size + SIZEOF(char *) + 2 * OS_PAGE_SIZE) & ~(OS_PAGE_SIZE - 1)) - OS_PAGE_SIZE);
 	stringpool.lasttop = lasttop;
-	lasttop = stringpool.top
+	lasttop = stringpool.top = stringpool.invokestpgcollevel
 		= na_page[0] - SIZEOF(char *);
-
 	set_noaccess (na_page, &stringpool.prvprt);
-
 	return;
 }
diff --git a/sr_port/stp_parms.h b/sr_port/stp_parms.h
index 66d45e6..01d0ff9 100755
--- a/sr_port/stp_parms.h
+++ b/sr_port/stp_parms.h
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2009 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -24,5 +25,10 @@
 			 * so that divides can be done as shifts */
 #define STP_LOWRECLAIM_LEVEL(x) ((x >> 2) + (x >> 3) - (x >> 4)) /* level of available string pool (after reclaim) to
 			 * count as a low reclaim pass (31.25%) */
-#define STP_MAXLOWRECLAIM_PASSES 4 /* after compaction, if at least STP_LOWRECLAIM_LEVEL of string pool is not free for
+#define STP_MAXLOWRECLAIM_PASSES 2 /* after compaction, if at least STP_LOWRECLAIM_LEVEL of string pool is not free for
 			 * STP_MAXLOWRECLAIM_PASSES, force an expansion */
+#define STP_SPACE_USED_MULTIPLIER 3 /* This factor is used to multiply the space used after a garbage collection to set the target
+			 * level to invoke the garbage collector (so if you have a large string pool but later only use a small
+			 * part, it will be concentrated at the bottom of the stringpool (so the OS can swap the rest out).
+			 */
+#define STP_GCOL_TRIGGER_FLOOR 100000 /* Don't set the target level to call the garbage collector below this value. */
diff --git a/sr_port/stringpool.h b/sr_port/stringpool.h
index accf6e2..8160da0 100755
--- a/sr_port/stringpool.h
+++ b/sr_port/stringpool.h
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2014 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -11,31 +12,31 @@
 
 typedef struct
 {
-	unsigned char *base, *free, *top, *lasttop, prvprt;
+	unsigned char *base, *free, *top, *lasttop, prvprt, *invokestpgcollevel;
 } spdesc;
 
 void	stp_expand_array(void);
-void	stp_gcol(int space_needed);										/* BYPASSOK */
+void	stp_gcol(size_t space_needed);										/* BYPASSOK */
 void	stp_move(char *from, char *to);
-void	stp_init(unsigned int size);
+void	stp_init(size_t size);
 void	s2pool(mstr *a);
 void	s2pool_align(mstr *string);
 void	s2pool_concat(mval *dst, mstr *a);	/* concatenates strings "dst->str" + "a" and stores result in "dst->str" */
 
 #ifdef DEBUG
 void		stp_vfy_mval(void);
-boolean_t	is_stp_space_available(int space_needed);
+boolean_t	is_stp_space_available(ssize_t space_needed);
 #endif
 
 #ifdef DEBUG
-#define	IS_STP_SPACE_AVAILABLE(SPC)	is_stp_space_available(SPC)
+#define	IS_STP_SPACE_AVAILABLE(SPC)	is_stp_space_available((ssize_t)SPC)
 #else
-#define	IS_STP_SPACE_AVAILABLE(SPC)	IS_STP_SPACE_AVAILABLE_PRO(SPC)
+#define	IS_STP_SPACE_AVAILABLE(SPC)	IS_STP_SPACE_AVAILABLE_PRO((ssize_t)SPC)
 #endif
 
 GBLREF	spdesc		stringpool;
 
-#define	IS_STP_SPACE_AVAILABLE_PRO(SPC)	((stringpool.free + SPC) <= stringpool.top)
+#define	IS_STP_SPACE_AVAILABLE_PRO(SPC)	((stringpool.free + SPC) <= stringpool.invokestpgcollevel)
 #define	IS_IN_STRINGPOOL(PTR, LEN)		\
 		((((unsigned char *)PTR + (int)(LEN)) <= stringpool.top) && ((unsigned char *)PTR >= stringpool.base))
 #define	IS_AT_END_OF_STRINGPOOL(PTR, LEN)		(((unsigned char *)PTR + (int)(LEN)) == stringpool.free)
@@ -90,3 +91,17 @@ GBLREF	boolean_t	stringpool_unexpandable;
 	*PTRARRAYCUR++ = PTR;										\
 }
 
+#define	COPY_ARG_TO_STRINGPOOL(DST, KEYEND, KEYSTART)				\
+MBSTART {									\
+	int	keylen;								\
+										\
+	keylen = (unsigned char *)(KEYEND) - (unsigned char *)(KEYSTART);	\
+	ENSURE_STP_FREE_SPACE(keylen);						\
+	assert(stringpool.top - stringpool.free >= keylen);			\
+	memcpy(stringpool.free, (KEYSTART), keylen);				\
+	(DST)->mvtype = (MV_STR);						\
+	(DST)->str.len = keylen;						\
+	(DST)->str.addr = (char *)stringpool.free;				\
+	stringpool.free += keylen;						\
+} MBEND
+
diff --git a/sr_port/stx_error.c b/sr_port/stx_error.c
index 04a6ebc..d7378eb 100755
--- a/sr_port/stx_error.c
+++ b/sr_port/stx_error.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information 	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -49,24 +49,34 @@ error_def(ERR_FMLLSTPRESENT);
 error_def(ERR_FOROFLOW);
 error_def(ERR_INVDLRCVAL);
 error_def(ERR_LABELMISSING);
+error_def(ERR_PATNOTFOUND);
 error_def(ERR_SRCLIN);
 error_def(ERR_SRCLOC);
 error_def(ERR_SRCNAM);
 
 void stx_error(int in_error, ...)
 {
-	va_list		args;
+	va_list		var;
+
+	VAR_START(var, in_error);
+	stx_error_va(in_error, var);
+	return;
+}
+
+void stx_error_va(int in_error, va_list args)
+{
 	VA_ARG_TYPE	cnt, arg1, arg2, arg3, arg4;
-	bool		list, warn;
+	boolean_t	is_stx_warn, list, warn;
 	char		msgbuf[MAX_SRCLINE];
 	char		buf[MAX_SRCLINE + LISTTAB + SIZEOF(ARROW)];
 	char		*c;
 	mstr		msg;
-	boolean_t	is_stx_warn;	/* current error is actually of type warning and we are in CGP_PARSE phase */
+	va_list		dup_args;
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
-	va_start(args, in_error);
+	VAR_COPY(dup_args, args);
+
 	/* In case of a IS_STX_WARN type of parsing error, we resume parsing so it is important NOT to reset
 	 * the following global variables
 	 *	a) saw_side_effect
@@ -74,7 +84,7 @@ void stx_error(int in_error, ...)
 	 *	c) source_error_found
 	 */
 	is_stx_warn = (CGP_PARSE == cg_phase) && IS_STX_WARN(in_error) GTMTRIG_ONLY( && !TREF(trigger_compile_and_link));
-	if (!is_stx_warn)
+	if (!is_stx_warn)	/* is current error not of type warning or are we not in CGP_PARSE phase? */
 		TREF(saw_side_effect) = TREF(shift_side_effects) = FALSE;
 	if (run_time)
 	{	/* If the current error is of type STX_WARN then do not issue an error at compile time. Insert
@@ -186,7 +196,14 @@ void stx_error(int in_error, ...)
 		show_source_line(warn);
 		if (warn)
 		{
-			if ((ERR_CEUSRERROR != in_error) && (ERR_INVDLRCVAL != in_error) && (ERR_FOROFLOW != in_error))
+			if (ERR_PATNOTFOUND == in_error)
+			{
+				cnt = va_arg(args, VA_ARG_TYPE);
+				assert(cnt == 2);
+				arg1 = va_arg(args, VA_ARG_TYPE);
+				arg2 = va_arg(args, VA_ARG_TYPE);
+				dec_err(VARLSTCNT(4) in_error, 2, arg1, arg2);
+			} else if ((ERR_CEUSRERROR != in_error) && (ERR_INVDLRCVAL != in_error) && (ERR_FOROFLOW != in_error))
 				dec_err(VARLSTCNT(1) in_error);
 			else
 			{
@@ -201,19 +218,18 @@ void stx_error(int in_error, ...)
 	va_end(args);
 	if (list)
 	{
-		va_start(args, in_error);
 		msg.addr = msgbuf;
 		msg.len = SIZEOF(msgbuf);
 		gtm_getmsg(in_error, &msg);
 		assert(msg.len);
 #		ifdef UNIX
-		cnt = va_arg(args, VA_ARG_TYPE);
-		c = util_format(msgbuf, args, LIT_AND_LEN(buf), (int)cnt);
+		cnt = va_arg(dup_args, VA_ARG_TYPE);
+		c = util_format(msgbuf, dup_args, LIT_AND_LEN(buf), (int)cnt);
 		va_end(TREF(last_va_list_ptr));	/* set by util_format */
 #		else
-		c = util_format(msgbuf, args, LIT_AND_LEN(buf));
+		c = util_format(msgbuf, dup_args, LIT_AND_LEN(buf));
 #		endif
-		va_end(args);
+		va_end(dup_args);
 		*c = 0;
 		list_line(buf);
 	}
diff --git a/sr_port/t_abort.c b/sr_port/t_abort.c
index 2a4d0d5..60fe21e 100755
--- a/sr_port/t_abort.c
+++ b/sr_port/t_abort.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2004-2016 Fidelity National Information	*
+ * Copyright (c) 2004-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -19,30 +19,42 @@
 #include "gdsbt.h"
 #include "gdsfhead.h"
 #include "filestruct.h"
-#include "longset.h"		/* needed for cws_insert.h */
-#include "hashtab_int4.h"	/* needed for cws_insert.h */
-#include "cws_insert.h"		/* for CWS_RESET macro */
-#include "gdsblkops.h"		/* for CHECK_AND_RESET_UPDATE_ARRAY macro */
-#include "t_abort.h"		/* for prototype of t_abort() */
+#include "t_abort.h"		/* for prototype of "t_abort" */
 #include "process_reorg_encrypt_restart.h"
+#include "op.h"			/* for OP_TROLLBACK */
 
-GBLREF	unsigned char	cw_set_depth;
-GBLREF	unsigned int	t_tries;
-GBLREF	uint4		update_trans;
-GBLREF sgmnt_addrs	*reorg_encrypt_restart_csa;
+GBLREF	sgmnt_addrs	*reorg_encrypt_restart_csa;
+GBLREF	uint4		dollar_tlevel;
+GBLREF	int		process_exiting;
 
 void t_abort(gd_region *reg, sgmnt_addrs *csa)
 {
+#	ifdef DEBUG
+	uint4		save_dollar_tlevel;
+#	endif
+
+	assert(!dollar_tlevel);
+	assert(IS_REG_BG_OR_MM(reg));	/* caller should have ensured this */
 	assert(&FILE_INFO(reg)->s_addrs == csa);
-	CWS_RESET;
-	/* reset update_array_ptr to update_array; do not use CHECK_AND_RESET_UPDATE_ARRAY since cw_set_depth can be non-zero */
-	RESET_UPDATE_ARRAY;
-	/* "secshr_db_clnup/t_commit_cleanup" assume an active non-TP transaction if cw_set_depth is non-zero or if
-	 * update_trans has the UPDTRNS_TCOMMIT_STARTED_MASK bit set. Now that the transaction is aborted, reset these fields.
-	 */
-	cw_set_depth = 0;
-	update_trans = 0;
-	t_tries = 0;
+	if (process_exiting)
+	{	/* If we are in the phase2 of an M-KILL (where "dollar_tlevel" is temporarily reset to 0), reset the global
+		 * variable "bml_save_dollar_tlevel" and restore "dollar_tlevel" now that we are going to go into exit handling
+		 * and unwind from that "gvcst_expand_free_subtree" context altogether.
+		 */
+		DEBUG_ONLY(save_dollar_tlevel = dollar_tlevel;)
+		RESET_BML_SAVE_DOLLAR_TLEVEL;
+		if (dollar_tlevel)
+		{	/* If "dollar_tlevel" was 0 at function entry and became 1 now, it means we were in phase2 of
+			 * an M-kill when we got a kill -15 and started exit handling and came here from "secshr_db_clnup".
+			 * Exit handling code relies on "dollar_tlevel" being 0 (e.g. "gvcst_remove_statsDB_linkage_all").
+			 * So rollback the TP.
+			 */
+			assert(!save_dollar_tlevel);
+			OP_TROLLBACK(0);
+			assert(!dollar_tlevel);
+		}
+	}
+	t_abort_cleanup();
 	/* Do not release crit in case of
 	 * 	a) MUPIP RECOVER ONLINE  OR
 	 * 	b) DSE where a CRIT SEIZE had been done on this region previously
diff --git a/sr_port/t_abort.h b/sr_port/t_abort.h
index c5dffb1..b2857d5 100755
--- a/sr_port/t_abort.h
+++ b/sr_port/t_abort.h
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2004 Sanchez Computer Associates, Inc.	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -12,6 +13,32 @@
 #ifndef T_ABORT_DEFINED
 #define T_ABORT_DEFINED
 
+void	t_abort_cleanup(void);
 void	t_abort(gd_region *reg, sgmnt_addrs *csa);
 
+#define CLEAR_CSE(GVNH)							\
+{									\
+	gv_namehead		*gvnh;					\
+	srch_blk_status		*s;					\
+									\
+	gvnh = GVNH;							\
+	if (NULL != gvnh)						\
+	{								\
+		for (s = &gvnh->hist.h[0]; s->blk_num; s++)		\
+			s->cse = NULL;					\
+	}								\
+}
+
+#define	RESET_BML_SAVE_DOLLAR_TLEVEL				\
+{								\
+	GBLREF	uint4		bml_save_dollar_tlevel;		\
+								\
+	if (bml_save_dollar_tlevel)				\
+	{							\
+		assert(!dollar_tlevel);				\
+		dollar_tlevel = bml_save_dollar_tlevel;		\
+		bml_save_dollar_tlevel = 0;			\
+	}							\
+}
+
 #endif
diff --git a/sr_port/t_abort_cleanup.c b/sr_port/t_abort_cleanup.c
new file mode 100755
index 0000000..f5a4bea
--- /dev/null
+++ b/sr_port/t_abort_cleanup.c
@@ -0,0 +1,96 @@
+/****************************************************************
+ *								*
+ * Copyright (c) 2004-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
+ *								*
+ *	This source code contains the intellectual property	*
+ *	of its copyright holder(s), and is made available	*
+ *	under a license.  If you do not know the terms of	*
+ *	the license, please stop and do not read further.	*
+ *								*
+ ****************************************************************/
+
+#include "mdef.h"
+
+#include "gdsroot.h"
+#include "gdskill.h"
+#include "gtm_facility.h"
+#include "fileinfo.h"
+#include "gdsbt.h"
+#include "gdsfhead.h"
+#include "filestruct.h"
+#include "longset.h"		/* needed for cws_insert.h */
+#include "hashtab_int4.h"	/* needed for cws_insert.h */
+#include "cws_insert.h"		/* for CWS_RESET macro */
+#include "gdsblkops.h"		/* for RESET_UPDATE_ARRAY macro */
+#include "t_abort.h"		/* for prototype of "t_abort" */
+
+GBLREF	unsigned char	cw_set_depth;
+GBLREF	unsigned int	t_tries;
+GBLREF	uint4		update_trans;
+GBLREF	boolean_t	need_kip_incr;
+GBLREF	uint4		dollar_tlevel;
+GBLREF	inctn_opcode_t	inctn_opcode;
+GBLREF	char		*update_array;
+GBLREF	boolean_t	mu_reorg_process;
+
+/* This function does cleanup that is common to "t_abort" and "preemptive_db_clnup" */
+void	t_abort_cleanup(void)
+{
+	DCL_THREADGBL_ACCESS;
+
+	SETUP_THREADGBL_ACCESS;
+	/* Clear "inctn_opcode" global variable now that any in-progress transaction is aborted at this point.
+	 * Not doing so would cause future calls to "t_end" to get confused and skip writing logical jnl recs
+	 * and instead incorrectly write an INCTN record (GTM-8425).
+	 * MUPIP REORG sets "inctn_opcode" once and expects it to stay that way for all of its non-tp transactions
+	 * even though it calls "t_abort" many times in between. So skip clearing this global just for that.
+	 * A better fix would be for "inctn_opcode" to be set to "inctn_mu_reorg" at the start of each reorg transaction.
+	 * But that requires more work and not clear if that is worth the time.
+	 */
+	if (!mu_reorg_process)
+		inctn_opcode = inctn_invalid_op;
+	/* If called from "preemptive_db_clnup" (because of an error in t_end (e.g. GBLOFLOW)), we don't want "need_kip_incr"
+	 * to get carried over to the next non-TP transaction that this process does (e.g. inside an error trap).
+	 * If called from "t_abort" (e.g. if we get a "kill -15" in t_end that was finishing phase1 of an M-kill), we don't want
+	 * this global variable to get carried over to the next non-TP transaction that this process does (e.g. removing ^%YGS
+	 * node from a statsdb as part of exit handling logic). So reset it in both cases.
+	 */
+	need_kip_incr = FALSE;
+	TREF(expand_prev_key) = FALSE;	/* reset global (in case it is TRUE) so it does not get carried over to future operations */
+	if (!dollar_tlevel)
+	{
+		/* "secshr_db_clnup/t_commit_cleanup" assume an active non-TP transaction if cw_set_depth is non-zero or if
+		 * update_trans has the UPDTRNS_TCOMMIT_STARTED_MASK bit set. Now that the transaction is aborted, reset them.
+		 */
+		cw_set_depth = 0;
+		if (update_trans)
+		{	/* It's possible we hit an error in the middle of an update transaction, at which point we have
+			 * a valid clue and non-NULL cse. However, this causes problems for subsequent
+			 * transactions (see comment in t_begin). In particular we could end up pinning buffers
+			 * unnecessarily. So clear the cse of any histories that may have been active during the update.
+			 */
+			CLEAR_CSE(gv_target);
+			if ((NULL != gv_target) && (NULL != gv_target->gd_csa))
+			{
+				CLEAR_CSE(gv_target->gd_csa->dir_tree);
+				GTMTRIG_ONLY(CLEAR_CSE(gv_target->gd_csa->hasht_tree));
+			}
+			/* Resetting this is needed to not fail an assert in t_begin that it is 0 at the start of a transaction */
+			update_trans = 0;
+		}
+		/* It is possible no CWS_INIT was done in which case CWS_RESET should not be called.
+		 * cw_stagnate.size would be 0 in that case. So check before calling CWS_RESET.
+		 */
+		if (cw_stagnate.size)
+			CWS_RESET;
+		/* Reset update_array_ptr to update_array.
+		 * Do not use CHECK_AND_RESET_UPDATE_ARRAY since cw_set_depth can be non-zero.
+		 * It is possible "update_array" could be NULL (no transaction was ever started in this process)
+		 * so check that before invoking the macro which assumes it is non-NULL.
+		 */
+		if (NULL != update_array)
+			RESET_UPDATE_ARRAY;
+		t_tries = 0;
+	}
+}
diff --git a/sr_port/t_begin.c b/sr_port/t_begin.c
index 665de89..6ffa8dc 100755
--- a/sr_port/t_begin.c
+++ b/sr_port/t_begin.c
@@ -49,6 +49,7 @@ GBLREF	boolean_t		need_kip_incr;
 GBLREF	boolean_t		mu_reorg_process;
 #ifdef DEBUG
 GBLREF	sgmnt_addrs		*reorg_encrypt_restart_csa;
+GBLREF	uint4			bml_save_dollar_tlevel;
 #endif
 
 error_def(ERR_MMREGNOACCESS);
@@ -99,10 +100,15 @@ void t_begin(uint4 err, uint4 upd_trans) 	/* err --> error code for current gvcs
 		{
 			histtn = s->tn;
 			/* Assert that we have a NULL cse in case of a non-zero clue as this will otherwise confuse t_end.c.
-			 * The only exception is reorg in which case we nullify the clue AFTER the t_begin call (in mu_reorg.c,
-			 * mu_swap_root.c, mu_truncate.c) but BEFORE the gvcst_search call so the clue does not get used.
+			 * The only exceptions are
+			 *	a) reorg in which case we nullify the clue AFTER the t_begin call (in mu_reorg.c, mu_swap_root.c,
+			 *	   mu_truncate.c) but BEFORE the gvcst_search call so the clue does not get used.
+			 *	b) gvcst_bmp_mark_free : It could be invoked from op_tcommit (through gvcst_expand_free_subtree)
+			 *	   to free up blocks in a bitmap in which case it does not deal with histories/gv_target and
+			 *	   so gv_target->clue and/or gv_target->hist.h[x].cse does not matter. The global variable
+			 *	   bml_save_dollar_tlevel exactly identifies this scenario.
 			 */
-			assert(mu_reorg_process || (NULL == s->cse));
+			assert(mu_reorg_process || (NULL == s->cse) || bml_save_dollar_tlevel);
 			if (start_tn > histtn)
 				start_tn = histtn;
 		}
diff --git a/sr_port/t_begin_crit.c b/sr_port/t_begin_crit.c
index e42d725..64dcccf 100755
--- a/sr_port/t_begin_crit.c
+++ b/sr_port/t_begin_crit.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2012 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -71,7 +72,7 @@ void	t_begin_crit(uint4 err)	/* err - error code for current gvcst_routine */
 		 * in the middle of any transaction.
 		 */
 		DEBUG_ONLY(TREF(ok_to_call_wcs_recover) = TRUE;)
-		grab_crit(gv_cur_region);
+		grab_crit_encr_cycle_sync(gv_cur_region);
 		DEBUG_ONLY(TREF(ok_to_call_wcs_recover) = FALSE;)
 	}
 }
diff --git a/sr_port/t_commit_cleanup.c b/sr_port/t_commit_cleanup.c
index d15e5d9..67988e6 100755
--- a/sr_port/t_commit_cleanup.c
+++ b/sr_port/t_commit_cleanup.c
@@ -42,7 +42,7 @@
 #include "send_msg.h"
 #include "have_crit.h"
 
-GBLREF	cache_rec_ptr_t		cr_array[((MAX_BT_DEPTH * 2) - 1) * 2]; /* Maximum number of blocks that can be in transaction */
+GBLREF	cache_rec_ptr_t		cr_array[]; /* Maximum number of blocks that can be in transaction */
 GBLREF	unsigned int		cr_array_index;
 GBLREF	sgmnt_addrs		*cs_addrs;
 GBLREF	sgmnt_data_ptr_t	cs_data;
@@ -52,6 +52,7 @@ GBLREF	uint4			dollar_trestart;
 GBLREF	uint4			dollar_tlevel;
 GBLREF	sgm_info		*first_sgm_info;
 GBLREF	sgm_info		*first_tp_si_by_ftok; /* List of participating regions in the TP transaction sorted on ftok order */
+GBLREF  tp_region               *tp_reg_list;	      /* List of tp_regions for this transaction */
 GBLREF	gd_region		*gv_cur_region;
 GBLREF	gv_namehead		*gv_target;
 GBLREF	jnlpool_addrs		jnlpool;
@@ -103,6 +104,7 @@ boolean_t t_commit_cleanup(enum cdb_sc status, int signal)
 	cache_rec_ptr_t			cr;
 	sgm_info			*si;
 	sgmnt_addrs			*csa, *jpl_csa = NULL;
+	tp_region			*tr;
 	char				*trstr;
 	gd_region			*xactn_err_region, *jpl_reg = NULL;
 	cache_rec_ptr_t			*tp_cr_array;
@@ -203,16 +205,35 @@ boolean_t t_commit_cleanup(enum cdb_sc status, int signal)
 				ASSERT_JNL_SEQNO_FILEHDR_JNLPOOL(csa->hdr, jnlpool_ctl); /* debug-only sanity check between
 											  * seqno of filehdr and jnlpool */
 				/* Do not release crit on the region until reg_seqno has been reset above. */
-				assert(!csa->hold_onto_crit UNIX_ONLY(|| jgbl.onlnrlbk));
+				assert(!csa->hold_onto_crit || jgbl.onlnrlbk);
 				if (!csa->hold_onto_crit && release_crit)
 					rel_crit(gv_cur_region); /* step (1) of the commit logic is iteratively undone here */
 			}
-			/* If final retry and released crit (in the above loop), decrement t_tries to ensure that we dont have an
-			 * out-of-design situation (with crit not being held in the final retry).
-			 */
-			if (release_crit && (CDB_STAGNATE <= t_tries))
-				TP_FINAL_RETRY_DECREMENT_T_TRIES_IF_OK; /* t_tries untouched for rollback and recover */
-			UNIX_ONLY(assert(!jgbl.onlnrlbk || (lcl_t_tries == t_tries)));
+			if (release_crit)
+			{	/* If final retry and released crit (in the above loop), do the following
+				 * Decrement t_tries to ensure that we dont have an out-of-design situation (with crit not being
+				 * held in the final retry).
+				 */
+				if (CDB_STAGNATE <= t_tries)
+					TP_FINAL_RETRY_DECREMENT_T_TRIES_IF_OK; /* t_tries untouched for rollback and recover */
+				/* Above, we released crit on all regions in "first_sgm_info" (list of regions referenced in the
+				 * current try/retry of this TP transaction). But it is possible "tp_reg_list" (list of regions
+				 * referenced across all tries/retries of this TP transaction until now) contains a few more
+				 * regions on which we have crit . In that case we need to release crit on those regions as well.
+				 * Types of activity that could lead to this situation:
+				 *  - M locks
+				 *  - Regions from which globals are read but not updated
+				 */
+				for (tr = tp_reg_list; NULL != tr; tr = tr->fPtr)
+				{
+					assert(tr->reg->open);
+					csa = (sgmnt_addrs *)&FILE_INFO(tr->reg)->s_addrs;
+					assert(!csa->hold_onto_crit || jgbl.onlnrlbk);
+					if (!csa->hold_onto_crit && csa->now_crit)
+						rel_crit(tr->reg);
+				}
+			}
+			assert(!jgbl.onlnrlbk || (lcl_t_tries == t_tries));
 			assert((lcl_t_tries == t_tries) || (t_tries == (CDB_STAGNATE - 1)));
 			/* Do not release crit on jnlpool until reg_seqno has been reset above */
 			RELEASE_JNLPOOL_LOCK_IF_NEEDED(jpl_reg);/* step (2) of the commit logic is undone here */
@@ -240,7 +261,7 @@ boolean_t t_commit_cleanup(enum cdb_sc status, int signal)
 		 * the process wants to hold onto crit (for instance, DSE or ONLINE ROLLBACK). In that case, do the flush anyways.
 		 */
 		assert(!release_crit || (0 == have_crit(CRIT_HAVE_ANY_REG))
-			UNIX_ONLY(|| jgbl.onlnrlbk) || (!dollar_tlevel && cs_addrs->hold_onto_crit));
+			|| jgbl.onlnrlbk || (!dollar_tlevel && cs_addrs->hold_onto_crit));
 		if (release_crit && unhandled_stale_timer_pop)
 			process_deferred_stale();
 	} else
diff --git a/sr_port/t_create.c b/sr_port/t_create.c
index 47193e8..8bc21a3 100755
--- a/sr_port/t_create.c
+++ b/sr_port/t_create.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -26,24 +27,13 @@
 #include "tp.h"
 #include "t_create.h"
 
-#define TP_ALLOCATION_CLUE_INCREMENT	1	/* This is the default value. Defined below (under a #ifdef) is another value
-						 * Enable below #ifdef/#endif block if you want that value instead.
-						 */
-#ifdef TP_ALLOCATION_CLUE_BUMP_BY_512
-#define	TP_ALLOCATION_CLUE_INCREMENT	512	/* Change this to some other number if you want a different bump to the
-						 * tp allocation clue each time it is used.
-						 */
-#endif
-
 GBLREF	cw_set_element		cw_set[];
 GBLREF	sgmnt_data_ptr_t	cs_data;
 GBLREF	unsigned char		cw_set_depth;
 GBLREF	sgm_info		*sgm_info_ptr;
 GBLREF	uint4			dollar_tlevel;
-GBLREF	block_id		tp_allocation_clue;
 GBLREF	gv_namehead		*gv_target;
 GBLREF	trans_num		local_tn;	/* transaction number for THIS PROCESS */
-GBLREF	block_id		gtm_tp_allocation_clue;	/* block# hint to start allocation for created blocks in TP */
 
 block_index t_create (
 		      block_id	hint,			/*  A hint block number.  */
@@ -68,20 +58,6 @@ block_index t_create (
 		cse = &cw_set[cw_set_depth];
 	} else
 	{
-		if (!tp_allocation_clue)
-		{
-			tp_allocation_clue = gtm_tp_allocation_clue + 1; /* + 1 so we dont start out with 0 value for "hint" */
-			hint = tp_allocation_clue;			 /* this is copied over to cse->blk which is asserted
-									  * in gvcst_put as never being 0.
-									  */
-		} else
-		{
-			tp_allocation_clue += TP_ALLOCATION_CLUE_INCREMENT;
-			hint = tp_allocation_clue;
-			/* What if hint becomes greater than total_blks. Should we wrap back to 0? */
-			if (tp_allocation_clue < 0)
-				GTMASSERT;
-		}
 		tp_cw_list(&cse);
 		assert(gv_target);
 		cse->blk_target = gv_target;
diff --git a/sr_port/t_end.c b/sr_port/t_end.c
index 51e836d..e51ba98 100644
--- a/sr_port/t_end.c
+++ b/sr_port/t_end.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -18,10 +18,6 @@
 #include "gtm_inet.h"
 #include "gtm_signal.h"	/* for VSIG_ATOMIC_T type */
 
-#ifdef VMS
-#include <descrip.h> 	/* Required for gtmsource.h */
-#endif
-
 #include "cdb_sc.h"
 #include "gdsroot.h"
 #include "gtm_facility.h"
@@ -53,12 +49,10 @@
 #include "gtmimagename.h"
 #include "anticipatory_freeze.h"
 
-#ifdef UNIX
 #include "gtmrecv.h"
 #include "deferred_signal_handler.h"
 #include "repl_instance.h"
 #include "format_targ_key.h"
-#endif
 
 /* Include prototypes */
 #include "t_qread.h"
@@ -82,9 +76,7 @@
 #include "jnl_get_checksum.h"
 #include "wbox_test_init.h"
 #include "have_crit.h"
-#ifdef GTM_SNAPSHOT
 #include "db_snapshot.h"
-#endif
 #include "shmpool.h"
 #include "bml_status_check.h"
 #include "is_proc_alive.h"
@@ -92,7 +84,7 @@
 
 GBLREF	bool			rc_locked;
 GBLREF	unsigned char		t_fail_hist[CDB_MAX_TRIES];
-GBLREF	cache_rec_ptr_t		cr_array[((MAX_BT_DEPTH * 2) - 1) * 2]; /* Maximum number of blocks that can be in transaction */
+GBLREF	cache_rec_ptr_t		cr_array[]; /* Maximum number of blocks that can be in transaction */
 GBLREF	unsigned int		cr_array_index;
 GBLREF	boolean_t		block_saved;
 GBLREF	uint4			update_trans;
@@ -134,18 +126,17 @@ GBLREF	boolean_t		block_is_free;
 GBLREF	boolean_t		gv_play_duplicate_kills;
 GBLREF	boolean_t		pool_init;
 GBLREF	gv_key			*gv_currkey;
-#ifdef GTM_TRIGGER
-GBLREF	boolean_t		skip_dbtriggers;	/* see gbldefs.c for description of this global */
-#endif
-#ifdef UNIX
 GBLREF	recvpool_addrs		recvpool;
 GBLREF	int4			strm_index;
+GBLREF	uint4			mu_reorg_encrypt_in_prog;	/* non-zero if MUPIP REORG ENCRYPT is in progress */
+GBLREF	sgmnt_addrs		*reorg_encrypt_restart_csa;
+#ifdef GTM_TRIGGER
+GBLREF	boolean_t		skip_dbtriggers;	/* see gbldefs.c for description of this global */
 #endif
 #ifdef DEBUG
 GBLREF	boolean_t		mupip_jnl_recover;
+GBLREF	uint4			bml_save_dollar_tlevel;
 #endif
-GBLREF	uint4			mu_reorg_encrypt_in_prog;	/* non-zero if MUPIP REORG ENCRYPT is in progress */
-GBLREF	sgmnt_addrs		*reorg_encrypt_restart_csa;
 
 error_def(ERR_GBLOFLOW);
 error_def(ERR_GVKILLFAIL);
@@ -159,15 +150,15 @@ error_def(ERR_TEXT);
 
 #define BLOCK_FLUSHING(x) (csa->hdr->clustered && x->flushing && !CCP_SEGMENT_STATE(cs_addrs->nl,CCST_MASK_HAVE_DIRTY_BUFFERS))
 
-#define	RESTORE_CURRTN_IF_NEEDED(csa, write_inctn, decremented_currtn)					\
+#define	RESTORE_CURRTN_IF_NEEDED(csa, cti, write_inctn, decremented_currtn)				\
 {													\
 	if (write_inctn && decremented_currtn)								\
 	{	/* decremented curr_tn above; need to restore to original state due to the restart */	\
 		assert(csa->now_crit);									\
 		if (csa->now_crit)									\
 		{	/* need crit to update curr_tn and early_tn */					\
-			csa->ti->curr_tn++;								\
-			csa->ti->early_tn++;								\
+			cti->curr_tn++;									\
+			cti->early_tn++;								\
 		}											\
 		decremented_currtn = FALSE;								\
 	}												\
@@ -209,10 +200,8 @@ trans_num t_end(srch_hist *hist1, srch_hist *hist2, trans_num ctn)
 	jnlpool_ctl_ptr_t	jpl;
 	jnlpool_write_ctx_t	jplctx;
 	boolean_t		replication = FALSE;
-#	ifdef UNIX
 	boolean_t		supplementary = FALSE;	/* this variable is initialized ONLY if "replication" is TRUE. */
 	seq_num			strm_seqno, next_strm_seqno;
-#	endif
 	sm_uc_ptr_t		blk_ptr, backup_blk_ptr;
 	int			blkid;
 	boolean_t		is_mm;
@@ -241,12 +230,13 @@ trans_num t_end(srch_hist *hist1, srch_hist *hist2, trans_num ctn)
 	boolean_t		same_db_state;
 	gv_namehead		*gvnh;
 	qw_off_t		jnlpool_overflow_size;
+	gd_region		*reg;
 #	ifdef GTM_TRIGGER
 	uint4			cycle;
 #	endif
-#	ifdef GTM_SNAPSHOT
 	snapshot_context_ptr_t  lcl_ss_ctx;
-#	endif
+	th_index_ptr_t     	cti;
+
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
@@ -262,13 +252,12 @@ trans_num t_end(srch_hist *hist1, srch_hist *hist2, trans_num ctn)
 		ready2signal_gvundef_lcl = TREF(ready2signal_gvundef);
 		TREF(ready2signal_gvundef) = FALSE;
 	)
+	reg = gv_cur_region;
 	csa = cs_addrs;
 	csd = csa->hdr;
 	cnl = csa->nl;
 	is_mm = (dba_mm == csd->acc_meth);
-#	ifdef GTM_TRUNCATE
 	DEBUG_ONLY(in_mu_truncate = (cnl != NULL && process_id == cnl->trunc_pid);)
-#	endif
 	TREF(rlbk_during_redo_root) = FALSE;
 	status = cdb_sc_normal;
 	/* The only cases where we set csa->hold_onto_crit to TRUE are the following :
@@ -282,7 +271,7 @@ trans_num t_end(srch_hist *hist1, srch_hist *hist2, trans_num ctn)
 	 * to catch cases where the field is inadvertently set to TRUE.
 	 */
 	assert(!csa->hold_onto_crit || IS_DSE_IMAGE
-		UNIX_ONLY(|| jgbl.onlnrlbk || TREF(in_gvcst_redo_root_search) || TREF(in_trigger_upgrade)));
+		|| jgbl.onlnrlbk || TREF(in_gvcst_redo_root_search) || TREF(in_trigger_upgrade));
 	assert(cs_data == csd);
 	assert((t_tries < CDB_STAGNATE) || csa->now_crit);
 	assert(!dollar_tlevel);
@@ -294,18 +283,19 @@ trans_num t_end(srch_hist *hist1, srch_hist *hist2, trans_num ctn)
 	assert(cw_set_depth || !update_trans || ((ERR_GVPUTFAIL == t_err) && gvdupsetnoop)
 		|| (ERR_JRTNULLFAIL == t_err) || ((ERR_GVKILLFAIL == t_err) && gv_play_duplicate_kills));
 	assert(0 == cr_array_index);
-	assert(!gv_cur_region->read_only || !update_trans);
+	assert(!reg->read_only || !update_trans);
 	cr_array_index = 0;	/* be safe and reset it in PRO even if it is not zero */
 	/* If inctn_opcode has a valid value, then we better be doing an update. The only exception to this rule is if we are
 	 * in MUPIP REORG UPGRADE/DOWNGRADE/ENCRYPT (mu_reorg_upgrd_dwngrd.c or mupip_reorg_encrypt.c), where update_trans is
 	 * explicitly set to 0 in some cases.
 	 */
 	assert((inctn_invalid_op == inctn_opcode) || mu_reorg_upgrd_dwngrd_in_prog || mu_reorg_encrypt_in_prog || update_trans);
-	assert(!need_kip_incr || update_trans UNIX_ONLY(|| TREF(in_gvcst_redo_root_search)));
-	if (cnl->wc_blocked || (is_mm && (csa->total_blks != csa->ti->total_blks)))
+	assert(!need_kip_incr || update_trans || TREF(in_gvcst_redo_root_search));
+	cti = csa->ti;
+	if (cnl->wc_blocked || (is_mm && (csa->total_blks != cti->total_blks)))
 	{	/* If blocked, or we have MM and file has been extended, force repair */
 		status = cdb_sc_helpedout;	/* force retry with special status so philanthropy isn't punished */
-		assert((CDB_STAGNATE > t_tries) || !is_mm || (csa->total_blks == csa->ti->total_blks));
+		assert((CDB_STAGNATE > t_tries) || !is_mm || (csa->total_blks == cti->total_blks));
 		goto failed_skip_revert;
 	}
 	if (!update_trans)
@@ -314,7 +304,7 @@ trans_num t_end(srch_hist *hist1, srch_hist *hist2, trans_num ctn)
 		 * Note: if, as with updates, we validated via bt_get/db_csh_get, we would restart under the same conditions.
 		 */
 		SHM_READ_MEMORY_BARRIER;
-		same_db_state = (start_tn == csa->ti->early_tn);
+		same_db_state = (start_tn == cti->early_tn);
 		n_blks_validated = 0;
 		if (cw_map_depth)
 		{	/* Bit maps from "mupip_reorg_encrypt" or "mu_reorg_upgrd_dwngrd" that need history validation.
@@ -360,7 +350,7 @@ trans_num t_end(srch_hist *hist1, srch_hist *hist2, trans_num ctn)
 				/* Validate buffer cycle */
 				if (!is_mm && (t1->cr->cycle != t1->cycle))
 				{	/* cache slot has been stolen */
-					assert(!csa->now_crit);
+					assert(CDB_STAGNATE > t_tries);
 					status = cdb_sc_cyclefail;
 					goto failed_skip_revert;
 				}
@@ -368,7 +358,6 @@ trans_num t_end(srch_hist *hist1, srch_hist *hist2, trans_num ctn)
 			}
 		}
 		assert(cdb_sc_normal == status);
-#		ifdef UNIX
 		if ((0 != csa->nl->onln_rlbk_pid) && (process_id != csa->nl->onln_rlbk_pid))
 		{	/* We don't want read transactions to succeed if a concurrent online rollback is running. Following
 			 * grab_crit, we know none is running because grab_crit either waits for online rollback to complete, or
@@ -378,8 +367,8 @@ trans_num t_end(srch_hist *hist1, srch_hist *hist2, trans_num ctn)
 			 * database to a state back in time, and we can complete the read.
 			 */
 			assert(!csa->now_crit);
-			grab_crit(gv_cur_region);
-			rel_crit(gv_cur_region);
+			grab_crit(reg);
+			rel_crit(reg);
 		}
 		if (MISMATCH_ROOT_CYCLES(csa, cnl))
 		{	/* If a root block has moved, we might have started the read from the wrong root block, in which
@@ -388,26 +377,32 @@ trans_num t_end(srch_hist *hist1, srch_hist *hist2, trans_num ctn)
 			 */
 			was_crit = csa->now_crit;
 			if (!was_crit)
-				grab_crit(gv_cur_region);
+				grab_crit(reg);
 			status = cdb_sc_gvtrootmod2;
 			if (MISMATCH_ONLN_RLBK_CYCLES(csa, cnl))
 			{
 				assert(!mupip_jnl_recover);
+				assert(!IS_STATSDB_CSA(csa));
 				status = ONLN_RLBK_STATUS(csa, cnl);
 				SYNC_ONLN_RLBK_CYCLES;
 				SYNC_ROOT_CYCLES(NULL);
 			} else
 				SYNC_ROOT_CYCLES(csa);
 			if (!was_crit)
-				rel_crit(gv_cur_region);
+				rel_crit(reg);
+			goto failed_skip_revert;
+		}
+		if (start_tn <= cnl->last_wcs_recover_tn)
+		{
+			status = cdb_sc_wcs_recover;
+			assert(CDB_STAGNATE > t_tries);
 			goto failed_skip_revert;
 		}
-#		endif
 		/* Assert that if gtm_gvundef_fatal is non-zero, then we better not be about to signal a GVUNDEF */
 		assert(!TREF(gtm_gvundef_fatal) || !ready2signal_gvundef_lcl);
 		assert(!TREF(donot_commit));    /* We should never commit a transaction that was determined restartable */
 		if (csa->now_crit && !csa->hold_onto_crit)
-			rel_crit(gv_cur_region);
+			rel_crit(reg);
 		if (unhandled_stale_timer_pop)
 			process_deferred_stale();
 		CWS_RESET;
@@ -415,7 +410,7 @@ trans_num t_end(srch_hist *hist1, srch_hist *hist2, trans_num ctn)
 		t_tries = 0;	/* commit was successful so reset t_tries */
 		INCR_GVSTATS_COUNTER(csa, cnl, n_nontp_readonly, 1);
 		INCR_GVSTATS_COUNTER(csa, cnl, n_nontp_blkread, n_blks_validated);
-		return csa->ti->curr_tn;
+		return cti->curr_tn;
 	}
 	assert(update_trans);
 	assert((gds_t_committed < gds_t_busy2free)	&& (n_gds_t_op > gds_t_busy2free));
@@ -451,7 +446,6 @@ trans_num t_end(srch_hist *hist1, srch_hist *hist2, trans_num ctn)
 			cw_bmp_depth = 1;
 		}
 	}
-#	ifdef GTM_SNAPSHOT
 	if (SNAPSHOTS_IN_PROG(cnl))
 	{
 		/* If snapshot context is not already created, then create one now to be used by this transaction. If context
@@ -461,16 +455,13 @@ trans_num t_end(srch_hist *hist1, srch_hist *hist2, trans_num ctn)
 		SS_INIT_IF_NEEDED(csa, cnl);
 	} else
 		CLEAR_SNAPSHOTS_IN_PROG(csa);
-#	endif
 	if (0 != cw_depth)
 	{	/* Caution : since csa->backup_in_prog and read_before_image are initialized below
 	 	 * only if (cw_depth), these variables should be used below only within an if (cw_depth).
 		 */
-#		ifdef GTM_SNAPSHOT
 		lcl_ss_in_prog = SNAPSHOTS_IN_PROG(csa); /* store in local variable to avoid pointer access */
 		reorg_ss_in_prog = (mu_reorg_process && lcl_ss_in_prog); /* store in local variable if both snapshots and MUPIP
 									  * REORG are in progress */
-#		endif
 		assert(SIZEOF(bsiz) == SIZEOF(old_block->bsiz));
 		csa->backup_in_prog = (BACKUP_NOT_IN_PROGRESS != cnl->nbb);
 		jbbp = (JNL_ENABLED(csa) && csa->jnl_before_image) ? csa->jnl->jnl_buff : NULL;
@@ -492,7 +483,6 @@ trans_num t_end(srch_hist *hist1, srch_hist *hist2, trans_num ctn)
 					} else
 					{
 						GET_CDB_SC_CODE(cs->blk, status);	/* code is set in status */
-#						ifdef UNIX
 						if (is_mm && (cdb_sc_gbloflow == status))
 						{
 							assert(NULL != gv_currkey);
@@ -503,11 +493,10 @@ trans_num t_end(srch_hist *hist1, srch_hist *hist2, trans_num ctn)
 							rts_error_csa(CSA_ARG(csa) VARLSTCNT(6) ERR_GBLOFLOW, 0,
 									ERR_GVIS, 2, end - buff, buff);
 						}
-#						endif
 					}
 					goto failed_skip_revert;
 				}
-				assert((CDB_STAGNATE > t_tries) || (cs->blk < csa->ti->total_blks));
+				assert((CDB_STAGNATE > t_tries) || (cs->blk < cti->total_blks));
 				blk_used ? BIT_SET_RECYCLED_AND_CLEAR_FREE(cs->blk_prior_state)
 					 : BIT_CLEAR_RECYCLED_AND_SET_FREE(cs->blk_prior_state);
 				BEFORE_IMAGE_NEEDED(read_before_image, cs, csa, csd, cs->blk, before_image_needed);
@@ -544,11 +533,11 @@ trans_num t_end(srch_hist *hist1, srch_hist *hist2, trans_num ctn)
 				}
 				/* assert that the block that we got from bm_getfree is less than the total blocks.
 				 * if we do not have crit in this region, then it is possible that bm_getfree can return
-				 * a cs->blk that is >= csa->ti->total_blks (i.e. if the bitmap buffer gets recycled).
+				 * a cs->blk that is >= cti->total_blks (i.e. if the bitmap buffer gets recycled).
 				 * adjust assert accordingly.
 				 * note that checking for crit is equivalent to checking if we are in the final retry.
 				 */
-				assert((CDB_STAGNATE > t_tries) || (cs->blk < csa->ti->total_blks));
+				assert((CDB_STAGNATE > t_tries) || (cs->blk < cti->total_blks));
 				cs->mode = gds_t_acquired;
 				assert(GDSVCURR == cs->ondsk_blkver);
 			} else if (reorg_ss_in_prog && WAS_FREE(cs->blk_prior_state))
@@ -615,29 +604,32 @@ trans_num t_end(srch_hist *hist1, srch_hist *hist2, trans_num ctn)
 		/* Get more space if needed. This is done outside crit so that
 		 * any necessary IO has a chance of occurring outside crit.
 		 * The available space must be double-checked inside crit. */
-		if (!is_mm && !WCS_GET_SPACE(gv_cur_region, cw_set_depth + 1, NULL))
+		if (!is_mm && !WCS_GET_SPACE(reg, cw_set_depth + 1, NULL))
 			assert(FALSE);	/* wcs_get_space should have returned TRUE unconditionally in this case */
 		for (;;)
 		{
-			grab_crit(gv_cur_region);
-			if (FALSE == csd->freeze)
+			grab_crit(reg);
+			if (!FROZEN_HARD(csd))
 				break;
-			rel_crit(gv_cur_region);
+			rel_crit(reg);
 			/* We are about to wait for freeze. Assert that we are not in phase2 of a bitmap free operation
-			 * (part of an M-kill or REORG operation). The freeze must have waited for the phase2 to complete.
+			 * (part of an M-kill or REORG operation). Most freeze operations (e.g. MUPIP FREEZE) wait for the
+			 * phase2 to complete. Some (e.g. MUPIP EXTRACT -FREEZE) don't. The cnl->freezer_waited_for_kip flag
+			 * indicates which type of freeze it is. Assert based on that.
 			 */
-			assert((inctn_bmp_mark_free_gtm != inctn_opcode) && (inctn_bmp_mark_free_mu_reorg != inctn_opcode));
-			while (csd->freeze)
+			assert(!cnl->freezer_waited_for_kip
+				|| (inctn_bmp_mark_free_gtm != inctn_opcode) && (inctn_bmp_mark_free_mu_reorg != inctn_opcode));
+			while (FROZEN_HARD(csd))
 				hiber_start(1000);
 		}
 	} else
 	{	/* We expect the process to be in its final retry as it is holding crit. The only exception is if hold_onto_crit
-		 * is TRUE but in that case we dont expect csd->freeze to be TRUE so we dont care much about that case. The other
+		 * is TRUE but in that case we don't expect csd->freeze to be TRUE so we don't care much about that case. The other
 		 * exception is if this is DSE which gets crit even without being in the final retry. In that case, skip the check
 		 * about whether we are about to update a frozen db. DSE is the only utility allowed to update frozen databases.
 		 */
 		assert((CDB_STAGNATE == t_tries) || csa->hold_onto_crit || IS_DSE_IMAGE);
-		if (csd->freeze && !IS_DSE_IMAGE)
+		if (FROZEN_HARD(csd) && !IS_DSE_IMAGE)
 		{	/* We are about to update a frozen database. This is possible in rare cases even though
 			 * we waited for the freeze to be lifted in t_retry (see GTM-7004). Restart in this case.
 			 */
@@ -647,8 +639,7 @@ trans_num t_end(srch_hist *hist1, srch_hist *hist2, trans_num ctn)
 	}
 	com_csum = 0;
 	/* We should never proceed to update a frozen database. Only exception is DSE */
-	assert(!csd->freeze || IS_DSE_IMAGE);
-#	ifdef UNIX
+	assert(!FROZEN_HARD(csd) || IS_DSE_IMAGE);
 	/* We never expect to come here with file_corrupt set to TRUE (in case of an online rollback) because
 	 * grab_crit done above will make sure of that. The only exception is RECOVER/ROLLBACK itself coming
 	 * here in the forward phase
@@ -675,8 +666,7 @@ trans_num t_end(srch_hist *hist1, srch_hist *hist2, trans_num ctn)
 	DEBUG_ONLY(prev_status = LAST_RESTART_CODE);
 	assert((cdb_sc_normal == prev_status) || ((cdb_sc_onln_rlbk1 != prev_status) && (cdb_sc_onln_rlbk2 != prev_status))
 		|| (!TREF(in_gvcst_bmp_mark_free) || mu_reorg_process));
-#	endif
-	if (is_mm && ((csa->hdr != csd) || (csa->total_blks != csa->ti->total_blks)))
+	if (is_mm && ((csa->hdr != csd) || (csa->total_blks != cti->total_blks)))
         {       /* If MM, check if wcs_mm_recover was invoked as part of the grab_crit done above OR if
                  * the file has been extended. If so, restart.
                  */
@@ -744,7 +734,7 @@ trans_num t_end(srch_hist *hist1, srch_hist *hist2, trans_num ctn)
 		goto failed;
 	}
 	ss_need_to_restart = new_bkup_started = FALSE;
-	GTM_SNAPSHOT_ONLY(CHK_AND_UPDATE_SNAPSHOT_STATE_IF_NEEDED(csa, cnl, ss_need_to_restart));
+	CHK_AND_UPDATE_SNAPSHOT_STATE_IF_NEEDED(csa, cnl, ss_need_to_restart);
 	if (cw_depth)
 	{
 		CHK_AND_UPDATE_BKUP_STATE_IF_NEEDED(cnl, csa, new_bkup_started);
@@ -769,7 +759,7 @@ trans_num t_end(srch_hist *hist1, srch_hist *hist2, trans_num ctn)
 		}
 	}
 	/* in crit, ensure cache-space is available. the out-of-crit check done above might not have been enough */
-	if (!is_mm && !WCS_GET_SPACE(gv_cur_region, cw_set_depth + 1, NULL))
+	if (!is_mm && !WCS_GET_SPACE(reg, cw_set_depth + 1, NULL))
 	{
 		assert(cnl->wc_blocked);	/* only reason we currently know why wcs_get_space could fail */
 		assert(gtm_white_box_test_case_enabled);
@@ -801,13 +791,13 @@ trans_num t_end(srch_hist *hist1, srch_hist *hist2, trans_num ctn)
 			assert((inctn_gvcstput_extra_blk_split == inctn_opcode)
 				|| (inctn_bmp_mark_free_gtm == inctn_opcode)
 				|| (inctn_bmp_mark_free_mu_reorg == inctn_opcode) || (1 == cw_set_depth));
-			csa->ti->curr_tn--;
-			csa->ti->early_tn--;
+			cti->curr_tn--;
+			cti->early_tn--;
 			decremented_currtn = TRUE;
 		}
 	}
 	assert(csd == csa->hdr);
-	valid_thru = dbtn = csa->ti->curr_tn;
+	valid_thru = dbtn = cti->curr_tn;
 	if (!is_mm)
 		oldest_hist_tn = OLDEST_HIST_TN(csa);
 	valid_thru++;
@@ -1189,7 +1179,7 @@ trans_num t_end(srch_hist *hist1, srch_hist *hist2, trans_num ctn)
 		 * This is necessary to ensure that timestamps of successive journal records for each
 		 * database file are in non-decreasing order. A side-effect of this is that our recorded
 		 * time might not accurately reflect the current system time but that is considered not
-		 * an issue since we dont expect to be off by more than a second or two if at all.
+		 * an issue since we don't expect to be off by more than a second or two if at all.
 		 * Another side effect is that even if the system time went back, we will never write
 		 * out-of-order timestamped journal records in the lifetime of this database shared memory.
 		 */
@@ -1206,7 +1196,7 @@ trans_num t_end(srch_hist *hist1, srch_hist *hist2, trans_num ctn)
 		 * In case of forw-phase-recovery, mur_output_record would have already set this.
 		 */
 		assert(jgbl.gbl_jrec_time);
-		jnl_status = jnl_ensure_open();
+		jnl_status = jnl_ensure_open(reg, csa);
 		GTM_WHITE_BOX_TEST(WBTEST_T_END_JNLFILOPN, jnl_status, ERR_JNLFILOPN);
 		if (jnl_status == 0)
 		{	/* tmp_cw_set_depth was used to do TOTAL_NONTPJNL_REC_SIZE calculation earlier in this function.
@@ -1243,38 +1233,26 @@ trans_num t_end(srch_hist *hist1, srch_hist *hist2, trans_num ctn)
 			assert(jgbl.gbl_jrec_time >= jbp->prev_jrec_time);
 			if (0 == jpc->pini_addr)
 				jnl_put_jrt_pini(csa);
-			if (JNL_HAS_EPOCH(jbp))
-			{
-				if ((jbp->next_epoch_time <= jgbl.gbl_jrec_time) UNCONDITIONAL_EPOCH_ONLY(|| TRUE))
-				{	/* Flush the cache. Since we are in crit, defer syncing epoch */
-					if (!wcs_flu(WCSFLU_FLUSH_HDR | WCSFLU_WRITE_EPOCH | WCSFLU_IN_COMMIT
-											| WCSFLU_SPEEDUP_NOBEFORE))
-					{
-						SET_WCS_FLU_FAIL_STATUS(status, csd);
-						SET_TRACEABLE_VAR(cnl->wc_blocked, TRUE);
-						BG_TRACE_PRO_ANY(csa, wc_blocked_t_end_jnl_wcsflu);
-						goto failed;
-					}
-					assert(csd == csa->hdr);
-					VMS_ONLY(
-						if (csd->clustered  &&
-							!CCP_SEGMENT_STATE(cnl, CCST_MASK_HAVE_DIRTY_BUFFERS))
-						{
-							CCP_FID_MSG(gv_cur_region, CCTR_FLUSHLK);
-							ccp_userwait(gv_cur_region,
-								CCST_MASK_HAVE_DIRTY_BUFFERS, 0, cnl->ccp_cycle);
-						}
-					)
+			if (((jbp->next_epoch_time <= jgbl.gbl_jrec_time) UNCONDITIONAL_EPOCH_ONLY(|| TRUE))
+						&& !FROZEN_CHILLED(csd))
+			{	/* Flush the cache. Since we are in crit, defer syncing epoch */
+				if (!wcs_flu(WCSFLU_FLUSH_HDR | WCSFLU_WRITE_EPOCH | WCSFLU_IN_COMMIT
+										| WCSFLU_SPEEDUP_NOBEFORE))
+				{
+					SET_WCS_FLU_FAIL_STATUS(status, csd);
+					SET_TRACEABLE_VAR(cnl->wc_blocked, TRUE);
+					BG_TRACE_PRO_ANY(csa, wc_blocked_t_end_jnl_wcsflu);
+					goto failed;
 				}
+				assert(csd == csa->hdr);
 			}
 		} else
 		{
 			if (SS_NORMAL != jpc->status)
 				rts_error_csa(CSA_ARG(csa) VARLSTCNT(7) jnl_status, 4, JNL_LEN_STR(csd),
-						DB_LEN_STR(gv_cur_region), jpc->status);
+						DB_LEN_STR(reg), jpc->status);
 			else
-				rts_error_csa(CSA_ARG(csa) VARLSTCNT(6) jnl_status, 4, JNL_LEN_STR(csd),
-						DB_LEN_STR(gv_cur_region));
+				rts_error_csa(CSA_ARG(csa) VARLSTCNT(6) jnl_status, 4, JNL_LEN_STR(csd), DB_LEN_STR(reg));
 		}
 	}
 	/* At this point, we are done with validation and so we need to assert that donot_commit is set to FALSE */
@@ -1286,14 +1264,12 @@ trans_num t_end(srch_hist *hist1, srch_hist *hist2, trans_num ctn)
 			grab_lock(jnlpool.jnlpool_dummy_reg, TRUE, ASSERT_NO_ONLINE_ROLLBACK);
 		assert(repl_csa->now_crit);
 		jnlpool_crit_acquired = TRUE;
-#		ifdef UNIX
 		/* With jnlpool lock held, check instance freeze, and retry if set. */
 		if (jnlpool.jnlpool_ctl->freeze)
 		{
 			status = cdb_sc_instancefreeze;
 			goto failed;
 		}
-#		endif
 		if (is_replicator && (inctn_invalid_op == inctn_opcode))
 		{
 			jpl = jnlpool_ctl;
@@ -1301,7 +1277,6 @@ trans_num t_end(srch_hist *hist1, srch_hist *hist2, trans_num ctn)
 			jplctx.write = jpl->write;
 			jplctx.write_total = 0;
 			temp_jnl_seqno = jpl->jnl_seqno;
-#			ifdef UNIX
 			if (INVALID_SUPPL_STRM != strm_index)
 			{	/* Need to also update supplementary stream seqno */
 				supplementary = TRUE;
@@ -1310,7 +1285,6 @@ trans_num t_end(srch_hist *hist1, srch_hist *hist2, trans_num ctn)
 				ASSERT_INST_FILE_HDR_HAS_HISTREC_FOR_STRM(strm_index);
 			} else
 				supplementary = FALSE;
-#			endif
 			INT8_ONLY(assert(jplctx.write == jpl->write_addr % jpl->jnlpool_size));
 			assert(jgbl.cumul_jnl_rec_len);
 			tmp_cumul_jnl_rec_len = (uint4)(jgbl.cumul_jnl_rec_len + SIZEOF(jnldata_hdr_struct));
@@ -1340,7 +1314,7 @@ trans_num t_end(srch_hist *hist1, srch_hist *hist2, trans_num ctn)
 	}
 	assert(TN_NOT_SPECIFIED > MAX_TN_V6); /* Ensure TN_NOT_SPECIFIED isn't a valid TN number */
 	blktn = (TN_NOT_SPECIFIED == ctn) ? dbtn : ctn;
-	csa->ti->early_tn = dbtn + 1;
+	cti->early_tn = dbtn + 1;
 	if (JNL_ENABLED(csa))
 	{	/* At this point we know tn,pini_addr and jrec_time; so calculate the checksum for the transaction once reuse it for
 		 * all the updates.
@@ -1469,10 +1443,8 @@ trans_num t_end(srch_hist *hist1, srch_hist *hist2, trans_num ctn)
 			if (replication)
 			{
 				jnl_fence_ctl.token = temp_jnl_seqno;
-				UNIX_ONLY(
-					if (supplementary)
-						jnl_fence_ctl.strm_seqno = SET_STRM_INDEX(strm_seqno, strm_index);
-				)
+				if (supplementary)
+					jnl_fence_ctl.strm_seqno = SET_STRM_INDEX(strm_seqno, strm_index);
 			} else if (!jgbl.forw_phase_recovery)
 				jnl_fence_ctl.token = seq_num_zero;
 			/* In case of forw-phase of recovery, token would have been set by mur_output_record */
@@ -1489,10 +1461,8 @@ trans_num t_end(srch_hist *hist1, srch_hist *hist2, trans_num ctn)
 		if (0 == jnl_fence_ctl.level)
 		{
 			jnl_fence_ctl.token = temp_jnl_seqno;
-			UNIX_ONLY(
-				if (supplementary)
-					jnl_fence_ctl.strm_seqno = SET_STRM_INDEX(strm_seqno, strm_index);
-			)
+			if (supplementary)
+				jnl_fence_ctl.strm_seqno = SET_STRM_INDEX(strm_seqno, strm_index);
 			jnl_write_logical(csa, non_tp_jfb_ptr, com_csum, &jplctx);
 		} else
 			jnl_write_ztp_logical(csa, non_tp_jfb_ptr, com_csum, temp_jnl_seqno, &jplctx);
@@ -1514,7 +1484,6 @@ trans_num t_end(srch_hist *hist1, srch_hist *hist2, trans_num ctn)
 			backup_blk_ptr = blk_ptr;
 			BG_BACKUP_BLOCK(csa, csd, cnl, cr, cs, blkid, backup_cr, backup_blk_ptr, block_saved,
 					 dummysi->backup_block_saved);
-#			ifdef GTM_SNAPSHOT
 			if (SNAPSHOTS_IN_PROG(csa))
 			{	/* we write the before-image to snapshot file only for FAST_INTEG and not for
 				 * regular integ because the block is going to be marked free at this point
@@ -1526,7 +1495,6 @@ trans_num t_end(srch_hist *hist1, srch_hist *hist2, trans_num ctn)
 				if (lcl_ss_ctx && FASTINTEG_IN_PROG(lcl_ss_ctx) && (blkid < lcl_ss_ctx->total_blks))
 					WRITE_SNAPSHOT_BLOCK(cs_addrs, cr, NULL, blkid, lcl_ss_ctx);
 			}
-#			endif
 		}
 	}
 	if (replication)
@@ -1534,22 +1502,13 @@ trans_num t_end(srch_hist *hist1, srch_hist *hist2, trans_num ctn)
 		temp_jnl_seqno++;
 		assert(csa->hdr->reg_seqno < temp_jnl_seqno);
 		csa->hdr->reg_seqno = temp_jnl_seqno;
-		UNIX_ONLY(
-			if (supplementary)
-			{
-				next_strm_seqno = strm_seqno + 1;
-				csa->hdr->strm_reg_seqno[strm_index] = next_strm_seqno;
-			}
-		)
-		VMS_ONLY(
-			if (is_updproc)
-			{
-				jgbl.max_resync_seqno++;
-				csa->hdr->resync_seqno = jgbl.max_resync_seqno;
-			}
-		)
+		if (supplementary)
+		{
+			next_strm_seqno = strm_seqno + 1;
+			csa->hdr->strm_reg_seqno[strm_index] = next_strm_seqno;
+		}
 	}
-	csa->prev_free_blks = csa->ti->free_blocks;
+	csa->prev_free_blks = cti->free_blocks;
 	csa->t_commit_crit = T_COMMIT_CRIT_PHASE1;
 	if (cw_set_depth)
 	{
@@ -1639,7 +1598,7 @@ trans_num t_end(srch_hist *hist1, srch_hist *hist2, trans_num ctn)
 	update_trans |= UPDTRNS_TCOMMIT_STARTED_MASK;
 	assert(cdb_sc_normal == status);
 	/* should never increment curr_tn on a frozen database except if DSE */
-	assert(!(csd->freeze UNIX_ONLY(|| (replication && jnlpool.jnlpool_ctl->freeze))) || IS_DSE_IMAGE);
+	assert(!(FROZEN_HARD(csd) || (replication && jnlpool.jnlpool_ctl->freeze)) || IS_DSE_IMAGE);
 	/* To avoid confusing concurrent processes, MM requires a barrier before incrementing db TN. For BG, cr->in_tend
 	 * serves this purpose so no barrier is needed. See comment in tp_tend.
 	 */
@@ -1651,31 +1610,28 @@ trans_num t_end(srch_hist *hist1, srch_hist *hist2, trans_num ctn)
 	 * otherwise do it here every HEADER_UPDATE_COUNT transactions.
 	 */
 	assert(!JNL_ENABLED(csa) || (jbp == csa->jnl->jnl_buff));
-	if ((!JNL_ENABLED(csa) || !JNL_HAS_EPOCH(jbp)) && !(csd->trans_hist.curr_tn & (HEADER_UPDATE_COUNT - 1)))
-		fileheader_sync(gv_cur_region);
-	UNIX_ONLY(assert((MUSWP_INCR_ROOT_CYCLE != TREF(in_mu_swap_root_state)) || need_kip_incr));
+	if (!JNL_ENABLED(csa) && !(csd->trans_hist.curr_tn & (HEADER_UPDATE_COUNT - 1)) && !FROZEN_CHILLED(csd))
+		fileheader_sync(reg);
+	assert((MUSWP_INCR_ROOT_CYCLE != TREF(in_mu_swap_root_state)) || need_kip_incr);
 	if (need_kip_incr)		/* increment kill_in_prog */
 	{
 		INCR_KIP(csd, csa, kip_csa);
 		need_kip_incr = FALSE;
-#		ifdef UNIX
 		if (MUSWP_INCR_ROOT_CYCLE == TREF(in_mu_swap_root_state))
 		{	/* Increment root_search_cycle to let other processes know that they should redo_root_search. */
 			assert((0 != cw_map_depth) && !TREF(in_gvcst_redo_root_search));
 			csa->nl->root_search_cycle++;
 		}
-#		endif
 	}
 	start_tn = dbtn; /* start_tn temporarily used to store currtn (for bg_update_phase2) before releasing crit */
 	if (free_seen)
 	{	/* need to do below BEFORE releasing crit as we have no other lock on this buffer */
-		VMS_ONLY(assert((BUSY2FREE == free_seen) && (2 <= cr_array_index) && (cr_array_index <= 3)));
-		UNIX_ONLY(assert(2 == cr_array_index));	/* Unlike VMS, no chance to pin a twin for bitmap update */
+		assert((2 <= cr_array_index) && (cr_array_index <= 3));	/* 3 is possible if we pinned a twin for bitmap update */
 		assert((2 == cw_set_depth) && (process_id == cr_array[0]->in_cw_set));
 		UNPIN_CACHE_RECORD(cr_array[0]);
 	}
 	if (!csa->hold_onto_crit)
-		rel_crit(gv_cur_region);
+		rel_crit(reg);
 	if (replication)
 	{
 		assert(jpl->early_write_addr > jpl->write_addr);
@@ -1689,10 +1645,8 @@ trans_num t_end(srch_hist *hist1, srch_hist *hist2, trans_num ctn)
 		 * this path.  If there is an update, then both the indices should be 1.
 		 */
 		INT8_ONLY(assert(jgbl.cumul_index == jgbl.cu_jnl_index));
-		UNIX_ONLY(
-			if (supplementary)
-				jpl->strm_seqno[strm_index] = next_strm_seqno;
-		)
+		if (supplementary)
+			jpl->strm_seqno[strm_index] = next_strm_seqno;
 		jpl->lastwrite_len = jnl_header->jnldata_len;
 		/* For systems with UNORDERED memory access (example, ALPHA, POWER4, PA-RISC 2.0), on a
 		 * multi processor system, it is possible that the source server notices the change in
@@ -1736,7 +1690,7 @@ trans_num t_end(srch_hist *hist1, srch_hist *hist2, trans_num ctn)
 		rel_lock(jnlpool.jnlpool_dummy_reg);
 	}
 	/* If BG, check that we have not pinned any more buffers than we are updating */
-	DBG_CHECK_PINNED_CR_ARRAY_CONTENTS(is_mm, cr_array, cr_array_index, csd->bplmap);
+	DBG_CHECK_PINNED_CR_ARRAY_CONTENTS(csd, is_mm, cr_array, cr_array_index);
 	if (cw_set_depth)
 	{	/* Finish 2nd phase of commit for BG (updating the buffers in phase1) now that CRIT has been released.
 		 * For MM, only thing needed is to set cs->mode to gds_t_committed.
@@ -1780,8 +1734,8 @@ trans_num t_end(srch_hist *hist1, srch_hist *hist2, trans_num ctn)
 		if (!is_mm)	/* now that two-phase commit is done, decrement counter */
 			DECR_WCS_PHASE2_COMMIT_PIDCNT(csa, cnl);
 	}
-	UNPIN_CR_ARRAY_ON_COMMIT(cr_array, cr_array_index);
-	assert(!cr_array_index);
+	ASSERT_CR_ARRAY_IS_UNPINNED(csd, cr_array, cr_array_index);
+	cr_array_index = 0;
 	csa->t_commit_crit = FALSE;
 	/* Phase 2 commits are completed. See if we had done a snapshot init (csa->snapshot_in_prog == TRUE). If so,
 	 * try releasing the resources obtained while snapshot init.
@@ -1825,16 +1779,16 @@ skip_cr_array:
 	t_tries = 0;	/* commit was successful so reset t_tries */
 	assert(0 == cr_array_index);
 	if (block_saved)
-		backup_buffer_flush(gv_cur_region);
+		backup_buffer_flush(reg);
 	if (unhandled_stale_timer_pop)
 		process_deferred_stale();
-	wcs_timer_start(gv_cur_region, TRUE);
+	wcs_timer_start(reg, TRUE);
 	return dbtn;
 failed:
 	assert(cdb_sc_normal != status);
 	REVERT;
 failed_skip_revert:
-	RESTORE_CURRTN_IF_NEEDED(csa, write_inctn, decremented_currtn);
+	RESTORE_CURRTN_IF_NEEDED(csa, cti, write_inctn, decremented_currtn);
 	retvalue = t_commit_cleanup(status, 0);	/* we expect to get a return value indicating update was NOT underway */
 	assert(!retvalue); 			/* if it was, then we would have done a "goto skip_cr_array:" instead */
 	if ((NULL != hist1) && (NULL != (gvnh = hist1->h[0].blk_num ? hist1->h[0].blk_target : NULL)))
@@ -1842,17 +1796,25 @@ failed_skip_revert:
 	if ((NULL != hist2) && (NULL != (gvnh = hist2->h[0].blk_num ? hist2->h[0].blk_target : NULL)))
 		gvnh->clue.end = 0;
 #	ifdef DEBUG
-	/* Ensure we dont have t1->cse set for any gv_targets that also have their clue non-zero.
+	/* Ensure we don't have t1->cse set for any gv_targets that also have their clue non-zero.
 	 * As this can cause following transactions to rely on out-of-date information and do wrong things.
 	 * (e.g. in t_end of the following transaction, we will see t1->cse non-NULL and conclude the buffer
 	 * needs to be pinned when actually it is not necessary).
+	 * The only exception to this is if we are in gvcst_bmp_mark_free. It could be invoked from op_tcommit
+	 * (through gvcst_expand_free_subtree) to free up blocks in a bitmap in which case the gv_target->hist.h[x].cse
+	 * cleanup has not yet happened (will take place in tp_clean_up() called a little later). In that case
+	 * skip the below assert. There is a similar assert in tp_clean_up after the cleanup to ensure we do not have
+	 * any non-NULL t1->cse. The global variable bml_save_dollar_tlevel identifies this exactly for us.
 	 */
-	for (gvnh = gv_target_list; NULL != gvnh; gvnh = gvnh->next_gvnh)
+	if (!bml_save_dollar_tlevel)
 	{
-		if (gvnh->clue.end)
+		for (gvnh = gv_target_list; NULL != gvnh; gvnh = gvnh->next_gvnh)
 		{
-			for (t1 = &gvnh->hist.h[0]; t1->blk_num; t1++)
-				assert(NULL == t1->cse);
+			if (gvnh->clue.end)
+			{
+				for (t1 = &gvnh->hist.h[0]; t1->blk_num; t1++)
+					assert(NULL == t1->cse);
+			}
 		}
 	}
 #	endif
diff --git a/sr_port/t_end_sysops.c b/sr_port/t_end_sysops.c
index e7f2ed8..d079c96 100644
--- a/sr_port/t_end_sysops.c
+++ b/sr_port/t_end_sysops.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2007-2016 Fidelity National Information	*
+ * Copyright (c) 2007-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -72,7 +72,6 @@
 #include "gvcst_map_build.h"
 #include "relqop.h"
 #include "is_proc_alive.h"
-#include "wcs_sleep.h"
 #include "bm_update.h"
 #include "mm_update.h"
 #include "bg_update.h"
@@ -85,9 +84,8 @@
 #include "wcs_phase2_commit_wait.h"
 #include "wcs_recover.h"
 #include "shmpool.h"	/* Needed for the shmpool structures */
-#ifdef GTM_SNAPSHOT
 #include "db_snapshot.h"
-#endif
+#include "wcs_wt.h"
 
 error_def(ERR_DBFILERR);
 error_def(ERR_FREEBLKSLOW);
@@ -110,7 +108,6 @@ error_def(ERR_WCBLOCKED);
 }
 
 #define MAX_CYCLES	2
-NOPIO_ONLY(GBLREF boolean_t	*lseekIoInProgress_flags;)
 
 #define DO_FAST_INTEG_CHECK(old_block, cs_addrs, cs, lcl_ss_ctx, blkid, write_to_snapshot_file)					\
 {																\
@@ -185,12 +182,12 @@ void fileheader_sync(gd_region *reg)
 	csd = csa->hdr;
 	assert(csa->now_crit);	/* only way high water mark code works is if in crit */
 				/* Adding lock code to it would remove this restriction */
-	assert(!reg->read_only);
+	assert(csa->orig_read_write);
 	assert(0 == memcmp(csd->label, GDS_LABEL, GDS_LABEL_SZ - 1));
 	cnl = csa->nl;
 	gvstats_rec_cnl2csd(csa);	/* Periodically transfer statistics from database shared-memory to file-header */
 	high_blk = cnl->highest_lbm_blk_changed;
-	cnl->highest_lbm_blk_changed = -1;			/* Reset to initial value */
+	cnl->highest_lbm_blk_changed = GDS_CREATE_BLK_MAX;	/* Reset to initial value */
 	flush_len = SGMNT_HDR_LEN;
 	if (0 <= high_blk)					/* If not negative, flush at least one master map block */
 		flush_len += ((high_blk / csd->bplmap / DISK_BLOCK_SIZE / BITS_PER_UCHAR) + 1) * DISK_BLOCK_SIZE;
@@ -200,9 +197,11 @@ void fileheader_sync(gd_region *reg)
 		 */
 		flush_len = ROUND_UP(flush_len, csa->fullblockwrite_len);
 	}
-	assert(flush_len <= (csd->start_vbn - 1) * DISK_BLOCK_SIZE);	/* assert that we never overwrite GDS block 0's offset */
+	if (udi->fd_opened_with_o_direct)
+		flush_len = ROUND_UP2(flush_len, DIO_ALIGNSIZE(udi));
+	assert(flush_len <= BLK_ZERO_OFF(csd->start_vbn));	/* assert that we never overwrite GDS block 0's offset */
 	assert(flush_len <= SIZEOF_FILE_HDR(csd));	/* assert that we never go past the mastermap end */
-	DB_LSEEKWRITE(csa, udi->fn, udi->fd, 0, (sm_uc_ptr_t)csd, flush_len, save_errno);
+	DB_LSEEKWRITE(csa, udi, udi->fn, udi->fd, 0, (sm_uc_ptr_t)csd, flush_len, save_errno);
 	if (0 != save_errno)
 	{
 		rts_error_csa(CSA_ARG(csa) VARLSTCNT(9) ERR_DBFILERR, 2, DB_LEN_STR(reg),
@@ -243,7 +242,7 @@ void	bm_update(cw_set_element *cs, sm_uc_ptr_t lclmap, boolean_t is_mm)
 	/* assert that if cs->reference_cnt is 0, then we are in MUPIP REORG UPGRADE/DOWNGRADE or DSE MAPS or DSE CHANGE -BHEAD
 	 * or MUPIP REORG -TRUNCATE */
 	assert(mu_reorg_upgrd_dwngrd_in_prog || mu_reorg_encrypt_in_prog || dse_running || (0 != reference_cnt)
-		GTM_TRUNCATE_ONLY(|| (NULL != csa->nl && process_id == csa->nl->trunc_pid)));
+		|| (NULL != csa->nl && process_id == csa->nl->trunc_pid));
 	if (0 < reference_cnt)
 	{	/* Blocks were allocated in this bitmap. Check if local bitmap became full as a result. If so update mastermap. */
 		bml_full = bml_find_free(0, (SIZEOF(blk_hdr) + (is_mm ? lclmap : ((sm_uc_ptr_t)GDS_REL2ABS(lclmap)))), total_blks);
@@ -289,10 +288,8 @@ enum cdb_sc	mm_update(cw_set_element *cs, trans_num ctn, trans_num effective_tn,
 	cw_set_element		*cs_ptr, *nxt;
 	off_chain		chain;
 	sm_uc_ptr_t		chain_ptr, db_addr[2];
-#	ifdef GTM_SNAPSHOT
 	boolean_t 		write_to_snapshot_file;
 	snapshot_context_ptr_t	lcl_ss_ctx;
-#	endif
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
@@ -314,7 +311,6 @@ enum cdb_sc	mm_update(cw_set_element *cs, trans_num ctn, trans_num effective_tn,
 		else
 			si->backup_block_saved = TRUE;
 	}
-#	ifdef GTM_SNAPSHOT
 	if (SNAPSHOTS_IN_PROG(cs_addrs) && (NULL != cs->old_block))
 	{
 		lcl_ss_ctx = SS_CTX_CAST(cs_addrs->ss_ctx);
@@ -334,7 +330,6 @@ enum cdb_sc	mm_update(cw_set_element *cs, trans_num ctn, trans_num effective_tn,
 					|| ((blk_hdr_ptr_t)(db_addr[0]))->tn >= lcl_ss_ctx->ss_shm_ptr->ss_info.snapshot_tn);
 		}
 	}
-#	endif
 	if (gds_t_writemap == cs->mode)
 	{
 		assert(0 == (blkid & (BLKS_PER_LMAP - 1)));
@@ -424,11 +419,12 @@ enum cdb_sc	bg_update(cw_set_element *cs, trans_num ctn, trans_num effective_tn,
 
 enum cdb_sc	bg_update_phase1(cw_set_element *cs, trans_num ctn, sgm_info *si)
 {
+	boolean_t		twinning_on;
 	int			dummy;
 	int4			n;
 	uint4			lcnt;
 	bt_rec_ptr_t		bt;
-	cache_rec_ptr_t		cr, save_cr;
+	cache_rec_ptr_t		cr, cr_new, save_cr;
 	boolean_t		read_finished, wait_for_rip, write_finished, intend_finished;
 	boolean_t		read_before_image;
 	block_id		blkid;
@@ -438,10 +434,12 @@ enum cdb_sc	bg_update_phase1(cw_set_element *cs, trans_num ctn, sgm_info *si)
 	enum gds_t_mode		mode;
 	enum db_ver		desired_db_format;
 	trans_num		dirty_tn;
+	gv_namehead		*gvt;
+	srch_blk_status		*blk_hist;
+	void_ptr_t		retcrptr;
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
-
 	csa = cs_addrs;		/* Local access copies */
 	csd = csa->hdr;
 	cnl = csa->nl;
@@ -456,7 +454,6 @@ enum cdb_sc	bg_update_phase1(cw_set_element *cs, trans_num ctn, sgm_info *si)
 	INCR_DB_CSH_COUNTER(csa, n_bgmm_updates, 1);
 	bt = bt_put(gv_cur_region, blkid);
 	GTM_WHITE_BOX_TEST(WBTEST_BG_UPDATE_BTPUTNULL, bt, NULL);
-	GTM_WHITE_BOX_TEST(WBTEST_ANTIFREEZE_DBDANGER, bt, NULL);
 	if (NULL == bt)
 	{
 		assert(gtm_white_box_test_case_enabled);
@@ -480,6 +477,7 @@ enum cdb_sc	bg_update_phase1(cw_set_element *cs, trans_num ctn, sgm_info *si)
 #			ifdef DEBUG
 			save_cr = NULL;
 			if (gtm_white_box_test_case_enabled)
+			{
 				save_cr = cr;	/* save cr for r_epid cleanup before setting it to INVALID */
 				/* stop self to test sechshr_db_clnup clears the read state */
 				if (WBTEST_SIGTSTP_IN_T_QREAD == gtm_white_box_test_case_number)
@@ -489,21 +487,22 @@ enum cdb_sc	bg_update_phase1(cw_set_element *cs, trans_num ctn, sgm_info *si)
 					for (dummy = 10; dummy; dummy--)
 						LONG_SLEEP(10); /* time for sigterm to take hit before we clear block_now_locked */
 				}
+			}
 #			endif
 			GTM_WHITE_BOX_TEST(WBTEST_BG_UPDATE_DBCSHGETN_INVALID, cr, (cache_rec_ptr_t)CR_NOTVALID);
 			if ((cache_rec_ptr_t)CR_NOTVALID == cr)
 			{
 				assert(gtm_white_box_test_case_enabled);
-				DEBUG_ONLY(
-					if (NULL != save_cr)
-					{	/* release the r_epid lock on the valid cache-record returned from db_csh_getn */
-						assert(save_cr->r_epid == process_id);
-						save_cr->r_epid = 0;
-						assert(0 == save_cr->read_in_progress);
-						RELEASE_BUFF_READ_LOCK(save_cr);
-						TREF(block_now_locked) = NULL;
-					}
-				)
+#				ifdef DEBUG
+				if (NULL != save_cr)
+				{	/* release the r_epid lock on the valid cache-record returned from db_csh_getn */
+					assert(save_cr->r_epid == process_id);
+					save_cr->r_epid = 0;
+					assert(0 == save_cr->read_in_progress);
+					RELEASE_BUFF_READ_LOCK(save_cr);
+					TREF(block_now_locked) = NULL;
+				}
+#				endif
 				BG_TRACE_PRO(wcb_t_end_sysops_nocr_invcr);
 				send_msg_csa(CSA_ARG(csa) VARLSTCNT(8) ERR_WCBLOCKED, 6, LEN_AND_LIT("wcb_t_end_sysops_nocr_invcr"),
 					process_id, &ctn, DB_LEN_STR(gv_cur_region));
@@ -538,18 +537,24 @@ enum cdb_sc	bg_update_phase1(cw_set_element *cs, trans_num ctn, sgm_info *si)
 		}
 		cs->first_copy = TRUE;
 		assert(0 == cr->in_tend);
-		cr->in_tend = process_id;		/* in_tend should be set before the semaphore (and data_invalid) */
+		/* Set cr->in_tend before the semaphore (and data_invalid). But note that cr->in_tend needs to be reset
+		 * in case we encounter an error in phase1. This way if "secshr_db_clnup" is invoked and does a commit for
+		 * this block into a new cr it would set cr->stopped and "wcs_recover" would know to use the cr->stopped one.
+		 * If "secshr_db_clnup" is not invoked (e.g. kill -9 of process in middle of commit), "wcs_recover" would
+		 * see cr->in_tend as non-zero and in that case it can know this cr cannot be discarded (i.e. no corresponding
+		 * new cr with cr->stopped=TRUE got created).
+		 */
+		cr->in_tend = process_id;
 		assert(0 == cr->dirty);
-		/* Even though the buffer is not in the active queue and we are in crit, it is possible
-		 * for the cache-record to have the write interlock still set. This is because in wcs_wtstart
-		 * csr->dirty is reset to 0 before it releases the write interlock on the buffer. Because all
-		 * routines (bt_put, db_csh_getn and wcs_get_space) wait only for cr->dirty to become 0 before
+		/* Even though the buffer is not in the active (or wip queue if csd->asyncio is ON) and we are in crit, it is
+		 * possible for the cache-record to have the write interlock still set. This is because in wcs_wtstart
+		 * (and wcs_wtfini) csr->dirty is reset to 0 before it releases the write interlock on the buffer.
+		 * Because all routines (bt_put, db_csh_getn and wcs_get_space) wait only for cr->dirty to become 0 before
 		 * considering the buffer ready for reuse, it is possible to have the write interlock set at this
-		 * point with a concurrent wcs_wtstart almost ready to release the interlock. In this case wait.
+		 * point with a concurrent wcs_wtstart/wcs_wtfini almost ready to release the interlock. In this case wait.
 		 * Hence we cannot call LOCK_NEW_BUFF_FOR_UPDATE directly.
-		 */
-		/* Since the only case where the write interlock is not clear is a two-instruction window
-		 * (described in the above comment), we dont expect the lock-not-clear situation to be frequent.
+		 * Since the only case where the write interlock is not clear is a two-instruction window
+		 * (described in the above comment), we don't expect the lock-not-clear situation to be frequent.
 		 * Hence, for performance reasons we do the check before invoking the wcs_write_in_progress_wait function
 		 * (instead of moving the if check into the function which would mean an unconditional function call).
 		 */
@@ -563,6 +568,7 @@ enum cdb_sc	bg_update_phase1(cw_set_element *cs, trans_num ctn, sgm_info *si)
 				send_msg_csa(CSA_ARG(csa) VARLSTCNT(8) ERR_WCBLOCKED,
 						6, LEN_AND_LIT("wcb_t_end_sysops_dirtystuck1"), process_id, &ctn,
 						DB_LEN_STR(gv_cur_region));
+				cr->in_tend = 0;
 				return cdb_sc_cacheprob;
 			}
 		} else
@@ -571,10 +577,11 @@ enum cdb_sc	bg_update_phase1(cw_set_element *cs, trans_num ctn, sgm_info *si)
 		BG_TRACE(new_buff);
 		cr->bt_index = GDS_ABS2REL(bt);
 		bt->cache_index = (int4)GDS_ABS2REL(cr);
+		cr->backup_cr_is_twin = FALSE;
 	} else	/* end of if else on cr NOTVALID */
 	{
 		cr = (cache_rec_ptr_t)GDS_REL2ABS(cr);
-		assert(0 != cr->bt_index);
+		assert(bt == (bt_rec_ptr_t)GDS_REL2ABS(cr->bt_index));
 		assert(CR_BLKEMPTY != cr->blk);
 		assert(blkid == cr->blk);
 		if (cr->in_tend)
@@ -601,26 +608,213 @@ enum cdb_sc	bg_update_phase1(cw_set_element *cs, trans_num ctn, sgm_info *si)
 		assert(0 == cr->data_invalid);
 		cr->in_tend = process_id;
 		wait_for_rip = FALSE;
-		/* If we find the buffer we intend to update is concurrently being flushed to disk, wait for an active writer to
-		 * finish flushing.
+		/* If we find the buffer we intend to update is concurrently being flushed to disk,
+		 *	a) If asyncio=OFF, writes are to the filesystem cache (which are relatively fast) so wait for the
+		 *		active writer to finish flushing.
+		 *	b) If asyncio=ON, then writes are with O_DIRECT and directly hardened to disk (no cache in between)
+		 *		so take a long time to return. Do not want to wait for that IO event while holding crit.
+		 *		Create a twin buffer and dump the update on that buffer instead of waiting.
 		 */
 		LOCK_BUFF_FOR_UPDATE(cr, n, &cnl->db_latch);
-		if (!OWN_BUFF(n))
-		{
-			write_finished = wcs_write_in_progress_wait(cnl, cr, WBTEST_BG_UPDATE_DIRTYSTUCK2);
-			if (!write_finished)
+		assert((LATCH_CONFLICT >= n) && (LATCH_CLEAR <= n));
+		twinning_on = TWINNING_ON(csd);
+		cr->backup_cr_is_twin = FALSE;
+		if (!twinning_on)
+		{	/* TWINNING is not active because of asyncio=OFF */
+			if (!OWN_BUFF(n))
 			{
-				assert(gtm_white_box_test_case_enabled);
-				BG_TRACE_PRO(wcb_t_end_sysops_dirtystuck2);
-				send_msg_csa(CSA_ARG(csa) VARLSTCNT(8) ERR_WCBLOCKED,
-						6, LEN_AND_LIT("wcb_t_end_sysops_dirtystuck2"),
-						process_id, &ctn, DB_LEN_STR(gv_cur_region));
-				return cdb_sc_cacheprob;
+				write_finished = wcs_write_in_progress_wait(cnl, cr, WBTEST_BG_UPDATE_DIRTYSTUCK2);
+				if (!write_finished)
+				{
+					assert(gtm_white_box_test_case_enabled);
+					BG_TRACE_PRO(wcb_t_end_sysops_dirtystuck2);
+					send_msg_csa(CSA_ARG(csa) VARLSTCNT(8) ERR_WCBLOCKED,
+							6, LEN_AND_LIT("wcb_t_end_sysops_dirtystuck2"),
+							process_id, &ctn, DB_LEN_STR(gv_cur_region));
+					cr->in_tend = 0;
+					return cdb_sc_cacheprob;
+				}
+			}
+			assert((0 == cr->dirty) || (-1 == cr->read_in_progress)); /* dirty buffer cannot be read in progress */
+			if (-1 != cr->read_in_progress)
+				wait_for_rip = TRUE;
+		} else
+		{	/* TWINNING is enabled because of asyncio=ON. Create TWIN instead of waiting for write to complete */
+			if (0 == cr->dirty)		/* Free, move to active queue */
+			{	/* If "asyncio" is turned ON, "wcs_wtfini" is the only one that will reset "cr->dirty". And
+				 * that runs inside crit. Since we hold crit now, wcs_wtfini could not have run after we
+				 * did the LOCK_BUFF_FOR_UPDATE and so we are guaranteed the current value of the write
+				 * interlock is LATCH_SET. Assert that.
+				 */
+				assert(LATCH_SET == WRITE_LATCH_VAL(cr));
+				assert(0 == cr->twin);
+				if (-1 != cr->read_in_progress)
+					wait_for_rip = TRUE;
+			} else if (LATCH_CONFLICT > n)
+			{	/* it's modified but available */
+				assert(-1 == cr->read_in_progress);	/* so "wait_for_rip" can stay FALSE */
+			} else
+			{	/* This cr is owned by a concurrent writer. Create TWIN. */
+				assert(-1 == cr->read_in_progress);	/* so "wait_for_rip" can stay FALSE */
+				cr_new = db_csh_getn(blkid);
+#				ifdef DEBUG
+				save_cr = NULL;
+				if (gtm_white_box_test_case_enabled)
+					save_cr = cr_new;	/* save cr for r_epid cleanup before setting to INVALID */
+#				endif
+				GTM_WHITE_BOX_TEST(WBTEST_BG_UPDATE_DBCSHGETN_INVALID2, cr_new, (cache_rec *)CR_NOTVALID);
+				if ((cache_rec *)CR_NOTVALID == cr_new)
+				{
+					assert(gtm_white_box_test_case_enabled);
+#					ifdef DEBUG
+					if (NULL != save_cr)
+					{	/* Since we are simulating a "db_csh_getn" failure return,
+						 * undo all changes in db_csh_getn that would otherwise persist.
+						 */
+						assert(save_cr->r_epid == process_id);
+						retcrptr = remqh((que_ent_ptr_t)((sm_uc_ptr_t)save_cr + save_cr->blkque.bl));
+						assert(retcrptr == save_cr);
+						save_cr->r_epid = 0;
+						assert(0 == save_cr->read_in_progress);
+						RELEASE_BUFF_READ_LOCK(save_cr);
+						assert(blkid == save_cr->blk);
+						save_cr->blk = CR_BLKEMPTY;
+						TREF(block_now_locked) = NULL;
+					}
+#					endif
+					BG_TRACE_PRO(wcb_t_end_sysops_dirty_invcr);
+					send_msg_csa(CSA_ARG(csa) VARLSTCNT(8) ERR_WCBLOCKED, 6,
+							LEN_AND_LIT("wcb_t_end_sysops_dirty_invcr"),
+							process_id, &ctn, DB_LEN_STR(gv_cur_region));
+					cr->in_tend = 0;
+					return cdb_sc_cacheprob;
+				}
+				assert(NULL != cr_new);
+				assert(0 == cr_new->dirty);
+				assert(cr_new->blk == blkid);
+				LOCK_NEW_BUFF_FOR_UPDATE(cr_new);	/* is new or cleaning up old; can't be active */
+				if (cr != cr_new)
+				{	/* db_csh_getn did not give back the same cache-record, which it could do
+					 * if it had to invoke wcs_wtfini.
+					 */
+					assert(0 == cr_new->in_cw_set);
+					assert(0 == cr_new->in_tend);
+					if (0 != cr->dirty)
+					{	/* "cr" is still dirty and in WIP queue. "cr" cannot already have an OLDER twin.
+						 * This is because we know "n" == LATCH_CONFLICT at this point which means
+						 * "wcs_wtstart" took over this "cr" for writing. But it will not have done that
+						 * if "cr->twin" was still non-zero.
+						 */
+						assert(!cr->twin);
+						if (!dollar_tlevel)		/* stuff it in the array before setting in_cw_set */
+						{
+							assert(ARRAYSIZE(cr_array) > cr_array_index);
+							PIN_CACHE_RECORD(cr_new, cr_array, cr_array_index);
+						} else
+							TP_PIN_CACHE_RECORD(cr_new, si);
+						assert(process_id == cr->in_tend);
+						cr->in_tend = 0;
+						cr_new->in_tend = process_id;
+						cr_new->ondsk_blkver = cr->ondsk_blkver; /* copy blk version from old cache rec */
+						if (gds_t_writemap == mode)
+						{	/* gvcst_map_build doesn't do first_copy */
+							memcpy(GDS_REL2ABS(cr_new->buffaddr), GDS_REL2ABS(cr->buffaddr),
+													BM_SIZE(csd->bplmap));
+						}
+						/* form twin*/
+						cr_new->twin = GDS_ABS2REL(cr);
+						cr->twin = GDS_ABS2REL(cr_new);
+						/* Currently we compare out-of-crit "cr->buffaddr->tn" with the "hist->tn"
+						 * to see if a block has been modified since the time we did our read
+						 * (places are t_qread, tp_hist, gvcst_search and gvcst_put). With twinning,
+						 * if a cache-record is currently being written to disk, and we need to
+						 * update it, we find out another free cache-record and twin the two
+						 * and make all changes only in the newer twin. Because of this, if we
+						 * are doing our blkmod check against the old cache-record, our check
+						 * may incorrectly conclude that nothing has changed. To prevent this
+						 * the cycle number of the older twin has to be incremented. This way,
+						 * the following cycle-check (in all the above listed places, a
+						 * cdb_sc_blkmod check is immediately followed by a cycle check) will
+						 * detect a restartable condition. Note that cr->bt_index should be set to 0
+						 * BEFORE cr->cycle++ as t_qread relies on this order.
+						 */
+						cr->bt_index = 0;
+						cr->cycle++;	/* increment cycle whenever blk number changes (for tp_hist) */
+						cs->first_copy = TRUE;
+						if (gds_t_write == mode) /* update landed in a different cache-record (twin) */
+						{	/* If valid clue and this block is in it, need to update buffer address to
+							 * point to NEWER twin. The NEWER twin has not yet been built (happens in
+							 * phase2 of commit) so its block contents are invalid but it is okay for
+							 * the clue to point to it since the clue will not be used until the commit
+							 * completes. In case of any error before we reach phase2 for this block,
+							 * we would invoke "secshr_db_clnup" which will create a cr->stopped
+							 * cache-record and update clue to point to that more-uptodate cr. So we
+							 * are fine setting clue prematurely to point to the incomplete NEWER twin
+							 * here in all cases.
+							 */
+							gvt = (!dollar_tlevel ? gv_target : cs->blk_target);
+							if ((NULL != gvt) && (0 != gvt->clue.end))
+							{
+								blk_hist = &gvt->hist.h[cs->level];
+								if (blk_hist->blk_num == blkid)
+								{
+									blk_hist->buffaddr =
+											(sm_uc_ptr_t)GDS_REL2ABS(cr_new->buffaddr);
+									blk_hist->cr = cr_new;
+									blk_hist->cycle = cr_new->cycle;
+								}
+							}
+						}
+						cr = cr_new;
+						cr->backup_cr_is_twin = TRUE;	/* OLDER "twin" has before-image for backup etc. */
+						/* Note that a "cr"'s read_in_progress will be set whenever it is obtained through
+						 *   db_csh_getn which is done for two cases in the bg_update function,
+						 *	(i) one for a newly created block
+						 *	(ii) one for the twin of an existing block
+						 * This read-in-progress lock is released before the actual gvcst_blk_build of the
+						 *	block by a RELEASE_BUFF_READ_LOCK done down below in a codepath common to
+						 *	both case(i) and (ii).
+						 * Both cases result in buffers that are empty and hence should not be used by any
+						 *	other process for doing their gvcst_blk_search. To this effect we should
+						 *	set things up so that one of the validation checks will fail later on these
+						 *	buffers.
+						 * Case (i) is easy since no other process would be trying to search through a
+						 *	to-be-created block and hence requires no special handling.
+						 * Case (ii) refers to an existing block and hence we need to set the block-tn in
+						 *	the empty buffer to be csa->ti->curr_tn to ensure the other process using
+						 *	this buffer for their gvcst_blk_search fails the cdb_sc_blkmod check in the
+						 *	intermediate validation routine tp_hist.
+						 * Since the above needs to be done only for case (ii), we do the necessary stuff
+						 *	here rather than just before the RELEASE_BUFF_READ_LOCK which is common to
+						 *	both cases.
+						 */
+						((blk_hdr_ptr_t)GDS_REL2ABS(cr->buffaddr))->tn = ctn;
+					} else
+					{	/* If not cr->dirty, then "wcs_wtfini" (invoked from "db_csh_getn" above)
+						 * has processed it, just proceed with "cr". Discard "cr_new".
+						 */
+						assert(process_id == cr_new->r_epid);	/* "db_csh_getn" returned "cr_new" */
+						cr_new->r_epid = 0;
+						assert(0 == cr_new->read_in_progress);
+						RELEASE_BUFF_READ_LOCK(cr_new);
+						TREF(block_now_locked) = NULL;
+						/* Release update lock on "cr_new" and get it on "cr" now that we changed minds */
+						assert(!cr_new->dirty);
+						WRITE_LATCH_VAL(cr_new) = LATCH_CLEAR;
+						assert(LATCH_CLEAR == WRITE_LATCH_VAL(cr));
+						LOCK_NEW_BUFF_FOR_UPDATE(cr);
+						/* The block "blkid" can no longer be found in "cr_new".
+						 * It can only be found in "cr". Set that accordingly.
+						 */
+						assert(blkid == cr_new->blk);
+						cr_new->blk = CR_BLKEMPTY;
+					}
+				}	/* end of if (cr != cr_new) */
+				assert(cr->blk == blkid);
+				bt->cache_index = GDS_ABS2REL(cr);
+				cr->bt_index = GDS_ABS2REL(bt);
 			}
 		}
-		assert((0 == cr->dirty) || (-1 == cr->read_in_progress));	/* dirty buffer cannot be read in progress */
-		if (-1 != cr->read_in_progress)
-			wait_for_rip = TRUE;
 		if (wait_for_rip)
 		{	/* wait for another process in t_qread to stop overlaying the buffer, possible due to
 			 *	(a) reuse of a killed block that's still in the cache OR
@@ -636,6 +830,7 @@ enum cdb_sc	bg_update_phase1(cw_set_element *cs, trans_num ctn, sgm_info *si)
 				send_msg_csa(CSA_ARG(csa) VARLSTCNT(8) ERR_WCBLOCKED, 6,
 					LEN_AND_LIT("wcb_t_end_sysops_dirtyripwait"),
 					process_id, &ctn, DB_LEN_STR(gv_cur_region));
+				cr->in_tend = 0;
 				return cdb_sc_cacheprob;
 			}
 			assert(-1 == cr->read_in_progress);
@@ -651,7 +846,7 @@ enum cdb_sc	bg_update_phase1(cw_set_element *cs, trans_num ctn, sgm_info *si)
 				|| (gds_t_acquired != mode) && (0 != cs->new_buff));
 		if (!dollar_tlevel)		/* stuff it in the array before setting in_cw_set */
 		{
-			assert((((MAX_BT_DEPTH * 2) - 1) * 2) > cr_array_index);
+			assert(ARRAYSIZE(cr_array) > cr_array_index);
 			PIN_CACHE_RECORD(cr, cr_array, cr_array_index);
 		} else
 			TP_PIN_CACHE_RECORD(cr, si);
@@ -716,9 +911,7 @@ enum cdb_sc	bg_update_phase1(cw_set_element *cs, trans_num ctn, sgm_info *si)
 		}
 	}
 	assert((gds_t_writemap != mode) || dse_running /* generic dse_running variable is used for caller = dse_maps */
-		VMS_ONLY(|| cr->twin || CR_BLKEMPTY == cs->cr->blk)
-		|| (cs->cr == cr) && (cs->cycle == cr->cycle));
-	assert((gds_t_writemap != mode) || (cs->cycle == cr->cycle));
+		|| cr->twin || (CR_BLKEMPTY == cs->cr->blk) || (cs->cr == cr) && (cs->cycle == cr->cycle));
 	/* Before marking this cache-record dirty, record the value of cr->dirty into cr->tn.
 	 * This is used in phase2 to determine "recycled".
 	 */
@@ -730,7 +923,9 @@ enum cdb_sc	bg_update_phase1(cw_set_element *cs, trans_num ctn, sgm_info *si)
 	 */
 	if (0 == dirty_tn)
 	{
-		DECR_CNT(&cnl->wc_in_free, &cnl->wc_var_lock);
+		SUB_ENT_FROM_FREE_QUE_CNT(cnl);
+		assert(0 == cr->dirty);		/* dirty_tn just picked up above from cr->dirty of locked buffer */
+		INCR_GVSTATS_COUNTER(csa, cnl, n_clean2dirty, 1);
 		cr->dirty = ctn;		/* block will be dirty.	 Note the tn in which this occurred */
 		/* At this point cr->flushed_dirty_tn could be EQUAL to ctn if this cache-record was used to update a different
 		 * block in this very same transaction and reused later for the current block. Reset it to 0 to avoid confusion.
@@ -763,7 +958,6 @@ enum cdb_sc	bg_update_phase2(cw_set_element *cs, trans_num ctn, trans_num effect
 	int4			n;
 	off_chain		chain;
 	sm_uc_ptr_t		blk_ptr, backup_blk_ptr, chain_ptr;
-	sm_off_t		backup_cr_off;
 	cw_set_element		*cs_ptr, *nxt;
 	cache_rec_ptr_t		cr, backup_cr;
 	boolean_t		recycled;
@@ -774,10 +968,8 @@ enum cdb_sc	bg_update_phase2(cw_set_element *cs, trans_num ctn, trans_num effect
 	node_local_ptr_t        cnl;
 	enum gds_t_mode		mode;
 	cache_que_heads_ptr_t	cache_state;
-#ifdef GTM_SNAPSHOT
 	boolean_t 		write_to_snapshot_file;
 	snapshot_context_ptr_t	lcl_ss_ctx;
-#endif
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
@@ -811,22 +1003,31 @@ enum cdb_sc	bg_update_phase2(cw_set_element *cs, trans_num ctn, trans_num effect
 	 */
 	assert((0 <= blkid) && (blkid < csa->ti->total_blks));
 	GTM_WHITE_BOX_TEST(WBTEST_BG_UPDATE_PHASE2FAIL, cr, NULL);
-	DEBUG_ONLY(
-		if (NULL == cr)
-		{
-			assert(gtm_white_box_test_case_enabled);
-			return cdb_sc_cacheprob;
-		}
-	)
+#	ifdef DEBUG
+	if (NULL == cr)
+	{
+		assert(gtm_white_box_test_case_enabled);
+		return cdb_sc_cacheprob;
+	}
+#	endif
 	blk_ptr = (sm_uc_ptr_t)GDS_REL2ABS(cr->buffaddr);
 	/* Take backup of block in phase2 (outside of crit). */
-	backup_cr = cr;
-	backup_blk_ptr = blk_ptr;
-	if (!WAS_FREE(cs->blk_prior_state)) /* dont do before image write for backup for FREE blocks */
+	if (!WAS_FREE(cs->blk_prior_state)) /* don't do before image write for backup for FREE blocks */
+	{
+		if (!cr->backup_cr_is_twin)
+		{
+			backup_cr = cr;
+			backup_blk_ptr = blk_ptr;
+		} else
+		{
+			assert(TWINNING_ON(csd));
+			backup_cr = (cache_rec_ptr_t)GDS_ANY_REL2ABS(csa, cr->twin);
+			backup_blk_ptr = (sm_uc_ptr_t)GDS_REL2ABS(backup_cr->buffaddr);
+		}
 		BG_BACKUP_BLOCK(csa, csd, cnl, cr, cs, blkid, backup_cr, backup_blk_ptr, block_saved, si->backup_block_saved);
+	}
 	/* Update cr->ondsk_blkver to reflect the current desired_db_format. */
 	SET_ONDSK_BLKVER(cr, csd, ctn);
-#	ifdef GTM_SNAPSHOT
 	if (SNAPSHOTS_IN_PROG(cs_addrs) && (NULL != cs->old_block))
 	{
 		lcl_ss_ctx = SS_CTX_CAST(csa->ss_ctx);
@@ -846,7 +1047,6 @@ enum cdb_sc	bg_update_phase2(cw_set_element *cs, trans_num ctn, trans_num effect
 					|| ((blk_hdr_ptr_t)(blk_ptr))->tn >= lcl_ss_ctx->ss_shm_ptr->ss_info.snapshot_tn);
 		}
 	}
-#	endif
 	SET_DATA_INVALID(cr);	/* data_invalid should be set signaling intent to update contents of a valid block */
 	if (gds_t_writemap == mode)
 	{
@@ -946,6 +1146,7 @@ enum cdb_sc	bg_update_phase2(cw_set_element *cs, trans_num ctn, trans_num effect
 	cache_state = csa->acc_meth.bg.cache_state;
 	if (!recycled)
 	{	/* stuff it on the active queue */
+		assert(0 == cr->epid);
 		/* Earlier revisions of this code had a kludge in place here to work around INSQTI failures (D9D06-002342).
 		 * Those are now removed as the primary error causing INSQTI failures is believed to have been resolved.
 		 */
@@ -959,7 +1160,7 @@ enum cdb_sc	bg_update_phase2(cw_set_element *cs, trans_num ctn, trans_num effect
 				process_id, &ctn, DB_LEN_STR(gv_cur_region));
 			return cdb_sc_cacheprob;
 		}
-		ADD_ENT_TO_ACTIVE_QUE_CNT(&cnl->wcs_active_lvl, &cnl->wc_var_lock);
+		ADD_ENT_TO_ACTIVE_QUE_CNT(cnl);
 	}
 	RELEASE_BUFF_UPDATE_LOCK(cr, n, &cnl->db_latch);
 	/* "n" holds the pre-release value, so check accordingly */
@@ -971,6 +1172,7 @@ enum cdb_sc	bg_update_phase2(cw_set_element *cs, trans_num ctn, trans_num effect
 		 * that a concurrent process in bg_update_phase1 could lock this buffer for update and incorrectly conclude that
 		 * it has been locked by a writer when it has actually been locked by a process in bg_update_phase2.
 		 */
+		assert(0 == cr->epid);
 		n = INSQHI((que_ent_ptr_t)&cr->state_que, (que_head_ptr_t)&cache_state->cacheq_active);
 		GTM_WHITE_BOX_TEST(WBTEST_BG_UPDATE_INSQHIFAIL, n, INTERLOCK_FAIL);
 		if (INTERLOCK_FAIL == n)
@@ -982,17 +1184,7 @@ enum cdb_sc	bg_update_phase2(cw_set_element *cs, trans_num ctn, trans_num effect
 			return cdb_sc_cacheprob;
 		}
 	}
-	/* A concurrent process reading this block will wait for in_tend to become FALSE and then proceed with its
-	 * database operation. Later it will reach t_end/tp_tend doing validations at which point it will need to set in_cw_set.
-	 * It expects in_cw_set to be 0 at that point. Therefore in_cw_set needs to be reset to 0 BEFORE resetting in_tend.
-	 * Need a write memory barrier to ensure that these two updates are seen in that order by any other concurrent process.
-	 */
-	assert(process_id == cr->in_cw_set);
-	UNPIN_CACHE_RECORD(cr);
-	assert(!cr->in_cw_set);
-	SHM_WRITE_MEMORY_BARRIER;
-	assert(process_id == cr->in_tend);	/* should still be valid */
-	cr->in_tend = 0;
+	RESET_CR_IN_TEND_AFTER_PHASE2_COMMIT(cr);	/* resets cr->in_tend & cr->in_cw_set (for older twin too if needed) */
 	VERIFY_QUEUE_LOCK(&cache_state->cacheq_active, &cnl->db_latch);
 	cs->old_mode = -cs->old_mode;	/* negate it back to indicate phase2 is complete for this cse (used by secshr_db_clnup) */
 	assert(0 < cs->old_mode);
@@ -1009,11 +1201,10 @@ void	wcs_timer_start(gd_region *reg, boolean_t io_ok)
 	int4			wtstart_errno;
 	INTPTR_T		reg_parm;
 	jnl_private_control	*jpc;
-
 	uint4		buffs_per_flush, flush_target;
 
 	assert(reg->open); /* there is no reason we know of why a region should be closed at this point */
-	if (!reg->open)    /* in pro, be safe though and dont touch an already closed region */
+	if (!reg->open)    /* in pro, be safe though and don't touch an already closed region */
 		return;
 	csa = &FILE_INFO(reg)->s_addrs;
 	csd = csa->hdr;
@@ -1029,6 +1220,7 @@ void	wcs_timer_start(gd_region *reg, boolean_t io_ok)
 		{
 			reg_parm = (UINTPTR_T)reg;
 			csa->timer = TRUE;
+			csa->canceled_flush_timer = FALSE;
 			INCR_CNT(&cnl->wcs_timers, &cnl->wc_var_lock);
 			INSERT_WT_PID(csa);
 			start_timer((TID)reg,
@@ -1063,11 +1255,10 @@ void	wcs_timer_start(gd_region *reg, boolean_t io_ok)
 	{
 		EPOCH_TAPER_IF_NEEDED(csa, csd, cnl, reg, TRUE, buffs_per_flush, flush_target);
 	}
-	if (flush_target  <= cnl->wcs_active_lvl)
+	if ((flush_target  <= cnl->wcs_active_lvl) && !FROZEN_CHILLED(csd))
 	{	/* Already in need of a good flush */
 		BG_TRACE_PRO_ANY(csa, active_lvl_trigger);
-		DCLAST_WCS_WTSTART(reg, buffs_per_flush, wtstart_errno);
-		/* a macro that dclast's wcs_wtstart and checks for errors etc. */
+		wtstart_errno = wcs_wtstart(reg, buffs_per_flush, NULL, NULL);
 		if ((dba_mm == acc_meth) && (ERR_GBLOFLOW == wtstart_errno))
 			wcs_recover(reg);
 		csa->stale_defer = FALSE;		/* This took care of any pending work for this region */
@@ -1082,12 +1273,13 @@ void	wcs_stale(TID tid, int4 hd_len, gd_region **region)
 	gd_region		*save_region;
 	sgmnt_addrs		*csa, *save_csaddrs, *check_csaddrs;
 	sgmnt_data_ptr_t	csd, save_csdata;
-	NOPIO_ONLY(boolean_t	lseekIoInProgress_flag;)
 	gd_region		*reg;
 	enum db_acc_method	acc_meth;
 	node_local_ptr_t	cnl;
 	jnl_private_control	*jpc;
+	DCL_THREADGBL_ACCESS;
 
+	SETUP_THREADGBL_ACCESS;
 	save_region = gv_cur_region;		/* Certain debugging calls expect gv_cur_region to be correct */
 	save_csaddrs = cs_addrs;
 	save_csdata = cs_data;
@@ -1106,7 +1298,7 @@ void	wcs_stale(TID tid, int4 hd_len, gd_region **region)
 	cnl = csa->nl;
 	jpc = csa->jnl;
 	assert((NULL == jpc) || (NOJNL != jpc->channel) || JNL_FILE_SWITCHED(jpc));
-	/* Check if this is a condition where we dont want to start a new timer for sure */
+	/* Check if this is a condition where we don't want to start a new timer for sure */
 	if (((dba_mm == acc_meth) && (csa->total_blks != csa->ti->total_blks)) /* access method is MM and file extended */
 		|| (is_updproc && (cnl->wcs_timers > 0)) /* Update process need not take up the burden of flushing if
 							  * there is at least one other flusher */
@@ -1119,6 +1311,7 @@ void	wcs_stale(TID tid, int4 hd_len, gd_region **region)
 		DECR_CNT(&cnl->wcs_timers, &cnl->wc_var_lock);
 		REMOVE_WT_PID(csa);
 		csa->timer = FALSE;		/* No timer set for this region by this process anymore */
+		csa->canceled_flush_timer = TRUE;
 		/* Restore region */
 		if (save_region != gv_cur_region)
 		{
@@ -1138,32 +1331,38 @@ void	wcs_stale(TID tid, int4 hd_len, gd_region **region)
 	      Note that the function "mutex_deadlock_check" resets crit_count to 0 temporarily even though we
 	      might actually be in the midst of acquiring crit. Therefore we should not interrupt mainline code
 	      if we are in "mutex_deadlock_check" as otherwise it presents reentrancy issues.
-	   3) We have crit in any region OR are in the middle of commit for this region even though we dont
+	   3) We have crit in any region OR are in the middle of commit for this region even though we don't
 	      hold crit (in bg_update_phase2) OR are in wcs_wtstart (potentially holding write interlock and
 	      keeping another process in crit waiting). Assumption is that if region we were in was not crit, we're
 	      clear. This is not strictly true in some special TP cases on the final retry if the previous retry did
 	      not get far enough into the transaction to cause all regions to be locked down but this case is
 	      statistically infrequent enough that we will go ahead and do the IO in crit "this one time".
 	   4) We are in a "fast lock".
+	   5) We are in an external call and the database is encrypted (both of which could use memory management
+	      functions).
+	   6) We are in an online freeze.
+	   Note: Please ensure the terms in the "if" below appear in descending order based upon likelihood
+	      of their being FALSE. Any terms that call functions should be at the end.
 	   **************************************************************************************************/
-	GET_LSEEK_FLAG(FILE_INFO(reg)->fd, lseekIoInProgress_flag);
-	if ((0 == crit_count) && !in_mutex_deadlock_check && OK_TO_INTERRUPT
-		NOPIO_ONLY(&& (FALSE == lseekIoInProgress_flag))
+	if ((0 == crit_count) && !in_mutex_deadlock_check
 		&& ((NULL == check_csaddrs) || !T_IN_CRIT_OR_COMMIT_OR_WRITE(check_csaddrs))
-		&& (0 == fast_lock_count))
+		&& (0 == fast_lock_count)
+		&& !FROZEN_CHILLED(csd)
+		&& (!(TREF(in_ext_call) && csd->is_encrypted))
+		&& OK_TO_INTERRUPT)
 	{
 		BG_TRACE_PRO_ANY(csa, stale);
 		switch (acc_meth)
 		{
 			case dba_bg:
 				/* Flush at least some of our cache */
-				wcs_wtstart(reg, 0);
+				wcs_wtstart(reg, 0, NULL, NULL);
 				/* If there is no dirty buffer left in the active queue, then no need for new timer */
 				if (0 == csa->acc_meth.bg.cache_state->cacheq_active.fl)
 					need_new_timer = FALSE;
 				break;
 			case dba_mm:
-				wcs_wtstart(reg, 0);
+				wcs_wtstart(reg, 0, NULL, NULL);
 				assert(csd == csa->hdr);
 				need_new_timer = FALSE;
 				break;
@@ -1191,6 +1390,11 @@ void	wcs_stale(TID tid, int4 hd_len, gd_region **region)
 		DECR_CNT(&cnl->wcs_timers, &cnl->wc_var_lock);
 		REMOVE_WT_PID(csa);
 		csa->timer = FALSE;		/* No timer set for this region by this process anymore */
+		/* Since this is a case where we know for sure no dirty buffers remain, there is no need of
+		 * the flush timer anymore, so "csa->canceled_flush_timer" can be safely set to FALSE.
+		 */
+		assert(!csa->canceled_flush_timer);	/* should have been reset when "csa->timer = TRUE" happened */
+		csa->canceled_flush_timer = FALSE;	/* be safe in pro just in case */
 	}
 	/* To restore to former glory, don't use TP_CHANGE_REG, 'coz we might mistakenly set cs_addrs and cs_data to NULL
 	 * if the region we are restoring has been closed. Don't use tp_change_reg 'coz we might be ripping out the structures
diff --git a/sr_port/t_qread.c b/sr_port/t_qread.c
index 7bb7903..5bbfad2 100755
--- a/sr_port/t_qread.c
+++ b/sr_port/t_qread.c
@@ -53,6 +53,8 @@
 #include "gtm_c_stack_trace.h"
 #include "gtm_time.h"
 #include "process_reorg_encrypt_restart.h"
+#include "wcs_backoff.h"
+#include "wcs_wt.h"
 
 GBLDEF srch_blk_status	*first_tp_srch_status;	/* the first srch_blk_status for this block in this transaction */
 GBLDEF unsigned char	rdfail_detail;	/* t_qread uses a 0 return to indicate a failure (no buffer filled) and the real
@@ -83,7 +85,7 @@ GBLREF	uint4			update_trans;
  * The second pass which holds crit and is waiting for a concurrent reader to finish reading the input block in.
  * The third pass is needed because the concurrent reader (in dsk_read) might encounter a DYNUPGRDFAIL error in which case
  *	it is going to increment the cycle in the cache-record and reset the blk to CR_BLKEMPTY.
- * We dont need any pass more than this because if we hold crit then no one else can start a dsk_read for this block.
+ * We don't need any pass more than this because if we hold crit then no one else can start a dsk_read for this block.
  * This # of passes is hardcoded in the macro BAD_LUCK_ABOUNDS
  */
 #define BAD_LUCK_ABOUNDS 2
@@ -136,6 +138,9 @@ sm_uc_ptr_t t_qread(block_id blk, sm_int_ptr_t cycle, cache_rec_ptr_ptr_t cr_out
 	gd_segment		*seg;
 	uint4			buffs_per_flush, flush_target;
 	enc_info_t		*encr_ptr;
+#	ifdef DEBUG
+	cache_rec_ptr_t		cr_lo, bt_cr;
+#	endif
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
@@ -350,7 +355,7 @@ sm_uc_ptr_t t_qread(block_id blk, sm_int_ptr_t cycle, cache_rec_ptr_ptr_t cr_out
 			/* If we are inside a TP read-write transaction, it is possible we already used the old keys for
 			 * prior calls to "jnl_format" so we have to restart (cannot sync up cycles). Do the same for
 			 * TP read-only transaction as well as NON-TP read-write transaction. In all these cases we know
-			 * the caller is capable of restarting. All other cases we dont know if the caller is capable so
+			 * the caller is capable of restarting. All other cases we don't know if the caller is capable so
 			 * sync up the cycles and proceed using the new keys for the read.
 			 *
 			 * But since it is possible the caller does not call t_retry right away (e.g. mupip reorg which can
@@ -398,7 +403,7 @@ sm_uc_ptr_t t_qread(block_id blk, sm_int_ptr_t cycle, cache_rec_ptr_ptr_t cr_out
 					EPOCH_TAPER_IF_NEEDED(csa, csd, cnl, (gd_region *) 0, FALSE, buffs_per_flush, flush_target);
 				}
 				if ((flush_target <= cnl->wcs_active_lvl) && (FALSE == gv_cur_region->read_only))
-					JNL_ENSURE_OPEN_WCS_WTSTART(csa, gv_cur_region, buffs_per_flush, dummy_errno);
+					JNL_ENSURE_OPEN_WCS_WTSTART(csa, gv_cur_region, buffs_per_flush, NULL, FALSE, dummy_errno);
 						/* a macro that dclast's "wcs_wtstart" and checks for errors etc. */
 				/* Get crit but also ensure encryption cycles are in sync ("dsk_read" relies on this).
 				 * Note: "sync_needed" should be TRUE very rarely since we synced the cycles just a few lines
@@ -473,7 +478,7 @@ sm_uc_ptr_t t_qread(block_id blk, sm_int_ptr_t cycle, cache_rec_ptr_ptr_t cr_out
 					assert(-1 <= cr->read_in_progress);
 					assert(was_crit == csa->now_crit);
 					if (ERR_DYNUPGRDFAIL == status)
-					{	/* if we dont hold crit on the region, it is possible due to concurrency conflicts
+					{	/* if we don't hold crit on the region, it is possible due to concurrency conflicts
 						 * that this block is unused (i.e. marked free/recycled in bitmap, see comments in
 						 * gds_blk_upgrade.h). in this case we should not error out but instead restart.
 						 */
@@ -498,7 +503,7 @@ sm_uc_ptr_t t_qread(block_id blk, sm_int_ptr_t cycle, cache_rec_ptr_ptr_t cr_out
 						 */
 						rdfail_detail = cdb_sc_truncate;
 						return (sm_uc_ptr_t)NULL;
-					} else if (IS_CRYPTERR_MASK(status))
+					} else if ((-1 != status) && IS_CRYPTERR_MASK(status))
 					{
 						seg = gv_cur_region->dyn.addr;
 						GTMCRYPT_REPORT_ERROR(status, rts_error, seg->fname_len, seg->fname);
@@ -571,23 +576,20 @@ sm_uc_ptr_t t_qread(block_id blk, sm_int_ptr_t cycle, cache_rec_ptr_ptr_t cr_out
 					break;
 				}
 				*cr_out = cr;
-				VMS_ONLY(
-					/* If we were doing the "db_csh_get" above (in t_qread itself) and located the cache-record
-					 * which, before coming here and taking a copy of cr->cycle a few lines above, was made an
-					 * older twin by another process in bg_update (note this can happen in VMS only) which has
-					 * already incremented the cycle, we will end up having a copy of the old cache-record with
-					 * its incremented cycle number and hence will succeed in tp_hist validation if we return
-					 * this <cr,cycle> combination although we don't want to since this "cr" is not current for
-					 * the given block as of now. Note that the "indexmod" optimization in "tp_tend" relies on
-					 * an accurate intermediate validation by "tp_hist" which in turn relies on the <cr,cycle>
-					 * value returned by t_qread to be accurate for a given blk at the current point in time.
-					 * We detect the older-twin case by the following check. Note that here we depend on the
-					 * the fact that "bg_update" sets cr->bt_index to 0 before incrementing cr->cycle.
-					 * Given that order, cr->bt_index can be guaranteed to be 0 if we read the incremented cycle
-					 */
-					if (cr->twin && (0 == cr->bt_index))
-						break;
-				)
+				/* If we were doing the "db_csh_get" above (in t_qread itself) and located the cache-record
+				 * which, before coming here and taking a copy of cr->cycle a few lines above, was made an
+				 * older twin by another process in "bg_update_phase1" which has already incremented the cycle,
+				 * we will end up having a copy of the old cache-record with its incremented cycle number and hence
+				 * will succeed in tp_hist validation if we return this <cr,cycle> combination although we don't
+				 * want to since this "cr" is not current for the given block as of now. Note that the "indexmod"
+				 * optimization in "tp_tend" relies on an accurate intermediate validation by "tp_hist" which in
+				 * turn relies on the <cr,cycle> value returned by t_qread to be accurate for a given blk at the
+				 * current point in time. We detect the older-twin case by the following check. Note that here
+				 * we depend on the the fact that "bg_update" sets cr->bt_index to 0 before incrementing cr->cycle.
+				 * Given that order, cr->bt_index can be guaranteed to be 0 if we read the incremented cycle.
+				 */
+				if (cr->twin && (0 == cr->bt_index))
+					break;
 				if (cr->blk != blk)
 					break;
 				REL_CRIT_IF_NEEDED(csa, gv_cur_region, was_crit, hold_onto_crit);
@@ -618,7 +620,7 @@ sm_uc_ptr_t t_qread(block_id blk, sm_int_ptr_t cycle, cache_rec_ptr_ptr_t cr_out
 					 * restart will be triggered (in tp_tend) and the function "recompute_upd_array" will be
 					 * invoked. Avoiding the sleep in this case (at the cost of recomputing the update array
 					 * in crit) is expected to improve throughput. The only exception is if we are in the
-					 * final retry in which case it is better to wait here as we dont want to end up in a
+					 * final retry in which case it is better to wait here as we don't want to end up in a
 					 * situation where "recompute_upd_array" indicates that a restart is necessary.
 					 */
 					if (dollar_tlevel && (gv_target && gv_target->noisolation) && (ERR_GVPUTFAIL == t_err)
@@ -661,10 +663,17 @@ sm_uc_ptr_t t_qread(block_id blk, sm_int_ptr_t cycle, cache_rec_ptr_ptr_t cr_out
 				}
 				if (reset_first_tp_srch_status)
 					RESET_FIRST_TP_SRCH_STATUS(first_tp_srch_status, cr, *cycle);
+				/* Assert that if we are returning a "twin" while in crit, it better be the NEWER "twin" */
 				assert(!csa->now_crit || !cr->twin || cr->bt_index);
-				assert(!csa->now_crit || (NULL == (bt = bt_get(blk)))
-					|| (CR_NOTVALID == bt->cache_index)
-					|| (cr == (cache_rec_ptr_t)GDS_REL2ABS(bt->cache_index)) && (0 == cr->in_tend));
+#				ifdef DEBUG
+				if (csa->now_crit && (NULL != (bt = bt_get(blk))) && (CR_NOTVALID != bt->cache_index))
+				{
+					cr_lo = (cache_rec_ptr_t)csa->acc_meth.bg.cache_state->cache_array + csd->bt_buckets;
+					bt_cr = (cache_rec_ptr_t)GDS_REL2ABS(bt->cache_index);
+					assert(cr == bt_cr);
+					assert(0 == cr->in_tend);
+				}
+#				endif
 				/* Note that at this point we expect t_qread to return a <cr,cycle> combination that
 				 * corresponds to "blk" passed in. It is crucial to get an accurate value for both the fields
 				 * since "tp_hist" relies on this for its intermediate validation.
@@ -689,7 +698,7 @@ sm_uc_ptr_t t_qread(block_id blk, sm_int_ptr_t cycle, cache_rec_ptr_ptr_t cr_out
 					blocking_pid = cr->r_epid;
 					if ((0 != blocking_pid) && (process_id != blocking_pid))
 					{
-						if (FALSE == is_proc_alive(blocking_pid, cr->image_count))
+						if (FALSE == is_proc_alive(blocking_pid, 0))
 						{	/* process gone: release that process's lock */
 							assert(0 == cr->bt_index);
 							if (cr->bt_index)
@@ -722,8 +731,8 @@ sm_uc_ptr_t t_qread(block_id blk, sm_int_ptr_t cycle, cache_rec_ptr_ptr_t cr_out
 					{	/* process stopped before could set r_epid OR
 						 * Process is waiting on the lock held by itself.
 						 * Process waiting on the lock held by itself is an out-of-design
-						 * situation that we dont how it can occur hence the following assert
-						 * but know how to handle so we dont have to gtmassert in pro.
+						 * situation that we don't how it can occur hence the following assert
+						 * but know how to handle so we don't have to gtmassert in pro.
 						 */
 						assert(process_id != blocking_pid);
 						assert(0 == cr->bt_index);
diff --git a/sr_port/t_retry.c b/sr_port/t_retry.c
index 06efa3d..e63c222 100755
--- a/sr_port/t_retry.c
+++ b/sr_port/t_retry.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -296,6 +296,9 @@ void t_retry(enum cdb_sc failure)
 			 * (f) cdb_sc_instancefreeze : Instance freeze detected while crit held.
 			 * (g) cdb_sc_gvtrootmod2 : Similar to (e).
 			 * (h) cdb_sc_reorg_encrypt : Concurrent update of encryption settings due to MUPIP REORG -ENCRYPT.
+			 * (i) cdb_sc_gvtrootnonzero : It is possible that a GVT gets created just before we get crit in the
+			 *	final retry inside "gvcst_put2". In that case a cdb_sc_gvtrootnonzero restart is possible while in
+			 *	the final retry.
 			 */
 			assert(cdb_sc_optrestart != failure);
 			if (IS_FINAL_RETRY_CODE(failure))
@@ -402,7 +405,7 @@ void t_retry(enum cdb_sc failure)
 			csd = cs_data;
 			if (CDB_STAGNATE == t_tries)
 			{
-				if (csd->freeze && update_trans)
+				if (FROZEN_HARD(csd) && update_trans)
 				{	/* Final retry on an update transaction and region is frozen.
 					 * Wait for it to be unfrozen and only then grab crit.
 					 */
@@ -423,6 +426,7 @@ void t_retry(enum cdb_sc failure)
 					end = &buff[MAX_ZWR_KEY_SZ - 1];
 				if (cdb_sc_gbloflow == failure)
 				{
+					gv_currkey->end = 0;
 					send_msg_csa(CSA_ARG(csa) VARLSTCNT(6) ERR_GBLOFLOW, 0, ERR_GVIS, 2, end - buff, buff);
 					rts_error_csa(CSA_ARG(csa) VARLSTCNT(6) ERR_GBLOFLOW, 0, ERR_GVIS, 2, end - buff, buff);
 				}
@@ -517,7 +521,8 @@ void t_retry(enum cdb_sc failure)
 				}
 #				endif
 				break;
-			case cdb_sc_gvtrootmod:	/* failure signaled by gvcst_kill */
+			case cdb_sc_gvtrootmod:		/* failure signaled by gvcst_kill */
+			case cdb_sc_gvtrootnonzero:	/* failure signaled by gvcst_put */
 				/* If "gvcst_redo_root_search" has not yet been invoked in t_retry, do that now */
 				assert(NULL != gv_target);
 				if (!redo_root_search_done && (NULL != gv_target) && (DIR_ROOT != gv_target->root))
diff --git a/sr_port/t_write.c b/sr_port/t_write.c
index 75ec121..71a25a3 100755
--- a/sr_port/t_write.c
+++ b/sr_port/t_write.c
@@ -92,7 +92,7 @@ cw_set_element *t_write (
 	blk = blkhist->blk_num;
 	if (!dollar_tlevel)
 	{
-		assert((blk < csa->ti->total_blks) GTM_TRUNCATE_ONLY(|| (CDB_STAGNATE > t_tries)));
+		assert((blk < csa->ti->total_blks) || (CDB_STAGNATE > t_tries));
 		cse = &cw_set[cw_set_depth];
 		cse->mode = gds_t_noop;	/* initialize it to a value that is not "gds_t_committed" before incrementing
 					 * cw_set_depth as secshr_db_clnup relies on it */
@@ -100,7 +100,7 @@ cw_set_element *t_write (
 		assert(cw_set_depth < CDB_CW_SET_SIZE);
 		assert(index < (int)cw_set_depth);
 		new_cse = TRUE;
-		tp_cse = NULL; /* dont bother returning tp_cse for non-TP; it's almost never needed and it distiguishes the cases */
+		tp_cse = NULL;/* don't bother returning tp_cse for non-TP; it's almost never needed and it distiguishes the cases */
 	} else
 	{
 		assert(!index || index < sgm_info_ptr->cw_set_depth);
@@ -198,7 +198,7 @@ cw_set_element *t_write (
 		assert(NULL != old_block);
 		jbbp = (JNL_ENABLED(csa) && csa->jnl_before_image) ? csa->jnl->jnl_buff : NULL;
 		if ((NULL != jbbp) && (old_block->tn < jbbp->epoch_tn))
-		{	/* Pre-compute CHECKSUM. Since we dont necessarily hold crit at this point, ensure we never try to
+		{	/* Pre-compute CHECKSUM. Since we don't necessarily hold crit at this point, ensure we never try to
 			 * access the buffer more than the db blk_size.
 			 */
 			bsiz = MIN(old_block->bsiz, csa->hdr->blk_size);
diff --git a/sr_port/t_write_map.c b/sr_port/t_write_map.c
index 76aee0b..0752cdf 100755
--- a/sr_port/t_write_map.c
+++ b/sr_port/t_write_map.c
@@ -35,9 +35,7 @@ GBLREF unsigned char	cw_set_depth;
 GBLREF sgmnt_addrs	*cs_addrs;
 GBLREF sgm_info		*sgm_info_ptr;
 GBLREF uint4		dollar_tlevel;
-#ifdef GTM_TRUNCATE
 GBLREF unsigned int	t_tries;
-#endif
 
 void t_write_map (
 		srch_blk_status	*blkhist,	/* Search History of the block to be written. Currently the
@@ -77,7 +75,7 @@ void t_write_map (
 	cs->mode = gds_t_writemap;
 	cs->blk_checksum = 0;
 	cs->blk = blkhist->blk_num;
-	assert((cs->blk < csa->ti->total_blks) GTM_TRUNCATE_ONLY(|| (CDB_STAGNATE > t_tries)));
+	assert((cs->blk < csa->ti->total_blks) || (CDB_STAGNATE > t_tries));
 	cs->old_block = blkhist->buffaddr;
 	BIT_CLEAR_FREE(cs->blk_prior_state);	/* t_write_map operates on BUSY blocks and hence
 						 * cs->blk_prior_state's free_status is set to FALSE unconditionally */
@@ -86,7 +84,7 @@ void t_write_map (
 	assert(NULL != old_block);
 	jbbp = (JNL_ENABLED(csa) && csa->jnl_before_image) ? csa->jnl->jnl_buff : NULL;
 	if ((NULL != jbbp) && (old_block->tn < jbbp->epoch_tn))
-	{	/* Pre-compute CHECKSUM. Since we dont necessarily hold crit at this point, ensure we never try to
+	{	/* Pre-compute CHECKSUM. Since we don't necessarily hold crit at this point, ensure we never try to
 		 * access the buffer more than the db blk_size.
 		 */
 		bsiz = MIN(old_block->bsiz, csa->hdr->blk_size);
diff --git a/sr_port/tab_bg_trc_rec.h b/sr_port/tab_bg_trc_rec.h
index ae73dc4..5898113 100755
--- a/sr_port/tab_bg_trc_rec.h
+++ b/sr_port/tab_bg_trc_rec.h
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2005, 2012 Fidelity Information Services, Inc	*
+ * Copyright (c) 2005-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -11,21 +12,6 @@
 
 /* All additions to the end please */
 
-#if defined(VMS)
-TAB_BG_TRC_REC("  Removed from free     ", rmv_free)
-TAB_BG_TRC_REC("  Scratched clean       ", rmv_clean)
-TAB_BG_TRC_REC("  Reused clean          ", clean_to_mod)
-TAB_BG_TRC_REC("  Reused qio            ", qio_to_mod)
-TAB_BG_TRC_REC("  Blocked by qio        ", blocked)
-TAB_BG_TRC_REC("  Blkd qio fnshd 2 late ", blkd_made_empty)
-TAB_BG_TRC_REC("  Obsolete to empty     ", obsolete_to_empty)
-TAB_BG_TRC_REC("  Qio to clean          ", qio_to_clean)
-TAB_BG_TRC_REC("  Former Activelvltriggr", active_lvl_trigger_obsolete)
-TAB_BG_TRC_REC("  Former T_end new got b", new_buff_obsolete)
-TAB_BG_TRC_REC("  Getnew buff           ", get_new_buff)
-TAB_BG_TRC_REC("  Reused modified       ", mod_to_mod)
-TAB_BG_TRC_REC("  Wcs_wtfini invoked    ", wcs_wtfini_invoked)
-#elif defined(UNIX)
 TAB_BG_TRC_REC("  Total buffer flushes  ", total_buffer_flush)		/* # of wcs_flu calls */
 TAB_BG_TRC_REC("  Flsh for buff cnt     ", bufct_buffer_flush)		/* # of flushing-till-buffers-free-cnt (wcs_get_space) */
 TAB_BG_TRC_REC("  Flsh for buff cnt lps ", bufct_buffer_flush_loop)	/* # of flushing-till-buffers-free-cnt looping back */
@@ -39,9 +25,6 @@ TAB_BG_TRC_REC("  Reserved filler bg_trc", reserved_bgtrcrec2)		/* Reserved fill
 TAB_BG_TRC_REC("  Reserved filler bg_trc", reserved_bgtrcrec3)		/* Reserved filler to match length of VMS section */
 TAB_BG_TRC_REC("  Lost block recovery   ", lost_block_recovery)		/* Performing lost block recovery in gds_rundown  */
 TAB_BG_TRC_REC("  WcBlocked onln_rlbk   ", wc_blocked_onln_rlbk)	/* Set by online rollback due to incomplete wcs_flu */
-#else
-# error Unsupported platform
-#endif
 TAB_BG_TRC_REC("  Stale                 ", stale)
 TAB_BG_TRC_REC("  Starved               ", starved)
 TAB_BG_TRC_REC("  Stale timer started   ", stale_timer_started)		/* Stale buffer timer started */
@@ -51,7 +34,7 @@ TAB_BG_TRC_REC("  Stale deferd procsd   ", stale_defer_processed)	/* Stale proce
 TAB_BG_TRC_REC("  Spcfc buff flshs      ", spcfc_buffer_flush)		/* Count of flushing specific buffer (wcs_get_space) */
 TAB_BG_TRC_REC("  Spcfc buff flsh lps   ", spcfc_buffer_flush_loop)	/* # of passes to flush a specific buffer (wcs_get_space) */
 TAB_BG_TRC_REC("  Spcfc buff flsh rtries", spcfc_buffer_flush_retries)	/* Times we re-flushed when 1st flush didn't flush buffer */
-TAB_BG_TRC_REC("  Spcfc buff lkwait flsh", spcfc_buffer_flushed_during_lockwait)
+TAB_BG_TRC_REC("  Spcfc buff lkwait flsh", spcfc_buffer_flushed_during_lockwait) /* UNUSED */
 TAB_BG_TRC_REC("  TP crit retries       ", tp_crit_retries)		/* # of times re-tried getting crit (common Unix & VMS) */
 TAB_BG_TRC_REC("  DbCshGetn_FlushDirty  ", db_csh_getn_flush_dirty)	/* all the fields from now on use the BG_TRACE_PRO macro  */
 TAB_BG_TRC_REC("  DbCshGetn_RipWait     ", db_csh_getn_rip_wait)	/* since they are incremented rarely, they will go in	  */
@@ -165,3 +148,11 @@ TAB_BG_TRC_REC("  recompute_upd blk_fini", recompute_upd_array_blk_fini)
 TAB_BG_TRC_REC("  recompute_upd blksplit", recompute_upd_array_blk_split)
 TAB_BG_TRC_REC("  T_qread ripsleep_cnt  ", t_qread_ripsleep_cnt)
 TAB_BG_TRC_REC("  T_qread ripsleep_nblks", t_qread_ripsleep_nblks)
+TAB_BG_TRC_REC("  Wcs_wtfini invoked    ", wcs_wtfini_invoked)
+TAB_BG_TRC_REC("  Wcs_wterror invoked   ", wcs_wterror_invoked)
+TAB_BG_TRC_REC("  Wcs_wt_restart invoked", wcs_wt_restart_invoked)
+TAB_BG_TRC_REC("  Wcs_wt_restart EAGAIN ", wcs_wt_restart_eagain)
+TAB_BG_TRC_REC("  Wcs_wt_restart reinsrt", wcs_wt_restart_reinsert)
+TAB_BG_TRC_REC("  Wcs_wtstart EAGAIN    ", wcs_wtstart_eagain)
+TAB_BG_TRC_REC("  Wcs_wtstart EAGAINcrit", wcs_wtstart_eagain_incrit)
+TAB_BG_TRC_REC("  LseekAIORestart EAGAIN", async_restart_eagain)
diff --git a/sr_port/tab_gvstats_rec.h b/sr_port/tab_gvstats_rec.h
index 274dd30..484e4c4 100644
--- a/sr_port/tab_gvstats_rec.h
+++ b/sr_port/tab_gvstats_rec.h
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2008, 2014 Fidelity Information Services, Inc	*
+ * Copyright (c) 2008-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -9,9 +10,13 @@
  *								*
  ****************************************************************/
 
-/* Note that each TAB_GVSTATS_REC entry corresponds to a field in the file-header
- * Therefore, any operation that changes the offset of any entry in the file-header shouldn't be attempted.
+/* Note that the order these fields appear in below is the same order the fields are defined in the
+ * gvstats_rec_t structure (fileheader, sgmnt_addrs, and node_local). They also represent the order
+ * these fields are displayed by zshow_gvstats() (ZSHOW "G"). Also the order the stats present themselves
+ * is assumed to be the order of the binary stats by ^%YGBLSTAT.m when processing shared global stats.
+ * Therefore, any operation that changes the order or offset of any given field should not be attempted.
  * Additions are to be done at the END of the file.
+ *
  * Replacing existing fields with new fields is allowed (provided their implications are thoroughly analyzed).
  */
 TAB_GVSTATS_REC(n_set                , "SET", "# of SET   operations                 ")
@@ -64,7 +69,6 @@ TAB_GVSTATS_REC(n_jrec_epoch_idle    , "JRI", "# of Idle epoch Journal Records
 TAB_GVSTATS_REC(n_jrec_other         , "JRO", "# of Other Journal Records            ")
 TAB_GVSTATS_REC(n_jnl_extends        , "JEX", "# of Journal file EXtensions          ")
 TAB_GVSTATS_REC(n_db_extends         , "DEX", "# of Database file EXtensions         ")
-#ifdef UNIX
 TAB_GVSTATS_REC(n_crit_success       , "CAT", "# of crit acquired total successes    ")
 TAB_GVSTATS_REC(n_crits_in_epch      , "CFE", "# of attempts in CFT caused by epochs ")
 TAB_GVSTATS_REC(sq_crit_failed       , "CFS", "sum squares grab crit failed          ")
@@ -73,4 +77,4 @@ TAB_GVSTATS_REC(sq_crit_que_slps     , "CQS", "sum squares grab crit queued slee
 TAB_GVSTATS_REC(n_crit_que_slps      , "CQT", "# of grab crit queued sleeps          ")
 TAB_GVSTATS_REC(sq_crit_yields       , "CYS", "sum squares grab crit yields          ")
 TAB_GVSTATS_REC(n_crit_yields        , "CYT", "# of grab crit yields                 ")
-#endif
+TAB_GVSTATS_REC(n_clean2dirty        , "BTD", "# of Block Transitions to Dirty       ")
diff --git a/sr_port/targ_alloc.c b/sr_port/targ_alloc.c
index 5b83b16..c4de0ee 100755
--- a/sr_port/targ_alloc.c
+++ b/sr_port/targ_alloc.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information 	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -13,7 +13,9 @@
 #include "mdef.h"
 
 #include <stddef.h>		/* for offsetof macro (used by OFFSETOF macro) */
+#include "gtm_stdio.h"
 
+#include "gtmio.h"
 #include "gtm_string.h"
 #include "gdsroot.h"
 #include "gtm_facility.h"
@@ -26,6 +28,7 @@
 #include "hashtab_mname.h"
 #include "gtmimagename.h"
 #include "dpgbldir.h"
+#include "io.h"
 
 GBLREF	gv_namehead		*gv_target_list;
 GBLREF	gv_namehead		*gv_target;
@@ -62,7 +65,7 @@ gv_namehead *targ_alloc(int keysize, mname_entry *gvent, gd_region *reg)
 		gvt->gvname.hash_code = gvent->hash_code;
 		return gvt;
 	}
-	assert((NULL == reg) || dba_mm == REG_ACC_METH(reg) || (dba_bg == REG_ACC_METH(reg)));
+	assert((NULL == reg) || IS_REG_BG_OR_MM(reg));
 	assert((NULL == reg) || (reg->max_key_size <= MAX_KEY_SZ));
 	/* Ensure there are no additional compiler introduced filler bytes. This is a safety since a few elements in the
 	 * gv_namehead structure are defined using MAX_BT_DEPTH macros and we want to guard against changes to this macro
@@ -213,11 +216,13 @@ void	targ_free(gv_namehead *gvt)
 		 *      a) We are exiting and in the process of freeing up cs_addrs->dir_tree in gv_rundown
 		 *	b) The GT.CM GNP server which could free up a region as part of running down a client's database.
 		 *	c) In VMS, DAL calls could rundown the database. This is tough to check using an assert.
+		 *      d) This is a statsDB which can be closed on an opt-out and reopened on a subsequent opt-in.
 		 * Assert accordingly.
 		 */
 		UNIX_ONLY(assert(IS_GTCM_GNP_SERVER_IMAGE
 				 || (process_exiting && ((gvt == cs_addrs->dir_tree)
-							 GTMTRIG_ONLY(|| (gvt == cs_addrs->hasht_tree))))));
+							 GTMTRIG_ONLY(|| (gvt == cs_addrs->hasht_tree))))
+				 || (IS_STATSDB_REG(gvt->gd_csa->region))));
 		gv_target = NULL;	/* In that case, set gv_target to NULL to ensure freed up memory is never used */
 	}
 	/* assert we never delete a gvt that is actively used in a TP transaction */
diff --git a/sr_port/ti.mpt b/sr_port/ti.mpt
index 53cf7fe..605aeed 100755
--- a/sr_port/ti.mpt
+++ b/sr_port/ti.mpt
@@ -1,6 +1,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;								;
-;	Copyright 1987,2001 Sanchez Computer Associates, Inc.	;
+; Copyright (c) 1987-2017 Fidelity National Information		;
+; Services, Inc. and/or its subsidiaries. All rights reserved.	;
 ;								;
 ;	This source code contains the intellectual property	;
 ;	of its copyright holder(s), and is made available	;
@@ -8,41 +9,59 @@
 ;	the license, please stop and do not read further.	;
 ;								;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-%TI	;GT.M %TI utility - convert time to $H format
-	;invoke ^%TI to enter time interactively; returns %TN
-	;invoke INT^%TI with %TS to convert a previously captured time
-	;formats accepted include:
+%TI	; GT.M %TI utility - convert time to $H format
+	; invoke ^%TI to enter time interactively; returns %TN
+	; invoke INT^%TI with %TS to convert a previously captured time
+	; $$FUNC^%TI() with an appropriate argument returns time
+	; formats accepted include:
 	;	[h]h mm [a/p[m]]
-	;	hhmm is interpreted as 24 hr (military) time
-	;	unique prefixes of midni(ght/te), and noon
-	;	any non-alphameric character(s) are accepted as delimiters
-	n %TS
-	f  r !,"Time: ",%TS s %TN=$$FUNC(%TS) q:%TN'=""  w "  - invalid time"
-	q
-INT	s %TN=$$FUNC($g(%TS))
-	q
+	;	hhmm interpreted as 24 hr (military) time
+	;	unique suffixes of midni(ght/te), and noon
+	;	any punctuation character(s) are accepted as delimiters
+	new %TS,d
+	set d("io")=$io
+	if '$data(%zdebug) new $etrap set $etrap="zgoto "_$zlevel_":err^"_$text(+0) do
+	. zshow "d":d									; save original $p settings
+	. set d=$piece($piece(d("D",1),"CTRA=",2)," ")
+	. set:d?1."""" d=""
+	. set d("use")="$principal:(ctrap="""_d_""":exception=""",d=$piece(d("D",1),"EXCE=",2),d=$zwrite($extract(d,2,$length(d)-1))
+	. set:d?1."""" d=""
+	. set d("use")=d("use")_d_""":"_$select($find(d("D",1),"NOCENE"):"nocenable",1:"cenable")_")"
+	. use $principal:(ctrap=$char(3,4):exception=d:nocenable)
+	for  read !,"Time: ",%TS set %TN=$$FUNC(%TS) quit:""'=%TN  write "  - invalid time"
+	use:$data(d("use")) @d("use")
+	use:$data(d("io")) d("io")
+	quit
+INT	set %TN=$$FUNC($get(%TS))
+	quit
 FUNC(ts)
-	n apm,cp,dir,hr,ilen,min,tp,tok,dh
-	s dh="",min=0
-	i $g(ts)="" q $p($H,",",2)
-	s ilen=$l(ts)+1,cp=1 d advance
-	i dir?1A q $s("\NOON"[tok:43200,"\MIDNIGHT\MIDNITE"[tok:0,1:"")
-	i tok?4N,cp=ilen s min=$e(tok,3,4),hr=$e(tok,1,2) q:hr>24!(min>59) "" q hr*60+min*60
-	i tok'?1.2N!(tok>12) q ""
-	s hr=$s(tok=12:0,1:tok)
-	i $e(ts,cp,cp+2)?1":"2N d advance q:tok>59 "" s min=tok
-	d advance
-	i dir'?1A!(cp'=ilen) q ""
-	s apm=$f("\AM\PM",tok)-3\3
-	i apm'<0 q apm*12+hr*60+min*60
-	q $s(hr:"",min:"","\NOON"[tok:43200,"\MIDNIGHT\MIDNITE"[tok:0,1:"")
+	quit:(""=$get(ts)) $piece($horolog,",",2)
+	if '$data(%zdebug) new $etrap set $etrap="zgoto "_$zlevel_":err^"_$text(+0)
+	new apm,cp,dir,hr,ilen,min,ocp,tp,tok,dh
+	set dh="",min=0
+	set ilen=$length(ts)+1,ocp=1
+	do advance quit:(dir?1C) ""
+	quit:(tok?1A.E) $select("\NOON"[("\"_tok):43200,"\MIDNIGHT\MIDNITE"[("\"_tok):0,1:"")
+	if tok?4N set min=$extract(tok,3,4),hr=$extract(tok,1,2) quit:(24<hr)!(59<min) ""
+	else  if (tok?1.N) quit:24<tok "" do  if dir'?1A do advance quit:(dir?1C) "" if tok?1.N quit:(59<tok) "" set min=tok
+	. set hr=tok,min=0
+	if dir?1A quit:12<hr "" do advance quit:(dir?1C) "" do  quit:(0>apm) ""
+	. set apm=$find("\AM\PM\MI\NO","\"_$extract(tok,1,2))-3\3
+	. set:((1<apm)&min) apm=-1
+	. if 0<=apm set:(12=hr)&(apm<2) hr=apm*hr set hr=$select((0=apm):hr,(1=apm)&(12'=hr):12+hr,2=apm:0,3:12)
+	quit $select((ocp+1<ilen):"",1:((hr*60)+min)*60)
 	;
-advance	f cp=cp:1:ilen q:$e(ts,cp)?1AN
-	s dir=$e(ts,cp)
-	i dir?1A f tp=cp+1:1:ilen q:$e(ts,tp)'?1A
-	e  i dir?1N f tp=cp+1:1:ilen q:$e(ts,tp)'?1N
-	e  s tok="" q
-	s tok=$e(ts,cp,tp-1)
-	i dir?1A s tok="\"_$tr(tok,"abcdefghijklmnopqrstuvwxyz","ABCDEFGHIJKLMNOPQRSTUVWXYZ")
-	s cp=tp
-	q
+advance	for cp=ocp:1:ilen quit:$extract(ts,cp)?1AN
+	set dir=$extract(ts,cp)
+	if dir?1A for tp=cp+1:1:ilen quit:$extract(ts,tp)'?1A
+	else  if dir?1N for tp=cp+1:1:ilen quit:$extract(ts,tp)'?1N
+	if  set tok=$extract(ts,cp,tp-1) set:(dir?1A) tok=$zconvert(dir,"U")
+	else  set tok="",tp=ocp
+	for cp=tp:1:ilen set dir=$extract(ts,cp) quit:dir'?1P
+	set dir=$zconvert(dir,"U"),ocp=cp
+	quit
+err	write !,$piece($zstatus,",",2,99),!
+	use:$data(d("use")) @d("use")
+	use:$data(d("io")) d("io")
+	set $ecode=""
+	quit
diff --git a/sr_port/toktyp.h b/sr_port/toktyp.h
index 95bad8b..afa0728 100755
--- a/sr_port/toktyp.h
+++ b/sr_port/toktyp.h
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2012 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -63,6 +64,7 @@
 #define TK_NSORTS_AFTER 50
 #define TK_ATHASH 51
 #define TK_SQLFIELDNAME 52
+#define TK_CR 53
 
 #define	NUM_ASCII_CHARS	128
 #define	NUM_CHARS	256	/* number of single-byte characters (includes ASCII and non-ASCII) */
diff --git a/sr_port/tp.h b/sr_port/tp.h
index 9a93c1e..d1ac333 100755
--- a/sr_port/tp.h
+++ b/sr_port/tp.h
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information 	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -641,146 +641,177 @@ typedef struct trans_restart_hist_struct
 }
 
 #ifdef GTM_TRIGGER
-#define TP_INVALIDATE_TRIGGER_CYCLES_IF_NEEDED(INCREMENTAL, COMMIT)								\
+/* State information needed by TP_INVALIDATE_TRIGGER_CYCLES_IF_NEEDED(). Currently needed for trigger cycle handling */
+typedef enum
+{
+	TP_COMMIT,
+	TP_ROLLBACK,
+	TP_INCR_ROLLBACK,
+	TP_RESTART
+
+} tp_cleanup_state;
+
+/* TP_INVALIDATE_TRIGGER_CYCLES_IF_NEEDED uses the logic below to manage CSA's and GVT's trigger cycle information
+ *
+ * Manage cached trigger state for regions and gvts. If either $ZTRIGGER() was invoked (dollar_ztrigger_invoked == TRUE) or
+ * triggers were read from the database in the current (TREF(gvt_triggers_read_this_tn) == TRUE) transaction, certain state
+ * information needs to be cleaned up at transaction commit, complete/incremental rollback or restart.
+ * Rules for gvt:
+ * - For all cases, commit, incr/complete rollback and restart, each gvt's db_dztrigger_cycle must be reset to zero. We do
+ *   this to ensure that any $ZTRIGGER() causes a cycle mismatch which will result in a call to gvtr_db_read_hasht(). The end
+ *   of this macro ASSERTs that cleanup will always reset gvt->db_dztrigger_cycle to zero.
+ * - Any gvt that read trigger info from the DB since the transaction start will have gvt->trig_read_tn >= tstart_local_tn
+ *   and gvt->trig_read_tn == local_tn if read in the current (possibly sub) transaction. For commits, there is nothing to
+ *   do. Complete rollbacks and restarts, if gvt->gvt_trigger is non-NULL, reset gvt_trigger->gv_trigger_cycle to zero.
+ *   Incremental rollbacks only reset gvt_trigger->gv_trigger_cycle to zero when the trigger was read in the current
+ *   transaction. Alone, resetting gvt_trigger->gv_trigger_cycle to zero will not force a cycle mismatch.
+ *   The above reset of the gvt's db_dztrigger_cycle to zero only causes a mismatch when $ZTRIGGER() is involved. To cover
+ *   restarts and complete rollbacks without $ZTRIGGER() set gvt->db_trigger_cycle to gvt->gd_csa->db_trigger_cycle - 1 to force
+ *   a cycle mismatch. While resetting gvt->db_dztrigger_cycle and gvt->db_trigger_cycle is redundant doing both simplifies
+ *   the logic.
+ * - For commits and complete rollbacks cleanup asserts that gvt->db_dztrigger_cycle == gvt->gd_csa->db_dztrigger_cycle
+ * Rules for csa:
+ * - For commits and complete rollbacks, reset csa->db_dztrigger_cycle to zero as the transaction is over. Also reset
+ *   csa->incr_db_trigger_cycle to FALSE (this is redundant for commits as tp_tend will already have reset
+ *   csa->incr_db_trigger_cycle when it increment csd->db_trigger_cycle. Iterate over tp_reg_list in case a region that was
+ *   affected by a $ZTRIGGER() in a prior try, but not by the current try.
+ * - For restarts and incremental rollbacks, if $ZTRIGGER() was invoked (dollar_ztrigger_invoked == TRUE), iterate over
+ *   sgminfo to set each non-zero csa->db_dztrigger_cycle to 1. While any non-zero value will cause a cycle mismatch -
+ *   because each gvt will have its gvt->db_dztrigger_cycle reset to 0 - one is enough to preserve the knowledge that
+ *   $ZTRIGGER() affected loaded triggers. Assert that csa->db_dztrigger_cycle is non-zero when csa->incr_db_trigger_cycle is
+ *   TRUE.
+ * At clean up end:
+ * - Reset TREF(gvt_triggers_read_this_tn) to FALSE
+ * - Reset dollar_ztrigger_invoked to FALSE only for commits and complete rollbacks. Done last since it impacts both gvts and
+ *   CSAs. Restarts and incremental rollbacks must retain the knowledge that $ZTRIGGER() was invoked and leaving
+ *   dollar_ztrigger_invoked is one part of that.
+ */
+#define TP_INVALIDATE_TRIGGER_CYCLES_IF_NEEDED(STATE)										\
 {																\
 	GBLREF	boolean_t	dollar_ztrigger_invoked;									\
 	GBLREF	trans_num	local_tn;											\
 	GBLREF	gv_namehead	*gvt_tp_list;											\
 	GBLREF	sgm_info	*first_sgm_info;										\
+	GBLREF	tp_region	*tp_reg_list;											\
+	GBLREF	trans_num	tstart_local_tn;	/* copy of global variable "local_tn" at op_tstart time */		\
+	DEBUG_ONLY(GBLDEF	boolean_t	was_dollar_ztrigger_invoked);							\
+	DEBUG_ONLY(GBLDEF	boolean_t	were_gvt_triggers_read_this_tn);						\
+	DBGTRIGR_ONLY(char	gvnamestr[MAX_MIDENT_LEN + 1];)									\
+	DBGTRIGR_ONLY(uint4	lcl_csadztrig;)											\
+	DBGTRIGR_ONLY(uint4	lcl_dztrig;)											\
 																\
 	gv_namehead		*gvnh, *lcl_hasht_tree;										\
 	cw_set_element		*cse;												\
 	sgmnt_addrs		*csa;												\
 	sgm_info		*si;												\
 	gvt_trigger_t		*gvt_trigger;											\
-	DEBUG_ONLY(boolean_t	matched_one_gvnh;)										\
+	tp_region               *tr;												\
 	DCL_THREADGBL_ACCESS;													\
 																\
 	SETUP_THREADGBL_ACCESS;													\
+	DEBUG_ONLY(was_dollar_ztrigger_invoked = dollar_ztrigger_invoked;)							\
+	DEBUG_ONLY(were_gvt_triggers_read_this_tn = TREF(gvt_triggers_read_this_tn);)						\
+	/* $ZTRIGGER() was invoked. Clean up csa->db_dztrigger_cycle as necessary. */						\
+	DBGTRIGR((stderr, "INVALIDATE_TRIG_CYCLE(): %s:%d t_tries %d, $tlevel=%d state=%d wasDZ=%d wasTREAD=%d\n",		\
+				__FILE__, __LINE__, t_tries, dollar_tlevel, STATE,						\
+				was_dollar_ztrigger_invoked, were_gvt_triggers_read_this_tn));					\
 	if (dollar_ztrigger_invoked)												\
-	{	/* There was at least one region where a $ZTRIGGER() was invoked. */						\
-		dollar_ztrigger_invoked = FALSE;										\
-		/* Phase 1: Adjust trigger/$ztrigger related fields for all gv_target read/updated in this transaction */	\
-		if (COMMIT)													\
-		{	/* Reset csa->db_dztrigger_cycle and gvt->db_dztrigger_cycle to zero. This is needed so that globals 	\
-			 * updated after the TCOMMIT don't re-read triggers when NOT necessary. Such a case is possible if	\
-			 * for instance a $ZTRIGGER() happened in a sub-transaction that got rolled back. Though no actual	\
-			 * trigger change happened, csa->db_dztrigger_cycle will be incremented and hence gvt(s) whose 		\
-			 * db_dztrigger_cycle does not match will now re-read triggers. We don't expect $ZTRIGGER() to be	\
-			 * frequent. So, it's okay to go through the list of gvt 						\
+	{															\
+		if ((STATE == TP_COMMIT) || (STATE == TP_ROLLBACK))								\
+		{	/* Reset csa->db_dztrigger_cycle to zero. This is needed so that globals updated after the commit or	\
+			 * rollback do not re-read triggers when NOT necessary. Such a case is possible if for instance a	\
+			 * $ZTRIGGER() happened in a sub-transaction that got rolled back. Though no actual trigger change	\
+			 * happened, csa->db_dztrigger_cycle will be incremented and hence gvt(s) whose db_dztrigger_cycle does	\
+			 * not match will now re-read triggers. We don't expect $ZTRIGGER() to be frequent. So, it's okay to go	\
+			 * through tp_reg_list											\
 			 */													\
-			for (gvnh = gvt_tp_list; NULL != gvnh; gvnh = gvnh->next_tp_gvnh)					\
+			for (tr = tp_reg_list; NULL != tr; tr = tr->fPtr)							\
 			{													\
-				gvnh->db_dztrigger_cycle = 0;									\
-				gvnh->gd_csa->db_dztrigger_cycle = 0;								\
+				csa = &FILE_INFO(tr->reg)->s_addrs;								\
+				csa->db_dztrigger_cycle = 0;									\
+				/* This is safe to do here for commit because tp_tend() has already been done. This is safe	\
+				 * for a complete rollback as well because the transaction is now complete.			\
+				 */												\
+				csa->incr_db_trigger_cycle = FALSE;								\
 			}													\
 		} else														\
-		{														\
-			/* Now that the transaction is rolled back/restarted, invalidate gvt->gvt_trigger->gv_trigger_cycle	\
-			 * (by resetting it to zero) for all gvt read/updated in this transaction. Note that even though we	\
-			 * reset db_trigger_cycle for non-incremental rollbacks/restarts and increment db_dztrigger_cycle	\
-			 * for incremental rollbacks we still need to reset gv_trigger_cycle as otherwise gvtr_init will find 	\
-			 * that gv_trigger_cycle has NOT changed since it was updated last and will NOT do any trigger reads.	\
-			 */													\
-			for (gvnh = gvt_tp_list; NULL != gvnh; gvnh = gvnh->next_tp_gvnh)					\
-			{													\
-				assert(gvnh->read_local_tn == local_tn);							\
-				if (NULL != (gvt_trigger = gvnh->gvt_trigger))							\
-					gvt_trigger->gv_trigger_cycle = 0;							\
-				if (!INCREMENTAL)										\
-				{	/* TROLLBACK(0) or TRESTART. Reset db_dztrigger_cycle to 0 since we are going to start 	\
-					 * a new transaction. But, we want to ensure that the new transaction re-reads triggers	\
-					 * since any gvt which updated its gvt_trigger in this transaction will be stale as	\
-					 * they never got committed. We will later ensure csa->db_dztrigger_cycle is non-zero.	\
-					 */											\
-					gvnh->db_dztrigger_cycle = 0;								\
-					gvnh->db_trigger_cycle = 0;								\
-				}												\
-			}													\
-		}														\
-		/* Phase 2: Adjust trigger/$ztrigger related fields for all csa accessed in this transaction */			\
-		if (INCREMENTAL)												\
-		{	/* An incremental rollback. Find out if there are still any cse->blk_target containing ^#t updates. 	\
-			 * If not, set csa->incr_db_trigger_cycle to FALSE (if already set to TRUE) so that we don't 		\
-			 * increment csd->db_trigger_cycle during commit time 							\
+		{	/* In case of a restart or incremental rollback, reset the csa's db_dztrigger_cycle to force a		\
+			 * cycle mismatch in the next try or update (rollback)							\
 			 */													\
 			for (si = first_sgm_info; NULL != si; si = si->next_sgm_info)						\
 			{													\
-				cse = si->first_cw_set;										\
 				csa = si->tp_csa;										\
-				lcl_hasht_tree = csa->hasht_tree;								\
-				if (NULL != lcl_hasht_tree)									\
-				{												\
-					/* Walk through the cw_set_elements remaining after the incremental rollback to 	\
-					 * see if any of them has a ^#t update 							\
-					 */											\
-					while (NULL != cse)									\
-					{											\
-						if (lcl_hasht_tree == cse->blk_target)						\
-							break;									\
-						cse = cse->next_cw_set;								\
-					}											\
-					if (NULL != cse)									\
-						csa->incr_db_trigger_cycle = FALSE;						\
-				} else												\
-					assert(!csa->incr_db_trigger_cycle);							\
+				assert(!csa->db_dztrigger_cycle || ((csa->db_dztrigger_cycle) && (csa->incr_db_trigger_cycle)));\
+				DBGTRIGR_ONLY(lcl_csadztrig = csa->db_dztrigger_cycle;)						\
 				if (csa->db_dztrigger_cycle)									\
-					csa->db_dztrigger_cycle++; /* so that future updates in this TN re-read triggers */	\
-			}													\
-			/* Keep dollar_ztrigger_invoked as TRUE as the transaction is not yet complete and we need this 	\
-			 * variable being TRUE to reset csa->db_dztrigger_cycle and gvt->db_dztrigger_cycle to 0 during 	\
-			 * tp_clean_up of this transaction.									\
-			 */													\
-			dollar_ztrigger_invoked = TRUE;										\
-		} else if (!COMMIT)												\
-		{	/* This is either a complete rollback or a restart. In either case, set csa->incr_db_trigger_cycle 	\
-			 * to FALSE for all csa referenced in this transaction as they are anyways not going to be committed.	\
-			 * Based on this though, set csa->db_dztrigger_cycle to a non-zero value this way we ensure		\
-			 * triggers are forced to be re-read on the restart/rollback so any cached stale trigger state from	\
-			 * the current failed try is thrown away.								\
-			 */													\
-			for (si = first_sgm_info; NULL != si; si = si->next_sgm_info)						\
-			{													\
-				si->tp_csa->db_dztrigger_cycle = si->tp_csa->incr_db_trigger_cycle ? 1 : 0;			\
-				si->tp_csa->incr_db_trigger_cycle = FALSE;							\
+					csa->db_dztrigger_cycle = 1;								\
+				DBGTRIGR((stderr, "INVALIDATE_TRIG_CYCLE(): CSA is %s at %d, was %d\n",				\
+						csa->region->rname, csa->db_dztrigger_cycle, lcl_csadztrig));			\
 			}													\
 		}														\
 	}															\
-	/* If gvt_triggers_read_this_tn is TRUE and INCREMENTAL is TRUE, we are in an incremental commit or rollback.		\
-	 * In either case, we dont need to worry about resetting gv_target's trigger cycles as we will do this when the		\
-	 * outermost commit or rollback (or a restart) occurs. The key is that even if a gv_target gets used in a nested	\
-	 * tstart/tcommit that gets incrementally rolled back, it is still part of the gvt_tp_list and hence we can wait	\
-	 * to clean the cycle fields at restart/commit/non-incremental-rollback time. In case of a commit, no need to reset	\
-	 * the gv_trigger_cycle, db_dztrigger_cycle and db_trigger_cycle fields of gvnh as those are valid going forward.	\
+	/* Either $ZTRIGGER() was invoked or triggers were read for the first time in this transaction. In order for the next	\
+	 * try or update (in case of a rollback) to re-read triggers, force a cycle mismatch as necessary.			\
 	 */															\
-	if (TREF(gvt_triggers_read_this_tn) && !INCREMENTAL)									\
+	if (TREF(gvt_triggers_read_this_tn) || dollar_ztrigger_invoked)								\
 	{															\
-		if (!COMMIT)													\
-		{	/* There was at least one GVT where ^#t records were read and this is a complete			\
-			 * (i.e. non-incremental) transaction restart or rollback. In this case, reset cycle fields		\
-			 * in corresponding gv_target to force re-reads of ^#t records of this gvt (if any) in next retry.	\
+		for (gvnh = gvt_tp_list; NULL != gvnh; gvnh = gvnh->next_tp_gvnh)						\
+		{														\
+			assert(gvnh->read_local_tn == local_tn);								\
+			/* Always reset db_dztrigger_cycle, but capture current state */					\
+			DBGTRIGR_ONLY(lcl_dztrig = gvnh->db_dztrigger_cycle;)							\
+			gvnh->db_dztrigger_cycle = 0;										\
+			/* For commit and complete rollback the csa and gvt must share the same db_dztrigger_cycle value */	\
+			assert(((STATE != TP_COMMIT) && (STATE != TP_ROLLBACK))							\
+					|| (gvnh->db_dztrigger_cycle == gvnh->gd_csa->db_dztrigger_cycle));			\
+			DBGTRIGR_ONLY(memcpy(gvnamestr, gvnh->gvname.var_name.addr, gvnh->gvname.var_name.len);)		\
+			DBGTRIGR_ONLY(gvnamestr[gvnh->gvname.var_name.len]='\0';)						\
+			DBGTRIGR((stderr, "INVALIDATE_TRIG_CYCLE(): %s:%d %s dztrig=%d(%d) cycle=%d CSA\n", 			\
+					__FILE__, __LINE__, gvnamestr, gvnh->db_dztrigger_cycle, lcl_dztrig, 			\
+						gvnh->db_trigger_cycle));							\
+			if (STATE == TP_COMMIT)											\
+				continue;											\
+			/* If in a restart/complete rollback and gvhn's trigger was read since the transaction start, clear its	\
+			 * gv_trigger_cycle to force a complete re-read of trigger content in the next try or update (rollback).\
+			 * NOTE: While reseting gv_trigger_cycle forces a complete re-read, that only occurs with a cycle	\
+			 * mismatch by reseting some combination of gvnh->db_trigger_cycle and gvnh->db_dztrigger_cycle.	\
 			 */													\
-			DEBUG_ONLY(matched_one_gvnh = TRUE;)									\
-			for (gvnh = gvt_tp_list; NULL != gvnh; gvnh = gvnh->next_tp_gvnh)					\
-			{													\
-				assert(gvnh->read_local_tn == local_tn);							\
-				if (gvnh->trig_read_tn != local_tn)								\
-					continue;										\
-				DEBUG_ONLY(matched_one_gvnh = FALSE;)								\
-				if (NULL != (gvt_trigger = gvnh->gvt_trigger))							\
+			if (((STATE == TP_ROLLBACK) || (STATE == TP_RESTART)) && (gvnh->trig_read_tn >= tstart_local_tn) 	\
+				&& (NULL != (gvt_trigger = gvnh->gvt_trigger)))	/* in-line assigment */				\
 					gvt_trigger->gv_trigger_cycle = 0;							\
-				gvnh->db_dztrigger_cycle = 0;									\
-				gvnh->db_trigger_cycle = 0;									\
+			/* If in an incremental rollback, only clear gv_trigger_cycle if the trigger was read in the current 	\
+			 * transaction. Do not force a cycle mismatch. A $ZTRIGGER() operation in the current transaction will	\
+			 * cause a cycle mismatch. Without any external change - another process doing a $ZTRIGGER() - there is	\
+			 * no reason to reload the trigger. Inducing a mismatch would cause GVTR_INIT_AND_TPWRAP_IF_NEEDED	\
+			 * to restart when local_tn == GVT->trig_local_tn							\
+			 */													\
+			if (STATE == TP_INCR_ROLLBACK)										\
+			{													\
+				if ((gvnh->trig_read_tn == local_tn)		 						\
+					&& (NULL != (gvt_trigger = gvnh->gvt_trigger)))	/* in-line assigment */			\
+						gvt_trigger->gv_trigger_cycle = 0;						\
+				continue;											\
 			}													\
-			assert(!matched_one_gvnh);	/* we expect at least one gvnh with trig_read_tn == local_tn */		\
+			/* For complete rollback and restart always force a cycle mismatch */					\
+			gvnh->db_trigger_cycle = gvnh->gd_csa->db_trigger_cycle - 1;						\
 		}														\
-		TREF(gvt_triggers_read_this_tn) = FALSE;									\
 	}															\
+	/* At this point, assert that each gvt's db_dztrigger_cycle is zero */							\
+	DEBUG_ONLY(for (gvnh = gvt_tp_list; NULL != gvnh; gvnh = gvnh->next_tp_gvnh))						\
+		assert(!gvnh->db_dztrigger_cycle);										\
+	/* Now it is safe to clear dollar_ztrigger_invoked and gvt_triggers_read_this_tn */					\
+	if (TREF(gvt_triggers_read_this_tn))											\
+		TREF(gvt_triggers_read_this_tn) = FALSE;									\
+	if (dollar_ztrigger_invoked && ((STATE == TP_COMMIT) || (STATE == TP_ROLLBACK)))					\
+		dollar_ztrigger_invoked = FALSE;										\
+	assert(!TREF(gvt_triggers_read_this_tn));										\
+	assert((FALSE == dollar_ztrigger_invoked) || (STATE == TP_RESTART) || (STATE == TP_INCR_ROLLBACK));			\
+	TP_ASSERT_ZTRIGGER_CYCLE_STATUS;											\
 }
 # ifdef DEBUG
-#  define TP_ASSERT_ZTRIGGER_CYCLE_RESET										\
+#  define TP_ASSERT_ZTRIGGER_CYCLE_STATUS										\
 {	/* At the end of a transaction commit ensure that csa->db_dztrigger_cycle is reset to zero.			\
-	 * In the case of trestart and/or rollback, this value could be 1 if $ztrigger activity happened in		\
+	 * In the case of trestart and/or rollback, this value could be 1 if $ZTRIGGER() activity happened in		\
 	 * the failed try. Because of this it is also possible the value could be 1 after a commit (that is preceded	\
 	 * by a restart). Assert this.											\
 	 * It's okay not to check if all gvt updated in this transaction also has gvt->db_dztrigger_cycle set		\
@@ -794,7 +825,7 @@ typedef struct trans_restart_hist_struct
 		assert((0 == si->tp_csa->db_dztrigger_cycle) || (1 == si->tp_csa->db_dztrigger_cycle));			\
 }
 # else
-#  define TP_ASSERT_ZTRIGGER_CYCLE_RESET
+#  define TP_ASSERT_ZTRIGGER_CYCLE_STATUS
 # endif	/* #ifdef DEBUG */
 #endif	/* #ifdef GTM_TRIGGER */
 
@@ -917,6 +948,33 @@ GBLREF	unsigned int	t_tries;
 	}														\
 }
 
+#define SAVE_REGION_INFO(SAVE_KEY, SAVE_TARGET, SAVE_CUR_REG, SAVE_SI_PTR)	\
+MBSTART {									\
+	SAVE_TARGET = gv_target;						\
+	SAVE_CUR_REG = gv_cur_region;						\
+	SAVE_SI_PTR = sgm_info_ptr;						\
+	assert(NULL != gv_currkey);						\
+	assert((SIZEOF(gv_key) + gv_currkey->end) <= SIZEOF(SAVE_KEY));		\
+	memcpy(&SAVE_KEY[0], gv_currkey, SIZEOF(gv_key) + gv_currkey->end);	\
+} MBEND
+#define RESTORE_REGION_INFO(SAVE_KEY, SAVE_TARGET, SAVE_CUR_REG, SAVE_SI_PTR)	\
+MBSTART {									\
+	gv_target = SAVE_TARGET;						\
+	sgm_info_ptr = SAVE_SI_PTR;						\
+	/* check no keysize expansion occurred inside gvcst_root_search */	\
+	assert(gv_currkey->top == SAVE_KEY[0].top);				\
+	memcpy(gv_currkey, &SAVE_KEY[0], SIZEOF(gv_key) + SAVE_KEY[0].end);	\
+	if (NULL != SAVE_CUR_REG)						\
+	{									\
+		TP_CHANGE_REG_IF_NEEDED(SAVE_CUR_REG);				\
+	} else									\
+	{									\
+		gv_cur_region = NULL;						\
+		cs_data = NULL;							\
+		cs_addrs = NULL;						\
+	}									\
+} MBEND
+
 /* Any retry transition where the destination state is the 3rd retry, we don't want to release crit, i.e. for 2nd to 3rd retry
  * transition or 3rd to 3rd retry transition. Therefore we need to release crit only if (CDB_STAGNATE - 1) > t_tries.
  */
@@ -924,7 +982,7 @@ GBLREF	unsigned int	t_tries;
 							 UNIX_ONLY(|| cdb_sc_instancefreeze == STATUS))
 
 void tp_get_cw(cw_set_element *cs, int depth, cw_set_element **cs1);
-void tp_clean_up(boolean_t rollback_flag);
+void tp_clean_up(tp_cleanup_state clnup_state);
 void tp_cw_list(cw_set_element **cs);
 void tp_get_cw(cw_set_element *cs, int depth, cw_set_element **cs1);
 void tp_incr_clean_up(uint4 newlevel);
diff --git a/sr_port/tp_clean_up.c b/sr_port/tp_clean_up.c
index ae36ab6..32d511b 100644
--- a/sr_port/tp_clean_up.c
+++ b/sr_port/tp_clean_up.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -34,28 +34,26 @@
 #include "have_crit.h"
 #include "min_max.h"
 #include "tp_frame.h"
-#ifdef GTM_TRIGGER
 #include <rtnhdr.h>
+#include "gtm_trigger_trc.h"
 #include "gv_trigger.h"		/* for TP_INVALIDATE_TRIGGER_CYCLES_IF_NEEDED macro */
 #include "util.h"		/* for TP_ZTRIGBUFF_PRINT macro */
-#endif
 
 GBLREF	sgmnt_data_ptr_t	cs_data;
 GBLREF	sgmnt_addrs		*cs_addrs;
 GBLREF	ua_list			*curr_ua, *first_ua;
 GBLREF	uint4			dollar_trestart;
+GBLREF	boolean_t		dollar_ztrigger_invoked;
 GBLREF	sgm_info		*first_tp_si_by_ftok; /* List of participating regions in the TP transaction sorted on ftok order */
 GBLREF	jnl_gbls_t		jgbl;
 GBLREF	jnl_fence_control	jnl_fence_ctl;
 GBLREF	trans_num		local_tn;
 GBLREF	global_tlvl_info	*global_tlvl_info_head;
 GBLREF	buddy_list		*global_tlvl_info_list;
-GBLREF	block_id		gtm_tp_allocation_clue;	/* block# hint to start allocation for created blocks in TP */
 GBLREF	gd_region		*gv_cur_region;
 GBLREF	gv_namehead		*gv_target_list, *gvt_tp_list;
 GBLREF	sgm_info		*sgm_info_ptr, *first_sgm_info;
 GBLREF	int			process_exiting;
-GBLREF	block_id		tp_allocation_clue;
 GBLREF	char			*update_array, *update_array_ptr;
 GBLREF	uint4			update_array_size, cumul_update_array_size;
 GBLREF	tp_frame		*tp_pointer;
@@ -70,7 +68,7 @@ GBLREF	unsigned int		t_tries;
 error_def(ERR_MEMORY);
 error_def(ERR_VMSMEMORY);
 
-void	tp_clean_up(boolean_t rollback_flag)
+void	tp_clean_up(tp_cleanup_state clnup_state)
 {
 	gv_namehead	*gvnh, *blk_target;
 	sgm_info	*si, *next_si;
@@ -97,7 +95,7 @@ void	tp_clean_up(boolean_t rollback_flag)
 	assert((NULL != first_sgm_info) || (0 == cw_stagnate.size) || cw_stagnate_reinitialized);
 		/* if no database activity, cw_stagnate should be uninitialized or reinitialized */
 #	ifdef DEBUG
-	if (rollback_flag)
+	if (TP_COMMIT != clnup_state)
 		TREF(donot_commit) = FALSE;
 	assert(!TREF(donot_commit));
 #	endif
@@ -106,6 +104,17 @@ void	tp_clean_up(boolean_t rollback_flag)
 		update_trans = 0;
 	} else
 		assert(!update_trans);
+	/* Reset trigger state now. Trigger cycles, dollar_ztrigger_invoked and gvt_triggers_read_this_tn are reset only in
+	 * TP_INVALIDATE_TRIGGER_CYCLES_IF_NEEDED. Trigger cycles and dollar_ztrigger_invoked are different from other TP level
+	 * artifacts in that they are maintained through an incremental rollback and restarts so that future trigger operations in
+	 * the current transaction recognize the invalid trigger cycles and reload triggers as necessary. Trigger cycles and
+	 * dollar_ztrigger_invoked are only reset upon a commit or a complete rollback.
+	 * Unlike other cleanup, trigger reset is not made conditional upon the existence of first_sgm_info because it is possible
+	 * for the Update Process to restart and immediately issue a complete rollback while handling an ONLINE ROLLBACK.
+	 * Please see the comment for TP_INVALIDATE_TRIGGER_CYCLES_IF_NEEDED to understand how trigger cycles and friends are
+	 * handled across commit, rollback and restarts.
+	 */
+	TP_INVALIDATE_TRIGGER_CYCLES_IF_NEEDED(clnup_state);
 	if (NULL != first_sgm_info)
 	{	/* It is possible that first_ua is NULL at this point due to a prior call to tp_clean_up() that failed in
 		 * malloc() of tmp_ua->update_array. This is possible because we might have originally had two chunks of
@@ -156,7 +165,7 @@ void	tp_clean_up(boolean_t rollback_flag)
 			}
 		}
 		RESET_UPDATE_ARRAY; /* do not use CHECK_AND_RESET_UPDATE_ARRAY since we are in TP and will fail the check there */
-		if (rollback_flag) 		/* Rollback invalidates clues in all targets used by this transaction */
+		if (TP_COMMIT != clnup_state) 		/* Rollback invalidates clues in all targets used by this transaction */
 		{
 			for (gvnh = gvt_tp_list; NULL != gvnh; gvnh = gvnh->next_tp_gvnh)
 			{
@@ -172,7 +181,6 @@ void	tp_clean_up(boolean_t rollback_flag)
 				/* Cleanup any block-split info (of created block #) in gvtarget histories */
 				TP_CLEANUP_GVNH_SPLIT_IF_NEEDED(gvnh, 0);
 			}
-			GTMTRIG_ONLY(TP_INVALIDATE_TRIGGER_CYCLES_IF_NEEDED(FALSE, FALSE));
 #			ifdef DEBUG
 			if (!process_exiting)
 			{	/* Ensure that we did not miss out on resetting clue for any gvtarget.
@@ -191,18 +199,7 @@ void	tp_clean_up(boolean_t rollback_flag)
 			}
 #			endif
 			local_tn++;	/* to effectively invalidate first_tp_srch_status of all gv_targets */
-			tp_allocation_clue = gtm_tp_allocation_clue;	/* Reset clue to what it was at beginning of transaction */
-		} else
-		{
-			GTMTRIG_ONLY(TP_INVALIDATE_TRIGGER_CYCLES_IF_NEEDED(FALSE, TRUE));
-			gtm_tp_allocation_clue = tp_allocation_clue;	/* Update tp allocation clue for next transaction to skip
-									 * past values used in this transaction now that this one
-									 * is successfully committed.
-									 */
 		}
-		GTMTRIG_ONLY(assert(!TREF(gvt_triggers_read_this_tn));)
-		/* Assert that for all regions, we have csa->db_dztrigger_cycle = 0 or 1 (based on commit/restart/rollback) */
-		GTMTRIG_ONLY(TP_ASSERT_ZTRIGGER_CYCLE_RESET;)
 		for (si = first_sgm_info;  si != NULL;  si = next_si)
 		{
 			TP_TEND_CHANGE_REG(si);
@@ -227,7 +224,7 @@ void	tp_clean_up(boolean_t rollback_flag)
 				 * inctn_tp_upd_no_logical_rec) was written. So reset cs_addrs->next_fenced unconditionally.
 				 */
 				cs_addrs->next_fenced = NULL;
-				if (FALSE == rollback_flag)
+				if (TP_COMMIT == clnup_state)
 				{	/* Non-rollback case (op_tcommit) validates clues in the targets we are updating */
 					sgm_info_ptr = si;	/* for tp_get_cw to work */
 					is_mm = (dba_mm == gv_cur_region->dyn.addr->acc_meth);
@@ -348,7 +345,7 @@ void	tp_clean_up(boolean_t rollback_flag)
 				si->first_cw_set = si->last_cw_set = si->first_cw_bitmap = NULL;
 				si->cw_set_depth = 0;
 				si->update_trans = 0;
-			} else if (rollback_flag)
+			} else if (TP_COMMIT != clnup_state)
 				REINITIALIZE_LIST(si->tlvl_info_list);		/* reinitialize the tlvl_info buddy_list */
 #			ifdef DEBUG
 			/* Verify that all fields that were reset in the if code above are already at the reset value.
@@ -387,18 +384,11 @@ void	tp_clean_up(boolean_t rollback_flag)
 		{	/* Ensure that we did not miss out on clearing any gv_target->root which had chain.flag set.
 			 * Dont do this if the process is cleaning up the TP transaction as part of exit handling
 			 * Also use this opportunity to check that non-zero clues for BG contain non-null cr in histories.
-			 * In addition, check that the list of multi-level block numbers (involved in the most recent split
-			 * operations) stored in the gv_target are valid block #s.
 			 */
 			for (gvnh = gv_target_list; NULL != gvnh; gvnh = gvnh->next_gvnh)
 			{
 				chain1 = *(off_chain *)&gvnh->root;
 				assert(!chain1.flag);
-				for (level = 0; level < ARRAYSIZE(gvnh->last_split_blk_num); level++)
-				{
-					chain1 = *(off_chain *)&gvnh->last_split_blk_num[level];
-					assert(!chain1.flag);
-				}
 				/* If there was a gvnh->write_local_tn, we could assert that if ever that field was updated
 				 * in this transaction, then gvnh->root better be non-zero. Otherwise gvnh could have been
 				 * used only for reads in this TP and in that case it is ok for the root to be 0.
@@ -407,7 +397,6 @@ void	tp_clean_up(boolean_t rollback_flag)
 				{	/* check that gv_target->root falls within total blocks range */
 					csa = gvnh->gd_csa;
 					assert(NULL != csa);
-					NON_GTM_TRUNCATE_ONLY(assert(gvnh->root < csa->ti->total_blks));
 					assert(!IS_BITMAP_BLK(gvnh->root));
 				}
 				if (gvnh->clue.end)
@@ -428,12 +417,10 @@ void	tp_clean_up(boolean_t rollback_flag)
 #		endif
 		jgbl.cumul_jnl_rec_len = 0;
 		jgbl.tp_ztp_jnl_upd_num = 0;
-		GTMTRIG_ONLY(
-			/* reset jgbl.prev_ztworm_ptr as we are now ready to start a new transaction
-			 * and thus need to write new ztwormhole records if needed
-			 */
-			jgbl.prev_ztworm_ptr = NULL;
-		)
+		/* reset jgbl.prev_ztworm_ptr as we are now ready to start a new transaction
+		 * and thus need to write new ztwormhole records if needed
+		 */
+		jgbl.prev_ztworm_ptr = NULL;
 		DEBUG_ONLY(jgbl.cumul_index = jgbl.cu_jnl_index = 0;)
 		global_tlvl_info_head = NULL;
 		REINITIALIZE_LIST(global_tlvl_info_list);		/* reinitialize the global_tlvl_info buddy_list */
@@ -451,18 +438,16 @@ void	tp_clean_up(boolean_t rollback_flag)
 	/* Now that this transaction try is done (need to start a fresh try in case of a restart; in case of commit the entire
 	 * transaction is done) ensure first_tp_si_by_ftok is NULL at end of tp_clean_up as this field is relied upon by
 	 * secshr_db_clnup and t_commit_cleanup to determine if we have an ongoing transaction. In case of a successfully
-	 * committing transaction (rollback_flag == FALSE), this should be guaranteed already. So we might need to do the reset
-	 * only in case rollback_flag == TRUE but since that is an if condition which involves a pipeline break we avoid it by
+	 * committing transaction (clnup_state == TP_COMMIT), this should be guaranteed already. So we might need to do the reset
+	 * only in case clnup_state != TP_COMMIT but since that is an if condition which involves a pipeline break we avoid it by
 	 * doing the set to NULL unconditionally.
 	 */
-	assert(rollback_flag || (NULL == first_tp_si_by_ftok));
+	assert(TP_COMMIT != (clnup_state) || (NULL == first_tp_si_by_ftok));
 	first_tp_si_by_ftok = NULL;
 	ENABLE_INTERRUPTS(INTRPT_IN_TP_CLEAN_UP, prev_intrpt_state);	/* Allow MUPIP STOP/signals from now on */
-#	ifdef GTM_TRIGGER
-	if (!rollback_flag)
+	if (TP_COMMIT == clnup_state)
 	{
 		TP_ZTRIGBUFF_PRINT; /* TP is committed so print $ZTRIGGER/MUPIP-TRIGGER activity output in this tn */
 	} else
 		TREF(ztrigbuffLen) = 0;
-#	endif
 }
diff --git a/sr_port/tp_hist.c b/sr_port/tp_hist.c
index 963118e..3528f10 100755
--- a/sr_port/tp_hist.c
+++ b/sr_port/tp_hist.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -84,24 +85,25 @@ void	gds_tp_hist_moved(sgm_info *si, srch_hist *hist1);
 
 enum cdb_sc tp_hist(srch_hist *hist1)
 {
-	int 		hist_index;
-	srch_hist	*hist;
-	off_chain	chain;
-	srch_blk_status	*t1, *t2;
-	block_id	blk;
-	srch_blk_status	*local_hash_entry;
-	enum cdb_sc	status = cdb_sc_normal;
-	boolean_t	is_mm, store_history, was_crit;
-	sgm_info	*si;
-	ht_ent_int4	*tabent, *lookup_tabent;
-	cw_set_element	*cse;
-	cache_rec_ptr_t	cr;
-	sgmnt_addrs	*csa;
+	int			hist_index;
+	srch_hist		*hist;
+	off_chain		chain;
+	srch_blk_status		*t1, *t2;
+	block_id		blk;
+	srch_blk_status		*local_hash_entry;
+	enum cdb_sc		status = cdb_sc_normal;
+	boolean_t		is_mm, store_history, was_crit;
+	sgm_info		*si;
+	ht_ent_int4		*tabent, *lookup_tabent;
+	cw_set_element		*cse;
+	cache_rec_ptr_t		cr;
+	sgmnt_addrs		*csa;
+	node_local_ptr_t	cnl;
 #	ifdef DEBUG
-	boolean_t	wc_blocked;
-	boolean_t	ready2signal_gvundef_lcl;
+	boolean_t		wc_blocked;
+	boolean_t		ready2signal_gvundef_lcl;
 #	endif
-	gv_namehead	*gvt;	/* store local copy of global "gv_target" for faster access */
+	gv_namehead		*gvt;	/* store local copy of global "gv_target" for faster access */
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
@@ -116,6 +118,7 @@ enum cdb_sc tp_hist(srch_hist *hist1)
 	assert((NULL != sgm_info_ptr) && (cs_addrs->sgm_info_ptr == sgm_info_ptr));
 	si = sgm_info_ptr;
 	csa = si->tp_csa;
+	cnl = csa->nl;
 	gvt = gv_target;
 	store_history = (!gvt->noisolation || ERR_GVKILLFAIL == t_err || ERR_GVPUTFAIL == t_err);
 	assert(hist1 != &gvt->hist);
@@ -186,10 +189,10 @@ enum cdb_sc tp_hist(srch_hist *hist1)
 				/* Assert that cr->in_tend is never equal to our process_id since at this point we should
 				 * never have locked a buffer for phase2 commit. The only exception is if the previous
 				 * transaction by this process had a commit-time error and secshr_db_clnup finished the
-				 * transaction and had set csa->nl->wc_blocked to TRUE. It is possible in that case no process
+				 * transaction and had set cnl->wc_blocked to TRUE. It is possible in that case no process
 				 * has yet done a cache-recovery by the time we come to tp_hist as part of the next transaction
 				 * in which case cr->in_tend could still be pointing to our process_id. Note that
-				 * csa->nl->wc_blocked could be changing concurrently so need to note it down in a local
+				 * cnl->wc_blocked could be changing concurrently so need to note it down in a local
 				 * variable BEFORE checking the value of cr->in_tend.
 				 */
 				DEBUG_ONLY(wc_blocked = cs_addrs->nl->wc_blocked;)
@@ -219,7 +222,7 @@ enum cdb_sc tp_hist(srch_hist *hist1)
 						status = cdb_sc_blkmod;
 						BREAK_IN_PRO__CONTINUE_IN_DBG;
 					} else
-					{	/* In case of VMS, it is possible we (gvcst_search) could have been looking at
+					{	/* In case of twinning, it is possible we (gvcst_search) could have been looking at
 						 * a newly formed twin buffer while setting the first_rec portion of the clue.
 						 * It is possible that the twin buffer was obtained by a db_csh_getn and that
 						 * it does not yet contain the records of the block we were interested in. This
@@ -232,14 +235,14 @@ enum cdb_sc tp_hist(srch_hist *hist1)
 						 * "recompute_upd_array" function) so a similar reset of the first_rec needs to
 						 * happen there too.
 						 *
-						 * In Unix, there is no twinning so we dont have that issue. But it is possible
-						 * that if gvcst_search is reading from a buffer that is being modified
-						 * concurrently, it could pick up the first half of first_rec from the pre-update
-						 * copy of the block and the second half of first_rec from the post-update copy of
-						 * the block. Depending on the actual byte sequences, it is possible that this
-						 * mixed first_rec is LESSER than the correct value. This could therefore cause
-						 * DBKEYORD integ errors in case this is used for the next transaction. It is
-						 * therefore necessary to invalidate the first_rec in this case (C9J07-003162).
+						 * Even if there is no twinning, it is possible that if gvcst_search is reading
+						 * from a buffer that is being modified concurrently, it could pick up the first
+						 * half of first_rec from the pre-update copy of the block and the second half of
+						 * first_rec from the post-update copy of the block. Depending on the actual byte
+						 * sequences, it is possible that this mixed first_rec is LESSER than the correct
+						 * value. This could therefore cause DBKEYORD integ errors in case this is used
+						 * for the next transaction. It is therefore necessary to invalidate the first_rec
+						 * in this case (C9J07-003162).
 						 */
 						if (gvt->clue.end)
 							GVT_CLUE_INVALIDATE_FIRST_REC(gvt);
@@ -287,8 +290,7 @@ enum cdb_sc tp_hist(srch_hist *hist1)
 				if ((t1 != t2) && t1->cr)
 				{
 					assert(((sm_long_t)GDS_REL2ABS(t1->cr->buffaddr) == (sm_long_t)t1->buffaddr)
-						UNIX_ONLY(|| (0 != csa->nl->onln_rlbk_pid)
-							  || MISMATCH_ROOT_CYCLES(csa, csa->nl)));
+						|| (0 != cnl->onln_rlbk_pid) || MISMATCH_ROOT_CYCLES(csa, cnl));
 					if (t1->cycle != t1->cr->cycle)
 					{
 						assert(CDB_STAGNATE > t_tries);
@@ -300,8 +302,7 @@ enum cdb_sc tp_hist(srch_hist *hist1)
 				if (cr)
 				{
 					assert(((sm_long_t)GDS_REL2ABS(cr->buffaddr) == (sm_long_t)t2->buffaddr)
-						UNIX_ONLY( || (0 != csa->nl->onln_rlbk_pid)
-							   || MISMATCH_ROOT_CYCLES(csa, csa->nl)));
+						|| (0 != cnl->onln_rlbk_pid) || MISMATCH_ROOT_CYCLES(csa, cnl));
 					if (t2->cycle != cr->cycle)
 					{
 						assert(CDB_STAGNATE > t_tries);
@@ -432,8 +433,7 @@ enum cdb_sc tp_hist(srch_hist *hist1)
 			for (t1 = hist->h; HIST_TERMINATOR != (blk = t1->blk_num); t1++)
 			{
 				t2 = t1->first_tp_srch_status ? t1->first_tp_srch_status : t1;
-				assert((t2->tn <= t1->tn) UNIX_ONLY(|| (0 != csa->nl->onln_rlbk_pid)
-								    || MISMATCH_ROOT_CYCLES(csa, csa->nl)));
+				assert((t2->tn <= t1->tn) || (0 != cnl->onln_rlbk_pid) || MISMATCH_ROOT_CYCLES(csa, cnl));
 				/* Take this time to also check that gv_targets match between t1 and t2.
 				 * If they dont, the restart should be detected in tp_tend.
 				 * Set the flag donot_commit to catch the case this does not restart.
@@ -444,8 +444,7 @@ enum cdb_sc tp_hist(srch_hist *hist1)
 		}
 #		endif
 	}
-#	ifdef UNIX
-	if (MISMATCH_ROOT_CYCLES(csa, csa->nl))
+	if (MISMATCH_ROOT_CYCLES(csa, cnl))
 	{	/* We want to sync the online rollback cycles ONLY under crit. So, grab_crit and sync the
 		 * cycles. While grab_crit_immediate would have been a better choice, the reason we don't use
 		 * grab_crit_immediate here is because if we don't sync cycles because we don't hold crit but
@@ -460,10 +459,10 @@ enum cdb_sc tp_hist(srch_hist *hist1)
 		if (!was_crit)
 			grab_crit(gv_cur_region);
 		status = cdb_sc_gvtrootmod2;
-		if (MISMATCH_ONLN_RLBK_CYCLES(csa, csa->nl))
+		if (MISMATCH_ONLN_RLBK_CYCLES(csa, cnl))
 		{
 			assert(!mupip_jnl_recover);
-			status = ONLN_RLBK_STATUS(csa, csa->nl);
+			status = ONLN_RLBK_STATUS(csa, cnl);
 			SYNC_ONLN_RLBK_CYCLES;
 			SYNC_ROOT_CYCLES(NULL);
 		} else
@@ -471,7 +470,11 @@ enum cdb_sc tp_hist(srch_hist *hist1)
 		if (!was_crit)
 			rel_crit(gv_cur_region);
 	}
-#	endif
+	if (si->start_tn <= cnl->last_wcs_recover_tn)
+	{
+		status = cdb_sc_wcs_recover;
+		assert(CDB_STAGNATE > t_tries);
+	}
 	/* If validation has succeeded, assert that if gtm_gvundef_fatal is non-zero, then we better not signal a GVUNDEF */
 	assert((cdb_sc_normal != status) || !TREF(gtm_gvundef_fatal) || !ready2signal_gvundef_lcl);
 	ADD_TO_GVT_TP_LIST(gvt, RESET_FIRST_TP_SRCH_STATUS_FALSE);	/* updates gvt->read_local_tn & adds gvt to gvt_tp_list
diff --git a/sr_port/tp_incr_clean_up.c b/sr_port/tp_incr_clean_up.c
index 4d03ab0..5a3426a 100644
--- a/sr_port/tp_incr_clean_up.c
+++ b/sr_port/tp_incr_clean_up.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2014 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -27,10 +28,9 @@
 #include "copy.h"
 #include "longset.h"		/* also needed for cws_insert.h */
 #include "cws_insert.h"		/* for cw_stagnate_reinitialized */
-#ifdef GTM_TRIGGER
 #include <rtnhdr.h>
+#include "gtm_trigger_trc.h"
 #include "gv_trigger.h"		/* for TP_INVALIDATE_TRIGGER_CYCLES_IF_NEEDED macro */
-#endif
 
 GBLREF	sgm_info		*first_sgm_info;
 GBLREF	sgm_info		*sgm_info_ptr;
@@ -203,7 +203,7 @@ void tp_incr_clean_up(uint4 newlevel)
 		}
 		DEBUG_ONLY(if (!si->update_trans) DBG_CHECK_SI_BUDDY_LIST_IS_REINITIALIZED(si);)
 	}
-	GTMTRIG_ONLY(TP_INVALIDATE_TRIGGER_CYCLES_IF_NEEDED(TRUE, FALSE);)
+	TP_INVALIDATE_TRIGGER_CYCLES_IF_NEEDED(TP_INCR_ROLLBACK);
 	/* After an incremental rollback, it is possible that some gv_targets now have a block-split history that reflects
 	 * a created block number that is no longer relevant due to the rollback. Fix those as needed.
 	 */
diff --git a/sr_port/tp_restart.c b/sr_port/tp_restart.c
index 65b998a..17f001e 100644
--- a/sr_port/tp_restart.c
+++ b/sr_port/tp_restart.c
@@ -452,6 +452,7 @@ int tp_restart(int newlevel, boolean_t handle_errors_internally)
 			case cdb_sc_onln_rlbk2:
 			case cdb_sc_instancefreeze:
 			case cdb_sc_gvtrootmod2:
+			case cdb_sc_gvtrootnonzero:
 			case cdb_sc_optrestart:
 				assert(IS_FINAL_RETRY_CODE(status));
 				if (CDB_STAGNATE <= t_tries)
@@ -595,7 +596,7 @@ int tp_restart(int newlevel, boolean_t handle_errors_internally)
 		if (FALSE == tf->restartable && IS_MCODE_RUNNING)
 			getzposition(TADR(tp_restart_entryref));
 		/* Do a rollback type cleanup (invalidate gv_target clues of read as well as updated blocks) */
-		tp_clean_up(TRUE);
+		tp_clean_up(TP_RESTART);
 		/* Note: At this point, we are ready to begin the next retry. While we can sync the trigger cycles now to avoid
 		 * further restarts, we don't need to because tp_set_sgm (done for each region that is updated in a TP transaction)
 		 * does the syncing anyways.
diff --git a/sr_port/tp_set_sgm.c b/sr_port/tp_set_sgm.c
old mode 100755
new mode 100644
index 6a3f0c6..89bbbf9
--- a/sr_port/tp_set_sgm.c
+++ b/sr_port/tp_set_sgm.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -29,10 +30,9 @@
 #include "gtm_trigger_trc.h"
 #endif
 
-GBLDEF	sgm_info	*sgm_info_ptr;
-GBLDEF	tp_region	*tp_reg_free_list;	/* Ptr to list of tp_regions that are unused */
-GBLDEF  tp_region	*tp_reg_list;		/* Ptr to list of tp_regions for this transaction */
-
+GBLREF	sgm_info		*sgm_info_ptr;
+GBLREF	tp_region		*tp_reg_free_list;	/* Ptr to list of tp_regions that are unused */
+GBLREF  tp_region		*tp_reg_list;		/* Ptr to list of tp_regions for this transaction */
 GBLREF	short			crash_count;
 GBLREF	sgm_info		*first_sgm_info;
 GBLREF	gd_region		*gv_cur_region;
@@ -58,10 +58,13 @@ void tp_set_sgm(void)
 	{
 		si->next_sgm_info = first_sgm_info;
 		first_sgm_info = si;
-		si->start_tn = csa->ti->curr_tn;
 		if (csa->critical)
 			si->crash_count = csa->critical->crashcnt;
 		insert_region(gv_cur_region, &tp_reg_list, &tp_reg_free_list, SIZEOF(tp_region));
+		/* Note down "si->start_tn" AFTER the "insert_region" call in case it does a "grab_crit_immediate/wcs_recover"
+		 * call and bumps csa->ti->curr_tn. Otherwise we would end up with a cdb_sc_wcs_recover failure code.
+		 */
+		si->start_tn = csa->ti->curr_tn;
 		/* In case triggers are supported, make sure we start with latest copy of file header's db_trigger_cycle
 		 * to avoid unnecessary cdb_sc_triggermod type of restarts.
 		 */
diff --git a/sr_port/tp_tend.c b/sr_port/tp_tend.c
old mode 100755
new mode 100644
index 2718a4c..fc02c5c
--- a/sr_port/tp_tend.c
+++ b/sr_port/tp_tend.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -79,9 +79,7 @@
 #include "repl_instance.h"
 #endif
 #include "shmpool.h"
-#ifdef GTM_SNAPSHOT
 #include "db_snapshot.h"
-#endif
 #include "is_proc_alive.h"
 #include "process_reorg_encrypt_restart.h"
 
@@ -116,6 +114,7 @@ GBLREF	gv_namehead		*gv_target;
 GBLREF	trans_num		local_tn;	/* transaction number for THIS PROCESS */
 GBLREF	uint4			process_id;
 GBLREF	sgmnt_addrs		*reorg_encrypt_restart_csa;
+GBLREF unsigned char		rdfail_detail;
 #ifdef UNIX
 GBLREF	recvpool_addrs		recvpool;
 GBLREF	int4			strm_index;
@@ -164,7 +163,7 @@ error_def(ERR_TEXT);
 	}											\
 }
 
-boolean_t	reallocate_bitmap(sgm_info *si, cw_set_element *bml_cse);
+enum cdb_sc	reallocate_bitmap(sgm_info *si, cw_set_element *bml_cse);
 enum cdb_sc	recompute_upd_array(srch_blk_status *hist1, cw_set_element *cse);
 
 boolean_t	tp_crit_all_regions()
@@ -214,11 +213,11 @@ boolean_t	tp_crit_all_regions()
 						 * cycles are in sync and crit is obtained. We cannot do that here as with TP
 						 * and multiple regions, we might end up calling "grab_crit_encr_cycle_sync"
 						 * for a region while holding crit on one or more previous regions and the
-						 * encryption keys need to be resynced. We dont want to do that while holding
+						 * encryption keys need to be resynced. We don't want to do that while holding
 						 * crit on any region. So take care of that explicitly here just like csd->freeze.
 						 */
 			assert(!(tmpsi->update_trans & ~UPDTRNS_VALID_MASK));
-			if (tmpcsd->freeze && tmpsi->update_trans)
+			if (FROZEN_HARD(tmpcsd) && tmpsi->update_trans)
 			{
 				tr = tr->fPtr;		/* Increment so we release the crit lock we actually got */
 				x_lock = FALSE;
@@ -294,7 +293,7 @@ boolean_t	tp_tend()
 	boolean_t		save_dont_reset_gbl_jrec_time;
 	uint4			jnl_status, leafmods, indexmods;
 	uint4			total_jnl_rec_size, in_tend;
-	uint4			update_trans;
+	uint4			lcl_update_trans;
 	jnlpool_ctl_ptr_t	jpl;
 	jnlpool_write_ctx_t 	jplctx;
 	boolean_t		read_before_image; /* TRUE if before-image journaling or online backup in progress */
@@ -365,7 +364,7 @@ boolean_t	tp_tend()
 		 * 	(b) If we are in the final retry and we don't hold crit on some region.
 		 * 	(c) If we are in the final retry and we hold crit on a frozen region that we want to update.
 		 * 		This is possible if:
-		 *		(1) We did a grab_crit_immediate() through one of the gvcst_* routines when we first encountered the
+		 *		(1) We did a "grab_crit_immediate" through one of the gvcst_* routines when we first encountered the
 		 *		    region in the TP transaction and it wasn't locked down although it was frozen then.
 		 *		(2) tp_crit_all_regions notices that at least one of the participating regions did ONLY READs, it
 		 *		    will not wait for any freeze on THAT region to complete before grabbing crit. Later, in the
@@ -377,12 +376,12 @@ boolean_t	tp_tend()
 		 *	Note that in case of an online mupip journal rollback/recover, we will hold onto crit for the entire life
 		 *	of the process so that needs to be taken into account below.
 		 */
-		update_trans = si->update_trans;
-		assert(!(update_trans & ~UPDTRNS_VALID_MASK));
-		assert((UPDTRNS_JNL_LOGICAL_MASK & update_trans) || (NULL == si->jnl_head));
-		assert(!(UPDTRNS_JNL_LOGICAL_MASK & update_trans) || (NULL != si->jnl_head));
-		assert(!tr->reg->read_only || !update_trans);
-		region_is_frozen = (update_trans && csd->freeze);
+		lcl_update_trans = si->update_trans;
+		assert(!(lcl_update_trans & ~UPDTRNS_VALID_MASK));
+		assert((UPDTRNS_JNL_LOGICAL_MASK & lcl_update_trans) || (NULL == si->jnl_head));
+		assert(!(UPDTRNS_JNL_LOGICAL_MASK & lcl_update_trans) || (NULL != si->jnl_head));
+		assert(!tr->reg->read_only || !lcl_update_trans);
+		region_is_frozen = (lcl_update_trans && FROZEN_HARD(csd));
 		if ((CDB_STAGNATE > t_tries)
 				? (csa->now_crit && !csa->hold_onto_crit)
 				: (!csa->now_crit || region_is_frozen))
@@ -400,11 +399,11 @@ boolean_t	tp_tend()
 			goto failed_skip_revert;
 		}
 		/* Whenever si->first_cw_set is non-NULL, ensure that update_trans is non-zero */
-		assert((NULL == si->first_cw_set) || update_trans);
+		assert((NULL == si->first_cw_set) || lcl_update_trans);
 		/* Whenever si->first_cw_set is NULL, ensure that si->update_trans is FALSE. See op_tcommit.c for exceptions */
 		assert((NULL != si->first_cw_set) || !si->update_trans || (UPDTRNS_ZTRIGGER_MASK & si->update_trans)
 			|| (gvdupsetnoop && (!JNL_ENABLED(csa) || (NULL != si->jnl_head))));
-		if (!update_trans)
+		if (!lcl_update_trans)
 		{
 			/* See if we can take a fast path for read transactions based on the following conditions :
 			 * 1. If the transaction number hasn't changed since we read the blocks from the disk or cache
@@ -509,17 +508,17 @@ boolean_t	tp_tend()
 	 * after the loop above
 	 */
 	first_tp_si_by_ftok = tmp_first_tp_si_by_ftok;
-	DEBUG_ONLY(
-		/* Cross-check the validity of the ftok sorted sgm_info list with "tp_reg_list" */
-		tr = tp_reg_list;
-		for (si = first_tp_si_by_ftok;  (NULL != si);  si = si->next_tp_si_by_ftok)
-		{
-			tmpsi = (sgm_info *)(FILE_INFO(tr->reg)->s_addrs.sgm_info_ptr);
-			assert(tmpsi == si);
-			tr = tr->fPtr;
-		}
-		assert(NULL == tr);
-	)
+#	ifdef DEBUG
+	/* Cross-check the validity of the ftok sorted sgm_info list with "tp_reg_list" */
+	tr = tp_reg_list;
+	for (si = first_tp_si_by_ftok;  (NULL != si);  si = si->next_tp_si_by_ftok)
+	{
+		tmpsi = (sgm_info *)(FILE_INFO(tr->reg)->s_addrs.sgm_info_ptr);
+		assert(tmpsi == si);
+		tr = tr->fPtr;
+	}
+	assert(NULL == tr);
+#	endif
 	assert(cdb_sc_normal == status);
 	/* The following section of code (initial part of the for loop) is similar to the function "tp_crit_all_regions".
 	 * The duplication is there only because of performance reasons. The latter function has to go through tp_reg_list
@@ -552,11 +551,11 @@ boolean_t	tp_tend()
 					BG_TRACE_ANY(csa, tp_crit_retries);
 				}
 			)
-			update_trans = si->update_trans;
-			assert(!(update_trans & ~UPDTRNS_VALID_MASK));
+			lcl_update_trans = si->update_trans;
+			assert(!(lcl_update_trans & ~UPDTRNS_VALID_MASK));
 			first_cw_set = si->first_cw_set;
 			/* whenever si->first_cw_set is non-NULL, ensure that si->update_trans is non-zero */
-			assert((NULL == first_cw_set) || update_trans);
+			assert((NULL == first_cw_set) || lcl_update_trans);
 			/* When si->first_cw_set is NULL, ensure that si->update_trans is FALSE. See op_tcommit.c for exceptions */
 			assert((NULL != si->first_cw_set) || !si->update_trans || (UPDTRNS_ZTRIGGER_MASK & si->update_trans)
 				|| (gvdupsetnoop && (!JNL_ENABLED(csa) || (NULL != si->jnl_head))));
@@ -587,7 +586,7 @@ boolean_t	tp_tend()
 			 * that they become frozen just before we grab crit. In this case (should be rare though) release
 			 * crit on ALL regions that we have grabbed uptil this point and wait for the freeze to be removed.
 			 */
-			if (csd->freeze && update_trans)
+			if (FROZEN_HARD(csd) && lcl_update_trans)
 			{
 				x_lock = FALSE;
 				break;
@@ -623,7 +622,7 @@ boolean_t	tp_tend()
 				 */
 				/* Triggers can be invoked only by GT.M and Update process. Out of these, we expect only
 				 * GT.M to see restarts due to concurrent trigger changes. Update process is the only
-				 * updater on the secondary so we dont expect it to see any concurrent trigger changes.
+				 * updater on the secondary so we don't expect it to see any concurrent trigger changes.
 				 * The only exception is if this is a supplementary root primary instance. In that case,
 				 * the update process coexists with GT.M processes and hence can see restarts due to
 				 * concurrent trigger changes. Assert accordingly.
@@ -646,7 +645,7 @@ boolean_t	tp_tend()
 						cnl, csa, csd, status, process_id);
 				goto failed;
 			}
-			if (update_trans)
+			if (lcl_update_trans)
 			{
 				assert((NULL == first_cw_set) || (0 != si->cw_set_depth));
 #				ifdef DEBUG
@@ -663,7 +662,7 @@ boolean_t	tp_tend()
 				if (JNL_ALLOWED(csa))
 				{
 					if ((csa->jnl_state != csd->jnl_state) || (csa->jnl_before_image != csd->jnl_before_image))
-					{	/* Take this opportunity to check/sync ALL regions where csa/csd dont match */
+					{	/* Take this opportunity to check/sync ALL regions where csa/csd don't match */
 						for (tmpsi = first_tp_si_by_ftok;
 							(NULL != tmpsi);
 							tmpsi = tmpsi->next_tp_si_by_ftok)
@@ -702,9 +701,7 @@ boolean_t	tp_tend()
 				if (NULL != first_cw_set)
 				{
 					ss_need_to_restart = new_bkup_started = FALSE;
-					GTM_SNAPSHOT_ONLY(
-						CHK_AND_UPDATE_SNAPSHOT_STATE_IF_NEEDED(csa, cnl, ss_need_to_restart);
-					)
+					CHK_AND_UPDATE_SNAPSHOT_STATE_IF_NEEDED(csa, cnl, ss_need_to_restart);
 					CHK_AND_UPDATE_BKUP_STATE_IF_NEEDED(cnl, csa, new_bkup_started);
 					if (ss_need_to_restart
 						|| (new_bkup_started && !(JNL_ENABLED(csa) && csa->jnl_before_image)))
@@ -754,7 +751,7 @@ boolean_t	tp_tend()
 					 * This is necessary to ensure that timestamps of successive journal records for each
 					 * database file are in non-decreasing order. A side-effect of this is that our recorded
 					 * time might not accurately reflect the current system time but that is considered not
-					 * an issue since we dont expect to be off by more than a second or two if at all.
+					 * an issue since we don't expect to be off by more than a second or two if at all.
 					 * Another side effect is that even if the system time went back, we will never write
 					 * out-of-order timestamped journal records in the lifetime of this database shared memory.
 					 */
@@ -771,7 +768,7 @@ boolean_t	tp_tend()
 					 * mur_output_record would have already set this.
 					 */
 					assert(jgbl.gbl_jrec_time);
-					jnl_status = jnl_ensure_open();
+					jnl_status = jnl_ensure_open(gv_cur_region, csa);
 					GTM_WHITE_BOX_TEST(WBTEST_TP_TEND_JNLFILOPN, jnl_status, ERR_JNLFILOPN);
 					if (jnl_status != 0)
 					{
@@ -805,8 +802,8 @@ boolean_t	tp_tend()
 						}
 						assert(csd == csa->hdr);	/* If MM, csd shouldn't have been reset */
 					}
-					if (JNL_HAS_EPOCH(jbp)
-						&& ((jbp->next_epoch_time <= jgbl.gbl_jrec_time) UNCONDITIONAL_EPOCH_ONLY(|| TRUE)))
+					if (((jbp->next_epoch_time <= jgbl.gbl_jrec_time) UNCONDITIONAL_EPOCH_ONLY(|| TRUE))
+						&& !FROZEN_CHILLED(csd))
 					{	/* Flush the cache. Since we are in crit, defer syncing the epoch */
 						/* Note that at this point, jgbl.gbl_jrec_time has been computed taking into
 						 * account the current system time & the last journal record timestamp of ALL
@@ -973,7 +970,7 @@ boolean_t	tp_tend()
 							TP_TRACE_HIST(t1->blk_num, t1->blk_target);
 							goto failed;
 						}
-						assert(update_trans);	/* ensure read_before_image was computed above */
+						assert(lcl_update_trans);	/* ensure read_before_image was computed above */
 						if (!cse->new_buff || read_before_image)
 						{
 							if ((NULL == cr) || (cr->cycle != t1->cycle)
@@ -1000,7 +997,7 @@ boolean_t	tp_tend()
 							 * It is possible that t1->cse is non-NULL even though we eventually
 							 * decided NOT to update that particular block e.g. if t1->cse->mode
 							 * was originally t_write but later got set to kill_t_write. In such
-							 * cases, dont set in_cw_set as we dont need this buffer pinned at all.
+							 * cases, don't set in_cw_set as we don't need this buffer pinned at all.
 							 */
 							assert(n_gds_t_op != cse->mode);
 							assert(kill_t_create > n_gds_t_op);
@@ -1052,10 +1049,10 @@ boolean_t	tp_tend()
 				assert(!cse->high_tlevel);
 				if (is_mm)
 				{
-					if ((cse->tn <= ((blk_hdr_ptr_t)cse->old_block)->tn) && !reallocate_bitmap(si, cse))
+					if ((cse->tn <= ((blk_hdr_ptr_t)cse->old_block)->tn)
+						&& (status = reallocate_bitmap(si, cse)))	/* WARNING assignment */
 					{
 						assert(CDB_STAGNATE > t_tries);
-						status = cdb_sc_bmlmod;
 						TP_TRACE_HIST(cse->blk, NULL);
 						goto failed;
 					}
@@ -1065,10 +1062,9 @@ boolean_t	tp_tend()
 					bt = bt_get(tp_blk);
 					if (NULL != bt)
 					{
-						if ((cse->tn <= bt->tn) && !reallocate_bitmap(si, cse))
-						{
+						if ((cse->tn <= bt->tn) && (status = reallocate_bitmap(si, cse)))
+						{	/* WARNING assignment above */
 							assert(CDB_STAGNATE > t_tries);
-							status = cdb_sc_bmlmod;
 							TP_TRACE_HIST(tp_blk, NULL);
 							goto failed;
 						}
@@ -1219,7 +1215,7 @@ boolean_t	tp_tend()
 			 * occurs in the midst of commit and we end up invoking secshr_db_clnup which in turn will invoke
 			 * sec_shr_blk_build for these cses and that will expect that cse->new_buff be non-zero. For Unix
 			 * we invoke get_new_free_element to initialize cse->new_buff in secshr_db_clnup itself. But for VMS
-			 * we dont want this routine invoked in the privileged GTMSECSHR image so we do this beforehand.
+			 * we don't want this routine invoked in the privileged GTMSECSHR image so we do this beforehand.
 			 */
 			if (tp_has_kill_t_cse)
 			{
@@ -1396,7 +1392,7 @@ boolean_t	tp_tend()
 			{
 				for (jfb = si->jnl_head; NULL != jfb; jfb = jfb->next)
 				{
-					/* ZTWORMHOLE will have same update_num as following SET/KILL record so dont double count */
+					/* ZTWORMHOLE has same update_num as following SET/KILL record so don't double count */
 					if (IS_ZTWORM(jfb->rectype))
 						continue;
 					upd_num = ((struct_jrec_upd *)(jfb->buff))->update_num;
@@ -1441,6 +1437,15 @@ boolean_t	tp_tend()
 		ctn = csd->trans_hist.curr_tn;
 		ASSERT_CURR_TN_EQUALS_EARLY_TN(csa, ctn);
 		csd->trans_hist.early_tn = ctn + 1;
+		/* If this process had used "cnl->tp_hint" and done some block allocations in "bm_getfree", now that
+		 * all history validation is complete and this transaction is going to commit, take this opportunity
+		 * to update the shared memory hint to reflect this process' allocations in this TP transaction.
+		 */
+		if (csa->tp_hint)
+		{
+			cnl = csa->nl;
+			cnl->tp_hint = csa->tp_hint;	/* update the region hint to reflect any (successful) allocations */
+		}
 		com_csum = 0;
 		/* Write non-logical records (PBLK) if applicable */
 		if (JNL_ENABLED(csa))
@@ -1535,7 +1540,7 @@ boolean_t	tp_tend()
 			jfb = si->jnl_head;
 			assert(NULL != jfb);
 			/* Fill in "num_participants" field in TSET/TKILL/TZKILL/TZTRIG/TZTWORM/TLGTRIG record.
-			 * The rest of the records (USET/UKILL/UZKILL/UZTRIG/UZTWORM/ULGTRIG) dont have this initialized.
+			 * The rest of the records (USET/UKILL/UZKILL/UZTRIG/UZTWORM/ULGTRIG) don't have this initialized.
 			 * Recovery looks at this field only in the T* records.
 			 */
 			rec = (jnl_record *)jfb->buff;
@@ -1577,9 +1582,9 @@ boolean_t	tp_tend()
 	for (csa = jnl_fence_ctl.fence_list;  JNL_FENCE_LIST_END != csa;  csa = csa->next_fenced)
 	{
 		jpc = csa->jnl;
-		DEBUG_ONLY(update_trans = ((sgm_info *)(csa->sgm_info_ptr))->update_trans;)
-		assert(!(update_trans & ~UPDTRNS_VALID_MASK));
-		assert(UPDTRNS_DB_UPDATED_MASK & update_trans);
+		DEBUG_ONLY(lcl_update_trans = ((sgm_info *)(csa->sgm_info_ptr))->update_trans;)
+		assert(!(lcl_update_trans & ~UPDTRNS_VALID_MASK));
+		assert(UPDTRNS_DB_UPDATED_MASK & lcl_update_trans);
 		tcom_record.prefix.pini_addr = jpc->pini_addr;
 		tcom_record.prefix.tn = csa->ti->curr_tn;
 		tcom_record.prefix.checksum = INIT_CHECKSUM_SEED;
@@ -1601,7 +1606,7 @@ boolean_t	tp_tend()
 	/* the following section is the actual commitment of the changes in the database (phase1 for BG) */
 	for (si = first_tp_si_by_ftok;  (NULL != si); si = si->next_tp_si_by_ftok)
 	{
-		if (update_trans = si->update_trans)
+		if (lcl_update_trans = si->update_trans)
 		{
 			assert((NULL == si->first_cw_set) || (0 != si->cw_set_depth));
 			sgm_info_ptr = si;
@@ -1702,7 +1707,7 @@ boolean_t	tp_tend()
 							 * "si->cr_array_index" is reset to 0 by secshr_db_clnup.
 							 */
 							assert(0 == si->cr_array_index);
-							goto skip_failed; /* do not do "failed:" processing as we dont hold crit */
+							goto skip_failed; /* do not do "failed:" processing as we don't hold crit */
 						}
 					} else
 					{
@@ -1723,12 +1728,12 @@ boolean_t	tp_tend()
 				} while (NULL != cse);
 			}
 			/* signal secshr_db_clnup/t_commit_cleanup, roll-back is no longer possible */
-			assert(!(update_trans & ~UPDTRNS_VALID_MASK));
-			assert(!(UPDTRNS_TCOMMIT_STARTED_MASK & update_trans));
-			si->update_trans = update_trans | UPDTRNS_TCOMMIT_STARTED_MASK;
+			assert(!(lcl_update_trans & ~UPDTRNS_VALID_MASK));
+			assert(!(UPDTRNS_TCOMMIT_STARTED_MASK & lcl_update_trans));
+			si->update_trans = lcl_update_trans | UPDTRNS_TCOMMIT_STARTED_MASK;
 			csa->t_commit_crit = T_COMMIT_CRIT_PHASE2;	/* set this BEFORE releasing crit */
 			/* should never increment curr_tn on a frozen database */
-			assert(!(csd->freeze UNIX_ONLY(|| (replication && IS_REPL_INST_FROZEN))));
+			assert(!(FROZEN_HARD(csd) UNIX_ONLY(|| (replication && IS_REPL_INST_FROZEN))));
 			/* For MM, barrier ensures blocks updates complete before incrementing db TN. Otherwise concurrent
 			 * processes could note a premature db TN value in gvcst_search and later fail to detect a block
 			 * modification.
@@ -1761,8 +1766,7 @@ boolean_t	tp_tend()
 			/* If db is journaled, then db header is flushed periodically when writing the EPOCH record,
 			 * otherwise do it here every HEADER_UPDATE_COUNT transactions.
 			 */
-			if ((!JNL_ENABLED(csa) || !JNL_HAS_EPOCH(csa->jnl->jnl_buff))
-					&& !(csd->trans_hist.curr_tn & (HEADER_UPDATE_COUNT - 1)))
+			if (!JNL_ENABLED(csa) && !(csd->trans_hist.curr_tn & (HEADER_UPDATE_COUNT - 1)) && !FROZEN_CHILLED(csd))
 				fileheader_sync(gv_cur_region);
 			if (NULL != si->kill_set_head)
 				INCR_KIP(csd, csa, si->kip_csa);
@@ -1840,7 +1844,7 @@ boolean_t	tp_tend()
 			ctn = si->start_tn;
 			is_mm = (dba_mm == cs_data->acc_meth);
 			/* If BG, check that we have not pinned any more buffers than we are updating */
-			DBG_CHECK_PINNED_CR_ARRAY_CONTENTS(is_mm, si->cr_array, si->cr_array_index, si->tp_csd->bplmap);
+			DBG_CHECK_PINNED_CR_ARRAY_CONTENTS(si->tp_csd, is_mm, si->cr_array, si->cr_array_index);
 			do
 			{
 				TRAVERSE_TO_LATEST_CSE(cse);
@@ -1873,7 +1877,7 @@ boolean_t	tp_tend()
 							 * "wcs_phase2_commit_pidcnt" so it is ok to skip all that processing
 							 * below and go directly to skip_failed.
 							 */
-							goto skip_failed; /* do not do "failed:" processing as we dont hold crit */
+							goto skip_failed; /* do not do "failed:" processing as we don't hold crit */
 						}
 					}
 					cse->mode = gds_t_committed;
@@ -1886,7 +1890,8 @@ boolean_t	tp_tend()
 			} while (NULL != cse);
 			/* Free up all pinnned cache-records */
 			tp_cr_array = si->cr_array;
-			UNPIN_CR_ARRAY_ON_COMMIT(tp_cr_array, si->cr_array_index);
+			ASSERT_CR_ARRAY_IS_UNPINNED(si->tp_csd, tp_cr_array, si->cr_array_index);
+			si->cr_array_index = 0;
 			if (!is_mm)
 			{	/* In BG, now that two-phase commit is done, decrement counter */
 				csa = cs_addrs;
@@ -2253,23 +2258,21 @@ enum cdb_sc	recompute_upd_array(srch_blk_status *bh, cw_set_element *cse)
  * See similar comment before the function definition of "recompute_upd_array". For the same reasons, it is considered
  * ok to do the reallocation since frozen regions are considered relatively rare.
  */
-boolean_t	reallocate_bitmap(sgm_info *si, cw_set_element *bml_cse)
+enum cdb_sc	reallocate_bitmap(sgm_info *si, cw_set_element *bml_cse)
 {
-	boolean_t		blk_used;
-	block_id_ptr_t		b_ptr;
+	blk_hdr_ptr_t		old_block;
 	block_id		bml, free_bit;
+	block_id_ptr_t		b_ptr;
+	boolean_t		before_image_needed, blk_used, is_mm;
+	boolean_t		read_before_image;		/* TRUE if before-image journaling or online backup in progress */
 	cache_rec_ptr_t		cr;
 	cw_set_element		*cse, *bmp_begin_cse;
 	int4			offset;
-	uint4			total_blks, map_size;
-	boolean_t		read_before_image; /* TRUE if before-image journaling or online backup in progress */
+	jnl_buffer_ptr_t	jbp;				/* jbp is non-NULL only if before-image journaling */
 	sgmnt_addrs		*csa;
 	sgmnt_data_ptr_t	csd;
-	boolean_t		is_mm;
-	jnl_buffer_ptr_t	jbp; /* jbp is non-NULL only if before-image journaling */
-	blk_hdr_ptr_t		old_block;
+	uint4			total_blks, map_size;
 	unsigned int		bsiz;
-	boolean_t		before_image_needed;
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
@@ -2285,134 +2288,129 @@ boolean_t	reallocate_bitmap(sgm_info *si, cw_set_element *bml_cse)
 		 * all updates to the bitmap (both phase1 and phase) happen inside of crit.
 		 */
 		assert(csa->now_crit && (bml != bml_cse->cr->blk) && (bml_cse->cr->blk % csd->bplmap));
-		return FALSE;
+		return cdb_sc_lostbmlcr;
 	}
 	assert(is_mm || (FALSE == bml_cse->cr->in_tend));
 	assert(is_mm || (FALSE == bml_cse->cr->data_invalid));
-	b_ptr = (block_id_ptr_t)bml_cse->upd_addr;
 	offset = 0;
 	total_blks = is_mm ? csa->total_blks : csa->ti->total_blks;
-	if (ROUND_DOWN2(total_blks, BLKS_PER_LMAP) == bml)
-		map_size = total_blks - bml;
-	else
-		map_size = BLKS_PER_LMAP;
+	map_size = (ROUND_DOWN2(total_blks, BLKS_PER_LMAP) == bml) ? total_blks - bml : BLKS_PER_LMAP;
 	assert(bml >= 0 && bml < total_blks);
 	bmp_begin_cse = si->first_cw_bitmap;	/* stored in a local to avoid pointer de-referencing within the loop below */
 	jbp = (JNL_ENABLED(csa) && csa->jnl_before_image) ? csa->jnl->jnl_buff : NULL;
 	read_before_image = ((NULL != jbp) || csa->backup_in_prog || SNAPSHOTS_IN_PROG(csa));
+	b_ptr = (block_id_ptr_t)bml_cse->upd_addr;
 	for (cse = si->first_cw_set;  cse != bmp_begin_cse; cse = cse->next_cw_set)
 	{
 		TRAVERSE_TO_LATEST_CSE(cse);
 		if ((gds_t_acquired != cse->mode) || (ROUND_DOWN2(cse->blk, BLKS_PER_LMAP) != bml))
 			continue;
+		assert(gds_t_acquired == cse->mode);
+		assert(GDSVCURR == cse->ondsk_blkver);
 		assert(*b_ptr == (cse->blk - bml));
-		/* If bm_find_blk is passed a hint (first arg) it assumes it is less than map_size and gives invalid results (for
-		 * values >= map_size). Instead of changing bm_find_blk we do the check here and assert that "hint" < "map_size" in
-		 * bm_find_blk.
-		 */
-		if (offset >= map_size)
-		{	/* We have a block that needs to be reallocated but there are no free blocks left in this local bitmap.
-			 * Note: It's possible for `offset' to be greater than `map_size' if the cache record holding the bitmap
-			 * gets reused for a non-bitmap block in which case donot_commit should be set (and hence asserted here).
-			 * In such a case, we return FALSE causing the caller to restart the transaction with a cdb_sc_bmlmod
-			 * even though it's a case of cdb_sc_lostbmlcr.
-			 */
-			assert((offset == map_size) || (TREF(donot_commit) & DONOTCOMMIT_REALLOCATE_BITMAP_BMLMOD));
-			return FALSE;
-		}
-		free_bit = bm_find_blk(offset, (sm_uc_ptr_t)bml_cse->old_block + SIZEOF(blk_hdr), map_size, &blk_used);
-		if (MAP_RD_FAIL == free_bit || NO_FREE_SPACE == free_bit)
-			return FALSE;
-		cse->blk = bml + free_bit;
-#		ifdef DEBUG
-		if (cse->blk >= total_blks)
-			TREF(donot_commit) |= DONOTCOMMIT_REALLOCATE_BITMAP_BMLMOD;
-#		endif
-		blk_used ? BIT_SET_RECYCLED_AND_CLEAR_FREE(cse->blk_prior_state)
-			 : BIT_CLEAR_RECYCLED_AND_SET_FREE(cse->blk_prior_state);
-		/* re-point before-images into cse->old_block if necessary; if not available restart by returning FALSE */
-		BEFORE_IMAGE_NEEDED(read_before_image, cse, csa, csd, cse->blk, before_image_needed);
-		if (!before_image_needed)
-		{
-			cse->old_block = NULL;
-			cse->blk_checksum = 0;
-		} else if (!is_mm)
+		do
 		{
-			cr = db_csh_get(cse->blk);
-			assert(CR_NOTVALID != (sm_long_t)cr);
-			if ((NULL == cr) || (CR_NOTVALID == (sm_long_t)cr) || (0 <= cr->read_in_progress))
-				return FALSE;	/* if one block was freed a long time ago, most probably were; so just give up */
-			/* Reset cse->cr, cycle, old_block and checksums if we had not read a before-image previously (because
-			 * cse->blk was not a reused block previously) OR if old cse->cr and cse->cycle dont match current cr
+			/* If "bm_find_blk" is passed a hint (first arg) it assumes it is less than map_size and gives invalid
+			 * results (for values >= map_size). Instead of changing "bm_find_blk" we do the check here and assert
+			 * that "hint" < "map_size" in "bm_find_blk".
 			 */
-			assert((NULL == cse->old_block) || (cse->cr != cr)
-				|| cse->old_block == (sm_uc_ptr_t)GDS_REL2ABS(cr->buffaddr));
-			if ((NULL == cse->old_block) || (cse->cr != cr) || (cse->cycle != cr->cycle)
-					|| (cse->tn <= ((blk_hdr_ptr_t)GDS_REL2ABS(cr->buffaddr))->tn))
-			{	/* Bitmap reallocation has resulted in a situation where checksums etc. have to be recomputed */
-				cse->cr = cr;
-				cse->cycle = cr->cycle;
-				cse->old_block = (sm_uc_ptr_t)GDS_REL2ABS(cr->buffaddr);
-				old_block = (blk_hdr_ptr_t)cse->old_block;
-				if (!WAS_FREE(cse->blk_prior_state) && (NULL != jbp))
-				{
-					if (old_block->tn < jbp->epoch_tn)
+			if (offset >= map_size)
+				return cdb_sc_bmlmod;
+			free_bit = bm_find_blk(offset, (sm_uc_ptr_t)bml_cse->old_block + SIZEOF(blk_hdr), map_size, &blk_used);
+			if (NO_FREE_SPACE == free_bit)
+				return cdb_sc_bmlmod;
+			cse->blk = bml + free_bit;
+			if (cse->blk >= total_blks)
+				return cdb_sc_lostbmlcr;
+			/* Re-point before-images into cse->old_block if necessary; if not available: restart.
+			 * Set cse->blk_prior_state before invoking BEFORE_IMAGE_NEEDED macro (as it needs this field set).
+			 */
+			if (blk_used)
+				BIT_SET_RECYCLED_AND_CLEAR_FREE(cse->blk_prior_state);
+			else
+				BIT_CLEAR_RECYCLED_AND_SET_FREE(cse->blk_prior_state);
+			BEFORE_IMAGE_NEEDED(read_before_image, cse, csa, csd, cse->blk, before_image_needed);
+			if (!before_image_needed)
+			{
+				cse->old_block = NULL;
+				cse->blk_checksum = 0;
+			} else if (!is_mm)
+			{
+				cr = db_csh_get(cse->blk);			/* see if the before image is in memory and OK */
+				assert(CR_NOTVALID != (sm_long_t)cr);
+				if ((NULL == cr) || (CR_NOTVALID == (sm_long_t)cr) || (0 <= cr->read_in_progress))
+				{	/* if this before image is not at hand don't wait for it in crit */
+					offset = free_bit + 1;		/* try further in this bitmap */
+					continue;
+				}
+				/* if we had not read a before-image previously (because cse->blk was not a reused block previously)
+				 * OR if old cse->cr and cse->cycle don't match current cr, reset cse->cr, cycle, old_block and
+				 * checksums
+				 */
+				assert((NULL == cse->old_block) || (cse->cr != cr)
+					|| cse->old_block == (sm_uc_ptr_t)GDS_REL2ABS(cr->buffaddr));
+				if ((NULL == cse->old_block) || (cse->cr != cr) || (cse->cycle != cr->cycle)
+						|| (cse->tn <= ((blk_hdr_ptr_t)GDS_REL2ABS(cr->buffaddr))->tn))
+				{	/* Bitmap reallocation resulted in a situation where checksums etc. must be recomputed */
+					cse->old_block = (sm_uc_ptr_t)GDS_REL2ABS(cr->buffaddr);
+					old_block = (blk_hdr_ptr_t)cse->old_block;
+					/* Note: cse->cr needs to be set BEFORE the JNL_GET_CHECKSUM_ACQUIRED macro call
+					 * as the macro relies on this.
+					 */
+					cse->cr = cr;
+					cse->cycle = cr->cycle;
+					if (!WAS_FREE(cse->blk_prior_state) && (NULL != jbp))
 					{
-						/* See comment before similar check in "gvincr_recompute_upd_array"
-						 * for why this check is needed.
-						 */
-						bsiz = old_block->bsiz;
-						if (bsiz > csd->blk_size)
-						{
-							assert(CDB_STAGNATE > t_tries);
-							return FALSE;	/* This is a restartable condition. Restart */
-						}
-						JNL_GET_CHECKSUM_ACQUIRED_BLK(cse, csd, csa, old_block, bsiz);
-					} else
-						cse->blk_checksum = 0;
+						if (old_block->tn < jbp->epoch_tn)
+						{	/* See comment before similar check in "gvincr_recompute_upd_array"
+							 * for why this check is needed.
+							 */
+							bsiz = old_block->bsiz;
+							if (bsiz > csd->blk_size)
+							{	/* if this before image is not valid don't wait for it in crit */
+								offset = free_bit + 1;		/* try further in this bitmap */
+								continue;
+							}
+							JNL_GET_CHECKSUM_ACQUIRED_BLK(cse, csd, csa, old_block, bsiz);
+						} else
+							cse->blk_checksum = 0;
+					}
 				}
+			} else
+			{	/* in MM, although mm_update does not use cse->old_block, tp_tend uses it to write before-images.
+				 * therefore, fix it to point to the reallocated block's buffer address
+				 */
+				cse->old_block = t_qread(cse->blk, (sm_int_ptr_t)&cse->cycle, &cse->cr);
+				assert(GDSVCURR == cse->ondsk_blkver);	/* should have been already initialized in t_write_map */
+				old_block = (blk_hdr_ptr_t)cse->old_block;
+				if (NULL == old_block)
+					return ((enum cdb_sc)rdfail_detail);
+				assert(NULL == jbp);	/* don't need to have any JNL_GET_CHECKSUM_ACQUIRED_BLK logic */
 			}
-			assert(gds_t_acquired == cse->mode);
- 			assert(GDSVCURR == cse->ondsk_blkver);
+			*b_ptr++ = free_bit;
+			offset = free_bit + 1;
+			break;
+		} while (TRUE);
+	}
+	assert(cse == bmp_begin_cse);
+	assert(0 == *b_ptr);
+	/* since bitmap block got modified, copy latest "ondsk_blkver" status from cache-record to bml_cse */
+	assert((NULL != bml_cse->cr) || is_mm);
+	old_block = (blk_hdr_ptr_t)bml_cse->old_block;
+	assert(!WAS_FREE(bml_cse->blk_prior_state));	/* Bitmap blocks are never of type gds_t_acquired or gds_t_create */
+	if (NULL != jbp)
+	{	/* recompute CHECKSUM for the modified bitmap block before-image */
+		if (old_block->tn < jbp->epoch_tn)
+		{
+			bsiz = old_block->bsiz;
+			/* See comment before similar check in "gvincr_recompute_upd_array" for why this check is needed */
+			if (bsiz > csd->blk_size)
+				return cdb_sc_lostbmlcr;	/* This is a restartable condition, so restart */
+			bml_cse->blk_checksum = jnl_get_checksum(old_block, csa, bsiz);
 		} else
-		{	/* in MM, although mm_update does not use cse->old_block, tp_tend uses it to write before-images.
-			 * therefore, fix it to point to the reallocated block's buffer address
-			 */
-			cse->old_block = t_qread(cse->blk, (sm_int_ptr_t)&cse->cycle, &cse->cr);
-			assert(GDSVCURR == cse->ondsk_blkver);	/* should have been already initialized in t_write_map */
-			old_block = (blk_hdr_ptr_t)cse->old_block;
-			if (NULL == old_block)
-				return FALSE;
-			assert(NULL == jbp);	/* this means we dont need to have any JNL_GET_CHECKSUM_ACQUIRED_BLK logic */
-		}
-		*b_ptr++ = free_bit;
-		offset = free_bit + 1;
+			bml_cse->blk_checksum = 0;
 	}
-	if (cse == bmp_begin_cse)
-	{
-		assert(0 == *b_ptr);
-		/* since bitmap block got modified, copy latest "ondsk_blkver" status from cache-record to bml_cse */
-		assert((NULL != bml_cse->cr) || is_mm);
-		old_block = (blk_hdr_ptr_t)bml_cse->old_block;
-		assert(!WAS_FREE(bml_cse->blk_prior_state));	/* Bitmap blocks are never of type gds_t_acquired or gds_t_create */
-		if (NULL != jbp)
-		{	/* recompute CHECKSUM for the modified bitmap block before-image */
-			if (old_block->tn < jbp->epoch_tn)
-			{
-				bsiz = old_block->bsiz;
-				/* See comment before similar check in "gvincr_recompute_upd_array" for why this check is needed */
-				if (bsiz > csd->blk_size)
-				{
-					assert(CDB_STAGNATE > t_tries);
-					return FALSE;	/* This is a restartable condition. Restart */
-				}
-				bml_cse->blk_checksum = jnl_get_checksum(old_block, csa, bsiz);
-			} else
-				bml_cse->blk_checksum = 0;
-		}
-		if (!is_mm)
-			bml_cse->ondsk_blkver = bml_cse->cr->ondsk_blkver;
-		return TRUE;
-	} else
-		return FALSE;
+	if (!is_mm)
+		bml_cse->ondsk_blkver = bml_cse->cr->ondsk_blkver;
+	return cdb_sc_normal;
 }
diff --git a/sr_port/tp_unwind.c b/sr_port/tp_unwind.c
index 372440a..63c6c1c 100644
--- a/sr_port/tp_unwind.c
+++ b/sr_port/tp_unwind.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -302,6 +302,13 @@ void	tp_unwind(uint4 newlevel, enum tp_unwind_invocation invocation_type, int *t
 			mlk_pvtblk_delete(prior);
 	}
 	DBGRFCT((stderr, "tp_unwind: Processing complete\n"));
+	/* Reset tprestart_state here instead of (or in addition to) the regular places it is modified because this routine
+	 * is used both in normal TP unwind scenarios as well as in error conditions and is part of running down the process
+	 * in the exit handler. Added due to the need for a statsDB to kill a record from its DB as part of it being rundown
+	 * and the first need to NOT be in the middle of a TP transaction when that happens.
+	 */
+	if ((0 == newlevel) && (NULL == tp_pointer))
+		tprestart_state = TPRESTART_STATE_NORMAL;
 	dollar_tlevel = newlevel;
 	ENABLE_INTERRUPTS(INTRPT_IN_TP_UNWIND, prev_intrpt_state);/* drive any MUPIP STOP/signals deferred while in this function */
 }
diff --git a/sr_port/unary_tail.c b/sr_port/unary_tail.c
new file mode 100644
index 0000000..1844ae2
--- /dev/null
+++ b/sr_port/unary_tail.c
@@ -0,0 +1,345 @@
+/****************************************************************
+ *								*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
+ *								*
+ *	This source code contains the intellectual property	*
+ *	of its copyright holder(s), and is made available	*
+ *	under a license.  If you do not know the terms of	*
+ *	the license, please stop and do not read further.	*
+ *								*
+ ****************************************************************/
+
+#include "mdef.h"
+#include "gtm_string.h"
+#include "compiler.h"
+#include "mdq.h"
+#include "mmemory.h"
+#include "op.h"
+#include "opcode.h"
+#include "stringpool.h"
+#include "toktyp.h"
+
+LITREF octabstruct	oc_tab[];
+
+void unary_tail(oprtype *opr)
+{	/* collapse any string of unary operators that cam be simplified
+	 * opr is a pointer to a operand structure to process
+	 */
+	int		com, comval, drop, neg, num;
+	mval		*mv, *v;
+	opctype		c, c1, c2;
+	oprtype		*p;
+	triple		*t, *t1, *t2, *ta;
+	uint4		w;
+
+	assert(TRIP_REF == opr->oprclass);
+	t = ta = t2 = opr->oprval.tref;
+	assert(OCT_UNARY & oc_tab[t->opcode].octype);
+	assert((TRIP_REF == t->operand[0].oprclass) && (NO_REF == t->operand[1].oprclass));
+	com = comval = drop = neg = num = 0;
+	do
+	{
+		t1 = t2;
+		c1 = t1->opcode;
+		assert(TRIP_REF == t1->operand[0].oprclass);
+		assert((TRIP_REF == t1->operand[1].oprclass) || (NO_REF == t1->operand[1].oprclass));
+		t2 = t1->operand[0].oprval.tref;
+		c2 = t2->opcode;
+		switch (c2)	/* this switch is on the opcode of the operand triple */
+		{
+			case OC_JMPFALSE:
+			case OC_JMPTRUE:
+				t2->operand[1] = t2->operand[0];			/* track info as we switch opcode */
+				PUT_LITERAL_TRUTH(OC_JMPTRUE == c2, t2);
+				c2 = t2->opcode = OC_LIT;				/* WARNING fallthrough */
+			case OC_COM:
+			case OC_COBOOL:
+			case OC_COMVAL:
+			case OC_FORCENUM:
+			case OC_LIT:
+			case OC_NEG:
+			case OC_PARAMETER:/* the next bit of logic works on the opcode of the (current) operator triple */
+				comval += (OC_COMVAL == c1);
+				com += (OC_COM == c1);	/* use a count to know if there were any and whether an even or odd # */
+				num += (OC_FORCENUM == c1);	/* use a count to know if there were any numeric coersions */
+				if (OC_NEG == c1)	/* get rid of all negation for literals; all but 1 for other exprs */
+				{
+					num++;		/* num indicates a coerce if the target is not a literal */
+					neg = com ? neg : !neg;		/* a complement makes any right-hand negation irrelevant */
+				} else if ((OC_NOOP != c1) && !(OCT_UNARY & oc_tab[c1].octype))
+					break;
+				assert((NO_REF == t1->operand[1].oprclass) && ((NO_REF == t2->operand[1].oprclass)
+					|| ((INDR_REF == t2->operand[1].oprclass) && (OC_LIT == c2))));
+				drop++;			/* use a count of potential "extra" operands */
+				if (OC_LIT != c2)
+					continue;	/* this keeps the loop going */
+				if (OC_COBOOL == t->opcode)
+				{	/* keep Boolean processing happy by leaving one of these alone/behind */
+					t = t->operand[0].oprval.tref;
+					drop--;
+				}
+				for (t1 = t, c = t1->opcode; 0 < drop; drop--)	/* reached a literal - time to stop */
+				{	/* if it's a literal, delete all but one leading unary op and operate on the literal now */
+					assert(OCT_UNARY & oc_tab[c].octype);
+					t2 = t1->operand[0].oprval.tref;
+					t1->opcode = c = t2->opcode;	/* slide next opcode & operand back before deleting it */
+					t1->operand[0] = t2->operand[0];
+					dqdel(t2, exorder);
+				}
+				assert(OC_LIT == c);
+				t = ta;
+				v = &t1->operand[0].oprval.mlit->v;
+				if (num || com)
+				{	/* num includes both OC_NEG and OC_FORCENUM */
+					unuse_literal(v);
+					t->opcode = OC_LIT;
+				}
+				if (com)
+				{	/* any complement reduces the literal value to [unsigned] 1 or 0 */
+					PUT_LITERAL_TRUTH((!(1 & com) ? (0 != v->m[1]) : (0 == v->m[1])), t);
+					v = &t->operand[0].oprval.mlit->v;
+					if (neg)
+						unuse_literal(v);	/* need to negate the literal just added above */
+				}
+				assert(1 >= neg);
+				if (num)	/* if an "outer" OC_NEG or OC_FORCENUM, get it over with at compile time */
+				{
+					mv = (mval *)mcalloc(SIZEOF(mval));
+					*mv = *v;
+					if (neg)
+					{	/* logic below is a bit less efficient than run time assembler op_neg, but in C */
+						if (MV_INT & mv->mvtype)	/* code, we aren't set up to call assembler code */
+						{
+							if (0 != mv->m[1])
+								mv->m[1] = -v->m[1];
+							else
+								mv->sgn = 0;
+						} else if (MV_NM & mv->mvtype)
+							mv->sgn = !mv->sgn;
+					} else
+						s2n(mv);
+					n2s(mv);
+					v = mv;
+					put_lit_s(v, t);
+				}
+				assert((MV_NM & v->mvtype) && (MV_STR & v->mvtype));
+				break;
+			default:	/* something other than a unary operator or a literal - stop and do what can be done */
+				if (OCT_ARITH & oc_tab[c2].octype)
+				{	/* some arithmetic */
+					ex_tail(&t1->operand[0]);
+					if (OC_LIT == t2->opcode)
+					{
+						c2 = t2->opcode;
+						assert(t2 != t);
+						t2 = t;						/* start the check over */
+						com = drop = neg = num = 0;
+						continue;
+					} else
+						assert(c2 == t2->opcode);
+				}
+				if (TRUE || !drop || (NO_REF != t2->operand[1].oprclass))
+					break;		/* don't try anything fancy if the leaf is complex */
+				assert(OCT_UNARY & oc_tab[c1].octype);
+				drop++;
+				if ((OC_NEG == c1) && !com)
+					neg = !neg;
+				num += (OC_FORCENUM == c1);
+				com += (OC_COM == c1);
+				comval += (OC_COMVAL == c1);
+				if (!com)
+				{
+					if (!num)
+					{	/* nothing going on */
+						assert(drop <= 2);
+						break;
+					}
+					/* numeric conversion only - just pick one and throw any others away */
+					t1 = t->operand[0].oprval.tref;
+					if (OC_COBOOL == t->opcode)
+					{	/* keep Boolean processing happy by leaving one of these alone/behind */
+						c = OC_COBOOL;
+						if (neg)
+						{
+							t1 = t1->operand[0].oprval.tref;
+							drop--;
+						}
+					} else
+						c = neg ? OC_NEG : OC_FORCENUM;
+					for (drop--; 0 < drop; t1 = t2, drop--)
+					{	/* get rid of any extras we can */
+						t2 = t1->operand[0].oprval.tref;
+						dqdel(t1, exorder);
+					}
+					if (neg && (OC_COBOOL == c2))
+					{	/* preserving both a COBOOL and a NEG */
+						assert(t2 == t->operand[0].oprval.tref);
+						t2->opcode = OC_NEG;
+						t2->operand[0].oprval.tref = t1;
+					} else
+					{	/* just keeping one */
+						assert(c2 == t2->opcode);
+						t->operand[0].oprval.tref = t1;
+						t->opcode = c;
+					}
+					break;
+				}
+				if ((comval ? 3 : 2) >= drop)
+					break;	/* a single complement takes two or three OP codes so no need to waste time */
+				if (comval && !(1 & com))
+					break;				/* a hack for a case that we're out of time to work out */
+				ta = t2 = t;	/* below deals with complement by picking thru & deleting extra triples */
+				if (neg)	/* in the common case, most of the loops don't run even a single iteration */
+				{	/* a negation outside the complement */
+					for (t1 = t; OC_NEG != t1->opcode; t1 = t2, drop--)
+					{
+						if (!drop)
+						{
+							assert(0 < drop);
+							break;
+						}
+						t2 = t1->operand[0].oprval.tref;
+						if (t1 != t)
+							dqdel(t1, exorder);
+					}
+					assert(drop);	/* there should be something going on within the negated expression */
+					if (t2 != ta)
+					{	/* we did drop something to get to this negation, so slide it to the "front" */
+						t->operand[0].oprval.tref = t1->operand[0].oprval.tref;
+						t->opcode = c = OC_NEG;
+						dqdel(t1, exorder);
+					}
+					t1 = ta->operand[0].oprval.tref;
+					drop--;
+				} else
+					t1 = t2 = ta;
+				if (comval)
+				{	/* with complement & expr (rather than tvexpr) we expect: COBOOL, COM, COMVAL sequence */
+					for (; OC_COMVAL != t1->opcode; t1 = t2, drop--)
+					{
+						if (OC_COM == t1->opcode)
+							break;
+						if (3 >= drop)
+							break;		/* need to deal with "final" COMVAL, COM and COBOOL */
+						t2 = t1->operand[0].oprval.tref;
+						if (t1 != t)
+							dqdel(t1, exorder);
+					}
+				}
+				t2 = t1->operand[0].oprval.tref;
+				if (OC_COMVAL == t1->opcode)
+				{	/* did find a COMVAL */
+					if (t1 != t)
+					{	/* if not already in the right place in the revised chain move it */
+						if (!neg)
+						{	/* no (outer) negation, so OC_COMVAL leads things off */
+							assert(drop);
+							t->operand[0].oprval.tref = t2;
+							t->opcode = c = OC_COMVAL;
+							dqdel(t1, exorder);
+							t1 = t;
+						} else
+						{	/* move it up or possibly not - cheaper to do it whether needed or not */
+							assert(ta != t1);
+							ta->operand[0].oprval.tref = t1;
+						}
+					}
+					ta = t1;
+					drop--;
+				}
+				if (1 & com)
+				{	/* need one complement */
+					for (t1 = ta->operand[0].oprval.tref; OC_COM != t1->opcode; t1 = t2, drop--)
+					{
+						if (!drop)
+						{
+							assert(0 < drop);
+							break;
+						}
+						t2 = t1->operand[0].oprval.tref;
+						if (t1 != t)
+							dqdel(t1, exorder);
+					}
+					t2 = t1->operand[0].oprval.tref; /* pick up the operand of what we may have just deleted */
+					if (t1 != t)
+					{
+						if (!neg && (OC_COMVAL != ta->opcode))
+						{	/* no (outer) negation or OC_COMVAL, so OC_COM leads things off */
+							if (!drop)
+							{
+								assert(0 < drop);
+								break;
+							}
+							t->operand[0].oprval.tref = t2;
+							t->opcode = c = OC_COM;
+							t->operand[0] = t1->operand[0];
+							dqdel(t1, exorder);
+							t1 = t;
+						} else
+						{	/* move it up or possibly not - cheaper to do it whether needed or not */
+							assert(ta != t1);
+							ta->operand[0].oprval.tref = t1;
+						}
+					}
+					ta = t1;
+					drop--;
+				}
+				for (t1 = ta->operand[0].oprval.tref; (OCT_UNARY & oc_tab[t1->opcode].octype) ; t1 = t2, drop--)
+				{	/* a complement always requires a COBOOL but if the COMs cancelled out, it can go */
+					if ((OC_COBOOL == t1->opcode) && (1 & com))
+					{
+						assert(0 < drop);
+						drop--;
+						break;
+					}
+					t2 = t1->operand[0].oprval.tref;
+					if (t1 != t)
+					{
+						assert(ta != t1);
+						ta->operand[0] = t1->operand[0];
+						dqdel(t1, exorder);
+					}
+				}
+				if (!(1 & com))
+				{
+					assert(c2 == t1->opcode);
+					t->operand[0] = t1->operand[0];
+					t->operand[1] = t1->operand[1];
+					t->opcode = t1->opcode;
+					dqdel(t1, exorder);
+					break;
+				}
+				t2 = t1->operand[0].oprval.tref;
+				assert(0 <= drop);
+				if (drop && (t1 != t))
+				{	/* still working toward the "actual" or "real" operand */
+					assert(1 & com);
+					if (!neg && (OC_COMVAL != ta->opcode) && (OC_COM != ta->opcode))
+					{	/* no (outer) negation, OC_COMVAL or OC_COM - OC_COBOOL leads things off */
+						assert(drop);
+						t->operand[0].oprval.tref = t2;
+						t->opcode = c = OC_COBOOL;
+						dqdel(t1, exorder);
+						t1 = t;
+					} else
+					{
+						assert(ta != t1);
+						ta->operand[0].oprval.tref = t1;
+					}
+				}
+				ta = t1;
+				for (t1 = ta->operand[0].oprval.tref; drop; t1 = t2, drop--)
+				{	/* anything left is redundant, so get rid of it */
+					if (TRIP_REF != t1->operand[0].oprclass)
+						break;
+					t2 = t1->operand[0].oprval.tref;
+					dqdel(t1, exorder);
+				}
+				assert(c2 == t1->opcode);	/* check that 2nd pass appears to wind up same place as 1st */
+				ta->operand[0].oprval.tref = t1;
+				break;
+		}
+		return;
+	} while (TRUE);		/* the loop is managed by breaks and a continue statement above */
+}
diff --git a/sr_port/unuse_literal.c b/sr_port/unuse_literal.c
new file mode 100644
index 0000000..bb9a994
--- /dev/null
+++ b/sr_port/unuse_literal.c
@@ -0,0 +1,53 @@
+#include "mdef.h"
+
+#include "mdq.h"
+#include "hashtab_str.h"
+#include "compiler.h"
+#include "opcode.h"
+#include "mmemory.h"
+
+GBLREF mliteral 	literal_chain;
+GBLREF hash_table_str	*complits_hashtab;
+
+boolean_t unuse_literal(mval *x)
+{
+	mliteral	*a = NULL;
+	stringkey	litkey;
+	ht_ent_str	*litent;
+	bool		in_hashtab = FALSE;
+	if (complits_hashtab && complits_hashtab->base)
+	{
+		litkey.str = x->str;
+		COMPUTE_HASH_STR(&litkey);
+		if (NULL != (litent = lookup_hashtab_str(complits_hashtab, &litkey)))
+		{
+			a = (mliteral *)litent->value;
+			assert(a->reference_count != 0);
+			a->reference_count -= 1;
+			in_hashtab = TRUE;
+		}
+	} else
+	{
+		dqloop(&literal_chain, que, a)
+		{
+			if (is_equ(x, &(a->v)))
+			{
+				assert(a->reference_count != 0);
+				a->reference_count -= 1;
+				break;
+			}
+		}
+	}
+	/* The first assert here covers the case of no literal in the hashtab, the second in the literal chain */
+	assert(a != NULL); /* ATTEMPT TO REMOVE MVAL NOT IN HASHTABLE; THIS WAS CALLED IN ERROR */
+	assert(a != &literal_chain); /* This probably means you attempted to remove a literal not in the literal chain */
+	if (a->reference_count == 0)
+	{
+		/* Remove mval */
+		if (in_hashtab)
+			delete_hashtab_ent_str(complits_hashtab, litent);
+		dqdel(a, que);
+		return TRUE;
+	}
+	return FALSE;
+}
diff --git a/sr_port/updhelper_reader.c b/sr_port/updhelper_reader.c
index 23f5d62..5a1943e 100644
--- a/sr_port/updhelper_reader.c
+++ b/sr_port/updhelper_reader.c
@@ -92,6 +92,14 @@
 
 #define MAX_LCNT 100
 
+#define IS_GOOD_RECORD(REC, RECLEN, READADDRS, LIMITADDRS, PRE_READ, LOCAL_READ) 	\
+	((IS_VALID_RECTYPE(REC))							\
+	    && (MIN_JNLREC_SIZE < RECLEN)						\
+	    && (ROUND_DOWN2(RECLEN, JNL_REC_START_BNDRY) == RECLEN)			\
+	    && (READADDRS + RECLEN <= LIMITADDRS)					\
+	    && (RECLEN == REC_LEN_FROM_SUFFIX(READADDRS, RECLEN))			\
+	    && (PRE_READ + RECLEN > LOCAL_READ))
+
 GBLREF	void			(*call_on_signal)();
 GBLREF	gv_namehead		*gv_target;
 GBLREF	gv_key			*gv_currkey;
@@ -178,7 +186,7 @@ boolean_t updproc_preread(void)
 	gvnh_reg_t		*gvnh_reg;
 #	ifdef REPL_DEBUG
 	unsigned char 		buff[MAX_ZWR_KEY_SZ], *end;
-	uint4			write, write_wrap;
+	uint4			lcl_write, write_wrap;
 #	endif
 	DCL_THREADGBL_ACCESS;
 
@@ -237,12 +245,12 @@ boolean_t updproc_preread(void)
 		}
 #		ifdef REPL_DEBUG
 		write_wrap = recvpool_ctl->write_wrap;
-		write = recvpool_ctl->write;
+		lcl_write = recvpool_ctl->write;
 #		endif
 		if (pre_read_offset >= recvpool_ctl->write_wrap)
 		{
 			REPL_DPRINT4("Wrapped: pre_read_offset = %x write_wrap = %x write = %x\n",
-				pre_read_offset, write_wrap, write);
+				pre_read_offset, write_wrap, lcl_write);
 			pre_read_offset = 0;
 		}
 		if (pre_read_offset == recvpool_ctl->write && (!recvpool_ctl->wrapped))
@@ -275,15 +283,12 @@ boolean_t updproc_preread(void)
 				readaddrs = recvpool.recvdata_base + pre_read_offset;
 				limit_readaddrs = recvpool.recvdata_base +
 					(recvpool_ctl->wrapped ? recvpool_ctl->write_wrap : recvpool_ctl->write);
-				if (limit_readaddrs - MIN_JNLREC_SIZE > readaddrs)
+				if ((limit_readaddrs - MIN_JNLREC_SIZE) > readaddrs)
 				{
 					rec = (jnl_record *)readaddrs;
 					rec_len = rec->prefix.forwptr;
-					if (IS_VALID_RECTYPE(rec)
-					    && (ROUND_DOWN2(rec_len, JNL_REC_START_BNDRY) == rec_len)
-					    && (readaddrs + rec_len <= limit_readaddrs)
-					    && (rec_len == REC_LEN_FROM_SUFFIX(readaddrs, rec_len))
-		    			    && (pre_read_offset + rec_len > upd_proc_local->read))
+					if (IS_GOOD_RECORD(rec, rec_len, readaddrs, limit_readaddrs,
+								pre_read_offset, upd_proc_local->read))
 						pre_read_offset += rec_len;
 					else
 						break;
@@ -306,35 +311,32 @@ boolean_t updproc_preread(void)
 				}
 			}
 		}
-		good_record = TRUE;
+		good_record = FALSE;
 		readaddrs = recvpool.recvdata_base + pre_read_offset;
 		limit_readaddrs = recvpool.recvdata_base +
 			(recvpool_ctl->wrapped ? recvpool_ctl->write_wrap : recvpool_ctl->write);
-		if (limit_readaddrs - MIN_JNLREC_SIZE > readaddrs)
+		if ((limit_readaddrs - MIN_JNLREC_SIZE) > readaddrs)
 		{
 			rec = (jnl_record *)readaddrs;
 			rec_len = rec->prefix.forwptr;
-			if (IS_VALID_RECTYPE(rec)
-			    && (ROUND_DOWN2(rec_len, JNL_REC_START_BNDRY) == rec_len)
-			    && (readaddrs + rec_len <= limit_readaddrs)
-			    && (rec_len == REC_LEN_FROM_SUFFIX(readaddrs, rec_len))
-			    && (pre_read_offset + rec_len > upd_proc_local->read))
+			rectype = (enum jnl_record_type)rec->prefix.jrec_type;
+			if (IS_GOOD_RECORD(rec, rec_len, readaddrs, limit_readaddrs, pre_read_offset, upd_proc_local->read))
 			{
 				upd_helper_ctl->next_read_offset = pre_read_offset + rec_len;
+				good_record = TRUE;
 			}
-			else
-				good_record = FALSE;
-		} else
-			good_record = FALSE;
+		}
 		RELEASE_SWAPLOCK(&upd_helper_ctl->pre_read_lock);
 		DEBUG_ONLY(num_scanned++;)
-		if (good_record)
+		if (good_record && (IS_SET_KILL_ZKILL_ZTRIG(rectype)))
 		{
-			rectype = (enum jnl_record_type)rec->prefix.jrec_type;
-			if (IS_SET_KILL_ZKILL_ZTRIG(rectype))
+			good_record = FALSE;	/* The record is good enough to look at, but it's not fully validated */
+			was_wrapped = recvpool_ctl->wrapped;
+			keystr = (limit_readaddrs > ((sm_uc_ptr_t)rec + SIZEOF(struct_jrec_upd))) ?
+					(jnl_string *)&rec->jrec_set_kill.mumps_node : NULL;
+			/* Avoid reading beyond receive pool boundary. Happens when reading at the end and the pool is wrapped */
+			if ((NULL != keystr) && (limit_readaddrs > ((sm_uc_ptr_t)keystr + keystr->length)))
 			{
-				was_wrapped = recvpool_ctl->wrapped;
-				keystr = (jnl_string *)&rec->jrec_set_kill.mumps_node;
 				key_len = keystr->length;	/* local copy of shared recvpool key */
 				if (MAX_KEY_SZ >= key_len)
 				{	/* The receive pool is shared memory and the contents can be overwritten concurrently by the
@@ -425,22 +427,18 @@ boolean_t updproc_preread(void)
 								TRUE, &recvpool.recvpool_ctl->jnl_seqno,
 								rectype, end - buff, buff, status);
 #							endif
+							good_record = TRUE;
 						} else
-						{
 							REPL_DPRINT1("Unexpected bad record\n");
-							good_record = FALSE;
-						}
-					} else
-						good_record = FALSE;
-				} else
-					good_record = FALSE;
+					}
+				}
 			}
 		}
 		if (!good_record)
 		{
 #			ifdef REPL_DEBUG
-			REPL_DPRINT5("Skipping record: pre_read_offset = %x read = %x write_wrap = %x write = %x\n",
-				pre_read_offset, upd_proc_local->read, write_wrap, write);
+			REPL_DPRINT6("Skipping record: pre_read_offset = %x read = %x write_wrap = %x write = %x reclen = %x\n",
+				pre_read_offset, upd_proc_local->read, write_wrap, lcl_write, rec_len);
 			REPL_DPRINT3("New values: write_wrap = %x write = %x\n",
 					recvpool_ctl->write_wrap, recvpool_ctl->write);
 #			endif
diff --git a/sr_port/updhelper_writer.c b/sr_port/updhelper_writer.c
index f57a901..9f0559a 100755
--- a/sr_port/updhelper_writer.c
+++ b/sr_port/updhelper_writer.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2005-2016 Fidelity National Information	*
+ * Copyright (c) 2005-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -47,6 +47,7 @@
 #include "repl_sp.h"
 #include "jnl_write.h"
 #include "gtmio.h"
+#include "interlock.h"
 #include "wcs_flu.h"
 #include "wcs_mm_recover.h"
 #include "wcs_timer_start.h"
@@ -63,13 +64,14 @@
 #include "gtmmsg.h"	/* for gtm_putmsg() prototype */
 #include "memcoherency.h"
 #include "change_reg.h"
+#include "wcs_backoff.h"
+#include "wcs_wt.h"
 
 #define UPDHELPER_SLEEP 30
 #define UPDHELPER_EARLY_EPOCH 5
 #define THRESHOLD_FOR_PAUSE 10
 
-GBLDEF	jnlpool_addrs		jnlpool;
-
+GBLREF	jnlpool_addrs		jnlpool;
 GBLREF	void			(*call_on_signal)();
 GBLREF	recvpool_addrs		recvpool;
 GBLREF	upd_helper_entry_ptr_t	helper_entry;
@@ -128,9 +130,10 @@ int updhelper_writer(void)
 					MM_DBFILEXT_REMAP_IF_NEEDED(csa, reg);
 				}
 				wcs_timer_start(reg, TRUE);
-				if (cnl->wcs_active_lvl >= csd->flush_trigger * csd->writer_trigger_factor / 100.0)
+				if ((cnl->wcs_active_lvl >= csd->flush_trigger * csd->writer_trigger_factor / 100.0)
+						&& !FROZEN_CHILLED(csd))
 				{
-					JNL_ENSURE_OPEN_WCS_WTSTART(csa, reg, 0, dummy_errno);
+					JNL_ENSURE_OPEN_WCS_WTSTART(csa, reg, 0, NULL, FALSE, dummy_errno);
 					flushed = TRUE;
 				}
 				assert(NULL == reorg_encrypt_restart_csa); /* ensure above wcs_wtstart call does not set it */
@@ -143,18 +146,24 @@ int updhelper_writer(void)
 						ENSURE_JNL_OPEN(csa, reg);
 					SET_GBL_JREC_TIME;
 					assert(jgbl.gbl_jrec_time);
-					if ((jbp->next_epoch_time - UPDHELPER_EARLY_EPOCH <= jgbl.gbl_jrec_time)
-						 && grab_crit_immediate(reg))
+					if (((jbp->next_epoch_time - UPDHELPER_EARLY_EPOCH) <= jgbl.gbl_jrec_time)
+						 && !FROZEN_CHILLED(csd))
 					{
-						if (jbp->next_epoch_time - UPDHELPER_EARLY_EPOCH <= jgbl.gbl_jrec_time)
+						DO_DB_FSYNC_OUT_OF_CRIT_IF_NEEDED(reg, csa, jpc, jbp);
+						if (grab_crit_immediate(reg, OK_FOR_WCS_RECOVER_TRUE))
 						{
-							ENSURE_JNL_OPEN(csa, reg);
-							wcs_flu(WCSFLU_FLUSH_HDR | WCSFLU_WRITE_EPOCH | WCSFLU_SPEEDUP_NOBEFORE
-								| WCSFLU_SYNC_EPOCH);
-							assert(NULL == reorg_encrypt_restart_csa);
+							if ((jbp->next_epoch_time - UPDHELPER_EARLY_EPOCH) <= jgbl.gbl_jrec_time)
+							{
+								ENSURE_JNL_OPEN(csa, reg);
+								wcs_flu(WCSFLU_FLUSH_HDR | WCSFLU_WRITE_EPOCH
+												| WCSFLU_SPEEDUP_NOBEFORE);
+								assert(NULL == reorg_encrypt_restart_csa);
+							}
+							rel_crit(reg);
+							/* Do equivalent of WCSFLU_SYNC_EPOCH now out of crit */
+							DO_DB_FSYNC_OUT_OF_CRIT_IF_NEEDED(reg, csa, jpc, jbp);
 						}
-						rel_crit(reg);
-				 	}
+					}
 				 }
 			 }
 		}
diff --git a/sr_port/updproc.c b/sr_port/updproc.c
index 5306bf0..741c928 100644
--- a/sr_port/updproc.c
+++ b/sr_port/updproc.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information 	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -183,6 +183,7 @@ error_def(ERR_UPDREPLSTATEOFF);
 {														\
 	jnl_buffer_ptr_t	jbp;										\
 	uint4			jnl_status;									\
+	gd_region		*reg;										\
 														\
 	assert(CSA = &FILE_INFO(gv_cur_region)->s_addrs);	/* so we can use gv_cur_region below */		\
 	assert(JPC == CSA->jnl);										\
@@ -201,7 +202,9 @@ error_def(ERR_UPDREPLSTATEOFF);
 	ADJUST_GBL_JREC_TIME_JNLPOOL(jgbl, jnlpool_ctl);							\
 	if (JNL_ENABLED(CSA))											\
 	{													\
-		jnl_status = jnl_ensure_open();									\
+		reg = JPC->region;										\
+		assert(reg == gv_cur_region);									\
+		jnl_status = jnl_ensure_open(reg, CSA);								\
 		if (0 == jnl_status)										\
 		{												\
 			if (0 == JPC->pini_addr)								\
@@ -210,15 +213,14 @@ error_def(ERR_UPDREPLSTATEOFF);
 		{												\
 			if (SS_NORMAL != JPC->status)								\
 				rts_error_csa(CSA_ARG(CSA) VARLSTCNT(7) jnl_status, 4, JNL_LEN_STR(CSA->hdr),	\
-					DB_LEN_STR(gv_cur_region), JPC->status);				\
+					DB_LEN_STR(reg), JPC->status);						\
 			else											\
 				rts_error_csa(CSA_ARG(CSA) VARLSTCNT(6) jnl_status, 4, JNL_LEN_STR(CSA->hdr),	\
-					DB_LEN_STR(gv_cur_region));						\
+					DB_LEN_STR(reg));							\
 		}												\
 	}													\
 }
 
-#ifdef UNIX
 # define UPDPROC_ONLN_RLBK_CLNUP(REG)						\
 {										\
 	sgmnt_addrs		*csa;						\
@@ -264,7 +266,21 @@ error_def(ERR_UPDREPLSTATEOFF);
 	repl_log(updproc_log_fp, TRUE, TRUE, "REPL INFO - Current Receive Pool Seqno : %llu\n",					\
 			recvpool_ctl->jnl_seqno);										\
 }
-#endif
+
+#define INCR_TUPD_NUM_AND_OP_TSTART_IF_NEEDED								\
+MBSTART {												\
+	ts_mv.mvtype = MV_STR;										\
+	ts_mv.str.len = 0;										\
+	ts_mv.str.addr = NULL;										\
+	assert((!dollar_tlevel && !tupd_num) || dollar_tlevel && (tupd_num || dollar_trestart));	\
+	if (!dollar_tlevel)										\
+	{												\
+		assert(!donot_INVOKE_MUMTSTART);							\
+		DEBUG_ONLY(donot_INVOKE_MUMTSTART = TRUE);						\
+		op_tstart(IMPLICIT_TSTART, TRUE, &ts_mv, 0);/* 0 ==> save no locals but RESTART OK */	\
+	}												\
+	tupd_num++;											\
+} MBEND
 
 CONDITION_HANDLER(updproc_ch)
 {
@@ -433,6 +449,7 @@ int updproc(void)
 #	endif
 	is_updproc = TRUE;
 	is_replicator = TRUE;	/* as update process goes through t_end() and can write jnl recs to the jnlpool for replicated db */
+	TREF(ok_to_see_statsdb_regs) = TRUE;
 	gv_play_duplicate_kills = TRUE;	/* needed to ensure seqnos are kept in sync between source and receiver instances */
 	NON_GTMTRIG_ONLY(skip_dbtriggers = TRUE;)
 	memset((uchar_ptr_t)&recvpool, 0, SIZEOF(recvpool)); /* For util_base_ch and mupip_exit */
@@ -1035,21 +1052,7 @@ void updproc_actions(gld_dbname_list *gld_db_files)
 								bad_trans_type = upd_fence_bad_t_num;
 								assert(FALSE);
 							} else if (IS_TUPD(rectype))
-							{
-								ts_mv.mvtype = MV_STR;
-								ts_mv.str.len = 0;
-								ts_mv.str.addr = NULL;
-								assert((!dollar_tlevel && !tupd_num) || dollar_tlevel
-										&& (tupd_num || dollar_trestart));
-								if (!dollar_tlevel)
-								{
-									assert(!donot_INVOKE_MUMTSTART);
-									DEBUG_ONLY(donot_INVOKE_MUMTSTART = TRUE);
-									op_tstart(IMPLICIT_TSTART, TRUE, &ts_mv, 0);
-										/* 0 ==> save no locals but RESTART OK */
-								}
-								tupd_num++;
-							}
+								INCR_TUPD_NUM_AND_OP_TSTART_IF_NEEDED;
 							upd_rec_seqno++;
 						} else if (IS_FUPD(rectype))
 							op_ztstart();
@@ -1076,16 +1079,7 @@ void updproc_actions(gld_dbname_list *gld_db_files)
 								: upd_fence_bad_lgtrig_t_num;
 					assert(FALSE);
 				} else if (IS_TUPD(rectype))
-				{
-					ts_mv.mvtype = MV_STR;
-					ts_mv.str.len = 0;
-					ts_mv.str.addr = NULL;
-					assert((!dollar_tlevel && !tupd_num) || dollar_tlevel && (tupd_num || dollar_trestart));
-					if (!dollar_tlevel)
-						 /* 0 ==> save no locals but RESTART OK */
-						op_tstart(IMPLICIT_TSTART, TRUE, &ts_mv, 0);
-					tupd_num++;
-				}
+					INCR_TUPD_NUM_AND_OP_TSTART_IF_NEEDED;
 				upd_rec_seqno++;
 			}
 		}
@@ -1327,7 +1321,8 @@ void updproc_actions(gld_dbname_list *gld_db_files)
 					{
 						csd = csa->hdr;
 						upd_helper_ctl->first_done = FALSE;
-						upd_helper_ctl->pre_read_offset = temp_read + rec_len;
+						upd_helper_ctl->pre_read_offset =
+							((temp_read + rec_len) >= write_wrap) ? 0 : temp_read + rec_len;
 						REPL_DPRINT2("pre_read_offset = %x\n", upd_helper_ctl->pre_read_offset);
 						csa->n_pre_read_trigger = (int)((csd->n_bts * (float)csd->reserved_for_upd /
 						csd->avg_blks_per_100gbl) * csd->pre_read_trigger_factor / 100.0);
diff --git a/sr_port/util_base_ch.c b/sr_port/util_base_ch.c
index 14499f8..92f28ce 100755
--- a/sr_port/util_base_ch.c
+++ b/sr_port/util_base_ch.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -79,7 +80,7 @@ CONDITION_HANDLER(util_base_ch)
 			{
 				csa = &FILE_INFO(r_local)->s_addrs;
 				if (!csa->persistent_freeze)
-					region_freeze(r_local, FALSE, FALSE, FALSE);
+					region_freeze(r_local, FALSE, FALSE, FALSE, FALSE, FALSE);
 			}
 		}
 	}
diff --git a/sr_port/view_arg_convert.c b/sr_port/view_arg_convert.c
index 3564061..ceb18e7 100755
--- a/sr_port/view_arg_convert.c
+++ b/sr_port/view_arg_convert.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information 	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -244,7 +244,8 @@ void view_arg_convert(viewtab_entry *vtp, int vtp_parm, mval *parm, viewparm *pa
 						tmp_gvt = gvnh_reg->gvt;
 					} else
 					{
-						gd_map = gv_srch_map(gd_header, gvent.var_name.addr, gvent.var_name.len);
+						gd_map = gv_srch_map(gd_header, gvent.var_name.addr, gvent.var_name.len,
+													SKIP_BASEDB_OPEN_FALSE);
 						r_ptr = gd_map->reg.addr;
 						tmp_gvt = (gv_namehead *)targ_alloc(r_ptr->max_key_size, &gvent, r_ptr);
 						GVNH_REG_INIT(gd_header, gd_header->tab_ptr, gd_map, tmp_gvt,
diff --git a/sr_port/viewtab.h b/sr_port/viewtab.h
index d89c311..6a85a59 100755
--- a/sr_port/viewtab.h
+++ b/sr_port/viewtab.h
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -81,6 +81,7 @@ VIEWTAB("NOISOLATION",		VTP_NULL | VTP_DBKEYLIST,	VTK_NOISOLATION,	MV_NM),
 VIEWTAB("NOLOGNONTP",		VTP_NULL,			VTK_NOLOGNONTP,		MV_NM),
 VIEWTAB("NOLOGTPRESTART",	VTP_NULL,			VTK_NOLOGTPRESTART,	MV_NM),
 VIEWTAB("NOLVNULLSUBS",		VTP_NULL,			VTK_NOLVNULLSUBS,	MV_NM),
+VIEWTAB("NOSTATSHARE",		VTP_NULL,			VTK_NOSTATSHARE,	MV_NM),
 VIEWTAB("NOUNDEF",		VTP_NULL,			VTK_NOUNDEF,		MV_NM),
 VIEWTAB("PATCODE",		VTP_VALUE | VTP_NULL,		VTK_PATCODE,		MV_STR),
 VIEWTAB("PATLOAD",		VTP_VALUE,			VTK_PATLOAD,		MV_NM),
@@ -93,7 +94,8 @@ VIEWTAB("REGION",		VTP_DBKEY,			VTK_REGION,		MV_STR),
 VIEWTAB("RESETGVSTATS",		VTP_NULL,			VTK_RESETGVSTATS,	MV_STR),
 VIEWTAB("RTNCHECKSUM",		VTP_RTNAME,			VTK_RTNCHECKSUM,	MV_STR),
 VIEWTAB("RTNNEXT",		VTP_RTNAME,			VTK_RTNEXT,		MV_STR),
-VIEWTAB("SPSIZE",		VTP_NULL,			VTK_SPSIZE,		MV_NM),
+VIEWTAB("SPSIZE",		VTP_NULL,			VTK_SPSIZE,		MV_STR),
+VIEWTAB("STATSHARE",		VTP_NULL,			VTK_STATSHARE,		MV_NM),
 VIEWTAB("STKSIZ",		VTP_NULL,			VTK_STKSIZ,		MV_NM),
 VIEWTAB("STORDUMP",		VTP_NULL,			VTK_STORDUMP,		MV_NM), /* nodoc : code debugging feature */
 VIEWTAB("STP_GCOL",		VTP_NULL,			VTK_STPGCOL,		MV_NM),
diff --git a/sr_port/wbox_test_init.h b/sr_port/wbox_test_init.h
index c49fe76..5aaf8cd 100755
--- a/sr_port/wbox_test_init.h
+++ b/sr_port/wbox_test_init.h
@@ -14,10 +14,18 @@
 #ifndef __WBOX_TEST_INIT_
 #define __WBOX_TEST_INIT_
 
-GBLREF	boolean_t	gtm_white_box_test_case_enabled;
-GBLREF	int		gtm_white_box_test_case_number;
-GBLREF	int		gtm_white_box_test_case_count;
-GBLREF	int 		gtm_wbox_input_test_case_count;
+/* The standalone routine gtmsecshr_wrapper needs these to be GBLDEFs so create a scheme to force that. If WBOX_GBLDEF is
+ * defined, create these as GBLDEFs instead of GBLREFs.
+ */
+#ifdef WBOX_GBLDEF
+# define REFTYPE GBLDEF
+#else
+# define REFTYPE GBLREF
+#endif
+REFTYPE	boolean_t	gtm_white_box_test_case_enabled;
+REFTYPE	int		gtm_white_box_test_case_number;
+REFTYPE	int		gtm_white_box_test_case_count;
+REFTYPE	int 		gtm_wbox_input_test_case_count;
 
 void wbox_test_init(void);
 
@@ -29,19 +37,19 @@ typedef enum {
 	WBTEST_BG_UPDATE_BTPUTNULL,		/*  4 */
 	WBTEST_BG_UPDATE_DBCSHGET_INVALID,	/*  5 */
 	WBTEST_BG_UPDATE_DBCSHGETN_INVALID,	/*  6 */
-	WBTEST_BG_UPDATE_DBCSHGETN_INVALID2,	/*  7 : VMS only twin logic */
+	WBTEST_BG_UPDATE_DBCSHGETN_INVALID2,	/*  7 : twin logic */
 	WBTEST_BG_UPDATE_READINPROGSTUCK1,	/*  8 */
 	WBTEST_BG_UPDATE_READINPROGSTUCK2,	/*  9 */
-	WBTEST_BG_UPDATE_DIRTYSTUCK1,		/* 10 : Unix only dirty wait logic */
+	WBTEST_BG_UPDATE_DIRTYSTUCK1,		/* 10 : dirty wait logic */
 	WBTEST_BG_UPDATE_DIRTYSTUCK2,		/* 11 */
 	WBTEST_BG_UPDATE_INTENDSTUCK,		/* 12 */
 	WBTEST_BG_UPDATE_INSQTIFAIL,		/* 13 */
 	WBTEST_BG_UPDATE_INSQHIFAIL,		/* 14 */
 	WBTEST_BG_UPDATE_PHASE2FAIL,		/* 15 */
 	WBTEST_JNL_FILE_LOST_DSKADDR,		/* 16 */
-	WBTEST_REPL_HEARTBEAT_NO_ACK,		/* 17 : Unix only */
-	WBTEST_REPL_TEST_UNCMP_ERROR,		/* 18 : Unix only */
-	WBTEST_REPL_TR_UNCMP_ERROR,		/* 19 : Unix only */
+	WBTEST_REPL_HEARTBEAT_NO_ACK,		/* 17 */
+	WBTEST_REPL_TEST_UNCMP_ERROR,		/* 18 */
+	WBTEST_REPL_TR_UNCMP_ERROR,		/* 19 */
 	WBTEST_TP_HIST_CDB_SC_BLKMOD,		/* 20 */
 	WBTEST_ABANDONEDKILL,			/* 21 : MUPIP STOP a kill in progress in 2nd stage*/
 	WBTEST_ENCRYPT_INIT_ERROR,		/* 22 : Prevent encryption-initialized assert from happening */
@@ -103,7 +111,7 @@ typedef enum {
 	/* Begin ANTIFREEZE related white box test cases */
 	WBTEST_ANTIFREEZE_JNLCLOSE,		/* 69 :  */
 	WBTEST_ANTIFREEZE_DBBMLCORRUPT,		/* 70 :  */
-	WBTEST_ANTIFREEZE_DBDANGER,		/* 71 :  */
+	WBTEST_EXPECT_CRYPTOPFAILED,		/* 71 :  set when expecting CRYPTOPFAILED so we don't take a core*/
 	WBTEST_ANTIFREEZE_DBFSYNCERR,		/* 72 :	 */
 	WBTEST_ANTIFREEZE_GVDATAFAIL,		/* 73 :  */
 	WBTEST_ANTIFREEZE_GVGETFAIL,		/* 74 :  */
@@ -161,7 +169,14 @@ typedef enum {
 	WBTEST_MM_CONCURRENT_FILE_EXTEND,	/* 122 : Extend database concurrently in MM */
 	WBTEST_SLEEP_IN_MUPIP_REORG_ENCRYPT,	/* 123 : Sleep in mupip_reorg_encrypt() upon releasing crit */
 	WBTEST_OPFNZCONVERT_FILE_ACCESS_ERROR,	/* 124 : gtm_strToTitle() returning U_FILE_ACCESS_ERROR error */
-	WBTEST_MUEXTRACT_GVCST_RETURN_FALSE	/* 125 : check return value of gvcst_get in concurrent update. */
+	WBTEST_MUEXTRACT_GVCST_RETURN_FALSE,	/* 125 : check return value of gvcst_get in concurrent update. */
+	WBTEST_SECSHRWRAP_NOETC,		/* 126 : gtmsecshr_wrapper pretending /etc doesn't exist */
+	WBTEST_SECSHRWRAP_NOENVIRON,		/* 127 : gtmsecshr_wrapper pretending /etc/environment doesn't exist */
+	WBTEST_SECSHRWRAP_NOTZREC_READERR,	/* 128 : gtmsecshr_wrapper read error */
+	WBTEST_SECSHRWRAP_NOTZREC_EOF,		/* 129 : gtmsecshr_wrapper no TZ record found in environment file */
+	WBTEST_SECSHRWRAP_SETENVFAIL1,		/* 130 : gtmsecshr_wrapper pretend setenv failed (before clearenv) */
+	WBTEST_SECSHRWRAP_SETENVFAIL2,		/* 131 : gtmsecshr_wrapper pretend setenv failed (after clearenv) */
+	WBTEST_HELPOUT_FAILGROUPCHECK		/* 132 : Create GTM-8654 : EUID and file owners are not group members */
 	/* Note 1: when adding new white box test cases, please make use of WBTEST_ENABLED and WBTEST_ASSIGN_ONLY (defined below)
 	 * whenever applicable
 	 * Note 2: when adding a new white box test case, see if an existing WBTEST_UNUSED* slot can be leveraged.
diff --git a/sr_port/wcs_phase2_commit_wait.c b/sr_port/wcs_phase2_commit_wait.c
index 10f1f8a..2237135 100644
--- a/sr_port/wcs_phase2_commit_wait.c
+++ b/sr_port/wcs_phase2_commit_wait.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2008-2015 Fidelity National Information	*
+ * Copyright (c) 2008-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -69,7 +69,6 @@ GBLREF	boolean_t	in_mu_rndwn_file;
 #endif
 
 #ifdef UNIX
-GBLREF	volatile uint4		heartbeat_counter;
 GBLREF	volatile int4		timer_stack_count;
 #endif
 
@@ -86,14 +85,12 @@ boolean_t	wcs_phase2_commit_wait(sgmnt_addrs *csa, cache_rec_ptr_t cr)
 {
 	sgmnt_data_ptr_t	csd;
 	node_local_ptr_t        cnl;
-	uint4			lcnt, blocking_pid, start_in_tend, spincnt, maxspincnt, start_heartbeat, heartbeat_delta;
+	uint4			lcnt, blocking_pid, start_in_tend, spincnt, maxspincnt;
 	int4			value;
 	boolean_t		was_crit;
-	boolean_t		use_heartbeat;
+	boolean_t		use_timer;
+	boolean_t		timedout;
 	block_id		blk;
-#	ifdef VMS
-	uint4			heartbeat_counter = 0;	/* dummy variable to make compiler happy */
-#	endif
 	int4			index, crarray_size, crarray_index;
 	cache_rec_ptr_t		cr_lo, cr_top, curcr;
 	phase2_wait_trace_t	crarray[MAX_PHASE2_WAIT_CR_TRACE_SIZE];
@@ -123,19 +120,19 @@ boolean_t	wcs_phase2_commit_wait(sgmnt_addrs *csa, cache_rec_ptr_t cr)
 	 * the sleep approach for Tru64. Choosing a spincnt of 0 would choose the sleep approach (versus rel_quant).
 	 */
 #	if (defined(UNIX) && !defined(__osf__))
-	use_heartbeat = (!process_exiting && csd->wcs_phase2_commit_wait_spincnt && (1 > timer_stack_count));
+	use_timer = (!process_exiting && csd->wcs_phase2_commit_wait_spincnt && (1 > timer_stack_count));
 #	else
-	use_heartbeat = FALSE;
+	use_timer = FALSE;
 #	endif
-	DEBUG_ONLY(phase2_commit_half_wait = use_heartbeat ? (PHASE2_COMMIT_WAIT_HTBT >> 1) : (PHASE2_COMMIT_WAIT >> 1);)
-	if (use_heartbeat)
+	if (use_timer)
 	{
 		maxspincnt = csd->wcs_phase2_commit_wait_spincnt;
 		assert(maxspincnt);
 		if (!maxspincnt)
 			maxspincnt = WCS_PHASE2_COMMIT_DEFAULT_SPINCNT;
-		start_heartbeat = heartbeat_counter;
-	}
+		TIMEOUT_INIT(timedout, PHASE2_COMMIT_WAIT_MS DEBUG_ONLY(/ 2));
+	} else
+		DEBUG_ONLY(phase2_commit_half_wait = (PHASE2_COMMIT_WAIT >> 1));
 	assert(dba_bg == csd->acc_meth);
 	if (dba_bg != csd->acc_meth)	/* in pro, be safe and return */
 		return TRUE;
@@ -159,12 +156,18 @@ boolean_t	wcs_phase2_commit_wait(sgmnt_addrs *csa, cache_rec_ptr_t cr)
 		/* we better not deadlock wait for ourself */
 		if (!was_crit && (process_id == start_in_tend))
 		{
+			if (use_timer)
+				TIMEOUT_DONE(timedout);
 			assert(gtm_white_box_test_case_enabled);
 			return TRUE;
 		}
 		assertpro(process_id != start_in_tend);	/* should not deadlock on our self */
 		if (!start_in_tend)
+		{
+			if (use_timer)
+				TIMEOUT_DONE(timedout);
 			return TRUE;
+		}
 	} else
 	{	/* initialize the beginning and the end of cache-records to be used later (only in case of cr == NULL) */
 		cr_lo = ((cache_rec_ptr_t)csa->acc_meth.bg.cache_state->cache_array) + csd->bt_buckets;
@@ -178,7 +181,11 @@ boolean_t	wcs_phase2_commit_wait(sgmnt_addrs *csa, cache_rec_ptr_t cr)
 		{
 			value = cnl->wcs_phase2_commit_pidcnt;
 			if (!value)
+			{
+				if (use_timer)
+					TIMEOUT_DONE(timedout);
 				return TRUE;
+			}
 		} else
 		{	/* If we dont hold crit and are sleep looping waiting for cr->in_tend to become 0, it is
 			 * theoretically possible (though very remote) that every one of the 1000s of iterations we look
@@ -200,6 +207,8 @@ boolean_t	wcs_phase2_commit_wait(sgmnt_addrs *csa, cache_rec_ptr_t cr)
 			value = cr->in_tend;
 			if (value != start_in_tend)
 			{
+				if (use_timer)
+					TIMEOUT_DONE(timedout);
 				assert(!was_crit || !value);
 				return TRUE;
 			}
@@ -208,15 +217,16 @@ boolean_t	wcs_phase2_commit_wait(sgmnt_addrs *csa, cache_rec_ptr_t cr)
 				 * a minute, we will time out for no reason. No point proceeding with this transaction
 				 * anyway as we are bound to restart. Do that right away. Caller knows to restart.
 				 */
+				if (use_timer)
+					TIMEOUT_DONE(timedout);
 				return FALSE;
 			}
 		}
-		if (use_heartbeat)
+		if (use_timer)
 		{
 			if (spincnt < maxspincnt)
 				continue;
 			assert(spincnt == maxspincnt);
-			heartbeat_delta = heartbeat_counter - start_heartbeat;
 		}
 		spincnt = 0;
 		lcnt++;
@@ -234,13 +244,25 @@ boolean_t	wcs_phase2_commit_wait(sgmnt_addrs *csa, cache_rec_ptr_t cr)
 		{
 			BG_TRACE_PRO_ANY(csa, phase2_commit_wait_pidcnt);
 		}
-		if (use_heartbeat)
+		if (use_timer)
 		{	/* this seems like a nanosleep would be better than a rel_quant,
 			 * but a wake mechanism, perhaps using a queue shared by all phase 2 blockers might be better still
 			 */
-			if (PHASE2_COMMIT_WAIT_HTBT < heartbeat_delta)
+			if (timedout)
+			{
+#				ifdef DEBUG
+				if(!half_time)
+				{
+					half_time = TRUE;
+					TIMEOUT_DONE(timedout);
+					TIMEOUT_INIT(timedout, PHASE2_COMMIT_WAIT_MS / 2);
+				}
+				else
+					break;
+#				else
 				break;
-			DEBUG_ONLY(half_time = (phase2_commit_half_wait == heartbeat_delta));
+#				endif
+			}
 			rel_quant();
 		} else
 		{
@@ -269,6 +291,8 @@ boolean_t	wcs_phase2_commit_wait(sgmnt_addrs *csa, cache_rec_ptr_t cr)
 #		endif
 
 	}
+	if (use_timer)
+		TIMEOUT_DONE(timedout);
 	if (NULL == cr)
 	{	/* This is the case where we wait for all the phase2 commits to complete. Note down the cache records that
 		 * are still not done with the commits. Since there can be multiple cache records held by the same PID, note
diff --git a/sr_port/wcs_read_in_progress_wait.c b/sr_port/wcs_read_in_progress_wait.c
index 6b23ae9..0afd96e 100644
--- a/sr_port/wcs_read_in_progress_wait.c
+++ b/sr_port/wcs_read_in_progress_wait.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2007-2015 Fidelity National Information	*
+ * Copyright (c) 2007-2016 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -60,12 +60,12 @@ boolean_t	wcs_read_in_progress_wait(cache_rec_ptr_t cr, wbtest_code_t wbox_test_
 		if (BUF_OWNER_STUCK < lcnt)
 		{	/* sick of waiting */
 			/* Since cr->r_epid can be changing concurrently, take a local copy before using it below,
-			 * particularly before calling is_proc_alive as we dont want to call it with a 0 r_epid.
+			 * particularly before calling is_proc_alive as we don't want to call it with a 0 r_epid.
 			 */
 			r_epid = cr->r_epid;
 			if (0 != r_epid)
 			{
-				if (FALSE == is_proc_alive(r_epid, cr->image_count))
+				if (FALSE == is_proc_alive(r_epid, 0))
 				{	/* process gone; release its lock */
 					cr->r_epid = 0;
 					RELEASE_BUFF_READ_LOCK(cr);
diff --git a/sr_port/wcs_recover.c b/sr_port/wcs_recover.c
old mode 100755
new mode 100644
index d4f7d50..48ea310
--- a/sr_port/wcs_recover.c
+++ b/sr_port/wcs_recover.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -16,23 +16,14 @@
 #include "gtm_time.h"
 #include "gtmimagename.h"
 
-#ifdef UNIX
-#  include <sys/mman.h>
-# ifdef _AIX
+#include <sys/mman.h>
+#ifdef _AIX
 # include <sys/shm.h>
-# endif
-#  include "gtm_stat.h"
-#  include <errno.h>
-#  include "gtm_signal.h"
-#elif defined(VMS)
-#  include <fab.h>
-#  include <iodef.h>
-#  include <ssdef.h>
-#else
-#  error UNSUPPORTED PLATFORM
 #endif
+#include "gtm_stat.h"
+#include <errno.h>
+#include "gtm_signal.h"
 
-#include "ast.h"	/* needed for DCLAST_WCS_WTSTART macro in gdsfhead.h */
 #include "gdsroot.h"
 #include "gdskill.h"
 #include "gtm_facility.h"
@@ -41,24 +32,15 @@
 #include "gdsblk.h"
 #include "gdsfhead.h"
 #include "gdsbgtr.h"
-#include "gdsbml.h"
 #include "filestruct.h"
 #include "gdscc.h"
 #include "interlock.h"
 #include "jnl.h"
 #include "testpt.h"
 #include "sleep_cnt.h"
-#include "mupipbckup.h"
 #include "wbox_test_init.h"
-
-#ifdef UNIX
-#  include "eintr_wrappers.h"
-   GBLREF	sigset_t	blockalrm;
-#endif
-
+#include "eintr_wrappers.h"
 #include "send_msg.h"
-#include "bit_set.h"
-#include "bit_clear.h"
 #include "relqop.h"
 #include "is_proc_alive.h"
 #include "mmseg.h"
@@ -77,31 +59,26 @@
 #include "tp.h"
 #include "memcoherency.h"
 #include "gtm_c_stack_trace.h"
-
-#ifdef GTM_TRUNCATE
+#include "wcs_wt.h"
 #include "recover_truncate.h"
-#endif
 
-GBLREF	boolean_t		certify_all_blocks;
-GBLREF	sgmnt_addrs		*cs_addrs;
-GBLREF 	sgmnt_data_ptr_t 	cs_data;
-GBLREF	gd_region		*gv_cur_region;
-GBLREF	gv_key			*gv_currkey;		/* needed in VMS for error logging in MM */
-GBLREF	uint4			process_id;
-GBLREF	testpt_struct		testpoint;
-GBLREF  inctn_opcode_t          inctn_opcode;
+GBLREF	boolean_t		is_src_server;
 GBLREF	boolean_t		mupip_jnl_recover;
-GBLREF 	jnl_gbls_t		jgbl;
-GBLREF	enum gtmImageTypes	image_type;
+GBLREF	gd_region		*gv_cur_region;
+GBLREF	sgmnt_addrs		*cs_addrs;
+GBLREF	uint4			dollar_tlevel;
 GBLREF	uint4			gtmDebugLevel;
+GBLREF	uint4			process_id;
 GBLREF	unsigned int		cr_array_index;
-GBLREF	uint4			dollar_tlevel;
 GBLREF	volatile boolean_t	in_wcs_recover;	/* TRUE if in "wcs_recover" */
-GBLREF	boolean_t		is_src_server;
+GBLREF 	jnl_gbls_t		jgbl;
+GBLREF 	sgmnt_data_ptr_t 	cs_data;
+GBLREF	inctn_opcode_t		inctn_opcode;
 #ifdef DEBUG
 GBLREF	unsigned int		t_tries;
 GBLREF	int			process_exiting;
 GBLREF	boolean_t		in_mu_rndwn_file;
+GBLREF	boolean_t		dse_running;
 #endif
 
 error_def(ERR_BUFRDTIMEOUT);
@@ -111,10 +88,9 @@ error_def(ERR_DBCNTRLERR);
 error_def(ERR_DBCRERR);
 error_def(ERR_DBDANGER);
 error_def(ERR_DBFILERR);
-error_def(ERR_INVALIDRIP);
 error_def(ERR_GBLOFLOW);
 error_def(ERR_GVIS);
-error_def(ERR_STOPTIMEOUT);
+error_def(ERR_INVALIDRIP);
 error_def(ERR_SYSCALL);
 error_def(ERR_TEXT);
 
@@ -132,22 +108,22 @@ error_def(ERR_TEXT);
 void wcs_recover(gd_region *reg)
 {
 	bt_rec_ptr_t		bt;
-	cache_rec_ptr_t		cr, cr_alt, cr_alt_new, cr_lo, cr_top, hash_hdr;
+	cache_rec_ptr_t		cr, cr_alt, cr_lo, cr_hi, hash_hdr, cr_old, cr_new;
 	cache_que_head_ptr_t	active_head, hq, wip_head, wq;
 	gd_region		*save_reg;
 	que_ent_ptr_t		back_link; /* should be crit & not need interlocked ops. */
 	sgmnt_addrs		*csa;
 	sgmnt_data_ptr_t	csd;
 	node_local_ptr_t	cnl;
-	int4			bml_full, dummy_errno, blk_size;
+	int4			dummy_errno, blk_size;
 	uint4			jnl_status, epid, r_epid;
-	int4			bt_buckets, bufindx;	/* should be the same type as "csd->bt_buckets" */
-	inctn_opcode_t          save_inctn_opcode;
-	unsigned int		bplmap, lcnt, total_blks, wait_in_rip;
+	int4			bt_buckets;
+	inctn_opcode_t		save_inctn_opcode;
+	unsigned int		bplmap, lcnt, total_rip_wait;
 	sm_uc_ptr_t		buffptr;
 	blk_hdr_ptr_t		blk_ptr;
-	INTPTR_T		bp_lo, bp_top, old_block;
-	boolean_t		backup_block_saved, change_bmm;
+	INTPTR_T		bp_lo, bp_top;
+	boolean_t		asyncio, twinning_on, wcs_wtfini_ret;
 	jnl_private_control	*jpc;
 	jnl_buffer_ptr_t	jbp;
 	sgm_info		*si;
@@ -156,7 +132,7 @@ void wcs_recover(gd_region *reg)
 	SETUP_THREADGBL_ACCESS;
 	/* If this is the source server, do not invoke cache recovery as that implies touching the database file header
 	 * (incrementing the curr_tn etc.) and touching the journal file (writing INCTN records) both of which are better
-	 * avoided by the source server; It is best to keep it as read-only to the db/jnl as possible.  It is ok to do
+	 * avoided by the source server; It is best to keep it as read-only to the db/jnl as possible. It is ok to do
 	 * so because the source server anyways does not rely on the integrity of the database cache and so does not need
 	 * to fix it right away. Any other process that does rely on the cache integrity will fix it when it gets crit next.
 	 */
@@ -176,7 +152,7 @@ void wcs_recover(gd_region *reg)
 	cnl = csa->nl;
 	si = csa->sgm_info_ptr;
 	/* If a mupip truncate operation was abruptly interrupted we have to correct any inconsistencies */
-	GTM_TRUNCATE_ONLY(recover_truncate(csa, csd, gv_cur_region);)
+	recover_truncate(csa, csd, gv_cur_region);
 	/* We are going to UNPIN (reset in_cw_set to 0) ALL cache-records so assert that we are not in the middle of a
 	 * non-TP or TP transaction that has already PINNED a few buffers as otherwise we will create an out-of-design state.
 	 * The only exception is if we are in the 2nd phase of KILL in a TP transaction. In this case si->cr_aray_index
@@ -198,9 +174,16 @@ void wcs_recover(gd_region *reg)
 	/* if the wait loop above hits the limit, or cnl->intent_wtstart goes negative, it is ok to proceed since
 	 * wcs_verify (invoked below) reports and clears cnl->intent_wtstart and cnl->in_wtstart.
 	 */
-	assert(!TREF(donot_write_inctn_in_wcs_recover) || in_mu_rndwn_file UNIX_ONLY(|| jgbl.onlnrlbk) || jgbl.mur_extract);
+	assert(!TREF(donot_write_inctn_in_wcs_recover) || in_mu_rndwn_file || jgbl.onlnrlbk || jgbl.mur_extract);
 	assert(!in_mu_rndwn_file || (0 == cnl->wcs_phase2_commit_pidcnt));
 	assert(!csa->wcs_pidcnt_incremented); /* we should never have come here with a phase2 commit pending for ourself */
+	/* A non-zero value of cnl->wtfini_in_prog implies a process in
+	 * wcs_wtfini() was abnormally terminated (e.g. kill -9). Since we have
+	 * crit here and are about to reinitialize the cache structures, it is
+	 * safe to reset it here
+	 */
+	if (0 != cnl->wtfini_in_prog)
+		cnl->wtfini_in_prog = 0;
 	/* Wait for any pending phase2 commits to finish */
 	if (cnl->wcs_phase2_commit_pidcnt)
 	{
@@ -211,6 +194,9 @@ void wcs_recover(gd_region *reg)
 		 * decrementing cnl->wcs_phase2_commit_pidcnt). Anyways wcs_verify reports and clears this field so no problems.
 		 */
 	}
+	asyncio = csd->asyncio;
+	twinning_on = TWINNING_ON(csd);
+	wip_head = &csa->acc_meth.bg.cache_state->cacheq_wip;
 	BG_TRACE_PRO_ANY(csa, wc_blocked_wcs_recover_invoked);
 	if (wcs_verify(reg, TRUE, TRUE))	/* expect_damage is TRUE, in_wcs_recover is TRUE */
 	{	/* if it passes verify, then recover can't help ??? what to do */
@@ -219,121 +205,38 @@ void wcs_recover(gd_region *reg)
 	}
 	if (gtmDebugLevel)
 		verifyAllocatedStorage();
-	change_bmm = FALSE;
 	/* Before recovering the cache, set early_tn to curr_tn + 1 to indicate to have_crit that we are in a situation that
 	 * is equivalent to being in the midst of a database commit and therefore defer exit handling in case of a MUPIP STOP.
 	 * wc_blocked is anyways set to TRUE at this point so the next process to grab crit will anyways attempt another recovery.
 	 */
 	if (!TREF(donot_write_inctn_in_wcs_recover))
+	{
 		csd->trans_hist.early_tn = csd->trans_hist.curr_tn + 1;
+		/* Take this opportunity to set "cnl->last_wcs_recover_tn" BEFORE cache recover (e.g. "bt_refresh") starts.
+		 * This is relied upon by the out-of-crit validation logic in tp_hist/t_end.
+		 */
+		cnl->last_wcs_recover_tn = csd->trans_hist.curr_tn;
+	}
 	assert(!in_wcs_recover);	/* should not be called if we are already in "wcs_recover" for another region */
 	in_wcs_recover = TRUE;	/* used by bt_put() called below */
 	bt_refresh(csa, TRUE);	/* this resets all bt->cache_index links to CR_NOTVALID */
 	/* the following queue head initializations depend on the wc_blocked mechanism for protection from wcs_wtstart */
-	wip_head = &csa->acc_meth.bg.cache_state->cacheq_wip;
 	memset(wip_head, 0, SIZEOF(cache_que_head));
 	active_head = &csa->acc_meth.bg.cache_state->cacheq_active;
 	memset(active_head, 0, SIZEOF(cache_que_head));
-	UNIX_ONLY(wip_head = active_head);	/* all inserts into wip_que in VMS should be done in active_que in UNIX */
-	UNIX_ONLY(SET_LATCH_GLOBAL(&active_head->latch, LOCK_AVAILABLE));
+	cnl->cur_lru_cache_rec_off = GDS_ABS2REL(csa->acc_meth.bg.cache_state->cache_array + csd->bt_buckets);
 	cnl->wcs_active_lvl = 0;
+	cnl->wcs_wip_lvl = 0;
 	cnl->wc_in_free = 0;
 	bplmap = csd->bplmap;
 	hash_hdr = (cache_rec_ptr_t)csa->acc_meth.bg.cache_state->cache_array;
 	bt_buckets = csd->bt_buckets;
-	for (cr = hash_hdr, cr_top = cr + bt_buckets; cr < cr_top;  cr++)
+	for (cr = hash_hdr, cr_hi = cr + bt_buckets; cr < cr_hi; cr++)
 		cr->blkque.fl = cr->blkque.bl = 0;	/* take no chances that the blkques are messed up */
-	cr_lo = cr_top;
-	cr_top = cr_top + csd->n_bts;
+	cr_lo = cr_hi;
+	cr_hi = cr_lo + csd->n_bts;
 	blk_size = csd->blk_size;
-	buffptr = (sm_uc_ptr_t)ROUND_UP((sm_ulong_t)cr_top, OS_PAGE_SIZE);
-	backup_block_saved = FALSE;
-	if (BACKUP_NOT_IN_PROGRESS != cnl->nbb)
-	{	/* Online backup is in progress. Check if secshr_db_clnup has created any cache-records with pointers
-		 * to before-images that need to be backed up. If so take care of that first before doing any cache recovery.
-		 */
-		bp_lo = (INTPTR_T)buffptr;
-		bp_top = bp_lo + ((gtm_uint64_t)csd->n_bts * csd->blk_size);
-		for (cr = cr_lo; cr < cr_top;  cr++)
-		{
-			if (cr->stopped && (0 != cr->twin))
-			{	/* Check if cr->twin points to a valid buffer. Only in that case, do the backup */
-				old_block = (INTPTR_T)GDS_ANY_REL2ABS(csa, cr->twin);
-				if (!IS_PTR_IN_RANGE(old_block, bp_lo, bp_top))
-				{
-					send_msg_csa(CSA_ARG(csa) VARLSTCNT(11) ERR_DBADDRANGE, 9, DB_LEN_STR(reg),
-						cr, cr->blk, old_block, RTS_ERROR_TEXT("bkup_before_image_range"), bp_lo, bp_top);
-					assert(FALSE);
-					continue;
-				} else if (!IS_PTR_ALIGNED(old_block, bp_lo, csd->blk_size))
-				{
-					send_msg_csa(CSA_ARG(csa) VARLSTCNT(11) ERR_DBADDRALIGN, 9, DB_LEN_STR(reg), cr, cr->blk,
-						RTS_ERROR_TEXT("bkup_before_image_align"), old_block, bp_lo, csd->blk_size);
-					assert(FALSE);
-					continue;
-				}
-				bufindx = (int4)((old_block - bp_lo) / csd->blk_size);
-				assert(0 <= bufindx);
-				assert(bufindx < csd->n_bts);
-				cr_alt = &cr_lo[bufindx];
-				assert((sm_uc_ptr_t)old_block == (sm_uc_ptr_t)GDS_ANY_REL2ABS(csa, cr_alt->buffaddr));
-				/* Do other checks to validate before-image buffer */
-				if (cr_alt == cr)
-				{
-					send_msg_csa(CSA_ARG(csa) VARLSTCNT(13) ERR_DBCRERR, 11, DB_LEN_STR(reg), cr, cr->blk,
-						RTS_ERROR_TEXT("bkup_before_image_cr_same"), cr_alt, FALSE, CALLFROM);
-					assert(FALSE);
-					continue;
-				} else if (cr->blk != cr_alt->blk)
-				{
-					send_msg_csa(CSA_ARG(csa) VARLSTCNT(13) ERR_DBCRERR, 11, DB_LEN_STR(reg), cr, cr->blk,
-						RTS_ERROR_TEXT("bkup_before_image_blk"), cr_alt->blk, cr->blk, CALLFROM);
-					assert(FALSE);
-					continue;
-				} else if (!cr_alt->in_cw_set)
-				{
-					send_msg_csa(CSA_ARG(csa) VARLSTCNT(13) ERR_DBCRERR, 11, DB_LEN_STR(reg), cr_alt,
-							cr_alt->blk, RTS_ERROR_TEXT("bkup_before_image_in_cw_set"),
-							cr_alt->in_cw_set, TRUE, CALLFROM);
-					assert(FALSE);
-					continue;
-				} else if (cr_alt->stopped)
-				{
-					send_msg_csa(CSA_ARG(csa) VARLSTCNT(13) ERR_DBCRERR, 11, DB_LEN_STR(reg), cr_alt,
-							cr_alt->blk, RTS_ERROR_TEXT("bkup_before_image_stopped"),
-							cr_alt->stopped, FALSE, CALLFROM);
-					assert(FALSE);
-					continue;
-				}
-				VMS_ONLY(
-					/* At this point, it is possible cr_alt points to the older twin. In this case though, the
-					 * commit should have errored out BEFORE the newer twin got built. This way we are
-					 * guaranteed that the cache-record holding the proper before-image is indeed the older
-					 * twin. This is asserted below.
-					 */
-					DEBUG_ONLY(
-						cr_alt_new = (cr_alt->twin)
-							? ((cache_rec_ptr_t)GDS_ANY_REL2ABS(csa, cr_alt->twin)) : NULL;
-					)
-					assert(!cr_alt->twin || cr_alt->bt_index
-						|| cr_alt_new->bt_index && cr_alt_new->in_tend && cr_alt_new->in_cw_set);
-				)
-				/* The following check is similar to the one in BG_BACKUP_BLOCK and the one in
-				 * secshr_db_clnup (where backup_block is invoked)
-				 */
-				blk_ptr = (blk_hdr_ptr_t)old_block;
-				if ((cr_alt->blk >= cnl->nbb)
-					&& (0 == csa->shmpool_buffer->failed)
-					&& (blk_ptr->tn < csa->shmpool_buffer->backup_tn)
-					&& (blk_ptr->tn >= csa->shmpool_buffer->inc_backup_tn))
-				{
-					cr_alt->buffaddr = cr->twin;	/* reset it to what it should be just to be safe */
-					backup_block(csa, cr_alt->blk, cr_alt, NULL);
-					backup_block_saved = TRUE;
-				}
-			}
-		}
-	}
+	buffptr = (sm_uc_ptr_t)ROUND_UP((sm_ulong_t)cr_hi, OS_PAGE_SIZE);
 	/* After recovering the cache, we normally increment the db curr_tn. But this should not be done if called from
 	 * forward journal recovery, since we want the final database transaction number to match the journal file's
 	 * eov_tn (to avoid JNLDBTNNOMATCH errors). Therefore in this case, make sure all "tn" fields in the bt and cache are set
@@ -345,8 +248,10 @@ void wcs_recover(gd_region *reg)
 		csd->trans_hist.curr_tn--;
 		csd->trans_hist.early_tn--;
 		assert(csd->trans_hist.early_tn == (csd->trans_hist.curr_tn + 1));
+		/* Adjust "cnl->last_wcs_recover_tn" to be in sync with adjusted curr_tn */
+		cnl->last_wcs_recover_tn = csd->trans_hist.curr_tn;
 	}
-	for (cr = cr_lo, wait_in_rip = 0; cr < cr_top;  cr++, buffptr += blk_size)
+	for (cr = cr_lo, total_rip_wait = 0; cr < cr_hi; cr++, buffptr += blk_size)
 	{
 		cr->buffaddr = GDS_ANY_ABS2REL(csa, buffptr);	/* reset it to what it should be just to be safe */
 		if (((int)(cr->blk) != CR_BLKEMPTY) && (((int)(cr->blk) < 0) || ((int)(cr->blk) >= csd->trans_hist.total_blks)))
@@ -362,16 +267,11 @@ void wcs_recover(gd_region *reg)
 			cr->dirty = csd->trans_hist.curr_tn;	/* we assume csd->trans_hist.curr_tn is valid */
 		if (cr->flushed_dirty_tn >= cr->dirty)
 			cr->flushed_dirty_tn = 0;
-		UNIX_ONLY(
-			/* reset all fields that might be corrupt that wcs_verify() cares about */
-			cr->epid = 0;
-			cr->image_count = 0;	/* image_count needs to be reset before its usage below in case it is corrupt */
-		)
 		/* wait for read-in-progress to complete */
-		for (lcnt = 1;  (-1 != cr->read_in_progress);  lcnt++)
+		for (lcnt = 1; (-1 != cr->read_in_progress); lcnt++)
 		{	/* very similar code appears elsewhere and perhaps should be common */
 			/* Since cr->r_epid can be changing concurrently, take a local copy before using it below,
-			 * particularly before calling is_proc_alive as we dont want to call it with a 0 r_epid.
+			 * particularly before calling is_proc_alive as we don't want to call it with a 0 r_epid.
 			 */
 			r_epid = cr->r_epid;
 			if (cr->read_in_progress < -1)
@@ -383,20 +283,19 @@ void wcs_recover(gd_region *reg)
 				SHMPOOL_FREE_CR_RFMT_BLOCK(reg, csa, cr);
 				assert(cr->r_epid == 0);
 				assert(0 == cr->dirty);
-			} else  if ((0 != r_epid)
-					&& ((r_epid == process_id) || (FALSE == is_proc_alive(r_epid, cr->image_count))))
+			} else if ((0 != r_epid) && ((r_epid == process_id) || (FALSE == is_proc_alive(r_epid, 0))))
 			{
 				INTERLOCK_INIT(cr);	/* Process gone, release that process's lock */
 				cr->cycle++;	/* increment cycle whenever blk number changes (tp_hist depends on this) */
 				cr->blk = CR_BLKEMPTY;
 				SHMPOOL_FREE_CR_RFMT_BLOCK(reg, csa, cr);
-	   		} else
+			} else
 			{
 				if (1 == lcnt)
 					epid = r_epid;
-				else  if ((BUF_OWNER_STUCK < lcnt) || (MAX_WAIT_FOR_RIP <= wait_in_rip))
+				else if ((BUF_OWNER_STUCK < lcnt) || (MAX_WAIT_FOR_RIP <= total_rip_wait))
 				{	/* If we have already waited for atleast 4 minutes, no longer wait but fixup
-					 * all following cr's.  If r_epid is 0 and also read in progress, we identify
+					 * all following cr's. If r_epid is 0 and also read in progress, we identify
 					 * this as corruption and fixup up this cr and proceed to the next cr.
 					 */
 					assert(WBTEST_CRASH_SHUTDOWN_EXPECTED == gtm_white_box_test_case_number);
@@ -407,118 +306,76 @@ void wcs_recover(gd_region *reg)
 					}
 					/* process still active but not playing fair or cache is corrupted */
 					GET_C_STACK_FROM_SCRIPT("BUFRDTIMEOUT", process_id, r_epid, TWICE);
-					send_msg_csa(CSA_ARG(csa) VARLSTCNT(8) ERR_BUFRDTIMEOUT, 6, process_id, cr->blk, cr, r_epid,
-						DB_LEN_STR(reg));
-					send_msg_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_TEXT, 2, LEN_AND_LIT("Buffer forcibly seized"));
+					send_msg_csa(CSA_ARG(csa) VARLSTCNT(12) ERR_BUFRDTIMEOUT, 6, process_id, cr->blk, cr,
+						r_epid, DB_LEN_STR(reg), ERR_TEXT, 2, LEN_AND_LIT("Buffer forcibly seized"));
 					INTERLOCK_INIT(cr);
 					cr->cycle++;	/* increment cycle whenever blk number changes (tp_hist depends on this) */
 					cr->blk = CR_BLKEMPTY;
 					SHMPOOL_FREE_CR_RFMT_BLOCK(reg, csa, cr);
 					if (BUF_OWNER_STUCK < lcnt)
-						wait_in_rip++;
+						total_rip_wait++;
 					break;
 				}
 				DEBUG_ONLY(
-				else if (((BUF_OWNER_STUCK / 2) == lcnt) || ((MAX_WAIT_FOR_RIP / 2) == wait_in_rip))
+				else if (((BUF_OWNER_STUCK / 2) == lcnt) || ((MAX_WAIT_FOR_RIP / 2) == total_rip_wait))
 						GET_C_STACK_FROM_SCRIPT("BUFRDTIMEOUT", process_id, r_epid, ONCE);)
-    				wcs_sleep(lcnt);
+				wcs_sleep(lcnt);
 			}
 		}
 		/* reset cr->rip_latch. it is unused in VMS, but wcs_verify() checks it hence the reset in both Unix and VMS */
-		UNIX_ONLY(SET_LATCH_GLOBAL(&(cr->rip_latch), LOCK_AVAILABLE));
-		VMS_ONLY(memset((sm_uc_ptr_t)&cr->rip_latch, 0, SIZEOF(global_latch_t)));
+		SET_LATCH_GLOBAL(&(cr->rip_latch), LOCK_AVAILABLE);
 		cr->r_epid = 0;		/* the processing above should make this appropriate */
-		cr->tn = csd->trans_hist.curr_tn;
 		cr->blkque.fl = cr->blkque.bl = 0;		/* take no chances that the blkques are messed up */
 		cr->state_que.fl = cr->state_que.bl = 0;	/* take no chances that the state_ques are messed up */
 		cr->in_cw_set = 0;	/* this has crit and is here, so in_cw_set must no longer be non-zero */
-		UNIX_ONLY(cr->wip_stopped = FALSE;)
-		VMS_ONLY(
-			if (cr->wip_stopped)
-			{
-				for (lcnt = 1; (0 == cr->iosb.cond) && is_proc_alive(cr->epid, cr->image_count); lcnt++)
-				{
-					if (1 == lcnt)
-						epid = cr->epid;
-					else  if (BUF_OWNER_STUCK < lcnt)
-					{
-						if (!((0 == cr->epid) || (epid == cr->epid)))
-						{
-							send_msg_csa(CSA_ARG(csa) VARLSTCNT(4) ERR_INVALIDRIP, 2, DB_LEN_STR(reg));
-							assert(FALSE);
-						}
-						if (0 != epid)
-						{	/* process still active, but not playing fair */
-							send_msg_csa(CSA_ARG(csa) VARLSTCNT(5) ERR_STOPTIMEOUT, 3, cr->epid,
-									DB_LEN_STR(reg));
-							send_msg_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_TEXT, 2,
-									LEN_AND_LIT("Buffer forcibly seized"));
-							cr->epid = 0;
-						}
-						continue;
-					}
-					wcs_sleep(lcnt);
-				}
-				if (0 == cr->iosb.cond)
-				{	/* if it's abandonned wip_stopped, treat it as a WRT_STRT_PNDNG */
-					cr->iosb.cond = WRT_STRT_PNDNG;
-					cr->epid = 0;
-					cr->image_count = 0;
-				}	/* otherwise the iosb.cond should suffice */
-				cr->wip_stopped = FALSE;
-			}
-		)
+		/* If asyncio is TRUE and cr->epid is non-zero, it is a WIP record. Do not touch it */
+		if (!asyncio)
+			cr->epid = 0;
 		if (0 != cr->twin)
-		{	/* clean up any old twins. in unix twin is unused so reset it without examining its value */
-			VMS_ONLY(
-				cr_alt = (cache_rec_ptr_t)GDS_ANY_REL2ABS(csa, cr->twin);
-				if (!CR_NOT_ALIGNED(cr_alt, cr_lo) && !CR_NOT_IN_RANGE(cr_alt, cr_lo, cr_top))
-				{
-					assert(((cache_rec_ptr_t)GDS_ANY_REL2ABS(csa, cr_alt->twin)) == cr);
-					assert((0 == cr->bt_index) || (0 == cr_alt->bt_index));		/* at least one zero */
-					assert((0 != cr->bt_index) || (0 != cr_alt->bt_index));		/* at least one non-zero */
-					cr_alt->twin = 0;
-				}
-			)
-			cr->twin = 0;
-		}
+			cr->twin = 0; /* Clean up "twin" link. We will set it afresh further down below */
 		if (JNL_ENABLED(csd) && cr->dirty)
 		{
 			if ((NULL != csa->jnl) && (NULL != csa->jnl->jnl_buff) && (cr->jnl_addr > csa->jnl->jnl_buff->freeaddr))
 				cr->jnl_addr = csa->jnl->jnl_buff->freeaddr;
 		} else
 			cr->jnl_addr = 0;	/* just be safe */
+		if (cr->data_invalid)
+		{	/* Some process was shot (kill -9 in Unix) in the middle of an update. So send a DBDANGER warning first.
+			 * If the buffer was dirty at the start of this current update we cannot discard this buffer (since it
+			 * contains updates corresponding to prior transactions) but otherwise we can discard it as a clean
+			 * copy of this block (minus the current update) can be later fetched from disk.
+			 * If cr->tn is 0, it means this buffer was not dirty at the start of this current update. And vice versa.
+			 * So that provides a convenient way to decide.
+			 */
+			if (!jgbl.mur_rollback)
+				send_msg_csa(CSA_ARG(csa) VARLSTCNT(7) ERR_DBDANGER, 5, cr->data_invalid, cr->data_invalid,
+						DB_LEN_STR(reg), cr->blk);
+			assert(gtm_white_box_test_case_enabled
+				&& (WBTEST_CRASH_SHUTDOWN_EXPECTED == gtm_white_box_test_case_number));
+			cr->data_invalid = 0;
+			if (!cr->tn)
+				cr->dirty = 0;
+		}
+		cr->tn = csd->trans_hist.curr_tn;
 		assert(!cr->stopped || (CR_BLKEMPTY != cr->blk));
+		assert(!cr->stopped || (0 == cr->twin));
 		if (cr->stopped && (CR_BLKEMPTY != cr->blk))
 		{	/* cache record attached to a buffer built by secshr_db_clnup: finish work; clearest case: do it 1st */
 			assert(LATCH_CLEAR == WRITE_LATCH_VAL(cr));
-			if ((cr->blk / bplmap) * bplmap == cr->blk)
-			{	/* it's a bitmap */
-				if ((csd->trans_hist.total_blks / bplmap) * bplmap == cr->blk)
-					total_blks = csd->trans_hist.total_blks - cr->blk;
-				else
-					total_blks = bplmap;
-				bml_full = bml_find_free(0, (sm_uc_ptr_t)(GDS_ANY_REL2ABS(csa, cr->buffaddr)) + SIZEOF(blk_hdr),
-						total_blks);
-				if (NO_FREE_SPACE == bml_full)
-				{
-					bit_clear(cr->blk / bplmap, MM_ADDR(csd));
-					if (cr->blk > cnl->highest_lbm_blk_changed)
-						cnl->highest_lbm_blk_changed = cr->blk;
-					change_bmm = TRUE;
-				} else if (!(bit_set(cr->blk / bplmap, MM_ADDR(csd))))
-				{
-					if (cr->blk > cnl->highest_lbm_blk_changed)
-						cnl->highest_lbm_blk_changed = cr->blk;
-					change_bmm = TRUE;
-				}
-			}	/* end of bitmap processing */
-			if (!cert_blk(reg, cr->blk, (blk_hdr_ptr_t)GDS_REL2ABS(cr->buffaddr), 0, FALSE))
+			if (!cert_blk(reg, cr->blk, (blk_hdr_ptr_t)GDS_REL2ABS(cr->buffaddr), 0, FALSE, NULL))
 			{	/* always check the block and return - no assertpro, so last argument is FALSE */
 				if (!jgbl.mur_rollback)
-					send_msg_csa(CSA_ARG(csa) VARLSTCNT(7) ERR_DBDANGER, 5, cr->data_invalid, cr->data_invalid,
+					send_msg_csa(CSA_ARG(csa) VARLSTCNT(7) ERR_DBDANGER, 5, cr->stopped, cr->stopped,
 						DB_LEN_STR(reg), cr->blk);
-				assert(gtm_white_box_test_case_enabled);
+				/* The only tests that we know which can produce a DBDANGER are the crash tests (which have
+				 * WBTEST_CRASH_SHUTDOWN_EXPECTED white-box enabled. But there is one exception, the v62000/gtm6348
+				 * subtest, which uses WBTEST_BG_UPDATE_BTPUTNULL & dse to trigger a DBDANGER. So allow that
+				 * additional condition here. Other places where DBDANGER is issued should not have this ||.
+				 */
+				assert(gtm_white_box_test_case_enabled
+					&& ((WBTEST_CRASH_SHUTDOWN_EXPECTED == gtm_white_box_test_case_number)
+						|| (dse_running
+							&& (WBTEST_BG_UPDATE_BTPUTNULL == gtm_white_box_test_case_number))));
 			}
 			bt = bt_put(reg, cr->blk);
 			BT_NOT_NULL(bt, cr, csa, reg);
@@ -530,10 +387,11 @@ void wcs_recover(gd_region *reg)
 					>= ((blk_hdr_ptr_t)GDS_ANY_REL2ABS(csa, cr_alt->buffaddr))->tn);
 				assert((bt_rec_ptr_t)GDS_ANY_REL2ABS(csa, cr_alt->bt_index) == bt);
 				cr_alt->bt_index = 0;				/* cr is more recent */
-				assert(LATCH_CLEAR <= WRITE_LATCH_VAL(cr_alt) && LATCH_CONFLICT >= WRITE_LATCH_VAL(cr_alt));
-				if (UNIX_ONLY(FALSE &&) LATCH_CLEAR < WRITE_LATCH_VAL(cr_alt))
+				assert((LATCH_CLEAR <= WRITE_LATCH_VAL(cr_alt)) && (LATCH_CONFLICT >= WRITE_LATCH_VAL(cr_alt)));
+				if (LATCH_CLEAR < WRITE_LATCH_VAL(cr_alt))
 				{	/* the previous entry is of interest to some process and therefore must be WIP:
-					 * twin and make this (cr->stopped) cache record the active one */
+					 * twin and make this (cr->stopped) cache record the active one.
+					 */
 					assert(0 == cr_alt->twin);
 					cr->twin = GDS_ANY_ABS2REL(csa, cr_alt);
 					cr_alt->twin = GDS_ANY_ABS2REL(csa, cr);
@@ -547,7 +405,7 @@ void wcs_recover(gd_region *reg)
 						assert((UINTPTR_T)wq + wq->bl == (UINTPTR_T)&cr_alt->state_que);
 						back_link = (que_ent_ptr_t)remqt((que_ent_ptr_t)wq);
 						assert(EMPTY_QUEUE != back_link);
-						SUB_ENT_FROM_ACTIVE_QUE_CNT(&cnl->wcs_active_lvl, &cnl->wc_var_lock);
+						SUB_ENT_FROM_ACTIVE_QUE_CNT(cnl);
 						assert(0 <= cnl->wcs_active_lvl);
 						assert(back_link == (que_ent *)&cr_alt->state_que);
 						/* Now that back_link is out of the active queue, reset its links to 0.
@@ -557,8 +415,6 @@ void wcs_recover(gd_region *reg)
 						back_link->fl = 0;
 						back_link->bl = 0;
 					}
-					UNIX_ONLY(assert(!cr_alt->twin));
-					UNIX_ONLY(cr_alt->twin = 0;)
 					cr->twin = cr_alt->twin;		/* existing cache record may have a twin */
 					cr_alt->cycle++; /* increment cycle whenever blk number changes (tp_hist depends on this) */
 					cr_alt->blk = CR_BLKEMPTY;
@@ -567,12 +423,10 @@ void wcs_recover(gd_region *reg)
 					cr_alt->in_tend = 0;
 					SHMPOOL_FREE_CR_RFMT_BLOCK(reg, csa, cr_alt);
 					WRITE_LATCH_VAL(cr_alt) = LATCH_CLEAR;
-					VMS_ONLY(cr_alt->iosb.cond = 0;)
 					cr_alt->jnl_addr = 0;
 					cr_alt->refer = FALSE;
 					cr_alt->twin = 0;
-					cnl->wc_in_free++;
-					UNIX_ONLY(assert(!cr->twin));
+					ADD_ENT_TO_FREE_QUE_CNT(cnl);
 					if (0 != cr->twin)
 					{	/* inherited a WIP twin from cr_alt, transfer the twin's affections */
 						cr_alt = (cache_rec_ptr_t)GDS_ANY_REL2ABS(csa, cr->twin);
@@ -589,36 +443,39 @@ void wcs_recover(gd_region *reg)
 			cr->dirty = csd->trans_hist.curr_tn;
 			cr->flushed_dirty_tn = 0;	/* need to be less than cr->dirty. we choose 0. */
 			cr->epid = 0;
-			cr->image_count = 0;
 			cr->in_tend = 0;
 			cr->data_invalid = 0;
 			WRITE_LATCH_VAL(cr) = LATCH_CLEAR;
-			VMS_ONLY(assert(0 == cr->iosb.cond));
-			VMS_ONLY(cr->iosb.cond = 0;)
 			cr->refer = TRUE;
-			cr->stopped = FALSE;
+			cr->stopped = 0;
 			hq = (cache_que_head_ptr_t)(hash_hdr + (cr->blk % bt_buckets));
 			insqh((que_ent_ptr_t)&cr->blkque, (que_ent_ptr_t)hq);
 			insqt((que_ent_ptr_t)&cr->state_que, (que_ent_ptr_t)active_head);
-			ADD_ENT_TO_ACTIVE_QUE_CNT(&cnl->wcs_active_lvl, &cnl->wc_var_lock);
+			ADD_ENT_TO_ACTIVE_QUE_CNT(cnl);
 			continue;
 		}
-#if defined(DEBUG) && defined(UNIX)
-		if (gtm_white_box_test_case_enabled && (WBTEST_ANTIFREEZE_DBDANGER == gtm_white_box_test_case_number))
-		{
-			gtm_wbox_input_test_case_count++;
-			/* 50 has no special meaning. Just to trigger this somewhere in the middle once. */
-			if (50 == gtm_wbox_input_test_case_count)
-			{
-				cr->blk = 0;
-				cr->dirty = 1;
-				cr->data_invalid = 1;
+		if (cr->in_tend)
+		{	/* Some process was shot (kill -9 in Unix) in the middle of an update.
+			 * We cannot discard this buffer so send a warning to the user and proceed.
+			 */
+			if (!jgbl.mur_rollback)
+				send_msg_csa(CSA_ARG(csa) VARLSTCNT(7) ERR_DBDANGER, 5, cr->in_tend, cr->in_tend,
+						DB_LEN_STR(reg), cr->blk);
+			assert(gtm_white_box_test_case_enabled
+				&& (WBTEST_CRASH_SHUTDOWN_EXPECTED == gtm_white_box_test_case_number));
+			cr->in_tend= 0;
+			blk_ptr = (blk_hdr_ptr_t)GDS_ANY_REL2ABS(csa, cr->buffaddr);
+			if (!blk_ptr->bsiz)
+			{	/* A new twin was created with an empty buffer and process got shot before it could do
+				 * a gvcst_blk_build. A 0-byte block presents problems with asyncio (since wcs_wtfini
+				 * expects a non-zero return value for # of bytes written by the aio call) so
+				 * just discard this buffer.
+				 */
+				cr->dirty = 0;
 			}
 		}
-#endif
-		if ((CR_BLKEMPTY == cr->blk) || (0 == cr->dirty) VMS_ONLY(|| ((0 != cr->iosb.cond) && (0 == cr->bt_index))))
-		{	/* cache record has no valid buffer attached, or its contents are in the database,
-			 * or it has a more recent twin so we don't even have to care how its write terminated */
+		if ((CR_BLKEMPTY == cr->blk) || (0 == cr->dirty))
+		{	/* cache record has no valid buffer attached, or its contents are in the database */
 			cr->cycle++;	/* increment cycle whenever blk number changes (tp_hist depends on this) */
 			cr->blk = CR_BLKEMPTY;
 			cr->bt_index = 0;
@@ -626,78 +483,17 @@ void wcs_recover(gd_region *reg)
 			cr->dirty = 0;
 			cr->flushed_dirty_tn = 0;
 			cr->epid = 0;
-			cr->image_count = 0;
 			cr->in_tend = 0;
 			SHMPOOL_FREE_CR_RFMT_BLOCK(reg, csa, cr);
 			WRITE_LATCH_VAL(cr) = LATCH_CLEAR;
-			VMS_ONLY(cr->iosb.cond = 0;)
 			cr->jnl_addr = 0;
 			cr->refer = FALSE;
-			cr->stopped = FALSE;	/* reset cr->stopped just in case it has a corrupt value */
-			cnl->wc_in_free++;
+			cr->stopped = 0;	/* reset cr->stopped just in case it has a corrupt value */
+			ADD_ENT_TO_FREE_QUE_CNT(cnl);
 			continue;
 		}
-		if (cr->data_invalid)
-		{	/* Some process was shot (kill -9 in Unix and STOP/ID in VMS) in the middle of an update.
-			 * In VMS, the kernel extension routine secshr_db_clnup would have rebuilt the block nevertheless.
-			 * In Unix, no rebuild would have been attempted since no kernel extension routine currently available.
-			 * In either case, we do not want to discard this buffer so send a warning to the user and proceed.
-			 */
-			if (!jgbl.mur_rollback)
-				send_msg_csa(CSA_ARG(csa) VARLSTCNT(7) ERR_DBDANGER, 5, cr->data_invalid, cr->data_invalid,
-						DB_LEN_STR(reg), cr->blk);
-			cr->data_invalid = 0;
-		}
-		if (cr->in_tend)
-		{	/* caught by a failure while in bg_update, and less recent than a cache record created by secshr_db_clnup */
-			if (UNIX_ONLY(FALSE &&) (LATCH_CONFLICT == WRITE_LATCH_VAL(cr)) VMS_ONLY( && (0 == cr->iosb.cond)))
-			{	/* must be WIP, with a currently active write */
-				assert(LATCH_CONFLICT >= WRITE_LATCH_VAL(cr));
-				hq = (cache_que_head_ptr_t)(hash_hdr + (cr->blk % bt_buckets));
-				WRITE_LATCH_VAL(cr) = LATCH_SET;
-				bt = bt_put(reg, cr->blk);
-				BT_NOT_NULL(bt, cr, csa, reg);
-				bt->killtn = csd->trans_hist.curr_tn;	/* be safe; don't know when was last kill after recover */
-				if (CR_NOTVALID == bt->cache_index)
-				{	/* no previous entry for this block; more recent cache record will twin when processed */
-					cr->bt_index = GDS_ANY_ABS2REL(csa, bt);
-					bt->cache_index = (int4)GDS_ANY_ABS2REL(csa, cr);
-					insqh((que_ent_ptr_t)&cr->blkque, (que_ent_ptr_t)hq);
-				} else
-				{	/* form the twin with the previous (and more recent) cache record */
-					cr_alt = (cache_rec_ptr_t)GDS_ANY_REL2ABS(csa, bt->cache_index);
-					assert(((blk_hdr_ptr_t)GDS_ANY_REL2ABS(csa, cr->buffaddr))->tn
-						< ((blk_hdr_ptr_t)GDS_ANY_REL2ABS(csa, cr_alt->buffaddr))->tn);
-					assert((bt_rec_ptr_t)GDS_ANY_REL2ABS(csa, cr_alt->bt_index) == bt);
-					assert(0 == cr_alt->twin);
-					cr_alt->twin = GDS_ANY_ABS2REL(csa, cr);
-					cr->twin = GDS_ANY_ABS2REL(csa, cr_alt);
-					cr->bt_index = 0;
-					insqt((que_ent_ptr_t)&cr->blkque, (que_ent_ptr_t)hq);
-				}
-				assert(cr->epid); /* before inserting into WIP queue, ensure there is a writer process for this */
-				insqt((que_ent_ptr_t)&cr->state_que, (que_ent_ptr_t)wip_head); /* this should be VMS only code */
-			} else
-			{	/* the [current] in_tend cache record is no longer of value and can be discarded */
-				cr->cycle++;	/* increment cycle whenever blk number changes (tp_hist depends on this) */
-				cr->blk = CR_BLKEMPTY;
-				cr->bt_index = 0;
-				cr->dirty = 0;
-				cr->flushed_dirty_tn = 0;
-				cr->epid = 0;
-				cr->image_count = 0;
-				SHMPOOL_FREE_CR_RFMT_BLOCK(reg, csa, cr);
-				WRITE_LATCH_VAL(cr) = LATCH_CLEAR;
-				VMS_ONLY(cr->iosb.cond = 0;)
-				cr->jnl_addr = 0;
-				cnl->wc_in_free++;
-			}
-			cr->in_tend = 0;
-			cr->refer = FALSE;
-			continue;
-		}
-		if ((LATCH_SET > WRITE_LATCH_VAL(cr)) VMS_ONLY(|| (WRT_STRT_PNDNG == cr->iosb.cond)))
-		{	/* no process has an interest */
+		if (LATCH_SET > WRITE_LATCH_VAL(cr))
+		{	/* No process has an interest */
 			bt = bt_put(reg, cr->blk);
 			BT_NOT_NULL(bt, cr, csa, reg);
 			bt->killtn = csd->trans_hist.curr_tn;	/* be safe; don't know when was last kill after recover */
@@ -709,16 +505,15 @@ void wcs_recover(gd_region *reg)
 				hq = (cache_que_head_ptr_t)(hash_hdr + (cr->blk % bt_buckets));
 				insqh((que_ent_ptr_t)&cr->blkque, (que_ent_ptr_t)hq);
 				insqt((que_ent_ptr_t)&cr->state_que, (que_ent_ptr_t)active_head);
-				ADD_ENT_TO_ACTIVE_QUE_CNT(&cnl->wcs_active_lvl, &cnl->wc_var_lock);
+				ADD_ENT_TO_ACTIVE_QUE_CNT(cnl);
 			} else
-			{	/* the bt already has an entry for the block */
+			{	/* The bt already has an entry for the block */
 				cr_alt = (cache_rec_ptr_t)GDS_ANY_REL2ABS(csa, bt->cache_index);
 				assert((bt_rec_ptr_t)GDS_ANY_REL2ABS(csa, cr_alt->bt_index) == bt);
-				if (UNIX_ONLY(FALSE &&) LATCH_CLEAR < WRITE_LATCH_VAL(cr_alt))
+				if (LATCH_CLEAR < WRITE_LATCH_VAL(cr_alt))
 				{	/* the previous cache record is WIP, and the current cache record is the more recent twin */
 					assert(((blk_hdr_ptr_t)GDS_ANY_REL2ABS(csa, cr->buffaddr))->tn
 						> ((blk_hdr_ptr_t)GDS_ANY_REL2ABS(csa, cr_alt->buffaddr))->tn);
-					VMS_ONLY(assert(WRT_STRT_PNDNG != cr->iosb.cond));
 					cr_alt->bt_index = 0;
 					WRITE_LATCH_VAL(cr_alt) = LATCH_CONFLICT;
 					cr_alt->twin = GDS_ANY_ABS2REL(csa, cr);
@@ -729,10 +524,11 @@ void wcs_recover(gd_region *reg)
 					hq = (cache_que_head_ptr_t)(hash_hdr + (cr->blk % bt_buckets));
 					insqh((que_ent_ptr_t)&cr->blkque, (que_ent_ptr_t)hq);
 					insqt((que_ent_ptr_t)&cr->state_que, (que_ent_ptr_t)active_head);
-					ADD_ENT_TO_ACTIVE_QUE_CNT(&cnl->wcs_active_lvl, &cnl->wc_var_lock);
+					ADD_ENT_TO_ACTIVE_QUE_CNT(cnl);
 				} else
-				{	/* previous cache record is more recent from a cr->stopped record made by sechsr_db_clnup:
-					 * discard this copy as it is old */
+				{	/* Previous cache record is more recent from a cr->stopped record
+					 * made by secshr_db_clnup. Discard this copy as it is old.
+					 */
 					assert(((blk_hdr_ptr_t)GDS_ANY_REL2ABS(csa, cr->buffaddr))->tn
 						<= ((blk_hdr_ptr_t)GDS_ANY_REL2ABS(csa, cr_alt->buffaddr))->tn);
 					assert(LATCH_CLEAR == WRITE_LATCH_VAL(cr_alt));
@@ -744,20 +540,17 @@ void wcs_recover(gd_region *reg)
 					cr->jnl_addr = 0;
 					cr->refer = FALSE;
 					SHMPOOL_FREE_CR_RFMT_BLOCK(reg, csa, cr);
-					cnl->wc_in_free++;
+					ADD_ENT_TO_FREE_QUE_CNT(cnl);
 				}
 			}
 			cr->epid = 0;
-			cr->image_count = 0;
 			WRITE_LATCH_VAL(cr) = LATCH_CLEAR;
-			VMS_ONLY(assert(0 == cr->iosb.cond || WRT_STRT_PNDNG == cr->iosb.cond));
-			VMS_ONLY(cr->iosb.cond = 0;)
 			continue;
 		}
-		/* not in_tend and interlock.semaphore is not LATCH_CLEAR so cache record must be WIP */
+		/* interlock.semaphore is not LATCH_CLEAR so cache record must be WIP in case of no-twinning
+		 * and could be in WIP or Active queue in case of twinning.
+		 */
 		assert(LATCH_CONFLICT >= WRITE_LATCH_VAL(cr));
-		VMS_ONLY(WRITE_LATCH_VAL(cr) = LATCH_SET;)
-		UNIX_ONLY(WRITE_LATCH_VAL(cr) = LATCH_CLEAR;)
 		hq = (cache_que_head_ptr_t)(hash_hdr + (cr->blk % bt_buckets));
 		bt = bt_put(reg, cr->blk);
 		BT_NOT_NULL(bt, cr, csa, reg);
@@ -769,33 +562,71 @@ void wcs_recover(gd_region *reg)
 			cr->refer = TRUE;
 			insqh((que_ent_ptr_t)&cr->blkque, (que_ent_ptr_t)hq);
 		} else
-		{	/* previous cache record must be more recent as this one is WIP */
+		{	/* Whichever cache record (previous or current one) has cr->epid non-zero is the WIP one.
+			 * The other is the more recent one.
+			 */
+			assert(asyncio);
+			assert(twinning_on);
 			cr_alt = (cache_rec_ptr_t)GDS_ANY_REL2ABS(csa, bt->cache_index);
-			assert(((blk_hdr_ptr_t)GDS_ANY_REL2ABS(csa, cr->buffaddr))->tn
-				< ((blk_hdr_ptr_t)GDS_ANY_REL2ABS(csa, cr_alt->buffaddr))->tn);
+			/* These two crs should be twins so one of them should have epid set. Only exception is a kill -9
+			 * in a small window in wcs_wtstart after LOCK_BUFF_FOR_WRITE but before csr->epid = process_id.
+			 * In that case, we will not know accurately which is the newer twin (and could even end up adding
+			 * both crs into active queue for the same block) but since kill -9 is not officially supported
+			 * and this is a rare scenario even within that, it is considered okay for now.
+			 */
+			assert(cr_alt->epid || cr->epid || (gtm_white_box_test_case_enabled
+					&& (WBTEST_CRASH_SHUTDOWN_EXPECTED == gtm_white_box_test_case_number)));
+			if (cr_alt->epid)
+			{
+				cr_old = cr_alt;
+				cr_new = cr;
+			} else
+			{
+				cr_old = cr;
+				cr_new = cr_alt;
+			}
+			assert(((blk_hdr_ptr_t)GDS_ANY_REL2ABS(csa, cr_old->buffaddr))->tn
+				< ((blk_hdr_ptr_t)GDS_ANY_REL2ABS(csa, cr_new->buffaddr))->tn);
 			assert((bt_rec_ptr_t)GDS_ANY_REL2ABS(csa, cr_alt->bt_index) == bt);
-			VMS_ONLY(
-				assert(WRT_STRT_PNDNG != cr->iosb.cond);
-				assert(FALSE == cr_alt->wip_stopped);
-				WRITE_LATCH_VAL(cr) = LATCH_CONFLICT;
-				cr_alt->twin = GDS_ANY_ABS2REL(csa, cr);
-				cr->twin = GDS_ANY_ABS2REL(csa, cr_alt);
-			)
-			cr->bt_index = 0;
+			cr_old->bt_index = 0;
+			cr_new->bt_index = GDS_ANY_ABS2REL(csa, bt);
+			cr_alt->twin = GDS_ANY_ABS2REL(csa, cr);
+			cr->twin = GDS_ANY_ABS2REL(csa, cr_alt);
 			cr->refer = FALSE;
 			insqt((que_ent_ptr_t)&cr->blkque, (que_ent_ptr_t)hq);
 		}
-		VMS_ONLY(assert(cr->epid)); /* before inserting into WIP queue, ensure there is a writer process for this */
-		insqt((que_ent_ptr_t)&cr->state_que, (que_ent_ptr_t)wip_head);
-		UNIX_ONLY(ADD_ENT_TO_ACTIVE_QUE_CNT(&cnl->wcs_active_lvl, &cnl->wc_var_lock));
+		if (asyncio && cr->epid && cr->aio_issued)
+		{	/* WIP queue is functional AND a process had issued an aio write. Insert cr in WIP queue */
+			WRITE_LATCH_VAL(cr) = LATCH_CONFLICT;
+			insqt((que_ent_ptr_t)&cr->state_que, (que_ent_ptr_t)wip_head);
+			ADD_ENT_TO_WIP_QUE_CNT(cnl);
+		} else
+		{	/* WIP queue does not exist OR a process had removed it from active queue but got kill -9'ed before
+			 * setting "cr->epid" OR process had readied for write but got kill -9'ed before it issued the aio write.
+			 * Use Active queue in either case.
+			 */
+			cr->epid = 0;
+			WRITE_LATCH_VAL(cr) = LATCH_CLEAR;
+			insqt((que_ent_ptr_t)&cr->state_que, (que_ent_ptr_t)active_head);
+			ADD_ENT_TO_ACTIVE_QUE_CNT(cnl);
+		}
 		/* end of processing for a single cache record */
 	}	/* end of processing all cache records */
-	if (change_bmm)
+	assert(0 > GDS_CREATE_BLK_MAX);	/* the minimum block # is 0 which should be greater than the macro.
+					 * this is relied upon by cnl->highest_lbm_blk_changed maintenance code
+					 * in "bm_update" and "sec_shr_map_build".
+					 */
+	if (GDS_CREATE_BLK_MAX != cnl->highest_lbm_blk_changed)
 	{
 		csd->trans_hist.mm_tn++;
-		if (!reg->read_only)
+		if (!reg->read_only && !FROZEN_CHILLED(csd))
 			fileheader_sync(reg);
 	}
+	assert((cnl->wcs_active_lvl + cnl->wcs_wip_lvl + cnl->wc_in_free) == csd->n_bts);
+	assert(cnl->wcs_active_lvl || !active_head->fl);
+	assert(!cnl->wcs_active_lvl || active_head->fl);
+	assert(cnl->wcs_wip_lvl || !wip_head->fl);
+	assert(!cnl->wcs_wip_lvl || wip_head->fl);
 	assertpro(wcs_verify(reg, FALSE, TRUE));	/* expect_damage is FALSE, in_wcs_recover is TRUE */
 	/* skip INCTN processing in case called from mu_rndwn_file().
 	 * if called from mu_rndwn_file(), we have standalone access to shared memory so no need to increment db curr_tn
@@ -818,7 +649,7 @@ void wcs_recover(gd_region *reg)
 			 * journal records (if it decides to switch to a new journal file).
 			 */
 			ADJUST_GBL_JREC_TIME(jgbl, jbp);
-			jnl_status = jnl_ensure_open();
+			jnl_status = jnl_ensure_open(reg, csa);
 			if (0 == jnl_status)
 			{
 				if (0 == jpc->pini_addr)
@@ -836,15 +667,19 @@ void wcs_recover(gd_region *reg)
 	csa->wbuf_dqd = 0;	/* reset this so the wcs_wtstart below will work */
 	SIGNAL_WRITERS_TO_RESUME(cnl);
 	in_wcs_recover = FALSE;
-	if (!reg->read_only)
+	if (!reg->read_only && !FROZEN_CHILLED(csd))
 	{
-		DCLAST_WCS_WTSTART(reg, 0, dummy_errno);
-		VMS_ONLY(
-			wcs_wtfini(gv_cur_region);	/* try to free as many buffers from the wip queue if write is done */
-		)
+		dummy_errno = wcs_wtstart(reg, 0, NULL, NULL);
+		/* Note: Just like in "db_csh_getn" (see comment there for more details), we do not rely on the call to
+		 * "wcs_wtfini" below succeeding. Therefore we do not check the return value.
+		 */
+		if (asyncio)
+		{
+			DEBUG_ONLY(dbg_wtfini_lcnt = dbg_wtfini_wcs_recover);	/* used by "wcs_wtfini" */
+			wcs_wtfini(reg, CHECK_IS_PROC_ALIVE_FALSE, NULL);
+				/* try to free as many buffers from the wip queue if write is done */
+		}
 	}
-	if (backup_block_saved)
-		backup_buffer_flush(reg);
 	TP_CHANGE_REG(save_reg);
 	TREF(wcs_recover_done) = TRUE;
 	return;
@@ -856,13 +691,12 @@ void	wcs_mm_recover(gd_region *reg)
 	int			save_errno;
 	gtm_uint64_t		mmap_sz;
 	INTPTR_T		status;
-	struct stat     	stat_buf;
+	struct stat		stat_buf;
 	sm_uc_ptr_t		old_db_addrs[2], mmap_retaddr;
-	boolean_t       	was_crit, read_only;
+	boolean_t		was_crit, read_only;
 	unix_db_info		*udi;
 	const char		*syscall;
 
-	VMS_ONLY(assert(FALSE));
 	assert(&FILE_INFO(reg)->s_addrs == cs_addrs);
 	assert(cs_addrs->hdr == cs_data);
 	assert(!cs_addrs->hdr->clustered);
@@ -884,7 +718,7 @@ void	wcs_mm_recover(gd_region *reg)
 	cs_addrs->db_addrs[0] = NULL;
 	syscall = MEM_UNMAP_SYSCALL;
 #	ifdef _AIX
-	status = shmdt(old_db_addrs[0] - BLK_ZERO_OFF(cs_data));
+	status = shmdt(old_db_addrs[0] - BLK_ZERO_OFF(cs_data->start_vbn));
 #	else
 	status = (INTPTR_T)munmap((caddr_t)old_db_addrs[0], (size_t)(old_db_addrs[1] - old_db_addrs[0]));
 #	endif
@@ -892,15 +726,22 @@ void	wcs_mm_recover(gd_region *reg)
 	{
 		udi = FILE_INFO(gv_cur_region);
 		FSTAT_FILE(udi->fd, &stat_buf, status);
-		mmap_sz = stat_buf.st_size - BLK_ZERO_OFF(cs_data);
+		mmap_sz = stat_buf.st_size - BLK_ZERO_OFF(cs_data->start_vbn);
 		CHECK_LARGEFILE_MMAP(gv_cur_region, mmap_sz); /* can issue rts_error MMFILETOOLARGE */
-		read_only = gv_cur_region->read_only;
+		/* Note that for a statsdb, gv_cur_region->read_only could be TRUE (and cs_addrs->read_write would be FALSE)
+		 * even though we have write permissions to the statsdb (see "gvcst_init" and "gvcst_init_statsDB"). But in
+		 * that case "cs_addrs->orig_read_write" would have the original permissions when the file got opened. So use
+		 * that for the remap as we want to have read-write permissions on the remap if we had it on the first mmap.
+		 */
+		assert(cs_addrs->orig_read_write || !cs_addrs->read_write);
+		read_only = !cs_addrs->orig_read_write;
 		syscall = MEM_MAP_SYSCALL;
 #		ifdef _AIX
 		status = (sm_long_t)(mmap_retaddr = (sm_uc_ptr_t)shmat(udi->fd, (void *)NULL,
 								(read_only ? (SHM_MAP|SHM_RDONLY) : SHM_MAP)));
 		#else
-		status = (sm_long_t)(mmap_retaddr = (sm_uc_ptr_t)MMAP_FD(udi->fd, mmap_sz, BLK_ZERO_OFF(cs_data), read_only));
+		status = (sm_long_t)(mmap_retaddr = (sm_uc_ptr_t)MMAP_FD(udi->fd, mmap_sz,
+										BLK_ZERO_OFF(cs_data->start_vbn), read_only));
 #		endif
 		GTM_WHITE_BOX_TEST(WBTEST_MEM_MAP_SYSCALL_FAIL, status, -1);
 	}
@@ -915,11 +756,11 @@ void	wcs_mm_recover(gd_region *reg)
 				LEN_AND_STR(syscall), CALLFROM, save_errno);
 	}
 #	if defined(_AIX)
-	mmap_retaddr = (sm_uc_ptr_t)mmap_retaddr + BLK_ZERO_OFF(cs_data);
+	mmap_retaddr = (sm_uc_ptr_t)mmap_retaddr + BLK_ZERO_OFF(cs_data->start_vbn);
 #	endif
 	gds_map_moved(mmap_retaddr, old_db_addrs[0], old_db_addrs[1], mmap_sz); /* updates cs_addrs->db_addrs[1] */
 	cs_addrs->db_addrs[0] = mmap_retaddr;
-        cs_addrs->total_blks = cs_addrs->ti->total_blks;
+	cs_addrs->total_blks = cs_addrs->ti->total_blks;
 	if (!was_crit)
 		rel_crit(gv_cur_region);
 	return;
diff --git a/sr_port/wcs_verify.c b/sr_port/wcs_verify.c
index 1284bf8..442e82b 100755
--- a/sr_port/wcs_verify.c
+++ b/sr_port/wcs_verify.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -29,16 +30,15 @@
 #include "send_msg.h"
 #include "cert_blk.h"
 #include "memcoherency.h"
+#ifdef DEBUG
+#include "op.h"
+#endif
 
 /* global refs/defs */
 
 /* defines */
 #define FAKE_DIRTY		((trans_num)(-1))
-#ifdef UNIX
 #define SEND_MSG_CSA(...)	send_msg_csa(CSA_ARG(csa) __VA_ARGS__)	/* to avoid formatting various send_msg calls */
-#else
-#define SEND_MSG_CSA		send_msg
-#endif
 
 GBLREF 	uint4			process_id;
 
@@ -51,6 +51,7 @@ error_def(ERR_DBCRERR8);
 error_def(ERR_DBFHEADERR4);
 error_def(ERR_DBFHEADERR8);
 error_def(ERR_DBFHEADERRANY);
+error_def(ERR_DBFHEADLRU);
 error_def(ERR_DBQUELINK);
 error_def(ERR_DBWCVERIFYEND);
 error_def(ERR_DBWCVERIFYSTART);
@@ -69,11 +70,11 @@ boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_i
         trans_num 		max_tn, tmp_8byte;
 	INTPTR_T		bp_lo, bp_top, bp, cr_base, cr_top, bt_top_off, bt_base_off;
 	sm_uc_ptr_t		bptmp;
-	boolean_t		ret;
+	boolean_t		asyncio, ret;
 	sgmnt_addrs		*csa;
 	sgmnt_data_ptr_t	csd;
 	node_local_ptr_t	cnl;
-	cache_rec_ptr_t		cr, cr0, cr_tmp, cr_prev, cr_hi, cr_lo, cr_qbase;
+	cache_rec_ptr_t		cr, cr0, cr_tmp, cr_tmp2, cr_prev, cr_hi, cr_lo, cr_qbase;
 	bt_rec_ptr_t		bt, bt0, bt_prev, bt_hi, bt_lo;
 	th_rec_ptr_t		th, th_prev;
 	cache_que_head_ptr_t	que_head;
@@ -85,6 +86,9 @@ boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_i
 	int4			i, n_bts;	/* a copy of csd->n_bts since it is used frequently in this routine */
 	trans_num		dummy_tn;
 	int4			in_wtstart, intent_wtstart, wcs_phase2_commit_pidcnt;
+#	ifdef DEBUG
+	mval			rand_lru;
+#	endif
 
 	csa = &FILE_INFO(reg)->s_addrs;
 	csd = csa->hdr;
@@ -102,13 +106,16 @@ boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_i
 	}
 	if (dba_mm != csd->acc_meth)
 	{
+		if (0 != cnl->wtfini_in_prog)
+			SEND_MSG_CSA(VARLSTCNT(8) ERR_DBFHEADERRANY, 6, DB_LEN_STR(reg),
+				RTS_ERROR_TEXT("wtfini_in_prog"), cnl->wtfini_in_prog, 0);
 		offset = ROUND_UP(SIZEOF_FILE_HDR(csd), (SIZEOF(int4) * 2));
 		if (cnl->bt_header_off != offset)			/* bt_header is "quadword-aligned" after the header */
 		{
 			assert(expect_damage);
 			ret = FALSE;
 			SEND_MSG_CSA(VARLSTCNT(8) ERR_DBFHEADERRANY, 6, DB_LEN_STR(reg),
-				 RTS_ERROR_TEXT("bt_header_off"), cnl->bt_header_off, offset);
+				RTS_ERROR_TEXT("bt_header_off"), cnl->bt_header_off, offset);
 			cnl->bt_header_off = offset;
 		}
 		if (csa->bt_header != (bt_rec_ptr_t)((sm_uc_ptr_t)csd + cnl->bt_header_off))
@@ -116,7 +123,7 @@ boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_i
 			assert(expect_damage);
 			ret = FALSE;
 			SEND_MSG_CSA(VARLSTCNT(8) ERR_DBFHEADERRANY, 6, DB_LEN_STR(reg),
-				 RTS_ERROR_TEXT("bt_header"), csa->bt_header, (sm_uc_ptr_t)csd + cnl->bt_header_off);
+				RTS_ERROR_TEXT("bt_header"), csa->bt_header, (sm_uc_ptr_t)csd + cnl->bt_header_off);
 			csa->bt_header = (bt_rec_ptr_t)((sm_uc_ptr_t)csd + cnl->bt_header_off);
 		}
 		offset += csd->bt_buckets * SIZEOF(bt_rec);
@@ -125,7 +132,7 @@ boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_i
 			assert(expect_damage);
 			ret = FALSE;
 			SEND_MSG_CSA(VARLSTCNT(8) ERR_DBFHEADERRANY, 6, DB_LEN_STR(reg),
-				 RTS_ERROR_TEXT("th_base_off"), cnl->th_base_off, offset + SIZEOF(bt->blkque));
+				RTS_ERROR_TEXT("th_base_off"), cnl->th_base_off, offset + SIZEOF(bt->blkque));
 			cnl->th_base_off = (offset + SIZEOF(bt->blkque));
 		}
 		if (csa->th_base != (th_rec_ptr_t)((sm_uc_ptr_t)csd + cnl->th_base_off))
@@ -133,7 +140,7 @@ boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_i
 			assert(expect_damage);
 			ret = FALSE;
 			SEND_MSG_CSA(VARLSTCNT(8) ERR_DBFHEADERRANY, 6, DB_LEN_STR(reg),
-				 RTS_ERROR_TEXT("th_base"), csa->th_base, (sm_uc_ptr_t)csd + cnl->th_base_off);
+				RTS_ERROR_TEXT("th_base"), csa->th_base, (sm_uc_ptr_t)csd + cnl->th_base_off);
 			csa->th_base = (th_rec_ptr_t)((sm_uc_ptr_t)csd + cnl->th_base_off);
 		}
 		offset += SIZEOF(bt_rec);
@@ -142,7 +149,7 @@ boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_i
 			assert(expect_damage);
 			ret = FALSE;
 			SEND_MSG_CSA(VARLSTCNT(8) ERR_DBFHEADERRANY, 6, DB_LEN_STR(reg),
-				 RTS_ERROR_TEXT("bt_base_off"), cnl->bt_base_off, offset);
+				RTS_ERROR_TEXT("bt_base_off"), cnl->bt_base_off, offset);
 			cnl->bt_base_off = offset;
 		}
 		if (csa->bt_base != (bt_rec_ptr_t)((sm_uc_ptr_t)csd + cnl->bt_base_off))
@@ -150,7 +157,7 @@ boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_i
 			assert(expect_damage);
 			ret = FALSE;
 			SEND_MSG_CSA(VARLSTCNT(8) ERR_DBFHEADERRANY, 6, DB_LEN_STR(reg),
-				 RTS_ERROR_TEXT("bt_base"), csa->bt_base, (sm_uc_ptr_t)csd + cnl->bt_base_off);
+				RTS_ERROR_TEXT("bt_base"), csa->bt_base, (sm_uc_ptr_t)csd + cnl->bt_base_off);
 			csa->bt_base = (bt_rec_ptr_t)((sm_uc_ptr_t)csd + cnl->bt_base_off);
 		}
 	} else
@@ -172,7 +179,7 @@ boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_i
 			assert(expect_damage);
 			ret = FALSE;
 			SEND_MSG_CSA(VARLSTCNT(8) ERR_DBFHEADERRANY, 6, DB_LEN_STR(reg),
-				 RTS_ERROR_TEXT("cache_off"), cnl->cache_off, -CACHE_CONTROL_SIZE(csd));
+				RTS_ERROR_TEXT("cache_off"), cnl->cache_off, -CACHE_CONTROL_SIZE(csd));
 			cnl->cache_off = -CACHE_CONTROL_SIZE(csd);
 		}
 		if (csa->acc_meth.bg.cache_state != (cache_que_heads_ptr_t)((sm_uc_ptr_t)csd + cnl->cache_off))
@@ -180,7 +187,7 @@ boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_i
 			assert(expect_damage);
 			ret = FALSE;
 			SEND_MSG_CSA(VARLSTCNT(8) ERR_DBFHEADERRANY, 6, DB_LEN_STR(reg),
-				 RTS_ERROR_TEXT("cache_state"), csa->acc_meth.bg.cache_state, (sm_uc_ptr_t)csd + cnl->cache_off);
+				RTS_ERROR_TEXT("cache_state"), csa->acc_meth.bg.cache_state, (sm_uc_ptr_t)csd + cnl->cache_off);
 			csa->acc_meth.bg.cache_state = (cache_que_heads_ptr_t)((sm_uc_ptr_t)csd + cnl->cache_off);
 		}
 		if (csd->bt_buckets != getprime(n_bts))
@@ -188,7 +195,7 @@ boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_i
 			assert(expect_damage);
 			ret = FALSE;
 			SEND_MSG_CSA(VARLSTCNT(8) ERR_DBFHEADERR4, 6, DB_LEN_STR(reg),
-				 RTS_ERROR_TEXT("bt_buckets"), csd->bt_buckets, getprime(n_bts));
+				RTS_ERROR_TEXT("bt_buckets"), csd->bt_buckets, getprime(n_bts));
 			csd->bt_buckets = getprime(n_bts);
 		}
 	}
@@ -221,6 +228,22 @@ boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_i
 		cr_hi = cr_lo + n_bts;
 		cr_base = GDS_ANY_ABS2REL(csa, cr_lo);
 		cr_top = GDS_ANY_ABS2REL(csa, cr_hi);
+#		ifdef DEBUG
+		if (gtm_white_box_test_case_enabled && (WBTEST_CRASH_SHUTDOWN_EXPECTED == gtm_white_box_test_case_number))
+		{	/* if we are crashing anyway mess with the lru pointer to demonstrate the test below gives an error */
+			op_fnrandom(E_9, &rand_lru);
+			GTM_WHITE_BOX_TEST(WBTEST_CRASH_SHUTDOWN_EXPECTED, cnl->cur_lru_cache_rec_off, rand_lru.m[1])
+			gtm_wbox_input_test_case_count++;
+		}
+#		endif
+		cr = (cache_rec_ptr_t)GDS_ANY_REL2ABS(csa, cnl->cur_lru_cache_rec_off);
+		if ((cr < cr_lo) || (cr > cr_hi) || (0 != (((char *)cr - (char *)cr_lo) % SIZEOF(cache_rec))))
+		{
+			assert(expect_damage);
+			ret = FALSE;
+			SEND_MSG_CSA(VARLSTCNT(7) ERR_DBFHEADLRU, 5, DB_LEN_STR(reg), &cr, &cr_lo, &cr_hi);
+			cnl->cur_lru_cache_rec_off = cr_base;
+		}
 		if (caller_is_wcs_recover)
 		{	/* if wcs_recover is caller, it would have waited for the following fields to become 0.
 			 * if called from DSE CACHE -VERIFY, none of these are guaranteed. So do these checks only for first case.
@@ -230,7 +253,7 @@ boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_i
 				assert(expect_damage);
 				ret = FALSE;
 				SEND_MSG_CSA(VARLSTCNT(8) ERR_DBFHEADERR4, 6, DB_LEN_STR(reg),
-					 RTS_ERROR_TEXT("wc_blocked"), cnl->wc_blocked, TRUE);
+					RTS_ERROR_TEXT("wc_blocked"), cnl->wc_blocked, TRUE);
 				SET_TRACEABLE_VAR(cnl->wc_blocked, TRUE);
 			}
 			in_wtstart = cnl->in_wtstart;	/* store value in local variable in case the following assert fails */
@@ -238,7 +261,7 @@ boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_i
 			{	/* caller should outwait active writers */
 				ret = FALSE;
 				SEND_MSG_CSA(VARLSTCNT(8) ERR_DBFHEADERR4, 6, DB_LEN_STR(reg), RTS_ERROR_TEXT("in_wtstart"),
-					 in_wtstart, 0);
+					in_wtstart, 0);
 				assert(expect_damage);
 				cnl->in_wtstart = 0;
 				csa->in_wtstart = FALSE; /* To allow wcs_wtstart() after wcs_recover() */
@@ -248,7 +271,7 @@ boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_i
 			{	/* Two situations are possible.
 				 *	a) A wcs_wtstart() call is concurrently in progress and that the process has just now
 				 *		incremented intent_wtstart. It will notice cnl->wc_blocked to be TRUE and
-				 *		decrement intent_wtstart right away and return. So we dont need to do anything.
+				 *		decrement intent_wtstart right away and return. So we don't need to do anything.
 				 *	b) A wcs_wtstart() call had previously increment intent_wtstart but got shot before it could
 				 *		get a chance to decrement the field. In this case, we need to clear the field to
 				 *		recover from this situation.
@@ -261,7 +284,7 @@ boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_i
 				 *	case.
 				 */
 				SEND_MSG_CSA(VARLSTCNT(8) ERR_DBFHEADERR4, 6, DB_LEN_STR(reg),
-					 RTS_ERROR_TEXT("intent_wtstart"), intent_wtstart, 0);
+					RTS_ERROR_TEXT("intent_wtstart"), intent_wtstart, 0);
 				cnl->intent_wtstart = 0;
 				SHM_WRITE_MEMORY_BARRIER;
 			}
@@ -270,7 +293,7 @@ boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_i
 			{	/* caller should outwait active committers */
 				ret = FALSE;
 				SEND_MSG_CSA(VARLSTCNT(8) ERR_DBFHEADERR4, 6, DB_LEN_STR(reg),
-					 RTS_ERROR_TEXT("wcs_phase2_commit_pidcnt"), wcs_phase2_commit_pidcnt, 0);
+					RTS_ERROR_TEXT("wcs_phase2_commit_pidcnt"), wcs_phase2_commit_pidcnt, 0);
 				assert(expect_damage);
 				cnl->wcs_phase2_commit_pidcnt = 0;
 				csa->wcs_pidcnt_incremented = FALSE; /* Just to be safe */
@@ -282,13 +305,13 @@ boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_i
 			assert(expect_damage);
 			ret = FALSE;
 			SEND_MSG_CSA(VARLSTCNT(8) ERR_DBFHEADERR4, 6, DB_LEN_STR(reg),
-				 RTS_ERROR_TEXT("th_base->blk"), th->blk, BT_QUEHEAD);
+				RTS_ERROR_TEXT("th_base->blk"), th->blk, BT_QUEHEAD);
 			th->blk = BT_QUEHEAD;
 		}
 		/* loop through bt tnque */
 		for (th_prev = th, th = (th_rec_ptr_t)((sm_uc_ptr_t)th + th->tnque.fl), cnt = n_bts, max_tn = 0, cnt = n_bts + 1;
-		     (th != csa->th_base) && (cnt > 0);
-		     th_prev = th, cnt--, th = (th_rec_ptr_t)((sm_uc_ptr_t)th + th->tnque.fl))
+			(th != csa->th_base) && (cnt > 0);
+				th_prev = th, cnt--, th = (th_rec_ptr_t)((sm_uc_ptr_t)th + th->tnque.fl))
 		{
 			bt = (bt_rec_ptr_t)((sm_uc_ptr_t)th - SIZEOF(bt->blkque));
 			if (BT_NOT_ALIGNED(bt, bt_lo))
@@ -296,7 +319,7 @@ boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_i
 				assert(expect_damage);
 				ret = FALSE;
 				SEND_MSG_CSA(VARLSTCNT(11) ERR_DBADDRALIGN, 9, DB_LEN_STR(reg), th_prev, -1,
-					 RTS_ERROR_TEXT("th->tnque"), bt, bt_lo, SIZEOF(bt_rec));
+					RTS_ERROR_TEXT("th->tnque"), bt, bt_lo, SIZEOF(bt_rec));
 				break;
 			}
 			if (BT_NOT_IN_RANGE(bt, bt_lo, bt_hi))
@@ -304,7 +327,7 @@ boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_i
 				assert(expect_damage);
 				ret = FALSE;
 				SEND_MSG_CSA(VARLSTCNT(11) ERR_DBADDRANGE, 9, DB_LEN_STR(reg), th_prev, -1,
-					 bt, RTS_ERROR_TEXT("th->tnque"), bt_lo, bt_hi);
+					bt, RTS_ERROR_TEXT("th->tnque"), bt_lo, bt_hi);
 				break;
 			}
 			if ((th_rec_ptr_t)((sm_uc_ptr_t)th + th->tnque.bl) != th_prev)
@@ -334,34 +357,34 @@ boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_i
 				max_tn = th->tn;
 			}
 			if (((int)(th->blk) != BT_NOTVALID) &&
-			    (((int)(th->blk) < 0) || ((int)(th->blk) > csd->trans_hist.total_blks)))
+				(((int)(th->blk) < 0) || ((int)(th->blk) > csd->trans_hist.total_blks)))
 			{
 				assert(expect_damage);
 				ret = FALSE;
 				SEND_MSG_CSA(VARLSTCNT(11) ERR_DBADDRANGE, 9, DB_LEN_STR(reg),
-					 th, th->blk, th->blk, RTS_ERROR_TEXT("th->blk"), 0, csd->trans_hist.total_blks);
+					th, th->blk, th->blk, RTS_ERROR_TEXT("th->blk"), 0, csd->trans_hist.total_blks);
 			}
 			if (((int)(th->cache_index) != CR_NOTVALID) &&
-			    (((int)(th->cache_index) < cr_base) || ((int)(th->cache_index) >= cr_top)))
+				(((int)(th->cache_index) < cr_base) || ((int)(th->cache_index) >= cr_top)))
 			{
 				assert(expect_damage);
 				ret = FALSE;
 				SEND_MSG_CSA(VARLSTCNT(11) ERR_DBADDRANGE, 9, DB_LEN_STR(reg),
-					 th, th->blk, th->cache_index, RTS_ERROR_TEXT("th->cache_index"), cr_base, cr_top);
+					th, th->blk, th->cache_index, RTS_ERROR_TEXT("th->cache_index"), cr_base, cr_top);
 			}
 			if (th->flushing != FALSE) /* ??? this is a gt.cx item that may require more synchronization at the top */
 			{
 				assert(expect_damage);
 				ret = FALSE;
 				SEND_MSG_CSA(VARLSTCNT(8) ERR_DBFHEADERR4, 6, DB_LEN_STR(reg),
-					 RTS_ERROR_TEXT("th->flushing"), th->flushing, FALSE);
+					RTS_ERROR_TEXT("th->flushing"), th->flushing, FALSE);
 			}
 			if (0 == th->tnque.fl)
 			{	/* No point proceeding to next iteration of loop as "th + th->tnque.fl" will be the same as "th" */
 				assert(expect_damage);
 				ret = FALSE;
 				SEND_MSG_CSA(VARLSTCNT(10) ERR_DBQUELINK, 8, DB_LEN_STR(reg),
-					 th, th->blk, RTS_ERROR_TEXT("tnque.fl"), (UINTPTR_T)th->tnque.fl, (UINTPTR_T)-1);
+					th, th->blk, RTS_ERROR_TEXT("tnque.fl"), (UINTPTR_T)th->tnque.fl, (UINTPTR_T)-1);
 				break;
 			}
 		}
@@ -370,20 +393,20 @@ boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_i
 			assert(expect_damage);
 			ret = FALSE;
 			SEND_MSG_CSA(VARLSTCNT(8) ERR_DBFHEADERR4, 6, DB_LEN_STR(reg),
-				 RTS_ERROR_TEXT("tnque entries"), n_bts - cnt, n_bts - 1);
+				RTS_ERROR_TEXT("tnque entries"), n_bts - cnt, n_bts - 1);
 		} else if ((th == csa->th_base) && ((th_rec_ptr_t)((sm_uc_ptr_t)th + th->tnque.bl) != th_prev))
 		{	/* at this point "th" is csa->th_base and its backlink does not point to the last entry in the th queue */
 			assert(expect_damage);
 			ret = FALSE;
 			SEND_MSG_CSA(VARLSTCNT(10) ERR_DBQUELINK, 8, DB_LEN_STR(reg), th, th->blk,
-				 RTS_ERROR_TEXT("tnque th_base"), (UINTPTR_T)th->tnque.bl, (sm_uc_ptr_t)th_prev - (sm_uc_ptr_t)th);
+				RTS_ERROR_TEXT("tnque th_base"), (UINTPTR_T)th->tnque.bl, (sm_uc_ptr_t)th_prev - (sm_uc_ptr_t)th);
 		}
 		if (max_tn > csd->trans_hist.curr_tn)
 		{
 			assert(expect_damage);
 			ret = FALSE;
 			SEND_MSG_CSA(VARLSTCNT(8) ERR_DBFHEADERR8, 6, DB_LEN_STR(reg),
-				 RTS_ERROR_TEXT("MAX(th_base->tn)"), &max_tn, &csd->trans_hist.curr_tn);
+				RTS_ERROR_TEXT("MAX(th_base->tn)"), &max_tn, &csd->trans_hist.curr_tn);
 		}
 		/* loop through bt blkques */
 		blkque_array = malloc(n_bts * SIZEOF(boolean_t));
@@ -395,19 +418,19 @@ boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_i
 				assert(expect_damage);
 				ret = FALSE;
 				SEND_MSG_CSA(VARLSTCNT(8) ERR_DBFHEADERR4, 6, DB_LEN_STR(reg),
-					 RTS_ERROR_TEXT("queue head bt->blk"), bt0->blk, BT_QUEHEAD);
+					RTS_ERROR_TEXT("queue head bt->blk"), bt0->blk, BT_QUEHEAD);
 				bt0->blk = BT_QUEHEAD;
 			}
 			for (bt_prev = bt0, bt = (bt_rec_ptr_t)((sm_uc_ptr_t)bt0 + bt0->blkque.fl), cnt = n_bts + 1;
-			     (bt != bt0) && (cnt > 0);
-			     bt_prev = bt, cnt--, bt = (bt_rec_ptr_t)((sm_uc_ptr_t)bt + bt->blkque.fl))
+				(bt != bt0) && (cnt > 0);
+					bt_prev = bt, cnt--, bt = (bt_rec_ptr_t)((sm_uc_ptr_t)bt + bt->blkque.fl))
 			{
 				if (BT_NOT_ALIGNED(bt, bt_lo))
 				{
 					assert(expect_damage);
 					ret = FALSE;
 					SEND_MSG_CSA(VARLSTCNT(11) ERR_DBADDRALIGN, 9, DB_LEN_STR(reg), bt_prev, -1,
-						 RTS_ERROR_TEXT("bt->blkque"), bt, bt_lo, SIZEOF(bt_rec));
+						RTS_ERROR_TEXT("bt->blkque"), bt, bt_lo, SIZEOF(bt_rec));
 					break;
 				}
 				if (BT_NOT_IN_RANGE(bt, bt_lo, bt_hi))
@@ -415,7 +438,7 @@ boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_i
 					assert(expect_damage);
 					ret = FALSE;
 					SEND_MSG_CSA(VARLSTCNT(11) ERR_DBADDRANGE, 9, DB_LEN_STR(reg), bt_prev, -1,
-						 bt, RTS_ERROR_TEXT("bt->blkque"), bt_lo, bt_hi);
+						bt, RTS_ERROR_TEXT("bt->blkque"), bt_lo, bt_hi);
 					break;
 				}
 				if ((bt_rec_ptr_t)((sm_uc_ptr_t)bt + bt->blkque.bl) != bt_prev)
@@ -423,8 +446,8 @@ boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_i
 					assert(expect_damage);
 					ret = FALSE;
 					SEND_MSG_CSA(VARLSTCNT(10) ERR_DBQUELINK, 8, DB_LEN_STR(reg), bt, bt->blk,
-						 RTS_ERROR_TEXT("bt->blkque.bl"), (UINTPTR_T)bt->blkque.bl,
-						 (sm_uc_ptr_t)bt_prev - (sm_uc_ptr_t)bt);
+						RTS_ERROR_TEXT("bt->blkque.bl"), (UINTPTR_T)bt->blkque.bl,
+						(sm_uc_ptr_t)bt_prev - (sm_uc_ptr_t)bt);
 				}
 				if ((int)(bt->blk) != BT_NOTVALID)
 				{
@@ -433,8 +456,8 @@ boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_i
 						assert(expect_damage);
 						ret = FALSE;
 						SEND_MSG_CSA(VARLSTCNT(10) ERR_DBQUELINK, 8, DB_LEN_STR(reg), bt, bt->blk,
-							 RTS_ERROR_TEXT("bt hash"), (bt0 - csa->bt_header),
-							 (UINTPTR_T)(bt->blk % csd->bt_buckets));
+							RTS_ERROR_TEXT("bt hash"), (bt0 - csa->bt_header),
+							(UINTPTR_T)(bt->blk % csd->bt_buckets));
 					}
 					if (CR_NOTVALID != bt->cache_index)
 					{
@@ -445,20 +468,20 @@ boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_i
 							assert(expect_damage);
 							ret = FALSE;
 							SEND_MSG_CSA(VARLSTCNT(11) ERR_DBADDRANGE, 9, DB_LEN_STR(reg),
-								 bt, bt->blk, cr, RTS_ERROR_TEXT("bt->cache_index"), cr_lo, cr_hi);
+								bt, bt->blk, cr, RTS_ERROR_TEXT("bt->cache_index"), cr_lo, cr_hi);
 						} else if (CR_NOT_ALIGNED(cr, cr_lo))
 						{
 							assert(expect_damage);
 							ret = FALSE;
 							SEND_MSG_CSA(VARLSTCNT(11) ERR_DBADDRALIGN, 9, DB_LEN_STR(reg), bt, bt->blk,
-								 RTS_ERROR_TEXT("bt->cache_index"), cr, cr_lo, SIZEOF(cache_rec));
+								RTS_ERROR_TEXT("bt->cache_index"), cr, cr_lo, SIZEOF(cache_rec));
 						} else if (cr->blk != bt->blk)
 						{
 							assert(expect_damage);
 							ret = FALSE;
 							SEND_MSG_CSA(VARLSTCNT(13) ERR_DBCRERR, 11, DB_LEN_STR(reg), cr,
-								 bt->blk, RTS_ERROR_TEXT("bt block"), cr->blk, bt->blk,
-								 CALLFROM);
+								bt->blk, RTS_ERROR_TEXT("bt block"), cr->blk, bt->blk,
+								CALLFROM);
 						}
 					}
 				}
@@ -468,7 +491,7 @@ boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_i
 					assert(expect_damage);
 					ret = FALSE;
 					SEND_MSG_CSA(VARLSTCNT(10) ERR_DBQUELINK, 8, DB_LEN_STR(reg), bt, bt->blk,
-						 RTS_ERROR_TEXT("bt->blkque.fl"), (UINTPTR_T)bt->blkque.fl, (UINTPTR_T)-1);
+						RTS_ERROR_TEXT("bt->blkque.fl"), (UINTPTR_T)bt->blkque.fl, (UINTPTR_T)-1);
 					break;
 				}
 			}
@@ -477,14 +500,14 @@ boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_i
 				assert(expect_damage);
 				ret = FALSE;
 				SEND_MSG_CSA(VARLSTCNT(8) ERR_DBFHEADERR4, 6, DB_LEN_STR(reg),
-					 RTS_ERROR_TEXT("btque entries"), n_bts + 1 - cnt, n_bts + 1);
+					RTS_ERROR_TEXT("btque entries"), n_bts + 1 - cnt, n_bts + 1);
 			} else if ((bt == bt0) && ((bt_rec_ptr_t)((sm_uc_ptr_t)bt + bt->blkque.bl) != bt_prev))
 			{	/* at this point "bt" is bt0 and its backlink does not point to last entry in the bt0'th queue */
 				assert(expect_damage);
 				ret = FALSE;
 				SEND_MSG_CSA(VARLSTCNT(10) ERR_DBQUELINK, 8, DB_LEN_STR(reg), bt, bt->blk,
-					 RTS_ERROR_TEXT("btque bt_base"), (UINTPTR_T)bt->blkque.bl,
-					 (sm_uc_ptr_t)bt_prev - (sm_uc_ptr_t)bt);
+					RTS_ERROR_TEXT("btque bt_base"), (UINTPTR_T)bt->blkque.bl,
+					(sm_uc_ptr_t)bt_prev - (sm_uc_ptr_t)bt);
 			}
 		}
 		/* scan all bts looking for valid bt->blks whose bts were not in any blkque */
@@ -495,7 +518,7 @@ boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_i
 				assert(expect_damage);
 				ret = FALSE;
 				SEND_MSG_CSA(VARLSTCNT(10) ERR_DBQUELINK, 8, DB_LEN_STR(reg), bt, bt->blk,
-					 RTS_ERROR_TEXT("bt blkque hash"), (UINTPTR_T)-1, (UINTPTR_T)(bt->blk % csd->bt_buckets));
+					RTS_ERROR_TEXT("bt blkque hash"), (UINTPTR_T)-1, (UINTPTR_T)(bt->blk % csd->bt_buckets));
 			}
 		}
 
@@ -531,15 +554,16 @@ boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_i
 		}
 		/* loop through the cache_recs */
 		memset(blkque_array, 0, n_bts * SIZEOF(boolean_t));	/* initially, we did not find any cr in the cr blkques */
+		asyncio = csd->asyncio;
 		for (bp = bp_lo, cr = cr_lo, cnt = n_bts; cnt > 0; cr++, bp += csd->blk_size, cnt--)
 		{
 			if (((int)(cr->blk) != CR_BLKEMPTY) &&
-			    (((int)(cr->blk) < 0) || ((int)(cr->blk) >= csd->trans_hist.total_blks)))
+				(((int)(cr->blk) < 0) || ((int)(cr->blk) >= csd->trans_hist.total_blks)))
 			{
 				assert(expect_damage);
 				ret = FALSE;
 				SEND_MSG_CSA(VARLSTCNT(11) ERR_DBADDRANGE, 9, DB_LEN_STR(reg),
-					 cr, cr->blk, cr->blk, RTS_ERROR_TEXT("cr->blk"), 0, csd->trans_hist.total_blks);
+					cr, cr->blk, cr->blk, RTS_ERROR_TEXT("cr->blk"), 0, csd->trans_hist.total_blks);
 			}
 			if (cr->tn > csd->trans_hist.curr_tn)
 			{
@@ -547,7 +571,7 @@ boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_i
 				ret = FALSE;
 				tmp_8byte = 0;
 				SEND_MSG_CSA(VARLSTCNT(11) ERR_DBADDRANGE8, 9, DB_LEN_STR(reg),
-					 cr, cr->blk, &cr->tn, RTS_ERROR_TEXT("cr->tn"), &tmp_8byte, &csd->trans_hist.curr_tn);
+					cr, cr->blk, &cr->tn, RTS_ERROR_TEXT("cr->tn"), &tmp_8byte, &csd->trans_hist.curr_tn);
 			}
 			if (0 != cr->bt_index)
 			{
@@ -556,15 +580,15 @@ boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_i
 					assert(expect_damage);
 					ret = FALSE;
 					SEND_MSG_CSA(VARLSTCNT(11) ERR_DBADDRANGE, 9, DB_LEN_STR(reg),
-						 cr, cr->blk, cr->bt_index, RTS_ERROR_TEXT("cr->bt_index"), bt_base_off,
-						 bt_top_off);
+						cr, cr->blk, cr->bt_index, RTS_ERROR_TEXT("cr->bt_index"), bt_base_off,
+						bt_top_off);
 				} else if (!IS_PTR_ALIGNED(cr->bt_index, bt_base_off, SIZEOF(bt_rec)))
 				{
 					assert(expect_damage);
 					ret = FALSE;
 					SEND_MSG_CSA(VARLSTCNT(11) ERR_DBADDRALIGN, 9, DB_LEN_STR(reg),
-						 cr, cr->blk, RTS_ERROR_TEXT("cr->bt_index"), cr->bt_index, bt_base_off,
-						 SIZEOF(bt_rec));
+						cr, cr->blk, RTS_ERROR_TEXT("cr->bt_index"), cr->bt_index, bt_base_off,
+						SIZEOF(bt_rec));
 				} else
 				{
 					bt = (bt_rec_ptr_t)GDS_ANY_REL2ABS(csa, cr->bt_index);
@@ -573,8 +597,8 @@ boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_i
 						assert(expect_damage);
 						ret = FALSE;
 						SEND_MSG_CSA(VARLSTCNT(13) ERR_DBCRERR, 11, DB_LEN_STR(reg), cr,
-							 cr->blk, RTS_ERROR_TEXT("cr block"), cr->blk, bt->blk,
-							 CALLFROM);
+							cr->blk, RTS_ERROR_TEXT("cr block"), cr->blk, bt->blk,
+							CALLFROM);
 					}
 				}
 			}
@@ -583,33 +607,33 @@ boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_i
 				assert(expect_damage);
 				ret = FALSE;
 				SEND_MSG_CSA(VARLSTCNT(11) ERR_DBADDRANGE, 9, DB_LEN_STR(reg),
-					 cr, cr->blk, cr->buffaddr, RTS_ERROR_TEXT("cr->buffaddr"), bp_lo, bp_top);
+					cr, cr->blk, cr->buffaddr, RTS_ERROR_TEXT("cr->buffaddr"), bp_lo, bp_top);
 			} else if (!IS_PTR_ALIGNED(cr->buffaddr, bp_lo, csd->blk_size))
 			{
 				assert(expect_damage);
 				ret = FALSE;
 				SEND_MSG_CSA(VARLSTCNT(11) ERR_DBADDRALIGN, 9, DB_LEN_STR(reg),
-					 cr, cr->blk, RTS_ERROR_TEXT("cr->buffaddr"), cr->buffaddr, bp_lo, csd->blk_size);
+					cr, cr->blk, RTS_ERROR_TEXT("cr->buffaddr"), cr->buffaddr, bp_lo, csd->blk_size);
 			} else if (cr->buffaddr != bp)
 			{
 				assert(expect_damage);
 				ret = FALSE;
 				SEND_MSG_CSA(VARLSTCNT(13) ERR_DBCRERR, 11, DB_LEN_STR(reg),
-					 cr, cr->blk, RTS_ERROR_TEXT("cr->buffaddr"), cr->buffaddr, bp, CALLFROM);
+					cr, cr->blk, RTS_ERROR_TEXT("cr->buffaddr"), cr->buffaddr, bp, CALLFROM);
 			}
 			if (cr->in_tend)
 			{
 				assert(expect_damage);
 				ret = FALSE;
 				SEND_MSG_CSA(VARLSTCNT(13) ERR_DBCRERR, 11, DB_LEN_STR(reg),
-					 cr, cr->blk, RTS_ERROR_TEXT("cr->in_tend"), cr->in_tend, FALSE, CALLFROM);
+					cr, cr->blk, RTS_ERROR_TEXT("cr->in_tend"), cr->in_tend, FALSE, CALLFROM);
 			}
 			if (cr->data_invalid)
 			{
 				assert(expect_damage);
 				ret = FALSE;
 				SEND_MSG_CSA(VARLSTCNT(13) ERR_DBCRERR, 11, DB_LEN_STR(reg),
-					 cr, cr->blk, RTS_ERROR_TEXT("cr->data_invalid"), cr->data_invalid, FALSE, CALLFROM);
+					cr, cr->blk, RTS_ERROR_TEXT("cr->data_invalid"), cr->data_invalid, FALSE, CALLFROM);
 			}
 			if (cr->r_epid != 0)
 			{
@@ -618,15 +642,15 @@ boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_i
 					assert(expect_damage);
 					ret = FALSE;
 					SEND_MSG_CSA(VARLSTCNT(13) ERR_DBCRERR, 11, DB_LEN_STR(reg),
-						 cr, cr->blk, RTS_ERROR_TEXT("cr->r_epid"), cr->r_epid, 0, CALLFROM);
+						cr, cr->blk, RTS_ERROR_TEXT("cr->r_epid"), cr->r_epid, 0, CALLFROM);
 				}
 			} else if ((-1 == cr->read_in_progress) && !caller_is_wcs_recover && (CR_BLKEMPTY != cr->blk)
 				&& !cr->data_invalid
-				VMS_ONLY(&& (!IS_BITMAP_BLK(cr->blk) || (0 == cr->twin) || (0 != cr->bt_index))))
+				&& (!IS_BITMAP_BLK(cr->blk) || (0 == cr->twin) || (0 != cr->bt_index)))
 			{	/* If the buffer is not being read into currently (checked both by cr->r_epid being 0 and
 				 * cr->read_in_progress being -1) and we are being called from DSE CACHE -VERIFY and cr points
 				 * to a valid non-empty block, check the content of cr->buffaddr through a cert_blk().
-				 * In VMS, if it is a bitmap block, we could have twins so do check only on newtest twin as
+				 * If it is a bitmap block, we could have twins so do check only on newtest twin as
 				 * older twin could have an incorrect masterbitmap full/free status (DBBMMSTR error).
 				 * Use "bp" as the buffer as cr->buffaddr might be detected as corrupt by the buffaddr checks
 				 * above. The reason why the cert_blk() is done only from a DSE CACHE -VERIFY call and not from a
@@ -636,16 +660,16 @@ boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_i
 				 * as such are not damaged. wcs_recover() should not return failure in that case.
 				 */
 				bptmp = (sm_uc_ptr_t)GDS_ANY_REL2ABS(csa, bp);
-				if (!cert_blk(reg, cr->blk, (blk_hdr_ptr_t)bptmp, 0, FALSE))
+				if (!cert_blk(reg, cr->blk, (blk_hdr_ptr_t)bptmp, 0, FALSE, NULL))
 				{
 					assert(expect_damage);
 					ret = FALSE;
 					SEND_MSG_CSA(VARLSTCNT(13) ERR_DBCRERR, 11, DB_LEN_STR(reg),
-						 cr, cr->blk, RTS_ERROR_TEXT("Block certification result"),
-						 FALSE, TRUE, CALLFROM);
+						cr, cr->blk, RTS_ERROR_TEXT("Block certification result"),
+						FALSE, TRUE, CALLFROM);
 					SEND_MSG_CSA(VARLSTCNT(13) ERR_DBCRERR, 11, DB_LEN_STR(reg), cr, cr->blk,
-						 RTS_ERROR_TEXT("Block certification result buffer"),
-						 bptmp, csa->lock_addrs[0], CALLFROM);
+						RTS_ERROR_TEXT("Block certification result buffer"),
+						bptmp, csa->lock_addrs[0], CALLFROM);
 				}
 			}
 			if (0 != cr->in_cw_set)
@@ -653,139 +677,104 @@ boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_i
 				assert(expect_damage);
 				ret = FALSE;
 				SEND_MSG_CSA(VARLSTCNT(13) ERR_DBCRERR, 11, DB_LEN_STR(reg),
-					 cr, cr->blk, RTS_ERROR_TEXT("cr->in_cw_set"), (uint4)cr->in_cw_set, 0, CALLFROM);
+					cr, cr->blk, RTS_ERROR_TEXT("cr->in_cw_set"), (uint4)cr->in_cw_set, 0, CALLFROM);
 			}
 			assert(!JNL_ALLOWED(csd) || (NULL != csa->jnl) && (NULL != csa->jnl->jnl_buff));
 			if (JNL_ENABLED(csd))
 			{
 				if ((NULL != csa->jnl) && (NULL != csa->jnl->jnl_buff)
-				    && (0 != cr->dirty) && (cr->jnl_addr > csa->jnl->jnl_buff->freeaddr))
+					&& (0 != cr->dirty) && (cr->jnl_addr > csa->jnl->jnl_buff->freeaddr))
 				{
 					assert(expect_damage);
 					ret = FALSE;
 					SEND_MSG_CSA(VARLSTCNT(11) ERR_DBADDRANGE, 9, DB_LEN_STR(reg), cr, cr->blk,
-						 (uint4)cr->jnl_addr, RTS_ERROR_TEXT("cr->jnl_addr"), 0,
-						 csa->jnl->jnl_buff->freeaddr);
+						(uint4)cr->jnl_addr, RTS_ERROR_TEXT("cr->jnl_addr"), 0,
+						csa->jnl->jnl_buff->freeaddr);
 				}
 			} else if (!JNL_ALLOWED(csd) && (cr->jnl_addr != 0))
 			{
 				assert(expect_damage);
 				ret = FALSE;
 				SEND_MSG_CSA(VARLSTCNT(13) ERR_DBCRERR, 11, DB_LEN_STR(reg),
-					 cr, cr->blk, RTS_ERROR_TEXT("cr->jnl_addr"), (uint4)cr->jnl_addr, 0, CALLFROM);
+					cr, cr->blk, RTS_ERROR_TEXT("cr->jnl_addr"), (uint4)cr->jnl_addr, 0, CALLFROM);
 			}
 			if ((WRITE_LATCH_VAL(cr) < LATCH_CLEAR) || (WRITE_LATCH_VAL(cr) > LATCH_CONFLICT))
 			{	/* the message would read cr->interlock.semaphore although in Unix it means cr->interlock.latch */
 				assert(expect_damage);
 				ret = FALSE;
 				SEND_MSG_CSA(VARLSTCNT(11) ERR_DBADDRANGE, 9, DB_LEN_STR(reg), cr, cr->blk,
-					 WRITE_LATCH_VAL(cr), RTS_ERROR_TEXT("cr->interlock.semaphore"), LATCH_CLEAR,
-					 LATCH_CONFLICT);
+					WRITE_LATCH_VAL(cr), RTS_ERROR_TEXT("cr->interlock.semaphore"), LATCH_CLEAR,
+					LATCH_CONFLICT);
 			}
-			/* as of this time cycle is believed to be a relative timestamp with no characteristics useful to verify */
-#ifdef VMS
-			if (cr->rip_latch.u.parts.latch_pid != 0)
+			/* "cycle" is a relative timestamp with no characteristics useful to verify. So skip that*/
+			/* If "cr->stopped" is TRUE, then "cr->twin" can be non-zero (special case for "secshr_db_clnup"
+			 * to communicate to "wcs_recover"). But in that case it is a one-way link so check that.
+			 */
+			if (cr->stopped)
 			{
 				assert(expect_damage);
 				ret = FALSE;
 				SEND_MSG_CSA(VARLSTCNT(13) ERR_DBCRERR, 11, DB_LEN_STR(reg), cr, cr->blk,
-					 RTS_ERROR_TEXT("cr->rip_latch"), cr->rip_latch.u.parts.latch_pid, 0, CALLFROM);
+					RTS_ERROR_TEXT("cr->stopped"), cr->stopped, FALSE, CALLFROM);
 			}
-			if (cr->iosb.cond != 0)
-			{	/* do not set "ret" to FALSE in both cases below. this is because it seems like VMS can set
-				 * iosb.cond to the qio status much after a process that issued the qio died. our current
-				 * suspicion is that this occurs because the iosb is in shared memory which is available even
-				 * after the process dies. although the two cases below are unexpected, wcs_wtstart()/wcs_wtfini()
-				 * handle this well enough that we do not see any need to consider this as a damaged cache. see
-				 * D9B11-001992 for details. -- nars - July 2003.
-				 */
-				if (0 == cr->dirty)
-				{
-					assert(expect_damage);
-					dummy_tn = (trans_num)TRUE;
-					SEND_MSG_CSA(VARLSTCNT(13) ERR_DBCRERR8, 11, DB_LEN_STR(reg),
-						 cr, cr->blk, RTS_ERROR_TEXT("cr->cr->dirty"), &cr->dirty, &dummy_tn, CALLFROM);
-					SEND_MSG_CSA(VARLSTCNT(13) ERR_DBCRERR, 11, DB_LEN_STR(reg),
-						 cr, cr->blk, RTS_ERROR_TEXT("cr->cr->iosb"), cr->iosb.cond, 0, CALLFROM);
-				}
-				if (0 == cr->epid)
-				{
-					assert(expect_damage);
-					SEND_MSG_CSA(VARLSTCNT(13) ERR_DBCRERR, 11, DB_LEN_STR(reg),
-						 cr, cr->blk, RTS_ERROR_TEXT("cr->epid"), cr->epid, -1, CALLFROM);
-					SEND_MSG_CSA(VARLSTCNT(13) ERR_DBCRERR, 11, DB_LEN_STR(reg),
-						 cr, cr->blk, RTS_ERROR_TEXT("cr->iosb"), cr->iosb.cond, 0, CALLFROM);
-				}
-			}
-			if ((WRT_STRT_PNDNG == cr->iosb.cond) && (0 == cr->dirty))
-			{
-				assert(expect_damage);
-				ret = FALSE;
-				dummy_tn = (trans_num)TRUE;
-				SEND_MSG_CSA(VARLSTCNT(13) ERR_DBCRERR8, 11, DB_LEN_STR(reg), cr, cr->blk,
-					 RTS_ERROR_TEXT("cr->dirty"), &cr->dirty, &dummy_tn, CALLFROM);
-			}
-			if (cr->twin != 0)
-			{
-				cr_tmp = (cache_rec_ptr_t)GDS_ANY_REL2ABS(csa, cr->twin);
-				if (CR_NOT_IN_RANGE(cr_tmp, cr_lo, cr_hi))
-				{
-					assert(expect_damage);
-					ret = FALSE;
-					SEND_MSG_CSA(VARLSTCNT(11) ERR_DBADDRANGE, 9, DB_LEN_STR(reg),
-						 cr, cr->blk, cr_tmp, RTS_ERROR_TEXT("cr->twin"), cr_lo, cr_hi);
-				} else if (CR_NOT_ALIGNED(cr_tmp, cr_lo))
-				{
-					assert(expect_damage);
-					ret = FALSE;
-					SEND_MSG_CSA(VARLSTCNT(11) ERR_DBADDRALIGN, 9, DB_LEN_STR(reg),
-						 cr, cr->blk, RTS_ERROR_TEXT("cr->twin"), cr_tmp, cr_lo, SIZEOF(cache_rec));
-				} else if (cr != (cache_rec_ptr_t)GDS_ANY_REL2ABS(csa, cr_tmp->twin))
+			if (0 != cr->twin)
+			{	/* Validate twin links */
+				assert(!cr->stopped);
+				if (TWINNING_ON(csd))
 				{
+					cr_tmp = (cache_rec_ptr_t)GDS_ANY_REL2ABS(csa, cr->twin);
+					if (CR_NOT_IN_RANGE(cr_tmp, cr_lo, cr_hi))
+					{
+						assert(expect_damage);
+						ret = FALSE;
+						SEND_MSG_CSA(VARLSTCNT(11) ERR_DBADDRANGE, 9, DB_LEN_STR(reg),
+							cr, cr->blk, cr_tmp, RTS_ERROR_TEXT("cr->twin"), cr_lo, cr_hi);
+					} else if (CR_NOT_ALIGNED(cr_tmp, cr_lo))
+					{
+						assert(expect_damage);
+						ret = FALSE;
+						SEND_MSG_CSA(VARLSTCNT(11) ERR_DBADDRALIGN, 9, DB_LEN_STR(reg), cr, cr->blk,
+							RTS_ERROR_TEXT("cr->twin"), cr_tmp, cr_lo, SIZEOF(cache_rec));
+					} else
+					{	/* We expect a two-way link. */
+						cr_tmp2 = (cache_rec_ptr_t)GDS_ANY_REL2ABS(csa, cr_tmp->twin);
+						if (cr != cr_tmp2)
+						{
+							assert(expect_damage);
+							ret = FALSE;
+							SEND_MSG_CSA(VARLSTCNT(13) ERR_DBCRERR, 11, DB_LEN_STR(reg), cr_tmp,
+								cr->blk, RTS_ERROR_TEXT("cr->twin->twin"),
+								GDS_ANY_REL2ABS(csa, cr_tmp->twin),
+								cr, CALLFROM);
+						}
+					}
+				} else
+				{	/* We do not expect cr->twin to be non-zero */
 					assert(expect_damage);
 					ret = FALSE;
-					SEND_MSG_CSA(VARLSTCNT(13) ERR_DBCRERR, 11, DB_LEN_STR(reg), cr_tmp, cr->blk,
-						 RTS_ERROR_TEXT("cr->twin->twin"), GDS_ANY_REL2ABS(csa, cr_tmp->twin), cr,
-						 CALLFROM);
+					SEND_MSG_CSA(VARLSTCNT(13) ERR_DBCRERR, 11, DB_LEN_STR(reg),
+						 cr, cr->blk, RTS_ERROR_TEXT("cr->twin"), cr->twin, 0, CALLFROM);
 				}
+				/* One twin's bt_index has to be zero and another non-zero.
+				 * The only exception is if this is a "kill -9" situation in which case the process
+				 * could have been shot in the middle of bg_update_phase1 where things are still not in sync.
+				 */
+				assert((0 == cr->bt_index) || (0 == cr_tmp->bt_index)	/* one has to be zero */
+							|| WBTEST_ENABLED(WBTEST_CRASH_SHUTDOWN_EXPECTED));
+				assert((0 != cr->bt_index) || (0 != cr_tmp->bt_index)	/* one has to be non-zero */
+							|| WBTEST_ENABLED(WBTEST_CRASH_SHUTDOWN_EXPECTED));
 			}
-#else
-			/* iosb, twin, image_count, wip_stopped are currently used in VMS only */
-			if (0 != cr->twin)
-			{
-				assert(expect_damage);
-				ret = FALSE;
-				SEND_MSG_CSA(VARLSTCNT(13) ERR_DBCRERR, 11, DB_LEN_STR(reg),
-					 cr, cr->blk, RTS_ERROR_TEXT("cr->twin"), cr->twin, 0, CALLFROM);
-			}
-			if (0 != cr->image_count)
-			{
-				assert(expect_damage);
-				ret = FALSE;
-				SEND_MSG_CSA(VARLSTCNT(13) ERR_DBCRERR, 11, DB_LEN_STR(reg),
-					 cr, cr->blk, RTS_ERROR_TEXT("cr->image_count"), cr->image_count, 0, CALLFROM);
-			}
-			if ((0 != cr->epid) && caller_is_wcs_recover)
-			{	/* if called from DSE CACHE -VERIFY, we do not wait for concurrent writers to finish */
+			/* If asyncio=OFF, we do not expect any concurrent writers. Check that.
+			 * If asyncio=ON, it is possible to have concurrent writers. Do not check epid in that case.
+			 */
+			if (!asyncio && (0 != cr->epid) && caller_is_wcs_recover)
+			{	/* If called from DSE CACHE -VERIFY, we do not wait for concurrent writers to finish
+				 * so do not issue an error message in that case.
+				 */
 				assert(expect_damage);
 				ret = FALSE;
 				SEND_MSG_CSA(VARLSTCNT(13) ERR_DBCRERR, 11, DB_LEN_STR(reg),
-					 cr, cr->blk, RTS_ERROR_TEXT("cr->epid"), cr->epid, 0, CALLFROM);
-			}
-#endif
-			if (FALSE != cr->wip_stopped)
-			{
-				assert(expect_damage);
-				ret = FALSE;
-				SEND_MSG_CSA(VARLSTCNT(13) ERR_DBCRERR, 11, DB_LEN_STR(reg), cr, cr->blk,
-					 RTS_ERROR_TEXT("cr->wip_stopped"), cr->wip_stopped, FALSE, CALLFROM);
-			}
-			if (FALSE != cr->stopped)
-			{
-				assert(expect_damage);
-				ret = FALSE;
-				SEND_MSG_CSA(VARLSTCNT(13) ERR_DBCRERR, 11, DB_LEN_STR(reg), cr, cr->blk,
-					 RTS_ERROR_TEXT("cr->stopped"), cr->stopped, FALSE, CALLFROM);
+					cr, cr->blk, RTS_ERROR_TEXT("cr->epid"), cr->epid, 0, CALLFROM);
 			}
 		}
 		/* loop through the cr blkques */
@@ -796,19 +785,19 @@ boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_i
 				assert(expect_damage);
 				ret = FALSE;
 				SEND_MSG_CSA(VARLSTCNT(13) ERR_DBCRERR, 11, DB_LEN_STR(reg), cr0, cr0->blk,
-					 RTS_ERROR_TEXT("queue head cr->blk"), cr0->blk, BT_QUEHEAD, CALLFROM);
+					RTS_ERROR_TEXT("queue head cr->blk"), cr0->blk, BT_QUEHEAD, CALLFROM);
 				cr0->blk = BT_QUEHEAD;
 			}
 			for (cr_prev = cr0, cr = (cache_rec_ptr_t)((sm_uc_ptr_t)cr0 + cr0->blkque.fl), cnt = n_bts + 1;
-			     (cr != cr0) && (cnt > 0);
-			     cr_prev = cr, cnt--, cr = (cache_rec_ptr_t)((sm_uc_ptr_t)cr + cr->blkque.fl))
+				(cr != cr0) && (cnt > 0);
+					cr_prev = cr, cnt--, cr = (cache_rec_ptr_t)((sm_uc_ptr_t)cr + cr->blkque.fl))
 			{
 				if (CR_NOT_IN_RANGE(cr, cr_lo, cr_hi))
 				{
 					assert(expect_damage);
 					ret = FALSE;
 					SEND_MSG_CSA(VARLSTCNT(11) ERR_DBADDRANGE, 9, DB_LEN_STR(reg),
-						 cr0, -1, cr, RTS_ERROR_TEXT("cr->blkque"), cr_lo, cr_hi);
+						cr0, -1, cr, RTS_ERROR_TEXT("cr->blkque"), cr_lo, cr_hi);
 					break;
 				}
 				if (CR_NOT_ALIGNED(cr, cr_lo))
@@ -816,7 +805,7 @@ boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_i
 					assert(expect_damage);
 					ret = FALSE;
 					SEND_MSG_CSA(VARLSTCNT(11) ERR_DBADDRALIGN, 9, DB_LEN_STR(reg),
-						 cr0, -1, RTS_ERROR_TEXT("cr->blkque"), cr, cr_lo, SIZEOF(cache_rec));
+						cr0, -1, RTS_ERROR_TEXT("cr->blkque"), cr, cr_lo, SIZEOF(cache_rec));
 					break;
 				}
 				if ((cache_rec_ptr_t)((sm_uc_ptr_t)cr + cr->blkque.bl) != cr_prev)
@@ -824,15 +813,15 @@ boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_i
 					assert(expect_damage);
 					ret = FALSE;
 					SEND_MSG_CSA(VARLSTCNT(10) ERR_DBQUELINK, 8, DB_LEN_STR(reg), cr, cr->blk,
-						 RTS_ERROR_TEXT("cr->blkque.bl"), (UINTPTR_T)cr->blkque.bl,
-						 (sm_uc_ptr_t)cr_prev - (sm_uc_ptr_t)cr);
+						RTS_ERROR_TEXT("cr->blkque.bl"), (UINTPTR_T)cr->blkque.bl,
+						(sm_uc_ptr_t)cr_prev - (sm_uc_ptr_t)cr);
 				}
 				if (((int)(cr->blk) != CR_BLKEMPTY) && ((cr_qbase + (cr->blk % csd->bt_buckets)) != cr0))
 				{
 					assert(expect_damage);
 					ret = FALSE;
 					SEND_MSG_CSA(VARLSTCNT(13) ERR_DBCRERR, 11, DB_LEN_STR(reg), cr, cr->blk,
-						 RTS_ERROR_TEXT("cr hash"), cr0 - cr_qbase, cr->blk % csd->bt_buckets, CALLFROM);
+						RTS_ERROR_TEXT("cr hash"), cr0 - cr_qbase, cr->blk % csd->bt_buckets, CALLFROM);
 					if (caller_is_wcs_recover && !cr->stopped)
 					{	/* if cr->stopped is TRUE, then the buffer was created by secshr_db_clnup(),
 						 * and hence it is ok to have different hash value, but otherwise we believe
@@ -866,7 +855,7 @@ boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_i
 					assert(expect_damage);
 					ret = FALSE;
 					SEND_MSG_CSA(VARLSTCNT(10) ERR_DBQUELINK, 8, DB_LEN_STR(reg), cr, cr->blk,
-						 RTS_ERROR_TEXT("cr->blkque.fl"), (UINTPTR_T)cr->blkque.fl, (UINTPTR_T)-1);
+						RTS_ERROR_TEXT("cr->blkque.fl"), (UINTPTR_T)cr->blkque.fl, (UINTPTR_T)-1);
 					break;
 				}
 			}
@@ -875,14 +864,14 @@ boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_i
 				assert(expect_damage);
 				ret = FALSE;
 				SEND_MSG_CSA(VARLSTCNT(10) ERR_DBQUELINK, 8, DB_LEN_STR(reg),
-					 cr_qbase, 0, RTS_ERROR_TEXT("crque entries"), (UINTPTR_T)(n_bts + 1), (UINTPTR_T)(n_bts));
+					cr_qbase, 0, RTS_ERROR_TEXT("crque entries"), (UINTPTR_T)(n_bts + 1), (UINTPTR_T)(n_bts));
 			} else if ((cr == cr0) && ((cache_rec_ptr_t)((sm_uc_ptr_t)cr + cr->blkque.bl) != cr_prev))
 			{	/* at this point "cr" is cr0 and its backlink does not point to last entry in the cr0'th queue */
 				assert(expect_damage);
 				ret = FALSE;
 				SEND_MSG_CSA(VARLSTCNT(10) ERR_DBQUELINK, 8, DB_LEN_STR(reg), cr, cr->blk,
-					 RTS_ERROR_TEXT("crque cr_base"), (UINTPTR_T)cr->blkque.bl,
-					 (sm_uc_ptr_t)cr_prev - (sm_uc_ptr_t)cr);
+					RTS_ERROR_TEXT("crque cr_base"), (UINTPTR_T)cr->blkque.bl,
+					(sm_uc_ptr_t)cr_prev - (sm_uc_ptr_t)cr);
 			}
 		}
 		/* scan all crs looking for non-empty cr->blks whose crs were not in any blkque */
@@ -893,7 +882,7 @@ boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_i
 				assert(expect_damage);
 				ret = FALSE;
 				SEND_MSG_CSA(VARLSTCNT(13) ERR_DBCRERR, 11, DB_LEN_STR(reg), cr, cr->blk,
-					 RTS_ERROR_TEXT("cr blkque hash"), -1, cr->blk % csd->bt_buckets, CALLFROM);
+					RTS_ERROR_TEXT("cr blkque hash"), -1, cr->blk % csd->bt_buckets, CALLFROM);
 				if (caller_is_wcs_recover && !cr->stopped) /* see comment above ("cr hash") for similar handling */
 				{
 					assert(expect_damage);
@@ -901,14 +890,24 @@ boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_i
 				}
 			}
 		}
-
 		que_head = &csa->acc_meth.bg.cache_state->cacheq_active;
 		if ((sm_long_t)que_head % SIZEOF(que_head->fl) != 0)
 		{
 			assert(expect_damage);
 			ret = FALSE;
 			SEND_MSG_CSA(VARLSTCNT(10) ERR_DBQUELINK, 8, DB_LEN_STR(reg), que_head, 0, RTS_ERROR_TEXT("cacheq_active"),
-				 que_head, ((sm_long_t)que_head / SIZEOF(que_head->fl)) * SIZEOF(que_head->fl));
+				que_head, ((sm_long_t)que_head / SIZEOF(que_head->fl)) * SIZEOF(que_head->fl));
+		}
+		if ((0 != que_head->fl) != (0 != que_head->bl))
+		{
+			assert(expect_damage);
+			ret = FALSE;
+			if (que_head->fl)
+				SEND_MSG_CSA(VARLSTCNT(10) ERR_DBQUELINK, 8, DB_LEN_STR(reg),
+					que_head, 0, RTS_ERROR_TEXT("cacheq_active1"), (UINTPTR_T)que_head->fl, 0);
+			else
+				SEND_MSG_CSA(VARLSTCNT(10) ERR_DBQUELINK, 8, DB_LEN_STR(reg),
+					que_head, 0, RTS_ERROR_TEXT("cacheq_active2"), (UINTPTR_T)que_head->bl, 0);
 		}
 		/* loop through the active queue */
 		for (cstt_prev = (cache_state_rec_ptr_t)que_head,
@@ -922,7 +921,7 @@ boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_i
 				assert(expect_damage);
 				ret = FALSE;
 				SEND_MSG_CSA(VARLSTCNT(11) ERR_DBADDRANGE, 9, DB_LEN_STR(reg), que_head, -1,
-					 cr, RTS_ERROR_TEXT("active cstt->state_que"), cr_lo, cr_hi);
+					cr, RTS_ERROR_TEXT("active cstt->state_que"), cr_lo, cr_hi);
 				break;
 			}
 			if (CR_NOT_ALIGNED(cr, cr_lo))
@@ -930,7 +929,7 @@ boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_i
 				assert(expect_damage);
 				ret = FALSE;
 				SEND_MSG_CSA(VARLSTCNT(11) ERR_DBADDRALIGN, 9, DB_LEN_STR(reg), que_head, -1,
-					 RTS_ERROR_TEXT("active cstt->state_que"), cr, cr_lo, SIZEOF(cache_rec));
+					RTS_ERROR_TEXT("active cstt->state_que"), cr, cr_lo, SIZEOF(cache_rec));
 				break;
 			}
 			if ((cache_state_rec_ptr_t)((sm_uc_ptr_t)cstt + cstt->state_que.bl) != cstt_prev)
@@ -938,8 +937,8 @@ boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_i
 				assert(expect_damage);
 				ret = FALSE;
 				SEND_MSG_CSA(VARLSTCNT(10) ERR_DBQUELINK, 8, DB_LEN_STR(reg), cstt, cstt->blk,
-					 RTS_ERROR_TEXT("active queue.bl"), (UINTPTR_T)cstt->state_que.bl,
-					 (sm_uc_ptr_t)cstt_prev - (sm_uc_ptr_t)cstt);
+					RTS_ERROR_TEXT("active queue.bl"), (UINTPTR_T)cstt->state_que.bl,
+					(sm_uc_ptr_t)cstt_prev - (sm_uc_ptr_t)cstt);
 			}
 			if (0 == cstt->dirty)
 			{
@@ -947,16 +946,16 @@ boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_i
 				ret = FALSE;
 				dummy_tn = (trans_num)TRUE;
 				SEND_MSG_CSA(VARLSTCNT(13) ERR_DBCRERR8, 11, DB_LEN_STR(reg), cr, cstt->blk,
-					 RTS_ERROR_TEXT("active cr->dirty"), &cstt->dirty, &dummy_tn, CALLFROM);
+					RTS_ERROR_TEXT("active cr->dirty"), &cstt->dirty, &dummy_tn, CALLFROM);
 			}
 			if (((0 != cstt->flushed_dirty_tn) && (cstt->dirty <= cstt->flushed_dirty_tn))
-			    || (cstt->dirty > csd->trans_hist.curr_tn))
+				|| (cstt->dirty > csd->trans_hist.curr_tn))
 			{
 				assert(expect_damage);
 				ret = FALSE;
 				dummy_tn = cstt->flushed_dirty_tn + 1;
 				SEND_MSG_CSA(VARLSTCNT(11) ERR_DBADDRANGE8, 9, DB_LEN_STR(reg), cstt + SIZEOF(que_head), cstt->blk,
-					 &cstt->dirty, RTS_ERROR_TEXT("active dirty (tn)"), &dummy_tn, &csd->trans_hist.curr_tn);
+					&cstt->dirty, RTS_ERROR_TEXT("active dirty (tn)"), &dummy_tn, &csd->trans_hist.curr_tn);
 			}
 			/* if caller_is_wcs_recover, we would have waited for all writers to stop manipulating the active/wip queues
 			 * and so it is ok to do the FAKE_DIRTY check. but otherwise it is not.
@@ -968,7 +967,7 @@ boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_i
 				assert(expect_damage);
 				ret = FALSE;
 				SEND_MSG_CSA(VARLSTCNT(10) ERR_DBQUELINK, 8, DB_LEN_STR(reg), cstt, cstt->blk,
-					 RTS_ERROR_TEXT("active queue.fl"), (UINTPTR_T)cstt->state_que.fl, (UINTPTR_T)-1);
+					RTS_ERROR_TEXT("active queue.fl"), (UINTPTR_T)cstt->state_que.fl, (UINTPTR_T)-1);
 				break;
 			}
 		}
@@ -977,16 +976,15 @@ boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_i
 			assert(expect_damage);
 			ret = FALSE;
 			SEND_MSG_CSA(VARLSTCNT(10) ERR_DBQUELINK, 8, DB_LEN_STR(reg),
-				 que_head, 0, RTS_ERROR_TEXT("active queue entries"), (UINTPTR_T)(n_bts + 1), (UINTPTR_T)n_bts);
+				que_head, 0, RTS_ERROR_TEXT("active queue entries"), (UINTPTR_T)(n_bts + 1), (UINTPTR_T)n_bts);
 		} else if ((cstt == (cache_state_rec_ptr_t)que_head)
-			   && ((cache_state_rec_ptr_t)((sm_uc_ptr_t)cstt + cstt->state_que.bl) != cstt_prev))
+			&& ((cache_state_rec_ptr_t)((sm_uc_ptr_t)cstt + cstt->state_que.bl) != cstt_prev))
 		{	/* at this point "cstt" is active que_head and its backlink does not point to last entry in active queue */
 			assert(expect_damage);
 			ret = FALSE;
 			SEND_MSG_CSA(VARLSTCNT(10) ERR_DBQUELINK, 8, DB_LEN_STR(reg), cstt, 0, RTS_ERROR_TEXT("active queue base"),
-				 (UINTPTR_T)cstt->state_que.bl, (sm_uc_ptr_t)cstt_prev - (sm_uc_ptr_t)cstt);
+				(UINTPTR_T)cstt->state_que.bl, (sm_uc_ptr_t)cstt_prev - (sm_uc_ptr_t)cstt);
 		}
-
 		/* loop through the wip queue */
 		que_head = &csa->acc_meth.bg.cache_state->cacheq_wip;
 		if ((sm_long_t)que_head % SIZEOF(que_head->fl) != 0)
@@ -994,12 +992,23 @@ boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_i
 			assert(expect_damage);
 			ret = FALSE;
 			SEND_MSG_CSA(VARLSTCNT(10) ERR_DBQUELINK, 8, DB_LEN_STR(reg), que_head, 0, RTS_ERROR_TEXT("cacheq_wip"),
-				 que_head, ((sm_long_t)que_head / SIZEOF(que_head->fl)) * SIZEOF(que_head->fl));
+				que_head, ((sm_long_t)que_head / SIZEOF(que_head->fl)) * SIZEOF(que_head->fl));
 		}
-#ifdef VMS
-		for (cstt_prev = que_head, cstt = (cache_state_rec_ptr_t)((sm_uc_ptr_t)que_head + que_head->fl), cnt = n_bts;
-		     (cstt != (cache_state_rec_ptr_t)que_head) && (cnt > 0);
-		     cstt_prev = cstt, cnt--, cstt = (cache_state_rec_ptr_t)((sm_uc_ptr_t)cstt + cstt->state_que.fl))
+		if ((0 != que_head->fl) != (0 != que_head->bl))
+		{
+			assert(expect_damage);
+			ret = FALSE;
+			if (que_head->fl)
+				SEND_MSG_CSA(VARLSTCNT(10) ERR_DBQUELINK, 8, DB_LEN_STR(reg),
+					que_head, 0, RTS_ERROR_TEXT("cacheq_wip1"), (UINTPTR_T)que_head->fl, 0);
+			else
+				SEND_MSG_CSA(VARLSTCNT(10) ERR_DBQUELINK, 8, DB_LEN_STR(reg),
+					que_head, 0, RTS_ERROR_TEXT("cacheq_wip2"), (UINTPTR_T)que_head->bl, 0);
+		}
+		for (cstt_prev = (cache_state_rec_ptr_t)que_head,
+				cstt = (cache_state_rec_ptr_t)((sm_uc_ptr_t)que_head + que_head->fl), cnt = n_bts;
+			(cstt != (cache_state_rec_ptr_t)que_head) && (cnt > 0);
+				cstt_prev = cstt, cnt--, cstt = (cache_state_rec_ptr_t)((sm_uc_ptr_t)cstt + cstt->state_que.fl))
 		{
 			cr = (cache_rec_ptr_t)((sm_uc_ptr_t)cstt - SIZEOF(cr->blkque));
 			if (CR_NOT_IN_RANGE((cache_rec_ptr_t)cr, cr_lo, cr_hi))
@@ -1007,7 +1016,7 @@ boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_i
 				assert(expect_damage);
 				ret = FALSE;
 				SEND_MSG_CSA(VARLSTCNT(11) ERR_DBADDRANGE, 9, DB_LEN_STR(reg), que_head, -1,
-					 cr, RTS_ERROR_TEXT("wip cstt->state_que"), cr_lo, cr_hi);
+					cr, RTS_ERROR_TEXT("wip cstt->state_que"), cr_lo, cr_hi);
 				break;
 			}
 			if (CR_NOT_ALIGNED(cr, cr_lo))
@@ -1015,7 +1024,7 @@ boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_i
 				assert(expect_damage);
 				ret = FALSE;
 				SEND_MSG_CSA(VARLSTCNT(11) ERR_DBADDRALIGN, 9, DB_LEN_STR(reg), que_head, -1,
-					 RTS_ERROR_TEXT("wip cstt->state_que"), cr, cr_lo, SIZEOF(cache_rec));
+					RTS_ERROR_TEXT("wip cstt->state_que"), cr, cr_lo, SIZEOF(cache_rec));
 				break;
 			}
 			if ((cache_state_rec_ptr_t)((sm_uc_ptr_t)cstt + cstt->state_que.bl) != cstt_prev)
@@ -1023,35 +1032,33 @@ boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_i
 				assert(expect_damage);
 				ret = FALSE;
 				SEND_MSG_CSA(VARLSTCNT(10) ERR_DBQUELINK, 8, DB_LEN_STR(reg), cstt, cstt->blk,
-					 RTS_ERROR_TEXT("wip queue.bl"), (UINTPTR_T)cstt->state_que.bl,
-					 (sm_uc_ptr_t)cstt_prev - (sm_uc_ptr_t)cstt);
+					RTS_ERROR_TEXT("wip queue.bl"), (UINTPTR_T)cstt->state_que.bl,
+					(sm_uc_ptr_t)cstt_prev - (sm_uc_ptr_t)cstt);
+			}
+			if (cstt->epid == 0)
+			{
+				assert(expect_damage);
+				ret = FALSE;
+				SEND_MSG_CSA(VARLSTCNT(13) ERR_DBCRERR, 11, DB_LEN_STR(reg),
+					cr, cstt->blk, RTS_ERROR_TEXT("wip cr->epid"), cstt->epid, -1, CALLFROM);
 			}
-			/* Secondary failure @ ipb - not yet determined if it was a legal state or a recover problem
-			 *	if (cstt->epid == 0)
-			 *	{
-			 *		assert(expect_damage);
-			 *		ret = FALSE;
-			 *		SEND_MSG_CSA(VARLSTCNT(13) ERR_DBCRERR, 11, DB_LEN_STR(reg),
-			 *			cr, cstt->blk, RTS_ERROR_TEXT("wip cr->epid"), cstt->epid, -1, CALLFROM);
-			 *	}
-			 */
 			if (0 == cstt->dirty)
 			{
 				assert(expect_damage);
 				ret = FALSE;
 				dummy_tn = (trans_num)TRUE;
 				SEND_MSG_CSA(VARLSTCNT(13) ERR_DBCRERR8, 11, DB_LEN_STR(reg), cr, cstt->blk,
-					 RTS_ERROR_TEXT("wip cr->dirty"), &cstt->dirty, &dummy_tn, CALLFROM);
+					RTS_ERROR_TEXT("wip cr->dirty"), &cstt->dirty, &dummy_tn, CALLFROM);
 			}
 			if (((0 != cstt->flushed_dirty_tn) && (cstt->dirty <= cstt->flushed_dirty_tn))
-			    || (cstt->dirty > csd->trans_hist.curr_tn))
+								|| (cstt->dirty > csd->trans_hist.curr_tn))
 			{
 				assert(expect_damage);
 				ret = FALSE;
 				dummy_tn = cstt->flushed_dirty_tn + 1;
-				SEND_MSG_CSA(VARLSTCNT(11) ERR_DBADDRANGE8, 9, DB_LEN_STR(reg), (int)cstt + SIZEOF(que_head),
-						cstt->blk, &cstt->dirty, RTS_ERROR_TEXT("wip dirty (tn)"), &dummy_tn,
-						&csd->trans_hist.curr_tn);
+				SEND_MSG_CSA(VARLSTCNT(11) ERR_DBADDRANGE8, 9, DB_LEN_STR(reg),
+					(sm_uc_ptr_t)cstt + SIZEOF(que_head), cstt->blk, &cstt->dirty,
+					RTS_ERROR_TEXT("wip dirty (tn)"), &dummy_tn, &csd->trans_hist.curr_tn);
 			}
 			/* if caller_is_wcs_recover, we would have waited for all writers to stop manipulating the active/wip queues
 			 * and so it is ok to do the FAKE_DIRTY check. but otherwise it is not.
@@ -1063,7 +1070,7 @@ boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_i
 				assert(expect_damage);
 				ret = FALSE;
 				SEND_MSG_CSA(VARLSTCNT(10) ERR_DBQUELINK, 8, DB_LEN_STR(reg), cstt, cstt->blk,
-					 RTS_ERROR_TEXT("wip queue.fl"), (UINTPTR_T)cstt->state_que.fl, (UINTPTR_T)-1);
+					RTS_ERROR_TEXT("wip queue.fl"), (UINTPTR_T)cstt->state_que.fl, (UINTPTR_T)-1);
 				break;
 			}
 		}
@@ -1072,33 +1079,15 @@ boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_i
 			assert(expect_damage);
 			ret = FALSE;
 			SEND_MSG_CSA(VARLSTCNT(10) ERR_DBQUELINK, 8, DB_LEN_STR(reg),
-				 que_head, 0, RTS_ERROR_TEXT("wip queue entries"), (UINTPTR_T)(n_bts + 1), (UINTPTR_T)n_bts);
+				que_head, 0, RTS_ERROR_TEXT("wip queue entries"), (UINTPTR_T)(n_bts + 1), (UINTPTR_T)n_bts);
 		} else if ((cstt == (cache_state_rec_ptr_t)que_head)
-			   && ((cache_state_rec_ptr_t)((sm_uc_ptr_t)cstt + cstt->state_que.bl) != cstt_prev))
+				&& ((cache_state_rec_ptr_t)((sm_uc_ptr_t)cstt + cstt->state_que.bl) != cstt_prev))
 		{	/* at this point "cstt" is wip que_head and its backlink does not point to last entry in the wip queue */
 			assert(expect_damage);
 			ret = FALSE;
 			SEND_MSG_CSA(VARLSTCNT(10) ERR_DBQUELINK, 8, DB_LEN_STR(reg), cstt, 0, RTS_ERROR_TEXT("active queue base"),
-				 (UINTPTR_T)cstt->state_que.bl, (sm_uc_ptr_t)cstt_prev - (sm_uc_ptr_t)cstt);
-		}
-#else
-		if (que_head->fl != 0)
-		{
-			assert(expect_damage);
-			ret = FALSE;
-			SEND_MSG_CSA(VARLSTCNT(10) ERR_DBQUELINK, 8, DB_LEN_STR(reg),
-				 que_head, 0, RTS_ERROR_TEXT("wip queue head fl"), (UINTPTR_T)que_head->fl, (UINTPTR_T)0);
-			que_head->fl = 0;
+				(UINTPTR_T)cstt->state_que.bl, (sm_uc_ptr_t)cstt_prev - (sm_uc_ptr_t)cstt);
 		}
-		if (que_head->bl != 0)
-		{
-			assert(expect_damage);
-			ret = FALSE;
-			SEND_MSG_CSA(VARLSTCNT(10) ERR_DBQUELINK, 8, DB_LEN_STR(reg),
-				 que_head, 0, RTS_ERROR_TEXT("wip queue head bl"), (UINTPTR_T)que_head->bl, (UINTPTR_T)0);
-			que_head->bl = 0;
-		}
-#endif
 		/* if caller_is_wcs_recover, we would have waited for all writers to stop manipulating the active/wip queues
 		 * and so it is ok to do the FAKE_DIRTY check. but otherwise it is not.
 		 */
@@ -1116,7 +1105,9 @@ boolean_t	wcs_verify(gd_region *reg, boolean_t expect_damage, boolean_t caller_i
 						ret = FALSE;
 						dummy_tn = (trans_num)FALSE;
 						SEND_MSG_CSA(VARLSTCNT(13) ERR_DBCRERR8, 11, DB_LEN_STR(reg), cr, cr->blk,
-							 RTS_ERROR_TEXT("non-state cr->dirty"), &cr->dirty, &dummy_tn, CALLFROM);
+							RTS_ERROR_TEXT("non-state cr->dirty"), &cr->dirty, &dummy_tn, CALLFROM);
+						SEND_MSG_CSA(VARLSTCNT(13) ERR_DBCRERR, 11, DB_LEN_STR(reg),
+							cr, cr->blk, RTS_ERROR_TEXT("cr->epid"), cr->epid, 0, CALLFROM);
 					}
 				}
 			}
diff --git a/sr_port/xfer.h b/sr_port/xfer.h
index 4f19362..1b422cf 100755
--- a/sr_port/xfer.h
+++ b/sr_port/xfer.h
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information 	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -307,13 +307,13 @@ XFER(xf_fnzpeek, op_fnzpeek),
 #endif
 XFER(xf_litc, op_litc),
 XFER(xf_stolitc, op_stolitc),
-XFER(xf_fnzsocket, op_fnzsocket)
+XFER(xf_fnzsocket, op_fnzsocket),
 #ifdef UNIX
-,
 XFER(xf_fnzsyslog, op_fnzsyslog),
-XFER(xf_zrupdate, op_zrupdate)
+XFER(xf_zrupdate, op_zrupdate),
 #endif
 #ifdef AUTORELINK_SUPPORTED
-,
-XFER(xf_currhd, op_currhd)
+XFER(xf_currhd, op_currhd),
 #endif
+XFER(xf_fnzcollate, op_fnzcollate),
+XFER(xf_fnzatransform, op_fnzatransform)
diff --git a/sr_port/zshow_gvstats.c b/sr_port/zshow_gvstats.c
index 7e7304a..d5498fe 100644
--- a/sr_port/zshow_gvstats.c
+++ b/sr_port/zshow_gvstats.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2008, 2010 Fidelity Information Services, Inc	*
+ * Copyright (c) 2008-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -22,6 +23,7 @@
 #include "gvstats_rec.h"
 #include "zshow.h"
 #include "dpgbldir.h"
+#include "gtm_reservedDB.h"
 
 #define	KEYWORD_TERMINATOR	","
 #define	KEYWORD_SEPARATOR	":"
@@ -85,13 +87,13 @@ void zshow_gvstats(zshow_out *output)
 	{
 		for (reg = addr_ptr->regions, r_top = reg + addr_ptr->n_regions; reg < r_top; reg++)
 		{
-			if (!reg->open || reg->was_open)
+			if (!reg->open || reg->was_open || IS_STATSDB_REG(reg))
 				continue;
 			acc_meth = reg->dyn.addr->acc_meth;
-			if ((dba_bg != acc_meth) && (dba_mm != acc_meth))
+			if (!IS_ACC_METH_BG_OR_MM(acc_meth))
 				continue;
 			csa = &FILE_INFO(reg)->s_addrs;
-#			define TAB_GVSTATS_REC(COUNTER,TEXT1,TEXT2)	cumul_gvstats.COUNTER += csa->gvstats_rec.COUNTER;
+#			define TAB_GVSTATS_REC(COUNTER,TEXT1,TEXT2) cumul_gvstats.COUNTER += csa->gvstats_rec_p->COUNTER;
 #			include "tab_gvstats_rec.h"
 #			undef TAB_GVSTATS_REC
 		}
@@ -103,15 +105,15 @@ void zshow_gvstats(zshow_out *output)
 		get_first_gdr_name(addr_ptr, &gldname);
 		for (reg = addr_ptr->regions, r_top = reg + addr_ptr->n_regions; reg < r_top; reg++)
 		{
-			if (!reg->open)
+			if (!reg->open || IS_STATSDB_REG(reg))
 				continue;
 			acc_meth = reg->dyn.addr->acc_meth;
-			if ((dba_bg != acc_meth) && (dba_mm != acc_meth))
+			if (!IS_ACC_METH_BG_OR_MM(acc_meth))
 				continue;
 			csa = &FILE_INFO(reg)->s_addrs;
 			regname.len = reg->rname_len;
 			regname.addr = (char *)&reg->rname[0];
-			zshow_gvstats_output(output, &gldname, &regname, &csa->gvstats_rec);
+			zshow_gvstats_output(output, &gldname, &regname, csa->gvstats_rec_p);
 		}
  	}
 }
diff --git a/sr_port/zshow_zwrite.c b/sr_port/zshow_zwrite.c
index 8e76f6f..e745ec8 100755
--- a/sr_port/zshow_zwrite.c
+++ b/sr_port/zshow_zwrite.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2007 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -25,16 +26,17 @@
 GBLREF uint4 pat_everything[];
 GBLREF mstr_len_t sizeof_pat_everything;
 
+LITREF mval literal_one;
+
 void zshow_zwrite(zshow_out *output)
 {
-	mval mv,pat;
+	mval pat;
 
 	zshow_output(output,0);
 	pat.mvtype = MV_STR;
 	pat.str.addr = (char *)&pat_everything[0];
 	pat.str.len = INTCAST(sizeof_pat_everything - 1);
-	MV_FORCE_MVAL(&mv,ZWRITE_ASTERISK) ;
-	n2s(&mv);
-	op_lvpatwrite(VARLSTCNT(3) (UINTPTR_T)output, &pat, &mv);
+	/* ZWRITE_ASTERISK is equivalent to literal_one */
+	op_lvpatwrite(VARLSTCNT(3) (UINTPTR_T)output, &pat, &literal_one);
 	return;
 }
diff --git a/sr_port_cm/gtcm_bind_name.c b/sr_port_cm/gtcm_bind_name.c
index a40452b..dfc043c 100755
--- a/sr_port_cm/gtcm_bind_name.c
+++ b/sr_port_cm/gtcm_bind_name.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -53,7 +54,7 @@ void gtcm_bind_name(cm_region_head *rh, boolean_t xform)
 		gv_target = gvnh_reg->gvt;
 	} else
 	{
-		assert((dba_bg == REG_ACC_METH(rh->reg)) || (dba_mm == REG_ACC_METH(rh->reg)));
+		assert(IS_REG_BG_OR_MM(rh->reg));
 		gv_target = targ_alloc(cs_data->max_key_size, &gvent, rh->reg);
 		GVNH_REG_INIT(NULL, rh->reg_hash, NULL, gv_target, rh->reg, gvnh_reg, tabent);
 	}
diff --git a/sr_port_cm/gtcmd_rundown.c b/sr_port_cm/gtcmd_rundown.c
old mode 100755
new mode 100644
index c3a81a5..bdede34
--- a/sr_port_cm/gtcmd_rundown.c
+++ b/sr_port_cm/gtcmd_rundown.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2012 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -40,10 +41,6 @@ GBLREF	jnl_gbls_t		jgbl;
 
 error_def(ERR_NOTALLDBRNDWN);
 
-#ifdef VMS
-GBLREF short		gtcm_ast_avail;
-#endif
-
 void gtcmd_rundown(connection_struct *cnx, bool clean_exit)
 {
 	int4			link;
@@ -54,7 +51,7 @@ void gtcmd_rundown(connection_struct *cnx, bool clean_exit)
 	jnl_buffer_ptr_t	jbp;
 	int			refcnt;
 	boolean_t		was_crit;
-	int4			rundown_status = EXIT_NRM;			/* if gds_rundown went smoothly */
+	int4			rundown_status = EXIT_NRM;			/* if "gds_rundown" went smoothly */
 
 	for (ptr = cnx->region_root;  ptr;)
 	{
@@ -76,13 +73,14 @@ void gtcmd_rundown(connection_struct *cnx, bool clean_exit)
 				 * journal records (if it decides to switch to a new journal file).
 				 */
 				ADJUST_GBL_JREC_TIME(jgbl, jbp);
-				jnl_status = jnl_ensure_open();
+				jnl_status = jnl_ensure_open(gv_cur_region, cs_addrs);
 				if (0 == jnl_status)
 				{
 					if (0 != jpc->pini_addr)
 						jnl_put_jrt_pfin(cs_addrs);
 				} else
-					send_msg(VARLSTCNT(6) jnl_status, 4, JNL_LEN_STR(cs_data), DB_LEN_STR(gv_cur_region));
+					send_msg_csa(CSA_ARG(cs_addrs) VARLSTCNT(6) jnl_status, 4,
+							JNL_LEN_STR(cs_data), DB_LEN_STR(gv_cur_region));
 			}
 			if (!was_crit)
 				rel_crit(gv_cur_region);
@@ -98,12 +96,13 @@ void gtcmd_rundown(connection_struct *cnx, bool clean_exit)
 		 */
 		assert(0 <= refcnt);
 		if (0 == refcnt)
-		{	/* free up only as little as needed to facilitate structure reuse when the region is opened again */
+		{	/* Free up only as little as needed to facilitate structure reuse when the region is opened again.
+			 * Hence the CLEANUP_UDI_FALSE use below.
+			 */
 			assert(region->head.fl == region->head.bl);
-			VMS_ONLY(gtcm_ast_avail++);
 			if (JNL_ALLOWED(cs_data))
 				jpc->pini_addr = 0;
-			UNIX_ONLY(rundown_status |=) gds_rundown();
+			rundown_status |= gds_rundown(CLEANUP_UDI_FALSE);
 			gd_ht_kill(region->reg_hash, TRUE);	/* TRUE to free up the table and the gv_targets it holds too */
 			FREE_CSA_DIR_TREE(cs_addrs);
 			cm_del_gdr_ptr(gv_cur_region);
@@ -117,7 +116,6 @@ void gtcmd_rundown(connection_struct *cnx, bool clean_exit)
 		ptr = ptr->next;
 		free(last);
 	}
-
 	if (EXIT_NRM != rundown_status)
-		rts_error(VARLSTCNT(1) ERR_NOTALLDBRNDWN);
+		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(1) ERR_NOTALLDBRNDWN);
 }
diff --git a/sr_port_cm/gtcml_chklck.c b/sr_port_cm/gtcml_chklck.c
index 0ddc78a..b7ce24a 100755
--- a/sr_port_cm/gtcml_chklck.c
+++ b/sr_port_cm/gtcml_chklck.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001, 2015 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -31,6 +31,8 @@
 #include "gtcmlkdef.h"
 #include "is_proc_alive.h"
 #include "gtcml.h"
+#include "interlock.h"
+#include "rel_quant.h"
 
 GBLREF gd_region	*gv_cur_region;
 GBLREF uint4            process_id;
@@ -74,8 +76,7 @@ void gtcml_chklck(cm_lckblkreg *reg, bool timed)
 						if ((d = prc1->blocked))
 						{	/* Blocking process shrblk exists. Check it under crit lock */
 							csa = &FILE_INFO(gv_cur_region)->s_addrs;
-							if (!(was_crit = csa->now_crit))
-								grab_crit(gv_cur_region);
+							GRAB_LOCK_CRIT(csa, gv_cur_region, was_crit);
 							if (d->sequence != prc1->blk_sequence)
 							{	/* Blocking structure no longer ours - do artificial wakeup */
 								lck->sequence = csa->hdr->trans_hist.lock_sequence++;
@@ -90,8 +91,7 @@ void gtcml_chklck(cm_lckblkreg *reg, bool timed)
 							{	/* No longer any owner (lke stole?). Wake up */
 								lck->sequence = csa->hdr->trans_hist.lock_sequence++;
 							}
-							if (!was_crit)
-								rel_crit(gv_cur_region);
+							REL_LOCK_CRIT(csa, gv_cur_region, was_crit);
 						}
 						prc1 = prc1->next;
 					} while (prc1 != prc);
diff --git a/sr_port_cm/gtcmtr_lke_clearrep.c b/sr_port_cm/gtcmtr_lke_clearrep.c
index 1718ad8..475aed9 100755
--- a/sr_port_cm/gtcmtr_lke_clearrep.c
+++ b/sr_port_cm/gtcmtr_lke_clearrep.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2010 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -34,6 +35,8 @@
 #include "gtmmsg.h"
 #include "gtcm_find_region.h"
 #include "lke_cleartree.h"
+#include "interlock.h"
+#include "rel_quant.h"
 
 #define RESET		2
 
@@ -44,7 +47,7 @@ GBLREF	short			crash_count;
 char gtcmtr_lke_clearrep(struct CLB *lnk, clear_request	*creq)
 {
 	gd_region		*cur_region;
-	sgmnt_addrs		*cs_adr;
+	sgmnt_addrs		*csa;
 	mlk_ctldata_ptr_t	lke_ctl;
 	mstr			dnode;
 	show_reply		srep;
@@ -52,24 +55,19 @@ char gtcmtr_lke_clearrep(struct CLB *lnk, clear_request	*creq)
 	boolean_t		was_crit;
 
 	cur_region = gv_cur_region = gtcm_find_region(curr_entry, creq->rnum)->reghead->reg;
-	if (dba_bg == cur_region->dyn.addr->acc_meth || dba_mm == cur_region->dyn.addr->acc_meth)
+	if (IS_REG_BG_OR_MM(cur_region))
 	{
-		cs_adr = &FILE_INFO(cur_region)->s_addrs;
-		lke_ctl = (mlk_ctldata_ptr_t)cs_adr->lock_addrs[0];
+		csa = &FILE_INFO(cur_region)->s_addrs;
+		lke_ctl = (mlk_ctldata_ptr_t)csa->lock_addrs[0];
 		util_cm_print(lnk, 0, NULL, RESET);
 		dnode.len = creq->nodelength;
 		dnode.addr = creq->node;
-		if (cs_adr->critical != NULL)
-			crash_count = cs_adr->critical->crashcnt;
-		was_crit = cs_adr->now_crit;
-		if (!was_crit)
-			grab_crit(cur_region);
+		GRAB_LOCK_CRIT(csa, gv_cur_region, was_crit);
 		if (lke_ctl->blkroot != 0)
 			/* Remote lock clears are not supported, so LKE CLEAR -EXACT qualifier will not be supported on GT.CM.*/
 			lke_cleartree(cur_region, lnk, lke_ctl, (mlk_shrblk_ptr_t)R2A(lke_ctl->blkroot), creq->all,
 				      creq->interactive, creq->pid, dnode, FALSE);
-		if (!was_crit)
-			rel_crit(cur_region);
+		REL_LOCK_CRIT(csa, gv_cur_region, was_crit);
 	}
 	srep.code = CMMS_U_LKEDELETE;
 	lnk->cbl = SIZEOF(srep.code);
diff --git a/sr_port_cm/gtcmtr_lke_showrep.c b/sr_port_cm/gtcmtr_lke_showrep.c
index 4289076..dcd0f39 100755
--- a/sr_port_cm/gtcmtr_lke_showrep.c
+++ b/sr_port_cm/gtcmtr_lke_showrep.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2011 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -39,6 +40,8 @@
 #include "gtcm_find_region.h"
 #include "gvcmz.h"
 #include "longcpy.h"
+#include "interlock.h"
+#include "rel_quant.h"
 
 #define RESET	2
 
@@ -49,7 +52,7 @@ GBLREF	short			crash_count;
 char gtcmtr_lke_showrep(struct CLB *lnk, show_request *sreq)
 {
 	gd_region		*cur_region;
-	sgmnt_addrs		*cs_adr;
+	sgmnt_addrs		*csa;
 	mlk_ctldata		*lke_ctl;
 	ssize_t			ls_len;
 	mstr 			dnode;
@@ -58,20 +61,15 @@ char gtcmtr_lke_showrep(struct CLB *lnk, show_request *sreq)
 	boolean_t		was_crit;
 
 	cur_region = gv_cur_region = gtcm_find_region(curr_entry, sreq->rnum)->reghead->reg;
-	if (dba_bg == cur_region->dyn.addr->acc_meth || dba_mm == cur_region->dyn.addr->acc_meth)
+	if (IS_REG_BG_OR_MM(cur_region))
 	{
-		cs_adr = &FILE_INFO(cur_region)->s_addrs;
-		ls_len = cs_adr->lock_addrs[1] - cs_adr->lock_addrs[0];
+		csa = &FILE_INFO(cur_region)->s_addrs;
+		ls_len = csa->lock_addrs[1] - csa->lock_addrs[0];
 		lke_ctl = (mlk_ctldata *)malloc(ls_len);
 		/* Prevent any modification of the lock space while we make a local copy of it */
-		if (cs_adr->critical != NULL)
-			crash_count = cs_adr->critical->crashcnt;
-		was_crit = cs_adr->now_crit;
-		if (!was_crit)
-			grab_crit(cur_region);
-		longcpy((uchar_ptr_t)lke_ctl, cs_adr->lock_addrs[0], ls_len);
-		if (!was_crit)
-			rel_crit(cur_region);
+		GRAB_LOCK_CRIT(csa, gv_cur_region, was_crit);
+		longcpy((uchar_ptr_t)lke_ctl, csa->lock_addrs[0], ls_len);
+		REL_LOCK_CRIT(csa, gv_cur_region, was_crit);
 		util_cm_print(lnk, 0, NULL, RESET);
 		dnode.len = sreq->nodelength;
 		dnode.addr = sreq->node;
diff --git a/sr_port_cm/gvcmy_open.c b/sr_port_cm/gvcmy_open.c
index 6ac96cc..71b7960 100755
--- a/sr_port_cm/gvcmy_open.c
+++ b/sr_port_cm/gvcmy_open.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -12,16 +12,10 @@
 
 #include "mdef.h"
 
-#ifdef VMS
-#  include <descrip.h>
-#  include <rms.h>
-#  include <ssdef.h>
-#elif defined(UNIX)
-#  include "gtm_unistd.h"
-#  include <errno.h>
-#  include "parse_file.h"
-#  include "gtm_stdlib.h"
-#endif
+#include "gtm_unistd.h"
+#include <errno.h>
+#include "parse_file.h"
+#include "gtm_stdlib.h"
 
 #include "gdsroot.h"
 #include "gtm_facility.h"
@@ -54,11 +48,7 @@ error_def(ERR_SYSCALL);
 #define GTCM_ENVVAR_PFX "GTCM_"
 #define GTCM_ENVVAR_PFXLEN (SIZEOF(GTCM_ENVVAR_PFX) - 1)
 
-#ifdef VMS
-void gvcmy_open(gd_region *reg, struct NAM *nb)
-#else
 void gvcmy_open(gd_region *reg, parse_blk *pb)
-#endif
 {
 	struct CLB	*clb_ptr;
 	link_info	*li;
@@ -71,25 +61,13 @@ void gvcmy_open(gd_region *reg, parse_blk *pb)
 	mstr		task1, task2;
 	unsigned char	buff[256], lbuff[MAX_HOST_NAME_LEN + GTCM_ENVVAR_PFXLEN];
 	short		temp_short;
-	VMS_ONLY($DESCRIPTOR(task, "GTCMSVR");)
-	UNIX_ONLY(MSTR_DEF(task, 0, NULL);)
+	MSTR_DEF(task, 0, NULL);
+	DCL_THREADGBL_ACCESS;		/* needed by TREF usage inside SET_REGION_OPEN_TRUE macro */
 
+	SETUP_THREADGBL_ACCESS;		/* needed by TREF usage inside SET_REGION_OPEN_TRUE macro */
 	ESTABLISH(gvcmy_open_ch);
 	if (reg->is_spanned)
 		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_REMOTEDBNOSPGBL, 2, REG_LEN_STR(reg));
-#ifdef VMS
-	if (!nb->nam$b_node)
-		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(1) ERR_INVNETFILNM);
-	top = nb->nam$l_esa + nb->nam$b_esl;
-	fn = nb->nam$l_node + nb->nam$b_node;
-	node.dsc$b_dtype = task.dsc$b_dtype = 14;
-	node.dsc$b_class = task.dsc$b_class = 1;
-	node.dsc$w_length = nb->nam$b_node - 2;
-	node.dsc$a_pointer = nb->nam$l_node;
-	task1.addr = "GTCMSVRNAM";
-	task1.len = SIZEOF("GTCMSVRNAM") - 1;
-	status = TRANS_LOG_NAME(&task1, &task2, (char *)buff, SIZEOF(buff), dont_sendmsg_on_log2long);
-#elif defined(UNIX)
 	if (!pb->b_node)
 		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(1) ERR_INVNETFILNM);
 	fn = (unsigned char *)pb->l_dir;
@@ -119,29 +97,18 @@ void gvcmy_open(gd_region *reg, parse_blk *pb)
 			status = SS_LOG2LONG;
 	} else
 		status = SS_NOLOGNAM;
-#else
-#  error "Undefined platform"
-#endif
 	if (SS_NOLOGNAM != status)
 	{
 		if (SS_NORMAL != status)
 		{
-#			ifdef UNIX
 			if (SS_LOG2LONG == status)
 				rts_error_csa(CSA_ARG(NULL)
 					VARLSTCNT(5) ERR_LOGTOOLONG, 3, task1.len, task1.addr, SIZEOF(buff) - 1);
 			else
-#			endif
 				rts_error_csa(CSA_ARG(NULL) VARLSTCNT(1) status);
 		}
-		VMS_ONLY(
-			task.dsc$a_pointer = buff;
-			task.dsc$w_length = task2.len;
-			);
-		UNIX_ONLY(
-			task.addr = (char *)task2.addr;
-			task.len = task2.len;
-			);
+		task.addr = (char *)task2.addr;
+		task.len = task2.len;
 	}
 	clb_ptr = cmu_getclb(&node, &task);
 	if (!clb_ptr)		/* If link not open */
diff --git a/sr_unix/Makefile.mk b/sr_unix/Makefile.mk
index 52c5b9b..5ea7db1 100644
--- a/sr_unix/Makefile.mk
+++ b/sr_unix/Makefile.mk
@@ -1,6 +1,6 @@
 #################################################################
 #								#
-# Copyright (c) 2013-2016 Fidelity National Information		#
+# Copyright (c) 2013-2017 Fidelity National Information		#
 # Services, Inc. and/or its subsidiaries. All rights reserved.	#
 #								#
 #	This source code contains the intellectual property	#
@@ -33,6 +33,9 @@ CURDIR = `pwd`
 # Find out whether we are already in $gtm_dist/plugin/gtmcrypt directory.
 NOT_IN_GTMCRYPTDIR = $(shell [ "$(CURDIR)" = "$(GTMCRYPTDIR)" ] ; echo $$?)
 
+# Users may install GT.M without Unicode support
+HAVE_UNICODE = $(shell [ -d "$(DISTDIR)/utf8" ] ; echo $$?)
+
 # Determine machine and OS type.
 UNAMESTR = $(shell uname -a)
 MACHTYPE = $(shell uname -m)
@@ -43,6 +46,19 @@ endif
 # 64 bit version of GT.M? 0 for yes!
 BIT64 = $(shell file $(FILEFLAG) $(DISTDIR)/mumps | grep -q -E '64-bit|ELF-64'; echo $$?)
 
+# Determine if GPG 2.1+ is installed
+HAVE_GPG21   = 0
+HAVE_GPGCONF = $(shell which gpgconf 2> /dev/null)
+ifneq ($(HAVE_GPGCONF),)
+	GPGBIN     = $(shell gpgconf | grep 'gpg:' | cut -d: -f3)
+	GPGVER     = $(shell $(GPGBIN) --version | head -n1 | cut -d' ' -f3)
+	HAVE_GPG21 = $(shell expr $(GPGVER) \>= 2.1.12)
+endif
+ifeq ($(HAVE_GPG21),1)
+	USE_LOOPBACK = "-DUSE_GPGME_PINENTRY_MODE_LOOPBACK"
+endif
+
+
 # Default installation target. This allows for the build system to randomize `thirdparty' and `algo' thereby changing the default
 # gtmcrypt install link.
 install_targ = libgtmcrypt_$(thirdparty)_$(algo).so
@@ -59,7 +75,7 @@ endif
 CC = cc
 
 # Setup common compiler flags
-CFLAGS = $(debug_flag) $(optimize) -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE64_SOURCE=1
+CFLAGS = $(debug_flag) $(optimize) -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE64_SOURCE=1 $(USE_LOOPBACK)
 
 ifneq ($(gcrypt_nofips),0)
 	gcrypt_nofips_flag = -DGCRYPT_NO_FIPS
@@ -187,18 +203,13 @@ libgtmcrypt_gcrypt_AES256CFB.so: $(crypt_srcfiles) $(crypt_hdrfiles) libgtmcrypt
 	$(CC) $(CFLAGS) -DUSE_GCRYPT -DUSE_AES256CFB $(gcrypt_nofips_flag) $(crypt_srcfiles) $(LDSHR)		\
 		$(RPATHFLAGS) $(LDFLAGS) $@ -lgcrypt -lgpgme -lgpg-error $(COMMON_LIBS)
 
-openssl: libgtmcrypt_openssl_AES256CFB.so libgtmcrypt_openssl_BLOWFISHCFB.so
+openssl: libgtmcrypt_openssl_AES256CFB.so
 
 libgtmcrypt_openssl_AES256CFB.so: $(crypt_srcfiles) $(crypt_hdrfiles) libgtmcryptutil.so
 	@echo ; echo "Compiling $@..."
 	$(CC) $(CFLAGS) -DUSE_OPENSSL -DUSE_AES256CFB $(crypt_srcfiles) $(LDSHR) $(RPATHFLAGS) $(LDFLAGS)	\
 		$@ -lcrypto -lgpgme -lgpg-error $(COMMON_LIBS)
 
-libgtmcrypt_openssl_BLOWFISHCFB.so: $(crypt_srcfiles) $(crypt_hdrfiles) libgtmcryptutil.so
-	@echo ; echo "Compiling $@..."
-	$(CC) $(CFLAGS) -DUSE_OPENSSL -DUSE_BLOWFISHCFB $(crypt_srcfiles) $(LDSHR) $(RPATHFLAGS) $(LDFLAGS)	\
-	$@ -lcrypto -lgpgme -lgpg-error $(COMMON_LIBS)
-
 libgtmtls.so: $(tls_srcfiles) $(tls_hdrfiles) libgtmcryptutil.so
 	@echo ; echo "Compiling $@..."
 	$(CC) $(CFLAGS) $(tls_srcfiles) $(LDSHR) $(RPATHFLAGS) $(LDFLAGS) $@ -lssl $(COMMON_LIBS)
@@ -211,12 +222,15 @@ install: all
 	echo "unmaskpwd: gtm_status_t gc_mask_unmask_passwd(I:gtm_string_t*,O:gtm_string_t*[512])" >> $(PLUGINDIR)/gpgagent.tab
 	ln -fs ./$(install_targ) $(PLUGINDIR)/libgtmcrypt.so
 	cp -pf pinentry.m $(PLUGINDIR)/r
-	(cd $(PLUGINDIR)/o && ${gtm_dist}/mumps $(PLUGINDIR)/r/pinentry.m)
-	(cd $(PLUGINDIR)/o/utf8 && env gtm_chset=UTF-8 ${gtm_dist}/mumps $(PLUGINDIR)/r/pinentry.m)
+	(cd $(PLUGINDIR)/o      && env gtm_chset=M     ${gtm_dist}/mumps $(PLUGINDIR)/r/pinentry.m)
 ifeq ($(NOT_IN_GTMCRYPTDIR),1)
-	cp -pf *.sh $(GTMCRYPTDIR)/
+	cp -pf *.sh *.m $(GTMCRYPTDIR)/
 	cp -f maskpass $(GTMCRYPTDIR)/
 endif
+ifeq ($(HAVE_UNICODE),0)
+	@echo "UTF-8 mode library installation may fail if gtm_icu_version (${gtm_icu_version}) is not set"
+	(cd $(PLUGINDIR)/o/utf8 && env gtm_chset=UTF-8 ${gtm_dist}/mumps $(PLUGINDIR)/r/pinentry.m)
+endif
 
 uninstall:
 	@echo ; echo "Uninstalling shared libraries from $(PLUGINDIR) and maskpass from $(PLUGINDIR)/gtmcrypt..."
diff --git a/sr_unix/aio_shim.c b/sr_unix/aio_shim.c
new file mode 100644
index 0000000..2b2c3aa
--- /dev/null
+++ b/sr_unix/aio_shim.c
@@ -0,0 +1,584 @@
+/****************************************************************
+ *								*
+ * Copyright (c) 2016-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
+ *								*
+ *	This source code contains the intellectual property	*
+ *	of its copyright holder(s), and is made available	*
+ *	under a license.  If you do not know the terms of	*
+ *	the license, please stop and do not read further.	*
+ *								*
+ ****************************************************************/
+#include "mdef.h"
+
+#include "gtmio.h"
+#include "gdsroot.h"
+#include "gtm_facility.h"
+#include "fileinfo.h"
+#include "gdsbt.h"
+#include "gdsfhead.h"
+#include "gdsblk.h"
+#include "filestruct.h"
+#include "dpgbldir.h"
+#include "gbldirnam.h"
+#include "sleep_cnt.h"
+#include "mutex.h"
+#include "wcs_wt.h"
+#include "interlock.h"
+#include "performcaslatchcheck.h"
+#include "gtm_rel_quant.h"
+#include "wcs_sleep.h"
+#include "aio_shim.h"
+#include "gtm_signal.h"
+
+#ifdef USE_LIBAIO
+#include "gtm_socket.h"
+#include <sys/eventfd.h>
+#include "gtm_time.h"
+#include <stdint.h>
+#include "gtm_poll.h"
+#include "gtm_stdlib.h"
+
+/* aio_shim.c: serves as a "shim" between both POSIX AIO and Linux AIO
+ * interfaces. Because POSIX AIO is truly asynchronous from the client's
+ * perspective, whereas Linux AIO requires io_getevents() to be called
+ * at appropriate intervals, we have the following approach:
+ *
+ * * A multiplexing thread  will service a single Linux kernel context
+ *   and exactly one global directory.
+ *   * Each global directory has one context and one thread.
+ *   * The first global directory to claim the region (via udi->owning_gd)
+ *     will be the one to service the IO.
+ *   * If a global directory leaves, and another global directory has control
+ *     over the same region, we clean up everything so that the next write
+ *     into that region will set up the kernel context for the second global
+ *     directory.
+ */
+
+GBLREF  char 		*aio_shim_errstr;
+GBLREF	char		io_setup_errstr[];
+GBLREF	int		num_additional_processors;
+GBLREF	uint4		process_id;
+GBLREF	boolean_t	multi_thread_in_use;
+#ifdef 	DEBUG
+GBLREF	boolean_t	gtm_jvm_process;
+GBLREF	int		process_exiting;
+#endif
+GBLREF	mstr		extnam_str;
+GBLREF	mval		dollar_zgbldir;
+GBLREF  boolean_t	blocksig_initialized;
+GBLREF  sigset_t 	block_worker;
+
+#define	MAX_EVENTS 	100	/* An optimization to batch requests -- the
+				 * maximum number of completed IO's that come
+				 * back to us from io_getevents() at a time.
+				 */
+#define EVENTFD_SZ	8	/* The number of bytes needed to trigger an eventfd */
+#define MAX_WIP_TRIES	3	/* Number of times to try to clear the WIP queue in
+				 * event of a wtfini_in_prog
+				 */
+
+error_def(ERR_DBFILERR);
+error_def(ERR_SYSCALL);
+
+/* Used by the multiplexing thread to keep track of state and the pipes to
+ * communicate with the main process.
+ */
+enum
+{
+	EXIT_EFD,
+	LAIO_EFD
+};
+
+/* checks that aiocb and iocb are equivalent */
+#define CHECK_OFFSETOF_FLD(x) ((offsetof(struct aiocb, x) == offsetof(struct iocb, x))			\
+				&& (SIZEOF(((struct aiocb *)0)->x) == SIZEOF(((struct iocb *)0)->x)))
+#define CHECK_STRUCT_AIOCB					\
+MBSTART {							\
+	assert(CHECK_OFFSETOF_FLD(aio_data) &&			\
+	       CHECK_OFFSETOF_FLD(aio_key) &&			\
+	       CHECK_OFFSETOF_FLD(aio_lio_opcode) &&		\
+	       CHECK_OFFSETOF_FLD(aio_reqprio) &&		\
+	       CHECK_OFFSETOF_FLD(aio_fildes) &&		\
+	       CHECK_OFFSETOF_FLD(aio_buf) &&			\
+	       CHECK_OFFSETOF_FLD(aio_nbytes) &&		\
+	       CHECK_OFFSETOF_FLD(aio_offset) &&		\
+	       CHECK_OFFSETOF_FLD(aio_reserved2) &&		\
+	       CHECK_OFFSETOF_FLD(aio_flags) &&			\
+	       CHECK_OFFSETOF_FLD(aio_resfd));			\
+} MBEND
+
+#define CLEANUP_AIO_SHIM_THREAD_INIT(GDI)				\
+MBSTART {								\
+	int 	ret, save_errno;					\
+									\
+	save_errno = errno;						\
+	if (FD_INVALID != (GDI).exit_efd)				\
+	{								\
+		CLOSEFILE_RESET((GDI).exit_efd, ret);			\
+		assert(0 == ret);					\
+	}								\
+	if (FD_INVALID != (GDI).laio_efd)				\
+	{								\
+		CLOSEFILE_RESET((GDI).laio_efd, ret);			\
+		assert(0 == ret);					\
+	}								\
+	if (0 != (GDI).ctx)						\
+	{								\
+		ret = io_destroy((GDI).ctx);				\
+		assert(0 == ret);					\
+	}								\
+	errno = save_errno;						\
+} MBEND
+
+#define io_setup(nr, ctxp) syscall(SYS_io_setup, nr, ctxp)
+#define io_destroy(ctx) syscall(SYS_io_destroy, ctx)
+#define io_submit(ctx, nr, iocbpp) syscall(SYS_io_submit, ctx, nr, iocbpp)
+#define io_getevents(ctx, min_nr, max_nr, events, timeout) syscall(SYS_io_getevents, ctx, min_nr, max_nr, events, timeout)
+
+#define ATOMIC_SUB_FETCH(ptr, val) INTERLOCK_ADD(ptr, NULL,-val)
+#define ATOMIC_ADD_FETCH(ptr, val) INTERLOCK_ADD(ptr, NULL, val)
+
+/* Note that ERROR_LIT MUST be a literal */
+#define ISSUE_SYSCALL_RTS_ERROR_WITH_GD(GD, ERROR_LIT, SAVE_ERRNO)			\
+MBSTART {										\
+	mstr		*gldname;							\
+	mstr 		gld_str_tmp;							\
+	char		err_buffer[GTM_PATH_MAX + SIZEOF(ERROR_LIT) + 3];		\
+	/* save errno in case SNPRINTF modifies errno and SAVE_ERRNO passed		\
+	 * in is "errno" in caller.							\
+	 */										\
+	int		lcl_save_errno = SAVE_ERRNO;					\
+											\
+	GET_CURR_GLD_NAME(gldname);							\
+	DEBUG_ONLY({									\
+		get_first_gdr_name(GD, &gld_str_tmp);					\
+		assert(!strncmp(gld_str_tmp.addr, gldname->addr, gldname->len));	\
+	});										\
+	SNPRINTF(err_buffer, ARRAYSIZE(err_buffer), "%s(%*s)", ERROR_LIT,		\
+			gldname->len, gldname->addr);					\
+	rts_error_csa(CSA_ARG(NULL) VARLSTCNT(8) ERR_SYSCALL, 5,			\
+			LEN_AND_STR(err_buffer), CALLFROM, lcl_save_errno);		\
+} MBEND
+
+STATICFNDCL void *io_getevents_multiplexer(void *arg);
+STATICFNDCL int io_getevents_internal(aio_context_t ctx);
+STATICFNDCL void clean_wip_queue(unix_db_info *udi);
+STATICFNDCL void aio_gld_clean_wip_queue(gd_addr *input_gd, gd_addr *match_gd);
+STATICFNDCL int	aio_shim_setup(aio_context_t *ctx);
+STATICFNDCL int aio_shim_thread_init(gd_addr *gd);
+
+/* Routine performed only by the multiplexing thread. It polls on all file descriptors
+ * and passes messages between the caller and the multiplexing thread to manage file
+ * descriptors, etc.
+ */
+/* #GTM_THREAD_SAFE : The below function (io_getevents_multiplexer) is thread-safe */
+STATICFNDCL void *io_getevents_multiplexer(void *arg)
+{
+	struct gd_info		*gdi = (struct gd_info *)arg;
+	struct pollfd		fds[2];
+	uint64_t		dummy;
+	int			ret, num_ios;
+
+	INIT_POLLFD(fds[LAIO_EFD], gdi->laio_efd);
+	INIT_POLLFD(fds[EXIT_EFD], gdi->exit_efd);
+	do
+	{	/* we poll on the file descriptors */
+		while ((-1 == (ret = poll(fds, ARRAYSIZE(fds), -1))) && (EINTR == errno))
+			;
+		assert(-1 != ret);
+		if (-1 == ret)
+			RECORD_ERROR_IN_WORKER_THREAD_AND_EXIT(gdi, "worker_thread::poll()", errno);
+		/* Service the IO's if they completed */
+		if (EVENTFD_NOTIFIED(fds, LAIO_EFD))
+		{	/* flush the eventfd (though we don't care about the value) */
+			DOREADRC(fds[LAIO_EFD].fd, &dummy, SIZEOF(dummy), ret);
+			assert(0 == ret);
+			if (-1 == ret)
+				RECORD_ERROR_IN_WORKER_THREAD_AND_EXIT(gdi, "worker_thread::read()", errno);
+			/* we subtract from num_ios all the IOs gleaned by
+			 * io_getevents_internal().
+			 */
+			ret = io_getevents_internal(gdi->ctx);
+			if (-1 == ret)
+				RECORD_ERROR_IN_WORKER_THREAD_AND_EXIT(gdi, "worker_thread::io_getevents()", errno);
+			num_ios = ATOMIC_SUB_FETCH(&gdi->num_ios, ret);
+			assert(num_ios >= 0);
+		}
+		/* Exit if we have been notified via the exit eventfd */
+		if (EVENTFD_NOTIFIED(fds, EXIT_EFD))
+		{
+			CLOSEFILE_RESET(gdi->laio_efd, ret);
+			assert(0 == ret);
+			CLOSEFILE_RESET(gdi->exit_efd, ret);
+			assert(0 == ret);
+			return NULL;
+		}
+	} while (TRUE);
+}
+
+/* Batches io_getevent() requests until there are no more for this particular context */
+/* #GTM_THREAD_SAFE : The below function (io_getevents_internal) is thread-safe */
+STATICFNDCL int io_getevents_internal(aio_context_t ctx)
+{
+	struct timespec 	timeout = { 0, 0 };
+	struct io_event 	event[MAX_EVENTS];
+	int 			ret, i;
+	struct aiocb		*aiocbp;
+	int			num_ios = 0;
+
+	do
+	{	/* Loop on EINTR. */
+		while (-1 == (ret = io_getevents(ctx, 0, MAX_EVENTS, event, &timeout))
+				&& (EINTR == errno))
+			;
+		assert(ret >= 0);
+		if (-1 == ret)
+			return -1;
+		num_ios += ret;
+		for (i = 0; i < ret; ++i)
+		{
+			aiocbp = (struct aiocb *)event[i].obj;
+			if (0 <= event[i].res)
+				AIOCBP_SET_FLDS(aiocbp, event[i].res, event[i].res2);
+			/* res < 0 means LIBAIO is providing a negated errno through
+			 * the "return" (res) value instead of the positive errno via res2.
+			 * We place the negated value (which is the actual errno) in
+			 * the third parameter of AIOCBP_SET_FLDS() which is where the
+			 * errno is expected. In this situation res2 value is also
+			 * returned for potential help in debugging.
+			 */
+			else
+				AIOCBP_SET_FLDS(aiocbp, event[i].res2, -event[i].res);
+		}
+	} while (0 < ret);
+	return num_ios;
+}
+
+/* Walks the WIP queue and "cancels" all outstanding IO's that have not yet
+ * completed, and that belong to the current process.
+ */
+STATICFNDCL void clean_wip_queue(unix_db_info *udi)
+{
+	int 			spins, maxspins, retries, ret;
+	int4			max_sleep_mask;
+	cache_que_head_ptr_t	que_head;
+	cache_state_rec_ptr_t   cstt;
+	struct aiocb 		*aiocbp;
+	sgmnt_data_ptr_t	csd;
+	sgmnt_addrs		*csa;
+	struct gd_info		*gdi;
+	node_local_ptr_t	cnl;
+	int			num_ios, lcnt;
+	int			num_tries;
+	boolean_t		wtfini_in_prog, done;
+
+	/* Walk through the WIP queue  and mark all processes with our process id and fd as ECANCELED.
+	 * Note that this isn't strictly necessary: once we've exited another process doing "wcs_wtfini" will eventually
+	 * discover that our process id is not alive anymore and reissue the write. However, doing this here avoids
+	 * that salvage/reissue logic in "wcs_wtfini" from kicking in.
+	 */
+	gdi = udi->owning_gd->thread_gdi;
+	assert(gdi->num_ios > 0); 	/* caller should have ensured this */
+	csa = &udi->s_addrs;
+	csd = csa->hdr;
+	cnl = csa->nl;
+	max_sleep_mask = -1;	/* initialized to -1 to defer memory reference until needed */
+	maxspins = num_additional_processors ? MAX_LOCK_SPINS(LOCK_SPINS, num_additional_processors) : 1;
+	que_head = &csa->acc_meth.bg.cache_state->cacheq_wip;
+	/* Grab the WIP queue lock, similarly to wcs_get_space.c where we lock the active queue header. */
+	for (num_tries = 0, done = FALSE; !done && (num_tries < MAX_WIP_TRIES); num_tries++)
+	{
+		if (grab_latch(&que_head->latch, WT_LATCH_TIMEOUT_SEC))
+		{	/* walk the WIP queue and strike all csr's that have our epid and file descriptor,
+			 * and if aio_shim_error(aiocbp) == EINPROGRESS.
+			 */
+			for (cstt = (cache_state_rec_ptr_t)((sm_uc_ptr_t)que_head + que_head->fl);
+			     (cstt != (cache_state_rec_ptr_t)que_head);
+			      cstt = (cache_state_rec_ptr_t)((sm_uc_ptr_t)cstt + cstt->state_que.fl))
+			{
+				if ((cstt->epid == process_id) && ((aiocbp = &cstt->aiocb)->aio_fildes == udi->fd))
+				{
+					AIO_SHIM_ERROR(aiocbp, ret);
+					if (EINPROGRESS == ret)
+					{
+						AIOCBP_SET_FLDS(aiocbp, -1, ECANCELED);
+						num_ios = ATOMIC_SUB_FETCH(&gdi->num_ios, 1);
+						assert(num_ios >= 0);
+						if (0 == num_ios)
+							break;
+					}
+				}
+			}
+			/* Make sure that a wcs_wtfini() is not currently in progress. It's possible that
+			 * wcs_wtfini() has already pulled an element off the WIP queue, and in the meantime
+			 * we got the swaplock. This means our view of the WIP queue is missing a cr, and we
+			 * must retry to cancel that cr.
+			 */
+			wtfini_in_prog = cnl->wtfini_in_prog;
+			rel_latch(&que_head->latch);
+			if (wtfini_in_prog)
+			{	/* Wait 5 seconds, or until wtfini_in_prog becomes 0. */
+				for (lcnt = 1; (lcnt < SLEEP_FIVE_SEC) && (cnl->wtfini_in_prog); ++lcnt)
+					wcs_sleep(1);
+				if (!cnl->wtfini_in_prog)
+				{	/* This forces us to retry on the swaplock, up to MAX_WIP_TRIES */
+					done = FALSE;
+				} else
+				{ 	/* We waited 5 seconds, and in that time wtfini_in_prog stayed non-zero.
+					 * We'll simply exit as our writes will be cleaned up once the process
+					 * dies anyway. We don't expect this edge case to occur in testing, so
+					 * we leave the assert gd->thread_gdi->num_ios == 0 in aio_shim_destroy()
+					 * as-is.
+					 */
+					done = TRUE;
+				}
+			} else
+				done = TRUE; /* A wtfini was not in progress, so our WIP queue is now clean. */
+		} else
+			done = TRUE; /* Couldn't grab the lock, but we leave as this case will be handled later. */
+	}
+}
+
+/* Helper method to initialize the AIO kernel context */
+STATICFNDCL int	aio_shim_setup(aio_context_t *ctx)
+{
+	int 	ret;
+	int	nr_events;
+	DCL_THREADGBL_ACCESS;
+
+	SETUP_THREADGBL_ACCESS;
+	/* initialize num_requests from the environment variable or otherwise */
+	nr_events = TREF(gtm_aio_nr_events);
+	/* We try io_setup() in a loop, and each failed attempt we reduce the amount of space
+	 * we're asking for. If there is no space to give, just return -1 EAGAIN
+	 */
+	while (TRUE)
+	{
+		*ctx = 0;
+		ret = io_setup(nr_events, ctx);
+		assert((0 == ret) || (EAGAIN == errno));
+		if (-1 == ret)
+		{
+			nr_events /= 2;
+			if (0 == nr_events)
+			{
+				aio_shim_errstr = io_setup_errstr;
+				return -1;
+			}
+		} else
+			return 0;
+	}
+}
+
+/* Initializes the multiplexing thread and the shutdown eventfd. */
+STATICFNDCL int aio_shim_thread_init(gd_addr *gd)
+{ 	/* Sets up the AIO context, two eventfd's and the multiplexing thread */
+	int		ret, ret2;
+	struct gd_info	*gdi, tmp_gdi;
+	sigset_t	savemask;
+
+	CHECK_STRUCT_AIOCB;
+	DEBUG_ONLY(aio_shim_errstr = NULL;)
+	/* initialize fields of tmp_gdi */
+	tmp_gdi.exit_efd = FD_INVALID;
+	tmp_gdi.laio_efd = FD_INVALID;
+	tmp_gdi.ctx = 0;
+	tmp_gdi.num_ios = 0;
+	tmp_gdi.err_syscall = NULL;
+	tmp_gdi.save_errno = 0;
+	/* Sets up the eventfd which notifies the multiplexing thread that it must exit.  */
+	if (-1 != (ret = eventfd(0, 0)))
+		tmp_gdi.exit_efd = ret;
+	else
+	{
+		assert(FALSE);
+		aio_shim_errstr = "eventfd(EXIT_EFD)";
+		return -1;
+	}
+	/* Sets up the eventfd which notifies the multiplexing thread that an AIO completed. */
+	if (-1 != (ret = eventfd(0, 0)))
+		tmp_gdi.laio_efd = ret;
+	else
+	{
+		assert(FALSE);
+		CLEANUP_AIO_SHIM_THREAD_INIT(tmp_gdi);
+		aio_shim_errstr = "eventfd(LAIO_EFD)";
+		return -1;
+	}
+	/* Sets up the AIO context */
+	if (-1 == (ret = aio_shim_setup(&tmp_gdi.ctx)))
+	{	/* The only "allowed" error is EAGAIN. The errstr should have been set by
+		 * aio_shim_setup().
+		 */
+		assert(NULL != aio_shim_errstr);
+		assert(EAGAIN == errno);
+		CLEANUP_AIO_SHIM_THREAD_INIT(tmp_gdi);
+		return -1;
+	}
+	gdi = gtm_malloc(SIZEOF(struct gd_info));
+	*gdi = tmp_gdi;
+	/* Temporarily block external signals for the worker thread. This enforces that
+	 * the multiplexing worker thread will not invoke signal handlers (e.g. timer_handler())
+	 * and manipulate global variables while the main process/thread is concurrently running
+	 * and using them.
+	 * Note that SIGPROCMASK relies on multi_thread_in_use and so we must set it.
+	 * TODO: this code should ideally be merged with gtm_multi_thread.c When gtm_multi_thread()
+	 * is enhanced to create a thread in the background. Right now it returns only when the
+	 * thread completes.
+	 */
+	multi_thread_in_use = TRUE;
+	assert(TRUE == blocksig_initialized);
+	/* We block all signals, except those which could be generated from within the worker thread.
+	 * Every other signal must be externally generated and should drive the signal handler from
+	 * the main process and not this worker thread.
+	 */
+	SIGPROCMASK(SIG_BLOCK, &block_worker, &savemask, ret);
+	ret = pthread_create(&gdi->pt, NULL, io_getevents_multiplexer, gdi);
+	if (0 != ret)
+	{
+		/* We don't want to clobber ret so we use ret2. */
+		SIGPROCMASK(SIG_SETMASK, &savemask, NULL, ret2);
+		multi_thread_in_use = FALSE;
+		assert(EAGAIN == ret);
+		CLEANUP_AIO_SHIM_THREAD_INIT(tmp_gdi);
+		gtm_free(gdi);
+		aio_shim_errstr = "pthread_create()";
+		errno = ret;	/* pthread_create() returns errno in ret. */
+		return -1;
+	}
+	SIGPROCMASK(SIG_SETMASK, &savemask, NULL, ret);
+	multi_thread_in_use = FALSE;
+	gd->thread_gdi = gdi;
+	return 0;
+}
+
+/* Similar to aio_cancel(), cancels all outstanding IO's by destroying the kernel context
+ * associated with the region. Also destroys the multiplexing thread to clean resources.
+ */
+void aio_shim_destroy(gd_addr *gd)
+{
+	struct gd_info 	*gdi;
+	int		ret;
+	char 		*eventfd_str = "GTMROCKS";
+	mstr		*gldname;
+	gd_addr		*addr_ptr;
+	DCL_THREADGBL_ACCESS;
+
+	SETUP_THREADGBL_ACCESS;
+	gdi = gd->thread_gdi;
+	if (NULL == gdi)
+	{	/* A write didn't happen. */
+		return;
+	}
+	/* We notify the thread to exit; note we only need to write 8 bytes (exactly) to the fd. */
+	assert(EVENTFD_SZ == STRLEN(eventfd_str));
+	DOWRITERC(gdi->exit_efd, eventfd_str, EVENTFD_SZ, ret);
+	assert(0 == ret);
+	if (-1 == ret)
+		ISSUE_SYSCALL_RTS_ERROR_WITH_GD(gd, "aio_shim_destroy::write", errno);
+	/* Wait on the thread exit */
+	ret = pthread_join(gdi->pt, NULL);
+	assert(0 == ret);
+	if (0 != ret)
+		ISSUE_SYSCALL_RTS_ERROR_WITH_GD(gd, "aio_shim_destroy::pthread_join", errno);
+	/* Destroy the kernel context */
+	ret = io_destroy(gdi->ctx);
+	assert(0 == ret);
+	if (-1 == ret)
+		ISSUE_SYSCALL_RTS_ERROR_WITH_GD(gd, "aio_shim_destroy::io_destroy", errno);
+	/* If there was at least one region with reg->was_open = TRUE, then it is possible regions in other glds
+	 * (different from "gd" have a "udi" with "udi->owning_gd" == "gd". So we would need to look at all regions
+	 * across all glds opened by this process. If no was_open region was ever seen by this process, then it is
+	 * enough to look at regions in just the current gld ("gd").
+	 */
+	if (TREF(was_open_reg_seen))
+	{
+		/* Iterate over all the regions in the global directory and clean their WIP queues */
+		for (addr_ptr = get_next_gdr(NULL); addr_ptr; addr_ptr = get_next_gdr(addr_ptr))
+			aio_gld_clean_wip_queue(addr_ptr, gd);
+	} else
+		aio_gld_clean_wip_queue(gd, gd);
+	/* By this point, we must have no more outstanding IOs */
+	assert(0 == gdi->num_ios);
+	/* Delete the thread_gdi to leave us in a state consistent with no thread existing. */
+	gtm_free(gdi);
+	gd->thread_gdi = NULL;
+}
+
+void	aio_gld_clean_wip_queue(gd_addr *input_gd, gd_addr *match_gd)
+{
+	unix_db_info	*udi;
+	gd_region 	*reg, *r_top;
+	struct gd_info 	*gdi;
+
+	gdi = match_gd->thread_gdi;
+	assert(NULL != gdi);
+	for (reg = input_gd->regions, r_top = reg + input_gd->n_regions; reg < r_top; reg++)
+	{
+		assert(input_gd == reg->owning_gd);
+		if (reg->open && reg->dyn.addr->asyncio && (dba_cm != reg->dyn.addr->acc_meth))
+		{
+			udi = FILE_INFO(reg);
+			/* We don't call clean_wip_queue() if we don't have any outstanding IOs in the region.
+			 * This reduces wip queue header lock contention if lots of processes exit at the same time.
+			 * Note that in case multiple regions map to same db file, it is possible udi->owning_gd
+			 * points to a gld different from "match_gd". In that case, skip the wip queue clean as we are
+			 * interested only in cleaning up aio writes issued from "match_gd".
+			 */
+			if ((udi->owning_gd == match_gd) && (0 < gdi->num_ios))
+				clean_wip_queue(udi);
+		}
+	}
+}
+
+/* Lazily loads the multiplexing thread and submits an IO. */
+int aio_shim_write(gd_region *reg, struct aiocb *aiocbp)
+{
+	unix_db_info 	*udi;
+	struct gd_info 	*gdi;
+	gd_addr		*owning_gd;
+	int		ret;
+	struct iocb 	*iocbp;
+	struct iocb 	*cb[1];
+
+	udi = FILE_INFO(reg);
+	assert(gtm_is_main_thread() || (gtm_jvm_process && process_exiting));
+	owning_gd = udi->owning_gd;
+	assert(NULL != owning_gd);
+	if (NULL == (gdi = owning_gd->thread_gdi))
+	{	/* No thread is servicing this global directory -- set it up. */
+		ret = aio_shim_thread_init(owning_gd);
+		assert((0 == ret) || (EAGAIN == errno));
+		if (-1 == ret)
+		{	/* aio_shim_thread_init() should set aio_shim_errstr */
+			assert(NULL != aio_shim_errstr);
+			/* Caller will handle -1 case by calling wcs_wterror() which
+			 * looks at aio_shim_errstr to report error detail.
+			 */
+			return -1;
+		}
+		gdi = owning_gd->thread_gdi;
+	}
+	assert(NULL != gdi);
+	/* submit the write */
+	CHECK_ERROR_IN_WORKER_THREAD(reg, udi);
+	aiocbp->status = EINPROGRESS;
+	iocbp = (struct iocb *)aiocbp;
+	iocbp->aio_lio_opcode = IOCB_CMD_PWRITE;
+	iocbp->aio_resfd = gdi->laio_efd;
+	iocbp->aio_flags = IOCB_FLAG_RESFD;
+	cb[0] = iocbp;
+	ATOMIC_ADD_FETCH(&gdi->num_ios, 1);
+	ret = io_submit(gdi->ctx, 1, cb);
+	/* the only acceptable error is EAGAIN in our case */
+	assert((1 == ret) || (EAGAIN == errno));
+	if (1 == ret)
+		return 0;
+	/* we need to rescind the write */
+	ATOMIC_SUB_FETCH(&gdi->num_ios, 1);
+	aio_shim_errstr = "io_submit()";
+	return -1;
+}
+
+#endif
diff --git a/sr_unix/anticipatory_freeze.c b/sr_unix/anticipatory_freeze.c
index b9d272a..6c363c6 100644
--- a/sr_unix/anticipatory_freeze.c
+++ b/sr_unix/anticipatory_freeze.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2012-2015 Fidelity National Information 	*
+ * Copyright (c) 2012-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -377,7 +377,7 @@ void clear_fake_enospc_if_master_dead(void)
 		{
 			for (r_local = addr_ptr->regions, r_top = r_local + addr_ptr->n_regions; r_local < r_top; r_local++)
 			{
-				if ((dba_bg != r_local->dyn.addr->acc_meth) && (dba_mm != r_local->dyn.addr->acc_meth))
+				if (!IS_REG_BG_OR_MM(r_local))
 					continue;
 				csa = REG2CSA(r_local);
 				if ((NULL != csa) && (NULL != csa->nl))
diff --git a/sr_unix/append_time_stamp.c b/sr_unix/append_time_stamp.c
deleted file mode 100755
index 7599ce6..0000000
--- a/sr_unix/append_time_stamp.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/****************************************************************
- *								*
- *	Copyright 2003, 2013 Fidelity Information Services, Inc	*
- *								*
- *	This source code contains the intellectual property	*
- *	of its copyright holder(s), and is made available	*
- *	under a license.  If you do not know the terms of	*
- *	the license, please stop and do not read further.	*
- *								*
- ****************************************************************/
-
-#include "mdef.h"
-
-#include <errno.h>
-#include "gtm_string.h"
-#include "gtm_time.h"
-#include "gtm_rename.h"
-
-#include "eintr_wrappers.h"
-#include "iosp.h"
-
-/* Append the formatted timestamp to the file name (fn); *fn_len contains the current length of the filename and at exit from this
- * function, it is updated to reflect the new length.
- */
-uint4 append_time_stamp(char *fn, int *fn_len, jnl_tm_t now)
-{
-	struct tm	*tm_struct;
-	time_t		tt_now;
-	size_t          tm_str_len;
-
-	assert(0 <  MAX_FN_LEN - *fn_len - 1);
-	tt_now = (time_t)now;
-	GTM_LOCALTIME(tm_struct, &tt_now);
-	STRFTIME(&fn[*fn_len], MAX_FN_LEN - *fn_len - 1, JNLSWITCH_TM_FMT, tm_struct, tm_str_len);
-	*fn_len += (int)tm_str_len;
-	return SS_NORMAL;
-}
-
diff --git a/sr_unix/bin_load.c b/sr_unix/bin_load.c
index 73af7e7..7c13e5d 100644
--- a/sr_unix/bin_load.c
+++ b/sr_unix/bin_load.c
@@ -50,6 +50,8 @@
 #include "min_max.h"
 #include "mu_interactive.h"
 
+#define LAST_NEGATIVE_SUBSCRIPT 127
+
 GBLREF bool		mupip_DB_full;
 GBLREF bool		mu_ctrly_occurred;
 GBLREF bool		mu_ctrlc_occurred;
@@ -61,9 +63,14 @@ GBLREF gv_key		*gv_currkey;
 GBLREF gv_namehead	*gv_target;
 GBLREF int4		gv_keysize;
 GBLREF sgmnt_addrs	*cs_addrs;
+GBLREF sgmnt_data_ptr_t	cs_data;
 GBLREF int		onerror;
 GBLREF io_pair		io_curr_device;
 
+LITREF boolean_t mu_int_possub[16][16];
+LITREF boolean_t mu_int_negsub[16][16];
+LITREF boolean_t mu_int_exponent[256];
+
 error_def(ERR_CORRUPTNODE);
 error_def(ERR_GVIS);
 error_def(ERR_TEXT);
@@ -78,6 +85,8 @@ error_def(ERR_LOADINVCHSET);
 error_def(ERR_LDSPANGLOINCMP);
 error_def(ERR_RECLOAD);
 error_def(ERR_GVFAILCORE);
+error_def(ERR_NULSUBSC);
+error_def(ERR_DBDUPNULCOL);
 
 #define	BIN_PUT		0
 #define BIN_BIND	1
@@ -179,7 +188,7 @@ error_def(ERR_GVFAILCORE);
  */
 
 gvnh_reg_t	*bin_call_db(int, INTPTR_T, INTPTR_T);
-void 		zwr_out_print(char * buff, int len);
+void		zwr_out_print(char * buff, int len);
 
 #define ZWR_BASE_STRIDE 1024
 #define UOP_BASE_STRIDE 1024
@@ -218,9 +227,9 @@ void bin_load(uint4 begin, uint4 end, char *line1_ptr, int line1_len)
 	unsigned char		*ptr, *cp1, *cp2, *btop, *gvkey_char_ptr, *tmp_ptr, *tmp_key_ptr, *c, *ctop, *ptr_base;
 	unsigned char		hdr_lvl, src_buff[MAX_KEY_SZ + 1], dest_buff[MAX_ZWR_KEY_SZ],
 				cmpc_str[MAX_KEY_SZ + 1], dup_key_str[MAX_KEY_SZ + 1], sn_key_str[MAX_KEY_SZ + 1], *sn_key_str_end;
-	unsigned char		*end_buff;
-	unsigned short		rec_len, next_cmpc, numsubs;
-	int			len, current, last, max_key;
+	unsigned char		*end_buff, *gvn_char, *subs, mych;
+	unsigned short		rec_len, next_cmpc, numsubs, num_subscripts;
+	int			len, current, last, max_key, max_rec, fmtd_key_len;
 	int			tmp_cmpc, sn_chunk_number, expected_sn_chunk_number = 0, sn_hold_buff_pos, sn_hold_buff_size;
 	uint4			max_data_len, max_subsc_len, gblsize, data_len;
 	ssize_t			subsc_len, extr_std_null_coll;
@@ -229,7 +238,7 @@ void bin_load(uint4 begin, uint4 end, char *line1_ptr, int line1_len)
 	boolean_t		need_xlation, new_gvn, utf8_extract;
 	boolean_t		is_hidden_subscript, ok_to_put = TRUE, putting_a_sn = FALSE, sn_incmp_gbl_already_killed = FALSE;
 	rec_hdr			*rp, *next_rp;
-	mval			v, tmp_mval;
+	mval			v, tmp_mval, *val;
 	mname_entry		gvname;
 	mstr			mstr_src, mstr_dest, opstr;
 	collseq			*extr_collseq, *db_collseq, *save_gv_target_collseq;
@@ -237,15 +246,24 @@ void bin_load(uint4 begin, uint4 end, char *line1_ptr, int line1_len)
 	gv_key			*tmp_gvkey = NULL;	/* null-initialize at start, will be malloced later */
 	gv_key			*sn_gvkey = NULL; /* null-initialize at start, will be malloced later */
 	gv_key			*sn_savekey = NULL; /* null-initialize at start, will be malloced later */
+	gv_key			*save_orig_key = NULL; /* null-initialize at start, will be malloced later */
+	gv_key			*orig_gv_currkey_ptr = NULL;
 	char			std_null_coll[BIN_HEADER_NUMSZ + 1], *sn_hold_buff = NULL, *sn_hold_buff_temp = NULL;
 	int			in_len, gtmcrypt_errno, n_index, encrypted_hash_array_len, null_iv_array_len;
 	char			*inbuf, *encrypted_hash_array_ptr, *curr_hash_ptr, *null_iv_array_ptr, null_iv_char;
 	int4			index;
 	gtmcrypt_key_t		*encr_key_handles;
-	boolean_t		encrypted_version, mixed_encryption;
+	boolean_t		encrypted_version, mixed_encryption, valid_gblname;
 	char			index_err_buf[1024];
 	gvnh_reg_t		*gvnh_reg;
 	gd_region		*dummy_reg;
+	sub_num			subtocheck;
+	sgmnt_data_ptr_t	csd;
+	boolean_t		discard_nullcoll_mismatch_record, update_nullcoll_mismatch_record;
+	unsigned char		subscript, *r_ptr;
+	unsigned int		null_subscript_cnt, k, sub_index[MAX_GVSUBSCRIPTS];
+	static unsigned char	key_buffer[MAX_ZWR_KEY_SZ];
+	unsigned char		*temp, coll_typr_char;
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
@@ -402,6 +420,8 @@ void bin_load(uint4 begin, uint4 end, char *line1_ptr, int line1_len)
 	GVKEY_INIT(sn_gvkey, DBKEYSIZE(MAX_KEY_SZ));	/* sn_gvkey will point to malloced memory after this */
 	assert(NULL == sn_savekey);	/* GVKEY_INIT macro relies on this */
 	GVKEY_INIT(sn_savekey, DBKEYSIZE(MAX_KEY_SZ));	/* sn_gvkey will point to malloced memory after this */
+	assert(NULL == save_orig_key);	/* GVKEY_INIT macro relies on this */
+	GVKEY_INIT(save_orig_key, DBKEYSIZE(MAX_KEY_SZ));	/* sn_gvkey will point to malloced memory after this */
 	gvnh_reg = NULL;
 	for ( ; !mupip_DB_full; )
 	{
@@ -486,7 +506,7 @@ void bin_load(uint4 begin, uint4 end, char *line1_ptr, int line1_len)
 						 */
 						if ((n_index <= index) || (0 > index)
 						    || (mixed_encryption
-						        && (0 == memcmp(encrypted_hash_array_ptr + index * GTMCRYPT_HASH_LEN,
+							&& (0 == memcmp(encrypted_hash_array_ptr + index * GTMCRYPT_HASH_LEN,
 									EMPTY_GTMCRYPT_HASH, GTMCRYPT_HASH_LEN))))
 						{
 							rp = (rec_hdr *)ptr;
@@ -533,12 +553,13 @@ void bin_load(uint4 begin, uint4 end, char *line1_ptr, int line1_len)
 				ONERROR_PROCESS;
 			}
 			max_key = gvnh_reg->gd_reg->max_key_size;
+			max_rec = gvnh_reg->gd_reg->max_rec_size;
 			db_collhdr.act = gv_target->act;
 			db_collhdr.ver = gv_target->ver;
 			db_collhdr.nct = gv_target->nct;
 		}
 		GET_USHORT(rec_len, &rp->rsiz);
-		if ((0 != EVAL_CMPC(rp)) || (gvname.var_name.len > rec_len) || mupip_error_occurred)
+		if ((max_rec < rec_len) || (0 != EVAL_CMPC(rp)) || (gvname.var_name.len > rec_len) || mupip_error_occurred)
 		{
 			bin_call_db(ERR_COR, (INTPTR_T)rec_count, (INTPTR_T)global_key_count);
 			mu_gvis();
@@ -594,6 +615,7 @@ void bin_load(uint4 begin, uint4 end, char *line1_ptr, int line1_len)
 		new_gvn = FALSE;
 		for ( ; rp < (rec_hdr*)btop; rp = (rec_hdr*)((unsigned char *)rp + rec_len))
 		{
+			csd = cs_data;
 			GET_USHORT(rec_len, &rp->rsiz);
 			if (rec_len + (unsigned char *)rp > btop)
 			{
@@ -644,6 +666,7 @@ void bin_load(uint4 begin, uint4 end, char *line1_ptr, int line1_len)
 							/* length of the key might change (due to nct variation),
 							 * so get a copy of the original key from the extract */
 				memcpy(dup_key_str, gv_currkey->base, gv_currkey->end + 1);
+				COPY_KEY(save_orig_key, gv_currkey);
 				gvkey_char_ptr = dup_key_str;
 				while (*gvkey_char_ptr++)
 					;
@@ -673,8 +696,8 @@ void bin_load(uint4 begin, uint4 end, char *line1_ptr, int line1_len)
 						/* transform the string to the current subsc format */
 					TREF(transform) = TRUE;
 					tmp_mval.mvtype = MV_STR;
-                                	tmp_mval.str.addr = (char *)dest_buff;
-                                	tmp_mval.str.len = INTCAST(end_buff - dest_buff);
+					tmp_mval.str.addr = (char *)dest_buff;
+					tmp_mval.str.len = INTCAST(end_buff - dest_buff);
 					tmp_gvkey->prev = 0;
 					tmp_gvkey->end = 0;
 					if (extr_collseq)
@@ -695,10 +718,93 @@ void bin_load(uint4 begin, uint4 end, char *line1_ptr, int line1_len)
 				DISPLAY_FILE_OFFSET_OF_RECORD_AND_REST_OF_BLOCK;
 				continue;
 			}
+			/* Validate the global variable name */
+			gvn_char = gv_currkey->base;
+			valid_gblname = VALFIRSTCHAR(*gvn_char);
+			gvn_char++; /* need to post-increment here since above macro uses it multiple times */
+			for (; (*gvn_char && valid_gblname) ; gvn_char++)
+				valid_gblname = valid_gblname && VALKEY(*gvn_char);
+			valid_gblname = (valid_gblname && (KEY_DELIMITER == *gvn_char));
+			if (!valid_gblname)
+			{
+				mupip_error_occurred = TRUE;
+				bin_call_db(ERR_COR, (INTPTR_T)rec_count, (INTPTR_T)global_key_count);
+				mu_gvis();
+				DISPLAY_FILE_OFFSET_OF_RECORD_AND_REST_OF_BLOCK;
+				break;
+			}
+			/* Validate the subscripts */
+			subs = gvn_char + 1;
+			num_subscripts = 0;
+			while (mych = *subs++) /* WARNING: assignment */
+			{
+				num_subscripts++;
+				if (MAX_GVSUBSCRIPTS < num_subscripts)
+				{
+					mupip_error_occurred = TRUE;
+					bin_call_db(ERR_COR, (INTPTR_T)rec_count, (INTPTR_T)global_key_count);
+					mu_gvis();
+					DISPLAY_FILE_OFFSET_OF_RECORD_AND_REST_OF_BLOCK;
+					break;
+				}
+				if (mu_int_exponent[mych]) /* Is it a numeric subscript? */
+				{
+					if (mych > LAST_NEGATIVE_SUBSCRIPT) /* Is it a positive numeric subscript */
+					{
+						while (mych = *subs++) /* WARNING: assignment */
+						{
+							memcpy(&subtocheck, &mych, 1);
+							if (!mu_int_possub[subtocheck.one][subtocheck.two])
+							{
+								mupip_error_occurred = TRUE;
+								bin_call_db(ERR_COR, (INTPTR_T)rec_count,
+									(INTPTR_T)global_key_count);
+								mu_gvis();
+								DISPLAY_FILE_OFFSET_OF_RECORD_AND_REST_OF_BLOCK;
+								break;
+							}
+						}
+					}
+					else /* It is a negative subscript */
+					{
+						while ((mych = *subs++) && (STR_SUB_PREFIX != mych)) /* WARNING: assignment */
+						{
+							memcpy(&subtocheck, &mych, 1);
+							if (!mu_int_negsub[subtocheck.one][subtocheck.two])
+							{
+								mupip_error_occurred = TRUE;
+								bin_call_db(ERR_COR, (INTPTR_T)rec_count,
+									(INTPTR_T)global_key_count);
+								mu_gvis();
+								DISPLAY_FILE_OFFSET_OF_RECORD_AND_REST_OF_BLOCK;
+								break;
+							}
+						}
+						if (!mupip_error_occurred && ((STR_SUB_PREFIX != mych) || (*subs)))
+						{
+							mupip_error_occurred = TRUE;
+							bin_call_db(ERR_COR, (INTPTR_T)rec_count, (INTPTR_T)global_key_count);
+							mu_gvis();
+							DISPLAY_FILE_OFFSET_OF_RECORD_AND_REST_OF_BLOCK;
+							break;
+						}
+					}
+				}
+				else /* It is a string subscript */
+				{
+					/* string can have arbitrary content so move to the next subscript */
+					while (mych = *subs++) /* WARNING: assignment */
+						;
+				}
+				if (mupip_error_occurred)
+					break;
+			}
+			if (mupip_error_occurred)
+				break;
 			/*
 			 * Spanning node-related variables and their usage:
 			 *
-			 * expected_sn_chunk_number: 	0  - looking for spanning nodes (regular nodes are OK, too)
+			 * expected_sn_chunk_number:	0  - looking for spanning nodes (regular nodes are OK, too)
 			 *				!0 - number of the next chunk needed (implies we are building
 			 *					a spanning node's value)
 			 *
@@ -715,9 +821,9 @@ void bin_load(uint4 begin, uint4 end, char *line1_ptr, int line1_len)
 			 *
 			 * Controlling the placing of the key,value in the database:
 			 * ok_to_put: means we are ready to place the key,value in the database, i.e., we have the full value
-			 * 		(either of the spanning node or a regular node).
+			 *		(either of the spanning node or a regular node).
 			 * putting_a_sn: we are placing a spanning node in the database, i.e, use the key from sn_gvkey and
-			 * 		the value from sn_hold_buff.
+			 *		the value from sn_hold_buff.
 			 */
 			CHECK_HIDDEN_SUBSCRIPT(gv_currkey,is_hidden_subscript);
 			if (!is_hidden_subscript && (max_subsc_len < (gv_currkey->end + 1)))
@@ -751,7 +857,7 @@ void bin_load(uint4 begin, uint4 end, char *line1_ptr, int line1_len)
 					continue;
 				}
 				if (0 == sn_chunk_number)
-				{ 	/* first spanning node chunk, get ctrl info */
+				{	/* first spanning node chunk, get ctrl info */
 					if (0 != expected_sn_chunk_number)
 					{
 						DISPLAY_INCMP_SN_MSG;
@@ -798,8 +904,8 @@ void bin_load(uint4 begin, uint4 end, char *line1_ptr, int line1_len)
 						if (expected_sn_chunk_number == numsubs)
 						{
 							if (sn_hold_buff_pos != gblsize)
-							{	/* we don't have the expected size even though 	*/
-								/* we have all the expected chunks. 		*/
+							{	/* we don't have the expected size even though	*/
+								/* we have all the expected chunks.		*/
 								DISPLAY_INCMP_SN_MSG;
 								util_out_print("!_!_Expected size : !UL actual size : !UL", TRUE,
 										gblsize, sn_hold_buff_pos);
@@ -842,6 +948,89 @@ void bin_load(uint4 begin, uint4 end, char *line1_ptr, int line1_len)
 				ok_to_put = TRUE;
 			if (ok_to_put)
 			{
+				if (!need_xlation)
+					COPY_KEY(save_orig_key, gv_currkey);
+				orig_gv_currkey_ptr = gv_currkey;
+				gv_currkey = save_orig_key;
+				for (r_ptr = gv_currkey->base; *r_ptr != KEY_DELIMITER; r_ptr++)
+					;
+				null_subscript_cnt = 0;
+				coll_typr_char = (gvnh_reg->gd_reg->std_null_coll) ? SUBSCRIPT_STDCOL_NULL : STR_SUB_PREFIX;
+				for (;;)
+				{
+					if (r_ptr >= (gv_currkey->base + gv_currkey->end))
+						break;
+					if (KEY_DELIMITER == *r_ptr++)
+					{
+						subscript = *r_ptr;
+						if (KEY_DELIMITER == subscript)
+							break;
+						if (SUBSCRIPT_ZERO == subscript || KEY_DELIMITER != *(r_ptr + 1))
+						{
+							r_ptr++;
+							continue;
+						}
+						sub_index[null_subscript_cnt++] = (r_ptr - gv_currkey->base);
+					}
+				}
+				if (0 < null_subscript_cnt && !csd->null_subs)
+				{
+					temp = (unsigned char *)format_targ_key(&key_buffer[0], MAX_ZWR_KEY_SZ, gv_currkey, TRUE);
+					fmtd_key_len = (int)(temp - key_buffer);
+					key_buffer[fmtd_key_len] = '\0';
+					gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(8) ERR_NULSUBSC, 2, gvnh_reg->gd_reg->rname_len,
+						&gvnh_reg->gd_reg->rname[0], ERR_GVIS, 2, fmtd_key_len, &key_buffer[0]);
+					ok_to_put = FALSE;
+				}
+				discard_nullcoll_mismatch_record = FALSE;
+				update_nullcoll_mismatch_record = FALSE;
+				if (0 < null_subscript_cnt && gv_target->root)
+				{
+					if (!val)
+					{
+						PUSH_MV_STENT(MVST_MVAL);
+						val = &mv_chain->mv_st_cont.mvs_mval;
+					}
+					if (csd->std_null_coll ? SUBSCRIPT_STDCOL_NULL
+								: STR_SUB_PREFIX != gv_currkey->base[sub_index[0]])
+					{
+						for (k = 0; k < null_subscript_cnt; k++)
+							gv_currkey->base[sub_index[k]] = coll_typr_char;
+						if (gvcst_get(val))
+							discard_nullcoll_mismatch_record = TRUE;
+						for (k = 0; k < null_subscript_cnt; k++)
+							gv_currkey->base[sub_index[k]] = (csd->std_null_coll) ? STR_SUB_PREFIX
+										: SUBSCRIPT_STDCOL_NULL;
+					} else
+					{
+						if (gvcst_get(val))
+							update_nullcoll_mismatch_record = TRUE;
+					}
+				}
+				if (discard_nullcoll_mismatch_record || update_nullcoll_mismatch_record)
+				{
+					temp = (unsigned char *)format_targ_key(key_buffer, MAX_ZWR_KEY_SZ, gv_currkey, TRUE);
+					fmtd_key_len = (int)(temp - key_buffer);
+					key_buffer[fmtd_key_len] = '\0';
+					if (discard_nullcoll_mismatch_record)
+						gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_DBDUPNULCOL, 4,
+							LEN_AND_STR(key_buffer), v.str.len, v.str.addr);
+					else
+						gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_DBDUPNULCOL, 4,
+							LEN_AND_STR(key_buffer), val->str.len, val->str.addr);
+					if (discard_nullcoll_mismatch_record)
+						ok_to_put = FALSE;
+				}
+				gv_currkey = orig_gv_currkey_ptr;
+			}
+			if (ok_to_put)
+			{
+				if (gvnh_reg->gd_reg->null_subs)
+				{
+					for (k = 0; k < null_subscript_cnt; k++)
+						gv_currkey->base[sub_index[k]] = csd->std_null_coll
+							? SUBSCRIPT_STDCOL_NULL : STR_SUB_PREFIX;
+				}
 				if (putting_a_sn)
 				{
 					gv_currkey->base[gv_currkey->end - (SPAN_SUBS_LEN + 1)] = 0;
@@ -871,8 +1060,11 @@ void bin_load(uint4 begin, uint4 end, char *line1_ptr, int line1_len)
 					putting_a_sn = FALSE;
 				else
 				{
-					key_count++;
-					global_key_count++;
+					if (!(discard_nullcoll_mismatch_record || update_nullcoll_mismatch_record))
+					{
+						key_count++;
+						global_key_count++;
+					}
 				}
 			}
 		}
@@ -889,6 +1081,7 @@ void bin_load(uint4 begin, uint4 end, char *line1_ptr, int line1_len)
 	}
 	free(tmp_gvkey);
 	free(sn_gvkey);
+	free(save_orig_key);
 	if (NULL != sn_hold_buff)
 		free(sn_hold_buff);
 	file_input_close();
diff --git a/sr_unix/buildaux.csh b/sr_unix/buildaux.csh
index e08cd50..a7de9e9 100755
--- a/sr_unix/buildaux.csh
+++ b/sr_unix/buildaux.csh
@@ -1,7 +1,7 @@
 #!/usr/local/bin/tcsh -f
 #################################################################
 #								#
-# Copyright (c) 2001-2016 Fidelity National Information		#
+# Copyright (c) 2001-2017 Fidelity National Information		#
 # Services, Inc. and/or its subsidiaries. All rights reserved.	#
 #								#
 #	This source code contains the intellectual property	#
@@ -72,8 +72,7 @@ if ( $buildaux_status ) then
 endif
 
 set buildaux_auxillaries = "gde dse geteuid gtmsecshr lke mupip gtcm_server gtcm_gnp_server gtmcrypt"
-set buildaux_utilities = "semstat2 ftok gtcm_pkdisp gtcm_shmclean gtcm_play dummy dbcertify"	# dummy needed for "dtgbldir"
-												# See runall.csh mapping
+set buildaux_utilities = "semstat2 ftok gtcm_pkdisp gtcm_shmclean gtcm_play dbcertify"
 set buildaux_executables = "$buildaux_auxillaries $buildaux_utilities"
 set buildaux_validexecutable = 0
 
diff --git a/sr_unix/buildaux_gtmcrypt.csh b/sr_unix/buildaux_gtmcrypt.csh
index 574fe4f..b4c8a75 100644
--- a/sr_unix/buildaux_gtmcrypt.csh
+++ b/sr_unix/buildaux_gtmcrypt.csh
@@ -1,7 +1,7 @@
 #!/usr/local/bin/tcsh -f
 #################################################################
 #								#
-# Copyright (c) 2001-2016 Fidelity National Information		#
+# Copyright (c) 2001-2017 Fidelity National Information		#
 # Services, Inc. and/or its subsidiaries. All rights reserved.	#
 #								#
 #	This source code contains the intellectual property	#
@@ -78,14 +78,6 @@ if ("HP-UX" == "$HOSTOS") then
 else
 	set make = "make"
 endif
-# On atlhxit1 and atlhxit2 Libgcrypt version is too low to support FIPS mode. Add necessary flags to
-# Makefile to tell the plugin to build without FIPS support.
-set host=$HOST:r:r:r
-if ($host =~ {atlhxit1,atlhxit2}) then
-	set fips_flag = "gcrypt_nofips=1"
-else
-	set fips_flag = ""
-endif
 if ($gtm_verno =~ V[4-8]*) then
 	# For production builds don't do any randomizations.
 	set algorithm = "AES256CFB"
@@ -102,18 +94,16 @@ else
 		# Force AES as long as the plugin is linked against libgcrypt
 		set algorithm = "AES256CFB"
 	else
-		# OpenSSL, V9* build. Go ahead and randomize the algorithm. Increase the probability of AES256CFB,
-		# the industry standard and the one we officially support.
-		set algorithms = ("AES256CFB" "AES256CFB" "BLOWFISHCFB")
-		set rand = `echo $#algorithms | awk '{srand() ; print 1+int(rand()*$1)}'`
-		set algorithm = $algorithms[$rand]
+		# OpenSSL, V9* build. AES256CFB is the only one we we officially support.
+		set algorithm = "AES256CFB"
 	endif
 endif
 
 source $gtm_tools/set_library_path.csh
 source $gtm_tools/check_unicode_support.csh
+if (! -e $gtm_dist/utf8) mkdir $gtm_dist/utf8
 # Build and install all encryption libraries and executables.
-env LC_ALL=$utflocale $make install algo=$algorithm image=$plugin_build_type thirdparty=$encryption_lib $fips_flag
+env LC_ALL=$utflocale $make install algo=$algorithm image=$plugin_build_type thirdparty=$encryption_lib
 if ($status) then
 	@ buildaux_gtmcrypt_status++
 	echo "buildaux-E-libgtmcrypt, failed to install libgtmcrypt and/or helper scripts"	\
@@ -127,6 +117,9 @@ if ($status) then
 	echo "buildaux-E-libgtmcrypt, failed to clean libgtmcrypt and/or helper scripts"	\
 				>> $gtm_log/error.${gtm_exe:t}.log
 endif
+# Remove pinentry routine for GTM-8668
+rm -f $gtm_dist_plugin/gtmcrypt/pinentry.m
+
 
 popd >&! /dev/null
 exit $buildaux_gtmcrypt_status
diff --git a/sr_unix/ce_substitute.c b/sr_unix/ce_substitute.c
index 11f5aed..99fab35 100755
--- a/sr_unix/ce_substitute.c
+++ b/sr_unix/ce_substitute.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -14,7 +14,6 @@
 #include "compiler.h"
 #include "comp_esc.h"
 
-GBLREF unsigned char *source_buffer;
 GBLREF int   source_column;
 GBLREF struct ce_sentinel_desc	*ce_def_list;
 
diff --git a/sr_unix/check_encrypt_support.sh b/sr_unix/check_encrypt_support.sh
index 6b3da93..8b6b39f 100755
--- a/sr_unix/check_encrypt_support.sh
+++ b/sr_unix/check_encrypt_support.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 #################################################################
 #								#
-# Copyright (c) 2009, 2015 Fidelity National Information	#
+# Copyright (c) 2009-2016 Fidelity National Information		#
 # Services, Inc. and/or its subsidiaries. All rights reserved.	#
 #								#
 #	This source code contains the intellectual property	#
@@ -37,14 +37,18 @@ check_files()
 	for each_file in $srch_files
 	do
 		flag=0
-		for each_path in $srch_path
+		list=`echo $each_file | tr '|' ' '`
+		for file in $list
 		do
-			for each_ext in $srch_ext
+			for each_path in $srch_path
 			do
-				if [ -f $each_path/$each_file$each_ext ]; then flag=1 break ; fi
+				for each_ext in $srch_ext
+				do
+					if [ -f $each_path/$file$each_ext ]; then flag=1 break ; fi
+				done
+				# The below takes care of files whose extensions are already determined by the caller
+				if [ -f $each_path/$file ]; then flag=1 break; fi
 			done
-			# The below takes care of files whose extensions are already determined by the caller
-			if [ -f $each_path/$each_file ]; then flag=1 break; fi
 		done
 		if [ $flag -eq 0 ]; then
 			missing="$missing $each_file"
@@ -108,10 +112,10 @@ bin_search_path="/usr/bin /usr/local/bin /bin"
 
 mandate_headers="gpgme.h gpg-error.h"
 mandate_libs="libgpg-error libgpgme"
-mandate_bins="gpg"
+mandate_bins="gpg|gpg2"
 gcrypt_headers="gcrypt.h"
 gcrypt_libs="libgcrypt"
-openssl_headers="openssl/evp.h openssl/sha.h openssl/blowfish.h openssl/ssl.h openssl/err.h"
+openssl_headers="openssl/evp.h openssl/sha.h openssl/ssl.h openssl/err.h"
 openssl_libs="libcrypto libssl"
 lib_ext=".so"
 if [ "AIX" = "$hostos" ]; then
diff --git a/sr_unix/check_trigger_support.csh b/sr_unix/check_trigger_support.csh
deleted file mode 100755
index 1a74a28..0000000
--- a/sr_unix/check_trigger_support.csh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/local/bin/tcsh -f
-#################################################################
-#								#
-# Copyright (c) 2009-2015 Fidelity National Information 	#
-# Services, Inc. and/or its subsidiaries. All rights reserved.	#
-#								#
-#	This source code contains the intellectual property	#
-#	of its copyright holder(s), and is made available	#
-#	under a license.  If you do not know the terms of	#
-#	the license, please stop and do not read further.	#
-#								#
-#################################################################
-###########################################################################################
-#
-#	check_trigger_support.csh - Checks if triggers are available on a platform.
-#				    There must the gtm_trigger.h for this source base to
-#				    have triggers enabled
-#	Returns :
-#		TRUE - if the platform supports triggers (true for all posix platforms)
-#		FALSE - if not supported
-###########################################################################################
-
-# HP-UX PA-RISC is not supported
-if ( "HP-UX" == "$HOSTOS" && "ia64" != `uname -m` ) then
-	echo "FALSE"
-	exit 0
-endif
-
-ls $gtm_inc/gtm_trigger.h >& /dev/null && echo "TRUE" || echo "FALSE"
-
-exit 0
diff --git a/sr_unix/cli.c b/sr_unix/cli.c
index 304624f..e1c5981 100755
--- a/sr_unix/cli.c
+++ b/sr_unix/cli.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2014 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -23,6 +24,10 @@
 #include "util.h"
 #include "cli_parse.h"
 #include "min_max.h"
+#include "gtmimagename.h"
+#include "gtmmsg.h"
+
+error_def(ERR_CLISTRTOOLONG);
 
 /*
  * --------------------------------------------------
@@ -271,7 +276,14 @@ boolean_t cli_get_str(char *entry, char *dst, unsigned short *max_len)
 	}
 	DEBUG_ONLY(TREF(cli_get_str_max_len) = 0;)	/* for use inside cli_get_value -> get_parm_entry ... */
 	copylen = strlen(buf);
-	copylen = MIN(copylen, maxdstlen);
+	if (maxdstlen < copylen)
+	{
+		if (!IS_GTM_IMAGE)
+			gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(5) ERR_CLISTRTOOLONG, 3, entry, copylen, maxdstlen);
+		else
+			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(5) ERR_CLISTRTOOLONG, 3, entry, copylen, maxdstlen);
+		return FALSE;
+	}
 	memset(dst, 0, maxdstlen);
 	memcpy(dst, buf, copylen);
 	*max_len = (unsigned short) copylen;
diff --git a/sr_unix/cms_load.csh b/sr_unix/cms_load.csh
index 9a114f8..4b6ae15 100755
--- a/sr_unix/cms_load.csh
+++ b/sr_unix/cms_load.csh
@@ -1,7 +1,7 @@
 #! /usr/local/bin/tcsh
 #################################################################
 #								#
-# Copyright (c) 2001-2016 Fidelity National Information		#
+# Copyright (c) 2001-2017 Fidelity National Information		#
 # Services, Inc. and/or its subsidiaries. All rights reserved.	#
 #								#
 #	This source code contains the intellectual property	#
@@ -55,7 +55,7 @@ set dir_structure      = "inc pct src tools log $build_types"
 set gtm_src_types = "c m64 s msg"
 set gtm_inc_types = "h max mac si"
 set gtm_pct_types = "mpt m hlp"
-set gtm_tools_types = "gtc sed awk sh csh list txt exp mk ksh cmake tab in"
+set gtm_tools_types = "gtc sed awk sh csh list txt exp mk ksh cmake tab in xc"
 
 #####################################################################################
 
diff --git a/sr_unix/comlist.csh b/sr_unix/comlist.csh
index 4f95da8..467facb 100755
--- a/sr_unix/comlist.csh
+++ b/sr_unix/comlist.csh
@@ -1,6 +1,6 @@
 #################################################################
 #								#
-# Copyright (c) 2001-2016 Fidelity National Information		#
+# Copyright (c) 2001-2017 Fidelity National Information		#
 # Services, Inc. and/or its subsidiaries. All rights reserved.	#
 #								#
 #	This source code contains the intellectual property	#
@@ -79,6 +79,9 @@ if ( "$version" =~ *ibm-aix* ) then
 	unsetenv gtm_icu_version
 endif
 
+# Unset gtm_custom_errors to prevent some errors, especially %GTM-E-FTOKERR if $gtm_repl_instance is set in the environment
+unsetenv gtm_custom_errors
+
 @ comlist_status = 0
 
 set dollar_sign = \$
@@ -312,6 +315,7 @@ endif
 
 chmod +x {lowerc,gtminstall}*
 
+cp $gtm_tools/*.xc .
 cp $gtm_tools/*.gtc .
 mv configure{.gtc,}
 
@@ -572,7 +576,7 @@ foreach i ( $comlist_liblist )
 		# Exclude files that define the same externals
 		# (e.g., "main" and the VMS CLI [command line interpreter] emulator arrays):
 		set exclude = "^gtm\.o|^gtm_main\.o|^lke\.o|^lke_cmd\.o|^dse\.o|^dse_cmd\.o|^dbcertify\.o"
-		set exclude = "$exclude|^mupip\.o|^mupip_cmd\.o|^gtmsecshr\.o|^gtmsecshr_wrapper\.o|^geteuid\.o|^dtgbldir\.o"
+		set exclude = "$exclude|^mupip\.o|^mupip_cmd\.o|^gtmsecshr\.o|^gtmsecshr_wrapper\.o|^geteuid\.o"
 		set exclude = "$exclude|^semstat2\.o|^ftok\.o|^msg\.o|^gtcm_main\.o|^gtcm_play\.o|^gtcm_pkdisp\.o|^gtcm_shmclean\.o"
 		set exclude = "$exclude|^omi_srvc_xct\.o|^omi_sx_play\.o"
 		set exclude = "$exclude|^gtcm_gnp_server\.o|^dbcertify_cmd\.o"
@@ -674,29 +678,28 @@ endif
 if ((0 != $savestatus) || (! -e GTMDefinedTypesInit.m)) then
 	set errmsg = "COMLIST-E-FAIL gengtmdeftypes.csh failed to create GTMDefinedTypesInit.m "
 	set errmsg = "$errmsg - see log in $gtm_obj/gengtmdeftypes.log"
-	if (`expr $gtm_verno \< V900`) then
-		@ comlist_status++	# No errors for development - this fails the build
-	else
-		echo "Warning: Build of $gtm_verno on $HOST, $errmsg" | \
-			mailx -s "${HOST}: Build for $gtm_verno failed to create GTMDefinedTypes.m" $USER
-	endif
+	@ comlist_status++
 	echo $errmsg >> $errorlog
 endif
 if (-e GTMDefinedTypesInit.m) then
 	# Need a different name for each build type as they can be different
 	cp -f GTMDefinedTypesInit.m $gtm_pct/GTMDefinedTypesInit${bldtype}.m
+	cp -f gdeinitsz.m $gtm_pct/gdeinitsz.m
+	mv -f gdeinitsz.m GDEINITSZ.m
 	setenv LC_CTYPE C
 	setenv gtm_chset M
 	./mumps GTMDefinedTypesInit.m
 	if ($status) then
 		set errmsg = "COMLIST-E-FAIL Failed to compile generated $gtm_exe/GTMDefinedTypes.m"
-		if (`expr $gtm_verno \< V900`) then
-			@ comlist_status++
-		else
-			echo "Warning: During build of $gtm_verno on $HOST, ${errmsg}" | \
-				mailx -s "${HOST}: Compile for GTMDefinedTypes.m failed during build of $gtm_verno" $USER
-		endif
+		@ comlist_status++
+		echo "${errmsg}" >> $errorlog
+	endif
+	ls -l GDEINITSZ.m
+	./mumps GDEINITSZ.m
+	if ($status) then
+		@ comlist_status++
 		echo "${errmsg}" >> $errorlog
+		set errmsg = "COMLIST_E-FAIL Failed to compile generated $gtm_pct/GDEINITSZ.m"
 	endif
 	# If we have a utf8 dir (created by buildaux.csh called from buildbdp.csh above), add a link to it for
 	# GTMDefinedTypesInit.m and compile it in UTF8 mode
@@ -706,6 +709,9 @@ if (-e GTMDefinedTypesInit.m) then
 		if (! -e $gtm_dist/utf8/GTMDefinedTypesInit.m) then
 		    ln -s $gtm_dist/GTMDefinedTypesInit.m $gtm_dist/utf8/GTMDefinedTypesInit.m
 		endif
+		if (! -e $gtm_dist/utf8/GDEINITSZ.m) then
+		    ln -s $gtm_dist/GDEINITSZ.m $gtm_dist/utf8/GDEINITSZ.m
+		endif
 		pushd utf8
 		# Switch to UTF8 mode
 		if ( "OS/390" == $HOSTOS ) setenv gtm_chset_locale $utflocale      # LC_CTYPE not picked up right
@@ -716,13 +722,13 @@ if (-e GTMDefinedTypesInit.m) then
 		../mumps GTMDefinedTypesInit.m
 		if ($status) then
 			set errmsg = "COMLIST_E-FAIL Failed to compile generated $gtm_exe/utf8/GTMDefinedTypes.m"
-			if (`expr $gtm_verno \< V900`) then
-				@ comlist_status++
-			else
-				echo "Warning: During build of $gtm_verno on $HOST, ${errmsg}" | \
-					mailx -s "${HOST}: Compile for utf8/GTMDefinedTypes.m failed during build of $gtm_verno" \
-					$USER
-			endif
+			@ comlist_status++
+			echo "${errmsg}" >> $errorlog
+		endif
+		../mumps GDEINITSZ.m
+		if ($status) then
+			set errmsg = "COMLIST_E-FAIL Failed to compile generated $gtm_exe/utf8/GDEINITSZ.m"
+			@ comlist_status++
 			echo "${errmsg}" >> $errorlog
 		endif
 		popd
diff --git a/sr_unix/configure.gtc b/sr_unix/configure.gtc
index c133ae7..b9bb576 100755
--- a/sr_unix/configure.gtc
+++ b/sr_unix/configure.gtc
@@ -1,7 +1,7 @@
 #!/bin/sh
 #################################################################
 #								#
-# Copyright (c) 2009-2016 Fidelity National Information		#
+# Copyright (c) 2009-2017 Fidelity National Information		#
 # Services, Inc. and/or its subsidiaries. All rights reserved.	#
 #								#
 #	This source code contains the intellectual property	#
@@ -16,14 +16,7 @@
 # Path to the correct echo program
 # depending on the list of locales configured, locale -a might be considered a binary output.
 # grep needs -a option to process the output as text but -a is not supported on the non-linux servers we have.
-if [ $arch = "sun"  -o  $arch = "solaris" ]; then
-	echo=/usr/5bin/echo
-	# Solaris 11 does not have /usr/5bin/echo
-	if [ ! -f $echo ]; then
-		echo=/usr/bin/echo
-	fi
-	binaryopt=""
-elif [ $arch = "linux" ]; then
+if [ $arch = "linux" ]; then
 	echo="/bin/echo -e"
 	binaryopt="-a"
 else
@@ -31,12 +24,6 @@ else
 	binaryopt=""
 fi
 
-# add path to strip for solaris
-if [ $arch = "sun"  -o  $arch = "solaris" ]; then
-	PATH="$PATH:/usr/ccs/bin"
-	export PATH
-fi
-
 # Options to ps
 psopts="-ea"
 
@@ -61,17 +48,11 @@ if [ -d utf8 ]; then
 fi
 
 # Native shared library extension.
-if [ $arch = "hp" -a `uname -m` != "ia64" ]; then
-	ext=".sl"
-else
-	ext=".so"
-fi
+ext=".so"
 
 # Flags to build shared libraries of M routines
-if [ "hp" = $arch ] ; then ldflags="-b" ; ldcmd="ld" # HP-UX - all platforms
-elif [ "ibm" = $arch ] ; then ldflags="-brtl -G -bexpfull -bnoentry -b64" ; ldcmd="ld" # AIX
+if [ "ibm" = $arch ] ; then ldflags="-brtl -G -bexpfull -bnoentry -b64" ; ldcmd="ld" # AIX
 elif [ "linux" = $arch ] ; then ldflags="-shared" ; ldcmd="ld" # Linux - all platforms
-elif [ "solaris" = $arch ] ; then ldflags="-G -64" ; ldcmd="ld" # Solaris SPARC
 else echo "Shared libary ldflags not set for this platform"; exit 1
 fi
 
@@ -188,28 +169,18 @@ $echo ""
 if [ -d $gtmdist ]; then
 	$echo "Directory $gtmdist exists. If you proceed with this installation then"
 	$echo "some files will be over-written. Is it ok to proceed? (y or n) \c"
-	read resp
-	if [ "$resp" = "Y" -o "$resp" = "y" ] ; then
-		chmod 0755 $gtmdist
-		chown $owner $gtmdist
-		chgrp $bingroup $gtmdist
-	else
-		exit
-	fi
-
 else
 	$echo "Directory $gtmdist does not exist. Do you wish to create it as part of"
 	$echo "this installation? (y or n) \c"
-
-	read resp
-	if [ "$resp" = "Y" -o "$resp" = "y" ] ; then
-		mkdir -p        $gtmdist/plugin/r $gtmdist/plugin/o
-		chmod 0755      $gtmdist/plugin/r $gtmdist/plugin/o $gtmdist
-		chown $owner    $gtmdist/plugin/r $gtmdist/plugin/o $gtmdist
-		chgrp $bingroup $gtmdist/plugin/r $gtmdist/plugin/o $gtmdist
-	else
-		exit
-	fi
+fi
+read resp
+if [ "$resp" = "Y" -o "$resp" = "y" ] ; then
+	mkdir -p        $gtmdist/plugin/r $gtmdist/plugin/o
+	chmod 0755      $gtmdist/plugin/r $gtmdist/plugin/o $gtmdist
+	chown $owner    $gtmdist/plugin/r $gtmdist/plugin/o $gtmdist
+	chgrp $bingroup $gtmdist/plugin/r $gtmdist/plugin/o $gtmdist
+else
+	exit
 fi
 
 if [ ! -w $gtmdist ]; then
@@ -223,25 +194,20 @@ $echo ""
 $echo "Installing GT.M...."
 $echo ""
 
+is64bit_gtm=`file mumps | grep -c 64`
 
 # Create $gtmdist/utf8 if this platform can support "UTF-8" mode.
 
 # keep the utf8 libicu search code in gtm_test_install.csh in sync with the following!
-
 if [ -d "utf8" ]; then
 	unset gtm_icu_version
 	# If package has utf8 directory, see if system has libicu and locale
 	# Setup library path (in prep for looking for libicu and crypto libs)
-	if [ "$arch" = "hp" ] ; then
-		is64bit_gtm=`file mumps | grep "IA64" | wc -l`
-	else
-		is64bit_gtm=`file mumps | grep "64-bit" | wc -l`
-	fi
-# please keep in sync with sr_unix/set_library_path.csh
+	# Please keep in sync with sr_unix/set_library_path.csh and sr_unix/gtm_test_install.csh
 	if [ $is64bit_gtm -eq 1 ] ; then
-		library_path="/usr/local/lib64 /usr/local/lib /usr/lib64 /usr/lib /usr/lib/x86_64-linux-gnu /lib64 /lib /usr/local/ssl/lib"  #BYPASSOK line length
+		library_path="/usr/local/lib64 /usr/local/lib /usr/lib64 /usr/lib /usr/lib/x86_64-linux-gnu"
 	else
-		library_path="/usr/local/lib32 /usr/local/lib /usr/lib32 /usr/lib /usr/lib/i386-linux-gnu /lib32 /lib"
+		library_path="                 /usr/local/lib /usr/lib32 /usr/lib /usr/lib/i386-linux-gnu"
 	fi
 	$echo "Should UTF-8 support be installed? (y or n) \c"
 	read resp
@@ -270,8 +236,6 @@ if [ -d "utf8" ]; then
 	icu_ext=".so"
 	if [ $arch = "ibm" ] ; then
 		icu_ext=".a"
-	elif [ $arch = "hp" ] ; then
-		icu_ext=".sl"
 	fi
 	if [ "$would_like_utf8" -eq 1 ] ; then
 		for libpath in $library_path
@@ -305,12 +269,9 @@ if [ -d "utf8" ]; then
 			fi
 			if [ $icu_lib_found -eq 1 ] ; then
 				# Figure out the object mode(64 bit or 32 bit)  of ICU libraries on the target machine
-				if [ $arch = "linux" -o $arch = "sun"  -o  $arch = "solaris" ] ; then
+				if [ $arch = "linux" ] ; then
 					icu_full_ver_lib=`ls -l $libpath/libicuio$icu_ext.$majmin 2>/dev/null | awk '{print $NF}'`
 					is64bit_icu=`file $libpath/$icu_full_ver_lib 2>/dev/null | grep "64-bit" | wc -l`
-				elif [ $arch = "hp" ] ; then
-					icu_full_ver_lib=`ls -l $libpath/libicuio$icu_ext.$majmin 2>/dev/null | awk '{print $NF}'`
-					is64bit_icu=`file $libpath/$icu_full_ver_lib 2>/dev/null | grep "IA64" | wc -l`
 				elif [ $arch = "ibm" ] ; then
 					icu_full_ver_lib=`ls -l $libpath/libicuio$majmin$icu_ext 2>/dev/null | awk '{print $NF}'`
 					is64bit_icu=`nm -X64 $libpath/$icu_full_ver_lib 2>/dev/null | head -n 1 | wc -l`
@@ -417,9 +378,11 @@ if [ -f $file ]; then
 	fi
 fi
 # Install the .cshrc and .profile files
-cp -p gdedefaults gtmprofile gtmprofile_preV54000 gtm gtmcshrc $gtmdist
+cp -p gdedefaults gtmgblstat.xc gtmprofile gtmprofile_preV54000 gtm gtmcshrc $gtmdist
 chmod 0444 $gtmdist/gdedefaults
 chown $owner $gtmdist/gdedefaults
+chmod 0444 $gtmdist/gtmgblstat.xc
+chown $owner $gtmdist/gtmgblstat.xc
 chmod 0755 $gtmdist/gtmprofile
 chown $owner $gtmdist/gtmprofile
 chmod 0755 $gtmdist/gtmprofile_preV54000
@@ -448,7 +411,7 @@ done
 # Install the normal binaries
 for i in $binaries
 do
-	if [ $arch = "sun" -o $arch = "linux" ]; then
+	if [ $arch = "linux" ]; then
 		install -g $bingroup -o $owner -m 644 $i $gtmdist
 	elif [ $arch = "ibm" ]; then
 		/usr/bin/install -f $gtmdist -M 644 -O $owner -G $bingroup $i
@@ -625,7 +588,7 @@ if [ "$doutf8" -ne 0 ]; then
 	(
 		# Ensure we ARE in UTF-8 mode
 		utflocale=`locale -a | grep $binaryopt -iE 'en_us\.utf.?8$' | head -n1`
-		if [ $utflocale = "" ]; then
+		if [ "$utflocale" = "" ]; then
 			# If no locale defined, try C.UTF-8
 			utflocale="C.UTF-8"
 		fi
@@ -729,7 +692,7 @@ chmod 700 $tgtmsecshrdir
 chgrp $bingroup $tgtmsecshrdir
 
 # Install gtmsecshr and the wrapper with special permissions
-if [ $arch = "sun" -o $arch = "linux" ]; then
+if [ $arch = "linux" ]; then
 	install -m 4555 -o root -g $bingroup gtmsecshr $gtmdist
 	install -m 4500 -o root -g $bingroup gtmsecshrdir/gtmsecshr $tgtmsecshrdir/gtmsecshr
 elif [ $arch = "ibm" ]; then
diff --git a/sr_unix/db_ipcs_reset.c b/sr_unix/db_ipcs_reset.c
index a3c5f9b..35101d2 100755
--- a/sr_unix/db_ipcs_reset.c
+++ b/sr_unix/db_ipcs_reset.c
@@ -66,7 +66,7 @@ boolean_t db_ipcs_reset(gd_region *reg)
 	file_control		*fc;
 	unix_db_info		*udi;
 	gd_region		*temp_region;
-	char			sgmnthdr_unaligned[SGMNT_HDR_LEN + 8], *sgmnthdr_8byte_aligned;
+	sgmnt_data		old_data;
 	sgmnt_addrs             *csa;
 	DCL_THREADGBL_ACCESS;
 
@@ -94,9 +94,6 @@ boolean_t db_ipcs_reset(gd_region *reg)
 		gv_cur_region = temp_region;
 		return FALSE;
 	}
-	sgmnthdr_8byte_aligned = &sgmnthdr_unaligned[0];
-	sgmnthdr_8byte_aligned = (char *)ROUND_UP2((unsigned long)sgmnthdr_8byte_aligned, 8);
-	csd = (sgmnt_data_ptr_t)&sgmnthdr_8byte_aligned[0];
 	fc = reg->dyn.addr->file_cntl;
 	fc->op = FC_OPEN;
 	status = dbfilop(fc);
@@ -106,8 +103,8 @@ boolean_t db_ipcs_reset(gd_region *reg)
 		gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(5) ERR_DBFILERR, 2, DB_LEN_STR(reg), status);
                 return FALSE;
 	}
-	LSEEKREAD(udi->fd, (off_t)0, csd, SGMNT_HDR_LEN, status);
-	csa->hdr = csd;			/* needed for DB_LSEEKWRITE when instance is frozen */
+	csd = !udi->fd_opened_with_o_direct ? &old_data : (sgmnt_data_ptr_t)(TREF(dio_buff)).aligned;
+	DB_LSEEKREAD(udi, udi->fd, (off_t)0, csd, SGMNT_HDR_LEN, status);
 	if (0 != status)
 	{
 		gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(5) ERR_DBFILERR, 2, DB_LEN_STR(reg), status);
@@ -116,6 +113,7 @@ boolean_t db_ipcs_reset(gd_region *reg)
 			gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(5) ERR_DBFILERR, 2, DB_LEN_STR(reg), status);
 		return FALSE;
 	}
+	csa->hdr = csd;			/* needed for DB_LSEEKWRITE (done later) if/when instance is frozen */
 	assert((udi->semid == csd->semid) || (INVALID_SEMID == csd->semid));
 	semval = semctl(udi->semid, DB_COUNTER_SEM, GETVAL);	/* Get the counter semaphore's value */
 	/* Since we have standalone access to the db (caller ensures this) we do not need to worry about whether the
@@ -158,7 +156,7 @@ boolean_t db_ipcs_reset(gd_region *reg)
 			csd->shmid = INVALID_SHMID;
 			csd->gt_sem_ctime.ctime = 0;
 			csd->gt_shm_ctime.ctime = 0;
-			DB_LSEEKWRITE(csa, udi->fn, udi->fd, (off_t)0, csd, SGMNT_HDR_LEN, status);
+			DB_LSEEKWRITE(csa, udi, udi->fn, udi->fd, (off_t)0, csd, SGMNT_HDR_LEN, status);
 			if (0 != status)
 			{
 				gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(5) ERR_DBFILERR, 2, DB_LEN_STR(reg), status);
@@ -169,6 +167,7 @@ boolean_t db_ipcs_reset(gd_region *reg)
 			}
 		} else
 		{
+			db_ipcs.open_fd_with_o_direct = udi->fd_opened_with_o_direct;
 			db_ipcs.semid = INVALID_SEMID;
 			db_ipcs.shmid = INVALID_SHMID;
 			db_ipcs.gt_sem_ctime = 0;
diff --git a/sr_unix/db_snapshot.h b/sr_unix/db_snapshot.h
index f8b763d..89060c8 100644
--- a/sr_unix/db_snapshot.h
+++ b/sr_unix/db_snapshot.h
@@ -152,11 +152,7 @@ typedef snapshot_context_t	*snapshot_context_ptr_t;
 #	define	DBG_ENSURE_PTR_WITHIN_SS_BOUNDS(CSA, PTR)
 #endif
 
-#ifdef GTM_SNAPSHOT
-#	define	SNAPSHOT_SECTION_SIZE	(ROUND_UP((MAX_SNAPSHOTS * SINGLE_SHM_SNAPSHOT_SIZE), OS_PAGE_SIZE))
-#else
-#	define	SNAPSHOT_SECTION_SIZE	0
-#endif
+#define	SNAPSHOT_SECTION_SIZE	(ROUND_UP((MAX_SNAPSHOTS * SINGLE_SHM_SNAPSHOT_SIZE), OS_PAGE_SIZE))
 #define SHMPOOL_SECTION_SIZE	(ROUND_UP((SHMPOOL_BUFFER_SIZE + SNAPSHOT_SECTION_SIZE), OS_PAGE_SIZE))
 
 boolean_t	ss_initiate(gd_region *, util_snapshot_ptr_t, snapshot_context_ptr_t *, boolean_t, char *);
diff --git a/sr_unix/db_write_eof_block.c b/sr_unix/db_write_eof_block.c
new file mode 100644
index 0000000..1e5c56e
--- /dev/null
+++ b/sr_unix/db_write_eof_block.c
@@ -0,0 +1,57 @@
+/****************************************************************
+ *								*
+ * Copyright (c) 2016 Fidelity National Information		*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
+ *								*
+ *	This source code contains the intellectual property	*
+ *	of its copyright holder(s), and is made available	*
+ *	under a license.  If you do not know the terms of	*
+ *	the license, please stop and do not read further.	*
+ *								*
+ ****************************************************************/
+
+#include "mdef.h"
+
+#include "gdsroot.h"
+#include "gdsblk.h"
+#include "gdsbml.h"
+#include "gdsbt.h"
+#include "gdsfhead.h"
+#include "gdsblkops.h"
+#include "gdscc.h"
+#include "filestruct.h"
+#include "jnl.h"
+#include "db_write_eof_block.h"
+#include "gtmio.h"
+#include "anticipatory_freeze.h"
+
+/* #GTM_THREAD_SAFE : The below function db_write_eof_block is thread-safe */
+int	db_write_eof_block(unix_db_info *udi, int fd, int blk_size, off_t offset, dio_buff_t *diobuff)
+{
+	int		status;
+	char		*buff;
+	sgmnt_addrs	*csa;
+	boolean_t	free_needed;
+
+	if ((NULL != udi) && udi->fd_opened_with_o_direct)
+	{
+		DIO_BUFF_EXPAND_IF_NEEDED(udi, blk_size, diobuff);
+		buff = diobuff->aligned;
+		free_needed = FALSE;
+	} else
+	{
+		buff = (char *)malloc(blk_size);
+		free_needed = TRUE;
+	}
+	memset(buff, 0, blk_size);
+	if (NULL != udi)
+	{
+		csa = &udi->s_addrs;
+		assert(fd == udi->fd);
+		DB_LSEEKWRITE(csa, udi, udi->fn, fd, offset, buff, blk_size, status);
+	} else
+		DB_LSEEKWRITE(NULL, ((unix_db_info *)NULL), NULL, fd, offset, buff, blk_size, status);
+	if (free_needed)
+		free(buff);
+	return status;
+}
diff --git a/sr_unix/db_write_eof_block.h b/sr_unix/db_write_eof_block.h
new file mode 100644
index 0000000..934efcd
--- /dev/null
+++ b/sr_unix/db_write_eof_block.h
@@ -0,0 +1,21 @@
+/****************************************************************
+ *								*
+ * Copyright (c) 2016 Fidelity National Information		*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
+ *								*
+ *	This source code contains the intellectual property	*
+ *	of its copyright holder(s), and is made available	*
+ *	under a license.  If you do not know the terms of	*
+ *	the license, please stop and do not read further.	*
+ *								*
+ ****************************************************************/
+
+#ifndef DB_WRITE_EOF_BLOCK_H_INCLUDED
+#define DB_WRITE_EOF_BLOCK_H_INCLUDED
+
+/* Reduction in free blocks after truncating from a to b total blocks: a = old_total (larger), b = new_total */
+# define DELTA_FREE_BLOCKS(a, b)	((a - b) - (DIVIDE_ROUND_UP(a, BLKS_PER_LMAP) - DIVIDE_ROUND_UP(b, BLKS_PER_LMAP)))
+
+int	db_write_eof_block(unix_db_info *udi, int fd, int blk_size, off_t offset, dio_buff_t *diobuff);
+
+#endif
diff --git a/sr_unix/dbcertify_dbfilop.c b/sr_unix/dbcertify_dbfilop.c
index 024a276..b6ea6b9 100755
--- a/sr_unix/dbcertify_dbfilop.c
+++ b/sr_unix/dbcertify_dbfilop.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2005, 2012 Fidelity Information Services, Inc *
+ * Copyright (c) 2005-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -54,8 +55,7 @@ void dbcertify_dbfilop(phase_static_area *psa)
 	int4		save_errno;
 	int		fstat_res;
 
-	/* assert((dba_mm == psa->fc->file_type) || (dba_bg == psa->fc->file_type)); not always set in unix */
-	udi = (unix_db_info *)psa->fc->file_info;
+	udi = FC2UDI(psa->fc);
 	switch(psa->fc->op)
 	{
 		case FC_READ:
@@ -72,9 +72,10 @@ void dbcertify_dbfilop(phase_static_area *psa)
 			if (0 != save_errno)
 			{
 				if (-1 == save_errno)
-					rts_error(VARLSTCNT(4) ERR_DBPREMATEOF, 2, LEN_AND_STR(udi->fn));
+					rts_error_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_DBPREMATEOF, 2, LEN_AND_STR(udi->fn));
 				else
-					rts_error(VARLSTCNT(5) ERR_DBFILOPERR, 2, LEN_AND_STR(udi->fn), save_errno);
+					rts_error_csa(CSA_ARG(NULL) VARLSTCNT(5) ERR_DBFILOPERR, 2, LEN_AND_STR(udi->fn),
+														save_errno);
 			}
 			break;
 		case FC_WRITE:
@@ -82,13 +83,13 @@ void dbcertify_dbfilop(phase_static_area *psa)
 					     psa->fc->op_pos, psa->fc->op_len)));
 			GTM64_ONLY(DBC_DEBUG(("DBC_DEBUG: -- Writing database op_pos = %ld  op_len = %d\n",
 						 psa->fc->op_pos, psa->fc->op_len)));
-			DB_LSEEKWRITE(NULL, NULL, udi->fd,
+			DB_LSEEKWRITE(NULL, udi, NULL, udi->fd,
 				   (off_t)(psa->fc->op_pos - 1) * DISK_BLOCK_SIZE,
 				   psa->fc->op_buff,
 				   psa->fc->op_len,
 				   save_errno);
 			if (0 != save_errno)
-				rts_error(VARLSTCNT(5) ERR_DBFILOPERR, 2, LEN_AND_STR(udi->fn), save_errno);
+				rts_error_csa(CSA_ARG(NULL) VARLSTCNT(5) ERR_DBFILOPERR, 2, LEN_AND_STR(udi->fn), save_errno);
 			break;
 		case FC_OPEN:
 			DBC_DEBUG(("DBC_DEBUG: -- Opening database %s\n", (char *)psa->dbc_gv_cur_region->dyn.addr->fname));
@@ -99,7 +100,8 @@ void dbcertify_dbfilop(phase_static_area *psa)
 				if (FD_INVALID == (udi->fd = OPEN((char *)psa->dbc_gv_cur_region->dyn.addr->fname, O_RDONLY)))
 				{
 					save_errno = errno;
-					rts_error(VARLSTCNT(5) ERR_DBOPNERR, 2, DB_LEN_STR(psa->dbc_gv_cur_region), save_errno);
+					rts_error_csa(CSA_ARG(NULL) VARLSTCNT(5) ERR_DBOPNERR, 2,
+								DB_LEN_STR(psa->dbc_gv_cur_region), save_errno);
 				}
 				psa->dbc_gv_cur_region->read_only = TRUE;	/* maintain csa->read_write simultaneously */
 				udi->s_addrs.read_write = FALSE;		/* maintain reg->read_only simultaneously */
@@ -108,7 +110,8 @@ void dbcertify_dbfilop(phase_static_area *psa)
 			if (-1 == fstat_res)
 			{
 				save_errno = errno;
-				rts_error(VARLSTCNT(5) ERR_DBOPNERR, 2, DB_LEN_STR(psa->dbc_gv_cur_region), save_errno);
+				rts_error_csa(CSA_ARG(NULL) VARLSTCNT(5) ERR_DBOPNERR, 2, DB_LEN_STR(psa->dbc_gv_cur_region),
+															save_errno);
 			}
 			set_gdid_from_stat(&udi->fileid, &stat_buf);
 			udi->raw = (S_ISCHR(stat_buf.st_mode) || S_ISBLK(stat_buf.st_mode));
@@ -118,9 +121,9 @@ void dbcertify_dbfilop(phase_static_area *psa)
 			DBC_DEBUG(("DBC_DEBUG: -- Closing database %s\n", (char *)psa->dbc_gv_cur_region->dyn.addr->fname));
 			CLOSEFILE_RESET(udi->fd, save_errno);	/* resets "udi->fd" to FD_INVALID */
 			if (0 != save_errno)
-				rts_error(VARLSTCNT(5) ERR_DBFILOPERR, 2, LEN_AND_STR(udi->fn), save_errno);
+				rts_error_csa(CSA_ARG(NULL) VARLSTCNT(5) ERR_DBFILOPERR, 2, LEN_AND_STR(udi->fn), save_errno);
 			break;
 		default:
-			GTMASSERT;
+			assertpro(FALSE && psa->fc->op);
 	}
 }
diff --git a/sr_unix/dbfilop.c b/sr_unix/dbfilop.c
index b548d0c..13924d2 100755
--- a/sr_unix/dbfilop.c
+++ b/sr_unix/dbfilop.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2012 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -12,10 +13,10 @@
 #include "mdef.h"
 
 #include "gtm_string.h"
-
-#include <sys/sem.h>
 #include "gtm_fcntl.h"
 #include "gtm_unistd.h"
+
+#include <sys/sem.h>
 #include <errno.h>
 #include <stddef.h>
 
@@ -35,6 +36,7 @@
 #include "dbfilop.h"
 #include "anticipatory_freeze.h"
 #include "jnl.h"
+#include "get_fs_block_size.h"
 
 GBLREF	gd_region	*gv_cur_region;
 
@@ -43,7 +45,6 @@ error_def(ERR_DBNOTGDS);
 error_def(ERR_DBOPNERR);
 error_def(ERR_DBPREMATEOF);
 error_def(ERR_TEXT);
-ZOS_ONLY(error_def(ERR_BADTAG);)
 
 uint4 dbfilop(file_control *fc)
 {
@@ -51,81 +52,84 @@ uint4 dbfilop(file_control *fc)
 	struct stat		stat_buf;
 	int4			save_errno;
 	int			fstat_res;
+	off_t			offset;
+	gd_segment		*seg;
+	sgmnt_addrs		*csa;
 	sgmnt_data_ptr_t	csd;
 	ZOS_ONLY(int		realfiletag;)
 
-	/* assert((dba_mm == fc->file_type) || (dba_bg == fc->file_type)); not always set in unix */
-	udi = (unix_db_info *)fc->file_info;
+	udi = FC2UDI(fc);
+	csa = &udi->s_addrs;
 	switch(fc->op)
 	{
 		case FC_READ:
-				assert(fc->op_pos > 0);		/* gt.m uses the vms convention of numbering the blocks from 1 */
- 				LSEEKREAD(udi->fd,
- 					  (off_t)(fc->op_pos - 1) * DISK_BLOCK_SIZE,
- 					  fc->op_buff,
- 					  fc->op_len,
- 					  save_errno);
-				if (0 != save_errno)
-				{
-					if (-1 == save_errno)
-						rts_error(VARLSTCNT(4) ERR_DBPREMATEOF, 2, LEN_AND_STR(udi->fn));
-					else
-						rts_error(VARLSTCNT(5) ERR_DBFILOPERR, 2, LEN_AND_STR(udi->fn), save_errno);
-				}
-				if (1 == fc->op_pos)
+			assert(fc->op_pos > 0);		/* gt.m uses the vms convention of numbering the blocks from 1 */
+			offset = (off_t)(fc->op_pos - 1) * DISK_BLOCK_SIZE;
+			DB_LSEEKREAD(udi, udi->fd, offset, fc->op_buff, fc->op_len, save_errno);
+			if (0 != save_errno)
+			{
+				if (-1 == save_errno)
+					rts_error_csa(CSA_ARG(csa) VARLSTCNT(4) ERR_DBPREMATEOF, 2, LEN_AND_STR(udi->fn));
+				else
+					rts_error_csa(CSA_ARG(csa) VARLSTCNT(5) ERR_DBFILOPERR, 2, LEN_AND_STR(udi->fn),
+														save_errno);
+			}
+			if (1 == fc->op_pos)
+			{
+				if (0 != memcmp(fc->op_buff, GDS_LABEL, GDS_LABEL_SZ - 3))
+					rts_error_csa(CSA_ARG(csa) VARLSTCNT(4) ERR_DBNOTGDS, 2, LEN_AND_STR(udi->fn));
+				if (0 == memcmp(fc->op_buff, GDS_LABEL, GDS_LABEL_SZ - 1))	/* current GDS */
 				{
-					if (0 != memcmp(fc->op_buff, GDS_LABEL, GDS_LABEL_SZ - 3))
-						rts_error(VARLSTCNT(4) ERR_DBNOTGDS, 2, LEN_AND_STR(udi->fn));
-					if (0 == memcmp(fc->op_buff, GDS_LABEL, GDS_LABEL_SZ - 1))	/* current GDS */
-					{
-						csd = (sgmnt_data_ptr_t)fc->op_buff;
-						if (offsetof(sgmnt_data, minor_dbver) < fc->op_len)
-							CHECK_DB_ENDIAN((sgmnt_data_ptr_t)fc->op_buff, strlen(udi->fn), udi->fn);
-					}
+					csd = (sgmnt_data_ptr_t)fc->op_buff;
+					if (offsetof(sgmnt_data, minor_dbver) < fc->op_len)
+						CHECK_DB_ENDIAN((sgmnt_data_ptr_t)fc->op_buff, strlen(udi->fn),
+													udi->fn); /* BYPASSOK */
 				}
-				break;
+			}
+			break;
 		case FC_WRITE:
-				if ((1 == fc->op_pos) && ((0 != memcmp(fc->op_buff, GDS_LABEL, GDS_LABEL_SZ - 1))
-						|| (0 == ((sgmnt_data_ptr_t)fc->op_buff)->acc_meth)))
-					GTMASSERT;
-				assert((1 != fc->op_pos) || fc->op_len <= SIZEOF_FILE_HDR(fc->op_buff));
- 				DB_LSEEKWRITE(&udi->s_addrs, udi->fn, udi->fd,
- 					   (off_t)(fc->op_pos - 1) * DISK_BLOCK_SIZE,
- 					   fc->op_buff,
- 					   fc->op_len,
- 					   save_errno);
- 				if (0 != save_errno)
-					rts_error(VARLSTCNT(5) ERR_DBFILOPERR, 2, LEN_AND_STR(udi->fn), save_errno);
-				break;
+			assertpro((1 != fc->op_pos) || ((0 == memcmp(fc->op_buff, GDS_LABEL, GDS_LABEL_SZ - 1))
+					&& (0 != ((sgmnt_data_ptr_t)fc->op_buff)->acc_meth)));
+			assert((1 != fc->op_pos) || (fc->op_len <= SIZEOF_FILE_HDR(fc->op_buff)));
+			offset = (off_t)(fc->op_pos - 1) * DISK_BLOCK_SIZE;
+			DB_LSEEKWRITE(csa, udi, udi->fn, udi->fd, offset, fc->op_buff, fc->op_len, save_errno);
+			if (0 != save_errno)
+				rts_error_csa(CSA_ARG(csa) VARLSTCNT(5) ERR_DBFILOPERR, 2, LEN_AND_STR(udi->fn), save_errno);
+			break;
 		case FC_OPEN:
-				gv_cur_region->read_only = FALSE;	/* maintain csa->read_write simultaneously */
-				udi->s_addrs.read_write = TRUE;		/* maintain reg->read_only simultaneously */
-				if (FD_INVALID == (udi->fd = OPEN((char *)gv_cur_region->dyn.addr->fname, O_RDWR)))
-				{
-					if (FD_INVALID == (udi->fd = OPEN((char *)gv_cur_region->dyn.addr->fname, O_RDONLY)))
-						return ERR_DBOPNERR;
-					gv_cur_region->read_only = TRUE;	/* maintain csa->read_write simultaneously */
-					udi->s_addrs.read_write = FALSE;	/* maintain reg->read_only simultaneously */
-				}
-				FSTAT_FILE(udi->fd, &stat_buf, fstat_res);
-				if (-1 == fstat_res)
+			gv_cur_region->read_only = FALSE;	/* maintain csa->read_write simultaneously */
+			seg = gv_cur_region->dyn.addr;
+			csa->read_write = TRUE;		/* maintain reg->read_only simultaneously */
+			csa->orig_read_write = TRUE;	/* maintain orig_read_write at same time as read_write */
+			OPENFILE_DB((char *)seg->fname, O_RDWR, udi, seg);
+			if (FD_INVALID == udi->fd)
+			{
+				OPENFILE_DB((char *)seg->fname, O_RDONLY, udi, seg);
+				if (FD_INVALID == udi->fd)
 					return ERR_DBOPNERR;
-#ifdef __MVS__
-				if (-1 == gtm_zos_tag_to_policy(udi->fd, TAG_BINARY, &realfiletag))
-					TAG_POLICY_SEND_MSG((char_ptr_t)gv_cur_region->dyn.addr->fname, errno,
-								realfiletag, TAG_BINARY);
-#endif
-				set_gdid_from_stat(&udi->fileid, &stat_buf);
-				udi->raw = (S_ISCHR(stat_buf.st_mode) || S_ISBLK(stat_buf.st_mode));
-				udi->fn = (char *)gv_cur_region->dyn.addr->fname;
-				break;
+				gv_cur_region->read_only = TRUE;	/* maintain csa->read_write simultaneously */
+				csa->read_write = FALSE;	/* maintain reg->read_only simultaneously */
+				csa->orig_read_write = FALSE;	/* maintain orig_read_write at same time as read_write */
+			}
+			FSTAT_FILE(udi->fd, &stat_buf, fstat_res);
+			if (-1 == fstat_res)
+				return ERR_DBOPNERR;
+#			ifdef __MVS__
+			if (-1 == gtm_zos_tag_to_policy(udi->fd, TAG_BINARY, &realfiletag))
+				TAG_POLICY_SEND_MSG((char_ptr_t)gv_cur_region->dyn.addr->fname, errno, realfiletag, TAG_BINARY);
+#			endif
+			set_gdid_from_stat(&udi->fileid, &stat_buf);
+			udi->raw = (S_ISCHR(stat_buf.st_mode) || S_ISBLK(stat_buf.st_mode));
+			udi->fn = (char *)gv_cur_region->dyn.addr->fname;
+			break;
 		case FC_CLOSE:
-				CLOSEFILE_RESET(udi->fd, save_errno);	/* resets "udi->fd" to FD_INVALID */
- 				if (0 != save_errno)
-					rts_error(VARLSTCNT(5) ERR_DBFILOPERR, 2, LEN_AND_STR(udi->fn), save_errno);
-				break;
+			CLOSEFILE_RESET(udi->fd, save_errno);	/* resets "udi->fd" to FD_INVALID */
+			if (0 != save_errno)
+				rts_error_csa(CSA_ARG(csa) VARLSTCNT(5) ERR_DBFILOPERR, 2, LEN_AND_STR(udi->fn), save_errno);
+			udi->fd_opened_with_o_direct = FALSE;
+			break;
 		default:
-				GTMASSERT;
+			assertpro(FALSE && fc->op);
 	}
 	return SS_NORMAL;
 }
diff --git a/sr_unix/dbinit_ch.c b/sr_unix/dbinit_ch.c
index e2b8ec8..6bf7c86 100755
--- a/sr_unix/dbinit_ch.c
+++ b/sr_unix/dbinit_ch.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -54,7 +54,7 @@ void db_init_err_cleanup(boolean_t retry_dbinit)
 	gd_segment		*seg;
 	sgmnt_addrs		*csa;
 	int			rc, lcl_new_dbinit_ipc;
-	boolean_t		ftok_counter_halted, access_counter_halted;
+	boolean_t		ftok_counter_halted, access_counter_halted, decrement_ftok_counter;
 
 	/* Here, we can not rely on the validity of csa->hdr because this function can be triggered anywhere in db_init().Because
 	 * we don't have access to file header, we can not know if counters are disabled so we go by our best guess, not disabled,
@@ -124,10 +124,16 @@ void db_init_err_cleanup(boolean_t retry_dbinit)
 			do_semop(udi->semid, DB_CONTROL_SEM, -1, SEM_UNDO | IPC_NOWAIT); /* release the startup-shutdown sem */
 			udi->grabbed_access_sem = FALSE;
 		}
+		decrement_ftok_counter = udi->counter_ftok_incremented
+						? (ftok_counter_halted ? DECR_CNT_SAFE : DECR_CNT_TRUE)
+						: DECR_CNT_FALSE;
 		if (udi->grabbed_ftok_sem)
-			ftok_sem_release(db_init_region, udi->counter_ftok_incremented && !ftok_counter_halted, TRUE);
-		else if (udi->counter_ftok_incremented && !ftok_counter_halted)
+		{
+			ftok_sem_release(db_init_region, decrement_ftok_counter, TRUE);
+			assert(FALSE == udi->counter_ftok_incremented);
+		} else if (udi->counter_ftok_incremented)
 			do_semop(udi->ftok_semid, DB_COUNTER_SEM, -DB_COUNTER_SEM_INCR, SEM_UNDO | IPC_NOWAIT);
+		/* Below reset needed for "else if" case above but do it for "if" case too (in pro) just in case */
 		udi->counter_ftok_incremented = FALSE;
 		udi->grabbed_ftok_sem = FALSE;
 		if (!IS_GTCM_GNP_SERVER_IMAGE && !retry_dbinit) /* gtcm_gnp_server reuses file_cntl */
diff --git a/sr_unix/dse.c b/sr_unix/dse.c
index ff963d4..d0b696b 100755
--- a/sr_unix/dse.c
+++ b/sr_unix/dse.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -110,6 +110,7 @@ int main(int argc, char *argv[])
 	TREF(no_spangbls) = TRUE;	/* dse operates on a per-region basis irrespective of global mapping in gld */
 	TREF(skip_file_corrupt_check) = TRUE;	/* do not let csd->file_corrupt flag cause errors in dse */
 	op_open_ptr = op_open;
+	INIT_FNPTR_GLOBAL_VARIABLES;
 	patch_curr_blk = get_dir_root();
 	err_init(util_base_ch);
 	UNICODE_ONLY(gtm_strToTitle_ptr = &gtm_strToTitle);
diff --git a/sr_unix/dse_cmd.c b/sr_unix/dse_cmd.c
index 83fe644..2ce8d3a 100755
--- a/sr_unix/dse_cmd.c
+++ b/sr_unix/dse_cmd.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -285,6 +285,7 @@ static readonly CLI_ENTRY dse_find_qual[] = {
 { "KEY",        dse_f_key,  0, 0,                    0, 0, 0, VAL_REQ,     0, NON_NEG, VAL_STR, 0       },
 { "REGION",     dse_f_reg,  0, dse_freg_parm_values, 0, 0, 0, VAL_NOT_REQ, 0, NON_NEG, VAL_STR, 0       },
 { "SIBLINGS",   0,          0, 0,                    0, 0, 0, VAL_N_A,     0, NON_NEG, 0,       0       },
+{ "STATS",      0,          0, 0,                    0, 0, 0, VAL_N_A,     0, NEG,     0,       0       },
 { "" }
 };
 
diff --git a/sr_unix/dse_cmd_disallow.c b/sr_unix/dse_cmd_disallow.c
old mode 100755
new mode 100644
index 6442d24..22d4de6
--- a/sr_unix/dse_cmd_disallow.c
+++ b/sr_unix/dse_cmd_disallow.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2003, 2011 Fidelity Information Services, Inc	*
+ * Copyright (c) 2003-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -252,6 +253,8 @@ boolean_t cli_disallow_dse_find(void)
 	CLI_DIS_CHECK_N_RESET;
 	disallow_return_value = d_c_cli_present("FREEBLOCK") && !d_c_cli_present("HINT");
 	CLI_DIS_CHECK_N_RESET;
+	disallow_return_value = d_c_cli_present("STATS") && !d_c_cli_present("REGION");
+	CLI_DIS_CHECK_N_RESET;
 	return FALSE;
 }
 
diff --git a/sr_unix/dsk_read.c b/sr_unix/dsk_read.c
index aaaf3a7..30de8f4 100755
--- a/sr_unix/dsk_read.c
+++ b/sr_unix/dsk_read.c
@@ -88,7 +88,7 @@ int4	dsk_read (block_id blk, sm_uc_ptr_t buff, enum db_ver *ondsk_blkver, boolea
 	 * risk reading a potential V4 format block directly into the cache and then upgrading it. Instead we read it into
 	 * a private buffer, upgrade it there and then copy it over to the cache in V5 format. This is the static variable
 	 * read_reformat_buffer. We could have as well used the global variable "reformat_buffer" for this purpose. But
-	 * that would then prevent dsk_reads and concurrent dsk_writes from proceeding. We dont want that loss of asynchronocity.
+	 * that would then prevent dsk_reads and concurrent dsk_writes from proceeding. We don't want that loss of asynchronocity.
 	 * Hence we keep them separate. Note that while "reformat_buffer" is used by a lot of routines, "read_reformat_buffer"
 	 * is used only by this routine and hence is a static instead of a GBLDEF.
 	 */
@@ -111,7 +111,7 @@ int4	dsk_read (block_id blk, sm_uc_ptr_t buff, enum db_ver *ondsk_blkver, boolea
 	assert(!blk_free || SNAPSHOTS_IN_PROG(csa)); /* Only SNAPSHOTS require dsk_read to read a FREE block from the disk */
 	assert(0 == in_dsk_read);	/* dsk_read should never be nested. the read_reformat_buffer logic below relies on this */
 	DEBUG_ONLY(in_dsk_read++;)
-	udi = (unix_db_info *)(gv_cur_region->dyn.addr->file_cntl->file_info);
+	udi = FILE_INFO(gv_cur_region);
 	assert(csd == cs_data);
 	size = csd->blk_size;
 	assert(csd->acc_meth == dba_bg);
@@ -154,12 +154,8 @@ int4	dsk_read (block_id blk, sm_uc_ptr_t buff, enum db_ver *ondsk_blkver, boolea
 		enc_save_buff = GDS_ANY_ENCRYPTGLOBUF(buff, csa);
 		DBG_ENSURE_PTR_IS_VALID_ENCTWINGLOBUFF(csa, csd, enc_save_buff);
 	}
-	LSEEKREAD(udi->fd,
-		  (DISK_BLOCK_SIZE * (csd->start_vbn - 1) + (off_t)blk * size),
-		  enc_save_buff,
-		  size,
-		  save_errno);
-	assert((0 == save_errno) GTM_TRUNCATE_ONLY(|| (-1 == save_errno)));
+	DB_LSEEKREAD(udi, udi->fd, (BLK_ZERO_OFF(csd->start_vbn) + (off_t)blk * size), enc_save_buff, size, save_errno);
+	assert((0 == save_errno) || (-1 == save_errno));
 	WBTEST_ASSIGN_ONLY(WBTEST_PREAD_SYSCALL_FAIL, save_errno, EIO);
 	if ((enc_save_buff != buff) && (0 == save_errno))
 	{
diff --git a/sr_unix/dsk_write.c b/sr_unix/dsk_write.c
deleted file mode 100755
index 2f927be..0000000
--- a/sr_unix/dsk_write.c
+++ /dev/null
@@ -1,127 +0,0 @@
-/****************************************************************
- *								*
- *	Copyright 2001, 2012 Fidelity Information Services, Inc	*
- *								*
- *	This source code contains the intellectual property	*
- *	of its copyright holder(s), and is made available	*
- *	under a license.  If you do not know the terms of	*
- *	the license, please stop and do not read further.	*
- *								*
- ****************************************************************/
-
-#include "mdef.h"
-
-#include <sys/types.h>
-#include "gtm_unistd.h"
-#include <signal.h>
-#include <errno.h>
-#ifdef DEBUG
-#include "gtm_stdio.h"
-#endif
-
-#include "gdsroot.h"
-#include "gtm_facility.h"
-#include "fileinfo.h"
-#include "gdsbt.h"
-#include "gdsfhead.h"
-#include "filestruct.h"
-#include "gdsblk.h"
-#include "iosp.h"
-#include "gtmio.h"
-#include "gds_blk_downgrade.h"
-#include "gdsbml.h"
-#include "jnl.h"
-#include "anticipatory_freeze.h"
-
-GBLREF	sm_uc_ptr_t	reformat_buffer;
-GBLREF	int		reformat_buffer_len;
-GBLREF	volatile int	reformat_buffer_in_use;	/* used only in DEBUG mode */
-GBLREF	int		fast_lock_count;
-GBLREF	boolean_t	dse_running;
-
-int	dsk_write(gd_region *reg, block_id blk, cache_rec_ptr_t cr)
-{
-	unix_db_info		*udi;
-	int4			size, save_errno;
-	sgmnt_addrs		*csa;
-	sgmnt_data_ptr_t	csd;
-	sm_uc_ptr_t		buff;
-	DEBUG_ONLY(
-		blk_hdr_ptr_t	blk_hdr;
-	)
-
-	udi = (unix_db_info *)(reg->dyn.addr->file_cntl->file_info);
-	csa = &udi->s_addrs;
-	csd = csa->hdr;
-	assert(NULL != csd);
-	assert(cr);
-	assert(cr->buffaddr);
-	buff = GDS_ANY_REL2ABS(csa, cr->buffaddr);
-	DEBUG_ONLY(
-		/* Check GDS block that is about to be written. Dont do this for DSE as it may intentionally create bad blocks */
-		if (!dse_running)
-		{
-			blk_hdr = (blk_hdr_ptr_t)buff;
-			assert((unsigned)GDSVLAST > (unsigned)blk_hdr->bver);
-			assert((LCL_MAP_LEVL == blk_hdr->levl) || ((unsigned)MAX_BT_DEPTH > (unsigned)blk_hdr->levl));
-			assert((unsigned)csd->blk_size >= (unsigned)blk_hdr->bsiz);
-			assert(csd->trans_hist.curr_tn >= blk_hdr->tn);
-		}
-	)
-	assert(((blk_hdr_ptr_t)buff)->bver);	/* GDSV4 (0) version uses this field as a block length so should always be > 0 */
-	assert(0 == fast_lock_count); /* ensure the static reformat buffer is not being used currently */
-	++fast_lock_count; 	/* Prevents interrupt from using reformat buffer while we have it */
-	/* reformat_buffer_in_use should always be incremented only AFTER incrementing fast_lock_count
-	 * as it is the latter that prevents interrupts from using the reformat buffer. Similarly
-	 * the decrement of fast_lock_count should be done AFTER decrementing reformat_buffer_in_use.
-	 */
-	assert(0 == reformat_buffer_in_use);
-	DEBUG_ONLY(reformat_buffer_in_use++;)
-	if (IS_GDS_BLK_DOWNGRADE_NEEDED(cr->ondsk_blkver))
-	{	/* Need to downgrade/reformat this block back to the previous format */
-		DEBUG_DYNGRD_ONLY(PRINTF("DSK_WRITE: Block %d being dynamically downgraded on write\n", blk));
-		if (csd->blk_size > reformat_buffer_len)
-		{	/* Buffer not big enough (or does not exist) .. get a new one releasing old if it exists */
-			if (reformat_buffer)
-				free(reformat_buffer);	/* Different blksized databases in use .. keep only largest one */
-			reformat_buffer = malloc(csd->blk_size);
-			reformat_buffer_len = csd->blk_size;
-		}
-		gds_blk_downgrade((v15_blk_hdr_ptr_t)reformat_buffer, (blk_hdr_ptr_t)buff);
-		buff = reformat_buffer;
-		size = ((v15_blk_hdr_ptr_t)buff)->bsiz;
-		assert(size <= csd->blk_size - SIZEOF(blk_hdr) + SIZEOF(v15_blk_hdr));
-		size = (size + 1) & ~1;
-		assert(SIZEOF(v15_blk_hdr) <= size);
-	} else DEBUG_ONLY(if (GDSV6 == cr->ondsk_blkver))
-	{
-		size = (((blk_hdr_ptr_t)buff)->bsiz + 1) & ~1;
-		assert(SIZEOF(blk_hdr) <= size);
-	}
-	DEBUG_ONLY(else GTMASSERT);
-	if (csa->do_fullblockwrites)
-		/* round size up to next full logical filesys block. */
-		size = (int)ROUND_UP(size, csa->fullblockwrite_len);
-	assert(size <= csd->blk_size);
-	assert(FALSE == reg->read_only);
-	assert(dba_bg == reg->dyn.addr->acc_meth);
-	assert(!csa->acc_meth.bg.cache_state->cache_array || buff != (sm_uc_ptr_t)csd);
-	assert(!csa->acc_meth.bg.cache_state->cache_array
-	       || (buff >= (sm_uc_ptr_t)csa->acc_meth.bg.cache_state->cache_array
-		   + (SIZEOF(cache_rec) * (csd->bt_buckets + csd->n_bts))));
-	assert(buff < (sm_uc_ptr_t)csd || buff == reformat_buffer);
-		/* assumes hdr follows immediately after the buffer pool in shared memory */
-	assert(size <= csd->blk_size);
-	if (udi->raw)
-		size = ROUND_UP(size, DISK_BLOCK_SIZE);	/* raw I/O must be a multiple of DISK_BLOCK_SIZE */
-	DB_LSEEKWRITE(csa, udi->fn, udi->fd,
-		   (DISK_BLOCK_SIZE * (csd->start_vbn - 1) + (off_t)blk * csd->blk_size),
-		   buff, size, save_errno);
-	DEBUG_ONLY(reformat_buffer_in_use--;)
-	assert(0 == reformat_buffer_in_use);
-	--fast_lock_count;
-	assert(0 == fast_lock_count);
-	if (0 != save_errno)		/* If it didn't work for whatever reason.. */
-		return -1;
-	return SS_NORMAL;
-}
diff --git a/sr_unix/dsk_write_nocache.c b/sr_unix/dsk_write_nocache.c
index 7936872..e90c931 100755
--- a/sr_unix/dsk_write_nocache.c
+++ b/sr_unix/dsk_write_nocache.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2005-2016 Fidelity National Information	*
+ * Copyright (c) 2005-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -12,10 +12,12 @@
 
 #include "mdef.h"
 
-#include <sys/types.h>
+#include "gtm_fcntl.h"	/* needed for silly aix's expansion of open to open64 */
 #include "gtm_unistd.h"
 #include "gtm_stdio.h"
 #include "gtm_signal.h"
+
+#include <sys/types.h>
 #include <errno.h>
 
 #include "gdsroot.h"
@@ -39,24 +41,27 @@ GBLREF	int		reformat_buffer_len;
 GBLREF	volatile int	reformat_buffer_in_use;	/* used only in DEBUG mode */
 GBLREF	volatile int4	fast_lock_count;
 
-/* Similiar to dsk_write but differs in two important ways:
-   1) We write direct from the given buffer rather than from a cache record's buffer.
-   2) This routine takes care of the maint of blks_to_upgrd in the file-header for
-      these non-cached writes.
-*/
+/*
+ * 1) We write direct from the given buffer to a block in the database file on disk rather than from a cache record's buffer.
+ * 2) This routine takes care of the maint of blks_to_upgrd in the file-header for these non-cached writes.
+ */
 int	dsk_write_nocache(gd_region *reg, block_id blk, sm_uc_ptr_t buff, enum db_ver ondsk_blkver)
 {
 	unix_db_info		*udi;
 	int4			size, save_errno;
 	sgmnt_addrs		*csa;
 	sgmnt_data_ptr_t	csd;
-	sm_uc_ptr_t		save_buff;
 	int			in_len, this_blk_size, gtmcrypt_errno;
 	char			*in;
 	gd_segment		*seg;
 	boolean_t		use_new_key;
+#	ifdef DEBUG
+	sm_uc_ptr_t		save_buff;
+#	endif
+	DCL_THREADGBL_ACCESS;
 
-	udi = (unix_db_info *)(reg->dyn.addr->file_cntl->file_info);
+	SETUP_THREADGBL_ACCESS;
+	udi = FILE_INFO(reg);
 	csa = &udi->s_addrs;
 	csd = csa->hdr;
 	assert(NULL != csd);
@@ -99,7 +104,15 @@ int	dsk_write_nocache(gd_region *reg, block_id blk, sm_uc_ptr_t buff, enum db_ve
 		size =(int)ROUND_UP(size, csa->fullblockwrite_len); /* round size up to next full logical filesys block. */
 	assert(size <= csd->blk_size);
 	assert(FALSE == reg->read_only);
-	assert(!csa->acc_meth.bg.cache_state->cache_array || buff != (sm_uc_ptr_t)csd);
+	/* This function is called by "bml_init" which in turn can be called by "mucregini" or "gdsfilext". The former is
+	 * a case where the region is not yet open. csa is usable to a limited extent in the former case but since shared
+	 * memory is not set up yet, most of it (e.g. csa->nl etc.) are not usable in the former case. But it is usable
+	 * completely in the latter case. Therefore take care using "csa" below. Hence the "reg->open" usages before csa access.
+	 * The reg->open check was not necessary until statsdb support because the only caller of "mucregini" was MUPIP CREATE
+	 * which would not anyways open the journal pool. But now that GT.M can call "mucregini" to create a statsdb while
+	 * it has other basedbs open, it could have the jnlpool open which is why we need this safety check.
+	 */
+	assert(!reg->open || !csa->acc_meth.bg.cache_state->cache_array || buff != (sm_uc_ptr_t)csd);
 	assert(size <= csd->blk_size);
 	if (udi->raw)
 		size = ROUND_UP(size, DISK_BLOCK_SIZE);	/* raw I/O must be a multiple of DISK_BLOCK_SIZE */
@@ -124,11 +137,19 @@ int	dsk_write_nocache(gd_region *reg, block_id blk, sm_uc_ptr_t buff, enum db_ve
 			}
 		}
 	}
-	DB_LSEEKWRITE(csa, udi->fn, udi->fd,
-		(DISK_BLOCK_SIZE * (csd->start_vbn - 1) + (off_t)blk * csd->blk_size),
-		buff,
-		size,
-		save_errno);
+	if (udi->fd_opened_with_o_direct)
+	{
+		assert(reg->open);	/* should be coming in through "gdsfilext" after having done a "gvcst_init" */
+		/* This means dio_buff.aligned would already have been allocated to hold at least one GDS block. Use it. */
+		size = ROUND_UP2(size, DIO_ALIGNSIZE(udi));
+		assert(DIO_BUFF_NO_OVERFLOW((TREF(dio_buff)), size));
+		assert(size <= csd->blk_size);
+		memcpy((TREF(dio_buff)).aligned, buff, size);
+		DEBUG_ONLY(save_buff = buff;)	/* for DBG purposes */
+		buff = (sm_uc_ptr_t)(TREF(dio_buff)).aligned;
+	}
+	DB_LSEEKWRITE(reg->open ? csa : NULL, udi, udi->fn, udi->fd,
+			(BLK_ZERO_OFF(csd->start_vbn) + (off_t)blk * csd->blk_size), buff, size, save_errno);
 	DEBUG_ONLY(reformat_buffer_in_use--;)
 	assert(0 == reformat_buffer_in_use);
 	--fast_lock_count; 		/* reformat buffer is no longer necessary */
diff --git a/sr_unix/dskspace_msg_timer.c b/sr_unix/dskspace_msg_timer.c
deleted file mode 100755
index 2912f7f..0000000
--- a/sr_unix/dskspace_msg_timer.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/****************************************************************
- *								*
- *	Copyright 2001 Sanchez Computer Associates, Inc.	*
- *								*
- *	This source code contains the intellectual property	*
- *	of its copyright holder(s), and is made available	*
- *	under a license.  If you do not know the terms of	*
- *	the license, please stop and do not read further.	*
- *								*
- ****************************************************************/
-
-#include "mdef.h"
-#include "dskspace_msg_timer.h"
-#include "gt_timer.h"
-
-GBLREF volatile uint4 dskspace_msg_counter;
-
-void dskspace_msg_timer(void)
-{
-	dskspace_msg_counter++;
-}
-
diff --git a/sr_unix/dtgbldir.c b/sr_unix/dtgbldir.c
deleted file mode 100755
index 7e1c822..0000000
--- a/sr_unix/dtgbldir.c
+++ /dev/null
@@ -1,223 +0,0 @@
-/****************************************************************
- *								*
- *	Copyright 2001, 2013 Fidelity Information Services, Inc	*
- *								*
- *	This source code contains the intellectual property	*
- *	of its copyright holder(s), and is made available	*
- *	under a license.  If you do not know the terms of	*
- *	the license, please stop and do not read further.	*
- *								*
- ****************************************************************/
-
-#include "mdef.h"
-#include "main_pragma.h"
-
-#undef malloc
-#undef free
-#undef GTM_FD_TRACE	/* this is a standalone executable so do not convert OPEN3 to gtm_open3 for FD tracing */
-
-#include "gtm_string.h"
-#include "gtm_fcntl.h"
-#include "gtm_stat.h"
-#include "gtm_stdio.h"
-#include "gtm_stdlib.h"
-#include "gtm_unistd.h"
-#include <errno.h>
-
-#include "gdsroot.h"
-#include "gtm_facility.h"
-#include "fileinfo.h"
-#include "gdsbt.h"
-#include "gdsfhead.h"
-#include "gdsblk.h"
-#include "mlkdef.h"
-#include "filestruct.h"
-#include "gbldirnam.h"
-#include "hashtab_mname.h"
-
-#ifdef __MVS__
-#include "gtm_zos_io.h"
-#endif
-
-#define asc2i(str,len) atoi((const char*)str)
-#ifdef BIGENDIAN
-#	define	FIRST_ONE	0x2329FFFF
-#	define  SECOND_ONE	0x25FFFFFF
-#else
-#	define	FIRST_ONE	0xFFFF2923
-#	define  SECOND_ONE	0xFFFFFF25
-#endif
-
-int main(int argc, char **argv)
-{
-	int		fd;
-	header_struct	*header;
-	gd_addr		*addr;
-	gd_region	*region;
-	gd_segment	*segment;
-	uint4		size;
-	int		i, alloc, extend, block, global, key, lock, record;
-	ZOS_ONLY(int	realfiletag;)
-
-	argv++;
-	alloc = 100;
-	extend = 100;
-	block = 1024;
-	global = 128;
-	lock = 20;
-	record = 256;
-	key = 64;
-	for (i = argc; i > 1; i--)
-	{
-		if (argv[0][0] != '-' || argv[0][1] == 'h')
-		{
-			PRINTF("syntax is dtgbldir [-abegklr] with each qualifier followed by a number\n");
-			PRINTF("and separated by spaces. i.e. dtgbldir -a100 -b2048 -l30\n");
-			PRINTF("-a is alloc [100]     -b is block size [1024] -e is ext [100]\n");
-			PRINTF("-g is glo buff [128]  -k is keysize [64]      -l is lock [20]\n");
-			PRINTF("-r is rec size [256]  -h prints this message\n");
-			PRINTF("The global directory is created as ./mumps.gld\n");
-			return 0;
-		}
-		switch (argv[0][1])
-		{
-			case 'a':	if (-1 == (alloc = asc2i((uchar_ptr_t)&argv[0][2],STRLEN(argv[0]) - 2)))
-					{
-						PRINTF("Invalid value for -a: %s\n", &argv[0][2]);
-						return 0;
-					}
-					break;
-			case 'b':	if (-1 == (block = asc2i((uchar_ptr_t)&argv[0][2],STRLEN(argv[0]) - 2)))
-					{
-						PRINTF("Invalid value for -b: %s\n", &argv[0][2]);
-						return 0;
-					}
-					break;
-			case 'e':	if (-1 == (extend = asc2i((uchar_ptr_t)&argv[0][2],STRLEN(argv[0]) - 2)))
-					{
-						PRINTF("Invalid value for -e: %s\n", &argv[0][2]);
-						return 0;
-					}
-					break;
-			case 'g':	if (-1 == (global = asc2i((uchar_ptr_t)&argv[0][2], STRLEN(argv[0]) - 2)))
-					{
-						PRINTF("Invalid value for -g: %s\n", &argv[0][2]);
-						return 0;
-					}
-					break;
-			case 'k':	if (-1 == (key = asc2i((uchar_ptr_t)&argv[0][2], STRLEN(argv[0]) - 2)))
-					{
-						PRINTF("Invalid value for -k: %s\n", &argv[0][2]);
-						return 0;
-					}
-					break;
-			case 'l':	if (-1 == (lock = asc2i((uchar_ptr_t)&argv[0][2], STRLEN(argv[0]) - 2)))
-					{
-						PRINTF("Invalid value for -l: %s\n", &argv[0][2]);
-						return 0;
-					}
-					break;
-			case 'r':	if (-1 == (record = asc2i((uchar_ptr_t)&argv[0][2], STRLEN(argv[0]) - 2)))
-					{
-						PRINTF("Invalid value for -r: %s\n", &argv[0][2]);
-						return 0;
-					}
-					break;
-			default:	PRINTF("unrecognized qualifier %s\n",argv[0]);
-					return 0;
-		}
-		argv++;
-	}
-	if (argc == 1)
-	{
-		PRINTF("syntax is dtgbldir [-abegklr] with each qualifier followed by a number\n");
-		PRINTF("and separated by spaces. i.e. dtgbldir -a100 -b2048 -l30\n");
-		PRINTF("-a is alloc [100]     -b is block size [1024] -e is ext [100]\n");
-		PRINTF("-g is glo buff [128]  -k is keysize [64]      -l is lock [20]\n");
-		PRINTF("-r is rec size [256]  -h prints this message\n");
-		PRINTF("The global directory is created as ./mumps.gld\n");
-		PRINTF("\n\nCreating default global directory\n");
-	}
-	if (record > (block / 2) - 4)
-	{
-		PRINTF("Record size %d is too large, block size %d will only support record size of %d\n",
-			record, block, (block / 2) - 4);
-		return 0;
-	}
-	if (key >= record)
-	{
-		PRINTF("Key size %d is too large, record size %d will only support key size of %d\n",
-			key, record, record - 1);
-		return 0;
-	}
-
-	if (lock > 100 || lock < 4)
-	{
-		PRINTF("Lock size %d is invalid, must be between 4 and 100\n", lock);
-		return 0;
-	}
-
-	if (block % DISK_BLOCK_SIZE)
-	{
-		PRINTF("Block size %d is invalid, must be a multiple of %d\n", block, DISK_BLOCK_SIZE);
-		return 0;
-	}
-
-	if (global < 64 || global > 4096)
-	{
-		PRINTF("Global value %d is invalid, must be between 64 and 4096\n", global);
-		return 0;
-	}
-	if (FD_INVALID == (fd = OPEN3("./mumps.gld", O_CREAT | O_EXCL | O_RDWR, 0600)))
-	{
-		PERROR("Error opening file");
-		return 0;
-	}
-#if defined(__MVS__)
-	if (-1 == gtm_zos_set_tag(fd, TAG_BINARY, TAG_NOTTEXT, TAG_FORCE, &realfiletag))
-		PERROR("Error tagging file with TAG_BINARY");
-#endif
-
-	DUMMY_GLD_INIT(header, addr, region, segment, size, RELATIVE_OFFSET_TRUE);
-	/* the above macro invocation initializes "header", "addr", "region", "segment" and "size" */
-	region->dyn.offset = (int4)(INTPTR_T)addr->segments;
-	region->max_rec_size = record;
-	region->max_key_size = key;
-	region->open = region->lock_write = region->null_subs = region->jnl_state = 0;
-	region->jnl_alq = 0x64;
-	region->jnl_deq = 0x64;
-	region->jnl_buffer_size = 0x80;
-	region->jnl_before_image = 1;
-	region->jnl_file_len = region->node = region->cmx_regnum = 0;
-	region->sec_size = 0;
-
-	segment->sname_len = 7;
-	memcpy(segment->sname,"DEFAULT",7);
-	memcpy(segment->fname,"mumps.dat",9);
-	segment->fname_len = 9;
-	segment->blk_size = block;
-	segment->allocation = alloc;
-	segment->ext_blk_count = extend;
-	segment->cm_blk = 0;
-	segment->lock_space = lock;
-	memcpy(segment->defext,".DAT",4);
-	segment->global_buffers = global;
-	segment->buckets = 0;
-	segment->windows = 0;
-	segment->acc_meth = dba_bg;
-	segment->defer_time = 0;
-	segment->file_cntl = 0;
-
-	if (lseek(fd, (off_t)0, SEEK_SET))
-	{
-		PERROR("Error seeking on file");
-		return 0;
-	}
-	if (write(fd, header, size) != size)
-	{
-		PERROR("Error writing to file");
-		return 0;
-	}
-	return 1;
-}
-
diff --git a/sr_unix/err_init.c b/sr_unix/err_init.c
index 012e274..9310c95 100755
--- a/sr_unix/err_init.c
+++ b/sr_unix/err_init.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -15,6 +15,8 @@
 #include <sys/types.h>
 #include <setjmp.h>
 #include <errno.h>
+#include "gtm_string.h"
+
 #include "unistd.h"
 #include "gtm_stdlib.h"
 #include "gtm_stdio.h"
@@ -27,10 +29,11 @@
 #include "eintr_wrappers.h"
 
 #define	COREDUMPFILTERFN	"/proc/%i/coredump_filter"
-#define FILTERPARMSIZE		(8 + 1)
-#define FILTERENABLEBITS	0x00000073			/* Represents bits 0, 1, 4, 5, 6 */
+#define FILTERPARMSIZE		(7 + 2 + 1)			/* 7 bytes for number, 2 bytes for 0x, and 1 null terminator */
+#define FILTERENABLEBITS	0x0000073			/* Bits 0, 1, 4, 5, 6 - 32-bit can only handle 10 bytes total */
 
 GBLREF enum gtmImageTypes	image_type;
+GBLDEF char                    **gtmenvp;
 
 error_def(ERR_SYSCALL);
 
@@ -40,6 +43,14 @@ error_def(ERR_SYSCALL);
  */
 void err_init(void (*x)())
 {
+#	ifdef __linux__
+	int		rc;
+	unsigned int	filterbits;
+	char		procfn[SIZEOF(COREDUMPFILTERFN) + MAX_DIGITS_IN_INT];	/* File name of file to update */
+	char		filter[FILTERPARMSIZE], *filterend;			/* Value read in & written out */
+	char		*rcc, *bytes_buf;
+	FILE		*filterstrm;						/* filter stream file block */
+#	endif
 	chnd = (condition_handler *)malloc((CONDSTK_INITIAL_INCR + CONDSTK_RESERVE) * SIZEOF(condition_handler));
 	chnd[0].ch_active = FALSE;
 	chnd[0].save_active_ch = NULL;
@@ -57,71 +68,78 @@ void err_init(void (*x)())
 	 * kernel supports the ELF loader or not. To date, all Linux flavors GT.M supports use ELF so we regard this as largely
 	 * mandatory though in the future it may happen that GT.M works yet runs with something other than ELF. In that case,
 	 * we'd need to change the below to avoid the operator log messages every time GT.M initializes.
+	 *
+	 * Note use simple basic methods since this early in initialization not everything is necessarily setup to
+	 * be able to properly use the *print*() wrapper functions.
+	 *
 	 */
+	bytes_buf = GETENV("gtm_coredump_filter");
+	if ((NULL == bytes_buf) || (0 != strncmp("-1", bytes_buf, 3)))
 	{
-		int 		rc;
-		unsigned int	filterbits;
-		char		procfn[SIZEOF(COREDUMPFILTERFN) + MAX_DIGITS_IN_INT];	/* File name of file to update */
-		char		filter[FILTERPARMSIZE], *filterend;			/* Value read in & written out */
-		char		*rcc;
-		FILE		*filterstrm;						/* filter stream file block */
 
-		/* Note use simple basic methods since this early in initialization not everything is necessarily setup to
-		 * be able to properly use the *print*() wrapper functions.
-		 */
 		rc = snprintf(procfn, SIZEOF(procfn), COREDUMPFILTERFN, getpid());
 		if (0 > rc)
 		{
 			send_msg_csa(CSA_ARG(NULL) VARLSTCNT(8) ERR_SYSCALL, 5, RTS_ERROR_LITERAL("sprintf()"), CALLFROM, rc);
 			return;
 		}
-		Fopen(filterstrm, procfn, "r");
-		if (NULL == filterstrm)
+		if (NULL == bytes_buf)
 		{
-			rc = errno;
-			send_msg_csa(CSA_ARG(NULL) VARLSTCNT(8) ERR_SYSCALL, 5, RTS_ERROR_LITERAL("fopen()"), CALLFROM, rc);
-			return;
-		}
-		rcc = fgets(filter, SIZEOF(filter), filterstrm);
-		if (NULL == rcc)
-		{
-			send_msg_csa(CSA_ARG(NULL) VARLSTCNT(8) ERR_SYSCALL, 5, RTS_ERROR_LITERAL("fgets()"), CALLFROM, rc);
-			return;
-		}
-		FCLOSE(filterstrm, rc);
-		if (0 > rc)
-		{
-			send_msg_csa(CSA_ARG(NULL) VARLSTCNT(8) ERR_SYSCALL, 5, RTS_ERROR_LITERAL("fclose()"), CALLFROM, rc);
-			return;
-		}
-		filterend = filter + SIZEOF(filter);
-		filterbits = (unsigned int)strtol(filter, &filterend, 16);
-		if (FILTERENABLEBITS != (filterbits & FILTERENABLEBITS))
-		{	/* At least one flag was missing - reset them */
-			filterbits = filterbits | FILTERENABLEBITS;
-			Fopen(filterstrm, procfn, "w");
+			/* If $gtm_coredump_filter is not defined, set the filter to provide a full dump  including huge pages */
+			Fopen(filterstrm, procfn, "r");
 			if (NULL == filterstrm)
 			{
 				rc = errno;
-				send_msg_csa(CSA_ARG(NULL) VARLSTCNT(8) ERR_SYSCALL, 5, RTS_ERROR_LITERAL("fopen()"),
-					     CALLFROM, rc);
+				send_msg_csa(CSA_ARG(NULL) VARLSTCNT(8) ERR_SYSCALL, 5,
+						RTS_ERROR_LITERAL("fopen()"), CALLFROM, rc);
 				return;
 			}
-			rc = fprintf(filterstrm, "0x%08x", filterbits);
-			if (0 > rc)
+			rcc = fgets(filter, SIZEOF(filter), filterstrm);
+			if (NULL == rcc)
 			{
-				send_msg_csa(CSA_ARG(NULL) VARLSTCNT(8) ERR_SYSCALL, 5, RTS_ERROR_LITERAL("fprintf"),
-					     CALLFROM, rc);
+				send_msg_csa(CSA_ARG(NULL) VARLSTCNT(8) ERR_SYSCALL, 5,
+						RTS_ERROR_LITERAL("fgets()"), CALLFROM, rc);
 				return;
 			}
 			FCLOSE(filterstrm, rc);
 			if (0 > rc)
 			{
-				send_msg_csa(CSA_ARG(NULL) VARLSTCNT(8) ERR_SYSCALL, 5, RTS_ERROR_LITERAL("fclose()"),
-					     CALLFROM, rc);
+				send_msg_csa(CSA_ARG(NULL) VARLSTCNT(8) ERR_SYSCALL, 5,
+						RTS_ERROR_LITERAL("fclose()"), CALLFROM, rc);
 				return;
 			}
+			filterend = filter + SIZEOF(filter);
+			filterbits = (unsigned int)strtol(filter, &filterend, 16);
+			if (FILTERENABLEBITS != (filterbits & FILTERENABLEBITS))
+			{	/* At least one flag was missing - reset them */
+				filterbits = filterbits | FILTERENABLEBITS;
+			}
+			snprintf(filter, FILTERPARMSIZE, "0x%07x", filterbits);
+			bytes_buf = filter;
 		}
+		Fopen(filterstrm, procfn, "w");
+		if (NULL == filterstrm)
+		{
+			rc = errno;
+			send_msg_csa(CSA_ARG(NULL) VARLSTCNT(8) ERR_SYSCALL, 5, RTS_ERROR_LITERAL("fopen()"),
+				     CALLFROM, rc);
+			return;
+		}
+		rc = fprintf(filterstrm, "%s", bytes_buf);
+		if (0 > rc)
+		{
+			send_msg_csa(CSA_ARG(NULL) VARLSTCNT(8) ERR_SYSCALL, 5, RTS_ERROR_LITERAL("fprintf"),
+				     CALLFROM, rc);
+			return;
+		}
+		FCLOSE(filterstrm, rc);
+		if (0 > rc)
+		{
+			send_msg_csa(CSA_ARG(NULL) VARLSTCNT(8) ERR_SYSCALL, 5, RTS_ERROR_LITERAL("fclose()"),
+				     CALLFROM, rc);
+			return;
+		}
+
 	}
 #	endif
 }
diff --git a/sr_unix/errorsp.h b/sr_unix/errorsp.h
index 9344855..f04d9f8 100644
--- a/sr_unix/errorsp.h
+++ b/sr_unix/errorsp.h
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -408,8 +408,11 @@ MBSTART {													\
 					CONTINUE;							\
 				}
 
-/* Should never unwind a condition handler established with ESTABLISH_NOUNWIND. Currently t_ch and dbinit_ch are the only ones. */
-#define UNWINDABLE(unw_ch)	((&t_ch != unw_ch->ch) && (&dbinit_ch != unw_ch->ch))
+/* Should never unwind a condition handler established with ESTABLISH_NOUNWIND. Currently t_ch and dbinit_ch are the only ones.
+ * Use function pointer (t_ch_fnptr global variable) instead of &tch (and likewise for dbinit_ch) as it will otherwise bloat
+ * executables that don't need to pull in t_ch/dbinit_ch (e.g. ftok/gtcm_shmclean/dbcertify).
+ */
+#define UNWINDABLE(unw_ch)	((t_ch_fnptr != unw_ch->ch) && (dbinit_ch_fnptr != unw_ch->ch))
 /* Note, since we are not initially changing the assembler ESTABLISH version to also include deferring/enabling of interrupts,
  * we cannot leave the interrupt block in effect during the longjmp(). But once that support is in place, we can do away with
  * re-enabling interrupts and let the longjmp() return from setjmp() take care of it.
@@ -419,6 +422,8 @@ MBSTART {													\
 					GBLREF	boolean_t		ok_to_UNWIND_in_exit_handling;				\
 					GBLREF	volatile boolean_t	in_wcs_recover;						\
 					GBLREF	uint4			dollar_tlevel;						\
+					GBLREF	ch_ret_type		(*t_ch_fnptr)();      /* Function pointer to t_ch */	\
+					GBLREF	ch_ret_type		(*dbinit_ch_fnptr)();/* Function pointer to dbinit_ch */\
 																\
 					intrpt_state_t			prev_intrpt_state;					\
 																\
@@ -474,8 +479,10 @@ MBSTART {													\
 	ENABLE_INTERRUPTS(INTRPT_IN_CONDSTK, prev_intrpt_state);					\
 	DBGEHND((stderr, "%s: Condition handler entered at line %d - arg: %d  SIGNAL: %d\n",		\
 		 __FILE__, __LINE__, arg, SIGNAL));							\
-	if ((continue_on_success) && ((SUCCESS == SEVERITY) || (INFO == SEVERITY)			\
-		&& ((int)ERR_CTRLY != SIGNAL) && ((int)ERR_CTRLC != SIGNAL)))				\
+	if ((continue_on_success)									\
+		&& ((SUCCESS == SEVERITY)								\
+			|| ((INFO == SEVERITY) && ((int)ERR_CTRLY != SIGNAL)				\
+				&& ((int)ERR_CTRLC != SIGNAL))))					\
 	{												\
 		if (ctrlc_on || !IS_GTM_IMAGE)								\
 			PRN_ERROR;									\
@@ -534,7 +541,7 @@ error_def(ERR_OUTOFSPACE);
 #define DUMPABLE                ((SEVERITY == SEVERE) && IS_GTM_ERROR(SIGNAL)						\
 					&& (SIGNAL != (int)ERR_OUTOFSPACE)						\
 					DEBUG_ONLY(&& (WBTEST_ENABLED(WBTEST_SKIP_CORE_FOR_MEMORY_ERROR)		\
-							? (!process_exiting || (SIGNAL != (int)ERR_MEMORY)) : TRUE)))
+							? (SIGNAL != (int)ERR_MEMORY) : TRUE)))
 
 unsigned char *set_zstatus(mstr *src, int arg, unsigned char **ctxtp, boolean_t need_rtsloc);
 
@@ -601,6 +608,8 @@ CONDITION_HANDLER(gvcst_spr_queryget_ch);
 CONDITION_HANDLER(op_fnzpeek_ch);
 CONDITION_HANDLER(op_fnzpeek_getpool_ch);
 
+CONDITION_HANDLER(timer_cancel_ch);
+
 CONDITION_HANDLER(trigger_upgrade_ch);
 
 #endif
diff --git a/sr_unix/exttab_parse.c b/sr_unix/exttab_parse.c
index 5a235e5..c920b02 100644
--- a/sr_unix/exttab_parse.c
+++ b/sr_unix/exttab_parse.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -87,9 +87,9 @@ const int parm_space_needed[] =
 	SIZEOF(gtm_long_t *) + SIZEOF(gtm_long_t),
 	SIZEOF(gtm_float_t *) + SIZEOF(gtm_float_t),
 	SIZEOF(gtm_double_t *) + SIZEOF(gtm_double_t),
-	SIZEOF(gtm_string_t *) + SIZEOF(gtm_string_t),
-	SIZEOF(gtm_string_t *) + SIZEOF(gtm_string_t),
-	SIZEOF(gtm_string_t *) + SIZEOF(gtm_string_t)
+	SIZEOF(gtm_string_t),  /* gtm_string_t contains a (gtm_long_t) and (gtm_char_t *) */
+	SIZEOF(gtm_string_t),
+	SIZEOF(gtm_string_t)
 };
 
 error_def(ERR_CIDIRECTIVE);
diff --git a/sr_unix/fake_enospc.c b/sr_unix/fake_enospc.c
index ae13b8a..95298b5 100644
--- a/sr_unix/fake_enospc.c
+++ b/sr_unix/fake_enospc.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2014 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -33,23 +34,19 @@
 #endif
 #include "fake_enospc.h"
 #ifdef DEBUG
-GBLREF		boolean_t	is_jnlpool_creator;	/* The purpose of this check is to assign only one process responsible of
-							 * setting fake ENOSPC flags. If we had multiple processes messing with,
-							 * FREEZE the test would freeze more often and eventually do nothing but
-							 * freeze.
-							 */
 GBLREF		jnlpool_addrs	jnlpool;
 GBLREF		volatile int4	gtmMallocDepth;
-GBLREF		volatile uint4	heartbeat_counter;
 
-STATICDEF	uint4		next_heartbeat_counter = 1; /* the heartbeat_counter at which enospc manipulations need to happen */
 STATICDEF	uint4		syslog_deferred = 0;
 
 error_def(ERR_TEXT);
 error_def(ERR_FAKENOSPCLEARED);
 
-#define ENOSPC_FROZEN_DURATION		2				/* 16 seconds */
-#define ENOSPC_UNFROZEN_DURATION	(2 * (rand() % 120 + 1))	/* 16 seconds to 32 minutes */
+#define ENOSPC_FROZEN_DURATION		(16 * MILLISECS_IN_SEC)
+#define ENOSPC_UNFROZEN_DURATION	(16 * MILLISECS_IN_SEC * ((rand() % 120) + 1))	/* 16 seconds to 32 minutes */
+#define ENOSPC_GDWAIT_INTERVAL		(2 * MILLISECS_IN_SEC)
+#define ENOSPC_RETRY_INTERVAL		MILLISECS_IN_SEC
+#define DEFERRED_SYSLOG_INTERVAL	MILLISECS_IN_SEC
 #define MAX_REGIONS			50
 #define	NONE				0				/* 1/2 probablility */
 #define	DB_ON				1				/* 1/6 probablility */
@@ -58,10 +55,19 @@ error_def(ERR_FAKENOSPCLEARED);
 #define MAX_ENOSPC_TARGET		4
 #endif
 
-void fake_enospc()
+/* This is a debug-only timer routine which is run within the source server that creates the journal pool.
+ * It randomly sets flags indicating that writes to database files and/or journal files within the instance
+ * should return an ENOSPC error, expecting that the custom error retry processing will handle it seamlessly
+ * when it later clears the flags.
+ * The routine logs its activities to the syslog. If the timer fires in a context in which it is not safe
+ * to send a message to the syslog, it starts a handle_deferred_syslog timer (below) to attempt to send the
+ * syslog message at a future time.
+ */
+void fake_enospc(void)
 {
 #	ifdef DEBUG
-	boolean_t	ok_to_interrupt, is_time_to_act;
+	boolean_t	ok_to_interrupt;
+	uint4		deferred_count;
 	char		enospc_enable_list[MAX_REGIONS];
 	const char	*syslog_msg;
 	gd_addr		*addr_ptr;
@@ -71,89 +77,120 @@ void fake_enospc()
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
-	if (TREF(gtm_test_fake_enospc) && is_jnlpool_creator && CUSTOM_ERRORS_LOADED)
+	ok_to_interrupt = (INTRPT_OK_TO_INTERRUPT == intrpt_ok_state) && (0 == gtmMallocDepth);
+	if (syslog_deferred && ok_to_interrupt)
 	{
-		ok_to_interrupt = (INTRPT_OK_TO_INTERRUPT == intrpt_ok_state) && (0 == gtmMallocDepth);
-		is_time_to_act = (next_heartbeat_counter == heartbeat_counter);
-		if (syslog_deferred && ok_to_interrupt)
+		cancel_timer((TID)&syslog_deferred);
+		deferred_count = syslog_deferred;
+		syslog_deferred = 0;
+		send_msg_csa(CSA_ARG(NULL) VARLSTCNT(3) ERR_FAKENOSPCLEARED, 1, deferred_count);
+	}
+	if (syslog_deferred || (!ok_to_interrupt && !IS_REPL_INST_FROZEN) || !CUSTOM_ERRORS_LOADED)
+	{	/* We have to skip this because we have just fallen into deferred zone or we are currently in it */
+		/* Try again in a second */
+		start_timer((TID)fake_enospc, ENOSPC_RETRY_INTERVAL, fake_enospc, 0, NULL);
+		return;
+	}
+	assert(0 == syslog_deferred);
+	addr_ptr = get_next_gdr(NULL);
+	if (NULL == addr_ptr) /* Ensure that there is a global directory to operate on. */
+	{
+		start_timer((TID)fake_enospc, ENOSPC_GDWAIT_INTERVAL, fake_enospc, 0, NULL);
+		return;
+	}
+	assert(NULL == get_next_gdr(addr_ptr));
+	/* Randomly simulate ENOSPC or free space. NO more than 50 regions are allowed to avoid unnecessary
+	 * malloc/frees in debug-only code
+	 */
+	assert(MAX_REGIONS >= addr_ptr->n_regions);
+	if (!IS_REPL_INST_FROZEN)
+	{	/* We are in an UNFROZEN state, and about to be FROZEN due to ENOSPC */
+		assert(MAX_REGIONS >= addr_ptr->n_regions);
+		for (i = 0; i < addr_ptr->n_regions; i++)
 		{
-			send_msg_csa(CSA_ARG(NULL) VARLSTCNT(3) ERR_FAKENOSPCLEARED, 1, (heartbeat_counter - syslog_deferred));
-			syslog_deferred = 0;
-		}
-		if (!is_time_to_act || syslog_deferred || (!ok_to_interrupt && !IS_REPL_INST_FROZEN))
-		{	/* We have to skip this because we have just fallen into deferred zone or we are currently in it */
-			if (is_time_to_act)
-				next_heartbeat_counter++;  /* Try again in the next heartbeat */
-			return;
+			if (rand() % 2) /* Should we trigger fake ENOSPC on this region */
+				enospc_enable_list[i] = rand() % (MAX_ENOSPC_TARGET - 1) + 1; /* What kind? */
+			else
+				enospc_enable_list[i] = NONE;
 		}
-		assert(0 == syslog_deferred);
-		srand(time(NULL));
-		addr_ptr = get_next_gdr(NULL);
-		if (NULL == addr_ptr) /* Ensure that there is a global directory to operate on. */
-			return;
-		assert(NULL == get_next_gdr(addr_ptr));
-		/* Randomly simulate ENOSPC or free space. NO more than 50 regions are allowed to avoid unnecessary
-		 * malloc/frees in debug-only code
-		 */
-		assert(MAX_REGIONS >= addr_ptr->n_regions);
-		if (!IS_REPL_INST_FROZEN)
-		{	/* We are in an UNFROZEN state, and about to be FROZEN due to ENOSPC */
-			assert(MAX_REGIONS >= addr_ptr->n_regions);
-			for (i = 0; i < addr_ptr->n_regions; i++)
-			{
-				if (rand() % 2) /* Should we trigger fake ENOSPC on this region */
-					enospc_enable_list[i] = rand() % (MAX_ENOSPC_TARGET - 1) + 1; /* What kind? */
-				else
-					enospc_enable_list[i] = NONE;
-			}
-			next_heartbeat_counter = heartbeat_counter + ENOSPC_FROZEN_DURATION;
-		} else
-		{	/* We are in a FROZEN state, and about to be UNFROZEN due to free space */
-			memset(enospc_enable_list, 0, MAX_REGIONS);
-			next_heartbeat_counter = heartbeat_counter + ENOSPC_UNFROZEN_DURATION;
-			if (!ok_to_interrupt)
-				syslog_deferred = heartbeat_counter;
+		start_timer((TID)fake_enospc, ENOSPC_FROZEN_DURATION, fake_enospc, 0, NULL);
+	} else
+	{	/* We are in a FROZEN state, and about to be UNFROZEN due to free space */
+		memset(enospc_enable_list, 0, MAX_REGIONS);
+		if (!ok_to_interrupt)
+		{
+			syslog_deferred = 1;
+			start_timer((TID)&syslog_deferred, DEFERRED_SYSLOG_INTERVAL, handle_deferred_syslog, 0, NULL);
 		}
-		for (r_local = addr_ptr->regions, r_top = r_local + addr_ptr->n_regions, i = 0; r_local < r_top; r_local++, i++)
+		start_timer((TID)fake_enospc, ENOSPC_UNFROZEN_DURATION, fake_enospc, 0, NULL);
+	}
+	for (r_local = addr_ptr->regions, r_top = r_local + addr_ptr->n_regions, i = 0; r_local < r_top; r_local++, i++)
+	{
+		if (!IS_REG_BG_OR_MM(r_local))
+			continue;
+		csa = REG2CSA(r_local);
+		if ((NULL != csa) && (NULL != csa->nl) && INST_FREEZE_ON_NOSPC_ENABLED(csa))
 		{
-			if ((dba_bg != r_local->dyn.addr->acc_meth) && (dba_mm != r_local->dyn.addr->acc_meth))
-				continue;
-			csa = REG2CSA(r_local);
-			if ((NULL != csa) && (NULL != csa->nl) && INST_FREEZE_ON_NOSPC_ENABLED(csa))
+			syslog_msg = NULL;
+			switch(enospc_enable_list[i])
 			{
-				syslog_msg = NULL;
-				switch(enospc_enable_list[i])
+			case NONE:
+				if (csa->nl->fake_db_enospc || csa->nl->fake_jnl_enospc)
 				{
-				case NONE:
-					if (csa->nl->fake_db_enospc || csa->nl->fake_jnl_enospc)
-					{
-						syslog_msg = "Turning off fake ENOSPC for both database and journal file.";
-						csa->nl->fake_db_enospc = FALSE;
-						csa->nl->fake_jnl_enospc = FALSE;
-					}
-					break;
-				case DB_ON:
-					syslog_msg = "Turning on fake ENOSPC only for database file.";
-					csa->nl->fake_db_enospc = TRUE;
-					csa->nl->fake_jnl_enospc = FALSE;
-					break;
-				case JNL_ON:
-					syslog_msg = "Turning on fake ENOSPC only for journal file.";
+					syslog_msg = "Turning off fake ENOSPC for both database and journal file.";
 					csa->nl->fake_db_enospc = FALSE;
-					csa->nl->fake_jnl_enospc = TRUE;
-					break;
-				case DB_AND_JNL_ON:
-					syslog_msg = "Turning on fake ENOSPC for both database and journal file.";
-					csa->nl->fake_db_enospc = TRUE;
-					csa->nl->fake_jnl_enospc = TRUE;
-					break;
-				default:
-					assert(FALSE);
+					csa->nl->fake_jnl_enospc = FALSE;
 				}
-				if (ok_to_interrupt && (NULL != syslog_msg))
-					send_msg_csa(CSA_ARG(NULL) VARLSTCNT(8) ERR_TEXT, 2, DB_LEN_STR(r_local), ERR_TEXT, 2,
-						LEN_AND_STR(syslog_msg));
+				break;
+			case DB_ON:
+				syslog_msg = "Turning on fake ENOSPC only for database file.";
+				csa->nl->fake_db_enospc = TRUE;
+				csa->nl->fake_jnl_enospc = FALSE;
+				break;
+			case JNL_ON:
+				syslog_msg = "Turning on fake ENOSPC only for journal file.";
+				csa->nl->fake_db_enospc = FALSE;
+				csa->nl->fake_jnl_enospc = TRUE;
+				break;
+			case DB_AND_JNL_ON:
+				syslog_msg = "Turning on fake ENOSPC for both database and journal file.";
+				csa->nl->fake_db_enospc = TRUE;
+				csa->nl->fake_jnl_enospc = TRUE;
+				break;
+			default:
+				assert(FALSE);
+				break;				/* NOTREACHED */
 			}
+			if (ok_to_interrupt && (NULL != syslog_msg))
+				send_msg_csa(CSA_ARG(NULL) VARLSTCNT(8) ERR_TEXT, 2, DB_LEN_STR(r_local), ERR_TEXT, 2,
+					LEN_AND_STR(syslog_msg));
+		}
+	}
+
+#	endif
+	return;
+}
+
+/* This is a timer routine used by fake_enospc, above. */
+void handle_deferred_syslog(void)
+{
+#	ifdef DEBUG
+	boolean_t	ok_to_interrupt;
+	uint4		deferred_count;
+
+	if (syslog_deferred)
+	{
+		ok_to_interrupt = (INTRPT_OK_TO_INTERRUPT == intrpt_ok_state) && (0 == gtmMallocDepth);
+		if (ok_to_interrupt)
+		{
+			deferred_count = syslog_deferred;
+			syslog_deferred = 0;
+			send_msg_csa(CSA_ARG(NULL) VARLSTCNT(3) ERR_FAKENOSPCLEARED, 1, deferred_count);
+		}
+		else
+		{
+			syslog_deferred++;
+			start_timer((TID)&syslog_deferred, DEFERRED_SYSLOG_INTERVAL, handle_deferred_syslog, 0, NULL);
 		}
 	}
 #	endif
diff --git a/sr_unix/fake_enospc.h b/sr_unix/fake_enospc.h
index 5832f07..6a682b2 100644
--- a/sr_unix/fake_enospc.h
+++ b/sr_unix/fake_enospc.h
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2014 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -12,5 +13,8 @@
 #ifndef _FAKE_ENOSPC_H
 #define _FAKE_ENOSPC_H
 
+#define ENOSPC_INIT_DURATION	(8 * MILLISECS_IN_SEC)
+
 void fake_enospc(void);
+void handle_deferred_syslog(void);
 #endif
diff --git a/sr_unix/file_head_read.c b/sr_unix/file_head_read.c
index a6eb2c9..4de6022 100755
--- a/sr_unix/file_head_read.c
+++ b/sr_unix/file_head_read.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2009 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -33,6 +34,10 @@
 #include "gtm_zos_io.h"
 #endif
 
+error_def(ERR_DBFILOPERR);
+error_def(ERR_DBNOTGDS);
+error_def(ERR_TEXT);
+
 /*
  * This is a plain way to read file header.
  * User needs to take care of concurrency issue etc.
@@ -47,51 +52,46 @@ boolean_t file_head_read(char *fn, sgmnt_data_ptr_t header, int4 len)
 	struct stat	stat_buf;
 	ZOS_ONLY(int	realfiletag;)
 
-	error_def(ERR_DBFILOPERR);
-	error_def(ERR_DBNOTGDS);
-	error_def(ERR_TEXT);
-	ZOS_ONLY(error_def(ERR_BADTAG);)
-
 	header_size = SIZEOF(sgmnt_data);
-	OPENFILE(fn, O_RDONLY, fd);
+	OPENFILE(fn, O_RDONLY, fd);	/* udi not available so OPENFILE_DB not used */
 	if (FD_INVALID == fd)
 	{
 		save_errno = errno;
-		gtm_putmsg(VARLSTCNT(5) ERR_DBFILOPERR, 2, LEN_AND_STR(fn), save_errno);
+		gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(5) ERR_DBFILOPERR, 2, LEN_AND_STR(fn), save_errno);
 		return FALSE;
 	}
-#ifdef __MVS__
+#	ifdef __MVS__
 	if (-1 == gtm_zos_tag_to_policy(fd, TAG_BINARY, &realfiletag))
 		TAG_POLICY_GTM_PUTMSG(fn, errno, realfiletag, TAG_BINARY);
-#endif
+#	endif
 	FSTAT_FILE(fd, &stat_buf, save_errno);
 	if (-1 == save_errno)
 	{
 		save_errno = errno;
-		gtm_putmsg(VARLSTCNT(5) ERR_DBFILOPERR, 2, LEN_AND_STR(fn), save_errno);
+		gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(5) ERR_DBFILOPERR, 2, LEN_AND_STR(fn), save_errno);
  		CLOSEFILE_RESET(fd, save_errno);	/* resets "fd" to FD_INVALID */
 		return FALSE;
 	}
 	if (!S_ISREG(stat_buf.st_mode) || stat_buf.st_size < header_size)
 	{
-		gtm_putmsg(VARLSTCNT(4) ERR_DBNOTGDS, 2, LEN_AND_STR(fn));
+		gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_DBNOTGDS, 2, LEN_AND_STR(fn));
  		CLOSEFILE_RESET(fd, save_errno);	/* resets "fd" to FD_INVALID */
 		return FALSE;
 	}
 	LSEEKREAD(fd, 0, header, header_size, save_errno);
 	if (0 != save_errno)
 	{
-		gtm_putmsg(VARLSTCNT(5) ERR_DBFILOPERR, 2, LEN_AND_STR(fn), save_errno);
+		gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(5) ERR_DBFILOPERR, 2, LEN_AND_STR(fn), save_errno);
  		CLOSEFILE_RESET(fd, save_errno);	/* resets "fd" to FD_INVALID */
 		return FALSE;
 	}
 	if (memcmp(header->label, GDS_LABEL, GDS_LABEL_SZ - 1))
 	{
-		gtm_putmsg(VARLSTCNT(4) ERR_DBNOTGDS, 2, LEN_AND_STR(fn));
+		gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_DBNOTGDS, 2, LEN_AND_STR(fn));
  		CLOSEFILE_RESET(fd, save_errno);	/* resets "fd" to FD_INVALID */
 		return FALSE;
 	}
-	CHECK_DB_ENDIAN(header, strlen(fn), fn);
+	CHECK_DB_ENDIAN(header, strlen(fn), fn);	/* BYPASSOK */
 	assert(MASTER_MAP_SIZE_MAX >= MASTER_MAP_SIZE(header));
 	assert(SGMNT_HDR_LEN == len || SIZEOF_FILE_HDR(header) <= len);
 	if (SIZEOF_FILE_HDR(header) <= len)
@@ -99,7 +99,7 @@ boolean_t file_head_read(char *fn, sgmnt_data_ptr_t header, int4 len)
 		LSEEKREAD(fd, ROUND_UP(SGMNT_HDR_LEN + 1, DISK_BLOCK_SIZE), MM_ADDR(header), MASTER_MAP_SIZE(header), save_errno);
 		if (0 != save_errno)
 		{
-			gtm_putmsg(VARLSTCNT(5) ERR_DBFILOPERR, 2, LEN_AND_STR(fn), save_errno);
+			gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(5) ERR_DBFILOPERR, 2, LEN_AND_STR(fn), save_errno);
 			CLOSEFILE_RESET(fd, save_errno);	/* resets "fd" to FD_INVALID */
 			return FALSE;
 		}
@@ -107,7 +107,7 @@ boolean_t file_head_read(char *fn, sgmnt_data_ptr_t header, int4 len)
 	CLOSEFILE_RESET(fd, save_errno);	/* resets "fd" to FD_INVALID */
 	if (0 != save_errno)
 	{
-		gtm_putmsg(VARLSTCNT(5) ERR_DBFILOPERR, 2, LEN_AND_STR(fn), save_errno);
+		gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(5) ERR_DBFILOPERR, 2, LEN_AND_STR(fn), save_errno);
 		return FALSE;
 	}
 	return TRUE;
diff --git a/sr_unix/file_head_write.c b/sr_unix/file_head_write.c
index c61ce83..35da69c 100755
--- a/sr_unix/file_head_write.c
+++ b/sr_unix/file_head_write.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2012 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -37,10 +38,8 @@
 error_def(ERR_DBFILOPERR);
 error_def(ERR_DBNOTGDS);
 error_def(ERR_TEXT);
-ZOS_ONLY(error_def(ERR_BADTAG);)
 
-/*
- * This is a plain way to write file header to database.
+/* This is a plain way to write file header to database.
  * User needs to take care of concurrency issue etc.
  * Parameters :
  *	fn : full name of a database file.
@@ -54,27 +53,27 @@ boolean_t file_head_write(char *fn, sgmnt_data_ptr_t header, int4 len)
 
 	header_size = (int)SIZEOF_FILE_HDR(header);
 	assert(SGMNT_HDR_LEN == len || header_size == len);
-	OPENFILE(fn, O_RDWR, fd);
+	OPENFILE(fn, O_RDWR, fd); /* udi not available so OPENFILE_DB not used */
 	if (FD_INVALID == fd)
 	{
 		save_errno = errno;
-		gtm_putmsg(VARLSTCNT(5) ERR_DBFILOPERR, 2, LEN_AND_STR(fn), save_errno);
+		gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(5) ERR_DBFILOPERR, 2, LEN_AND_STR(fn), save_errno);
 		return FALSE;
 	}
-#ifdef __MVS__
+#	ifdef __MVS__
 	if (-1 == gtm_zos_tag_to_policy(fd, TAG_BINARY, &realfiletag))
 		TAG_POLICY_GTM_PUTMSG(fn, errno, realfiletag, TAG_BINARY);
-#endif
-	DB_LSEEKWRITE(NULL, NULL, fd, 0, header, len, save_errno);
+#	endif
+	DB_LSEEKWRITE(NULL, ((unix_db_info *)NULL), NULL, fd, 0, header, len, save_errno);
 	if (0 != save_errno)
 	{
-		gtm_putmsg(VARLSTCNT(5) ERR_DBFILOPERR, 2, LEN_AND_STR(fn), save_errno);
+		gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(5) ERR_DBFILOPERR, 2, LEN_AND_STR(fn), save_errno);
 		return FALSE;
 	}
 	CLOSEFILE_RESET(fd, save_errno);	/* resets "fd" to FD_INVALID */
 	if (0 != save_errno)
 	{
-		gtm_putmsg(VARLSTCNT(5) ERR_DBFILOPERR, 2, LEN_AND_STR(fn), save_errno);
+		gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(5) ERR_DBFILOPERR, 2, LEN_AND_STR(fn), save_errno);
 		return FALSE;
 	}
 	return TRUE;
diff --git a/sr_unix/file_head_write_secshr.c b/sr_unix/file_head_write_secshr.c
deleted file mode 100644
index 2023d33..0000000
--- a/sr_unix/file_head_write_secshr.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/****************************************************************
- *								*
- *	Copyright 2012 Fidelity Information Services, Inc	*
- *								*
- *	This source code contains the intellectual property	*
- *	of its copyright holder(s), and is made available	*
- *	under a license.  If you do not know the terms of	*
- *	the license, please stop and do not read further.	*
- *								*
- ****************************************************************/
-
-#include "mdef.h"
-
-#include <errno.h>
-#include "gtm_unistd.h"
-#include "gtm_fcntl.h"
-#include "gdsroot.h"
-#include "gtm_facility.h"
-#include "fileinfo.h"
-#include "gdsbt.h"
-#include "gdsfhead.h"
-#include "filestruct.h"
-#include "gtm_stdio.h"
-#include "gtm_stdlib.h"
-#include "gtm_string.h"
-#include "gtmio.h"
-#include "iosp.h"
-#include "eintr_wrappers.h"
-#include "file_head_write.h"
-#include "gtmmsg.h"
-#ifdef __MVS__
-#include "gtm_zos_io.h"
-#endif
-
-error_def(ERR_DBFILOPERR);
-error_def(ERR_DBNOTGDS);
-error_def(ERR_TEXT);
-ZOS_ONLY(error_def(ERR_BADTAG);)
-
-/*
- * This is a plain way to write file header to database.
- * Caller needs to take care of concurrency issue etc.
- * Parameters :
- *	fn : full name of a database file.
- *	header: Pointer to database file header structure (may not be in shared memory)
- *	len: length of header to write (should be either SGMNT_HDR_LEN or SIZEOF_FILE_HDR(header))
- */
-boolean_t file_head_write_secshr(char *fn, sgmnt_data_ptr_t header, int4 len)
-{
-	int 		save_errno, fd, header_size;
-	ZOS_ONLY(int	realfiletag;)
-
-	header_size = (int)SIZEOF_FILE_HDR(header);
-	assert(SGMNT_HDR_LEN == len || header_size == len);
-	OPENFILE(fn, O_RDWR, fd);
-	if (FD_INVALID == fd)
-	{
-		save_errno = errno;
-		gtm_putmsg(VARLSTCNT(5) ERR_DBFILOPERR, 2, LEN_AND_STR(fn), save_errno);
-		return FALSE;
-	}
-#ifdef __MVS__
-	if (-1 == gtm_zos_tag_to_policy(fd, TAG_BINARY, &realfiletag))
-		TAG_POLICY_GTM_PUTMSG(fn, errno, realfiletag, TAG_BINARY);
-#endif
-	LSEEKWRITE(fd, 0, header, len, save_errno);
-	if (0 != save_errno)
-	{
-		gtm_putmsg(VARLSTCNT(5) ERR_DBFILOPERR, 2, LEN_AND_STR(fn), save_errno);
-		return FALSE;
-	}
-	CLOSEFILE_RESET(fd, save_errno);	/* resets "fd" to FD_INVALID */
-	if (0 != save_errno)
-	{
-		gtm_putmsg(VARLSTCNT(5) ERR_DBFILOPERR, 2, LEN_AND_STR(fn), save_errno);
-		return FALSE;
-	}
-	return TRUE;
-}
diff --git a/sr_unix/filestruct.h b/sr_unix/filestruct.h
index 2d86e9f..f747965 100755
--- a/sr_unix/filestruct.h
+++ b/sr_unix/filestruct.h
@@ -19,17 +19,95 @@
 #define GDS_LABEL 		GDS_LABEL_GENERIC GDS_CURR	/* This string must be of length GDS_LABEL_SZ */
 #define GDS_RPL_LABEL 		"GDSRPLUNX04" 	/* format of journal pool and receive pool (must be of length GDS_LABEL_SZ) */
 
+/* Check O_DIRECT alignment requirements for each supported platform */
+#define	DIO_ALIGNSIZE(udi)	((udi)->db_fs_block_size)
+
+#define	BUFF_IS_DIO_ALIGNED(udi, buff)	(0 == (((UINTPTR_T)(buff)) % DIO_ALIGNSIZE(udi)))
+#define	OFFSET_IS_DIO_ALIGNED(udi, off)	(0 == ((off) % DIO_ALIGNSIZE(udi)))
+#define	SIZE_IS_DIO_ALIGNED(udi, size)	(0 == ((size) % DIO_ALIGNSIZE(udi)))
+
+#define	DIO_BUFF_NO_OVERFLOW(DIO_BUFF, SIZE)										\
+	(((UINTPTR_T)(DIO_BUFF).aligned + (SIZE)) <= ((UINTPTR_T)(DIO_BUFF).unaligned + (DIO_BUFF).unaligned_size))
+
+/* DIO buffer alignment is needed in almost all cases of writing to the database file. The only exception is if
+ * we are about to create the database file AND we should not have opened the fd with O_DIRECT. Take that into account.
+ */
+#define	ASSERT_NO_DIO_ALIGN_NEEDED(UDI)	assert(in_mu_cre_file && !(UDI)->fd_opened_with_o_direct)
+
+#define	DBG_CHECK_DIO_ALIGNMENT(udi, offset, buff, size)							\
+MBSTART {													\
+	DEBUG_ONLY(DCL_THREADGBL_ACCESS);									\
+														\
+	DEBUG_ONLY(SETUP_THREADGBL_ACCESS);									\
+	assert((NULL == (udi)) || !(udi)->fd_opened_with_o_direct || (NULL != (TREF(dio_buff)).aligned));	\
+	assert((NULL == (udi)) || !(udi)->fd_opened_with_o_direct || OFFSET_IS_DIO_ALIGNED(udi, offset));	\
+	assert((NULL == (udi)) || !(udi)->fd_opened_with_o_direct || BUFF_IS_DIO_ALIGNED(udi, buff));		\
+	assert((NULL == (udi)) || !(udi)->fd_opened_with_o_direct || SIZE_IS_DIO_ALIGNED(udi, size));		\
+	/* If we are using the global variable "dio_buff.aligned", then we better not be executing in timer	\
+	 * code or in threaded code (as we have only ONE buffer to use). Assert that.				\
+	 */													\
+	assert(((TREF(dio_buff)).aligned != (char *)(buff)) || (!timer_in_handler && !multi_thread_in_use));	\
+	/* Assert that we are not exceeding allocated buffer bounds in case of "dio_buff.aligned" */		\
+	assert(((TREF(dio_buff)).aligned != (char *)(buff)) || DIO_BUFF_NO_OVERFLOW((TREF(dio_buff)), size));	\
+} MBEND
+
+typedef struct
+{
+	int	unaligned_size; /* size of allocated (and potentially) unaligned buffer */
+	char	*unaligned;	/* pointer to start of allocated buffer */
+	char	*aligned;	/* pointer to start of aligned buffer (i.e. aligned >= unaligned) */
+} dio_buff_t;
+
+#ifdef DEBUG
+GBLREF	boolean_t		in_mu_cre_file;
+GBLREF	volatile boolean_t	timer_in_handler;
+GBLREF	boolean_t		multi_thread_in_use;
+#endif
+
+/* Returns a buffer that has space to hold at least SIZE bytes where the buffer start is OS_PAGE_SIZE aligned. */
+#define	DIO_BUFF_EXPAND_IF_NEEDED(UDI, SIZE, DIO_BUFF)							\
+MBSTART {												\
+	assert(UDI->fd_opened_with_o_direct);								\
+	assert(DIO_ALIGNSIZE(UDI));									\
+	DIO_BUFF_EXPAND_IF_NEEDED_NO_UDI(SIZE, DIO_ALIGNSIZE(UDI), DIO_BUFF);				\
+} MBEND
+
+#define	DIO_BUFF_EXPAND_IF_NEEDED_NO_UDI(SIZE, ALIGNSIZE, DIO_BUFF)					\
+MBSTART {												\
+	int	needed;											\
+													\
+	needed = ROUND_UP2(SIZE, ALIGNSIZE) + OS_PAGE_SIZE;						\
+	if (needed > (DIO_BUFF)->unaligned_size)							\
+	{												\
+		if (NULL != (DIO_BUFF)->unaligned)							\
+		{											\
+			free((DIO_BUFF)->unaligned);							\
+			(DIO_BUFF)->unaligned = NULL;							\
+		}											\
+		(DIO_BUFF)->unaligned = (char *)malloc(needed);						\
+		(DIO_BUFF)->aligned = (char *)ROUND_UP2((UINTPTR_T)(DIO_BUFF)->unaligned, OS_PAGE_SIZE);\
+		(DIO_BUFF)->unaligned_size = needed;							\
+	}												\
+} MBEND
+
 typedef struct unix_db_info_struct
 {
 	sgmnt_addrs	s_addrs;
 	char		*fn;
 	int		fd;
+	gd_addr		*owning_gd;	/* Used by the linux kernel interface for AIO. As long as owning_gd
+					 * is NULL we can assume no writes to this database file on disk
+					 * have happened yet.
+					 */
 	gd_id		fileid;
 	int		semid;
 	time_t		gt_sem_ctime;
 	int		shmid;
 	time_t		gt_shm_ctime;
 	int		ftok_semid;
+        key_t           key;
+	boolean_t	raw;
+	uint4		db_fs_block_size;
 	unsigned int	shm_created : 1;
 	unsigned int	shm_deleted : 1;
 	unsigned int	sem_created : 1;
@@ -38,8 +116,7 @@ typedef struct unix_db_info_struct
 	unsigned int	grabbed_access_sem : 1;
 	unsigned int	counter_acc_incremented : 1;
 	unsigned int	counter_ftok_incremented : 1;
-        key_t           key;
-	boolean_t	raw;
+	unsigned int	fd_opened_with_o_direct : 1;	/* If dbfilop(FC_OPEN) happened with O_DIRECT */
 } unix_db_info;
 
 typedef struct unix_file_info_struct
@@ -49,11 +126,12 @@ typedef struct unix_file_info_struct
 	char	*fn;
 } unix_file_info;
 
-#define FILE_INFO(reg)	((unix_db_info *)(reg)->dyn.addr->file_cntl->file_info)
-#define FILE_ID(reg)	((unix_db_info *)(reg)->dyn.addr->file_cntl->file_info)->fileid
-#define GDS_INFO unix_db_info
-#define FI_FN(file_info)	((unix_file_info *)(file_info))->fn
-#define FI_FN_LEN(file_info)	((unix_file_info *)(file_info))->fn_len
+#define	FC2UDI(FILE_CNTL)	((unix_db_info *)(FILE_CNTL->file_info))
+#define	FILE_INFO(reg)		((unix_db_info *)(reg)->dyn.addr->file_cntl->file_info)
+#define	FILE_ID(reg)		((unix_db_info *)(reg)->dyn.addr->file_cntl->file_info)->fileid
+#define	GDS_INFO		unix_db_info
+#define	FI_FN(file_info)	((unix_file_info *)(file_info))->fn
+#define	FI_FN_LEN(file_info)	((unix_file_info *)(file_info))->fn_len
 
 #if defined(__osf__) || defined(_AIX)
 #define REG_EQUAL(fileinfo,reg) ((fileinfo)->fileid.inode == FILE_INFO(reg)->fileid.inode		\
@@ -64,21 +142,18 @@ typedef struct unix_file_info_struct
 					&& (fileinfo)->fileid.device == FILE_INFO(reg)->fileid.device)
 #endif
 
-#define WRT_STRT_PNDNG (unsigned short)65534 /* the code assumes this is non-zero, even,
-					and that VMS never uses its value for iosb.cond */
-
 #define CSD2UDI(CSD, UDI)				\
-{							\
+MBSTART {						\
 	UDI->shmid = CSD->shmid;			\
 	UDI->semid = CSD->semid;			\
 	UDI->gt_sem_ctime = CSD->gt_sem_ctime.ctime;	\
 	UDI->gt_shm_ctime = CSD->gt_shm_ctime.ctime;	\
-}
+} MBEND
 
 #define UDI2CSD(UDI, CSD)				\
-{							\
+MBSTART {						\
 	CSD->shmid = UDI->shmid;			\
 	CSD->semid = UDI->semid;			\
 	CSD->gt_sem_ctime.ctime = UDI->gt_sem_ctime;	\
 	CSD->gt_shm_ctime.ctime = UDI->gt_shm_ctime;	\
-}
+} MBEND
diff --git a/sr_unix/ftok_sem_incrcnt.c b/sr_unix/ftok_sem_incrcnt.c
index 2ec4e1b..b75870c 100644
--- a/sr_unix/ftok_sem_incrcnt.c
+++ b/sr_unix/ftok_sem_incrcnt.c
@@ -77,13 +77,17 @@ boolean_t ftok_sem_incrcnt(gd_region *reg, const char *file_type_str, boolean_t
 		if (ERANGE == save_errno)
 		{	/* "repl_inst_read" and "repl_inst_write" (invoked from "repl_inst_ftok_counter_halted")
 			 * rely on the caller holding the ftok semaphore. Although we dont hold it in this case,
-			 * our caller (gtmrecv.c or gtmsource.c) have ensured there is a parent pid that is holding
-			 * the ftok and waiting for us to finish this counter increment. Therefore steal the ftok
-			 * semaphore temporarily for the assert.
+			 * if we are the source server (is_src_server) our caller (gtmsource.c) would have ensured
+			 * there is a parent pid that is holding the ftok and waiting for us to finish this counter
+			 * increment. Therefore steal the ftok semaphore temporarily for the assert.  If we are the
+			 * receiver server (is_rcvr_server) our caller (gtmrecv.c) does not ensure this so grab the
+			 * ftok in that case. Those are the only two possibilities for the caller as asserted below.
 			 */
-			assert(!udi->grabbed_ftok_sem);
 			assert(is_src_server || is_rcvr_server);
-			DEBUG_ONLY(udi->grabbed_ftok_sem = TRUE;)
+			assert(!udi->grabbed_ftok_sem);
+			DEBUG_ONLY(if (is_src_server) udi->grabbed_ftok_sem = TRUE;)
+			if (is_rcvr_server)
+				repl_inst_ftok_sem_lock();
 			repl_inst_read(udi->fn, (off_t)0, (sm_uc_ptr_t)&repl_instance, SIZEOF(repl_inst_hdr));
 			if (repl_instance.qdbrundown)
 			{
@@ -91,7 +95,9 @@ boolean_t ftok_sem_incrcnt(gd_region *reg, const char *file_type_str, boolean_t
 				if (!jnlpool.jnlpool_ctl->ftok_counter_halted)
 					repl_inst_ftok_counter_halted(udi);
 			}
-			DEBUG_ONLY(udi->grabbed_ftok_sem = FALSE;)
+			if (is_rcvr_server)
+				repl_inst_ftok_sem_release();
+			DEBUG_ONLY(if (is_src_server) udi->grabbed_ftok_sem = FALSE;)
 		}
 		if (issue_error)
 		{
diff --git a/sr_unix/ftok_sems.c b/sr_unix/ftok_sems.c
index beac58c..9204fee 100755
--- a/sr_unix/ftok_sems.c
+++ b/sr_unix/ftok_sems.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -108,8 +108,8 @@ error_def(ERR_TEXT);
 	return TRUE;													\
 }
 
-boolean_t ftok_sem_get2(gd_region *reg, uint4 start_hrtbt_cntr, semwait_status_t *retstat, boolean_t *bypass,
-			boolean_t *ftok_counter_halted, boolean_t incr_cnt)
+boolean_t ftok_sem_get2(gd_region *reg, boolean_t *stacktrace_time, boolean_t *timedout, semwait_status_t *retstat,
+			boolean_t *bypass, boolean_t *ftok_counter_halted, boolean_t incr_cnt)
 {
 	int			status = SS_NORMAL, save_errno;
 	int			ftok_sopcnt, sem_pid;
@@ -145,26 +145,33 @@ boolean_t ftok_sem_get2(gd_region *reg, uint4 start_hrtbt_cntr, semwait_status_t
 		{
 			save_errno = errno;
 			if (SEM_REMOVED(save_errno))
+			{
+				*ftok_counter_halted = FALSE;	/* start afresh for next iteration of for loop with new semid */
 				continue;
+			}
 			RETURN_SEMWAIT_FAILURE(retstat, save_errno, op_semctl, 0, ERR_CRITSEMFAIL, 0);
 		}
 		SEMOP(ftokid, ftok_sop, ftok_sopcnt, status, NO_WAIT);
 		if (-1 != status)
 		{
 			udi->counter_ftok_incremented = (FTOK_SOPCNT_NO_INCR_COUNTER != ftok_sopcnt);
+			/* Input parameter *bypass could be OK_TO_BYPASS_FALSE or OK_TO_BYPASS_TRUE (for "do_blocking_semop" call).
+			 * But if we are returning without going that path, reset "*bypass" to reflect no bypass happened.
+			 */
+			*bypass = FALSE;
 			RETURN_SUCCESS(reg);
 		}
 		assert(EINTR != errno);
 		save_errno = errno;
 		if (EAGAIN == save_errno)
 		{	/* someone else is holding it */
-			if (NO_SEMWAIT_ON_EAGAIN == TREF(dbinit_max_hrtbt_delta))
+			if (NO_SEMWAIT_ON_EAGAIN == TREF(dbinit_max_delta_secs))
 			{
 				sem_pid = semctl(ftokid, 0, GETPID);
 				if (-1 != sem_pid)
 					RETURN_SEMWAIT_FAILURE(retstat, 0, op_invalid_sem_syscall, ERR_SEMWT2LONG, 0, sem_pid);
 				save_errno = errno; /* fall-through */
-			} else if (do_blocking_semop(ftokid, gtm_ftok_sem, start_hrtbt_cntr, retstat, reg, bypass,
+			} else if (do_blocking_semop(ftokid, gtm_ftok_sem, stacktrace_time, timedout, retstat, reg, bypass,
 						     ftok_counter_halted))
 			{
 				if (*ftok_counter_halted)	/* set by "do_blocking_semop" */
@@ -187,7 +194,10 @@ boolean_t ftok_sem_get2(gd_region *reg, uint4 start_hrtbt_cntr, semwait_status_t
 			continue;
 		}
 		if (SEM_REMOVED(save_errno))
+		{
+			*ftok_counter_halted = FALSE;	/* start afresh for next iteration of for loop with new semid */
 			continue;
+		}
 		assert(EINTR != save_errno);
 		RETURN_SEMWAIT_FAILURE(retstat, save_errno, op_semctl_or_semop, 0, ERR_CRITSEMFAIL, 0);
 	}
@@ -287,6 +297,7 @@ boolean_t ftok_sem_get(gd_region *reg, boolean_t incr_cnt, int project_id, boole
 			save_errno = errno;
 			if (immediate || !SEM_REMOVED(save_errno))
 				ISSUE_CRITSEMFAIL_AND_RETURN(reg, "semctl()", save_errno);
+			*ftok_counter_halted = FALSE;	/* start afresh for next iteration of for loop with new semid */
 			continue;
 		}
 		save_errno = errno;
@@ -366,7 +377,10 @@ boolean_t ftok_sem_get(gd_region *reg, boolean_t incr_cnt, int project_id, boole
 		}
 		assert(0 != save_errno);
 		if (SEM_REMOVED(save_errno))
+		{
+			*ftok_counter_halted = FALSE;	/* start afresh for next iteration of for loop with new semid */
 			continue;
+		}
 		ISSUE_CRITSEMFAIL_AND_RETURN(reg, "semop()/semctl()", save_errno);
 	} /* end for loop */
 	assert(-1 == status);
@@ -406,6 +420,9 @@ boolean_t ftok_sem_lock(gd_region *reg, boolean_t immediate)
 		|| (jgbl.mur_rollback && !jgbl.mur_options_forward) || !holds_sem[SOURCE][JNL_POOL_ACCESS_SEM]);
 	udi = FILE_INFO(reg);
 	csa = &udi->s_addrs;
+	/* Requests for the ftok lock on a db should always comes before requests for crit on the same db.
+	 * This is needed to avoid deadlocks. So we should never hold crit on this db while requesting the ftok lock. Assert that.
+	 */
 	assert(!csa->now_crit);
 	/* The following two asserts are to ensure we never hold more than one FTOK semaphore at any point in time.  The only
 	 * exception is if we were MUPIP STOPped (or kill -3ed) while having ftok_sem lock on one region and we came to rundown code
@@ -460,7 +477,8 @@ boolean_t ftok_sem_lock(gd_region *reg, boolean_t immediate)
  * 	Assumes that ftok semaphore was already locked. Now release it.
  * Parameters:
  *	reg		: Regions structure
- * 	IF decr_cnt == TRUE, it will decrement counter semaphore.
+ * 	IF decr_cnt == DECR_CNT_TRUE (1), it will decrement counter semaphore & remove it if needed.
+ * 	IF decr_cnt == DECR_CNT_SAFE (2), it will decrement counter semaphore but not remove the semaphore.
  * 	IF immediate == TRUE, it will use IPC_NOWAIT flag.
  * Return Value: TRUE, if succsessful
  *	         FALSE, if fails.
@@ -476,6 +494,8 @@ boolean_t ftok_sem_release(gd_region *reg,  boolean_t decr_cnt, boolean_t immedi
 
 	SETUP_THREADGBL_ACCESS;
 	assert(NULL != reg);
+	assert(DECR_CNT_SAFE != DECR_CNT_TRUE);
+	assert(DECR_CNT_SAFE != DECR_CNT_FALSE);
 	/* The following assert is to ensure we never hold more than one FTOK semaphore at any point in time.  The only exception is
 	 * if we were MUPIP STOPped (or kill -3ed) while having ftok_sem lock on one region and we came to rundown code that invoked
 	 * ftok_sem_lock() on a different region. Hence the process_exiting check below.
@@ -491,25 +511,29 @@ boolean_t ftok_sem_release(gd_region *reg,  boolean_t decr_cnt, boolean_t immedi
 	if (decr_cnt)
 	{
 		assert(udi->counter_ftok_incremented);
-		if (-1 == (ftok_semval = semctl(udi->ftok_semid, DB_COUNTER_SEM, GETVAL)))
+		if (DECR_CNT_SAFE != decr_cnt)
 		{
-			save_errno = errno;
-			GTM_SEM_CHECK_EINVAL(TREF(gtm_environment_init), save_errno, udi);
-			ISSUE_CRITSEMFAIL_AND_RETURN(reg, "semop()", save_errno);
-		}
-		if (DB_COUNTER_SEM_INCR >= ftok_semval)	/* checking against 0, in case already we decremented semaphore number 1 */
-		{
-			if (0 != sem_rmid(udi->ftok_semid))
+			if (-1 == (ftok_semval = semctl(udi->ftok_semid, DB_COUNTER_SEM, GETVAL)))
 			{
 				save_errno = errno;
 				GTM_SEM_CHECK_EINVAL(TREF(gtm_environment_init), save_errno, udi);
-				ISSUE_CRITSEMFAIL_AND_RETURN(reg, "sem_rmid()", save_errno);
+				ISSUE_CRITSEMFAIL_AND_RETURN(reg, "semop()", save_errno);
+			}
+			/* Below checks against 0, in case already we decremented semaphore number 1 */
+			if (DB_COUNTER_SEM_INCR >= ftok_semval)
+			{
+				if (0 != sem_rmid(udi->ftok_semid))
+				{
+					save_errno = errno;
+					GTM_SEM_CHECK_EINVAL(TREF(gtm_environment_init), save_errno, udi);
+					ISSUE_CRITSEMFAIL_AND_RETURN(reg, "sem_rmid()", save_errno);
+				}
+				udi->ftok_semid = INVALID_SEMID;
+				ftok_sem_reg = NULL;
+				udi->grabbed_ftok_sem = FALSE;
+				udi->counter_ftok_incremented = FALSE;
+				return TRUE;
 			}
-			udi->ftok_semid = INVALID_SEMID;
-			ftok_sem_reg = NULL;
-			udi->grabbed_ftok_sem = FALSE;
-			udi->counter_ftok_incremented = FALSE;
-			return TRUE;
 		}
 		if (0 != (save_errno = do_semop(udi->ftok_semid, DB_COUNTER_SEM, -DB_COUNTER_SEM_INCR, semflag)))
 		{
diff --git a/sr_unix/ftok_sems.h b/sr_unix/ftok_sems.h
index c670647..97c753a 100755
--- a/sr_unix/ftok_sems.h
+++ b/sr_unix/ftok_sems.h
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -15,8 +15,12 @@
 
 #include "gtm_semutils.h"
 
-boolean_t ftok_sem_get2(gd_region *reg, uint4 stacktrace_on_wait, semwait_status_t *retstat, boolean_t *bypass,
-			boolean_t *ftok_counter_halted, boolean_t incr_cnt);
+#define	DECR_CNT_FALSE		FALSE
+#define	DECR_CNT_TRUE		TRUE
+#define	DECR_CNT_SAFE		2
+
+boolean_t ftok_sem_get2(gd_region *reg, boolean_t *stacktrace_time, boolean_t *timedout, semwait_status_t *retstat,
+			boolean_t *bypass, boolean_t *ftok_counter_halted, boolean_t incr_cnt);
 boolean_t ftok_sem_get(gd_region *reg, boolean_t incr_cnt, int project_id, boolean_t immediate,
 		       boolean_t *ftok_counter_halted);
 boolean_t ftok_sem_lock(gd_region *reg, boolean_t immediate);
diff --git a/sr_unix/gbldirnam.h b/sr_unix/gbldirnam.h
index 7ded664..2c6c5a1 100755
--- a/sr_unix/gbldirnam.h
+++ b/sr_unix/gbldirnam.h
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information 	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -13,5 +13,5 @@
 #define GDE_LABEL_SIZE 13
 #define GDE_LABEL_NUM 1
 /* Note, GDE_LABEL_LITERAL must be maintained in gdeinit.m if changes are made here */
-#define GDE_LABEL_LITERAL GTM64_ONLY("GTCGBDUNX110") NON_GTM64_ONLY("GTCGBDUNX010")
+#define GDE_LABEL_LITERAL GTM64_ONLY("GTCGBDUNX111") NON_GTM64_ONLY("GTCGBDUNX011")
 #define DEF_GDR_EXT "*.gld"
diff --git a/sr_unix/gdeget.m b/sr_unix/gdeget.m
old mode 100755
new mode 100644
index 315c221..5d9171b
--- a/sr_unix/gdeget.m
+++ b/sr_unix/gdeget.m
@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;								;
-; Copyright (c) 2006-2015 Fidelity National Information 	;
+; Copyright (c) 2006-2017 Fidelity National Information		;
 ; Services, Inc. and/or its subsidiaries. All rights reserved.	;
 ;								;
 ;	This source code contains the intellectual property	;
@@ -17,7 +17,7 @@ LOAD
 	; if zchset is UTF-8 open in raw mode to avoid BADCHAR errors
 	; For OS390 aka z/OS, use BINARY mode
 	s abs=1,update=0,chset=$SELECT($ZV["OS390":"BINARY",$ZCHSET="UTF-8":"M",1:"")
-	o file:(exc="g badfile":rewind:recordsize=SIZEOF("dsk_blk"):readonly:fixed:blocksize=SIZEOF("dsk_blk"):ichset=chset)
+	o file:(exc="g badfile^"_$t(+0):rewind:recordsize=SIZEOF("dsk_blk"):readonly:fixed:blocksize=SIZEOF("dsk_blk"):ichset=chset)
 	u file r rec
 	i debug u @useio
 ; header
@@ -33,6 +33,9 @@ LOAD
 	i gldfmt>6 s reghasv550fields=TRUE
 	s reghasv600fields=FALSE
 	i gldfmt>7 s reghasv600fields=TRUE
+	s v63a=0
+	i (label="GTCGBDUNX010")!(label="GTCGBDUNX110") s label=hdrlab,v63a=1,update=1  ;autoconvert
+	i (v63a=1) n SIZEOF d v63ainit
 	s v621=0
 	i (label="GTCGBDUNX009")!(label="GTCGBDUNX109") s label=hdrlab,v621=1,update=1  ;autoconvert
 	i (v621=1) n SIZEOF d v621init
@@ -141,6 +144,9 @@ LOAD
 	e  s gnams=0
 	; wait until "gnams" is setup before checking maps, as "gnams" is used in case of subscripted gvns in map entries
 	zm:'$$MAP2NAM^GDEMAP(.map) gdeerr("INPINTEG")
+	i (gldfmt'>10) do
+	. ; remove any %Y* name mappings in old gld (unsubscripted OR subscripted) as documented
+	. n s s s="" f  s s=$o(nams(s)) q:s=""  i $ze(s,1,2)="%Y"  k nams(s)  i $incr(nams,-1)
 ; template access method
 	s tmpacc=$$gderead(4)
 	i accmeth'[("\"_tmpacc) zm gdeerr("INPINTEG")
@@ -148,7 +154,8 @@ LOAD
 	k tmpreg,tmpseg
 	d cretmps
 	i (reghasv550fields=TRUE) d tmpreg("ALIGNSIZE")
-	f s="ALLOCATION" d tmpreg(s)
+	s s="ALLOCATION" d tmpreg(s)
+	if (gldfmt>10) d tmpreg("AUTODB") s tmpreg("STATS")='(tmpreg("AUTODB")\2#2),tmpreg("AUTODB")=tmpreg("AUTODB")#2
 	i (reghasv550fields=TRUE) d tmpreg("AUTOSWITCHLIMIT")
 	f s="BEFORE_IMAGE","BUFFER_SIZE" d tmpreg(s)
 	i tmpreg("BUFFER_SIZE")<minreg("BUFFER_SIZE")  s tmpreg("BUFFER_SIZE")=minreg("BUFFER_SIZE"),update=1
@@ -157,7 +164,9 @@ LOAD
 	i (reghasv550fields=TRUE) d tmpreg("EPOCH_INTERVAL")
 	f s="EXTENSION","FILE_NAME" d tmpreg(s)
 	i (reghasv600fields=TRUE) d tmpreg("INST_FREEZE_ON_ERROR")
-	f s="JOURNAL","KEY_SIZE","NULL_SUBSCRIPTS" d tmpreg(s)
+	f s="JOURNAL","KEY_SIZE" d tmpreg(s)
+	if (gldfmt>10) d tmpreg("LOCK_CRIT") s tmpreg("LOCK_CRIT")='tmpreg("LOCK_CRIT")
+	f s="NULL_SUBSCRIPTS" d tmpreg(s)
 	i (reghasv600fields=TRUE) d tmpreg("QDBRUNDOWN")
 	f s="RECORD_SIZE" d tmpreg(s)
 	; need to handle versioning
@@ -172,7 +181,9 @@ LOAD
 	. s tmpreg("AUTOSWITCHLIMIT")=minreg("AUTOSWITCHLIMIT"),update=1
 	f i=2:1:$zl(accmeth,"\") s am=$p(accmeth,"\",i) d
 	. i am="MM" d:$zl(rec)-(rel-1)<3 nextrec i +$ze(rec,rel,rel+2)'=2 n tmpsegcommon d tmpmm q
-	. f s="ACCESS_METHOD","ALLOCATION","BLOCK_SIZE","BUCKET_SIZE","DEFER" d tmpseg(am,s)
+	. f s="ACCESS_METHOD","ALLOCATION" d tmpseg(am,s)
+	. i (gldfmt>10) d tmpseg(am,"ASYNCIO")
+	. f s="BLOCK_SIZE","BUCKET_SIZE","DEFER" d tmpseg(am,s)
 	. i (gldfmt>9) d tmpseg(am,"DEFER_ALLOCATE")
 	. i (seghasencrflag=TRUE) d tmpseg(am,"ENCRYPTION_FLAG")
 	. f s="EXTENSION_COUNT","FILE_TYPE","GLOBAL_BUFFER_COUNT","LOCK_SPACE" d tmpseg(am,s)
@@ -183,7 +194,9 @@ LOAD
 	c file
 ; resolve
 	s s=""
-	f  s s=$o(nams(s)) q:'$zl(s)  zm:'$d(xregs(nams(s))) gdeerr("INPINTEG") s nams(s)=xregs(nams(s))
+	f  s s=$o(nams(s)) q:'$zl(s)  zm:'$d(xregs(nams(s))) gdeerr("INPINTEG") s nams(s)=xregs(nams(s)) d:nams(s)?1L.E
+	. i $i(nams,-1),$d(regs(nams(s))),$i(regs,-1),$i(segs,-1) k regs(nams(s)),segs(nams(s))
+	. k nams(s)
 	f  s s=$o(regs(s)) q:'$zl(s)  zm:'$d(xsegs(regs(s,"DYNAMIC_SEGMENT"))) gdeerr("INPINTEG") d
 	. s regs(s,"DYNAMIC_SEGMENT")=xsegs(regs(s,"DYNAMIC_SEGMENT"))
 	f  s s=$o(segs(s)) q:'$zl(s)  s am=segs(s,"ACCESS_METHOD") d
@@ -323,10 +336,18 @@ region:
 	s regs(s,"FILE_NAME")=$ze(rec,rel,rel+l-1),rel=rel+SIZEOF("file_spec")
 	i $ze(rec,rel,rel+7)'=$tr($j("",8)," ",ZERO) zm gdeerr("INPINTEG")				; reserved
 	s rel=rel+8											; reserved
-	i (gldfmt>8) s rel=rel+4 ; isSpan not needed by GDE
-	i (gldfmt>9) s regs(s,"EPOCHTAPER")=$$bin2num($ze(rec,rel)),rel=rel+12
-	i (gldfmt'>9) s regs(s,"EPOCHTAPER")=1
-	i (gldfmt=9) s rel=rel+12	; reserved for runtime fillers
+	i (gldfmt>8) s rel=rel+4 ; "gd_region.is_spanned" not needed by GDE
+	i (gldfmt>10) s rel=rel+4 ; "gd_region.statsDB_reg_index" never used by GDE (generated by gdeput if needed)
+	s regs(s,"EPOCHTAPER")=1
+	s regs(s,"AUTODB")=0,regs(s,"STATS")=1,regs(s,"LOCK_CRIT")=0
+	i (gldfmt>9) do
+	. s regs(s,"EPOCHTAPER")=$$bin2num($ze(rec,rel)),rel=rel+1
+	. i (gldfmt>10) do
+	. . s x=$$bin2num($ze(rec,rel)),regs(s,"AUTODB")=x#2,regs(s,"STATS")='(x\2#2),rel=rel+1
+	. . s regs(s,"LOCK_CRIT")='$$bin2num($ze(rec,rel)),rel=rel+1
+	. . s rel=rel+34	; reserved for runtime fillers
+	. s rel=rel+11		; reserved for runtime fillers
+	e  i (gldfmt=9) s rel=rel+12	; reserved for runtime fillers
 	s rel=rel+SIZEOF("gd_region_padding")								; padding
 	s abs=abs+SIZEOF("gd_region")
 	q
@@ -375,9 +396,11 @@ segment:
 	; If the gld file has the encrytion flag, read it. Also read only if
 	; the current platform is encrpytion enabled. Otherwise default to 0
 	s segs(s,"ENCRYPTION_FLAG")=$S(((encsupportedplat=TRUE)&(seghasencrflag=TRUE)):$$bin2num($ze(rec,rel,rel+3)),1:0)
-	i (seghasencrflag=TRUE) d
-	. s rel=rel+4
-        . if (gtm64=TRUE) s rel=rel+4 ; Padding bytes for 64 bit platforms
+	i (seghasencrflag=TRUE) s rel=rel+4
+	i (gldfmt>10) s segs(s,"ASYNCIO")=$$bin2num($ze(rec,rel,rel+3)),rel=rel+4
+	e  do
+	. s segs(s,"ASYNCIO")=defseg("ASYNCIO")
+	. if (seghasencrflag=TRUE)&(gtm64=TRUE) s rel=rel+4 ; Padding bytes for 64 bit platforms
 	i (gldfmt>8) s rel=rel+16	; reserved for runtime fillers
 	s abs=abs+SIZEOF("gd_segment")-v30
 	q
@@ -442,8 +465,9 @@ cretmps:
 	s tmpreg("ALIGNSIZE")=4096
 	s tmpreg("ALLOCATION")=2048
 	s tmpreg("AUTOSWITCHLIMIT")=8386560
+	s tmpreg("AUTODB")=0
 	s tmpreg("BEFORE_IMAGE")=1
-	s tmpreg("BUFFER_SIZE")=2308
+	s tmpreg("BUFFER_SIZE")=2312
 	s tmpreg("COLLATION_DEFAULT")=0
 	s tmpreg("EPOCHTAPER")=1
 	s tmpreg("EPOCH_INTERVAL")=300
@@ -451,10 +475,12 @@ cretmps:
 	s tmpreg("FILE_NAME")=""
 	s tmpreg("JOURNAL")=0
 	s tmpreg("INST_FREEZE_ON_ERROR")=0
-	s tmpreg("KEY_SIZE")=64
+	s tmpreg("KEY_SIZE")=dflreg("KEY_SIZE")
+	s tmpreg("LOCK_CRIT")=1
 	s tmpreg("NULL_SUBSCRIPTS")=0
 	s tmpreg("QDBRUNDOWN")=0
 	s tmpreg("RECORD_SIZE")=256
+	s tmpreg("STATS")=1
 	s tmpreg("STDNULLCOLL")=0
 	s tmpreg("SYNC_IO")=0
 	s tmpreg("YIELD_LIMIT")=8
@@ -693,3 +719,33 @@ v621init:
 	s MAXNAMLN=SIZEOF("mident")-1,MAXREGLN=32,MAXSEGLN=32	; maximum name length allowed is 31 characters
 	s PARNAMLN=31,PARREGLN=31,PARSEGLN=31
 	q
+v63ainit:
+	i (olabel="GTCGBDUNX010") d
+	. s SIZEOF("am_offset")=332
+	. s SIZEOF("file_spec")=256
+	. s SIZEOF("gd_header")=16
+	. s SIZEOF("gd_contents")=76
+	. s SIZEOF("gd_map")=16
+	. s SIZEOF("gd_region")=372
+	. s SIZEOF("gd_region_padding")=0
+	. s SIZEOF("gd_segment")=364
+	e  d
+	. s SIZEOF("am_offset")=340
+	. s SIZEOF("file_spec")=256
+	. s SIZEOF("gd_header")=16
+	. s SIZEOF("gd_contents")=112
+	. s SIZEOF("gd_map")=24
+	. s SIZEOF("gd_region")=384
+	. s SIZEOF("gd_region_padding")=4
+	. s SIZEOF("gd_segment")=384
+	s SIZEOF("gd_gblname")=40
+	s SIZEOF("mident")=32
+	s SIZEOF("blk_hdr")=16
+	s SIZEOF("rec_hdr")=4
+	s SIZEOF("dsk_blk")=512
+	s SIZEOF("max_str")=1048576
+	s SIZEOF("reg_jnl_deq")=4
+	d Init^GDEINITSZ
+	s MAXNAMLN=SIZEOF("mident")-1,MAXREGLN=32,MAXSEGLN=32	; maximum name length allowed is 31 characters
+	s PARNAMLN=31,PARREGLN=31,PARSEGLN=31
+	q
diff --git a/sr_unix/gdeput.m b/sr_unix/gdeput.m
old mode 100755
new mode 100644
index 9c1a7e6..8a59c64
--- a/sr_unix/gdeput.m
+++ b/sr_unix/gdeput.m
@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;								;
-; Copyright (c) 2006-2015 Fidelity National Information 	;
+; Copyright (c) 2006-2017 Fidelity National Information		;
 ; Services, Inc. and/or its subsidiaries. All rights reserved.	;
 ;								;
 ;	This source code contains the intellectual property	;
@@ -12,8 +12,8 @@
 gdeput:	;output the result of the session to the global directory file
 GDEPUT()
 	n rec,gds,cregs,csegs,cregcnt,csegcnt,maxrecsize,mapcnt,map,hasSpanGbls,isSpanned,curMapSpanning,prevMapSpanning
-	n varmapslen,vargblnamelen,tmplen,ptrsize,varmapoff,gnamcnt,gblnamelen,filler16byte,filler12byte,filler11byte
-	d CREATEGLDMAP^GDEMAP
+	n varmapslen,vargblnamelen,tmplen,ptrsize,varmapoff,gnamcnt,gblnamelen,filler16byte,filler12byte,filler45byte
+	d gblstatmap,CREATEGLDMAP^GDEMAP
 	s ptrsize=$s((gtm64=TRUE):8,1:4)
 	s s="",gdeputzs="",varmapslen=0,mapcnt=0,hasSpanGbls=0
 	f  s s=$o(map(s)),tmplen=$zl(s) q:'tmplen  d
@@ -38,7 +38,7 @@ GDEPUT()
 	s x=x+(csegcnt*SIZEOF("gd_segment"))
 	s gnamcnt=gnams
 	s rec=""
-	s $p(filler11byte,ZERO,11)=ZERO
+	s $p(filler45byte,ZERO,45)=ZERO				; this may be used by the runtime logic
 	s $p(filler12byte,ZERO,12)=ZERO
 	s $p(filler16byte,ZERO,16)=ZERO
 ; contents
@@ -91,7 +91,12 @@ GDEPUT()
 	s rec=rec_$tr($j($l(tmpacc),3)," ",0)
 	s rec=rec_tmpacc
 ; templates
+	new x
+	s x=tmpreg("STATS"),tmpreg("AUTODB")='x*2+tmpreg("AUTODB") k tmpreg("STATS")	;combine items for bit mask - restore below
+	s tmpreg("LOCK_CRIT")='tmpreg("LOCK_CRIT")					; again an adjustment before and after
 	f  s s=$o(tmpreg(s)) q:'$l(s)  s rec=rec_$tr($j($l(tmpreg(s)),3)," ",0) s rec=rec_tmpreg(s)
+	s tmpreg("STATS")=x,tmpreg("AUTODB")=tmpreg("AUTODB")#2				; save/restore cheaper than checking in loop
+	s tmpreg("LOCK_CRIT")='tmpreg("LOCK_CRIT")					; restore GDE representation
 	f i=2:1:$l(accmeth,"\") s am=$p(accmeth,"\",i) s s="" d
 	. f  s s=$o(tmpseg(am,s)) q:'$l(s)  s rec=rec_$tr($j($l(tmpseg(am,s)),3)," ",0),rec=rec_tmpseg(am,s)
 	u tempfile
@@ -99,10 +104,69 @@ GDEPUT()
 	u @useio
 	o file:chset="M" c file:delete
 	c tempfile:rename=file
+	i debug,$$MAP2NAM^GDEMAP(.map),$$ALL^GDEVERIF
 	q 1
 
 ;-----------------------------------------------------------------------------------------------------------------------------------
 
+gblstatmap:
+	n s,ysr,cnt,xrefstatsreg,xrefcnt,ynam,blksiz
+	s s=""
+	s maxs=$o(regs(s),-1) 	; to ensure STDNULLCOLL for the statsDB mapping, last lower-case reg gets all of %YGS
+				; It cannot be the first lower-case region as that would cause problems for the runtime
+				; (since the map entries for %YGS and %YGS(FIRSTREG) would coalesce). Choosing the last
+				; lower-case region avoids this coalesce issue and ensure there is a separate map entry
+				; for just %YGS. This is needed by runtime (see "ygs_map_entry_changed" usage)
+	s ysr=$zconvert(maxs,"L")
+	; Map ^%Y* to a lower-case region
+	s ynam="%Y*",ynam("NSUBS")=0,ynam("SUBS",0)=ynam,ynam("TYPE")="STAR" m nams(ynam)=ynam s nams(ynam)=ysr i $incr(nams)
+	s blksiz=$$BLKSIZ($tr($j("",MAXREGLN)," ","x")) ; use maximum length region name for computation
+	s s=maxs d  s s="" f  s s=$o(regs(s)) q:(maxs=s)  i (s?1U.e) s ysr=$zconvert(s,"L") d
+	. d add2nams^GDEMAP("^%YGS("""_s_""")",ysr,"POINT")  i $incr(nams)
+	. s xrefstatsreg(ysr)=s,xrefstatsreg(s)=ysr
+	. m regs(ysr)=regs(s)				; copy & then partially override region settings for statsDB regions
+	. s regs(ysr,"AUTODB")=1
+	. s regs(ysr,"BEFORE_IMAGE")=0
+	. s regs(ysr,"DYNAMIC_SEGMENT")=ysr
+	. s regs(ysr,"JOURNAL")=0
+	. s regs(ysr,"KEY_SIZE")=dflreg("KEY_SIZE")
+	. s regs(ysr,"QDBRUNDOWN")=1	; have it always enabled on statsdbs as MUPIP SET can enable this only on basedb later
+	. s regs(ysr,"STATS")=0
+	. s regs(ysr,"STDNULLCOLL")=1
+	. m segs(ysr)=segs(regs(s,"DYNAMIC_SEGMENT"))	; copy & then partially override segment settings for statsDB segments
+	. s segs(ysr,"ACCESS_METHOD")="MM"
+	. s segs(ysr,"ALLOCATION")=2050			; about enough for 2000 processes
+	. s segs(ysr,"ASYNCIO")=0
+	. s segs(ysr,"BLOCK_SIZE")=blksiz,regs(ysr,"RECORD_SIZE")=segs(ysr,"BLOCK_SIZE")-SIZEOF("blk_hdr")
+	. s segs(ysr,"DEFER")=0		; setting defer=0 on an MM database implies NO flush timer on statsdb regions
+	. s segs(ysr,"DEFER_ALLOCATE")=1
+	. s segs(ysr,"ENCRYPTION_FLAG")=0
+	. s segs(ysr,"EXTENSION_COUNT")=2050		; and a 2000 more at a time
+	. ; Corresponding unique .gst file name for statsdb is determined at runtime when basedb is first opened.
+	. ; For now just keep the name as the basedb name + ".gst"
+	. s segs(ysr,"FILE_NAME")=segs(ysr,"FILE_NAME")_".gst"
+	. s segs(ysr,"LOCK_SPACE")=defseg("LOCK_SPACE")
+	. s segs(ysr,"RESERVED_BYTES")=0
+	. i $i(nams),$i(regs),$i(segs)			; increment the counts
+	; Determine gd_region.statsDB_reg_index for runtime
+	k sreg
+	s cnt=0,s=""
+	for  set s=$o(regs(s))  quit:s=""  s xrefcnt(s)=cnt i $incr(cnt)
+	for  set s=$o(xrefstatsreg(s))  quit:s=""  s sreg(s,"STATSDB_REG_INDEX")=xrefcnt(xrefstatsreg(s))
+	q
+
+BLKSIZ(regnm)
+	; Calculate minimum block size for ^%YGS(regnm)
+	new bhdsz,helpgld,maxksz,maxkpad,maxpid,minksz,minkpad,minreq,rhdsz,statsz,tmp
+	set tmp=$piece($zversion," ",3),maxpid=$select("AIX"=tmp:2**26-2,"Linux"=tmp:2**22-1,1:2**16)
+	set maxksz=$zlength($zcollate("%YGS("""_regnm_""","""_maxpid_""")",0))	; max key size for statistics record
+	set minksz=$zlength($zcollate("%YGS("""_regnm_""",1)",0))		; min key size for statistics record
+	set maxkpad=maxksz#8,maxkpad=$select(tmp:8-tmp,1:0)			; padding to align statistics of largest record
+	set minkpad=minksz#8,minkpad=$select(tmp:8-tmp,1:0)			; padding to align statistics of smallest record
+	set tmp=maxksz+maxkpad set:minksz+minkpad>tmp tmp=minksz+minkpad
+	set minreq=SIZEOF("blk_hdr")+SIZEOF("rec_hdr")+tmp+SIZEOF("gvstats")
+	quit $select(minreq#512:minreq\512+1*512,1:minreq)			; actual block size must round up to multiple of 512
+
 fdatum:
 	s x=segs(s,"ACCESS_METHOD")
 	s filetype=$s((x="BG")!(x="MM"):"GDS",x="USER":"USER",1:"ERROR")
@@ -160,8 +224,12 @@ cregion:
 	s rec=rec_regs(s,"FILE_NAME")_$tr($j("",SIZEOF("file_spec")-$zl(regs(s,"FILE_NAME")))," ",ZERO)
 	s rec=rec_$tr($j("",8)," ",ZERO)							; reserved
 	s rec=rec_$$num2bin(4,isSpanned(s))							; is_spanned
+	n maxregindex s maxregindex=$get(sreg(s,"STATSDB_REG_INDEX"),TWO(32)-1)
+	s rec=rec_$$num2bin(4,maxregindex)							; statsDB_reg_index
 	s rec=rec_$$num2bin(1,regs(s,"EPOCHTAPER"))						; epoch tapering
-	s rec=rec_filler11byte									; runtime filler
+	s rec=rec_$$num2bin(1,((s?1L.E)*4)+(('regs(s,"STATS"))*2)+regs(s,"AUTODB"))		; type of reserved DB
+	s rec=rec_$$num2bin(1,'regs(s,"LOCK_CRIT"))						; LOCK crit with DB (1) or not (0)
+	s rec=rec_filler45byte									; runtime filler
 	s rec=rec_$tr($j("",SIZEOF("gd_region_padding"))," ",ZERO)				; padding
 	q
 csegment:
@@ -196,8 +264,8 @@ csegment:
 	; always be 0 (ie encryption is off)
 	i (encsupportedplat=TRUE) s rec=rec_$$num2bin(4,segs(s,"ENCRYPTION_FLAG"))
 	e  s rec=rec_$$num2bin(4,0)
+	s rec=rec_$$num2bin(4,segs(s,"ASYNCIO"))
 	s rec=rec_filler16byte			; runtime filler
-	i (gtm64=TRUE) s rec=rec_$$num2bin(4,0)
 	q
 cgblname:(s)
 	n len,coll,ver
diff --git a/sr_unix/gdeverif.m b/sr_unix/gdeverif.m
index 60a8bbb..af0e7ff 100755
--- a/sr_unix/gdeverif.m
+++ b/sr_unix/gdeverif.m
@@ -1,6 +1,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;								;
-;	Copyright 2006, 2014 Fidelity Information Services, Inc	;
+; Copyright (c) 2006-2016 Fidelity National Information		;
+; Services, Inc. and/or its subsidiaries. All rights reserved.	;
 ;								;
 ;	This source code contains the intellectual property	;
 ;	of its copyright holder(s), and is made available	;
@@ -109,7 +110,9 @@ seg1:	i '$d(segs(SEGMENT,"ACCESS_METHOD")) s verified=0 zm $$info(gdeerr("QUALRE
 	f  s s=$o(segs(SEGMENT,s)) q:'$l(s)  s squals(s)=segs(SEGMENT,s)
 	f  s s=$o(minseg(am,s)) q:'$l(s)  i '$d(squals(s)) s verified=0 zm $$info(gdeerr("QUALREQD")):s,gdeerr("SEGIS"):am:SEGMENT
 	f  s s=$o(maxseg(am,s)) q:'$l(s)  i '$d(squals(s)) s verified=0 zm $$info(gdeerr("QUALREQD")):s,gdeerr("SEGIS"):am:SEGMENT
-	i "MM"=am,1=squals("ENCRYPTION_FLAG") s verified=0 zm $$info(gdeerr("CRYPTNOMM")):s,gdeerr("SEGIS"):am:SEGMENT
+	i "MM"=am  do
+	. i 1=squals("ENCRYPTION_FLAG") s verified=0 zm $$info(gdeerr("GDECRYPTNOMM")):SEGMENT
+	. i 1=squals("ASYNCIO")         s verified=0 zm $$info(gdeerr("GDEASYNCIONOMM")):SEGMENT
 	s x=$$SQUALS(am,.squals)
 	q
 usereg:	n REGION,NAME s REGION=""
diff --git a/sr_unix/gds_rundown.c b/sr_unix/gds_rundown.c
old mode 100755
new mode 100644
index d074dbd..5f029c9
--- a/sr_unix/gds_rundown.c
+++ b/sr_unix/gds_rundown.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -46,9 +46,7 @@
 #include "send_msg.h"
 #include "change_reg.h"
 #include "compswap.h"
-#ifdef UNIX
 #include "mutex.h"
-#endif
 #include "gds_rundown.h"
 #include "gvusr.h"
 #include "do_semop.h"
@@ -75,10 +73,16 @@
 #include "wcs_clean_dbsync.h"
 #include "interlock.h"
 #include "gds_rundown_err_cleanup.h"
-
-#ifndef GTM_SNAPSHOT
-# error "Snapshot facility not available on this platform"
-#endif
+#include "wcs_wt.h"
+#include "wcs_sleep.h"
+#include "aio_shim.h"
+#include "gvcst_protos.h"
+#include "targ_alloc.h"
+#include "gdskill.h"		/* needed for tp.h */
+#include "gdscc.h"		/* needed for tp.h */
+#include "buddy_list.h"		/* needed for tp.h */
+#include "hashtab_int4.h"	/* needed for tp.h */
+#include "tp.h"
 
 GBLREF	VSIG_ATOMIC_T		forced_exit;
 GBLREF	boolean_t		mupip_jnl_recover;
@@ -96,16 +100,17 @@ GBLREF	int			num_additional_processors;
 GBLREF	jnlpool_addrs		jnlpool;
 GBLREF	int			process_exiting;
 GBLREF	boolean_t		ok_to_UNWIND_in_exit_handling;
+GBLREF	gv_namehead		*gv_target_list;
 
 LITREF  char                    gtm_release_name[];
 LITREF  int4                    gtm_release_name_len;
 LITREF gtmImageName		gtmImageNames[];
 
+error_def(ERR_AIOCANCELTIMEOUT);
 error_def(ERR_ASSERT);
 error_def(ERR_CRITSEMFAIL);
 error_def(ERR_DBFILERR);
 error_def(ERR_DBRNDWN);
-error_def(ERR_RNDWNSKIPCNT);
 error_def(ERR_DBRNDWNWRN);
 error_def(ERR_GTMASSERT);
 error_def(ERR_GTMASSERT2);
@@ -117,23 +122,27 @@ error_def(ERR_MEMORY);
 error_def(ERR_OUTOFSPACE);
 error_def(ERR_RESRCINTRLCKBYPAS);
 error_def(ERR_RNDWNSEMFAIL);
+error_def(ERR_RNDWNSKIPCNT);
+error_def(ERR_STACKOFLOW);
 error_def(ERR_STACKOFLOW);
 error_def(ERR_TEXT);
 error_def(ERR_WCBLOCKED);
-error_def(ERR_STACKOFLOW);
 
-int4 gds_rundown(void)
+int4 gds_rundown(boolean_t cleanup_udi)
 {
-	boolean_t		canceled_dbsync_timer, canceled_flush_timer, ok_to_write_pfin;
-	boolean_t		have_standalone_access, ipc_deleted, err_caught;
+	boolean_t		canceled_dbsync_timer, do_jnlwait, ok_to_write_pfin, wrote_pfin;
+	boolean_t		have_standalone_access, ipc_deleted, err_caught, aiocancel_timedout;
 	boolean_t		is_cur_process_ss_initiator, remove_shm, vermismatch, we_are_last_user, we_are_last_writer, is_mm;
 	boolean_t		unsafe_last_writer;
+	boolean_t		db_needs_flushing;
 	char			time_str[CTIME_BEFORE_NL + 2]; /* for GET_CUR_TIME macro */
-	gd_region		*reg;
+	gd_region		*reg, *statsDBreg;
+	gd_segment		*seg;
 	int			save_errno, status, rc;
 	int4			semval, ftok_semval, sopcnt, ftok_sopcnt;
 	short			crash_count;
 	sm_long_t		munmap_len;
+	void			*munmap_start;
 	sgmnt_addrs		*csa;
 	sgmnt_data_ptr_t	csd;
 	node_local_ptr_t	cnl;
@@ -145,20 +154,21 @@ int4 gds_rundown(void)
 	jnl_buffer_ptr_t	jbp;
 	shm_snapshot_t		*ss_shm_ptr;
 	uint4			ss_pid, onln_rlbk_pid, holder_pid;
-	boolean_t		was_crit;
+	boolean_t		is_statsDB, was_crit;
 	boolean_t		safe_mode; /* Do not flush or take down shared memory. */
-	boolean_t		bypassed_ftok = FALSE, bypassed_access = FALSE, may_bypass_ftok, inst_is_frozen,
-				ftok_counter_halted,
-				access_counter_halted;
+	boolean_t		bypassed_ftok = FALSE, bypassed_access = FALSE, may_bypass_ftok, inst_is_frozen;
+	boolean_t		ftok_counter_halted, access_counter_halted;
 	int			secshrstat;
 	intrpt_state_t		prev_intrpt_state;
-	DCL_THREADGBL_ACCESS;
+	gv_namehead		*currgvt;
+	gd_region		*baseDBreg;
+	sgmnt_addrs		*baseDBcsa;
+	node_local_ptr_t	baseDBnl;
+	sgm_info		*si;
 
-	SETUP_THREADGBL_ACCESS;
 	jnl_status = 0;
 	reg = gv_cur_region;			/* Local copy */
-
-	/* early out for cluster regions
+	/* Early out for cluster regions
 	 * to avoid tripping the assert below.
 	 * Note:
 	 *	This early out is consistent with VMS.  It has been
@@ -167,19 +177,62 @@ int4 gds_rundown(void)
 	 *	macro.  This would also avoid the assert problem
 	 *	and should be done eventually.
 	 */
-	if (dba_cm == reg->dyn.addr->acc_meth)
+	seg = reg->dyn.addr;
+	if (dba_cm == seg->acc_meth)
 		return EXIT_NRM;
-
 	udi = FILE_INFO(reg);
 	csa = &udi->s_addrs;
 	csd = csa->hdr;
-	assert(csa == cs_addrs && csd == cs_data);
+	assert((csa == cs_addrs) && (csd == cs_data));	/* relied upon by "jnl_ensure_open" calls below */
 	if ((reg->open) && (dba_usr == csd->acc_meth))
 	{
 		change_reg();
 		gvusr_rundown();
 		return EXIT_NRM;
 	}
+	/* If this region has a corresponding statsdb region that is open, close that first. This is needed to ensure
+	 * that the statsdb can safely be deleted at basedb rundown time if we happen to be the last one to rundown the basedb.
+	 */
+	is_statsDB = IS_STATSDB_REG(reg);
+	if (!is_statsDB)
+	{	/* Note that even if the baseDB has RDBF_NOSTATS set, we could have opened the statsDB region
+		 * (for example, if statsDB has read-only permissions, we would have opened it and found it is
+		 * read-only when we tried to add the ^%YGS node and would have disabled stats in the baseDB
+		 * all the while leaving the statsDB open. So we need to check if it is open and if so run it down
+		 * without checking the RDBF_NOSTATS bit in the baseDB.
+		 */
+		BASEDBREG_TO_STATSDBREG(reg, statsDBreg);
+		if (statsDBreg->open)
+		{
+			gv_cur_region = statsDBreg;	/* Switch "gv_cur_region" to do rundown of statsDB */
+			tp_change_reg();
+			gds_rundown(cleanup_udi); /* Ignore errors in statsdb rundown. Continue with baseDB rundown. */
+			gv_cur_region = reg;	/* Restore "gv_cur_region" back to continue rundown of baseDB */
+			tp_change_reg();
+			/* Now that statsdb has been rundown, reset basedb stats back to private memory in case it was
+			 * pointing to statsdb shared/mapped memory. Note that the following reset of the stats
+			 * pointer back to the internal stats buffer located is sgmnt_data is normally taken care
+			 * of by the statsdb unlink processing in gvcst_remove_statsDB_linkage() but we keep this
+			 * reset here also to be sure it gets done in case of a statsDB rundown issue.
+			 */
+			csa->gvstats_rec_p = &csa->gvstats_rec;
+		}
+	}
+	csa->regcnt--;
+	if (csa->regcnt)
+	{	/* There is at least one more region pointing to the same db file as this region.
+		 * Defer rundown of this "csa" until the last region corresponding to this csa is called for rundown.
+		 */
+		reg->open = FALSE;
+		return EXIT_NRM;
+	}
+	if (is_statsDB)
+	{	/* This is a statsdb. Fix reg->read_only & csa->read_write based on csa->orig_read_write.
+		 * This is so it reflects real permissions this process has on the statsdb.
+		 */
+		reg->read_only = !csa->orig_read_write;
+		csa->read_write = csa->orig_read_write;		/* Maintain read_only/read_write in parallel */
+	}
 	/* If the process has standalone access, it has udi->grabbed_access_sem set to TRUE at this point. Note that down in a local
 	 * variable as the udi->grabbed_access_sem is set to TRUE even for non-standalone access below and hence we can't rely on
 	 * that later to determine if the process had standalone access or not when it entered this function.  We need to guarantee
@@ -199,31 +252,31 @@ int4 gds_rundown(void)
 	}
 	assert(reg->open);			/* if we failed to open, dbinit_ch should have taken care of proper clean up */
 	assert(!reg->opening);			/* see comment above */
-	assert((dba_bg == csd->acc_meth) || (dba_mm == csd->acc_meth));
+	assert(IS_CSD_BG_OR_MM(csd));
 	is_mm = (dba_bg != csd->acc_meth);
 	assert(!csa->hold_onto_crit || (csa->now_crit && jgbl.onlnrlbk));
 	/* If we are online rollback, we should already be holding crit and should release it only at the end of this module. This
 	 * is usually done by noting down csa->now_crit in a local variable (was_crit) and using it whenever we are about to
-	 * grab_crit. But, there are instances (like mupip_set_journal.c) where we grab_crit but invoke gds_rundown without any
-	 * preceeding rel_crit. Such code relies on the fact that gds_rundown does rel_crit unconditionally (to get locks to a known
-	 * state). So, augment csa->now_crit with jgbl.onlnrlbk to track if we can rel_crit unconditionally or not in gds_rundown.
+	 * grab_crit. But, there are instances (like mupip_set_journal.c) where we grab_crit but invoke "gds_rundown" without any
+	 * preceeding rel_crit. Such code relies on the fact that "gds_rundown" does rel_crit unconditionally (to get locks to a
+	 * known state). So, augment csa->now_crit with jgbl.onlnrlbk to track if we can rel_crit unconditionally or not in
+	 * "gds_rundown".
 	 */
 	was_crit = (csa->now_crit && jgbl.onlnrlbk);
-	/* Cancel any pending flush timer for this region by this task */
-	canceled_flush_timer = FALSE;
+	/* Cancel any pending flush timer for this region by this process */
 	canceled_dbsync_timer = FALSE;
-	CANCEL_DB_TIMERS(reg, csa, canceled_flush_timer, canceled_dbsync_timer);
+	CANCEL_DB_TIMERS(reg, csa, canceled_dbsync_timer);
 	we_are_last_user = FALSE;
 	inst_is_frozen = IS_REPL_INST_FROZEN && REPL_ALLOWED(csa->hdr);
 	if (!csa->persistent_freeze)
-		region_freeze(reg, FALSE, FALSE, FALSE);
+		region_freeze(reg, FALSE, FALSE, FALSE, FALSE, FALSE);
 	if (!was_crit)
 	{
 		rel_crit(reg);		/* get locks to known state */
 		mutex_cleanup(reg);
 	}
-	/* The only process that can invoke gds_rundown while holding access control semaphore is RECOVER/ROLLBACK. All the others
-	 * (like MUPIP SET -FILE/MUPIP EXTEND would have invoked db_ipcs_reset() before invoking gds_rundown (from
+	/* The only process that can invoke "gds_rundown" while holding access control semaphore is RECOVER/ROLLBACK. All the
+	* others (like MUPIP SET -FILE/MUPIP EXTEND would have invoked db_ipcs_reset() before invoking "gds_rundown" (from
 	 * mupip_exit_handler). The only exception is when these processes encounter a terminate signal and they reach
 	 * mupip_exit_handler while holding access control semaphore. Assert accordingly.
 	 */
@@ -241,7 +294,7 @@ int4 gds_rundown(void)
 			save_errno = errno;
 			assert(FALSE);
 			rts_error_csa(CSA_ARG(csa) VARLSTCNT(12) ERR_CRITSEMFAIL, 2, DB_LEN_STR(reg), ERR_SYSCALL, 5,
-				  RTS_ERROR_TEXT("gds_rundown SEMCTL failed to get ftok_semval"), CALLFROM, errno);
+				      RTS_ERROR_TEXT("gds_rundown SEMCTL failed to get ftok_semval"), CALLFROM, errno);
 		}
 		may_bypass_ftok = CAN_BYPASS(ftok_semval, csd, inst_is_frozen); /* Do we need a blocking wait? */
 		/* We need to guarantee that no one else access database file header when semid/shmid fields are reset.
@@ -255,16 +308,16 @@ int4 gds_rundown(void)
 				holder_pid = semctl(udi->ftok_semid, DB_CONTROL_SEM, GETPID);
 				if ((uint4)-1 == holder_pid)
 					rts_error_csa(CSA_ARG(csa) VARLSTCNT(12) ERR_CRITSEMFAIL, 2, DB_LEN_STR(reg),
-							ERR_SYSCALL, 5,
-							RTS_ERROR_TEXT("gds_rundown SEMCTL failed to get holder_pid"),
-							CALLFROM, errno);
+						      ERR_SYSCALL, 5,
+						      RTS_ERROR_TEXT("gds_rundown SEMCTL failed to get holder_pid"),
+						      CALLFROM, errno);
 				if (!IS_GTM_IMAGE) /* MUMPS processes should not flood syslog with bypass messages. */
 				{
 					send_msg_csa(CSA_ARG(csa) VARLSTCNT(12) ERR_RESRCINTRLCKBYPAS, 10,
-						 LEN_AND_STR(gtmImageNames[image_type].imageName), process_id, LEN_AND_LIT("FTOK"),
-						 REG_LEN_STR(reg), DB_LEN_STR(reg), holder_pid);
+						     LEN_AND_STR(gtmImageNames[image_type].imageName), process_id,
+						     LEN_AND_LIT("FTOK"), REG_LEN_STR(reg), DB_LEN_STR(reg), holder_pid);
 					send_msg_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_TEXT, 2,
-							LEN_AND_LIT("FTOK bypassed at rundown"));
+						     LEN_AND_LIT("FTOK bypassed at rundown"));
 				}
 			} else
 			{	/* We did a blocking wait but something bad happened. */
@@ -285,7 +338,7 @@ int4 gds_rundown(void)
 			{
 				assert(FALSE);
 				rts_error_csa(CSA_ARG(csa) VARLSTCNT(12) ERR_CRITSEMFAIL, 2, DB_LEN_STR(reg), ERR_SYSCALL, 5,
-					  RTS_ERROR_TEXT("gds_rundown SEMCTL failed to get semval"), CALLFROM, errno);
+					      RTS_ERROR_TEXT("gds_rundown SEMCTL failed to get semval"), CALLFROM, errno);
 			}
 			bypassed_access = CAN_BYPASS(semval, csd, inst_is_frozen) || onln_rlbk_pid || csd->file_corrupt;
 			/* Before attempting again in the blocking mode, see if the holding process is an online rollback.
@@ -295,13 +348,13 @@ int4 gds_rundown(void)
 			holder_pid = semctl(udi->semid, DB_CONTROL_SEM, GETPID);
 			if ((uint4)-1 == holder_pid)
 				rts_error_csa(CSA_ARG(csa) VARLSTCNT(12) ERR_CRITSEMFAIL, 2, DB_LEN_STR(reg), ERR_SYSCALL, 5,
-					  RTS_ERROR_TEXT("gds_rundown SEMCTL failed to get holder_pid"), CALLFROM, errno);
+					      RTS_ERROR_TEXT("gds_rundown SEMCTL failed to get holder_pid"), CALLFROM, errno);
 			if (!bypassed_access)
 			{	/* We couldn't get it in one shot-- see if we already have it */
 				if (holder_pid == process_id)
 				{
 					send_msg_csa(CSA_ARG(csa) VARLSTCNT(5) MAKE_MSG_INFO(ERR_CRITSEMFAIL), 2, DB_LEN_STR(reg),
-							ERR_RNDWNSEMFAIL);
+						     ERR_RNDWNSEMFAIL);
 					REVERT;
 					ENABLE_INTERRUPTS(INTRPT_IN_GDS_RUNDOWN, prev_intrpt_state);
 					assert(FALSE);
@@ -311,28 +364,28 @@ int4 gds_rundown(void)
 				{
 					assert(FALSE);
 					rts_error_csa(CSA_ARG(csa) VARLSTCNT(12) ERR_CRITSEMFAIL, 2, DB_LEN_STR(reg),
-							ERR_SYSCALL, 5,
-							RTS_ERROR_TEXT("gds_rundown SEMOP on access control semaphore"),
-							CALLFROM, save_errno);
+						      ERR_SYSCALL, 5,
+						      RTS_ERROR_TEXT("gds_rundown SEMOP on access control semaphore"),
+						      CALLFROM, save_errno);
 				}
 				sop[0].sem_flg = sop[1].sem_flg = SEM_UNDO;	/* Try again - blocking this time */
 				SEMOP(udi->semid, sop, 2, status, FORCED_WAIT);
 				if (-1 == status)			/* We couldn't get it at all.. */
 					rts_error_csa(CSA_ARG(csa) VARLSTCNT(12) ERR_CRITSEMFAIL, 2, DB_LEN_STR(reg),
-							ERR_SYSCALL, 5,
-							RTS_ERROR_TEXT("gds_rundown SEMOP on access control semaphore"),
-							CALLFROM, errno);
+						      ERR_SYSCALL, 5,
+						      RTS_ERROR_TEXT("gds_rundown SEMOP on access control semaphore"),
+						      CALLFROM, errno);
 			} else if (!IS_GTM_IMAGE)
 			{
 				send_msg_csa(CSA_ARG(csa) VARLSTCNT(12) ERR_RESRCINTRLCKBYPAS, 10,
-						LEN_AND_STR(gtmImageNames[image_type].imageName), process_id,
-						LEN_AND_LIT("access control"), REG_LEN_STR(reg), DB_LEN_STR(reg), holder_pid);
+					     LEN_AND_STR(gtmImageNames[image_type].imageName), process_id,
+					     LEN_AND_LIT("access control"), REG_LEN_STR(reg), DB_LEN_STR(reg), holder_pid);
 				send_msg_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_TEXT, 2,
-						LEN_AND_LIT("Access control bypassed at rundown"));
+					     LEN_AND_LIT("Access control bypassed at rundown"));
 			}
 			udi->grabbed_access_sem = !bypassed_access;
 		}
-	} /* else we we hold the access control semaphore and therefore have standalone access. We do not release it now - we
+	} /* Else we we hold the access control semaphore and therefore have standalone access. We do not release it now - we
 	   * release it later in mupip_exit_handler.c. Since we already hold the access control semaphore, we don't need the
 	   * ftok semaphore and trying it could cause deadlock
 	   */
@@ -348,12 +401,16 @@ int4 gds_rundown(void)
 	 * no flushes of dirty buffers to this db can happen while the instance is frozen) activate safe mode.
 	 */
 	ok_to_write_pfin = !(bypassed_access || bypassed_ftok || inst_is_frozen);
-	safe_mode = !ok_to_write_pfin || ftok_counter_halted || access_counter_halted;
+	safe_mode = !ok_to_write_pfin || ftok_counter_halted || access_counter_halted || FROZEN_CHILLED(csd);
 	/* At this point we are guaranteed no one else is doing a db_init/rundown as we hold the access control semaphore */
 	assert(csa->ref_cnt);	/* decrement private ref_cnt before shared ref_cnt decrement. */
-	csa->ref_cnt--;		/* Currently journaling logic in gds_rundown() in VMS relies on this order to detect last writer */
+	csa->ref_cnt--;
 	assert(!csa->ref_cnt);
-	--cnl->ref_cnt;
+	/* Note that the below value is normally incremented/decremented under control of the init/rundown semaphore in
+	 * "db_init" and "gds_rundown" but if QDBRUNDOWN is turned ON it could be manipulated without the semaphore in
+	 * both callers. Therefore use interlocked INCR_CNT/DECR_CNT.
+	 */
+	DECR_CNT(&cnl->ref_cnt, &cnl->wc_var_lock);
 	if (memcmp(cnl->now_running, gtm_release_name, gtm_release_name_len + 1))
 	{	/* VERMISMATCH condition. Possible only if DSE */
 		assert(dse_running);
@@ -364,14 +421,14 @@ int4 gds_rundown(void)
 	{
 		save_errno = errno;
 		rts_error_csa(CSA_ARG(csa) VARLSTCNT(12) ERR_CRITSEMFAIL, 2, DB_LEN_STR(reg), ERR_SYSCALL, 5,
-				RTS_ERROR_TEXT("gds_rundown shmctl"), CALLFROM, save_errno);
+			      RTS_ERROR_TEXT("gds_rundown shmctl"), CALLFROM, save_errno);
 	} else
 		we_are_last_user =  (1 == shm_buf.shm_nattch) && !vermismatch && !safe_mode;
 	/* recover => one user except ONLINE ROLLBACK, or standalone with frozen instance */
 	assert(!have_standalone_access || we_are_last_user || jgbl.onlnrlbk || inst_is_frozen);
 	if (-1 == (semval = semctl(udi->semid, DB_COUNTER_SEM, GETVAL)))
 		rts_error_csa(CSA_ARG(csa) VARLSTCNT(12) ERR_CRITSEMFAIL, 2, DB_LEN_STR(reg), ERR_SYSCALL, 5,
-			  RTS_ERROR_TEXT("gds_rundown SEMCTL failed to get semval"), CALLFROM, errno);
+			      RTS_ERROR_TEXT("gds_rundown SEMCTL failed to get semval"), CALLFROM, errno);
 	/* There's one writer left and I am it */
 	assert(reg->read_only || semval >= 0);
 	unsafe_last_writer = (DB_COUNTER_SEM_INCR == semval) && (FALSE == reg->read_only) && !vermismatch;
@@ -383,7 +440,7 @@ int4 gds_rundown(void)
 	GTM_WHITE_BOX_TEST(WBTEST_ANTIFREEZE_JNLCLOSE, we_are_last_writer, 1); /* Assume we are the last writer to invoke wcs_flu */
 	if (!have_standalone_access && (-1 == (ftok_semval = semctl(udi->ftok_semid, DB_COUNTER_SEM, GETVAL))))
 		rts_error_csa(CSA_ARG(csa) VARLSTCNT(12) ERR_CRITSEMFAIL, 2, DB_LEN_STR(reg), ERR_SYSCALL, 5,
-			  RTS_ERROR_TEXT("gds_rundown SEMCTL failed to get ftok_semval"), CALLFROM, errno);
+			      RTS_ERROR_TEXT("gds_rundown SEMCTL failed to get ftok_semval"), CALLFROM, errno);
 	if (NULL != csa->ss_ctx)
 		ss_destroy_context(csa->ss_ctx);
 	/* SS_MULTI: If multiple snapshots are supported, then we have to run through each of the snapshots */
@@ -392,13 +449,12 @@ int4 gds_rundown(void)
 	ss_pid = ss_shm_ptr->ss_info.ss_pid;
 	is_cur_process_ss_initiator = (process_id == ss_pid);
 	if (ss_pid && (is_cur_process_ss_initiator || we_are_last_user))
-	{
-		/* Try getting snapshot crit latch. If we don't get latch, we won't hang for eternity and will skip
+	{	/* Try getting snapshot crit latch. If we don't get latch, we won't hang for eternity and will skip
 		 * doing the orphaned snapshot cleanup. It will be cleaned up eventually either by subsequent MUPIP
 		 * INTEG or by a MUPIP RUNDOWN.
 		 */
 		if (ss_get_lock_nowait(reg) && (ss_pid == ss_shm_ptr->ss_info.ss_pid)
-			&& (is_cur_process_ss_initiator || !is_proc_alive(ss_pid, 0)))
+		    && (is_cur_process_ss_initiator || !is_proc_alive(ss_pid, 0)))
 		{
 			ss_release(NULL);
 			ss_release_lock(reg);
@@ -409,15 +465,16 @@ int4 gds_rundown(void)
 	 * future rollback to undo more journal records (PBLKs). In this case, we will go ahead and remove shared memory (without
 	 * flushing the contents) in this routine. A reissue of the recover/rollback command will restore the database to a
 	 * consistent state.
+	 * Or if we have an Online Freeze, skip flushing, as that will be handled when the freeze is removed.
 	 */
-	if (!cnl->donotflush_dbjnl && !reg->read_only && !vermismatch)
+	if (!cnl->donotflush_dbjnl && !reg->read_only && !vermismatch && !FROZEN_CHILLED(csd))
 	{	/* If we had an orphaned block and were interrupted, set wc_blocked so we can invoke wcs_recover. Do it ONLY
 		 * if there is NO concurrent online rollback running (as we need crit to set wc_blocked)
 		 */
 		if (csa->wbuf_dqd && !is_mm)
 		{	/* If we had an orphaned block and were interrupted, mupip_exit_handler will invoke secshr_db_clnup which
-			 * will clear this field and so we should never come to gds_rundown with a non-zero wbuf_dqd. The only
-			 * exception is if we are recover/rollback in which case gds_rundown (from mur_close_files) is invoked
+			 * will clear this field and so we should never come to "gds_rundown" with a non-zero wbuf_dqd. The only
+			 * exception is if we are recover/rollback in which case "gds_rundown" (from mur_close_files) is invoked
 			 * BEFORE secshr_db_clnup in mur_close_files.
 			 * Note: It is NOT possible for online rollback to reach here with wbuf_dqd being non-zero. This is because
 			 * the moment we apply the first PBLK, we stop all interrupts and hence can never be interrupted in
@@ -429,7 +486,7 @@ int4 gds_rundown(void)
 			SET_TRACEABLE_VAR(cnl->wc_blocked, TRUE);
 			BG_TRACE_PRO_ANY(csa, wcb_gds_rundown);
                         send_msg_csa(CSA_ARG(csa) VARLSTCNT(8) ERR_WCBLOCKED, 6, LEN_AND_LIT("wcb_gds_rundown"),
-                                process_id, &csa->ti->curr_tn, DB_LEN_STR(reg));
+				     process_id, &csa->ti->curr_tn, DB_LEN_STR(reg));
 			csa->wbuf_dqd = 0;
 			wcs_recover(reg);
 			BG_TRACE_PRO_ANY(csa, lost_block_recovery);
@@ -448,13 +505,14 @@ int4 gds_rundown(void)
 				cnl->remove_shm = TRUE;
 			}
 			if (cnl->wc_blocked && jgbl.onlnrlbk)
-			{	/* if the last update done by online rollback was not committed in the normal code-path but was
-				 * completed by secshr_db_clnup, wc_blocked will be set to TRUE. But, since online rollback never
-				 * invokes grab_crit (since csa->hold_onto_crit is set to TRUE), wcs_recover is never invoked. This
-				 * could result in the last update never getting flushed to the disk and if online rollback happened
-				 * to be the last writer then the shared memory will be flushed and removed and the last update will
-				 * be lost. So, force wcs_recover if we find ourselves in such a situation. But, wc_blocked is
-				 * possible only if phase1 or phase2 errors are induced using white box test cases
+			{	/* if the last update done by online rollback was not committed in the normal code-path but
+				 * was completed by secshr_db_clnup, wc_blocked will be set to TRUE. But, since online
+				 * rollback never invokes grab_crit (since csa->hold_onto_crit is set to TRUE), wcs_recover
+				 * is never invoked. This could result in the last update never getting flushed to the disk
+				 * and if online rollback happened to be the last writer then the shared memory will be
+				 * flushed and removed and the last update will be lost. So, force wcs_recover if we find
+				 * ourselves in such a situation. But, wc_blocked is possible only if phase1 or phase2
+				 * errors are induced using white box test cases
 				 */
 				assert(WB_COMMIT_ERR_ENABLED);
 				wcs_recover(reg);
@@ -463,33 +521,39 @@ int4 gds_rundown(void)
 			 * also ensures that the db is fsynced. We don't want to use it in the calls to
 			 * wcs_flu() from t_end() and tp_tend() since we can defer it to out-of-crit there.
 			 * In this case, since we are running down, we don't have any such option.
+			 * If we are in safe_mode, we won't get here, so no need to check for online freeze.
 			 */
 			cnl->remove_shm = wcs_flu(WCSFLU_FLUSH_HDR | WCSFLU_WRITE_EPOCH | WCSFLU_SYNC_EPOCH);
+			/* wcs_flu() performs writes asynchronously, which might spawn up a thread. We close it here. Since
+			 * the thread belongs to the global directory, we assume no one else is doing the same for this global
+			 * directory.
+			 */
+			IF_LIBAIO(aio_shim_destroy(udi->owning_gd);)
 			/* Since we_are_last_writer, we should be guaranteed that wcs_flu() did not change csd, (in
 			 * case of MM for potential file extension), even if it did a grab_crit().  Therefore, make
 			 * sure that's true.
 			 */
 			assert(csd == csa->hdr);
 			assert(0 == memcmp(csd->label, GDS_LABEL, GDS_LABEL_SZ - 1));
-		} else if (((canceled_flush_timer && (0 > cnl->wcs_timers)) || canceled_dbsync_timer) && !inst_is_frozen)
-		{	/* canceled pending db or jnl flush timers - flush database and journal buffers to disk */
-			if (!was_crit)
-				grab_crit(reg);
-			/* we need to sync the epoch as the fact that there is no active pending flush timer implies
-			 * there will be noone else who will flush the dirty buffers and EPOCH to disk in a timely fashion
+		} else if (((csa->canceled_flush_timer && (0 > cnl->wcs_timers)) || canceled_dbsync_timer)
+				&& !inst_is_frozen)
+		{	/* If we canceled a pending dbsync timer in "gds_rundown" OR canceled a db flush timer in "gds_rundown"
+			 * or sometime in the past (e.g. because we found a JNL_FILE_SWITCHED situation in wcs_stale etc.)
+			 * AND there are no other active pending flush timers, it is possible we have unflushed buffers in
+			 * the db/jnl so call wcs_flu to flush EPOCH to disk in a timely fashion.
+			 * But before that, check if a wcs_flu is really necessary. If not, skip the heavyweight call.
 			 */
-			wcs_flu(WCSFLU_FLUSH_HDR | WCSFLU_WRITE_EPOCH | WCSFLU_SYNC_EPOCH);
-			if (!was_crit)
-				rel_crit(reg);
-			assert((dba_mm == cs_data->acc_meth) || (csd == cs_data));
+			db_needs_flushing = (cnl->last_wcsflu_tn < csa->ti->curr_tn);
+			if (db_needs_flushing)
+				wcs_flu(WCSFLU_FLUSH_HDR | WCSFLU_WRITE_EPOCH | WCSFLU_SYNC_EPOCH);
+			/* Same as above wcs_flu() */
+			IF_LIBAIO(aio_shim_destroy(udi->owning_gd);)
+			assert(is_mm || (csd == cs_data));
 			csd = cs_data;	/* In case this is MM and wcs_flu() remapped an extended database, reset csd */
 		}
 		/* Do rundown journal processing after buffer flushes since they require jnl to be open */
 		if (JNL_ENABLED(csd))
-		{	/* the following tp_change_reg() is not needed due to the assert csa == cs_addrs at the beginning
-			 * of gds_rundown(), but just to be safe. To be removed by 2002!! --- nars -- 2001/04/25.
-			 */
-			tp_change_reg();	/* call this because jnl_ensure_open checks cs_addrs rather than gv_cur_region */
+		{
 			jpc = csa->jnl;
 			jbp = jpc->jnl_buff;
 			if (jbp->fsync_in_prog_latch.u.parts.latch_pid == process_id)
@@ -503,13 +567,14 @@ int4 gds_rundown(void)
                                 COMPSWAP_UNLOCK(&jbp->io_in_prog_latch, process_id, 0, LOCK_AVAILABLE, 0);
                         }
 			if ((((NOJNL != jpc->channel) && !JNL_FILE_SWITCHED(jpc))
-				|| we_are_last_writer && (0 != cnl->jnl_file.u.inode)) && ok_to_write_pfin)
+			     || we_are_last_writer && (0 != cnl->jnl_file.u.inode)) && ok_to_write_pfin)
 			{	/* We need to close the journal file cleanly if we have the latest generation journal file open
 				 *	or if we are the last writer and the journal file is open in shared memory (not necessarily
 				 *	by ourselves e.g. the only process that opened the journal got shot abnormally)
 				 * Note: we should not infer anything from the shared memory value of cnl->jnl_file.u.inode
 				 * 	if we are not the last writer as it can be concurrently updated.
 				 */
+				do_jnlwait = FALSE;
 				if (!was_crit)
 					grab_crit(reg);
 				if (JNL_ENABLED(csd))
@@ -520,7 +585,7 @@ int4 gds_rundown(void)
 					 * journal records (if it decides to switch to a new journal file).
 					 */
 					ADJUST_GBL_JREC_TIME(jgbl, jbp);
-					jnl_status = jnl_ensure_open();
+					jnl_status = jnl_ensure_open(reg, csa);
 					if (0 == jnl_status)
 					{	/* If we_are_last_writer, we would have already done a wcs_flu() which would
 						 * have written an epoch record and we are guaranteed no further updates
@@ -529,15 +594,24 @@ int4 gds_rundown(void)
 						 * a pini, so allow for that.
 						 */
 						assert(!jbp->before_images || is_mm
-						    || !we_are_last_writer || (0 != jpc->pini_addr) || jgbl.mur_extract
-						    || (jpc->jnl_buff->freeaddr == jpc->jnl_buff->post_epoch_freeaddr));
+						       || !we_are_last_writer || (0 != jpc->pini_addr) || jgbl.mur_extract
+						       || (jpc->jnl_buff->freeaddr == jpc->jnl_buff->post_epoch_freeaddr));
 						/* If we haven't written a pini, let jnl_file_close write the pini/pfin. */
 						if (!jgbl.mur_extract && (0 != jpc->pini_addr))
+						{
 							jnl_put_jrt_pfin(csa);
-						/* If not the last writer and no pending flush timer left, do jnl flush now */
+							wrote_pfin = TRUE;
+						} else
+							wrote_pfin = FALSE;
+						/* If not the last writer and no pending flush timer left, do jnl flush now.
+						 * But if we wrote a PFIN record, then we can instead do a "jnl_wait" which is
+						 * done outside CRIT and is equivalent to "jnl_flush".
+						 */
 						if (!we_are_last_writer && (0 > cnl->wcs_timers))
 						{
-							if (SS_NORMAL == (jnl_status = jnl_flush(reg)))
+							if (wrote_pfin)
+								do_jnlwait = TRUE;
+							else if (SS_NORMAL == (jnl_status = jnl_flush(reg)))
 							{
 								assert(jbp->freeaddr == jbp->dskaddr);
 								jnl_fsync(reg, jbp->dskaddr);
@@ -556,16 +630,22 @@ int4 gds_rundown(void)
 								 */
 							}
 						}
-						jnl_file_close(reg, we_are_last_writer, FALSE);
+						if (!do_jnlwait)
+							jnl_file_close(reg, we_are_last_writer, FALSE);
 					} else
 						send_msg_csa(CSA_ARG(csa) VARLSTCNT(6) jnl_status, 4, JNL_LEN_STR(csd),
-								DB_LEN_STR(reg));
+							     DB_LEN_STR(reg));
 				}
 				if (!was_crit)
 					rel_crit(reg);
+				if (do_jnlwait)
+				{
+					jnl_wait(reg);	/* Try to do db fsync outside crit */
+					jnl_file_close(reg, we_are_last_writer, FALSE);
+				}
 			}
 		}
-		if (we_are_last_writer)			/* Flush the fileheader last and harden the file to disk */
+		if (we_are_last_writer)		/* Flush the fileheader last and harden the file to disk */
 		{
 			if (!was_crit)
 				grab_crit(reg);			/* To satisfy crit requirement in fileheader_sync() */
@@ -586,21 +666,22 @@ int4 gds_rundown(void)
 				if (-1 == rc)
 				{
 					rts_error_csa(CSA_ARG(csa) VARLSTCNT(9) ERR_DBFILERR, 2, DB_LEN_STR(reg),
-						  ERR_TEXT, 2, RTS_ERROR_TEXT("Error during file sync at close"), errno);
+						      ERR_TEXT, 2, RTS_ERROR_TEXT("Error during file sync at close"), errno);
 				}
 			} else
 			{	/* Now do final MM file sync before exit */
 				assert(csa->ti->total_blks == csa->total_blks);
-				#ifdef _AIX
+#				ifdef _AIX
 				GTM_DB_FSYNC(csa, udi->fd, rc);
 				if (-1 == rc)
-				#else
+#				else
 				if (-1 == MSYNC((caddr_t)csa->db_addrs[0], (caddr_t)csa->db_addrs[1]))
-				#endif
-				{
-					rts_error_csa(CSA_ARG(csa) VARLSTCNT(9) ERR_DBFILERR, 2, DB_LEN_STR(reg),
-						  ERR_TEXT, 2, RTS_ERROR_TEXT("Error during file sync at close"), errno);
-				}
+#				endif
+					{
+						rts_error_csa(CSA_ARG(csa) VARLSTCNT(9) ERR_DBFILERR, 2, DB_LEN_STR(reg),
+							      ERR_TEXT, 2, RTS_ERROR_TEXT("Error during file sync at close"),
+							      errno);
+					}
 			}
 		} else if (unsafe_last_writer && !cnl->lastwriterbypas_msg_issued)
 		{
@@ -611,16 +692,17 @@ int4 gds_rundown(void)
 	/* We had canceled all db timers at start of rundown. In case as part of rundown (wcs_flu above), we had started
 	 * any timers, cancel them BEFORE setting reg->open to FALSE (assert in wcs_clean_dbsync relies on this).
 	 */
-	CANCEL_DB_TIMERS(reg, csa, canceled_flush_timer, canceled_dbsync_timer);
+	CANCEL_DB_TIMERS(reg, csa, canceled_dbsync_timer);
 	if (reg->read_only && we_are_last_user && !have_standalone_access && cnl->remove_shm)
 	{	/* mupip_exit_handler will do this after mur_close_file */
+		db_ipcs.open_fd_with_o_direct = udi->fd_opened_with_o_direct;
 		db_ipcs.semid = INVALID_SEMID;
 		db_ipcs.shmid = INVALID_SHMID;
 		db_ipcs.gt_sem_ctime = 0;
 		db_ipcs.gt_shm_ctime = 0;
-		db_ipcs.fn_len = reg->dyn.addr->fname_len;
-		memcpy(db_ipcs.fn, reg->dyn.addr->fname, reg->dyn.addr->fname_len);
-		db_ipcs.fn[reg->dyn.addr->fname_len] = 0;
+		db_ipcs.fn_len = seg->fname_len;
+		memcpy(db_ipcs.fn, seg->fname, seg->fname_len);
+		db_ipcs.fn[seg->fname_len] = 0;
  		/* request gtmsecshr to flush. read_only cannot flush itself */
 		WAIT_FOR_REPL_INST_UNFREEZE_SAFE(csa);
 		if (!csa->read_only_fs)
@@ -628,26 +710,63 @@ int4 gds_rundown(void)
 			secshrstat = send_mesg2gtmsecshr(FLUSH_DB_IPCS_INFO, 0, (char *)NULL, 0);
 			if (0 != secshrstat)
 				rts_error_csa(CSA_ARG(csa) VARLSTCNT(8) ERR_DBFILERR, 2, DB_LEN_STR(reg),
-					  ERR_TEXT, 2, RTS_ERROR_TEXT("gtmsecshr failed to update database file header"));
+					      ERR_TEXT, 2, RTS_ERROR_TEXT("gtmsecshr failed to update database file header"));
 		}
 	}
+	if (!is_mm && csd->asyncio)
+	{	/* Cancel ALL pending async ios for this region by this process. Need to do this BEFORE detaching from database
+		 * shared memory OR closing the file descriptor (udi->fd) as the in-progress asyncio buffers/fd point there.
+		 */
+#		ifndef USE_LIBAIO
+		WAIT_FOR_AIO_TO_BE_DONE(udi->fd, aiocancel_timedout);
+		if (aiocancel_timedout)
+			send_msg_csa(CSA_ARG(csa) VARLSTCNT(5) ERR_AIOCANCELTIMEOUT, 3, process_id, DB_LEN_STR(reg));
+#		else
+		/* Here, aio_shim_destroy() will destroy the thread and the kernel context associated with the entire global
+		 * directory -- so this effectively cancels all in-progress IOs to all subsequent regions that are about to
+		 * be rundown. This is necessary, however, because we need to cancel all in-progress IOs before the below
+		 * CLOSEFILE_RESET().
+		 *
+		 * IOs canceled for subsequent regions will be reissued when we go to "gds_rundown" next and the
+		 * wcs_flu()/wcs_wtstart()/aio_shim_write() happens, which will reopen the kernel context and multiplexing thread
+		 * as necessary.
+		 */
+		aio_shim_destroy(udi->owning_gd);
+#		endif
+	}
+	/* If "reg" is a statsdb, it is possible that the basedb has asyncio turned on and has called for the statsdb to be
+	 * rundown first. A statsdb never has asyncio turned on. So it is possible that thread_gdi is non-NULL and will be
+	 * cleaned up as part of the "aio_shim_destroy" done in "gds_rundown" of the basedb but that will happen only after
+	 * the statsdb rundown completes. So account for that in the below assert.
+	 */
+	assert((NULL == udi->owning_gd->thread_gdi) || is_statsDB);
+	udi->owning_gd = NULL;
 	/* Done with file now, close it */
 	CLOSEFILE_RESET(udi->fd, rc);	/* resets "udi->fd" to FD_INVALID */
 	if (-1 == rc)
 	{
 		rts_error_csa(CSA_ARG(csa) VARLSTCNT(9) ERR_DBFILERR, 2, DB_LEN_STR(reg),
-			  ERR_TEXT, 2, LEN_AND_LIT("Error during file close"), errno);
+			      ERR_TEXT, 2, LEN_AND_LIT("Error during file close"), errno);
 	}
-	/* Unmap storage if mm mode but only the part that is not the fileheader (so shows up in dumps) */
-#	if !defined(_AIX)
-	if (is_mm && (NULL != csa->db_addrs[0]))
+	if (NULL != csa->db_addrs[0])
 	{
-		assert(csa->db_addrs[1] > csa->db_addrs[0]);
-		munmap_len = (sm_long_t)(csa->db_addrs[1] - csa->db_addrs[0]);
-		if (0 < munmap_len)
-			munmap((caddr_t)(csa->db_addrs[0]), (size_t)(munmap_len));
+		/* Unmap storage if mm mode */
+		if (is_mm)
+		{
+			assert(csa->db_addrs[1] > csa->db_addrs[0]);
+#			if !defined(_AIX)
+			munmap_len = (sm_long_t)(1 + csa->db_addrs[1] - csa->db_addrs[0]);	/* Note: 1 + to compensate for
+												 * -1 done in "db_init".
+												 */
+			assert(0 < munmap_len);
+			status = munmap((caddr_t)(csa->db_addrs[0]), (size_t)(munmap_len));
+			assert(0 == status);
+#			endif
+		}
+		/* If this is a BASEDB and we are the last one out, prepare to unlink/remove the corresponding STATSDB */
+		if (we_are_last_user)
+			UNLINK_STATSDB_AT_BASEDB_RUNDOWN(cnl);
 	}
-#	endif
 	/* Detach our shared memory while still under lock so reference counts will be correct for the next process to run down
 	 * this region. In the process also get the remove_shm status from node_local before detaching.
 	 * If cnl->donotflush_dbjnl is TRUE, it means we can safely remove shared memory without compromising data
@@ -674,8 +793,9 @@ int4 gds_rundown(void)
 	if (jgbl.onlnrlbk)
 		csa->hold_onto_crit = FALSE;
 	GTM_WHITE_BOX_TEST(WBTEST_HOLD_SEM_BYPASS, cnl->wbox_test_seq_num, 0);
-	status = shmdt((caddr_t)cnl);
+	status = SHMDT((caddr_t)cnl);
 	csa->nl = NULL; /* dereferencing nl after detach is not right, so we set it to NULL so that we can test before dereference*/
+	csa->hdr = NULL;	/* dereferencing hdr after detach also is not right so set it to NULL */
 	/* Note that although csa->nl is NULL, we use CSA_ARG(csa) below (not CSA_ARG(NULL)) to be consistent with similar
 	 * usages before csa->nl became NULL. The "is_anticipatory_freeze_needed" function (which is in turn called by the
 	 * CHECK_IF_FREEZE_ON_ERROR_NEEDED macro) does a check of csa->nl before dereferencing shared memory contents so
@@ -683,9 +803,10 @@ int4 gds_rundown(void)
 	 */
 	if (-1 == status)
 		send_msg_csa(CSA_ARG(csa) VARLSTCNT(9) ERR_DBFILERR, 2, DB_LEN_STR(reg), ERR_TEXT, 2,
-				LEN_AND_LIT("Error during shmdt"), errno);
+			     LEN_AND_LIT("Error during shmdt"), errno);
 	REMOVE_CSA_FROM_CSADDRSLIST(csa);	/* remove "csa" from list of open regions (cs_addrs_list) */
 	reg->open = FALSE;
+	assert(!is_statsDB || process_exiting || IS_GTCM_GNP_SERVER_IMAGE);
 	/* If file is still not in good shape, die here and now before we get rid of our storage */
 	assertpro(0 == csa->wbuf_dqd);
 	ipc_deleted = FALSE;
@@ -698,7 +819,7 @@ int4 gds_rundown(void)
 			ipc_deleted = TRUE;
 			if (0 != shm_rmid(udi->shmid))
 				rts_error_csa(CSA_ARG(csa) VARLSTCNT(8) ERR_DBFILERR, 2, DB_LEN_STR(reg),
-					ERR_TEXT, 2, RTS_ERROR_TEXT("Unable to remove shared memory"));
+					      ERR_TEXT, 2, RTS_ERROR_TEXT("Unable to remove shared memory"));
 			/* Note that this process deleted shared memory. Currently only used by rollback. */
 			udi->shm_deleted = TRUE;
 			/* mupip recover/rollback don't release the semaphore here, but do it later in db_ipcs_reset (invoked from
@@ -713,6 +834,14 @@ int4 gds_rundown(void)
 				udi->grabbed_access_sem = FALSE;
 				udi->counter_acc_incremented = FALSE;
 			}
+			if (is_statsDB)
+			{
+				STATSDBREG_TO_BASEDBREG(reg, baseDBreg);
+				assert(baseDBreg->open);
+				baseDBcsa = &FILE_INFO(baseDBreg)->s_addrs;
+				baseDBnl = baseDBcsa->nl;
+				baseDBnl->statsdb_rundown_clean = TRUE;
+			}
 		} else if (is_src_server || is_updproc)
 		{
 			gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(6) ERR_DBRNDWNWRN, 4, DB_LEN_STR(reg), process_id, process_id);
@@ -731,9 +860,9 @@ int4 gds_rundown(void)
 					save_errno = do_semop(udi->semid, DB_COUNTER_SEM, -DB_COUNTER_SEM_INCR, SEM_UNDO);
 					if (0 != save_errno)
 						rts_error_csa(CSA_ARG(csa) VARLSTCNT(12) ERR_CRITSEMFAIL, 2, DB_LEN_STR(reg),
-								ERR_SYSCALL, 5,
-								RTS_ERROR_TEXT("gds_rundown access control semaphore decrement"),
-								CALLFROM, save_errno);
+							      ERR_SYSCALL, 5,
+							      RTS_ERROR_TEXT("gds_rundown access control semaphore decrement"),
+							      CALLFROM, save_errno);
 				}
 				udi->counter_acc_incremented = FALSE;
 			}
@@ -743,9 +872,9 @@ int4 gds_rundown(void)
 			{
 				if (0 != (save_errno = do_semop(udi->semid, DB_CONTROL_SEM, -1, SEM_UNDO)))
 					rts_error_csa(CSA_ARG(csa) VARLSTCNT(12) ERR_CRITSEMFAIL, 2, DB_LEN_STR(reg),
-							ERR_SYSCALL, 5,
-							RTS_ERROR_TEXT("gds_rundown access control semaphore release"),
-							CALLFROM, save_errno);
+						      ERR_SYSCALL, 5,
+						      RTS_ERROR_TEXT("gds_rundown access control semaphore release"),
+						      CALLFROM, save_errno);
 				udi->grabbed_access_sem = FALSE;
 			}
 		} /* else access control semaphore will be released in db_ipcs_reset */
@@ -771,18 +900,71 @@ int4 gds_rundown(void)
 		GET_CUR_TIME(time_str);
 		if (is_src_server)
 			gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(8) ERR_IPCNOTDEL, 6, CTIME_BEFORE_NL, time_str,
-				LEN_AND_LIT("Source server"), REG_LEN_STR(reg));
+				       LEN_AND_LIT("Source server"), REG_LEN_STR(reg));
 		if (is_updproc)
 			gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(8) ERR_IPCNOTDEL, 6, CTIME_BEFORE_NL, time_str,
-				LEN_AND_LIT("Update process"), REG_LEN_STR(reg));
+				       LEN_AND_LIT("Update process"), REG_LEN_STR(reg));
 		if (mupip_jnl_recover && (!jgbl.onlnrlbk || !we_are_last_user))
 		{
 			gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(8) ERR_IPCNOTDEL, 6, CTIME_BEFORE_NL, time_str,
-				LEN_AND_LIT("Mupip journal process"), REG_LEN_STR(reg));
+				       LEN_AND_LIT("Mupip journal process"), REG_LEN_STR(reg));
 			send_msg_csa(CSA_ARG(csa) VARLSTCNT(8) ERR_IPCNOTDEL, 6, CTIME_BEFORE_NL, time_str,
-				LEN_AND_LIT("Mupip journal process"), REG_LEN_STR(reg));
+				     LEN_AND_LIT("Mupip journal process"), REG_LEN_STR(reg));
 		}
 	}
 	REVERT;
+	/* Now that "gds_rundown" is done, free up the memory associated with the region as long as the caller is okay with it */
+	if (cleanup_udi)
+	{
+		if (NULL != csa->dir_tree)
+			FREE_CSA_DIR_TREE(csa);
+		if (csa->sgm_info_ptr)
+		{
+			si = csa->sgm_info_ptr;
+			/* It is possible we got interrupted before initializing all fields of "si"
+			 * completely so account for NULL values while freeing/releasing those fields.
+			 */
+			assert((si->tp_csa == csa) || (NULL == si->tp_csa));
+			if (si->jnl_tail)
+			{
+				PROBE_FREEUP_BUDDY_LIST(si->format_buff_list);
+				PROBE_FREEUP_BUDDY_LIST(si->jnl_list);
+			}
+			PROBE_FREEUP_BUDDY_LIST(si->recompute_list);
+			PROBE_FREEUP_BUDDY_LIST(si->new_buff_list);
+			PROBE_FREEUP_BUDDY_LIST(si->tlvl_info_list);
+			PROBE_FREEUP_BUDDY_LIST(si->tlvl_cw_set_list);
+			PROBE_FREEUP_BUDDY_LIST(si->cw_set_list);
+			if (NULL != si->blks_in_use)
+			{
+				free_hashtab_int4(si->blks_in_use);
+				free(si->blks_in_use);
+				si->blks_in_use = NULL;
+			}
+			if (si->cr_array_size)
+			{
+				assert(NULL != si->cr_array);
+				if (NULL != si->cr_array)
+					free(si->cr_array);
+			}
+			if (NULL != si->first_tp_hist)
+				free(si->first_tp_hist);
+			free(si);
+		}
+		if (csa->jnl)
+		{
+			assert(&FILE_INFO(csa->jnl->region)->s_addrs == csa);
+			if (csa->jnl->jnllsb)
+			{
+				assert(FALSE);
+				free(csa->jnl->jnllsb);
+			}
+			free(csa->jnl);
+		}
+		assert(seg->file_cntl->file_info);
+		free(seg->file_cntl->file_info);
+		free(seg->file_cntl);
+		seg->file_cntl = NULL;
+	}
 	return EXIT_NRM;
 }
diff --git a/sr_unix/gds_rundown_err_cleanup.c b/sr_unix/gds_rundown_err_cleanup.c
index e44e411..e05e30c 100644
--- a/sr_unix/gds_rundown_err_cleanup.c
+++ b/sr_unix/gds_rundown_err_cleanup.c
@@ -41,7 +41,7 @@ void gds_rundown_err_cleanup(boolean_t have_standalone_access)
 	int		semop_res;
 	unix_db_info	*udi;
 	sgmnt_addrs	*csa;
-	boolean_t	cancelled_timer, cancelled_dbsync_timer;
+	boolean_t	cancelled_dbsync_timer;
 
 	/* Here, we can not rely on the validity of csa->hdr because this function can be triggered anywhere in
 	 * gds_rundown().Because we don't have access to file header, we can not know if counters are disabled so we go by our best
@@ -50,7 +50,7 @@ void gds_rundown_err_cleanup(boolean_t have_standalone_access)
 	udi = FILE_INFO(gv_cur_region);
 	csa = &udi->s_addrs;
 	/* We got here on an error and are going to close the region. Cancel any pending flush timer for this region by this task*/
-	CANCEL_DB_TIMERS(gv_cur_region, csa, cancelled_timer, cancelled_dbsync_timer);
+	CANCEL_DB_TIMERS(gv_cur_region, csa, cancelled_dbsync_timer);
 	if (csa->now_crit)		/* Might hold crit if wcs_flu or other failure */
 	{
 		assert(!csa->hold_onto_crit || jgbl.onlnrlbk);
diff --git a/sr_unix/gdsfheadsp.h b/sr_unix/gdsfheadsp.h
index b8a1306..096ca2f 100755
--- a/sr_unix/gdsfheadsp.h
+++ b/sr_unix/gdsfheadsp.h
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2005 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -12,7 +13,6 @@
 #ifndef __GDSFHEADSP_H__
 #define __GDSFHEADSP_H__
 
-int dsk_write(gd_region *r, block_id blk, cache_rec_ptr_t cr);
 int dsk_write_nocache(gd_region *r, block_id blk, sm_uc_ptr_t buff, enum db_ver ondsk_blkver);
 void wcs_clean_dbsync_timer(sgmnt_addrs *csa);
 
diff --git a/sr_unix/gdsfilext.c b/sr_unix/gdsfilext.c
old mode 100755
new mode 100644
index 1792f3e..6859405
--- a/sr_unix/gdsfilext.c
+++ b/sr_unix/gdsfilext.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -58,21 +58,25 @@
 #include "repl_msg.h"
 #include "gtmsource.h"
 #include "error.h"
+#include "wcs_backoff.h"
+#include "wcs_wt.h"
+#include "db_write_eof_block.h"
+#include "interlock.h"
 
 #define	GDSFILEXT_CLNUP						\
-{								\
+MBSTART {							\
 	if (!was_crit)						\
 		rel_crit(gv_cur_region);			\
-}
+} MBEND
 
 #define ISSUE_WAITDSKSPACE(TO_WAIT, WAIT_PERIOD, MECHANISM)									\
-{																\
+MBSTART {															\
 	uint4		seconds;												\
 																\
 	seconds = TO_WAIT + (CDB_STAGNATE - t_tries) * WAIT_PERIOD;								\
 	MECHANISM(CSA_ARG(cs_addrs) VARLSTCNT(11) ERR_WAITDSKSPACE, 4, process_id, seconds, DB_LEN_STR(gv_cur_region), ERR_TEXT,\
 			2, LEN_AND_LIT("Please make more disk space available or shutdown GT.M to avoid data loss"), ENOSPC);	\
-}
+} MBEND
 
 #define SUSPICIOUS_EXTEND 	(2 * (dollar_tlevel ? sgm_info_ptr->cw_set_depth : cw_set_depth) < cs_addrs->ti->free_blocks)
 
@@ -107,8 +111,8 @@ error_def(ERR_WAITDSKSPACE);
 OS_PAGE_SIZE_DECLARE
 
 #if !defined(__sun) && !defined(__hpux)
-STATICFNDCL int extend_wait_for_fallocate(unix_db_info *udi, uint4 new_total);
-STATICFNDEF int extend_wait_for_fallocate(unix_db_info *udi, uint4 new_total)
+STATICFNDCL int extend_wait_for_fallocate(unix_db_info *udi, off_t new_size);
+STATICFNDEF int extend_wait_for_fallocate(unix_db_info *udi, off_t new_size)
 {
 	int to_wait, to_msg, wait_period, save_errno;
 
@@ -121,18 +125,19 @@ STATICFNDEF int extend_wait_for_fallocate(unix_db_info *udi, uint4 new_total)
 			ISSUE_WAITDSKSPACE(to_wait, wait_period, send_msg_csa);
 		hiber_start(1000);
 		to_wait--;
-		save_errno = posix_fallocate(udi->fd, 0, BLK_ZERO_OFF(cs_data) + (off_t)new_total * cs_data->blk_size +
-					     DISK_BLOCK_SIZE);
+		save_errno = posix_fallocate(udi->fd, 0, new_size);
 	} while ((to_wait > 0) && (ENOSPC == save_errno));
 	return save_errno;
 }
 #endif
 
-STATICFNDCL int extend_wait_for_write(unix_db_info *udi, off_t new_eof, char *buff);
-STATICFNDEF int extend_wait_for_write(unix_db_info *udi, off_t new_eof, char *buff)
+STATICFNDCL int extend_wait_for_write(unix_db_info *udi, int blk_size, off_t new_eof);
+STATICFNDEF int extend_wait_for_write(unix_db_info *udi, int blk_size, off_t new_eof)
 {
-	int to_wait, to_msg, wait_period, save_errno;
+	int	to_wait, to_msg, wait_period, save_errno;
+	DCL_THREADGBL_ACCESS;
 
+	SETUP_THREADGBL_ACCESS;
 	/* Attempt to write every second, and send message to operator every 1/20 of cs_data->wait_disk_space */
 	wait_period = to_wait = DIVIDE_ROUND_UP(cs_data->wait_disk_space, CDB_STAGNATE + 1);
 	to_msg = (to_wait / 8) ? (to_wait / 8) : 1;		/* send around 8 messages during 1 wait_period */
@@ -142,7 +147,7 @@ STATICFNDEF int extend_wait_for_write(unix_db_info *udi, off_t new_eof, char *bu
 			ISSUE_WAITDSKSPACE(to_wait, wait_period, send_msg_csa);
 		hiber_start(1000);
 		to_wait--;
-		LSEEKWRITE(udi->fd, new_eof, buff, DISK_BLOCK_SIZE, save_errno);
+		save_errno = db_write_eof_block(udi, udi->fd, blk_size, new_eof, &(TREF(dio_buff)));
 	} while ((to_wait > 0) && (ENOSPC == save_errno));
 	return save_errno;
 }
@@ -151,12 +156,12 @@ uint4	 gdsfilext(uint4 blocks, uint4 filesize, boolean_t trans_in_prog)
 {
 	sm_uc_ptr_t		old_base[2], mmap_retaddr;
 	boolean_t		was_crit, is_mm;
-	char			buff[DISK_BLOCK_SIZE];
 	int			result, save_errno, status;
+	DEBUG_ONLY(int		first_save_errno);
 	uint4			new_bit_maps, bplmap, map, new_blocks, new_total, max_tot_blks, old_total;
 	uint4			jnl_status;
 	gtm_uint64_t		avail_blocks, mmap_sz;
-	off_t			new_eof;
+	off_t			new_eof, new_size;
 	trans_num		curr_tn;
 	unix_db_info		*udi;
 	inctn_opcode_t		save_inctn_opcode;
@@ -166,6 +171,7 @@ uint4	 gdsfilext(uint4 blocks, uint4 filesize, boolean_t trans_in_prog)
 	cache_rec_ptr_t         cr;
 	DCL_THREADGBL_ACCESS;
 
+	SETUP_THREADGBL_ACCESS;
 	assert(!IS_DSE_IMAGE);
 	assert((cs_addrs->nl == NULL) || (process_id != cs_addrs->nl->trunc_pid)); /* mu_truncate shouldn't extend file... */
 	assert(!process_exiting);
@@ -220,7 +226,6 @@ uint4	 gdsfilext(uint4 blocks, uint4 filesize, boolean_t trans_in_prog)
 			{
 				if (blocks > (uint4)avail_blocks)
 				{
-					SETUP_THREADGBL_ACCESS;
 					if (!INST_FREEZE_ON_NOSPC_ENABLED(cs_addrs))
 						return (uint4)(NO_FREE_SPACE);
 					else
@@ -256,7 +261,7 @@ uint4	 gdsfilext(uint4 blocks, uint4 filesize, boolean_t trans_in_prog)
 	 *	op_tcommit to invoke bm_getfree->gdsfilext, then we would have come here with a frozen region on which
 	 *	we hold crit.
 	 */
-	assert(!was_crit || !cs_data->freeze || (dollar_tlevel && (CDB_STAGNATE <= t_tries)));
+	assert(!was_crit || !FROZEN_HARD(cs_data) || (dollar_tlevel && (CDB_STAGNATE <= t_tries)));
 	/*
 	 * If we are in the final retry and already hold crit, it is possible that csa->nl->wc_blocked is also set to TRUE
 	 * (by a concurrent process in phase2 which encountered an error in the midst of commit and secshr_db_clnup
@@ -270,20 +275,27 @@ uint4	 gdsfilext(uint4 blocks, uint4 filesize, boolean_t trans_in_prog)
 		for ( ; ; )
 		{
 			grab_crit(gv_cur_region);
-			if (!cs_data->freeze && !IS_REPL_INST_FROZEN)
+			if (FROZEN_CHILLED(cs_data))
+				DO_CHILLED_AUTORELEASE(cs_addrs, cs_data);
+			if (!FROZEN(cs_data) && !IS_REPL_INST_FROZEN)
 				break;
 			rel_crit(gv_cur_region);
-			while (cs_data->freeze || IS_REPL_INST_FROZEN)
+			while (FROZEN(cs_data) || IS_REPL_INST_FROZEN)
+			{
 				hiber_start(1000);
+				if (FROZEN_CHILLED(cs_data) && CHILLED_AUTORELEASE(cs_data))
+					break;
+			}
 		}
-	} else if (cs_data->freeze && dollar_tlevel)
+	} else if (FROZEN_HARD(cs_data) && dollar_tlevel)
 	{	/* We don't want to continue with file extension as explained above. Hence return with an error code which
 		 * op_tcommit will recognize (as a cdb_sc_needcrit/cdb_sc_instancefreeze type of restart) and restart accordingly.
 		 */
 		assert(CDB_STAGNATE <= t_tries);
 		GDSFILEXT_CLNUP;
 		return (uint4)FINAL_RETRY_FREEZE_PROG;
-	}
+	} else
+		WAIT_FOR_REGION_TO_UNCHILL(cs_addrs, cs_data);
 	if (IS_REPL_INST_FROZEN && trans_in_prog)
 	{
 		assert(CDB_STAGNATE <= t_tries);
@@ -296,7 +308,7 @@ uint4	 gdsfilext(uint4 blocks, uint4 filesize, boolean_t trans_in_prog)
 	{	/* Somebody else has already extended it, since we are in crit, this is trust-worthy. However, in case of MM,
 		 * we still need to remap the database
 		 */
-		assert((old_total > filesize) GTM_TRUNCATE_ONLY( || !is_mm));
+		assert((old_total > filesize) || !is_mm);
 		/* For BG, someone else could have truncated or extended - we have no idea */
 		GDSFILEXT_CLNUP;
 		return (SS_NORMAL);
@@ -324,7 +336,7 @@ uint4	 gdsfilext(uint4 blocks, uint4 filesize, boolean_t trans_in_prog)
 		 * journal records (if it decides to switch to a new journal file).
 		 */
 		ADJUST_GBL_JREC_TIME(jgbl, jbp);
-		jnl_status = jnl_ensure_open();
+		jnl_status = jnl_ensure_open(gv_cur_region, cs_addrs);
 		if (jnl_status)
 		{
 			GDSFILEXT_CLNUP;
@@ -335,14 +347,14 @@ uint4	 gdsfilext(uint4 blocks, uint4 filesize, boolean_t trans_in_prog)
 	if (is_mm)
 	{
 		cs_addrs->nl->mm_extender_pid = process_id;
-		status = wcs_wtstart(gv_cur_region, 0);
+		status = wcs_wtstart(gv_cur_region, 0, NULL, NULL);
 		cs_addrs->nl->mm_extender_pid = 0;
 		assertpro(SS_NORMAL == status);
 		old_base[0] = cs_addrs->db_addrs[0];
 		old_base[1] = cs_addrs->db_addrs[1];
 		cs_addrs->db_addrs[0] = NULL; /* don't rely on it until the mmap below */
 #		ifdef _AIX
-		status = shmdt(old_base[0] - BLK_ZERO_OFF(cs_data));
+		status = shmdt(old_base[0] - BLK_ZERO_OFF(cs_data->start_vbn));
 #		else
 		status = munmap((caddr_t)old_base[0], (size_t)(old_base[1] - old_base[0]));
 #		endif
@@ -356,7 +368,7 @@ uint4	 gdsfilext(uint4 blocks, uint4 filesize, boolean_t trans_in_prog)
 		}
 	} else
 	{	/* Due to concurrency issues, it is possible some process had issued a disk read of the GDS block# corresponding
-		 * to "old_total" right after a truncate wrote a 512-byte block of zeros on disk (to signal end of the db file).
+		 * to "old_total" right after a truncate wrote a GDS-block of zeros on disk (to signal end of the db file).
 		 * If so, the global buffer containing this block needs to be invalidated now as part of the extend. If not, it is
 		 * possible the EOF block on disk is now going to be overwritten by a properly initialized bitmap block (as part
 		 * of the gdsfilext below) while the global buffer continues to have an incorrect copy of that bitmap block and
@@ -372,17 +384,19 @@ uint4	 gdsfilext(uint4 blocks, uint4 filesize, boolean_t trans_in_prog)
 	}
 	CHECK_TN(cs_addrs, cs_data, cs_data->trans_hist.curr_tn);	/* can issue rts_error TNTOOLARGE */
 	new_total = old_total + new_blocks;
-	new_eof = BLK_ZERO_OFF(cs_data) + ((off_t)new_total * cs_data->blk_size);
+	new_eof = BLK_ZERO_OFF(cs_data->start_vbn) + ((off_t)new_total * cs_data->blk_size);
 #	if !defined(__sun) && !defined(__hpux)
 	if (!cs_data->defer_allocate)
 	{
-		save_errno = posix_fallocate(udi->fd, 0, BLK_ZERO_OFF(cs_data) + (off_t)new_total * cs_data->blk_size +
-					     DISK_BLOCK_SIZE);
+		new_size = new_eof + cs_data->blk_size;
+		save_errno = posix_fallocate(udi->fd, 0, new_size);
+		DEBUG_ONLY(first_save_errno = save_errno);
 		if ((ENOSPC == save_errno) && IS_GTM_IMAGE)
-			save_errno = extend_wait_for_fallocate(udi, new_total);
+			save_errno = extend_wait_for_fallocate(udi, new_size);
 		if (0 != save_errno)
 		{
 			GDSFILEXT_CLNUP;
+			assert(ENOSPC == save_errno);
 			if (ENOSPC != save_errno)
 				send_msg_csa(CSA_ARG(cs_addrs) VARLSTCNT(5) ERR_PREALLOCATEFAIL, 2, DB_LEN_STR(gv_cur_region),
 					     save_errno);
@@ -390,9 +404,9 @@ uint4	 gdsfilext(uint4 blocks, uint4 filesize, boolean_t trans_in_prog)
 		}
 	}
 #	endif
-	DB_LSEEKWRITE(cs_addrs, udi->fn, udi->fd, new_eof, buff, DISK_BLOCK_SIZE, save_errno);
+	save_errno = db_write_eof_block(udi, udi->fd, cs_data->blk_size, new_eof, &(TREF(dio_buff)));
 	if ((ENOSPC == save_errno) && IS_GTM_IMAGE)
-		save_errno = extend_wait_for_write(udi, new_eof, buff);
+		save_errno = extend_wait_for_write(udi, cs_data->blk_size, new_eof);
 	if (0 != save_errno)
 	{
 		GDSFILEXT_CLNUP;
@@ -408,13 +422,17 @@ uint4	 gdsfilext(uint4 blocks, uint4 filesize, boolean_t trans_in_prog)
 	/* Ensure the EOF and metadata get to disk BEFORE any bitmap writes. Otherwise, the file size could no longer reflect
 	 * a proper extent and subsequent invocations of gdsfilext could corrupt the database.
 	 */
-	GTM_DB_FSYNC(cs_addrs, udi->fd, status);
-	assert(0 == status);
-	if (0 != status)
+	if (!IS_STATSDB_CSA(cs_addrs))
 	{
-		GDSFILEXT_CLNUP;
-		send_msg_csa(CSA_ARG(cs_addrs) VARLSTCNT(8) ERR_DBFILERR, 5, RTS_ERROR_LITERAL("fsync1()"), CALLFROM, status);
-		return (uint4)(NO_FREE_SPACE);
+		GTM_DB_FSYNC(cs_addrs, udi->fd, status);
+		assert(0 == status);
+		if (0 != status)
+		{
+			GDSFILEXT_CLNUP;
+			send_msg_csa(CSA_ARG(cs_addrs) VARLSTCNT(8) ERR_DBFILERR, 5,
+						RTS_ERROR_LITERAL("fsync1()"), CALLFROM, status);
+			return (uint4)(NO_FREE_SPACE);
+		}
 	}
 	if (WBTEST_ENABLED(WBTEST_FILE_EXTEND_INTERRUPT_2))
 	{
@@ -474,13 +492,17 @@ uint4	 gdsfilext(uint4 blocks, uint4 filesize, boolean_t trans_in_prog)
 		LONG_SLEEP(600);
 		assert(FALSE); /* Should be killed before that */
 	}
-	GTM_DB_FSYNC(cs_addrs, udi->fd, status);
-	assert(0 == status);
-	if (0 != status)
+	if (!IS_STATSDB_CSA(cs_addrs))
 	{
-		GDSFILEXT_CLNUP;
-		send_msg_csa(CSA_ARG(cs_addrs) VARLSTCNT(8) ERR_DBFILERR, 5, RTS_ERROR_LITERAL("fsync2()"), CALLFROM, status);
-		return (uint4)(NO_FREE_SPACE);
+		GTM_DB_FSYNC(cs_addrs, udi->fd, status);
+		assert(0 == status);
+		if (0 != status)
+		{
+			GDSFILEXT_CLNUP;
+			send_msg_csa(CSA_ARG(cs_addrs) VARLSTCNT(8) ERR_DBFILERR, 5, RTS_ERROR_LITERAL("fsync2()"), CALLFROM,
+				     status);
+			return (uint4)(NO_FREE_SPACE);
+		}
 	}
 	if (WBTEST_ENABLED(WBTEST_FILE_EXTEND_INTERRUPT_4))
 	{
@@ -523,12 +545,13 @@ uint4	 gdsfilext(uint4 blocks, uint4 filesize, boolean_t trans_in_prog)
 	if (is_mm)
 	{
 		assert((NULL != old_base[0]) && (NULL != old_base[1]));
-		mmap_sz = new_eof - BLK_ZERO_OFF(cs_data);	/* Don't mmap the file header and master map */
+		mmap_sz = new_eof - BLK_ZERO_OFF(cs_data->start_vbn);	/* Don't mmap the file header and master map */
 		CHECK_LARGEFILE_MMAP(gv_cur_region, mmap_sz);   /* can issue rts_error MMFILETOOLARGE */
 #		ifdef _AIX
 		status = (sm_long_t)(mmap_retaddr = (sm_uc_ptr_t)shmat(udi->fd, (void *)NULL,SHM_MAP));
 #		else
-		status = (sm_long_t)(mmap_retaddr = (sm_uc_ptr_t)MMAP_FD(udi->fd, mmap_sz, BLK_ZERO_OFF(cs_data), FALSE));
+		status = (sm_long_t)(mmap_retaddr = (sm_uc_ptr_t)MMAP_FD(udi->fd, mmap_sz,
+										BLK_ZERO_OFF(cs_data->start_vbn), FALSE));
 #		endif
 		GTM_WHITE_BOX_TEST(WBTEST_MEM_MAP_SYSCALL_FAIL, status, -1);
 		if (-1 == status)
@@ -542,7 +565,7 @@ uint4	 gdsfilext(uint4 blocks, uint4 filesize, boolean_t trans_in_prog)
 		}
 		/* In addition to updating the internal map values, gds_map_moved sets cs_data to point to the remapped file */
 #		if defined(_AIX)
-		mmap_retaddr = (sm_uc_ptr_t)mmap_retaddr + BLK_ZERO_OFF(cs_data);
+		mmap_retaddr = (sm_uc_ptr_t)mmap_retaddr + BLK_ZERO_OFF(cs_data->start_vbn);
 #		endif
 		gds_map_moved(mmap_retaddr, old_base[0], old_base[1], mmap_sz); /* updates cs_addrs->db_addrs[1] */
 		cs_addrs->db_addrs[0] = mmap_retaddr;
diff --git a/sr_unix/gdsfilext_nojnl.c b/sr_unix/gdsfilext_nojnl.c
index af13ae4..dc5d6ae 100644
--- a/sr_unix/gdsfilext_nojnl.c
+++ b/sr_unix/gdsfilext_nojnl.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2012-2015 Fidelity National Information	*
+ * Copyright (c) 2012-2016 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -44,13 +44,20 @@
 #include "gdsfilext_nojnl.h"
 #include "gtmio.h"
 #include "anticipatory_freeze.h"
-
 #include "sleep_cnt.h"
 #include "wcs_sleep.h"
 #include "interlock.h"
 #include "gdsbgtr.h"
 #include "copy.h"
 #include "shmpool.h"
+#include "db_write_eof_block.h"
+#include "buddy_list.h"
+#include "hashtab_int4.h"	/* needed for muprec.h */
+#include "hashtab_int8.h"	/* needed for muprec.h */
+#include "hashtab_mname.h"	/* needed for muprec.h */
+#include "muprec.h"
+
+GBLREF	jnl_gbls_t	jgbl;
 
 error_def(ERR_DBFILERR);
 
@@ -62,31 +69,61 @@ int gdsfilext_nojnl(gd_region* reg, uint4 new_total, uint4 old_total)
 {
 	sgmnt_addrs		*csa;
 	sgmnt_data_ptr_t	csd;
-	int 			status;
+	int 			blk_size, status;
 	off_t			offset;
-	char			*newmap;
+	char			*newmap, *aligned_buff;
 	uint4			ii;
 	unix_db_info		*udi;
+	reg_ctl_list		*rctl;
+	dio_buff_t		*diobuff;
+	DCL_THREADGBL_ACCESS;
 
+	SETUP_THREADGBL_ACCESS;
 	udi = FILE_INFO(reg);
 	csa = &udi->s_addrs;
 	csd = csa->hdr;
 	assert(old_total < new_total);
 	assert(new_total <= MAXTOTALBLKS(csd));
-	WRITE_EOF_BLOCK(reg, csd, new_total, status);
+	blk_size = csd->blk_size;
+	offset = (off_t)BLK_ZERO_OFF(csd->start_vbn) + (off_t)new_total * blk_size;
+	if (udi->fd_opened_with_o_direct)
+	{
+		if (multi_thread_in_use)
+		{	/* If multiple threads are running, we cannot use the global variable "dio_buff". Fortunately though,
+			 * the only caller of this function which can have "multi_thread_in_use" set is "mur_back_process"
+			 * which is invoked by a MUPIP JOURNAL command. Assert that. Given that, we can safely get at "rctl"
+			 * from csa->miscptr in this case and use "rctl->dio_buff" safely inside threaded code since each thread
+			 * operates on one "rctl".
+			 */
+			assert(jgbl.in_mupjnl);
+			rctl = (reg_ctl_list *)csa->miscptr;
+			assert(csa == rctl->csa);
+			assert(csd == rctl->csd);
+			DIO_BUFF_EXPAND_IF_NEEDED(udi, blk_size, &rctl->dio_buff);
+			diobuff = &rctl->dio_buff;
+		} else
+			diobuff = &(TREF(dio_buff));
+	}
+	status = db_write_eof_block(udi, udi->fd, blk_size, offset, diobuff);
 	if (0 != status)
 	{
 		send_msg_csa(CSA_ARG(csa) VARLSTCNT(5) ERR_DBFILERR, 2, DB_LEN_STR(reg), status);
 		return status;
 	}
 	/* initialize the bitmap tn's to 0. */
-	newmap = (char *)malloc(csd->blk_size);
+	newmap = (char *)malloc(blk_size);
 	bml_newmap((blk_hdr *)newmap, BM_SIZE(BLKS_PER_LMAP), 0);
+	if (udi->fd_opened_with_o_direct)
+	{
+		aligned_buff = diobuff->aligned;
+		memcpy(aligned_buff, newmap, blk_size);
+	} else
+		aligned_buff = newmap;
 	/* initialize bitmaps, if any new ones are added */
 	for (ii = ROUND_UP(old_total, BLKS_PER_LMAP); ii < new_total; ii += BLKS_PER_LMAP)
 	{
-		offset = (off_t)(csd->start_vbn - 1) * DISK_BLOCK_SIZE + (off_t)ii * csd->blk_size;
-		DB_LSEEKWRITE(csa, udi->fn, udi->fd, offset, newmap, csd->blk_size, status);
+		offset = (off_t)BLK_ZERO_OFF(csd->start_vbn) + (off_t)ii * blk_size;
+		DB_LSEEKWRITE(csa, udi, udi->fn, udi->fd, offset, aligned_buff, blk_size, status);
 		if (0 != status)
 		{
 			send_msg_csa(CSA_ARG(csa) VARLSTCNT(5) ERR_DBFILERR, 2, DB_LEN_STR(reg), status);
diff --git a/sr_unix/generate_help.csh b/sr_unix/generate_help.csh
index 759aec4..6f27b06 100755
--- a/sr_unix/generate_help.csh
+++ b/sr_unix/generate_help.csh
@@ -1,6 +1,6 @@
 #################################################################
 #								#
-# Copyright (c) 2014-2016 Fidelity National Information		#
+# Copyright (c) 2014-2017 Fidelity National Information		#
 # Services, Inc. and/or its subsidiaries. All rights reserved.	#
 #								#
 #	This source code contains the intellectual property	#
@@ -64,8 +64,7 @@ foreach hlp (${hlpdir}/*.hlp)
 	setenv gtmgbldir ${gtm_dist}/${prefix}help.gld
 	${gtm_dist}/mumps -run GDE <<GDE_in_help
 Change -segment DEFAULT	-block=2048	-file=\$gtm_dist/${prefix}help.dat
-Change -region DEFAULT	-record=1020	-key=255
-change -region DEFAULT  -qdbrundown
+Change -region DEFAULT -record=1020 -key=255 -qdbrundown -nostats
 GDE_in_help
 
 	if ($status) then
@@ -93,7 +92,14 @@ GTM_in_gtmhelp
 		echo "genreatehelp-E-hlp, Error while processing ${hlp}" $errout
 		continue
 	endif
-	if ("gtm" == "$prefix") $gtm_exe/mumps -run GTMDEFINEDTYPESTODB
+	if ("gtm" == "$prefix") then
+		$gtm_exe/mumps -run GTMDEFINEDTYPESTODB
+		if ($status) then
+			@ script_stat++
+			echo "generatehelp-E-hlp, Error during GTMDEFINEDTYPESTODB ${hlp}" $errout
+			continue
+		endif
+	endif
 	chmod ugo-x ${gtm_dist}/${prefix}help.{gld,dat}
 end
 
diff --git a/sr_unix/generic_signal_handler.c b/sr_unix/generic_signal_handler.c
index 5fde63d..a0f4d53 100755
--- a/sr_unix/generic_signal_handler.c
+++ b/sr_unix/generic_signal_handler.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information 	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -303,6 +303,11 @@ void generic_signal_handler(int sig, siginfo_t *info, void *context)
 					DEBUG_ONLY(in_nondeferrable_signal_handler = IN_GENERIC_SIGNAL_HANDLER;)
 					exit_state = EXIT_IMMED;
 					SET_PROCESS_EXITING_TRUE;
+					/* SIGABRT is usually delivered when memory corruption is detected by glibc
+					 * e.g.  *** glibc detected *** mupip: double free or corruption (!prev): 0x0983f180 ***
+					 * We want to detect that right when it happens so assert fail in that case.
+					 */
+					assert(SIGABRT != sig);
 					SEND_AND_PUT_MSG(VARLSTCNT(8) ERR_KILLBYSIGSINFO1, 6, GTMIMAGENAMETXT(image_type),
 						process_id, sig, signal_info.int_iadr, signal_info.bad_vadr);
 					break;
diff --git a/sr_unix/get_src_line.c b/sr_unix/get_src_line.c
index a9f01b1..923e9ed 100644
--- a/sr_unix/get_src_line.c
+++ b/sr_unix/get_src_line.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -30,21 +30,19 @@
 #include "op.h"
 #include "zbreak.h"
 #include "hashtab_mname.h"
-#ifdef GTM_TRIGGER
-# include "gdsroot.h"
-# include "gtm_facility.h"
-# include "fileinfo.h"
-# include "gdsbt.h"
-# include "gdsfhead.h"
-# include "gv_trigger.h"
-# include "gtm_trigger.h"
-# include "cdb_sc.h"
-# include "tp_frame.h" /* for tp_frame */
-# include "t_retry.h"
-# include "trigger_read_andor_locate.h"
-# include "gtm_trigger_trc.h"
-# include "zr_unlink_rtn.h"
-#endif
+#include "gdsroot.h"
+#include "gtm_facility.h"
+#include "fileinfo.h"
+#include "gdsbt.h"
+#include "gdsfhead.h"
+#include "gv_trigger.h"
+#include "gtm_trigger.h"
+#include "cdb_sc.h"
+#include "tp_frame.h" /* for tp_frame */
+#include "t_retry.h"
+#include "trigger_read_andor_locate.h"
+#include "gtm_trigger_trc.h"
+#include "zr_unlink_rtn.h"
 #include "stack_frame.h"
 #include "rtn_src_chksum.h"
 #include "cmd_qlf.h"
@@ -85,9 +83,7 @@ int get_src_line(mval *routine, mval *label, int offset, mstr **srcret, rhdtyp *
 	off_t			srcsize;
 	unsigned char		*srcptr, *srcptr_max, *srcstart, *eol_srcstart, *prev_srcptr;
 	gtm_rtn_src_chksum_ctx	checksum_ctx;
-#	ifdef GTM_TRIGGER
 	boolean_t	is_trigger;
-#	endif
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
@@ -112,7 +108,6 @@ int get_src_line(mval *routine, mval *label, int offset, mstr **srcret, rhdtyp *
 		GTMTRIG_ONLY(is_trigger=(NULL != rtn_vector->trigr_handle));
 		DBGIFTRIGR((stderr, "get_src_line: entered $tlevel=%d and $t_tries=%d\n", dollar_tlevel, t_tries));
 	}
-#	ifdef GTM_TRIGGER
 	if (is_trigger && (NULL == rtn_vector))
 	{	/* Need source on a trigger. Get trigger loaded and its source becomes available since all triggers
 		 * are compiled with -EMBED_SOURCE.
@@ -138,21 +133,8 @@ int get_src_line(mval *routine, mval *label, int offset, mstr **srcret, rhdtyp *
 				*rtn_vec = NULL;
 			return OBJMODMISS;
 		}
-		DBGTRIGR((stderr, "get_src_line: source found @0x%lx(%d) for %lx\n", rtn_vector->trigr_handle,
-					((gv_trigger_t *)rtn_vector->trigr_handle)->xecute_str.str.len, rtn_vector));
 		DBGARLNK((stderr, "get_src_line: Fetch trigger source from rtnhdr 0x"lvaddr"\n", rtn_vector));
-		/* Remove the source buffer from the trigger descriptor since we will use the source embedded in the
-		 * trigger object to return the line to the caller.
-		 */
-		if (0 != ((gv_trigger_t *)rtn_vector->trigr_handle)->xecute_str.str.len)
-		{
-			free(((gv_trigger_t *)rtn_vector->trigr_handle)->xecute_str.str.addr);
-			((gv_trigger_t *)rtn_vector->trigr_handle)->xecute_str.str.len = 0;
-			((gv_trigger_t *)rtn_vector->trigr_handle)->xecute_str.str.addr = NULL;
-		}
-	} else
-#	endif
-	if (NULL == rtn_vector)
+	} else if (NULL == rtn_vector)
 	{
 		assert(!is_trigger);
 		if (NULL == (rtn_vector = find_rtn_hdr(&routine->str)))		/* Note assignment */
@@ -373,7 +355,7 @@ STATICFNDEF boolean_t fill_src_tbl_via_mfile(routine_source **src_tbl_result, rh
 	 * entry is not used in the source array for direct referencing ease.
 	 */
 	src_tbl = (routine_source *)malloc(SIZEOF(routine_source) + ((srcrecs - 1) * SIZEOF(mstr)));
-	src_tbl->srcbuff = (0 < srcsize) ? malloc(srcsize) : NULL;
+	src_tbl->srcbuff = (0 < srcsize) ? malloc(srcsize + 1) : NULL;
 	base = src_tbl->srclines;
 	srcptr = src_tbl->srcbuff;
 	DEBUG_ONLY(srcptr_max = srcptr + srcsize);
@@ -447,6 +429,8 @@ STATICFNDEF boolean_t fill_src_tbl_via_mfile(routine_source **src_tbl_result, rh
 				assert(feof(fp));
 			}
 		}
+		if (srcsize && ('\n' != *(src_tbl->srcbuff + srcsize - 1)))
+			*(src_tbl->srcbuff + srcsize++) = '\n';		/* add \n in case last line was unterminated */
 		rtn_src_chksum_buffer(&checksum_ctx, src_tbl->srcbuff, srcsize);
 		if (!eof_seen
 			|| !rtn_src_chksum_match(get_ctx_checksum(&checksum_ctx), get_rtnhdr_checksum(rtn_vector)))
diff --git a/sr_unix/grab_crit_immediate.c b/sr_unix/grab_crit_immediate.c
index 3d4b744..2e964b6 100644
--- a/sr_unix/grab_crit_immediate.c
+++ b/sr_unix/grab_crit_immediate.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information 	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -12,7 +12,7 @@
 
 #include "mdef.h"
 
-#include <signal.h>	/* for VSIG_ATOMIC_T type */
+#include "gtm_signal.h"		/* for VSIG_ATOMIC_T type */
 
 #include "gdsroot.h"
 #include "gtm_facility.h"
@@ -24,11 +24,11 @@
 #include "send_msg.h"
 #include "mutex.h"
 #include "deferred_signal_handler.h"
-#include "wcs_recover.h"
 #include "caller_id.h"
 #include "is_proc_alive.h"
 #include "gtmimagename.h"
 #include "error.h"
+#include "wcs_recover.h"
 
 GBLREF	short 			crash_count;
 GBLREF	volatile int4		crit_count;
@@ -42,7 +42,7 @@ error_def(ERR_CRITRESET);
 error_def(ERR_DBCCERR);
 error_def(ERR_DBFLCORRP);
 
-boolean_t grab_crit_immediate(gd_region *reg)
+boolean_t grab_crit_immediate(gd_region *reg, boolean_t ok_for_wcs_recover)
 {
 	unix_db_info 		*udi;
 	sgmnt_addrs  		*csa;
@@ -106,14 +106,19 @@ boolean_t grab_crit_immediate(gd_region *reg)
 	assert(!mupip_jnl_recover || TREF(skip_file_corrupt_check));
 	if (csd->file_corrupt && !TREF(skip_file_corrupt_check))
 		rts_error_csa(CSA_ARG(csa) VARLSTCNT(4) ERR_DBFLCORRP, 2, DB_LEN_STR(reg));
-	/* Ideally we do not want to do wcs_recover if we are in interrupt code (as opposed to mainline code).
-	 * This is easily accomplished in VMS with a library function lib$ast_in_prog but in Unix there is no way
-	 * to tell mainline code from interrupt code without the caller providing that information. Hence we
-	 * currently do the cache recovery even in case of interrupt code even though it is a heavyweight operation.
-	 * If it is found to cause issues, this logic has to be re-examined.
-	 */
 	if (cnl->wc_blocked)
-		wcs_recover(reg);
+	{
+		if (ok_for_wcs_recover)
+			wcs_recover(reg);
+		else
+		{	/* Caller says it is not okay to call "wcs_recover" so return as if crit could not be obtained right away.
+			 * These callers are periodic/cyclical and interrupt-based so they will retry later if needed
+			 * (e.g. wcs_wtstart and wcs_clean_dbsync).
+			 */
+			rel_crit(reg);
+			return(FALSE);
+		}
+	}
 	return(TRUE);
 }
 
diff --git a/sr_unix/gt_timer.h b/sr_unix/gt_timer.h
index 7b7f07a..9df6461 100755
--- a/sr_unix/gt_timer.h
+++ b/sr_unix/gt_timer.h
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2014 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -69,11 +70,12 @@ typedef struct tag_ts
         int4            safe;           /* Indicates if handler can be delivered while we are in
 					 * a deferred mode
 					 */
+	int4		block_int;	/* Set to intrpt_state_t value if timer handling was blocked
+					 * by an uninterruptible state. For use in debugging, but not
+					 * conditional on DEBUG to keep the structure stable.
+					 */
 	int4		hd_len_max;	/* Max length this blk can hold */
 	int4		hd_len;		/* Handler data length */
-  	GTM64_ONLY(int4 padding;)       /* Padding for 8 byte alignment of hd_data. Remove if hd_data
-					 * is made to start on a 8 byte boundary (for GTM64)
-					 */
 	char		hd_data[1];	/* Handler data */
 } GT_TIMER;
 
@@ -84,12 +86,56 @@ typedef struct st_timer_alloc
 	struct st_timer_alloc	*next;
 } st_timer_alloc;
 
-#define MAX_SAFE_TIMER_HNDLRS	10	/* Max # of safe timer handlers */
+#define MAX_SAFE_TIMER_HNDLRS		16	/* Max # of safe timer handlers */
 #define GT_WAKE
-#define CANCEL_TIMERS		cancel_unsafe_timers()
+#define CANCEL_TIMERS			cancel_unsafe_timers()
+
+/* Set a timeout timer, using a local variable as the timeout indicator.
+ * Note: This macro establishes a condition handler which cancels the timer in case of an rts_error.
+ *       The TIMEOUT_DONE() macro must be used on all normal routine exit paths in order to REVERT the handler.
+ */
+#define TIMEOUT_INIT(TIMEOUT_VAR, TIMEOUT_MILLISECS)									\
+MBSTART {														\
+	boolean_t	*ptr_to_##TIMEOUT_VAR = &(TIMEOUT_VAR);								\
+	boolean_t	got_error;											\
+															\
+	TIMEOUT_VAR = FALSE;												\
+	start_timer((TID)ptr_to_##TIMEOUT_VAR, TIMEOUT_MILLISECS, simple_timeout_timer,					\
+			SIZEOF(ptr_to_##TIMEOUT_VAR), &ptr_to_##TIMEOUT_VAR);						\
+	ESTABLISH_NORET(timer_cancel_ch, got_error);									\
+	if (got_error)													\
+	{														\
+		TIMEOUT_DONE(TIMEOUT_VAR);										\
+		DRIVECH(error_condition);										\
+	}														\
+} MBEND
+#define TIMEOUT_DONE(TIMEOUT_VAR)						\
+MBSTART {									\
+	boolean_t	*ptr_to_##TIMEOUT_VAR = &(TIMEOUT_VAR);			\
+										\
+	assert(ctxt->ch == timer_cancel_ch);					\
+	REVERT;									\
+	cancel_timer((TID)ptr_to_##TIMEOUT_VAR);				\
+} MBEND
+
+/* Lighter versions with no condition handler, for when it is safe to have the timer hang around after it is no longer relevant. */
+#define TIMEOUT_INIT_NOCH(TIMEOUT_VAR, TIMEOUT_MILLISECS)								\
+MBSTART {														\
+	boolean_t	*ptr_to_##TIMEOUT_VAR = &(TIMEOUT_VAR);								\
+															\
+	TIMEOUT_VAR = FALSE;												\
+	start_timer((TID)ptr_to_##TIMEOUT_VAR, TIMEOUT_MILLISECS, simple_timeout_timer,					\
+			SIZEOF(ptr_to_##TIMEOUT_VAR), &ptr_to_##TIMEOUT_VAR);						\
+} MBEND
+#define TIMEOUT_DONE_NOCH(TIMEOUT_VAR)						\
+MBSTART {									\
+	boolean_t	*ptr_to_##TIMEOUT_VAR = &(TIMEOUT_VAR);			\
+										\
+	cancel_timer((TID)ptr_to_##TIMEOUT_VAR);				\
+} MBEND
 
 /* Uncomment the below #define if you want to print the status of the key timer-related variables as well as the entire timer queue
- * when operations such as addition, cancelation, or handling of a timer occur.
+ * when operations such as addition, cancellation, or handling of a timer occur.
  *
  * #define TIMER_DEBUGGING
  */
@@ -97,13 +143,17 @@ typedef struct st_timer_alloc
 #ifdef TIMER_DEBUGGING
 #  define DUMP_TIMER_INFO(LOCATION)								\
 {												\
+	extern void	(*fake_enospc_ptr)();							\
+	extern void	(*simple_timeout_timer_ptr)();						\
 	int		i;									\
 	GT_TIMER	*cur_timer;								\
-	char		*s_heartbeat_timer = "heartbeat_timer";					\
+	char		*s_jnl_file_close_timer = "jnl_file_close_timer";			\
 	char		*s_wcs_clean_dbsync = "wcs_clean_dbsync";				\
 	char		*s_wcs_stale = "wcs_stale";						\
 	char		*s_hiber_wake = "hiber_wake";						\
-	char		*s_unknown = "unknown";							\
+	char		*s_fake_enospc = "fake_enospc";						\
+	char		*s_simple_timeout_timer = "simple_timeout_timer";			\
+	char		s_unknown[20];								\
 	char		*handler;								\
 												\
 	cur_timer = (GT_TIMER *)timeroot;							\
@@ -113,22 +163,30 @@ typedef struct st_timer_alloc
 		"  system timer active: %d\n"							\
 		"  timer in handler:    %d\n"							\
 		"  timer stack count:   %d\n"							\
-		"  heartbeat started:   %d\n",							\
-		LOCATION, timer_active, timer_in_handler, timer_stack_count, heartbeat_started);\
+		"  oldjnlclose started: %d\n",							\
+		LOCATION, timer_active, timer_in_handler,					\
+		timer_stack_count, oldjnlclose_started);					\
 	FFLUSH(stderr);										\
 	i = 0;											\
 	while (cur_timer)									\
 	{											\
-		if ((void (*)())heartbeat_timer_ptr == cur_timer->handler)			\
-			handler = s_heartbeat_timer;						\
+		if ((void (*)())jnl_file_close_timer_ptr == cur_timer->handler)			\
+			handler = s_jnl_file_close_timer;					\
 		else if ((void (*)())wcs_clean_dbsync_fptr == cur_timer->handler)		\
 			handler = s_wcs_clean_dbsync;						\
 		else if ((void (*)())wcs_stale_fptr == cur_timer->handler)			\
 			handler = s_wcs_stale;							\
 		else if ((void (*)())hiber_wake == cur_timer->handler)				\
 			handler = s_hiber_wake;							\
+		else if ((void (*)())fake_enospc_ptr == cur_timer->handler)			\
+			handler = s_fake_enospc;						\
+		else if ((void (*)())simple_timeout_timer_ptr == cur_timer->handler)		\
+			handler = s_simple_timeout_timer;					\
 		else										\
+		{										\
+			SPRINTF(s_unknown, "%p", (void *)handler);				\
 			handler = s_unknown;							\
+		}										\
 		FPRINTF(stderr, "  - timer #%d:\n"						\
 			"      handler:    %s\n"						\
 			"      safe:       %d\n"						\
@@ -166,17 +224,18 @@ GT_TIMER	*find_timer_intr_safe(TID tid, GT_TIMER **tprev);
 void		check_for_deferred_timers(void);
 void		add_safe_timer_handler(int safetmr_cnt, ...);
 void		sys_canc_timer(void);
+void 		simple_timeout_timer(TID tid, int4 hd_len, boolean_t **timedout);
 
 STATICFNDCL void	hiber_wake(TID tid, int4 hd_len, int4 **waitover_flag);
 STATICFNDCL void	gt_timers_alloc(void);
 STATICFNDCL void	start_timer_int(TID tid, int4 time_to_expir, void (*handler)(), int4 hdata_len,
-	void *hdata, boolean_t safe_timer);
-STATICFNDCL void	sys_settimer (TID tid, ABS_TIME *time_to_expir, void (*handler)());
+					void *hdata, boolean_t safe_timer);
+STATICFNDCL void	sys_settimer (TID tid, ABS_TIME *time_to_expir);
 STATICFNDCL void	start_first_timer(ABS_TIME *curr_time);
 STATICFNDCL void	timer_handler(int why);
 STATICFNDCL GT_TIMER	*find_timer(TID tid, GT_TIMER **tprev);
-STATICFNDCL void	add_timer(ABS_TIME *atp, TID tid, int4 time_to_expir, void (*handler)(), int4 hdata_len,
-	void *hdata, boolean_t safe_timer);
+STATICFNDCL GT_TIMER	*add_timer(ABS_TIME *atp, TID tid, int4 time_to_expir, void (*handler)(), int4 hdata_len,
+					void *hdata, boolean_t safe_timer);
 STATICFNDCL void	remove_timer(TID tid);
 STATICFNDCL void	init_timers(void);
 
diff --git a/sr_unix/gt_timers.c b/sr_unix/gt_timers.c
index 603c725..3ca5743 100755
--- a/sr_unix/gt_timers.c
+++ b/sr_unix/gt_timers.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information 	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -76,6 +76,7 @@
 #include "sleep.h"
 #include "error.h"
 #include "gtm_multi_thread.h"
+#include "gtmxc_types.h"
 
 #ifdef ITIMER_REAL
 # define BSD_TIMER
@@ -96,6 +97,7 @@ int4	time();
 #define ADD_SAFE_HNDLR(HNDLR)									\
 {												\
 	assert((ARRAYSIZE(safe_handlers) - 1) > safe_handlers_cnt);				\
+	assert(NULL != (void *)HNDLR); /* void * to avoid warnings of always true */		\
 	safe_handlers[safe_handlers_cnt++] = HNDLR;						\
 }
 
@@ -121,7 +123,14 @@ int4	time();
 			1, ERRNO, ERR_TEXT, 2, LEN_AND_STR(s));					\
 }
 
+#define SYS_SETTIMER(TIMER, DELTA)								\
+MBSTART {											\
+	sys_timer_at = (TIMER)->expir_time;							\
+	sys_settimer((TIMER)->tid, DELTA);							\
+} MBEND
+
 STATICDEF struct itimerval	sys_timer, old_sys_timer;
+STATICDEF ABS_TIME		sys_timer_at;			/* Absolute time associated with sys_timer */
 STATICDEF boolean_t		in_setitimer_error;
 #endif
 
@@ -183,14 +192,16 @@ GBLREF	boolean_t	blocksig_initialized;			/* Set to TRUE when blockalrm, block_tt
 GBLREF	sigset_t	blockalrm;
 GBLREF	sigset_t	block_ttinout;
 GBLREF	sigset_t	block_sigsent;
+GBLREF	sigset_t	block_worker;
 GBLREF 	volatile int4	fast_lock_count;
-GBLREF	boolean_t	heartbeat_started;
-GBLREF	void		(*heartbeat_timer_ptr)(void);		/* Initialized only in gtm_startup(). */
+GBLREF	boolean_t	oldjnlclose_started;
+GBLREF	void		(*jnl_file_close_timer_ptr)(void);	/* Initialized only in gtm_startup(). */
 GBLREF	int4		error_condition;
 GBLREF	int4		outofband;
 GBLREF	int		process_exiting;
 #ifdef DEBUG
 GBLREF	boolean_t	in_nondeferrable_signal_handler;
+GBLREF	boolean_t	gtm_jvm_process;
 #endif
 
 error_def(ERR_SETITIMERFAILED);
@@ -262,6 +273,11 @@ void set_blocksig(void)
 	sigaddset(&block_sigsent, SIGTSTP);
 	sigaddset(&block_sigsent, SIGCONT);
 	sigaddset(&block_sigsent, SIGALRM);
+	sigfillset(&block_worker);
+	sigdelset(&block_worker, SIGSEGV);
+	sigdelset(&block_worker, SIGKILL);
+	sigdelset(&block_worker, SIGFPE);
+	sigdelset(&block_worker, SIGBUS);
 	blocksig_initialized = TRUE;	/* note the fact that blockalrm and block_sigsent are initialized */
 }
 
@@ -451,7 +467,8 @@ void start_timer(TID tid, int4 time_to_expir, void (*handler)(), int4 hdata_len,
  */
 STATICFNDEF void start_timer_int(TID tid, int4 time_to_expir, void (*handler)(), int4 hdata_len, void *hdata, boolean_t safe_timer)
 {
-	ABS_TIME at;
+	ABS_TIME	at;
+	GT_TIMER 	*newt;
 
  	assert(0 <= time_to_expir);
 	sys_get_curr_time(&at);
@@ -471,9 +488,13 @@ STATICFNDEF void start_timer_int(TID tid, int4 time_to_expir, void (*handler)(),
 	if ((GT_TIMER_EXPAND_TRIGGER > num_timers_free) && (1 > timer_stack_count))
 		gt_timers_alloc();
 	DUMP_TIMER_INFO("Before invoking add_timer()");
-	add_timer(&at, tid, time_to_expir, handler, hdata_len, hdata, safe_timer);	/* Put new timer in the queue. */
+	newt = add_timer(&at, tid, time_to_expir, handler, hdata_len, hdata, safe_timer);	/* Put new timer in the queue. */
 	DUMP_TIMER_INFO("After invoking add_timer()");
-	if ((timeroot->tid == tid) || !timer_active)
+	if ((timeroot->tid == tid) || !timer_active
+			|| (timer_active
+				&& ((newt->expir_time.at_sec < sys_timer_at.at_sec)
+					|| ((newt->expir_time.at_sec == sys_timer_at.at_sec)
+						&& ((gtm_tv_usec_t)newt->expir_time.at_usec < sys_timer_at.at_usec)))))
 		start_first_timer(&at);
 }
 
@@ -509,11 +530,16 @@ void clear_timers(void)
 	sigset_t	savemask;
 	int		rc;
 
+	DUMP_TIMER_INFO("At the start of clear_timers()");
 	if (NULL == timeroot)
 	{	/* If no timers have been initialized in this process, take fast path (avoid system call) */
-		assert(FALSE == timer_in_handler);
+		/* If the only timer popped, and we got a SIGTERM while its handler was active, the timeroot
+		 * would be NULL and timer_in_handler would be TRUE, but that should be safe for the fast path,
+		 * so allow this case if the process is exiting.
+		 */
+		assert((FALSE == timer_in_handler) || process_exiting);
 		assert(FALSE == timer_active);
-		assert(FALSE == heartbeat_started);
+		assert(FALSE == oldjnlclose_started);
 		assert(FALSE == deferred_timers_check_needed);
 		return;
 	}
@@ -522,18 +548,18 @@ void clear_timers(void)
 		remove_timer(timeroot->tid);
 	timer_in_handler = FALSE;
 	timer_active = FALSE;
-	heartbeat_started = FALSE;
+	oldjnlclose_started = FALSE;
 	deferred_timers_check_needed = FALSE;
 	SIGPROCMASK(SIG_SETMASK, &savemask, NULL, rc);
+	DUMP_TIMER_INFO("After invoking clear_timers()");
 	return;
 }
 
 /* System call to set timer. Time is given im msecs.
  * Arguments:	tid		- timer id
  *		time_to_expir	- time to expiration
- *		handler		- address of handler routine
  */
-STATICFNDEF void sys_settimer(TID tid, ABS_TIME *time_to_expir, void (*handler)())
+STATICFNDEF void sys_settimer(TID tid, ABS_TIME *time_to_expir)
 {
 #	ifdef BSD_TIMER
 	if (in_setitimer_error)
@@ -577,7 +603,7 @@ STATICFNDEF void start_first_timer(ABS_TIME *curr_time)
 		{
 			eltime = sub_abs_time((ABS_TIME *)&timeroot->expir_time, curr_time);
 			/* If nothing has expired yet, break. */
-			if ((0 < eltime.at_sec) || ((0 == eltime.at_sec) && (0 < eltime.at_usec)) || (0 < timer_stack_count))
+			if (((0 <= eltime.at_sec) && !((0 == eltime.at_sec) && (0 == eltime.at_usec))) || (0 < timer_stack_count))
 				break;
 			/* Otherwise, drive the handler. */
 			timer_handler(DUMMY_SIG_NUM);
@@ -586,7 +612,7 @@ STATICFNDEF void start_first_timer(ABS_TIME *curr_time)
 		if (timeroot)
 		{
 			deferred_timers_check_needed = FALSE;
-			sys_settimer(timeroot->tid, &eltime, timeroot->handler);
+			SYS_SETTIMER(timeroot, &eltime);
 		}
 	} else if (0 < safe_timer_cnt)
 	{	/* There are some safe timers on the queue. */
@@ -594,18 +620,27 @@ STATICFNDEF void start_first_timer(ABS_TIME *curr_time)
 		while (tpop)
 		{
 			eltime = sub_abs_time((ABS_TIME *)&tpop->expir_time, curr_time);
-			if (tpop->safe)
-			{	/* Regular timers cannot be processed here, so only handle safe timers, and only if expired. */
-				if ((0 > eltime.at_sec) || ((0 == eltime.at_sec) && (0 == eltime.at_usec)))
+			if ((0 > eltime.at_sec) || ((0 == eltime.at_sec) && (0 == eltime.at_usec)))
+			{	/* Timer has expired. Handle safe timers, defer unsafe timers. */
+				if (tpop->safe)
+				{
 					timer_handler(DUMMY_SIG_NUM);
-				else
-					sys_settimer(tpop->tid, &eltime, tpop->handler);
-				break;
-			} else if (0 > eltime.at_sec)
-				deferred_timers_check_needed = TRUE;
-			tpop = tpop->next;
+					break;	/* timer_handler() handles all expired, so we are done. */
+				} else
+				{
+					deferred_timers_check_needed = TRUE;
+					tpop->block_int = intrpt_ok_state;
+					tpop = tpop->next;	/* Check next timer */
+				}
+			} else
+			{	/* Set system timer to wake on unexpired timer. */
+				SYS_SETTIMER(tpop, &eltime);
+				break;	/* System timer will handle subsequent timers, so we are done. */
+			}
 		}
 	}
+	else
+		deferred_timers_check_needed = (NULL != timeroot);
 	DUMP_TIMER_INFO("At the end of start_first_timer()");
 }
 
@@ -628,10 +663,13 @@ STATICFNDEF void timer_handler(int why)
 	boolean_t	util_copy_saved = FALSE, safe_for_timer_pop;
 #	ifdef DEBUG
 	boolean_t	save_in_nondeferrable_signal_handler;
+	ABS_TIME	rel_time, old_at, late_time;
+	static int	last_continue_proc_cnt = -1;
 #	endif
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
+	assert(gtm_is_main_thread() || gtm_jvm_process);
 	DUMP_TIMER_INFO("At the start of timer_handler()");
 	if (SIGALRM == why)
 	{	/* If why is 0, we know that timer_handler() was called directly, so no need
@@ -640,11 +678,6 @@ STATICFNDEF void timer_handler(int why)
 		FORWARD_SIG_TO_MAIN_THREAD_IF_NEEDED(SIGALRM);
 	}
 #	ifdef DEBUG
-	if (IS_GTM_IMAGE)
-	{
-		tpop = find_timer((TID)heartbeat_timer_ptr, &tpop);
-		assert(process_exiting || (((NULL != tpop) && heartbeat_started) || ((NULL == tpop) && !heartbeat_started)));
-	}
 	/* Note that it is possible "in_nondeferrable_signal_handler" is non-zero if we first went into generic_signal_handler
 	 * (say to handle sig-3) and then had a timer handler pop while inside there (possible for example in receiver server).
 	 * So save current value of global and restore it at end of this function.
@@ -673,12 +706,31 @@ STATICFNDEF void timer_handler(int why)
 #	ifdef DEBUG
 	if (safe_for_timer_pop)
 		in_nondeferrable_signal_handler = IN_TIMER_HANDLER;
+	/* Allow a base 50 seconds of lateness for safe timers */
+	late_time.at_sec = 50;
+	late_time.at_usec = 0;
 #	endif
 	while (tpop)					/* fire all handlers that expired */
 	{
 		cmp = abs_time_comp(&at, (ABS_TIME *)&tpop->expir_time);
 		if (cmp < 0)
 			break;
+#		if defined(DEBUG) && !defined(_AIX)
+		if (tpop->safe && (TREF(continue_proc_cnt) == last_continue_proc_cnt)
+			&& !(gtm_white_box_test_case_enabled
+				&& (WBTEST_SIGTSTP_IN_JNL_OUTPUT_SP == gtm_white_box_test_case_number)))
+		{	/* Check if the timer is extremely overdue, with the following exceptions:
+			 *	- Unsafe timers can be delayed indefinitely.
+			 *	- AIX systems tend to arbitrarily delay processes when loaded.
+			 *	- WBTEST_SIGTSTP_IN_JNL_OUTPUT_SP stops the process from running.
+			 *	- Some other mechanism causes a SIGSTOP/SIGCONT, bumping continue_proc_cnt.
+			 */
+			rel_time = sub_abs_time(&at, (ABS_TIME *)&tpop->expir_time);
+			if (abs_time_comp(&late_time, &rel_time) <= 0)
+				gtm_fork_n_core();	/* Dump core, but keep going. */
+		}
+		last_continue_proc_cnt = TREF(continue_proc_cnt);
+#		endif
 		/* A timer might pop while we are in the non-zero intrpt_ok_state zone, which could cause collisions. Instead,
 		 * we will defer timer events and drive them once the deferral is removed, unless the timer is safe.
 		 */
@@ -698,7 +750,7 @@ STATICFNDEF void timer_handler(int why)
 #				ifdef DEBUG
 				if (gtm_white_box_test_case_enabled
 					&& (WBTEST_DEFERRED_TIMERS == gtm_white_box_test_case_number)
-					&& ((void *)tpop->handler != (void*)heartbeat_timer_ptr))
+					&& ((void *)tpop->handler != (void*)jnl_file_close_timer_ptr))
 				{
 					DBGFPF((stderr, "TIMER_HANDLER: handled a timer\n"));
 					timer_pop_cnt++;
@@ -708,7 +760,23 @@ STATICFNDEF void timer_handler(int why)
 				(*tpop->handler)(tpop->tid, tpop->hd_len, tpop->hd_data);
 				timer_in_handler = FALSE;
 				if (!tpop->safe)		/* if safe, avoid a system call */
+				{
+					DEBUG_ONLY(old_at = at);
 					sys_get_curr_time(&at);	/* refresh current time if called a handler */
+#					ifdef DEBUG
+					/* Include the time it took to handle the unsafe timer in the allowed late time.
+					 * Otherwise, a hung unsafe timer could cause a subsequent safe timer to be overdue.
+					 */
+					rel_time = sub_abs_time(&at, &old_at);
+					late_time.at_sec += rel_time.at_sec;
+					late_time.at_usec += rel_time.at_usec;
+					if (late_time.at_usec > MICROSEC_IN_SEC)
+					{
+						late_time.at_sec++;
+						late_time.at_usec -= MICROSEC_IN_SEC;
+					}
+#					endif
+				}
 				DEBUG_ONLY(TRACE_TIMER_POP(tpop));
 			}
 			tpop->next = (GT_TIMER *)timefree;	/* put timer block on the free chain */
@@ -759,6 +827,7 @@ STATICFNDEF void timer_handler(int why)
 				}
 			}
 #			endif
+			tpop->block_int = intrpt_ok_state;
 			tpop_prev = tpop;
 			tpop = tpop->next;
 			if (0 == safe_timer_cnt)	/* no more safe timers left, so quit */
@@ -816,7 +885,7 @@ STATICFNDEF GT_TIMER *find_timer(TID tid, GT_TIMER **tprev)
  *      	hdata   	- data to pass to timer rtn if any
  *      	safe_timer	- timer's handler is in safe_handlers array
  */
-STATICFNDEF void add_timer(ABS_TIME *atp, TID tid, int4 time_to_expir, void (*handler)(), int4 hdata_len,
+STATICFNDEF GT_TIMER *add_timer(ABS_TIME *atp, TID tid, int4 time_to_expir, void (*handler)(), int4 hdata_len,
 	void *hdata, boolean_t safe_timer)
 {
 	GT_TIMER	*tp, *tpp, *ntp, *lastntp;
@@ -869,6 +938,7 @@ STATICFNDEF void add_timer(ABS_TIME *atp, TID tid, int4 time_to_expir, void (*ha
 		assert(0 < safe_timer_cnt);
 	} else
 		ntp->safe = FALSE;
+	ntp->block_int = INTRPT_OK_TO_INTERRUPT;
 	ntp->hd_len = hdata_len;
 	if (0 < hdata_len)
 		memcpy(ntp->hd_data, hdata, hdata_len);
@@ -890,7 +960,7 @@ STATICFNDEF void add_timer(ABS_TIME *atp, TID tid, int4 time_to_expir, void (*ha
 		timeroot = ntp;
 	else
 		tpp->next = ntp;
-	return;
+	return ntp;
 }
 
 /* Remove timer from the timer chain. */
@@ -900,6 +970,7 @@ STATICFNDEF void remove_timer(TID tid)
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
+	DUMP_TIMER_INFO("At the start of remove_timer()");
 	if (tp = find_timer(tid, &tprev))		/* Warning: assignment */
 	{
 		if (tprev)
@@ -915,6 +986,7 @@ STATICFNDEF void remove_timer(TID tid)
 		/* assert that no duplicate timer entry with the same "tid" exists in the timer chain */
 		assert((NULL == find_timer(tid, &tpp)));
 	}
+	DUMP_TIMER_INFO("After invoking remove_timer()");
 }
 
 /* System call to cancel timer. Not static because can be called from generic_signal_handler() to stop timers
@@ -957,6 +1029,7 @@ void cancel_unsafe_timers(void)
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
+	DUMP_TIMER_INFO("At the start of cancel_unsafe_timers()");
 	SIGPROCMASK(SIG_BLOCK, &blockalrm, &savemask, rc);	/* block SIGALRM signal */
 	active = curr = (GT_TIMER *)timeroot;
 	while (curr)
@@ -991,6 +1064,7 @@ void cancel_unsafe_timers(void)
 	}
 #	endif
 	SIGPROCMASK(SIG_SETMASK, &savemask, NULL, rc);
+	DUMP_TIMER_INFO("After invoking cancel_unsafe_timers()");
 }
 
 /* Initialize timers. */
diff --git a/sr_unix/gt_timers_add_safe_hndlrs.c b/sr_unix/gt_timers_add_safe_hndlrs.c
index 475c629..ee98cd5 100644
--- a/sr_unix/gt_timers_add_safe_hndlrs.c
+++ b/sr_unix/gt_timers_add_safe_hndlrs.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2012, 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2012-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -13,10 +14,12 @@
 
 #include "gt_timer.h"
 #include "gt_timers_add_safe_hndlrs.h"
-#include "heartbeat_timer.h"
 #include "semwt2long_handler.h"
 #include "secshr_client.h"
-#include "dskspace_msg_timer.h"
+#include "jnl_file_close_timer.h"
+#ifdef DEBUG
+#include "fake_enospc.h"
+#endif
 
 /* This optional routine adds entries to the safe_handlers[] array. It is separate because while most executables need
  * these timers listed, there is one executable (gtmsecshr) that decidedly does not - gtmsecshr. If these routines are
@@ -26,5 +29,9 @@
 
 void gt_timers_add_safe_hndlrs(void)
 {
-	add_safe_timer_handler(4, semwt2long_handler, client_timer_handler, heartbeat_timer, dskspace_msg_timer);
+	add_safe_timer_handler(4, semwt2long_handler, client_timer_handler, simple_timeout_timer,
+				jnl_file_close_timer);
+#	ifdef DEBUG
+	add_safe_timer_handler(2, fake_enospc, handle_deferred_syslog);
+#	endif
 }
diff --git a/sr_unix/gtm_aio.h b/sr_unix/gtm_aio.h
old mode 100755
new mode 100644
index 3c491a3..15d0636
--- a/sr_unix/gtm_aio.h
+++ b/sr_unix/gtm_aio.h
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2003, 2009 Fidelity Information Services, Inc	*
+ * Copyright (c) 2003-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -10,7 +11,7 @@
  ****************************************************************/
 #ifndef GTM_AIO_H
 #define GTM_AIO_H
-
+#if defined(MUR_USE_AIO)
 #ifndef __CYGWIN__
 #include <aio.h>
 #endif
@@ -91,3 +92,4 @@ struct aiocb {
 }
 
 #endif
+#endif
diff --git a/sr_unix/gtm_compile.c b/sr_unix/gtm_compile.c
index 7fce330..6f737d3 100644
--- a/sr_unix/gtm_compile.c
+++ b/sr_unix/gtm_compile.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001, 2015 Fidelity National Information	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -106,7 +106,6 @@ int	gtm_compile (void)
 	free(orig_cmdstr.addr);
 	glb_cmd_qlf = save_qlf;
 	/* end command qualifier processing stuff */
-	initialize_pattern_table();
 	ce_init();	/* initialize compiler escape processing */
 	prealloc_gt_timers();
 	gt_timers_add_safe_hndlrs();	/* Not sure why compiler needs timers but .. */
diff --git a/sr_unix/gtm_dbjnl_dupfd_check.c b/sr_unix/gtm_dbjnl_dupfd_check.c
index 18cfdf6..a313b4c 100644
--- a/sr_unix/gtm_dbjnl_dupfd_check.c
+++ b/sr_unix/gtm_dbjnl_dupfd_check.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2009 Fidelity Information Services, Inc	*
+ * Copyright (c) 2009-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -37,20 +38,20 @@ GBLDEF	gd_region	*dupfd_check_reg;		/* for debugging purposes */
 GBLDEF	int		dupfd_check_fd;			/* for debugging purposes */
 GBLDEF	fdinfo_t	*dupfd_check_openfdarray;	/* for debugging purposes */
 
+error_def(ERR_GVFAILCORE);
+
 /* Before fixing corrupt jnl fd take a core dump and send syslog message to ensure it gets analyzed */
-#define	FIX_CORRUPT_JNLFD(REG)				\
-{							\
-	jnl_private_control	*jpc;			\
-							\
-	error_def(ERR_GVFAILCORE);			\
-							\
-	assert(FALSE);					\
-	gtm_fork_n_core();				\
-	send_msg(VARLSTCNT(1) ERR_GVFAILCORE);		\
-	jpc = FILE_INFO(REG)->s_addrs.jnl;		\
-	jpc->channel = NOJNL;				\
-	jpc->cycle--;					\
-	jpc->pini_addr = 0;				\
+#define	FIX_CORRUPT_JNLFD(REG)						\
+{									\
+	jnl_private_control	*jpc;					\
+									\
+	assert(FALSE);							\
+	gtm_fork_n_core();						\
+	send_msg_csa(CSA_ARG(NULL) VARLSTCNT(1) ERR_GVFAILCORE);	\
+	jpc = FILE_INFO(REG)->s_addrs.jnl;				\
+	jpc->channel = NOJNL;						\
+	jpc->cycle--;							\
+	jpc->pini_addr = 0;						\
 }
 
 boolean_t gtm_check_fd_is_valid(gd_region *reg, boolean_t is_db, int fd)
@@ -60,14 +61,11 @@ boolean_t gtm_check_fd_is_valid(gd_region *reg, boolean_t is_db, int fd)
 	int		fstat_res;
 
 	FSTAT_FILE(fd, &stat_buf, fstat_res);
-	if (-1 == fstat_res)
-		GTMASSERT;
+	assertpro(-1 != fstat_res);
 	assert(reg->open);
 	if (is_db)
-	{
-		if (!is_gdid_stat_identical(&FILE_ID(reg), &stat_buf))
-			GTMASSERT;	/* db fd does not corespond back to itself */
-	} else
+		assertpro(is_gdid_stat_identical(&FILE_ID(reg), &stat_buf));	/* db fd does not corespond back to itself */
+	else
 	{
 		csa = &FILE_INFO(reg)->s_addrs;
 		/* If fd does not point back to journal file, it could be because of a concurrent journal switch.
@@ -88,12 +86,11 @@ void	gtm_dupfd_check_specific(gd_region *reg, fdinfo_t *open_fdarray, int fd, bo
 	int			fstat_res;
 	struct stat		stat_buf;
 
-	/* Record key local variables in globals in case we take a GTMASSERT and need to analyze the pro core */
+	/* Record key local variables in globals in case we take an assertpro and need to analyze the pro core */
 	dupfd_check_fd = fd;
 	dupfd_check_reg = reg;
 	dupfd_check_openfdarray = open_fdarray;
-	if (0 > fd)
-		GTMASSERT;
+	assertpro(0 <= fd);
 	if (MAX_FD_FOR_FASTCHECK > fd)
 	{	/* fd is within fastcheck range. We assume the first fd that fills the array is valid and skip the
 		 * heavyweight fstat check. For dbg builds though, we do this check just so that code is exercised as well.
@@ -101,15 +98,13 @@ void	gtm_dupfd_check_specific(gd_region *reg, fdinfo_t *open_fdarray, int fd, bo
 		assert((NULL != open_fdarray[fd].reg) || gtm_check_fd_is_valid(reg, is_db, fd));
 		if (NULL != open_fdarray[fd].reg)
 		{
-			if (is_db && open_fdarray[fd].is_db)
-				GTMASSERT;	/* Two databases have SAME fd. Cannot do much to recover from this situation */
+			assertpro(!(is_db && open_fdarray[fd].is_db));	/* Cannot do much to recover from 2 DBs with SAME the fd */
 			/* The fds of one region's database and another region's journal collide.
 			 * Check if db fd is indeed valid and if so close the journal's fd.
 			 * If db fd is not valid, then cannot do much to recover from this situation.
 			 */
 			FSTAT_FILE(fd, &stat_buf, fstat_res);
-			if (-1 == fstat_res)
-				GTMASSERT;
+			assertpro(-1 != fstat_res);
 			if (is_db)
 			{
 				db_reg = reg;
@@ -119,8 +114,7 @@ void	gtm_dupfd_check_specific(gd_region *reg, fdinfo_t *open_fdarray, int fd, bo
 				db_reg = open_fdarray[fd].reg;
 				jnl_reg = reg;
 			}
-			if (!is_gdid_stat_identical(&FILE_ID(db_reg), &stat_buf))
-				GTMASSERT;	/* fd does not correspond back to the db file so the db fd got corrupt somehow */
+			assertpro(is_gdid_stat_identical(&FILE_ID(db_reg), &stat_buf));	/* fd doesn't lead back to DB; corrupted! */
 			/* fd corresponds back to the database which means the jnl file structure is corrupt which can be fixed */
 			FIX_CORRUPT_JNLFD(jnl_reg);
 			if (!is_db) /* Entry in open_fdarray[fd] is correct. So return without updating it (to the wrong value) */
@@ -153,7 +147,7 @@ void	gtm_dbjnl_dupfd_check(void)
 		for (reg = addr_ptr->regions, r_top = reg + addr_ptr->n_regions; reg < r_top; reg++)
 		{
 			seg = reg->dyn.addr;
-			if ((dba_bg != seg->acc_meth) && (dba_mm != seg->acc_meth))
+			if (!IS_ACC_METH_BG_OR_MM(seg->acc_meth))
 				continue;
 			if (!reg->open || reg->was_open)
 				continue;
diff --git a/sr_unix/gtm_env.csh b/sr_unix/gtm_env.csh
index a32c07c..0f6fbeb 100755
--- a/sr_unix/gtm_env.csh
+++ b/sr_unix/gtm_env.csh
@@ -1,6 +1,7 @@
 #################################################################
 #								#
-#	Copyright 2001, 2014 Fidelity Information Services, Inc	#
+# Copyright (c) 2001-2016 Fidelity National Information		#
+# Services, Inc. and/or its subsidiaries. All rights reserved.	#
 #								#
 #	This source code contains the intellectual property	#
 #	of its copyright holder(s), and is made available	#
@@ -113,7 +114,7 @@ if ( $?gtm_version_change == "1" ) then
 	setenv	gt_ld_options_pro	"$gt_ld_options_common"
 	setenv	gt_ld_options_gtmshr	""
 # force the linker to retain gtmci.o & dependent modules even if not referenced.
-	setenv gt_ld_ci_u_option	"-Wl,-u,gtm_ci"
+	setenv gt_ld_ci_u_option	"-Wl,-u,gtm_ci -Wl,-u,gtm_is_main_thread"
 
 	setenv gt_ld_extra_libs		""		# platform specific GT.M libraries
 
diff --git a/sr_unix/gtm_env_init_sp.c b/sr_unix/gtm_env_init_sp.c
index c3e7370..8442819 100755
--- a/sr_unix/gtm_env_init_sp.c
+++ b/sr_unix/gtm_env_init_sp.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2004-2016 Fidelity National Information	*
+ * Copyright (c) 2004-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -27,6 +27,7 @@
 #include "gtm_stdio.h"
 #include "gtm_stdlib.h"
 
+#include "gtmio.h"
 #include "gtmimagename.h"
 #include "gtm_logicals.h"
 #include "trans_numeric.h"
@@ -54,6 +55,7 @@
 #include "send_msg.h"
 #include "eintr_wrappers.h"
 #include "utfcgr.h"
+#include "gtm_reservedDB.h"
 #ifdef __linux__
 #include "hugetlbfs_overrides.h"
 #endif
@@ -78,14 +80,6 @@
 #endif
 #define DEFAULT_MUPIP_TRIGGER_ETRAP 		"IF $ZJOBEXAM()"
 
-/* Only for this function, define MAX_TRANS_NAME_LEN to be equal to GTM_PATH_MAX as some of the environment variables can indicate
- * path to files which is limited by GTM_PATH_MAX.
- */
-#ifdef MAX_TRANS_NAME_LEN
-#undef MAX_TRANS_NAME_LEN
-#endif
-#define MAX_TRANS_NAME_LEN			GTM_PATH_MAX
-
 /* Remove trailing '/' from path (unless only '/') */
 #define	REMOVE_TRAILING_SLASH_FROM_MSTR(TRANS)				\
 {									\
@@ -110,6 +104,9 @@ ZOS_ONLY(GBLREF	char		*gtm_utf8_locale_object;)
 ZOS_ONLY(GBLREF	boolean_t	gtm_tag_utf8_as_ascii;)
 GTMTRIG_ONLY(GBLREF	mval	gtm_trigger_etrap;)
 GBLREF	volatile boolean_t	timer_in_handler;
+#ifdef USE_LIBAIO
+GBLREF	char			io_setup_errstr[IO_SETUP_ERRSTR_ARRAYSIZE];
+#endif
 
 #ifdef GTM_TRIGGER
 LITDEF mval default_mupip_trigger_etrap = DEFINE_MVAL_LITERAL(MV_STR, 0 , 0 , (SIZEOF(DEFAULT_MUPIP_TRIGGER_ETRAP) - 1),
@@ -146,8 +143,8 @@ void	gtm_env_init_sp(void)
 	int4		status, index, len, hrtbt_cntr_delta, stat_res;
 	size_t		cwdlen;
 	boolean_t	ret, is_defined, novalidate;
-	char		buf[MAX_TRANS_NAME_LEN], *token, cwd[GTM_PATH_MAX];
-	char		*cwdptr, *trigger_etrap, *c, *end, *strtokptr;
+	char		buf[MAX_SRCLINE + 1], *token, cwd[GTM_PATH_MAX];
+	char		*cwdptr, *c, *end, *strtokptr;
 	struct stat	outbuf;
 	int		gtm_autorelink_shm_min;
 	DCL_THREADGBL_ACCESS;
@@ -179,10 +176,11 @@ void	gtm_env_init_sp(void)
 		} /* else gtm_core_file/gtm_core_putenv remain null and we likely cannot generate proper core files */
 	}
 #	endif
+	assert(GTM_PATH_MAX <= MAX_SRCLINE);
 	/* Validate $gtm_tmp if specified, else that default is available */
 	val.addr = GTM_TMP_ENV;
 	val.len = SIZEOF(GTM_TMP_ENV) - 1;
-	if (SS_NORMAL != (status = TRANS_LOG_NAME(&val, &trans, buf, SIZEOF(buf), do_sendmsg_on_log2long)))
+	if (SS_NORMAL != (status = TRANS_LOG_NAME(&val, &trans, buf, GTM_PATH_MAX, do_sendmsg_on_log2long)))
 	{	/* Nothing for $gtm_tmp either - use DEFAULT_GTM_TMP which is already a string */
 		MEMCPY_LIT(buf, DEFAULT_GTM_TMP);
 		trans.addr = buf;
@@ -209,15 +207,14 @@ void	gtm_env_init_sp(void)
 	ret = trans_numeric(&val, &is_defined, TRUE); /* Not initialized enuf for errors yet so silent rejection of invalid vals */
 	TREF(lv_null_subs) = ((is_defined && (LVNULLSUBS_FIRST < ret) && (LVNULLSUBS_LAST > ret)) ? ret : LVNULLSUBS_OK);
 #	ifdef GTM_TRIGGER
-	token = GTM_TRIGGER_ETRAP;
-	trigger_etrap = GETENV(++token);	/* Point past the $ in gtm_logicals definition */
-	if (trigger_etrap)
+	val.addr = GTM_TRIGGER_ETRAP;
+	val.len = SIZEOF(GTM_TRIGGER_ETRAP) - 1;
+	if (SS_NORMAL == (status = TRANS_LOG_NAME(&val, &trans, buf, SIZEOF(buf), do_sendmsg_on_log2long)))
 	{
-		len = STRLEN(trigger_etrap);
-		gtm_trigger_etrap.str.len = len;
-		gtm_trigger_etrap.str.addr = malloc(len);	/* Allocates special null addr if length is 0 which we can key on */
-		if (0 < len)
-			memcpy(gtm_trigger_etrap.str.addr, trigger_etrap, len);
+		gtm_trigger_etrap.str.addr = malloc(trans.len + 1); /* +1 for '\0'; This memory is never freed */
+		memcpy(gtm_trigger_etrap.str.addr, trans.addr, trans.len);
+		gtm_trigger_etrap.str.addr[trans.len] = '\0';
+		gtm_trigger_etrap.str.len = trans.len;
 		gtm_trigger_etrap.mvtype = MV_STR;
 	} else if (IS_MUPIP_IMAGE)
 		gtm_trigger_etrap = default_mupip_trigger_etrap;
@@ -231,9 +228,9 @@ void	gtm_env_init_sp(void)
 	gtm_principal_editing_defaults = 0;
 	val.addr = GTM_PRINCIPAL_EDITING;
 	val.len = SIZEOF(GTM_PRINCIPAL_EDITING) - 1;
-	if (SS_NORMAL == (status = TRANS_LOG_NAME(&val, &trans, buf, SIZEOF(buf), do_sendmsg_on_log2long)))
+	if (SS_NORMAL == (status = TRANS_LOG_NAME(&val, &trans, buf, GTM_PATH_MAX, do_sendmsg_on_log2long)))
 	{
-		assert(trans.len < SIZEOF(buf));
+		assert(trans.len < GTM_PATH_MAX);
 		trans.addr[trans.len] = '\0';
 		token = STRTOK_R(trans.addr, ":", &strtokptr);
 		while (NULL != token)
@@ -271,7 +268,7 @@ void	gtm_env_init_sp(void)
 	}
 	val.addr = GTM_CHSET_ENV;
 	val.len = STR_LIT_LEN(GTM_CHSET_ENV);
-	if (SS_NORMAL == (status = TRANS_LOG_NAME(&val, &trans, buf, SIZEOF(buf), do_sendmsg_on_log2long))
+	if (SS_NORMAL == (status = TRANS_LOG_NAME(&val, &trans, buf, GTM_PATH_MAX, do_sendmsg_on_log2long))
 	    && STR_LIT_LEN(UTF8_NAME) == trans.len)
 	{
 		if (!strncasecmp(buf, UTF8_NAME, STR_LIT_LEN(UTF8_NAME)))
@@ -280,15 +277,16 @@ void	gtm_env_init_sp(void)
 #			ifdef __MVS__
 			val.addr = GTM_CHSET_LOCALE_ENV;
 			val.len = STR_LIT_LEN(GTM_CHSET_LOCALE_ENV);
-			if ((SS_NORMAL == (status = TRANS_LOG_NAME(&val, &trans, buf, SIZEOF(buf), do_sendmsg_on_log2long))) &&
+			if ((SS_NORMAL == (status = TRANS_LOG_NAME(&val, &trans, buf, GTM_PATH_MAX, do_sendmsg_on_log2long))) &&
 			    (0 < trans.len))
 			{	/* full path to 64 bit ASCII UTF-8 locale object */
 				gtm_utf8_locale_object = malloc(trans.len + 1);
-				strcpy(gtm_utf8_locale_object, buf);
+				STRNCPY_STR(gtm_utf8_locale_object, buf, trans.len);
+				gtm_utf8_locale_object[trans.len] = '\0';
 			}
 			val.addr = GTM_TAG_UTF8_AS_ASCII;
 			val.len = STR_LIT_LEN(GTM_TAG_UTF8_AS_ASCII);
-			if (SS_NORMAL == (status = TRANS_LOG_NAME(&val, &trans, buf, SIZEOF(buf), do_sendmsg_on_log2long)))
+			if (SS_NORMAL == (status = TRANS_LOG_NAME(&val, &trans, buf, GTM_PATH_MAX, do_sendmsg_on_log2long)))
 			{	/* We to tag UTF8 files as ASCII so we can read them, this var disables that */
 				if (status = logical_truth_value(&val, FALSE, &is_defined) && is_defined)
 					gtm_tag_utf8_as_ascii = FALSE;
@@ -297,7 +295,7 @@ void	gtm_env_init_sp(void)
 			/* Initialize $ZPATNUMERIC only if $ZCHSET is "UTF-8" */
 			val.addr = GTM_PATNUMERIC_ENV;
 			val.len = STR_LIT_LEN(GTM_PATNUMERIC_ENV);
-			if (SS_NORMAL == (status = TRANS_LOG_NAME(&val, &trans, buf, SIZEOF(buf), do_sendmsg_on_log2long))
+			if (SS_NORMAL == (status = TRANS_LOG_NAME(&val, &trans, buf, GTM_PATH_MAX, do_sendmsg_on_log2long))
 			    && STR_LIT_LEN(UTF8_NAME) == trans.len
 			    && !strncasecmp(buf, UTF8_NAME, STR_LIT_LEN(UTF8_NAME)))
 			{
@@ -337,15 +335,13 @@ void	gtm_env_init_sp(void)
 	val.len = SIZEOF(GTM_DB_STARTUP_MAX_WAIT) - 1;
 	hrtbt_cntr_delta = trans_numeric(&val, &is_defined, FALSE);
 	if (!is_defined)
-		TREF(dbinit_max_hrtbt_delta) = DEFAULT_DBINIT_MAX_HRTBT_DELTA;
-	else if ((INDEFINITE_WAIT_ON_EAGAIN != hrtbt_cntr_delta) && (NO_SEMWAIT_ON_EAGAIN != hrtbt_cntr_delta))
-		TREF(dbinit_max_hrtbt_delta) = (ROUND_UP2(hrtbt_cntr_delta, 8)) / 8;
+		TREF(dbinit_max_delta_secs) = DEFAULT_DBINIT_MAX_DELTA_SECS;
 	else
-		TREF(dbinit_max_hrtbt_delta) = hrtbt_cntr_delta;
+		TREF(dbinit_max_delta_secs) = hrtbt_cntr_delta;
 	/* Initialize variable that controls the location of GT.M custom errors file (used for anticipatory freeze) */
 	val.addr = GTM_CUSTOM_ERRORS;
 	val.len = SIZEOF(GTM_CUSTOM_ERRORS) - 1;
-	if (SS_NORMAL == (status = TRANS_LOG_NAME(&val, &trans, buf, SIZEOF(buf), do_sendmsg_on_log2long)))
+	if (SS_NORMAL == (status = TRANS_LOG_NAME(&val, &trans, buf, GTM_PATH_MAX, do_sendmsg_on_log2long)))
 	{
 		assert(GTM_PATH_MAX > trans.len);
 		(TREF(gtm_custom_errors)).addr = malloc(trans.len + 1); /* +1 for '\0'; This memory is never freed */
@@ -362,14 +358,11 @@ void	gtm_env_init_sp(void)
 	val.len = SIZEOF(GTM_ETRAP) - 1;
 	if (SS_NORMAL == (status = TRANS_LOG_NAME(&val, &trans, buf, SIZEOF(buf), do_sendmsg_on_log2long)))
 	{
-		if (MAX_SRCLINE >= trans.len)
-		{	/* Only set $ETRAP if the length is usable (may be NULL) */
-			dollar_etrap.str.addr = malloc(trans.len + 1); /* +1 for '\0'; This memory is never freed */
-			memcpy(dollar_etrap.str.addr, trans.addr, trans.len);
-			dollar_etrap.str.addr[trans.len] = '\0';
-			dollar_etrap.str.len = trans.len;
-			dollar_etrap.mvtype = MV_STR;
-		}
+		dollar_etrap.str.addr = malloc(trans.len + 1); /* +1 for '\0'; This memory is never freed */
+		memcpy(dollar_etrap.str.addr, trans.addr, trans.len);
+		dollar_etrap.str.addr[trans.len] = '\0';
+		dollar_etrap.str.len = trans.len;
+		dollar_etrap.mvtype = MV_STR;
 	} else if (0 == dollar_etrap.mvtype)
 	{	/* If didn't setup $ETRAP, set default $ZTRAP instead */
 		dollar_ztrap.mvtype = MV_STR;
@@ -381,20 +374,17 @@ void	gtm_env_init_sp(void)
 	val.len = SIZEOF(GTM_ZSTEP) - 1;
 	if (SS_NORMAL == (status = TRANS_LOG_NAME(&val, &trans, buf, SIZEOF(buf), do_sendmsg_on_log2long)))
 	{
-		if (MAX_SRCLINE >= trans.len)
-		{
-			dollar_zstep.str.addr = malloc(trans.len + 1); /* +1 for '\0'; This memory is never freed */
-			memcpy(dollar_zstep.str.addr, trans.addr, trans.len);
-			dollar_zstep.str.addr[trans.len] = '\0';
-			dollar_zstep.str.len = trans.len;
-			dollar_zstep.mvtype = MV_STR;
-		}
+		dollar_zstep.str.addr = malloc(trans.len + 1); /* +1 for '\0'; This memory is never freed */
+		memcpy(dollar_zstep.str.addr, trans.addr, trans.len);
+		dollar_zstep.str.addr[trans.len] = '\0';
+		dollar_zstep.str.len = trans.len;
+		dollar_zstep.mvtype = MV_STR;
 	}
 	/* See if gtm_link is set */
 	val.addr = GTM_LINK;
 	val.len = SIZEOF(GTM_LINK) - 1;
 	TREF(relink_allowed) = LINK_NORECURSIVE; /* default */
-	if (SS_NORMAL == (status = TRANS_LOG_NAME(&val, &trans, buf, SIZEOF(buf), do_sendmsg_on_log2long)))
+	if (SS_NORMAL == (status = TRANS_LOG_NAME(&val, &trans, buf, GTM_PATH_MAX, do_sendmsg_on_log2long)))
 	{
 		init_relink_allowed(&trans); /* set TREF(relink_allowed) */
 	}
@@ -403,11 +393,11 @@ void	gtm_env_init_sp(void)
 	{	/* Set default or supplied value for $gtm_linktmpdir */
 		val.addr = GTM_LINKTMPDIR;
 		val.len = SIZEOF(GTM_LINKTMPDIR) - 1;
-		if (SS_NORMAL != (status = TRANS_LOG_NAME(&val, &trans, buf, SIZEOF(buf), do_sendmsg_on_log2long)))
+		if (SS_NORMAL != (status = TRANS_LOG_NAME(&val, &trans, buf, GTM_PATH_MAX, do_sendmsg_on_log2long)))
 		{	/* Else use default $gtm_tmp value or its default */
 			val.addr = GTM_TMP_ENV;
 			val.len = SIZEOF(GTM_TMP_ENV) - 1;
-			if (SS_NORMAL != (status = TRANS_LOG_NAME(&val, &trans, buf, SIZEOF(buf), do_sendmsg_on_log2long)))
+			if (SS_NORMAL != (status = TRANS_LOG_NAME(&val, &trans, buf, GTM_PATH_MAX, do_sendmsg_on_log2long)))
 			{	/* Nothing for $gtm_tmp either - use DEFAULT_GTM_TMP which is already a string */
 				trans.addr = DEFAULT_GTM_TMP;
 				trans.len = SIZEOF(DEFAULT_GTM_TMP) - 1;
@@ -500,7 +490,7 @@ void	gtm_env_init_sp(void)
 	val.addr = GTM_DB_COUNTER_SEM_INCR;
 	val.len = SIZEOF(GTM_DB_COUNTER_SEM_INCR) - 1;
 	gtm_db_counter_sem_incr = trans_numeric(&val, &is_defined, TRUE);
-	if (!is_defined)
+	if (!is_defined || !gtm_db_counter_sem_incr)
 		gtm_db_counter_sem_incr = DEFAULT_DB_COUNTER_SEM_INCR;
 	/* DEBUG-only option to force the journal pool accounting out of sync every n transactions. */
 	val.addr = GTM_TEST_JNLPOOL_SYNC;
@@ -545,9 +535,9 @@ void	gtm_env_init_sp(void)
 	{
 		val.addr = GTM_LOCALE;
 		val.len = SIZEOF(GTM_LOCALE) - 1;
-		if (SS_NORMAL == (status = TRANS_LOG_NAME(&val, &trans, buf, SIZEOF(buf), do_sendmsg_on_log2long)))
+		if (SS_NORMAL == (status = TRANS_LOG_NAME(&val, &trans, buf, GTM_PATH_MAX, do_sendmsg_on_log2long)))
 		{
-			if ((0 < trans.len) && (SIZEOF(buf) > trans.len))
+			if ((0 < trans.len) && (GTM_PATH_MAX > trans.len))
 			{	/* Something was specified - need to clear LC_ALL and set LC_CTYPE but need room in buf[]
 				 * for string-ending null.
 				 */
@@ -559,4 +549,46 @@ void	gtm_env_init_sp(void)
 			}
 		}
 	}
+#	ifdef 	USE_LIBAIO
+	/* Initialize variable that controls the nr_events parameter to io_setup() for linux AIO. */
+	val.addr = GTM_AIO_NR_EVENTS;
+	val.len = SIZEOF(GTM_AIO_NR_EVENTS) - 1;
+	TREF(gtm_aio_nr_events) = trans_numeric(&val, &is_defined, FALSE);
+	if (!is_defined || (TREF(gtm_aio_nr_events) == 0))
+		TREF(gtm_aio_nr_events) = GTM_AIO_NR_EVENTS_DEFAULT;
+	/* Populate the io_setup() error string. */
+	SNPRINTF(io_setup_errstr, ARRAYSIZE(io_setup_errstr), IO_SETUP_FMT, TREF(gtm_aio_nr_events));
+#	endif
+	/* Check if gtm_statshare is enabled */
+	val.addr = GTM_STATSHARE;
+	val.len = SIZEOF(GTM_STATSHARE) - 1;
+	ret = logical_truth_value(&val, FALSE, &is_defined);
+	if (is_defined)
+		TREF(statshare_opted_in) = ret;
+	/* Pull in specified gtm_statsdir if specified, else default to gtm_tmp or its default. Note we don't validate the directory
+	 * here. It need not exist until a database is opened. If gtm_statsdir does not exist, find an appropriate default and
+	 * set it so it is always resolvable.
+	 */
+	val.addr = GTM_STATSDIR;
+	val.len = SIZEOF(GTM_STATSDIR) - 1;
+	/* Using MAX_FN_LEN below instead of GTM_PATH_MAX because csa->nl->statsdb_fname[] size is MAX_FN_LEN + 1 */
+	if (SS_NORMAL != (status = TRANS_LOG_NAME(&val, &trans, buf, MAX_STATSDIR_LEN, do_sendmsg_on_log2long)))
+	{	/* Either no translation for $gtm_statsdir or the current and/or expanded value of $gtm_statsdir exceeds the
+		 * max path length. For either case $gtm_statsdir needs to be (re)set so try to use $gtm_tmp instead - note
+		 * from here down we'll (re)set $gtm_statsdir so it ALWAYS has a (valid) value for mu_cre_file() to later use.
+		 */
+		val.addr = GTM_TMP_ENV;
+		val.len = SIZEOF(GTM_TMP_ENV) - 1;
+		if (SS_NORMAL != (status = TRANS_LOG_NAME(&val, &trans, buf, MAX_STATSDIR_LEN, do_sendmsg_on_log2long)))
+		{	/* Nothing for $gtm_tmp - use DEFAULT_GTM_TMP instead */
+			trans.addr = DEFAULT_GTM_TMP;
+			trans.len = SIZEOF(DEFAULT_GTM_TMP) - 1;
+		}
+		/* In the setenv() call below, trans.addr always points to a double quoted string so has a NULL terminator */
+		c = GTM_STATSDIR;
+		c++;				/* Bump past the '$' to get to the actual envvar name needed by setenv */
+		status = setenv(c, trans.addr, 1);
+		assert(0 == status);
+	}
+	assert(MAX_STATSDIR_LEN >= trans.len);
 }
diff --git a/sr_unix/gtm_exit_handler.c b/sr_unix/gtm_exit_handler.c
index e2f9297..df1de36 100755
--- a/sr_unix/gtm_exit_handler.c
+++ b/sr_unix/gtm_exit_handler.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -33,10 +33,7 @@
 #include "repl_msg.h"
 #include "gtmsource.h"
 #include "gt_timer.h"
-#ifdef UNIX
 #include "mutex.h"
-#endif
-#include "op.h"
 #include "fgncalsp.h"
 #include "zcall_package.h"
 #include "gtm_exit_handler.h"
@@ -47,11 +44,13 @@
 #include "secshr_db_clnup.h"
 #include "gtmcrypt.h"
 #include "relinkctl.h"
+#include "gvcst_protos.h"
+#include "op.h"
 
 GBLREF	int4			exi_condition;
 GBLREF	uint4			dollar_tlevel;
 GBLREF	boolean_t		need_core;			/* Core file should be created */
-GBLREF	boolean_t		created_core;			/* core file was created */
+GBLREF	boolean_t		created_core;			/* Core file was created */
 GBLREF	unsigned int		core_in_progress;
 GBLREF	boolean_t		dont_want_core;
 GBLREF	boolean_t		exit_handler_active;
@@ -60,8 +59,9 @@ GBLREF 	boolean_t		is_tracing_on;
 
 enum rundown_state
 {
-	rundown_state_mprof,
 	rundown_state_lock,
+	rundown_state_mprof,
+	rundown_state_statsdb,
 	rundown_state_db,
 	rundown_state_io,
 	rundown_state_last
@@ -112,12 +112,10 @@ GBLREF	int			process_exiting;
 	SET_PROCESS_EXITING_TRUE;									\
 	CANCEL_TIMERS;			/* Cancel all unsafe timers - No unpleasant surprises */	\
 	/* Note we call secshr_db_clnup() with the flag NORMAL_TERMINATION even in an error condition	\
-	 * here because we know at this point that we aren't in the middle of a transaction but crit	\
-	 * may be held in one or more regions and/or other odds/ends to cleanup.			\
+	 * here because we know at this point that we aren't in the middle of a transaction commit but	\
+	 * crit	may be held in one or more regions and/or other odds/ends to cleanup.			\
 	 */												\
 	secshr_db_clnup(NORMAL_TERMINATION);								\
-	if (dollar_tlevel)										\
-		OP_TROLLBACK(0);									\
 	zcall_halt();											\
 	op_lkinit();											\
 	op_unlock();											\
@@ -169,11 +167,13 @@ void gtm_exit_handler(void)
 	if (exit_handler_active || skip_exit_handler) /* Skip exit handling if specified or if exit handler already active */
 		return;
 	exit_handler_active = TRUE;
-	attempting = rundown_state_mprof;
+	attempting = rundown_state_lock;
 	actual_exi_condition = 0;
 	ESTABLISH_NORET(exi_ch, error_seen);	/* "error_seen" is initialized inside this macro */
-	RUNDOWN_STEP(rundown_state_mprof, rundown_state_lock, ERR_MPROFRUNDOWN, MPROF_RUNDOWN_MACRO);
-	RUNDOWN_STEP(rundown_state_lock, rundown_state_db, ERR_LKRUNDOWN, LOCK_RUNDOWN_MACRO);
+	RUNDOWN_STEP(rundown_state_lock, rundown_state_mprof, ERR_LKRUNDOWN, LOCK_RUNDOWN_MACRO);
+	RUNDOWN_STEP(rundown_state_mprof, rundown_state_statsdb, ERR_MPROFRUNDOWN, MPROF_RUNDOWN_MACRO);
+	/* The condition handler used in the gvcst_remove_statsDB_linkage_all() path takes care of sending errors */
+	RUNDOWN_STEP(rundown_state_statsdb, rundown_state_db, 0, gvcst_remove_statsDB_linkage_all());
 	RUNDOWN_STEP(rundown_state_db, rundown_state_io, ERR_GVRUNDOWN, gv_rundown());
 	/* We pass 0 (not ERR_IORUNDOWN) below to avoid displaying any error if io_rundown fails. One reason we have
 	 * seen an external filter M program fail is with a "SYSTEM-E-ENO32, Broken pipe" error if the source or receiver
diff --git a/sr_unix/gtm_fork_n_core.c b/sr_unix/gtm_fork_n_core.c
index 314b8cc..5af7bff 100755
--- a/sr_unix/gtm_fork_n_core.c
+++ b/sr_unix/gtm_fork_n_core.c
@@ -45,7 +45,6 @@
 #include "gdsfhead.h"
 #include "filestruct.h"
 #include "dpgbldir.h"
-#include "fork_init.h"
 
 GBLREF boolean_t	created_core;		/* core file was created */
 GBLREF unsigned int	core_in_progress;
@@ -82,6 +81,7 @@ void gtm_fork_n_core(void)
 	sgmnt_addrs		*csa;
 	sgmnt_data_ptr_t	csd, tmp_csd;
 	gd_region		*reg, *r_top;
+	intrpt_state_t		prev_intrpt_state;
 	DEBUG_ONLY(struct rlimit rlim;)
 
 	DEBUG_ONLY(
@@ -171,9 +171,15 @@ void gtm_fork_n_core(void)
 	/* block SIGALRM signal */
 	SIGPROCMASK(SIG_BLOCK, &blockalrm, &savemask, rc);
 
-	FORK(childid);
+	/* FORK() clears timers in the child, which shouldn't be necessary here since we have SIGALRM blocked,
+	 * and it disrupts diagnosis of any timer related issues, so inline the parts we want here.
+	 */
+	DEFER_INTERRUPTS(INTRPT_IN_FORK_OR_SYSTEM, prev_intrpt_state);
+	childid = fork();							/* BYPASSOK */
+	/* Only ENABLE_INTERRUPTS() in the parent, below, as we don't want any deferred handlers firing in the child. */
 	if (childid)
 	{
+		ENABLE_INTERRUPTS(INTRPT_IN_FORK_OR_SYSTEM, prev_intrpt_state);
 		if (-1 == childid)
 		{	/* restore interrupt handler */
 			sigaction(SIGINT, &intr, 0);
@@ -201,6 +207,7 @@ void gtm_fork_n_core(void)
 			created_core = TRUE;
 	} else
 	{
+		intrpt_ok_state = prev_intrpt_state;	/* Restore from DEFER_INTERRUPTS */
 		DUMP_CORE;	/* This will (should) not return */
 		UNDERSCORE_EXIT(-1);	/* Protection to kill fork'd process with no rundown by exit handler(s) */
 	}
diff --git a/sr_unix/gtm_is_main_thread.c b/sr_unix/gtm_is_main_thread.c
new file mode 100644
index 0000000..9aae875
--- /dev/null
+++ b/sr_unix/gtm_is_main_thread.c
@@ -0,0 +1,39 @@
+/****************************************************************
+ *								*
+ * Copyright (c) 2016 Fidelity National Information		*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
+ *								*
+ *	This source code contains the intellectual property	*
+ *	of its copyright holder(s), and is made available	*
+ *	under a license.  If you do not know the terms of	*
+ *	the license, please stop and do not read further.	*
+ *								*
+ ****************************************************************/
+
+#include "mdef.h"
+
+#include "gtmxc_types.h"
+
+#ifdef GTM_PTHREAD
+#  include "gtm_pthread.h"
+#endif
+
+#ifdef GTM_PTHREAD
+GBLREF	pthread_t		gtm_main_thread_id;
+GBLREF	boolean_t		gtm_main_thread_id_set;
+#endif
+
+int gtm_is_main_thread()
+{
+# 	ifdef GTM_PTHREAD
+	if (!gtm_main_thread_id_set)
+		return -1;
+	if (pthread_equal(gtm_main_thread_id, pthread_self()))
+		return 1;
+	return 0;
+#	else
+	return -1;
+#	endif
+}
+
+
diff --git a/sr_unix/gtm_logicals.h b/sr_unix/gtm_logicals.h
index d0b3a7f..a3a4183 100644
--- a/sr_unix/gtm_logicals.h
+++ b/sr_unix/gtm_logicals.h
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -10,6 +10,8 @@
  *								*
  ****************************************************************/
 
+#include "gtm_libaio.h"
+
 /* gtm_logicals.h - Environment variables used by GT.M. */
 /* within each group, the entries are in alpha order of the third column */
 /* Warning: A consideration is that reordering these values reorders the output in v53003/D9I10002703 as well */
@@ -94,6 +96,9 @@
 #define	GTM_TRIGGER_ETRAP		"$gtm_trigger_etrap"
 #define	GTM_SNAPTMPDIR			"$gtm_snaptmpdir"
 #define	GTM_DB_STARTUP_MAX_WAIT		"$gtm_db_startup_max_wait"
+#ifdef USE_LIBAIO
+#define GTM_AIO_NR_EVENTS		"$gtm_aio_nr_events"
+#endif
 
 /* Replication */
 #define	GTM_REPL_INSTANCE		"$gtm_repl_instance"
@@ -122,6 +127,11 @@
 #define	GTM_AUTORELINK_KEEPRTN		"$gtm_autorelink_keeprtn"	/* do not let go of objects in rtnobj shm */
 #define	GTM_AUTORELINK_CTLMAX		"$gtm_autorelink_ctlmax"
 
+/* Global shared stats related */
+#define GTM_STATSHARE			"$gtm_statshare"
+#define GTM_STATSDIR			"$gtm_statsdir"
+#define GTM_JNL_STATSDB			"gtm_jnl_statsdb"		/* Only seen/used in debug mode */
+
 /* Miscellaneous */
 #define GTM_ERROR_ON_JNL_FILE_LOST	"$gtm_error_on_jnl_file_lost"
 #define GTM_ETRAP			"$gtm_etrap"
@@ -142,3 +152,4 @@
 #define GTM_LOCALE			"$gtm_locale"
 #define GTM_UTFCGR_STRINGS		"$gtm_utfcgr_strings"
 #define GTM_UTFCGR_STRING_GROUPS	"$gtm_utfcgr_string_groups"
+
diff --git a/sr_unix/gtm_main.c b/sr_unix/gtm_main.c
index ba168ab..39473b5 100644
--- a/sr_unix/gtm_main.c
+++ b/sr_unix/gtm_main.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -53,6 +53,7 @@ GBLREF	IN_PARMS			*cli_lex_in_ptr;
 GBLREF	char				cli_token_buf[];
 GBLREF	char				cli_err_str[];
 GBLREF	boolean_t			gtm_dist_ok_to_use;
+GBLREF	char				gtm_dist[GTM_PATH_MAX];
 GBLREF	CLI_ENTRY			mumps_cmd_ary[];
 GBLREF	boolean_t			skip_dbtriggers;
 #if defined (GTM_TRIGGER) && (DEBUG)
@@ -65,6 +66,7 @@ GBLREF	u_casemap_t 			gtm_strToTitle_ptr;		/* Function pointer for gtm_strToTitl
 GBLDEF	CLI_ENTRY			*cmd_ary = &mumps_cmd_ary[0]; /* Define cmd_ary to be the MUMPS specific cmd table */
 
 #define GTMCRYPT_ERRLIT			"during GT.M startup"
+#define GTMXC_gblstat			"GTMXC_gblstat=%s/gtmgblstat.xc"
 
 #ifdef __osf__
  /* On OSF/1 (Digital Unix), pointers are 64 bits wide; the only exception to this is C programs for which one may
@@ -93,10 +95,12 @@ int gtm_main (int argc, char **argv, char **envp)
 #endif
 {
 	char			*ptr, *eq, **p;
+	char			gtmlibxc[GTM_PATH_MAX];
 	int             	eof, parse_ret;
 	int			gtmcrypt_errno;
-#	ifdef GTM_SOCKET_SSL_SUPPORT
 	int			status;
+
+#	ifdef GTM_SOCKET_SSL_SUPPORT
 	char			tlsid_env_name[MAX_TLSID_LEN * 2];
 #	endif
 	DCL_THREADGBL_ACCESS;
@@ -146,6 +150,8 @@ int gtm_main (int argc, char **argv, char **envp)
 	gtm_chk_dist(argv[0]);
 	/* this should be after cli_lex_setup() due to S390 A/E conversion in cli_lex_setup   */
 	init_gtm();
+	SNPRINTF(gtmlibxc, GTM_PATH_MAX, GTMXC_gblstat, gtm_dist);
+	PUTENV(status, gtmlibxc);
 #	ifdef GTM_TLS
 	if (MUMPS_COMPILE != invocation_mode)
 	{
@@ -162,7 +168,8 @@ int gtm_main (int argc, char **argv, char **envp)
 				else if (ERR_CRYPTINIT == gtmcrypt_errno)
 					gtmcrypt_errno = ERR_CRYPTINIT2;
 				gtmcrypt_errno = SET_CRYPTERR_MASK(gtmcrypt_errno);
-				GTMCRYPT_REPORT_ERROR(gtmcrypt_errno, rts_error, SIZEOF(GTMCRYPT_ERRLIT) - 1, GTMCRYPT_ERRLIT); /* BYPASSOK */
+				GTMCRYPT_REPORT_ERROR(gtmcrypt_errno, rts_error, SIZEOF(GTMCRYPT_ERRLIT) - 1,
+						      GTMCRYPT_ERRLIT);
 			}
 		}
 #		ifdef GTM_SOCKET_SSL_SUPPORT
diff --git a/sr_unix/gtm_multi_proc.c b/sr_unix/gtm_multi_proc.c
index eb55162..50d3290 100644
--- a/sr_unix/gtm_multi_proc.c
+++ b/sr_unix/gtm_multi_proc.c
@@ -48,7 +48,6 @@
 #include "gtmsource.h"
 #include "init_secshr_addrs.h"
 #include "mutex.h"
-#include "heartbeat_timer.h"
 
 #ifdef DEBUG
 #include "is_proc_alive.h"
@@ -257,7 +256,6 @@ void	gtm_multi_proc_helper(void)
 	{
 		assert(mutex_per_process_init_pid != process_id);
 		mutex_per_process_init();
-		START_HEARTBEAT_IF_NEEDED;
 	}
 	/* process-level reinitialization is done */
 	mp_hdr = multi_proc_shm_hdr;
diff --git a/sr_unix/gtm_permissions.c b/sr_unix/gtm_permissions.c
index a677693..397e412 100755
--- a/sr_unix/gtm_permissions.c
+++ b/sr_unix/gtm_permissions.c
@@ -27,17 +27,40 @@
 #include "send_msg.h"
 #include "eintr_wrappers.h"
 
-GBLREF  char		gtm_dist[GTM_PATH_MAX];
-GBLREF  boolean_t	gtm_dist_ok_to_use;
+GBLREF		char		gtm_dist[GTM_PATH_MAX];
+GBLREF		boolean_t	gtm_dist_ok_to_use;
+STATICDEF	gid_t		*gid_list = NULL;
+STATICDEF	int		gid_list_len = 0;
 
-#if defined(__hpux) && defined(__hppa)
-#	define LIBGTMSHR "%s/libgtmshr.sl"
-#elif defined(__MVS__)
+#if defined(__MVS__)
 #	define LIBGTMSHR "%s/libgtmshr.dll"
 #else
 #	define LIBGTMSHR "%s/libgtmshr.so"
 #endif
 
+/* Get the process's group list and stash the information to avoid repeated calls */
+#define GETGROUPS								\
+MBSTART {									\
+	int	tmp_gid_list_len;						\
+	if (NULL == gid_list)							\
+	{	/* Obtain the supplementary gid list */				\
+		tmp_gid_list_len = getgroups(0, NULL);				\
+		assert(0 <= tmp_gid_list_len);					\
+		if (0 < tmp_gid_list_len)					\
+		{								\
+			gid_list = malloc(tmp_gid_list_len * SIZEOF(gid_t));	\
+			gid_list_len = getgroups(tmp_gid_list_len, gid_list);	\
+			assert(gid_list_len == tmp_gid_list_len);		\
+			if (gid_list_len != tmp_gid_list_len)			\
+			{							\
+				gid_list_len = 0;				\
+				free(gid_list);					\
+				gid_list = NULL;				\
+			}							\
+		}								\
+	}									\
+} MBEND
+
 /* Return the group id of the distribution based on libgtmshr.xx[x]. If there is some
  * problem accessing that file then return INVALID_GID which signals no change to group.  Otherwise,
  * the pointer to the stat buffer will contain the result of the call to STAT_FILE.
@@ -73,14 +96,32 @@ gid_t	gtm_get_group_id(struct stat *stat_buff)
 /* Return TRUE if the "uid" parameter is a member of the "gid" group parameter.
  * Return FALSE if it is not.
  */
-int gtm_member_group_id(uid_t uid, gid_t gid)
+boolean_t gtm_member_group_id(uid_t uid, gid_t gid, struct perm_diag_data *pdd)
 {
 	struct group	*grp;
 	struct passwd	*pwd;
+	int		i;
 
-	/* Check effective group if current effective uid */
-	if ((GETEUID() == uid) && (GETEGID() == gid))
-		return(TRUE);
+#	ifdef DEBUG
+	if (WBTEST_HELPOUT_FAILGROUPCHECK == gtm_white_box_test_case_number)
+	{
+		GETGROUPS;
+		return FALSE;
+	}
+#	endif
+	/* Effective user is uid ?*/
+	if (GETEUID() == uid)
+	{	/* Effective group is gid? */
+		if (GETEGID() == gid)
+			return(TRUE);
+		GETGROUPS;
+		/* Search through the supplementary gid list for a match */
+		for (i = 0; i < gid_list_len; i++)
+			if (gid == gid_list[i])
+				return (TRUE);
+		/* EUID == uid but gid is not in any groups associated with the process */
+		return FALSE;
+	}
 	/* Get "uid" details */
 	pwd = getpwuid(uid);
 	if (NULL == pwd)
@@ -108,7 +149,8 @@ int gtm_member_group_id(uid_t uid, gid_t gid)
  *	c) *user_id to the user id to be used.
  *		If the user is root, *user_id may be set to a target uid if needed. Otherwise, it will be set to INVALID_UID.
  */
-void	gtm_permissions(struct stat *stat_buff, int *user_id, int *group_id, int *perm, enum perm_target_types target_type)
+boolean_t gtm_permissions(struct stat *stat_buff, int *user_id, int *group_id, int *perm,
+			  enum perm_target_types target_type, struct perm_diag_data *pdd)
 {
 	uid_t		this_uid, file_uid;
 	gid_t		this_gid, file_gid;
@@ -121,7 +163,9 @@ void	gtm_permissions(struct stat *stat_buff, int *user_id, int *group_id, int *p
 	int		gtm_group_restricted;
 	int		file_owner_perms, file_group_perms, file_other_perms;
 	int		new_owner_perms, new_group_perms, new_other_perms;
-	mode_t		st_mode;
+	char		*strnow, *strtop;
+	int		i, len;
+	mode_t		st_mode, dir_mode = 0;
 
 	/* get this_uid/gid */
 	this_uid = GETEUID();
@@ -131,8 +175,8 @@ void	gtm_permissions(struct stat *stat_buff, int *user_id, int *group_id, int *p
 	/* set variables for permission logic */
 	this_uid_is_file_owner = (this_uid == file_uid);
 	this_uid_is_root = (0 == this_uid);
-	this_uid_in_file_group = gtm_member_group_id(this_uid, file_gid);
-	owner_in_file_group = gtm_member_group_id(file_uid, file_gid);
+	this_uid_in_file_group = gtm_member_group_id(this_uid, file_gid, pdd);
+	owner_in_file_group = gtm_member_group_id(file_uid, file_gid, pdd);
 	*user_id = INVALID_UID;		/* set default uid */
 	*group_id = INVALID_GID;	/* set default gid */
 	assert((PERM_FILE & target_type) || (PERM_IPC & target_type));	/* code below relies on this */
@@ -179,7 +223,6 @@ void	gtm_permissions(struct stat *stat_buff, int *user_id, int *group_id, int *p
 			*perm = new_owner_perms | new_group_perms;
 		}
 		*group_id = file_gid;			/* use file group */
-		assert(this_uid_in_file_group || this_uid_is_root);
 	} else
 	{	/* File is other accessible OR accessible to user and group but not other */
 		file_other_perms = (0006 & st_mode);
@@ -196,7 +239,8 @@ void	gtm_permissions(struct stat *stat_buff, int *user_id, int *group_id, int *p
 		}
 		/* Find restricted group, if any */
 		gtm_dist_gid = gtm_get_group_id(&dist_stat_buff);
-		gtm_group_restricted = ((INVALID_GID != gtm_dist_gid) && !(dist_stat_buff.st_mode & 01)); /* not other executable */
+		dir_mode = dist_stat_buff.st_mode;
+		gtm_group_restricted = ((INVALID_GID != gtm_dist_gid) && !(dir_mode & 01)); /* not other executable */
 		if ((this_uid_is_file_owner && this_uid_in_file_group) || this_uid_is_root)
 		{
 			if (this_uid_is_root)		/* otherwise, use default uid */
@@ -212,7 +256,8 @@ void	gtm_permissions(struct stat *stat_buff, int *user_id, int *group_id, int *p
 			new_group_perms = (new_group_perms | (new_other_perms << 3));
 			if (gtm_group_restricted)
 			{
-				assert(gtm_member_group_id(this_uid, gtm_dist_gid));
+				assert((WBTEST_HELPOUT_FAILGROUPCHECK == gtm_white_box_test_case_number)
+						|| gtm_member_group_id(this_uid, gtm_dist_gid, pdd));
 				*group_id = gtm_dist_gid;	/* use restricted group */
 				*perm = new_owner_perms | new_group_perms;
 			} else
@@ -234,7 +279,7 @@ void	gtm_permissions(struct stat *stat_buff, int *user_id, int *group_id, int *p
 		} else
 		{	/* This uid has access via file group OR file other membership */
 			/* Use default uid in all cases below */
-			if (this_uid_in_file_group && owner_in_file_group)
+			if ((this_uid_in_file_group && owner_in_file_group) || this_uid_is_root)
 			{
 				*group_id = file_gid;		/* use file group */
 				assert(file_group_perms);
@@ -242,9 +287,11 @@ void	gtm_permissions(struct stat *stat_buff, int *user_id, int *group_id, int *p
 				*perm = new_owner_perms | new_group_perms | new_other_perms;
 			} else if (gtm_group_restricted)
 			{
-				assert(gtm_member_group_id(this_uid, gtm_dist_gid));
+				assert((WBTEST_HELPOUT_FAILGROUPCHECK == gtm_white_box_test_case_number)
+						|| gtm_member_group_id(this_uid, gtm_dist_gid, pdd));
 				*group_id = gtm_dist_gid;	/* use restricted group */
 				new_group_perms = (new_group_perms | (new_other_perms << 3));
+				/* "owner" gets group permissions if in group, otherwise "other" permissions */
 				new_owner_perms = this_uid_in_file_group ? (new_group_perms << 3) : (new_other_perms << 6);
 				*perm = new_owner_perms | new_group_perms;
 			} else
@@ -259,7 +306,7 @@ void	gtm_permissions(struct stat *stat_buff, int *user_id, int *group_id, int *p
 					new_owner_perms = new_group_perms << 3;
 				} else
 				{
-					/* Use default group */
+					/* Use default group; Use 'other' permissions for owner */
 					new_owner_perms = (new_other_perms << 6);
 					new_group_perms = (new_group_perms | (new_other_perms << 3));
 					new_other_perms = new_group_perms >> 3;
@@ -271,5 +318,33 @@ void	gtm_permissions(struct stat *stat_buff, int *user_id, int *group_id, int *p
 	if (target_type & PERM_EXEC)
 		*perm |= ((*perm & 0444) >> 2);	/* Grab the read bits, shift them to the exec bit position, and add them back in. */
 	assert(*perm);
-	return;
+	if (!(this_uid_is_root) && (!(*perm & 0600)
+				|| (!(this_uid_is_file_owner) && !(this_uid_in_file_group) && !(0006 & st_mode))))
+	{	/* Either permissions don't include owner or could not ascertain group membership */
+		pdd->this_uid = this_uid;
+		pdd->this_gid = this_gid;
+		pdd->file_uid = file_uid;	/* get owning file uid */
+		pdd->file_gid = file_gid;	/* get owning file gid */
+		pdd->lib_gid  = gtm_dist_gid;
+		SNPRINTF(pdd->file_perm, SIZEOF(pdd->file_perm), "%04o", st_mode & 07777);
+		SNPRINTF(pdd->lib_perm, SIZEOF(pdd->lib_perm), "%04o", dir_mode  & 07777);
+		if (gid_list_len > 0)
+		{
+			strtop = pdd->print_gid_list + MAX_PRINT_GID_LEN;
+			strnow = pdd->print_gid_list;
+			for (i = 0; (strnow < strtop) && (i < gid_list_len); i++)
+				if (this_gid != gid_list[i]) /* Avoid printing the primary GID */
+					strnow += SNPRINTF(strnow, (strtop - strnow), ",%d", (int) gid_list[i]);
+			if (strnow >= strtop)
+			{	/* It's too long, terminate with an ellipsis*/
+				strnow = pdd->print_gid_list + MAX_PRINT_GID_LEN - GID_ELLIPSIS_LEN;
+				SNPRINTF(strnow, GID_ELLIPSIS_LEN, GID_ELLIPSIS);
+			}
+			pdd->print_gid_list_len = strlen(pdd->print_gid_list);
+			assert(pdd->print_gid_list_len < MAX_PRINT_GID_LEN);
+		} else
+			pdd->print_gid_list_len = 0;
+		return FALSE;
+	}
+	return TRUE;
 }
diff --git a/sr_unix/gtm_permissions.h b/sr_unix/gtm_permissions.h
index 8e855cb..6c92750 100644
--- a/sr_unix/gtm_permissions.h
+++ b/sr_unix/gtm_permissions.h
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2009-2015 Fidelity National Information 	*
+ * Copyright (c) 2009-2016 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -15,6 +15,7 @@
 
 #include <mdefsp.h>
 
+
 enum perm_target_types
 {
     PERM_FILE = 0x01,			/* Request permissions for creating a new file */
@@ -22,8 +23,37 @@ enum perm_target_types
     PERM_EXEC = 0x04			/* Request execute permissions, masked with the above. Currently only used with PERM_IPC */
 };
 
-gid_t	gtm_get_group_id(struct stat *stat_buff);
-int	gtm_member_group_id(uid_t uid, gid_t gid);
-void	gtm_permissions(struct stat *stat_buff, int *user_id, int *group_id, int *perm, enum perm_target_types target_type);
+#define MAX_PRINT_GID_LEN	128
+#define GID_ELLIPSIS		"..."
+#define GID_ELLIPSIS_LEN	4
+
+struct perm_diag_data
+{
+	uid_t	this_uid;
+	gid_t	this_gid;
+	uid_t	file_uid;
+	gid_t	file_gid;
+	char	file_perm[12];
+	gid_t	lib_gid;
+	char	lib_perm[12];
+	char	print_gid_list[MAX_PRINT_GID_LEN];	/* Can't imagine this getting any longer in the real world */
+	int	print_gid_list_len;
+};
+
+error_def(ERR_PERMGENFAIL);
+error_def(ERR_PERMGENDIAG);
+
+#define PERMGENDIAG_ARGS(pdd)									\
+		ERR_PERMGENDIAG, 11,								\
+		(pdd).this_uid, (pdd).this_gid,							\
+		(pdd).print_gid_list_len, (pdd).print_gid_list,					\
+		(pdd).file_uid, (pdd).file_gid, RTS_ERROR_STRING((pdd).file_perm),		\
+		(pdd).lib_gid, RTS_ERROR_STRING((pdd).lib_perm)
+#define PERMGENDIAG_ARG_COUNT	(13)
+
+gid_t gtm_get_group_id(struct stat *stat_buff);
+boolean_t gtm_member_group_id(uid_t uid, gid_t gid, struct perm_diag_data *pdd);
+boolean_t gtm_permissions(struct stat *stat_buff, int *user_id, int *group_id, int *perm, enum perm_target_types target_type,
+			struct perm_diag_data *pdd);
 
 #endif /* GTM_PERMISSIONS */
diff --git a/sr_unix/dskspace_msg_timer.h b/sr_unix/gtm_poll.h
old mode 100755
new mode 100644
similarity index 51%
rename from sr_unix/dskspace_msg_timer.h
rename to sr_unix/gtm_poll.h
index b255fdc..29e943d
--- a/sr_unix/dskspace_msg_timer.h
+++ b/sr_unix/gtm_poll.h
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001 Sanchez Computer Associates, Inc.	*
+ * Copyright (c) 2016 Fidelity National Information		*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -8,13 +9,18 @@
  *	the license, please stop and do not read further.	*
  *								*
  ****************************************************************/
+#ifndef GTM_POLL_H_INCLUDED
+#define GTM_POLL_H_INCLUDED
 
-#ifndef _DSKSPACE_MSG_TIMER_H
-#define _DSKSPACE_MSG_TIMER_H
+#include <poll.h>
 
-/* define heartbeat interval */
-#define DSKSPACE_MSG_INTERVAL 	60 * 1000 /* one minute */
+#define EVENTFD_NOTIFIED(fds, n) (0 != (fds[n].revents & POLLIN))
 
-void dskspace_msg_timer(void);
+#define INIT_POLLFD(pollfd, efd)		\
+{						\
+	pollfd.fd = efd;			\
+	pollfd.revents = 0;			\
+	pollfd.events = POLLIN;			\
+}
 
 #endif
diff --git a/sr_unix/gtm_pthread_init_key.c b/sr_unix/gtm_pthread_init_key.c
index 7bb7c3d..cf4a1da 100644
--- a/sr_unix/gtm_pthread_init_key.c
+++ b/sr_unix/gtm_pthread_init_key.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2015 Fidelity National Information 		*
+ * Copyright (c) 2015-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -34,14 +34,15 @@ uint4	gtm_pthread_init_key(gd_region *reg)
 		return 0;
 	/* Initialize thread_gtm_putmsg_rname_key at start of thread */
 	assert('\0' == reg->rname[reg->rname_len]);	/* ensure region name is null terminated */
-	/* In rare cases (e.g. "mur_db_files_from_jnllist"), rname is not initialized, but fname is. Use it then.
-	 */
-	if (reg->rname_len)
+	/* In rare cases (e.g. "mur_db_files_from_jnllist"), rname is not initialized, but fname is. Use it then. */
+	if (!reg->owning_gd->is_dummy_gbldir)
 	{
+		assert(reg->rname_len);
 		ptr = &reg->rname[0];
 		assert('\0' == ptr[reg->rname_len]);
 	} else
 	{
+		assert(!memcmp(reg->rname, "DEFAULT", reg->rname_len));
 		ptr = &reg->dyn.addr->fname[0];
 		assert('\0' == ptr[reg->dyn.addr->fname_len]);
 	}
diff --git a/sr_unix/gtm_rel_quant.h b/sr_unix/gtm_rel_quant.h
index 409ec12..d6809bc 100644
--- a/sr_unix/gtm_rel_quant.h
+++ b/sr_unix/gtm_rel_quant.h
@@ -20,7 +20,6 @@
 #include "gtm_unistd.h"
 #include "sleep.h"
 
-GBLREF	uint4 volatile	heartbeat_counter;
 GBLREF	uint4		process_id;
 /* yield processor macro - if argument is 0 or the (pseudo-)random value whose limit the argument defines is 0 just yield
  * otherwise do a microsleep
@@ -38,12 +37,17 @@ GBLREF	uint4		process_id;
 
 #define	GTM_REL_QUANT(MAX_TIME_MASK)									\
 MBSTART {												\
-	int	NANO_SLEEP_TIME;									\
+	int		NANO_SLEEP_TIME;								\
+	static uint4	TIME_ADJ = 0;									\
 													\
-	/* process_id provides cheap pseudo-random across processes */					\
+	/* process_id provides cheap pseudo-random across processes, but add in a timestamp/counter	\
+	 * so that the number varies a bit.								\
+	 */												\
+	if (0 == TIME_ADJ)										\
+		TIME_ADJ = (uint4) time(NULL);								\
 	if (MAX_TIME_MASK)										\
-	{	/* 1 below guards against 0 heartbeat_counter to which AIX is prone, or process_id */	\
-		NANO_SLEEP_TIME = (1 | (process_id ^ heartbeat_counter) & (MAX_TIME_MASK));		\
+	{	/* To get a value that moves a bit, xor with a timestamp/counter. */			\
+		NANO_SLEEP_TIME = (process_id ^ (TIME_ADJ++)) & (MAX_TIME_MASK);			\
 		if (!NANO_SLEEP_TIME)									\
 			NANO_SLEEP_TIME = MAX_TIME_MASK;						\
 		assert((NANO_SLEEP_TIME < E_9) && (NANO_SLEEP_TIME > 0));				\
diff --git a/sr_unix/gtm_semutils.c b/sr_unix/gtm_semutils.c
index c7ced6e..8c201d6 100644
--- a/sr_unix/gtm_semutils.c
+++ b/sr_unix/gtm_semutils.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2011-2016 Fidelity National Information	*
+ * Copyright (c) 2011-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -39,7 +39,7 @@
 #include "filestruct.h"
 
 GBLREF uint4			process_id;
-GBLREF volatile uint4		heartbeat_counter;
+GBLREF bool			in_mupip_freeze;
 
 error_def(ERR_CRITSEMFAIL);
 error_def(ERR_SEMWT2LONG);
@@ -56,14 +56,14 @@ error_def(ERR_TEXT);
 #define IS_FTOK_SEM	(gtm_ftok_sem == semtype)
 
 
-boolean_t do_blocking_semop(int semid, enum gtm_semtype semtype, uint4 start_hrtbt_cntr, semwait_status_t *retstat, gd_region *reg,
-			    boolean_t *bypass, boolean_t *sem_halted)
+boolean_t do_blocking_semop(int semid, enum gtm_semtype semtype, boolean_t *stacktrace_time, boolean_t *timedout,
+				semwait_status_t *retstat, gd_region *reg, boolean_t *bypass, boolean_t *sem_halted)
 {
 	boolean_t			need_stacktrace, indefinite_wait;
 	char				*msgstr;
 	int				status = SS_NORMAL, save_errno, sem_pid, semval, i, sopcnt;
 	uint4				loopcnt = 0, max_hrtbt_delta, lcl_hrtbt_cntr, stuck_cnt = 0;
-	boolean_t			stacktrace_issued = FALSE, is_editor; /* This is LKE or DSE editor image */
+	boolean_t			stacktrace_issued = FALSE, ok_to_bypass;
 	struct sembuf			sop[3];
 	char				*sem_names[2] = {"FTOK", "access control"}; /* based on gtm_semtype enum order */
 
@@ -71,19 +71,22 @@ boolean_t do_blocking_semop(int semid, enum gtm_semtype semtype, uint4 start_hrt
 
 	SETUP_THREADGBL_ACCESS;
 	assert(IS_FTOK_SEM || IS_ACCESS_SEM);
+	assert(NO_SEMWAIT_ON_EAGAIN != TREF(dbinit_max_delta_secs));
+	assert(!((NULL == timedout) ^ (NULL == stacktrace_time)));
 	*sem_halted = FALSE;
 	/* Access control semaphore should not be increased when the process is readonly */
 	SET_GTM_SOP_ARRAY(sop, sopcnt, (IS_FTOK_SEM || !reg->read_only), (SEM_UNDO | IPC_NOWAIT));
-	is_editor = (IS_DSE_IMAGE || IS_LKE_IMAGE);
-	max_hrtbt_delta = TREF(dbinit_max_hrtbt_delta);
-	assert(NO_SEMWAIT_ON_EAGAIN != max_hrtbt_delta);
-	if (indefinite_wait = (INDEFINITE_WAIT_ON_EAGAIN == max_hrtbt_delta))
-		max_hrtbt_delta = DEFAULT_DBINIT_MAX_HRTBT_DELTA;
-	need_stacktrace = (DEFAULT_DBINIT_MAX_HRTBT_DELTA <= max_hrtbt_delta) && !is_editor;
+	/* If DSE or LKE or MUPIP FREEZE -ONLINE, it is okay to bypass but only if input "*bypass" is TRUE.
+	 * If "*bypass" is FALSE, that overrides anything else.
+	 */
+	ok_to_bypass = *bypass && (IS_DSE_IMAGE || IS_LKE_IMAGE || (IS_MUPIP_IMAGE && in_mupip_freeze));
+	*bypass = FALSE;	/* set default value of "*bypass" first. Can be overridden later if needed */
+	indefinite_wait = (NULL == timedout);
+	need_stacktrace = (DEFAULT_DBINIT_MAX_DELTA_SECS <= TREF(dbinit_max_delta_secs)) && !ok_to_bypass;
 	if (!need_stacktrace)
 	{	/* Since the user specified wait time is less than the default wait, wait that time without any stack trace */
-		if (is_editor)
-		{	/* Editors are able to bypass after 3 seconds of wait. IPC_NOWAIT semop every second.
+		if (ok_to_bypass)
+		{	/* ok_to_bypass == TRUE means we can bypass after 3 seconds of wait. IPC_NOWAIT semop every second.
 			 * The semaphore value must be at least 2 to make sure the shared memeory is already created.
 			 */
 			if (-1 == (semval = semctl(semid, DB_COUNTER_SEM, GETVAL))) /* semval = number of process attached */
@@ -117,7 +120,7 @@ boolean_t do_blocking_semop(int semid, enum gtm_semtype semtype, uint4 start_hrt
 						i++;
 					}
 				} while ((-1 == status) && ((EAGAIN == save_errno) || (ERANGE == save_errno))
-					 && (i < MAX_BYPASS_WAIT_SEC));
+											&& (i < MAX_BYPASS_WAIT_SEC));
 				if (-1 != status)
 					return TRUE;
 				assert(EINTR != save_errno);
@@ -148,9 +151,8 @@ boolean_t do_blocking_semop(int semid, enum gtm_semtype semtype, uint4 start_hrt
 				}
 			}
 		}
-		if (!is_editor || (semval <= DB_COUNTER_SEM_INCR))
-		{
-			/* Do not bypass. (We are not LKE/DSE OR) OR (There are less than 2 processes inside) */
+		if (!ok_to_bypass || (semval <= DB_COUNTER_SEM_INCR))
+		{	/* Do not bypass. (We are not LKE/DSE OR) OR (There are less than 2 processes inside) */
 			sop[0].sem_flg = sop[1].sem_flg = sop[2].sem_flg = SEM_UNDO; /* Enable blocking wait. */
 			do
 			{
@@ -166,7 +168,7 @@ boolean_t do_blocking_semop(int semid, enum gtm_semtype semtype, uint4 start_hrt
 					}
 				}
 			} while ((-1 == status) && ((EINTR == save_errno) || (ERANGE == save_errno))
-				 && !USER_SPECIFIED_TIME_EXPIRED(max_hrtbt_delta, start_hrtbt_cntr));
+				 && (indefinite_wait || !*timedout));
 			if (-1 != status)
 				return TRUE;
 			/* someone else is holding it and we are done waiting */
@@ -177,8 +179,7 @@ boolean_t do_blocking_semop(int semid, enum gtm_semtype semtype, uint4 start_hrt
 	} else
 	{
 		sop[0].sem_flg = sop[1].sem_flg = sop[2].sem_flg = SEM_UNDO; /* Enable blocking wait. */
-		lcl_hrtbt_cntr = heartbeat_counter;
-		while (!USER_SPECIFIED_TIME_EXPIRED(max_hrtbt_delta, start_hrtbt_cntr))
+		do
 		{
 			loopcnt++;
 			status = semop(semid, sop, sopcnt);
@@ -196,38 +197,31 @@ boolean_t do_blocking_semop(int semid, enum gtm_semtype semtype, uint4 start_hrt
 				continue;	/* retry semop */
 			} else if (EINTR != save_errno)
 				break;
-			if (lcl_hrtbt_cntr != heartbeat_counter)
-			{	/* We waited for at least one heartbeat. This is to ensure that we don't prematurely conclude
-				 * that we waited enough for the semop to return before taking a stack trace of the holding
-				 * process.
-				 */
-				sem_pid = semctl(semid, 0, GETPID);
-				if (-1 != sem_pid)
+			sem_pid = semctl(semid, 0, GETPID);
+			if (-1 != sem_pid)
+			{
+				if (!indefinite_wait && (*stacktrace_time || *timedout))
 				{
-					if (STACKTRACE_TIME(max_hrtbt_delta, start_hrtbt_cntr))
-					{	/* We want to take the stack trace at half-time and after the wait. But, since
-						 * the loop will continue ONLY as long as the specified wait time has not yet
-						 * elapsed, get the stack trace at half-time and at the penultimate heartbeat.
-						 */
-						stuck_cnt++;
-						if (IS_FTOK_SEM)
-							msgstr = (1 == stuck_cnt) ? "SEMWT2LONG_FTOK_INFO" : "SEMWT2LONG_FTOK";
-						else
-							msgstr = (1 == stuck_cnt) ? "SEMWT2LONG_ACCSEM_INFO" : "SEMWT2LONG_ACCSEM";
-						if ((0 != sem_pid) && (sem_pid != process_id))
-						{
-							GET_C_STACK_FROM_SCRIPT(msgstr, process_id, sem_pid, stuck_cnt);
-							if (TREF(gtm_environment_init))
-								stacktrace_issued = TRUE;
-						}
+					if (*stacktrace_time)
+						*stacktrace_time = FALSE;	/* Prevent re-issuing midpoint trace */
+					stuck_cnt++;
+					if (IS_FTOK_SEM)
+						msgstr = (1 == stuck_cnt) ? "SEMWT2LONG_FTOK_INFO" : "SEMWT2LONG_FTOK";
+					else
+						msgstr = (1 == stuck_cnt) ? "SEMWT2LONG_ACCSEM_INFO" : "SEMWT2LONG_ACCSEM";
+					if ((0 != sem_pid) && (sem_pid != process_id))
+					{
+						GET_C_STACK_FROM_SCRIPT(msgstr, process_id, sem_pid, stuck_cnt);
+						if (TREF(gtm_environment_init))
+							stacktrace_issued = TRUE;
 					}
-					lcl_hrtbt_cntr = heartbeat_counter;
-					continue;
 				}
-				save_errno = errno;	/* for the failed semctl, fall-through */
-				break;
+				continue;
 			}
-		}
+			save_errno = errno;	/* for the failed semctl, fall-through */
+			break;
+
+		} while (indefinite_wait || !*timedout);
 		if ((0 == loopcnt) || (EINTR == save_errno))
 		{	/* the timer has expired */
 			if (!indefinite_wait && !TREF(gtm_environment_init))
@@ -249,7 +243,7 @@ boolean_t do_blocking_semop(int semid, enum gtm_semtype semtype, uint4 start_hrt
 			} else if ((!*sem_halted) && (ERANGE == save_errno))
 			{
 				*sem_halted = TRUE;
-				return TRUE;
+				RETURN_SEMWAIT_FAILURE(retstat, 0, op_invalid_sem_syscall, ERR_SEMWT2LONG, 0, sem_pid);
 			}
 			/* else some other error occurred; fall-through */
 		}
diff --git a/sr_unix/gtm_semutils.h b/sr_unix/gtm_semutils.h
index 2d08b76..3d7dd84 100644
--- a/sr_unix/gtm_semutils.h
+++ b/sr_unix/gtm_semutils.h
@@ -15,7 +15,7 @@
 #include <sys/sem.h>
 
 /* Database startup wait related macros */
-#define DEFAULT_DBINIT_MAX_HRTBT_DELTA	12
+#define DEFAULT_DBINIT_MAX_DELTA_SECS	96
 #define NO_SEMWAIT_ON_EAGAIN		0
 #define INDEFINITE_WAIT_ON_EAGAIN	(uint4) -1
 #define MAX_BYPASS_WAIT_SEC		3
@@ -68,8 +68,8 @@ typedef struct semwait_status_struct
 	enum sem_syscalls	op;
 } semwait_status_t;
 
-boolean_t do_blocking_semop(int semid, enum gtm_semtype semtype, uint4 start_hrtbt_cntr, semwait_status_t *status, gd_region *reg,
-			    boolean_t *bypass, boolean_t *sem_halted);
+boolean_t do_blocking_semop(int semid, enum gtm_semtype semtype, boolean_t *stacktrace_time, boolean_t *timedout,
+				semwait_status_t *status, gd_region *reg, boolean_t *bypass, boolean_t *sem_halted);
 
 #define SENDMSG_SEMOP_SUCCESS_IF_NEEDED(STACKTRACE_ISSUED, SEMTYPE)								 \
 {																 \
@@ -78,7 +78,7 @@ boolean_t do_blocking_semop(int semid, enum gtm_semtype semtype, uint4 start_hrt
 		const char		*lcl_msgstr = NULL;									 \
 																 \
 		lcl_msgstr = (gtm_ftok_sem == SEMTYPE) ? "SEMWT2LONG_FTOK_SUCCEEDED: semop for the ftok semaphore succeeded"	 \
-							: "SEMWT2LONG_ACCSEM_SUCCEEDED: semop for the ftok semaphore succeeded"; \
+						       : "SEMWT2LONG_ACCSEM_SUCCEEDED: semop for the access semaphore succeeded";\
 		send_msg_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_TEXT, 2, LEN_AND_STR(lcl_msgstr));					 \
 	}															 \
 }
@@ -146,7 +146,7 @@ boolean_t do_blocking_semop(int semid, enum gtm_semtype semtype, uint4 start_hrt
 	{													\
 		assert(ERR_SEMWT2LONG == RETSTAT->status1);							\
 		assert(RETSTAT->sem_pid && (-1 != RETSTAT->sem_pid));						\
-		tot_wait_time = TREF(dbinit_max_hrtbt_delta) * HEARTBEAT_INTERVAL_IN_SECS;			\
+		tot_wait_time = TREF(dbinit_max_delta_secs);							\
 		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(13) DBFILERR_PARAMS(REG),					\
 			SEMWT2LONG_PARAMS(REG, RETSTAT, GTM_SEMTYPE, tot_wait_time));				\
 	} else													\
diff --git a/sr_unix/gtm_startup.c b/sr_unix/gtm_startup.c
index 8dc2d11..050ec2b 100644
--- a/sr_unix/gtm_startup.c
+++ b/sr_unix/gtm_startup.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information 	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -26,8 +26,6 @@
 #include "startup.h"
 #include "cmd_qlf.h"
 #include "lv_val.h"
-#include "collseq.h"
-#include "patcode.h"
 #include "gdsroot.h"
 #include "gtm_facility.h"
 #include "fileinfo.h"
@@ -87,11 +85,11 @@
 #include "cenable.h"
 #include "gtmimagename.h"
 #include "mprof.h"
-#include "heartbeat_timer.h"
 #include "gt_timers_add_safe_hndlrs.h"
 #include "continue_handler.h"
 #include "jobsp.h" /* For gcall.h */
 #include "gcall.h" /* For ojchildparms() */
+#include "common_startup_init.h"
 #ifdef UNICODE_SUPPORTED
 #include "utfcgr.h"
 #endif
@@ -120,19 +118,11 @@ GBLREF spdesc			rts_stringpool;
 GBLREF command_qualifier	glb_cmd_qlf, cmd_qlf;
 GBLREF lv_val			*zsrch_var, *zsrch_dir1, *zsrch_dir2;
 GBLREF symval			*curr_symval;
-GBLREF pattern         		*pattern_list;
-GBLREF pattern        		*curr_pattern;
-GBLREF pattern        		mumps_pattern;
-GBLREF uint4    		*pattern_typemask;
-GBLREF int4			exi_condition;
 GBLREF global_latch_t 		defer_latch;
 GBLREF boolean_t		is_replicator;
 GBLREF void			(*ctrlc_handler_ptr)();
 GBLREF boolean_t		mstr_native_align;
 GBLREF boolean_t		gtm_utf8_mode;
-GBLREF boolean_t		utf8_patnumeric;
-GBLREF mstr			dollar_zchset;
-GBLREF mstr			dollar_zpatnumeric;
 GBLREF casemap_t		casemaps[];
 GBLREF void             	(*cache_table_relobjs)(void);   /* Function pointer to call cache_table_rebuild() */
 GBLREF ch_ret_type		(*ht_rhash_ch)();		/* Function pointer to hashtab_rehash_ch */
@@ -140,21 +130,20 @@ GBLREF ch_ret_type		(*jbxm_dump_ch)();		/* Function pointer to jobexam_dump_ch *
 GBLREF ch_ret_type		(*stpgc_ch)();			/* Function pointer to stp_gcol_ch */
 GBLREF enum gtmImageTypes	image_type;
 GBLREF int			init_xfer_table(void);
-GBLREF void			(*heartbeat_timer_ptr)(void);
 
 OS_PAGE_SIZE_DECLARE
 
-error_def(ERR_COLLATIONUNDEF);
-
 #define MIN_INDIRECTION_NESTING 32
 #define MAX_INDIRECTION_NESTING 256
 
 void gtm_startup(struct startup_vector *svec)
-/* Note: various references to data copied from *svec could profitably be referenced directly */
-{
+{	/* initialize various process characteristics and states, but beware as initialization occurs in other places as well
+	 * svec is really a VMS vestige as it had a file to tailor process characteristics
+	 * while in UNIX, it's all done with environment variables
+	 * hence, various references to data copied from *svec could profitably be referenced directly
+	 */
 	unsigned char	*mstack_ptr;
 	void		gtm_ret_code();
-	int4		lct;
 	static char 	other_mode_buf[] = "OTHER";
 	mstr		log_name;
 	stack_frame 	*frame_pointer_lcl;
@@ -166,9 +155,9 @@ void gtm_startup(struct startup_vector *svec)
 	IA64_ONLY(init_xfer_table());
 	get_page_size();
 	cache_table_relobjs = &cache_table_rebuild;
+	INIT_FNPTR_GLOBAL_VARIABLES;
 	ht_rhash_ch = &hashtab_rehash_ch;
 	jbxm_dump_ch = &jobexam_dump_ch;
-	heartbeat_timer_ptr = &heartbeat_timer;
 	stpgc_ch = &stp_gcol_ch;
 	rtn_fst_table = rtn_names = (rtn_tabent *)svec->rtn_start;
 	rtn_names_end = rtn_names_top = (rtn_tabent *)svec->rtn_end;
@@ -274,24 +263,7 @@ void gtm_startup(struct startup_vector *svec)
 	init_callin_functable();
 	gtm_env_xlate_init();
 	SET_LATCH_GLOBAL(&defer_latch, LOCK_AVAILABLE);
-	curr_pattern = pattern_list = &mumps_pattern;
-	pattern_typemask = mumps_pattern.typemask;
-	initialize_pattern_table();
 	ce_init();	/* initialize compiler escape processing */
-	/* Initialize local collating sequence */
-	TREF(transform) = TRUE;
-	lct = find_local_colltype();
-	if (lct != 0)
-	{
-		TREF(local_collseq) = ready_collseq(lct);
-		if (!TREF(local_collseq))
-		{
-			exi_condition = -ERR_COLLATIONUNDEF;
-			gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(3) ERR_COLLATIONUNDEF, 1, lct);
-			EXIT(exi_condition);
-		}
-	} else
-		TREF(local_collseq) = 0;
 	prealloc_gt_timers();
 	gt_timers_add_safe_hndlrs();
 	/* Initialize zwrite subsystem. Better to do it now when we have storage to allocate than
@@ -324,19 +296,15 @@ void gtm_utf8_init(void)
 	SETUP_THREADGBL_ACCESS;
 	if (!gtm_utf8_mode)
 	{	/* Unicode is not enabled (i.e. $ZCHSET="M"). All standard functions must be byte oriented */
-	  	FIX_XFER_ENTRY(xf_fnascii, op_fnzascii);
-		FIX_XFER_ENTRY(xf_fnchar, op_fnzchar);
-		FIX_XFER_ENTRY(xf_fnextract, op_fnzextract);
 		FIX_XFER_ENTRY(xf_setextract, op_setzextract);
-		FIX_XFER_ENTRY(xf_fnfind, op_fnzfind);
 		FIX_XFER_ENTRY(xf_fnj2, op_fnzj2);
-		FIX_XFER_ENTRY(xf_fnlength, op_fnzlength);
-		FIX_XFER_ENTRY(xf_fnpopulation, op_fnzpopulation);
-		FIX_XFER_ENTRY(xf_fnpiece, op_fnzpiece);
-		FIX_XFER_ENTRY(xf_fnp1, op_fnzp1);
 		FIX_XFER_ENTRY(xf_setpiece, op_setzpiece);
+		/* If optimization of this happens, we need to move this to
+		 * 	expritem.c under 'update opcodes rather than mess with xfer table' */
+		FIX_XFER_ENTRY(xf_fnpopulation, op_fnzpopulation);
 		FIX_XFER_ENTRY(xf_setp1, op_setzp1);
-		FIX_XFER_ENTRY(xf_fntranslate, op_fnztranslate);
+		/* If optimization of this happens, we need to move this to
+		 * 	expritem.c under 'update opcodes rather than mess with xfer table' */
 		FIX_XFER_ENTRY(xf_fnreverse, op_fnzreverse);
 		return;
 	} else
@@ -359,11 +327,4 @@ void gtm_utf8_init(void)
 		TREF(utfcgr_string_lookmax) = TREF(gtm_utfcgr_strings) / UTFCGR_MAXLOOK_DIVISOR;
 #		endif /* UNICODE_SUPPORTED */
 	}
-	dollar_zchset.len = STR_LIT_LEN(UTF8_NAME);
-	dollar_zchset.addr = UTF8_NAME;
-	if (utf8_patnumeric)
-	{
-		dollar_zpatnumeric.len = STR_LIT_LEN(UTF8_NAME);
-		dollar_zpatnumeric.addr = UTF8_NAME;
-	}
 }
diff --git a/sr_unix/gtm_test_install.csh b/sr_unix/gtm_test_install.csh
index 54fc22b..0edf029 100755
--- a/sr_unix/gtm_test_install.csh
+++ b/sr_unix/gtm_test_install.csh
@@ -1,7 +1,7 @@
 #!/usr/local/bin/tcsh
 #################################################################
 #								#
-# Copyright (c) 2011-2015 Fidelity National Information 	#
+# Copyright (c) 2011-2017 Fidelity National Information		#
 # Services, Inc. and/or its subsidiaries. All rights reserved.	#
 #								#
 #	This source code contains the intellectual property	#
@@ -85,9 +85,9 @@ cd $gtm_dist
 
 # keep the utf8 libicu search code below in synch with configure.gtc!
 
-set is64bit_gtm = `file mumps | grep 64 | wc -l`
+set is64bit_gtm = `file mumps | grep -c 64`
 
-# please keep in sync with sr_unix/set_library_path.csh
+# Please keep in sync with sr_unix/set_library_path.csh and sr_unix/configure.gtc
 if ( $is64bit_gtm == 1 ) then
 	set library_path = "/usr/local/lib64 /usr/local/lib /usr/lib64 /usr/lib/x86_64-linux-gnu /usr/lib"
 else
@@ -99,8 +99,6 @@ set is64bit_icu = 0
 set icu_ext = ".so"
 if ( $arch == "ibm" ) then
 	set icu_ext = ".a"
-else if ( $arch == "hp" ) then
-	set icu_ext = ".sl"
 endif
 
 # Check the presence of gtm_icu_version
@@ -139,12 +137,9 @@ foreach libpath ($library_path)
 	endif
 	if ( $icu_lib_found ) then
 		# Figure out the object mode(64 bit or 32 bit) of ICU libraries on the target machine
-		if ( "linux" == "$arch" || "sun" == "$arch" || "solaris" == $arch ) then
+		if ( "linux" == "$arch" ) then
 			set icu_full_ver_lib = `sh -c "ls -l $libpath/libicuio$icu_ext.$majmin 2>/dev/null" | awk '{print $NF}'`
-			set is64bit_icu = `sh -c "file $libpath/$icu_full_ver_lib 2>/dev/null | grep "64-bit" | wc -l"`
-		else if ( "hp" == "$arch" ) then
-			set icu_full_ver_lib = `sh -c "ls -l $libpath/libicuio$icu_ext.$majmin 2>/dev/null" | awk '{print $NF}'`
-			set is64bit_icu = `sh -c "file $libpath/$icu_full_ver_lib 2>/dev/null | grep "IA64" | wc -l"`
+			set is64bit_icu = `sh -c "file $libpath/$icu_full_ver_lib 2>/dev/null | grep -c 64"`
 		else if ( "ibm" == "$arch" ) then
 			set icu_full_ver_lib = `sh -c "ls -l $libpath/libicuio$majmin$icu_ext 2>/dev/null" | awk '{print $NF}'`
 			set is64bit_icu = `sh -c "nm -X64 $libpath/$icu_full_ver_lib 2>/dev/null | head -n 1 | wc -l"`
@@ -192,88 +187,87 @@ EOF
 
 setenv gtm_dist utf8
 
-if ( -d utf8) then
-	setenv LD_LIBRARY_PATH $libpath
-	setenv LIBPATH $libpath
-	setenv gtm_chset utf-8
-	# depending on the list of locales configured, locale -a might be considered a binary output.
-	# grep needs -a option to process the output as text but -a is not supported on the non-linux servers we have.
-	if ( "linux" == "$arch" ) then
-		set binaryopt = "-a"
-	else
-		set binaryopt = ""
-	endif
-	set utflocale = `locale -a | grep $binaryopt -iE '\.utf.?8$' | head -n1`
-	setenv LC_ALL $utflocale
+setenv LD_LIBRARY_PATH $libpath
+setenv LIBPATH $libpath
+setenv gtm_chset utf-8
+# depending on the list of locales configured, locale -a might be considered a binary output.
+# grep needs -a option to process the output as text but -a is not supported on the non-linux servers we have.
+if ( "linux" == "$arch" ) then
+	set binaryopt = "-a"
+else
+	set binaryopt = ""
+endif
+set utflocale = `locale -a | grep $binaryopt -iE '\.utf.?8$' | head -n1`
+setenv LC_ALL $utflocale
 
 gtm << EOF						>>&! gtm_test_install.out
 write \$zchset
 EOF
 
-	setenv gtm_dist $save_gtm_dist/utf8
-	setenv gtmroutines ". $save_gtm_dist/utf8"
-
-	mkdir test_gtm_utf8
-	cd test_gtm_utf8
-	cp ../test_gtm/sim.m .
-
-	# set to test directory
-	setenv gtmdir $save_gtm_dist/test_gtm_utf8
-	# make gtm set the utf locale
-	unsetenv LC_CTYPE
-	# unset gtm_icu_version to test gtmprofile.gtc setting it using icu-config
-	setenv save_icu $gtm_icu_version
-	unsetenv gtm_icu_version
-	# NOTE: this is not the alias gtm, but the script sr_unix/gtm.gtc
-	../gtm -r sim >& gtm.out
-
-	# get $ZCHSET
-	echo ""						>>&! $save_gtm_dist/gtm_test_install.out
-	grep ZCHSET gtm.out				>>&! $save_gtm_dist/gtm_test_install.out
-	# restore saved gtm_icu_version
-	setenv gtm_icu_version $save_icu
-	# test gtmsecshr with an alternate user
-	set XCMD='do ^GTMHELP("",$ztrnlnm("gtm_dist")_"/gtmhelp.gld")'
-	su - gtmtest -c "env LD_LIBRARY_PATH=$libpath LC_ALL=$LC_ALL gtm_chset=UTF-8 gtm_dist=$gtm_dist gtmroutines='$gtmroutines' $gtm_dist/mumps -run %XCMD '${XCMD:q}' < /dev/null" > gtmtest.out   #BYPASSOK line length
-	# if we see the 'Topic? ' prompt, all is well
-	grep -q '^Topic. $' gtmtest.out
-	if ( $status ) cat gtmtest.out			>>&! $save_gtm_dist/gtm_test_install.out
-	# get journal output
-	cd V*/g
-
-	$save_gtm_dist/mupip journal -extract -forward gtm.mjl					>& mupip.out
-	env gtmgbldir=$save_gtm_dist/test_gtm/mumps.gld $save_gtm_dist/mupip integ -reg "*"	>& integ.out
-	set mupip_status = $status
-	# output the change lines
-	echo ""						>>&! $save_gtm_dist/gtm_test_install.out
-	echo "Global changes in the gtm.mjl file:"	>>&! $save_gtm_dist/gtm_test_install.out
-	awk -F\\ '/=/{print ($NF)}' gtm.mjf		>>&! $save_gtm_dist/gtm_test_install.out
-	if (0 != $mupip_status) then
-		echo "Error: mupip integ returned $status status instead of 0" >>&! $save_gtm_dist/gtm_test_install.out
-	else
-		echo "mupip integ returned a 0 status - as expected" >>&! $save_gtm_dist/gtm_test_install.out
-	endif
-	$gtm_dist/gtmsecshr				>>&! $save_gtm_dist/gtm_test_install.out
-	$gtm_com/IGS $gtm_dist/gtmsecshr "STOP"
-	cd $save_gtm_dist
+setenv gtm_dist $save_gtm_dist/utf8
+setenv gtmroutines ". $save_gtm_dist/utf8"
 
-else
-	# BEGIN - Fake the UTF-8 mode run for platforms that don't support it
-cat <<EOF						>>&! gtm_test_install.out
+mkdir test_gtm_utf8
+cd test_gtm_utf8
+cp ../test_gtm/sim.m .
 
-GTM>
-UTF-8
-GTM>
+# set to test directory
+setenv gtmdir $save_gtm_dist/test_gtm_utf8
+# make gtm set the utf locale
+unsetenv LC_CTYPE
+# unset gtm_icu_version to test gtmprofile.gtc setting it using icu-config
+setenv save_icu $gtm_icu_version
+unsetenv gtm_icu_version
+# NOTE: this is not the alias gtm, but the script sr_unix/gtm.gtc
+../gtm -r sim >& gtm.out
 
-ZCHSET= UTF-8
+# get $ZCHSET
+echo ""						>>&! $save_gtm_dist/gtm_test_install.out
+grep ZCHSET gtm.out				>>&! $save_gtm_dist/gtm_test_install.out
+# restore saved gtm_icu_version
+setenv gtm_icu_version $save_icu
+# test gtmsecshr with an alternate user
+set XCMD='do ^GTMHELP("",$ztrnlnm("gtm_dist")_"/gtmhelp.gld")'
+su - gtmtest -c "env LD_LIBRARY_PATH=$libpath LC_ALL=$LC_ALL gtm_chset=UTF-8 gtm_dist=$gtm_dist gtmroutines='$gtmroutines' $gtm_dist/mumps -run %XCMD '${XCMD:q}' < /dev/null" > gtmtest.out   #BYPASSOKLENGTH
+# if we see the 'Topic? ' prompt, all is well
+grep -q '^Topic. $' gtmtest.out
+if ( $status ) cat gtmtest.out			>>&! $save_gtm_dist/gtm_test_install.out
+# get journal output
+cd V*/g
 
-Global changes in the gtm.mjl file:
-^a="1"
-^b="2"
-mupip integ returned a 0 status - as expected
-EOF
-	#  END  - Fake the UTF-8 mode run for platforms that don't support it
+$save_gtm_dist/mupip journal -extract -forward gtm.mjl					>& mupip.out
+env gtmgbldir=$save_gtm_dist/test_gtm/mumps.gld $save_gtm_dist/mupip integ -reg "*"	>& integ.out
+set mupip_status = $status
+# output the change lines
+echo ""						>>&! $save_gtm_dist/gtm_test_install.out
+echo "Global changes in the gtm.mjl file:"	>>&! $save_gtm_dist/gtm_test_install.out
+awk -F\\ '/=/{print ($NF)}' gtm.mjf		>>&! $save_gtm_dist/gtm_test_install.out
+if (0 != $mupip_status) then
+	echo "Error: mupip integ returned $status status instead of 0" >>&! $save_gtm_dist/gtm_test_install.out
+else
+	echo "mupip integ returned a 0 status - as expected" >>&! $save_gtm_dist/gtm_test_install.out
 endif
+$gtm_dist/gtmsecshr				>>&! $save_gtm_dist/gtm_test_install.out
+$gtm_com/IGS $gtm_dist/gtmsecshr "STOP"
+
+echo "Build test the encryption plugin"									>>&! $save_gtm_dist/gtm_test_install.out #BYPASSOKLENGTH
+mkdir -p $save_gtm_dist/plugin/buildcrypt
+cd $save_gtm_dist/plugin/buildcrypt
+tar xf $save_gtm_dist/plugin/gtmcrypt/source.tar
+env LD_LIBRARY_PATH=$libpath LC_ALL=$LC_ALL GTMXC_gpgagent=$save_gtm_dist/plugin/gpgagent.tab sh -v README >& $save_gtm_dist/encr_plugin_build_test.out #BYPASSOKLENGTH
+if ($status) echo "Encryption plugin build failure"
+grep "GTM.[WIFE]" $save_gtm_dist/encr_plugin_build_test.out
+setenv gtmroutines ". $gtm_dist/plugin/o($gtm_dist/plugin/r) $gtm_dist"
+setenv gtm_passwd "`echo gtmrocks | env gtm_dist=$gtm_dist $gtm_dist/plugin/gtmcrypt/maskpass | cut -f3 -d ' '`"
+setenv GTMXC_gpgagent $gtm_dist/plugin/gpgagent.tab
+setenv gtm_pinentry_log $gtm_dist/encr_plugin_build_test.out
+echo "Default gtmroutines"										>>&! $save_gtm_dist/gtm_test_install.out #BYPASSOKLENGTH
+echo GETPIN | env LD_LIBRARY_PATH=$libpath LC_ALL=$LC_ALL $gtm_dist/plugin/gtmcrypt/pinentry-gtm.sh	>>&! $save_gtm_dist/gtm_test_install.out #BYPASSOKLENGTH
+echo "Null gtmroutines"											>>&! $save_gtm_dist/gtm_test_install.out #BYPASSOKLENGTH
+unsetenv gtmroutines
+echo GETPIN | env LD_LIBRARY_PATH=$libpath LC_ALL=$LC_ALL $gtm_dist/plugin/gtmcrypt/pinentry-gtm.sh	>>&! $save_gtm_dist/gtm_test_install.out #BYPASSOKLENGTH
+
+cd $save_gtm_dist
 
 # strip off the copyright lines
 tail -n +11 $gtm_tools/gtm_test_install.txt > gtm_test_install.txt
diff --git a/sr_unix/gtm_test_install.txt b/sr_unix/gtm_test_install.txt
index 58bbd18..43cd3f8 100644
--- a/sr_unix/gtm_test_install.txt
+++ b/sr_unix/gtm_test_install.txt
@@ -64,3 +64,12 @@ Global changes in the gtm.mjl file:
 ^a="1"
 ^b="2"
 mupip integ returned a 0 status - as expected
+Build test the encryption plugin
+Default gtmroutines
+OK Your orders please
+D gtmrocks
+OK
+Null gtmroutines
+OK Your orders please
+D gtmrocks
+OK
diff --git a/sr_unix/gtm_tls_impl.c b/sr_unix/gtm_tls_impl.c
index 1863ced..74fc3cb 100644
--- a/sr_unix/gtm_tls_impl.c
+++ b/sr_unix/gtm_tls_impl.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2013-2015 Fidelity National Information 	*
+ * Copyright (c) 2013-2016 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -1675,7 +1675,13 @@ int gtm_tls_get_conn_info(gtm_tls_socket_t *socket, gtm_tls_conn_info *conn_info
 			if (NULL != peer)
 			{
 				pubkey = X509_get_pubkey(peer);
-				SNPRINTF(conn_info->cert_algo, SIZEOF(conn_info->cert_algo), "%s", OBJ_nid2ln(pubkey->type));
+#				if OPENSSL_VERSION_NUMBER >= 0x10000001L
+				SNPRINTF(conn_info->cert_algo, SIZEOF(conn_info->cert_algo), "%s",
+						OBJ_nid2ln(EVP_PKEY_base_id(pubkey)));
+#				else
+				SNPRINTF(conn_info->cert_algo, SIZEOF(conn_info->cert_algo), "%s",
+						OBJ_nid2ln(pubkey->type));
+#				endif
 			} else
 				conn_info->cert_algo[0] = '\0';
 			/* Is Secure Renegotiation Supported? */
diff --git a/sr_unix/gtm_trigger.c b/sr_unix/gtm_trigger.c
index 2f532de..ff9fa94 100644
--- a/sr_unix/gtm_trigger.c
+++ b/sr_unix/gtm_trigger.c
@@ -482,6 +482,11 @@ int gtm_trigger_complink(gv_trigger_t *trigdsc, boolean_t dolink)
 		trigdsc->rtn_desc.rt_adr->src_full_name.addr = GTM_TRIGGER_SOURCE_NAME;
 		trigdsc->rtn_desc.rt_adr->src_full_name.len = STRLEN(GTM_TRIGGER_SOURCE_NAME);
 		trigdsc->rtn_desc.rt_adr->trigr_handle = trigdsc;       /* Back pointer to trig def */
+		/* Release trigger source field since it was compiled with -embed_source */
+		assert(0 < trigdsc->xecute_str.str.len);
+		free(trigdsc->xecute_str.str.addr);
+		trigdsc->xecute_str.str.len = 0;
+		trigdsc->xecute_str.str.addr = NULL;
 	}
 	if (MVST_MSAV == mv_chain->mv_st_type && &dollar_zsource == mv_chain->mv_st_cont.mvs_msav.addr)
 	{       /* Top mv_stent is one we pushed on there - restore dollar_zsource and get rid of it */
@@ -876,6 +881,8 @@ void gtm_trigger_cleanup(gv_trigger_t *trigdsc)
 	int		size;
 	stack_frame	*fp;
 
+	/* TODO: We don't expect the trigger source to exist now the gtm_trigger cleans it up ASAP. Remove it after a few releases */
+	assert (0 == trigdsc->xecute_str.str.len);
 	/* First thing to do is release trigger source field if it exists */
 	if (0 < trigdsc->xecute_str.str.len)
 	{
diff --git a/sr_unix/gtmci.c b/sr_unix/gtmci.c
index 457196d..42e445d 100644
--- a/sr_unix/gtmci.c
+++ b/sr_unix/gtmci.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information 	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -15,7 +15,7 @@
 #include "gtm_stdio.h"
 #include <errno.h>
 #ifdef GTM_PTHREAD
-#  include <pthread.h>
+#  include "gtm_pthread.h"
 #endif
 #include "gtm_stat.h"
 #include "gtm_stdlib.h"
@@ -198,19 +198,6 @@ static callin_entry_list* get_entry(const char* call_name)
 	return (callin_entry ? callin_entry->value : NULL);
 }
 
-int gtm_is_main_thread()
-{
-# 	ifdef GTM_PTHREAD
-	if (!gtm_main_thread_id_set)
-		return -1;
-	if (pthread_equal(gtm_main_thread_id, pthread_self()))
-		return 1;
-	return 0;
-#	else
-	return -1;
-#	endif
-}
-
 /* Java-specific version of call-in handler. */
 int gtm_cij(const char *c_rtn_name, char **arg_blob, int count, int *arg_types, unsigned int *io_vars_mask,
 		unsigned int *has_ret_value)
diff --git a/sr_unix/gtmcrypt.h b/sr_unix/gtmcrypt.h
index 9a3fa96..17f0b86 100644
--- a/sr_unix/gtmcrypt.h
+++ b/sr_unix/gtmcrypt.h
@@ -111,6 +111,13 @@ error_def(ERR_CRYPTOPFAILED);
 	MECHANISM(VARLSTCNT(6) errid, 4, LEN, PTR, LEN_AND_STR(errptr));							\
 }
 
+#define CORE_ON_CRYPTOPFAILED													\
+MBSTART {															\
+	/* if we are not expecting nor forcing CRYPTOPFAILED get a core for analysis */						\
+	if (!WBTEST_ENABLED(WBTEST_EXPECT_CRYPTOPFAILED) && !ENCR_WBOX_ENABLED)							\
+		gtm_fork_n_core();												\
+} MBEND
+
 /* =====================================================================================================*/
 /* 					GT.M Related Macros						*/
 /* =====================================================================================================*/
@@ -249,7 +256,10 @@ error_def(ERR_CRYPTOPFAILED);
 			RC = 0;													\
 		ENABLE_INTERRUPTS(INTRPT_IN_CRYPT_SECTION, prev_intrpt_state);							\
 	} else															\
+	{															\
 		RC = SET_REPEAT_MSG_MASK((SET_CRYPTERR_MASK(ERR_CRYPTOPFAILED)));						\
+		DEBUG_ONLY(CORE_ON_CRYPTOPFAILED);										\
+	}															\
 }
 
 /* Ensure that the symmetric key corresponding to the specified hash exists and that a handle is created. */
@@ -284,7 +294,10 @@ error_def(ERR_CRYPTOPFAILED);
 			RC = 0;													\
 		ENABLE_INTERRUPTS(INTRPT_IN_CRYPT_SECTION, prev_intrpt_state);							\
 	} else															\
+	{															\
 		RC = SET_REPEAT_MSG_MASK((SET_CRYPTERR_MASK(ERR_CRYPTOPFAILED)));						\
+		DEBUG_ONLY(CORE_ON_CRYPTOPFAILED);										\
+	}															\
 }
 
 /* Safely remove the specified handle to a particular symmetric key. */
@@ -345,7 +358,10 @@ error_def(ERR_CRYPTOPFAILED);
 		}														\
 		ENABLE_INTERRUPTS(INTRPT_IN_CRYPT_SECTION, prev_intrpt_state);							\
 	} else															\
+	{															\
 		RC = SET_REPEAT_MSG_MASK((SET_CRYPTERR_MASK(ERR_CRYPTOPFAILED)));						\
+		DEBUG_ONLY(CORE_ON_CRYPTOPFAILED);										\
+	}															\
 }
 
 /* Encrypt data with either a null IV or set to the specified value prior to the operation. */
@@ -472,7 +488,10 @@ error_def(ERR_CRYPTOPFAILED);
 			RC = SET_CRYPTERR_MASK(ERR_CRYPTOPFAILED);								\
 		ENABLE_INTERRUPTS(INTRPT_IN_CRYPT_SECTION, prev_intrpt_state);							\
 	} else															\
+	{															\
 		RC = SET_REPEAT_MSG_MASK((SET_CRYPTERR_MASK(ERR_CRYPTOPFAILED)));						\
+		DEBUG_ONLY(CORE_ON_CRYPTOPFAILED);										\
+	}															\
 }
 #else
 #  define GTMCRYPT_ENCRYPT_DECRYPT_WITH_IV(CSA, KEY_HANDLE, INBUF, INBUF_LEN, OUTBUF, OPERATION, IV_MODE, IV, RC)		\
@@ -488,10 +507,16 @@ error_def(ERR_CRYPTOPFAILED);
 				OPERATION, IV_MODE, IV))									\
 			RC = 0;													\
 		else														\
+		{														\
 			RC = SET_CRYPTERR_MASK(ERR_CRYPTOPFAILED);								\
+			DEBUG_ONLY(CORE_ON_CRYPTOPFAILED);									\
+		}														\
 		ENABLE_INTERRUPTS(INTRPT_IN_CRYPT_SECTION, prev_intrpt_state);							\
 	} else															\
+	{															\
 		RC = SET_REPEAT_MSG_MASK((SET_CRYPTERR_MASK(ERR_CRYPTOPFAILED)));						\
+		DEBUG_ONLY(CORE_ON_CRYPTOPFAILED);										\
+	}															\
 }
 #endif
 
diff --git a/sr_unix/gtmcrypt_dbk_ref.c b/sr_unix/gtmcrypt_dbk_ref.c
index f09eb37..6657865 100644
--- a/sr_unix/gtmcrypt_dbk_ref.c
+++ b/sr_unix/gtmcrypt_dbk_ref.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2009-2016 Fidelity National Information	*
+ * Copyright (c) 2009-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -305,9 +305,22 @@ STATICFNDEF gtm_keystore_t *keystore_lookup_by_keyname_plus(char *keyname, char
 {
 	int				diff, match;
 	gtm_keystore_keyname_link_t 	*cur_node;
+	char				*ynew_ext;
+	char				lcl_keyname[GTM_PATH_MAX];
+	int				keynamelen;
 
 	assert((SEARCH_BY_KEYPATH == search_type) || (SEARCH_BY_HASH == search_type));
 	assert(NULL != search_field);
+	assert(keyname);
+	/* Strip off EXT_NEW from autodb paths so that the key lookup works correctly */
+	keynamelen = strlen(keyname);
+	ynew_ext = keyname + keynamelen - STRLEN(EXT_NEW);
+	if (0 == strcmp(ynew_ext, EXT_NEW))
+	{	/* This is an autodb, fixup the path */
+		strncpy(lcl_keyname, keyname, keynamelen - STRLEN(EXT_NEW));
+		lcl_keyname[keynamelen - STRLEN(EXT_NEW)] = '\0';
+		keyname = lcl_keyname;
+	}
 	cur_node = keystore_by_keyname_head;
 	while (cur_node)
 	{
@@ -353,7 +366,11 @@ STATICFNDEF gtm_keystore_t *keystore_lookup_by_unres_key(char *search_field1, in
 	gtm_keystore_unres_key_link_t	*curr, *prev;
 	gtm_keystore_t			*node;
 	int				name_length, path_length, search_fail;
-	char				*name_search_field_ptr, *path_search_field_ptr;
+	char				*name_search_field_ptr, *path_search_field_ptr, *ynew_ext;
+	char				*lcl_key_name, lcl_key_name_buff[GTM_PATH_MAX];
+	char				name_search_field_buff[GTM_PATH_MAX];
+	int				search_field_len;
+	int				isautodb;
 
 	assert(NULL != search_field1);
 	assert((SEARCH_BY_KEYNAME == search_field1_type) || (SEARCH_BY_HASH == search_field1_type));
@@ -362,9 +379,24 @@ STATICFNDEF gtm_keystore_t *keystore_lookup_by_unres_key(char *search_field1, in
 			|| ((SEARCH_BY_HASH == search_field1_type) && (SEARCH_BY_KEYNAME == search_field2_type)));
 	/* Prepare the character array pointers to use for searching by key name or path. */
 	path_search_field_ptr = NULL;
+	isautodb = FALSE;
 	if (SEARCH_BY_KEYNAME == search_field1_type)
 	{
 		name_search_field_ptr = search_field1;
+		if (database && (NULL == search_field2))
+		{	/* Newly created AutoDBs have EXT_NEW appended to them, but the crypt cfg doesn't have those keys */
+			search_field_len = strlen(search_field1);
+			ynew_ext = search_field1 + search_field_len - STRLEN(EXT_NEW);
+			if (0 == strcmp(ynew_ext, EXT_NEW))
+			{	/* Strip EXT_NEW off the path string for comparison later. Note that this path, minus EXT_NEW,
+				 * is a fully resolved path.
+				 */
+				isautodb = TRUE;
+				strncpy(name_search_field_buff, search_field1, search_field_len - STRLEN(EXT_NEW));
+				name_search_field_buff[search_field_len - STRLEN(EXT_NEW)] = '\0';
+				name_search_field_ptr = name_search_field_buff;
+			}
+		}
 		if ((NULL != search_field2) && (SEARCH_BY_KEYPATH == search_field2_type))
 			path_search_field_ptr = search_field2;
 	} else if ((NULL != search_field2) && (SEARCH_BY_KEYNAME == search_field2_type))
@@ -381,7 +413,14 @@ STATICFNDEF gtm_keystore_t *keystore_lookup_by_unres_key(char *search_field1, in
 			search_fail = 0;
 			if (UNRES_KEY_UNRES_DB == curr->status)
 			{
-				if (NULL == realpath(curr->key_name, path_array))
+				if (isautodb)
+				{	/* Append EXT_NEW to see if this a matching AutoDB */
+					strncpy(lcl_key_name_buff, curr->key_name, GTM_PATH_MAX);
+					strcat(lcl_key_name_buff, EXT_NEW);
+					lcl_key_name = lcl_key_name_buff;
+				} else
+					lcl_key_name = curr->key_name;
+				if (NULL == realpath(lcl_key_name, path_array))
 				{
 					if (ENAMETOOLONG == errno)
 					{
@@ -402,9 +441,19 @@ STATICFNDEF gtm_keystore_t *keystore_lookup_by_unres_key(char *search_field1, in
 					if (SEARCH_BY_KEYNAME == search_field1_type)
 						search_fail = 1;
 				} else
-				{	/* Once the path has been resolved, save it to avoid future realpath()s. */
-					strcpy(curr->key_name, path_array);
-					curr->status = UNRES_KEY_RES_DB;
+				{	/* Once the path has been resolved, save it to avoid future realpath()s.
+					 * If this isn't an autodb, use the path as is. If it is an autodb ensure that the target
+					 * path and the existing db match before storing it.
+					 */
+					if (!isautodb || (!strcmp(path_array, search_field1)))
+					{
+						if (isautodb) /* Save the resolved path minus EXT_NEW */
+							strcpy(curr->key_name, name_search_field_buff);
+						else
+							strcpy(curr->key_name, path_array);
+						curr->status = UNRES_KEY_RES_DB;
+					} else
+						continue;
 				}
 			}
 			/* Do not proceed examining the current item if the file we are looking for is missing. */
@@ -652,7 +701,7 @@ STATICFNDEF int read_files_section(config_t *cfgp)
 			return -1;
 		}
 		/* Length should be under GTM_PATH_MAX because that is the size of the array where the name of a key is stored. */
-		name_length = strlen(key_name);
+		name_length = strlen(key_name) + 1;
 		if (GTM_PATH_MAX <= name_length)
 		{
 			UPDATE_ERROR_STRING("In config file " STR_ARG ", 'files' entry #%d's field length exceeds %d",
@@ -729,11 +778,12 @@ STATICFNDEF int read_database_section(config_t *cfgp)
 			return -1;
 		}
 		/* Length should be under GTM_PATH_MAX because that is the size of the array where the name of a key is stored. */
-		name_length = strlen(key_name);
+		name_length = strlen(key_name) + 1 + STR_LIT_LEN(EXT_NEW);
 		if (GTM_PATH_MAX <= name_length)
 		{
 			UPDATE_ERROR_STRING("In config file " STR_ARG ", in entry #%d corresponding to 'database.keys' "
-					"file name exceeds %d", ELLIPSIZE(gc_config_filename), i + 1, GTM_PATH_MAX - 1);
+					"file name exceeds %d", ELLIPSIZE(gc_config_filename), i + 1,
+					(int)(GTM_PATH_MAX - STR_LIT_LEN(EXT_NEW) - 1));
 			return -1;
 		}
 		if (!config_setting_lookup_string(elem, "key", (const char **)&key_path))
@@ -770,7 +820,7 @@ STATICFNDEF int read_database_section(config_t *cfgp)
 int keystore_new_cipher_ctx(gtm_keystore_t *entry, char *iv, int length, int action)
 {
 	int			rv;
-	crypt_key_t		handle;
+	crypt_key_t		handle = NULL;
 	gtm_cipher_ctx_t	*ctx;
 	unsigned char		iv_array[GTMCRYPT_IV_LEN];
 
@@ -809,8 +859,7 @@ int keystore_remove_cipher_ctx(gtm_cipher_ctx_t *ctx)
 
 	assert(NULL != ctx);
 	status = 0;
-	if (-1 == gc_sym_destroy_cipher_handle(ctx->handle))
-		status = -1;
+	gc_sym_destroy_cipher_handle(ctx->handle);
 	next = ctx->next;
 	prev = ctx->prev;
 	if (NULL != prev)
@@ -888,8 +937,7 @@ STATICFNDEF int gtm_keystore_cleanup_node(gtm_keystore_t *node)
 	while (NULL != curr)
 	{
 		temp = curr->next;
-		if (-1 == gc_sym_destroy_cipher_handle(curr->handle))
-			status = -1;
+		gc_sym_destroy_cipher_handle(curr->handle);
 		FREE(curr);
 		curr = temp;
 	}
diff --git a/sr_unix/gtmcrypt_dbk_ref.h b/sr_unix/gtmcrypt_dbk_ref.h
index 2ea7a35..7a0c433 100644
--- a/sr_unix/gtmcrypt_dbk_ref.h
+++ b/sr_unix/gtmcrypt_dbk_ref.h
@@ -151,7 +151,7 @@ typedef struct gtm_keystore_unres_key_link_struct
 	struct gtm_keystore_unres_key_link_struct	*next;				/* Pointer to next element. */
 } gtm_keystore_unres_key_link_t;
 
-STATICFNDEF int			keystore_refresh();
+STATICFNDEF int			keystore_refresh(void);
 STATICFNDEF int 		read_files_section(config_t *cfgp);
 STATICFNDEF int 		read_database_section(config_t *cfgp);
 STATICFNDEF int			gtm_keystore_cleanup_node(gtm_keystore_t *);
diff --git a/sr_unix/gtmcrypt_pk_ref.h b/sr_unix/gtmcrypt_pk_ref.h
index c2ea6c3..07dc77d 100644
--- a/sr_unix/gtmcrypt_pk_ref.h
+++ b/sr_unix/gtmcrypt_pk_ref.h
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2009, 2014 Fidelity Information Services, Inc 	*
+ * Copyright (c) 2009-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -30,24 +31,59 @@ void			gc_pk_crypt_load_gtmci_env(void);
 int			gc_pk_scrub_plaintext_keys_from_c_stack(void);
 int			gc_pk_gpghome_has_permissions(void);
 
-/* Public key cryptography related macros */
-#define GC_PK_INIT													\
+#ifdef USE_GPGME_PINENTRY_MODE_LOOPBACK
+/* Tell GPGME to set the pinentry mode to LOOPBACK. Note that turning this on implies that the
+ * installed gpg/gpg2 supports the command line argument. If it does not, gpg will error out
+ * leading to confusion. Rely on the Makefile to detect GPG 2.1.12+ under the assumption that
+ * an upgrade will not break this option.
+ * We could use gpgme_set_global_flag("require-gnupg","2.1.0"), but that causes a failure in
+ * GPGME where we want to operate in a compatible mode.
+ * Attempting to use the GPGME library version does not work because distributions have
+ * packaged GPGME versions ahead of GnuPG binaries (this was true at least on Debian).
+ *   https://lists.gt.net/gnupg/devel/72103#72103
+ */
+#define	GPG_MAJOR_PINENTRY_LOOPBACK	2
+#define	GPG_SEPERATOR_PINENTRY_LOOPBACK	'.'
+#define	GPG_MINOR_PINENTRY_LOOPBACK	1
+#define	GPG_SUBMINOR_PINENTRY_LOOPBACK	12
+#define GC_PK_INIT_PINENTRY_MODE											\
 {															\
-	gpgme_error_t			err;										\
-	GBLREF	gpgme_ctx_t		pk_crypt_ctx;									\
+	gpgme_engine_info_t		info;										\
+	int				i, len, major, minor, sub;							\
 															\
-	gpgme_check_version(NULL); /* This initializes the gpgme engine. */						\
-	err = gpgme_new(&pk_crypt_ctx);											\
-	if (!err)													\
-	{														\
-		err = gpgme_set_protocol(pk_crypt_ctx, GPGME_PROTOCOL_OpenPGP);						\
-		if (!err)												\
+	GC_PK_INIT_DO_OR_ERR(gpgme_get_engine_info(&info));								\
+	/* Find the right protocol entry for the version check */							\
+	while (info && (info->protocol != GPGME_PROTOCOL_OpenPGP))							\
+		info = info->next;											\
+	/* Check the version before using */										\
+	if (info && info->version)											\
+	{ 														\
+		len = strlen(info->version);										\
+		for (major = i = 0; (i <= len) && (('0' < info->version[i]) && ('9' >= info->version[i])); i++)		\
+			major = (major * 10) + (info->version[i] - '0');						\
+		if (GPG_SEPERATOR_PINENTRY_LOOPBACK == info->version[i]) i++;						\
+		for (minor = 0; (i <= len) && (('0' < info->version[i]) && ('9' >= info->version[i])); i++)		\
+			minor = (minor * 10) + (info->version[i] - '0');						\
+		if (GPG_SEPERATOR_PINENTRY_LOOPBACK == info->version[i]) i++;						\
+		for (sub = 0; (i <= len) && (('0' < info->version[i]) && ('9' >= info->version[i])); i++)		\
+			sub = (sub * 10) + (info->version[i] - '0');							\
+		if ((GPG_MAJOR_PINENTRY_LOOPBACK < major) ||								\
+			((GPG_MAJOR_PINENTRY_LOOPBACK == major) &&							\
+			 ((GPG_MINOR_PINENTRY_LOOPBACK < minor) ||							\
+			 ((GPG_MINOR_PINENTRY_LOOPBACK ==  minor) && (GPG_SUBMINOR_PINENTRY_LOOPBACK <= sub)))))	\
 		{													\
-			gpgme_set_passphrase_cb(pk_crypt_ctx,								\
-						(gpgme_passphrase_cb_t) gc_pk_crypt_passphrase_callback,		\
-						NULL);									\
+			GC_PK_INIT_DO_OR_ERR(gpgme_set_pinentry_mode(pk_crypt_ctx, GPGME_PINENTRY_MODE_LOOPBACK));	\
 		}													\
 	}														\
+}
+#else
+#define GC_PK_INIT_PINENTRY_MODE
+#endif
+
+
+#define GC_PK_INIT_DO_OR_ERR(LINE)											\
+{															\
+	err = LINE;													\
 	if (err)													\
 	{														\
 		pk_crypt_ctx = NULL;											\
@@ -56,6 +92,21 @@ int			gc_pk_gpghome_has_permissions(void);
 	}														\
 }
 
+/* Public key cryptography related macros */
+#define GC_PK_INIT													\
+{															\
+	gpgme_error_t			err;										\
+	GBLREF	gpgme_ctx_t		pk_crypt_ctx;									\
+															\
+	gpgme_check_version(NULL); /* This initializes the gpgme engine. */						\
+	GC_PK_INIT_DO_OR_ERR(gpgme_new(&pk_crypt_ctx));									\
+	GC_PK_INIT_DO_OR_ERR(gpgme_set_protocol(pk_crypt_ctx, GPGME_PROTOCOL_OpenPGP));					\
+	GC_PK_INIT_PINENTRY_MODE;											\
+	/* Attempt to set a callback to retrieve the password. Works with GPG classic and GPG 2.1+ */			\
+	gpgme_set_passphrase_cb(pk_crypt_ctx,										\
+				(gpgme_passphrase_cb_t) gc_pk_crypt_passphrase_callback, NULL);				\
+}
+
 #define GC_PK_APPEND_UNIQ_STRING(in_buff, symmetric_key)								\
 {															\
 	memcpy(in_buff, symmetric_key, SYMMETRIC_KEY_MAX);								\
diff --git a/sr_unix/gtmcrypt_ref.h b/sr_unix/gtmcrypt_ref.h
index c612c45..fe9e594 100755
--- a/sr_unix/gtmcrypt_ref.h
+++ b/sr_unix/gtmcrypt_ref.h
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2009, 2014 Fidelity Information Services, Inc	*
+ * Copyright (c) 2009-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -12,11 +13,10 @@
 #define GTMCRYPT_REF_H
 
 #ifdef USE_OPENSSL
-# include <openssl/blowfish.h>
 # include <openssl/sha.h>
 # include <openssl/evp.h>
 # include <openssl/err.h>
-typedef EVP_CIPHER_CTX		crypt_key_t;
+typedef EVP_CIPHER_CTX		*crypt_key_t;
 #else
 # include <gcrypt.h>
 typedef gcry_cipher_hd_t	crypt_key_t;
diff --git a/sr_unix/gtmcrypt_sym_ref.c b/sr_unix/gtmcrypt_sym_ref.c
index 101ede2..0cc4d34 100644
--- a/sr_unix/gtmcrypt_sym_ref.c
+++ b/sr_unix/gtmcrypt_sym_ref.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2013-2015 Fidelity National Information	*
+ * Copyright (c) 2013-2016 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -67,22 +67,18 @@ int gc_sym_init(void)
  *
  * Arguments:	handle	Encryption / decryption state object to destroy.
  *
- * Returns:	1 if the cipher handle was successfully destroyed; -1 otherwise.
+ * Returns:	N/A neither OpenSSL nor GCrypt destructors return a status.
  */
-int gc_sym_destroy_cipher_handle(crypt_key_t handle)
+void gc_sym_destroy_cipher_handle(crypt_key_t handle)
 {
-#	ifdef USE_OPENSSL
-	if (!EVP_CIPHER_CTX_cleanup(&handle))
-	{
-		GC_APPEND_OPENSSL_ERROR("Failed to destroy encryption key handle.");
-		return -1;
-	}
-#	endif
-#	ifdef USE_GCRYPT
-	if (handle)
+	if (NULL != handle)
+#ifdef USE_OPENSSL
+		EVP_CIPHER_CTX_free(handle);
+#elif defined(USE_GCRYPT)
 		gcry_cipher_close(handle);
-#	endif
-	return 0;
+#else
+	error Encryption library not defined, please use either -DUSE_OPENSSL or -DUSE_GCRYPT
+#endif
 }
 
 /*
@@ -103,11 +99,13 @@ int gc_sym_create_cipher_handle(unsigned char *raw_key, unsigned char *iv, crypt
 	int rv, plain_text_length;
 
 #	ifdef USE_OPENSSL
-	if (!reuse)
+	if (NULL == *handle)
+		*handle = EVP_CIPHER_CTX_new();
+	else if (!reuse)
 	{
-		EVP_CIPHER_CTX_init(handle);
+		EVP_CIPHER_CTX_init(*handle);
 	}
-	if (!EVP_CipherInit_ex(handle, ALGO, NULL, raw_key, iv, direction))
+	if (!EVP_CipherInit_ex(*handle, ALGO, NULL, raw_key, iv, direction))
 	{
 		GC_APPEND_OPENSSL_ERROR("Failed to initialize encryption key handle.");
 		return -1;
@@ -168,12 +166,12 @@ int gc_sym_encrypt_decrypt(crypt_key_t *key, unsigned char *in_block, int in_blo
 	}
 #	endif
 #	ifdef USE_OPENSSL
-	if (!EVP_CipherUpdate(key, out_block, &out_block_len, in_block, in_block_len))
+	if (!EVP_CipherUpdate(*key, out_block, &out_block_len, in_block, in_block_len))
 	{
 		GC_APPEND_OPENSSL_ERROR("OpenSSL function 'EVP_CipherUpdate' failed.")
 		return -1;
 	}
-	if (!EVP_CipherFinal_ex(key, out_block + out_block_len, &tmp_len))
+	if (!EVP_CipherFinal_ex(*key, out_block + out_block_len, &tmp_len))
 	{
 		GC_APPEND_OPENSSL_ERROR("OpenSSL function 'EVP_CipherFinal_ex' failed.")
 		return -1;
diff --git a/sr_unix/gtmcrypt_sym_ref.h b/sr_unix/gtmcrypt_sym_ref.h
index e1ffe4f..8e5171a 100644
--- a/sr_unix/gtmcrypt_sym_ref.h
+++ b/sr_unix/gtmcrypt_sym_ref.h
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2009-2015 Fidelity National Information	*
+ * Copyright (c) 2009-2016 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -17,9 +17,6 @@
 # if defined(USE_AES256CFB)
 #  define ALGO			EVP_aes_256_cfb128()
 #  define UNIQ_ENC_PARAM_STRING	"AES256CFB"
-# elif defined(USE_BLOWFISHCFB)
-#  define ALGO			EVP_bf_cfb64()
-#  define UNIQ_ENC_PARAM_STRING	"BLOWFISHCFB"
 # else
 #  error			"Unsupported Algorithm for OpenSSL"
 # endif
@@ -45,6 +42,6 @@ int gc_sym_init(void);
 #endif
 int gc_sym_destroy_key_handles(gtm_keystore_t *entry);
 int gc_sym_create_cipher_handle(unsigned char *raw_key, unsigned char *iv, crypt_key_t *handle, int direction, int reuse);
-int gc_sym_destroy_cipher_handle(crypt_key_t handle);
+void gc_sym_destroy_cipher_handle(crypt_key_t handle);
 int gc_sym_encrypt_decrypt(crypt_key_t *key, unsigned char *in_block, int in_block_len, unsigned char *out_block, int flag);
 #endif /* GTMCRYPT_SYM_REF_H */
diff --git a/sr_unix/gtmdefinedtypestodb.m b/sr_unix/gtmdefinedtypestodb.m
index 6962351..5fa582a 100644
--- a/sr_unix/gtmdefinedtypestodb.m
+++ b/sr_unix/gtmdefinedtypestodb.m
@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;								;
-; Copyright (c) 2015 Fidelity National Information		;
+; Copyright (c) 2015-2016 Fidelity National Information		;
 ; Services, Inc. and/or its subsidiaries. All rights reserved.	;
 ;								;
 ;	This source code contains the intellectual property	;
@@ -12,9 +12,10 @@
 
 ; This is called by generate_help.csh to put offset, length, type and format info into the gtmhelp database
 GTMDEFINEDTYPESTODB
+	set $etrap="use $principal write $zstatus,! zhalt 1"
 	do Init^GTMDefinedTypesInit
-	merge ^gtmtypes=gtmtypes
 	merge ^gtmtypfldindx=gtmtypfldindx
 	merge ^gtmstructs=gtmstructs
 	merge ^gtmunions=gtmunions
+	merge ^gtmtypes=gtmtypes
 	quit
diff --git a/sr_unix/gtmgblstat.c b/sr_unix/gtmgblstat.c
new file mode 100644
index 0000000..ba76531
--- /dev/null
+++ b/sr_unix/gtmgblstat.c
@@ -0,0 +1,44 @@
+/****************************************************************
+ *								*
+ * Copyright (c) 2016-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
+ *								*
+ *	This source code contains the intellectual property	*
+ *	of its copyright holder(s), and is made available	*
+ *	under a license.  If you do not know the terms of	*
+ *	the license, please stop and do not read further.	*
+ *								*
+ ****************************************************************/
+/* inc_rand() is not thread-safe; others are believed to be thread-safe. */
+
+#include "mdef.h"
+#include "gtm_stdlib.h"
+#include "gtmxc_types.h"
+#include "gtmgblstat.h"
+
+/* Functions to support %YGBLSTAT */
+gtm_status_t accumulate(int argc, gtm_string_t *acc, gtm_string_t *incr)
+{
+	unsigned long long *acc1, *acc2, *incr1;
+	acc1 = (unsigned long long *)acc->address;
+	acc2 = (unsigned long long *)(acc->address + (acc->length > incr->length ? incr->length : acc->length));
+	incr1 = (unsigned long long *)incr->address;
+	while ( acc1 < acc2 ) *acc1++ += *incr1++ ;
+	return 0;
+}
+
+gtm_status_t is_big_endian(int argc, gtm_uint_t *endian)
+{
+#if __BIG_ENDIAN__
+	*endian = 1;
+#else
+	*endian = 0;
+#endif
+	return 0;
+}
+
+gtm_status_t to_ulong(int argc, gtm_ulong_t *value, gtm_string_t *bytestr)
+{
+	*value = *(gtm_ulong_t *)bytestr->address;
+	return 0;
+}
diff --git a/sr_unix/gbldirnam.h b/sr_unix/gtmgblstat.h
old mode 100755
new mode 100644
similarity index 55%
copy from sr_unix/gbldirnam.h
copy to sr_unix/gtmgblstat.h
index 7ded664..5fb382f
--- a/sr_unix/gbldirnam.h
+++ b/sr_unix/gtmgblstat.h
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information 	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -10,8 +10,10 @@
  *								*
  ****************************************************************/
 
-#define GDE_LABEL_SIZE 13
-#define GDE_LABEL_NUM 1
-/* Note, GDE_LABEL_LITERAL must be maintained in gdeinit.m if changes are made here */
-#define GDE_LABEL_LITERAL GTM64_ONLY("GTCGBDUNX110") NON_GTM64_ONLY("GTCGBDUNX010")
-#define DEF_GDR_EXT "*.gld"
+/* Functions to support %YGBLSTAT  */
+#ifndef GTMGBLSTAT_H
+#define GTMGBLSTAT_H
+gtm_status_t accumulate(int argc, gtm_string_t *acc, gtm_string_t *incr);
+gtm_status_t is_big_endian(int argc, gtm_uint_t *endian);
+gtm_status_t to_ulong(int argc, gtm_ulong_t *value, gtm_string_t *bytestr);
+#endif /* GTMGBLSTAT_H */
diff --git a/sr_unix/gtmgblstat.xc b/sr_unix/gtmgblstat.xc
new file mode 100644
index 0000000..117940b
--- /dev/null
+++ b/sr_unix/gtmgblstat.xc
@@ -0,0 +1,4 @@
+$gtm_dist/libgtmshr.so
+accumulate:		gtm_status_t accumulate(IO:gtm_string_t*, I:gtm_string_t*)
+isbigendian:		gtm_status_t is_big_endian(O:gtm_uint_t*)
+toulong:		gtm_status_t to_ulong(O:gtm_ulong_t*, I:gtm_string_t*)
diff --git a/sr_unix/gtmhlpld.m b/sr_unix/gtmhlpld.m
index f5de83e..80fcdca 100755
--- a/sr_unix/gtmhlpld.m
+++ b/sr_unix/gtmhlpld.m
@@ -1,6 +1,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;								;
-;	Copyright 2002 Sanchez Computer Associates, Inc.	;
+; Copyright (c) 2002-2016 Fidelity National Information		;
+; Services, Inc. and/or its subsidiaries. All rights reserved.	;
 ;								;
 ;	This source code contains the intellectual property	;
 ;	of its copyright holder(s), and is made available	;
@@ -48,7 +49,7 @@ err	;
 	use file
 	zshow "*"
 	close file
-	quit
+	zhalt 1
 	;
 UCASE(string)
 	set lo="abcdefghijklmnopqrstuvwxyz"
diff --git a/sr_unix/gtminstall_Solaris.sh b/sr_unix/gtminstall_Solaris.sh
deleted file mode 100755
index 624fae3..0000000
--- a/sr_unix/gtminstall_Solaris.sh
+++ /dev/null
@@ -1,481 +0,0 @@
-#!/usr/xpg4/bin/sh -
-#################################################################
-#                                                               #
-# Copyright (c) 2014-2015 Fidelity National Information 	#
-# Services, Inc. and/or its subsidiaries. All rights reserved.	#
-#                                                               #
-#       This source code contains the intellectual property     #
-#       of its copyright holder(s), and is made available       #
-#       under a license.  If you do not know the terms of       #
-#       the license, please stop and do not read further.       #
-#                                                               #
-#################################################################
-
-# This script automates the installation of GT.M as much as possible,
-# to the extent of attempting to download the distribution file.
-# Current limitation is GNU/Linux on x86 (32- & 64-bit) architectures
-# and root installation, but it is intended to relax this in the future.
-
-# NOTE: This script requires the GNU wget program to download
-# distribution files that are not on the local file system.
-
-# CAUTION - this script is still experimental.
-
-# Revision history
-#
-# 2011-02-15  0.01 K.S. Bhaskar - Initial version for internal use
-# 2011-02-20  0.02 K.S. Bhaskar - Mostly usable with enough features for first Beta test
-# 2011-02-21  0.03 K.S. Bhaskar - Deal with case of no group bin, bug fixes, download from FTP site, other platforms
-# 2011-02-28  0.04 K.S. Bhaskar - Use which to get locations of id and grep, more bug fixes
-# 2011-03-05  0.05 K.S. Bhaskar - Through V5.4-001 group only needed if execution restricted to a group
-# 2011-03-08  0.06 K.S. Bhaskar - Make it work when bundled with GT.M V5.4-002
-# 2011-03-10  0.10 K.S. Bhaskar - Incorporate review comments to bundle with V5.4-002 distribution
-# 2011-05-03  0.11 K.S. Bhaskar - Allow for letter suffix releases
-# 2011-10-25  0.12 K.S. Bhaskar - Support option to delete .o files on shared library platforms
-# 2014-08-13  0.13 K.S. Bhaskar - Add verbosity around getting latest version and tarball, if requested
-# 2015-10-13  0.14 GT.M Staff   - Fix a few minor bugs
-
-# Turn on debugging if set
-if [ "Y" = "$gtm_debug" ] ; then set -x ; fi
-
-# Initialization
-timestamp=`date +%Y%m%d%H%M%S`
-if [ -x "/usr/bin/which" ] ; then which=/usr/bin/which ; else which=which ; fi
-if [ "SunOS" = `uname -s` ] ; then
-    gtm_id="/usr/xpg4/bin/id"
-    gtm_grep="/usr/xpg4/bin/grep"
-else
-    gtm_id=`which id`
-    gtm_grep=`which grep`
-fi
-if [ -z "$USER" ] ; then USER=`$gtm_id -un` ; fi
-
-# Functions
-dump_info()
-{
-    set +x
-    if [ -n "$gtm_arch" ] ; then echo gtm_arch " : " $gtm_arch ; fi
-    if [ -n "$gtm_buildtype" ] ; then echo gtm_buildtype " : " $gtm_buildtype ; fi
-    if [ -n "$gtm_configure_in" ] ; then echo gtm_configure_in " : " $gtm_configure_in ; fi
-    if [ -n "$gtm_copyenv" ] ; then echo gtm_copyenv " : " $gtm_copyenv ; fi
-    if [ -n "$gtm_copyexec" ] ; then echo gtm_copyexec " : " $gtm_copyexec ; fi
-    if [ -n "$gtm_debug" ] ; then echo gtm_debug " : " $gtm_debug ; fi
-    if [ -n "$gtm_dist" ] ; then echo gtm_dist " : " $gtm_dist ; fi
-    if [ -n "$gtm_distrib" ] ; then echo gtm_distrib " : " $gtm_distrib ; fi
-    if [ -n "$gtm_dryrun" ] ; then echo gtm_dryrun " : " $gtm_dryrun ; fi
-    if [ -n "$gtm_filename" ] ; then echo gtm_filename " : " $gtm_filename ; fi
-    if [ -n "$gtm_flavor" ] ; then echo gtm_flavor " : " $gtm_flavor ; fi
-    if [ -n "$gtm_ftp_dirname" ] ; then echo gtm_ftp_dirname " : " $gtm_ftp_dirname ; fi
-    if [ -n "$gtm_group" ] ; then echo gtm_group " : " $gtm_group ; fi
-    if [ -n "$gtm_group_already" ] ; then echo gtm_group_already " : " $gtm_group_already ; fi
-    if [ -n "$gtm_group_restriction" ] ; then echo gtm_group_restriction " : " $gtm_group_restriction ; fi
-    if [ -n "$gtm_hostos" ] ; then echo gtm_hostos " : " $gtm_hostos ; fi
-    if [ -n "$gtm_icu_version" ] ; then echo gtm_icu_version " : " $gtm_icu_version ; fi
-    if [ -n "$gtm_install_flavor" ] ; then echo gtm_install_flavor " : " $gtm_install_flavor ; fi
-    if [ -n "$gtm_installdir" ] ; then echo gtm_installdir " : " $gtm_installdir ; fi
-    if [ -n "$gtm_keep_obj" ] ; then echo gtm_keep_obj " : " $gtm_keep_obj ; fi
-    if [ -n "$gtm_lcase_utils" ] ; then echo gtm_lcase_utils " : " $gtm_lcase_utils ; fi
-    if [ -n "$gtm_linkenv" ] ; then echo gtm_linkenv " : " $gtm_linkenv ; fi
-    if [ -n "$gtm_linkexec" ] ; then echo gtm_linkexec " : " $gtm_linkexec ; fi
-    if [ -n "$gtm_overwrite_existing" ] ; then echo gtm_overwrite_existing " : " $gtm_overwrite_existing ; fi
-    if [ -n "$gtm_prompt_for_group" ] ; then echo gtm_prompt_for_group " : " $gtm_prompt_for_group ; fi
-    if [ -n "$gtm_sf_dirname" ] ; then echo gtm_sf_dirname " : " $gtm_sf_dirname ; fi
-    if [ -n "$gtm_tmp" ] ; then echo gtm_tmp " : " $gtm_tmp ; fi
-    if [ -n "$gtm_user" ] ; then echo gtm_user " : " $gtm_user ; fi
-    if [ -n "$gtm_verbose" ] ; then echo gtm_verbose " : " $gtm_verbose ; fi
-    if [ -n "$gtm_version" ] ; then echo gtm_version " : " $gtm_version ; fi
-    if [ -n "$gtmroutines" ] ; then echo gtmroutines " : " $gtmroutines ; fi
-    if [ -n "$timestamp" ] ; then echo timestamp " : " $timestamp ; fi
-    if [ "Y" = "$gtm_debug" ] ; then set -x ; fi
-}
-
-err_exit()
-{
-    set +x
-    echo "gtminstall [option] ... [version]"
-    echo "Options are:"
-    echo "--build-type buildtype - * type of GT.M build, default is pro"
-    echo "--copyenv dirname - copy gtmprofile and gtmcshrc files to dirname; incompatible with linkenv"
-    echo "--copyexec dirname - copy gtm script to dirname; incompatible with linkexec"
-    echo "--debug - * turn on debugging with set -x"
-    echo "--distrib dirname or URL - source directory for GT.M distribution tarball, local or remote"
-    echo "--dry-run - do everything short of installing GT.M, including downloading the distribution"
-    echo "--group group - group that should own the GT.M installation"
-    echo "--group-restriction - limit execution to a group; defaults to unlimited if not specified"
-    echo "--help - print this usage information"
-    echo "--installdir dirname - directory where GT.M is to be installed; defaults to /usr/lib/fis-gtm/version_platform"
-    m1="--keep-obj - keep .o files"
-    m1="$m1"" of M routines (normally deleted on platforms with GT.M support for routines in shared libraries)"
-    echo "$m1"
-    echo "--linkenv dirname - create link in dirname to gtmprofile and gtmcshrc files; incompatible with copyenv"
-    echo "--linkexec dirname - create link in dirname to gtm script; incompatible with copyexec"
-    echo "--overwrite-existing - install into an existing directory, overwriting contents; defaults to requiring new directory"
-    m1="--prompt-for-group - * GT.M installation "
-    m1="$m1""script will prompt for group; default is yes for production releases V5.4-002 or later, no for all others"
-    echo "$m1"
-    echo "--ucaseonly-utils -- install only upper case utility program names; defaults to both if not specified"
-    echo "--user username - user who should own GT.M installation; default is root"
-    m1="--utf8 ICU_version - install "
-    m1="$m1""UTF-8 support using specified  major.minor ICU version; specify default to use default version"
-    echo "$m1"
-    echo "--verbose - * output diagnostic information as the script executes; default is to run quietly"
-    echo "options that take a value (e.g, --group) can be specified as either --option=value or --option value"
-    echo "options marked with * are likely to be of interest primarily to GT.M developers"
-    echo "version is defaulted from mumps file if one exists in the same directory as the installer"
-    echo "This version must run as root."
-    exit 1
-}
-
-mktmpdir()
-{
-    case `uname -s` in
-        AIX | SunOS) tmpdirname="/tmp/${USER}_$$_${timestamp}"
-            ( umask 077 ; mkdir $tmpdirname ) ;;
-        HP-UX) tmpdirname=`mktemp`
-            ( umask 077 ; mkdir $tmpdirname ) ;;
-        *) tmpdirname=`mktemp -d` ;;
-    esac
-    echo $tmpdirname
-}
-
-# Defaults that can be over-ridden by command line options to follow
-if [ -z "$gtm_buildtype" ] ; then gtm_buildtype="pro" ; fi
-if [ -z "$gtm_keep_obj" ] ; then gtm_keep_obj="N" ; fi
-if [ -z "$gtm_dryrun" ] ; then gtm_dryrun="N" ; fi
-if [ -z "$gtm_group_restriction" ] ; then gtm_group_restriction="N" ; fi
-if [ -z "$gtm_lcase_utils" ] ; then gtm_lcase_utils="Y" ; fi
-if [ -z "$gtm_overwrite_existing" ] ; then gtm_overwrite_existing="N" ; fi
-if [ -z "$gtm_prompt_for_group" ] ; then gtm_prompt_for_group="N" ; fi
-if [ -z "$gtm_verbose" ] ; then gtm_verbose="N" ; fi
-
-# Initializing internal flags
-gtm_group_already="N"
-
-# Process command line
-while [ $# -gt 0 ] ; do
-    case "$1" in
-        --build-type*) tmp=`echo $1 | cut -s -d = -f 2-`
-            if [ -n "$tmp" ] ; then gtm_buildtype=$tmp
-            else if [ 1 -lt "$#" ] ; then gtm_buildtype=$2 ; shift
-                else echo "--buildtype needs a value" ; err_exit
-                fi
-            fi ;;
-        --copyenv*) tmp=`echo $1 | cut -s -d = -f 2-`
-            if [ -n "$tmp" ] ; then gtm_copyenv=$tmp
-            else if [ 1 -lt "$#" ] ; then gtm_copyenv=$2 ; shift
-                else echo "--copyenv needs a value" ; err_exit
-                fi
-            fi
-            unset gtm_linkenv
-            shift ;;
-        --copyexec*) tmp=`echo $1 | cut -s -d = -f 2-`
-            if [ -n "$tmp" ] ; then gtm_copyexec=$tmp
-            else if [ 1 -lt "$#" ] ; then gtm_copyexec=$2 ; shift
-                else echo "--copyexec needs a value" ; err_exit
-                fi
-            fi
-            unset gtm_linkexec
-            shift ;;
-        --debug) gtm_debug="Y" ; set -x ; shift ;;
-        --distrib*) tmp=`echo $1 | cut -s -d = -f 2-`
-            if [ -n "$tmp" ] ; then gtm_distrib=$tmp
-            else if [ 1 -lt "$#" ] ; then gtm_distrib=$2 ; shift
-                else echo "--distrib needs a value" ; err_exit
-                fi
-            fi
-            shift ;;
-        --dry-run) gtm_dryrun="Y" ; shift ;;
-        --group-restriction) gtm_group_restriction="Y" ; shift ;; # must come before group*
-        --group*) tmp=`echo $1 | cut -s -d = -f 2-`
-            if [ -n "$tmp" ] ; then gtm_group=$tmp
-            else if [ 1 -lt "$#" ] ; then gtm_group=$2 ; shift
-                else echo "--group needs a value" ; err_exit
-                fi
-            fi
-            shift ;;
-        --help) err_exit ;;
-        --installdir*) tmp=`echo $1 | cut -s -d = -f 2-`
-            if [ -n "$tmp" ] ; then gtm_installdir=$tmp
-            else if [ 1 -lt "$#" ] ; then gtm_installdir=$2 ; shift
-                else echo "--installdir needs a value" ; err_exit
-                fi
-            fi
-            shift ;;
-        --keep-obj) gtm_keep_obj="Y" ; shift ;;
-        --linkenv*) tmp=`echo $1 | cut -s -d = -f 2-`
-            if [ -n "$tmp" ] ; then gtm_linkenv=$tmp
-            else if [ 1 -lt "$#" ] ; then gtm_linkenv=$2 ; shift
-                else echo "--linkenv needs a value" ; err_exit
-                fi
-            fi
-            unset gtm_copyenv
-            shift ;;
-        --linkexec*) tmp=`echo $1 | cut -s -d = -f 2-`
-            if [ -n "$tmp" ] ; then gtm_linkexec=$tmp
-            else if [ 1 -lt "$#" ] ; then gtm_linkexec=$2 ; shift
-                else echo "--linkexec needs a value" ; err_exit
-                fi
-            fi
-            unset gtm_copyexec
-            shift ;;
-        --overwrite-existing) gtm_overwrite_existing="Y" ; shift ;;
-        --prompt-for-group) gtm_prompt_for_group="Y" ; shift ;;
-        --ucaseonly-utils) gtm_lcase_utils="N" ; shift ;;
-        --user*) tmp=`echo $1 | cut -s -d = -f 2-`
-            if [ -n "$tmp" ] ; then gtm_user=$tmp
-            else if [ 1 -lt "$#" ] ; then gtm_user=$2 ; shift
-                else echo "--user needs a value" ; err_exit
-                fi
-            fi
-            shift ;;
-        --utf8*) tmp=`echo $1 | cut -s -d = -f 2- | tr DEFAULT default`
-            if [ -n "$tmp" ] ; then gtm_icu_version=$tmp
-            else if [ 1 -lt "$#" ] ; then gtm_icu_version=`echo $2 | tr DEFAULT default`; shift
-                else echo "--utf8 needs a value" ; err_exit
-                fi
-            fi
-            shift ;;
-        --verbose) gtm_verbose="Y" ; shift ;;
-        -*) echo Unrecognized option "$1" ; err_exit ;;
-        *) if [ -n "$gtm_version" ] ; then echo Nothing must follow the GT.M version ; err_exit
-            else gtm_version=$1 ; shift ; fi
-    esac
-done
-if [ "Y" = "$gtm_verbose" ] ; then echo Processed command line ; dump_info ; fi
-
-# Set environment variables according to machine architecture
-gtm_arch=`uname -m | tr -d _`
-case $gtm_arch in
-    sun*) gtm_arch="sparc" ;;
-esac
-gtm_hostos=`uname -s | tr A-Z a-z`
-case $gtm_hostos in
-    gnu/linux) gtm_hostos="linux" ;;
-    hp-ux) gtm_hostos="hpux" ;;
-    sun*) gtm_hostos="solaris" ;;
-esac
-gtm_shlib_support="Y"
-case ${gtm_hostos}_${gtm_arch} in
-    aix*) # no Source Forge dirname
-        gtm_arch="rs6000" # uname -m is not useful on AIX
-        gtm_ftp_dirname="aix"
-        gtm_flavor="rs6000"
-        gtm_install_flavor="RS6000" ;;
-    hpux_ia64) # no Source Forge dirname
-        gtm_ftp_dirname="hpux_ia64"
-        gtm_flavor="ia64"
-        gtm_install_flavor="IA64" ;;
-    linux_i586) gtm_sf_dirname="GT.M-x86-Linux"
-        gtm_ftp_dirname="linux"
-        gtm_flavor="i586"
-        gtm_install_flavor="x86"
-        gtm_shlib_support="N" ;;
-    linux_i686) gtm_sf_dirname="GT.M-x86-Linux"
-        gtm_ftp_dirname="linux"
-        gtm_flavor="i686"
-        gtm_install_flavor="x86"
-        gtm_shlib_support="N" ;;
-    linux_ia64) # no Source Forge dirname
-        gtm_ftp_dirname="linux_ia64"
-        gtm_flavor="ia64"
-        gtm_install_flavor="IA" ;;
-    linux_s390x) # no Source Forge dirname
-        gtm_ftp_dirname="linux_s390x"
-        gtm_flavor="s390x"
-        gtm_install_flavor="S390X" ;;
-    linux_x8664) gtm_sf_dirname="GT.M-amd64-Linux"
-        gtm_ftp_dirname="linux_x8664"
-        gtm_flavor="x8664"
-        gtm_install_flavor="x86_64" ;;
-    solaris_sparc) # no Source Forge dirname
-        gtm_ftp_dirname="sun"
-        gtm_flavor="sparc"
-        gtm_install_flavor="SPARC" ;;
-    default) echo Architecture `uname -o` on `uname -m` not supported by this script ; err_exit ;;
-esac
-
-# GT.M version is required - first see if gtminstall and mumps are bundled
-if [ -z "$gtm_version" ] ; then
-    tmp=`dirname $0`
-    if [ -e "$tmp/mumps" -a -e "$tmp/_XCMD.m" ] ; then
-        gtm_distrib=$tmp
-        gtm_dist=$tmp ; export gtm_dist
-        chmod +x $gtm_dist/mumps
-        tmp=`mktmpdir`
-        gtmroutines="$tmp($gtm_dist)" ; export gtmroutines
-        gtm_version=`$gtm_dist/mumps -run %XCMD 'write $piece($zversion," ",2)'`
-        rm -rf $tmp
-    fi
-fi
-if [ "Y" = "$gtm_verbose" ] ; then
-    echo Determined architecture, OS and GT.M version ; dump_info
-    wget_flags="-P"
-else wget_flags="-qP"
-fi
-
-# See if GT.M version can be determined from meta data
-if [ -z "$gtm_distrib" ] ; then
-    gtm_distrib=http://sourceforge.net/projects/fis-gtm
-fi
-gtm_tmp=`mktmpdir`
-mkdir $gtm_tmp/tmp
-if [ -z "$gtm_version" -o "latest" = "`echo "$gtm_version" | tr LATES lates`" ] ; then
-    case $gtm_distrib in
-        http://sourceforge.net/projects/fis-gtm | https://sourceforge.net/projects/fis-gtm)
-            if [ "Y" = "$gtm_verbose" ] ; then
-		echo wget ${gtm_distrib}/files/${gtm_sf_dirname}/latest to determine latest version
-		echo Check proxy settings if wget hangs
-            fi
-            if { wget $wget_flags $gtm_tmp ${gtm_distrib}/files/${gtm_sf_dirname}/latest 2>&1 1>${gtm_tmp}/wget_latest.log ; } ; then
-                gtm_version=`cat ${gtm_tmp}/latest`
-            else echo Unable to determine GT.M version ; err_exit
-            fi ;;
-        ftp://*)
-            if [ "Y" = "$gtm_verbose" ] ; then
-		echo wget $gtm_tmp ${gtm_distrib}/${gtm_ftp_dirname}/latest to determine latest version
-		echo Check proxy settings if wget hangs
-            fi
-            if { wget $wget_flags $gtm_tmp ${gtm_distrib}/${gtm_ftp_dirname}/latest 2>&1 1>${gtm_tmp}/wget_latest.log ; } ; then
-                gtm_version=`cat ${gtm_tmp}/latest`
-            else echo Unable to determine GT.M version ; err_exit
-            fi ;;
-        *)
-            if [ -f ${gtm_distrib}/latest ] ; then
-                gtm_version=`cat ${gtm_distrib}/latest`
-                if [ "Y" = "$gtm_verbose" ] ; then echo Version is $gtm_version ; fi
-            else echo Unable to determine GT.M version ; err_exit
-            fi ;;
-    esac
-fi
-if [ -z "$gtm_version" ] ; then
-echo GT.M version to install is required ; err_exit
-fi
-
-# Get GT.M distribution if gtminstall is not bundled with distribution
-if [ -f "${gtm_distrib}/mumps" ] ; then gtm_tmp=$gtm_distrib
-else
-    tmp=`echo $gtm_version | tr -d .-`
-    gtm_filename=gtm_${tmp}_${gtm_hostos}_${gtm_flavor}_${gtm_buildtype}.tar.gz
-    case $gtm_distrib in
-        http://sourceforge.net/projects/fis-gtm | https://sourceforge.net/projects/fis-gtm)
-            if [ "Y" = "$gtm_verbose" ] ; then
-		echo wget ${gtm_distrib}/files/${gtm_sf_dirname}/${gtm_version}/${gtm_filename} to download tarball
-		echo Check proxy settings if wget hangs
-            fi
-            if { ! wget $wget_flags $gtm_tmp ${gtm_distrib}/files/${gtm_sf_dirname}/${gtm_version}/${gtm_filename} \
-                2>&1 1>${gtm_tmp}/wget_dist.log ; } ; then
-                echo Unable to download GT.M distribution $gtm_filename ; err_exit
-            fi ;;
-        ftp://*)
-            if [ "Y" = "$gtm_verbose" ] ; then
-		echo wget ${gtm_distrib}/${gtm_ftp_dirname}/${tmp}/${gtm_filename} to download tarball
-		echo Check proxy settings if wget hangs
-            fi
-            if { ! wget $wget_flags $gtm_tmp ${gtm_distrib}/${gtm_ftp_dirname}/${tmp}/${gtm_filename} \
-                2>&1 1>${gtm_tmp}/wget_dist.log ; } ; then
-                echo Unable to download GT.M distribution $gtm_filename ; err_exit
-            fi ;;
-        *)
-            if [ -f ${gtm_distrib}/${gtm_filename} ] ; then
-                if [ "Y" = "$gtm_verbose" ] ; then echo tarball is ${gtm_distrib}/${gtm_filename} ; fi
-                ln -s ${gtm_distrib}/${gtm_filename} $gtm_tmp
-            else echo Unable to locate GT.M distribution file ${gtm_distrib}/${gtm_filename} ; err_exit
-            fi ;;
-    esac
-    ( cd $gtm_tmp/tmp ; gzip -d < ${gtm_tmp}/${gtm_filename} | tar xf - 2>&1 1>${gtm_tmp}/tar.log )
-fi
-if [ "Y" = "$gtm_verbose" ] ; then echo Downloaded and unpacked GT.M distribution ; dump_info ; fi
-
-# Check installation settings & provide defaults as needed
-tmp=`$gtm_id -un`
-if [ -z "$gtm_user" ] ; then gtm_user=$tmp
-else if [ "$gtm_user" != "`$gtm_id -un $gtm_user`" ] ; then
-    echo $gtm_user is a non-existent user ; err_exit
-    fi
-fi
-if [ "root" = $tmp ] ; then
-    if [ -z "$gtm_group" ] ; then gtm_group=`$gtm_id -gn`
-    else if [ "root" != "$gtm_user" -a "$gtm_group" != "`$gtm_id -Gn $gtm_user | xargs -n 1 | $gtm_grep $gtm_group`" ] ; then
-        echo $gtm_user is not a member of $gtm_group ; err_exit
-        fi
-    fi
- else
-    echo Non-root installations not currently supported
-    if [ "N" = "$gtm_dryrun" ] ; then err_exit
-    else echo "Continuing because --dry-run selected"
-    fi
-fi
-if [ -z "$gtm_installdir" ] ; then gtm_installdir=/usr/lib/fis-gtm/${gtm_version}_${gtm_install_flavor} ; fi
-if [ -d "$gtm_installdir" -a "Y" != "$gtm_overwrite_existing" ] ; then
-    echo $gtm_installdir exists and --overwrite-existing not specified ; err_exit
-fi
-if [ "Y" = "$gtm_verbose" ] ; then echo Finished checking options and assigning defaults ; dump_info ; fi
-
-# Prepare input to GT.M configure script
-gtm_configure_in=${gtm_tmp}/configure_${timestamp}.in
-if { ! $gtm_id -gn bin 2>/dev/null 1>/dev/null ; } then
-    if [ "N" = "$gtm_prompt_for_group" -o 54002 -gt `echo $gtm_version | cut -s -d V -f 2- | tr -d A-Za-z.-` ] ; then
-        echo y >>$gtm_configure_in
-        echo root >>$gtm_configure_in
-        echo $gtm_group_restriction >>$gtm_configure_in
-        gtm_group_already="Y"
-    fi
-fi
-echo $gtm_user >>$gtm_configure_in
-if [ "Y" = "$gtm_prompt_for_group" -o 54002 -le `echo $gtm_version | cut -s -d V -f 2- | tr -d A-Za-z.-` ] ; then
-    echo $gtm_group >>$gtm_configure_in
-fi
-if [ "N" = "$gtm_group_already" ] ; then
-    echo $gtm_group_restriction >>$gtm_configure_in
-fi
-echo $gtm_installdir >>$gtm_configure_in
-echo y >>$gtm_configure_in
-if [ -z "$gtm_icu_version" ] ; then echo n  >>$gtm_configure_in
-else echo y  >>$gtm_configure_in
-    if [ "default" = $gtm_icu_version ] ; then echo n  >>$gtm_configure_in
-    else echo y >>$gtm_configure_in
-        echo $gtm_icu_version >>$gtm_configure_in
-    fi
-fi
-echo $gtm_lcase_utils >>$gtm_configure_in
-if [ "Y" = $gtm_shlib_support ] ; then echo $gtm_keep_obj >>$gtm_configure_in ; fi
-echo n >>$gtm_configure_in
-if [ "Y" = "$gtm_verbose" ] ; then echo Prepared configuration file ; cat $gtm_configure_in ; dump_info ; fi
-
-
-# Run the GT.M configure script
-if [ "$gtm_distrib" != "$gtm_tmp" ] ; then
-    chmod +w $gtm_tmp/tmp
-    cd $gtm_tmp/tmp
-fi
-tmp=`head -1 configure | cut -f 1`
-if [ "#!/bin/sh" != "$tmp" ] ; then
-    echo "#!/bin/sh" >configure.sh
-fi
-cat configure >>configure.sh
-chmod +x configure.sh
-
-# Stop here if this is a dry run
-if [ "Y" = "$gtm_dryrun" ] ; then echo Installation prepared in $gtm_tmp ; exit ; fi
-
-./configure.sh <$gtm_configure_in 1> $gtm_tmp/configure_${timestamp}.out 2>$gtm_tmp/configure_${timestamp}.err
-if [ $? -gt 0 ] ; then cat $gtm_tmp/configure_${timestamp}.out $gtm_tmp/configure_${timestamp}.err ; fi
-if [ "Y" = "$gtm_verbose" ] ; then echo Installation complete ; ls -l $gtm_installdir ; fi
-
-# Create copies of environment scripts and gtm executable
-if [ -d "$gtm_linkenv" ] ; then
-    ( cd $gtm_linkenv ; ln -s $gtm_installdir/gtmprofile $gtm_installdir/gtmcshrc ./ )
-    if [ "Y" = "$gtm_verbose" ] ; then echo Linked env ; ls -l $gtm_linkenv ; fi
-else if [ -d "$gtm_copyenv" ] ; then
-        ( cd $gtm_copyenv ; cp $gtm_installdir/gtmprofile $gtm_installdir/gtmcshrc ./ )
-        if [ "Y" = "$gtm_verbose" ] ; then echo Copied env ; ls -l $gtm_copyenv ; fi
-     fi
-fi
-if [ -d "$gtm_linkexec" ] ; then
-    ( cd $gtm_linkexec ; ln -s $gtm_installdir/gtm ./ )
-    if [ "Y" = "$gtm_verbose" ] ; then echo Linked exec ; ls -l $gtm_linkexec ; fi
-else if [ -d "$gtm_copyexec" ] ; then
-        ( cd $gtm_copyexec ; cp $gtm_installdir/gtm ./ )
-        if [ "Y" = "$gtm_verbose" ] ; then echo Copied exec ; ls -l $gtm_copyexec ; fi
-     fi
-fi
diff --git a/sr_unix/gtmio.h b/sr_unix/gtmio.h
old mode 100755
new mode 100644
index c966d33..7c54447
--- a/sr_unix/gtmio.h
+++ b/sr_unix/gtmio.h
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information 	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -42,6 +42,11 @@
 #ifndef GTMIO_Included
 #define GTMIO_Included
 
+/* Depends on aio_shim.h if using the POSIX or linux ASYNC IO #defines. This is due to aio_shim.h
+ * requiring some header files with no include guards, and so we don't want to pull it in multiple
+ * times by accident.
+ */
+
 #ifndef GTMIO_MINIMAL		/* Avoid pulling in includes that make gtm_icu.c uncompilable */
 # include <sys/types.h>
 # include "gtm_stat.h"
@@ -50,10 +55,12 @@
 # include "eintr_wrappers.h"
 # include "min_max.h"
 # include "wbox_test_init.h"
+# include "get_fs_block_size.h"
 #endif
 
 #if defined(__linux__) || defined(__CYGWIN__)
 #include <sys/vfs.h>
+#include "is_fstype_nfs.h"
 #endif
 
 error_def(ERR_PREMATEOF);
@@ -73,7 +80,7 @@ error_def(ERR_PREMATEOF);
 #define WAIT_FOR_BLOCK_TIME	100 /* msec */
 
 #define IOCTL(FDESC, REQUEST, ARG, RC)			\
-{							\
+MBSTART {						\
 	do						\
 	{						\
 		RC = ioctl(FDESC, REQUEST, ARG);	\
@@ -82,23 +89,23 @@ error_def(ERR_PREMATEOF);
 		RC = 0;					\
 	else						\
 		RC = errno;				\
-}
+} MBEND
 
 #define OPENFILE(FNAME, FFLAGS, FDESC)			\
-{							\
+MBSTART {						\
 	do						\
 	{						\
 		FDESC = OPEN(FNAME, FFLAGS);		\
 	} while(-1 == FDESC && EINTR == errno);		\
-}
+} MBEND
 
 #define OPENFILE3(FNAME, FFLAGS, FMODE, FDESC)		\
-{							\
+MBSTART {						\
 	do						\
 	{						\
 		FDESC = OPEN3(FNAME, FFLAGS, FMODE);	\
 	} while(-1 == FDESC && EINTR == errno);		\
-}
+} MBEND
 
 /* OPENFILE4 not needed - io_open_try handles interrupts */
 
@@ -106,7 +113,7 @@ error_def(ERR_PREMATEOF);
  * This is used for system calls, e.g, pipe, that do not support O_CLOEXEC.
  */
 #define SETFDCLOEXECALWAYS(FDESC) 					\
-{									\
+MBSTART {								\
 	int flags, fcntl_res;						\
 	if (-1 != FDESC) 						\
 	{ 								\
@@ -115,20 +122,20 @@ error_def(ERR_PREMATEOF);
 	    if (-1 != flags) 						\
 		FCNTL3(FDESC, F_SETFD, (flags | FD_CLOEXEC), fcntl_res);\
 	} 								\
-}
+} MBEND
 
 /* Versions of the OPEN* macros that cause the file descriptor to be closed before an EXEC. */
 
 /* If the platform really supports O_CLOEXEC use it in the OPEN */
 #if defined(O_CLOEXEC) && !defined(_AIX) && !defined(__sparc)
 #define OPEN_CLOEXEC(FNAME, FFLAGS, FDESC)	\
-{						\
+MBSTART {					\
 	FDESC = OPEN(FNAME, FFLAGS | O_CLOEXEC);\
-}
+} MBEND
 #define OPEN3_CLOEXEC(FNAME, FFLAGS, FMODE, FDESC)  	\
-{							\
+MBSTART {						\
 	FDESC = OPEN3(FNAME, FFLAGS | O_CLOEXEC, FMODE);\
-}
+} MBEND
 #define OPENFILE_CLOEXEC(FNAME, FFLAGS, FDESC)  OPENFILE(FNAME, FFLAGS | O_CLOEXEC, FDESC);
 #define OPENFILE_SYNC_CLOEXEC(FNAME, FFLAGS, FDESC)	OPENFILE_SYNC(FNAME, FFLAGS | O_CLOEXEC, FDESC);
 #define OPENFILE3_CLOEXEC(FNAME, FFLAGS, FMODE, FDESC)	OPENFILE3(FNAME, FFLAGS | O_CLOEXEC, FMODE, FDESC);
@@ -143,7 +150,7 @@ error_def(ERR_PREMATEOF);
 #else
 /* If the platform does not support O_CLOEXEC, use fcntl with FD_CLOEXEC */
 #define OPEN_CLOEXEC(FNAME, FFLAGS, FDESC)				\
-{									\
+MBSTART {								\
 	int flags, fcntl_res;						\
 	FDESC = OPEN(FNAME, FFLAGS);					\
 	if (-1 != FDESC)						\
@@ -153,9 +160,9 @@ error_def(ERR_PREMATEOF);
 	    if (-1 != flags)						\
 		FCNTL3(FDESC, F_SETFD, (flags | FD_CLOEXEC), fcntl_res);\
 	}								\
-}
+} MBEND
 #define OPEN3_CLOEXEC(FNAME, FFLAGS, FMODE, FDESC)			\
-{									\
+MBSTART {								\
 	int flags, fcntl_res;						\
 	FDESC = OPEN3(FNAME, FFLAGS, FMODE);				\
 	if (-1 != FDESC)						\
@@ -165,9 +172,9 @@ error_def(ERR_PREMATEOF);
 	    if (-1 != flags)						\
 		FCNTL3(FDESC, F_SETFD, (flags | FD_CLOEXEC), fcntl_res);\
 	}								\
-}
+} MBEND
 #define OPENFILE_CLOEXEC(FNAME, FFLAGS, FDESC)				\
-{									\
+MBSTART {								\
 	int flags, fcntl_res;						\
 	OPENFILE(FNAME, FFLAGS, FDESC);					\
 	if (-1 != FDESC)						\
@@ -177,10 +184,10 @@ error_def(ERR_PREMATEOF);
 	    if (-1 != flags)						\
 		FCNTL3(FDESC, F_SETFD, (flags | FD_CLOEXEC), fcntl_res);\
 	}								\
-}
+} MBEND
 
 #define OPENFILE_SYNC_CLOEXEC(FNAME, FFLAGS, FDESC)			\
-{									\
+MBSTART {								\
 	int flags, fcntl_res;						\
 	OPENFILE_SYNC(FNAME, FFLAGS, FDESC);				\
 	if (-1 != FDESC)						\
@@ -190,10 +197,10 @@ error_def(ERR_PREMATEOF);
 	    if (-1 != flags)						\
 		FCNTL3(FDESC, F_SETFD, (flags | FD_CLOEXEC), fcntl_res);\
 	}								\
-}
+} MBEND
 
 #define OPENFILE3_CLOEXEC(FNAME, FFLAGS, FMODE, FDESC)			\
-{									\
+MBSTART {								\
 	int flags, fcntl_res;						\
 	OPENFILE3(FNAME, FFLAGS, FMODE, FDESC);				\
 	if (-1 != FDESC)						\
@@ -203,160 +210,95 @@ error_def(ERR_PREMATEOF);
 	    if (-1 != flags)						\
 		FCNTL3(FDESC, F_SETFD, (flags | FD_CLOEXEC), fcntl_res);\
 	}								\
-}
+} MBEND
 #define SETOCLOEXEC(FFLAGS) (FFLAGS)
 #define SETSOCKCLOEXEC(FFLAGS) (FFLAGS)
 #define SETFDCLOEXEC(FDESC)		\
-{					\
+MBSTART {				\
 	SETFDCLOEXECALWAYS(FDESC);	\
-}
+} MBEND
 #endif
 
+#define OPENFILE_DB(FNAME, FFLAGS, UDI, SEG)									\
+MBSTART {													\
+	DCL_THREADGBL_ACCESS;											\
+														\
+	SETUP_THREADGBL_ACCESS;											\
+	if (!IS_AIO_ON_SEG(SEG))										\
+	{													\
+		OPENFILE_CLOEXEC(FNAME, FFLAGS, UDI->fd);							\
+		UDI->fd_opened_with_o_direct = FALSE;								\
+	} else													\
+	{													\
+		OPENFILE_SYNC_CLOEXEC(FNAME, FFLAGS, UDI->fd);							\
+		if (FD_INVALID != udi->fd)									\
+		{												\
+			UDI->fd_opened_with_o_direct = TRUE;							\
+			/* Get filesystem block size and use that to align future reads/writes */		\
+			UDI->db_fs_block_size = get_fs_block_size(UDI->fd);					\
+			/* Until we read the db file header, we do not know the blocksize so allocate space	\
+			 * initially to read the db file header. Later we can expand this to fit a GDS block	\
+			 * in case that turns out to be bigger than the file header. The global variable	\
+			 * "dio_buff" is filled in with the aligned/unaligned buffer details.			\
+			 */											\
+			DIO_BUFF_EXPAND_IF_NEEDED(UDI, SGMNT_HDR_LEN, &(TREF(dio_buff)));			\
+		}												\
+	}													\
+} MBEND
+
 #define FSTYPE_ADVFS	"advfs"
 #define FSTYPE_UFS	"ufs"
 
-#if defined(_AIX)
-#define OPENFILE_SYNC(FNAME, FFLAGS, FDESC)	OPENFILE(FNAME, FFLAGS | O_DIRECT | O_DSYNC, FDESC);
-/* Note: putting the DIRECTIO_FLAG definition before the #if and then redefining it below for the two exceptions
- * causes a warning on sparc - "macro redefined: DIRECTIO_FLAG" so it is repeated in each part of the big #define
- */
-#define DIRECTIO_FLAG	O_DIRECT
-#elif defined(__osf__)
-#define OPENFILE_SYNC(FNAME, FFLAGS, FDESC)										\
-{															\
-	struct statvfs	statvfs_buf;											\
-	int		macro_errno;											\
-	boolean_t	dio_success = TRUE;										\
-	if (-1 == statvfs(FNAME, &statvfs_buf))										\
-	{														\
-		macro_errno = errno;											\
-		util_out_print("Error finding FS type for file, !AD :!AD", OPER,					\
-				LEN_AND_STR(FNAME), LEN_AND_STR(STRERROR(macro_errno)));				\
-		dio_success = FALSE;											\
-	} else if (strcmp(FSTYPE_ADVFS, statvfs_buf.f_basetype))							\
-			dio_success = FALSE;										\
-	if (dio_success)												\
-	{														\
-		OPENFILE(FNAME, FFLAGS | O_DIRECTIO | O_DSYNC, FDESC);							\
-	} else														\
-	{														\
-		OPENFILE(FNAME, FFLAGS | O_DSYNC, FDESC);								\
-	}														\
-}
-#define DIRECTIO_FLAG	O_DIRECTIO
-#elif defined(__sparc)
-#define OPENFILE_SYNC(FNAME, FFLAGS, FDESC)										\
-{															\
-	struct statvfs	statvfs_buf;											\
-	int		macro_errno;											\
-	boolean_t	dio_success = TRUE;										\
-	if (-1 == statvfs(FNAME, &statvfs_buf))										\
-	{														\
-		macro_errno = errno;											\
-		util_out_print("Error finding FS type for file, !AD. !AD", OPER,					\
-				LEN_AND_STR(FNAME), LEN_AND_STR(STRERROR(macro_errno)));				\
-		dio_success = FALSE;											\
-	} else if (strcmp(FSTYPE_UFS, statvfs_buf.f_basetype))								\
-			dio_success = FALSE;										\
-	OPENFILE(FNAME, FFLAGS | O_DSYNC, FDESC);									\
-	if (dio_success && (FD_INVALID != FDESC))									\
-	{														\
-		if (-1 == directio(FDESC, DIRECTIO_ON))									\
-		{													\
-			macro_errno = errno;										\
-			util_out_print("Failed to set DIRECT IO option for !AD, reverting to normal IO. !AD ",		\
-					OPER, LEN_AND_STR(FNAME), LEN_AND_STR(STRERROR(macro_errno)));			\
-		}													\
-	}														\
-}
-#define DIRECTIO_FLAG	0
-#elif defined(__MVS__)
-#define OPENFILE_SYNC(FNAME, FFLAGS, FDESC)	OPENFILE(FNAME, FFLAGS | O_SYNC, FDESC);
-#define DIRECTIO_FLAG	0
-#elif defined(__linux__) || defined(__CYGWIN__)
-#define OPENFILE_SYNC(FNAME, FFLAGS, FDESC)	OPENFILE(FNAME, FFLAGS | O_DIRECT | O_DSYNC, FDESC);
-#define DIRECTIO_FLAG	O_DIRECT
-#elif defined(__hpux)
-#define OPENFILE_SYNC(FNAME, FFLAGS, FDESC)	OPENFILE(FNAME, FFLAGS | O_DIRECT | O_DSYNC, FDESC);
-#define DIRECTIO_FLAG	O_DIRECT
+#if defined(__MVS__)
+#	define	O_DIRECT_FLAGS				(O_SYNC)
 #else
-#error UNSUPPORTED PLATFORM
+#	define	O_DIRECT_FLAGS				(O_DIRECT | O_DSYNC)
 #endif
+#define OPENFILE_SYNC(FNAME, FFLAGS, FDESC)	OPENFILE(FNAME, FFLAGS | O_DIRECT_FLAGS, FDESC);
 
 #if defined( __linux__) || defined(__CYGWIN__)
 /* A special handling was needed for linux due to its inability to lock
  * over NFS.  The only difference in code is an added check for NFS file
  * thru fstatfs
- *
- * This should ideally include <linux/nfs_fs.h> for NFS_SUPER_MAGIC.
- * However, this header file doesn't seem to be standard and gives lots of
- * compilation errors and hence defining again here.  The constant value
- * seems to be portable across all linuxes (courtesy 'statfs' man pages)
  */
-#define NFS_SUPER_MAGIC 0x6969
 #define LOCK_IS_ALLOWED(FDESC, STATUS)								\
-{												\
+MBSTART {											\
 	struct statfs buf;									\
 	STATUS = ((-1 != fstatfs(FDESC, &buf)) && (NFS_SUPER_MAGIC != buf.f_type)) ? 0 : -2;	\
-}
+} MBEND
 #else
 #define LOCK_IS_ALLOWED(FDESC, STATUS)	STATUS = 0
 #endif
 #define OPEN_OBJECT_FILE(FNAME, FFLAG, FDESC)	OPENFILE(FNAME, FFLAG, FDESC)
 #define CLOSE_OBJECT_FILE(FDESC, RC)		CLOSEFILE_RESET(FDESC, RC)
 #define CLOSEFILE(FDESC, RC)					\
-{								\
+MBSTART {							\
 	do							\
 	{							\
 		RC = close(FDESC);				\
 	} while(-1 == RC && EINTR == errno);			\
 	if (-1 == RC)	/* Had legitimate error - return it */	\
 		RC = errno;					\
-}
+} MBEND
 
 #define	CLOSEFILE_RESET(FDESC, RC)	\
-{					\
-	CLOSEFILE(FDESC, RC)		\
+MBSTART {				\
+	CLOSEFILE(FDESC, RC);		\
 	FDESC = FD_INVALID;		\
-}
+} MBEND
 
 /* Close file only if we have it open. Use FCNTL to check if we have it open */
 #define CLOSEFILE_IF_OPEN(FDESC, RC)							\
-{											\
+MBSTART {										\
 	int	flags;									\
 											\
 	FCNTL2(FDESC, F_GETFL, flags);							\
 	if ((-1 != flags) || (EBADF != errno))						\
 		CLOSEFILE(FDESC, RC);	/* file is a valid descriptor. Close it */	\
-}
-
-#if defined(__osf__) || defined(_AIX) || defined(__sparc) || defined(__linux__) || defined(__hpux) || \
-	defined(__CYGWIN__) || defined(__MVS__)
-/* These platforms are known to support pread/pwrite.
- * !!!!!!!!!!!!!! Note !!!!!!!!!!!!!!
- * pread and pwrite do NOT (on most platforms) set the file pointer like lseek/read/write would,
- * so they are NOT a drop-in replacement !!
- */
-
-#define NOPIO_ONLY(X)
-
-#define GET_LSEEK_FLAG(FDESC, VAL)
-
-/* If definitions are flying around for pread/pread64, don't override them. Otherwise on HPUX
-   we need to run the 64bit versions of these calls because the POSIX version linkage to the
-   64 bit variation is broken. SE 07/2005.
-*/
-#if (defined(__hpux) && !defined(__ia64))
-# if !defined(pread) && !defined(pread64)
-#  define pread pread64
-#  define pwrite pwrite64
-# else
-#  error "** Interference with pread/pwrite defines - HPUX may have fixed their problem **"
-# endif
-#endif
+} MBEND
 
 #define LSEEKREAD(FDESC, FPTR, FBUFF, FBUFF_LEN, RC)						\
-{												\
+MBSTART {											\
 	ssize_t			gtmioStatus;							\
 	size_t			gtmioBuffLen;							\
 	off_t			gtmioPtr;							\
@@ -384,13 +326,19 @@ error_def(ERR_PREMATEOF);
 		RC = errno;									\
 	else											\
 		RC = -1;		/* Something kept us from reading what we wanted */	\
-}
+} MBEND
+
+#define	DB_LSEEKREAD(UDI, FD, OFFSET, BUFF, SIZE, STATUS)		\
+MBSTART {								\
+	DBG_CHECK_DIO_ALIGNMENT(UDI, OFFSET, BUFF, SIZE);		\
+	LSEEKREAD(FD, OFFSET, BUFF, SIZE, STATUS);			\
+} MBEND
 
 /* The below macro is almost the same as LSEEKREAD except it has an extra parameter where the number of
  * bytes ACTUALLY READ are stored irrespective of whether all REQUESTED BYTES were read or not.
  */
 #define LSEEKREAD_AVAILABLE(FDESC, FPTR, FBUFF, FBUFF_LEN, ACTUAL_READLEN, RC)			\
-{												\
+MBSTART {											\
 	ssize_t			gtmioStatus;							\
 	size_t			gtmioBuffLen;							\
 	off_t			gtmioPtr;							\
@@ -420,10 +368,42 @@ error_def(ERR_PREMATEOF);
 		RC = errno;									\
 	else											\
 		RC = -1;		/* Something kept us from reading what we wanted */	\
-}
+} MBEND
+
+#define LSEEKWRITEASYNCSTART(CSA, FDESC, FPTR, FBUFF, FBUFF_LEN, CR, RC)			\
+MBSTART {											\
+	memset(&CR->aiocb, 0, SIZEOF(struct aiocb));						\
+	CR->aiocb.aio_nbytes = (size_t) FBUFF_LEN;						\
+	CR->aiocb.aio_offset = (off_t) FPTR;							\
+	LSEEKWRITEASYNCRESTART(CSA, FDESC, FBUFF, CR, RC);					\
+} MBEND
+
+#define LSEEKWRITEASYNCRESTART(CSA, FDESC, FBUFF, CR, RC)					\
+MBSTART {											\
+	GBLREF 	boolean_t	async_restart_got_eagain;					\
+	ssize_t			gtmioStatus;							\
+												\
+	CR->aiocb.aio_buf = IF_LIBAIO((unsigned long)) FBUFF;					\
+	CR->aiocb.aio_fildes = FDESC;								\
+	assert(0 < CR->aiocb.aio_nbytes);							\
+	assert(0 < CR->aiocb.aio_offset);							\
+	AIO_SHIM_WRITE(CSA->region, &(CR->aiocb), gtmioStatus);					\
+	if (0 == gtmioStatus)									\
+		RC = 0;										\
+	else if (-1 == gtmioStatus)	/* Had legitimate error - return it */			\
+		RC = errno;									\
+	else											\
+	{											\
+		assert(FALSE);									\
+		RC = -1;		/* Something kept us from initiating the write */	\
+	}											\
+	assert((-1 < gtmioStatus) IF_LIBAIO(|| (EAGAIN == RC)));				\
+	if (EAGAIN == RC)									\
+		BG_TRACE_PRO_ANY(CSA, async_restart_eagain);					\
+} MBEND
 
 #define LSEEKWRITE(FDESC, FPTR, FBUFF, FBUFF_LEN, RC)						\
-{												\
+MBSTART {											\
 	ssize_t			gtmioStatus;							\
 	size_t			gtmioBuffLen;							\
 	off_t			gtmioPtr;							\
@@ -451,162 +431,10 @@ error_def(ERR_PREMATEOF);
 		RC = errno;									\
 	else											\
 		RC = -1;		/* Something kept us from writing what we wanted */	\
-}
-
-#else /* real lseek and read/write - still need to protect against interrupts inbetween calls */
-/* Using lseek/read/write path instead of faster pread/pwrite path */
-
-#ifndef __MVS__
-#warning "Using lseek/read/write path instead of faster pread/pwrite path"
-#endif
-
-#define NOPIO_ONLY(X) X
-
-/* Note array is not initialized but first IO to a given file descriptor will initialize that element */
-#define GET_LSEEK_FLAGS_ARRAY									\
-{												\
-	GBLREF	boolean_t	*lseekIoInProgress_flags;					\
-	int4	sc_open_max;									\
-	if ((boolean_t *)0 == lseekIoInProgress_flags)						\
-	{											\
-		SYSCONF(_SC_OPEN_MAX, sc_open_max);						\
-		lseekIoInProgress_flags = (boolean_t *)malloc(sc_open_max * SIZEOF(boolean_t));	\
-	}											\
-}
-
-#define GET_LSEEK_FLAG(FDESC, VAL)				\
-{								\
-	GBLREF	boolean_t	*lseekIoInProgress_flags;	\
-	GET_LSEEK_FLAGS_ARRAY;					\
-	VAL = lseekIoInProgress_flags[(FDESC)];			\
-}
-
-#define SET_LSEEK_FLAG(FDESC, VAL)				\
-{								\
-	GBLREF	boolean_t	*lseekIoInProgress_flags;	\
-	GET_LSEEK_FLAGS_ARRAY;					\
-	lseekIoInProgress_flags[(FDESC)] = VAL;			\
-}
-
-#define LSEEKREAD(FDESC, FPTR, FBUFF, FBUFF_LEN, RC)					\
-{											\
-	GBLREF boolean_t	*lseekIoInProgress_flags;				\
-	ssize_t			gtmioStatus;						\
-	size_t			gtmioBuffLen;						\
-	off_t			gtmioPtr;						\
-	sm_uc_ptr_t		gtmioBuff;						\
-	SET_LSEEK_FLAG(FDESC, TRUE);							\
-	gtmioBuffLen = FBUFF_LEN;							\
-	gtmioBuff = (sm_uc_ptr_t)(FBUFF);						\
-	gtmioPtr = (off_t)(FPTR);							\
-	for (;;)									\
-	{										\
-		if (-1 != (gtmioStatus = (ssize_t)lseek(FDESC, gtmioPtr, SEEK_SET)))	\
-		{									\
-			if (-1 != (gtmioStatus = read(FDESC, gtmioBuff, gtmioBuffLen)))	\
-			{								\
-				gtmioBuffLen -= gtmioStatus;				\
-				if (0 == gtmioBuffLen || 0 == gtmioStatus)		\
-					break;						\
-				gtmioBuff += gtmioStatus;				\
-				gtmioPtr += gtmioStatus;				\
-				continue;						\
-			}								\
-		}									\
-		if (EINTR != errno)							\
-			break;								\
-	}										\
-	if (0 == gtmioBuffLen)								\
-		RC = 0;									\
-	else if (-1 == gtmioStatus)	/* Had legitimate error - return it */		\
-		RC = errno;								\
-	else										\
-		RC = -1;		/* Something kept us from reading what we wanted */	\
-	SET_LSEEK_FLAG(FDESC, FALSE);	/* Reason this is last is so max optimization occurs */	\
-}
-
-/* The below macro is almost the same as LSEEKREAD except it has an extra parameter where the number of
- * bytes ACTUALLY READ are stored irrespective of whether all REQUESTED BYTES were read or not.
- */
-#define LSEEKREAD_AVAILABLE(FDESC, FPTR, FBUFF, FBUFF_LEN, ACTUAL_READLEN, RC)			\
-{												\
-	GBLREF boolean_t	*lseekIoInProgress_flags;					\
-	ssize_t			gtmioStatus;							\
-	size_t			gtmioBuffLen;							\
-	off_t			gtmioPtr;							\
-	sm_uc_ptr_t		gtmioBuff;							\
-												\
-	SET_LSEEK_FLAG(FDESC, TRUE);								\
-	gtmioBuffLen = FBUFF_LEN;								\
-	gtmioBuff = (sm_uc_ptr_t)(FBUFF);							\
-	gtmioPtr = (off_t)(FPTR);								\
-	for (;;)										\
-	{											\
-		if (-1 != (gtmioStatus = (ssize_t)lseek(FDESC, gtmioPtr, SEEK_SET)))		\
-		{										\
-			if (-1 != (gtmioStatus = read(FDESC, gtmioBuff, gtmioBuffLen)))		\
-			{									\
-				gtmioBuffLen -= gtmioStatus;					\
-				if (0 == gtmioBuffLen || 0 == gtmioStatus)			\
-					break;							\
-				gtmioBuff += gtmioStatus;					\
-				gtmioPtr += gtmioStatus;					\
-				continue;							\
-			}									\
-		}										\
-		if (EINTR != errno)								\
-			break;									\
-	}											\
-	(ACTUAL_READLEN) = (FBUFF_LEN) - gtmioBuffLen;						\
-	if (0 == gtmioBuffLen)									\
-		RC = 0;										\
-	else if (-1 == gtmioStatus)	/* Had legitimate error - return it */			\
-		RC = errno;									\
-	else											\
-		RC = -1;		/* Something kept us from reading what we wanted */	\
-	SET_LSEEK_FLAG(FDESC, FALSE);	/* Reason this is last is so max optimization occurs */	\
-}
-
-#define LSEEKWRITE(FDESC, FPTR, FBUFF, FBUFF_LEN, RC) 						\
-{												\
-	GBLREF boolean_t	*lseekIoInProgress_flags;					\
-	ssize_t			gtmioStatus;							\
-	size_t			gtmioBuffLen;							\
-	off_t			gtmioPtr;							\
-	sm_uc_ptr_t		gtmioBuff;							\
-	SET_LSEEK_FLAG(FDESC, TRUE);								\
-	gtmioBuffLen = FBUFF_LEN;								\
-	gtmioBuff = (sm_uc_ptr_t)(FBUFF);							\
-	gtmioPtr = (off_t)(FPTR);								\
-	for (;;)										\
-	{											\
-		if (-1 != (gtmioStatus = (ssize_t)lseek(FDESC, gtmioPtr, SEEK_SET)))		\
-		{										\
-			if (-1 != (gtmioStatus = write(FDESC, gtmioBuff, gtmioBuffLen)))	\
-			{									\
-				gtmioBuffLen -= gtmioStatus;					\
-				if (0 == gtmioBuffLen)						\
-					break;							\
-				gtmioBuff += gtmioStatus;					\
-				gtmioPtr += gtmioStatus;					\
-				continue;							\
-			}									\
-		}										\
-		if (EINTR != errno)								\
-			break;									\
-	}											\
-	if (0 == gtmioBuffLen)									\
-		RC = 0;										\
-	else if (-1 == gtmioStatus)	/* Had legitimate error - return it */			\
-		RC = errno;									\
-	else											\
-		RC = -1;		/* Something kept us from writing what we wanted */	\
-	SET_LSEEK_FLAG(FDESC, FALSE);	/* Reason this is last is so max optimization occurs */	\
-}
-#endif /* if old lseekread/writes */
+} MBEND
 
 #define DOREADRC(FDESC, FBUFF, FBUFF_LEN, RC)							\
-{												\
+MBSTART {											\
 	ssize_t		gtmioStatus;								\
 	size_t		gtmioBuffLen;								\
 	sm_uc_ptr_t	gtmioBuff;								\
@@ -630,10 +458,10 @@ error_def(ERR_PREMATEOF);
 		RC = 0;										\
 	else											\
 		RC = -1;		/* Something kept us from reading what we wanted */	\
-}
+} MBEND
 
 #define DOREADRL(FDESC, FBUFF, FBUFF_LEN, RLEN)							\
-{												\
+MBSTART {											\
 	ssize_t		gtmioStatus;								\
 	size_t		gtmioBuffLen;								\
 	sm_uc_ptr_t	gtmioBuff;								\
@@ -655,11 +483,11 @@ error_def(ERR_PREMATEOF);
 		RLEN = (int)(FBUFF_LEN - gtmioBuffLen); /* Return length actually read */	\
 	else						/* Had legitimate error - return it */	\
 		RLEN = -1;									\
-}
+} MBEND
 
 #define DOREADRLTO2(FDESC, FBUFF, FBUFF_LEN, TOFLAG, BLOCKED_IN, ISPIPE, FLAGS, RLEN,				\
-		    TOT_BYTES_READ, TIMER_ID, MSEC_TIMEOUT, PIPE_ZERO_TIMEOUT, UTF_VAR_PF, PIPE_OR_FIFO)	\
-{														\
+			TOT_BYTES_READ, TIMER_ID, MSEC_TIMEOUT, PIPE_ZERO_TIMEOUT, UTF_VAR_PF, PIPE_OR_FIFO)	\
+MBSTART {													\
 	ssize_t		gtmioStatus;										\
 	int		skip_read = FALSE;									\
 	int		tfcntl_res;										\
@@ -712,7 +540,8 @@ error_def(ERR_PREMATEOF);
 			}											\
 		}												\
 		/* if we didn't read 1 character or it's an error don't read anymore now */			\
-		if (TRUE == skip_read) break;									\
+		if (skip_read)											\
+			break;											\
 		if (-1 != (gtmioStatus = read(FDESC, gtmioBuff, gtmioBuffLen)))					\
 		{												\
 			gtmioBuffLen -= gtmioStatus;								\
@@ -739,10 +568,10 @@ error_def(ERR_PREMATEOF);
 		*TOT_BYTES_READ = (int)(FBUFF_LEN - gtmioBuffLen);						\
 		RLEN = -1;											\
 	}													\
-}
+} MBEND
 
 #define DOWRITE(FDESC, FBUFF, FBUFF_LEN)						\
-{											\
+MBSTART {										\
 	ssize_t		gtmioStatus;							\
 	size_t		gtmioBuffLen;							\
 	sm_uc_ptr_t	gtmioBuff;							\
@@ -757,17 +586,16 @@ error_def(ERR_PREMATEOF);
 			if (0 == gtmioBuffLen)						\
 				break;							\
 			gtmioBuff += gtmioStatus;					\
-		}									\
-		else if (EINTR != errno)						\
-		  break;								\
+		} else if (EINTR != errno)						\
+			break;								\
 	}										\
 	/* assertpro(FALSE)? */								\
-}
+} MBEND
 
 #define DOWRITERC_RM(RM, FBUFF, FBUFF_LEN, RC)									\
-{														\
+MBSTART {													\
 	if (0 == RM->fsblock_buffer_size)									\
-		DOWRITERC(RM->fildes, FBUFF, FBUFF_LEN, RC)							\
+		DOWRITERC(RM->fildes, FBUFF, FBUFF_LEN, RC);							\
 	else													\
 	{													\
 		GBLREF	int	gtm_non_blocked_write_retries;							\
@@ -806,10 +634,10 @@ error_def(ERR_PREMATEOF);
 		else												\
 			RC = errno;		/* Something kept us from writing what we wanted */		\
 	}													\
-}
+} MBEND
 
 #define DOWRITERC(FDESC, FBUFF, FBUFF_LEN, RC)							\
-{												\
+MBSTART {											\
 	GBLREF	int	gtm_non_blocked_write_retries;						\
 	ssize_t		gtmioStatus;								\
 	size_t		gtmioBuffLen;								\
@@ -842,10 +670,10 @@ error_def(ERR_PREMATEOF);
 		RC = 0;										\
 	else											\
 		RC = -1;		/* Something kept us from writing what we wanted */	\
-}
+} MBEND
 
 #define DOLLAR_DEVICE_SET(DEVPTR,STATUS)							\
-{												\
+MBSTART {											\
 	len = SIZEOF(ONE_COMMA) - 1;								\
 	memcpy(DEVPTR->dollar.device, ONE_COMMA, len);					\
 	errptr = (char *)STRERROR(STATUS);							\
@@ -853,10 +681,10 @@ error_def(ERR_PREMATEOF);
 	errlen = MIN(STRLEN(errptr), SIZEOF(DEVPTR->dollar.device) - SIZEOF(ONE_COMMA));	\
 	memcpy(&DEVPTR->dollar.device[len], errptr, errlen);				\
 	DEVPTR->dollar.device[len + errlen] = '\0';					\
-}
+} MBEND
 
 #define DOLLAR_DEVICE_WRITE(DEVPTR,STATUS)						\
-{											\
+MBSTART {										\
 	int	len;									\
 	int	errlen;									\
 	char	*errptr;								\
@@ -867,12 +695,12 @@ error_def(ERR_PREMATEOF);
 		memcpy(DEVPTR->dollar.device, ONE_COMMA_UNAVAILABLE, len);		\
 	} else										\
 		DOLLAR_DEVICE_SET(DEVPTR,STATUS);					\
-}
+} MBEND
 
 #define DOWRITERL_RM(RM, FBUFF, FBUFF_LEN, RLEN)								\
-{														\
+MBSTART {													\
 	if (0 == RM->fsblock_buffer_size)									\
-		DOWRITERL(RM->fildes, FBUFF, FBUFF_LEN, RLEN)							\
+		DOWRITERL(RM->fildes, FBUFF, FBUFF_LEN, RLEN);							\
 	else													\
 	{													\
 		ssize_t		gtmioStatus;									\
@@ -912,10 +740,10 @@ error_def(ERR_PREMATEOF);
 		else						/* Had legitimate error - return it */		\
 			RLEN = -1;										\
 	}													\
-}
+} MBEND
 
 #define DOWRITERL(FDESC, FBUFF, FBUFF_LEN, RLEN)						\
-{												\
+MBSTART {											\
 	ssize_t		gtmioStatus;								\
 	size_t		gtmioBuffLen;								\
 	sm_uc_ptr_t	gtmioBuff;								\
@@ -948,31 +776,31 @@ error_def(ERR_PREMATEOF);
 		RLEN = (int)(FBUFF_LEN - gtmioBuffLen); /* Return length actually written */	\
 	else						/* Had legitimate error - return it */	\
 		RLEN = -1;									\
-}
+} MBEND
 
 #define DO_FILE_READ(CHANNEL, OFFSET, READBUFF, LEN, STATUS1, STATUS2)		\
-{										\
+MBSTART {									\
 	STATUS2 = SS_NORMAL;							\
 	LSEEKREAD(CHANNEL, OFFSET, READBUFF, LEN, STATUS1);			\
 	if (-1 == STATUS1)							\
 		STATUS1 = ERR_PREMATEOF;					\
-}
+} MBEND
 
-#define DB_DO_FILE_WRITE(CHANNEL, OFFSET, WRITEBUFF, LEN, STATUS1, STATUS2)	\
-{										\
-	STATUS2 = SS_NORMAL;							\
-	DB_LSEEKWRITE(NULL, NULL, CHANNEL, OFFSET, WRITEBUFF, LEN, STATUS1);	\
-	if (-1 == STATUS1)							\
-		STATUS1 = ERR_PREMATEOF;					\
-}
+#define DB_DO_FILE_WRITE(CHANNEL, OFFSET, WRITEBUFF, LEN, STATUS1, STATUS2)				\
+MBSTART {												\
+	STATUS2 = SS_NORMAL;										\
+	DB_LSEEKWRITE(NULL, ((unix_db_info *)NULL), NULL, CHANNEL, OFFSET, WRITEBUFF, LEN, STATUS1);	\
+	if (-1 == STATUS1)										\
+		STATUS1 = ERR_PREMATEOF;								\
+} MBEND
 
 #define JNL_DO_FILE_WRITE(CSA, JNL_FN, CHANNEL, OFFSET, WRITEBUFF, LEN, STATUS1, STATUS2)	\
-{												\
+MBSTART {											\
 	STATUS2 = SS_NORMAL;									\
 	JNL_LSEEKWRITE(CSA, JNL_FN, CHANNEL, OFFSET, WRITEBUFF, LEN, STATUS1);			\
 	if (-1 == STATUS1)									\
 		STATUS1 = ERR_PREMATEOF;							\
-}
+} MBEND
 
 typedef struct
 {
@@ -985,7 +813,7 @@ typedef struct
  * applied to all Unix platforms, even though all except z/OS seem to work with monster writes.
  */
 #define WRITEPIPE(FDESC, PIPESZ, FBUFF, FBUFF_LEN, RC)						\
-{												\
+MBSTART {											\
 	GBLREF	int	gtm_non_blocked_write_retries;						\
 	ssize_t		gtmioStatus;								\
 	size_t		gtmioBuffLen;								\
@@ -1020,46 +848,49 @@ typedef struct
 		RC = 0;										\
 	else											\
 		RC = -1;		/* Something kept us from writing what we wanted */	\
-}
+} MBEND
 
 #define FFLUSH(STREAM)							\
-{									\
+MBSTART {								\
 	intrpt_state_t	prev_intrpt_state;				\
 									\
 	DEFER_INTERRUPTS(INTRPT_IN_FFLUSH, prev_intrpt_state);		\
 	fflush(STREAM);							\
 	ENABLE_INTERRUPTS(INTRPT_IN_FFLUSH, prev_intrpt_state);		\
-}
+} MBEND
 
 /* Macros to deal with calls which are not async-signal-safe */
 
 #define GETC(STREAM, RC)							\
-{										\
+MBSTART {									\
 	GBLREF boolean_t	multi_thread_in_use;				\
 	char			*rname;						\
+	intrpt_state_t		prev_intrpt_state;				\
 	/* Use the right system call based on threads are in use or not */	\
+	DEFER_INTERRUPTS(INTRPT_IN_GETC, prev_intrpt_state);			\
 	if (!INSIDE_THREADED_CODE(rname))					\
 		RC = getc_unlocked(STREAM);					\
 	else									\
 		RC = getc(STREAM);						\
-}
+	ENABLE_INTERRUPTS(INTRPT_IN_GETC, prev_intrpt_state);			\
+} MBEND
 
 #define CLEARERR(STREAM)						\
-{									\
+MBSTART {								\
 	intrpt_state_t	prev_intrpt_state;				\
 									\
 	DEFER_INTERRUPTS(INTRPT_IN_IO_READ, prev_intrpt_state);		\
 	clearerr(STREAM);						\
 	ENABLE_INTERRUPTS(INTRPT_IN_IO_READ, prev_intrpt_state);	\
-}
+} MBEND
 
 #define FEOF(STREAM, RC)						\
-{									\
+MBSTART {								\
 	intrpt_state_t	prev_intrpt_state;				\
 									\
 	DEFER_INTERRUPTS(INTRPT_IN_IO_READ, prev_intrpt_state);		\
 	RC = feof(STREAM);						\
 	ENABLE_INTERRUPTS(INTRPT_IN_IO_READ, prev_intrpt_state);	\
-}
+} MBEND
 
 #endif
diff --git a/sr_unix/gtmrecv.c b/sr_unix/gtmrecv.c
index a85f3d3..df4622e 100644
--- a/sr_unix/gtmrecv.c
+++ b/sr_unix/gtmrecv.c
@@ -59,7 +59,6 @@
 #include "init_secshr_addrs.h"
 #include "mutex.h"
 #include "fork_init.h"
-#include "heartbeat_timer.h"
 #include "gtmio.h"
 
 GBLDEF	boolean_t		gtmrecv_fetchreysnc;
@@ -407,7 +406,6 @@ int gtmrecv(void)
 	 */
 	assert(mutex_per_process_init_pid && mutex_per_process_init_pid != process_id);
 	mutex_per_process_init();
-	START_HEARTBEAT_IF_NEEDED;
 	/* Take a copy of the fact whether an -UPDATERESYNC was specified or not. Note this down in shared memory.
 	 * We will clear the shared memory copy as soon as the first history record gets written to the instance file
 	 * after the first time this receiver connects to a source. Future connects of this same receiver with the same
diff --git a/sr_unix/gtmrecv_poll_actions.c b/sr_unix/gtmrecv_poll_actions.c
index f865708..72319e4 100755
--- a/sr_unix/gtmrecv_poll_actions.c
+++ b/sr_unix/gtmrecv_poll_actions.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2008-2015 Fidelity National Information	*
+ * Copyright (c) 2008-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -584,9 +584,12 @@ int gtmrecv_poll_actions1(int *pending_data_len, int *buff_unprocessed, unsigned
 			repl_log_fd2fp(&gtmrecv_log_fp, gtmrecv_log_fd);
 			repl_log(gtmrecv_log_fp, TRUE, TRUE, "Change log to %s successful\n",gtmrecv_local->log_file);
 		}
-		upd_proc_local->changelog = gtmrecv_local->changelog; /* Pass changelog request to the update process */
 		/* NOTE: update process and receiver each ignore any setting specific to the other (REPLIC_CHANGE_UPD_LOGINTERVAL,
 		 * REPLIC_CHANGE_LOGINTERVAL) */
+		if (REPLIC_CHANGE_LOGINTERVAL == gtmrecv_local->changelog)
+			upd_proc_local->changelog = 0;
+		else
+			upd_proc_local->changelog = gtmrecv_local->changelog; /* Pass changelog request to the update process */
 		gtmrecv_local->changelog = 0;
 	}
 	if (0 == *pending_data_len && !gtmrecv_logstats && gtmrecv_local->statslog)
diff --git a/sr_unix/gtmrecv_process.c b/sr_unix/gtmrecv_process.c
index de47e6b..0dcd595 100755
--- a/sr_unix/gtmrecv_process.c
+++ b/sr_unix/gtmrecv_process.c
@@ -885,7 +885,7 @@ void gtmrecv_free_filter_buff(void)
 
 int gtmrecv_alloc_msgbuff(void)
 {
-	gtmrecv_max_repl_msglen = MAX_REPL_MSGLEN + SIZEOF(gtmrecv_msgp->type); /* add SIZEOF(...) for alignment */
+	gtmrecv_max_repl_msglen = MAX_REPL_MSGLEN;
 	assert(NULL == gtmrecv_msgp); /* first time initialization. The receiver server doesn't need to re-allocate */
 	msgbuff = (unsigned char *)malloc(gtmrecv_max_repl_msglen + OS_PAGE_SIZE);
 	gtmrecv_msgp = (repl_msg_ptr_t)ROUND_UP2((unsigned long)msgbuff, OS_PAGE_SIZE);
@@ -2724,7 +2724,7 @@ STATICFNDEF void do_main_loop(boolean_t crash_restart)
 	int4				msghdrlen, strm_num, processed_hdrlen;
 	int4				need_histinfo_num;
 	int				cmpret;
-	int				msg_type, msg_len;
+	int				msg_type, msg_len, hdr_msg_type, hdr_msg_len;
 	int				torecv_len, recvd_len, recvd_this_iter;	/* needed for REPL_RECV_LOOP */
 	int				tosend_len, sent_len, sent_this_iter;	/* needed for REPL_SEND_LOOP */
 	int				status, poll_dir;			/* needed for REPL_{SEND,RECV}_LOOP */
@@ -2974,16 +2974,20 @@ STATICFNDEF void do_main_loop(boolean_t crash_restart)
 				}
 				if (remote_side->cross_endian)
 				{
-					((repl_msg_ptr_t)buffp)->type = GTM_BYTESWAP_32(((repl_msg_ptr_t)buffp)->type);
-					((repl_msg_ptr_t)buffp)->len = GTM_BYTESWAP_32(((repl_msg_ptr_t)buffp)->len);
+					hdr_msg_type = GTM_BYTESWAP_32(((repl_msg_ptr_t)buffp)->type);
+					hdr_msg_len = GTM_BYTESWAP_32(((repl_msg_ptr_t)buffp)->len);
+				} else
+				{
+					hdr_msg_type = ((repl_msg_ptr_t)buffp)->type;
+					hdr_msg_len = ((repl_msg_ptr_t)buffp)->len;
 				}
-				msg_type = (((repl_msg_ptr_t)buffp)->type & REPL_TR_CMP_MSG_TYPE_MASK);
+				msg_type = hdr_msg_type & REPL_TR_CMP_MSG_TYPE_MASK;
 				if (REPL_TR_CMP_JNL_RECS == msg_type)
 				{
 					processed_hdrlen = REPL_MSG_HDRLEN;
-					msg_len = ((repl_msg_ptr_t)buffp)->len - processed_hdrlen;
+					msg_len = hdr_msg_len - processed_hdrlen;
 					gtmrecv_repl_cmpmsglen = msg_len;
-					gtmrecv_repl_uncmpmsglen = (((repl_msg_ptr_t)buffp)->type >> REPL_TR_CMP_MSG_TYPE_BITS);
+					gtmrecv_repl_uncmpmsglen = (hdr_msg_type >> REPL_TR_CMP_MSG_TYPE_BITS);
 					assert(0 < gtmrecv_repl_uncmpmsglen);
 					assert(REPL_TR_CMP_THRESHOLD > gtmrecv_repl_uncmpmsglen);
 					/* Since msg_len is compressed length, it need not be 8-byte aligned. Make it so
@@ -3014,7 +3018,7 @@ STATICFNDEF void do_main_loop(boolean_t crash_restart)
 					gtmrecv_repl_uncmpmsglen = cmpmsgp->uncmplen;
 					assert(0 < gtmrecv_repl_uncmpmsglen);
 					assert(REPL_TR_CMP_THRESHOLD <= gtmrecv_repl_uncmpmsglen);
-					msg_len = ((repl_msg_ptr_t)buffp)->len - processed_hdrlen;
+					msg_len = hdr_msg_len - processed_hdrlen;
 					/* Unlike REPL_TR_CMP_JNL_RECS message, msg_len is guaranteed to be 8-byte aligned here */
 					buffp += processed_hdrlen;
 					exp_data_len = gtmrecv_repl_uncmpmsglen;
@@ -3024,7 +3028,7 @@ STATICFNDEF void do_main_loop(boolean_t crash_restart)
 				} else
 				{
 					processed_hdrlen = REPL_MSG_HDRLEN;
-					msg_len = ((repl_msg_ptr_t)buffp)->len - processed_hdrlen;
+					msg_len = hdr_msg_len - processed_hdrlen;
 					exp_data_len = msg_len;
 					if (REPL_TR_JNL_RECS == msg_type || REPL_OLD_TRIPLE == msg_type || REPL_HISTREC == msg_type)
 					{
@@ -3697,20 +3701,18 @@ STATICFNDEF void do_main_loop(boolean_t crash_restart)
 		{	/* We are at the tail of the current received buffer. */
 			if ((0 != data_len) && !copied_to_recvpool)
 			{	/* We have a complete header for a control message, but not the complete message. Move the message
-				 * (including the header) to the beginning of the allocated buffer space and update data_len and
-				 * buff_unprocessed.
+				 * (including the header) to the beginning of the allocated buffer space. Restore the remaining
+				 * length to buff_unprocessed and reset data_len so that the header is read again.
 				 */
-				buff_unprocessed += buffered_data_len;
-				data_len += buffered_data_len;
+				data_len = 0;
+				buff_unprocessed += buffered_data_len + processed_hdrlen;
 				if (buffp_start != buff_start)
-					memmove(buff_start, buffp_start, buff_unprocessed + processed_hdrlen);
-				buffp = buff_start + processed_hdrlen;
+					memmove(buff_start, buffp_start, buff_unprocessed);
 			} else if (0 != buff_unprocessed)
 			{	/* We have an incomplete header. Move it to the beginning of the allocated buffer space. */
 				memmove(buff_start, buffp, buff_unprocessed);
-				buffp = buff_start;
-			} else
-				buffp = buff_start;
+			}
+			buffp = buff_start;
 		}
 		GTMRECV_POLL_ACTIONS(data_len, buff_unprocessed, buffp);
 	}
diff --git a/sr_unix/gtmsecshr.c b/sr_unix/gtmsecshr.c
index f449bdb..c5cb489 100755
--- a/sr_unix/gtmsecshr.c
+++ b/sr_unix/gtmsecshr.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -51,7 +51,6 @@
 #if defined(__MVS__)
 # include "gtm_zos_io.h"
 #endif
-
 #include "cli.h"
 #include "error.h"
 #include "gtm_logicals.h"
@@ -77,12 +76,14 @@
 #include "have_crit.h"
 #include "sig_init.h"
 #include "gtmio.h"
-#include "file_head_read.h"
-#include "file_head_write.h"
 #include "common_startup_init.h"
 #include "gtm_threadgbl_init.h"
 #include "hashtab.h"
 #include "fork_init.h"
+#include "jnl.h"
+#include "repl_msg.h"			/* needed by gtmsource.h */
+#include "gtmsource.h"			/* for anticipatory_freeze.h */
+#include "anticipatory_freeze.h"
 #ifdef UNICODE_SUPPORTED
 # include "gtm_icu_api.h"
 # include "gtm_utf8.h"
@@ -92,8 +93,6 @@
 #define execname 	"gtmsecshr"	/* this is what this executable is supposed to be called. A different name is verboten */
 #define intent_open	"for open"	/* FLUSH_DB_IPCS_INFO types */
 #define intent_close	"for close"
-#define TZLOCATOR	"TZ="
-#define NEWLINE		0x0a
 
 GBLDEF CLI_ENTRY	*cmd_ary = NULL; /* GTMSECSHR does not have any command tables so initialize command array to NULL */
 
@@ -232,7 +231,7 @@ int main(int argc, char_ptr_t argv[])
 	timer_id = (TID)main;
 	while (TRUE)
 	{
-		input_timeval.tv_sec  = MAX_TIMEOUT_VALUE;	/* Restart timeout each interation for platforms that save
+		input_timeval.tv_sec = MAX_TIMEOUT_VALUE;	/* Restart timeout each interation for platforms that save
 								 * unexpired time when select exits.
 								 */
 		input_timeval.tv_usec = 0;
@@ -240,7 +239,7 @@ int main(int argc, char_ptr_t argv[])
 		FD_ZERO(&wait_on_fd);
 		FD_SET(gtmsecshr_sockfd, &wait_on_fd);
 		gtmsecshr_timer_popped = FALSE;
-		SELECT(gtmsecshr_sockfd+1, (void *)&wait_on_fd, NULL, NULL, &input_timeval, selstat);
+		SELECT(gtmsecshr_sockfd + 1, (void *)&wait_on_fd, NULL, NULL, &input_timeval, selstat);
 		if (0 > selstat)
 			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_GTMSECSHR, 1, process_id, ERR_GTMSECSHRSCKSEL, 0, errno);
 		else if (0 == selstat)
@@ -294,7 +293,7 @@ int main(int argc, char_ptr_t argv[])
 			cancel_timer(timer_id);
 		} else
 			DBGGSSHR((LOGFLAGS, "gtmsecshr: SENDTO reply skipped due to mesg.code = INVALID_COMMAND\n"));
-		assert('a' > 'F' && 'a' > '9');
+		assert(('a' > 'F') && ('a' > '9'));
 		if ('a' <= client_addr.sun_path[strlen(client_addr.sun_path) - 1])
 			clean_client_sockets(client_addr.sun_path);
 	}
@@ -316,12 +315,6 @@ void gtmsecshr_init(char_ptr_t argv[], char **rundir, int *rundir_len)
 	int		status;
 	int		lib_gid;
 	struct stat	dist_stat_buff;
-#	ifdef _AIX
-	FILE		*envfile;
-	int		recnum, reclen;
-	char		*fgets_rc, *newtz;
-	boolean_t	tzfnd;
-#	endif
 	intrpt_state_t	prev_intrpt_state;
 	DCL_THREADGBL_ACCESS;
 
@@ -396,80 +389,9 @@ void gtmsecshr_init(char_ptr_t argv[], char **rundir, int *rundir_len)
 			RTS_ERROR_LITERAL("Server"), process_id, ERR_GTMSECSHRBADDIR);
 		gtmsecshr_exit(BADGTMDISTDIR, FALSE);
 	}
-#	ifdef _AIX
-	/* Note time is handled very oddly on AIX. If one undefines the TZ environment variable (such as our wrapper does to
-	 * prevent reporting time in the timezone of the process that started gtmsecshr, process time reverts to GMT. So to
-	 * prevent that, lookup the default timezone in /etc/environment and use it to prevent whacky time reporting by
-	 * gtmsecshr in the operator log. Secure file read method is to switch dir first, then do relative open.
-	 */
-	if (-1 == CHDIR("/etc"))	/* Note chdir is changed again below so this is only temporary */
-	{
-		save_errno = errno;
-		send_msg_csa(CSA_ARG(NULL) VARLSTCNT(10) ERR_GTMSECSHRSTART, 3, RTS_ERROR_LITERAL("Server"), process_id, ERR_TEXT,
-			2, RTS_ERROR_LITERAL("Error during chdir to /etc - TZ cannot be determined"), save_errno);
-	} else
-	{
-		Fopen(envfile, "environment", "r");
-		if (NULL == envfile)
-		{
-			save_errno = errno;
-			send_msg_csa(CSA_ARG(NULL) VARLSTCNT(10) ERR_GTMSECSHRSTART, 3,
-				RTS_ERROR_LITERAL("Server"), process_id, ERR_TEXT, 2,
-				RTS_ERROR_LITERAL("Failed to read /etc/environment - TZ cannot be determined"), save_errno);
-		} else
-		{	/* /etc/environments is open, locate TZ= record */
-			tzfnd = FALSE;
-			for (recnum = 0; ; recnum++)
-			{	/* Reuse realpathbef as it is not otherwise needed any longer */
-				FGETS(realpathbef, GTM_PATH_MAX, envfile, fgets_rc);
-				if (NULL == fgets_rc)
-					break;
-				if (STRLEN(TZLOCATOR) >= (reclen = STRLEN(realpathbef)))
-					continue;
-				if (0 == memcmp(TZLOCATOR, realpathbef, STRLEN(TZLOCATOR)))
-				{
-					tzfnd = TRUE;
-					break;
-				}
-			}
-			if (!tzfnd)
-			{	/* We didn't find the TZ record - report it depending if we just hit EOF or something more
-				 * severe.
-				 */
-				if (!feof(envfile))
-				{
-					save_errno = errno;
-					send_msg_csa(CSA_ARG(NULL) VARLSTCNT(10) ERR_GTMSECSHRSTART, 3,
-						RTS_ERROR_LITERAL("Server"), process_id, ERR_TEXT, 2,
-						RTS_ERROR_LITERAL("Error reading /etc/environment - TZ cannot be determined"),
-						save_errno);
-				} else
-					/* Have EOF - didn't find TZ */
-					send_msg_csa(CSA_ARG(NULL) VARLSTCNT(9) ERR_GTMSECSHRSTART, 3,
-						RTS_ERROR_LITERAL("Server"), process_id, ERR_TEXT, 2,
-						RTS_ERROR_LITERAL("TZ cannot be determined"));
-			} else
-			{	/* TZ record acquired - isolate TZ - malloc space to put it once determine exact length */
-				if (NEWLINE == realpathbef[reclen - 1])
-					realpathbef[reclen-- - 1] = '\0';	/* Overwrite nl with null and decr length */
-				newtz = malloc(reclen);				/* putenv arg must be new - no stack vars */
-				strcpy(newtz, realpathbef);
-				PUTENV(status, newtz);
-				if (0 != status)
-				{
-					save_errno = errno;
-					send_msg_csa(CSA_ARG(NULL) VARLSTCNT(10) ERR_GTMSECSHRSTART, 3,
-						RTS_ERROR_LITERAL("Server"), process_id, ERR_TEXT, 2,
-						RTS_ERROR_LITERAL("TZ reset with putenv() failed"), save_errno);
-				}
-			}
-			FCLOSE(envfile, status);
-		}
-	}
-#	endif /* _AIX */
 	/*
-      **** With invocation validated, begin our priviledge escalation ****
-      */
+	 **** With invocation validated, begin our priviledge escalation ****
+	 */
 	if (-1 == setuid(ROOTUID))
 	{
 		save_errno = errno;
@@ -647,14 +569,16 @@ void gtmsecshr_signal_handler(int sig, siginfo_t *info, void *context)
 
 void service_request(gtmsecshr_mesg *buf, int msglen, char *rundir, int rundir_len)
 {
-	int			fn_len, index, basind, save_errno, save_code;
+	int			flags, fn_len, index, basind, save_errno, save_code;
 	int			stat_res, fd;
 	char			*basnam, *fn;
 	struct shmid_ds		temp_shmctl_buf;
 	struct stat		statbuf;
-	sgmnt_data		header;
+	sgmnt_data		header, *csd;
 	endian32_struct		check_endian;
-	char			*intent;
+	char			*intent, *buff;
+	boolean_t		fd_opened_with_o_direct;
+	uint4			fsb_size;
 	ZOS_ONLY(int		realfiletag;)
 	DCL_THREADGBL_ACCESS;
 
@@ -860,7 +784,7 @@ void service_request(gtmsecshr_mesg *buf, int msglen, char *rundir, int rundir_l
 			fn = buf->mesg.db_ipcs.fn;
 			fn_len = buf->mesg.db_ipcs.fn_len;
 			if ((GTM_PATH_MAX < fn_len) || ('\0' != *(fn + fn_len))
-			    || (fn_len != (msglen - GTM_MESG_HDR_SIZE - offsetof(ipcs_mesg, fn[0]) - 1)))
+				|| (fn_len != (msglen - GTM_MESG_HDR_SIZE - offsetof(ipcs_mesg, fn[0]) - 1)))
 			{
 				buf->code = EINVAL;
 				send_msg_csa(CSA_ARG(NULL) VARLSTCNT(12) ERR_GTMSECSHRSRVFID, 6,
@@ -869,7 +793,14 @@ void service_request(gtmsecshr_mesg *buf, int msglen, char *rundir, int rundir_l
 				break;
 			}
 			/* First open and read-in the fileheader */
-			OPENFILE(fn, O_RDWR, fd);
+			flags = O_RDWR;
+			if (buf->mesg.db_ipcs.open_fd_with_o_direct)
+			{
+				fd_opened_with_o_direct = TRUE;
+				flags = flags | O_DIRECT_FLAGS;
+			} else
+				fd_opened_with_o_direct = FALSE;
+			OPENFILE(fn, flags, fd); /* udi not available so OPENFILE_DB not used */
 			if (FD_INVALID == fd)
 			{
 				save_errno = buf->code = errno;
@@ -911,7 +842,14 @@ void service_request(gtmsecshr_mesg *buf, int msglen, char *rundir, int rundir_l
 				CLOSEFILE_RESET(fd, save_errno);	/* resets "fd" to FD_INVALID */
 				break;
 			}
-			LSEEKREAD(fd, 0, &header, SIZEOF(header), save_errno);
+			if (fd_opened_with_o_direct)
+			{
+				fsb_size = get_fs_block_size(fd);
+				DIO_BUFF_EXPAND_IF_NEEDED_NO_UDI(SGMNT_HDR_LEN, fsb_size, &(TREF(dio_buff)));
+				csd = (sgmnt_data *)(TREF(dio_buff)).aligned;
+			} else
+				csd = &header;
+			DB_LSEEKREAD(((unix_db_info *)NULL), fd, 0, csd, SGMNT_HDR_LEN, save_errno);
 			if (0 != save_errno)
 			{
 				buf->code = save_errno;
@@ -921,7 +859,7 @@ void service_request(gtmsecshr_mesg *buf, int msglen, char *rundir, int rundir_l
 				CLOSEFILE_RESET(fd, save_errno);	/* resets "fd" to FD_INVALID */
 				break;
 			}
-			if (0 != memcmp(header.label, GDS_LABEL, GDS_LABEL_SZ - 1))	/* Verify is GT.M database file */
+			if (0 != memcmp(csd->label, GDS_LABEL, GDS_LABEL_SZ - 1))	/* Verify is GT.M database file */
 			{
 				buf->code = ERR_DBNOTGDS;
 				send_msg_csa(CSA_ARG(NULL) VARLSTCNT(12) ERR_GTMSECSHRSRVFID, 6,
@@ -931,7 +869,7 @@ void service_request(gtmsecshr_mesg *buf, int msglen, char *rundir, int rundir_l
 				break;
 			}
 			/* It would be easier to use the CHECK_DB_ENDIAN macro here but we'd prefer it didn't raise rts_error */
-			check_endian.word32 = header.minor_dbver;
+			check_endian.word32 = csd->minor_dbver;
 			if (!check_endian.shorts.ENDIANCHECKTHIS)
 			{
 				buf->code = ERR_DBENDIAN;
@@ -997,15 +935,12 @@ void service_request(gtmsecshr_mesg *buf, int msglen, char *rundir, int rundir_l
 				}
 			}
 			/* Update file header fields */
-			header.semid = buf->mesg.db_ipcs.semid;
-			header.shmid = buf->mesg.db_ipcs.shmid;
-			header.gt_sem_ctime.ctime = buf->mesg.db_ipcs.gt_sem_ctime;
-			header.gt_shm_ctime.ctime = buf->mesg.db_ipcs.gt_shm_ctime;
-			/* And flush the changes back out. Note this service code is only used by read-only processes so
-			 * we don't need any anticipatory freeze insertion which anyway pulls in the world so LSEEKWRITE does
-			 * what we need.
-			 */
-			LSEEKWRITE(fd, 0, &header, SIZEOF(header), save_errno);
+			csd->semid = buf->mesg.db_ipcs.semid;
+			csd->shmid = buf->mesg.db_ipcs.shmid;
+			csd->gt_sem_ctime.ctime = buf->mesg.db_ipcs.gt_sem_ctime;
+			csd->gt_shm_ctime.ctime = buf->mesg.db_ipcs.gt_shm_ctime;
+			/* And flush the changes back out. */
+			GTMSECSHR_DB_LSEEKWRITE(((unix_db_info *)NULL), fd, 0, csd, SGMNT_HDR_LEN, save_errno);
 			if (0 != save_errno)
 			{
 				buf->code = save_errno;
diff --git a/sr_unix/gtmsecshr.h b/sr_unix/gtmsecshr.h
index 51566e7..2e62f06 100755
--- a/sr_unix/gtmsecshr.h
+++ b/sr_unix/gtmsecshr.h
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -77,6 +78,7 @@
 
 typedef struct ipcs_mesg_struct
 {
+	boolean_t	open_fd_with_o_direct;	/* if TRUE, gtmsecshr will open db file with O_DIRECT */
 	int		semid;
 	int		shmid;
 	time_t		gt_sem_ctime;
diff --git a/sr_unix/gtmsecshr_wrapper.c b/sr_unix/gtmsecshr_wrapper.c
index f31e725..06f086c 100644
--- a/sr_unix/gtmsecshr_wrapper.c
+++ b/sr_unix/gtmsecshr_wrapper.c
@@ -10,6 +10,18 @@
  *								*
  ****************************************************************/
 
+/********************************************************************************************
+ * W A R N I N G  ---  W A R N I N G  --- W A R N I N G --- W A R N I N G --- W A R N I N G *
+ *											    *
+ * This routine (gtmsecshr_wrapper) runs as setuid to root to perform "environmental        *
+ * cleanup" prior to invoking gtmsecshr proper. Extreme care must be taken to prevent all   *
+ * forms of deceptive access,  linking with unauthorized libraries, etc. Same applies to    *
+ * anything it calls.		    							    *
+ *											    *
+ * W A R N I N G  ---  W A R N I N G  --- W A R N I N G --- W A R N I N G --- W A R N I N G *
+ ********************************************************************************************/
+
+
 #include "mdef.h"
 #define BYPASS_MEMCPY_OVERRIDE  /* Signals gtm_string.h to not override memcpy(). This causes linking problems when libmumps.a
                                  * is not available.
@@ -33,51 +45,56 @@
 #endif
 #include <errno.h>
 
+#define WBOX_GBLDEF		/* Causes whitebox global vars to be GBLDEF'd instead of GBLREF'd thus keeping gbldefs.c out
+				 * of gtmsecshr_wrapper the executable.
+				 */
+#include "wbox_test_init.h"
+#include "gtm_limits.h"
+
 #define ROOTUID 0
 #define ROOTGID 0
 #define MAX_ENV_VAR_VAL_LEN 1024
 #define MAX_ALLOWABLE_LEN 256
 #define ASCIICTLMAX	32  /* space character */
 #define ASCIICTLMIN	0   /* NULL character */
-#define GTM_TMP "gtm_tmp"
-#define GTM_DIST "gtm_dist"
-#define GTM_DBGLVL "gtmdbglvl"
+#define GTM_TMP		"gtm_tmp"
+#define GTM_DIST	"gtm_dist"
 #define	SUB_PATH_TO_GTMSECSHRDIR "/gtmsecshrdir"
 #define	REL_PATH_TO_CURDIR "."
 #define	REL_PATH_TO_GTMSECSHR "./gtmsecshr"
 #define	GTMSECSHR_BASENAME "/gtmsecshr"
 #define MAX_ENV_NAME_LEN 2048
 
-#ifdef __osf__
-	/* On OSF/1 (Digital Unix), pointers are 64 bits wide; the only exception to this is C programs for which one may
-	 * specify compiler and link editor options in order to use (and allocate) 32-bit pointers.  However, since C is
-	 * the only exception and, in particular because the operating system does not support such an exception, the argv
-	 * array passed to the main program is an array of 64-bit pointers.  Thus the C program needs to declare argv[]
-	 * as an array of 64-bit pointers and needs to do the same for any pointer it sets to an element of argv[].
-	 */
-#pragma pointer_size (save)
-#pragma pointer_size (long)
+/* Build up some defines for use with AIX and reading /etc/environment to pick up a default TZ value plus some defines
+ * for testing AIX errors in this wrapper with white box test cases.
+ */
+#ifdef _AIX
+#define GTM_TZ				"TZ"
+#define TZLOCATOR			"TZ="
+#define NEWLINE				0x0a
+#define GTM_WHITE_BOX_TEST_CASE_ENABLE	"gtm_white_box_test_case_enable"
+#define GTM_WHITE_BOX_TEST_CASE_NUMBER	"gtm_white_box_test_case_number"
+#define GTMETCDIRPATH			"/etc"
+#define BADGTMETCDIRPATH		"/bogusdirnotetc"
+#define GTMENVIRONFILE			"environment"
+#define BADGTMENVIRONFILE		"bogusfilenotenvironment"
 #endif
 
 typedef	char	**environptr_t;
 extern	char	**environ;
 
-#ifdef __osf__
-#pragma pointer_size (restore)
-#endif
-
 /* Since gtmsecshr_wrapper.c is a stand-alone module, we cannot use error_def-style definitions, so use simple macro defines to
  * initialize all error types used along with their respective mnemonics. Note that we need two '%' to ensure the '%' prefix
  * in the syslog.
  */
-#define ERR_SECSHRCHDIRFAILED			\
-	"%%GTM-E-SECSHRCHDIRFAILED, chdir failed on %s, errno %d. gtmsecshr will not be started\n"
 #define ERR_SECSHRCLEARENVFAILED		\
 	"%%GTM-E-SECSHRCLEARENVFAILED, clearenv failed. gtmsecshr will not be started\n"
+#define ERR_SECSHRCHDIRFAILED1			\
+	"%%GTM-E-SECSHRCHDIRFAILED1, chdir failed on %s, errno %d. gtmsecshr will not be started\n"
+#define ERR_SECSHRCHDIRFAILED2			\
+	"%%GTM-W-SECSHRCHDIRFAILED2, chdir failed on %s, errno %d. gtmsecshr will be started with GMT timezone\n"
 #define ERR_SECSHREXECLFAILED			\
 	"%%GTM-E-SECSHREXECLFAILED, execl of %s failed\n"
-#define ERR_SECSHRGTMDBGLVL2LONG		\
-	"%%GTM-E-SECSHRGTMDBGLVL2LONG, gtmdbglvl env var too long. gtmsecshr will not be started\n"
 #define ERR_SECSHRGTMDIST2LONG			\
 	"%%GTM-E-SECSHRGTMDIST2LONG, gtm_dist env var too long. gtmsecshr will not be started\n"
 #define ERR_SECSHRGTMTMP2LONG			\
@@ -98,6 +115,8 @@ extern	char	**environ;
 	"%%GTM-E-SECSHRSETUIDFAILED, setuid failed. gtmsecshr will not be started\n"
 #define ERR_SECSHRSTATFAILED			\
 	"%%GTM-E-SECSHRSTATFAILED, stat failed on %s, errno %d. gtmsecshr will not be started\n"
+#define ERR_SECSHRTZFAIL			\
+	"%%GTM-W-SECSHRTZFAIL, %s %d. gtmsecshr will start with TZ set to GMT\n"
 #define ERR_SECSHRWRITABLE			\
 	"%%GTM-E-SECSHRWRITABLE, %s writable. gtmsecshr will not be started\n"
 
@@ -107,10 +126,10 @@ information for gtmsecshr_wrapper.c, since it does not have a stand-alone .msg f
 
 	.FACILITY	GTMSECSHRINIT,251/PREFIX=ERR_
 
-SECSHRCHDIRFAILED	<chdir failed on !AD, errno !UL. gtmsecshr will not be started>/error/fao=3!/ansi=0
+SECSHRCHDIRFAILED1	<chdir failed on !AD, errno !UL. gtmsecshr will not be started>/error/fao=3!/ansi=0
+SECSHRCHDIRFAILED2	<chdir failed on !AD, errno !UL. gtmsecshr will be started with GMT timezone>/warning/fao=3!/ansi=0
 SECSHRCLEARENVFAILED	<clearenv failed. gtmsecshr will not be started>/error/fao=0!/ansi=0
 SECSHREXECLFAILED	<execl of !AD failed>/error/fao=2!/ansi=0
-SECSHRGTMDBGLVL2LONG	<gtmdbglvl env var too long. gtmsecshr will not be started>/error/fao=0!/ansi=0
 SECSHRGTMDIST2LONG	<gtm_dist env var too long. gtmsecshr will not be started>/error/fao=0!/ansi=0
 SECSHRGTMTMP2LONG	<gtm_tmp env var too long. gtmsecshr will not be started>/error/fao=0!/ansi=0
 SECSHRNOGTMDIST		<gtm_dist env var does not exist. gtmsecshr will not be started>/error/fao=0!/ansi=0
@@ -121,6 +140,7 @@ SECSHRSETGTMDISTFAILED	<setenv for gtm_dist failed. gtmsecshr will not be starte
 SECSHRSETGTMTMPFAILED	<setenv for gtm_tmp failed. gtmsecshr will not be started>/error/fao=0!/ansi=0
 SECSHRSETUIDFAILED	<setuid failed. gtmsecshr will not be started>/error/fao=0!/ansi=0
 SECSHRSTATFAILED	<stat failed on !AD, errno !UL. gtmsecshr will not be started>/error/fao=3!/ansi=0
+SECSHRTZFAIL		<!AD !UL. gtmsecshr will start with TZ set to GMT>/warning/fao=3!/ansi=0
 SECSHRWRITABLE		<!AD writable. gtmsecshr will not be started>/error/fao=2!/ansi=0
 ! the following line stops getmsginfo.m
 	.end
@@ -131,20 +151,18 @@ void strsanitize(char *src, char *dst)
 {
 	int i, srclen;
 
-	/* The calling function already validate the string length. */
+	/* The calling function already validates the string length. */
 	srclen = strlen(src);
-	for (i = 0; i <= srclen && i < MAX_ENV_VAR_VAL_LEN; i++)
+	for (i = 0; (i <= srclen) && (MAX_ENV_VAR_VAL_LEN > i); i++)
 	{
 		/* Convert all control characters to '*'. */
-		if (ASCIICTLMAX > (int)src[i] && ASCIICTLMIN < (int)src[i])
+		if ((ASCIICTLMAX > (int)src[i]) && (ASCIICTLMIN < (int)src[i]))
 			dst[i] = '*';
 		else
 			dst[i] = src[i];
 	}
 }
 
-
-
 int main()
 {
 	int		ret, status;
@@ -153,15 +171,22 @@ int main()
 	struct stat	gtm_secshr_stat;
 	char 		gtm_dist_val[MAX_ENV_VAR_VAL_LEN];
 	char 		gtm_tmp_val[MAX_ENV_VAR_VAL_LEN];
-	char 		gtm_dbglvl_val[MAX_ENV_VAR_VAL_LEN];
 	char 		gtm_secshrdir_path[MAX_ENV_VAR_VAL_LEN];
 	char 		gtm_secshrdir_path_display[MAX_ENV_VAR_VAL_LEN];
 	char 		gtm_secshr_path[MAX_ENV_VAR_VAL_LEN];
 	char 		gtm_secshr_path_display[MAX_ENV_VAR_VAL_LEN];
 	char 		gtm_secshr_orig_path[MAX_ENV_VAR_VAL_LEN];
-	int		gtm_tmp_exists = 0;
+	boolean_t	gtm_tmp_exists = FALSE;
 	int		rc;
 	sigset_t	mask;
+#	ifdef _AIX
+	FILE		*envfile;
+	int		recnum, reclen, save_errno;
+	char		*fgets_rc;
+	boolean_t	gtm_TZ_found;
+	char		gtm_TZ_val[MAX_ENV_VAR_VAL_LEN + 1], *gtm_TZ_val_ptr;
+	char		*etcdirpath, *environfile;
+#	endif
 
 	/* Reset the signal mask (since the one inherited from the invoking process might have signals such as SIGALRM or SIGTERM
 	 * blocked) to let gtmsecshr manage its own signals using sig_init.
@@ -169,6 +194,112 @@ int main()
 	sigemptyset(&mask);
 	sigprocmask(SIG_SETMASK, &mask, NULL);	/* BYPASSOK(sigprocmask) */
 	OPENLOG("GTMSECSHRINIT", LOG_PID | LOG_CONS | LOG_NOWAIT, LOG_USER);
+#	ifdef _AIX
+#	ifdef DEBUG
+	/* Use some very simplistic processing to obtain values for $gtm_white_box_test_case_enable/number since we are basically
+	 * standalone in this routine without the ability to call into other mumps routines. We fetch the value and convert it
+	 * numerically as best as possible. For the boolean enable flag, If it's non-zero - it's true else false. No errors raised
+	 * here for conversions.
+	 */
+	env_var_ptr = getenv(GTM_WHITE_BOX_TEST_CASE_ENABLE);
+	if (NULL != env_var_ptr)
+	{
+		gtm_white_box_test_case_enabled = atoi(env_var_ptr);
+		if (gtm_white_box_test_case_enabled)
+		{
+			env_var_ptr = getenv(GTM_WHITE_BOX_TEST_CASE_NUMBER);
+			if (NULL != env_var_ptr)
+				gtm_white_box_test_case_number = atoi(env_var_ptr);
+		}
+	}
+#	endif /* DEBUG */
+	etcdirpath = !(WBTEST_ENABLED(WBTEST_SECSHRWRAP_NOETC)) ? GTMETCDIRPATH : BADGTMETCDIRPATH;
+	environfile = !(WBTEST_ENABLED(WBTEST_SECSHRWRAP_NOENVIRON)) ? GTMENVIRONFILE : BADGTMENVIRONFILE;
+	/* Note syslog timestamps are handled somewhat differently on AIX. If one undefines the TZ environment variable (such as
+	 * our wrapper does to prevent reporting time in the timezone of the process that started gtmsecshr, process time reverts
+	 * to GMT. So to prevent that, lookup the default timezone in /etc/environment and use it to prevent whacky time reporting
+	 * by gtmsecshr in the operator log. Secure file read method is to switch dir first, then do relative open.
+	 */
+	gtm_TZ_found = FALSE;
+	if (-1 == CHDIR(etcdirpath))	/* Note chdir is changed again below so this is only temporary */
+		SYSLOG(LOG_USER | LOG_INFO, ERR_SECSHRCHDIRFAILED2, etcdirpath, errno);
+	else
+	{
+		envfile = fopen(environfile, "r");
+		if (NULL == envfile)
+			SYSLOG(LOG_USER | LOG_INFO, ERR_SECSHRTZFAIL, "Unable to open /etc/environment errno:", errno);
+		else
+		{	/* /etc/environments is open, locate TZ= record */
+			for (recnum = 0; ; recnum++)
+			{
+				FGETS(gtm_TZ_val, MAX_ENV_VAR_VAL_LEN, envfile, fgets_rc);
+				if (NULL == fgets_rc)
+					break;
+				if (STRLEN(TZLOCATOR) >= (reclen = STRLEN(gtm_TZ_val)))		/* Note assignment */
+					continue;
+				if (0 == memcmp(TZLOCATOR, gtm_TZ_val, STRLEN(TZLOCATOR)))
+				{
+					gtm_TZ_found = TRUE;
+					break;
+				}
+			}
+			if (!gtm_TZ_found DEBUG_ONLY(|| WBTEST_ENABLED(WBTEST_SECSHRWRAP_NOTZREC_READERR)
+						     || WBTEST_ENABLED(WBTEST_SECSHRWRAP_NOTZREC_EOF)))
+			{	/* We didn't find the TZ record - report it depending if we just hit EOF or something more
+				 * severe.
+				 */
+				save_errno = errno;
+#				if DEBUG
+				/* Separately test for some white box conditions before testing the real return codes */
+				if (WBTEST_ENABLED(WBTEST_SECSHRWRAP_NOTZREC_READERR))
+					SYSLOG(LOG_USER | LOG_INFO, ERR_SECSHRTZFAIL, "FGETS() failure reading /etc/environment "
+                                               "errno:", 999);
+				else if (WBTEST_ENABLED(WBTEST_SECSHRWRAP_NOTZREC_EOF))
+					SYSLOG(LOG_USER | LOG_INFO, ERR_SECSHRTZFAIL, "File /etc/environment has no default TZ ",
+					       0);	/* This puts a spurious 0 out with the message but this condition should
+							 * be so rare as to be irrelevant and not worth a separate message.
+							 */
+				else
+#				endif
+				if (!feof(envfile))
+					SYSLOG(LOG_USER | LOG_INFO, ERR_SECSHRTZFAIL, "FGETS() failure reading /etc/environment "
+					       "errno:", save_errno);
+				else
+					/* Have EOF - didn't find TZ */
+					SYSLOG(LOG_USER | LOG_INFO, ERR_SECSHRTZFAIL, "File /etc/environment has no default TZ ",
+					       0);	/* This puts a spurious 0 out with the message but this condition should
+							 * be so rare as to be irrelevant and not worth a separate message.
+							 */
+			} else
+			{	/* TZ record acquired - isolate TZ value. Note we don't allocate storage for it like we would if
+				 * this were a long(er) running process but this process's sole job is to call the real gtmsecshr
+				 * so the stack storage flavor of the buffer is fine.
+				 */
+				if (NEWLINE == gtm_TZ_val[reclen - 1])
+					gtm_TZ_val[--reclen] = '\0';		/* Overwrite nl with null and decr length */
+				/* Set pointer to point past the TZ= part of the value pair as we use setenv() to set this value */
+				gtm_TZ_val_ptr = gtm_TZ_val + STRLEN(TZLOCATOR);
+				/* In case this default TZ is different from the process that started gtmsecshr, go ahead and
+				 * establish this version now for any remaining messages that happen before we do a clearenv().
+				 * We will re-establish the value again after the clear. Until we establish the default value
+				 * here, gtmsecshr wrapper messages will have the timezone of the invoking process.
+				 */
+				status = setenv(GTM_TZ, gtm_TZ_val_ptr, TRUE);
+				if ((0 != status) || WBTEST_ENABLED(WBTEST_SECSHRWRAP_SETENVFAIL1))
+				{
+					save_errno = errno;
+#					ifdef DEBUG
+					if (WBTEST_ENABLED(WBTEST_SECSHRWRAP_SETENVFAIL1))
+					    save_errno = 999;
+#					endif
+					SYSLOG(LOG_USER | LOG_INFO, ERR_SECSHRTZFAIL, "TZ reset with setenv() failed (1) errno:",
+					       save_errno);
+				}
+			}
+			fclose(envfile);
+		}
+	}
+#	endif /* _AIX */
 	ret = 0; /* start positive */
 	/* get the ones we need */
 	if (env_var_ptr = getenv(GTM_DIST))		/* Warning - assignment */
@@ -204,19 +335,10 @@ int main()
 			ret = -1;
 		} else
 		{
-			gtm_tmp_exists = 1;
+			gtm_tmp_exists = TRUE;
 			strcpy(gtm_tmp_val, env_var_ptr);
 		}
 	}
-	if (env_var_ptr = getenv(GTM_DBGLVL))		/* Warning - assignment */
-	{
-		if (MAX_ALLOWABLE_LEN < strlen(env_var_ptr))
-		{
-			SYSLOG(LOG_USER | LOG_INFO, ERR_SECSHRGTMDBGLVL2LONG);
-			ret = -1;
-		} else
-			strcpy(gtm_dbglvl_val, env_var_ptr);
-	}
 	if (!ret)
 	{	/* clear all */
 #		ifdef SUNOS
@@ -246,11 +368,34 @@ int main()
 				ret = -1;
 			}
 		}
+#		ifdef _AIX
+		if (gtm_TZ_found DEBUG_ONLY(|| WBTEST_ENABLED(WBTEST_SECSHRWRAP_SETENVFAIL2)))
+		{
+#			ifdef DEBUG
+			if (gtm_TZ_found)	/* Want to run setenv even if WBOX if TZ was found so we can find log entries */
+				status = setenv(GTM_TZ, gtm_TZ_val_ptr, TRUE);
+			if (WBTEST_ENABLED(WBTEST_SECSHRWRAP_SETENVFAIL2))
+				status = -1;
+#			else
+			status = setenv(GTM_TZ, gtm_TZ_val_ptr, TRUE);
+#			endif
+			if (0 != status)
+			{
+				save_errno = errno;
+#				ifdef DEBUG
+				if (WBTEST_ENABLED(WBTEST_SECSHRWRAP_SETENVFAIL2))
+					save_errno = 999;
+#				endif
+				SYSLOG(LOG_USER | LOG_INFO, ERR_SECSHRTZFAIL, "TZ reset with setenv() failed (2) errno:",
+				       save_errno);
+			}
+		}
+#		endif
 	}
 	if (!ret)
 	{	/* go to root */
 		if (-1 == CHDIR(gtm_secshrdir_path))
-			SYSLOG(LOG_USER | LOG_INFO, ERR_SECSHRCHDIRFAILED, gtm_secshrdir_path_display, errno);
+			SYSLOG(LOG_USER | LOG_INFO, ERR_SECSHRCHDIRFAILED1, gtm_secshrdir_path_display, errno);
 		else if (-1 == Stat(REL_PATH_TO_CURDIR, &gtm_secshrdir_stat))
 			SYSLOG(LOG_USER | LOG_INFO, ERR_SECSHRSTATFAILED, gtm_secshrdir_path_display, errno);
 		else if (ROOTUID != gtm_secshrdir_stat.st_uid)
diff --git a/sr_unix/gtmshr_symbols.exp b/sr_unix/gtmshr_symbols.exp
index db6aed3..752c301 100755
--- a/sr_unix/gtmshr_symbols.exp
+++ b/sr_unix/gtmshr_symbols.exp
@@ -16,3 +16,6 @@ gtm_filename_to_id
 gtm_is_file_identical
 gtm_xcfileid_free
 gtm_is_main_thread
+accumulate
+to_ulong
+is_big_endian
diff --git a/sr_unix/gtmsource.c b/sr_unix/gtmsource.c
index c0d77b7..7914806 100644
--- a/sr_unix/gtmsource.c
+++ b/sr_unix/gtmsource.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -56,16 +56,20 @@
 #include "repl_instance.h"
 #include "ftok_sems.h"
 #include "ftok_sem_incrcnt.h"
-#include "gt_timer.h"		/* for LONG_SLEEP macro (hiber_start function prototype) */
+#include "gt_timer.h"		/* for LONG_SLEEP macro (hiber_start function prototype) and add_safe_timer_handler */
+#include "gtmsource_heartbeat.h" /* for gtmsource_heartbeat_timer */
 #include "init_secshr_addrs.h"
 #include "mutex.h"
 #include "gtm_zlib.h"
 #include "fork_init.h"
-#include "heartbeat_timer.h"
 #include "gtmio.h"
 #ifdef GTM_TLS
 #include "gtm_repl.h"
 #endif
+#ifdef DEBUG
+#include "anticipatory_freeze.h"
+#include "fake_enospc.h"
+#endif
 
 GBLDEF	boolean_t		gtmsource_logstats = FALSE, gtmsource_pool2file_transition = FALSE;
 GBLDEF	int			gtmsource_filter = NO_FILTER;
@@ -124,7 +128,9 @@ int gtmsource()
 	boolean_t		this_side_std_null_coll;
 	int			null_fd, rc;
 	uint4			shutdowntime = 0;
+	DCL_THREADGBL_ACCESS;
 
+	SETUP_THREADGBL_ACCESS;
 	memset((uchar_ptr_t)&jnlpool, 0, SIZEOF(jnlpool_addrs));
 	call_on_signal = gtmsource_sigstop;
 	ESTABLISH_RET(gtmsource_ch, SS_NORMAL);
@@ -296,6 +302,7 @@ int gtmsource()
 	assert(!holds_sem[SOURCE][SRC_SERV_COUNT_SEM]);
 	/* Start child source server initialization */
 	is_src_server = TRUE;
+	TREF(error_on_jnl_file_lost) = JNL_FILE_LOST_ERRORS; /* source server should never switch journal files even on errors */
 	OPERATOR_LOG_MSG;
 	process_id = getpid();
 	/* Reinvoke secshr related initialization with the child's pid */
@@ -306,7 +313,6 @@ int gtmsource()
 	 */
 	assert(mutex_per_process_init_pid && (mutex_per_process_init_pid != process_id));
 	mutex_per_process_init();
-	START_HEARTBEAT_IF_NEEDED;
 	ppid = getppid();
 	log_init_status = repl_log_init(REPL_GENERAL_LOG, &gtmsource_log_fd, gtmsource_options.log_file);
 	assert(SS_NORMAL == log_init_status);
@@ -319,7 +325,6 @@ int gtmsource()
 		gtm_zlib_init();	/* Open zlib shared library for compression/decompression */
 	REPL_DPRINT1("Setting up regions\n");
 	gvinit();
-
 	/* We use the same code dse uses to open all regions but we must make sure they are all open before proceeding. */
 	all_files_open = region_init(FALSE);
 	if (!all_files_open)
@@ -332,6 +337,7 @@ int gtmsource()
 	this_side_std_null_coll = -1;
 	for (reg = gd_header->regions, region_top = gd_header->regions + gd_header->n_regions; reg < region_top; reg++)
 	{
+		assert(reg->open);
 		csa = &FILE_INFO(reg)->s_addrs;
 		if (this_side_std_null_coll != csa->hdr->std_null_coll)
 		{
@@ -430,6 +436,17 @@ int gtmsource()
 		sgtm_putmsg(print_msg, VARLSTCNT(3) ERR_REPLINSTFREEZECOMMENT, 1, jnlpool.jnlpool_ctl->freeze_comment);
 		repl_log(gtmsource_log_fp, TRUE, TRUE, print_msg);
 	}
+	add_safe_timer_handler(1, gtmsource_heartbeat_timer);
+#	ifdef DEBUG
+	if (is_jnlpool_creator)
+	{
+		if (TREF(gtm_test_fake_enospc) && CUSTOM_ERRORS_LOADED)
+		{	/* Only the journal pool creator drives fake_enospc */
+			srand(time(NULL));
+			start_timer((TID)fake_enospc, ENOSPC_INIT_DURATION, fake_enospc, 0, NULL);
+		}
+	}
+#	endif
 	gtmsource_local->jnlfileonly = gtmsource_options.jnlfileonly;
 	do
 	{ 	/* If mode is passive, go to sleep. Wakeup every now and then and check to see if I have to become active. */
diff --git a/sr_unix/gtmsource.h b/sr_unix/gtmsource.h
old mode 100755
new mode 100644
index fe019b4..80be4af
--- a/sr_unix/gtmsource.h
+++ b/sr_unix/gtmsource.h
@@ -85,6 +85,7 @@ typedef enum
 #define	LOG_WAIT_FOR_JNLOPEN_PERIOD		(50 * 1000) /* ms */
 #define	GTMSOURCE_WAIT_FOR_JNL_RECS		1 /* ms */
 #define	LOG_WAIT_FOR_JNL_RECS_PERIOD		(50 * 1000) /* ms */
+#define	LOG_WAIT_FOR_JNL_FLUSH_PERIOD		(8 * 1000) /* ms */
 #define	GTMSOURCE_WAIT_FOR_SRV_START		10 /* ms */
 #define	GTMSOURCE_WAIT_FOR_MODE_CHANGE		(1000 - 1) /* ms, almost 1 sec */
 #define	GTMSOURCE_WAIT_FOR_SHUTDOWN		(1000 - 1) /* ms, almost 1 sec */
diff --git a/sr_unix/gtmsource_changelog.c b/sr_unix/gtmsource_changelog.c
index f49ffee..e4c4d3b 100755
--- a/sr_unix/gtmsource_changelog.c
+++ b/sr_unix/gtmsource_changelog.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2006-2015 Fidelity National Information	*
+ * Copyright (c) 2006-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -41,25 +41,36 @@ GBLREF	jnlpool_addrs		jnlpool;
 GBLREF	gtmsource_options_t	gtmsource_options;
 GBLREF	boolean_t		holds_sem[NUM_SEM_SETS][NUM_SRC_SEMS];
 error_def(ERR_REPLLOGOPN);
+error_def(ERR_CHANGELOGINTERVAL);
 int gtmsource_changelog(void)
 {
-	uint4	changelog_desired = 0, changelog_accepted = 0;
+	uint4	changelog_accepted = 0;
 	int     log_fd = 0; /*used to indicate whether the new specified log file is writable*/
 	int     close_status = 0; /*used to indicate if log file is successfully closed*/
 	char*   err_code;
-	int	save_errno;
+	int	save_errno = 0;
+	int	retry_count = 5;
 
 	assert(holds_sem[SOURCE][JNL_POOL_ACCESS_SEM]);
 	repl_log(stderr, TRUE, TRUE, "Initiating CHANGELOG operation on source server pid [%d] for secondary instance [%s]\n",
 		jnlpool.gtmsource_local->gtmsource_pid, jnlpool.gtmsource_local->secondary_instname);
 	if (0 != jnlpool.gtmsource_local->changelog)
 	{
+		retry_count = 5;
+		while (0 != retry_count--)
+		{
+			LONG_SLEEP(5);
+			if (!jnlpool.gtmsource_local->changelog)
+				break;
+		}
+	}
+	if (0 != jnlpool.gtmsource_local->changelog)
+	{
 		util_out_print("Change log is already in progress. Not initiating change in log file or log interval", TRUE);
 		return (ABNORMAL_SHUTDOWN);
 	}
 	if ('\0' != gtmsource_options.log_file[0]) /* trigger change in log file */
 	{
-		changelog_desired |= REPLIC_CHANGE_LOGFILE;
 		if (0 != STRCMP(jnlpool.gtmsource_local->log_file, gtmsource_options.log_file))
 		{	/*check if the new log file is writable*/
 			OPENFILE3_CLOEXEC(gtmsource_options.log_file,
@@ -68,10 +79,16 @@ int gtmsource_changelog(void)
 			{
 				save_errno = ERRNO;
 				err_code = STRERROR(save_errno);
-				gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(8) ERR_REPLLOGOPN, 6,
-						   LEN_AND_STR(gtmsource_options.log_file),
-						   LEN_AND_STR(err_code),
-						   LEN_AND_STR(NULL_DEVICE));
+				if ('\0' != jnlpool.gtmsource_local->log_file[0])
+					gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(8) ERR_REPLLOGOPN, 6,
+						LEN_AND_STR(gtmsource_options.log_file),
+						LEN_AND_STR(err_code),
+						LEN_AND_STR(jnlpool.gtmsource_local->log_file));
+				else
+					gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(8) ERR_REPLLOGOPN, 6,
+						LEN_AND_STR(gtmsource_options.log_file),
+					   	LEN_AND_STR(err_code),
+						LEN_AND_STR(NULL_DEVICE));
 			} else {
 				CLOSEFILE_IF_OPEN(log_fd, close_status);
 				assert(close_status==0);
@@ -85,12 +102,14 @@ int gtmsource_changelog(void)
 	}
 	if (0 != gtmsource_options.src_log_interval) /* trigger change in log interval */
 	{
-		changelog_desired |= REPLIC_CHANGE_LOGINTERVAL;
 		if (gtmsource_options.src_log_interval != jnlpool.gtmsource_local->log_interval)
 		{
 			changelog_accepted |= REPLIC_CHANGE_LOGINTERVAL;
 			jnlpool.gtmsource_local->log_interval = gtmsource_options.src_log_interval;
-			util_out_print("Change log initiated with interval !UL", TRUE, gtmsource_options.src_log_interval);
+			gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(7) ERR_CHANGELOGINTERVAL, 5,
+					   LEN_AND_LIT("Source"),
+					   LEN_AND_STR(jnlpool.gtmsource_local->log_file),
+					   gtmsource_options.src_log_interval);
 		} else
 			util_out_print("Log interval is already !UL. Not initiating change in log interval", TRUE,
 					gtmsource_options.src_log_interval);
@@ -99,5 +118,5 @@ int gtmsource_changelog(void)
 		jnlpool.gtmsource_local->changelog = changelog_accepted;
 	else
 		util_out_print("No change to log file or log interval", TRUE);
-	return ((0 != changelog_accepted && changelog_accepted == changelog_desired) ? NORMAL_SHUTDOWN : ABNORMAL_SHUTDOWN);
+	return (0 != save_errno) ? ABNORMAL_SHUTDOWN : NORMAL_SHUTDOWN;
 }
diff --git a/sr_unix/gtmsource_get_opt.c b/sr_unix/gtmsource_get_opt.c
index 68e711e..b292109 100755
--- a/sr_unix/gtmsource_get_opt.c
+++ b/sr_unix/gtmsource_get_opt.c
@@ -44,7 +44,6 @@
 #include "gtm_zlib.h"
 #ifdef GTM_TLS
 #include "gtm_repl.h"
-#include "heartbeat_timer.h"
 #endif
 
 #define MAX_SECONDARY_LEN 		(MAX_HOST_NAME_LEN + 11) /* +11 for ':' and port number */
@@ -362,8 +361,6 @@ int gtmsource_get_opt(void)
 				renegotiate_interval = renegotiate_interval * 60;	   /* Convert to seconds. */
 			} else
 				renegotiate_interval = DEFAULT_RENEGOTIATE_TIMEOUT * 60; /* Convert to seconds. */
-			/* Convert renegotiate_interval to heartbeat units (# of 8 second intervals). */
-			renegotiate_interval = DIVIDE_ROUND_UP(renegotiate_interval, HEARTBEAT_INTERVAL_IN_SECS);
 			gtmsource_options.renegotiate_interval = renegotiate_interval;
 			/* Check if plaintext-fallback mode is specified. Default option is NOPLAINTEXTFALLBACK. */
 			if (CLI_PRESENT == (plaintext_fallback = cli_present("PLAINTEXTFALLBACK")))
diff --git a/sr_unix/gtmsource_heartbeat.c b/sr_unix/gtmsource_heartbeat.c
index 0585311..d346018 100755
--- a/sr_unix/gtmsource_heartbeat.c
+++ b/sr_unix/gtmsource_heartbeat.c
@@ -65,7 +65,7 @@ void gtmsource_heartbeat_timer(TID tid, int4 interval_len, int *interval_ptr)
 	assert(0 != gtmsource_now);
 	UNIX_ONLY(assert(*interval_ptr == heartbeat_period);)	/* interval_len and interval_ptr are dummies on VMS */
 	gtmsource_now += heartbeat_period;			/* cannot use *interval_ptr on VMS */
-	REPL_DPRINT2("Starting heartbeat timer with %d s\n", heartbeat_period);
+	REPL_DPRINT4("Repeating heartbeat timer with %d s\tSource now is %ld\tTime now is %ld\n", heartbeat_period, gtmsource_now, time(NULL));
 	start_timer((TID)gtmsource_heartbeat_timer, heartbeat_period * 1000, gtmsource_heartbeat_timer, SIZEOF(heartbeat_period),
 			&heartbeat_period); /* start_timer expects time interval in milli seconds, heartbeat_period is in seconds */
 }
@@ -105,6 +105,7 @@ int gtmsource_init_heartbeat(void)
 	 */
 	start_timer((TID)gtmsource_heartbeat_timer, heartbeat_period * 1000, gtmsource_heartbeat_timer, SIZEOF(heartbeat_period),
 			&heartbeat_period); /* start_timer expects time interval in milli seconds, heartbeat_period is in seconds */
+	REPL_DPRINT4("Started heartbeat timer with %d s\tSource now is %ld\tTime now is %ld\n", heartbeat_period, gtmsource_now, time(NULL));
 	heartbeat_stalled = FALSE;
 	earliest_sent_time = 0;
 	return (SS_NORMAL);
@@ -112,6 +113,7 @@ int gtmsource_init_heartbeat(void)
 
 int gtmsource_stop_heartbeat(void)
 {
+	REPL_DPRINT4("Stopping heartbeat timer with %d s\tSource now is %ld\tTime now is %ld\n", heartbeat_period, gtmsource_now, time(NULL));
 	cancel_timer((TID)gtmsource_heartbeat_timer);
 	if (NULL != repl_heartbeat_que_head)
 		free(repl_heartbeat_que_head);
@@ -121,7 +123,7 @@ int gtmsource_stop_heartbeat(void)
 	earliest_sent_time = 0;
 	gtmsource_now = 0;
 	heartbeat_stalled = TRUE;
-	REPL_DPRINT1("Stopped heartbeat\n");
+	REPL_DPRINT2("Stopped heartbeat (%d)\n", intrpt_ok_state);
 	return (SS_NORMAL);
 }
 
diff --git a/sr_unix/gtmsource_process.c b/sr_unix/gtmsource_process.c
index 89370fb..58b4a04 100644
--- a/sr_unix/gtmsource_process.c
+++ b/sr_unix/gtmsource_process.c
@@ -68,7 +68,6 @@
 #include "gv_trigger_common.h"
 #include "wbox_test_init.h"
 #ifdef GTM_TLS
-#include "heartbeat_timer.h"
 #include "gtm_repl.h"
 #endif
 
@@ -214,7 +213,6 @@ GBLREF	repl_conn_info_t	*this_side, *remote_side;
 GBLREF	int4			strm_index;
 GBLREF	uint4			process_id;
 GBLREF	seq_num			gtmsource_save_read_jnl_seqno;
-GBLREF	uint4			heartbeat_counter;
 
 STATICDEF	boolean_t	xon_wait_logged = FALSE;
 STATICDEF	boolean_t	already_communicated = FALSE;
@@ -222,9 +220,9 @@ STATICDEF	seq_num		recvd_seqno = 0;
 STATICDEF	int		recvd_start_flags = START_FLAG_NONE;
 STATICDEF	int		poll_time = REPL_POLL_NOWAIT;
 #ifdef GTM_TLS
-STATICDEF	uint4		next_renegotiate_hrtbt = 0;
+STATICDEF	boolean_t	next_renegotiate_hrtbt = FALSE;
 #ifdef DEBUG
-STATICDEF	boolean_t	renegotiation_pending = 0;
+STATICDEF	boolean_t	renegotiation_pending = FALSE;
 #endif
 #endif
 
@@ -404,8 +402,7 @@ void gtmsource_recv_ctl(void)
 		return;
 #	ifdef GTM_TLS
 	assert(repl_tls.enabled || (REPLTLS_RENEG_STATE_NONE == repl_tls.renegotiate_state));
-	if (repl_tls.enabled && (REPLTLS_WAITING_FOR_RENEG_TIMEOUT == repl_tls.renegotiate_state)
-		&& (heartbeat_counter >= next_renegotiate_hrtbt))
+	if (repl_tls.enabled && (REPLTLS_WAITING_FOR_RENEG_TIMEOUT == repl_tls.renegotiate_state) && next_renegotiate_hrtbt)
 	{	/* Time to renegotiate the TLS/SSL parameters. */
 		heartbeat_stalled = TRUE;	/* Defer heartbeats until renegotiation is done. */
 		DEBUG_ONLY(renegotiation_pending = TRUE);
@@ -761,6 +758,10 @@ int gtmsource_process(void)
 		if (max_epoch_interval < csa->hdr->epoch_interval)
 			max_epoch_interval = csa->hdr->epoch_interval;
 	}
+	/* Since we want to wait at least a couple of minutes before timing out on the latch, ensure max_epoch_interval
+	 * is at least 1 minute even if the individual file header epoch intervals are not that big.
+	 */
+	max_epoch_interval = MAX(60, max_epoch_interval);
 	while (TRUE)
 	{
 		assert(!udi->grabbed_ftok_sem);
@@ -1356,9 +1357,14 @@ int gtmsource_process(void)
 			}
 		}
 #		endif
-		if (QWLT(gtmsource_local->read_jnl_seqno, sav_read_jnl_seqno) && (NULL != repl_ctl_list))
-		{	/* The journal files may have been positioned ahead of the read_jnl_seqno for the next read.
-			 * Indicate that they have to be repositioned into the past.
+		if (NULL != repl_ctl_list)
+		{	/* The journal files may have been positioned
+			 *	a) Ahead of the read_jnl_seqno for the next read in which case indicate that they have to be
+			 *		repositioned into the past OR
+			 *	b) Behind the read_jnl_seqno for the next read and ctl->lookback might have been set when
+			 *		the disconnect of the previous connection occured and the newer connection happens
+			 *		with a receiver database that is much more ahead in time than when it disconnected.
+			 *		In this case fix ctl->lookback. (GTM-8547)
 			 */
 			assert(READ_FILE == gtmsource_local->read_state);
 			gtmsource_set_lookback();	/* In case we read ahead, enable looking back. */
diff --git a/sr_unix/gtmsource_readfiles.c b/sr_unix/gtmsource_readfiles.c
old mode 100755
new mode 100644
index 5063d3d..a506b83
--- a/sr_unix/gtmsource_readfiles.c
+++ b/sr_unix/gtmsource_readfiles.c
@@ -74,7 +74,7 @@
 
 /* Callers of this macro ensure that the maximum seqno which can be found until offset MAX_SEQNO_EOF_ADDR is MAX_SEQNO. */
 #define	CTL_SET_MAX_SEQNO(CTL, MAX_SEQNO, MAX_SEQNO_ADDR, MAX_SEQNO_EOF_ADDR, SKIP_EOF_ADDR_CHECK)		\
-{														\
+MBSTART {													\
 	assert(MAX_SEQNO_ADDR <= MAX_SEQNO_EOF_ADDR);								\
 	assert(SKIP_EOF_ADDR_CHECK || (MAX_SEQNO_EOF_ADDR <= CTL->repl_buff->fc->eof_addr));			\
 	assert(ctl->max_seqno <= MAX_SEQNO);									\
@@ -84,7 +84,36 @@
 	assert(MAX_SEQNO_EOF_ADDR >= MAX_SEQNO_ADDR);								\
 	assert(ctl->max_seqno_eof_addr <= MAX_SEQNO_EOF_ADDR);							\
 	ctl->max_seqno_eof_addr = MAX_SEQNO_EOF_ADDR;								\
-}
+} MBEND
+
+#define BUNCHING_TIME	(8 * MILLISECS_IN_SEC)
+
+#define	GTMSRC_DO_JNL_FLUSH_IF_POSSIBLE(CTL, CSA)									\
+MBSTART {														\
+	boolean_t		flush_done;										\
+	uint4			dskaddr, freeaddr, saved_jpc_cycle;							\
+	jnl_private_control	*jpc;											\
+	int			rc;											\
+															\
+	jpc = CSA->jnl;													\
+	saved_jpc_cycle = jpc->cycle; /* remember current cycle */							\
+	DO_JNL_FLUSH_IF_POSSIBLE(CTL->reg, CSA, flush_done, dskaddr, freeaddr);						\
+	if (flush_done)													\
+	{	/* Source server did a flush. Log that event for debugging purposes */					\
+		repl_log(gtmsource_log_fp, TRUE, TRUE, "REPL_INFO : Source server did flush of journal file %s "	\
+			"state %s : seqno %llu [0x%llx]. [dskaddr 0x%x freeaddr 0x%x]\n", CTL->jnl_fn,			\
+			jnl_file_state_lit[CTL->file_state], CTL->seqno, CTL->seqno, dskaddr, freeaddr);		\
+		/* Since "flush_done" is TRUE, it means the source server has done a "jnl_ensure_open" inside the	\
+		 * DO_JNL_FLUSH_IF_POSSIBLE macro and has opened the journal file. It already has a copy of the fd in	\
+		 * ctl->repl_buff->fc->fd which it uses to read the journal file. Now that the jnl_flush (rare event)	\
+		 * is done, close the jpc->channel and continue to use the ctl's fd.					\
+		 */													\
+		assert(NOJNL != jpc->channel);										\
+		JNL_FD_CLOSE(jpc->channel, rc);	/* sets jpc->channel to NOJNL */					\
+		assert(NOJNL == jpc->channel);										\
+		jpc->cycle = saved_jpc_cycle; /* do not want cycle to be changed by our flushing so restore it */	\
+	}														\
+} MBEND
 
 GBLREF	unsigned char		*gtmsource_tcombuff_start;
 GBLREF	jnlpool_addrs		jnlpool;
@@ -98,7 +127,6 @@ GBLREF	gd_region		*gv_cur_region;
 GBLREF	FILE			*gtmsource_log_fp;
 GBLREF	gtmsource_state_t	gtmsource_state;
 GBLREF	uint4			process_id;
-GBLREF	uint4			heartbeat_counter;
 
 LITREF char *jnl_file_state_lit[];
 
@@ -503,10 +531,10 @@ static	int update_eof_addr(repl_ctl_element *ctl, int *eof_change)
 			     csa->nl->jnl_file.u.device,  csa->nl->jnl_file.u.st_gen);
 		if (!ctl->eof_addr_final)
 		{
-			F_READ_BLK_ALIGNED(fc->fd, 0, fc->jfh, REAL_JNL_HDR_LEN, status);
+			F_READ_BLK_ALIGNED(fc->fd, 0, fc->jfh, ROUND_UP2(REAL_JNL_HDR_LEN, fc->fs_block_size), status);
 			if (SS_NORMAL != status)
-				rts_error_csa(CSA_ARG(csa) VARLSTCNT(9) ERR_REPLFILIOERR, 2, ctl->jnl_fn_len, ctl->jnl_fn,
-						ERR_TEXT, 2, LEN_AND_LIT("Error in reading jfh in update_eof_addr"), status);
+				rts_error_csa(CSA_ARG(csa) VARLSTCNT(9) ERR_REPLFILIOERR, 2, ctl->jnl_fn_len, ctl->jnl_fn, ERR_TEXT,
+						2, LEN_AND_LIT("Error reading journal fileheader to update EOF address"), status);
 			REPL_DPRINT2("Update EOF : Jnl file hdr refreshed from file for %s\n", ctl->jnl_fn);
 			ctl->eof_addr_final = TRUE; /* No more updates to fc->eof_addr for this journal file */
 		}
@@ -704,11 +732,14 @@ static	int update_max_seqno_info(repl_ctl_element *ctl)
 					return (SS_NORMAL);
 				}
 				SHORT_SLEEP(GTMSOURCE_WAIT_FOR_JNL_RECS);
-				if (0 == (wait_for_jnl += GTMSOURCE_WAIT_FOR_JNL_RECS) % LOG_WAIT_FOR_JNL_RECS_PERIOD)
+				wait_for_jnl += GTMSOURCE_WAIT_FOR_JNL_RECS;
+				if (0 == (wait_for_jnl % LOG_WAIT_FOR_JNL_FLUSH_PERIOD))
+					GTMSRC_DO_JNL_FLUSH_IF_POSSIBLE(ctl, csa); /* See if a "jnl_flush" might help nudge */
+				if (0 == (wait_for_jnl % LOG_WAIT_FOR_JNL_RECS_PERIOD))
 				{
 					repl_log(gtmsource_log_fp, TRUE, TRUE, "REPL_WARN : Source server waited %u seconds for "
 						" journal record(s) to be written to journal file %s while attempting to read "
-						"seqno %llu [0x%llx]. [dskaddr 0x%llx freeaddr 0x%llx]. Check for problems with "
+						"seqno %llu [0x%llx]. [dskaddr 0x%x freeaddr 0x%x]. Check for problems with "
 						"journaling\n", wait_for_jnl / 1000, ctl->jnl_fn, ctl->seqno, ctl->seqno,
 						csa->jnl->jnl_buff->dskaddr, csa->jnl->jnl_buff->freeaddr);
 				}
@@ -1011,11 +1042,14 @@ static	int read_transaction(repl_ctl_element *ctl, unsigned char **buff, int *bu
 				return 0;
 			}
 			SHORT_SLEEP(GTMSOURCE_WAIT_FOR_JNL_RECS);
-			if (0 == (total_wait_for_jnl_recs += GTMSOURCE_WAIT_FOR_JNL_RECS) % LOG_WAIT_FOR_JNL_RECS_PERIOD)
+			total_wait_for_jnl_recs += GTMSOURCE_WAIT_FOR_JNL_RECS;
+			if (0 == (total_wait_for_jnl_recs % LOG_WAIT_FOR_JNL_FLUSH_PERIOD))
+				GTMSRC_DO_JNL_FLUSH_IF_POSSIBLE(ctl, csa); /* See if a "jnl_flush" might help nudge */
+			if (0 == (total_wait_for_jnl_recs % LOG_WAIT_FOR_JNL_RECS_PERIOD))
 			{
 				repl_log(gtmsource_log_fp, TRUE, TRUE, "REPL_WARN : Source server waited %u seconds for journal "
 					"record(s) to be written to journal file %s while attempting to read seqno %llu [0x%llx]. "
-					"[dskaddr 0x%llx freeaddr 0x%llx]. Check for problems with journaling\n",
+					"[dskaddr 0x%x freeaddr 0x%x]. Check for problems with journaling\n",
 					total_wait_for_jnl_recs / 1000, ctl->jnl_fn, ctl->seqno, ctl->seqno,
 					csa->jnl->jnl_buff->dskaddr, csa->jnl->jnl_buff->freeaddr);
 			}
@@ -1455,34 +1489,37 @@ static	int read_and_merge(unsigned char *buff, int maxbufflen, seq_num read_jnl_
 				return 0;
 			}
 			SHORT_SLEEP(GTMSOURCE_WAIT_FOR_JNLOPEN); /* sleep for 10 msec between each iteration */
-			if (0 == ((total_wait_for_jnlopen += GTMSOURCE_WAIT_FOR_JNLOPEN) % LOG_WAIT_FOR_JNLOPEN_PERIOD))
+			total_wait_for_jnlopen += GTMSOURCE_WAIT_FOR_JNLOPEN;
+			if (0 == (total_wait_for_jnlopen % LOG_WAIT_FOR_JNL_FLUSH_PERIOD))
+			{
+				for (ctl = repl_ctl_list->next; NULL != ctl; ctl = ctl->next)
+				{
+					csa = &FILE_INFO(ctl->reg)->s_addrs;
+					GTMSRC_DO_JNL_FLUSH_IF_POSSIBLE(ctl, csa); /* See if a "jnl_flush" might help nudge */
+				}
+			}
+			if (0 == (total_wait_for_jnlopen % LOG_WAIT_FOR_JNLOPEN_PERIOD))
 			{	/* We have waited for 5000 intervals of 10 msec each, for a total of 50 seconds sleep.
-				 * Issue alert every 50 seconds. Print detail of all open journal files only in first alert.
+				 * Issue alert every 50 seconds.
 				 */
 				repl_log(gtmsource_log_fp, TRUE, TRUE, "REPL_WARN : Source server waited %u seconds for journal"
 					" file(s) to be opened, or updated while attempting to read seqno %llu [0x%llx]. Check"
 					" for problems with journaling\n", total_wait_for_jnlopen / 1000,
 					read_jnl_seqno, read_jnl_seqno);
-				if (LOG_WAIT_FOR_JNLOPEN_PERIOD == total_wait_for_jnlopen)
-				{	/* Print debug info only for first alert */
-					for (ctl = repl_ctl_list->next; NULL != ctl; ctl = ctl->next)
-					{
-						csa = &FILE_INFO(ctl->reg)->s_addrs;
-						repl_log(gtmsource_log_fp, TRUE, TRUE, "DBG_INFO: Journal File: %s for"
-							" Database File: %s; State: %s. Timer PIDs(%d): (%u %u %u)\n",
-							ctl->jnl_fn, ctl->reg->dyn.addr->fname,
-							jnl_file_state_lit[ctl->file_state], csa->nl->wcs_timers + 1,
-							csa->nl->wt_pid_array[0], csa->nl->wt_pid_array[1],
-							csa->nl->wt_pid_array[2]);
-						if (JNL_FILE_OPEN == ctl->file_state)
-						{
-							repl_log(gtmsource_log_fp, TRUE, TRUE, " "
-								"ctl->seqno = %llu [0x%llx]. [dskaddr = 0x%x,freeaddr = 0x%x]. "
-								"ctl->repl_rctl->read_complete = %d\n",
-								ctl->seqno, ctl->seqno, csa->jnl->jnl_buff->dskaddr,
-								csa->jnl->jnl_buff->freeaddr, ctl->repl_rctl->read_complete);
-						}
-					}
+				for (ctl = repl_ctl_list->next; NULL != ctl; ctl = ctl->next)
+				{
+					csa = &FILE_INFO(ctl->reg)->s_addrs;
+					repl_log(gtmsource_log_fp, TRUE, TRUE, "DBG_INFO: Journal File: %s for"
+						" Database File: %s; State: %s. Timer PIDs(%d): (%u %u %u)\n",
+						ctl->jnl_fn, ctl->reg->dyn.addr->fname,
+						jnl_file_state_lit[ctl->file_state], csa->nl->wcs_timers + 1,
+						csa->nl->wt_pid_array[0], csa->nl->wt_pid_array[1],
+						csa->nl->wt_pid_array[2]);
+					repl_log(gtmsource_log_fp, TRUE, TRUE, " "
+						"ctl->seqno = %llu [0x%llx]. [dskaddr = 0x%x,freeaddr = 0x%x]. "
+						"ctl->repl_rctl->read_complete = %d\n",
+						ctl->seqno, ctl->seqno, csa->jnl->jnl_buff->dskaddr,
+						csa->jnl->jnl_buff->freeaddr, ctl->repl_rctl->read_complete);
 				}
 			}
 		}
@@ -1878,6 +1915,7 @@ int gtmsource_readfiles(unsigned char *buff, int *data_len, int maxbufflen, bool
 	uint4			jnlpool_size;
 	boolean_t		file2pool;
 	unsigned int		start_heartbeat;
+	boolean_t		stop_bunching;
 	gtmsource_state_t	gtmsource_state_sav;
 
 	jctl = jnlpool.jnlpool_ctl;
@@ -1909,12 +1947,15 @@ int gtmsource_readfiles(unsigned char *buff, int *data_len, int maxbufflen, bool
 			REPL_DPRINT1("REPL_HISTREC message first needs to be sent before any more seqnos can be sent across\n");
 			return 0;
 		}
-		start_heartbeat = heartbeat_counter;
+		TIMEOUT_INIT(stop_bunching, BUNCHING_TIME);
 		read_addr = gtmsource_local->read_addr;
 		GTMSOURCE_SAVE_STATE(gtmsource_state_sav);
 		first_tr_len = read_size = read_and_merge(buff, maxbufflen, read_jnl_seqno++) + REPL_MSG_HDRLEN;
 		if (GTMSOURCE_NOW_TRANSITIONAL(gtmsource_state_sav))
+		{
+			TIMEOUT_DONE(stop_bunching);
 			return 0;
+		}
 		tot_tr_len = 0;
 		do
 		{
@@ -1949,7 +1990,7 @@ int gtmsource_readfiles(unsigned char *buff, int *data_len, int maxbufflen, bool
 			 * of no-progress. In the worst case we could be unresponsive for 8 seconds (1 heartbeat period)
 			 * with this approach.
 			 */
-			read_multiple = read_multiple && (start_heartbeat == heartbeat_counter);
+			read_multiple = read_multiple && !stop_bunching;
 			if (read_multiple)
 			{	/* Ok to read multiple transactions. Limit the multiple reads until there is no more to be read
 				 * OR total read size reaches a fixed value MAX_TR_BUFFSIZE. This strikes a fine balance between
@@ -1966,7 +2007,10 @@ int gtmsource_readfiles(unsigned char *buff, int *data_len, int maxbufflen, bool
 					GTMSOURCE_SAVE_STATE(gtmsource_state_sav);
 					read_size = read_and_merge(buff, maxbufflen, read_jnl_seqno++) + REPL_MSG_HDRLEN;
 					if (GTMSOURCE_NOW_TRANSITIONAL(gtmsource_state_sav))
-						return 0;	/* Control message triggered state change */
+					{	/* Control message triggered state change */
+						TIMEOUT_DONE(stop_bunching);
+						return 0;
+					}
 					/* Don't use buff to assign type and len as buffer may have expanded.
 					 * Use gtmsource_msgp instead */
 					((repl_msg_ptr_t)((unsigned char *)gtmsource_msgp + tot_tr_len))->type = REPL_TR_JNL_RECS;
@@ -1979,6 +2023,7 @@ int gtmsource_readfiles(unsigned char *buff, int *data_len, int maxbufflen, bool
 			}
 			break;
 		} while (TRUE);
+		TIMEOUT_DONE(stop_bunching);
 		assert(read_jnl_seqno <= max_read_seqno);
 		if ((gtmsource_local->next_histinfo_num < gtmsource_local->num_histinfo)
 			|| (gtmsource_local->num_histinfo == jnlpool.repl_inst_filehdr->num_histinfo))
diff --git a/sr_unix/gtmsource_rootprimary_init.c b/sr_unix/gtmsource_rootprimary_init.c
old mode 100755
new mode 100644
index e63b96b..4ee3b4d
--- a/sr_unix/gtmsource_rootprimary_init.c
+++ b/sr_unix/gtmsource_rootprimary_init.c
@@ -131,7 +131,7 @@ void	gtmsource_rootprimary_init(seq_num start_seqno)
 			 */
 			jbp = jpc->jnl_buff;
 			ADJUST_GBL_JREC_TIME(jgbl, jbp);
-			jnl_status = jnl_ensure_open();
+			jnl_status = jnl_ensure_open(gv_cur_region, cs_addrs);
 			if (0 == jnl_status)
 			{
 				if (EXIT_ERR == SWITCH_JNL_FILE(jpc))
diff --git a/sr_unix/gtmsource_seqno_init.c b/sr_unix/gtmsource_seqno_init.c
index 3374b20..b70a189 100755
--- a/sr_unix/gtmsource_seqno_init.c
+++ b/sr_unix/gtmsource_seqno_init.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2006, 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2006-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -91,7 +92,7 @@ void gtmsource_seqno_init(boolean_t this_side_std_null_coll)
 	}
 	if (0 == db_seqno)
 	{	/* No replicated region, or databases created with older * version of GTM */
-		gtm_putmsg(VARLSTCNT(5) ERR_NOREPLCTDREG, 3, LEN_AND_LIT("instance file"), gld_fn);
+		gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(5) ERR_NOREPLCTDREG, 3, LEN_AND_LIT("instance file"), gld_fn);
 		/* Error, has to shutdown all regions 'cos mupip needs exclusive access to turn replication on */
 		gtmsource_exit(ABNORMAL_SHUTDOWN);
 	}
@@ -105,7 +106,8 @@ void gtmsource_seqno_init(boolean_t this_side_std_null_coll)
 		if (db_seqno != replinst_seqno)
 		{	/* Journal seqno from the databases does NOT match that stored in the replication instance file header. */
 			udi = FILE_INFO(jnlpool.jnlpool_dummy_reg);
-			gtm_putmsg(VARLSTCNT(6) ERR_REPLINSTDBMATCH, 4, LEN_AND_STR(udi->fn), &replinst_seqno, &db_seqno);
+			gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_REPLINSTDBMATCH, 4, LEN_AND_STR(udi->fn), &replinst_seqno,
+				       &db_seqno);
 			gtmsource_exit(ABNORMAL_SHUTDOWN);
 		}
 		if (is_supplementary)
@@ -116,7 +118,7 @@ void gtmsource_seqno_init(boolean_t this_side_std_null_coll)
 				if (strm_inst_seqno && (strm_db_seqno[idx] != strm_inst_seqno))
 				{
 					udi = FILE_INFO(jnlpool.jnlpool_dummy_reg);
-					gtm_putmsg(VARLSTCNT(7) ERR_REPLINSTDBSTRM, 5, LEN_AND_STR(udi->fn),
+					gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(7) ERR_REPLINSTDBSTRM, 5, LEN_AND_STR(udi->fn),
 						&strm_inst_seqno, idx, &strm_db_seqno[idx]);
 					assert(FALSE);
 					gtmsource_exit(ABNORMAL_SHUTDOWN);
diff --git a/sr_unix/gtmsrc.csh b/sr_unix/gtmsrc.csh
index abba4cb..84e25f5 100755
--- a/sr_unix/gtmsrc.csh
+++ b/sr_unix/gtmsrc.csh
@@ -72,7 +72,7 @@ if (0 < $#rtns) then
 	# Strip off "$gtm_exe/plugin/o($gtm_exe/plugin/r)" if present; assumption, it's at the end
 	if ("$rtns[$rtncnt]" =~ "*/plugin/o*(*/plugin/r)") @ rtncnt--
 	# Strip off "$gtm_exe"; assumption, it's next to last or the last
-	if ("${rtns[$rtncnt]:s;/utf8;;}" == "${gtmsrc_last_exe:s;/utf8;;}") @ rtncnt--
+	if ("${rtns[$rtncnt]:s;/utf8;;:s;*;;}" == "${gtmsrc_last_exe:s;/utf8;;:s;*;;}") @ rtncnt--
 	setenv gtmroutines "$rtns[-$rtncnt]"
 	unset rtncnt
 else
diff --git a/sr_unix/gtmxc_types.h b/sr_unix/gtmxc_types.h
index 7bcbd83..e5d840c 100755
--- a/sr_unix/gtmxc_types.h
+++ b/sr_unix/gtmxc_types.h
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2014 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
diff --git a/sr_unix/gv_trigger.c b/sr_unix/gv_trigger.c
index 031e76c..022ebb6 100644
--- a/sr_unix/gv_trigger.c
+++ b/sr_unix/gv_trigger.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2010, 2014 Fidelity Information Services, Inc	*
+ * Copyright (c) 2010-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -56,6 +57,7 @@
 #include "trigger.h"		/* for MAX_TRIGNAME_LEN */
 #include "wbox_test_init.h"
 #include "have_crit.h"
+#include "gtm_trigger_trc.h"
 
 #ifdef GTM_TRIGGER
 GBLREF	boolean_t		is_dollar_incr;
@@ -129,20 +131,46 @@ LITREF	mval	literal_null;
 	memcpy(SAVE_VAR_NAME, GVT->gvname.var_name.addr, SAVE_VAR_NAME_LEN);		\
 }
 
-#define	GVTR_HASHTGBL_READ_CLEANUP(do_gvtr_cleanup)					\
-{											\
-	/* Restore gv_target, gv_currkey & gv_altkey */					\
-	gv_target = save_gvtarget;							\
-	if (do_gvtr_cleanup)								\
-		gvtr_free(gv_target);							\
-	/* check no keysize expansion occurred inside gvcst_root_search */		\
-	assert(gv_currkey->top == save_gv_currkey->top);				\
-	COPY_KEY(gv_currkey, save_gv_currkey);						\
-	/* check no keysize expansion occurred inside gvcst_root_search */		\
-	assert(gv_altkey->top == save_gv_altkey->top);					\
-	COPY_KEY(gv_altkey, save_gv_altkey);						\
-	TREF(gv_last_subsc_null) = save_gv_last_subsc_null;				\
-	TREF(gv_some_subsc_null) = save_gv_some_subsc_null;				\
+/* GVTR_HASHTGBL_READ_CLEANUP
+ * Now that ^#t has been read/referenced, make sure this gvt is added to the gvt_tp_list, even if the gvt has no
+ * triggers associated with it.
+ *
+ * Callers gvcst_put and gvcst_kill perform database operations on gvt and an accompanying tp_hist() automatically
+ * ensures that gvt is added to gvt_tp_list. However, there is a window in time between gvtr_db_read_hasht() and
+ * tp_hist() where a restart could occur. If we did not add this gvt to the gvt_tp_list, a restart would not undo this
+ * gvt's trigger related cycles (in TP_INVALIDATE_TRIGGER_CYCLES_IF_NEEDED).
+ *
+ * If the caller is op_ztrigger, it is possible only the ^#t global gvtarget gets added as part of the
+ * "gvtr_get_hasht_gblsubs" calls below and the triggering global does not get referenced anywhere else in the TP
+ * transaction. Since ZTRIGGER command does no db operations on the triggering global, it is possible gvt does not get
+ * added to the gvt_tp_list which means if a trollback/tprestart occurs we would not undo this gvt's trigger related
+ * cycles. To avoid this issue, we add this gvt to the gvt_tp_list always. The macro anyways does nothing if this gvt
+ * has already been added so we should be fine correctness and performance wise.
+ */														
+#define	GVTR_HASHTGBL_READ_CLEANUP(do_gvtr_cleanup)									\
+{															\
+	/* Restore gv_target, gv_currkey & gv_altkey */									\
+	gv_target = save_gvtarget;											\
+	/* This ADD_TO_GVT_TP_LIST could potentially happen BEFORE a gvcst_search of this gvt occurred in this		\
+	 * transaction.  This means if gvt->clue.end is non-zero, gvcst_search would not get a chance to clear the	\
+	 * first_tp_srch_status fields (which it does using the GVT_CLEAR_FIRST_TP_SRCH_STATUS macro) because		\
+	 * gvt->read_local_tn would be set to local_tn as part of the ADD_TO_GVT_TP_LIST macro invocation. We		\
+	 * therefore pass the second parameter indicating that first_tp_srch_status needs to be cleared too if		\
+	 * gvt->read_local_tn gets synced to local_tn. All other callers of ADD_TO_GVT_TP_LIST (as of this writing)	\
+	 * happen AFTER a gvcst_search of this gvt occurred in this TP transaction.  Therefore this is currently the	\
+	 * only place which uses TRUE for the second parameter.								\
+	 */														\
+	ADD_TO_GVT_TP_LIST(gv_target, RESET_FIRST_TP_SRCH_STATUS_TRUE);							\
+	if (do_gvtr_cleanup)												\
+		gvtr_free(gv_target);											\
+	/* check no keysize expansion occurred inside gvcst_root_search */						\
+	assert(gv_currkey->top == save_gv_currkey->top);								\
+	COPY_KEY(gv_currkey, save_gv_currkey);										\
+	/* check no keysize expansion occurred inside gvcst_root_search */						\
+	assert(gv_altkey->top == save_gv_altkey->top);									\
+	COPY_KEY(gv_altkey, save_gv_altkey);										\
+	TREF(gv_last_subsc_null) = save_gv_last_subsc_null;								\
+	TREF(gv_some_subsc_null) = save_gv_some_subsc_null;								\
 }
 
 #define	GVTR_POOL2BUDDYLIST(GVT_TRIGGER, DST_MSTR)									\
@@ -246,7 +274,7 @@ LITREF	mval	literal_null;
 /* This error macro is used for all definition errors where the target is ^#t(GVN,<index>,<required subscript>) */
 #define GVTR_HASHT_GVN_DEFINITION_RETRY_OR_ERROR(INDEX,SUBSCRIPT,CSA)				\
 {												\
-	if (CDB_STAGNATE > t_tries)								\
+	if (UPDATE_CAN_RETRY(t_tries, t_fail_hist[t_tries]))					\
 	{											\
 		GVTR_HASHTGBL_READ_CLEANUP(TRUE);						\
 		t_retry(cdb_sc_triggermod);							\
@@ -266,7 +294,7 @@ LITREF	mval	literal_null;
 /* This error macro is used for all definition errors where the target is ^#t(GVN,<#COUNT|#CYCLE>) */
 #define HASHT_DEFINITION_RETRY_OR_ERROR(SUBSCRIPT,MOREINFO,CSA)	\
 {								\
-	if (CDB_STAGNATE > t_tries)				\
+	if (UPDATE_CAN_RETRY(t_tries, t_fail_hist[t_tries]))	\
 	{							\
 		GVTR_HASHTGBL_READ_CLEANUP(TRUE);		\
 		t_retry(cdb_sc_triggermod);			\
@@ -735,6 +763,8 @@ void	gvtr_db_read_hasht(sgmnt_addrs *csa)
 		gvtr_free(gvt);
 		assert(NULL == gvt->gvt_trigger);
 	}
+	/* Force a cycle mismatch if a restart occurs during trigger content read */
+	gvt->db_trigger_cycle = gvt->gd_csa->db_trigger_cycle - 1;
 	gvt_trigger = (gvt_trigger_t *)malloc(SIZEOF(gvt_trigger_t));
 	gvt_trigger->gv_trigger_cycle = 0;
 	gvt_trigger->gv_trig_array = NULL;
@@ -1151,27 +1181,10 @@ void	gvtr_db_read_hasht(sgmnt_addrs *csa)
 	 * we cannot be sure of the correctness of whatever we read so we need to undo the "cycle" update.
 	 * We take care of this by setting "gvt_triggers_read_this_tn" to TRUE and use this in "tp_clean_up".
 	 * Set gvt->trig_read_tn as well so this gvt is part of the list of gvts whose cycle gets restored in tp_clean_up.
-	 * In addition, make sure this gvt is added to the gvt_tp_list. In case callers are gvcst_put or gvcst_kill, they
-	 * do database operations on gvt and an accompanying tp_hist which automatically ensures this. But in case the caller
-	 * is ZTRIGGER, it is possible only the ^#t global gvtarget gets added as part of the above "gvtr_get_hasht_gblsubs"
-	 * calls and the triggering global does not get referenced anywhere else in the TP transaction. Since ZTRIGGER command
-	 * does no db operations on the triggering global, it is possible "gvt" does not get added to the gvt_tp_list which
-	 * means if a trollback/tprestart occurs we would not undo this gvt's trigger related cycles. To avoid
-	 * this issue, we add this gvt to the gvt_tp_list always. The macro anyways does nothing if this gvt has already been
-	 * added so we should be fine correctness and performance wise.
 	 */
 	gvt_trigger->gv_trigger_cycle = cycle;
 	TREF(gvt_triggers_read_this_tn) = TRUE;
 	gvt->trig_read_tn = local_tn;
-	/* This ADD_TO_GVT_TP_LIST could potentially happen BEFORE a gvcst_search of this gvt occurred in this transaction.
-	 * This means if gvt->clue.end is non-zero, gvcst_search would not get a chance to clear the first_tp_srch_status
-	 * fields (which it does using the GVT_CLEAR_FIRST_TP_SRCH_STATUS macro) because gvt->read_local_tn would be set to
-	 * local_tn as part of the ADD_TO_GVT_TP_LIST macro invocation. We therefore pass the second parameter indicating
-	 * that first_tp_srch_status needs to be cleared too if gvt->read_local_tn gets synced to local_tn. All other callers
-	 * of ADD_TO_GVT_TP_LIST (as of this writing) happen AFTER a gvcst_search of this gvt occurred in this TP transaction.
-	 * Therefore this is currently the only place which uses TRUE for the second parameter.
-	 */
-	ADD_TO_GVT_TP_LIST(gvt, RESET_FIRST_TP_SRCH_STATUS_TRUE);
 	return;
 }
 
@@ -1338,7 +1351,7 @@ void	gvtr_init(gv_namehead *gvt, uint4 cycle, boolean_t tp_is_implicit, int err_
 	if (gvt == csa->hasht_tree)
 		return;
 	csd = csa->hdr;
-	assert((gvt->db_trigger_cycle != cycle) || (gvt->db_dztrigger_cycle < csa->db_dztrigger_cycle));
+	assert((gvt->db_trigger_cycle != cycle) || (gvt->db_dztrigger_cycle != csa->db_dztrigger_cycle));
 	root_srch_needed = FALSE;
 	/* Check if TP was in turn an implicit TP (e.g. created by the GVTR_INIT_AND_TPWRAP_IF_NEEDED macro). */
 	if (tp_is_implicit)
@@ -1443,6 +1456,8 @@ void	gvtr_init(gv_namehead *gvt, uint4 cycle, boolean_t tp_is_implicit, int err_
 	 */
 	gvt->db_trigger_cycle = cycle;
 	gvt->db_dztrigger_cycle = csa->db_dztrigger_cycle; /* No more trigger reads for this global until next $ZTRIGGER() */
+	DBGTRIGR((stderr, "gvtr_init(): GVT->db_trigger_cycle=%d ->db_dztrigger_cycle=%d\n",
+				gvt->db_trigger_cycle, gvt->db_dztrigger_cycle));
 }
 
 /* Determines matching triggers for a given gv_currkey and uses "gtm_trigger" to invokes them with appropriate parameters.
@@ -1642,16 +1657,7 @@ int	gvtr_match_n_invoke(gtm_trigger_parms *trigparms, gvtr_invoke_parms_t *gvtr_
 			{
 				DBGTRIGR((stderr, "gvtr_match_n_invoke: Inside trigger drive block\n"));
 				DEBUG_ONLY(lcl_gtm_trigger_depth = gtm_trigger_depth);
-				/* To exercise the trigger load code, for a debug build, we often load the trigger source code even
-				 * when not needed (based on whether a random bit in an address is on or not). Trigger code is only
-				 * needed when the trigger has not yet been compiled (the routine address is NULL). For a pro
-				 * build, trigger source is only loaded when needed. Usually there will be no source here unless a
-				 * given trigger is nesting unpleasantly so is still loaded from an ealier invocation on the
-				 * stack. It's not strictly illegal but probably leads to a trigger depth error later.
-				 */
-				if ((0 == trigdsc->xecute_str.str.len) && ((NULL == trigdsc->rtn_desc.rt_adr)
-									   DEBUG_ONLY(|| (0 != ((INTPTR_T)trigdsc & 0x100)))))
-
+				if (NULL == trigdsc->rtn_desc.rt_adr)
 				{	/* Trigger xecute string not compiled yet, so load it */
 					/* Read in ^#t("GBL",1,"XECUTE")="do ^XNAMEinGBL"	*/
 					DBGTRIGR((stderr, "gvtr_match_n_invoke: Fetching trigger source\n"));
@@ -1673,18 +1679,6 @@ int	gvtr_match_n_invoke(gtm_trigger_parms *trigparms, gvtr_invoke_parms_t *gvtr_
 				}
 				gtm_trig_status = gtm_trigger(trigdsc, trigparms);
 				/* note: the above call may update trigparms->ztvalue_new for SET type triggers */
-				if (NULL != trigdsc->xecute_str.str.addr)
-				{	/* Now that gtm_trigger() has compiled the xecute string, the source  can be freed
-					 * if it still allocated. Note a $TEXT() call or other source reference could have
-					 * stolen the buffer so it may no longer be here for us to free.
-					 */
-					if (0 < trigdsc->xecute_str.str.len)
-					{
-						free(trigdsc->xecute_str.str.addr);
-						trigdsc->xecute_str.str.addr = NULL;
-						trigdsc->xecute_str.str.len = 0;
-					}
-				}
 				assert(lcl_gtm_trigger_depth == gtm_trigger_depth);
 				num_triggers_invoked++;
 				ztupd_mval->mvtype = 0;	/* so stp_gcol -if invoked somehow - can free up any space
diff --git a/sr_unix/gv_trigger.h b/sr_unix/gv_trigger.h
index fdd415c..8b82767 100644
--- a/sr_unix/gv_trigger.h
+++ b/sr_unix/gv_trigger.h
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2010-2016 Fidelity National Information	*
+ * Copyright (c) 2010-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -184,6 +184,7 @@ typedef struct gvtr_invoke_parms_struct
 	LITREF	mval			literal_batch;										\
 	uint4				cycle;											\
 	boolean_t			set_upd_trans_t_err, cycle_mismatch, db_trigger_cycle_mismatch, ztrig_cycle_mismatch;	\
+	DBGTRIGR_ONLY(char 		gvnamestr[MAX_MIDENT_LEN + 1];)								\
 																\
 	assert(TPRESTART_STATE_NORMAL == tprestart_state);									\
 	assert(!skip_dbtriggers);												\
@@ -203,7 +204,10 @@ typedef struct gvtr_invoke_parms_struct
 	ztrig_cycle_mismatch = (CSA->db_dztrigger_cycle && (GVT->db_dztrigger_cycle != CSA->db_dztrigger_cycle));		\
 	db_trigger_cycle_mismatch = (GVT->db_trigger_cycle != cycle);								\
 	cycle_mismatch = (db_trigger_cycle_mismatch || ztrig_cycle_mismatch);							\
-	DBGTRIGR((stderr, "GVTR_INIT_AND_TPWRAP_IF_NEEDED: CSA->db_ztrigger_cycle=%d\n", cycle));				\
+	DBGTRIGR_ONLY(memcpy(gvnamestr, GVT->gvname.var_name.addr, GVT->gvname.var_name.len);)					\
+	DBGTRIGR_ONLY(gvnamestr[GVT->gvname.var_name.len]='\0';)								\
+	DBGTRIGR((stderr, "GVTR_INIT_AND_TPWRAP_IF_NEEDED: CSA=%s GVT=%s\n", CSA->region->rname, gvnamestr));			\
+	DBGTRIGR((stderr, "GVTR_INIT_AND_TPWRAP_IF_NEEDED: CSA->db_trigger_cycle=%d\n", cycle));				\
 	DBGTRIGR((stderr, "GVTR_INIT_AND_TPWRAP_IF_NEEDED: GVT->db_trigger_cycle=%d\n", GVT->db_trigger_cycle));		\
 	DBGTRIGR((stderr, "GVTR_INIT_AND_TPWRAP_IF_NEEDED: CSA->db_dztrigger_cycle=%d\n", CSA->db_dztrigger_cycle));		\
 	DBGTRIGR((stderr, "GVTR_INIT_AND_TPWRAP_IF_NEEDED: GVT->db_dztrigger_cycle=%d\n", GVT->db_dztrigger_cycle));		\
@@ -287,7 +291,7 @@ typedef struct gvtr_invoke_parms_struct
 				 * because of $ZTRIGGER as part of this transaction as that could cause unintended restarts.	\
 				 */												\
 				assert(!LCL_TSTART);										\
-				assert(CDB_STAGNATE > t_tries);									\
+				assert(UPDATE_CAN_RETRY(t_tries, t_fail_hist[t_tries]));					\
 				DBGTRIGR((stderr, "GVTR_INIT_AND_TPWRAP_IF_NEEDED: throwing TP restart\n"));			\
 				t_retry(cdb_sc_triggermod);									\
 			}													\
@@ -493,6 +497,7 @@ typedef struct gvtr_invoke_parms_struct
 	GBLREF	gd_region	*gv_cur_region;								\
 	GBLREF	gv_key		*gv_currkey;								\
 													\
+	assert(!IS_STATSDB_REGNAME(reg));	/* caller should have ensured this */			\
 	if (!reg->open)											\
 		gv_init_reg(reg);									\
 	gv_cur_region = reg;										\
@@ -672,7 +677,7 @@ GBLREF	int4		tstart_trigger_depth;
 /* This error macro is used for all definition errors where the target is ^#t(GVN,<index>,<required subscript>) */
 #define HASHT_GVN_DEFINITION_RETRY_OR_ERROR(INDEX,SUBSCRIPT,CSA)				\
 {												\
-	if (CDB_STAGNATE > t_tries)								\
+	if (UPDATE_CAN_RETRY(t_tries, t_fail_hist[t_tries]))					\
 		t_retry(cdb_sc_triggermod);							\
 	else											\
 	{											\
diff --git a/sr_unix/gvcst_init_sysops.c b/sr_unix/gvcst_init_sysops.c
old mode 100755
new mode 100644
index a51c2f2..f522130
--- a/sr_unix/gvcst_init_sysops.c
+++ b/sr_unix/gvcst_init_sysops.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -20,12 +20,12 @@
 #include <sys/sem.h>
 #include <sys/shm.h>
 #include <sys/time.h>
+#include "gtm_stdlib.h"
 #include "gtm_ipc.h"
 #include "gtm_un.h"
 #include "gtm_socket.h"
 #include "gtm_fcntl.h"
 #include "gtm_unistd.h"
-#include "gtm_stdio.h"
 #include "gtm_string.h"
 #include "gtm_sem.h"
 #include "gtm_statvfs.h"
@@ -68,7 +68,6 @@
 #include "is_file_identical.h"
 #include "repl_instance.h"
 
-#include "heartbeat_timer.h"
 #include "util.h"
 #include "dbfilop.h"
 #include "gvcst_protos.h"
@@ -90,22 +89,21 @@
 #endif
 #include "db_snapshot.h"
 #include "lockconst.h"	/* for LOCK_AVAILABLE */
-#ifdef GTM_TRUNCATE
 #include "recover_truncate.h"
-#endif
-
-#ifndef GTM_SNAPSHOT
-# error "Snapshot facility not supported in this platform"
-#endif
+#include "get_fs_block_size.h"
+#include "add_inter.h"
+#include "dpgbldir.h"
+#include "tp_change_reg.h"
+#include "mu_gv_cur_reg_init.h"
 
 #define REQRUNDOWN_TEXT		"semid is invalid but shmid is valid or at least one of sem_ctime or shm_ctime are non-zero"
-#define MAX_ACCESS_SEM_RETRIES	2
+#define MAX_ACCESS_SEM_RETRIES	2	/* see comment below where this macro is used for why it needs to be 2 */
 
 #define RTS_ERROR(...)		rts_error_csa(CSA_ARG(csa) __VA_ARGS__)
 #define SEND_MSG(...)		send_msg_csa(CSA_ARG(csa) __VA_ARGS__)
 
 #define SS_INFO_INIT(CSA)												\
-{															\
+MBSTART {														\
 	shm_snapshot_ptr_t	ss_shm_ptr;										\
 	node_local_ptr_t	lcl_cnl;										\
 															\
@@ -118,11 +116,11 @@
 	assert(1 == MAX_SNAPSHOTS); /* To ensure that we revisit this whenever multiple snapshots is implemented */	\
 	ss_shm_ptr = (shm_snapshot_ptr_t)(SS_GETSTARTPTR(CSA));								\
 	SS_DEFAULT_INIT_POOL(ss_shm_ptr);										\
-}
+} MBEND
 
 /* If a current value doesn't match the saved value used in the original calculation revert to the original */
 #define DSE_VERIFY_AND_RESTORE(CSA, TSD, VAR)						\
-{											\
+MBSTART {										\
 	assert(IS_DSE_IMAGE);								\
 	if (CSA->nl->saved_##VAR != TSD->VAR)						\
 	{										\
@@ -130,36 +128,36 @@
 				LEN_AND_LIT(#VAR), TSD->VAR, CSA->nl->saved_##VAR);	\
 		TSD->VAR = CSA->nl->saved_##VAR;					\
 	}										\
-}
+} MBEND
 
 #define GTM_ATTACH_CHECK_ERROR												\
-{															\
+MBSTART {														\
 	if (-1 == status_l)												\
 	{														\
 		RTS_ERROR(VARLSTCNT(9) ERR_DBFILERR, 2, DB_LEN_STR(reg),						\
 			  ERR_TEXT, 2, LEN_AND_LIT("Error attaching to database shared memory"), errno);		\
 	}														\
-}
+} MBEND
 
 #define GTM_ATTACH_SHM													\
-{															\
+MBSTART {														\
 	status_l = (sm_long_t)(csa->db_addrs[0] = (sm_uc_ptr_t)do_shmat(udi->shmid, 0, SHM_RND));			\
 	GTM_ATTACH_CHECK_ERROR;												\
 	csa->nl = (node_local_ptr_t)csa->db_addrs[0];									\
-}
+} MBEND
 
 /* These values may potentially be used by DSE to calculate various offsets into the shared memory layout.
  * Note that blk_size does not affect the offset calculation for MM. */
 #define GTM_CACHE_INTO_SHM(CSA, TSD)					\
-{									\
+MBSTART {								\
 	CSA->nl->saved_acc_meth		= TSD->acc_meth;		\
 	CSA->nl->saved_lock_space_size	= TSD->lock_space_size;		\
 	CSA->nl->saved_blk_size		= TSD->blk_size;		\
 	CSA->nl->saved_jnl_buffer_size	= TSD->jnl_buffer_size;		\
-}
+} MBEND
 
 #define GTM_ATTACH_SHM_AND_CHECK_VERS(VERMISMATCH, SHM_SETUP_OK)								\
-{																\
+MBSTART {															\
 	GTM_ATTACH_SHM;														\
 	/* The following checks for GDS_LABEL_GENERIC and  gtm_release_name ensure that the shared memory under consideration	\
 	 * is valid.  If shared memory is already initialized, do VERMISMATCH check BEFORE referencing any other fields in	\
@@ -190,20 +188,20 @@
 		} else														\
 			SHM_SETUP_OK = TRUE;											\
 	}															\
-}
+} MBEND
 
 #define GTM_VERMISMATCH_ERROR												\
-{															\
+MBSTART {														\
 	if (!vermismatch_already_printed)										\
 	{														\
 		vermismatch_already_printed = TRUE;									\
 		RTS_ERROR(VARLSTCNT(8) ERR_VERMISMATCH, 6, DB_LEN_STR(reg), gtm_release_name_len, gtm_release_name,	\
 			  LEN_AND_STR(now_running));									\
 	}														\
-}
+} MBEND
 
 #define INIT_DB_ENCRYPTION_IF_NEEDED(DO_CRYPT_INIT, INIT_STATUS, REG, CSA, TSD, CRYPT_WARNING)				\
-{															\
+MBSTART {														\
 	int	fn_len;													\
 	char	*fn;													\
 															\
@@ -225,44 +223,80 @@
 			}												\
 		}													\
 	}														\
-}
+} MBEND
 #define INIT_PROC_ENCRYPTION_IF_NEEDED(CSA, DO_CRYPT_INIT, INIT_STATUS)							\
-{															\
+MBSTART {														\
 	if (DO_CRYPT_INIT)												\
 		INIT_PROC_ENCRYPTION(CSA, INIT_STATUS);									\
-}
+} MBEND
 
-#define READ_DB_FILE_HEADER(REG, TSD)			\
-{							\
-	file_control    	*fc;			\
-							\
-	fc = REG->dyn.addr->file_cntl;			\
-	fc->file_type = REG->dyn.addr->acc_meth;	\
-	fc->op = FC_READ;				\
-	fc->op_buff = (sm_uc_ptr_t)TSD;			\
-	fc->op_pos = 1;					\
-	fc->op_len = SIZEOF(sgmnt_data);		\
-	dbfilop(fc);					\
-}
+#define READ_DB_FILE_HEADER(REG, TSD, ERR_RET)								\
+MBSTART {												\
+	file_control    	*fc;									\
+	gd_segment		*seg;									\
+	mstr			*gld_str;								\
+	unix_db_info    	*udi;									\
+	uint4			fsb_size;								\
+	gd_region		*baseDBreg;								\
+													\
+	seg = REG->dyn.addr;										\
+	fc = seg->file_cntl;										\
+	fc->op = FC_READ;										\
+	fc->op_buff = (sm_uc_ptr_t)TSD;									\
+	fc->op_pos = 1;											\
+	fc->op_len = SGMNT_HDR_LEN;									\
+	dbfilop(fc);											\
+	ERR_RET = 0;											\
+	if (IS_AIO_DBGLDMISMATCH(seg, TSD))								\
+	{	/* Copy tsd setting for asyncio into seg and retry "dbfilopn"/"db_init"			\
+		 * sequence in caller "gvcst_init" by returning with an error.				\
+		 */											\
+		COPY_AIO_SETTINGS(seg, TSD);	/* copies from TSD to seg */				\
+		ERR_RET = ERR_DBGLDMISMATCH;								\
+	}												\
+	if (IS_RDBF_STATSDB(TSD) && !IS_STATSDB_REGNAME(REG))						\
+	{	/* This is a case where the file header says it is a statsDB but the region		\
+		 * name is not lower case as it should be for a statsDB. Not supported.			\
+		 */											\
+		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_STATSDBNOTSUPP, 2, DB_LEN_STR(REG));	\
+	}												\
+	if (!IS_RDBF_STATSDB(TSD) && IS_STATSDB_REGNAME(REG))						\
+	{	/* This is a case where the file header does NOT say it is a statsDB but the region	\
+		 * name is lower case as it should be for a statsDB. This is also an illegal		\
+		 * combination so give an appropriate error.						\
+		 */											\
+		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_INVSTATSDB, 4, DB_LEN_STR(REG),		\
+		 	      REG_LEN_STR(REG));							\
+	}												\
+	if (TSD->asyncio)										\
+	{	/* AIO = ON, implies we need to use O_DIRECT.						\
+		 * Check for db vs fs blksize alignment issues.						\
+		 */											\
+		udi = FC2UDI(fc);									\
+		fsb_size = get_fs_block_size(udi->fd);							\
+		if (0 != (TSD->blk_size % fsb_size))							\
+			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_DBBLKSIZEALIGN, 4,			\
+						DB_LEN_STR(REG), TSD->blk_size, fsb_size);		\
+	}												\
+} MBEND
 
 #define READ_DB_FILE_MASTERMAP(REG, CSD)		\
-{							\
+MBSTART {						\
 	file_control    	*fc;			\
 							\
 	fc = REG->dyn.addr->file_cntl;			\
-	fc->file_type = dba_bg;				\
 	fc->op = FC_READ;				\
 	fc->op_buff = MM_ADDR(CSD);			\
 	fc->op_len = MASTER_MAP_SIZE(CSD);		\
 	fc->op_pos = MM_BLOCK;				\
 	dbfilop(fc);					\
-}
+} MBEND
 
 /* Depending on whether journaling and/or replication was enabled at the time of the crash,
  * print REQRUNDOWN, REQRECOV, or REQROLLBACK error message.
  */
 #define PRINT_CRASH_MESSAGE(CNT, ARG, ...)							\
-{												\
+MBSTART {											\
 	if (JNL_ENABLED(tsd))									\
 	{											\
 		if (REPL_ENABLED(tsd) && tsd->jnl_before_image)					\
@@ -274,16 +308,51 @@
 	} else											\
 		RTS_ERROR(VARLSTCNT(10 + CNT) ERR_REQRUNDOWN, 4, DB_LEN_STR(reg), 		\
 			LEN_AND_STR((ARG)->machine_name), __VA_ARGS__);				\
+} MBEND
+
+#define	START_SEM_TIMERS(SEM_STACKTRACE_TIME, SEM_TIMEDOUT, MAX_HRTBT_DELTA)		\
+MBSTART {										\
+	TIMEOUT_INIT(SEM_TIMEDOUT, MAX_HRTBT_DELTA * MILLISECS_IN_SEC);			\
+	TIMEOUT_INIT(SEM_STACKTRACE_TIME, MAX_HRTBT_DELTA * MILLISECS_IN_SEC / 2);	\
+} MBEND
+
+#define	CANCEL_SEM_TIMERS(SEM_STACKTRACE_TIME, SEM_TIMEDOUT)	\
+MBSTART {							\
+	TIMEOUT_DONE(SEM_STACKTRACE_TIME);			\
+	TIMEOUT_DONE(SEM_TIMEDOUT);				\
+} MBEND
+
+#define	RETURN_IF_BYPASSED(BYPASSED_FTOK, INDEFINITE_WAIT, SEM_STACKTRACE_TIME, SEM_TIMEDOUT)	\
+	RETURN_IF_ERROR(BYPASSED_FTOK, -1, INDEFINITE_WAIT, SEM_STACKTRACE_TIME, SEM_TIMEDOUT)
+
+#define	RETURN_IF_ERROR(COND, RETVAL, INDEFINITE_WAIT, SEM_STACKTRACE_TIME, SEM_TIMEDOUT)	\
+MBSTART {											\
+	if (COND)										\
+	{											\
+		if (!INDEFINITE_WAIT)								\
+			CANCEL_SEM_TIMERS(SEM_STACKTRACE_TIME, SEM_TIMEDOUT);			\
+		REVERT;										\
+		return RETVAL; /* "gvcst_init" does cleanup and retries the "db_init" call */	\
+	}											\
+} MBEND
+
+#define MU_GV_CUR_REG_FREE(TMP_REG, SAVE_REG)		\
+{							\
+	GBLREF	gd_region	*gv_cur_region;		\
+							\
+	SAVE_REG = gv_cur_region;			\
+	gv_cur_region = TMP_REG;			\
+	mu_gv_cur_reg_free();				\
+	gv_cur_region = SAVE_REG;			\
 }
 
 GBLREF	boolean_t		gtm_fullblockwrites;	/* Do full (not partial) database block writes T/F */
 GBLREF	boolean_t		is_src_server;
 GBLREF  boolean_t               mupip_jnl_recover;
-GBLREF  gd_region               *gv_cur_region;
+GBLREF	gd_region		*gv_cur_region, *db_init_region;
 GBLREF	ipcs_mesg		db_ipcs;
 GBLREF	jnlpool_addrs		jnlpool;
 GBLREF	node_local_ptr_t	locknl;
-GBLREF	uint4			heartbeat_counter;
 GBLREF	uint4			mutex_per_process_init_pid;
 GBLREF  uint4                   process_id;
 GBLREF	jnl_gbls_t		jgbl;
@@ -299,46 +368,57 @@ LITREF  int4                    gtm_release_name_len;
 OS_PAGE_SIZE_DECLARE
 
 error_def(ERR_BADDBVER);
-ZOS_ONLY(error_def(ERR_BADTAG);)
-error_def(ERR_HOSTCONFLICT);
 error_def(ERR_CRITSEMFAIL);
+error_def(ERR_DBBLKSIZEALIGN);
 error_def(ERR_DBCREINCOMP);
 error_def(ERR_DBFILERR);
 error_def(ERR_DBFLCORRP);
+error_def(ERR_DBGLDMISMATCH);
 error_def(ERR_DBIDMISMATCH);
 error_def(ERR_DBNAMEMISMATCH);
 error_def(ERR_DBNOTGDS);
 error_def(ERR_DBSHMNAMEDIFF);
+error_def(ERR_FILENOTFND);
+error_def(ERR_HOSTCONFLICT);
+error_def(ERR_INVOPNSTATSDB);
+error_def(ERR_INVSTATSDB);
 error_def(ERR_JNLBUFFREGUPD);
+error_def(ERR_MMNODYNUPGRD);
 error_def(ERR_NLMISMATCHCALC);
 error_def(ERR_NLRESTORE);
-error_def(ERR_MMNODYNUPGRD);
-error_def(ERR_PERMGENFAIL);
-error_def(ERR_REQROLLBACK);
 error_def(ERR_REQRECOV);
+error_def(ERR_REQROLLBACK);
 error_def(ERR_REQRUNDOWN);
-error_def(ERR_REGOPENRETRY);
+error_def(ERR_STATSDBNOTSUPP);
 error_def(ERR_SYSCALL);
 error_def(ERR_TEXT);
 error_def(ERR_VERMISMATCH);
 
-gd_region *dbfilopn (gd_region *reg)
+gd_region *dbfilopn(gd_region *reg)
 {
-	unix_db_info    *udi;
-	parse_blk       pblk;
-	mstr            file;
-	char            *fnptr, fbuff[MAX_FBUFF + 1];
-	struct stat     buf;
-	gd_region       *prev_reg;
-	gd_segment      *seg;
-	int             status;
-	bool            raw;
-	int		stat_res, rc, save_errno;
-	sgmnt_addrs	*csa;
-	ZOS_ONLY(int	realfiletag;)
+	unix_db_info		*tmp_udi, *udi;
+	parse_blk		pblk;
+	mstr			file;
+	char			*fnptr, fbuff[MAX_FBUFF + 1], tmpbuff[MAX_FBUFF + 1];
+	struct stat		buf;
+	gd_region		*prev_reg, *save_gv_cur_region, *tmp_reg;
+	gd_segment		*seg;
+	int			status;
+	boolean_t		raw;
+	boolean_t		open_read_only;
+	int			stat_res, rc, save_errno;
+	sgmnt_addrs		*csa;
+	sgmnt_data		tsdbuff;
+	sgmnt_data_ptr_t        tsd;
+	file_control    	*fc;
+	unsigned char		cstatus;
+	boolean_t		ftok_counter_halted;
+	ZOS_ONLY(int		realfiletag;)
+	DCL_THREADGBL_ACCESS;
 
+	SETUP_THREADGBL_ACCESS;
 	seg = reg->dyn.addr;
-	assert(seg->acc_meth == dba_bg  ||  seg->acc_meth == dba_mm);
+	assert(IS_ACC_METH_BG_OR_MM(seg->acc_meth));
 	FILE_CNTL_INIT_IF_NULL(seg);
 	udi = FILE_INFO(reg);
 	csa = &udi->s_addrs;
@@ -348,7 +428,7 @@ gd_region *dbfilopn (gd_region *reg)
 	pblk.buffer = fbuff;
 	pblk.buff_size = MAX_FBUFF;
 	pblk.fop = (F_SYNTAXO | F_PARNODE);
-	memcpy(fbuff,file.addr,file.len);
+	memcpy(fbuff, file.addr, file.len);
 	*(fbuff + file.len) = '\0';
 	if (is_raw_dev(fbuff))
 	{
@@ -362,13 +442,16 @@ gd_region *dbfilopn (gd_region *reg)
 		pblk.def1_size = SIZEOF(DEF_DBEXT) - 1;
 	}
 	status = parse_file(&file, &pblk);
+	/* When opening a reservedDB type database file, it is possible that it does not (yet) exist. In that case,
+	 * make a call out to create it.
+	 */
 	if (!(status & 1))
 	{
 		if (!IS_GTCM_GNP_SERVER_IMAGE)
 		{
 			free(seg->file_cntl->file_info);
 			free(seg->file_cntl);
-			seg->file_cntl = 0;
+			seg->file_cntl = NULL;
 		}
 		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(5) ERR_DBFILERR, 2, DB_LEN_STR(reg), status);
 	}
@@ -386,42 +469,139 @@ gd_region *dbfilopn (gd_region *reg)
 	fnptr = (char *)seg->fname + pblk.b_node;
 	udi->raw = raw;
 	udi->fn = (char *)fnptr;
-	if (!(jgbl.mur_extract && !jgbl.mur_update))
+	/* If MUPIP JOURNAL -EXTRACT, then open db in read-only mode or else we could incorrectly reset crash field
+	 * in journal file header as part of gds_rundown because we have the db open in read_write mode (GTM-8483).
+	 */
+	open_read_only = (jgbl.mur_extract && !jgbl.mur_update);
+	for ( ; ; )
 	{
-		OPENFILE_CLOEXEC(fnptr, O_RDWR, udi->fd);
-		if (!udi->grabbed_access_sem)
-		{	/* If the process already has standalone access, these fields are initialized in mu_rndwn_file */
-			udi->ftok_semid = INVALID_SEMID;
-			udi->semid = INVALID_SEMID;
-			udi->shmid = INVALID_SHMID;
-			udi->gt_sem_ctime = 0;
-			udi->gt_shm_ctime = 0;
+		if (!open_read_only)
+		{
+			OPENFILE_DB(fnptr, O_RDWR, udi, seg);
+			/* When opening an auto-create type of reservedDB database file, it is possible
+			 * that it does not (yet) exist. In that case, make a call out to create it. Note that
+			 * a statsdb (which is also an autodb) gets created in "gvcst_init" so skip that here.
+			 */
+			if ((FD_INVALID == udi->fd) && (ENOENT == errno) && IS_AUTODB_REG(reg) && !IS_STATSDB_REG(reg))
+			{	/* We want to get a lock to ensure only one process does the create. But the lock needs to be
+				 * based on an existing file ("ftok_sem_get" relies on that). So use "/" directory. That is
+				 * guaranteed to exist on any system and will serve as a sync point for ANY/ALL autodb creates.
+				 */
+				/* First check if we have enough space to do ".new" suffix addition (done a little later) */
+				if (ARRAYSIZE(seg->fname) <= seg->fname_len + STR_LIT_LEN(EXT_NEW))
+					rts_error_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_DBFILERR, 2, DB_LEN_STR(reg));
+				save_gv_cur_region = gv_cur_region;
+				mu_gv_cur_reg_init();
+				tmp_reg = gv_cur_region;
+				gv_cur_region = save_gv_cur_region;
+				tmp_reg->dyn.addr->fname[0] = '/';
+				tmp_reg->dyn.addr->fname[1] = '\0';
+				tmp_reg->dyn.addr->fname_len = 1;
+				tmp_udi = FILE_INFO(tmp_reg);
+				tmp_udi->fn = (char *)tmp_reg->dyn.addr->fname;
+				if (!ftok_sem_get(tmp_reg, FALSE, GTM_ID, FALSE, &ftok_counter_halted))
+				{
+					MU_GV_CUR_REG_FREE(tmp_reg, save_gv_cur_region);
+					rts_error_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_DBFILERR, 2, DB_LEN_STR(reg));
+				}
+				assert(!ftok_counter_halted);	/* since we specified FALSE as the 2nd parameter ("incr_cnt") */
+				/* Now that we got the ftok lock, check if the file exists. If so skip the create. */
+				OPENFILE_DB(fnptr, O_RDWR, udi, seg);
+				if ((FD_INVALID == udi->fd) && (ENOENT == errno))
+				{	/* File still does not exist. Create it. */
+					/* If autodb file name is say "tmp.dat", point region to a temporary filename
+					 * "tmp.dat_%YGTM" (suffix EXT_NEW). This is similar to the logic used in "cre_jnl_file"
+					 * with ".mjl" and ".mjl_%YGTM" files. Create database "tmp.dat_%YGTM" and initialize it.
+					 * And finally rename it to "tmp.dat". If we instead create "tmp.dat" and then fill it
+					 * with GT.M db file header content, it is possible while this is happening, other
+					 * processes see the file exist (OPENFILE_DB returns TRUE above) and proceed assuming the
+					 * file is a valid GT.M database file when actually the creation is not yet done.
+					 */
+					MEMCPY_LIT(seg->fname + seg->fname_len, EXT_NEW);
+					seg->fname_len += STR_LIT_LEN(EXT_NEW);
+					seg->fname[seg->fname_len] = '\0';
+					cstatus = gvcst_cre_autoDB(reg);
+					if (EXIT_NRM != cstatus)
+					{
+						ftok_sem_release(tmp_reg, FALSE, FALSE);
+						MU_GV_CUR_REG_FREE(tmp_reg, save_gv_cur_region);
+						save_errno = TREF(mu_cre_file_openrc);
+						rts_error_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_DBFILERR, 2, DB_LEN_STR(reg));
+					}
+					memcpy(tmpbuff, seg->fname, seg->fname_len + 1); /* + 1 to include terminating '\0' */
+					seg->fname_len -= STR_LIT_LEN(EXT_NEW);
+					seg->fname[seg->fname_len] = '\0';
+					/* Rename "tmp.dat_%YGTM" to "tmp.dat" */
+					if (-1 == RENAME(tmpbuff, (char *)seg->fname))
+					{
+						save_errno = errno;
+						ftok_sem_release(tmp_reg, FALSE, FALSE);
+						MU_GV_CUR_REG_FREE(tmp_reg, save_gv_cur_region);
+						rts_error_csa(CSA_ARG(NULL) VARLSTCNT(5) ERR_DBFILERR, 2, DB_LEN_STR(reg),
+														save_errno);
+					}
+				}
+				ftok_sem_release(tmp_reg, FALSE, FALSE);
+				MU_GV_CUR_REG_FREE(tmp_reg, save_gv_cur_region);
+				/* DB file exists now - retry the open */
+				OPENFILE_DB(fnptr, O_RDWR, udi, seg);
+			}
+			if (!udi->grabbed_access_sem)
+			{	/* If the process already has standalone access, these fields are initialized in mu_rndwn_file */
+				udi->ftok_semid = INVALID_SEMID;
+				udi->semid = INVALID_SEMID;
+				udi->shmid = INVALID_SHMID;
+				udi->gt_sem_ctime = 0;
+				udi->gt_shm_ctime = 0;
+			}
+			reg->read_only = FALSE;		/* maintain csa->read_write simultaneously */
+			csa->read_write = TRUE;		/* maintain reg->read_only simultaneously */
+			csa->orig_read_write = TRUE;
 		}
-		reg->read_only = FALSE;		/* maintain csa->read_write simultaneously */
-		csa->read_write = TRUE;	/* maintain reg->read_only simultaneously */
-	}
-	if ((jgbl.mur_extract && !jgbl.mur_update) || (FD_INVALID == udi->fd))
-	{
-		OPENFILE_CLOEXEC(fnptr, O_RDONLY, udi->fd);
-		if (FD_INVALID == udi->fd)
+		if (open_read_only || (FD_INVALID == udi->fd))
 		{
-			save_errno = errno;
-			if (!IS_GTCM_GNP_SERVER_IMAGE)
+			OPENFILE_DB(fnptr, O_RDONLY, udi, seg);
+			if (FD_INVALID == udi->fd)
 			{
-				free(seg->file_cntl->file_info);
-				free(seg->file_cntl);
-				seg->file_cntl = 0;
+				save_errno = errno;
+				if (!IS_GTCM_GNP_SERVER_IMAGE)
+				{
+					free(seg->file_cntl->file_info);
+					free(seg->file_cntl);
+					seg->file_cntl = NULL;
+				}
+				rts_error_csa(CSA_ARG(NULL) VARLSTCNT(5) ERR_DBFILERR, 2, DB_LEN_STR(reg), save_errno);
 			}
-			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(5) ERR_DBFILERR, 2, DB_LEN_STR(reg), save_errno);
+			reg->read_only = TRUE;		/* maintain csa->read_write simultaneously */
+			csa->read_write = FALSE;	/* maintain reg->read_only simultaneously */
+			csa->orig_read_write = FALSE;
 		}
-		reg->read_only = TRUE;			/* maintain csa->read_write simultaneously */
-		csa->read_write = FALSE;	/* maintain reg->read_only simultaneously */
+		if (!reg->owning_gd->is_dummy_gbldir)
+			break;
+		/* Caller created a dummy region (not a region from a gld). So determine asyncio & acc_meth setting
+		 * from db file header and copy that to segment to avoid DBGLDMISMATCH error later in "db_init".
+		 */
+		tsd = udi->fd_opened_with_o_direct ? (sgmnt_data_ptr_t)(TREF(dio_buff)).aligned : &tsdbuff;
+		/* If O_DIRECT, use aligned buffer */
+		fc = seg->file_cntl;
+		fc->op = FC_READ;
+		fc->op_buff = (sm_uc_ptr_t)tsd;
+		fc->op_pos = 1;
+		fc->op_len = SGMNT_HDR_LEN;
+		dbfilop(fc);
+		if (!IS_AIO_DBGLDMISMATCH(seg, tsd))
+			break;
+		CLOSEFILE_RESET(udi->fd, rc);	/* close file and reopen it with correct asyncio setting */
+		COPY_AIO_SETTINGS(seg, tsd);	/* copies from tsd to seg */
 	}
 #	ifdef __MVS__
 	if (-1 == gtm_zos_tag_to_policy(udi->fd, TAG_BINARY, &realfiletag))
 		TAG_POLICY_SEND_MSG(fnptr, errno, realfiletag, TAG_BINARY);
 #	endif
-	STAT_FILE(fnptr, &buf, stat_res);
+	/* Now that the file has been opened, use FSTAT on the fd instead of STAT on the file name. The latter is risky for AUTODB
+	 * since it could be concurrently deleted whereas the fd would still be accessible (delete-pending).
+	 */
+	FSTAT_FILE(udi->fd, &buf, stat_res);
         if (-1 == stat_res)
         {
         	save_errno = errno;
@@ -433,9 +613,10 @@ gd_region *dbfilopn (gd_region *reg)
 		CLOSEFILE_RESET(udi->fd, rc);	/* resets "udi->fd" to FD_INVALID */
 		free(seg->file_cntl->file_info);
 		free(seg->file_cntl);
-		seg->file_cntl = 0;
+		seg->file_cntl = NULL;
 		return prev_reg;
 	}
+	SYNC_OWNING_GD(reg);
 	return reg;
 }
 
@@ -467,17 +648,18 @@ void dbsecspc(gd_region *reg, sgmnt_data_ptr_t csd, gtm_uint64_t *sec_size)
 	return;
 }
 
-int db_init(gd_region *reg)
+int db_init(gd_region *reg, boolean_t ok_to_bypass)
 {
 	boolean_t       	is_bg, read_only, need_stacktrace, have_standalone_access;
 	boolean_t		shm_setup_ok = FALSE, vermismatch = FALSE, vermismatch_already_printed = FALSE;
 	boolean_t		new_shm_ipc, replinst_mismatch, need_shmctl, need_semctl;
-	boolean_t		gld_do_crypt_init, db_do_crypt_init;
+	boolean_t		gld_do_crypt_init, db_do_crypt_init, semop_success, statsdb_off;
 	char            	machine_name[MAX_MCNAMELEN];
 	int			gethostname_res, stat_res, user_id, group_id, perm, save_udi_semid;
-	int4            	status, dblksize, fbwsize, save_errno, wait_time, loopcnt, sem_pid;
+	int4            	status, dblksize, save_errno, wait_time, loopcnt, sem_pid;
 	sm_long_t       	status_l;
 	sgmnt_addrs     	*csa;
+	node_local_ptr_t	cnl;
 	sgmnt_data		tsdbuff;
 	sgmnt_data_ptr_t        csd, tsd;
 	struct sembuf   	sop[3];
@@ -486,28 +668,38 @@ int db_init(gd_region *reg)
 	struct semid_ds		semstat;
 	struct shmid_ds         shmstat;
 	struct statvfs		dbvfs;
-	uint4           	sopcnt, start_hrtbt_cntr;
+	uint4           	fbwsize, sopcnt;
+	uint4			max_hrtbt_delta;
+	boolean_t		sem_timedout, *sem_timedoutp = NULL,
+				sem_stacktrace_time, *sem_stacktrace_timep = NULL,
+				indefinite_wait = TRUE;
 	unix_db_info    	*udi;
 	char			now_running[MAX_REL_NAME];
-	int			init_status;
+	int			err_ret, init_status;
 	gtm_uint64_t 		sec_size, mmap_sz;
 	semwait_status_t	retstat;
+	struct perm_diag_data	pdd;
 	boolean_t		bypassed_ftok = FALSE, bypassed_access = FALSE, dummy_ftok_counter_halted,
 				ftok_counter_halted, access_counter_halted, incr_cnt;
 	int			jnl_buffer_size;
 	char			s[JNLBUFFUPDAPNDX_SIZE];	/* JNLBUFFUPDAPNDX_SIZE is defined in jnl.h */
 	char			*syscall;
 	void			*mmapaddr;
-	int			secshrstat;
+	int			ret, secshrstat;
 	boolean_t		crypt_warning;
+	gd_region		*baseDBreg;
+	sgmnt_addrs		*baseDBcsa;
+	node_local_ptr_t	baseDBnl;
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
 	ESTABLISH_NOUNWIND(dbinit_ch);
+	db_init_region = reg;	/* initialized for dbinit_ch */
 	assert(INTRPT_IN_GVCST_INIT == intrpt_ok_state); /* we better be called from gvcst_init */
-	tsd = &tsdbuff;
 	read_only = reg->read_only;
 	udi = FILE_INFO(reg);
+	tsd = udi->fd_opened_with_o_direct
+			? (sgmnt_data_ptr_t)(TREF(dio_buff)).aligned : &tsdbuff; /* If O_DIRECT, use aligned buffer */
 	memset(machine_name, 0, SIZEOF(machine_name));
 	csa = &udi->s_addrs;
 	assert(!mutex_per_process_init_pid || mutex_per_process_init_pid == process_id);
@@ -522,12 +714,20 @@ int db_init(gd_region *reg)
 	assert((NULL == csa->db_addrs[0]) && (NULL == csa->db_addrs[1]));
 	assert((NULL == csa->lock_addrs[0]) && (NULL == csa->lock_addrs[1]));
 	reg->opening = TRUE;
-	assert(0 <= udi->fd); /* database file must have been already opened by dbfilopn() done from gvcst_init() */
+	assert(0 <= udi->fd); /* database file must have been already opened by "dbfilopn" done from "gvcst_init" */
 	FSTAT_FILE(udi->fd, &stat_buf, stat_res); /* get the stats for the database file */
 	if (-1 == stat_res)
 		RTS_ERROR(VARLSTCNT(5) ERR_DBFILERR, 2, DB_LEN_STR(reg), errno);
 	/* Setup new group and permissions if indicated by the security rules. */
-	gtm_permissions(&stat_buf, &user_id, &group_id, &perm, PERM_IPC);
+	if (!gtm_permissions(&stat_buf, &user_id, &group_id, &perm, PERM_IPC, &pdd))
+	{
+		SEND_MSG(VARLSTCNT(6 + PERMGENDIAG_ARG_COUNT)
+			ERR_PERMGENFAIL, 4, RTS_ERROR_STRING("ipc resources"), RTS_ERROR_STRING(udi->fn),
+			PERMGENDIAG_ARGS(pdd));
+		RTS_ERROR(VARLSTCNT(6 + PERMGENDIAG_ARG_COUNT)
+			ERR_PERMGENFAIL, 4, RTS_ERROR_STRING("ipc resources"), RTS_ERROR_STRING(udi->fn),
+			PERMGENDIAG_ARGS(pdd));
+	}
 	/* if the process has standalone access, it will have udi->grabbed_access_sem set to TRUE at
 	 * this point. Note that down in a local variable as the udi->grabbed_access_sem will be set
 	 * to TRUE even for non-standalone access below and hence we can't rely on that later to determine if the process had
@@ -542,21 +742,31 @@ int db_init(gd_region *reg)
 		gld_do_crypt_init = (IS_ENCRYPTED(reg->dyn.addr->is_encrypted) && !IS_LKE_IMAGE);
 		assert(!TO_BE_ENCRYPTED(reg->dyn.addr->is_encrypted));
 		INIT_PROC_ENCRYPTION_IF_NEEDED(csa, gld_do_crypt_init, init_status); /* heavyweight so do it before ftok */
-		start_hrtbt_cntr = heartbeat_counter;
+		max_hrtbt_delta = TREF(dbinit_max_delta_secs);
+		indefinite_wait = (INDEFINITE_WAIT_ON_EAGAIN == max_hrtbt_delta);
+		if (!indefinite_wait)
+		{
+			START_SEM_TIMERS(sem_stacktrace_time, sem_timedout, max_hrtbt_delta);
+			sem_timedoutp = &sem_timedout;
+			sem_stacktrace_timep = &sem_stacktrace_time;
+		}
 		/* If the header is uninitalized we assume that mumps_can_bypass is TRUE. After we read the header to confirm our
-		 * assumption. If we turn out to be wrong, we error out
+		 * assumption. If we turn out to be wrong, we error out.
 		 */
-		if (!ftok_sem_get2(reg, start_hrtbt_cntr, &retstat, &bypassed_ftok, &ftok_counter_halted, TRUE))
+		bypassed_ftok = ok_to_bypass;
+		if (!ftok_sem_get2(reg, sem_stacktrace_timep, sem_timedoutp, &retstat, &bypassed_ftok, &ftok_counter_halted, TRUE))
 			ISSUE_SEMWAIT_ERROR((&retstat), reg, udi, "ftok");
+		assert(ok_to_bypass || !bypassed_ftok);
 		assert(udi->grabbed_ftok_sem || bypassed_ftok);
 		if (bypassed_ftok)
 			SEND_MSG(VARLSTCNT(4) ERR_TEXT, 2, LEN_AND_LIT("FTOK bypassed at database initialization"));
-		/* At this point we have ftok_semid semaphore based on ftok key. Any ftok conflicted region will block at this
-		 * point. For example, if a.dat and b.dat both have same ftok and process A tries to open or close a.dat and
-		 * process B tries to open or close b.dat, even though the database accesses don't conflict, the first one to
-		 * control the ftok semaphore blocks (makes wait) the other(s).
+		/* At this point we have ftok_semid semaphore based on ftok key (exception is if "bypassed_ftok" is TRUE).
+		 * Any ftok conflicted region will block at this point. For example, if a.dat and b.dat both have same ftok
+		 * and process A tries to open or close a.dat and process B tries to open or close b.dat, even though the
+		 * database accesses don't conflict, the first one to control the ftok semaphore blocks (makes wait) the other(s).
 		 */
-		READ_DB_FILE_HEADER(reg, tsd); /* file already opened by dbfilopn() done from gvcst_init() */
+		READ_DB_FILE_HEADER(reg, tsd, err_ret); /* file already opened by "dbfilopn" done from "gvcst_init" */
+		RETURN_IF_ERROR(err_ret, err_ret, indefinite_wait, sem_stacktrace_time, sem_timedout);
 		DO_BADDBVER_CHK(reg, tsd); /* need to do BADDBVER check before de-referencing shmid and semid from file header
 					    * as they could be at different offsets if the database is V4-format */
 		db_do_crypt_init = (USES_ENCRYPTION(tsd->is_encrypted) && !IS_LKE_IMAGE);
@@ -573,14 +783,19 @@ int db_init(gd_region *reg)
 				if (!bypassed_ftok && !ftok_sem_release(reg, FALSE, FALSE))
 					RTS_ERROR(VARLSTCNT(4) ERR_DBFILERR, 2, DB_LEN_STR(reg));
 				INIT_PROC_ENCRYPTION_IF_NEEDED(csa, db_do_crypt_init, init_status); /* redo initialization */
-				bypassed_ftok = FALSE;
-				start_hrtbt_cntr = heartbeat_counter; /* update to reflect time lost in encryption initialization */
+				bypassed_ftok = ok_to_bypass;
+				if (!indefinite_wait)
+				{	/* restart timer to reflect time lost in encryption initialization */
+					CANCEL_SEM_TIMERS(sem_stacktrace_time, sem_timedout);
+					START_SEM_TIMERS(sem_stacktrace_time, sem_timedout, max_hrtbt_delta);
+				}
 				/* Since this is the second call to "ftok_sem_get2", do not increment counter.
 				 * Hence FALSE as last parameter.
 				 */
-				if (!ftok_sem_get2(reg, start_hrtbt_cntr, &retstat, &bypassed_ftok,
+				if (!ftok_sem_get2(reg, sem_stacktrace_timep, sem_timedoutp, &retstat, &bypassed_ftok,
 									&dummy_ftok_counter_halted, FALSE))
 					ISSUE_SEMWAIT_ERROR((&retstat), reg, udi, "ftok");
+				assert(ok_to_bypass || !bypassed_ftok);
 				assert(!udi->counter_ftok_incremented);
 				udi->counter_ftok_incremented = !ftok_counter_halted;	/* restore to first "ftok_sem_get2" call */
 				assert(udi->grabbed_ftok_sem || bypassed_ftok);
@@ -588,7 +803,8 @@ int db_init(gd_region *reg)
 					SEND_MSG(VARLSTCNT(4) ERR_TEXT, 2,
 						 LEN_AND_LIT("bypassed at database encryption initialization"));
 				/* Re-read now possibly stale file header and redo the above based on the new header info */
-				READ_DB_FILE_HEADER(reg, tsd); /* file already opened by dbfilopn() done from gvcst_init() */
+				READ_DB_FILE_HEADER(reg, tsd, err_ret);
+				RETURN_IF_ERROR(err_ret, err_ret, indefinite_wait, sem_stacktrace_time, sem_timedout);
 				DO_BADDBVER_CHK(reg, tsd); /* need to do BADDBVER check before de-referencing shmid and semid from
 							    * file header as they could be at different offsets if the database is
 							    * V4-format
@@ -598,7 +814,8 @@ int db_init(gd_region *reg)
 			   * before is discarded
 			   */
 		}
-		INIT_DB_ENCRYPTION_IF_NEEDED(db_do_crypt_init, init_status, reg, csa, tsd, crypt_warning);
+		if (!bypassed_ftok)
+			INIT_DB_ENCRYPTION_IF_NEEDED(db_do_crypt_init, init_status, reg, csa, tsd, crypt_warning);
 		if (WBTEST_ENABLED(WBTEST_HOLD_ONTO_FTOKSEM_IN_DBINIT))
 		{
 			DBGFPF((stderr, "Holding the ftok semaphore.. Sleeping for 30 seconds\n"));
@@ -606,13 +823,28 @@ int db_init(gd_region *reg)
 			DBGFPF((stderr, "30 second sleep exhausted.. continuing with rest of db_init..\n"));
 		}
 		access_counter_halted = FALSE;
+		/* This loop is primarily to take care of the case where udi->semid is non-zero in the file header and did exist
+		 * when we read the file header but was concurrently deleted by a process holding standalone access on the database
+		 * file (that does not hold the ftok semaphore) e.g. "db_ipcs_reset". We do not expect the semaphore to be deleted
+		 * more than once because for another delete to happen, the deleting process must first open the database and
+		 * for that it needs to go through "mu_rndwn_file"/"db_init" which needs the ftok lock that we currently hold.
+		 * Note that it is possible we don't hold the ftok lock (e.g. DSE/LKE) but in that case, any errors cause us
+		 * to retry in the caller ("gvcst_init") where the final retry is always with holding the ftok lock.
+		 */
 		for (loopcnt = 0; MAX_ACCESS_SEM_RETRIES > loopcnt; loopcnt++)
 		{
 			CSD2UDI(tsd, udi); /* sets udi->semid/shmid/sem_ctime/shm_ctime from file header */
-			/* we did not create a new ipc resource */
+			/* We did not create a new ipc resource */
 			udi->sem_created = udi->shm_created = FALSE;
+			/* In the below code, use RETURN_IF_BYPASSED macro to retry the "db_init" (with "ok_to_bypass" == FALSE)
+			 * if ever we are about to issue an error or create a sem/shm, all of which should happen only when
+			 * someone has the ftok lock (i.e. have not bypassed that part above).
+			 */
 			if (INVALID_SEMID == udi->semid)
-			{	/* access control semaphore does not exist. Create one */
+			{	/* Access control semaphore does not exist. Create one. But if we have bypassed the ftok lock,
+				 * then return (sem/shm can only be created by someone with the ftok lock).
+				 */
+				RETURN_IF_BYPASSED(bypassed_ftok, indefinite_wait, sem_stacktrace_time, sem_timedout);
 				if (0 != udi->gt_sem_ctime || INVALID_SHMID != udi->shmid || 0 != udi->gt_shm_ctime)
 				{	/* We must have somthing wrong in protocol or, code, if this happens. */
 					assert(FALSE);
@@ -678,17 +910,14 @@ int db_init(gd_region *reg)
 					}
 					if (-1 == shmctl(udi->shmid, IPC_STAT, &shmstat))
 					{
-						if (bypassed_ftok)
-						{
-							gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(6) ERR_REGOPENRETRY, 4,
-								       REG_LEN_STR(reg), DB_LEN_STR(reg));
-							REVERT;
-							return -1; /* Retry calling db_init. Cleanup in gvcst_init() */
-						}
+						RETURN_IF_BYPASSED(bypassed_ftok, indefinite_wait, sem_stacktrace_time,	\
+													sem_timedout);
 						PRINT_CRASH_MESSAGE(1, tsd, ERR_TEXT, 2,
 								    LEN_AND_LIT("Error with database control shmctl"), errno);
 					} else if (shmstat.shm_ctime != tsd->gt_shm_ctime.ctime)
 					{
+						RETURN_IF_BYPASSED(bypassed_ftok, indefinite_wait, sem_stacktrace_time,	\
+													sem_timedout);
 						GTM_ATTACH_SHM_AND_CHECK_VERS(vermismatch, shm_setup_ok);
 						if (vermismatch)
 						{
@@ -702,10 +931,14 @@ int db_init(gd_region *reg)
 					semarg.buf = &semstat;
 					if (-1 == semctl(udi->semid, DB_CONTROL_SEM, IPC_STAT, semarg))
 					{	/* file header has valid semid but semaphore does not exist */
+						RETURN_IF_BYPASSED(bypassed_ftok, indefinite_wait, sem_stacktrace_time,	\
+													sem_timedout);
 						PRINT_CRASH_MESSAGE(1, tsd, ERR_TEXT, 2,
 							LEN_AND_LIT("Error with database control semaphore (IPC_STAT)"), errno);
 					} else if (semarg.buf->sem_ctime != tsd->gt_sem_ctime.ctime)
 					{
+						RETURN_IF_BYPASSED(bypassed_ftok, indefinite_wait, sem_stacktrace_time,	\
+													sem_timedout);
 						GTM_ATTACH_SHM_AND_CHECK_VERS(vermismatch, shm_setup_ok);
 						if (vermismatch)
 						{
@@ -727,6 +960,7 @@ int db_init(gd_region *reg)
 					 * In either case, try grabbing the semaphore. If not, wait (depending on the user specified
 					 * wait time). Eventually, we will either get hold of the semaphore OR will error out.
 					 */
+					RETURN_IF_BYPASSED(bypassed_ftok, indefinite_wait, sem_stacktrace_time, sem_timedout);
 					udi->shm_created = TRUE; /* Need to create shared memory */
 				}
 			}
@@ -736,33 +970,41 @@ int db_init(gd_region *reg)
 			SEMOP(udi->semid, sop, sopcnt, status, NO_WAIT);
 			if (-1 != status)
 				break;
-			else
+			save_errno = errno;
+			assert(!udi->sem_created); /* If we created the semaphore, we should be able to do the semop */
+			if ((EAGAIN == save_errno) || (ERANGE == save_errno))
 			{
-				save_errno = errno;
-				assert(!udi->sem_created); /* If we created the semaphore, we should be able to do the semop */
-				if ((EAGAIN == save_errno) || (ERANGE == save_errno))
+				if ((EAGAIN == save_errno) && (NO_SEMWAIT_ON_EAGAIN == TREF(dbinit_max_delta_secs)))
 				{
-					if ((EAGAIN == save_errno) && (NO_SEMWAIT_ON_EAGAIN == TREF(dbinit_max_hrtbt_delta)))
+					sem_pid = semctl(udi->semid, DB_CONTROL_SEM, GETPID);
+					if (-1 != sem_pid)
 					{
-						sem_pid = semctl(udi->semid, DB_CONTROL_SEM, GETPID);
-						if (-1 != sem_pid)
-						{
-							RTS_ERROR(VARLSTCNT(13) ERR_DBFILERR, 2, DB_LEN_STR(reg),
-								ERR_SEMWT2LONG, 7, process_id, 0, LEN_AND_LIT("access control"),
-									DB_LEN_STR(reg), sem_pid);
-						} else
-						{
-							save_errno = errno;
-							if (!SEM_REMOVED(save_errno))
-							{
-								RTS_ERROR(VARLSTCNT(12) ERR_CRITSEMFAIL, 2, DB_LEN_STR(reg),
-									ERR_SYSCALL, 5,	RTS_ERROR_LITERAL("semop()"), CALLFROM,
-									save_errno);
-							} /* else semaphore was removed. Fall-through */
-						}
-					} else if (!do_blocking_semop(udi->semid, gtm_access_sem, start_hrtbt_cntr,
-								      &retstat, reg, &bypassed_access, &access_counter_halted))
+						RETURN_IF_BYPASSED(bypassed_ftok, indefinite_wait, sem_stacktrace_time,	\
+													sem_timedout);
+						RTS_ERROR(VARLSTCNT(13) ERR_DBFILERR, 2, DB_LEN_STR(reg),
+							ERR_SEMWT2LONG, 7, process_id, 0, LEN_AND_LIT("access control"),
+								DB_LEN_STR(reg), sem_pid);
+					} else
+					{
+						save_errno = errno;
+						RETURN_IF_BYPASSED(bypassed_ftok, indefinite_wait, sem_stacktrace_time,	\
+													sem_timedout);
+						if (!SEM_REMOVED(save_errno))
+							RTS_ERROR(VARLSTCNT(12) ERR_CRITSEMFAIL, 2, DB_LEN_STR(reg),
+								ERR_SYSCALL, 5,	RTS_ERROR_LITERAL("semop()"), CALLFROM,
+								save_errno);
+					}
+				} else
+				{
+					bypassed_access = ok_to_bypass;
+					semop_success = do_blocking_semop(udi->semid, gtm_access_sem, sem_stacktrace_timep,
+										sem_timedoutp, &retstat, reg,
+										&bypassed_access, &access_counter_halted);
+					assert(ok_to_bypass || !bypassed_access);
+					if (!semop_success)
 					{
+						RETURN_IF_BYPASSED(bypassed_ftok, indefinite_wait, sem_stacktrace_time,	\
+													sem_timedout);
 						if (!SEM_REMOVED(retstat.save_errno))
 							ISSUE_SEMWAIT_ERROR((&retstat), reg, udi, "access control");
 						save_errno = retstat.save_errno;
@@ -775,37 +1017,36 @@ int db_init(gd_region *reg)
 						incr_cnt = (incr_cnt && !access_counter_halted);
 						break;
 					}
-				} else if (!SEM_REMOVED(save_errno))
-				{
-					RTS_ERROR(VARLSTCNT(12) ERR_CRITSEMFAIL, 2, DB_LEN_STR(reg), ERR_SYSCALL, 5,	\
-							RTS_ERROR_LITERAL("semop()"), CALLFROM, save_errno);
 				}
-				/* this is possible if a concurrent gds_rundown removed the access control semaphore (if
-				 * it was the last writer). Another possibility is if the user did an ipcrm which removed
-				 * the access control semaphore from the system. Instead of issuing an error right-away,
-				 * retry by reading the file header again. Note, it is not possible for another gds_rundown
-				 * removing the access control semaphore because any other process has to first get the
-				 * ftok lock at startup and since we hold it, they will wait for us to release the ftok.
-				 */
-				assert(SEM_REMOVED(save_errno));
-				if (1 == loopcnt)
-				{
-					RTS_ERROR(VARLSTCNT(12) ERR_CRITSEMFAIL, 2, DB_LEN_STR(reg), ERR_SYSCALL, 5,	\
+			} else if (!SEM_REMOVED(save_errno))
+			{
+				RETURN_IF_BYPASSED(bypassed_ftok, indefinite_wait, sem_stacktrace_time, sem_timedout);
+				RTS_ERROR(VARLSTCNT(12) ERR_CRITSEMFAIL, 2, DB_LEN_STR(reg), ERR_SYSCALL, 5,
 						RTS_ERROR_LITERAL("semop()"), CALLFROM, save_errno);
-				}
-				READ_DB_FILE_HEADER(reg, tsd);
 			}
+			assert(SEM_REMOVED(save_errno));
+			if ((MAX_ACCESS_SEM_RETRIES - 1) == loopcnt)
+				RTS_ERROR(VARLSTCNT(12) ERR_CRITSEMFAIL, 2, DB_LEN_STR(reg), ERR_SYSCALL, 5,
+					RTS_ERROR_LITERAL("semop()"), CALLFROM, save_errno);
+			READ_DB_FILE_HEADER(reg, tsd, err_ret);
+			RETURN_IF_ERROR(err_ret, err_ret, indefinite_wait, sem_stacktrace_time, sem_timedout);
 		}
-		assert(-1 != status || bypassed_access);
+		assert((-1 != status) || bypassed_access);
+		if (!indefinite_wait)
+			CANCEL_SEM_TIMERS(sem_stacktrace_time, sem_timedout);
 		if (!bypassed_access)
+		{
 			udi->grabbed_access_sem = TRUE;
+			/* Now that we have the access control semaphore, re-read the file header so we have uptodate information
+			 * in case some of the fields (like access method) were modified concurrently by MUPIP SET -FILE.
+			 */
+			READ_DB_FILE_HEADER(reg, tsd, err_ret);
+			RETURN_IF_ERROR(err_ret, err_ret, indefinite_wait, sem_stacktrace_time, sem_timedout);
+			UDI2CSD(udi, tsd); /* Since we read the file header again, tsd->semid/shmid and corresponding ctime fields
+					    * will not be uptodate. Refresh it with udi copies as they are more uptodate.
+					    */
+		}
 		udi->counter_acc_incremented = incr_cnt;
-		/* Now that we have the access control semaphore, re-read the file header so we have the uptodate information
-		 * in case some of the fields (like access method) were modified concurrently by MUPIP SET -FILE
-		 */
-		READ_DB_FILE_HEADER(reg, tsd);
-		UDI2CSD(udi, tsd); /* Since we read the file header again, tsd->semid/shmid and corresponding ctime fields
-				    * will not be uptodate. Refresh it with the udi copies as they are the ones used above */
 	} else
 	{	/* for have_standalone_access we were already in "mu_rndwn_file" and got "semid" semaphore. Since mu_rndwn_file
 		 * would have gotten "ftok" semaphore before acquiring the access control semaphore, no need to get the "ftok"
@@ -814,7 +1055,8 @@ int db_init(gd_region *reg)
 		incr_cnt = !read_only;
 		ftok_counter_halted = FALSE;
 		access_counter_halted = FALSE;
-		READ_DB_FILE_HEADER(reg, tsd); /* file already opened by dbfilopn() done from gvcst_init() */
+		READ_DB_FILE_HEADER(reg, tsd, err_ret); /* file already opened by "dbfilopn" done from "gvcst_init" */
+		RETURN_IF_ERROR(err_ret, err_ret, indefinite_wait, sem_stacktrace_time, sem_timedout);
 		db_do_crypt_init = (USES_ENCRYPTION(tsd->is_encrypted) && !IS_LKE_IMAGE);
 		INIT_PROC_ENCRYPTION_IF_NEEDED(csa, db_do_crypt_init, init_status);
 		INIT_DB_ENCRYPTION_IF_NEEDED(db_do_crypt_init, init_status, reg, csa, tsd, crypt_warning);
@@ -828,6 +1070,15 @@ int db_init(gd_region *reg)
 		udi->shm_created = udi->sem_created = TRUE;
 	}
 	assert(udi->grabbed_access_sem || bypassed_access);
+	if (udi->fd_opened_with_o_direct)
+	{	/* "tsd" points to dio_buff.aligned, a global variable buffer that will likely be reused by other functions
+		 * inside "db_init" (e.g. "recover_truncate" invoking "db_write_eof_block"). Point it back to tsdbuff
+		 * after copying the contents as we need access to "tsd" even after the "recover_truncate" invocation.
+		 */
+		assert(tsd == (sgmnt_data_ptr_t)(TREF(dio_buff)).aligned);
+		memcpy(&tsdbuff, (sgmnt_data_ptr_t)(TREF(dio_buff)).aligned, SGMNT_HDR_LEN);
+		tsd = &tsdbuff;
+	}
 	DO_DB_HDR_CHECK(reg, tsd); /* Basic sanity check on the file header fields */
 	if (WBTEST_ENABLED(WBTEST_HOLD_ONTO_ACCSEM_IN_DBINIT))
 	{
@@ -850,15 +1101,11 @@ int db_init(gd_region *reg)
 	 * unconditionally
 	 */
 	reg->dyn.addr->acc_meth = tsd->acc_meth;
+	COPY_AIO_SETTINGS(reg->dyn.addr, tsd);	/* copy "asyncio" from tsd to reg->dyn.addr */
 	new_shm_ipc = udi->shm_created;
 	if (new_shm_ipc)
 	{	/* Bypassers are not allowed to create shared memory so we don't end up with conflicting shared memories */
-		if (bypassed_ftok || bypassed_access)
-		{
-			gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(6) ERR_REGOPENRETRY, 4, REG_LEN_STR(reg), DB_LEN_STR(reg));
-			REVERT;
-			return -1; /* Retry calling db_init. Cleanup in gvcst_init() */
-		}
+		assert(!bypassed_ftok && !bypassed_access);
 		/* Since we are about to allocate new shared memory, if necessary, adjust the journal buffer size right now.
 		 * Note that if the process setting up shared memory is a read-only process, then we might not flush updated
 		 * jnl_buffer_size to the file header, which is fine because the value in shared memory is what all processes
@@ -946,19 +1193,21 @@ int db_init(gd_region *reg)
 	 */
 	JNL_INIT(csa, reg, tsd);
 	csa->shmpool_buffer = (shmpool_buff_hdr_ptr_t)(csa->db_addrs[0] + NODE_LOCAL_SPACE(tsd) + JNL_SHARE_SIZE(tsd));
-	/* Initialize memory for snapshot context */									\
-	csa->ss_ctx = malloc(SIZEOF(snapshot_context_t));
+	/* Initialize memory for snapshot context */
+	if (NULL == csa->ss_ctx)					/* May have been allocated if opened/closed/opened */
+		csa->ss_ctx = malloc(SIZEOF(snapshot_context_t));
 	DEFAULT_INIT_SS_CTX((SS_CTX_CAST(csa->ss_ctx)));
 	csa->lock_addrs[0] = (sm_uc_ptr_t)csa->shmpool_buffer + SHMPOOL_SECTION_SIZE;
 	csa->lock_addrs[1] = csa->lock_addrs[0] + LOCK_SPACE_SIZE(tsd) - 1;
 	csa->total_blks = tsd->trans_hist.total_blks;   		/* For test to see if file has extended */
+	cnl = csa->nl;
 	if (new_shm_ipc)
 	{
-		memset(csa->nl, 0, SIZEOF(*csa->nl));			/* We allocated shared storage -- we have to init it */
-		csa->nl->sec_size = sec_size;				/* Set the shared memory size 			     */
+		memset(cnl, 0, SIZEOF(*cnl));			/* We allocated shared storage -- we have to init it */
+		cnl->sec_size = sec_size;			/* Set the shared memory size 			     */
 		if (JNL_ALLOWED(csa))
 		{	/* initialize jb->cycle to a value different from initial value of jpc->cycle (0). although this is not
-			 * necessary right now, in the future, the plan is to change jnl_ensure_open() to only do a cycle mismatch
+			 * necessary right now, in the future, the plan is to change "jnl_ensure_open" to only do a cycle mismatch
 			 * check in order to determine whether to call jnl_file_open() or not. this is in preparation for that.
 			 */
 			csa->jnl->jnl_buff->cycle = 1;
@@ -973,13 +1222,13 @@ int db_init(gd_region *reg)
 		FSTAT_FILE(udi->fd, &stat_buf, stat_res);
 		if (-1 == stat_res)
 			RTS_ERROR(VARLSTCNT(5) ERR_DBFILERR, 2, DB_LEN_STR(reg), errno);
-		mmap_sz = stat_buf.st_size - BLK_ZERO_OFF(tsd);
+		mmap_sz = stat_buf.st_size - BLK_ZERO_OFF(tsd->start_vbn);
 		assert(0 < mmap_sz);
 		CHECK_LARGEFILE_MMAP(reg, mmap_sz); /* can issue rts_error MMFILETOOLARGE */
 #		ifdef _AIX
 		mmapaddr = shmat(udi->fd, 0, (read_only ? (SHM_MAP|SHM_RDONLY) : SHM_MAP));
 #		else
-		mmapaddr = MMAP_FD(udi->fd, mmap_sz, BLK_ZERO_OFF(tsd), read_only);
+		mmapaddr = MMAP_FD(udi->fd, mmap_sz, BLK_ZERO_OFF(tsd->start_vbn), read_only);
 #		endif
 		if (-1 == (INTPTR_T)mmapaddr)
 		{
@@ -987,7 +1236,7 @@ int db_init(gd_region *reg)
 					ERR_SYSCALL, 5, LEN_AND_STR(MEM_MAP_SYSCALL), CALLFROM, errno);
 		}
 #		ifdef _AIX
-		csa->db_addrs[0] = (sm_uc_ptr_t)((sm_uc_ptr_t)mmapaddr + BLK_ZERO_OFF(tsd));
+		csa->db_addrs[0] = (sm_uc_ptr_t)((sm_uc_ptr_t)mmapaddr + BLK_ZERO_OFF(tsd->start_vbn));
 #		else
 		csa->db_addrs[0] = mmapaddr;
 #		endif
@@ -996,11 +1245,11 @@ int db_init(gd_region *reg)
 		csd = csa->hdr = (sgmnt_data_ptr_t)((sm_uc_ptr_t)csa->lock_addrs[1] + 1);
 	}
 	/* At this point, shm_setup_ok is TRUE so we are guaranteed that vermismatch is FALSE.  Therefore, we can safely
-	 * dereference csa->nl->glob_sec_init without worrying about whether or not it could be at a different offset than
+	 * dereference cnl->glob_sec_init without worrying about whether or not it could be at a different offset than
 	 * the current version. The only exception is DSE which can continue even after the VERMISMATCH error and hence
 	 * can have shm_setup_ok set to FALSE at this point.
 	 */
-	if (shm_setup_ok && !csa->nl->glob_sec_init && !(bypassed_ftok || bypassed_access))
+	if (shm_setup_ok && !cnl->glob_sec_init && !(bypassed_ftok || bypassed_access))
 	{
 		assert(udi->shm_created);
 		assert(new_shm_ipc);
@@ -1020,32 +1269,32 @@ int db_init(gd_region *reg)
 		}
 		if (is_bg)
 		{
-			csa->nl->cache_off = -CACHE_CONTROL_SIZE(csd);
+			cnl->cache_off = -CACHE_CONTROL_SIZE(csd);
 			db_csh_ini(csa);
 			bt_malloc(csa);
 		}
 		db_csh_ref(csa, TRUE);
 		shmpool_buff_init(reg);
 		SS_INFO_INIT(csa);
-		STRNCPY_STR(csa->nl->machine_name, machine_name, MAX_MCNAMELEN);				/* machine name */
+		STRNCPY_STR(cnl->machine_name, machine_name, MAX_MCNAMELEN);				/* machine name */
 		assert(MAX_REL_NAME > gtm_release_name_len);
-		memcpy(csa->nl->now_running, gtm_release_name, gtm_release_name_len + 1);	/* GT.M release name */
-		memcpy(csa->nl->label, GDS_LABEL, GDS_LABEL_SZ - 1);				/* GDS label */
-		memcpy(csa->nl->fname, reg->dyn.addr->fname, reg->dyn.addr->fname_len);		/* database filename */
-		csa->nl->creation_date_time4 = csd->creation_time4;
-		csa->nl->highest_lbm_blk_changed = -1;
-		csa->nl->wcs_timers = -1;
-		csa->nl->nbb = BACKUP_NOT_IN_PROGRESS;
-		csa->nl->unique_id.uid = FILE_INFO(reg)->fileid;            /* save what file we initialized this storage for */
+		memcpy(cnl->now_running, gtm_release_name, gtm_release_name_len + 1);	/* GT.M release name */
+		memcpy(cnl->label, GDS_LABEL, GDS_LABEL_SZ - 1);				/* GDS label */
+		memcpy(cnl->fname, reg->dyn.addr->fname, reg->dyn.addr->fname_len);		/* database filename */
+		cnl->creation_date_time4 = csd->creation_time4;
+		cnl->highest_lbm_blk_changed = GDS_CREATE_BLK_MAX;				/* set to invalid block number */
+		cnl->wcs_timers = -1;
+		cnl->nbb = BACKUP_NOT_IN_PROGRESS;
+		cnl->unique_id.uid = FILE_INFO(reg)->fileid;            /* save what file we initialized this storage for */
 		/* save pointers in csa to access shared memory */
-		csa->nl->critical = (sm_off_t)((sm_uc_ptr_t)csa->critical - (sm_uc_ptr_t)csa->nl);
+		cnl->critical = (sm_off_t)((sm_uc_ptr_t)csa->critical - (sm_uc_ptr_t)cnl);
 		if (JNL_ALLOWED(csa))
-			csa->nl->jnl_buff = (sm_off_t)((sm_uc_ptr_t)csa->jnl->jnl_buff - (sm_uc_ptr_t)csa->nl);
-		csa->nl->shmpool_buffer = (sm_off_t)((sm_uc_ptr_t)csa->shmpool_buffer - (sm_uc_ptr_t)csa->nl);
+			cnl->jnl_buff = (sm_off_t)((sm_uc_ptr_t)csa->jnl->jnl_buff - (sm_uc_ptr_t)cnl);
+		cnl->shmpool_buffer = (sm_off_t)((sm_uc_ptr_t)csa->shmpool_buffer - (sm_uc_ptr_t)cnl);
 		if (is_bg)
 			/* Field is sm_off_t (4 bytes) so only in BG mode is this assurred to be 4 byte capable */
-			csa->nl->hdr = (sm_off_t)((sm_uc_ptr_t)csd - (sm_uc_ptr_t)csa->nl);
-		csa->nl->lock_addrs = (sm_off_t)((sm_uc_ptr_t)csa->lock_addrs[0] - (sm_uc_ptr_t)csa->nl);
+			cnl->hdr = (sm_off_t)((sm_uc_ptr_t)csd - (sm_uc_ptr_t)cnl);
+		cnl->lock_addrs = (sm_off_t)((sm_uc_ptr_t)csa->lock_addrs[0] - (sm_uc_ptr_t)cnl);
 		if (!read_only || is_bg)
 		{
 			csd->trans_hist.early_tn = csd->trans_hist.curr_tn;
@@ -1059,16 +1308,16 @@ int db_init(gd_region *reg)
 #			include "tab_db_csh_acct_rec.h"
 #			undef TAB_DB_CSH_ACCT_REC
 		}
-		csa->nl->wc_blocked = FALSE; 	/* Since we are creating shared memory, reset wc_blocked to FALSE */
+		cnl->wc_blocked = FALSE; 	/* Since we are creating shared memory, reset wc_blocked to FALSE */
 		gvstats_rec_csd2cnl(csa);	/* should be called before "db_auto_upgrade" */
 		reg->dyn.addr->ext_blk_count = csd->extension_size;
 		mlk_shr_init(csa->lock_addrs[0], csd->lock_space_size, csa, (FALSE == read_only));
 		db_auto_upgrade(reg);		/* should be called before "gtm_mutex_init" to ensure NUM_CRIT_ENTRY is nonzero */
-		DEBUG_ONLY(locknl = csa->nl;)	/* for DEBUG_ONLY LOCK_HIST macro */
+		DEBUG_ONLY(locknl = cnl;)	/* for DEBUG_ONLY LOCK_HIST macro */
 		gtm_mutex_init(reg, NUM_CRIT_ENTRY(csd), FALSE);
 		DEBUG_ONLY(locknl = NULL;)	/* restore "locknl" to default value */
 		if (read_only)
-			csa->nl->remove_shm = TRUE;	/* gds_rundown can remove shmem if first process has read-only access */
+			cnl->remove_shm = TRUE;	/* gds_rundown can remove shmem if first process has read-only access */
 		if (FALSE == csd->multi_site_open)
 		{	/* first time database is opened after upgrading to a GTM version that supports multi-site
 			 * replication
@@ -1079,34 +1328,41 @@ int db_init(gd_region *reg)
 				csd->pre_multisite_resync_seqno = csd->reg_seqno;
 			csd->multi_site_open = TRUE;
 		}
-		csa->nl->glob_sec_init = TRUE;
-		STAT_FILE((char *)csa->nl->fname, &stat_buf, stat_res);
+		cnl->glob_sec_init = TRUE;
+		STAT_FILE((char *)cnl->fname, &stat_buf, stat_res);
 		if (-1 == stat_res)
 		{
 			save_errno = errno;
 			RTS_ERROR(VARLSTCNT(5) ERR_DBFILERR, 2, DB_LEN_STR(reg), save_errno);
 		}
-		set_gdid_from_stat(&csa->nl->unique_id.uid, &stat_buf);
-#		ifdef RELEASE_LATCH_GLOBAL
-		/* On HP-UX, it is possible that mucregini/cs_data is not aligned at the same address
-		 * boundary as csd would be in shared memory. This may lead to the initialization and
-		 * usage of different elements of hp_latch_space. This may lead to the latch being
-		 * "in-use" permanently. To resolve this, shm-initialer re-initializes the global latch
-		 * to the "available" state.
-		 * Although Solaris doesn't have the same issue of alignment, we'll cover the case of
-		 * a corrupt latch (say in case of abnormal process termination).
-		 */
-		RELEASE_LATCH_GLOBAL(&csd->next_upgrd_warn.time_latch);
-#		endif
-		GTM_TRUNCATE_ONLY(recover_truncate(csa, csd, reg);)
-		csa->nl->jnlpool_shmid = INVALID_SHMID;
+		set_gdid_from_stat(&cnl->unique_id.uid, &stat_buf);
+		recover_truncate(csa, csd, reg);
+		cnl->jnlpool_shmid = INVALID_SHMID;
+		cnl->statsdb_fname_len = ARRAYSIZE(cnl->statsdb_fname);
+		/* Initialize cnl->statsdb_fname from the basedb name */
+		gvcst_set_statsdb_fname(csd, reg, cnl->statsdb_fname, &cnl->statsdb_fname_len);
+		cnl->statsdb_created = FALSE;
+		cnl->statsdb_rundown_clean = FALSE;
+		if (IS_STATSDB_REGNAME(reg))
+		{	/* Note that in case this region is a statsdb, its baseDBnl->statsdb_rundown_clean would have been set to
+			 * FALSE at baseDB "db_init" time but it is possible the statsdb has been through "gds_rundown" and we
+			 * are back in "db_init" for the same statsDB (e.g. VIEW "NOSTATSHARE" VIEW "STATSHARE" sequence). In that
+			 * case, we need to reset the flag to FALSE. Hence the code below.
+			 */
+			STATSDBREG_TO_BASEDBREG(reg, baseDBreg);
+			assert(baseDBreg->open);
+			baseDBcsa = &FILE_INFO(baseDBreg)->s_addrs;
+			baseDBnl = baseDBcsa->nl;
+			baseDBnl->statsdb_rundown_clean = FALSE;
+			assert(csd->basedb_fname_len);	/* should have been initialized for statsdb at "mucregini" time */
+		}
 	} else
 	{
-		if (STRNCMP_STR(csa->nl->machine_name, machine_name, MAX_MCNAMELEN))       /* machine names do not match */
+		if (STRNCMP_STR(cnl->machine_name, machine_name, MAX_MCNAMELEN))       /* machine names do not match */
 		{
-			if (csa->nl->machine_name[0])
+			if (cnl->machine_name[0])
 				RTS_ERROR(VARLSTCNT(8) ERR_HOSTCONFLICT, 6, LEN_AND_STR(machine_name), DB_LEN_STR(reg),
-					  LEN_AND_STR(csa->nl->machine_name));
+					  LEN_AND_STR(cnl->machine_name));
 			else
 			{
 				PRINT_CRASH_MESSAGE(0, csd, ERR_TEXT, 2,
@@ -1114,38 +1370,38 @@ int db_init(gd_region *reg)
 			}
 		}
 		/* Since nl is memset to 0 initially and then fname is copied over from gv_cur_region and since "fname" is
-		 * guaranteed to not exceed MAX_FN_LEN, we should have a terminating '\0' atleast at csa->nl->fname[MAX_FN_LEN]
+		 * guaranteed to not exceed MAX_FN_LEN, we should have a terminating '\0' at least at cnl->fname[MAX_FN_LEN]
 		 */
-		assert(csa->nl->fname[MAX_FN_LEN] == '\0');	/* Note: the first '\0' in csa->nl->fname can be much earlier */
-		/* Check whether csa->nl->fname exists. If not, then it is a serious condition. Error out. */
-		STAT_FILE((char *)csa->nl->fname, &stat_buf, stat_res);
+		assert(cnl->fname[MAX_FN_LEN] == '\0');	/* Note: the first '\0' in cnl->fname can be much earlier */
+		/* Check whether cnl->fname exists. If not, then it is a serious condition. Error out. */
+		STAT_FILE((char *)cnl->fname, &stat_buf, stat_res);
 		if (-1 == stat_res)
 		{
 			save_errno = errno;
-			SEND_MSG(VARLSTCNT(13) ERR_REQRUNDOWN, 4, DB_LEN_STR(reg), LEN_AND_STR(csa->nl->machine_name),
-				ERR_DBNAMEMISMATCH, 4, DB_LEN_STR(reg), udi->shmid, csa->nl->fname, save_errno);
-			PRINT_CRASH_MESSAGE(3, csa->nl, ERR_DBNAMEMISMATCH, 4,
-				DB_LEN_STR(reg), udi->shmid, csa->nl->fname, save_errno);
+			SEND_MSG(VARLSTCNT(13) ERR_REQRUNDOWN, 4, DB_LEN_STR(reg), LEN_AND_STR(cnl->machine_name),
+				ERR_DBNAMEMISMATCH, 4, DB_LEN_STR(reg), udi->shmid, cnl->fname, save_errno);
+			PRINT_CRASH_MESSAGE(3, cnl, ERR_DBNAMEMISMATCH, 4,
+				DB_LEN_STR(reg), udi->shmid, cnl->fname, save_errno);
 		}
-		/* Check whether csa->nl->fname and csa->nl->unique_id.uid are in sync. If not error out. */
-		if (FALSE == is_gdid_stat_identical(&csa->nl->unique_id.uid, &stat_buf))
+		/* Check whether cnl->fname and cnl->unique_id.uid are in sync. If not error out. */
+		if (FALSE == is_gdid_stat_identical(&cnl->unique_id.uid, &stat_buf))
 		{
-			SEND_MSG(VARLSTCNT(12) ERR_REQRUNDOWN, 4, DB_LEN_STR(reg), LEN_AND_STR(csa->nl->machine_name),
-				ERR_DBIDMISMATCH, 4, csa->nl->fname, DB_LEN_STR(reg), udi->shmid);
-			PRINT_CRASH_MESSAGE(2, csa->nl, ERR_DBIDMISMATCH, 4, csa->nl->fname, DB_LEN_STR(reg), udi->shmid);
+			SEND_MSG(VARLSTCNT(12) ERR_REQRUNDOWN, 4, DB_LEN_STR(reg), LEN_AND_STR(cnl->machine_name),
+				ERR_DBIDMISMATCH, 4, cnl->fname, DB_LEN_STR(reg), udi->shmid);
+			PRINT_CRASH_MESSAGE(2, cnl, ERR_DBIDMISMATCH, 4, cnl->fname, DB_LEN_STR(reg), udi->shmid);
 		}
-		/* Previously, we used to check for csa->nl->creation_date_time4 vs csd->creation_time4 and treat it as
+		/* Previously, we used to check for cnl->creation_date_time4 vs csd->creation_time4 and treat it as
 		 * an id mismatch situation as well. But later it was determined that as long as the filename and the fileid
 		 * match between the database file header and the copy in shared memory, there is no more matching that needs
 		 * to be done. It is not possible for the user to create a situation where the filename/fileid matches but
 		 * the creation time does not. The only way for this to happen is shared memory corruption in which case we
 		 * have a much bigger problem to deal with -- 2011/03/30 --- nars.
 		 */
-		if (FALSE == is_gdid_gdid_identical(&FILE_INFO(reg)->fileid, &csa->nl->unique_id.uid))
+		if (FALSE == is_gdid_gdid_identical(&FILE_INFO(reg)->fileid, &cnl->unique_id.uid))
 		{
-			SEND_MSG(VARLSTCNT(12) ERR_REQRUNDOWN, 4, DB_LEN_STR(reg), LEN_AND_STR(csa->nl->machine_name),
-				ERR_DBSHMNAMEDIFF, 4, DB_LEN_STR(reg), udi->shmid, csa->nl->fname);
-			PRINT_CRASH_MESSAGE(2, csa->nl, ERR_DBSHMNAMEDIFF, 4, DB_LEN_STR(reg), udi->shmid, csa->nl->fname);
+			SEND_MSG(VARLSTCNT(12) ERR_REQRUNDOWN, 4, DB_LEN_STR(reg), LEN_AND_STR(cnl->machine_name),
+				ERR_DBSHMNAMEDIFF, 4, DB_LEN_STR(reg), udi->shmid, cnl->fname);
+			PRINT_CRASH_MESSAGE(2, cnl, ERR_DBSHMNAMEDIFF, 4, DB_LEN_STR(reg), udi->shmid, cnl->fname);
 		}
 		/* If a regular Recover/Rollback created the shared memory and died (because of a user error or runtime error),
 		 * any process that comes up after that should NOT touch the shared memory or database. The user should reissue
@@ -1154,37 +1410,37 @@ int db_init(gd_region *reg)
 		 * mu_rndwn_file (STANDALONE) that removes the shared memory. The only case in which mu_rndwn_file does NOT remove
 		 * shared memory is if it was invoked by an Online Rollback in which case the below check should be bypassed
 		 */
-		if (csa->nl->donotflush_dbjnl && !jgbl.onlnrlbk)
+		if (cnl->donotflush_dbjnl && !jgbl.onlnrlbk)
 		{
-			PRINT_CRASH_MESSAGE(0, csa->nl, ERR_TEXT, 2,
+			PRINT_CRASH_MESSAGE(0, cnl, ERR_TEXT, 2,
 				LEN_AND_LIT("mupip recover/rollback created shared memory. Needs MUPIP RUNDOWN"));
 		}
 		/* verify pointers from our calculation vs. the copy in shared memory */
-		if (csa->nl->critical != (sm_off_t)((sm_uc_ptr_t)csa->critical - (sm_uc_ptr_t)csa->nl))
+		if (cnl->critical != (sm_off_t)((sm_uc_ptr_t)csa->critical - (sm_uc_ptr_t)cnl))
 		{
-			PRINT_CRASH_MESSAGE(2, csa->nl, ERR_NLMISMATCHCALC, 4, LEN_AND_LIT("critical"),
-					(uint4)((sm_uc_ptr_t)csa->critical - (sm_uc_ptr_t)csa->nl), (uint4)csa->nl->critical);
+			PRINT_CRASH_MESSAGE(2, cnl, ERR_NLMISMATCHCALC, 4, LEN_AND_LIT("critical"),
+					(uint4)((sm_uc_ptr_t)csa->critical - (sm_uc_ptr_t)cnl), (uint4)cnl->critical);
 		}
 		if ((JNL_ALLOWED(csa)) &&
-		    (csa->nl->jnl_buff != (sm_off_t)((sm_uc_ptr_t)csa->jnl->jnl_buff - (sm_uc_ptr_t)csa->nl)))
+		    (cnl->jnl_buff != (sm_off_t)((sm_uc_ptr_t)csa->jnl->jnl_buff - (sm_uc_ptr_t)cnl)))
 		{
-			PRINT_CRASH_MESSAGE(2, csa->nl, ERR_NLMISMATCHCALC, 4, LEN_AND_LIT("journal buffer"),
-					(uint4)((sm_uc_ptr_t)csa->jnl->jnl_buff - (sm_uc_ptr_t)csa->nl), (uint4)csa->nl->jnl_buff);
+			PRINT_CRASH_MESSAGE(2, cnl, ERR_NLMISMATCHCALC, 4, LEN_AND_LIT("journal buffer"),
+					(uint4)((sm_uc_ptr_t)csa->jnl->jnl_buff - (sm_uc_ptr_t)cnl), (uint4)cnl->jnl_buff);
 		}
-		if (csa->nl->shmpool_buffer != (sm_off_t)((sm_uc_ptr_t)csa->shmpool_buffer - (sm_uc_ptr_t)csa->nl))
+		if (cnl->shmpool_buffer != (sm_off_t)((sm_uc_ptr_t)csa->shmpool_buffer - (sm_uc_ptr_t)cnl))
 		{
-			PRINT_CRASH_MESSAGE(2, csa->nl, ERR_NLMISMATCHCALC, 4, LEN_AND_LIT("backup buffer"),
-				  (uint4)((sm_uc_ptr_t)csa->shmpool_buffer - (sm_uc_ptr_t)csa->nl), (uint4)csa->nl->shmpool_buffer);
+			PRINT_CRASH_MESSAGE(2, cnl, ERR_NLMISMATCHCALC, 4, LEN_AND_LIT("backup buffer"),
+				  (uint4)((sm_uc_ptr_t)csa->shmpool_buffer - (sm_uc_ptr_t)cnl), (uint4)cnl->shmpool_buffer);
 		}
-		if ((is_bg) && (csa->nl->hdr != (sm_off_t)((sm_uc_ptr_t)csd - (sm_uc_ptr_t)csa->nl)))
+		if ((is_bg) && (cnl->hdr != (sm_off_t)((sm_uc_ptr_t)csd - (sm_uc_ptr_t)cnl)))
 		{
-			PRINT_CRASH_MESSAGE(2, csa->nl, ERR_NLMISMATCHCALC, 4, LEN_AND_LIT("file header"),
-					(uint4)((sm_uc_ptr_t)csd - (sm_uc_ptr_t)csa->nl), (uint4)csa->nl->hdr);
+			PRINT_CRASH_MESSAGE(2, cnl, ERR_NLMISMATCHCALC, 4, LEN_AND_LIT("file header"),
+					(uint4)((sm_uc_ptr_t)csd - (sm_uc_ptr_t)cnl), (uint4)cnl->hdr);
 		}
-		if (csa->nl->lock_addrs != (sm_off_t)((sm_uc_ptr_t)csa->lock_addrs[0] - (sm_uc_ptr_t)csa->nl))
+		if (cnl->lock_addrs != (sm_off_t)((sm_uc_ptr_t)csa->lock_addrs[0] - (sm_uc_ptr_t)cnl))
 		{
-			PRINT_CRASH_MESSAGE(2, csa->nl, ERR_NLMISMATCHCALC, 4, LEN_AND_LIT("lock address"),
-				  (uint4)((sm_uc_ptr_t)csa->lock_addrs[0] - (sm_uc_ptr_t)csa->nl), (uint4)csa->nl->lock_addrs);
+			PRINT_CRASH_MESSAGE(2, cnl, ERR_NLMISMATCHCALC, 4, LEN_AND_LIT("lock address"),
+				  (uint4)((sm_uc_ptr_t)csa->lock_addrs[0] - (sm_uc_ptr_t)cnl), (uint4)cnl->lock_addrs);
 		}
 		assert(!udi->shm_created);
 		if (is_bg)
@@ -1202,33 +1458,33 @@ int db_init(gd_region *reg)
 	if ((REPL_ALLOWED(csd) && is_src_server) || (pool_init && udi->shm_created))
 	{
 		assert(NULL != jnlpool.repl_inst_filehdr);
-		/* Note: csa->nl->replinstfilename is changed under control of the init/rundown semaphore only. */
+		/* Note: cnl->replinstfilename is changed under control of the init/rundown semaphore only. */
 		assert('\0' != jnlpool.jnlpool_ctl->jnlpool_id.instfilename[0]);
 		replinst_mismatch = FALSE;
-		if ('\0' == csa->nl->replinstfilename[0])
-			STRCPY(csa->nl->replinstfilename, jnlpool.jnlpool_ctl->jnlpool_id.instfilename);
-		else if (STRCMP(csa->nl->replinstfilename, jnlpool.jnlpool_ctl->jnlpool_id.instfilename))
+		if ('\0' == cnl->replinstfilename[0])
+			STRCPY(cnl->replinstfilename, jnlpool.jnlpool_ctl->jnlpool_id.instfilename);
+		else if (STRCMP(cnl->replinstfilename, jnlpool.jnlpool_ctl->jnlpool_id.instfilename))
 		{
 			assert(!(pool_init && udi->shm_created));
 			replinst_mismatch = TRUE;
 		}
-		/* Note: csa->nl->jnlpool_shmid is changed under control of the init/rundown semaphore only. */
+		/* Note: cnl->jnlpool_shmid is changed under control of the init/rundown semaphore only. */
 		assert(INVALID_SHMID != jnlpool.repl_inst_filehdr->jnlpool_shmid);
-		if (INVALID_SHMID == csa->nl->jnlpool_shmid)
-			csa->nl->jnlpool_shmid = jnlpool.repl_inst_filehdr->jnlpool_shmid;
-		else if (csa->nl->jnlpool_shmid != jnlpool.repl_inst_filehdr->jnlpool_shmid)
+		if (INVALID_SHMID == cnl->jnlpool_shmid)
+			cnl->jnlpool_shmid = jnlpool.repl_inst_filehdr->jnlpool_shmid;
+		else if (cnl->jnlpool_shmid != jnlpool.repl_inst_filehdr->jnlpool_shmid)
 		{	/* shmid mismatch. Check if the shmid noted down in db filehdr is out-of-date.
 			 * Possible if the jnlpool has since been deleted. If so, note the new one down.
 			 * If not, then issue an error.
 			 */
 			assert(!(pool_init && udi->shm_created));
-			if (-1 == shmctl(csa->nl->jnlpool_shmid, IPC_STAT, &shmstat))
+			if (-1 == shmctl(cnl->jnlpool_shmid, IPC_STAT, &shmstat))
 			{
 				save_errno = errno;
 				if (SHM_REMOVED(save_errno))
 				{
 					replinst_mismatch = FALSE;
-					csa->nl->jnlpool_shmid = jnlpool.repl_inst_filehdr->jnlpool_shmid;
+					cnl->jnlpool_shmid = jnlpool.repl_inst_filehdr->jnlpool_shmid;
 				} else
 					replinst_mismatch = TRUE;
 			} else
@@ -1238,31 +1494,32 @@ int db_init(gd_region *reg)
 		if (replinst_mismatch)
 		{
 			assert(!(pool_init && udi->shm_created));
-			if (INVALID_SHMID == csa->nl->jnlpool_shmid)
+			if (INVALID_SHMID == cnl->jnlpool_shmid)
 				RTS_ERROR(VARLSTCNT(4) ERR_REPLINSTNOSHM, 2, DB_LEN_STR(reg));
 			else
 				RTS_ERROR(VARLSTCNT(10) ERR_REPLINSTMISMTCH, 8,
 					  LEN_AND_STR(jnlpool.jnlpool_ctl->jnlpool_id.instfilename),
 					  jnlpool.repl_inst_filehdr->jnlpool_shmid, DB_LEN_STR(reg),
-					  LEN_AND_STR(csa->nl->replinstfilename), csa->nl->jnlpool_shmid);
+					  LEN_AND_STR(cnl->replinstfilename), cnl->jnlpool_shmid);
 		}
 	}
-	csa->root_search_cycle = csa->nl->root_search_cycle;
-	csa->onln_rlbk_cycle = csa->nl->onln_rlbk_cycle;	/* take local copy of the current Online Rollback cycle */
-	csa->db_onln_rlbkd_cycle = csa->nl->db_onln_rlbkd_cycle; /* take local copy of the current Online Rollback mod cycle */
-	INITIALIZE_CSA_ENCR_PTR(csa, csd, udi, db_do_crypt_init, crypt_warning);	/* sets csa->encr_ptr */
+	csa->root_search_cycle = cnl->root_search_cycle;
+	csa->onln_rlbk_cycle = cnl->onln_rlbk_cycle;	/* take local copy of the current Online Rollback cycle */
+	csa->db_onln_rlbkd_cycle = cnl->db_onln_rlbkd_cycle; /* take local copy of the current Online Rollback mod cycle */
+	SYNC_RESERVEDDBFLAGS_REG_CSA_CSD(reg, csa, csd, cnl);
+	INITIALIZE_CSA_ENCR_PTR(csa, csd, udi, db_do_crypt_init, crypt_warning, bypassed_ftok);	/* sets csa->encr_ptr */
 	/* Record ftok information as soon as shared memory set up is done */
 	if (!have_standalone_access && !bypassed_ftok)
 		FTOK_TRACE(csa, csd->trans_hist.curr_tn, ftok_ops_lock, process_id);
 	assert(!incr_cnt || !read_only);
 	if (incr_cnt)
 	{
-		if (!csa->nl->first_writer_seen)
+		if (!cnl->first_writer_seen)
 		{
-			csa->nl->first_writer_seen = TRUE;
-			csa->nl->remove_shm = FALSE;
+			cnl->first_writer_seen = TRUE;
+			cnl->remove_shm = FALSE;
 		}
-		if (!csa->nl->first_nonbypas_writer_seen && !bypassed_ftok && !bypassed_access)
+		if (!cnl->first_nonbypas_writer_seen && !bypassed_ftok && !bypassed_access && !FROZEN_CHILLED(csd))
 		{	/* For read-write process flush file header to write machine_name,
 			 * semaphore, shared memory id and semaphore creation time to disk.
 			 * Note: If first process to open db was read-only, then sem/shm info would have already been flushed
@@ -1272,13 +1529,13 @@ int db_init(gd_region *reg)
 			 * until the first non-bypassing-writer process attaches since those bypassing processes would be
 			 * DSE/LKE only.
 			 */
-			csa->nl->first_nonbypas_writer_seen = TRUE;
+			cnl->first_nonbypas_writer_seen = TRUE;
 			STRNCPY_STR(csd->machine_name, machine_name, MAX_MCNAMELEN);
 			assert(csd->shmid == tsd->shmid); /* csd already has uptodate sem/shm info from the UDI2CSD call above */
 			assert(csd->semid == tsd->semid);
 			assert(!memcmp(&csd->gt_sem_ctime, &tsd->gt_sem_ctime, SIZEOF(tsd->gt_sem_ctime)));
 			assert(!memcmp(&csd->gt_shm_ctime, &tsd->gt_shm_ctime, SIZEOF(tsd->gt_shm_ctime)));
-			DB_LSEEKWRITE(csa, udi->fn, udi->fd, (off_t)0, (sm_uc_ptr_t)csd, SIZEOF(sgmnt_data), save_errno);
+			DB_LSEEKWRITE(csa, udi, udi->fn, udi->fd, (off_t)0, (sm_uc_ptr_t)csd, SGMNT_HDR_LEN, save_errno);
 			if (0 != save_errno)
 			{
 				RTS_ERROR(VARLSTCNT(9) ERR_DBFILERR, 2, DB_LEN_STR(reg),
@@ -1289,6 +1546,7 @@ int db_init(gd_region *reg)
 	{	/* For read-only process if shared memory and semaphore created for first time,
 		 * semaphore and shared memory id, and semaphore creation time are written to disk.
 		 */
+		db_ipcs.open_fd_with_o_direct = udi->fd_opened_with_o_direct;
 		db_ipcs.semid = tsd->semid;	/* use tsd instead of csd in order for MM to work too */
 		db_ipcs.shmid = tsd->shmid;
 		db_ipcs.gt_sem_ctime = tsd->gt_sem_ctime.ctime;
@@ -1311,20 +1569,20 @@ int db_init(gd_region *reg)
 			SET_SEMWAIT_FAILURE_RETSTAT(&retstat, ERANGE, op_semctl_or_semop, 0, ERR_CRITSEMFAIL, 0);
 			ISSUE_SEMWAIT_ERROR((&retstat), reg, udi, (ftok_counter_halted ? "ftok" : "access control"));
 		}
-		if (ftok_counter_halted && !csa->nl->ftok_counter_halted)
+		if (ftok_counter_halted && !cnl->ftok_counter_halted)
 		{
-			csa->nl->ftok_counter_halted = TRUE;
+			cnl->ftok_counter_halted = TRUE;
 			send_msg_csa(CSA_ARG(csa) VARLSTCNT(7) ERR_NOMORESEMCNT, 5,
 								LEN_AND_LIT("ftok"), FILE_TYPE_DB, DB_LEN_STR(reg));
 		}
-		if (access_counter_halted && !csa->nl->access_counter_halted)
+		if (access_counter_halted && !cnl->access_counter_halted)
 		{
-			csa->nl->access_counter_halted = TRUE;
+			cnl->access_counter_halted = TRUE;
 			send_msg_csa(CSA_ARG(csa) VARLSTCNT(7) ERR_NOMORESEMCNT, 5,
 								LEN_AND_LIT("access"), FILE_TYPE_DB, DB_LEN_STR(reg));
 		}
 	}
-	if (udi->counter_acc_incremented && csa->nl->access_counter_halted)
+	if (udi->counter_acc_incremented && cnl->access_counter_halted)
 	{	/* Shared access counter had overflown a while back but is not right now. Undo the counter bump that we
 		 * did as otherwise we will later have problems (for example if this is a MUPIP SET -JOURNAL command that
 		 * needs standalone access and does a "gds_rundown" followed by a "mu_rndwn_file" later. The "mu_rndwn_file"
@@ -1335,7 +1593,7 @@ int db_init(gd_region *reg)
 		udi->counter_acc_incremented = FALSE;
 		assert(-1 != status);	/* since we hold the access control lock, we do not expect any errors */
 	}
-	if (udi->counter_ftok_incremented && csa->nl->ftok_counter_halted)
+	if (udi->counter_ftok_incremented && cnl->ftok_counter_halted)
 	{	/* Do similar cleanup for ftok like we did for access semaphore above */
 		SET_SOP_ARRAY_FOR_DECR_CNT(sop, sopcnt, (SEM_UNDO | IPC_NOWAIT));
 		SEMOP(udi->ftok_semid, sop, sopcnt, status, NO_WAIT);
@@ -1357,31 +1615,27 @@ int db_init(gd_region *reg)
 		 * The saved length (if the feature is enabled) will be the filesystem blocksize and will be the
 		 * length that a database IO is rounded up to prior to initiation of the IO.
 		 */
-		FSTATVFS_FILE(udi->fd, &dbvfs, status);
-		if (-1 != status)
-		{
-			dblksize = csd->blk_size;
-			fbwsize = (int4)dbvfs.f_bsize;
-			if (0 != fbwsize && (0 == dblksize % fbwsize) && (0 == ((csd->start_vbn - 1) * DISK_BLOCK_SIZE) % fbwsize))
-				csa->do_fullblockwrites = TRUE;		/* This region is fullblockwrite enabled */
-			/* Report this length in DSE even if not enabled */
-			csa->fullblockwrite_len = fbwsize;		/* Length for rounding fullblockwrite */
-		} else
-		{
-			save_errno = errno;
-			SEND_MSG(VARLSTCNT(8) ERR_SYSCALL, 5, LEN_AND_LIT("fstatvfs"), CALLFROM, save_errno);
-		}
+		fbwsize = get_fs_block_size(udi->fd);
+		dblksize = csd->blk_size;
+		if (0 != fbwsize && (0 == dblksize % fbwsize) && (0 == (BLK_ZERO_OFF(csd->start_vbn)) % fbwsize))
+			csa->do_fullblockwrites = TRUE;		/* This region is fullblockwrite enabled */
+		/* Report this length in DSE even if not enabled */
+		csa->fullblockwrite_len = fbwsize;		/* Length for rounding fullblockwrite */
 	}
-	++csa->nl->ref_cnt;	/* This value is changed under control of the init/rundown semaphore only */
+	/* Note that the below value is normally incremented/decremented under control of the init/rundown semaphore in
+	 * "db_init" and "gds_rundown" but if QDBRUNDOWN is turned ON it could be manipulated without the semaphore in
+	 * both callers. Therefore use interlocked INCR_CNT/DECR_CNT.
+	 */
+	INCR_CNT(&cnl->ref_cnt, &cnl->wc_var_lock);
 	assert(!csa->ref_cnt);	/* Increment shared ref_cnt before private ref_cnt increment. */
 	csa->ref_cnt++;		/* Currently journaling logic in gds_rundown() in VMS relies on this order to detect last writer */
 	if (WBTEST_ENABLED(WBTEST_HOLD_SEM_BYPASS) && !IS_GTM_IMAGE)
 	{
-		if (0 == csa->nl->wbox_test_seq_num)
+		if (0 == cnl->wbox_test_seq_num)
 		{
-			csa->nl->wbox_test_seq_num = 1;
+			cnl->wbox_test_seq_num = 1;
 			DBGFPF((stderr, "Holding semaphores...\n"));
-			while (1 == csa->nl->wbox_test_seq_num)
+			while (1 == cnl->wbox_test_seq_num)
 				LONG_SLEEP(1);
 		}
 	}
@@ -1396,11 +1650,11 @@ int db_init(gd_region *reg)
 		}
 		udi->grabbed_access_sem = FALSE;
 	}
-	if (WBTEST_ENABLED(WBTEST_SEMTOOLONG_STACK_TRACE) && (1 == csa->nl->wbox_test_seq_num))
+	if (WBTEST_ENABLED(WBTEST_SEMTOOLONG_STACK_TRACE) && (1 == cnl->wbox_test_seq_num))
 	{
-		csa->nl->wbox_test_seq_num = 2;
+		cnl->wbox_test_seq_num = 2;
 		/* Wait till the other process has got some stack traces */
-		while (csa->nl->wbox_test_seq_num != 3)
+		while (cnl->wbox_test_seq_num != 3)
 			LONG_SLEEP(1);
 	}
 	/* In case of REORG -ENCRYPT the ftok will be released after it has incremented cnl->reorg_encrypt_cycle. */
@@ -1411,6 +1665,14 @@ int db_init(gd_region *reg)
 		FTOK_TRACE(csa, csd->trans_hist.curr_tn, ftok_ops_release, process_id);
 		udi->grabbed_ftok_sem = FALSE;
 	}
+	if (udi->fd_opened_with_o_direct)
+	{	/* When we opened the database file we allocated an aligned buffer to hold SGMNT_HDR_LEN bytes.
+		 * Now that we have read the db file header (as part of READ_DB_FILE_HEADER above) check if the
+		 * database block size is bigger than SGMNT_HDR_LEN. If so, allocate more aligned space in the
+		 * global variable "dio_buff" as that will be later used to write either the file header or a GDS block.
+		 */
+		DIO_BUFF_EXPAND_IF_NEEDED(udi, csd->blk_size, &(TREF(dio_buff)));
+	}
 	REVERT;
 	return 0;
 }
diff --git a/sr_unix/gvcst_spr_data.c b/sr_unix/gvcst_spr_data.c
index 5cd430c..406c199 100644
--- a/sr_unix/gvcst_spr_data.c
+++ b/sr_unix/gvcst_spr_data.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -11,6 +12,9 @@
 
 #include "mdef.h"
 
+#include "gtm_stdio.h"
+
+#include "gtmio.h"
 #include "gdsroot.h"
 #include "gtm_facility.h"
 #include "fileinfo.h"
@@ -24,7 +28,7 @@
 #include "hashtab_int4.h"	/* needed for tp.h */
 #include "tp.h"			/* needed for T_BEGIN_READ_NONTP_OR_TP macro */
 #include "error.h"
-
+#include "io.h"
 #include "gvcst_protos.h"
 #include "change_reg.h"
 #include "op.h"
@@ -108,6 +112,7 @@ mint	gvcst_spr_data(void)
 	assert(gvnh_reg == TREF(gd_targ_gvnh_reg));
 	for ( ; map <= end_map; map++)
 	{
+		ASSERT_BASEREG_OPEN_IF_STATSREG(map);	/* "gv_srch_map_linear" call above should have ensured that */
 		reg = map->reg.addr;
 		GET_REG_INDEX(addr, gd_reg_start, reg, reg_index);	/* sets "reg_index" */
 		assert((map != start_map) || (tn_array[reg_index] != gd_targ_tn));
diff --git a/sr_unix/gvcst_spr_kill.c b/sr_unix/gvcst_spr_kill.c
index 8cee2d5..1356393 100644
--- a/sr_unix/gvcst_spr_kill.c
+++ b/sr_unix/gvcst_spr_kill.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -11,6 +12,9 @@
 
 #include "mdef.h"
 
+#include "gtm_stdio.h"
+
+#include "gtmio.h"
 #include "gdsroot.h"
 #include "gtm_facility.h"
 #include "fileinfo.h"
@@ -27,7 +31,7 @@
 #include <rtnhdr.h>
 #include "gv_trigger.h"		/* for IS_EXPLICIT_UPDATE_NOASSERT macro used by IS_OK_TO_INVOKE_GVCST_KILL macro */
 #endif
-
+#include "io.h"
 #include "gvcst_protos.h"
 #include "change_reg.h"
 #include "op.h"
@@ -113,6 +117,7 @@ void	gvcst_spr_kill(void)
 	assert(gvnh_reg == TREF(gd_targ_gvnh_reg));
 	for ( ; map <= end_map; map++)
 	{
+		ASSERT_BASEREG_OPEN_IF_STATSREG(map);	/* "gv_srch_map_linear" call above should have ensured that */
 		reg = map->reg.addr;
 		GET_REG_INDEX(addr, gd_reg_start, reg, reg_index);	/* sets "reg_index" */
 		assert((map != start_map) || (tn_array[reg_index] != gd_targ_tn));
diff --git a/sr_unix/gvcst_spr_order.c b/sr_unix/gvcst_spr_order.c
index 8680547..3fc7333 100644
--- a/sr_unix/gvcst_spr_order.c
+++ b/sr_unix/gvcst_spr_order.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -11,6 +12,9 @@
 
 #include "mdef.h"
 
+#include "gtm_stdio.h"
+
+#include "gtmio.h"
 #include "gdsroot.h"
 #include "gtm_facility.h"
 #include "fileinfo.h"
@@ -23,7 +27,7 @@
 #include "buddy_list.h"		/* needed for tp.h */
 #include "hashtab_int4.h"	/* needed for tp.h */
 #include "tp.h"			/* needed for T_BEGIN_READ_NONTP_OR_TP macro */
-
+#include "io.h"
 #include "gvcst_protos.h"
 #include "change_reg.h"
 #include "op.h"
@@ -141,6 +145,7 @@ boolean_t	gvcst_spr_order(void)
 		 * Note down the smallest key found across the scanned regions until we find a key that belongs to the
 		 * same map (in the gld) as the currently scanned "map". At which point, the region-spanning order is done.
 		 */
+		ASSERT_BASEREG_OPEN_IF_STATSREG(map);	/* "gv_srch_map_linear" call above should have ensured that */
 		reg = map->reg.addr;
 		GET_REG_INDEX(addr, gd_reg_start, reg, reg_index);	/* sets "reg_index" */
 		assert((map != first_map) || (tn_array[reg_index] != gd_targ_tn));
diff --git a/sr_unix/gvcst_spr_query.c b/sr_unix/gvcst_spr_query.c
index e377fa0..66a4063 100644
--- a/sr_unix/gvcst_spr_query.c
+++ b/sr_unix/gvcst_spr_query.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -11,6 +12,9 @@
 
 #include "mdef.h"
 
+#include "gtm_stdio.h"
+
+#include "gtmio.h"
 #include "gdsroot.h"
 #include "gtm_facility.h"
 #include "fileinfo.h"
@@ -23,7 +27,7 @@
 #include "buddy_list.h"		/* needed for tp.h */
 #include "hashtab_int4.h"	/* needed for tp.h */
 #include "tp.h"			/* needed for T_BEGIN_READ_NONTP_OR_TP macro */
-
+#include "io.h"
 #include "gvcst_protos.h"
 #include "change_reg.h"
 #include "op.h"
@@ -49,7 +53,7 @@ boolean_t	gvcst_spr_query(void)
 	boolean_t	est_first_pass;
 	boolean_t	found, cumul_found;
 	int		reg_index;
-	gd_binding	*start_map, *end_map, *map, *prev_end_map;
+	gd_binding	*start_map, *end_map, *map, *prev_end_map, *stop_map;
 	gd_region	*reg, *gd_reg_start;
 	gd_addr		*addr;
 	gv_namehead	*start_map_gvt;
@@ -74,8 +78,15 @@ boolean_t	gvcst_spr_query(void)
 	assert(NULL != gvnh_reg);
 	assert(NULL != gvnh_reg->gvspan);
 	/* Now that we know the keyrange maps to more than one region, go through each of them and do the $query
-	 * Since multiple regions are potentially involved, need a TP fence.
+	 * Since multiple regions are potentially involved, need a TP fence. But before that, open any statsDBs pointed
+	 * to by map entries from "start_map" to "stop_map" (as their open will be deferred once we go into TP). Not
+	 * opening them before the TP can produce incomplete results from the $query operation.
 	 */
+	assert(0 < gvnh_reg->gvspan->end_map_index);
+	assert(gvnh_reg->gvspan->end_map_index < addr->n_maps);
+	stop_map = &addr->maps[gvnh_reg->gvspan->end_map_index];
+	for (map = start_map; map <= stop_map; map++)
+		OPEN_BASEREG_IF_STATSREG(map);
 	DEBUG_ONLY(save_dollar_tlevel = dollar_tlevel);
 	if (!dollar_tlevel)
 	{
@@ -93,9 +104,7 @@ boolean_t	gvcst_spr_query(void)
 	cumul_key_len = 0;
 	DEBUG_ONLY(cumul_key[cumul_key_len] = KEY_DELIMITER;)
 	INCREMENT_GD_TARG_TN(gd_targ_tn); /* takes a copy of incremented "TREF(gd_targ_tn)" into local variable "gd_targ_tn" */
-	assert(0 < gvnh_reg->gvspan->end_map_index);
-	assert(gvnh_reg->gvspan->end_map_index < addr->n_maps);
-	end_map = &addr->maps[gvnh_reg->gvspan->end_map_index];
+	end_map = stop_map;
 	/* Verify that initializations that happened before op_tstart are still unchanged */
 	assert(addr == TREF(gd_targ_addr));
 	assert(tn_array == TREF(gd_targ_reg_array));
@@ -105,6 +114,7 @@ boolean_t	gvcst_spr_query(void)
 		 * Note down the smallest key found across the scanned regions until we find a key that belongs to the
 		 * same map (in the gld) as the currently scanned "map". At which point, the region-spanning query is done.
 		 */
+		ASSERT_BASEREG_OPEN_IF_STATSREG(map);	/* "OPEN_BASEREG_IF_STATSREG" call above should have ensured that */
 		reg = map->reg.addr;
 		GET_REG_INDEX(addr, gd_reg_start, reg, reg_index);	/* sets "reg_index" */
 		assert((map != start_map) || (tn_array[reg_index] != gd_targ_tn));
diff --git a/sr_unix/gvcst_spr_queryget.c b/sr_unix/gvcst_spr_queryget.c
index eb97352..b0f16cb 100644
--- a/sr_unix/gvcst_spr_queryget.c
+++ b/sr_unix/gvcst_spr_queryget.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information 	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -12,6 +12,9 @@
 
 #include "mdef.h"
 
+#include "gtm_stdio.h"
+
+#include "gtmio.h"
 #include "gdsroot.h"
 #include "gtm_facility.h"
 #include "fileinfo.h"
@@ -25,7 +28,7 @@
 #include "hashtab_int4.h"	/* needed for tp.h */
 #include "tp.h"			/* needed for T_BEGIN_READ_NONTP_OR_TP macro */
 #include "mv_stent.h"
-
+#include "io.h"
 #include "gvcst_protos.h"
 #include "change_reg.h"
 #include "op.h"
@@ -48,7 +51,7 @@ boolean_t	gvcst_spr_queryget(mval *cumul_val)
 	boolean_t	spr_tpwrapped;
 	boolean_t	est_first_pass;
 	int		reg_index;
-	gd_binding	*start_map, *end_map, *map, *prev_end_map;
+	gd_binding	*start_map, *end_map, *map, *prev_end_map, *stop_map;
 	gd_region	*reg, *gd_reg_start;
 	gd_addr		*addr;
 	gv_namehead	*start_map_gvt;
@@ -66,10 +69,7 @@ boolean_t	gvcst_spr_queryget(mval *cumul_val)
 	SETUP_THREADGBL_ACCESS;
 	start_map = TREF(gd_targ_map);	/* set up by op_gvname/op_gvnaked/op_gvextnam done just before invoking op_gvqueryget */
 	start_map_gvt = gv_target;	/* save gv_target corresponding to start_map so we can restore at end */
-	/* Now that we know the keyrange maps to more than one region, go through each of them and do the $queryget
-	 * Since multiple regions are potentially involved, need a TP fence.
-	 */
-	DEBUG_ONLY(save_dollar_tlevel = dollar_tlevel);
+	/* Do any initialization that is independent of retries BEFORE the op_tstart */
 	PUSH_MV_STENT(MVST_MVAL);	/* Need to protect value returned by gvcst_queryget from stpgcol */
 	/* "val" protection might not be necessary specifically for the non-spanning-node gvcst_queryget version.
 	 * And most likely not needed for the spanning-node gvcst_queryget version. But it is not easy to be sure and
@@ -84,6 +84,17 @@ boolean_t	gvcst_spr_queryget(mval *cumul_val)
 	gvnh_reg = TREF(gd_targ_gvnh_reg);
 	assert(NULL != gvnh_reg);
 	assert(NULL != gvnh_reg->gvspan);
+	/* Now that we know the keyrange maps to more than one region, go through each of them and do the $queryget
+	 * Since multiple regions are potentially involved, need a TP fence. But before that, open any statsDBs pointed
+	 * to by map entries from "start_map" to "stop_map" (as their open will be deferred once we go into TP). Not
+	 * opening them before the TP can produce incomplete results from the $query operation.
+	 */
+	assert(0 < gvnh_reg->gvspan->end_map_index);
+	assert(gvnh_reg->gvspan->end_map_index < addr->n_maps);
+	stop_map = &addr->maps[gvnh_reg->gvspan->end_map_index];
+	for (map = start_map; map <= stop_map; map++)
+		OPEN_BASEREG_IF_STATSREG(map);
+	DEBUG_ONLY(save_dollar_tlevel = dollar_tlevel);
 	if (!dollar_tlevel)
 	{
 		spr_tpwrapped = TRUE;
@@ -100,9 +111,7 @@ boolean_t	gvcst_spr_queryget(mval *cumul_val)
 	cumul_key_len = 0;
 	DEBUG_ONLY(cumul_key[cumul_key_len] = KEY_DELIMITER;)
 	INCREMENT_GD_TARG_TN(gd_targ_tn); /* takes a copy of incremented "TREF(gd_targ_tn)" into local variable "gd_targ_tn" */
-	assert(0 < gvnh_reg->gvspan->end_map_index);
-	assert(gvnh_reg->gvspan->end_map_index < addr->n_maps);
-	end_map = &addr->maps[gvnh_reg->gvspan->end_map_index];
+	end_map = stop_map;
 	/* Verify that initializations that happened before op_tstart are still unchanged */
 	assert(addr == TREF(gd_targ_addr));
 	assert(tn_array == TREF(gd_targ_reg_array));
@@ -112,6 +121,7 @@ boolean_t	gvcst_spr_queryget(mval *cumul_val)
 		 * Note down the smallest key found across the scanned regions until we find a key that belongs to the
 		 * same map (in the gld) as the currently scanned "map". At which point, the region-spanning queryget is done.
 		 */
+		ASSERT_BASEREG_OPEN_IF_STATSREG(map);	/* "OPEN_BASEREG_IF_STATSREG" call above should have ensured that */
 		reg = map->reg.addr;
 		GET_REG_INDEX(addr, gd_reg_start, reg, reg_index);	/* sets "reg_index" */
 		assert((map != start_map) || (tn_array[reg_index] != gd_targ_tn));
diff --git a/sr_unix/gvcst_spr_zprevious.c b/sr_unix/gvcst_spr_zprevious.c
index 1cffcf3..17fcdd5 100644
--- a/sr_unix/gvcst_spr_zprevious.c
+++ b/sr_unix/gvcst_spr_zprevious.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information 	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -12,6 +12,9 @@
 
 #include "mdef.h"
 
+#include "gtm_stdio.h"
+
+#include "gtmio.h"
 #include "gdsroot.h"
 #include "gtm_facility.h"
 #include "fileinfo.h"
@@ -24,7 +27,7 @@
 #include "buddy_list.h"		/* needed for tp.h */
 #include "hashtab_int4.h"	/* needed for tp.h */
 #include "tp.h"			/* needed for T_BEGIN_READ_NONTP_OR_TP macro */
-
+#include "io.h"
 #include "gvcst_protos.h"
 #include "change_reg.h"
 #include "op.h"
@@ -145,6 +148,9 @@ boolean_t	gvcst_spr_zprevious(void)
 		 * Note down the largest key found across the scanned regions until we find a key that belongs to the
 		 * same map (in the gld) as the currently scanned "map". At which point, the region-spanning zprevious is done.
 		 */
+		ASSERT_BASEREG_OPEN_IF_STATSREG(map);	/* "gv_srch_map_linear" and "gv_srch_map_linear_backward" call above
+							 * should have ensured that.
+							 */
 		reg = map->reg.addr;
 		GET_REG_INDEX(addr, gd_reg_start, reg, reg_index);	/* sets "reg_index" */
 		assert((map != first_map) || (tn_array[reg_index] != gd_targ_tn));
diff --git a/sr_unix/heartbeat_timer.h b/sr_unix/heartbeat_timer.h
deleted file mode 100755
index eddedf9..0000000
--- a/sr_unix/heartbeat_timer.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/****************************************************************
- *								*
- *	Copyright 2001, 2014 Fidelity Information Services, Inc	*
- *								*
- *	This source code contains the intellectual property	*
- *	of its copyright holder(s), and is made available	*
- *	under a license.  If you do not know the terms of	*
- *	the license, please stop and do not read further.	*
- *								*
- ****************************************************************/
-
-#ifndef _HEARTBEAT_TIMER_H
-#define _HEARTBEAT_TIMER_H
-
-#define HEARTBEAT_INTERVAL_IN_SECS 		8	/* Need to maintain this in sync with HEARTBEAT_INTERVAL. To avoid
-							 * division by 1000 wherever needed, the value is hardcoded to be 8
-							 */
-/* define heartbeat interval */
-#define HEARTBEAT_INTERVAL 			(HEARTBEAT_INTERVAL_IN_SECS * MILLISECS_IN_SEC) /* ms */
-#define	NUM_HEARTBEATS_FOR_OLDERJNL_CHECK	8	/* gives a total of 8 * 8 = 64 seconds between checks of older jnl files */
-
-/* The heartbeat timer is used
- * 	1) To periodically check if we have older generation journal files open and if so to close them.
- *	2) By mutex logic to approximately measure the time spent sleeping while waiting for CRIT or MSEMLOCK.
- * Linux currently does not support MSEMs. It uses the heartbeat timer only for (1).
- */
-#define START_HEARTBEAT_IF_NEEDED									\
-{													\
-	GBLREF boolean_t heartbeat_started;								\
-													\
-	if (!heartbeat_started)										\
-	{												\
-		start_timer((TID)&heartbeat_timer, HEARTBEAT_INTERVAL, heartbeat_timer, 0, NULL);	\
-		heartbeat_started = TRUE; /* should always be set AFTER start_timer */			\
-	}												\
-}
-
-void heartbeat_timer(void);
-
-#endif
diff --git a/sr_unix/hpuxia64_badd.txt b/sr_unix/hpuxia64_badd.txt
deleted file mode 100644
index 29fecc1..0000000
--- a/sr_unix/hpuxia64_badd.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-#################################################################
-#								#
-#	Copyright 2012, 2013 Fidelity Information Services, Inc       #
-#								#
-#	This source code contains the intellectual property	#
-#	of its copyright holder(s), and is made available	#
-#	under a license.  If you do not know the terms of	#
-#	the license, please stop and do not read further.	#
-#								#
-#################################################################
-# Do not add any blank lines after this comment
-pro:
-TTTGEN.m%-r--r----- README.txt
-dse%-r--r----- custom_errors_sample.txt
-gdehelp.dat%-r--r----- gdedefaults
-gtm_common_defs.h%-r-xr-x--- gtm
-gtmcshrc.gtc%-r-xr-x--- gtmbase
-gtmhelp.dat%-r-xr-x--- gtmcshrc
-gtmsecshr%-r-xr-x--- gtmprofile
-gtmsecshr%-r-xr-x--- gtmprofile_preV54000
-lke%-r-xr-x--- libgtmutil.so
-
-pro/plugin:
-zzz_insert%dr-xr-x--- o
-zzz_insert%dr-xr-x--- r
-
-pro/plugin/gtmcrypt:
-zzz_insert%-r--r----- source.tar
-
-pro/utf8:
-TTTGEN.m -> ../TTTGEN.m%lrwxr-xr-x README.txt -> ../README.txt
-dse -> ../dse%lrwxr-xr-x custom_errors_sample.txt -> ../custom_errors_sample.txt
-gtmstart.gtc -> ../gtmstart.gtc%-r-sr-x--- gtmsecshr
-gtmstart.gtc -> ../gtmstart.gtc%dr-x------ gtmsecshrdir
-lke -> ../lke%-r-xr-x--- libgtmutil.so
-
-pro/utf8/gtmsecshrdir:
-zzz_insert%-r-s------ gtmsecshr
diff --git a/sr_unix/hpuxparisc_badd.txt b/sr_unix/hpuxparisc_badd.txt
deleted file mode 100644
index b9c9f69..0000000
--- a/sr_unix/hpuxparisc_badd.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-#################################################################
-#								#
-#	Copyright 2011, 2013 Fidelity Information Services, Inc       #
-#								#
-#	This source code contains the intellectual property	#
-#	of its copyright holder(s), and is made available	#
-#	under a license.  If you do not know the terms of	#
-#	the license, please stop and do not read further.	#
-#								#
-#################################################################
-# Do not add any blank lines after this comment
-pro:
-TTTGEN.m%-r--r----- README.txt
-dse%-r--r----- custom_errors_sample.txt
-gdehelp.dat%-r--r----- gdedefaults
-gtm_common_defs.h%-r-xr-x--- gtm
-gtmcshrc.gtc%-r-xr-x--- gtmbase
-gtmhelp.dat%-r-xr-x--- gtmcshrc
-gtmsecshr%-r-xr-x--- gtmprofile
-gtmsecshr%-r-xr-x--- gtmprofile_preV54000
-lke%-r-xr-x--- libgtmutil.sl
-semstat2%dr-xr-x--- plugin
-
-pro/utf8:
-TTTGEN.m -> ../TTTGEN.m%lrwxr-xr-x README.txt -> ../README.txt
-dse -> ../dse%lrwxr-xr-x custom_errors_sample.txt -> ../custom_errors_sample.txt
-gtmstart.gtc -> ../gtmstart.gtc%-r-sr-x--- gtmsecshr
-gtmstart.gtc -> ../gtmstart.gtc%dr-x------ gtmsecshrdir
-lke -> ../lke%-r-xr-x--- libgtmutil.sl
-
-pro/utf8/gtmsecshrdir:
-zzz_insert%-r-s------ gtmsecshr
diff --git a/sr_unix/hpuxparisc_bdeldir.txt b/sr_unix/hpuxparisc_bdeldir.txt
deleted file mode 100644
index 6506720..0000000
--- a/sr_unix/hpuxparisc_bdeldir.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-#################################################################
-#								#
-#	Copyright 2011 Fidelity Information Services, Inc       #
-#								#
-#	This source code contains the intellectual property	#
-#	of its copyright holder(s), and is made available	#
-#	under a license.  If you do not know the terms of	#
-#	the license, please stop and do not read further.	#
-#								#
-#################################################################
-# Do not add any blank lines after this comment
-pro/map:
-pro/obj:
-pro/plugin:
-pro/plugin/o:
-pro/plugin/o/utf8:
-pro/plugin/r:
diff --git a/sr_unix/init_gtm.c b/sr_unix/init_gtm.c
index 0f2371c..fb65657 100644
--- a/sr_unix/init_gtm.c
+++ b/sr_unix/init_gtm.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -44,18 +44,33 @@
 #include "create_fatal_error_zshow_dmp.h"
 #include "mtables.h"
 #include "show_source_line.h"
+#include "patcode.h"
+#include "collseq.h"
 
+GBLREF boolean_t	utf8_patnumeric;
+GBLREF int4		exi_condition;
+GBLREF mstr		dollar_zchset;
+GBLREF mstr		dollar_zpatnumeric;
 GBLREF mstr		default_sysid;
+GBLREF pattern		*pattern_list;
+GBLREF pattern		*curr_pattern;
+GBLREF pattern		mumps_pattern;
+GBLREF uint4		*pattern_typemask;
+GBLREF int		(*op_open_ptr)(mval *v, mval *p, int t, mval *mspace);
 GBLREF void		(*ctrlc_handler_ptr)();
 GBLREF void		(*tp_timeout_action_ptr)(void);
 GBLREF void		(*tp_timeout_clear_ptr)(void);
 GBLREF void		(*tp_timeout_start_timer_ptr)(int4 tmout_sec);
-GBLREF int		(*op_open_ptr)(mval *v, mval *p, int t, mval *mspace);
 GBLREF void		(*unw_prof_frame_ptr)(void);
 GBLREF void		(*stx_error_fptr)(int in_error, ...);	/* Function pointer for stx_error() so gtm_utf8.c can avoid pulling
 								 * stx_error() into gtmsecshr, and thus just about everything else
 								 * as well.
 								 */
+GBLREF void		(*stx_error_va_fptr)(int in_error, va_list args);	/* Function pointer for stx_error() so rts_error.c
+										 * can avoid pulling stx_error() into gtmsecshr,
+										 * and thus just about everything else as well.
+										 */
+GBLREF	void		(*mupip_exit_fp)(int4 errnum);		/* Func ptr for mupip_exit() but in GTM, points to assert rtn */
 GBLREF	void		(*show_source_line_fptr)(boolean_t warn); /* Func ptr for show_source_line() for same reason as above */
 #ifdef GTM_PTHREAD
 GBLREF pthread_t	gtm_main_thread_id;
@@ -64,11 +79,17 @@ GBLREF boolean_t	gtm_jvm_process;
 #endif
 GBLDEF boolean_t	gtm_startup_active = FALSE;
 
-/* Note the function pointer initializations below happen in both the GT.M runtime and in mupip */
+STATICFNDCL void assert_on_entry(int4 arg);
+
+error_def(ERR_COLLATIONUNDEF);
+
 void init_gtm(void)
-{
+{	/* initialize process characteristics and states, but beware as initialization occurs in other places as well
+	 * the function pointer initializations below happen in both the GT.M runtime and in mupip
+	 */
 	struct startup_vector   svec;
-	int i;
+	int			i;
+	int4			lct;
 	DEBUG_ONLY(mval		chkmval;)
 	DEBUG_ONLY(mval		chkmval_b;)
 	DCL_THREADGBL_ACCESS;
@@ -100,7 +121,7 @@ void init_gtm(void)
 	SFPTR(create_fatal_error_zshow_dmp_fptr, create_fatal_error_zshow_dmp);
 #	ifdef GTM_PTHREAD
 	assert(!gtm_main_thread_id_set);
-	if (!gtm_main_thread_id_set && gtm_jvm_process)
+	if (!gtm_main_thread_id_set)
 	{
 		gtm_main_thread_id = pthread_self();
 		gtm_main_thread_id_set = TRUE;
@@ -114,6 +135,7 @@ void init_gtm(void)
 		op_open_ptr = op_open;
 	unw_prof_frame_ptr = unw_prof_frame;
 	stx_error_fptr = stx_error;
+	stx_error_va_fptr = stx_error_va;
 	show_source_line_fptr = show_source_line;
 	/* For compile time optimization, we need to have the cache for $PIECE enabled */
 	for (i = 0; FNPC_MAX > i; i++)
@@ -122,8 +144,46 @@ void init_gtm(void)
 	}
 	(TREF(fnpca)).fnpcsteal = (TREF(fnpca)).fnpcs;			/* Starting place to look for cache reuse */
 	(TREF(fnpca)).fnpcmax = &(TREF(fnpca)).fnpcs[FNPC_MAX - 1];	/* The last element */
-	if (MUMPS_COMPILE == invocation_mode)
+	curr_pattern = pattern_list = &mumps_pattern;
+	pattern_typemask = mumps_pattern.typemask;
+	initialize_pattern_table();
+	/* Initialize local collating sequence */
+	TREF(transform) = TRUE;
+	lct = find_local_colltype();
+	if (lct != 0)
+	{
+		TREF(local_collseq) = ready_collseq(lct);
+		if (!TREF(local_collseq))
+		{
+			exi_condition = -ERR_COLLATIONUNDEF;
+			gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(3) ERR_COLLATIONUNDEF, 1, lct);
+			EXIT(exi_condition);
+		}
+	} else
+		TREF(local_collseq) = 0;
+	if (gtm_utf8_mode)
+	{
+		dollar_zchset.len = STR_LIT_LEN(UTF8_NAME);
+		dollar_zchset.addr = UTF8_NAME;
+		if (utf8_patnumeric)
+		{
+			dollar_zpatnumeric.len = STR_LIT_LEN(UTF8_NAME);
+			dollar_zpatnumeric.addr = UTF8_NAME;
+		}
+	}
+	if (MUMPS_COMPILE == invocation_mode)				/* MUMPS compile branches here and gets none of the below */
+	{
+		TREF(transform) = FALSE;
 		EXIT(gtm_compile());
+	}
+	/* With the advent of reservedDBs, the ability to create a new database is not only in MUPIP but is in MUMPS too.
+	 * This means mucregini() (called by mu_cre_file()) is also in libgtmshr. But mucregini calls mupip_exit for certain
+	 * types of errors we won't run into with reservedDBs. So, if mupip.c has not already initialized this function
+	 * pointer for mupip_exit to be used in mucregini() (MUPIP calls this routine too), then initialize it to point to a
+	 * routine that will assert fail if it is used in MUMPS .
+	 */
+	if (NULL == mupip_exit_fp)
+		mupip_exit_fp = assert_on_entry;
 	/* This should be after cli_lex_setup() due to S390 A/E conversion in cli_lex_setup   */
 	memset(&svec, 0, SIZEOF(svec));
 	svec.argcnt = SIZEOF(svec);
@@ -141,3 +201,11 @@ void init_gtm(void)
 	gtm_startup(&svec);
 	gtm_startup_active = TRUE;
 }
+
+/* Routine to be driven by a function pointer when that function pointer should never be driven.
+ * Does an assertpro() to stop things.
+ */
+void assert_on_entry(int4 arg)
+{
+	assertpro(FALSE);
+}
diff --git a/sr_unix/interlock.h b/sr_unix/interlock.h
index 59a34dc..b05dba6 100644
--- a/sr_unix/interlock.h
+++ b/sr_unix/interlock.h
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -48,6 +48,7 @@
 /* New buffer doesn't need interlocked operation.  */
 #define LOCK_NEW_BUFF_FOR_UPDATE(X)	(SET_LATCH((sm_int_ptr_t)&((X)->interlock.latch), LATCH_SET))
 
+/* After this macro returns, Y points to the PRE-aswp (not POST-aswp) value of the latch */
 #define LOCK_BUFF_FOR_UPDATE(X,Y,Z)     {Y = ASWP((sm_int_ptr_t)&(X)->interlock.latch, LATCH_SET, Z);		\
 						 LOCK_HIST("OBTN", &(X)->interlock.latch, process_id, -1);}
 #define RELEASE_BUFF_UPDATE_LOCK(X,Y,Z) {LOCK_HIST("RLSE", &(X)->interlock.latch, process_id, -1); 		\
@@ -88,9 +89,6 @@
  */
 #define OWN_BUFF(X)			((X) == LATCH_CLEAR)
 
-#define ADD_ENT_TO_ACTIVE_QUE_CNT(X,Y)		(INCR_CNT((sm_int_ptr_t)(X), (sm_global_latch_ptr_t)(Y)))
-#define SUB_ENT_FROM_ACTIVE_QUE_CNT(X,Y)	(DECR_CNT((sm_int_ptr_t)(X), (sm_global_latch_ptr_t)(Y)))
-
 #define INCR_CNT(X,Y)			INTERLOCK_ADD(X,Y,1)
 #define DECR_CNT(X,Y)			INTERLOCK_ADD(X,Y,-1)
 
@@ -113,3 +111,28 @@
 boolean_t	grab_latch(sm_global_latch_ptr_t latch, int max_timeout_in_secs);
 void		rel_latch(sm_global_latch_ptr_t latch);
 
+#define LOCK_HARD_SPIN_TIME 		60	/* in seconds */
+/* macros to grab and release a critical section (either shared with DB or not) for LOCK operations */
+#define GRAB_LOCK_CRIT(CSA, REGION, RET_WAS_CRIT)						\
+MBSTART {											\
+	if (CSA->lock_crit_with_db)								\
+	{											\
+		if (CSA->critical)								\
+			crash_count = CSA->critical->crashcnt;					\
+		if (!(RET_WAS_CRIT = CSA->now_crit))		/* WARNING assignment */	\
+			grab_crit(REGION);							\
+	} else											\
+	{											\
+		while (!grab_latch(&CSA->nl->lock_crit, LOCK_HARD_SPIN_TIME))			\
+			rel_quant();								\
+	}											\
+} MBEND
+#define REL_LOCK_CRIT(CSA, REGION, WAS_CRIT)							\
+MBSTART {											\
+	if (CSA->lock_crit_with_db)								\
+	{											\
+		if (!WAS_CRIT)									\
+			rel_crit(REGION);							\
+	} else											\
+		rel_latch(&CSA->nl->lock_crit);							\
+} MBEND
diff --git a/sr_unix/io_open_try.c b/sr_unix/io_open_try.c
index 4ac91ca..9e0f955 100755
--- a/sr_unix/io_open_try.c
+++ b/sr_unix/io_open_try.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information 	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -106,6 +106,7 @@ bool io_open_try(io_log_name *naml, io_log_name *tl, mval *pp, int4 timeout, mva
 	int		errcode;
 	unsigned int	port_len;
 	char		port_buffer[NI_MAXSERV], *port_ptr;
+	io_desc		*temp_iod;
 
 	mt_ptr = NULL;
 	char_or_block_special = FALSE;
@@ -138,24 +139,24 @@ bool io_open_try(io_log_name *naml, io_log_name *tl, mval *pp, int4 timeout, mva
 	{
 		if (0 == tl->iod)
 		{
-			tl->iod =  (io_desc *)malloc(SIZEOF(io_desc));
-			memset((char*)tl->iod, 0, SIZEOF(io_desc));
-			tl->iod->pair.in  = tl->iod;
-			tl->iod->pair.out = tl->iod;
-			tl->iod->trans_name = tl;
-			tl->iod->type = n_io_dev_types;
+			temp_iod =  (io_desc *)malloc(SIZEOF(io_desc));
+			memset((char*)temp_iod, 0, SIZEOF(io_desc));
+			temp_iod->pair.in  = temp_iod;
+			temp_iod->pair.out = temp_iod;
+			temp_iod->trans_name = tl;
+			temp_iod->type = n_io_dev_types;
 			p_offset = 0;
 			while(iop_eol != *(pp->str.addr + p_offset))
 			{
 				ch = *(pp->str.addr + p_offset++);
 				if (iop_fifo == ch)
-					tl->iod->type = ff;
+					temp_iod->type = ff;
 				else  if (iop_sequential == ch)
-					tl->iod->type = rm;
+					temp_iod->type = rm;
 				p_offset += ((IOP_VAR_SIZE == io_params_size[ch]) ?
 					     (unsigned char)*(pp->str.addr + p_offset) + 1 : io_params_size[ch]);
 			}
-			if (ff == tl->iod->type)
+			if (ff == temp_iod->type)
 			{
 				/* fifo with RW permissions for owner, group, other */
 				if ((-1 != MKNOD(buf, FIFO_PERMISSION, 0))
@@ -168,11 +169,11 @@ bool io_open_try(io_log_name *naml, io_log_name *tl, mval *pp, int4 timeout, mva
 					if (EEXIST != errno)
 						filecreated = TRUE;
 					/*	create another one for fifo write	*/
-					tl->iod->pair.out = (io_desc *)malloc(SIZEOF(io_desc));
-					(tl->iod->pair.out)->pair.in = tl->iod;
-					(tl->iod->pair.out)->pair.out = (tl->iod->pair.out);
-					(tl->iod->pair.out)->trans_name = tl;
-					(tl->iod->pair.out)->type = ff;
+					temp_iod->pair.out = (io_desc *)malloc(SIZEOF(io_desc));
+					(temp_iod->pair.out)->pair.in = temp_iod;
+					(temp_iod->pair.out)->pair.out = (temp_iod->pair.out);
+					(temp_iod->pair.out)->trans_name = tl;
+					(temp_iod->pair.out)->type = ff;
 #else
 					filecreated = TRUE;
 #endif
@@ -184,6 +185,7 @@ bool io_open_try(io_log_name *naml, io_log_name *tl, mval *pp, int4 timeout, mva
 					   In that way error handler will get the chance to handle any error */
 				}
 			}
+			tl->iod = temp_iod;
 		}
 		if ((n_io_dev_types == tl->iod->type) && mspace && mspace->str.len)
 		{
diff --git a/sr_unix/iob_read.c b/sr_unix/iob_read.c
index 8dfdd20..779671d 100755
--- a/sr_unix/iob_read.c
+++ b/sr_unix/iob_read.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2009 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -30,26 +31,25 @@
 #include "error.h"
 #include "iob.h"
 #include "gtmio.h"
-void iob_flush(BFILE *bf);
+#include "gtmmsg.h"
+
+GBLREF	uint4		restore_read_errno;
+
+error_def(ERR_IOEOF);
 
 void iob_read(BFILE *bf, char *buf, int nbytes)
 {
 	int4	nread, nreread;
 	int	rc;
 
-	error_def(ERR_IOEOF);
-
 	if (bf->write_mode)
 	{
 		iob_flush(bf);
 		bf->write_mode = FALSE;
 	}
-
-#ifdef DEBUG_IOB
-	PRINTF("iob_read:\tiob_read(%x, %x, %d), bf->remaining = %d\n",
-	       bf, buf, nbytes, bf->remaining);
-#endif
-
+#	ifdef DEBUG_IOB
+	PRINTF("iob_read:\tiob_read(%x, %x, %d), bf->remaining = %d\n", bf, buf, nbytes, bf->remaining);
+#	endif
 	while (nbytes > bf->remaining)
 	{
 		/* copy bytes remaining in buffer */
@@ -59,47 +59,23 @@ void iob_read(BFILE *bf, char *buf, int nbytes)
 
 		/* refill */
 		DOREADRL(bf->fd, bf->buf, bf->bufsiz, nread);
-#ifdef DEBUG_IOB
-		PRINTF("iob_read:\t\tread(%d, %x, %d) = %d\n", bf->fd, bf->buf,
-		       bf->bufsiz, nread);
-#endif
+#		ifdef DEBUG_IOB
+		PRINTF("iob_read:\t\tread(%d, %x, %d) = %d\n", bf->fd, bf->buf, bf->bufsiz, nread);
+#		endif
 		bf->bptr = bf->buf;
 		bf->remaining = nread;
-
-		if (nread == -1)
-		{
-			rts_error(VARLSTCNT(1) errno);
-			return;
-		}
-		else if (nread == 0 || nread % bf->blksiz)
+		/* In case of error, set global variable "restore_read_errno" and return to caller ("mupip_restore")
+		 * for it to do cleanup before exiting.
+		 */
+		if ((-1 == nread) || (0 == nread) || (nread % bf->blksiz))
 		{
+			restore_read_errno = ((-1 == nread) ? errno : ERR_IOEOF);
+			gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(1) restore_read_errno);
 			CLOSEFILE_RESET(bf->fd, rc);	/* resets "bf->fd" to FD_INVALID */
-			rts_error(VARLSTCNT(1) ERR_IOEOF);
-
-			/* if we continued from here, assume that this is a magnetic
-			   tape and we have loaded the next volume. Re-open and
-			   finish the read operation.
-			   */
-			while (FD_INVALID == (bf->fd = OPEN3(bf->path,bf->oflag,bf->mode)))
-				rts_error(VARLSTCNT(1) errno);
-
-			DOREADRL(bf->fd, bf->buf + nread, bf->bufsiz - nread, nreread);
-#ifdef DEBUG_IOB
-			PRINTF("iob_read:\t\tread(%d, %x, %d) = %d\n", bf->fd, bf->buf,
-			       bf->bufsiz, nread);
-#endif
-			if (nreread < bf->bufsiz - nread)
-			{
-				rts_error(VARLSTCNT(1) errno);
-				return;
-			}
-			bf->remaining = nread;
+			return;
 		}
 	}
-
 	memcpy(buf, bf->bptr, nbytes);
 	bf->bptr += nbytes;
 	bf->remaining -= nbytes;
 }
-
-
diff --git a/sr_unix/iorm_close.c b/sr_unix/iorm_close.c
index c95bf13..95f73c2 100755
--- a/sr_unix/iorm_close.c
+++ b/sr_unix/iorm_close.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information 	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -216,6 +216,11 @@ void iorm_close(io_desc *iod, mval *pp)
 			free(rm_ptr->outbuf);
 			rm_ptr->outbuf = NULL;
 		}
+		if (rm_ptr->tmp_buffer)
+		{
+			free(rm_ptr->tmp_buffer);
+			rm_ptr->tmp_buffer = NULL;
+		}
 	}
 
 	/* Do the close first. If the fclose is done first and we are being called from io_rundown just prior to the execv
diff --git a/sr_unix/iorm_get.c b/sr_unix/iorm_get.c
index bb8c2f4..6df2633 100755
--- a/sr_unix/iorm_get.c
+++ b/sr_unix/iorm_get.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2006-2015 Fidelity National Information 	*
+ * Copyright (c) 2006-2016 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -321,7 +321,7 @@ int	iorm_get_fol(io_desc *io_ptr, int4 *tot_bytes_read, int4 *msec_timeout, bool
 	assert(CHSET_UTF16 != chset);
 	PIPE_DEBUG(PRINTF("iorm_get_fol: bom_buf_cnt: %d bom_buf_off: %d\n",rm_ptr->bom_buf_cnt,rm_ptr->bom_buf_off );
 		   DEBUGPIPEFLUSH;);
-	if (0 <= status && rm_ptr->bom_buf_cnt > rm_ptr->bom_buf_off)
+	if ((0 <= status) && (rm_ptr->bom_buf_cnt > rm_ptr->bom_buf_off))
 	{
 		PIPE_DEBUG(PRINTF("move bom: status: %d\n", status); DEBUGPIPEFLUSH;);
 		from_bom = MIN((rm_ptr->bom_buf_cnt - rm_ptr->bom_buf_off), bytes2read);
@@ -333,7 +333,7 @@ int	iorm_get_fol(io_desc *io_ptr, int4 *tot_bytes_read, int4 *msec_timeout, bool
 		rm_ptr->file_pos += from_bom;
 		status = 0;
 	}
-	if (0 <= status && 0 < bytes2read)
+	if ((0 <= status) && (0 < bytes2read))
 	{
 		PIPE_DEBUG(PRINTF("iorm_get_fol: bytes2read after bom: %d\n", bytes2read); DEBUGPIPEFLUSH;);
 		if (timed)
@@ -556,10 +556,11 @@ int	iorm_get_bom(io_desc *io_ptr, int *blocked_in, boolean_t ispipe, int flags,
 				    out_of_time, blocked_in, ispipe, flags, status, tot_bytes_read,
 				    timer_id, msec_timeout, pipe_zero_timeout, FALSE, pipe_or_fifo);
 			/* Decrypt the read bytes even if they turned out to not contain a BOM. */
-			if (rm_ptr->input_encrypted && ((status > 0) || ((status < 0) && (*tot_bytes_read > 0))))
+			if ((0 < status) || ((0 > status) && (0 < *tot_bytes_read)))
 			{
-				READ_ENCRYPTED_DATA(rm_ptr, io_ptr->trans_name, &rm_ptr->bom_buf[rm_ptr->bom_buf_cnt],
-					status > 0 ? status : *tot_bytes_read, NULL);
+				if (rm_ptr->input_encrypted)
+					READ_ENCRYPTED_DATA(rm_ptr, io_ptr->trans_name, &rm_ptr->bom_buf[rm_ptr->bom_buf_cnt],
+						status > 0 ? status : *tot_bytes_read, NULL);
 				rm_ptr->read_occurred = TRUE;
 			}
 			PIPE_DEBUG(PRINTF("iorm_get_bom UTF8 DOREADRLTO2: status: %d\n", status); DEBUGPIPEFLUSH;);
@@ -582,10 +583,11 @@ int	iorm_get_bom(io_desc *io_ptr, int *blocked_in, boolean_t ispipe, int flags,
 				    out_of_time, blocked_in, ispipe, flags, status, tot_bytes_read,
 				    timer_id, msec_timeout, pipe_zero_timeout, FALSE, pipe_or_fifo);
 			/* Decrypt the read bytes even if they turned out to not contain a BOM. */
-			if (rm_ptr->input_encrypted && ((status > 0) || ((status < 0) && (*tot_bytes_read > 0))))
+			if ((0 < status) || ((0 > status) && (0 < *tot_bytes_read)))
 			{
-				READ_ENCRYPTED_DATA(rm_ptr, io_ptr->trans_name, &rm_ptr->bom_buf[rm_ptr->bom_buf_cnt],
-					status > 0 ? status : *tot_bytes_read, NULL);
+				if (rm_ptr->input_encrypted)
+					READ_ENCRYPTED_DATA(rm_ptr, io_ptr->trans_name, &rm_ptr->bom_buf[rm_ptr->bom_buf_cnt],
+						status > 0 ? status : *tot_bytes_read, NULL);
 				rm_ptr->read_occurred = TRUE;
 			}
 		}
@@ -733,10 +735,11 @@ int	iorm_get(io_desc *io_ptr, int *blocked_in, boolean_t ispipe, int flags, int4
 		PIPE_DEBUG(PRINTF("pipeget: bytes2read after bom: %d\n", bytes2read); DEBUGPIPEFLUSH;);
 		DOREADRLTO2(fildes, rm_ptr->inbuf_pos, (int)bytes2read, out_of_time, blocked_in, ispipe,
 			    flags, status, tot_bytes_read, timer_id, msec_timeout, pipe_zero_timeout, FALSE, pipe_or_fifo);
-		if (rm_ptr->input_encrypted && ((0 < status) || ((status < 0) && (*tot_bytes_read > 0))))
+		if ((0 < status) || ((0 > status) && (0 < *tot_bytes_read)))
 		{	/* Decrypt. */
-			READ_ENCRYPTED_DATA(rm_ptr, io_ptr->trans_name, rm_ptr->inbuf_pos,
-				status > 0 ? status : *tot_bytes_read, NULL);
+			if (rm_ptr->input_encrypted)
+				READ_ENCRYPTED_DATA(rm_ptr, io_ptr->trans_name, rm_ptr->inbuf_pos,
+					status > 0 ? status : *tot_bytes_read, NULL);
 			rm_ptr->read_occurred = TRUE;
 		}
 	}
diff --git a/sr_unix/iorm_open.c b/sr_unix/iorm_open.c
index 7c9f7c5..314045c 100755
--- a/sr_unix/iorm_open.c
+++ b/sr_unix/iorm_open.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information 	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -121,6 +121,7 @@ short	iorm_open(io_log_name *dev_name, mval *pp, int fd, mval *mspace, int4 time
 		d_rm->write_occurred = FALSE;
 		d_rm->fsblock_buffer_size = 0;
 		d_rm->fsblock_buffer = NULL;
+		d_rm->ichset_utf16_variant = d_rm->ochset_utf16_variant = 0;
 	} else
 	{
 		d_rm = (d_rm_struct *)iod->dev_sp;
@@ -178,12 +179,12 @@ short	iorm_open(io_log_name *dev_name, mval *pp, int fd, mval *mspace, int4 time
 					new_position = d_rm->file_pos;
 				} else
 				{
-					if ((CHSET_M == iod->ichset) || d_rm->fixed)
+					if (d_rm->fixed)
 						new_position = d_rm->file_pos;
 					else
-					{
+					{	/* Buffered reads in non-fixed M & UTF modes. */
 						new_position = d_rm->file_pos +
-							d_rm->utf_tot_bytes_in_buffer - d_rm->utf_start_pos;
+							d_rm->tot_bytes_in_buffer - d_rm->start_pos;
 					}
 				}
 
@@ -211,11 +212,11 @@ short	iorm_open(io_log_name *dev_name, mval *pp, int fd, mval *mspace, int4 time
 					if (!append)
 						d_rm->file_pos = 0;
 					/* Reset temporary buffer so that the next read starts afresh */
-					if (IS_UTF_CHSET(iod->ichset))
+					if (!d_rm->fixed || IS_UTF_CHSET(iod->ichset))
 					{
-						DEBUG_ONLY(memset(d_rm->utf_tmp_buffer, 0, CHUNK_SIZE));
-						d_rm->utf_start_pos = 0;
-						d_rm->utf_tot_bytes_in_buffer = 0;
+						DEBUG_ONLY(MEMSET_IF_DEFINED(d_rm->tmp_buffer, 0, CHUNK_SIZE));
+						d_rm->start_pos = 0;
+						d_rm->tot_bytes_in_buffer = 0;
 					}
 				}
 			}
@@ -238,31 +239,13 @@ short	iorm_open(io_log_name *dev_name, mval *pp, int fd, mval *mspace, int4 time
 			if (NULL == d_rm->filstr)
 				rts_error_csa(CSA_ARG(NULL) VARLSTCNT(9) ERR_DEVOPENFAIL, 2, dev_name->len,
 					      dev_name->dollar_io, ERR_TEXT, 2, LEN_AND_LIT("Error in stream open"), errno);
-			/* now fseeko required for nodestroy if non-fixed M streaming */
-			if (d_rm->no_destroy && !d_rm->fixed && !IS_UTF_CHSET(iod->ichset))
-			{
-				if ((off_t)-1 == fseeko(d_rm->filstr, d_rm->file_pos, SEEK_SET))	/* move input stream */
-				{
-					rts_error_csa(CSA_ARG(NULL) VARLSTCNT(9) ERR_IOERROR, 7, RTS_ERROR_LITERAL("fseeko"),
-						      RTS_ERROR_LITERAL("REWIND"), CALLFROM, errno);
-				}
-			}
 		}
 	}
-	recsize_before = d_rm->recordsize;
-	def_recsize_before = d_rm->def_recsize;
-	/* don't change character set on reopen */
+	/* setting of recordsize, WIDTH, etc, based on changed (if any) CHSET is taken care in iorm_use(). */
 	if (closed_nodestroy)
 		d_rm->no_destroy = TRUE;
 	iorm_use(iod, pp);
 
-	/* Now that recordsize and CHSET parms have been handled (if any), set WIDTH if necessary */
-	if (recsize_before != d_rm->recordsize || def_recsize_before != d_rm->def_recsize)
-	{	/* record size was specified even if the same value */
-		SET_WIDTH_BYTES;
-		assert(width_bytes <= d_rm->recordsize);	/* or else RECSIZENOTEVEN error would have been issued */
-		iod->width = d_rm->recordsize;/* we are guaranteed this width will hold at least one character due to above check */
-	}
 	/* Now that recordsize and CHSET parms have been handled (if any), allocate the record buffer if needed (utf8 fixed) */
 	if (dev_closed == iod->state)
 	{
@@ -327,57 +310,12 @@ short	iorm_open(io_log_name *dev_name, mval *pp, int fd, mval *mspace, int4 time
 			iod->wrap = TRUE;
 		}
 #endif
-		if (IS_UTF_CHSET(iod->ichset))
-		{
-			assert(gtm_utf8_mode);
-			/* We shouldn't have an existing buffer at this point if not closed nodestroy */
-			if (!d_rm->no_destroy)
-				assert(NULL == d_rm->inbuf);
-			/* if we already have a buffer then we opened previously in UTF char set so only allocate if NULL*/
-			if (NULL == d_rm->inbuf)
-			{
-				d_rm->bufsize = d_rm->fixed ? (d_rm->recordsize + 4) : 20;	/* +4 for one extra utf8 char */
-				d_rm->inbuf = malloc(d_rm->bufsize);
-				d_rm->inbuf_pos = d_rm->inbuf_top = d_rm->inbuf_off = d_rm->inbuf;/* Force read first time thru */
-			}
-		}
-		if (IS_UTF16_CHSET(iod->ochset))
-		{
-			/* We shouldn't have an existing buffer at this point if not closed nodestroy*/
-			if (!d_rm->no_destroy)
-				assert(NULL == d_rm->outbuf);
-			/* if we already have a buffer then we opened previously in UTF char set so only allocate if NULL*/
-			if (NULL == d_rm->outbuf)
-			{
-				d_rm->outbufsize = d_rm->recordsize + 4;
-				d_rm->outbuf = malloc(d_rm->outbufsize);
-				d_rm->out_bytes = 0;
-			}
-		}
 		/* Unless NEWVERSION is specified or the file is empty, or the file was CLOSEd with NODESTROY at EOF, we do not
 		 * allow APPEND with encryption.
 		 */
 		if (d_rm->output_encrypted && append && (!newversion) && (0 != statbuf.st_size) &&
 				(!d_rm->no_destroy || !iod->dollar.zeof))
 			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_CRYPTNOAPPEND, 2, dev_name->len, dev_name->dollar_io);
-	} else
-	{	/* check for changed recordsize */
-		if (IS_UTF_CHSET(iod->ichset) && (recsize_before != d_rm->recordsize))
-		{
-			if (NULL != d_rm->inbuf)
-				free(d_rm->inbuf);
-			d_rm->bufsize = d_rm->fixed ? (d_rm->recordsize + 4) : 20;		/* +4 for one extra utf8 char */
-			d_rm->inbuf = malloc(d_rm->bufsize);
-			d_rm->inbuf_pos = d_rm->inbuf_top = d_rm->inbuf_off = d_rm->inbuf;	/* Force read first time thru */
-		}
-		if (IS_UTF16_CHSET(iod->ochset) && (recsize_before != d_rm->recordsize))
-		{
-			if (NULL != d_rm->outbuf)
-				free(d_rm->outbuf);
-			d_rm->outbufsize = d_rm->recordsize + 4;
-			d_rm->outbuf = malloc(d_rm->outbufsize);
-			d_rm->out_bytes = 0;
-		}
 	}
 
 	if (!d_rm->bom_checked && !d_rm->fifo && !d_rm->pipe && (2 < fd) && IS_UTF_CHSET(iod->ochset))
@@ -472,7 +410,7 @@ int	open_get_bom(io_desc *io_ptr, int bom_size)
 		num_bom_bytes = gtm_utf_bomcheck(io_ptr, &io_ptr->ichset, &rm_ptr->bom_buf[0], bom_size);
 		if ((UTF16BE_BOM_LEN == bom_size) && chset != io_ptr->ichset)
 		{
-			chset = io_ptr->ichset;
+			rm_ptr->ichset_utf16_variant = chset = io_ptr->ichset;
 			get_chset_desc(&chset_names[chset]);
 		}
 	}
diff --git a/sr_unix/iorm_readfl.c b/sr_unix/iorm_readfl.c
index 26df731..9a3b0c5 100755
--- a/sr_unix/iorm_readfl.c
+++ b/sr_unix/iorm_readfl.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information 	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -121,7 +121,7 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 	int		fcntl_res, stp_need;
 	int4		msec_timeout;	/* timeout in milliseconds */
 	int4		bytes2read, bytes_read, char_bytes_read, add_bytes, reclen;
-	int4		buff_len, mblen, char_count, bytes_count, tot_bytes_read, utf_tot_bytes_read;
+	int4		buff_len, mblen, char_count, bytes_count, tot_bytes_read, chunk_bytes_read, utf_tot_bytes_read;
 	int4		status, max_width, ltind, exp_width, from_bom, fol_bytes_read, feof_status;
 	wint_t		utf_code;
 	char		*errptr;
@@ -242,29 +242,19 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 				      RTS_ERROR_LITERAL("iorm_readfl()"), CALLFROM, errno);
 		} else
 			rm_ptr->file_pos = cur_position;
-		/* if not fixed and streaming then need to set the stream to the same place in the file */
-		if (!rm_ptr->fixed && !utf_active)
-		{
-			/* move input stream */
-			if ((off_t)-1 == fseeko(rm_ptr->filstr, rm_ptr->file_pos, SEEK_SET))
-			{
-				rts_error_csa(CSA_ARG(NULL) VARLSTCNT(9) ERR_IOERROR, 7,
-					      RTS_ERROR_LITERAL("fseeko"),
-					      RTS_ERROR_LITERAL("iorm_readfl()"), CALLFROM, errno);
-			}
-		}
-
 		*dollary_ptr = 0;
 		*dollarx_ptr = 0;
 		/* Reset temporary buffer so that the next read starts afresh */
-		if (utf_active)
+		if (utf_active || !rm_ptr->fixed)
 		{
 			rm_ptr->out_bytes = rm_ptr->bom_buf_cnt = rm_ptr->bom_buf_off = 0;
 			rm_ptr->inbuf_top = rm_ptr->inbuf_off = rm_ptr->inbuf_pos = rm_ptr->inbuf;
-			DEBUG_ONLY(memset(rm_ptr->utf_tmp_buffer, 0, CHUNK_SIZE));
-			rm_ptr->utf_start_pos = 0;
-			rm_ptr->utf_tot_bytes_in_buffer = 0;
-
+			DEBUG_ONLY(MEMSET_IF_DEFINED(rm_ptr->tmp_buffer, 0, CHUNK_SIZE));
+			rm_ptr->start_pos = 0;
+			rm_ptr->tot_bytes_in_buffer = 0;
+		}
+		if (utf_active)
+		{
 			/* If bom not checked yet, not at the beginning of the file and at least UTF16BE_BOM_LEN number of bytes,
 			 * then go to the beginning of the file and read the potential BOM. Move back to previous file position
 			 * after BOM check. Note that in case of encryption this is the only place where the BOM is read.
@@ -378,8 +368,8 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 	{
 		exp_width = pipeintr->max_bufflen;
 		bytes_read = pipeintr->bytes_read;
-		/* some locals needed by unicode streaming mode */
-		if (utf_active && !rm_ptr->fixed)
+		/* some locals needed by unicode & M streaming mode */
+		if (!rm_ptr->fixed)
 		{
 			bytes2read = pipeintr->bytes2read;
 			char_count = pipeintr->char_count;
@@ -438,7 +428,7 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 				width -= bytes_read;
 		}
 	}
-        if (utf_active)
+	if (utf_active || !rm_ptr->fixed)
 		bytes_read = 0;
 	out_of_time = FALSE;
 	if (timeout == NO_M_TIMEOUT)
@@ -457,7 +447,7 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 		 */
 		timed = TRUE;
 		msec_timeout = timeout2msec(timeout);
-		if (msec_timeout > 0)
+		if (0 < msec_timeout)
 		{	/* For the READ x:n case, start a timer and clean it up in the (timed) clause at the end of this routine if
 			 * it has not expired.
 			 */
@@ -547,6 +537,7 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 						if (rm_ptr->input_encrypted)
 							READ_ENCRYPTED_DATA(rm_ptr, io_ptr->trans_name, temp, status, NULL);
 						rm_ptr->read_occurred = TRUE;
+						rm_ptr->done_1st_read = TRUE;
 						tot_bytes_read += status;
 						rm_ptr->file_pos += status;
 						bytes_count += status;
@@ -630,11 +621,13 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 
 				PIPE_DEBUG(PRINTF(" %d fixed\n", pid); DEBUGPIPEFLUSH);
 
-				if (rm_ptr->input_encrypted && ((status > 0) || ((status < 0) && (tot_bytes_read > 0))))
+				if ((0 < status) || ((0 > status) && (0 < tot_bytes_read)))
 				{
-					READ_ENCRYPTED_DATA(rm_ptr, io_ptr->trans_name, temp,
-						(status > 0) ? status : tot_bytes_read, NULL);
+					if (rm_ptr->input_encrypted)
+						READ_ENCRYPTED_DATA(rm_ptr, io_ptr->trans_name, temp,
+							(status > 0) ? status : tot_bytes_read, NULL);
 					rm_ptr->read_occurred = TRUE;
+					rm_ptr->done_1st_read = TRUE;
 				}
 				if (0 > status)
 				{
@@ -682,75 +675,93 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 					return FALSE;	/* For the compiler.. */
 				}
 			}
-		} else if (!rm_ptr->pipe && !rm_ptr->fifo) /* not fixed mode */
-		{	/* rms-file device */
-			if ((rm_ptr->follow) && timed)
+		} else  /* Handle pipe/fifo with stream.var files */
+		{	/* rms-file device, PIPE or FIFO */
+		/* read using read() into buffer and manage the buffer. */
+			PIPE_DEBUG(PRINTF("M 1: status: %d bytes2read: %d rm_ptr->start_pos: %d "
+					  "rm_ptr->tot_bytes_in_buffer: %d add_bytes: %d bytes_read: %d\n",
+					  status, bytes2read, rm_ptr->start_pos, rm_ptr->tot_bytes_in_buffer,
+					  add_bytes, bytes_read); DEBUGPIPEFLUSH);
+
+			if (rm_ptr->follow)
 			{
-				/* recalculate msec_timeout and sleep_left as &end_time - &current_time */
-				if (0 < msec_timeout)
+				PIPE_DEBUG(PRINTF(" %d M streaming with follow\n", pid); DEBUGPIPEFLUSH);
+
+				/* rms-file device in follow mode */
+				if (timed)
 				{
-					/* get the current time */
-					sys_get_curr_time(&current_time);
-					time_left = sub_abs_time(&end_time, &current_time);
-					if (0 > time_left.at_sec)
+					/* recalculate msec_timeout and sleep_left as &end_time - &current_time */
+					if (0 < msec_timeout)
 					{
-						msec_timeout = -1;
-						out_of_time = TRUE;
+						/* get the current time */
+						sys_get_curr_time(&current_time);
+						time_left = sub_abs_time(&end_time, &current_time);
+						if (0 > time_left.at_sec)
+						{
+							msec_timeout = -1;
+							out_of_time = TRUE;
+						} else
+							msec_timeout = (int4)(time_left.at_sec * MILLISECS_IN_SEC +
+									DIVIDE_ROUND_UP(time_left.at_usec, MICROSECS_IN_MSEC));
+
+						/* make sure it terminates with out_of_time */
+						if (!out_of_time && !msec_timeout)
+							msec_timeout = 1;
+						sleep_left = msec_timeout;
 					} else
-						msec_timeout = (int4)(time_left.at_sec * MILLISECS_IN_SEC +
-								      DIVIDE_ROUND_UP(time_left.at_usec, MICROSECS_IN_MSEC));
-					/* make sure it terminates with out_of_time */
-					if (!out_of_time && !msec_timeout)
-						msec_timeout = 1;
-					sleep_left = msec_timeout;
-				} else
-					sleep_left = 0;
+						sleep_left = 0;
+				}
+
+				/* if zeof is set in follow mode then ignore any previous zeof */
+				if (TRUE == io_ptr->dollar.zeof)
+					io_ptr->dollar.zeof = FALSE;
 			}
-			/* if zeof is set and follow is TRUE then ignore any previous zeof */
-			if (rm_ptr->follow && (TRUE == io_ptr->dollar.zeof))
-				io_ptr->dollar.zeof = FALSE;
+
 			do
 			{
-				/* in follow mode a read will return an EOF if no more bytes are available*/
-				GETC(filstr, status);
-				if (EOF != status)
-				{
-					inchar = (unsigned char)status;
-					tot_bytes_read++;
-					if (rm_ptr->input_encrypted)
-						READ_ENCRYPTED_DATA(rm_ptr, io_ptr->trans_name, &inchar, 1, NULL);
-					rm_ptr->read_occurred = TRUE;
-					rm_ptr->file_pos++;
-					if (inchar == NATIVE_NL)
-					{
-						line_term_seen = TRUE;
-						if (!rdone)
-							break;
-					}
-					*temp++ = inchar;
-					bytes_count++;
-				} else
+				bytes2read = 1;
+				PIPE_DEBUG(PRINTF("M 3: status: %d bytes2read: %d rm_ptr->start_pos: %d "
+						  "rm_ptr->tot_bytes_in_buffer: %d\n",
+						  status, bytes2read, rm_ptr->start_pos,
+						  rm_ptr->tot_bytes_in_buffer); DEBUGPIPEFLUSH);
+				/* If it is a pipe and at least one character is read, a timer with timer_id
+				   will be started.  It is canceled later in this routine if not expired
+				   prior to return */
+				if (rm_ptr->start_pos == rm_ptr->tot_bytes_in_buffer)
 				{
-					inchar = 0;
-					FEOF(filstr, feof_status);
-					if (feof_status)
+					DEBUG_ONLY(MEMSET_IF_DEFINED(rm_ptr->tmp_buffer, 0, CHUNK_SIZE));
+					rm_ptr->start_pos = rm_ptr->tot_bytes_in_buffer = 0;
+					/* Read CHUNK_SIZE bytes from device into the temporary buffer. By doing this
+					 * one-byte reads can be avoided when in non fixed format.
+					 *
+					 */
+					if (rm_ptr->follow)
 					{
-						status = 0;
-						CLEARERR(filstr);
-
-						if (rm_ptr->follow)
+						/* In follow mode a read returns an EOF if no more bytes are available. */
+						status = read(fildes, rm_ptr->tmp_buffer, CHUNK_SIZE);
+						if (0 < status)
+						{
+							if (rm_ptr->input_encrypted)
+								READ_ENCRYPTED_DATA(rm_ptr, io_ptr->trans_name,
+									rm_ptr->tmp_buffer, status, NULL);
+							rm_ptr->read_occurred = TRUE;
+							rm_ptr->done_1st_read = TRUE;
+						}
+						if (0 == status) /* end of file */
 						{
 							if ((TRUE == timed) && (0 >= sleep_left))
 							{
 								follow_timeout = TRUE;
 								break;
 							}
-							/* if a timed read, sleep the minimum of 100 ms and sleep_left.
-							   If not a timed read then just sleep 100 ms */
+							/* If a timed read, sleep the minimum of 100 ms and sleep_left.
+							 * If not a timed read then just sleep 100 ms.
+							 */
 							if (TRUE == timed)
 							{
 								/* recalculate msec_timeout and sleep_left as
-								   &end_time - &current_time */
+								 * &end_time - &current_time.
+								 */
 								/* get the current time */
 								sys_get_curr_time(&current_time);
 								time_left = sub_abs_time(&end_time, &current_time);
@@ -759,9 +770,10 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 									msec_timeout = -1;
 									out_of_time = TRUE;
 								} else
-									msec_timeout = (int4)(time_left.at_sec * MILLISECS_IN_SEC +
-											      DIVIDE_ROUND_UP(time_left.at_usec,
-													      MICROSECS_IN_MSEC));
+									msec_timeout = (int4)(time_left.at_sec *
+											MILLISECS_IN_SEC +
+											DIVIDE_ROUND_UP(time_left.at_usec,
+											MICROSECS_IN_MSEC));
 
 								/* make sure it terminates with out_of_time */
 								if (!out_of_time && !msec_timeout)
@@ -774,107 +786,156 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 								SHORT_SLEEP(sleep_time);
 							if (outofband)
 							{
-								PIPE_DEBUG(PRINTF(" %d outofband\n", pid); DEBUGPIPEFLUSH);
+								PIPE_DEBUG(PRINTF(" %d M 2 stream outofband\n",
+										  pid); DEBUGPIPEFLUSH);
 								PUSH_MV_STENT(MVST_ZINTDEV);
 								mv_chain->mv_st_cont.mvs_zintdev.io_ptr = io_ptr;
-								mv_chain->mv_st_cont.mvs_zintdev.curr_sp_buffer.addr =
-									(char *)stringpool.free;
-								mv_chain->mv_st_cont.mvs_zintdev.curr_sp_buffer.len =
-									tot_bytes_read;
-								mv_chain->mv_st_cont.mvs_zintdev.buffer_valid = TRUE;
+								mv_chain->mv_st_cont.mvs_zintdev.curr_sp_buffer.addr
+									= (char *)stringpool.free;
+								mv_chain->mv_st_cont.mvs_zintdev.curr_sp_buffer.len
+									= bytes_count;
+								mv_chain->mv_st_cont.mvs_zintdev.buffer_valid =
+									TRUE;
 								pipeintr->who_saved = pipewhich_readfl;
-								if (0 < msec_timeout && NO_M_TIMEOUT != msec_timeout)
+								if (0 < msec_timeout && NO_M_TIMEOUT !=
+								    msec_timeout)
 								{
 									pipeintr->end_time = end_time;
 									pipeintr->end_time_valid = TRUE;
 								}
 								pipeintr->max_bufflen = exp_width;
-								pipeintr->bytes_read = tot_bytes_read;
+								/* streaming mode uses bytes_count to show how many
+								   bytes are in *temp, but the interrupt re-entrant
+								   code uses bytes_read */
+								pipeintr->bytes_read = bytes_count;
+								pipeintr->bytes2read = bytes2read;
+								pipeintr->char_count = bytes_count;
+								pipeintr->add_bytes = add_bytes;
+								pipeintr->bytes_count = bytes_count;
+								PIPE_DEBUG(PRINTF("M 2 stream outofband "
+										  " add_bytes "
+										  "%d bytes_count %d\n",
+										  add_bytes, bytes_count);
+									   DEBUGPIPEFLUSH);
 								rm_ptr->mupintr = TRUE;
-								stringpool.free += tot_bytes_read; /* Don't step on our parade
-												      in the interrupt */
+								/* Don't step on our parade in the interrupt */
+								stringpool.free += bytes_count;
 								(TREF(pipefifo_interrupt))++;
 								REVERT_GTMIO_CH(&io_curr_device, ch_set);
 								outofband_action(FALSE);
-								/* Should *never* return from outofband_action */
-								assertpro(FALSE);
+								assertpro(FALSE);	/* Should *never* return from
+										   outofband_action */
 								return FALSE;	/* For the compiler.. */
 							}
-							continue; /* for now try and read again if eof or no input ready */
+							continue; /* for now try and read again if eof or no input
+								     ready */
+						} else if (-1 == status && errno != EINTR)  /* error returned */
+						{
+							bytes_count = 0;
+							break;
+						}
+					} else
+					{	/* NO FOLLOW */
+						DOREADRLTO2(fildes, rm_ptr->tmp_buffer, CHUNK_SIZE,
+							    out_of_time, &blocked_in, rm_ptr->pipe, flags,
+							    status, &chunk_bytes_read, timer_id,
+							    &msec_timeout, pipe_zero_timeout, pipe_or_fifo, pipe_or_fifo);
+						if ((0 < status) || ((0 > status) && (0 < chunk_bytes_read)))
+						{
+							if (rm_ptr->input_encrypted)
+								READ_ENCRYPTED_DATA(rm_ptr, io_ptr->trans_name,
+									rm_ptr->tmp_buffer,
+									(status > 0) ? status : chunk_bytes_read, NULL);
+							rm_ptr->read_occurred = TRUE;
+							rm_ptr->done_1st_read = TRUE;
 						}
 					}
-					else
-						do_clearerr = TRUE;
-					break;
-				}
-			} while (bytes_count < width);
-		} else
-		{	/* fifo or pipe device */
-			do
-			{
-				unsigned char tchar;
-				int tfcntl_res;
-				GETC(filstr, status);
-				if (EOF != status)
-				{
-					tchar = (unsigned char)status;
-					if (rm_ptr->input_encrypted)
-						READ_ENCRYPTED_DATA(rm_ptr, io_ptr->trans_name, &tchar, 1, NULL);
-					rm_ptr->read_occurred = TRUE;
-					/* force it to process below in case character read is a 0 */
-					if (!status)
-						status = 1;
-				} else
-				{
-					FEOF(filstr, feof_status);
-					if (feof_status)
-					{
-						status = 0;
-						CLEARERR(filstr);
-					}
-				}
-
-				if (0 > status)
-				{
-					do_clearerr = TRUE;
-					if (!rm_ptr->pipe || !timed || 0 != msec_timeout)
+					PIPE_DEBUG(PRINTF(" M 4: read chunk  status: %d chunk_bytes_read: %d\n",
+							  status, chunk_bytes_read); DEBUGPIPEFLUSH);
+					/* If status is -1, then total number of bytes read will be stored in
+					 * chunk_bytes_read. If chunk read returned some bytes, then ignore outofband.
+					 * We won't try a read again until bytes are processed.
+					 */
+					if ((pipe_or_fifo || rm_ptr->follow) && outofband && (0 >= status))
 					{
-						/* process for a non-pipe or r x or r x:1 or r x:0 after timer started*/
-						inchar = 0;
-						/* When a sigusr1 is sent it sets errno to EINTR */
-						/* if it is outofband don't ignore it - don't take the "continue" */
-						/* Don't ignore the out_of_time, however */
-						if (EINTR == errno)
+						PIPE_DEBUG(PRINTF(" %d utf2 stream outofband\n", pid); DEBUGPIPEFLUSH);
+						PUSH_MV_STENT(MVST_ZINTDEV);
+						mv_chain->mv_st_cont.mvs_zintdev.io_ptr = io_ptr;
+						mv_chain->mv_st_cont.mvs_zintdev.curr_sp_buffer.addr =
+							(char *)stringpool.free;
+						mv_chain->mv_st_cont.mvs_zintdev.curr_sp_buffer.len = bytes_count;
+						mv_chain->mv_st_cont.mvs_zintdev.buffer_valid = TRUE;
+						pipeintr->who_saved = pipewhich_readfl;
+						if (0 < msec_timeout && NO_M_TIMEOUT != msec_timeout)
 						{
-							if (out_of_time)
-								status = -2;
-							else if (0 == outofband || !pipe_or_fifo)
-								continue; /* Ignore interrupt if not our wakeup and not outofband */
+							pipeintr->end_time = end_time;
+							pipeintr->end_time_valid = TRUE;
+							/* Worry about timer if/when we come back */
+							if (!rm_ptr->follow)
+								cancel_timer(timer_id);
 						}
+						pipeintr->max_bufflen = exp_width;
+						/* streaming mode uses bytes_count to show how many bytes are in *temp,
+						 * but the interrupt re-entrant code uses bytes_read.
+						 */
+						pipeintr->bytes_read = bytes_count;
+						pipeintr->bytes2read = bytes2read;
+						pipeintr->char_count = bytes_count;
+						pipeintr->add_bytes = add_bytes;
+						pipeintr->bytes_count = bytes_count;
+						PIPE_DEBUG(PRINTF("utf2 stream outofband "
+							  "add_bytes %d bytes_count %d\n",
+							  add_bytes, bytes_count); DEBUGPIPEFLUSH);
+						rm_ptr->mupintr = TRUE;
+						/* Don't step on our parade in the interrupt */
+						stringpool.free += bytes_count;
+						(TREF(pipefifo_interrupt))++;
+						REVERT_GTMIO_CH(&io_curr_device, ch_set);
+						outofband_action(FALSE);
+						assertpro(FALSE);	/* Should *never* return from outofband_action */
+						return FALSE;	/* For the compiler.. */
 					}
-					/* if it is not an outofband signal for a pipe/fifo then break out of the loop */
-					if (0 == outofband || !pipe_or_fifo)
-						break;
-				} else if (status)
-				{
-					status = tchar;
-					inchar = (unsigned char)status;
-					if (pipe_zero_timeout && blocked_in == FALSE)
+					if (-1 == status)
 					{
-						FCNTL3(fildes, F_SETFL, flags, tfcntl_res);
-						if (0 > tfcntl_res)
-							rts_error_csa(CSA_ARG(NULL) VARLSTCNT(8) ERR_SYSCALL, 5,
-								  LEN_AND_LIT("fcntl"), CALLFROM, errno);
-						blocked_in = TRUE;
-						out_of_time = FALSE;
-						/* Set a timer for 1 sec so atomic read x:0 will still work
-						   on loaded systems but timeout on incomplete reads.  Any
-						   characters read prior a timeout will be returned and
-						   $device will be set to "0".*/
-						msec_timeout = timeout2msec(1);
-						start_timer(timer_id, msec_timeout, wake_alarm, 0, NULL);
+						rm_ptr->tot_bytes_in_buffer = chunk_bytes_read;
+						tot_bytes_read = chunk_bytes_read;
+						if (!rm_ptr->pipe && !rm_ptr->fifo)
+							status = chunk_bytes_read;
 					}
-					tot_bytes_read++;
+					else
+						rm_ptr->tot_bytes_in_buffer = status;
+
+				} else if (pipe_zero_timeout)
+					out_of_time = FALSE;	/* reset out_of_time for pipe as no actual read is done */
+				if (0 <= rm_ptr->tot_bytes_in_buffer)
+				{
+					min_bytes_to_copy = (rm_ptr->tot_bytes_in_buffer - rm_ptr->start_pos) >= 1 ? 1 : 0;
+					assert(rm_ptr->start_pos <= rm_ptr->tot_bytes_in_buffer);
+					/* Copy the char to inchar */
+					inchar = rm_ptr->tmp_buffer[rm_ptr->start_pos];
+					/* Increment start_pos. Only 1 byte in M mode */
+					rm_ptr->start_pos += min_bytes_to_copy;
+					/* Set status appropriately so that the following code can continue as if
+					 * a one byte read happened. In case of a negative status, preserve the status
+					 * as-is.
+					 */
+
+					status = (0 <= status) ? min_bytes_to_copy : status;
+				}
+				if (0 <= status)
+				{
+					bytes_read += status;			/* bytes read this pass */
+					tot_bytes_read += bytes_read;		/* total bytes read this command */
+					rm_ptr->file_pos += status;
+					PIPE_DEBUG(PRINTF("M 5: status: %d bytes2read: %d bytes_read: %d "
+							  "%d tot_bytes_read: %d\n", status, bytes2read, bytes_read,
+							  tot_bytes_read); DEBUGPIPEFLUSH);
+					if ((0 < bytes2read) && (0 == status))
+					{	/* EOF  on read */
+						SETZACANCELTIMER;
+						break;			/* nothing read for this char so treat as EOF */
+					}
+					/* Check for the line terminators : NATIVE_NL */
 					if (NATIVE_NL == inchar)
 					{
 						line_term_seen = TRUE;
@@ -882,35 +943,24 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 							break;
 					}
 					*temp++ = inchar;
-					bytes_count++;
+					PIPE_DEBUG(PRINTF("8: move inchar to *temp\n"); DEBUGPIPEFLUSH);
+					bytes_count += status;
+					PIPE_DEBUG(PRINTF("11: bytes_count: %d \n", bytes_count); DEBUGPIPEFLUSH);
 				} else
-					break; /* it's an EOF */
-
-				/* process outofband if set and we didn't see a line terminator or an EOF */
-				if (pipe_or_fifo && outofband)
 				{
-					PIPE_DEBUG(PRINTF(" %d outofband\n", pid); DEBUGPIPEFLUSH);
-					PUSH_MV_STENT(MVST_ZINTDEV);
-					mv_chain->mv_st_cont.mvs_zintdev.io_ptr = io_ptr;
-					mv_chain->mv_st_cont.mvs_zintdev.curr_sp_buffer.addr = (char *)stringpool.free;
-					mv_chain->mv_st_cont.mvs_zintdev.curr_sp_buffer.len = tot_bytes_read;
-					mv_chain->mv_st_cont.mvs_zintdev.buffer_valid = TRUE;
-					pipeintr->who_saved = pipewhich_readfl;
-					if (0 < msec_timeout && NO_M_TIMEOUT != msec_timeout)
+					inchar = 0;
+					if (errno == 0)
 					{
-						pipeintr->end_time = end_time;
-						pipeintr->end_time_valid = TRUE;
-						cancel_timer(timer_id);		/* Worry about timer if/when we come back */
+						tot_bytes_read = 0;
+						status = 0;
+					} else if (EINTR == errno)
+					{
+						if (out_of_time)
+							status = -2;
+						else
+							continue;		/* Ignore interrupt if not our wakeup */
 					}
-					pipeintr->max_bufflen = exp_width;
-					pipeintr->bytes_read = tot_bytes_read;
-					rm_ptr->mupintr = TRUE;
-					stringpool.free += tot_bytes_read;	/* Don't step on our parade in the interrupt */
-					(TREF(pipefifo_interrupt))++;
-					REVERT_GTMIO_CH(&io_curr_device, ch_set);
-					outofband_action(FALSE);
-					assertpro(FALSE);	/* Should *never* return from outofband_action */
-					return FALSE;	/* For the compiler.. */
+					break;
 				}
 			} while (bytes_count < width);
 		}
@@ -1084,9 +1134,9 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 				if (!zint_restart)
 					add_bytes = bytes_read - 1;	/* to satisfy asserts */
 			}
-			PIPE_DEBUG(PRINTF("1: status: %d bytes2read: %d rm_ptr->utf_start_pos: %d "
-					  "rm_ptr->utf_tot_bytes_in_buffer: %d char_bytes_read: %d add_bytes: %d\n",
-					  status, bytes2read, rm_ptr->utf_start_pos, rm_ptr->utf_tot_bytes_in_buffer,
+			PIPE_DEBUG(PRINTF("1: status: %d bytes2read: %d rm_ptr->start_pos: %d "
+					  "rm_ptr->tot_bytes_in_buffer: %d char_bytes_read: %d add_bytes: %d\n",
+					  status, bytes2read, rm_ptr->start_pos, rm_ptr->tot_bytes_in_buffer,
 					  char_bytes_read, add_bytes); DEBUGPIPEFLUSH);
 			char_start = rm_ptr->inbuf_off;
 
@@ -1126,6 +1176,14 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 
 			do
 			{
+				/* In case the CHSET changes from non-UTF-16 to UTF-16 and a read has already been done,
+				 * there's no way to read the BOM bytes & to determine the variant. So default to UTF-16BE.
+				 */
+				if (rm_ptr->done_1st_read &&
+					 (!IS_UTF16_CHSET(rm_ptr->ichset_utf16_variant) && (CHSET_UTF16 == io_ptr->ichset)))
+				{
+					chset = io_ptr->ichset = rm_ptr->ichset_utf16_variant = CHSET_UTF16BE;
+				}
 				if (!rm_ptr->done_1st_read)
 				{
 					/* need to check BOM */
@@ -1170,6 +1228,9 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 						assertpro(FALSE);	/* Should *never* return from outofband_action */
 						return FALSE;	/* For the compiler.. */
 					}
+					/* Set the UTF-16 variant if not already set, and has been determined right now */
+					if (!IS_UTF16_CHSET(rm_ptr->ichset_utf16_variant) && (chset != io_ptr->ichset))
+						rm_ptr->ichset_utf16_variant = io_ptr->ichset;
 					chset = io_ptr->ichset;	/* UTF16 will have changed to UTF16BE or UTF16LE */
 				}
 
@@ -1190,19 +1251,19 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 				}
 
 
-				if ((0 <= status && 0 < bytes2read))
+				if ((0 <= status) && (0 < bytes2read))
 				{
-					PIPE_DEBUG(PRINTF("3: status: %d bytes2read: %d rm_ptr->utf_start_pos: %d "
-							  "rm_ptr->utf_tot_bytes_in_buffer: %d\n",
-							  status, bytes2read, rm_ptr->utf_start_pos,
-							  rm_ptr->utf_tot_bytes_in_buffer); DEBUGPIPEFLUSH);
+					PIPE_DEBUG(PRINTF("3: status: %d bytes2read: %d rm_ptr->start_pos: %d "
+							  "rm_ptr->tot_bytes_in_buffer: %d\n",
+							  status, bytes2read, rm_ptr->start_pos,
+							  rm_ptr->tot_bytes_in_buffer); DEBUGPIPEFLUSH);
 					/* If it is a pipe and at least one character is read, a timer with timer_id
 					   will be started.  It is canceled later in this routine if not expired
 					   prior to return */
-					if (rm_ptr->utf_start_pos == rm_ptr->utf_tot_bytes_in_buffer)
+					if (rm_ptr->start_pos == rm_ptr->tot_bytes_in_buffer)
 					{
-						DEBUG_ONLY(memset(rm_ptr->utf_tmp_buffer, 0, CHUNK_SIZE));
-						rm_ptr->utf_start_pos = rm_ptr->utf_tot_bytes_in_buffer = 0;
+						DEBUG_ONLY(MEMSET_IF_DEFINED(rm_ptr->tmp_buffer, 0, CHUNK_SIZE));
+						rm_ptr->start_pos = rm_ptr->tot_bytes_in_buffer = 0;
 						/* Read CHUNK_SIZE bytes from device into the temporary buffer. By doing this
 						 * one-byte reads can be avoided when in UTF mode.
 						 *
@@ -1211,12 +1272,14 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 						if (rm_ptr->follow && (FALSE == bom_timeout))
 						{
 							/* In follow mode a read returns an EOF if no more bytes are available. */
-							status = read(fildes, rm_ptr->utf_tmp_buffer, CHUNK_SIZE);
-							if ((rm_ptr->input_encrypted) && (0 < status))
+							status = read(fildes, rm_ptr->tmp_buffer, CHUNK_SIZE);
+							if (0 < status)
 							{
-								READ_ENCRYPTED_DATA(rm_ptr, io_ptr->trans_name,
-									rm_ptr->utf_tmp_buffer, status, NULL);
+								if (rm_ptr->input_encrypted)
+									READ_ENCRYPTED_DATA(rm_ptr, io_ptr->trans_name,
+										rm_ptr->tmp_buffer, status, NULL);
 								rm_ptr->read_occurred = TRUE;
+								rm_ptr->done_1st_read = TRUE;
 							}
 							if (0 == status) /* end of file */
 							{
@@ -1308,17 +1371,18 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 							}
 						} else
 						{
-							DOREADRLTO2(fildes, rm_ptr->utf_tmp_buffer, CHUNK_SIZE,
+							DOREADRLTO2(fildes, rm_ptr->tmp_buffer, CHUNK_SIZE,
 								    out_of_time, &blocked_in, rm_ptr->pipe, flags,
 								    status, &utf_tot_bytes_read, timer_id,
 								    &msec_timeout, pipe_zero_timeout, pipe_or_fifo, pipe_or_fifo);
-							if (rm_ptr->input_encrypted && ((0 < status) ||
-									((status < 0) && (0 < utf_tot_bytes_read))))
+							if ((0 < status) || ((0 > status) && (0 < utf_tot_bytes_read)))
 							{
-								READ_ENCRYPTED_DATA(rm_ptr, io_ptr->trans_name,
-									rm_ptr->utf_tmp_buffer,
-									(status > 0) ? status : utf_tot_bytes_read, NULL);
+								if (rm_ptr->input_encrypted)
+									READ_ENCRYPTED_DATA(rm_ptr, io_ptr->trans_name,
+										rm_ptr->tmp_buffer,
+										(status > 0) ? status : utf_tot_bytes_read, NULL);
 								rm_ptr->read_occurred = TRUE;
+								rm_ptr->done_1st_read = TRUE;
 							}
 						}
 						PIPE_DEBUG(PRINTF("4: read chunk  status: %d utf_tot_bytes_read: %d\n",
@@ -1368,38 +1432,38 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 						}
 						if (-1 == status)
 						{
-							rm_ptr->utf_tot_bytes_in_buffer = utf_tot_bytes_read;
+							rm_ptr->tot_bytes_in_buffer = utf_tot_bytes_read;
 							tot_bytes_read = utf_tot_bytes_read;
 							if (!rm_ptr->pipe && !rm_ptr->fifo)
 								status = utf_tot_bytes_read;
 						}
 						else
-							rm_ptr->utf_tot_bytes_in_buffer = status;
+							rm_ptr->tot_bytes_in_buffer = status;
 
 					} else if (pipe_zero_timeout)
 						out_of_time = FALSE;	/* reset out_of_time for pipe as no actual read is done */
-					if (0 <= rm_ptr->utf_tot_bytes_in_buffer)
+					if (0 <= rm_ptr->tot_bytes_in_buffer)
 					{
 						min_bytes_to_copy = MIN(bytes2read,
-									(rm_ptr->utf_tot_bytes_in_buffer - rm_ptr->utf_start_pos));
+									(rm_ptr->tot_bytes_in_buffer - rm_ptr->start_pos));
 						assert(0 <= min_bytes_to_copy);
 						assert(CHUNK_SIZE >= min_bytes_to_copy);
-						assert(rm_ptr->utf_start_pos <= rm_ptr->utf_tot_bytes_in_buffer);
+						assert(rm_ptr->start_pos <= rm_ptr->tot_bytes_in_buffer);
 						/* If we have data in buffer, copy it to inbuf_pos */
 						if (0 < min_bytes_to_copy)
 						{
 							/* If min_bytes_to_copy == 1, avoid memcpy by direct assignment */
 							if (1 == min_bytes_to_copy)
-								*rm_ptr->inbuf_pos = rm_ptr->utf_tmp_buffer[rm_ptr->utf_start_pos];
+								*rm_ptr->inbuf_pos = rm_ptr->tmp_buffer[rm_ptr->start_pos];
 							else
 							{
 								memcpy(rm_ptr->inbuf_pos,
-										rm_ptr->utf_tmp_buffer + rm_ptr->utf_start_pos,
+										rm_ptr->tmp_buffer + rm_ptr->start_pos,
 										min_bytes_to_copy);
 							}
 						}
-						/* Increment utf_start_pos */
-						rm_ptr->utf_start_pos += min_bytes_to_copy;
+						/* Increment start_pos */
+						rm_ptr->start_pos += min_bytes_to_copy;
 						/* Set status appropriately so that the following code can continue as if
 						 * a one byte read happened. In case of a negative status, preserve the status
 						 * as-is.
@@ -1417,7 +1481,7 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 					PIPE_DEBUG(PRINTF("5: status: %d bytes2read: %d bytes_read: %d char_bytes_read: "
 							  "%d tot_bytes_read: %d\n", status, bytes2read, bytes_read,
 							  char_bytes_read, tot_bytes_read); DEBUGPIPEFLUSH);
-					if (0 < bytes2read && 0 == status)
+					if ((0 < bytes2read) && (0 == status))
 					{	/* EOF  on read */
 						if (0 == char_bytes_read)
 							break;			/* nothing read for this char so treat as EOF */
@@ -1679,7 +1743,7 @@ int	iorm_readfl (mval *v, int4 width, int4 timeout) /* timeout in seconds */
 		}
 	}
 
-	if (status == 0 && tot_bytes_read == 0)
+	if ((0 == status) && (0 == tot_bytes_read))
 	{
 		v->str.len = 0;
 		v->str.addr = (char *)stringpool.free;		/* ensure valid address */
diff --git a/sr_unix/iorm_use.c b/sr_unix/iorm_use.c
index cd6e3db..2f0b4bb 100755
--- a/sr_unix/iorm_use.c
+++ b/sr_unix/iorm_use.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -89,10 +89,6 @@
 	((NEW_KEY.len != RM_PTR->DIRECTION ## _key.len)							\
 		|| (0 != memcmp(NEW_KEY.addr, RM_PTR->DIRECTION ## _key.addr, NEW_KEY.len)))
 
-#define GET_ADDR_AND_LEN(ADDR, LEN)									\
-	ADDR = (char *)(pp->str.addr + p_offset + 1);							\
-	LEN = (int)(*(pp->str.addr + p_offset));
-
 #define GET_LEN_AND_ADDR(ADDR, LEN)									\
 	LEN = (int)(*(pp->str.addr + p_offset));							\
 	ADDR = (char *)(pp->str.addr + p_offset + 1);
@@ -184,7 +180,7 @@ void	iorm_use(io_desc *iod, mval *pp)
 	boolean_t	seek_specified, ichset_specified, ochset_specified, chset_allowed;
 	unsigned char	c;
 	short		mode, mode1;
-	int4		length, width, width_bytes, recordsize, padchar;
+	int4		length, width, width_bytes, recordsize, recsize_before, padchar;
 	int		fstat_res, save_errno, rv;
 	d_rm_struct	*rm_ptr;
 	struct stat	statbuf;
@@ -204,7 +200,7 @@ void	iorm_use(io_desc *iod, mval *pp)
 	io_log_name	*dev_name;
 	mstr		input_iv, output_iv, input_key, output_key;
 	char		error_str[MAX_ERROR_SIZE];
-	boolean_t	ch_set;
+	boolean_t	ch_set, def_recsize_before;
 	int		disk_block_multiple;
 	size_t		fwrite_buffer_size;
 
@@ -218,6 +214,8 @@ void	iorm_use(io_desc *iod, mval *pp)
 	seen_wrap = fstat_done = get_mode_done = outdevparam = FALSE;
 	seek_specified = ichset_specified = ochset_specified = chset_allowed = FALSE;
 	dev_name = iod->trans_name;
+	recsize_before = rm_ptr->recordsize;
+	def_recsize_before = rm_ptr->def_recsize;
 	if (ZOS_ONLY(TRUE ||) gtm_utf8_mode)
 		chset_allowed = TRUE;
 	while (*(pp->str.addr + p_offset) != iop_eol)
@@ -334,29 +332,6 @@ void	iorm_use(io_desc *iod, mval *pp)
 						      RTS_ERROR_LITERAL("REWIND"), CALLFROM, errno);
 				}
 
-				/* do fseeko if non-fixed streaming and iod doesn't point to io_std_device.out */
-				/* Only necessary for the non-utf input which uses buffered reads */
-				if (!rm_ptr->fixed && !IS_UTF_CHSET(iod->ichset) && (iod != io_std_device.out))
-				{
-					/* if streaming non-utf move to end of file first to force flush of any
-					   buffered read io */
-					if ((off_t)-1 == fseeko(rm_ptr->filstr, 0, SEEK_END))
-					{
-						save_errno = errno;
-						rts_error_csa(CSA_ARG(NULL) VARLSTCNT(9) ERR_IOERROR, 7,
-							      RTS_ERROR_LITERAL("fseeko"),
-							      RTS_ERROR_LITERAL("REWIND"), CALLFROM, save_errno);
-					}
-
-
-					if ((off_t)-1 == fseeko(rm_ptr->filstr, 0, SEEK_SET))	/* Rewind the input stream */
-					{
-						rts_error_csa(CSA_ARG(NULL) VARLSTCNT(9) ERR_IOERROR, 7,
-							      RTS_ERROR_LITERAL("fseeko"),
-							      RTS_ERROR_LITERAL("REWIND"), CALLFROM, errno);
-					}
-				}
-
 				/* need to do FSTAT_FILE to get file size if not already done */
 				FSTAT_CHECK(FALSE);
 
@@ -373,11 +348,11 @@ void	iorm_use(io_desc *iod, mval *pp)
 				rm_ptr->inbuf_top = rm_ptr->inbuf_off = rm_ptr->inbuf_pos = rm_ptr->inbuf;
 				rm_ptr->file_pos = 0;
 				/* Reset temporary buffer so that the next read starts afresh */
-				if (IS_UTF_CHSET(iod->ichset))
+				if (!rm_ptr->fixed || IS_UTF_CHSET(iod->ichset))
 				{
-					DEBUG_ONLY(memset(rm_ptr->utf_tmp_buffer, 0, CHUNK_SIZE));
-					rm_ptr->utf_start_pos = 0;
-					rm_ptr->utf_tot_bytes_in_buffer = 0;
+					DEBUG_ONLY(MEMSET_IF_DEFINED(rm_ptr->tmp_buffer, 0, CHUNK_SIZE));
+					rm_ptr->start_pos = 0;
+					rm_ptr->tot_bytes_in_buffer = 0;
 				}
 				/* If encrypted, release and acquire the cipher handle once again. This way, we reset the encryption
 				 * state to read the encrypted data. Any writes henceforth will issue error (NOTTOEOFOUTPUT) unless
@@ -520,15 +495,15 @@ void	iorm_use(io_desc *iod, mval *pp)
 				}
 				iod->dollar.zeof = TRUE;
 				/* Reset temporary buffer so that the next read can start afresh */
-				if (IS_UTF_CHSET(iod->ichset))
+				if (!rm_ptr->fixed || IS_UTF_CHSET(iod->ichset))
 				{
 					rm_ptr->inbuf_top = rm_ptr->inbuf_off = rm_ptr->inbuf_pos = rm_ptr->inbuf;
 					if (RM_WRITE != rm_ptr->lastop && rm_ptr->fixed)
 						rm_ptr->out_bytes = 0;
 					rm_ptr->bom_buf_cnt = rm_ptr->bom_buf_off = 0;
-					DEBUG_ONLY(memset(rm_ptr->utf_tmp_buffer, 0, CHUNK_SIZE));
-					rm_ptr->utf_start_pos = 0;
-					rm_ptr->utf_tot_bytes_in_buffer = 0;
+					DEBUG_ONLY(MEMSET_IF_DEFINED(rm_ptr->tmp_buffer, 0, CHUNK_SIZE));
+					rm_ptr->start_pos = 0;
+					rm_ptr->tot_bytes_in_buffer = 0;
 					if (RM_WRITE == rm_ptr->lastop && rm_ptr->fixed && iod->dollar.x == iod->width)
 						iod->dollar.x = 0;
 					if (0 == rm_ptr->file_pos)
@@ -619,13 +594,14 @@ void	iorm_use(io_desc *iod, mval *pp)
 				ICONV_OPEN_CD(iod->input_conv_cd, (char *)(pp->str.addr + p_offset + 1),
 					      INSIDE_CH_SET);
 #endif
-			if (chset_allowed && (dev_open != iod->state))
+			if (chset_allowed)
 			{
 				GET_ADDR_AND_LEN(chset_mstr.addr, chset_mstr.len);
 				SET_ENCODING(temp_chset, &chset_mstr);
 				if (!gtm_utf8_mode && IS_UTF_CHSET(temp_chset))
 					break;	/* ignore UTF chsets if not utf8_mode */
-				iod->ichset = temp_chset;
+
+				CHECK_UTF16_VARIANT_AND_SET_CHSET(rm_ptr->ichset_utf16_variant, iod->ichset, temp_chset);
 				ichset_specified = TRUE;
 			}
 		}
@@ -642,13 +618,13 @@ void	iorm_use(io_desc *iod, mval *pp)
 				ICONV_OPEN_CD(iod->output_conv_cd, INSIDE_CH_SET,
 					      (char *)(pp->str.addr + p_offset + 1));
 #endif
-			if (chset_allowed && (dev_open != iod->state))
+			if (chset_allowed)
 			{
 				GET_ADDR_AND_LEN(chset_mstr.addr, chset_mstr.len);
 				SET_ENCODING(temp_chset, &chset_mstr);
 				if (!gtm_utf8_mode && IS_UTF_CHSET(temp_chset))
 					break;	/* ignore UTF chsets if not utf8_mode */
-				iod->ochset = temp_chset;
+				CHECK_UTF16_VARIANT_AND_SET_CHSET(rm_ptr->ochset_utf16_variant, iod->ochset, temp_chset);
 				ochset_specified = TRUE;
 				if (gtm_utf8_mode && !IS_PADCHAR_VALID(iod->ochset, rm_ptr->padchar))
 					rts_error_csa(CSA_ARG(NULL) VARLSTCNT(2) ERR_PADCHARINVALID, 0);
@@ -657,16 +633,16 @@ void	iorm_use(io_desc *iod, mval *pp)
 		break;
                 case iop_chset:
 		{
-			if (chset_allowed && (dev_open != iod->state))
+			if (chset_allowed)
 			{
 				GET_ADDR_AND_LEN(chset_mstr.addr, chset_mstr.len);
 				SET_ENCODING(temp_chset, &chset_mstr);
 				if (!gtm_utf8_mode && IS_UTF_CHSET(temp_chset))
 					break;	/* ignore UTF chsets if not utf8_mode */
-				iod->ochset = temp_chset;
+				CHECK_UTF16_VARIANT_AND_SET_CHSET(rm_ptr->ichset_utf16_variant, iod->ichset, temp_chset);
+				CHECK_UTF16_VARIANT_AND_SET_CHSET(rm_ptr->ochset_utf16_variant, iod->ochset, temp_chset);
 				if (gtm_utf8_mode && !IS_PADCHAR_VALID(iod->ochset, rm_ptr->padchar))
 					rts_error_csa(CSA_ARG(NULL) VARLSTCNT(2) ERR_PADCHARINVALID, 0);
-				iod->ichset = iod->ochset;
 				ochset_specified = ichset_specified = TRUE;
 			}
 		}
@@ -863,30 +839,6 @@ void	iorm_use(io_desc *iod, mval *pp)
 							      RTS_ERROR_LITERAL("lseek"),
 							      RTS_ERROR_LITERAL("SEEK"), CALLFROM, save_errno);
 					}
-					/* do fseeko if non-fixed streaming and iod doesn't point to io_std_device.out */
-					/* Only necessary for the non-utf input which uses buffered reads */
-					if (!rm_ptr->fixed && !IS_UTF_CHSET(iod->ichset) && (iod != io_std_device.out))
-					{
-						/* if open then move to end of file first to force flush of any buffered read io */
-						if (iod->state == dev_open)
-						{
-							if ((off_t)-1 == fseeko(rm_ptr->filstr, 0, SEEK_END))
-							{
-								save_errno = errno;
-								rts_error_csa(CSA_ARG(NULL) VARLSTCNT(9) ERR_IOERROR, 7,
-									      RTS_ERROR_LITERAL("fseeko"),
-									      RTS_ERROR_LITERAL("SEEK"), CALLFROM, save_errno);
-							}
-						}
-						/* move input stream */
-						if ((off_t)-1 == fseeko(rm_ptr->filstr, new_position, SEEK_SET))
-						{
-							save_errno = errno;
-							rts_error_csa(CSA_ARG(NULL) VARLSTCNT(9) ERR_IOERROR, 7,
-								      RTS_ERROR_LITERAL("fseeko"),
-								      RTS_ERROR_LITERAL("SEEK"), CALLFROM, save_errno);
-						}
-					}
 					if (statbuf.st_size == new_position) /* at end of file */
 						iod->dollar.zeof = TRUE;
 					else
@@ -900,14 +852,14 @@ void	iorm_use(io_desc *iod, mval *pp)
 					rm_ptr->lastop = RM_NOOP;
 					rm_ptr->file_pos = new_position;
 					/* Reset temporary buffer so that the next read starts afresh */
-					if (IS_UTF_CHSET(iod->ichset))
+					if (!rm_ptr->fixed || IS_UTF_CHSET(iod->ichset))
 					{
 						/* if not at beginning of file then don't read BOM */
 						rm_ptr->out_bytes = rm_ptr->bom_buf_cnt = rm_ptr->bom_buf_off = 0;
 						rm_ptr->inbuf_top = rm_ptr->inbuf_off = rm_ptr->inbuf_pos = rm_ptr->inbuf;
-						DEBUG_ONLY(memset(rm_ptr->utf_tmp_buffer, 0, CHUNK_SIZE));
-						rm_ptr->utf_start_pos = 0;
-						rm_ptr->utf_tot_bytes_in_buffer = 0;
+						DEBUG_ONLY(MEMSET_IF_DEFINED(rm_ptr->tmp_buffer, 0, CHUNK_SIZE));
+						rm_ptr->start_pos = 0;
+						rm_ptr->tot_bytes_in_buffer = 0;
 					}
 				}
 			}
@@ -959,16 +911,16 @@ void	iorm_use(io_desc *iod, mval *pp)
 		p_offset += ((IOP_VAR_SIZE == io_params_size[c]) ?
 			     (unsigned char)*(pp->str.addr + p_offset) + 1 : io_params_size[c]);
 	}
-	if (dev_open != iod->state)
+	if (dev_open != iod->state || ichset_specified || ochset_specified)
 	{
-		if (!ichset_specified && !rm_ptr->no_destroy)
+		if (dev_open != iod->state && !ichset_specified && !rm_ptr->no_destroy)
 		{
 #			ifdef __MVS__
 			iod->is_ichset_default = TRUE;
 #			endif
 			iod->ichset = (gtm_utf8_mode) ? CHSET_UTF8 : CHSET_M;
 		}
-		if (!ochset_specified && !rm_ptr->no_destroy)
+		if (dev_open != iod->state && !ochset_specified && !rm_ptr->no_destroy)
 		{
 #			ifdef __MVS__
 			iod->is_ochset_default = TRUE;
@@ -979,7 +931,7 @@ void	iorm_use(io_desc *iod, mval *pp)
 			get_chset_desc(&chset_names[iod->ichset]);
 		if ((CHSET_M != iod->ochset) && (CHSET_UTF16 != iod->ochset) && (CHSET_MAX_IDX > iod->ochset))
 			get_chset_desc(&chset_names[iod->ochset]);
-		/* If ICHSET or OCHSET is of type UTF-16, check that RECORDSIZE is even */
+		/* If ICHSET or OCHSET is of type UTF-16, check that RECORDSIZE is even. */
 		if (gtm_utf8_mode && (IS_UTF16_CHSET(iod->ichset) || IS_UTF16_CHSET(iod->ochset)))
 		{
 			if (rm_ptr->def_recsize)
@@ -992,6 +944,65 @@ void	iorm_use(io_desc *iod, mval *pp)
 		}
 	}
 
+	/* Now that recordsize and CHSET parms have been handled (if any), set WIDTH if necessary */
+	if (rm_ptr->def_width && (recsize_before != rm_ptr->recordsize || def_recsize_before != rm_ptr->def_recsize))
+	{	/* record size was specified even if the same value */
+		SET_WIDTH_BYTES;
+		assert(width_bytes <= rm_ptr->recordsize);	/* or else RECSIZENOTEVEN error would have been issued */
+		iod->width = rm_ptr->recordsize;	/* this width will hold at least one character due to above check */
+	}
+	if (dev_closed == iod->state)
+	{
+		if (IS_UTF_CHSET(iod->ichset))
+		{
+			assert(gtm_utf8_mode);
+			/* We shouldn't have an existing buffer at this point if not closed nodestroy */
+			if (!rm_ptr->no_destroy)
+				assert(NULL == rm_ptr->inbuf);
+		}
+		if (IS_UTF16_CHSET(iod->ochset))
+		{
+			/* We shouldn't have an existing buffer at this point if not closed nodestroy*/
+			if (!rm_ptr->no_destroy)
+				assert(NULL == rm_ptr->outbuf);
+		}
+	}
+	/* Now adjust the buffer based on new CHSET & recordsize, If the file was already opened */
+	if (dev_open == iod->state)
+	{
+		if ((!rm_ptr->fixed || IS_UTF_CHSET(iod->ichset)) && (recsize_before != rm_ptr->recordsize))
+		{
+			if (NULL != rm_ptr->inbuf)
+			{
+				free(rm_ptr->inbuf);
+				rm_ptr->inbuf = NULL;
+			}
+		}
+		if (IS_UTF16_CHSET(iod->ochset) && (recsize_before != rm_ptr->recordsize))
+		{
+			if (NULL != rm_ptr->outbuf)
+			{
+				free(rm_ptr->outbuf);
+				rm_ptr->outbuf=NULL;
+			}
+		}
+	}
+	/* Allocate the buffers in case it is UTF mode and not already allocated. */
+	if ((NULL == rm_ptr->inbuf) && IS_UTF_CHSET(iod->ichset))
+	{
+		rm_ptr->bufsize = rm_ptr->fixed ? (rm_ptr->recordsize + 4) : 20;
+		rm_ptr->inbuf = malloc(rm_ptr->bufsize);
+		rm_ptr->inbuf_pos = rm_ptr->inbuf_top = rm_ptr->inbuf_off = rm_ptr->inbuf;
+	}
+	if ((NULL == rm_ptr->tmp_buffer) && (IS_UTF_CHSET(iod->ichset) || !rm_ptr->fixed))
+		rm_ptr->tmp_buffer = malloc(CHUNK_SIZE);
+	if ((NULL == rm_ptr->outbuf) && IS_UTF16_CHSET(iod->ochset))
+	{
+		rm_ptr->outbufsize = rm_ptr->recordsize + 4;
+		rm_ptr->outbuf = malloc(rm_ptr->outbufsize);
+		rm_ptr->out_bytes = 0;
+	}
+
 	assert(((!rm_ptr->input_encrypted) && (!rm_ptr->output_encrypted)) || (dev_open == iod->state) || rm_ptr->no_destroy);
 	assert((!rm_ptr->input_encrypted) || (0 != rm_ptr->input_key.len));
 	assert((!rm_ptr->output_encrypted) || (0 != rm_ptr->output_key.len));
diff --git a/sr_unix/iorm_write.c b/sr_unix/iorm_write.c
index 7cafe90..04ad9fa 100755
--- a/sr_unix/iorm_write.c
+++ b/sr_unix/iorm_write.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information 	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -151,6 +151,13 @@ void iorm_write_utf(mstr *v)
 	if (CHSET_UTF8 != iod->ochset)
 	{
 		outstart = nextoutptr = outptr = &rm_ptr->outbuf[rm_ptr->out_bytes];
+		/* In case the CHSET changes from non-UTF-16 to UTF-16 and a read has already been done,
+		 * there's no way to read the BOM bytes & to determine the variant. So default to UTF-16BE.
+		 */
+		if (rm_ptr->done_1st_write && ((CHSET_UTF16 == iod->ochset) && !IS_UTF16_CHSET(rm_ptr->ochset_utf16_variant)))
+		{
+			iod->ochset = rm_ptr->ochset_utf16_variant = CHSET_UTF16BE;
+		}
 		if (!rm_ptr->done_1st_write)
 		{	/* get the file size  */
 			FSTAT_FILE(rm_ptr->fildes, &statbuf, fstat_res);
@@ -190,6 +197,9 @@ void iorm_write_utf(mstr *v)
 				iod->ochset = CHSET_UTF16BE;
 				get_chset_desc(&chset_names[iod->ochset]);
 			}
+			if (!IS_UTF16_CHSET(rm_ptr->ochset_utf16_variant) &&
+				(IS_UTF16_CHSET(iod->ochset) && (CHSET_UTF16 != iod->ochset)))
+				rm_ptr->ochset_utf16_variant = iod->ochset;
 		}
 	} else
 		outstart = (unsigned char *)v->addr;	/* write from the UTF-8 string */
diff --git a/sr_unix/iormdef.h b/sr_unix/iormdef.h
index 000c953..82c818f 100755
--- a/sr_unix/iormdef.h
+++ b/sr_unix/iormdef.h
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information 	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -18,7 +18,7 @@
 #define DEF_RM_WIDTH		32767
 #define DEF_RM_RECORDSIZE	32767
 #define DEF_RM_LENGTH		66
-#define CHUNK_SIZE		512
+#define CHUNK_SIZE		BUFSIZ
 
 #define	ONE_COMMA		"1,"
 #define	ONE_COMMA_UNAVAILABLE	"1,Resource temporarily unavailable"
@@ -26,7 +26,7 @@
 
 #define	DEF_RM_PADCHAR		' '	/* SPACE */
 
-/*#define DEBUG_PIPE*/
+/*	#define DEBUG_PIPE	*/
 
 #ifdef DEBUG_PIPE
 #define PIPE_DEBUG(X) X
@@ -68,6 +68,12 @@ int pid;
 error_def(ERR_CLOSEFAIL);
 error_def(ERR_CRYPTBADWRTPOS);
 
+#define MEMSET_IF_DEFINED(BUFFER, CHAR, SIZE)				\
+{									\
+	if (NULL != BUFFER)						\
+		memset(BUFFER, CHAR, SIZE);				\
+}
+
 #define	IORM_FCLOSE(D_RM, FILDES, FILSTR)								\
 {													\
 	GBLREF int	process_exiting;								\
@@ -260,9 +266,9 @@ typedef struct
 	FILE		*filstr;
 	off_t		file_pos;
 	long		pipe_buff_size;
-	char		utf_tmp_buffer[CHUNK_SIZE];	/* Buffer to store CHUNK bytes */
-	int		utf_tot_bytes_in_buffer;	/* Number of bytes read from device, it refers utf_tmp_buffer buffer */
-	int		utf_start_pos;			/* Current position in utf_tmp_buffer */
+	char		*tmp_buffer;			/* Buffer to store CHUNK_SIZE bytes */
+	int		tot_bytes_in_buffer;		/* Number of bytes read from device, it refers tmp_buffer buffer */
+	int		start_pos;			/* Current position in tmp_buffer */
 	boolean_t	write_occurred;			/* Flag indicating whether a write has occurred on this device. */
 	boolean_t	read_occurred;			/* Flag indicating whether a read has occurred on this device. */
 	boolean_t	input_encrypted;		/* Whether this device's input stream is encrypted or not. */
@@ -273,6 +279,8 @@ typedef struct
 	mstr		output_key;			/* Name that maps to an output encryption key on disk. */
 	gtmcrypt_key_t	input_cipher_handle;		/* Encryption cipher handle for this device. */
 	gtmcrypt_key_t	output_cipher_handle;		/* Decryption cipher handle for this device. */
+	gtm_chset_t	ichset_utf16_variant;		/* Used to determine UTF16 variant when CHSET is changed b/w UTF16 & M. */
+	gtm_chset_t	ochset_utf16_variant;		/* Used to determine UTF16 variant when CHSET is changed b/w UTF16 & M. */
 	uint4		fsblock_buffer_size;		/* I/O buffer size; 1 == default size; 0 == no buffering */
 	char		*fsblock_buffer;		/* I/O buffer for, erm, buffered I/O */
 } d_rm_struct;	/*  rms		*/
diff --git a/sr_unix/iott_open.c b/sr_unix/iott_open.c
index e9f6b11..9730a2a 100755
--- a/sr_unix/iott_open.c
+++ b/sr_unix/iott_open.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information 	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -52,7 +52,8 @@ short iott_open(io_log_name *dev_name, mval *pp, int fd, mval *mspace, int4 time
 	int		status, chset_index;
 	int		save_errno;
 	int		p_offset;
-	mstr		chset;
+	mstr		chset_mstr;
+	gtm_chset_t	temp_chset, old_ichset, old_ochset;
 	boolean_t	empt = FALSE;
 	boolean_t	ch_set;
 
@@ -75,6 +76,8 @@ short iott_open(io_log_name *dev_name, mval *pp, int fd, mval *mspace, int4 time
 	if (tt_ptr->mupintr)
 		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(1) ERR_ZINTRECURSEIO);
 	p_offset = 0;
+	old_ichset = ioptr->ichset;
+	old_ochset = ioptr->ochset;
 	while (*(pp->str.addr + p_offset) != iop_eol)
 	{
 		if ((ch = *(pp->str.addr + p_offset++)) == iop_exception)
@@ -95,23 +98,28 @@ short iott_open(io_log_name *dev_name, mval *pp, int fd, mval *mspace, int4 time
 			ioptr->ichset = ioptr->ochset = CHSET_M;
 		else if (gtm_utf8_mode && iop_utf8 == ch)
 			ioptr->ichset = ioptr->ochset = CHSET_UTF8;
-		else if (gtm_utf8_mode && (iop_ipchset == ch || iop_opchset == ch))
+		else if (gtm_utf8_mode && (iop_ipchset == ch || iop_opchset == ch || iop_chset == ch))
 		{
-			chset.len = *(pp->str.addr + p_offset);
-			chset.addr = (char *)(pp->str.addr + p_offset + 1);
-			chset_index = verify_chset(&chset);
-			if (CHSET_M == chset_index)
-				if (iop_ipchset == ch)
-					ioptr->ichset = CHSET_M;
-				else
-					ioptr->ochset = CHSET_M;
-			else if (CHSET_UTF8 == chset_index)
-				if (iop_ipchset == ch)
-					ioptr->ichset = CHSET_UTF8;
-				else
-					ioptr->ochset = CHSET_UTF8;
+			GET_ADDR_AND_LEN(chset_mstr.addr, chset_mstr.len);
+			SET_ENCODING(temp_chset, &chset_mstr);
+			if (IS_UTF16_CHSET(temp_chset))		/* Not allowed for terminals */
+				rts_error_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_BADCHSET, 2, chset_mstr.len, chset_mstr.addr);
 			else
-				rts_error_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_BADCHSET, 2, chset.len, chset.addr);
+			{
+				switch(ch)
+				{
+					case iop_ipchset:
+						ioptr->ichset = temp_chset;
+						break;
+					case iop_opchset:
+						ioptr->ochset = temp_chset;
+						break;
+					case iop_chset:
+						ioptr->ichset = temp_chset;
+						ioptr->ochset = temp_chset;
+						break;
+				}
+			}
 		}
 		p_offset += ((IOP_VAR_SIZE == io_params_size[ch]) ?
 			(unsigned char)*(pp->str.addr + p_offset) + 1 : io_params_size[ch]);
@@ -162,7 +170,8 @@ short iott_open(io_log_name *dev_name, mval *pp, int fd, mval *mspace, int4 time
 			tt_ptr->ext_cap = 0;
 		if (empt)
 			tt_ptr->ext_cap |= TT_EMPTERM;
-		if (tt_ptr->default_mask_term)
+		/* Set terminal mask on the terminal not open, if default_term or if CHSET changes */
+		if (tt_ptr->default_mask_term || (old_ichset != ioptr->ichset))
 		{
 			memset(&tt_ptr->mask_term.mask[0], 0, SIZEOF(io_termmask));
 			if (CHSET_M != ioptr->ichset)
@@ -171,6 +180,7 @@ short iott_open(io_log_name *dev_name, mval *pp, int fd, mval *mspace, int4 time
 				tt_ptr->mask_term.mask[4] = TERM_MSK_UTF8_4;
 			} else
 				tt_ptr->mask_term.mask[0] = TERM_MSK;
+			tt_ptr->default_mask_term = TRUE;
 		}
 		ioptr->state = dev_open;
 		if ((TT_EDITING & tt_ptr->ext_cap) && !tt_ptr->recall_buff.addr)
@@ -181,6 +191,20 @@ short iott_open(io_log_name *dev_name, mval *pp, int fd, mval *mspace, int4 time
 			tt_ptr->recall_buff.len = 0;	/* nothing in buffer */
 			tt_ptr->recall_width = 0;
 		}
+	} else
+	{
+		/* Set terminal mask on the already open terminal, if CHSET changes */
+		if (old_ichset != ioptr->ichset)
+		{
+			memset(&tt_ptr->mask_term.mask[0], 0, SIZEOF(io_termmask));
+			if (CHSET_M != ioptr->ichset)
+			{
+				tt_ptr->mask_term.mask[0] = TERM_MSK_UTF8_0;
+				tt_ptr->mask_term.mask[4] = TERM_MSK_UTF8_4;
+			} else
+				tt_ptr->mask_term.mask[0] = TERM_MSK;
+			tt_ptr->default_mask_term = TRUE;
+		}
 	}
 	REVERT_GTMIO_CH(&ioptr->pair, ch_set);
 	return TRUE;
diff --git a/sr_unix/iott_readfl.c b/sr_unix/iott_readfl.c
index ab3a489..9d208a8 100755
--- a/sr_unix/iott_readfl.c
+++ b/sr_unix/iott_readfl.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information 	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -614,8 +614,7 @@ int	iott_readfl(mval *v, int4 length, int4 timeout)	/* timeout in seconds */
 							{
 								for (i = 0; i < delchar_width; i++)
 								{
-									DOWRITERC(tt_ptr->fildes, eraser,
-										SIZEOF(eraser), status)
+									DOWRITERC(tt_ptr->fildes, eraser, SIZEOF(eraser), status);
 									if (0 != status)
 										break;
 								}
diff --git a/sr_unix/iott_use.c b/sr_unix/iott_use.c
index ce57c01..de40d26 100755
--- a/sr_unix/iott_use.c
+++ b/sr_unix/iott_use.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information 	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -34,6 +34,7 @@
 #include "stringpool.h"
 #include "send_msg.h"
 #include "namelook.h"
+#include "gtm_conv.h"
 #include "error.h"
 #include "gtm_tputs.h"
 #include "gtm_tparm.h"
@@ -72,7 +73,7 @@ error_def(ERR_ZINTRECURSEIO);
 
 void iott_use(io_desc *iod, mval *pp)
 {
-	boolean_t		flush_input;
+	boolean_t		flush_input, terminator_specified = FALSE;
 	char			dc1, *ttab;
 	d_tt_struct		*temp_ptr, *tt_ptr;
 	int			p_offset, fil_type, save_errno, status;
@@ -81,6 +82,8 @@ void iott_use(io_desc *iod, mval *pp)
 	io_termmask		mask_term;
 	struct sigaction	act;
 	struct termios		t;
+	mstr			chset_mstr;
+	gtm_chset_t		temp_chset, old_ochset, old_ichset;
 	uint4			mask_in;
 	unsigned char		ch, len;
 	boolean_t		ch_set;
@@ -114,6 +117,8 @@ void iott_use(io_desc *iod, mval *pp)
 		temp_ptr = (d_tt_struct *)d_in->dev_sp;
 		mask_in = temp_ptr->term_ctrl;
 		mask_term = temp_ptr->mask_term;
+		old_ochset = iod->ochset;
+		old_ichset = iod->ichset;
 		while (*(pp->str.addr + p_offset) != iop_eol)
 		{
 			switch (ch = *(pp->str.addr + p_offset++))
@@ -301,6 +306,7 @@ void iott_use(io_desc *iod, mval *pp)
 					break;
 				case iop_terminator:
 					memcpy(&mask_term.mask[0], (pp->str.addr + p_offset), SIZEOF(io_termmask));
+					terminator_specified = TRUE;
 					temp_ptr = (d_tt_struct *)d_in->dev_sp;
 					if (mask_term.mask[0] == NUL &&
 						mask_term.mask[1] == NUL &&
@@ -310,17 +316,10 @@ void iott_use(io_desc *iod, mval *pp)
 						mask_term.mask[5] == NUL &&
 						mask_term.mask[6] == NUL &&
 						mask_term.mask[7] == NUL)
-					{
 						temp_ptr->default_mask_term = TRUE;
-						if (CHSET_UTF8 == d_in->ichset)
-						{
-							mask_term.mask[0] = TERM_MSK_UTF8_0;
-							mask_term.mask[4] = TERM_MSK_UTF8_4;
-						} else
-							mask_term.mask[0] = TERM_MSK;
-					} else
+					else
 						temp_ptr->default_mask_term = FALSE;
-						break;
+					break;
 				case iop_noterminator:
 					temp_ptr = (d_tt_struct *)d_in->dev_sp;
 					temp_ptr->default_mask_term = FALSE;
@@ -403,6 +402,14 @@ void iott_use(io_desc *iod, mval *pp)
 							ICONV_OPEN_CD(iod->input_conv_cd,
 								(char *)(pp->str.addr + p_offset + 1), INSIDE_CH_SET);
 #						endif
+						GET_ADDR_AND_LEN(chset_mstr.addr, chset_mstr.len);
+						SET_ENCODING(temp_chset, &chset_mstr);
+						if (!gtm_utf8_mode && IS_UTF_CHSET(temp_chset))
+							break;	/* ignore UTF chsets if not utf8_mode. */
+						if (IS_UTF16_CHSET(temp_chset))		/* UTF16 is not valid for TTY */
+							rts_error_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_BADCHSET, 2,
+								 chset_mstr.len, chset_mstr.addr);
+						iod->ichset = temp_chset;
 						break;
 					}
 				case iop_opchset:
@@ -417,6 +424,26 @@ void iott_use(io_desc *iod, mval *pp)
 							ICONV_OPEN_CD(iod->output_conv_cd, INSIDE_CH_SET,
 								(char *)(pp->str.addr + p_offset + 1));
 #						endif
+						GET_ADDR_AND_LEN(chset_mstr.addr, chset_mstr.len);
+						SET_ENCODING(temp_chset, &chset_mstr);
+						if (!gtm_utf8_mode && IS_UTF_CHSET(temp_chset))
+							break;	/* ignore UTF chsets if not utf8_mode. */
+						if (IS_UTF16_CHSET(temp_chset))		/* UTF16 is not valid for TTY */
+							rts_error_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_BADCHSET, 2,
+								 chset_mstr.len, chset_mstr.addr);
+						iod->ochset = temp_chset;
+						break;
+					}
+				case iop_chset:
+					{
+						GET_ADDR_AND_LEN(chset_mstr.addr, chset_mstr.len);
+						SET_ENCODING(temp_chset, &chset_mstr);
+						if (!gtm_utf8_mode && IS_UTF_CHSET(temp_chset))
+							break;	/* ignore UTF chsets if not utf8_mode. */
+						if (IS_UTF16_CHSET(temp_chset))		/* UTF16 is not valid for TTY */
+							rts_error_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_BADCHSET, 2,
+								 chset_mstr.len, chset_mstr.addr);
+						iod->ichset = iod->ochset = temp_chset;
 						break;
 					}
 			}
@@ -427,8 +454,24 @@ void iott_use(io_desc *iod, mval *pp)
 		Tcsetattr(tt_ptr->fildes, TCSANOW, &t, status, save_errno);
 		if (0 != status)
 			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_TCSETATTR, 1, tt_ptr->fildes, save_errno);
-		temp_ptr->term_ctrl = mask_in;
-		memcpy(&temp_ptr->mask_term, &mask_term, SIZEOF(io_termmask));
+		if (tt == d_in->type)
+		{
+			temp_ptr->term_ctrl = mask_in;
+			/* reset the mask to default if chset was changed without specifying new terminators or Default */
+			if ((!terminator_specified && (old_ichset != iod->ichset)) ||
+				(terminator_specified && temp_ptr->default_mask_term))
+			{
+				memset(&mask_term.mask[0], 0, SIZEOF(io_termmask));
+				if (CHSET_M != iod->ichset)
+				{
+					mask_term.mask[0] = TERM_MSK_UTF8_0;
+					mask_term.mask[4] = TERM_MSK_UTF8_4;
+				} else
+					mask_term.mask[0] = TERM_MSK;
+				temp_ptr->default_mask_term = TRUE;
+			}
+			memcpy(&temp_ptr->mask_term, &mask_term, SIZEOF(io_termmask));
+		}
 		if (flush_input)
 		{
 			TCFLUSH(tt_ptr->fildes, TCIFLUSH, status);
diff --git a/sr_unix/is_fstype_nfs.c b/sr_unix/is_fstype_nfs.c
new file mode 100644
index 0000000..8303836
--- /dev/null
+++ b/sr_unix/is_fstype_nfs.c
@@ -0,0 +1,46 @@
+/****************************************************************
+ *								*
+ * Copyright (c) 2016 Fidelity National Information		*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
+ *								*
+ *	This source code contains the intellectual property	*
+ *	of its copyright holder(s), and is made available	*
+ *	under a license.  If you do not know the terms of	*
+ *	the license, please stop and do not read further.	*
+ *								*
+ ****************************************************************/
+#include "mdef.h"
+
+#include <sys/statfs.h>
+#ifdef _AIX
+#include <sys/vmount.h>	/* needed for MNT_NFS */
+#endif
+
+#if defined( __linux__) || defined(__CYGWIN__)
+/* Define NFS_SUPER_MAGIC. This should ideally include <linux/nfs_fs.h> for NFS_SUPER_MAGIC.
+ * However, this header file doesn't seem to be standard and gives lots of
+ * compilation errors and hence defining again here.  The constant value
+ * seems to be portable across all linuxes (courtesy 'statfs' man pages)
+ */
+# define NFS_SUPER_MAGIC 0x6969
+#endif
+
+#include "is_fstype_nfs.h"
+
+boolean_t is_fstype_nfs(int fd)
+{
+	struct statfs	buf;
+	boolean_t	is_nfs;
+
+	is_nfs = FALSE;
+	if (0 != fstatfs(fd, &buf))
+		return is_nfs;
+#	if defined(__linux__)
+	is_nfs = (NFS_SUPER_MAGIC == buf.f_type);
+#	elif defined(_AIX)
+	is_nfs = (MNT_NFS == buf.f_vfstype);
+#	else
+#	error UNSUPPORTED PLATFORM
+#	endif
+	return is_nfs;
+}
diff --git a/sr_port/t_abort.h b/sr_unix/is_fstype_nfs.h
old mode 100755
new mode 100644
similarity index 64%
copy from sr_port/t_abort.h
copy to sr_unix/is_fstype_nfs.h
index c5dffb1..427ee29
--- a/sr_port/t_abort.h
+++ b/sr_unix/is_fstype_nfs.h
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2004 Sanchez Computer Associates, Inc.	*
+ * Copyright (c) 2016 Fidelity National Information		*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -9,9 +10,9 @@
  *								*
  ****************************************************************/
 
-#ifndef T_ABORT_DEFINED
-#define T_ABORT_DEFINED
+#ifndef IS_FSTYPE_NFS_H_INCLUDED
+#define IS_FSTYPE_NFS_H_INCLUDED
 
-void	t_abort(gd_region *reg, sgmnt_addrs *csa);
+boolean_t	is_fstype_nfs(int fd);
 
 #endif
diff --git a/sr_unix/is_proc_alive.c b/sr_unix/is_proc_alive.c
index 338f04d..0fa8e8b 100755
--- a/sr_unix/is_proc_alive.c
+++ b/sr_unix/is_proc_alive.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001, 2015 Fidelity National Information	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -11,16 +11,21 @@
  ****************************************************************/
 
 #include "mdef.h"
-#include <errno.h>
-#include <signal.h>
 
+#include <errno.h>
 #ifdef __MVS__
 #include <sys/resource.h>
 #endif
 
+#include "gtm_signal.h"
+
 #include "is_proc_alive.h"
-/*
- * ----------------------------------------------
+
+#ifdef DEBUG
+GBLREF	uint4			process_id;
+#endif
+
+/* ----------------------------------------------
  * Check if process is still alive
  *
  * Arguments:
@@ -50,12 +55,10 @@ bool is_proc_alive(int4 pid, int4 imagecnt)
 #	endif
 	if (status)
 	{
-		assert(status == -1 && (errno == EPERM || errno == ESRCH));
-		if (errno == ESRCH)
-			ret = FALSE;
-		else
-			ret = TRUE;
+		assert((-1 == status) && ((EPERM == errno) || (ESRCH == errno)));
+		ret = (ESRCH != errno);
 	} else
 		ret = TRUE;
+	assert(ret || (process_id != pid));
 	return ret;
 }
diff --git a/sr_unix/heartbeat_timer.c b/sr_unix/jnl_file_close_timer.c
similarity index 71%
rename from sr_unix/heartbeat_timer.c
rename to sr_unix/jnl_file_close_timer.c
index 696e967..4fe3a7c 100755
--- a/sr_unix/heartbeat_timer.c
+++ b/sr_unix/jnl_file_close_timer.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2014 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -24,41 +25,29 @@
 #include "gtmio.h"	/* for CLOSEFILE used by the F_CLOSE macro in JNL_FD_CLOSE */
 #include "repl_sp.h"	/* for F_CLOSE used by the JNL_FD_CLOSE macro */
 #include "iosp.h"	/* for SS_NORMAL used by the JNL_FD_CLOSE macro */
-#include "heartbeat_timer.h"
 #include "gt_timer.h"
 #include "gtmimagename.h"
 #include "dpgbldir.h"
 #include "have_crit.h"
 #include "anticipatory_freeze.h"
-#ifdef DEBUG
-#include "fake_enospc.h"
-#endif
+#include "jnl_file_close_timer.h"
 
-GBLREF	boolean_t		is_src_server;
-GBLREF	enum gtmImageTypes	image_type;
-GBLREF	int			process_exiting;
-GBLREF	jnlpool_addrs		jnlpool;
-GBLREF	uint4			process_id;
-GBLREF	volatile uint4		heartbeat_counter;
-GBLREF	volatile int4		gtmMallocDepth;
+GBLREF	boolean_t	oldjnlclose_started;
+GBLREF	uint4		process_id;
+GBLREF	int		process_exiting;
 
-void heartbeat_timer(void)
+void jnl_file_close_timer(void)
 {
 	gd_addr			*addr_ptr;
 	sgmnt_addrs		*csa;
 	jnl_private_control	*jpc;
 	gd_region		*r_local, *r_top;
 	int			rc;
+	boolean_t		any_jnl_open = FALSE;
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
 
-	/* It will take heartbeat_counter about 1014 years to overflow. */
-	heartbeat_counter++;
-#	ifdef DEBUG
-	if (!process_exiting)
-		fake_enospc();
-#	endif
 	/* Check every 1 minute if we have an older generation journal file open. If so, close it.
 	 * The only exceptions are
 	 *	a) The source server can have older generations open and they should not be closed.
@@ -68,8 +57,7 @@ void heartbeat_timer(void)
 	 *		the midst of a journal file switch is tricky so we check if the process is in
 	 *		crit for this region and if so we skip the close this time and wait for the next heartbeat.
 	 */
-	if (((INTRPT_OK_TO_INTERRUPT == intrpt_ok_state) && (!process_exiting)) && !is_src_server
-		&& (0 == heartbeat_counter % NUM_HEARTBEATS_FOR_OLDERJNL_CHECK))
+	if ((INTRPT_OK_TO_INTERRUPT == intrpt_ok_state) && (!process_exiting))
 	{
 		for (addr_ptr = get_next_gdr(NULL); addr_ptr; addr_ptr = get_next_gdr(addr_ptr))
 		{
@@ -77,12 +65,15 @@ void heartbeat_timer(void)
 			{
 				if (!r_local->open || r_local->was_open)
 					continue;
-				if ((dba_bg != r_local->dyn.addr->acc_meth) && (dba_mm != r_local->dyn.addr->acc_meth))
+				if (!IS_REG_BG_OR_MM(r_local))
 					continue;
 				csa = REG2CSA(r_local);
+				jpc = csa->jnl;
 				if (csa->now_crit)
+				{
+					any_jnl_open |= ((NULL != jpc) && (NOJNL != jpc->channel));
 					continue;
-				jpc = csa->jnl;
+				}
 				if ((NULL != jpc) && (NOJNL != jpc->channel) && JNL_FILE_SWITCHED(jpc))
 				{	/* The journal file we have as open is not the latest generation journal file. Close it */
 					/* Assert that we never have an active write on a previous generation journal file. */
@@ -90,8 +81,18 @@ void heartbeat_timer(void)
 					JNL_FD_CLOSE(jpc->channel, rc);	/* sets jpc->channel to NOJNL */
 					jpc->pini_addr = 0;
 				}
+				any_jnl_open |= ((NULL != jpc) && (NOJNL != jpc->channel));
 			}
 		}
 	}
-	start_timer((TID)heartbeat_timer, HEARTBEAT_INTERVAL, heartbeat_timer, 0, NULL);
+	/* Only restart the timer if there are still journal files open, or if we didn't check because it wasn't safe.
+	 * Otherwise, it will be restarted on the next successful jnl_file_open(), or never, if we are exiting.
+	 */
+	if (any_jnl_open || (INTRPT_OK_TO_INTERRUPT != intrpt_ok_state))
+		start_timer((TID)jnl_file_close_timer, OLDERJNL_CHECK_INTERVAL, jnl_file_close_timer, 0, NULL);
+	else
+	{
+		assert(!any_jnl_open || process_exiting);
+		oldjnlclose_started = FALSE;
+	}
 }
diff --git a/sr_unix/jnl_file_close_timer.h b/sr_unix/jnl_file_close_timer.h
new file mode 100755
index 0000000..7358e7e
--- /dev/null
+++ b/sr_unix/jnl_file_close_timer.h
@@ -0,0 +1,33 @@
+/****************************************************************
+ *								*
+ * Copyright (c) 2016 Fidelity National Information		*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
+ *								*
+ *	This source code contains the intellectual property	*
+ *	of its copyright holder(s), and is made available	*
+ *	under a license.  If you do not know the terms of	*
+ *	the license, please stop and do not read further.	*
+ *								*
+ ****************************************************************/
+
+#ifndef _JNL_FILE_CLOSE_TIMER_H
+#define _JNL_FILE_CLOSE_TIMER_H
+
+#define OLDERJNL_CHECK_INTERVAL			(60 * MILLISECS_IN_SEC)
+
+#define START_JNL_FILE_CLOSE_TIMER_IF_NEEDED										\
+MBSTART {														\
+	GBLREF boolean_t heartbeat_started;										\
+	GBLREF boolean_t oldjnlclose_started;										\
+	GBLREF boolean_t is_src_server;											\
+															\
+	if (!oldjnlclose_started && !is_src_server)									\
+	{														\
+		start_timer((TID)jnl_file_close_timer, OLDERJNL_CHECK_INTERVAL,	jnl_file_close_timer, 0, NULL);		\
+		oldjnlclose_started = TRUE; /* should always be set AFTER start_timer */				\
+	}														\
+} MBEND
+
+void jnl_file_close_timer(void);
+
+#endif
diff --git a/sr_unix/jnl_file_extend.c b/sr_unix/jnl_file_extend.c
old mode 100755
new mode 100644
index 2dfeaf2..9cebf68
--- a/sr_unix/jnl_file_extend.c
+++ b/sr_unix/jnl_file_extend.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information 	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -74,8 +74,10 @@ uint4 jnl_file_extend(jnl_private_control *jpc, uint4 total_jnl_rec_size)
 	gtm_uint64_t		avail_blocks;
 	uint4			aligned_tot_jrec_size, count;
 	uint4			jnl_fs_block_size, read_write_size;
+	unix_db_info		*udi;
 	DCL_THREADGBL_ACCESS;
 
+	SETUP_THREADGBL_ACCESS;
 	switch(jpc->region->dyn.addr->acc_meth)
 	{
 	case dba_mm:
@@ -83,7 +85,7 @@ uint4 jnl_file_extend(jnl_private_control *jpc, uint4 total_jnl_rec_size)
 		csa = &FILE_INFO(jpc->region)->s_addrs;
 		break;
 	default:
-		assertpro((dba_mm == jpc->region->dyn.addr->acc_meth) || (dba_bg == jpc->region->dyn.addr->acc_meth));
+		assertpro(IS_REG_BG_OR_MM(jpc->region));
 	}
 	csd = csa->hdr;
 	assert(csa == cs_addrs && csd == cs_data);
@@ -133,7 +135,6 @@ uint4 jnl_file_extend(jnl_private_control *jpc, uint4 total_jnl_rec_size)
 					 * we will freeze the instance and wait for space to become available and keep
 					 * retrying the writes. Therefore, we make the NOSPACEEXT a warning in this case.
 					 */
-					SETUP_THREADGBL_ACCESS;
 					if (!INST_FREEZE_ON_NOSPC_ENABLED(csa))
 					{
 						send_msg_csa(CSA_ARG(csa) VARLSTCNT(6) ERR_NOSPACEEXT, 4,
@@ -164,7 +165,7 @@ uint4 jnl_file_extend(jnl_private_control *jpc, uint4 total_jnl_rec_size)
 			jnl_info.prev_jnl = &prev_jnl_fn[0];
 			set_jnl_info(gv_cur_region, &jnl_info);
 			assert(JNL_ENABLED(csa) && (NOJNL != jpc->channel) && !(JNL_FILE_SWITCHED(jpc)));
-			jnl_status = jnl_ensure_open();
+			jnl_status = jnl_ensure_open(gv_cur_region, csa);
 			if (0 != jnl_status)
 			{
 				if (SS_NORMAL != jpc->status)
@@ -236,7 +237,14 @@ uint4 jnl_file_extend(jnl_private_control *jpc, uint4 total_jnl_rec_size)
 				send_msg_csa(CSA_ARG(csa) VARLSTCNT(4) ERR_NEWJNLFILECREAT, 2, JNL_LEN_STR(csd));
 				fc = gv_cur_region->dyn.addr->file_cntl;
 				fc->op = FC_WRITE;
-				fc->op_buff = (sm_uc_ptr_t)csd;
+				udi = FC2UDI(fc);
+				if (!udi->fd_opened_with_o_direct)
+					fc->op_buff = (sm_uc_ptr_t)csd;
+				else
+				{
+					memcpy((TREF(dio_buff)).aligned, csd, SGMNT_HDR_LEN);
+					fc->op_buff = (sm_uc_ptr_t)(TREF(dio_buff)).aligned;
+				}
 				fc->op_len = SGMNT_HDR_LEN;
 				fc->op_pos = 1;
 				status = dbfilop(fc);
@@ -244,7 +252,7 @@ uint4 jnl_file_extend(jnl_private_control *jpc, uint4 total_jnl_rec_size)
 					send_msg_csa(CSA_ARG(csa) VARLSTCNT(5) ERR_DBFILERR, 2, DB_LEN_STR(gv_cur_region), status);
 				assert(JNL_ENABLED(csa));
 				/* call jnl_ensure_open instead of jnl_file_open to make sure jpc->pini_addr is set to 0 */
-				jnl_status = jnl_ensure_open();	/* sets jpc->status */
+				jnl_status = jnl_ensure_open(gv_cur_region, csa);	/* sets jpc->status */
 				if (0 != jnl_status)
 				{
 					if (jpc->status)
diff --git a/sr_unix/jnl_file_open.c b/sr_unix/jnl_file_open.c
index 0d33d2b..096a2ab 100755
--- a/sr_unix/jnl_file_open.c
+++ b/sr_unix/jnl_file_open.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information 	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -32,11 +32,13 @@
 #include "gtmmsg.h"
 #include "iosp.h"	/* for SS_NORMAL */
 #include "gtmio.h"
+#include "sgtm_putmsg.h"
 #include "repl_sp.h"	/* for F_CLOSE used by the JNL_FD_CLOSE macro */
 #include "interlock.h"
 #include "lockconst.h"
 #include "aswp.h"
 #include "is_file_identical.h"
+#include "jnl_file_close_timer.h"
 #ifdef __MVS__
 #include "gtm_zos_io.h"
 #endif
@@ -47,6 +49,14 @@
 
 #include "wbox_test_init.h"
 
+#define SET_JPC_ERR_STR(ERR1, ERR2, BUF)							\
+{												\
+	jpc->status = ERR2;									\
+	sts = ERR1;										\
+	sgtm_putmsg(BUF, VARLSTCNT(7) sts, 4, JNL_LEN_STR(csd), DB_LEN_STR(reg), jpc->status);	\
+	jpc->err_str = BUF;									\
+}
+
 GBLREF	boolean_t		is_src_server;
 GBLREF	boolean_t		mupip_jnl_recover;
 
@@ -55,7 +65,7 @@ error_def(ERR_JNLMOVED);
 error_def(ERR_JNLOPNERR);
 error_def(ERR_JNLRDERR);
 
-uint4 jnl_file_open(gd_region *reg, bool init, void *dummy)	/* third argument for compatibility with VMS version */
+uint4 jnl_file_open(gd_region *reg, boolean_t init)
 {
 	sgmnt_addrs		*csa;
 	sgmnt_data_ptr_t	csd;
@@ -67,6 +77,7 @@ uint4 jnl_file_open(gd_region *reg, bool init, void *dummy)	/* third argument fo
 	int			fstat_res;
 	int			close_res;
 	boolean_t		switch_and_retry;
+	char			buff[OUT_BUFF_SIZE];
 	ZOS_ONLY(int		realfiletag;)
 
 	csa = &FILE_INFO(reg)->s_addrs;
@@ -76,21 +87,25 @@ uint4 jnl_file_open(gd_region *reg, bool init, void *dummy)	/* third argument fo
 	assert(NOJNL == jpc->channel);
 	sts = 0;
 	jpc->status = jpc->status2 = SS_NORMAL;
+	assert(NULL == jpc->err_str);
 	nameptr = csd->jnl_file_name;
 	assert('/' == csd->jnl_file_name[0]);
 	if (init)
 	{
 		assert(csd->jnl_file_len < JNL_NAME_SIZE);
+		/* csd->jnl_file_name[] is of size JNL_NAME_SIZE and must not change across GT.M versions hence the below asserts */
+		assert(JNL_NAME_SIZE == ARRAYSIZE(csd->jnl_file_name));
+		assert(256 == JNL_NAME_SIZE);
 		nameptr[csd->jnl_file_len] = 0;
 		cre_jnl_file_intrpt_rename(csa);
-		/* although jnl_file_close() would have reset jnl_file.u.inode and device to 0 and incremented cycle, it
+		/* although "jnl_file_close" would have reset jnl_file.u.inode and device to 0 and incremented cycle, it
 		 * might have got shot in the middle of executing those instructions. we redo it here just to be safe.
 		 */
 		csa->nl->jnl_file.u.inode = 0;
 		csa->nl->jnl_file.u.device = 0;
 		jb->cycle++;
 		/* Source Server only reads journal files so must never try to create and switch to a new journal file. */
-		switch_and_retry = (!is_src_server) ? TRUE : FALSE;
+		switch_and_retry = (!is_src_server);
 		for (;;)
 		{
 			/* D9E04-002445 MUPIP RECOVER always open journal file without O_SYNC, ignoring jnl_sync_io */
@@ -125,13 +140,13 @@ uint4 jnl_file_open(gd_region *reg, bool init, void *dummy)	/* third argument fo
 					JNL_FD_CLOSE(jpc->channel, close_res);	/* sets jpc->channel to NOJNL */
 					break;
 				} else
-					sts = jnl_file_open_common(reg, (off_jnl_t) stat_buf.st_size);
+					sts = jnl_file_open_common(reg, (off_jnl_t) stat_buf.st_size, buff);
 			}
-			DEBUG_ONLY(
-				/* Will fail if Source Server would need to switch journal files. */
-				assert((gtm_white_box_test_case_enabled && (WBTEST_JNL_SWITCH_EXPECTED ==
-					gtm_white_box_test_case_number)) || (0 == sts) || switch_and_retry);
-			)
+#			ifdef DEBUG
+			/* Will fail if Source Server would need to switch journal files. */
+			assert((gtm_white_box_test_case_enabled && (WBTEST_JNL_SWITCH_EXPECTED == gtm_white_box_test_case_number))
+					|| (0 == sts) || (!is_src_server));
+#			endif
 			if ((0 != sts) && switch_and_retry)
 			{	/* Switch to a new journal file and retry, but only once */
 				sts = jnl_file_open_switch(reg, sts);
@@ -197,19 +212,18 @@ uint4 jnl_file_open(gd_region *reg, bool init, void *dummy)	/* third argument fo
 						/* The dupfd check above should not reset our channel. */
 						assertpro(NOJNL != jpc->channel);
 					)
+					START_JNL_FILE_CLOSE_TIMER_IF_NEEDED;
 				}  /* if jnl_state */
 			} else
 			{	/* not init and file moved */
-				jpc->status = ERR_JNLMOVED;
-				sts = ERR_JNLOPNERR;
+				SET_JPC_ERR_STR(ERR_JNLOPNERR, ERR_JNLMOVED, buff);
 				assert(gtm_white_box_test_case_enabled
 					&& ((WBTEST_JNLOPNERR_EXPECTED == gtm_white_box_test_case_number)
 						|| (WBTEST_JNL_CREATE_FAIL == gtm_white_box_test_case_number)));
 			}
 		} else
 		{	/* stat failed */
-			jpc->status = errno;
-			sts = ERR_JNLFILOPN;
+			SET_JPC_ERR_STR(ERR_JNLFILOPN, errno, buff);
 		}
 	}  /* sts == 0 when we started */
 	if (0 != sts)
@@ -219,6 +233,7 @@ uint4 jnl_file_open(gd_region *reg, bool init, void *dummy)	/* third argument fo
 		assert(NOJNL == jpc->channel);
 		jnl_send_oper(jpc, sts);
 	}
+	jpc->err_str = NULL;
 	assert((0 != sts) || (NOJNL != jpc->channel));
 	return sts;
 }
diff --git a/sr_unix/jnlpool_init.c b/sr_unix/jnlpool_init.c
index 4239382..2108e4a 100755
--- a/sr_unix/jnlpool_init.c
+++ b/sr_unix/jnlpool_init.c
@@ -50,7 +50,6 @@
 #include "is_proc_alive.h"
 #include "repl_shutdcode.h"
 #include "send_msg.h"
-#include "heartbeat_timer.h"
 #include "lockconst.h"
 #include "anticipatory_freeze.h"
 #include "have_crit.h"
@@ -513,7 +512,6 @@ void jnlpool_init(jnlpool_user pool_user, boolean_t gtmsource_startup, boolean_t
 	assert(!mutex_per_process_init_pid || mutex_per_process_init_pid == process_id);
 	if (!mutex_per_process_init_pid)
 		mutex_per_process_init();
-	START_HEARTBEAT_IF_NEEDED;
 	if (new_ipc)
 	{
 		jnlpool_ctl->instfreeze_environ_inited = FALSE;
diff --git a/sr_unix/jnlsp.h b/sr_unix/jnlsp.h
index 7f243d6..4bffc68 100755
--- a/sr_unix/jnlsp.h
+++ b/sr_unix/jnlsp.h
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2012 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -27,10 +28,10 @@ typedef unix_file_info		fi_type;
 #endif
 /* Since the journal buffer size always gets rounded up to the next multiple of
  * MIN(MAX_IO_BLOCK_SIZE, csd->blk_size) / DISK_BLOCK_SIZE), make the default journal
- * buffer size a multiple of default-block-size-to-512 ratio, which equals 2. That
- * value might need readjustment for certain block sizes, but should currently suit
- * well block sizes of 1K and 2K. */
-#define JNL_BUFFER_DEF		ROUND_UP(JNL_BUFFER_MIN, 2)
+ * buffer size a multiple of default-block-size-to-512 ratio, which equals 8 (default block size = 4K).
+ * That value might need readjustment for block sizes > 4K
+ */
+#define JNL_BUFFER_DEF		ROUND_UP(JNL_BUFFER_MIN, 8)
 #define NOJNL			FD_INVALID_NONPOSIX
 #define MID_TIME(W)		W
 #define EXTTIMEVMS(T)
@@ -64,6 +65,6 @@ typedef unix_file_info		fi_type;
 #define DEF_DB_EXT_NAME			"dat"
 #define DEF_JNL_EXT_NAME		".mjl"
 
-uint4 jnl_file_open(gd_region *reg, bool init, void *dummy);
+uint4 jnl_file_open(gd_region *reg, boolean_t init);
 
 #endif /* JNLSP_H_INCLUDED */
diff --git a/sr_unix/kitstart.csh b/sr_unix/kitstart.csh
index 09118e0..1654d50 100755
--- a/sr_unix/kitstart.csh
+++ b/sr_unix/kitstart.csh
@@ -1,7 +1,7 @@
 #!/usr/local/bin/tcsh
 #################################################################
 #								#
-# Copyright (c) 2011-2016 Fidelity National Information		#
+# Copyright (c) 2011-2017 Fidelity National Information		#
 # Services, Inc. and/or its subsidiaries. All rights reserved.	#
 #								#
 #	This source code contains the intellectual property	#
@@ -195,7 +195,7 @@ chmod 444 $readme_txt
 # be copied as a part of open source distribution (down the script)
 set open_source = 0
 set GNU_COPYING_license = "${gtm_com}/COPYING"
-if (("$osname" == "linux" && ( "$arch" == "i586" || "x8664" == "$arch" )) || ("$osname" == "osf1" && "$arch" == "alpha")) then
+if ("$osname" == "linux" && ( "$arch" == "i586" || "x8664" == "$arch" )) then
 	set open_source = 1
 	/bin/cp -pf $cms_tools/opensource_COPYING $GNU_COPYING_license
 	chmod 444 $GNU_COPYING_license
@@ -206,7 +206,7 @@ set dist = "$gtm_ver/dist"
 set tmp_dist = "$gtm_ver/tmp_dist"
 set install = "$gtm_ver/install"
 set dist_prefix = "${product}_${version}_${osname}_${arch}"
-set mnotdistributed = '{CHK2LEV,CHKOP,GENDASH,GENOUT,GETNEAR,GTMDEFINEDTYPESTODB,GTMHLPLD,GTMTHREADGBLASM,LOAD,LOADOP,LOADVX,MSG,TTTGEN,TTTSCAN,UNLOAD}.[om]'
+set mnotdistributed = '{CHK2LEV,CHKOP,GENDASH,GENOUT,GETNEAR,GTMDEFINEDTYPESTODB,GTMHLPLD,GTMTHREADGBLASM,LOAD,LOADOP,LOADVX,MSG,TTTGEN,TTTSCAN,UNLOAD}.[om]' #BYPASSOKLENGTH
 set notdistributed = '_*.o GDE*.m *.log map obj plugin/libgtm* plugin/gpgagent.tab plugin/gtmcrypt/maskpass plugin/r plugin/o'
 set utf8_notdistributed = '_*.o *.m *.log map obj [a-z]*'
 
@@ -235,8 +235,9 @@ foreach image ($imagetype)
 	echo "Copying files from ${gtm_ver}/${image}"
 	set cpflags="-r"
 	if ("aix" == $osname) set cpflags="-rh"
-	if ("solaris" == $osname) set cpflags="-rH"
 	cp ${cpflags} ${gtm_ver}/${image}/* . || exit 8
+	# Put pinentry into the plugin directory so that it ends up in the final package
+	cp ${gtm_pct}/pinentry.m ./plugin/gtmcrypt/
 	echo ""
 	echo "Removing files that are not distributed (${notdistributed} ${mnotdistributed})"
 	/bin/rm -rf ${notdistributed} ${mnotdistributed} || exit 9
@@ -334,11 +335,7 @@ foreach image ($imagetype)
 	find . -exec chown 40535:40535 {} \;
 	echo ""
 	echo "Creating $dist_file"
-	if (("hpux" == ${osname})) then
-		$package $dist_file . >& /dev/null
-	else
-		$package $dist_file . || exit 10
-	endif
+	$package $dist_file . || exit 10
 	echo ""
 	echo "Gzipping $dist_file"
 	gzip $dist_file || exit 11
@@ -391,7 +388,6 @@ if ($testinstall) then
 		# V54003 now asks whether or not to retain .o files if libgtmutil.so is created
 		# We answer "y" to this question
 		# If libgtmutil.so is not created(on i586) this question is not asked
-		if ("$osname" != "osf1") then
 			if ("$osname" == "linux" && "$arch" == "i586") then
 				sh ./configure << CONFIGURE_EOF
 
@@ -419,18 +415,6 @@ n
 CONFIGURE_EOF
 
 			endif
-		else
-			sh ./configure << CONFIGURE_EOF
-
-
-n
-${install}/defgroup/${image}
-y
-n
-y
-n
-CONFIGURE_EOF
-		endif
 
 		# We need for root to be a member of the restricted group so that it can run tests. root is a
 		# member of the gtmsec NIS group.
@@ -441,7 +425,6 @@ CONFIGURE_EOF
 		# V54003 now asks whether or not to retain .o files if libgtmutil.so is created
 		# We answer "y" to this question
 		# If libgtmutil.so is not created(on i586) this question is not asked
-		if("$osname" != "osf1") then
 			if ("$osname" == "linux" && "$arch" == "i586") then
 	 			sh ./configure << CONFIGURE_EOF
 
@@ -468,18 +451,6 @@ y
 y
 CONFIGURE_EOF
 			endif
-		else
-			sh ./configure << CONFIGURE_EOF
-
-$rootgroup
-y
-${install}/${image}
-y
-n
-y
-y
-CONFIGURE_EOF
-		endif
 
 		# exit if the installation of the image failed
 		if ($status) then
@@ -499,7 +470,7 @@ CONFIGURE_EOF
 			# create the build.dir.  Only have to do it once
 			cd $gtm_ver || exit 14
 			# insert "pro:" for non Linux/Solaris
-			if ((${osname} != linux) && (${osname} != solaris)) echo pro: > ${tmp_dist}/build.dir
+			if (${osname} != linux) echo pro: > ${tmp_dist}/build.dir
 			ls -lR pro >> ${tmp_dist}/build.dir
 			if (aix == ${osname}) then
 				# insert a newline before "pro/gtmsecshrdir:" on AIX
@@ -518,7 +489,7 @@ CONFIGURE_EOF
 				# create the install.dir from both installations
 				cd ${install}/$defgroup
 				# insert "pro:" for non Linux/Solaris
-				if ((${osname} != linux) && (${osname} != solaris)) echo pro: > ${tmp_dist}/$defgroup/install.dir
+				if (${osname} != linux) echo pro: > ${tmp_dist}/$defgroup/install.dir
 				ls -lR pro >> ${tmp_dist}/$defgroup/install.dir
 				if (aix == ${osname}) then
 					# insert a newline before "pro/gtmsecshrdir:" on AIX
@@ -532,14 +503,6 @@ CONFIGURE_EOF
 				set deldir=$gtm_tools/bdeldir.txt
 				if (("linux" == ${osname}) && ("i586" == ${arch})) then
 					set adddir=$gtm_tools/linuxi686_badd.txt
-				else if (("hpux" == ${osname}) && ("parisc" == ${arch})) then
-					set adddir=$gtm_tools/hpuxparisc_badd.txt
-					set deldir=$gtm_tools/hpuxparisc_bdeldir.txt
-				else if (("hpux" == ${osname}) && ("ia64" == ${arch})) then
-					set adddir=$gtm_tools/hpuxia64_badd.txt
-				else if (("osf1" == ${osname}) && ("alpha" == ${arch})) then
-					set adddir=$gtm_tools/osf1alpha_badd.txt
-					set deldir=$gtm_tools/hpuxparisc_bdeldir.txt
 				endif
 				$comp $adddir $deldir ${osname}
 				set teststat = $status
diff --git a/sr_unix/liblke.list b/sr_unix/liblke.list
index d08ed52..41cb5d9 100755
--- a/sr_unix/liblke.list
+++ b/sr_unix/liblke.list
@@ -8,7 +8,6 @@ lke_getansw
 lke_getcli
 lke_getki
 lke_help
-lke_setgdr
 lke_show
 lke_showlock
 lke_showtree
diff --git a/sr_unix/libmupip.list b/sr_unix/libmupip.list
index 53a3038..ccb31a7 100755
--- a/sr_unix/libmupip.list
+++ b/sr_unix/libmupip.list
@@ -56,7 +56,6 @@ jnlext_write
 jnlpool_hasnt_overflowed
 mu_all_version_standalone
 mu_clsce
-mu_cre_file
 mu_cre_structs
 mu_decrypt
 mu_dwngrd_header
@@ -111,8 +110,6 @@ mubexpfilnam
 mubfilcpy
 mubgetfil
 mubinccpy
-mucblkini
-mucregini
 mup_bak_sys
 mupip_backup
 mupip_cmd_disallow
diff --git a/sr_unix/lintgtm.csh b/sr_unix/lintgtm.csh
index a786b13..51eda5e 100755
--- a/sr_unix/lintgtm.csh
+++ b/sr_unix/lintgtm.csh
@@ -1,6 +1,7 @@
 #################################################################
 #								#
-#	Copyright 2001, 2014 Fidelity Information Services, Inc	#
+# Copyright (c) 2001-2017 Fidelity National Information		#
+# Services, Inc. and/or its subsidiaries. All rights reserved.	#
 #								#
 #	This source code contains the intellectual property	#
 #	of its copyright holder(s), and is made available	#
@@ -175,12 +176,7 @@ foreach i ( $lintgtm_liblist )
 		# Exclude files that define the same externals (e.g., "main" and the VMS CLI [command line interpreter]
 		# emulator arrays):
 		pwd
-		rm -f gtm.c \
-			lke.c lke_cmd.c \
-			dse.c dse_cmd.c \
-			mupip.c mupip_cmd.c \
-			daemon.c gtmsecshr.c geteuid.c dtgbldir.c semstat2.c ftok.c
-
+		rm -f gtm.c lke.c lke_cmd.c dse.c dse_cmd.c mupip.c mupip_cmd.c daemon.c gtmsecshr.c geteuid.c semstat2.c ftok.c
 		gt_lint ${gt_lint_option_output}$i $gt_lint_options $gt_lint_options_library *.c >>& llib-l$i.log
 		rm *.c
 		breaksw
diff --git a/sr_unix/lke_cmd.c b/sr_unix/lke_cmd.c
index 49fad4a..e632737 100755
--- a/sr_unix/lke_cmd.c
+++ b/sr_unix/lke_cmd.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -60,7 +61,6 @@ GBLDEF CLI_ENTRY lke_cmd_ary[] = {
 	{ "CLEAR",  lke_clear,  clear_qual, 0, 0, cli_disallow_lke_clear, 0, VAL_NOT_REQ,    2, 0, VAL_STR, 0},
 	{ "EXIT",   lke_exit,   0,          0, 0, 0, 0, VAL_DISALLOWED, 0, 0, 0,       0},
 	{ "HELP",   util_help,  0,          0, 0, 0, 0, VAL_NOT_REQ,    1, 0, 0,       0},
-	{ "SETGDR", lke_setgdr,	0,          0, 0, 0, 0, VAL_REQ,        1, 0, 0,       0},
 	{ "SHOW",   lke_show,   show_qual,  0, 0, 0, 0, VAL_NOT_REQ,    1, 0, VAL_STR, 0},
 	{ "SPAWN",  util_spawn,	0,          0, 0, 0, 0, VAL_DISALLOWED, 0, 0, 0,       0},
 	{ "" }
diff --git a/sr_unix/lke_setgdr.c b/sr_unix/lke_setgdr.c
deleted file mode 100755
index 7b37730..0000000
--- a/sr_unix/lke_setgdr.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/****************************************************************
- *								*
- * Copyright (c) 2001-2015 Fidelity National Information	*
- * Services, Inc. and/or its subsidiaries. All rights reserved.	*
- *								*
- *	This source code contains the intellectual property	*
- *	of its copyright holder(s), and is made available	*
- *	under a license.  If you do not know the terms of	*
- *	the license, please stop and do not read further.	*
- *								*
- ****************************************************************/
-
-#include "mdef.h"
-
-#include "gtm_string.h"
-
-#include "gdsroot.h"
-#include "gdsblk.h"
-#include "gtm_facility.h"
-#include "fileinfo.h"
-#include "gdsbt.h"
-#include "gdsfhead.h"
-#include "io.h"
-#include "gtmsecshr.h"
-#include "cli.h"
-#include "mutex.h"
-#include "tp_change_reg.h"
-#include "gds_rundown.h"
-#include "dpgbldir.h"
-#include "gvcmy_rundown.h"
-#include "mlkdef.h"
-#include "lke.h"
-
-GBLREF gd_region 	*gv_cur_region;
-GBLREF sgmnt_data_ptr_t	cs_data;
-GBLREF sgmnt_addrs	*cs_addrs;
-GBLREF gd_addr		*gd_header;
-GBLREF mval		dollar_zgbldir;
-
-error_def(ERR_NOTALLDBRNDWN);
-
-void lke_setgdr(void)
-{
-	gd_region 	*r_top;
-	mval		reset;
-	short		len;
-	char		buf[256];
-	int4		rundown_status = EXIT_NRM;			/* if gds_rundown went smoothly */
-	static readonly char init_gdr[] = "gtmgbldir";
-
-	gvcmy_rundown();
-	gv_cur_region = gd_header->regions;
-	for (gv_cur_region = gd_header->regions,
-	  r_top = gv_cur_region + gd_header->n_regions;
-	  gv_cur_region < r_top;
-	  gv_cur_region++)
-	{
-		tp_change_reg();
-		UNIX_ONLY(rundown_status |=) gds_rundown();
-	}
-
-	if (EXIT_NRM != rundown_status)
-		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(1) ERR_NOTALLDBRNDWN);
-
-	if (cli_present("gld"))
-	{
-		cli_get_value("gld", buf) ;
-		reset.mvtype = MV_STR;
-		reset.str.len = STRLEN(buf);
-		reset.str.addr = buf;
-	}
-	else
-	{
-		reset.mvtype = MV_STR;
-		reset.str.len = SIZEOF(init_gdr) - 1;
-		reset.str.addr = init_gdr;
-	}
-
-	zgbldir(&reset);
-	cs_addrs = 0;
-	cs_data = 0;
-	region_init(FALSE) ;
-#ifndef MUTEX_MSEM_WAKE
-	mutex_sock_cleanup();
-#endif
-	gtmsecshr_sock_cleanup(CLIENT);
-}
-
diff --git a/sr_unix/mdefsa.h b/sr_unix/mdefsa.h
index cb71212..d60c572 100755
--- a/sr_unix/mdefsa.h
+++ b/sr_unix/mdefsa.h
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -14,24 +15,14 @@
 
 /* Declarations common to all unix mdefsp.h, to be moved here */
 
-/* DSK_WRITE Macro needs <errno.h> to be included. Use this flavor if
-   writing from the cache.
-*/
-#define	DSK_WRITE(reg, blk, cr, status)				\
-{								\
-	if (-1 == dsk_write(reg, blk, cr))			\
-		status = errno;					\
-	else							\
-		status = 0;					\
-}
-/* Use this flavor if writing direct from storage (not cache buffer) */
+/* DSK_WRITE_NOCACHE macro needs <errno.h> to be included. Use this flavor if writing direct from storage (not cache buffer) */
 #define	DSK_WRITE_NOCACHE(reg, blk, ptr, odv, status)		\
-{								\
+MBSTART {							\
 	if (-1 == dsk_write_nocache(reg, blk, ptr, odv))	\
 		status = errno;					\
 	else							\
 		status = 0;					\
-}
+} MBEND
 
 #define DOTM			".m"
 #define DOTOBJ			".o"
diff --git a/sr_unix/mdefsp.h b/sr_unix/mdefsp.h
index 904ca78..3cb6d06 100755
--- a/sr_unix/mdefsp.h
+++ b/sr_unix/mdefsp.h
@@ -1,6 +1,6 @@
 /****************************************************************
  *                                                              *
- * Copyright (c) 2001-2015 Fidelity National Information	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *                                                              *
  *    This source code contains the intellectual property       *
@@ -169,7 +169,15 @@ typedef char  mach_inst;	/* machine instruction */
 #ifdef Linux390
 #  define INTERLOCK_ADD(X,Y,Z)	(interlock_add(Z, (sm_int_ptr_t)(X)))
 #else
-#  define INTERLOCK_ADD(X,Y,Z)	(add_inter(Z, (sm_int_ptr_t)(X), (sm_global_latch_ptr_t)(Y)))
+#  ifdef __x86_64__
+#    ifdef __atomic_add_fetch
+#      define INTERLOCK_ADD(X,Y,Z)	(__atomic_add_fetch(X, Z, __ATOMIC_SEQ_CST))
+#    else
+#      define INTERLOCK_ADD(X,Y,Z)	(__sync_add_and_fetch(X, Z))
+#    endif
+#  else
+#    define INTERLOCK_ADD(X,Y,Z) (add_inter(Z, (sm_int_ptr_t)(X), (sm_global_latch_ptr_t)(Y)))
+#  endif
 #endif
 
 /* On NON_USHBIN_ONLY platforms, reserve enough space in routine header for the dummy
diff --git a/sr_unix/mu_all_version_standalone.c b/sr_unix/mu_all_version_standalone.c
index 511fe28..2dcaf11 100755
--- a/sr_unix/mu_all_version_standalone.c
+++ b/sr_unix/mu_all_version_standalone.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2005, 2014 Fidelity Information Services, Inc	*
+ * Copyright (c) 2005-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -50,7 +51,6 @@ error_def(ERR_FTOKKEY);
 error_def(ERR_SEMID);
 error_def(ERR_SYSCALL);
 error_def(ERR_TEXT);
-ZOS_ONLY(error_def(ERR_BADTAG);)
 
 /* Aquire semaphores that on on all V4.x releases are the access control semaphores. In pre V4.2 releases
    they were based on an FTOK of the database name with an ID of '1'. In V4.2 and later, they are based on
@@ -145,7 +145,7 @@ void mu_all_version_get_standalone(char_ptr_t db_fn, sem_info *sem_inf)
 	shmid = shmget(sem_inf[0].ftok_key, 0, RWDALL);
 	if (-1 == shmid)
 	{	/* That failed, second check is if shmid stored in file-header (if any) exists */
-		fd = OPEN(db_fn, O_RDONLY);
+		fd = OPEN(db_fn, O_RDONLY);	/* udi not available so OPENFILE_DB not used */
 		if (FD_INVALID == fd)
 		{
 			save_errno = errno;
diff --git a/sr_unix/mu_cre_file.c b/sr_unix/mu_cre_file.c
index 19bad43..06479ed 100644
--- a/sr_unix/mu_cre_file.c
+++ b/sr_unix/mu_cre_file.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -45,53 +45,82 @@
 #include "gtmcrypt.h"
 #include "shmpool.h"	/* Needed for the shmpool structures */
 #include "jnl.h"
+#include "db_write_eof_block.h"
+#include "get_fs_block_size.h"
+#include "gtm_permissions.h"
 
 #define BLK_SIZE (((gd_segment*)gv_cur_region->dyn.addr)->blk_size)
 
 #define CLEANUP(XX)								\
-{										\
+MBSTART {									\
 	int	rc;								\
 										\
-	if (cc)									\
-		free(cc);							\
 	if (cs_data)								\
 		free(cs_data);							\
 	if (FD_INVALID != fd)							\
 		CLOSEFILE_RESET(fd, rc); /* resets "fd" to FD_INVALID */	\
 	if (EXIT_ERR == XX)							\
 		UNLINK(path);							\
-}
+} MBEND
 
-#define SPRINTF_AND_PERROR(MESSAGE)			\
-{							\
-	save_errno = errno;				\
-	SPRINTF(errbuff, MESSAGE, path);		\
-	errno = save_errno;				\
-	PERROR(errbuff);				\
-}
+#define PUTMSG_ERROR_CSA(MSGPARMS)			\
+MBSTART {						\
+	if (cleanup_needed)				\
+		CLEANUP(EXIT_ERR);			\
+	if (IS_MUPIP_IMAGE)				\
+		gtm_putmsg_csa MSGPARMS;		\
+	else						\
+		send_msg_csa MSGPARMS;			\
+} MBEND
 
+#define PUTMSG_WARN_CSA(MSGPARMS)			\
+MBSTART {						\
+	if (IS_MUPIP_IMAGE)				\
+		gtm_putmsg_csa MSGPARMS;		\
+	else						\
+		send_msg_csa MSGPARMS;			\
+} MBEND
+
+/* zOS is a currently unsupported platform so this macro remains unconverted but with an assertpro(FALSE) should
+ * the zOS port ever be resurrected. In that case, uses of this macro need to be converted to PUTMSG_ERROR_CSA
+ * invocations.
+ */
 #define SPRINTF_AND_PERROR_MVS(MESSAGE)					\
-{									\
+MBSTART {								\
+	assertpro(FALSE);						\
 	save_errno = errno;						\
 	SPRINTF(errbuff, MESSAGE, path, realfiletag, TAG_BINARY);	\
 	errno = save_errno;						\
 	PERROR(errbuff);						\
-}
+} MBEND
 
 GBLREF	gd_region		*gv_cur_region;
 GBLREF	jnlpool_addrs		jnlpool;
 GBLREF	sgmnt_addrs		*cs_addrs;
 GBLREF	sgmnt_data_ptr_t	cs_data;
 GBLREF	uint4			gtmDebugLevel;
+#ifdef DEBUG
+GBLREF	boolean_t		in_mu_cre_file;
+#endif
 
-error_def(ERR_NOSPACECRE);
+error_def(ERR_DBBLKSIZEALIGN);
+error_def(ERR_DBFILECREATED);
+error_def(ERR_DBOPNERR);
+error_def(ERR_DSKSPCCHK);
+error_def(ERR_FILECREERR);
+error_def(ERR_FNTRANSERROR);
 error_def(ERR_LOWSPACECRE);
 error_def(ERR_MUNOSTRMBKUP);
+error_def(ERR_NOCREMMBIJ);
+error_def(ERR_NOCRENETFILE);
+error_def(ERR_NOSPACECRE);
+error_def(ERR_PARNORMAL);
 error_def(ERR_PREALLOCATEFAIL);
+error_def(ERR_RAWDEVUNSUP);
 
 unsigned char mu_cre_file(void)
 {
-	char		*cc = NULL, path[MAX_FBUFF + 1], errbuff[512];
+	char		path[MAX_FBUFF + 1], errbuff[512];
 	unsigned char	buff[DISK_BLOCK_SIZE];
 	int		fd = FD_INVALID, i, lower, upper, norm_vbn;
         ssize_t         status;
@@ -104,10 +133,21 @@ unsigned char mu_cre_file(void)
 	unix_db_info	udi_struct, *udi;
 	char		*fgets_res;
 	gd_segment	*seg;
+	gd_region	*baseDBreg;
 	char		hash[GTMCRYPT_HASH_LEN];
-	int		gtmcrypt_errno;
+	int		gtmcrypt_errno, retcode, perms, user_id, group_id;
+	off_t		new_eof;
+	uint4		fsb_size;
+	boolean_t	cleanup_needed;
+	sgmnt_addrs	*baseDBcsa;
+	struct stat	stat_buf;
+	struct perm_diag_data	pdd;
 	ZOS_ONLY(int	realfiletag;)
+	DCL_THREADGBL_ACCESS;
 
+	SETUP_THREADGBL_ACCESS;
+	cleanup_needed = FALSE;
+	DEBUG_ONLY(in_mu_cre_file = TRUE;)
 	assert((-(SIZEOF(uint4) * 2) & SIZEOF_FILE_HDR_DFLT) == SIZEOF_FILE_HDR_DFLT);
 	cs_addrs = &udi_struct.s_addrs;
 	cs_data = (sgmnt_data_ptr_t)NULL;	/* for CLEANUP */
@@ -120,29 +160,26 @@ unsigned char mu_cre_file(void)
 	strncpy(path, file.addr, file.len);
 	*(path + file.len) = '\0';
 	if (is_raw_dev(path))
-	{	/* do not use a default extension for raw device files */
-		pblk.def1_buf = DEF_NODBEXT;
-		pblk.def1_size = SIZEOF(DEF_NODBEXT) - 1;
-	} else
 	{
-		pblk.def1_buf = DEF_DBEXT;
-		pblk.def1_size = SIZEOF(DEF_DBEXT) - 1;
+		PUTMSG_ERROR_CSA((CSA_ARG(cs_addrs) VARLSTCNT(4) ERR_RAWDEVUNSUP, 2, REG_LEN_STR(gv_cur_region)));
+		return EXIT_ERR;
 	}
-	if (1 != (parse_file(&file, &pblk) & 1))
+	pblk.def1_buf = DEF_DBEXT;
+	pblk.def1_size = SIZEOF(DEF_DBEXT) - 1;
+	if (ERR_PARNORMAL != (retcode = parse_file(&file, &pblk)))	/* Note assignment */
 	{
-		PRINTF("Error translating filename %s.\n", file.addr);
+		PUTMSG_ERROR_CSA((CSA_ARG(cs_addrs) VARLSTCNT(4) ERR_FNTRANSERROR, 2, REG_LEN_STR(gv_cur_region)));
 		return EXIT_ERR;
 	}
 	path[pblk.b_esl] = 0;
 	if (pblk.fnb & F_HAS_NODE)
 	{	/* Remote node specification given */
 		assert(pblk.b_node);
-		PRINTF("Database file for region %s not created; cannot create across network.\n", path);
+		PUTMSG_ERROR_CSA((CSA_ARG(cs_addrs) VARLSTCNT(4) ERR_NOCRENETFILE, 2, LEN_AND_STR(path)));
 		return EXIT_WRN;
 	}
 	udi = &udi_struct;
 	memset(udi, 0, SIZEOF(unix_db_info));
-	udi->raw = is_raw_dev(pblk.l_dir);
 	/* Check if this file is an encrypted database. If yes, do init */
 	if (IS_ENCRYPTED(gv_cur_region->dyn.addr->is_encrypted))
 	{
@@ -154,111 +191,82 @@ unsigned char mu_cre_file(void)
 			return EXIT_ERR;
 		}
 	}
-	if (udi->raw)
+	fd = OPEN3(pblk.l_dir, O_CREAT | O_EXCL | O_RDWR, 0600);
+	if (FD_INVALID == fd)
+	{	/* Avoid error message if file already exists (another process created it) for AUTODBs that are NOT also
+		 * STATSDBs.
+		 */
+		save_errno = errno;
+		TREF(mu_cre_file_openrc) = errno;		/* Save for gvcst_init() */
+		/* If this is an AUTODB (but not a STATSDB) and the file already exists, this is not an error (some other
+		 * process created the file. This is ok so return as if we created it.
+		 */
+		if (IS_AUTODB_REG(gv_cur_region) && !IS_STATSDB_REG(gv_cur_region) && (EEXIST == errno))
+			return EXIT_NRM;
+		/* Suppress EEXIST messages for statsDBs */
+		if (!IS_STATSDB_REG(gv_cur_region) || (EEXIST != errno))
+			PUTMSG_ERROR_CSA((CSA_ARG(cs_addrs) VARLSTCNT(5) ERR_DBOPNERR, 2, LEN_AND_STR(path), save_errno));
+		return EXIT_ERR;
+	}
+	cleanup_needed = TRUE;			/* File open now so cleanup needed */
+#	ifdef __MVS__
+	if (-1 == gtm_zos_set_tag(fd, TAG_BINARY, TAG_NOTTEXT, TAG_FORCE, &realfiletag))
+		SPRINTF_AND_PERROR_MVS("Error setting tag policy for file %s (%d) to %d\n");
+#	endif
+	if (0 != (save_errno = disk_block_available(fd, &avail_blocks, FALSE)))
 	{
-		fd = OPEN(pblk.l_dir,O_EXCL | O_RDWR);
-		if (FD_INVALID == fd)
-		{
-			SPRINTF_AND_PERROR("Error opening file %s\n");
-			return EXIT_ERR;
-		}
-		if (-1 != (status = (ssize_t)lseek(fd, 0, SEEK_SET)))
-		{
-			DOREADRC(fd, buff, SIZEOF(buff), status);
-		} else
-			status = errno;
-		if (0 != status)
+		errno = save_errno;
+		PUTMSG_ERROR_CSA((CSA_ARG(cs_addrs) VARLSTCNT(5) ERR_DSKSPCCHK, 2, LEN_AND_STR(path), errno));
+		return EXIT_ERR;
+	}
+	seg = gv_cur_region->dyn.addr;
+	if (seg->asyncio)
+	{	/* AIO = ON, implies we need to use O_DIRECT. Check for db vs fs blksize alignment issues. */
+		fsb_size = get_fs_block_size(fd);
+		if (0 != (seg->blk_size % fsb_size))
 		{
-			SPRINTF_AND_PERROR("Error reading header for file %s\n");
+			PUTMSG_ERROR_CSA((CSA_ARG(cs_addrs) VARLSTCNT(6) ERR_DBBLKSIZEALIGN, 4,
+					  LEN_AND_STR(path), seg->blk_size, fsb_size));
 			return EXIT_ERR;
 		}
-#		ifdef __MVS__
-		if (-1 == gtm_zos_tag_to_policy(fd, TAG_BINARY, &realfiletag))
-			SPRINTF_AND_PERROR_MVS("Error setting tag policy for file %s (%d) to %d\n");
-#		endif
-		if (!memcmp(buff, GDS_LABEL, STR_LIT_LEN(GDS_LABEL)))
-		{
-			char rsp[80];
-			PRINTF("Database already exists on device %s\n", path);
-			PRINTF("Do you wish to re-initialize (all current data will be lost) [y/n] ? ");
-			FGETS(rsp, 79, stdin, fgets_res);
-			if ('y' != *rsp)
-				return EXIT_NRM;
-		}
-		PRINTF("Determining size of raw device...\n");
-		for(i = 1; read(fd, buff, SIZEOF(buff)) == SIZEOF(buff);)
-		{
-			i *= 2;
-			lseek(fd, (off_t)i * BUFSIZ, SEEK_SET);
-		}
-		lower = i / 2;
-		upper = i;
-		while ((lower + upper) / 2 != lower)
-		{
-			i = (lower + upper) / 2;
-			lseek(fd, (off_t)i * BUFSIZ, SEEK_SET);
- 			if (read(fd, buff, SIZEOF(buff)) == SIZEOF(buff))
-				lower = i;
-			else
-				upper = i;
-		}
-		raw_dev_size = i * BUFSIZ;
-	} else
-	{
-		fd = OPEN3(pblk.l_dir, O_CREAT | O_EXCL | O_RDWR, 0600);
-		if (FD_INVALID == fd)
+	}
+	/* Blocks_for_create is in the unit of DISK_BLOCK_SIZE */
+	blocks_for_create = (gtm_uint64_t)(DIVIDE_ROUND_UP(SIZEOF_FILE_HDR_DFLT, DISK_BLOCK_SIZE) + 1
+					   + (seg->blk_size / DISK_BLOCK_SIZE
+					      * (gtm_uint64_t)((DIVIDE_ROUND_UP(seg->allocation, BLKS_PER_LMAP - 1))
+							       + seg->allocation)));
+	blocks_for_extension = (seg->blk_size / DISK_BLOCK_SIZE
+				* ((DIVIDE_ROUND_UP(EXTEND_WARNING_FACTOR * (gtm_uint64_t)seg->ext_blk_count,
+						    BLKS_PER_LMAP - 1))
+				   + EXTEND_WARNING_FACTOR * (gtm_uint64_t)seg->ext_blk_count));
+	if (!(gtmDebugLevel & GDL_IgnoreAvailSpace))
+	{	/* Bypass this space check if debug flag above is on. Allows us to create a large sparse DB
+		 * in space it could never fit it if wasn't sparse. Needed for some tests.
+		 * Also, if the anticipatory freeze scheme is in effect at this point, we would have issued
+		 * a NOSPACECRE warning (see NOSPACEEXT message which goes through a similar transformation).
+		 * But at this point, we are guaranteed to not have access to the journal pool or csa both
+		 * of which are necessary for the INST_FREEZE_ON_ERROR_ENABLED(csa) macro so we don't bother
+		 * to do the warning transformation in this case. The only exception to this is a statsdb
+		 * which is anyways not journaled so need not worry about INST_FREEZE_ON_ERROR_ENABLED.
+		 */
+		assert((NULL == jnlpool.jnlpool_ctl) || IS_STATSDB_REG(gv_cur_region));
+		if (avail_blocks < blocks_for_create)
 		{
-			SPRINTF_AND_PERROR("Error opening file %s\n");
+			PUTMSG_ERROR_CSA((CSA_ARG(cs_addrs) VARLSTCNT(6) ERR_NOSPACECRE, 4, LEN_AND_STR(path),
+					  &blocks_for_create, &avail_blocks));
+			if (IS_MUPIP_IMAGE)
+				send_msg_csa(CSA_ARG(cs_addrs) VARLSTCNT(6) ERR_NOSPACECRE, 4, LEN_AND_STR(path),
+					     &blocks_for_create, &avail_blocks);
 			return EXIT_ERR;
 		}
-#		ifdef __MVS__
-		if (-1 == gtm_zos_set_tag(fd, TAG_BINARY, TAG_NOTTEXT, TAG_FORCE, &realfiletag))
-			SPRINTF_AND_PERROR_MVS("Error setting tag policy for file %s (%d) to %d\n");
-#		endif
-		if (0 != (save_errno = disk_block_available(fd, &avail_blocks, FALSE)))
+		delta_blocks = avail_blocks - blocks_for_create;
+		if (delta_blocks < blocks_for_extension)
 		{
-			errno = save_errno;
-			SPRINTF_AND_PERROR("Error checking available disk space for %s\n");
-			CLEANUP(EXIT_ERR);
-			return EXIT_ERR;
-		}
-		seg = gv_cur_region->dyn.addr;
-
-		/* blocks_for_create is in the unit of DISK_BLOCK_SIZE */
-		blocks_for_create = (gtm_uint64_t)(DIVIDE_ROUND_UP(SIZEOF_FILE_HDR_DFLT, DISK_BLOCK_SIZE) + 1 +
-					(seg->blk_size / DISK_BLOCK_SIZE *
-					 (gtm_uint64_t)((DIVIDE_ROUND_UP(seg->allocation, BLKS_PER_LMAP - 1)) + seg->allocation)));
-		blocks_for_extension = (seg->blk_size / DISK_BLOCK_SIZE *
-					((DIVIDE_ROUND_UP(EXTEND_WARNING_FACTOR * (gtm_uint64_t)seg->ext_blk_count,
-							BLKS_PER_LMAP - 1))
-				 	  + EXTEND_WARNING_FACTOR * (gtm_uint64_t)seg->ext_blk_count));
-		if (!(gtmDebugLevel & GDL_IgnoreAvailSpace))
-		{	/* Bypass this space check if debug flag above is on. Allows us to create a large sparce DB
-			 * in space it could never fit it if wasn't sparse. Needed for some tests.
-			 * Also, if the anticipatory freeze scheme is in effect at this point, we would have issued
-			 * a NOSPACECRE warning (see NOSPACEEXT message which goes through a similar transformation).
-			 * But at this point, we are guaranteed to not have access to the journal pool or csa both
-			 * of which are necessary for the INST_FREEZE_ON_ERROR_ENABLED(csa) macro so we dont bother
-			 * to do the warning transformation in this case.
-			 */
-			assert(NULL == jnlpool.jnlpool_ctl);
-			if (avail_blocks < blocks_for_create)
-			{
-				gtm_putmsg_csa(CSA_ARG(cs_addrs) VARLSTCNT(6) ERR_NOSPACECRE, 4, LEN_AND_STR(path),
-						&blocks_for_create, &avail_blocks);
-				send_msg_csa(CSA_ARG(cs_addrs) VARLSTCNT(6) ERR_NOSPACECRE, 4, LEN_AND_STR(path),
-						&blocks_for_create, &avail_blocks);
-				CLEANUP(EXIT_ERR);
-				return EXIT_ERR;
-			}
-			delta_blocks = avail_blocks - blocks_for_create;
-			if (delta_blocks < blocks_for_extension)
-			{
-				gtm_putmsg_csa(CSA_ARG(cs_addrs) VARLSTCNT(8) ERR_LOWSPACECRE, 6, LEN_AND_STR(path),
-						EXTEND_WARNING_FACTOR, &blocks_for_extension, DISK_BLOCK_SIZE, &delta_blocks);
+			PUTMSG_WARN_CSA((CSA_ARG(cs_addrs) VARLSTCNT(8) ERR_LOWSPACECRE, 6, LEN_AND_STR(path),
+					 EXTEND_WARNING_FACTOR, &blocks_for_extension, DISK_BLOCK_SIZE, &delta_blocks));
+			if (IS_MUPIP_IMAGE)	/* Is not mupip, msg already went to operator log */
 				send_msg_csa(CSA_ARG(cs_addrs) VARLSTCNT(8) ERR_LOWSPACECRE, 6, LEN_AND_STR(path),
-						EXTEND_WARNING_FACTOR, &blocks_for_extension, DISK_BLOCK_SIZE, &delta_blocks);
-			}
+					     EXTEND_WARNING_FACTOR, &blocks_for_extension, DISK_BLOCK_SIZE, &delta_blocks);
 		}
 	}
 	gv_cur_region->dyn.addr->file_cntl = &fc;
@@ -280,36 +288,16 @@ unsigned char mu_cre_file(void)
 	cs_data->acc_meth = gv_cur_region->dyn.addr->acc_meth;
 	if ((dba_mm == cs_data->acc_meth) && (gv_cur_region->jnl_before_image))
 	{
-		PRINTF("MM access method not compatible with BEFORE image journaling; Database file %s not created.\n", path);
-		CLEANUP(EXIT_ERR);
+		PUTMSG_ERROR_CSA((CSA_ARG(cs_addrs) VARLSTCNT(4) ERR_NOCREMMBIJ, 2, LEN_AND_STR(path)));
 		return EXIT_ERR;
 	}
-	if (udi->raw)
-	{
-		/* calculate total blocks, reduce to make room for the
-		 * database header (size rounded up to a block), then
-		 * make into a multiple of BLKS_PER_LMAP to have a complete bitmap
-		 * for each set of blocks.
-		 */
-		cs_data->trans_hist.total_blks = raw_dev_size - (uint4)ROUND_UP(SIZEOF_FILE_HDR_DFLT, DISK_BLOCK_SIZE);
-		cs_data->trans_hist.total_blks /= (uint4)(((gd_segment *)gv_cur_region->dyn.addr)->blk_size);
-		if (0 == (cs_data->trans_hist.total_blks - DIVIDE_ROUND_UP(cs_data->trans_hist.total_blks, BLKS_PER_LMAP - 1)
-			  % (BLKS_PER_LMAP - 1)))
-			cs_data->trans_hist.total_blks -= 1;	/* don't create a bitmap with no data blocks */
-		cs_data->extension_size = 0;
-		PRINTF("Raw device size is %dK, %d GDS blocks\n",
-		raw_dev_size / 1000,
-		cs_data->trans_hist.total_blks);
-	} else
-	{
-		cs_data->trans_hist.total_blks = gv_cur_region->dyn.addr->allocation;
-		/* There are (bplmap - 1) non-bitmap blocks per bitmap, so add (bplmap - 2) to number of non-bitmap blocks
-		 * and divide by (bplmap - 1) to get total number of bitmaps for expanded database. (must round up in this
-		 * manner as every non-bitmap block must have an associated bitmap)
-		 */
-		cs_data->trans_hist.total_blks += DIVIDE_ROUND_UP(cs_data->trans_hist.total_blks, BLKS_PER_LMAP - 1);
-		cs_data->extension_size = gv_cur_region->dyn.addr->ext_blk_count;
-	}
+	cs_data->trans_hist.total_blks = gv_cur_region->dyn.addr->allocation;
+	/* There are (bplmap - 1) non-bitmap blocks per bitmap, so add (bplmap - 2) to number of non-bitmap blocks
+	 * and divide by (bplmap - 1) to get total number of bitmaps for expanded database. (must round up in this
+	 * manner as every non-bitmap block must have an associated bitmap)
+	 */
+	cs_data->trans_hist.total_blks += DIVIDE_ROUND_UP(cs_data->trans_hist.total_blks, BLKS_PER_LMAP - 1);
+	cs_data->extension_size = gv_cur_region->dyn.addr->ext_blk_count;
 	/* Check if this file is an encrypted database. If yes, do init */
 	if (IS_ENCRYPTED(gv_cur_region->dyn.addr->is_encrypted))
 	{
@@ -338,49 +326,70 @@ unsigned char mu_cre_file(void)
 	cs_data->maxkeysz_assured = TRUE;
 	mucregini(cs_data->trans_hist.total_blks);
 	cs_data->createinprogress = FALSE;
-	DB_LSEEKWRITE(cs_addrs, udi->fn, udi->fd, 0, cs_data, SIZEOF_FILE_HDR_DFLT, status);
+	ASSERT_NO_DIO_ALIGN_NEEDED(udi);	/* because we are creating the database and so effectively have standalone access */
+	DB_LSEEKWRITE(cs_addrs, udi, udi->fn, udi->fd, 0, cs_data, SIZEOF_FILE_HDR_DFLT, status);
 	if (0 != status)
 	{
-		SPRINTF_AND_PERROR("Error writing out header for file %s\n");
-		CLEANUP(EXIT_ERR);
+		PUTMSG_ERROR_CSA((CSA_ARG(cs_addrs) VARLSTCNT(7) ERR_FILECREERR, 4, LEN_AND_LIT("writing out file header"),
+				  LEN_AND_LIT(path), status));
 		return EXIT_ERR;
 	}
-	cc = (char*)malloc(DISK_BLOCK_SIZE);
-	memset(cc, 0, DISK_BLOCK_SIZE);
-	DB_LSEEKWRITE(cs_addrs, udi->fn, udi->fd,
-		      BLK_ZERO_OFF(cs_data) + ((off_t)(cs_data->trans_hist.total_blks) * cs_data->blk_size),
-		      cc,
-		      DISK_BLOCK_SIZE,
-		      status);
+	new_eof = (off_t)BLK_ZERO_OFF(cs_data->start_vbn) + (off_t)cs_data->trans_hist.total_blks * cs_data->blk_size;
+	status = db_write_eof_block(udi, udi->fd, cs_data->blk_size, new_eof, &(TREF(dio_buff)));
 	if (0 != status)
 	{
-		SPRINTF_AND_PERROR("Error writing out end of file %s\n");
-		CLEANUP(EXIT_ERR);
+		PUTMSG_ERROR_CSA((CSA_ARG(cs_addrs) VARLSTCNT(7) ERR_FILECREERR, 4, LEN_AND_LIT("writing out end-of-file marker"),
+				  LEN_AND_LIT(path), status));
 		return EXIT_ERR;
 	}
-#	if !defined(__sun) && !defined(__hpux)
 	if (!cs_data->defer_allocate)
 	{
-		status = posix_fallocate(udi->fd, 0, BLK_ZERO_OFF(cs_data) +
-					 ((off_t)(cs_data->trans_hist.total_blks) * cs_data->blk_size) + DISK_BLOCK_SIZE);
+		status = posix_fallocate(udi->fd, 0, BLK_ZERO_OFF(cs_data->start_vbn) +
+					 ((off_t)(cs_data->trans_hist.total_blks + 1) * cs_data->blk_size));
 		if (0 != status)
 		{
-			gtm_putmsg_csa(CSA_ARG(cs_addrs) VARLSTCNT(5) ERR_PREALLOCATEFAIL, 2, DB_LEN_STR(gv_cur_region), status);
-			CLEANUP(EXIT_ERR);
+			assert(ENOSPC == status);
+			PUTMSG_ERROR_CSA((CSA_ARG(cs_addrs) VARLSTCNT(5) ERR_PREALLOCATEFAIL, 2, DB_LEN_STR(gv_cur_region),
+					  status));
 			return EXIT_ERR;
 		}
 	}
-#	endif
-	if ((!udi->raw) && (-1 == CHMOD(pblk.l_dir, 0666)))
+	/* If we are opening a statsDB, use IPC type permissions derived from the baseDB */
+	if (IS_STATSDB_REG(gv_cur_region))
+	{
+		STATSDBREG_TO_BASEDBREG(gv_cur_region, baseDBreg);
+		assert(baseDBreg->open);
+		baseDBcsa = &FILE_INFO(baseDBreg)->s_addrs;
+		STAT_FILE((char *)baseDBcsa->nl->fname, &stat_buf, retcode);
+		if (0 > retcode)
+		{	/* Should be rare-if-ever message as we just opened the baseDB so it should be there */
+			save_errno = errno;
+			PUTMSG_ERROR_CSA((CSA_ARG(cs_addrs) VARLSTCNT(7) ERR_FILECREERR, 4,
+					  LEN_AND_LIT("getting base file information"), LEN_AND_STR(path), save_errno));
+			return EXIT_ERR;
+		}
+		if (!gtm_permissions(&stat_buf, &user_id, &group_id, &perms, PERM_IPC, &pdd))
+		{	/* Not sure what could cause this as we would have done the same call when opening the baseDB but
+			 * make sure it is present just in case.
+			 */
+			PUTMSG_ERROR_CSA((CSA_ARG(cs_addrs) VARLSTCNT(7) ERR_FILECREERR, 4,
+					  LEN_AND_LIT("obtaining permissions from base DB"),  LEN_AND_STR(path), EPERM));
+			return EXIT_ERR;
+		}
+	} else
+		perms = 0666;
+	if (-1 == CHMOD(pblk.l_dir, perms))
 	{
-		SPRINTF_AND_PERROR("Error changing file mode on file %s\n");
-		CLEANUP(EXIT_WRN);
+		save_errno = errno;
+		PUTMSG_WARN_CSA((CSA_ARG(cs_addrs) VARLSTCNT(7) MAKE_MSG_WARNING(ERR_FILECREERR), 4,
+				 LEN_AND_LIT("changing file mode"), LEN_AND_LIT(path), save_errno));
 		return EXIT_WRN;
 	}
 	if ((32 * 1024 - SIZEOF(shmpool_blk_hdr)) < cs_data->blk_size)
-		gtm_putmsg_csa(CSA_ARG(cs_addrs) VARLSTCNT(5) ERR_MUNOSTRMBKUP, 3, RTS_ERROR_STRING(path),
-				32 * 1024 - DISK_BLOCK_SIZE);
-	util_out_print("Created file !AD", TRUE, RTS_ERROR_STRING(path));
+		PUTMSG_WARN_CSA((CSA_ARG(cs_addrs) VARLSTCNT(5) ERR_MUNOSTRMBKUP, 3, RTS_ERROR_STRING(path),
+				 32 * 1024 - DISK_BLOCK_SIZE));
+	if (!(RDBF_AUTODB & gv_cur_region->reservedDBFlags))
+		PUTMSG_WARN_CSA((CSA_ARG(cs_addrs) VARLSTCNT(4) ERR_DBFILECREATED, 2, LEN_AND_STR(path)));
 	CLEANUP(EXIT_NRM);
 	return EXIT_NRM;
 }
diff --git a/sr_unix/mu_decrypt.c b/sr_unix/mu_decrypt.c
index 661d8e6..dbd68e8 100644
--- a/sr_unix/mu_decrypt.c
+++ b/sr_unix/mu_decrypt.c
@@ -1,4 +1,4 @@
-/****************************************************************
+	/****************************************************************
  *								*
  * Copyright (c) 2009-2016 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
@@ -191,7 +191,7 @@ int get_file_encr_hash(boolean_t is_journal, char *fname, int fname_len, int *fd
 	int		save_errno, hdr_sz;
 	uint4		status;
 
-	OPENFILE(fname, O_RDONLY, *fd);
+	OPENFILE(fname, O_RDONLY, *fd);	/* udi not available so OPENFILE_DB not used */
 	if (-1 == *fd)
 	{
 		save_errno = errno;
diff --git a/sr_unix/mu_extract.c b/sr_unix/mu_extract.c
index 297d52b..0e12aae 100755
--- a/sr_unix/mu_extract.c
+++ b/sr_unix/mu_extract.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -63,6 +63,7 @@
 #include "tp.h"
 #include "gtmcrypt.h"
 #include "is_proc_alive.h"
+#include "gtm_reservedDB.h"
 
 GBLREF	int			(*op_open_ptr)(mval *v, mval *p, int t, mval *mspace);
 GBLREF	bool			mu_ctrlc_occurred;
diff --git a/sr_unix/mu_getlst.c b/sr_unix/mu_getlst.c
index dae62aa..c3f77c6 100755
--- a/sr_unix/mu_getlst.c
+++ b/sr_unix/mu_getlst.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2014 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -11,6 +12,9 @@
 
 #include "mdef.h"
 
+#include "sys/types.h"
+#include "gtm_stat.h"
+#include "gtm_unistd.h"
 #include "gtm_string.h"
 #include "gtm_limits.h"
 
@@ -33,6 +37,7 @@
 #include "str_match.h"
 #include "mu_getlst.h"
 #include "gtmmsg.h"
+#include "gtm_reservedDB.h"
 
 GBLDEF	boolean_t		is_directory;
 GBLDEF	mstr			directory;
@@ -61,11 +66,13 @@ error_def(ERR_NOREGION);
 
 void mu_getlst(char *name, int4 size)
 {
-	boolean_t	matched;
-	char		*c1, *c2, *c3, *c4, fbuff[GTM_PATH_MAX], rbuff[GTM_PATH_MAX];
+	boolean_t	matched, is_statsDB, is_autoDB;
+	char		*c1, *c2, *c3, *c4, fbuff[GTM_PATH_MAX], rbuff[GTM_PATH_MAX], fnbuff[GTM_PATH_MAX + 1];
 	gd_region	*reg;
 	tp_region	*list;
 	unsigned short	flen, i, rlen;
+	struct stat	stat_buf;
+	int		rc;
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
@@ -146,6 +153,23 @@ void mu_getlst(char *name, int4 size)
 			matched = FALSE;
 			for (i = 0, reg = gd_header->regions; i < gd_header->n_regions; i++, reg++)
 			{
+				is_statsDB = IS_STATSDB_REG(reg);
+				is_autoDB = IS_AUTODB_REG(reg);
+				/* See if autoDB file actually exists to know whether to include this region in the list or not.
+				 * But a statsDB (which is also an autoDB) region does not point to the real statsdb file name.
+				 * (will be determined only when the baseDB is opened). So skip this check for statsDBs.
+				 * LOG_ERROR_FALSE usage below as we do not want error message displayed if file does not exist.
+				 */
+				if (!is_statsDB && is_autoDB && !mupfndfil(reg, NULL, LOG_ERROR_FALSE))
+					continue;	/* autoDB does not exist - do not include */
+				if (IS_STATSDB_REGNAME(reg))
+				{	/* This is a statsdb region. Since the statsdb file name is not determined until the
+					 * basedb region is opened, we cannot run "insert_region" on this region. Skip for now.
+					 * Caller needs to do the needful for statsdb regions since it is the one that will
+					 * do a "gvcst_init" of the baseDB region.
+					 */
+					continue;
+				}
 				if (TRUE == str_match((char *)REG_STR_LEN(reg), c1, c2 - c1))
 				{
 					matched = TRUE;
diff --git a/sr_unix/mu_op_open.c b/sr_unix/mu_op_open.c
index 62c8fe1..3c0f222 100755
--- a/sr_unix/mu_op_open.c
+++ b/sr_unix/mu_op_open.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -132,8 +133,8 @@ static bool mu_open_try(io_log_name *naml, io_log_name *tl, mval *pp, mval *mspa
 	{
 		if (0 == tl->iod)
 		{
-			tl->iod = iod = (io_desc *)malloc(SIZEOF(io_desc));
-			memset((char*)tl->iod, 0, SIZEOF(io_desc));
+			iod = (io_desc *)malloc(SIZEOF(io_desc));
+			memset((char*)iod, 0, SIZEOF(io_desc));
 			iod->pair.in  = iod;
 			iod->pair.out = iod;
 			iod->trans_name = tl;
@@ -149,7 +150,9 @@ static bool mu_open_try(io_log_name *naml, io_log_name *tl, mval *pp, mval *mspa
 				else
 					p_offset += io_params_size[ch];
 			}
-		}
+			tl->iod = iod;
+		} else
+			iod = tl->iod;
 		if ((n_io_dev_types == iod->type) && mspace && mspace->str.len)
 			iod->type = us;
 		if (n_io_dev_types == iod->type)
diff --git a/sr_unix/mu_rndwn_all.c b/sr_unix/mu_rndwn_all.c
index 9b79f54..fa4bc07 100755
--- a/sr_unix/mu_rndwn_all.c
+++ b/sr_unix/mu_rndwn_all.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -58,20 +58,18 @@
 #include "do_shmat.h"	/* for do_shmat() prototype */
 #include "shmpool.h" /* Needed for the shmpool structures */
 #include "error.h"
-#ifdef GTM_SNAPSHOT
 #include "db_snapshot.h"
-#endif
 
 #define PRINT_AND_SEND_SHMREMOVED_MSG(MSGBUFF, FNAME_LEN, FNAME, SHMID)							\
-{															\
+MBSTART {														\
 	gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(9) ERR_TEXT, 2, LEN_AND_STR(MSGBUFF), 					\
 			ERR_SHMREMOVED, 3, SHMID, FNAME_LEN, FNAME);							\
 	send_msg_csa(CSA_ARG(NULL) VARLSTCNT(9) ERR_TEXT, 2, LEN_AND_STR(MSGBUFF), 					\
 			ERR_SHMREMOVED, 3, SHMID, FNAME_LEN, FNAME);							\
-}
+} MBEND
 
 #define PRINT_AND_SEND_REPLPOOL_FAILURE_MSG(MSGBUFF, REPLPOOL_ID, SHMID)						\
-{															\
+MBSTART {														\
 	int		msgid;												\
 	unsigned char	ipcs_buff[MAX_IPCS_ID_BUF], *ipcs_ptr;								\
 															\
@@ -82,15 +80,15 @@
 				msgid, 4, LEN_AND_STR(ipcs_buff), LEN_AND_STR(REPLPOOL_ID->instfilename));		\
 	send_msg_csa(CSA_ARG(NULL) VARLSTCNT(10) ERR_TEXT, 2, LEN_AND_STR(MSGBUFF), msgid, 4, LEN_AND_STR(ipcs_buff),	\
 			LEN_AND_STR(REPLPOOL_ID->instfilename));							\
-}
+} MBEND
 
 #define PRINT_AND_SEND_DBRNDWN_FAILURE_MSG(MSGBUFF, FNAME, SHMID)							\
-{															\
+MBSTART {														\
 	gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(9) ERR_TEXT, 2, LEN_AND_STR(MSGBUFF), ERR_MUFILRNDWNFL2, 3, 		\
 			SHMID, LEN_AND_STR(FNAME));									\
 	send_msg_csa(CSA_ARG(NULL) VARLSTCNT(9) ERR_TEXT, 2, LEN_AND_STR(MSGBUFF), ERR_MUFILRNDWNFL2, 3, 		\
 			SHMID, LEN_AND_STR(FNAME));									\
-}
+} MBEND
 
 GBLREF gd_region        *gv_cur_region;
 GBLREF semid_queue_elem	*keep_semids;
@@ -150,8 +148,13 @@ STATICFNDEF void mu_rndwn_all_helper(shm_parms *parm_buff, char *fname, int *exi
 			gv_cur_region->dyn.addr->fname_len = strlen(fname);
 			STRNCPY_STR(gv_cur_region->dyn.addr->fname, fname, gv_cur_region->dyn.addr->fname_len);
 			if (mu_rndwn_file(gv_cur_region, FALSE))
-				gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_MUFILRNDWNSUC, 2, DB_LEN_STR(gv_cur_region));
-			else
+			{	/* If this is a statsdb, "mu_rundwn_file" would have invoked rundown on basedb which would
+				 * in turn invoke rundown on the statsdb. The basedb rundown would print the MUFILRNDWNSUC
+				 * message if needed. So skip double-printing it here.
+				 */
+				if (!IS_RDBF_STATSDB(gv_cur_region))
+					gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_MUFILRNDWNSUC, 2, DB_LEN_STR(gv_cur_region));
+			} else
 			{	/* Save semid so that it will not be removed by mu_rndwn_sem_all() */
 				add_to_semids_list(FILE_INFO(gv_cur_region)->semid);
 				*exit_status = ERR_MUNOTALLSEC;
@@ -336,7 +339,8 @@ boolean_t validate_db_shm_entry(shm_parms *parm_buff, char *fname, int *exit_sta
 			return FALSE;
 		}
 		udi = FILE_INFO(gv_cur_region);
-		LSEEKREAD(udi->fd, 0, &tsd, SIZEOF(sgmnt_data), status);
+		assert(!udi->fd_opened_with_o_direct);
+		DB_LSEEKREAD(udi, udi->fd, 0, &tsd, SIZEOF(sgmnt_data), status);
 		if (0 != status)
 		{
 			save_errno = errno;
diff --git a/sr_unix/mu_rndwn_file.c b/sr_unix/mu_rndwn_file.c
index f159a87..e7dc5a1 100755
--- a/sr_unix/mu_rndwn_file.c
+++ b/sr_unix/mu_rndwn_file.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -76,10 +76,8 @@
 #include "hashtab_mname.h"	/* needed for muprec.h */
 #include "hashtab.h"		/* needed for muprec.h */
 #include "muprec.h"
-
-#ifndef GTM_SNAPSHOT
-# error "Snapshot facility not available in this platform"
-#endif
+#include "aio_shim.h"
+#include "mu_gv_cur_reg_init.h"
 
 GBLREF	sgmnt_addrs		*cs_addrs;
 GBLREF	gd_region		*gv_cur_region;
@@ -90,15 +88,16 @@ GBLREF	ipcs_mesg		db_ipcs;
 GBLREF	jnl_gbls_t		jgbl;
 GBLREF	gd_region		*ftok_sem_reg;
 GBLREF	mur_opt_struct		mur_options;
+GBLREF	mval			dollar_zgbldir;
 #ifdef DEBUG
 GBLREF	boolean_t		in_mu_rndwn_file;
 #endif
 
+/* Any additions/removal from this "static" list requires a similar change in NESTED_MU_RNDWN_FILE_CALL */
 static gd_region	*rundown_reg = NULL;
 static gd_region	*temp_region;
 static sgmnt_data_ptr_t	temp_cs_data;
 static sgmnt_addrs	*temp_cs_addrs;
-static boolean_t	restore_rndwn_gbl;
 static boolean_t	mu_rndwn_file_standalone;
 static boolean_t	sem_created;
 static boolean_t	no_shm_exists;
@@ -108,7 +107,6 @@ LITREF char             gtm_release_name[];
 LITREF int4             gtm_release_name_len;
 
 error_def(ERR_BADDBVER);
-error_def(ERR_NOMORESEMCNT);
 error_def(ERR_DBFILERR);
 error_def(ERR_DBIDMISMATCH);
 error_def(ERR_DBNAMEMISMATCH);
@@ -116,78 +114,89 @@ error_def(ERR_DBNOTGDS);
 error_def(ERR_DBRDONLY);
 error_def(ERR_DBSHMNAMEDIFF);
 error_def(ERR_JNLORDBFLU);
+error_def(ERR_MUFILRNDWNSUC);
 error_def(ERR_MURNDWNOVRD);
 error_def(ERR_MUUSERECOV);
 error_def(ERR_MUUSERLBK);
+error_def(ERR_NOMORESEMCNT);
+error_def(ERR_OFRZACTIVE);
 error_def(ERR_SEMREMOVED);
 error_def(ERR_SHMREMOVED);
+error_def(ERR_STATSDBNOTSUPP);
 error_def(ERR_SYSCALL);
 error_def(ERR_TEXT);
 error_def(ERR_VERMISMATCH);
 
-#define RESET_GV_CUR_REGION													\
-{																\
-	gv_cur_region = temp_region;												\
-	cs_addrs = temp_cs_addrs;												\
-	cs_data = temp_cs_data;													\
-}
+#define	ALIGN_BUFF_IF_NEEDED_FOR_DIO(UDI, BUFF, TSD, TSD_SIZE)	\
+MBSTART {							\
+	if (UDI->fd_opened_with_o_direct)			\
+	{							\
+		BUFF = (TREF(dio_buff)).aligned;		\
+		memcpy(BUFF, TSD, TSD_SIZE);			\
+	} else							\
+		BUFF = (char *)TSD;				\
+} MBEND
 
-#define	CLNUP_AND_RETURN(REG, UDI, TSD, SEM_CREATED, SEM_INCREMENTED)								\
-{																\
-	int		rc;													\
-																\
-	if (FD_INVALID != UDI->fd)												\
-	{															\
-		CLOSEFILE_RESET(UDI->fd, rc);											\
-		assert(FD_INVALID == UDI->fd);											\
-	}															\
-	if (NULL != TSD)													\
-	{															\
-		free(TSD);													\
-		TSD = NULL;													\
-	}															\
-	if (SEM_INCREMENTED)													\
-	{															\
-		do_semop(udi->semid, DB_CONTROL_SEM, -1, IPC_NOWAIT | SEM_UNDO);						\
-		SEM_INCREMENTED = FALSE;											\
-	}															\
-	if (SEM_CREATED)													\
-	{															\
-		if (-1 == sem_rmid(UDI->semid))											\
-		{														\
-			RNDWN_ERR("!AD -> Error removing semaphore.", REG);							\
-		} else														\
-			SEM_CREATED = FALSE;											\
-	}															\
-	REVERT;															\
-	assert((NULL == ftok_sem_reg) || (REG == ftok_sem_reg));								\
-	if (REG == ftok_sem_reg)												\
-		ftok_sem_release(REG, UDI->counter_ftok_incremented, TRUE);							\
-	if (restore_rndwn_gbl)													\
-	{															\
-		RESET_GV_CUR_REGION;												\
-		restore_rndwn_gbl = FALSE;											\
-	}															\
-	return FALSE;														\
-}
+#define RESET_GV_CUR_REGION		\
+MBSTART {				\
+	gv_cur_region = temp_region;	\
+	cs_addrs = temp_cs_addrs;	\
+	cs_data = temp_cs_data;		\
+} MBEND
 
-#define SEG_SHMATTACH(addr, reg, udi, tsd, sem_created, sem_incremented)							\
-{																\
-	if (-1 == (sm_long_t)(cs_addrs->db_addrs[0] = (sm_uc_ptr_t)								\
-				do_shmat(udi->shmid, addr, SHM_RND)))								\
-	{															\
-		if (EINVAL != errno)												\
-			RNDWN_ERR("!AD -> Error attaching to shared memory", (reg));						\
-		/* shared memory segment no longer exists */									\
-		CLNUP_AND_RETURN(reg, udi, tsd, sem_created, sem_incremented);							\
-	}															\
-}
+#define	MU_RNDWN_FILE_CLNUP(REG, UDI, TSD, SEM_CREATED, SEM_INCREMENTED)		\
+MBSTART {										\
+	int		rc;								\
+											\
+	IF_LIBAIO(aio_shim_destroy(UDI->owning_gd);)					\
+	if (FD_INVALID != UDI->fd)							\
+	{										\
+		CLOSEFILE_RESET(UDI->fd, rc);						\
+		assert(FD_INVALID == UDI->fd);						\
+	}										\
+	if (NULL != TSD)								\
+	{										\
+		free(TSD);								\
+		TSD = NULL;								\
+	}										\
+	if (SEM_INCREMENTED)								\
+	{										\
+		do_semop(udi->semid, DB_CONTROL_SEM, -1, IPC_NOWAIT | SEM_UNDO);	\
+		SEM_INCREMENTED = FALSE;						\
+	}										\
+	if (SEM_CREATED)								\
+	{										\
+		if (-1 == sem_rmid(UDI->semid))						\
+		{									\
+			RNDWN_ERR("!AD -> Error removing semaphore.", REG);		\
+		} else									\
+			SEM_CREATED = FALSE;						\
+	}										\
+	REVERT;										\
+	assert((NULL == ftok_sem_reg) || (REG == ftok_sem_reg));			\
+	if (REG == ftok_sem_reg)							\
+		ftok_sem_release(REG, UDI->counter_ftok_incremented, TRUE);		\
+	RESET_GV_CUR_REGION;								\
+} MBEND
+
+#define SEG_SHMATTACH(addr, reg, udi, tsd, sem_created, sem_incremented)		\
+MBSTART {										\
+	if (-1 == (sm_long_t)(cs_addrs->db_addrs[0] = (sm_uc_ptr_t)			\
+				do_shmat(udi->shmid, addr, SHM_RND)))			\
+	{										\
+		if (EINVAL != errno)							\
+			RNDWN_ERR("!AD -> Error attaching to shared memory", (reg));	\
+		/* shared memory segment no longer exists */				\
+		MU_RNDWN_FILE_CLNUP(reg, udi, tsd, sem_created, sem_incremented);	\
+		return FALSE;								\
+	}										\
+} MBEND
 
 /* Print an error message that, based on whether replication was enabled at the time of the crash, would instruct
  * the user to a more appropriate operation than RUNDOWN, such as RECOVER or ROLLBACK.
  */
 #define PRINT_PREVENT_RUNDOWN_MESSAGE(REG, CS_ADDRS, NEED_ROLLBACK)					\
-{													\
+MBSTART {												\
 	if (NEED_ROLLBACK)										\
 	{												\
 		rts_error_csa(CSA_ARG(CS_ADDRS) VARLSTCNT(8) ERR_MUUSERLBK, 2, DB_LEN_STR(REG),		\
@@ -197,6 +206,94 @@ error_def(ERR_VERMISMATCH);
 		rts_error_csa(CSA_ARG(CS_ADDRS) VARLSTCNT(8) ERR_MUUSERECOV, 2, DB_LEN_STR(REG),	\
 			ERR_TEXT, 2, LEN_AND_LIT("Run MUPIP JOURNAL RECOVER"));				\
 	}												\
+} MBEND
+
+/* This macro is called whenever a "mu_rndwn_file" call is done from within "mu_rndwn_file".
+ * In that case, some static variables (relied upon by mu_rndwn_file_ch to handle errors in current
+ * "mu_rndwn_file" frame level) are saved off in the stack and restored once the call returns.
+ */
+#define	NESTED_MU_RNDWN_FILE_CALL(REG, STANDALONE, STATUS)		\
+{									\
+	gd_region		*save_rundown_reg;			\
+	gd_region		*save_temp_region;			\
+	sgmnt_data_ptr_t	save_temp_cs_data;			\
+	sgmnt_addrs		*save_temp_cs_addrs;			\
+	boolean_t		save_mu_rndwn_file_standalone;		\
+	boolean_t		save_sem_created;			\
+	boolean_t		save_no_shm_exists;			\
+	boolean_t		save_shm_status_confirmed;		\
+									\
+	save_rundown_reg                = rundown_reg;			\
+	save_temp_region                = temp_region;			\
+	save_temp_cs_data               = temp_cs_data;			\
+	save_temp_cs_addrs              = temp_cs_addrs;		\
+	save_mu_rndwn_file_standalone   = mu_rndwn_file_standalone;	\
+	save_sem_created                = sem_created;			\
+	save_no_shm_exists              = no_shm_exists;		\
+	save_shm_status_confirmed       = shm_status_confirmed;		\
+									\
+	STATUS = mu_rndwn_file(REG, STANDALONE);			\
+									\
+	rundown_reg                = save_rundown_reg;			\
+	temp_region                = save_temp_region;			\
+	temp_cs_data               = save_temp_cs_data;			\
+	temp_cs_addrs              = save_temp_cs_addrs;		\
+	mu_rndwn_file_standalone   = save_mu_rndwn_file_standalone;	\
+	sem_created                = save_sem_created;			\
+	no_shm_exists              = save_no_shm_exists;		\
+	shm_status_confirmed       = save_shm_status_confirmed;		\
+}
+
+/* Runs down a stats db pointed to by "statsDBreg". Returns TRUE/FALSE depending on whether rundown succeeded or not.
+ * Input parameter "standalone" is FALSE if caller is MUPIP RUNDOWN and TRUE otherwise. Used to decide whether to
+ *	print the MUFILRNDWNSUC message or not (only mupip rundown should print it).
+ * Modifies "*statsdb_exists" to TRUE or FALSE depending on whether the file exists or not.
+ */
+STATICFNDEF boolean_t mu_rndwn_file_statsdb(gd_region *statsDBreg, boolean_t *statsdb_exists, boolean_t standalone)
+{
+	boolean_t	statsDBrundown_status;
+	gd_region	*save_gv_cur_region, *save_ftok_sem_reg;
+	gd_segment	*statsDBseg;
+
+	/* We are in "mu_rndwn_file" of a basedb and are about to do a nested call of "mu_rndwn_file" on a statsdb.
+	 * But we don't want that to in turn call a "mu_rndwn_file" of the basedb (which it can if IS_RDBF_STATSDB
+	 * is TRUE; see NESTED_MU_RNDWN_FILE_CALL usage in "mu_rndwn_file") as that would lead to an indefinite recursion.
+	 * Below assert is done to ensure that does not happen.
+	 */
+	assert(IS_STATSDB_REGNAME(statsDBreg));
+	assert(statsDBreg->owning_gd->regions != statsDBreg);	/* A statsdb is never the first region in a gld */
+	if (mupfndfil(statsDBreg, NULL, LOG_ERROR_FALSE))
+	{	/* statsDB exists. Do its rundown first. */
+		*statsdb_exists = TRUE;
+		statsDBseg = statsDBreg->dyn.addr;
+		if (NULL == statsDBseg->file_cntl)
+			FILE_CNTL_INIT(statsDBseg);
+		/* Since this function is called only from "mu_rndwn_file", we hold the ftok lock on the basedb at this point.
+		 * But the "mu_rndwn_file" call below is going to get the ftok lock on the statsdb and "ftok_sem_get" does not
+		 * like holding more than one ftok at any point in time. So fix structures to indicate no ftok lock is held
+		 * and restore that after the "mu_rndwn_file" call.
+		 */
+		save_ftok_sem_reg = ftok_sem_reg;
+		ftok_sem_reg = NULL;
+		NESTED_MU_RNDWN_FILE_CALL(statsDBreg, FALSE, statsDBrundown_status);
+		if (statsDBrundown_status && !standalone)
+			gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_MUFILRNDWNSUC, 2, DB_LEN_STR(statsDBreg));
+		ftok_sem_reg = save_ftok_sem_reg;
+		save_gv_cur_region = gv_cur_region;
+		/* In case "mu_rndwn_file" call on the statsdb failed with SIG-11 or so, it would return with "gv_cur_region"
+		 * still pointing to the statsdb so fix it to point back to the basedb and continue with basedb rundown.
+		 */
+		if (save_gv_cur_region != gv_cur_region)
+		{
+			gv_cur_region = save_gv_cur_region;
+			tp_change_reg();
+		}
+	} else
+	{
+		*statsdb_exists = FALSE;
+		statsDBrundown_status = TRUE;
+	}
+	return statsDBrundown_status;
 }
 
 /* Description:
@@ -221,16 +318,17 @@ boolean_t mu_rndwn_file(gd_region *reg, boolean_t standalone)
 	int			status, save_errno, sopcnt, tsd_size, save_udi_semid = INVALID_SEMID, semop_res, stat_res, rc;
 	int			csd_size;
 	char                    now_running[MAX_REL_NAME];
-	boolean_t		rc_cpt_removed, is_gtm_shm;
+	boolean_t		is_gtm_shm, is_statsdb, rc_cpt_removed, statsDBexists;
 	boolean_t		glob_sec_init, db_shm_in_sync, remove_shmid, ftok_counter_halted;
-	boolean_t		crypt_warning, do_crypt_init;
+	boolean_t		crypt_warning, do_crypt_init, need_statsdb_rundown;
+	boolean_t		baseDBrundown_status, statsDBrundown_status;
 	sgmnt_data_ptr_t	csd, tsd = NULL;
 	sgmnt_addrs		*csa;
 	jnl_private_control	*jpc;
 	struct sembuf		sop[4], *sopptr;
 	struct shmid_ds		shm_buf;
 	file_control		*fc;
-	unix_db_info		*udi;
+	unix_db_info		*statsDBudi, *udi;
 	enum db_acc_method	acc_meth;
         struct stat     	stat_buf;
 	struct semid_ds		semstat;
@@ -238,7 +336,7 @@ boolean_t mu_rndwn_file(gd_region *reg, boolean_t standalone)
 	uint4			status_msg, ss_pid;
 	shm_snapshot_t		*ss_shm_ptr;
 	gtm_uint64_t		sec_size, mmap_sz = 0;
-	gd_segment		*seg;
+	gd_segment		*seg, *baseDBseg;
 	int			gtmcrypt_errno;
 	boolean_t		cleanjnl_present, override_present, wcs_flu_success, prevent_mu_rndwn, need_rollback;
 	unsigned char		*fn;
@@ -247,50 +345,204 @@ boolean_t mu_rndwn_file(gd_region *reg, boolean_t standalone)
 	jnl_file_header		header;
 	int4			status1;
 	uint4			status2;
-	int			secshrstat;
+	int			iter, secshrstat;
+	char			*buff;
+	node_local_ptr_t	cnl;
+	char			basedb_fname[MAX_FN_LEN + 1], statsdb_fname[MAX_FN_LEN + 1], *statsdb_fname_ptr;
+	int			basedb_fname_len;
+	uint4			statsdb_fname_len;
+	gd_addr			*owning_gd;
+	gd_region		*statsDBreg, *save_ftok_sem_reg;
+	gd_segment		*statsDBseg;
+#	ifdef DEBUG
+	boolean_t		already_grabbed_ftok_sem = FALSE;
+#	endif
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
 	mu_rndwn_file_standalone = standalone;
 	rc_cpt_removed = FALSE;
-	restore_rndwn_gbl = FALSE;
 	sem_created = FALSE;
 	shm_status_confirmed = FALSE;
 	assert(!jgbl.onlnrlbk);
-	assert(!mupip_jnl_recover || standalone);
-	temp_region = gv_cur_region; 	/* save gv_cur_region wherever there is scope for it to be changed */
+	assert(!mupip_jnl_recover || standalone || IS_STATSDB_REG(reg));
+	/* save gv_cur_region, cs_data, cs_addrs, and restore them on return */
+	temp_region = gv_cur_region;
+	temp_cs_data = cs_data;
+	temp_cs_addrs = cs_addrs;
 	rundown_reg = gv_cur_region = reg;
 #	ifdef GTCM_RC
         rc_cpt_removed = mupip_rundown_cpt();
 #	endif
-	fc = reg->dyn.addr->file_cntl;
-	fc->op = FC_OPEN;
-	status = dbfilop(fc);
-	udi = FILE_INFO(reg);
-	csa = &(udi->s_addrs);		/* Need valid cs_addrs in is_anticipatory_freeze_needed, which can be called */
-	cs_addrs = csa;			/* by gtm_putmsg(), so set it up here. */
-	if (SS_NORMAL != status)
+	seg = reg->dyn.addr;
+	fc = seg->file_cntl;
+	SYNC_OWNING_GD(reg);
+	owning_gd = reg->owning_gd;
+	for (iter = 0; ; iter++)
 	{
-		gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(5) status, 2, DB_LEN_STR(reg), errno);
-		if (FD_INVALID != udi->fd)	/* Since dbfilop failed, close udi->fd only if it was opened */
-			CLOSEFILE_RESET(udi->fd, rc);	/* resets "udi->fd" to FD_INVALID */
-                return FALSE;
+		fc->op = FC_OPEN;
+		status = dbfilop(fc);
+		udi = FILE_INFO(reg);
+		csa = &(udi->s_addrs);		/* Need valid cs_addrs in is_anticipatory_freeze_needed, which can be called */
+		cs_addrs = csa;			/* by gtm_putmsg(), so set it up here. */
+		if (SS_NORMAL != status)
+		{
+			gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(5) status, 2, DB_LEN_STR(reg), errno);
+			if (0 == iter)
+			{
+				if (FD_INVALID != udi->fd)	/* Since dbfilop failed, close udi->fd only if it was opened */
+					CLOSEFILE_RESET(udi->fd, rc);	/* resets "udi->fd" to FD_INVALID */
+			} else
+			{	/* Release ftok semaphore grabbed in first iteration and never released in later iterations */
+				assert(reg == ftok_sem_reg);
+				ftok_sem_release(reg, udi->counter_ftok_incremented, TRUE);
+			}
+			return FALSE;
+		}
+		ESTABLISH_RET(mu_rndwn_file_ch, FALSE);
+		if (0 == iter)
+		{	/* Get FTOK lock only once in for loop and do not release it as otherwise it introduces complications
+			 * related to "ftok_counter_halted" maintenance across all iterations and how much to finally
+			 * decrement the counter semaphore at the end (as part of the "ftok_sem_release").
+			 * Note that if we are a statsdb it is possible that a parent "mu_rndwn_file" invocation grabbed the
+			 * ftok (and in turn invoked "mu_rndwn_file" on the basedb which in turn invoked "mu_rndwn_file"
+			 * on the statsdb again). In that case, the nested statsdb rundown invocation will continue to use
+			 * the ftok grabbed by the parent statsdb rundown invocation. We do not release the ftok in the parent
+			 * invocation as otherwise we run the possibility of deleting the ftok semaphore as part of that
+			 * (since at the time we do the basedb rundown invocation we have not yet attached to db shm to know
+			 * if the ftok counter semaphore overflowed or not).
+			 */
+			DEBUG_ONLY(already_grabbed_ftok_sem = udi->grabbed_ftok_sem);
+			if (!udi->grabbed_ftok_sem)
+			{
+				if (!ftok_sem_get(reg, TRUE, GTM_ID, !standalone, &ftok_counter_halted))
+				{
+					MU_RNDWN_FILE_CLNUP(reg, udi, tsd, sem_created, udi->counter_acc_incremented);
+					return FALSE;
+				}
+			} else
+			{
+				assert(NULL == ftok_sem_reg); /* parent statsdb "mu_rndwn_file" invocation would have done this */
+				ftok_sem_reg = reg;
+				/* Inherit "ftok_counter_halted" from parent "ftok_sem_get" invocation since we did not do one */
+				ftok_counter_halted = !udi->counter_ftok_incremented;
+			}
+			/* At this point, we have not yet attached to the database shared memory so we do not know if the ftok
+			 * counter got halted previously or not. So be safe and assume it has halted in case the db shmid
+			 * indicates it is up and running.
+			 */
+			assert(udi->counter_ftok_incremented == !ftok_counter_halted);
+			udi->counter_ftok_incremented = FALSE;
+		}
+		/* Now we have standalone access of the database using ftok semaphore. Any other ftok conflicted database suspends
+		 * their operation at this point. At the end of this routine, we release ftok semaphore lock.
+		 */
+		tsd_size = ROUND_UP(SIZEOF(sgmnt_data), DISK_BLOCK_SIZE);
+		/* Assert that later DB_LSEEKWRITE with DIO will be fine */
+		assert(!udi->fd_opened_with_o_direct || (tsd_size == ROUND_UP2(tsd_size, DIO_ALIGNSIZE(udi))));
+		tsd = (sgmnt_data_ptr_t)malloc(tsd_size);
+		buff = (udi->fd_opened_with_o_direct ? (TREF(dio_buff)).aligned : (char *)tsd);
+		DB_LSEEKREAD(udi, udi->fd, 0, buff, tsd_size, status);
+		if (0 != status)
+		{
+			RNDWN_ERR("!AD -> Error reading from file.", reg);
+			MU_RNDWN_FILE_CLNUP(reg, udi, tsd, sem_created, udi->counter_acc_incremented);
+			return FALSE;
+		}
+		if (udi->fd_opened_with_o_direct)
+			memcpy(tsd, buff, tsd_size);
+		if (standalone && IS_RDBF_STATSDB(tsd))
+		{	/* Only MUPIP RUNDOWN (which has "standalone" set to FALSE) is supported for statsdb files.
+			 * All other MUPIP commands which require standalone access cannot directly operate on statsdb files.
+			 */
+			gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_STATSDBNOTSUPP, 2, DB_LEN_STR(reg));
+			MU_RNDWN_FILE_CLNUP(reg, udi, tsd, sem_created, udi->counter_acc_incremented);
+			return FALSE;
+		}
+		SYNC_RESERVEDDBFLAGS_REG_CSA_CSD(reg, csa, tsd, ((node_local_ptr_t)NULL));
+		if (!IS_AIO_DBGLDMISMATCH(seg, tsd))
+			break;
+		/* Close current file and reopen with the correct O_DIRECT setting based on the revised asyncio value */
+		CLOSEFILE_RESET(udi->fd, rc);	/* resets "udi->fd" to FD_INVALID */
+		/* asyncio settings differ between segment and db. In this case, copy asyncio setting from db into segment
+		 * and retry the db file open.
+		 */
+		COPY_AIO_SETTINGS(seg, tsd);	/* copies from tsd to seg */
+		free(tsd);
+		tsd = NULL;
+		REVERT;
 	}
-	ESTABLISH_RET(mu_rndwn_file_ch, FALSE);
-	if (!ftok_sem_get(reg, TRUE, GTM_ID, !standalone, &ftok_counter_halted))
-		CLNUP_AND_RETURN(reg, udi, tsd, sem_created, udi->counter_acc_incremented);
-	/* Now we have standalone access of the database using ftok semaphore. Any other ftok conflicted database suspends
-	 * their operation at this point. At the end of this routine, we release ftok semaphore lock.
+	CSD2UDI(tsd, udi);	/* copies tsd->semid/tsd->shmid into udi->semid/udi->shmid */
+	is_statsdb = IS_RDBF_STATSDB(tsd);
+	assert(!already_grabbed_ftok_sem || is_statsdb);
+	assert(!is_statsdb || !standalone);	/* or else an ERR_STATSDBNOTSUPP error would have been issued */
+	/* If this is a statsdb, then we are guaranteed the caller is a MUPIP RUNDOWN command (standalone is FALSE).
+	 * Check if it is a MUPIP RUNDOWN -FILE statsdb call. In that case, we need to instead do a
+	 * MUPIP RUNDOWN -FILE basedb call and let that in turn rundown the statsdb (need that to safely cleanup
+	 * the .gst file). Similar handling is needed if the caller is argumentless MUPIP RUNDOWN. In all other cases,
+	 * we are guaranteed "mu_rndwn_file" will be invoked only on the basedb and so this call for a rundown of the
+	 * statsdb is not a direct call and so we can continue the rundown. Thankfully the two desired cases are
+	 * easily identified as in that case we would have done a "mu_gv_cur_reg_init" (which would have set
+	 * owning_gd->is_dummy_gbldir to TRUE) AND "reg" would be the first region in the gld even though it points
+	 * to a statsdb file.
 	 */
-	tsd_size = ROUND_UP(SIZEOF(sgmnt_data), DISK_BLOCK_SIZE);
-	tsd = (sgmnt_data_ptr_t)malloc(tsd_size);
-	LSEEKREAD(udi->fd, 0, tsd, tsd_size, status);
-	if (0 != status)
-	{
-		RNDWN_ERR("!AD -> Error reading from file.", reg);
-		CLNUP_AND_RETURN(reg, udi, tsd, sem_created, udi->counter_acc_incremented);
+	if (is_statsdb && owning_gd->is_dummy_gbldir && (reg == owning_gd->regions))
+	{	/* Copy basedb file name to local variable before freeing up tsd, releasing ftok lock etc. */
+		assert(tsd->basedb_fname_len);
+		assert(ARRAYSIZE(tsd->basedb_fname) <= ARRAYSIZE(basedb_fname));
+		basedb_fname_len = MIN(tsd->basedb_fname_len, ARRAYSIZE(basedb_fname) - 1);
+		assert('\0' == tsd->basedb_fname[basedb_fname_len]);
+		memcpy(basedb_fname, tsd->basedb_fname, basedb_fname_len + 1);	/* copy trailing '\0' too */
+		/* Record "ftok_counter_halted" value from "ftok_sem_get" invocation for child statsdb "mu_rndwn_file" invocation */
+		udi->counter_ftok_incremented = !ftok_counter_halted;
+		/* Create fresh gld/region structure and point basedb to it and invoke mu_rndwn_file on this */
+		mu_gv_cur_reg_init();	/* changes "gv_cur_region" */
+		baseDBseg = gv_cur_region->dyn.addr;
+		assert(ARRAYSIZE(baseDBseg->fname) >= ARRAYSIZE(basedb_fname));
+		memcpy(baseDBseg->fname, basedb_fname, basedb_fname_len + 1);	/* copy trailing '\0' too */
+		baseDBseg->fname_len = basedb_fname_len;
+		/* Check if the basedb exists. If not, skip nested "mu_rndwn_file" invocation altogether */
+		if (mupfndfil(gv_cur_region, NULL, LOG_ERROR_FALSE))
+		{
+			/* We have gotten the ftok semaphore on the statsdb. Releasing it here (and reobtaining it in the nested
+			 * statsdb "mu_rndwn_file" invocation) runs the risk of deleting the ftok semaphore while processes are
+			 * still attached. But we also do not want to leak the ftok ipcs. So hold on to the ftok sem of the statsdb
+			 * here and use that in the nested statsdb "mu_rndwn_file" invocation. And do the release of this there when
+			 * we have access to statsdb shm (and can therefore correctly decide whether counter semaphore got halted or
+			 * not). Save "ftok_sem_reg" before it is modified (a few lines later).
+			 */
+			save_ftok_sem_reg = ftok_sem_reg;
+			/* Set "ftok_sem_reg" to NULL since the nested "mu_rndwn_file" call is going to get ftok lock on the
+			 * basedb and that would assert fail otherwise.
+			 */
+			ftok_sem_reg = NULL;
+			/* Now that statsdb region has been setup, transfer parent "mu_rndwn_file" udi info to it */
+			BASEDBREG_TO_STATSDBREG(gv_cur_region, statsDBreg);
+			statsDBseg = statsDBreg->dyn.addr;
+			if (NULL == statsDBseg->file_cntl)
+				FILE_CNTL_INIT(statsDBseg);
+			statsDBudi = FILE_INFO(statsDBreg);
+			memcpy(statsDBudi, udi, SIZEOF(*udi));
+			NESTED_MU_RNDWN_FILE_CALL(gv_cur_region, FALSE, baseDBrundown_status);
+			/* If above "mu_rndwn_file" invocation of the basedb did a rundown of the statsdb too, then we would have
+			 * released the ftok lock on the statsdb. But if an error happened in "mu_rndwn_file" of the basedb before
+			 * it even attempted "mu_rndwn_file" of statsdb, then we would still be holding the ftok sem on the statsdb.
+			 * So use that as a means of distinguishing the two scenarios. We can return right away if the statsdb
+			 * rundown is already happened in the nested call and should continue with the rundown in this call
+			 * otherwise.
+			 */
+			need_statsdb_rundown = statsDBudi->grabbed_ftok_sem;
+			assert(!need_statsdb_rundown || !baseDBrundown_status);
+			if (!need_statsdb_rundown)
+			{
+				mu_gv_cur_reg_free();
+				MU_RNDWN_FILE_CLNUP(reg, udi, tsd, sem_created, udi->counter_acc_incremented);
+				return baseDBrundown_status;
+			}
+			ftok_sem_reg = save_ftok_sem_reg;
+		}
+		/* else : basedb does not exist. Continue rundown of statsdb without going through basedb rundown */
 	}
-	CSD2UDI(tsd, udi);	/* copies tsd->semid/tsd->shmid into udi->semid/udi->shmid */
 	/* read_only process cannot rundown database.
 	 * read only process can succeed in getting standalone access of the database,
 	 *	if the db is clean with no orphaned shared memory.
@@ -301,7 +553,15 @@ boolean_t mu_rndwn_file(gd_region *reg, boolean_t standalone)
 	if (reg->read_only && !standalone)
 	{
 		gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_DBRDONLY, 2, DB_LEN_STR(reg));
-		CLNUP_AND_RETURN(reg, udi, tsd, sem_created, udi->counter_acc_incremented);
+		MU_RNDWN_FILE_CLNUP(reg, udi, tsd, sem_created, udi->counter_acc_incremented);
+		return FALSE;
+	}
+	override_present = (cli_present("OVERRIDE") == CLI_PRESENT);
+	if (FROZEN_CHILLED(tsd) && !standalone && !override_present)
+	{
+		gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_OFRZACTIVE, 2, DB_LEN_STR(reg));
+		MU_RNDWN_FILE_CLNUP(reg, udi, tsd, sem_created, udi->counter_acc_incremented);
+		return FALSE;
 	}
 	csa->hdr = tsd;
 	csa->region = gv_cur_region;
@@ -311,19 +571,17 @@ boolean_t mu_rndwn_file(gd_region *reg, boolean_t standalone)
 	 * This means we might not delete the ftok semaphore in some cases of error codepaths but it should be rare
 	 * and is better than incorrectly deleting it while live processes are concurrently using it.
 	 */
-	assert(udi->counter_ftok_incremented == !ftok_counter_halted);
-	udi->counter_ftok_incremented = udi->counter_ftok_incremented && (INVALID_SHMID == udi->shmid);
+	udi->counter_ftok_incremented = !ftok_counter_halted && (INVALID_SHMID == udi->shmid);
 	if (USES_ENCRYPTION(tsd->is_encrypted))
 	{
-		csa = &(udi->s_addrs);
 		INIT_PROC_ENCRYPTION(csa, gtmcrypt_errno);
-		seg = reg->dyn.addr;
 		if (0 == gtmcrypt_errno)
 			INIT_DB_OR_JNL_ENCRYPTION(csa, tsd, seg->fname_len, seg->fname, gtmcrypt_errno);
 		if (0 != gtmcrypt_errno)
 		{
 			GTMCRYPT_REPORT_ERROR(gtmcrypt_errno, gtm_putmsg, seg->fname_len, seg->fname);
-			CLNUP_AND_RETURN(reg, udi, tsd, sem_created, udi->counter_acc_incremented);
+			MU_RNDWN_FILE_CLNUP(reg, udi, tsd, sem_created, udi->counter_acc_incremented);
+			return FALSE;
 		}
 	}
 	semarg.buf = &semstat;
@@ -339,7 +597,8 @@ boolean_t mu_rndwn_file(gd_region *reg, boolean_t standalone)
 		{
 			udi->semid = INVALID_SEMID;
 			RNDWN_ERR("!AD -> Error with semget with IPC_CREAT.", reg);
-			CLNUP_AND_RETURN(reg, udi, tsd, sem_created, udi->counter_acc_incremented);
+			MU_RNDWN_FILE_CLNUP(reg, udi, tsd, sem_created, udi->counter_acc_incremented);
+			return FALSE;
 		}
 		sem_created = TRUE;
 		tsd->semid = udi->semid;
@@ -352,7 +611,8 @@ boolean_t mu_rndwn_file(gd_region *reg, boolean_t standalone)
 		if (-1 == semctl(udi->semid, FTOK_SEM_PER_ID - 1, SETVAL, semarg))
 		{
 			RNDWN_ERR("!AD -> Error with semctl with SETVAL.", reg);
-			CLNUP_AND_RETURN(reg, udi, tsd, sem_created, udi->counter_acc_incremented);
+			MU_RNDWN_FILE_CLNUP(reg, udi, tsd, sem_created, udi->counter_acc_incremented);
+			return FALSE;
 		}
 		/*
 		 * Warning: We must read the sem_ctime after SETVAL, which changes it.
@@ -363,7 +623,8 @@ boolean_t mu_rndwn_file(gd_region *reg, boolean_t standalone)
 		if (-1 == semctl(udi->semid, FTOK_SEM_PER_ID - 1, IPC_STAT, semarg))
 		{
 			RNDWN_ERR("!AD -> Error with semctl with IPC_STAT.", reg);
-			CLNUP_AND_RETURN(reg, udi, tsd, sem_created, udi->counter_acc_incremented);
+			MU_RNDWN_FILE_CLNUP(reg, udi, tsd, sem_created, udi->counter_acc_incremented);
+			return FALSE;
 		}
 		udi->gt_sem_ctime = tsd->gt_sem_ctime.ctime = semarg.buf->sem_ctime;
 	}
@@ -417,11 +678,11 @@ boolean_t mu_rndwn_file(gd_region *reg, boolean_t standalone)
 	if (-1 == semop_res)
 	{
 		RNDWN_ERR("!AD -> File already open by another process.", reg);
-		CLNUP_AND_RETURN(reg, udi, tsd, sem_created, udi->counter_acc_incremented);
+		MU_RNDWN_FILE_CLNUP(reg, udi, tsd, sem_created, udi->counter_acc_incremented);
+		return FALSE;
 	}
 	udi->grabbed_access_sem = TRUE;
 	udi->counter_acc_incremented = no_shm_exists;
-	override_present = (cli_present("OVERRIDE") == CLI_PRESENT);
 #	ifdef DEBUG
 	cleanjnl_present = (cli_present("CLEANJNL") == CLI_PRESENT);
 #	else
@@ -450,18 +711,43 @@ boolean_t mu_rndwn_file(gd_region *reg, boolean_t standalone)
 		prevent_mu_rndwn = FALSE;
 		need_rollback = FALSE;
 	}
+	statsDBrundown_status = TRUE;
 	/* Now rundown database if shared memory segment exists. We try this for both values of 'standalone'. */
 	if (no_shm_exists)
 	{	/* Since we know no shm exists, we can safely say the counter has not halted so restore counter_ftok_incremented */
 		udi->counter_ftok_incremented = !ftok_counter_halted;
 		assert(udi->counter_ftok_incremented);
+		/* If this is a basedb, check for statsdb existence and if so call mu_rndwn_file on it */
+		if (!is_statsdb)
+		{
+			assert(udi->fn == (char *)&seg->fname[0]);
+			statsdb_fname_len = ARRAYSIZE(statsdb_fname);
+			gvcst_set_statsdb_fname(tsd, reg, statsdb_fname, &statsdb_fname_len);
+			if (statsdb_fname_len)
+			{
+				BASEDBREG_TO_STATSDBREG(reg, statsDBreg);
+				COPY_STATSDB_FNAME_INTO_STATSREG(statsDBreg, statsdb_fname, statsdb_fname_len);
+				/* Note: Error status of statsdb rundown is factored into final basedb rundown status
+				 * by storing the return value in "statsDBrundown_status".
+				 */
+				statsDBrundown_status = mu_rndwn_file_statsdb(statsDBreg, &statsDBexists, standalone);
+				/* If statsDB exists and rundown was successful, remove it. It is okay to do so since
+				 * we hold an ftok on the basedb at this point.
+				 */
+				if (statsDBexists && statsDBrundown_status)
+				{
+					rc = UNLINK(statsdb_fname);
+					assert(0 == rc);
+				}
+			}
+		}
 		if (prevent_mu_rndwn)
 		{
 			if (override_present)
 			{	/* If the rundown should normally be prevented, but the operator specified an OVERRIDE qualifier,
 				 * record the fact of the usage in the syslog and continue.
 				 */
-				send_msg_csa(CSA_ARG(cs_addrs) VARLSTCNT(8) ERR_MURNDWNOVRD, 2, DB_LEN_STR(reg), ERR_TEXT, 2,
+				send_msg_csa(CSA_ARG(csa) VARLSTCNT(8) ERR_MURNDWNOVRD, 2, DB_LEN_STR(reg), ERR_TEXT, 2,
 					LEN_AND_LIT("Overriding enabled journaling state"));
 			} else
 			{	/* Issue error if the crash bit in the journal file is set thereby preventing the user from doing a
@@ -486,9 +772,9 @@ boolean_t mu_rndwn_file(gd_region *reg, boolean_t standalone)
 								assert('\0' == header.data_file_name[header.data_file_name_length]);
 								header.data_file_name[header.data_file_name_length] = '\0';
 								if (is_file_identical((char *)header.data_file_name,
-								    (char *)gv_cur_region->dyn.addr->fname) && header.crash)
+											(char *)seg->fname) && header.crash)
 								{
-									PRINT_PREVENT_RUNDOWN_MESSAGE(reg, cs_addrs, need_rollback);
+									PRINT_PREVENT_RUNDOWN_MESSAGE(reg, csa, need_rollback);
 								}
 							}
 						}
@@ -501,7 +787,8 @@ boolean_t mu_rndwn_file(gd_region *reg, boolean_t standalone)
 			/* attempt to force-write header */
 			tsd->rc_srv_cnt = tsd->dsid = tsd->rc_node = 0;
 			assert(FALSE);	/* not sure what to do here. handle it if/when it happens */
-			CLNUP_AND_RETURN(reg, udi, tsd, sem_created, udi->counter_acc_incremented);
+			MU_RNDWN_FILE_CLNUP(reg, udi, tsd, sem_created, udi->counter_acc_incremented);
+			return FALSE;
 		} else
 		{	/* Note that if creation time does not match, we ignore that shared memory segment. It might result in
 			 * orphaned shared memory segment which can be later removed with argument-less MUPIP RUNDOWN.
@@ -514,14 +801,17 @@ boolean_t mu_rndwn_file(gd_region *reg, boolean_t standalone)
 				{
 					if (mupip_jnl_recover)
 						memset(tsd->machine_name, 0, MAX_MCNAMELEN);
-					DB_LSEEKWRITE(csa, udi->fn, udi->fd, (off_t)0, tsd, tsd_size, status);
+					ALIGN_BUFF_IF_NEEDED_FOR_DIO(udi, buff, tsd, tsd_size);	/* sets "buff" */
+					DB_LSEEKWRITE(csa, udi, udi->fn, udi->fd, (off_t)0, buff, tsd_size, status);
 					if (0 != status)
 					{
 						RNDWN_ERR("!AD -> Unable to write header to disk.", reg);
-						CLNUP_AND_RETURN(reg, udi, tsd, sem_created, udi->counter_acc_incremented);
+						MU_RNDWN_FILE_CLNUP(reg, udi, tsd, sem_created, udi->counter_acc_incremented);
+						return FALSE;
 					}
 				} else
 				{
+					db_ipcs.open_fd_with_o_direct = udi->fd_opened_with_o_direct;
 					db_ipcs.semid = tsd->semid;
 					db_ipcs.gt_sem_ctime = tsd->gt_sem_ctime.ctime;
 					db_ipcs.shmid = tsd->shmid;
@@ -531,7 +821,8 @@ boolean_t mu_rndwn_file(gd_region *reg, boolean_t standalone)
 					{
 						gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(1) status_msg);
 						RNDWN_ERR("!AD -> get_full_path failed.", reg);
-						CLNUP_AND_RETURN(reg, udi, tsd, sem_created, udi->counter_acc_incremented);
+						MU_RNDWN_FILE_CLNUP(reg, udi, tsd, sem_created, udi->counter_acc_incremented);
+						return FALSE;
 					}
 					db_ipcs.fn[db_ipcs.fn_len] = 0;
 					WAIT_FOR_REPL_INST_UNFREEZE_SAFE(csa);
@@ -540,38 +831,43 @@ boolean_t mu_rndwn_file(gd_region *reg, boolean_t standalone)
 					if ((0 != secshrstat) && !csa->read_only_fs)
 					{
 						RNDWN_ERR("!AD -> gtmsecshr was unable to write header to disk.", reg);
-						CLNUP_AND_RETURN(reg, udi, tsd, sem_created, udi->counter_acc_incremented);
+						MU_RNDWN_FILE_CLNUP(reg, udi, tsd, sem_created, udi->counter_acc_incremented);
+						return FALSE;
 					}
 				}
 				if (!ftok_sem_release(reg, FALSE, FALSE))
 				{
 					RNDWN_ERR("!AD -> Error from ftok_sem_release.", reg);
-					CLNUP_AND_RETURN(reg, udi, tsd, sem_created, udi->counter_acc_incremented);
+					MU_RNDWN_FILE_CLNUP(reg, udi, tsd, sem_created, udi->counter_acc_incremented);
+					return FALSE;
 				}
 				CLOSEFILE_RESET(udi->fd, rc);	/* resets "udi->fd" to FD_INVALID */
 				REVERT;
 				free(tsd);
 				assert(udi->grabbed_access_sem);
-				return TRUE; /* For "standalone" and "no shared memory existing", we exit here */
+				RESET_GV_CUR_REGION;
+				return statsDBrundown_status; /* For "standalone" and "no shared memory existing", we exit here */
 			} else
 			{	/* We are here for not standalone (basically the "mupip rundown" command). */
 				if (0 != do_semop(udi->semid, DB_CONTROL_SEM, -1, IPC_NOWAIT | SEM_UNDO))
 				{
 					assert(FALSE); /* We incremented the semaphore, so we should be able to decrement it */
 					RNDWN_ERR("!AD -> Error decrementing semaphore.", reg);
-					CLNUP_AND_RETURN(reg, udi, tsd, sem_created, udi->counter_acc_incremented);
+					MU_RNDWN_FILE_CLNUP(reg, udi, tsd, sem_created, udi->counter_acc_incremented);
+					return FALSE;
 				}
 				udi->counter_acc_incremented = FALSE;
 				if (0 != sem_rmid(udi->semid))
 				{
 					assert(FALSE); /* We've created the semaphore, so we should be able to remove it */
 					RNDWN_ERR("!AD -> Error removing semaphore.", reg);
-					CLNUP_AND_RETURN(reg, udi, tsd, sem_created, udi->counter_acc_incremented);
+					MU_RNDWN_FILE_CLNUP(reg, udi, tsd, sem_created, udi->counter_acc_incremented);
+					return FALSE;
 				}
 				if (!sem_created)
 				{
-					send_msg_csa(CSA_ARG(cs_addrs) VARLSTCNT(3) ERR_SEMREMOVED, 1, udi->semid);
-					gtm_putmsg_csa(CSA_ARG(cs_addrs) VARLSTCNT(3) ERR_SEMREMOVED, 1, udi->semid);
+					send_msg_csa(CSA_ARG(csa) VARLSTCNT(3) ERR_SEMREMOVED, 1, udi->semid);
+					gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(3) ERR_SEMREMOVED, 1, udi->semid);
 				}
 				sem_created = FALSE;
 				udi->grabbed_access_sem = FALSE;
@@ -582,11 +878,13 @@ boolean_t mu_rndwn_file(gd_region *reg, boolean_t standalone)
 			}
 		}
 		assert(!standalone);
-		DB_LSEEKWRITE(csa, udi->fn, udi->fd, (off_t)0, tsd, tsd_size, status);
+		ALIGN_BUFF_IF_NEEDED_FOR_DIO(udi, buff, tsd, tsd_size);	/* sets "buff" */
+		DB_LSEEKWRITE(csa, udi, udi->fn, udi->fd, (off_t)0, buff, tsd_size, status);
 		if (0 != status)
 		{
 			RNDWN_ERR("!AD -> Unable to write header to disk.", reg);
-			CLNUP_AND_RETURN(reg, udi, tsd, sem_created, udi->counter_acc_incremented);
+			MU_RNDWN_FILE_CLNUP(reg, udi, tsd, sem_created, udi->counter_acc_incremented);
+			return FALSE;
 		}
 		CLOSEFILE_RESET(udi->fd, rc);	/* resets "udi->fd" to FD_INVALID */
 		free(tsd);
@@ -597,7 +895,8 @@ boolean_t mu_rndwn_file(gd_region *reg, boolean_t standalone)
 			RNDWN_ERR("!AD -> Error from ftok_sem_release.", reg);
 			return FALSE;
 		}
-		return TRUE; /* For "!standalone" and "no shared memory existing", we exit here */
+		RESET_GV_CUR_REGION;
+		return statsDBrundown_status; /* For "!standalone" and "no shared memory existing", we exit here */
 	}
 	/* Now that we know shared memory exists, make sure FORWARD RECOVER or FORWARD ROLLBACK are not allowed to recover
 	 * the database. Only backward rollback and/or recover should be allowed.
@@ -606,7 +905,8 @@ boolean_t mu_rndwn_file(gd_region *reg, boolean_t standalone)
 	if (reg->read_only)             /* read only process can't succeed beyond this point */
 	{
 		gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(4) ERR_DBRDONLY, 2, DB_LEN_STR(reg));
-		CLNUP_AND_RETURN(reg, udi, tsd, sem_created, udi->counter_acc_incremented);
+		MU_RNDWN_FILE_CLNUP(reg, udi, tsd, sem_created, udi->counter_acc_incremented);
+		return FALSE;
 	}
 	/* Now we have a pre-existing shared memory section. Do some setup */
 	if (memcmp(tsd->label, GDS_LABEL, GDS_LABEL_SZ - 1))
@@ -615,9 +915,10 @@ boolean_t mu_rndwn_file(gd_region *reg, boolean_t standalone)
 			gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(4) ERR_DBNOTGDS, 2, DB_LEN_STR(reg));
 		else
 			gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(4) ERR_BADDBVER, 2, DB_LEN_STR(reg));
-		CLNUP_AND_RETURN(reg, udi, tsd, sem_created, udi->counter_acc_incremented);
+		MU_RNDWN_FILE_CLNUP(reg, udi, tsd, sem_created, udi->counter_acc_incremented);
+		return FALSE;
        	}
-	reg->dyn.addr->acc_meth = acc_meth = tsd->acc_meth;
+	seg->acc_meth = acc_meth = tsd->acc_meth;
 	dbsecspc(reg, tsd, &sec_size);
 #	ifdef __MVS__
 	/* match gvcst_init_sysops.c shmget with __IPC_MEGA or _LP64 */
@@ -631,414 +932,475 @@ boolean_t mu_rndwn_file(gd_region *reg, boolean_t standalone)
 		util_out_print("!AD -> Existing shared memory size do not match.", TRUE, DB_LEN_STR(reg));
 		/* fall through to get VERMISMATCH message */
 	}
-	/* save gv_cur_region, cs_data, cs_addrs, and restore them on return */
-	temp_region = gv_cur_region;
-	temp_cs_data = cs_data;
-	temp_cs_addrs = cs_addrs;
-	restore_rndwn_gbl = TRUE;
 	gv_cur_region = reg;
 	tp_change_reg();
 	SEG_SHMATTACH(0, reg, udi, tsd, sem_created, udi->counter_acc_incremented);
 	assert(csa == cs_addrs);
-	cs_addrs->nl = (node_local_ptr_t)cs_addrs->db_addrs[0];
-	/* The following checks for GDS_LABEL_GENERIC, gtm_release_name, and cs_addrs->nl->glob_sec_init ensure that the
-	 * shared memory under consideration is valid.  First, since cs_addrs->nl->label is in the same place for every
+	csa->nl = cnl = (node_local_ptr_t)csa->db_addrs[0];
+	/* The following checks for GDS_LABEL_GENERIC, gtm_release_name, and cnl->glob_sec_init ensure that the
+	 * shared memory under consideration is valid.  First, since cnl->label is in the same place for every
 	 * version, a failing check means it is most likely NOT a GT.M created shared memory, so no attempt will be
 	 * made to delete it. Next a successful match of the currently running release will guarantee that all fields in
 	 * the structure are where they're expected to be -- without this check the glob_sec_init check should not be done
 	 * as this field is at different offsets in different versions. Finally, we can check the glob_sec_init flag to
 	 * verify that shared memory has been completely initialized. If not, we should delete it right away. [C9D07-002355]
 	 */
-	if (!MEMCMP_LIT(cs_addrs->nl->label, GDS_LABEL_GENERIC))
+	for ( ; ; )	/* for loop only there to let us break from error cases without having a deep if-then-else structure */
 	{
+		if (MEMCMP_LIT(cnl->label, GDS_LABEL_GENERIC))
+		{
+			is_gtm_shm = FALSE;
+			assert(FALSE);
+			break;
+		}
 		is_gtm_shm = TRUE;
 		remove_shmid = TRUE;
-		memcpy(now_running, cs_addrs->nl->now_running, MAX_REL_NAME);
+		memcpy(now_running, cnl->now_running, MAX_REL_NAME);
 		if (memcmp(now_running, gtm_release_name, gtm_release_name_len + 1))
 		{
 			gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(8) ERR_VERMISMATCH, 6, DB_LEN_STR(reg), gtm_release_name_len,
 				   gtm_release_name, LEN_AND_STR(now_running));
-			CLNUP_AND_RETURN(reg, udi, tsd, sem_created, udi->counter_acc_incremented);
+			MU_RNDWN_FILE_CLNUP(reg, udi, tsd, sem_created, udi->counter_acc_incremented);
+			return FALSE;
 		}
-		if (cs_addrs->nl->glob_sec_init)
+		if (!cnl->glob_sec_init)
 		{
-			glob_sec_init = TRUE;
-			if (memcmp(cs_addrs->nl->label, GDS_LABEL, GDS_LABEL_SZ - 1))
+			glob_sec_init = FALSE;
+			break;
+		}
+		glob_sec_init = TRUE;
+		if (memcmp(cnl->label, GDS_LABEL, GDS_LABEL_SZ - 1))
+		{
+			if (memcmp(cnl->label, GDS_LABEL, GDS_LABEL_SZ - 3))
+				gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(8) ERR_DBNOTGDS, 2, DB_LEN_STR(reg),
+					   ERR_TEXT, 2, RTS_ERROR_LITERAL("(from shared segment - nl)"));
+			else
+				gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(8) ERR_BADDBVER, 2, DB_LEN_STR(reg),
+					   ERR_TEXT, 2, RTS_ERROR_LITERAL("(from shared segment - nl)"));
+			MU_RNDWN_FILE_CLNUP(reg, udi, tsd, sem_created, udi->counter_acc_incremented);
+			return FALSE;
+		}
+		/* Since nl is memset to 0 initially and then fname is copied over from gv_cur_region and since "fname" is
+		 * guaranteed to not exceed MAX_FN_LEN, we should have a terminating '\0' at least at
+		 * cnl->fname[MAX_FN_LEN]
+		 */
+		assert(cnl->fname[MAX_FN_LEN] == '\0');  /* First '\0' in cnl->fname can be earlier */
+		db_shm_in_sync = TRUE;	/* assume this unless proven otherwise */
+		/* Check whether cnl->fname exists. If not, then db & shm are not in sync. */
+		STAT_FILE((char *)cnl->fname, &stat_buf, stat_res);
+		if (-1 == stat_res)
+		{
+			save_errno = errno;
+			db_shm_in_sync = FALSE;
+			if (ENOENT == save_errno)
+			{
+				send_msg_csa(CSA_ARG(csa) VARLSTCNT(7) MAKE_MSG_INFO(ERR_DBNAMEMISMATCH), 4,
+						DB_LEN_STR(reg), udi->shmid, cnl->fname, save_errno);
+				gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(6) MAKE_MSG_INFO(ERR_DBNAMEMISMATCH), 4,
+						DB_LEN_STR(reg),
+					udi->shmid, cnl->fname);
+				/* In this case, the shared memory no longer points to a valid db file in the filesystem.
+				 * So it is best that we remove this shmid. But remove_shmid is already TRUE. Assert that.
+				 */
+				assert(remove_shmid);
+			} else /* Could be permission issue */
 			{
-				if (memcmp(cs_addrs->nl->label, GDS_LABEL, GDS_LABEL_SZ - 3))
-					gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(8) ERR_DBNOTGDS, 2, DB_LEN_STR(reg),
-						   ERR_TEXT, 2, RTS_ERROR_LITERAL("(from shared segment - nl)"));
-				else
-					gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(8) ERR_BADDBVER, 2, DB_LEN_STR(reg),
-						   ERR_TEXT, 2, RTS_ERROR_LITERAL("(from shared segment - nl)"));
-				CLNUP_AND_RETURN(reg, udi, tsd, sem_created, udi->counter_acc_incremented);
+				send_msg_csa(CSA_ARG(csa) VARLSTCNT(7) MAKE_MSG_INFO(ERR_DBNAMEMISMATCH), 4,
+						DB_LEN_STR(reg),
+					 udi->shmid, cnl->fname, save_errno);
+				gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(7) MAKE_MSG_INFO(ERR_DBNAMEMISMATCH), 4,
+						DB_LEN_STR(reg),
+					udi->shmid, cnl->fname, save_errno);
+				remove_shmid = FALSE; /* Shared memory might be pointing to valid database */
 			}
-			/* Since nl is memset to 0 initially and then fname is copied over from gv_cur_region and since "fname" is
-			 * guaranteed to not exceed MAX_FN_LEN, we should have a terminating '\0' at least at
-			 * cs_addrs->nl->fname[MAX_FN_LEN]
-			 */
-			assert(cs_addrs->nl->fname[MAX_FN_LEN] == '\0');  /* First '\0' in cs_addrs->nl->fname can be earlier */
-			db_shm_in_sync = TRUE;	/* assume this unless proven otherwise */
-			/* Check whether cs_addrs->nl->fname exists. If not, then db & shm are not in sync. */
-			STAT_FILE((char *)cs_addrs->nl->fname, &stat_buf, stat_res);
-			if (-1 == stat_res)
+		}
+		if (db_shm_in_sync)
+		{	/* Check if cnl->fname and cnl->dbfid are in sync. If not, then db & shm are not in sync */
+			if (FALSE == is_gdid_stat_identical(&cnl->unique_id.uid, &stat_buf))
 			{
-				save_errno = errno;
+				send_msg_csa(CSA_ARG(csa) VARLSTCNT(10) MAKE_MSG_INFO(ERR_DBIDMISMATCH), 4,
+				      cnl->fname, DB_LEN_STR(reg), udi->shmid, ERR_TEXT, 2,
+				      LEN_AND_LIT("[MUPIP] Database filename and fileid in shared memory are not in sync"));
+				gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(10) MAKE_MSG_INFO(ERR_DBIDMISMATCH), 4,
+				      cnl->fname, DB_LEN_STR(reg), udi->shmid, ERR_TEXT, 2,
+				      LEN_AND_LIT("[MUPIP] Database filename and fileid in shared memory are not in sync"));
 				db_shm_in_sync = FALSE;
-				if (ENOENT == save_errno)
-				{
-					send_msg_csa(CSA_ARG(csa) VARLSTCNT(7) MAKE_MSG_INFO(ERR_DBNAMEMISMATCH), 4,
-							DB_LEN_STR(reg), udi->shmid, cs_addrs->nl->fname, save_errno);
-					gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(6) MAKE_MSG_INFO(ERR_DBNAMEMISMATCH), 4,
-							DB_LEN_STR(reg),
-						udi->shmid, cs_addrs->nl->fname);
-					/* In this case, the shared memory no longer points to a valid db file in the filesystem.
-					 * So it is best that we remove this shmid. But remove_shmid is already TRUE. Assert that.
-					 */
-					assert(remove_shmid);
-				} else /* Could be permission issue */
+				/* In this case, the shared memory points to a file that exists in the filesystem but
+				 * the fileid of the currently present file does not match the file id recorded in
+				 * shared memory at shm creation time. Therefore the database file has since been
+				 * overwritten. In this case, we have no other option but to remove this shmid.
+				 * remove_shmid is already TRUE. Assert that.
+				 */
+				assert(remove_shmid);
+			}
+		}
+		/* Check if seg->fname and cnl->fname are identical filenames.
+		 * If not, then db that we want to rundown points to a shared memory which in turn points
+		 * to a DIFFERENT db file. In this case, do NOT remove the shared memory as it is possible
+		 * some other database file on the system points to it and passes the filename identicality check.
+		 */
+		if (db_shm_in_sync && !is_file_identical((char *)cnl->fname, (char *)seg->fname))
+		{
+			send_msg_csa(CSA_ARG(csa) VARLSTCNT(6) MAKE_MSG_INFO(ERR_DBSHMNAMEDIFF), 4, DB_LEN_STR(reg),
+				udi->shmid, cnl->fname);
+			gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(6) MAKE_MSG_INFO(ERR_DBSHMNAMEDIFF), 4, DB_LEN_STR(reg),
+				udi->shmid, cnl->fname);
+			db_shm_in_sync = FALSE;
+			remove_shmid = FALSE;
+		}
+		wcs_flu_success = TRUE;
+		/* If db & shm are not in sync at this point, skip the part of flushing shm to db file on disk.
+		 * We still need to reset the fields (shmid, semid etc.) in db file header.
+		 * About deleting the shmid, it depends on the type of out-of-sync between db & shm. This is handled
+		 * by setting the variable "remove_shmid" appropriately in each case.
+		 */
+		if (db_shm_in_sync)
+		{
+			/* Now that we have attached to db shm and verified it is usable, fix udi->counter_ftok_incremented
+			 * to take into account the "ftok_counter_halted" flag. This will make sure we do not incorrectly
+			 * delete the ftok semaphore in any error codepaths from now on until the end. In the end when we
+			 * are sure it is safe to rundown this shm, we will fix udi->counter_ftok_incremented to what it
+			 * should be to correctly remove the ftok semaphore.
+			 */
+			udi->counter_ftok_incremented = udi->counter_ftok_incremented && !cnl->ftok_counter_halted;
+			if (!udi->counter_acc_incremented)
+			{	/* Now that we have ensured db & shm are in sync and will be doing the "actual"
+				 * rundown, we need to ensure that no one is attached to the database (counter
+				 * sempahore is 0)
+				 */
+				assert(!no_shm_exists);
+				assert(udi->grabbed_access_sem);
+				assert(INVALID_SEMID != udi->semid);
+				sopcnt = 2; /* Need only the last 2 "sop" array */
+				sopptr = &sop[2];
+				SEMOP(udi->semid, sopptr, sopcnt, semop_res, NO_WAIT);
+				if (-1 == semop_res)
 				{
-					send_msg_csa(CSA_ARG(csa) VARLSTCNT(7) MAKE_MSG_INFO(ERR_DBNAMEMISMATCH), 4,
-							DB_LEN_STR(reg),
-						 udi->shmid, cs_addrs->nl->fname, save_errno);
-					gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(7) MAKE_MSG_INFO(ERR_DBNAMEMISMATCH), 4,
-							DB_LEN_STR(reg),
-						udi->shmid, cs_addrs->nl->fname, save_errno);
-					remove_shmid = FALSE; /* Shared memory might be pointing to valid database */
+					RNDWN_ERR("!AD -> File already open by another process (2).", reg);
+					MU_RNDWN_FILE_CLNUP(reg, udi, tsd, sem_created, udi->counter_acc_incremented);
+					return FALSE;
 				}
+				udi->counter_acc_incremented = TRUE;
 			}
-			if (db_shm_in_sync)
-			{	/* Check if csa->nl->fname and csa->nl->dbfid are in sync. If not, then db & shm are not in sync */
-				if (FALSE == is_gdid_stat_identical(&cs_addrs->nl->unique_id.uid, &stat_buf))
-				{
-					send_msg_csa(CSA_ARG(csa) VARLSTCNT(10) MAKE_MSG_INFO(ERR_DBIDMISMATCH), 4,
-					      cs_addrs->nl->fname, DB_LEN_STR(reg), udi->shmid, ERR_TEXT, 2,
-					      LEN_AND_LIT("[MUPIP] Database filename and fileid in shared memory are not in sync"));
-					gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(10) MAKE_MSG_INFO(ERR_DBIDMISMATCH), 4,
-					      cs_addrs->nl->fname, DB_LEN_STR(reg), udi->shmid, ERR_TEXT, 2,
-					      LEN_AND_LIT("[MUPIP] Database filename and fileid in shared memory are not in sync"));
-					db_shm_in_sync = FALSE;
-					/* In this case, the shared memory points to a file that exists in the filesystem but
-					 * the fileid of the currently present file does not match the file id recorded in
-					 * shared memory at shm creation time. Therefore the database file has since been
-					 * overwritten. In this case, we have no other option but to remove this shmid.
-					 * remove_shmid is already TRUE. Assert that.
+			/* If db & shm are in sync AND we aren't alone in using it, we can do nothing */
+			if (0 != shm_buf.shm_nattch)
+			{
+				util_out_print("!AD [!UL]-> File is in use by another process.",
+						TRUE, DB_LEN_STR(reg), udi->shmid);
+				MU_RNDWN_FILE_CLNUP(reg, udi, tsd, sem_created, udi->counter_acc_incremented);
+				return FALSE;
+			}
+			if (prevent_mu_rndwn && cnl->jnl_file.u.inode)
+			{
+				if (override_present)
+				{	/* If the rundown should normally be prevented, but the operator specified an
+					 * OVERRIDE qualifier, record the fact of the usage in the syslog and continue.
+					 */
+					send_msg_csa(CSA_ARG(csa) VARLSTCNT(8) ERR_MURNDWNOVRD, 2, DB_LEN_STR(reg),
+						ERR_TEXT, 2,
+						LEN_AND_LIT("Overriding OPEN journal file state in shared memory"));
+				} else
+				{	/* Journal file state being still open in shared memory implies a crashed state,
+					 * so error out.
 					 */
-					assert(remove_shmid);
+					PRINT_PREVENT_RUNDOWN_MESSAGE(reg, csa, need_rollback);
 				}
 			}
-			/* Check if reg->dyn.addr->fname and csa->nl->fname are identical filenames.
-			 * If not, then db that we want to rundown points to a shared memory which in turn points
-			 * to a DIFFERENT db file. In this case, do NOT remove the shared memory as it is possible
-			 * some other database file on the system points to it and passes the filename identicality check.
+			/* The shared section is valid and up-to-date with respect to the database file header;
+			 * ignore the temporary storage and use the shared section from here on. Now that the
+			 * shared section is valid, check if there is a statsdb associated with this (that we created
+			 * in this lifetime of the basedb shm or even before) and if so attempt a rundown of that first.
 			 */
-			if (db_shm_in_sync && !is_file_identical((char *)cs_addrs->nl->fname, (char *)reg->dyn.addr->fname))
+			if (cnl->statsdb_created)
 			{
-				send_msg_csa(CSA_ARG(csa) VARLSTCNT(6) MAKE_MSG_INFO(ERR_DBSHMNAMEDIFF), 4, DB_LEN_STR(reg),
-					udi->shmid, cs_addrs->nl->fname);
-				gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(6) MAKE_MSG_INFO(ERR_DBSHMNAMEDIFF), 4, DB_LEN_STR(reg),
-					udi->shmid, cs_addrs->nl->fname);
-				db_shm_in_sync = FALSE;
-				remove_shmid = FALSE;
-			}
-			wcs_flu_success = TRUE;
-			/* If db & shm are not in sync at this point, skip the part of flushing shm to db file on disk.
-			 * We still need to reset the fields (shmid, semid etc.) in db file header.
-			 * About deleting the shmid, it depends on the type of out-of-sync between db & shm. This is handled
-			 * by setting the variable "remove_shmid" appropriately in each case.
-			 */
-			if (db_shm_in_sync)
+				assert(!IS_STATSDB_REG(reg));
+				statsdb_fname_len = cnl->statsdb_fname_len;
+				assert(statsdb_fname_len);
+				statsdb_fname_ptr = cnl->statsdb_fname;
+			} else if (!is_statsdb)
 			{
-				/* Now that we have attached to db shm and verified it is usable, fix udi->counter_ftok_incremented
-				 * to take into account the "ftok_counter_halted" flag. This will make sure we do not incorrectly
-				 * delete the ftok semaphore in any error codepaths from now on until the end. In the end when we
-				 * are sure it is safe to rundown this shm, we will fix udi->counter_ftok_incremented to what it
-				 * should be to correctly remove the ftok semaphore.
+				assert(!IS_STATSDB_REG(reg));
+				assert(udi->fn == (char *)&seg->fname[0]);
+				statsdb_fname_len = ARRAYSIZE(statsdb_fname);
+				gvcst_set_statsdb_fname(tsd, reg, statsdb_fname, &statsdb_fname_len);
+				statsdb_fname_ptr = &statsdb_fname[0];
+			} else
+				statsdb_fname_len = 0;
+			if (statsdb_fname_len)
+			{
+				BASEDBREG_TO_STATSDBREG(reg, statsDBreg);
+				COPY_STATSDB_FNAME_INTO_STATSREG(statsDBreg, statsdb_fname_ptr, statsdb_fname_len);
+				/* Note: Error status of statsdb rundown is factored into final basedb rundown status
+				 * by storing the return value in "statsDBrundown_status".
 				 */
-				udi->counter_ftok_incremented = udi->counter_ftok_incremented && !cs_addrs->nl->ftok_counter_halted;
-				if (!udi->counter_acc_incremented)
-				{	/* Now that we have ensured db & shm are in sync and will be doing the "actual"
-					 * rundown, we need to ensure that no one is attached to the database (counter
-					 * sempahore is 0)
-					 */
-					assert(!no_shm_exists);
-					assert(udi->grabbed_access_sem);
-					assert(INVALID_SEMID != udi->semid);
-					sopcnt = 2; /* Need only the last 2 "sop" array */
-					sopptr = &sop[2];
-					SEMOP(udi->semid, sopptr, sopcnt, semop_res, NO_WAIT);
-					if (-1 == semop_res)
-					{
-						RNDWN_ERR("!AD -> File already open by another process (2).", reg);
-						CLNUP_AND_RETURN(reg, udi, tsd, sem_created, udi->counter_acc_incremented);
-					}
-					udi->counter_acc_incremented = TRUE;
+				statsDBrundown_status = mu_rndwn_file_statsdb(statsDBreg, &statsDBexists, standalone);
+				assert(!cnl->statsdb_created || statsDBexists);
+				assert(csa == cs_addrs);	/* cs_addrs should not have changed in above call */
+				if (cnl->statsdb_created)
+				{	/* If basedb shm exists, note statsdb rundown status in basedb shm too */
+					cnl->statsdb_rundown_clean = statsDBrundown_status;
 				}
-				/* If db & shm are in sync AND we aren't alone in using it, we can do nothing */
-				if (0 != shm_buf.shm_nattch)
+			}
+			csa->critical = (mutex_struct_ptr_t)(csa->db_addrs[0] + NODE_LOCAL_SIZE);
+			assert(((INTPTR_T)csa->critical & 0xf) == 0);	/* critical should be 16-byte aligned */
+#			ifdef CACHELINE_SIZE
+			assert(0 == ((INTPTR_T)csa->critical & (CACHELINE_SIZE - 1)));
+#			endif
+			JNL_INIT(csa, reg, tsd);
+			csa->shmpool_buffer = (shmpool_buff_hdr_ptr_t)(csa->db_addrs[0]
+										+ NODE_LOCAL_SPACE(tsd) + JNL_SHARE_SIZE(tsd));
+			csa->lock_addrs[0] = (sm_uc_ptr_t)csa->shmpool_buffer + SHMPOOL_SECTION_SIZE;
+			csa->lock_addrs[1] = csa->lock_addrs[0] + LOCK_SPACE_SIZE(tsd) - 1;
+			if (dba_bg == acc_meth)
+			{
+				cs_data = csd = csa->hdr = (sgmnt_data_ptr_t)(csa->lock_addrs[1] + 1
+								+ CACHE_CONTROL_SIZE(tsd));
+				assert(cnl->cache_off == -CACHE_CONTROL_SIZE(csd));
+				db_csh_ini(csa);
+			} else
+			{
+				cs_data = csd = csa->hdr = (sgmnt_data_ptr_t)((sm_uc_ptr_t)csa->lock_addrs[1] + 1);
+				FSTAT_FILE(udi->fd, &stat_buf, stat_res);
+				if (-1 == stat_res)
 				{
-					util_out_print("!AD [!UL]-> File is in use by another process.",
-							TRUE, DB_LEN_STR(reg), udi->shmid);
-					CLNUP_AND_RETURN(reg, udi, tsd, sem_created, udi->counter_acc_incremented);
+					RNDWN_ERR("!AD -> Error with fstat.", reg);
+					MU_RNDWN_FILE_CLNUP(reg, udi, tsd, sem_created, udi->counter_acc_incremented);
+					return FALSE;
 				}
-				if (prevent_mu_rndwn && cs_addrs->nl->jnl_file.u.inode)
+				mmap_sz = stat_buf.st_size - BLK_ZERO_OFF(csd->start_vbn);
+				CHECK_LARGEFILE_MMAP(reg, mmap_sz); /* can issue rts_error MMFILETOOLARGE */
+				csa->db_addrs[0] = (sm_uc_ptr_t) MMAP_FD(udi->fd, mmap_sz,
+										BLK_ZERO_OFF(csd->start_vbn), FALSE);
+				if (-1 == (sm_long_t)(csa->db_addrs[0]))
 				{
-					if (override_present)
-					{	/* If the rundown should normally be prevented, but the operator specified an
-						 * OVERRIDE qualifier, record the fact of the usage in the syslog and continue.
-						 */
-						send_msg_csa(CSA_ARG(cs_addrs) VARLSTCNT(8) ERR_MURNDWNOVRD, 2, DB_LEN_STR(reg),
-							ERR_TEXT, 2,
-							LEN_AND_LIT("Overriding OPEN journal file state in shared memory"));
-					} else
-					{	/* Journal file state being still open in shared memory implies a crashed state,
-						 * so error out.
-						 */
-						PRINT_PREVENT_RUNDOWN_MESSAGE(reg, cs_addrs, need_rollback);
-					}
+					RNDWN_ERR("!AD -> Error mapping memory", reg);
+					MU_RNDWN_FILE_CLNUP(reg, udi, tsd, sem_created, udi->counter_acc_incremented);
+					return FALSE;
 				}
-				/* The shared section is valid and up-to-date with respect to the database file header;
-				 * ignore the temporary storage and use the shared section from here on
-				 */
-				cs_addrs->critical = (mutex_struct_ptr_t)(cs_addrs->db_addrs[0] + NODE_LOCAL_SIZE);
-				assert(((INTPTR_T)cs_addrs->critical & 0xf) == 0);	/* critical should be 16-byte aligned */
-#				ifdef CACHELINE_SIZE
-				assert(0 == ((INTPTR_T)cs_addrs->critical & (CACHELINE_SIZE - 1)));
-#				endif
-				JNL_INIT(cs_addrs, reg, tsd);
-				cs_addrs->shmpool_buffer = (shmpool_buff_hdr_ptr_t)(cs_addrs->db_addrs[0] + NODE_LOCAL_SPACE(tsd) +
-					JNL_SHARE_SIZE(tsd));
-				cs_addrs->lock_addrs[0] = (sm_uc_ptr_t)cs_addrs->shmpool_buffer + SHMPOOL_SECTION_SIZE;
-				cs_addrs->lock_addrs[1] = cs_addrs->lock_addrs[0] + LOCK_SPACE_SIZE(tsd) - 1;
-				if (dba_bg == acc_meth)
-				{
-					cs_data = csd = csa->hdr = (sgmnt_data_ptr_t)(cs_addrs->lock_addrs[1] + 1
-									+ CACHE_CONTROL_SIZE(tsd));
-					assert(csa->nl->cache_off == -CACHE_CONTROL_SIZE(csd));
-					db_csh_ini(csa);
-				} else
+				csa->db_addrs[1] = csa->db_addrs[0] + mmap_sz - 1;
+			}
+			assert(sem_created ||
+				((csd->semid == tsd->semid) && (csd->gt_sem_ctime.ctime == tsd->gt_sem_ctime.ctime)));
+			if (sem_created && standalone)
+			{
+				csd->semid = tsd->semid;
+				csd->gt_sem_ctime.ctime = tsd->gt_sem_ctime.ctime;
+			}
+			assert(JNL_ALLOWED(csd) == JNL_ALLOWED(tsd));
+			free(tsd);
+			tsd = NULL;
+			/* Check to see that the fileheader in the shared segment is valid, so we wont end up
+			 * flushing garbage to the db file.
+			 * Check the label in the header - keep adding any further appropriate checks in future here.
+			 */
+			if (memcmp(csd->label, GDS_LABEL, GDS_LABEL_SZ - 1))
+			{
+				if (memcmp(csd->label, GDS_LABEL, GDS_LABEL_SZ - 3))
 				{
-					cs_data = csd = csa->hdr = (sgmnt_data_ptr_t)((sm_uc_ptr_t)csa->lock_addrs[1] + 1);
-					FSTAT_FILE(udi->fd, &stat_buf, stat_res);
-					if (-1 == stat_res)
+					status_msg = ERR_DBNOTGDS;
+					if (0 != shm_rmid(udi->shmid))
+						gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(8) ERR_DBFILERR, 2, DB_LEN_STR(reg),
+							   ERR_TEXT, 2, RTS_ERROR_TEXT("Error removing shared memory"));
+					else
 					{
-						RNDWN_ERR("!AD -> Error with fstat.", reg);
-						CLNUP_AND_RETURN(reg, udi, tsd, sem_created, udi->counter_acc_incremented);
+						gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(5) ERR_SHMREMOVED, 3, udi->shmid,
+								DB_LEN_STR(reg));
+						send_msg_csa(CSA_ARG(csa) VARLSTCNT(5) ERR_SHMREMOVED, 3, udi->shmid,
+								DB_LEN_STR(reg));
 					}
-					mmap_sz = stat_buf.st_size - BLK_ZERO_OFF(csd);
-					CHECK_LARGEFILE_MMAP(reg, mmap_sz); /* can issue rts_error MMFILETOOLARGE */
-					cs_addrs->db_addrs[0] = (sm_uc_ptr_t) MMAP_FD(udi->fd, mmap_sz, BLK_ZERO_OFF(csd), FALSE);
-					if (-1 == (sm_long_t)(cs_addrs->db_addrs[0]))
+				} else
+					status_msg = ERR_BADDBVER;
+				gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(8) status_msg, 2, DB_LEN_STR(reg),
+				       ERR_TEXT, 2, RTS_ERROR_LITERAL("(File header in the shared segment seems corrupt)"));
+				MU_RNDWN_FILE_CLNUP(reg, udi, tsd, sem_created, udi->counter_acc_incremented);
+				return FALSE;
+			}
+			db_common_init(reg, csa, csd); /* do initialization common to "db_init" and "mu_rndwn_file" */
+			do_crypt_init = USES_ENCRYPTION(csd->is_encrypted);
+			crypt_warning = FALSE;
+			INITIALIZE_CSA_ENCR_PTR(csa, csd, udi, do_crypt_init, crypt_warning, FALSE);	/* sets csa->encr_ptr */
+			/* cleanup mutex stuff */
+			csa->hdr->image_count = 0;
+			gtm_mutex_init(reg, NUM_CRIT_ENTRY(csa->hdr), FALSE); /* this is the only process running */
+			assert(!csa->hold_onto_crit); /* so it is safe to do unconditional grab_crit/rel_crit below */
+			cnl->in_crit = 0;
+			csa->now_crit = FALSE;
+			reg->open = TRUE;
+			if (rc_cpt_removed) /* reset RC values if we've rundown the RC CPT */
+				csd->rc_srv_cnt = csd->dsid = csd->rc_node = 0;
+			/* At this point we are holding standalone access and are about to invoke wcs_recover/wcs_flu. If
+			 * one or more GT.M processes were at the midst of phase 2 commit, wcs_recover/wcs_flu invokes
+			 * wcs_phase2_commit_wait to wait for the processes to complete the phase 2 commit. But, if we have
+			 * standalone access, there is NO point waiting for the phase 2 commits to complete as the processes
+			 * might have been killed. So, set wcs_phase2_commit_pidcnt to 0 so wcs_recover/wcs_flu skips
+			 * invoking wcs_phase2_commit_wait
+			 */
+			cnl->wcs_phase2_commit_pidcnt = 0;
+			DEBUG_ONLY(in_mu_rndwn_file = TRUE);
+			TREF(donot_write_inctn_in_wcs_recover) = TRUE;
+			/* If an orphaned snapshot is lying around, then clean it up */
+			/* SS_MULTI: If multiple snapshots are supported, then we must run-through each of the
+			 * "possible" snapshots in progress and clean them up
+			 */
+			assert(1 == MAX_SNAPSHOTS);
+			ss_get_lock(gv_cur_region); /* Snapshot initiator will wait until this cleanup is done */
+			ss_shm_ptr = (shm_snapshot_ptr_t)SS_GETSTARTPTR(csa);
+			ss_pid = ss_shm_ptr->ss_info.ss_pid;
+			if (ss_pid && !is_proc_alive(ss_pid, 0))
+				ss_release(NULL);
+			ss_release_lock(gv_cur_region);
+			/* If cnl->donotflush_dbjnl is set, it means mupip recover/rollback was interrupted and
+			 * therefore we need not flush shared memory contents to disk as they might be in an inconsistent
+			 * state. Moreover, any more flushing will only cause the future rollback/recover to undo more
+			 * journal records (PBLKs). In this case, we will go ahead and remove shared memory (without
+			 * flushing the contents) in this routine. A reissue of the recover/rollback command will restore
+			 * the database to a consistent state.
+			 */
+			if (!cnl->donotflush_dbjnl)
+			{
+				if (cnl->glob_sec_init)
+				{	/* WCSFLU_NONE only is done here, as we aren't sure of the state, so no EPOCHs are
+					 * written. If we write an EPOCH record, recover may get confused. Note that for
+					 * journaling we do not call jnl_file_close() with TRUE for second parameter.
+					 * As a result journal file might not have an EOF record.
+					 * So, a new process will switch the journal file and cut the journal file link,
+					 * though it might be a good journal without an EOF
+					 */
+					wcs_flu_success = wcs_flu(WCSFLU_NONE);
+					if (!wcs_flu_success)
 					{
-						RNDWN_ERR("!AD -> Error mapping memory", reg);
-						CLNUP_AND_RETURN(reg, udi, tsd, sem_created, udi->counter_acc_incremented);
+						if (override_present && !standalone)
+						{	/* Case of MUPIP RUNDOWN with OVERRIDE flag; continue. */
+							send_msg_csa(CSA_ARG(csa) VARLSTCNT(8) ERR_MURNDWNOVRD, 2,
+								DB_LEN_STR(reg), ERR_TEXT, 2, LEN_AND_LIT(
+								"Overriding error during database block flush"));
+							csd = csa->hdr;
+						} else
+						{	/* In case of MUPIP RUNDOWN append a suggestion to use OVERRIDE flag
+							 * to bypass the error.
+							 */
+							if (standalone)
+								rts_error_csa(CSA_ARG(csa) VARLSTCNT(4)
+									ERR_JNLORDBFLU, 2, DB_LEN_STR(reg));
+							else
+								rts_error_csa(CSA_ARG(csa) VARLSTCNT(8)
+									ERR_JNLORDBFLU, 2, DB_LEN_STR(reg),
+									ERR_TEXT, 2, LEN_AND_LIT(
+									"To force the operation to proceed, use the "
+									"OVERRIDE qualifier"));
+							assert(FALSE);	/* The above rts_error should not return. */
+							return FALSE;
+						}
 					}
-					cs_addrs->db_addrs[1] = cs_addrs->db_addrs[0] + mmap_sz - 1;
-				}
-				assert(sem_created ||
-					((csd->semid == tsd->semid) && (csd->gt_sem_ctime.ctime == tsd->gt_sem_ctime.ctime)));
-				if (sem_created && standalone)
-				{
-					csd->semid = tsd->semid;
-					csd->gt_sem_ctime.ctime = tsd->gt_sem_ctime.ctime;
 				}
-				assert(JNL_ALLOWED(csd) == JNL_ALLOWED(tsd));
-				free(tsd);
-				tsd = NULL;
-				/* Check to see that the fileheader in the shared segment is valid, so we wont end up
-				 * flushing garbage to the db file.
-				 * Check the label in the header - keep adding any further appropriate checks in future here.
-				 */
-				if (memcmp(csd->label, GDS_LABEL, GDS_LABEL_SZ - 1))
-				{
-					if (memcmp(csd->label, GDS_LABEL, GDS_LABEL_SZ - 3))
+				jpc = csa->jnl;
+				if (NULL != jpc)
+				{	/* this swaplock should probably be a mutex */
+					grab_crit(gv_cur_region);
+					/* If we own it or owner died, clear the fsync lock */
+					if (process_id == jpc->jnl_buff->fsync_in_prog_latch.u.parts.latch_pid)
 					{
-						status_msg = ERR_DBNOTGDS;
-						if (0 != shm_rmid(udi->shmid))
-							gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(8) ERR_DBFILERR, 2, DB_LEN_STR(reg),
-								   ERR_TEXT, 2, RTS_ERROR_TEXT("Error removing shared memory"));
-						else
-						{
-							gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(5) ERR_SHMREMOVED, 3, udi->shmid,
-									DB_LEN_STR(reg));
-							send_msg_csa(CSA_ARG(csa) VARLSTCNT(5) ERR_SHMREMOVED, 3, udi->shmid,
-									DB_LEN_STR(reg));
-						}
+						RELEASE_SWAPLOCK(&jpc->jnl_buff->fsync_in_prog_latch);
 					} else
-						status_msg = ERR_BADDBVER;
-					gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(8) status_msg, 2, DB_LEN_STR(reg),
-					       ERR_TEXT, 2, RTS_ERROR_LITERAL("(File header in the shared segment seems corrupt)"));
-					CLNUP_AND_RETURN(reg, udi, tsd, sem_created, udi->counter_acc_incremented);
-				}
-				db_common_init(reg, cs_addrs, csd); /* do initialization common to "db_init" and "mu_rndwn_file" */
-				do_crypt_init = USES_ENCRYPTION(csd->is_encrypted);
-				crypt_warning = FALSE;
-				INITIALIZE_CSA_ENCR_PTR(csa, csd, udi, do_crypt_init, crypt_warning);	/* sets csa->encr_ptr */
-				/* cleanup mutex stuff */
-				cs_addrs->hdr->image_count = 0;
-				gtm_mutex_init(reg, NUM_CRIT_ENTRY(cs_addrs->hdr), FALSE); /* this is the only process running */
-				assert(!cs_addrs->hold_onto_crit); /* so it is safe to do unconditional grab_crit/rel_crit below */
-				cs_addrs->nl->in_crit = 0;
-				cs_addrs->now_crit = FALSE;
-				reg->open = TRUE;
-				if (rc_cpt_removed) /* reset RC values if we've rundown the RC CPT */
-					csd->rc_srv_cnt = csd->dsid = csd->rc_node = 0;
-				/* At this point we are holding standalone access and are about to invoke wcs_recover/wcs_flu. If
-				 * one or more GT.M processes were at the midst of phase 2 commit, wcs_recover/wcs_flu invokes
-				 * wcs_phase2_commit_wait to wait for the processes to complete the phase 2 commit. But, if we have
-				 * standalone access, there is NO point waiting for the phase 2 commits to complete as the processes
-				 * might have been killed. So, set wcs_phase2_commit_pidcnt to 0 so wcs_recover/wcs_flu skips
-				 * invoking wcs_phase2_commit_wait
-				 */
-				cs_addrs->nl->wcs_phase2_commit_pidcnt = 0;
-				DEBUG_ONLY(in_mu_rndwn_file = TRUE);
-				TREF(donot_write_inctn_in_wcs_recover) = TRUE;
-				/* If an orphaned snapshot is lying around, then clean it up */
-				/* SS_MULTI: If multiple snapshots are supported, then we must run-through each of the
-				 * "possible" snapshots in progress and clean them up
-				 */
-				assert(1 == MAX_SNAPSHOTS);
-				ss_get_lock(gv_cur_region); /* Snapshot initiator will wait until this cleanup is done */
-				ss_shm_ptr = (shm_snapshot_ptr_t)SS_GETSTARTPTR(cs_addrs);
-				ss_pid = ss_shm_ptr->ss_info.ss_pid;
-				if (ss_pid && !is_proc_alive(ss_pid, 0))
-					ss_release(NULL);
-				ss_release_lock(gv_cur_region);
-				/* If csa->nl->donotflush_dbjnl is set, it means mupip recover/rollback was interrupted and
-				 * therefore we need not flush shared memory contents to disk as they might be in an inconsistent
-				 * state. Moreover, any more flushing will only cause the future rollback/recover to undo more
-				 * journal records (PBLKs). In this case, we will go ahead and remove shared memory (without
-				 * flushing the contents) in this routine. A reissue of the recover/rollback command will restore
-				 * the database to a consistent state.
-				 */
-				if (!cs_addrs->nl->donotflush_dbjnl)
-				{
-					if (cs_addrs->nl->glob_sec_init)
-					{	/* WCSFLU_NONE only is done here, as we aren't sure of the state, so no EPOCHs are
-						 * written. If we write an EPOCH record, recover may get confused. Note that for
-						 * journaling we do not call jnl_file_close() with TRUE for second parameter.
-						 * As a result journal file might not have an EOF record.
-						 * So, a new process will switch the journal file and cut the journal file link,
-						 * though it might be a good journal without an EOF
-						 */
-						wcs_flu_success = wcs_flu(WCSFLU_NONE);
-						if (!wcs_flu_success)
-						{
-							if (override_present && !standalone)
-							{	/* Case of MUPIP RUNDOWN with OVERRIDE flag; continue. */
-								send_msg_csa(CSA_ARG(cs_addrs) VARLSTCNT(8) ERR_MURNDWNOVRD, 2,
-									DB_LEN_STR(reg), ERR_TEXT, 2, LEN_AND_LIT(
-									"Overriding error during database block flush"));
-								csd = cs_addrs->hdr;
-							} else
-							{	/* In case of MUPIP RUNDOWN append a suggestion to use OVERRIDE flag
-								 * to bypass the error.
-								 */
-								if (standalone)
-									rts_error_csa(CSA_ARG(cs_addrs) VARLSTCNT(4)
-										ERR_JNLORDBFLU, 2, DB_LEN_STR(reg));
-								else
-									rts_error_csa(CSA_ARG(cs_addrs) VARLSTCNT(8)
-										ERR_JNLORDBFLU, 2, DB_LEN_STR(reg),
-										ERR_TEXT, 2, LEN_AND_LIT(
-										"To force the operation to proceed, use the "
-										"OVERRIDE qualifier"));
-								assert(FALSE);	/* The above rts_error should not return. */
-								return FALSE;
-							}
-						}
-					}
-					jpc = cs_addrs->jnl;
-					if (NULL != jpc)
-					{	/* this swaplock should probably be a mutex */
-						grab_crit(gv_cur_region);
-						/* If we own it or owner died, clear the fsync lock */
-						if (process_id == jpc->jnl_buff->fsync_in_prog_latch.u.parts.latch_pid)
-						{
-							RELEASE_SWAPLOCK(&jpc->jnl_buff->fsync_in_prog_latch);
-						} else
-							performCASLatchCheck(&jpc->jnl_buff->fsync_in_prog_latch, FALSE);
-						if (NOJNL != jpc->channel)
-							jnl_file_close(gv_cur_region, cleanjnl_present, FALSE);
-						free(jpc);
-						cs_addrs->jnl = NULL;
-						rel_crit(gv_cur_region);
-					}
+						performCASLatchCheck(&jpc->jnl_buff->fsync_in_prog_latch, FALSE);
+					if (NOJNL != jpc->channel)
+						jnl_file_close(gv_cur_region, cleanjnl_present, FALSE);
+					free(jpc);
+					csa->jnl = NULL;
+					rel_crit(gv_cur_region);
 				}
-				/* Write master-map (in addition to file header) as wcs_flu done above would not have updated it */
-				csd_size = SIZEOF_FILE_HDR(csd); 	/* SIZEOF(sgmnt_data) + master-map */
-				TREF(donot_write_inctn_in_wcs_recover) = FALSE;
-			} else
-			{	/* In this case, we just want to clear a few fields in the file header but we do NOT want to
-				 * write the master map which we dont have access to at this point so set csd_size accordingly.
+			}
+			/* Write master-map (in addition to file header) as wcs_flu done above would not have updated it */
+			csd_size = SIZEOF_FILE_HDR(csd); 	/* SIZEOF(sgmnt_data) + master-map */
+			TREF(donot_write_inctn_in_wcs_recover) = FALSE;
+		} else
+		{	/* In this case, we just want to clear a few fields in the file header but we do NOT want to
+			 * write the master map which we don't have access to at this point so set csd_size accordingly.
+			 */
+			csd = tsd;
+			csd_size = tsd_size;	/* SIZEOF(sgmnt_data) */
+		}
+		reg->open = FALSE;
+		/* If wcs_flu returned FALSE, it better be because of MUPIP RUNDOWN run with OVERRIDE qualifier. */
+		assert(wcs_flu_success || (override_present && !standalone));
+		/* In case MUPIP RUNDOWN is invoked with OVERRIDE qualifier and we ignored a FALSE return from wcs_flu, do
+		 * not update the database header, thus forcing the operator to either use a ROLLBACK/RECOVER or supply the
+		 * OVERRIDE qualifier with RUNDOWN before GT.M could again be used to access the database.
+		 */
+		if (wcs_flu_success)
+		{	/* Note: At this point we have write permission */
+			memset(csd->machine_name, 0, MAX_MCNAMELEN);
+			RESET_SHMID_CTIME(csd);
+			if (!standalone)
+			{	/* Invalidate semid in the file header as part of rundown. The actual semaphore still
+				 * exists and we'll remove that just before releasing the ftok semaphore. However, if the
+				 * MUPIP RUNDOWN command gets killed AFTER we write the file header but BEFORE we remove
+				 * the semaphore from the system, we can have an orphaned semaphore. But, this is okay
+				 * since an arugment-less MUPIP RUNDOWN, if invoked, will remove those orphaned semaphores
 				 */
-				csd = tsd;
-				csd_size = tsd_size;	/* SIZEOF(sgmnt_data) */
+				RESET_SEMID_CTIME(csd);
 			}
-			reg->open = FALSE;
-			/* If wcs_flu returned FALSE, it better be because of MUPIP RUNDOWN run with OVERRIDE qualifier. */
-			assert(wcs_flu_success || (override_present && !standalone));
-			/* In case MUPIP RUNDOWN is invoked with OVERRIDE qualifier and we ignored a FALSE return from wcs_flu, do
-			 * not update the database header, thus forcing the operator to either use a ROLLBACK/RECOVER or supply the
-			 * OVERRIDE qualifier with RUNDOWN before GT.M could again be used to access the database.
+			/* If "db_shm_in_sync" is TRUE, csd points to shared memory which is already aligned so we do
+			 * not need to do any more alignment if fd is opened with O_DIRECT.
 			 */
-			if (wcs_flu_success)
-			{	/* Note: At this point we have write permission */
-				memset(csd->machine_name, 0, MAX_MCNAMELEN);
-				RESET_SHMID_CTIME(csd);
-				if (!standalone)
-				{	/* Invalidate semid in the file header as part of rundown. The actual semaphore still
-					 * exists and we'll remove that just before releasing the ftok semaphore. However, if the
-					 * MUPIP RUNDOWN command gets killed AFTER we write the file header but BEFORE we remove
-					 * the semaphore from the system, we can have an orphaned semaphore. But, this is okay
-					 * since an arugment-less MUPIP RUNDOWN, if invoked, will remove those orphaned semaphores
-					 */
-					RESET_SEMID_CTIME(csd);
-				}
-				DB_LSEEKWRITE(csa, udi->fn, udi->fd, (off_t)0, csd, csd_size, status);
-				if (0 != status)
-				{
-					RNDWN_ERR("!AD -> Error writing header to disk.", reg);
-					CLNUP_AND_RETURN(reg, udi, tsd, sem_created, udi->counter_acc_incremented);
-				}
+			if (db_shm_in_sync)
+				buff = (char *)csd;
+			else
+			{
+				assert(!udi->fd_opened_with_o_direct || DIO_BUFF_NO_OVERFLOW((TREF(dio_buff)), csd_size));
+				ALIGN_BUFF_IF_NEEDED_FOR_DIO(udi, buff, csd, csd_size);	/* sets "buff" */
 			}
-			if (NULL != tsd)
+			DB_LSEEKWRITE(csa, udi, udi->fn, udi->fd, (off_t)0, buff, csd_size, status);
+			if (0 != status)
 			{
-				assert(!db_shm_in_sync);
-				free(tsd);
-				tsd = NULL;
+				RNDWN_ERR("!AD -> Error writing header to disk.", reg);
+				MU_RNDWN_FILE_CLNUP(reg, udi, tsd, sem_created, udi->counter_acc_incremented);
+				return FALSE;
 			}
-#			if !defined(_AIX)
-			if ((dba_mm == acc_meth) && db_shm_in_sync)
+		}
+		if (NULL != tsd)
+		{
+			assert(!db_shm_in_sync);
+			free(tsd);
+			tsd = NULL;
+		}
+#		if !defined(_AIX)
+		if ((dba_mm == acc_meth) && db_shm_in_sync)
+		{
+			assert(0 != mmap_sz);
+			if (-1 == msync((caddr_t)csa->db_addrs[0], mmap_sz, MS_SYNC))
 			{
-				assert(0 != mmap_sz);
-				if (-1 == msync((caddr_t)cs_addrs->db_addrs[0], mmap_sz, MS_SYNC))
-				{
-					RNDWN_ERR("!AD -> Error synchronizing mapped memory.", reg);
-					CLNUP_AND_RETURN(reg, udi, tsd, sem_created, udi->counter_acc_incremented);
-				}
-				if (-1 == munmap((caddr_t)cs_addrs->db_addrs[0], mmap_sz))
-				{
-					RNDWN_ERR("!AD -> Error unmapping mapped memory.", reg);
-					CLNUP_AND_RETURN(reg, udi, tsd, sem_created, udi->counter_acc_incremented);
-				}
+				RNDWN_ERR("!AD -> Error synchronizing mapped memory.", reg);
+				MU_RNDWN_FILE_CLNUP(reg, udi, tsd, sem_created, udi->counter_acc_incremented);
+				return FALSE;
 			}
-#			endif
-		} else
-			glob_sec_init = FALSE;
-	} else
-	{
-		is_gtm_shm = FALSE;
-		assert(FALSE);
+			if (-1 == munmap((caddr_t)csa->db_addrs[0], mmap_sz))
+			{
+				RNDWN_ERR("!AD -> Error unmapping mapped memory.", reg);
+				MU_RNDWN_FILE_CLNUP(reg, udi, tsd, sem_created, udi->counter_acc_incremented);
+				return FALSE;
+			}
+		}
+#		endif
+		IF_LIBAIO(aio_shim_destroy(udi->owning_gd);)
+		/* If this is a BASEDB and we are the last one out, unlink/remove the corresponding STASDB if one exists */
+		/* Note that if "is_statsdb" is TRUE and basedb was not found, we cannot safely delete the statsdb (deletion
+		 * of statsdb requires ftok lock on the basedb). In that case, we leave it as is. And when the basedb is next
+		 * opened, we will remove this statsdb and create a new one.
+		 */
+		UNLINK_STATSDB_AT_BASEDB_RUNDOWN(cnl);
+		break;
 	}
 	/* Detach from shared memory whether it is a GT.M shared memory or not */
-	if (-1 == shmdt((caddr_t)cs_addrs->nl))
+	if (-1 == shmdt((caddr_t)cnl))
 	{
 		assert(FALSE);
 		RNDWN_ERR("!AD -> Error detaching from shared memory.", reg);
-		CLNUP_AND_RETURN(reg, udi, tsd, sem_created, udi->counter_acc_incremented);
+		MU_RNDWN_FILE_CLNUP(reg, udi, tsd, sem_created, udi->counter_acc_incremented);
+		return FALSE;
 	}
-	cs_addrs->nl = NULL;
+	csa->nl = cnl = NULL;
+	csa->hdr = NULL;
 	/* Remove the shared memory only if it is a GT.M created one. */
 	if (is_gtm_shm)
 	{
@@ -1051,7 +1413,8 @@ boolean_t mu_rndwn_file(gd_region *reg, boolean_t standalone)
 				{
 					assert(FALSE);
 					RNDWN_ERR("!AD -> Error removing shared memory.", reg);
-					CLNUP_AND_RETURN(reg, udi, tsd, sem_created, udi->counter_acc_incremented);
+					MU_RNDWN_FILE_CLNUP(reg, udi, tsd, sem_created, udi->counter_acc_incremented);
+					return FALSE;
 				}
 			} else
 			{
@@ -1064,7 +1427,7 @@ boolean_t mu_rndwn_file(gd_region *reg, boolean_t standalone)
 	}
 	/* If the shared memory was found to a valid GT.M created segment and if it was properly initialized, we would
 	 * have cleared shmid in the database file header to INVALID_SHMID. If not, do the reset now as we nevertheless
-	 * dont want the database to connect to that non-GT.M-shmid or uninitialized-GT.M-shmid anymore.
+	 * don't want the database to connect to that non-GT.M-shmid or uninitialized-GT.M-shmid anymore.
 	 */
 	if (!is_gtm_shm || !glob_sec_init)
 	{
@@ -1072,11 +1435,13 @@ boolean_t mu_rndwn_file(gd_region *reg, boolean_t standalone)
 		RESET_SHMID_CTIME(tsd);
 		if (mupip_jnl_recover)
 			memset(tsd->machine_name, 0, MAX_MCNAMELEN);
-		DB_LSEEKWRITE(csa, udi->fn, udi->fd, (off_t)0, tsd, tsd_size, status);
+		ALIGN_BUFF_IF_NEEDED_FOR_DIO(udi, buff, tsd, tsd_size);	/* sets "buff" */
+		DB_LSEEKWRITE(csa, udi, udi->fn, udi->fd, (off_t)0, buff, tsd_size, status);
 		if (0 != status)
 		{
 			RNDWN_ERR("!AD -> Unable to write header to disk.", reg);
-			CLNUP_AND_RETURN(reg, udi, tsd, sem_created, udi->counter_acc_incremented);
+			MU_RNDWN_FILE_CLNUP(reg, udi, tsd, sem_created, udi->counter_acc_incremented);
+			return FALSE;
 		}
 		free(tsd);
 		tsd = NULL;
@@ -1092,12 +1457,13 @@ boolean_t mu_rndwn_file(gd_region *reg, boolean_t standalone)
 		{
 			assert(FALSE); /* We've created the semaphore, so we should be able to remove it */
 			RNDWN_ERR("!AD -> Error removing semaphore.", reg);
-			CLNUP_AND_RETURN(reg, udi, tsd, sem_created, udi->counter_acc_incremented);
+			MU_RNDWN_FILE_CLNUP(reg, udi, tsd, sem_created, udi->counter_acc_incremented);
+			return FALSE;
 		}
 		if (!sem_created)
 		{
-			send_msg_csa(CSA_ARG(cs_addrs) VARLSTCNT(3) ERR_SEMREMOVED, 1, udi->semid);
-			gtm_putmsg_csa(CSA_ARG(cs_addrs) VARLSTCNT(3) ERR_SEMREMOVED, 1, udi->semid);
+			send_msg_csa(CSA_ARG(csa) VARLSTCNT(3) ERR_SEMREMOVED, 1, udi->semid);
+			gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(3) ERR_SEMREMOVED, 1, udi->semid);
 		}
 		udi->grabbed_access_sem = FALSE;
 		udi->counter_acc_incremented = FALSE;
@@ -1106,25 +1472,17 @@ boolean_t mu_rndwn_file(gd_region *reg, boolean_t standalone)
 	}
 	REVERT;
 	RESET_GV_CUR_REGION;
-	restore_rndwn_gbl = FALSE;
-	/* For mupip rundown, standalone == FALSE and we want to remove ftok semaphore.
-	 *	The only exception is if "wcs_flu" had an error and MUPIP RUNDOWN -OVERRIDE was specified.
-	 *	In that case, we could have the ftok_counter_halted fields still set in the file header.
-	 * Otherwise, just release ftok semaphore lock. Counter will be one more for this process.
-	 * Exit handlers must take care of removing if necessary.
-	 */
 	/* We successfully ran down the database. So restore udi->counter_ftok_incremented before "ftok_sem_release"
 	 * that way the ftok semaphore gets deleted correctly as part of the counter decrement.
 	 */
 	udi->counter_ftok_incremented = !ftok_counter_halted;
-	assert(udi->counter_ftok_incremented || (!wcs_flu_success && override_present && !standalone));
 	if (!ftok_sem_release(reg, udi->counter_ftok_incremented && !standalone, !standalone))
 		return FALSE;
 	/* if "standalone" we better leave this function with standalone access */
 	assert(!standalone || udi->grabbed_access_sem);
 	CLOSEFILE_RESET(udi->fd, rc);	/* resets "udi->fd" to FD_INVALID */
 	DEBUG_ONLY(in_mu_rndwn_file = FALSE);
-	return TRUE;
+	return statsDBrundown_status;
 }
 
 CONDITION_HANDLER(mu_rndwn_file_ch)
@@ -1155,10 +1513,7 @@ CONDITION_HANDLER(mu_rndwn_file_ch)
 		if (udi->grabbed_ftok_sem)
 			ftok_sem_release(rundown_reg, udi->counter_ftok_incremented, !mu_rndwn_file_standalone);
 	}
-	if (restore_rndwn_gbl)
-	{
-		RESET_GV_CUR_REGION;
-	}
+	RESET_GV_CUR_REGION;
 	rundown_reg->open = FALSE;
 	/* We want to proceed to the next condition handler in case we have stand-alone access, because if an error happens on one
 	 * region, we should signal an issue and not proceed to the next region. Otherwise, we try to rundown the next region.
diff --git a/sr_unix/mu_rndwn_file.h b/sr_unix/mu_rndwn_file.h
index 6b9293c..43222cd 100755
--- a/sr_unix/mu_rndwn_file.h
+++ b/sr_unix/mu_rndwn_file.h
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2011 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -73,5 +74,6 @@ typedef struct shm_parms_struct
 	free(parm);							\
 }
 
-boolean_t mu_rndwn_file(gd_region *reg, boolean_t standalone);
+STATICFNDCL boolean_t	mu_rndwn_file_statsdb(gd_region *statsDBreg, boolean_t *statsdb_exists, boolean_t standalone);
+boolean_t		mu_rndwn_file(gd_region *reg, boolean_t standalone);
 #endif
diff --git a/sr_unix/mu_rndwn_repl_instance.c b/sr_unix/mu_rndwn_repl_instance.c
index f40837c..82cad81 100755
--- a/sr_unix/mu_rndwn_repl_instance.c
+++ b/sr_unix/mu_rndwn_repl_instance.c
@@ -56,7 +56,6 @@
 #include "muprec.h"
 #include "error.h"
 #include "anticipatory_freeze.h"
-#include "heartbeat_timer.h"
 #include "mutex.h"
 #include "do_semop.h"
 
@@ -320,11 +319,7 @@ boolean_t mu_rndwn_repl_instance(replpool_identifier *replpool_id, boolean_t imm
 						assert(!repl_csa->now_crit);
 						assert(!repl_csa->hold_onto_crit);
 						was_crit = repl_csa->now_crit;
-						/* Since we do grab_lock, below, we need to do a per-process initialization. Also,
-						 * start heartbeat so that grab_lock can issue MUTEXLCKALERT and get C-stacks if
-						 * waiting for crit
-						 */
-						START_HEARTBEAT_IF_NEEDED;
+						/* Since we do grab_lock, below, we need to do a per-process initialization. */
 						mutex_per_process_init();
 						if (!was_crit)
 							grab_lock(jnlpool.jnlpool_dummy_reg, TRUE, GRAB_LOCK_ONLY);
diff --git a/sr_unix/mu_size_arsample.c b/sr_unix/mu_size_arsample.c
index 4470ba3..69d3e86 100644
--- a/sr_unix/mu_size_arsample.c
+++ b/sr_unix/mu_size_arsample.c
@@ -163,7 +163,7 @@ int4 mu_size_arsample(glist *gl_ptr, uint4 M, int seed)
 			CLEAR_VECTOR(a);
 			if (cdb_sc_normal != (status = mu_size_rand_traverse(r, a)))			/* WARNING assignment */
 			{
-				assert((CDB_STAGNATE > t_tries) || IS_FINAL_RETRY_CODE(status));
+				assert(UPDATE_CAN_RETRY(t_tries, status));
 				t_retry(status);
 				continue;
 			}
@@ -247,7 +247,7 @@ STATICFNDCL void accum_stats_ar(stat_t *stat, double *r, double *a)
 
 STATICFNDCL void finalize_stats_ar(stat_t *stat)
 {
-	unsigned int	j, k;
+	int	j, k;
 
 	for (j = 0; MAX_BT_DEPTH >= j; j++)
 		/* Variance of the mean (mean referes to avg number of records per block) is Var(R)/N where N is samples size */
@@ -257,9 +257,17 @@ STATICFNDCL void finalize_stats_ar(stat_t *stat)
 			stat->S[j] /= stat->N[j];
 		}
 	stat->N[0] = stat->n;				/* for arithmetic below */
-	for (j = MAX_BT_DEPTH; (0 <= j) && (stat->M[j] < EPS); j--)
+	/* Note: stat->M[0] should remain zero since we don't maintain it. Also stat->M[1] should be > EPS.
+	 * So "j" is guaranteed to be at least 1 at the end of the for loop. Assert that.
+	 * In "pro" we be safe and add the "(0 < j)" check in the for loop below to prevent "j" from becoming negative.
+	 */
+	assert(0 == stat->M[0]);
+	assert(EPS > 0);
+	assert(EPS < 1);
+	assert(1 <= stat->M[1]);
+	for (j = MAX_BT_DEPTH; (0 < j) && (stat->M[j] < EPS); j--)
 		;
-	assert(0 <= j);					/* stat->M[0] should remain zero since we don't maintain it */
+	assert(0 < j);
 	mu_int_adj[j] = stat->AT = stat->blkerr[j] = stat->error = 0;
 	stat->B = stat->blktot[j] = 1;
 	for (k = j - 1; j > 0; j--, k--)
diff --git a/sr_unix/mu_size_impsample.c b/sr_unix/mu_size_impsample.c
index d5dfdb4..2db80d2 100644
--- a/sr_unix/mu_size_impsample.c
+++ b/sr_unix/mu_size_impsample.c
@@ -150,7 +150,7 @@ int4 mu_size_impsample(glist *gl_ptr, int4 M, int4 seed)
 			CLEAR_VECTOR(a);
 			if (cdb_sc_normal != (status = mu_size_rand_traverse(r, a)))			/* WARNING: assignment */
 			{
-				assert((CDB_STAGNATE > t_tries) || IS_FINAL_RETRY_CODE(status));
+				assert(UPDATE_CAN_RETRY(t_tries, status));
 				t_retry(status);
 				continue;
 			}
@@ -229,7 +229,7 @@ STATICFNDEF void accum_stats_impsmpl(stat_t *stat, double *r, double *a)
 STATICFNDEF void finalize_stats_impsmpl(stat_t *stat)
 {
 	double		ess; /* effective sample size */
-	unsigned int	k, l;
+	int		k, l;
 
 	for (l = 1; MAX_BT_DEPTH >= l; l++)
 		if (stat->W[l] > 0)
@@ -245,9 +245,17 @@ STATICFNDEF void finalize_stats_impsmpl(stat_t *stat)
 			stat->S[l] /= (ess + 1);
 		}
 	stat->W[0] = stat->n;				/* for arithmetic below */
-	for (l = MAX_BT_DEPTH; (0 <= l) && (stat->mu[l] < EPS); l--)
+	/* Note: stat->mu[0] should remain zero since we don't maintain it. Also stat->mu[1] should be > EPS.
+	 * So "l" is guaranteed to be at least 1 at the end of the for loop. Assert that.
+	 * In "pro" we be safe and add the "(0 < l)" check in the for loop below to prevent "l" from becoming negative.
+	 */
+	assert(0 == stat->mu[0]);
+	assert(EPS > 0);
+	assert(EPS < 1);
+	assert(1 <= stat->mu[1]);
+	for (l = MAX_BT_DEPTH; (0 < l) && (stat->mu[l] < EPS); l--)
 		;
-	assert(0 <= l);				/* stat->mu[0] should remain zero */
+	assert(0 < l);
 	stat->AT = stat->blkerr[l] = stat->error = stat->R = 0;
 	stat->B = stat->blktot[l] = 1;
 	for (k = l - 1 ; 0 < l; k--, l--)
diff --git a/sr_unix/mu_trig_trgfile.c b/sr_unix/mu_trig_trgfile.c
index 4b3e52c..c9d69ad 100644
--- a/sr_unix/mu_trig_trgfile.c
+++ b/sr_unix/mu_trig_trgfile.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2010 Fidelity Information Services, Inc	*
+ * Copyright (c) 2010-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -22,17 +23,17 @@
 
 GBLREF	boolean_t		skip_dbtriggers;	/* see gbldefs.c for description of this global */
 GBLREF	IN_PARMS		*cli_lex_in_ptr;
-GBLREF	boolean_t		is_replicator;
 GBLREF	int			tprestart_state;
 
+error_def(ERR_MUNOACTION);
+
 void mu_trig_trgfile(char *trigger_filename, int trigger_filename_len, boolean_t noprompt)
 {
 	IN_PARMS		*cli_lex_in_ptr_save = NULL;
 	boolean_t		trigger_error;
+	DCL_THREADGBL_ACCESS;
 
-	error_def(ERR_MUNOACTION);
-
-	is_replicator = TRUE;
+	SETUP_THREADGBL_ACCESS;
 	/* Since ^#t global is the ONLY global that is touched by MUPIP TRIGGERS and we currently dont support triggers
 	 * on ^#t global, it is safe to set skip_dbtriggers to TRUE for this process. This is in fact needed so we
 	 * skip cdb_sc_triggermod processing in t_end and tp_tend as otherwise that could cause unnecessary restarts in
diff --git a/sr_unix/mu_truncate.c b/sr_unix/mu_truncate.c
index 4c8c4b8..397f476 100644
--- a/sr_unix/mu_truncate.c
+++ b/sr_unix/mu_truncate.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2012-2015 Fidelity National Information	*
+ * Copyright (c) 2012-2016 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -63,7 +63,6 @@
 #include "gtmio.h"
 #include "util.h"
 #include "anticipatory_freeze.h"
-
 #include "sleep_cnt.h"
 #include "wcs_sleep.h"
 #include "interlock.h"
@@ -74,6 +73,7 @@
 #include "wcs_flu.h"
 #include "repl_msg.h"
 #include "gtmsource.h"
+#include "db_write_eof_block.h"
 
 error_def(ERR_BUFFLUFAILED);
 error_def(ERR_DBFILERR);
@@ -143,6 +143,7 @@ boolean_t mu_truncate(int4 truncate_percent)
 	jnl_buffer_ptr_t	jbp;
 	char			*err_msg;
 	intrpt_state_t		prev_intrpt_state;
+	off_t			offset;
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
@@ -308,11 +309,17 @@ boolean_t mu_truncate(int4 truncate_percent)
 	for (;;)
 	{ /* wait for FREEZE, we don't want to truncate a frozen database */
 		grab_crit(gv_cur_region);
-		if (!cs_data->freeze && !IS_REPL_INST_FROZEN)
+		if (FROZEN_CHILLED(cs_data))
+			DO_CHILLED_AUTORELEASE(csa, cs_data);
+		if (!FROZEN(cs_data) && !IS_REPL_INST_FROZEN)
 			break;
 		rel_crit(gv_cur_region);
-		while (cs_data->freeze || IS_REPL_INST_FROZEN)
+		while (FROZEN(cs_data) || IS_REPL_INST_FROZEN)
+		{
 			hiber_start(1000);
+			if (FROZEN_CHILLED(cs_data) && CHILLED_AUTORELEASE(cs_data))
+				break;
+		}
 	}
 	assert(csa->nl->trunc_pid == process_id);
 	/* Flush pending updates to disk. If this is not done, old updates can be flushed AFTER ftruncate, extending the file. */
@@ -365,7 +372,7 @@ boolean_t mu_truncate(int4 truncate_percent)
 		 * journal records (if it decides to switch to a new journal file).
 		 */
 		ADJUST_GBL_JREC_TIME(jgbl, jbp);
-		jnl_status = jnl_ensure_open();
+		jnl_status = jnl_ensure_open(gv_cur_region, csa);
 		if (SS_NORMAL != jnl_status)
 			send_msg_csa(CSA_ARG(csa) VARLSTCNT(6) jnl_status, 4, JNL_LEN_STR(csd), DB_LEN_STR(gv_cur_region));
 		else
@@ -390,7 +397,7 @@ boolean_t mu_truncate(int4 truncate_percent)
 	CHECK_TN(csa, csd, curr_tn);
 	udi = FILE_INFO(gv_cur_region);
 	/* Information used by recover_truncate to check if the file size and csa->ti->total_blks are INCONSISTENT */
-	trunc_file_size = BLK_ZERO_OFF(csd) + ((off_t)csd->blk_size * new_total) + DISK_BLOCK_SIZE;
+	trunc_file_size = BLK_ZERO_OFF(csd->start_vbn) + ((off_t)csd->blk_size * (new_total + 1));
 	csd->after_trunc_total_blks = new_total;
 	csd->before_trunc_free_blocks = csa->ti->free_blocks;
 	csd->before_trunc_total_blks = old_total; /* Flags interrupted truncate for recover_truncate */
@@ -407,7 +414,8 @@ boolean_t mu_truncate(int4 truncate_percent)
 	/* past the point of no return -- shared memory deleted */
 	KILL_TRUNC_TEST(WBTEST_CRASH_TRUNCATE_2); /* 56 : Issue a kill -9 after 1st fsync */
 	clear_cache_array(csa, csd, gv_cur_region, new_total, old_total);
-	WRITE_EOF_BLOCK(gv_cur_region, csd, new_total, save_errno);
+	offset = (off_t)BLK_ZERO_OFF(csd->start_vbn) + (off_t)new_total * csd->blk_size;
+	save_errno = db_write_eof_block(udi, udi->fd, csd->blk_size, offset, &(TREF(dio_buff)));
 	if (0 != save_errno)
 	{
 		err_msg = (char *)STRERROR(errno);
diff --git a/sr_unix/mubexpfilnam.c b/sr_unix/mubexpfilnam.c
index 7452114..087089f 100755
--- a/sr_unix/mubexpfilnam.c
+++ b/sr_unix/mubexpfilnam.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2008 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -37,7 +38,7 @@ void mubexpfilnam(char *dirname, unsigned int dirlen, backup_reg_list *list)
 	file.addr = tmp_mstr_addr;
 	if (list != mu_repl_inst_reg_list)
 	{	/* Database region */
-		if (!mupfndfil(list->reg, &file))
+		if (!mupfndfil(list->reg, &file, LOG_ERROR_TRUE))
 		{
 			util_out_print("Backup not finished because of the above error.", TRUE);
 			error_mupip = TRUE;
@@ -46,7 +47,7 @@ void mubexpfilnam(char *dirname, unsigned int dirlen, backup_reg_list *list)
 	} else
 	{	/* Replication instance region */
 		if (!repl_inst_get_name(file.addr, (unsigned int *)&file.len, MAX_FN_LEN, issue_rts_error))
-			GTMASSERT;	/* rts_error should have been issued by repl_inst_get_name */
+			assertpro(FALSE);	/* rts_error should have been issued by repl_inst_get_name */
 	}
 	for (c1 = file.addr + file.len; (*c1 != '/') && (c1 != file.addr); c1--)
 		;
diff --git a/sr_unix/mubfilcpy.c b/sr_unix/mubfilcpy.c
index 5745ae4..8e48952 100755
--- a/sr_unix/mubfilcpy.c
+++ b/sr_unix/mubfilcpy.c
@@ -46,6 +46,7 @@
 #include "shmpool.h"
 #include "wcs_phase2_commit_wait.h"
 #include "wbox_test_init.h"
+#include "db_write_eof_block.h"
 
 #define TMPDIR_ACCESS_MODE	R_OK | W_OK | X_OK
 #define TMPDIR_CREATE_MODE	S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH
@@ -115,10 +116,8 @@ error_def(ERR_COMMITWAITSTUCK);
 error_def(ERR_DBCCERR);
 error_def(ERR_DBROLLEDBACK);
 error_def(ERR_ERRCALL);
-error_def(ERR_PERMGENFAIL);
 error_def(ERR_TEXT);
 error_def(ERR_TMPFILENOCRE);
-ZOS_ONLY(error_def(ERR_BADTAG);)
 
 bool	mubfilcpy (backup_reg_list *list)
 {
@@ -131,7 +130,7 @@ bool	mubfilcpy (backup_reg_list *list)
 	int4			sourcefilelen, sourcedirlen, realpathlen;
 	struct stat		stat_buf;
 	off_t			filesize, offset;
-	char 			*inbuf, *zero_blk, *ptr, *errptr, *sourcefilename, *sourcedirname;
+	char 			*inbuf, *ptr, *errptr, *sourcefilename, *sourcedirname;
 	char			tempfilename[MAX_FN_LEN + 1], tempdir[MAX_FN_LEN], prefix[MAX_FN_LEN];
 	char			tmpsrcfname[MAX_FN_LEN], tmpsrcdirname[MAX_FN_LEN], realpathname[PATH_MAX];
 	int                     fstat_res;
@@ -141,7 +140,11 @@ bool	mubfilcpy (backup_reg_list *list)
 	int			user_id;
 	int			group_id;
 	int			perm;
+	struct perm_diag_data	pdd;
+	int 			ftruncate_res;
+	DCL_THREADGBL_ACCESS;
 
+	SETUP_THREADGBL_ACCESS;
 	file = &(list->backup_file);
 	file->addr[file->len] = '\0';
 	header_cpy = list->backup_hdr;
@@ -232,7 +235,11 @@ bool	mubfilcpy (backup_reg_list *list)
 		util_out_print("Temporary directory !AD could not be created.", TRUE, tempfilelen, tempfilename);
 		CLEANUP_AND_RETURN_FALSE;
 	}
-	realpath(tempfilename, realpathname);
+	if (NULL == realpath(tempfilename, realpathname))
+	{
+		util_out_print("Temporary directory !AD could not be found after creation.", TRUE, tempfilelen, tempfilename);
+		CLEANUP_AND_RETURN_FALSE;
+	}
 	realpathlen = STRLEN(realpathname);
 	/* Calculate total line length for commands to execute (pushd + cp). *
  	 * If cannot fit in local variable array, malloc space *
@@ -300,7 +307,20 @@ bool	mubfilcpy (backup_reg_list *list)
 	}
 	FSTAT_FILE(((unix_db_info *)(gv_cur_region->dyn.addr->file_cntl->file_info))->fd, &stat_buf, fstat_res);
 	if (-1 != fstat_res)
-		gtm_permissions(&stat_buf, &user_id, &group_id, &perm, PERM_FILE);
+		if (!gtm_permissions(&stat_buf, &user_id, &group_id, &perm, PERM_FILE, &pdd))
+		{
+			send_msg_csa(CSA_ARG(cs_addrs) VARLSTCNT(6+PERMGENDIAG_ARG_COUNT)
+				ERR_PERMGENFAIL, 4, RTS_ERROR_STRING("backup file"),
+				RTS_ERROR_STRING(((unix_db_info *)(gv_cur_region->dyn.addr->file_cntl->file_info))->fn),
+				PERMGENDIAG_ARGS(pdd));
+			gtm_putmsg_csa(CSA_ARG(cs_addrs) VARLSTCNT(6+PERMGENDIAG_ARG_COUNT)
+				ERR_PERMGENFAIL, 4, RTS_ERROR_STRING("backup file"),
+				RTS_ERROR_STRING(((unix_db_info *)(gv_cur_region->dyn.addr->file_cntl->file_info))->fn),
+				PERMGENDIAG_ARGS(pdd));
+			if (online)
+				cs_addrs->nl->nbb = BACKUP_NOT_IN_PROGRESS;
+			CLEANUP_AND_RETURN_FALSE;
+		}
 	/* Setup new group and permissions if indicated by the security rules. */
 	if ((-1 == fstat_res) || (-1 == FCHMOD(backup_fd, perm))
 		|| (((INVALID_UID != user_id) || (INVALID_GID != group_id)) && (-1 == fchown(backup_fd, user_id, group_id))))
@@ -312,10 +332,10 @@ bool	mubfilcpy (backup_reg_list *list)
 			cs_addrs->nl->nbb = BACKUP_NOT_IN_PROGRESS;
 		CLEANUP_AND_RETURN_FALSE;
 	}
-#if defined(__MVS__)
+#	if defined(__MVS__)
 	if (-1 == gtm_zos_tag_to_policy(backup_fd, TAG_BINARY, &realfiletag))
 		TAG_POLICY_GTM_PUTMSG( tempfilename, realfiletag, TAG_BINARY, errno);
-#endif
+#	endif
 	if (online)
 	{
 		cs_addrs->nl->nbb = BACKUP_NOT_IN_PROGRESS;
@@ -338,11 +358,10 @@ bool	mubfilcpy (backup_reg_list *list)
 			util_out_print("WARNING: backup file !AD is not valid.", TRUE, file->len, file->addr);
 			CLEANUP_AND_RETURN_FALSE;
 		}
-		filesize = header_cpy->start_vbn * DISK_BLOCK_SIZE +
-			(off_t)header_cpy->trans_hist.total_blks * header_cpy->blk_size;
+		filesize = (off_t)BLK_ZERO_OFF(header_cpy->start_vbn)
+				+ (off_t)(header_cpy->trans_hist.total_blks + 1) * header_cpy->blk_size;
 		if (filesize != stat_buf.st_size)
 		{	/* file has been extended, so truncate it and set the end of database block */
-			int ftruncate_res;
 			FTRUNCATE(backup_fd, filesize, ftruncate_res);
 			if (-1 == ftruncate_res)
 			{
@@ -353,16 +372,14 @@ bool	mubfilcpy (backup_reg_list *list)
 				util_out_print("WARNING: backup file !AD is not valid.", TRUE, file->len, file->addr);
 				CLEANUP_AND_RETURN_FALSE;
 			}
-			zero_blk = (char *)malloc(DISK_BLOCK_SIZE);
-			memset(zero_blk, 0, DISK_BLOCK_SIZE);
-			LSEEKWRITE(backup_fd, filesize - DISK_BLOCK_SIZE, zero_blk, DISK_BLOCK_SIZE, status);
+			status = db_write_eof_block(NULL, backup_fd, cs_data->blk_size, filesize - header_cpy->blk_size,
+													&(TREF(dio_buff)));
 			if (0 != status)
 			{
 				util_out_print("Error writing the last block in database !AD.", TRUE, file->len, file->addr);
 				util_out_print("WARNING: backup file !AD is not valid.", TRUE, file->len, file->addr);
 				CLEANUP_AND_RETURN_FALSE;
 			}
-			free(zero_blk);
 		}
 		/* By getting crit here, we ensure that there is no process still in transaction logic that sees
 		   (nbb != BACKUP_NOT_IN_PRORESS). After rel_crit(), any process that enters transaction logic will
@@ -375,7 +392,7 @@ bool	mubfilcpy (backup_reg_list *list)
 		assert(cs_data == cs_addrs->hdr);
 		if (dba_bg == cs_data->acc_meth)
 		{	/* Now that we have crit, wait for any pending phase2 updates to finish. Since phase2 updates happen
-			 * outside of crit, we dont want them to keep writing to the backup temporary file even after the
+			 * outside of crit, we don't want them to keep writing to the backup temporary file even after the
 			 * backup is complete and the temporary file has been deleted.
 			 */
 			if (cs_addrs->nl->wcs_phase2_commit_pidcnt && !wcs_phase2_commit_wait(cs_addrs, NULL))
@@ -492,8 +509,7 @@ bool	mubfilcpy (backup_reg_list *list)
 					if (cs_addrs->do_fullblockwrites)
 						size = ROUND_UP(size, cs_addrs->fullblockwrite_len);
 					assert((uint4)cs_addrs->hdr->blk_size >= size);
-					offset = (header_cpy->start_vbn - 1) * DISK_BLOCK_SIZE
-						+ ((off_t)header_cpy->blk_size * blk_num);
+					offset = BLK_ZERO_OFF(header_cpy->start_vbn) + ((off_t)header_cpy->blk_size * blk_num);
 					LSEEKWRITE(backup_fd,
 						   offset,
 						   inbuf,
diff --git a/sr_unix/mubinccpy.c b/sr_unix/mubinccpy.c
index 19717b8..f8a84a4 100755
--- a/sr_unix/mubinccpy.c
+++ b/sr_unix/mubinccpy.c
@@ -78,7 +78,6 @@ GBLREF	spdesc			stringpool;
 GBLREF	gd_region		*gv_cur_region;
 GBLREF	sgmnt_addrs		*cs_addrs;
 GBLREF	sgmnt_data_ptr_t	cs_data;
-GBLREF	uchar_ptr_t		mubbuf;
 GBLREF	uint4			pipe_child;
 GBLREF	uint4			process_id;
 GBLREF	boolean_t		debug_mupip;
@@ -129,7 +128,6 @@ error_def(ERR_COMMITWAITSTUCK);
 error_def(ERR_DBCCERR);
 error_def(ERR_ERRCALL);
 error_def(ERR_IOEOF);
-error_def(ERR_PERMGENFAIL);
 
 bool	mubinccpy (backup_reg_list *list)
 {
@@ -143,7 +141,7 @@ bool	mubinccpy (backup_reg_list *list)
 	int4			size1, bsize, bm_num, hint, lmsize, rsize, timeout, outsize,
 				blks_per_buff, counter, i, write_size, read_size, match;
 	size_t			copysize;
-	off_t			copied;
+	off_t			copied, read_offset;
 	int			db_fd, exec_fd;
 	enum db_acc_method	access;
 	blk_hdr_ptr_t		bp, bptr;
@@ -163,22 +161,24 @@ bool	mubinccpy (backup_reg_list *list)
 	int			user_id;
 	int			group_id;
 	int			perm;
+	struct perm_diag_data	pdd;
 	int4			cur_mdb_ver;
+	unix_db_info		*udi;
 	DEBUG_INCBKUP_ONLY(int	blks_this_lmap;)
 	DEBUG_INCBKUP_ONLY(gtm_uint64_t backup_write_offset = 0;)
+	DCL_THREADGBL_ACCESS;
 
+	SETUP_THREADGBL_ACCESS;
 	assert(list->reg == gv_cur_region);
 	assert(incremental);
-	/* Make sure inc_header  can be same size on all platforms. Some platforms pad 8 byte aligned structures
-	   that end on a 4 byte boundary and some do not. It is critical that this structure is the same size on
-	   all platforms as it is sent across TCP connections when doing TCP backup.
-	*/
+	/* Make sure inc_header can be same size on all platforms. Some platforms pad 8 byte aligned structures
+	 * that end on a 4 byte boundary and some do not. It is critical that this structure is the same size on
+	 * all platforms as it is sent across TCP connections when doing TCP backup.
+	 */
 	assert(0 == (SIZEOF(inc_header) % 8));
-
 	/* ================= Initialization and some checks ======================== */
 	header	=	list->backup_hdr;
 	file	=	&(list->backup_file);
-
 	if (list->tn >= header->trans_hist.curr_tn)
 	{
 		util_out_print("!/TRANSACTION number is greater than or equal to current transaction,", TRUE);
@@ -187,8 +187,8 @@ bool	mubinccpy (backup_reg_list *list)
 	}
 	if (!mubtomag)
 		mubmaxblk = (64 * 1024);
-	db_fd = ((unix_db_info *)(gv_cur_region->dyn.addr->file_cntl->file_info))->fd;
-
+	udi = FILE_INFO(gv_cur_region);
+	db_fd = udi->fd;
 	/* =================== open backup destination ============================= */
 	backup_write_errno = 0;
 	switch (list->backup_to)
@@ -202,29 +202,28 @@ bool	mubinccpy (backup_reg_list *list)
 				util_out_print("Error: Cannot create backup file !AD.", TRUE, file->len, file->addr);
 				return FALSE;
 			}
-			if (is_raw_dev(file->addr))
+			FSTAT_FILE(db_fd, &stat_buf, fstat_res);
+			if (-1 != fstat_res && !gtm_permissions(&stat_buf, &user_id, &group_id, &perm, PERM_FILE, &pdd))
 			{
-				ESTABLISH_RET(iob_io_error1, FALSE);
-			} else
+				gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(6+PERMGENDIAG_ARG_COUNT)
+						ERR_PERMGENFAIL, 4, RTS_ERROR_STRING("incremental backup file"),
+						file->len, file->addr, PERMGENDIAG_ARGS(pdd));
+				CLEANUP_AND_RETURN_FALSE;
+			}
+			/* setup new group and permissions if indicated by the security rules. */
+			if ((-1 == fstat_res) || (-1 == FCHMOD(backup->fd, perm))
+				|| (((INVALID_UID != user_id) || (INVALID_GID != group_id))
+					&& (-1 == fchown(backup->fd, user_id, group_id))))
 			{
-				FSTAT_FILE(db_fd, &stat_buf, fstat_res);
-				if (-1 != fstat_res)
-					gtm_permissions(&stat_buf, &user_id, &group_id, &perm, PERM_FILE);
-				/* setup new group and permissions if indicated by the security rules. */
-				if ((-1 == fstat_res) || (-1 == FCHMOD(backup->fd, perm))
-					|| (((INVALID_UID != user_id) || (INVALID_GID != group_id))
-						&& (-1 == fchown(backup->fd, user_id, group_id))))
-				{
-					PERROR("fchmod/fchown error: ");
-					util_out_print("ERROR: Cannot access incremental backup file !AD.",
-						       TRUE, file->len, file->addr);
-					util_out_print("WARNING: Backup file !AD is not valid.", TRUE, file->len, file->addr);
-					CLEANUP_AND_RETURN_FALSE;
-				}
-				memcpy(incbackupfile, file->addr, file->len);
-				incbackupfile[file->len] = 0;
-				ESTABLISH_RET(iob_io_error2, FALSE);
+				PERROR("fchmod/fchown error: ");
+				util_out_print("ERROR: Cannot access incremental backup file !AD.",
+					       TRUE, file->len, file->addr);
+				util_out_print("WARNING: Backup file !AD is not valid.", TRUE, file->len, file->addr);
+				CLEANUP_AND_RETURN_FALSE;
 			}
+			memcpy(incbackupfile, file->addr, file->len);
+			incbackupfile[file->len] = 0;
+			ESTABLISH_RET(iob_io_error2, FALSE);
 			break;
 		case backup_to_exec:
 			pipe_child = 0;
@@ -299,7 +298,6 @@ bool	mubinccpy (backup_reg_list *list)
 			DB_LEN_STR(gv_cur_region), file->len, file->addr);
 		CLEANUP_AND_RETURN_FALSE;
 	}
-
 	/* ============================ read/write appropriate blocks =============================== */
 	bsize		= header->blk_size;
 	gds_ratio	= bsize / DISK_BLOCK_SIZE;
@@ -309,21 +307,18 @@ bool	mubinccpy (backup_reg_list *list)
 	outptr		= (char_ptr_t)malloc(MAX(outsize, mubmaxblk));
 	sblkh_p		= (muinc_blk_hdr_ptr_t)outptr;
 	data_ptr	= (char_ptr_t)(sblkh_p + 1);
-	bp		= (blk_hdr_ptr_t)mubbuf;
+	/* If udi->fd_opened_with_o_direct is TRUE, we need an aligned buffer to proceed with the reads. And if it is FALSE,
+	 * we anyways have to allocate a 64Kb (BACKUP_READ_SIZE) buffer and free it. Most of this logic is already present
+	 * in the below macro so we use it even for the no-O_DIRECT case (i.e. dio_buff.aligned is used even if
+	 * udi->fd_opened_with_o_direct is FALSE).
+	 */
+	DIO_BUFF_EXPAND_IF_NEEDED_NO_UDI(BACKUP_READ_SIZE, BACKUP_READ_SIZE, &(TREF(dio_buff)));
+	bp		= (blk_hdr_ptr_t)(TREF(dio_buff)).aligned;
 	bm_blk_buff	= (uchar_ptr_t)malloc(SIZEOF(blk_hdr) + (BLKS_PER_LMAP * BML_BITS_PER_BLK / BITS_PER_UCHAR));
 	save_blks	= 0;
 	memset(sblkh_p, 0, SIZEOF(*sblkh_p));
 	sblkh_p->use.bkup.ondsk_blkver = GDSNOVER;
 
-	if (-1 == lseek(db_fd, (off_t)(header->start_vbn - 1) * DISK_BLOCK_SIZE, SEEK_SET))
-	{
-		PERROR("fseek error: ");
-		util_out_print("Error reading from database file !AD.", TRUE, DB_LEN_STR(gv_cur_region));
-		util_out_print("WARNING: backup file !AD is not valid.", TRUE, DB_LEN_STR(gv_cur_region));
-		free(outptr);
-		free(bm_blk_buff);
-		CLEANUP_AND_RETURN_FALSE;
-	}
 	DEBUG_INCBKUP_ONLY(blks_this_lmap = 0);
 	if (cs_addrs->nl->onln_rlbk_pid)
 	{
@@ -332,6 +327,7 @@ bool	mubinccpy (backup_reg_list *list)
 		free(bm_blk_buff);
 		CLEANUP_AND_RETURN_FALSE;
 	}
+	read_offset = (off_t)BLK_ZERO_OFF(header->start_vbn);
 	for (blk_num_base = 0;  blk_num_base < header->trans_hist.total_blks;  blk_num_base += blks_per_buff)
 	{
 		if (online && (0 != cs_addrs->shmpool_buffer->failed))
@@ -341,7 +337,7 @@ bool	mubinccpy (backup_reg_list *list)
 			blks_per_buff = header->trans_hist.total_blks - blk_num_base;
 			read_size = blks_per_buff * bsize;
 		}
-		DOREADRC(db_fd, bp, read_size, status);
+		DB_LSEEKREAD(udi, db_fd, read_offset, bp, read_size, status);
 		if (0 != status)
 		{
 			PERROR("read error: ");
@@ -351,6 +347,7 @@ bool	mubinccpy (backup_reg_list *list)
 			free(bm_blk_buff);
 			CLEANUP_AND_RETURN_FALSE;
 		}
+		read_offset += read_size;
 		bptr = (blk_hdr *)bp;
 		/* The blocks we back up will be whatever version they are. There is no implicit conversion in this
 		 * part of the backup/restore. Since we aren't even looking at the blocks (and indeed some of these blocks
@@ -465,10 +462,8 @@ bool	mubinccpy (backup_reg_list *list)
 			else if ((3 > blk_num) || (is_bitmap_blk && (0 != header->blks_to_upgrd) && ((trans_num)0 == blk_tn)
 						 && (blk_num >= list->last_blk_at_last_bkup)))
 				backup_this_blk = TRUE;
-#			ifdef GTM_TRUNCATE
 			else if (is_bitmap_blk && ((trans_num)0 == blk_tn))
 				backup_this_blk = TRUE;
-#			endif
 			else if ((blk_tn < list->tn))
 				backup_this_blk = FALSE;
 			else
@@ -521,7 +516,7 @@ bool	mubinccpy (backup_reg_list *list)
 		assert(cs_data == cs_addrs->hdr);
 		if (dba_bg == cs_data->acc_meth)
 		{	/* Now that we have crit, wait for any pending phase2 updates to finish. Since phase2 updates happen
-			 * outside of crit, we dont want them to keep writing to the backup temporary file even after the
+			 * outside of crit, we don't want them to keep writing to the backup temporary file even after the
 			 * backup is complete and the temporary file has been deleted.
 			 */
 			if (cs_addrs->nl->wcs_phase2_commit_pidcnt && !wcs_phase2_commit_wait(cs_addrs, NULL))
@@ -573,13 +568,13 @@ bool	mubinccpy (backup_reg_list *list)
 		{
 			if (cs_addrs->shmpool_buffer->dskaddr < copied + copysize)
 				copysize = (size_t)(cs_addrs->shmpool_buffer->dskaddr - copied);
-			DOREADRC(list->backup_fd, mubbuf, copysize, status);
+			DOREADRC(list->backup_fd, (TREF(dio_buff)).aligned, copysize, status);
 			if (0 != status)
 			{
 				PERROR("read error : ");
 				CLEANUP_AND_RETURN_FALSE;
 			}
-			COMMON_WRITE(backup, (char *)mubbuf, copysize);
+			COMMON_WRITE(backup, (char *)(TREF(dio_buff)).aligned, copysize);
 		}
 	}
 	/* Write one last (zero-filled) block into this file that designates the end of the blocks */
@@ -746,29 +741,6 @@ void tcp_write(BFILE *bf, char *buf, int nbytes)
 	return;
 }
 
-CONDITION_HANDLER(iob_io_error1)
-{
-	int	dummy1, dummy2;
-	char	s[80];
-	char	*fgets_res;
-
-	START_CH(TRUE);
-	if (SIGNAL == ERR_IOEOF)
-	{
-		PRINTF("End of media reached, please mount next volume and press Enter: ");
-		FGETS(s, 79, stdin, fgets_res);
-		util_out_print(0, 2, 0);  /* clear error message */
-		if (mu_ctrly_occurred  ||  mu_ctrlc_occurred)
-		{
-			util_out_print("WARNING:  DB file backup aborted, backup file is not valid.", TRUE);
-			UNWIND(dummy1, dummy2);
-		}
-		CONTINUE;
-	}
-	PRN_ERROR;
-	UNWIND(dummy1, dummy2);
-}
-
 CONDITION_HANDLER(iob_io_error2)
 {
 	int	dummy1, dummy2;
diff --git a/sr_unix/mucblkini.c b/sr_unix/mucblkini.c
index 43f8558..d58f633 100755
--- a/sr_unix/mucblkini.c
+++ b/sr_unix/mucblkini.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -35,10 +35,21 @@
 #define DIR_ROOT 1
 #define DIR_DATA 2
 
+#define PUTMSG_ERROR_CSA(MSGPARMS)			\
+MBSTART {						\
+	if (IS_MUPIP_IMAGE)				\
+		gtm_putmsg_csa MSGPARMS;		\
+	else						\
+		rts_error_csa MSGPARMS;			\
+} MBEND
+
 GBLREF gd_region	*gv_cur_region;
 GBLREF sgmnt_addrs	*cs_addrs;
 
-void mucblkini (void)
+error_def(ERR_AUTODBCREFAIL);
+error_def(ERR_FILECREERR);
+
+void mucblkini(void)
 {
 	uchar_ptr_t		c, bmp;
 	blk_hdr_ptr_t		bp1, bp2;
@@ -46,25 +57,28 @@ void mucblkini (void)
 	unix_db_info		*udi;
 	int4			tmp, bmpsize, status;
 
-	udi = (unix_db_info *)gv_cur_region->dyn.addr->file_cntl->file_info;
+	udi = FILE_INFO(gv_cur_region);
 	bp1 = (blk_hdr_ptr_t)malloc(cs_addrs->hdr->blk_size);
 	bp2 = (blk_hdr_ptr_t)malloc(cs_addrs->hdr->blk_size);
 	bmpsize = BM_SIZE(cs_addrs->hdr->bplmap);
 	if (cs_addrs->do_fullblockwrites)
 		bmpsize = (int4)ROUND_UP(bmpsize, cs_addrs->fullblockwrite_len);
 	bmp = (uchar_ptr_t)malloc(bmpsize);
-	LSEEKREAD(udi->fd, (off_t)(cs_addrs->hdr->start_vbn - 1) * DISK_BLOCK_SIZE, bmp, bmpsize, status);
+	DB_LSEEKREAD(udi, udi->fd, (off_t)BLK_ZERO_OFF(cs_addrs->hdr->start_vbn), bmp, bmpsize, status);
 	if (0 != status)
 	{
-		PERROR("Error reading first bitmap");
+		PUTMSG_ERROR_CSA((CSA_ARG(cs_addrs) VARLSTCNT(7) ERR_FILECREERR, 4, LEN_AND_LIT("reading first bitmap"),
+				  DB_LEN_STR(gv_cur_region), status));
 		return;
 	}
 	bml_busy(DIR_ROOT, bmp + SIZEOF(blk_hdr));
 	bml_busy(DIR_DATA, bmp + SIZEOF(blk_hdr));
-	DB_LSEEKWRITE(cs_addrs, udi->fn, udi->fd, (off_t)(cs_addrs->hdr->start_vbn - 1) * DISK_BLOCK_SIZE, bmp, bmpsize, status);
+	ASSERT_NO_DIO_ALIGN_NEEDED(udi);	/* because we are creating the database and so effectively have standalone access */
+	DB_LSEEKWRITE(cs_addrs, udi, udi->fn, udi->fd, (off_t)BLK_ZERO_OFF(cs_addrs->hdr->start_vbn), bmp, bmpsize, status);
 	if (0 != status)
 	{
-		PERROR("Error writing out first bitmap");
+		PUTMSG_ERROR_CSA((CSA_ARG(cs_addrs) VARLSTCNT(7) ERR_FILECREERR, 4, LEN_AND_LIT("writing out first bitmap"),
+				  DB_LEN_STR(gv_cur_region), status));
 		return;
 	}
 	rp = (rec_hdr_ptr_t)((uchar_ptr_t)bp1 + SIZEOF(blk_hdr));
@@ -83,14 +97,26 @@ void mucblkini (void)
 	DSK_WRITE_NOCACHE(gv_cur_region, DIR_ROOT, (uchar_ptr_t)bp1, cs_addrs->hdr->desired_db_format, status);
 	if (0 != status)
 	{
-		PERROR("Error writing to disk");
-		EXIT(status);
+		if (IS_MUMPS_IMAGE)
+			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(7) ERR_AUTODBCREFAIL, 4, DB_LEN_STR(gv_cur_region),
+				      REG_LEN_STR(gv_cur_region), status);
+		else
+		{
+			PERROR("Error writing to disk");
+			EXIT(status);
+		}
 	}
 	DSK_WRITE_NOCACHE(gv_cur_region, DIR_DATA, (uchar_ptr_t)bp2, cs_addrs->hdr->desired_db_format, status);
 	if (0 != status)
 	{
-		PERROR("Error writing to disk");
-		EXIT(status);
+		if (IS_MUMPS_IMAGE)
+			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(7) ERR_AUTODBCREFAIL, 4, DB_LEN_STR(gv_cur_region),
+				      REG_LEN_STR(gv_cur_region), status);
+		else
+		{
+			PERROR("Error writing to disk");
+			EXIT(status);
+		}
 	}
 	return;
 }
diff --git a/sr_unix/mupip.c b/sr_unix/mupip.c
index 6825871..b680d5a 100755
--- a/sr_unix/mupip.c
+++ b/sr_unix/mupip.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information 	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -14,7 +14,7 @@
 #include "main_pragma.h"
 
 #include "gtm_inet.h"
-#include <signal.h>
+#include "gtm_signal.h"
 
 #include "mlkdef.h"
 #include "gtm_stdlib.h"
@@ -78,6 +78,7 @@ GBLREF	global_latch_t		defer_latch;
 GBLREF	spdesc			rts_stringpool, stringpool;
 GBLREF	char			cli_err_str[];
 GBLREF	CLI_ENTRY		mupip_cmd_ary[];
+GBLREF	void			(*mupip_exit_fp)(int errcode);
 
 GBLDEF	CLI_ENTRY		*cmd_ary = &mupip_cmd_ary[0];	/* Define cmd_ary to be the MUPIP specific cmd table */
 
@@ -99,6 +100,7 @@ int main (int argc, char **argv)
 	licensed = TRUE;
 	in_backup = FALSE;
 	op_open_ptr = mu_op_open;
+	INIT_FNPTR_GLOBAL_VARIABLES;
 	mu_get_term_characterstics();
 	gtm_chk_dist(argv[0]);
 	cli_lex_setup(argc,argv);
@@ -106,6 +108,7 @@ int main (int argc, char **argv)
 		display_prompt();
 	/*      this call should be after cli_lex_setup() due to S390 A/E conversion    */
 	init_gtm();
+	mupip_exit_fp = mupip_exit;	/* Initialize function pointer for use during MUPIP */
 	while (TRUE)
 	{	func = 0;
 		if ((res = parse_cmd()) == EOF)
diff --git a/sr_unix/mupip_cmd.c b/sr_unix/mupip_cmd.c
index 3444e4f..ed6d06f 100644
--- a/sr_unix/mupip_cmd.c
+++ b/sr_unix/mupip_cmd.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -55,14 +55,13 @@
 #include "mupip_endiancvt.h"
 #include "mupip_crypt.h"
 #include "mupip_hash.h"
+#include "mupip_dump_fhead.h"
 #include "gtmsource.h"
 #include "gtmrecv.h"
 #include "read_db_files_from_gld.h"	/* Needed for updproc.h */
 #include "updproc.h"
 #include "repl_instance.h"
-#ifdef GTM_SNAPSHOT
 #include "db_snapshot.h"
-#endif
 #include "mupip_rctldump.h"
 #include "mu_rndwn_rlnkctl.h"
 
@@ -116,8 +115,20 @@ static CLI_ENTRY mup_crypt_type_qual[] = {
 };
 
 static CLI_ENTRY mup_downgrade_dbver_qual[] = {
-	{ "V4",	0, 0, 0, 0, 0, 0, VAL_DISALLOWED,	0,	NON_NEG,	VAL_N_A,	0 },
-	{ "V5",	0, 0, 0, 0, 0, 0, VAL_DISALLOWED,	0,	NON_NEG,	VAL_N_A,	0 },
+	{ "V4",		0, 0, 0, 0, 0, 0, VAL_DISALLOWED,	0,	NON_NEG,	VAL_N_A,	0 },
+	{ "V5",		0, 0, 0, 0, 0, 0, VAL_DISALLOWED,	0,	NON_NEG,	VAL_N_A,	0 },
+	{ "V63000A",	0, 0, 0, 0, 0, 0, VAL_DISALLOWED,	0,	NON_NEG,	VAL_N_A,	0 },
+	{ "" }
+};
+
+static	CLI_PARM mup_dumpfhead_parm[] = {
+	{ "WHAT", "File or Region: ", 	PARM_REQ},
+	{ "", "",           		PARM_REQ}
+};
+
+static CLI_ENTRY mup_dumpfhead_qual[] = {
+	{ "FILE",	mupip_dump_fhead, 0, 0, 0, 0, 0, VAL_DISALLOWED,	1, NON_NEG, VAL_N_A, 0 },
+	{ "REGION",	mupip_dump_fhead, 0, 0, 0, 0, 0, VAL_DISALLOWED,	1, NON_NEG, VAL_N_A, 0 },
 	{ "" }
 };
 
@@ -280,13 +291,16 @@ static	CLI_PARM	mup_freeze_parm[] = {
 };
 
 static	CLI_ENTRY	mup_freeze_qual[] = {
-	{ "DBG",      mupip_freeze, 0, 0, 0, 0, 0, VAL_DISALLOWED, 2, NON_NEG, VAL_N_A, 0 },
-	{ "OFF",      mupip_freeze, 0, 0, 0, 0, 0, VAL_DISALLOWED, 1, NON_NEG, VAL_N_A, 0 },
-	{ "ON",       mupip_freeze, 0, 0, 0, 0, 0, VAL_DISALLOWED, 1, NON_NEG, VAL_N_A, 0 },
-	{ "OVERRIDE", mupip_freeze, 0, 0, 0, 0, 0, VAL_DISALLOWED, 1, NON_NEG, VAL_N_A, 0 },
-	{ "RECORD",   mupip_freeze, 0, 0, 0, 0, 0, VAL_DISALLOWED, 1, NON_NEG, VAL_N_A, 0 },
+	{ "AUTORELEASE",	mupip_freeze, 0, 0, 0, 0, 0,				VAL_DISALLOWED, 1, NEG, VAL_N_A, 0 },
+	{ "DBG",		mupip_freeze, 0, 0, 0, 0, 0,				VAL_DISALLOWED,	2, NON_NEG, VAL_N_A, 0 },
+	{ "OFF",		mupip_freeze, 0, 0, 0, 0, 0,				VAL_DISALLOWED,	1, NON_NEG, VAL_N_A, 0 },
+	{ "ON",			mupip_freeze, 0, 0, 0, 0, 0,				VAL_DISALLOWED,	1, NON_NEG, VAL_N_A, 0 },
+	{ "ONLINE",		mupip_freeze, 0, 0, 0, 0, 0,				VAL_DISALLOWED,	1, NEG, VAL_N_A, 0 },
+	{ "OVERRIDE",		mupip_freeze, 0, 0, 0, 0, 0,				VAL_DISALLOWED,	1, NON_NEG, VAL_N_A, 0 },
+	{ "RECORD",		mupip_freeze, 0, 0, 0, 0, 0,				VAL_DISALLOWED,	1, NON_NEG, VAL_N_A, 0 },
 	{ "" }
 };
+
 static	CLI_PARM	mup_ftok_parm[] = {
 	{ "FILE", "File: ", PARM_REQ},
 	{ "", "",           PARM_REQ}
@@ -324,6 +338,7 @@ static	CLI_ENTRY	mup_integ_qual[] = {
 	{ "ONLINE",      mupip_integ, 0, 0,                  0, 0, 0, VAL_DISALLOWED, 2, NEG,     VAL_N_A, 0       },
 	{ "PRESERVE",	 mupip_integ, 0, 0,		     0, 0, 0, VAL_NOT_REQ,    1, NON_NEG, VAL_N_A, 0	   },
 	{ "REGION",      mupip_integ, 0, 0,                  0, 0, 0, VAL_DISALLOWED, 1, NON_NEG, VAL_N_A, 0       },
+	{ "STATS",       mupip_integ, 0, 0,                  0, 0, 0, VAL_DISALLOWED, 1, NEG,     VAL_N_A, 0       },
 	{ "SUBSCRIPT",   mupip_integ, 0, 0,                  0, 0, 0, VAL_REQ,        1, NON_NEG, VAL_STR, 0       },
 	{ "TN_RESET",    mupip_integ, 0, 0,                  0, 0, 0, VAL_DISALLOWED, 1, NON_NEG, VAL_N_A, 0       },
 	{ "TRANSACTION", mupip_integ, 0, mup_integ_map_parm, 0, 0, 0, VAL_NOT_REQ,    1, NEG,     VAL_NUM, 0       },
@@ -672,6 +687,7 @@ static readonly CLI_PARM mup_set_ftime_parm[] = {
 
 static	CLI_ENTRY	mup_set_qual[] = {
 { "ACCESS_METHOD",        mupip_set, 0, 0,                  mup_set_acc_qual,     0, 0, VAL_REQ,        1, NON_NEG, VAL_STR,  0 },
+{ "ASYNCIO",              mupip_set, 0, 0,                  0,                    0, 0, VAL_DISALLOWED,	1, NEG,     VAL_N_A,  0 },
 { "BYPASS",               mupip_set, 0, 0,                  0,                    0, 0, VAL_DISALLOWED, 1, NON_NEG, VAL_N_A,  0 },
 { "DBFILENAME",           mupip_set, 0, 0,                  0,                    0, 0, VAL_REQ,        1, NEG,     VAL_STR,  0 },
 { "DEFER_ALLOCATE",       mupip_set, 0, 0,                  0,                    0, 0, VAL_DISALLOWED, 1, NEG,     VAL_N_A,  0 },
@@ -687,6 +703,7 @@ static	CLI_ENTRY	mup_set_qual[] = {
 { "JNLFILE",              mupip_set, 0, 0,                  0,                    0, 0, VAL_DISALLOWED, 1, NON_NEG, VAL_N_A,  0 },
 { "JOURNAL",              mupip_set, 0, 0,                  mup_set_journal_qual, 0, 0, VAL_NOT_REQ,    1, NEG,     VAL_STR,  0 },
 { "KEY_SIZE",             mupip_set, 0, 0,                  0,                    0, 0, VAL_REQ,        1, NON_NEG, VAL_NUM,  0 },
+{ "LCK_SHARES_DB_CRIT",   mupip_set, 0, 0,                  0,                    0, 0, VAL_DISALLOWED, 1, NEG,     VAL_N_A,  0 },
 { "LOCK_SPACE",           mupip_set, 0, 0,                  0,                    0, 0, VAL_REQ,        1, NON_NEG, VAL_NUM,  0 },
 { "MUTEX_SLOTS",          mupip_set, 0, 0,                  0,                    0, 0, VAL_REQ,        1, NON_NEG, VAL_NUM,  0 },
 { "PARTIAL_RECOV_BYPASS", mupip_set, 0, 0,                  0,                    0, 0, VAL_DISALLOWED, 1, NON_NEG, VAL_N_A,  0 },
@@ -700,6 +717,7 @@ static	CLI_ENTRY	mup_set_qual[] = {
 { "SLEEP_SPIN_COUNT",     mupip_set, 0, 0,                  0,                    0, 0, VAL_REQ,        1, NON_NEG, VAL_NUM,  0 },
 { "SPIN_SLEEP_LIMIT",     mupip_set, 0, 0,                  0,                    0, 0, VAL_REQ,        1, NON_NEG, VAL_NUM,  0 },
 { "STANDALONENOT",        mupip_set, 0, 0,                  0,                    0, 0, VAL_DISALLOWED, 1, NON_NEG, VAL_N_A,  0 },
+{ "STATS",                mupip_set, 0, 0,                  0,                    0, 0, VAL_DISALLOWED, 1, NEG,     VAL_N_A,  0 },
 { "VERSION",              mupip_set, 0, 0,                  mup_set_dbver_qual,   0, 0, VAL_REQ,        1, NON_NEG, VAL_STR,  0 },
 { "WAIT_DISK",            mupip_set, 0, 0,                  0,                    0, 0, VAL_REQ,        1, NON_NEG, VAL_NUM,  0 },
 { "" }
@@ -760,36 +778,37 @@ static	CLI_PARM	mup_rctldump_parm[] = {
 };
 
 GBLDEF	CLI_ENTRY	mupip_cmd_ary[] = {
-{ "BACKUP",	mupip_backup,	mup_backup_qual,	mup_backup_parm,	0, cli_disallow_mupip_backup,	0, VAL_DISALLOWED, 2, 0, 0, 0 },
-{ "CONVERT",	mupip_cvtpgm,	mup_convert_qual,	mup_convert_parm,	0, 0,				0, VAL_DISALLOWED, 2, 0, 0, 0 },
-{ "CREATE",	mupip_create,	mup_create_qual,	0,			0, 0,				0, VAL_DISALLOWED, 0, 0, 0, 0 },
-{ "CRYPT",	mupip_crypt,	mup_crypt_qual,		0,			0, cli_disallow_mupip_crypt,	0, VAL_DISALLOWED, 1, 0, 0, 0 },
-{ "DOWNGRADE",	mupip_downgrade,mup_downgrade_qual,	mup_downgrade_parm,	0, 0,				0, VAL_DISALLOWED, 1, 0, 0, 0 },
-{ "ENDIANCVT",	mupip_endiancvt,mup_endian_qual,	mup_endian_parm,	0, 0,				0, VAL_DISALLOWED, 1, 0, 0, 0 },
-{ "EXIT",	mupip_quit,	0,			0,			0, 0,				0, VAL_DISALLOWED, 0, 0, 0, 0 },
-{ "EXTEND",	mupip_extend,	mup_extend_qual,	mup_extend_parm,	0, 0,				0, VAL_DISALLOWED, 1, 0, 0, 0 },
-{ "EXTRACT",	mu_extract,	mup_extract_qual,	mup_extract_parm,	0, cli_disallow_mupip_extract,	0, VAL_DISALLOWED, 1, 0, 0, 0 },
-{ "FREEZE",	mupip_freeze,	mup_freeze_qual,	mup_freeze_parm,	0, cli_disallow_mupip_freeze,	0, VAL_DISALLOWED, 1, 0, 0, 0 },
-{ "FTOK",	mupip_ftok,	mup_ftok_qual,		mup_ftok_parm,		0, 0,				0, VAL_DISALLOWED, 1, 0, 0, 0 },
-{ "HASH",	mupip_hash,	0,			0,			0, 0,				0, VAL_DISALLOWED, MAX_PARMS, 0, 0, 0 },
-{ "HELP",	util_help,	0,			0,			0, 0,				0, VAL_DISALLOWED, 1, 0, 0, 0 },
-{ "INTEG",	mupip_integ,	mup_integ_qual,		mup_integ_parm,		0, cli_disallow_mupip_integ,	0, VAL_DISALLOWED, 1, 0, 0, 0 },
-{ "INTRPT",	mupip_intrpt,	0,			mup_intrpt_parm,	0, 0,				0, VAL_DISALLOWED, 1, 0, 0, 0 },
-{ "JOURNAL",	mupip_recover,	mup_journal_qual,	mup_journal_parm,	0, cli_disallow_mupip_journal,	0, VAL_DISALLOWED, 1, 0, 0, 0 },
-{ "LOAD",	mupip_cvtgbl,	mup_load_qual,		mup_load_parm,		0, 0,				0, VAL_DISALLOWED, 1, 0, 0, 0 },
-{ "QUIT",	mupip_quit,	0,			0,			0, 0,				0, VAL_DISALLOWED, 0, 0, 0, 0 },
-{ "RCTLDUMP",	mupip_rctldump, 0,                      mup_rctldump_parm,	0, 0,				0, VAL_DISALLOWED, 1, 0, 0, 0 },
-{ "REORG",	mupip_reorg,	mup_reorg_qual,		mup_reorg_parm,		0, cli_disallow_mupip_reorg,	0, VAL_DISALLOWED, 1, 0, 0, 0 },
-{ "REPLICATE",	0,		mup_replicate_qual,	mup_replicate_parm,	0, cli_disallow_mupip_replicate,0, VAL_DISALLOWED, 1, 0, 0, 0 },
-{ "RESTORE",	mupip_restore,	mup_restore_qual,	mup_restore_parm,	0, 0,				0, VAL_DISALLOWED, 2, 0, 0, 0 },
-{ "RUNDOWN",	mupip_rundown,	mup_rundown_qual,	mup_rundown_parm,	0, cli_disallow_mupip_rundown,	0, VAL_DISALLOWED, 1, 0, 0, 0 },
-{ "SET",	mupip_set,	mup_set_qual,		mup_set_parm,		0, cli_disallow_mupip_set,	0, VAL_DISALLOWED, 1, 0, 0, 0 },
-{ "SIZE",	mupip_size,	mup_size_qual,		0,			0, cli_disallow_mupip_size,	0, VAL_DISALLOWED, 1, 0, 0, 0 },
-{ "STOP",	mupip_stop,	0,			mup_stop_parm,		0, 0,				0, VAL_DISALLOWED, 1, 0, 0, 0 },
+{ "BACKUP",	mupip_backup,		mup_backup_qual,	mup_backup_parm,	0, cli_disallow_mupip_backup,	0, VAL_DISALLOWED, 2, 0, 0, 0 },
+{ "CONVERT",	mupip_cvtpgm,		mup_convert_qual,	mup_convert_parm,	0, 0,				0, VAL_DISALLOWED, 2, 0, 0, 0 },
+{ "CREATE",	mupip_create,		mup_create_qual,	0,			0, 0,				0, VAL_DISALLOWED, 0, 0, 0, 0 },
+{ "CRYPT",	mupip_crypt,		mup_crypt_qual,		0,			0, cli_disallow_mupip_crypt,	0, VAL_DISALLOWED, 1, 0, 0, 0 },
+{ "DOWNGRADE",	mupip_downgrade,	mup_downgrade_qual,	mup_downgrade_parm,	0, 0,				0, VAL_DISALLOWED, 1, 0, 0, 0 },
+{ "DUMPFHEAD",	mupip_dump_fhead,	mup_dumpfhead_qual,	mup_dumpfhead_parm,	0, cli_disallow_mupip_dumpfhead,0, VAL_DISALLOWED, 1, 0, 0, 0 },
+{ "ENDIANCVT",	mupip_endiancvt,	mup_endian_qual,	mup_endian_parm,	0, 0,				0, VAL_DISALLOWED, 1, 0, 0, 0 },
+{ "EXIT",	mupip_quit,		0,			0,			0, 0,				0, VAL_DISALLOWED, 0, 0, 0, 0 },
+{ "EXTEND",	mupip_extend,		mup_extend_qual,	mup_extend_parm,	0, 0,				0, VAL_DISALLOWED, 1, 0, 0, 0 },
+{ "EXTRACT",	mu_extract,		mup_extract_qual,	mup_extract_parm,	0, cli_disallow_mupip_extract,	0, VAL_DISALLOWED, 1, 0, 0, 0 },
+{ "FREEZE",	mupip_freeze,		mup_freeze_qual,	mup_freeze_parm,	0, cli_disallow_mupip_freeze,	0, VAL_DISALLOWED, 1, 0, 0, 0 },
+{ "FTOK",	mupip_ftok,		mup_ftok_qual,		mup_ftok_parm,		0, 0,				0, VAL_DISALLOWED, 1, 0, 0, 0 },
+{ "HASH",	mupip_hash,		0,			0,			0, 0,				0, VAL_DISALLOWED, MAX_PARMS, 0, 0, 0 },
+{ "HELP",	util_help,		0,			0,			0, 0,				0, VAL_DISALLOWED, 1, 0, 0, 0 },
+{ "INTEG",	mupip_integ,		mup_integ_qual,		mup_integ_parm,		0, cli_disallow_mupip_integ,	0, VAL_DISALLOWED, 1, 0, 0, 0 },
+{ "INTRPT",	mupip_intrpt,		0,			mup_intrpt_parm,	0, 0,				0, VAL_DISALLOWED, 1, 0, 0, 0 },
+{ "JOURNAL",	mupip_recover,		mup_journal_qual,	mup_journal_parm,	0, cli_disallow_mupip_journal,	0, VAL_DISALLOWED, 1, 0, 0, 0 },
+{ "LOAD",	mupip_cvtgbl,		mup_load_qual,		mup_load_parm,		0, 0,				0, VAL_DISALLOWED, 1, 0, 0, 0 },
+{ "QUIT",	mupip_quit,		0,			0,			0, 0,				0, VAL_DISALLOWED, 0, 0, 0, 0 },
+{ "RCTLDUMP",	mupip_rctldump, 	0,                      mup_rctldump_parm,	0, 0,				0, VAL_DISALLOWED, 1, 0, 0, 0 },
+{ "REORG",	mupip_reorg,		mup_reorg_qual,		mup_reorg_parm,		0, cli_disallow_mupip_reorg,	0, VAL_DISALLOWED, 1, 0, 0, 0 },
+{ "REPLICATE",	0,			mup_replicate_qual,	mup_replicate_parm,	0, cli_disallow_mupip_replicate,0, VAL_DISALLOWED, 1, 0, 0, 0 },
+{ "RESTORE",	mupip_restore,		mup_restore_qual,	mup_restore_parm,	0, 0,				0, VAL_DISALLOWED, 2, 0, 0, 0 },
+{ "RUNDOWN",	mupip_rundown,		mup_rundown_qual,	mup_rundown_parm,	0, cli_disallow_mupip_rundown,	0, VAL_DISALLOWED, 1, 0, 0, 0 },
+{ "SET",	mupip_set,		mup_set_qual,		mup_set_parm,		0, cli_disallow_mupip_set,	0, VAL_DISALLOWED, 1, 0, 0, 0 },
+{ "SIZE",	mupip_size,		mup_size_qual,		0,			0, cli_disallow_mupip_size,	0, VAL_DISALLOWED, 1, 0, 0, 0 },
+{ "STOP",	mupip_stop,		0,			mup_stop_parm,		0, 0,				0, VAL_DISALLOWED, 1, 0, 0, 0 },
 #ifdef GTM_TRIGGER
-{ "TRIGGER",	mupip_trigger,	mup_trigger_qual,	mup_trig_parm,		0, cli_disallow_mupip_trigger,	0, VAL_DISALLOWED, 1, 0, 0, 0 },
+{ "TRIGGER",	mupip_trigger,		mup_trigger_qual,	mup_trig_parm,		0, cli_disallow_mupip_trigger,	0, VAL_DISALLOWED, 1, 0, 0, 0 },
 #endif
-{ "UPGRADE",	mupip_upgrade, 0,			mup_upgrade_parm,	0, 0,				0, VAL_DISALLOWED, 1, 0, 0, 0 },
+{ "UPGRADE",	mupip_upgrade, 		0,			mup_upgrade_parm,	0, 0,				0, VAL_DISALLOWED, 1, 0, 0, 0 },
 { "" }
 };
 
diff --git a/sr_unix/mupip_cmd_disallow.c b/sr_unix/mupip_cmd_disallow.c
index 318291d..3407c38 100644
--- a/sr_unix/mupip_cmd_disallow.c
+++ b/sr_unix/mupip_cmd_disallow.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2002-2016 Fidelity National Information	*
+ * Copyright (c) 2002-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -77,6 +77,20 @@ boolean_t cli_disallow_mupip_freeze(void)
 	CLI_DIS_CHECK_N_RESET;
 	disallow_return_value = d_c_cli_present("ON") && d_c_cli_present("OFF");
 	CLI_DIS_CHECK_N_RESET;
+	disallow_return_value = d_c_cli_present("ONLINE") && d_c_cli_present("OFF");
+	CLI_DIS_CHECK_N_RESET;
+	disallow_return_value = !d_c_cli_present("ONLINE") && d_c_cli_present("AUTORELEASE");
+	CLI_DIS_CHECK_N_RESET;
+	return FALSE;
+}
+
+boolean_t cli_disallow_mupip_dumpfhead(void)
+{
+	int disallow_return_value = 0;
+
+	*cli_err_str_ptr = 0;
+	disallow_return_value = d_c_cli_present("FILE") && d_c_cli_present("REGION");
+	CLI_DIS_CHECK_N_RESET;
 	return FALSE;
 }
 
@@ -100,6 +114,10 @@ boolean_t cli_disallow_mupip_integ(void)
 	disallow_return_value = d_c_cli_present("ONLINE") && (d_c_cli_present("TN_RESET")
 								|| d_c_cli_present("FILE"));
 	CLI_DIS_CHECK_N_RESET;
+	/* [NO]STATS is supported only with REGION */
+	disallow_return_value = !d_c_cli_present("REGION")
+					&& (d_c_cli_present("STATS") || d_c_cli_negated("STATS"));
+	CLI_DIS_CHECK_N_RESET;
 	return FALSE;
 }
 
diff --git a/sr_unix/mupip_cmd_disallow.h b/sr_unix/mupip_cmd_disallow.h
index 6af4016..dc0dda9 100755
--- a/sr_unix/mupip_cmd_disallow.h
+++ b/sr_unix/mupip_cmd_disallow.h
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2002-2015 Fidelity National Information 	*
+ * Copyright (c) 2002-2016 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -15,6 +15,7 @@
 
 boolean_t cli_disallow_mupip_backup(void);
 boolean_t cli_disallow_mupip_crypt(void);
+boolean_t cli_disallow_mupip_dumpfhead(void);
 boolean_t cli_disallow_mupip_extract(void);
 boolean_t cli_disallow_mupip_freeze(void);
 boolean_t cli_disallow_mupip_integ(void);
diff --git a/sr_unix/mupip_cvtgbl.c b/sr_unix/mupip_cvtgbl.c
index ad7791c..04d4608 100755
--- a/sr_unix/mupip_cvtgbl.c
+++ b/sr_unix/mupip_cvtgbl.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information 	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -78,18 +78,22 @@ void mupip_cvtgbl(void)
 	 */
 	TREF(issue_DBROLLEDBACK_anyways) = TRUE;
 	is_replicator = TRUE;
+	TREF(ok_to_see_statsdb_regs) = TRUE;
 	skip_dbtriggers = TRUE;
 	fn_len = SIZEOF(fn);
 	if (cli_present("STDIN"))
 	{
+		/* Check if both file name and -STDIN specified. */
+		if (cli_get_str("FILE", fn, &fn_len))
+		{
+			util_out_print("STDIN and FILE (!AD) cannot be specified at the same time", TRUE, fn_len, fn);
+			mupip_exit(ERR_MUPCLIERR);
+		}
 		/* User wants to load from standard input */
 		assert(SIZEOF(fn) > sys_input.len);
 		memcpy(fn, sys_input.addr, sys_input.len);
 		fn_len = sys_input.len;
 		assert(-1 != fcntl(fileno(stdin), F_GETFD));
-		/* Check if both file name and -STDIN specified. */
-		if (cli_get_str("FILE", fn, &fn_len))
-			mupip_exit(ERR_MUPCLIERR);
 	} else if (!cli_get_str("FILE", fn, &fn_len))  /* User wants to read from a file. */
 		mupip_exit(ERR_MUPCLIERR); /* Neither -STDIN nor file name specified. */
 	file_input_init(fn, fn_len, IOP_EOL);
@@ -256,16 +260,15 @@ int get_load_format(char **line1_ptr, char **line3_ptr, int *line1_len, int *lin
 		if (c == ctop)
 		{	/* did not find a terminator - read some more of 1st line */
 			ptr = c;
-			if (0 < (len = go_get(&ptr, 0, max_io_size)))		/* WARNING assignment */
-			{
+			if (0 <= (len = go_get(&ptr, 0, max_io_size)))		/* WARNING assignment */
 				*line1_len += len;
-				line2 = line1 + *line1_len;
-			} else
+			else
 			{	/* chances of this are small but we are careful not to overflow buffers */
 				mupip_error_occurred = TRUE;
 				gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(1) ERR_MAXSTRLEN);
 			}
 			line2_len = 0;
+			line2 = line1 + *line1_len;
 		} else if (line2_len)
 		{	/* If line1 length is actually < 12 chars, the buffer has characters from line2 as well */
 			for (c = line2, ctop = c + line2_len; c < ctop; c++)
diff --git a/sr_unix/mupip_dump_fhead.c b/sr_unix/mupip_dump_fhead.c
new file mode 100644
index 0000000..3ebfb6f
--- /dev/null
+++ b/sr_unix/mupip_dump_fhead.c
@@ -0,0 +1,108 @@
+/****************************************************************
+ *								*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
+ *								*
+ *	This source code contains the intellectual property	*
+ *	of its copyright holder(s), and is made available	*
+ *	under a license.  If you do not know the terms of	*
+ *	the license, please stop and do not read further.	*
+ *								*
+ ****************************************************************/
+
+#include "mdef.h"
+
+#include "gtm_string.h"
+#include "gtm_limits.h"
+
+#include "gdsroot.h"
+#include "gtm_facility.h"
+#include "fileinfo.h"
+#include "gdsbt.h"
+#include "gdsfhead.h"
+#include "filestruct.h"
+#include "mupipbckup.h"
+#include "gdscc.h"
+#include "gdskill.h"
+#include "jnl.h"
+#include "buddy_list.h"
+#include "hashtab_int4.h"	/* needed for tp.h */
+#include "tp.h"
+#include "util.h"
+#include "cli.h"
+#include "mupip_exit.h"
+#include "str_match.h"
+#include "mu_getlst.h"
+#include "gtmmsg.h"
+#include "mupip_dump_fhead.h"
+#include "gtm_stdlib.h"
+
+GBLREF char			gtm_dist[GTM_PATH_MAX];
+GBLREF boolean_t		gtm_dist_ok_to_use;
+GBLREF tp_region		*grlist;
+
+error_def(ERR_DBNOREGION);
+error_def(ERR_GTMDISTUNVERIF);
+error_def(ERR_MUNOFINISH);
+error_def(ERR_MUPCLIERR);
+
+#define DUMPFHEAD_CMD_STRING_SIZE 	256 + GTM_PATH_MAX + GTM_PATH_MAX
+#define EXEC_GTMDUMPFHEAD		"%s/mumps -run %%XCMD 'do dumpfhead^%%DUMPFHEAD(\"%s\")'"
+
+int4 dumpfhead(int len, unsigned char *filepath);
+
+void mupip_dump_fhead(void)
+{
+	int4		status;
+	tp_region	*rptr;
+	unsigned char	file[GTM_PATH_MAX + 1];
+	unsigned short	file_len = SIZEOF(file);
+	DCL_THREADGBL_ACCESS;
+
+	SETUP_THREADGBL_ACCESS;
+	/* Verify gtm_dist, and make sure there is a parameter. */
+	if (!gtm_dist_ok_to_use)
+		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(3) ERR_GTMDISTUNVERIF, 4, LEN_AND_STR(gtm_dist));
+	if (CLI_PRESENT == cli_present("REGION"))
+	{	/* region */
+		status = SS_NORMAL;
+		gvinit();
+		mu_getlst("WHAT", SIZEOF(tp_region));
+		if (!grlist)
+			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(1) ERR_DBNOREGION);
+		for (rptr = grlist; NULL != rptr; rptr = rptr->fPtr)
+		{
+			util_out_print("Fileheader dump of region !AD", TRUE, REG_LEN_STR(rptr->reg));
+			util_out_print("Dumping fileheader of !AD", TRUE, DB_LEN_STR(rptr->reg));
+			status |= dumpfhead(DB_LEN_STR(rptr->reg));
+		}
+		mupip_exit(status == SS_NORMAL ? status : ERR_MUNOFINISH);
+	} else
+	{	/* we default to file if neither -file nor -region could be found */
+		if (!cli_get_str("WHAT", (char *) file, (unsigned short *) &file_len))
+			mupip_exit(ERR_MUPCLIERR);
+		file[file_len] = '\0';     /* Null terminate */
+		mupip_exit(dumpfhead(file_len, file));
+	}
+}
+
+int4 dumpfhead(int len, unsigned char *file)
+{
+	char	cmd_dmpfhead_string[DUMPFHEAD_CMD_STRING_SIZE];
+#	ifdef _BSD
+	union wait		wait_stat;
+#	else
+	int4			wait_stat;
+#	endif
+
+	SNPRINTF(cmd_dmpfhead_string, SIZEOF(cmd_dmpfhead_string), EXEC_GTMDUMPFHEAD,
+		 gtm_dist, file);
+
+#ifdef _BSD
+	assert(SIZEOF(wait_stat) == SIZEOF(int4));
+	wait_stat.w_status = SYSTEM(cmd_dmpfhead_string);
+#else
+	wait_stat = SYSTEM(cmd_dmpfhead_string);
+#endif
+	return WEXITSTATUS(wait_stat);
+}
diff --git a/sr_port/mu_cre_file.h b/sr_unix/mupip_dump_fhead.h
old mode 100755
new mode 100644
similarity index 60%
copy from sr_port/mu_cre_file.h
copy to sr_unix/mupip_dump_fhead.h
index b3229f7..988637f
--- a/sr_port/mu_cre_file.h
+++ b/sr_unix/mupip_dump_fhead.h
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001 Sanchez Computer Associates, Inc.	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -9,9 +10,9 @@
  *								*
  ****************************************************************/
 
-#ifndef MU_CRE_FILE_INCLUDED
-#define MU_CRE_FILE_INCLUDED
+#ifndef MUPIP_DUMP_FHEAD_INCLUDED
+#define MUPIP_DUMP_FHEAD_INCLUDED
 
-unsigned char mu_cre_file(void);
+void mupip_dump_fhead(void);
 
-#endif /* MU_CRE_FILE_INCLUDED */
+#endif /* MUPIP_DUMP_FHEAD_INCLUDED */
diff --git a/sr_unix/mupip_endiancvt.c b/sr_unix/mupip_endiancvt.c
index 3c0f9fb..c2d05b4 100644
--- a/sr_unix/mupip_endiancvt.c
+++ b/sr_unix/mupip_endiancvt.c
@@ -66,6 +66,7 @@
 #include "anticipatory_freeze.h"
 #include "gtmcrypt.h"
 #include "db_ipcs_reset.h"
+#include "db_write_eof_block.h"
 
 GBLREF	gd_region		*gv_cur_region;
 GBLREF	mstr			pvt_crypt_buf;
@@ -135,7 +136,7 @@ typedef struct
 } endian_info;
 
 void		endian_header(sgmnt_data *new, sgmnt_data *old, boolean_t new_is_native);
-int4		endian_process(endian_info *info, sgmnt_data *new_data, sgmnt_data *old_data);
+int4		endian_process(endian_info *info, sgmnt_data *new_data, sgmnt_data *old_data, boolean_t override_specified);
 void		endian_cvt_blk_hdr(blk_hdr_ptr_t blkhdr, boolean_t new_is_native, boolean_t make_empty);
 void		endian_cvt_blk_recs(endian_info *info, char *new_block, blk_hdr_ptr_t blkhdr, int blknum);
 char		*endian_read_dbblk(endian_info *info, block_id blk_to_get);
@@ -203,10 +204,10 @@ void mupip_endiancvt(void)
 		util_out_print("open : !AZ", TRUE, errptr);
 		mupip_exit(save_errno);
 	}
-#ifdef __MVS__
+#	ifdef __MVS__
 	if (-1 == gtm_zos_tag_to_policy(db_fd, TAG_BINARY, &realfiletag))
 		TAG_POLICY_GTM_PUTMSG(db_name, realfiletag, TAG_BINARY, errno);
-#endif
+#	endif
 	old_data = (sgmnt_data *)malloc(SIZEOF(sgmnt_data));
 	LSEEKREAD(db_fd, 0, old_data, SIZEOF(sgmnt_data), save_errno);
 	if (0 != save_errno)
@@ -512,10 +513,10 @@ void mupip_endiancvt(void)
 			CLOSEFILE_RESET(db_fd, rc);	/* resets "db_fd" to FD_INVALID */
 			mupip_exit(save_errno);
 		}
-#ifdef __MVS__
+#		ifdef __MVS__
 		if (-1 == gtm_zos_set_tag(outdb_fd, TAG_BINARY, TAG_NOTTEXT, TAG_DONTFORCE, &realfiletag))
 			TAG_POLICY_GTM_PUTMSG(outdb, realfiletag, TAG_BINARY, errno);
-#endif
+#		endif
 		new_data->file_corrupt = endian_native ? GTM_BYTESWAP_32(TRUE) : TRUE;
 		LSEEKWRITE(outdb_fd, 0, new_data, SIZEOF(sgmnt_data), save_errno);
 		if (0 != save_errno)
@@ -584,7 +585,7 @@ void mupip_endiancvt(void)
 	} else
 		outdb_fd = FD_INVALID;
 	info.outdb_fd = outdb_fd;
-	status = endian_process(&info, new_data, old_data);
+	status = endian_process(&info, new_data, old_data, override_specified);
 	if (0 != status)
 	{
 		/* db_ipcs_reset in the macro below works even with the now converted opposite endian header since it just sets
@@ -603,7 +604,8 @@ void mupip_endiancvt(void)
 	{
 		LSEEKWRITE(outdb_fd, 0, new_data, SIZEOF(sgmnt_data), save_errno);
 	} else
-		DB_LSEEKWRITE((sgmnt_addrs *)NULL, (char *)NULL, db_fd, 0, new_data, SIZEOF(sgmnt_data), save_errno);
+		DB_LSEEKWRITE((sgmnt_addrs *)NULL, ((unix_db_info *)NULL), (char *)NULL, db_fd, 0,
+									new_data, SIZEOF(sgmnt_data), save_errno);
 	if (0 != save_errno)
 	{
 		free(new_data);
@@ -665,6 +667,7 @@ void endian_header(sgmnt_data *new, sgmnt_data *old, boolean_t new_is_native)
 	int	idx;
 	time_t	ctime;
 
+	/************* MOSTLY STATIC DATABASE STATE FIELDS **************************/
 	SWAP_SD4(blk_size);
 	SWAP_SD4(master_map_len);
 	SWAP_SD4(bplmap);
@@ -695,6 +698,9 @@ void endian_header(sgmnt_data *new, sgmnt_data *old, boolean_t new_is_native)
 	SWAP_SD4_CAST(minor_dbver, enum mdb_ver);
 	SWAP_SD4(jnl_checksum);
 	SWAP_SD4(wcs_phase2_commit_wait_spincnt);
+	assert(SIZEOF(int4) == SIZEOF(old->last_mdb_ver));	/* enum */
+	SWAP_SD4_CAST(last_mdb_ver, enum mdb_ver);
+	/************* FIELDS SET AT CREATION TIME ********************************/
 	/* SWAP_SD4(createinprogress);	checked above as FALSE so no need */
 	assert(SIZEOF(int4) == SIZEOF(old->creation_time4));
 	time(&ctime);
@@ -702,9 +708,11 @@ void endian_header(sgmnt_data *new, sgmnt_data *old, boolean_t new_is_native)
 	new->creation_time4 = (int4)ctime;/* Take only lower order 4-bytes of current time */
 	if (!new_is_native)
 		SWAP_SD4(creation_time4);
+	/************* FIELDS USED BY TN WARN PROCESSING *************************/
 	assert(SIZEOF(gtm_int64_t) == SIZEOF(old->max_tn));	/* trans_num */
 	SWAP_SD8(max_tn);
 	SWAP_SD8(max_tn_warn);
+	/************* FIELDS SET BY MUPIP BACKUP/REORG *************************/
 	SWAP_SD8(last_inc_backup);
 	SWAP_SD8(last_com_backup);
 	SWAP_SD8(last_rec_backup);
@@ -713,10 +721,13 @@ void endian_header(sgmnt_data *new, sgmnt_data *old, boolean_t new_is_native)
 	SWAP_SD4(last_com_bkup_last_blk);
 	SWAP_SD4(last_rec_bkup_last_blk);
 	SWAP_SD4(reorg_restart_block);
+	/************* FIELDS SET WHEN DB IS OPEN ********************************/
 	new->image_count = 0;		/* should be zero when db is not open so reset it unconditionally */
 	new->freeze = 0;		/* should be zero when db is not open so reset it unconditionally */
+	new->freeze_online = 0;		/* should be zero when db is not open so reset it unconditionally */
 	SWAP_SD4(kill_in_prog);
 	SWAP_SD4(abandoned_kills);
+	/************* FIELDS USED IN V4 <==> V5 COMPATIBILITY MODE ****************/
 	SWAP_SD8(tn_upgrd_blks_0);
 	SWAP_SD8(desired_db_format_tn);
 	SWAP_SD8(reorg_db_fmt_start_tn);
@@ -731,6 +742,8 @@ void endian_header(sgmnt_data *new, sgmnt_data *old, boolean_t new_is_native)
 	 * there are NO V4 format block that is too full to be upgraded to V5 format (i.e. will cause DYNUPGRDFAIL error).
 	 */
 	new->db_got_to_v5_once = TRUE;	/* should be TRUE */
+	new->opened_by_gtmv53 = TRUE;	/* should be TRUE */
+	/************* FIELDS RELATED TO DB TRANSACTION HISTORY *****************************/
 	SWAP_SD8(trans_hist.curr_tn);
 	SWAP_SD8(trans_hist.early_tn);
 	SWAP_SD8(trans_hist.last_mm_sync);
@@ -739,20 +752,28 @@ void endian_header(sgmnt_data *new, sgmnt_data *old, boolean_t new_is_native)
 	SWAP_SD4(trans_hist.ccp_jnl_filesize);
 	SWAP_SD4(trans_hist.total_blks);
 	SWAP_SD4(trans_hist.free_blocks);
+	/************* FIELDS RELATED TO WRITE CACHE FLUSHING *******************************/
 	SWAP_SD4(flush_time[0]);
 	SWAP_SD4(flush_time[1]);
 	SWAP_SD4(flush_trigger);
 	SWAP_SD4(n_wrt_per_flu);
 	SWAP_SD4(wait_disk_space);
 	SWAP_SD4(defer_time);
+	SWAP_SD4(mumps_can_bypass);
+	SWAP_SD4(epoch_taper);
+	SWAP_SD4(epoch_taper_time_pct);
+	SWAP_SD4(epoch_taper_jnl_pct);
+	SWAP_SD4(asyncio);
+	/************* FIELDS Used for update process performance improvement. Some may go away in later releases ********/
 	SWAP_SD4(reserved_for_upd);
 	SWAP_SD4(avg_blks_per_100gbl);
 	SWAP_SD4(pre_read_trigger_factor);
 	SWAP_SD4(writer_trigger_factor);
+	/************* FIELDS USED ONLY BY UNIX ********************************/
 	/* Solaris complains about swapping -1
-	   assert(INVALID_SEMID == GTM_BYTESWAP_32(INVALID_SEMID));
-	   assert(INVALID_SHMID == GTM_BYTESWAP_32(INVALID_SHMID));
-	*/
+	 * assert(INVALID_SEMID == GTM_BYTESWAP_32(INVALID_SEMID));
+	 * assert(INVALID_SHMID == GTM_BYTESWAP_32(INVALID_SHMID));
+	 */
 	assert(-1 == INVALID_SEMID);
 	assert(-1 == INVALID_SHMID);
 	if (new_is_native)
@@ -763,10 +784,8 @@ void endian_header(sgmnt_data *new, sgmnt_data *old, boolean_t new_is_native)
 		new->gt_shm_ctime.ctime = 0;
 		memset(new->machine_name, 0, MAX_MCNAMELEN);
 	}
-	/* Convert GVSTATS information */
-#	define TAB_GVSTATS_REC(COUNTER,TEXT1,TEXT2)	SWAP_SD8(gvstats_rec.COUNTER);
-#	include "tab_gvstats_rec.h"
-#	undef TAB_GVSTATS_REC
+	/************* ACCOUNTING INFORMATION ********************************/
+	/************* CCP/RC RELATED FIELDS (CCP STUFF IS NOT USED CURRENTLY BY GT.M) *************/
 	SWAP_SD4(staleness[0]);
 	SWAP_SD4(staleness[1]);
 	SWAP_SD4(ccp_tick_interval[0]);
@@ -783,11 +802,11 @@ void endian_header(sgmnt_data *new, sgmnt_data *old, boolean_t new_is_native)
 	SWAP_SD4(dsid);
 	SWAP_SD4(rc_node);
 	assert(SIZEOF(gtm_int64_t) == SIZEOF(old->reg_seqno));	/* seq_num */
+	/************* REPLICATION RELATED FIELDS ****************/
 	SWAP_SD8(reg_seqno);
 	SWAP_SD8(pre_multisite_resync_seqno);
-	/* Note some of the following names were added or renamed in V5.1 but
-	   should be of no issue for V5.0 builds since we will be swapping
-	   unused fields.
+	/* Note some of the following names were added or renamed in V5.1 but should be of no issue for V5.0 builds
+	 * since we will be swapping unused fields.
 	*/
 	SWAP_SD8(zqgblmod_tn);
 	SWAP_SD8(zqgblmod_seqno);
@@ -795,8 +814,10 @@ void endian_header(sgmnt_data *new, sgmnt_data *old, boolean_t new_is_native)
 	if (!new_is_native)
 		SWAP_SD4(repl_state);
 	SWAP_SD4(multi_site_open);
+	/************* TP RELATED FIELDS ********************/
 	for (idx = 0; idx < ARRAYSIZE(old->tp_cdb_sc_blkmod); idx++)
 		new->tp_cdb_sc_blkmod[idx] = 0;
+	/************* JOURNALLING RELATED FIELDS ****************/
 	SWAP_SD4(jnl_alq);
 	SWAP_SD4(jnl_deq);
 	SWAP_SD4(jnl_buffer_size);
@@ -810,39 +831,69 @@ void endian_header(sgmnt_data *new, sgmnt_data *old, boolean_t new_is_native)
 	SWAP_SD4(alignsize);
 	SWAP_SD4(jnl_sync_io);
 	SWAP_SD4(yield_lmt);
+	SWAP_SD4(turn_around_point);
+	SWAP_SD8(jnl_eovtn);
 	assert(SIZEOF(gtm_int64_t) == SIZEOF(old->intrpt_recov_resync_seqno));
+	/************* INTERRUPTED RECOVERY RELATED FIELDS ****************/
 	SWAP_SD8(intrpt_recov_resync_seqno);
 	assert(SIZEOF(int4) == SIZEOF(old->intrpt_recov_tp_resolve_time));
 	SWAP_SD4(intrpt_recov_tp_resolve_time);
 	SWAP_SD4(recov_interrupted);
 	SWAP_SD4(intrpt_recov_jnl_state);
 	SWAP_SD4(intrpt_recov_repl_state);
-	for (idx = 0; idx < MAX_SUPPL_STRMS; idx++)
-	{
-		SWAP_SD8(strm_reg_seqno[idx]);
-		SWAP_SD8(intrpt_recov_resync_strm_seqno[idx]);
-		SWAP_SD8(save_strm_reg_seqno[idx]);
-	}
-	SWAP_SD4(is_encrypted);
+	/************* TRUNCATE RELATED FIELDS ****************/
+	SWAP_SD4(before_trunc_total_blks);
+	SWAP_SD4(after_trunc_total_blks);
+	SWAP_SD4(before_trunc_free_blocks);
+	/************* POTENTIALLY LARGE CHARACTER ARRAYS **************/
+	/************* ENCRYPTION-RELATED FIELDS **************/
 	SWAP_SD4(non_null_iv);
 	SWAP_SD4(encryption_hash_cutoff);
 	SWAP_SD8(encryption_hash2_start_tn);
-#define TAB_BG_TRC_REC(A,B)	new->B##_cntr = (bg_trc_rec_cntr) 0; new->B##_tn = (bg_trc_rec_tn) 0;
-#include "tab_bg_trc_rec.h"
-#undef TAB_BG_TRC_REC
-#define TAB_DB_CSH_ACCT_REC(A,B,C)	new->A.cumul_count = new->A.curr_count = 0;
-#include "tab_db_csh_acct_rec.h"
-#undef TAB_DB_CSH_ACCT_REC
+	/************* BG_TRC_REC RELATED FIELDS ***********/
+	/* Convert "bg_trc_rec_cntr_filler" and "bg_trc_rec_tn_filler" */
+#	define TAB_BG_TRC_REC(A,B)	new->B##_cntr = (bg_trc_rec_cntr) 0; new->B##_tn = (bg_trc_rec_tn) 0;
+#	include "tab_bg_trc_rec.h"
+#	undef TAB_BG_TRC_REC
+	/************* DB_CSH_ACCT_REC RELATED FIELDS ***********/
+	/* Convert "db_csh_acct_rec_filler_4k" */
+#	define TAB_DB_CSH_ACCT_REC(A,B,C)	new->A.cumul_count = new->A.curr_count = 0;
+#	include "tab_db_csh_acct_rec.h"
+#	undef TAB_DB_CSH_ACCT_REC
+	/************* GVSTATS_REC RELATED FIELDS ***********/
+#	define TAB_GVSTATS_REC(COUNTER,TEXT1,TEXT2)	SWAP_SD8(gvstats_rec.COUNTER);
+#	include "tab_gvstats_rec.h"
+#	undef TAB_GVSTATS_REC
+	/************* INTERRUPTED RECOVERY RELATED FIELDS continued ****************/
+	for (idx = 0; idx < MAX_SUPPL_STRMS; idx++)
+		SWAP_SD8(intrpt_recov_resync_strm_seqno[idx]);
+	/************* DB CREATION AND UPGRADE CERTIFICATION FIELDS ***********/
 	SWAP_SD4_CAST(creation_db_ver, enum db_ver);
 	SWAP_SD4_CAST(creation_mdb_ver, enum mdb_ver);
 	SWAP_SD4_CAST(certified_for_upgrade_to, enum db_ver);
-	/* next_upgrd_warn	isn't valid since the database is fully_upgraded
-	   and the latch values differ by platform and since we don't know where
-	   the db will be used, we will ignore it.
-	*/
+	/************* SECSHR_DB_CLNUP RELATED FIELDS (now moved to node_local) ***********/
+	/* "secshr_ops_index_filler" and "secshr_ops_array_filler" need not be converted (they are fillers) */
+	/********************************************************/
+	/* "next_upgrd_warn" isn't valid since the database is fully_upgraded and the latch values differ by platform
+	 * and since we don't know where the db will be used, we will ignore it.
+	 */
+	SWAP_SD4(is_encrypted);
+	SWAP_SD4(db_trigger_cycle);
+	/************* SUPPLEMENTARY REPLICATION INSTANCE RELATED FIELDS ****************/
+	for (idx = 0; idx < MAX_SUPPL_STRMS; idx++)
+	{
+		SWAP_SD8(strm_reg_seqno[idx]);
+		SWAP_SD8(save_strm_reg_seqno[idx]);
+	}
+	/************* MISCELLANEOUS FIELDS ****************/
+	SWAP_SD4(freeze_on_fail);
+	SWAP_SD4(span_node_absent);
+	SWAP_SD4(maxkeysz_assured);
+	SWAP_SD4(hasht_upgrade_needed);
+	SWAP_SD4(defer_allocate);
 }
 
-int4	endian_process(endian_info *info, sgmnt_data *new_data, sgmnt_data *old_data)
+int4	endian_process(endian_info *info, sgmnt_data *new_data, sgmnt_data *old_data, boolean_t override_specified)
 {	/* returns 0 for success
 	   This routine based on mubinccpy and dbcertify_scan_phase
 	*/
@@ -860,7 +911,9 @@ int4	endian_process(endian_info *info, sgmnt_data *new_data, sgmnt_data *old_dat
 	blk_hdr_ptr_t	bp_new, bp_native, bp_old;
 	boolean_t	blk_needs_encryption, non_null_iv, use_old_key, use_new_key;
 	trans_num	encryption_hash2_start_tn;
+	DCL_THREADGBL_ACCESS;
 
+	SETUP_THREADGBL_ACCESS;
 	if (info->endian_native)
 	{	/* use fields from old header */
 		bplmap = old_data->bplmap;
@@ -888,7 +941,7 @@ int4	endian_process(endian_info *info, sgmnt_data *new_data, sgmnt_data *old_dat
 	}
 	/* Asserting that the database is either not using any encryption or has set the database_fn_len field for future uses. */
 	assert((0 != info->database_fn_len) || !USES_ANY_KEY(info));
-	dbptr = (off_t)(startvbn - 1) * DISK_BLOCK_SIZE;
+	dbptr = (off_t)BLK_ZERO_OFF(startvbn);
 	info->tot_blks = totblks;
 	info->bsize = bsize;
 	info->startvbn = startvbn;
@@ -932,7 +985,8 @@ int4	endian_process(endian_info *info, sgmnt_data *new_data, sgmnt_data *old_dat
 		}
 		if (info->inplace)
 		{
-			DB_LSEEKWRITE(NULL, NULL, info->db_fd, dbptr, lbmap_buff[buff_new], bsize, save_errno);
+			DB_LSEEKWRITE(NULL, ((unix_db_info *)NULL), NULL, info->db_fd, dbptr,
+							lbmap_buff[buff_new], bsize, save_errno);
 		} else
 			LSEEKWRITE(info->outdb_fd, dbptr, lbmap_buff[buff_new], bsize, save_errno);
 		if (0 != save_errno)
@@ -1035,7 +1089,8 @@ int4	endian_process(endian_info *info, sgmnt_data *new_data, sgmnt_data *old_dat
 				}
 				if (info->inplace)
 				{
-					DB_LSEEKWRITE(NULL, NULL, info->db_fd, dbptr, blk_buff[buff_new], bsize, save_errno);
+					DB_LSEEKWRITE(NULL, ((unix_db_info *)NULL), NULL, info->db_fd,
+								dbptr, blk_buff[buff_new], bsize, save_errno);
 				} else
 					LSEEKWRITE(info->outdb_fd, dbptr, blk_buff[buff_new], bsize, save_errno);
 				if (0 != save_errno)
@@ -1054,15 +1109,16 @@ int4	endian_process(endian_info *info, sgmnt_data *new_data, sgmnt_data *old_dat
 			}
 		}
 	}
-	if (last_blk_written < totblks)
+	/* If MUPIP ENDIANCVT -OVERRIDE is specified and source db minor_dbver is not same as that of the endiancvt,
+	 * then skip the EOF block writing as otherwise we could end up creating a db with dbver pointing to a
+	 * pre-V63001 GT.M version but with a GDS-block EOF block (instead of a 512-byte EOF block which is the
+	 * norm pre-V63001) effectively creating a db reflecting bits and pieces of multiple GT.M versions.
+	 */
+	if ((last_blk_written < totblks) && (!override_specified || (GDSMVCURR == old_data->minor_dbver)))
 	{	/* need to create last disk block */
-		memset(blk_buff[0], 0, DISK_BLOCK_SIZE);
-		dbptr = ((off_t)(startvbn - 1) * DISK_BLOCK_SIZE) + ((off_t)totblks * bsize);
-		if (info->inplace)
-		{
-			DB_LSEEKWRITE(NULL, NULL, info->db_fd, dbptr, blk_buff[0], DISK_BLOCK_SIZE, save_errno);
-		} else
-			LSEEKWRITE(info->outdb_fd, dbptr, blk_buff[0], DISK_BLOCK_SIZE, save_errno);
+		dbptr = ((off_t)BLK_ZERO_OFF(startvbn) + (off_t)totblks * bsize);
+		save_errno = db_write_eof_block(NULL, info->inplace ? info->db_fd : info->outdb_fd, bsize, dbptr,
+												&(TREF(dio_buff)));
 		if (0 != save_errno)
 		{
 			free(blk_buff[0]);
@@ -1167,7 +1223,7 @@ char *endian_read_dbblk(endian_info *info, block_id blk_to_get)
 			return info->dtblk.buff;	/* already have it */
 		buff = info->dtblk.buff;
 	}
-	blkoff = ((off_t)(info->startvbn - 1) * DISK_BLOCK_SIZE) + ((off_t)blk_to_get * info->bsize);
+	blkoff = ((off_t)BLK_ZERO_OFF(info->startvbn) + (off_t)blk_to_get * info->bsize);
 	LSEEKREAD(info->db_fd, blkoff, buff, info->bsize, save_errno);
 	if (0 != save_errno)
 	{
diff --git a/sr_unix/mupip_exit_handler.c b/sr_unix/mupip_exit_handler.c
index 1717856..1c9f702 100755
--- a/sr_unix/mupip_exit_handler.c
+++ b/sr_unix/mupip_exit_handler.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -61,7 +61,6 @@
 #include "secshr_db_clnup.h"
 #include "gtmio.h"
 #include "repl_shutdcode.h"
-#include "op.h"
 #include "io.h"
 #include "gtmsource_srv_latch.h"
 #include "gtmcrypt.h"
@@ -117,8 +116,6 @@ void mupip_exit_handler(void)
 	 * be holding crit in one or more regions and/or we could have other odds/ends to cleanup.
 	 */
 	secshr_db_clnup(NORMAL_TERMINATION);
-	if (dollar_tlevel)
-		OP_TROLLBACK(0);
 	if (is_updhelper && NULL != helper_entry) /* haven't had a chance to cleanup, must be an abnormal exit */
 	{
 		helper_entry->helper_shutdown = ABNORMAL_SHUTDOWN;
diff --git a/sr_unix/mupip_reorg_encrypt.c b/sr_unix/mupip_reorg_encrypt.c
index 7456271..f28c552 100644
--- a/sr_unix/mupip_reorg_encrypt.c
+++ b/sr_unix/mupip_reorg_encrypt.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2015-2016 Fidelity National Information	*
+ * Copyright (c) 2015-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -41,6 +41,7 @@
 #include "gtm_c_stack_trace.h"
 #include "is_proc_alive.h"
 #include "gtmsecshr.h"
+#include "wcs_backoff.h"
 #include "wcs_sleep.h"
 #include "gtm_sem.h"
 #include "gtm_semutils.h"
@@ -50,6 +51,7 @@
 #include "have_crit.h"
 #include "mupip_reorg_encrypt.h"
 #include "t_abort.h"
+#include "interlock.h"
 
 GBLREF bool		error_mupip;
 GBLREF bool		mu_ctrlc_occurred;
@@ -104,11 +106,12 @@ STATICFNDEF void	release_ftok_semaphore(gd_region *reg, sgmnt_addrs *csa, sgmnt_
 STATICFNDEF void	switch_journal_file(sgmnt_addrs *csa, sgmnt_data_ptr_t csd);
 
 #define EXIT_MUPIP_REORG(STATUS)											\
-{															\
+MBSTART {														\
 	mu_reorg_encrypt_in_prog = MUPIP_REORG_IN_PROG_FALSE;								\
 	mupip_exit(STATUS);												\
-}
+} MBEND
 
+/* Note: The below should not use MBSTART/MBEND as it does a "continue" (see MBSTART macro definition comment) */
 #define CONTINUE_TO_NEXT_REGION(CSA, CSD, CNL, REG, REG_STATUS, STATUS, REORG_IN_PROG, HAVE_CRIT, ERROR, OPER, ...)	\
 {															\
 	if (REORG_IN_PROG)												\
@@ -158,7 +161,7 @@ void mupip_reorg_encrypt(void)
 	sm_uc_ptr_t		blkBase, bml_sm_buff;	/* shared memory pointer to the bitmap global buffer */
 	cache_rec_ptr_t		cr;
 	blk_segment		*bs1, *bs_ptr;
-	sm_uc_ptr_t		bptr;
+	sm_uc_ptr_t		bptr, buff;
 	blk_hdr			new_hdr;
 	unsigned char    	save_cw_set_depth;
 	uint4			lcl_update_trans, pid, bptr_size;
@@ -167,7 +170,10 @@ void mupip_reorg_encrypt(void)
 	uint4			reencryption_count;
 	uint4			initial_blk_cnt;
 #	endif
+	unix_db_info		*udi;
+	DCL_THREADGBL_ACCESS;
 
+	SETUP_THREADGBL_ACCESS;
 	mu_reorg_encrypt_in_prog = MUPIP_REORG_IN_PROG_TRUE;
 	status = SS_NORMAL;
 	/* Get the region(s) parameter. */
@@ -175,9 +181,8 @@ void mupip_reorg_encrypt(void)
 	error_mupip = FALSE;
 	mu_getlst("REG_NAME", SIZEOF(tp_region));
 	if (error_mupip)
-	{
 		EXIT_MUPIP_REORG(ERR_MUNOACTION);
-	} else if (!grlist)
+	else if (!grlist)
 	{
 		gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(1) ERR_DBNOREGION);
 		EXIT_MUPIP_REORG(ERR_MUNOACTION);
@@ -426,7 +431,11 @@ void mupip_reorg_encrypt(void)
 				reencryption_count = gtm_white_box_test_case_count;
 		}
 #		endif
-		if ((NULL != bptr) && (bptr_size < blk_size))
+		udi = FILE_INFO(reg);
+		if (udi->fd_opened_with_o_direct)
+		{
+			DIO_BUFF_EXPAND_IF_NEEDED(udi, blk_size, &(TREF(dio_buff)));
+		} else if ((NULL != bptr) && (bptr_size < blk_size))
 		{	/* malloc/free "bptr" for each region as GDS block-size can be different */
 			free(bptr);
 			bptr = NULL;
@@ -438,7 +447,7 @@ void mupip_reorg_encrypt(void)
 			if (mu_ctrly_occurred || mu_ctrlc_occurred)
 			{
 				reg_status = ERR_MUNOFINISH;
-				goto stop_reorg_on_this_reg;
+				break;
 			}
 			assert(!csa->now_crit);
 			bml_sm_buff = t_qread(curbmp, (sm_int_ptr_t)&cycle, &cr); /* bring block into the cache outside of crit */
@@ -449,7 +458,7 @@ void mupip_reorg_encrypt(void)
 			{
 				rel_crit(reg);
 				reg_status = ERR_MUNOFINISH;
-				goto stop_reorg_on_this_reg;
+				break;
 			}
 			if (total_blks > csd->trans_hist.total_blks)
 			{
@@ -457,9 +466,9 @@ void mupip_reorg_encrypt(void)
 				last_bmp = ROUND_DOWN2(total_blks - 1, BLKS_PER_LMAP);
 				if (curbmp >= total_blks)
 				{
-					curbmp = last_bmp;
 					rel_crit(reg);
-					goto stop_reorg_on_this_reg;
+					assert(SS_NORMAL == reg_status);
+					break;
 				}
 			}
 			/* Before changing the hash cutoff, check if the journal file is not open in shared memory (possible
@@ -489,7 +498,7 @@ void mupip_reorg_encrypt(void)
 			if (NULL == bml_lcl_buff)
 				bml_lcl_buff = malloc(BM_SIZE(BLKS_PER_LMAP));
 			memcpy(bml_lcl_buff, (blk_hdr_ptr_t)bml_sm_buff, BM_SIZE(BLKS_PER_LMAP));
-			if (FALSE == cert_blk(reg, curbmp, (blk_hdr_ptr_t)bml_lcl_buff, 0, FALSE))
+			if (FALSE == cert_blk(reg, curbmp, (blk_hdr_ptr_t)bml_lcl_buff, 0, FALSE, NULL))
 			{	/* Certify the block while holding crit as cert_blk uses fields from file-header (shared memory). */
 				rel_crit(reg);
 				assert(FALSE);	/* In pro, skip ugprading/downgarding all blks in this unreliable local bitmap. */
@@ -511,23 +520,28 @@ void mupip_reorg_encrypt(void)
 				if (mu_ctrly_occurred || mu_ctrlc_occurred)
 				{
 					reg_status = ERR_MUNOFINISH;
-					goto stop_reorg_on_this_reg;
+					break;
 				}
 				GET_BM_STATUS(bml_lcl_buff, lcnt, bml_status);
-				assert(BLK_MAPINVALID != bml_status); /* cert_blk ran clean so we dont expect invalid entries */
+				assert(BLK_MAPINVALID != bml_status); /* cert_blk ran clean so we don't expect invalid entries */
 				if (BLK_FREE == bml_status)
 					continue;
 				curblk = curbmp + lcnt;
 				if (lcnt)
 				{	/* non-bitmap block */
-					/* read in block from disk into private buffer. dont pollute the cache yet */
-					if (NULL == bptr)
+					/* read in block from disk into private buffer. don't pollute the cache yet */
+					if (!udi->fd_opened_with_o_direct)
 					{
-						bptr = (sm_uc_ptr_t)malloc(blk_size);
-						bptr_size = blk_size;
-					}
+						if (NULL == bptr)
+						{
+							bptr = (sm_uc_ptr_t)malloc(blk_size);
+							bptr_size = blk_size;
+						}
+						buff = bptr;
+					} else
+						buff = (sm_uc_ptr_t)(TREF(dio_buff)).aligned;
 					mu_reorg_encrypt_in_prog = MUPIP_REORG_IN_PROG_LOCAL_DSK_READ;
-					status1 = dsk_read(curblk, bptr, NULL, FALSE);
+					status1 = dsk_read(curblk, buff, NULL, FALSE);
 					mu_reorg_encrypt_in_prog = MUPIP_REORG_IN_PROG_TRUE;
 					if (SS_NORMAL != status1)
 					{
@@ -535,9 +549,9 @@ void mupip_reorg_encrypt(void)
 						util_out_print("Region !AD : Error occurred while reading block [0x!XL]",
 								TRUE, REG_LEN_STR(reg), curblk);
 						reg_status = ERR_MUNOFINISH;
-						goto stop_reorg_on_this_reg;/* goto needed due to nested FOR Loop */
+						break;
 					}
-					blk_tn = ((blk_hdr_ptr_t)bptr)->tn;
+					blk_tn = ((blk_hdr_ptr_t)buff)->tn;
 					if (blk_tn >= start_tn)
 						continue;
 				}
@@ -560,14 +574,13 @@ void mupip_reorg_encrypt(void)
 						assert(csa->now_crit);
 						total_blks = csd->trans_hist.total_blks;
 						last_bmp = ROUND_DOWN2(total_blks - 1, BLKS_PER_LMAP);
-						if (curbmp >= total_blks)
-						{
-							curbmp = last_bmp;
-							assert(NULL == reorg_encrypt_restart_csa);
-							t_abort(reg, csa);
-							assert(!csa->now_crit);	/* "t_abort" should have released crit */
-							goto stop_reorg_on_this_reg;
-						}
+						assert(NULL == reorg_encrypt_restart_csa);
+						t_abort(reg, csa);
+						assert(!csa->now_crit);	/* "t_abort" should have released crit */
+						assert(SS_NORMAL == reg_status);
+						curbmp = last_bmp; /* ensure we "break" out of 1st level (outermost) for loop */
+						lcnt = mapsize;	/* to break out of 2nd level (outer) for-loop */
+						break;
 					}
 					blkBase = t_qread(curblk, (sm_int_ptr_t)&blkhist->cycle, &blkhist->cr);
 					if (NULL == blkBase)
@@ -683,7 +696,7 @@ void mupip_reorg_encrypt(void)
 							if (0 == reencryption_count)
 							{
 								reg_status = ERR_MUNOFINISH;
-								goto stop_reorg_on_this_reg;
+								break;
 							}
 						}
 #						endif
@@ -694,53 +707,54 @@ void mupip_reorg_encrypt(void)
 					}
 					assert(csd == cs_data);
 				}
+#				ifdef DEBUG
+				if (SS_NORMAL != reg_status)
+					break;	/* this takes into account the WBTEST_SLEEP_IN_MUPIP_REORG_ENCRYPT case above */
+#				endif
 			}
-stop_reorg_on_this_reg:
-			if (SS_NORMAL == reg_status)
+			if (SS_NORMAL != reg_status)
+				break;
+		}
+		if (SS_NORMAL == reg_status)
+		{
+			get_ftok_semaphore(reg, csa);
+			grab_crit(reg);
+			/* Wait for all the readers to complete to prevent them from attempting to digest an
+			 * encrypted block or decrypt a block with a wrong key in case MUPIP REORG -ENCRYPT has
+			 * concurrently processed that block.
+			 */
+			if (!wait_for_concurrent_reads(csa))
 			{
-				if (curbmp == last_bmp)
-				{
-					get_ftok_semaphore(reg, csa);
-					grab_crit(reg);
-					/* Wait for all the readers to complete to prevent them from attempting to digest an
-					 * encrypted block or decrypt a block with a wrong key in case MUPIP REORG -ENCRYPT has
-					 * concurrently processed that block.
-					 */
-					if (!wait_for_concurrent_reads(csa))
-					{
-						util_out_print("Region !AD : Timed out waiting for concurrent reads to finish2",
-								TRUE, REG_LEN_STR(reg));
-						reg_status = ERR_MUNOFINISH;
-						break;
-					}
-					/* Same for writers. */
-					if (!wcs_flu(WCSFLU_WRITE_EPOCH))
-					{
-						gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(6) ERR_BUFFLUFAILED, 4,
-								LEN_AND_LIT("MUPIP REORG ENCRYPT3"), db_name_len, db_name);
-						reg_status = ERR_MUNOFINISH;
-						break;
-					}
-					/* We are not resetting encryption_hash2_start_tn because we do not want the
-					 * database to be reencryptable before the user had a chance to back it up.
-					 */
-					csd->encryption_hash_cutoff = UNSTARTED;
-					csd->non_null_iv = TRUE;
-					SET_AS_ENCRYPTED(csd->is_encrypted);
-					memcpy(csd->encryption_hash, csd->encryption_hash2, GTMCRYPT_RESERVED_HASH_LEN);
-					memset(csd->encryption_hash2, 0, GTMCRYPT_RESERVED_HASH_LEN);
-					/* A simple copy because gtmcrypt_key_t is a pointer type. */
-					csa->encr_key_handle = csa->encr_key_handle2;
-					csa->encr_key_handle2 = NULL;
-					cnl->reorg_encrypt_cycle++;
-					assert(NULL != csa->encr_ptr);
-					COPY_ENC_INFO(csd, csa->encr_ptr, cnl->reorg_encrypt_cycle;);
-					if (JNL_ENABLED(csd))
-						switch_journal_file(csa, csd);
-					DBG_RECORD_CRYPT_UPDATE(csd, csa, cnl, process_id);
-				}
-			} else
+				util_out_print("Region !AD : Timed out waiting for concurrent reads to finish2",
+						TRUE, REG_LEN_STR(reg));
+				reg_status = ERR_MUNOFINISH;
+				break;
+			}
+			/* Same for writers. */
+			if (!wcs_flu(WCSFLU_WRITE_EPOCH))
+			{
+				gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(6) ERR_BUFFLUFAILED, 4,
+						LEN_AND_LIT("MUPIP REORG ENCRYPT3"), db_name_len, db_name);
+				reg_status = ERR_MUNOFINISH;
 				break;
+			}
+			/* We are not resetting encryption_hash2_start_tn because we do not want the
+			 * database to be reencryptable before the user had a chance to back it up.
+			 */
+			csd->encryption_hash_cutoff = UNSTARTED;
+			csd->non_null_iv = TRUE;
+			SET_AS_ENCRYPTED(csd->is_encrypted);
+			memcpy(csd->encryption_hash, csd->encryption_hash2, GTMCRYPT_RESERVED_HASH_LEN);
+			memset(csd->encryption_hash2, 0, GTMCRYPT_RESERVED_HASH_LEN);
+			/* A simple copy because gtmcrypt_key_t is a pointer type. */
+			csa->encr_key_handle = csa->encr_key_handle2;
+			csa->encr_key_handle2 = NULL;
+			cnl->reorg_encrypt_cycle++;
+			assert(NULL != csa->encr_ptr);
+			COPY_ENC_INFO(csd, csa->encr_ptr, cnl->reorg_encrypt_cycle;);
+			if (JNL_ENABLED(csd))
+				switch_journal_file(csa, csd);
+			DBG_RECORD_CRYPT_UPDATE(csd, csa, cnl, process_id);
 		}
 		/* We are done (although potentially due to an error or a Ctrl-C), so update file-header fields to store reorg's
 		 * progress before exiting.
@@ -829,7 +843,7 @@ boolean_t wait_for_concurrent_reads(sgmnt_addrs *csa)
 					 cr->blk, cr, blocking_pid, DB_LEN_STR(csa->region));
 				return FALSE;
 			}
-			if ((0 != blocking_pid) && is_proc_alive(blocking_pid, cr->image_count))
+			if ((0 != blocking_pid) && is_proc_alive(blocking_pid, 0))
 			{	/* Kickstart the process taking a long time in case it was suspended */
 				UNIX_ONLY(continue_proc(blocking_pid));
 			}
@@ -877,7 +891,7 @@ void switch_journal_file(sgmnt_addrs *csa, sgmnt_data_ptr_t csd)
 	 */
 	jbp = jpc->jnl_buff;
 	ADJUST_GBL_JREC_TIME(jgbl, jbp);
-	jnl_status = jnl_ensure_open();
+	jnl_status = jnl_ensure_open(gv_cur_region, csa);
 	if (0 == jnl_status)
 	{
 		if (EXIT_ERR == SWITCH_JNL_FILE(jpc))
diff --git a/sr_unix/mupip_restore.c b/sr_unix/mupip_restore.c
index f5103f7..e248c58 100644
--- a/sr_unix/mupip_restore.c
+++ b/sr_unix/mupip_restore.c
@@ -70,6 +70,7 @@
 #include "gtmcrypt.h"
 #include "jnl.h"
 #include "anticipatory_freeze.h"
+#include "db_write_eof_block.h"
 
 GBLDEF	inc_list_struct		in_files;
 GBLREF	uint4			pipe_child;
@@ -103,24 +104,6 @@ error_def(ERR_TEXT);
 	mupip_exit(EXIT_STATUS);					\
 }
 
-CONDITION_HANDLER(iob_io_error)
-{
-	char 	s[80];
-	char 	*fgets_res;
-
-	START_CH(TRUE);
-	if (SIGNAL == ERR_IOEOF)
-	{
-		PRINTF("End of media reached, please mount next volume and press Enter: ");
-		FGETS(s, 79, stdin, fgets_res);
-		util_out_print(0, 2, 0);  /* clear error message */
-		CONTINUE;
-	}
-	PRN_ERROR;
-	UNWIND(NULL, NULL);
-}
-
-
 void mupip_restore(void)
 {
 	static readonly char	label[] =   GDS_LABEL;
@@ -134,17 +117,14 @@ void mupip_restore(void)
 	trans_num		curr_tn;
 	uint4			ii;
 	block_id		blk_num;
-	boolean_t		extend, truncate;
+	boolean_t		extend;
 	uint4			cli_status;
 	BFILE			*in;
 	int			i, db_fd;
-	uint4			old_blk_size, size, old_tot_blks, bplmap, old_bit_maps, new_bit_maps;
+	uint4			old_blk_size, orig_size, size, old_tot_blks, bplmap, old_bit_maps, new_bit_maps;
 	off_t			new_eof, offset;
-#	ifdef GTM_TRUNCATE
 	off_t			new_size;
-#	endif
-	char			buff[DISK_BLOCK_SIZE];
-	char			msg_buffer[1024], *newmap, *newmap_bptr;
+	char			msg_buffer[1024], *newmap;
 	mstr			msg_string;
 	char			addr[SA_MAXLEN + 1];
 	unsigned char		tcp[5];
@@ -166,15 +146,16 @@ void mupip_restore(void)
 	enc_handles		in_encr_handles, old_encr_handles;
 	int4			cur_mdb_ver;
 	gd_segment		*seg;
+	unix_db_info		*udi;
+	sgmnt_data_ptr_t	csd;
 	ZOS_ONLY(int 		realfiletag;)
-	DEBUG_ONLY(unix_db_info	*udi;)
+	DCL_THREADGBL_ACCESS;
 
+	SETUP_THREADGBL_ACCESS;
 	inbuf = NULL;
 	extend = TRUE;
 	if (CLI_NEGATED == (cli_status = cli_present("EXTEND")))
 		extend = FALSE;
-	truncate = FALSE;
-	GTM_TRUNCATE_ONLY(truncate = TRUE;)
 	mu_outofband_setup();
 	mu_gv_cur_reg_init();
 	n_len = SIZEOF(db_name);
@@ -187,8 +168,10 @@ void mupip_restore(void)
 		util_out_print("Error securing stand alone access to output file !AD. Aborting restore.", TRUE, n_len, db_name);
 		mupip_exit(ERR_MUPRESTERR);
 	}
-	DEBUG_ONLY(udi = FILE_INFO(gv_cur_region));
-	OPENFILE(db_name, O_RDWR, db_fd);
+	udi = FILE_INFO(gv_cur_region);
+	seg = gv_cur_region->dyn.addr;
+	OPENFILE_DB(db_name, O_RDWR, udi, seg);
+	db_fd = udi->fd;
 	if (FD_INVALID == db_fd)
 	{
 		save_errno = errno;
@@ -202,7 +185,8 @@ void mupip_restore(void)
 		TAG_POLICY_GTM_PUTMSG(db_name, realfiletag, TAG_BINARY, errno);
 #	endif
 	murgetlst();
-	LSEEKREAD(db_fd, 0, &old_data, SIZEOF(sgmnt_data), save_errno);
+	csd = !udi->fd_opened_with_o_direct ? &old_data : (sgmnt_data_ptr_t)(TREF(dio_buff)).aligned;
+	DB_LSEEKREAD(udi, db_fd, 0, csd, SGMNT_HDR_LEN, save_errno);
 	if (0 != save_errno)
 	{
 		util_out_print("Error accessing output file !AD. Aborting restore.", TRUE, n_len, db_name);
@@ -214,6 +198,8 @@ void mupip_restore(void)
 		} else
 			CLNUP_AND_EXIT(ERR_IOEOF, NULL);
 	}
+	if (udi->fd_opened_with_o_direct)
+		memcpy(&old_data, csd, SGMNT_HDR_LEN);
 	if (memcmp(old_data.label, label, GDS_LABEL_SZ))
 	{
 		util_out_print("Output file !AD has an unrecognizable format", TRUE, n_len, db_name);
@@ -276,7 +262,6 @@ void mupip_restore(void)
 					util_out_print("open : !AZ", TRUE, errptr);
 					CLNUP_AND_EXIT(save_errno, inbuf);
 				}
-				ESTABLISH(iob_io_error);
 				break;
 			case backup_to_exec:
 				pipe_child = 0;
@@ -361,7 +346,6 @@ void mupip_restore(void)
 		}
 		if (!SAME_ENCRYPTION_SETTINGS(&inhead, &old_data))
 		{
-			ASSERT_ENCRYPTION_INITIALIZED;	/* should have been done in mu_rndwn_file (called from STANDALONE) */
 			same_encr_settings = FALSE;
 			INIT_DB_OR_JNL_ENCRYPTION(&in_encr_handles, &inhead, 0, NULL, gtmcrypt_errno);
 			if (0 != gtmcrypt_errno)
@@ -369,7 +353,6 @@ void mupip_restore(void)
 				GTMCRYPT_REPORT_ERROR(gtmcrypt_errno, gtm_putmsg, ptr->input_file.len, ptr->input_file.addr);
 				CLNUP_AND_EXIT(ERR_MUPRESTERR, inbuf);
 			}
-			seg = gv_cur_region->dyn.addr;
 			INIT_DB_OR_JNL_ENCRYPTION(&old_encr_handles, &old_data, seg->fname_len, seg->fname, gtmcrypt_errno);
 			if (0 != gtmcrypt_errno)
 			{
@@ -400,15 +383,14 @@ void mupip_restore(void)
 		new_bit_maps = DIVIDE_ROUND_UP(inhead.db_total_blks, bplmap);
 		if (old_tot_blks != inhead.db_total_blks)
 		{
-			if (old_tot_blks > inhead.db_total_blks && truncate)
+			if (old_tot_blks > inhead.db_total_blks)
 			{
 				/* Truncate occurred between incremental backups. FTRUNCATE the db file to the appropriate size,
-				 * write the EOF block. */
-				new_eof = ((off_t)(old_start_vbn - 1) * DISK_BLOCK_SIZE)
-						+ ((off_t)inhead.db_total_blks * old_blk_size);
-				new_size = new_eof + DISK_BLOCK_SIZE;
-				memset(buff, 0, DISK_BLOCK_SIZE);
-				DB_LSEEKWRITE(NULL, NULL, db_fd, new_eof, buff, DISK_BLOCK_SIZE, status);
+				 * write the EOF block.
+				 */
+				new_eof = (off_t)BLK_ZERO_OFF(old_start_vbn) + ((off_t)inhead.db_total_blks * old_blk_size);
+				new_size = new_eof + old_blk_size;
+				status = db_write_eof_block(udi, db_fd, old_blk_size, new_eof, &(TREF(dio_buff)));
 				if (0 != status)
 				{
 					util_out_print("Aborting restore!/", TRUE);
@@ -456,10 +438,8 @@ void mupip_restore(void)
 				 * a GDSVCURR format block is the only one that can be added to the database without affecting
 				 * the blks_to_upgrd counter.
 				 */
-				new_eof = ((off_t)(old_start_vbn - 1) * DISK_BLOCK_SIZE)
-						+ ((off_t)inhead.db_total_blks * old_blk_size);
-				memset(buff, 0, DISK_BLOCK_SIZE);
-				DB_LSEEKWRITE(NULL, NULL, db_fd, new_eof, buff, DISK_BLOCK_SIZE, status);
+				new_eof = (off_t)BLK_ZERO_OFF(old_start_vbn) + ((off_t)inhead.db_total_blks * old_blk_size);
+				status = db_write_eof_block(udi, db_fd, old_blk_size, new_eof, &(TREF(dio_buff)));
 				if (0 != status)
 				{
 					util_out_print("Aborting restore!/", TRUE);
@@ -475,19 +455,18 @@ void mupip_restore(void)
 				}
 				/* --- initialize all new bitmaps, just in case they are not touched later --- */
 				if (new_bit_maps > old_bit_maps)
-				{	/* -- similar logic exist in bml_newmap.c, which need to pick up any new updates here -- */
-					newmap = (char *)malloc(old_blk_size);
-					((blk_hdr *)newmap)->bver = GDSVCURR;
-					((blk_hdr *)newmap)->bsiz = (unsigned int)(BM_SIZE(bplmap));
-					((blk_hdr *)newmap)->levl = LCL_MAP_LEVL;
-					((blk_hdr *)newmap)->tn = curr_tn;
-					newmap_bptr = newmap + SIZEOF(blk_hdr);
-					*newmap_bptr++ = THREE_BLKS_FREE;
-					memset(newmap_bptr, FOUR_BLKS_FREE, BM_SIZE(bplmap) - SIZEOF(blk_hdr) - 1);
+				{
+					if (udi->fd_opened_with_o_direct)
+					{	/* Align buffers for O_DIRECT */
+						DIO_BUFF_EXPAND_IF_NEEDED(udi, old_blk_size, &(TREF(dio_buff)));
+						newmap = (TREF(dio_buff)).aligned;
+					} else
+						newmap = (char *)malloc(old_blk_size);
+					bml_newmap((blk_hdr_ptr_t)newmap, BM_SIZE(bplmap), curr_tn);
 					for (ii = ROUND_UP(old_tot_blks, bplmap); ii < inhead.db_total_blks; ii += bplmap)
 					{
-						new_eof = (off_t)(old_start_vbn - 1) * DISK_BLOCK_SIZE + (off_t)ii * old_blk_size;
-						DB_LSEEKWRITE(NULL, NULL, db_fd, new_eof, newmap, old_blk_size, status);
+						offset = (off_t)BLK_ZERO_OFF(old_start_vbn) + (off_t)ii * old_blk_size;
+						DB_LSEEKWRITE(NULL, udi, NULL, db_fd, offset, newmap, old_blk_size, status);
 						if (0 != status)
 						{
 							util_out_print("Aborting restore!/", TRUE);
@@ -497,7 +476,8 @@ void mupip_restore(void)
 							CLNUP_AND_EXIT(ERR_MUPRESTERR, inbuf);
 						}
 					}
-					free(newmap);
+					if (!udi->fd_opened_with_o_direct)
+						free(newmap);
 				}
 				old_tot_blks = inhead.db_total_blks;
 				old_bit_maps = new_bit_maps;
@@ -528,10 +508,8 @@ void mupip_restore(void)
 			blk_num = sblkh_p->blkid;
 			/* Between incremental backups, an extend followed by a truncate could have occurred. The block below
 			 * would have been truncated, so no need to write it. */
-			GTM_TRUNCATE_ONLY(
-				if (blk_num >= old_tot_blks) /* Should be a bitmap block */
-					continue;
-			)
+			if (blk_num >= old_tot_blks) /* Should be a bitmap block */
+				continue;
 			/* For blocks that were read during the main backup phase of stream backup, the blocks are
 			   recorded without version (there may even be some garbage blocks in the stream of
 			   indeterminate/invalid format if a bitmap was written out prior to the data blocks that
@@ -598,8 +576,17 @@ void mupip_restore(void)
 					}
 				}
 			}
-			offset = (old_start_vbn - 1) * DISK_BLOCK_SIZE + ((off_t)old_blk_size * blk_num);
-			DB_LSEEKWRITE(NULL, NULL, db_fd, offset, blk_ptr, size, save_errno);
+			offset = (off_t)BLK_ZERO_OFF(old_start_vbn) + (off_t)blk_num * old_blk_size;
+			if (udi->fd_opened_with_o_direct)
+			{	/* Align buffers for O_DIRECT */
+				assert(size <= old_blk_size);
+				DIO_BUFF_EXPAND_IF_NEEDED(udi, old_blk_size, &(TREF(dio_buff)));
+				memcpy((TREF(dio_buff)).aligned, blk_ptr, size);
+				memset((TREF(dio_buff)).aligned + size, 0, old_blk_size - size);
+				blk_ptr = (char *)(TREF(dio_buff)).aligned;
+				size = old_blk_size;
+			}
+			DB_LSEEKWRITE(NULL, udi, NULL, db_fd, offset, blk_ptr, size, save_errno);
 			if (0 != save_errno)
 			{
 				util_out_print("Error accessing output file !AD. Aborting restore.", TRUE, n_len, db_name);
@@ -610,10 +597,10 @@ void mupip_restore(void)
 		}
 		/* Next section is the file header which we need to restore */
 		COMMON_READ(in, &rsize, SIZEOF(rsize), inbuf);
-		assert((SIZEOF(sgmnt_data) + SIZEOF(int4)) == rsize);
+		assert((SGMNT_HDR_LEN + SIZEOF(int4)) == rsize);
 		COMMON_READ(in, inbuf, rsize, inbuf);
 		((sgmnt_data_ptr_t)inbuf)->start_vbn = old_start_vbn;
-		((sgmnt_data_ptr_t)inbuf)->free_space = (uint4)(((old_start_vbn - 1) * DISK_BLOCK_SIZE) - SIZEOF_FILE_HDR(inbuf));
+		((sgmnt_data_ptr_t)inbuf)->free_space = (uint4)(BLK_ZERO_OFF(old_start_vbn) - SIZEOF_FILE_HDR(inbuf));
 		GTMCRYPT_COPY_ENCRYPT_SETTINGS(&old_data, ((sgmnt_data_ptr_t)inbuf));
 		assert((udi->semid == old_data.semid) && (udi->gt_sem_ctime == old_data.gt_sem_ctime.ctime)
 			&& (udi->shmid == old_data.shmid) && (udi->gt_shm_ctime == old_data.gt_shm_ctime.ctime));
@@ -623,15 +610,21 @@ void mupip_restore(void)
 		 * db_ipcs_reset). So, before writing the new file header, set the semid/shmid (and ctime fields) to the semid and
 		 * shmid fields that is currently valid in the system (when we did the mu_rndwn_file).
 		 */
-		((sgmnt_data_ptr_t)inbuf)->semid = old_data.semid;
-		((sgmnt_data_ptr_t)inbuf)->gt_sem_ctime.ctime = old_data.gt_sem_ctime.ctime;
-		((sgmnt_data_ptr_t)inbuf)->shmid = old_data.shmid;
-		((sgmnt_data_ptr_t)inbuf)->gt_shm_ctime.ctime = old_data.gt_shm_ctime.ctime;
-		DB_LSEEKWRITE(NULL, NULL, db_fd, 0, inbuf, rsize - SIZEOF(int4), save_errno);
+		csd = (sgmnt_data_ptr_t)inbuf;
+		csd->semid = old_data.semid;
+		csd->gt_sem_ctime.ctime = old_data.gt_sem_ctime.ctime;
+		csd->shmid = old_data.shmid;
+		csd->gt_shm_ctime.ctime = old_data.gt_shm_ctime.ctime;
+		if (udi->fd_opened_with_o_direct)
+		{	/* Align buffers for O_DIRECT */
+			DIO_BUFF_EXPAND_IF_NEEDED(udi, SGMNT_HDR_LEN, &(TREF(dio_buff)));
+			memcpy((TREF(dio_buff)).aligned, csd, SGMNT_HDR_LEN);
+			csd = (sgmnt_data_ptr_t)(TREF(dio_buff)).aligned;
+		}
+		DB_LSEEKWRITE(NULL, udi, NULL, db_fd, 0, csd, SGMNT_HDR_LEN, save_errno);
 		if (0 != save_errno)
 		{
-			util_out_print("Error accessing output file !AD. Aborting restore.",
-				       TRUE, n_len, db_name);
+			util_out_print("Error accessing output file !AD. Aborting restore.", TRUE, n_len, db_name);
 			errptr = (char *)STRERROR(save_errno);
 			util_out_print("write : !AZ", TRUE, errptr);
 			CLNUP_AND_EXIT(save_errno, inbuf);
@@ -641,13 +634,11 @@ void mupip_restore(void)
 		COMMON_READ(in, inbuf, rsize, inbuf);
 		if (0 != MEMCMP_LIT(inbuf, HDR_MSG))
 		{
-			util_out_print("Unexpected backup format error restoring !AD. Aborting restore.",
-				       TRUE, n_len, db_name);
+			util_out_print("Unexpected backup format error restoring !AD. Aborting restore.", TRUE, n_len, db_name);
 			errptr = (char *)STRERROR(save_errno);
 			util_out_print("write : !AZ", TRUE, errptr);
 			CLNUP_AND_EXIT(save_errno, inbuf);
 		}
-
 		GET_LONG(temp, (inbuf + rsize - SIZEOF(int4)));
 		rsize = temp;
 		offset = (MM_BLOCK - 1) * DISK_BLOCK_SIZE;
@@ -657,11 +648,17 @@ void mupip_restore(void)
 			COMMON_READ(in, inbuf, rsize, inbuf);
 			if (!MEMCMP_LIT(inbuf, MAP_MSG))
 				break;
-			DB_LSEEKWRITE(NULL, NULL, db_fd,
-				   offset,
-				   inbuf,
-				   rsize - SIZEOF(int4),
-				   save_errno);
+			size = rsize - SIZEOF(int4);
+			if (udi->fd_opened_with_o_direct)
+			{	/* Align buffers for O_DIRECT */
+				orig_size = size;
+				size = ROUND_UP2(orig_size, DIO_ALIGNSIZE(udi));
+				DIO_BUFF_EXPAND_IF_NEEDED(udi, size, &(TREF(dio_buff)));
+				memcpy((TREF(dio_buff)).aligned, inbuf, orig_size);
+				p = (char *)(TREF(dio_buff)).aligned;
+			} else
+				p = (char *)inbuf;
+			DB_LSEEKWRITE(NULL, udi, NULL, db_fd, offset, p, size, save_errno);
 			if (0 != save_errno)
 			{
 				util_out_print("Error accessing output file !AD. Aborting restore.",
@@ -670,15 +667,14 @@ void mupip_restore(void)
 				util_out_print("write : !AZ", TRUE, errptr);
 				CLNUP_AND_EXIT(save_errno, inbuf);
 			}
-			offset += rsize - SIZEOF(int4);
-			GET_LONG(temp, (inbuf + rsize - SIZEOF(int4)));
+			offset += size;
+			GET_LONG(temp, inbuf + size);
 			rsize = temp;
 		}
 		curr_tn = inhead.end_tn;
 		switch (type)
 		{
 			case backup_to_file:
-				REVERT;
 				iob_close(in);
 				break;
 			case backup_to_exec:
diff --git a/sr_unix/mupip_rundown.c b/sr_unix/mupip_rundown.c
index 4e286af..2d92d42 100755
--- a/sr_unix/mupip_rundown.c
+++ b/sr_unix/mupip_rundown.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -92,12 +92,14 @@ void mupip_rundown(void)
 	replpool_identifier	replpool_id;
 	repl_inst_hdr		repl_instance;
 	unix_db_info		*udi;
+	sgmnt_addrs		*csa;
 	struct shmid_ds		shm_buf;
 	union semun		semarg;
 	unsigned int		full_len;
 	char			*instfilename;
 	unsigned char		ipcs_buff[MAX_IPCS_ID_BUF], *ipcs_ptr;
 	semid_queue_elem	*prev_elem;
+	gd_segment		*seg;
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
@@ -105,6 +107,10 @@ void mupip_rundown(void)
 	file = (CLI_PRESENT == cli_present("FILE"));
 	region = (CLI_PRESENT == cli_present("REGION")) || (CLI_PRESENT == cli_present("R"));
 	TREF(skip_file_corrupt_check) = TRUE;	/* rundown the database even if csd->file_corrupt is TRUE */
+	TREF(ok_to_see_statsdb_regs) = TRUE;
+	/* No need to do the following set (like is done in mupip_integ.c) since we call "mu_rndwn_file" (not "gvcst_init")
+	 *	TREF(statshare_opted_in) = FALSE;	// Do not open statsdb automatically when basedb is opened
+	 */
 	arg_present = (0 != TREF(parms_cnt));
 	if ((file == region) && (TRUE == file))
 		mupip_exit(ERR_MUQUALINCOMP);
@@ -123,10 +129,11 @@ void mupip_rundown(void)
 	} else if (file)
 	{
 		mu_gv_cur_reg_init();
-		gv_cur_region->dyn.addr->fname_len = SIZEOF(gv_cur_region->dyn.addr->fname);
-		if (!cli_get_str("WHAT",  (char *)&gv_cur_region->dyn.addr->fname[0], &gv_cur_region->dyn.addr->fname_len))
+		seg = gv_cur_region->dyn.addr;
+		seg->fname_len = SIZEOF(seg->fname);
+		if (!cli_get_str("WHAT",  (char *)&seg->fname[0], &seg->fname_len))
 			mupip_exit(ERR_MUNODBNAME);
-		*(gv_cur_region->dyn.addr->fname + gv_cur_region->dyn.addr->fname_len) = 0;
+		seg->fname[seg->fname_len] = '\0';
 		rptr = &single;		/* a dummy value that permits one trip through the loop */
 		rptr->fPtr = NULL;
 	}
@@ -178,26 +185,21 @@ void mupip_rundown(void)
 		{
 			if (region)
 			{
-				if (!mupfndfil(rptr->reg, NULL))
+				if (!mupfndfil(rptr->reg, NULL, LOG_ERROR_TRUE))
 				{
 					exit_status = ERR_MUNOTALLSEC;
 					continue;
 				}
 				gv_cur_region = rptr->reg;
-				if (NULL == gv_cur_region->dyn.addr->file_cntl)
-				{
-					gv_cur_region->dyn.addr->acc_meth = dba_bg;
-					gv_cur_region->dyn.addr->file_cntl =
-						(file_control *)malloc(SIZEOF(*gv_cur_region->dyn.addr->file_cntl));
-					memset(gv_cur_region->dyn.addr->file_cntl, 0, SIZEOF(*gv_cur_region->dyn.addr->file_cntl));
-					gv_cur_region->dyn.addr->file_cntl->file_type = dba_bg;
-					gv_cur_region->dyn.addr->file_cntl->file_info = (GDS_INFO *)malloc(SIZEOF(GDS_INFO));
-					memset(gv_cur_region->dyn.addr->file_cntl->file_info, 0, SIZEOF(GDS_INFO));
-				}
+				seg = gv_cur_region->dyn.addr;
+				if (NULL == seg->file_cntl)
+					FILE_CNTL_INIT(seg);
 			}
-			if (TRUE == mu_rndwn_file(gv_cur_region, FALSE))
-				gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_MUFILRNDWNSUC, 2, DB_LEN_STR(gv_cur_region));
-			else
+			if (mu_rndwn_file(gv_cur_region, FALSE))
+			{
+				if (!IS_RDBF_STATSDB(gv_cur_region))	/* See comment in "mu_rndwn_all" for why this is needed */
+					gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_MUFILRNDWNSUC, 2, DB_LEN_STR(gv_cur_region));
+			} else
 				exit_status = ERR_MUNOTALLSEC;
 		}
 		if (do_jnlpool_detach)
@@ -327,7 +329,7 @@ void mupip_rundown(void)
 		 * We have noticed that on HPUX, a call to "fflush NULL" (done inside gtm_putmsg which is called from
 		 * the above two functions at various places) causes unread (but buffered) data from the input stream
 		 * to be cleared/consumed resulting in incomplete processing of the input list of ipcs. To avoid this
-		 * we set this global variable. That causes gtm_putmsg to skip the fflush NULL. We dont have an issue
+		 * we set this global variable. That causes gtm_putmsg to skip the fflush NULL. We don't have an issue
 		 * with out-of-order mixing of stdout and stderr streams (like is there with replication server logfiles)
 		 * and so it is okay for this global variable to be set to TRUE for the entire lifetime of the argumentless
 		 * rundown command. See <C9J02_003091_mu_rndwn_all_premature_termination_on_HPUX>.
diff --git a/sr_unix/mupip_set_file.c b/sr_unix/mupip_set_file.c
old mode 100755
new mode 100644
index 78e6ad3..167cde8
--- a/sr_unix/mupip_set_file.c
+++ b/sr_unix/mupip_set_file.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -60,6 +60,8 @@
 #include "gtmmsg.h"		/* for gtm_putmsg prototype */
 #include "gtmcrypt.h"
 #include "anticipatory_freeze.h"
+#include "get_fs_block_size.h"
+#include "interlock.h"
 
 GBLREF	bool			in_backup;
 GBLREF	bool			region;
@@ -70,8 +72,10 @@ GBLREF	tp_region		*grlist;
 
 LITREF char			*gtm_dbversion_table[];
 
-ZOS_ONLY(error_def(ERR_BADTAG);)
+error_def(ERR_ASYNCIONOV4);
+error_def(ERR_ASYNCIONOMM);
 error_def(ERR_CRYPTNOMM);
+error_def(ERR_DBBLKSIZEALIGN);
 error_def(ERR_DBFILOPERR);
 error_def(ERR_DBPREMATEOF);
 error_def(ERR_DBRDERR);
@@ -83,6 +87,7 @@ error_def(ERR_MUPIPSET2SML);
 error_def(ERR_MUREENCRYPTV4NOALLOW);
 error_def(ERR_NODFRALLOCSUPP);
 error_def(ERR_NOUSERDB);
+error_def(ERR_OFRZACTIVE);
 error_def(ERR_SETQUALPROB);
 error_def(ERR_TEXT);
 error_def(ERR_WCERRNOTCHG);
@@ -101,24 +106,24 @@ MBSTART {									\
 
 int4 mupip_set_file(int db_fn_len, char *db_fn)
 {
-	boolean_t		bypass_partial_recov, got_standalone, need_standalone = FALSE;
+	boolean_t		bypass_partial_recov, got_standalone, need_standalone = FALSE, acc_meth_changing;
 	char			acc_spec[MAX_ACC_METH_LEN], *command = "MUPIP SET VERSION", *errptr, exit_stat, *fn,
 				ver_spec[MAX_DB_VER_LEN];
 	enum db_acc_method	access, access_new;
 	enum db_ver		desired_dbver;
 	gd_region		*temp_cur_region;
-	int			defer_allocate_status, defer_status, disk_wait_status, encryptable_status,
+	int			asyncio_status, defer_allocate_status, defer_status, disk_wait_status, encryptable_status,
 				encryption_complete_status, epoch_taper_status, extn_count_status,
-				fd, fn_len, glbl_buff_status, inst_freeze_on_error_status, key_size_status,
+				fd, fn_len, glbl_buff_status, inst_freeze_on_error_status, key_size_status, locksharesdbcrit,
 				lock_space_status, mutex_space_status, qdbrundown_status, rec_size_status, reg_exit_stat, rc,
-				rsrvd_bytes_status, sleep_cnt_status, save_errno, status, status1;
+				rsrvd_bytes_status, sleep_cnt_status, save_errno, stats_status, status, status1;
 	int4			defer_time, new_cache_size, new_disk_wait, new_extn_count, new_key_size, new_lock_space,
 				new_mutex_space, new_rec_size, new_sleep_cnt, new_spin_sleep, reserved_bytes, spin_sleep_status;
-	sgmnt_addrs		*csa;
 	sgmnt_data_ptr_t	csd, pvt_csd;
 	tp_region		*rptr, single;
-	unix_db_info		*udi;
 	unsigned short		acc_spec_len = MAX_ACC_METH_LEN, ver_spec_len = MAX_DB_VER_LEN;
+	gd_segment		*seg;
+	uint4			fsb_size, reservedDBFlags;
 	ZOS_ONLY(int 		realfiletag;)
 	DCL_THREADGBL_ACCESS;
 
@@ -150,6 +155,8 @@ int4 mupip_set_file(int db_fn_len, char *db_fn)
 	} else
 		access = n_dba;		/* really want to keep current method,
 					    which has not yet been read */
+	if (asyncio_status = cli_present("ASYNCIO"))
+		need_standalone = TRUE;
 	defer_allocate_status = cli_present("DEFER_ALLOCATE");
 	if (encryptable_status = cli_present("ENCRYPTABLE"))
 		need_standalone = TRUE;
@@ -219,6 +226,8 @@ int4 mupip_set_file(int db_fn_len, char *db_fn)
 		}
 		need_standalone = TRUE;
 	}
+	if (locksharesdbcrit = cli_present("LCK_SHARES_DB_CRIT"))
+		need_standalone = TRUE;
 	if (lock_space_status = cli_present("LOCK_SPACE"))
 	{
 		if (cli_get_int("LOCK_SPACE", &new_lock_space))
@@ -331,6 +340,8 @@ int4 mupip_set_file(int db_fn_len, char *db_fn)
 			exit_stat |= EXIT_ERR;
 		}
 	}
+	if (stats_status = cli_present("STATS"))
+		need_standalone = TRUE;
 	if (cli_present("VERSION"))
 	{
 		cli_get_str("VERSION", ver_spec, &ver_spec_len);
@@ -383,7 +394,7 @@ int4 mupip_set_file(int db_fn_len, char *db_fn)
 				exit_stat |= EXIT_WRN;
 				continue;
 			}
-			if (!mupfndfil(rptr->reg, NULL))
+			if (!mupfndfil(rptr->reg, NULL, LOG_ERROR_TRUE))
 				continue;
 			fn = (char *)rptr->reg->dyn.addr->fname;
 			fn_len = rptr->reg->dyn.addr->fname_len;
@@ -395,45 +406,64 @@ int4 mupip_set_file(int db_fn_len, char *db_fn)
 		mu_gv_cur_reg_init();
 		memcpy(gv_cur_region->dyn.addr->fname, fn, fn_len);
 		gv_cur_region->dyn.addr->fname_len = fn_len;
+		acc_meth_changing = FALSE;
 		if (need_standalone)
 		{	/* Following part needs standalone access */
 			got_standalone = STANDALONE(gv_cur_region);
 			if (FALSE == got_standalone)
 			{
 				exit_stat |= EXIT_WRN;
+				mu_gv_cur_reg_free();
 				continue;
 			}
 			/* we should open it (for changing) after mu_rndwn_file, since mu_rndwn_file changes the file header too */
-			if (FD_INVALID == (fd = OPEN(fn, O_RDWR)))
+			if (FD_INVALID == (fd = OPEN(fn, O_RDWR)))	/* udi not available so OPENFILE_DB not used */
 			{
 				save_errno = errno;
 				gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(5) ERR_DBFILOPERR, 2, LEN_AND_STR(fn), save_errno);
 				DO_CLNUP_AND_SET_EXIT_STAT(exit_stat, EXIT_ERR);
 				continue;
 			}
-#ifdef __MVS__
+#			ifdef __MVS__
 			if (-1 == gtm_zos_tag_to_policy(fd, TAG_BINARY, &realfiletag))
 				TAG_POLICY_GTM_PUTMSG(fn, realfiletag, TAG_BINARY, errno);
-#endif
+#			endif
 			LSEEKREAD(fd, 0, pvt_csd, SIZEOF(sgmnt_data), status);
 			if (0 != status)
 			{
 				save_errno = errno;
 				gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(5) ERR_DBFILOPERR, 2, LEN_AND_STR(fn), save_errno);
 				if (-1 != status)
-					gtm_putmsg_csa(CSA_ARG(cs_addrs) VARLSTCNT(4) ERR_DBRDERR, 2, fn_len, fn);
+					gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_DBRDERR, 2, fn_len, fn);
 				else
-					gtm_putmsg_csa(CSA_ARG(cs_addrs) VARLSTCNT(4) ERR_DBPREMATEOF, 2, fn_len, fn);
+					gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_DBPREMATEOF, 2, fn_len, fn);
 				DO_CLNUP_AND_SET_EXIT_STAT(exit_stat, EXIT_ERR);
 				continue;
 			}
 			if ((n_dba != access) && (pvt_csd->acc_meth != access))	/* n_dba is a proxy for no change */
 			{
-				if ((dba_mm == access) && USES_ENCRYPTION(pvt_csd->is_encrypted))
+				acc_meth_changing = TRUE;
+				if (dba_mm == access)
 				{
-					gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_CRYPTNOMM, 2, DB_LEN_STR(gv_cur_region));
-					DO_CLNUP_AND_SET_EXIT_STAT(exit_stat, EXIT_ERR);
-					continue;
+					if (USES_ENCRYPTION(pvt_csd->is_encrypted))
+					{
+						gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_CRYPTNOMM, 2,
+											DB_LEN_STR(gv_cur_region));
+						DO_CLNUP_AND_SET_EXIT_STAT(exit_stat, EXIT_ERR);
+						continue;
+					}
+					if (pvt_csd->asyncio && (CLI_NEGATED != asyncio_status))
+					{	/* ASYNCIO=ON */
+						gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(8) ERR_ASYNCIONOMM, 6,
+							DB_LEN_STR(gv_cur_region), LEN_AND_LIT(" has ASYNCIO enabled;"),
+							LEN_AND_LIT("enable MM"));
+					} else if (!pvt_csd->asyncio && (CLI_PRESENT == asyncio_status))
+					{
+						gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(8) ERR_ASYNCIONOMM, 6,
+							DB_LEN_STR(gv_cur_region), LEN_AND_LIT(";"),
+							LEN_AND_LIT("enable MM and ASYNCIO at the same time"));
+						reg_exit_stat |= EXIT_WRN;
+					}
 				}
 				if (dba_mm == access)
 					pvt_csd->defer_time = 1;			/* defer defaults to 1 */
@@ -549,12 +579,14 @@ int4 mupip_set_file(int db_fn_len, char *db_fn)
 				}
 				pvt_csd->max_key_size = new_key_size;
 			}
+			if (locksharesdbcrit)
+				pvt_csd->lock_crit_with_db = CLI_PRESENT == locksharesdbcrit;
 			if (lock_space_status)
 				pvt_csd->lock_space_size = (uint4)new_lock_space * OS_PAGELET_SIZE;
 			if (mutex_space_status)
 				NUM_CRIT_ENTRY(pvt_csd) = new_mutex_space;
 			if (qdbrundown_status)
-				pvt_csd->mumps_can_bypass = CLI_PRESENT == qdbrundown_status;
+				pvt_csd->mumps_can_bypass = (CLI_PRESENT == qdbrundown_status);
 			if (rec_size_status)
 			{
 				if (pvt_csd->max_rec_size > new_rec_size)
@@ -575,6 +607,13 @@ int4 mupip_set_file(int db_fn_len, char *db_fn)
 				}
 				pvt_csd->reserved_bytes = reserved_bytes;
 			}
+			if (stats_status)
+			{
+				reservedDBFlags = pvt_csd->reservedDBFlags & ~RDBF_NOSTATS;
+				if (CLI_NEGATED == stats_status)
+					reservedDBFlags |= RDBF_NOSTATS;
+				pvt_csd->reservedDBFlags = reservedDBFlags;
+			}
 			if (EXIT_NRM != reg_exit_stat)
 			{
 				DO_CLNUP_AND_SET_EXIT_STAT(exit_stat, reg_exit_stat);
@@ -584,19 +623,45 @@ int4 mupip_set_file(int db_fn_len, char *db_fn)
 		} else /* if (!need_standalone) */
 		{
 			got_standalone = FALSE;
+			if (region)
+			{	/* We have a region from a gld file. Find out asyncio setting from there. And copy that
+				 * over to the dummy region we created. This is to avoid DBGLDMISMATCH errors inside "gvcst_init".
+				 */
+				COPY_AIO_SETTINGS(gv_cur_region->dyn.addr, rptr->reg->dyn.addr); /* copies from rptr->reg->dyn.addr
+												  * to gv_cur_region->dyn.addr
+												  */
+			} else
+			{	/* We do not have a region from a gld file. All we have is the name of the db file.
+				 * "db_init" (invoked by "gvcst_init") takes care of initializing the "asyncio" field
+				 * as appropriate.
+				 */
+			}
 			gvcst_init(gv_cur_region);
 			change_reg();	/* sets cs_addrs and cs_data */
 			if (gv_cur_region->read_only)
 			{
 				gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_DBRDONLY, 2, DB_LEN_STR(gv_cur_region));
 				exit_stat |= EXIT_ERR;
-				gds_rundown();
+				gds_rundown(CLEANUP_UDI_TRUE);
 				mu_gv_cur_reg_free();
 				continue;
 			}
 			csd = cs_data;
 			assert(!cs_addrs->hold_onto_crit); /* this ensures we can safely do unconditional grab_crit and rel_crit */
 			grab_crit(gv_cur_region);
+			if (FROZEN_CHILLED(cs_data))
+			{
+				DO_CHILLED_AUTORELEASE(cs_addrs, cs_data);
+				if (FROZEN_CHILLED(cs_data))
+				{
+					gtm_putmsg_csa(CSA_ARG(cs_addrs) VARLSTCNT(4) ERR_OFRZACTIVE, 2,
+								DB_LEN_STR(gv_cur_region));
+					exit_stat |= EXIT_WRN;
+					exit_stat |= gds_rundown(CLEANUP_UDI_TRUE);
+					mu_gv_cur_reg_free();
+					continue;
+				}
+			}
 		}
 		access_new = (n_dba == access ? csd->acc_meth : access);
 		if (GDSVLAST != desired_dbver)
@@ -630,8 +695,35 @@ int4 mupip_set_file(int db_fn_len, char *db_fn)
 				reg_exit_stat |= EXIT_WRN;
 			}
 		}
+		if (asyncio_status && (CLI_PRESENT == asyncio_status))
+		{
+			if (!csd->fully_upgraded)
+			{
+				gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(8) ERR_ASYNCIONOV4, 6, DB_LEN_STR(gv_cur_region),
+					LEN_AND_LIT("V4 format"), LEN_AND_LIT("enable ASYNCIO"));
+				reg_exit_stat |= EXIT_WRN;
+			}
+			if (!acc_meth_changing && (dba_bg != access_new))
+			{
+				gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(8) ERR_ASYNCIONOMM, 6, DB_LEN_STR(gv_cur_region),
+					LEN_AND_LIT(" has MM access method;"), LEN_AND_LIT("enable ASYNCIO"));
+				reg_exit_stat |= EXIT_WRN;
+			}
+			seg = gv_cur_region->dyn.addr;
+			/* AIO = ON, implies we need to use O_DIRECT. Check for db vs fs blksize alignment issues. */
+			fsb_size = get_fs_block_size(got_standalone ? fd : FILE_INFO(gv_cur_region)->fd);
+			if (0 != (csd->blk_size % fsb_size))
+			{
+				gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_DBBLKSIZEALIGN, 4,
+							DB_LEN_STR(gv_cur_region), csd->blk_size, fsb_size);
+				reg_exit_stat |= EXIT_WRN;
+			}
+		}
 		if (EXIT_NRM == reg_exit_stat)
 		{
+			if (n_dba != access)
+				util_out_print("Database file !AD now has !AD access method", TRUE,
+					       fn_len, fn, 2, ((dba_bg == csd->acc_meth) ? "BG" : "MM"));
 			if (defer_allocate_status)
 			{
 #				if defined(__sun) || defined(__hpux)
@@ -646,7 +738,9 @@ int4 mupip_set_file(int db_fn_len, char *db_fn)
 			if (disk_wait_status)
 				csd->wait_disk_space = new_disk_wait;
 			if (epoch_taper_status)
-				csd->epoch_taper = CLI_PRESENT == epoch_taper_status;
+				csd->epoch_taper = (CLI_PRESENT == epoch_taper_status);
+			if (asyncio_status)
+				csd->asyncio = (CLI_PRESENT == asyncio_status);
 			if (extn_count_status)
 				csd->extension_size = (uint4)new_extn_count;
 			change_fhead_timer("FLUSH_TIME", csd->flush_time,
@@ -661,6 +755,15 @@ int4 mupip_set_file(int db_fn_len, char *db_fn)
 			if (spin_sleep_status)
 				SPIN_SLEEP_MASK(csd) = new_spin_sleep;
 			/* --------------------- report results ------------------------- */
+			if (asyncio_status)
+			{
+				if (csd->asyncio)
+					util_out_print("Database file !AD now has asyncio !AD", TRUE,
+						       fn_len, fn, LEN_AND_LIT("enabled"));
+				else
+					util_out_print("Database file !AD now has asyncio !AD", TRUE,
+						       fn_len, fn, LEN_AND_LIT("disabled"));
+			}
 			if (disk_wait_status)
 				util_out_print("Database file !AD now has wait disk set to !UL seconds",
 					TRUE, fn_len, fn, csd->wait_disk_space);
@@ -686,7 +789,7 @@ int4 mupip_set_file(int db_fn_len, char *db_fn)
 					TRUE, fn_len, fn, SPIN_SLEEP_MASK(csd));
 			if (got_standalone)
 			{
-				DB_LSEEKWRITE(NULL, NULL, fd, 0, pvt_csd, SIZEOF(sgmnt_data), status);
+				DB_LSEEKWRITE(NULL, ((unix_db_info *)NULL), NULL, fd, 0, pvt_csd, SIZEOF(sgmnt_data), status);
 				if (0 != status)
 				{
 					save_errno = errno;
@@ -694,7 +797,7 @@ int4 mupip_set_file(int db_fn_len, char *db_fn)
 					util_out_print("write : !AZ", TRUE, errptr);
 					util_out_print("Error writing header of file", TRUE);
 					util_out_print("Database file !AD not changed: ", TRUE, fn_len, fn);
-					rts_error_csa(CSA_ARG(cs_addrs) VARLSTCNT(4) ERR_DBRDERR, 2, fn_len, fn);
+					rts_error_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_DBRDERR, 2, fn_len, fn);
 				}
 				if (defer_status && (dba_mm == pvt_csd->acc_meth))
 					util_out_print("Database file !AD now has defer_time set to !SL",
@@ -709,6 +812,9 @@ int4 mupip_set_file(int db_fn_len, char *db_fn)
 					util_out_print("Database file !AD now has encryptable flag set to !AD", TRUE,
 							fn_len, fn, 5,
 							(TO_BE_ENCRYPTED(pvt_csd->is_encrypted) ? " TRUE" : "FALSE"));
+				if (locksharesdbcrit)
+					util_out_print("Database file !AD now has LOCK sharing crit with DB !AD", TRUE,
+							fn_len, fn, 5, (pvt_csd->lock_crit_with_db ? " TRUE" : "FALSE"));
 				if (lock_space_status)
 					util_out_print("Database file !AD now has lock space !UL pages",
 							TRUE, fn_len, fn, pvt_csd->lock_space_size/OS_PAGELET_SIZE);
@@ -724,6 +830,9 @@ int4 mupip_set_file(int db_fn_len, char *db_fn)
 				if (rsrvd_bytes_status)
 					util_out_print("Database file !AD now has !UL reserved bytes",
 							TRUE, fn_len, fn, pvt_csd->reserved_bytes);
+				if (stats_status)
+					util_out_print("Database file !AD now has sharing of gvstats set to !AD", TRUE,
+						       fn_len, fn, 5, (CLI_PRESENT == stats_status) ? " TRUE" : "FALSE");
 			} else
 				wcs_flu(WCSFLU_FLUSH_HDR);
 		} else
@@ -735,9 +844,9 @@ int4 mupip_set_file(int db_fn_len, char *db_fn)
 		} else
 		{
 			rel_crit(gv_cur_region);
-			exit_stat |=gds_rundown();
-			mu_gv_cur_reg_free();
+			exit_stat |= gds_rundown(CLEANUP_UDI_TRUE);
 		}
+		mu_gv_cur_reg_free();
 	}
 	free(pvt_csd);
 	assert(!(exit_stat & EXIT_INF));
diff --git a/sr_unix/mupip_size.c b/sr_unix/mupip_size.c
index b52de57..684dd84 100644
--- a/sr_unix/mupip_size.c
+++ b/sr_unix/mupip_size.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2012, 2014 Fidelity Information Services, Inc	*
+ * Copyright (c) 2012-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -98,8 +99,8 @@ void mupip_size(void)
 	if (CLI_PRESENT == cli_present("REGION"))
 	{
 		restrict_reg = TRUE;
-		gvinit();				/* initialize gd_header (needed by the following call to mu_getlst) */
-		mu_getlst("REGION", SIZEOF(tp_region));	/* get the parameter corresponding to REGION qualifier */
+		gvinit();							/* init gd_header (needed to call mu_getlst) */
+		mu_getlst("REGION", SIZEOF(tp_region));
 	}
 	mupip_size_check_error();
 	/* SELECT qualifier */
diff --git a/sr_unix/mupip_trigger.c b/sr_unix/mupip_trigger.c
index 8a20208..ade9b07 100644
--- a/sr_unix/mupip_trigger.c
+++ b/sr_unix/mupip_trigger.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2010-2015 Fidelity National Information 	*
+ * Copyright (c) 2010-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -37,9 +37,7 @@
 #include "trigger_upgrade_protos.h"
 
 GBLREF	gd_addr		*gd_header;
-#ifdef DEBUG
 GBLREF	boolean_t	is_replicator;
-#endif
 
 error_def(ERR_INVSTRLEN);
 error_def(ERR_MUNOACTION);
@@ -57,11 +55,9 @@ void mupip_trigger(void)
 	boolean_t	noprompt, trigger_error;
 	gd_region	*reg, *reg_top;
 	sgmnt_addrs	*csa;
-#	ifdef DEBUG
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
-#	endif
 	if (CLI_PRESENT == cli_present("TRIGGERFILE"))
 	{
 		noprompt = (CLI_PRESENT == cli_present("NOPROMPT"));
@@ -76,6 +72,8 @@ void mupip_trigger(void)
 			util_out_print("Missing input file name", TRUE);
 			mupip_exit(ERR_MUPCLIERR);
 		}
+		is_replicator = TRUE;
+		TREF(ok_to_see_statsdb_regs) = TRUE;
 		gvinit();
 		mu_trig_trgfile(trigger_file_name, (uint4)trigger_file_len, noprompt);
 	}
@@ -111,9 +109,11 @@ void mupip_trigger(void)
 		DEBUG_ONLY(TREF(in_trigger_upgrade) = TRUE;)
 		for (reg = gd_header->regions, reg_top = reg + gd_header->n_regions; reg < reg_top; reg++)
 		{
+			if (IS_STATSDB_REGNAME(reg))
+				continue;
 			GVTR_SWITCH_REG_AND_HASHT_BIND_NAME(reg);
 			csa = cs_addrs;
-			if (NULL == csa)	/* not BG or MM access method */
+			if (NULL == csa)	/* not BG or MM access method OR a statsdb region */
 				continue;
 			if (!csa->hdr->hasht_upgrade_needed)
 			{
diff --git a/sr_unix/mur_cre_file_extfmt.c b/sr_unix/mur_cre_file_extfmt.c
index 689af14..13d68f8 100755
--- a/sr_unix/mur_cre_file_extfmt.c
+++ b/sr_unix/mur_cre_file_extfmt.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2003-2015 Fidelity National Information	*
+ * Copyright (c) 2003-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -74,6 +74,7 @@ int4 mur_cre_file_extfmt(jnl_ctl_list *jctl, int recstat)
 	mval			op_val, op_pars;
 	boolean_t		is_stdout;	/* Output will go STDOUT?. Matters only for single-region in this function */
 	boolean_t		need_rel_latch, copy_from_shm, single_reg, release_latch, key_reset;
+	boolean_t		is_dummy_gbldir;
 	reg_ctl_list		*rctl;
 	gd_region		*reg;
 	shm_reg_ctl_t		*shm_rctl_start, *shm_rctl;
@@ -185,12 +186,22 @@ int4 mur_cre_file_extfmt(jnl_ctl_list *jctl, int recstat)
 			/* Calculate if appending region name will not overflow allocation. If so error out */
 			tmplen = file_info->fn_len;
 			tmplen++;	/* for the '_' */
-			if (reg->rname_len)
+			/* If this region corresponds to a gld created by "gd_load" then it is a real gld and use that
+			 * "region-name". Else it is a dummy gld created by "mu_gv_cur_reg_init" in which case use a
+			 * number (of the rctl in the rctl array) to differentiate multiple journal files. Thankfully
+			 * "mu_gv_cur_reg_init" uses "create_dummy_gbldir" which sets gd->link = NULL whereas "gd_load"
+			 * sets it to a non-NULL value. So use that as the distinguishing characteristic.
+			 */
+			is_dummy_gbldir = reg->owning_gd->is_dummy_gbldir;
+			if (!is_dummy_gbldir)
+			{
+				assert(reg->rname_len);
 				tmplen += reg->rname_len;
-			else
+			} else
 			{	/* maximum # of regions is limited by MULTI_PROC_MAX_PROCS (since that is the limit
 				 * that "gtm_multi_proc" can handle. Use the byte-length of MULTI_PROC_MAX_PROCS-1.
 				 */
+				assert(!memcmp(reg->rname, "DEFAULT", reg->rname_len));
 				assert(1000 == MULTI_PROC_MAX_PROCS);
 				tmplen += 3;	/* 999 is maximum valid value and has 3 decimal digits */
 			}
@@ -204,7 +215,7 @@ int4 mur_cre_file_extfmt(jnl_ctl_list *jctl, int recstat)
 			tmplen = file_info->fn_len;
 			ptr = &file_info->fn[tmplen];
 			*ptr++ = '_'; tmplen++;
-			if (reg->rname_len)
+			if (!is_dummy_gbldir)
 			{
 				memcpy(ptr, reg->rname, reg->rname_len);
 				tmplen += reg->rname_len;
@@ -212,6 +223,7 @@ int4 mur_cre_file_extfmt(jnl_ctl_list *jctl, int recstat)
 				tmplen += SPRINTF(ptr, "%d", rctl - &mur_ctl[0]);
 			file_info->fn_len = tmplen;
 		}
+		rename_fn_len = ARRAYSIZE(rename_fn);
 		if (RENAME_FAILED == rename_file_if_exists(file_info->fn, file_info->fn_len, rename_fn, &rename_fn_len, &status))
 			return status;
 		op_pars.mvtype = MV_STR;
diff --git a/sr_unix/mutex.c b/sr_unix/mutex.c
index 2f415e1..1ab0f56 100755
--- a/sr_unix/mutex.c
+++ b/sr_unix/mutex.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information 	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -64,8 +64,7 @@
 #endif
 
 #ifdef MUTEX_MSEM_WAKE
-#define MUTEX_MAX_HEARTBEAT_WAIT        2 /* so that total wait for both select and msem wait will be the same */
-#define MUTEX_LCKALERT_PERIOD		4
+#define MUTEX_MAX_WAIT        		(MUTEX_CONST_TIMEOUT_VAL * MILLISECS_IN_SEC)
 #endif
 
 /* The following PROBE_* macros invoke the corresponding * macros except in the case csa->hdr is NULL.
@@ -109,7 +108,7 @@ MBSTART {															\
 		(CSA)->critical->crit_cycle++;											\
 		MUTEX_DPRINT3("%d: Write %sACQUIRED\n", (PID), (MUTEX_LOCK_WRITE == (LOCK_TYPE)) ? "" : "IMMEDIATE ");		\
 		MUTEX_TEST_SIGNAL_HERE("WRTLCK NOW CRIT\n", FALSE);								\
-		(CSA)->now_crit = TRUE;												\
+		SET_CSA_NOW_CRIT_TRUE(CSA);											\
 		MUTEX_TEST_SIGNAL_HERE("WRTLCK SUCCESS\n", FALSE);								\
 		if (-1 != (SPIN_CNT))												\
 		{														\
@@ -160,9 +159,8 @@ GBLREF int			num_additional_processors;
 GBLREF jnl_gbls_t		jgbl;
 GBLREF jnlpool_addrs		jnlpool;
 GBLREF uint4			process_id;
-GBLREF uint4			image_count, mutex_per_process_init_pid;
+GBLREF uint4			mutex_per_process_init_pid;
 #ifdef MUTEX_MSEM_WAKE
-GBLREF volatile uint4           heartbeat_counter;
 #  ifdef POSIX_MSEM
 static sem_t			*mutex_wake_msem_ptr = NULL;
 #  else
@@ -364,7 +362,8 @@ static	enum cdb_sc mutex_long_sleep(mutex_struct_ptr_t addr, sgmnt_addrs *csa,
 	enum cdb_sc		status;
 	boolean_t		wakeup_status;
 #	ifdef MUTEX_MSEM_WAKE
-	uint4                   bad_heartbeat;
+	boolean_t		msem_timedout;
+	int			save_errno;
 #	else
 	struct timeval		timeout;
 	int			timeout_threshold;
@@ -398,40 +397,39 @@ static	enum cdb_sc mutex_long_sleep(mutex_struct_ptr_t addr, sgmnt_addrs *csa,
 	do
 	{
 #		ifdef MUTEX_MSEM_WAKE
-		/* My msemaphore is already used by another process.
-		 * In other words, I was woken up, but missed my wakeup call.
-		 * I should return immediately.
-		 */
 		if (msem_slot->pid != process_id)
+		{	/* My msemaphore is already used by another process.
+		   	 * In other words, I was woken up, but missed my wakeup call.
+			 * I should return immediately.
+			 */
 			wakeup_status = TRUE;
-		else
+		} else
 		{
-			bad_heartbeat = 0;
+			TIMEOUT_INIT(msem_timedout, MUTEX_MAX_WAIT);
 			/*
 			 * the check for EINTR below is valid and should not be converted to an EINTR
 			 * wrapper macro, because another condition is checked for the while loop.
 			 */
 			while (!(wakeup_status = (0 == MSEM_LOCKW(mutex_wake_msem_ptr))))
 			{
-				if (EINTR == errno)
+				save_errno = errno;
+				if (EINTR == save_errno)
 				{
-					if (bad_heartbeat)	/* to save memory reference and calc on fast path */
+					if (msem_timedout)
 					{
-						if (bad_heartbeat < heartbeat_counter)
-						{
-							MUTEX_DPRINT3("%d: msem sleep done, heartbeat_counter = %d\n",
-								     process_id, heartbeat_counter);
-							break;
-						}
-						MUTEX_DPRINT3("%d: msem sleep continue, heartbeat_counter = %d\n",
-							      process_id, heartbeat_counter);
-					} else
-						bad_heartbeat = heartbeat_counter + MUTEX_MAX_HEARTBEAT_WAIT - 1;
-					/* -1 since we were interrupted this time */
+						MUTEX_DPRINT3("%d: msem sleep done, heartbeat_counter = %d\n",
+							     process_id, heartbeat_counter);
+						break;
+					}
+					MUTEX_DPRINT3("%d: msem sleep continue, heartbeat_counter = %d\n",
+						      process_id, heartbeat_counter);
 				} else
+				{
 					rts_error_csa(CSA_ARG(csa) VARLSTCNT(7) ERR_MUTEXERR, 0, ERR_TEXT, 2,
-						RTS_ERROR_TEXT("Error with mutex wake msem"), errno);
+						RTS_ERROR_TEXT("Error with mutex wake msem"), save_errno);
+				}
 			}
+			TIMEOUT_DONE(msem_timedout);
 			/* wakeup_status is set to true, if I was able to lock...somebody woke me up;
 			 * wakeup_status is set to false, if I timed out and should go to recovery.
 			 */
@@ -669,7 +667,9 @@ enum cdb_sc gtm_mutex_lock(gd_region *reg,
 #	ifdef MUTEX_MSEM_WAKE
 	int			rc;
 #	endif
+        DCL_THREADGBL_ACCESS;
 
+        SETUP_THREADGBL_ACCESS;
 	csa = &FILE_INFO(reg)->s_addrs;
 	assert(!csa->now_crit);
 	cnl = csa->nl;
@@ -679,7 +679,7 @@ enum cdb_sc gtm_mutex_lock(gd_region *reg,
 	 * know for sure there is no other pid accessing the database shared memory.
 	 */
 	assert((MUTEX_LOCK_WRITE_IMMEDIATE == mutex_lock_type) || (MUTEX_LOCK_WRITE == mutex_lock_type));
-	assert((mutex_per_process_init_pid == process_id) || (0 == mutex_per_process_init_pid) && in_mu_rndwn_file);
+	assert((mutex_per_process_init_pid == process_id) || ((0 == mutex_per_process_init_pid) && in_mu_rndwn_file));
 	MUTEX_TRACE_CNTR((MUTEX_LOCK_WRITE == mutex_lock_type) ? mutex_trc_lockw : mutex_trc_lockwim);
 	optimistic_attempts = MUTEX_MAX_OPTIMISTIC_ATTEMPTS;
 	queue_sleeps = csa->probecrit_rec.p_crit_que_full = 0;
@@ -753,7 +753,7 @@ enum cdb_sc gtm_mutex_lock(gd_region *reg,
 				if (process_id == in_crit_pid)
 				{	/* This is just a precaution - shouldn't ever happen and has no code to maintain gvstats */
 					assert(FALSE);
-					csa->now_crit = TRUE;
+					SET_CSA_NOW_CRIT_TRUE(csa);
 					return (cdb_sc_normal);
 				}
 				if (in_crit_pid && (in_crit_pid == cnl->in_crit) && is_proc_alive(in_crit_pid, 0))
@@ -925,15 +925,17 @@ enum cdb_sc mutex_unlockw(gd_region *reg, int crash_count)
 
 	uint4		already_clear;
 	sgmnt_addrs	*csa;
+        DCL_THREADGBL_ACCESS;
 
+        SETUP_THREADGBL_ACCESS;
 	csa = &FILE_INFO(reg)->s_addrs;
 	if (crash_count != csa->critical->crashcnt)
 		return (cdb_sc_critreset);
 	assert(csa->now_crit);
 	MUTEX_TEST_SIGNAL_HERE("WRTUNLCK NOW CRIT\n", FALSE);
-	csa->now_crit = FALSE;
 	assert(csa->critical->semaphore.u.parts.latch_pid == process_id);
 	RELEASE_SWAPLOCK(&csa->critical->semaphore);
+	SET_CSA_NOW_CRIT_FALSE(csa);
 	MUTEX_DPRINT2("%d: WRITE LOCK RELEASED\n", process_id);
 	return (mutex_wakeup(csa->critical, NULL != csa->hdr
 		? (mutex_spin_parms_ptr_t)(&csa->hdr->mutex_spin_parms)
@@ -949,7 +951,7 @@ void mutex_cleanup(gd_region *reg)
 	   the lock, go ahead and release it.
 	*/
 	csa = &FILE_INFO(reg)->s_addrs;
-	if (COMPSWAP_UNLOCK(&csa->critical->semaphore, process_id, image_count, LOCK_AVAILABLE, 0))
+	if (COMPSWAP_UNLOCK(&csa->critical->semaphore, process_id, CMPVAL2, LOCK_AVAILABLE, 0))
 	{
 		MUTEX_DPRINT2("%d  mutex_cleanup : released lock\n", process_id);
 	}
@@ -981,8 +983,7 @@ void mutex_salvage(gd_region *reg)
 	if (0 != (holder_pid = csa->critical->semaphore.u.parts.latch_pid))
 	{
 		mutex_salvaged = FALSE;
-		VMS_ONLY(holder_imgcnt = csa->critical->semaphore.u.parts.latch_image_count);
-		if (holder_pid == process_id VMS_ONLY(&& holder_imgcnt == image_count))
+		if (holder_pid == process_id)
 		{	/* We were trying to obtain a lock we already held -- very odd */
 			RELEASE_SWAPLOCK(&csa->critical->semaphore);
 			csa->nl->in_crit = 0;
@@ -1027,6 +1028,7 @@ void mutex_salvage(gd_region *reg)
 		assert((NULL != csa->hdr) || (csa == &FILE_INFO(jnlpool.jnlpool_dummy_reg)->s_addrs));
 		if (mutex_salvaged && (NULL != csa->hdr))
 		{
+			SET_TRACEABLE_VAR(csa->nl->wc_blocked, TRUE);
 			BG_TRACE_PRO_ANY(csa, wcb_mutex_salvage); /* no need to use PROBE_BG_TRACE_PRO_ANY macro
 								   * since we already checked for csa->hdr non-NULL.
 								   */
diff --git a/sr_unix/mutexsp.h b/sr_unix/mutexsp.h
index bc4baae..1930701 100755
--- a/sr_unix/mutexsp.h
+++ b/sr_unix/mutexsp.h
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information 	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -227,4 +227,24 @@ if (!mutex_trc_dump_done) \
 
 #endif /* MUTEX_TEST */
 
+#define TOO_MANY_REGIONS	1025	/* An arbitrary number that is a value much higher than the
+					 * total # of database regions + jnlpools that a process is
+					 * supposed to attach to. Used only in debug to ensure
+					 * TREF(crit_reg_count) does not go too high.
+					 */
+
+#define SET_CSA_NOW_CRIT_TRUE(CSA)								\
+MBSTART {											\
+	(CSA)->now_crit = TRUE;									\
+	(TREF(crit_reg_count))++;								\
+	assert((0 < TREF(crit_reg_count)) && (TOO_MANY_REGIONS > TREF(crit_reg_count)));	\
+} MBEND
+
+#define SET_CSA_NOW_CRIT_FALSE(CSA)								\
+MBSTART {											\
+	(CSA)->now_crit = FALSE;								\
+	(TREF(crit_reg_count))--;								\
+	assert((0 <= TREF(crit_reg_count)) && (TOO_MANY_REGIONS > TREF(crit_reg_count)));	\
+} MBEND
+
 #endif /* MUTEXSP_H */
diff --git a/sr_unix/ojchildioclean.c b/sr_unix/ojchildioclean.c
index 63a37e1..7eb2481 100644
--- a/sr_unix/ojchildioclean.c
+++ b/sr_unix/ojchildioclean.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2009-2016 Fidelity National Information	*
+ * Copyright (c) 2009-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -49,11 +49,9 @@ void ojchildioclean(void)
 	/* Run through the list of databases to simply close them out (still open by parent) */
 	for (addr_ptr = get_next_gdr(NULL); addr_ptr; addr_ptr = get_next_gdr(addr_ptr))
 	{
-		for (r_local = addr_ptr->regions, r_top = r_local + addr_ptr->n_regions; r_local < r_top;
-		     r_local++)
+		for (r_local = addr_ptr->regions, r_top = r_local + addr_ptr->n_regions; r_local < r_top; r_local++)
 		{
-			if (r_local->open && !r_local->was_open &&
-			    (dba_bg == r_local->dyn.addr->acc_meth || dba_mm == r_local->dyn.addr->acc_meth))
+			if (r_local->open && !r_local->was_open && IS_REG_BG_OR_MM(r_local))
 			{
 				udi = (unix_db_info *)(r_local->dyn.addr->file_cntl->file_info);
 				csa = &udi->s_addrs;
diff --git a/sr_unix/ojchildparms.c b/sr_unix/ojchildparms.c
index edd2a42..94da6e3 100755
--- a/sr_unix/ojchildparms.c
+++ b/sr_unix/ojchildparms.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -41,7 +41,6 @@
 GBLREF spdesc			stringpool;
 GBLREF io_log_name		*dollar_principal;
 GBLREF io_pair			io_std_device;
-GBLREF unsigned char		*source_buffer;
 GBLREF int4			aligned_source_buffer[];
 GBLREF stack_frame		*frame_pointer;
 GBLREF hash_table_objcode	cache_table;
@@ -264,8 +263,8 @@ STATICFNDEF void receive_child_locals_init(char **local_buff, mval **command_str
 	assert(ctxt == chnd);
 	DEBUG_ONLY(save_msp = msp);
 	*local_buff = malloc(MAX_STRLEN);
-	source_buffer = malloc(MAX_STRLEN + 2);
-	TREF(max_advancewindow_line) = MAX_STRLEN + 1;
+	(TREF(source_buffer)).addr = malloc(MAX_STRLEN + 2);	/* changing source_buffer prevents long items from causing errors */
+	(TREF(source_buffer)).len = MAX_STRLEN + 1;
 	/* Get space from the stack to save the command strings before putting the base stack frame This must be done first (before
 	 * putting the base frame) so that dm_start does not unintentionally pop strings off the stack
 	 */
@@ -290,10 +289,10 @@ STATICFNDEF void receive_child_locals_finalize(char **local_buff)
 	frame_pointer = *(stack_frame**)msp;
 	msp += SIZEOF(stack_frame *);           /* Remove frame save pointer from stack */
 	free(*local_buff);
-	free(source_buffer);
+	free((TREF(source_buffer)).addr);
 	/* Reset the source buffer */
-	TREF(max_advancewindow_line) = MAX_SRCLINE;
-	source_buffer = (unsigned char *)aligned_source_buffer;
+	(TREF(source_buffer)).len = MAX_SRCLINE;
+	(TREF(source_buffer)).addr = (char *)&aligned_source_buffer;
 	/* Return the space saved for command strings */
 	POP_MV_STENT();
 	ctxt = active_ch = chnd;		/* Clear extra condition handlers added by dm_start()s */
diff --git a/sr_unix/op_fnfgncal.c b/sr_unix/op_fnfgncal.c
index ea51700..a73d90f 100644
--- a/sr_unix/op_fnfgncal.c
+++ b/sr_unix/op_fnfgncal.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2014 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -15,7 +16,7 @@
 #include <stdarg.h>
 #include <errno.h>
 #ifdef GTM_PTHREAD
-#  include <pthread.h>
+#  include "gtm_pthread.h"
 #endif
 #include "gtm_stdlib.h"
 
@@ -34,6 +35,7 @@
 #include "callintogtmxfer.h"
 #include "min_max.h"
 #include "have_crit.h"
+#include "gtm_malloc.h"		/* for verifyAllocatedStorage */
 
 /******************************************************************************
  *
@@ -386,7 +388,6 @@ STATICFNDEF void op_fgnjavacal(mval *dst, mval *package, mval *extref, uint4 mas
 
 	SETUP_THREADGBL_ACCESS;
 #	ifdef GTM_PTHREAD
-	assert(gtm_jvm_process == gtm_main_thread_id_set);
 	gtm_jvm_process = TRUE;
 	if (!gtm_main_thread_id_set)
 	{
@@ -449,28 +450,15 @@ STATICFNDEF void op_fgnjavacal(mval *dst, mval *package, mval *extref, uint4 mas
 			if (MV_DEFINED(v))
 			{
 				MV_FORCE_STR(v);
-				n += SIZEOF(gtm_long_t) + SIZEOF(void *) + v->str.len + 1;  /* length + pointer + string + '\0' */
+				n += SIZEOF(gtm_long_t) + v->str.len + 1;  /* length + string + '\0' */
 			} else
-				n += SIZEOF(gtm_long_t) + SIZEOF(void *) + 1;		    /* length + pointer + '\0' */
-			space_n += SIZEOF(gtm_long_t) + SIZEOF(void *);
+				n += SIZEOF(gtm_long_t) + 1;		    /* length + '\0' */
 		}
-#		ifdef GTM64
-		else if (MASK_BIT_ON(m2) || (gtm_jfloat == entry_ptr->parms[j]) || (gtm_jdouble == entry_ptr->parms[j]))
-		{	/* Account for a pointer space, since floats and doubles cannot be passed by value. */
-			n += SIZEOF(void *);
-			space_n += SIZEOF(void *);
-		}
-#		else
+#		ifndef GTM64
 		else if ((gtm_jdouble == entry_ptr->parms[j]) || (gtm_jlong == entry_ptr->parms[j]))
-		{	/* Account for a pointer space, since longs and doubles cannot be passed by value on 32-bit boxes, and also
-			 * make room for a potential 8-byte alignment.
-			 */
-			n += SIZEOF(void *) + SIZEOF(gtm_int64_t);
-			space_n += SIZEOF(void *) + SIZEOF(gtm_int64_t);
-		} else if (MASK_BIT_ON(m2) || (gtm_jfloat == entry_ptr->parms[j]))
-		{	/* Account for a pointer space, since floats cannot be passed by value. */
-			n += SIZEOF(void *);
-			space_n += SIZEOF(void *);
+		{	/* Account for potential 8-byte alignment on 32-bit boxes */
+			n += SIZEOF(gtm_int64_t);
+			space_n += SIZEOF(gtm_int64_t);
 		}
 #		endif
 		jtype_char = entry_ptr->parms[j] - gtm_jtype_start_idx;
@@ -550,7 +538,8 @@ STATICFNDEF void op_fgnjavacal(mval *dst, mval *package, mval *extref, uint4 mas
 				 * alignment requirement on those platforms.
 				 */
 				free_space_pointer = (gtm_long_t *)(ROUND_UP2(((INTPTR_T)free_space_pointer), SIZEOF(gtm_int64_t)));
-#				else
+#				endif
+#				ifdef GTM64
 				if (MASK_BIT_ON(m2))
 				{	/* Output expected. */
 #				endif
@@ -615,8 +604,13 @@ STATICFNDEF void op_fgnjavacal(mval *dst, mval *package, mval *extref, uint4 mas
 	assert((char *)free_space_pointer <= free_string_pointer_start);
 	va_end(var_copy);
 	param_list->n = argcnt + 3;		/* Take care of the three implicit parameters. */
+#ifdef DEBUG
+	verifyAllocatedStorage();		/* GTM-8669 verify that argument placement did not trash allocated memory */
+#endif
 	save_mumps_status = mumps_status; 	/* Save mumps_status as a callin from external call may change it. */
+	TREF(in_ext_call) = TRUE;
 	status = callg((callgfnptr)entry_ptr->fcn, param_list);
+	TREF(in_ext_call) = FALSE;
 	mumps_status = save_mumps_status;
 	/* The first byte of the type description argument gets set to 0xFF in case error happened in JNI glue code,
 	 * so check for that and act accordingly.
@@ -995,7 +989,9 @@ void op_fnfgncal(uint4 n_mvals, mval *dst, mval *package, mval *extref, uint4 ma
 	va_end(var);
 	param_list->n = argcnt;
 	save_mumps_status = mumps_status; /* Save mumps_status as a callin from external call may change it */
+	TREF(in_ext_call) = TRUE;
 	status = callg((callgfnptr)entry_ptr->fcn, param_list);
+	TREF(in_ext_call) = FALSE;
 	mumps_status = save_mumps_status;
 
 	/* Exit from the residual call-in environment(SFF_CI and base frames) which might
diff --git a/sr_unix/op_fnzconvert.c b/sr_unix/op_fnzconvert.c
index 7a05624..b204d6d 100755
--- a/sr_unix/op_fnzconvert.c
+++ b/sr_unix/op_fnzconvert.c
@@ -17,6 +17,7 @@
 #include "gtm_icu_api.h"
 #include "gtm_conv.h"
 #include "gtm_utf8.h"
+#include "have_crit.h"
 
 GBLREF	boolean_t	gtm_utf8_mode;
 GBLREF	spdesc 		stringpool;
@@ -55,10 +56,16 @@ void	op_fnzconvert2(mval *src, mval *kase, mval *dst)
 	UErrorCode	status;
 	char		*dstbase;
 	UChar		src_ustr[MAX_ZCONVBUFF], dst_ustr[MAX_ZCONVBUFF], *src_ustr_ptr, *dst_ustr_ptr;
+	intrpt_state_t  prev_intrpt_state;
+
+	DEFER_INTERRUPTS(INTRPT_IN_FUNC_WITH_MALLOC, prev_intrpt_state);
 
 	MV_FORCE_STR(kase);
 	if (-1 == (index = verify_case(&kase->str)))
+	{
+		ENABLE_INTERRUPTS(INTRPT_IN_FUNC_WITH_MALLOC, prev_intrpt_state);
 		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_BADCASECODE, 2, kase->str.len, kase->str.addr);
+	}
 
 	MV_FORCE_STR(src);
 	/* allocate stringpool */
@@ -91,6 +98,7 @@ void	op_fnzconvert2(mval *src, mval *kase, mval *dst)
 			RELEASE_IF_NOT_LOCAL(src_ustr_ptr, src_ustr);
 			if (U_ILLEGAL_CHAR_FOUND == status || U_INVALID_CHAR_FOUND == status)
 				utf8_len_strict((unsigned char *)src->str.addr, src->str.len);	/* to report BADCHAR error */
+			ENABLE_INTERRUPTS(INTRPT_IN_FUNC_WITH_MALLOC, prev_intrpt_state);
 			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(3) ERR_ICUERROR,
 						1, status); /* ICU said bad, we say good or don't recognize error*/
 		}
@@ -106,6 +114,7 @@ void	op_fnzconvert2(mval *src, mval *kase, mval *dst)
 		} else if ( U_FILE_ACCESS_ERROR == status )
 		{
 			RELEASE_IF_NOT_LOCAL(src_ustr_ptr, src_ustr);
+			ENABLE_INTERRUPTS(INTRPT_IN_FUNC_WITH_MALLOC, prev_intrpt_state);
 			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(3) ERR_ICUERROR,
 					1, status);
 		}
@@ -118,6 +127,7 @@ void	op_fnzconvert2(mval *src, mval *kase, mval *dst)
 		if (MAX_STRLEN < dstlen)
 		{
 			RELEASE_IF_NOT_LOCAL(dst_ustr_ptr, dst_ustr);
+			ENABLE_INTERRUPTS(INTRPT_IN_FUNC_WITH_MALLOC, prev_intrpt_state);
 			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(1) ERR_MAXSTRLEN);
 		}
 		ENSURE_STP_FREE_SPACE(dstlen);
@@ -128,6 +138,7 @@ void	op_fnzconvert2(mval *src, mval *kase, mval *dst)
 		{
 			RELEASE_IF_NOT_LOCAL(src_ustr_ptr, src_ustr);
 			RELEASE_IF_NOT_LOCAL(dst_ustr_ptr, dst_ustr);
+			ENABLE_INTERRUPTS(INTRPT_IN_FUNC_WITH_MALLOC, prev_intrpt_state);
 			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(3) ERR_ICUERROR,
 					1, status); /* ICU said bad, but same call above just returned OK */
 		}
@@ -136,6 +147,7 @@ void	op_fnzconvert2(mval *src, mval *kase, mval *dst)
 	}
 	MV_INIT_STRING(dst, dstlen, dstbase);
 	stringpool.free += dstlen;
+	ENABLE_INTERRUPTS(INTRPT_IN_FUNC_WITH_MALLOC, prev_intrpt_state);
 }
 
 void	op_fnzconvert3(mval *src, mval* ichset, mval* ochset, mval* dst)
diff --git a/sr_unix/op_fnzpeek.c b/sr_unix/op_fnzpeek.c
index 26f5a9d..d641306 100644
--- a/sr_unix/op_fnzpeek.c
+++ b/sr_unix/op_fnzpeek.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2013-2015 Fidelity National Information	*
+ * Copyright (c) 2013-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -48,6 +48,8 @@ error_def(ERR_ZPEEKNORPLINFO);
 
 #define FMTHEXDGT(spfree, digit) *spfree++ = digit + ((digit <= 9) ? '0' : ('A' - 0x0A))
 #define ARGUMENT_MAX_LEN	MAX_MIDENT_LEN
+#define	PASS1			1
+#define	PASS2			2
 
 /* Codes for peek operation mnemonics */
 typedef enum
@@ -445,6 +447,7 @@ void	op_fnzpeek(mval *structid, int offset, int len, mval *format, mval *ret)
 	unsigned int		full_len;
 	unsigned char		argument_uc_buf[ARGUMENT_MAX_LEN];
 	sgmnt_addrs		*csa;
+	int			pass;
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
@@ -481,20 +484,29 @@ void	op_fnzpeek(mval *structid, int offset, int len, mval *format, mval *ret)
 			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_BADZPEEKARG, 2, RTS_ERROR_LITERAL("mnemonic argument"));
 		switch(mnemonic_opcode)
 		{
-			case PO_CSAREG:			/* These types have a region name argument */
-			case PO_FHREG:
-			case PO_GDRREG:
-			case PO_NLREG:
-			case PO_JNLREG:
-			case PO_JBFREG:
-				/* Uppercase the region name since that is what GDE does when creating them */
-				lower_to_upper(argument_uc_buf, argptr, arglen);
-				argptr = argument_uc_buf;	/* Reset now to point to upper case version */
+		case PO_CSAREG:			/* These types have a region name argument */
+		case PO_FHREG:
+		case PO_GDRREG:
+		case PO_NLREG:
+		case PO_JNLREG:
+		case PO_JBFREG:
+			/* Uppercase the region name since that is what GDE does when creating them.
+			 * But we want the ability to do $zpeek on statsdb regions (lower-case regions)
+			 * so first check if region as is does exist. If so use that. If not, do uppercase.
+			 */
+			assert(arglen);
+			pass = (ISLOWER_ASCII(argptr[0]) ? PASS1 : PASS2);
+			for ( ; ; )
+			{
+				if (PASS1 != pass)
+				{
+					lower_to_upper(argument_uc_buf, argptr, arglen);
+					argptr = argument_uc_buf;	/* Reset now to point to upper case version */
+				}
 				/* See if region recently used so can avoid lookup */
 				if ((arglen == TREF(zpeek_regname_len)) && (0 == memcmp(argptr, TADR(zpeek_regname), arglen)))
 				{	/* Fast path - no lookup necessary */
 					r_ptr = TREF(zpeek_reg_ptr);
-					assert(r_ptr->open && !r_ptr->was_open);	/* Make sure truly open */
 					break;
 				}
 				/* Region now defined - make sure it is open */
@@ -504,42 +516,67 @@ void	op_fnzpeek(mval *structid, int offset, int len, mval *format, mval *ret)
 				for (r_top = r_ptr + gd_header->n_regions; ; r_ptr++)
 				{
 					if (r_ptr >= r_top)
+					{
+						if (PASS1 == pass)
+							break;
 						rts_error_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_BADZPEEKARG, 2,
 							      RTS_ERROR_LITERAL("mnemonic argument (region name)"));
+					}
 					if ((r_ptr->rname_len == arglen) && (0 == memcmp(r_ptr->rname, argptr, arglen)))
 						break;
 				}
-				if (!r_ptr->open)
-					gv_init_reg(r_ptr);
+				if (r_ptr == r_top)
+				{	/* Could not find lower-case region specified. Try upper-casing it.
+					 * Note that even though GDE guarantees all upper-case region names have a corresponding
+					 * lower-case region name, it is possible the user specified a region name with
+					 * a lower-case letter as the first letter and at least one upper-case letter in the
+					 * region name. In that case, it is possible we find the region in the gld only when we
+					 * convert the entire region name into upper case.
+					 */
+					assert(PASS1 == pass);
+					pass = PASS2;
+					continue;
+				}
 				/* Cache new region access for followup references */
 				memcpy(TADR(zpeek_regname), argptr, arglen);
 				TREF(zpeek_regname_len) = arglen;
 				TREF(zpeek_reg_ptr) = r_ptr;
-				/* r_ptr now points to (open) region */
-				assert(r_ptr->open && !r_ptr->was_open);	/* Make sure truly open */
-				break;
-			case PO_GLFREPL:		/* These types have an array index argument */
-			case PO_GSLREPL:
-				arryidx = asc2i(argptr, arglen);
-				if ((0 > arryidx) || (NUM_GTMSRC_LCL <= arryidx))
-					rts_error_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_BADZPEEKARG, 2,
-						      RTS_ERROR_LITERAL("mnemonic argument (array index)"));
 				break;
-			case PO_PEEK:			/* Argument is address of form 0Xhhhhhhhh[hhhhhhhh] */
-				if (('0' != *cptr++) || ('x' != *cptr) && ('X' != *cptr))
-					rts_error_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_BADZPEEKARG, 2,
-						      RTS_ERROR_LITERAL("mnemonic argument (peek base address)"));
-				cptr++;			/* Bump past 'x' or 'X' - rest of arg should be hex value */
-				prmpeekadr = (UINTPTR_T)GTM64_ONLY(asc_hex2l)NON_GTM64_ONLY(asc_hex2i)(cptr, arglen - 2);
-				if (-1 == (INTPTR_T)prmpeekadr)
-					/* Either an error occurred or the user specified the maximum address. So it's
-					 * either an error from the conversion routine or an otherwise useless value.
-					 */
+			}
+			/* PO_GDRREG opcode examines only the region's fields so does not need the region to be open.
+			 * All the rest need it to be open. If there are any errors in the open (e.g. statsdb specified
+			 * and gtm_statsdir env var is too long etc.) then handle it by issuing an error.
+			 */
+			if ((PO_GDRREG != mnemonic_opcode) && !r_ptr->open)
+			{
+				gv_init_reg(r_ptr);
+				if (!r_ptr->open)
 					rts_error_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_BADZPEEKARG, 2,
-						      RTS_ERROR_LITERAL("mnemonic argument (peek base address)"));
-				break;
-			default:
-				assert(FALSE);		/* Only the above types should ever have an argument */
+						      RTS_ERROR_LITERAL("mnemonic argument (region name could not be opened)"));
+			}
+			break;
+		case PO_GLFREPL:		/* These types have an array index argument */
+		case PO_GSLREPL:
+			arryidx = asc2i(argptr, arglen);
+			if ((0 > arryidx) || (NUM_GTMSRC_LCL <= arryidx))
+				rts_error_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_BADZPEEKARG, 2,
+					      RTS_ERROR_LITERAL("mnemonic argument (array index)"));
+			break;
+		case PO_PEEK:			/* Argument is address of form 0Xhhhhhhhh[hhhhhhhh] */
+			if (('0' != *cptr++) || ('x' != *cptr) && ('X' != *cptr))
+				rts_error_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_BADZPEEKARG, 2,
+					      RTS_ERROR_LITERAL("mnemonic argument (peek base address)"));
+			cptr++;			/* Bump past 'x' or 'X' - rest of arg should be hex value */
+			prmpeekadr = (UINTPTR_T)GTM64_ONLY(asc_hex2l)NON_GTM64_ONLY(asc_hex2i)(cptr, arglen - 2);
+			if (-1 == (INTPTR_T)prmpeekadr)
+				/* Either an error occurred or the user specified the maximum address. So it's
+				 * either an error from the conversion routine or an otherwise useless value.
+				 */
+				rts_error_csa(CSA_ARG(NULL) VARLSTCNT(4) ERR_BADZPEEKARG, 2,
+					      RTS_ERROR_LITERAL("mnemonic argument (peek base address)"));
+			break;
+		default:
+			assert(FALSE);		/* Only the above types should ever have an argument */
 		}
 	}
 	/* Figure out the address of each block to return */
diff --git a/sr_unix/op_setp1.c b/sr_unix/op_setp1.c
index 58f4b22..883b5b7 100755
--- a/sr_unix/op_setp1.c
+++ b/sr_unix/op_setp1.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2006-2015 Fidelity National Information	*
+ * Copyright (c) 2006-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -53,7 +53,7 @@ void op_setp1(mval *src, int delim, mval *expr, int ind, mval *dst)
 {
 	size_t		str_len, delim_cnt;
 	int		len, pfx_str_len, sfx_start_offset, sfx_str_len, rep_str_len, pfx_scan_offset;
-	int		dlmlen, cpy_cache_lines, mblen;
+	int		dlmlen, cpy_cache_lines, mblen, lmsdelim;
 	unsigned char	*start_sfx, *str_addr, *end_pfx, *end_src, *start_pfx;
 	boolean_t	do_scan, delim_last_scan, valid_char;
 	mval		dummymval;	/* It's value is not used but is part of the call to op_fnp1() */
@@ -267,10 +267,18 @@ void op_setp1(mval *src, int delim, mval *expr, int ind, mval *dst)
 		str_addr += pfx_str_len;
 	}
 	/* copy delimiters */
-	while (0 < delim_cnt--)
-	{
-		memcpy(str_addr, ldelim.unibytes_val, dlmlen);
-		str_addr += dlmlen;
+	if (gtm_utf8_mode && (1 < dlmlen))
+	{	/* In this mode, delimiters can exceed 1 character so copy them this way */
+		while (0 < delim_cnt--)
+		{
+			memcpy(str_addr, ldelim.unibytes_val, dlmlen);
+			str_addr += dlmlen;
+		}
+	} else
+	{	/* If delimiters are 1 byte (M mode always and perhaps UTF8 mode), use this simpler/faster method */
+		lmsdelim = (gtm_utf8_mode) ? ldelim.unibytes_val[0] : delim;
+		memset(str_addr, lmsdelim, delim_cnt);
+		str_addr += delim_cnt;
 	}
 	/* copy expression */
 	if (0 < expr->str.len)
diff --git a/sr_unix/op_setpiece.c b/sr_unix/op_setpiece.c
index 25ec023..292cce6 100755
--- a/sr_unix/op_setpiece.c
+++ b/sr_unix/op_setpiece.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2006, 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2006-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -137,10 +138,17 @@ void op_setpiece(mval *src, mval *del, mval *expr, int4 first, int4 last, mval *
 		str_addr += first_src_ind;
 	}
 	/* copy delimiters */
-	while (0 < delim_cnt--)
-	{
-		memcpy(str_addr, del->str.addr, del->str.len);
-		str_addr += del->str.len;
+	if (gtm_utf8_mode && (1 < del->str.len))
+	{	/* In this mode, delimiters can exceed 1 character so copy them this way */
+		while (0 < delim_cnt--)
+		{
+			memcpy(str_addr, del->str.addr, del->str.len);
+			str_addr += del->str.len;
+		}
+	} else
+	{	/* If delimiters are 1 byte (M mode always and perhaps UTF8 mode), use this simpler/faster method */
+		memset(str_addr, (char)*del->str.addr, delim_cnt);
+		str_addr += delim_cnt;
 	}
 	/* copy expression */
 	memcpy(str_addr, expr->str.addr, expr->str.len);
diff --git a/sr_unix/op_ztrigger.c b/sr_unix/op_ztrigger.c
index 0724b1f..cc16c57 100644
--- a/sr_unix/op_ztrigger.c
+++ b/sr_unix/op_ztrigger.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2010, 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2010-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -37,14 +38,13 @@
 #include "interlock.h"
 #include <rtnhdr.h>
 #include "stack_frame.h"
-#ifdef GTM_TRIGGER
-#  include "gv_trigger.h"
-#  include "gtm_trigger.h"
-#  include "gv_trigger_protos.h"
-#  include "mv_stent.h"
-#  include "stringpool.h"
-#  include "trigger.h"
-#endif
+#include "gv_trigger.h"
+#include "gtm_trigger.h"
+#include "gv_trigger_protos.h"
+#include "mv_stent.h"
+#include "stringpool.h"
+#include "trigger.h"
+#include "gtm_trigger_trc.h"
 #include "tp_frame.h"
 #include "tp_restart.h"
 #include "t_end.h"
diff --git a/sr_unix/osf1alpha_badd.txt b/sr_unix/osf1alpha_badd.txt
deleted file mode 100644
index 0b4bd1a..0000000
--- a/sr_unix/osf1alpha_badd.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-#################################################################
-#								#
-#	Copyright 2011, 2013 Fidelity Information Services, Inc       #
-#								#
-#	This source code contains the intellectual property	#
-#	of its copyright holder(s), and is made available	#
-#	under a license.  If you do not know the terms of	#
-#	the license, please stop and do not read further.	#
-#								#
-#################################################################
-# Do not add any blank lines after this comment
-pro:
-TTTGEN.m%-r--r----- README.txt
-dse%-r--r----- custom_errors_sample.txt
-gdehelp.dat%-r--r----- gdedefaults
-gtm_common_defs.h%-r-xr-x--- gtm
-gtmcshrc.gtc%-r-xr-x--- gtmbase
-gtmhelp.dat%-r-xr-x--- gtmcshrc
-gtmsecshr%-r-xr-x--- gtmprofile
-gtmsecshr%-r-xr-x--- gtmprofile_preV54000
-lke%-r--r----- libgtmutil.so
-semstat2%dr-xr-x--- plugin
-zzz_insert%-r--r----- so_locations
diff --git a/sr_unix/peekbyname.mpt b/sr_unix/peekbyname.mpt
index 8f13645..85c3f7d 100755
--- a/sr_unix/peekbyname.mpt
+++ b/sr_unix/peekbyname.mpt
@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;								;
-; Copyright (c) 2015-2016 Fidelity National Information		;
+; Copyright (c) 2015-2017 Fidelity National Information		;
 ; Services, Inc. and/or its subsidiaries. All rights reserved.	;
 ;								;
 ;	This source code contains the intellectual property	;
@@ -35,12 +35,12 @@
 %PEEKBYNAME(field,regindex,format)
 	if '$quit write "GTM-E-EXTRINSIC Use $$ rather than DO to invoke ",$text(+0) quit
 	new anindexval,aregname,digits,etrap,first,ishexnum,land,length,mnemonicandreg,offset,pattern,rest,type,typeindex
+	new dim,ret,idx,off
 	set etrap=$etrap
 	new $etrap	; Do not modify caller's error trap
 	set $ecode="",$etrap="quit"	; Defer error handling to the caller without doing anything
 	set land=$zlevel-1
 	set anindexval="an index value",aregname="a region name"
-	set field=$zconvert($get(field),"L")
 	set first=$piece(field,".",1)
 	set rest=$piece(field,".",2,$length(field,"."))
 	do:""=rest error("NOFIELD")
@@ -73,25 +73,43 @@
 	.	set $zgbldir=$ztrnlnm("gtm_dist")_"/gtmhelp.gld"
 	.	set typeindex=$get(^gtmtypfldindx(first,rest))
 	.	do:0=+typeindex error("INVALID",first,rest)
+	.	set type=^gtmtypes(first,typeindex,"type")
+	.	; determine if struct or union
+	.	do:0'=$data(^gtmtypes(type)) error("UNSUPTYPE",type)
 	.	set offset=^gtmtypes(first,typeindex,"off")
 	.	set length=^gtmtypes(first,typeindex,"len")
-	.	set type=^gtmtypes(first,typeindex,"type")
+	.	set dim=$get(^gtmtypes(first,typeindex,"dim"),1)
 	if $get(format)="" do
-	.	if (type="unsigned-char")&(1=length) set format="U"
-	.	else  if (type="char")&(1=length) set format="I"
-	.	else  if type["char" set format="C"
-	.	else  if (type["addr")!(type["ptr")!(type="void") set format="X"
-	.	else  if (type["uint")!(type["unsigned") set format="U"
-	.	else  set format="I"
+	.	; note that even with the check above for structs, anonymous
+	.	; structs and unions "types" can still appear here
+	.	set format=$get(format)
+	.	set:(""=format)&(1=length) format=$select((type="unsigned-char"):"U",(type="char"):"I",1:"")
+	.	set:""=format format=$select(type["char":"C",1:"")
+	.	set:""=format format=$select(type["addr":"X",type["ptr":"X",type["void":"X",1:"")
+	.	set:""=format format=$select(type["uint64":"X",type["int64":"X",type["long":"X",1:"")
+	.	set:""=format format=$select(type["uint":"U",type["unsigned":"U",1:"")
+	.	set:""=format format=$select(type["int":"I",1:"")
+	.	; miscellaneous whitelist of non-standard types
+	.	set:""=format format=$select("boolean_t"=type:"I","time_t"=type:"I","size_t"=type:"U",1:"")
+	.	do:""=format error("UNSUPTYPE",type)
 	set $etrap=etrap
-	quit $zpeek(mnemonicandreg,offset,length,format)
+	; determine if this is an array
+	if (1=dim)!("C"=format) do
+	.	set ret=$zpeek(mnemonicandreg,offset,length,format)
+	else  do
+	.	set length=length/dim
+	.	set ret=$zpeek(mnemonicandreg,offset,length,format)
+	.	for idx=1:1:dim-1 do
+	.	.	set off=offset+(length*idx)
+	.	.	set ret=ret_","_$zpeek(mnemonicandreg,off,length,format)
+	quit ret
 
 ; Raises an error with given arguments
 error(err,first,args)
 	new i,x
 	set str=$text(@("ERRPBN"_err)),x="x="_$piece(str,";",3), at x,str=$piece(str,";",2)_","
 	if ("PARMREQ"=err)!("INVALID"=err) set args=""""_first_""":"""_args_""""
-	else  if ("NOPARM"=err)!("UNSUPSTRUCT"=err) set args=""""_first_""""
+	else  if ("NOPARM"=err)!("UNSUPSTRUCT"=err)!("UNSUPTYPE"=err) set args=""""_first_""""
 	else  set args=""""""
 	set $etrap="if $zstatus[""UNKNOWN"" set $zstatus=""%GTM-E-""_str_x zgoto land"	; in case of older versions
 	xecute "zmessage "_$translate(str,",",":")_args	; XECUTE because indirection exploded in older versions
@@ -124,6 +142,7 @@ ERRPBNNOPARM		;150383754;"First parameter "_first_" does not support a second pa
 ERRPBNUNSUPSTRUCT	;150383762;"$ZPEEK() does not support structure "_first
 ERRPBNINVALID		;150383770;first_" does not have a field named "_args
 ERRPBNNOFIELD		;150383778;"%ZPEEKBYNAME() requires a field.item in its first parameter"
+ERRPBNUNSUPTYPE		;150383882;"$ZPEEK() does not support type "_first
 struct	;  listed below, in alphabetical order, structures currently supported by ^%PEEKBYNAME
 	;gd_region
 	;gtmrecv_local_struct
diff --git a/sr_unix/pinentry-gtm.sh b/sr_unix/pinentry-gtm.sh
index 64a3064..d9e2a96 100755
--- a/sr_unix/pinentry-gtm.sh
+++ b/sr_unix/pinentry-gtm.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 #################################################################
 #                                                               #
-# Copyright (c) 2010-2016 Fidelity National Information		#
+# Copyright (c) 2010-2017 Fidelity National Information		#
 # Services, Inc. and/or its subsidiaries. All rights reserved.	#
 #                                                               #
 #       This source code contains the intellectual property     #
@@ -25,34 +25,44 @@ punt=1
 if [ -z "$gtm_dist" ] ; then
 	# $gtm_dist is not set in the environment. See if we can use dirname to find one
 	if [ "`echo $gtm_chset | tr utf UTF`" = "UTF-8" -a -x "$dir/../../utf8/mumps" ] ; then
-		export gtm_dist=$dir/../../utf8
+		gtm_dist=$dir/../../utf8
+		export gtm_dist
 	elif [ -x "$dir/../../mumps" ] ; then
-		export gtm_dist=$dir/../..
-		unset gtm_chset
+		gtm_dist=$dir/../..
+		gtm_chset=M
+		export gtm_dist gtm_chset
 	fi
 fi
 
 if [ -n "$gtm_passwd" -a -x "$gtm_dist/mumps" ] ; then
-	pinentry=PINENTRY
+	pinentry=pinentry
 	# Password and MUMPS exists, perform some extended setup checks
 	if [ -z "$gtmroutines" ] ; then
 		utfodir=""
 		if [ "`echo $gtm_chset | tr utf UTF`" = "UTF-8" -a -x "$dir/../../utf8/mumps" ] ; then
 			utfodir="/utf8"
 		fi
-		# $gtmroutines is not set in the environment, attempt to pick it up from libgtmutil.so, $gtm_dist, $gtm_dist/plugin/o
+		# $gtmroutines is not set in the environment, attempt to pick it up from libgtmutil.so,
+		# $gtm_dist, $gtm_dist/plugin/o
 		if [ -e "$gtm_dist/libgtmutil.so" ] ; then
-			export gtmroutines="$gtm_dist/libgtmutil.so"
+			gtmroutines="$gtm_dist/libgtmutil.so"
+			export gtmroutines
 		elif [ -e "$gtm_dist/PINENTRY.o" ] ; then
-			export gtmroutines="$gtm_dist"
+			pinentry=PINENTRY
+			gtmroutines="$gtm_dist"
+			export gtmroutines
 		elif [ -e "$gtm_dist/plugin/o${utfodir}/pinentry.o" ] ; then
-			pinentry=pinentry
-			export gtmroutines="$gtm_dist $gtm_dist/plugin/o${utfodir}"
+			gtmroutines="$gtm_dist $gtm_dist/plugin/o${utfodir}"
+			export gtmroutines
 		fi
 	fi
 
+	# Protect the pinentry program from other env vars
+	gtm_env_translate= gtm_etrap= gtm_local_collate= gtm_sysid= gtm_trace_gbl_name= gtm_zdate_form= gtm_zstep= gtm_ztrap_form= gtm_zyerror= gtmcompile= gtmdbglvl= LD_PRELOAD=	#BYPASSOKLENGTH
+	export gtm_env_translate gtm_etrap gtm_local_collate gtm_sysid gtm_trace_gbl_name gtm_zdate_form gtm_zstep gtm_ztrap_form gtm_zyerror gtmcompile gtmdbglvl LD_PRELOAD		#BYPASSOKLENGTH
+
 	# Validate gtmroutines. Redirect output or it will affect the password protocol
-	printf 'zhalt (0=$zlength($text(pinentry^'$pinentry')))' | gtm_local_collate= LD_PRELOAD= gtm_trace_gbl_name= gtmdbglvl= gtmcompile= $gtm_dist/mumps -direct >> /dev/null 2>&1
+	printf 'zhalt (0=$zlength($text(pinentry^'$pinentry')))' | $gtm_dist/mumps -direct >> /dev/null 2>&1
 	needsprivroutines=$?
 
 	if [ 0 -ne "${needsprivroutines}" ] ; then
@@ -65,10 +75,14 @@ if [ -n "$gtm_passwd" -a -x "$gtm_dist/mumps" ] ; then
 		fi
 		trapstr="rm -rf $tmpdir"
 		trap "$trapstr" HUP INT QUIT TERM TRAP
-		export gtmroutines="$tmpdir($dir $gtm_dist/plugin/gtmcrypt)"
+		pinentry_in="$dir"
+		if [ -e "$gtm_dist/plugin/r/pinentry.m" ] ; then pinentry_in="$pinentry_in $gtm_dist/plugin/r"; fi
+		if [ -e "$gtm_dist/plugin/gtmcrypt/pinentry.m" ] ; then pinentry_in="$pinentry_in $gtm_dist/plugin/gtmcrypt"; fi
+		gtmroutines="$tmpdir($pinentry_in)"
+		export gtmroutines
 	fi
 
-	gtm_local_collate= LD_PRELOAD= gtm_trace_gbl_name= gtmdbglvl= gtmcompile= $gtm_dist/mumps -run $pinentry
+	$gtm_dist/mumps -run $pinentry
 	punt=$?
 	if [ -d "$tmpdir" ] ; then rm -rf "$tmpdir" ; fi
 fi
diff --git a/sr_unix/pinentry.m b/sr_unix/pinentry.m
index dbb094c..93acf51 100644
--- a/sr_unix/pinentry.m
+++ b/sr_unix/pinentry.m
@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;								;
-; Copyright (c) 2010-2015 Fidelity National Information 	;
+; Copyright (c) 2010-2017 Fidelity National Information		;
 ; Services, Inc. and/or its subsidiaries. All rights reserved.	;
 ;								;
 ;	This source code contains the intellectual property	;
@@ -42,12 +42,14 @@ pinentry; Custom pinentry that returns an unobfuscated password if $gtm_passwd i
 	; can execute the default pinentry program. If $gtm_pinentry_log is defined, the routine will dump all
 	; status. Note that the locals are all killed prior to dumping status
 error	kill
-	set pinlog=$ztrnlnm("gtm_pinentry_log")
 	new $etrap set $etrap="zhalt +$zstatus"
+	set errmsg="%GTM-E-PINENTRYERR, Custom pinentry program failure. "_$zstatus
+	if $zsyslog(errmsg)
+	set pinlog=$ztrnlnm("gtm_pinentry_log")
 	if $zlength(pinlog) do
 	. open pinlog:(append:chset="M")
 	. use pinlog
-	. write !,"PINENTRY-F-FAILED ",$zdate($horolog,"YYYY/MM/DD 24:60:SS"),!
+	. write !,$zdate($horolog,"YYYY/MM/DD 24:60:SS"),errmsg,!
 	. zwrite $zversion,$ecode,$job,$zchset,$zdirectory,$zroutines,$zstatus
 	. write "Stack trace:",! zshow "S"
 	. write "Loaded external calls:",! zshow "C"
diff --git a/sr_unix/recover_truncate.c b/sr_unix/recover_truncate.c
index 7ad10f2..3356d9b 100644
--- a/sr_unix/recover_truncate.c
+++ b/sr_unix/recover_truncate.c
@@ -36,8 +36,8 @@
 #include "clear_cache_array.h"
 #include "is_proc_alive.h"
 #include "do_semop.h"
-#include "anticipatory_freeze.h"	/* needed for WRITE_EOF_BLOCK -->  DB_LSEEKWRITE */
 #include "gtm_semutils.h"
+#include "db_write_eof_block.h"
 
 error_def(ERR_DBFILERR);
 error_def(ERR_MUTRUNCERROR);
@@ -51,8 +51,10 @@ void recover_truncate(sgmnt_addrs *csa, sgmnt_data_ptr_t csd, gd_region* reg)
 	off_t			old_size, cur_size, new_size;
 	int			ftrunc_status, status;
 	unix_db_info    	*udi;
-	int			semval;
+	int			blk_size, semval;
+	DCL_THREADGBL_ACCESS;
 
+	SETUP_THREADGBL_ACCESS;
 	if (NULL != csa->nl && csa->nl->trunc_pid && !is_proc_alive(csa->nl->trunc_pid, 0))
 		csa->nl->trunc_pid = 0;
 	if (!csd->before_trunc_total_blks)
@@ -67,22 +69,22 @@ void recover_truncate(sgmnt_addrs *csa, sgmnt_data_ptr_t csd, gd_region* reg)
 	if (NULL != csa->nl)
 		csa->nl->root_search_cycle++;
 	old_total = csd->before_trunc_total_blks;					/* Pre-truncate total_blks */
-	old_size = (off_t)SIZEOF_FILE_HDR(csd)						/* Pre-truncate file size (in bytes) */
-			+ (off_t)old_total * csd->blk_size + DISK_BLOCK_SIZE;
+	blk_size = csd->blk_size;
+	old_size = (off_t)SIZEOF_FILE_HDR(csd) + (off_t)(old_total + 1) * blk_size;	/* Pre-truncate file size (in bytes) */
 	cur_total = csa->ti->total_blks;						/* Actual total_blks right now */
 	cur_size = (off_t)gds_file_size(reg->dyn.addr->file_cntl) * DISK_BLOCK_SIZE;	/* Actual file size right now (in bytes) */
 	new_total = csd->after_trunc_total_blks;					/* Post-truncate total_blks */
-	new_size = old_size - (off_t)(old_total - new_total) * csd->blk_size;		/* Post-truncate file size (in bytes) */
+	new_size = old_size - (off_t)(old_total - new_total) * blk_size;		/* Post-truncate file size (in bytes) */
 	/* We don't expect FTRUNCATE to leave the file size in an 'in between' state, hence the assert below. */
 	assert(old_size == cur_size || new_size == cur_size);
 	if (new_total == cur_total && old_size == cur_size)
-	{ /* Crash after reducing total_blks, before successful FTRUNCATE. Complete the FTRUNCATE here. */
+	{	/* Crash after reducing total_blks, before successful FTRUNCATE. Complete the FTRUNCATE here. */
 		DBGEHND((stdout, "DBG:: recover_truncate() -- completing truncate, old_total = [%lu], cur_total = [%lu]\n",
 			old_total, new_total));
 		assert(csd->before_trunc_free_blocks >= DELTA_FREE_BLOCKS(old_total, new_total));
 		csa->ti->free_blocks = csd->before_trunc_free_blocks - DELTA_FREE_BLOCKS(old_total, new_total);
 		clear_cache_array(csa, csd, reg, new_total, old_total);
-		WRITE_EOF_BLOCK(reg, csd, new_total, status);
+		status = db_write_eof_block(udi, udi->fd, blk_size, new_size - blk_size, &(TREF(dio_buff)));
 		if (status != 0)
 		{
 			err_msg = (char *)STRERROR(errno);
diff --git a/sr_unix/relinkctl.c b/sr_unix/relinkctl.c
index f39cc44..18795f5 100644
--- a/sr_unix/relinkctl.c
+++ b/sr_unix/relinkctl.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2014-2015 Fidelity National Information 	*
+ * Copyright (c) 2014-2016 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -15,7 +15,6 @@
 #include <sys/mman.h>
 #include <sys/types.h>
 #include <sys/shm.h>
-
 #include "gtm_ipc.h"
 #include "gtm_limits.h"
 #include "gtm_fcntl.h"
@@ -75,7 +74,6 @@ STATICFNDCL void relinkctl_delete(open_relinkctl_sgm *linkctl);
 #define MAX_RCTL_OPEN_RETRIES	16
 
 error_def(ERR_FILEPARSE);
-error_def(ERR_PERMGENFAIL);
 error_def(ERR_RELINKCTLERR);
 error_def(ERR_RELINKCTLFULL);
 error_def(ERR_REQRLNKCTLRNDWN);
@@ -235,6 +233,7 @@ int relinkctl_open(open_relinkctl_sgm *linkctl, boolean_t object_dir_missing)
 	char			errstr[256];
 	struct stat		dir_stat_buf;
 	int			rctl_deleted_count, rctl_rundown_count, rctl_init_wait_count;
+	struct perm_diag_data	pdd;
 	struct shmid_ds		shmstat;
 	DCL_THREADGBL_ACCESS;
 
@@ -275,7 +274,13 @@ int relinkctl_open(open_relinkctl_sgm *linkctl, boolean_t object_dir_missing)
 					SNPRINTF(errstr, SIZEOF(errstr), "stat() of file %s failed", linkctl->zro_entry_name.addr);
 					ISSUE_RELINKCTLERR_SYSCALL(&linkctl->zro_entry_name, errstr, errno);
 				}
-				gtm_permissions(&dir_stat_buf, &user_id, &group_id, &perm, PERM_IPC);
+				if (!gtm_permissions(&dir_stat_buf, &user_id, &group_id, &perm, PERM_IPC, &pdd))
+				{
+					rts_error_csa(CSA_ARG(NULL) VARLSTCNT(10 + PERMGENDIAG_ARG_COUNT) ERR_RELINKCTLERR, 2,
+						RTS_ERROR_MSTR(&linkctl->zro_entry_name), ERR_PERMGENFAIL, 4,
+						RTS_ERROR_STRING("relinkctl"), RTS_ERROR_MSTR(&linkctl->zro_entry_name),
+						PERMGENDIAG_ARGS(pdd));
+				}
 				/* Attempt to create the relinkctl file with desired permissions. */
 				OPEN3_CLOEXEC(linkctl->relinkctl_path, O_CREAT | O_RDWR | O_EXCL, perm, fd);
 				obtained_perms = TRUE;
@@ -526,10 +531,7 @@ int relinkctl_open(open_relinkctl_sgm *linkctl, boolean_t object_dir_missing)
 		assert(linkctl->locked == is_mu_rndwn_rlnkctl);
 		assert(0 == ((UINTPTR_T)shm_base % 8));
 		assert(0 == (SIZEOF(relinkshm_hdr_t) % SIZEOF(uint4)));	/* assert SIZEOF(*sm_uint_ptr_t) alignment */
-#		ifdef DEBUG
-		if (TREF(gtm_autorelink_keeprtn))
-			shm_base->skip_rundown_check = TRUE;
-#		endif
+		shm_base->skip_rundown_check = TRUE;
 		linkctl->shm_hashbase = (sm_uint_ptr_t)(sm_uc_ptr_t)(shm_base + 1);
 			/* Skip past shm header to reach hash array start */
 		assert(0 == ((UINTPTR_T)linkctl->shm_hashbase % 8));	/* assert each section is 8-byte aligned at least */
diff --git a/sr_unix/remove_rms.c b/sr_unix/remove_rms.c
index c53c6b1..f4731d4 100755
--- a/sr_unix/remove_rms.c
+++ b/sr_unix/remove_rms.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -23,6 +23,7 @@
 #include "gtmcrypt.h"
 
 GBLREF	io_log_name	*io_root_log_name;
+GBLREF	int		process_exiting;
 
 error_def(ERR_CRYPTKEYRELEASEFAILED);
 
@@ -30,14 +31,22 @@ void remove_rms (io_desc *ciod)
 {
 	io_log_name	**lpp, *lp;	/* logical name pointers */
 	d_rm_struct     *rm_ptr;
-	int		rc, fclose_res;
-	assert (ciod->type == rm);
-	assert (ciod->state == dev_closed || ciod->state == dev_never_opened);
-	rm_ptr = (d_rm_struct *) ciod->dev_sp;
+	io_desc		*iod;
+	int		i, rc, fclose_res;
+#	ifdef DEBUG
+	DCL_THREADGBL_ACCESS;
 
+	SETUP_THREADGBL_ACCESS;
+#	endif
+	/* The routine is also called now when there's an open error and ciod->type == n_io_dev_types. */
+	assert((rm == ciod->type) || (n_io_dev_types == ciod->type));
+	assert(ciod->state == dev_closed || ciod->state == dev_never_opened);
+	/* When we get here after an open error with n_io_dev_types == ciod->type, the ciod->dev_sp should be NULL. Assert it */
+	assert((n_io_dev_types != ciod->type) || (NULL == ciod->dev_sp));
+	rm_ptr = (d_rm_struct *) ciod->dev_sp;
 	/* This routine will now be called if there is an open error to remove the partially created device
-	 from the list of devices in io_root_log_name.  This means rm_ptr may be zero so don't use it if it is*/
-
+	 * from the list of devices in io_root_log_name.  This means rm_ptr may be zero so don't use it if it is.
+	 */
 	/* if this is the stderr device being closed directly by user then let the close of the pipe handle it */
 	if (rm_ptr && rm_ptr->stderr_parent)
 		return;
@@ -63,43 +72,52 @@ void remove_rms (io_desc *ciod)
 	}
 	if (rm_ptr && (NULL != rm_ptr->fsblock_buffer))
 		free(rm_ptr->fsblock_buffer);
-	if (ciod->newly_created && rm_ptr && !rm_ptr->pipe)
+	if ((n_io_dev_types != ciod->type) && ciod->newly_created)
 	{
+		assert((NULL == rm_ptr) || !rm_ptr->pipe);
 		UNLINK(ciod->trans_name->dollar_io);
 	}
 	for (lpp = &io_root_log_name, lp = *lpp; lp; lp = *lpp)
 	{
-		if ((lp->iod->pair.in == ciod) ZOS_ONLY(|| (rm_ptr && rm_ptr->fifo && (lp->iod->pair.out == ciod))))
+		if ((NULL != lp->iod) && (n_io_dev_types == lp->iod->type))
 		{
-			assert (lp->iod == ciod);
-#ifndef __MVS__
-			assert (lp->iod->pair.out == ciod);
-#else
+			/* remove the uninitialized device */
+			*lpp = (*lpp)->next;
+			free(lp);
+			continue;
+		}
+		iod = lp->iod;
+		/* Handle case where iod can be NULL (e.g. if GTM-F-MEMORY occurred during device setup & we are creating
+		 * zshow dump file).
+		 */
+		assert((NULL != iod) || (process_exiting && TREF(jobexam_counter)));
+		if ((NULL != iod) && (iod->pair.in == ciod) ZOS_ONLY(|| (rm_ptr && rm_ptr->fifo && (iod->pair.out == ciod))))
+		{
+			assert (iod == ciod);
+#			ifndef __MVS__
+			assert (iod->pair.out == ciod);
+#			else
 			if (rm_ptr && rm_ptr->fifo)
 			{
-				if (ciod == lp->iod->pair.out)
-					free(lp->iod->pair.in);
-				else if (ciod == lp->iod->pair.in)
-					free(lp->iod->pair.out);
+				if (ciod == iod->pair.out)
+					free(iod->pair.in);
+				else if (ciod == iod->pair.in)
+					free(iod->pair.out);
 			}
-#endif
-			/*
-			 * The only device that may be "split" is the
-			 * principal device.  Since that device is
-			 * permanently open, it will never get here.
+#			endif
+			/* The only device that may be "split" is the principal device, other than a PIPE device which
+			 * is handled above.  Since that device is permanently open, it will never get here.
 			 */
 			*lpp = (*lpp)->next;
-			free (lp);
+			free(lp);
+			continue;
 		}
-		else
-			lpp = &lp->next;
+		lpp = &lp->next;
 	}
 	if (rm_ptr)
 	{
 		if (rm_ptr->pipe)
-		{
-			int i;
-			/* free up dev_param_pairs if defined */
+		{	/* free up dev_param_pairs if defined */
 			for ( i = 0; i < rm_ptr->dev_param_pairs.num_pairs; i++ )
 			{
 				if (NULL != rm_ptr->dev_param_pairs.pairs[i].name)
diff --git a/sr_unix/repl_inst_create.c b/sr_unix/repl_inst_create.c
index e93304c..88cdcd1 100755
--- a/sr_unix/repl_inst_create.c
+++ b/sr_unix/repl_inst_create.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2006-2016 Fidelity National Information	*
+ * Copyright (c) 2006-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -72,7 +72,7 @@ void repl_inst_create(void)
 	unsigned int		inst_fn_len;
 	unsigned short		inst_name_len;
 	int 			rename_fn_len;
-	char			rename_fn[MAX_FN_LEN];
+	char			rename_fn[MAX_FN_LEN + 1];
 	char			inst_fn[MAX_FN_LEN + 1], inst_name[MAX_FN_LEN + 1];
 	char			machine_name[MAX_MCNAMELEN], buff_unaligned[REPL_INST_HDR_SIZE + GTMSRC_LCL_SIZE + 8];
 	char			*buff_8byte_aligned;
@@ -137,6 +137,7 @@ void repl_inst_create(void)
 			assert(FALSE);
 		}
 		JNL_SHORT_TIME(now);
+		rename_fn_len = ARRAYSIZE(rename_fn);
 		if (SS_NORMAL != (status = prepare_unique_name((char *)inst_fn, inst_fn_len, "", "",
 				rename_fn, &rename_fn_len, now, &status2)))
 		{
diff --git a/sr_unix/repl_instance.c b/sr_unix/repl_instance.c
index df68406..47b2ccb 100755
--- a/sr_unix/repl_instance.c
+++ b/sr_unix/repl_instance.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -738,12 +738,21 @@ void	repl_inst_histinfo_add(repl_histinfo *histinfo)
 				assert(prev_histinfo_num > last_strm_histinfo->prev_histinfo_num);
 				prev_histinfo_num = last_strm_histinfo->prev_histinfo_num;
 			}
-			if (start_seqno_equal && (strm_histinfo_num == (histinfo_num - 1)))
+			if (start_seqno_equal && (strm_histinfo_num == (histinfo_num - 1))
+				&& (histinfo->history_type == last_strm_histinfo->history_type))
 			{	/* Starting seqno of the last histinfo in the instance file matches the input histinfo.
 				 * This means there are no journal records corresponding to the input stream in the journal
 				 * files after the last histinfo (which happens to be same as the input stream) was written
 				 * in the instance file. Overwrite the last histinfo with the new histinfo information before
 				 * writing new journal records.
+				 * Note: The check for history_type above is to take into account a supplementary
+				 * instance where a HISTINFO_TYPE_UPDRESYNC type history record is first written when A->P
+				 * connect for the first time and later a HISTINFO_TYPE_NORMAL record is written when A->P
+				 * connect for the second time. If there were no intervening updates on P from the disconnect
+				 * to the reconnect, we do not want to overwrite the HISTINFO_TYPE_UPDRESYNC type record
+				 * as that will confuse Q in a A->P->Q configuration when Q receives updates from A (GTM-8657).
+				 * If the history types do not match, treat the two history records as different and avoid
+				 * overwriting even if the start_seqno matches.
 				 */
 				histinfo_num--;
 			}
@@ -1313,13 +1322,13 @@ int4	repl_inst_reset_zqgblmod_seqno_and_tn(void)
 	for (reg = gd_header->regions, reg_top = reg + gd_header->n_regions;  reg < reg_top;  reg++)
 	{	/* Rundown all databases that we opened as we dont need them anymore. This is not done in the previous
 		 * loop as it has to wait until the ftok semaphore of the instance file has been released as otherwise
-		 * an assert in gds_rundown will fail as it tries to get the ftok semaphore of the database while holding
+		 * an assert in "gds_rundown" will fail as it tries to get the ftok semaphore of the database while holding
 		 * another ftok semaphore already.
 		 */
 		assert(reg->open);
 		TP_CHANGE_REG(reg);
 		assert(!cs_addrs->now_crit);
-		UNIX_ONLY(ret |=) gds_rundown();
+		ret |= gds_rundown(CLEANUP_UDI_TRUE);
 	}
 	assert(!repl_csa->now_crit);
 	return ret;
diff --git a/sr_unix/rtnobj.c b/sr_unix/rtnobj.c
index ab51534..44f10ee 100644
--- a/sr_unix/rtnobj.c
+++ b/sr_unix/rtnobj.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2014-2015 Fidelity National Information 	*
+ * Copyright (c) 2014-2016 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -119,7 +119,6 @@
 
 #ifdef AUTORELINK_SUPPORTED
 
-error_def(ERR_PERMGENFAIL);
 error_def(ERR_RELINKCTLERR);
 error_def(ERR_REQRLNKCTLRNDWN);
 error_def(ERR_RLNKRECLATCH);
@@ -366,6 +365,7 @@ sm_uc_ptr_t rtnobj_shm_malloc(zro_hist *zhist, int fd, off_t objSize, gtm_uint64
 	int			perm;
 	int			maxvers, curvers;
 	struct shmid_ds		shmstat;
+	struct perm_diag_data	pdd;
 #	ifdef DEBUG
 	DCL_THREADGBL_ACCESS;
 
@@ -557,7 +557,17 @@ sm_uc_ptr_t rtnobj_shm_malloc(zro_hist *zhist, int fd, off_t objSize, gtm_uint64
 				SNPRINTF(errstr, SIZEOF(errstr), "rtnobj stat() of file %s failed", linkctl->zro_entry_name.addr);
 				ISSUE_RELINKCTLERR_SYSCALL(&linkctl->zro_entry_name, errstr, save_errno);
 			}
-			gtm_permissions(&dir_stat_buf, &user_id, &group_id, &perm, PERM_IPC|PERM_EXEC);
+			if (!gtm_permissions(&dir_stat_buf, &user_id, &group_id, &perm, PERM_IPC|PERM_EXEC, &pdd))
+			{
+				rel_latch(&shm_hdr->relinkctl_latch);
+				rel_latch(&relinkrec->rtnobj_latch);
+				shm_rmid(shmid);	/* if error removing shmid we created, just move on */
+				rts_error_csa(CSA_ARG(NULL) VARLSTCNT(10 + PERMGENDIAG_ARG_COUNT)
+						ERR_RELINKCTLERR, 2, RTS_ERROR_MSTR(&linkctl->zro_entry_name),
+						ERR_PERMGENFAIL, 4, RTS_ERROR_STRING("rtnobj"),
+						RTS_ERROR_MSTR(&linkctl->zro_entry_name),
+						PERMGENDIAG_ARGS(pdd));
+			}
 			if (-1 == shmctl(shmid, IPC_STAT, &shmstat))
 			{
 				save_errno = errno;
diff --git a/sr_unix/rts_error.c b/sr_unix/rts_error.c
index 8b92a4c..225ef6f 100755
--- a/sr_unix/rts_error.c
+++ b/sr_unix/rts_error.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -30,12 +30,19 @@
 #include "repl_msg.h"
 #include "gtmsource.h"
 #include "anticipatory_freeze.h"
+#include "toktyp.h"
+#include "cgp.h"
 
-GBLREF	int		gtm_errno;
 GBLREF	boolean_t 	created_core;
 GBLREF	boolean_t	dont_want_core;
+GBLREF	boolean_t	run_time;
+GBLREF	char		cg_phase;
 GBLREF	gd_region	*gv_cur_region;
+GBLREF	int		gtm_errno;
 GBLREF	jnlpool_addrs	jnlpool;
+GBLREF	void		(*stx_error_va_fptr)(int in_error, ...);	/* Function pointer for stx_error_va() so this can avoid
+								 	 * pulling stx_error() into gtmsecshr.
+								 	 */
 
 error_def(ERR_ASSERT);
 error_def(ERR_GTMASSERT);
@@ -84,10 +91,10 @@ int rts_error_va(void *csa, int argcnt, va_list var)
 	va_list		var_dup;
 	const err_ctl	*ctl;
 	boolean_t	was_holder;
-#	ifdef DEBUG
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
+#	ifdef DEBUG
 	if (TREF(rts_error_unusable) && !TREF(rts_error_unusable_seen))
 	{
 		TREF(rts_error_unusable_seen) = TRUE;
@@ -129,6 +136,12 @@ int rts_error_va(void *csa, int argcnt, va_list var)
 		if (IS_GTMSECSHR_IMAGE)
 			util_out_print(NULL, RESET);
 		SET_ERROR_CONDITION(msgid);	/* sets "error_condition" & "severity" */
+		if (!run_time && (CGP_PARSE == cg_phase))
+		{
+			(*stx_error_va_fptr)(msgid, var_dup);
+			TREF(director_token) = TK_ERROR;
+			return FALSE;
+		}
 		gtm_putmsg_list(csa, argcnt, var);
 		if (DUMPABLE)
 			created_core = dont_want_core = FALSE;		/* We can create a(nother) core now */
@@ -142,5 +155,5 @@ int rts_error_va(void *csa, int argcnt, va_list var)
 	 * when the severity was error or above. That code had to be removed because of several errors
 	 * that are handled and returned from. An example is EOF errors.  SE 9/2000
 	 */
-	return 0;
+	return FALSE;
 }
diff --git a/sr_unix/runall.csh b/sr_unix/runall.csh
index 742add7..b8132be 100755
--- a/sr_unix/runall.csh
+++ b/sr_unix/runall.csh
@@ -1,7 +1,7 @@
 #!/usr/local/bin/tcsh -f
 #################################################################
 #								#
-# Copyright (c) 2001-2016 Fidelity National Information		#
+# Copyright (c) 2001-2017 Fidelity National Information		#
 # Services, Inc. and/or its subsidiaries. All rights reserved.	#
 #								#
 #	This source code contains the intellectual property	#
@@ -155,12 +155,9 @@ onintr cleanup
 set platform_name = `uname | sed 's/-//g' | sed 's,/,,' | tr '[A-Z]' '[a-z]'`
 set mach_type = `uname -m`
 
-# ---- currently, dtgbldir isn't built into an executable. So a "dummy" executable is assigned to it.
-
 cat - << LABEL >>! ${TMP_DIR}_exclude
 dse dse
 dse_cmd dse
-dtgbldir dummy
 mupip mupip
 mupip_cmd mupip
 lke lke
@@ -250,7 +247,8 @@ else
 	# Look down the $gtm_exe recursively so that the search for recent build executable is inclusive of $gtm_exe/plugin/ and
 	# $gtm_exe/plugin/gtmcrypt. Also the new shell invocation is needed to redirect the stderr that will arise due to the
 	# gtmsecshr privileges for which (find .) will issue 'permission denied'.
-	(ls -lart `find . -type f`| grep "\-..x..x..x" | tail -n 1 | awk '{print $NF}' > ${TMP_DIR}_latest_exe) >&! /dev/null
+	# Look for files with execute permissions (-111) and ignore help database (! -name "*.dat")
+	(ls -lart `find . -type f -perm -111 ! -name "*.dat"` | tail -n 1 | awk '{print $NF}' > ${TMP_DIR}_latest_exe) >&! /dev/null
 	set latest_exe_with_rel_path = `cat ${TMP_DIR}_latest_exe`
 	set latest_exe = `basename $latest_exe_with_rel_path`
 	rm -f ${TMP_DIR}_latest_exe
diff --git a/sr_unix/secshr_client.c b/sr_unix/secshr_client.c
index f0068b9..36f2ff2 100755
--- a/sr_unix/secshr_client.c
+++ b/sr_unix/secshr_client.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information 	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -234,8 +234,8 @@ int send_mesg2gtmsecshr(unsigned int code, unsigned int id, char *path, int path
 		} else if (FLUSH_DB_IPCS_INFO == code)
 		{
 			assert(GTM_PATH_MAX > db_ipcs.fn_len);
+			/* Most of the time file length is much smaller than GTM_PATH_MAX, hence the fn_len + 1 below */
 			memcpy(&mesg.mesg.db_ipcs, &db_ipcs, (offsetof(ipcs_mesg, fn[0]) + db_ipcs.fn_len + 1));
-			/* Most of the time file length is much smaller than GTM_PATH_MAX */
 			send_len += offsetof(ipcs_mesg, fn[0]);
 			send_len += mesg.mesg.db_ipcs.fn_len + 1;
 		} else
diff --git a/sr_unix/set_jnl_file_close.c b/sr_unix/set_jnl_file_close.c
old mode 100755
new mode 100644
index 0dfbce4..fadb0a9
--- a/sr_unix/set_jnl_file_close.c
+++ b/sr_unix/set_jnl_file_close.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2003 Sanchez Computer Associates, Inc.	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -25,12 +26,12 @@
 GBLREF	gd_region		*gv_cur_region;
 GBLREF  sgmnt_addrs             *cs_addrs;
 
-uint4	set_jnl_file_close(set_jnl_file_close_opcode_t set_jnl_file_close_opcode)
+uint4	set_jnl_file_close(void)
 {
 	uint4 		jnl_status = 0;
 
 	cs_addrs = &FILE_INFO(gv_cur_region)->s_addrs;
-	jnl_status = jnl_ensure_open();
+	jnl_status = jnl_ensure_open(gv_cur_region, cs_addrs);
 	if (0 == jnl_status)
 	{
 		if (0 == cs_addrs->jnl->pini_addr)
@@ -39,7 +40,7 @@ uint4	set_jnl_file_close(set_jnl_file_close_opcode_t set_jnl_file_close_opcode)
 		jnl_put_jrt_pfin(cs_addrs);
 		jnl_file_close(gv_cur_region, TRUE, TRUE);
 	} else
-		gtm_putmsg(VARLSTCNT(6) jnl_status, 4, JNL_LEN_STR(cs_addrs->hdr),
-			DB_LEN_STR(gv_cur_region));
+		gtm_putmsg_csa(CSA_ARG(cs_addrs) VARLSTCNT(6) jnl_status, 4, JNL_LEN_STR(cs_addrs->hdr),
+				DB_LEN_STR(gv_cur_region));
 	return jnl_status;
 }
diff --git a/sr_unix/set_library_path.csh b/sr_unix/set_library_path.csh
index 864b988..2872fc3 100644
--- a/sr_unix/set_library_path.csh
+++ b/sr_unix/set_library_path.csh
@@ -34,15 +34,15 @@ else
 #			/lib64		64bit
 # Redhat/SuSE way:	/lib		32bit
 #			/lib64		64bit
-	if ( ! $?gtm_inc ) then
-		echo "ERROR : gtm_inc not defined!"
+	if !($?gtm_inc) then
+		echo "GTM-E-ERROR : gtm_inc not defined!"
 		exit
 	endif
 
-# please keep in sync with sr_unix/gtm_test_install.csh
+	# Please keep in sync with sr_unix/gtm_test_install.csh && sr_unix/configure.gtc
 	if (( -e $gtm_inc/s390.h ) || ( -e $gtm_inc/x86_64.h )) then
-		setenv LD_LIBRARY_PATH "/usr/local/lib64:/usr/local/lib:/usr/lib64:/usr/lib/x86_64-linux-gnu:/usr/lib"
+		setenv LD_LIBRARY_PATH "/usr/local/lib64:/usr/local/lib:/usr/lib64:/usr/lib:/usr/lib/x86_64-linux-gnu"
 	else
-		setenv LD_LIBRARY_PATH "/usr/local/lib:/usr/lib:/usr/lib/i386-linux-gnu:/usr/lib32"
+		setenv LD_LIBRARY_PATH "/usr/local/lib:/usr/lib32:/usr/lib:/usr/lib/i386-linux-gnu"
         endif
 endif
diff --git a/sr_unix/set_zstatus.c b/sr_unix/set_zstatus.c
index f863c01..1e49efd 100644
--- a/sr_unix/set_zstatus.c
+++ b/sr_unix/set_zstatus.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -49,12 +49,12 @@ unsigned char *set_zstatus(mstr *src, int arg, unsigned char **ctxtp, boolean_t
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
-	b_line = 0;
+	b_line = NULL;
 	if (!need_rtsloc)
 	 	trans_frame = FALSE;
 	else
 	{	/* get the line address of the last "known" MUMPS code that was executed.  MUMPS
-		 * indirection consitutes MUMPS code that is "unknown" is the sense that there is no
+		 * indirection constitutes MUMPS code that is "unknown" is the sense that there is no
 		 * line address for it.
 		 */
 		trans_frame = !(SFT_DM & frame_pointer->type) && ((!(frame_pointer->type & SFT_COUNT
diff --git a/sr_unix/simple_timeout_timer.c b/sr_unix/simple_timeout_timer.c
new file mode 100644
index 0000000..3c90131
--- /dev/null
+++ b/sr_unix/simple_timeout_timer.c
@@ -0,0 +1,33 @@
+/****************************************************************
+ *								*
+ * Copyright (c) 2016 Fidelity National Information		*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
+ *								*
+ *	This source code contains the intellectual property	*
+ *	of its copyright holder(s), and is made available	*
+ *	under a license.  If you do not know the terms of	*
+ *	the license, please stop and do not read further.	*
+ *								*
+ ****************************************************************/
+
+#include "mdef.h"
+#include "gt_timer.h"
+#include "error.h"
+
+/* This is a timer routine used by the TIMEOUT_INIT() macro.
+ * When fired it simply sets the referenced timedout value to TRUE.
+ */
+void simple_timeout_timer(TID tid, int4 hd_len, boolean_t **timedout)
+{
+	**timedout = TRUE;
+}
+
+/* This is a condition handler established by the TIMEOUT_INIT() macro and reverted by the TIMEOUT_DONE() macro.
+ * The real cleanup work is done in the TIMEOUT_INIT() code, as it has the necessary context, so this handler
+ * simply does an unwind so that control can return to the establishment point.
+ */
+CONDITION_HANDLER(timer_cancel_ch)
+{
+	START_CH(TRUE);
+	UNWIND(NULL, NULL);
+}
diff --git a/sr_unix/source_file.c b/sr_unix/source_file.c
index 486c0e6..b749225 100755
--- a/sr_unix/source_file.c
+++ b/sr_unix/source_file.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001, 2015 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -41,7 +41,6 @@ GBLREF unsigned short	source_name_len;
 GBLREF unsigned char	source_file_name[];
 GBLREF char		rev_time_buf[];
 GBLREF mident		routine_name, module_name, int_module_name;
-GBLREF unsigned char	*source_buffer;
 GBLREF int4		dollar_zcstatus;
 GBLREF io_pair          io_curr_device, io_std_device;
 GBLREF char		object_file_name[];
@@ -242,23 +241,24 @@ int4	read_source_file (void)
 {
 	unsigned char	*cp;
 	mval		val;
+	DCL_THREADGBL_ACCESS;
 
+	SETUP_THREADGBL_ACCESS;
 	errno = 0;
 	tmp_list_dev = io_curr_device;
 	io_curr_device = compile_src_dev;
 	ESTABLISH_RET(read_source_ch, -1);
 	op_readfl(&val, MAX_SRCLINE, NO_M_TIMEOUT);
 	REVERT;
-	memcpy((char *)source_buffer, val.str.addr, val.str.len);
-	cp = source_buffer + val.str.len;
-	/*	if there is a newline charactor (end of a line)	*/
-	if (!(io_curr_device.in->dollar.x))
-		*cp++ = '\n';
+	memcpy((TREF(source_buffer)).addr, val.str.addr, val.str.len);
+	cp = (unsigned char *)((TREF(source_buffer)).addr + val.str.len);
+	*cp++ = '\n';				/* insert /n needed in checksum calculation */
 	*cp = '\0';
 	if ( FALSE != io_curr_device.in->dollar.zeof )
 		return -1;
 	io_curr_device = tmp_list_dev;	/*	restore list file after reading	if it's opened	*/
-	return (int4)(cp - source_buffer);	/*	var.str.len	*/
+	(TREF(source_buffer)).len = val.str.len + 1;
+	return (int4)((TREF(source_buffer)).len);
 }
 
 CONDITION_HANDLER(read_source_ch)
diff --git a/sr_unix/ss_anal_shdw_file.c b/sr_unix/ss_anal_shdw_file.c
index 82ca4fa..840291f 100644
--- a/sr_unix/ss_anal_shdw_file.c
+++ b/sr_unix/ss_anal_shdw_file.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2009, 2011 Fidelity Information Services, Inc	*
+ * Copyright (c) 2009-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -33,6 +34,9 @@
 #include "eintr_wrappers.h"
 #include "db_snapshot.h"
 
+error_def(ERR_SSFILOPERR);
+error_def(ERR_SSPREMATEOF);
+
 static void ss_print_blk_details(block_id, blk_hdr_ptr_t);
 
 static void ss_print_fil_hdr(snapshot_filhdr_ptr_t);
@@ -47,20 +51,18 @@ void	ss_anal_shdw_file(char	*filename, int flen)
 	block_id		blkno;
 	unsigned int		*bitmap_buffer = NULL;
 
-	error_def(ERR_SSPREMATEOF);
-	error_def(ERR_SSFILOPERR);
 	OPENFILE(filename, O_RDONLY, shdw_fd);
 	if (FD_INVALID == shdw_fd)
 	{
 		status = errno;
-		gtm_putmsg(VARLSTCNT(7) ERR_SSFILOPERR, 4, LEN_AND_LIT("open"), flen, filename, status);
+		gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(7) ERR_SSFILOPERR, 4, LEN_AND_LIT("open"), flen, filename, status);
 	}
 	LSEEKREAD(shdw_fd, 0, ((sm_uc_ptr_t)&ss_filhdr), SNAPSHOT_HDR_SIZE, status);
 	if (0 != status)
 	{
 		if (-1 != status)
 		{
-			gtm_putmsg(VARLSTCNT(7) ERR_SSFILOPERR, 4, LEN_AND_LIT("read"), flen, filename, status);
+			gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(7) ERR_SSFILOPERR, 4, LEN_AND_LIT("read"), flen, filename, status);
 			return;
 		} else
 		{
@@ -82,7 +84,7 @@ void	ss_anal_shdw_file(char	*filename, int flen)
 	{
 		if (-1 != status)
 		{
-			gtm_putmsg(VARLSTCNT(7) ERR_SSFILOPERR, 4, LEN_AND_LIT("read"), flen, filename, status);
+			gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(7) ERR_SSFILOPERR, 4, LEN_AND_LIT("read"), flen, filename, status);
 			return;
 		} else
 		{
@@ -105,17 +107,19 @@ void	ss_anal_shdw_file(char	*filename, int flen)
 		bit = blkno % BLKS_PER_WORD;
 		if (num & (1 << bit))
 		{
-			blk_offset = ((DISK_BLOCK_SIZE * (off_t)(shadow_vbn - 1)) + ((off_t)(blkno) * db_blk_size));
+			blk_offset = (BLK_ZERO_OFF(shadow_vbn) + (off_t)blkno * db_blk_size);
 			LSEEKREAD(shdw_fd, blk_offset, bp, db_blk_size, status);
 			if (0 != status)
 			{
 				if (-1 != status)
 				{
-					gtm_putmsg(VARLSTCNT(7) ERR_SSFILOPERR, 4, LEN_AND_LIT("read"), flen, filename, status);
+					gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(7) ERR_SSFILOPERR, 4, LEN_AND_LIT("read"),
+													flen, filename, status);
 					return;
 				} else
 				{
-					gtm_putmsg(VARLSTCNT(7) ERR_SSPREMATEOF, 5, blkno, db_blk_size, blk_offset, flen, filename);
+					gtm_putmsg_csa(CSA_ARG(NULL) VARLSTCNT(7) ERR_SSPREMATEOF, 5, blkno,
+											db_blk_size, blk_offset, flen, filename);
 					return;
 				}
 			}
diff --git a/sr_unix/ss_initiate.c b/sr_unix/ss_initiate.c
index 94ed58c..d71fd13 100644
--- a/sr_unix/ss_initiate.c
+++ b/sr_unix/ss_initiate.c
@@ -73,7 +73,6 @@ GBLREF	int			process_exiting;
 error_def(ERR_BUFFLUFAILED);
 error_def(ERR_DBROLLEDBACK);
 error_def(ERR_MAXSSREACHED);
-error_def(ERR_PERMGENFAIL);
 error_def(ERR_SSFILOPERR);
 error_def(ERR_SSTMPCREATE);
 error_def(ERR_SSTMPDIRSTAT);
@@ -166,13 +165,13 @@ ZOS_ONLY(error_def(ERR_TEXT);)
 /* In case of an error, un-freeze the region before returning if we had done the region_freeze
  * in mu_int_reg for a read_only process
  */
-#define UNFREEZE_REGION_IF_NEEDED(CSD, REG)			\
-{								\
-	if (process_id == CSD->freeze)				\
-	{							\
-		assert(reg->read_only);				\
-		region_freeze(reg, FALSE, FALSE, FALSE);	\
-	}							\
+#define UNFREEZE_REGION_IF_NEEDED(CSD, REG)					\
+{										\
+	if (process_id == (CSD)->image_count)					\
+	{									\
+		assert((REG)->read_only);					\
+		region_freeze((REG), FALSE, FALSE, FALSE, FALSE, FALSE);	\
+	}									\
 }
 
 /* The below function is modelled around mupip_backup_call_on_signal. This is invoked for doing snapshot clean up if ss_initiate
@@ -204,7 +203,6 @@ boolean_t	ss_initiate(gd_region *reg, 			/* Region in which snapshot has to be s
 	char			time_str[CTIME_BEFORE_NL + 2]; /* for GET_CUR_TIME macro */
 	enum db_acc_method	acc_meth;
 	gtm_uint64_t		db_file_size, native_size;
-	DEBUG_ONLY(gtm_uint64_t	db_size;)
 	int			dsk_addr = 0;
 	int			fclose_res, fstat_res, group_id, perm, pwrite_res, retries;
 	int			save_errno, shdw_fd, ss_shmsize, ss_shm_vbn, status, tmpfd, user_id;
@@ -218,6 +216,7 @@ boolean_t	ss_initiate(gd_region *reg, 			/* Region in which snapshot has to be s
 	shm_snapshot_ptr_t	ss_shm_ptr;
 	snapshot_context_ptr_t	lcl_ss_ctx;
 	snapshot_filhdr_ptr_t	ss_filhdr_ptr;
+	struct perm_diag_data	pdd;
 	struct stat		stat_buf;
 	uint4			crit_counter, fstat_status, prev_ss_shmsize, tempnamprefix_len, tot_blks;
 	void			*ss_shmaddr;
@@ -265,7 +264,7 @@ boolean_t	ss_initiate(gd_region *reg, 			/* Region in which snapshot has to be s
 	assert(ss_lock_held_by_us(reg));
 	ss_release_lock(reg);
 	/* For a readonly database for the current process, we better have the region frozen */
-	assert(!reg->read_only || csd->freeze);
+	assert(!reg->read_only || FROZEN_HARD(csd));
 	/* ============================ STEP 1 : Shadow file name construction ==============================
 	 *
 	 * --> Directory is taken from GTM_SNAPTMPDIR, if available, else GTM_BAK_TEMPDIR_LOG_NAME_UC, if available,
@@ -383,7 +382,19 @@ boolean_t	ss_initiate(gd_region *reg, 			/* Region in which snapshot has to be s
 		 * INTEG started by read-only processes to create snapshot files that are writable by processes having write
 		 * permissions on the database file.
 		 */
-		gtm_permissions(&stat_buf, &user_id, &group_id, &perm, PERM_IPC);
+		if (!gtm_permissions(&stat_buf, &user_id, &group_id, &perm, PERM_IPC, &pdd))
+		{
+			send_msg_csa(CSA_ARG(csa) VARLSTCNT(6+PERMGENDIAG_ARG_COUNT)
+				ERR_PERMGENFAIL, 4, RTS_ERROR_STRING("snapshot file"),
+				RTS_ERROR_STRING(((unix_db_info *)(reg->dyn.addr->file_cntl->file_info))->fn),
+				PERMGENDIAG_ARGS(pdd));
+			gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(6+PERMGENDIAG_ARG_COUNT)
+				ERR_PERMGENFAIL, 4, RTS_ERROR_STRING("snapshot file"),
+				RTS_ERROR_STRING(((unix_db_info *)(reg->dyn.addr->file_cntl->file_info))->fn),
+				PERMGENDIAG_ARGS(pdd));
+			UNFREEZE_REGION_IF_NEEDED(csd, reg);
+			return FALSE;
+		}
 	}
 	if ((-1 == fstat_res) || (-1 == FCHMOD(shdw_fd, perm))
 		|| (((INVALID_UID != user_id) || (INVALID_GID != group_id)) && (-1 == fchown(shdw_fd, user_id, group_id))))
@@ -431,6 +442,7 @@ boolean_t	ss_initiate(gd_region *reg, 			/* Region in which snapshot has to be s
 	INCR_INHIBIT_KILLS(cnl);
 	kip_pids_arr_ptr = cnl->kip_pid_array;
 	prev_ss_shmsize = 0;
+	crit_counter = 1;
 	for (retries = 0; MAX_TRY_FOR_TOT_BLKS >= retries; ++retries)
 	{
 		final_retry = (MAX_TRY_FOR_TOT_BLKS == retries);
@@ -499,7 +511,7 @@ boolean_t	ss_initiate(gd_region *reg, 			/* Region in which snapshot has to be s
 			ISSUE_WRITE_ERROR_AND_EXIT(reg, status, csa, tempfilename);
 		}
 		/* Wait for KIP to reset */
-		wait_for_zero_kip = csd->kill_in_prog;
+		wait_for_zero_kip = csd->kill_in_prog && (MAX_CRIT_TRY > crit_counter);	/* only do kip wait once */
 		/* Wait for existing kills-in-progress to be reset. Since a database file extension is possible as
 		 * we don't hold crit while wcs_sleep below, we will retry if the total blocks have changed since
 		 * we last checked it. However, in the final retry, the shared memory and shadow file initialization
@@ -508,8 +520,8 @@ boolean_t	ss_initiate(gd_region *reg, 			/* Region in which snapshot has to be s
 		 * issued by the caller of ss_initiate if csd->kill_in_prog is set to TRUE. But, such a case should
 		 * be rare.
 		 */
-		for (crit_counter = 1; wait_for_zero_kip && !final_retry; )
-		{
+		if (wait_for_zero_kip)
+		{	/* after inhibitting kills wait once for up to a minute; if that's insufficient, it's probably abandoned */
 			/* Release crit before going into the wait loop */
 			rel_crit(reg);
 			if (debug_mupip)
@@ -529,42 +541,14 @@ boolean_t	ss_initiate(gd_region *reg, 			/* Region in which snapshot has to be s
 				util_out_print("!/MUPIP INFO: !AD : Done with kill-in-prog wait on !AD", TRUE,
 					CTIME_BEFORE_NL, time_str, DB_LEN_STR(reg));
 			}
-			wait_for_zero_kip = (MAX_CRIT_TRY > crit_counter); /* if TRUE, we can wait for some more time on
-									    * this region */
-			grab_crit(reg);
-			if (csd->kill_in_prog)
-			{
-				/* It is possible for this to happen in case a concurrent GT.M process is in its 4th retry.
-				 * In that case, it will not honor the inhibit_kills flag since it holds crit and therefore
-				 * could have set kill-in-prog to a non-zero value while we were outside of crit.
-				 * Since we have waited for 1 minute already, proceed with snapshot. The reasoning is that
-				 * once the GT.M process that is in the final retry finishes off the second part of the M-kill,
-				 * it will not start a new transaction in the first try which is outside of crit so will honor
-				 * the inhibit-kills flag and therefore not increment the kill_in_prog counter any more until
-				 * this crit is released.  So we could be waiting for at most 1 kip increment per concurrent process
-				 * that is updating the database. We expect these kills to be complete within 1 minute.
-				 */
-				if (!wait_for_zero_kip)
-					break;
-			} else
-				break;
 		}
 		grab_crit(reg);
-		/* There are two reasons why we might go for another iteration of this loop
-		 * (a) After we have created the shared memory and before we grab crit, another process can add new blocks to the
+		/* After we have created the shared memory and before we grab crit, another process can add new blocks to the
 		 * database, in which case csd->trans_hist.total_blks is no longer the value as we noted down above. Check if this
 		 * is the case and if so, retry to obtain a consistent copy of the total number of blocks.
-		 * (b) Similarly, csd->kill_in_prog was FALSE before grab_crit, but non-zero after grab-crit due to concurrency
-		 * reasons. Check if this is the case and if so, retry to wait for KIP to reset.
 		 */
-		if ((tot_blks == csd->trans_hist.total_blks) && !csd->kill_in_prog)
-		{	/* We have a consistent copy of the total blocks and csd->kill_in_prog is FALSE inside crit. No need for
-			 * retry.
-			 */
-			DEBUG_ONLY(db_size = ((gtm_uint64_t)tot_blks * (csd->blk_size / DISK_BLOCK_SIZE)) + (csd->start_vbn);)
-			assert((native_size == db_size) || (native_size == ROUND_UP(db_size, (OS_PAGE_SIZE / DISK_BLOCK_SIZE))));
-			break;
-		}
+		if (tot_blks == csd->trans_hist.total_blks)
+			break;	/* We have a consistent copy of the total blocks No need for retry. */
 	}
 	/* At this point, we are MOST likely guaranteed that kill-in-prog is set to zero for this region and CERTAINLY
 	 * guaranteed that no more kills will be started for this region. Now, we are still holding crit, so any error
@@ -572,8 +556,6 @@ boolean_t	ss_initiate(gd_region *reg, 			/* Region in which snapshot has to be s
 	 * proceed gracefully
 	 */
 	assert(csa->now_crit);
-	DEBUG_ONLY(db_size = ((gtm_uint64_t)tot_blks * (csd->blk_size / DISK_BLOCK_SIZE)) + (csd->start_vbn);)
-	assert((native_size == db_size) || (native_size == ROUND_UP(db_size, (OS_PAGE_SIZE / DISK_BLOCK_SIZE))));
 	assert(NULL != ss_shmaddr);
 	assert(0 == ((long)ss_shmaddr % OS_PAGE_SIZE));
 	assert(0 == ss_shmsize % OS_PAGE_SIZE);
@@ -619,7 +601,7 @@ boolean_t	ss_initiate(gd_region *reg, 			/* Region in which snapshot has to be s
 	 */
 	if (reg->read_only)
 	{
-		region_freeze(reg, FALSE, FALSE, FALSE);
+		region_freeze(reg, FALSE, FALSE, FALSE, FALSE, FALSE);
 	}
 	else if (!wcs_flu(WCSFLU_FLUSH_HDR | WCSFLU_WRITE_EPOCH | WCSFLU_MSYNC_DB)) /* wcs_flu guarantees that all the pending
 								   * phase 2 commits are done with before returning */
@@ -684,7 +666,7 @@ boolean_t	ss_initiate(gd_region *reg, 			/* Region in which snapshot has to be s
 		 * Cleanup and exit
 		 */
 		gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(1) ERR_DBROLLEDBACK);
-		UNFREEZE_REGION_IF_NEEDED(csa, reg);
+		UNFREEZE_REGION_IF_NEEDED(csa->hdr, reg);
 		ENABLE_INTERRUPTS(INTRPT_IN_SS_INITIATE, prev_intrpt_state);
 		return FALSE;
 	}
diff --git a/sr_unix/ss_read_block.c b/sr_unix/ss_read_block.c
index 44c0044..5fe6a6f 100644
--- a/sr_unix/ss_read_block.c
+++ b/sr_unix/ss_read_block.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2009, 2010 Fidelity Information Services, Inc	*
+ * Copyright (c) 2009-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -36,12 +37,16 @@
 #include "db_snapshot.h"
 #include "mupip_exit.h"
 
+error_def(ERR_INTEGERRS);
+error_def(ERR_SSFILOPERR);
+error_def(ERR_SSPREMATEOF);
+
 /*
  * This function is called to read the before image from the snapshot file
  */
-GBLREF	sgmnt_addrs	*cs_addrs;
-GBLREF	gd_region	*gv_cur_region;
-GTM_SNAPSHOT_ONLY(GBLDEF util_snapshot_ptr_t	util_ss_ptr;)
+GBLREF	sgmnt_addrs		*cs_addrs;
+GBLREF	gd_region		*gv_cur_region;
+GBLDEF	util_snapshot_ptr_t	util_ss_ptr;
 
 void	ss_read_block(snapshot_context_ptr_t lcl_ss_ctx, block_id blk, sm_uc_ptr_t blk_buff_ptr)
 {
@@ -53,27 +58,23 @@ void	ss_read_block(snapshot_context_ptr_t lcl_ss_ctx, block_id blk, sm_uc_ptr_t
 	sgmnt_data_ptr_t	csd;
 	shm_snapshot_ptr_t	ss_shm_ptr;
 
-	error_def(ERR_SSPREMATEOF);
-	error_def(ERR_SSFILOPERR);
-	error_def(ERR_INTEGERRS);
-
 	assert(-1 != lcl_ss_ctx->shdw_fd);
 	csa = cs_addrs;
 	csd = csa->hdr;
 	ss_shm_ptr = lcl_ss_ctx->ss_shm_ptr;
 	DBG_ENSURE_PTR_WITHIN_SS_BOUNDS(csa, (sm_uc_ptr_t)ss_shm_ptr);
 	blk_size = csd->blk_size;
-	blk_offset = (off_t)(lcl_ss_ctx->shadow_vbn - 1) * DISK_BLOCK_SIZE + (off_t)blk * blk_size;
+	blk_offset = (off_t)BLK_ZERO_OFF(lcl_ss_ctx->shadow_vbn) + (off_t)blk * blk_size;
 	LSEEKREAD(lcl_ss_ctx->shdw_fd, blk_offset, (uchar_ptr_t) blk_buff_ptr, blk_size, pread_res);
 	if (0 != pread_res)
 	{
 		if (-1 == pread_res)
 		{
-			gtm_putmsg(VARLSTCNT(7) ERR_SSPREMATEOF, 5, blk, blk_size, blk_offset,
+			gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(7) ERR_SSPREMATEOF, 5, blk, blk_size, blk_offset,
 				LEN_AND_STR(ss_shm_ptr->ss_info.shadow_file));
 		} else
 		{
-			gtm_putmsg(VARLSTCNT(7) ERR_SSFILOPERR, 4, LEN_AND_LIT("read"),
+			gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(7) ERR_SSFILOPERR, 4, LEN_AND_LIT("read"),
 				LEN_AND_STR(ss_shm_ptr->ss_info.shadow_file), pread_res);
 		}
 		mupip_exit(ERR_INTEGERRS);
diff --git a/sr_unix/ss_write_block.c b/sr_unix/ss_write_block.c
index af6b027..29c5cba 100644
--- a/sr_unix/ss_write_block.c
+++ b/sr_unix/ss_write_block.c
@@ -145,7 +145,7 @@ boolean_t ss_write_block(sgmnt_addrs *csa,
 		DBG_ENSURE_PTR_IS_VALID_ENCTWINGLOBUFF(csa, csd, blk_ptr);
 	}
 	assert(NULL != blk_ptr);
-	blk_offset = ((off_t)(lcl_ss_ctx->shadow_vbn - 1) * DISK_BLOCK_SIZE + (off_t)blk * blk_size);
+	blk_offset = (off_t)BLK_ZERO_OFF(lcl_ss_ctx->shadow_vbn) + (off_t)blk * blk_size;
 	/* Note: If a FREE block is being written here, then we could avoid the write below: if the underlying file system
 	 * is guaranteed to give us all zeros for a block and if the block header is empty
 	 */
diff --git a/sr_unix/trigger.h b/sr_unix/trigger.h
index 58471e3..d575695 100644
--- a/sr_unix/trigger.h
+++ b/sr_unix/trigger.h
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2010-2015 Fidelity National Information 	*
+ * Copyright (c) 2010-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -535,33 +535,6 @@ typedef enum
 	*(lcl_ptr + num_len) = '\0';		\
 }
 
-#define SAVE_TRIGGER_REGION_INFO(SAVE_KEY)					\
-{										\
-	save_gv_target = gv_target;						\
-	save_gv_cur_region = gv_cur_region;					\
-	save_sgm_info_ptr = sgm_info_ptr;					\
-	assert(NULL != gv_currkey);						\
-	assert((SIZEOF(gv_key) + gv_currkey->end) <= SIZEOF(SAVE_KEY));		\
-	memcpy(&SAVE_KEY[0], gv_currkey, SIZEOF(gv_key) + gv_currkey->end);	\
-}
-#define RESTORE_TRIGGER_REGION_INFO(SAVE_KEY)					\
-{										\
-	gv_target = save_gv_target;						\
-	sgm_info_ptr = save_sgm_info_ptr;					\
-	/* check no keysize expansion occurred inside gvcst_root_search */	\
-	assert(gv_currkey->top == SAVE_KEY[0].top);				\
-	memcpy(gv_currkey, &SAVE_KEY[0], SIZEOF(gv_key) + SAVE_KEY[0].end);	\
-	if (NULL != save_gv_cur_region)						\
-	{									\
-		TP_CHANGE_REG_IF_NEEDED(save_gv_cur_region);			\
-	} else									\
-	{									\
-		gv_cur_region = NULL;						\
-		cs_data = NULL;							\
-		cs_addrs = NULL;						\
-	}									\
-}
-
 /* If this is the first call of this macro inside a function, then note down whatever is in the util_output buffer.
  * This is the prefix that is already printed for the first "util_out_print_gtmio" call. For the second and future
  * calls of the "util_out_print_gtmio" function inside the current function, print the noted down prefix first.
diff --git a/sr_unix/trigger_compare.c b/sr_unix/trigger_compare.c
index 45965b2..4c76a46 100644
--- a/sr_unix/trigger_compare.c
+++ b/sr_unix/trigger_compare.c
@@ -46,6 +46,7 @@ GBLREF	gd_region		*gv_cur_region;
 GBLREF	gv_key			*gv_currkey;
 GBLREF	gv_namehead		*gv_target;
 GBLREF	unsigned int		t_tries;
+GBLREF	unsigned char		t_fail_hist[CDB_MAX_TRIES];
 
 LITREF	mval			literal_one;
 LITREF	mval			literal_ten;
@@ -167,7 +168,7 @@ boolean_t search_trigger_hash(char *trigvn, int trigvn_len, stringkey *trigger_h
 			LITERAL_HASHTRHASH, STR_LIT_LEN(LITERAL_HASHTRHASH), mv_hash, collision_indx);
 		if (!gvcst_get(&key_val))
 		{	/* There has to be a #TRHASH entry or else it is a retry situation (due to concurrent updates) */
-			if (CDB_STAGNATE > t_tries)
+			if (UPDATE_CAN_RETRY(t_tries, t_fail_hist[t_tries]))
 				t_retry(cdb_sc_triggermod);
 			assert(WBTEST_HELPOUT_TRIGDEFBAD == gtm_white_box_test_case_number);
 			rts_error_csa(CSA_ARG(REG2CSA(gv_cur_region)) VARLSTCNT(8) ERR_TRIGDEFBAD, 6, trigvn_len, trigvn,
@@ -177,7 +178,7 @@ boolean_t search_trigger_hash(char *trigvn, int trigvn_len, stringkey *trigger_h
 		ptr2 = memchr(ptr, '\0', key_val.str.len);
 		if (NULL == ptr2)
 		{	/* We expect $c(0) in the middle of ptr. If we dont find it, this is a restartable situation */
-			if (CDB_STAGNATE > t_tries)
+			if (UPDATE_CAN_RETRY(t_tries, t_fail_hist[t_tries]))
 				t_retry(cdb_sc_triggermod);
 			assert(WBTEST_HELPOUT_TRIGDEFBAD == gtm_white_box_test_case_number);
 			rts_error_csa(CSA_ARG(REG2CSA(gv_cur_region)) VARLSTCNT(8) ERR_TRIGDEFBAD, 6, trigvn_len, trigvn,
@@ -247,7 +248,7 @@ boolean_t search_triggers(char *trigvn, int trigvn_len, char **values, uint4 *va
 			LITERAL_HASHTRHASH, STR_LIT_LEN(LITERAL_HASHTRHASH), mv_hash, collision_indx);
 		if (!gvcst_get(&key_val))
 		{	/* There has to be a #TRHASH entry or else it is a retry situation (due to concurrent updates) */
-			if (CDB_STAGNATE > t_tries)
+			if (UPDATE_CAN_RETRY(t_tries, t_fail_hist[t_tries]))
 				t_retry(cdb_sc_triggermod);
 			assert(WBTEST_HELPOUT_TRIGDEFBAD == gtm_white_box_test_case_number);
 			rts_error_csa(CSA_ARG(REG2CSA(gv_cur_region)) VARLSTCNT(8) ERR_TRIGDEFBAD, 6, trigvn_len, trigvn,
@@ -257,7 +258,7 @@ boolean_t search_triggers(char *trigvn, int trigvn_len, char **values, uint4 *va
 		ptr2 = memchr(ptr, '\0', key_val.str.len);
 		if (NULL == ptr2)
 		{	/* We expect $c(0) in the middle of ptr. If we dont find it, this is a restartable situation */
-			if (CDB_STAGNATE > t_tries)
+			if (UPDATE_CAN_RETRY(t_tries, t_fail_hist[t_tries]))
 				t_retry(cdb_sc_triggermod);
 			assert(WBTEST_HELPOUT_TRIGDEFBAD == gtm_white_box_test_case_number);
 			rts_error_csa(CSA_ARG(REG2CSA(gv_cur_region)) VARLSTCNT(8) ERR_TRIGDEFBAD, 6, trigvn_len, trigvn,
@@ -268,7 +269,7 @@ boolean_t search_triggers(char *trigvn, int trigvn_len, char **values, uint4 *va
 		{	/* We expect all hashes under ^#t(<gbl>,"#TRHASH",...) to correspond to <gbl> in their value.
 			 * If not this is a TRIGDEFBAD situation.
 			 */
-			if (CDB_STAGNATE > t_tries)
+			if (UPDATE_CAN_RETRY(t_tries, t_fail_hist[t_tries]))
 				t_retry(cdb_sc_triggermod);
 			assert(WBTEST_HELPOUT_TRIGDEFBAD == gtm_white_box_test_case_number);
 			rts_error_csa(CSA_ARG(REG2CSA(gv_cur_region)) VARLSTCNT(8) ERR_TRIGDEFBAD, 6, trigvn_len, trigvn,
diff --git a/sr_unix/trigger_delete.c b/sr_unix/trigger_delete.c
index 5a5091b..533416a 100644
--- a/sr_unix/trigger_delete.c
+++ b/sr_unix/trigger_delete.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2010-2015 Fidelity National Information	*
+ * Copyright (c) 2010-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -40,6 +40,7 @@
 #include "trigger_user_name.h"
 #include "trigger_compare_protos.h"
 #include "trigger_parse_protos.h"
+#include "gtm_trigger_trc.h"
 #include "min_max.h"
 #include "mvalconv.h"			/* Needed for MV_FORCE_* */
 #include "change_reg.h"
@@ -50,6 +51,7 @@
 #include "t_begin.h"
 #include "repl_msg.h"
 #include "gtmsource.h"
+#include "gtm_reservedDB.h"
 
 GBLREF	boolean_t		dollar_ztrigger_invoked;
 GBLREF	gd_addr			*gd_header;
@@ -59,6 +61,8 @@ GBLREF	gv_namehead		*gv_target;
 GBLREF	sgm_info		*sgm_info_ptr;
 GBLREF	sgmnt_data_ptr_t	cs_data;
 GBLREF	uint4			dollar_tlevel;
+GBLREF	unsigned int		t_tries;
+GBLREF	unsigned char		t_fail_hist[CDB_MAX_TRIES];
 
 LITREF	char 			*trigger_subs[];
 
@@ -73,7 +77,7 @@ error_def(ERR_TRIGNAMBAD);
 /* This error macro is used for all definition errors where the target is ^#t("TRHASH",<HASH>) */
 #define TRHASH_DEFINITION_RETRY_OR_ERROR(HASH, CSA)					\
 {											\
-	if (CDB_STAGNATE > t_tries)							\
+	if (UPDATE_CAN_RETRY(t_tries, t_fail_hist[t_tries]))				\
 		t_retry(cdb_sc_triggermod);						\
 	assert(WBTEST_HELPOUT_TRIGDEFBAD == gtm_white_box_test_case_number);		\
 	rts_error_csa(CSA_ARG(CSA) VARLSTCNT(8) ERR_TRIGDEFBAD, 6, trigvn_len,		\
@@ -191,7 +195,7 @@ STATICFNDEF int4 update_trigger_name_value(char *trig_name, int trig_name_len, i
 	BUILD_HASHT_SUB_SUB_CURRKEY(LITERAL_HASHTNAME, STRLEN(LITERAL_HASHTNAME), trig_name, trig_name_len - 1);
 	if (!gvcst_get(&trig_gbl))
 	{	/* There has to be a #TNAME entry */
-		if (CDB_STAGNATE > t_tries)
+		if (UPDATE_CAN_RETRY(t_tries, t_fail_hist[t_tries]))
 			t_retry(cdb_sc_triggermod);
 		assert(WBTEST_HELPOUT_TRIGDEFBAD == gtm_white_box_test_case_number);
 		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_TRIGNAMBAD, 4, LEN_AND_LIT("\"#TNAME\""),
@@ -203,7 +207,7 @@ STATICFNDEF int4 update_trigger_name_value(char *trig_name, int trig_name_len, i
 	ptr += len;
 	if ((trig_gbl.str.len == len) || ('\0' != *ptr))
 	{
-		if (CDB_STAGNATE > t_tries)
+		if (UPDATE_CAN_RETRY(t_tries, t_fail_hist[t_tries]))
 			t_retry(cdb_sc_triggermod);
 		assert(WBTEST_HELPOUT_TRIGDEFBAD == gtm_white_box_test_case_number);
 		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_TRIGNAMBAD, 4, LEN_AND_LIT("\"#TNAME\""),
@@ -261,7 +265,7 @@ STATICFNDEF int4 update_trigger_hash_value(char *trigvn, int trigvn_len, char **
 		ptr += len;
 		if ((key_val.str.len == len) || ('\0' != *ptr))
 		{	/* We expect $c(0) in the middle of ptr. If we dont find it, this is a restartable situation */
-			if (CDB_STAGNATE > t_tries)
+			if (UPDATE_CAN_RETRY(t_tries, t_fail_hist[t_tries]))
 				t_retry(cdb_sc_triggermod);
 			assert(WBTEST_HELPOUT_TRIGDEFBAD == gtm_white_box_test_case_number);
 			rts_error_csa(CSA_ARG(REG2CSA(gv_cur_region)) VARLSTCNT(8) ERR_TRIGDEFBAD, 6, trigvn_len, trigvn,
@@ -297,7 +301,7 @@ STATICFNDEF int4 update_trigger_hash_value(char *trigvn, int trigvn_len, char **
 	ptr += len;
 	if ((key_val.str.len == len) || ('\0' != *ptr))
 	{	/* We expect $c(0) in the middle of ptr. If we dont find it, this is a restartable situation */
-		if (CDB_STAGNATE > t_tries)
+		if (UPDATE_CAN_RETRY(t_tries, t_fail_hist[t_tries]))
 			t_retry(cdb_sc_triggermod);
 		assert(WBTEST_HELPOUT_TRIGDEFBAD == gtm_white_box_test_case_number);
 		rts_error_csa(CSA_ARG(REG2CSA(gv_cur_region)) VARLSTCNT(8) ERR_TRIGDEFBAD, 6, trigvn_len, trigvn,
@@ -363,6 +367,12 @@ boolean_t trigger_delete_name(char *trigger_name, uint4 trigger_name_len, uint4
 		trig_stats[STATS_ERROR_TRIGFILE]++;
 		return TRIG_FAILURE;
 	}
+	if (trig_stats[STATS_ERROR_TRIGFILE])
+	{	/* If an error has occurred during trigger processing the above validity check is all we need */
+		CONV_STR_AND_PRINT("No errors processing trigger delete by name: ", orig_name_len, trigger_name);
+		/* Return success because there was no error with the name to delete */
+		return TRIG_SUCCESS;
+	}
 	name_tail_ptr = trigger_name + trigger_name_len - 1;
 	if ((TRIGNAME_SEQ_DELIM == *name_tail_ptr) || wildcard)
 		trigger_name_len--; /* drop the trailing # sign for wildcard */
@@ -378,6 +388,8 @@ boolean_t trigger_delete_name(char *trigger_name, uint4 trigger_name_len, uint4
 	INCR_AND_PUSH_MV_STENT(trigger_count); /* Protect trigger_count from garbage collection */
 	for (reg = gd_header->regions, reg_top = reg + gd_header->n_regions; reg < reg_top; reg++)
 	{
+		if (IS_STATSDB_REGNAME(reg))
+			continue;
 		GVTR_SWITCH_REG_AND_HASHT_BIND_NAME(reg);
 		csa = cs_addrs;
 		if (NULL == csa)	/* not BG or MM access method */
@@ -397,14 +409,14 @@ boolean_t trigger_delete_name(char *trigger_name, uint4 trigger_name_len, uint4
 			{
 				if (reg->read_only)
 					rts_error_csa(CSA_ARG(csa) VARLSTCNT(4) ERR_TRIGMODREGNOTRW, 2, REG_LEN_STR(reg));
-				SAVE_TRIGGER_REGION_INFO(save_currkey);
+				SAVE_REGION_INFO(save_currkey, save_gv_target, save_gv_cur_region, save_sgm_info_ptr);
 				ptr = trig_gbl.str.addr;
 				trigvn_len = MIN(trig_gbl.str.len, MAX_MIDENT_LEN);
 				STRNLEN(ptr, trigvn_len, trigvn_len);
 				ptr += trigvn_len;
 				if ((trig_gbl.str.len == trigvn_len) || ('\0' != *ptr))
 				{	/* We expect $c(0) in the middle of ptr. If not found, this is a restartable situation */
-					if (CDB_STAGNATE > t_tries)
+					if (UPDATE_CAN_RETRY(t_tries, t_fail_hist[t_tries]))
 						t_retry(cdb_sc_triggermod);
 					assert(WBTEST_HELPOUT_TRIGDEFBAD == gtm_white_box_test_case_number);
 					rts_error_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_TRIGNAMBAD, 4, LEN_AND_LIT("\"#TNAME\""),
@@ -416,7 +428,7 @@ boolean_t trigger_delete_name(char *trigger_name, uint4 trigger_name_len, uint4
 				A2I(ptr, trig_gbl.str.addr + trig_gbl.str.len, trig_indx);
 				if (1 > trig_indx)
 				{	/* Trigger indexes start from 1 */
-					if (CDB_STAGNATE > t_tries)
+					if (UPDATE_CAN_RETRY(t_tries, t_fail_hist[t_tries]))
 						t_retry(cdb_sc_triggermod);
 					assert(WBTEST_HELPOUT_TRIGDEFBAD == gtm_white_box_test_case_number);
 					rts_error_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_TRIGNAMBAD, 4, LEN_AND_LIT("\"#TNAME\""),
@@ -427,7 +439,7 @@ boolean_t trigger_delete_name(char *trigger_name, uint4 trigger_name_len, uint4
 				BUILD_HASHT_SUB_SUB_CURRKEY(trigvn, trigvn_len, LITERAL_HASHCOUNT, STRLEN(LITERAL_HASHCOUNT));
 				if (!gvcst_get(trigger_count))
 				{	/* We just looked this up, if it doesn't exist then assume a concurrent update occurred */
-					if (CDB_STAGNATE > t_tries)
+					if (UPDATE_CAN_RETRY(t_tries, t_fail_hist[t_tries]))
 						t_retry(cdb_sc_triggermod);
 					assert(WBTEST_HELPOUT_TRIGDEFBAD == gtm_white_box_test_case_number);
 					rts_error_csa(CSA_ARG(REG2CSA(gv_cur_region)) VARLSTCNT(8) ERR_TRIGDEFBAD, 6,
@@ -457,6 +469,8 @@ boolean_t trigger_delete_name(char *trigger_name, uint4 trigger_name_len, uint4
 						 * for a comment on why it is okay for db_dztrigger_cycle to be incremented
 						 * more than once in the same transaction.
 						 */
+						DBGTRIGR((stderr, "trigger_delete_name: CSA->db_dztrigger_cycle=%d\n",
+									csa->db_dztrigger_cycle));
 						csa->db_dztrigger_cycle++;
 					}
 					trig_stats[STATS_DELETED]++;
@@ -468,7 +482,7 @@ boolean_t trigger_delete_name(char *trigger_name, uint4 trigger_name_len, uint4
 					}
 				}
 				trigger_count->mvtype = 0; /* allow stp_gcol to release the current contents if necessary */
-				RESTORE_TRIGGER_REGION_INFO(save_currkey);
+				RESTORE_REGION_INFO(save_currkey, save_gv_target, save_gv_cur_region, save_sgm_info_ptr);
 				triggers_deleted++;
 			}
 			if (!wildcard)
@@ -578,7 +592,7 @@ int4 trigger_delete(char *trigvn, int trigvn_len, mval *trigger_count, int index
 		{
 			if (((TRIGNAME_SUB == sub_indx) || (CMD_SUB == sub_indx) || (CHSET_SUB == sub_indx)))
 			{ /* CMD, NAME and CHSET cannot be zero length */
-				if (CDB_STAGNATE > t_tries)
+				if (UPDATE_CAN_RETRY(t_tries, t_fail_hist[t_tries]))
 					t_retry(cdb_sc_triggermod);
 				assert(WBTEST_HELPOUT_TRIGDEFBAD == gtm_white_box_test_case_number);
 				rts_error_csa(CSA_ARG(REG2CSA(gv_cur_region)) VARLSTCNT(8) ERR_TRIGDEFBAD, 6, trigvn_len, trigvn,
@@ -692,7 +706,7 @@ int4 trigger_delete(char *trigvn, int trigvn_len, mval *trigger_count, int index
 					if (((TRIGNAME_SUB == sub_indx) || (CMD_SUB == sub_indx) ||
 						 (CHSET_SUB == sub_indx)))
 					{ /* CMD, NAME and CHSET cannot be zero length */
-						if (CDB_STAGNATE > t_tries)
+						if (UPDATE_CAN_RETRY(t_tries, t_fail_hist[t_tries]))
 							t_retry(cdb_sc_triggermod);
 						assert(WBTEST_HELPOUT_TRIGDEFBAD == gtm_white_box_test_case_number);
 						rts_error_csa(CSA_ARG(REG2CSA(gv_cur_region)) VARLSTCNT(8) ERR_TRIGDEFBAD,
@@ -711,7 +725,7 @@ int4 trigger_delete(char *trigvn, int trigvn_len, mval *trigger_count, int index
 					{
 						if (MAX_BUFF_SIZE <= tmp_len)
 						{ /* Exceeding the temporary buffer is impossible, restart*/
-							if (CDB_STAGNATE > t_tries)
+							if (UPDATE_CAN_RETRY(t_tries, t_fail_hist[t_tries]))
 								t_retry(cdb_sc_triggermod);
 							assert(WBTEST_HELPOUT_TRIGDEFBAD == gtm_white_box_test_case_number);
 							rts_error_csa(CSA_ARG(REG2CSA(gv_cur_region)) VARLSTCNT(8) ERR_TRIGDEFBAD,
@@ -790,6 +804,8 @@ void trigger_delete_all(char *trigger_rec, uint4 len, uint4 *trig_stats)
 	triggers_deleted = 0;
 	for (reg = gd_header->regions, reg_top = reg + gd_header->n_regions; reg < reg_top; reg++)
 	{
+		if (IS_STATSDB_REGNAME(reg))
+			continue;
 		GVTR_SWITCH_REG_AND_HASHT_BIND_NAME(reg);
 		csa = cs_addrs;
 		if (NULL == csa)	/* not BG or MM access method */
@@ -834,7 +850,7 @@ void trigger_delete_all(char *trigger_rec, uint4 len, uint4 *trig_stats)
 				LITERAL_HASHCYCLE, STRLEN(LITERAL_HASHCYCLE));
 			if (!gvcst_get(&trigger_cycle))
 			{	/* Found hasht record, there must be #CYCLE */
-				if (CDB_STAGNATE > t_tries)
+				if (UPDATE_CAN_RETRY(t_tries, t_fail_hist[t_tries]))
 					t_retry(cdb_sc_triggermod);
 				gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(12) MAKE_MSG_WARNING(ERR_TRIGDEFBAD), 6,
 						curr_gbl_name.str.len, curr_gbl_name.str.addr,
@@ -845,7 +861,8 @@ void trigger_delete_all(char *trigger_rec, uint4 len, uint4 *trig_stats)
 						curr_gbl_name.str.len, curr_gbl_name.str.addr, LEN_AND_LIT("\"#CYCLE\""),
 						ERR_TEXT, 2, RTS_ERROR_TEXT("#CYCLE field is missing"));
 				assert(WBTEST_HELPOUT_TRIGDEFBAD == gtm_white_box_test_case_number);
-			} else {
+			} else
+			{
 				mv_cycle_ptr = &trigger_cycle;
 				cycle = MV_FORCE_UINT(mv_cycle_ptr);
 				cycle++;
@@ -860,7 +877,7 @@ void trigger_delete_all(char *trigger_rec, uint4 len, uint4 *trig_stats)
 				/* quit:$length(after_hash_cycle)=0 */
 				if (0 != after_hash_cycle.str.len)
 				{	/* Found hasht record after #LABEL, but #COUNT is not defined; Force removal */
-					if (CDB_STAGNATE > t_tries)
+					if (UPDATE_CAN_RETRY(t_tries, t_fail_hist[t_tries]))
 						t_retry(cdb_sc_triggermod);
 					gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(12) MAKE_MSG_WARNING(ERR_TRIGDEFBAD), 6,
 							curr_gbl_name.str.len, curr_gbl_name.str.addr,
@@ -908,6 +925,8 @@ void trigger_delete_all(char *trigger_rec, uint4 len, uint4 *trig_stats)
 				 * on this region, will re-read. See trigger_update.c for a comment on why it is okay
 				 * for db_dztrigger_cycle to be incremented more than once in the same transaction
 				 */
+				DBGTRIGR((stderr, "trigger_delete_all: CSA->db_dztrigger_cycle=%d\n",
+					  csa->db_dztrigger_cycle));
 				csa->db_dztrigger_cycle++;
 			}
 		}
diff --git a/sr_unix/trigger_fill_xecute_buffer.c b/sr_unix/trigger_fill_xecute_buffer.c
index 9331733..4bb3bf3 100644
--- a/sr_unix/trigger_fill_xecute_buffer.c
+++ b/sr_unix/trigger_fill_xecute_buffer.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2010-2016 Fidelity National Information	*
+ * Copyright (c) 2010-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -44,18 +44,26 @@
 #include "trigger_fill_xecute_buffer.h"
 #include "trigger_gbl_fill_xecute_buffer.h"
 #include "gtm_trigger_trc.h"
+#ifdef DEBUG
+#include "repl_msg.h"
+#include "gtmsource.h"			/* for jnlpool_addrs */
+#endif
 
 GBLREF	sgmnt_data_ptr_t	cs_data;
 GBLREF	sgmnt_addrs		*cs_addrs;
+GBLREF	int4			gtm_trigger_depth;
 GBLREF	gv_key			*gv_currkey;
 GBLREF	gd_region		*gv_cur_region;
-GBLREF	sgm_info		*sgm_info_ptr;
 GBLREF	gv_namehead		*gv_target;
+#ifdef DEBUG
+GBLREF	boolean_t		is_updproc;
+GBLREF	jnlpool_addrs		jnlpool;
+#endif
+GBLREF	sgm_info		*sgm_info_ptr;
 GBLREF	boolean_t		skip_INVOKE_RESTART;
 GBLREF	int			tprestart_state;
-GBLREF	int4			tstart_trigger_depth;
-GBLREF	int4			gtm_trigger_depth;
 GBLREF	tp_frame		*tp_pointer;
+GBLREF	int4			tstart_trigger_depth;
 
 error_def(ERR_TPRETRY);
 
@@ -147,7 +155,7 @@ STATICFNDEF void trigger_fill_xecute_buffer_read_trigger_source(gv_trigger_t *tr
 
 	assert(0 < dollar_tlevel);
 	assert(NULL != trigdsc);
-	SAVE_TRIGGER_REGION_INFO(save_currkey);
+	SAVE_REGION_INFO(save_currkey, save_gv_target, save_gv_cur_region, save_sgm_info_ptr);
 
 	gvt_trigger = trigdsc->gvt_trigger;			/* We now know our base block now */
 	index = trigdsc - gvt_trigger->gv_trig_array + 1;	/* We now know our trigger index value */
@@ -172,15 +180,16 @@ STATICFNDEF void trigger_fill_xecute_buffer_read_trigger_source(gv_trigger_t *tr
 	/* See if we need to reload our triggers */
 	if ((csa->db_trigger_cycle != gvt->db_trigger_cycle)
 	    || (csa->db_dztrigger_cycle && (gvt->db_dztrigger_cycle != csa->db_dztrigger_cycle)))
-	{       /* The process' view of the triggers could be potentially stale. Restart to be safe.
-		 * Triggers can be invoked only by GT.M and Update process. Out of these, we expect only
-		 * GT.M to see restarts due to concurrent trigger changes. Update process is the only
-		 * updater on the secondary so we dont expect it to see any concurrent trigger changes
-		 * Assert accordingly.
+	{       /* The process' view of the triggers is likely stale. Restart to be safe.
+		 * Triggers can be invoked only by GT.M and Update process. We expect to see GT.M processes to
+		 * restart due to concurrent trigger changes. The Update Process should only restart if it is a
+		 * supplementary instance. Assert accordingly. Note similar asserts occur in t_end.c and
+		 * tp_tend.c.
 		 */
 		DBGTRIGR((stderr, "trigger_fill_xecute_buffer_read_trigger_source: stale trigger view\n"));
 		assert(CDB_STAGNATE > t_tries);
-		assert(IS_GTM_IMAGE);
+		assert(!is_updproc || (jnlpool.repl_inst_filehdr->is_supplementary
+					&& !jnlpool.jnlpool_ctl->upd_disabled));
 		t_retry(cdb_sc_triggermod);
 	}
 	SET_GVTARGET_TO_HASHT_GBL(csa);
@@ -189,7 +198,7 @@ STATICFNDEF void trigger_fill_xecute_buffer_read_trigger_source(gv_trigger_t *tr
 	xecute_buff.addr = trigger_gbl_fill_xecute_buffer(gbl.addr, gbl.len, &trig_index, NULL, (int4 *)&xecute_buff.len);
 	trigdsc->xecute_str.str = xecute_buff;
 	/* Restore gv_target/gv_currkey which need to be kept in sync */
-	RESTORE_TRIGGER_REGION_INFO(save_currkey);
+	RESTORE_REGION_INFO(save_currkey, save_gv_target, save_gv_cur_region, save_sgm_info_ptr);
 	return;
 }
 #endif /* GTM_TRIGGER */
diff --git a/sr_unix/trigger_gbl_fill_xecute_buffer.c b/sr_unix/trigger_gbl_fill_xecute_buffer.c
index e719300..55701ce 100644
--- a/sr_unix/trigger_gbl_fill_xecute_buffer.c
+++ b/sr_unix/trigger_gbl_fill_xecute_buffer.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2010, 2014 Fidelity Information Services, Inc	*
+ * Copyright (c) 2010-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -31,6 +32,10 @@
 #include "gtmimagename.h"
 #include "filestruct.h"			/* for FILE_INFO, needed by REG2CSA */
 #include "have_crit.h"
+#ifdef DEBUG
+#include "repl_msg.h"
+#include "gtmsource.h"			/* for jnlpool_addrs */
+#endif
 
 LITREF	mval			literal_ten;
 
@@ -44,10 +49,15 @@ error_def(ERR_TRIGDEFBAD);
 
 GBLREF	sgmnt_data_ptr_t	cs_data;
 GBLREF	sgmnt_addrs		*cs_addrs;
+GBLREF	uint4			dollar_tlevel;
 GBLREF	gd_region		*gv_cur_region;
 GBLREF	gv_key			*gv_currkey;
-GBLREF	uint4			dollar_tlevel;
+#ifdef DEBUG
+GBLREF	boolean_t		is_updproc;
+GBLREF	jnlpool_addrs		jnlpool;
+#endif
 GBLREF	unsigned int		t_tries;
+GBLREF	unsigned char		t_fail_hist[CDB_MAX_TRIES];
 
 LITREF	char			*trigger_subs[];
 
@@ -121,12 +131,13 @@ char *trigger_gbl_fill_xecute_buffer(char *trigvn, int trigvn_len, mval *trig_in
 			op_gvdata(&data_val);
 			if ((literal_ten.m[0] != data_val.m[0]) || (literal_ten.m[1] != data_val.m[1]))
 			{	/* The process' view of the triggers is likely stale. Restart to be safe.
-				 * Triggers can be invoked only by GT.M and Update process. Out of these, we expect only
-				 * GT.M to see restarts due to concurrent trigger changes. Update process is the only
-				 * updater on the secondary so we dont expect it to see any concurrent trigger changes
-				 * Assert accordingly. Note similar asserts occur in t_end.c and tp_tend.c.
+				 * Triggers can be invoked only by GT.M and Update process. We expect to see GT.M processes to
+				 * restart due to concurrent trigger changes. The Update Process should only restart if it is a
+				 * supplementary instance. Assert accordingly. Note similar asserts occur in t_end.c and
+				 * tp_tend.c.
 				 */
-				assert(IS_GTM_IMAGE);
+				assert(!is_updproc || (jnlpool.repl_inst_filehdr->is_supplementary
+							&& !jnlpool.jnlpool_ctl->upd_disabled));
 				DBGTRIGR((stderr, "trigger_gbl_fill_xecute_buffer: multiline not found, retry\n"));
 				/* Assert that the cycle has changed but in order to properly do the assert, we need a memory
 				 * barrier since cs_data->db_trigger_cycle could be stale in our cache.
@@ -136,7 +147,7 @@ char *trigger_gbl_fill_xecute_buffer(char *trigvn, int trigvn_len, mval *trig_in
 				DEBUG_ONLY(gvt_cycle = gv_target->db_trigger_cycle);
 				DEBUG_ONLY(csd_cycle = cs_data->db_trigger_cycle);
 				assert(csd_cycle > gvt_cycle);
-				if (CDB_STAGNATE > t_tries)
+				if (UPDATE_CAN_RETRY(t_tries, t_fail_hist[t_tries]))
 					t_retry(cdb_sc_triggermod);
 				assert(WBTEST_HELPOUT_TRIGDEFBAD == gtm_white_box_test_case_number);
 				trgindx = mval2i(&index);
@@ -153,7 +164,7 @@ char *trigger_gbl_fill_xecute_buffer(char *trigvn, int trigvn_len, mval *trig_in
 		if (!gvcst_get(&key_val))
 		{	/* There has to be an XECUTE string or else it is a retry situation (due to concurrent updates) */
 			DBGTRIGR((stderr, "trigger_gbl_fill_xecute_buffer: problem getting multiline record count, retry\n"));
-			if (CDB_STAGNATE > t_tries)
+			if (UPDATE_CAN_RETRY(t_tries, t_fail_hist[t_tries]))
 				t_retry(cdb_sc_triggermod);
 			assert(WBTEST_HELPOUT_TRIGDEFBAD == gtm_white_box_test_case_number);
 			trgindx = mval2i(&index);
@@ -179,7 +190,7 @@ char *trigger_gbl_fill_xecute_buffer(char *trigvn, int trigvn_len, mval *trig_in
 				 */
 				DBGTRIGR((stderr, "trigger_gbl_fill_xecute_buffer: problem getting multiline component, retry\n"));
 				free(xecute_buff);
-				if (CDB_STAGNATE > t_tries)
+				if (UPDATE_CAN_RETRY(t_tries, t_fail_hist[t_tries]))
 					t_retry(cdb_sc_triggermod);
 				assert(WBTEST_HELPOUT_TRIGDEFBAD == gtm_white_box_test_case_number);
 				SET_PARAM_STRING(util_buff, util_len, num, ",\"XECUTE\"");
diff --git a/sr_unix/trigger_incr_cycle.c b/sr_unix/trigger_incr_cycle.c
index 3fc98b4..a6ebf07 100644
--- a/sr_unix/trigger_incr_cycle.c
+++ b/sr_unix/trigger_incr_cycle.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2010, 2011 Fidelity Information Services, Inc	*
+ * Copyright (c) 2010-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -24,6 +25,7 @@
 #include "gvsub2str.h"			/* for COPY_SUBS_TO_GVCURRKEY */
 #include "format_targ_key.h"		/* for COPY_SUBS_TO_GVCURRKEY */
 #include "mvalconv.h"			/* Needed for MV_FORCE_* */
+#include "gtm_trigger_trc.h"
 
 GBLREF	gd_region		*gv_cur_region;
 GBLREF	gv_key			*gv_currkey;
@@ -48,6 +50,7 @@ void trigger_incr_cycle(char *trigvn, int trigvn_len)
 		cycle_ptr = cycle_str;
 	} else
 		cycle_ptr = INITIAL_CYCLE;
+	DBGTRIGR((stderr, "trigger_incr_cycle(): %s #CYCLE=%s\n", trigvn, cycle_ptr));
 	SET_TRIGGER_GLOBAL_SUB_SUB_STR(trigvn, trigvn_len, LITERAL_HASHCYCLE, STRLEN(LITERAL_HASHCYCLE),
 		cycle_ptr, STRLEN(cycle_ptr), result);
 	assert(PUT_SUCCESS == result);
diff --git a/sr_unix/trigger_locate_andor_load.c b/sr_unix/trigger_locate_andor_load.c
index e9323c8..3b4300d 100644
--- a/sr_unix/trigger_locate_andor_load.c
+++ b/sr_unix/trigger_locate_andor_load.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2011-2016 Fidelity National Information	*
+ * Copyright (c) 2011-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -161,7 +161,7 @@ int trigger_locate_andor_load(mstr *trigname, rhdtyp **rtn_vec)
 		rtn_vector = NULL;
 	DBGTRIGR((stderr, "trigger_locate_andor_load: routine was %sfound (1)\n", (NULL == rtn_vector)?"not ":""));
 	/* If we have the trigger routine header, do some validation on it, else keep looking */
-	SAVE_TRIGGER_REGION_INFO(save_currkey);
+	SAVE_REGION_INFO(save_currkey, save_gv_target, save_gv_cur_region, save_sgm_info_ptr);
 	runtime_disambiguator_specified = ('#' != trigname->addr[trigname->len - 1]);
 	if (!runtime_disambiguator_specified && (NULL != reg))
 	{	/* Region-name has been specified and no runtime-disambiguator specified. Need to further refine the
@@ -217,7 +217,7 @@ int trigger_locate_andor_load(mstr *trigname, rhdtyp **rtn_vec)
 		if (runtime_disambiguator_specified
 			|| (TRIG_FAILURE_RC == trigger_source_read_andor_verify(trigname, &rtn_vector)))
 		{
-			RESTORE_TRIGGER_REGION_INFO(save_currkey);
+			RESTORE_REGION_INFO(save_currkey, save_gv_target, save_gv_cur_region, save_sgm_info_ptr);
 			ISSUE_TRIGNAMENF_ERROR_IF_APPROPRIATE(trigname);
 			return TRIG_FAILURE_RC;
 		}
@@ -245,7 +245,7 @@ int trigger_locate_andor_load(mstr *trigname, rhdtyp **rtn_vec)
 				gv_init_reg(reg);
 			if (&FILE_INFO(reg)->s_addrs != csa)
 			{
-				RESTORE_TRIGGER_REGION_INFO(save_currkey);
+				RESTORE_REGION_INFO(save_currkey, save_gv_target, save_gv_cur_region, save_sgm_info_ptr);
 				ISSUE_TRIGNAMENF_ERROR_IF_APPROPRIATE(trigname);
 				return TRIG_FAILURE_RC;
 			}
@@ -257,7 +257,7 @@ int trigger_locate_andor_load(mstr *trigname, rhdtyp **rtn_vec)
 			if (((NULL == gvnh_reg->gvspan) && (gv_cur_region != reg))
 			    || ((NULL != gvnh_reg->gvspan) && !gvnh_spanreg_ismapped(gvnh_reg, gd_header, reg)))
 			{
-				RESTORE_TRIGGER_REGION_INFO(save_currkey);
+				RESTORE_REGION_INFO(save_currkey, save_gv_target, save_gv_cur_region, save_sgm_info_ptr);
 				ISSUE_TRIGNAMENF_ERROR_IF_APPROPRIATE(trigname);
 				return TRIG_FAILURE_RC;
 			}
@@ -266,7 +266,7 @@ int trigger_locate_andor_load(mstr *trigname, rhdtyp **rtn_vec)
 	}
 	DBGTRIGR((stderr, "trigger_locate_andor_load: leaving with source from rtnhdr 0x%lx\n",
 		  (*rtn_vec) ? (*((rhdtyp **)rtn_vec))->trigr_handle : NULL));
-	RESTORE_TRIGGER_REGION_INFO(save_currkey);
+	RESTORE_REGION_INFO(save_currkey, save_gv_target, save_gv_cur_region, save_sgm_info_ptr);
 	assert(NULL != rtn_vector);
 	assert(trigdsc == rtn_vector->trigr_handle);
 	*rtn_vec = rtn_vector;
diff --git a/sr_unix/trigger_parse.c b/sr_unix/trigger_parse.c
index 747e8c7..5423282 100644
--- a/sr_unix/trigger_parse.c
+++ b/sr_unix/trigger_parse.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2010-2015 Fidelity National Information 	*
+ * Copyright (c) 2010-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -1288,6 +1288,13 @@ boolean_t trigger_parse(char *input, uint4 input_len, char *trigvn, char **value
 		ERROR_MSG_RETURN("Error : Invalid global name:\n", input_len, input);
 	}
 	trigvn_len = (int)(ptr1 - ptr);
+	/* If specified var name is global ^%Y*, the name is illegal to use in a TRIGGER */
+	if ((RESERVED_NAMESPACE_LEN <= trigvn_len) && (0 == MEMCMP_LIT(ptr, RESERVED_NAMESPACE)))
+	{	/* Triggers not allowed for ^%Y*. ERR_PCTYRESERVED error is better issued here but no easy way to fit it in
+		 * ERROR_MSG_RETURN macro so we copy its message text here.
+		 */
+		ERROR_MSG_RETURN("Error : ^%Y* global name not supported:\n", input_len, input);
+	}
 	if (MAX_MIDENT_LEN < trigvn_len)
 	{
 		trigvn_len = MAX_MIDENT_LEN;
diff --git a/sr_unix/trigger_select.c b/sr_unix/trigger_select.c
index 0497714..a49fadf 100644
--- a/sr_unix/trigger_select.c
+++ b/sr_unix/trigger_select.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2010, 2015 Fidelity National Information	*
+ * Copyright (c) 2010-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -242,7 +242,7 @@ STATICFNDEF void write_out_trigger(char *gbl_name, uint4 gbl_name_len, int nam_i
 		BUILD_HASHT_SUB_SUB_CURRKEY(gbl_name, gbl_name_len, LITERAL_HASHLABEL, STRLEN(LITERAL_HASHLABEL));
 		if (!gvcst_get(&trigger_value))
 		{	/* There has to be a #LABEL */
-			if (CDB_STAGNATE > t_tries)
+			if (UPDATE_CAN_RETRY(t_tries, t_fail_hist[t_tries]))
 				t_retry(cdb_sc_triggermod);
 			assert(WBTEST_HELPOUT_TRIGDEFBAD == gtm_white_box_test_case_number);
 			rts_error_csa(CSA_ARG(REG2CSA(gv_cur_region)) VARLSTCNT(8) ERR_TRIGDEFBAD, 6, gbl_name_len,
@@ -259,7 +259,7 @@ STATICFNDEF void write_out_trigger(char *gbl_name, uint4 gbl_name_len, int nam_i
 		BUILD_HASHT_SUB_SUB_CURRKEY(gbl_name, gbl_name_len, LITERAL_HASHCYCLE, LITERAL_HASHCYCLE_LEN);
 		if (!gvcst_get(&trigger_value))
 		{	/* There has to be a #CYCLE */
-			if (CDB_STAGNATE > t_tries)
+			if (UPDATE_CAN_RETRY(t_tries, t_fail_hist[t_tries]))
 				t_retry(cdb_sc_triggermod);
 			assert(WBTEST_HELPOUT_TRIGDEFBAD == gtm_white_box_test_case_number);
 			rts_error_csa(CSA_ARG(REG2CSA(gv_cur_region)) VARLSTCNT(8) ERR_TRIGDEFBAD, 6, gbl_name_len,
@@ -281,7 +281,7 @@ STATICFNDEF void write_out_trigger(char *gbl_name, uint4 gbl_name_len, int nam_i
 			out_rec_ptr = out_rec;
 			if (!gvcst_get(&trigger_value))
 			{	/* There has to be a #NAME */
-				if (CDB_STAGNATE > t_tries)
+				if (UPDATE_CAN_RETRY(t_tries, t_fail_hist[t_tries]))
 					t_retry(cdb_sc_triggermod);
 				assert(WBTEST_HELPOUT_TRIGDEFBAD == gtm_white_box_test_case_number);
 				rts_error_csa(CSA_ARG(REG2CSA(gv_cur_region)) VARLSTCNT(8) ERR_TRIGDEFBAD, 6, gbl_name_len,
@@ -470,7 +470,7 @@ STATICFNDEF void write_gbls_or_names(char *gbl_name, uint4 gbl_name_len, boolean
 			ptr += trigvn_len;
 			if ((mv_trigger_val.str.len == trigvn_len) || ('\0' != *ptr))
 			{	/* We expect $c(0) in the middle of addr. If we dont find it, this is a restartable situation */
-				if (CDB_STAGNATE > t_tries)
+				if (UPDATE_CAN_RETRY(t_tries, t_fail_hist[t_tries]))
 					t_retry(cdb_sc_triggermod);
 				assert(WBTEST_HELPOUT_TRIGDEFBAD == gtm_white_box_test_case_number);
 				rts_error_csa(CSA_ARG(REG2CSA(gv_cur_region)) VARLSTCNT(8) ERR_TRIGDEFBAD, 6,
@@ -481,7 +481,7 @@ STATICFNDEF void write_gbls_or_names(char *gbl_name, uint4 gbl_name_len, boolean
 			A2I(ptr, mv_trigger_val.str.addr + mv_trigger_val.str.len, indx);
 			if (1 > indx)
 			{	/* We expect a valid index */
-				if (CDB_STAGNATE > t_tries)
+				if (UPDATE_CAN_RETRY(t_tries, t_fail_hist[t_tries]))
 					t_retry(cdb_sc_triggermod);
 				assert(WBTEST_HELPOUT_TRIGDEFBAD == gtm_white_box_test_case_number);
 				rts_error_csa(CSA_ARG(REG2CSA(gv_cur_region)) VARLSTCNT(8) ERR_TRIGDEFBAD, 6,
@@ -534,8 +534,10 @@ STATICFNDEF void dump_all_triggers(void)
 	save_gvtarget = gv_target;
 	for (reg_index = 0, reg = gd_header->regions; reg_index < gd_header->n_regions; reg_index++, reg++)
 	{
+		if (IS_STATSDB_REGNAME(reg))
+			continue;
 		GVTR_SWITCH_REG_AND_HASHT_BIND_NAME(reg);
-		if (NULL == cs_addrs)	/* not MM or BG access method, which means GT.CM */
+		if (NULL == cs_addrs)	/* not BG or MM access method */
 			continue;
 		/* gv_target now points to ^#t in region "reg" */
 		if (0 != gv_target->root)
@@ -762,7 +764,7 @@ STATICFNDEF boolean_t trigger_select(char *select_list, uint4 select_list_len)
 	else
 	{
 		len = select_list_len;
-		sel_ptr = strtok_r(save_select_list, ",", &strtok_ptr);
+		sel_ptr = STRTOK_R(save_select_list, ",", &strtok_ptr);
 		do
 		{
 			trig_name = ('^' != *sel_ptr);
@@ -786,12 +788,12 @@ STATICFNDEF boolean_t trigger_select(char *select_list, uint4 select_list_len)
 				/* Skip only if the previous global is the same as the current */
 				if ((prev_len == gbl_len) && (0 == memcmp(prev_ptr, ptr1, gbl_len)))
 					continue;
-				SAVE_TRIGGER_REGION_INFO(save_currkey);
+				SAVE_REGION_INFO(save_currkey, save_gv_target, save_gv_cur_region, save_sgm_info_ptr);
 				prev_ptr = ptr1;
 				prev_len = gbl_len;
-				start_map = gv_srch_map(gd_header, ptr1, gbl_len);
+				start_map = gv_srch_map(gd_header, ptr1, gbl_len, SKIP_BASEDB_OPEN_FALSE);
 				ptr1[gbl_len - 1]++;
-				end_map = gv_srch_map(gd_header, ptr1, gbl_len);
+				end_map = gv_srch_map(gd_header, ptr1, gbl_len, SKIP_BASEDB_OPEN_FALSE);
 				ptr1[gbl_len - 1]--;
 				gvname.var_name.addr = ptr1;
 				gvname.var_name.len = gbl_len;
@@ -805,11 +807,14 @@ STATICFNDEF boolean_t trigger_select(char *select_list, uint4 select_list_len)
 						gvname.var_name.len++;
 					for (map = start_map; map <= end_map; map++)
 					{
+						OPEN_BASEREG_IF_STATSREG(map);
 						reg = map->reg.addr;
 						GET_REG_INDEX(gd_header, reg_start, reg, reg_index);	/* sets "reg_index" */
 						assert(reg_array_size > reg_index);
 						if (!reg_done[reg_index])
 						{	/* this region first encountered now */
+							if (IS_STATSDB_REGNAME(reg))
+								continue;
 							GVTR_SWITCH_REG_AND_HASHT_BIND_NAME(reg);
 							if (NULL == cs_addrs)	/* not BG or MM access method */
 								continue;
@@ -848,9 +853,11 @@ STATICFNDEF boolean_t trigger_select(char *select_list, uint4 select_list_len)
 					len1--;	/* drop the trailing # sign */
 				gvname.var_name.addr = sel_ptr;
 				gvname.var_name.len = len1;
-				SAVE_TRIGGER_REGION_INFO(save_currkey);
+				SAVE_REGION_INFO(save_currkey, save_gv_target, save_gv_cur_region, save_sgm_info_ptr);
 				for (reg = gd_header->regions, reg_top = reg + gd_header->n_regions; reg < reg_top; reg++)
 				{
+					if (IS_STATSDB_REGNAME(reg))
+						continue;
 					GVTR_SWITCH_REG_AND_HASHT_BIND_NAME(reg);
 					if (NULL == cs_addrs)	/* not BG or MM access method */
 						continue;
@@ -860,8 +867,8 @@ STATICFNDEF boolean_t trigger_select(char *select_list, uint4 select_list_len)
 					write_gbls_or_names(gvname.var_name.addr, gvname.var_name.len, trig_name);
 				}
 			}
-			RESTORE_TRIGGER_REGION_INFO(save_currkey);
-		} while (NULL != (sel_ptr = strtok_r(NULL, ",", &strtok_ptr)));	/* Embedded assignment is intended */
+			RESTORE_REGION_INFO(save_currkey, save_gv_target, save_gv_cur_region, save_sgm_info_ptr);
+		} while (NULL != (sel_ptr = STRTOK_R(NULL, ",", &strtok_ptr)));	/* Embedded assignment is intended */
 	}
 	return select_status;
 }
diff --git a/sr_unix/trigger_source_read_andor_verify.c b/sr_unix/trigger_source_read_andor_verify.c
index ad6aa00..5416c48 100644
--- a/sr_unix/trigger_source_read_andor_verify.c
+++ b/sr_unix/trigger_source_read_andor_verify.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2011-2016 Fidelity National Information	*
+ * Copyright (c) 2011-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -12,7 +12,10 @@
 
 #include "mdef.h"
 
+#include "gtm_stdio.h"
+
 #ifdef GTM_TRIGGER
+#include "gtmio.h"
 #include "error.h"
 #include "gdsroot.h"			/* for gdsfhead.h */
 #include "gdsbt.h"			/* for gdsfhead.h */
@@ -25,6 +28,7 @@
 #include "trigger_fill_xecute_buffer.h"
 #include "trigger_gbl_fill_xecute_buffer.h"
 #include "trigger_read_andor_locate.h"
+#include "gtm_trigger_trc.h"
 #include "gvsub2str.h"			/* for COPY_SUBS_TO_GVCURRKEY */
 #include "format_targ_key.h"		/* for COPY_SUBS_TO_GVCURRKEY */
 #include "hashtab.h"			/* for STR_HASH (in COMPUTE_HASH_MNAME) */
@@ -54,6 +58,7 @@
 #include "change_reg.h"			/* for "change_reg" prototype */
 #include "gvnh_spanreg.h"
 #include "min_max.h"
+#include "io.h"
 
 GBLREF	uint4			dollar_tlevel;
 GBLREF	sgmnt_addrs		*cs_addrs;
@@ -321,7 +326,7 @@ STATICFNDEF int trigger_source_raov(mstr *trigname, gd_region *reg, rhdtyp **rtn
 	assert(dollar_tlevel);		/* A TP wrap should have been done by the caller if needed */
 	DBGTRIGR((stderr, "trigger_source_raov: Entered\n"));
 	/* Before we try to save anything, see if there is something to save and initialize stuff if not */
-	SAVE_TRIGGER_REGION_INFO(save_currkey);
+	SAVE_REGION_INFO(save_currkey, save_gv_target, save_gv_cur_region, save_sgm_info_ptr);
 	if (NULL != *rtn_vec)
 		rtn_vector = *rtn_vec;
 	else if (find_rtn_tabent(&rttabent, trigname))
@@ -385,7 +390,7 @@ STATICFNDEF int trigger_source_raov(mstr *trigname, gd_region *reg, rhdtyp **rtn
 		if (runtime_disambiguator_specified
 			|| (TRIG_FAILURE == trigger_source_raov_trigload(trigname, &trigdsc, reg)))
 		{
-			RESTORE_TRIGGER_REGION_INFO(save_currkey);
+			RESTORE_REGION_INFO(save_currkey, save_gv_target, save_gv_cur_region, save_sgm_info_ptr);
 			ISSUE_TRIGNAMENF_ERROR_IF_APPROPRIATE(trigname);
 			return TRIG_FAILURE_RC;
 		}
@@ -413,7 +418,7 @@ STATICFNDEF int trigger_source_raov(mstr *trigname, gd_region *reg, rhdtyp **rtn
 				gv_init_reg(reg);
 			if (&FILE_INFO(reg)->s_addrs != csa)
 			{
-				RESTORE_TRIGGER_REGION_INFO(save_currkey);
+				RESTORE_REGION_INFO(save_currkey, save_gv_target, save_gv_cur_region, save_sgm_info_ptr);
 				ISSUE_TRIGNAMENF_ERROR_IF_APPROPRIATE(trigname);
 				return TRIG_FAILURE_RC;
 			}
@@ -425,13 +430,11 @@ STATICFNDEF int trigger_source_raov(mstr *trigname, gd_region *reg, rhdtyp **rtn
 			if (((NULL == gvnh_reg->gvspan) && (gv_cur_region != reg))
 			    || ((NULL != gvnh_reg->gvspan) && !gvnh_spanreg_ismapped(gvnh_reg, gd_header, reg)))
 			{
-				RESTORE_TRIGGER_REGION_INFO(save_currkey);
+				RESTORE_REGION_INFO(save_currkey, save_gv_target, save_gv_cur_region, save_sgm_info_ptr);
 				ISSUE_TRIGNAMENF_ERROR_IF_APPROPRIATE(trigname);
 				return TRIG_FAILURE_RC;
 			}
 		}
-		DBGTRIGR((stderr, "trigger_source_raov: existing trigger routine has %d bytes of source\n",
-			  ((gv_trigger_t *)rtn_vector->trigr_handle)->xecute_str.str.len));
 		assert(csd == cs_data);
 		tp_set_sgm();
 		/* Ensure that we don't use stale triggers if we are in the third retry OR an explicit transaction */
@@ -442,11 +445,11 @@ STATICFNDEF int trigger_source_raov(mstr *trigname, gd_region *reg, rhdtyp **rtn
 			needs_reload = (db_trigger_cycle_mismatch || ztrig_cycle_mismatch);
 			DBGTRIGR((stderr, "trigger_source_raov: ztrig_cycle_mismatch=%d\tdb_trigger_cycle_mismatch=%d\treload?%d\n",
 				  ztrig_cycle_mismatch, db_trigger_cycle_mismatch, needs_reload));
-			if (needs_reload && (TRIG_FAILURE == trigger_source_raov_trigload(trigname, &trigdsc, reg)) &&
-					(0 == trigdsc->xecute_str.str.len && NULL == rtn_vector->source_code))
+			if (needs_reload && (TRIG_FAILURE == trigger_source_raov_trigload(trigname, &trigdsc, reg))
+					&& (NULL == rtn_vector->source_code))
 			{
 				/* A reload failed (deleted or ^#t busted) and there is nothing cached, issue an error */
-				RESTORE_TRIGGER_REGION_INFO(save_currkey);
+				RESTORE_REGION_INFO(save_currkey, save_gv_target, save_gv_cur_region, save_sgm_info_ptr);
 				ISSUE_TRIGNAMENF_ERROR_IF_APPROPRIATE(trigname);
 				return TRIG_FAILURE_RC;
 			}
@@ -459,12 +462,12 @@ STATICFNDEF int trigger_source_raov(mstr *trigname, gd_region *reg, rhdtyp **rtn
 		if (NULL != trigdsc->rtn_desc.rt_adr)
 		{
 			DBGTRIGR((stderr, "trigger_source_raov: trigger already compiled, all done\n"));
-			RESTORE_TRIGGER_REGION_INFO(save_currkey);
+			RESTORE_REGION_INFO(save_currkey, save_gv_target, save_gv_cur_region, save_sgm_info_ptr);
 			*rtn_vec = rtn_vector;
 			return 0;
 		}
 		/* Else load the trigger source as needed */
-		if ((0 == trigdsc->xecute_str.str.len) && (NULL == rtn_vector->source_code))
+		if (NULL == rtn_vector->source_code)
 		{
 			DBGTRIGR((stderr, "trigger_source_raov: get the source\n"));
 			SET_GVTARGET_TO_HASHT_GBL(csa);
@@ -490,21 +493,12 @@ STATICFNDEF int trigger_source_raov(mstr *trigname, gd_region *reg, rhdtyp **rtn
 		}
 		assert(trigdsc->rtn_desc.rt_adr);
 		assert(trigdsc->rtn_desc.rt_adr == CURRENT_RHEAD_ADR(trigdsc->rtn_desc.rt_adr));
-		/* After the compile is no longer needed so release it */
-		if (0 < trigdsc->xecute_str.str.len)
-		{
-			DBGTRIGR((stderr, "trigger_source_raov: free the source\n"));
-			free(trigdsc->xecute_str.str.addr);
-			trigdsc->xecute_str.str.addr = NULL;
-			trigdsc->xecute_str.str.len = 0;
-		}
 		rtn_vector = trigdsc->rtn_desc.rt_adr;
 	} else
 	{
-		assert(((NULL != trigdsc->xecute_str.str.addr) && (0 < trigdsc->xecute_str.str.len))
-		       || (rtn_vector && NULL !=rtn_vector->source_code));
+		assert(rtn_vector && (NULL !=rtn_vector->source_code));
 	}
-	RESTORE_TRIGGER_REGION_INFO(save_currkey);
+	RESTORE_REGION_INFO(save_currkey, save_gv_target, save_gv_cur_region, save_sgm_info_ptr);
 	assert(rtn_vector);
 	assert(trigdsc == rtn_vector->trigr_handle);
 	*rtn_vec = rtn_vector;
@@ -592,6 +586,7 @@ STATICFNDEF boolean_t trigger_source_raov_trigload(mstr *trigname, gv_trigger_t
 	gvt->db_trigger_cycle = cycle_start;
 	gvt->db_dztrigger_cycle = csa->db_dztrigger_cycle;
 	gvt->trig_local_tn = local_tn;		/* Mark this trigger as being referenced in this transaction */
+	DBGTRIGR((stderr, "trigger_source_raov_trigload: CSA->db_dztrigger_cycle=%d\n", csa->db_dztrigger_cycle));
 	DBGTRIGR((stderr, "trigger_source_raov_trigload: gvt->db_trigger_cycle updated to %d\n", gvt->db_trigger_cycle));
 	SET_GVTARGET_TO_HASHT_GBL(csa);
 	INITIAL_HASHT_ROOT_SEARCH_IF_NEEDED;
diff --git a/sr_unix/trigger_update.c b/sr_unix/trigger_update.c
index 050d822..e9e4691 100644
--- a/sr_unix/trigger_update.c
+++ b/sr_unix/trigger_update.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2010-2015 Fidelity National Information 	*
+ * Copyright (c) 2010-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -31,6 +31,7 @@
 #include "trigger_update_protos.h"
 #include "trigger_compare_protos.h"
 #include "trigger_user_name.h"
+#include "gtm_trigger_trc.h"
 #include "gtm_string.h"
 #include "mv_stent.h"			/* for COPY_SUBS_TO_GVCURRKEY macro */
 #include "gvsub2str.h"			/* for COPY_SUBS_TO_GVCURRKEY */
@@ -326,7 +327,7 @@ static	boolean_t		promptanswer = TRUE;
 /* This error macro is used for all definition errors where the target is ^#t(GVN,<#LABEL|#COUNT|#CYCLE>) */
 #define HASHT_DEFINITION_RETRY_OR_ERROR(SUBSCRIPT, MOREINFO, CSA)	\
 {									\
-	if (CDB_STAGNATE > t_tries)					\
+	if (UPDATE_CAN_RETRY(t_tries, t_fail_hist[t_tries]))		\
 		t_retry(cdb_sc_triggermod);				\
 	else								\
 	{								\
@@ -458,7 +459,7 @@ boolean_t trigger_name_search(char *trigger_name, uint4 trigger_name_len, mval *
 	 * on the max # of duplicated auto-generated names.
 	 */
 	assert(0 < trigger_name_len);
-	SAVE_TRIGGER_REGION_INFO(save_currkey);
+	SAVE_REGION_INFO(save_currkey, save_gv_target, save_gv_cur_region, save_sgm_info_ptr);
 	name_found = FALSE;
 	reg = *srch_reg;
 	if (NULL != reg)
@@ -471,6 +472,8 @@ boolean_t trigger_name_search(char *trigger_name, uint4 trigger_name_len, mval *
 	}
 	for ( ; reg < reg_top; reg++)
 	{
+		if (IS_STATSDB_REGNAME(reg))
+			continue;
 		GVTR_SWITCH_REG_AND_HASHT_BIND_NAME(reg);
 		if (NULL == cs_addrs)	/* not BG or MM access method */
 			continue;
@@ -485,7 +488,7 @@ boolean_t trigger_name_search(char *trigger_name, uint4 trigger_name_len, mval *
 		ptr2 = memchr(ptr, '\0', val->str.len);	/* Do it this way since "val" has multiple fields null separated */
 		if (NULL == ptr2)
 		{	/* We expect $c(0) in the middle of ptr. If we dont find it, this is a restartable situation */
-			if (CDB_STAGNATE > t_tries)
+			if (UPDATE_CAN_RETRY(t_tries, t_fail_hist[t_tries]))
 				t_retry(cdb_sc_triggermod);
 			assert(WBTEST_HELPOUT_TRIGDEFBAD == gtm_white_box_test_case_number);
 			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(6) ERR_TRIGNAMBAD, 4, LEN_AND_LIT("\"#TNAME\""),
@@ -507,7 +510,7 @@ boolean_t trigger_name_search(char *trigger_name, uint4 trigger_name_len, mval *
 		name_found = TRUE;
 		break;
 	}
-	RESTORE_TRIGGER_REGION_INFO(save_currkey);
+	RESTORE_REGION_INFO(save_currkey, save_gv_target, save_gv_cur_region, save_sgm_info_ptr);
 	return name_found;
 }
 
@@ -537,10 +540,12 @@ boolean_t check_unique_trigger_name_full(char **values, uint4 *value_len, mval *
 	*new_match = TRUE;
 	if (0 == value_len[TRIGNAME_SUB])
 		return TRUE;
-	SAVE_TRIGGER_REGION_INFO(save_currkey);
+	SAVE_REGION_INFO(save_currkey, save_gv_target, save_gv_cur_region, save_sgm_info_ptr);
 	overall_name_found = FALSE;
 	for (reg = gd_header->regions, reg_top = reg + gd_header->n_regions; reg < reg_top; reg++)
 	{
+		if (IS_STATSDB_REGNAME(reg))
+			continue;
 		GVTR_SWITCH_REG_AND_HASHT_BIND_NAME(reg);
 		if (NULL == cs_addrs)	/* not BG or MM access method */
 			continue;
@@ -565,7 +570,7 @@ boolean_t check_unique_trigger_name_full(char **values, uint4 *value_len, mval *
 			}
 		}
 	}
-	RESTORE_TRIGGER_REGION_INFO(save_currkey);
+	RESTORE_REGION_INFO(save_currkey, save_gv_target, save_gv_cur_region, save_sgm_info_ptr);
 	return !overall_name_found;
 }
 
@@ -1531,16 +1536,6 @@ STATICFNDEF trig_stats_t trigupdrec_reg(char *trigvn, int trigvn_len, boolean_t
 	if (gv_cur_region->read_only)
 		rts_error_csa(CSA_ARG(csa) VARLSTCNT(4) ERR_TRIGMODREGNOTRW, 2, REG_LEN_STR(gv_cur_region));
 	assert(cs_addrs == gv_target->gd_csa);
-	csa->incr_db_trigger_cycle = TRUE; /* so that we increment csd->db_trigger_cycle at commit time */
-	if (dollar_ztrigger_invoked)
-	{	/* increment db_dztrigger_cycle so that next gvcst_put/gvcst_kill in this transaction, on this region,
-		 * will re-read triggers. Note that the below increment happens for every record added. So, even if a
-		 * single trigger file loaded multiple triggers on the same region, db_dztrigger_cycle will be incremented
-		 * more than one for same transaction. This is considered okay since we only need db_dztrigger_cycle to
-		 * be equal to a different value than gvt->db_dztrigger_cycle.
-		 */
-		csa->db_dztrigger_cycle++;
-	}
 	if (!*jnl_format_done && JNL_WRITE_LOGICAL_RECS(csa))
 	{	/* Attach to jnlpool if replication is turned on. Normally SET or KILL of the ^#t records take care of this
 		 * but in case this is a NO-OP trigger operation that wont happen and we still want to write a
@@ -1780,7 +1775,7 @@ STATICFNDEF trig_stats_t trigupdrec_reg(char *trigvn, int trigvn_len, boolean_t
 								&tmp_index, &db_matched_set, &db_matched_kill,
 								&full_match, trigname[oprtype], trigname[oprtype])))
 					{	/* SET trigger found previously is not found again */
-						if (CDB_STAGNATE > t_tries)
+						if (UPDATE_CAN_RETRY(t_tries, t_fail_hist[t_tries]))
 							t_retry(cdb_sc_triggermod);
 						assert(WBTEST_HELPOUT_TRIGDEFBAD == gtm_white_box_test_case_number);
 						util_out_print_gtmio("Error : Previously found SET trigger " \
@@ -2011,7 +2006,21 @@ STATICFNDEF trig_stats_t trigupdrec_reg(char *trigvn, int trigvn_len, boolean_t
 	}
 	assert((STATS_UNCHANGED_TRIGFILE == trigload_status) || (STATS_NOERROR_TRIGFILE == trigload_status));
 	if ((0 == trig_stats[STATS_ERROR_TRIGFILE]) && (STATS_NOERROR_TRIGFILE == trigload_status))
+	{
 		trigger_incr_cycle(trigvn, trigvn_len);	/* ^#t records changed in this function, increment cycle */
+		csa->incr_db_trigger_cycle = TRUE; /* so that we increment csd->db_trigger_cycle at commit time */
+		if (dollar_ztrigger_invoked)
+		{	/* increment db_dztrigger_cycle so that next gvcst_put/gvcst_kill in this transaction, on this region,
+			 * will re-read triggers. Note that the below increment happens for every record added. So, even if a
+			 * single trigger file loaded multiple triggers on the same region, db_dztrigger_cycle will be incremented
+			 * more than one for same transaction. This is considered okay since we only need db_dztrigger_cycle to
+			 * be equal to a different value than gvt->db_dztrigger_cycle.
+			 */
+			csa->db_dztrigger_cycle++;
+			DBGTRIGR((stderr, "trigupdrec_reg: dollar_ztrigger_invoked CSA->db_dztrigger_cycle=%d\n",
+						csa->db_dztrigger_cycle));
+		}
+	}
 	RETURN_AND_POP_MVALS(trigload_status);
 }
 
diff --git a/sr_unix/trigger_upgrade.c b/sr_unix/trigger_upgrade.c
index 96bdc20..1c99c97 100644
--- a/sr_unix/trigger_upgrade.c
+++ b/sr_unix/trigger_upgrade.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2014-2015 Fidelity National Information 	*
+ * Copyright (c) 2014-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -62,7 +62,8 @@ error_def(ERR_TRIGUPBADLABEL);
 
 #define LITERAL_TRIGJNLREC	"; ^#t physical upgrade from #LABEL 2,3 to #LABEL 4 (no logical change)"
 #define	LITERAL_TRIGJNLREC_LEN	STR_LIT_LEN(LITERAL_TRIGJNLREC)
-LITDEF mval literal_trigjnlrec	= DEFINE_MVAL_LITERAL(MV_STR | MV_NUM_APPROX, 0, 0, LITERAL_TRIGJNLREC_LEN, (char *)LITERAL_TRIGJNLREC, 0, 0);	/* BYPASSOK */
+LITDEF mval literal_trigjnlrec	= DEFINE_MVAL_LITERAL(MV_STR | MV_NUM_APPROX, 0, 0, LITERAL_TRIGJNLREC_LEN,
+							(char *)LITERAL_TRIGJNLREC, 0, 0);
 
 LITREF	mval		literal_batch;
 LITREF	mval		literal_curlabel;
@@ -559,7 +560,7 @@ void	trigger_upgrade(gd_region *reg)
 		/* Switch to new journal file and cut previous link if we did ^#t upgrade on a journaled region */
 		if (do_upgrade && JNL_WRITE_LOGICAL_RECS(csa))
 		{
-			sts = set_jnl_file_close(0);
+			sts = set_jnl_file_close();
 			assert(SS_NORMAL == sts);	/* because we should have done jnl_ensure_open already
 							 * in which case set_jnl_file_close has no way of erroring out.
 							 */
diff --git a/sr_unix/ttt.txt b/sr_unix/ttt.txt
index 5037658..693b1eb 100755
--- a/sr_unix/ttt.txt
+++ b/sr_unix/ttt.txt
@@ -287,6 +287,12 @@ OC_FNZASCII:	pushab	val.0
 OC_FNZAHANDLE:	pushab	val.0
 		pushab	val.1
 		calls	#2,xfer.xf_fnzahandle
+OC_FNZATRANSFORM:	pushab  val.0
+		pushl   val.4
+		pushl   val.3
+		pushl   val.2
+		pushab  val.1
+		calls   #5,xfer.xf_fnzatransform
 OC_FNZBITAND:	pushab	val.2
 		pushab	val.1
 		pushab	val.0
@@ -332,15 +338,20 @@ OC_FNZCALL:	irepab	val.2
 OC_FNZCHAR:	irepl	val.2
 		pushab	val.0
 		calls	val.1,xfer.xf_fnzchar
-OC_FNZCONVERT2: pushab  val.0                   ; /* destination mval */
-                pushab  val.2                   ; /* "U"/"L"/"T" */
-                pushab  val.1                   ; /* string */
-                calls   #3,xfer.xf_fnzconvert2
-OC_FNZCONVERT3: pushab  val.0                   ; /* Destination mval */
-                pushab  val.3                   ; /* target chset */
-                pushab  val.2                   ; /* src chset */
-                pushab  val.1                   ; /* string */
-                calls   #4,xfer.xf_fnzconvert3
+OC_FNZCONVERT2: pushab  val.0		   ; /* destination mval */
+		pushab  val.2		   ; /* "U"/"L"/"T" */
+		pushab  val.1		   ; /* string */
+		calls   #3,xfer.xf_fnzconvert2
+OC_FNZCONVERT3: pushab  val.0		   ; /* Destination mval */
+		pushab  val.3		   ; /* target chset */
+		pushab  val.2		   ; /* src chset */
+		pushab  val.1		   ; /* string */
+		calls   #4,xfer.xf_fnzconvert3
+OC_FNZCOLLATE:  pushab  val.0
+		pushl   val.3
+		pushl   val.2
+		pushab  val.1
+		calls   #4,xfer.xf_fnzcollate
 OC_FNZDATA:	pushab	val.0
 		pushab	val.1
 		calls	#2,xfer.xf_fnzdata
@@ -445,11 +456,11 @@ OC_FNZSIGPROC:	pushab	val.0
 OC_FNZSOCKET:	irepab  val.2
 		pushab  val.0
 		calls   val.1,xfer.xf_fnzsocket
-OC_FNZSUBSTR:   pushab  val.0                   ; /* Destination mval */
-                pushl   val.3                   ; /* max byte length */
-                pushl   val.2                   ; /* starting character position */
-                pushab  val.1                   ; /* string */
-                calls   #4,xfer.xf_fnzsubstr
+OC_FNZSUBSTR:   pushab  val.0		   ; /* Destination mval */
+		pushl   val.3		   ; /* max byte length */
+		pushl   val.2		   ; /* starting character position */
+		pushab  val.1		   ; /* string */
+		calls   #4,xfer.xf_fnzsubstr
 OC_FNZTRANSLATE: pushab	val.0
 		pushab	val.3
 		pushab	val.2
@@ -468,9 +479,9 @@ OC_FNZTRNLNM:	pushab	val.0
 		pushab	val.2
 		pushab	val.1
 		calls	#7,xfer.xf_fnztrnlnm
-OC_FNZWIDTH:    pushab  val.0                   ; /* destination mval */
-                pushab  val.1                   ; /* string */
-                calls   #2,xfer.xf_fnzwidth
+OC_FNZWIDTH:    pushab  val.0		   ; /* destination mval */
+		pushab  val.1		   ; /* string */
+		calls   #2,xfer.xf_fnzwidth
 OC_FOLLOW:	movab	val.1,r0
 		movab	val.2,r1
 		jsb	xfer.xf_follow
diff --git a/sr_unix/util_exit_handler.c b/sr_unix/util_exit_handler.c
index db4c8b8..aa50fe8 100755
--- a/sr_unix/util_exit_handler.c
+++ b/sr_unix/util_exit_handler.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -34,7 +34,6 @@ GBLREF	boolean_t	created_core;
 GBLREF	boolean_t	exit_handler_active;
 GBLREF	boolean_t	skip_exit_handler;
 GBLREF	uint4		dollar_tlevel;
-GBLREF	boolean_t	hold_onto_crit;
 
 void util_exit_handler()
 {
@@ -76,8 +75,6 @@ void util_exit_handler()
 	 * be holding crit in one or more regions and/or we could have other odds/ends to cleanup.
 	 */
 	secshr_db_clnup(NORMAL_TERMINATION);
-	assert(!dollar_tlevel);	/* MUPIP and GT.M are the only ones which can run TP and they have their own exit handlers.
-				 * So no need to run op_trollback here like mupip_exit_handler and gtm_exit_handler. */
 	WITH_CH(exi_ch, gv_rundown(), 0);
 	print_exit_stats();
 	util_out_close();
diff --git a/sr_unix/versions.csh b/sr_unix/versions.csh
index c75b8ac..7700375 100755
--- a/sr_unix/versions.csh
+++ b/sr_unix/versions.csh
@@ -20,6 +20,6 @@
 ############################################
 
 #	gtm_curpro is the current production version
-setenv	gtm_curpro	"V63000"
+setenv	gtm_curpro	"V63000A"
 #	gtm_verno is the current production version
 setenv	gtm_verno	$gtm_curpro
diff --git a/sr_unix/wait_for_disk_space.c b/sr_unix/wait_for_disk_space.c
index 6cd59af..6e41446 100644
--- a/sr_unix/wait_for_disk_space.c
+++ b/sr_unix/wait_for_disk_space.c
@@ -135,9 +135,9 @@ void wait_for_disk_space(sgmnt_addrs *csa, char *fn, int fd, off_t offset, char
 		LSEEKWRITE(fd, offset, buf, count, tmp_errno);
 #		ifdef DEBUG
 		if (LSEEKWRITE_IS_TO_DB == lcl_lseekwrite_target)
-			FAKE_ENOSPC(csa, fake_db_enospc, lcl_lseekwrite_target, tmp_errno)
+			FAKE_ENOSPC(csa, fake_db_enospc, lcl_lseekwrite_target, tmp_errno);
 		else if (LSEEKWRITE_IS_TO_JNL == lcl_lseekwrite_target)
-			FAKE_ENOSPC(csa, fake_jnl_enospc, lcl_lseekwrite_target, tmp_errno)
+			FAKE_ENOSPC(csa, fake_jnl_enospc, lcl_lseekwrite_target, tmp_errno);
 #		endif
 	}
 	/* Report that we were able to continue whether we are still frozen or not. */
diff --git a/sr_unix/wcs_clean_dbsync.c b/sr_unix/wcs_clean_dbsync.c
index 0dba4ca..fdc8fb3 100755
--- a/sr_unix/wcs_clean_dbsync.c
+++ b/sr_unix/wcs_clean_dbsync.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -41,7 +42,6 @@
 #	define	GTM_MALLOC_NO_RENT_ONLY(X)	X
 #endif
 
-NOPIO_ONLY(GBLREF boolean_t	*lseekIoInProgress_flags;)	/* needed for the LSEEK* macros in gtmio.h */
 GBLREF	gd_region		*gv_cur_region;
 GBLREF	sgmnt_addrs		*cs_addrs;
 GBLREF	sgmnt_data_ptr_t	cs_data;
@@ -64,10 +64,10 @@ void	wcs_clean_dbsync(TID tid, int4 hd_len, sgmnt_addrs **csaptr)
 	boolean_t		dbsync_defer_timer;
 	gd_region               *reg, *save_region;
 	jnl_private_control	*jpc;
+	jnl_buffer_ptr_t	jbp;
 	node_local_ptr_t	cnl;
 	sgmnt_addrs		*csa, *check_csaddrs, *save_csaddrs;
 	sgmnt_data_ptr_t	csd, save_csdata;
-	NOPIO_ONLY(boolean_t	lseekIoInProgress_flag;)
 	DEBUG_ONLY(boolean_t	save_ok_to_call_wcs_recover;)
 	boolean_t		is_mm;
 	DCL_THREADGBL_ACCESS;
@@ -96,9 +96,13 @@ void	wcs_clean_dbsync(TID tid, int4 hd_len, sgmnt_addrs **csaptr)
 	csd = csa->hdr;
 	cnl = csa->nl;
 	jpc = csa->jnl;
+	DEBUG_ONLY(jbp = NULL;)
+	if (NULL != jpc)
+		jbp = jpc->jnl_buff;	/* Note: Use "jbp" below ONLY if "jpc" is non-NULL */
 	BG_TRACE_PRO_ANY(csa, n_dbsync_timers);
 	assert(csa == cs_addrs);
-	assert(!JNL_ALLOWED(csd) || NULL != jpc);
+	assert(!JNL_ALLOWED(csd) || (NULL != jpc));
+	assert((NULL == jpc) || (NULL != jbp));
 	/* Note that even if the active queue was emptied when this routine was called, due to
 	 * concurrent update activity, cnl->wcs_active_lvl can be non-zero when we reach here. We
 	 * defer syncing in this case to the next time the active queue becomes empty ( or when we
@@ -111,13 +115,12 @@ void	wcs_clean_dbsync(TID tid, int4 hd_len, sgmnt_addrs **csaptr)
 	dbsync_defer_timer = FALSE;
 	if (!cnl->wcs_active_lvl && !csa->in_wtstart)
 	{	/* Similar to wcs_stale, defer expensive IO flushing if any of the following is true.
-		 *   1) We are in the midst of lseek/read/write IO. This could reset an lseek.
-		 *   2) We are aquiring/releasing crit in any region (Strictly speaking it is enough
-		 *		to check this in the current region, but doesn't harm us much).
+		 *   1) We are aquiring/releasing crit in any region (Strictly speaking it is enough
+		 *	to check this in the current region, but doesn't harm us much).
 		 *	Note that the function "mutex_deadlock_check" resets crit_count to 0 temporarily even though we
 		 *	might actually be in the midst of acquiring crit. Therefore we should not interrupt mainline code
 		 *	if we are in the "mutex_deadlock_check" as otherwise it presents reentrancy issues.
-		 *   3) We have crit in the current region OR are in the middle of commit for this region (even though
+		 *   2) We have crit on any region/jnlpool OR are in the middle of commit for this region (even though
 		 *	we dont hold crit) OR are in wcs_wtstart (potentially holding write interlock and keeping another
 		 *	process in crit waiting) OR we need to wait to obtain crit. At least one reason why we should not wait
 		 *	to obtain crit is because the timeout mechanism for the critical section is currently (as of 2004 May)
@@ -125,45 +128,26 @@ void	wcs_clean_dbsync(TID tid, int4 hd_len, sgmnt_addrs **csaptr)
 		 *	it is a SIGALRM handler and cannot nest while we are already in a SIGALRM handler for the wcs_clean_dbsync.
 		 *   	Were this to happen, we could end up waiting for crit, not being able to interrupt the wait
 		 *   	with a timeout resulting in a hang until crit became available.
-		 *   4) We are in a "fast lock".
-		 *   5) We are in gtm_malloc. Don't want to recurse on malloc.
+		 *   3) We are in a "fast lock".
+		 *   4) We are in gtm_malloc. Don't want to recurse on malloc.
 		 * Other deadlock causing conditions that need to be taken care of
 		 *   1) We already have either the fsync_in_prog or the io_in_prog lock.
 		 *   2) We are currently doing a db_fsync on some region.
+		 * Note that wcs_clean_dbsync is always called in interrupt code and so we do not want to risk running a
+		 * "wcs_recover" inside the call to "grab_crit_immediate" hence the OK_FOR_WCS_RECOVER_FALSE usage below.
 		 */
 		dbsync_defer_timer = TRUE;
-		GET_LSEEK_FLAG(FILE_INFO(reg)->fd, lseekIoInProgress_flag);
-		DEBUG_ONLY(
-			/* We invoke grab_crit_immediate below which can potentially do cache-recoveries if cnl->wc_blocked is set.
-			 * But wcs_recover has an assert that we never invoke it in the final retry. This is to avoid
-			 * restarts in the final retry. But wcs_clean_dbsync invokes grab_crit_immediate only if we dont already
-			 * hold crit and that means we have already finished commit on this particular region (e.g. if
-			 * commit is complete on all regions and crit is released on all of them but before we reset t_tries
-			 * to 0 in t_end/tp_tend) so it is okay to invoke wcs_recover in that case. Signal that to wcs_recover
-			 * by setting ok_to_call_wcs_recover to TRUE. Need to save and restore the global as it could be
-			 * TRUE or FALSE depending on where wcs_clean_dbsync interrupted mainline code.
-			 */
-			assert(CDB_STAGNATE >= t_tries || WBTEST_ENABLED(WBTEST_ANTIFREEZE_GVDATAFAIL));
-			if (CDB_STAGNATE <= t_tries)
-			{
-				save_ok_to_call_wcs_recover = TREF(ok_to_call_wcs_recover);
-				TREF(ok_to_call_wcs_recover) = TRUE;
-			}
-		)
-		if (!mupip_jnl_recover NOPIO_ONLY(&& (FALSE == lseekIoInProgress_flag))
+		if (!mupip_jnl_recover
 			GTM_MALLOC_NO_RENT_ONLY(&& 0 == gtmMallocDepth)
 			&& (0 == crit_count) && !in_mutex_deadlock_check
 			&& (0 == fast_lock_count)
-			&& (!jnl_qio_in_prog)      && (!db_fsync_in_prog)
-			&& (!jpc || !jpc->jnl_buff || (LOCK_AVAILABLE == jpc->jnl_buff->fsync_in_prog_latch.u.parts.latch_pid))
-			&& ((NULL == check_csaddrs) || !T_IN_CRIT_OR_COMMIT_OR_WRITE(check_csaddrs))
-			&& !T_IN_CRIT_OR_COMMIT_OR_WRITE(csa)
-			&& (FALSE != grab_crit_immediate(reg)))
-		{	/* Note that grab_crit_immediate invokes wcs_recover in case cnl->wc_blocked is non-zero.  This means we
-			 * could be doing cache recovery even though we are in interrupt code.  If this is found undesirable, the
-			 * logic in grab_crit_immediate that invokes wcs_recover has to be re-examined.
-			 */
-			/* Note that if we are here, we have obtained crit using grab_crit_immediate. */
+			&& (!jnl_qio_in_prog) && (!db_fsync_in_prog)
+			&& (!jpc || (LOCK_AVAILABLE == jbp->fsync_in_prog_latch.u.parts.latch_pid))
+			&& (0 == TREF(crit_reg_count))
+			&& ((NULL == check_csaddrs) || !T_IN_COMMIT_OR_WRITE(check_csaddrs))
+			&& !T_IN_COMMIT_OR_WRITE(csa)
+			&& (FALSE != grab_crit_immediate(reg, OK_FOR_WCS_RECOVER_FALSE)))
+		{ 	/* Note that if we are here, we have obtained crit using grab_crit_immediate. */
 			assert(csa->ti->early_tn == csa->ti->curr_tn);
 			/* Do not invoke wcs_flu if the database has a newer journal file than what this process had open
 			 * when the dbsync timer was started in wcs_wtstart. This is because mainline (non-interrupt) code
@@ -203,13 +187,13 @@ void	wcs_clean_dbsync(TID tid, int4 hd_len, sgmnt_addrs **csaptr)
 				 * but this is a very rare situation that is considered okay to write the epoch in that case
 				 * as it keeps the if check simple for the most frequent path.
 				 */
-				if ((NULL != jpc) && JNL_HAS_EPOCH(jpc->jnl_buff)
+				if ((NULL != jpc)
 					? (((NOJNL == jpc->channel) || !JNL_FILE_SWITCHED(jpc))
-							&& (jpc->jnl_buff->epoch_tn < csa->ti->curr_tn))
+							&& (jbp->epoch_tn < csa->ti->curr_tn))
 					: (cnl->last_wcsflu_tn < csa->ti->curr_tn))
 				{
-					wcs_flu(WCSFLU_FLUSH_HDR | WCSFLU_WRITE_EPOCH | WCSFLU_SYNC_EPOCH | WCSFLU_CLEAN_DBSYNC
-							| WCSFLU_SPEEDUP_NOBEFORE);
+					wcs_flu(WCSFLU_FLUSH_HDR | WCSFLU_WRITE_EPOCH | WCSFLU_CLEAN_DBSYNC
+											| WCSFLU_SPEEDUP_NOBEFORE);
 					BG_TRACE_PRO_ANY(csa, n_dbsync_writes);
 					/* If MM, file could have been remapped by wcs_flu above.
 					 * If so, cs_data needs to be reset.
@@ -221,11 +205,8 @@ void	wcs_clean_dbsync(TID tid, int4 hd_len, sgmnt_addrs **csaptr)
 			dbsync_defer_timer = FALSE;
 			assert(!csa->hold_onto_crit); /* this ensures we can safely do unconditional rel_crit */
 			rel_crit(reg);
+			DO_DB_FSYNC_OUT_OF_CRIT_IF_NEEDED(reg, csa, jpc, jbp); /* Do equivalent of WCSFLU_SYNC_EPOCH out of crit */
 		}
-		DEBUG_ONLY(
-			if (CDB_STAGNATE <= t_tries)
-				TREF(ok_to_call_wcs_recover) = save_ok_to_call_wcs_recover;
-		)
 	}
 	if (dbsync_defer_timer)
 	{
diff --git a/sr_unix/wcs_clean_dbsync_timer.c b/sr_unix/wcs_clean_dbsync_timer.c
index 40e44cf..df984c4 100755
--- a/sr_unix/wcs_clean_dbsync_timer.c
+++ b/sr_unix/wcs_clean_dbsync_timer.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2011 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -25,6 +26,7 @@
 #include "timers.h"		/* for TIM_DEFER_DBSYNC #define */
 #include "have_crit.h"
 #include "wcs_clean_dbsync.h"
+#include "gtm_reservedDB.h"
 
 GBLREF	uint4			process_id;
 
@@ -39,6 +41,8 @@ void	wcs_clean_dbsync_timer(sgmnt_addrs *csa)
 	 * process P1 empties the queue and another by the wcs_flu() of process P2 (waiting on P1 to finish
 	 * its wcs_wtstart). But this is considered infrequent enough to be better than skipping writing an
 	 * epoch due to incorrect cnl->wcsflu_pid.
+	 *
+	 * Note setting timer also bypassed if this is an statsDB as no flush is ever needed/used.
 	 */
 	if (!process_exiting && (process_id != csa->nl->wcsflu_pid) && (FALSE == csa->dbsync_timer))
 		START_DBSYNC_TIMER(csa, TIM_DEFER_DBSYNC);
diff --git a/sr_unix/wcs_flu.c b/sr_unix/wcs_flu.c
old mode 100755
new mode 100644
index 3bb9c49..222c272
--- a/sr_unix/wcs_flu.c
+++ b/sr_unix/wcs_flu.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -37,6 +37,7 @@
 #include "gt_timer.h"
 #include "is_file_identical.h"
 #include "gtmmsg.h"
+#include "wcs_backoff.h"
 #include "wcs_sleep.h"
 #include "wcs_flu.h"
 #include "wcs_recover.h"
@@ -47,6 +48,7 @@
 #include "gtm_c_stack_trace.h"
 #include "anticipatory_freeze.h"
 #include "eintr_wrappers.h"
+#include "wcs_wt.h"
 
 GBLREF	bool			in_backup;
 GBLREF	gd_region		*gv_cur_region;
@@ -54,6 +56,7 @@ GBLREF	sgmnt_addrs		*cs_addrs;
 GBLREF	uint4			process_id;
 GBLREF	volatile int4		db_fsync_in_prog;	/* for DB_FSYNC macro usage */
 GBLREF	jnl_gbls_t		jgbl;
+GBLREF	bool			in_mupip_freeze;
 #ifdef DEBUG
 GBLREF	boolean_t		in_mu_rndwn_file;
 GBLREF	boolean_t		mupip_jnl_recover;
@@ -73,7 +76,7 @@ error_def(ERR_WCBLOCKED);
 error_def(ERR_WRITERSTUCK);
 
 #define	JNL_WRITE_EPOCH_REC(CSA, CNL, CLEAN_DBSYNC)					\
-{											\
+MBSTART {										\
 	jnl_write_epoch_rec(CSA);							\
 	/* Note: Cannot easily use ? : syntax below as INCR_GVSTATS_COUNTER macro	\
 	 * is not an arithmetic expression but a sequence of statements.		\
@@ -83,25 +86,29 @@ error_def(ERR_WRITERSTUCK);
 		INCR_GVSTATS_COUNTER(CSA, CNL, n_jrec_epoch_regular, 1);		\
 	} else										\
 		INCR_GVSTATS_COUNTER(CSA, CNL, n_jrec_epoch_idle, 1);			\
-}
+} MBEND
 
-#define	WAIT_FOR_CONCURRENT_WRITERS_TO_FINISH(FIX_IN_WTSTART, WAS_CRIT)							\
-{															\
-	GTM_WHITE_BOX_TEST(WBTEST_BUFOWNERSTUCK_STACK, (cnl->in_wtstart), 1);						\
-	if (WRITERS_ACTIVE(cnl))											\
+#define	WAIT_FOR_CONCURRENT_WRITERS_TO_FINISH(FIX_IN_WTSTART, WAS_CRIT, REG, CSA, CNL)					\
+MBSTART {														\
+	unsigned int		lcnt;											\
+        struct shmid_ds         shm_buf;										\
+	int			save_errno;										\
+															\
+	GTM_WHITE_BOX_TEST(WBTEST_BUFOWNERSTUCK_STACK, (CNL->in_wtstart), 1);						\
+	if (WRITERS_ACTIVE(CNL))											\
 	{														\
 		DEBUG_ONLY(int4	in_wtstart;) 		/* temporary for debugging purposes */				\
 		DEBUG_ONLY(int4	intent_wtstart;) 	/* temporary for debugging purposes */				\
 															\
-		assert(csa->now_crit);											\
-		SIGNAL_WRITERS_TO_STOP(cnl);		/* to stop all active writers */				\
+		assert(CSA->now_crit);											\
+		SIGNAL_WRITERS_TO_STOP(CNL);		/* to stop all active writers */				\
 		lcnt = 0;												\
 		do													\
 		{													\
-			DEBUG_ONLY(in_wtstart = cnl->in_wtstart;)							\
-			DEBUG_ONLY(intent_wtstart = cnl->intent_wtstart;)						\
+			DEBUG_ONLY(in_wtstart = CNL->in_wtstart;)							\
+			DEBUG_ONLY(intent_wtstart = CNL->intent_wtstart;)						\
 			GTM_WHITE_BOX_TEST(WBTEST_BUFOWNERSTUCK_STACK, lcnt, (MAXGETSPACEWAIT * 2) - 1);		\
-			GTM_WHITE_BOX_TEST(WBTEST_BUFOWNERSTUCK_STACK, cnl->wtstart_pid[0], process_id);		\
+			GTM_WHITE_BOX_TEST(WBTEST_BUFOWNERSTUCK_STACK, CNL->wtstart_pid[0], process_id);		\
 			if (MAXGETSPACEWAIT DEBUG_ONLY( * 2) == ++lcnt)							\
 			{	/* We have noticed the below assert to fail occasionally on some platforms (mostly	\
 				 * AIX and Linux). We suspect it is because of waiting for another writer that is 	\
@@ -109,22 +116,22 @@ error_def(ERR_WRITERSTUCK);
 				 * to finish. To avoid false failures (where the other writer finishes its job in	\
 				 * a little over a minute) we wait for twice the time in the debug version.		\
 				 */											\
-				GET_C_STACK_MULTIPLE_PIDS("WRITERSTUCK", cnl->wtstart_pid, MAX_WTSTART_PID_SLOTS, 1);	\
+				GET_C_STACK_MULTIPLE_PIDS("WRITERSTUCK", CNL->wtstart_pid, MAX_WTSTART_PID_SLOTS, 1);	\
 				assert((gtm_white_box_test_case_enabled)						\
 					&& ((WBTEST_BUFOWNERSTUCK_STACK == gtm_white_box_test_case_number)		\
 						|| (WBTEST_SLEEP_IN_WCS_WTSTART == gtm_white_box_test_case_number)));	\
-				cnl->wcsflu_pid = 0;									\
-				SIGNAL_WRITERS_TO_RESUME(cnl);								\
+				CNL->wcsflu_pid = 0;									\
+				SIGNAL_WRITERS_TO_RESUME(CNL);								\
 				if (!WAS_CRIT)										\
-					rel_crit(gv_cur_region);							\
+					rel_crit(REG);									\
 				/* Disable white box testing after the first time the					\
 				WBTEST_BUFOWNERSTUCK_STACK mechanism has kicked in. This is because as			\
 				part of the exit handling process, the control once agin comes to wcs_flu		\
 				and at that time we do not want the WBTEST_BUFOWNERSTUCK_STACK white box		\
 				mechanism to kick in.*/									\
 				GTM_WHITE_BOX_TEST(WBTEST_BUFOWNERSTUCK_STACK, gtm_white_box_test_case_enabled, FALSE);	\
-				send_msg_csa(CSA_ARG(csa) VARLSTCNT(5) ERR_WRITERSTUCK, 3, cnl->in_wtstart,		\
-						DB_LEN_STR(gv_cur_region));						\
+				send_msg_csa(CSA_ARG(CSA) VARLSTCNT(5) ERR_WRITERSTUCK, 3, CNL->in_wtstart,		\
+						DB_LEN_STR(REG));							\
 				return FALSE;										\
 			}												\
 			if (-1 == shmctl(udi->shmid, IPC_STAT, &shm_buf))						\
@@ -132,39 +139,73 @@ error_def(ERR_WRITERSTUCK);
 				save_errno = errno;									\
 				if (1 == lcnt)										\
 				{											\
-					send_msg_csa(CSA_ARG(csa) VARLSTCNT(4) ERR_DBFILERR, 2,				\
-							DB_LEN_STR(gv_cur_region));					\
-					send_msg_csa(CSA_ARG(csa) VARLSTCNT(8) ERR_SYSCALL, 5,				\
+					send_msg_csa(CSA_ARG(CSA) VARLSTCNT(4) ERR_DBFILERR, 2,				\
+							DB_LEN_STR(REG));						\
+					send_msg_csa(CSA_ARG(CSA) VARLSTCNT(8) ERR_SYSCALL, 5,				\
 							RTS_ERROR_LITERAL("shmctl()"), CALLFROM, save_errno);		\
 				} 											\
 			} else if (1 == shm_buf.shm_nattch)								\
 			{												\
-				assert((FALSE == csa->in_wtstart) && (0 <= cnl->in_wtstart));				\
-				cnl->in_wtstart = 0;	/* fix improper value of in_wtstart if you are standalone */	\
+				assert((FALSE == CSA->in_wtstart) && (0 <= CNL->in_wtstart));				\
+				CNL->in_wtstart = 0;	/* fix improper value of in_wtstart if you are standalone */	\
 				FIX_IN_WTSTART = TRUE;									\
-				cnl->intent_wtstart = 0;/* fix improper value of intent_wtstart if standalone */	\
+				CNL->intent_wtstart = 0;/* fix improper value of intent_wtstart if standalone */	\
 			} else												\
 				wcs_sleep(lcnt);		/* wait for any in wcs_wtstart to finish */		\
-		} while (WRITERS_ACTIVE(cnl));										\
-		SIGNAL_WRITERS_TO_RESUME(cnl);										\
+		} while (WRITERS_ACTIVE(CNL));										\
+		SIGNAL_WRITERS_TO_RESUME(CNL);										\
 	}														\
-}
+} MBEND
 
-#define REL_CRIT_BEFORE_RETURN			\
-{						\
-	cnl->doing_epoch = FALSE;		\
-	cnl->wcsflu_pid = 0;			\
+#define REL_CRIT_BEFORE_RETURN(CNL, REG)	\
+MBSTART {					\
+	CNL->doing_epoch = FALSE;		\
+	CNL->wcsflu_pid = 0;			\
 	if (!was_crit)				\
-		rel_crit(gv_cur_region);	\
-}
+		rel_crit(REG);			\
+} MBEND
+
+/* The below macro returns TRUE if there is some cache-record is likely still dirty in
+ *	a) active queue     : (CNL->wcs_active_lvl || CRQ->fl) check OR
+ *	b) wip queue        : (CRWIPQ->fl)                     check OR
+ *	c) in neither queue : (N_BTS != CNL->wc_in_free)       check
+ */
+#define	FLUSH_NOT_COMPLETE(CNL, CRQ, CRWIPQ, N_BTS) (CNL->wcs_active_lvl || CRQ->fl || CRWIPQ->fl || (N_BTS != CNL->wc_in_free))
+
+/* Sets RET to FALSE if the caller needs to do a "return FALSE" after macro returns. Sets RET to TRUE otherwise. */
+#define	CLEAR_WIP_QUEUE_IF_NEEDED(ASYNCIO, WTSTART_OR_WTFINI_ERRNO, CNL, CRWIPQ, REG, RET)	\
+MBSTART {											\
+	int	wtfini_errno;									\
+												\
+	RET = TRUE;										\
+	if (ASYNCIO)										\
+	{											\
+		assert(ENOSPC != WTSTART_OR_WTFINI_ERRNO);					\
+		WAIT_FOR_WIP_QUEUE_TO_CLEAR(CNL, CRWIPQ, ((cache_rec_ptr_t) NULL), REG, wtfini_errno);		\
+		if (wtfini_errno)								\
+		{										\
+			if (ENOSPC != wtfini_errno)						\
+			{									\
+				assert(FALSE);							\
+				REL_CRIT_BEFORE_RETURN(CNL, REG);				\
+				RET = FALSE;							\
+			} else									\
+			{									\
+				assert(!WTSTART_OR_WTFINI_ERRNO);				\
+				if (!WTSTART_OR_WTFINI_ERRNO)					\
+					WTSTART_OR_WTFINI_ERRNO = wtfini_errno;			\
+			}									\
+		}										\
+	}											\
+} MBEND
 
 boolean_t wcs_flu(uint4 options)
 {
-	bool			success, was_crit;
+	boolean_t		was_crit, ret;
 	boolean_t		fix_in_wtstart, flush_hdr, jnl_enabled, sync_epoch, write_epoch, need_db_fsync, in_commit;
-	boolean_t		flush_msync, speedup_nobefore, clean_dbsync, return_early, epoch_already_current;
+	boolean_t		flush_msync, speedup_nobefore, clean_dbsync, return_early, epoch_already_current, asyncio;
 	unsigned int		lcnt, pass;
-	int			save_errno, wtstart_errno;
+	int			n_bts, save_errno, wtstart_or_wtfini_errno;
 	jnl_buffer_ptr_t	jb;
 	jnl_private_control	*jpc;
 	uint4			jnl_status, to_wait, to_msg;
@@ -173,10 +214,14 @@ boolean_t wcs_flu(uint4 options)
 	sgmnt_data_ptr_t	csd;
 	node_local_ptr_t	cnl;
 	file_control		*fc;
-	cache_que_head_ptr_t	crq;
-        struct shmid_ds         shm_buf;
+	cache_que_head_ptr_t	crq, crwipq;
 	uint4			fsync_dskaddr;
 	int4			rc;
+	gd_region		*reg;
+#	ifdef DEBUG
+	boolean_t		writers_active;
+	int			wcs_wip_lvl, wcs_active_lvl, wc_in_free; /* copy of cnl noted down for debugging purposes */
+#	endif
 
 	jnl_status = 0;
 	flush_hdr = options & WCSFLU_FLUSH_HDR;
@@ -194,8 +239,13 @@ boolean_t wcs_flu(uint4 options)
 	 * the wcs_flu in the caller will fail because no buffer is pinned at that point.
 	 */
 	in_commit = options & WCSFLU_IN_COMMIT;
-	udi = FILE_INFO(gv_cur_region);
+	reg = gv_cur_region;
+	udi = FILE_INFO(reg);
 	csa = &udi->s_addrs;
+	/* We do not want to do costly WCSFLU_SYNC_EPOCH inside crit. Only exception is if caller holds crit for a lot longer
+	 * than the current operation (e.g. DSE CRIT SEIZE etc.). csa->hold_onto_crit is TRUE in that case. Assert that.
+	 */
+	assert(!sync_epoch || csa->hold_onto_crit || !csa->now_crit);
 	csd = csa->hdr;
 	cnl = csa->nl;
 	assert(cnl->glob_sec_init);
@@ -206,14 +256,19 @@ boolean_t wcs_flu(uint4 options)
 	assert(mupip_jnl_recover || !csa->nl->donotflush_dbjnl);
 	assert(!csa->hold_onto_crit || csa->now_crit);
 	assert(0 == memcmp(csd->label, GDS_LABEL, GDS_LABEL_SZ - 1));
+	jpc = csa->jnl;
 	if (!(was_crit = csa->now_crit))	/* Caution: assignment */
-		grab_crit(gv_cur_region);
+	{
+		DO_DB_FSYNC_OUT_OF_CRIT_IF_NEEDED(reg, csa, jpc, jpc->jnl_buff);
+		grab_crit_encr_cycle_sync(reg);
+	}
+	if (!FREEZE_LATCH_HELD(csa))
+		WAIT_FOR_REGION_TO_UNCHILL(csa, csd);
 	/* jnl_enabled is an overloaded variable. It is TRUE only if JNL_ENABLED(csd) is TRUE
 	 * and if the journal file has been opened in shared memory. If the journal file hasn't
 	 * been opened in shared memory, we needn't (and shouldn't) do any journal file activity.
 	 */
 	jnl_enabled = (JNL_ENABLED(csd) && (0 != cnl->jnl_file.u.inode));
-	jpc = csa->jnl;
 	if (jnl_enabled)
 	{
 		jb = jpc->jnl_buff;
@@ -223,7 +278,7 @@ boolean_t wcs_flu(uint4 options)
 			assert(jb->fsync_dskaddr == jb->freeaddr);
 			assert((dba_bg != csd->acc_meth) || !csd->jnl_before_image
 				|| (!cnl->wcs_active_lvl && !csa->acc_meth.bg.cache_state->cacheq_active.fl));
-			REL_CRIT_BEFORE_RETURN;
+			REL_CRIT_BEFORE_RETURN(cnl, reg);
 			return TRUE;
 		}
 		/* Assert that we never flush the cache in the midst of a database commit. The only exception is MUPIP RUNDOWN */
@@ -236,17 +291,17 @@ boolean_t wcs_flu(uint4 options)
 		 */
 		ADJUST_GBL_JREC_TIME(jgbl, jb);
 		assert(csa == cs_addrs);	/* for jnl_ensure_open */
-		jnl_status = jnl_ensure_open();
+		jnl_status = jnl_ensure_open(reg, csa);
 		WBTEST_ASSIGN_ONLY(WBTEST_WCS_FLU_FAIL, jnl_status, ERR_JNLFILOPN);
 		if (SS_NORMAL != jnl_status)
 		{
 			assert(ERR_JNLFILOPN == jnl_status);
-			send_msg_csa(CSA_ARG(csa) VARLSTCNT(6) jnl_status, 4, JNL_LEN_STR(csd), DB_LEN_STR(gv_cur_region));
+			send_msg_csa(CSA_ARG(csa) VARLSTCNT(6) jnl_status, 4, JNL_LEN_STR(csd), DB_LEN_STR(reg));
 			if (JNL_ENABLED(csd))
 			{	/* If journaling is still enabled, but we failed to open the journal file,
 				 * we don't want to continue processing.
 				 */
-				REL_CRIT_BEFORE_RETURN;
+				REL_CRIT_BEFORE_RETURN(cnl, reg);
 				return FALSE;
 			}
 			jnl_enabled = FALSE;
@@ -259,7 +314,7 @@ boolean_t wcs_flu(uint4 options)
 		epoch_already_current = (jb->post_epoch_freeaddr == jb->freeaddr);	/* crit held, so this stays valid */
 		if (return_early = (speedup_nobefore && !csd->jnl_before_image))
 		{	/* Finish easiest option first. This database has NOBEFORE image journaling and caller has asked for
-			 * processing to be speeded up in that case. Write only an epoch record, dont do heavyweight flush or fsync
+			 * processing to be speeded up in that case. Write only an epoch record, don't do heavyweight flush or fsync
 			 * of db.This will avoid bunching of IO at the epoch time like is the case with before-image journaling
 			 * where this is currently necessary for correctness. But for nobefore, there is no need to do this since
 			 * no backward recovery will be performed. Note that if db has journaling disabled OR enabled with before-
@@ -275,7 +330,7 @@ boolean_t wcs_flu(uint4 options)
 			 * current database transaction number. If this relation is not maintained by GT.M, Rollback/Recovery logic
 			 * can issue JNLDBTNNOMATCH error. To avoid this situation, flush and sync the DB file header.
 			 */
-			fileheader_sync(gv_cur_region);
+			fileheader_sync(reg);
 			assert(NULL != jpc);
 			if (!jgbl.mur_extract && !epoch_already_current)
 			{
@@ -288,21 +343,21 @@ boolean_t wcs_flu(uint4 options)
 		if (fsync_dskaddr != jb->freeaddr)
 		{
 			assert(fsync_dskaddr <= jb->dskaddr);
-			if (SS_NORMAL != (jnl_status = jnl_flush(gv_cur_region)))
+			if (SS_NORMAL != (jnl_status = jnl_flush(reg)))
 			{
 				assert(NOJNL == jpc->channel); /* jnl file lost */
-				REL_CRIT_BEFORE_RETURN;
+				REL_CRIT_BEFORE_RETURN(cnl, reg);
 				send_msg_csa(CSA_ARG(csa) VARLSTCNT(9) ERR_JNLFLUSH, 2, JNL_LEN_STR(csd), ERR_TEXT, 2,
 					RTS_ERROR_TEXT("Error with journal flush during wcs_flu1"), jnl_status);
 				return FALSE;
 			}
 			assert(jb->freeaddr == jb->dskaddr);
-			jnl_fsync(gv_cur_region, jb->dskaddr);
+			jnl_fsync(reg, jb->dskaddr);
 			assert(jb->fsync_dskaddr == jb->dskaddr);
 		}
 		if (return_early)
 		{
-			REL_CRIT_BEFORE_RETURN;
+			REL_CRIT_BEFORE_RETURN(cnl, reg);
 			return TRUE;
 		}
 	}
@@ -312,7 +367,7 @@ boolean_t wcs_flu(uint4 options)
 	if (dba_mm == csd->acc_meth)
 	{
 		if (WBTEST_ENABLED(WBTEST_WCS_FLU_FAIL)
-			|| ((csd->freeze || flush_msync) && (csa->ti->last_mm_sync != csa->ti->curr_tn)))
+			|| ((FROZEN(csd) || flush_msync) && (csa->ti->last_mm_sync != csa->ti->curr_tn)))
 		{
 			#ifdef _AIX
 			GTM_DB_FSYNC(csa, udi->fd, rc);
@@ -324,143 +379,187 @@ boolean_t wcs_flu(uint4 options)
 				csa->ti->last_mm_sync = csa->ti->curr_tn;
 			} else
 			{
-				REL_CRIT_BEFORE_RETURN;
-				send_msg_csa(CSA_ARG(csa) VARLSTCNT(8) ERR_DBFILERR, 2, DB_LEN_STR(gv_cur_region), ERR_TEXT, 2,
+				REL_CRIT_BEFORE_RETURN(cnl, reg);
+				send_msg_csa(CSA_ARG(csa) VARLSTCNT(8) ERR_DBFILERR, 2, DB_LEN_STR(reg), ERR_TEXT, 2,
 					RTS_ERROR_TEXT("Error during file msync during flush"));
 				return FALSE;
 			}
 		}
-	}
-	if (dba_mm != csd->acc_meth)
+	} else
 	{	/* If not mupip rundown, wait for ALL active phase2 commits to complete first.
 		 * In case of mupip rundown, we know no one else is accessing shared memory so no point waiting.
 		 */
+		asyncio = csd->asyncio;
 		assert(!in_mu_rndwn_file || (0 == cnl->wcs_phase2_commit_pidcnt));
 		if (WBTEST_ENABLED(WBTEST_WCS_FLU_FAIL) || (cnl->wcs_phase2_commit_pidcnt && !wcs_phase2_commit_wait(csa, NULL)))
 		{
 			assert((WBTEST_CRASH_SHUTDOWN_EXPECTED == gtm_white_box_test_case_number) /* see wcs_phase2_commit_wait.c */
 				|| (WBTEST_WCS_FLU_FAIL == gtm_white_box_test_case_number));
-			REL_CRIT_BEFORE_RETURN;
+			REL_CRIT_BEFORE_RETURN(cnl, reg);
 			return FALSE;	/* We expect the caller to trigger cache-recovery which will fix this counter */
 		}
 		/* Now that all concurrent commits are complete, wait for these dirty buffers to be flushed to disk.
 		 * Note that calling wcs_wtstart just once assumes that if we ask it to flush all the buffers, it will.
-		 * This may not be true in case of twins. But this is Unix. So not an issue.
+		 * This may not be true in case of twins since "wcs_wtstart" has to wait for the twin link to be broken
+		 * by "wcs_wtfini" before it can issue the write of the newer twin. We handle that case by calling
+		 * "wcs_wtstart" again down below.
 		 */
-		wtstart_errno = wcs_wtstart(gv_cur_region, csd->n_bts);		/* Flush it all */
+		WCS_OPS_TRACE(csa, process_id, wcs_ops_flu1, 0, 0, 0, 0, 0);
+		DEBUG_ONLY(writers_active = WRITERS_ACTIVE(cnl);) /* Note down any concurrent writers BEFORE "wcs_wtstart" call.
+								   * This is needed by a later assert.
+								   */
+		n_bts = csd->n_bts;
+		wtstart_or_wtfini_errno = wcs_wtstart(reg, n_bts, NULL, NULL);		/* Flush it all */
 		/* At this point the cache should have been flushed except if some other process is in wcs_wtstart waiting
 		 * to flush the dirty buffer that it has already removed from the active queue. Wait for it to finish.
 		 */
 		fix_in_wtstart = FALSE;		/* set to TRUE by the following macro if we needed to correct cnl->in_wtstart */
-		WAIT_FOR_CONCURRENT_WRITERS_TO_FINISH(fix_in_wtstart, was_crit);
-		/* Ideally at this point, the cache should have been flushed. But there is a possibility that the other
-		 *   process in wcs_wtstart which had already removed the dirty buffer from the active queue found (because
-		 *   csr->jnl_addr > jb->dskaddr) that it needs to be reinserted and placed it back in the active queue.
-		 *   In this case, issue another wcs_wtstart to flush the cache. Even if a concurrent writer picks up an
-		 *   entry, he should be able to write it out since the journal is already flushed.
-		 * The check for whether the cache has been flushed is two-pronged. One via "wcs_active_lvl" and the other
-		 *   via the active queue head. Ideally, both are interdependent and checking on "wcs_active_lvl" should be
-		 *   enough, but we don't want to take a risk in PRO (in case wcs_active_lvl is incorrect).
-		 */
+#		ifdef DEBUG
+		wcs_wip_lvl = cnl->wcs_wip_lvl;
+		wcs_active_lvl = cnl->wcs_active_lvl;
+		wc_in_free = cnl->wc_in_free;
+#		endif
+		crwipq = &csa->acc_meth.bg.cache_state->cacheq_wip;
+		assert(asyncio || !crwipq->fl);
+		WCS_OPS_TRACE(csa, process_id, wcs_ops_flu2, 0, 0, 0, 0, 0);
+		WAIT_FOR_CONCURRENT_WRITERS_TO_FINISH(fix_in_wtstart, was_crit, reg, csa, cnl);
+		CLEAR_WIP_QUEUE_IF_NEEDED(asyncio, wtstart_or_wtfini_errno, cnl, crwipq, reg, ret);
+		if (!ret)
+		{	/* We expect caller to trigger cache-recovery which will fix the wip queue */
+			return FALSE;
+		}
+		WCS_OPS_TRACE(csa, process_id, wcs_ops_flu3, 0, 0, 0, 0, 0);
 		crq = &csa->acc_meth.bg.cache_state->cacheq_active;
-		assert(((0 <= cnl->wcs_active_lvl) && (cnl->wcs_active_lvl || 0 == crq->fl)) || (ENOSPC == wtstart_errno));
+		/* At this point, we expect the cache to be flushed. Exceptions are
+		 *	a) twinning : "wcs_wtstart" could be waiting for a twin to be broken by "wcs_wtfini"
+		 *		OR "wcs_wtfini" could have reinserted a cr back in active queue because cr->epid
+		 *		corresponded to a dead pid.
+		 *	b) A concurrent writer (that was active before we did the "wcs_wtstart" above) had removed a
+		 *		cache record from the active queue but could not flush it out
+		 *		(e.g. cr->jnl_addr > jb->fsync_dskaddr) and so reinserted it back in the active queue.
+		 *	c) ENOSPC errors
+		 *	d) white-box cases which induce error codepaths.
+		 * Take this into account in the below assert.
+		 * The check for whether the cache has been flushed is multi-pronged. See FLUSH_NOT_COMPLETE macro definition.
+		 */
+		assert(!FLUSH_NOT_COMPLETE(cnl, crq, crwipq, n_bts) || TWINNING_ON(csd) || writers_active
+			|| (ENOSPC == wtstart_or_wtfini_errno) || gtm_white_box_test_case_enabled);
 #		ifdef DEBUG
+		/* White-box code to exercise error codepaths */
 		if (in_commit)
 			GTM_WHITE_BOX_TEST(WBTEST_WCS_FLU_IOERR, cnl->wcs_active_lvl, 1);
 		GTM_WHITE_BOX_TEST(WBTEST_ANTIFREEZE_OUTOFSPACE, cnl->wcs_active_lvl, 1);
 #		endif
-		if (cnl->wcs_active_lvl || crq->fl)
-		{
-			wtstart_errno = wcs_wtstart(gv_cur_region, csd->n_bts);		/* Flush it all */
-			WAIT_FOR_CONCURRENT_WRITERS_TO_FINISH(fix_in_wtstart, was_crit);
+		if (FLUSH_NOT_COMPLETE(cnl, crq, crwipq, n_bts))
+		{	/* Some cache-record is likely still dirty in either active queue or wip queue or in neither queue */
+			wtstart_or_wtfini_errno = wcs_wtstart(reg, n_bts, NULL, NULL);		/* Flush it all */
+			WAIT_FOR_CONCURRENT_WRITERS_TO_FINISH(fix_in_wtstart, was_crit, reg, csa, cnl);
+			WCS_OPS_TRACE(csa, process_id, wcs_ops_flu4, 0, 0, 0, 0, 0);
+			CLEAR_WIP_QUEUE_IF_NEEDED(asyncio, wtstart_or_wtfini_errno, cnl, crwipq, reg, ret);
+			if (!ret)
+			{	/* We expect caller to trigger cache-recovery which will fix the wip queue */
+				return FALSE;
+			}
+			WCS_OPS_TRACE(csa, process_id, wcs_ops_flu5, 0, 0, 0, 0, 0);
 #			ifdef DEBUG
 			if (in_commit)
 			{
 				GTM_WHITE_BOX_TEST(WBTEST_WCS_FLU_IOERR, cnl->wcs_active_lvl, 1);
-				GTM_WHITE_BOX_TEST(WBTEST_WCS_FLU_IOERR, wtstart_errno, ENOENT);
+				GTM_WHITE_BOX_TEST(WBTEST_WCS_FLU_IOERR, wtstart_or_wtfini_errno, ENOENT);
 			}
 			if (gtm_white_box_test_case_enabled && (WBTEST_ANTIFREEZE_OUTOFSPACE == gtm_white_box_test_case_number))
-			{
+			{	/* Simulate an ENOSPC return from "wcs_wtstart" or "wcs_wtfini" (if asyncio is TRUE) */
 				cnl->wcs_active_lvl = 1;
-				wtstart_errno = ENOSPC;
+				wtstart_or_wtfini_errno = ENOSPC;
 			}
 #			endif
-			if (cnl->wcs_active_lvl || crq->fl)		/* give allowance in PRO */
+			if (FLUSH_NOT_COMPLETE(cnl, crq, crwipq, n_bts)) /* give allowance in PRO */
 			{
-				if (ENOSPC == wtstart_errno)
-				{	/* wait for csd->wait_disk_space seconds, and give up if still not successful */
+				if (ENOSPC == wtstart_or_wtfini_errno)
+				{	/* wait for at least csd->wait_disk_space seconds, and give up if still not successful */
+					WCS_OPS_TRACE(csa, process_id, wcs_ops_flu6, 0, 0, 0, 0, 0);
 					to_wait = csd->wait_disk_space;
 					to_msg = (to_wait / 8) ? (to_wait / 8) : 1; /* send message 8 times */
-					while ((0 < to_wait) && (ENOSPC == wtstart_errno))
+					while ((0 < to_wait) && (ENOSPC == wtstart_or_wtfini_errno))
 					{
-						if ((to_wait == csd->wait_disk_space)
-						    || (0 == to_wait % to_msg))
+						if ((to_wait == csd->wait_disk_space) || (0 == (to_wait % to_msg)))
 						{
 							send_msg_csa(CSA_ARG(csa) VARLSTCNT(7) ERR_WAITDSKSPACE, 4,
-								 process_id, to_wait, DB_LEN_STR(gv_cur_region), wtstart_errno);
+								 process_id, to_wait, DB_LEN_STR(reg), wtstart_or_wtfini_errno);
 							gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(7) ERR_WAITDSKSPACE, 4,
-								   process_id, to_wait, DB_LEN_STR(gv_cur_region), wtstart_errno);
+								   process_id, to_wait, DB_LEN_STR(reg), wtstart_or_wtfini_errno);
 						}
 						hiber_start(1000);
 						to_wait--;
-						wtstart_errno = wcs_wtstart(gv_cur_region, csd->n_bts);
-						if (0 == crq->fl)
+						wtstart_or_wtfini_errno = wcs_wtstart(reg, n_bts, NULL, NULL);	/* Flush it all */
+						CLEAR_WIP_QUEUE_IF_NEEDED(asyncio, wtstart_or_wtfini_errno, cnl, crwipq, reg, ret);
+						if (!ret)
+						{	/* We expect caller to trigger cache-recovery which will fix wip queue */
+							return FALSE;
+						}
+						if (!FLUSH_NOT_COMPLETE(cnl, crq, crwipq, n_bts))
 							break;
 					}
-					if ((to_wait <= 0) && (cnl->wcs_active_lvl || crq->fl))
+					if ((to_wait <= 0) && FLUSH_NOT_COMPLETE(cnl, crq, crwipq, n_bts))
 					{	/* not enough space became available after the wait */
 						send_msg_csa(CSA_ARG(csa) VARLSTCNT(5) ERR_OUTOFSPACE, 3,
-								DB_LEN_STR(gv_cur_region), process_id);
+								DB_LEN_STR(reg), process_id);
 						rts_error_csa(CSA_ARG(csa) VARLSTCNT(5) ERR_OUTOFSPACE, 3,
-								DB_LEN_STR(gv_cur_region), process_id);
+								DB_LEN_STR(reg), process_id);
 					}
 				} else
-				{	/* There are four different cases we know of currently when this is possible:
+				{	/* There are different cases we know of currently when this is possible all of which
+					 * we currently test with white-box test cases.
 					 * (a) If a process encountered an error in the midst of committing in phase2 and
-					 * secshr_db_clnup completed the commit for it and set wc_blocked to TRUE (even though
-					 * it was OUT of crit) causing the wcs_wtstart calls done above to do nothing.
+					 *    secshr_db_clnup completed the commit for it and set wc_blocked to TRUE (even though
+					 *    it was OUT of crit) causing the wcs_wtstart calls done above to do nothing.
 					 * (b) If a process performing multi-region TP transaction encountered an error in
-					 * phase1 of the commit, but at least one of the participating regions have completed
-					 * the phase1 and released crit, secshr_db_clnup will set wc_blocked on all the regions
-					 * (including those that will be OUTSIDE crit) that participated in the commit. Hence,
-					 * like (a), wcs_wtstart calls done above will return immediately.
-					 * But phase1 and phase2 commit errors are currently enabled only through white-box testing.
+					 *    phase1 of the commit, but at least one of the participating regions have completed
+					 *    the phase1 and released crit, secshr_db_clnup will set wc_blocked on all the regions
+					 *    (including those that will be OUTSIDE crit) that participated in the commit. Hence,
+					 *    like (a), wcs_wtstart calls done above will return immediately. But phase1 and
+					 *    phase2 commit errors are currently enabled only through white-box testing.
 					 * (c) If a test does crash shutdown (kill -9) that hit the process in the middle of
-					 * wcs_wtstart which means the writes did not complete successfully.
+					 *    wcs_wtstart which means the writes did not complete successfully.
 					 * (d) If WBTEST_WCS_FLU_IOERR/WBTEST_WCS_WTSTART_IOERR white box test case is set that
-					 * forces wcs_wtstart invocations to end up with I/O errors.
+					 *    forces wcs_wtstart invocations to end up with I/O errors.
 					 */
+					WCS_OPS_TRACE(csa, process_id, wcs_ops_flu7, 0, 0, 0, wtstart_or_wtfini_errno, 0);
 					assert((WBTEST_BG_UPDATE_PHASE2FAIL == gtm_white_box_test_case_number)
 						|| (WBTEST_BG_UPDATE_BTPUTNULL == gtm_white_box_test_case_number)
+						|| (WBTEST_BG_UPDATE_DBCSHGET_INVALID == gtm_white_box_test_case_number)
+						|| (WBTEST_BG_UPDATE_DBCSHGETN_INVALID == gtm_white_box_test_case_number)
+						|| (WBTEST_BG_UPDATE_DBCSHGETN_INVALID2 == gtm_white_box_test_case_number)
 						|| (WBTEST_CRASH_SHUTDOWN_EXPECTED == gtm_white_box_test_case_number)
 						|| (WBTEST_WCS_FLU_IOERR == gtm_white_box_test_case_number)
 						|| (WBTEST_WCS_WTSTART_IOERR == gtm_white_box_test_case_number)
-						|| (WBTEST_ANTIFREEZE_DBDANGER == gtm_white_box_test_case_number)
-					        || (WBTEST_ANTIFREEZE_JNLCLOSE == gtm_white_box_test_case_number));
-					if (0 == wtstart_errno)
+						|| (WBTEST_ANTIFREEZE_JNLCLOSE == gtm_white_box_test_case_number)
+						|| ((WBTEST_ANTIFREEZE_OUTOFSPACE == gtm_white_box_test_case_number) && asyncio));
+					if (0 == wtstart_or_wtfini_errno)
 					{
 						SET_TRACEABLE_VAR(cnl->wc_blocked, TRUE);
 						BG_TRACE_PRO_ANY(csa, wcb_wcs_flu1);
 						send_msg_csa(CSA_ARG(csa) VARLSTCNT(8) ERR_WCBLOCKED, 6,
 								LEN_AND_LIT("wcb_wcs_flu1"), process_id, &csa->ti->curr_tn,
-								DB_LEN_STR(gv_cur_region));
+								DB_LEN_STR(reg));
 					} else
 					{	/* Encountered I/O error. Transfer control to error trap */
-						rts_error_csa(CSA_ARG(csa) VARLSTCNT(7) ERR_DBIOERR, 4, REG_LEN_STR(gv_cur_region),
-								DB_LEN_STR(gv_cur_region), wtstart_errno);
+						rts_error_csa(CSA_ARG(csa) VARLSTCNT(7) ERR_DBIOERR, 4, REG_LEN_STR(reg),
+								DB_LEN_STR(reg), wtstart_or_wtfini_errno);
+						assert(FALSE);	/* control should not come back here */
 					}
 					if (in_commit)
 					{	/* We should NOT be invoking wcs_recover as otherwise the callers (t_end or tp_tend)
 						 * will get confused (see explanation above where variable "in_commit" gets set).
 						 */
-						assert(was_crit);	/* so dont need to rel_crit */
+						assert(was_crit);	/* so don't need to rel_crit */
 						cnl->doing_epoch = FALSE;
 						cnl->wcsflu_pid = 0;
 						return FALSE;
 					}
 					assert(!jnl_enabled || jb->fsync_dskaddr == jb->freeaddr);
-					if (0 == wtstart_errno)
-						wcs_recover(gv_cur_region);
+					assert(0 == wtstart_or_wtfini_errno);
+					wcs_recover(reg);
 					if (jnl_enabled)
 					{
 						fsync_dskaddr = jb->fsync_dskaddr;
@@ -471,10 +570,10 @@ boolean_t wcs_flu(uint4 options)
 							assert((jb->freeaddr - fsync_dskaddr) >= INCTN_RECLEN);
 							/* above assert has a >= instead of == due to possible
 							 * ALIGN record in between */
-							if (SS_NORMAL != (jnl_status = jnl_flush(gv_cur_region)))
+							if (SS_NORMAL != (jnl_status = jnl_flush(reg)))
 							{
 								assert(NOJNL == jpc->channel); /* jnl file lost */
-								REL_CRIT_BEFORE_RETURN;
+								REL_CRIT_BEFORE_RETURN(cnl, reg);
 								send_msg_csa(CSA_ARG(csa) VARLSTCNT(9) ERR_JNLFLUSH, 2,
 									JNL_LEN_STR(csd), ERR_TEXT, 2,
 									RTS_ERROR_TEXT("Error with journal flush during wcs_flu2"),
@@ -482,7 +581,7 @@ boolean_t wcs_flu(uint4 options)
 								return FALSE;
 							}
 							assert(jb->freeaddr == jb->dskaddr);
-							jnl_fsync(gv_cur_region, jb->dskaddr);
+							jnl_fsync(reg, jb->dskaddr);
 							/* Use jb->fsync_dskaddr (instead of "fsync_dskaddr") below as the
 							 * shared memory copy is more uptodate (could have been updated by
 							 * "jnl_fsync" call above).
@@ -490,19 +589,37 @@ boolean_t wcs_flu(uint4 options)
 							assert(jb->fsync_dskaddr == jb->dskaddr);
 						}
 					}
-					wcs_wtstart(gv_cur_region, csd->n_bts);		/* Flush it all */
-					WAIT_FOR_CONCURRENT_WRITERS_TO_FINISH(fix_in_wtstart, was_crit);
-					if (cnl->wcs_active_lvl || crq->fl)
+					/* After the "wcs_recover" call above, it is possible a dirty cache-record which was
+					 * in the wip queue and corresponded to a dead pid got re-inserted into the wip
+					 * queue. In that case, the call to WAIT_FOR_WIP_QUEUE_CLEAR (which in turn calls
+					 * "wcs_wtfini") would reinsert this into the active queue. So we need to call
+					 * "wcs_wtstart"/WAIT_FOR_WIP_QUEUE_CLEAR once more to clean this out. Hence the
+					 * loop count of 2 below.
+					 */
+					for (lcnt = 0; lcnt < 2; lcnt++)
 					{
-						REL_CRIT_BEFORE_RETURN;
-						assertpro(FALSE);
+						wtstart_or_wtfini_errno = wcs_wtstart(reg, n_bts, NULL, NULL);	/* Flush it all */
+						WAIT_FOR_CONCURRENT_WRITERS_TO_FINISH(fix_in_wtstart, was_crit, reg, csa, cnl);
+						CLEAR_WIP_QUEUE_IF_NEEDED(asyncio, wtstart_or_wtfini_errno, cnl, crwipq, reg, ret);
+						if (!ret)
+						{	/* We expect caller to trigger cache-recovery which will fix wip queue */
+							return FALSE;
+						}
+						if (FLUSH_NOT_COMPLETE(cnl, crq, crwipq, n_bts))
+						{
+							if (!lcnt)
+								continue;
+							/* Something wrong inspite of all these attempts */
+							REL_CRIT_BEFORE_RETURN(cnl, reg);
+							assertpro(FALSE);
+						}
 					}
 				}
 			}
 		}
 	}
 	if (flush_hdr)
-		fileheader_sync(gv_cur_region);
+		fileheader_sync(reg);
 	if (jnl_enabled && write_epoch)
 	{	/* If need to write an epoch,
 		 *	(1) get hold of the jnl io_in_prog lock.
@@ -526,7 +643,7 @@ boolean_t wcs_flu(uint4 options)
 			{
 				GET_C_STACK_MULTIPLE_PIDS("MAXJNLQIOLOCKWAIT", cnl->wtstart_pid, MAX_WTSTART_PID_SLOTS, 1);
 				assert(FALSE);
-				REL_CRIT_BEFORE_RETURN;
+				REL_CRIT_BEFORE_RETURN(cnl, reg);
 				assertpro(FALSE);
 			}
 			wcs_sleep(SLEEP_JNLQIOLOCKWAIT);	/* since it is a short lock, sleep the minimum */
@@ -550,7 +667,7 @@ boolean_t wcs_flu(uint4 options)
 		}
 	}
 	cnl->last_wcsflu_tn = csa->ti->curr_tn;	/* record when last successful wcs_flu occurred */
-	REL_CRIT_BEFORE_RETURN;
+	REL_CRIT_BEFORE_RETURN(cnl, reg);
 	/* sync the epoch record in the journal if needed. */
 	if (jnl_enabled && write_epoch && sync_epoch && (csa->ti->curr_tn == csa->ti->early_tn))
 	{	/* Note that if we are in the midst of committing and came here through a bizarre
@@ -558,17 +675,17 @@ boolean_t wcs_flu(uint4 options)
 		 * Note that we are guaranteed to come back to wcs_wtstart since we are currently in commit-phase
 		 * and will dirty atleast one block as part of the commit for a wtstart timer to be triggered.
 		 */
-		jnl_wait(gv_cur_region);
+		jnl_wait(reg);
 	}
 	if (need_db_fsync && JNL_ALLOWED(csd))
 	{
 		if (dba_mm != csd->acc_meth)
 		{
-			DB_FSYNC(gv_cur_region, udi, csa, db_fsync_in_prog, save_errno);
+			DB_FSYNC(reg, udi, csa, db_fsync_in_prog, save_errno);
 			if (0 != save_errno)
 			{
-				send_msg_csa(CSA_ARG(csa) VARLSTCNT(5) ERR_DBFSYNCERR, 2, DB_LEN_STR(gv_cur_region), save_errno);
-				rts_error_csa(CSA_ARG(csa) VARLSTCNT(5) ERR_DBFSYNCERR, 2, DB_LEN_STR(gv_cur_region), save_errno);
+				send_msg_csa(CSA_ARG(csa) VARLSTCNT(5) ERR_DBFSYNCERR, 2, DB_LEN_STR(reg), save_errno);
+				rts_error_csa(CSA_ARG(csa) VARLSTCNT(5) ERR_DBFSYNCERR, 2, DB_LEN_STR(reg), save_errno);
 				assert(FALSE);	/* should not come here as the rts_error above should not return */
 				return FALSE;
 			}
diff --git a/sr_unix/wcs_get_space.c b/sr_unix/wcs_get_space.c
index f1097fe..0425939 100644
--- a/sr_unix/wcs_get_space.c
+++ b/sr_unix/wcs_get_space.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2007-2015 Fidelity National Information 	*
+ * Copyright (c) 2007-2016 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -34,9 +34,11 @@
 #include "error.h"		/* for gtm_fork_n_core() prototype */
 #include "gtm_rel_quant.h"
 #include "performcaslatchcheck.h"
+#include "wcs_backoff.h"
 #include "wcs_phase2_commit_wait.h"
 #include "wcs_recover.h"
 #include "gtm_c_stack_trace.h"
+#include "wcs_wt.h"
 
 GBLDEF	cache_rec_ptr_t		get_space_fail_cr;	/* gbldefed to be accessible in a pro core */
 GBLDEF	wcs_conflict_trace_t	*get_space_fail_array;	/* gbldefed to be accessilbe in a pro core */
@@ -47,7 +49,6 @@ GBLREF	sgmnt_data_ptr_t	cs_data;
 GBLREF	gd_region		*gv_cur_region;	/* needed for the JNL_ENSURE_OPEN_WCS_WTSTART macro */
 GBLREF	int			num_additional_processors;
 GBLREF	uint4			process_id;
-GBLREF	volatile int4		fast_lock_count;
 
 error_def(ERR_DBFILERR);
 error_def(ERR_WAITDSKSPACE);
@@ -56,14 +57,17 @@ error_def(ERR_GBLOFLOW);
 #define	WCS_CONFLICT_TRACE_ARRAYSIZE	64
 #define	LCNT_INTERVAL			DIVIDE_ROUND_UP(UNIX_GETSPACEWAIT, WCS_CONFLICT_TRACE_ARRAYSIZE)
 
-#define WCS_GET_SPACE_RETURN_FAIL(TRACEARRAY, CR)					\
-{											\
-	assert(FALSE);			/* We have failed */				\
-	get_space_fail_cr = CR;								\
-	get_space_fail_array = TRACEARRAY;						\
-	if (TREF(gtm_environment_init))							\
-		gtm_fork_n_core();	/* take a snapshot in case running in-house */	\
-	return FALSE;									\
+#define WCS_GET_SPACE_RETURN_FAIL(TRACEARRAY, CR)								\
+{														\
+	/* A failure occurred. Ignored for WB test case */							\
+	assert(FALSE || (gtm_white_box_test_case_enabled							\
+				&& (WBTEST_JNL_FILE_LOST_DSKADDR == gtm_white_box_test_case_number)));		\
+	get_space_fail_cr = CR;											\
+	get_space_fail_array = TRACEARRAY;									\
+	if (TREF(gtm_environment_init) DEBUG_ONLY(&& !(gtm_white_box_test_case_enabled				\
+				&& (WBTEST_JNL_FILE_LOST_DSKADDR == gtm_white_box_test_case_number))))		\
+		gtm_fork_n_core();	/* take a snapshot in case running in-house */				\
+	return FALSE;												\
 }
 
 #define GET_IO_LATCH_PID(CSA)		(CSA->jnl ? CSA->jnl->jnl_buff->io_in_prog_latch.u.parts.latch_pid : -1)
@@ -93,12 +97,13 @@ bool	wcs_get_space(gd_region *reg, int needed, cache_rec_ptr_t cr)
 	sgmnt_addrs		*csa;
 	sgmnt_data_ptr_t	csd;
 	node_local_ptr_t        cnl;
-	cache_que_head_ptr_t	q0, base;
-	int4			count, dummy_errno, i, k, max_count, max_sleep_mask, n, save_errno = 0;
-	int			maxspins, retries, spins;
+	cache_que_head_ptr_t	q0, base, crwipq = NULL;
+	int4			count, dummy_errno, i, k, max_count, n, save_errno = 0;
 	uint4			lcnt, size, to_wait, to_msg, this_idx;
 	wcs_conflict_trace_t	wcs_conflict_trace[WCS_CONFLICT_TRACE_ARRAYSIZE];
 	cache_rec		cr_contents;
+	boolean_t		asyncio, ret;
+	int			curr_wc_in_free;
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
@@ -109,14 +114,14 @@ bool	wcs_get_space(gd_region *reg, int needed, cache_rec_ptr_t cr)
 	cnl = csa->nl;
 	assert(dba_bg == csd->acc_meth);
 	assert((0 == needed) || ((DB_CSH_RDPOOL_SZ <= needed) && (needed <= csd->n_bts)));
+	WCS_OPS_TRACE(csa, process_id, wcs_ops_getspace1, 0, GDS_ANY_ABS2REL(csa,cr), 0, needed, csa->now_crit);
 	if (FALSE == csa->now_crit)
 	{
 		assert(0 != needed);	/* if needed == 0, then we should be in crit */
-		for (lcnt = DIVIDE_ROUND_UP(needed, csd->n_wrt_per_flu);  0 < lcnt;  lcnt--)
-			JNL_ENSURE_OPEN_WCS_WTSTART(csa, reg, 0, dummy_errno);
-					/* a macro that ensure jnl is open, invokes wcs_wtstart() and checks for errors etc. */
+		JNL_ENSURE_OPEN_WCS_WTSTART(csa, reg, needed, NULL, TRUE, dummy_errno);
 		return TRUE;
 	}
+	asyncio = csd->asyncio;
 	csd->flush_trigger = MAX(csd->flush_trigger - MAX(csd->flush_trigger / STEP_FACTOR, 1), MIN_FLUSH_TRIGGER(csd->n_bts));
 	/* Routine actually serves two purposes:
 	 *	1 - Free up required number of buffers or
@@ -126,22 +131,20 @@ bool	wcs_get_space(gd_region *reg, int needed, cache_rec_ptr_t cr)
 	if (0 != needed)
 	{
 		BG_TRACE_ANY(csa, bufct_buffer_flush);
-		for (lcnt = 1; (cnl->wc_in_free < needed) && (BUF_OWNER_STUCK > lcnt); ++lcnt)
+		curr_wc_in_free = cnl->wc_in_free;
+		for (lcnt = 1; (cnl->wc_in_free < needed) && ((BUF_OWNER_STUCK AIX_ONLY(* (asyncio ? 4 : 1))) > lcnt); ++lcnt)
 		{
-			JNL_ENSURE_OPEN_WCS_WTSTART(csa, reg, needed, save_errno);
+			JNL_ENSURE_OPEN_WCS_WTSTART(csa, reg, needed, NULL, TRUE, save_errno);
 			if (cnl->wc_in_free < needed)
 			{
 				if ((ENOSPC == save_errno) && (csa->hdr->wait_disk_space > 0))
 				{
-					/* not enough disk space to flush the buffers to regain them
-					 * so wait for it to become available,
-					 * and if it takes too long, just
-					 * quit. Unfortunately, quitting would
-					 * invoke the recovery logic which
-					 * should be of no help to this
-					 * situation. Then what?
+					/* Not enough disk space to flush the buffers to regain them
+					 * so wait for it to become available, and if it takes too long,
+					 * just quit. Unfortunately, quitting would invoke the recovery
+					 * logic which should be of no help to this situation. Then what?
 					 */
-					lcnt = BUF_OWNER_STUCK;
+					lcnt = BUF_OWNER_STUCK AIX_ONLY(* (asyncio ? 4 : 1));
 					to_wait = cs_data->wait_disk_space;
 					to_msg = (to_wait / 8) ? (to_wait / 8) : 1; /* output error message around 8 times */
 					while ((0 < to_wait) && (ENOSPC == save_errno))
@@ -156,12 +159,17 @@ bool	wcs_get_space(gd_region *reg, int needed, cache_rec_ptr_t cr)
 						}
 						hiber_start(1000);
 						to_wait--;
-						JNL_ENSURE_OPEN_WCS_WTSTART(csa, reg, needed, save_errno);
+						JNL_ENSURE_OPEN_WCS_WTSTART(csa, reg, needed, NULL, TRUE, save_errno);
 						if (cnl->wc_in_free >= needed)
 							break;
 					}
 				}
 				wcs_sleep(lcnt);
+				if (cnl->wc_in_free > curr_wc_in_free)
+				{	/* As long as we are making progress in freeing up buffers be patient */
+					lcnt = 1;
+					curr_wc_in_free = cnl->wc_in_free;
+				}
 			} else
 				return TRUE;
 			BG_TRACE_ANY(csa, bufct_buffer_flush_loop);
@@ -169,140 +177,113 @@ bool	wcs_get_space(gd_region *reg, int needed, cache_rec_ptr_t cr)
 		if (cnl->wc_in_free >= needed)
 			return TRUE;
 	} else
-	{	/* Wait for a specific buffer to be flushed. We attempt to speed this along by shuffling the entry
-		 * we want to the front of the queue before we call routines to do some writing.
-		 * Formerly we used to wait for this buffer to be flushed irrespective of its position in the active queue.
-		 * We keep this code commented just in case this needs to be resurrected in the future.
-		 */
-#		ifdef old_code
-		BG_TRACE_ANY(csa, spcfc_buffer_flush);
-		for (lcnt = 1; (0 != cr->dirty) && (BUF_OWNER_STUCK > lcnt); ++lcnt)
-		{
-			for (; 0 != cr->dirty && 0 != csa->acc_meth.bg.cache_state->cacheq_active.fl;)
-				JNL_ENSURE_OPEN_WCS_WTSTART(csa, reg, 0, save_errno);
-			if (0 != cr->dirty)
-				wcs_sleep(lcnt);
-			else
-				return TRUE;
-			BG_TRACE_ANY(csa, spcfc_buffer_flush_loop);
-		}
-		if (0 == cr->dirty)
-			return TRUE;
-#		endif
+	{	/* Wait for a specific buffer to be flushed. */
 		assert(csa->now_crit);		/* must be crit to play with queues when not the writer */
 		BG_TRACE_PRO_ANY(csa, spcfc_buffer_flush);
-		++fast_lock_count;			/* Disable wcs_stale for duration */
 		base = &csa->acc_meth.bg.cache_state->cacheq_active;
+		if (asyncio)
+			crwipq = &csa->acc_meth.bg.cache_state->cacheq_wip;
 		/* If another process is concurrently finishing up phase2 of commit, wait for that to complete first. */
 		if (cr->in_tend && !wcs_phase2_commit_wait(csa, cr))
 			return FALSE;	/* assumption is that caller will set wc_blocked and trigger cache recovery */
-		maxspins = num_additional_processors ? MAX_LOCK_SPINS(LOCK_SPINS, num_additional_processors) : 1;
-		max_sleep_mask = -1;	/* initialized to -1 to defer memory reference until needed */
-		for (retries = LOCK_TRIES - 1; retries > 0 ; retries--)
+		JNL_ENSURE_OPEN_WCS_WTSTART(csa, reg, 1, cr, TRUE, save_errno);
+		if (asyncio && cr->epid)
+		{ 	/* if the buffer is in the WIP queue and still dirty then another process flushed it for
+			 * us (wait for the buffer to become non-dirty)
+			 */
+			WAIT_FOR_WIP_QUEUE_TO_CLEAR(cnl, crwipq, cr, reg, ret);
+			if (ret)
+				return FALSE;
+		}
+		for (lcnt = 1; (0 != cr->dirty) && (UNIX_GETSPACEWAIT > lcnt); ++lcnt)
 		{
-			for (spins = maxspins; spins > 0 ; spins--)
+			if (0 == (lcnt % LCNT_INTERVAL))
 			{
-				if (GET_SWAPLOCK(&base->latch)) /* Lock queue to prevent interference */
-				{	/* This appears to be a valid place for a spin lock - refactoring might improve things */
-					if (0 != cr->state_que.fl)
-					{	/* If it is still in the active queue, then insert it at the head of the queue */
-						csa->wbuf_dqd++;	/* unnecessary under tm and would cause aborts */
-						q0 = (cache_que_head_ptr_t)((sm_uc_ptr_t)&cr->state_que + cr->state_que.fl);
-						shuffqth((que_ent_ptr_t)q0, (que_ent_ptr_t)base);
-						csa->wbuf_dqd--;
-						VERIFY_QUEUE(base);	/* debug only */
-					}
-					/* release the queue header lock so that the writers can proceed */
-					RELEASE_SWAPLOCK(&base->latch);
-					--fast_lock_count;
-					assert(0 <= fast_lock_count);
-					/* Fire off a writer to write it out. Another writer may grab our cache
-					 * record so we have to be willing to wait for him to flush it.
-					 * Flush this one buffer the first time through.
-					 * If this didn't work, flush normal amount next time in the loop.
-					 */
-					JNL_ENSURE_OPEN_WCS_WTSTART(csa, reg, 1, save_errno);
-					for (lcnt = 1; (0 != cr->dirty) && (UNIX_GETSPACEWAIT > lcnt); ++lcnt)
-					{
-						if (0 == (lcnt % LCNT_INTERVAL))
-						{
-							this_idx = (lcnt / LCNT_INTERVAL);
-							assert(this_idx < WCS_CONFLICT_TRACE_ARRAYSIZE);
-							wcs_conflict_trace[this_idx].wcs_active_lvl = cnl->wcs_active_lvl;
-							wcs_conflict_trace[this_idx].io_in_prog_pid = GET_IO_LATCH_PID(csa);
-							wcs_conflict_trace[this_idx].fsync_in_prog_pid = GET_FSYNC_LATCH_PID(csa);
-						}
-						get_space_fail_arridx = lcnt;
-						max_count = ROUND_UP(cnl->wcs_active_lvl, csd->n_wrt_per_flu);
-						/* Check if cache recovery is needed (could be set by another process in
-						 * secshr_db_clnup finishing off a phase2 commit). If so, no point invoking
-						 * wcs_wtstart as it will return right away. Instead return FALSE so
-						 * cache-recovery can be triggered by the caller.
-						 */
-						if (cnl->wc_blocked)
-						{
-							assert(gtm_white_box_test_case_enabled);
-							return FALSE;
-						}
-						/* loop till the active queue is exhausted */
-						for (count = max_count; (0 != cr->dirty) && (0 != cnl->wcs_active_lvl) && count;
-							 count--)
-						{
-							BG_TRACE_PRO_ANY(csa, spcfc_buffer_flush_retries);
-							JNL_ENSURE_OPEN_WCS_WTSTART(csa, reg, 0, save_errno);
-						}
-						/* Usually we want to sleep only if we need to wait on someone else
-						 * i.e. (i) if we are waiting for another process' fsync to complete
-						 *		We have seen jnl_fsync() to take more than a minute.
-						 *		Hence we wait for a max. of 2 mins (UNIX_GETSPACEWAIT).
-						 *     (ii) if some concurrent writer has taken this cache-record out.
-						 *    (iii) if someone else is holding the io_in_prog lock.
-						 * Right now we know of only one case where there is no point in waiting
-						 *   which is if the cache-record is out of the active queue and is dirty.
-						 * But since that is quite rare and we don't lose much in that case by
-						 *   sleeping we do an unconditional sleep (only if cr is dirty).	{BYPASSOK}
-						 */
-						if (!cr->dirty)
-							return TRUE;
-						else
-						{
-							DEBUG_ONLY(cr_contents = *cr;)
-							/* Assert that if the cache-record is dirty, it better be in the
-							 * active queue or be in the process of getting flushed by a concurrent
-							 * writer or phase2 of the commit is in progress. If none of this is
-							 * true, it should have become non-dirty by now even though we found it
-							 * dirty a few lines above. Note that the cache-record could be in the
-							 * process of being released by a concurrent writer; This is done by
-							 * resetting 3 fields cr->epid, cr->dirty, cr->interlock; Since the write
-							 * interlock is the last field to be released, check that BEFORE dirty.
-							 */
-							assert(cr_contents.state_que.fl || cr_contents.epid || cnl->in_wtstart
-								|| cr_contents.in_tend
-								|| (LATCH_CLEAR != WRITE_LATCH_VAL(&cr_contents))
-								|| !cr_contents.dirty);
-							wcs_sleep(lcnt);
-						}
-						BG_TRACE_PRO_ANY(csa, spcfc_buffer_flush_loop);
-					}
-					if (0 == cr->dirty)
-						return TRUE;
-					INVOKE_C_STACK_APPROPRIATE(cr, csa, 1);
-					WCS_GET_SPACE_RETURN_FAIL(wcs_conflict_trace, cr);
-				} else
-				{	/* buffer was locked */
-					if (0 == cr->dirty)
-					{
-						BG_TRACE_ANY(csa, spcfc_buffer_flushed_during_lockwait);
-						--fast_lock_count;
-						assert(0 <= fast_lock_count);
-						return TRUE;
-					}
+				this_idx = (lcnt / LCNT_INTERVAL);
+				assert(this_idx < WCS_CONFLICT_TRACE_ARRAYSIZE);
+				wcs_conflict_trace[this_idx].wcs_active_lvl = cnl->wcs_active_lvl;
+				wcs_conflict_trace[this_idx].io_in_prog_pid = GET_IO_LATCH_PID(csa);
+				wcs_conflict_trace[this_idx].fsync_in_prog_pid = GET_FSYNC_LATCH_PID(csa);
+			}
+			get_space_fail_arridx = lcnt;
+			max_count = ROUND_UP(cnl->wcs_active_lvl, csd->n_wrt_per_flu);
+			/* Check if cache recovery is needed (could be set by another process in
+			 * secshr_db_clnup finishing off a phase2 commit). If so, no point invoking
+			 * wcs_wtstart as it will return right away. Instead return FALSE so
+			 * cache-recovery can be triggered by the caller.
+			 */
+			if (cnl->wc_blocked)
+			{
+				assert(gtm_white_box_test_case_enabled);
+				return FALSE;
+			}
+			/* loop till the active queue is exhausted OR desired cr becomes non-dirty */
+			for (count = max_count; (0 != cr->dirty) && (0 != cnl->wcs_active_lvl) && count;
+				 count--)
+			{
+				BG_TRACE_PRO_ANY(csa, spcfc_buffer_flush_retries);
+				JNL_ENSURE_OPEN_WCS_WTSTART(csa, reg, 0, NULL, TRUE, save_errno);
+				if (asyncio)
+				{
+					DEBUG_ONLY(dbg_wtfini_lcnt = dbg_wtfini_wcs_get_space2);
+							/* used by "wcs_wtfini" */
+					if (wcs_wtfini(reg, CHECK_IS_PROC_ALIVE_FALSE, cr))
+						return FALSE;
 				}
 			}
-			REST_FOR_LATCH(&base->latch, (-1 == max_sleep_mask) ? SPIN_SLEEP_MASK(csd) : max_sleep_mask, retries);
+			/* Even if there was no record in the active queue, there might be something
+			 * in the wip queue (including our desired cr). So flush that out separately.
+			 */
+			if (asyncio)
+			{
+				DEBUG_ONLY(dbg_wtfini_lcnt = lcnt);	/* used by "wcs_wtfini" */
+				if (wcs_wtfini(reg, CHECK_IS_PROC_ALIVE_TRUE_OR_FALSE(lcnt,	\
+									UNIX_GETSPACEWAIT), cr))
+					return FALSE;
+			}
+			/* Usually we want to sleep only if we need to wait on someone else
+			 * i.e. (i) if we are waiting for another process' fsync to complete
+			 *		We have seen jnl_fsync() to take more than a minute.
+			 *		Hence we wait for a max. of 2 mins (UNIX_GETSPACEWAIT).
+			 *     (ii) if some concurrent writer has taken this cache-record out.
+			 *    (iii) if someone else is holding the io_in_prog lock.
+			 * Right now we know of only one case where there is no point in waiting
+			 *   which is if the cache-record is out of the active queue and is dirty.
+			 * But since that is quite rare and we don't lose much in that case by
+			 *   sleeping we do an unconditional sleep (only if cr is dirty).	{BYPASSOK}
+			 */
+			if (!cr->dirty)
+				return TRUE;
+			else
+			{
+				DEBUG_ONLY(cr_contents = *cr;)
+				/* Assert that if the cache-record is dirty, it better be in the
+				 * active queue or be in the process of getting flushed by a concurrent
+				 * writer or phase2 of the commit is in progress. If none of this is
+				 * true, it should have become non-dirty by now even though we found it
+				 * dirty a few lines above. Note that the cache-record could be in the
+				 * process of being released by a concurrent writer; This is done by
+				 * resetting 3 fields cr->epid, cr->dirty, cr->interlock; Since the write
+				 * interlock is the last field to be released, check that BEFORE dirty.
+				 */
+				assert(cr_contents.state_que.fl || cr_contents.epid || cnl->in_wtstart
+					|| cr_contents.in_tend
+					|| (LATCH_CLEAR != WRITE_LATCH_VAL(&cr_contents))
+					|| !cr_contents.dirty);
+				wcs_sleep(lcnt);
+			}
+			BG_TRACE_PRO_ANY(csa, spcfc_buffer_flush_loop);
+#			ifdef DEBUG
+			/* Reduce the wait time to encounter errors associated with
+			 * WBTEST_JNL_FILE_LOST_DSKADDR faster
+			 */
+			if (gtm_white_box_test_case_enabled
+					&& (WBTEST_JNL_FILE_LOST_DSKADDR == gtm_white_box_test_case_number)
+					&& (0 < gtm_white_box_test_case_count)
+					&& (lcnt >= gtm_white_box_test_case_count))
+				lcnt += UNIX_GETSPACEWAIT;
+#			endif
 		}
-		--fast_lock_count;
-		assert(0 <= fast_lock_count);
 		if (0 == cr->dirty)
 			return TRUE;
 	}
diff --git a/sr_unix/wcs_write_in_progress_wait.c b/sr_unix/wcs_write_in_progress_wait.c
index 947fb34..5e636b9 100644
--- a/sr_unix/wcs_write_in_progress_wait.c
+++ b/sr_unix/wcs_write_in_progress_wait.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2007, 2011 Fidelity Information Services, Inc	*
+ * Copyright (c) 2007-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -32,9 +33,11 @@
 #include "wcs_write_in_progress_wait.h"
 #include "add_inter.h"
 #include "gtm_c_stack_trace.h"
+#include "wcs_wt.h"
 
-GBLREF	gd_region	*gv_cur_region;	/* for the LOCK_HIST macro used in LOCK_BUFF_FOR_UPDATE macro */
-GBLREF	uint4		process_id;	/* for the LOCK_HIST macro used in LOCK_BUFF_FOR_UPDATE macro */
+GBLREF	gd_region		*gv_cur_region;	/* for the LOCK_HIST macro used in LOCK_BUFF_FOR_UPDATE macro */
+GBLREF	sgmnt_data_ptr_t	cs_data;
+GBLREF	uint4			process_id;	/* for the LOCK_HIST macro used in LOCK_BUFF_FOR_UPDATE macro */
 
 error_def (ERR_WRITEWAITPID);
 
@@ -45,10 +48,10 @@ error_def (ERR_WRITEWAITPID);
  */
 boolean_t	wcs_write_in_progress_wait(node_local_ptr_t cnl, cache_rec_ptr_t cr, wbtest_code_t wbox_test_code)
 {
-	uint4	lcnt;
-	int4	n;
-
+	uint4		lcnt;
+	int4		n;
 
+	assert(!TWINNING_ON(cs_data));
 	for (lcnt = 1; ; lcnt++)
 	{	/* the design here is that either this process owns the block, or the writer does.
 		 * if the writer does, it must be allowed to finish its write; then it will release the block
@@ -69,10 +72,10 @@ boolean_t	wcs_write_in_progress_wait(node_local_ptr_t cnl, cache_rec_ptr_t cr, w
 			 * To avoid false failures (where the other writer finishes its job in a little over
 			 * a minute) we wait for twice the time in the debug version.
 			 */
-DEBUG_ONLY(
+#			ifdef DEBUG
 			if ((BUF_OWNER_STUCK == lcnt) && cr->epid)
 				GET_C_STACK_FROM_SCRIPT("WRITEWAITPID", process_id, cr->epid, ONCE);
-	  )
+#			endif
 			if (BUF_OWNER_STUCK DEBUG_ONLY( * 2) < lcnt)
 			{	/* sick of waiting */
 				if (0 == cr->dirty)
@@ -83,16 +86,17 @@ DEBUG_ONLY(
 				{
 					if (cr->epid)
 					{
-#ifdef DEBUG
+#						ifdef DEBUG
 						GET_C_STACK_FROM_SCRIPT("WRITEWAITPID", process_id, cr->epid, TWICE);
-						send_msg(VARLSTCNT(8) ERR_WRITEWAITPID, 6, process_id, TWICE, \
+						send_msg_csa(CSA_ARG(NULL) VARLSTCNT(8) ERR_WRITEWAITPID, 6, process_id, TWICE, \
 							cr->epid, cr->blk, DB_LEN_STR(gv_cur_region));
-#else
+#						else
 						GET_C_STACK_FROM_SCRIPT("WRITEWAITPID", process_id, cr->epid, ONCE);
-						send_msg(VARLSTCNT(8) ERR_WRITEWAITPID, 6, process_id, ONCE, \
+						send_msg_csa(CSA_ARG(NULL) VARLSTCNT(8) ERR_WRITEWAITPID, 6, process_id, ONCE, \
 							cr->epid, cr->blk, DB_LEN_STR(gv_cur_region));
-#endif
+#						endif
 					}
+					assert(FALSE);
 					return FALSE;
 				}
 			}
diff --git a/sr_unix/wcs_wt.h b/sr_unix/wcs_wt.h
new file mode 100644
index 0000000..6aa709b
--- /dev/null
+++ b/sr_unix/wcs_wt.h
@@ -0,0 +1,86 @@
+/****************************************************************
+ *								*
+ * Copyright (c) 2016-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
+ *								*
+ *	This source code contains the intellectual property	*
+ *	of its copyright holder(s), and is made available	*
+ *	under a license.  If you do not know the terms of	*
+ *	the license, please stop and do not read further.	*
+ *								*
+ ****************************************************************/
+
+#ifndef WCS_WT_H_INCLUDED
+#define WCS_WT_H_INCLUDED
+
+#define WT_LATCH_TIMEOUT_SEC    (4 * 60)        /* Define latch timeout as being 4 mins */
+
+#define	REINSERT_CR_AT_TAIL(csr, ahead, n, csa, csd, trace_cntr)	\
+MBSTART {								\
+	n = INSQTI((que_ent_ptr_t)csr, (que_head_ptr_t)ahead);		\
+	if (INTERLOCK_FAIL == n)					\
+	{								\
+		assert(FALSE);						\
+		SET_TRACEABLE_VAR(cnl->wc_blocked, TRUE);		\
+		BG_TRACE_PRO_ANY(csa, trace_cntr);			\
+	}								\
+} MBEND
+
+#define	BREAK_TWIN(csr, csa)											\
+MBSTART {													\
+	cache_rec_ptr_t		cr_new;										\
+														\
+	assert(csr->twin && csa->now_crit); 	/* We need crit to break twin connections. */			\
+	assert(!csr->bt_index);	/* It has to be an OLDER twin. It cannot be a NEWER twin because		\
+				 * as long as the OLDER twin exists in the WIP queue, the NEWER			\
+				 * twin write would not have been issued by "wcs_wtstart".			\
+				 */										\
+	assert(!csr->in_cw_set);	/* no other process should be needing this buffer */			\
+	cr_new = (cache_rec_ptr_t)GDS_ANY_REL2ABS(csa, csr->twin); /* Get NEWER twin cr */			\
+	assert((void *)&((cache_rec_ptr_t)GDS_ANY_REL2ABS(csa, cr_new->twin))->state_que == (void *)csr);	\
+	assert(cr_new->dirty); /* NEWER twin should be in ACTIVE queue */					\
+	csr->cycle++;	/* increment cycle whenever blk number changes (tp_hist needs it) */			\
+	csr->blk = CR_BLKEMPTY;											\
+	assert(CR_BLKEMPTY != cr_new->blk);	/* NEWER twin should have a valid block number */		\
+	cr_new->twin = csr->twin = 0;	/* Break the twin link */						\
+} MBEND
+/* "wcs_wtfini" is called with a second parameter which indicates whether it has to do "is_proc_alive" check or not.
+ * In places where we know for sure we do not need this check, we pass FALSE. In places where we would benefit from a check
+ * we pass TRUE but since "wcs_wtfini" is usually called in a "wcs_sleep" loop using "lcnt" variable iterating from 1 to
+ * SLEEP_ONE_MIN/BUF_OWNER_STUCK, we want to limit the heavyweight nature of the "is_proc_alive" check by doing it only
+ * 32 times for every SLEEP_ONE_MIN iterations of the loop. Hence the MAX/32 calculation below. This approximates to
+ * doing the system call once every 2 seconds.
+ */
+#define	CHECK_IS_PROC_ALIVE_FALSE			FALSE
+#define	CHECK_IS_PROC_ALIVE_TRUE			TRUE
+#define	CHECK_IS_PROC_ALIVE_TRUE_OR_FALSE(lcnt, MAX)	(0 == (lcnt % (MAX/32)))
+
+#ifdef DEBUG
+enum dbg_wtfini_lcnt_t {
+	dbg_wtfini_db_csh_getn = 32768,	/* a value greater than SLEEP_ONE_MIN (= 6000) and UNIX_GETSPACEWAIT (= 12000)
+					 * to distinguish this from other "lcnt".
+					 */
+	dbg_wtfini_wcs_recover = 32769,
+	dbg_wtfini_wcs_get_space1 = 32770,
+	dbg_wtfini_wcs_get_space2 = 32771,
+	dbg_wtfini_wcs_wtstart = 32772
+};
+
+GBLREF	enum dbg_wtfini_lcnt_t	dbg_wtfini_lcnt;	/* "lcnt" value for WCS_OPS_TRACE tracking purposes */
+#endif
+
+typedef struct  wtstart_cr_list_struct
+{
+	int numcrs;
+	int listsize; /* number of items allocated for listcrs[] */
+	cache_rec_ptr_t *listcrs;
+} wtstart_cr_list_t;
+
+int		wcs_wt_restart(unix_db_info *udi, cache_state_rec_ptr_t csr);
+int		wcs_wtfini(gd_region *reg, boolean_t do_is_proc_alive_check, cache_rec_ptr_t cr2flush);
+void		wcs_wtfini_nocrit(gd_region *reg, wtstart_cr_list_t *cr_list_ptr);
+void		wcs_wterror(gd_region *reg, int4 save_errno);
+int4		wcs_wtstart(gd_region *region, int4 writes, wtstart_cr_list_t *cr_list_ptr, cache_rec_ptr_t cr2flush);
+int		wcs_wtstart_fini(gd_region *region, int nbuffs, cache_rec_ptr_t cr2flush);
+
+#endif
diff --git a/sr_unix/wcs_wt_restart.c b/sr_unix/wcs_wt_restart.c
new file mode 100644
index 0000000..1e7acd1
--- /dev/null
+++ b/sr_unix/wcs_wt_restart.c
@@ -0,0 +1,83 @@
+/****************************************************************
+ *								*
+ * Copyright (c) 2016 Fidelity National Information		*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
+ *								*
+ *	This source code contains the intellectual property	*
+ *	of its copyright holder(s), and is made available	*
+ *	under a license.  If you do not know the terms of	*
+ *	the license, please stop and do not read further.	*
+ *								*
+ ****************************************************************/
+
+#include "mdef.h"
+
+#include <errno.h>
+
+#include "gdsroot.h"
+#include "gtm_facility.h"
+#include "fileinfo.h"
+#include "gdsbt.h"
+#include "gdsblk.h"
+#include "gdsfhead.h"
+#include "filestruct.h"
+#include "jnl.h"
+#include "aio_shim.h"
+#include "gtmio.h"
+#include "anticipatory_freeze.h"
+#include "wcs_wt.h"
+#include "gdsbgtr.h"
+
+GBLREF	uint4		process_id;
+
+/* Reissues a pending qio from the WIP queue. In case of EAGAIN and holding crit, it issues a SYNCIO instead.
+ * And if the SYNCIO succeeds, a special value of SYNCIO_MORPH_SUCCESS is returned so caller can handle this
+ * situation appropriately (by moving the cr from wip queue to active queue or out of all queues).
+ */
+int	wcs_wt_restart(unix_db_info *udi, cache_state_rec_ptr_t csr)
+{
+	int			save_errno;
+	blk_hdr_ptr_t		bp, save_bp;
+	sgmnt_data_ptr_t	csd;
+	cache_que_head_ptr_t	ahead;
+	sgmnt_addrs		*csa;
+
+	assert(0 > SYNCIO_MORPH_SUCCESS); /* save_errno should be positive in all cases except when == SYNCIO_MORPH_SUCCESS */
+	csa = &udi->s_addrs;
+	BG_TRACE_PRO_ANY(csa, wcs_wt_restart_invoked);
+	csd = csa->hdr;
+	bp = (blk_hdr_ptr_t)(GDS_ANY_REL2ABS(csa, csr->buffaddr));
+	if (!csr->wip_is_encr_buf)
+		save_bp = bp;
+	else
+		save_bp = (blk_hdr_ptr_t)GDS_ANY_ENCRYPTGLOBUF(bp, csa);
+	DB_LSEEKWRITEASYNCRESTART(csa, udi, udi->fn, udi->fd, save_bp, csr, save_errno);
+	assert(0 == save_errno IF_LIBAIO(|| EAGAIN  == save_errno));
+	if (0 == save_errno)
+		csr->epid = process_id;
+	else if (EAGAIN == save_errno)
+	{	/* ASYNC IO could not be started */
+		BG_TRACE_PRO_ANY(csa, wcs_wt_restart_eagain);
+		if (csa->now_crit && !csa->region->read_only)
+		{	/* Holding crit and have read-write access to the database.
+			 * Do synchronous IO given OS does not have enough memory temporarily.
+			 */
+			DB_LSEEKWRITE(csa, udi, udi->fn, udi->fd,
+				csr->aiocb.aio_offset, save_bp, csr->aiocb.aio_nbytes, save_errno);
+			assert(0 <= save_errno);
+			if (0 == save_errno)
+			{	/* SYNCIO succeeded. Return special status */
+				save_errno = SYNCIO_MORPH_SUCCESS;
+			}
+		} else
+		{	/* Need to reinsert this back into the active queue.
+			 * Clearing csr->epid and returning 0 indicates this to caller.
+			 */
+			BG_TRACE_PRO_ANY(csa, wcs_wt_restart_reinsert);
+			csr->epid = 0;
+			save_errno = 0;
+		}
+	}
+	return save_errno;
+}
+
diff --git a/sr_unix/wcs_wterror.c b/sr_unix/wcs_wterror.c
new file mode 100644
index 0000000..182e84b
--- /dev/null
+++ b/sr_unix/wcs_wterror.c
@@ -0,0 +1,151 @@
+/****************************************************************
+ *								*
+ * Copyright (c) 2016 Fidelity National Information		*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
+ *								*
+ *	This source code contains the intellectual property	*
+ *	of its copyright holder(s), and is made available	*
+ *	under a license.  If you do not know the terms of	*
+ *	the license, please stop and do not read further.	*
+ *								*
+ ****************************************************************/
+
+#include "mdef.h"
+
+#include <errno.h>
+
+#include "gdsroot.h"
+#include "gtm_facility.h"
+#include "fileinfo.h"
+#include "gdsbt.h"
+#include "gdsblk.h"
+#include "gdsbml.h"
+#include "gdsfhead.h"
+#include "filestruct.h"
+#include "jnl.h"
+#include "interlock.h"
+#include "relqueopi.h"
+#include "gdsbgtr.h"
+#include "aio_shim.h"
+#include "gtmio.h"
+#include "is_proc_alive.h"
+#include "anticipatory_freeze.h"
+#include "add_inter.h"
+#include "gtm_multi_proc.h"	/* for "multi_proc_in_use" GBLREF */
+#include "wcs_wt.h"
+#include "compswap.h"
+
+#define DBIOERR_LOGGING_PERIOD			100
+#define DSKSPACE_MSG_INTERVAL 			60 	/* 60 seconds, epoch time */
+
+#ifdef USE_LIBAIO
+GBLREF char	*aio_shim_errstr;
+#endif
+
+error_def(ERR_DBFILERR);
+error_def(ERR_DBIOERR);
+error_def(ERR_SYSCALL);
+error_def(ERR_ENOSPCQIODEFER);
+
+STATICDEF volatile uint4 	eagain_error_count;
+
+/* This function is called from wcs_wtstart (for noasyncio and asyncio cases) and/or wcs_wtfini (for asyncio) when they each
+ * encounter an error in a write to the database file on disk. It could be ENOSPC or some other IO error. Handle all of them
+ * by sending periodic syslog messages etc.
+ */
+void	wcs_wterror(gd_region *reg, int4 save_errno)
+{
+	unix_db_info		*udi;
+	sgmnt_addrs		*csa;
+	node_local_ptr_t	cnl;
+	gtm_uint64_t		dskspace_next_fire;
+
+	udi = FILE_INFO(reg);
+	csa = &udi->s_addrs;
+	BG_TRACE_PRO_ANY(csa, wcs_wterror_invoked);
+	cnl = csa->nl;
+	if (ENOSPC == save_errno)
+	{	/* Determine whether or not to ignore this error, based on when the last ENOSPC error was reported. */
+		dskspace_next_fire = cnl->dskspace_next_fire;
+		if ((dskspace_next_fire + DSKSPACE_MSG_INTERVAL <= time(NULL))
+				/* We use a CAS instruction to ensure that concurrent accesses to this location don't fire
+				 * multiple times by different processes; the first one to swap dskspace_next_fire is the
+				 * only one to report the ENOSPC error. A blind interlock_add() would not prevent this.
+				 */
+				&& COMPSWAP_LOCK((sm_global_latch_ptr_t)&cnl->dskspace_next_fire,
+						 dskspace_next_fire, 0, time(NULL), 0))
+		{	/* Report ENOSPC errors for first time and every minute after that. */
+			send_msg_csa(CSA_ARG(csa) VARLSTCNT(9) ERR_DBIOERR, 2, DB_LEN_STR(reg),
+				 ERR_TEXT, 2, RTS_ERROR_TEXT("Error during flush write"), save_errno);
+			if (!IS_GTM_IMAGE)
+			{
+				gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(9) ERR_DBIOERR, 2, DB_LEN_STR(reg),
+					ERR_TEXT, 2, RTS_ERROR_TEXT("Error during flush write"), save_errno);
+			}
+		}
+	} else if (EAGAIN == save_errno)
+	{ 	/* When using POSIX AIO we don't ever expect to see an EAGAIN error. */
+		assert(IF_LIBAIO_ELSE(NULL != aio_shim_errstr, FALSE));
+		/* If EAGAIN occurs from "io_submit", do not treat it as an ERROR. We know it can happen if more than the
+		 * allocated aio slots are issued as writes concurrently by this process. In that case, the count of
+		 * wcs_wterror_invoked in file header is enough to indicate how many times such events occured.
+		 */
+#		ifdef USE_LIBAIO
+		if ((NULL != aio_shim_errstr) && STRCMP(aio_shim_errstr, "io_submit()"))
+		{
+#		endif
+			eagain_error_count++;
+			if (1 == (eagain_error_count % DBIOERR_LOGGING_PERIOD))
+			{	/* See below; every 100th failed attempt, issue a warning. We cannot issue a DBIOERR in
+				 * the case of an EAGAIN because it is innocuous and can easily be retried -- a DBIOERR
+				 * will freeze the database forcing us to not perform a retry at all.
+				 */
+				send_msg_csa(CSA_ARG(csa) VARLSTCNT(12) ERR_DBFILERR, 2, DB_LEN_STR(reg), ERR_SYSCALL, 5,
+					LEN_AND_STR(IF_LIBAIO_ELSE(aio_shim_errstr, "aio_write()")), CALLFROM, save_errno);
+			}
+#		ifdef USE_LIBAIO
+			aio_shim_errstr = NULL;
+		}
+#		endif
+	} else if (ERR_ENOSPCQIODEFER != save_errno)
+	{
+		cnl->wtstart_errcnt++;
+		if (1 == (cnl->wtstart_errcnt % DBIOERR_LOGGING_PERIOD))
+		{	/* Every 100th failed attempt, issue an operator log indicating an I/O error.
+			 * wcs_wtstart is typically invoked during periodic flush timeout and since there
+			 * cannot be more than 2 pending flush timers per region, number of concurrent
+			 * processes issuing the below send_msg should be relatively small even if there
+			 * are 1000s of processes.
+			 */
+			/* Below assert is to account for some white-box tests which exercise this code as
+			 * well as tests which could trigger a CRYPTOPFAILED inside the encryption plugin.
+			 * Neither of those are real IO errors.
+			 */
+			assert(gtm_white_box_test_case_enabled
+				|| (SET_REPEAT_MSG_MASK(SET_CRYPTERR_MASK(ERR_CRYPTOPFAILED)) == save_errno));
+#ifdef 			USE_LIBAIO
+			if (NULL == aio_shim_errstr)
+			{
+#			endif
+				send_msg_csa(CSA_ARG(csa) VARLSTCNT(7) ERR_DBIOERR, 4, REG_LEN_STR(reg), DB_LEN_STR(reg),
+						save_errno);
+#ifdef			USE_LIBAIO
+			} else
+			{	/* If the error string was set, then we can output the syscall that failed as well. */
+				send_msg_csa(CSA_ARG(csa) VARLSTCNT(15) ERR_DBIOERR, 4, REG_LEN_STR(reg), DB_LEN_STR(reg),
+						save_errno, ERR_SYSCALL, 5, LEN_AND_STR(aio_shim_errstr), CALLFROM,
+						save_errno);
+				aio_shim_errstr = NULL;
+			}
+#			endif
+		}
+	}
+	/* If (ERR_ENOSPCQIODEFER == save_errno): DB_LSEEKWRITE above encountered ENOSPC but could not
+	 * trigger a freeze as it did not hold crit. It is okay to return as this is not a critical write.
+	 * Eventually, some crit holding process will trigger a freeze and wait for space to be freed up.
+	 * Analogously, if we detected that encryption settings have changed during a transaction, it is OK
+	 * to skip this write because this transaction will be retried after encryption settings update in
+	 * t_retry or tp_restart.
+	 */
+	return;
+}
diff --git a/sr_unix/wcs_wtfini.c b/sr_unix/wcs_wtfini.c
new file mode 100644
index 0000000..5dd070e
--- /dev/null
+++ b/sr_unix/wcs_wtfini.c
@@ -0,0 +1,407 @@
+/****************************************************************
+ *								*
+ * Copyright (c) 2016-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
+ *								*
+ *	This source code contains the intellectual property	*
+ *	of its copyright holder(s), and is made available	*
+ *	under a license.  If you do not know the terms of	*
+ *	the license, please stop and do not read further.	*
+ *								*
+ ****************************************************************/
+
+#include "mdef.h"
+
+#include <errno.h>
+
+#include "gdsroot.h"
+#include "gtm_facility.h"
+#include "fileinfo.h"
+#include "gdsbt.h"
+#include "gdsblk.h"
+#include "gdsfhead.h"
+#include "filestruct.h"
+#include "jnl.h"
+#include "interlock.h"
+#include "relqueopi.h"
+#include "gdsbgtr.h"
+#include "aio_shim.h"
+#include "gtmio.h"
+#include "is_proc_alive.h"
+#include "anticipatory_freeze.h"
+#include "add_inter.h"
+#include "gtm_multi_proc.h"	/* for "multi_proc_in_use" GBLREF */
+#include "wcs_wt.h"
+#include "hashtab_int4.h"
+#include "performcaslatchcheck.h"
+#include "wcs_sleep.h"
+#include "caller_id.h"
+#include "rel_quant.h"
+#include "sleep_cnt.h"
+#include "gtm_c_stack_trace.h"
+#include "copy.h"
+#include "relqop.h"
+
+#define	REQUEUE_TO_FREE		0
+#define	REQUEUE_TO_WIP		1
+#define	REQUEUE_TO_ACTIVE	2
+
+#define	WTFINI_PID_ALIVE_HT_INITIAL_SIZE	4
+#ifdef DEBUG
+/* Every N successful writes, simulate an error in one of the writes. This is to exercise "wcs_wt_restart" code.
+ * We do not want the frequency to be too low resulting in lot of rewrites. Neither do we want it too high as
+ * that would mean no coverage of "wcs_wt_restart". Hence the particular value chosen below.
+ */
+#define	FAKE_WTERROR_FREQUENCY	256
+#endif
+
+STATICDEF hash_table_int4	wtfini_pid_ht;
+STATICDEF boolean_t		wtfini_pid_ht_reinitialized = TRUE;
+#ifdef DEBUG
+STATICDEF int			dbg_skip_wcs_wt_restart;
+#endif
+
+GBLREF	volatile	int4	fast_lock_count;
+GBLREF	int4		wtfini_in_prog;
+GBLREF	uint4		process_id;
+GBLREF	gd_region	*gv_cur_region;
+
+error_def(ERR_DBCCERR);
+
+/* Note: In case caller has read_only access to db, wcs_wtfini cleans up finished qios but does not initiate new ones.
+ * Returns: 0 in case of SUCCESS. non-zero (== errno) in case of FAILURE.
+ */
+int	wcs_wtfini(gd_region *reg, boolean_t do_is_proc_alive_check, cache_rec_ptr_t cr2flush)
+{
+	boolean_t		new_pid, pid_alive;
+	cache_que_head_ptr_t	ahead, whead;
+	cache_rec_ptr_t		cr;
+#	ifdef DEBUG
+	cache_rec_ptr_t		cr_lo, cr_hi;
+#	endif
+	cache_state_rec_ptr_t	csr, start_csr;
+	int			requeue, ret_value;
+	int			restart_errno, status;
+	int			aio_errno, aio_retval;
+	int4			n;
+	node_local_ptr_t	cnl;
+	sgmnt_addrs		*csa;
+	sgmnt_data_ptr_t	csd;
+	unix_db_info		*udi;
+	unsigned int		n_bts;
+	int			lcnt;
+	uint4			epid;
+	ht_ent_int4		*tabent;
+	que_ent_ptr_t		next, prev, qent;
+	void_ptr_t		retcsrptr;
+
+	udi = FILE_INFO(reg);
+	csa = &udi->s_addrs;
+	csd = csa->hdr;
+	assert(csd->asyncio);	/* caller should have ensured this */
+	cnl = csa->nl;
+	assert(dba_bg == csd->acc_meth);
+	assert(csa->now_crit);	/* Or else "bg_update_phase1" (which holds crit) would get confused if a concurrent non-crit
+				 * process is running "wcs_wtfini" at the same time since it makes assumptions on the state of
+				 * OLDER and NEWER twins based on cr->dirty etc. all of which could be concurrently changing
+				 * in case "wcs_wtfini" can be invoked outside of crit.
+				 */
+	BG_TRACE_PRO_ANY(csa, wcs_wtfini_invoked);
+	wtfini_in_prog++;
+	cnl->wtfini_in_prog = process_id;
+	ahead = &csa->acc_meth.bg.cache_state->cacheq_active;
+	whead = &csa->acc_meth.bg.cache_state->cacheq_wip;
+	n_bts = csd->n_bts;
+#	ifdef DEBUG
+	cr_lo = csa->acc_meth.bg.cache_state->cache_array + csd->bt_buckets;
+	cr_hi = cr_lo + n_bts;
+#	endif
+	ret_value = 0;
+	CHECK_ERROR_IN_WORKER_THREAD(reg, udi);
+	if (do_is_proc_alive_check)
+	{	/* Check if process is alive. But avoid calling "is_proc_alive" more than once per pid
+		 * (system call) by maintaining a hash table of pids that we have already called for.
+		 * Use hashtable if pid is found. If not use "is_proc_alive".
+		 * This way if there are thousands of cache-records in the WIP queue corresponding to dead
+		 * pids, we will not do thousands of "kill" system calls while holding crit in "wcs_wtfini".
+		 */
+		/* Reinitialize hash table if not cleared from previous invocation of "wcs_wtfini" */
+		if (!wtfini_pid_ht_reinitialized)
+		{
+			reinitialize_hashtab_int4(&wtfini_pid_ht);
+			wtfini_pid_ht_reinitialized = TRUE;
+		} else if (0 == wtfini_pid_ht.size)
+			init_hashtab_int4(&wtfini_pid_ht, WTFINI_PID_ALIVE_HT_INITIAL_SIZE, HASHTAB_COMPACT, HASHTAB_SPARE_TABLE);
+	}
+	for (lcnt = cr2flush ? 0 : n_bts, start_csr = NULL; lcnt >= 0; lcnt--)
+	{
+		/* we will be attempting to take a cr off the wip queue for processing. We do not need the wbuf_dqd protection
+		 * used by wcs_get_space() and wcs_wtstart() since wcs_wtfini has crit and will have wc_blocked set anyway
+		 * if we get killed.
+		 */
+		if (cr2flush)
+		{	/* asked to flush a specific cr: */
+			/* should be dirty and have had a write issued, i.e., in the wip queue */
+			csr = NULL; /* assume it's none until we find it */
+			if (cr2flush->dirty && cr2flush->epid)
+			{
+				/* the if check implies cr2flush is out of the active queue at this point and is either already in
+				 * the wip queue or about to be inserted into the wip queue. cr2flush->state_que.fl being non-zero
+				 * (checked after the grab_latch below) would imply it is in the wip queue.
+				 */
+				++fast_lock_count; /* Disable wcs_stale for duration */
+				if (grab_latch(&whead->latch, WT_LATCH_TIMEOUT_SEC))
+                       		{
+					cr = cr2flush;
+					csr = (cache_state_rec_ptr_t)((sm_uc_ptr_t)cr + SIZEOF(cr->blkque));
+					/* now that we have the wip queue header lock ensure cr2flush is still on the wip queue */
+					if (cr2flush->dirty && cr2flush->epid && cr2flush->state_que.fl)
+					{	/* the entry is in the wip queue */
+						assert(cr2flush->dirty);
+						assert(cr2flush->epid);
+						assert(csr);
+						assert(csr->state_que.bl);
+						retcsrptr = remqh((que_ent_ptr_t)((sm_uc_ptr_t)&csr->state_que
+							+ csr->state_que.bl));
+						if ((cache_state_rec_ptr_t)retcsrptr != csr)
+                                                {       /* Did not get the csr we intended so something must be wrong with cache.
+                                                         * Kill -9 can cause this. Assert that we were doing a crash shutdown.
+                                                         */
+							assert(gtm_white_box_test_case_enabled
+								&& (WBTEST_CRASH_SHUTDOWN_EXPECTED
+								== gtm_white_box_test_case_number));
+							SET_TRACEABLE_VAR(cnl->wc_blocked, TRUE);
+							ret_value = ERR_DBCCERR;
+							break;
+						}
+						csr->state_que.bl = (sm_off_t)0;
+						csr->state_que.fl = (sm_off_t)0;
+					} else
+						/* The entry is still in the active queue waiting to be inserted into the wip
+						 * queue.
+						*/
+						csr = NULL;
+					rel_latch(&whead->latch);
+				} else
+					csr = NULL; /* did not get the lock */
+				--fast_lock_count;
+				assert(0 <= fast_lock_count);
+			}
+			/* else cr2flush is either in the active queue or in the free queue (i.e. not dirty).
+			 * In either case, we cannot handle it in this function so return.
+			 */
+		} else
+		{
+			csr = (cache_state_rec_ptr_t)REMQHI((que_head_ptr_t)whead);
+			if (INTERLOCK_FAIL == (INTPTR_T)csr)
+			{
+				assert(FALSE);
+				SET_TRACEABLE_VAR(cnl->wc_blocked, TRUE);
+				BG_TRACE_PRO_ANY(csa, wcb_wtfini_lckfail1);
+				ret_value = ERR_DBCCERR;
+				break;
+			}
+		}
+		if (NULL == csr)
+			break;		/* empty queue */
+		assert(!multi_proc_in_use);	/* wcs_wtstart uses syncio for online/offline rollback/recover forward phase */
+		/* wcs_get_space relies on the fact that a cache-record that is out of either active or wip queue has its
+		 * fl and bl fields set to 0. Initialize those fields now that this cache-record is out of the wip queue.
+		 */
+		csr->state_que.fl = csr->state_que.bl = 0;
+		if (csr == start_csr)
+		{
+			status = INSQHI((que_ent_ptr_t)csr, (que_head_ptr_t)whead);
+			if (INTERLOCK_FAIL == status)
+			{
+				assert(FALSE);
+				SET_TRACEABLE_VAR(cnl->wc_blocked, TRUE);
+				BG_TRACE_PRO_ANY(csa, wcb_wtfini_lckfail2);
+				ret_value = ERR_DBCCERR;
+			}
+			break;		/* looped the queue */
+		}
+#		ifdef DEBUG
+		cr = (cache_rec_ptr_t)((sm_uc_ptr_t)csr - SIZEOF(cr->blkque));
+		assert(cr >= cr_lo);
+		assert(cr < cr_hi);
+#		endif
+		assert(csr->dirty);
+		assert(CR_BLKEMPTY != csr->blk);
+		AIO_SHIM_ERROR(&(csr->aiocb), aio_errno);
+		assert(EBADF != aio_errno);
+		if ((ENOSYS == aio_errno) || (EINVAL == aio_errno))
+		{
+			assert(FALSE);
+			rts_error_csa(CSA_ARG(NULL) VARLSTCNT(8) ERR_SYSCALL, 5,
+						RTS_ERROR_LITERAL("aio_error()"), CALLFROM, aio_errno);
+		}
+		restart_errno = 0;
+		requeue = REQUEUE_TO_WIP;
+		epid = csr->epid;
+		if (EINPROGRESS == aio_errno)
+		{
+			if (do_is_proc_alive_check && (process_id != epid))
+			{
+				assert(SIZEOF(process_id) == SIZEOF(uint4));
+				/* hashtab_int4 routines do not handle 0 value so bump return value from is_proc_alive
+				 * (TRUE or FALSE) by 1 when storing and decrement by 1 after lookup.
+				 */
+				if (NULL != (tabent = lookup_hashtab_int4(&wtfini_pid_ht, (uint4 *)(&epid))))
+					pid_alive = (boolean_t)(UINTPTR_T)tabent->value - 1;
+				else
+				{
+					pid_alive = is_proc_alive(epid, 0);
+					new_pid = add_hashtab_int4(&wtfini_pid_ht, (uint4 *)&epid,
+								(void *)(UINTPTR_T)(pid_alive + 1), &tabent);
+					assert(new_pid);
+				}
+				/* If pid that issued the original write is no longer alive, we do not know if the aiocb
+				 * structure was fully initialized (e.g. aiocb.aio_nbytes, aiocb.aio_offset etc.) when the
+				 * pid died or not. So we cannot safely issue a rewrite (i.e. LSEEKWRITEASYNCRESTART) which
+				 * assumes these are initialized. Instead we need to issue a fresh write (LSEEKWRITEASYNCSTART).
+				 * The only function capable of issuing this is "wcs_wtstart" so put this cr back in active queue.
+				 */
+				if (!pid_alive)
+				{
+					WCS_OPS_TRACE(csa, process_id, wcs_ops_wtfini1, cr->blk, GDS_ANY_ABS2REL(csa,cr),
+							cr->dirty, dbg_wtfini_lcnt, epid);
+					if (!csr->bt_index && !csr->in_cw_set)
+					{	/* This is an older twin so we do not need the update anymore.
+						 * For comment on why "csr->in_cw_set" needs to be additionally checked,
+						 * see usage of "csr->in_cw_set" a little later for a descriptive comment.
+						 */
+						requeue = REQUEUE_TO_FREE;
+						/* csr->epid = 0 will happen a little later as part of REQUEUE_TO_FREE handling */
+					} else
+					{
+						requeue = REQUEUE_TO_ACTIVE;
+						csr->epid = 0;	/* Clear this since the process that issued the write is dead */
+					}
+				}
+			}
+		} else
+		{	/* Status is available for the I/O. Note: In case IO was canceled, "aio_return" will return -1. */
+			/* aio_errno == 0, if the request completed successfully. */
+			/* aio_errno  > 0, A positive error number, if the asynchronous I/O operation failed.
+			 *	This is the same value that would have been stored in the errno variable in the
+			 *	case of the corresponding synchronous "write()" call.
+			 */
+			assert(EINTR != aio_errno);
+			AIO_SHIM_RETURN(&(csr->aiocb), aio_retval); /* get the return value of the i/o */
+#			ifdef DEBUG
+			/* Fake an error once in a while. But do not do that in AIX if we are inside "wcs_flu" as we
+			 * have seen a lot of test failures because "wcs_flu" takes more than 1 minute to reflush
+			 * the dirty cache-record after a fake-error inside "wcs_wtfini".
+			 */
+			if (FAKE_WTERROR_FREQUENCY == ++dbg_skip_wcs_wt_restart)
+				dbg_skip_wcs_wt_restart = 0;
+			if ((0 == dbg_skip_wcs_wt_restart) && (0 < aio_retval) AIX_ONLY(&& (cnl->wcsflu_pid != process_id)))
+			{
+				WCS_OPS_TRACE(csa, process_id, wcs_ops_wtfini2, cr->blk, GDS_ANY_ABS2REL(csa,cr),	\
+					cr->dirty, dbg_wtfini_lcnt, aio_retval);
+				aio_retval = 0;
+			}
+#			endif
+			if (0 < aio_retval)
+			{	/* async IO completed successfully with no errors */
+				assert(0 == aio_errno);
+				/* We can move this csr from the WIP queue to the FREE queue now that the write is complete.
+				 * There is one exception though. If the write of an OLDER twin completes fine (0 == csr->bt_index)
+				 * AND if csr->in_cw_set is still non-zero, it implies PHASE2 commit is in progress for this csr
+				 * concurrently by another pid and since "in_cw_set" is still non-zero, it implies the buffer is
+				 * likely needed by that pid (e.g. secshr_db_clnup/wcs_recover to complete the flush of the
+				 * before-image block to an online backup file (in case of an error in the midst of commit).
+				 * In that case, we should NOT touch csr->blk so keep csr in the WIP queue until "in_cw_set" clears.
+				 */
+				assert(REQUEUE_TO_WIP == requeue);
+				if (csr->bt_index || !csr->in_cw_set)
+					requeue = REQUEUE_TO_FREE;
+			} else
+			{	/* aio_errno can be 0 if we faked an aio error (by setting "aio_retval = 0" above) OR
+				 * if the process that was doing the AIO got killed (and so the OS decided to abandon the IO).
+				 * Assert accordingly.
+				 */
+				assert((0 < aio_errno)
+					|| ((0 == aio_errno) && (!dbg_skip_wcs_wt_restart || (epid && !is_proc_alive(epid, 0)))));
+				WCS_OPS_TRACE(csa, process_id, wcs_ops_wtfini3, cr->blk, GDS_ANY_ABS2REL(csa,cr),	\
+					cr->dirty, dbg_wtfini_lcnt, aio_errno);
+				/* Now that the IO is complete with some sort of error, handle the asyncio like is done in
+				 * wcs_wtstart for syncio. The only exception is ECANCELED which is because the async IO got
+				 * canceled. In this case it is not a real IO error. Same with dbg-only aio_errno of 0 which
+				 * is to test the "wcs_wt_restart" logic (nothing to do with "wcs_wterror").
+				 */
+				if ((ECANCELED != aio_errno) && (0 != aio_errno))
+				{
+					if (!ret_value)
+						ret_value = aio_errno;
+					wcs_wterror(reg, aio_errno);
+				}
+				/* If a NEWER twin has been formed (indicated by csr->bt_index being 0) and an error occurs in
+				 * the write of the OLDER twin, one would be tempted to ignore that error, move the OLDER twin
+				 * from the WIP queue to the FREE queue and focus on the NEWER twin. But it is possible the OLDER
+				 * twin is BEFORE an EPOCH whereas the NEWER twin is AFTER. In that case, we need the OLDER twin
+				 * flushed to disk to catch the state of the database as of the EPOCH. So we keep the OLDER twin
+				 * in the WIP queue until its write completes.
+				 */
+				/* Reissue the IO */
+				restart_errno = wcs_wt_restart(udi, csr);	/* sets "csr->epid" */
+				if (SYNCIO_MORPH_SUCCESS == restart_errno)
+					requeue = REQUEUE_TO_FREE;
+				else if (!restart_errno && !csr->epid)
+				{	/* Case where IO was not reissued (either because we did not have crit or because we did
+					 * not have read-write access to db. Put it back in active queue.
+					 */
+					requeue = REQUEUE_TO_ACTIVE;
+				}
+			}
+		}
+		if (REQUEUE_TO_WIP == requeue)
+		{
+			status = INSQTI((que_ent_ptr_t)csr, (que_head_ptr_t)whead);
+			if (INTERLOCK_FAIL == status)
+			{
+				assert(FALSE);
+				SET_TRACEABLE_VAR(cnl->wc_blocked, TRUE);
+				BG_TRACE_PRO_ANY(csa, wcb_wtfini_lckfail3);
+				ret_value = ERR_DBCCERR;
+				break;
+			}
+			if (NULL == start_csr)
+				start_csr = csr;
+		} else if (REQUEUE_TO_FREE == requeue)
+		{
+			csr->flushed_dirty_tn = csr->dirty;
+			csr->dirty = 0;
+			cnl->wcs_buffs_freed++;
+			csr->epid = 0;
+			SUB_ENT_FROM_WIP_QUE_CNT(cnl);
+			ADD_ENT_TO_FREE_QUE_CNT(cnl);
+			if (csr->twin)
+				BREAK_TWIN(csr, csa);
+			CLEAR_BUFF_UPDATE_LOCK(csr, &cnl->db_latch);
+		} else
+		{
+			assert(REQUEUE_TO_ACTIVE == requeue);
+			CLEAR_BUFF_UPDATE_LOCK(csr, &cnl->db_latch);
+			ahead = &csa->acc_meth.bg.cache_state->cacheq_active;
+			REINSERT_CR_AT_TAIL(csr, ahead, n, csa, csd, wcb_wtfini_lckfail4);
+			if (INTERLOCK_FAIL == n)
+			{
+				ret_value = ERR_DBCCERR;
+				break;
+			}
+			SUB_ENT_FROM_WIP_QUE_CNT(cnl);
+			ADD_ENT_TO_ACTIVE_QUE_CNT(cnl);
+			WCS_OPS_TRACE(csa, process_id, wcs_ops_wtfini4, cr->blk, GDS_ANY_ABS2REL(csa,cr), cr->dirty,	\
+				dbg_wtfini_lcnt, epid);
+		}
+	}
+	cnl->wtfini_in_prog = 0;
+	wtfini_in_prog--;
+	assert(0 <= wtfini_in_prog);
+	if (0 > wtfini_in_prog)
+		wtfini_in_prog = 0;
+	assert(!ret_value || ENOSPC == ret_value || ERR_DBCCERR == ret_value);
+	return ret_value;
+}
diff --git a/sr_unix/wcs_wtfini_nocrit.c b/sr_unix/wcs_wtfini_nocrit.c
new file mode 100644
index 0000000..762b444
--- /dev/null
+++ b/sr_unix/wcs_wtfini_nocrit.c
@@ -0,0 +1,60 @@
+/****************************************************************
+ *								*
+ * Copyright (c) 2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
+ *								*
+ *	This source code contains the intellectual property	*
+ *	of its copyright holder(s), and is made available	*
+ *	under a license.  If you do not know the terms of	*
+ *	the license, please stop and do not read further.	*
+ *								*
+ ****************************************************************/
+#include "mdef.h"
+
+#include <error.h>
+
+#include "gdsroot.h"
+#include "gdsbt.h"
+#include "gdsfhead.h"
+#include "wcs_sleep.h"
+#include "filestruct.h"
+#include "gtmio.h"
+#include "wcs_wt.h"
+#include "sleep_cnt.h"
+#include "aio_shim.h"
+
+GBLREF uint4 		process_id;
+
+error_def(ERR_AIOBUFSTUCK);
+error_def(ERR_DBFILERR);
+
+/* This function goes through the list of crs that is passed in and waits until all
+ * of them have their AIO status available before returning. If the cr is no longer
+ * dirty or another process has issued a write, the function goes to the next cr.
+ */
+
+void wcs_wtfini_nocrit(gd_region *reg, wtstart_cr_list_t *cr_list_ptr)
+{
+	int 		lcnt, ret;
+	cache_rec_ptr_t	cr, *crbeg, *crtop, *crptr;
+
+	crbeg = &cr_list_ptr->listcrs[0];
+	crtop = crbeg + cr_list_ptr->numcrs;
+	for (crptr = crbeg; crptr < crtop; crptr++)
+	{
+		cr = *crptr;
+		for (lcnt = 1; cr->dirty && (cr->epid == process_id); lcnt++)
+		{	/* dirty, i/o has been issued by our process and there is no i/o status available yet */
+			AIO_SHIM_ERROR(&cr->aiocb, ret);
+			if (EINPROGRESS != ret)
+				break;
+			if (0 == lcnt % SLEEP_ONE_MIN)
+			{	/* let them know we have been waiting a while */
+				send_msg_csa(CSA_ARG(NULL) VARLSTCNT(11) ERR_DBFILERR, 2, DB_LEN_STR(reg),
+					ERR_AIOBUFSTUCK, 5, (lcnt / SLEEP_ONE_MIN), cr->epid, cr->blk, cr->blk, EINPROGRESS);
+			}
+			wcs_sleep(lcnt); /* so wait a while */
+		}
+	}
+}
+
diff --git a/sr_unix/wcs_wtstart.c b/sr_unix/wcs_wtstart.c
old mode 100755
new mode 100644
index 389fe2d..e7f9e90
--- a/sr_unix/wcs_wtstart.c
+++ b/sr_unix/wcs_wtstart.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -13,16 +13,13 @@
 #include "mdef.h"
 
 #include <sys/mman.h>
-#include <errno.h>
 #include "gtm_fcntl.h"
 #include "gtm_unistd.h"
 #include "gtm_signal.h"	/* needed for VSIG_ATOMIC_T */
-#include "util.h"
 #include "gtm_stdio.h"
 
 #include "aswp.h"
 #include "copy.h"
-#include "dskspace_msg_timer.h"		/* needed for dskspace_msg_timer() declaration and DSKSPACE_MSG_INTERVAL macro value */
 #include "error.h"
 #include "gdsroot.h"
 #include "gtm_facility.h"
@@ -39,6 +36,7 @@
 #include "interlock.h"
 #include "io.h"
 #include "gdsbgtr.h"
+#include "aio_shim.h"
 #include "gtmio.h"
 #include "relqueopi.h"
 #include "gt_timer.h"
@@ -62,24 +60,23 @@
 #include "t_retry.h"
 #include "min_max.h"
 #include "gtmimagename.h"
+#include "util.h"
+#include "gtm_multi_proc.h"	/* for "multi_proc_in_use" GBLREF */
+#include "wcs_backoff.h"
+#include "wcs_wt.h"
+#include "performcaslatchcheck.h"
+#include "wcs_sleep.h"
+#include "caller_id.h"
+#include "rel_quant.h"
+#include "sleep_cnt.h"
+#include "gtm_c_stack_trace.h"
+#include "relqop.h"
 
-#define	REINSERT_CR_AT_TAIL(csr, ahead, n, csa, csd, trace_cntr)	\
-{									\
-	n = INSQTI((que_ent_ptr_t)csr, (que_head_ptr_t)ahead);		\
-	if (INTERLOCK_FAIL == n)					\
-	{								\
-		assert(FALSE);						\
-		SET_TRACEABLE_VAR(cnl->wc_blocked, TRUE);		\
-		BG_TRACE_PRO_ANY(csa, trace_cntr);			\
-		break;							\
-	}								\
-}
-
-#define DBIOERR_LOGGING_PERIOD			100
 
 #ifdef DEBUG
-GBLREF int4	exit_state;
-STATICDEF int	wcs_wtstart_count;
+GBLREF		int4		exit_state;
+
+STATICDEF	int		wcs_wtstart_count;
 
 /* White-box-test-activated macro to sleep in one of the predetermined places (based on the count variable)
  * inside wcs_wtstart. The sleep allows for the delivery of an interrupt in a specific window of code.
@@ -108,15 +105,6 @@ STATICDEF int	wcs_wtstart_count;
 #  define SLEEP_ON_WBOX_COUNT(COUNT)
 #endif
 
-/* In case of a disk-full situation, we want to print a message every 1 minute. We maintain two global variables to that effect.
- * dskspace_msg_counter and save_dskspace_msg_counter. If we encounter a disk-full situation and both those variables are different
- * we start a timer dskspace_msg_timer() that pops after a minute and increments one of the variables dskspace_msg_counter.
- * Since we want the first disk-full situation to also log a message, we initialise them to different values.
- */
-static 	volatile uint4 		save_dskspace_msg_counter = 0;
-GBLDEF	volatile uint4		dskspace_msg_counter = 1;	/* not static since used in dskspace_msg_timer.c */
-
-GBLREF	boolean_t		*lseekIoInProgress_flags;	/* needed for the LSEEK* macros in gtmio.h */
 GBLREF	uint4			process_id;
 GBLREF	sm_uc_ptr_t		reformat_buffer;
 GBLREF	int			reformat_buffer_len;
@@ -128,13 +116,14 @@ GBLREF	uint4			dollar_tlevel;
 GBLREF	uint4			update_trans;
 GBLREF	uint4			mu_reorg_encrypt_in_prog;
 GBLREF	sgmnt_addrs		*reorg_encrypt_restart_csa;
+GBLREF	bool			in_mupip_freeze;
 #ifdef DEBUG
 GBLREF	volatile int		reformat_buffer_in_use;
 GBLREF	volatile int4		gtmMallocDepth;
 #endif
+GBLREF	volatile int4		fast_lock_count;
 
-error_def(ERR_DBFILERR);
-error_def(ERR_DBIOERR);
+error_def(ERR_DBCCERR);
 error_def(ERR_ENOSPCQIODEFER);
 error_def(ERR_GBLOFLOW);
 error_def(ERR_JNLFSYNCERR);
@@ -143,11 +132,11 @@ error_def(ERR_JNLWRTNOWWRTR);
 error_def(ERR_SYSCALL);
 error_def(ERR_TEXT);
 
-int4	wcs_wtstart(gd_region *region, int4 writes)
+int4	wcs_wtstart(gd_region *region, int4 writes, wtstart_cr_list_t *cr_list_ptr, cache_rec_ptr_t cr2flush)
 {
 	blk_hdr_ptr_t		bp, save_bp;
-	boolean_t               need_jnl_sync, queue_empty, got_lock, bmp_status;
-	cache_que_head_ptr_t	ahead;
+	boolean_t               need_jnl_sync, queue_empty, got_lock, bmp_status, do_asyncio, wtfini_called_once;
+	cache_que_head_ptr_t	ahead, whead;
 	cache_state_rec_ptr_t	csr, csrfirst;
 	int4                    err_status = 0, n, n1, n2, max_ent, max_writes, save_errno;
         size_t                  size ;
@@ -174,27 +163,35 @@ int4	wcs_wtstart(gd_region *region, int4 writes)
 	int			in_len;
 	int4			gtmcrypt_errno = 0;
 	gd_segment		*seg;
-	boolean_t		use_new_key, skip_in_trans;
+	boolean_t		use_new_key, skip_in_trans, skip_sync, sync_keys;
+	que_ent_ptr_t		next, prev;
+	void_ptr_t              retcsrptr;
+	boolean_t		keep_buff_lock;
+	cache_rec_ptr_t		older_twin;
+
 	DCL_THREADGBL_ACCESS;
 
 	SETUP_THREADGBL_ACCESS;
+	if (cr_list_ptr)
+		cr_list_ptr->numcrs = 0;
 	if (INST_FREEZE_ON_ERROR_POLICY)
-		PUSH_GV_CUR_REGION(region, sav_cur_region, sav_cs_addrs, sav_cs_data)
+		PUSH_GV_CUR_REGION(region, sav_cur_region, sav_cs_addrs, sav_cs_data);
 	udi = FILE_INFO(region);
 	csa = &udi->s_addrs;
 	csd = csa->hdr;
 	is_mm = (dba_mm == csd->acc_meth);
 	assert(is_mm || (dba_bg == csd->acc_meth));
-	BG_TRACE_ANY(csa, wrt_calls);	/* Calls to wcs_wtstart */
-	/* If *this* process is already in wtstart, we won't interrupt it do it again */
+	BG_TRACE_PRO_ANY(csa, wrt_calls);	/* Calls to wcs_wtstart */
+	/* If this process is already in wcs_wtstart for this region, we won't interrupt it again */
+	cnl = csa->nl;
 	if (csa->in_wtstart)
 	{
-		BG_TRACE_ANY(csa, wrt_busy);
+		WCS_OPS_TRACE(csa, process_id, wcs_ops_wtstart1, 0, 0, 0, 0, 0);
+		BG_TRACE_PRO_ANY(csa, wrt_busy);
 		if (INST_FREEZE_ON_ERROR_POLICY)
-			POP_GV_CUR_REGION(sav_cur_region, sav_cs_addrs, sav_cs_data)
+			POP_GV_CUR_REGION(sav_cur_region, sav_cs_addrs, sav_cs_data);
 		return err_status;			/* Already here, get out */
 	}
-	cnl = csa->nl;
 	/* Defer interrupts to protect against an inconsistent state caused by mismatch of such values as
 	 * cnl->intent_wtstart and cnl->in_wtstart.
 	 */
@@ -204,10 +201,11 @@ int4	wcs_wtstart(gd_region *region, int4 writes)
 	SHM_READ_MEMORY_BARRIER;	/* need to do this to ensure uptodate value of cnl->wc_blocked is read */
 	if (cnl->wc_blocked)
 	{
+		WCS_OPS_TRACE(csa, process_id, wcs_ops_wtstart2, 0, 0, 0, 0, 0);
 		DECR_INTENT_WTSTART(cnl);
-		BG_TRACE_ANY(csa, wrt_blocked);
+		BG_TRACE_PRO_ANY(csa, wrt_blocked);
 		if (INST_FREEZE_ON_ERROR_POLICY)
-			POP_GV_CUR_REGION(sav_cur_region, sav_cs_addrs, sav_cs_data)
+			POP_GV_CUR_REGION(sav_cur_region, sav_cs_addrs, sav_cs_data);
 		ENABLE_INTERRUPTS(INTRPT_IN_WCS_WTSTART, prev_intrpt_state);
 		return err_status;
 	}
@@ -217,6 +215,17 @@ int4	wcs_wtstart(gd_region *region, int4 writes)
 	 * Because it is highly unlikely for an interrupt-deferred process to get killed at exactly this spot, do not test that.
 	 */
 	INCR_CNT(&cnl->in_wtstart, &cnl->wc_var_lock);	/* and cnl->in_wtstart (shared copy) assignments as close as possible.   */
+	if (FROZEN_CHILLED(csd) && !FREEZE_LATCH_HELD(csa))
+	{
+		CAREFUL_DECR_CNT(cnl->in_wtstart, cnl->wc_var_lock);
+		DECR_INTENT_WTSTART(cnl);
+		csa->in_wtstart = FALSE;
+		if (INST_FREEZE_ON_ERROR_POLICY)
+			POP_GV_CUR_REGION(sav_cur_region, sav_cs_addrs, sav_cs_data);
+		ENABLE_INTERRUPTS(INTRPT_IN_WCS_WTSTART, prev_intrpt_state);
+		/* Return non-zero in order to break wcs_wtstart_fini() out of its loop. Ignored elsewhere. */
+		return EAGAIN;
+	}
 	SLEEP_ON_WBOX_COUNT(2);
 	SAVE_WTSTART_PID(cnl, process_id, index);
 	assert((cnl->in_wtstart > 0) && csa->in_wtstart);
@@ -233,17 +242,16 @@ int4	wcs_wtstart(gd_region *region, int4 writes)
 		 */
 		jnl_qio_start(jpc);
 	}
-	if (!is_mm)
-	{
-		ahead = &csa->acc_meth.bg.cache_state->cacheq_active;
-		cr_lo = csa->acc_meth.bg.cache_state->cache_array + csd->bt_buckets;
-		cr_hi = cr_lo + csd->n_bts;
-	} else
+	if (is_mm)
 	{
 		queue_empty = TRUE;
 		n1 = 1; /* set to a non-zero value so dbsync timer canceling (if needed) can happen */
 		goto writes_completed; /* to avoid unnecessary IF checks in the more common case (BG) */
 	}
+	ahead = &csa->acc_meth.bg.cache_state->cacheq_active;
+	whead = &csa->acc_meth.bg.cache_state->cacheq_wip;
+	cr_lo = csa->acc_meth.bg.cache_state->cache_array + csd->bt_buckets;
+	cr_hi = cr_lo + csd->n_bts;
 	assert(((sm_long_t)ahead & 7) == 0);
 	queue_empty = FALSE;
 	csa->wbuf_dqd++;			/* Tell rundown we have an orphaned block in case of interrupt */
@@ -251,6 +259,9 @@ int4	wcs_wtstart(gd_region *region, int4 writes)
 	was_crit = csa->now_crit;
 	SLEEP_ON_WBOX_COUNT(4);
 	skip_in_trans = FALSE;
+	assert(!is_mm);	/* MM should have bypassed this "for" loop completely */
+	wtfini_called_once = FALSE;
+	WCS_OPS_TRACE(csa, process_id, wcs_ops_wtstart3, 0, 0, 0, 0, 0);
 	for (n1 = n2 = 0, csrfirst = NULL; (n1 < max_ent) && (n2 < max_writes) && !cnl->wc_blocked; ++n1)
 	{	/* If not-crit, avoid REMQHI by peeking at the active queue and if it is found to have a 0 fl link, assume
 		 * there is nothing to flush and break out of the loop. This avoids unnecessary interlock usage (GTM-7635).
@@ -258,7 +269,60 @@ int4	wcs_wtstart(gd_region *region, int4 writes)
 		 */
 		if (!was_crit && (0 == ahead->fl))
 			csr = NULL;
-		else
+		keep_buff_lock = FALSE;
+		if (cr2flush)
+		{ 	/* asked to flush a specific cr: */
+			/* should be dirty and not have had a write issued, i.e., in the active queue */
+			max_ent = 1;
+			max_writes = 1;
+			csr = NULL; /* assume it's none until we find it */
+			if (cr2flush->dirty && !cr2flush->epid)
+			{ 	/* if it is in the active queue */
+				++fast_lock_count; /* Disable wcs_stale for duration */
+				if (grab_latch(&ahead->latch, WT_LATCH_TIMEOUT_SEC))
+				{
+					cr = cr2flush;
+					csr = (cache_state_rec_ptr_t)((sm_uc_ptr_t)cr + SIZEOF(cr->blkque));
+					if (csr->dirty && !csr->epid && csr->state_que.fl)
+					{	/* Now that we know csr is in the active queue, remove it. */
+						retcsrptr = remqh((que_ent_ptr_t)((sm_uc_ptr_t)&csr->state_que
+							+ csr->state_que.bl));
+						if ((cache_state_rec_ptr_t)retcsrptr != csr)
+                                                {	/* Did not get the csr we intended so something must be wrong with cache.
+							 * Kill -9 can cause this. Assert that we were doing a crash shutdown.
+							 */
+                                                        assert(gtm_white_box_test_case_enabled
+                                                                && (WBTEST_CRASH_SHUTDOWN_EXPECTED
+                                                                == gtm_white_box_test_case_number));
+                                                        SET_TRACEABLE_VAR(cnl->wc_blocked, TRUE);
+                                                        err_status = ERR_DBCCERR;
+                                                        break;
+                                                }
+						csr->state_que.fl = (sm_off_t)0;
+						csr->state_que.bl = (sm_off_t)0;
+						/* LOCK_BUFF_FOR_WRITE needs to happens AFTER the remqh just like
+						 * the non-cr2flush case because bg_update_phase2() relies on this
+						 * ordering for reinserting a cr into the active queue.
+						 */
+						LOCK_BUFF_FOR_WRITE(csr, n, &cnl->db_latch);
+						assert(WRITE_LATCH_VAL(csr) >= LATCH_CLEAR);
+						assert(WRITE_LATCH_VAL(csr) <= LATCH_CONFLICT);
+						if (OWN_BUFF(n))
+						{
+							assert(WRITE_LATCH_VAL(csr) > LATCH_CLEAR);
+							assert(0 == n);
+							keep_buff_lock = TRUE;
+						} else
+							csr = NULL; /* another process is taking care of this cr */
+					} else
+						csr = NULL; /* no longer on the active queue */
+					rel_latch(&ahead->latch);
+				} else
+					csr = NULL; /* did not get the lock */
+        			--fast_lock_count;
+        			assert(0 <= fast_lock_count);
+			}
+		} else
 		{
 			csr = (cache_state_rec_ptr_t)REMQHI((que_head_ptr_t)ahead);
 			if (INTERLOCK_FAIL == (INTPTR_T)csr)
@@ -268,280 +332,399 @@ int4	wcs_wtstart(gd_region *region, int4 writes)
 				BG_TRACE_PRO_ANY(csa, wcb_wtstart_lckfail1);
 				break;
 			}
+			cr = (cache_rec_ptr_t)((sm_uc_ptr_t)csr - SIZEOF(cr->blkque));
 		}
 		if (NULL == csr)
 			break;				/* the queue is empty */
+		assert(!FROZEN_CHILLED(csd) || FREEZE_LATCH_HELD(csa));
 		if (csr == csrfirst)
 		{					/* completed a tour of the queue */
 			queue_empty = FALSE;
+			assert(!keep_buff_lock);
+			/* the if check and lock clear is for PRO just in case */
+			if (keep_buff_lock)
+				CLEAR_BUFF_UPDATE_LOCK(csr, &cnl->db_latch);
 			REINSERT_CR_AT_TAIL(csr, ahead, n, csa, csd, wcb_wtstart_lckfail2);
+			if (INTERLOCK_FAIL == n)
+				err_status = ERR_DBCCERR;
 			break;
 		}
-		cr = (cache_rec_ptr_t)((sm_uc_ptr_t)csr - SIZEOF(cr->blkque));
-		if (!is_mm)
-		{
-			assert(!CR_NOT_ALIGNED(cr, cr_lo) && !CR_NOT_IN_RANGE(cr, cr_lo, cr_hi));
-			if (CR_BLKEMPTY == csr->blk)
-			{	/* must be left by t_commit_cleanup - removing it from the queue and the following
-				 * completes the cleanup
-				 */
-				assert(0 != csr->dirty);
-				assert(csr->data_invalid);
-				csr->data_invalid = FALSE;
-				csr->dirty = 0;
-				INCR_CNT(&cnl->wc_in_free, &cnl->wc_var_lock);
-				queue_empty = !SUB_ENT_FROM_ACTIVE_QUE_CNT(&cnl->wcs_active_lvl, &cnl->wc_var_lock);
+		assert(!CR_NOT_ALIGNED(cr, cr_lo) && !CR_NOT_IN_RANGE(cr, cr_lo, cr_hi));
+		if (CR_BLKEMPTY == csr->blk)
+		{	/* must be left by t_commit_cleanup - removing it from the queue and the following
+			 * completes the cleanup
+			 */
+			WCS_OPS_TRACE(csa, process_id, wcs_ops_wtstart4, cr->blk, GDS_ANY_ABS2REL(csa,cr), cr->dirty, 0, 0);
+			assert(0 != csr->dirty);
+			assert(csr->data_invalid);
+			csr->data_invalid = FALSE;
+			csr->dirty = 0;
+			assert(!keep_buff_lock);
+			/* the if check and lock clear is for PRO just in case */
+			if (keep_buff_lock)
+				CLEAR_BUFF_UPDATE_LOCK(csr, &cnl->db_latch);
+			ADD_ENT_TO_FREE_QUE_CNT(cnl);
+			assert(LATCH_CLEAR == WRITE_LATCH_VAL(csr));
+			queue_empty = !SUB_ENT_FROM_ACTIVE_QUE_CNT(cnl);
+			continue;
+		}
+		/* If journaling, write only if the journal file is up to date and no jnl-switches occurred */
+		if (JNL_ENABLED(csd))
+		{	/* this looks to be a long lock and hence should use a mutex */
+			jb = jpc->jnl_buff;
+			need_jnl_sync = (csr->jnl_addr > jb->fsync_dskaddr);
+			assert(!need_jnl_sync || ((NOJNL) != jpc->channel) || (cnl->wcsflu_pid != process_id));
+			got_lock = FALSE;
+			if ((csr->jnl_addr > jb->dskaddr)
+			    || (need_jnl_sync && (NOJNL == jpc->channel
+					|| (FALSE == (got_lock = GET_SWAPLOCK(&jb->fsync_in_prog_latch))))))
+			{
+				WCS_OPS_TRACE(csa, process_id, wcs_ops_wtstart5, cr->blk, GDS_ANY_ABS2REL(csa,cr), cr->dirty,	\
+					need_jnl_sync, got_lock);
+				if (need_jnl_sync)
+					BG_TRACE_PRO_ANY(csa, n_jnl_fsync_tries);
+				if (keep_buff_lock)
+					CLEAR_BUFF_UPDATE_LOCK(csr, &cnl->db_latch);
+				REINSERT_CR_AT_TAIL(csr, ahead, n, csa, csd, wcb_wtstart_lckfail3);
+				if (INTERLOCK_FAIL == n)
+				{
+					err_status = ERR_DBCCERR;
+					break;
+				}
+				if (NULL == csrfirst)
+					csrfirst = csr;
 				continue;
-			}
-			/* If journaling, write only if the journal file is up to date and no jnl-switches occurred */
-			if (JNL_ENABLED(csd))
-			{	/* this looks to be a long lock and hence should use a mutex */
-				jb = jpc->jnl_buff;
-				need_jnl_sync = (csr->jnl_addr > jb->fsync_dskaddr);
-				assert(!need_jnl_sync || ((NOJNL) != jpc->channel) || (cnl->wcsflu_pid != process_id));
-				got_lock = FALSE;
-				if ((csr->jnl_addr > jb->dskaddr)
-				    || (need_jnl_sync && (NOJNL == jpc->channel
-						|| (FALSE == (got_lock = GET_SWAPLOCK(&jb->fsync_in_prog_latch))))))
+			} else if (got_lock)
+			{
+				saved_dsk_addr = jb->dskaddr;
+				if (jpc->sync_io)
 				{
-					if (need_jnl_sync)
-						BG_TRACE_PRO_ANY(csa, n_jnl_fsync_tries);
-					REINSERT_CR_AT_TAIL(csr, ahead, n, csa, csd, wcb_wtstart_lckfail3);
-					if (NULL == csrfirst)
-						csrfirst = csr;
-					continue;
-				} else if (got_lock)
+					/* We need to maintain the fsync control fields irrespective of the type of IO,
+					 * because we might switch between these at any time.
+					 */
+					jb->fsync_dskaddr = saved_dsk_addr;
+				} else
 				{
-					saved_dsk_addr = jb->dskaddr;
-					if (jpc->sync_io)
-					{
-						/* We need to maintain the fsync control fields irrespective of the type of IO,
-						 * because we might switch between these at any time.
-						 */
-						jb->fsync_dskaddr = saved_dsk_addr;
-					} else
+					GTM_JNL_FSYNC(csa, jpc->channel, rc);
+					if (-1 == rc)
 					{
-						GTM_JNL_FSYNC(csa, jpc->channel, rc);
-						if (-1 == rc)
-						{
-							assert(FALSE);
-							send_msg_csa(CSA_ARG(csa) VARLSTCNT(9) ERR_JNLFSYNCERR, 2, JNL_LEN_STR(csd),
-								 ERR_TEXT, 2, RTS_ERROR_TEXT("Error with fsync"), errno);
-							RELEASE_SWAPLOCK(&jb->fsync_in_prog_latch);
-							REINSERT_CR_AT_TAIL(csr, ahead, n, csa, csd, wcb_wtstart_lckfail3);
-							if (NULL == csrfirst)
-								csrfirst = csr;
-							continue;
-						} else
+						assert(FALSE);
+						send_msg_csa(CSA_ARG(csa) VARLSTCNT(9) ERR_JNLFSYNCERR, 2, JNL_LEN_STR(csd),
+							 ERR_TEXT, 2, RTS_ERROR_TEXT("Error with fsync"), errno);
+						RELEASE_SWAPLOCK(&jb->fsync_in_prog_latch);
+						if (keep_buff_lock)
+							CLEAR_BUFF_UPDATE_LOCK(csr, &cnl->db_latch);
+						REINSERT_CR_AT_TAIL(csr, ahead, n, csa, csd, wcb_wtstart_lckfail3);
+						if (INTERLOCK_FAIL == n)
 						{
-							jb->fsync_dskaddr = saved_dsk_addr;
-							BG_TRACE_PRO_ANY(csa, n_jnl_fsyncs);
+							err_status = ERR_DBCCERR;
+							break;
 						}
+						if (NULL == csrfirst)
+							csrfirst = csr;
+						continue;
+					} else
+					{
+						jb->fsync_dskaddr = saved_dsk_addr;
+						BG_TRACE_PRO_ANY(csa, n_jnl_fsyncs);
 					}
-					RELEASE_SWAPLOCK(&jb->fsync_in_prog_latch);
 				}
+				RELEASE_SWAPLOCK(&jb->fsync_in_prog_latch);
 			}
 		}
-		LOCK_BUFF_FOR_WRITE(csr, n, &cnl->db_latch);
+		/* If twin exists then do not issue write of NEWER twin until OLDER twin has been removed from WIP queue.
+		 * The act of removal from the WIP queue clears "csr->twin" so checking just that is enough.
+		 */
+		if (csr->twin)
+		{
+			assert(csd->asyncio);	/* Assert that ASYNCIO is turned ON as that is a necessity for twinning */
+			/* Check if crit can be obtained right away. If so, call "wcs_wtfini" after getting crit.
+			 * And recheck if the "twin" has been broken. If so proceed with the write. Else skip this write.
+			 * Do not call heavyweight "wcs_wtfini" more than once per "wcs_wtstart" call.
+			 * Also we are meddling with active queue now so we cannot risk a "wcs_recover" call inside
+			 * "grab_crit_immediate" hence the OK_FOR_WCS_RECOVER_FALSE usage below.
+			 */
+			if (!wtfini_called_once && (was_crit || grab_crit_immediate(region, OK_FOR_WCS_RECOVER_FALSE)))
+			{
+				DEBUG_ONLY(dbg_wtfini_lcnt = dbg_wtfini_wcs_wtstart);	/* used by "wcs_wtfini" */
+				older_twin = (csr->bt_index ? (cache_rec_ptr_t)GDS_ANY_REL2ABS(csa, csr->twin) : cr);
+				assert(!older_twin->bt_index);
+				wcs_wtfini(region, CHECK_IS_PROC_ALIVE_FALSE, older_twin);
+				if (!was_crit)
+					rel_crit(region);
+				wtfini_called_once = TRUE;
+			}
+			/* Note that in the most common case, csr will be the NEWER twin. But it is possible csr is the OLDER
+			 * twin too. For example, if the OLDER twin's write got aborted because the process that initiated
+			 * the write got killed and "wcs_wtfini" moved the csr back into the active queue. csr->bt_index
+			 * being non-zero indicates it is a NEWER twin in which case we need to wait for the twin link to be broken.
+			 */
+			if (csr->twin && csr->bt_index)
+			{
+				WCS_OPS_TRACE(csa, process_id, wcs_ops_wtstart6, cr->blk, GDS_ANY_ABS2REL(csa,cr), cr->dirty,	\
+					cr->bt_index, 0);
+				if (keep_buff_lock)
+					CLEAR_BUFF_UPDATE_LOCK(csr, &cnl->db_latch);
+				REINSERT_CR_AT_TAIL(csr, ahead, n, csa, csd, wcb_wtstart_lckfail3);
+				if (INTERLOCK_FAIL == n)
+				{
+					err_status = ERR_DBCCERR;
+					break;
+				}
+				if (NULL == csrfirst)
+					csrfirst = csr;
+				continue;
+			}
+		}
+		csr->aio_issued = FALSE;	/* set this to TRUE before csr->epid is set to a non-zero value.
+						 * To avoid out-of-order execution place this BEFORE the LOCK_BUFF_FOR_WRITE.
+						 * It does not hurt in the case we skip the "if (OWN_BUFF(n))" check.
+						 */
+		if (!keep_buff_lock)
+			LOCK_BUFF_FOR_WRITE(csr, n, &cnl->db_latch);
+		else
+			assert(OWN_BUFF(n)); /* since we keep it we better own it */
 		assert(WRITE_LATCH_VAL(csr) >= LATCH_CLEAR);
 		assert(WRITE_LATCH_VAL(csr) <= LATCH_CONFLICT);
 		if (OWN_BUFF(n))
 		{	/* sole owner */
+			assert(csr->dirty);
 			assert(WRITE_LATCH_VAL(csr) > LATCH_CLEAR);
 			assert(0 == n);
-			assert(0 != csr->dirty);
 			/* We're going to write this block out now */
 			save_errno = 0;
-			if (!is_mm)
+			assert(FALSE == csr->data_invalid);	/* check that buffer has valid data */
+			csr->epid = process_id;
+			CR_BUFFER_CHECK1(region, csa, csd, cr, cr_lo, cr_hi);
+			bp = (blk_hdr_ptr_t)(GDS_ANY_REL2ABS(csa, csr->buffaddr));
+			VALIDATE_BM_BLK(csr->blk, bp, csa, region, bmp_status);	/* bmp_status holds bmp buffer's validity */
+			/* GDSV4 (0) version uses this field as a block length so should always be > 0. Assert that.
+			 * There is one exception in that we might have a crash test where a process was killed just before
+			 * populating a block in bg_update_phase2 when cr->data_invalid is still 0 but cr->in_tend is non-zero
+			 * (so the block-header is still null) in which case "wcs_recover" would have kept cr->dirty non-zero
+			 * even though the block-header is empty. So assert that. Note that gds_blk_downgrade has a safety
+			 * check for bver == 0 and returns immediately in that case so it is okay to call it with a 0 bver in pro.
+			 */
+			assert(((blk_hdr_ptr_t)bp)->bver
+				|| (gtm_white_box_test_case_enabled
+					&& (WBTEST_CRASH_SHUTDOWN_EXPECTED == gtm_white_box_test_case_number)));
+			if (IS_GDS_BLK_DOWNGRADE_NEEDED(csr->ondsk_blkver))
+			{	/* Need to downgrade/reformat this block back to a previous format. */
+				assert(!csd->asyncio);	/* asyncio & V4 format are not supported together */
+				assert((0 == reformat_buffer_in_use) || process_exiting);
+				DEBUG_ONLY(reformat_buffer_in_use++;)
+				DEBUG_DYNGRD_ONLY(PRINTF("WCS_WTSTART: Block %d being dynamically downgraded on write\n", \
+							 csr->blk));
+				if (csd->blk_size > reformat_buffer_len)
+				{	/* Buffer not big enough (or does not exist) .. get a new one releasing
+					 * old if it exists
+					 */
+					assert(0 == gtmMallocDepth);	/* should not be in a nested free/malloc */
+					if (reformat_buffer)
+						free(reformat_buffer);	/* Different blksized databases in use
+									   .. keep only largest one */
+					reformat_buffer = malloc(csd->blk_size);
+					reformat_buffer_len = csd->blk_size;
+				}
+				gds_blk_downgrade((v15_blk_hdr_ptr_t)reformat_buffer, (blk_hdr_ptr_t)bp);
+				bp = (blk_hdr_ptr_t)reformat_buffer;
+				size = (((v15_blk_hdr_ptr_t)bp)->bsiz + 1) & ~1;
+			} else DEBUG_ONLY(if (GDSV6 == csr->ondsk_blkver))
+				size = (bp->bsiz + 1) & ~1;
+#			ifdef DEBUG
+			else
+				assert(IS_GDS_BLK_DOWNGRADE_NEEDED(csr->ondsk_blkver) || (GDSV6 == csr->ondsk_blkver));
+#			endif
+			if (csa->do_fullblockwrites)
+				size = ROUND_UP(size, csa->fullblockwrite_len);
+			assert(size <= csd->blk_size);
+			INCR_GVSTATS_COUNTER(csa, cnl, n_dsk_write, 1);
+			save_bp = bp;
+			/* Encryption settings in the database file header cannot change at this time because a concurrent
+			 * MUPIP REORG -ENCRYPT process should wait for all ongoing wcs_wtstarts to finish before
+			 * proceeding. Therefore, we can safely reference csd to (re)initialize the encryption handles based
+			 * on the hashes in the file header.
+			 */
+			use_new_key = USES_NEW_KEY(csd);
+			if (IS_ENCRYPTED(csd->is_encrypted) || use_new_key)
 			{
-				assert(FALSE == csr->data_invalid);	/* check that buffer has valid data */
-				csr->epid = process_id;
-				CR_BUFFER_CHECK1(region, csa, csd, cr, cr_lo, cr_hi);
-				bp = (blk_hdr_ptr_t)(GDS_ANY_REL2ABS(csa, csr->buffaddr));
-				VALIDATE_BM_BLK(csr->blk, bp, csa, region, bmp_status);	/* bmp_status holds bmp buffer's validity */
-				assert(((blk_hdr_ptr_t)bp)->bver);	/* GDSV4 (0) version uses this field as a block length so
-									   should always be > 0 */
-				if (IS_GDS_BLK_DOWNGRADE_NEEDED(csr->ondsk_blkver))
-				{	/* Need to downgrade/reformat this block back to a previous format. */
-					assert((0 == reformat_buffer_in_use) || process_exiting);
-					DEBUG_ONLY(reformat_buffer_in_use++;)
-					DEBUG_DYNGRD_ONLY(PRINTF("WCS_WTSTART: Block %d being dynamically downgraded on write\n", \
-								 csr->blk));
-					if (csd->blk_size > reformat_buffer_len)
-					{	/* Buffer not big enough (or does not exist) .. get a new one releasing
-						 * old if it exists
-						 */
-						assert(0 == gtmMallocDepth);	/* should not be in a nested free/malloc */
-						if (reformat_buffer)
-							free(reformat_buffer);	/* Different blksized databases in use
-										   .. keep only largest one */
-						reformat_buffer = malloc(csd->blk_size);
-						reformat_buffer_len = csd->blk_size;
-					}
-					gds_blk_downgrade((v15_blk_hdr_ptr_t)reformat_buffer, (blk_hdr_ptr_t)bp);
-					bp = (blk_hdr_ptr_t)reformat_buffer;
-					size = (((v15_blk_hdr_ptr_t)bp)->bsiz + 1) & ~1;
-				} else DEBUG_ONLY(if (GDSV6 == csr->ondsk_blkver))
-					size = (bp->bsiz + 1) & ~1;
-#				ifdef DEBUG
-				else
-					assert(IS_GDS_BLK_DOWNGRADE_NEEDED(csr->ondsk_blkver) || (GDSV6 == csr->ondsk_blkver));
-#				endif
-				if (csa->do_fullblockwrites)
-					size = ROUND_UP(size, csa->fullblockwrite_len);
-				assert(size <= csd->blk_size);
-				offset = (csd->start_vbn - 1) * DISK_BLOCK_SIZE + (off_t)csr->blk * csd->blk_size;
-				INCR_GVSTATS_COUNTER(csa, cnl, n_dsk_write, 1);
-				save_bp = bp;
-				/* Encryption settings in the database file header cannot change at this time because a concurrent
-				 * MUPIP REORG -ENCRYPT process should wait for all ongoing wcs_wtstarts to finish before
-				 * proceeding. Therefore, we can safely reference csd to (re)initialize the encryption handles based
-				 * on the hashes in the file header.
-				 */
-				use_new_key = USES_NEW_KEY(csd);
-				if (IS_ENCRYPTED(csd->is_encrypted) || use_new_key)
+				seg = region->dyn.addr;
+				assert(NULL != csa->encr_ptr);
+				skip_sync = FALSE;
+				sync_keys = FALSE;
+				if (csa->encr_ptr->reorg_encrypt_cycle != cnl->reorg_encrypt_cycle)
 				{
-					seg = region->dyn.addr;
-					assert(NULL != csa->encr_ptr);
-					if (csa->encr_ptr->reorg_encrypt_cycle != cnl->reorg_encrypt_cycle)
+					assert(!mu_reorg_encrypt_in_prog);
+					if (IS_NOT_SAFE_TO_SYNC_NEW_KEYS(dollar_tlevel, update_trans))
+						skip_sync = TRUE;
+					else
 					{
-						assert(!mu_reorg_encrypt_in_prog);
-						assert(cnl->reorg_encrypt_cycle > csa->encr_ptr->reorg_encrypt_cycle);
-						if (IS_NOT_SAFE_TO_SYNC_NEW_KEYS(dollar_tlevel, update_trans))
-						{
-							DBG_RECORD_BLOCK_ABORT(csd, csa, cnl, process_id);
-							skip_in_trans = TRUE;
-						} else
-						{
-							assert(NULL == reorg_encrypt_restart_csa);
-							INIT_DB_OR_JNL_ENCRYPTION(csa, csd, seg->fname_len, seg->fname,
-									gtmcrypt_errno);
-							save_errno = gtmcrypt_errno;
-							if (0 == save_errno)
-								COPY_ENC_INFO(csd, csa->encr_ptr, cnl->reorg_encrypt_cycle);
-						}
-					} else if (NULL != reorg_encrypt_restart_csa)
-					{	/* The reorg_encrypt_cycle fields are identical (between csa->encr_ptr and cnl), but
-						 * the global variable reorg_encrypt_restart_csa clearly indicates we are in the
-						 * middle of a transaction-retry due to cdb_sc_reorg_encrypt status code and
-						 * t_retry/tp_restart will take care of doing the reinitialization of the new key
-						 * handles. We cannot do the wcs_wtstart until then in case we encounter a block
-						 * with the new key. Skip this wcs_wtstart call as if the cycles were different.
-						 */
-						DBG_RECORD_BLOCK_ABORT(csd, csa, cnl, process_id);
-						skip_in_trans = TRUE;
+						sync_keys = TRUE;
+						assert(NULL == reorg_encrypt_restart_csa);
 					}
-					if (!skip_in_trans && (0 == save_errno))
+				} else if (NULL != reorg_encrypt_restart_csa)
+				{	/* The reorg_encrypt_cycle fields are identical (between csa->encr_ptr and cnl), but
+					 * the global variable reorg_encrypt_restart_csa indicates one of two possibilities.
+					 * a) We are in the middle of a transaction-retry due to cdb_sc_reorg_encrypt status
+					 *	code and t_retry/tp_restart will take care of doing the reinitialization of
+					 *	the new key handles. We cannot do the wcs_wtstart until then in case we encounter
+					 *	a block with the new key. Skip this wcs_wtstart call as if the cycles were
+					 *	different.
+					 * b) We are exiting i.e. "process_exiting" = TRUE. In that case, we are clearly not in
+					 *	the middle of a transaction that will be committed. And so, we can safely go
+					 *	ahead and (re)initialize the encryption handles. And proceed with the flush of
+					 *	the buffers using uptodate encryption keys.
+					 */
+					if (process_exiting)
+						sync_keys = TRUE;
+					else
+						skip_sync = TRUE;
+				}
+				if (skip_sync)
+				{
+					DBG_RECORD_BLOCK_ABORT(csd, csa, cnl, process_id);
+					skip_in_trans = TRUE;
+				}
+				if (sync_keys)
+				{	/* Note: Below logic is very similar to "process_reorg_encrypt_restart" but we do
+					 * not invoke that function here because it assumes various things (e.g. non-NULL
+					 * "reorg_encrypt_restart_csa", no crit on any region etc.) all of which are not
+					 * guaranteed in some cases.
+					 */
+					INIT_DB_OR_JNL_ENCRYPTION(csa, csd, seg->fname_len, seg->fname, gtmcrypt_errno);
+					save_errno = gtmcrypt_errno;
+					if (0 == save_errno)
+						COPY_ENC_INFO(csd, csa->encr_ptr, cnl->reorg_encrypt_cycle);
+					reorg_encrypt_restart_csa = NULL; /* Reset this in case it is non-NULL */
+				}
+				if (!skip_in_trans && (0 == save_errno))
+				{
+					assert((unsigned char *)bp != reformat_buffer);
+					DBG_ENSURE_PTR_IS_VALID_GLOBUFF(csa, csd, (sm_uc_ptr_t)bp);
+					save_bp = (blk_hdr_ptr_t)GDS_ANY_ENCRYPTGLOBUF(bp, csa);
+					DBG_ENSURE_PTR_IS_VALID_ENCTWINGLOBUFF(csa, csd, (sm_uc_ptr_t)save_bp);
+					assert((bp->bsiz <= csd->blk_size) && (bp->bsiz >= SIZEOF(*bp)));
+					in_len = MIN(csd->blk_size, bp->bsiz) - SIZEOF(*bp);
+					if (BLK_NEEDS_ENCRYPTION(bp->levl, in_len))
 					{
-						assert((unsigned char *)bp != reformat_buffer);
-						DBG_ENSURE_PTR_IS_VALID_GLOBUFF(csa, csd, (sm_uc_ptr_t)bp);
-						save_bp = (blk_hdr_ptr_t) GDS_ANY_ENCRYPTGLOBUF(bp, csa);
-						DBG_ENSURE_PTR_IS_VALID_ENCTWINGLOBUFF(csa, csd, (sm_uc_ptr_t)save_bp);
-						assert((bp->bsiz <= csd->blk_size) && (bp->bsiz >= SIZEOF(*bp)));
-						in_len = MIN(csd->blk_size, bp->bsiz) - SIZEOF(*bp);
-						if (BLK_NEEDS_ENCRYPTION(bp->levl, in_len))
+						ASSERT_ENCRYPTION_INITIALIZED;
+						memcpy(save_bp, bp, SIZEOF(blk_hdr));
+						in = (char *)(bp + 1);
+						out = (char *)(save_bp + 1);
+						if (use_new_key)
 						{
-							ASSERT_ENCRYPTION_INITIALIZED;
-							memcpy(save_bp, bp, SIZEOF(blk_hdr));
-							in = (char *)(bp + 1);
-							out = (char *)(save_bp + 1);
-							if (use_new_key)
-							{
-								GTMCRYPT_ENCRYPT(csa, TRUE, csa->encr_key_handle2, in, in_len, out,
-										bp, SIZEOF(blk_hdr), gtmcrypt_errno);
-							} else
-							{
-								GTMCRYPT_ENCRYPT(csa, csd->non_null_iv, csa->encr_key_handle, in,
-										in_len, out, bp, SIZEOF(blk_hdr), gtmcrypt_errno);
-							}
-							DBG_RECORD_BLOCK_WRITE(csd, csa, cnl, process_id, csr->blk,
-								((blk_hdr *)bp)->tn,
-								4, use_new_key, bp, save_bp, bp->bsiz, in_len);
-							save_errno = gtmcrypt_errno;
+							GTMCRYPT_ENCRYPT(csa, TRUE, csa->encr_key_handle2, in, in_len, out,
+									bp, SIZEOF(blk_hdr), gtmcrypt_errno);
 						} else
 						{
-							memcpy(save_bp, bp, bp->bsiz);
-							DBG_RECORD_BLOCK_WRITE(csd, csa, cnl, process_id, csr->blk,
-								((blk_hdr *)bp)->tn,
-								5, use_new_key, bp, save_bp, bp->bsiz, in_len);
+							GTMCRYPT_ENCRYPT(csa, csd->non_null_iv, csa->encr_key_handle, in,
+									in_len, out, bp, SIZEOF(blk_hdr), gtmcrypt_errno);
 						}
+						DBG_RECORD_BLOCK_WRITE(csd, csa, cnl, process_id, csr->blk,
+							((blk_hdr *)bp)->tn,
+							4, use_new_key, bp, save_bp, bp->bsiz, in_len);
+						save_errno = gtmcrypt_errno;
+					} else
+					{
+						memcpy(save_bp, bp, bp->bsiz);
+						DBG_RECORD_BLOCK_WRITE(csd, csa, cnl, process_id, csr->blk,
+							((blk_hdr *)bp)->tn,
+							5, use_new_key, bp, save_bp, bp->bsiz, in_len);
 					}
-				} else
-				{
-					DBG_RECORD_BLOCK_WRITE(csd, csa, cnl, process_id, csr->blk,
-						((blk_hdr *)bp)->tn,
-						6, use_new_key, bp, save_bp, bp->bsiz, 0);
 				}
-				if (!skip_in_trans && (0 == save_errno))
-				{	/* Due to csa->in_wtstart protection (at the beginning of this module), we are guaranteed
-					 * that the write below won't be interrupted by another nested wcs_wtstart
-					 */
-					DB_LSEEKWRITE(csa, udi->fn, udi->fd, offset, save_bp, size, save_errno);
-				}
-				if ((blk_hdr_ptr_t)reformat_buffer == bp)
+			} else
+			{
+				DBG_RECORD_BLOCK_WRITE(csd, csa, cnl, process_id, csr->blk,
+					((blk_hdr *)bp)->tn,
+					6, use_new_key, bp, save_bp, bp->bsiz, 0);
+			}
+			/* If online rollback has forked off child processes to operate on each region,
+			 * we have seen ASYNC IOs issued from the child process do not finish for reasons unknown.
+			 * So we disable asyncio in the forward phase of offline/online rollback/recover.
+			 * This is easily identified currently by the global variable "multi_proc_in_use" being TRUE.
+			 */
+			do_asyncio = csd->asyncio && !multi_proc_in_use;
+			if (udi->fd_opened_with_o_direct)
+			{
+				size = ROUND_UP2(size, DIO_ALIGNSIZE(udi));
+				assert(size <= csd->blk_size);
+			}
+			if (!skip_in_trans && (0 == save_errno))
+			{	/* Due to csa->in_wtstart protection (at the beginning of this module), we are guaranteed
+				 * that the write below won't be interrupted by another nested wcs_wtstart
+				 */
+				offset = BLK_ZERO_OFF(csd->start_vbn) + (off_t)csr->blk * csd->blk_size;
+				if (!do_asyncio)
+				{
+					DB_LSEEKWRITE(csa, udi, udi->fn, udi->fd, offset, save_bp, size, save_errno);
+				} else
 				{
-					DEBUG_ONLY(reformat_buffer_in_use--;)
-					assert((0 == reformat_buffer_in_use) || process_exiting);
+					cr->wip_is_encr_buf = (save_bp != bp);
+					DB_LSEEKWRITEASYNCSTART(csa, udi, udi->fn, udi->fd, offset, save_bp, size, cr, save_errno);
+					if (EAGAIN == save_errno)
+					{	/* ASYNCIO IO could not be started due to OS not having enough memory temporarily */
+						BG_TRACE_PRO_ANY(csa, wcs_wtstart_eagain);
+						if (was_crit)
+						{	/* Holding crit. Do synchronous IO as we need this flushed. */
+							do_asyncio = FALSE;
+							BG_TRACE_PRO_ANY(csa, wcs_wtstart_eagain_incrit);
+							DB_LSEEKWRITE(csa, udi, udi->fn, udi->fd, offset,		\
+											save_bp, size, save_errno);
+						}
+						/* else: We do not hold crit so flushing this is not critical. */
+					} else if (0 == save_errno)
+						csr->aio_issued = TRUE;
 				}
 			}
+			if ((blk_hdr_ptr_t)reformat_buffer == bp)
+			{
+				DEBUG_ONLY(reformat_buffer_in_use--;)
+				assert((0 == reformat_buffer_in_use) || process_exiting);
+			}
 			/* Trigger I/O error if white box test case is turned on */
 			GTM_WHITE_BOX_TEST(WBTEST_WCS_WTSTART_IOERR, save_errno, ENOENT);
 			if (skip_in_trans || (0 != save_errno))
 			{
-				assert((ERR_ENOSPCQIODEFER != save_errno) || !csa->now_crit || skip_in_trans);
-				if (!is_mm)	/* before releasing update lock, clear epid as well in case of bg */
-					csr->epid = 0;
+				WCS_OPS_TRACE(csa, process_id, wcs_ops_wtstart7, cr->blk, GDS_ANY_ABS2REL(csa,cr), cr->dirty,	\
+					skip_in_trans, save_errno);
+				assert((ERR_ENOSPCQIODEFER != save_errno) || !was_crit || skip_in_trans);
+				csr->epid = 0; /* before releasing update lock, clear epid */
 				CLEAR_BUFF_UPDATE_LOCK(csr, &cnl->db_latch);
 				REINSERT_CR_AT_TAIL(csr, ahead, n, csa, csd, wcb_wtstart_lckfail4);
-				/* note: this will be automatically retried after csd->flush_time[0] msec, if this was called
-				 * through a timer-pop, otherwise, error should be handled (including ignored) by the caller.
-				 */
-				if (ENOSPC == save_errno)
-				{
-					if (dskspace_msg_counter != save_dskspace_msg_counter)
-					{	/* Report ENOSPC errors for first time and every minute after that. While this
-						 * approach reduces the number of times ENOSPC is issued by every process, it still
-						 * allows for flooding the syslog with ENOSPC messages if there are a lot of
-						 * concurrent processes encountering ENOSPC errors. We should consider using a
-						 * scheme like what is used limiting non-ENOSPC errors (see below) or MUTEXLCKALERT
-						 * (see mutex.c)
-						 * Also, may be DBFILERR should be replaced with DBIOERR for specificity.
-						 */
-						send_msg_csa(CSA_ARG(csa) VARLSTCNT(9) ERR_DBFILERR, 2, DB_LEN_STR(region),
-							 ERR_TEXT, 2, RTS_ERROR_TEXT("Error during flush write"), save_errno);
-						if (!IS_GTM_IMAGE)
-						{
-							gtm_putmsg_csa(CSA_ARG(csa) VARLSTCNT(9) ERR_DBFILERR, 2,
-									DB_LEN_STR(region), ERR_TEXT, 2,
-									RTS_ERROR_TEXT("Error during flush write"), save_errno);
-						}
-						save_dskspace_msg_counter = dskspace_msg_counter;
-						start_timer((TID)&dskspace_msg_timer, DSKSPACE_MSG_INTERVAL, dskspace_msg_timer, 0,
-								NULL);
-					}
-				} else if (!skip_in_trans && (ERR_ENOSPCQIODEFER != save_errno))
+				if (INTERLOCK_FAIL == n)
 				{
-					cnl->wtstart_errcnt++;
-					if (1 == (cnl->wtstart_errcnt % DBIOERR_LOGGING_PERIOD))
-					{	/* Every 100th failed attempt, issue an operator log indicating an I/O error.
-						 * wcs_wtstart is typically invoked during periodic flush timeout and since there
-						 * cannot be more than 2 pending flush timers per region, number of concurrent
-						 * processes issuing the below send_msg should be relatively small even if there
-						 * are 1000s of processes.
-						 */
-						send_msg_csa(CSA_ARG(csa) VARLSTCNT(7) ERR_DBIOERR, 4, REG_LEN_STR(region),
-								DB_LEN_STR(region), save_errno);
-					}
+					err_status = ERR_DBCCERR;
+					break;
 				}
-				/* If (ERR_ENOSPCQIODEFER == save_errno): DB_LSEEKWRITE above encountered ENOSPC but could not
-				 * trigger a freeze as it did not hold crit. It is okay to return as this is not a critical write.
-				 * Eventually, some crit holding process will trigger a freeze and wait for space to be freed up.
-				 * Analogously, if we detected that encryption settings have changed during a transaction, it is OK
-				 * to skip this write because this transaction will be retried after encryption settings update in
-				 * t_retry or tp_restart.
-				 */
 				err_status = save_errno;
+				if (!skip_in_trans)
+				{	/* We have an error from the write. Could be disk space or a real error. Handle it.
+					 * Note: This write will be automatically retried after csd->flush_time[0] msec, if this
+					 * was called through a timer-pop, otherwise, error (return value from this function)
+					 * should be handled (including ignored) by the caller.
+					 */
+					wcs_wterror(region, save_errno);
+				} else
+					assert(0 == save_errno);
 				break;
+			} else if (do_asyncio)
+			{
+				n = INSQTI((que_ent_ptr_t)csr, (que_head_ptr_t)whead);
+				if (INTERLOCK_FAIL == n)
+				{
+					assert(FALSE);
+					csr->epid = 0;
+					SET_TRACEABLE_VAR(cnl->wc_blocked, TRUE);
+					BG_TRACE_PRO_ANY(csa, wcb_wtstart_lckfail4);
+					err_status = ERR_DBCCERR;
+					break;
+				}
+				if (cr_list_ptr) /* we've been asked to return a list of crs where we issued i/o's */
+				{
+					assert(cr_list_ptr->numcrs < cr_list_ptr->listsize);
+					cr_list_ptr->listcrs[cr_list_ptr->numcrs++] = cr;
+				}
+				ADD_ENT_TO_WIP_QUE_CNT(cnl);
 			}
 			cnl->wtstart_errcnt = 0; /* Discard any previously noted I/O errors */
 			++n2;
@@ -549,22 +732,29 @@ int4	wcs_wtstart(gd_region *region, int4 writes)
 			/* Detect whether queue has become empty. Defer action (calling wcs_clean_dbsync)
 			 * to end of routine, since we still hold the lock on the cache-record
 			 */
-			queue_empty = !SUB_ENT_FROM_ACTIVE_QUE_CNT(&cnl->wcs_active_lvl, &cnl->wc_var_lock);
-			INCR_CNT(&cnl->wc_in_free, &cnl->wc_var_lock);
-			if (!is_mm)
+			queue_empty = !SUB_ENT_FROM_ACTIVE_QUE_CNT(cnl);
+			if (!do_asyncio)
 			{
 				csr->flushed_dirty_tn = csr->dirty;
 				csr->epid = 0;
+				ADD_ENT_TO_FREE_QUE_CNT(cnl);
+				csr->dirty = 0;
+				/* Even though asyncio is ON we may have done a synchronous I/O to get it done, e.g.,
+				 * we were holding crit and got an asyncio error. If that is the case, check for
+				 * a twin.
+				 */
+				if (csd->asyncio && csr->twin)
+					BREAK_TWIN(csr, csa);
+				CLEAR_BUFF_UPDATE_LOCK(csr, &cnl->db_latch);
+				/* Note we are still under protection of wbuf_dqd lock at this point. Reason we keep
+				 * it so long is so that all the counters are updated along with the queue being correct.
+				 * The result of not doing this previously is that wcs_recover was NOT called when we
+				 * got interrupted just prior to the counter adjustment leaving wcs_active_lvl out of
+				 * sync with the actual count on the queue which caused an assert failure in wcs_flu. SE 11/2000
+				 */
 			}
-			csr->dirty = 0;
-			CLEAR_BUFF_UPDATE_LOCK(csr, &cnl->db_latch);
-			/* Note we are still under protection of wbuf_dqd lock at this point. Reason we keep
-			 * it so long is so that all the counters are updated along with the queue being correct.
-			 * The result of not doing this previously is that wcs_recover was NOT called when we
-			 * got interrupted just prior to the counter adjustment leaving wcs_active_lvl out of
-			 * sync with the actual count on the queue which caused an assert failure in wcs_flu. SE 11/2000
-			 */
-		}
+		} else
+			WCS_OPS_TRACE(csa, process_id, wcs_ops_wtstart8, cr->blk, GDS_ANY_ABS2REL(csa,cr), cr->dirty, n, 0);
 	}
 	csa->wbuf_dqd--;
 writes_completed:
@@ -601,6 +791,6 @@ writes_completed:
 		GTMCRYPT_REPORT_ERROR(gtmcrypt_errno, rts_error, seg->fname_len, seg->fname);
 	}
 	if (INST_FREEZE_ON_ERROR_POLICY)
-		POP_GV_CUR_REGION(sav_cur_region, sav_cs_addrs, sav_cs_data)
+		POP_GV_CUR_REGION(sav_cur_region, sav_cs_addrs, sav_cs_data);
 	return err_status;
 }
diff --git a/sr_unix/wcs_wtstart_fini.c b/sr_unix/wcs_wtstart_fini.c
new file mode 100644
index 0000000..b7e5af8
--- /dev/null
+++ b/sr_unix/wcs_wtstart_fini.c
@@ -0,0 +1,207 @@
+/****************************************************************
+ *								*
+ * Copyright (c) 2016-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
+ *								*
+ *	This source code contains the intellectual property	*
+ *	of its copyright holder(s), and is made available	*
+ *	under a license.  If you do not know the terms of	*
+ *	the license, please stop and do not read further.	*
+ *								*
+ ****************************************************************/
+#include "mdef.h"
+
+#include <error.h>
+
+#include "gdsroot.h"
+#include "gdsbt.h"
+#include "gdsfhead.h"
+#include "wcs_sleep.h"
+#include "filestruct.h"
+#include "gtmio.h"
+#include "wcs_wt.h"
+#include "jnl.h"
+#include "sleep_cnt.h"
+
+#define SMALLNUMCRS	128 /* if a small number is requested use a local rather than the heap */
+
+/* This function waits for "nbuffs" dirty buffers to be moved to the free queue (from the active or wip
+ * queue) since function entry. If the active and wip queue become empty, it returns even if the "nbuffs"
+ * target is not reached. It uses "cnl->wcs_buffs_freed" to help with this determination. Note that
+ * "wcs_buffs_freed" can only be updated by "wcs_wtfini" (which holds crit) so we can expect to see a
+ * monotonically increasing value of this shared counter.
+ */
+
+int wcs_wtstart_fini(gd_region *reg, int nbuffs, cache_rec_ptr_t cr2flush)
+{
+	int			numwritesneeded, numwritesissued;
+	wtstart_cr_list_t	cr_list;
+	cache_que_head_ptr_t 	crq, crwipq;
+	cache_rec_ptr_t 	*listcrs, smalllistcrs[SMALLNUMCRS], *heaplistcrs;
+	boolean_t		was_crit, wtstartalreadycalled = FALSE, proc_check, tried_to_flush = FALSE;
+	gtm_uint64_t 		targetfreedlevel, basefreedlevel, prewtfinifreedlevel, lcl_buffs_freed;
+	int4			err_status = 0, num_sleeps = 0;
+	sgmnt_addrs             *csa;
+	node_local_ptr_t	cnl;
+	sgmnt_data_ptr_t	csd;
+	jnl_private_control     *jpc;
+	cache_rec_ptr_t		older_twin, cr2use;
+#ifdef DEBUG
+	gtm_uint64_t		dbg_wcs_buffs_freed, prev_dbg_wcs_buffs_freed = 0;
+#endif
+
+	csa = &FILE_INFO(reg)->s_addrs;
+	csd = csa->hdr;
+	cnl = csa->nl;
+	crwipq = &csa->acc_meth.bg.cache_state->cacheq_wip;
+	crq = &csa->acc_meth.bg.cache_state->cacheq_active;
+	heaplistcrs = NULL;
+	if (0 == nbuffs) /* if number not specified, use default (same as "wcs_wtstart") */
+		nbuffs = csd->n_wrt_per_flu;
+	basefreedlevel = cnl->wcs_buffs_freed;
+        /* If we are asked to flush a specific cr AND it is the younger twin, check if the older twin needs
+	 * to have its io initiated and reaped first.
+	 */
+	older_twin = (cache_rec_ptr_t) NULL;
+	assert((NULL == cr2flush) || csa->now_crit);
+	assert(csd->asyncio);
+	if (cr2flush && cr2flush->twin && cr2flush->bt_index)
+	{
+		older_twin = (cache_rec_ptr_t) GDS_ANY_REL2ABS(csa, cr2flush->twin);
+		if (older_twin->dirty)
+			nbuffs++; /* We need to flush the older sibling too. */
+	}
+	targetfreedlevel = basefreedlevel + nbuffs;
+	cr_list.listsize = nbuffs;
+	if (SMALLNUMCRS < nbuffs)
+	{
+		heaplistcrs = (cache_rec_ptr_t *)malloc(SIZEOF(cache_rec_ptr_t) * nbuffs);
+		cr_list.listcrs = heaplistcrs;
+	} else /* if small number of buffers use the local */
+		cr_list.listcrs = smalllistcrs;
+
+	while (((lcl_buffs_freed = cnl->wcs_buffs_freed) < targetfreedlevel)
+			&& (crq->fl || crwipq->fl))
+	{ /* while we have not reached our free target and there are still things to free */
+#		ifdef DEBUG
+		dbg_wcs_buffs_freed = cnl->wcs_buffs_freed;
+		assert(dbg_wcs_buffs_freed >= prev_dbg_wcs_buffs_freed);
+		prev_dbg_wcs_buffs_freed = dbg_wcs_buffs_freed;
+#		endif
+		numwritesissued = 0;
+		numwritesneeded = targetfreedlevel - lcl_buffs_freed;
+		assert(numwritesneeded <= nbuffs);
+		while (0 < numwritesneeded)
+		{ /* issue the requested number of writes unless you run out of dirty buffers that don't have outstanding writes  */
+#			ifdef DEBUG
+			dbg_wcs_buffs_freed = cnl->wcs_buffs_freed;
+			assert(dbg_wcs_buffs_freed >= prev_dbg_wcs_buffs_freed);
+			prev_dbg_wcs_buffs_freed = dbg_wcs_buffs_freed;
+#			endif
+			assert(numwritesneeded <= nbuffs);
+			/* wcs_wtstart() will initiate up to numwritesneeded writes (limited by the number of dirty buffers
+			 * available and buffers being blocked from having their writes initiated)
+			 */
+			/* If we are asked to flush a specific cr AND it is the younger twin, check if the older twin needs
+			 * to have its io initiated (via wcs_wtstart()) (possible if its write errored out and it transitioned
+			 * from the wip queue back to the active queue). If it does call wcs_wtstart with the older twin as it
+			 * must be flushed first before we can attempt to flush the newer twin.
+			 */
+			if (older_twin)
+		 	{
+				if (older_twin->dirty && !older_twin->epid)
+				{
+					wtstartalreadycalled = TRUE; /* this variable indicates if we ever called wcs_wtstart */
+					tried_to_flush = TRUE; /* this variable indicates if we called it in this iteration */
+					err_status = wcs_wtstart(reg, numwritesneeded, &cr_list, older_twin);
+				} else
+				{
+					tried_to_flush = FALSE; /* remember that we did not try to initiate any ios */
+					cr_list.numcrs = 0; /* since wcs_wtstart was not called indicate 0 ios were initiated. */
+					assert(!err_status); /* we should only get here if err_status is 0 */
+					err_status = 0; /* for PRO ensure it is set to 0 */
+				}
+
+			} else
+			{
+				wtstartalreadycalled = TRUE;
+				tried_to_flush = TRUE;
+				err_status = wcs_wtstart(reg, numwritesneeded, &cr_list, cr2flush);
+			}
+			if (err_status || cnl->wc_blocked) /* if we are blocked get out to allow cache recovery */
+				break;
+			if (0 != cr_list.numcrs)
+			{ /* If we were able to initiate some writes wait for their statuses to complete */
+				wcs_wtfini_nocrit(reg, &cr_list);
+				numwritesissued += cr_list.numcrs;
+				num_sleeps = 0; /* making progress so reset the clock */
+				if (numwritesissued >= numwritesneeded)
+					break; /* enough i/o statuses are back so lets reap them */
+			} else
+			 	/* not able to initiate any i/os:
+				 * maybe out of i/o slots, buffer(s) may be stuck (jnl write, twin, bt_put)
+				 * or we are out of dirty buffers to initiate writes on but there are crs
+				 * in the WIP queue or we have previously issued the io for an older twin
+				 * and now need to wait for the io to complete (or tried_to_flush=FALSE case).
+				 */
+				break;
+			/* we waited in wcs_wtfini_nocrit() above so check cnl->wcs_buffs_freed to see if any other processes
+			 *  helped increase the number of freed buffers.
+			 */
+			numwritesneeded = targetfreedlevel - cnl->wcs_buffs_freed;
+		}
+		/* if we got an error from wcs_wtstart() or wcs_wtfini() or we were asked to flush a specific buffer
+		 * and it is no longer dirty or cache needs to be verified we are done.
+		 */
+		if (err_status || (cr2flush && !cr2flush->dirty) || cnl->wc_blocked)
+			break;
+		/* have i/o statuses on i/os we issued so call wcs_wtfini() to reap them all at once;
+		 * other's i/os may also be reaped
+		 */
+		prewtfinifreedlevel = cnl->wcs_buffs_freed; /* get a base line to see if wtfini is making progress */
+		was_crit = csa->now_crit;
+		if (!was_crit)
+			grab_crit(reg);
+		/* Reap our i/os (and maybe some others).
+		 * If we tried to flush, were unable to, and there is something on the wip queue: a process with an outstanding
+		 * i/o may have died and is blocking our ability to initiate i/os; ask wcs_wtfini() to see if all of the processes
+		 * that have outstanding writes are alive.
+		 */
+		proc_check = tried_to_flush && (0 == cr_list.numcrs) && crwipq->fl
+			? CHECK_IS_PROC_ALIVE_TRUE : CHECK_IS_PROC_ALIVE_FALSE;
+		/* If we are waiting on the completion of the io of an older twin use its cr on the call to wcs_wtfini */
+		cr2use = (older_twin && older_twin->dirty & older_twin->epid) ? older_twin : cr2flush;
+		err_status = wcs_wtfini(reg, proc_check, cr2use);
+                if (older_twin && !older_twin->dirty)
+                        /* the older twin has been flushed so we are done with it. */
+                        older_twin = (cache_rec_ptr_t) NULL;
+		if (!was_crit)
+			rel_crit(reg);
+		if (prewtfinifreedlevel == cnl->wcs_buffs_freed)
+		{
+			wcs_sleep(1); /* wtfini did not make any progress so wait a while */
+			num_sleeps++;
+		} else
+			num_sleeps = 0; /* we are making progress so reset the clock */
+		if (MAX_WTSTART_FINI_SLEEPS < num_sleeps) /* waited long enough; initiate cache recovery */
+		{
+			SET_TRACEABLE_VAR(cnl->wc_blocked, TRUE);
+			break;
+		}
+		if (err_status)
+			break;
+	}
+	if (!wtstartalreadycalled)
+	{
+        	jpc = csa->jnl;
+        	assert(!JNL_ALLOWED(csd) || ( NULL != jpc));     /* if journaling is allowed, we better have non-null csa->jnl */
+		/* wcs_wtstart(), which would call jnl_qio_start(), has not been called. Call jnl_qio_start() in case there are
+		 * journal buffers that need to be flushed.
+		 */
+        	if (JNL_ENABLED(csd) && (NULL != jpc) && (NOJNL != jpc->channel))
+                	jnl_qio_start(jpc);
+	}
+	if (NULL != heaplistcrs)
+		free(heaplistcrs);
+	return err_status;
+}
diff --git a/sr_unix/ygblstat.mpt b/sr_unix/ygblstat.mpt
new file mode 100644
index 0000000..980a3f8
--- /dev/null
+++ b/sr_unix/ygblstat.mpt
@@ -0,0 +1,183 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;                                                               ;
+; Copyright (c) 2017 Fidelity National Information              ;
+; Services, Inc. and/or its subsidiaries. All rights reserved.  ;
+;                                                               ;
+;       This source code contains the intellectual property     ;
+;       of its copyright holder(s), and is made available       ;
+;       under a license.  If you do not know the terms of       ;
+;       the license, please stop and do not read further.       ;
+;                                                               ;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+%YGBLSTAT
+	; Gather and report statistics shared by GT.M processes
+	; Note: Application code is permitted to KILL %YGS (the entire
+	; tree), or to hide it with NEW. But application code must
+	; not modify nodes within it.
+	;
+	; As all strings contain only ASCII, code uses "Z" functions to
+	; ensure performance even in UTF-8 mode. As this is a utility
+	; program that is part of GT.M, it assumes it is compiled with
+	; short-circuit expression evaluation ($gtm_side_effects &
+	; $gtm_full_boolean set to 0 or not defined).
+
+help    ; Usage: mumps -run %YGBLSTAT [--help] [--pid pidlist] [--reg reglist] [--stat statlist]
+	; Program to report statistics shared by processes that have
+	; opted in to share global database access statistics. All
+	; command line flags are optional and can appear in any order
+	; except --help.
+	;  --help          - Display usage information and exit (rest of
+	;                    command line is ignored).
+	;  --pid pid       - pid whose statistics are to be reported.
+	;                    "*" or default is all pids.
+	;  --reg reglist   - region whose statistics are to be reported/
+	;                    "*" or default is all regions in $gtmgbldir.
+	;  --stat statlist - comma separated list of statistics
+	;                    (subset) of ZSHOW "G" to print. Default is "*"
+	;                    for all statistics. Statistics are always
+	;                    output in the same order as ZSHOW "G"
+	; If invoked with DO %YGBLSTAT, prompts for inputs. Other entryrefs are:
+	;   $$ORDERPID(pid,gld,reg)  - Returns the next pid as specified by gld and reg,
+	;                              first pid if pid="", gld defaults to current global
+	;                              directory, reg defaults to next pid in any region
+	;   $$SHOW(accum,stat)       - Returns the statistic(s) specified by stat (defaults
+	;                              to "*"for all statistics) in string / vector of
+	;                              accumulated statistics in accum.
+	;   $$STAT(pid,stat,gld,reg) - Returns the statistic(s) specified by stat (defaults
+	;                              to all statistics), for process pid (defaults to all
+	;                              processes), for region (defaults to all regions) in
+	;                              global directory gld (defaults to current global direcory).
+	; Note: this program uses external calls, which must be installed.
+
+	; Main Program
+	if $stack do PROMPTGO quit      ; if invoked from another program, prompt for inputs, do work, and exit
+	use $principal:(ctrap=$char(3):nocenable:exception="halt")	   ; terminate on Ctrl-C if invoked from shell
+	set $etrap="set $etrap=""use $principal write $zstatus,! zhalt 1"""
+	set $etrap=$etrap_" set tmp1=$piece($ecode,"","",2),tmp2=$text(@tmp1)"
+	set $etrap=$etrap_" if $length(tmp2) write $text(+0),@$piece(tmp2,"";"",2),! zhalt +$extract(tmp1,2,$length(tmp1))"
+	new cmdline,pid,reg
+	set cmdline=$zcmdline
+	set (pid,reg,stat)="*"                  ; Default is all processes, all regions, all statistics
+	set reg="*"
+	for  quit:'$$trimleadingstr^%XCMD(.cmdline,"--")  do ; process options
+	. if $$trimleadingstr^%XCMD(.cmdline,"help") do MSGANDHALT("help")
+	. else  if $$trimleadingstr^%XCMD(.cmdline,"pid") set pid=$$trimleadingdelimstr^%XCMD(.cmdline)
+	. else  if $$trimleadingstr^%XCMD(.cmdline,"reg") set reg=$$trimleadingdelimstr^%XCMD(.cmdline)
+	. else  if $$trimleadingstr^%XCMD(.cmdline,"stat") set stat=$$trimleadingdelimstr^%XCMD(.cmdline)
+	. else  set $ecode=",U249,"
+	write $$STAT(pid,stat,,reg),!
+	quit
+
+INITYGS ; Initialize statistics names and locations in %YGS
+	new i,stat,zsh
+	zshow "g":zsh
+	set %YGS("*")="",zsh=$zpiece(zsh("G",0),"*",3)  ; initialize & strip out global directory and region name
+	for i=2:1:$zlength(zsh,",") do
+	. set stat=$zpiece($zpiece(zsh,",",i),":",1)
+	. set %YGS(i-1)=stat,%YGS(stat)=(i-2)*8+1
+	. set %YGS("*")=%YGS("*")_stat_","
+	set %YGS(0)=i-1,%YGS=(i-1)*8
+	set $zpiece(%YGS(-1),$zchar(0),1+%YGS)="",%YGS(-2)=%YGS-1
+	set %YGS("*")=$zextract(%YGS("*"),1,$zlength(%YGS("*"))-1)
+	quit
+
+MSGANDHALT(label)
+	new j,tmp
+	for j=0:1 set tmp=$piece($text(@label+j),"; ",2) halt:""=tmp  write tmp,!
+
+ORDERPID(pid,gld,reg)
+	; Get the next pid as specified by gld and reg, first pid if pid=""
+	; Verify that the pid actually exists
+	new i,nextpid,nextreg,pidflag,tmp,$zgbldir
+	set pid=$get(pid),reg=$zconvert($get(reg),"U")
+	set:$data(gld) $zgbldir=gld
+	; return next pid in region if only one region specified, otherwise get lowest across regions
+	; if not running on simulated pids, verify that process exists
+	set pidflag=0
+	if $zlength(reg)&("*"'=reg) for  quit:pidflag  do
+	. set nextpid=$order(^%YGS(reg,pid))
+	. set:""=nextpid!$zlength($zsearch("/proc/"_$j))!$zlength($zsearch("/proc/"_$j)) pidflag=1
+	else  do
+	. set nextreg="",nextpid=999999999999999999     ; start nextpid at largest GT.M integer
+	. for  set nextreg=$order(^%YGS(nextreg)) quit:""=nextreg  do
+	. . set pidflag=0 for  quit:pidflag  do
+	. . . set tmp=$order(^%YGS(nextreg,pid))
+	. . . set:""=tmp!$zlength($zsearch("/proc/"_$j))!$zlength($zsearch("/proc/"_$j)) pidflag=1
+	. . set:$zlength(tmp)&(tmp<nextpid) nextpid=tmp
+	quit $select(999999999999999999=nextpid:"",1:nextpid)
+
+PROMPTGO
+	; prompt for inputs, execute
+	new gld,pid,reg,stat
+	if $zsearch("")         ; clear $zsearch() context
+	read "Process id / $JOB [default all processes]: ",pid,! set:0'<+pid pid="*"
+	read "Statistics [default all ZSHOW ""G"" statistics]: ",stat,! set:'$zlength(stat) stat="*"
+	write "Global directory [default ",$zgbldir,"]: " read gld,! set:'$zsearch(gld) gld=$zgbldir
+	read "Region list (comma separated) [default all regions]: ",reg,! set:'$zlength(reg) reg="*"
+	write $$STAT(pid,stat,gld,reg),!
+	quit
+
+SHOW(wkstat,stat)
+	; Generate output from accumulated statistics
+	new i,r,ret,tmp
+	do:'$data(%YGS) INITYGS
+	set stat=$get(stat)
+	if ""'=wkstat do ; ,(%YGS(-1)'=wkstat) do
+	. if %YGS<$zlength(wkstat) set wkstat=$zextract(wkstat,$zlength(wkstat)-%YGS(-2),$zlength(wkstat))
+	. else  set:%YGS>$zlength(wkstat) wkstat=$zextract(%YGS(-1),1,%YGS-$zlength(wkstat))_wkstat	; protect against user error
+	. if 1=$zlength(stat,","),""'=stat,"*"'=stat do                                 ; only one statistic
+	. . if $data(%YGS(stat)) set tmp=%YGS(stat),r=$&gblstat.toulong(.ret,$zextract(wkstat,tmp,tmp+7))
+	. . else  set ret=""
+	. else  do
+	. . set:'$zlength(stat)!("*"=stat) stat=%YGS("*")                               ; default is all statistics
+	. . set ret="",tmp=%YGS("*") for i=1:1:%YGS(0) do
+	. . . set nextstat=$zpiece(tmp,",",i)
+	. . . do:stat[nextstat
+	. . . . set offset=%YGS(nextstat)
+	. . . . set r=$&gblstat.toulong(.num,$zextract(wkstat,offset,offset+7))
+	. . . . set ret=ret_nextstat_":"_num_","
+	. . set ret=$zextract(ret,1,$zlength(ret)-1)
+	else  set ret=""
+	quit ret
+
+STAT(pid,stat,gld,reg)
+	; Report requested statistics
+	; If single pid specified, verify that it exists
+	new i,nextpid,nextreg,nextstat,num,offset,r,ret,wkstat,statszm1,tmp,$zgbldir
+	set:$data(gld) $zgbldir=gld
+	set pid=$get(pid),reg=$zconvert($get(reg),"U"),stat=$get(stat)
+	do:'$data(%YGS) INITYGS
+	set statszm1=%YGS(-2)     ; precalculate values to save recalculation
+	; Gather statistics - as a process may terminate after a $order() to get a pid
+	; and before its statistics are accessed, the access must be wrapped with $get()
+	; and the accessed data must tested for existence with $zlength().
+	; Also test for existence of process relies on existence of /proc/<pid> - $zsigproc()
+	; cannot be used because it requires the target process to have the same userid as the
+	; process executing the function. $zsearch() must be called twice to ensure that it works
+	; despite the context.
+	if $zlength(pid)&(pid=+pid) do	    		; one process
+	. if $zlength($zsearch("/proc/"_$j))!$zlength($zsearch("/proc/"_$j)) do	;process exists
+	. . if $zlength(reg)&("*"'=reg) do		; one process, one region
+	. . . set tmp=$get(^%YGS(reg,pid))
+	. . . set wkstat=$select($zlength(tmp):$zextract(tmp,$zlength(tmp)-statszm1,$zlength(tmp)),1:"")
+	. . else  do			      		; one process, multiple regions
+	. . . set nextreg="",wkstat=%YGS(-1) for  set nextreg=$order(^%YGS(nextreg)) quit:""=nextreg  do
+	. . . . set nextstat=$get(^%YGS(nextreg,pid)),tmp=$zlength(nextstat)
+	. . . . set:tmp r=$&gblstat.accumulate(.wkstat,$zextract(nextstat,tmp-statszm1,tmp))
+	. else  set wkstat=""				; process does not exist
+	else  set wkstat=%YGS(-1) if $zlength(reg)&("*"'=reg) do STATREG(reg)	; all processes one region
+	; all processes, all regions
+	else  set nextreg="" for  set nextreg=$order(^%YGS(nextreg)) quit:""=nextreg  do STATREG(nextreg)
+	quit $$SHOW(wkstat,stat)
+
+STATREG(reg)
+	; Accumulate statistics for all processes in a region
+	; Refer to comments above on need to use $get() wrapper & test $zlength()
+	new nextpid,tmp
+	set nextpid="" for  set nextpid=$order(^%YGS(reg,nextpid)) quit:""=nextpid  do
+	. set nextstat=$get(^%YGS(reg,nextpid)),tmp=$zlength(nextstat)
+	. set:tmp r=$&gblstat.accumulate(.wkstat,$zextract(nextstat,tmp-statszm1,tmp))
+	quit
+
+;	Error message texts - termination by Ctrl-C must be last message
+U249	;"-F-ILLEGALCMDLINE Illegal command line starting with --"_cmdline
diff --git a/sr_unix/zshow_devices.c b/sr_unix/zshow_devices.c
index 6bdd39b..27dc05e 100755
--- a/sr_unix/zshow_devices.c
+++ b/sr_unix/zshow_devices.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information 	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -52,6 +52,7 @@ static readonly char	space_text[] = {' '};
 GBLREF boolean_t	ctrlc_on, gtm_utf8_mode;
 GBLREF io_log_name	*io_root_log_name;
 GBLREF io_pair		*io_std_device;
+GBLREF int		process_exiting;
 
 LITREF mstr		chset_names[];
 LITREF nametabent	dev_param_names[];
@@ -145,23 +146,34 @@ void zshow_devices(zshow_out *output)
 		};
 	static readonly char morereadtime_text[] = "MOREREADTIME=";
 	char	*charptr;
+#	ifdef DEBUG
+	DCL_THREADGBL_ACCESS;
 
+	SETUP_THREADGBL_ACCESS;
+#	endif
 	v.mvtype = MV_STR;
 	savel = NULL;
-	for (l = io_root_log_name;  ((l != 0) || (NULL != savel));  l = l->next)
+	for (l = io_root_log_name;  ((l != NULL) || (NULL != savel));  l = l->next)
 	{
 		/* If savel is set then process the output side of $principal */
 		if (NULL != savel)
-		{
 			l = savel;
+		if ((NULL != l) && (NULL != l->iod) && (n_io_dev_types == l->iod->type))
+		{
+			assert(FALSE);
+			continue;       /* skip it on pro */
+		}
+		if (NULL == l->iod)
+		{
+			assert(process_exiting); /* GTM-F-MEMORY occurred during device setup & we are creating zshow dump file */
+			assert(TREF(jobexam_counter));
+			continue;
 		}
 		if (l->iod->trans_name == l)
 		{
-			/* if it is an rm type we don't want to output the device if it is the stderr
-			   device for a pipe device */
+			/* If it is an rm type we don't want to output the device if it is the stderr device for a pipe device */
 			if ((rm_ptr = (d_rm_struct*)l->iod->dev_sp) && rm == l->iod->type && rm_ptr->pipe && rm_ptr->stderr_parent)
 				continue;
-
 			if (l->iod->pair.in != l->iod->pair.out)
 			{
 				/* process the output side of $principal if savel is set */
@@ -171,12 +183,10 @@ void zshow_devices(zshow_out *output)
 					savel = NULL;
 					rm_ptr = (d_rm_struct*)tiod->dev_sp;
 					if ('&' == tiod->trans_name->dollar_io[0])
-					{
-						/* replace & with 0-out */
+					{	/* replace & with 0-out */
 						ZS_STR_OUT(&v, stdout_text);
 					} else
-					{
-						/* prepend with 0-out and a space */
+					{	/* prepend with 0-out and a space */
 						ZS_STR_OUT(&v, stdout_text);
 						ZS_ONE_OUT(&v, space_text);
 						v.str.addr = &tiod->trans_name->dollar_io[0];
@@ -184,9 +194,7 @@ void zshow_devices(zshow_out *output)
 						zshow_output(output,&v.str);
 					}
 				} else
-				{
-					/* plan to process the output side of $principal if it is std out*/
-
+				{	/* plan to process the output side of $principal if it is std out */
 					if (l->iod->pair.out == io_std_device->out)
 						savel = l;
 					tiod = l->iod;
diff --git a/sr_unix_cm/rc_fnd_file.c b/sr_unix_cm/rc_fnd_file.c
index cceedda..7a6c61b 100755
--- a/sr_unix_cm/rc_fnd_file.c
+++ b/sr_unix_cm/rc_fnd_file.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2013 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -138,9 +139,12 @@ short rc_fnd_file(rc_xdsid *xdsid)
 		/* No need to initialize g->clue.prev as it is never used */
 		g->clue.end = 0;
 		g->root = DIR_ROOT;
+		assertpro(FALSE);	/* Need to rework the below codepath if/when this is reached */
+#		ifdef DISABLED_CODE
 		addr = dsid_list->gda = (gd_addr *)malloc(SIZEOF(gd_addr) + DUMMY_GBLDIR_TOT_MAP_SIZE);
 		memset(addr, 0, SIZEOF(gd_addr) + DUMMY_GBLDIR_TOT_MAP_SIZE);
 		DUMMY_GLD_MAP_INIT(addr, RELATIVE_OFFSET_FALSE, gv_cur_region);
+#		endif
 		dsid_list->gda->max_rec_size = gv_cur_region->max_rec_size;
 		dsid_list->gda->tab_ptr = (hash_table_mname *)malloc(SIZEOF(hash_table_mname));
 		init_hashtab_mname(dsid_list->gda->tab_ptr, 0, HASHTAB_NO_COMPACT, HASHTAB_NO_SPARE_TABLE);
@@ -262,9 +266,12 @@ short rc_fnd_file(rc_xdsid *xdsid)
 		/* No need to initialize g->clue.prev as it is not currently used */
 		g->clue.end = 0;
 		g->root = DIR_ROOT;
+		assert(FALSE);	/* Need to rework the below codepath if/when this is reached */
+#		ifdef DISABLED_CODE
 		addr = fdi_ptr->gda = (gd_addr *)malloc(SIZEOF(gd_addr) + DUMMY_GBLDIR_TOT_MAP_SIZE);
 		memset(addr, 0, SIZEOF(gd_addr) + DUMMY_GBLDIR_TOT_MAP_SIZE);
 		DUMMY_GLD_MAP_INIT(addr, RELATIVE_OFFSET_FALSE, gv_cur_region);
+#		endif
 		fdi_ptr->gda->max_rec_size = gv_cur_region->max_rec_size;
 		fdi_ptr->gda->tab_ptr = (hash_table_mname *)malloc(SIZEOF(hash_table_mname));
 		init_hashtab_mname(fdi_ptr->gda->tab_ptr, 0, HASHTAB_NO_COMPACT, HASHTAB_NO_SPARE_TABLE);
diff --git a/sr_unix_gnp/cmi_open.c b/sr_unix_gnp/cmi_open.c
index 4ecfc99..6808242 100755
--- a/sr_unix_gnp/cmi_open.c
+++ b/sr_unix_gnp/cmi_open.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -120,7 +120,7 @@ cmi_status_t cmi_open(struct CLB *lnk)
 	SIGPROCMASK(SIG_BLOCK, &ntd_root->mutex_set, &oset, rc);
 	status = cmj_setupfd(new_fd);
 	if (CMI_ERROR(status))
-		CLOSEFILE_RESET(new_fd, rc)	/* resets "new_fd" to FD_INVALID */
+		CLOSEFILE_RESET(new_fd, rc);	/* resets "new_fd" to FD_INVALID */
 	else
 	{
 		status = cmj_set_async(new_fd);
diff --git a/sr_unix_gnp/gtcm_open_cmerrlog.c b/sr_unix_gnp/gtcm_open_cmerrlog.c
index 388bce1..b8dc11f 100755
--- a/sr_unix_gnp/gtcm_open_cmerrlog.c
+++ b/sr_unix_gnp/gtcm_open_cmerrlog.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2015 Fidelity National Information	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -65,6 +65,7 @@ void gtcm_open_cmerrlog(void)
 	if (rval == SS_NORMAL || rval == SS_NOLOGNAM)
 	{
 		lfn_path[lfn2.len] = 0;
+		new_len = ARRAYSIZE(new_lfn_path);
 		rename_file_if_exists(lfn_path, lfn2.len, new_lfn_path, &new_len, &ustatus);
 #ifdef __MVS__
 		if (-1 == gtm_zos_create_tagged_file(lfn_path, TAG_EBCDIC))
diff --git a/sr_unix_gnp/gtcmd_ini_reg.c b/sr_unix_gnp/gtcmd_ini_reg.c
index 4bccf7a..eac7ab9 100755
--- a/sr_unix_gnp/gtcmd_ini_reg.c
+++ b/sr_unix_gnp/gtcmd_ini_reg.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2009 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2017 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -42,16 +43,17 @@ GBLREF gd_region	*gv_cur_region;
 GBLREF sgmnt_addrs	*cs_addrs;
 GBLREF sgmnt_data_ptr_t	cs_data;
 
+error_def (ERR_DBOPNERR);
+
 cm_region_head *gtcmd_ini_reg(connection_struct *cnx)
 {
-	cm_region_head  *ptr,*last;
+	cm_region_head  *last, *ptr;
 	struct stat	stat_buf;
 	unsigned char	*fname, buff[256];
 	unsigned short	len;
 	uint4		status, retlen;
-	unsigned char	node[MAX_HOST_NAME_LEN];
+	unsigned char	ch, node[MAX_HOST_NAME_LEN], *tmp_ptr;
 	sgmnt_addrs	*csa;
-	error_def (ERR_DBOPNERR);
 
 	ptr = 0;
 	fname = cnx->clb_ptr->mbf;
@@ -62,7 +64,7 @@ cm_region_head *gtcmd_ini_reg(connection_struct *cnx)
 	memcpy(buff, fname, len);
 	STAT_FILE((char *)buff, &stat_buf, status);
 	if ((uint4)-1 == status)
-		rts_error(VARLSTCNT(5) ERR_DBOPNERR, 2, len, fname, errno);
+		rts_error_csa(CSA_ARG(NULL) VARLSTCNT(5) ERR_DBOPNERR, 2, len, fname, errno);
 	last = reglist;
 	for (ptr = reglist ; ptr ; ptr = ptr->next)
 	{
@@ -99,10 +101,21 @@ cm_region_head *gtcmd_ini_reg(connection_struct *cnx)
 		set_gdid_from_stat(&FILE_INFO(ptr->reg)->fileid, &stat_buf);
 		ptr->reg_hash = (hash_table_mname *)malloc(SIZEOF(hash_table_mname));
 		if (-1 != gethostname((char *)node, SIZEOF(node)))
-		{
-			retlen = USTRLEN((char *)node);
+		{	/* In case the nodename is in lower-case, convert it to upper-case. This is because
+			 * region-names that start with a lower-case have special meaning in GT.M. See IS_STATSDB_REGNAME.
+			 */
+		 	tmp_ptr = node;
+			do
+			{
+				ch = *tmp_ptr;
+				if ('\0' == ch)
+					break;
+				*tmp_ptr++ = TOUPPER(ch);
+			} while (TRUE);
+			retlen = tmp_ptr - node;
 			retlen = MIN(retlen, MAX_RN_LEN - 1);
 			memcpy(ptr->reg->rname, node, retlen);
+
 		} else
 			retlen = 0;
 		ptr->reg->rname[retlen] = ':';
diff --git a/sr_unix_nsb/m_do.c b/sr_unix_nsb/m_do.c
deleted file mode 100755
index ce333c2..0000000
--- a/sr_unix_nsb/m_do.c
+++ /dev/null
@@ -1,178 +0,0 @@
-/****************************************************************
- *								*
- * Copyright (c) 2001, 2015 Fidelity National Information	*
- * Services, Inc. and/or its subsidiaries. All rights reserved.	*
- *								*
- *	This source code contains the intellectual property	*
- *	of its copyright holder(s), and is made available	*
- *	under a license.  If you do not know the terms of	*
- *	the license, please stop and do not read further.	*
- *								*
- ****************************************************************/
-
-#include "mdef.h"
-#include "mdq.h"
-#include "compiler.h"
-#include "opcode.h"
-#include "indir_enum.h"
-#include "toktyp.h"
-#include "mmemory.h"
-#include "advancewindow.h"
-#include "cmd.h"
-
-GBLREF	boolean_t	run_time;
-
-error_def(ERR_ACTOFFSET);
-
-int m_do(void)
-{
-	int		opcd;
-	oprtype		*cr;
-	triple		*calltrip, *labelref, *obp, *oldchain, *ref0, *ref1, *routineref, tmpchain, *triptr;
-	DCL_THREADGBL_ACCESS;
-
-	SETUP_THREADGBL_ACCESS;
-	if ((TK_EOL == TREF(window_token)) || (TK_SPACE == TREF(window_token)))
-	{
-		if (!run_time)	/* DO SP SP is a noop at run time */
-		{
-			calltrip = newtriple(OC_CALLSP);
-			calltrip->operand[0] = put_mnxl();
-		}
-		return TRUE;
-	} else if (TK_AMPERSAND == TREF(window_token))
-	{
-		if (!extern_func(0))
-			return FALSE;
-		else
-			return TRUE;
-	}
-	dqinit(&tmpchain, exorder);
-	oldchain = setcurtchain(&tmpchain);
-	calltrip = entryref(OC_CALL, OC_EXTCALL, (mint)indir_do, TRUE, FALSE, FALSE);
-	setcurtchain(oldchain);
-	if (!calltrip)
-		return FALSE;
-	if (TK_LPAREN == TREF(window_token))
-	{
-		if (OC_CALL == calltrip->opcode)
-		{
-			assert(MLAB_REF == calltrip->operand[0].oprclass);
-			calltrip->opcode = OC_EXCAL;
-			ref0 = calltrip;
-		} else
-		{
-			if (OC_EXTCALL == calltrip->opcode)
-			{
-				assert(TRIP_REF == calltrip->operand[1].oprclass);
-				if (OC_CDLIT == calltrip->operand[1].oprval.tref->opcode)
-					assert(CDLT_REF == calltrip->operand[1].oprval.tref->operand[0].oprclass);
-				else
-				{
-					assert(OC_LABADDR == calltrip->operand[1].oprval.tref->opcode);
-					assert(TRIP_REF == calltrip->operand[1].oprval.tref->operand[1].oprclass);
-					assert(OC_PARAMETER == calltrip->operand[1].oprval.tref->operand[1].oprval.tref->opcode);
-					assert(TRIP_REF ==
-						calltrip->operand[1].oprval.tref->operand[1].oprval.tref->operand[0].oprclass);
-					DEBUG_ONLY(opcd = calltrip->operand[1].oprval.tref->operand[1].oprval.tref->
-						   operand[0].oprval.tref->opcode);
-					assert((OC_ILIT == opcd) || (OC_COMINT == opcd));
-					DEBUG_ONLY(opcd = calltrip->operand[1].oprval.tref->operand[1].oprval.tref->
-						   operand[0].oprval.tref->operand[0].oprclass);
-					assert((ILIT_REF == opcd) || (TRIP_REF == opcd));
-					/* The opcd references above added to allow an invalid syntax using indirect values for
-					 * offsets while specifying a parm list to get through the above asserts (invalid syntax
-					 * should not trip asserts) but it leads to the conclusion that the below test may not be
-					 * robust enough since it is looking at a literal integer value when there is none so have
-					 * added further checks mirroring the first checks done in the two most recent asserts to
-					 * make the check more robust. [Example bad code: Do @lbl+ at n^artn(arg)]
-					 */
-					if ((0 != calltrip->operand[1].oprval.tref->operand[1].oprval.tref->
-					     operand[0].oprval.tref->operand[0].oprval.ilit)
-					    || (OC_ILIT != calltrip->operand[1].oprval.tref->operand[1].oprval.tref->
-						operand[0].oprval.tref->opcode)
-					    || (ILIT_REF != calltrip->operand[1].oprval.tref->operand[1].oprval.tref->
-						operand[0].oprval.tref->operand[0].oprclass))
-					{
-						stx_error (ERR_ACTOFFSET);
-						return FALSE;
-					}
-				}
-			} else
-			{	/* DO _ @dlabel actuallist */
-				assert(OC_COMMARG == calltrip->opcode);
-				assert(TRIP_REF == calltrip->operand[1].oprclass);
-				assert(OC_ILIT == calltrip->operand[1].oprval.tref->opcode);
-				assert(ILIT_REF == calltrip->operand[1].oprval.tref->operand[0].oprclass);
-				assert((mint)indir_do == calltrip->operand[1].oprval.tref->operand[0].oprval.ilit);
-				assert(calltrip->exorder.fl == &tmpchain);
-				routineref = maketriple(OC_CURRHD);
-				labelref = maketriple(OC_LABADDR);
-				ref0 = maketriple(OC_PARAMETER);
-				dqins(calltrip->exorder.bl, exorder, routineref);
-				dqins(calltrip->exorder.bl, exorder, labelref);
-				dqins(calltrip->exorder.bl, exorder, ref0);
-				labelref->operand[0] = calltrip->operand[0];
-				labelref->operand[1] = put_tref (ref0);
-				ref0->operand[0] = calltrip->operand[1];
-				ref0->operand[0].oprval.tref->operand[0].oprval.ilit = 0;
-				ref0->operand[1] = put_tref (routineref);
-				calltrip->operand[0] = put_tref(routineref);
-				calltrip->operand[1] = put_tref(labelref);
-			}
-			calltrip->opcode = OC_EXTEXCAL;
-			ref0 = newtriple(OC_PARAMETER);
-			ref0->operand[0] = calltrip->operand[1];
-			calltrip->operand[1] = put_tref(ref0);
-		}
-		if (!actuallist(&ref0->operand[1]))
-			return FALSE;
-	} else if (OC_CALL == calltrip->opcode)
-	{
-		if (TREF(for_stack_ptr) != (oprtype **)TADR(for_stack))
-		{
-			if (TAREF1(for_temps, (TREF(for_stack_ptr) - (oprtype **)TADR(for_stack))))
-				calltrip->opcode = OC_FORLCLDO;
-		}
-	}
-	if (TK_COLON == TREF(window_token))
-	{
-		advancewindow();
-		cr = (oprtype *)mcalloc(SIZEOF(oprtype));
-		if (!bool_expr(FALSE, cr))
-			return FALSE;
-		if ((TREF(expr_start) != TREF(expr_start_orig)) && (OC_NOOP != (TREF(expr_start))->opcode))
-		{
-			triptr = newtriple(OC_GVRECTARG);
-			triptr->operand[0] = put_tref(TREF(expr_start));
-		}
-		obp = oldchain->exorder.bl;
-		dqadd(obp, &tmpchain, exorder);   /*this is a violation of info hiding*/
-		if (calltrip->opcode == OC_EXCAL)
-		{
-			triptr = newtriple(OC_JMP);
-			triptr->operand[0] = put_mfun(&calltrip->operand[0].oprval.lab->mvname);
-			calltrip->operand[0].oprclass = ILIT_REF;	/* dummy placeholder */
-		}
-		if ((TREF(expr_start) != TREF(expr_start_orig)) && (OC_NOOP != (TREF(expr_start))->opcode))
-		{
-			ref0 = newtriple(OC_JMP);
-			ref1 = newtriple(OC_GVRECTARG);
-			ref1->operand[0] = put_tref(TREF(expr_start));
-			*cr = put_tjmp(ref1);
-			tnxtarg(&ref0->operand[0]);
-		} else
-			tnxtarg(cr);
-	} else
-	{
-		obp = oldchain->exorder.bl;
-		dqadd(obp, &tmpchain, exorder);   /*this is a violation of info hiding*/
-		if (OC_EXCAL == calltrip->opcode)
-		{
-			triptr = newtriple(OC_JMP);
-			triptr->operand[0] = put_mfun(&calltrip->operand[0].oprval.lab->mvname);
-			calltrip->operand[0].oprclass = ILIT_REF;	/* dummy placeholder */
-		}
-	}
-	return TRUE;
-}
diff --git a/sr_unix_nsb/opcode_def.h b/sr_unix_nsb/opcode_def.h
index 4558040..446a815 100755
--- a/sr_unix_nsb/opcode_def.h
+++ b/sr_unix_nsb/opcode_def.h
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2001, 2014 Fidelity Information Services, Inc	*
+ * Copyright (c) 2001-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -15,20 +16,19 @@
 
 
 
-
 /* start at line 20 to make arithmetic (add 20) easy for those debugging compilation */
 OPCODE_DEF(OC_NOOP, (OCT_CGSKIP))
 OPCODE_DEF(OC_PARAMETER, (OCT_CGSKIP))
 OPCODE_DEF(OC_VAR, (OCT_MVADDR | OCT_MVAL | OCT_CGSKIP | OCT_EXPRLEAF))
 OPCODE_DEF(OC_LIT, (OCT_MVAL | OCT_CGSKIP | OCT_EXPRLEAF))
-OPCODE_DEF(OC_ADD, (OCT_MVAL))
-OPCODE_DEF(OC_SUB, (OCT_MVAL))
-OPCODE_DEF(OC_MUL, (OCT_MVAL))
-OPCODE_DEF(OC_DIV, (OCT_MVAL))
-OPCODE_DEF(OC_IDIV, (OCT_MVAL))
-OPCODE_DEF(OC_MOD, (OCT_MVAL))
-OPCODE_DEF(OC_NEG, (OCT_MVAL))
-OPCODE_DEF(OC_FORCENUM, (OCT_MVAL))
+OPCODE_DEF(OC_ADD, (OCT_MVAL | OCT_ARITH))
+OPCODE_DEF(OC_SUB, (OCT_MVAL | OCT_ARITH))
+OPCODE_DEF(OC_MUL, (OCT_MVAL | OCT_ARITH))
+OPCODE_DEF(OC_DIV, (OCT_MVAL | OCT_ARITH))
+OPCODE_DEF(OC_IDIV, (OCT_MVAL | OCT_ARITH))
+OPCODE_DEF(OC_MOD, (OCT_MVAL | OCT_ARITH))
+OPCODE_DEF(OC_NEG, (OCT_MVAL | OCT_UNARY))
+OPCODE_DEF(OC_FORCENUM, (OCT_MVAL | OCT_UNARY))
 OPCODE_DEF(OC_CAT, (OCT_MVAL))
 OPCODE_DEF(OC_SRCHINDX, (OCT_MVADDR | OCT_MVAL | OCT_EXPRLEAF))
 OPCODE_DEF(OC_GETINDX, (OCT_MVADDR | OCT_MVAL | OCT_EXPRLEAF))
@@ -82,23 +82,23 @@ OPCODE_DEF(OC_FNZSEA, (OCT_MVAL | OCT_EXPRLEAF))
 OPCODE_DEF(OC_FNZSETPRV, (OCT_MVAL | OCT_EXPRLEAF))
 OPCODE_DEF(OC_SVGET, (OCT_MVAL | OCT_EXPRLEAF))
 OPCODE_DEF(OC_SVPUT, (OCT_NULL))
-OPCODE_DEF(OC_LT, (OCT_BOOL))
-OPCODE_DEF(OC_NLT, (OCT_BOOL))
-OPCODE_DEF(OC_GT, (OCT_BOOL))
-OPCODE_DEF(OC_NGT, (OCT_BOOL))
-OPCODE_DEF(OC_EQU, (OCT_BOOL))
-OPCODE_DEF(OC_NEQU, (OCT_BOOL))
-OPCODE_DEF(OC_CONTAIN, (OCT_BOOL))
-OPCODE_DEF(OC_NCONTAIN, (OCT_BOOL))
-OPCODE_DEF(OC_FOLLOW, (OCT_BOOL))
-OPCODE_DEF(OC_NFOLLOW, (OCT_BOOL))
-OPCODE_DEF(OC_PATTERN, (OCT_BOOL))
-OPCODE_DEF(OC_NPATTERN, (OCT_BOOL))
+OPCODE_DEF(OC_LT, (OCT_BOOL | OCT_REL))
+OPCODE_DEF(OC_NLT, (OCT_BOOL | OCT_REL | OCT_NEGATED))
+OPCODE_DEF(OC_GT, (OCT_BOOL | OCT_REL))
+OPCODE_DEF(OC_NGT, (OCT_BOOL | OCT_REL | OCT_NEGATED))
+OPCODE_DEF(OC_EQU, (OCT_BOOL | OCT_REL))
+OPCODE_DEF(OC_NEQU, (OCT_BOOL | OCT_REL | OCT_NEGATED))
+OPCODE_DEF(OC_CONTAIN, (OCT_BOOL | OCT_REL))
+OPCODE_DEF(OC_NCONTAIN, (OCT_BOOL | OCT_REL | OCT_NEGATED))
+OPCODE_DEF(OC_FOLLOW, (OCT_BOOL | OCT_REL))
+OPCODE_DEF(OC_NFOLLOW, (OCT_BOOL | OCT_REL | OCT_NEGATED))
+OPCODE_DEF(OC_PATTERN, (OCT_BOOL | OCT_REL))
+OPCODE_DEF(OC_NPATTERN, (OCT_BOOL | OCT_REL | OCT_NEGATED))
 OPCODE_DEF(OC_AND, (OCT_BOOL))
-OPCODE_DEF(OC_NAND, (OCT_BOOL))
+OPCODE_DEF(OC_NAND, (OCT_BOOL | OCT_NEGATED))
 OPCODE_DEF(OC_OR, (OCT_BOOL))
-OPCODE_DEF(OC_NOR, (OCT_BOOL))
-OPCODE_DEF(OC_COM, (OCT_BOOL))
+OPCODE_DEF(OC_NOR, (OCT_BOOL | OCT_NEGATED))
+OPCODE_DEF(OC_COM, (OCT_BOOL | OCT_UNARY))
 OPCODE_DEF(OC_BREAK, (OCT_NULL))
 OPCODE_DEF(OC_CLOSE, (OCT_NULL))
 OPCODE_DEF(OC_HALT, (OCT_NULL))
@@ -161,13 +161,13 @@ OPCODE_DEF(OC_INDSET, (OCT_NULL))
 OPCODE_DEF(OC_GVEXTNAM, (OCT_NULL))
 OPCODE_DEF(OC_INDNAME, (OCT_MVAL | OCT_EXPRLEAF))
 OPCODE_DEF(OC_INDTEXT, (OCT_MVAL | OCT_EXPRLEAF))
-OPCODE_DEF(OC_COMVAL, (OCT_MVAL | OCT_COERCE))
+OPCODE_DEF(OC_COMVAL, (OCT_MVAL | OCT_COERCE | OCT_UNARY))
 OPCODE_DEF(OC_GVSAVTARG, (OCT_MVAL))
 OPCODE_DEF(OC_GVRECTARG, (OCT_NULL))
 OPCODE_DEF(OC_COMINT, (OCT_MINT | OCT_COERCE))
 OPCODE_DEF(OC_FNTRANSLATE, (OCT_MVAL | OCT_EXPRLEAF))
 OPCODE_DEF(OC_FNZTRANSLATE, (OCT_MVAL | OCT_EXPRLEAF))
-OPCODE_DEF(OC_COBOOL, (OCT_BOOL | OCT_COERCE))
+OPCODE_DEF(OC_COBOOL, (OCT_BOOL | OCT_COERCE | OCT_UNARY))
 OPCODE_DEF(OC_BOOLINIT, (OCT_MINT | OCT_EXPRLEAF))
 OPCODE_DEF(OC_BOOLFINI, (OCT_NULL))
 OPCODE_DEF(OC_SETTEST, (OCT_NULL))
@@ -254,7 +254,7 @@ OPCODE_DEF(OC_TSTART, (OCT_NULL))
 OPCODE_DEF(OC_TROLLBACK, (OCT_NULL))
 OPCODE_DEF(OC_TRESTART, (OCT_NULL))
 OPCODE_DEF(OC_TCOMMIT, (OCT_NULL))
-OPCODE_DEF(OC_EXP, (OCT_MVAL))
+OPCODE_DEF(OC_EXP, (OCT_MVAL | OCT_ARITH))
 OPCODE_DEF(OC_FNGET2, (OCT_MVAL | OCT_EXPRLEAF))
 OPCODE_DEF(OC_INDINCR, (OCT_MVAL | OCT_EXPRLEAF))
 OPCODE_DEF(OC_FNNAME, (OCT_MVAL | OCT_EXPRLEAF))
@@ -275,8 +275,8 @@ OPCODE_DEF(OC_FNZBITAND, (OCT_MVAL | OCT_EXPRLEAF))
 OPCODE_DEF(OC_FNZBITOR, (OCT_MVAL | OCT_EXPRLEAF))
 OPCODE_DEF(OC_FNZBITXOR, (OCT_MVAL | OCT_EXPRLEAF))
 OPCODE_DEF(OC_FGNLOOKUP, (OCT_CDADDR))
-OPCODE_DEF(OC_SORTS_AFTER, (OCT_BOOL))
-OPCODE_DEF(OC_NSORTS_AFTER, (OCT_BOOL))
+OPCODE_DEF(OC_SORTS_AFTER, (OCT_BOOL | OCT_REL))
+OPCODE_DEF(OC_NSORTS_AFTER, (OCT_BOOL | OCT_REL | OCT_NEGATED))
 OPCODE_DEF(OC_FNGVGET1, (OCT_MVAL | OCT_EXPRLEAF))
 OPCODE_DEF(OC_FNGET1, (OCT_MVAL | OCT_EXPRLEAF))
 OPCODE_DEF(OC_SETP1, (OCT_MVAL | OCT_EXPRLEAF))
@@ -343,3 +343,7 @@ OPCODE_DEF(OC_STOLITC, (OCT_NULL))
 OPCODE_DEF(OC_FNZPEEK, (OCT_MVAL | OCT_EXPRLEAF))
 OPCODE_DEF(OC_FNZSYSLOG, (OCT_MVAL | OCT_EXPRLEAF))
 OPCODE_DEF(OC_FNZSOCKET, (OCT_MVAL | OCT_EXPRLEAF))
+OPCODE_DEF(OC_FNZCOLLATE, (OCT_MVAL | OCT_EXPRLEAF))
+OPCODE_DEF(OC_FNZATRANSFORM, (OCT_MVAL | OCT_EXPRLEAF))
+OPCODE_DEF(OC_JMPTRUE, (OCT_JUMP))
+OPCODE_DEF(OC_JMPFALSE, (OCT_JUMP))
diff --git a/sr_unix_nsb/resolve_ref.c b/sr_unix_nsb/resolve_ref.c
deleted file mode 100755
index 0435ab0..0000000
--- a/sr_unix_nsb/resolve_ref.c
+++ /dev/null
@@ -1,202 +0,0 @@
-/****************************************************************
- *								*
- *	Copyright 2001, 2014 Fidelity Information Services, Inc	*
- *								*
- *	This source code contains the intellectual property	*
- *	of its copyright holder(s), and is made available	*
- *	under a license.  If you do not know the terms of	*
- *	the license, please stop and do not read further.	*
- *								*
- ****************************************************************/
-
-#include "mdef.h"
-
-#include "gtm_stdio.h"
-
-#include "compiler.h"
-#include "mdq.h"
-#include "opcode.h"
-#include "cmd_qlf.h"
-#include "mmemory.h"
-#include "resolve_lab.h"
-#include "cdbg_dump.h"
-#include "gtmdbglvl.h"
-
-GBLREF boolean_t		run_time;
-GBLREF triple			t_orig;
-GBLREF mlabel			*mlabtab;
-GBLREF command_qualifier	cmd_qlf;
-GBLREF uint4			gtmDebugLevel;
-
-error_def(ERR_ACTLSTTOOLONG);
-error_def(ERR_FMLLSTMISSING);
-error_def(ERR_LABELMISSING);
-error_def(ERR_LABELNOTFND);
-error_def(ERR_LABELUNKNOWN);
-
-int resolve_ref(int errknt)
-{
-	triple	*x,*y,*z;
-	tbp	*p;
-	mline	*mxl;
-	mlabel	*mlbx;
-	oprtype *n;
-	int4	in_error;
-	int	actcnt;
-	DCL_THREADGBL_ACCESS;
-
-	SETUP_THREADGBL_ACCESS;
-	if (errknt && !(cmd_qlf.qlf & CQ_IGNORE))
-	{
-		assert(!run_time);
-		walktree((mvar *)mlabtab, resolve_lab, (char *)&errknt);
-	} else
-	{
-		COMPDBG(PRINTF(" ************************************* Begin resolve_ref scan ******************************\n"););
-		dqloop(&t_orig, exorder, x)
-		{
-			COMPDBG(PRINTF(" ************************ Triple Start **********************\n"););
-			COMPDBG(cdbg_dump_triple(x, 0);)
-			for (n = x->operand; n < ARRAYTOP(x->operand); n++)
-			{
-				if (n->oprclass == INDR_REF)
-					*n = *(n->oprval.indr);
-				switch (n->oprclass)
-				{
-				case TNXT_REF:
-					n->oprclass = TJMP_REF;
-					n->oprval.tref = n->oprval.tref->exorder.fl;
-					/* caution:  fall through */
-				case TJMP_REF:
-					p = (tbp *) mcalloc(SIZEOF(tbp));
-					p->bpt = x;
-					dqins(&n->oprval.tref->jmplist, que, p);
-					continue;
-				case MNXL_REF:
-					mxl = n->oprval.mlin->child;
-					y = mxl ? mxl->externalentry : 0;
-					if (!y)
-					{	/* ignore vacuuous DO sp sp */
-						x->opcode = OC_NOOP;
-						break;
-					}
-					n->oprclass = TJMP_REF;
-					n->oprval.tref = y;
-					break;
-				case MLAB_REF:
-					assert(!run_time);
-					mlbx = n->oprval.lab;
-					y = mlbx->ml ? mlbx->ml->externalentry : 0;
-					if (y)
-					{
-						n->oprclass = TJMP_REF;
-						n->oprval.tref = y;
-					} else
-					{
-						errknt++;
-						stx_error(ERR_LABELMISSING, 2, mlbx->mvname.len, mlbx->mvname.addr);
-						TREF(source_error_found) = 0;
-						y = newtriple(OC_RTERROR);
-						y->operand[0] = put_ilit(OC_JMP == x->opcode
-							? ERR_LABELNOTFND : ERR_LABELUNKNOWN); /* special error for GOTO jmp */
-						y->operand[1] = put_ilit(TRUE);	/* This is a subroutine/func reference */
-						n->oprval.tref = y;
-						n->oprclass = TJMP_REF;
-					}
-					continue;
-				case MFUN_REF:
-					assert(!run_time);
-					assert(OC_JMP == x->opcode);
-					z = x->exorder.bl;
-					assert((OC_EXCAL == z->opcode) || (OC_EXFUN == z->opcode));
-					assert(TRIP_REF == z->operand[1].oprclass);
-					z = z->operand[1].oprval.tref;
-					assert(OC_PARAMETER == z->opcode);
-					assert(TRIP_REF == z->operand[0].oprclass);
-					assert(OC_ILIT == z->operand[0].oprval.tref->opcode);
-					assert(ILIT_REF == z->operand[0].oprval.tref->operand[0].oprclass);
-					z = z->operand[1].oprval.tref;
-					assert(OC_PARAMETER == z->opcode);
-					assert(TRIP_REF == z->operand[0].oprclass);
-					assert(OC_ILIT == z->operand[0].oprval.tref->opcode);
-					assert(ILIT_REF == z->operand[0].oprval.tref->operand[0].oprclass);
-					actcnt = z->operand[0].oprval.tref->operand[0].oprval.ilit;
-					assert(0 <= actcnt);
-					mlbx = n->oprval.lab;
-					y = mlbx->ml ? mlbx->ml->externalentry : 0;
-					if (y)
-					{
-						if (mlbx->formalcnt == NO_FORMALLIST)
-						{
-							errknt++;
-							stx_error(ERR_FMLLSTMISSING, 2, mlbx->mvname.len, mlbx->mvname.addr);
-							TREF(source_error_found) = 0;
-							y = newtriple(OC_RTERROR);
-							y->operand[0] = put_ilit(ERR_FMLLSTMISSING);
-							y->operand[1] = put_ilit(TRUE);	/* This is a subroutine/func reference */
-							n->oprval.tref = y;
-							n->oprclass = TJMP_REF;
-						} else if (mlbx->formalcnt < actcnt)
-						{
-							errknt++;
-							stx_error(ERR_ACTLSTTOOLONG, 2, mlbx->mvname.len, mlbx->mvname.addr);
-							TREF(source_error_found) = 0;
-							y = newtriple(OC_RTERROR);
-							y->operand[0] = put_ilit(ERR_ACTLSTTOOLONG);
-							y->operand[1] = put_ilit(TRUE);	/* This is a subroutine/func reference */
-							n->oprval.tref = y;
-							n->oprclass = TJMP_REF;
-						} else
-						{
-							n->oprclass = TJMP_REF;
-							n->oprval.tref = y;
-						}
-					} else
-					{
-						errknt++;
-						stx_error(ERR_LABELMISSING, 2, mlbx->mvname.len, mlbx->mvname.addr);
-						TREF(source_error_found) = 0;
-						y = newtriple(OC_RTERROR);
-						y->operand[0] = put_ilit(ERR_LABELUNKNOWN);
-						y->operand[1] = put_ilit(TRUE);	/* This is a subroutine/func reference */
-						n->oprval.tref = y;
-						n->oprclass = TJMP_REF;
-					}
-					continue;
-				case TRIP_REF:
-					resolve_tref(x, n);
-					continue;
-				}
-			}
-			n = &x->destination;
-			if (n->oprclass == TRIP_REF)
-				resolve_tref(x, n);
-		}
-	}
-	return errknt;
-}
-
-
-/* If for example there are nested $SELECT routines feeding a value to a SET $PIECE/$EXTRACT, this nested checking is
- * necessary to make sure no OC_PASSTHRUs remain in the parameter chain to get turned into OC_NOOPs that will
- * cause assertpro in emit_code.
- */
-void resolve_tref(triple *curtrip, oprtype *opnd)
-{
-	triple	*tripref;
-	tbp	*tripbp;
-
-	if (OC_PASSTHRU == (tripref = opnd->oprval.tref)->opcode)		/* note the assignment */
-	{
-		assert(tripref->operand[0].oprclass == TRIP_REF);
-		do
-			/* As many OC_PASSTHRUs as are stacked, we will devour */
-			*opnd = tripref->operand[0];
-		while (OC_PASSTHRU == (tripref = opnd->oprval.tref)->opcode);	/* note the assignment */
-	}
-	COMPDBG(PRINTF(" ** Passthru replacement: Operand at 0x%08lx replaced by operand at 0x%08lx\n",
-		       opnd, &tripref->operand[0]););
-	tripbp = (tbp *) mcalloc(SIZEOF(tbp));
-	tripbp->bpt = curtrip;
-	dqins(&opnd->oprval.tref->backptr, que, tripbp);
-}
diff --git a/sr_unix_nsb/ttt.txt b/sr_unix_nsb/ttt.txt
index 70b7c2c..c6b4fe2 100755
--- a/sr_unix_nsb/ttt.txt
+++ b/sr_unix_nsb/ttt.txt
@@ -486,7 +486,7 @@ OC_GVEXTNAM:	irepab	val.3
 OC_GVGET:	pushab	val.0
 		calls	#1,xfer.xf_gvget
 OC_GVINCR:	pushab	val.0		; /* result of $INCR */
-		pushab	val.2		; /* r->operand[1] = increment (global-variable to increment is gv_currkey so no operand[0]) BYPASSOK */
+		pushab	val.2		; /* r->operand[1] = increment (global-var to increment is gv_currkey so no operand[0]) */
 		calls	#2,xfer.xf_gvincr
 OC_GVKILL:	calls	#0,xfer.xf_gvkill
 OC_GVNAKED:	irepab	val.3
@@ -953,6 +953,12 @@ OC_INDMERGE:	pushab	val.1
 OC_M_SRCHINDX:	irepab	val.2
 		calls	val.1,xfer.xf_m_srchindx
 		movl	r0,addr.0
+OC_FNZATRANSFORM:    pushab  val.0
+                pushl   val.4
+                pushl   val.3
+                pushl   val.2
+                pushab  val.1
+                calls   #5,xfer.xf_fnzatransform
 OC_FNZCONVERT2: pushab  val.0                   ; /* destination mval */
                 pushab  val.2                   ; /* "U"/"L"/"T" */
                 pushab  val.1                   ; /* string */
@@ -962,6 +968,11 @@ OC_FNZCONVERT3: pushab  val.0                   ; /* Destination mval */
                 pushab  val.2                   ; /* src chset */
                 pushab  val.1                   ; /* string */
                 calls   #4,xfer.xf_fnzconvert3
+OC_FNZCOLLATE:  pushab  val.0
+                pushl   val.3
+                pushl   val.2
+                pushab  val.1
+                calls   #4,xfer.xf_fnzcollate
 OC_FNZSUBSTR:   pushab  val.0                   ; /* Destination mval */
                 pushl   val.3                   ; /* max byte length */
                 pushl   val.2                   ; /* starting character position */
diff --git a/sr_x86_64/GDEINITSZ.m b/sr_x86_64/GDEINITSZ.m
new file mode 100644
index 0000000..109130c
--- /dev/null
+++ b/sr_x86_64/GDEINITSZ.m
@@ -0,0 +1,24 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;
+; Generated by scantypedefs.m at 10:50:05 on 2017-03-30
+; Build done with GT.M version: GT.M V6.3-000A Linux x86_64
+;
+; Environment variables during run:
+;   $gtm_dist: /usr/library/V63000A/dbg
+;   $gtm_exe: /usr/library/V63001A/dbg
+;   $gtm_src: /usr/library/V63001A/src
+;   $gtm_inc: /usr/library/V63001A/inc
+;
+; Note this file should not be manually invoked
+;
+	Write "GTM-E-GTMSDFILE This routine (",$TEXT(+0),") should not be manually invoked",!
+	Quit
+;
+; Entry point used by gdeinit.m to define GTM structure fields
+;
+Init
+	; GT.M structure and field definitions
+	Set SIZEOF("gvstats")=472
+	Quit
diff --git a/sr_x86_64/GTMDefinedTypesInitDebug.m b/sr_x86_64/GTMDefinedTypesInitDebug.m
index f4d30d6..36ae27b 100644
--- a/sr_x86_64/GTMDefinedTypesInitDebug.m
+++ b/sr_x86_64/GTMDefinedTypesInitDebug.m
@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;								;
-; Copyright (c) 2010-2016 Fidelity National Information 	;
+; Copyright (c) 2010-2017 Fidelity National Information 	;
 ; Services, Inc. and/or its subsidiaries. All rights reserved.	;
 ;								;
 ;	This source code contains the intellectual property	;
@@ -11,14 +11,14 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ;
-; Generated by scantypedefs.m at 17:38:52 on 2016-05-09
-; Build done with GT.M version: GT.M V6.3-000 Linux x86_64
+; Generated by scantypedefs.m at 10:50:05 on 2017-03-30
+; Build done with GT.M version: GT.M V6.3-000A Linux x86_64
 ;
 ; Environment variables during run:
-;   $gtm_dist: /usr/library/V63000/dbg
-;   $gtm_exe: /usr/library/V63000A/dbg
-;   $gtm_src: /usr/library/V63000A/src
-;   $gtm_inc: /usr/library/V63000A/inc
+;   $gtm_dist: /usr/library/V63000A/dbg
+;   $gtm_exe: /usr/library/V63001A/dbg
+;   $gtm_src: /usr/library/V63001A/src
+;   $gtm_inc: /usr/library/V63001A/inc
 ;
 ; Note this file should not be manually invoked
 ;
@@ -28,10 +28,10 @@
 ; Entry point used by gtmpcat and others to define GTM structure fields
 ;
 Init
-	Set gtmsdver="1.1.0"
+	; GT.M structure and field definitions
+	Set gtmsdver="1.2.0"
 	Set gtmsdtyp="dbg"
 	;
-	; GT.M structure and field definitions
 	;
 	Set gtmtypes("ABS_TIME")="struct"
 	Set gtmtypes("ABS_TIME",0)=2
@@ -261,21 +261,21 @@ Init
 	Set gtmtypes("GT_TIMER",10,"len")=4
 	Set gtmtypes("GT_TIMER",10,"type")="int"
 	Set gtmtypfldindx("GT_TIMER","safe")=10
-	Set gtmtypes("GT_TIMER",11,"name")="GT_TIMER.hd_len_max"
+	Set gtmtypes("GT_TIMER",11,"name")="GT_TIMER.block_int"
 	Set gtmtypes("GT_TIMER",11,"off")=60
 	Set gtmtypes("GT_TIMER",11,"len")=4
 	Set gtmtypes("GT_TIMER",11,"type")="int"
-	Set gtmtypfldindx("GT_TIMER","hd_len_max")=11
-	Set gtmtypes("GT_TIMER",12,"name")="GT_TIMER.hd_len"
+	Set gtmtypfldindx("GT_TIMER","block_int")=11
+	Set gtmtypes("GT_TIMER",12,"name")="GT_TIMER.hd_len_max"
 	Set gtmtypes("GT_TIMER",12,"off")=64
 	Set gtmtypes("GT_TIMER",12,"len")=4
 	Set gtmtypes("GT_TIMER",12,"type")="int"
-	Set gtmtypfldindx("GT_TIMER","hd_len")=12
-	Set gtmtypes("GT_TIMER",13,"name")="GT_TIMER.padding"
+	Set gtmtypfldindx("GT_TIMER","hd_len_max")=12
+	Set gtmtypes("GT_TIMER",13,"name")="GT_TIMER.hd_len"
 	Set gtmtypes("GT_TIMER",13,"off")=68
 	Set gtmtypes("GT_TIMER",13,"len")=4
 	Set gtmtypes("GT_TIMER",13,"type")="int"
-	Set gtmtypfldindx("GT_TIMER","padding")=13
+	Set gtmtypfldindx("GT_TIMER","hd_len")=13
 	Set gtmtypes("GT_TIMER",14,"name")="GT_TIMER.hd_data"
 	Set gtmtypes("GT_TIMER",14,"off")=72
 	Set gtmtypes("GT_TIMER",14,"len")=1
@@ -828,8 +828,8 @@ Init
 	Set gtmtypfldindx("cache_que_head","latch.u.parts.latch_word")=8
 	;
 	Set gtmtypes("cache_que_heads")="struct"
-	Set gtmtypes("cache_que_heads",0)=49
-	Set gtmtypes("cache_que_heads","len")=200
+	Set gtmtypes("cache_que_heads",0)=52
+	Set gtmtypes("cache_que_heads","len")=264
 	Set gtmtypes("cache_que_heads",1,"name")="cache_que_heads.cacheq_wip"
 	Set gtmtypes("cache_que_heads",1,"off")=0
 	Set gtmtypes("cache_que_heads",1,"len")=24
@@ -922,7 +922,7 @@ Init
 	Set gtmtypfldindx("cache_que_heads","cacheq_active.latch.u.parts.latch_word")=18
 	Set gtmtypes("cache_que_heads",19,"name")="cache_que_heads.cache_array"
 	Set gtmtypes("cache_que_heads",19,"off")=48
-	Set gtmtypes("cache_que_heads",19,"len")=152
+	Set gtmtypes("cache_que_heads",19,"len")=216
 	Set gtmtypes("cache_que_heads",19,"type")="cache_rec"
 	Set gtmtypfldindx("cache_que_heads","cache_array")=19
 	Set gtmtypes("cache_que_heads",20,"name")="cache_que_heads.cache_array[0].blkque"
@@ -1020,65 +1020,80 @@ Init
 	Set gtmtypes("cache_que_heads",38,"len")=4
 	Set gtmtypes("cache_que_heads",38,"type")="unsigned-int"
 	Set gtmtypfldindx("cache_que_heads","cache_array[0].jnl_addr")=38
-	Set gtmtypes("cache_que_heads",39,"name")="cache_que_heads.cache_array[0].rip_latch"
-	Set gtmtypes("cache_que_heads",39,"off")=152
-	Set gtmtypes("cache_que_heads",39,"len")=8
-	Set gtmtypes("cache_que_heads",39,"type")="global_latch_t"
-	Set gtmtypfldindx("cache_que_heads","cache_array[0].rip_latch")=39
-	Set gtmtypes("cache_que_heads",40,"name")="cache_que_heads.cache_array[0].image_count"
-	Set gtmtypes("cache_que_heads",40,"off")=160
-	Set gtmtypes("cache_que_heads",40,"len")=4
-	Set gtmtypes("cache_que_heads",40,"type")="int"
-	Set gtmtypfldindx("cache_que_heads","cache_array[0].image_count")=40
-	Set gtmtypes("cache_que_heads",41,"name")="cache_que_heads.cache_array[0].epid"
-	Set gtmtypes("cache_que_heads",41,"off")=164
+	Set gtmtypes("cache_que_heads",39,"name")="cache_que_heads.cache_array[0].stopped"
+	Set gtmtypes("cache_que_heads",39,"off")=148
+	Set gtmtypes("cache_que_heads",39,"len")=4
+	Set gtmtypes("cache_que_heads",39,"type")="unsigned-int"
+	Set gtmtypfldindx("cache_que_heads","cache_array[0].stopped")=39
+	Set gtmtypes("cache_que_heads",40,"name")="cache_que_heads.cache_array[0].rip_latch"
+	Set gtmtypes("cache_que_heads",40,"off")=152
+	Set gtmtypes("cache_que_heads",40,"len")=8
+	Set gtmtypes("cache_que_heads",40,"type")="global_latch_t"
+	Set gtmtypfldindx("cache_que_heads","cache_array[0].rip_latch")=40
+	Set gtmtypes("cache_que_heads",41,"name")="cache_que_heads.cache_array[0].data_invalid"
+	Set gtmtypes("cache_que_heads",41,"off")=160
 	Set gtmtypes("cache_que_heads",41,"len")=4
-	Set gtmtypes("cache_que_heads",41,"type")="int"
-	Set gtmtypfldindx("cache_que_heads","cache_array[0].epid")=41
-	Set gtmtypes("cache_que_heads",42,"name")="cache_que_heads.cache_array[0].cycle"
-	Set gtmtypes("cache_que_heads",42,"off")=168
+	Set gtmtypes("cache_que_heads",41,"type")="unsigned-int"
+	Set gtmtypfldindx("cache_que_heads","cache_array[0].data_invalid")=41
+	Set gtmtypes("cache_que_heads",42,"name")="cache_que_heads.cache_array[0].epid"
+	Set gtmtypes("cache_que_heads",42,"off")=164
 	Set gtmtypes("cache_que_heads",42,"len")=4
 	Set gtmtypes("cache_que_heads",42,"type")="int"
-	Set gtmtypfldindx("cache_que_heads","cache_array[0].cycle")=42
-	Set gtmtypes("cache_que_heads",43,"name")="cache_que_heads.cache_array[0].r_epid"
-	Set gtmtypes("cache_que_heads",43,"off")=172
+	Set gtmtypfldindx("cache_que_heads","cache_array[0].epid")=42
+	Set gtmtypes("cache_que_heads",43,"name")="cache_que_heads.cache_array[0].cycle"
+	Set gtmtypes("cache_que_heads",43,"off")=168
 	Set gtmtypes("cache_que_heads",43,"len")=4
 	Set gtmtypes("cache_que_heads",43,"type")="int"
-	Set gtmtypfldindx("cache_que_heads","cache_array[0].r_epid")=43
-	Set gtmtypes("cache_que_heads",44,"name")="cache_que_heads.cache_array[0].read_in_progress"
-	Set gtmtypes("cache_que_heads",44,"off")=176
+	Set gtmtypfldindx("cache_que_heads","cache_array[0].cycle")=43
+	Set gtmtypes("cache_que_heads",44,"name")="cache_que_heads.cache_array[0].r_epid"
+	Set gtmtypes("cache_que_heads",44,"off")=172
 	Set gtmtypes("cache_que_heads",44,"len")=4
 	Set gtmtypes("cache_que_heads",44,"type")="int"
-	Set gtmtypfldindx("cache_que_heads","cache_array[0].read_in_progress")=44
-	Set gtmtypes("cache_que_heads",45,"name")="cache_que_heads.cache_array[0].in_tend"
-	Set gtmtypes("cache_que_heads",45,"off")=180
-	Set gtmtypes("cache_que_heads",45,"len")=4
-	Set gtmtypes("cache_que_heads",45,"type")="unsigned-int"
-	Set gtmtypfldindx("cache_que_heads","cache_array[0].in_tend")=45
-	Set gtmtypes("cache_que_heads",46,"name")="cache_que_heads.cache_array[0].in_cw_set"
-	Set gtmtypes("cache_que_heads",46,"off")=184
+	Set gtmtypfldindx("cache_que_heads","cache_array[0].r_epid")=44
+	Set gtmtypes("cache_que_heads",45,"name")="cache_que_heads.cache_array[0].aiocb"
+	Set gtmtypes("cache_que_heads",45,"off")=176
+	Set gtmtypes("cache_que_heads",45,"len")=72
+	Set gtmtypes("cache_que_heads",45,"type")="struct"
+	Set gtmtypfldindx("cache_que_heads","cache_array[0].aiocb")=45
+	Set gtmtypes("cache_que_heads",46,"name")="cache_que_heads.cache_array[0].read_in_progress"
+	Set gtmtypes("cache_que_heads",46,"off")=248
 	Set gtmtypes("cache_que_heads",46,"len")=4
-	Set gtmtypes("cache_que_heads",46,"type")="unsigned-int"
-	Set gtmtypfldindx("cache_que_heads","cache_array[0].in_cw_set")=46
-	Set gtmtypes("cache_que_heads",47,"name")="cache_que_heads.cache_array[0].data_invalid"
-	Set gtmtypes("cache_que_heads",47,"off")=188
+	Set gtmtypes("cache_que_heads",46,"type")="int"
+	Set gtmtypfldindx("cache_que_heads","cache_array[0].read_in_progress")=46
+	Set gtmtypes("cache_que_heads",47,"name")="cache_que_heads.cache_array[0].in_tend"
+	Set gtmtypes("cache_que_heads",47,"off")=252
 	Set gtmtypes("cache_que_heads",47,"len")=4
 	Set gtmtypes("cache_que_heads",47,"type")="unsigned-int"
-	Set gtmtypfldindx("cache_que_heads","cache_array[0].data_invalid")=47
-	Set gtmtypes("cache_que_heads",48,"name")="cache_que_heads.cache_array[0].stopped"
-	Set gtmtypes("cache_que_heads",48,"off")=192
+	Set gtmtypfldindx("cache_que_heads","cache_array[0].in_tend")=47
+	Set gtmtypes("cache_que_heads",48,"name")="cache_que_heads.cache_array[0].in_cw_set"
+	Set gtmtypes("cache_que_heads",48,"off")=256
 	Set gtmtypes("cache_que_heads",48,"len")=4
-	Set gtmtypes("cache_que_heads",48,"type")="boolean_t"
-	Set gtmtypfldindx("cache_que_heads","cache_array[0].stopped")=48
-	Set gtmtypes("cache_que_heads",49,"name")="cache_que_heads.cache_array[0].wip_stopped"
-	Set gtmtypes("cache_que_heads",49,"off")=196
-	Set gtmtypes("cache_que_heads",49,"len")=4
-	Set gtmtypes("cache_que_heads",49,"type")="boolean_t"
-	Set gtmtypfldindx("cache_que_heads","cache_array[0].wip_stopped")=49
+	Set gtmtypes("cache_que_heads",48,"type")="unsigned-int"
+	Set gtmtypfldindx("cache_que_heads","cache_array[0].in_cw_set")=48
+	Set gtmtypes("cache_que_heads",49,"name")="cache_que_heads.cache_array[0].wip_is_encr_buf"
+	Set gtmtypes("cache_que_heads",49,"off")=260
+	Set gtmtypes("cache_que_heads",49,"len")=1
+	Set gtmtypes("cache_que_heads",49,"type")="char"
+	Set gtmtypfldindx("cache_que_heads","cache_array[0].wip_is_encr_buf")=49
+	Set gtmtypes("cache_que_heads",50,"name")="cache_que_heads.cache_array[0].backup_cr_is_twin"
+	Set gtmtypes("cache_que_heads",50,"off")=261
+	Set gtmtypes("cache_que_heads",50,"len")=1
+	Set gtmtypes("cache_que_heads",50,"type")="char"
+	Set gtmtypfldindx("cache_que_heads","cache_array[0].backup_cr_is_twin")=50
+	Set gtmtypes("cache_que_heads",51,"name")="cache_que_heads.cache_array[0].aio_issued"
+	Set gtmtypes("cache_que_heads",51,"off")=262
+	Set gtmtypes("cache_que_heads",51,"len")=1
+	Set gtmtypes("cache_que_heads",51,"type")="char"
+	Set gtmtypfldindx("cache_que_heads","cache_array[0].aio_issued")=51
+	Set gtmtypes("cache_que_heads",52,"name")="cache_que_heads.cache_array[0].filler4bytealign"
+	Set gtmtypes("cache_que_heads",52,"off")=263
+	Set gtmtypes("cache_que_heads",52,"len")=1
+	Set gtmtypes("cache_que_heads",52,"type")="char"
+	Set gtmtypfldindx("cache_que_heads","cache_array[0].filler4bytealign")=52
 	;
 	Set gtmtypes("cache_rec")="struct"
-	Set gtmtypes("cache_rec",0)=35
-	Set gtmtypes("cache_rec","len")=152
+	Set gtmtypes("cache_rec",0)=38
+	Set gtmtypes("cache_rec","len")=216
 	Set gtmtypes("cache_rec",1,"name")="cache_rec.blkque"
 	Set gtmtypes("cache_rec",1,"off")=0
 	Set gtmtypes("cache_rec",1,"len")=16
@@ -1174,90 +1189,105 @@ Init
 	Set gtmtypes("cache_rec",19,"len")=4
 	Set gtmtypes("cache_rec",19,"type")="unsigned-int"
 	Set gtmtypfldindx("cache_rec","jnl_addr")=19
-	Set gtmtypes("cache_rec",20,"name")="cache_rec.rip_latch"
-	Set gtmtypes("cache_rec",20,"off")=104
-	Set gtmtypes("cache_rec",20,"len")=8
-	Set gtmtypes("cache_rec",20,"type")="global_latch_t"
-	Set gtmtypfldindx("cache_rec","rip_latch")=20
-	Set gtmtypes("cache_rec",21,"name")="cache_rec.rip_latch.u"
+	Set gtmtypes("cache_rec",20,"name")="cache_rec.stopped"
+	Set gtmtypes("cache_rec",20,"off")=100
+	Set gtmtypes("cache_rec",20,"len")=4
+	Set gtmtypes("cache_rec",20,"type")="unsigned-int"
+	Set gtmtypfldindx("cache_rec","stopped")=20
+	Set gtmtypes("cache_rec",21,"name")="cache_rec.rip_latch"
 	Set gtmtypes("cache_rec",21,"off")=104
 	Set gtmtypes("cache_rec",21,"len")=8
-	Set gtmtypes("cache_rec",21,"type")="union"
-	Set gtmtypfldindx("cache_rec","rip_latch.u")=21
-	Set gtmtypes("cache_rec",22,"name")="cache_rec.rip_latch.u.pid_imgcnt"
+	Set gtmtypes("cache_rec",21,"type")="global_latch_t"
+	Set gtmtypfldindx("cache_rec","rip_latch")=21
+	Set gtmtypes("cache_rec",22,"name")="cache_rec.rip_latch.u"
 	Set gtmtypes("cache_rec",22,"off")=104
 	Set gtmtypes("cache_rec",22,"len")=8
-	Set gtmtypes("cache_rec",22,"type")="uint64_t"
-	Set gtmtypfldindx("cache_rec","rip_latch.u.pid_imgcnt")=22
-	Set gtmtypes("cache_rec",23,"name")="cache_rec.rip_latch.u.parts"
+	Set gtmtypes("cache_rec",22,"type")="union"
+	Set gtmtypfldindx("cache_rec","rip_latch.u")=22
+	Set gtmtypes("cache_rec",23,"name")="cache_rec.rip_latch.u.pid_imgcnt"
 	Set gtmtypes("cache_rec",23,"off")=104
 	Set gtmtypes("cache_rec",23,"len")=8
-	Set gtmtypes("cache_rec",23,"type")="struct"
-	Set gtmtypfldindx("cache_rec","rip_latch.u.parts")=23
-	Set gtmtypes("cache_rec",24,"name")="cache_rec.rip_latch.u.parts.latch_pid"
+	Set gtmtypes("cache_rec",23,"type")="uint64_t"
+	Set gtmtypfldindx("cache_rec","rip_latch.u.pid_imgcnt")=23
+	Set gtmtypes("cache_rec",24,"name")="cache_rec.rip_latch.u.parts"
 	Set gtmtypes("cache_rec",24,"off")=104
-	Set gtmtypes("cache_rec",24,"len")=4
-	Set gtmtypes("cache_rec",24,"type")="int"
-	Set gtmtypfldindx("cache_rec","rip_latch.u.parts.latch_pid")=24
-	Set gtmtypes("cache_rec",25,"name")="cache_rec.rip_latch.u.parts.latch_word"
-	Set gtmtypes("cache_rec",25,"off")=108
+	Set gtmtypes("cache_rec",24,"len")=8
+	Set gtmtypes("cache_rec",24,"type")="struct"
+	Set gtmtypfldindx("cache_rec","rip_latch.u.parts")=24
+	Set gtmtypes("cache_rec",25,"name")="cache_rec.rip_latch.u.parts.latch_pid"
+	Set gtmtypes("cache_rec",25,"off")=104
 	Set gtmtypes("cache_rec",25,"len")=4
 	Set gtmtypes("cache_rec",25,"type")="int"
-	Set gtmtypfldindx("cache_rec","rip_latch.u.parts.latch_word")=25
-	Set gtmtypes("cache_rec",26,"name")="cache_rec.image_count"
-	Set gtmtypes("cache_rec",26,"off")=112
+	Set gtmtypfldindx("cache_rec","rip_latch.u.parts.latch_pid")=25
+	Set gtmtypes("cache_rec",26,"name")="cache_rec.rip_latch.u.parts.latch_word"
+	Set gtmtypes("cache_rec",26,"off")=108
 	Set gtmtypes("cache_rec",26,"len")=4
 	Set gtmtypes("cache_rec",26,"type")="int"
-	Set gtmtypfldindx("cache_rec","image_count")=26
-	Set gtmtypes("cache_rec",27,"name")="cache_rec.epid"
-	Set gtmtypes("cache_rec",27,"off")=116
+	Set gtmtypfldindx("cache_rec","rip_latch.u.parts.latch_word")=26
+	Set gtmtypes("cache_rec",27,"name")="cache_rec.data_invalid"
+	Set gtmtypes("cache_rec",27,"off")=112
 	Set gtmtypes("cache_rec",27,"len")=4
-	Set gtmtypes("cache_rec",27,"type")="int"
-	Set gtmtypfldindx("cache_rec","epid")=27
-	Set gtmtypes("cache_rec",28,"name")="cache_rec.cycle"
-	Set gtmtypes("cache_rec",28,"off")=120
+	Set gtmtypes("cache_rec",27,"type")="unsigned-int"
+	Set gtmtypfldindx("cache_rec","data_invalid")=27
+	Set gtmtypes("cache_rec",28,"name")="cache_rec.epid"
+	Set gtmtypes("cache_rec",28,"off")=116
 	Set gtmtypes("cache_rec",28,"len")=4
 	Set gtmtypes("cache_rec",28,"type")="int"
-	Set gtmtypfldindx("cache_rec","cycle")=28
-	Set gtmtypes("cache_rec",29,"name")="cache_rec.r_epid"
-	Set gtmtypes("cache_rec",29,"off")=124
+	Set gtmtypfldindx("cache_rec","epid")=28
+	Set gtmtypes("cache_rec",29,"name")="cache_rec.cycle"
+	Set gtmtypes("cache_rec",29,"off")=120
 	Set gtmtypes("cache_rec",29,"len")=4
 	Set gtmtypes("cache_rec",29,"type")="int"
-	Set gtmtypfldindx("cache_rec","r_epid")=29
-	Set gtmtypes("cache_rec",30,"name")="cache_rec.read_in_progress"
-	Set gtmtypes("cache_rec",30,"off")=128
+	Set gtmtypfldindx("cache_rec","cycle")=29
+	Set gtmtypes("cache_rec",30,"name")="cache_rec.r_epid"
+	Set gtmtypes("cache_rec",30,"off")=124
 	Set gtmtypes("cache_rec",30,"len")=4
 	Set gtmtypes("cache_rec",30,"type")="int"
-	Set gtmtypfldindx("cache_rec","read_in_progress")=30
-	Set gtmtypes("cache_rec",31,"name")="cache_rec.in_tend"
-	Set gtmtypes("cache_rec",31,"off")=132
-	Set gtmtypes("cache_rec",31,"len")=4
-	Set gtmtypes("cache_rec",31,"type")="unsigned-int"
-	Set gtmtypfldindx("cache_rec","in_tend")=31
-	Set gtmtypes("cache_rec",32,"name")="cache_rec.in_cw_set"
-	Set gtmtypes("cache_rec",32,"off")=136
+	Set gtmtypfldindx("cache_rec","r_epid")=30
+	Set gtmtypes("cache_rec",31,"name")="cache_rec.aiocb"
+	Set gtmtypes("cache_rec",31,"off")=128
+	Set gtmtypes("cache_rec",31,"len")=72
+	Set gtmtypes("cache_rec",31,"type")="struct"
+	Set gtmtypfldindx("cache_rec","aiocb")=31
+	Set gtmtypes("cache_rec",32,"name")="cache_rec.read_in_progress"
+	Set gtmtypes("cache_rec",32,"off")=200
 	Set gtmtypes("cache_rec",32,"len")=4
-	Set gtmtypes("cache_rec",32,"type")="unsigned-int"
-	Set gtmtypfldindx("cache_rec","in_cw_set")=32
-	Set gtmtypes("cache_rec",33,"name")="cache_rec.data_invalid"
-	Set gtmtypes("cache_rec",33,"off")=140
+	Set gtmtypes("cache_rec",32,"type")="int"
+	Set gtmtypfldindx("cache_rec","read_in_progress")=32
+	Set gtmtypes("cache_rec",33,"name")="cache_rec.in_tend"
+	Set gtmtypes("cache_rec",33,"off")=204
 	Set gtmtypes("cache_rec",33,"len")=4
 	Set gtmtypes("cache_rec",33,"type")="unsigned-int"
-	Set gtmtypfldindx("cache_rec","data_invalid")=33
-	Set gtmtypes("cache_rec",34,"name")="cache_rec.stopped"
-	Set gtmtypes("cache_rec",34,"off")=144
+	Set gtmtypfldindx("cache_rec","in_tend")=33
+	Set gtmtypes("cache_rec",34,"name")="cache_rec.in_cw_set"
+	Set gtmtypes("cache_rec",34,"off")=208
 	Set gtmtypes("cache_rec",34,"len")=4
-	Set gtmtypes("cache_rec",34,"type")="boolean_t"
-	Set gtmtypfldindx("cache_rec","stopped")=34
-	Set gtmtypes("cache_rec",35,"name")="cache_rec.wip_stopped"
-	Set gtmtypes("cache_rec",35,"off")=148
-	Set gtmtypes("cache_rec",35,"len")=4
-	Set gtmtypes("cache_rec",35,"type")="boolean_t"
-	Set gtmtypfldindx("cache_rec","wip_stopped")=35
+	Set gtmtypes("cache_rec",34,"type")="unsigned-int"
+	Set gtmtypfldindx("cache_rec","in_cw_set")=34
+	Set gtmtypes("cache_rec",35,"name")="cache_rec.wip_is_encr_buf"
+	Set gtmtypes("cache_rec",35,"off")=212
+	Set gtmtypes("cache_rec",35,"len")=1
+	Set gtmtypes("cache_rec",35,"type")="char"
+	Set gtmtypfldindx("cache_rec","wip_is_encr_buf")=35
+	Set gtmtypes("cache_rec",36,"name")="cache_rec.backup_cr_is_twin"
+	Set gtmtypes("cache_rec",36,"off")=213
+	Set gtmtypes("cache_rec",36,"len")=1
+	Set gtmtypes("cache_rec",36,"type")="char"
+	Set gtmtypfldindx("cache_rec","backup_cr_is_twin")=36
+	Set gtmtypes("cache_rec",37,"name")="cache_rec.aio_issued"
+	Set gtmtypes("cache_rec",37,"off")=214
+	Set gtmtypes("cache_rec",37,"len")=1
+	Set gtmtypes("cache_rec",37,"type")="char"
+	Set gtmtypfldindx("cache_rec","aio_issued")=37
+	Set gtmtypes("cache_rec",38,"name")="cache_rec.filler4bytealign"
+	Set gtmtypes("cache_rec",38,"off")=215
+	Set gtmtypes("cache_rec",38,"len")=1
+	Set gtmtypes("cache_rec",38,"type")="char"
+	Set gtmtypfldindx("cache_rec","filler4bytealign")=38
 	;
 	Set gtmtypes("cache_state_rec")="struct"
-	Set gtmtypes("cache_state_rec",0)=32
-	Set gtmtypes("cache_state_rec","len")=136
+	Set gtmtypes("cache_state_rec",0)=35
+	Set gtmtypes("cache_state_rec","len")=200
 	Set gtmtypes("cache_state_rec",1,"name")="cache_state_rec.state_que"
 	Set gtmtypes("cache_state_rec",1,"off")=0
 	Set gtmtypes("cache_state_rec",1,"len")=16
@@ -1338,86 +1368,101 @@ Init
 	Set gtmtypes("cache_state_rec",16,"len")=4
 	Set gtmtypes("cache_state_rec",16,"type")="unsigned-int"
 	Set gtmtypfldindx("cache_state_rec","jnl_addr")=16
-	Set gtmtypes("cache_state_rec",17,"name")="cache_state_rec.rip_latch"
-	Set gtmtypes("cache_state_rec",17,"off")=88
-	Set gtmtypes("cache_state_rec",17,"len")=8
-	Set gtmtypes("cache_state_rec",17,"type")="global_latch_t"
-	Set gtmtypfldindx("cache_state_rec","rip_latch")=17
-	Set gtmtypes("cache_state_rec",18,"name")="cache_state_rec.rip_latch.u"
+	Set gtmtypes("cache_state_rec",17,"name")="cache_state_rec.stopped"
+	Set gtmtypes("cache_state_rec",17,"off")=84
+	Set gtmtypes("cache_state_rec",17,"len")=4
+	Set gtmtypes("cache_state_rec",17,"type")="boolean_t"
+	Set gtmtypfldindx("cache_state_rec","stopped")=17
+	Set gtmtypes("cache_state_rec",18,"name")="cache_state_rec.rip_latch"
 	Set gtmtypes("cache_state_rec",18,"off")=88
 	Set gtmtypes("cache_state_rec",18,"len")=8
-	Set gtmtypes("cache_state_rec",18,"type")="union"
-	Set gtmtypfldindx("cache_state_rec","rip_latch.u")=18
-	Set gtmtypes("cache_state_rec",19,"name")="cache_state_rec.rip_latch.u.pid_imgcnt"
+	Set gtmtypes("cache_state_rec",18,"type")="global_latch_t"
+	Set gtmtypfldindx("cache_state_rec","rip_latch")=18
+	Set gtmtypes("cache_state_rec",19,"name")="cache_state_rec.rip_latch.u"
 	Set gtmtypes("cache_state_rec",19,"off")=88
 	Set gtmtypes("cache_state_rec",19,"len")=8
-	Set gtmtypes("cache_state_rec",19,"type")="uint64_t"
-	Set gtmtypfldindx("cache_state_rec","rip_latch.u.pid_imgcnt")=19
-	Set gtmtypes("cache_state_rec",20,"name")="cache_state_rec.rip_latch.u.parts"
+	Set gtmtypes("cache_state_rec",19,"type")="union"
+	Set gtmtypfldindx("cache_state_rec","rip_latch.u")=19
+	Set gtmtypes("cache_state_rec",20,"name")="cache_state_rec.rip_latch.u.pid_imgcnt"
 	Set gtmtypes("cache_state_rec",20,"off")=88
 	Set gtmtypes("cache_state_rec",20,"len")=8
-	Set gtmtypes("cache_state_rec",20,"type")="struct"
-	Set gtmtypfldindx("cache_state_rec","rip_latch.u.parts")=20
-	Set gtmtypes("cache_state_rec",21,"name")="cache_state_rec.rip_latch.u.parts.latch_pid"
+	Set gtmtypes("cache_state_rec",20,"type")="uint64_t"
+	Set gtmtypfldindx("cache_state_rec","rip_latch.u.pid_imgcnt")=20
+	Set gtmtypes("cache_state_rec",21,"name")="cache_state_rec.rip_latch.u.parts"
 	Set gtmtypes("cache_state_rec",21,"off")=88
-	Set gtmtypes("cache_state_rec",21,"len")=4
-	Set gtmtypes("cache_state_rec",21,"type")="int"
-	Set gtmtypfldindx("cache_state_rec","rip_latch.u.parts.latch_pid")=21
-	Set gtmtypes("cache_state_rec",22,"name")="cache_state_rec.rip_latch.u.parts.latch_word"
-	Set gtmtypes("cache_state_rec",22,"off")=92
+	Set gtmtypes("cache_state_rec",21,"len")=8
+	Set gtmtypes("cache_state_rec",21,"type")="struct"
+	Set gtmtypfldindx("cache_state_rec","rip_latch.u.parts")=21
+	Set gtmtypes("cache_state_rec",22,"name")="cache_state_rec.rip_latch.u.parts.latch_pid"
+	Set gtmtypes("cache_state_rec",22,"off")=88
 	Set gtmtypes("cache_state_rec",22,"len")=4
 	Set gtmtypes("cache_state_rec",22,"type")="int"
-	Set gtmtypfldindx("cache_state_rec","rip_latch.u.parts.latch_word")=22
-	Set gtmtypes("cache_state_rec",23,"name")="cache_state_rec.image_count"
-	Set gtmtypes("cache_state_rec",23,"off")=96
+	Set gtmtypfldindx("cache_state_rec","rip_latch.u.parts.latch_pid")=22
+	Set gtmtypes("cache_state_rec",23,"name")="cache_state_rec.rip_latch.u.parts.latch_word"
+	Set gtmtypes("cache_state_rec",23,"off")=92
 	Set gtmtypes("cache_state_rec",23,"len")=4
 	Set gtmtypes("cache_state_rec",23,"type")="int"
-	Set gtmtypfldindx("cache_state_rec","image_count")=23
-	Set gtmtypes("cache_state_rec",24,"name")="cache_state_rec.epid"
-	Set gtmtypes("cache_state_rec",24,"off")=100
+	Set gtmtypfldindx("cache_state_rec","rip_latch.u.parts.latch_word")=23
+	Set gtmtypes("cache_state_rec",24,"name")="cache_state_rec.data_invalid"
+	Set gtmtypes("cache_state_rec",24,"off")=96
 	Set gtmtypes("cache_state_rec",24,"len")=4
-	Set gtmtypes("cache_state_rec",24,"type")="int"
-	Set gtmtypfldindx("cache_state_rec","epid")=24
-	Set gtmtypes("cache_state_rec",25,"name")="cache_state_rec.cycle"
-	Set gtmtypes("cache_state_rec",25,"off")=104
+	Set gtmtypes("cache_state_rec",24,"type")="unsigned-int"
+	Set gtmtypfldindx("cache_state_rec","data_invalid")=24
+	Set gtmtypes("cache_state_rec",25,"name")="cache_state_rec.epid"
+	Set gtmtypes("cache_state_rec",25,"off")=100
 	Set gtmtypes("cache_state_rec",25,"len")=4
 	Set gtmtypes("cache_state_rec",25,"type")="int"
-	Set gtmtypfldindx("cache_state_rec","cycle")=25
-	Set gtmtypes("cache_state_rec",26,"name")="cache_state_rec.r_epid"
-	Set gtmtypes("cache_state_rec",26,"off")=108
+	Set gtmtypfldindx("cache_state_rec","epid")=25
+	Set gtmtypes("cache_state_rec",26,"name")="cache_state_rec.cycle"
+	Set gtmtypes("cache_state_rec",26,"off")=104
 	Set gtmtypes("cache_state_rec",26,"len")=4
 	Set gtmtypes("cache_state_rec",26,"type")="int"
-	Set gtmtypfldindx("cache_state_rec","r_epid")=26
-	Set gtmtypes("cache_state_rec",27,"name")="cache_state_rec.read_in_progress"
-	Set gtmtypes("cache_state_rec",27,"off")=112
+	Set gtmtypfldindx("cache_state_rec","cycle")=26
+	Set gtmtypes("cache_state_rec",27,"name")="cache_state_rec.r_epid"
+	Set gtmtypes("cache_state_rec",27,"off")=108
 	Set gtmtypes("cache_state_rec",27,"len")=4
 	Set gtmtypes("cache_state_rec",27,"type")="int"
-	Set gtmtypfldindx("cache_state_rec","read_in_progress")=27
-	Set gtmtypes("cache_state_rec",28,"name")="cache_state_rec.in_tend"
-	Set gtmtypes("cache_state_rec",28,"off")=116
-	Set gtmtypes("cache_state_rec",28,"len")=4
-	Set gtmtypes("cache_state_rec",28,"type")="unsigned-int"
-	Set gtmtypfldindx("cache_state_rec","in_tend")=28
-	Set gtmtypes("cache_state_rec",29,"name")="cache_state_rec.in_cw_set"
-	Set gtmtypes("cache_state_rec",29,"off")=120
+	Set gtmtypfldindx("cache_state_rec","r_epid")=27
+	Set gtmtypes("cache_state_rec",28,"name")="cache_state_rec.aiocb"
+	Set gtmtypes("cache_state_rec",28,"off")=112
+	Set gtmtypes("cache_state_rec",28,"len")=72
+	Set gtmtypes("cache_state_rec",28,"type")="struct"
+	Set gtmtypfldindx("cache_state_rec","aiocb")=28
+	Set gtmtypes("cache_state_rec",29,"name")="cache_state_rec.read_in_progress"
+	Set gtmtypes("cache_state_rec",29,"off")=184
 	Set gtmtypes("cache_state_rec",29,"len")=4
-	Set gtmtypes("cache_state_rec",29,"type")="unsigned-int"
-	Set gtmtypfldindx("cache_state_rec","in_cw_set")=29
-	Set gtmtypes("cache_state_rec",30,"name")="cache_state_rec.data_invalid"
-	Set gtmtypes("cache_state_rec",30,"off")=124
+	Set gtmtypes("cache_state_rec",29,"type")="int"
+	Set gtmtypfldindx("cache_state_rec","read_in_progress")=29
+	Set gtmtypes("cache_state_rec",30,"name")="cache_state_rec.in_tend"
+	Set gtmtypes("cache_state_rec",30,"off")=188
 	Set gtmtypes("cache_state_rec",30,"len")=4
 	Set gtmtypes("cache_state_rec",30,"type")="unsigned-int"
-	Set gtmtypfldindx("cache_state_rec","data_invalid")=30
-	Set gtmtypes("cache_state_rec",31,"name")="cache_state_rec.stopped"
-	Set gtmtypes("cache_state_rec",31,"off")=128
+	Set gtmtypfldindx("cache_state_rec","in_tend")=30
+	Set gtmtypes("cache_state_rec",31,"name")="cache_state_rec.in_cw_set"
+	Set gtmtypes("cache_state_rec",31,"off")=192
 	Set gtmtypes("cache_state_rec",31,"len")=4
-	Set gtmtypes("cache_state_rec",31,"type")="boolean_t"
-	Set gtmtypfldindx("cache_state_rec","stopped")=31
-	Set gtmtypes("cache_state_rec",32,"name")="cache_state_rec.wip_stopped"
-	Set gtmtypes("cache_state_rec",32,"off")=132
-	Set gtmtypes("cache_state_rec",32,"len")=4
-	Set gtmtypes("cache_state_rec",32,"type")="boolean_t"
-	Set gtmtypfldindx("cache_state_rec","wip_stopped")=32
+	Set gtmtypes("cache_state_rec",31,"type")="unsigned-int"
+	Set gtmtypfldindx("cache_state_rec","in_cw_set")=31
+	Set gtmtypes("cache_state_rec",32,"name")="cache_state_rec.wip_is_encr_buf"
+	Set gtmtypes("cache_state_rec",32,"off")=196
+	Set gtmtypes("cache_state_rec",32,"len")=1
+	Set gtmtypes("cache_state_rec",32,"type")="char"
+	Set gtmtypfldindx("cache_state_rec","wip_is_encr_buf")=32
+	Set gtmtypes("cache_state_rec",33,"name")="cache_state_rec.backup_cr_is_twin"
+	Set gtmtypes("cache_state_rec",33,"off")=197
+	Set gtmtypes("cache_state_rec",33,"len")=1
+	Set gtmtypes("cache_state_rec",33,"type")="char"
+	Set gtmtypfldindx("cache_state_rec","backup_cr_is_twin")=33
+	Set gtmtypes("cache_state_rec",34,"name")="cache_state_rec.aio_issued"
+	Set gtmtypes("cache_state_rec",34,"off")=198
+	Set gtmtypes("cache_state_rec",34,"len")=1
+	Set gtmtypes("cache_state_rec",34,"type")="char"
+	Set gtmtypfldindx("cache_state_rec","aio_issued")=34
+	Set gtmtypes("cache_state_rec",35,"name")="cache_state_rec.filler4bytealign"
+	Set gtmtypes("cache_state_rec",35,"off")=199
+	Set gtmtypes("cache_state_rec",35,"len")=1
+	Set gtmtypes("cache_state_rec",35,"type")="char"
+	Set gtmtypfldindx("cache_state_rec","filler4bytealign")=35
 	;
 	Set gtmtypes("callin_entry_list")="struct"
 	Set gtmtypes("callin_entry_list",0)=14
@@ -2692,8 +2737,8 @@ Init
 	Set gtmtypfldindx("d_mt_struct","stream")=32
 	;
 	Set gtmtypes("d_rm_struct")="struct"
-	Set gtmtypes("d_rm_struct",0)=88
-	Set gtmtypes("d_rm_struct","len")=976
+	Set gtmtypes("d_rm_struct",0)=90
+	Set gtmtypes("d_rm_struct","len")=480
 	Set gtmtypes("d_rm_struct",1,"name")="d_rm_struct.fixed"
 	Set gtmtypes("d_rm_struct",1,"off")=0
 	Set gtmtypes("d_rm_struct",1,"len")=4
@@ -3000,145 +3045,155 @@ Init
 	Set gtmtypes("d_rm_struct",61,"len")=8
 	Set gtmtypes("d_rm_struct",61,"type")="long"
 	Set gtmtypfldindx("d_rm_struct","pipe_buff_size")=61
-	Set gtmtypes("d_rm_struct",62,"name")="d_rm_struct.utf_tmp_buffer"
+	Set gtmtypes("d_rm_struct",62,"name")="d_rm_struct.tmp_buffer"
 	Set gtmtypes("d_rm_struct",62,"off")=344
-	Set gtmtypes("d_rm_struct",62,"len")=512
-	Set gtmtypes("d_rm_struct",62,"type")="char"
-	Set gtmtypfldindx("d_rm_struct","utf_tmp_buffer")=62
-	Set gtmtypes("d_rm_struct",63,"name")="d_rm_struct.utf_tot_bytes_in_buffer"
-	Set gtmtypes("d_rm_struct",63,"off")=856
+	Set gtmtypes("d_rm_struct",62,"len")=8
+	Set gtmtypes("d_rm_struct",62,"type")="addr"
+	Set gtmtypfldindx("d_rm_struct","tmp_buffer")=62
+	Set gtmtypes("d_rm_struct",63,"name")="d_rm_struct.tot_bytes_in_buffer"
+	Set gtmtypes("d_rm_struct",63,"off")=352
 	Set gtmtypes("d_rm_struct",63,"len")=4
 	Set gtmtypes("d_rm_struct",63,"type")="int"
-	Set gtmtypfldindx("d_rm_struct","utf_tot_bytes_in_buffer")=63
-	Set gtmtypes("d_rm_struct",64,"name")="d_rm_struct.utf_start_pos"
-	Set gtmtypes("d_rm_struct",64,"off")=860
+	Set gtmtypfldindx("d_rm_struct","tot_bytes_in_buffer")=63
+	Set gtmtypes("d_rm_struct",64,"name")="d_rm_struct.start_pos"
+	Set gtmtypes("d_rm_struct",64,"off")=356
 	Set gtmtypes("d_rm_struct",64,"len")=4
 	Set gtmtypes("d_rm_struct",64,"type")="int"
-	Set gtmtypfldindx("d_rm_struct","utf_start_pos")=64
+	Set gtmtypfldindx("d_rm_struct","start_pos")=64
 	Set gtmtypes("d_rm_struct",65,"name")="d_rm_struct.write_occurred"
-	Set gtmtypes("d_rm_struct",65,"off")=864
+	Set gtmtypes("d_rm_struct",65,"off")=360
 	Set gtmtypes("d_rm_struct",65,"len")=4
 	Set gtmtypes("d_rm_struct",65,"type")="boolean_t"
 	Set gtmtypfldindx("d_rm_struct","write_occurred")=65
 	Set gtmtypes("d_rm_struct",66,"name")="d_rm_struct.read_occurred"
-	Set gtmtypes("d_rm_struct",66,"off")=868
+	Set gtmtypes("d_rm_struct",66,"off")=364
 	Set gtmtypes("d_rm_struct",66,"len")=4
 	Set gtmtypes("d_rm_struct",66,"type")="boolean_t"
 	Set gtmtypfldindx("d_rm_struct","read_occurred")=66
 	Set gtmtypes("d_rm_struct",67,"name")="d_rm_struct.input_encrypted"
-	Set gtmtypes("d_rm_struct",67,"off")=872
+	Set gtmtypes("d_rm_struct",67,"off")=368
 	Set gtmtypes("d_rm_struct",67,"len")=4
 	Set gtmtypes("d_rm_struct",67,"type")="boolean_t"
 	Set gtmtypfldindx("d_rm_struct","input_encrypted")=67
 	Set gtmtypes("d_rm_struct",68,"name")="d_rm_struct.output_encrypted"
-	Set gtmtypes("d_rm_struct",68,"off")=876
+	Set gtmtypes("d_rm_struct",68,"off")=372
 	Set gtmtypes("d_rm_struct",68,"len")=4
 	Set gtmtypes("d_rm_struct",68,"type")="boolean_t"
 	Set gtmtypfldindx("d_rm_struct","output_encrypted")=68
 	Set gtmtypes("d_rm_struct",69,"name")="d_rm_struct.input_iv"
-	Set gtmtypes("d_rm_struct",69,"off")=880
+	Set gtmtypes("d_rm_struct",69,"off")=376
 	Set gtmtypes("d_rm_struct",69,"len")=16
 	Set gtmtypes("d_rm_struct",69,"type")="mstr"
 	Set gtmtypfldindx("d_rm_struct","input_iv")=69
 	Set gtmtypes("d_rm_struct",70,"name")="d_rm_struct.input_iv.char_len"
-	Set gtmtypes("d_rm_struct",70,"off")=880
+	Set gtmtypes("d_rm_struct",70,"off")=376
 	Set gtmtypes("d_rm_struct",70,"len")=4
 	Set gtmtypes("d_rm_struct",70,"type")="unsigned-int"
 	Set gtmtypfldindx("d_rm_struct","input_iv.char_len")=70
 	Set gtmtypes("d_rm_struct",71,"name")="d_rm_struct.input_iv.len"
-	Set gtmtypes("d_rm_struct",71,"off")=884
+	Set gtmtypes("d_rm_struct",71,"off")=380
 	Set gtmtypes("d_rm_struct",71,"len")=4
 	Set gtmtypes("d_rm_struct",71,"type")="int"
 	Set gtmtypfldindx("d_rm_struct","input_iv.len")=71
 	Set gtmtypes("d_rm_struct",72,"name")="d_rm_struct.input_iv.addr"
-	Set gtmtypes("d_rm_struct",72,"off")=888
+	Set gtmtypes("d_rm_struct",72,"off")=384
 	Set gtmtypes("d_rm_struct",72,"len")=8
 	Set gtmtypes("d_rm_struct",72,"type")="addr"
 	Set gtmtypfldindx("d_rm_struct","input_iv.addr")=72
 	Set gtmtypes("d_rm_struct",73,"name")="d_rm_struct.output_iv"
-	Set gtmtypes("d_rm_struct",73,"off")=896
+	Set gtmtypes("d_rm_struct",73,"off")=392
 	Set gtmtypes("d_rm_struct",73,"len")=16
 	Set gtmtypes("d_rm_struct",73,"type")="mstr"
 	Set gtmtypfldindx("d_rm_struct","output_iv")=73
 	Set gtmtypes("d_rm_struct",74,"name")="d_rm_struct.output_iv.char_len"
-	Set gtmtypes("d_rm_struct",74,"off")=896
+	Set gtmtypes("d_rm_struct",74,"off")=392
 	Set gtmtypes("d_rm_struct",74,"len")=4
 	Set gtmtypes("d_rm_struct",74,"type")="unsigned-int"
 	Set gtmtypfldindx("d_rm_struct","output_iv.char_len")=74
 	Set gtmtypes("d_rm_struct",75,"name")="d_rm_struct.output_iv.len"
-	Set gtmtypes("d_rm_struct",75,"off")=900
+	Set gtmtypes("d_rm_struct",75,"off")=396
 	Set gtmtypes("d_rm_struct",75,"len")=4
 	Set gtmtypes("d_rm_struct",75,"type")="int"
 	Set gtmtypfldindx("d_rm_struct","output_iv.len")=75
 	Set gtmtypes("d_rm_struct",76,"name")="d_rm_struct.output_iv.addr"
-	Set gtmtypes("d_rm_struct",76,"off")=904
+	Set gtmtypes("d_rm_struct",76,"off")=400
 	Set gtmtypes("d_rm_struct",76,"len")=8
 	Set gtmtypes("d_rm_struct",76,"type")="addr"
 	Set gtmtypfldindx("d_rm_struct","output_iv.addr")=76
 	Set gtmtypes("d_rm_struct",77,"name")="d_rm_struct.input_key"
-	Set gtmtypes("d_rm_struct",77,"off")=912
+	Set gtmtypes("d_rm_struct",77,"off")=408
 	Set gtmtypes("d_rm_struct",77,"len")=16
 	Set gtmtypes("d_rm_struct",77,"type")="mstr"
 	Set gtmtypfldindx("d_rm_struct","input_key")=77
 	Set gtmtypes("d_rm_struct",78,"name")="d_rm_struct.input_key.char_len"
-	Set gtmtypes("d_rm_struct",78,"off")=912
+	Set gtmtypes("d_rm_struct",78,"off")=408
 	Set gtmtypes("d_rm_struct",78,"len")=4
 	Set gtmtypes("d_rm_struct",78,"type")="unsigned-int"
 	Set gtmtypfldindx("d_rm_struct","input_key.char_len")=78
 	Set gtmtypes("d_rm_struct",79,"name")="d_rm_struct.input_key.len"
-	Set gtmtypes("d_rm_struct",79,"off")=916
+	Set gtmtypes("d_rm_struct",79,"off")=412
 	Set gtmtypes("d_rm_struct",79,"len")=4
 	Set gtmtypes("d_rm_struct",79,"type")="int"
 	Set gtmtypfldindx("d_rm_struct","input_key.len")=79
 	Set gtmtypes("d_rm_struct",80,"name")="d_rm_struct.input_key.addr"
-	Set gtmtypes("d_rm_struct",80,"off")=920
+	Set gtmtypes("d_rm_struct",80,"off")=416
 	Set gtmtypes("d_rm_struct",80,"len")=8
 	Set gtmtypes("d_rm_struct",80,"type")="addr"
 	Set gtmtypfldindx("d_rm_struct","input_key.addr")=80
 	Set gtmtypes("d_rm_struct",81,"name")="d_rm_struct.output_key"
-	Set gtmtypes("d_rm_struct",81,"off")=928
+	Set gtmtypes("d_rm_struct",81,"off")=424
 	Set gtmtypes("d_rm_struct",81,"len")=16
 	Set gtmtypes("d_rm_struct",81,"type")="mstr"
 	Set gtmtypfldindx("d_rm_struct","output_key")=81
 	Set gtmtypes("d_rm_struct",82,"name")="d_rm_struct.output_key.char_len"
-	Set gtmtypes("d_rm_struct",82,"off")=928
+	Set gtmtypes("d_rm_struct",82,"off")=424
 	Set gtmtypes("d_rm_struct",82,"len")=4
 	Set gtmtypes("d_rm_struct",82,"type")="unsigned-int"
 	Set gtmtypfldindx("d_rm_struct","output_key.char_len")=82
 	Set gtmtypes("d_rm_struct",83,"name")="d_rm_struct.output_key.len"
-	Set gtmtypes("d_rm_struct",83,"off")=932
+	Set gtmtypes("d_rm_struct",83,"off")=428
 	Set gtmtypes("d_rm_struct",83,"len")=4
 	Set gtmtypes("d_rm_struct",83,"type")="int"
 	Set gtmtypfldindx("d_rm_struct","output_key.len")=83
 	Set gtmtypes("d_rm_struct",84,"name")="d_rm_struct.output_key.addr"
-	Set gtmtypes("d_rm_struct",84,"off")=936
+	Set gtmtypes("d_rm_struct",84,"off")=432
 	Set gtmtypes("d_rm_struct",84,"len")=8
 	Set gtmtypes("d_rm_struct",84,"type")="addr"
 	Set gtmtypfldindx("d_rm_struct","output_key.addr")=84
 	Set gtmtypes("d_rm_struct",85,"name")="d_rm_struct.input_cipher_handle"
-	Set gtmtypes("d_rm_struct",85,"off")=944
+	Set gtmtypes("d_rm_struct",85,"off")=440
 	Set gtmtypes("d_rm_struct",85,"len")=8
 	Set gtmtypes("d_rm_struct",85,"type")="addr"
 	Set gtmtypfldindx("d_rm_struct","input_cipher_handle")=85
 	Set gtmtypes("d_rm_struct",86,"name")="d_rm_struct.output_cipher_handle"
-	Set gtmtypes("d_rm_struct",86,"off")=952
+	Set gtmtypes("d_rm_struct",86,"off")=448
 	Set gtmtypes("d_rm_struct",86,"len")=8
 	Set gtmtypes("d_rm_struct",86,"type")="addr"
 	Set gtmtypfldindx("d_rm_struct","output_cipher_handle")=86
-	Set gtmtypes("d_rm_struct",87,"name")="d_rm_struct.fsblock_buffer_size"
-	Set gtmtypes("d_rm_struct",87,"off")=960
+	Set gtmtypes("d_rm_struct",87,"name")="d_rm_struct.ichset_utf16_variant"
+	Set gtmtypes("d_rm_struct",87,"off")=456
 	Set gtmtypes("d_rm_struct",87,"len")=4
-	Set gtmtypes("d_rm_struct",87,"type")="unsigned-int"
-	Set gtmtypfldindx("d_rm_struct","fsblock_buffer_size")=87
-	Set gtmtypes("d_rm_struct",88,"name")="d_rm_struct.fsblock_buffer"
-	Set gtmtypes("d_rm_struct",88,"off")=968
-	Set gtmtypes("d_rm_struct",88,"len")=8
-	Set gtmtypes("d_rm_struct",88,"type")="addr"
-	Set gtmtypfldindx("d_rm_struct","fsblock_buffer")=88
+	Set gtmtypes("d_rm_struct",87,"type")="int"
+	Set gtmtypfldindx("d_rm_struct","ichset_utf16_variant")=87
+	Set gtmtypes("d_rm_struct",88,"name")="d_rm_struct.ochset_utf16_variant"
+	Set gtmtypes("d_rm_struct",88,"off")=460
+	Set gtmtypes("d_rm_struct",88,"len")=4
+	Set gtmtypes("d_rm_struct",88,"type")="int"
+	Set gtmtypfldindx("d_rm_struct","ochset_utf16_variant")=88
+	Set gtmtypes("d_rm_struct",89,"name")="d_rm_struct.fsblock_buffer_size"
+	Set gtmtypes("d_rm_struct",89,"off")=464
+	Set gtmtypes("d_rm_struct",89,"len")=4
+	Set gtmtypes("d_rm_struct",89,"type")="unsigned-int"
+	Set gtmtypfldindx("d_rm_struct","fsblock_buffer_size")=89
+	Set gtmtypes("d_rm_struct",90,"name")="d_rm_struct.fsblock_buffer"
+	Set gtmtypes("d_rm_struct",90,"off")=472
+	Set gtmtypes("d_rm_struct",90,"len")=8
+	Set gtmtypes("d_rm_struct",90,"type")="addr"
+	Set gtmtypfldindx("d_rm_struct","fsblock_buffer")=90
 	;
 	Set gtmtypes("d_socket_struct")="struct"
-	Set gtmtypes("d_socket_struct",0)=17
-	Set gtmtypes("d_socket_struct","len")=88
+	Set gtmtypes("d_socket_struct",0)=19
+	Set gtmtypes("d_socket_struct","len")=96
 	Set gtmtypes("d_socket_struct",1,"name")="d_socket_struct.sock_save_state"
 	Set gtmtypes("d_socket_struct",1,"off")=0
 	Set gtmtypes("d_socket_struct",1,"len")=48
@@ -3214,16 +3269,26 @@ Init
 	Set gtmtypes("d_socket_struct",15,"len")=4
 	Set gtmtypes("d_socket_struct",15,"type")="boolean_t"
 	Set gtmtypfldindx("d_socket_struct","ochset_specified")=15
-	Set gtmtypes("d_socket_struct",16,"name")="d_socket_struct.iod"
+	Set gtmtypes("d_socket_struct",16,"name")="d_socket_struct.ichset_utf16_variant"
 	Set gtmtypes("d_socket_struct",16,"off")=72
-	Set gtmtypes("d_socket_struct",16,"len")=8
-	Set gtmtypes("d_socket_struct",16,"type")="addr"
-	Set gtmtypfldindx("d_socket_struct","iod")=16
-	Set gtmtypes("d_socket_struct",17,"name")="d_socket_struct.gtm_socket"
-	Set gtmtypes("d_socket_struct",17,"off")=80
-	Set gtmtypes("d_socket_struct",17,"len")=8
-	Set gtmtypes("d_socket_struct",17,"type")="addr"
-	Set gtmtypfldindx("d_socket_struct","gtm_socket")=17
+	Set gtmtypes("d_socket_struct",16,"len")=4
+	Set gtmtypes("d_socket_struct",16,"type")="int"
+	Set gtmtypfldindx("d_socket_struct","ichset_utf16_variant")=16
+	Set gtmtypes("d_socket_struct",17,"name")="d_socket_struct.ochset_utf16_variant"
+	Set gtmtypes("d_socket_struct",17,"off")=76
+	Set gtmtypes("d_socket_struct",17,"len")=4
+	Set gtmtypes("d_socket_struct",17,"type")="int"
+	Set gtmtypfldindx("d_socket_struct","ochset_utf16_variant")=17
+	Set gtmtypes("d_socket_struct",18,"name")="d_socket_struct.iod"
+	Set gtmtypes("d_socket_struct",18,"off")=80
+	Set gtmtypes("d_socket_struct",18,"len")=8
+	Set gtmtypes("d_socket_struct",18,"type")="addr"
+	Set gtmtypfldindx("d_socket_struct","iod")=18
+	Set gtmtypes("d_socket_struct",19,"name")="d_socket_struct.gtm_socket"
+	Set gtmtypes("d_socket_struct",19,"off")=88
+	Set gtmtypes("d_socket_struct",19,"len")=8
+	Set gtmtypes("d_socket_struct",19,"type")="addr"
+	Set gtmtypfldindx("d_socket_struct","gtm_socket")=19
 	;
 	Set gtmtypes("d_tt_struct")="struct"
 	Set gtmtypes("d_tt_struct",0)=48
@@ -3888,6 +3953,25 @@ Init
 	Set gtmtypes("dev_dispatch_struct",16,"type")="addr"
 	Set gtmtypfldindx("dev_dispatch_struct","dlr_zkey")=16
 	;
+	Set gtmtypes("dio_buff_t")="struct"
+	Set gtmtypes("dio_buff_t",0)=3
+	Set gtmtypes("dio_buff_t","len")=24
+	Set gtmtypes("dio_buff_t",1,"name")="dio_buff_t.unaligned_size"
+	Set gtmtypes("dio_buff_t",1,"off")=0
+	Set gtmtypes("dio_buff_t",1,"len")=4
+	Set gtmtypes("dio_buff_t",1,"type")="int"
+	Set gtmtypfldindx("dio_buff_t","unaligned_size")=1
+	Set gtmtypes("dio_buff_t",2,"name")="dio_buff_t.unaligned"
+	Set gtmtypes("dio_buff_t",2,"off")=8
+	Set gtmtypes("dio_buff_t",2,"len")=8
+	Set gtmtypes("dio_buff_t",2,"type")="addr"
+	Set gtmtypfldindx("dio_buff_t","unaligned")=2
+	Set gtmtypes("dio_buff_t",3,"name")="dio_buff_t.aligned"
+	Set gtmtypes("dio_buff_t",3,"off")=16
+	Set gtmtypes("dio_buff_t",3,"len")=8
+	Set gtmtypes("dio_buff_t",3,"type")="addr"
+	Set gtmtypfldindx("dio_buff_t","aligned")=3
+	;
 	Set gtmtypes("dollar_ecode_struct")="struct"
 	Set gtmtypes("dollar_ecode_struct",0)=4
 	Set gtmtypes("dollar_ecode_struct","len")=16
@@ -4103,6 +4187,70 @@ Init
 	Set gtmtypes("dskread_trace",5,"type")="unsigned-int"
 	Set gtmtypfldindx("dskread_trace","cycle")=5
 	;
+	Set gtmtypes("emit_base_info_struct")="struct"
+	Set gtmtypes("emit_base_info_struct",0)=12
+	Set gtmtypes("emit_base_info_struct","len")=16
+	Set gtmtypes("emit_base_info_struct",1,"name")="emit_base_info_struct.modrm_byte"
+	Set gtmtypes("emit_base_info_struct",1,"off")=0
+	Set gtmtypes("emit_base_info_struct",1,"len")=1
+	Set gtmtypes("emit_base_info_struct",1,"type")="modrm_byte_type"
+	Set gtmtypfldindx("emit_base_info_struct","modrm_byte")=1
+	Set gtmtypes("emit_base_info_struct",2,"name")="emit_base_info_struct.modrm_byte.modrm"
+	Set gtmtypes("emit_base_info_struct",2,"off")=0
+	Set gtmtypes("emit_base_info_struct",2,"len")=1
+	Set gtmtypes("emit_base_info_struct",2,"type")="ModR_M"
+	Set gtmtypfldindx("emit_base_info_struct","modrm_byte.modrm")=2
+	Set gtmtypes("emit_base_info_struct",3,"name")="emit_base_info_struct.modrm_byte.byte"
+	Set gtmtypes("emit_base_info_struct",3,"off")=0
+	Set gtmtypes("emit_base_info_struct",3,"len")=1
+	Set gtmtypes("emit_base_info_struct",3,"type")="unsigned-char"
+	Set gtmtypfldindx("emit_base_info_struct","modrm_byte.byte")=3
+	Set gtmtypes("emit_base_info_struct",4,"name")="emit_base_info_struct.sib_byte"
+	Set gtmtypes("emit_base_info_struct",4,"off")=1
+	Set gtmtypes("emit_base_info_struct",4,"len")=1
+	Set gtmtypes("emit_base_info_struct",4,"type")="sib_byte_type"
+	Set gtmtypfldindx("emit_base_info_struct","sib_byte")=4
+	Set gtmtypes("emit_base_info_struct",5,"name")="emit_base_info_struct.sib_byte.sib"
+	Set gtmtypes("emit_base_info_struct",5,"off")=1
+	Set gtmtypes("emit_base_info_struct",5,"len")=1
+	Set gtmtypes("emit_base_info_struct",5,"type")="SIB"
+	Set gtmtypfldindx("emit_base_info_struct","sib_byte.sib")=5
+	Set gtmtypes("emit_base_info_struct",6,"name")="emit_base_info_struct.sib_byte.byte"
+	Set gtmtypes("emit_base_info_struct",6,"off")=1
+	Set gtmtypes("emit_base_info_struct",6,"len")=1
+	Set gtmtypes("emit_base_info_struct",6,"type")="unsigned-char"
+	Set gtmtypfldindx("emit_base_info_struct","sib_byte.byte")=6
+	Set gtmtypes("emit_base_info_struct",7,"name")="emit_base_info_struct.rex"
+	Set gtmtypes("emit_base_info_struct",7,"off")=2
+	Set gtmtypes("emit_base_info_struct",7,"len")=1
+	Set gtmtypes("emit_base_info_struct",7,"type")="char"
+	Set gtmtypfldindx("emit_base_info_struct","rex")=7
+	Set gtmtypes("emit_base_info_struct",8,"name")="emit_base_info_struct.offset8"
+	Set gtmtypes("emit_base_info_struct",8,"off")=3
+	Set gtmtypes("emit_base_info_struct",8,"len")=1
+	Set gtmtypes("emit_base_info_struct",8,"type")="char"
+	Set gtmtypfldindx("emit_base_info_struct","offset8")=8
+	Set gtmtypes("emit_base_info_struct",9,"name")="emit_base_info_struct.flags"
+	Set gtmtypes("emit_base_info_struct",9,"off")=4
+	Set gtmtypes("emit_base_info_struct",9,"len")=1
+	Set gtmtypes("emit_base_info_struct",9,"type")="struct"
+	Set gtmtypfldindx("emit_base_info_struct","flags")=9
+	Set gtmtypes("emit_base_info_struct",10,"name")="emit_base_info_struct.filler"
+	Set gtmtypes("emit_base_info_struct",10,"off")=5
+	Set gtmtypes("emit_base_info_struct",10,"len")=1
+	Set gtmtypes("emit_base_info_struct",10,"type")="char"
+	Set gtmtypfldindx("emit_base_info_struct","filler")=10
+	Set gtmtypes("emit_base_info_struct",11,"name")="emit_base_info_struct.offset32"
+	Set gtmtypes("emit_base_info_struct",11,"off")=8
+	Set gtmtypes("emit_base_info_struct",11,"len")=4
+	Set gtmtypes("emit_base_info_struct",11,"type")="int"
+	Set gtmtypfldindx("emit_base_info_struct","offset32")=11
+	Set gtmtypes("emit_base_info_struct",12,"name")="emit_base_info_struct.imm32"
+	Set gtmtypes("emit_base_info_struct",12,"off")=12
+	Set gtmtypes("emit_base_info_struct",12,"len")=4
+	Set gtmtypes("emit_base_info_struct",12,"type")="int"
+	Set gtmtypfldindx("emit_base_info_struct","imm32")=12
+	;
 	Set gtmtypes("enc_handles")="struct"
 	Set gtmtypes("enc_handles",0)=2
 	Set gtmtypes("enc_handles","len")=16
@@ -4276,7 +4424,7 @@ Init
 	Set gtmtypfldindx("fdinfo_t","is_db")=2
 	;
 	Set gtmtypes("file_control")="struct"
-	Set gtmtypes("file_control",0)=6
+	Set gtmtypes("file_control",0)=5
 	Set gtmtypes("file_control","len")=40
 	Set gtmtypes("file_control",1,"name")="file_control.op_buff"
 	Set gtmtypes("file_control",1,"off")=0
@@ -4298,16 +4446,11 @@ Init
 	Set gtmtypes("file_control",4,"len")=8
 	Set gtmtypes("file_control",4,"type")="addr"
 	Set gtmtypfldindx("file_control","file_info")=4
-	Set gtmtypes("file_control",5,"name")="file_control.file_type"
+	Set gtmtypes("file_control",5,"name")="file_control.op"
 	Set gtmtypes("file_control",5,"off")=32
 	Set gtmtypes("file_control",5,"len")=1
 	Set gtmtypes("file_control",5,"type")="char"
-	Set gtmtypfldindx("file_control","file_type")=5
-	Set gtmtypes("file_control",6,"name")="file_control.op"
-	Set gtmtypes("file_control",6,"off")=33
-	Set gtmtypes("file_control",6,"len")=1
-	Set gtmtypes("file_control",6,"type")="char"
-	Set gtmtypfldindx("file_control","op")=6
+	Set gtmtypfldindx("file_control","op")=5
 	;
 	Set gtmtypes("file_info")="struct"
 	Set gtmtypes("file_info",0)=5
@@ -4678,7 +4821,7 @@ Init
 	Set gtmtypes("gcall_args",6,"dim")=32
 	;
 	Set gtmtypes("gd_addr")="struct"
-	Set gtmtypes("gd_addr",0)=17
+	Set gtmtypes("gd_addr",0)=20
 	Set gtmtypes("gd_addr","len")=112
 	Set gtmtypes("gd_addr",1,"name")="gd_addr.local_locks"
 	Set gtmtypes("gd_addr",1,"off")=0
@@ -4760,11 +4903,26 @@ Init
 	Set gtmtypes("gd_addr",16,"len")=4
 	Set gtmtypes("gd_addr",16,"type")="unsigned-int"
 	Set gtmtypfldindx("gd_addr","has_span_gbls")=16
-	Set gtmtypes("gd_addr",17,"name")="gd_addr.filler"
+	Set gtmtypes("gd_addr",17,"name")="gd_addr.ygs_map_entry_changed"
 	Set gtmtypes("gd_addr",17,"off")=100
-	Set gtmtypes("gd_addr",17,"len")=12
+	Set gtmtypes("gd_addr",17,"len")=1
 	Set gtmtypes("gd_addr",17,"type")="char"
-	Set gtmtypfldindx("gd_addr","filler")=17
+	Set gtmtypfldindx("gd_addr","ygs_map_entry_changed")=17
+	Set gtmtypes("gd_addr",18,"name")="gd_addr.is_dummy_gbldir"
+	Set gtmtypes("gd_addr",18,"off")=101
+	Set gtmtypes("gd_addr",18,"len")=1
+	Set gtmtypes("gd_addr",18,"type")="char"
+	Set gtmtypfldindx("gd_addr","is_dummy_gbldir")=18
+	Set gtmtypes("gd_addr",19,"name")="gd_addr.filler"
+	Set gtmtypes("gd_addr",19,"off")=102
+	Set gtmtypes("gd_addr",19,"len")=2
+	Set gtmtypes("gd_addr",19,"type")="char"
+	Set gtmtypfldindx("gd_addr","filler")=19
+	Set gtmtypes("gd_addr",20,"name")="gd_addr.thread_gdi"
+	Set gtmtypes("gd_addr",20,"off")=104
+	Set gtmtypes("gd_addr",20,"len")=8
+	Set gtmtypes("gd_addr",20,"type")="addr"
+	Set gtmtypfldindx("gd_addr","thread_gdi")=20
 	;
 	Set gtmtypes("gd_binding")="struct"
 	Set gtmtypes("gd_binding",0)=8
@@ -4830,8 +4988,8 @@ Init
 	Set gtmtypfldindx("gd_gblname","ver")=3
 	;
 	Set gtmtypes("gd_region")="struct"
-	Set gtmtypes("gd_region",0)=38
-	Set gtmtypes("gd_region","len")=384
+	Set gtmtypes("gd_region",0)=44
+	Set gtmtypes("gd_region","len")=424
 	Set gtmtypes("gd_region",1,"name")="gd_region.rname_len"
 	Set gtmtypes("gd_region",1,"off")=0
 	Set gtmtypes("gd_region",1,"len")=2
@@ -5012,16 +5170,46 @@ Init
 	Set gtmtypes("gd_region",36,"len")=4
 	Set gtmtypes("gd_region",36,"type")="unsigned-int"
 	Set gtmtypfldindx("gd_region","is_spanned")=36
-	Set gtmtypes("gd_region",37,"name")="gd_region.epoch_taper"
+	Set gtmtypes("gd_region",37,"name")="gd_region.statsDB_reg_index"
 	Set gtmtypes("gd_region",37,"off")=368
-	Set gtmtypes("gd_region",37,"len")=1
-	Set gtmtypes("gd_region",37,"type")="char"
-	Set gtmtypfldindx("gd_region","epoch_taper")=37
-	Set gtmtypes("gd_region",38,"name")="gd_region.filler"
-	Set gtmtypes("gd_region",38,"off")=369
-	Set gtmtypes("gd_region",38,"len")=11
+	Set gtmtypes("gd_region",37,"len")=4
+	Set gtmtypes("gd_region",37,"type")="unsigned-int"
+	Set gtmtypfldindx("gd_region","statsDB_reg_index")=37
+	Set gtmtypes("gd_region",38,"name")="gd_region.epoch_taper"
+	Set gtmtypes("gd_region",38,"off")=372
+	Set gtmtypes("gd_region",38,"len")=1
 	Set gtmtypes("gd_region",38,"type")="char"
-	Set gtmtypfldindx("gd_region","filler")=38
+	Set gtmtypfldindx("gd_region","epoch_taper")=38
+	Set gtmtypes("gd_region",39,"name")="gd_region.reservedDBFlags"
+	Set gtmtypes("gd_region",39,"off")=373
+	Set gtmtypes("gd_region",39,"len")=1
+	Set gtmtypes("gd_region",39,"type")="char"
+	Set gtmtypfldindx("gd_region","reservedDBFlags")=39
+	Set gtmtypes("gd_region",40,"name")="gd_region.lock_crit_with_db"
+	Set gtmtypes("gd_region",40,"off")=374
+	Set gtmtypes("gd_region",40,"len")=1
+	Set gtmtypes("gd_region",40,"type")="char"
+	Set gtmtypfldindx("gd_region","lock_crit_with_db")=40
+	Set gtmtypes("gd_region",41,"name")="gd_region.statsDB_setup_started"
+	Set gtmtypes("gd_region",41,"off")=375
+	Set gtmtypes("gd_region",41,"len")=1
+	Set gtmtypes("gd_region",41,"type")="char"
+	Set gtmtypfldindx("gd_region","statsDB_setup_started")=41
+	Set gtmtypes("gd_region",42,"name")="gd_region.owning_gd"
+	Set gtmtypes("gd_region",42,"off")=376
+	Set gtmtypes("gd_region",42,"len")=8
+	Set gtmtypes("gd_region",42,"type")="addr"
+	Set gtmtypfldindx("gd_region","owning_gd")=42
+	Set gtmtypes("gd_region",43,"name")="gd_region.statsDB_setup_completed"
+	Set gtmtypes("gd_region",43,"off")=384
+	Set gtmtypes("gd_region",43,"len")=1
+	Set gtmtypes("gd_region",43,"type")="char"
+	Set gtmtypfldindx("gd_region","statsDB_setup_completed")=43
+	Set gtmtypes("gd_region",44,"name")="gd_region.filler"
+	Set gtmtypes("gd_region",44,"off")=385
+	Set gtmtypes("gd_region",44,"len")=39
+	Set gtmtypes("gd_region",44,"type")="char"
+	Set gtmtypfldindx("gd_region","filler")=44
 	;
 	Set gtmtypes("gd_seg_addr")="union"
 	Set gtmtypes("gd_seg_addr",0)=2
@@ -5038,7 +5226,7 @@ Init
 	Set gtmtypfldindx("gd_seg_addr","addr")=2
 	;
 	Set gtmtypes("gd_segment")="struct"
-	Set gtmtypes("gd_segment",0)=23
+	Set gtmtypes("gd_segment",0)=24
 	Set gtmtypes("gd_segment","len")=384
 	Set gtmtypes("gd_segment",1,"name")="gd_segment.sname_len"
 	Set gtmtypes("gd_segment",1,"off")=0
@@ -5150,11 +5338,16 @@ Init
 	Set gtmtypes("gd_segment",22,"len")=4
 	Set gtmtypes("gd_segment",22,"type")="unsigned-int"
 	Set gtmtypfldindx("gd_segment","is_encrypted")=22
-	Set gtmtypes("gd_segment",23,"name")="gd_segment.filler"
+	Set gtmtypes("gd_segment",23,"name")="gd_segment.asyncio"
 	Set gtmtypes("gd_segment",23,"off")=364
-	Set gtmtypes("gd_segment",23,"len")=16
-	Set gtmtypes("gd_segment",23,"type")="char"
-	Set gtmtypfldindx("gd_segment","filler")=23
+	Set gtmtypes("gd_segment",23,"len")=4
+	Set gtmtypes("gd_segment",23,"type")="boolean_t"
+	Set gtmtypfldindx("gd_segment","asyncio")=23
+	Set gtmtypes("gd_segment",24,"name")="gd_segment.filler"
+	Set gtmtypes("gd_segment",24,"off")=368
+	Set gtmtypes("gd_segment",24,"len")=16
+	Set gtmtypes("gd_segment",24,"type")="char"
+	Set gtmtypfldindx("gd_segment","filler")=24
 	;
 	Set gtmtypes("gdr_name")="struct"
 	Set gtmtypes("gdr_name",0)=10
@@ -6370,8 +6563,8 @@ Init
 	Set gtmtypfldindx("gtmrecv_options_t","autorollback_verbose")=29
 	;
 	Set gtmtypes("gtmsecshr_mesg")="struct"
-	Set gtmtypes("gtmsecshr_mesg",0)=15
-	Set gtmtypes("gtmsecshr_mesg","len")=4152
+	Set gtmtypes("gtmsecshr_mesg",0)=16
+	Set gtmtypes("gtmsecshr_mesg","len")=4160
 	Set gtmtypes("gtmsecshr_mesg",1,"name")="gtmsecshr_mesg.code"
 	Set gtmtypes("gtmsecshr_mesg",1,"off")=0
 	Set gtmtypes("gtmsecshr_mesg",1,"len")=4
@@ -6399,7 +6592,7 @@ Init
 	Set gtmtypfldindx("gtmsecshr_mesg","seqno")=5
 	Set gtmtypes("gtmsecshr_mesg",6,"name")="gtmsecshr_mesg.mesg"
 	Set gtmtypes("gtmsecshr_mesg",6,"off")=24
-	Set gtmtypes("gtmsecshr_mesg",6,"len")=4128
+	Set gtmtypes("gtmsecshr_mesg",6,"len")=4136
 	Set gtmtypes("gtmsecshr_mesg",6,"type")="union"
 	Set gtmtypfldindx("gtmsecshr_mesg","mesg")=6
 	Set gtmtypes("gtmsecshr_mesg",7,"name")="gtmsecshr_mesg.mesg.id"
@@ -6414,39 +6607,44 @@ Init
 	Set gtmtypfldindx("gtmsecshr_mesg","mesg.path")=8
 	Set gtmtypes("gtmsecshr_mesg",9,"name")="gtmsecshr_mesg.mesg.db_ipcs"
 	Set gtmtypes("gtmsecshr_mesg",9,"off")=24
-	Set gtmtypes("gtmsecshr_mesg",9,"len")=4128
+	Set gtmtypes("gtmsecshr_mesg",9,"len")=4136
 	Set gtmtypes("gtmsecshr_mesg",9,"type")="ipcs_mesg"
 	Set gtmtypfldindx("gtmsecshr_mesg","mesg.db_ipcs")=9
-	Set gtmtypes("gtmsecshr_mesg",10,"name")="gtmsecshr_mesg.mesg.db_ipcs.semid"
+	Set gtmtypes("gtmsecshr_mesg",10,"name")="gtmsecshr_mesg.mesg.db_ipcs.open_fd_with_o_direct"
 	Set gtmtypes("gtmsecshr_mesg",10,"off")=24
 	Set gtmtypes("gtmsecshr_mesg",10,"len")=4
-	Set gtmtypes("gtmsecshr_mesg",10,"type")="int"
-	Set gtmtypfldindx("gtmsecshr_mesg","mesg.db_ipcs.semid")=10
-	Set gtmtypes("gtmsecshr_mesg",11,"name")="gtmsecshr_mesg.mesg.db_ipcs.shmid"
+	Set gtmtypes("gtmsecshr_mesg",10,"type")="boolean_t"
+	Set gtmtypfldindx("gtmsecshr_mesg","mesg.db_ipcs.open_fd_with_o_direct")=10
+	Set gtmtypes("gtmsecshr_mesg",11,"name")="gtmsecshr_mesg.mesg.db_ipcs.semid"
 	Set gtmtypes("gtmsecshr_mesg",11,"off")=28
 	Set gtmtypes("gtmsecshr_mesg",11,"len")=4
 	Set gtmtypes("gtmsecshr_mesg",11,"type")="int"
-	Set gtmtypfldindx("gtmsecshr_mesg","mesg.db_ipcs.shmid")=11
-	Set gtmtypes("gtmsecshr_mesg",12,"name")="gtmsecshr_mesg.mesg.db_ipcs.gt_sem_ctime"
+	Set gtmtypfldindx("gtmsecshr_mesg","mesg.db_ipcs.semid")=11
+	Set gtmtypes("gtmsecshr_mesg",12,"name")="gtmsecshr_mesg.mesg.db_ipcs.shmid"
 	Set gtmtypes("gtmsecshr_mesg",12,"off")=32
-	Set gtmtypes("gtmsecshr_mesg",12,"len")=8
-	Set gtmtypes("gtmsecshr_mesg",12,"type")="time_t"
-	Set gtmtypfldindx("gtmsecshr_mesg","mesg.db_ipcs.gt_sem_ctime")=12
-	Set gtmtypes("gtmsecshr_mesg",13,"name")="gtmsecshr_mesg.mesg.db_ipcs.gt_shm_ctime"
+	Set gtmtypes("gtmsecshr_mesg",12,"len")=4
+	Set gtmtypes("gtmsecshr_mesg",12,"type")="int"
+	Set gtmtypfldindx("gtmsecshr_mesg","mesg.db_ipcs.shmid")=12
+	Set gtmtypes("gtmsecshr_mesg",13,"name")="gtmsecshr_mesg.mesg.db_ipcs.gt_sem_ctime"
 	Set gtmtypes("gtmsecshr_mesg",13,"off")=40
 	Set gtmtypes("gtmsecshr_mesg",13,"len")=8
 	Set gtmtypes("gtmsecshr_mesg",13,"type")="time_t"
-	Set gtmtypfldindx("gtmsecshr_mesg","mesg.db_ipcs.gt_shm_ctime")=13
-	Set gtmtypes("gtmsecshr_mesg",14,"name")="gtmsecshr_mesg.mesg.db_ipcs.fn_len"
+	Set gtmtypfldindx("gtmsecshr_mesg","mesg.db_ipcs.gt_sem_ctime")=13
+	Set gtmtypes("gtmsecshr_mesg",14,"name")="gtmsecshr_mesg.mesg.db_ipcs.gt_shm_ctime"
 	Set gtmtypes("gtmsecshr_mesg",14,"off")=48
-	Set gtmtypes("gtmsecshr_mesg",14,"len")=4
-	Set gtmtypes("gtmsecshr_mesg",14,"type")="unsigned-int"
-	Set gtmtypfldindx("gtmsecshr_mesg","mesg.db_ipcs.fn_len")=14
-	Set gtmtypes("gtmsecshr_mesg",15,"name")="gtmsecshr_mesg.mesg.db_ipcs.fn"
-	Set gtmtypes("gtmsecshr_mesg",15,"off")=52
-	Set gtmtypes("gtmsecshr_mesg",15,"len")=4097
-	Set gtmtypes("gtmsecshr_mesg",15,"type")="char"
-	Set gtmtypfldindx("gtmsecshr_mesg","mesg.db_ipcs.fn")=15
+	Set gtmtypes("gtmsecshr_mesg",14,"len")=8
+	Set gtmtypes("gtmsecshr_mesg",14,"type")="time_t"
+	Set gtmtypfldindx("gtmsecshr_mesg","mesg.db_ipcs.gt_shm_ctime")=14
+	Set gtmtypes("gtmsecshr_mesg",15,"name")="gtmsecshr_mesg.mesg.db_ipcs.fn_len"
+	Set gtmtypes("gtmsecshr_mesg",15,"off")=56
+	Set gtmtypes("gtmsecshr_mesg",15,"len")=4
+	Set gtmtypes("gtmsecshr_mesg",15,"type")="unsigned-int"
+	Set gtmtypfldindx("gtmsecshr_mesg","mesg.db_ipcs.fn_len")=15
+	Set gtmtypes("gtmsecshr_mesg",16,"name")="gtmsecshr_mesg.mesg.db_ipcs.fn"
+	Set gtmtypes("gtmsecshr_mesg",16,"off")=60
+	Set gtmtypes("gtmsecshr_mesg",16,"len")=4097
+	Set gtmtypes("gtmsecshr_mesg",16,"type")="char"
+	Set gtmtypfldindx("gtmsecshr_mesg","mesg.db_ipcs.fn")=16
 	;
 	Set gtmtypes("gtmsiginfo_t")="struct"
 	Set gtmtypes("gtmsiginfo_t",0)=8
@@ -6990,6 +7188,22 @@ Init
 	Set gtmtypes("gv_key",4,"type")="unsigned-char"
 	Set gtmtypfldindx("gv_key","base")=4
 	;
+	Set gtmtypes("gv_name_and_subscripts")="union"
+	Set gtmtypes("gv_name_and_subscripts",0)=2
+	Set gtmtypes("gv_name_and_subscripts","len")=140
+	Set gtmtypes("gv_name_and_subscripts",1,"name")="gv_name_and_subscripts.lv"
+	Set gtmtypes("gv_name_and_subscripts",1,"off")=0
+	Set gtmtypes("gv_name_and_subscripts",1,"len")=140
+	Set gtmtypes("gv_name_and_subscripts",1,"type")="int"
+	Set gtmtypfldindx("gv_name_and_subscripts","lv")=1
+	Set gtmtypes("gv_name_and_subscripts",1,"dim")=35
+	Set gtmtypes("gv_name_and_subscripts",2,"name")="gv_name_and_subscripts.gv"
+	Set gtmtypes("gv_name_and_subscripts",2,"off")=0
+	Set gtmtypes("gv_name_and_subscripts",2,"len")=140
+	Set gtmtypes("gv_name_and_subscripts",2,"type")="int"
+	Set gtmtypfldindx("gv_name_and_subscripts","gv")=2
+	Set gtmtypes("gv_name_and_subscripts",2,"dim")=35
+	;
 	Set gtmtypes("gv_namehead")="struct"
 	Set gtmtypes("gv_namehead",0)=42
 	Set gtmtypes("gv_namehead","len")=808
@@ -7539,8 +7753,8 @@ Init
 	Set gtmtypfldindx("gvsavtarg_t","end")=8
 	;
 	Set gtmtypes("gvstats_rec_t")="struct"
-	Set gtmtypes("gvstats_rec_t",0)=58
-	Set gtmtypes("gvstats_rec_t","len")=464
+	Set gtmtypes("gvstats_rec_t",0)=59
+	Set gtmtypes("gvstats_rec_t","len")=472
 	Set gtmtypes("gvstats_rec_t",1,"name")="gvstats_rec_t.n_set"
 	Set gtmtypes("gvstats_rec_t",1,"off")=0
 	Set gtmtypes("gvstats_rec_t",1,"len")=8
@@ -7831,6 +8045,11 @@ Init
 	Set gtmtypes("gvstats_rec_t",58,"len")=8
 	Set gtmtypes("gvstats_rec_t",58,"type")="uint64_t"
 	Set gtmtypfldindx("gvstats_rec_t","n_crit_yields")=58
+	Set gtmtypes("gvstats_rec_t",59,"name")="gvstats_rec_t.n_clean2dirty"
+	Set gtmtypes("gvstats_rec_t",59,"off")=464
+	Set gtmtypes("gvstats_rec_t",59,"len")=8
+	Set gtmtypes("gvstats_rec_t",59,"type")="uint64_t"
+	Set gtmtypfldindx("gvstats_rec_t","n_clean2dirty")=59
 	;
 	Set gtmtypes("gvt_container")="struct"
 	Set gtmtypes("gvt_container",0)=4
@@ -9425,38 +9644,43 @@ Init
 	Set gtmtypfldindx("iosb","dev_dep_info")=3
 	;
 	Set gtmtypes("ipcs_mesg")="struct"
-	Set gtmtypes("ipcs_mesg",0)=6
-	Set gtmtypes("ipcs_mesg","len")=4128
-	Set gtmtypes("ipcs_mesg",1,"name")="ipcs_mesg.semid"
+	Set gtmtypes("ipcs_mesg",0)=7
+	Set gtmtypes("ipcs_mesg","len")=4136
+	Set gtmtypes("ipcs_mesg",1,"name")="ipcs_mesg.open_fd_with_o_direct"
 	Set gtmtypes("ipcs_mesg",1,"off")=0
 	Set gtmtypes("ipcs_mesg",1,"len")=4
-	Set gtmtypes("ipcs_mesg",1,"type")="int"
-	Set gtmtypfldindx("ipcs_mesg","semid")=1
-	Set gtmtypes("ipcs_mesg",2,"name")="ipcs_mesg.shmid"
+	Set gtmtypes("ipcs_mesg",1,"type")="boolean_t"
+	Set gtmtypfldindx("ipcs_mesg","open_fd_with_o_direct")=1
+	Set gtmtypes("ipcs_mesg",2,"name")="ipcs_mesg.semid"
 	Set gtmtypes("ipcs_mesg",2,"off")=4
 	Set gtmtypes("ipcs_mesg",2,"len")=4
 	Set gtmtypes("ipcs_mesg",2,"type")="int"
-	Set gtmtypfldindx("ipcs_mesg","shmid")=2
-	Set gtmtypes("ipcs_mesg",3,"name")="ipcs_mesg.gt_sem_ctime"
+	Set gtmtypfldindx("ipcs_mesg","semid")=2
+	Set gtmtypes("ipcs_mesg",3,"name")="ipcs_mesg.shmid"
 	Set gtmtypes("ipcs_mesg",3,"off")=8
-	Set gtmtypes("ipcs_mesg",3,"len")=8
-	Set gtmtypes("ipcs_mesg",3,"type")="time_t"
-	Set gtmtypfldindx("ipcs_mesg","gt_sem_ctime")=3
-	Set gtmtypes("ipcs_mesg",4,"name")="ipcs_mesg.gt_shm_ctime"
+	Set gtmtypes("ipcs_mesg",3,"len")=4
+	Set gtmtypes("ipcs_mesg",3,"type")="int"
+	Set gtmtypfldindx("ipcs_mesg","shmid")=3
+	Set gtmtypes("ipcs_mesg",4,"name")="ipcs_mesg.gt_sem_ctime"
 	Set gtmtypes("ipcs_mesg",4,"off")=16
 	Set gtmtypes("ipcs_mesg",4,"len")=8
 	Set gtmtypes("ipcs_mesg",4,"type")="time_t"
-	Set gtmtypfldindx("ipcs_mesg","gt_shm_ctime")=4
-	Set gtmtypes("ipcs_mesg",5,"name")="ipcs_mesg.fn_len"
+	Set gtmtypfldindx("ipcs_mesg","gt_sem_ctime")=4
+	Set gtmtypes("ipcs_mesg",5,"name")="ipcs_mesg.gt_shm_ctime"
 	Set gtmtypes("ipcs_mesg",5,"off")=24
-	Set gtmtypes("ipcs_mesg",5,"len")=4
-	Set gtmtypes("ipcs_mesg",5,"type")="unsigned-int"
-	Set gtmtypfldindx("ipcs_mesg","fn_len")=5
-	Set gtmtypes("ipcs_mesg",6,"name")="ipcs_mesg.fn"
-	Set gtmtypes("ipcs_mesg",6,"off")=28
-	Set gtmtypes("ipcs_mesg",6,"len")=4097
-	Set gtmtypes("ipcs_mesg",6,"type")="char"
-	Set gtmtypfldindx("ipcs_mesg","fn")=6
+	Set gtmtypes("ipcs_mesg",5,"len")=8
+	Set gtmtypes("ipcs_mesg",5,"type")="time_t"
+	Set gtmtypfldindx("ipcs_mesg","gt_shm_ctime")=5
+	Set gtmtypes("ipcs_mesg",6,"name")="ipcs_mesg.fn_len"
+	Set gtmtypes("ipcs_mesg",6,"off")=32
+	Set gtmtypes("ipcs_mesg",6,"len")=4
+	Set gtmtypes("ipcs_mesg",6,"type")="unsigned-int"
+	Set gtmtypfldindx("ipcs_mesg","fn_len")=6
+	Set gtmtypes("ipcs_mesg",7,"name")="ipcs_mesg.fn"
+	Set gtmtypes("ipcs_mesg",7,"off")=36
+	Set gtmtypes("ipcs_mesg",7,"len")=4097
+	Set gtmtypes("ipcs_mesg",7,"type")="char"
+	Set gtmtypfldindx("ipcs_mesg","fn")=7
 	;
 	Set gtmtypes("jext_heap_elem_t")="struct"
 	Set gtmtypes("jext_heap_elem_t",0)=2
@@ -10236,7 +10460,7 @@ Init
 	Set gtmtypfldindx("jnl_fence_control","strm_seqno")=4
 	;
 	Set gtmtypes("jnl_file_header")="struct"
-	Set gtmtypes("jnl_file_header",0)=66
+	Set gtmtypes("jnl_file_header",0)=67
 	Set gtmtypes("jnl_file_header","len")=2048
 	Set gtmtypes("jnl_file_header",1,"name")="jnl_file_header.label"
 	Set gtmtypes("jnl_file_header",1,"off")=0
@@ -10565,11 +10789,16 @@ Init
 	Set gtmtypes("jnl_file_header",65,"len")=4
 	Set gtmtypes("jnl_file_header",65,"type")="boolean_t"
 	Set gtmtypfldindx("jnl_file_header","last_eof_written")=65
-	Set gtmtypes("jnl_file_header",66,"name")="jnl_file_header.filler"
+	Set gtmtypes("jnl_file_header",66,"name")="jnl_file_header.is_not_latest_jnl"
 	Set gtmtypes("jnl_file_header",66,"off")=1612
-	Set gtmtypes("jnl_file_header",66,"len")=436
-	Set gtmtypes("jnl_file_header",66,"type")="char"
-	Set gtmtypfldindx("jnl_file_header","filler")=66
+	Set gtmtypes("jnl_file_header",66,"len")=4
+	Set gtmtypes("jnl_file_header",66,"type")="boolean_t"
+	Set gtmtypfldindx("jnl_file_header","is_not_latest_jnl")=66
+	Set gtmtypes("jnl_file_header",67,"name")="jnl_file_header.filler"
+	Set gtmtypes("jnl_file_header",67,"off")=1616
+	Set gtmtypes("jnl_file_header",67,"len")=432
+	Set gtmtypes("jnl_file_header",67,"type")="char"
+	Set gtmtypfldindx("jnl_file_header","filler")=67
 	;
 	Set gtmtypes("jnl_format_buffer")="struct"
 	Set gtmtypes("jnl_format_buffer",0)=14
@@ -10646,7 +10875,7 @@ Init
 	Set gtmtypfldindx("jnl_format_buffer","alt_buff")=14
 	;
 	Set gtmtypes("jnl_gbls_t")="struct"
-	Set gtmtypes("jnl_gbls_t",0)=26
+	Set gtmtypes("jnl_gbls_t",0)=27
 	Set gtmtypes("jnl_gbls_t","len")=128
 	Set gtmtypes("jnl_gbls_t",1,"name")="jnl_gbls_t.mur_jrec_seqno"
 	Set gtmtypes("jnl_gbls_t",1,"off")=0
@@ -10758,30 +10987,35 @@ Init
 	Set gtmtypes("jnl_gbls_t",22,"len")=4
 	Set gtmtypes("jnl_gbls_t",22,"type")="boolean_t"
 	Set gtmtypfldindx("jnl_gbls_t","mur_options_forward")=22
-	Set gtmtypes("jnl_gbls_t",23,"name")="jnl_gbls_t.onlnrlbk"
+	Set gtmtypes("jnl_gbls_t",23,"name")="jnl_gbls_t.in_mupjnl"
 	Set gtmtypes("jnl_gbls_t",23,"off")=108
 	Set gtmtypes("jnl_gbls_t",23,"len")=4
 	Set gtmtypes("jnl_gbls_t",23,"type")="boolean_t"
-	Set gtmtypfldindx("jnl_gbls_t","onlnrlbk")=23
-	Set gtmtypes("jnl_gbls_t",24,"name")="jnl_gbls_t.mur_extract"
+	Set gtmtypfldindx("jnl_gbls_t","in_mupjnl")=23
+	Set gtmtypes("jnl_gbls_t",24,"name")="jnl_gbls_t.onlnrlbk"
 	Set gtmtypes("jnl_gbls_t",24,"off")=112
 	Set gtmtypes("jnl_gbls_t",24,"len")=4
 	Set gtmtypes("jnl_gbls_t",24,"type")="boolean_t"
-	Set gtmtypfldindx("jnl_gbls_t","mur_extract")=24
-	Set gtmtypes("jnl_gbls_t",25,"name")="jnl_gbls_t.save_dont_reset_gbl_jrec_time"
+	Set gtmtypfldindx("jnl_gbls_t","onlnrlbk")=24
+	Set gtmtypes("jnl_gbls_t",25,"name")="jnl_gbls_t.mur_extract"
 	Set gtmtypes("jnl_gbls_t",25,"off")=116
 	Set gtmtypes("jnl_gbls_t",25,"len")=4
 	Set gtmtypes("jnl_gbls_t",25,"type")="boolean_t"
-	Set gtmtypfldindx("jnl_gbls_t","save_dont_reset_gbl_jrec_time")=25
-	Set gtmtypes("jnl_gbls_t",26,"name")="jnl_gbls_t.mur_update"
+	Set gtmtypfldindx("jnl_gbls_t","mur_extract")=25
+	Set gtmtypes("jnl_gbls_t",26,"name")="jnl_gbls_t.save_dont_reset_gbl_jrec_time"
 	Set gtmtypes("jnl_gbls_t",26,"off")=120
 	Set gtmtypes("jnl_gbls_t",26,"len")=4
 	Set gtmtypes("jnl_gbls_t",26,"type")="boolean_t"
-	Set gtmtypfldindx("jnl_gbls_t","mur_update")=26
+	Set gtmtypfldindx("jnl_gbls_t","save_dont_reset_gbl_jrec_time")=26
+	Set gtmtypes("jnl_gbls_t",27,"name")="jnl_gbls_t.mur_update"
+	Set gtmtypes("jnl_gbls_t",27,"off")=124
+	Set gtmtypes("jnl_gbls_t",27,"len")=4
+	Set gtmtypes("jnl_gbls_t",27,"type")="boolean_t"
+	Set gtmtypfldindx("jnl_gbls_t","mur_update")=27
 	;
 	Set gtmtypes("jnl_private_control")="struct"
-	Set gtmtypes("jnl_private_control",0)=23
-	Set gtmtypes("jnl_private_control","len")=120
+	Set gtmtypes("jnl_private_control",0)=24
+	Set gtmtypes("jnl_private_control","len")=128
 	Set gtmtypes("jnl_private_control",1,"name")="jnl_private_control.jnl_buff"
 	Set gtmtypes("jnl_private_control",1,"off")=0
 	Set gtmtypes("jnl_private_control",1,"len")=8
@@ -10897,6 +11131,11 @@ Init
 	Set gtmtypes("jnl_private_control",23,"len")=4
 	Set gtmtypes("jnl_private_control",23,"type")="unsigned-int"
 	Set gtmtypfldindx("jnl_private_control","cycle")=23
+	Set gtmtypes("jnl_private_control",24,"name")="jnl_private_control.err_str"
+	Set gtmtypes("jnl_private_control",24,"off")=120
+	Set gtmtypes("jnl_private_control",24,"len")=8
+	Set gtmtypes("jnl_private_control",24,"type")="addr"
+	Set gtmtypfldindx("jnl_private_control","err_str")=24
 	;
 	Set gtmtypes("jnl_process_vector")="struct"
 	Set gtmtypes("jnl_process_vector",0)=10
@@ -13244,8 +13483,8 @@ Init
 	Set gtmtypfldindx("mline","table")=6
 	;
 	Set gtmtypes("mliteral")="struct"
-	Set gtmtypes("mliteral",0)=10
-	Set gtmtypes("mliteral","len")=56
+	Set gtmtypes("mliteral",0)=11
+	Set gtmtypes("mliteral","len")=64
 	Set gtmtypes("mliteral",1,"name")="mliteral.que"
 	Set gtmtypes("mliteral",1,"off")=0
 	Set gtmtypes("mliteral",1,"len")=16
@@ -13266,37 +13505,42 @@ Init
 	Set gtmtypes("mliteral",4,"len")=8
 	Set gtmtypes("mliteral",4,"type")="intptr_t"
 	Set gtmtypfldindx("mliteral","rt_addr")=4
-	Set gtmtypes("mliteral",5,"name")="mliteral.v"
+	Set gtmtypes("mliteral",5,"name")="mliteral.reference_count"
 	Set gtmtypes("mliteral",5,"off")=24
-	Set gtmtypes("mliteral",5,"len")=32
-	Set gtmtypes("mliteral",5,"type")="mval"
-	Set gtmtypfldindx("mliteral","v")=5
-	Set gtmtypes("mliteral",6,"name")="mliteral.v.mvtype"
-	Set gtmtypes("mliteral",6,"off")=24
-	Set gtmtypes("mliteral",6,"len")=2
-	Set gtmtypes("mliteral",6,"type")="unsigned-short"
-	Set gtmtypfldindx("mliteral","v.mvtype")=6
-	Set gtmtypes("mliteral",7,"name")="mliteral.v.fnpc_indx"
-	Set gtmtypes("mliteral",7,"off")=27
-	Set gtmtypes("mliteral",7,"len")=1
-	Set gtmtypes("mliteral",7,"type")="unsigned-char"
-	Set gtmtypfldindx("mliteral","v.fnpc_indx")=7
-	Set gtmtypes("mliteral",8,"name")="mliteral.v.utfcgr_indx"
-	Set gtmtypes("mliteral",8,"off")=28
-	Set gtmtypes("mliteral",8,"len")=4
-	Set gtmtypes("mliteral",8,"type")="unsigned-int"
-	Set gtmtypfldindx("mliteral","v.utfcgr_indx")=8
-	Set gtmtypes("mliteral",9,"name")="mliteral.v.m"
-	Set gtmtypes("mliteral",9,"off")=32
-	Set gtmtypes("mliteral",9,"len")=8
-	Set gtmtypes("mliteral",9,"type")="int"
-	Set gtmtypfldindx("mliteral","v.m")=9
-	Set gtmtypes("mliteral",9,"dim")=2
-	Set gtmtypes("mliteral",10,"name")="mliteral.v.str"
+	Set gtmtypes("mliteral",5,"len")=4
+	Set gtmtypes("mliteral",5,"type")="int"
+	Set gtmtypfldindx("mliteral","reference_count")=5
+	Set gtmtypes("mliteral",6,"name")="mliteral.v"
+	Set gtmtypes("mliteral",6,"off")=32
+	Set gtmtypes("mliteral",6,"len")=32
+	Set gtmtypes("mliteral",6,"type")="mval"
+	Set gtmtypfldindx("mliteral","v")=6
+	Set gtmtypes("mliteral",7,"name")="mliteral.v.mvtype"
+	Set gtmtypes("mliteral",7,"off")=32
+	Set gtmtypes("mliteral",7,"len")=2
+	Set gtmtypes("mliteral",7,"type")="unsigned-short"
+	Set gtmtypfldindx("mliteral","v.mvtype")=7
+	Set gtmtypes("mliteral",8,"name")="mliteral.v.fnpc_indx"
+	Set gtmtypes("mliteral",8,"off")=35
+	Set gtmtypes("mliteral",8,"len")=1
+	Set gtmtypes("mliteral",8,"type")="unsigned-char"
+	Set gtmtypfldindx("mliteral","v.fnpc_indx")=8
+	Set gtmtypes("mliteral",9,"name")="mliteral.v.utfcgr_indx"
+	Set gtmtypes("mliteral",9,"off")=36
+	Set gtmtypes("mliteral",9,"len")=4
+	Set gtmtypes("mliteral",9,"type")="unsigned-int"
+	Set gtmtypfldindx("mliteral","v.utfcgr_indx")=9
+	Set gtmtypes("mliteral",10,"name")="mliteral.v.m"
 	Set gtmtypes("mliteral",10,"off")=40
-	Set gtmtypes("mliteral",10,"len")=16
-	Set gtmtypes("mliteral",10,"type")="mstr"
-	Set gtmtypfldindx("mliteral","v.str")=10
+	Set gtmtypes("mliteral",10,"len")=8
+	Set gtmtypes("mliteral",10,"type")="int"
+	Set gtmtypfldindx("mliteral","v.m")=10
+	Set gtmtypes("mliteral",10,"dim")=2
+	Set gtmtypes("mliteral",11,"name")="mliteral.v.str"
+	Set gtmtypes("mliteral",11,"off")=48
+	Set gtmtypes("mliteral",11,"len")=16
+	Set gtmtypes("mliteral",11,"type")="mstr"
+	Set gtmtypfldindx("mliteral","v.str")=11
 	;
 	Set gtmtypes("mlk_ctldata")="struct"
 	Set gtmtypes("mlk_ctldata",0)=12
@@ -13627,10 +13871,10 @@ Init
 	;
 	Set gtmtypes("modrm_byte_type")="union"
 	Set gtmtypes("modrm_byte_type",0)=2
-	Set gtmtypes("modrm_byte_type","len")=4
+	Set gtmtypes("modrm_byte_type","len")=1
 	Set gtmtypes("modrm_byte_type",1,"name")="modrm_byte_type.modrm"
 	Set gtmtypes("modrm_byte_type",1,"off")=0
-	Set gtmtypes("modrm_byte_type",1,"len")=4
+	Set gtmtypes("modrm_byte_type",1,"len")=1
 	Set gtmtypes("modrm_byte_type",1,"type")="ModR_M"
 	Set gtmtypfldindx("modrm_byte_type","modrm")=1
 	Set gtmtypes("modrm_byte_type",2,"name")="modrm_byte_type.byte"
@@ -16871,8 +17115,8 @@ Init
 	Set gtmtypfldindx("nametabent","name")=2
 	;
 	Set gtmtypes("node_local")="struct"
-	Set gtmtypes("node_local",0)=209
-	Set gtmtypes("node_local","len")=63792
+	Set gtmtypes("node_local",0)=247
+	Set gtmtypes("node_local","len")=121528
 	Set gtmtypes("node_local",1,"name")="node_local.label"
 	Set gtmtypes("node_local",1,"off")=0
 	Set gtmtypes("node_local",1,"len")=12
@@ -17144,790 +17388,981 @@ Init
 	Set gtmtypes("node_local",54,"len")=60
 	Set gtmtypes("node_local",54,"type")="char"
 	Set gtmtypfldindx("node_local","fill_cacheline9")=54
-	Set gtmtypes("node_local",55,"name")="node_local.mm_extender_pid"
+	Set gtmtypes("node_local",55,"name")="node_local.wcs_wip_lvl"
 	Set gtmtypes("node_local",55,"off")=1288
 	Set gtmtypes("node_local",55,"len")=4
 	Set gtmtypes("node_local",55,"type")="int"
-	Set gtmtypfldindx("node_local","mm_extender_pid")=55
-	Set gtmtypes("node_local",56,"name")="node_local.highest_lbm_blk_changed"
+	Set gtmtypfldindx("node_local","wcs_wip_lvl")=55
+	Set gtmtypes("node_local",56,"name")="node_local.fill_cacheline10"
 	Set gtmtypes("node_local",56,"off")=1292
-	Set gtmtypes("node_local",56,"len")=4
-	Set gtmtypes("node_local",56,"type")="int"
-	Set gtmtypfldindx("node_local","highest_lbm_blk_changed")=56
-	Set gtmtypes("node_local",57,"name")="node_local.nbb"
-	Set gtmtypes("node_local",57,"off")=1296
+	Set gtmtypes("node_local",56,"len")=60
+	Set gtmtypes("node_local",56,"type")="char"
+	Set gtmtypfldindx("node_local","fill_cacheline10")=56
+	Set gtmtypes("node_local",57,"name")="node_local.wtfini_in_prog"
+	Set gtmtypes("node_local",57,"off")=1352
 	Set gtmtypes("node_local",57,"len")=4
 	Set gtmtypes("node_local",57,"type")="int"
-	Set gtmtypfldindx("node_local","nbb")=57
-	Set gtmtypes("node_local",58,"name")="node_local.lockhist_idx"
-	Set gtmtypes("node_local",58,"off")=1300
+	Set gtmtypfldindx("node_local","wtfini_in_prog")=57
+	Set gtmtypes("node_local",58,"name")="node_local.freezer_waited_for_kip"
+	Set gtmtypes("node_local",58,"off")=1356
 	Set gtmtypes("node_local",58,"len")=4
-	Set gtmtypes("node_local",58,"type")="int"
-	Set gtmtypfldindx("node_local","lockhist_idx")=58
-	Set gtmtypes("node_local",59,"name")="node_local.crit_ops_index"
-	Set gtmtypes("node_local",59,"off")=1304
+	Set gtmtypes("node_local",58,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","freezer_waited_for_kip")=58
+	Set gtmtypes("node_local",59,"name")="node_local.mm_extender_pid"
+	Set gtmtypes("node_local",59,"off")=1360
 	Set gtmtypes("node_local",59,"len")=4
 	Set gtmtypes("node_local",59,"type")="int"
-	Set gtmtypfldindx("node_local","crit_ops_index")=59
-	Set gtmtypes("node_local",60,"name")="node_local.dskread_ops_index"
-	Set gtmtypes("node_local",60,"off")=1308
+	Set gtmtypfldindx("node_local","mm_extender_pid")=59
+	Set gtmtypes("node_local",60,"name")="node_local.highest_lbm_blk_changed"
+	Set gtmtypes("node_local",60,"off")=1364
 	Set gtmtypes("node_local",60,"len")=4
 	Set gtmtypes("node_local",60,"type")="int"
-	Set gtmtypfldindx("node_local","dskread_ops_index")=60
-	Set gtmtypes("node_local",61,"name")="node_local.ftok_ops_index"
-	Set gtmtypes("node_local",61,"off")=1312
+	Set gtmtypfldindx("node_local","highest_lbm_blk_changed")=60
+	Set gtmtypes("node_local",61,"name")="node_local.nbb"
+	Set gtmtypes("node_local",61,"off")=1368
 	Set gtmtypes("node_local",61,"len")=4
 	Set gtmtypes("node_local",61,"type")="int"
-	Set gtmtypfldindx("node_local","ftok_ops_index")=61
-	Set gtmtypes("node_local",62,"name")="node_local.lockhists"
-	Set gtmtypes("node_local",62,"off")=1320
-	Set gtmtypes("node_local",62,"len")=16384
-	Set gtmtypes("node_local",62,"type")="lockhist"
-	Set gtmtypfldindx("node_local","lockhists")=62
-	Set gtmtypes("node_local",62,"dim")=512
-	Set gtmtypes("node_local",63,"name")="node_local.lockhists[0].lock_addr"
-	Set gtmtypes("node_local",63,"off")=1320
-	Set gtmtypes("node_local",63,"len")=8
-	Set gtmtypes("node_local",63,"type")="addr"
-	Set gtmtypfldindx("node_local","lockhists[0].lock_addr")=63
-	Set gtmtypes("node_local",64,"name")="node_local.lockhists[0].lock_callr"
-	Set gtmtypes("node_local",64,"off")=1328
-	Set gtmtypes("node_local",64,"len")=8
-	Set gtmtypes("node_local",64,"type")="caddr_t"
-	Set gtmtypfldindx("node_local","lockhists[0].lock_callr")=64
-	Set gtmtypes("node_local",65,"name")="node_local.lockhists[0].lock_pid"
-	Set gtmtypes("node_local",65,"off")=1336
+	Set gtmtypfldindx("node_local","nbb")=61
+	Set gtmtypes("node_local",62,"name")="node_local.lockhist_idx"
+	Set gtmtypes("node_local",62,"off")=1372
+	Set gtmtypes("node_local",62,"len")=4
+	Set gtmtypes("node_local",62,"type")="int"
+	Set gtmtypfldindx("node_local","lockhist_idx")=62
+	Set gtmtypes("node_local",63,"name")="node_local.crit_ops_index"
+	Set gtmtypes("node_local",63,"off")=1376
+	Set gtmtypes("node_local",63,"len")=4
+	Set gtmtypes("node_local",63,"type")="int"
+	Set gtmtypfldindx("node_local","crit_ops_index")=63
+	Set gtmtypes("node_local",64,"name")="node_local.dskread_ops_index"
+	Set gtmtypes("node_local",64,"off")=1380
+	Set gtmtypes("node_local",64,"len")=4
+	Set gtmtypes("node_local",64,"type")="int"
+	Set gtmtypfldindx("node_local","dskread_ops_index")=64
+	Set gtmtypes("node_local",65,"name")="node_local.ftok_ops_index"
+	Set gtmtypes("node_local",65,"off")=1384
 	Set gtmtypes("node_local",65,"len")=4
 	Set gtmtypes("node_local",65,"type")="int"
-	Set gtmtypfldindx("node_local","lockhists[0].lock_pid")=65
-	Set gtmtypes("node_local",66,"name")="node_local.lockhists[0].loop_cnt"
-	Set gtmtypes("node_local",66,"off")=1340
+	Set gtmtypfldindx("node_local","ftok_ops_index")=65
+	Set gtmtypes("node_local",66,"name")="node_local.wcs_ops_index"
+	Set gtmtypes("node_local",66,"off")=1388
 	Set gtmtypes("node_local",66,"len")=4
 	Set gtmtypes("node_local",66,"type")="int"
-	Set gtmtypfldindx("node_local","lockhists[0].loop_cnt")=66
-	Set gtmtypes("node_local",67,"name")="node_local.lockhists[0].lock_op"
-	Set gtmtypes("node_local",67,"off")=1344
-	Set gtmtypes("node_local",67,"len")=4
-	Set gtmtypes("node_local",67,"type")="char"
-	Set gtmtypfldindx("node_local","lockhists[0].lock_op")=67
-	Set gtmtypes("node_local",68,"name")="node_local.crit_ops_array"
-	Set gtmtypes("node_local",68,"off")=17704
-	Set gtmtypes("node_local",68,"len")=12288
-	Set gtmtypes("node_local",68,"type")="crit_trace"
-	Set gtmtypfldindx("node_local","crit_ops_array")=68
-	Set gtmtypes("node_local",68,"dim")=512
-	Set gtmtypes("node_local",69,"name")="node_local.crit_ops_array[0].call_from"
-	Set gtmtypes("node_local",69,"off")=17704
+	Set gtmtypfldindx("node_local","wcs_ops_index")=66
+	Set gtmtypes("node_local",67,"name")="node_local.lockhists"
+	Set gtmtypes("node_local",67,"off")=1392
+	Set gtmtypes("node_local",67,"len")=16384
+	Set gtmtypes("node_local",67,"type")="lockhist"
+	Set gtmtypfldindx("node_local","lockhists")=67
+	Set gtmtypes("node_local",67,"dim")=512
+	Set gtmtypes("node_local",68,"name")="node_local.lockhists[0].lock_addr"
+	Set gtmtypes("node_local",68,"off")=1392
+	Set gtmtypes("node_local",68,"len")=8
+	Set gtmtypes("node_local",68,"type")="addr"
+	Set gtmtypfldindx("node_local","lockhists[0].lock_addr")=68
+	Set gtmtypes("node_local",69,"name")="node_local.lockhists[0].lock_callr"
+	Set gtmtypes("node_local",69,"off")=1400
 	Set gtmtypes("node_local",69,"len")=8
 	Set gtmtypes("node_local",69,"type")="caddr_t"
-	Set gtmtypfldindx("node_local","crit_ops_array[0].call_from")=69
-	Set gtmtypes("node_local",70,"name")="node_local.crit_ops_array[0].crit_act"
-	Set gtmtypes("node_local",70,"off")=17712
+	Set gtmtypfldindx("node_local","lockhists[0].lock_callr")=69
+	Set gtmtypes("node_local",70,"name")="node_local.lockhists[0].lock_pid"
+	Set gtmtypes("node_local",70,"off")=1408
 	Set gtmtypes("node_local",70,"len")=4
 	Set gtmtypes("node_local",70,"type")="int"
-	Set gtmtypfldindx("node_local","crit_ops_array[0].crit_act")=70
-	Set gtmtypes("node_local",71,"name")="node_local.crit_ops_array[0].epid"
-	Set gtmtypes("node_local",71,"off")=17716
+	Set gtmtypfldindx("node_local","lockhists[0].lock_pid")=70
+	Set gtmtypes("node_local",71,"name")="node_local.lockhists[0].loop_cnt"
+	Set gtmtypes("node_local",71,"off")=1412
 	Set gtmtypes("node_local",71,"len")=4
 	Set gtmtypes("node_local",71,"type")="int"
-	Set gtmtypfldindx("node_local","crit_ops_array[0].epid")=71
-	Set gtmtypes("node_local",72,"name")="node_local.crit_ops_array[0].curr_tn"
-	Set gtmtypes("node_local",72,"off")=17720
-	Set gtmtypes("node_local",72,"len")=8
-	Set gtmtypes("node_local",72,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","crit_ops_array[0].curr_tn")=72
-	Set gtmtypes("node_local",73,"name")="node_local.dskread_ops_array"
-	Set gtmtypes("node_local",73,"off")=29992
-	Set gtmtypes("node_local",73,"len")=16384
-	Set gtmtypes("node_local",73,"type")="dskread_trace"
-	Set gtmtypfldindx("node_local","dskread_ops_array")=73
+	Set gtmtypfldindx("node_local","lockhists[0].loop_cnt")=71
+	Set gtmtypes("node_local",72,"name")="node_local.lockhists[0].lock_op"
+	Set gtmtypes("node_local",72,"off")=1416
+	Set gtmtypes("node_local",72,"len")=4
+	Set gtmtypes("node_local",72,"type")="char"
+	Set gtmtypfldindx("node_local","lockhists[0].lock_op")=72
+	Set gtmtypes("node_local",73,"name")="node_local.crit_ops_array"
+	Set gtmtypes("node_local",73,"off")=17776
+	Set gtmtypes("node_local",73,"len")=12288
+	Set gtmtypes("node_local",73,"type")="crit_trace"
+	Set gtmtypfldindx("node_local","crit_ops_array")=73
 	Set gtmtypes("node_local",73,"dim")=512
-	Set gtmtypes("node_local",74,"name")="node_local.dskread_ops_array[0].cr_off"
-	Set gtmtypes("node_local",74,"off")=29992
+	Set gtmtypes("node_local",74,"name")="node_local.crit_ops_array[0].call_from"
+	Set gtmtypes("node_local",74,"off")=17776
 	Set gtmtypes("node_local",74,"len")=8
-	Set gtmtypes("node_local",74,"type")="intptr_t"
-	Set gtmtypfldindx("node_local","dskread_ops_array[0].cr_off")=74
-	Set gtmtypes("node_local",75,"name")="node_local.dskread_ops_array[0].cr_tn"
-	Set gtmtypes("node_local",75,"off")=30000
-	Set gtmtypes("node_local",75,"len")=8
-	Set gtmtypes("node_local",75,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","dskread_ops_array[0].cr_tn")=75
-	Set gtmtypes("node_local",76,"name")="node_local.dskread_ops_array[0].process_id"
-	Set gtmtypes("node_local",76,"off")=30008
+	Set gtmtypes("node_local",74,"type")="caddr_t"
+	Set gtmtypfldindx("node_local","crit_ops_array[0].call_from")=74
+	Set gtmtypes("node_local",75,"name")="node_local.crit_ops_array[0].crit_act"
+	Set gtmtypes("node_local",75,"off")=17784
+	Set gtmtypes("node_local",75,"len")=4
+	Set gtmtypes("node_local",75,"type")="int"
+	Set gtmtypfldindx("node_local","crit_ops_array[0].crit_act")=75
+	Set gtmtypes("node_local",76,"name")="node_local.crit_ops_array[0].epid"
+	Set gtmtypes("node_local",76,"off")=17788
 	Set gtmtypes("node_local",76,"len")=4
-	Set gtmtypes("node_local",76,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","dskread_ops_array[0].process_id")=76
-	Set gtmtypes("node_local",77,"name")="node_local.dskread_ops_array[0].blk"
-	Set gtmtypes("node_local",77,"off")=30012
-	Set gtmtypes("node_local",77,"len")=4
-	Set gtmtypes("node_local",77,"type")="int"
-	Set gtmtypfldindx("node_local","dskread_ops_array[0].blk")=77
-	Set gtmtypes("node_local",78,"name")="node_local.dskread_ops_array[0].cycle"
-	Set gtmtypes("node_local",78,"off")=30016
-	Set gtmtypes("node_local",78,"len")=4
-	Set gtmtypes("node_local",78,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","dskread_ops_array[0].cycle")=78
-	Set gtmtypes("node_local",79,"name")="node_local.unique_id"
-	Set gtmtypes("node_local",79,"off")=46376
-	Set gtmtypes("node_local",79,"len")=24
-	Set gtmtypes("node_local",79,"type")="unique_file_id"
-	Set gtmtypfldindx("node_local","unique_id")=79
-	Set gtmtypes("node_local",80,"name")="node_local.unique_id.uid"
-	Set gtmtypes("node_local",80,"off")=46376
-	Set gtmtypes("node_local",80,"len")=24
-	Set gtmtypes("node_local",80,"type")="unix_file_id"
-	Set gtmtypfldindx("node_local","unique_id.uid")=80
-	Set gtmtypes("node_local",81,"name")="node_local.unique_id.file_id"
-	Set gtmtypes("node_local",81,"off")=46376
-	Set gtmtypes("node_local",81,"len")=24
-	Set gtmtypes("node_local",81,"type")="char"
-	Set gtmtypfldindx("node_local","unique_id.file_id")=81
-	Set gtmtypes("node_local",82,"name")="node_local.owner_node"
-	Set gtmtypes("node_local",82,"off")=46400
+	Set gtmtypes("node_local",76,"type")="int"
+	Set gtmtypfldindx("node_local","crit_ops_array[0].epid")=76
+	Set gtmtypes("node_local",77,"name")="node_local.crit_ops_array[0].curr_tn"
+	Set gtmtypes("node_local",77,"off")=17792
+	Set gtmtypes("node_local",77,"len")=8
+	Set gtmtypes("node_local",77,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","crit_ops_array[0].curr_tn")=77
+	Set gtmtypes("node_local",78,"name")="node_local.dskread_ops_array"
+	Set gtmtypes("node_local",78,"off")=30064
+	Set gtmtypes("node_local",78,"len")=16384
+	Set gtmtypes("node_local",78,"type")="dskread_trace"
+	Set gtmtypfldindx("node_local","dskread_ops_array")=78
+	Set gtmtypes("node_local",78,"dim")=512
+	Set gtmtypes("node_local",79,"name")="node_local.dskread_ops_array[0].cr_off"
+	Set gtmtypes("node_local",79,"off")=30064
+	Set gtmtypes("node_local",79,"len")=8
+	Set gtmtypes("node_local",79,"type")="intptr_t"
+	Set gtmtypfldindx("node_local","dskread_ops_array[0].cr_off")=79
+	Set gtmtypes("node_local",80,"name")="node_local.dskread_ops_array[0].cr_tn"
+	Set gtmtypes("node_local",80,"off")=30072
+	Set gtmtypes("node_local",80,"len")=8
+	Set gtmtypes("node_local",80,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","dskread_ops_array[0].cr_tn")=80
+	Set gtmtypes("node_local",81,"name")="node_local.dskread_ops_array[0].process_id"
+	Set gtmtypes("node_local",81,"off")=30080
+	Set gtmtypes("node_local",81,"len")=4
+	Set gtmtypes("node_local",81,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","dskread_ops_array[0].process_id")=81
+	Set gtmtypes("node_local",82,"name")="node_local.dskread_ops_array[0].blk"
+	Set gtmtypes("node_local",82,"off")=30084
 	Set gtmtypes("node_local",82,"len")=4
-	Set gtmtypes("node_local",82,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","owner_node")=82
-	Set gtmtypes("node_local",83,"name")="node_local.wcsflu_pid"
-	Set gtmtypes("node_local",83,"off")=46404
+	Set gtmtypes("node_local",82,"type")="int"
+	Set gtmtypfldindx("node_local","dskread_ops_array[0].blk")=82
+	Set gtmtypes("node_local",83,"name")="node_local.dskread_ops_array[0].cycle"
+	Set gtmtypes("node_local",83,"off")=30088
 	Set gtmtypes("node_local",83,"len")=4
-	Set gtmtypes("node_local",83,"type")="int"
-	Set gtmtypfldindx("node_local","wcsflu_pid")=83
-	Set gtmtypes("node_local",84,"name")="node_local.creation_date_time4"
-	Set gtmtypes("node_local",84,"off")=46408
-	Set gtmtypes("node_local",84,"len")=4
-	Set gtmtypes("node_local",84,"type")="int"
-	Set gtmtypfldindx("node_local","creation_date_time4")=84
-	Set gtmtypes("node_local",85,"name")="node_local.inhibit_kills"
-	Set gtmtypes("node_local",85,"off")=46412
-	Set gtmtypes("node_local",85,"len")=4
-	Set gtmtypes("node_local",85,"type")="int"
-	Set gtmtypfldindx("node_local","inhibit_kills")=85
-	Set gtmtypes("node_local",86,"name")="node_local.remove_shm"
-	Set gtmtypes("node_local",86,"off")=46416
+	Set gtmtypes("node_local",83,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","dskread_ops_array[0].cycle")=83
+	Set gtmtypes("node_local",84,"name")="node_local.wcs_ops_array"
+	Set gtmtypes("node_local",84,"off")=46448
+	Set gtmtypes("node_local",84,"len")=57344
+	Set gtmtypes("node_local",84,"type")="wcs_ops_trace_t"
+	Set gtmtypfldindx("node_local","wcs_ops_array")=84
+	Set gtmtypes("node_local",84,"dim")=1024
+	Set gtmtypes("node_local",85,"name")="node_local.wcs_ops_array[0].db_tn"
+	Set gtmtypes("node_local",85,"off")=46448
+	Set gtmtypes("node_local",85,"len")=8
+	Set gtmtypes("node_local",85,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","wcs_ops_array[0].db_tn")=85
+	Set gtmtypes("node_local",86,"name")="node_local.wcs_ops_array[0].process_id"
+	Set gtmtypes("node_local",86,"off")=46456
 	Set gtmtypes("node_local",86,"len")=4
-	Set gtmtypes("node_local",86,"type")="boolean_t"
-	Set gtmtypfldindx("node_local","remove_shm")=86
-	Set gtmtypes("node_local",87,"name")="node_local.jnl_file"
-	Set gtmtypes("node_local",87,"off")=46424
-	Set gtmtypes("node_local",87,"len")=32
-	Set gtmtypes("node_local",87,"type")="union"
-	Set gtmtypfldindx("node_local","jnl_file")=87
-	Set gtmtypes("node_local",88,"name")="node_local.jnl_file.jnl_file_id"
-	Set gtmtypes("node_local",88,"off")=46424
-	Set gtmtypes("node_local",88,"len")=28
-	Set gtmtypes("node_local",88,"type")="gds_file_id"
-	Set gtmtypfldindx("node_local","jnl_file.jnl_file_id")=88
-	Set gtmtypes("node_local",89,"name")="node_local.jnl_file.jnl_file_id.dvi"
-	Set gtmtypes("node_local",89,"off")=46424
-	Set gtmtypes("node_local",89,"len")=16
-	Set gtmtypes("node_local",89,"type")="char"
-	Set gtmtypfldindx("node_local","jnl_file.jnl_file_id.dvi")=89
-	Set gtmtypes("node_local",90,"name")="node_local.jnl_file.jnl_file_id.did"
-	Set gtmtypes("node_local",90,"off")=46440
-	Set gtmtypes("node_local",90,"len")=6
-	Set gtmtypes("node_local",90,"type")="unsigned-short"
-	Set gtmtypfldindx("node_local","jnl_file.jnl_file_id.did")=90
-	Set gtmtypes("node_local",90,"dim")=3
-	Set gtmtypes("node_local",91,"name")="node_local.jnl_file.jnl_file_id.fid"
-	Set gtmtypes("node_local",91,"off")=46446
-	Set gtmtypes("node_local",91,"len")=6
-	Set gtmtypes("node_local",91,"type")="unsigned-short"
-	Set gtmtypfldindx("node_local","jnl_file.jnl_file_id.fid")=91
-	Set gtmtypes("node_local",91,"dim")=3
-	Set gtmtypes("node_local",92,"name")="node_local.jnl_file.u"
-	Set gtmtypes("node_local",92,"off")=46424
-	Set gtmtypes("node_local",92,"len")=24
-	Set gtmtypes("node_local",92,"type")="unix_file_id"
-	Set gtmtypfldindx("node_local","jnl_file.u")=92
-	Set gtmtypes("node_local",93,"name")="node_local.jnl_file.u.inode"
-	Set gtmtypes("node_local",93,"off")=46424
+	Set gtmtypes("node_local",86,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","wcs_ops_array[0].process_id")=86
+	Set gtmtypes("node_local",87,"name")="node_local.wcs_ops_array[0].wc_in_free"
+	Set gtmtypes("node_local",87,"off")=46460
+	Set gtmtypes("node_local",87,"len")=4
+	Set gtmtypes("node_local",87,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","wcs_ops_array[0].wc_in_free")=87
+	Set gtmtypes("node_local",88,"name")="node_local.wcs_ops_array[0].wcs_active_lvl"
+	Set gtmtypes("node_local",88,"off")=46464
+	Set gtmtypes("node_local",88,"len")=4
+	Set gtmtypes("node_local",88,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","wcs_ops_array[0].wcs_active_lvl")=88
+	Set gtmtypes("node_local",89,"name")="node_local.wcs_ops_array[0].wcs_wip_lvl"
+	Set gtmtypes("node_local",89,"off")=46468
+	Set gtmtypes("node_local",89,"len")=4
+	Set gtmtypes("node_local",89,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","wcs_ops_array[0].wcs_wip_lvl")=89
+	Set gtmtypes("node_local",90,"name")="node_local.wcs_ops_array[0].type"
+	Set gtmtypes("node_local",90,"off")=46472
+	Set gtmtypes("node_local",90,"len")=4
+	Set gtmtypes("node_local",90,"type")="int"
+	Set gtmtypfldindx("node_local","wcs_ops_array[0].type")=90
+	Set gtmtypes("node_local",91,"name")="node_local.wcs_ops_array[0].blk"
+	Set gtmtypes("node_local",91,"off")=46476
+	Set gtmtypes("node_local",91,"len")=4
+	Set gtmtypes("node_local",91,"type")="int"
+	Set gtmtypfldindx("node_local","wcs_ops_array[0].blk")=91
+	Set gtmtypes("node_local",92,"name")="node_local.wcs_ops_array[0].cr_off"
+	Set gtmtypes("node_local",92,"off")=46480
+	Set gtmtypes("node_local",92,"len")=8
+	Set gtmtypes("node_local",92,"type")="intptr_t"
+	Set gtmtypfldindx("node_local","wcs_ops_array[0].cr_off")=92
+	Set gtmtypes("node_local",93,"name")="node_local.wcs_ops_array[0].cr_dirty"
+	Set gtmtypes("node_local",93,"off")=46488
 	Set gtmtypes("node_local",93,"len")=8
-	Set gtmtypes("node_local",93,"type")="ino_t"
-	Set gtmtypfldindx("node_local","jnl_file.u.inode")=93
-	Set gtmtypes("node_local",94,"name")="node_local.jnl_file.u.device"
-	Set gtmtypes("node_local",94,"off")=46432
-	Set gtmtypes("node_local",94,"len")=8
-	Set gtmtypes("node_local",94,"type")="dev_t"
-	Set gtmtypfldindx("node_local","jnl_file.u.device")=94
-	Set gtmtypes("node_local",95,"name")="node_local.jnl_file.u.st_gen"
-	Set gtmtypes("node_local",95,"off")=46440
+	Set gtmtypes("node_local",93,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","wcs_ops_array[0].cr_dirty")=93
+	Set gtmtypes("node_local",94,"name")="node_local.wcs_ops_array[0].detail1"
+	Set gtmtypes("node_local",94,"off")=46496
+	Set gtmtypes("node_local",94,"len")=4
+	Set gtmtypes("node_local",94,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","wcs_ops_array[0].detail1")=94
+	Set gtmtypes("node_local",95,"name")="node_local.wcs_ops_array[0].detail2"
+	Set gtmtypes("node_local",95,"off")=46500
 	Set gtmtypes("node_local",95,"len")=4
 	Set gtmtypes("node_local",95,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","jnl_file.u.st_gen")=95
-	Set gtmtypes("node_local",96,"name")="node_local.donotflush_dbjnl"
-	Set gtmtypes("node_local",96,"off")=46456
-	Set gtmtypes("node_local",96,"len")=4
-	Set gtmtypes("node_local",96,"type")="boolean_t"
-	Set gtmtypfldindx("node_local","donotflush_dbjnl")=96
-	Set gtmtypes("node_local",97,"name")="node_local.n_pre_read"
-	Set gtmtypes("node_local",97,"off")=46460
-	Set gtmtypes("node_local",97,"len")=4
-	Set gtmtypes("node_local",97,"type")="int"
-	Set gtmtypfldindx("node_local","n_pre_read")=97
-	Set gtmtypes("node_local",98,"name")="node_local.replinstfilename"
-	Set gtmtypes("node_local",98,"off")=46464
-	Set gtmtypes("node_local",98,"len")=256
+	Set gtmtypfldindx("node_local","wcs_ops_array[0].detail2")=95
+	Set gtmtypes("node_local",96,"name")="node_local.unique_id"
+	Set gtmtypes("node_local",96,"off")=103792
+	Set gtmtypes("node_local",96,"len")=24
+	Set gtmtypes("node_local",96,"type")="unique_file_id"
+	Set gtmtypfldindx("node_local","unique_id")=96
+	Set gtmtypes("node_local",97,"name")="node_local.unique_id.uid"
+	Set gtmtypes("node_local",97,"off")=103792
+	Set gtmtypes("node_local",97,"len")=24
+	Set gtmtypes("node_local",97,"type")="unix_file_id"
+	Set gtmtypfldindx("node_local","unique_id.uid")=97
+	Set gtmtypes("node_local",98,"name")="node_local.unique_id.file_id"
+	Set gtmtypes("node_local",98,"off")=103792
+	Set gtmtypes("node_local",98,"len")=24
 	Set gtmtypes("node_local",98,"type")="char"
-	Set gtmtypfldindx("node_local","replinstfilename")=98
-	Set gtmtypes("node_local",99,"name")="node_local.secshr_ops_index"
-	Set gtmtypes("node_local",99,"off")=46720
+	Set gtmtypfldindx("node_local","unique_id.file_id")=98
+	Set gtmtypes("node_local",99,"name")="node_local.owner_node"
+	Set gtmtypes("node_local",99,"off")=103816
 	Set gtmtypes("node_local",99,"len")=4
-	Set gtmtypes("node_local",99,"type")="int"
-	Set gtmtypfldindx("node_local","secshr_ops_index")=99
-	Set gtmtypes("node_local",100,"name")="node_local.secshr_ops_array"
-	Set gtmtypes("node_local",100,"off")=46728
-	Set gtmtypes("node_local",100,"len")=8184
-	Set gtmtypes("node_local",100,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","secshr_ops_array")=100
-	Set gtmtypes("node_local",100,"dim")=1023
-	Set gtmtypes("node_local",101,"name")="node_local.gvstats_rec"
-	Set gtmtypes("node_local",101,"off")=54912
-	Set gtmtypes("node_local",101,"len")=464
-	Set gtmtypes("node_local",101,"type")="gvstats_rec_t"
-	Set gtmtypfldindx("node_local","gvstats_rec")=101
-	Set gtmtypes("node_local",102,"name")="node_local.gvstats_rec.n_set"
-	Set gtmtypes("node_local",102,"off")=54912
-	Set gtmtypes("node_local",102,"len")=8
-	Set gtmtypes("node_local",102,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_set")=102
-	Set gtmtypes("node_local",103,"name")="node_local.gvstats_rec.n_kill"
-	Set gtmtypes("node_local",103,"off")=54920
-	Set gtmtypes("node_local",103,"len")=8
-	Set gtmtypes("node_local",103,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_kill")=103
-	Set gtmtypes("node_local",104,"name")="node_local.gvstats_rec.n_get"
-	Set gtmtypes("node_local",104,"off")=54928
-	Set gtmtypes("node_local",104,"len")=8
-	Set gtmtypes("node_local",104,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_get")=104
-	Set gtmtypes("node_local",105,"name")="node_local.gvstats_rec.n_data"
-	Set gtmtypes("node_local",105,"off")=54936
-	Set gtmtypes("node_local",105,"len")=8
-	Set gtmtypes("node_local",105,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_data")=105
-	Set gtmtypes("node_local",106,"name")="node_local.gvstats_rec.n_order"
-	Set gtmtypes("node_local",106,"off")=54944
-	Set gtmtypes("node_local",106,"len")=8
-	Set gtmtypes("node_local",106,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_order")=106
-	Set gtmtypes("node_local",107,"name")="node_local.gvstats_rec.n_zprev"
-	Set gtmtypes("node_local",107,"off")=54952
-	Set gtmtypes("node_local",107,"len")=8
-	Set gtmtypes("node_local",107,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_zprev")=107
-	Set gtmtypes("node_local",108,"name")="node_local.gvstats_rec.n_query"
-	Set gtmtypes("node_local",108,"off")=54960
-	Set gtmtypes("node_local",108,"len")=8
-	Set gtmtypes("node_local",108,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_query")=108
-	Set gtmtypes("node_local",109,"name")="node_local.gvstats_rec.n_lock_success"
-	Set gtmtypes("node_local",109,"off")=54968
-	Set gtmtypes("node_local",109,"len")=8
-	Set gtmtypes("node_local",109,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_lock_success")=109
-	Set gtmtypes("node_local",110,"name")="node_local.gvstats_rec.n_lock_fail"
-	Set gtmtypes("node_local",110,"off")=54976
+	Set gtmtypes("node_local",99,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","owner_node")=99
+	Set gtmtypes("node_local",100,"name")="node_local.wcsflu_pid"
+	Set gtmtypes("node_local",100,"off")=103820
+	Set gtmtypes("node_local",100,"len")=4
+	Set gtmtypes("node_local",100,"type")="int"
+	Set gtmtypfldindx("node_local","wcsflu_pid")=100
+	Set gtmtypes("node_local",101,"name")="node_local.creation_date_time4"
+	Set gtmtypes("node_local",101,"off")=103824
+	Set gtmtypes("node_local",101,"len")=4
+	Set gtmtypes("node_local",101,"type")="int"
+	Set gtmtypfldindx("node_local","creation_date_time4")=101
+	Set gtmtypes("node_local",102,"name")="node_local.inhibit_kills"
+	Set gtmtypes("node_local",102,"off")=103828
+	Set gtmtypes("node_local",102,"len")=4
+	Set gtmtypes("node_local",102,"type")="int"
+	Set gtmtypfldindx("node_local","inhibit_kills")=102
+	Set gtmtypes("node_local",103,"name")="node_local.remove_shm"
+	Set gtmtypes("node_local",103,"off")=103832
+	Set gtmtypes("node_local",103,"len")=4
+	Set gtmtypes("node_local",103,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","remove_shm")=103
+	Set gtmtypes("node_local",104,"name")="node_local.jnl_file"
+	Set gtmtypes("node_local",104,"off")=103840
+	Set gtmtypes("node_local",104,"len")=32
+	Set gtmtypes("node_local",104,"type")="union"
+	Set gtmtypfldindx("node_local","jnl_file")=104
+	Set gtmtypes("node_local",105,"name")="node_local.jnl_file.jnl_file_id"
+	Set gtmtypes("node_local",105,"off")=103840
+	Set gtmtypes("node_local",105,"len")=28
+	Set gtmtypes("node_local",105,"type")="gds_file_id"
+	Set gtmtypfldindx("node_local","jnl_file.jnl_file_id")=105
+	Set gtmtypes("node_local",106,"name")="node_local.jnl_file.jnl_file_id.dvi"
+	Set gtmtypes("node_local",106,"off")=103840
+	Set gtmtypes("node_local",106,"len")=16
+	Set gtmtypes("node_local",106,"type")="char"
+	Set gtmtypfldindx("node_local","jnl_file.jnl_file_id.dvi")=106
+	Set gtmtypes("node_local",107,"name")="node_local.jnl_file.jnl_file_id.did"
+	Set gtmtypes("node_local",107,"off")=103856
+	Set gtmtypes("node_local",107,"len")=6
+	Set gtmtypes("node_local",107,"type")="unsigned-short"
+	Set gtmtypfldindx("node_local","jnl_file.jnl_file_id.did")=107
+	Set gtmtypes("node_local",107,"dim")=3
+	Set gtmtypes("node_local",108,"name")="node_local.jnl_file.jnl_file_id.fid"
+	Set gtmtypes("node_local",108,"off")=103862
+	Set gtmtypes("node_local",108,"len")=6
+	Set gtmtypes("node_local",108,"type")="unsigned-short"
+	Set gtmtypfldindx("node_local","jnl_file.jnl_file_id.fid")=108
+	Set gtmtypes("node_local",108,"dim")=3
+	Set gtmtypes("node_local",109,"name")="node_local.jnl_file.u"
+	Set gtmtypes("node_local",109,"off")=103840
+	Set gtmtypes("node_local",109,"len")=24
+	Set gtmtypes("node_local",109,"type")="unix_file_id"
+	Set gtmtypfldindx("node_local","jnl_file.u")=109
+	Set gtmtypes("node_local",110,"name")="node_local.jnl_file.u.inode"
+	Set gtmtypes("node_local",110,"off")=103840
 	Set gtmtypes("node_local",110,"len")=8
-	Set gtmtypes("node_local",110,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_lock_fail")=110
-	Set gtmtypes("node_local",111,"name")="node_local.gvstats_rec.db_curr_tn"
-	Set gtmtypes("node_local",111,"off")=54984
+	Set gtmtypes("node_local",110,"type")="ino_t"
+	Set gtmtypfldindx("node_local","jnl_file.u.inode")=110
+	Set gtmtypes("node_local",111,"name")="node_local.jnl_file.u.device"
+	Set gtmtypes("node_local",111,"off")=103848
 	Set gtmtypes("node_local",111,"len")=8
-	Set gtmtypes("node_local",111,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.db_curr_tn")=111
-	Set gtmtypes("node_local",112,"name")="node_local.gvstats_rec.n_dsk_read"
-	Set gtmtypes("node_local",112,"off")=54992
-	Set gtmtypes("node_local",112,"len")=8
-	Set gtmtypes("node_local",112,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_dsk_read")=112
-	Set gtmtypes("node_local",113,"name")="node_local.gvstats_rec.n_dsk_write"
-	Set gtmtypes("node_local",113,"off")=55000
-	Set gtmtypes("node_local",113,"len")=8
-	Set gtmtypes("node_local",113,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_dsk_write")=113
-	Set gtmtypes("node_local",114,"name")="node_local.gvstats_rec.n_nontp_readwrite"
-	Set gtmtypes("node_local",114,"off")=55008
-	Set gtmtypes("node_local",114,"len")=8
-	Set gtmtypes("node_local",114,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_nontp_readwrite")=114
-	Set gtmtypes("node_local",115,"name")="node_local.gvstats_rec.n_nontp_readonly"
-	Set gtmtypes("node_local",115,"off")=55016
-	Set gtmtypes("node_local",115,"len")=8
-	Set gtmtypes("node_local",115,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_nontp_readonly")=115
-	Set gtmtypes("node_local",116,"name")="node_local.gvstats_rec.n_nontp_blkwrite"
-	Set gtmtypes("node_local",116,"off")=55024
-	Set gtmtypes("node_local",116,"len")=8
-	Set gtmtypes("node_local",116,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_nontp_blkwrite")=116
-	Set gtmtypes("node_local",117,"name")="node_local.gvstats_rec.n_nontp_blkread"
-	Set gtmtypes("node_local",117,"off")=55032
-	Set gtmtypes("node_local",117,"len")=8
-	Set gtmtypes("node_local",117,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_nontp_blkread")=117
-	Set gtmtypes("node_local",118,"name")="node_local.gvstats_rec.n_nontp_retries_0"
-	Set gtmtypes("node_local",118,"off")=55040
-	Set gtmtypes("node_local",118,"len")=8
+	Set gtmtypes("node_local",111,"type")="dev_t"
+	Set gtmtypfldindx("node_local","jnl_file.u.device")=111
+	Set gtmtypes("node_local",112,"name")="node_local.jnl_file.u.st_gen"
+	Set gtmtypes("node_local",112,"off")=103856
+	Set gtmtypes("node_local",112,"len")=4
+	Set gtmtypes("node_local",112,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","jnl_file.u.st_gen")=112
+	Set gtmtypes("node_local",113,"name")="node_local.donotflush_dbjnl"
+	Set gtmtypes("node_local",113,"off")=103872
+	Set gtmtypes("node_local",113,"len")=4
+	Set gtmtypes("node_local",113,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","donotflush_dbjnl")=113
+	Set gtmtypes("node_local",114,"name")="node_local.n_pre_read"
+	Set gtmtypes("node_local",114,"off")=103876
+	Set gtmtypes("node_local",114,"len")=4
+	Set gtmtypes("node_local",114,"type")="int"
+	Set gtmtypfldindx("node_local","n_pre_read")=114
+	Set gtmtypes("node_local",115,"name")="node_local.replinstfilename"
+	Set gtmtypes("node_local",115,"off")=103880
+	Set gtmtypes("node_local",115,"len")=256
+	Set gtmtypes("node_local",115,"type")="char"
+	Set gtmtypfldindx("node_local","replinstfilename")=115
+	Set gtmtypes("node_local",116,"name")="node_local.statsdb_fname"
+	Set gtmtypes("node_local",116,"off")=104136
+	Set gtmtypes("node_local",116,"len")=256
+	Set gtmtypes("node_local",116,"type")="char"
+	Set gtmtypfldindx("node_local","statsdb_fname")=116
+	Set gtmtypes("node_local",117,"name")="node_local.secshr_ops_index"
+	Set gtmtypes("node_local",117,"off")=104392
+	Set gtmtypes("node_local",117,"len")=4
+	Set gtmtypes("node_local",117,"type")="int"
+	Set gtmtypfldindx("node_local","secshr_ops_index")=117
+	Set gtmtypes("node_local",118,"name")="node_local.secshr_ops_array"
+	Set gtmtypes("node_local",118,"off")=104400
+	Set gtmtypes("node_local",118,"len")=8184
 	Set gtmtypes("node_local",118,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_nontp_retries_0")=118
-	Set gtmtypes("node_local",119,"name")="node_local.gvstats_rec.n_nontp_retries_1"
-	Set gtmtypes("node_local",119,"off")=55048
-	Set gtmtypes("node_local",119,"len")=8
-	Set gtmtypes("node_local",119,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_nontp_retries_1")=119
-	Set gtmtypes("node_local",120,"name")="node_local.gvstats_rec.n_nontp_retries_2"
-	Set gtmtypes("node_local",120,"off")=55056
+	Set gtmtypfldindx("node_local","secshr_ops_array")=118
+	Set gtmtypes("node_local",118,"dim")=1023
+	Set gtmtypes("node_local",119,"name")="node_local.gvstats_rec"
+	Set gtmtypes("node_local",119,"off")=112584
+	Set gtmtypes("node_local",119,"len")=472
+	Set gtmtypes("node_local",119,"type")="gvstats_rec_t"
+	Set gtmtypfldindx("node_local","gvstats_rec")=119
+	Set gtmtypes("node_local",120,"name")="node_local.gvstats_rec.n_set"
+	Set gtmtypes("node_local",120,"off")=112584
 	Set gtmtypes("node_local",120,"len")=8
 	Set gtmtypes("node_local",120,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_nontp_retries_2")=120
-	Set gtmtypes("node_local",121,"name")="node_local.gvstats_rec.n_nontp_retries_3"
-	Set gtmtypes("node_local",121,"off")=55064
+	Set gtmtypfldindx("node_local","gvstats_rec.n_set")=120
+	Set gtmtypes("node_local",121,"name")="node_local.gvstats_rec.n_kill"
+	Set gtmtypes("node_local",121,"off")=112592
 	Set gtmtypes("node_local",121,"len")=8
 	Set gtmtypes("node_local",121,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_nontp_retries_3")=121
-	Set gtmtypes("node_local",122,"name")="node_local.gvstats_rec.n_tp_readwrite"
-	Set gtmtypes("node_local",122,"off")=55072
+	Set gtmtypfldindx("node_local","gvstats_rec.n_kill")=121
+	Set gtmtypes("node_local",122,"name")="node_local.gvstats_rec.n_get"
+	Set gtmtypes("node_local",122,"off")=112600
 	Set gtmtypes("node_local",122,"len")=8
 	Set gtmtypes("node_local",122,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_readwrite")=122
-	Set gtmtypes("node_local",123,"name")="node_local.gvstats_rec.n_tp_readonly"
-	Set gtmtypes("node_local",123,"off")=55080
+	Set gtmtypfldindx("node_local","gvstats_rec.n_get")=122
+	Set gtmtypes("node_local",123,"name")="node_local.gvstats_rec.n_data"
+	Set gtmtypes("node_local",123,"off")=112608
 	Set gtmtypes("node_local",123,"len")=8
 	Set gtmtypes("node_local",123,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_readonly")=123
-	Set gtmtypes("node_local",124,"name")="node_local.gvstats_rec.n_tp_rolledback"
-	Set gtmtypes("node_local",124,"off")=55088
+	Set gtmtypfldindx("node_local","gvstats_rec.n_data")=123
+	Set gtmtypes("node_local",124,"name")="node_local.gvstats_rec.n_order"
+	Set gtmtypes("node_local",124,"off")=112616
 	Set gtmtypes("node_local",124,"len")=8
 	Set gtmtypes("node_local",124,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_rolledback")=124
-	Set gtmtypes("node_local",125,"name")="node_local.gvstats_rec.n_tp_blkwrite"
-	Set gtmtypes("node_local",125,"off")=55096
+	Set gtmtypfldindx("node_local","gvstats_rec.n_order")=124
+	Set gtmtypes("node_local",125,"name")="node_local.gvstats_rec.n_zprev"
+	Set gtmtypes("node_local",125,"off")=112624
 	Set gtmtypes("node_local",125,"len")=8
 	Set gtmtypes("node_local",125,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_blkwrite")=125
-	Set gtmtypes("node_local",126,"name")="node_local.gvstats_rec.n_tp_blkread"
-	Set gtmtypes("node_local",126,"off")=55104
+	Set gtmtypfldindx("node_local","gvstats_rec.n_zprev")=125
+	Set gtmtypes("node_local",126,"name")="node_local.gvstats_rec.n_query"
+	Set gtmtypes("node_local",126,"off")=112632
 	Set gtmtypes("node_local",126,"len")=8
 	Set gtmtypes("node_local",126,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_blkread")=126
-	Set gtmtypes("node_local",127,"name")="node_local.gvstats_rec.n_tp_tot_retries_0"
-	Set gtmtypes("node_local",127,"off")=55112
+	Set gtmtypfldindx("node_local","gvstats_rec.n_query")=126
+	Set gtmtypes("node_local",127,"name")="node_local.gvstats_rec.n_lock_success"
+	Set gtmtypes("node_local",127,"off")=112640
 	Set gtmtypes("node_local",127,"len")=8
 	Set gtmtypes("node_local",127,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_tot_retries_0")=127
-	Set gtmtypes("node_local",128,"name")="node_local.gvstats_rec.n_tp_tot_retries_1"
-	Set gtmtypes("node_local",128,"off")=55120
+	Set gtmtypfldindx("node_local","gvstats_rec.n_lock_success")=127
+	Set gtmtypes("node_local",128,"name")="node_local.gvstats_rec.n_lock_fail"
+	Set gtmtypes("node_local",128,"off")=112648
 	Set gtmtypes("node_local",128,"len")=8
 	Set gtmtypes("node_local",128,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_tot_retries_1")=128
-	Set gtmtypes("node_local",129,"name")="node_local.gvstats_rec.n_tp_tot_retries_2"
-	Set gtmtypes("node_local",129,"off")=55128
+	Set gtmtypfldindx("node_local","gvstats_rec.n_lock_fail")=128
+	Set gtmtypes("node_local",129,"name")="node_local.gvstats_rec.db_curr_tn"
+	Set gtmtypes("node_local",129,"off")=112656
 	Set gtmtypes("node_local",129,"len")=8
 	Set gtmtypes("node_local",129,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_tot_retries_2")=129
-	Set gtmtypes("node_local",130,"name")="node_local.gvstats_rec.n_tp_tot_retries_3"
-	Set gtmtypes("node_local",130,"off")=55136
+	Set gtmtypfldindx("node_local","gvstats_rec.db_curr_tn")=129
+	Set gtmtypes("node_local",130,"name")="node_local.gvstats_rec.n_dsk_read"
+	Set gtmtypes("node_local",130,"off")=112664
 	Set gtmtypes("node_local",130,"len")=8
 	Set gtmtypes("node_local",130,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_tot_retries_3")=130
-	Set gtmtypes("node_local",131,"name")="node_local.gvstats_rec.n_tp_tot_retries_4"
-	Set gtmtypes("node_local",131,"off")=55144
+	Set gtmtypfldindx("node_local","gvstats_rec.n_dsk_read")=130
+	Set gtmtypes("node_local",131,"name")="node_local.gvstats_rec.n_dsk_write"
+	Set gtmtypes("node_local",131,"off")=112672
 	Set gtmtypes("node_local",131,"len")=8
 	Set gtmtypes("node_local",131,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_tot_retries_4")=131
-	Set gtmtypes("node_local",132,"name")="node_local.gvstats_rec.n_tp_cnflct_retries_0"
-	Set gtmtypes("node_local",132,"off")=55152
+	Set gtmtypfldindx("node_local","gvstats_rec.n_dsk_write")=131
+	Set gtmtypes("node_local",132,"name")="node_local.gvstats_rec.n_nontp_readwrite"
+	Set gtmtypes("node_local",132,"off")=112680
 	Set gtmtypes("node_local",132,"len")=8
 	Set gtmtypes("node_local",132,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_cnflct_retries_0")=132
-	Set gtmtypes("node_local",133,"name")="node_local.gvstats_rec.n_tp_cnflct_retries_1"
-	Set gtmtypes("node_local",133,"off")=55160
+	Set gtmtypfldindx("node_local","gvstats_rec.n_nontp_readwrite")=132
+	Set gtmtypes("node_local",133,"name")="node_local.gvstats_rec.n_nontp_readonly"
+	Set gtmtypes("node_local",133,"off")=112688
 	Set gtmtypes("node_local",133,"len")=8
 	Set gtmtypes("node_local",133,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_cnflct_retries_1")=133
-	Set gtmtypes("node_local",134,"name")="node_local.gvstats_rec.n_tp_cnflct_retries_2"
-	Set gtmtypes("node_local",134,"off")=55168
+	Set gtmtypfldindx("node_local","gvstats_rec.n_nontp_readonly")=133
+	Set gtmtypes("node_local",134,"name")="node_local.gvstats_rec.n_nontp_blkwrite"
+	Set gtmtypes("node_local",134,"off")=112696
 	Set gtmtypes("node_local",134,"len")=8
 	Set gtmtypes("node_local",134,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_cnflct_retries_2")=134
-	Set gtmtypes("node_local",135,"name")="node_local.gvstats_rec.n_tp_cnflct_retries_3"
-	Set gtmtypes("node_local",135,"off")=55176
+	Set gtmtypfldindx("node_local","gvstats_rec.n_nontp_blkwrite")=134
+	Set gtmtypes("node_local",135,"name")="node_local.gvstats_rec.n_nontp_blkread"
+	Set gtmtypes("node_local",135,"off")=112704
 	Set gtmtypes("node_local",135,"len")=8
 	Set gtmtypes("node_local",135,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_cnflct_retries_3")=135
-	Set gtmtypes("node_local",136,"name")="node_local.gvstats_rec.n_tp_cnflct_retries_4"
-	Set gtmtypes("node_local",136,"off")=55184
+	Set gtmtypfldindx("node_local","gvstats_rec.n_nontp_blkread")=135
+	Set gtmtypes("node_local",136,"name")="node_local.gvstats_rec.n_nontp_retries_0"
+	Set gtmtypes("node_local",136,"off")=112712
 	Set gtmtypes("node_local",136,"len")=8
 	Set gtmtypes("node_local",136,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_cnflct_retries_4")=136
-	Set gtmtypes("node_local",137,"name")="node_local.gvstats_rec.n_ztrigger"
-	Set gtmtypes("node_local",137,"off")=55192
+	Set gtmtypfldindx("node_local","gvstats_rec.n_nontp_retries_0")=136
+	Set gtmtypes("node_local",137,"name")="node_local.gvstats_rec.n_nontp_retries_1"
+	Set gtmtypes("node_local",137,"off")=112720
 	Set gtmtypes("node_local",137,"len")=8
 	Set gtmtypes("node_local",137,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_ztrigger")=137
-	Set gtmtypes("node_local",138,"name")="node_local.gvstats_rec.n_db_flush"
-	Set gtmtypes("node_local",138,"off")=55200
+	Set gtmtypfldindx("node_local","gvstats_rec.n_nontp_retries_1")=137
+	Set gtmtypes("node_local",138,"name")="node_local.gvstats_rec.n_nontp_retries_2"
+	Set gtmtypes("node_local",138,"off")=112728
 	Set gtmtypes("node_local",138,"len")=8
 	Set gtmtypes("node_local",138,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_db_flush")=138
-	Set gtmtypes("node_local",139,"name")="node_local.gvstats_rec.n_db_fsync"
-	Set gtmtypes("node_local",139,"off")=55208
+	Set gtmtypfldindx("node_local","gvstats_rec.n_nontp_retries_2")=138
+	Set gtmtypes("node_local",139,"name")="node_local.gvstats_rec.n_nontp_retries_3"
+	Set gtmtypes("node_local",139,"off")=112736
 	Set gtmtypes("node_local",139,"len")=8
 	Set gtmtypes("node_local",139,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_db_fsync")=139
-	Set gtmtypes("node_local",140,"name")="node_local.gvstats_rec.n_jnl_flush"
-	Set gtmtypes("node_local",140,"off")=55216
+	Set gtmtypfldindx("node_local","gvstats_rec.n_nontp_retries_3")=139
+	Set gtmtypes("node_local",140,"name")="node_local.gvstats_rec.n_tp_readwrite"
+	Set gtmtypes("node_local",140,"off")=112744
 	Set gtmtypes("node_local",140,"len")=8
 	Set gtmtypes("node_local",140,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_jnl_flush")=140
-	Set gtmtypes("node_local",141,"name")="node_local.gvstats_rec.n_jnl_fsync"
-	Set gtmtypes("node_local",141,"off")=55224
+	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_readwrite")=140
+	Set gtmtypes("node_local",141,"name")="node_local.gvstats_rec.n_tp_readonly"
+	Set gtmtypes("node_local",141,"off")=112752
 	Set gtmtypes("node_local",141,"len")=8
 	Set gtmtypes("node_local",141,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_jnl_fsync")=141
-	Set gtmtypes("node_local",142,"name")="node_local.gvstats_rec.n_jbuff_bytes"
-	Set gtmtypes("node_local",142,"off")=55232
+	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_readonly")=141
+	Set gtmtypes("node_local",142,"name")="node_local.gvstats_rec.n_tp_rolledback"
+	Set gtmtypes("node_local",142,"off")=112760
 	Set gtmtypes("node_local",142,"len")=8
 	Set gtmtypes("node_local",142,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_jbuff_bytes")=142
-	Set gtmtypes("node_local",143,"name")="node_local.gvstats_rec.n_jfile_bytes"
-	Set gtmtypes("node_local",143,"off")=55240
+	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_rolledback")=142
+	Set gtmtypes("node_local",143,"name")="node_local.gvstats_rec.n_tp_blkwrite"
+	Set gtmtypes("node_local",143,"off")=112768
 	Set gtmtypes("node_local",143,"len")=8
 	Set gtmtypes("node_local",143,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_jfile_bytes")=143
-	Set gtmtypes("node_local",144,"name")="node_local.gvstats_rec.n_jfile_writes"
-	Set gtmtypes("node_local",144,"off")=55248
+	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_blkwrite")=143
+	Set gtmtypes("node_local",144,"name")="node_local.gvstats_rec.n_tp_blkread"
+	Set gtmtypes("node_local",144,"off")=112776
 	Set gtmtypes("node_local",144,"len")=8
 	Set gtmtypes("node_local",144,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_jfile_writes")=144
-	Set gtmtypes("node_local",145,"name")="node_local.gvstats_rec.n_jrec_logical"
-	Set gtmtypes("node_local",145,"off")=55256
+	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_blkread")=144
+	Set gtmtypes("node_local",145,"name")="node_local.gvstats_rec.n_tp_tot_retries_0"
+	Set gtmtypes("node_local",145,"off")=112784
 	Set gtmtypes("node_local",145,"len")=8
 	Set gtmtypes("node_local",145,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_jrec_logical")=145
-	Set gtmtypes("node_local",146,"name")="node_local.gvstats_rec.n_jrec_pblk"
-	Set gtmtypes("node_local",146,"off")=55264
+	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_tot_retries_0")=145
+	Set gtmtypes("node_local",146,"name")="node_local.gvstats_rec.n_tp_tot_retries_1"
+	Set gtmtypes("node_local",146,"off")=112792
 	Set gtmtypes("node_local",146,"len")=8
 	Set gtmtypes("node_local",146,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_jrec_pblk")=146
-	Set gtmtypes("node_local",147,"name")="node_local.gvstats_rec.n_jrec_epoch_regular"
-	Set gtmtypes("node_local",147,"off")=55272
+	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_tot_retries_1")=146
+	Set gtmtypes("node_local",147,"name")="node_local.gvstats_rec.n_tp_tot_retries_2"
+	Set gtmtypes("node_local",147,"off")=112800
 	Set gtmtypes("node_local",147,"len")=8
 	Set gtmtypes("node_local",147,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_jrec_epoch_regular")=147
-	Set gtmtypes("node_local",148,"name")="node_local.gvstats_rec.n_jrec_epoch_idle"
-	Set gtmtypes("node_local",148,"off")=55280
+	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_tot_retries_2")=147
+	Set gtmtypes("node_local",148,"name")="node_local.gvstats_rec.n_tp_tot_retries_3"
+	Set gtmtypes("node_local",148,"off")=112808
 	Set gtmtypes("node_local",148,"len")=8
 	Set gtmtypes("node_local",148,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_jrec_epoch_idle")=148
-	Set gtmtypes("node_local",149,"name")="node_local.gvstats_rec.n_jrec_other"
-	Set gtmtypes("node_local",149,"off")=55288
+	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_tot_retries_3")=148
+	Set gtmtypes("node_local",149,"name")="node_local.gvstats_rec.n_tp_tot_retries_4"
+	Set gtmtypes("node_local",149,"off")=112816
 	Set gtmtypes("node_local",149,"len")=8
 	Set gtmtypes("node_local",149,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_jrec_other")=149
-	Set gtmtypes("node_local",150,"name")="node_local.gvstats_rec.n_jnl_extends"
-	Set gtmtypes("node_local",150,"off")=55296
+	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_tot_retries_4")=149
+	Set gtmtypes("node_local",150,"name")="node_local.gvstats_rec.n_tp_cnflct_retries_0"
+	Set gtmtypes("node_local",150,"off")=112824
 	Set gtmtypes("node_local",150,"len")=8
 	Set gtmtypes("node_local",150,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_jnl_extends")=150
-	Set gtmtypes("node_local",151,"name")="node_local.gvstats_rec.n_db_extends"
-	Set gtmtypes("node_local",151,"off")=55304
+	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_cnflct_retries_0")=150
+	Set gtmtypes("node_local",151,"name")="node_local.gvstats_rec.n_tp_cnflct_retries_1"
+	Set gtmtypes("node_local",151,"off")=112832
 	Set gtmtypes("node_local",151,"len")=8
 	Set gtmtypes("node_local",151,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_db_extends")=151
-	Set gtmtypes("node_local",152,"name")="node_local.gvstats_rec.n_crit_success"
-	Set gtmtypes("node_local",152,"off")=55312
+	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_cnflct_retries_1")=151
+	Set gtmtypes("node_local",152,"name")="node_local.gvstats_rec.n_tp_cnflct_retries_2"
+	Set gtmtypes("node_local",152,"off")=112840
 	Set gtmtypes("node_local",152,"len")=8
 	Set gtmtypes("node_local",152,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_crit_success")=152
-	Set gtmtypes("node_local",153,"name")="node_local.gvstats_rec.n_crits_in_epch"
-	Set gtmtypes("node_local",153,"off")=55320
+	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_cnflct_retries_2")=152
+	Set gtmtypes("node_local",153,"name")="node_local.gvstats_rec.n_tp_cnflct_retries_3"
+	Set gtmtypes("node_local",153,"off")=112848
 	Set gtmtypes("node_local",153,"len")=8
 	Set gtmtypes("node_local",153,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_crits_in_epch")=153
-	Set gtmtypes("node_local",154,"name")="node_local.gvstats_rec.sq_crit_failed"
-	Set gtmtypes("node_local",154,"off")=55328
+	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_cnflct_retries_3")=153
+	Set gtmtypes("node_local",154,"name")="node_local.gvstats_rec.n_tp_cnflct_retries_4"
+	Set gtmtypes("node_local",154,"off")=112856
 	Set gtmtypes("node_local",154,"len")=8
 	Set gtmtypes("node_local",154,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.sq_crit_failed")=154
-	Set gtmtypes("node_local",155,"name")="node_local.gvstats_rec.n_crit_failed"
-	Set gtmtypes("node_local",155,"off")=55336
+	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_cnflct_retries_4")=154
+	Set gtmtypes("node_local",155,"name")="node_local.gvstats_rec.n_ztrigger"
+	Set gtmtypes("node_local",155,"off")=112864
 	Set gtmtypes("node_local",155,"len")=8
 	Set gtmtypes("node_local",155,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_crit_failed")=155
-	Set gtmtypes("node_local",156,"name")="node_local.gvstats_rec.sq_crit_que_slps"
-	Set gtmtypes("node_local",156,"off")=55344
+	Set gtmtypfldindx("node_local","gvstats_rec.n_ztrigger")=155
+	Set gtmtypes("node_local",156,"name")="node_local.gvstats_rec.n_db_flush"
+	Set gtmtypes("node_local",156,"off")=112872
 	Set gtmtypes("node_local",156,"len")=8
 	Set gtmtypes("node_local",156,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.sq_crit_que_slps")=156
-	Set gtmtypes("node_local",157,"name")="node_local.gvstats_rec.n_crit_que_slps"
-	Set gtmtypes("node_local",157,"off")=55352
+	Set gtmtypfldindx("node_local","gvstats_rec.n_db_flush")=156
+	Set gtmtypes("node_local",157,"name")="node_local.gvstats_rec.n_db_fsync"
+	Set gtmtypes("node_local",157,"off")=112880
 	Set gtmtypes("node_local",157,"len")=8
 	Set gtmtypes("node_local",157,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_crit_que_slps")=157
-	Set gtmtypes("node_local",158,"name")="node_local.gvstats_rec.sq_crit_yields"
-	Set gtmtypes("node_local",158,"off")=55360
+	Set gtmtypfldindx("node_local","gvstats_rec.n_db_fsync")=157
+	Set gtmtypes("node_local",158,"name")="node_local.gvstats_rec.n_jnl_flush"
+	Set gtmtypes("node_local",158,"off")=112888
 	Set gtmtypes("node_local",158,"len")=8
 	Set gtmtypes("node_local",158,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.sq_crit_yields")=158
-	Set gtmtypes("node_local",159,"name")="node_local.gvstats_rec.n_crit_yields"
-	Set gtmtypes("node_local",159,"off")=55368
+	Set gtmtypfldindx("node_local","gvstats_rec.n_jnl_flush")=158
+	Set gtmtypes("node_local",159,"name")="node_local.gvstats_rec.n_jnl_fsync"
+	Set gtmtypes("node_local",159,"off")=112896
 	Set gtmtypes("node_local",159,"len")=8
 	Set gtmtypes("node_local",159,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_crit_yields")=159
-	Set gtmtypes("node_local",160,"name")="node_local.last_wcsflu_tn"
-	Set gtmtypes("node_local",160,"off")=55376
+	Set gtmtypfldindx("node_local","gvstats_rec.n_jnl_fsync")=159
+	Set gtmtypes("node_local",160,"name")="node_local.gvstats_rec.n_jbuff_bytes"
+	Set gtmtypes("node_local",160,"off")=112904
 	Set gtmtypes("node_local",160,"len")=8
 	Set gtmtypes("node_local",160,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","last_wcsflu_tn")=160
-	Set gtmtypes("node_local",161,"name")="node_local.encrypt_glo_buff_off"
-	Set gtmtypes("node_local",161,"off")=55384
+	Set gtmtypfldindx("node_local","gvstats_rec.n_jbuff_bytes")=160
+	Set gtmtypes("node_local",161,"name")="node_local.gvstats_rec.n_jfile_bytes"
+	Set gtmtypes("node_local",161,"off")=112912
 	Set gtmtypes("node_local",161,"len")=8
-	Set gtmtypes("node_local",161,"type")="intptr_t"
-	Set gtmtypfldindx("node_local","encrypt_glo_buff_off")=161
-	Set gtmtypes("node_local",162,"name")="node_local.snapshot_crit_latch"
-	Set gtmtypes("node_local",162,"off")=55392
+	Set gtmtypes("node_local",161,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","gvstats_rec.n_jfile_bytes")=161
+	Set gtmtypes("node_local",162,"name")="node_local.gvstats_rec.n_jfile_writes"
+	Set gtmtypes("node_local",162,"off")=112920
 	Set gtmtypes("node_local",162,"len")=8
-	Set gtmtypes("node_local",162,"type")="global_latch_t"
-	Set gtmtypfldindx("node_local","snapshot_crit_latch")=162
-	Set gtmtypes("node_local",163,"name")="node_local.snapshot_crit_latch.u"
-	Set gtmtypes("node_local",163,"off")=55392
+	Set gtmtypes("node_local",162,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","gvstats_rec.n_jfile_writes")=162
+	Set gtmtypes("node_local",163,"name")="node_local.gvstats_rec.n_jrec_logical"
+	Set gtmtypes("node_local",163,"off")=112928
 	Set gtmtypes("node_local",163,"len")=8
-	Set gtmtypes("node_local",163,"type")="union"
-	Set gtmtypfldindx("node_local","snapshot_crit_latch.u")=163
-	Set gtmtypes("node_local",164,"name")="node_local.snapshot_crit_latch.u.pid_imgcnt"
-	Set gtmtypes("node_local",164,"off")=55392
+	Set gtmtypes("node_local",163,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","gvstats_rec.n_jrec_logical")=163
+	Set gtmtypes("node_local",164,"name")="node_local.gvstats_rec.n_jrec_pblk"
+	Set gtmtypes("node_local",164,"off")=112936
 	Set gtmtypes("node_local",164,"len")=8
 	Set gtmtypes("node_local",164,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","snapshot_crit_latch.u.pid_imgcnt")=164
-	Set gtmtypes("node_local",165,"name")="node_local.snapshot_crit_latch.u.parts"
-	Set gtmtypes("node_local",165,"off")=55392
+	Set gtmtypfldindx("node_local","gvstats_rec.n_jrec_pblk")=164
+	Set gtmtypes("node_local",165,"name")="node_local.gvstats_rec.n_jrec_epoch_regular"
+	Set gtmtypes("node_local",165,"off")=112944
 	Set gtmtypes("node_local",165,"len")=8
-	Set gtmtypes("node_local",165,"type")="struct"
-	Set gtmtypfldindx("node_local","snapshot_crit_latch.u.parts")=165
-	Set gtmtypes("node_local",166,"name")="node_local.snapshot_crit_latch.u.parts.latch_pid"
-	Set gtmtypes("node_local",166,"off")=55392
-	Set gtmtypes("node_local",166,"len")=4
-	Set gtmtypes("node_local",166,"type")="int"
-	Set gtmtypfldindx("node_local","snapshot_crit_latch.u.parts.latch_pid")=166
-	Set gtmtypes("node_local",167,"name")="node_local.snapshot_crit_latch.u.parts.latch_word"
-	Set gtmtypes("node_local",167,"off")=55396
-	Set gtmtypes("node_local",167,"len")=4
-	Set gtmtypes("node_local",167,"type")="int"
-	Set gtmtypfldindx("node_local","snapshot_crit_latch.u.parts.latch_word")=167
-	Set gtmtypes("node_local",168,"name")="node_local.ss_shmid"
-	Set gtmtypes("node_local",168,"off")=55400
+	Set gtmtypes("node_local",165,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","gvstats_rec.n_jrec_epoch_regular")=165
+	Set gtmtypes("node_local",166,"name")="node_local.gvstats_rec.n_jrec_epoch_idle"
+	Set gtmtypes("node_local",166,"off")=112952
+	Set gtmtypes("node_local",166,"len")=8
+	Set gtmtypes("node_local",166,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","gvstats_rec.n_jrec_epoch_idle")=166
+	Set gtmtypes("node_local",167,"name")="node_local.gvstats_rec.n_jrec_other"
+	Set gtmtypes("node_local",167,"off")=112960
+	Set gtmtypes("node_local",167,"len")=8
+	Set gtmtypes("node_local",167,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","gvstats_rec.n_jrec_other")=167
+	Set gtmtypes("node_local",168,"name")="node_local.gvstats_rec.n_jnl_extends"
+	Set gtmtypes("node_local",168,"off")=112968
 	Set gtmtypes("node_local",168,"len")=8
-	Set gtmtypes("node_local",168,"type")="long"
-	Set gtmtypfldindx("node_local","ss_shmid")=168
-	Set gtmtypes("node_local",169,"name")="node_local.ss_shmcycle"
-	Set gtmtypes("node_local",169,"off")=55408
-	Set gtmtypes("node_local",169,"len")=4
-	Set gtmtypes("node_local",169,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","ss_shmcycle")=169
-	Set gtmtypes("node_local",170,"name")="node_local.snapshot_in_prog"
-	Set gtmtypes("node_local",170,"off")=55412
-	Set gtmtypes("node_local",170,"len")=4
-	Set gtmtypes("node_local",170,"type")="boolean_t"
-	Set gtmtypfldindx("node_local","snapshot_in_prog")=170
-	Set gtmtypes("node_local",171,"name")="node_local.num_snapshots_in_effect"
-	Set gtmtypes("node_local",171,"off")=55416
-	Set gtmtypes("node_local",171,"len")=4
-	Set gtmtypes("node_local",171,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","num_snapshots_in_effect")=171
-	Set gtmtypes("node_local",172,"name")="node_local.wbox_test_seq_num"
-	Set gtmtypes("node_local",172,"off")=55420
-	Set gtmtypes("node_local",172,"len")=4
-	Set gtmtypes("node_local",172,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","wbox_test_seq_num")=172
-	Set gtmtypes("node_local",173,"name")="node_local.kip_pid_array"
-	Set gtmtypes("node_local",173,"off")=55424
-	Set gtmtypes("node_local",173,"len")=32
-	Set gtmtypes("node_local",173,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","kip_pid_array")=173
-	Set gtmtypes("node_local",173,"dim")=8
-	Set gtmtypes("node_local",174,"name")="node_local.sec_size"
-	Set gtmtypes("node_local",174,"off")=55456
+	Set gtmtypes("node_local",168,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","gvstats_rec.n_jnl_extends")=168
+	Set gtmtypes("node_local",169,"name")="node_local.gvstats_rec.n_db_extends"
+	Set gtmtypes("node_local",169,"off")=112976
+	Set gtmtypes("node_local",169,"len")=8
+	Set gtmtypes("node_local",169,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","gvstats_rec.n_db_extends")=169
+	Set gtmtypes("node_local",170,"name")="node_local.gvstats_rec.n_crit_success"
+	Set gtmtypes("node_local",170,"off")=112984
+	Set gtmtypes("node_local",170,"len")=8
+	Set gtmtypes("node_local",170,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","gvstats_rec.n_crit_success")=170
+	Set gtmtypes("node_local",171,"name")="node_local.gvstats_rec.n_crits_in_epch"
+	Set gtmtypes("node_local",171,"off")=112992
+	Set gtmtypes("node_local",171,"len")=8
+	Set gtmtypes("node_local",171,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","gvstats_rec.n_crits_in_epch")=171
+	Set gtmtypes("node_local",172,"name")="node_local.gvstats_rec.sq_crit_failed"
+	Set gtmtypes("node_local",172,"off")=113000
+	Set gtmtypes("node_local",172,"len")=8
+	Set gtmtypes("node_local",172,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","gvstats_rec.sq_crit_failed")=172
+	Set gtmtypes("node_local",173,"name")="node_local.gvstats_rec.n_crit_failed"
+	Set gtmtypes("node_local",173,"off")=113008
+	Set gtmtypes("node_local",173,"len")=8
+	Set gtmtypes("node_local",173,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","gvstats_rec.n_crit_failed")=173
+	Set gtmtypes("node_local",174,"name")="node_local.gvstats_rec.sq_crit_que_slps"
+	Set gtmtypes("node_local",174,"off")=113016
 	Set gtmtypes("node_local",174,"len")=8
 	Set gtmtypes("node_local",174,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","sec_size")=174
-	Set gtmtypes("node_local",175,"name")="node_local.jnlpool_shmid"
-	Set gtmtypes("node_local",175,"off")=55464
-	Set gtmtypes("node_local",175,"len")=4
-	Set gtmtypes("node_local",175,"type")="int"
-	Set gtmtypfldindx("node_local","jnlpool_shmid")=175
-	Set gtmtypes("node_local",176,"name")="node_local.lockspacefull_logged"
-	Set gtmtypes("node_local",176,"off")=55468
-	Set gtmtypes("node_local",176,"len")=4
-	Set gtmtypes("node_local",176,"type")="boolean_t"
-	Set gtmtypfldindx("node_local","lockspacefull_logged")=176
-	Set gtmtypes("node_local",177,"name")="node_local.trunc_pid"
-	Set gtmtypes("node_local",177,"off")=55472
-	Set gtmtypes("node_local",177,"len")=4
-	Set gtmtypes("node_local",177,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","trunc_pid")=177
-	Set gtmtypes("node_local",178,"name")="node_local.highest_lbm_with_busy_blk"
-	Set gtmtypes("node_local",178,"off")=55476
-	Set gtmtypes("node_local",178,"len")=4
-	Set gtmtypes("node_local",178,"type")="int"
-	Set gtmtypfldindx("node_local","highest_lbm_with_busy_blk")=178
-	Set gtmtypes("node_local",179,"name")="node_local.ftok_ops_array"
-	Set gtmtypes("node_local",179,"off")=55480
-	Set gtmtypes("node_local",179,"len")=8192
-	Set gtmtypes("node_local",179,"type")="ftokhist"
-	Set gtmtypfldindx("node_local","ftok_ops_array")=179
-	Set gtmtypes("node_local",179,"dim")=512
-	Set gtmtypes("node_local",180,"name")="node_local.ftok_ops_array[0].ftok_oper"
-	Set gtmtypes("node_local",180,"off")=55480
-	Set gtmtypes("node_local",180,"len")=4
-	Set gtmtypes("node_local",180,"type")="int"
-	Set gtmtypfldindx("node_local","ftok_ops_array[0].ftok_oper")=180
-	Set gtmtypes("node_local",181,"name")="node_local.ftok_ops_array[0].process_id"
-	Set gtmtypes("node_local",181,"off")=55484
-	Set gtmtypes("node_local",181,"len")=4
-	Set gtmtypes("node_local",181,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","ftok_ops_array[0].process_id")=181
-	Set gtmtypes("node_local",182,"name")="node_local.ftok_ops_array[0].cr_tn"
-	Set gtmtypes("node_local",182,"off")=55488
+	Set gtmtypfldindx("node_local","gvstats_rec.sq_crit_que_slps")=174
+	Set gtmtypes("node_local",175,"name")="node_local.gvstats_rec.n_crit_que_slps"
+	Set gtmtypes("node_local",175,"off")=113024
+	Set gtmtypes("node_local",175,"len")=8
+	Set gtmtypes("node_local",175,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","gvstats_rec.n_crit_que_slps")=175
+	Set gtmtypes("node_local",176,"name")="node_local.gvstats_rec.sq_crit_yields"
+	Set gtmtypes("node_local",176,"off")=113032
+	Set gtmtypes("node_local",176,"len")=8
+	Set gtmtypes("node_local",176,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","gvstats_rec.sq_crit_yields")=176
+	Set gtmtypes("node_local",177,"name")="node_local.gvstats_rec.n_crit_yields"
+	Set gtmtypes("node_local",177,"off")=113040
+	Set gtmtypes("node_local",177,"len")=8
+	Set gtmtypes("node_local",177,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","gvstats_rec.n_crit_yields")=177
+	Set gtmtypes("node_local",178,"name")="node_local.gvstats_rec.n_clean2dirty"
+	Set gtmtypes("node_local",178,"off")=113048
+	Set gtmtypes("node_local",178,"len")=8
+	Set gtmtypes("node_local",178,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","gvstats_rec.n_clean2dirty")=178
+	Set gtmtypes("node_local",179,"name")="node_local.last_wcsflu_tn"
+	Set gtmtypes("node_local",179,"off")=113056
+	Set gtmtypes("node_local",179,"len")=8
+	Set gtmtypes("node_local",179,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","last_wcsflu_tn")=179
+	Set gtmtypes("node_local",180,"name")="node_local.last_wcs_recover_tn"
+	Set gtmtypes("node_local",180,"off")=113064
+	Set gtmtypes("node_local",180,"len")=8
+	Set gtmtypes("node_local",180,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","last_wcs_recover_tn")=180
+	Set gtmtypes("node_local",181,"name")="node_local.encrypt_glo_buff_off"
+	Set gtmtypes("node_local",181,"off")=113072
+	Set gtmtypes("node_local",181,"len")=8
+	Set gtmtypes("node_local",181,"type")="intptr_t"
+	Set gtmtypfldindx("node_local","encrypt_glo_buff_off")=181
+	Set gtmtypes("node_local",182,"name")="node_local.snapshot_crit_latch"
+	Set gtmtypes("node_local",182,"off")=113080
 	Set gtmtypes("node_local",182,"len")=8
-	Set gtmtypes("node_local",182,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","ftok_ops_array[0].cr_tn")=182
-	Set gtmtypes("node_local",183,"name")="node_local.root_search_cycle"
-	Set gtmtypes("node_local",183,"off")=63672
-	Set gtmtypes("node_local",183,"len")=4
-	Set gtmtypes("node_local",183,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","root_search_cycle")=183
-	Set gtmtypes("node_local",184,"name")="node_local.onln_rlbk_cycle"
-	Set gtmtypes("node_local",184,"off")=63676
-	Set gtmtypes("node_local",184,"len")=4
-	Set gtmtypes("node_local",184,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","onln_rlbk_cycle")=184
-	Set gtmtypes("node_local",185,"name")="node_local.db_onln_rlbkd_cycle"
-	Set gtmtypes("node_local",185,"off")=63680
-	Set gtmtypes("node_local",185,"len")=4
-	Set gtmtypes("node_local",185,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","db_onln_rlbkd_cycle")=185
-	Set gtmtypes("node_local",186,"name")="node_local.onln_rlbk_pid"
-	Set gtmtypes("node_local",186,"off")=63684
+	Set gtmtypes("node_local",182,"type")="global_latch_t"
+	Set gtmtypfldindx("node_local","snapshot_crit_latch")=182
+	Set gtmtypes("node_local",183,"name")="node_local.snapshot_crit_latch.u"
+	Set gtmtypes("node_local",183,"off")=113080
+	Set gtmtypes("node_local",183,"len")=8
+	Set gtmtypes("node_local",183,"type")="union"
+	Set gtmtypfldindx("node_local","snapshot_crit_latch.u")=183
+	Set gtmtypes("node_local",184,"name")="node_local.snapshot_crit_latch.u.pid_imgcnt"
+	Set gtmtypes("node_local",184,"off")=113080
+	Set gtmtypes("node_local",184,"len")=8
+	Set gtmtypes("node_local",184,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","snapshot_crit_latch.u.pid_imgcnt")=184
+	Set gtmtypes("node_local",185,"name")="node_local.snapshot_crit_latch.u.parts"
+	Set gtmtypes("node_local",185,"off")=113080
+	Set gtmtypes("node_local",185,"len")=8
+	Set gtmtypes("node_local",185,"type")="struct"
+	Set gtmtypfldindx("node_local","snapshot_crit_latch.u.parts")=185
+	Set gtmtypes("node_local",186,"name")="node_local.snapshot_crit_latch.u.parts.latch_pid"
+	Set gtmtypes("node_local",186,"off")=113080
 	Set gtmtypes("node_local",186,"len")=4
-	Set gtmtypes("node_local",186,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","onln_rlbk_pid")=186
-	Set gtmtypes("node_local",187,"name")="node_local.dbrndwn_ftok_skip"
-	Set gtmtypes("node_local",187,"off")=63688
+	Set gtmtypes("node_local",186,"type")="int"
+	Set gtmtypfldindx("node_local","snapshot_crit_latch.u.parts.latch_pid")=186
+	Set gtmtypes("node_local",187,"name")="node_local.snapshot_crit_latch.u.parts.latch_word"
+	Set gtmtypes("node_local",187,"off")=113084
 	Set gtmtypes("node_local",187,"len")=4
-	Set gtmtypes("node_local",187,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","dbrndwn_ftok_skip")=187
-	Set gtmtypes("node_local",188,"name")="node_local.dbrndwn_access_skip"
-	Set gtmtypes("node_local",188,"off")=63692
-	Set gtmtypes("node_local",188,"len")=4
-	Set gtmtypes("node_local",188,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","dbrndwn_access_skip")=188
-	Set gtmtypes("node_local",189,"name")="node_local.fastinteg_in_prog"
-	Set gtmtypes("node_local",189,"off")=63696
+	Set gtmtypes("node_local",187,"type")="int"
+	Set gtmtypfldindx("node_local","snapshot_crit_latch.u.parts.latch_word")=187
+	Set gtmtypes("node_local",188,"name")="node_local.ss_shmid"
+	Set gtmtypes("node_local",188,"off")=113088
+	Set gtmtypes("node_local",188,"len")=8
+	Set gtmtypes("node_local",188,"type")="long"
+	Set gtmtypfldindx("node_local","ss_shmid")=188
+	Set gtmtypes("node_local",189,"name")="node_local.ss_shmcycle"
+	Set gtmtypes("node_local",189,"off")=113096
 	Set gtmtypes("node_local",189,"len")=4
-	Set gtmtypes("node_local",189,"type")="boolean_t"
-	Set gtmtypfldindx("node_local","fastinteg_in_prog")=189
-	Set gtmtypes("node_local",190,"name")="node_local.wtstart_errcnt"
-	Set gtmtypes("node_local",190,"off")=63700
+	Set gtmtypes("node_local",189,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","ss_shmcycle")=189
+	Set gtmtypes("node_local",190,"name")="node_local.snapshot_in_prog"
+	Set gtmtypes("node_local",190,"off")=113100
 	Set gtmtypes("node_local",190,"len")=4
-	Set gtmtypes("node_local",190,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","wtstart_errcnt")=190
-	Set gtmtypes("node_local",191,"name")="node_local.fake_db_enospc"
-	Set gtmtypes("node_local",191,"off")=63704
+	Set gtmtypes("node_local",190,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","snapshot_in_prog")=190
+	Set gtmtypes("node_local",191,"name")="node_local.num_snapshots_in_effect"
+	Set gtmtypes("node_local",191,"off")=113104
 	Set gtmtypes("node_local",191,"len")=4
-	Set gtmtypes("node_local",191,"type")="boolean_t"
-	Set gtmtypfldindx("node_local","fake_db_enospc")=191
-	Set gtmtypes("node_local",192,"name")="node_local.fake_jnl_enospc"
-	Set gtmtypes("node_local",192,"off")=63708
+	Set gtmtypes("node_local",191,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","num_snapshots_in_effect")=191
+	Set gtmtypes("node_local",192,"name")="node_local.wbox_test_seq_num"
+	Set gtmtypes("node_local",192,"off")=113108
 	Set gtmtypes("node_local",192,"len")=4
-	Set gtmtypes("node_local",192,"type")="boolean_t"
-	Set gtmtypfldindx("node_local","fake_jnl_enospc")=192
-	Set gtmtypes("node_local",193,"name")="node_local.doing_epoch"
-	Set gtmtypes("node_local",193,"off")=63712
-	Set gtmtypes("node_local",193,"len")=4
-	Set gtmtypes("node_local",193,"type")="boolean_t"
-	Set gtmtypfldindx("node_local","doing_epoch")=193
-	Set gtmtypes("node_local",194,"name")="node_local.epoch_taper_start_dbuffs"
-	Set gtmtypes("node_local",194,"off")=63716
-	Set gtmtypes("node_local",194,"len")=4
-	Set gtmtypes("node_local",194,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","epoch_taper_start_dbuffs")=194
-	Set gtmtypes("node_local",195,"name")="node_local.epoch_taper_need_fsync"
-	Set gtmtypes("node_local",195,"off")=63720
+	Set gtmtypes("node_local",192,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","wbox_test_seq_num")=192
+	Set gtmtypes("node_local",193,"name")="node_local.kip_pid_array"
+	Set gtmtypes("node_local",193,"off")=113112
+	Set gtmtypes("node_local",193,"len")=32
+	Set gtmtypes("node_local",193,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","kip_pid_array")=193
+	Set gtmtypes("node_local",193,"dim")=8
+	Set gtmtypes("node_local",194,"name")="node_local.sec_size"
+	Set gtmtypes("node_local",194,"off")=113144
+	Set gtmtypes("node_local",194,"len")=8
+	Set gtmtypes("node_local",194,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","sec_size")=194
+	Set gtmtypes("node_local",195,"name")="node_local.jnlpool_shmid"
+	Set gtmtypes("node_local",195,"off")=113152
 	Set gtmtypes("node_local",195,"len")=4
-	Set gtmtypes("node_local",195,"type")="boolean_t"
-	Set gtmtypfldindx("node_local","epoch_taper_need_fsync")=195
-	Set gtmtypes("node_local",196,"name")="node_local.wt_pid_array"
-	Set gtmtypes("node_local",196,"off")=63724
-	Set gtmtypes("node_local",196,"len")=16
-	Set gtmtypes("node_local",196,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","wt_pid_array")=196
-	Set gtmtypes("node_local",196,"dim")=4
-	Set gtmtypes("node_local",197,"name")="node_local.reorg_encrypt_pid"
-	Set gtmtypes("node_local",197,"off")=63740
+	Set gtmtypes("node_local",195,"type")="int"
+	Set gtmtypfldindx("node_local","jnlpool_shmid")=195
+	Set gtmtypes("node_local",196,"name")="node_local.lockspacefull_logged"
+	Set gtmtypes("node_local",196,"off")=113156
+	Set gtmtypes("node_local",196,"len")=4
+	Set gtmtypes("node_local",196,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","lockspacefull_logged")=196
+	Set gtmtypes("node_local",197,"name")="node_local.trunc_pid"
+	Set gtmtypes("node_local",197,"off")=113160
 	Set gtmtypes("node_local",197,"len")=4
 	Set gtmtypes("node_local",197,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","reorg_encrypt_pid")=197
-	Set gtmtypes("node_local",198,"name")="node_local.reorg_encrypt_cycle"
-	Set gtmtypes("node_local",198,"off")=63744
+	Set gtmtypfldindx("node_local","trunc_pid")=197
+	Set gtmtypes("node_local",198,"name")="node_local.highest_lbm_with_busy_blk"
+	Set gtmtypes("node_local",198,"off")=113164
 	Set gtmtypes("node_local",198,"len")=4
-	Set gtmtypes("node_local",198,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","reorg_encrypt_cycle")=198
-	Set gtmtypes("node_local",199,"name")="node_local.mupip_extract_count"
-	Set gtmtypes("node_local",199,"off")=63748
-	Set gtmtypes("node_local",199,"len")=4
-	Set gtmtypes("node_local",199,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","mupip_extract_count")=199
-	Set gtmtypes("node_local",200,"name")="node_local.saved_acc_meth"
-	Set gtmtypes("node_local",200,"off")=63752
+	Set gtmtypes("node_local",198,"type")="int"
+	Set gtmtypfldindx("node_local","highest_lbm_with_busy_blk")=198
+	Set gtmtypes("node_local",199,"name")="node_local.ftok_ops_array"
+	Set gtmtypes("node_local",199,"off")=113168
+	Set gtmtypes("node_local",199,"len")=8192
+	Set gtmtypes("node_local",199,"type")="ftokhist"
+	Set gtmtypfldindx("node_local","ftok_ops_array")=199
+	Set gtmtypes("node_local",199,"dim")=512
+	Set gtmtypes("node_local",200,"name")="node_local.ftok_ops_array[0].ftok_oper"
+	Set gtmtypes("node_local",200,"off")=113168
 	Set gtmtypes("node_local",200,"len")=4
 	Set gtmtypes("node_local",200,"type")="int"
-	Set gtmtypfldindx("node_local","saved_acc_meth")=200
-	Set gtmtypes("node_local",201,"name")="node_local.saved_blk_size"
-	Set gtmtypes("node_local",201,"off")=63756
+	Set gtmtypfldindx("node_local","ftok_ops_array[0].ftok_oper")=200
+	Set gtmtypes("node_local",201,"name")="node_local.ftok_ops_array[0].process_id"
+	Set gtmtypes("node_local",201,"off")=113172
 	Set gtmtypes("node_local",201,"len")=4
-	Set gtmtypes("node_local",201,"type")="int"
-	Set gtmtypfldindx("node_local","saved_blk_size")=201
-	Set gtmtypes("node_local",202,"name")="node_local.saved_lock_space_size"
-	Set gtmtypes("node_local",202,"off")=63760
-	Set gtmtypes("node_local",202,"len")=4
-	Set gtmtypes("node_local",202,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","saved_lock_space_size")=202
-	Set gtmtypes("node_local",203,"name")="node_local.saved_jnl_buffer_size"
-	Set gtmtypes("node_local",203,"off")=63764
+	Set gtmtypes("node_local",201,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","ftok_ops_array[0].process_id")=201
+	Set gtmtypes("node_local",202,"name")="node_local.ftok_ops_array[0].cr_tn"
+	Set gtmtypes("node_local",202,"off")=113176
+	Set gtmtypes("node_local",202,"len")=8
+	Set gtmtypes("node_local",202,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","ftok_ops_array[0].cr_tn")=202
+	Set gtmtypes("node_local",203,"name")="node_local.root_search_cycle"
+	Set gtmtypes("node_local",203,"off")=121360
 	Set gtmtypes("node_local",203,"len")=4
-	Set gtmtypes("node_local",203,"type")="int"
-	Set gtmtypfldindx("node_local","saved_jnl_buffer_size")=203
-	Set gtmtypes("node_local",204,"name")="node_local.lastwriterbypas_msg_issued"
-	Set gtmtypes("node_local",204,"off")=63768
+	Set gtmtypes("node_local",203,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","root_search_cycle")=203
+	Set gtmtypes("node_local",204,"name")="node_local.onln_rlbk_cycle"
+	Set gtmtypes("node_local",204,"off")=121364
 	Set gtmtypes("node_local",204,"len")=4
-	Set gtmtypes("node_local",204,"type")="boolean_t"
-	Set gtmtypfldindx("node_local","lastwriterbypas_msg_issued")=204
-	Set gtmtypes("node_local",205,"name")="node_local.first_writer_seen"
-	Set gtmtypes("node_local",205,"off")=63772
+	Set gtmtypes("node_local",204,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","onln_rlbk_cycle")=204
+	Set gtmtypes("node_local",205,"name")="node_local.db_onln_rlbkd_cycle"
+	Set gtmtypes("node_local",205,"off")=121368
 	Set gtmtypes("node_local",205,"len")=4
-	Set gtmtypes("node_local",205,"type")="boolean_t"
-	Set gtmtypfldindx("node_local","first_writer_seen")=205
-	Set gtmtypes("node_local",206,"name")="node_local.first_nonbypas_writer_seen"
-	Set gtmtypes("node_local",206,"off")=63776
+	Set gtmtypes("node_local",205,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","db_onln_rlbkd_cycle")=205
+	Set gtmtypes("node_local",206,"name")="node_local.onln_rlbk_pid"
+	Set gtmtypes("node_local",206,"off")=121372
 	Set gtmtypes("node_local",206,"len")=4
-	Set gtmtypes("node_local",206,"type")="boolean_t"
-	Set gtmtypfldindx("node_local","first_nonbypas_writer_seen")=206
-	Set gtmtypes("node_local",207,"name")="node_local.ftok_counter_halted"
-	Set gtmtypes("node_local",207,"off")=63780
+	Set gtmtypes("node_local",206,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","onln_rlbk_pid")=206
+	Set gtmtypes("node_local",207,"name")="node_local.dbrndwn_ftok_skip"
+	Set gtmtypes("node_local",207,"off")=121376
 	Set gtmtypes("node_local",207,"len")=4
-	Set gtmtypes("node_local",207,"type")="boolean_t"
-	Set gtmtypfldindx("node_local","ftok_counter_halted")=207
-	Set gtmtypes("node_local",208,"name")="node_local.access_counter_halted"
-	Set gtmtypes("node_local",208,"off")=63784
+	Set gtmtypes("node_local",207,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","dbrndwn_ftok_skip")=207
+	Set gtmtypes("node_local",208,"name")="node_local.dbrndwn_access_skip"
+	Set gtmtypes("node_local",208,"off")=121380
 	Set gtmtypes("node_local",208,"len")=4
-	Set gtmtypes("node_local",208,"type")="boolean_t"
-	Set gtmtypfldindx("node_local","access_counter_halted")=208
-	Set gtmtypes("node_local",209,"name")="node_local.filler_8byte_align1"
-	Set gtmtypes("node_local",209,"off")=63788
+	Set gtmtypes("node_local",208,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","dbrndwn_access_skip")=208
+	Set gtmtypes("node_local",209,"name")="node_local.fastinteg_in_prog"
+	Set gtmtypes("node_local",209,"off")=121384
 	Set gtmtypes("node_local",209,"len")=4
-	Set gtmtypes("node_local",209,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","filler_8byte_align1")=209
+	Set gtmtypes("node_local",209,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","fastinteg_in_prog")=209
+	Set gtmtypes("node_local",210,"name")="node_local.wtstart_errcnt"
+	Set gtmtypes("node_local",210,"off")=121388
+	Set gtmtypes("node_local",210,"len")=4
+	Set gtmtypes("node_local",210,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","wtstart_errcnt")=210
+	Set gtmtypes("node_local",211,"name")="node_local.fake_db_enospc"
+	Set gtmtypes("node_local",211,"off")=121392
+	Set gtmtypes("node_local",211,"len")=4
+	Set gtmtypes("node_local",211,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","fake_db_enospc")=211
+	Set gtmtypes("node_local",212,"name")="node_local.fake_jnl_enospc"
+	Set gtmtypes("node_local",212,"off")=121396
+	Set gtmtypes("node_local",212,"len")=4
+	Set gtmtypes("node_local",212,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","fake_jnl_enospc")=212
+	Set gtmtypes("node_local",213,"name")="node_local.doing_epoch"
+	Set gtmtypes("node_local",213,"off")=121400
+	Set gtmtypes("node_local",213,"len")=4
+	Set gtmtypes("node_local",213,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","doing_epoch")=213
+	Set gtmtypes("node_local",214,"name")="node_local.epoch_taper_start_dbuffs"
+	Set gtmtypes("node_local",214,"off")=121404
+	Set gtmtypes("node_local",214,"len")=4
+	Set gtmtypes("node_local",214,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","epoch_taper_start_dbuffs")=214
+	Set gtmtypes("node_local",215,"name")="node_local.epoch_taper_need_fsync"
+	Set gtmtypes("node_local",215,"off")=121408
+	Set gtmtypes("node_local",215,"len")=4
+	Set gtmtypes("node_local",215,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","epoch_taper_need_fsync")=215
+	Set gtmtypes("node_local",216,"name")="node_local.wt_pid_array"
+	Set gtmtypes("node_local",216,"off")=121412
+	Set gtmtypes("node_local",216,"len")=16
+	Set gtmtypes("node_local",216,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","wt_pid_array")=216
+	Set gtmtypes("node_local",216,"dim")=4
+	Set gtmtypes("node_local",217,"name")="node_local.reorg_encrypt_pid"
+	Set gtmtypes("node_local",217,"off")=121428
+	Set gtmtypes("node_local",217,"len")=4
+	Set gtmtypes("node_local",217,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","reorg_encrypt_pid")=217
+	Set gtmtypes("node_local",218,"name")="node_local.reorg_encrypt_cycle"
+	Set gtmtypes("node_local",218,"off")=121432
+	Set gtmtypes("node_local",218,"len")=4
+	Set gtmtypes("node_local",218,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","reorg_encrypt_cycle")=218
+	Set gtmtypes("node_local",219,"name")="node_local.mupip_extract_count"
+	Set gtmtypes("node_local",219,"off")=121436
+	Set gtmtypes("node_local",219,"len")=4
+	Set gtmtypes("node_local",219,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","mupip_extract_count")=219
+	Set gtmtypes("node_local",220,"name")="node_local.saved_acc_meth"
+	Set gtmtypes("node_local",220,"off")=121440
+	Set gtmtypes("node_local",220,"len")=4
+	Set gtmtypes("node_local",220,"type")="int"
+	Set gtmtypfldindx("node_local","saved_acc_meth")=220
+	Set gtmtypes("node_local",221,"name")="node_local.saved_blk_size"
+	Set gtmtypes("node_local",221,"off")=121444
+	Set gtmtypes("node_local",221,"len")=4
+	Set gtmtypes("node_local",221,"type")="int"
+	Set gtmtypfldindx("node_local","saved_blk_size")=221
+	Set gtmtypes("node_local",222,"name")="node_local.saved_lock_space_size"
+	Set gtmtypes("node_local",222,"off")=121448
+	Set gtmtypes("node_local",222,"len")=4
+	Set gtmtypes("node_local",222,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","saved_lock_space_size")=222
+	Set gtmtypes("node_local",223,"name")="node_local.saved_jnl_buffer_size"
+	Set gtmtypes("node_local",223,"off")=121452
+	Set gtmtypes("node_local",223,"len")=4
+	Set gtmtypes("node_local",223,"type")="int"
+	Set gtmtypfldindx("node_local","saved_jnl_buffer_size")=223
+	Set gtmtypes("node_local",224,"name")="node_local.lastwriterbypas_msg_issued"
+	Set gtmtypes("node_local",224,"off")=121456
+	Set gtmtypes("node_local",224,"len")=4
+	Set gtmtypes("node_local",224,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","lastwriterbypas_msg_issued")=224
+	Set gtmtypes("node_local",225,"name")="node_local.first_writer_seen"
+	Set gtmtypes("node_local",225,"off")=121460
+	Set gtmtypes("node_local",225,"len")=4
+	Set gtmtypes("node_local",225,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","first_writer_seen")=225
+	Set gtmtypes("node_local",226,"name")="node_local.first_nonbypas_writer_seen"
+	Set gtmtypes("node_local",226,"off")=121464
+	Set gtmtypes("node_local",226,"len")=4
+	Set gtmtypes("node_local",226,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","first_nonbypas_writer_seen")=226
+	Set gtmtypes("node_local",227,"name")="node_local.ftok_counter_halted"
+	Set gtmtypes("node_local",227,"off")=121468
+	Set gtmtypes("node_local",227,"len")=4
+	Set gtmtypes("node_local",227,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","ftok_counter_halted")=227
+	Set gtmtypes("node_local",228,"name")="node_local.access_counter_halted"
+	Set gtmtypes("node_local",228,"off")=121472
+	Set gtmtypes("node_local",228,"len")=4
+	Set gtmtypes("node_local",228,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","access_counter_halted")=228
+	Set gtmtypes("node_local",229,"name")="node_local.statsdb_created"
+	Set gtmtypes("node_local",229,"off")=121476
+	Set gtmtypes("node_local",229,"len")=4
+	Set gtmtypes("node_local",229,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","statsdb_created")=229
+	Set gtmtypes("node_local",230,"name")="node_local.statsdb_fname_len"
+	Set gtmtypes("node_local",230,"off")=121480
+	Set gtmtypes("node_local",230,"len")=4
+	Set gtmtypes("node_local",230,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","statsdb_fname_len")=230
+	Set gtmtypes("node_local",231,"name")="node_local.statsdb_rundown_clean"
+	Set gtmtypes("node_local",231,"off")=121484
+	Set gtmtypes("node_local",231,"len")=4
+	Set gtmtypes("node_local",231,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","statsdb_rundown_clean")=231
+	Set gtmtypes("node_local",232,"name")="node_local.freeze_latch"
+	Set gtmtypes("node_local",232,"off")=121488
+	Set gtmtypes("node_local",232,"len")=8
+	Set gtmtypes("node_local",232,"type")="global_latch_t"
+	Set gtmtypfldindx("node_local","freeze_latch")=232
+	Set gtmtypes("node_local",233,"name")="node_local.freeze_latch.u"
+	Set gtmtypes("node_local",233,"off")=121488
+	Set gtmtypes("node_local",233,"len")=8
+	Set gtmtypes("node_local",233,"type")="union"
+	Set gtmtypfldindx("node_local","freeze_latch.u")=233
+	Set gtmtypes("node_local",234,"name")="node_local.freeze_latch.u.pid_imgcnt"
+	Set gtmtypes("node_local",234,"off")=121488
+	Set gtmtypes("node_local",234,"len")=8
+	Set gtmtypes("node_local",234,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","freeze_latch.u.pid_imgcnt")=234
+	Set gtmtypes("node_local",235,"name")="node_local.freeze_latch.u.parts"
+	Set gtmtypes("node_local",235,"off")=121488
+	Set gtmtypes("node_local",235,"len")=8
+	Set gtmtypes("node_local",235,"type")="struct"
+	Set gtmtypfldindx("node_local","freeze_latch.u.parts")=235
+	Set gtmtypes("node_local",236,"name")="node_local.freeze_latch.u.parts.latch_pid"
+	Set gtmtypes("node_local",236,"off")=121488
+	Set gtmtypes("node_local",236,"len")=4
+	Set gtmtypes("node_local",236,"type")="int"
+	Set gtmtypfldindx("node_local","freeze_latch.u.parts.latch_pid")=236
+	Set gtmtypes("node_local",237,"name")="node_local.freeze_latch.u.parts.latch_word"
+	Set gtmtypes("node_local",237,"off")=121492
+	Set gtmtypes("node_local",237,"len")=4
+	Set gtmtypes("node_local",237,"type")="int"
+	Set gtmtypfldindx("node_local","freeze_latch.u.parts.latch_word")=237
+	Set gtmtypes("node_local",238,"name")="node_local.wcs_buffs_freed"
+	Set gtmtypes("node_local",238,"off")=121496
+	Set gtmtypes("node_local",238,"len")=8
+	Set gtmtypes("node_local",238,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","wcs_buffs_freed")=238
+	Set gtmtypes("node_local",239,"name")="node_local.dskspace_next_fire"
+	Set gtmtypes("node_local",239,"off")=121504
+	Set gtmtypes("node_local",239,"len")=8
+	Set gtmtypes("node_local",239,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","dskspace_next_fire")=239
+	Set gtmtypes("node_local",240,"name")="node_local.lock_crit"
+	Set gtmtypes("node_local",240,"off")=121512
+	Set gtmtypes("node_local",240,"len")=8
+	Set gtmtypes("node_local",240,"type")="global_latch_t"
+	Set gtmtypfldindx("node_local","lock_crit")=240
+	Set gtmtypes("node_local",241,"name")="node_local.lock_crit.u"
+	Set gtmtypes("node_local",241,"off")=121512
+	Set gtmtypes("node_local",241,"len")=8
+	Set gtmtypes("node_local",241,"type")="union"
+	Set gtmtypfldindx("node_local","lock_crit.u")=241
+	Set gtmtypes("node_local",242,"name")="node_local.lock_crit.u.pid_imgcnt"
+	Set gtmtypes("node_local",242,"off")=121512
+	Set gtmtypes("node_local",242,"len")=8
+	Set gtmtypes("node_local",242,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","lock_crit.u.pid_imgcnt")=242
+	Set gtmtypes("node_local",243,"name")="node_local.lock_crit.u.parts"
+	Set gtmtypes("node_local",243,"off")=121512
+	Set gtmtypes("node_local",243,"len")=8
+	Set gtmtypes("node_local",243,"type")="struct"
+	Set gtmtypfldindx("node_local","lock_crit.u.parts")=243
+	Set gtmtypes("node_local",244,"name")="node_local.lock_crit.u.parts.latch_pid"
+	Set gtmtypes("node_local",244,"off")=121512
+	Set gtmtypes("node_local",244,"len")=4
+	Set gtmtypes("node_local",244,"type")="int"
+	Set gtmtypfldindx("node_local","lock_crit.u.parts.latch_pid")=244
+	Set gtmtypes("node_local",245,"name")="node_local.lock_crit.u.parts.latch_word"
+	Set gtmtypes("node_local",245,"off")=121516
+	Set gtmtypes("node_local",245,"len")=4
+	Set gtmtypes("node_local",245,"type")="int"
+	Set gtmtypfldindx("node_local","lock_crit.u.parts.latch_word")=245
+	Set gtmtypes("node_local",246,"name")="node_local.tp_hint"
+	Set gtmtypes("node_local",246,"off")=121520
+	Set gtmtypes("node_local",246,"len")=4
+	Set gtmtypes("node_local",246,"type")="int"
+	Set gtmtypfldindx("node_local","tp_hint")=246
+	Set gtmtypes("node_local",247,"name")="node_local.filler_8byte_align6"
+	Set gtmtypes("node_local",247,"off")=121524
+	Set gtmtypes("node_local",247,"len")=4
+	Set gtmtypes("node_local",247,"type")="int"
+	Set gtmtypfldindx("node_local","filler_8byte_align6")=247
 	;
 	Set gtmtypes("noisolation_element")="struct"
 	Set gtmtypes("noisolation_element",0)=2
@@ -17969,11 +18404,11 @@ Init
 	;
 	Set gtmtypes("octabstruct")="struct"
 	Set gtmtypes("octabstruct",0)=1
-	Set gtmtypes("octabstruct","len")=2
+	Set gtmtypes("octabstruct","len")=4
 	Set gtmtypes("octabstruct",1,"name")="octabstruct.octype"
 	Set gtmtypes("octabstruct",1,"off")=0
-	Set gtmtypes("octabstruct",1,"len")=2
-	Set gtmtypes("octabstruct",1,"type")="unsigned-short"
+	Set gtmtypes("octabstruct",1,"len")=4
+	Set gtmtypes("octabstruct",1,"type")="unsigned-int"
 	Set gtmtypfldindx("octabstruct","octype")=1
 	;
 	Set gtmtypes("omi_cl_stat")="struct"
@@ -22604,8 +23039,8 @@ Init
 	Set gtmtypfldindx("redo_root_search_context","t_tries_dbg")=16
 	;
 	Set gtmtypes("reg_ctl_list")="struct"
-	Set gtmtypes("reg_ctl_list",0)=62
-	Set gtmtypes("reg_ctl_list","len")=472
+	Set gtmtypes("reg_ctl_list",0)=66
+	Set gtmtypes("reg_ctl_list","len")=496
 	Set gtmtypes("reg_ctl_list",1,"name")="reg_ctl_list.db_tn"
 	Set gtmtypes("reg_ctl_list",1,"off")=0
 	Set gtmtypes("reg_ctl_list",1,"len")=8
@@ -22924,6 +23359,26 @@ Init
 	Set gtmtypes("reg_ctl_list",62,"type")="boolean_t"
 	Set gtmtypfldindx("reg_ctl_list","last_jext_logical_rec")=62
 	Set gtmtypes("reg_ctl_list",62,"dim")=3
+	Set gtmtypes("reg_ctl_list",63,"name")="reg_ctl_list.dio_buff"
+	Set gtmtypes("reg_ctl_list",63,"off")=472
+	Set gtmtypes("reg_ctl_list",63,"len")=24
+	Set gtmtypes("reg_ctl_list",63,"type")="dio_buff_t"
+	Set gtmtypfldindx("reg_ctl_list","dio_buff")=63
+	Set gtmtypes("reg_ctl_list",64,"name")="reg_ctl_list.dio_buff.unaligned_size"
+	Set gtmtypes("reg_ctl_list",64,"off")=472
+	Set gtmtypes("reg_ctl_list",64,"len")=4
+	Set gtmtypes("reg_ctl_list",64,"type")="int"
+	Set gtmtypfldindx("reg_ctl_list","dio_buff.unaligned_size")=64
+	Set gtmtypes("reg_ctl_list",65,"name")="reg_ctl_list.dio_buff.unaligned"
+	Set gtmtypes("reg_ctl_list",65,"off")=480
+	Set gtmtypes("reg_ctl_list",65,"len")=8
+	Set gtmtypes("reg_ctl_list",65,"type")="addr"
+	Set gtmtypfldindx("reg_ctl_list","dio_buff.unaligned")=65
+	Set gtmtypes("reg_ctl_list",66,"name")="reg_ctl_list.dio_buff.aligned"
+	Set gtmtypes("reg_ctl_list",66,"off")=488
+	Set gtmtypes("reg_ctl_list",66,"len")=8
+	Set gtmtypes("reg_ctl_list",66,"type")="addr"
+	Set gtmtypfldindx("reg_ctl_list","dio_buff.aligned")=66
 	;
 	Set gtmtypes("reg_jrec_info_t")="struct"
 	Set gtmtypes("reg_jrec_info_t",0)=2
@@ -26013,8 +26468,8 @@ Init
 	Set gtmtypfldindx("sgmm_addrs","filler")=1
 	;
 	Set gtmtypes("sgmnt_addrs")="struct"
-	Set gtmtypes("sgmnt_addrs",0)=141
-	Set gtmtypes("sgmnt_addrs","len")=936
+	Set gtmtypes("sgmnt_addrs",0)=152
+	Set gtmtypes("sgmnt_addrs","len")=992
 	Set gtmtypes("sgmnt_addrs",1,"name")="sgmnt_addrs.hdr"
 	Set gtmtypes("sgmnt_addrs",1,"off")=0
 	Set gtmtypes("sgmnt_addrs",1,"len")=8
@@ -26167,564 +26622,619 @@ Init
 	Set gtmtypes("sgmnt_addrs",30,"len")=8
 	Set gtmtypes("sgmnt_addrs",30,"type")="addr"
 	Set gtmtypfldindx("sgmnt_addrs","acc_meth.bg.cache_state")=30
-	Set gtmtypes("sgmnt_addrs",31,"name")="sgmnt_addrs.gvstats_rec"
+	Set gtmtypes("sgmnt_addrs",31,"name")="sgmnt_addrs.gvstats_rec_p"
 	Set gtmtypes("sgmnt_addrs",31,"off")=224
-	Set gtmtypes("sgmnt_addrs",31,"len")=464
-	Set gtmtypes("sgmnt_addrs",31,"type")="gvstats_rec_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec")=31
-	Set gtmtypes("sgmnt_addrs",32,"name")="sgmnt_addrs.gvstats_rec.n_set"
-	Set gtmtypes("sgmnt_addrs",32,"off")=224
-	Set gtmtypes("sgmnt_addrs",32,"len")=8
-	Set gtmtypes("sgmnt_addrs",32,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_set")=32
-	Set gtmtypes("sgmnt_addrs",33,"name")="sgmnt_addrs.gvstats_rec.n_kill"
+	Set gtmtypes("sgmnt_addrs",31,"len")=8
+	Set gtmtypes("sgmnt_addrs",31,"type")="addr"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec_p")=31
+	Set gtmtypes("sgmnt_addrs",32,"name")="sgmnt_addrs.gvstats_rec"
+	Set gtmtypes("sgmnt_addrs",32,"off")=232
+	Set gtmtypes("sgmnt_addrs",32,"len")=472
+	Set gtmtypes("sgmnt_addrs",32,"type")="gvstats_rec_t"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec")=32
+	Set gtmtypes("sgmnt_addrs",33,"name")="sgmnt_addrs.gvstats_rec.n_set"
 	Set gtmtypes("sgmnt_addrs",33,"off")=232
 	Set gtmtypes("sgmnt_addrs",33,"len")=8
 	Set gtmtypes("sgmnt_addrs",33,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_kill")=33
-	Set gtmtypes("sgmnt_addrs",34,"name")="sgmnt_addrs.gvstats_rec.n_get"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_set")=33
+	Set gtmtypes("sgmnt_addrs",34,"name")="sgmnt_addrs.gvstats_rec.n_kill"
 	Set gtmtypes("sgmnt_addrs",34,"off")=240
 	Set gtmtypes("sgmnt_addrs",34,"len")=8
 	Set gtmtypes("sgmnt_addrs",34,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_get")=34
-	Set gtmtypes("sgmnt_addrs",35,"name")="sgmnt_addrs.gvstats_rec.n_data"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_kill")=34
+	Set gtmtypes("sgmnt_addrs",35,"name")="sgmnt_addrs.gvstats_rec.n_get"
 	Set gtmtypes("sgmnt_addrs",35,"off")=248
 	Set gtmtypes("sgmnt_addrs",35,"len")=8
 	Set gtmtypes("sgmnt_addrs",35,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_data")=35
-	Set gtmtypes("sgmnt_addrs",36,"name")="sgmnt_addrs.gvstats_rec.n_order"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_get")=35
+	Set gtmtypes("sgmnt_addrs",36,"name")="sgmnt_addrs.gvstats_rec.n_data"
 	Set gtmtypes("sgmnt_addrs",36,"off")=256
 	Set gtmtypes("sgmnt_addrs",36,"len")=8
 	Set gtmtypes("sgmnt_addrs",36,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_order")=36
-	Set gtmtypes("sgmnt_addrs",37,"name")="sgmnt_addrs.gvstats_rec.n_zprev"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_data")=36
+	Set gtmtypes("sgmnt_addrs",37,"name")="sgmnt_addrs.gvstats_rec.n_order"
 	Set gtmtypes("sgmnt_addrs",37,"off")=264
 	Set gtmtypes("sgmnt_addrs",37,"len")=8
 	Set gtmtypes("sgmnt_addrs",37,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_zprev")=37
-	Set gtmtypes("sgmnt_addrs",38,"name")="sgmnt_addrs.gvstats_rec.n_query"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_order")=37
+	Set gtmtypes("sgmnt_addrs",38,"name")="sgmnt_addrs.gvstats_rec.n_zprev"
 	Set gtmtypes("sgmnt_addrs",38,"off")=272
 	Set gtmtypes("sgmnt_addrs",38,"len")=8
 	Set gtmtypes("sgmnt_addrs",38,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_query")=38
-	Set gtmtypes("sgmnt_addrs",39,"name")="sgmnt_addrs.gvstats_rec.n_lock_success"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_zprev")=38
+	Set gtmtypes("sgmnt_addrs",39,"name")="sgmnt_addrs.gvstats_rec.n_query"
 	Set gtmtypes("sgmnt_addrs",39,"off")=280
 	Set gtmtypes("sgmnt_addrs",39,"len")=8
 	Set gtmtypes("sgmnt_addrs",39,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_lock_success")=39
-	Set gtmtypes("sgmnt_addrs",40,"name")="sgmnt_addrs.gvstats_rec.n_lock_fail"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_query")=39
+	Set gtmtypes("sgmnt_addrs",40,"name")="sgmnt_addrs.gvstats_rec.n_lock_success"
 	Set gtmtypes("sgmnt_addrs",40,"off")=288
 	Set gtmtypes("sgmnt_addrs",40,"len")=8
 	Set gtmtypes("sgmnt_addrs",40,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_lock_fail")=40
-	Set gtmtypes("sgmnt_addrs",41,"name")="sgmnt_addrs.gvstats_rec.db_curr_tn"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_lock_success")=40
+	Set gtmtypes("sgmnt_addrs",41,"name")="sgmnt_addrs.gvstats_rec.n_lock_fail"
 	Set gtmtypes("sgmnt_addrs",41,"off")=296
 	Set gtmtypes("sgmnt_addrs",41,"len")=8
 	Set gtmtypes("sgmnt_addrs",41,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.db_curr_tn")=41
-	Set gtmtypes("sgmnt_addrs",42,"name")="sgmnt_addrs.gvstats_rec.n_dsk_read"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_lock_fail")=41
+	Set gtmtypes("sgmnt_addrs",42,"name")="sgmnt_addrs.gvstats_rec.db_curr_tn"
 	Set gtmtypes("sgmnt_addrs",42,"off")=304
 	Set gtmtypes("sgmnt_addrs",42,"len")=8
 	Set gtmtypes("sgmnt_addrs",42,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_dsk_read")=42
-	Set gtmtypes("sgmnt_addrs",43,"name")="sgmnt_addrs.gvstats_rec.n_dsk_write"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.db_curr_tn")=42
+	Set gtmtypes("sgmnt_addrs",43,"name")="sgmnt_addrs.gvstats_rec.n_dsk_read"
 	Set gtmtypes("sgmnt_addrs",43,"off")=312
 	Set gtmtypes("sgmnt_addrs",43,"len")=8
 	Set gtmtypes("sgmnt_addrs",43,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_dsk_write")=43
-	Set gtmtypes("sgmnt_addrs",44,"name")="sgmnt_addrs.gvstats_rec.n_nontp_readwrite"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_dsk_read")=43
+	Set gtmtypes("sgmnt_addrs",44,"name")="sgmnt_addrs.gvstats_rec.n_dsk_write"
 	Set gtmtypes("sgmnt_addrs",44,"off")=320
 	Set gtmtypes("sgmnt_addrs",44,"len")=8
 	Set gtmtypes("sgmnt_addrs",44,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_nontp_readwrite")=44
-	Set gtmtypes("sgmnt_addrs",45,"name")="sgmnt_addrs.gvstats_rec.n_nontp_readonly"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_dsk_write")=44
+	Set gtmtypes("sgmnt_addrs",45,"name")="sgmnt_addrs.gvstats_rec.n_nontp_readwrite"
 	Set gtmtypes("sgmnt_addrs",45,"off")=328
 	Set gtmtypes("sgmnt_addrs",45,"len")=8
 	Set gtmtypes("sgmnt_addrs",45,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_nontp_readonly")=45
-	Set gtmtypes("sgmnt_addrs",46,"name")="sgmnt_addrs.gvstats_rec.n_nontp_blkwrite"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_nontp_readwrite")=45
+	Set gtmtypes("sgmnt_addrs",46,"name")="sgmnt_addrs.gvstats_rec.n_nontp_readonly"
 	Set gtmtypes("sgmnt_addrs",46,"off")=336
 	Set gtmtypes("sgmnt_addrs",46,"len")=8
 	Set gtmtypes("sgmnt_addrs",46,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_nontp_blkwrite")=46
-	Set gtmtypes("sgmnt_addrs",47,"name")="sgmnt_addrs.gvstats_rec.n_nontp_blkread"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_nontp_readonly")=46
+	Set gtmtypes("sgmnt_addrs",47,"name")="sgmnt_addrs.gvstats_rec.n_nontp_blkwrite"
 	Set gtmtypes("sgmnt_addrs",47,"off")=344
 	Set gtmtypes("sgmnt_addrs",47,"len")=8
 	Set gtmtypes("sgmnt_addrs",47,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_nontp_blkread")=47
-	Set gtmtypes("sgmnt_addrs",48,"name")="sgmnt_addrs.gvstats_rec.n_nontp_retries_0"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_nontp_blkwrite")=47
+	Set gtmtypes("sgmnt_addrs",48,"name")="sgmnt_addrs.gvstats_rec.n_nontp_blkread"
 	Set gtmtypes("sgmnt_addrs",48,"off")=352
 	Set gtmtypes("sgmnt_addrs",48,"len")=8
 	Set gtmtypes("sgmnt_addrs",48,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_nontp_retries_0")=48
-	Set gtmtypes("sgmnt_addrs",49,"name")="sgmnt_addrs.gvstats_rec.n_nontp_retries_1"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_nontp_blkread")=48
+	Set gtmtypes("sgmnt_addrs",49,"name")="sgmnt_addrs.gvstats_rec.n_nontp_retries_0"
 	Set gtmtypes("sgmnt_addrs",49,"off")=360
 	Set gtmtypes("sgmnt_addrs",49,"len")=8
 	Set gtmtypes("sgmnt_addrs",49,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_nontp_retries_1")=49
-	Set gtmtypes("sgmnt_addrs",50,"name")="sgmnt_addrs.gvstats_rec.n_nontp_retries_2"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_nontp_retries_0")=49
+	Set gtmtypes("sgmnt_addrs",50,"name")="sgmnt_addrs.gvstats_rec.n_nontp_retries_1"
 	Set gtmtypes("sgmnt_addrs",50,"off")=368
 	Set gtmtypes("sgmnt_addrs",50,"len")=8
 	Set gtmtypes("sgmnt_addrs",50,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_nontp_retries_2")=50
-	Set gtmtypes("sgmnt_addrs",51,"name")="sgmnt_addrs.gvstats_rec.n_nontp_retries_3"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_nontp_retries_1")=50
+	Set gtmtypes("sgmnt_addrs",51,"name")="sgmnt_addrs.gvstats_rec.n_nontp_retries_2"
 	Set gtmtypes("sgmnt_addrs",51,"off")=376
 	Set gtmtypes("sgmnt_addrs",51,"len")=8
 	Set gtmtypes("sgmnt_addrs",51,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_nontp_retries_3")=51
-	Set gtmtypes("sgmnt_addrs",52,"name")="sgmnt_addrs.gvstats_rec.n_tp_readwrite"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_nontp_retries_2")=51
+	Set gtmtypes("sgmnt_addrs",52,"name")="sgmnt_addrs.gvstats_rec.n_nontp_retries_3"
 	Set gtmtypes("sgmnt_addrs",52,"off")=384
 	Set gtmtypes("sgmnt_addrs",52,"len")=8
 	Set gtmtypes("sgmnt_addrs",52,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_readwrite")=52
-	Set gtmtypes("sgmnt_addrs",53,"name")="sgmnt_addrs.gvstats_rec.n_tp_readonly"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_nontp_retries_3")=52
+	Set gtmtypes("sgmnt_addrs",53,"name")="sgmnt_addrs.gvstats_rec.n_tp_readwrite"
 	Set gtmtypes("sgmnt_addrs",53,"off")=392
 	Set gtmtypes("sgmnt_addrs",53,"len")=8
 	Set gtmtypes("sgmnt_addrs",53,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_readonly")=53
-	Set gtmtypes("sgmnt_addrs",54,"name")="sgmnt_addrs.gvstats_rec.n_tp_rolledback"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_readwrite")=53
+	Set gtmtypes("sgmnt_addrs",54,"name")="sgmnt_addrs.gvstats_rec.n_tp_readonly"
 	Set gtmtypes("sgmnt_addrs",54,"off")=400
 	Set gtmtypes("sgmnt_addrs",54,"len")=8
 	Set gtmtypes("sgmnt_addrs",54,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_rolledback")=54
-	Set gtmtypes("sgmnt_addrs",55,"name")="sgmnt_addrs.gvstats_rec.n_tp_blkwrite"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_readonly")=54
+	Set gtmtypes("sgmnt_addrs",55,"name")="sgmnt_addrs.gvstats_rec.n_tp_rolledback"
 	Set gtmtypes("sgmnt_addrs",55,"off")=408
 	Set gtmtypes("sgmnt_addrs",55,"len")=8
 	Set gtmtypes("sgmnt_addrs",55,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_blkwrite")=55
-	Set gtmtypes("sgmnt_addrs",56,"name")="sgmnt_addrs.gvstats_rec.n_tp_blkread"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_rolledback")=55
+	Set gtmtypes("sgmnt_addrs",56,"name")="sgmnt_addrs.gvstats_rec.n_tp_blkwrite"
 	Set gtmtypes("sgmnt_addrs",56,"off")=416
 	Set gtmtypes("sgmnt_addrs",56,"len")=8
 	Set gtmtypes("sgmnt_addrs",56,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_blkread")=56
-	Set gtmtypes("sgmnt_addrs",57,"name")="sgmnt_addrs.gvstats_rec.n_tp_tot_retries_0"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_blkwrite")=56
+	Set gtmtypes("sgmnt_addrs",57,"name")="sgmnt_addrs.gvstats_rec.n_tp_blkread"
 	Set gtmtypes("sgmnt_addrs",57,"off")=424
 	Set gtmtypes("sgmnt_addrs",57,"len")=8
 	Set gtmtypes("sgmnt_addrs",57,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_tot_retries_0")=57
-	Set gtmtypes("sgmnt_addrs",58,"name")="sgmnt_addrs.gvstats_rec.n_tp_tot_retries_1"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_blkread")=57
+	Set gtmtypes("sgmnt_addrs",58,"name")="sgmnt_addrs.gvstats_rec.n_tp_tot_retries_0"
 	Set gtmtypes("sgmnt_addrs",58,"off")=432
 	Set gtmtypes("sgmnt_addrs",58,"len")=8
 	Set gtmtypes("sgmnt_addrs",58,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_tot_retries_1")=58
-	Set gtmtypes("sgmnt_addrs",59,"name")="sgmnt_addrs.gvstats_rec.n_tp_tot_retries_2"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_tot_retries_0")=58
+	Set gtmtypes("sgmnt_addrs",59,"name")="sgmnt_addrs.gvstats_rec.n_tp_tot_retries_1"
 	Set gtmtypes("sgmnt_addrs",59,"off")=440
 	Set gtmtypes("sgmnt_addrs",59,"len")=8
 	Set gtmtypes("sgmnt_addrs",59,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_tot_retries_2")=59
-	Set gtmtypes("sgmnt_addrs",60,"name")="sgmnt_addrs.gvstats_rec.n_tp_tot_retries_3"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_tot_retries_1")=59
+	Set gtmtypes("sgmnt_addrs",60,"name")="sgmnt_addrs.gvstats_rec.n_tp_tot_retries_2"
 	Set gtmtypes("sgmnt_addrs",60,"off")=448
 	Set gtmtypes("sgmnt_addrs",60,"len")=8
 	Set gtmtypes("sgmnt_addrs",60,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_tot_retries_3")=60
-	Set gtmtypes("sgmnt_addrs",61,"name")="sgmnt_addrs.gvstats_rec.n_tp_tot_retries_4"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_tot_retries_2")=60
+	Set gtmtypes("sgmnt_addrs",61,"name")="sgmnt_addrs.gvstats_rec.n_tp_tot_retries_3"
 	Set gtmtypes("sgmnt_addrs",61,"off")=456
 	Set gtmtypes("sgmnt_addrs",61,"len")=8
 	Set gtmtypes("sgmnt_addrs",61,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_tot_retries_4")=61
-	Set gtmtypes("sgmnt_addrs",62,"name")="sgmnt_addrs.gvstats_rec.n_tp_cnflct_retries_0"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_tot_retries_3")=61
+	Set gtmtypes("sgmnt_addrs",62,"name")="sgmnt_addrs.gvstats_rec.n_tp_tot_retries_4"
 	Set gtmtypes("sgmnt_addrs",62,"off")=464
 	Set gtmtypes("sgmnt_addrs",62,"len")=8
 	Set gtmtypes("sgmnt_addrs",62,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_cnflct_retries_0")=62
-	Set gtmtypes("sgmnt_addrs",63,"name")="sgmnt_addrs.gvstats_rec.n_tp_cnflct_retries_1"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_tot_retries_4")=62
+	Set gtmtypes("sgmnt_addrs",63,"name")="sgmnt_addrs.gvstats_rec.n_tp_cnflct_retries_0"
 	Set gtmtypes("sgmnt_addrs",63,"off")=472
 	Set gtmtypes("sgmnt_addrs",63,"len")=8
 	Set gtmtypes("sgmnt_addrs",63,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_cnflct_retries_1")=63
-	Set gtmtypes("sgmnt_addrs",64,"name")="sgmnt_addrs.gvstats_rec.n_tp_cnflct_retries_2"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_cnflct_retries_0")=63
+	Set gtmtypes("sgmnt_addrs",64,"name")="sgmnt_addrs.gvstats_rec.n_tp_cnflct_retries_1"
 	Set gtmtypes("sgmnt_addrs",64,"off")=480
 	Set gtmtypes("sgmnt_addrs",64,"len")=8
 	Set gtmtypes("sgmnt_addrs",64,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_cnflct_retries_2")=64
-	Set gtmtypes("sgmnt_addrs",65,"name")="sgmnt_addrs.gvstats_rec.n_tp_cnflct_retries_3"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_cnflct_retries_1")=64
+	Set gtmtypes("sgmnt_addrs",65,"name")="sgmnt_addrs.gvstats_rec.n_tp_cnflct_retries_2"
 	Set gtmtypes("sgmnt_addrs",65,"off")=488
 	Set gtmtypes("sgmnt_addrs",65,"len")=8
 	Set gtmtypes("sgmnt_addrs",65,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_cnflct_retries_3")=65
-	Set gtmtypes("sgmnt_addrs",66,"name")="sgmnt_addrs.gvstats_rec.n_tp_cnflct_retries_4"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_cnflct_retries_2")=65
+	Set gtmtypes("sgmnt_addrs",66,"name")="sgmnt_addrs.gvstats_rec.n_tp_cnflct_retries_3"
 	Set gtmtypes("sgmnt_addrs",66,"off")=496
 	Set gtmtypes("sgmnt_addrs",66,"len")=8
 	Set gtmtypes("sgmnt_addrs",66,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_cnflct_retries_4")=66
-	Set gtmtypes("sgmnt_addrs",67,"name")="sgmnt_addrs.gvstats_rec.n_ztrigger"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_cnflct_retries_3")=66
+	Set gtmtypes("sgmnt_addrs",67,"name")="sgmnt_addrs.gvstats_rec.n_tp_cnflct_retries_4"
 	Set gtmtypes("sgmnt_addrs",67,"off")=504
 	Set gtmtypes("sgmnt_addrs",67,"len")=8
 	Set gtmtypes("sgmnt_addrs",67,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_ztrigger")=67
-	Set gtmtypes("sgmnt_addrs",68,"name")="sgmnt_addrs.gvstats_rec.n_db_flush"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_cnflct_retries_4")=67
+	Set gtmtypes("sgmnt_addrs",68,"name")="sgmnt_addrs.gvstats_rec.n_ztrigger"
 	Set gtmtypes("sgmnt_addrs",68,"off")=512
 	Set gtmtypes("sgmnt_addrs",68,"len")=8
 	Set gtmtypes("sgmnt_addrs",68,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_db_flush")=68
-	Set gtmtypes("sgmnt_addrs",69,"name")="sgmnt_addrs.gvstats_rec.n_db_fsync"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_ztrigger")=68
+	Set gtmtypes("sgmnt_addrs",69,"name")="sgmnt_addrs.gvstats_rec.n_db_flush"
 	Set gtmtypes("sgmnt_addrs",69,"off")=520
 	Set gtmtypes("sgmnt_addrs",69,"len")=8
 	Set gtmtypes("sgmnt_addrs",69,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_db_fsync")=69
-	Set gtmtypes("sgmnt_addrs",70,"name")="sgmnt_addrs.gvstats_rec.n_jnl_flush"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_db_flush")=69
+	Set gtmtypes("sgmnt_addrs",70,"name")="sgmnt_addrs.gvstats_rec.n_db_fsync"
 	Set gtmtypes("sgmnt_addrs",70,"off")=528
 	Set gtmtypes("sgmnt_addrs",70,"len")=8
 	Set gtmtypes("sgmnt_addrs",70,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jnl_flush")=70
-	Set gtmtypes("sgmnt_addrs",71,"name")="sgmnt_addrs.gvstats_rec.n_jnl_fsync"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_db_fsync")=70
+	Set gtmtypes("sgmnt_addrs",71,"name")="sgmnt_addrs.gvstats_rec.n_jnl_flush"
 	Set gtmtypes("sgmnt_addrs",71,"off")=536
 	Set gtmtypes("sgmnt_addrs",71,"len")=8
 	Set gtmtypes("sgmnt_addrs",71,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jnl_fsync")=71
-	Set gtmtypes("sgmnt_addrs",72,"name")="sgmnt_addrs.gvstats_rec.n_jbuff_bytes"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jnl_flush")=71
+	Set gtmtypes("sgmnt_addrs",72,"name")="sgmnt_addrs.gvstats_rec.n_jnl_fsync"
 	Set gtmtypes("sgmnt_addrs",72,"off")=544
 	Set gtmtypes("sgmnt_addrs",72,"len")=8
 	Set gtmtypes("sgmnt_addrs",72,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jbuff_bytes")=72
-	Set gtmtypes("sgmnt_addrs",73,"name")="sgmnt_addrs.gvstats_rec.n_jfile_bytes"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jnl_fsync")=72
+	Set gtmtypes("sgmnt_addrs",73,"name")="sgmnt_addrs.gvstats_rec.n_jbuff_bytes"
 	Set gtmtypes("sgmnt_addrs",73,"off")=552
 	Set gtmtypes("sgmnt_addrs",73,"len")=8
 	Set gtmtypes("sgmnt_addrs",73,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jfile_bytes")=73
-	Set gtmtypes("sgmnt_addrs",74,"name")="sgmnt_addrs.gvstats_rec.n_jfile_writes"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jbuff_bytes")=73
+	Set gtmtypes("sgmnt_addrs",74,"name")="sgmnt_addrs.gvstats_rec.n_jfile_bytes"
 	Set gtmtypes("sgmnt_addrs",74,"off")=560
 	Set gtmtypes("sgmnt_addrs",74,"len")=8
 	Set gtmtypes("sgmnt_addrs",74,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jfile_writes")=74
-	Set gtmtypes("sgmnt_addrs",75,"name")="sgmnt_addrs.gvstats_rec.n_jrec_logical"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jfile_bytes")=74
+	Set gtmtypes("sgmnt_addrs",75,"name")="sgmnt_addrs.gvstats_rec.n_jfile_writes"
 	Set gtmtypes("sgmnt_addrs",75,"off")=568
 	Set gtmtypes("sgmnt_addrs",75,"len")=8
 	Set gtmtypes("sgmnt_addrs",75,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jrec_logical")=75
-	Set gtmtypes("sgmnt_addrs",76,"name")="sgmnt_addrs.gvstats_rec.n_jrec_pblk"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jfile_writes")=75
+	Set gtmtypes("sgmnt_addrs",76,"name")="sgmnt_addrs.gvstats_rec.n_jrec_logical"
 	Set gtmtypes("sgmnt_addrs",76,"off")=576
 	Set gtmtypes("sgmnt_addrs",76,"len")=8
 	Set gtmtypes("sgmnt_addrs",76,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jrec_pblk")=76
-	Set gtmtypes("sgmnt_addrs",77,"name")="sgmnt_addrs.gvstats_rec.n_jrec_epoch_regular"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jrec_logical")=76
+	Set gtmtypes("sgmnt_addrs",77,"name")="sgmnt_addrs.gvstats_rec.n_jrec_pblk"
 	Set gtmtypes("sgmnt_addrs",77,"off")=584
 	Set gtmtypes("sgmnt_addrs",77,"len")=8
 	Set gtmtypes("sgmnt_addrs",77,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jrec_epoch_regular")=77
-	Set gtmtypes("sgmnt_addrs",78,"name")="sgmnt_addrs.gvstats_rec.n_jrec_epoch_idle"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jrec_pblk")=77
+	Set gtmtypes("sgmnt_addrs",78,"name")="sgmnt_addrs.gvstats_rec.n_jrec_epoch_regular"
 	Set gtmtypes("sgmnt_addrs",78,"off")=592
 	Set gtmtypes("sgmnt_addrs",78,"len")=8
 	Set gtmtypes("sgmnt_addrs",78,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jrec_epoch_idle")=78
-	Set gtmtypes("sgmnt_addrs",79,"name")="sgmnt_addrs.gvstats_rec.n_jrec_other"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jrec_epoch_regular")=78
+	Set gtmtypes("sgmnt_addrs",79,"name")="sgmnt_addrs.gvstats_rec.n_jrec_epoch_idle"
 	Set gtmtypes("sgmnt_addrs",79,"off")=600
 	Set gtmtypes("sgmnt_addrs",79,"len")=8
 	Set gtmtypes("sgmnt_addrs",79,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jrec_other")=79
-	Set gtmtypes("sgmnt_addrs",80,"name")="sgmnt_addrs.gvstats_rec.n_jnl_extends"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jrec_epoch_idle")=79
+	Set gtmtypes("sgmnt_addrs",80,"name")="sgmnt_addrs.gvstats_rec.n_jrec_other"
 	Set gtmtypes("sgmnt_addrs",80,"off")=608
 	Set gtmtypes("sgmnt_addrs",80,"len")=8
 	Set gtmtypes("sgmnt_addrs",80,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jnl_extends")=80
-	Set gtmtypes("sgmnt_addrs",81,"name")="sgmnt_addrs.gvstats_rec.n_db_extends"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jrec_other")=80
+	Set gtmtypes("sgmnt_addrs",81,"name")="sgmnt_addrs.gvstats_rec.n_jnl_extends"
 	Set gtmtypes("sgmnt_addrs",81,"off")=616
 	Set gtmtypes("sgmnt_addrs",81,"len")=8
 	Set gtmtypes("sgmnt_addrs",81,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_db_extends")=81
-	Set gtmtypes("sgmnt_addrs",82,"name")="sgmnt_addrs.gvstats_rec.n_crit_success"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jnl_extends")=81
+	Set gtmtypes("sgmnt_addrs",82,"name")="sgmnt_addrs.gvstats_rec.n_db_extends"
 	Set gtmtypes("sgmnt_addrs",82,"off")=624
 	Set gtmtypes("sgmnt_addrs",82,"len")=8
 	Set gtmtypes("sgmnt_addrs",82,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_crit_success")=82
-	Set gtmtypes("sgmnt_addrs",83,"name")="sgmnt_addrs.gvstats_rec.n_crits_in_epch"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_db_extends")=82
+	Set gtmtypes("sgmnt_addrs",83,"name")="sgmnt_addrs.gvstats_rec.n_crit_success"
 	Set gtmtypes("sgmnt_addrs",83,"off")=632
 	Set gtmtypes("sgmnt_addrs",83,"len")=8
 	Set gtmtypes("sgmnt_addrs",83,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_crits_in_epch")=83
-	Set gtmtypes("sgmnt_addrs",84,"name")="sgmnt_addrs.gvstats_rec.sq_crit_failed"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_crit_success")=83
+	Set gtmtypes("sgmnt_addrs",84,"name")="sgmnt_addrs.gvstats_rec.n_crits_in_epch"
 	Set gtmtypes("sgmnt_addrs",84,"off")=640
 	Set gtmtypes("sgmnt_addrs",84,"len")=8
 	Set gtmtypes("sgmnt_addrs",84,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.sq_crit_failed")=84
-	Set gtmtypes("sgmnt_addrs",85,"name")="sgmnt_addrs.gvstats_rec.n_crit_failed"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_crits_in_epch")=84
+	Set gtmtypes("sgmnt_addrs",85,"name")="sgmnt_addrs.gvstats_rec.sq_crit_failed"
 	Set gtmtypes("sgmnt_addrs",85,"off")=648
 	Set gtmtypes("sgmnt_addrs",85,"len")=8
 	Set gtmtypes("sgmnt_addrs",85,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_crit_failed")=85
-	Set gtmtypes("sgmnt_addrs",86,"name")="sgmnt_addrs.gvstats_rec.sq_crit_que_slps"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.sq_crit_failed")=85
+	Set gtmtypes("sgmnt_addrs",86,"name")="sgmnt_addrs.gvstats_rec.n_crit_failed"
 	Set gtmtypes("sgmnt_addrs",86,"off")=656
 	Set gtmtypes("sgmnt_addrs",86,"len")=8
 	Set gtmtypes("sgmnt_addrs",86,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.sq_crit_que_slps")=86
-	Set gtmtypes("sgmnt_addrs",87,"name")="sgmnt_addrs.gvstats_rec.n_crit_que_slps"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_crit_failed")=86
+	Set gtmtypes("sgmnt_addrs",87,"name")="sgmnt_addrs.gvstats_rec.sq_crit_que_slps"
 	Set gtmtypes("sgmnt_addrs",87,"off")=664
 	Set gtmtypes("sgmnt_addrs",87,"len")=8
 	Set gtmtypes("sgmnt_addrs",87,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_crit_que_slps")=87
-	Set gtmtypes("sgmnt_addrs",88,"name")="sgmnt_addrs.gvstats_rec.sq_crit_yields"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.sq_crit_que_slps")=87
+	Set gtmtypes("sgmnt_addrs",88,"name")="sgmnt_addrs.gvstats_rec.n_crit_que_slps"
 	Set gtmtypes("sgmnt_addrs",88,"off")=672
 	Set gtmtypes("sgmnt_addrs",88,"len")=8
 	Set gtmtypes("sgmnt_addrs",88,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.sq_crit_yields")=88
-	Set gtmtypes("sgmnt_addrs",89,"name")="sgmnt_addrs.gvstats_rec.n_crit_yields"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_crit_que_slps")=88
+	Set gtmtypes("sgmnt_addrs",89,"name")="sgmnt_addrs.gvstats_rec.sq_crit_yields"
 	Set gtmtypes("sgmnt_addrs",89,"off")=680
 	Set gtmtypes("sgmnt_addrs",89,"len")=8
 	Set gtmtypes("sgmnt_addrs",89,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_crit_yields")=89
-	Set gtmtypes("sgmnt_addrs",90,"name")="sgmnt_addrs.dbsync_timer_tn"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.sq_crit_yields")=89
+	Set gtmtypes("sgmnt_addrs",90,"name")="sgmnt_addrs.gvstats_rec.n_crit_yields"
 	Set gtmtypes("sgmnt_addrs",90,"off")=688
 	Set gtmtypes("sgmnt_addrs",90,"len")=8
 	Set gtmtypes("sgmnt_addrs",90,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","dbsync_timer_tn")=90
-	Set gtmtypes("sgmnt_addrs",91,"name")="sgmnt_addrs.fullblockwrite_len"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_crit_yields")=90
+	Set gtmtypes("sgmnt_addrs",91,"name")="sgmnt_addrs.gvstats_rec.n_clean2dirty"
 	Set gtmtypes("sgmnt_addrs",91,"off")=696
 	Set gtmtypes("sgmnt_addrs",91,"len")=8
-	Set gtmtypes("sgmnt_addrs",91,"type")="size_t"
-	Set gtmtypfldindx("sgmnt_addrs","fullblockwrite_len")=91
-	Set gtmtypes("sgmnt_addrs",92,"name")="sgmnt_addrs.total_blks"
+	Set gtmtypes("sgmnt_addrs",91,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_clean2dirty")=91
+	Set gtmtypes("sgmnt_addrs",92,"name")="sgmnt_addrs.dbsync_timer_tn"
 	Set gtmtypes("sgmnt_addrs",92,"off")=704
-	Set gtmtypes("sgmnt_addrs",92,"len")=4
-	Set gtmtypes("sgmnt_addrs",92,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_addrs","total_blks")=92
-	Set gtmtypes("sgmnt_addrs",93,"name")="sgmnt_addrs.prev_free_blks"
-	Set gtmtypes("sgmnt_addrs",93,"off")=708
-	Set gtmtypes("sgmnt_addrs",93,"len")=4
-	Set gtmtypes("sgmnt_addrs",93,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_addrs","prev_free_blks")=93
-	Set gtmtypes("sgmnt_addrs",94,"name")="sgmnt_addrs.timer"
-	Set gtmtypes("sgmnt_addrs",94,"off")=712
-	Set gtmtypes("sgmnt_addrs",94,"len")=4
-	Set gtmtypes("sgmnt_addrs",94,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_addrs","timer")=94
-	Set gtmtypes("sgmnt_addrs",95,"name")="sgmnt_addrs.in_wtstart"
-	Set gtmtypes("sgmnt_addrs",95,"off")=716
-	Set gtmtypes("sgmnt_addrs",95,"len")=4
-	Set gtmtypes("sgmnt_addrs",95,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_addrs","in_wtstart")=95
-	Set gtmtypes("sgmnt_addrs",96,"name")="sgmnt_addrs.now_crit"
-	Set gtmtypes("sgmnt_addrs",96,"off")=720
+	Set gtmtypes("sgmnt_addrs",92,"len")=8
+	Set gtmtypes("sgmnt_addrs",92,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_addrs","dbsync_timer_tn")=92
+	Set gtmtypes("sgmnt_addrs",93,"name")="sgmnt_addrs.our_midnite"
+	Set gtmtypes("sgmnt_addrs",93,"off")=712
+	Set gtmtypes("sgmnt_addrs",93,"len")=8
+	Set gtmtypes("sgmnt_addrs",93,"type")="addr"
+	Set gtmtypfldindx("sgmnt_addrs","our_midnite")=93
+	Set gtmtypes("sgmnt_addrs",94,"name")="sgmnt_addrs.fullblockwrite_len"
+	Set gtmtypes("sgmnt_addrs",94,"off")=720
+	Set gtmtypes("sgmnt_addrs",94,"len")=8
+	Set gtmtypes("sgmnt_addrs",94,"type")="size_t"
+	Set gtmtypfldindx("sgmnt_addrs","fullblockwrite_len")=94
+	Set gtmtypes("sgmnt_addrs",95,"name")="sgmnt_addrs.our_lru_cache_rec_off"
+	Set gtmtypes("sgmnt_addrs",95,"off")=728
+	Set gtmtypes("sgmnt_addrs",95,"len")=8
+	Set gtmtypes("sgmnt_addrs",95,"type")="intptr_t"
+	Set gtmtypfldindx("sgmnt_addrs","our_lru_cache_rec_off")=95
+	Set gtmtypes("sgmnt_addrs",96,"name")="sgmnt_addrs.total_blks"
+	Set gtmtypes("sgmnt_addrs",96,"off")=736
 	Set gtmtypes("sgmnt_addrs",96,"len")=4
 	Set gtmtypes("sgmnt_addrs",96,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_addrs","now_crit")=96
-	Set gtmtypes("sgmnt_addrs",97,"name")="sgmnt_addrs.wbuf_dqd"
-	Set gtmtypes("sgmnt_addrs",97,"off")=724
+	Set gtmtypfldindx("sgmnt_addrs","total_blks")=96
+	Set gtmtypes("sgmnt_addrs",97,"name")="sgmnt_addrs.prev_free_blks"
+	Set gtmtypes("sgmnt_addrs",97,"off")=740
 	Set gtmtypes("sgmnt_addrs",97,"len")=4
 	Set gtmtypes("sgmnt_addrs",97,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_addrs","wbuf_dqd")=97
-	Set gtmtypes("sgmnt_addrs",98,"name")="sgmnt_addrs.stale_defer"
-	Set gtmtypes("sgmnt_addrs",98,"off")=728
+	Set gtmtypfldindx("sgmnt_addrs","prev_free_blks")=97
+	Set gtmtypes("sgmnt_addrs",98,"name")="sgmnt_addrs.timer"
+	Set gtmtypes("sgmnt_addrs",98,"off")=744
 	Set gtmtypes("sgmnt_addrs",98,"len")=4
 	Set gtmtypes("sgmnt_addrs",98,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_addrs","stale_defer")=98
-	Set gtmtypes("sgmnt_addrs",99,"name")="sgmnt_addrs.freeze"
-	Set gtmtypes("sgmnt_addrs",99,"off")=732
+	Set gtmtypfldindx("sgmnt_addrs","timer")=98
+	Set gtmtypes("sgmnt_addrs",99,"name")="sgmnt_addrs.in_wtstart"
+	Set gtmtypes("sgmnt_addrs",99,"off")=748
 	Set gtmtypes("sgmnt_addrs",99,"len")=4
-	Set gtmtypes("sgmnt_addrs",99,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_addrs","freeze")=99
-	Set gtmtypes("sgmnt_addrs",100,"name")="sgmnt_addrs.dbsync_timer"
-	Set gtmtypes("sgmnt_addrs",100,"off")=736
+	Set gtmtypes("sgmnt_addrs",99,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_addrs","in_wtstart")=99
+	Set gtmtypes("sgmnt_addrs",100,"name")="sgmnt_addrs.now_crit"
+	Set gtmtypes("sgmnt_addrs",100,"off")=752
 	Set gtmtypes("sgmnt_addrs",100,"len")=4
-	Set gtmtypes("sgmnt_addrs",100,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_addrs","dbsync_timer")=100
-	Set gtmtypes("sgmnt_addrs",101,"name")="sgmnt_addrs.reorg_last_dest"
-	Set gtmtypes("sgmnt_addrs",101,"off")=740
+	Set gtmtypes("sgmnt_addrs",100,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_addrs","now_crit")=100
+	Set gtmtypes("sgmnt_addrs",101,"name")="sgmnt_addrs.wbuf_dqd"
+	Set gtmtypes("sgmnt_addrs",101,"off")=756
 	Set gtmtypes("sgmnt_addrs",101,"len")=4
-	Set gtmtypes("sgmnt_addrs",101,"type")="int"
-	Set gtmtypfldindx("sgmnt_addrs","reorg_last_dest")=101
-	Set gtmtypes("sgmnt_addrs",102,"name")="sgmnt_addrs.jnl_before_image"
-	Set gtmtypes("sgmnt_addrs",102,"off")=744
+	Set gtmtypes("sgmnt_addrs",101,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_addrs","wbuf_dqd")=101
+	Set gtmtypes("sgmnt_addrs",102,"name")="sgmnt_addrs.stale_defer"
+	Set gtmtypes("sgmnt_addrs",102,"off")=760
 	Set gtmtypes("sgmnt_addrs",102,"len")=4
-	Set gtmtypes("sgmnt_addrs",102,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_addrs","jnl_before_image")=102
-	Set gtmtypes("sgmnt_addrs",103,"name")="sgmnt_addrs.read_write"
-	Set gtmtypes("sgmnt_addrs",103,"off")=748
+	Set gtmtypes("sgmnt_addrs",102,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_addrs","stale_defer")=102
+	Set gtmtypes("sgmnt_addrs",103,"name")="sgmnt_addrs.freeze"
+	Set gtmtypes("sgmnt_addrs",103,"off")=764
 	Set gtmtypes("sgmnt_addrs",103,"len")=4
 	Set gtmtypes("sgmnt_addrs",103,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_addrs","read_write")=103
-	Set gtmtypes("sgmnt_addrs",104,"name")="sgmnt_addrs.persistent_freeze"
-	Set gtmtypes("sgmnt_addrs",104,"off")=752
+	Set gtmtypfldindx("sgmnt_addrs","freeze")=103
+	Set gtmtypes("sgmnt_addrs",104,"name")="sgmnt_addrs.dbsync_timer"
+	Set gtmtypes("sgmnt_addrs",104,"off")=768
 	Set gtmtypes("sgmnt_addrs",104,"len")=4
 	Set gtmtypes("sgmnt_addrs",104,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_addrs","persistent_freeze")=104
-	Set gtmtypes("sgmnt_addrs",105,"name")="sgmnt_addrs.pblk_align_jrecsize"
-	Set gtmtypes("sgmnt_addrs",105,"off")=756
+	Set gtmtypfldindx("sgmnt_addrs","dbsync_timer")=104
+	Set gtmtypes("sgmnt_addrs",105,"name")="sgmnt_addrs.reorg_last_dest"
+	Set gtmtypes("sgmnt_addrs",105,"off")=772
 	Set gtmtypes("sgmnt_addrs",105,"len")=4
 	Set gtmtypes("sgmnt_addrs",105,"type")="int"
-	Set gtmtypfldindx("sgmnt_addrs","pblk_align_jrecsize")=105
-	Set gtmtypes("sgmnt_addrs",106,"name")="sgmnt_addrs.min_total_tpjnl_rec_size"
-	Set gtmtypes("sgmnt_addrs",106,"off")=760
+	Set gtmtypfldindx("sgmnt_addrs","reorg_last_dest")=105
+	Set gtmtypes("sgmnt_addrs",106,"name")="sgmnt_addrs.jnl_before_image"
+	Set gtmtypes("sgmnt_addrs",106,"off")=776
 	Set gtmtypes("sgmnt_addrs",106,"len")=4
-	Set gtmtypes("sgmnt_addrs",106,"type")="int"
-	Set gtmtypfldindx("sgmnt_addrs","min_total_tpjnl_rec_size")=106
-	Set gtmtypes("sgmnt_addrs",107,"name")="sgmnt_addrs.min_total_nontpjnl_rec_size"
-	Set gtmtypes("sgmnt_addrs",107,"off")=764
+	Set gtmtypes("sgmnt_addrs",106,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_addrs","jnl_before_image")=106
+	Set gtmtypes("sgmnt_addrs",107,"name")="sgmnt_addrs.read_write"
+	Set gtmtypes("sgmnt_addrs",107,"off")=780
 	Set gtmtypes("sgmnt_addrs",107,"len")=4
-	Set gtmtypes("sgmnt_addrs",107,"type")="int"
-	Set gtmtypfldindx("sgmnt_addrs","min_total_nontpjnl_rec_size")=107
-	Set gtmtypes("sgmnt_addrs",108,"name")="sgmnt_addrs.jnl_state"
-	Set gtmtypes("sgmnt_addrs",108,"off")=768
+	Set gtmtypes("sgmnt_addrs",107,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_addrs","read_write")=107
+	Set gtmtypes("sgmnt_addrs",108,"name")="sgmnt_addrs.orig_read_write"
+	Set gtmtypes("sgmnt_addrs",108,"off")=784
 	Set gtmtypes("sgmnt_addrs",108,"len")=4
-	Set gtmtypes("sgmnt_addrs",108,"type")="int"
-	Set gtmtypfldindx("sgmnt_addrs","jnl_state")=108
-	Set gtmtypes("sgmnt_addrs",109,"name")="sgmnt_addrs.repl_state"
-	Set gtmtypes("sgmnt_addrs",109,"off")=772
+	Set gtmtypes("sgmnt_addrs",108,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_addrs","orig_read_write")=108
+	Set gtmtypes("sgmnt_addrs",109,"name")="sgmnt_addrs.persistent_freeze"
+	Set gtmtypes("sgmnt_addrs",109,"off")=788
 	Set gtmtypes("sgmnt_addrs",109,"len")=4
-	Set gtmtypes("sgmnt_addrs",109,"type")="int"
-	Set gtmtypfldindx("sgmnt_addrs","repl_state")=109
-	Set gtmtypes("sgmnt_addrs",110,"name")="sgmnt_addrs.crit_check_cycle"
-	Set gtmtypes("sgmnt_addrs",110,"off")=776
+	Set gtmtypes("sgmnt_addrs",109,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_addrs","persistent_freeze")=109
+	Set gtmtypes("sgmnt_addrs",110,"name")="sgmnt_addrs.pblk_align_jrecsize"
+	Set gtmtypes("sgmnt_addrs",110,"off")=792
 	Set gtmtypes("sgmnt_addrs",110,"len")=4
-	Set gtmtypes("sgmnt_addrs",110,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_addrs","crit_check_cycle")=110
-	Set gtmtypes("sgmnt_addrs",111,"name")="sgmnt_addrs.backup_in_prog"
-	Set gtmtypes("sgmnt_addrs",111,"off")=780
+	Set gtmtypes("sgmnt_addrs",110,"type")="int"
+	Set gtmtypfldindx("sgmnt_addrs","pblk_align_jrecsize")=110
+	Set gtmtypes("sgmnt_addrs",111,"name")="sgmnt_addrs.min_total_tpjnl_rec_size"
+	Set gtmtypes("sgmnt_addrs",111,"off")=796
 	Set gtmtypes("sgmnt_addrs",111,"len")=4
 	Set gtmtypes("sgmnt_addrs",111,"type")="int"
-	Set gtmtypfldindx("sgmnt_addrs","backup_in_prog")=111
-	Set gtmtypes("sgmnt_addrs",112,"name")="sgmnt_addrs.snapshot_in_prog"
-	Set gtmtypes("sgmnt_addrs",112,"off")=784
+	Set gtmtypfldindx("sgmnt_addrs","min_total_tpjnl_rec_size")=111
+	Set gtmtypes("sgmnt_addrs",112,"name")="sgmnt_addrs.min_total_nontpjnl_rec_size"
+	Set gtmtypes("sgmnt_addrs",112,"off")=800
 	Set gtmtypes("sgmnt_addrs",112,"len")=4
-	Set gtmtypes("sgmnt_addrs",112,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_addrs","snapshot_in_prog")=112
-	Set gtmtypes("sgmnt_addrs",113,"name")="sgmnt_addrs.ref_cnt"
-	Set gtmtypes("sgmnt_addrs",113,"off")=788
+	Set gtmtypes("sgmnt_addrs",112,"type")="int"
+	Set gtmtypfldindx("sgmnt_addrs","min_total_nontpjnl_rec_size")=112
+	Set gtmtypes("sgmnt_addrs",113,"name")="sgmnt_addrs.jnl_state"
+	Set gtmtypes("sgmnt_addrs",113,"off")=804
 	Set gtmtypes("sgmnt_addrs",113,"len")=4
 	Set gtmtypes("sgmnt_addrs",113,"type")="int"
-	Set gtmtypfldindx("sgmnt_addrs","ref_cnt")=113
-	Set gtmtypes("sgmnt_addrs",114,"name")="sgmnt_addrs.fid_index"
-	Set gtmtypes("sgmnt_addrs",114,"off")=792
+	Set gtmtypfldindx("sgmnt_addrs","jnl_state")=113
+	Set gtmtypes("sgmnt_addrs",114,"name")="sgmnt_addrs.repl_state"
+	Set gtmtypes("sgmnt_addrs",114,"off")=808
 	Set gtmtypes("sgmnt_addrs",114,"len")=4
 	Set gtmtypes("sgmnt_addrs",114,"type")="int"
-	Set gtmtypfldindx("sgmnt_addrs","fid_index")=114
-	Set gtmtypes("sgmnt_addrs",115,"name")="sgmnt_addrs.do_fullblockwrites"
-	Set gtmtypes("sgmnt_addrs",115,"off")=796
+	Set gtmtypfldindx("sgmnt_addrs","repl_state")=114
+	Set gtmtypes("sgmnt_addrs",115,"name")="sgmnt_addrs.crit_check_cycle"
+	Set gtmtypes("sgmnt_addrs",115,"off")=812
 	Set gtmtypes("sgmnt_addrs",115,"len")=4
-	Set gtmtypes("sgmnt_addrs",115,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_addrs","do_fullblockwrites")=115
-	Set gtmtypes("sgmnt_addrs",116,"name")="sgmnt_addrs.regnum"
-	Set gtmtypes("sgmnt_addrs",116,"off")=800
+	Set gtmtypes("sgmnt_addrs",115,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_addrs","crit_check_cycle")=115
+	Set gtmtypes("sgmnt_addrs",116,"name")="sgmnt_addrs.backup_in_prog"
+	Set gtmtypes("sgmnt_addrs",116,"off")=816
 	Set gtmtypes("sgmnt_addrs",116,"len")=4
 	Set gtmtypes("sgmnt_addrs",116,"type")="int"
-	Set gtmtypfldindx("sgmnt_addrs","regnum")=116
-	Set gtmtypes("sgmnt_addrs",117,"name")="sgmnt_addrs.n_pre_read_trigger"
-	Set gtmtypes("sgmnt_addrs",117,"off")=804
+	Set gtmtypfldindx("sgmnt_addrs","backup_in_prog")=116
+	Set gtmtypes("sgmnt_addrs",117,"name")="sgmnt_addrs.snapshot_in_prog"
+	Set gtmtypes("sgmnt_addrs",117,"off")=820
 	Set gtmtypes("sgmnt_addrs",117,"len")=4
-	Set gtmtypes("sgmnt_addrs",117,"type")="int"
-	Set gtmtypfldindx("sgmnt_addrs","n_pre_read_trigger")=117
-	Set gtmtypes("sgmnt_addrs",118,"name")="sgmnt_addrs.jnlpool_validate_check"
-	Set gtmtypes("sgmnt_addrs",118,"off")=808
+	Set gtmtypes("sgmnt_addrs",117,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_addrs","snapshot_in_prog")=117
+	Set gtmtypes("sgmnt_addrs",118,"name")="sgmnt_addrs.ref_cnt"
+	Set gtmtypes("sgmnt_addrs",118,"off")=824
 	Set gtmtypes("sgmnt_addrs",118,"len")=4
-	Set gtmtypes("sgmnt_addrs",118,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_addrs","jnlpool_validate_check")=118
-	Set gtmtypes("sgmnt_addrs",119,"name")="sgmnt_addrs.regcnt"
-	Set gtmtypes("sgmnt_addrs",119,"off")=812
+	Set gtmtypes("sgmnt_addrs",118,"type")="int"
+	Set gtmtypfldindx("sgmnt_addrs","ref_cnt")=118
+	Set gtmtypes("sgmnt_addrs",119,"name")="sgmnt_addrs.fid_index"
+	Set gtmtypes("sgmnt_addrs",119,"off")=828
 	Set gtmtypes("sgmnt_addrs",119,"len")=4
 	Set gtmtypes("sgmnt_addrs",119,"type")="int"
-	Set gtmtypfldindx("sgmnt_addrs","regcnt")=119
-	Set gtmtypes("sgmnt_addrs",120,"name")="sgmnt_addrs.t_commit_crit"
-	Set gtmtypes("sgmnt_addrs",120,"off")=816
+	Set gtmtypfldindx("sgmnt_addrs","fid_index")=119
+	Set gtmtypes("sgmnt_addrs",120,"name")="sgmnt_addrs.do_fullblockwrites"
+	Set gtmtypes("sgmnt_addrs",120,"off")=832
 	Set gtmtypes("sgmnt_addrs",120,"len")=4
 	Set gtmtypes("sgmnt_addrs",120,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_addrs","t_commit_crit")=120
-	Set gtmtypes("sgmnt_addrs",121,"name")="sgmnt_addrs.wcs_pidcnt_incremented"
-	Set gtmtypes("sgmnt_addrs",121,"off")=820
+	Set gtmtypfldindx("sgmnt_addrs","do_fullblockwrites")=120
+	Set gtmtypes("sgmnt_addrs",121,"name")="sgmnt_addrs.regnum"
+	Set gtmtypes("sgmnt_addrs",121,"off")=836
 	Set gtmtypes("sgmnt_addrs",121,"len")=4
-	Set gtmtypes("sgmnt_addrs",121,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_addrs","wcs_pidcnt_incremented")=121
-	Set gtmtypes("sgmnt_addrs",122,"name")="sgmnt_addrs.incr_db_trigger_cycle"
-	Set gtmtypes("sgmnt_addrs",122,"off")=824
+	Set gtmtypes("sgmnt_addrs",121,"type")="int"
+	Set gtmtypfldindx("sgmnt_addrs","regnum")=121
+	Set gtmtypes("sgmnt_addrs",122,"name")="sgmnt_addrs.n_pre_read_trigger"
+	Set gtmtypes("sgmnt_addrs",122,"off")=840
 	Set gtmtypes("sgmnt_addrs",122,"len")=4
-	Set gtmtypes("sgmnt_addrs",122,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_addrs","incr_db_trigger_cycle")=122
-	Set gtmtypes("sgmnt_addrs",123,"name")="sgmnt_addrs.db_trigger_cycle"
-	Set gtmtypes("sgmnt_addrs",123,"off")=828
+	Set gtmtypes("sgmnt_addrs",122,"type")="int"
+	Set gtmtypfldindx("sgmnt_addrs","n_pre_read_trigger")=122
+	Set gtmtypes("sgmnt_addrs",123,"name")="sgmnt_addrs.jnlpool_validate_check"
+	Set gtmtypes("sgmnt_addrs",123,"off")=844
 	Set gtmtypes("sgmnt_addrs",123,"len")=4
 	Set gtmtypes("sgmnt_addrs",123,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_addrs","db_trigger_cycle")=123
-	Set gtmtypes("sgmnt_addrs",124,"name")="sgmnt_addrs.db_dztrigger_cycle"
-	Set gtmtypes("sgmnt_addrs",124,"off")=832
+	Set gtmtypfldindx("sgmnt_addrs","jnlpool_validate_check")=123
+	Set gtmtypes("sgmnt_addrs",124,"name")="sgmnt_addrs.regcnt"
+	Set gtmtypes("sgmnt_addrs",124,"off")=848
 	Set gtmtypes("sgmnt_addrs",124,"len")=4
-	Set gtmtypes("sgmnt_addrs",124,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_addrs","db_dztrigger_cycle")=124
-	Set gtmtypes("sgmnt_addrs",125,"name")="sgmnt_addrs.hold_onto_crit"
-	Set gtmtypes("sgmnt_addrs",125,"off")=836
+	Set gtmtypes("sgmnt_addrs",124,"type")="int"
+	Set gtmtypfldindx("sgmnt_addrs","regcnt")=124
+	Set gtmtypes("sgmnt_addrs",125,"name")="sgmnt_addrs.t_commit_crit"
+	Set gtmtypes("sgmnt_addrs",125,"off")=852
 	Set gtmtypes("sgmnt_addrs",125,"len")=4
 	Set gtmtypes("sgmnt_addrs",125,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_addrs","hold_onto_crit")=125
-	Set gtmtypes("sgmnt_addrs",126,"name")="sgmnt_addrs.dse_crit_seize_done"
-	Set gtmtypes("sgmnt_addrs",126,"off")=840
+	Set gtmtypfldindx("sgmnt_addrs","t_commit_crit")=125
+	Set gtmtypes("sgmnt_addrs",126,"name")="sgmnt_addrs.wcs_pidcnt_incremented"
+	Set gtmtypes("sgmnt_addrs",126,"off")=856
 	Set gtmtypes("sgmnt_addrs",126,"len")=4
 	Set gtmtypes("sgmnt_addrs",126,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_addrs","dse_crit_seize_done")=126
-	Set gtmtypes("sgmnt_addrs",127,"name")="sgmnt_addrs.gbuff_limit"
-	Set gtmtypes("sgmnt_addrs",127,"off")=844
+	Set gtmtypfldindx("sgmnt_addrs","wcs_pidcnt_incremented")=126
+	Set gtmtypes("sgmnt_addrs",127,"name")="sgmnt_addrs.incr_db_trigger_cycle"
+	Set gtmtypes("sgmnt_addrs",127,"off")=860
 	Set gtmtypes("sgmnt_addrs",127,"len")=4
-	Set gtmtypes("sgmnt_addrs",127,"type")="int"
-	Set gtmtypfldindx("sgmnt_addrs","gbuff_limit")=127
-	Set gtmtypes("sgmnt_addrs",128,"name")="sgmnt_addrs.our_midnite"
-	Set gtmtypes("sgmnt_addrs",128,"off")=848
-	Set gtmtypes("sgmnt_addrs",128,"len")=8
-	Set gtmtypes("sgmnt_addrs",128,"type")="addr"
-	Set gtmtypfldindx("sgmnt_addrs","our_midnite")=128
-	Set gtmtypes("sgmnt_addrs",129,"name")="sgmnt_addrs.root_search_cycle"
-	Set gtmtypes("sgmnt_addrs",129,"off")=856
+	Set gtmtypes("sgmnt_addrs",127,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_addrs","incr_db_trigger_cycle")=127
+	Set gtmtypes("sgmnt_addrs",128,"name")="sgmnt_addrs.db_trigger_cycle"
+	Set gtmtypes("sgmnt_addrs",128,"off")=864
+	Set gtmtypes("sgmnt_addrs",128,"len")=4
+	Set gtmtypes("sgmnt_addrs",128,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_addrs","db_trigger_cycle")=128
+	Set gtmtypes("sgmnt_addrs",129,"name")="sgmnt_addrs.db_dztrigger_cycle"
+	Set gtmtypes("sgmnt_addrs",129,"off")=868
 	Set gtmtypes("sgmnt_addrs",129,"len")=4
 	Set gtmtypes("sgmnt_addrs",129,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_addrs","root_search_cycle")=129
-	Set gtmtypes("sgmnt_addrs",130,"name")="sgmnt_addrs.onln_rlbk_cycle"
-	Set gtmtypes("sgmnt_addrs",130,"off")=860
+	Set gtmtypfldindx("sgmnt_addrs","db_dztrigger_cycle")=129
+	Set gtmtypes("sgmnt_addrs",130,"name")="sgmnt_addrs.hold_onto_crit"
+	Set gtmtypes("sgmnt_addrs",130,"off")=872
 	Set gtmtypes("sgmnt_addrs",130,"len")=4
-	Set gtmtypes("sgmnt_addrs",130,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_addrs","onln_rlbk_cycle")=130
-	Set gtmtypes("sgmnt_addrs",131,"name")="sgmnt_addrs.db_onln_rlbkd_cycle"
-	Set gtmtypes("sgmnt_addrs",131,"off")=864
+	Set gtmtypes("sgmnt_addrs",130,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_addrs","hold_onto_crit")=130
+	Set gtmtypes("sgmnt_addrs",131,"name")="sgmnt_addrs.dse_crit_seize_done"
+	Set gtmtypes("sgmnt_addrs",131,"off")=876
 	Set gtmtypes("sgmnt_addrs",131,"len")=4
-	Set gtmtypes("sgmnt_addrs",131,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_addrs","db_onln_rlbkd_cycle")=131
-	Set gtmtypes("sgmnt_addrs",132,"name")="sgmnt_addrs.read_only_fs"
-	Set gtmtypes("sgmnt_addrs",132,"off")=868
+	Set gtmtypes("sgmnt_addrs",131,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_addrs","dse_crit_seize_done")=131
+	Set gtmtypes("sgmnt_addrs",132,"name")="sgmnt_addrs.gbuff_limit"
+	Set gtmtypes("sgmnt_addrs",132,"off")=880
 	Set gtmtypes("sgmnt_addrs",132,"len")=4
-	Set gtmtypes("sgmnt_addrs",132,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_addrs","read_only_fs")=132
-	Set gtmtypes("sgmnt_addrs",133,"name")="sgmnt_addrs.crit_probe"
-	Set gtmtypes("sgmnt_addrs",133,"off")=872
+	Set gtmtypes("sgmnt_addrs",132,"type")="int"
+	Set gtmtypfldindx("sgmnt_addrs","gbuff_limit")=132
+	Set gtmtypes("sgmnt_addrs",133,"name")="sgmnt_addrs.root_search_cycle"
+	Set gtmtypes("sgmnt_addrs",133,"off")=884
 	Set gtmtypes("sgmnt_addrs",133,"len")=4
-	Set gtmtypes("sgmnt_addrs",133,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_addrs","crit_probe")=133
-	Set gtmtypes("sgmnt_addrs",134,"name")="sgmnt_addrs.probecrit_rec"
-	Set gtmtypes("sgmnt_addrs",134,"off")=880
-	Set gtmtypes("sgmnt_addrs",134,"len")=56
-	Set gtmtypes("sgmnt_addrs",134,"type")="probecrit_rec_t"
-	Set gtmtypfldindx("sgmnt_addrs","probecrit_rec")=134
-	Set gtmtypes("sgmnt_addrs",135,"name")="sgmnt_addrs.probecrit_rec.t_get_crit"
-	Set gtmtypes("sgmnt_addrs",135,"off")=880
-	Set gtmtypes("sgmnt_addrs",135,"len")=8
-	Set gtmtypes("sgmnt_addrs",135,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","probecrit_rec.t_get_crit")=135
-	Set gtmtypes("sgmnt_addrs",136,"name")="sgmnt_addrs.probecrit_rec.p_crit_failed"
-	Set gtmtypes("sgmnt_addrs",136,"off")=888
-	Set gtmtypes("sgmnt_addrs",136,"len")=8
-	Set gtmtypes("sgmnt_addrs",136,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","probecrit_rec.p_crit_failed")=136
-	Set gtmtypes("sgmnt_addrs",137,"name")="sgmnt_addrs.probecrit_rec.p_crit_que_slps"
-	Set gtmtypes("sgmnt_addrs",137,"off")=896
-	Set gtmtypes("sgmnt_addrs",137,"len")=8
-	Set gtmtypes("sgmnt_addrs",137,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","probecrit_rec.p_crit_que_slps")=137
-	Set gtmtypes("sgmnt_addrs",138,"name")="sgmnt_addrs.probecrit_rec.p_crit_yields"
+	Set gtmtypes("sgmnt_addrs",133,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_addrs","root_search_cycle")=133
+	Set gtmtypes("sgmnt_addrs",134,"name")="sgmnt_addrs.onln_rlbk_cycle"
+	Set gtmtypes("sgmnt_addrs",134,"off")=888
+	Set gtmtypes("sgmnt_addrs",134,"len")=4
+	Set gtmtypes("sgmnt_addrs",134,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_addrs","onln_rlbk_cycle")=134
+	Set gtmtypes("sgmnt_addrs",135,"name")="sgmnt_addrs.db_onln_rlbkd_cycle"
+	Set gtmtypes("sgmnt_addrs",135,"off")=892
+	Set gtmtypes("sgmnt_addrs",135,"len")=4
+	Set gtmtypes("sgmnt_addrs",135,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_addrs","db_onln_rlbkd_cycle")=135
+	Set gtmtypes("sgmnt_addrs",136,"name")="sgmnt_addrs.reservedDBFlags"
+	Set gtmtypes("sgmnt_addrs",136,"off")=896
+	Set gtmtypes("sgmnt_addrs",136,"len")=4
+	Set gtmtypes("sgmnt_addrs",136,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_addrs","reservedDBFlags")=136
+	Set gtmtypes("sgmnt_addrs",137,"name")="sgmnt_addrs.read_only_fs"
+	Set gtmtypes("sgmnt_addrs",137,"off")=900
+	Set gtmtypes("sgmnt_addrs",137,"len")=4
+	Set gtmtypes("sgmnt_addrs",137,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_addrs","read_only_fs")=137
+	Set gtmtypes("sgmnt_addrs",138,"name")="sgmnt_addrs.crit_probe"
 	Set gtmtypes("sgmnt_addrs",138,"off")=904
-	Set gtmtypes("sgmnt_addrs",138,"len")=8
-	Set gtmtypes("sgmnt_addrs",138,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","probecrit_rec.p_crit_yields")=138
-	Set gtmtypes("sgmnt_addrs",139,"name")="sgmnt_addrs.probecrit_rec.p_crit_que_full"
-	Set gtmtypes("sgmnt_addrs",139,"off")=912
-	Set gtmtypes("sgmnt_addrs",139,"len")=8
-	Set gtmtypes("sgmnt_addrs",139,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","probecrit_rec.p_crit_que_full")=139
-	Set gtmtypes("sgmnt_addrs",140,"name")="sgmnt_addrs.probecrit_rec.p_crit_que_slots"
-	Set gtmtypes("sgmnt_addrs",140,"off")=920
-	Set gtmtypes("sgmnt_addrs",140,"len")=8
-	Set gtmtypes("sgmnt_addrs",140,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","probecrit_rec.p_crit_que_slots")=140
-	Set gtmtypes("sgmnt_addrs",141,"name")="sgmnt_addrs.probecrit_rec.p_crit_success"
-	Set gtmtypes("sgmnt_addrs",141,"off")=928
+	Set gtmtypes("sgmnt_addrs",138,"len")=4
+	Set gtmtypes("sgmnt_addrs",138,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_addrs","crit_probe")=138
+	Set gtmtypes("sgmnt_addrs",139,"name")="sgmnt_addrs.canceled_flush_timer"
+	Set gtmtypes("sgmnt_addrs",139,"off")=908
+	Set gtmtypes("sgmnt_addrs",139,"len")=4
+	Set gtmtypes("sgmnt_addrs",139,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_addrs","canceled_flush_timer")=139
+	Set gtmtypes("sgmnt_addrs",140,"name")="sgmnt_addrs.probecrit_rec"
+	Set gtmtypes("sgmnt_addrs",140,"off")=912
+	Set gtmtypes("sgmnt_addrs",140,"len")=56
+	Set gtmtypes("sgmnt_addrs",140,"type")="probecrit_rec_t"
+	Set gtmtypfldindx("sgmnt_addrs","probecrit_rec")=140
+	Set gtmtypes("sgmnt_addrs",141,"name")="sgmnt_addrs.probecrit_rec.t_get_crit"
+	Set gtmtypes("sgmnt_addrs",141,"off")=912
 	Set gtmtypes("sgmnt_addrs",141,"len")=8
 	Set gtmtypes("sgmnt_addrs",141,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","probecrit_rec.p_crit_success")=141
+	Set gtmtypfldindx("sgmnt_addrs","probecrit_rec.t_get_crit")=141
+	Set gtmtypes("sgmnt_addrs",142,"name")="sgmnt_addrs.probecrit_rec.p_crit_failed"
+	Set gtmtypes("sgmnt_addrs",142,"off")=920
+	Set gtmtypes("sgmnt_addrs",142,"len")=8
+	Set gtmtypes("sgmnt_addrs",142,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_addrs","probecrit_rec.p_crit_failed")=142
+	Set gtmtypes("sgmnt_addrs",143,"name")="sgmnt_addrs.probecrit_rec.p_crit_que_slps"
+	Set gtmtypes("sgmnt_addrs",143,"off")=928
+	Set gtmtypes("sgmnt_addrs",143,"len")=8
+	Set gtmtypes("sgmnt_addrs",143,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_addrs","probecrit_rec.p_crit_que_slps")=143
+	Set gtmtypes("sgmnt_addrs",144,"name")="sgmnt_addrs.probecrit_rec.p_crit_yields"
+	Set gtmtypes("sgmnt_addrs",144,"off")=936
+	Set gtmtypes("sgmnt_addrs",144,"len")=8
+	Set gtmtypes("sgmnt_addrs",144,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_addrs","probecrit_rec.p_crit_yields")=144
+	Set gtmtypes("sgmnt_addrs",145,"name")="sgmnt_addrs.probecrit_rec.p_crit_que_full"
+	Set gtmtypes("sgmnt_addrs",145,"off")=944
+	Set gtmtypes("sgmnt_addrs",145,"len")=8
+	Set gtmtypes("sgmnt_addrs",145,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_addrs","probecrit_rec.p_crit_que_full")=145
+	Set gtmtypes("sgmnt_addrs",146,"name")="sgmnt_addrs.probecrit_rec.p_crit_que_slots"
+	Set gtmtypes("sgmnt_addrs",146,"off")=952
+	Set gtmtypes("sgmnt_addrs",146,"len")=8
+	Set gtmtypes("sgmnt_addrs",146,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_addrs","probecrit_rec.p_crit_que_slots")=146
+	Set gtmtypes("sgmnt_addrs",147,"name")="sgmnt_addrs.probecrit_rec.p_crit_success"
+	Set gtmtypes("sgmnt_addrs",147,"off")=960
+	Set gtmtypes("sgmnt_addrs",147,"len")=8
+	Set gtmtypes("sgmnt_addrs",147,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_addrs","probecrit_rec.p_crit_success")=147
+	Set gtmtypes("sgmnt_addrs",148,"name")="sgmnt_addrs.lock_crit_with_db"
+	Set gtmtypes("sgmnt_addrs",148,"off")=968
+	Set gtmtypes("sgmnt_addrs",148,"len")=4
+	Set gtmtypes("sgmnt_addrs",148,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_addrs","lock_crit_with_db")=148
+	Set gtmtypes("sgmnt_addrs",149,"name")="sgmnt_addrs.needs_post_freeze_online_clean"
+	Set gtmtypes("sgmnt_addrs",149,"off")=972
+	Set gtmtypes("sgmnt_addrs",149,"len")=4
+	Set gtmtypes("sgmnt_addrs",149,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_addrs","needs_post_freeze_online_clean")=149
+	Set gtmtypes("sgmnt_addrs",150,"name")="sgmnt_addrs.needs_post_freeze_flushsync"
+	Set gtmtypes("sgmnt_addrs",150,"off")=976
+	Set gtmtypes("sgmnt_addrs",150,"len")=4
+	Set gtmtypes("sgmnt_addrs",150,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_addrs","needs_post_freeze_flushsync")=150
+	Set gtmtypes("sgmnt_addrs",151,"name")="sgmnt_addrs.tp_hint"
+	Set gtmtypes("sgmnt_addrs",151,"off")=980
+	Set gtmtypes("sgmnt_addrs",151,"len")=4
+	Set gtmtypes("sgmnt_addrs",151,"type")="int"
+	Set gtmtypfldindx("sgmnt_addrs","tp_hint")=151
+	Set gtmtypes("sgmnt_addrs",152,"name")="sgmnt_addrs.statsDB_setup_completed"
+	Set gtmtypes("sgmnt_addrs",152,"off")=984
+	Set gtmtypes("sgmnt_addrs",152,"len")=4
+	Set gtmtypes("sgmnt_addrs",152,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_addrs","statsDB_setup_completed")=152
 	;
 	Set gtmtypes("sgmnt_data")="struct"
-	Set gtmtypes("sgmnt_data",0)=565
+	Set gtmtypes("sgmnt_data",0)=586
 	Set gtmtypes("sgmnt_data","len")=8192
 	Set gtmtypes("sgmnt_data",1,"name")="sgmnt_data.label"
 	Set gtmtypes("sgmnt_data",1,"off")=0
@@ -26814,7 +27324,7 @@ Init
 	Set gtmtypes("sgmnt_data",18,"name")="sgmnt_data.null_subs"
 	Set gtmtypes("sgmnt_data",18,"off")=76
 	Set gtmtypes("sgmnt_data",18,"len")=4
-	Set gtmtypes("sgmnt_data",18,"type")="boolean_t"
+	Set gtmtypes("sgmnt_data",18,"type")="int"
 	Set gtmtypfldindx("sgmnt_data","null_subs")=18
 	Set gtmtypes("sgmnt_data",19,"name")="sgmnt_data.free_space"
 	Set gtmtypes("sgmnt_data",19,"off")=80
@@ -26896,11 +27406,11 @@ Init
 	Set gtmtypes("sgmnt_data",34,"len")=4
 	Set gtmtypes("sgmnt_data",34,"type")="int"
 	Set gtmtypfldindx("sgmnt_data","creation_time4")=34
-	Set gtmtypes("sgmnt_data",35,"name")="sgmnt_data.creation_filler_8byte"
+	Set gtmtypes("sgmnt_data",35,"name")="sgmnt_data.reservedDBFlags"
 	Set gtmtypes("sgmnt_data",35,"off")=188
 	Set gtmtypes("sgmnt_data",35,"len")=4
-	Set gtmtypes("sgmnt_data",35,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","creation_filler_8byte")=35
+	Set gtmtypes("sgmnt_data",35,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","reservedDBFlags")=35
 	Set gtmtypes("sgmnt_data",36,"name")="sgmnt_data.max_tn"
 	Set gtmtypes("sgmnt_data",36,"off")=192
 	Set gtmtypes("sgmnt_data",36,"len")=8
@@ -26981,2592 +27491,2697 @@ Init
 	Set gtmtypes("sgmnt_data",51,"len")=4
 	Set gtmtypes("sgmnt_data",51,"type")="int"
 	Set gtmtypfldindx("sgmnt_data","abandoned_kills")=51
-	Set gtmtypes("sgmnt_data",52,"name")="sgmnt_data.filler_320"
+	Set gtmtypes("sgmnt_data",52,"name")="sgmnt_data.freeze_online"
 	Set gtmtypes("sgmnt_data",52,"off")=312
-	Set gtmtypes("sgmnt_data",52,"len")=8
-	Set gtmtypes("sgmnt_data",52,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","filler_320")=52
-	Set gtmtypes("sgmnt_data",53,"name")="sgmnt_data.tn_upgrd_blks_0"
-	Set gtmtypes("sgmnt_data",53,"off")=320
-	Set gtmtypes("sgmnt_data",53,"len")=8
-	Set gtmtypes("sgmnt_data",53,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","tn_upgrd_blks_0")=53
-	Set gtmtypes("sgmnt_data",54,"name")="sgmnt_data.desired_db_format_tn"
-	Set gtmtypes("sgmnt_data",54,"off")=328
+	Set gtmtypes("sgmnt_data",52,"len")=4
+	Set gtmtypes("sgmnt_data",52,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","freeze_online")=52
+	Set gtmtypes("sgmnt_data",53,"name")="sgmnt_data.filler_320"
+	Set gtmtypes("sgmnt_data",53,"off")=316
+	Set gtmtypes("sgmnt_data",53,"len")=4
+	Set gtmtypes("sgmnt_data",53,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","filler_320")=53
+	Set gtmtypes("sgmnt_data",54,"name")="sgmnt_data.tn_upgrd_blks_0"
+	Set gtmtypes("sgmnt_data",54,"off")=320
 	Set gtmtypes("sgmnt_data",54,"len")=8
 	Set gtmtypes("sgmnt_data",54,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","desired_db_format_tn")=54
-	Set gtmtypes("sgmnt_data",55,"name")="sgmnt_data.reorg_db_fmt_start_tn"
-	Set gtmtypes("sgmnt_data",55,"off")=336
+	Set gtmtypfldindx("sgmnt_data","tn_upgrd_blks_0")=54
+	Set gtmtypes("sgmnt_data",55,"name")="sgmnt_data.desired_db_format_tn"
+	Set gtmtypes("sgmnt_data",55,"off")=328
 	Set gtmtypes("sgmnt_data",55,"len")=8
 	Set gtmtypes("sgmnt_data",55,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","reorg_db_fmt_start_tn")=55
-	Set gtmtypes("sgmnt_data",56,"name")="sgmnt_data.reorg_upgrd_dwngrd_restart_block"
-	Set gtmtypes("sgmnt_data",56,"off")=344
-	Set gtmtypes("sgmnt_data",56,"len")=4
-	Set gtmtypes("sgmnt_data",56,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","reorg_upgrd_dwngrd_restart_block")=56
-	Set gtmtypes("sgmnt_data",57,"name")="sgmnt_data.blks_to_upgrd"
-	Set gtmtypes("sgmnt_data",57,"off")=348
+	Set gtmtypfldindx("sgmnt_data","desired_db_format_tn")=55
+	Set gtmtypes("sgmnt_data",56,"name")="sgmnt_data.reorg_db_fmt_start_tn"
+	Set gtmtypes("sgmnt_data",56,"off")=336
+	Set gtmtypes("sgmnt_data",56,"len")=8
+	Set gtmtypes("sgmnt_data",56,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","reorg_db_fmt_start_tn")=56
+	Set gtmtypes("sgmnt_data",57,"name")="sgmnt_data.reorg_upgrd_dwngrd_restart_block"
+	Set gtmtypes("sgmnt_data",57,"off")=344
 	Set gtmtypes("sgmnt_data",57,"len")=4
 	Set gtmtypes("sgmnt_data",57,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","blks_to_upgrd")=57
-	Set gtmtypes("sgmnt_data",58,"name")="sgmnt_data.blks_to_upgrd_subzero_error"
-	Set gtmtypes("sgmnt_data",58,"off")=352
+	Set gtmtypfldindx("sgmnt_data","reorg_upgrd_dwngrd_restart_block")=57
+	Set gtmtypes("sgmnt_data",58,"name")="sgmnt_data.blks_to_upgrd"
+	Set gtmtypes("sgmnt_data",58,"off")=348
 	Set gtmtypes("sgmnt_data",58,"len")=4
 	Set gtmtypes("sgmnt_data",58,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","blks_to_upgrd_subzero_error")=58
-	Set gtmtypes("sgmnt_data",59,"name")="sgmnt_data.desired_db_format"
-	Set gtmtypes("sgmnt_data",59,"off")=356
+	Set gtmtypfldindx("sgmnt_data","blks_to_upgrd")=58
+	Set gtmtypes("sgmnt_data",59,"name")="sgmnt_data.blks_to_upgrd_subzero_error"
+	Set gtmtypes("sgmnt_data",59,"off")=352
 	Set gtmtypes("sgmnt_data",59,"len")=4
 	Set gtmtypes("sgmnt_data",59,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","desired_db_format")=59
-	Set gtmtypes("sgmnt_data",60,"name")="sgmnt_data.fully_upgraded"
-	Set gtmtypes("sgmnt_data",60,"off")=360
+	Set gtmtypfldindx("sgmnt_data","blks_to_upgrd_subzero_error")=59
+	Set gtmtypes("sgmnt_data",60,"name")="sgmnt_data.desired_db_format"
+	Set gtmtypes("sgmnt_data",60,"off")=356
 	Set gtmtypes("sgmnt_data",60,"len")=4
-	Set gtmtypes("sgmnt_data",60,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","fully_upgraded")=60
-	Set gtmtypes("sgmnt_data",61,"name")="sgmnt_data.db_got_to_v5_once"
-	Set gtmtypes("sgmnt_data",61,"off")=364
+	Set gtmtypes("sgmnt_data",60,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","desired_db_format")=60
+	Set gtmtypes("sgmnt_data",61,"name")="sgmnt_data.fully_upgraded"
+	Set gtmtypes("sgmnt_data",61,"off")=360
 	Set gtmtypes("sgmnt_data",61,"len")=4
 	Set gtmtypes("sgmnt_data",61,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","db_got_to_v5_once")=61
-	Set gtmtypes("sgmnt_data",62,"name")="sgmnt_data.opened_by_gtmv53"
-	Set gtmtypes("sgmnt_data",62,"off")=368
+	Set gtmtypfldindx("sgmnt_data","fully_upgraded")=61
+	Set gtmtypes("sgmnt_data",62,"name")="sgmnt_data.db_got_to_v5_once"
+	Set gtmtypes("sgmnt_data",62,"off")=364
 	Set gtmtypes("sgmnt_data",62,"len")=4
 	Set gtmtypes("sgmnt_data",62,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","opened_by_gtmv53")=62
-	Set gtmtypes("sgmnt_data",63,"name")="sgmnt_data.filler_384"
-	Set gtmtypes("sgmnt_data",63,"off")=372
-	Set gtmtypes("sgmnt_data",63,"len")=12
-	Set gtmtypes("sgmnt_data",63,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","filler_384")=63
-	Set gtmtypes("sgmnt_data",64,"name")="sgmnt_data.trans_hist"
-	Set gtmtypes("sgmnt_data",64,"off")=384
-	Set gtmtypes("sgmnt_data",64,"len")=56
-	Set gtmtypes("sgmnt_data",64,"type")="th_index"
-	Set gtmtypfldindx("sgmnt_data","trans_hist")=64
-	Set gtmtypes("sgmnt_data",65,"name")="sgmnt_data.trans_hist.curr_tn"
+	Set gtmtypfldindx("sgmnt_data","db_got_to_v5_once")=62
+	Set gtmtypes("sgmnt_data",63,"name")="sgmnt_data.opened_by_gtmv53"
+	Set gtmtypes("sgmnt_data",63,"off")=368
+	Set gtmtypes("sgmnt_data",63,"len")=4
+	Set gtmtypes("sgmnt_data",63,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","opened_by_gtmv53")=63
+	Set gtmtypes("sgmnt_data",64,"name")="sgmnt_data.filler_384"
+	Set gtmtypes("sgmnt_data",64,"off")=372
+	Set gtmtypes("sgmnt_data",64,"len")=12
+	Set gtmtypes("sgmnt_data",64,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","filler_384")=64
+	Set gtmtypes("sgmnt_data",65,"name")="sgmnt_data.trans_hist"
 	Set gtmtypes("sgmnt_data",65,"off")=384
-	Set gtmtypes("sgmnt_data",65,"len")=8
-	Set gtmtypes("sgmnt_data",65,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","trans_hist.curr_tn")=65
-	Set gtmtypes("sgmnt_data",66,"name")="sgmnt_data.trans_hist.early_tn"
-	Set gtmtypes("sgmnt_data",66,"off")=392
+	Set gtmtypes("sgmnt_data",65,"len")=56
+	Set gtmtypes("sgmnt_data",65,"type")="th_index"
+	Set gtmtypfldindx("sgmnt_data","trans_hist")=65
+	Set gtmtypes("sgmnt_data",66,"name")="sgmnt_data.trans_hist.curr_tn"
+	Set gtmtypes("sgmnt_data",66,"off")=384
 	Set gtmtypes("sgmnt_data",66,"len")=8
 	Set gtmtypes("sgmnt_data",66,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","trans_hist.early_tn")=66
-	Set gtmtypes("sgmnt_data",67,"name")="sgmnt_data.trans_hist.last_mm_sync"
-	Set gtmtypes("sgmnt_data",67,"off")=400
+	Set gtmtypfldindx("sgmnt_data","trans_hist.curr_tn")=66
+	Set gtmtypes("sgmnt_data",67,"name")="sgmnt_data.trans_hist.early_tn"
+	Set gtmtypes("sgmnt_data",67,"off")=392
 	Set gtmtypes("sgmnt_data",67,"len")=8
 	Set gtmtypes("sgmnt_data",67,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","trans_hist.last_mm_sync")=67
-	Set gtmtypes("sgmnt_data",68,"name")="sgmnt_data.trans_hist.filler_8byte"
-	Set gtmtypes("sgmnt_data",68,"off")=408
+	Set gtmtypfldindx("sgmnt_data","trans_hist.early_tn")=67
+	Set gtmtypes("sgmnt_data",68,"name")="sgmnt_data.trans_hist.last_mm_sync"
+	Set gtmtypes("sgmnt_data",68,"off")=400
 	Set gtmtypes("sgmnt_data",68,"len")=8
-	Set gtmtypes("sgmnt_data",68,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","trans_hist.filler_8byte")=68
-	Set gtmtypes("sgmnt_data",69,"name")="sgmnt_data.trans_hist.mm_tn"
-	Set gtmtypes("sgmnt_data",69,"off")=416
+	Set gtmtypes("sgmnt_data",68,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","trans_hist.last_mm_sync")=68
+	Set gtmtypes("sgmnt_data",69,"name")="sgmnt_data.trans_hist.filler_8byte"
+	Set gtmtypes("sgmnt_data",69,"off")=408
 	Set gtmtypes("sgmnt_data",69,"len")=8
-	Set gtmtypes("sgmnt_data",69,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","trans_hist.mm_tn")=69
-	Set gtmtypes("sgmnt_data",70,"name")="sgmnt_data.trans_hist.lock_sequence"
-	Set gtmtypes("sgmnt_data",70,"off")=424
-	Set gtmtypes("sgmnt_data",70,"len")=4
-	Set gtmtypes("sgmnt_data",70,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","trans_hist.lock_sequence")=70
-	Set gtmtypes("sgmnt_data",71,"name")="sgmnt_data.trans_hist.ccp_jnl_filesize"
-	Set gtmtypes("sgmnt_data",71,"off")=428
+	Set gtmtypes("sgmnt_data",69,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","trans_hist.filler_8byte")=69
+	Set gtmtypes("sgmnt_data",70,"name")="sgmnt_data.trans_hist.mm_tn"
+	Set gtmtypes("sgmnt_data",70,"off")=416
+	Set gtmtypes("sgmnt_data",70,"len")=8
+	Set gtmtypes("sgmnt_data",70,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","trans_hist.mm_tn")=70
+	Set gtmtypes("sgmnt_data",71,"name")="sgmnt_data.trans_hist.lock_sequence"
+	Set gtmtypes("sgmnt_data",71,"off")=424
 	Set gtmtypes("sgmnt_data",71,"len")=4
 	Set gtmtypes("sgmnt_data",71,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","trans_hist.ccp_jnl_filesize")=71
-	Set gtmtypes("sgmnt_data",72,"name")="sgmnt_data.trans_hist.total_blks"
-	Set gtmtypes("sgmnt_data",72,"off")=432
+	Set gtmtypfldindx("sgmnt_data","trans_hist.lock_sequence")=71
+	Set gtmtypes("sgmnt_data",72,"name")="sgmnt_data.trans_hist.ccp_jnl_filesize"
+	Set gtmtypes("sgmnt_data",72,"off")=428
 	Set gtmtypes("sgmnt_data",72,"len")=4
 	Set gtmtypes("sgmnt_data",72,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","trans_hist.total_blks")=72
-	Set gtmtypes("sgmnt_data",73,"name")="sgmnt_data.trans_hist.free_blocks"
-	Set gtmtypes("sgmnt_data",73,"off")=436
+	Set gtmtypfldindx("sgmnt_data","trans_hist.ccp_jnl_filesize")=72
+	Set gtmtypes("sgmnt_data",73,"name")="sgmnt_data.trans_hist.total_blks"
+	Set gtmtypes("sgmnt_data",73,"off")=432
 	Set gtmtypes("sgmnt_data",73,"len")=4
 	Set gtmtypes("sgmnt_data",73,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","trans_hist.free_blocks")=73
-	Set gtmtypes("sgmnt_data",74,"name")="sgmnt_data.filler_trans_hist"
-	Set gtmtypes("sgmnt_data",74,"off")=440
-	Set gtmtypes("sgmnt_data",74,"len")=8
-	Set gtmtypes("sgmnt_data",74,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","filler_trans_hist")=74
-	Set gtmtypes("sgmnt_data",75,"name")="sgmnt_data.flush_time"
-	Set gtmtypes("sgmnt_data",75,"off")=448
+	Set gtmtypfldindx("sgmnt_data","trans_hist.total_blks")=73
+	Set gtmtypes("sgmnt_data",74,"name")="sgmnt_data.trans_hist.free_blocks"
+	Set gtmtypes("sgmnt_data",74,"off")=436
+	Set gtmtypes("sgmnt_data",74,"len")=4
+	Set gtmtypes("sgmnt_data",74,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","trans_hist.free_blocks")=74
+	Set gtmtypes("sgmnt_data",75,"name")="sgmnt_data.filler_trans_hist"
+	Set gtmtypes("sgmnt_data",75,"off")=440
 	Set gtmtypes("sgmnt_data",75,"len")=8
-	Set gtmtypes("sgmnt_data",75,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","flush_time")=75
-	Set gtmtypes("sgmnt_data",75,"dim")=2
-	Set gtmtypes("sgmnt_data",76,"name")="sgmnt_data.flush_trigger"
-	Set gtmtypes("sgmnt_data",76,"off")=456
-	Set gtmtypes("sgmnt_data",76,"len")=4
+	Set gtmtypes("sgmnt_data",75,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","filler_trans_hist")=75
+	Set gtmtypes("sgmnt_data",76,"name")="sgmnt_data.flush_time"
+	Set gtmtypes("sgmnt_data",76,"off")=448
+	Set gtmtypes("sgmnt_data",76,"len")=8
 	Set gtmtypes("sgmnt_data",76,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","flush_trigger")=76
-	Set gtmtypes("sgmnt_data",77,"name")="sgmnt_data.n_wrt_per_flu"
-	Set gtmtypes("sgmnt_data",77,"off")=460
+	Set gtmtypfldindx("sgmnt_data","flush_time")=76
+	Set gtmtypes("sgmnt_data",76,"dim")=2
+	Set gtmtypes("sgmnt_data",77,"name")="sgmnt_data.flush_trigger"
+	Set gtmtypes("sgmnt_data",77,"off")=456
 	Set gtmtypes("sgmnt_data",77,"len")=4
 	Set gtmtypes("sgmnt_data",77,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_wrt_per_flu")=77
-	Set gtmtypes("sgmnt_data",78,"name")="sgmnt_data.wait_disk_space"
-	Set gtmtypes("sgmnt_data",78,"off")=464
+	Set gtmtypfldindx("sgmnt_data","flush_trigger")=77
+	Set gtmtypes("sgmnt_data",78,"name")="sgmnt_data.n_wrt_per_flu"
+	Set gtmtypes("sgmnt_data",78,"off")=460
 	Set gtmtypes("sgmnt_data",78,"len")=4
 	Set gtmtypes("sgmnt_data",78,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wait_disk_space")=78
-	Set gtmtypes("sgmnt_data",79,"name")="sgmnt_data.defer_time"
-	Set gtmtypes("sgmnt_data",79,"off")=468
+	Set gtmtypfldindx("sgmnt_data","n_wrt_per_flu")=78
+	Set gtmtypes("sgmnt_data",79,"name")="sgmnt_data.wait_disk_space"
+	Set gtmtypes("sgmnt_data",79,"off")=464
 	Set gtmtypes("sgmnt_data",79,"len")=4
 	Set gtmtypes("sgmnt_data",79,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","defer_time")=79
-	Set gtmtypes("sgmnt_data",80,"name")="sgmnt_data.filler_wc_blocked"
-	Set gtmtypes("sgmnt_data",80,"off")=472
+	Set gtmtypfldindx("sgmnt_data","wait_disk_space")=79
+	Set gtmtypes("sgmnt_data",80,"name")="sgmnt_data.defer_time"
+	Set gtmtypes("sgmnt_data",80,"off")=468
 	Set gtmtypes("sgmnt_data",80,"len")=4
-	Set gtmtypes("sgmnt_data",80,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","filler_wc_blocked")=80
-	Set gtmtypes("sgmnt_data",81,"name")="sgmnt_data.mumps_can_bypass"
-	Set gtmtypes("sgmnt_data",81,"off")=476
+	Set gtmtypes("sgmnt_data",80,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","defer_time")=80
+	Set gtmtypes("sgmnt_data",81,"name")="sgmnt_data.filler_wc_blocked"
+	Set gtmtypes("sgmnt_data",81,"off")=472
 	Set gtmtypes("sgmnt_data",81,"len")=4
 	Set gtmtypes("sgmnt_data",81,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","mumps_can_bypass")=81
-	Set gtmtypes("sgmnt_data",82,"name")="sgmnt_data.epoch_taper"
-	Set gtmtypes("sgmnt_data",82,"off")=480
+	Set gtmtypfldindx("sgmnt_data","filler_wc_blocked")=81
+	Set gtmtypes("sgmnt_data",82,"name")="sgmnt_data.mumps_can_bypass"
+	Set gtmtypes("sgmnt_data",82,"off")=476
 	Set gtmtypes("sgmnt_data",82,"len")=4
 	Set gtmtypes("sgmnt_data",82,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","epoch_taper")=82
-	Set gtmtypes("sgmnt_data",83,"name")="sgmnt_data.epoch_taper_time_pct"
-	Set gtmtypes("sgmnt_data",83,"off")=484
+	Set gtmtypfldindx("sgmnt_data","mumps_can_bypass")=82
+	Set gtmtypes("sgmnt_data",83,"name")="sgmnt_data.epoch_taper"
+	Set gtmtypes("sgmnt_data",83,"off")=480
 	Set gtmtypes("sgmnt_data",83,"len")=4
-	Set gtmtypes("sgmnt_data",83,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","epoch_taper_time_pct")=83
-	Set gtmtypes("sgmnt_data",84,"name")="sgmnt_data.epoch_taper_jnl_pct"
-	Set gtmtypes("sgmnt_data",84,"off")=488
+	Set gtmtypes("sgmnt_data",83,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","epoch_taper")=83
+	Set gtmtypes("sgmnt_data",84,"name")="sgmnt_data.epoch_taper_time_pct"
+	Set gtmtypes("sgmnt_data",84,"off")=484
 	Set gtmtypes("sgmnt_data",84,"len")=4
 	Set gtmtypes("sgmnt_data",84,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","epoch_taper_jnl_pct")=84
-	Set gtmtypes("sgmnt_data",85,"name")="sgmnt_data.filler_512"
-	Set gtmtypes("sgmnt_data",85,"off")=492
+	Set gtmtypfldindx("sgmnt_data","epoch_taper_time_pct")=84
+	Set gtmtypes("sgmnt_data",85,"name")="sgmnt_data.epoch_taper_jnl_pct"
+	Set gtmtypes("sgmnt_data",85,"off")=488
 	Set gtmtypes("sgmnt_data",85,"len")=4
-	Set gtmtypes("sgmnt_data",85,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","filler_512")=85
-	Set gtmtypes("sgmnt_data",86,"name")="sgmnt_data.reserved_for_upd"
-	Set gtmtypes("sgmnt_data",86,"off")=496
+	Set gtmtypes("sgmnt_data",85,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","epoch_taper_jnl_pct")=85
+	Set gtmtypes("sgmnt_data",86,"name")="sgmnt_data.asyncio"
+	Set gtmtypes("sgmnt_data",86,"off")=492
 	Set gtmtypes("sgmnt_data",86,"len")=4
-	Set gtmtypes("sgmnt_data",86,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","reserved_for_upd")=86
-	Set gtmtypes("sgmnt_data",87,"name")="sgmnt_data.avg_blks_per_100gbl"
-	Set gtmtypes("sgmnt_data",87,"off")=500
+	Set gtmtypes("sgmnt_data",86,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","asyncio")=86
+	Set gtmtypes("sgmnt_data",87,"name")="sgmnt_data.reserved_for_upd"
+	Set gtmtypes("sgmnt_data",87,"off")=496
 	Set gtmtypes("sgmnt_data",87,"len")=4
 	Set gtmtypes("sgmnt_data",87,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","avg_blks_per_100gbl")=87
-	Set gtmtypes("sgmnt_data",88,"name")="sgmnt_data.pre_read_trigger_factor"
-	Set gtmtypes("sgmnt_data",88,"off")=504
+	Set gtmtypfldindx("sgmnt_data","reserved_for_upd")=87
+	Set gtmtypes("sgmnt_data",88,"name")="sgmnt_data.avg_blks_per_100gbl"
+	Set gtmtypes("sgmnt_data",88,"off")=500
 	Set gtmtypes("sgmnt_data",88,"len")=4
 	Set gtmtypes("sgmnt_data",88,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","pre_read_trigger_factor")=88
-	Set gtmtypes("sgmnt_data",89,"name")="sgmnt_data.writer_trigger_factor"
-	Set gtmtypes("sgmnt_data",89,"off")=508
+	Set gtmtypfldindx("sgmnt_data","avg_blks_per_100gbl")=88
+	Set gtmtypes("sgmnt_data",89,"name")="sgmnt_data.pre_read_trigger_factor"
+	Set gtmtypes("sgmnt_data",89,"off")=504
 	Set gtmtypes("sgmnt_data",89,"len")=4
 	Set gtmtypes("sgmnt_data",89,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","writer_trigger_factor")=89
-	Set gtmtypes("sgmnt_data",90,"name")="sgmnt_data.semid"
-	Set gtmtypes("sgmnt_data",90,"off")=512
+	Set gtmtypfldindx("sgmnt_data","pre_read_trigger_factor")=89
+	Set gtmtypes("sgmnt_data",90,"name")="sgmnt_data.writer_trigger_factor"
+	Set gtmtypes("sgmnt_data",90,"off")=508
 	Set gtmtypes("sgmnt_data",90,"len")=4
-	Set gtmtypes("sgmnt_data",90,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","semid")=90
-	Set gtmtypes("sgmnt_data",91,"name")="sgmnt_data.shmid"
-	Set gtmtypes("sgmnt_data",91,"off")=516
+	Set gtmtypes("sgmnt_data",90,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","writer_trigger_factor")=90
+	Set gtmtypes("sgmnt_data",91,"name")="sgmnt_data.semid"
+	Set gtmtypes("sgmnt_data",91,"off")=512
 	Set gtmtypes("sgmnt_data",91,"len")=4
 	Set gtmtypes("sgmnt_data",91,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","shmid")=91
-	Set gtmtypes("sgmnt_data",92,"name")="sgmnt_data.gt_sem_ctime"
-	Set gtmtypes("sgmnt_data",92,"off")=520
-	Set gtmtypes("sgmnt_data",92,"len")=8
-	Set gtmtypes("sgmnt_data",92,"type")="gtm_time8"
-	Set gtmtypfldindx("sgmnt_data","gt_sem_ctime")=92
-	Set gtmtypes("sgmnt_data",93,"name")="sgmnt_data.gt_sem_ctime.ctime"
+	Set gtmtypfldindx("sgmnt_data","semid")=91
+	Set gtmtypes("sgmnt_data",92,"name")="sgmnt_data.shmid"
+	Set gtmtypes("sgmnt_data",92,"off")=516
+	Set gtmtypes("sgmnt_data",92,"len")=4
+	Set gtmtypes("sgmnt_data",92,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","shmid")=92
+	Set gtmtypes("sgmnt_data",93,"name")="sgmnt_data.gt_sem_ctime"
 	Set gtmtypes("sgmnt_data",93,"off")=520
 	Set gtmtypes("sgmnt_data",93,"len")=8
-	Set gtmtypes("sgmnt_data",93,"type")="time_t"
-	Set gtmtypfldindx("sgmnt_data","gt_sem_ctime.ctime")=93
-	Set gtmtypes("sgmnt_data",94,"name")="sgmnt_data.gt_sem_ctime.filler"
+	Set gtmtypes("sgmnt_data",93,"type")="gtm_time8"
+	Set gtmtypfldindx("sgmnt_data","gt_sem_ctime")=93
+	Set gtmtypes("sgmnt_data",94,"name")="sgmnt_data.gt_sem_ctime.ctime"
 	Set gtmtypes("sgmnt_data",94,"off")=520
 	Set gtmtypes("sgmnt_data",94,"len")=8
-	Set gtmtypes("sgmnt_data",94,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","gt_sem_ctime.filler")=94
-	Set gtmtypes("sgmnt_data",94,"dim")=2
-	Set gtmtypes("sgmnt_data",95,"name")="sgmnt_data.gt_shm_ctime"
-	Set gtmtypes("sgmnt_data",95,"off")=528
+	Set gtmtypes("sgmnt_data",94,"type")="time_t"
+	Set gtmtypfldindx("sgmnt_data","gt_sem_ctime.ctime")=94
+	Set gtmtypes("sgmnt_data",95,"name")="sgmnt_data.gt_sem_ctime.filler"
+	Set gtmtypes("sgmnt_data",95,"off")=520
 	Set gtmtypes("sgmnt_data",95,"len")=8
-	Set gtmtypes("sgmnt_data",95,"type")="gtm_time8"
-	Set gtmtypfldindx("sgmnt_data","gt_shm_ctime")=95
-	Set gtmtypes("sgmnt_data",96,"name")="sgmnt_data.gt_shm_ctime.ctime"
+	Set gtmtypes("sgmnt_data",95,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","gt_sem_ctime.filler")=95
+	Set gtmtypes("sgmnt_data",95,"dim")=2
+	Set gtmtypes("sgmnt_data",96,"name")="sgmnt_data.gt_shm_ctime"
 	Set gtmtypes("sgmnt_data",96,"off")=528
 	Set gtmtypes("sgmnt_data",96,"len")=8
-	Set gtmtypes("sgmnt_data",96,"type")="time_t"
-	Set gtmtypfldindx("sgmnt_data","gt_shm_ctime.ctime")=96
-	Set gtmtypes("sgmnt_data",97,"name")="sgmnt_data.gt_shm_ctime.filler"
+	Set gtmtypes("sgmnt_data",96,"type")="gtm_time8"
+	Set gtmtypfldindx("sgmnt_data","gt_shm_ctime")=96
+	Set gtmtypes("sgmnt_data",97,"name")="sgmnt_data.gt_shm_ctime.ctime"
 	Set gtmtypes("sgmnt_data",97,"off")=528
 	Set gtmtypes("sgmnt_data",97,"len")=8
-	Set gtmtypes("sgmnt_data",97,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","gt_shm_ctime.filler")=97
-	Set gtmtypes("sgmnt_data",97,"dim")=2
-	Set gtmtypes("sgmnt_data",98,"name")="sgmnt_data.filler_unixonly"
-	Set gtmtypes("sgmnt_data",98,"off")=536
-	Set gtmtypes("sgmnt_data",98,"len")=40
-	Set gtmtypes("sgmnt_data",98,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","filler_unixonly")=98
-	Set gtmtypes("sgmnt_data",99,"name")="sgmnt_data.filler_n_retries"
-	Set gtmtypes("sgmnt_data",99,"off")=576
-	Set gtmtypes("sgmnt_data",99,"len")=20
-	Set gtmtypes("sgmnt_data",99,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","filler_n_retries")=99
-	Set gtmtypes("sgmnt_data",99,"dim")=5
-	Set gtmtypes("sgmnt_data",100,"name")="sgmnt_data.filler_n_puts"
-	Set gtmtypes("sgmnt_data",100,"off")=596
-	Set gtmtypes("sgmnt_data",100,"len")=4
+	Set gtmtypes("sgmnt_data",97,"type")="time_t"
+	Set gtmtypfldindx("sgmnt_data","gt_shm_ctime.ctime")=97
+	Set gtmtypes("sgmnt_data",98,"name")="sgmnt_data.gt_shm_ctime.filler"
+	Set gtmtypes("sgmnt_data",98,"off")=528
+	Set gtmtypes("sgmnt_data",98,"len")=8
+	Set gtmtypes("sgmnt_data",98,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","gt_shm_ctime.filler")=98
+	Set gtmtypes("sgmnt_data",98,"dim")=2
+	Set gtmtypes("sgmnt_data",99,"name")="sgmnt_data.filler_unixonly"
+	Set gtmtypes("sgmnt_data",99,"off")=536
+	Set gtmtypes("sgmnt_data",99,"len")=40
+	Set gtmtypes("sgmnt_data",99,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","filler_unixonly")=99
+	Set gtmtypes("sgmnt_data",100,"name")="sgmnt_data.filler_n_retries"
+	Set gtmtypes("sgmnt_data",100,"off")=576
+	Set gtmtypes("sgmnt_data",100,"len")=20
 	Set gtmtypes("sgmnt_data",100,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","filler_n_puts")=100
-	Set gtmtypes("sgmnt_data",101,"name")="sgmnt_data.filler_n_kills"
-	Set gtmtypes("sgmnt_data",101,"off")=600
+	Set gtmtypfldindx("sgmnt_data","filler_n_retries")=100
+	Set gtmtypes("sgmnt_data",100,"dim")=5
+	Set gtmtypes("sgmnt_data",101,"name")="sgmnt_data.filler_n_puts"
+	Set gtmtypes("sgmnt_data",101,"off")=596
 	Set gtmtypes("sgmnt_data",101,"len")=4
 	Set gtmtypes("sgmnt_data",101,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","filler_n_kills")=101
-	Set gtmtypes("sgmnt_data",102,"name")="sgmnt_data.filler_n_queries"
-	Set gtmtypes("sgmnt_data",102,"off")=604
+	Set gtmtypfldindx("sgmnt_data","filler_n_puts")=101
+	Set gtmtypes("sgmnt_data",102,"name")="sgmnt_data.filler_n_kills"
+	Set gtmtypes("sgmnt_data",102,"off")=600
 	Set gtmtypes("sgmnt_data",102,"len")=4
 	Set gtmtypes("sgmnt_data",102,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","filler_n_queries")=102
-	Set gtmtypes("sgmnt_data",103,"name")="sgmnt_data.filler_n_gets"
-	Set gtmtypes("sgmnt_data",103,"off")=608
+	Set gtmtypfldindx("sgmnt_data","filler_n_kills")=102
+	Set gtmtypes("sgmnt_data",103,"name")="sgmnt_data.filler_n_queries"
+	Set gtmtypes("sgmnt_data",103,"off")=604
 	Set gtmtypes("sgmnt_data",103,"len")=4
 	Set gtmtypes("sgmnt_data",103,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","filler_n_gets")=103
-	Set gtmtypes("sgmnt_data",104,"name")="sgmnt_data.filler_n_order"
-	Set gtmtypes("sgmnt_data",104,"off")=612
+	Set gtmtypfldindx("sgmnt_data","filler_n_queries")=103
+	Set gtmtypes("sgmnt_data",104,"name")="sgmnt_data.filler_n_gets"
+	Set gtmtypes("sgmnt_data",104,"off")=608
 	Set gtmtypes("sgmnt_data",104,"len")=4
 	Set gtmtypes("sgmnt_data",104,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","filler_n_order")=104
-	Set gtmtypes("sgmnt_data",105,"name")="sgmnt_data.filler_n_zprevs"
-	Set gtmtypes("sgmnt_data",105,"off")=616
+	Set gtmtypfldindx("sgmnt_data","filler_n_gets")=104
+	Set gtmtypes("sgmnt_data",105,"name")="sgmnt_data.filler_n_order"
+	Set gtmtypes("sgmnt_data",105,"off")=612
 	Set gtmtypes("sgmnt_data",105,"len")=4
 	Set gtmtypes("sgmnt_data",105,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","filler_n_zprevs")=105
-	Set gtmtypes("sgmnt_data",106,"name")="sgmnt_data.filler_n_data"
-	Set gtmtypes("sgmnt_data",106,"off")=620
+	Set gtmtypfldindx("sgmnt_data","filler_n_order")=105
+	Set gtmtypes("sgmnt_data",106,"name")="sgmnt_data.filler_n_zprevs"
+	Set gtmtypes("sgmnt_data",106,"off")=616
 	Set gtmtypes("sgmnt_data",106,"len")=4
 	Set gtmtypes("sgmnt_data",106,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","filler_n_data")=106
-	Set gtmtypes("sgmnt_data",107,"name")="sgmnt_data.filler_n_puts_duplicate"
-	Set gtmtypes("sgmnt_data",107,"off")=624
+	Set gtmtypfldindx("sgmnt_data","filler_n_zprevs")=106
+	Set gtmtypes("sgmnt_data",107,"name")="sgmnt_data.filler_n_data"
+	Set gtmtypes("sgmnt_data",107,"off")=620
 	Set gtmtypes("sgmnt_data",107,"len")=4
-	Set gtmtypes("sgmnt_data",107,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","filler_n_puts_duplicate")=107
-	Set gtmtypes("sgmnt_data",108,"name")="sgmnt_data.filler_n_tp_updates"
-	Set gtmtypes("sgmnt_data",108,"off")=628
+	Set gtmtypes("sgmnt_data",107,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","filler_n_data")=107
+	Set gtmtypes("sgmnt_data",108,"name")="sgmnt_data.filler_n_puts_duplicate"
+	Set gtmtypes("sgmnt_data",108,"off")=624
 	Set gtmtypes("sgmnt_data",108,"len")=4
 	Set gtmtypes("sgmnt_data",108,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","filler_n_tp_updates")=108
-	Set gtmtypes("sgmnt_data",109,"name")="sgmnt_data.filler_n_tp_updates_duplicate"
-	Set gtmtypes("sgmnt_data",109,"off")=632
+	Set gtmtypfldindx("sgmnt_data","filler_n_puts_duplicate")=108
+	Set gtmtypes("sgmnt_data",109,"name")="sgmnt_data.filler_n_tp_updates"
+	Set gtmtypes("sgmnt_data",109,"off")=628
 	Set gtmtypes("sgmnt_data",109,"len")=4
 	Set gtmtypes("sgmnt_data",109,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","filler_n_tp_updates_duplicate")=109
-	Set gtmtypes("sgmnt_data",110,"name")="sgmnt_data.filler_accounting_64_align"
-	Set gtmtypes("sgmnt_data",110,"off")=636
+	Set gtmtypfldindx("sgmnt_data","filler_n_tp_updates")=109
+	Set gtmtypes("sgmnt_data",110,"name")="sgmnt_data.filler_n_tp_updates_duplicate"
+	Set gtmtypes("sgmnt_data",110,"off")=632
 	Set gtmtypes("sgmnt_data",110,"len")=4
-	Set gtmtypes("sgmnt_data",110,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","filler_accounting_64_align")=110
-	Set gtmtypes("sgmnt_data",111,"name")="sgmnt_data.staleness"
-	Set gtmtypes("sgmnt_data",111,"off")=640
-	Set gtmtypes("sgmnt_data",111,"len")=8
-	Set gtmtypes("sgmnt_data",111,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","staleness")=111
-	Set gtmtypes("sgmnt_data",111,"dim")=2
-	Set gtmtypes("sgmnt_data",112,"name")="sgmnt_data.ccp_tick_interval"
-	Set gtmtypes("sgmnt_data",112,"off")=648
+	Set gtmtypes("sgmnt_data",110,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","filler_n_tp_updates_duplicate")=110
+	Set gtmtypes("sgmnt_data",111,"name")="sgmnt_data.filler_accounting_64_align"
+	Set gtmtypes("sgmnt_data",111,"off")=636
+	Set gtmtypes("sgmnt_data",111,"len")=4
+	Set gtmtypes("sgmnt_data",111,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","filler_accounting_64_align")=111
+	Set gtmtypes("sgmnt_data",112,"name")="sgmnt_data.staleness"
+	Set gtmtypes("sgmnt_data",112,"off")=640
 	Set gtmtypes("sgmnt_data",112,"len")=8
 	Set gtmtypes("sgmnt_data",112,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","ccp_tick_interval")=112
+	Set gtmtypfldindx("sgmnt_data","staleness")=112
 	Set gtmtypes("sgmnt_data",112,"dim")=2
-	Set gtmtypes("sgmnt_data",113,"name")="sgmnt_data.ccp_quantum_interval"
-	Set gtmtypes("sgmnt_data",113,"off")=656
+	Set gtmtypes("sgmnt_data",113,"name")="sgmnt_data.ccp_tick_interval"
+	Set gtmtypes("sgmnt_data",113,"off")=648
 	Set gtmtypes("sgmnt_data",113,"len")=8
 	Set gtmtypes("sgmnt_data",113,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","ccp_quantum_interval")=113
+	Set gtmtypfldindx("sgmnt_data","ccp_tick_interval")=113
 	Set gtmtypes("sgmnt_data",113,"dim")=2
-	Set gtmtypes("sgmnt_data",114,"name")="sgmnt_data.ccp_response_interval"
-	Set gtmtypes("sgmnt_data",114,"off")=664
+	Set gtmtypes("sgmnt_data",114,"name")="sgmnt_data.ccp_quantum_interval"
+	Set gtmtypes("sgmnt_data",114,"off")=656
 	Set gtmtypes("sgmnt_data",114,"len")=8
 	Set gtmtypes("sgmnt_data",114,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","ccp_response_interval")=114
+	Set gtmtypfldindx("sgmnt_data","ccp_quantum_interval")=114
 	Set gtmtypes("sgmnt_data",114,"dim")=2
-	Set gtmtypes("sgmnt_data",115,"name")="sgmnt_data.ccp_jnl_before"
-	Set gtmtypes("sgmnt_data",115,"off")=672
-	Set gtmtypes("sgmnt_data",115,"len")=4
-	Set gtmtypes("sgmnt_data",115,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","ccp_jnl_before")=115
-	Set gtmtypes("sgmnt_data",116,"name")="sgmnt_data.clustered"
-	Set gtmtypes("sgmnt_data",116,"off")=676
+	Set gtmtypes("sgmnt_data",115,"name")="sgmnt_data.ccp_response_interval"
+	Set gtmtypes("sgmnt_data",115,"off")=664
+	Set gtmtypes("sgmnt_data",115,"len")=8
+	Set gtmtypes("sgmnt_data",115,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","ccp_response_interval")=115
+	Set gtmtypes("sgmnt_data",115,"dim")=2
+	Set gtmtypes("sgmnt_data",116,"name")="sgmnt_data.ccp_jnl_before"
+	Set gtmtypes("sgmnt_data",116,"off")=672
 	Set gtmtypes("sgmnt_data",116,"len")=4
 	Set gtmtypes("sgmnt_data",116,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","clustered")=116
-	Set gtmtypes("sgmnt_data",117,"name")="sgmnt_data.unbacked_cache"
-	Set gtmtypes("sgmnt_data",117,"off")=680
+	Set gtmtypfldindx("sgmnt_data","ccp_jnl_before")=116
+	Set gtmtypes("sgmnt_data",117,"name")="sgmnt_data.clustered"
+	Set gtmtypes("sgmnt_data",117,"off")=676
 	Set gtmtypes("sgmnt_data",117,"len")=4
 	Set gtmtypes("sgmnt_data",117,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","unbacked_cache")=117
-	Set gtmtypes("sgmnt_data",118,"name")="sgmnt_data.rc_srv_cnt"
-	Set gtmtypes("sgmnt_data",118,"off")=684
+	Set gtmtypfldindx("sgmnt_data","clustered")=117
+	Set gtmtypes("sgmnt_data",118,"name")="sgmnt_data.unbacked_cache"
+	Set gtmtypes("sgmnt_data",118,"off")=680
 	Set gtmtypes("sgmnt_data",118,"len")=4
-	Set gtmtypes("sgmnt_data",118,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","rc_srv_cnt")=118
-	Set gtmtypes("sgmnt_data",119,"name")="sgmnt_data.dsid"
-	Set gtmtypes("sgmnt_data",119,"off")=688
+	Set gtmtypes("sgmnt_data",118,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","unbacked_cache")=118
+	Set gtmtypes("sgmnt_data",119,"name")="sgmnt_data.rc_srv_cnt"
+	Set gtmtypes("sgmnt_data",119,"off")=684
 	Set gtmtypes("sgmnt_data",119,"len")=4
 	Set gtmtypes("sgmnt_data",119,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","dsid")=119
-	Set gtmtypes("sgmnt_data",120,"name")="sgmnt_data.rc_node"
-	Set gtmtypes("sgmnt_data",120,"off")=692
+	Set gtmtypfldindx("sgmnt_data","rc_srv_cnt")=119
+	Set gtmtypes("sgmnt_data",120,"name")="sgmnt_data.dsid"
+	Set gtmtypes("sgmnt_data",120,"off")=688
 	Set gtmtypes("sgmnt_data",120,"len")=4
 	Set gtmtypes("sgmnt_data",120,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","rc_node")=120
-	Set gtmtypes("sgmnt_data",121,"name")="sgmnt_data.filler_ccp_rc"
-	Set gtmtypes("sgmnt_data",121,"off")=696
-	Set gtmtypes("sgmnt_data",121,"len")=8
-	Set gtmtypes("sgmnt_data",121,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","filler_ccp_rc")=121
-	Set gtmtypes("sgmnt_data",122,"name")="sgmnt_data.reg_seqno"
-	Set gtmtypes("sgmnt_data",122,"off")=704
+	Set gtmtypfldindx("sgmnt_data","dsid")=120
+	Set gtmtypes("sgmnt_data",121,"name")="sgmnt_data.rc_node"
+	Set gtmtypes("sgmnt_data",121,"off")=692
+	Set gtmtypes("sgmnt_data",121,"len")=4
+	Set gtmtypes("sgmnt_data",121,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","rc_node")=121
+	Set gtmtypes("sgmnt_data",122,"name")="sgmnt_data.filler_ccp_rc"
+	Set gtmtypes("sgmnt_data",122,"off")=696
 	Set gtmtypes("sgmnt_data",122,"len")=8
-	Set gtmtypes("sgmnt_data",122,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","reg_seqno")=122
-	Set gtmtypes("sgmnt_data",123,"name")="sgmnt_data.pre_multisite_resync_seqno"
-	Set gtmtypes("sgmnt_data",123,"off")=712
+	Set gtmtypes("sgmnt_data",122,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","filler_ccp_rc")=122
+	Set gtmtypes("sgmnt_data",123,"name")="sgmnt_data.reg_seqno"
+	Set gtmtypes("sgmnt_data",123,"off")=704
 	Set gtmtypes("sgmnt_data",123,"len")=8
 	Set gtmtypes("sgmnt_data",123,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","pre_multisite_resync_seqno")=123
-	Set gtmtypes("sgmnt_data",124,"name")="sgmnt_data.zqgblmod_tn"
-	Set gtmtypes("sgmnt_data",124,"off")=720
+	Set gtmtypfldindx("sgmnt_data","reg_seqno")=123
+	Set gtmtypes("sgmnt_data",124,"name")="sgmnt_data.pre_multisite_resync_seqno"
+	Set gtmtypes("sgmnt_data",124,"off")=712
 	Set gtmtypes("sgmnt_data",124,"len")=8
 	Set gtmtypes("sgmnt_data",124,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","zqgblmod_tn")=124
-	Set gtmtypes("sgmnt_data",125,"name")="sgmnt_data.zqgblmod_seqno"
-	Set gtmtypes("sgmnt_data",125,"off")=728
+	Set gtmtypfldindx("sgmnt_data","pre_multisite_resync_seqno")=124
+	Set gtmtypes("sgmnt_data",125,"name")="sgmnt_data.zqgblmod_tn"
+	Set gtmtypes("sgmnt_data",125,"off")=720
 	Set gtmtypes("sgmnt_data",125,"len")=8
 	Set gtmtypes("sgmnt_data",125,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","zqgblmod_seqno")=125
-	Set gtmtypes("sgmnt_data",126,"name")="sgmnt_data.repl_state"
-	Set gtmtypes("sgmnt_data",126,"off")=736
-	Set gtmtypes("sgmnt_data",126,"len")=4
-	Set gtmtypes("sgmnt_data",126,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","repl_state")=126
-	Set gtmtypes("sgmnt_data",127,"name")="sgmnt_data.multi_site_open"
-	Set gtmtypes("sgmnt_data",127,"off")=740
+	Set gtmtypfldindx("sgmnt_data","zqgblmod_tn")=125
+	Set gtmtypes("sgmnt_data",126,"name")="sgmnt_data.zqgblmod_seqno"
+	Set gtmtypes("sgmnt_data",126,"off")=728
+	Set gtmtypes("sgmnt_data",126,"len")=8
+	Set gtmtypes("sgmnt_data",126,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","zqgblmod_seqno")=126
+	Set gtmtypes("sgmnt_data",127,"name")="sgmnt_data.repl_state"
+	Set gtmtypes("sgmnt_data",127,"off")=736
 	Set gtmtypes("sgmnt_data",127,"len")=4
-	Set gtmtypes("sgmnt_data",127,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","multi_site_open")=127
-	Set gtmtypes("sgmnt_data",128,"name")="sgmnt_data.filler_seqno"
-	Set gtmtypes("sgmnt_data",128,"off")=744
-	Set gtmtypes("sgmnt_data",128,"len")=8
-	Set gtmtypes("sgmnt_data",128,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","filler_seqno")=128
-	Set gtmtypes("sgmnt_data",129,"name")="sgmnt_data.filler_repl"
-	Set gtmtypes("sgmnt_data",129,"off")=752
-	Set gtmtypes("sgmnt_data",129,"len")=16
-	Set gtmtypes("sgmnt_data",129,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","filler_repl")=129
-	Set gtmtypes("sgmnt_data",130,"name")="sgmnt_data.filler_n_tp_retries"
-	Set gtmtypes("sgmnt_data",130,"off")=768
-	Set gtmtypes("sgmnt_data",130,"len")=48
-	Set gtmtypes("sgmnt_data",130,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","filler_n_tp_retries")=130
-	Set gtmtypes("sgmnt_data",130,"dim")=12
-	Set gtmtypes("sgmnt_data",131,"name")="sgmnt_data.filler_n_tp_retries_conflicts"
-	Set gtmtypes("sgmnt_data",131,"off")=816
+	Set gtmtypes("sgmnt_data",127,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","repl_state")=127
+	Set gtmtypes("sgmnt_data",128,"name")="sgmnt_data.multi_site_open"
+	Set gtmtypes("sgmnt_data",128,"off")=740
+	Set gtmtypes("sgmnt_data",128,"len")=4
+	Set gtmtypes("sgmnt_data",128,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","multi_site_open")=128
+	Set gtmtypes("sgmnt_data",129,"name")="sgmnt_data.filler_seqno"
+	Set gtmtypes("sgmnt_data",129,"off")=744
+	Set gtmtypes("sgmnt_data",129,"len")=8
+	Set gtmtypes("sgmnt_data",129,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","filler_seqno")=129
+	Set gtmtypes("sgmnt_data",130,"name")="sgmnt_data.filler_repl"
+	Set gtmtypes("sgmnt_data",130,"off")=752
+	Set gtmtypes("sgmnt_data",130,"len")=16
+	Set gtmtypes("sgmnt_data",130,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","filler_repl")=130
+	Set gtmtypes("sgmnt_data",131,"name")="sgmnt_data.filler_n_tp_retries"
+	Set gtmtypes("sgmnt_data",131,"off")=768
 	Set gtmtypes("sgmnt_data",131,"len")=48
 	Set gtmtypes("sgmnt_data",131,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","filler_n_tp_retries_conflicts")=131
+	Set gtmtypfldindx("sgmnt_data","filler_n_tp_retries")=131
 	Set gtmtypes("sgmnt_data",131,"dim")=12
-	Set gtmtypes("sgmnt_data",132,"name")="sgmnt_data.tp_cdb_sc_blkmod"
-	Set gtmtypes("sgmnt_data",132,"off")=864
-	Set gtmtypes("sgmnt_data",132,"len")=32
+	Set gtmtypes("sgmnt_data",132,"name")="sgmnt_data.filler_n_tp_retries_conflicts"
+	Set gtmtypes("sgmnt_data",132,"off")=816
+	Set gtmtypes("sgmnt_data",132,"len")=48
 	Set gtmtypes("sgmnt_data",132,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","tp_cdb_sc_blkmod")=132
-	Set gtmtypes("sgmnt_data",132,"dim")=8
-	Set gtmtypes("sgmnt_data",133,"name")="sgmnt_data.jnl_alq"
-	Set gtmtypes("sgmnt_data",133,"off")=896
-	Set gtmtypes("sgmnt_data",133,"len")=4
-	Set gtmtypes("sgmnt_data",133,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","jnl_alq")=133
-	Set gtmtypes("sgmnt_data",134,"name")="sgmnt_data.jnl_deq"
-	Set gtmtypes("sgmnt_data",134,"off")=900
+	Set gtmtypfldindx("sgmnt_data","filler_n_tp_retries_conflicts")=132
+	Set gtmtypes("sgmnt_data",132,"dim")=12
+	Set gtmtypes("sgmnt_data",133,"name")="sgmnt_data.tp_cdb_sc_blkmod"
+	Set gtmtypes("sgmnt_data",133,"off")=864
+	Set gtmtypes("sgmnt_data",133,"len")=32
+	Set gtmtypes("sgmnt_data",133,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","tp_cdb_sc_blkmod")=133
+	Set gtmtypes("sgmnt_data",133,"dim")=8
+	Set gtmtypes("sgmnt_data",134,"name")="sgmnt_data.jnl_alq"
+	Set gtmtypes("sgmnt_data",134,"off")=896
 	Set gtmtypes("sgmnt_data",134,"len")=4
 	Set gtmtypes("sgmnt_data",134,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","jnl_deq")=134
-	Set gtmtypes("sgmnt_data",135,"name")="sgmnt_data.jnl_buffer_size"
-	Set gtmtypes("sgmnt_data",135,"off")=904
+	Set gtmtypfldindx("sgmnt_data","jnl_alq")=134
+	Set gtmtypes("sgmnt_data",135,"name")="sgmnt_data.jnl_deq"
+	Set gtmtypes("sgmnt_data",135,"off")=900
 	Set gtmtypes("sgmnt_data",135,"len")=4
-	Set gtmtypes("sgmnt_data",135,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","jnl_buffer_size")=135
-	Set gtmtypes("sgmnt_data",136,"name")="sgmnt_data.jnl_before_image"
-	Set gtmtypes("sgmnt_data",136,"off")=908
+	Set gtmtypes("sgmnt_data",135,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","jnl_deq")=135
+	Set gtmtypes("sgmnt_data",136,"name")="sgmnt_data.jnl_buffer_size"
+	Set gtmtypes("sgmnt_data",136,"off")=904
 	Set gtmtypes("sgmnt_data",136,"len")=4
-	Set gtmtypes("sgmnt_data",136,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","jnl_before_image")=136
-	Set gtmtypes("sgmnt_data",137,"name")="sgmnt_data.jnl_state"
-	Set gtmtypes("sgmnt_data",137,"off")=912
+	Set gtmtypes("sgmnt_data",136,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","jnl_buffer_size")=136
+	Set gtmtypes("sgmnt_data",137,"name")="sgmnt_data.jnl_before_image"
+	Set gtmtypes("sgmnt_data",137,"off")=908
 	Set gtmtypes("sgmnt_data",137,"len")=4
-	Set gtmtypes("sgmnt_data",137,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","jnl_state")=137
-	Set gtmtypes("sgmnt_data",138,"name")="sgmnt_data.jnl_file_len"
-	Set gtmtypes("sgmnt_data",138,"off")=916
+	Set gtmtypes("sgmnt_data",137,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","jnl_before_image")=137
+	Set gtmtypes("sgmnt_data",138,"name")="sgmnt_data.jnl_state"
+	Set gtmtypes("sgmnt_data",138,"off")=912
 	Set gtmtypes("sgmnt_data",138,"len")=4
-	Set gtmtypes("sgmnt_data",138,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","jnl_file_len")=138
-	Set gtmtypes("sgmnt_data",139,"name")="sgmnt_data.autoswitchlimit"
-	Set gtmtypes("sgmnt_data",139,"off")=920
+	Set gtmtypes("sgmnt_data",138,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","jnl_state")=138
+	Set gtmtypes("sgmnt_data",139,"name")="sgmnt_data.jnl_file_len"
+	Set gtmtypes("sgmnt_data",139,"off")=916
 	Set gtmtypes("sgmnt_data",139,"len")=4
 	Set gtmtypes("sgmnt_data",139,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","autoswitchlimit")=139
-	Set gtmtypes("sgmnt_data",140,"name")="sgmnt_data.epoch_interval"
-	Set gtmtypes("sgmnt_data",140,"off")=924
+	Set gtmtypfldindx("sgmnt_data","jnl_file_len")=139
+	Set gtmtypes("sgmnt_data",140,"name")="sgmnt_data.autoswitchlimit"
+	Set gtmtypes("sgmnt_data",140,"off")=920
 	Set gtmtypes("sgmnt_data",140,"len")=4
-	Set gtmtypes("sgmnt_data",140,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","epoch_interval")=140
-	Set gtmtypes("sgmnt_data",141,"name")="sgmnt_data.alignsize"
-	Set gtmtypes("sgmnt_data",141,"off")=928
+	Set gtmtypes("sgmnt_data",140,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","autoswitchlimit")=140
+	Set gtmtypes("sgmnt_data",141,"name")="sgmnt_data.epoch_interval"
+	Set gtmtypes("sgmnt_data",141,"off")=924
 	Set gtmtypes("sgmnt_data",141,"len")=4
-	Set gtmtypes("sgmnt_data",141,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","alignsize")=141
-	Set gtmtypes("sgmnt_data",142,"name")="sgmnt_data.jnl_sync_io"
-	Set gtmtypes("sgmnt_data",142,"off")=932
+	Set gtmtypes("sgmnt_data",141,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","epoch_interval")=141
+	Set gtmtypes("sgmnt_data",142,"name")="sgmnt_data.alignsize"
+	Set gtmtypes("sgmnt_data",142,"off")=928
 	Set gtmtypes("sgmnt_data",142,"len")=4
-	Set gtmtypes("sgmnt_data",142,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","jnl_sync_io")=142
-	Set gtmtypes("sgmnt_data",143,"name")="sgmnt_data.yield_lmt"
-	Set gtmtypes("sgmnt_data",143,"off")=936
+	Set gtmtypes("sgmnt_data",142,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","alignsize")=142
+	Set gtmtypes("sgmnt_data",143,"name")="sgmnt_data.jnl_sync_io"
+	Set gtmtypes("sgmnt_data",143,"off")=932
 	Set gtmtypes("sgmnt_data",143,"len")=4
 	Set gtmtypes("sgmnt_data",143,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","yield_lmt")=143
-	Set gtmtypes("sgmnt_data",144,"name")="sgmnt_data.turn_around_point"
-	Set gtmtypes("sgmnt_data",144,"off")=940
+	Set gtmtypfldindx("sgmnt_data","jnl_sync_io")=143
+	Set gtmtypes("sgmnt_data",144,"name")="sgmnt_data.yield_lmt"
+	Set gtmtypes("sgmnt_data",144,"off")=936
 	Set gtmtypes("sgmnt_data",144,"len")=4
-	Set gtmtypes("sgmnt_data",144,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","turn_around_point")=144
-	Set gtmtypes("sgmnt_data",145,"name")="sgmnt_data.jnl_eovtn"
-	Set gtmtypes("sgmnt_data",145,"off")=944
-	Set gtmtypes("sgmnt_data",145,"len")=8
-	Set gtmtypes("sgmnt_data",145,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","jnl_eovtn")=145
-	Set gtmtypes("sgmnt_data",146,"name")="sgmnt_data.filler_jnl"
-	Set gtmtypes("sgmnt_data",146,"off")=952
+	Set gtmtypes("sgmnt_data",144,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","yield_lmt")=144
+	Set gtmtypes("sgmnt_data",145,"name")="sgmnt_data.turn_around_point"
+	Set gtmtypes("sgmnt_data",145,"off")=940
+	Set gtmtypes("sgmnt_data",145,"len")=4
+	Set gtmtypes("sgmnt_data",145,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","turn_around_point")=145
+	Set gtmtypes("sgmnt_data",146,"name")="sgmnt_data.jnl_eovtn"
+	Set gtmtypes("sgmnt_data",146,"off")=944
 	Set gtmtypes("sgmnt_data",146,"len")=8
-	Set gtmtypes("sgmnt_data",146,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","filler_jnl")=146
-	Set gtmtypes("sgmnt_data",147,"name")="sgmnt_data.intrpt_recov_resync_seqno"
-	Set gtmtypes("sgmnt_data",147,"off")=960
+	Set gtmtypes("sgmnt_data",146,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","jnl_eovtn")=146
+	Set gtmtypes("sgmnt_data",147,"name")="sgmnt_data.filler_jnl"
+	Set gtmtypes("sgmnt_data",147,"off")=952
 	Set gtmtypes("sgmnt_data",147,"len")=8
-	Set gtmtypes("sgmnt_data",147,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","intrpt_recov_resync_seqno")=147
-	Set gtmtypes("sgmnt_data",148,"name")="sgmnt_data.intrpt_recov_tp_resolve_time"
-	Set gtmtypes("sgmnt_data",148,"off")=968
-	Set gtmtypes("sgmnt_data",148,"len")=4
-	Set gtmtypes("sgmnt_data",148,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","intrpt_recov_tp_resolve_time")=148
-	Set gtmtypes("sgmnt_data",149,"name")="sgmnt_data.recov_interrupted"
-	Set gtmtypes("sgmnt_data",149,"off")=972
+	Set gtmtypes("sgmnt_data",147,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","filler_jnl")=147
+	Set gtmtypes("sgmnt_data",148,"name")="sgmnt_data.intrpt_recov_resync_seqno"
+	Set gtmtypes("sgmnt_data",148,"off")=960
+	Set gtmtypes("sgmnt_data",148,"len")=8
+	Set gtmtypes("sgmnt_data",148,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","intrpt_recov_resync_seqno")=148
+	Set gtmtypes("sgmnt_data",149,"name")="sgmnt_data.intrpt_recov_tp_resolve_time"
+	Set gtmtypes("sgmnt_data",149,"off")=968
 	Set gtmtypes("sgmnt_data",149,"len")=4
-	Set gtmtypes("sgmnt_data",149,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","recov_interrupted")=149
-	Set gtmtypes("sgmnt_data",150,"name")="sgmnt_data.intrpt_recov_jnl_state"
-	Set gtmtypes("sgmnt_data",150,"off")=976
+	Set gtmtypes("sgmnt_data",149,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","intrpt_recov_tp_resolve_time")=149
+	Set gtmtypes("sgmnt_data",150,"name")="sgmnt_data.recov_interrupted"
+	Set gtmtypes("sgmnt_data",150,"off")=972
 	Set gtmtypes("sgmnt_data",150,"len")=4
-	Set gtmtypes("sgmnt_data",150,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","intrpt_recov_jnl_state")=150
-	Set gtmtypes("sgmnt_data",151,"name")="sgmnt_data.intrpt_recov_repl_state"
-	Set gtmtypes("sgmnt_data",151,"off")=980
+	Set gtmtypes("sgmnt_data",150,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","recov_interrupted")=150
+	Set gtmtypes("sgmnt_data",151,"name")="sgmnt_data.intrpt_recov_jnl_state"
+	Set gtmtypes("sgmnt_data",151,"off")=976
 	Set gtmtypes("sgmnt_data",151,"len")=4
 	Set gtmtypes("sgmnt_data",151,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","intrpt_recov_repl_state")=151
-	Set gtmtypes("sgmnt_data",152,"name")="sgmnt_data.before_trunc_total_blks"
-	Set gtmtypes("sgmnt_data",152,"off")=984
+	Set gtmtypfldindx("sgmnt_data","intrpt_recov_jnl_state")=151
+	Set gtmtypes("sgmnt_data",152,"name")="sgmnt_data.intrpt_recov_repl_state"
+	Set gtmtypes("sgmnt_data",152,"off")=980
 	Set gtmtypes("sgmnt_data",152,"len")=4
-	Set gtmtypes("sgmnt_data",152,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","before_trunc_total_blks")=152
-	Set gtmtypes("sgmnt_data",153,"name")="sgmnt_data.after_trunc_total_blks"
-	Set gtmtypes("sgmnt_data",153,"off")=988
+	Set gtmtypes("sgmnt_data",152,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","intrpt_recov_repl_state")=152
+	Set gtmtypes("sgmnt_data",153,"name")="sgmnt_data.before_trunc_total_blks"
+	Set gtmtypes("sgmnt_data",153,"off")=984
 	Set gtmtypes("sgmnt_data",153,"len")=4
 	Set gtmtypes("sgmnt_data",153,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","after_trunc_total_blks")=153
-	Set gtmtypes("sgmnt_data",154,"name")="sgmnt_data.before_trunc_free_blocks"
-	Set gtmtypes("sgmnt_data",154,"off")=992
+	Set gtmtypfldindx("sgmnt_data","before_trunc_total_blks")=153
+	Set gtmtypes("sgmnt_data",154,"name")="sgmnt_data.after_trunc_total_blks"
+	Set gtmtypes("sgmnt_data",154,"off")=988
 	Set gtmtypes("sgmnt_data",154,"len")=4
 	Set gtmtypes("sgmnt_data",154,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","before_trunc_free_blocks")=154
-	Set gtmtypes("sgmnt_data",155,"name")="sgmnt_data.filler_trunc"
-	Set gtmtypes("sgmnt_data",155,"off")=996
+	Set gtmtypfldindx("sgmnt_data","after_trunc_total_blks")=154
+	Set gtmtypes("sgmnt_data",155,"name")="sgmnt_data.before_trunc_free_blocks"
+	Set gtmtypes("sgmnt_data",155,"off")=992
 	Set gtmtypes("sgmnt_data",155,"len")=4
 	Set gtmtypes("sgmnt_data",155,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","filler_trunc")=155
-	Set gtmtypes("sgmnt_data",156,"name")="sgmnt_data.filler_1k"
-	Set gtmtypes("sgmnt_data",156,"off")=1000
-	Set gtmtypes("sgmnt_data",156,"len")=24
-	Set gtmtypes("sgmnt_data",156,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","filler_1k")=156
-	Set gtmtypes("sgmnt_data",157,"name")="sgmnt_data.jnl_file_name"
-	Set gtmtypes("sgmnt_data",157,"off")=1024
-	Set gtmtypes("sgmnt_data",157,"len")=256
-	Set gtmtypes("sgmnt_data",157,"type")="unsigned-char"
-	Set gtmtypfldindx("sgmnt_data","jnl_file_name")=157
-	Set gtmtypes("sgmnt_data",158,"name")="sgmnt_data.reorg_restart_key"
-	Set gtmtypes("sgmnt_data",158,"off")=1280
+	Set gtmtypfldindx("sgmnt_data","before_trunc_free_blocks")=155
+	Set gtmtypes("sgmnt_data",156,"name")="sgmnt_data.filler_trunc"
+	Set gtmtypes("sgmnt_data",156,"off")=996
+	Set gtmtypes("sgmnt_data",156,"len")=4
+	Set gtmtypes("sgmnt_data",156,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","filler_trunc")=156
+	Set gtmtypes("sgmnt_data",157,"name")="sgmnt_data.filler_1k"
+	Set gtmtypes("sgmnt_data",157,"off")=1000
+	Set gtmtypes("sgmnt_data",157,"len")=24
+	Set gtmtypes("sgmnt_data",157,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","filler_1k")=157
+	Set gtmtypes("sgmnt_data",158,"name")="sgmnt_data.jnl_file_name"
+	Set gtmtypes("sgmnt_data",158,"off")=1024
 	Set gtmtypes("sgmnt_data",158,"len")=256
 	Set gtmtypes("sgmnt_data",158,"type")="unsigned-char"
-	Set gtmtypfldindx("sgmnt_data","reorg_restart_key")=158
-	Set gtmtypes("sgmnt_data",159,"name")="sgmnt_data.machine_name"
-	Set gtmtypes("sgmnt_data",159,"off")=1536
+	Set gtmtypfldindx("sgmnt_data","jnl_file_name")=158
+	Set gtmtypes("sgmnt_data",159,"name")="sgmnt_data.reorg_restart_key"
+	Set gtmtypes("sgmnt_data",159,"off")=1280
 	Set gtmtypes("sgmnt_data",159,"len")=256
-	Set gtmtypes("sgmnt_data",159,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","machine_name")=159
-	Set gtmtypes("sgmnt_data",160,"name")="sgmnt_data.encryption_hash"
-	Set gtmtypes("sgmnt_data",160,"off")=1792
-	Set gtmtypes("sgmnt_data",160,"len")=80
+	Set gtmtypes("sgmnt_data",159,"type")="unsigned-char"
+	Set gtmtypfldindx("sgmnt_data","reorg_restart_key")=159
+	Set gtmtypes("sgmnt_data",160,"name")="sgmnt_data.machine_name"
+	Set gtmtypes("sgmnt_data",160,"off")=1536
+	Set gtmtypes("sgmnt_data",160,"len")=256
 	Set gtmtypes("sgmnt_data",160,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","encryption_hash")=160
-	Set gtmtypes("sgmnt_data",161,"name")="sgmnt_data.encryption_hash2"
-	Set gtmtypes("sgmnt_data",161,"off")=1872
+	Set gtmtypfldindx("sgmnt_data","machine_name")=160
+	Set gtmtypes("sgmnt_data",161,"name")="sgmnt_data.encryption_hash"
+	Set gtmtypes("sgmnt_data",161,"off")=1792
 	Set gtmtypes("sgmnt_data",161,"len")=80
 	Set gtmtypes("sgmnt_data",161,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","encryption_hash2")=161
-	Set gtmtypes("sgmnt_data",162,"name")="sgmnt_data.non_null_iv"
-	Set gtmtypes("sgmnt_data",162,"off")=1952
-	Set gtmtypes("sgmnt_data",162,"len")=4
-	Set gtmtypes("sgmnt_data",162,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","non_null_iv")=162
-	Set gtmtypes("sgmnt_data",163,"name")="sgmnt_data.encryption_hash_cutoff"
-	Set gtmtypes("sgmnt_data",163,"off")=1956
+	Set gtmtypfldindx("sgmnt_data","encryption_hash")=161
+	Set gtmtypes("sgmnt_data",162,"name")="sgmnt_data.encryption_hash2"
+	Set gtmtypes("sgmnt_data",162,"off")=1872
+	Set gtmtypes("sgmnt_data",162,"len")=80
+	Set gtmtypes("sgmnt_data",162,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","encryption_hash2")=162
+	Set gtmtypes("sgmnt_data",163,"name")="sgmnt_data.non_null_iv"
+	Set gtmtypes("sgmnt_data",163,"off")=1952
 	Set gtmtypes("sgmnt_data",163,"len")=4
-	Set gtmtypes("sgmnt_data",163,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","encryption_hash_cutoff")=163
-	Set gtmtypes("sgmnt_data",164,"name")="sgmnt_data.encryption_hash2_start_tn"
-	Set gtmtypes("sgmnt_data",164,"off")=1960
-	Set gtmtypes("sgmnt_data",164,"len")=8
-	Set gtmtypes("sgmnt_data",164,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","encryption_hash2_start_tn")=164
-	Set gtmtypes("sgmnt_data",165,"name")="sgmnt_data.filler_encrypt"
-	Set gtmtypes("sgmnt_data",165,"off")=1968
-	Set gtmtypes("sgmnt_data",165,"len")=80
-	Set gtmtypes("sgmnt_data",165,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","filler_encrypt")=165
-	Set gtmtypes("sgmnt_data",166,"name")="sgmnt_data.total_buffer_flush_tn"
-	Set gtmtypes("sgmnt_data",166,"off")=2048
-	Set gtmtypes("sgmnt_data",166,"len")=8
-	Set gtmtypes("sgmnt_data",166,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","total_buffer_flush_tn")=166
-	Set gtmtypes("sgmnt_data",167,"name")="sgmnt_data.bufct_buffer_flush_tn"
-	Set gtmtypes("sgmnt_data",167,"off")=2056
+	Set gtmtypes("sgmnt_data",163,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","non_null_iv")=163
+	Set gtmtypes("sgmnt_data",164,"name")="sgmnt_data.encryption_hash_cutoff"
+	Set gtmtypes("sgmnt_data",164,"off")=1956
+	Set gtmtypes("sgmnt_data",164,"len")=4
+	Set gtmtypes("sgmnt_data",164,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","encryption_hash_cutoff")=164
+	Set gtmtypes("sgmnt_data",165,"name")="sgmnt_data.encryption_hash2_start_tn"
+	Set gtmtypes("sgmnt_data",165,"off")=1960
+	Set gtmtypes("sgmnt_data",165,"len")=8
+	Set gtmtypes("sgmnt_data",165,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","encryption_hash2_start_tn")=165
+	Set gtmtypes("sgmnt_data",166,"name")="sgmnt_data.filler_encrypt"
+	Set gtmtypes("sgmnt_data",166,"off")=1968
+	Set gtmtypes("sgmnt_data",166,"len")=80
+	Set gtmtypes("sgmnt_data",166,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","filler_encrypt")=166
+	Set gtmtypes("sgmnt_data",167,"name")="sgmnt_data.total_buffer_flush_tn"
+	Set gtmtypes("sgmnt_data",167,"off")=2048
 	Set gtmtypes("sgmnt_data",167,"len")=8
 	Set gtmtypes("sgmnt_data",167,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","bufct_buffer_flush_tn")=167
-	Set gtmtypes("sgmnt_data",168,"name")="sgmnt_data.bufct_buffer_flush_loop_tn"
-	Set gtmtypes("sgmnt_data",168,"off")=2064
+	Set gtmtypfldindx("sgmnt_data","total_buffer_flush_tn")=167
+	Set gtmtypes("sgmnt_data",168,"name")="sgmnt_data.bufct_buffer_flush_tn"
+	Set gtmtypes("sgmnt_data",168,"off")=2056
 	Set gtmtypes("sgmnt_data",168,"len")=8
 	Set gtmtypes("sgmnt_data",168,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","bufct_buffer_flush_loop_tn")=168
-	Set gtmtypes("sgmnt_data",169,"name")="sgmnt_data.wrt_calls_tn"
-	Set gtmtypes("sgmnt_data",169,"off")=2072
+	Set gtmtypfldindx("sgmnt_data","bufct_buffer_flush_tn")=168
+	Set gtmtypes("sgmnt_data",169,"name")="sgmnt_data.bufct_buffer_flush_loop_tn"
+	Set gtmtypes("sgmnt_data",169,"off")=2064
 	Set gtmtypes("sgmnt_data",169,"len")=8
 	Set gtmtypes("sgmnt_data",169,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wrt_calls_tn")=169
-	Set gtmtypes("sgmnt_data",170,"name")="sgmnt_data.wrt_count_tn"
-	Set gtmtypes("sgmnt_data",170,"off")=2080
+	Set gtmtypfldindx("sgmnt_data","bufct_buffer_flush_loop_tn")=169
+	Set gtmtypes("sgmnt_data",170,"name")="sgmnt_data.wrt_calls_tn"
+	Set gtmtypes("sgmnt_data",170,"off")=2072
 	Set gtmtypes("sgmnt_data",170,"len")=8
 	Set gtmtypes("sgmnt_data",170,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wrt_count_tn")=170
-	Set gtmtypes("sgmnt_data",171,"name")="sgmnt_data.wrt_blocked_tn"
-	Set gtmtypes("sgmnt_data",171,"off")=2088
+	Set gtmtypfldindx("sgmnt_data","wrt_calls_tn")=170
+	Set gtmtypes("sgmnt_data",171,"name")="sgmnt_data.wrt_count_tn"
+	Set gtmtypes("sgmnt_data",171,"off")=2080
 	Set gtmtypes("sgmnt_data",171,"len")=8
 	Set gtmtypes("sgmnt_data",171,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wrt_blocked_tn")=171
-	Set gtmtypes("sgmnt_data",172,"name")="sgmnt_data.wrt_busy_tn"
-	Set gtmtypes("sgmnt_data",172,"off")=2096
+	Set gtmtypfldindx("sgmnt_data","wrt_count_tn")=171
+	Set gtmtypes("sgmnt_data",172,"name")="sgmnt_data.wrt_blocked_tn"
+	Set gtmtypes("sgmnt_data",172,"off")=2088
 	Set gtmtypes("sgmnt_data",172,"len")=8
 	Set gtmtypes("sgmnt_data",172,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wrt_busy_tn")=172
-	Set gtmtypes("sgmnt_data",173,"name")="sgmnt_data.wrt_noblks_wrtn_tn"
-	Set gtmtypes("sgmnt_data",173,"off")=2104
+	Set gtmtypfldindx("sgmnt_data","wrt_blocked_tn")=172
+	Set gtmtypes("sgmnt_data",173,"name")="sgmnt_data.wrt_busy_tn"
+	Set gtmtypes("sgmnt_data",173,"off")=2096
 	Set gtmtypes("sgmnt_data",173,"len")=8
 	Set gtmtypes("sgmnt_data",173,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wrt_noblks_wrtn_tn")=173
-	Set gtmtypes("sgmnt_data",174,"name")="sgmnt_data.reserved_bgtrcrec1_tn"
-	Set gtmtypes("sgmnt_data",174,"off")=2112
+	Set gtmtypfldindx("sgmnt_data","wrt_busy_tn")=173
+	Set gtmtypes("sgmnt_data",174,"name")="sgmnt_data.wrt_noblks_wrtn_tn"
+	Set gtmtypes("sgmnt_data",174,"off")=2104
 	Set gtmtypes("sgmnt_data",174,"len")=8
 	Set gtmtypes("sgmnt_data",174,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","reserved_bgtrcrec1_tn")=174
-	Set gtmtypes("sgmnt_data",175,"name")="sgmnt_data.reserved_bgtrcrec2_tn"
-	Set gtmtypes("sgmnt_data",175,"off")=2120
+	Set gtmtypfldindx("sgmnt_data","wrt_noblks_wrtn_tn")=174
+	Set gtmtypes("sgmnt_data",175,"name")="sgmnt_data.reserved_bgtrcrec1_tn"
+	Set gtmtypes("sgmnt_data",175,"off")=2112
 	Set gtmtypes("sgmnt_data",175,"len")=8
 	Set gtmtypes("sgmnt_data",175,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","reserved_bgtrcrec2_tn")=175
-	Set gtmtypes("sgmnt_data",176,"name")="sgmnt_data.reserved_bgtrcrec3_tn"
-	Set gtmtypes("sgmnt_data",176,"off")=2128
+	Set gtmtypfldindx("sgmnt_data","reserved_bgtrcrec1_tn")=175
+	Set gtmtypes("sgmnt_data",176,"name")="sgmnt_data.reserved_bgtrcrec2_tn"
+	Set gtmtypes("sgmnt_data",176,"off")=2120
 	Set gtmtypes("sgmnt_data",176,"len")=8
 	Set gtmtypes("sgmnt_data",176,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","reserved_bgtrcrec3_tn")=176
-	Set gtmtypes("sgmnt_data",177,"name")="sgmnt_data.lost_block_recovery_tn"
-	Set gtmtypes("sgmnt_data",177,"off")=2136
+	Set gtmtypfldindx("sgmnt_data","reserved_bgtrcrec2_tn")=176
+	Set gtmtypes("sgmnt_data",177,"name")="sgmnt_data.reserved_bgtrcrec3_tn"
+	Set gtmtypes("sgmnt_data",177,"off")=2128
 	Set gtmtypes("sgmnt_data",177,"len")=8
 	Set gtmtypes("sgmnt_data",177,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","lost_block_recovery_tn")=177
-	Set gtmtypes("sgmnt_data",178,"name")="sgmnt_data.wc_blocked_onln_rlbk_tn"
-	Set gtmtypes("sgmnt_data",178,"off")=2144
+	Set gtmtypfldindx("sgmnt_data","reserved_bgtrcrec3_tn")=177
+	Set gtmtypes("sgmnt_data",178,"name")="sgmnt_data.lost_block_recovery_tn"
+	Set gtmtypes("sgmnt_data",178,"off")=2136
 	Set gtmtypes("sgmnt_data",178,"len")=8
 	Set gtmtypes("sgmnt_data",178,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_onln_rlbk_tn")=178
-	Set gtmtypes("sgmnt_data",179,"name")="sgmnt_data.stale_tn"
-	Set gtmtypes("sgmnt_data",179,"off")=2152
+	Set gtmtypfldindx("sgmnt_data","lost_block_recovery_tn")=178
+	Set gtmtypes("sgmnt_data",179,"name")="sgmnt_data.wc_blocked_onln_rlbk_tn"
+	Set gtmtypes("sgmnt_data",179,"off")=2144
 	Set gtmtypes("sgmnt_data",179,"len")=8
 	Set gtmtypes("sgmnt_data",179,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","stale_tn")=179
-	Set gtmtypes("sgmnt_data",180,"name")="sgmnt_data.starved_tn"
-	Set gtmtypes("sgmnt_data",180,"off")=2160
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_onln_rlbk_tn")=179
+	Set gtmtypes("sgmnt_data",180,"name")="sgmnt_data.stale_tn"
+	Set gtmtypes("sgmnt_data",180,"off")=2152
 	Set gtmtypes("sgmnt_data",180,"len")=8
 	Set gtmtypes("sgmnt_data",180,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","starved_tn")=180
-	Set gtmtypes("sgmnt_data",181,"name")="sgmnt_data.stale_timer_started_tn"
-	Set gtmtypes("sgmnt_data",181,"off")=2168
+	Set gtmtypfldindx("sgmnt_data","stale_tn")=180
+	Set gtmtypes("sgmnt_data",181,"name")="sgmnt_data.starved_tn"
+	Set gtmtypes("sgmnt_data",181,"off")=2160
 	Set gtmtypes("sgmnt_data",181,"len")=8
 	Set gtmtypes("sgmnt_data",181,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","stale_timer_started_tn")=181
-	Set gtmtypes("sgmnt_data",182,"name")="sgmnt_data.stale_timer_pop_tn"
-	Set gtmtypes("sgmnt_data",182,"off")=2176
+	Set gtmtypfldindx("sgmnt_data","starved_tn")=181
+	Set gtmtypes("sgmnt_data",182,"name")="sgmnt_data.stale_timer_started_tn"
+	Set gtmtypes("sgmnt_data",182,"off")=2168
 	Set gtmtypes("sgmnt_data",182,"len")=8
 	Set gtmtypes("sgmnt_data",182,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","stale_timer_pop_tn")=182
-	Set gtmtypes("sgmnt_data",183,"name")="sgmnt_data.stale_process_defer_tn"
-	Set gtmtypes("sgmnt_data",183,"off")=2184
+	Set gtmtypfldindx("sgmnt_data","stale_timer_started_tn")=182
+	Set gtmtypes("sgmnt_data",183,"name")="sgmnt_data.stale_timer_pop_tn"
+	Set gtmtypes("sgmnt_data",183,"off")=2176
 	Set gtmtypes("sgmnt_data",183,"len")=8
 	Set gtmtypes("sgmnt_data",183,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","stale_process_defer_tn")=183
-	Set gtmtypes("sgmnt_data",184,"name")="sgmnt_data.stale_defer_processed_tn"
-	Set gtmtypes("sgmnt_data",184,"off")=2192
+	Set gtmtypfldindx("sgmnt_data","stale_timer_pop_tn")=183
+	Set gtmtypes("sgmnt_data",184,"name")="sgmnt_data.stale_process_defer_tn"
+	Set gtmtypes("sgmnt_data",184,"off")=2184
 	Set gtmtypes("sgmnt_data",184,"len")=8
 	Set gtmtypes("sgmnt_data",184,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","stale_defer_processed_tn")=184
-	Set gtmtypes("sgmnt_data",185,"name")="sgmnt_data.spcfc_buffer_flush_tn"
-	Set gtmtypes("sgmnt_data",185,"off")=2200
+	Set gtmtypfldindx("sgmnt_data","stale_process_defer_tn")=184
+	Set gtmtypes("sgmnt_data",185,"name")="sgmnt_data.stale_defer_processed_tn"
+	Set gtmtypes("sgmnt_data",185,"off")=2192
 	Set gtmtypes("sgmnt_data",185,"len")=8
 	Set gtmtypes("sgmnt_data",185,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","spcfc_buffer_flush_tn")=185
-	Set gtmtypes("sgmnt_data",186,"name")="sgmnt_data.spcfc_buffer_flush_loop_tn"
-	Set gtmtypes("sgmnt_data",186,"off")=2208
+	Set gtmtypfldindx("sgmnt_data","stale_defer_processed_tn")=185
+	Set gtmtypes("sgmnt_data",186,"name")="sgmnt_data.spcfc_buffer_flush_tn"
+	Set gtmtypes("sgmnt_data",186,"off")=2200
 	Set gtmtypes("sgmnt_data",186,"len")=8
 	Set gtmtypes("sgmnt_data",186,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","spcfc_buffer_flush_loop_tn")=186
-	Set gtmtypes("sgmnt_data",187,"name")="sgmnt_data.spcfc_buffer_flush_retries_tn"
-	Set gtmtypes("sgmnt_data",187,"off")=2216
+	Set gtmtypfldindx("sgmnt_data","spcfc_buffer_flush_tn")=186
+	Set gtmtypes("sgmnt_data",187,"name")="sgmnt_data.spcfc_buffer_flush_loop_tn"
+	Set gtmtypes("sgmnt_data",187,"off")=2208
 	Set gtmtypes("sgmnt_data",187,"len")=8
 	Set gtmtypes("sgmnt_data",187,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","spcfc_buffer_flush_retries_tn")=187
-	Set gtmtypes("sgmnt_data",188,"name")="sgmnt_data.spcfc_buffer_flushed_during_lockwait_tn"
-	Set gtmtypes("sgmnt_data",188,"off")=2224
+	Set gtmtypfldindx("sgmnt_data","spcfc_buffer_flush_loop_tn")=187
+	Set gtmtypes("sgmnt_data",188,"name")="sgmnt_data.spcfc_buffer_flush_retries_tn"
+	Set gtmtypes("sgmnt_data",188,"off")=2216
 	Set gtmtypes("sgmnt_data",188,"len")=8
 	Set gtmtypes("sgmnt_data",188,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","spcfc_buffer_flushed_during_lockwait_tn")=188
-	Set gtmtypes("sgmnt_data",189,"name")="sgmnt_data.tp_crit_retries_tn"
-	Set gtmtypes("sgmnt_data",189,"off")=2232
+	Set gtmtypfldindx("sgmnt_data","spcfc_buffer_flush_retries_tn")=188
+	Set gtmtypes("sgmnt_data",189,"name")="sgmnt_data.spcfc_buffer_flushed_during_lockwait_tn"
+	Set gtmtypes("sgmnt_data",189,"off")=2224
 	Set gtmtypes("sgmnt_data",189,"len")=8
 	Set gtmtypes("sgmnt_data",189,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","tp_crit_retries_tn")=189
-	Set gtmtypes("sgmnt_data",190,"name")="sgmnt_data.db_csh_getn_flush_dirty_tn"
-	Set gtmtypes("sgmnt_data",190,"off")=2240
+	Set gtmtypfldindx("sgmnt_data","spcfc_buffer_flushed_during_lockwait_tn")=189
+	Set gtmtypes("sgmnt_data",190,"name")="sgmnt_data.tp_crit_retries_tn"
+	Set gtmtypes("sgmnt_data",190,"off")=2232
 	Set gtmtypes("sgmnt_data",190,"len")=8
 	Set gtmtypes("sgmnt_data",190,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","db_csh_getn_flush_dirty_tn")=190
-	Set gtmtypes("sgmnt_data",191,"name")="sgmnt_data.db_csh_getn_rip_wait_tn"
-	Set gtmtypes("sgmnt_data",191,"off")=2248
+	Set gtmtypfldindx("sgmnt_data","tp_crit_retries_tn")=190
+	Set gtmtypes("sgmnt_data",191,"name")="sgmnt_data.db_csh_getn_flush_dirty_tn"
+	Set gtmtypes("sgmnt_data",191,"off")=2240
 	Set gtmtypes("sgmnt_data",191,"len")=8
 	Set gtmtypes("sgmnt_data",191,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","db_csh_getn_rip_wait_tn")=191
-	Set gtmtypes("sgmnt_data",192,"name")="sgmnt_data.db_csh_getn_buf_owner_stuck_tn"
-	Set gtmtypes("sgmnt_data",192,"off")=2256
+	Set gtmtypfldindx("sgmnt_data","db_csh_getn_flush_dirty_tn")=191
+	Set gtmtypes("sgmnt_data",192,"name")="sgmnt_data.db_csh_getn_rip_wait_tn"
+	Set gtmtypes("sgmnt_data",192,"off")=2248
 	Set gtmtypes("sgmnt_data",192,"len")=8
 	Set gtmtypes("sgmnt_data",192,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","db_csh_getn_buf_owner_stuck_tn")=192
-	Set gtmtypes("sgmnt_data",193,"name")="sgmnt_data.db_csh_getn_out_of_design_tn"
-	Set gtmtypes("sgmnt_data",193,"off")=2264
+	Set gtmtypfldindx("sgmnt_data","db_csh_getn_rip_wait_tn")=192
+	Set gtmtypes("sgmnt_data",193,"name")="sgmnt_data.db_csh_getn_buf_owner_stuck_tn"
+	Set gtmtypes("sgmnt_data",193,"off")=2256
 	Set gtmtypes("sgmnt_data",193,"len")=8
 	Set gtmtypes("sgmnt_data",193,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","db_csh_getn_out_of_design_tn")=193
-	Set gtmtypes("sgmnt_data",194,"name")="sgmnt_data.t_qread_buf_owner_stuck_tn"
-	Set gtmtypes("sgmnt_data",194,"off")=2272
+	Set gtmtypfldindx("sgmnt_data","db_csh_getn_buf_owner_stuck_tn")=193
+	Set gtmtypes("sgmnt_data",194,"name")="sgmnt_data.db_csh_getn_out_of_design_tn"
+	Set gtmtypes("sgmnt_data",194,"off")=2264
 	Set gtmtypes("sgmnt_data",194,"len")=8
 	Set gtmtypes("sgmnt_data",194,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","t_qread_buf_owner_stuck_tn")=194
-	Set gtmtypes("sgmnt_data",195,"name")="sgmnt_data.t_qread_out_of_design_tn"
-	Set gtmtypes("sgmnt_data",195,"off")=2280
+	Set gtmtypfldindx("sgmnt_data","db_csh_getn_out_of_design_tn")=194
+	Set gtmtypes("sgmnt_data",195,"name")="sgmnt_data.t_qread_buf_owner_stuck_tn"
+	Set gtmtypes("sgmnt_data",195,"off")=2272
 	Set gtmtypes("sgmnt_data",195,"len")=8
 	Set gtmtypes("sgmnt_data",195,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","t_qread_out_of_design_tn")=195
-	Set gtmtypes("sgmnt_data",196,"name")="sgmnt_data.bt_put_flush_dirty_tn"
-	Set gtmtypes("sgmnt_data",196,"off")=2288
+	Set gtmtypfldindx("sgmnt_data","t_qread_buf_owner_stuck_tn")=195
+	Set gtmtypes("sgmnt_data",196,"name")="sgmnt_data.t_qread_out_of_design_tn"
+	Set gtmtypes("sgmnt_data",196,"off")=2280
 	Set gtmtypes("sgmnt_data",196,"len")=8
 	Set gtmtypes("sgmnt_data",196,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","bt_put_flush_dirty_tn")=196
-	Set gtmtypes("sgmnt_data",197,"name")="sgmnt_data.mlock_wakeups_tn"
-	Set gtmtypes("sgmnt_data",197,"off")=2296
+	Set gtmtypfldindx("sgmnt_data","t_qread_out_of_design_tn")=196
+	Set gtmtypes("sgmnt_data",197,"name")="sgmnt_data.bt_put_flush_dirty_tn"
+	Set gtmtypes("sgmnt_data",197,"off")=2288
 	Set gtmtypes("sgmnt_data",197,"len")=8
 	Set gtmtypes("sgmnt_data",197,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","mlock_wakeups_tn")=197
-	Set gtmtypes("sgmnt_data",198,"name")="sgmnt_data.wc_blocked_wcs_recover_invoked_tn"
-	Set gtmtypes("sgmnt_data",198,"off")=2304
+	Set gtmtypfldindx("sgmnt_data","bt_put_flush_dirty_tn")=197
+	Set gtmtypes("sgmnt_data",198,"name")="sgmnt_data.mlock_wakeups_tn"
+	Set gtmtypes("sgmnt_data",198,"off")=2296
 	Set gtmtypes("sgmnt_data",198,"len")=8
 	Set gtmtypes("sgmnt_data",198,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_recover_invoked_tn")=198
-	Set gtmtypes("sgmnt_data",199,"name")="sgmnt_data.wc_blocked_wcs_verify_passed_tn"
-	Set gtmtypes("sgmnt_data",199,"off")=2312
+	Set gtmtypfldindx("sgmnt_data","mlock_wakeups_tn")=198
+	Set gtmtypes("sgmnt_data",199,"name")="sgmnt_data.wc_blocked_wcs_recover_invoked_tn"
+	Set gtmtypes("sgmnt_data",199,"off")=2304
 	Set gtmtypes("sgmnt_data",199,"len")=8
 	Set gtmtypes("sgmnt_data",199,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_verify_passed_tn")=199
-	Set gtmtypes("sgmnt_data",200,"name")="sgmnt_data.wc_blocked_t_qread_db_csh_getn_invalid_blk_tn"
-	Set gtmtypes("sgmnt_data",200,"off")=2320
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_recover_invoked_tn")=199
+	Set gtmtypes("sgmnt_data",200,"name")="sgmnt_data.wc_blocked_wcs_verify_passed_tn"
+	Set gtmtypes("sgmnt_data",200,"off")=2312
 	Set gtmtypes("sgmnt_data",200,"len")=8
 	Set gtmtypes("sgmnt_data",200,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_db_csh_getn_invalid_blk_tn")=200
-	Set gtmtypes("sgmnt_data",201,"name")="sgmnt_data.wc_blocked_t_qread_db_csh_get_invalid_blk_tn"
-	Set gtmtypes("sgmnt_data",201,"off")=2328
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_verify_passed_tn")=200
+	Set gtmtypes("sgmnt_data",201,"name")="sgmnt_data.wc_blocked_t_qread_db_csh_getn_invalid_blk_tn"
+	Set gtmtypes("sgmnt_data",201,"off")=2320
 	Set gtmtypes("sgmnt_data",201,"len")=8
 	Set gtmtypes("sgmnt_data",201,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_db_csh_get_invalid_blk_tn")=201
-	Set gtmtypes("sgmnt_data",202,"name")="sgmnt_data.wc_blocked_db_csh_getn_loopexceed_tn"
-	Set gtmtypes("sgmnt_data",202,"off")=2336
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_db_csh_getn_invalid_blk_tn")=201
+	Set gtmtypes("sgmnt_data",202,"name")="sgmnt_data.wc_blocked_t_qread_db_csh_get_invalid_blk_tn"
+	Set gtmtypes("sgmnt_data",202,"off")=2328
 	Set gtmtypes("sgmnt_data",202,"len")=8
 	Set gtmtypes("sgmnt_data",202,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_db_csh_getn_loopexceed_tn")=202
-	Set gtmtypes("sgmnt_data",203,"name")="sgmnt_data.wc_blocked_db_csh_getn_wcsstarvewrt_tn"
-	Set gtmtypes("sgmnt_data",203,"off")=2344
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_db_csh_get_invalid_blk_tn")=202
+	Set gtmtypes("sgmnt_data",203,"name")="sgmnt_data.wc_blocked_db_csh_getn_loopexceed_tn"
+	Set gtmtypes("sgmnt_data",203,"off")=2336
 	Set gtmtypes("sgmnt_data",203,"len")=8
 	Set gtmtypes("sgmnt_data",203,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_db_csh_getn_wcsstarvewrt_tn")=203
-	Set gtmtypes("sgmnt_data",204,"name")="sgmnt_data.wc_blocked_db_csh_get_tn"
-	Set gtmtypes("sgmnt_data",204,"off")=2352
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_db_csh_getn_loopexceed_tn")=203
+	Set gtmtypes("sgmnt_data",204,"name")="sgmnt_data.wc_blocked_db_csh_getn_wcsstarvewrt_tn"
+	Set gtmtypes("sgmnt_data",204,"off")=2344
 	Set gtmtypes("sgmnt_data",204,"len")=8
 	Set gtmtypes("sgmnt_data",204,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_db_csh_get_tn")=204
-	Set gtmtypes("sgmnt_data",205,"name")="sgmnt_data.wc_blocked_tp_tend_wcsgetspace_tn"
-	Set gtmtypes("sgmnt_data",205,"off")=2360
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_db_csh_getn_wcsstarvewrt_tn")=204
+	Set gtmtypes("sgmnt_data",205,"name")="sgmnt_data.wc_blocked_db_csh_get_tn"
+	Set gtmtypes("sgmnt_data",205,"off")=2352
 	Set gtmtypes("sgmnt_data",205,"len")=8
 	Set gtmtypes("sgmnt_data",205,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_wcsgetspace_tn")=205
-	Set gtmtypes("sgmnt_data",206,"name")="sgmnt_data.wc_blocked_tp_tend_t1_tn"
-	Set gtmtypes("sgmnt_data",206,"off")=2368
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_db_csh_get_tn")=205
+	Set gtmtypes("sgmnt_data",206,"name")="sgmnt_data.wc_blocked_tp_tend_wcsgetspace_tn"
+	Set gtmtypes("sgmnt_data",206,"off")=2360
 	Set gtmtypes("sgmnt_data",206,"len")=8
 	Set gtmtypes("sgmnt_data",206,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_t1_tn")=206
-	Set gtmtypes("sgmnt_data",207,"name")="sgmnt_data.wc_blocked_tp_tend_bitmap_tn"
-	Set gtmtypes("sgmnt_data",207,"off")=2376
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_wcsgetspace_tn")=206
+	Set gtmtypes("sgmnt_data",207,"name")="sgmnt_data.wc_blocked_tp_tend_t1_tn"
+	Set gtmtypes("sgmnt_data",207,"off")=2368
 	Set gtmtypes("sgmnt_data",207,"len")=8
 	Set gtmtypes("sgmnt_data",207,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_bitmap_tn")=207
-	Set gtmtypes("sgmnt_data",208,"name")="sgmnt_data.wc_blocked_tp_tend_jnl_cwset_tn"
-	Set gtmtypes("sgmnt_data",208,"off")=2384
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_t1_tn")=207
+	Set gtmtypes("sgmnt_data",208,"name")="sgmnt_data.wc_blocked_tp_tend_bitmap_tn"
+	Set gtmtypes("sgmnt_data",208,"off")=2376
 	Set gtmtypes("sgmnt_data",208,"len")=8
 	Set gtmtypes("sgmnt_data",208,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_jnl_cwset_tn")=208
-	Set gtmtypes("sgmnt_data",209,"name")="sgmnt_data.wc_blocked_tp_tend_jnl_wcsflu_tn"
-	Set gtmtypes("sgmnt_data",209,"off")=2392
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_bitmap_tn")=208
+	Set gtmtypes("sgmnt_data",209,"name")="sgmnt_data.wc_blocked_tp_tend_jnl_cwset_tn"
+	Set gtmtypes("sgmnt_data",209,"off")=2384
 	Set gtmtypes("sgmnt_data",209,"len")=8
 	Set gtmtypes("sgmnt_data",209,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_jnl_wcsflu_tn")=209
-	Set gtmtypes("sgmnt_data",210,"name")="sgmnt_data.wc_blocked_t_end_hist_tn"
-	Set gtmtypes("sgmnt_data",210,"off")=2400
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_jnl_cwset_tn")=209
+	Set gtmtypes("sgmnt_data",210,"name")="sgmnt_data.wc_blocked_tp_tend_jnl_wcsflu_tn"
+	Set gtmtypes("sgmnt_data",210,"off")=2392
 	Set gtmtypes("sgmnt_data",210,"len")=8
 	Set gtmtypes("sgmnt_data",210,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_hist_tn")=210
-	Set gtmtypes("sgmnt_data",211,"name")="sgmnt_data.wc_blocked_t_end_hist1_nullbt_tn"
-	Set gtmtypes("sgmnt_data",211,"off")=2408
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_jnl_wcsflu_tn")=210
+	Set gtmtypes("sgmnt_data",211,"name")="sgmnt_data.wc_blocked_t_end_hist_tn"
+	Set gtmtypes("sgmnt_data",211,"off")=2400
 	Set gtmtypes("sgmnt_data",211,"len")=8
 	Set gtmtypes("sgmnt_data",211,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_hist1_nullbt_tn")=211
-	Set gtmtypes("sgmnt_data",212,"name")="sgmnt_data.wc_blocked_t_end_hist1_nonnullbt_tn"
-	Set gtmtypes("sgmnt_data",212,"off")=2416
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_hist_tn")=211
+	Set gtmtypes("sgmnt_data",212,"name")="sgmnt_data.wc_blocked_t_end_hist1_nullbt_tn"
+	Set gtmtypes("sgmnt_data",212,"off")=2408
 	Set gtmtypes("sgmnt_data",212,"len")=8
 	Set gtmtypes("sgmnt_data",212,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_hist1_nonnullbt_tn")=212
-	Set gtmtypes("sgmnt_data",213,"name")="sgmnt_data.wc_blocked_t_end_bitmap_nullbt_tn"
-	Set gtmtypes("sgmnt_data",213,"off")=2424
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_hist1_nullbt_tn")=212
+	Set gtmtypes("sgmnt_data",213,"name")="sgmnt_data.wc_blocked_t_end_hist1_nonnullbt_tn"
+	Set gtmtypes("sgmnt_data",213,"off")=2416
 	Set gtmtypes("sgmnt_data",213,"len")=8
 	Set gtmtypes("sgmnt_data",213,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_bitmap_nullbt_tn")=213
-	Set gtmtypes("sgmnt_data",214,"name")="sgmnt_data.wc_blocked_t_end_bitmap_nonnullbt_tn"
-	Set gtmtypes("sgmnt_data",214,"off")=2432
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_hist1_nonnullbt_tn")=213
+	Set gtmtypes("sgmnt_data",214,"name")="sgmnt_data.wc_blocked_t_end_bitmap_nullbt_tn"
+	Set gtmtypes("sgmnt_data",214,"off")=2424
 	Set gtmtypes("sgmnt_data",214,"len")=8
 	Set gtmtypes("sgmnt_data",214,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_bitmap_nonnullbt_tn")=214
-	Set gtmtypes("sgmnt_data",215,"name")="sgmnt_data.wc_blocked_t_end_jnl_cwset_tn"
-	Set gtmtypes("sgmnt_data",215,"off")=2440
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_bitmap_nullbt_tn")=214
+	Set gtmtypes("sgmnt_data",215,"name")="sgmnt_data.wc_blocked_t_end_bitmap_nonnullbt_tn"
+	Set gtmtypes("sgmnt_data",215,"off")=2432
 	Set gtmtypes("sgmnt_data",215,"len")=8
 	Set gtmtypes("sgmnt_data",215,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_jnl_cwset_tn")=215
-	Set gtmtypes("sgmnt_data",216,"name")="sgmnt_data.wc_blocked_t_end_jnl_wcsflu_tn"
-	Set gtmtypes("sgmnt_data",216,"off")=2448
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_bitmap_nonnullbt_tn")=215
+	Set gtmtypes("sgmnt_data",216,"name")="sgmnt_data.wc_blocked_t_end_jnl_cwset_tn"
+	Set gtmtypes("sgmnt_data",216,"off")=2440
 	Set gtmtypes("sgmnt_data",216,"len")=8
 	Set gtmtypes("sgmnt_data",216,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_jnl_wcsflu_tn")=216
-	Set gtmtypes("sgmnt_data",217,"name")="sgmnt_data.db_csh_get_too_many_loops_tn"
-	Set gtmtypes("sgmnt_data",217,"off")=2456
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_jnl_cwset_tn")=216
+	Set gtmtypes("sgmnt_data",217,"name")="sgmnt_data.wc_blocked_t_end_jnl_wcsflu_tn"
+	Set gtmtypes("sgmnt_data",217,"off")=2448
 	Set gtmtypes("sgmnt_data",217,"len")=8
 	Set gtmtypes("sgmnt_data",217,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","db_csh_get_too_many_loops_tn")=217
-	Set gtmtypes("sgmnt_data",218,"name")="sgmnt_data.wc_blocked_tpckh_hist1_nullbt_tn"
-	Set gtmtypes("sgmnt_data",218,"off")=2464
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_jnl_wcsflu_tn")=217
+	Set gtmtypes("sgmnt_data",218,"name")="sgmnt_data.db_csh_get_too_many_loops_tn"
+	Set gtmtypes("sgmnt_data",218,"off")=2456
 	Set gtmtypes("sgmnt_data",218,"len")=8
 	Set gtmtypes("sgmnt_data",218,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tpckh_hist1_nullbt_tn")=218
-	Set gtmtypes("sgmnt_data",219,"name")="sgmnt_data.wc_blocked_tpckh_hist1_nonnullbt_tn"
-	Set gtmtypes("sgmnt_data",219,"off")=2472
+	Set gtmtypfldindx("sgmnt_data","db_csh_get_too_many_loops_tn")=218
+	Set gtmtypes("sgmnt_data",219,"name")="sgmnt_data.wc_blocked_tpckh_hist1_nullbt_tn"
+	Set gtmtypes("sgmnt_data",219,"off")=2464
 	Set gtmtypes("sgmnt_data",219,"len")=8
 	Set gtmtypes("sgmnt_data",219,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tpckh_hist1_nonnullbt_tn")=219
-	Set gtmtypes("sgmnt_data",220,"name")="sgmnt_data.jnl_blocked_writer_lost_tn"
-	Set gtmtypes("sgmnt_data",220,"off")=2480
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tpckh_hist1_nullbt_tn")=219
+	Set gtmtypes("sgmnt_data",220,"name")="sgmnt_data.wc_blocked_tpckh_hist1_nonnullbt_tn"
+	Set gtmtypes("sgmnt_data",220,"off")=2472
 	Set gtmtypes("sgmnt_data",220,"len")=8
 	Set gtmtypes("sgmnt_data",220,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","jnl_blocked_writer_lost_tn")=220
-	Set gtmtypes("sgmnt_data",221,"name")="sgmnt_data.jnl_blocked_writer_stuck_tn"
-	Set gtmtypes("sgmnt_data",221,"off")=2488
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tpckh_hist1_nonnullbt_tn")=220
+	Set gtmtypes("sgmnt_data",221,"name")="sgmnt_data.jnl_blocked_writer_lost_tn"
+	Set gtmtypes("sgmnt_data",221,"off")=2480
 	Set gtmtypes("sgmnt_data",221,"len")=8
 	Set gtmtypes("sgmnt_data",221,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","jnl_blocked_writer_stuck_tn")=221
-	Set gtmtypes("sgmnt_data",222,"name")="sgmnt_data.jnl_blocked_writer_blocked_tn"
-	Set gtmtypes("sgmnt_data",222,"off")=2496
+	Set gtmtypfldindx("sgmnt_data","jnl_blocked_writer_lost_tn")=221
+	Set gtmtypes("sgmnt_data",222,"name")="sgmnt_data.jnl_blocked_writer_stuck_tn"
+	Set gtmtypes("sgmnt_data",222,"off")=2488
 	Set gtmtypes("sgmnt_data",222,"len")=8
 	Set gtmtypes("sgmnt_data",222,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","jnl_blocked_writer_blocked_tn")=222
-	Set gtmtypes("sgmnt_data",223,"name")="sgmnt_data.n_jnl_fsyncs_tn"
-	Set gtmtypes("sgmnt_data",223,"off")=2504
+	Set gtmtypfldindx("sgmnt_data","jnl_blocked_writer_stuck_tn")=222
+	Set gtmtypes("sgmnt_data",223,"name")="sgmnt_data.jnl_blocked_writer_blocked_tn"
+	Set gtmtypes("sgmnt_data",223,"off")=2496
 	Set gtmtypes("sgmnt_data",223,"len")=8
 	Set gtmtypes("sgmnt_data",223,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","n_jnl_fsyncs_tn")=223
-	Set gtmtypes("sgmnt_data",224,"name")="sgmnt_data.n_jnl_fsync_tries_tn"
-	Set gtmtypes("sgmnt_data",224,"off")=2512
+	Set gtmtypfldindx("sgmnt_data","jnl_blocked_writer_blocked_tn")=223
+	Set gtmtypes("sgmnt_data",224,"name")="sgmnt_data.n_jnl_fsyncs_tn"
+	Set gtmtypes("sgmnt_data",224,"off")=2504
 	Set gtmtypes("sgmnt_data",224,"len")=8
 	Set gtmtypes("sgmnt_data",224,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","n_jnl_fsync_tries_tn")=224
-	Set gtmtypes("sgmnt_data",225,"name")="sgmnt_data.n_jnl_fsync_recovers_tn"
-	Set gtmtypes("sgmnt_data",225,"off")=2520
+	Set gtmtypfldindx("sgmnt_data","n_jnl_fsyncs_tn")=224
+	Set gtmtypes("sgmnt_data",225,"name")="sgmnt_data.n_jnl_fsync_tries_tn"
+	Set gtmtypes("sgmnt_data",225,"off")=2512
 	Set gtmtypes("sgmnt_data",225,"len")=8
 	Set gtmtypes("sgmnt_data",225,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","n_jnl_fsync_recovers_tn")=225
-	Set gtmtypes("sgmnt_data",226,"name")="sgmnt_data.n_db_fsyncs_tn"
-	Set gtmtypes("sgmnt_data",226,"off")=2528
+	Set gtmtypfldindx("sgmnt_data","n_jnl_fsync_tries_tn")=225
+	Set gtmtypes("sgmnt_data",226,"name")="sgmnt_data.n_jnl_fsync_recovers_tn"
+	Set gtmtypes("sgmnt_data",226,"off")=2520
 	Set gtmtypes("sgmnt_data",226,"len")=8
 	Set gtmtypes("sgmnt_data",226,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","n_db_fsyncs_tn")=226
-	Set gtmtypes("sgmnt_data",227,"name")="sgmnt_data.n_db_fsyncs_in_crit_tn"
-	Set gtmtypes("sgmnt_data",227,"off")=2536
+	Set gtmtypfldindx("sgmnt_data","n_jnl_fsync_recovers_tn")=226
+	Set gtmtypes("sgmnt_data",227,"name")="sgmnt_data.n_db_fsyncs_tn"
+	Set gtmtypes("sgmnt_data",227,"off")=2528
 	Set gtmtypes("sgmnt_data",227,"len")=8
 	Set gtmtypes("sgmnt_data",227,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","n_db_fsyncs_in_crit_tn")=227
-	Set gtmtypes("sgmnt_data",228,"name")="sgmnt_data.n_dbsync_timers_tn"
-	Set gtmtypes("sgmnt_data",228,"off")=2544
+	Set gtmtypfldindx("sgmnt_data","n_db_fsyncs_tn")=227
+	Set gtmtypes("sgmnt_data",228,"name")="sgmnt_data.n_db_fsyncs_in_crit_tn"
+	Set gtmtypes("sgmnt_data",228,"off")=2536
 	Set gtmtypes("sgmnt_data",228,"len")=8
 	Set gtmtypes("sgmnt_data",228,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","n_dbsync_timers_tn")=228
-	Set gtmtypes("sgmnt_data",229,"name")="sgmnt_data.n_dbsync_writes_tn"
-	Set gtmtypes("sgmnt_data",229,"off")=2552
+	Set gtmtypfldindx("sgmnt_data","n_db_fsyncs_in_crit_tn")=228
+	Set gtmtypes("sgmnt_data",229,"name")="sgmnt_data.n_dbsync_timers_tn"
+	Set gtmtypes("sgmnt_data",229,"off")=2544
 	Set gtmtypes("sgmnt_data",229,"len")=8
 	Set gtmtypes("sgmnt_data",229,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","n_dbsync_writes_tn")=229
-	Set gtmtypes("sgmnt_data",230,"name")="sgmnt_data.mutex_queue_full_tn"
-	Set gtmtypes("sgmnt_data",230,"off")=2560
+	Set gtmtypfldindx("sgmnt_data","n_dbsync_timers_tn")=229
+	Set gtmtypes("sgmnt_data",230,"name")="sgmnt_data.n_dbsync_writes_tn"
+	Set gtmtypes("sgmnt_data",230,"off")=2552
 	Set gtmtypes("sgmnt_data",230,"len")=8
 	Set gtmtypes("sgmnt_data",230,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","mutex_queue_full_tn")=230
-	Set gtmtypes("sgmnt_data",231,"name")="sgmnt_data.wcb_bt_put_tn"
-	Set gtmtypes("sgmnt_data",231,"off")=2568
+	Set gtmtypfldindx("sgmnt_data","n_dbsync_writes_tn")=230
+	Set gtmtypes("sgmnt_data",231,"name")="sgmnt_data.mutex_queue_full_tn"
+	Set gtmtypes("sgmnt_data",231,"off")=2560
 	Set gtmtypes("sgmnt_data",231,"len")=8
 	Set gtmtypes("sgmnt_data",231,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_bt_put_tn")=231
-	Set gtmtypes("sgmnt_data",232,"name")="sgmnt_data.wcb_mutex_salvage_tn"
-	Set gtmtypes("sgmnt_data",232,"off")=2576
+	Set gtmtypfldindx("sgmnt_data","mutex_queue_full_tn")=231
+	Set gtmtypes("sgmnt_data",232,"name")="sgmnt_data.wcb_bt_put_tn"
+	Set gtmtypes("sgmnt_data",232,"off")=2568
 	Set gtmtypes("sgmnt_data",232,"len")=8
 	Set gtmtypes("sgmnt_data",232,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_mutex_salvage_tn")=232
-	Set gtmtypes("sgmnt_data",233,"name")="sgmnt_data.wcb_tp_grab_crit_tn"
-	Set gtmtypes("sgmnt_data",233,"off")=2584
+	Set gtmtypfldindx("sgmnt_data","wcb_bt_put_tn")=232
+	Set gtmtypes("sgmnt_data",233,"name")="sgmnt_data.wcb_mutex_salvage_tn"
+	Set gtmtypes("sgmnt_data",233,"off")=2576
 	Set gtmtypes("sgmnt_data",233,"len")=8
 	Set gtmtypes("sgmnt_data",233,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_tp_grab_crit_tn")=233
-	Set gtmtypes("sgmnt_data",234,"name")="sgmnt_data.wcb_t_end_sysops_nocr_invcr_tn"
-	Set gtmtypes("sgmnt_data",234,"off")=2592
+	Set gtmtypfldindx("sgmnt_data","wcb_mutex_salvage_tn")=233
+	Set gtmtypes("sgmnt_data",234,"name")="sgmnt_data.wcb_tp_grab_crit_tn"
+	Set gtmtypes("sgmnt_data",234,"off")=2584
 	Set gtmtypes("sgmnt_data",234,"len")=8
 	Set gtmtypes("sgmnt_data",234,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_nocr_invcr_tn")=234
-	Set gtmtypes("sgmnt_data",235,"name")="sgmnt_data.wcb_t_end_sysops_cr_invcr_tn"
-	Set gtmtypes("sgmnt_data",235,"off")=2600
+	Set gtmtypfldindx("sgmnt_data","wcb_tp_grab_crit_tn")=234
+	Set gtmtypes("sgmnt_data",235,"name")="sgmnt_data.wcb_t_end_sysops_nocr_invcr_tn"
+	Set gtmtypes("sgmnt_data",235,"off")=2592
 	Set gtmtypes("sgmnt_data",235,"len")=8
 	Set gtmtypes("sgmnt_data",235,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_cr_invcr_tn")=235
-	Set gtmtypes("sgmnt_data",236,"name")="sgmnt_data.wcb_t_end_sysops_rip_wait_tn"
-	Set gtmtypes("sgmnt_data",236,"off")=2608
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_nocr_invcr_tn")=235
+	Set gtmtypes("sgmnt_data",236,"name")="sgmnt_data.wcb_t_end_sysops_cr_invcr_tn"
+	Set gtmtypes("sgmnt_data",236,"off")=2600
 	Set gtmtypes("sgmnt_data",236,"len")=8
 	Set gtmtypes("sgmnt_data",236,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_rip_wait_tn")=236
-	Set gtmtypes("sgmnt_data",237,"name")="sgmnt_data.wcb_t_end_sysops_dirtyripwait_tn"
-	Set gtmtypes("sgmnt_data",237,"off")=2616
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_cr_invcr_tn")=236
+	Set gtmtypes("sgmnt_data",237,"name")="sgmnt_data.wcb_t_end_sysops_rip_wait_tn"
+	Set gtmtypes("sgmnt_data",237,"off")=2608
 	Set gtmtypes("sgmnt_data",237,"len")=8
 	Set gtmtypes("sgmnt_data",237,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirtyripwait_tn")=237
-	Set gtmtypes("sgmnt_data",238,"name")="sgmnt_data.wcb_gds_rundown_tn"
-	Set gtmtypes("sgmnt_data",238,"off")=2624
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_rip_wait_tn")=237
+	Set gtmtypes("sgmnt_data",238,"name")="sgmnt_data.wcb_t_end_sysops_dirtyripwait_tn"
+	Set gtmtypes("sgmnt_data",238,"off")=2616
 	Set gtmtypes("sgmnt_data",238,"len")=8
 	Set gtmtypes("sgmnt_data",238,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_gds_rundown_tn")=238
-	Set gtmtypes("sgmnt_data",239,"name")="sgmnt_data.wcb_wcs_flu1_tn"
-	Set gtmtypes("sgmnt_data",239,"off")=2632
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirtyripwait_tn")=238
+	Set gtmtypes("sgmnt_data",239,"name")="sgmnt_data.wcb_gds_rundown_tn"
+	Set gtmtypes("sgmnt_data",239,"off")=2624
 	Set gtmtypes("sgmnt_data",239,"len")=8
 	Set gtmtypes("sgmnt_data",239,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_wcs_flu1_tn")=239
-	Set gtmtypes("sgmnt_data",240,"name")="sgmnt_data.wcb_mu_back_tn"
-	Set gtmtypes("sgmnt_data",240,"off")=2640
+	Set gtmtypfldindx("sgmnt_data","wcb_gds_rundown_tn")=239
+	Set gtmtypes("sgmnt_data",240,"name")="sgmnt_data.wcb_wcs_flu1_tn"
+	Set gtmtypes("sgmnt_data",240,"off")=2632
 	Set gtmtypes("sgmnt_data",240,"len")=8
 	Set gtmtypes("sgmnt_data",240,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_mu_back_tn")=240
-	Set gtmtypes("sgmnt_data",241,"name")="sgmnt_data.wcb_t_end_sysops_dirty_invcr_tn"
-	Set gtmtypes("sgmnt_data",241,"off")=2648
+	Set gtmtypfldindx("sgmnt_data","wcb_wcs_flu1_tn")=240
+	Set gtmtypes("sgmnt_data",241,"name")="sgmnt_data.wcb_mu_back_tn"
+	Set gtmtypes("sgmnt_data",241,"off")=2640
 	Set gtmtypes("sgmnt_data",241,"len")=8
 	Set gtmtypes("sgmnt_data",241,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirty_invcr_tn")=241
-	Set gtmtypes("sgmnt_data",242,"name")="sgmnt_data.wcb_t_end_sysops_wtfini_fail_tn"
-	Set gtmtypes("sgmnt_data",242,"off")=2656
+	Set gtmtypfldindx("sgmnt_data","wcb_mu_back_tn")=241
+	Set gtmtypes("sgmnt_data",242,"name")="sgmnt_data.wcb_t_end_sysops_dirty_invcr_tn"
+	Set gtmtypes("sgmnt_data",242,"off")=2648
 	Set gtmtypes("sgmnt_data",242,"len")=8
 	Set gtmtypes("sgmnt_data",242,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_wtfini_fail_tn")=242
-	Set gtmtypes("sgmnt_data",243,"name")="sgmnt_data.wcb_t_end_sysops_twin_stuck_tn"
-	Set gtmtypes("sgmnt_data",243,"off")=2664
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirty_invcr_tn")=242
+	Set gtmtypes("sgmnt_data",243,"name")="sgmnt_data.wcb_t_end_sysops_wtfini_fail_tn"
+	Set gtmtypes("sgmnt_data",243,"off")=2656
 	Set gtmtypes("sgmnt_data",243,"len")=8
 	Set gtmtypes("sgmnt_data",243,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_twin_stuck_tn")=243
-	Set gtmtypes("sgmnt_data",244,"name")="sgmnt_data.db_csh_getn_wrt_latch_stuck_tn"
-	Set gtmtypes("sgmnt_data",244,"off")=2672
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_wtfini_fail_tn")=243
+	Set gtmtypes("sgmnt_data",244,"name")="sgmnt_data.wcb_t_end_sysops_twin_stuck_tn"
+	Set gtmtypes("sgmnt_data",244,"off")=2664
 	Set gtmtypes("sgmnt_data",244,"len")=8
 	Set gtmtypes("sgmnt_data",244,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","db_csh_getn_wrt_latch_stuck_tn")=244
-	Set gtmtypes("sgmnt_data",245,"name")="sgmnt_data.wcb_secshr_db_clnup_now_crit_tn"
-	Set gtmtypes("sgmnt_data",245,"off")=2680
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_twin_stuck_tn")=244
+	Set gtmtypes("sgmnt_data",245,"name")="sgmnt_data.db_csh_getn_wrt_latch_stuck_tn"
+	Set gtmtypes("sgmnt_data",245,"off")=2672
 	Set gtmtypes("sgmnt_data",245,"len")=8
 	Set gtmtypes("sgmnt_data",245,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_secshr_db_clnup_now_crit_tn")=245
-	Set gtmtypes("sgmnt_data",246,"name")="sgmnt_data.wc_blocked_t_qread_bad_bt_index1_tn"
-	Set gtmtypes("sgmnt_data",246,"off")=2688
+	Set gtmtypfldindx("sgmnt_data","db_csh_getn_wrt_latch_stuck_tn")=245
+	Set gtmtypes("sgmnt_data",246,"name")="sgmnt_data.wcb_secshr_db_clnup_now_crit_tn"
+	Set gtmtypes("sgmnt_data",246,"off")=2680
 	Set gtmtypes("sgmnt_data",246,"len")=8
 	Set gtmtypes("sgmnt_data",246,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_bad_bt_index1_tn")=246
-	Set gtmtypes("sgmnt_data",247,"name")="sgmnt_data.wc_blocked_t_qread_bad_bt_index2_tn"
-	Set gtmtypes("sgmnt_data",247,"off")=2696
+	Set gtmtypfldindx("sgmnt_data","wcb_secshr_db_clnup_now_crit_tn")=246
+	Set gtmtypes("sgmnt_data",247,"name")="sgmnt_data.wc_blocked_t_qread_bad_bt_index1_tn"
+	Set gtmtypes("sgmnt_data",247,"off")=2688
 	Set gtmtypes("sgmnt_data",247,"len")=8
 	Set gtmtypes("sgmnt_data",247,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_bad_bt_index2_tn")=247
-	Set gtmtypes("sgmnt_data",248,"name")="sgmnt_data.wc_blocked_t_end_crbtmismatch1_tn"
-	Set gtmtypes("sgmnt_data",248,"off")=2704
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_bad_bt_index1_tn")=247
+	Set gtmtypes("sgmnt_data",248,"name")="sgmnt_data.wc_blocked_t_qread_bad_bt_index2_tn"
+	Set gtmtypes("sgmnt_data",248,"off")=2696
 	Set gtmtypes("sgmnt_data",248,"len")=8
 	Set gtmtypes("sgmnt_data",248,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_crbtmismatch1_tn")=248
-	Set gtmtypes("sgmnt_data",249,"name")="sgmnt_data.wc_blocked_t_end_crbtmismatch2_tn"
-	Set gtmtypes("sgmnt_data",249,"off")=2712
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_bad_bt_index2_tn")=248
+	Set gtmtypes("sgmnt_data",249,"name")="sgmnt_data.wc_blocked_t_end_crbtmismatch1_tn"
+	Set gtmtypes("sgmnt_data",249,"off")=2704
 	Set gtmtypes("sgmnt_data",249,"len")=8
 	Set gtmtypes("sgmnt_data",249,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_crbtmismatch2_tn")=249
-	Set gtmtypes("sgmnt_data",250,"name")="sgmnt_data.wc_blocked_t_end_crbtmismatch3_tn"
-	Set gtmtypes("sgmnt_data",250,"off")=2720
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_crbtmismatch1_tn")=249
+	Set gtmtypes("sgmnt_data",250,"name")="sgmnt_data.wc_blocked_t_end_crbtmismatch2_tn"
+	Set gtmtypes("sgmnt_data",250,"off")=2712
 	Set gtmtypes("sgmnt_data",250,"len")=8
 	Set gtmtypes("sgmnt_data",250,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_crbtmismatch3_tn")=250
-	Set gtmtypes("sgmnt_data",251,"name")="sgmnt_data.wc_blocked_tp_tend_crbtmismatch1_tn"
-	Set gtmtypes("sgmnt_data",251,"off")=2728
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_crbtmismatch2_tn")=250
+	Set gtmtypes("sgmnt_data",251,"name")="sgmnt_data.wc_blocked_t_end_crbtmismatch3_tn"
+	Set gtmtypes("sgmnt_data",251,"off")=2720
 	Set gtmtypes("sgmnt_data",251,"len")=8
 	Set gtmtypes("sgmnt_data",251,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_crbtmismatch1_tn")=251
-	Set gtmtypes("sgmnt_data",252,"name")="sgmnt_data.wc_blocked_tp_tend_crbtmismatch2_tn"
-	Set gtmtypes("sgmnt_data",252,"off")=2736
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_crbtmismatch3_tn")=251
+	Set gtmtypes("sgmnt_data",252,"name")="sgmnt_data.wc_blocked_tp_tend_crbtmismatch1_tn"
+	Set gtmtypes("sgmnt_data",252,"off")=2728
 	Set gtmtypes("sgmnt_data",252,"len")=8
 	Set gtmtypes("sgmnt_data",252,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_crbtmismatch2_tn")=252
-	Set gtmtypes("sgmnt_data",253,"name")="sgmnt_data.wc_blocked_tp_tend_crbtmismatch3_tn"
-	Set gtmtypes("sgmnt_data",253,"off")=2744
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_crbtmismatch1_tn")=252
+	Set gtmtypes("sgmnt_data",253,"name")="sgmnt_data.wc_blocked_tp_tend_crbtmismatch2_tn"
+	Set gtmtypes("sgmnt_data",253,"off")=2736
 	Set gtmtypes("sgmnt_data",253,"len")=8
 	Set gtmtypes("sgmnt_data",253,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_crbtmismatch3_tn")=253
-	Set gtmtypes("sgmnt_data",254,"name")="sgmnt_data.wc_blocked_wcs_wtstart_bad_cr_tn"
-	Set gtmtypes("sgmnt_data",254,"off")=2752
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_crbtmismatch2_tn")=253
+	Set gtmtypes("sgmnt_data",254,"name")="sgmnt_data.wc_blocked_tp_tend_crbtmismatch3_tn"
+	Set gtmtypes("sgmnt_data",254,"off")=2744
 	Set gtmtypes("sgmnt_data",254,"len")=8
 	Set gtmtypes("sgmnt_data",254,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_wtstart_bad_cr_tn")=254
-	Set gtmtypes("sgmnt_data",255,"name")="sgmnt_data.wc_blocked_wcs_wtfini_bad_cr_tn"
-	Set gtmtypes("sgmnt_data",255,"off")=2760
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_crbtmismatch3_tn")=254
+	Set gtmtypes("sgmnt_data",255,"name")="sgmnt_data.wc_blocked_wcs_wtstart_bad_cr_tn"
+	Set gtmtypes("sgmnt_data",255,"off")=2752
 	Set gtmtypes("sgmnt_data",255,"len")=8
 	Set gtmtypes("sgmnt_data",255,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_wtfini_bad_cr_tn")=255
-	Set gtmtypes("sgmnt_data",256,"name")="sgmnt_data.wc_blocked_bt_get_tn"
-	Set gtmtypes("sgmnt_data",256,"off")=2768
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_wtstart_bad_cr_tn")=255
+	Set gtmtypes("sgmnt_data",256,"name")="sgmnt_data.wc_blocked_wcs_wtfini_bad_cr_tn"
+	Set gtmtypes("sgmnt_data",256,"off")=2760
 	Set gtmtypes("sgmnt_data",256,"len")=8
 	Set gtmtypes("sgmnt_data",256,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_bt_get_tn")=256
-	Set gtmtypes("sgmnt_data",257,"name")="sgmnt_data.wc_blocked_wcs_cdb_sc_final_retry_tn"
-	Set gtmtypes("sgmnt_data",257,"off")=2776
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_wtfini_bad_cr_tn")=256
+	Set gtmtypes("sgmnt_data",257,"name")="sgmnt_data.wc_blocked_bt_get_tn"
+	Set gtmtypes("sgmnt_data",257,"off")=2768
 	Set gtmtypes("sgmnt_data",257,"len")=8
 	Set gtmtypes("sgmnt_data",257,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_cdb_sc_final_retry_tn")=257
-	Set gtmtypes("sgmnt_data",258,"name")="sgmnt_data.wcb_bg_update_lckfail1_tn"
-	Set gtmtypes("sgmnt_data",258,"off")=2784
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_bt_get_tn")=257
+	Set gtmtypes("sgmnt_data",258,"name")="sgmnt_data.wc_blocked_wcs_cdb_sc_final_retry_tn"
+	Set gtmtypes("sgmnt_data",258,"off")=2776
 	Set gtmtypes("sgmnt_data",258,"len")=8
 	Set gtmtypes("sgmnt_data",258,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_bg_update_lckfail1_tn")=258
-	Set gtmtypes("sgmnt_data",259,"name")="sgmnt_data.wcb_bg_update_lckfail2_tn"
-	Set gtmtypes("sgmnt_data",259,"off")=2792
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_cdb_sc_final_retry_tn")=258
+	Set gtmtypes("sgmnt_data",259,"name")="sgmnt_data.wcb_bg_update_lckfail1_tn"
+	Set gtmtypes("sgmnt_data",259,"off")=2784
 	Set gtmtypes("sgmnt_data",259,"len")=8
 	Set gtmtypes("sgmnt_data",259,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_bg_update_lckfail2_tn")=259
-	Set gtmtypes("sgmnt_data",260,"name")="sgmnt_data.wcb_wtstart_lckfail1_tn"
-	Set gtmtypes("sgmnt_data",260,"off")=2800
+	Set gtmtypfldindx("sgmnt_data","wcb_bg_update_lckfail1_tn")=259
+	Set gtmtypes("sgmnt_data",260,"name")="sgmnt_data.wcb_bg_update_lckfail2_tn"
+	Set gtmtypes("sgmnt_data",260,"off")=2792
 	Set gtmtypes("sgmnt_data",260,"len")=8
 	Set gtmtypes("sgmnt_data",260,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail1_tn")=260
-	Set gtmtypes("sgmnt_data",261,"name")="sgmnt_data.wcb_wtstart_lckfail2_tn"
-	Set gtmtypes("sgmnt_data",261,"off")=2808
+	Set gtmtypfldindx("sgmnt_data","wcb_bg_update_lckfail2_tn")=260
+	Set gtmtypes("sgmnt_data",261,"name")="sgmnt_data.wcb_wtstart_lckfail1_tn"
+	Set gtmtypes("sgmnt_data",261,"off")=2800
 	Set gtmtypes("sgmnt_data",261,"len")=8
 	Set gtmtypes("sgmnt_data",261,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail2_tn")=261
-	Set gtmtypes("sgmnt_data",262,"name")="sgmnt_data.wcb_wtstart_lckfail3_tn"
-	Set gtmtypes("sgmnt_data",262,"off")=2816
+	Set gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail1_tn")=261
+	Set gtmtypes("sgmnt_data",262,"name")="sgmnt_data.wcb_wtstart_lckfail2_tn"
+	Set gtmtypes("sgmnt_data",262,"off")=2808
 	Set gtmtypes("sgmnt_data",262,"len")=8
 	Set gtmtypes("sgmnt_data",262,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail3_tn")=262
-	Set gtmtypes("sgmnt_data",263,"name")="sgmnt_data.wcb_wtstart_lckfail4_tn"
-	Set gtmtypes("sgmnt_data",263,"off")=2824
+	Set gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail2_tn")=262
+	Set gtmtypes("sgmnt_data",263,"name")="sgmnt_data.wcb_wtstart_lckfail3_tn"
+	Set gtmtypes("sgmnt_data",263,"off")=2816
 	Set gtmtypes("sgmnt_data",263,"len")=8
 	Set gtmtypes("sgmnt_data",263,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail4_tn")=263
-	Set gtmtypes("sgmnt_data",264,"name")="sgmnt_data.wcb_wtfini_lckfail1_tn"
-	Set gtmtypes("sgmnt_data",264,"off")=2832
+	Set gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail3_tn")=263
+	Set gtmtypes("sgmnt_data",264,"name")="sgmnt_data.wcb_wtstart_lckfail4_tn"
+	Set gtmtypes("sgmnt_data",264,"off")=2824
 	Set gtmtypes("sgmnt_data",264,"len")=8
 	Set gtmtypes("sgmnt_data",264,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail1_tn")=264
-	Set gtmtypes("sgmnt_data",265,"name")="sgmnt_data.wcb_wtfini_lckfail2_tn"
-	Set gtmtypes("sgmnt_data",265,"off")=2840
+	Set gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail4_tn")=264
+	Set gtmtypes("sgmnt_data",265,"name")="sgmnt_data.wcb_wtfini_lckfail1_tn"
+	Set gtmtypes("sgmnt_data",265,"off")=2832
 	Set gtmtypes("sgmnt_data",265,"len")=8
 	Set gtmtypes("sgmnt_data",265,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail2_tn")=265
-	Set gtmtypes("sgmnt_data",266,"name")="sgmnt_data.wcb_wtfini_lckfail3_tn"
-	Set gtmtypes("sgmnt_data",266,"off")=2848
+	Set gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail1_tn")=265
+	Set gtmtypes("sgmnt_data",266,"name")="sgmnt_data.wcb_wtfini_lckfail2_tn"
+	Set gtmtypes("sgmnt_data",266,"off")=2840
 	Set gtmtypes("sgmnt_data",266,"len")=8
 	Set gtmtypes("sgmnt_data",266,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail3_tn")=266
-	Set gtmtypes("sgmnt_data",267,"name")="sgmnt_data.wcb_wtfini_lckfail4_tn"
-	Set gtmtypes("sgmnt_data",267,"off")=2856
+	Set gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail2_tn")=266
+	Set gtmtypes("sgmnt_data",267,"name")="sgmnt_data.wcb_wtfini_lckfail3_tn"
+	Set gtmtypes("sgmnt_data",267,"off")=2848
 	Set gtmtypes("sgmnt_data",267,"len")=8
 	Set gtmtypes("sgmnt_data",267,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail4_tn")=267
-	Set gtmtypes("sgmnt_data",268,"name")="sgmnt_data.wcb_t_end_sysops_dirtystuck1_tn"
-	Set gtmtypes("sgmnt_data",268,"off")=2864
+	Set gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail3_tn")=267
+	Set gtmtypes("sgmnt_data",268,"name")="sgmnt_data.wcb_wtfini_lckfail4_tn"
+	Set gtmtypes("sgmnt_data",268,"off")=2856
 	Set gtmtypes("sgmnt_data",268,"len")=8
 	Set gtmtypes("sgmnt_data",268,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirtystuck1_tn")=268
-	Set gtmtypes("sgmnt_data",269,"name")="sgmnt_data.wcb_t_end_sysops_dirtystuck2_tn"
-	Set gtmtypes("sgmnt_data",269,"off")=2872
+	Set gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail4_tn")=268
+	Set gtmtypes("sgmnt_data",269,"name")="sgmnt_data.wcb_t_end_sysops_dirtystuck1_tn"
+	Set gtmtypes("sgmnt_data",269,"off")=2864
 	Set gtmtypes("sgmnt_data",269,"len")=8
 	Set gtmtypes("sgmnt_data",269,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirtystuck2_tn")=269
-	Set gtmtypes("sgmnt_data",270,"name")="sgmnt_data.wcb_secshr_db_clnup_wbuf_dqd_tn"
-	Set gtmtypes("sgmnt_data",270,"off")=2880
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirtystuck1_tn")=269
+	Set gtmtypes("sgmnt_data",270,"name")="sgmnt_data.wcb_t_end_sysops_dirtystuck2_tn"
+	Set gtmtypes("sgmnt_data",270,"off")=2872
 	Set gtmtypes("sgmnt_data",270,"len")=8
 	Set gtmtypes("sgmnt_data",270,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_secshr_db_clnup_wbuf_dqd_tn")=270
-	Set gtmtypes("sgmnt_data",271,"name")="sgmnt_data.dwngrd_refmts_syncio_tn"
-	Set gtmtypes("sgmnt_data",271,"off")=2888
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirtystuck2_tn")=270
+	Set gtmtypes("sgmnt_data",271,"name")="sgmnt_data.wcb_secshr_db_clnup_wbuf_dqd_tn"
+	Set gtmtypes("sgmnt_data",271,"off")=2880
 	Set gtmtypes("sgmnt_data",271,"len")=8
 	Set gtmtypes("sgmnt_data",271,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","dwngrd_refmts_syncio_tn")=271
-	Set gtmtypes("sgmnt_data",272,"name")="sgmnt_data.dwngrd_refmts_asyncio_tn"
-	Set gtmtypes("sgmnt_data",272,"off")=2896
+	Set gtmtypfldindx("sgmnt_data","wcb_secshr_db_clnup_wbuf_dqd_tn")=271
+	Set gtmtypes("sgmnt_data",272,"name")="sgmnt_data.dwngrd_refmts_syncio_tn"
+	Set gtmtypes("sgmnt_data",272,"off")=2888
 	Set gtmtypes("sgmnt_data",272,"len")=8
 	Set gtmtypes("sgmnt_data",272,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","dwngrd_refmts_asyncio_tn")=272
-	Set gtmtypes("sgmnt_data",273,"name")="sgmnt_data.shmpool_refmt_harvests_tn"
-	Set gtmtypes("sgmnt_data",273,"off")=2904
+	Set gtmtypfldindx("sgmnt_data","dwngrd_refmts_syncio_tn")=272
+	Set gtmtypes("sgmnt_data",273,"name")="sgmnt_data.dwngrd_refmts_asyncio_tn"
+	Set gtmtypes("sgmnt_data",273,"off")=2896
 	Set gtmtypes("sgmnt_data",273,"len")=8
 	Set gtmtypes("sgmnt_data",273,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","shmpool_refmt_harvests_tn")=273
-	Set gtmtypes("sgmnt_data",274,"name")="sgmnt_data.shmpool_recovery_tn"
-	Set gtmtypes("sgmnt_data",274,"off")=2912
+	Set gtmtypfldindx("sgmnt_data","dwngrd_refmts_asyncio_tn")=273
+	Set gtmtypes("sgmnt_data",274,"name")="sgmnt_data.shmpool_refmt_harvests_tn"
+	Set gtmtypes("sgmnt_data",274,"off")=2904
 	Set gtmtypes("sgmnt_data",274,"len")=8
 	Set gtmtypes("sgmnt_data",274,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","shmpool_recovery_tn")=274
-	Set gtmtypes("sgmnt_data",275,"name")="sgmnt_data.shmpool_blkd_by_sdc_tn"
-	Set gtmtypes("sgmnt_data",275,"off")=2920
+	Set gtmtypfldindx("sgmnt_data","shmpool_refmt_harvests_tn")=274
+	Set gtmtypes("sgmnt_data",275,"name")="sgmnt_data.shmpool_recovery_tn"
+	Set gtmtypes("sgmnt_data",275,"off")=2912
 	Set gtmtypes("sgmnt_data",275,"len")=8
 	Set gtmtypes("sgmnt_data",275,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","shmpool_blkd_by_sdc_tn")=275
-	Set gtmtypes("sgmnt_data",276,"name")="sgmnt_data.shmpool_alloc_bbflush_tn"
-	Set gtmtypes("sgmnt_data",276,"off")=2928
+	Set gtmtypfldindx("sgmnt_data","shmpool_recovery_tn")=275
+	Set gtmtypes("sgmnt_data",276,"name")="sgmnt_data.shmpool_blkd_by_sdc_tn"
+	Set gtmtypes("sgmnt_data",276,"off")=2920
 	Set gtmtypes("sgmnt_data",276,"len")=8
 	Set gtmtypes("sgmnt_data",276,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","shmpool_alloc_bbflush_tn")=276
-	Set gtmtypes("sgmnt_data",277,"name")="sgmnt_data.refmt_hvst_blk_released_replaced_tn"
-	Set gtmtypes("sgmnt_data",277,"off")=2936
+	Set gtmtypfldindx("sgmnt_data","shmpool_blkd_by_sdc_tn")=276
+	Set gtmtypes("sgmnt_data",277,"name")="sgmnt_data.shmpool_alloc_bbflush_tn"
+	Set gtmtypes("sgmnt_data",277,"off")=2928
 	Set gtmtypes("sgmnt_data",277,"len")=8
 	Set gtmtypes("sgmnt_data",277,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","refmt_hvst_blk_released_replaced_tn")=277
-	Set gtmtypes("sgmnt_data",278,"name")="sgmnt_data.refmt_hvst_blk_released_io_complete_tn"
-	Set gtmtypes("sgmnt_data",278,"off")=2944
+	Set gtmtypfldindx("sgmnt_data","shmpool_alloc_bbflush_tn")=277
+	Set gtmtypes("sgmnt_data",278,"name")="sgmnt_data.refmt_hvst_blk_released_replaced_tn"
+	Set gtmtypes("sgmnt_data",278,"off")=2936
 	Set gtmtypes("sgmnt_data",278,"len")=8
 	Set gtmtypes("sgmnt_data",278,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","refmt_hvst_blk_released_io_complete_tn")=278
-	Set gtmtypes("sgmnt_data",279,"name")="sgmnt_data.refmt_hvst_blk_kept_tn"
-	Set gtmtypes("sgmnt_data",279,"off")=2952
+	Set gtmtypfldindx("sgmnt_data","refmt_hvst_blk_released_replaced_tn")=278
+	Set gtmtypes("sgmnt_data",279,"name")="sgmnt_data.refmt_hvst_blk_released_io_complete_tn"
+	Set gtmtypes("sgmnt_data",279,"off")=2944
 	Set gtmtypes("sgmnt_data",279,"len")=8
 	Set gtmtypes("sgmnt_data",279,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","refmt_hvst_blk_kept_tn")=279
-	Set gtmtypes("sgmnt_data",280,"name")="sgmnt_data.refmt_hvst_blk_ignored_tn"
-	Set gtmtypes("sgmnt_data",280,"off")=2960
+	Set gtmtypfldindx("sgmnt_data","refmt_hvst_blk_released_io_complete_tn")=279
+	Set gtmtypes("sgmnt_data",280,"name")="sgmnt_data.refmt_hvst_blk_kept_tn"
+	Set gtmtypes("sgmnt_data",280,"off")=2952
 	Set gtmtypes("sgmnt_data",280,"len")=8
 	Set gtmtypes("sgmnt_data",280,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","refmt_hvst_blk_ignored_tn")=280
-	Set gtmtypes("sgmnt_data",281,"name")="sgmnt_data.refmt_blk_chk_blk_freed_tn"
-	Set gtmtypes("sgmnt_data",281,"off")=2968
+	Set gtmtypfldindx("sgmnt_data","refmt_hvst_blk_kept_tn")=280
+	Set gtmtypes("sgmnt_data",281,"name")="sgmnt_data.refmt_hvst_blk_ignored_tn"
+	Set gtmtypes("sgmnt_data",281,"off")=2960
 	Set gtmtypes("sgmnt_data",281,"len")=8
 	Set gtmtypes("sgmnt_data",281,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","refmt_blk_chk_blk_freed_tn")=281
-	Set gtmtypes("sgmnt_data",282,"name")="sgmnt_data.refmt_blk_chk_blk_kept_tn"
-	Set gtmtypes("sgmnt_data",282,"off")=2976
+	Set gtmtypfldindx("sgmnt_data","refmt_hvst_blk_ignored_tn")=281
+	Set gtmtypes("sgmnt_data",282,"name")="sgmnt_data.refmt_blk_chk_blk_freed_tn"
+	Set gtmtypes("sgmnt_data",282,"off")=2968
 	Set gtmtypes("sgmnt_data",282,"len")=8
 	Set gtmtypes("sgmnt_data",282,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","refmt_blk_chk_blk_kept_tn")=282
-	Set gtmtypes("sgmnt_data",283,"name")="sgmnt_data.active_lvl_trigger_tn"
-	Set gtmtypes("sgmnt_data",283,"off")=2984
+	Set gtmtypfldindx("sgmnt_data","refmt_blk_chk_blk_freed_tn")=282
+	Set gtmtypes("sgmnt_data",283,"name")="sgmnt_data.refmt_blk_chk_blk_kept_tn"
+	Set gtmtypes("sgmnt_data",283,"off")=2976
 	Set gtmtypes("sgmnt_data",283,"len")=8
 	Set gtmtypes("sgmnt_data",283,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","active_lvl_trigger_tn")=283
-	Set gtmtypes("sgmnt_data",284,"name")="sgmnt_data.new_buff_tn"
-	Set gtmtypes("sgmnt_data",284,"off")=2992
+	Set gtmtypfldindx("sgmnt_data","refmt_blk_chk_blk_kept_tn")=283
+	Set gtmtypes("sgmnt_data",284,"name")="sgmnt_data.active_lvl_trigger_tn"
+	Set gtmtypes("sgmnt_data",284,"off")=2984
 	Set gtmtypes("sgmnt_data",284,"len")=8
 	Set gtmtypes("sgmnt_data",284,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","new_buff_tn")=284
-	Set gtmtypes("sgmnt_data",285,"name")="sgmnt_data.phase2_commit_wait_sleep_in_crit_tn"
-	Set gtmtypes("sgmnt_data",285,"off")=3000
+	Set gtmtypfldindx("sgmnt_data","active_lvl_trigger_tn")=284
+	Set gtmtypes("sgmnt_data",285,"name")="sgmnt_data.new_buff_tn"
+	Set gtmtypes("sgmnt_data",285,"off")=2992
 	Set gtmtypes("sgmnt_data",285,"len")=8
 	Set gtmtypes("sgmnt_data",285,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","phase2_commit_wait_sleep_in_crit_tn")=285
-	Set gtmtypes("sgmnt_data",286,"name")="sgmnt_data.phase2_commit_wait_sleep_no_crit_tn"
-	Set gtmtypes("sgmnt_data",286,"off")=3008
+	Set gtmtypfldindx("sgmnt_data","new_buff_tn")=285
+	Set gtmtypes("sgmnt_data",286,"name")="sgmnt_data.phase2_commit_wait_sleep_in_crit_tn"
+	Set gtmtypes("sgmnt_data",286,"off")=3000
 	Set gtmtypes("sgmnt_data",286,"len")=8
 	Set gtmtypes("sgmnt_data",286,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","phase2_commit_wait_sleep_no_crit_tn")=286
-	Set gtmtypes("sgmnt_data",287,"name")="sgmnt_data.phase2_commit_wait_pidcnt_tn"
-	Set gtmtypes("sgmnt_data",287,"off")=3016
+	Set gtmtypfldindx("sgmnt_data","phase2_commit_wait_sleep_in_crit_tn")=286
+	Set gtmtypes("sgmnt_data",287,"name")="sgmnt_data.phase2_commit_wait_sleep_no_crit_tn"
+	Set gtmtypes("sgmnt_data",287,"off")=3008
 	Set gtmtypes("sgmnt_data",287,"len")=8
 	Set gtmtypes("sgmnt_data",287,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","phase2_commit_wait_pidcnt_tn")=287
-	Set gtmtypes("sgmnt_data",288,"name")="sgmnt_data.wcb_t_end_sysops_intend_wait_tn"
-	Set gtmtypes("sgmnt_data",288,"off")=3024
+	Set gtmtypfldindx("sgmnt_data","phase2_commit_wait_sleep_no_crit_tn")=287
+	Set gtmtypes("sgmnt_data",288,"name")="sgmnt_data.phase2_commit_wait_pidcnt_tn"
+	Set gtmtypes("sgmnt_data",288,"off")=3016
 	Set gtmtypes("sgmnt_data",288,"len")=8
 	Set gtmtypes("sgmnt_data",288,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_intend_wait_tn")=288
-	Set gtmtypes("sgmnt_data",289,"name")="sgmnt_data.wcb_secshr_db_clnup_phase2_clnup_tn"
-	Set gtmtypes("sgmnt_data",289,"off")=3032
+	Set gtmtypfldindx("sgmnt_data","phase2_commit_wait_pidcnt_tn")=288
+	Set gtmtypes("sgmnt_data",289,"name")="sgmnt_data.wcb_t_end_sysops_intend_wait_tn"
+	Set gtmtypes("sgmnt_data",289,"off")=3024
 	Set gtmtypes("sgmnt_data",289,"len")=8
 	Set gtmtypes("sgmnt_data",289,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_secshr_db_clnup_phase2_clnup_tn")=289
-	Set gtmtypes("sgmnt_data",290,"name")="sgmnt_data.wcb_phase2_commit_wait_tn"
-	Set gtmtypes("sgmnt_data",290,"off")=3040
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_intend_wait_tn")=289
+	Set gtmtypes("sgmnt_data",290,"name")="sgmnt_data.wcb_secshr_db_clnup_phase2_clnup_tn"
+	Set gtmtypes("sgmnt_data",290,"off")=3032
 	Set gtmtypes("sgmnt_data",290,"len")=8
 	Set gtmtypes("sgmnt_data",290,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_phase2_commit_wait_tn")=290
-	Set gtmtypes("sgmnt_data",291,"name")="sgmnt_data.recompute_upd_array_calls_tn"
-	Set gtmtypes("sgmnt_data",291,"off")=3048
+	Set gtmtypfldindx("sgmnt_data","wcb_secshr_db_clnup_phase2_clnup_tn")=290
+	Set gtmtypes("sgmnt_data",291,"name")="sgmnt_data.wcb_phase2_commit_wait_tn"
+	Set gtmtypes("sgmnt_data",291,"off")=3040
 	Set gtmtypes("sgmnt_data",291,"len")=8
 	Set gtmtypes("sgmnt_data",291,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_calls_tn")=291
-	Set gtmtypes("sgmnt_data",292,"name")="sgmnt_data.recompute_upd_array_rip_tn"
-	Set gtmtypes("sgmnt_data",292,"off")=3056
+	Set gtmtypfldindx("sgmnt_data","wcb_phase2_commit_wait_tn")=291
+	Set gtmtypes("sgmnt_data",292,"name")="sgmnt_data.recompute_upd_array_calls_tn"
+	Set gtmtypes("sgmnt_data",292,"off")=3048
 	Set gtmtypes("sgmnt_data",292,"len")=8
 	Set gtmtypes("sgmnt_data",292,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_rip_tn")=292
-	Set gtmtypes("sgmnt_data",293,"name")="sgmnt_data.recompute_upd_array_in_tend_tn"
-	Set gtmtypes("sgmnt_data",293,"off")=3064
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_calls_tn")=292
+	Set gtmtypes("sgmnt_data",293,"name")="sgmnt_data.recompute_upd_array_rip_tn"
+	Set gtmtypes("sgmnt_data",293,"off")=3056
 	Set gtmtypes("sgmnt_data",293,"len")=8
 	Set gtmtypes("sgmnt_data",293,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_in_tend_tn")=293
-	Set gtmtypes("sgmnt_data",294,"name")="sgmnt_data.recompute_upd_array_search_blk_tn"
-	Set gtmtypes("sgmnt_data",294,"off")=3072
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_rip_tn")=293
+	Set gtmtypes("sgmnt_data",294,"name")="sgmnt_data.recompute_upd_array_in_tend_tn"
+	Set gtmtypes("sgmnt_data",294,"off")=3064
 	Set gtmtypes("sgmnt_data",294,"len")=8
 	Set gtmtypes("sgmnt_data",294,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_search_blk_tn")=294
-	Set gtmtypes("sgmnt_data",295,"name")="sgmnt_data.recompute_upd_array_new_rec_tn"
-	Set gtmtypes("sgmnt_data",295,"off")=3080
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_in_tend_tn")=294
+	Set gtmtypes("sgmnt_data",295,"name")="sgmnt_data.recompute_upd_array_search_blk_tn"
+	Set gtmtypes("sgmnt_data",295,"off")=3072
 	Set gtmtypes("sgmnt_data",295,"len")=8
 	Set gtmtypes("sgmnt_data",295,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_new_rec_tn")=295
-	Set gtmtypes("sgmnt_data",296,"name")="sgmnt_data.recompute_upd_array_rec_size_tn"
-	Set gtmtypes("sgmnt_data",296,"off")=3088
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_search_blk_tn")=295
+	Set gtmtypes("sgmnt_data",296,"name")="sgmnt_data.recompute_upd_array_new_rec_tn"
+	Set gtmtypes("sgmnt_data",296,"off")=3080
 	Set gtmtypes("sgmnt_data",296,"len")=8
 	Set gtmtypes("sgmnt_data",296,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_rec_size_tn")=296
-	Set gtmtypes("sgmnt_data",297,"name")="sgmnt_data.recompute_upd_array_rec_cmpc_tn"
-	Set gtmtypes("sgmnt_data",297,"off")=3096
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_new_rec_tn")=296
+	Set gtmtypes("sgmnt_data",297,"name")="sgmnt_data.recompute_upd_array_rec_size_tn"
+	Set gtmtypes("sgmnt_data",297,"off")=3088
 	Set gtmtypes("sgmnt_data",297,"len")=8
 	Set gtmtypes("sgmnt_data",297,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_rec_cmpc_tn")=297
-	Set gtmtypes("sgmnt_data",298,"name")="sgmnt_data.recompute_upd_array_blk_fini_tn"
-	Set gtmtypes("sgmnt_data",298,"off")=3104
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_rec_size_tn")=297
+	Set gtmtypes("sgmnt_data",298,"name")="sgmnt_data.recompute_upd_array_rec_cmpc_tn"
+	Set gtmtypes("sgmnt_data",298,"off")=3096
 	Set gtmtypes("sgmnt_data",298,"len")=8
 	Set gtmtypes("sgmnt_data",298,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_blk_fini_tn")=298
-	Set gtmtypes("sgmnt_data",299,"name")="sgmnt_data.recompute_upd_array_blk_split_tn"
-	Set gtmtypes("sgmnt_data",299,"off")=3112
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_rec_cmpc_tn")=298
+	Set gtmtypes("sgmnt_data",299,"name")="sgmnt_data.recompute_upd_array_blk_fini_tn"
+	Set gtmtypes("sgmnt_data",299,"off")=3104
 	Set gtmtypes("sgmnt_data",299,"len")=8
 	Set gtmtypes("sgmnt_data",299,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_blk_split_tn")=299
-	Set gtmtypes("sgmnt_data",300,"name")="sgmnt_data.t_qread_ripsleep_cnt_tn"
-	Set gtmtypes("sgmnt_data",300,"off")=3120
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_blk_fini_tn")=299
+	Set gtmtypes("sgmnt_data",300,"name")="sgmnt_data.recompute_upd_array_blk_split_tn"
+	Set gtmtypes("sgmnt_data",300,"off")=3112
 	Set gtmtypes("sgmnt_data",300,"len")=8
 	Set gtmtypes("sgmnt_data",300,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","t_qread_ripsleep_cnt_tn")=300
-	Set gtmtypes("sgmnt_data",301,"name")="sgmnt_data.t_qread_ripsleep_nblks_tn"
-	Set gtmtypes("sgmnt_data",301,"off")=3128
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_blk_split_tn")=300
+	Set gtmtypes("sgmnt_data",301,"name")="sgmnt_data.t_qread_ripsleep_cnt_tn"
+	Set gtmtypes("sgmnt_data",301,"off")=3120
 	Set gtmtypes("sgmnt_data",301,"len")=8
 	Set gtmtypes("sgmnt_data",301,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","t_qread_ripsleep_nblks_tn")=301
-	Set gtmtypes("sgmnt_data",302,"name")="sgmnt_data.bg_trc_rec_tn_filler"
-	Set gtmtypes("sgmnt_data",302,"off")=3136
-	Set gtmtypes("sgmnt_data",302,"len")=112
-	Set gtmtypes("sgmnt_data",302,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","bg_trc_rec_tn_filler")=302
-	Set gtmtypes("sgmnt_data",303,"name")="sgmnt_data.total_buffer_flush_cntr"
-	Set gtmtypes("sgmnt_data",303,"off")=3248
-	Set gtmtypes("sgmnt_data",303,"len")=4
-	Set gtmtypes("sgmnt_data",303,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","total_buffer_flush_cntr")=303
-	Set gtmtypes("sgmnt_data",304,"name")="sgmnt_data.bufct_buffer_flush_cntr"
-	Set gtmtypes("sgmnt_data",304,"off")=3252
-	Set gtmtypes("sgmnt_data",304,"len")=4
-	Set gtmtypes("sgmnt_data",304,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","bufct_buffer_flush_cntr")=304
-	Set gtmtypes("sgmnt_data",305,"name")="sgmnt_data.bufct_buffer_flush_loop_cntr"
-	Set gtmtypes("sgmnt_data",305,"off")=3256
-	Set gtmtypes("sgmnt_data",305,"len")=4
-	Set gtmtypes("sgmnt_data",305,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","bufct_buffer_flush_loop_cntr")=305
-	Set gtmtypes("sgmnt_data",306,"name")="sgmnt_data.wrt_calls_cntr"
-	Set gtmtypes("sgmnt_data",306,"off")=3260
-	Set gtmtypes("sgmnt_data",306,"len")=4
-	Set gtmtypes("sgmnt_data",306,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wrt_calls_cntr")=306
-	Set gtmtypes("sgmnt_data",307,"name")="sgmnt_data.wrt_count_cntr"
-	Set gtmtypes("sgmnt_data",307,"off")=3264
-	Set gtmtypes("sgmnt_data",307,"len")=4
-	Set gtmtypes("sgmnt_data",307,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wrt_count_cntr")=307
-	Set gtmtypes("sgmnt_data",308,"name")="sgmnt_data.wrt_blocked_cntr"
-	Set gtmtypes("sgmnt_data",308,"off")=3268
-	Set gtmtypes("sgmnt_data",308,"len")=4
-	Set gtmtypes("sgmnt_data",308,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wrt_blocked_cntr")=308
-	Set gtmtypes("sgmnt_data",309,"name")="sgmnt_data.wrt_busy_cntr"
-	Set gtmtypes("sgmnt_data",309,"off")=3272
-	Set gtmtypes("sgmnt_data",309,"len")=4
-	Set gtmtypes("sgmnt_data",309,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wrt_busy_cntr")=309
-	Set gtmtypes("sgmnt_data",310,"name")="sgmnt_data.wrt_noblks_wrtn_cntr"
-	Set gtmtypes("sgmnt_data",310,"off")=3276
-	Set gtmtypes("sgmnt_data",310,"len")=4
-	Set gtmtypes("sgmnt_data",310,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wrt_noblks_wrtn_cntr")=310
-	Set gtmtypes("sgmnt_data",311,"name")="sgmnt_data.reserved_bgtrcrec1_cntr"
-	Set gtmtypes("sgmnt_data",311,"off")=3280
-	Set gtmtypes("sgmnt_data",311,"len")=4
-	Set gtmtypes("sgmnt_data",311,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","reserved_bgtrcrec1_cntr")=311
-	Set gtmtypes("sgmnt_data",312,"name")="sgmnt_data.reserved_bgtrcrec2_cntr"
-	Set gtmtypes("sgmnt_data",312,"off")=3284
+	Set gtmtypfldindx("sgmnt_data","t_qread_ripsleep_cnt_tn")=301
+	Set gtmtypes("sgmnt_data",302,"name")="sgmnt_data.t_qread_ripsleep_nblks_tn"
+	Set gtmtypes("sgmnt_data",302,"off")=3128
+	Set gtmtypes("sgmnt_data",302,"len")=8
+	Set gtmtypes("sgmnt_data",302,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","t_qread_ripsleep_nblks_tn")=302
+	Set gtmtypes("sgmnt_data",303,"name")="sgmnt_data.wcs_wtfini_invoked_tn"
+	Set gtmtypes("sgmnt_data",303,"off")=3136
+	Set gtmtypes("sgmnt_data",303,"len")=8
+	Set gtmtypes("sgmnt_data",303,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","wcs_wtfini_invoked_tn")=303
+	Set gtmtypes("sgmnt_data",304,"name")="sgmnt_data.wcs_wterror_invoked_tn"
+	Set gtmtypes("sgmnt_data",304,"off")=3144
+	Set gtmtypes("sgmnt_data",304,"len")=8
+	Set gtmtypes("sgmnt_data",304,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","wcs_wterror_invoked_tn")=304
+	Set gtmtypes("sgmnt_data",305,"name")="sgmnt_data.wcs_wt_restart_invoked_tn"
+	Set gtmtypes("sgmnt_data",305,"off")=3152
+	Set gtmtypes("sgmnt_data",305,"len")=8
+	Set gtmtypes("sgmnt_data",305,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","wcs_wt_restart_invoked_tn")=305
+	Set gtmtypes("sgmnt_data",306,"name")="sgmnt_data.wcs_wt_restart_eagain_tn"
+	Set gtmtypes("sgmnt_data",306,"off")=3160
+	Set gtmtypes("sgmnt_data",306,"len")=8
+	Set gtmtypes("sgmnt_data",306,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","wcs_wt_restart_eagain_tn")=306
+	Set gtmtypes("sgmnt_data",307,"name")="sgmnt_data.wcs_wt_restart_reinsert_tn"
+	Set gtmtypes("sgmnt_data",307,"off")=3168
+	Set gtmtypes("sgmnt_data",307,"len")=8
+	Set gtmtypes("sgmnt_data",307,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","wcs_wt_restart_reinsert_tn")=307
+	Set gtmtypes("sgmnt_data",308,"name")="sgmnt_data.wcs_wtstart_eagain_tn"
+	Set gtmtypes("sgmnt_data",308,"off")=3176
+	Set gtmtypes("sgmnt_data",308,"len")=8
+	Set gtmtypes("sgmnt_data",308,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","wcs_wtstart_eagain_tn")=308
+	Set gtmtypes("sgmnt_data",309,"name")="sgmnt_data.wcs_wtstart_eagain_incrit_tn"
+	Set gtmtypes("sgmnt_data",309,"off")=3184
+	Set gtmtypes("sgmnt_data",309,"len")=8
+	Set gtmtypes("sgmnt_data",309,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","wcs_wtstart_eagain_incrit_tn")=309
+	Set gtmtypes("sgmnt_data",310,"name")="sgmnt_data.async_restart_eagain_tn"
+	Set gtmtypes("sgmnt_data",310,"off")=3192
+	Set gtmtypes("sgmnt_data",310,"len")=8
+	Set gtmtypes("sgmnt_data",310,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","async_restart_eagain_tn")=310
+	Set gtmtypes("sgmnt_data",311,"name")="sgmnt_data.bg_trc_rec_tn_filler"
+	Set gtmtypes("sgmnt_data",311,"off")=3200
+	Set gtmtypes("sgmnt_data",311,"len")=48
+	Set gtmtypes("sgmnt_data",311,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","bg_trc_rec_tn_filler")=311
+	Set gtmtypes("sgmnt_data",312,"name")="sgmnt_data.total_buffer_flush_cntr"
+	Set gtmtypes("sgmnt_data",312,"off")=3248
 	Set gtmtypes("sgmnt_data",312,"len")=4
 	Set gtmtypes("sgmnt_data",312,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","reserved_bgtrcrec2_cntr")=312
-	Set gtmtypes("sgmnt_data",313,"name")="sgmnt_data.reserved_bgtrcrec3_cntr"
-	Set gtmtypes("sgmnt_data",313,"off")=3288
+	Set gtmtypfldindx("sgmnt_data","total_buffer_flush_cntr")=312
+	Set gtmtypes("sgmnt_data",313,"name")="sgmnt_data.bufct_buffer_flush_cntr"
+	Set gtmtypes("sgmnt_data",313,"off")=3252
 	Set gtmtypes("sgmnt_data",313,"len")=4
 	Set gtmtypes("sgmnt_data",313,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","reserved_bgtrcrec3_cntr")=313
-	Set gtmtypes("sgmnt_data",314,"name")="sgmnt_data.lost_block_recovery_cntr"
-	Set gtmtypes("sgmnt_data",314,"off")=3292
+	Set gtmtypfldindx("sgmnt_data","bufct_buffer_flush_cntr")=313
+	Set gtmtypes("sgmnt_data",314,"name")="sgmnt_data.bufct_buffer_flush_loop_cntr"
+	Set gtmtypes("sgmnt_data",314,"off")=3256
 	Set gtmtypes("sgmnt_data",314,"len")=4
 	Set gtmtypes("sgmnt_data",314,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","lost_block_recovery_cntr")=314
-	Set gtmtypes("sgmnt_data",315,"name")="sgmnt_data.wc_blocked_onln_rlbk_cntr"
-	Set gtmtypes("sgmnt_data",315,"off")=3296
+	Set gtmtypfldindx("sgmnt_data","bufct_buffer_flush_loop_cntr")=314
+	Set gtmtypes("sgmnt_data",315,"name")="sgmnt_data.wrt_calls_cntr"
+	Set gtmtypes("sgmnt_data",315,"off")=3260
 	Set gtmtypes("sgmnt_data",315,"len")=4
 	Set gtmtypes("sgmnt_data",315,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_onln_rlbk_cntr")=315
-	Set gtmtypes("sgmnt_data",316,"name")="sgmnt_data.stale_cntr"
-	Set gtmtypes("sgmnt_data",316,"off")=3300
+	Set gtmtypfldindx("sgmnt_data","wrt_calls_cntr")=315
+	Set gtmtypes("sgmnt_data",316,"name")="sgmnt_data.wrt_count_cntr"
+	Set gtmtypes("sgmnt_data",316,"off")=3264
 	Set gtmtypes("sgmnt_data",316,"len")=4
 	Set gtmtypes("sgmnt_data",316,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","stale_cntr")=316
-	Set gtmtypes("sgmnt_data",317,"name")="sgmnt_data.starved_cntr"
-	Set gtmtypes("sgmnt_data",317,"off")=3304
+	Set gtmtypfldindx("sgmnt_data","wrt_count_cntr")=316
+	Set gtmtypes("sgmnt_data",317,"name")="sgmnt_data.wrt_blocked_cntr"
+	Set gtmtypes("sgmnt_data",317,"off")=3268
 	Set gtmtypes("sgmnt_data",317,"len")=4
 	Set gtmtypes("sgmnt_data",317,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","starved_cntr")=317
-	Set gtmtypes("sgmnt_data",318,"name")="sgmnt_data.stale_timer_started_cntr"
-	Set gtmtypes("sgmnt_data",318,"off")=3308
+	Set gtmtypfldindx("sgmnt_data","wrt_blocked_cntr")=317
+	Set gtmtypes("sgmnt_data",318,"name")="sgmnt_data.wrt_busy_cntr"
+	Set gtmtypes("sgmnt_data",318,"off")=3272
 	Set gtmtypes("sgmnt_data",318,"len")=4
 	Set gtmtypes("sgmnt_data",318,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","stale_timer_started_cntr")=318
-	Set gtmtypes("sgmnt_data",319,"name")="sgmnt_data.stale_timer_pop_cntr"
-	Set gtmtypes("sgmnt_data",319,"off")=3312
+	Set gtmtypfldindx("sgmnt_data","wrt_busy_cntr")=318
+	Set gtmtypes("sgmnt_data",319,"name")="sgmnt_data.wrt_noblks_wrtn_cntr"
+	Set gtmtypes("sgmnt_data",319,"off")=3276
 	Set gtmtypes("sgmnt_data",319,"len")=4
 	Set gtmtypes("sgmnt_data",319,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","stale_timer_pop_cntr")=319
-	Set gtmtypes("sgmnt_data",320,"name")="sgmnt_data.stale_process_defer_cntr"
-	Set gtmtypes("sgmnt_data",320,"off")=3316
+	Set gtmtypfldindx("sgmnt_data","wrt_noblks_wrtn_cntr")=319
+	Set gtmtypes("sgmnt_data",320,"name")="sgmnt_data.reserved_bgtrcrec1_cntr"
+	Set gtmtypes("sgmnt_data",320,"off")=3280
 	Set gtmtypes("sgmnt_data",320,"len")=4
 	Set gtmtypes("sgmnt_data",320,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","stale_process_defer_cntr")=320
-	Set gtmtypes("sgmnt_data",321,"name")="sgmnt_data.stale_defer_processed_cntr"
-	Set gtmtypes("sgmnt_data",321,"off")=3320
+	Set gtmtypfldindx("sgmnt_data","reserved_bgtrcrec1_cntr")=320
+	Set gtmtypes("sgmnt_data",321,"name")="sgmnt_data.reserved_bgtrcrec2_cntr"
+	Set gtmtypes("sgmnt_data",321,"off")=3284
 	Set gtmtypes("sgmnt_data",321,"len")=4
 	Set gtmtypes("sgmnt_data",321,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","stale_defer_processed_cntr")=321
-	Set gtmtypes("sgmnt_data",322,"name")="sgmnt_data.spcfc_buffer_flush_cntr"
-	Set gtmtypes("sgmnt_data",322,"off")=3324
+	Set gtmtypfldindx("sgmnt_data","reserved_bgtrcrec2_cntr")=321
+	Set gtmtypes("sgmnt_data",322,"name")="sgmnt_data.reserved_bgtrcrec3_cntr"
+	Set gtmtypes("sgmnt_data",322,"off")=3288
 	Set gtmtypes("sgmnt_data",322,"len")=4
 	Set gtmtypes("sgmnt_data",322,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","spcfc_buffer_flush_cntr")=322
-	Set gtmtypes("sgmnt_data",323,"name")="sgmnt_data.spcfc_buffer_flush_loop_cntr"
-	Set gtmtypes("sgmnt_data",323,"off")=3328
+	Set gtmtypfldindx("sgmnt_data","reserved_bgtrcrec3_cntr")=322
+	Set gtmtypes("sgmnt_data",323,"name")="sgmnt_data.lost_block_recovery_cntr"
+	Set gtmtypes("sgmnt_data",323,"off")=3292
 	Set gtmtypes("sgmnt_data",323,"len")=4
 	Set gtmtypes("sgmnt_data",323,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","spcfc_buffer_flush_loop_cntr")=323
-	Set gtmtypes("sgmnt_data",324,"name")="sgmnt_data.spcfc_buffer_flush_retries_cntr"
-	Set gtmtypes("sgmnt_data",324,"off")=3332
+	Set gtmtypfldindx("sgmnt_data","lost_block_recovery_cntr")=323
+	Set gtmtypes("sgmnt_data",324,"name")="sgmnt_data.wc_blocked_onln_rlbk_cntr"
+	Set gtmtypes("sgmnt_data",324,"off")=3296
 	Set gtmtypes("sgmnt_data",324,"len")=4
 	Set gtmtypes("sgmnt_data",324,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","spcfc_buffer_flush_retries_cntr")=324
-	Set gtmtypes("sgmnt_data",325,"name")="sgmnt_data.spcfc_buffer_flushed_during_lockwait_cntr"
-	Set gtmtypes("sgmnt_data",325,"off")=3336
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_onln_rlbk_cntr")=324
+	Set gtmtypes("sgmnt_data",325,"name")="sgmnt_data.stale_cntr"
+	Set gtmtypes("sgmnt_data",325,"off")=3300
 	Set gtmtypes("sgmnt_data",325,"len")=4
 	Set gtmtypes("sgmnt_data",325,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","spcfc_buffer_flushed_during_lockwait_cntr")=325
-	Set gtmtypes("sgmnt_data",326,"name")="sgmnt_data.tp_crit_retries_cntr"
-	Set gtmtypes("sgmnt_data",326,"off")=3340
+	Set gtmtypfldindx("sgmnt_data","stale_cntr")=325
+	Set gtmtypes("sgmnt_data",326,"name")="sgmnt_data.starved_cntr"
+	Set gtmtypes("sgmnt_data",326,"off")=3304
 	Set gtmtypes("sgmnt_data",326,"len")=4
 	Set gtmtypes("sgmnt_data",326,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","tp_crit_retries_cntr")=326
-	Set gtmtypes("sgmnt_data",327,"name")="sgmnt_data.db_csh_getn_flush_dirty_cntr"
-	Set gtmtypes("sgmnt_data",327,"off")=3344
+	Set gtmtypfldindx("sgmnt_data","starved_cntr")=326
+	Set gtmtypes("sgmnt_data",327,"name")="sgmnt_data.stale_timer_started_cntr"
+	Set gtmtypes("sgmnt_data",327,"off")=3308
 	Set gtmtypes("sgmnt_data",327,"len")=4
 	Set gtmtypes("sgmnt_data",327,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","db_csh_getn_flush_dirty_cntr")=327
-	Set gtmtypes("sgmnt_data",328,"name")="sgmnt_data.db_csh_getn_rip_wait_cntr"
-	Set gtmtypes("sgmnt_data",328,"off")=3348
+	Set gtmtypfldindx("sgmnt_data","stale_timer_started_cntr")=327
+	Set gtmtypes("sgmnt_data",328,"name")="sgmnt_data.stale_timer_pop_cntr"
+	Set gtmtypes("sgmnt_data",328,"off")=3312
 	Set gtmtypes("sgmnt_data",328,"len")=4
 	Set gtmtypes("sgmnt_data",328,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","db_csh_getn_rip_wait_cntr")=328
-	Set gtmtypes("sgmnt_data",329,"name")="sgmnt_data.db_csh_getn_buf_owner_stuck_cntr"
-	Set gtmtypes("sgmnt_data",329,"off")=3352
+	Set gtmtypfldindx("sgmnt_data","stale_timer_pop_cntr")=328
+	Set gtmtypes("sgmnt_data",329,"name")="sgmnt_data.stale_process_defer_cntr"
+	Set gtmtypes("sgmnt_data",329,"off")=3316
 	Set gtmtypes("sgmnt_data",329,"len")=4
 	Set gtmtypes("sgmnt_data",329,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","db_csh_getn_buf_owner_stuck_cntr")=329
-	Set gtmtypes("sgmnt_data",330,"name")="sgmnt_data.db_csh_getn_out_of_design_cntr"
-	Set gtmtypes("sgmnt_data",330,"off")=3356
+	Set gtmtypfldindx("sgmnt_data","stale_process_defer_cntr")=329
+	Set gtmtypes("sgmnt_data",330,"name")="sgmnt_data.stale_defer_processed_cntr"
+	Set gtmtypes("sgmnt_data",330,"off")=3320
 	Set gtmtypes("sgmnt_data",330,"len")=4
 	Set gtmtypes("sgmnt_data",330,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","db_csh_getn_out_of_design_cntr")=330
-	Set gtmtypes("sgmnt_data",331,"name")="sgmnt_data.t_qread_buf_owner_stuck_cntr"
-	Set gtmtypes("sgmnt_data",331,"off")=3360
+	Set gtmtypfldindx("sgmnt_data","stale_defer_processed_cntr")=330
+	Set gtmtypes("sgmnt_data",331,"name")="sgmnt_data.spcfc_buffer_flush_cntr"
+	Set gtmtypes("sgmnt_data",331,"off")=3324
 	Set gtmtypes("sgmnt_data",331,"len")=4
 	Set gtmtypes("sgmnt_data",331,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","t_qread_buf_owner_stuck_cntr")=331
-	Set gtmtypes("sgmnt_data",332,"name")="sgmnt_data.t_qread_out_of_design_cntr"
-	Set gtmtypes("sgmnt_data",332,"off")=3364
+	Set gtmtypfldindx("sgmnt_data","spcfc_buffer_flush_cntr")=331
+	Set gtmtypes("sgmnt_data",332,"name")="sgmnt_data.spcfc_buffer_flush_loop_cntr"
+	Set gtmtypes("sgmnt_data",332,"off")=3328
 	Set gtmtypes("sgmnt_data",332,"len")=4
 	Set gtmtypes("sgmnt_data",332,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","t_qread_out_of_design_cntr")=332
-	Set gtmtypes("sgmnt_data",333,"name")="sgmnt_data.bt_put_flush_dirty_cntr"
-	Set gtmtypes("sgmnt_data",333,"off")=3368
+	Set gtmtypfldindx("sgmnt_data","spcfc_buffer_flush_loop_cntr")=332
+	Set gtmtypes("sgmnt_data",333,"name")="sgmnt_data.spcfc_buffer_flush_retries_cntr"
+	Set gtmtypes("sgmnt_data",333,"off")=3332
 	Set gtmtypes("sgmnt_data",333,"len")=4
 	Set gtmtypes("sgmnt_data",333,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","bt_put_flush_dirty_cntr")=333
-	Set gtmtypes("sgmnt_data",334,"name")="sgmnt_data.mlock_wakeups_cntr"
-	Set gtmtypes("sgmnt_data",334,"off")=3372
+	Set gtmtypfldindx("sgmnt_data","spcfc_buffer_flush_retries_cntr")=333
+	Set gtmtypes("sgmnt_data",334,"name")="sgmnt_data.spcfc_buffer_flushed_during_lockwait_cntr"
+	Set gtmtypes("sgmnt_data",334,"off")=3336
 	Set gtmtypes("sgmnt_data",334,"len")=4
 	Set gtmtypes("sgmnt_data",334,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","mlock_wakeups_cntr")=334
-	Set gtmtypes("sgmnt_data",335,"name")="sgmnt_data.wc_blocked_wcs_recover_invoked_cntr"
-	Set gtmtypes("sgmnt_data",335,"off")=3376
+	Set gtmtypfldindx("sgmnt_data","spcfc_buffer_flushed_during_lockwait_cntr")=334
+	Set gtmtypes("sgmnt_data",335,"name")="sgmnt_data.tp_crit_retries_cntr"
+	Set gtmtypes("sgmnt_data",335,"off")=3340
 	Set gtmtypes("sgmnt_data",335,"len")=4
 	Set gtmtypes("sgmnt_data",335,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_recover_invoked_cntr")=335
-	Set gtmtypes("sgmnt_data",336,"name")="sgmnt_data.wc_blocked_wcs_verify_passed_cntr"
-	Set gtmtypes("sgmnt_data",336,"off")=3380
+	Set gtmtypfldindx("sgmnt_data","tp_crit_retries_cntr")=335
+	Set gtmtypes("sgmnt_data",336,"name")="sgmnt_data.db_csh_getn_flush_dirty_cntr"
+	Set gtmtypes("sgmnt_data",336,"off")=3344
 	Set gtmtypes("sgmnt_data",336,"len")=4
 	Set gtmtypes("sgmnt_data",336,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_verify_passed_cntr")=336
-	Set gtmtypes("sgmnt_data",337,"name")="sgmnt_data.wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr"
-	Set gtmtypes("sgmnt_data",337,"off")=3384
+	Set gtmtypfldindx("sgmnt_data","db_csh_getn_flush_dirty_cntr")=336
+	Set gtmtypes("sgmnt_data",337,"name")="sgmnt_data.db_csh_getn_rip_wait_cntr"
+	Set gtmtypes("sgmnt_data",337,"off")=3348
 	Set gtmtypes("sgmnt_data",337,"len")=4
 	Set gtmtypes("sgmnt_data",337,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr")=337
-	Set gtmtypes("sgmnt_data",338,"name")="sgmnt_data.wc_blocked_t_qread_db_csh_get_invalid_blk_cntr"
-	Set gtmtypes("sgmnt_data",338,"off")=3388
+	Set gtmtypfldindx("sgmnt_data","db_csh_getn_rip_wait_cntr")=337
+	Set gtmtypes("sgmnt_data",338,"name")="sgmnt_data.db_csh_getn_buf_owner_stuck_cntr"
+	Set gtmtypes("sgmnt_data",338,"off")=3352
 	Set gtmtypes("sgmnt_data",338,"len")=4
 	Set gtmtypes("sgmnt_data",338,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_db_csh_get_invalid_blk_cntr")=338
-	Set gtmtypes("sgmnt_data",339,"name")="sgmnt_data.wc_blocked_db_csh_getn_loopexceed_cntr"
-	Set gtmtypes("sgmnt_data",339,"off")=3392
+	Set gtmtypfldindx("sgmnt_data","db_csh_getn_buf_owner_stuck_cntr")=338
+	Set gtmtypes("sgmnt_data",339,"name")="sgmnt_data.db_csh_getn_out_of_design_cntr"
+	Set gtmtypes("sgmnt_data",339,"off")=3356
 	Set gtmtypes("sgmnt_data",339,"len")=4
 	Set gtmtypes("sgmnt_data",339,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_db_csh_getn_loopexceed_cntr")=339
-	Set gtmtypes("sgmnt_data",340,"name")="sgmnt_data.wc_blocked_db_csh_getn_wcsstarvewrt_cntr"
-	Set gtmtypes("sgmnt_data",340,"off")=3396
+	Set gtmtypfldindx("sgmnt_data","db_csh_getn_out_of_design_cntr")=339
+	Set gtmtypes("sgmnt_data",340,"name")="sgmnt_data.t_qread_buf_owner_stuck_cntr"
+	Set gtmtypes("sgmnt_data",340,"off")=3360
 	Set gtmtypes("sgmnt_data",340,"len")=4
 	Set gtmtypes("sgmnt_data",340,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_db_csh_getn_wcsstarvewrt_cntr")=340
-	Set gtmtypes("sgmnt_data",341,"name")="sgmnt_data.wc_blocked_db_csh_get_cntr"
-	Set gtmtypes("sgmnt_data",341,"off")=3400
+	Set gtmtypfldindx("sgmnt_data","t_qread_buf_owner_stuck_cntr")=340
+	Set gtmtypes("sgmnt_data",341,"name")="sgmnt_data.t_qread_out_of_design_cntr"
+	Set gtmtypes("sgmnt_data",341,"off")=3364
 	Set gtmtypes("sgmnt_data",341,"len")=4
 	Set gtmtypes("sgmnt_data",341,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_db_csh_get_cntr")=341
-	Set gtmtypes("sgmnt_data",342,"name")="sgmnt_data.wc_blocked_tp_tend_wcsgetspace_cntr"
-	Set gtmtypes("sgmnt_data",342,"off")=3404
+	Set gtmtypfldindx("sgmnt_data","t_qread_out_of_design_cntr")=341
+	Set gtmtypes("sgmnt_data",342,"name")="sgmnt_data.bt_put_flush_dirty_cntr"
+	Set gtmtypes("sgmnt_data",342,"off")=3368
 	Set gtmtypes("sgmnt_data",342,"len")=4
 	Set gtmtypes("sgmnt_data",342,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_wcsgetspace_cntr")=342
-	Set gtmtypes("sgmnt_data",343,"name")="sgmnt_data.wc_blocked_tp_tend_t1_cntr"
-	Set gtmtypes("sgmnt_data",343,"off")=3408
+	Set gtmtypfldindx("sgmnt_data","bt_put_flush_dirty_cntr")=342
+	Set gtmtypes("sgmnt_data",343,"name")="sgmnt_data.mlock_wakeups_cntr"
+	Set gtmtypes("sgmnt_data",343,"off")=3372
 	Set gtmtypes("sgmnt_data",343,"len")=4
 	Set gtmtypes("sgmnt_data",343,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_t1_cntr")=343
-	Set gtmtypes("sgmnt_data",344,"name")="sgmnt_data.wc_blocked_tp_tend_bitmap_cntr"
-	Set gtmtypes("sgmnt_data",344,"off")=3412
+	Set gtmtypfldindx("sgmnt_data","mlock_wakeups_cntr")=343
+	Set gtmtypes("sgmnt_data",344,"name")="sgmnt_data.wc_blocked_wcs_recover_invoked_cntr"
+	Set gtmtypes("sgmnt_data",344,"off")=3376
 	Set gtmtypes("sgmnt_data",344,"len")=4
 	Set gtmtypes("sgmnt_data",344,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_bitmap_cntr")=344
-	Set gtmtypes("sgmnt_data",345,"name")="sgmnt_data.wc_blocked_tp_tend_jnl_cwset_cntr"
-	Set gtmtypes("sgmnt_data",345,"off")=3416
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_recover_invoked_cntr")=344
+	Set gtmtypes("sgmnt_data",345,"name")="sgmnt_data.wc_blocked_wcs_verify_passed_cntr"
+	Set gtmtypes("sgmnt_data",345,"off")=3380
 	Set gtmtypes("sgmnt_data",345,"len")=4
 	Set gtmtypes("sgmnt_data",345,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_jnl_cwset_cntr")=345
-	Set gtmtypes("sgmnt_data",346,"name")="sgmnt_data.wc_blocked_tp_tend_jnl_wcsflu_cntr"
-	Set gtmtypes("sgmnt_data",346,"off")=3420
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_verify_passed_cntr")=345
+	Set gtmtypes("sgmnt_data",346,"name")="sgmnt_data.wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr"
+	Set gtmtypes("sgmnt_data",346,"off")=3384
 	Set gtmtypes("sgmnt_data",346,"len")=4
 	Set gtmtypes("sgmnt_data",346,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_jnl_wcsflu_cntr")=346
-	Set gtmtypes("sgmnt_data",347,"name")="sgmnt_data.wc_blocked_t_end_hist_cntr"
-	Set gtmtypes("sgmnt_data",347,"off")=3424
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr")=346
+	Set gtmtypes("sgmnt_data",347,"name")="sgmnt_data.wc_blocked_t_qread_db_csh_get_invalid_blk_cntr"
+	Set gtmtypes("sgmnt_data",347,"off")=3388
 	Set gtmtypes("sgmnt_data",347,"len")=4
 	Set gtmtypes("sgmnt_data",347,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_hist_cntr")=347
-	Set gtmtypes("sgmnt_data",348,"name")="sgmnt_data.wc_blocked_t_end_hist1_nullbt_cntr"
-	Set gtmtypes("sgmnt_data",348,"off")=3428
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_db_csh_get_invalid_blk_cntr")=347
+	Set gtmtypes("sgmnt_data",348,"name")="sgmnt_data.wc_blocked_db_csh_getn_loopexceed_cntr"
+	Set gtmtypes("sgmnt_data",348,"off")=3392
 	Set gtmtypes("sgmnt_data",348,"len")=4
 	Set gtmtypes("sgmnt_data",348,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_hist1_nullbt_cntr")=348
-	Set gtmtypes("sgmnt_data",349,"name")="sgmnt_data.wc_blocked_t_end_hist1_nonnullbt_cntr"
-	Set gtmtypes("sgmnt_data",349,"off")=3432
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_db_csh_getn_loopexceed_cntr")=348
+	Set gtmtypes("sgmnt_data",349,"name")="sgmnt_data.wc_blocked_db_csh_getn_wcsstarvewrt_cntr"
+	Set gtmtypes("sgmnt_data",349,"off")=3396
 	Set gtmtypes("sgmnt_data",349,"len")=4
 	Set gtmtypes("sgmnt_data",349,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_hist1_nonnullbt_cntr")=349
-	Set gtmtypes("sgmnt_data",350,"name")="sgmnt_data.wc_blocked_t_end_bitmap_nullbt_cntr"
-	Set gtmtypes("sgmnt_data",350,"off")=3436
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_db_csh_getn_wcsstarvewrt_cntr")=349
+	Set gtmtypes("sgmnt_data",350,"name")="sgmnt_data.wc_blocked_db_csh_get_cntr"
+	Set gtmtypes("sgmnt_data",350,"off")=3400
 	Set gtmtypes("sgmnt_data",350,"len")=4
 	Set gtmtypes("sgmnt_data",350,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_bitmap_nullbt_cntr")=350
-	Set gtmtypes("sgmnt_data",351,"name")="sgmnt_data.wc_blocked_t_end_bitmap_nonnullbt_cntr"
-	Set gtmtypes("sgmnt_data",351,"off")=3440
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_db_csh_get_cntr")=350
+	Set gtmtypes("sgmnt_data",351,"name")="sgmnt_data.wc_blocked_tp_tend_wcsgetspace_cntr"
+	Set gtmtypes("sgmnt_data",351,"off")=3404
 	Set gtmtypes("sgmnt_data",351,"len")=4
 	Set gtmtypes("sgmnt_data",351,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_bitmap_nonnullbt_cntr")=351
-	Set gtmtypes("sgmnt_data",352,"name")="sgmnt_data.wc_blocked_t_end_jnl_cwset_cntr"
-	Set gtmtypes("sgmnt_data",352,"off")=3444
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_wcsgetspace_cntr")=351
+	Set gtmtypes("sgmnt_data",352,"name")="sgmnt_data.wc_blocked_tp_tend_t1_cntr"
+	Set gtmtypes("sgmnt_data",352,"off")=3408
 	Set gtmtypes("sgmnt_data",352,"len")=4
 	Set gtmtypes("sgmnt_data",352,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_jnl_cwset_cntr")=352
-	Set gtmtypes("sgmnt_data",353,"name")="sgmnt_data.wc_blocked_t_end_jnl_wcsflu_cntr"
-	Set gtmtypes("sgmnt_data",353,"off")=3448
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_t1_cntr")=352
+	Set gtmtypes("sgmnt_data",353,"name")="sgmnt_data.wc_blocked_tp_tend_bitmap_cntr"
+	Set gtmtypes("sgmnt_data",353,"off")=3412
 	Set gtmtypes("sgmnt_data",353,"len")=4
 	Set gtmtypes("sgmnt_data",353,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_jnl_wcsflu_cntr")=353
-	Set gtmtypes("sgmnt_data",354,"name")="sgmnt_data.db_csh_get_too_many_loops_cntr"
-	Set gtmtypes("sgmnt_data",354,"off")=3452
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_bitmap_cntr")=353
+	Set gtmtypes("sgmnt_data",354,"name")="sgmnt_data.wc_blocked_tp_tend_jnl_cwset_cntr"
+	Set gtmtypes("sgmnt_data",354,"off")=3416
 	Set gtmtypes("sgmnt_data",354,"len")=4
 	Set gtmtypes("sgmnt_data",354,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","db_csh_get_too_many_loops_cntr")=354
-	Set gtmtypes("sgmnt_data",355,"name")="sgmnt_data.wc_blocked_tpckh_hist1_nullbt_cntr"
-	Set gtmtypes("sgmnt_data",355,"off")=3456
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_jnl_cwset_cntr")=354
+	Set gtmtypes("sgmnt_data",355,"name")="sgmnt_data.wc_blocked_tp_tend_jnl_wcsflu_cntr"
+	Set gtmtypes("sgmnt_data",355,"off")=3420
 	Set gtmtypes("sgmnt_data",355,"len")=4
 	Set gtmtypes("sgmnt_data",355,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tpckh_hist1_nullbt_cntr")=355
-	Set gtmtypes("sgmnt_data",356,"name")="sgmnt_data.wc_blocked_tpckh_hist1_nonnullbt_cntr"
-	Set gtmtypes("sgmnt_data",356,"off")=3460
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_jnl_wcsflu_cntr")=355
+	Set gtmtypes("sgmnt_data",356,"name")="sgmnt_data.wc_blocked_t_end_hist_cntr"
+	Set gtmtypes("sgmnt_data",356,"off")=3424
 	Set gtmtypes("sgmnt_data",356,"len")=4
 	Set gtmtypes("sgmnt_data",356,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tpckh_hist1_nonnullbt_cntr")=356
-	Set gtmtypes("sgmnt_data",357,"name")="sgmnt_data.jnl_blocked_writer_lost_cntr"
-	Set gtmtypes("sgmnt_data",357,"off")=3464
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_hist_cntr")=356
+	Set gtmtypes("sgmnt_data",357,"name")="sgmnt_data.wc_blocked_t_end_hist1_nullbt_cntr"
+	Set gtmtypes("sgmnt_data",357,"off")=3428
 	Set gtmtypes("sgmnt_data",357,"len")=4
 	Set gtmtypes("sgmnt_data",357,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","jnl_blocked_writer_lost_cntr")=357
-	Set gtmtypes("sgmnt_data",358,"name")="sgmnt_data.jnl_blocked_writer_stuck_cntr"
-	Set gtmtypes("sgmnt_data",358,"off")=3468
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_hist1_nullbt_cntr")=357
+	Set gtmtypes("sgmnt_data",358,"name")="sgmnt_data.wc_blocked_t_end_hist1_nonnullbt_cntr"
+	Set gtmtypes("sgmnt_data",358,"off")=3432
 	Set gtmtypes("sgmnt_data",358,"len")=4
 	Set gtmtypes("sgmnt_data",358,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","jnl_blocked_writer_stuck_cntr")=358
-	Set gtmtypes("sgmnt_data",359,"name")="sgmnt_data.jnl_blocked_writer_blocked_cntr"
-	Set gtmtypes("sgmnt_data",359,"off")=3472
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_hist1_nonnullbt_cntr")=358
+	Set gtmtypes("sgmnt_data",359,"name")="sgmnt_data.wc_blocked_t_end_bitmap_nullbt_cntr"
+	Set gtmtypes("sgmnt_data",359,"off")=3436
 	Set gtmtypes("sgmnt_data",359,"len")=4
 	Set gtmtypes("sgmnt_data",359,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","jnl_blocked_writer_blocked_cntr")=359
-	Set gtmtypes("sgmnt_data",360,"name")="sgmnt_data.n_jnl_fsyncs_cntr"
-	Set gtmtypes("sgmnt_data",360,"off")=3476
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_bitmap_nullbt_cntr")=359
+	Set gtmtypes("sgmnt_data",360,"name")="sgmnt_data.wc_blocked_t_end_bitmap_nonnullbt_cntr"
+	Set gtmtypes("sgmnt_data",360,"off")=3440
 	Set gtmtypes("sgmnt_data",360,"len")=4
 	Set gtmtypes("sgmnt_data",360,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_jnl_fsyncs_cntr")=360
-	Set gtmtypes("sgmnt_data",361,"name")="sgmnt_data.n_jnl_fsync_tries_cntr"
-	Set gtmtypes("sgmnt_data",361,"off")=3480
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_bitmap_nonnullbt_cntr")=360
+	Set gtmtypes("sgmnt_data",361,"name")="sgmnt_data.wc_blocked_t_end_jnl_cwset_cntr"
+	Set gtmtypes("sgmnt_data",361,"off")=3444
 	Set gtmtypes("sgmnt_data",361,"len")=4
 	Set gtmtypes("sgmnt_data",361,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_jnl_fsync_tries_cntr")=361
-	Set gtmtypes("sgmnt_data",362,"name")="sgmnt_data.n_jnl_fsync_recovers_cntr"
-	Set gtmtypes("sgmnt_data",362,"off")=3484
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_jnl_cwset_cntr")=361
+	Set gtmtypes("sgmnt_data",362,"name")="sgmnt_data.wc_blocked_t_end_jnl_wcsflu_cntr"
+	Set gtmtypes("sgmnt_data",362,"off")=3448
 	Set gtmtypes("sgmnt_data",362,"len")=4
 	Set gtmtypes("sgmnt_data",362,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_jnl_fsync_recovers_cntr")=362
-	Set gtmtypes("sgmnt_data",363,"name")="sgmnt_data.n_db_fsyncs_cntr"
-	Set gtmtypes("sgmnt_data",363,"off")=3488
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_jnl_wcsflu_cntr")=362
+	Set gtmtypes("sgmnt_data",363,"name")="sgmnt_data.db_csh_get_too_many_loops_cntr"
+	Set gtmtypes("sgmnt_data",363,"off")=3452
 	Set gtmtypes("sgmnt_data",363,"len")=4
 	Set gtmtypes("sgmnt_data",363,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_db_fsyncs_cntr")=363
-	Set gtmtypes("sgmnt_data",364,"name")="sgmnt_data.n_db_fsyncs_in_crit_cntr"
-	Set gtmtypes("sgmnt_data",364,"off")=3492
+	Set gtmtypfldindx("sgmnt_data","db_csh_get_too_many_loops_cntr")=363
+	Set gtmtypes("sgmnt_data",364,"name")="sgmnt_data.wc_blocked_tpckh_hist1_nullbt_cntr"
+	Set gtmtypes("sgmnt_data",364,"off")=3456
 	Set gtmtypes("sgmnt_data",364,"len")=4
 	Set gtmtypes("sgmnt_data",364,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_db_fsyncs_in_crit_cntr")=364
-	Set gtmtypes("sgmnt_data",365,"name")="sgmnt_data.n_dbsync_timers_cntr"
-	Set gtmtypes("sgmnt_data",365,"off")=3496
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tpckh_hist1_nullbt_cntr")=364
+	Set gtmtypes("sgmnt_data",365,"name")="sgmnt_data.wc_blocked_tpckh_hist1_nonnullbt_cntr"
+	Set gtmtypes("sgmnt_data",365,"off")=3460
 	Set gtmtypes("sgmnt_data",365,"len")=4
 	Set gtmtypes("sgmnt_data",365,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_dbsync_timers_cntr")=365
-	Set gtmtypes("sgmnt_data",366,"name")="sgmnt_data.n_dbsync_writes_cntr"
-	Set gtmtypes("sgmnt_data",366,"off")=3500
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tpckh_hist1_nonnullbt_cntr")=365
+	Set gtmtypes("sgmnt_data",366,"name")="sgmnt_data.jnl_blocked_writer_lost_cntr"
+	Set gtmtypes("sgmnt_data",366,"off")=3464
 	Set gtmtypes("sgmnt_data",366,"len")=4
 	Set gtmtypes("sgmnt_data",366,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_dbsync_writes_cntr")=366
-	Set gtmtypes("sgmnt_data",367,"name")="sgmnt_data.mutex_queue_full_cntr"
-	Set gtmtypes("sgmnt_data",367,"off")=3504
+	Set gtmtypfldindx("sgmnt_data","jnl_blocked_writer_lost_cntr")=366
+	Set gtmtypes("sgmnt_data",367,"name")="sgmnt_data.jnl_blocked_writer_stuck_cntr"
+	Set gtmtypes("sgmnt_data",367,"off")=3468
 	Set gtmtypes("sgmnt_data",367,"len")=4
 	Set gtmtypes("sgmnt_data",367,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","mutex_queue_full_cntr")=367
-	Set gtmtypes("sgmnt_data",368,"name")="sgmnt_data.wcb_bt_put_cntr"
-	Set gtmtypes("sgmnt_data",368,"off")=3508
+	Set gtmtypfldindx("sgmnt_data","jnl_blocked_writer_stuck_cntr")=367
+	Set gtmtypes("sgmnt_data",368,"name")="sgmnt_data.jnl_blocked_writer_blocked_cntr"
+	Set gtmtypes("sgmnt_data",368,"off")=3472
 	Set gtmtypes("sgmnt_data",368,"len")=4
 	Set gtmtypes("sgmnt_data",368,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_bt_put_cntr")=368
-	Set gtmtypes("sgmnt_data",369,"name")="sgmnt_data.wcb_mutex_salvage_cntr"
-	Set gtmtypes("sgmnt_data",369,"off")=3512
+	Set gtmtypfldindx("sgmnt_data","jnl_blocked_writer_blocked_cntr")=368
+	Set gtmtypes("sgmnt_data",369,"name")="sgmnt_data.n_jnl_fsyncs_cntr"
+	Set gtmtypes("sgmnt_data",369,"off")=3476
 	Set gtmtypes("sgmnt_data",369,"len")=4
 	Set gtmtypes("sgmnt_data",369,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_mutex_salvage_cntr")=369
-	Set gtmtypes("sgmnt_data",370,"name")="sgmnt_data.wcb_tp_grab_crit_cntr"
-	Set gtmtypes("sgmnt_data",370,"off")=3516
+	Set gtmtypfldindx("sgmnt_data","n_jnl_fsyncs_cntr")=369
+	Set gtmtypes("sgmnt_data",370,"name")="sgmnt_data.n_jnl_fsync_tries_cntr"
+	Set gtmtypes("sgmnt_data",370,"off")=3480
 	Set gtmtypes("sgmnt_data",370,"len")=4
 	Set gtmtypes("sgmnt_data",370,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_tp_grab_crit_cntr")=370
-	Set gtmtypes("sgmnt_data",371,"name")="sgmnt_data.wcb_t_end_sysops_nocr_invcr_cntr"
-	Set gtmtypes("sgmnt_data",371,"off")=3520
+	Set gtmtypfldindx("sgmnt_data","n_jnl_fsync_tries_cntr")=370
+	Set gtmtypes("sgmnt_data",371,"name")="sgmnt_data.n_jnl_fsync_recovers_cntr"
+	Set gtmtypes("sgmnt_data",371,"off")=3484
 	Set gtmtypes("sgmnt_data",371,"len")=4
 	Set gtmtypes("sgmnt_data",371,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_nocr_invcr_cntr")=371
-	Set gtmtypes("sgmnt_data",372,"name")="sgmnt_data.wcb_t_end_sysops_cr_invcr_cntr"
-	Set gtmtypes("sgmnt_data",372,"off")=3524
+	Set gtmtypfldindx("sgmnt_data","n_jnl_fsync_recovers_cntr")=371
+	Set gtmtypes("sgmnt_data",372,"name")="sgmnt_data.n_db_fsyncs_cntr"
+	Set gtmtypes("sgmnt_data",372,"off")=3488
 	Set gtmtypes("sgmnt_data",372,"len")=4
 	Set gtmtypes("sgmnt_data",372,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_cr_invcr_cntr")=372
-	Set gtmtypes("sgmnt_data",373,"name")="sgmnt_data.wcb_t_end_sysops_rip_wait_cntr"
-	Set gtmtypes("sgmnt_data",373,"off")=3528
+	Set gtmtypfldindx("sgmnt_data","n_db_fsyncs_cntr")=372
+	Set gtmtypes("sgmnt_data",373,"name")="sgmnt_data.n_db_fsyncs_in_crit_cntr"
+	Set gtmtypes("sgmnt_data",373,"off")=3492
 	Set gtmtypes("sgmnt_data",373,"len")=4
 	Set gtmtypes("sgmnt_data",373,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_rip_wait_cntr")=373
-	Set gtmtypes("sgmnt_data",374,"name")="sgmnt_data.wcb_t_end_sysops_dirtyripwait_cntr"
-	Set gtmtypes("sgmnt_data",374,"off")=3532
+	Set gtmtypfldindx("sgmnt_data","n_db_fsyncs_in_crit_cntr")=373
+	Set gtmtypes("sgmnt_data",374,"name")="sgmnt_data.n_dbsync_timers_cntr"
+	Set gtmtypes("sgmnt_data",374,"off")=3496
 	Set gtmtypes("sgmnt_data",374,"len")=4
 	Set gtmtypes("sgmnt_data",374,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirtyripwait_cntr")=374
-	Set gtmtypes("sgmnt_data",375,"name")="sgmnt_data.wcb_gds_rundown_cntr"
-	Set gtmtypes("sgmnt_data",375,"off")=3536
+	Set gtmtypfldindx("sgmnt_data","n_dbsync_timers_cntr")=374
+	Set gtmtypes("sgmnt_data",375,"name")="sgmnt_data.n_dbsync_writes_cntr"
+	Set gtmtypes("sgmnt_data",375,"off")=3500
 	Set gtmtypes("sgmnt_data",375,"len")=4
 	Set gtmtypes("sgmnt_data",375,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_gds_rundown_cntr")=375
-	Set gtmtypes("sgmnt_data",376,"name")="sgmnt_data.wcb_wcs_flu1_cntr"
-	Set gtmtypes("sgmnt_data",376,"off")=3540
+	Set gtmtypfldindx("sgmnt_data","n_dbsync_writes_cntr")=375
+	Set gtmtypes("sgmnt_data",376,"name")="sgmnt_data.mutex_queue_full_cntr"
+	Set gtmtypes("sgmnt_data",376,"off")=3504
 	Set gtmtypes("sgmnt_data",376,"len")=4
 	Set gtmtypes("sgmnt_data",376,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_wcs_flu1_cntr")=376
-	Set gtmtypes("sgmnt_data",377,"name")="sgmnt_data.wcb_mu_back_cntr"
-	Set gtmtypes("sgmnt_data",377,"off")=3544
+	Set gtmtypfldindx("sgmnt_data","mutex_queue_full_cntr")=376
+	Set gtmtypes("sgmnt_data",377,"name")="sgmnt_data.wcb_bt_put_cntr"
+	Set gtmtypes("sgmnt_data",377,"off")=3508
 	Set gtmtypes("sgmnt_data",377,"len")=4
 	Set gtmtypes("sgmnt_data",377,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_mu_back_cntr")=377
-	Set gtmtypes("sgmnt_data",378,"name")="sgmnt_data.wcb_t_end_sysops_dirty_invcr_cntr"
-	Set gtmtypes("sgmnt_data",378,"off")=3548
+	Set gtmtypfldindx("sgmnt_data","wcb_bt_put_cntr")=377
+	Set gtmtypes("sgmnt_data",378,"name")="sgmnt_data.wcb_mutex_salvage_cntr"
+	Set gtmtypes("sgmnt_data",378,"off")=3512
 	Set gtmtypes("sgmnt_data",378,"len")=4
 	Set gtmtypes("sgmnt_data",378,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirty_invcr_cntr")=378
-	Set gtmtypes("sgmnt_data",379,"name")="sgmnt_data.wcb_t_end_sysops_wtfini_fail_cntr"
-	Set gtmtypes("sgmnt_data",379,"off")=3552
+	Set gtmtypfldindx("sgmnt_data","wcb_mutex_salvage_cntr")=378
+	Set gtmtypes("sgmnt_data",379,"name")="sgmnt_data.wcb_tp_grab_crit_cntr"
+	Set gtmtypes("sgmnt_data",379,"off")=3516
 	Set gtmtypes("sgmnt_data",379,"len")=4
 	Set gtmtypes("sgmnt_data",379,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_wtfini_fail_cntr")=379
-	Set gtmtypes("sgmnt_data",380,"name")="sgmnt_data.wcb_t_end_sysops_twin_stuck_cntr"
-	Set gtmtypes("sgmnt_data",380,"off")=3556
+	Set gtmtypfldindx("sgmnt_data","wcb_tp_grab_crit_cntr")=379
+	Set gtmtypes("sgmnt_data",380,"name")="sgmnt_data.wcb_t_end_sysops_nocr_invcr_cntr"
+	Set gtmtypes("sgmnt_data",380,"off")=3520
 	Set gtmtypes("sgmnt_data",380,"len")=4
 	Set gtmtypes("sgmnt_data",380,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_twin_stuck_cntr")=380
-	Set gtmtypes("sgmnt_data",381,"name")="sgmnt_data.db_csh_getn_wrt_latch_stuck_cntr"
-	Set gtmtypes("sgmnt_data",381,"off")=3560
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_nocr_invcr_cntr")=380
+	Set gtmtypes("sgmnt_data",381,"name")="sgmnt_data.wcb_t_end_sysops_cr_invcr_cntr"
+	Set gtmtypes("sgmnt_data",381,"off")=3524
 	Set gtmtypes("sgmnt_data",381,"len")=4
 	Set gtmtypes("sgmnt_data",381,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","db_csh_getn_wrt_latch_stuck_cntr")=381
-	Set gtmtypes("sgmnt_data",382,"name")="sgmnt_data.wcb_secshr_db_clnup_now_crit_cntr"
-	Set gtmtypes("sgmnt_data",382,"off")=3564
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_cr_invcr_cntr")=381
+	Set gtmtypes("sgmnt_data",382,"name")="sgmnt_data.wcb_t_end_sysops_rip_wait_cntr"
+	Set gtmtypes("sgmnt_data",382,"off")=3528
 	Set gtmtypes("sgmnt_data",382,"len")=4
 	Set gtmtypes("sgmnt_data",382,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_secshr_db_clnup_now_crit_cntr")=382
-	Set gtmtypes("sgmnt_data",383,"name")="sgmnt_data.wc_blocked_t_qread_bad_bt_index1_cntr"
-	Set gtmtypes("sgmnt_data",383,"off")=3568
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_rip_wait_cntr")=382
+	Set gtmtypes("sgmnt_data",383,"name")="sgmnt_data.wcb_t_end_sysops_dirtyripwait_cntr"
+	Set gtmtypes("sgmnt_data",383,"off")=3532
 	Set gtmtypes("sgmnt_data",383,"len")=4
 	Set gtmtypes("sgmnt_data",383,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_bad_bt_index1_cntr")=383
-	Set gtmtypes("sgmnt_data",384,"name")="sgmnt_data.wc_blocked_t_qread_bad_bt_index2_cntr"
-	Set gtmtypes("sgmnt_data",384,"off")=3572
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirtyripwait_cntr")=383
+	Set gtmtypes("sgmnt_data",384,"name")="sgmnt_data.wcb_gds_rundown_cntr"
+	Set gtmtypes("sgmnt_data",384,"off")=3536
 	Set gtmtypes("sgmnt_data",384,"len")=4
 	Set gtmtypes("sgmnt_data",384,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_bad_bt_index2_cntr")=384
-	Set gtmtypes("sgmnt_data",385,"name")="sgmnt_data.wc_blocked_t_end_crbtmismatch1_cntr"
-	Set gtmtypes("sgmnt_data",385,"off")=3576
+	Set gtmtypfldindx("sgmnt_data","wcb_gds_rundown_cntr")=384
+	Set gtmtypes("sgmnt_data",385,"name")="sgmnt_data.wcb_wcs_flu1_cntr"
+	Set gtmtypes("sgmnt_data",385,"off")=3540
 	Set gtmtypes("sgmnt_data",385,"len")=4
 	Set gtmtypes("sgmnt_data",385,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_crbtmismatch1_cntr")=385
-	Set gtmtypes("sgmnt_data",386,"name")="sgmnt_data.wc_blocked_t_end_crbtmismatch2_cntr"
-	Set gtmtypes("sgmnt_data",386,"off")=3580
+	Set gtmtypfldindx("sgmnt_data","wcb_wcs_flu1_cntr")=385
+	Set gtmtypes("sgmnt_data",386,"name")="sgmnt_data.wcb_mu_back_cntr"
+	Set gtmtypes("sgmnt_data",386,"off")=3544
 	Set gtmtypes("sgmnt_data",386,"len")=4
 	Set gtmtypes("sgmnt_data",386,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_crbtmismatch2_cntr")=386
-	Set gtmtypes("sgmnt_data",387,"name")="sgmnt_data.wc_blocked_t_end_crbtmismatch3_cntr"
-	Set gtmtypes("sgmnt_data",387,"off")=3584
+	Set gtmtypfldindx("sgmnt_data","wcb_mu_back_cntr")=386
+	Set gtmtypes("sgmnt_data",387,"name")="sgmnt_data.wcb_t_end_sysops_dirty_invcr_cntr"
+	Set gtmtypes("sgmnt_data",387,"off")=3548
 	Set gtmtypes("sgmnt_data",387,"len")=4
 	Set gtmtypes("sgmnt_data",387,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_crbtmismatch3_cntr")=387
-	Set gtmtypes("sgmnt_data",388,"name")="sgmnt_data.wc_blocked_tp_tend_crbtmismatch1_cntr"
-	Set gtmtypes("sgmnt_data",388,"off")=3588
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirty_invcr_cntr")=387
+	Set gtmtypes("sgmnt_data",388,"name")="sgmnt_data.wcb_t_end_sysops_wtfini_fail_cntr"
+	Set gtmtypes("sgmnt_data",388,"off")=3552
 	Set gtmtypes("sgmnt_data",388,"len")=4
 	Set gtmtypes("sgmnt_data",388,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_crbtmismatch1_cntr")=388
-	Set gtmtypes("sgmnt_data",389,"name")="sgmnt_data.wc_blocked_tp_tend_crbtmismatch2_cntr"
-	Set gtmtypes("sgmnt_data",389,"off")=3592
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_wtfini_fail_cntr")=388
+	Set gtmtypes("sgmnt_data",389,"name")="sgmnt_data.wcb_t_end_sysops_twin_stuck_cntr"
+	Set gtmtypes("sgmnt_data",389,"off")=3556
 	Set gtmtypes("sgmnt_data",389,"len")=4
 	Set gtmtypes("sgmnt_data",389,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_crbtmismatch2_cntr")=389
-	Set gtmtypes("sgmnt_data",390,"name")="sgmnt_data.wc_blocked_tp_tend_crbtmismatch3_cntr"
-	Set gtmtypes("sgmnt_data",390,"off")=3596
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_twin_stuck_cntr")=389
+	Set gtmtypes("sgmnt_data",390,"name")="sgmnt_data.db_csh_getn_wrt_latch_stuck_cntr"
+	Set gtmtypes("sgmnt_data",390,"off")=3560
 	Set gtmtypes("sgmnt_data",390,"len")=4
 	Set gtmtypes("sgmnt_data",390,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_crbtmismatch3_cntr")=390
-	Set gtmtypes("sgmnt_data",391,"name")="sgmnt_data.wc_blocked_wcs_wtstart_bad_cr_cntr"
-	Set gtmtypes("sgmnt_data",391,"off")=3600
+	Set gtmtypfldindx("sgmnt_data","db_csh_getn_wrt_latch_stuck_cntr")=390
+	Set gtmtypes("sgmnt_data",391,"name")="sgmnt_data.wcb_secshr_db_clnup_now_crit_cntr"
+	Set gtmtypes("sgmnt_data",391,"off")=3564
 	Set gtmtypes("sgmnt_data",391,"len")=4
 	Set gtmtypes("sgmnt_data",391,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_wtstart_bad_cr_cntr")=391
-	Set gtmtypes("sgmnt_data",392,"name")="sgmnt_data.wc_blocked_wcs_wtfini_bad_cr_cntr"
-	Set gtmtypes("sgmnt_data",392,"off")=3604
+	Set gtmtypfldindx("sgmnt_data","wcb_secshr_db_clnup_now_crit_cntr")=391
+	Set gtmtypes("sgmnt_data",392,"name")="sgmnt_data.wc_blocked_t_qread_bad_bt_index1_cntr"
+	Set gtmtypes("sgmnt_data",392,"off")=3568
 	Set gtmtypes("sgmnt_data",392,"len")=4
 	Set gtmtypes("sgmnt_data",392,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_wtfini_bad_cr_cntr")=392
-	Set gtmtypes("sgmnt_data",393,"name")="sgmnt_data.wc_blocked_bt_get_cntr"
-	Set gtmtypes("sgmnt_data",393,"off")=3608
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_bad_bt_index1_cntr")=392
+	Set gtmtypes("sgmnt_data",393,"name")="sgmnt_data.wc_blocked_t_qread_bad_bt_index2_cntr"
+	Set gtmtypes("sgmnt_data",393,"off")=3572
 	Set gtmtypes("sgmnt_data",393,"len")=4
 	Set gtmtypes("sgmnt_data",393,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_bt_get_cntr")=393
-	Set gtmtypes("sgmnt_data",394,"name")="sgmnt_data.wc_blocked_wcs_cdb_sc_final_retry_cntr"
-	Set gtmtypes("sgmnt_data",394,"off")=3612
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_bad_bt_index2_cntr")=393
+	Set gtmtypes("sgmnt_data",394,"name")="sgmnt_data.wc_blocked_t_end_crbtmismatch1_cntr"
+	Set gtmtypes("sgmnt_data",394,"off")=3576
 	Set gtmtypes("sgmnt_data",394,"len")=4
 	Set gtmtypes("sgmnt_data",394,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_cdb_sc_final_retry_cntr")=394
-	Set gtmtypes("sgmnt_data",395,"name")="sgmnt_data.wcb_bg_update_lckfail1_cntr"
-	Set gtmtypes("sgmnt_data",395,"off")=3616
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_crbtmismatch1_cntr")=394
+	Set gtmtypes("sgmnt_data",395,"name")="sgmnt_data.wc_blocked_t_end_crbtmismatch2_cntr"
+	Set gtmtypes("sgmnt_data",395,"off")=3580
 	Set gtmtypes("sgmnt_data",395,"len")=4
 	Set gtmtypes("sgmnt_data",395,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_bg_update_lckfail1_cntr")=395
-	Set gtmtypes("sgmnt_data",396,"name")="sgmnt_data.wcb_bg_update_lckfail2_cntr"
-	Set gtmtypes("sgmnt_data",396,"off")=3620
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_crbtmismatch2_cntr")=395
+	Set gtmtypes("sgmnt_data",396,"name")="sgmnt_data.wc_blocked_t_end_crbtmismatch3_cntr"
+	Set gtmtypes("sgmnt_data",396,"off")=3584
 	Set gtmtypes("sgmnt_data",396,"len")=4
 	Set gtmtypes("sgmnt_data",396,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_bg_update_lckfail2_cntr")=396
-	Set gtmtypes("sgmnt_data",397,"name")="sgmnt_data.wcb_wtstart_lckfail1_cntr"
-	Set gtmtypes("sgmnt_data",397,"off")=3624
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_crbtmismatch3_cntr")=396
+	Set gtmtypes("sgmnt_data",397,"name")="sgmnt_data.wc_blocked_tp_tend_crbtmismatch1_cntr"
+	Set gtmtypes("sgmnt_data",397,"off")=3588
 	Set gtmtypes("sgmnt_data",397,"len")=4
 	Set gtmtypes("sgmnt_data",397,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail1_cntr")=397
-	Set gtmtypes("sgmnt_data",398,"name")="sgmnt_data.wcb_wtstart_lckfail2_cntr"
-	Set gtmtypes("sgmnt_data",398,"off")=3628
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_crbtmismatch1_cntr")=397
+	Set gtmtypes("sgmnt_data",398,"name")="sgmnt_data.wc_blocked_tp_tend_crbtmismatch2_cntr"
+	Set gtmtypes("sgmnt_data",398,"off")=3592
 	Set gtmtypes("sgmnt_data",398,"len")=4
 	Set gtmtypes("sgmnt_data",398,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail2_cntr")=398
-	Set gtmtypes("sgmnt_data",399,"name")="sgmnt_data.wcb_wtstart_lckfail3_cntr"
-	Set gtmtypes("sgmnt_data",399,"off")=3632
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_crbtmismatch2_cntr")=398
+	Set gtmtypes("sgmnt_data",399,"name")="sgmnt_data.wc_blocked_tp_tend_crbtmismatch3_cntr"
+	Set gtmtypes("sgmnt_data",399,"off")=3596
 	Set gtmtypes("sgmnt_data",399,"len")=4
 	Set gtmtypes("sgmnt_data",399,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail3_cntr")=399
-	Set gtmtypes("sgmnt_data",400,"name")="sgmnt_data.wcb_wtstart_lckfail4_cntr"
-	Set gtmtypes("sgmnt_data",400,"off")=3636
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_crbtmismatch3_cntr")=399
+	Set gtmtypes("sgmnt_data",400,"name")="sgmnt_data.wc_blocked_wcs_wtstart_bad_cr_cntr"
+	Set gtmtypes("sgmnt_data",400,"off")=3600
 	Set gtmtypes("sgmnt_data",400,"len")=4
 	Set gtmtypes("sgmnt_data",400,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail4_cntr")=400
-	Set gtmtypes("sgmnt_data",401,"name")="sgmnt_data.wcb_wtfini_lckfail1_cntr"
-	Set gtmtypes("sgmnt_data",401,"off")=3640
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_wtstart_bad_cr_cntr")=400
+	Set gtmtypes("sgmnt_data",401,"name")="sgmnt_data.wc_blocked_wcs_wtfini_bad_cr_cntr"
+	Set gtmtypes("sgmnt_data",401,"off")=3604
 	Set gtmtypes("sgmnt_data",401,"len")=4
 	Set gtmtypes("sgmnt_data",401,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail1_cntr")=401
-	Set gtmtypes("sgmnt_data",402,"name")="sgmnt_data.wcb_wtfini_lckfail2_cntr"
-	Set gtmtypes("sgmnt_data",402,"off")=3644
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_wtfini_bad_cr_cntr")=401
+	Set gtmtypes("sgmnt_data",402,"name")="sgmnt_data.wc_blocked_bt_get_cntr"
+	Set gtmtypes("sgmnt_data",402,"off")=3608
 	Set gtmtypes("sgmnt_data",402,"len")=4
 	Set gtmtypes("sgmnt_data",402,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail2_cntr")=402
-	Set gtmtypes("sgmnt_data",403,"name")="sgmnt_data.wcb_wtfini_lckfail3_cntr"
-	Set gtmtypes("sgmnt_data",403,"off")=3648
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_bt_get_cntr")=402
+	Set gtmtypes("sgmnt_data",403,"name")="sgmnt_data.wc_blocked_wcs_cdb_sc_final_retry_cntr"
+	Set gtmtypes("sgmnt_data",403,"off")=3612
 	Set gtmtypes("sgmnt_data",403,"len")=4
 	Set gtmtypes("sgmnt_data",403,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail3_cntr")=403
-	Set gtmtypes("sgmnt_data",404,"name")="sgmnt_data.wcb_wtfini_lckfail4_cntr"
-	Set gtmtypes("sgmnt_data",404,"off")=3652
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_cdb_sc_final_retry_cntr")=403
+	Set gtmtypes("sgmnt_data",404,"name")="sgmnt_data.wcb_bg_update_lckfail1_cntr"
+	Set gtmtypes("sgmnt_data",404,"off")=3616
 	Set gtmtypes("sgmnt_data",404,"len")=4
 	Set gtmtypes("sgmnt_data",404,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail4_cntr")=404
-	Set gtmtypes("sgmnt_data",405,"name")="sgmnt_data.wcb_t_end_sysops_dirtystuck1_cntr"
-	Set gtmtypes("sgmnt_data",405,"off")=3656
+	Set gtmtypfldindx("sgmnt_data","wcb_bg_update_lckfail1_cntr")=404
+	Set gtmtypes("sgmnt_data",405,"name")="sgmnt_data.wcb_bg_update_lckfail2_cntr"
+	Set gtmtypes("sgmnt_data",405,"off")=3620
 	Set gtmtypes("sgmnt_data",405,"len")=4
 	Set gtmtypes("sgmnt_data",405,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirtystuck1_cntr")=405
-	Set gtmtypes("sgmnt_data",406,"name")="sgmnt_data.wcb_t_end_sysops_dirtystuck2_cntr"
-	Set gtmtypes("sgmnt_data",406,"off")=3660
+	Set gtmtypfldindx("sgmnt_data","wcb_bg_update_lckfail2_cntr")=405
+	Set gtmtypes("sgmnt_data",406,"name")="sgmnt_data.wcb_wtstart_lckfail1_cntr"
+	Set gtmtypes("sgmnt_data",406,"off")=3624
 	Set gtmtypes("sgmnt_data",406,"len")=4
 	Set gtmtypes("sgmnt_data",406,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirtystuck2_cntr")=406
-	Set gtmtypes("sgmnt_data",407,"name")="sgmnt_data.wcb_secshr_db_clnup_wbuf_dqd_cntr"
-	Set gtmtypes("sgmnt_data",407,"off")=3664
+	Set gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail1_cntr")=406
+	Set gtmtypes("sgmnt_data",407,"name")="sgmnt_data.wcb_wtstart_lckfail2_cntr"
+	Set gtmtypes("sgmnt_data",407,"off")=3628
 	Set gtmtypes("sgmnt_data",407,"len")=4
 	Set gtmtypes("sgmnt_data",407,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_secshr_db_clnup_wbuf_dqd_cntr")=407
-	Set gtmtypes("sgmnt_data",408,"name")="sgmnt_data.dwngrd_refmts_syncio_cntr"
-	Set gtmtypes("sgmnt_data",408,"off")=3668
+	Set gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail2_cntr")=407
+	Set gtmtypes("sgmnt_data",408,"name")="sgmnt_data.wcb_wtstart_lckfail3_cntr"
+	Set gtmtypes("sgmnt_data",408,"off")=3632
 	Set gtmtypes("sgmnt_data",408,"len")=4
 	Set gtmtypes("sgmnt_data",408,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","dwngrd_refmts_syncio_cntr")=408
-	Set gtmtypes("sgmnt_data",409,"name")="sgmnt_data.dwngrd_refmts_asyncio_cntr"
-	Set gtmtypes("sgmnt_data",409,"off")=3672
+	Set gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail3_cntr")=408
+	Set gtmtypes("sgmnt_data",409,"name")="sgmnt_data.wcb_wtstart_lckfail4_cntr"
+	Set gtmtypes("sgmnt_data",409,"off")=3636
 	Set gtmtypes("sgmnt_data",409,"len")=4
 	Set gtmtypes("sgmnt_data",409,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","dwngrd_refmts_asyncio_cntr")=409
-	Set gtmtypes("sgmnt_data",410,"name")="sgmnt_data.shmpool_refmt_harvests_cntr"
-	Set gtmtypes("sgmnt_data",410,"off")=3676
+	Set gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail4_cntr")=409
+	Set gtmtypes("sgmnt_data",410,"name")="sgmnt_data.wcb_wtfini_lckfail1_cntr"
+	Set gtmtypes("sgmnt_data",410,"off")=3640
 	Set gtmtypes("sgmnt_data",410,"len")=4
 	Set gtmtypes("sgmnt_data",410,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","shmpool_refmt_harvests_cntr")=410
-	Set gtmtypes("sgmnt_data",411,"name")="sgmnt_data.shmpool_recovery_cntr"
-	Set gtmtypes("sgmnt_data",411,"off")=3680
+	Set gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail1_cntr")=410
+	Set gtmtypes("sgmnt_data",411,"name")="sgmnt_data.wcb_wtfini_lckfail2_cntr"
+	Set gtmtypes("sgmnt_data",411,"off")=3644
 	Set gtmtypes("sgmnt_data",411,"len")=4
 	Set gtmtypes("sgmnt_data",411,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","shmpool_recovery_cntr")=411
-	Set gtmtypes("sgmnt_data",412,"name")="sgmnt_data.shmpool_blkd_by_sdc_cntr"
-	Set gtmtypes("sgmnt_data",412,"off")=3684
+	Set gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail2_cntr")=411
+	Set gtmtypes("sgmnt_data",412,"name")="sgmnt_data.wcb_wtfini_lckfail3_cntr"
+	Set gtmtypes("sgmnt_data",412,"off")=3648
 	Set gtmtypes("sgmnt_data",412,"len")=4
 	Set gtmtypes("sgmnt_data",412,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","shmpool_blkd_by_sdc_cntr")=412
-	Set gtmtypes("sgmnt_data",413,"name")="sgmnt_data.shmpool_alloc_bbflush_cntr"
-	Set gtmtypes("sgmnt_data",413,"off")=3688
+	Set gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail3_cntr")=412
+	Set gtmtypes("sgmnt_data",413,"name")="sgmnt_data.wcb_wtfini_lckfail4_cntr"
+	Set gtmtypes("sgmnt_data",413,"off")=3652
 	Set gtmtypes("sgmnt_data",413,"len")=4
 	Set gtmtypes("sgmnt_data",413,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","shmpool_alloc_bbflush_cntr")=413
-	Set gtmtypes("sgmnt_data",414,"name")="sgmnt_data.refmt_hvst_blk_released_replaced_cntr"
-	Set gtmtypes("sgmnt_data",414,"off")=3692
+	Set gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail4_cntr")=413
+	Set gtmtypes("sgmnt_data",414,"name")="sgmnt_data.wcb_t_end_sysops_dirtystuck1_cntr"
+	Set gtmtypes("sgmnt_data",414,"off")=3656
 	Set gtmtypes("sgmnt_data",414,"len")=4
 	Set gtmtypes("sgmnt_data",414,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","refmt_hvst_blk_released_replaced_cntr")=414
-	Set gtmtypes("sgmnt_data",415,"name")="sgmnt_data.refmt_hvst_blk_released_io_complete_cntr"
-	Set gtmtypes("sgmnt_data",415,"off")=3696
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirtystuck1_cntr")=414
+	Set gtmtypes("sgmnt_data",415,"name")="sgmnt_data.wcb_t_end_sysops_dirtystuck2_cntr"
+	Set gtmtypes("sgmnt_data",415,"off")=3660
 	Set gtmtypes("sgmnt_data",415,"len")=4
 	Set gtmtypes("sgmnt_data",415,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","refmt_hvst_blk_released_io_complete_cntr")=415
-	Set gtmtypes("sgmnt_data",416,"name")="sgmnt_data.refmt_hvst_blk_kept_cntr"
-	Set gtmtypes("sgmnt_data",416,"off")=3700
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirtystuck2_cntr")=415
+	Set gtmtypes("sgmnt_data",416,"name")="sgmnt_data.wcb_secshr_db_clnup_wbuf_dqd_cntr"
+	Set gtmtypes("sgmnt_data",416,"off")=3664
 	Set gtmtypes("sgmnt_data",416,"len")=4
 	Set gtmtypes("sgmnt_data",416,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","refmt_hvst_blk_kept_cntr")=416
-	Set gtmtypes("sgmnt_data",417,"name")="sgmnt_data.refmt_hvst_blk_ignored_cntr"
-	Set gtmtypes("sgmnt_data",417,"off")=3704
+	Set gtmtypfldindx("sgmnt_data","wcb_secshr_db_clnup_wbuf_dqd_cntr")=416
+	Set gtmtypes("sgmnt_data",417,"name")="sgmnt_data.dwngrd_refmts_syncio_cntr"
+	Set gtmtypes("sgmnt_data",417,"off")=3668
 	Set gtmtypes("sgmnt_data",417,"len")=4
 	Set gtmtypes("sgmnt_data",417,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","refmt_hvst_blk_ignored_cntr")=417
-	Set gtmtypes("sgmnt_data",418,"name")="sgmnt_data.refmt_blk_chk_blk_freed_cntr"
-	Set gtmtypes("sgmnt_data",418,"off")=3708
+	Set gtmtypfldindx("sgmnt_data","dwngrd_refmts_syncio_cntr")=417
+	Set gtmtypes("sgmnt_data",418,"name")="sgmnt_data.dwngrd_refmts_asyncio_cntr"
+	Set gtmtypes("sgmnt_data",418,"off")=3672
 	Set gtmtypes("sgmnt_data",418,"len")=4
 	Set gtmtypes("sgmnt_data",418,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","refmt_blk_chk_blk_freed_cntr")=418
-	Set gtmtypes("sgmnt_data",419,"name")="sgmnt_data.refmt_blk_chk_blk_kept_cntr"
-	Set gtmtypes("sgmnt_data",419,"off")=3712
+	Set gtmtypfldindx("sgmnt_data","dwngrd_refmts_asyncio_cntr")=418
+	Set gtmtypes("sgmnt_data",419,"name")="sgmnt_data.shmpool_refmt_harvests_cntr"
+	Set gtmtypes("sgmnt_data",419,"off")=3676
 	Set gtmtypes("sgmnt_data",419,"len")=4
 	Set gtmtypes("sgmnt_data",419,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","refmt_blk_chk_blk_kept_cntr")=419
-	Set gtmtypes("sgmnt_data",420,"name")="sgmnt_data.active_lvl_trigger_cntr"
-	Set gtmtypes("sgmnt_data",420,"off")=3716
+	Set gtmtypfldindx("sgmnt_data","shmpool_refmt_harvests_cntr")=419
+	Set gtmtypes("sgmnt_data",420,"name")="sgmnt_data.shmpool_recovery_cntr"
+	Set gtmtypes("sgmnt_data",420,"off")=3680
 	Set gtmtypes("sgmnt_data",420,"len")=4
 	Set gtmtypes("sgmnt_data",420,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","active_lvl_trigger_cntr")=420
-	Set gtmtypes("sgmnt_data",421,"name")="sgmnt_data.new_buff_cntr"
-	Set gtmtypes("sgmnt_data",421,"off")=3720
+	Set gtmtypfldindx("sgmnt_data","shmpool_recovery_cntr")=420
+	Set gtmtypes("sgmnt_data",421,"name")="sgmnt_data.shmpool_blkd_by_sdc_cntr"
+	Set gtmtypes("sgmnt_data",421,"off")=3684
 	Set gtmtypes("sgmnt_data",421,"len")=4
 	Set gtmtypes("sgmnt_data",421,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","new_buff_cntr")=421
-	Set gtmtypes("sgmnt_data",422,"name")="sgmnt_data.phase2_commit_wait_sleep_in_crit_cntr"
-	Set gtmtypes("sgmnt_data",422,"off")=3724
+	Set gtmtypfldindx("sgmnt_data","shmpool_blkd_by_sdc_cntr")=421
+	Set gtmtypes("sgmnt_data",422,"name")="sgmnt_data.shmpool_alloc_bbflush_cntr"
+	Set gtmtypes("sgmnt_data",422,"off")=3688
 	Set gtmtypes("sgmnt_data",422,"len")=4
 	Set gtmtypes("sgmnt_data",422,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","phase2_commit_wait_sleep_in_crit_cntr")=422
-	Set gtmtypes("sgmnt_data",423,"name")="sgmnt_data.phase2_commit_wait_sleep_no_crit_cntr"
-	Set gtmtypes("sgmnt_data",423,"off")=3728
+	Set gtmtypfldindx("sgmnt_data","shmpool_alloc_bbflush_cntr")=422
+	Set gtmtypes("sgmnt_data",423,"name")="sgmnt_data.refmt_hvst_blk_released_replaced_cntr"
+	Set gtmtypes("sgmnt_data",423,"off")=3692
 	Set gtmtypes("sgmnt_data",423,"len")=4
 	Set gtmtypes("sgmnt_data",423,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","phase2_commit_wait_sleep_no_crit_cntr")=423
-	Set gtmtypes("sgmnt_data",424,"name")="sgmnt_data.phase2_commit_wait_pidcnt_cntr"
-	Set gtmtypes("sgmnt_data",424,"off")=3732
+	Set gtmtypfldindx("sgmnt_data","refmt_hvst_blk_released_replaced_cntr")=423
+	Set gtmtypes("sgmnt_data",424,"name")="sgmnt_data.refmt_hvst_blk_released_io_complete_cntr"
+	Set gtmtypes("sgmnt_data",424,"off")=3696
 	Set gtmtypes("sgmnt_data",424,"len")=4
 	Set gtmtypes("sgmnt_data",424,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","phase2_commit_wait_pidcnt_cntr")=424
-	Set gtmtypes("sgmnt_data",425,"name")="sgmnt_data.wcb_t_end_sysops_intend_wait_cntr"
-	Set gtmtypes("sgmnt_data",425,"off")=3736
+	Set gtmtypfldindx("sgmnt_data","refmt_hvst_blk_released_io_complete_cntr")=424
+	Set gtmtypes("sgmnt_data",425,"name")="sgmnt_data.refmt_hvst_blk_kept_cntr"
+	Set gtmtypes("sgmnt_data",425,"off")=3700
 	Set gtmtypes("sgmnt_data",425,"len")=4
 	Set gtmtypes("sgmnt_data",425,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_intend_wait_cntr")=425
-	Set gtmtypes("sgmnt_data",426,"name")="sgmnt_data.wcb_secshr_db_clnup_phase2_clnup_cntr"
-	Set gtmtypes("sgmnt_data",426,"off")=3740
+	Set gtmtypfldindx("sgmnt_data","refmt_hvst_blk_kept_cntr")=425
+	Set gtmtypes("sgmnt_data",426,"name")="sgmnt_data.refmt_hvst_blk_ignored_cntr"
+	Set gtmtypes("sgmnt_data",426,"off")=3704
 	Set gtmtypes("sgmnt_data",426,"len")=4
 	Set gtmtypes("sgmnt_data",426,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_secshr_db_clnup_phase2_clnup_cntr")=426
-	Set gtmtypes("sgmnt_data",427,"name")="sgmnt_data.wcb_phase2_commit_wait_cntr"
-	Set gtmtypes("sgmnt_data",427,"off")=3744
+	Set gtmtypfldindx("sgmnt_data","refmt_hvst_blk_ignored_cntr")=426
+	Set gtmtypes("sgmnt_data",427,"name")="sgmnt_data.refmt_blk_chk_blk_freed_cntr"
+	Set gtmtypes("sgmnt_data",427,"off")=3708
 	Set gtmtypes("sgmnt_data",427,"len")=4
 	Set gtmtypes("sgmnt_data",427,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_phase2_commit_wait_cntr")=427
-	Set gtmtypes("sgmnt_data",428,"name")="sgmnt_data.recompute_upd_array_calls_cntr"
-	Set gtmtypes("sgmnt_data",428,"off")=3748
+	Set gtmtypfldindx("sgmnt_data","refmt_blk_chk_blk_freed_cntr")=427
+	Set gtmtypes("sgmnt_data",428,"name")="sgmnt_data.refmt_blk_chk_blk_kept_cntr"
+	Set gtmtypes("sgmnt_data",428,"off")=3712
 	Set gtmtypes("sgmnt_data",428,"len")=4
 	Set gtmtypes("sgmnt_data",428,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_calls_cntr")=428
-	Set gtmtypes("sgmnt_data",429,"name")="sgmnt_data.recompute_upd_array_rip_cntr"
-	Set gtmtypes("sgmnt_data",429,"off")=3752
+	Set gtmtypfldindx("sgmnt_data","refmt_blk_chk_blk_kept_cntr")=428
+	Set gtmtypes("sgmnt_data",429,"name")="sgmnt_data.active_lvl_trigger_cntr"
+	Set gtmtypes("sgmnt_data",429,"off")=3716
 	Set gtmtypes("sgmnt_data",429,"len")=4
 	Set gtmtypes("sgmnt_data",429,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_rip_cntr")=429
-	Set gtmtypes("sgmnt_data",430,"name")="sgmnt_data.recompute_upd_array_in_tend_cntr"
-	Set gtmtypes("sgmnt_data",430,"off")=3756
+	Set gtmtypfldindx("sgmnt_data","active_lvl_trigger_cntr")=429
+	Set gtmtypes("sgmnt_data",430,"name")="sgmnt_data.new_buff_cntr"
+	Set gtmtypes("sgmnt_data",430,"off")=3720
 	Set gtmtypes("sgmnt_data",430,"len")=4
 	Set gtmtypes("sgmnt_data",430,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_in_tend_cntr")=430
-	Set gtmtypes("sgmnt_data",431,"name")="sgmnt_data.recompute_upd_array_search_blk_cntr"
-	Set gtmtypes("sgmnt_data",431,"off")=3760
+	Set gtmtypfldindx("sgmnt_data","new_buff_cntr")=430
+	Set gtmtypes("sgmnt_data",431,"name")="sgmnt_data.phase2_commit_wait_sleep_in_crit_cntr"
+	Set gtmtypes("sgmnt_data",431,"off")=3724
 	Set gtmtypes("sgmnt_data",431,"len")=4
 	Set gtmtypes("sgmnt_data",431,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_search_blk_cntr")=431
-	Set gtmtypes("sgmnt_data",432,"name")="sgmnt_data.recompute_upd_array_new_rec_cntr"
-	Set gtmtypes("sgmnt_data",432,"off")=3764
+	Set gtmtypfldindx("sgmnt_data","phase2_commit_wait_sleep_in_crit_cntr")=431
+	Set gtmtypes("sgmnt_data",432,"name")="sgmnt_data.phase2_commit_wait_sleep_no_crit_cntr"
+	Set gtmtypes("sgmnt_data",432,"off")=3728
 	Set gtmtypes("sgmnt_data",432,"len")=4
 	Set gtmtypes("sgmnt_data",432,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_new_rec_cntr")=432
-	Set gtmtypes("sgmnt_data",433,"name")="sgmnt_data.recompute_upd_array_rec_size_cntr"
-	Set gtmtypes("sgmnt_data",433,"off")=3768
+	Set gtmtypfldindx("sgmnt_data","phase2_commit_wait_sleep_no_crit_cntr")=432
+	Set gtmtypes("sgmnt_data",433,"name")="sgmnt_data.phase2_commit_wait_pidcnt_cntr"
+	Set gtmtypes("sgmnt_data",433,"off")=3732
 	Set gtmtypes("sgmnt_data",433,"len")=4
 	Set gtmtypes("sgmnt_data",433,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_rec_size_cntr")=433
-	Set gtmtypes("sgmnt_data",434,"name")="sgmnt_data.recompute_upd_array_rec_cmpc_cntr"
-	Set gtmtypes("sgmnt_data",434,"off")=3772
+	Set gtmtypfldindx("sgmnt_data","phase2_commit_wait_pidcnt_cntr")=433
+	Set gtmtypes("sgmnt_data",434,"name")="sgmnt_data.wcb_t_end_sysops_intend_wait_cntr"
+	Set gtmtypes("sgmnt_data",434,"off")=3736
 	Set gtmtypes("sgmnt_data",434,"len")=4
 	Set gtmtypes("sgmnt_data",434,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_rec_cmpc_cntr")=434
-	Set gtmtypes("sgmnt_data",435,"name")="sgmnt_data.recompute_upd_array_blk_fini_cntr"
-	Set gtmtypes("sgmnt_data",435,"off")=3776
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_intend_wait_cntr")=434
+	Set gtmtypes("sgmnt_data",435,"name")="sgmnt_data.wcb_secshr_db_clnup_phase2_clnup_cntr"
+	Set gtmtypes("sgmnt_data",435,"off")=3740
 	Set gtmtypes("sgmnt_data",435,"len")=4
 	Set gtmtypes("sgmnt_data",435,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_blk_fini_cntr")=435
-	Set gtmtypes("sgmnt_data",436,"name")="sgmnt_data.recompute_upd_array_blk_split_cntr"
-	Set gtmtypes("sgmnt_data",436,"off")=3780
+	Set gtmtypfldindx("sgmnt_data","wcb_secshr_db_clnup_phase2_clnup_cntr")=435
+	Set gtmtypes("sgmnt_data",436,"name")="sgmnt_data.wcb_phase2_commit_wait_cntr"
+	Set gtmtypes("sgmnt_data",436,"off")=3744
 	Set gtmtypes("sgmnt_data",436,"len")=4
 	Set gtmtypes("sgmnt_data",436,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_blk_split_cntr")=436
-	Set gtmtypes("sgmnt_data",437,"name")="sgmnt_data.t_qread_ripsleep_cnt_cntr"
-	Set gtmtypes("sgmnt_data",437,"off")=3784
+	Set gtmtypfldindx("sgmnt_data","wcb_phase2_commit_wait_cntr")=436
+	Set gtmtypes("sgmnt_data",437,"name")="sgmnt_data.recompute_upd_array_calls_cntr"
+	Set gtmtypes("sgmnt_data",437,"off")=3748
 	Set gtmtypes("sgmnt_data",437,"len")=4
 	Set gtmtypes("sgmnt_data",437,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","t_qread_ripsleep_cnt_cntr")=437
-	Set gtmtypes("sgmnt_data",438,"name")="sgmnt_data.t_qread_ripsleep_nblks_cntr"
-	Set gtmtypes("sgmnt_data",438,"off")=3788
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_calls_cntr")=437
+	Set gtmtypes("sgmnt_data",438,"name")="sgmnt_data.recompute_upd_array_rip_cntr"
+	Set gtmtypes("sgmnt_data",438,"off")=3752
 	Set gtmtypes("sgmnt_data",438,"len")=4
 	Set gtmtypes("sgmnt_data",438,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","t_qread_ripsleep_nblks_cntr")=438
-	Set gtmtypes("sgmnt_data",439,"name")="sgmnt_data.bg_trc_rec_cntr_filler"
-	Set gtmtypes("sgmnt_data",439,"off")=3792
-	Set gtmtypes("sgmnt_data",439,"len")=56
-	Set gtmtypes("sgmnt_data",439,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","bg_trc_rec_cntr_filler")=439
-	Set gtmtypes("sgmnt_data",440,"name")="sgmnt_data.n_gvcst_srches"
-	Set gtmtypes("sgmnt_data",440,"off")=3848
-	Set gtmtypes("sgmnt_data",440,"len")=8
-	Set gtmtypes("sgmnt_data",440,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("sgmnt_data","n_gvcst_srches")=440
-	Set gtmtypes("sgmnt_data",441,"name")="sgmnt_data.n_gvcst_srches.curr_count"
-	Set gtmtypes("sgmnt_data",441,"off")=3848
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_rip_cntr")=438
+	Set gtmtypes("sgmnt_data",439,"name")="sgmnt_data.recompute_upd_array_in_tend_cntr"
+	Set gtmtypes("sgmnt_data",439,"off")=3756
+	Set gtmtypes("sgmnt_data",439,"len")=4
+	Set gtmtypes("sgmnt_data",439,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_in_tend_cntr")=439
+	Set gtmtypes("sgmnt_data",440,"name")="sgmnt_data.recompute_upd_array_search_blk_cntr"
+	Set gtmtypes("sgmnt_data",440,"off")=3760
+	Set gtmtypes("sgmnt_data",440,"len")=4
+	Set gtmtypes("sgmnt_data",440,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_search_blk_cntr")=440
+	Set gtmtypes("sgmnt_data",441,"name")="sgmnt_data.recompute_upd_array_new_rec_cntr"
+	Set gtmtypes("sgmnt_data",441,"off")=3764
 	Set gtmtypes("sgmnt_data",441,"len")=4
 	Set gtmtypes("sgmnt_data",441,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_gvcst_srches.curr_count")=441
-	Set gtmtypes("sgmnt_data",442,"name")="sgmnt_data.n_gvcst_srches.cumul_count"
-	Set gtmtypes("sgmnt_data",442,"off")=3852
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_new_rec_cntr")=441
+	Set gtmtypes("sgmnt_data",442,"name")="sgmnt_data.recompute_upd_array_rec_size_cntr"
+	Set gtmtypes("sgmnt_data",442,"off")=3768
 	Set gtmtypes("sgmnt_data",442,"len")=4
 	Set gtmtypes("sgmnt_data",442,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_gvcst_srches.cumul_count")=442
-	Set gtmtypes("sgmnt_data",443,"name")="sgmnt_data.n_gvcst_srch_clues"
-	Set gtmtypes("sgmnt_data",443,"off")=3856
-	Set gtmtypes("sgmnt_data",443,"len")=8
-	Set gtmtypes("sgmnt_data",443,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("sgmnt_data","n_gvcst_srch_clues")=443
-	Set gtmtypes("sgmnt_data",444,"name")="sgmnt_data.n_gvcst_srch_clues.curr_count"
-	Set gtmtypes("sgmnt_data",444,"off")=3856
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_rec_size_cntr")=442
+	Set gtmtypes("sgmnt_data",443,"name")="sgmnt_data.recompute_upd_array_rec_cmpc_cntr"
+	Set gtmtypes("sgmnt_data",443,"off")=3772
+	Set gtmtypes("sgmnt_data",443,"len")=4
+	Set gtmtypes("sgmnt_data",443,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_rec_cmpc_cntr")=443
+	Set gtmtypes("sgmnt_data",444,"name")="sgmnt_data.recompute_upd_array_blk_fini_cntr"
+	Set gtmtypes("sgmnt_data",444,"off")=3776
 	Set gtmtypes("sgmnt_data",444,"len")=4
 	Set gtmtypes("sgmnt_data",444,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_gvcst_srch_clues.curr_count")=444
-	Set gtmtypes("sgmnt_data",445,"name")="sgmnt_data.n_gvcst_srch_clues.cumul_count"
-	Set gtmtypes("sgmnt_data",445,"off")=3860
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_blk_fini_cntr")=444
+	Set gtmtypes("sgmnt_data",445,"name")="sgmnt_data.recompute_upd_array_blk_split_cntr"
+	Set gtmtypes("sgmnt_data",445,"off")=3780
 	Set gtmtypes("sgmnt_data",445,"len")=4
 	Set gtmtypes("sgmnt_data",445,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_gvcst_srch_clues.cumul_count")=445
-	Set gtmtypes("sgmnt_data",446,"name")="sgmnt_data.n_clue_used_head"
-	Set gtmtypes("sgmnt_data",446,"off")=3864
-	Set gtmtypes("sgmnt_data",446,"len")=8
-	Set gtmtypes("sgmnt_data",446,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("sgmnt_data","n_clue_used_head")=446
-	Set gtmtypes("sgmnt_data",447,"name")="sgmnt_data.n_clue_used_head.curr_count"
-	Set gtmtypes("sgmnt_data",447,"off")=3864
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_blk_split_cntr")=445
+	Set gtmtypes("sgmnt_data",446,"name")="sgmnt_data.t_qread_ripsleep_cnt_cntr"
+	Set gtmtypes("sgmnt_data",446,"off")=3784
+	Set gtmtypes("sgmnt_data",446,"len")=4
+	Set gtmtypes("sgmnt_data",446,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","t_qread_ripsleep_cnt_cntr")=446
+	Set gtmtypes("sgmnt_data",447,"name")="sgmnt_data.t_qread_ripsleep_nblks_cntr"
+	Set gtmtypes("sgmnt_data",447,"off")=3788
 	Set gtmtypes("sgmnt_data",447,"len")=4
 	Set gtmtypes("sgmnt_data",447,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_clue_used_head.curr_count")=447
-	Set gtmtypes("sgmnt_data",448,"name")="sgmnt_data.n_clue_used_head.cumul_count"
-	Set gtmtypes("sgmnt_data",448,"off")=3868
+	Set gtmtypfldindx("sgmnt_data","t_qread_ripsleep_nblks_cntr")=447
+	Set gtmtypes("sgmnt_data",448,"name")="sgmnt_data.wcs_wtfini_invoked_cntr"
+	Set gtmtypes("sgmnt_data",448,"off")=3792
 	Set gtmtypes("sgmnt_data",448,"len")=4
 	Set gtmtypes("sgmnt_data",448,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_clue_used_head.cumul_count")=448
-	Set gtmtypes("sgmnt_data",449,"name")="sgmnt_data.n_clue_used_same"
-	Set gtmtypes("sgmnt_data",449,"off")=3872
-	Set gtmtypes("sgmnt_data",449,"len")=8
-	Set gtmtypes("sgmnt_data",449,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("sgmnt_data","n_clue_used_same")=449
-	Set gtmtypes("sgmnt_data",450,"name")="sgmnt_data.n_clue_used_same.curr_count"
-	Set gtmtypes("sgmnt_data",450,"off")=3872
+	Set gtmtypfldindx("sgmnt_data","wcs_wtfini_invoked_cntr")=448
+	Set gtmtypes("sgmnt_data",449,"name")="sgmnt_data.wcs_wterror_invoked_cntr"
+	Set gtmtypes("sgmnt_data",449,"off")=3796
+	Set gtmtypes("sgmnt_data",449,"len")=4
+	Set gtmtypes("sgmnt_data",449,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","wcs_wterror_invoked_cntr")=449
+	Set gtmtypes("sgmnt_data",450,"name")="sgmnt_data.wcs_wt_restart_invoked_cntr"
+	Set gtmtypes("sgmnt_data",450,"off")=3800
 	Set gtmtypes("sgmnt_data",450,"len")=4
 	Set gtmtypes("sgmnt_data",450,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_clue_used_same.curr_count")=450
-	Set gtmtypes("sgmnt_data",451,"name")="sgmnt_data.n_clue_used_same.cumul_count"
-	Set gtmtypes("sgmnt_data",451,"off")=3876
+	Set gtmtypfldindx("sgmnt_data","wcs_wt_restart_invoked_cntr")=450
+	Set gtmtypes("sgmnt_data",451,"name")="sgmnt_data.wcs_wt_restart_eagain_cntr"
+	Set gtmtypes("sgmnt_data",451,"off")=3804
 	Set gtmtypes("sgmnt_data",451,"len")=4
 	Set gtmtypes("sgmnt_data",451,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_clue_used_same.cumul_count")=451
-	Set gtmtypes("sgmnt_data",452,"name")="sgmnt_data.n_clue_used_tail"
-	Set gtmtypes("sgmnt_data",452,"off")=3880
-	Set gtmtypes("sgmnt_data",452,"len")=8
-	Set gtmtypes("sgmnt_data",452,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("sgmnt_data","n_clue_used_tail")=452
-	Set gtmtypes("sgmnt_data",453,"name")="sgmnt_data.n_clue_used_tail.curr_count"
-	Set gtmtypes("sgmnt_data",453,"off")=3880
+	Set gtmtypfldindx("sgmnt_data","wcs_wt_restart_eagain_cntr")=451
+	Set gtmtypes("sgmnt_data",452,"name")="sgmnt_data.wcs_wt_restart_reinsert_cntr"
+	Set gtmtypes("sgmnt_data",452,"off")=3808
+	Set gtmtypes("sgmnt_data",452,"len")=4
+	Set gtmtypes("sgmnt_data",452,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","wcs_wt_restart_reinsert_cntr")=452
+	Set gtmtypes("sgmnt_data",453,"name")="sgmnt_data.wcs_wtstart_eagain_cntr"
+	Set gtmtypes("sgmnt_data",453,"off")=3812
 	Set gtmtypes("sgmnt_data",453,"len")=4
 	Set gtmtypes("sgmnt_data",453,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_clue_used_tail.curr_count")=453
-	Set gtmtypes("sgmnt_data",454,"name")="sgmnt_data.n_clue_used_tail.cumul_count"
-	Set gtmtypes("sgmnt_data",454,"off")=3884
+	Set gtmtypfldindx("sgmnt_data","wcs_wtstart_eagain_cntr")=453
+	Set gtmtypes("sgmnt_data",454,"name")="sgmnt_data.wcs_wtstart_eagain_incrit_cntr"
+	Set gtmtypes("sgmnt_data",454,"off")=3816
 	Set gtmtypes("sgmnt_data",454,"len")=4
 	Set gtmtypes("sgmnt_data",454,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_clue_used_tail.cumul_count")=454
-	Set gtmtypes("sgmnt_data",455,"name")="sgmnt_data.n_t_qreads"
-	Set gtmtypes("sgmnt_data",455,"off")=3888
-	Set gtmtypes("sgmnt_data",455,"len")=8
-	Set gtmtypes("sgmnt_data",455,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("sgmnt_data","n_t_qreads")=455
-	Set gtmtypes("sgmnt_data",456,"name")="sgmnt_data.n_t_qreads.curr_count"
-	Set gtmtypes("sgmnt_data",456,"off")=3888
-	Set gtmtypes("sgmnt_data",456,"len")=4
-	Set gtmtypes("sgmnt_data",456,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_t_qreads.curr_count")=456
-	Set gtmtypes("sgmnt_data",457,"name")="sgmnt_data.n_t_qreads.cumul_count"
-	Set gtmtypes("sgmnt_data",457,"off")=3892
-	Set gtmtypes("sgmnt_data",457,"len")=4
-	Set gtmtypes("sgmnt_data",457,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_t_qreads.cumul_count")=457
-	Set gtmtypes("sgmnt_data",458,"name")="sgmnt_data.unused_dsk_reads"
-	Set gtmtypes("sgmnt_data",458,"off")=3896
-	Set gtmtypes("sgmnt_data",458,"len")=8
-	Set gtmtypes("sgmnt_data",458,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("sgmnt_data","unused_dsk_reads")=458
-	Set gtmtypes("sgmnt_data",459,"name")="sgmnt_data.unused_dsk_reads.curr_count"
-	Set gtmtypes("sgmnt_data",459,"off")=3896
+	Set gtmtypfldindx("sgmnt_data","wcs_wtstart_eagain_incrit_cntr")=454
+	Set gtmtypes("sgmnt_data",455,"name")="sgmnt_data.async_restart_eagain_cntr"
+	Set gtmtypes("sgmnt_data",455,"off")=3820
+	Set gtmtypes("sgmnt_data",455,"len")=4
+	Set gtmtypes("sgmnt_data",455,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","async_restart_eagain_cntr")=455
+	Set gtmtypes("sgmnt_data",456,"name")="sgmnt_data.bg_trc_rec_cntr_filler"
+	Set gtmtypes("sgmnt_data",456,"off")=3824
+	Set gtmtypes("sgmnt_data",456,"len")=24
+	Set gtmtypes("sgmnt_data",456,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","bg_trc_rec_cntr_filler")=456
+	Set gtmtypes("sgmnt_data",457,"name")="sgmnt_data.n_gvcst_srches"
+	Set gtmtypes("sgmnt_data",457,"off")=3848
+	Set gtmtypes("sgmnt_data",457,"len")=8
+	Set gtmtypes("sgmnt_data",457,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("sgmnt_data","n_gvcst_srches")=457
+	Set gtmtypes("sgmnt_data",458,"name")="sgmnt_data.n_gvcst_srches.curr_count"
+	Set gtmtypes("sgmnt_data",458,"off")=3848
+	Set gtmtypes("sgmnt_data",458,"len")=4
+	Set gtmtypes("sgmnt_data",458,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_gvcst_srches.curr_count")=458
+	Set gtmtypes("sgmnt_data",459,"name")="sgmnt_data.n_gvcst_srches.cumul_count"
+	Set gtmtypes("sgmnt_data",459,"off")=3852
 	Set gtmtypes("sgmnt_data",459,"len")=4
 	Set gtmtypes("sgmnt_data",459,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","unused_dsk_reads.curr_count")=459
-	Set gtmtypes("sgmnt_data",460,"name")="sgmnt_data.unused_dsk_reads.cumul_count"
-	Set gtmtypes("sgmnt_data",460,"off")=3900
-	Set gtmtypes("sgmnt_data",460,"len")=4
-	Set gtmtypes("sgmnt_data",460,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","unused_dsk_reads.cumul_count")=460
-	Set gtmtypes("sgmnt_data",461,"name")="sgmnt_data.n_bgmm_updates"
-	Set gtmtypes("sgmnt_data",461,"off")=3904
-	Set gtmtypes("sgmnt_data",461,"len")=8
-	Set gtmtypes("sgmnt_data",461,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("sgmnt_data","n_bgmm_updates")=461
-	Set gtmtypes("sgmnt_data",462,"name")="sgmnt_data.n_bgmm_updates.curr_count"
-	Set gtmtypes("sgmnt_data",462,"off")=3904
+	Set gtmtypfldindx("sgmnt_data","n_gvcst_srches.cumul_count")=459
+	Set gtmtypes("sgmnt_data",460,"name")="sgmnt_data.n_gvcst_srch_clues"
+	Set gtmtypes("sgmnt_data",460,"off")=3856
+	Set gtmtypes("sgmnt_data",460,"len")=8
+	Set gtmtypes("sgmnt_data",460,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("sgmnt_data","n_gvcst_srch_clues")=460
+	Set gtmtypes("sgmnt_data",461,"name")="sgmnt_data.n_gvcst_srch_clues.curr_count"
+	Set gtmtypes("sgmnt_data",461,"off")=3856
+	Set gtmtypes("sgmnt_data",461,"len")=4
+	Set gtmtypes("sgmnt_data",461,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_gvcst_srch_clues.curr_count")=461
+	Set gtmtypes("sgmnt_data",462,"name")="sgmnt_data.n_gvcst_srch_clues.cumul_count"
+	Set gtmtypes("sgmnt_data",462,"off")=3860
 	Set gtmtypes("sgmnt_data",462,"len")=4
 	Set gtmtypes("sgmnt_data",462,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_bgmm_updates.curr_count")=462
-	Set gtmtypes("sgmnt_data",463,"name")="sgmnt_data.n_bgmm_updates.cumul_count"
-	Set gtmtypes("sgmnt_data",463,"off")=3908
-	Set gtmtypes("sgmnt_data",463,"len")=4
-	Set gtmtypes("sgmnt_data",463,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_bgmm_updates.cumul_count")=463
-	Set gtmtypes("sgmnt_data",464,"name")="sgmnt_data.unused_dsk_writes"
-	Set gtmtypes("sgmnt_data",464,"off")=3912
-	Set gtmtypes("sgmnt_data",464,"len")=8
-	Set gtmtypes("sgmnt_data",464,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("sgmnt_data","unused_dsk_writes")=464
-	Set gtmtypes("sgmnt_data",465,"name")="sgmnt_data.unused_dsk_writes.curr_count"
-	Set gtmtypes("sgmnt_data",465,"off")=3912
+	Set gtmtypfldindx("sgmnt_data","n_gvcst_srch_clues.cumul_count")=462
+	Set gtmtypes("sgmnt_data",463,"name")="sgmnt_data.n_clue_used_head"
+	Set gtmtypes("sgmnt_data",463,"off")=3864
+	Set gtmtypes("sgmnt_data",463,"len")=8
+	Set gtmtypes("sgmnt_data",463,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("sgmnt_data","n_clue_used_head")=463
+	Set gtmtypes("sgmnt_data",464,"name")="sgmnt_data.n_clue_used_head.curr_count"
+	Set gtmtypes("sgmnt_data",464,"off")=3864
+	Set gtmtypes("sgmnt_data",464,"len")=4
+	Set gtmtypes("sgmnt_data",464,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_clue_used_head.curr_count")=464
+	Set gtmtypes("sgmnt_data",465,"name")="sgmnt_data.n_clue_used_head.cumul_count"
+	Set gtmtypes("sgmnt_data",465,"off")=3868
 	Set gtmtypes("sgmnt_data",465,"len")=4
 	Set gtmtypes("sgmnt_data",465,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","unused_dsk_writes.curr_count")=465
-	Set gtmtypes("sgmnt_data",466,"name")="sgmnt_data.unused_dsk_writes.cumul_count"
-	Set gtmtypes("sgmnt_data",466,"off")=3916
-	Set gtmtypes("sgmnt_data",466,"len")=4
-	Set gtmtypes("sgmnt_data",466,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","unused_dsk_writes.cumul_count")=466
-	Set gtmtypes("sgmnt_data",467,"name")="sgmnt_data.n_bg_update_creates"
-	Set gtmtypes("sgmnt_data",467,"off")=3920
-	Set gtmtypes("sgmnt_data",467,"len")=8
-	Set gtmtypes("sgmnt_data",467,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("sgmnt_data","n_bg_update_creates")=467
-	Set gtmtypes("sgmnt_data",468,"name")="sgmnt_data.n_bg_update_creates.curr_count"
-	Set gtmtypes("sgmnt_data",468,"off")=3920
+	Set gtmtypfldindx("sgmnt_data","n_clue_used_head.cumul_count")=465
+	Set gtmtypes("sgmnt_data",466,"name")="sgmnt_data.n_clue_used_same"
+	Set gtmtypes("sgmnt_data",466,"off")=3872
+	Set gtmtypes("sgmnt_data",466,"len")=8
+	Set gtmtypes("sgmnt_data",466,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("sgmnt_data","n_clue_used_same")=466
+	Set gtmtypes("sgmnt_data",467,"name")="sgmnt_data.n_clue_used_same.curr_count"
+	Set gtmtypes("sgmnt_data",467,"off")=3872
+	Set gtmtypes("sgmnt_data",467,"len")=4
+	Set gtmtypes("sgmnt_data",467,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_clue_used_same.curr_count")=467
+	Set gtmtypes("sgmnt_data",468,"name")="sgmnt_data.n_clue_used_same.cumul_count"
+	Set gtmtypes("sgmnt_data",468,"off")=3876
 	Set gtmtypes("sgmnt_data",468,"len")=4
 	Set gtmtypes("sgmnt_data",468,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_bg_update_creates.curr_count")=468
-	Set gtmtypes("sgmnt_data",469,"name")="sgmnt_data.n_bg_update_creates.cumul_count"
-	Set gtmtypes("sgmnt_data",469,"off")=3924
-	Set gtmtypes("sgmnt_data",469,"len")=4
-	Set gtmtypes("sgmnt_data",469,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_bg_update_creates.cumul_count")=469
-	Set gtmtypes("sgmnt_data",470,"name")="sgmnt_data.n_db_csh_getns"
-	Set gtmtypes("sgmnt_data",470,"off")=3928
-	Set gtmtypes("sgmnt_data",470,"len")=8
-	Set gtmtypes("sgmnt_data",470,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("sgmnt_data","n_db_csh_getns")=470
-	Set gtmtypes("sgmnt_data",471,"name")="sgmnt_data.n_db_csh_getns.curr_count"
-	Set gtmtypes("sgmnt_data",471,"off")=3928
+	Set gtmtypfldindx("sgmnt_data","n_clue_used_same.cumul_count")=468
+	Set gtmtypes("sgmnt_data",469,"name")="sgmnt_data.n_clue_used_tail"
+	Set gtmtypes("sgmnt_data",469,"off")=3880
+	Set gtmtypes("sgmnt_data",469,"len")=8
+	Set gtmtypes("sgmnt_data",469,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("sgmnt_data","n_clue_used_tail")=469
+	Set gtmtypes("sgmnt_data",470,"name")="sgmnt_data.n_clue_used_tail.curr_count"
+	Set gtmtypes("sgmnt_data",470,"off")=3880
+	Set gtmtypes("sgmnt_data",470,"len")=4
+	Set gtmtypes("sgmnt_data",470,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_clue_used_tail.curr_count")=470
+	Set gtmtypes("sgmnt_data",471,"name")="sgmnt_data.n_clue_used_tail.cumul_count"
+	Set gtmtypes("sgmnt_data",471,"off")=3884
 	Set gtmtypes("sgmnt_data",471,"len")=4
 	Set gtmtypes("sgmnt_data",471,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_db_csh_getns.curr_count")=471
-	Set gtmtypes("sgmnt_data",472,"name")="sgmnt_data.n_db_csh_getns.cumul_count"
-	Set gtmtypes("sgmnt_data",472,"off")=3932
-	Set gtmtypes("sgmnt_data",472,"len")=4
-	Set gtmtypes("sgmnt_data",472,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_db_csh_getns.cumul_count")=472
-	Set gtmtypes("sgmnt_data",473,"name")="sgmnt_data.n_db_csh_getn_lcnt"
-	Set gtmtypes("sgmnt_data",473,"off")=3936
-	Set gtmtypes("sgmnt_data",473,"len")=8
-	Set gtmtypes("sgmnt_data",473,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("sgmnt_data","n_db_csh_getn_lcnt")=473
-	Set gtmtypes("sgmnt_data",474,"name")="sgmnt_data.n_db_csh_getn_lcnt.curr_count"
-	Set gtmtypes("sgmnt_data",474,"off")=3936
+	Set gtmtypfldindx("sgmnt_data","n_clue_used_tail.cumul_count")=471
+	Set gtmtypes("sgmnt_data",472,"name")="sgmnt_data.n_t_qreads"
+	Set gtmtypes("sgmnt_data",472,"off")=3888
+	Set gtmtypes("sgmnt_data",472,"len")=8
+	Set gtmtypes("sgmnt_data",472,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("sgmnt_data","n_t_qreads")=472
+	Set gtmtypes("sgmnt_data",473,"name")="sgmnt_data.n_t_qreads.curr_count"
+	Set gtmtypes("sgmnt_data",473,"off")=3888
+	Set gtmtypes("sgmnt_data",473,"len")=4
+	Set gtmtypes("sgmnt_data",473,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_t_qreads.curr_count")=473
+	Set gtmtypes("sgmnt_data",474,"name")="sgmnt_data.n_t_qreads.cumul_count"
+	Set gtmtypes("sgmnt_data",474,"off")=3892
 	Set gtmtypes("sgmnt_data",474,"len")=4
 	Set gtmtypes("sgmnt_data",474,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_db_csh_getn_lcnt.curr_count")=474
-	Set gtmtypes("sgmnt_data",475,"name")="sgmnt_data.n_db_csh_getn_lcnt.cumul_count"
-	Set gtmtypes("sgmnt_data",475,"off")=3940
-	Set gtmtypes("sgmnt_data",475,"len")=4
-	Set gtmtypes("sgmnt_data",475,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_db_csh_getn_lcnt.cumul_count")=475
-	Set gtmtypes("sgmnt_data",476,"name")="sgmnt_data.db_csh_acct_rec_filler_4k"
-	Set gtmtypes("sgmnt_data",476,"off")=3944
-	Set gtmtypes("sgmnt_data",476,"len")=152
-	Set gtmtypes("sgmnt_data",476,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","db_csh_acct_rec_filler_4k")=476
-	Set gtmtypes("sgmnt_data",477,"name")="sgmnt_data.gvstats_rec"
-	Set gtmtypes("sgmnt_data",477,"off")=4096
-	Set gtmtypes("sgmnt_data",477,"len")=464
-	Set gtmtypes("sgmnt_data",477,"type")="gvstats_rec_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec")=477
-	Set gtmtypes("sgmnt_data",478,"name")="sgmnt_data.gvstats_rec.n_set"
-	Set gtmtypes("sgmnt_data",478,"off")=4096
+	Set gtmtypfldindx("sgmnt_data","n_t_qreads.cumul_count")=474
+	Set gtmtypes("sgmnt_data",475,"name")="sgmnt_data.unused_dsk_reads"
+	Set gtmtypes("sgmnt_data",475,"off")=3896
+	Set gtmtypes("sgmnt_data",475,"len")=8
+	Set gtmtypes("sgmnt_data",475,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("sgmnt_data","unused_dsk_reads")=475
+	Set gtmtypes("sgmnt_data",476,"name")="sgmnt_data.unused_dsk_reads.curr_count"
+	Set gtmtypes("sgmnt_data",476,"off")=3896
+	Set gtmtypes("sgmnt_data",476,"len")=4
+	Set gtmtypes("sgmnt_data",476,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","unused_dsk_reads.curr_count")=476
+	Set gtmtypes("sgmnt_data",477,"name")="sgmnt_data.unused_dsk_reads.cumul_count"
+	Set gtmtypes("sgmnt_data",477,"off")=3900
+	Set gtmtypes("sgmnt_data",477,"len")=4
+	Set gtmtypes("sgmnt_data",477,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","unused_dsk_reads.cumul_count")=477
+	Set gtmtypes("sgmnt_data",478,"name")="sgmnt_data.n_bgmm_updates"
+	Set gtmtypes("sgmnt_data",478,"off")=3904
 	Set gtmtypes("sgmnt_data",478,"len")=8
-	Set gtmtypes("sgmnt_data",478,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_set")=478
-	Set gtmtypes("sgmnt_data",479,"name")="sgmnt_data.gvstats_rec.n_kill"
-	Set gtmtypes("sgmnt_data",479,"off")=4104
-	Set gtmtypes("sgmnt_data",479,"len")=8
-	Set gtmtypes("sgmnt_data",479,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_kill")=479
-	Set gtmtypes("sgmnt_data",480,"name")="sgmnt_data.gvstats_rec.n_get"
-	Set gtmtypes("sgmnt_data",480,"off")=4112
-	Set gtmtypes("sgmnt_data",480,"len")=8
-	Set gtmtypes("sgmnt_data",480,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_get")=480
-	Set gtmtypes("sgmnt_data",481,"name")="sgmnt_data.gvstats_rec.n_data"
-	Set gtmtypes("sgmnt_data",481,"off")=4120
+	Set gtmtypes("sgmnt_data",478,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("sgmnt_data","n_bgmm_updates")=478
+	Set gtmtypes("sgmnt_data",479,"name")="sgmnt_data.n_bgmm_updates.curr_count"
+	Set gtmtypes("sgmnt_data",479,"off")=3904
+	Set gtmtypes("sgmnt_data",479,"len")=4
+	Set gtmtypes("sgmnt_data",479,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_bgmm_updates.curr_count")=479
+	Set gtmtypes("sgmnt_data",480,"name")="sgmnt_data.n_bgmm_updates.cumul_count"
+	Set gtmtypes("sgmnt_data",480,"off")=3908
+	Set gtmtypes("sgmnt_data",480,"len")=4
+	Set gtmtypes("sgmnt_data",480,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_bgmm_updates.cumul_count")=480
+	Set gtmtypes("sgmnt_data",481,"name")="sgmnt_data.unused_dsk_writes"
+	Set gtmtypes("sgmnt_data",481,"off")=3912
 	Set gtmtypes("sgmnt_data",481,"len")=8
-	Set gtmtypes("sgmnt_data",481,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_data")=481
-	Set gtmtypes("sgmnt_data",482,"name")="sgmnt_data.gvstats_rec.n_order"
-	Set gtmtypes("sgmnt_data",482,"off")=4128
-	Set gtmtypes("sgmnt_data",482,"len")=8
-	Set gtmtypes("sgmnt_data",482,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_order")=482
-	Set gtmtypes("sgmnt_data",483,"name")="sgmnt_data.gvstats_rec.n_zprev"
-	Set gtmtypes("sgmnt_data",483,"off")=4136
-	Set gtmtypes("sgmnt_data",483,"len")=8
-	Set gtmtypes("sgmnt_data",483,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_zprev")=483
-	Set gtmtypes("sgmnt_data",484,"name")="sgmnt_data.gvstats_rec.n_query"
-	Set gtmtypes("sgmnt_data",484,"off")=4144
+	Set gtmtypes("sgmnt_data",481,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("sgmnt_data","unused_dsk_writes")=481
+	Set gtmtypes("sgmnt_data",482,"name")="sgmnt_data.unused_dsk_writes.curr_count"
+	Set gtmtypes("sgmnt_data",482,"off")=3912
+	Set gtmtypes("sgmnt_data",482,"len")=4
+	Set gtmtypes("sgmnt_data",482,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","unused_dsk_writes.curr_count")=482
+	Set gtmtypes("sgmnt_data",483,"name")="sgmnt_data.unused_dsk_writes.cumul_count"
+	Set gtmtypes("sgmnt_data",483,"off")=3916
+	Set gtmtypes("sgmnt_data",483,"len")=4
+	Set gtmtypes("sgmnt_data",483,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","unused_dsk_writes.cumul_count")=483
+	Set gtmtypes("sgmnt_data",484,"name")="sgmnt_data.n_bg_update_creates"
+	Set gtmtypes("sgmnt_data",484,"off")=3920
 	Set gtmtypes("sgmnt_data",484,"len")=8
-	Set gtmtypes("sgmnt_data",484,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_query")=484
-	Set gtmtypes("sgmnt_data",485,"name")="sgmnt_data.gvstats_rec.n_lock_success"
-	Set gtmtypes("sgmnt_data",485,"off")=4152
-	Set gtmtypes("sgmnt_data",485,"len")=8
-	Set gtmtypes("sgmnt_data",485,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_lock_success")=485
-	Set gtmtypes("sgmnt_data",486,"name")="sgmnt_data.gvstats_rec.n_lock_fail"
-	Set gtmtypes("sgmnt_data",486,"off")=4160
-	Set gtmtypes("sgmnt_data",486,"len")=8
-	Set gtmtypes("sgmnt_data",486,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_lock_fail")=486
-	Set gtmtypes("sgmnt_data",487,"name")="sgmnt_data.gvstats_rec.db_curr_tn"
-	Set gtmtypes("sgmnt_data",487,"off")=4168
+	Set gtmtypes("sgmnt_data",484,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("sgmnt_data","n_bg_update_creates")=484
+	Set gtmtypes("sgmnt_data",485,"name")="sgmnt_data.n_bg_update_creates.curr_count"
+	Set gtmtypes("sgmnt_data",485,"off")=3920
+	Set gtmtypes("sgmnt_data",485,"len")=4
+	Set gtmtypes("sgmnt_data",485,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_bg_update_creates.curr_count")=485
+	Set gtmtypes("sgmnt_data",486,"name")="sgmnt_data.n_bg_update_creates.cumul_count"
+	Set gtmtypes("sgmnt_data",486,"off")=3924
+	Set gtmtypes("sgmnt_data",486,"len")=4
+	Set gtmtypes("sgmnt_data",486,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_bg_update_creates.cumul_count")=486
+	Set gtmtypes("sgmnt_data",487,"name")="sgmnt_data.n_db_csh_getns"
+	Set gtmtypes("sgmnt_data",487,"off")=3928
 	Set gtmtypes("sgmnt_data",487,"len")=8
-	Set gtmtypes("sgmnt_data",487,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.db_curr_tn")=487
-	Set gtmtypes("sgmnt_data",488,"name")="sgmnt_data.gvstats_rec.n_dsk_read"
-	Set gtmtypes("sgmnt_data",488,"off")=4176
-	Set gtmtypes("sgmnt_data",488,"len")=8
-	Set gtmtypes("sgmnt_data",488,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_dsk_read")=488
-	Set gtmtypes("sgmnt_data",489,"name")="sgmnt_data.gvstats_rec.n_dsk_write"
-	Set gtmtypes("sgmnt_data",489,"off")=4184
-	Set gtmtypes("sgmnt_data",489,"len")=8
-	Set gtmtypes("sgmnt_data",489,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_dsk_write")=489
-	Set gtmtypes("sgmnt_data",490,"name")="sgmnt_data.gvstats_rec.n_nontp_readwrite"
-	Set gtmtypes("sgmnt_data",490,"off")=4192
+	Set gtmtypes("sgmnt_data",487,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("sgmnt_data","n_db_csh_getns")=487
+	Set gtmtypes("sgmnt_data",488,"name")="sgmnt_data.n_db_csh_getns.curr_count"
+	Set gtmtypes("sgmnt_data",488,"off")=3928
+	Set gtmtypes("sgmnt_data",488,"len")=4
+	Set gtmtypes("sgmnt_data",488,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_db_csh_getns.curr_count")=488
+	Set gtmtypes("sgmnt_data",489,"name")="sgmnt_data.n_db_csh_getns.cumul_count"
+	Set gtmtypes("sgmnt_data",489,"off")=3932
+	Set gtmtypes("sgmnt_data",489,"len")=4
+	Set gtmtypes("sgmnt_data",489,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_db_csh_getns.cumul_count")=489
+	Set gtmtypes("sgmnt_data",490,"name")="sgmnt_data.n_db_csh_getn_lcnt"
+	Set gtmtypes("sgmnt_data",490,"off")=3936
 	Set gtmtypes("sgmnt_data",490,"len")=8
-	Set gtmtypes("sgmnt_data",490,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_readwrite")=490
-	Set gtmtypes("sgmnt_data",491,"name")="sgmnt_data.gvstats_rec.n_nontp_readonly"
-	Set gtmtypes("sgmnt_data",491,"off")=4200
-	Set gtmtypes("sgmnt_data",491,"len")=8
-	Set gtmtypes("sgmnt_data",491,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_readonly")=491
-	Set gtmtypes("sgmnt_data",492,"name")="sgmnt_data.gvstats_rec.n_nontp_blkwrite"
-	Set gtmtypes("sgmnt_data",492,"off")=4208
-	Set gtmtypes("sgmnt_data",492,"len")=8
-	Set gtmtypes("sgmnt_data",492,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_blkwrite")=492
-	Set gtmtypes("sgmnt_data",493,"name")="sgmnt_data.gvstats_rec.n_nontp_blkread"
-	Set gtmtypes("sgmnt_data",493,"off")=4216
-	Set gtmtypes("sgmnt_data",493,"len")=8
-	Set gtmtypes("sgmnt_data",493,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_blkread")=493
-	Set gtmtypes("sgmnt_data",494,"name")="sgmnt_data.gvstats_rec.n_nontp_retries_0"
-	Set gtmtypes("sgmnt_data",494,"off")=4224
-	Set gtmtypes("sgmnt_data",494,"len")=8
-	Set gtmtypes("sgmnt_data",494,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_retries_0")=494
-	Set gtmtypes("sgmnt_data",495,"name")="sgmnt_data.gvstats_rec.n_nontp_retries_1"
-	Set gtmtypes("sgmnt_data",495,"off")=4232
+	Set gtmtypes("sgmnt_data",490,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("sgmnt_data","n_db_csh_getn_lcnt")=490
+	Set gtmtypes("sgmnt_data",491,"name")="sgmnt_data.n_db_csh_getn_lcnt.curr_count"
+	Set gtmtypes("sgmnt_data",491,"off")=3936
+	Set gtmtypes("sgmnt_data",491,"len")=4
+	Set gtmtypes("sgmnt_data",491,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_db_csh_getn_lcnt.curr_count")=491
+	Set gtmtypes("sgmnt_data",492,"name")="sgmnt_data.n_db_csh_getn_lcnt.cumul_count"
+	Set gtmtypes("sgmnt_data",492,"off")=3940
+	Set gtmtypes("sgmnt_data",492,"len")=4
+	Set gtmtypes("sgmnt_data",492,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_db_csh_getn_lcnt.cumul_count")=492
+	Set gtmtypes("sgmnt_data",493,"name")="sgmnt_data.db_csh_acct_rec_filler_4k"
+	Set gtmtypes("sgmnt_data",493,"off")=3944
+	Set gtmtypes("sgmnt_data",493,"len")=152
+	Set gtmtypes("sgmnt_data",493,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","db_csh_acct_rec_filler_4k")=493
+	Set gtmtypes("sgmnt_data",494,"name")="sgmnt_data.gvstats_rec"
+	Set gtmtypes("sgmnt_data",494,"off")=4096
+	Set gtmtypes("sgmnt_data",494,"len")=472
+	Set gtmtypes("sgmnt_data",494,"type")="gvstats_rec_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec")=494
+	Set gtmtypes("sgmnt_data",495,"name")="sgmnt_data.gvstats_rec.n_set"
+	Set gtmtypes("sgmnt_data",495,"off")=4096
 	Set gtmtypes("sgmnt_data",495,"len")=8
 	Set gtmtypes("sgmnt_data",495,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_retries_1")=495
-	Set gtmtypes("sgmnt_data",496,"name")="sgmnt_data.gvstats_rec.n_nontp_retries_2"
-	Set gtmtypes("sgmnt_data",496,"off")=4240
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_set")=495
+	Set gtmtypes("sgmnt_data",496,"name")="sgmnt_data.gvstats_rec.n_kill"
+	Set gtmtypes("sgmnt_data",496,"off")=4104
 	Set gtmtypes("sgmnt_data",496,"len")=8
 	Set gtmtypes("sgmnt_data",496,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_retries_2")=496
-	Set gtmtypes("sgmnt_data",497,"name")="sgmnt_data.gvstats_rec.n_nontp_retries_3"
-	Set gtmtypes("sgmnt_data",497,"off")=4248
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_kill")=496
+	Set gtmtypes("sgmnt_data",497,"name")="sgmnt_data.gvstats_rec.n_get"
+	Set gtmtypes("sgmnt_data",497,"off")=4112
 	Set gtmtypes("sgmnt_data",497,"len")=8
 	Set gtmtypes("sgmnt_data",497,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_retries_3")=497
-	Set gtmtypes("sgmnt_data",498,"name")="sgmnt_data.gvstats_rec.n_tp_readwrite"
-	Set gtmtypes("sgmnt_data",498,"off")=4256
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_get")=497
+	Set gtmtypes("sgmnt_data",498,"name")="sgmnt_data.gvstats_rec.n_data"
+	Set gtmtypes("sgmnt_data",498,"off")=4120
 	Set gtmtypes("sgmnt_data",498,"len")=8
 	Set gtmtypes("sgmnt_data",498,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_readwrite")=498
-	Set gtmtypes("sgmnt_data",499,"name")="sgmnt_data.gvstats_rec.n_tp_readonly"
-	Set gtmtypes("sgmnt_data",499,"off")=4264
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_data")=498
+	Set gtmtypes("sgmnt_data",499,"name")="sgmnt_data.gvstats_rec.n_order"
+	Set gtmtypes("sgmnt_data",499,"off")=4128
 	Set gtmtypes("sgmnt_data",499,"len")=8
 	Set gtmtypes("sgmnt_data",499,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_readonly")=499
-	Set gtmtypes("sgmnt_data",500,"name")="sgmnt_data.gvstats_rec.n_tp_rolledback"
-	Set gtmtypes("sgmnt_data",500,"off")=4272
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_order")=499
+	Set gtmtypes("sgmnt_data",500,"name")="sgmnt_data.gvstats_rec.n_zprev"
+	Set gtmtypes("sgmnt_data",500,"off")=4136
 	Set gtmtypes("sgmnt_data",500,"len")=8
 	Set gtmtypes("sgmnt_data",500,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_rolledback")=500
-	Set gtmtypes("sgmnt_data",501,"name")="sgmnt_data.gvstats_rec.n_tp_blkwrite"
-	Set gtmtypes("sgmnt_data",501,"off")=4280
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_zprev")=500
+	Set gtmtypes("sgmnt_data",501,"name")="sgmnt_data.gvstats_rec.n_query"
+	Set gtmtypes("sgmnt_data",501,"off")=4144
 	Set gtmtypes("sgmnt_data",501,"len")=8
 	Set gtmtypes("sgmnt_data",501,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_blkwrite")=501
-	Set gtmtypes("sgmnt_data",502,"name")="sgmnt_data.gvstats_rec.n_tp_blkread"
-	Set gtmtypes("sgmnt_data",502,"off")=4288
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_query")=501
+	Set gtmtypes("sgmnt_data",502,"name")="sgmnt_data.gvstats_rec.n_lock_success"
+	Set gtmtypes("sgmnt_data",502,"off")=4152
 	Set gtmtypes("sgmnt_data",502,"len")=8
 	Set gtmtypes("sgmnt_data",502,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_blkread")=502
-	Set gtmtypes("sgmnt_data",503,"name")="sgmnt_data.gvstats_rec.n_tp_tot_retries_0"
-	Set gtmtypes("sgmnt_data",503,"off")=4296
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_lock_success")=502
+	Set gtmtypes("sgmnt_data",503,"name")="sgmnt_data.gvstats_rec.n_lock_fail"
+	Set gtmtypes("sgmnt_data",503,"off")=4160
 	Set gtmtypes("sgmnt_data",503,"len")=8
 	Set gtmtypes("sgmnt_data",503,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_tot_retries_0")=503
-	Set gtmtypes("sgmnt_data",504,"name")="sgmnt_data.gvstats_rec.n_tp_tot_retries_1"
-	Set gtmtypes("sgmnt_data",504,"off")=4304
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_lock_fail")=503
+	Set gtmtypes("sgmnt_data",504,"name")="sgmnt_data.gvstats_rec.db_curr_tn"
+	Set gtmtypes("sgmnt_data",504,"off")=4168
 	Set gtmtypes("sgmnt_data",504,"len")=8
 	Set gtmtypes("sgmnt_data",504,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_tot_retries_1")=504
-	Set gtmtypes("sgmnt_data",505,"name")="sgmnt_data.gvstats_rec.n_tp_tot_retries_2"
-	Set gtmtypes("sgmnt_data",505,"off")=4312
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.db_curr_tn")=504
+	Set gtmtypes("sgmnt_data",505,"name")="sgmnt_data.gvstats_rec.n_dsk_read"
+	Set gtmtypes("sgmnt_data",505,"off")=4176
 	Set gtmtypes("sgmnt_data",505,"len")=8
 	Set gtmtypes("sgmnt_data",505,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_tot_retries_2")=505
-	Set gtmtypes("sgmnt_data",506,"name")="sgmnt_data.gvstats_rec.n_tp_tot_retries_3"
-	Set gtmtypes("sgmnt_data",506,"off")=4320
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_dsk_read")=505
+	Set gtmtypes("sgmnt_data",506,"name")="sgmnt_data.gvstats_rec.n_dsk_write"
+	Set gtmtypes("sgmnt_data",506,"off")=4184
 	Set gtmtypes("sgmnt_data",506,"len")=8
 	Set gtmtypes("sgmnt_data",506,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_tot_retries_3")=506
-	Set gtmtypes("sgmnt_data",507,"name")="sgmnt_data.gvstats_rec.n_tp_tot_retries_4"
-	Set gtmtypes("sgmnt_data",507,"off")=4328
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_dsk_write")=506
+	Set gtmtypes("sgmnt_data",507,"name")="sgmnt_data.gvstats_rec.n_nontp_readwrite"
+	Set gtmtypes("sgmnt_data",507,"off")=4192
 	Set gtmtypes("sgmnt_data",507,"len")=8
 	Set gtmtypes("sgmnt_data",507,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_tot_retries_4")=507
-	Set gtmtypes("sgmnt_data",508,"name")="sgmnt_data.gvstats_rec.n_tp_cnflct_retries_0"
-	Set gtmtypes("sgmnt_data",508,"off")=4336
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_readwrite")=507
+	Set gtmtypes("sgmnt_data",508,"name")="sgmnt_data.gvstats_rec.n_nontp_readonly"
+	Set gtmtypes("sgmnt_data",508,"off")=4200
 	Set gtmtypes("sgmnt_data",508,"len")=8
 	Set gtmtypes("sgmnt_data",508,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_cnflct_retries_0")=508
-	Set gtmtypes("sgmnt_data",509,"name")="sgmnt_data.gvstats_rec.n_tp_cnflct_retries_1"
-	Set gtmtypes("sgmnt_data",509,"off")=4344
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_readonly")=508
+	Set gtmtypes("sgmnt_data",509,"name")="sgmnt_data.gvstats_rec.n_nontp_blkwrite"
+	Set gtmtypes("sgmnt_data",509,"off")=4208
 	Set gtmtypes("sgmnt_data",509,"len")=8
 	Set gtmtypes("sgmnt_data",509,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_cnflct_retries_1")=509
-	Set gtmtypes("sgmnt_data",510,"name")="sgmnt_data.gvstats_rec.n_tp_cnflct_retries_2"
-	Set gtmtypes("sgmnt_data",510,"off")=4352
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_blkwrite")=509
+	Set gtmtypes("sgmnt_data",510,"name")="sgmnt_data.gvstats_rec.n_nontp_blkread"
+	Set gtmtypes("sgmnt_data",510,"off")=4216
 	Set gtmtypes("sgmnt_data",510,"len")=8
 	Set gtmtypes("sgmnt_data",510,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_cnflct_retries_2")=510
-	Set gtmtypes("sgmnt_data",511,"name")="sgmnt_data.gvstats_rec.n_tp_cnflct_retries_3"
-	Set gtmtypes("sgmnt_data",511,"off")=4360
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_blkread")=510
+	Set gtmtypes("sgmnt_data",511,"name")="sgmnt_data.gvstats_rec.n_nontp_retries_0"
+	Set gtmtypes("sgmnt_data",511,"off")=4224
 	Set gtmtypes("sgmnt_data",511,"len")=8
 	Set gtmtypes("sgmnt_data",511,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_cnflct_retries_3")=511
-	Set gtmtypes("sgmnt_data",512,"name")="sgmnt_data.gvstats_rec.n_tp_cnflct_retries_4"
-	Set gtmtypes("sgmnt_data",512,"off")=4368
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_retries_0")=511
+	Set gtmtypes("sgmnt_data",512,"name")="sgmnt_data.gvstats_rec.n_nontp_retries_1"
+	Set gtmtypes("sgmnt_data",512,"off")=4232
 	Set gtmtypes("sgmnt_data",512,"len")=8
 	Set gtmtypes("sgmnt_data",512,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_cnflct_retries_4")=512
-	Set gtmtypes("sgmnt_data",513,"name")="sgmnt_data.gvstats_rec.n_ztrigger"
-	Set gtmtypes("sgmnt_data",513,"off")=4376
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_retries_1")=512
+	Set gtmtypes("sgmnt_data",513,"name")="sgmnt_data.gvstats_rec.n_nontp_retries_2"
+	Set gtmtypes("sgmnt_data",513,"off")=4240
 	Set gtmtypes("sgmnt_data",513,"len")=8
 	Set gtmtypes("sgmnt_data",513,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_ztrigger")=513
-	Set gtmtypes("sgmnt_data",514,"name")="sgmnt_data.gvstats_rec.n_db_flush"
-	Set gtmtypes("sgmnt_data",514,"off")=4384
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_retries_2")=513
+	Set gtmtypes("sgmnt_data",514,"name")="sgmnt_data.gvstats_rec.n_nontp_retries_3"
+	Set gtmtypes("sgmnt_data",514,"off")=4248
 	Set gtmtypes("sgmnt_data",514,"len")=8
 	Set gtmtypes("sgmnt_data",514,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_db_flush")=514
-	Set gtmtypes("sgmnt_data",515,"name")="sgmnt_data.gvstats_rec.n_db_fsync"
-	Set gtmtypes("sgmnt_data",515,"off")=4392
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_retries_3")=514
+	Set gtmtypes("sgmnt_data",515,"name")="sgmnt_data.gvstats_rec.n_tp_readwrite"
+	Set gtmtypes("sgmnt_data",515,"off")=4256
 	Set gtmtypes("sgmnt_data",515,"len")=8
 	Set gtmtypes("sgmnt_data",515,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_db_fsync")=515
-	Set gtmtypes("sgmnt_data",516,"name")="sgmnt_data.gvstats_rec.n_jnl_flush"
-	Set gtmtypes("sgmnt_data",516,"off")=4400
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_readwrite")=515
+	Set gtmtypes("sgmnt_data",516,"name")="sgmnt_data.gvstats_rec.n_tp_readonly"
+	Set gtmtypes("sgmnt_data",516,"off")=4264
 	Set gtmtypes("sgmnt_data",516,"len")=8
 	Set gtmtypes("sgmnt_data",516,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jnl_flush")=516
-	Set gtmtypes("sgmnt_data",517,"name")="sgmnt_data.gvstats_rec.n_jnl_fsync"
-	Set gtmtypes("sgmnt_data",517,"off")=4408
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_readonly")=516
+	Set gtmtypes("sgmnt_data",517,"name")="sgmnt_data.gvstats_rec.n_tp_rolledback"
+	Set gtmtypes("sgmnt_data",517,"off")=4272
 	Set gtmtypes("sgmnt_data",517,"len")=8
 	Set gtmtypes("sgmnt_data",517,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jnl_fsync")=517
-	Set gtmtypes("sgmnt_data",518,"name")="sgmnt_data.gvstats_rec.n_jbuff_bytes"
-	Set gtmtypes("sgmnt_data",518,"off")=4416
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_rolledback")=517
+	Set gtmtypes("sgmnt_data",518,"name")="sgmnt_data.gvstats_rec.n_tp_blkwrite"
+	Set gtmtypes("sgmnt_data",518,"off")=4280
 	Set gtmtypes("sgmnt_data",518,"len")=8
 	Set gtmtypes("sgmnt_data",518,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jbuff_bytes")=518
-	Set gtmtypes("sgmnt_data",519,"name")="sgmnt_data.gvstats_rec.n_jfile_bytes"
-	Set gtmtypes("sgmnt_data",519,"off")=4424
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_blkwrite")=518
+	Set gtmtypes("sgmnt_data",519,"name")="sgmnt_data.gvstats_rec.n_tp_blkread"
+	Set gtmtypes("sgmnt_data",519,"off")=4288
 	Set gtmtypes("sgmnt_data",519,"len")=8
 	Set gtmtypes("sgmnt_data",519,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jfile_bytes")=519
-	Set gtmtypes("sgmnt_data",520,"name")="sgmnt_data.gvstats_rec.n_jfile_writes"
-	Set gtmtypes("sgmnt_data",520,"off")=4432
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_blkread")=519
+	Set gtmtypes("sgmnt_data",520,"name")="sgmnt_data.gvstats_rec.n_tp_tot_retries_0"
+	Set gtmtypes("sgmnt_data",520,"off")=4296
 	Set gtmtypes("sgmnt_data",520,"len")=8
 	Set gtmtypes("sgmnt_data",520,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jfile_writes")=520
-	Set gtmtypes("sgmnt_data",521,"name")="sgmnt_data.gvstats_rec.n_jrec_logical"
-	Set gtmtypes("sgmnt_data",521,"off")=4440
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_tot_retries_0")=520
+	Set gtmtypes("sgmnt_data",521,"name")="sgmnt_data.gvstats_rec.n_tp_tot_retries_1"
+	Set gtmtypes("sgmnt_data",521,"off")=4304
 	Set gtmtypes("sgmnt_data",521,"len")=8
 	Set gtmtypes("sgmnt_data",521,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jrec_logical")=521
-	Set gtmtypes("sgmnt_data",522,"name")="sgmnt_data.gvstats_rec.n_jrec_pblk"
-	Set gtmtypes("sgmnt_data",522,"off")=4448
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_tot_retries_1")=521
+	Set gtmtypes("sgmnt_data",522,"name")="sgmnt_data.gvstats_rec.n_tp_tot_retries_2"
+	Set gtmtypes("sgmnt_data",522,"off")=4312
 	Set gtmtypes("sgmnt_data",522,"len")=8
 	Set gtmtypes("sgmnt_data",522,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jrec_pblk")=522
-	Set gtmtypes("sgmnt_data",523,"name")="sgmnt_data.gvstats_rec.n_jrec_epoch_regular"
-	Set gtmtypes("sgmnt_data",523,"off")=4456
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_tot_retries_2")=522
+	Set gtmtypes("sgmnt_data",523,"name")="sgmnt_data.gvstats_rec.n_tp_tot_retries_3"
+	Set gtmtypes("sgmnt_data",523,"off")=4320
 	Set gtmtypes("sgmnt_data",523,"len")=8
 	Set gtmtypes("sgmnt_data",523,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jrec_epoch_regular")=523
-	Set gtmtypes("sgmnt_data",524,"name")="sgmnt_data.gvstats_rec.n_jrec_epoch_idle"
-	Set gtmtypes("sgmnt_data",524,"off")=4464
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_tot_retries_3")=523
+	Set gtmtypes("sgmnt_data",524,"name")="sgmnt_data.gvstats_rec.n_tp_tot_retries_4"
+	Set gtmtypes("sgmnt_data",524,"off")=4328
 	Set gtmtypes("sgmnt_data",524,"len")=8
 	Set gtmtypes("sgmnt_data",524,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jrec_epoch_idle")=524
-	Set gtmtypes("sgmnt_data",525,"name")="sgmnt_data.gvstats_rec.n_jrec_other"
-	Set gtmtypes("sgmnt_data",525,"off")=4472
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_tot_retries_4")=524
+	Set gtmtypes("sgmnt_data",525,"name")="sgmnt_data.gvstats_rec.n_tp_cnflct_retries_0"
+	Set gtmtypes("sgmnt_data",525,"off")=4336
 	Set gtmtypes("sgmnt_data",525,"len")=8
 	Set gtmtypes("sgmnt_data",525,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jrec_other")=525
-	Set gtmtypes("sgmnt_data",526,"name")="sgmnt_data.gvstats_rec.n_jnl_extends"
-	Set gtmtypes("sgmnt_data",526,"off")=4480
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_cnflct_retries_0")=525
+	Set gtmtypes("sgmnt_data",526,"name")="sgmnt_data.gvstats_rec.n_tp_cnflct_retries_1"
+	Set gtmtypes("sgmnt_data",526,"off")=4344
 	Set gtmtypes("sgmnt_data",526,"len")=8
 	Set gtmtypes("sgmnt_data",526,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jnl_extends")=526
-	Set gtmtypes("sgmnt_data",527,"name")="sgmnt_data.gvstats_rec.n_db_extends"
-	Set gtmtypes("sgmnt_data",527,"off")=4488
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_cnflct_retries_1")=526
+	Set gtmtypes("sgmnt_data",527,"name")="sgmnt_data.gvstats_rec.n_tp_cnflct_retries_2"
+	Set gtmtypes("sgmnt_data",527,"off")=4352
 	Set gtmtypes("sgmnt_data",527,"len")=8
 	Set gtmtypes("sgmnt_data",527,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_db_extends")=527
-	Set gtmtypes("sgmnt_data",528,"name")="sgmnt_data.gvstats_rec.n_crit_success"
-	Set gtmtypes("sgmnt_data",528,"off")=4496
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_cnflct_retries_2")=527
+	Set gtmtypes("sgmnt_data",528,"name")="sgmnt_data.gvstats_rec.n_tp_cnflct_retries_3"
+	Set gtmtypes("sgmnt_data",528,"off")=4360
 	Set gtmtypes("sgmnt_data",528,"len")=8
 	Set gtmtypes("sgmnt_data",528,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_crit_success")=528
-	Set gtmtypes("sgmnt_data",529,"name")="sgmnt_data.gvstats_rec.n_crits_in_epch"
-	Set gtmtypes("sgmnt_data",529,"off")=4504
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_cnflct_retries_3")=528
+	Set gtmtypes("sgmnt_data",529,"name")="sgmnt_data.gvstats_rec.n_tp_cnflct_retries_4"
+	Set gtmtypes("sgmnt_data",529,"off")=4368
 	Set gtmtypes("sgmnt_data",529,"len")=8
 	Set gtmtypes("sgmnt_data",529,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_crits_in_epch")=529
-	Set gtmtypes("sgmnt_data",530,"name")="sgmnt_data.gvstats_rec.sq_crit_failed"
-	Set gtmtypes("sgmnt_data",530,"off")=4512
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_cnflct_retries_4")=529
+	Set gtmtypes("sgmnt_data",530,"name")="sgmnt_data.gvstats_rec.n_ztrigger"
+	Set gtmtypes("sgmnt_data",530,"off")=4376
 	Set gtmtypes("sgmnt_data",530,"len")=8
 	Set gtmtypes("sgmnt_data",530,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.sq_crit_failed")=530
-	Set gtmtypes("sgmnt_data",531,"name")="sgmnt_data.gvstats_rec.n_crit_failed"
-	Set gtmtypes("sgmnt_data",531,"off")=4520
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_ztrigger")=530
+	Set gtmtypes("sgmnt_data",531,"name")="sgmnt_data.gvstats_rec.n_db_flush"
+	Set gtmtypes("sgmnt_data",531,"off")=4384
 	Set gtmtypes("sgmnt_data",531,"len")=8
 	Set gtmtypes("sgmnt_data",531,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_crit_failed")=531
-	Set gtmtypes("sgmnt_data",532,"name")="sgmnt_data.gvstats_rec.sq_crit_que_slps"
-	Set gtmtypes("sgmnt_data",532,"off")=4528
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_db_flush")=531
+	Set gtmtypes("sgmnt_data",532,"name")="sgmnt_data.gvstats_rec.n_db_fsync"
+	Set gtmtypes("sgmnt_data",532,"off")=4392
 	Set gtmtypes("sgmnt_data",532,"len")=8
 	Set gtmtypes("sgmnt_data",532,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.sq_crit_que_slps")=532
-	Set gtmtypes("sgmnt_data",533,"name")="sgmnt_data.gvstats_rec.n_crit_que_slps"
-	Set gtmtypes("sgmnt_data",533,"off")=4536
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_db_fsync")=532
+	Set gtmtypes("sgmnt_data",533,"name")="sgmnt_data.gvstats_rec.n_jnl_flush"
+	Set gtmtypes("sgmnt_data",533,"off")=4400
 	Set gtmtypes("sgmnt_data",533,"len")=8
 	Set gtmtypes("sgmnt_data",533,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_crit_que_slps")=533
-	Set gtmtypes("sgmnt_data",534,"name")="sgmnt_data.gvstats_rec.sq_crit_yields"
-	Set gtmtypes("sgmnt_data",534,"off")=4544
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jnl_flush")=533
+	Set gtmtypes("sgmnt_data",534,"name")="sgmnt_data.gvstats_rec.n_jnl_fsync"
+	Set gtmtypes("sgmnt_data",534,"off")=4408
 	Set gtmtypes("sgmnt_data",534,"len")=8
 	Set gtmtypes("sgmnt_data",534,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.sq_crit_yields")=534
-	Set gtmtypes("sgmnt_data",535,"name")="sgmnt_data.gvstats_rec.n_crit_yields"
-	Set gtmtypes("sgmnt_data",535,"off")=4552
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jnl_fsync")=534
+	Set gtmtypes("sgmnt_data",535,"name")="sgmnt_data.gvstats_rec.n_jbuff_bytes"
+	Set gtmtypes("sgmnt_data",535,"off")=4416
 	Set gtmtypes("sgmnt_data",535,"len")=8
 	Set gtmtypes("sgmnt_data",535,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_crit_yields")=535
-	Set gtmtypes("sgmnt_data",536,"name")="sgmnt_data.gvstats_rec_filler_4k_plus_512"
-	Set gtmtypes("sgmnt_data",536,"off")=4560
-	Set gtmtypes("sgmnt_data",536,"len")=48
-	Set gtmtypes("sgmnt_data",536,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec_filler_4k_plus_512")=536
-	Set gtmtypes("sgmnt_data",537,"name")="sgmnt_data.filler_4k_plus_512"
-	Set gtmtypes("sgmnt_data",537,"off")=4608
-	Set gtmtypes("sgmnt_data",537,"len")=368
-	Set gtmtypes("sgmnt_data",537,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","filler_4k_plus_512")=537
-	Set gtmtypes("sgmnt_data",538,"name")="sgmnt_data.intrpt_recov_resync_strm_seqno"
-	Set gtmtypes("sgmnt_data",538,"off")=4976
-	Set gtmtypes("sgmnt_data",538,"len")=128
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jbuff_bytes")=535
+	Set gtmtypes("sgmnt_data",536,"name")="sgmnt_data.gvstats_rec.n_jfile_bytes"
+	Set gtmtypes("sgmnt_data",536,"off")=4424
+	Set gtmtypes("sgmnt_data",536,"len")=8
+	Set gtmtypes("sgmnt_data",536,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jfile_bytes")=536
+	Set gtmtypes("sgmnt_data",537,"name")="sgmnt_data.gvstats_rec.n_jfile_writes"
+	Set gtmtypes("sgmnt_data",537,"off")=4432
+	Set gtmtypes("sgmnt_data",537,"len")=8
+	Set gtmtypes("sgmnt_data",537,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jfile_writes")=537
+	Set gtmtypes("sgmnt_data",538,"name")="sgmnt_data.gvstats_rec.n_jrec_logical"
+	Set gtmtypes("sgmnt_data",538,"off")=4440
+	Set gtmtypes("sgmnt_data",538,"len")=8
 	Set gtmtypes("sgmnt_data",538,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","intrpt_recov_resync_strm_seqno")=538
-	Set gtmtypes("sgmnt_data",538,"dim")=16
-	Set gtmtypes("sgmnt_data",539,"name")="sgmnt_data.creation_db_ver"
-	Set gtmtypes("sgmnt_data",539,"off")=5104
-	Set gtmtypes("sgmnt_data",539,"len")=4
-	Set gtmtypes("sgmnt_data",539,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","creation_db_ver")=539
-	Set gtmtypes("sgmnt_data",540,"name")="sgmnt_data.creation_mdb_ver"
-	Set gtmtypes("sgmnt_data",540,"off")=5108
-	Set gtmtypes("sgmnt_data",540,"len")=4
-	Set gtmtypes("sgmnt_data",540,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","creation_mdb_ver")=540
-	Set gtmtypes("sgmnt_data",541,"name")="sgmnt_data.certified_for_upgrade_to"
-	Set gtmtypes("sgmnt_data",541,"off")=5112
-	Set gtmtypes("sgmnt_data",541,"len")=4
-	Set gtmtypes("sgmnt_data",541,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","certified_for_upgrade_to")=541
-	Set gtmtypes("sgmnt_data",542,"name")="sgmnt_data.filler_5k"
-	Set gtmtypes("sgmnt_data",542,"off")=5116
-	Set gtmtypes("sgmnt_data",542,"len")=4
-	Set gtmtypes("sgmnt_data",542,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","filler_5k")=542
-	Set gtmtypes("sgmnt_data",543,"name")="sgmnt_data.secshr_ops_index_filler"
-	Set gtmtypes("sgmnt_data",543,"off")=5120
-	Set gtmtypes("sgmnt_data",543,"len")=4
-	Set gtmtypes("sgmnt_data",543,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","secshr_ops_index_filler")=543
-	Set gtmtypes("sgmnt_data",544,"name")="sgmnt_data.secshr_ops_array_filler"
-	Set gtmtypes("sgmnt_data",544,"off")=5124
-	Set gtmtypes("sgmnt_data",544,"len")=1020
-	Set gtmtypes("sgmnt_data",544,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","secshr_ops_array_filler")=544
-	Set gtmtypes("sgmnt_data",544,"dim")=255
-	Set gtmtypes("sgmnt_data",545,"name")="sgmnt_data.next_upgrd_warn"
-	Set gtmtypes("sgmnt_data",545,"off")=6144
-	Set gtmtypes("sgmnt_data",545,"len")=24
-	Set gtmtypes("sgmnt_data",545,"type")="compswap_time_field"
-	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn")=545
-	Set gtmtypes("sgmnt_data",546,"name")="sgmnt_data.next_upgrd_warn.time_latch"
-	Set gtmtypes("sgmnt_data",546,"off")=6144
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jrec_logical")=538
+	Set gtmtypes("sgmnt_data",539,"name")="sgmnt_data.gvstats_rec.n_jrec_pblk"
+	Set gtmtypes("sgmnt_data",539,"off")=4448
+	Set gtmtypes("sgmnt_data",539,"len")=8
+	Set gtmtypes("sgmnt_data",539,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jrec_pblk")=539
+	Set gtmtypes("sgmnt_data",540,"name")="sgmnt_data.gvstats_rec.n_jrec_epoch_regular"
+	Set gtmtypes("sgmnt_data",540,"off")=4456
+	Set gtmtypes("sgmnt_data",540,"len")=8
+	Set gtmtypes("sgmnt_data",540,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jrec_epoch_regular")=540
+	Set gtmtypes("sgmnt_data",541,"name")="sgmnt_data.gvstats_rec.n_jrec_epoch_idle"
+	Set gtmtypes("sgmnt_data",541,"off")=4464
+	Set gtmtypes("sgmnt_data",541,"len")=8
+	Set gtmtypes("sgmnt_data",541,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jrec_epoch_idle")=541
+	Set gtmtypes("sgmnt_data",542,"name")="sgmnt_data.gvstats_rec.n_jrec_other"
+	Set gtmtypes("sgmnt_data",542,"off")=4472
+	Set gtmtypes("sgmnt_data",542,"len")=8
+	Set gtmtypes("sgmnt_data",542,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jrec_other")=542
+	Set gtmtypes("sgmnt_data",543,"name")="sgmnt_data.gvstats_rec.n_jnl_extends"
+	Set gtmtypes("sgmnt_data",543,"off")=4480
+	Set gtmtypes("sgmnt_data",543,"len")=8
+	Set gtmtypes("sgmnt_data",543,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jnl_extends")=543
+	Set gtmtypes("sgmnt_data",544,"name")="sgmnt_data.gvstats_rec.n_db_extends"
+	Set gtmtypes("sgmnt_data",544,"off")=4488
+	Set gtmtypes("sgmnt_data",544,"len")=8
+	Set gtmtypes("sgmnt_data",544,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_db_extends")=544
+	Set gtmtypes("sgmnt_data",545,"name")="sgmnt_data.gvstats_rec.n_crit_success"
+	Set gtmtypes("sgmnt_data",545,"off")=4496
+	Set gtmtypes("sgmnt_data",545,"len")=8
+	Set gtmtypes("sgmnt_data",545,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_crit_success")=545
+	Set gtmtypes("sgmnt_data",546,"name")="sgmnt_data.gvstats_rec.n_crits_in_epch"
+	Set gtmtypes("sgmnt_data",546,"off")=4504
 	Set gtmtypes("sgmnt_data",546,"len")=8
-	Set gtmtypes("sgmnt_data",546,"type")="global_latch_t"
-	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch")=546
-	Set gtmtypes("sgmnt_data",547,"name")="sgmnt_data.next_upgrd_warn.time_latch.u"
-	Set gtmtypes("sgmnt_data",547,"off")=6144
+	Set gtmtypes("sgmnt_data",546,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_crits_in_epch")=546
+	Set gtmtypes("sgmnt_data",547,"name")="sgmnt_data.gvstats_rec.sq_crit_failed"
+	Set gtmtypes("sgmnt_data",547,"off")=4512
 	Set gtmtypes("sgmnt_data",547,"len")=8
-	Set gtmtypes("sgmnt_data",547,"type")="union"
-	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch.u")=547
-	Set gtmtypes("sgmnt_data",548,"name")="sgmnt_data.next_upgrd_warn.time_latch.u.pid_imgcnt"
-	Set gtmtypes("sgmnt_data",548,"off")=6144
+	Set gtmtypes("sgmnt_data",547,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.sq_crit_failed")=547
+	Set gtmtypes("sgmnt_data",548,"name")="sgmnt_data.gvstats_rec.n_crit_failed"
+	Set gtmtypes("sgmnt_data",548,"off")=4520
 	Set gtmtypes("sgmnt_data",548,"len")=8
 	Set gtmtypes("sgmnt_data",548,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch.u.pid_imgcnt")=548
-	Set gtmtypes("sgmnt_data",549,"name")="sgmnt_data.next_upgrd_warn.time_latch.u.parts"
-	Set gtmtypes("sgmnt_data",549,"off")=6144
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_crit_failed")=548
+	Set gtmtypes("sgmnt_data",549,"name")="sgmnt_data.gvstats_rec.sq_crit_que_slps"
+	Set gtmtypes("sgmnt_data",549,"off")=4528
 	Set gtmtypes("sgmnt_data",549,"len")=8
-	Set gtmtypes("sgmnt_data",549,"type")="struct"
-	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch.u.parts")=549
-	Set gtmtypes("sgmnt_data",550,"name")="sgmnt_data.next_upgrd_warn.time_latch.u.parts.latch_pid"
-	Set gtmtypes("sgmnt_data",550,"off")=6144
-	Set gtmtypes("sgmnt_data",550,"len")=4
-	Set gtmtypes("sgmnt_data",550,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch.u.parts.latch_pid")=550
-	Set gtmtypes("sgmnt_data",551,"name")="sgmnt_data.next_upgrd_warn.time_latch.u.parts.latch_word"
-	Set gtmtypes("sgmnt_data",551,"off")=6148
-	Set gtmtypes("sgmnt_data",551,"len")=4
-	Set gtmtypes("sgmnt_data",551,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch.u.parts.latch_word")=551
-	Set gtmtypes("sgmnt_data",552,"name")="sgmnt_data.next_upgrd_warn.hp_latch_space"
-	Set gtmtypes("sgmnt_data",552,"off")=6152
-	Set gtmtypes("sgmnt_data",552,"len")=16
-	Set gtmtypes("sgmnt_data",552,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.hp_latch_space")=552
-	Set gtmtypes("sgmnt_data",552,"dim")=4
-	Set gtmtypes("sgmnt_data",553,"name")="sgmnt_data.is_encrypted"
-	Set gtmtypes("sgmnt_data",553,"off")=6168
-	Set gtmtypes("sgmnt_data",553,"len")=4
-	Set gtmtypes("sgmnt_data",553,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","is_encrypted")=553
-	Set gtmtypes("sgmnt_data",554,"name")="sgmnt_data.db_trigger_cycle"
-	Set gtmtypes("sgmnt_data",554,"off")=6172
-	Set gtmtypes("sgmnt_data",554,"len")=4
-	Set gtmtypes("sgmnt_data",554,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","db_trigger_cycle")=554
-	Set gtmtypes("sgmnt_data",555,"name")="sgmnt_data.strm_reg_seqno"
-	Set gtmtypes("sgmnt_data",555,"off")=6176
-	Set gtmtypes("sgmnt_data",555,"len")=128
-	Set gtmtypes("sgmnt_data",555,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","strm_reg_seqno")=555
-	Set gtmtypes("sgmnt_data",555,"dim")=16
-	Set gtmtypes("sgmnt_data",556,"name")="sgmnt_data.save_strm_reg_seqno"
-	Set gtmtypes("sgmnt_data",556,"off")=6304
+	Set gtmtypes("sgmnt_data",549,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.sq_crit_que_slps")=549
+	Set gtmtypes("sgmnt_data",550,"name")="sgmnt_data.gvstats_rec.n_crit_que_slps"
+	Set gtmtypes("sgmnt_data",550,"off")=4536
+	Set gtmtypes("sgmnt_data",550,"len")=8
+	Set gtmtypes("sgmnt_data",550,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_crit_que_slps")=550
+	Set gtmtypes("sgmnt_data",551,"name")="sgmnt_data.gvstats_rec.sq_crit_yields"
+	Set gtmtypes("sgmnt_data",551,"off")=4544
+	Set gtmtypes("sgmnt_data",551,"len")=8
+	Set gtmtypes("sgmnt_data",551,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.sq_crit_yields")=551
+	Set gtmtypes("sgmnt_data",552,"name")="sgmnt_data.gvstats_rec.n_crit_yields"
+	Set gtmtypes("sgmnt_data",552,"off")=4552
+	Set gtmtypes("sgmnt_data",552,"len")=8
+	Set gtmtypes("sgmnt_data",552,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_crit_yields")=552
+	Set gtmtypes("sgmnt_data",553,"name")="sgmnt_data.gvstats_rec.n_clean2dirty"
+	Set gtmtypes("sgmnt_data",553,"off")=4560
+	Set gtmtypes("sgmnt_data",553,"len")=8
+	Set gtmtypes("sgmnt_data",553,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_clean2dirty")=553
+	Set gtmtypes("sgmnt_data",554,"name")="sgmnt_data.gvstats_rec_filler_4k_plus_512"
+	Set gtmtypes("sgmnt_data",554,"off")=4568
+	Set gtmtypes("sgmnt_data",554,"len")=40
+	Set gtmtypes("sgmnt_data",554,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec_filler_4k_plus_512")=554
+	Set gtmtypes("sgmnt_data",555,"name")="sgmnt_data.filler_4k_plus_512"
+	Set gtmtypes("sgmnt_data",555,"off")=4608
+	Set gtmtypes("sgmnt_data",555,"len")=368
+	Set gtmtypes("sgmnt_data",555,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","filler_4k_plus_512")=555
+	Set gtmtypes("sgmnt_data",556,"name")="sgmnt_data.intrpt_recov_resync_strm_seqno"
+	Set gtmtypes("sgmnt_data",556,"off")=4976
 	Set gtmtypes("sgmnt_data",556,"len")=128
 	Set gtmtypes("sgmnt_data",556,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","save_strm_reg_seqno")=556
+	Set gtmtypfldindx("sgmnt_data","intrpt_recov_resync_strm_seqno")=556
 	Set gtmtypes("sgmnt_data",556,"dim")=16
-	Set gtmtypes("sgmnt_data",557,"name")="sgmnt_data.freeze_on_fail"
-	Set gtmtypes("sgmnt_data",557,"off")=6432
+	Set gtmtypes("sgmnt_data",557,"name")="sgmnt_data.creation_db_ver"
+	Set gtmtypes("sgmnt_data",557,"off")=5104
 	Set gtmtypes("sgmnt_data",557,"len")=4
-	Set gtmtypes("sgmnt_data",557,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","freeze_on_fail")=557
-	Set gtmtypes("sgmnt_data",558,"name")="sgmnt_data.span_node_absent"
-	Set gtmtypes("sgmnt_data",558,"off")=6436
+	Set gtmtypes("sgmnt_data",557,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","creation_db_ver")=557
+	Set gtmtypes("sgmnt_data",558,"name")="sgmnt_data.creation_mdb_ver"
+	Set gtmtypes("sgmnt_data",558,"off")=5108
 	Set gtmtypes("sgmnt_data",558,"len")=4
-	Set gtmtypes("sgmnt_data",558,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","span_node_absent")=558
-	Set gtmtypes("sgmnt_data",559,"name")="sgmnt_data.maxkeysz_assured"
-	Set gtmtypes("sgmnt_data",559,"off")=6440
+	Set gtmtypes("sgmnt_data",558,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","creation_mdb_ver")=558
+	Set gtmtypes("sgmnt_data",559,"name")="sgmnt_data.certified_for_upgrade_to"
+	Set gtmtypes("sgmnt_data",559,"off")=5112
 	Set gtmtypes("sgmnt_data",559,"len")=4
-	Set gtmtypes("sgmnt_data",559,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","maxkeysz_assured")=559
-	Set gtmtypes("sgmnt_data",560,"name")="sgmnt_data.hasht_upgrade_needed"
-	Set gtmtypes("sgmnt_data",560,"off")=6444
+	Set gtmtypes("sgmnt_data",559,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","certified_for_upgrade_to")=559
+	Set gtmtypes("sgmnt_data",560,"name")="sgmnt_data.filler_5k"
+	Set gtmtypes("sgmnt_data",560,"off")=5116
 	Set gtmtypes("sgmnt_data",560,"len")=4
-	Set gtmtypes("sgmnt_data",560,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","hasht_upgrade_needed")=560
-	Set gtmtypes("sgmnt_data",561,"name")="sgmnt_data.defer_allocate"
-	Set gtmtypes("sgmnt_data",561,"off")=6448
+	Set gtmtypes("sgmnt_data",560,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","filler_5k")=560
+	Set gtmtypes("sgmnt_data",561,"name")="sgmnt_data.secshr_ops_index_filler"
+	Set gtmtypes("sgmnt_data",561,"off")=5120
 	Set gtmtypes("sgmnt_data",561,"len")=4
-	Set gtmtypes("sgmnt_data",561,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","defer_allocate")=561
-	Set gtmtypes("sgmnt_data",562,"name")="sgmnt_data.filler_ftok_counter_halted"
-	Set gtmtypes("sgmnt_data",562,"off")=6452
-	Set gtmtypes("sgmnt_data",562,"len")=4
-	Set gtmtypes("sgmnt_data",562,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","filler_ftok_counter_halted")=562
-	Set gtmtypes("sgmnt_data",563,"name")="sgmnt_data.filler_access_counter_halted"
-	Set gtmtypes("sgmnt_data",563,"off")=6456
-	Set gtmtypes("sgmnt_data",563,"len")=4
-	Set gtmtypes("sgmnt_data",563,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","filler_access_counter_halted")=563
-	Set gtmtypes("sgmnt_data",564,"name")="sgmnt_data.filler_7k"
-	Set gtmtypes("sgmnt_data",564,"off")=6460
-	Set gtmtypes("sgmnt_data",564,"len")=708
-	Set gtmtypes("sgmnt_data",564,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","filler_7k")=564
-	Set gtmtypes("sgmnt_data",565,"name")="sgmnt_data.filler_8k"
-	Set gtmtypes("sgmnt_data",565,"off")=7168
-	Set gtmtypes("sgmnt_data",565,"len")=1024
-	Set gtmtypes("sgmnt_data",565,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","filler_8k")=565
+	Set gtmtypes("sgmnt_data",561,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","secshr_ops_index_filler")=561
+	Set gtmtypes("sgmnt_data",562,"name")="sgmnt_data.secshr_ops_array_filler"
+	Set gtmtypes("sgmnt_data",562,"off")=5124
+	Set gtmtypes("sgmnt_data",562,"len")=1020
+	Set gtmtypes("sgmnt_data",562,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","secshr_ops_array_filler")=562
+	Set gtmtypes("sgmnt_data",562,"dim")=255
+	Set gtmtypes("sgmnt_data",563,"name")="sgmnt_data.next_upgrd_warn"
+	Set gtmtypes("sgmnt_data",563,"off")=6144
+	Set gtmtypes("sgmnt_data",563,"len")=24
+	Set gtmtypes("sgmnt_data",563,"type")="compswap_time_field"
+	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn")=563
+	Set gtmtypes("sgmnt_data",564,"name")="sgmnt_data.next_upgrd_warn.time_latch"
+	Set gtmtypes("sgmnt_data",564,"off")=6144
+	Set gtmtypes("sgmnt_data",564,"len")=8
+	Set gtmtypes("sgmnt_data",564,"type")="global_latch_t"
+	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch")=564
+	Set gtmtypes("sgmnt_data",565,"name")="sgmnt_data.next_upgrd_warn.time_latch.u"
+	Set gtmtypes("sgmnt_data",565,"off")=6144
+	Set gtmtypes("sgmnt_data",565,"len")=8
+	Set gtmtypes("sgmnt_data",565,"type")="union"
+	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch.u")=565
+	Set gtmtypes("sgmnt_data",566,"name")="sgmnt_data.next_upgrd_warn.time_latch.u.pid_imgcnt"
+	Set gtmtypes("sgmnt_data",566,"off")=6144
+	Set gtmtypes("sgmnt_data",566,"len")=8
+	Set gtmtypes("sgmnt_data",566,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch.u.pid_imgcnt")=566
+	Set gtmtypes("sgmnt_data",567,"name")="sgmnt_data.next_upgrd_warn.time_latch.u.parts"
+	Set gtmtypes("sgmnt_data",567,"off")=6144
+	Set gtmtypes("sgmnt_data",567,"len")=8
+	Set gtmtypes("sgmnt_data",567,"type")="struct"
+	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch.u.parts")=567
+	Set gtmtypes("sgmnt_data",568,"name")="sgmnt_data.next_upgrd_warn.time_latch.u.parts.latch_pid"
+	Set gtmtypes("sgmnt_data",568,"off")=6144
+	Set gtmtypes("sgmnt_data",568,"len")=4
+	Set gtmtypes("sgmnt_data",568,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch.u.parts.latch_pid")=568
+	Set gtmtypes("sgmnt_data",569,"name")="sgmnt_data.next_upgrd_warn.time_latch.u.parts.latch_word"
+	Set gtmtypes("sgmnt_data",569,"off")=6148
+	Set gtmtypes("sgmnt_data",569,"len")=4
+	Set gtmtypes("sgmnt_data",569,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch.u.parts.latch_word")=569
+	Set gtmtypes("sgmnt_data",570,"name")="sgmnt_data.next_upgrd_warn.hp_latch_space"
+	Set gtmtypes("sgmnt_data",570,"off")=6152
+	Set gtmtypes("sgmnt_data",570,"len")=16
+	Set gtmtypes("sgmnt_data",570,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.hp_latch_space")=570
+	Set gtmtypes("sgmnt_data",570,"dim")=4
+	Set gtmtypes("sgmnt_data",571,"name")="sgmnt_data.is_encrypted"
+	Set gtmtypes("sgmnt_data",571,"off")=6168
+	Set gtmtypes("sgmnt_data",571,"len")=4
+	Set gtmtypes("sgmnt_data",571,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","is_encrypted")=571
+	Set gtmtypes("sgmnt_data",572,"name")="sgmnt_data.db_trigger_cycle"
+	Set gtmtypes("sgmnt_data",572,"off")=6172
+	Set gtmtypes("sgmnt_data",572,"len")=4
+	Set gtmtypes("sgmnt_data",572,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","db_trigger_cycle")=572
+	Set gtmtypes("sgmnt_data",573,"name")="sgmnt_data.strm_reg_seqno"
+	Set gtmtypes("sgmnt_data",573,"off")=6176
+	Set gtmtypes("sgmnt_data",573,"len")=128
+	Set gtmtypes("sgmnt_data",573,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","strm_reg_seqno")=573
+	Set gtmtypes("sgmnt_data",573,"dim")=16
+	Set gtmtypes("sgmnt_data",574,"name")="sgmnt_data.save_strm_reg_seqno"
+	Set gtmtypes("sgmnt_data",574,"off")=6304
+	Set gtmtypes("sgmnt_data",574,"len")=128
+	Set gtmtypes("sgmnt_data",574,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","save_strm_reg_seqno")=574
+	Set gtmtypes("sgmnt_data",574,"dim")=16
+	Set gtmtypes("sgmnt_data",575,"name")="sgmnt_data.freeze_on_fail"
+	Set gtmtypes("sgmnt_data",575,"off")=6432
+	Set gtmtypes("sgmnt_data",575,"len")=4
+	Set gtmtypes("sgmnt_data",575,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","freeze_on_fail")=575
+	Set gtmtypes("sgmnt_data",576,"name")="sgmnt_data.span_node_absent"
+	Set gtmtypes("sgmnt_data",576,"off")=6436
+	Set gtmtypes("sgmnt_data",576,"len")=4
+	Set gtmtypes("sgmnt_data",576,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","span_node_absent")=576
+	Set gtmtypes("sgmnt_data",577,"name")="sgmnt_data.maxkeysz_assured"
+	Set gtmtypes("sgmnt_data",577,"off")=6440
+	Set gtmtypes("sgmnt_data",577,"len")=4
+	Set gtmtypes("sgmnt_data",577,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","maxkeysz_assured")=577
+	Set gtmtypes("sgmnt_data",578,"name")="sgmnt_data.hasht_upgrade_needed"
+	Set gtmtypes("sgmnt_data",578,"off")=6444
+	Set gtmtypes("sgmnt_data",578,"len")=4
+	Set gtmtypes("sgmnt_data",578,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","hasht_upgrade_needed")=578
+	Set gtmtypes("sgmnt_data",579,"name")="sgmnt_data.defer_allocate"
+	Set gtmtypes("sgmnt_data",579,"off")=6448
+	Set gtmtypes("sgmnt_data",579,"len")=4
+	Set gtmtypes("sgmnt_data",579,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","defer_allocate")=579
+	Set gtmtypes("sgmnt_data",580,"name")="sgmnt_data.filler_ftok_counter_halted"
+	Set gtmtypes("sgmnt_data",580,"off")=6452
+	Set gtmtypes("sgmnt_data",580,"len")=4
+	Set gtmtypes("sgmnt_data",580,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","filler_ftok_counter_halted")=580
+	Set gtmtypes("sgmnt_data",581,"name")="sgmnt_data.filler_access_counter_halted"
+	Set gtmtypes("sgmnt_data",581,"off")=6456
+	Set gtmtypes("sgmnt_data",581,"len")=4
+	Set gtmtypes("sgmnt_data",581,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","filler_access_counter_halted")=581
+	Set gtmtypes("sgmnt_data",582,"name")="sgmnt_data.lock_crit_with_db"
+	Set gtmtypes("sgmnt_data",582,"off")=6460
+	Set gtmtypes("sgmnt_data",582,"len")=4
+	Set gtmtypes("sgmnt_data",582,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","lock_crit_with_db")=582
+	Set gtmtypes("sgmnt_data",583,"name")="sgmnt_data.basedb_fname_len"
+	Set gtmtypes("sgmnt_data",583,"off")=6464
+	Set gtmtypes("sgmnt_data",583,"len")=4
+	Set gtmtypes("sgmnt_data",583,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","basedb_fname_len")=583
+	Set gtmtypes("sgmnt_data",584,"name")="sgmnt_data.basedb_fname"
+	Set gtmtypes("sgmnt_data",584,"off")=6468
+	Set gtmtypes("sgmnt_data",584,"len")=256
+	Set gtmtypes("sgmnt_data",584,"type")="unsigned-char"
+	Set gtmtypfldindx("sgmnt_data","basedb_fname")=584
+	Set gtmtypes("sgmnt_data",585,"name")="sgmnt_data.filler_7k"
+	Set gtmtypes("sgmnt_data",585,"off")=6724
+	Set gtmtypes("sgmnt_data",585,"len")=444
+	Set gtmtypes("sgmnt_data",585,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","filler_7k")=585
+	Set gtmtypes("sgmnt_data",586,"name")="sgmnt_data.filler_8k"
+	Set gtmtypes("sgmnt_data",586,"off")=7168
+	Set gtmtypes("sgmnt_data",586,"len")=1024
+	Set gtmtypes("sgmnt_data",586,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","filler_8k")=586
 	;
 	Set gtmtypes("shm_forw_multi_t")="struct"
 	Set gtmtypes("shm_forw_multi_t",0)=20
@@ -29743,7 +30358,7 @@ Init
 	Set gtmtypes("shm_reg_ctl_t",9,"dim")=3
 	;
 	Set gtmtypes("shm_snapshot_t")="struct"
-	Set gtmtypes("shm_snapshot_t",0)=587
+	Set gtmtypes("shm_snapshot_t",0)=608
 	Set gtmtypes("shm_snapshot_t","len")=12376
 	Set gtmtypes("shm_snapshot_t",1,"name")="shm_snapshot_t.ss_info"
 	Set gtmtypes("shm_snapshot_t",1,"off")=0
@@ -29943,7 +30558,7 @@ Init
 	Set gtmtypes("shm_snapshot_t",40,"name")="shm_snapshot_t.shadow_file_header.null_subs"
 	Set gtmtypes("shm_snapshot_t",40,"off")=4260
 	Set gtmtypes("shm_snapshot_t",40,"len")=4
-	Set gtmtypes("shm_snapshot_t",40,"type")="boolean_t"
+	Set gtmtypes("shm_snapshot_t",40,"type")="int"
 	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.null_subs")=40
 	Set gtmtypes("shm_snapshot_t",41,"name")="shm_snapshot_t.shadow_file_header.free_space"
 	Set gtmtypes("shm_snapshot_t",41,"off")=4264
@@ -30025,11 +30640,11 @@ Init
 	Set gtmtypes("shm_snapshot_t",56,"len")=4
 	Set gtmtypes("shm_snapshot_t",56,"type")="int"
 	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.creation_time4")=56
-	Set gtmtypes("shm_snapshot_t",57,"name")="shm_snapshot_t.shadow_file_header.creation_filler_8byte"
+	Set gtmtypes("shm_snapshot_t",57,"name")="shm_snapshot_t.shadow_file_header.reservedDBFlags"
 	Set gtmtypes("shm_snapshot_t",57,"off")=4372
 	Set gtmtypes("shm_snapshot_t",57,"len")=4
-	Set gtmtypes("shm_snapshot_t",57,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.creation_filler_8byte")=57
+	Set gtmtypes("shm_snapshot_t",57,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reservedDBFlags")=57
 	Set gtmtypes("shm_snapshot_t",58,"name")="shm_snapshot_t.shadow_file_header.max_tn"
 	Set gtmtypes("shm_snapshot_t",58,"off")=4376
 	Set gtmtypes("shm_snapshot_t",58,"len")=8
@@ -30110,2592 +30725,2697 @@ Init
 	Set gtmtypes("shm_snapshot_t",73,"len")=4
 	Set gtmtypes("shm_snapshot_t",73,"type")="int"
 	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.abandoned_kills")=73
-	Set gtmtypes("shm_snapshot_t",74,"name")="shm_snapshot_t.shadow_file_header.filler_320"
+	Set gtmtypes("shm_snapshot_t",74,"name")="shm_snapshot_t.shadow_file_header.freeze_online"
 	Set gtmtypes("shm_snapshot_t",74,"off")=4496
-	Set gtmtypes("shm_snapshot_t",74,"len")=8
-	Set gtmtypes("shm_snapshot_t",74,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_320")=74
-	Set gtmtypes("shm_snapshot_t",75,"name")="shm_snapshot_t.shadow_file_header.tn_upgrd_blks_0"
-	Set gtmtypes("shm_snapshot_t",75,"off")=4504
-	Set gtmtypes("shm_snapshot_t",75,"len")=8
-	Set gtmtypes("shm_snapshot_t",75,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.tn_upgrd_blks_0")=75
-	Set gtmtypes("shm_snapshot_t",76,"name")="shm_snapshot_t.shadow_file_header.desired_db_format_tn"
-	Set gtmtypes("shm_snapshot_t",76,"off")=4512
+	Set gtmtypes("shm_snapshot_t",74,"len")=4
+	Set gtmtypes("shm_snapshot_t",74,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.freeze_online")=74
+	Set gtmtypes("shm_snapshot_t",75,"name")="shm_snapshot_t.shadow_file_header.filler_320"
+	Set gtmtypes("shm_snapshot_t",75,"off")=4500
+	Set gtmtypes("shm_snapshot_t",75,"len")=4
+	Set gtmtypes("shm_snapshot_t",75,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_320")=75
+	Set gtmtypes("shm_snapshot_t",76,"name")="shm_snapshot_t.shadow_file_header.tn_upgrd_blks_0"
+	Set gtmtypes("shm_snapshot_t",76,"off")=4504
 	Set gtmtypes("shm_snapshot_t",76,"len")=8
 	Set gtmtypes("shm_snapshot_t",76,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.desired_db_format_tn")=76
-	Set gtmtypes("shm_snapshot_t",77,"name")="shm_snapshot_t.shadow_file_header.reorg_db_fmt_start_tn"
-	Set gtmtypes("shm_snapshot_t",77,"off")=4520
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.tn_upgrd_blks_0")=76
+	Set gtmtypes("shm_snapshot_t",77,"name")="shm_snapshot_t.shadow_file_header.desired_db_format_tn"
+	Set gtmtypes("shm_snapshot_t",77,"off")=4512
 	Set gtmtypes("shm_snapshot_t",77,"len")=8
 	Set gtmtypes("shm_snapshot_t",77,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reorg_db_fmt_start_tn")=77
-	Set gtmtypes("shm_snapshot_t",78,"name")="shm_snapshot_t.shadow_file_header.reorg_upgrd_dwngrd_restart_block"
-	Set gtmtypes("shm_snapshot_t",78,"off")=4528
-	Set gtmtypes("shm_snapshot_t",78,"len")=4
-	Set gtmtypes("shm_snapshot_t",78,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reorg_upgrd_dwngrd_restart_block")=78
-	Set gtmtypes("shm_snapshot_t",79,"name")="shm_snapshot_t.shadow_file_header.blks_to_upgrd"
-	Set gtmtypes("shm_snapshot_t",79,"off")=4532
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.desired_db_format_tn")=77
+	Set gtmtypes("shm_snapshot_t",78,"name")="shm_snapshot_t.shadow_file_header.reorg_db_fmt_start_tn"
+	Set gtmtypes("shm_snapshot_t",78,"off")=4520
+	Set gtmtypes("shm_snapshot_t",78,"len")=8
+	Set gtmtypes("shm_snapshot_t",78,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reorg_db_fmt_start_tn")=78
+	Set gtmtypes("shm_snapshot_t",79,"name")="shm_snapshot_t.shadow_file_header.reorg_upgrd_dwngrd_restart_block"
+	Set gtmtypes("shm_snapshot_t",79,"off")=4528
 	Set gtmtypes("shm_snapshot_t",79,"len")=4
 	Set gtmtypes("shm_snapshot_t",79,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.blks_to_upgrd")=79
-	Set gtmtypes("shm_snapshot_t",80,"name")="shm_snapshot_t.shadow_file_header.blks_to_upgrd_subzero_error"
-	Set gtmtypes("shm_snapshot_t",80,"off")=4536
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reorg_upgrd_dwngrd_restart_block")=79
+	Set gtmtypes("shm_snapshot_t",80,"name")="shm_snapshot_t.shadow_file_header.blks_to_upgrd"
+	Set gtmtypes("shm_snapshot_t",80,"off")=4532
 	Set gtmtypes("shm_snapshot_t",80,"len")=4
 	Set gtmtypes("shm_snapshot_t",80,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.blks_to_upgrd_subzero_error")=80
-	Set gtmtypes("shm_snapshot_t",81,"name")="shm_snapshot_t.shadow_file_header.desired_db_format"
-	Set gtmtypes("shm_snapshot_t",81,"off")=4540
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.blks_to_upgrd")=80
+	Set gtmtypes("shm_snapshot_t",81,"name")="shm_snapshot_t.shadow_file_header.blks_to_upgrd_subzero_error"
+	Set gtmtypes("shm_snapshot_t",81,"off")=4536
 	Set gtmtypes("shm_snapshot_t",81,"len")=4
 	Set gtmtypes("shm_snapshot_t",81,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.desired_db_format")=81
-	Set gtmtypes("shm_snapshot_t",82,"name")="shm_snapshot_t.shadow_file_header.fully_upgraded"
-	Set gtmtypes("shm_snapshot_t",82,"off")=4544
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.blks_to_upgrd_subzero_error")=81
+	Set gtmtypes("shm_snapshot_t",82,"name")="shm_snapshot_t.shadow_file_header.desired_db_format"
+	Set gtmtypes("shm_snapshot_t",82,"off")=4540
 	Set gtmtypes("shm_snapshot_t",82,"len")=4
-	Set gtmtypes("shm_snapshot_t",82,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.fully_upgraded")=82
-	Set gtmtypes("shm_snapshot_t",83,"name")="shm_snapshot_t.shadow_file_header.db_got_to_v5_once"
-	Set gtmtypes("shm_snapshot_t",83,"off")=4548
+	Set gtmtypes("shm_snapshot_t",82,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.desired_db_format")=82
+	Set gtmtypes("shm_snapshot_t",83,"name")="shm_snapshot_t.shadow_file_header.fully_upgraded"
+	Set gtmtypes("shm_snapshot_t",83,"off")=4544
 	Set gtmtypes("shm_snapshot_t",83,"len")=4
 	Set gtmtypes("shm_snapshot_t",83,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_got_to_v5_once")=83
-	Set gtmtypes("shm_snapshot_t",84,"name")="shm_snapshot_t.shadow_file_header.opened_by_gtmv53"
-	Set gtmtypes("shm_snapshot_t",84,"off")=4552
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.fully_upgraded")=83
+	Set gtmtypes("shm_snapshot_t",84,"name")="shm_snapshot_t.shadow_file_header.db_got_to_v5_once"
+	Set gtmtypes("shm_snapshot_t",84,"off")=4548
 	Set gtmtypes("shm_snapshot_t",84,"len")=4
 	Set gtmtypes("shm_snapshot_t",84,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.opened_by_gtmv53")=84
-	Set gtmtypes("shm_snapshot_t",85,"name")="shm_snapshot_t.shadow_file_header.filler_384"
-	Set gtmtypes("shm_snapshot_t",85,"off")=4556
-	Set gtmtypes("shm_snapshot_t",85,"len")=12
-	Set gtmtypes("shm_snapshot_t",85,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_384")=85
-	Set gtmtypes("shm_snapshot_t",86,"name")="shm_snapshot_t.shadow_file_header.trans_hist"
-	Set gtmtypes("shm_snapshot_t",86,"off")=4568
-	Set gtmtypes("shm_snapshot_t",86,"len")=56
-	Set gtmtypes("shm_snapshot_t",86,"type")="th_index"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist")=86
-	Set gtmtypes("shm_snapshot_t",87,"name")="shm_snapshot_t.shadow_file_header.trans_hist.curr_tn"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_got_to_v5_once")=84
+	Set gtmtypes("shm_snapshot_t",85,"name")="shm_snapshot_t.shadow_file_header.opened_by_gtmv53"
+	Set gtmtypes("shm_snapshot_t",85,"off")=4552
+	Set gtmtypes("shm_snapshot_t",85,"len")=4
+	Set gtmtypes("shm_snapshot_t",85,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.opened_by_gtmv53")=85
+	Set gtmtypes("shm_snapshot_t",86,"name")="shm_snapshot_t.shadow_file_header.filler_384"
+	Set gtmtypes("shm_snapshot_t",86,"off")=4556
+	Set gtmtypes("shm_snapshot_t",86,"len")=12
+	Set gtmtypes("shm_snapshot_t",86,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_384")=86
+	Set gtmtypes("shm_snapshot_t",87,"name")="shm_snapshot_t.shadow_file_header.trans_hist"
 	Set gtmtypes("shm_snapshot_t",87,"off")=4568
-	Set gtmtypes("shm_snapshot_t",87,"len")=8
-	Set gtmtypes("shm_snapshot_t",87,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.curr_tn")=87
-	Set gtmtypes("shm_snapshot_t",88,"name")="shm_snapshot_t.shadow_file_header.trans_hist.early_tn"
-	Set gtmtypes("shm_snapshot_t",88,"off")=4576
+	Set gtmtypes("shm_snapshot_t",87,"len")=56
+	Set gtmtypes("shm_snapshot_t",87,"type")="th_index"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist")=87
+	Set gtmtypes("shm_snapshot_t",88,"name")="shm_snapshot_t.shadow_file_header.trans_hist.curr_tn"
+	Set gtmtypes("shm_snapshot_t",88,"off")=4568
 	Set gtmtypes("shm_snapshot_t",88,"len")=8
 	Set gtmtypes("shm_snapshot_t",88,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.early_tn")=88
-	Set gtmtypes("shm_snapshot_t",89,"name")="shm_snapshot_t.shadow_file_header.trans_hist.last_mm_sync"
-	Set gtmtypes("shm_snapshot_t",89,"off")=4584
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.curr_tn")=88
+	Set gtmtypes("shm_snapshot_t",89,"name")="shm_snapshot_t.shadow_file_header.trans_hist.early_tn"
+	Set gtmtypes("shm_snapshot_t",89,"off")=4576
 	Set gtmtypes("shm_snapshot_t",89,"len")=8
 	Set gtmtypes("shm_snapshot_t",89,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.last_mm_sync")=89
-	Set gtmtypes("shm_snapshot_t",90,"name")="shm_snapshot_t.shadow_file_header.trans_hist.filler_8byte"
-	Set gtmtypes("shm_snapshot_t",90,"off")=4592
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.early_tn")=89
+	Set gtmtypes("shm_snapshot_t",90,"name")="shm_snapshot_t.shadow_file_header.trans_hist.last_mm_sync"
+	Set gtmtypes("shm_snapshot_t",90,"off")=4584
 	Set gtmtypes("shm_snapshot_t",90,"len")=8
-	Set gtmtypes("shm_snapshot_t",90,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.filler_8byte")=90
-	Set gtmtypes("shm_snapshot_t",91,"name")="shm_snapshot_t.shadow_file_header.trans_hist.mm_tn"
-	Set gtmtypes("shm_snapshot_t",91,"off")=4600
+	Set gtmtypes("shm_snapshot_t",90,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.last_mm_sync")=90
+	Set gtmtypes("shm_snapshot_t",91,"name")="shm_snapshot_t.shadow_file_header.trans_hist.filler_8byte"
+	Set gtmtypes("shm_snapshot_t",91,"off")=4592
 	Set gtmtypes("shm_snapshot_t",91,"len")=8
-	Set gtmtypes("shm_snapshot_t",91,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.mm_tn")=91
-	Set gtmtypes("shm_snapshot_t",92,"name")="shm_snapshot_t.shadow_file_header.trans_hist.lock_sequence"
-	Set gtmtypes("shm_snapshot_t",92,"off")=4608
-	Set gtmtypes("shm_snapshot_t",92,"len")=4
-	Set gtmtypes("shm_snapshot_t",92,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.lock_sequence")=92
-	Set gtmtypes("shm_snapshot_t",93,"name")="shm_snapshot_t.shadow_file_header.trans_hist.ccp_jnl_filesize"
-	Set gtmtypes("shm_snapshot_t",93,"off")=4612
+	Set gtmtypes("shm_snapshot_t",91,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.filler_8byte")=91
+	Set gtmtypes("shm_snapshot_t",92,"name")="shm_snapshot_t.shadow_file_header.trans_hist.mm_tn"
+	Set gtmtypes("shm_snapshot_t",92,"off")=4600
+	Set gtmtypes("shm_snapshot_t",92,"len")=8
+	Set gtmtypes("shm_snapshot_t",92,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.mm_tn")=92
+	Set gtmtypes("shm_snapshot_t",93,"name")="shm_snapshot_t.shadow_file_header.trans_hist.lock_sequence"
+	Set gtmtypes("shm_snapshot_t",93,"off")=4608
 	Set gtmtypes("shm_snapshot_t",93,"len")=4
 	Set gtmtypes("shm_snapshot_t",93,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.ccp_jnl_filesize")=93
-	Set gtmtypes("shm_snapshot_t",94,"name")="shm_snapshot_t.shadow_file_header.trans_hist.total_blks"
-	Set gtmtypes("shm_snapshot_t",94,"off")=4616
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.lock_sequence")=93
+	Set gtmtypes("shm_snapshot_t",94,"name")="shm_snapshot_t.shadow_file_header.trans_hist.ccp_jnl_filesize"
+	Set gtmtypes("shm_snapshot_t",94,"off")=4612
 	Set gtmtypes("shm_snapshot_t",94,"len")=4
 	Set gtmtypes("shm_snapshot_t",94,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.total_blks")=94
-	Set gtmtypes("shm_snapshot_t",95,"name")="shm_snapshot_t.shadow_file_header.trans_hist.free_blocks"
-	Set gtmtypes("shm_snapshot_t",95,"off")=4620
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.ccp_jnl_filesize")=94
+	Set gtmtypes("shm_snapshot_t",95,"name")="shm_snapshot_t.shadow_file_header.trans_hist.total_blks"
+	Set gtmtypes("shm_snapshot_t",95,"off")=4616
 	Set gtmtypes("shm_snapshot_t",95,"len")=4
 	Set gtmtypes("shm_snapshot_t",95,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.free_blocks")=95
-	Set gtmtypes("shm_snapshot_t",96,"name")="shm_snapshot_t.shadow_file_header.filler_trans_hist"
-	Set gtmtypes("shm_snapshot_t",96,"off")=4624
-	Set gtmtypes("shm_snapshot_t",96,"len")=8
-	Set gtmtypes("shm_snapshot_t",96,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_trans_hist")=96
-	Set gtmtypes("shm_snapshot_t",97,"name")="shm_snapshot_t.shadow_file_header.flush_time"
-	Set gtmtypes("shm_snapshot_t",97,"off")=4632
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.total_blks")=95
+	Set gtmtypes("shm_snapshot_t",96,"name")="shm_snapshot_t.shadow_file_header.trans_hist.free_blocks"
+	Set gtmtypes("shm_snapshot_t",96,"off")=4620
+	Set gtmtypes("shm_snapshot_t",96,"len")=4
+	Set gtmtypes("shm_snapshot_t",96,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.free_blocks")=96
+	Set gtmtypes("shm_snapshot_t",97,"name")="shm_snapshot_t.shadow_file_header.filler_trans_hist"
+	Set gtmtypes("shm_snapshot_t",97,"off")=4624
 	Set gtmtypes("shm_snapshot_t",97,"len")=8
-	Set gtmtypes("shm_snapshot_t",97,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.flush_time")=97
-	Set gtmtypes("shm_snapshot_t",97,"dim")=2
-	Set gtmtypes("shm_snapshot_t",98,"name")="shm_snapshot_t.shadow_file_header.flush_trigger"
-	Set gtmtypes("shm_snapshot_t",98,"off")=4640
-	Set gtmtypes("shm_snapshot_t",98,"len")=4
+	Set gtmtypes("shm_snapshot_t",97,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_trans_hist")=97
+	Set gtmtypes("shm_snapshot_t",98,"name")="shm_snapshot_t.shadow_file_header.flush_time"
+	Set gtmtypes("shm_snapshot_t",98,"off")=4632
+	Set gtmtypes("shm_snapshot_t",98,"len")=8
 	Set gtmtypes("shm_snapshot_t",98,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.flush_trigger")=98
-	Set gtmtypes("shm_snapshot_t",99,"name")="shm_snapshot_t.shadow_file_header.n_wrt_per_flu"
-	Set gtmtypes("shm_snapshot_t",99,"off")=4644
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.flush_time")=98
+	Set gtmtypes("shm_snapshot_t",98,"dim")=2
+	Set gtmtypes("shm_snapshot_t",99,"name")="shm_snapshot_t.shadow_file_header.flush_trigger"
+	Set gtmtypes("shm_snapshot_t",99,"off")=4640
 	Set gtmtypes("shm_snapshot_t",99,"len")=4
 	Set gtmtypes("shm_snapshot_t",99,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_wrt_per_flu")=99
-	Set gtmtypes("shm_snapshot_t",100,"name")="shm_snapshot_t.shadow_file_header.wait_disk_space"
-	Set gtmtypes("shm_snapshot_t",100,"off")=4648
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.flush_trigger")=99
+	Set gtmtypes("shm_snapshot_t",100,"name")="shm_snapshot_t.shadow_file_header.n_wrt_per_flu"
+	Set gtmtypes("shm_snapshot_t",100,"off")=4644
 	Set gtmtypes("shm_snapshot_t",100,"len")=4
 	Set gtmtypes("shm_snapshot_t",100,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wait_disk_space")=100
-	Set gtmtypes("shm_snapshot_t",101,"name")="shm_snapshot_t.shadow_file_header.defer_time"
-	Set gtmtypes("shm_snapshot_t",101,"off")=4652
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_wrt_per_flu")=100
+	Set gtmtypes("shm_snapshot_t",101,"name")="shm_snapshot_t.shadow_file_header.wait_disk_space"
+	Set gtmtypes("shm_snapshot_t",101,"off")=4648
 	Set gtmtypes("shm_snapshot_t",101,"len")=4
 	Set gtmtypes("shm_snapshot_t",101,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.defer_time")=101
-	Set gtmtypes("shm_snapshot_t",102,"name")="shm_snapshot_t.shadow_file_header.filler_wc_blocked"
-	Set gtmtypes("shm_snapshot_t",102,"off")=4656
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wait_disk_space")=101
+	Set gtmtypes("shm_snapshot_t",102,"name")="shm_snapshot_t.shadow_file_header.defer_time"
+	Set gtmtypes("shm_snapshot_t",102,"off")=4652
 	Set gtmtypes("shm_snapshot_t",102,"len")=4
-	Set gtmtypes("shm_snapshot_t",102,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_wc_blocked")=102
-	Set gtmtypes("shm_snapshot_t",103,"name")="shm_snapshot_t.shadow_file_header.mumps_can_bypass"
-	Set gtmtypes("shm_snapshot_t",103,"off")=4660
+	Set gtmtypes("shm_snapshot_t",102,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.defer_time")=102
+	Set gtmtypes("shm_snapshot_t",103,"name")="shm_snapshot_t.shadow_file_header.filler_wc_blocked"
+	Set gtmtypes("shm_snapshot_t",103,"off")=4656
 	Set gtmtypes("shm_snapshot_t",103,"len")=4
 	Set gtmtypes("shm_snapshot_t",103,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.mumps_can_bypass")=103
-	Set gtmtypes("shm_snapshot_t",104,"name")="shm_snapshot_t.shadow_file_header.epoch_taper"
-	Set gtmtypes("shm_snapshot_t",104,"off")=4664
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_wc_blocked")=103
+	Set gtmtypes("shm_snapshot_t",104,"name")="shm_snapshot_t.shadow_file_header.mumps_can_bypass"
+	Set gtmtypes("shm_snapshot_t",104,"off")=4660
 	Set gtmtypes("shm_snapshot_t",104,"len")=4
 	Set gtmtypes("shm_snapshot_t",104,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.epoch_taper")=104
-	Set gtmtypes("shm_snapshot_t",105,"name")="shm_snapshot_t.shadow_file_header.epoch_taper_time_pct"
-	Set gtmtypes("shm_snapshot_t",105,"off")=4668
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.mumps_can_bypass")=104
+	Set gtmtypes("shm_snapshot_t",105,"name")="shm_snapshot_t.shadow_file_header.epoch_taper"
+	Set gtmtypes("shm_snapshot_t",105,"off")=4664
 	Set gtmtypes("shm_snapshot_t",105,"len")=4
-	Set gtmtypes("shm_snapshot_t",105,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.epoch_taper_time_pct")=105
-	Set gtmtypes("shm_snapshot_t",106,"name")="shm_snapshot_t.shadow_file_header.epoch_taper_jnl_pct"
-	Set gtmtypes("shm_snapshot_t",106,"off")=4672
+	Set gtmtypes("shm_snapshot_t",105,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.epoch_taper")=105
+	Set gtmtypes("shm_snapshot_t",106,"name")="shm_snapshot_t.shadow_file_header.epoch_taper_time_pct"
+	Set gtmtypes("shm_snapshot_t",106,"off")=4668
 	Set gtmtypes("shm_snapshot_t",106,"len")=4
 	Set gtmtypes("shm_snapshot_t",106,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.epoch_taper_jnl_pct")=106
-	Set gtmtypes("shm_snapshot_t",107,"name")="shm_snapshot_t.shadow_file_header.filler_512"
-	Set gtmtypes("shm_snapshot_t",107,"off")=4676
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.epoch_taper_time_pct")=106
+	Set gtmtypes("shm_snapshot_t",107,"name")="shm_snapshot_t.shadow_file_header.epoch_taper_jnl_pct"
+	Set gtmtypes("shm_snapshot_t",107,"off")=4672
 	Set gtmtypes("shm_snapshot_t",107,"len")=4
-	Set gtmtypes("shm_snapshot_t",107,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_512")=107
-	Set gtmtypes("shm_snapshot_t",108,"name")="shm_snapshot_t.shadow_file_header.reserved_for_upd"
-	Set gtmtypes("shm_snapshot_t",108,"off")=4680
+	Set gtmtypes("shm_snapshot_t",107,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.epoch_taper_jnl_pct")=107
+	Set gtmtypes("shm_snapshot_t",108,"name")="shm_snapshot_t.shadow_file_header.asyncio"
+	Set gtmtypes("shm_snapshot_t",108,"off")=4676
 	Set gtmtypes("shm_snapshot_t",108,"len")=4
-	Set gtmtypes("shm_snapshot_t",108,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reserved_for_upd")=108
-	Set gtmtypes("shm_snapshot_t",109,"name")="shm_snapshot_t.shadow_file_header.avg_blks_per_100gbl"
-	Set gtmtypes("shm_snapshot_t",109,"off")=4684
+	Set gtmtypes("shm_snapshot_t",108,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.asyncio")=108
+	Set gtmtypes("shm_snapshot_t",109,"name")="shm_snapshot_t.shadow_file_header.reserved_for_upd"
+	Set gtmtypes("shm_snapshot_t",109,"off")=4680
 	Set gtmtypes("shm_snapshot_t",109,"len")=4
 	Set gtmtypes("shm_snapshot_t",109,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.avg_blks_per_100gbl")=109
-	Set gtmtypes("shm_snapshot_t",110,"name")="shm_snapshot_t.shadow_file_header.pre_read_trigger_factor"
-	Set gtmtypes("shm_snapshot_t",110,"off")=4688
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reserved_for_upd")=109
+	Set gtmtypes("shm_snapshot_t",110,"name")="shm_snapshot_t.shadow_file_header.avg_blks_per_100gbl"
+	Set gtmtypes("shm_snapshot_t",110,"off")=4684
 	Set gtmtypes("shm_snapshot_t",110,"len")=4
 	Set gtmtypes("shm_snapshot_t",110,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.pre_read_trigger_factor")=110
-	Set gtmtypes("shm_snapshot_t",111,"name")="shm_snapshot_t.shadow_file_header.writer_trigger_factor"
-	Set gtmtypes("shm_snapshot_t",111,"off")=4692
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.avg_blks_per_100gbl")=110
+	Set gtmtypes("shm_snapshot_t",111,"name")="shm_snapshot_t.shadow_file_header.pre_read_trigger_factor"
+	Set gtmtypes("shm_snapshot_t",111,"off")=4688
 	Set gtmtypes("shm_snapshot_t",111,"len")=4
 	Set gtmtypes("shm_snapshot_t",111,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.writer_trigger_factor")=111
-	Set gtmtypes("shm_snapshot_t",112,"name")="shm_snapshot_t.shadow_file_header.semid"
-	Set gtmtypes("shm_snapshot_t",112,"off")=4696
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.pre_read_trigger_factor")=111
+	Set gtmtypes("shm_snapshot_t",112,"name")="shm_snapshot_t.shadow_file_header.writer_trigger_factor"
+	Set gtmtypes("shm_snapshot_t",112,"off")=4692
 	Set gtmtypes("shm_snapshot_t",112,"len")=4
-	Set gtmtypes("shm_snapshot_t",112,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.semid")=112
-	Set gtmtypes("shm_snapshot_t",113,"name")="shm_snapshot_t.shadow_file_header.shmid"
-	Set gtmtypes("shm_snapshot_t",113,"off")=4700
+	Set gtmtypes("shm_snapshot_t",112,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.writer_trigger_factor")=112
+	Set gtmtypes("shm_snapshot_t",113,"name")="shm_snapshot_t.shadow_file_header.semid"
+	Set gtmtypes("shm_snapshot_t",113,"off")=4696
 	Set gtmtypes("shm_snapshot_t",113,"len")=4
 	Set gtmtypes("shm_snapshot_t",113,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmid")=113
-	Set gtmtypes("shm_snapshot_t",114,"name")="shm_snapshot_t.shadow_file_header.gt_sem_ctime"
-	Set gtmtypes("shm_snapshot_t",114,"off")=4704
-	Set gtmtypes("shm_snapshot_t",114,"len")=8
-	Set gtmtypes("shm_snapshot_t",114,"type")="gtm_time8"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gt_sem_ctime")=114
-	Set gtmtypes("shm_snapshot_t",115,"name")="shm_snapshot_t.shadow_file_header.gt_sem_ctime.ctime"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.semid")=113
+	Set gtmtypes("shm_snapshot_t",114,"name")="shm_snapshot_t.shadow_file_header.shmid"
+	Set gtmtypes("shm_snapshot_t",114,"off")=4700
+	Set gtmtypes("shm_snapshot_t",114,"len")=4
+	Set gtmtypes("shm_snapshot_t",114,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmid")=114
+	Set gtmtypes("shm_snapshot_t",115,"name")="shm_snapshot_t.shadow_file_header.gt_sem_ctime"
 	Set gtmtypes("shm_snapshot_t",115,"off")=4704
 	Set gtmtypes("shm_snapshot_t",115,"len")=8
-	Set gtmtypes("shm_snapshot_t",115,"type")="time_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gt_sem_ctime.ctime")=115
-	Set gtmtypes("shm_snapshot_t",116,"name")="shm_snapshot_t.shadow_file_header.gt_sem_ctime.filler"
+	Set gtmtypes("shm_snapshot_t",115,"type")="gtm_time8"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gt_sem_ctime")=115
+	Set gtmtypes("shm_snapshot_t",116,"name")="shm_snapshot_t.shadow_file_header.gt_sem_ctime.ctime"
 	Set gtmtypes("shm_snapshot_t",116,"off")=4704
 	Set gtmtypes("shm_snapshot_t",116,"len")=8
-	Set gtmtypes("shm_snapshot_t",116,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gt_sem_ctime.filler")=116
-	Set gtmtypes("shm_snapshot_t",116,"dim")=2
-	Set gtmtypes("shm_snapshot_t",117,"name")="shm_snapshot_t.shadow_file_header.gt_shm_ctime"
-	Set gtmtypes("shm_snapshot_t",117,"off")=4712
+	Set gtmtypes("shm_snapshot_t",116,"type")="time_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gt_sem_ctime.ctime")=116
+	Set gtmtypes("shm_snapshot_t",117,"name")="shm_snapshot_t.shadow_file_header.gt_sem_ctime.filler"
+	Set gtmtypes("shm_snapshot_t",117,"off")=4704
 	Set gtmtypes("shm_snapshot_t",117,"len")=8
-	Set gtmtypes("shm_snapshot_t",117,"type")="gtm_time8"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gt_shm_ctime")=117
-	Set gtmtypes("shm_snapshot_t",118,"name")="shm_snapshot_t.shadow_file_header.gt_shm_ctime.ctime"
+	Set gtmtypes("shm_snapshot_t",117,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gt_sem_ctime.filler")=117
+	Set gtmtypes("shm_snapshot_t",117,"dim")=2
+	Set gtmtypes("shm_snapshot_t",118,"name")="shm_snapshot_t.shadow_file_header.gt_shm_ctime"
 	Set gtmtypes("shm_snapshot_t",118,"off")=4712
 	Set gtmtypes("shm_snapshot_t",118,"len")=8
-	Set gtmtypes("shm_snapshot_t",118,"type")="time_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gt_shm_ctime.ctime")=118
-	Set gtmtypes("shm_snapshot_t",119,"name")="shm_snapshot_t.shadow_file_header.gt_shm_ctime.filler"
+	Set gtmtypes("shm_snapshot_t",118,"type")="gtm_time8"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gt_shm_ctime")=118
+	Set gtmtypes("shm_snapshot_t",119,"name")="shm_snapshot_t.shadow_file_header.gt_shm_ctime.ctime"
 	Set gtmtypes("shm_snapshot_t",119,"off")=4712
 	Set gtmtypes("shm_snapshot_t",119,"len")=8
-	Set gtmtypes("shm_snapshot_t",119,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gt_shm_ctime.filler")=119
-	Set gtmtypes("shm_snapshot_t",119,"dim")=2
-	Set gtmtypes("shm_snapshot_t",120,"name")="shm_snapshot_t.shadow_file_header.filler_unixonly"
-	Set gtmtypes("shm_snapshot_t",120,"off")=4720
-	Set gtmtypes("shm_snapshot_t",120,"len")=40
-	Set gtmtypes("shm_snapshot_t",120,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_unixonly")=120
-	Set gtmtypes("shm_snapshot_t",121,"name")="shm_snapshot_t.shadow_file_header.filler_n_retries"
-	Set gtmtypes("shm_snapshot_t",121,"off")=4760
-	Set gtmtypes("shm_snapshot_t",121,"len")=20
-	Set gtmtypes("shm_snapshot_t",121,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_retries")=121
-	Set gtmtypes("shm_snapshot_t",121,"dim")=5
-	Set gtmtypes("shm_snapshot_t",122,"name")="shm_snapshot_t.shadow_file_header.filler_n_puts"
-	Set gtmtypes("shm_snapshot_t",122,"off")=4780
-	Set gtmtypes("shm_snapshot_t",122,"len")=4
+	Set gtmtypes("shm_snapshot_t",119,"type")="time_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gt_shm_ctime.ctime")=119
+	Set gtmtypes("shm_snapshot_t",120,"name")="shm_snapshot_t.shadow_file_header.gt_shm_ctime.filler"
+	Set gtmtypes("shm_snapshot_t",120,"off")=4712
+	Set gtmtypes("shm_snapshot_t",120,"len")=8
+	Set gtmtypes("shm_snapshot_t",120,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gt_shm_ctime.filler")=120
+	Set gtmtypes("shm_snapshot_t",120,"dim")=2
+	Set gtmtypes("shm_snapshot_t",121,"name")="shm_snapshot_t.shadow_file_header.filler_unixonly"
+	Set gtmtypes("shm_snapshot_t",121,"off")=4720
+	Set gtmtypes("shm_snapshot_t",121,"len")=40
+	Set gtmtypes("shm_snapshot_t",121,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_unixonly")=121
+	Set gtmtypes("shm_snapshot_t",122,"name")="shm_snapshot_t.shadow_file_header.filler_n_retries"
+	Set gtmtypes("shm_snapshot_t",122,"off")=4760
+	Set gtmtypes("shm_snapshot_t",122,"len")=20
 	Set gtmtypes("shm_snapshot_t",122,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_puts")=122
-	Set gtmtypes("shm_snapshot_t",123,"name")="shm_snapshot_t.shadow_file_header.filler_n_kills"
-	Set gtmtypes("shm_snapshot_t",123,"off")=4784
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_retries")=122
+	Set gtmtypes("shm_snapshot_t",122,"dim")=5
+	Set gtmtypes("shm_snapshot_t",123,"name")="shm_snapshot_t.shadow_file_header.filler_n_puts"
+	Set gtmtypes("shm_snapshot_t",123,"off")=4780
 	Set gtmtypes("shm_snapshot_t",123,"len")=4
 	Set gtmtypes("shm_snapshot_t",123,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_kills")=123
-	Set gtmtypes("shm_snapshot_t",124,"name")="shm_snapshot_t.shadow_file_header.filler_n_queries"
-	Set gtmtypes("shm_snapshot_t",124,"off")=4788
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_puts")=123
+	Set gtmtypes("shm_snapshot_t",124,"name")="shm_snapshot_t.shadow_file_header.filler_n_kills"
+	Set gtmtypes("shm_snapshot_t",124,"off")=4784
 	Set gtmtypes("shm_snapshot_t",124,"len")=4
 	Set gtmtypes("shm_snapshot_t",124,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_queries")=124
-	Set gtmtypes("shm_snapshot_t",125,"name")="shm_snapshot_t.shadow_file_header.filler_n_gets"
-	Set gtmtypes("shm_snapshot_t",125,"off")=4792
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_kills")=124
+	Set gtmtypes("shm_snapshot_t",125,"name")="shm_snapshot_t.shadow_file_header.filler_n_queries"
+	Set gtmtypes("shm_snapshot_t",125,"off")=4788
 	Set gtmtypes("shm_snapshot_t",125,"len")=4
 	Set gtmtypes("shm_snapshot_t",125,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_gets")=125
-	Set gtmtypes("shm_snapshot_t",126,"name")="shm_snapshot_t.shadow_file_header.filler_n_order"
-	Set gtmtypes("shm_snapshot_t",126,"off")=4796
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_queries")=125
+	Set gtmtypes("shm_snapshot_t",126,"name")="shm_snapshot_t.shadow_file_header.filler_n_gets"
+	Set gtmtypes("shm_snapshot_t",126,"off")=4792
 	Set gtmtypes("shm_snapshot_t",126,"len")=4
 	Set gtmtypes("shm_snapshot_t",126,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_order")=126
-	Set gtmtypes("shm_snapshot_t",127,"name")="shm_snapshot_t.shadow_file_header.filler_n_zprevs"
-	Set gtmtypes("shm_snapshot_t",127,"off")=4800
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_gets")=126
+	Set gtmtypes("shm_snapshot_t",127,"name")="shm_snapshot_t.shadow_file_header.filler_n_order"
+	Set gtmtypes("shm_snapshot_t",127,"off")=4796
 	Set gtmtypes("shm_snapshot_t",127,"len")=4
 	Set gtmtypes("shm_snapshot_t",127,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_zprevs")=127
-	Set gtmtypes("shm_snapshot_t",128,"name")="shm_snapshot_t.shadow_file_header.filler_n_data"
-	Set gtmtypes("shm_snapshot_t",128,"off")=4804
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_order")=127
+	Set gtmtypes("shm_snapshot_t",128,"name")="shm_snapshot_t.shadow_file_header.filler_n_zprevs"
+	Set gtmtypes("shm_snapshot_t",128,"off")=4800
 	Set gtmtypes("shm_snapshot_t",128,"len")=4
 	Set gtmtypes("shm_snapshot_t",128,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_data")=128
-	Set gtmtypes("shm_snapshot_t",129,"name")="shm_snapshot_t.shadow_file_header.filler_n_puts_duplicate"
-	Set gtmtypes("shm_snapshot_t",129,"off")=4808
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_zprevs")=128
+	Set gtmtypes("shm_snapshot_t",129,"name")="shm_snapshot_t.shadow_file_header.filler_n_data"
+	Set gtmtypes("shm_snapshot_t",129,"off")=4804
 	Set gtmtypes("shm_snapshot_t",129,"len")=4
-	Set gtmtypes("shm_snapshot_t",129,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_puts_duplicate")=129
-	Set gtmtypes("shm_snapshot_t",130,"name")="shm_snapshot_t.shadow_file_header.filler_n_tp_updates"
-	Set gtmtypes("shm_snapshot_t",130,"off")=4812
+	Set gtmtypes("shm_snapshot_t",129,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_data")=129
+	Set gtmtypes("shm_snapshot_t",130,"name")="shm_snapshot_t.shadow_file_header.filler_n_puts_duplicate"
+	Set gtmtypes("shm_snapshot_t",130,"off")=4808
 	Set gtmtypes("shm_snapshot_t",130,"len")=4
 	Set gtmtypes("shm_snapshot_t",130,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_tp_updates")=130
-	Set gtmtypes("shm_snapshot_t",131,"name")="shm_snapshot_t.shadow_file_header.filler_n_tp_updates_duplicate"
-	Set gtmtypes("shm_snapshot_t",131,"off")=4816
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_puts_duplicate")=130
+	Set gtmtypes("shm_snapshot_t",131,"name")="shm_snapshot_t.shadow_file_header.filler_n_tp_updates"
+	Set gtmtypes("shm_snapshot_t",131,"off")=4812
 	Set gtmtypes("shm_snapshot_t",131,"len")=4
 	Set gtmtypes("shm_snapshot_t",131,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_tp_updates_duplicate")=131
-	Set gtmtypes("shm_snapshot_t",132,"name")="shm_snapshot_t.shadow_file_header.filler_accounting_64_align"
-	Set gtmtypes("shm_snapshot_t",132,"off")=4820
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_tp_updates")=131
+	Set gtmtypes("shm_snapshot_t",132,"name")="shm_snapshot_t.shadow_file_header.filler_n_tp_updates_duplicate"
+	Set gtmtypes("shm_snapshot_t",132,"off")=4816
 	Set gtmtypes("shm_snapshot_t",132,"len")=4
-	Set gtmtypes("shm_snapshot_t",132,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_accounting_64_align")=132
-	Set gtmtypes("shm_snapshot_t",133,"name")="shm_snapshot_t.shadow_file_header.staleness"
-	Set gtmtypes("shm_snapshot_t",133,"off")=4824
-	Set gtmtypes("shm_snapshot_t",133,"len")=8
-	Set gtmtypes("shm_snapshot_t",133,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.staleness")=133
-	Set gtmtypes("shm_snapshot_t",133,"dim")=2
-	Set gtmtypes("shm_snapshot_t",134,"name")="shm_snapshot_t.shadow_file_header.ccp_tick_interval"
-	Set gtmtypes("shm_snapshot_t",134,"off")=4832
+	Set gtmtypes("shm_snapshot_t",132,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_tp_updates_duplicate")=132
+	Set gtmtypes("shm_snapshot_t",133,"name")="shm_snapshot_t.shadow_file_header.filler_accounting_64_align"
+	Set gtmtypes("shm_snapshot_t",133,"off")=4820
+	Set gtmtypes("shm_snapshot_t",133,"len")=4
+	Set gtmtypes("shm_snapshot_t",133,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_accounting_64_align")=133
+	Set gtmtypes("shm_snapshot_t",134,"name")="shm_snapshot_t.shadow_file_header.staleness"
+	Set gtmtypes("shm_snapshot_t",134,"off")=4824
 	Set gtmtypes("shm_snapshot_t",134,"len")=8
 	Set gtmtypes("shm_snapshot_t",134,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.ccp_tick_interval")=134
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.staleness")=134
 	Set gtmtypes("shm_snapshot_t",134,"dim")=2
-	Set gtmtypes("shm_snapshot_t",135,"name")="shm_snapshot_t.shadow_file_header.ccp_quantum_interval"
-	Set gtmtypes("shm_snapshot_t",135,"off")=4840
+	Set gtmtypes("shm_snapshot_t",135,"name")="shm_snapshot_t.shadow_file_header.ccp_tick_interval"
+	Set gtmtypes("shm_snapshot_t",135,"off")=4832
 	Set gtmtypes("shm_snapshot_t",135,"len")=8
 	Set gtmtypes("shm_snapshot_t",135,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.ccp_quantum_interval")=135
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.ccp_tick_interval")=135
 	Set gtmtypes("shm_snapshot_t",135,"dim")=2
-	Set gtmtypes("shm_snapshot_t",136,"name")="shm_snapshot_t.shadow_file_header.ccp_response_interval"
-	Set gtmtypes("shm_snapshot_t",136,"off")=4848
+	Set gtmtypes("shm_snapshot_t",136,"name")="shm_snapshot_t.shadow_file_header.ccp_quantum_interval"
+	Set gtmtypes("shm_snapshot_t",136,"off")=4840
 	Set gtmtypes("shm_snapshot_t",136,"len")=8
 	Set gtmtypes("shm_snapshot_t",136,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.ccp_response_interval")=136
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.ccp_quantum_interval")=136
 	Set gtmtypes("shm_snapshot_t",136,"dim")=2
-	Set gtmtypes("shm_snapshot_t",137,"name")="shm_snapshot_t.shadow_file_header.ccp_jnl_before"
-	Set gtmtypes("shm_snapshot_t",137,"off")=4856
-	Set gtmtypes("shm_snapshot_t",137,"len")=4
-	Set gtmtypes("shm_snapshot_t",137,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.ccp_jnl_before")=137
-	Set gtmtypes("shm_snapshot_t",138,"name")="shm_snapshot_t.shadow_file_header.clustered"
-	Set gtmtypes("shm_snapshot_t",138,"off")=4860
+	Set gtmtypes("shm_snapshot_t",137,"name")="shm_snapshot_t.shadow_file_header.ccp_response_interval"
+	Set gtmtypes("shm_snapshot_t",137,"off")=4848
+	Set gtmtypes("shm_snapshot_t",137,"len")=8
+	Set gtmtypes("shm_snapshot_t",137,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.ccp_response_interval")=137
+	Set gtmtypes("shm_snapshot_t",137,"dim")=2
+	Set gtmtypes("shm_snapshot_t",138,"name")="shm_snapshot_t.shadow_file_header.ccp_jnl_before"
+	Set gtmtypes("shm_snapshot_t",138,"off")=4856
 	Set gtmtypes("shm_snapshot_t",138,"len")=4
 	Set gtmtypes("shm_snapshot_t",138,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.clustered")=138
-	Set gtmtypes("shm_snapshot_t",139,"name")="shm_snapshot_t.shadow_file_header.unbacked_cache"
-	Set gtmtypes("shm_snapshot_t",139,"off")=4864
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.ccp_jnl_before")=138
+	Set gtmtypes("shm_snapshot_t",139,"name")="shm_snapshot_t.shadow_file_header.clustered"
+	Set gtmtypes("shm_snapshot_t",139,"off")=4860
 	Set gtmtypes("shm_snapshot_t",139,"len")=4
 	Set gtmtypes("shm_snapshot_t",139,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.unbacked_cache")=139
-	Set gtmtypes("shm_snapshot_t",140,"name")="shm_snapshot_t.shadow_file_header.rc_srv_cnt"
-	Set gtmtypes("shm_snapshot_t",140,"off")=4868
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.clustered")=139
+	Set gtmtypes("shm_snapshot_t",140,"name")="shm_snapshot_t.shadow_file_header.unbacked_cache"
+	Set gtmtypes("shm_snapshot_t",140,"off")=4864
 	Set gtmtypes("shm_snapshot_t",140,"len")=4
-	Set gtmtypes("shm_snapshot_t",140,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.rc_srv_cnt")=140
-	Set gtmtypes("shm_snapshot_t",141,"name")="shm_snapshot_t.shadow_file_header.dsid"
-	Set gtmtypes("shm_snapshot_t",141,"off")=4872
+	Set gtmtypes("shm_snapshot_t",140,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.unbacked_cache")=140
+	Set gtmtypes("shm_snapshot_t",141,"name")="shm_snapshot_t.shadow_file_header.rc_srv_cnt"
+	Set gtmtypes("shm_snapshot_t",141,"off")=4868
 	Set gtmtypes("shm_snapshot_t",141,"len")=4
 	Set gtmtypes("shm_snapshot_t",141,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.dsid")=141
-	Set gtmtypes("shm_snapshot_t",142,"name")="shm_snapshot_t.shadow_file_header.rc_node"
-	Set gtmtypes("shm_snapshot_t",142,"off")=4876
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.rc_srv_cnt")=141
+	Set gtmtypes("shm_snapshot_t",142,"name")="shm_snapshot_t.shadow_file_header.dsid"
+	Set gtmtypes("shm_snapshot_t",142,"off")=4872
 	Set gtmtypes("shm_snapshot_t",142,"len")=4
 	Set gtmtypes("shm_snapshot_t",142,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.rc_node")=142
-	Set gtmtypes("shm_snapshot_t",143,"name")="shm_snapshot_t.shadow_file_header.filler_ccp_rc"
-	Set gtmtypes("shm_snapshot_t",143,"off")=4880
-	Set gtmtypes("shm_snapshot_t",143,"len")=8
-	Set gtmtypes("shm_snapshot_t",143,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_ccp_rc")=143
-	Set gtmtypes("shm_snapshot_t",144,"name")="shm_snapshot_t.shadow_file_header.reg_seqno"
-	Set gtmtypes("shm_snapshot_t",144,"off")=4888
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.dsid")=142
+	Set gtmtypes("shm_snapshot_t",143,"name")="shm_snapshot_t.shadow_file_header.rc_node"
+	Set gtmtypes("shm_snapshot_t",143,"off")=4876
+	Set gtmtypes("shm_snapshot_t",143,"len")=4
+	Set gtmtypes("shm_snapshot_t",143,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.rc_node")=143
+	Set gtmtypes("shm_snapshot_t",144,"name")="shm_snapshot_t.shadow_file_header.filler_ccp_rc"
+	Set gtmtypes("shm_snapshot_t",144,"off")=4880
 	Set gtmtypes("shm_snapshot_t",144,"len")=8
-	Set gtmtypes("shm_snapshot_t",144,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reg_seqno")=144
-	Set gtmtypes("shm_snapshot_t",145,"name")="shm_snapshot_t.shadow_file_header.pre_multisite_resync_seqno"
-	Set gtmtypes("shm_snapshot_t",145,"off")=4896
+	Set gtmtypes("shm_snapshot_t",144,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_ccp_rc")=144
+	Set gtmtypes("shm_snapshot_t",145,"name")="shm_snapshot_t.shadow_file_header.reg_seqno"
+	Set gtmtypes("shm_snapshot_t",145,"off")=4888
 	Set gtmtypes("shm_snapshot_t",145,"len")=8
 	Set gtmtypes("shm_snapshot_t",145,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.pre_multisite_resync_seqno")=145
-	Set gtmtypes("shm_snapshot_t",146,"name")="shm_snapshot_t.shadow_file_header.zqgblmod_tn"
-	Set gtmtypes("shm_snapshot_t",146,"off")=4904
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reg_seqno")=145
+	Set gtmtypes("shm_snapshot_t",146,"name")="shm_snapshot_t.shadow_file_header.pre_multisite_resync_seqno"
+	Set gtmtypes("shm_snapshot_t",146,"off")=4896
 	Set gtmtypes("shm_snapshot_t",146,"len")=8
 	Set gtmtypes("shm_snapshot_t",146,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.zqgblmod_tn")=146
-	Set gtmtypes("shm_snapshot_t",147,"name")="shm_snapshot_t.shadow_file_header.zqgblmod_seqno"
-	Set gtmtypes("shm_snapshot_t",147,"off")=4912
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.pre_multisite_resync_seqno")=146
+	Set gtmtypes("shm_snapshot_t",147,"name")="shm_snapshot_t.shadow_file_header.zqgblmod_tn"
+	Set gtmtypes("shm_snapshot_t",147,"off")=4904
 	Set gtmtypes("shm_snapshot_t",147,"len")=8
 	Set gtmtypes("shm_snapshot_t",147,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.zqgblmod_seqno")=147
-	Set gtmtypes("shm_snapshot_t",148,"name")="shm_snapshot_t.shadow_file_header.repl_state"
-	Set gtmtypes("shm_snapshot_t",148,"off")=4920
-	Set gtmtypes("shm_snapshot_t",148,"len")=4
-	Set gtmtypes("shm_snapshot_t",148,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.repl_state")=148
-	Set gtmtypes("shm_snapshot_t",149,"name")="shm_snapshot_t.shadow_file_header.multi_site_open"
-	Set gtmtypes("shm_snapshot_t",149,"off")=4924
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.zqgblmod_tn")=147
+	Set gtmtypes("shm_snapshot_t",148,"name")="shm_snapshot_t.shadow_file_header.zqgblmod_seqno"
+	Set gtmtypes("shm_snapshot_t",148,"off")=4912
+	Set gtmtypes("shm_snapshot_t",148,"len")=8
+	Set gtmtypes("shm_snapshot_t",148,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.zqgblmod_seqno")=148
+	Set gtmtypes("shm_snapshot_t",149,"name")="shm_snapshot_t.shadow_file_header.repl_state"
+	Set gtmtypes("shm_snapshot_t",149,"off")=4920
 	Set gtmtypes("shm_snapshot_t",149,"len")=4
-	Set gtmtypes("shm_snapshot_t",149,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.multi_site_open")=149
-	Set gtmtypes("shm_snapshot_t",150,"name")="shm_snapshot_t.shadow_file_header.filler_seqno"
-	Set gtmtypes("shm_snapshot_t",150,"off")=4928
-	Set gtmtypes("shm_snapshot_t",150,"len")=8
-	Set gtmtypes("shm_snapshot_t",150,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_seqno")=150
-	Set gtmtypes("shm_snapshot_t",151,"name")="shm_snapshot_t.shadow_file_header.filler_repl"
-	Set gtmtypes("shm_snapshot_t",151,"off")=4936
-	Set gtmtypes("shm_snapshot_t",151,"len")=16
-	Set gtmtypes("shm_snapshot_t",151,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_repl")=151
-	Set gtmtypes("shm_snapshot_t",152,"name")="shm_snapshot_t.shadow_file_header.filler_n_tp_retries"
-	Set gtmtypes("shm_snapshot_t",152,"off")=4952
-	Set gtmtypes("shm_snapshot_t",152,"len")=48
-	Set gtmtypes("shm_snapshot_t",152,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_tp_retries")=152
-	Set gtmtypes("shm_snapshot_t",152,"dim")=12
-	Set gtmtypes("shm_snapshot_t",153,"name")="shm_snapshot_t.shadow_file_header.filler_n_tp_retries_conflicts"
-	Set gtmtypes("shm_snapshot_t",153,"off")=5000
+	Set gtmtypes("shm_snapshot_t",149,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.repl_state")=149
+	Set gtmtypes("shm_snapshot_t",150,"name")="shm_snapshot_t.shadow_file_header.multi_site_open"
+	Set gtmtypes("shm_snapshot_t",150,"off")=4924
+	Set gtmtypes("shm_snapshot_t",150,"len")=4
+	Set gtmtypes("shm_snapshot_t",150,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.multi_site_open")=150
+	Set gtmtypes("shm_snapshot_t",151,"name")="shm_snapshot_t.shadow_file_header.filler_seqno"
+	Set gtmtypes("shm_snapshot_t",151,"off")=4928
+	Set gtmtypes("shm_snapshot_t",151,"len")=8
+	Set gtmtypes("shm_snapshot_t",151,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_seqno")=151
+	Set gtmtypes("shm_snapshot_t",152,"name")="shm_snapshot_t.shadow_file_header.filler_repl"
+	Set gtmtypes("shm_snapshot_t",152,"off")=4936
+	Set gtmtypes("shm_snapshot_t",152,"len")=16
+	Set gtmtypes("shm_snapshot_t",152,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_repl")=152
+	Set gtmtypes("shm_snapshot_t",153,"name")="shm_snapshot_t.shadow_file_header.filler_n_tp_retries"
+	Set gtmtypes("shm_snapshot_t",153,"off")=4952
 	Set gtmtypes("shm_snapshot_t",153,"len")=48
 	Set gtmtypes("shm_snapshot_t",153,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_tp_retries_conflicts")=153
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_tp_retries")=153
 	Set gtmtypes("shm_snapshot_t",153,"dim")=12
-	Set gtmtypes("shm_snapshot_t",154,"name")="shm_snapshot_t.shadow_file_header.tp_cdb_sc_blkmod"
-	Set gtmtypes("shm_snapshot_t",154,"off")=5048
-	Set gtmtypes("shm_snapshot_t",154,"len")=32
+	Set gtmtypes("shm_snapshot_t",154,"name")="shm_snapshot_t.shadow_file_header.filler_n_tp_retries_conflicts"
+	Set gtmtypes("shm_snapshot_t",154,"off")=5000
+	Set gtmtypes("shm_snapshot_t",154,"len")=48
 	Set gtmtypes("shm_snapshot_t",154,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.tp_cdb_sc_blkmod")=154
-	Set gtmtypes("shm_snapshot_t",154,"dim")=8
-	Set gtmtypes("shm_snapshot_t",155,"name")="shm_snapshot_t.shadow_file_header.jnl_alq"
-	Set gtmtypes("shm_snapshot_t",155,"off")=5080
-	Set gtmtypes("shm_snapshot_t",155,"len")=4
-	Set gtmtypes("shm_snapshot_t",155,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_alq")=155
-	Set gtmtypes("shm_snapshot_t",156,"name")="shm_snapshot_t.shadow_file_header.jnl_deq"
-	Set gtmtypes("shm_snapshot_t",156,"off")=5084
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_tp_retries_conflicts")=154
+	Set gtmtypes("shm_snapshot_t",154,"dim")=12
+	Set gtmtypes("shm_snapshot_t",155,"name")="shm_snapshot_t.shadow_file_header.tp_cdb_sc_blkmod"
+	Set gtmtypes("shm_snapshot_t",155,"off")=5048
+	Set gtmtypes("shm_snapshot_t",155,"len")=32
+	Set gtmtypes("shm_snapshot_t",155,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.tp_cdb_sc_blkmod")=155
+	Set gtmtypes("shm_snapshot_t",155,"dim")=8
+	Set gtmtypes("shm_snapshot_t",156,"name")="shm_snapshot_t.shadow_file_header.jnl_alq"
+	Set gtmtypes("shm_snapshot_t",156,"off")=5080
 	Set gtmtypes("shm_snapshot_t",156,"len")=4
 	Set gtmtypes("shm_snapshot_t",156,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_deq")=156
-	Set gtmtypes("shm_snapshot_t",157,"name")="shm_snapshot_t.shadow_file_header.jnl_buffer_size"
-	Set gtmtypes("shm_snapshot_t",157,"off")=5088
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_alq")=156
+	Set gtmtypes("shm_snapshot_t",157,"name")="shm_snapshot_t.shadow_file_header.jnl_deq"
+	Set gtmtypes("shm_snapshot_t",157,"off")=5084
 	Set gtmtypes("shm_snapshot_t",157,"len")=4
-	Set gtmtypes("shm_snapshot_t",157,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_buffer_size")=157
-	Set gtmtypes("shm_snapshot_t",158,"name")="shm_snapshot_t.shadow_file_header.jnl_before_image"
-	Set gtmtypes("shm_snapshot_t",158,"off")=5092
+	Set gtmtypes("shm_snapshot_t",157,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_deq")=157
+	Set gtmtypes("shm_snapshot_t",158,"name")="shm_snapshot_t.shadow_file_header.jnl_buffer_size"
+	Set gtmtypes("shm_snapshot_t",158,"off")=5088
 	Set gtmtypes("shm_snapshot_t",158,"len")=4
-	Set gtmtypes("shm_snapshot_t",158,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_before_image")=158
-	Set gtmtypes("shm_snapshot_t",159,"name")="shm_snapshot_t.shadow_file_header.jnl_state"
-	Set gtmtypes("shm_snapshot_t",159,"off")=5096
+	Set gtmtypes("shm_snapshot_t",158,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_buffer_size")=158
+	Set gtmtypes("shm_snapshot_t",159,"name")="shm_snapshot_t.shadow_file_header.jnl_before_image"
+	Set gtmtypes("shm_snapshot_t",159,"off")=5092
 	Set gtmtypes("shm_snapshot_t",159,"len")=4
-	Set gtmtypes("shm_snapshot_t",159,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_state")=159
-	Set gtmtypes("shm_snapshot_t",160,"name")="shm_snapshot_t.shadow_file_header.jnl_file_len"
-	Set gtmtypes("shm_snapshot_t",160,"off")=5100
+	Set gtmtypes("shm_snapshot_t",159,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_before_image")=159
+	Set gtmtypes("shm_snapshot_t",160,"name")="shm_snapshot_t.shadow_file_header.jnl_state"
+	Set gtmtypes("shm_snapshot_t",160,"off")=5096
 	Set gtmtypes("shm_snapshot_t",160,"len")=4
-	Set gtmtypes("shm_snapshot_t",160,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_file_len")=160
-	Set gtmtypes("shm_snapshot_t",161,"name")="shm_snapshot_t.shadow_file_header.autoswitchlimit"
-	Set gtmtypes("shm_snapshot_t",161,"off")=5104
+	Set gtmtypes("shm_snapshot_t",160,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_state")=160
+	Set gtmtypes("shm_snapshot_t",161,"name")="shm_snapshot_t.shadow_file_header.jnl_file_len"
+	Set gtmtypes("shm_snapshot_t",161,"off")=5100
 	Set gtmtypes("shm_snapshot_t",161,"len")=4
 	Set gtmtypes("shm_snapshot_t",161,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.autoswitchlimit")=161
-	Set gtmtypes("shm_snapshot_t",162,"name")="shm_snapshot_t.shadow_file_header.epoch_interval"
-	Set gtmtypes("shm_snapshot_t",162,"off")=5108
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_file_len")=161
+	Set gtmtypes("shm_snapshot_t",162,"name")="shm_snapshot_t.shadow_file_header.autoswitchlimit"
+	Set gtmtypes("shm_snapshot_t",162,"off")=5104
 	Set gtmtypes("shm_snapshot_t",162,"len")=4
-	Set gtmtypes("shm_snapshot_t",162,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.epoch_interval")=162
-	Set gtmtypes("shm_snapshot_t",163,"name")="shm_snapshot_t.shadow_file_header.alignsize"
-	Set gtmtypes("shm_snapshot_t",163,"off")=5112
+	Set gtmtypes("shm_snapshot_t",162,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.autoswitchlimit")=162
+	Set gtmtypes("shm_snapshot_t",163,"name")="shm_snapshot_t.shadow_file_header.epoch_interval"
+	Set gtmtypes("shm_snapshot_t",163,"off")=5108
 	Set gtmtypes("shm_snapshot_t",163,"len")=4
-	Set gtmtypes("shm_snapshot_t",163,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.alignsize")=163
-	Set gtmtypes("shm_snapshot_t",164,"name")="shm_snapshot_t.shadow_file_header.jnl_sync_io"
-	Set gtmtypes("shm_snapshot_t",164,"off")=5116
+	Set gtmtypes("shm_snapshot_t",163,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.epoch_interval")=163
+	Set gtmtypes("shm_snapshot_t",164,"name")="shm_snapshot_t.shadow_file_header.alignsize"
+	Set gtmtypes("shm_snapshot_t",164,"off")=5112
 	Set gtmtypes("shm_snapshot_t",164,"len")=4
-	Set gtmtypes("shm_snapshot_t",164,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_sync_io")=164
-	Set gtmtypes("shm_snapshot_t",165,"name")="shm_snapshot_t.shadow_file_header.yield_lmt"
-	Set gtmtypes("shm_snapshot_t",165,"off")=5120
+	Set gtmtypes("shm_snapshot_t",164,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.alignsize")=164
+	Set gtmtypes("shm_snapshot_t",165,"name")="shm_snapshot_t.shadow_file_header.jnl_sync_io"
+	Set gtmtypes("shm_snapshot_t",165,"off")=5116
 	Set gtmtypes("shm_snapshot_t",165,"len")=4
 	Set gtmtypes("shm_snapshot_t",165,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.yield_lmt")=165
-	Set gtmtypes("shm_snapshot_t",166,"name")="shm_snapshot_t.shadow_file_header.turn_around_point"
-	Set gtmtypes("shm_snapshot_t",166,"off")=5124
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_sync_io")=165
+	Set gtmtypes("shm_snapshot_t",166,"name")="shm_snapshot_t.shadow_file_header.yield_lmt"
+	Set gtmtypes("shm_snapshot_t",166,"off")=5120
 	Set gtmtypes("shm_snapshot_t",166,"len")=4
-	Set gtmtypes("shm_snapshot_t",166,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.turn_around_point")=166
-	Set gtmtypes("shm_snapshot_t",167,"name")="shm_snapshot_t.shadow_file_header.jnl_eovtn"
-	Set gtmtypes("shm_snapshot_t",167,"off")=5128
-	Set gtmtypes("shm_snapshot_t",167,"len")=8
-	Set gtmtypes("shm_snapshot_t",167,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_eovtn")=167
-	Set gtmtypes("shm_snapshot_t",168,"name")="shm_snapshot_t.shadow_file_header.filler_jnl"
-	Set gtmtypes("shm_snapshot_t",168,"off")=5136
+	Set gtmtypes("shm_snapshot_t",166,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.yield_lmt")=166
+	Set gtmtypes("shm_snapshot_t",167,"name")="shm_snapshot_t.shadow_file_header.turn_around_point"
+	Set gtmtypes("shm_snapshot_t",167,"off")=5124
+	Set gtmtypes("shm_snapshot_t",167,"len")=4
+	Set gtmtypes("shm_snapshot_t",167,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.turn_around_point")=167
+	Set gtmtypes("shm_snapshot_t",168,"name")="shm_snapshot_t.shadow_file_header.jnl_eovtn"
+	Set gtmtypes("shm_snapshot_t",168,"off")=5128
 	Set gtmtypes("shm_snapshot_t",168,"len")=8
-	Set gtmtypes("shm_snapshot_t",168,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_jnl")=168
-	Set gtmtypes("shm_snapshot_t",169,"name")="shm_snapshot_t.shadow_file_header.intrpt_recov_resync_seqno"
-	Set gtmtypes("shm_snapshot_t",169,"off")=5144
+	Set gtmtypes("shm_snapshot_t",168,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_eovtn")=168
+	Set gtmtypes("shm_snapshot_t",169,"name")="shm_snapshot_t.shadow_file_header.filler_jnl"
+	Set gtmtypes("shm_snapshot_t",169,"off")=5136
 	Set gtmtypes("shm_snapshot_t",169,"len")=8
-	Set gtmtypes("shm_snapshot_t",169,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.intrpt_recov_resync_seqno")=169
-	Set gtmtypes("shm_snapshot_t",170,"name")="shm_snapshot_t.shadow_file_header.intrpt_recov_tp_resolve_time"
-	Set gtmtypes("shm_snapshot_t",170,"off")=5152
-	Set gtmtypes("shm_snapshot_t",170,"len")=4
-	Set gtmtypes("shm_snapshot_t",170,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.intrpt_recov_tp_resolve_time")=170
-	Set gtmtypes("shm_snapshot_t",171,"name")="shm_snapshot_t.shadow_file_header.recov_interrupted"
-	Set gtmtypes("shm_snapshot_t",171,"off")=5156
+	Set gtmtypes("shm_snapshot_t",169,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_jnl")=169
+	Set gtmtypes("shm_snapshot_t",170,"name")="shm_snapshot_t.shadow_file_header.intrpt_recov_resync_seqno"
+	Set gtmtypes("shm_snapshot_t",170,"off")=5144
+	Set gtmtypes("shm_snapshot_t",170,"len")=8
+	Set gtmtypes("shm_snapshot_t",170,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.intrpt_recov_resync_seqno")=170
+	Set gtmtypes("shm_snapshot_t",171,"name")="shm_snapshot_t.shadow_file_header.intrpt_recov_tp_resolve_time"
+	Set gtmtypes("shm_snapshot_t",171,"off")=5152
 	Set gtmtypes("shm_snapshot_t",171,"len")=4
-	Set gtmtypes("shm_snapshot_t",171,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recov_interrupted")=171
-	Set gtmtypes("shm_snapshot_t",172,"name")="shm_snapshot_t.shadow_file_header.intrpt_recov_jnl_state"
-	Set gtmtypes("shm_snapshot_t",172,"off")=5160
+	Set gtmtypes("shm_snapshot_t",171,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.intrpt_recov_tp_resolve_time")=171
+	Set gtmtypes("shm_snapshot_t",172,"name")="shm_snapshot_t.shadow_file_header.recov_interrupted"
+	Set gtmtypes("shm_snapshot_t",172,"off")=5156
 	Set gtmtypes("shm_snapshot_t",172,"len")=4
-	Set gtmtypes("shm_snapshot_t",172,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.intrpt_recov_jnl_state")=172
-	Set gtmtypes("shm_snapshot_t",173,"name")="shm_snapshot_t.shadow_file_header.intrpt_recov_repl_state"
-	Set gtmtypes("shm_snapshot_t",173,"off")=5164
+	Set gtmtypes("shm_snapshot_t",172,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recov_interrupted")=172
+	Set gtmtypes("shm_snapshot_t",173,"name")="shm_snapshot_t.shadow_file_header.intrpt_recov_jnl_state"
+	Set gtmtypes("shm_snapshot_t",173,"off")=5160
 	Set gtmtypes("shm_snapshot_t",173,"len")=4
 	Set gtmtypes("shm_snapshot_t",173,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.intrpt_recov_repl_state")=173
-	Set gtmtypes("shm_snapshot_t",174,"name")="shm_snapshot_t.shadow_file_header.before_trunc_total_blks"
-	Set gtmtypes("shm_snapshot_t",174,"off")=5168
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.intrpt_recov_jnl_state")=173
+	Set gtmtypes("shm_snapshot_t",174,"name")="shm_snapshot_t.shadow_file_header.intrpt_recov_repl_state"
+	Set gtmtypes("shm_snapshot_t",174,"off")=5164
 	Set gtmtypes("shm_snapshot_t",174,"len")=4
-	Set gtmtypes("shm_snapshot_t",174,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.before_trunc_total_blks")=174
-	Set gtmtypes("shm_snapshot_t",175,"name")="shm_snapshot_t.shadow_file_header.after_trunc_total_blks"
-	Set gtmtypes("shm_snapshot_t",175,"off")=5172
+	Set gtmtypes("shm_snapshot_t",174,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.intrpt_recov_repl_state")=174
+	Set gtmtypes("shm_snapshot_t",175,"name")="shm_snapshot_t.shadow_file_header.before_trunc_total_blks"
+	Set gtmtypes("shm_snapshot_t",175,"off")=5168
 	Set gtmtypes("shm_snapshot_t",175,"len")=4
 	Set gtmtypes("shm_snapshot_t",175,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.after_trunc_total_blks")=175
-	Set gtmtypes("shm_snapshot_t",176,"name")="shm_snapshot_t.shadow_file_header.before_trunc_free_blocks"
-	Set gtmtypes("shm_snapshot_t",176,"off")=5176
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.before_trunc_total_blks")=175
+	Set gtmtypes("shm_snapshot_t",176,"name")="shm_snapshot_t.shadow_file_header.after_trunc_total_blks"
+	Set gtmtypes("shm_snapshot_t",176,"off")=5172
 	Set gtmtypes("shm_snapshot_t",176,"len")=4
 	Set gtmtypes("shm_snapshot_t",176,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.before_trunc_free_blocks")=176
-	Set gtmtypes("shm_snapshot_t",177,"name")="shm_snapshot_t.shadow_file_header.filler_trunc"
-	Set gtmtypes("shm_snapshot_t",177,"off")=5180
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.after_trunc_total_blks")=176
+	Set gtmtypes("shm_snapshot_t",177,"name")="shm_snapshot_t.shadow_file_header.before_trunc_free_blocks"
+	Set gtmtypes("shm_snapshot_t",177,"off")=5176
 	Set gtmtypes("shm_snapshot_t",177,"len")=4
 	Set gtmtypes("shm_snapshot_t",177,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_trunc")=177
-	Set gtmtypes("shm_snapshot_t",178,"name")="shm_snapshot_t.shadow_file_header.filler_1k"
-	Set gtmtypes("shm_snapshot_t",178,"off")=5184
-	Set gtmtypes("shm_snapshot_t",178,"len")=24
-	Set gtmtypes("shm_snapshot_t",178,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_1k")=178
-	Set gtmtypes("shm_snapshot_t",179,"name")="shm_snapshot_t.shadow_file_header.jnl_file_name"
-	Set gtmtypes("shm_snapshot_t",179,"off")=5208
-	Set gtmtypes("shm_snapshot_t",179,"len")=256
-	Set gtmtypes("shm_snapshot_t",179,"type")="unsigned-char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_file_name")=179
-	Set gtmtypes("shm_snapshot_t",180,"name")="shm_snapshot_t.shadow_file_header.reorg_restart_key"
-	Set gtmtypes("shm_snapshot_t",180,"off")=5464
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.before_trunc_free_blocks")=177
+	Set gtmtypes("shm_snapshot_t",178,"name")="shm_snapshot_t.shadow_file_header.filler_trunc"
+	Set gtmtypes("shm_snapshot_t",178,"off")=5180
+	Set gtmtypes("shm_snapshot_t",178,"len")=4
+	Set gtmtypes("shm_snapshot_t",178,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_trunc")=178
+	Set gtmtypes("shm_snapshot_t",179,"name")="shm_snapshot_t.shadow_file_header.filler_1k"
+	Set gtmtypes("shm_snapshot_t",179,"off")=5184
+	Set gtmtypes("shm_snapshot_t",179,"len")=24
+	Set gtmtypes("shm_snapshot_t",179,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_1k")=179
+	Set gtmtypes("shm_snapshot_t",180,"name")="shm_snapshot_t.shadow_file_header.jnl_file_name"
+	Set gtmtypes("shm_snapshot_t",180,"off")=5208
 	Set gtmtypes("shm_snapshot_t",180,"len")=256
 	Set gtmtypes("shm_snapshot_t",180,"type")="unsigned-char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reorg_restart_key")=180
-	Set gtmtypes("shm_snapshot_t",181,"name")="shm_snapshot_t.shadow_file_header.machine_name"
-	Set gtmtypes("shm_snapshot_t",181,"off")=5720
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_file_name")=180
+	Set gtmtypes("shm_snapshot_t",181,"name")="shm_snapshot_t.shadow_file_header.reorg_restart_key"
+	Set gtmtypes("shm_snapshot_t",181,"off")=5464
 	Set gtmtypes("shm_snapshot_t",181,"len")=256
-	Set gtmtypes("shm_snapshot_t",181,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.machine_name")=181
-	Set gtmtypes("shm_snapshot_t",182,"name")="shm_snapshot_t.shadow_file_header.encryption_hash"
-	Set gtmtypes("shm_snapshot_t",182,"off")=5976
-	Set gtmtypes("shm_snapshot_t",182,"len")=80
+	Set gtmtypes("shm_snapshot_t",181,"type")="unsigned-char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reorg_restart_key")=181
+	Set gtmtypes("shm_snapshot_t",182,"name")="shm_snapshot_t.shadow_file_header.machine_name"
+	Set gtmtypes("shm_snapshot_t",182,"off")=5720
+	Set gtmtypes("shm_snapshot_t",182,"len")=256
 	Set gtmtypes("shm_snapshot_t",182,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.encryption_hash")=182
-	Set gtmtypes("shm_snapshot_t",183,"name")="shm_snapshot_t.shadow_file_header.encryption_hash2"
-	Set gtmtypes("shm_snapshot_t",183,"off")=6056
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.machine_name")=182
+	Set gtmtypes("shm_snapshot_t",183,"name")="shm_snapshot_t.shadow_file_header.encryption_hash"
+	Set gtmtypes("shm_snapshot_t",183,"off")=5976
 	Set gtmtypes("shm_snapshot_t",183,"len")=80
 	Set gtmtypes("shm_snapshot_t",183,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.encryption_hash2")=183
-	Set gtmtypes("shm_snapshot_t",184,"name")="shm_snapshot_t.shadow_file_header.non_null_iv"
-	Set gtmtypes("shm_snapshot_t",184,"off")=6136
-	Set gtmtypes("shm_snapshot_t",184,"len")=4
-	Set gtmtypes("shm_snapshot_t",184,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.non_null_iv")=184
-	Set gtmtypes("shm_snapshot_t",185,"name")="shm_snapshot_t.shadow_file_header.encryption_hash_cutoff"
-	Set gtmtypes("shm_snapshot_t",185,"off")=6140
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.encryption_hash")=183
+	Set gtmtypes("shm_snapshot_t",184,"name")="shm_snapshot_t.shadow_file_header.encryption_hash2"
+	Set gtmtypes("shm_snapshot_t",184,"off")=6056
+	Set gtmtypes("shm_snapshot_t",184,"len")=80
+	Set gtmtypes("shm_snapshot_t",184,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.encryption_hash2")=184
+	Set gtmtypes("shm_snapshot_t",185,"name")="shm_snapshot_t.shadow_file_header.non_null_iv"
+	Set gtmtypes("shm_snapshot_t",185,"off")=6136
 	Set gtmtypes("shm_snapshot_t",185,"len")=4
-	Set gtmtypes("shm_snapshot_t",185,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.encryption_hash_cutoff")=185
-	Set gtmtypes("shm_snapshot_t",186,"name")="shm_snapshot_t.shadow_file_header.encryption_hash2_start_tn"
-	Set gtmtypes("shm_snapshot_t",186,"off")=6144
-	Set gtmtypes("shm_snapshot_t",186,"len")=8
-	Set gtmtypes("shm_snapshot_t",186,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.encryption_hash2_start_tn")=186
-	Set gtmtypes("shm_snapshot_t",187,"name")="shm_snapshot_t.shadow_file_header.filler_encrypt"
-	Set gtmtypes("shm_snapshot_t",187,"off")=6152
-	Set gtmtypes("shm_snapshot_t",187,"len")=80
-	Set gtmtypes("shm_snapshot_t",187,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_encrypt")=187
-	Set gtmtypes("shm_snapshot_t",188,"name")="shm_snapshot_t.shadow_file_header.total_buffer_flush_tn"
-	Set gtmtypes("shm_snapshot_t",188,"off")=6232
-	Set gtmtypes("shm_snapshot_t",188,"len")=8
-	Set gtmtypes("shm_snapshot_t",188,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.total_buffer_flush_tn")=188
-	Set gtmtypes("shm_snapshot_t",189,"name")="shm_snapshot_t.shadow_file_header.bufct_buffer_flush_tn"
-	Set gtmtypes("shm_snapshot_t",189,"off")=6240
+	Set gtmtypes("shm_snapshot_t",185,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.non_null_iv")=185
+	Set gtmtypes("shm_snapshot_t",186,"name")="shm_snapshot_t.shadow_file_header.encryption_hash_cutoff"
+	Set gtmtypes("shm_snapshot_t",186,"off")=6140
+	Set gtmtypes("shm_snapshot_t",186,"len")=4
+	Set gtmtypes("shm_snapshot_t",186,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.encryption_hash_cutoff")=186
+	Set gtmtypes("shm_snapshot_t",187,"name")="shm_snapshot_t.shadow_file_header.encryption_hash2_start_tn"
+	Set gtmtypes("shm_snapshot_t",187,"off")=6144
+	Set gtmtypes("shm_snapshot_t",187,"len")=8
+	Set gtmtypes("shm_snapshot_t",187,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.encryption_hash2_start_tn")=187
+	Set gtmtypes("shm_snapshot_t",188,"name")="shm_snapshot_t.shadow_file_header.filler_encrypt"
+	Set gtmtypes("shm_snapshot_t",188,"off")=6152
+	Set gtmtypes("shm_snapshot_t",188,"len")=80
+	Set gtmtypes("shm_snapshot_t",188,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_encrypt")=188
+	Set gtmtypes("shm_snapshot_t",189,"name")="shm_snapshot_t.shadow_file_header.total_buffer_flush_tn"
+	Set gtmtypes("shm_snapshot_t",189,"off")=6232
 	Set gtmtypes("shm_snapshot_t",189,"len")=8
 	Set gtmtypes("shm_snapshot_t",189,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bufct_buffer_flush_tn")=189
-	Set gtmtypes("shm_snapshot_t",190,"name")="shm_snapshot_t.shadow_file_header.bufct_buffer_flush_loop_tn"
-	Set gtmtypes("shm_snapshot_t",190,"off")=6248
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.total_buffer_flush_tn")=189
+	Set gtmtypes("shm_snapshot_t",190,"name")="shm_snapshot_t.shadow_file_header.bufct_buffer_flush_tn"
+	Set gtmtypes("shm_snapshot_t",190,"off")=6240
 	Set gtmtypes("shm_snapshot_t",190,"len")=8
 	Set gtmtypes("shm_snapshot_t",190,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bufct_buffer_flush_loop_tn")=190
-	Set gtmtypes("shm_snapshot_t",191,"name")="shm_snapshot_t.shadow_file_header.wrt_calls_tn"
-	Set gtmtypes("shm_snapshot_t",191,"off")=6256
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bufct_buffer_flush_tn")=190
+	Set gtmtypes("shm_snapshot_t",191,"name")="shm_snapshot_t.shadow_file_header.bufct_buffer_flush_loop_tn"
+	Set gtmtypes("shm_snapshot_t",191,"off")=6248
 	Set gtmtypes("shm_snapshot_t",191,"len")=8
 	Set gtmtypes("shm_snapshot_t",191,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_calls_tn")=191
-	Set gtmtypes("shm_snapshot_t",192,"name")="shm_snapshot_t.shadow_file_header.wrt_count_tn"
-	Set gtmtypes("shm_snapshot_t",192,"off")=6264
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bufct_buffer_flush_loop_tn")=191
+	Set gtmtypes("shm_snapshot_t",192,"name")="shm_snapshot_t.shadow_file_header.wrt_calls_tn"
+	Set gtmtypes("shm_snapshot_t",192,"off")=6256
 	Set gtmtypes("shm_snapshot_t",192,"len")=8
 	Set gtmtypes("shm_snapshot_t",192,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_count_tn")=192
-	Set gtmtypes("shm_snapshot_t",193,"name")="shm_snapshot_t.shadow_file_header.wrt_blocked_tn"
-	Set gtmtypes("shm_snapshot_t",193,"off")=6272
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_calls_tn")=192
+	Set gtmtypes("shm_snapshot_t",193,"name")="shm_snapshot_t.shadow_file_header.wrt_count_tn"
+	Set gtmtypes("shm_snapshot_t",193,"off")=6264
 	Set gtmtypes("shm_snapshot_t",193,"len")=8
 	Set gtmtypes("shm_snapshot_t",193,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_blocked_tn")=193
-	Set gtmtypes("shm_snapshot_t",194,"name")="shm_snapshot_t.shadow_file_header.wrt_busy_tn"
-	Set gtmtypes("shm_snapshot_t",194,"off")=6280
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_count_tn")=193
+	Set gtmtypes("shm_snapshot_t",194,"name")="shm_snapshot_t.shadow_file_header.wrt_blocked_tn"
+	Set gtmtypes("shm_snapshot_t",194,"off")=6272
 	Set gtmtypes("shm_snapshot_t",194,"len")=8
 	Set gtmtypes("shm_snapshot_t",194,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_busy_tn")=194
-	Set gtmtypes("shm_snapshot_t",195,"name")="shm_snapshot_t.shadow_file_header.wrt_noblks_wrtn_tn"
-	Set gtmtypes("shm_snapshot_t",195,"off")=6288
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_blocked_tn")=194
+	Set gtmtypes("shm_snapshot_t",195,"name")="shm_snapshot_t.shadow_file_header.wrt_busy_tn"
+	Set gtmtypes("shm_snapshot_t",195,"off")=6280
 	Set gtmtypes("shm_snapshot_t",195,"len")=8
 	Set gtmtypes("shm_snapshot_t",195,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_noblks_wrtn_tn")=195
-	Set gtmtypes("shm_snapshot_t",196,"name")="shm_snapshot_t.shadow_file_header.reserved_bgtrcrec1_tn"
-	Set gtmtypes("shm_snapshot_t",196,"off")=6296
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_busy_tn")=195
+	Set gtmtypes("shm_snapshot_t",196,"name")="shm_snapshot_t.shadow_file_header.wrt_noblks_wrtn_tn"
+	Set gtmtypes("shm_snapshot_t",196,"off")=6288
 	Set gtmtypes("shm_snapshot_t",196,"len")=8
 	Set gtmtypes("shm_snapshot_t",196,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reserved_bgtrcrec1_tn")=196
-	Set gtmtypes("shm_snapshot_t",197,"name")="shm_snapshot_t.shadow_file_header.reserved_bgtrcrec2_tn"
-	Set gtmtypes("shm_snapshot_t",197,"off")=6304
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_noblks_wrtn_tn")=196
+	Set gtmtypes("shm_snapshot_t",197,"name")="shm_snapshot_t.shadow_file_header.reserved_bgtrcrec1_tn"
+	Set gtmtypes("shm_snapshot_t",197,"off")=6296
 	Set gtmtypes("shm_snapshot_t",197,"len")=8
 	Set gtmtypes("shm_snapshot_t",197,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reserved_bgtrcrec2_tn")=197
-	Set gtmtypes("shm_snapshot_t",198,"name")="shm_snapshot_t.shadow_file_header.reserved_bgtrcrec3_tn"
-	Set gtmtypes("shm_snapshot_t",198,"off")=6312
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reserved_bgtrcrec1_tn")=197
+	Set gtmtypes("shm_snapshot_t",198,"name")="shm_snapshot_t.shadow_file_header.reserved_bgtrcrec2_tn"
+	Set gtmtypes("shm_snapshot_t",198,"off")=6304
 	Set gtmtypes("shm_snapshot_t",198,"len")=8
 	Set gtmtypes("shm_snapshot_t",198,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reserved_bgtrcrec3_tn")=198
-	Set gtmtypes("shm_snapshot_t",199,"name")="shm_snapshot_t.shadow_file_header.lost_block_recovery_tn"
-	Set gtmtypes("shm_snapshot_t",199,"off")=6320
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reserved_bgtrcrec2_tn")=198
+	Set gtmtypes("shm_snapshot_t",199,"name")="shm_snapshot_t.shadow_file_header.reserved_bgtrcrec3_tn"
+	Set gtmtypes("shm_snapshot_t",199,"off")=6312
 	Set gtmtypes("shm_snapshot_t",199,"len")=8
 	Set gtmtypes("shm_snapshot_t",199,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.lost_block_recovery_tn")=199
-	Set gtmtypes("shm_snapshot_t",200,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_onln_rlbk_tn"
-	Set gtmtypes("shm_snapshot_t",200,"off")=6328
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reserved_bgtrcrec3_tn")=199
+	Set gtmtypes("shm_snapshot_t",200,"name")="shm_snapshot_t.shadow_file_header.lost_block_recovery_tn"
+	Set gtmtypes("shm_snapshot_t",200,"off")=6320
 	Set gtmtypes("shm_snapshot_t",200,"len")=8
 	Set gtmtypes("shm_snapshot_t",200,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_onln_rlbk_tn")=200
-	Set gtmtypes("shm_snapshot_t",201,"name")="shm_snapshot_t.shadow_file_header.stale_tn"
-	Set gtmtypes("shm_snapshot_t",201,"off")=6336
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.lost_block_recovery_tn")=200
+	Set gtmtypes("shm_snapshot_t",201,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_onln_rlbk_tn"
+	Set gtmtypes("shm_snapshot_t",201,"off")=6328
 	Set gtmtypes("shm_snapshot_t",201,"len")=8
 	Set gtmtypes("shm_snapshot_t",201,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_tn")=201
-	Set gtmtypes("shm_snapshot_t",202,"name")="shm_snapshot_t.shadow_file_header.starved_tn"
-	Set gtmtypes("shm_snapshot_t",202,"off")=6344
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_onln_rlbk_tn")=201
+	Set gtmtypes("shm_snapshot_t",202,"name")="shm_snapshot_t.shadow_file_header.stale_tn"
+	Set gtmtypes("shm_snapshot_t",202,"off")=6336
 	Set gtmtypes("shm_snapshot_t",202,"len")=8
 	Set gtmtypes("shm_snapshot_t",202,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.starved_tn")=202
-	Set gtmtypes("shm_snapshot_t",203,"name")="shm_snapshot_t.shadow_file_header.stale_timer_started_tn"
-	Set gtmtypes("shm_snapshot_t",203,"off")=6352
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_tn")=202
+	Set gtmtypes("shm_snapshot_t",203,"name")="shm_snapshot_t.shadow_file_header.starved_tn"
+	Set gtmtypes("shm_snapshot_t",203,"off")=6344
 	Set gtmtypes("shm_snapshot_t",203,"len")=8
 	Set gtmtypes("shm_snapshot_t",203,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_timer_started_tn")=203
-	Set gtmtypes("shm_snapshot_t",204,"name")="shm_snapshot_t.shadow_file_header.stale_timer_pop_tn"
-	Set gtmtypes("shm_snapshot_t",204,"off")=6360
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.starved_tn")=203
+	Set gtmtypes("shm_snapshot_t",204,"name")="shm_snapshot_t.shadow_file_header.stale_timer_started_tn"
+	Set gtmtypes("shm_snapshot_t",204,"off")=6352
 	Set gtmtypes("shm_snapshot_t",204,"len")=8
 	Set gtmtypes("shm_snapshot_t",204,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_timer_pop_tn")=204
-	Set gtmtypes("shm_snapshot_t",205,"name")="shm_snapshot_t.shadow_file_header.stale_process_defer_tn"
-	Set gtmtypes("shm_snapshot_t",205,"off")=6368
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_timer_started_tn")=204
+	Set gtmtypes("shm_snapshot_t",205,"name")="shm_snapshot_t.shadow_file_header.stale_timer_pop_tn"
+	Set gtmtypes("shm_snapshot_t",205,"off")=6360
 	Set gtmtypes("shm_snapshot_t",205,"len")=8
 	Set gtmtypes("shm_snapshot_t",205,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_process_defer_tn")=205
-	Set gtmtypes("shm_snapshot_t",206,"name")="shm_snapshot_t.shadow_file_header.stale_defer_processed_tn"
-	Set gtmtypes("shm_snapshot_t",206,"off")=6376
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_timer_pop_tn")=205
+	Set gtmtypes("shm_snapshot_t",206,"name")="shm_snapshot_t.shadow_file_header.stale_process_defer_tn"
+	Set gtmtypes("shm_snapshot_t",206,"off")=6368
 	Set gtmtypes("shm_snapshot_t",206,"len")=8
 	Set gtmtypes("shm_snapshot_t",206,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_defer_processed_tn")=206
-	Set gtmtypes("shm_snapshot_t",207,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flush_tn"
-	Set gtmtypes("shm_snapshot_t",207,"off")=6384
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_process_defer_tn")=206
+	Set gtmtypes("shm_snapshot_t",207,"name")="shm_snapshot_t.shadow_file_header.stale_defer_processed_tn"
+	Set gtmtypes("shm_snapshot_t",207,"off")=6376
 	Set gtmtypes("shm_snapshot_t",207,"len")=8
 	Set gtmtypes("shm_snapshot_t",207,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flush_tn")=207
-	Set gtmtypes("shm_snapshot_t",208,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flush_loop_tn"
-	Set gtmtypes("shm_snapshot_t",208,"off")=6392
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_defer_processed_tn")=207
+	Set gtmtypes("shm_snapshot_t",208,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flush_tn"
+	Set gtmtypes("shm_snapshot_t",208,"off")=6384
 	Set gtmtypes("shm_snapshot_t",208,"len")=8
 	Set gtmtypes("shm_snapshot_t",208,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flush_loop_tn")=208
-	Set gtmtypes("shm_snapshot_t",209,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flush_retries_tn"
-	Set gtmtypes("shm_snapshot_t",209,"off")=6400
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flush_tn")=208
+	Set gtmtypes("shm_snapshot_t",209,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flush_loop_tn"
+	Set gtmtypes("shm_snapshot_t",209,"off")=6392
 	Set gtmtypes("shm_snapshot_t",209,"len")=8
 	Set gtmtypes("shm_snapshot_t",209,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flush_retries_tn")=209
-	Set gtmtypes("shm_snapshot_t",210,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flushed_during_lockwait_tn"
-	Set gtmtypes("shm_snapshot_t",210,"off")=6408
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flush_loop_tn")=209
+	Set gtmtypes("shm_snapshot_t",210,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flush_retries_tn"
+	Set gtmtypes("shm_snapshot_t",210,"off")=6400
 	Set gtmtypes("shm_snapshot_t",210,"len")=8
 	Set gtmtypes("shm_snapshot_t",210,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flushed_during_lockwait_tn")=210
-	Set gtmtypes("shm_snapshot_t",211,"name")="shm_snapshot_t.shadow_file_header.tp_crit_retries_tn"
-	Set gtmtypes("shm_snapshot_t",211,"off")=6416
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flush_retries_tn")=210
+	Set gtmtypes("shm_snapshot_t",211,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flushed_during_lockwait_tn"
+	Set gtmtypes("shm_snapshot_t",211,"off")=6408
 	Set gtmtypes("shm_snapshot_t",211,"len")=8
 	Set gtmtypes("shm_snapshot_t",211,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.tp_crit_retries_tn")=211
-	Set gtmtypes("shm_snapshot_t",212,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_flush_dirty_tn"
-	Set gtmtypes("shm_snapshot_t",212,"off")=6424
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flushed_during_lockwait_tn")=211
+	Set gtmtypes("shm_snapshot_t",212,"name")="shm_snapshot_t.shadow_file_header.tp_crit_retries_tn"
+	Set gtmtypes("shm_snapshot_t",212,"off")=6416
 	Set gtmtypes("shm_snapshot_t",212,"len")=8
 	Set gtmtypes("shm_snapshot_t",212,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_flush_dirty_tn")=212
-	Set gtmtypes("shm_snapshot_t",213,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_rip_wait_tn"
-	Set gtmtypes("shm_snapshot_t",213,"off")=6432
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.tp_crit_retries_tn")=212
+	Set gtmtypes("shm_snapshot_t",213,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_flush_dirty_tn"
+	Set gtmtypes("shm_snapshot_t",213,"off")=6424
 	Set gtmtypes("shm_snapshot_t",213,"len")=8
 	Set gtmtypes("shm_snapshot_t",213,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_rip_wait_tn")=213
-	Set gtmtypes("shm_snapshot_t",214,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_buf_owner_stuck_tn"
-	Set gtmtypes("shm_snapshot_t",214,"off")=6440
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_flush_dirty_tn")=213
+	Set gtmtypes("shm_snapshot_t",214,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_rip_wait_tn"
+	Set gtmtypes("shm_snapshot_t",214,"off")=6432
 	Set gtmtypes("shm_snapshot_t",214,"len")=8
 	Set gtmtypes("shm_snapshot_t",214,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_buf_owner_stuck_tn")=214
-	Set gtmtypes("shm_snapshot_t",215,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_out_of_design_tn"
-	Set gtmtypes("shm_snapshot_t",215,"off")=6448
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_rip_wait_tn")=214
+	Set gtmtypes("shm_snapshot_t",215,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_buf_owner_stuck_tn"
+	Set gtmtypes("shm_snapshot_t",215,"off")=6440
 	Set gtmtypes("shm_snapshot_t",215,"len")=8
 	Set gtmtypes("shm_snapshot_t",215,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_out_of_design_tn")=215
-	Set gtmtypes("shm_snapshot_t",216,"name")="shm_snapshot_t.shadow_file_header.t_qread_buf_owner_stuck_tn"
-	Set gtmtypes("shm_snapshot_t",216,"off")=6456
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_buf_owner_stuck_tn")=215
+	Set gtmtypes("shm_snapshot_t",216,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_out_of_design_tn"
+	Set gtmtypes("shm_snapshot_t",216,"off")=6448
 	Set gtmtypes("shm_snapshot_t",216,"len")=8
 	Set gtmtypes("shm_snapshot_t",216,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_buf_owner_stuck_tn")=216
-	Set gtmtypes("shm_snapshot_t",217,"name")="shm_snapshot_t.shadow_file_header.t_qread_out_of_design_tn"
-	Set gtmtypes("shm_snapshot_t",217,"off")=6464
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_out_of_design_tn")=216
+	Set gtmtypes("shm_snapshot_t",217,"name")="shm_snapshot_t.shadow_file_header.t_qread_buf_owner_stuck_tn"
+	Set gtmtypes("shm_snapshot_t",217,"off")=6456
 	Set gtmtypes("shm_snapshot_t",217,"len")=8
 	Set gtmtypes("shm_snapshot_t",217,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_out_of_design_tn")=217
-	Set gtmtypes("shm_snapshot_t",218,"name")="shm_snapshot_t.shadow_file_header.bt_put_flush_dirty_tn"
-	Set gtmtypes("shm_snapshot_t",218,"off")=6472
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_buf_owner_stuck_tn")=217
+	Set gtmtypes("shm_snapshot_t",218,"name")="shm_snapshot_t.shadow_file_header.t_qread_out_of_design_tn"
+	Set gtmtypes("shm_snapshot_t",218,"off")=6464
 	Set gtmtypes("shm_snapshot_t",218,"len")=8
 	Set gtmtypes("shm_snapshot_t",218,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bt_put_flush_dirty_tn")=218
-	Set gtmtypes("shm_snapshot_t",219,"name")="shm_snapshot_t.shadow_file_header.mlock_wakeups_tn"
-	Set gtmtypes("shm_snapshot_t",219,"off")=6480
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_out_of_design_tn")=218
+	Set gtmtypes("shm_snapshot_t",219,"name")="shm_snapshot_t.shadow_file_header.bt_put_flush_dirty_tn"
+	Set gtmtypes("shm_snapshot_t",219,"off")=6472
 	Set gtmtypes("shm_snapshot_t",219,"len")=8
 	Set gtmtypes("shm_snapshot_t",219,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.mlock_wakeups_tn")=219
-	Set gtmtypes("shm_snapshot_t",220,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_recover_invoked_tn"
-	Set gtmtypes("shm_snapshot_t",220,"off")=6488
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bt_put_flush_dirty_tn")=219
+	Set gtmtypes("shm_snapshot_t",220,"name")="shm_snapshot_t.shadow_file_header.mlock_wakeups_tn"
+	Set gtmtypes("shm_snapshot_t",220,"off")=6480
 	Set gtmtypes("shm_snapshot_t",220,"len")=8
 	Set gtmtypes("shm_snapshot_t",220,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_recover_invoked_tn")=220
-	Set gtmtypes("shm_snapshot_t",221,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_verify_passed_tn"
-	Set gtmtypes("shm_snapshot_t",221,"off")=6496
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.mlock_wakeups_tn")=220
+	Set gtmtypes("shm_snapshot_t",221,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_recover_invoked_tn"
+	Set gtmtypes("shm_snapshot_t",221,"off")=6488
 	Set gtmtypes("shm_snapshot_t",221,"len")=8
 	Set gtmtypes("shm_snapshot_t",221,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_verify_passed_tn")=221
-	Set gtmtypes("shm_snapshot_t",222,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_tn"
-	Set gtmtypes("shm_snapshot_t",222,"off")=6504
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_recover_invoked_tn")=221
+	Set gtmtypes("shm_snapshot_t",222,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_verify_passed_tn"
+	Set gtmtypes("shm_snapshot_t",222,"off")=6496
 	Set gtmtypes("shm_snapshot_t",222,"len")=8
 	Set gtmtypes("shm_snapshot_t",222,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_tn")=222
-	Set gtmtypes("shm_snapshot_t",223,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_tn"
-	Set gtmtypes("shm_snapshot_t",223,"off")=6512
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_verify_passed_tn")=222
+	Set gtmtypes("shm_snapshot_t",223,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_tn"
+	Set gtmtypes("shm_snapshot_t",223,"off")=6504
 	Set gtmtypes("shm_snapshot_t",223,"len")=8
 	Set gtmtypes("shm_snapshot_t",223,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_tn")=223
-	Set gtmtypes("shm_snapshot_t",224,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_db_csh_getn_loopexceed_tn"
-	Set gtmtypes("shm_snapshot_t",224,"off")=6520
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_tn")=223
+	Set gtmtypes("shm_snapshot_t",224,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_tn"
+	Set gtmtypes("shm_snapshot_t",224,"off")=6512
 	Set gtmtypes("shm_snapshot_t",224,"len")=8
 	Set gtmtypes("shm_snapshot_t",224,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_db_csh_getn_loopexceed_tn")=224
-	Set gtmtypes("shm_snapshot_t",225,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_tn"
-	Set gtmtypes("shm_snapshot_t",225,"off")=6528
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_tn")=224
+	Set gtmtypes("shm_snapshot_t",225,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_db_csh_getn_loopexceed_tn"
+	Set gtmtypes("shm_snapshot_t",225,"off")=6520
 	Set gtmtypes("shm_snapshot_t",225,"len")=8
 	Set gtmtypes("shm_snapshot_t",225,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_tn")=225
-	Set gtmtypes("shm_snapshot_t",226,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_db_csh_get_tn"
-	Set gtmtypes("shm_snapshot_t",226,"off")=6536
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_db_csh_getn_loopexceed_tn")=225
+	Set gtmtypes("shm_snapshot_t",226,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_tn"
+	Set gtmtypes("shm_snapshot_t",226,"off")=6528
 	Set gtmtypes("shm_snapshot_t",226,"len")=8
 	Set gtmtypes("shm_snapshot_t",226,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_db_csh_get_tn")=226
-	Set gtmtypes("shm_snapshot_t",227,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_wcsgetspace_tn"
-	Set gtmtypes("shm_snapshot_t",227,"off")=6544
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_tn")=226
+	Set gtmtypes("shm_snapshot_t",227,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_db_csh_get_tn"
+	Set gtmtypes("shm_snapshot_t",227,"off")=6536
 	Set gtmtypes("shm_snapshot_t",227,"len")=8
 	Set gtmtypes("shm_snapshot_t",227,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_wcsgetspace_tn")=227
-	Set gtmtypes("shm_snapshot_t",228,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_t1_tn"
-	Set gtmtypes("shm_snapshot_t",228,"off")=6552
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_db_csh_get_tn")=227
+	Set gtmtypes("shm_snapshot_t",228,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_wcsgetspace_tn"
+	Set gtmtypes("shm_snapshot_t",228,"off")=6544
 	Set gtmtypes("shm_snapshot_t",228,"len")=8
 	Set gtmtypes("shm_snapshot_t",228,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_t1_tn")=228
-	Set gtmtypes("shm_snapshot_t",229,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_bitmap_tn"
-	Set gtmtypes("shm_snapshot_t",229,"off")=6560
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_wcsgetspace_tn")=228
+	Set gtmtypes("shm_snapshot_t",229,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_t1_tn"
+	Set gtmtypes("shm_snapshot_t",229,"off")=6552
 	Set gtmtypes("shm_snapshot_t",229,"len")=8
 	Set gtmtypes("shm_snapshot_t",229,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_bitmap_tn")=229
-	Set gtmtypes("shm_snapshot_t",230,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_jnl_cwset_tn"
-	Set gtmtypes("shm_snapshot_t",230,"off")=6568
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_t1_tn")=229
+	Set gtmtypes("shm_snapshot_t",230,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_bitmap_tn"
+	Set gtmtypes("shm_snapshot_t",230,"off")=6560
 	Set gtmtypes("shm_snapshot_t",230,"len")=8
 	Set gtmtypes("shm_snapshot_t",230,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_jnl_cwset_tn")=230
-	Set gtmtypes("shm_snapshot_t",231,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_tn"
-	Set gtmtypes("shm_snapshot_t",231,"off")=6576
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_bitmap_tn")=230
+	Set gtmtypes("shm_snapshot_t",231,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_jnl_cwset_tn"
+	Set gtmtypes("shm_snapshot_t",231,"off")=6568
 	Set gtmtypes("shm_snapshot_t",231,"len")=8
 	Set gtmtypes("shm_snapshot_t",231,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_tn")=231
-	Set gtmtypes("shm_snapshot_t",232,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_hist_tn"
-	Set gtmtypes("shm_snapshot_t",232,"off")=6584
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_jnl_cwset_tn")=231
+	Set gtmtypes("shm_snapshot_t",232,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_tn"
+	Set gtmtypes("shm_snapshot_t",232,"off")=6576
 	Set gtmtypes("shm_snapshot_t",232,"len")=8
 	Set gtmtypes("shm_snapshot_t",232,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_hist_tn")=232
-	Set gtmtypes("shm_snapshot_t",233,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_hist1_nullbt_tn"
-	Set gtmtypes("shm_snapshot_t",233,"off")=6592
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_tn")=232
+	Set gtmtypes("shm_snapshot_t",233,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_hist_tn"
+	Set gtmtypes("shm_snapshot_t",233,"off")=6584
 	Set gtmtypes("shm_snapshot_t",233,"len")=8
 	Set gtmtypes("shm_snapshot_t",233,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_hist1_nullbt_tn")=233
-	Set gtmtypes("shm_snapshot_t",234,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_tn"
-	Set gtmtypes("shm_snapshot_t",234,"off")=6600
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_hist_tn")=233
+	Set gtmtypes("shm_snapshot_t",234,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_hist1_nullbt_tn"
+	Set gtmtypes("shm_snapshot_t",234,"off")=6592
 	Set gtmtypes("shm_snapshot_t",234,"len")=8
 	Set gtmtypes("shm_snapshot_t",234,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_tn")=234
-	Set gtmtypes("shm_snapshot_t",235,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_bitmap_nullbt_tn"
-	Set gtmtypes("shm_snapshot_t",235,"off")=6608
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_hist1_nullbt_tn")=234
+	Set gtmtypes("shm_snapshot_t",235,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_tn"
+	Set gtmtypes("shm_snapshot_t",235,"off")=6600
 	Set gtmtypes("shm_snapshot_t",235,"len")=8
 	Set gtmtypes("shm_snapshot_t",235,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_bitmap_nullbt_tn")=235
-	Set gtmtypes("shm_snapshot_t",236,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_tn"
-	Set gtmtypes("shm_snapshot_t",236,"off")=6616
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_tn")=235
+	Set gtmtypes("shm_snapshot_t",236,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_bitmap_nullbt_tn"
+	Set gtmtypes("shm_snapshot_t",236,"off")=6608
 	Set gtmtypes("shm_snapshot_t",236,"len")=8
 	Set gtmtypes("shm_snapshot_t",236,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_tn")=236
-	Set gtmtypes("shm_snapshot_t",237,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_jnl_cwset_tn"
-	Set gtmtypes("shm_snapshot_t",237,"off")=6624
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_bitmap_nullbt_tn")=236
+	Set gtmtypes("shm_snapshot_t",237,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_tn"
+	Set gtmtypes("shm_snapshot_t",237,"off")=6616
 	Set gtmtypes("shm_snapshot_t",237,"len")=8
 	Set gtmtypes("shm_snapshot_t",237,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_jnl_cwset_tn")=237
-	Set gtmtypes("shm_snapshot_t",238,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_jnl_wcsflu_tn"
-	Set gtmtypes("shm_snapshot_t",238,"off")=6632
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_tn")=237
+	Set gtmtypes("shm_snapshot_t",238,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_jnl_cwset_tn"
+	Set gtmtypes("shm_snapshot_t",238,"off")=6624
 	Set gtmtypes("shm_snapshot_t",238,"len")=8
 	Set gtmtypes("shm_snapshot_t",238,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_jnl_wcsflu_tn")=238
-	Set gtmtypes("shm_snapshot_t",239,"name")="shm_snapshot_t.shadow_file_header.db_csh_get_too_many_loops_tn"
-	Set gtmtypes("shm_snapshot_t",239,"off")=6640
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_jnl_cwset_tn")=238
+	Set gtmtypes("shm_snapshot_t",239,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_jnl_wcsflu_tn"
+	Set gtmtypes("shm_snapshot_t",239,"off")=6632
 	Set gtmtypes("shm_snapshot_t",239,"len")=8
 	Set gtmtypes("shm_snapshot_t",239,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_get_too_many_loops_tn")=239
-	Set gtmtypes("shm_snapshot_t",240,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tpckh_hist1_nullbt_tn"
-	Set gtmtypes("shm_snapshot_t",240,"off")=6648
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_jnl_wcsflu_tn")=239
+	Set gtmtypes("shm_snapshot_t",240,"name")="shm_snapshot_t.shadow_file_header.db_csh_get_too_many_loops_tn"
+	Set gtmtypes("shm_snapshot_t",240,"off")=6640
 	Set gtmtypes("shm_snapshot_t",240,"len")=8
 	Set gtmtypes("shm_snapshot_t",240,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tpckh_hist1_nullbt_tn")=240
-	Set gtmtypes("shm_snapshot_t",241,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_tn"
-	Set gtmtypes("shm_snapshot_t",241,"off")=6656
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_get_too_many_loops_tn")=240
+	Set gtmtypes("shm_snapshot_t",241,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tpckh_hist1_nullbt_tn"
+	Set gtmtypes("shm_snapshot_t",241,"off")=6648
 	Set gtmtypes("shm_snapshot_t",241,"len")=8
 	Set gtmtypes("shm_snapshot_t",241,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_tn")=241
-	Set gtmtypes("shm_snapshot_t",242,"name")="shm_snapshot_t.shadow_file_header.jnl_blocked_writer_lost_tn"
-	Set gtmtypes("shm_snapshot_t",242,"off")=6664
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tpckh_hist1_nullbt_tn")=241
+	Set gtmtypes("shm_snapshot_t",242,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_tn"
+	Set gtmtypes("shm_snapshot_t",242,"off")=6656
 	Set gtmtypes("shm_snapshot_t",242,"len")=8
 	Set gtmtypes("shm_snapshot_t",242,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_blocked_writer_lost_tn")=242
-	Set gtmtypes("shm_snapshot_t",243,"name")="shm_snapshot_t.shadow_file_header.jnl_blocked_writer_stuck_tn"
-	Set gtmtypes("shm_snapshot_t",243,"off")=6672
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_tn")=242
+	Set gtmtypes("shm_snapshot_t",243,"name")="shm_snapshot_t.shadow_file_header.jnl_blocked_writer_lost_tn"
+	Set gtmtypes("shm_snapshot_t",243,"off")=6664
 	Set gtmtypes("shm_snapshot_t",243,"len")=8
 	Set gtmtypes("shm_snapshot_t",243,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_blocked_writer_stuck_tn")=243
-	Set gtmtypes("shm_snapshot_t",244,"name")="shm_snapshot_t.shadow_file_header.jnl_blocked_writer_blocked_tn"
-	Set gtmtypes("shm_snapshot_t",244,"off")=6680
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_blocked_writer_lost_tn")=243
+	Set gtmtypes("shm_snapshot_t",244,"name")="shm_snapshot_t.shadow_file_header.jnl_blocked_writer_stuck_tn"
+	Set gtmtypes("shm_snapshot_t",244,"off")=6672
 	Set gtmtypes("shm_snapshot_t",244,"len")=8
 	Set gtmtypes("shm_snapshot_t",244,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_blocked_writer_blocked_tn")=244
-	Set gtmtypes("shm_snapshot_t",245,"name")="shm_snapshot_t.shadow_file_header.n_jnl_fsyncs_tn"
-	Set gtmtypes("shm_snapshot_t",245,"off")=6688
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_blocked_writer_stuck_tn")=244
+	Set gtmtypes("shm_snapshot_t",245,"name")="shm_snapshot_t.shadow_file_header.jnl_blocked_writer_blocked_tn"
+	Set gtmtypes("shm_snapshot_t",245,"off")=6680
 	Set gtmtypes("shm_snapshot_t",245,"len")=8
 	Set gtmtypes("shm_snapshot_t",245,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_jnl_fsyncs_tn")=245
-	Set gtmtypes("shm_snapshot_t",246,"name")="shm_snapshot_t.shadow_file_header.n_jnl_fsync_tries_tn"
-	Set gtmtypes("shm_snapshot_t",246,"off")=6696
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_blocked_writer_blocked_tn")=245
+	Set gtmtypes("shm_snapshot_t",246,"name")="shm_snapshot_t.shadow_file_header.n_jnl_fsyncs_tn"
+	Set gtmtypes("shm_snapshot_t",246,"off")=6688
 	Set gtmtypes("shm_snapshot_t",246,"len")=8
 	Set gtmtypes("shm_snapshot_t",246,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_jnl_fsync_tries_tn")=246
-	Set gtmtypes("shm_snapshot_t",247,"name")="shm_snapshot_t.shadow_file_header.n_jnl_fsync_recovers_tn"
-	Set gtmtypes("shm_snapshot_t",247,"off")=6704
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_jnl_fsyncs_tn")=246
+	Set gtmtypes("shm_snapshot_t",247,"name")="shm_snapshot_t.shadow_file_header.n_jnl_fsync_tries_tn"
+	Set gtmtypes("shm_snapshot_t",247,"off")=6696
 	Set gtmtypes("shm_snapshot_t",247,"len")=8
 	Set gtmtypes("shm_snapshot_t",247,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_jnl_fsync_recovers_tn")=247
-	Set gtmtypes("shm_snapshot_t",248,"name")="shm_snapshot_t.shadow_file_header.n_db_fsyncs_tn"
-	Set gtmtypes("shm_snapshot_t",248,"off")=6712
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_jnl_fsync_tries_tn")=247
+	Set gtmtypes("shm_snapshot_t",248,"name")="shm_snapshot_t.shadow_file_header.n_jnl_fsync_recovers_tn"
+	Set gtmtypes("shm_snapshot_t",248,"off")=6704
 	Set gtmtypes("shm_snapshot_t",248,"len")=8
 	Set gtmtypes("shm_snapshot_t",248,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_fsyncs_tn")=248
-	Set gtmtypes("shm_snapshot_t",249,"name")="shm_snapshot_t.shadow_file_header.n_db_fsyncs_in_crit_tn"
-	Set gtmtypes("shm_snapshot_t",249,"off")=6720
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_jnl_fsync_recovers_tn")=248
+	Set gtmtypes("shm_snapshot_t",249,"name")="shm_snapshot_t.shadow_file_header.n_db_fsyncs_tn"
+	Set gtmtypes("shm_snapshot_t",249,"off")=6712
 	Set gtmtypes("shm_snapshot_t",249,"len")=8
 	Set gtmtypes("shm_snapshot_t",249,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_fsyncs_in_crit_tn")=249
-	Set gtmtypes("shm_snapshot_t",250,"name")="shm_snapshot_t.shadow_file_header.n_dbsync_timers_tn"
-	Set gtmtypes("shm_snapshot_t",250,"off")=6728
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_fsyncs_tn")=249
+	Set gtmtypes("shm_snapshot_t",250,"name")="shm_snapshot_t.shadow_file_header.n_db_fsyncs_in_crit_tn"
+	Set gtmtypes("shm_snapshot_t",250,"off")=6720
 	Set gtmtypes("shm_snapshot_t",250,"len")=8
 	Set gtmtypes("shm_snapshot_t",250,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_dbsync_timers_tn")=250
-	Set gtmtypes("shm_snapshot_t",251,"name")="shm_snapshot_t.shadow_file_header.n_dbsync_writes_tn"
-	Set gtmtypes("shm_snapshot_t",251,"off")=6736
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_fsyncs_in_crit_tn")=250
+	Set gtmtypes("shm_snapshot_t",251,"name")="shm_snapshot_t.shadow_file_header.n_dbsync_timers_tn"
+	Set gtmtypes("shm_snapshot_t",251,"off")=6728
 	Set gtmtypes("shm_snapshot_t",251,"len")=8
 	Set gtmtypes("shm_snapshot_t",251,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_dbsync_writes_tn")=251
-	Set gtmtypes("shm_snapshot_t",252,"name")="shm_snapshot_t.shadow_file_header.mutex_queue_full_tn"
-	Set gtmtypes("shm_snapshot_t",252,"off")=6744
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_dbsync_timers_tn")=251
+	Set gtmtypes("shm_snapshot_t",252,"name")="shm_snapshot_t.shadow_file_header.n_dbsync_writes_tn"
+	Set gtmtypes("shm_snapshot_t",252,"off")=6736
 	Set gtmtypes("shm_snapshot_t",252,"len")=8
 	Set gtmtypes("shm_snapshot_t",252,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.mutex_queue_full_tn")=252
-	Set gtmtypes("shm_snapshot_t",253,"name")="shm_snapshot_t.shadow_file_header.wcb_bt_put_tn"
-	Set gtmtypes("shm_snapshot_t",253,"off")=6752
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_dbsync_writes_tn")=252
+	Set gtmtypes("shm_snapshot_t",253,"name")="shm_snapshot_t.shadow_file_header.mutex_queue_full_tn"
+	Set gtmtypes("shm_snapshot_t",253,"off")=6744
 	Set gtmtypes("shm_snapshot_t",253,"len")=8
 	Set gtmtypes("shm_snapshot_t",253,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_bt_put_tn")=253
-	Set gtmtypes("shm_snapshot_t",254,"name")="shm_snapshot_t.shadow_file_header.wcb_mutex_salvage_tn"
-	Set gtmtypes("shm_snapshot_t",254,"off")=6760
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.mutex_queue_full_tn")=253
+	Set gtmtypes("shm_snapshot_t",254,"name")="shm_snapshot_t.shadow_file_header.wcb_bt_put_tn"
+	Set gtmtypes("shm_snapshot_t",254,"off")=6752
 	Set gtmtypes("shm_snapshot_t",254,"len")=8
 	Set gtmtypes("shm_snapshot_t",254,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_mutex_salvage_tn")=254
-	Set gtmtypes("shm_snapshot_t",255,"name")="shm_snapshot_t.shadow_file_header.wcb_tp_grab_crit_tn"
-	Set gtmtypes("shm_snapshot_t",255,"off")=6768
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_bt_put_tn")=254
+	Set gtmtypes("shm_snapshot_t",255,"name")="shm_snapshot_t.shadow_file_header.wcb_mutex_salvage_tn"
+	Set gtmtypes("shm_snapshot_t",255,"off")=6760
 	Set gtmtypes("shm_snapshot_t",255,"len")=8
 	Set gtmtypes("shm_snapshot_t",255,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_tp_grab_crit_tn")=255
-	Set gtmtypes("shm_snapshot_t",256,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_nocr_invcr_tn"
-	Set gtmtypes("shm_snapshot_t",256,"off")=6776
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_mutex_salvage_tn")=255
+	Set gtmtypes("shm_snapshot_t",256,"name")="shm_snapshot_t.shadow_file_header.wcb_tp_grab_crit_tn"
+	Set gtmtypes("shm_snapshot_t",256,"off")=6768
 	Set gtmtypes("shm_snapshot_t",256,"len")=8
 	Set gtmtypes("shm_snapshot_t",256,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_nocr_invcr_tn")=256
-	Set gtmtypes("shm_snapshot_t",257,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_cr_invcr_tn"
-	Set gtmtypes("shm_snapshot_t",257,"off")=6784
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_tp_grab_crit_tn")=256
+	Set gtmtypes("shm_snapshot_t",257,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_nocr_invcr_tn"
+	Set gtmtypes("shm_snapshot_t",257,"off")=6776
 	Set gtmtypes("shm_snapshot_t",257,"len")=8
 	Set gtmtypes("shm_snapshot_t",257,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_cr_invcr_tn")=257
-	Set gtmtypes("shm_snapshot_t",258,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_rip_wait_tn"
-	Set gtmtypes("shm_snapshot_t",258,"off")=6792
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_nocr_invcr_tn")=257
+	Set gtmtypes("shm_snapshot_t",258,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_cr_invcr_tn"
+	Set gtmtypes("shm_snapshot_t",258,"off")=6784
 	Set gtmtypes("shm_snapshot_t",258,"len")=8
 	Set gtmtypes("shm_snapshot_t",258,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_rip_wait_tn")=258
-	Set gtmtypes("shm_snapshot_t",259,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirtyripwait_tn"
-	Set gtmtypes("shm_snapshot_t",259,"off")=6800
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_cr_invcr_tn")=258
+	Set gtmtypes("shm_snapshot_t",259,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_rip_wait_tn"
+	Set gtmtypes("shm_snapshot_t",259,"off")=6792
 	Set gtmtypes("shm_snapshot_t",259,"len")=8
 	Set gtmtypes("shm_snapshot_t",259,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirtyripwait_tn")=259
-	Set gtmtypes("shm_snapshot_t",260,"name")="shm_snapshot_t.shadow_file_header.wcb_gds_rundown_tn"
-	Set gtmtypes("shm_snapshot_t",260,"off")=6808
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_rip_wait_tn")=259
+	Set gtmtypes("shm_snapshot_t",260,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirtyripwait_tn"
+	Set gtmtypes("shm_snapshot_t",260,"off")=6800
 	Set gtmtypes("shm_snapshot_t",260,"len")=8
 	Set gtmtypes("shm_snapshot_t",260,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_gds_rundown_tn")=260
-	Set gtmtypes("shm_snapshot_t",261,"name")="shm_snapshot_t.shadow_file_header.wcb_wcs_flu1_tn"
-	Set gtmtypes("shm_snapshot_t",261,"off")=6816
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirtyripwait_tn")=260
+	Set gtmtypes("shm_snapshot_t",261,"name")="shm_snapshot_t.shadow_file_header.wcb_gds_rundown_tn"
+	Set gtmtypes("shm_snapshot_t",261,"off")=6808
 	Set gtmtypes("shm_snapshot_t",261,"len")=8
 	Set gtmtypes("shm_snapshot_t",261,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wcs_flu1_tn")=261
-	Set gtmtypes("shm_snapshot_t",262,"name")="shm_snapshot_t.shadow_file_header.wcb_mu_back_tn"
-	Set gtmtypes("shm_snapshot_t",262,"off")=6824
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_gds_rundown_tn")=261
+	Set gtmtypes("shm_snapshot_t",262,"name")="shm_snapshot_t.shadow_file_header.wcb_wcs_flu1_tn"
+	Set gtmtypes("shm_snapshot_t",262,"off")=6816
 	Set gtmtypes("shm_snapshot_t",262,"len")=8
 	Set gtmtypes("shm_snapshot_t",262,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_mu_back_tn")=262
-	Set gtmtypes("shm_snapshot_t",263,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirty_invcr_tn"
-	Set gtmtypes("shm_snapshot_t",263,"off")=6832
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wcs_flu1_tn")=262
+	Set gtmtypes("shm_snapshot_t",263,"name")="shm_snapshot_t.shadow_file_header.wcb_mu_back_tn"
+	Set gtmtypes("shm_snapshot_t",263,"off")=6824
 	Set gtmtypes("shm_snapshot_t",263,"len")=8
 	Set gtmtypes("shm_snapshot_t",263,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirty_invcr_tn")=263
-	Set gtmtypes("shm_snapshot_t",264,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_wtfini_fail_tn"
-	Set gtmtypes("shm_snapshot_t",264,"off")=6840
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_mu_back_tn")=263
+	Set gtmtypes("shm_snapshot_t",264,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirty_invcr_tn"
+	Set gtmtypes("shm_snapshot_t",264,"off")=6832
 	Set gtmtypes("shm_snapshot_t",264,"len")=8
 	Set gtmtypes("shm_snapshot_t",264,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_wtfini_fail_tn")=264
-	Set gtmtypes("shm_snapshot_t",265,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_twin_stuck_tn"
-	Set gtmtypes("shm_snapshot_t",265,"off")=6848
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirty_invcr_tn")=264
+	Set gtmtypes("shm_snapshot_t",265,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_wtfini_fail_tn"
+	Set gtmtypes("shm_snapshot_t",265,"off")=6840
 	Set gtmtypes("shm_snapshot_t",265,"len")=8
 	Set gtmtypes("shm_snapshot_t",265,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_twin_stuck_tn")=265
-	Set gtmtypes("shm_snapshot_t",266,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_wrt_latch_stuck_tn"
-	Set gtmtypes("shm_snapshot_t",266,"off")=6856
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_wtfini_fail_tn")=265
+	Set gtmtypes("shm_snapshot_t",266,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_twin_stuck_tn"
+	Set gtmtypes("shm_snapshot_t",266,"off")=6848
 	Set gtmtypes("shm_snapshot_t",266,"len")=8
 	Set gtmtypes("shm_snapshot_t",266,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_wrt_latch_stuck_tn")=266
-	Set gtmtypes("shm_snapshot_t",267,"name")="shm_snapshot_t.shadow_file_header.wcb_secshr_db_clnup_now_crit_tn"
-	Set gtmtypes("shm_snapshot_t",267,"off")=6864
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_twin_stuck_tn")=266
+	Set gtmtypes("shm_snapshot_t",267,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_wrt_latch_stuck_tn"
+	Set gtmtypes("shm_snapshot_t",267,"off")=6856
 	Set gtmtypes("shm_snapshot_t",267,"len")=8
 	Set gtmtypes("shm_snapshot_t",267,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_secshr_db_clnup_now_crit_tn")=267
-	Set gtmtypes("shm_snapshot_t",268,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_bad_bt_index1_tn"
-	Set gtmtypes("shm_snapshot_t",268,"off")=6872
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_wrt_latch_stuck_tn")=267
+	Set gtmtypes("shm_snapshot_t",268,"name")="shm_snapshot_t.shadow_file_header.wcb_secshr_db_clnup_now_crit_tn"
+	Set gtmtypes("shm_snapshot_t",268,"off")=6864
 	Set gtmtypes("shm_snapshot_t",268,"len")=8
 	Set gtmtypes("shm_snapshot_t",268,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_bad_bt_index1_tn")=268
-	Set gtmtypes("shm_snapshot_t",269,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_bad_bt_index2_tn"
-	Set gtmtypes("shm_snapshot_t",269,"off")=6880
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_secshr_db_clnup_now_crit_tn")=268
+	Set gtmtypes("shm_snapshot_t",269,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_bad_bt_index1_tn"
+	Set gtmtypes("shm_snapshot_t",269,"off")=6872
 	Set gtmtypes("shm_snapshot_t",269,"len")=8
 	Set gtmtypes("shm_snapshot_t",269,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_bad_bt_index2_tn")=269
-	Set gtmtypes("shm_snapshot_t",270,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_crbtmismatch1_tn"
-	Set gtmtypes("shm_snapshot_t",270,"off")=6888
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_bad_bt_index1_tn")=269
+	Set gtmtypes("shm_snapshot_t",270,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_bad_bt_index2_tn"
+	Set gtmtypes("shm_snapshot_t",270,"off")=6880
 	Set gtmtypes("shm_snapshot_t",270,"len")=8
 	Set gtmtypes("shm_snapshot_t",270,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_crbtmismatch1_tn")=270
-	Set gtmtypes("shm_snapshot_t",271,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_crbtmismatch2_tn"
-	Set gtmtypes("shm_snapshot_t",271,"off")=6896
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_bad_bt_index2_tn")=270
+	Set gtmtypes("shm_snapshot_t",271,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_crbtmismatch1_tn"
+	Set gtmtypes("shm_snapshot_t",271,"off")=6888
 	Set gtmtypes("shm_snapshot_t",271,"len")=8
 	Set gtmtypes("shm_snapshot_t",271,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_crbtmismatch2_tn")=271
-	Set gtmtypes("shm_snapshot_t",272,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_crbtmismatch3_tn"
-	Set gtmtypes("shm_snapshot_t",272,"off")=6904
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_crbtmismatch1_tn")=271
+	Set gtmtypes("shm_snapshot_t",272,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_crbtmismatch2_tn"
+	Set gtmtypes("shm_snapshot_t",272,"off")=6896
 	Set gtmtypes("shm_snapshot_t",272,"len")=8
 	Set gtmtypes("shm_snapshot_t",272,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_crbtmismatch3_tn")=272
-	Set gtmtypes("shm_snapshot_t",273,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_tn"
-	Set gtmtypes("shm_snapshot_t",273,"off")=6912
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_crbtmismatch2_tn")=272
+	Set gtmtypes("shm_snapshot_t",273,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_crbtmismatch3_tn"
+	Set gtmtypes("shm_snapshot_t",273,"off")=6904
 	Set gtmtypes("shm_snapshot_t",273,"len")=8
 	Set gtmtypes("shm_snapshot_t",273,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_tn")=273
-	Set gtmtypes("shm_snapshot_t",274,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_tn"
-	Set gtmtypes("shm_snapshot_t",274,"off")=6920
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_crbtmismatch3_tn")=273
+	Set gtmtypes("shm_snapshot_t",274,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_tn"
+	Set gtmtypes("shm_snapshot_t",274,"off")=6912
 	Set gtmtypes("shm_snapshot_t",274,"len")=8
 	Set gtmtypes("shm_snapshot_t",274,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_tn")=274
-	Set gtmtypes("shm_snapshot_t",275,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_tn"
-	Set gtmtypes("shm_snapshot_t",275,"off")=6928
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_tn")=274
+	Set gtmtypes("shm_snapshot_t",275,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_tn"
+	Set gtmtypes("shm_snapshot_t",275,"off")=6920
 	Set gtmtypes("shm_snapshot_t",275,"len")=8
 	Set gtmtypes("shm_snapshot_t",275,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_tn")=275
-	Set gtmtypes("shm_snapshot_t",276,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_tn"
-	Set gtmtypes("shm_snapshot_t",276,"off")=6936
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_tn")=275
+	Set gtmtypes("shm_snapshot_t",276,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_tn"
+	Set gtmtypes("shm_snapshot_t",276,"off")=6928
 	Set gtmtypes("shm_snapshot_t",276,"len")=8
 	Set gtmtypes("shm_snapshot_t",276,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_tn")=276
-	Set gtmtypes("shm_snapshot_t",277,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_tn"
-	Set gtmtypes("shm_snapshot_t",277,"off")=6944
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_tn")=276
+	Set gtmtypes("shm_snapshot_t",277,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_tn"
+	Set gtmtypes("shm_snapshot_t",277,"off")=6936
 	Set gtmtypes("shm_snapshot_t",277,"len")=8
 	Set gtmtypes("shm_snapshot_t",277,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_tn")=277
-	Set gtmtypes("shm_snapshot_t",278,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_bt_get_tn"
-	Set gtmtypes("shm_snapshot_t",278,"off")=6952
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_tn")=277
+	Set gtmtypes("shm_snapshot_t",278,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_tn"
+	Set gtmtypes("shm_snapshot_t",278,"off")=6944
 	Set gtmtypes("shm_snapshot_t",278,"len")=8
 	Set gtmtypes("shm_snapshot_t",278,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_bt_get_tn")=278
-	Set gtmtypes("shm_snapshot_t",279,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_tn"
-	Set gtmtypes("shm_snapshot_t",279,"off")=6960
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_tn")=278
+	Set gtmtypes("shm_snapshot_t",279,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_bt_get_tn"
+	Set gtmtypes("shm_snapshot_t",279,"off")=6952
 	Set gtmtypes("shm_snapshot_t",279,"len")=8
 	Set gtmtypes("shm_snapshot_t",279,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_tn")=279
-	Set gtmtypes("shm_snapshot_t",280,"name")="shm_snapshot_t.shadow_file_header.wcb_bg_update_lckfail1_tn"
-	Set gtmtypes("shm_snapshot_t",280,"off")=6968
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_bt_get_tn")=279
+	Set gtmtypes("shm_snapshot_t",280,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_tn"
+	Set gtmtypes("shm_snapshot_t",280,"off")=6960
 	Set gtmtypes("shm_snapshot_t",280,"len")=8
 	Set gtmtypes("shm_snapshot_t",280,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_bg_update_lckfail1_tn")=280
-	Set gtmtypes("shm_snapshot_t",281,"name")="shm_snapshot_t.shadow_file_header.wcb_bg_update_lckfail2_tn"
-	Set gtmtypes("shm_snapshot_t",281,"off")=6976
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_tn")=280
+	Set gtmtypes("shm_snapshot_t",281,"name")="shm_snapshot_t.shadow_file_header.wcb_bg_update_lckfail1_tn"
+	Set gtmtypes("shm_snapshot_t",281,"off")=6968
 	Set gtmtypes("shm_snapshot_t",281,"len")=8
 	Set gtmtypes("shm_snapshot_t",281,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_bg_update_lckfail2_tn")=281
-	Set gtmtypes("shm_snapshot_t",282,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail1_tn"
-	Set gtmtypes("shm_snapshot_t",282,"off")=6984
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_bg_update_lckfail1_tn")=281
+	Set gtmtypes("shm_snapshot_t",282,"name")="shm_snapshot_t.shadow_file_header.wcb_bg_update_lckfail2_tn"
+	Set gtmtypes("shm_snapshot_t",282,"off")=6976
 	Set gtmtypes("shm_snapshot_t",282,"len")=8
 	Set gtmtypes("shm_snapshot_t",282,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail1_tn")=282
-	Set gtmtypes("shm_snapshot_t",283,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail2_tn"
-	Set gtmtypes("shm_snapshot_t",283,"off")=6992
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_bg_update_lckfail2_tn")=282
+	Set gtmtypes("shm_snapshot_t",283,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail1_tn"
+	Set gtmtypes("shm_snapshot_t",283,"off")=6984
 	Set gtmtypes("shm_snapshot_t",283,"len")=8
 	Set gtmtypes("shm_snapshot_t",283,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail2_tn")=283
-	Set gtmtypes("shm_snapshot_t",284,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail3_tn"
-	Set gtmtypes("shm_snapshot_t",284,"off")=7000
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail1_tn")=283
+	Set gtmtypes("shm_snapshot_t",284,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail2_tn"
+	Set gtmtypes("shm_snapshot_t",284,"off")=6992
 	Set gtmtypes("shm_snapshot_t",284,"len")=8
 	Set gtmtypes("shm_snapshot_t",284,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail3_tn")=284
-	Set gtmtypes("shm_snapshot_t",285,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail4_tn"
-	Set gtmtypes("shm_snapshot_t",285,"off")=7008
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail2_tn")=284
+	Set gtmtypes("shm_snapshot_t",285,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail3_tn"
+	Set gtmtypes("shm_snapshot_t",285,"off")=7000
 	Set gtmtypes("shm_snapshot_t",285,"len")=8
 	Set gtmtypes("shm_snapshot_t",285,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail4_tn")=285
-	Set gtmtypes("shm_snapshot_t",286,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail1_tn"
-	Set gtmtypes("shm_snapshot_t",286,"off")=7016
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail3_tn")=285
+	Set gtmtypes("shm_snapshot_t",286,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail4_tn"
+	Set gtmtypes("shm_snapshot_t",286,"off")=7008
 	Set gtmtypes("shm_snapshot_t",286,"len")=8
 	Set gtmtypes("shm_snapshot_t",286,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail1_tn")=286
-	Set gtmtypes("shm_snapshot_t",287,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail2_tn"
-	Set gtmtypes("shm_snapshot_t",287,"off")=7024
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail4_tn")=286
+	Set gtmtypes("shm_snapshot_t",287,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail1_tn"
+	Set gtmtypes("shm_snapshot_t",287,"off")=7016
 	Set gtmtypes("shm_snapshot_t",287,"len")=8
 	Set gtmtypes("shm_snapshot_t",287,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail2_tn")=287
-	Set gtmtypes("shm_snapshot_t",288,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail3_tn"
-	Set gtmtypes("shm_snapshot_t",288,"off")=7032
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail1_tn")=287
+	Set gtmtypes("shm_snapshot_t",288,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail2_tn"
+	Set gtmtypes("shm_snapshot_t",288,"off")=7024
 	Set gtmtypes("shm_snapshot_t",288,"len")=8
 	Set gtmtypes("shm_snapshot_t",288,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail3_tn")=288
-	Set gtmtypes("shm_snapshot_t",289,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail4_tn"
-	Set gtmtypes("shm_snapshot_t",289,"off")=7040
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail2_tn")=288
+	Set gtmtypes("shm_snapshot_t",289,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail3_tn"
+	Set gtmtypes("shm_snapshot_t",289,"off")=7032
 	Set gtmtypes("shm_snapshot_t",289,"len")=8
 	Set gtmtypes("shm_snapshot_t",289,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail4_tn")=289
-	Set gtmtypes("shm_snapshot_t",290,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirtystuck1_tn"
-	Set gtmtypes("shm_snapshot_t",290,"off")=7048
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail3_tn")=289
+	Set gtmtypes("shm_snapshot_t",290,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail4_tn"
+	Set gtmtypes("shm_snapshot_t",290,"off")=7040
 	Set gtmtypes("shm_snapshot_t",290,"len")=8
 	Set gtmtypes("shm_snapshot_t",290,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirtystuck1_tn")=290
-	Set gtmtypes("shm_snapshot_t",291,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirtystuck2_tn"
-	Set gtmtypes("shm_snapshot_t",291,"off")=7056
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail4_tn")=290
+	Set gtmtypes("shm_snapshot_t",291,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirtystuck1_tn"
+	Set gtmtypes("shm_snapshot_t",291,"off")=7048
 	Set gtmtypes("shm_snapshot_t",291,"len")=8
 	Set gtmtypes("shm_snapshot_t",291,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirtystuck2_tn")=291
-	Set gtmtypes("shm_snapshot_t",292,"name")="shm_snapshot_t.shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_tn"
-	Set gtmtypes("shm_snapshot_t",292,"off")=7064
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirtystuck1_tn")=291
+	Set gtmtypes("shm_snapshot_t",292,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirtystuck2_tn"
+	Set gtmtypes("shm_snapshot_t",292,"off")=7056
 	Set gtmtypes("shm_snapshot_t",292,"len")=8
 	Set gtmtypes("shm_snapshot_t",292,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_tn")=292
-	Set gtmtypes("shm_snapshot_t",293,"name")="shm_snapshot_t.shadow_file_header.dwngrd_refmts_syncio_tn"
-	Set gtmtypes("shm_snapshot_t",293,"off")=7072
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirtystuck2_tn")=292
+	Set gtmtypes("shm_snapshot_t",293,"name")="shm_snapshot_t.shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_tn"
+	Set gtmtypes("shm_snapshot_t",293,"off")=7064
 	Set gtmtypes("shm_snapshot_t",293,"len")=8
 	Set gtmtypes("shm_snapshot_t",293,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.dwngrd_refmts_syncio_tn")=293
-	Set gtmtypes("shm_snapshot_t",294,"name")="shm_snapshot_t.shadow_file_header.dwngrd_refmts_asyncio_tn"
-	Set gtmtypes("shm_snapshot_t",294,"off")=7080
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_tn")=293
+	Set gtmtypes("shm_snapshot_t",294,"name")="shm_snapshot_t.shadow_file_header.dwngrd_refmts_syncio_tn"
+	Set gtmtypes("shm_snapshot_t",294,"off")=7072
 	Set gtmtypes("shm_snapshot_t",294,"len")=8
 	Set gtmtypes("shm_snapshot_t",294,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.dwngrd_refmts_asyncio_tn")=294
-	Set gtmtypes("shm_snapshot_t",295,"name")="shm_snapshot_t.shadow_file_header.shmpool_refmt_harvests_tn"
-	Set gtmtypes("shm_snapshot_t",295,"off")=7088
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.dwngrd_refmts_syncio_tn")=294
+	Set gtmtypes("shm_snapshot_t",295,"name")="shm_snapshot_t.shadow_file_header.dwngrd_refmts_asyncio_tn"
+	Set gtmtypes("shm_snapshot_t",295,"off")=7080
 	Set gtmtypes("shm_snapshot_t",295,"len")=8
 	Set gtmtypes("shm_snapshot_t",295,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_refmt_harvests_tn")=295
-	Set gtmtypes("shm_snapshot_t",296,"name")="shm_snapshot_t.shadow_file_header.shmpool_recovery_tn"
-	Set gtmtypes("shm_snapshot_t",296,"off")=7096
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.dwngrd_refmts_asyncio_tn")=295
+	Set gtmtypes("shm_snapshot_t",296,"name")="shm_snapshot_t.shadow_file_header.shmpool_refmt_harvests_tn"
+	Set gtmtypes("shm_snapshot_t",296,"off")=7088
 	Set gtmtypes("shm_snapshot_t",296,"len")=8
 	Set gtmtypes("shm_snapshot_t",296,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_recovery_tn")=296
-	Set gtmtypes("shm_snapshot_t",297,"name")="shm_snapshot_t.shadow_file_header.shmpool_blkd_by_sdc_tn"
-	Set gtmtypes("shm_snapshot_t",297,"off")=7104
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_refmt_harvests_tn")=296
+	Set gtmtypes("shm_snapshot_t",297,"name")="shm_snapshot_t.shadow_file_header.shmpool_recovery_tn"
+	Set gtmtypes("shm_snapshot_t",297,"off")=7096
 	Set gtmtypes("shm_snapshot_t",297,"len")=8
 	Set gtmtypes("shm_snapshot_t",297,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_blkd_by_sdc_tn")=297
-	Set gtmtypes("shm_snapshot_t",298,"name")="shm_snapshot_t.shadow_file_header.shmpool_alloc_bbflush_tn"
-	Set gtmtypes("shm_snapshot_t",298,"off")=7112
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_recovery_tn")=297
+	Set gtmtypes("shm_snapshot_t",298,"name")="shm_snapshot_t.shadow_file_header.shmpool_blkd_by_sdc_tn"
+	Set gtmtypes("shm_snapshot_t",298,"off")=7104
 	Set gtmtypes("shm_snapshot_t",298,"len")=8
 	Set gtmtypes("shm_snapshot_t",298,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_alloc_bbflush_tn")=298
-	Set gtmtypes("shm_snapshot_t",299,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_released_replaced_tn"
-	Set gtmtypes("shm_snapshot_t",299,"off")=7120
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_blkd_by_sdc_tn")=298
+	Set gtmtypes("shm_snapshot_t",299,"name")="shm_snapshot_t.shadow_file_header.shmpool_alloc_bbflush_tn"
+	Set gtmtypes("shm_snapshot_t",299,"off")=7112
 	Set gtmtypes("shm_snapshot_t",299,"len")=8
 	Set gtmtypes("shm_snapshot_t",299,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_released_replaced_tn")=299
-	Set gtmtypes("shm_snapshot_t",300,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_released_io_complete_tn"
-	Set gtmtypes("shm_snapshot_t",300,"off")=7128
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_alloc_bbflush_tn")=299
+	Set gtmtypes("shm_snapshot_t",300,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_released_replaced_tn"
+	Set gtmtypes("shm_snapshot_t",300,"off")=7120
 	Set gtmtypes("shm_snapshot_t",300,"len")=8
 	Set gtmtypes("shm_snapshot_t",300,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_released_io_complete_tn")=300
-	Set gtmtypes("shm_snapshot_t",301,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_kept_tn"
-	Set gtmtypes("shm_snapshot_t",301,"off")=7136
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_released_replaced_tn")=300
+	Set gtmtypes("shm_snapshot_t",301,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_released_io_complete_tn"
+	Set gtmtypes("shm_snapshot_t",301,"off")=7128
 	Set gtmtypes("shm_snapshot_t",301,"len")=8
 	Set gtmtypes("shm_snapshot_t",301,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_kept_tn")=301
-	Set gtmtypes("shm_snapshot_t",302,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_ignored_tn"
-	Set gtmtypes("shm_snapshot_t",302,"off")=7144
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_released_io_complete_tn")=301
+	Set gtmtypes("shm_snapshot_t",302,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_kept_tn"
+	Set gtmtypes("shm_snapshot_t",302,"off")=7136
 	Set gtmtypes("shm_snapshot_t",302,"len")=8
 	Set gtmtypes("shm_snapshot_t",302,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_ignored_tn")=302
-	Set gtmtypes("shm_snapshot_t",303,"name")="shm_snapshot_t.shadow_file_header.refmt_blk_chk_blk_freed_tn"
-	Set gtmtypes("shm_snapshot_t",303,"off")=7152
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_kept_tn")=302
+	Set gtmtypes("shm_snapshot_t",303,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_ignored_tn"
+	Set gtmtypes("shm_snapshot_t",303,"off")=7144
 	Set gtmtypes("shm_snapshot_t",303,"len")=8
 	Set gtmtypes("shm_snapshot_t",303,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_blk_chk_blk_freed_tn")=303
-	Set gtmtypes("shm_snapshot_t",304,"name")="shm_snapshot_t.shadow_file_header.refmt_blk_chk_blk_kept_tn"
-	Set gtmtypes("shm_snapshot_t",304,"off")=7160
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_ignored_tn")=303
+	Set gtmtypes("shm_snapshot_t",304,"name")="shm_snapshot_t.shadow_file_header.refmt_blk_chk_blk_freed_tn"
+	Set gtmtypes("shm_snapshot_t",304,"off")=7152
 	Set gtmtypes("shm_snapshot_t",304,"len")=8
 	Set gtmtypes("shm_snapshot_t",304,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_blk_chk_blk_kept_tn")=304
-	Set gtmtypes("shm_snapshot_t",305,"name")="shm_snapshot_t.shadow_file_header.active_lvl_trigger_tn"
-	Set gtmtypes("shm_snapshot_t",305,"off")=7168
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_blk_chk_blk_freed_tn")=304
+	Set gtmtypes("shm_snapshot_t",305,"name")="shm_snapshot_t.shadow_file_header.refmt_blk_chk_blk_kept_tn"
+	Set gtmtypes("shm_snapshot_t",305,"off")=7160
 	Set gtmtypes("shm_snapshot_t",305,"len")=8
 	Set gtmtypes("shm_snapshot_t",305,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.active_lvl_trigger_tn")=305
-	Set gtmtypes("shm_snapshot_t",306,"name")="shm_snapshot_t.shadow_file_header.new_buff_tn"
-	Set gtmtypes("shm_snapshot_t",306,"off")=7176
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_blk_chk_blk_kept_tn")=305
+	Set gtmtypes("shm_snapshot_t",306,"name")="shm_snapshot_t.shadow_file_header.active_lvl_trigger_tn"
+	Set gtmtypes("shm_snapshot_t",306,"off")=7168
 	Set gtmtypes("shm_snapshot_t",306,"len")=8
 	Set gtmtypes("shm_snapshot_t",306,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.new_buff_tn")=306
-	Set gtmtypes("shm_snapshot_t",307,"name")="shm_snapshot_t.shadow_file_header.phase2_commit_wait_sleep_in_crit_tn"
-	Set gtmtypes("shm_snapshot_t",307,"off")=7184
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.active_lvl_trigger_tn")=306
+	Set gtmtypes("shm_snapshot_t",307,"name")="shm_snapshot_t.shadow_file_header.new_buff_tn"
+	Set gtmtypes("shm_snapshot_t",307,"off")=7176
 	Set gtmtypes("shm_snapshot_t",307,"len")=8
 	Set gtmtypes("shm_snapshot_t",307,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.phase2_commit_wait_sleep_in_crit_tn")=307
-	Set gtmtypes("shm_snapshot_t",308,"name")="shm_snapshot_t.shadow_file_header.phase2_commit_wait_sleep_no_crit_tn"
-	Set gtmtypes("shm_snapshot_t",308,"off")=7192
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.new_buff_tn")=307
+	Set gtmtypes("shm_snapshot_t",308,"name")="shm_snapshot_t.shadow_file_header.phase2_commit_wait_sleep_in_crit_tn"
+	Set gtmtypes("shm_snapshot_t",308,"off")=7184
 	Set gtmtypes("shm_snapshot_t",308,"len")=8
 	Set gtmtypes("shm_snapshot_t",308,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.phase2_commit_wait_sleep_no_crit_tn")=308
-	Set gtmtypes("shm_snapshot_t",309,"name")="shm_snapshot_t.shadow_file_header.phase2_commit_wait_pidcnt_tn"
-	Set gtmtypes("shm_snapshot_t",309,"off")=7200
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.phase2_commit_wait_sleep_in_crit_tn")=308
+	Set gtmtypes("shm_snapshot_t",309,"name")="shm_snapshot_t.shadow_file_header.phase2_commit_wait_sleep_no_crit_tn"
+	Set gtmtypes("shm_snapshot_t",309,"off")=7192
 	Set gtmtypes("shm_snapshot_t",309,"len")=8
 	Set gtmtypes("shm_snapshot_t",309,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.phase2_commit_wait_pidcnt_tn")=309
-	Set gtmtypes("shm_snapshot_t",310,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_intend_wait_tn"
-	Set gtmtypes("shm_snapshot_t",310,"off")=7208
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.phase2_commit_wait_sleep_no_crit_tn")=309
+	Set gtmtypes("shm_snapshot_t",310,"name")="shm_snapshot_t.shadow_file_header.phase2_commit_wait_pidcnt_tn"
+	Set gtmtypes("shm_snapshot_t",310,"off")=7200
 	Set gtmtypes("shm_snapshot_t",310,"len")=8
 	Set gtmtypes("shm_snapshot_t",310,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_intend_wait_tn")=310
-	Set gtmtypes("shm_snapshot_t",311,"name")="shm_snapshot_t.shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_tn"
-	Set gtmtypes("shm_snapshot_t",311,"off")=7216
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.phase2_commit_wait_pidcnt_tn")=310
+	Set gtmtypes("shm_snapshot_t",311,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_intend_wait_tn"
+	Set gtmtypes("shm_snapshot_t",311,"off")=7208
 	Set gtmtypes("shm_snapshot_t",311,"len")=8
 	Set gtmtypes("shm_snapshot_t",311,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_tn")=311
-	Set gtmtypes("shm_snapshot_t",312,"name")="shm_snapshot_t.shadow_file_header.wcb_phase2_commit_wait_tn"
-	Set gtmtypes("shm_snapshot_t",312,"off")=7224
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_intend_wait_tn")=311
+	Set gtmtypes("shm_snapshot_t",312,"name")="shm_snapshot_t.shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_tn"
+	Set gtmtypes("shm_snapshot_t",312,"off")=7216
 	Set gtmtypes("shm_snapshot_t",312,"len")=8
 	Set gtmtypes("shm_snapshot_t",312,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_phase2_commit_wait_tn")=312
-	Set gtmtypes("shm_snapshot_t",313,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_calls_tn"
-	Set gtmtypes("shm_snapshot_t",313,"off")=7232
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_tn")=312
+	Set gtmtypes("shm_snapshot_t",313,"name")="shm_snapshot_t.shadow_file_header.wcb_phase2_commit_wait_tn"
+	Set gtmtypes("shm_snapshot_t",313,"off")=7224
 	Set gtmtypes("shm_snapshot_t",313,"len")=8
 	Set gtmtypes("shm_snapshot_t",313,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_calls_tn")=313
-	Set gtmtypes("shm_snapshot_t",314,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_rip_tn"
-	Set gtmtypes("shm_snapshot_t",314,"off")=7240
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_phase2_commit_wait_tn")=313
+	Set gtmtypes("shm_snapshot_t",314,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_calls_tn"
+	Set gtmtypes("shm_snapshot_t",314,"off")=7232
 	Set gtmtypes("shm_snapshot_t",314,"len")=8
 	Set gtmtypes("shm_snapshot_t",314,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_rip_tn")=314
-	Set gtmtypes("shm_snapshot_t",315,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_in_tend_tn"
-	Set gtmtypes("shm_snapshot_t",315,"off")=7248
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_calls_tn")=314
+	Set gtmtypes("shm_snapshot_t",315,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_rip_tn"
+	Set gtmtypes("shm_snapshot_t",315,"off")=7240
 	Set gtmtypes("shm_snapshot_t",315,"len")=8
 	Set gtmtypes("shm_snapshot_t",315,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_in_tend_tn")=315
-	Set gtmtypes("shm_snapshot_t",316,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_search_blk_tn"
-	Set gtmtypes("shm_snapshot_t",316,"off")=7256
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_rip_tn")=315
+	Set gtmtypes("shm_snapshot_t",316,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_in_tend_tn"
+	Set gtmtypes("shm_snapshot_t",316,"off")=7248
 	Set gtmtypes("shm_snapshot_t",316,"len")=8
 	Set gtmtypes("shm_snapshot_t",316,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_search_blk_tn")=316
-	Set gtmtypes("shm_snapshot_t",317,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_new_rec_tn"
-	Set gtmtypes("shm_snapshot_t",317,"off")=7264
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_in_tend_tn")=316
+	Set gtmtypes("shm_snapshot_t",317,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_search_blk_tn"
+	Set gtmtypes("shm_snapshot_t",317,"off")=7256
 	Set gtmtypes("shm_snapshot_t",317,"len")=8
 	Set gtmtypes("shm_snapshot_t",317,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_new_rec_tn")=317
-	Set gtmtypes("shm_snapshot_t",318,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_rec_size_tn"
-	Set gtmtypes("shm_snapshot_t",318,"off")=7272
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_search_blk_tn")=317
+	Set gtmtypes("shm_snapshot_t",318,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_new_rec_tn"
+	Set gtmtypes("shm_snapshot_t",318,"off")=7264
 	Set gtmtypes("shm_snapshot_t",318,"len")=8
 	Set gtmtypes("shm_snapshot_t",318,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_rec_size_tn")=318
-	Set gtmtypes("shm_snapshot_t",319,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_rec_cmpc_tn"
-	Set gtmtypes("shm_snapshot_t",319,"off")=7280
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_new_rec_tn")=318
+	Set gtmtypes("shm_snapshot_t",319,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_rec_size_tn"
+	Set gtmtypes("shm_snapshot_t",319,"off")=7272
 	Set gtmtypes("shm_snapshot_t",319,"len")=8
 	Set gtmtypes("shm_snapshot_t",319,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_rec_cmpc_tn")=319
-	Set gtmtypes("shm_snapshot_t",320,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_blk_fini_tn"
-	Set gtmtypes("shm_snapshot_t",320,"off")=7288
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_rec_size_tn")=319
+	Set gtmtypes("shm_snapshot_t",320,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_rec_cmpc_tn"
+	Set gtmtypes("shm_snapshot_t",320,"off")=7280
 	Set gtmtypes("shm_snapshot_t",320,"len")=8
 	Set gtmtypes("shm_snapshot_t",320,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_blk_fini_tn")=320
-	Set gtmtypes("shm_snapshot_t",321,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_blk_split_tn"
-	Set gtmtypes("shm_snapshot_t",321,"off")=7296
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_rec_cmpc_tn")=320
+	Set gtmtypes("shm_snapshot_t",321,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_blk_fini_tn"
+	Set gtmtypes("shm_snapshot_t",321,"off")=7288
 	Set gtmtypes("shm_snapshot_t",321,"len")=8
 	Set gtmtypes("shm_snapshot_t",321,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_blk_split_tn")=321
-	Set gtmtypes("shm_snapshot_t",322,"name")="shm_snapshot_t.shadow_file_header.t_qread_ripsleep_cnt_tn"
-	Set gtmtypes("shm_snapshot_t",322,"off")=7304
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_blk_fini_tn")=321
+	Set gtmtypes("shm_snapshot_t",322,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_blk_split_tn"
+	Set gtmtypes("shm_snapshot_t",322,"off")=7296
 	Set gtmtypes("shm_snapshot_t",322,"len")=8
 	Set gtmtypes("shm_snapshot_t",322,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_ripsleep_cnt_tn")=322
-	Set gtmtypes("shm_snapshot_t",323,"name")="shm_snapshot_t.shadow_file_header.t_qread_ripsleep_nblks_tn"
-	Set gtmtypes("shm_snapshot_t",323,"off")=7312
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_blk_split_tn")=322
+	Set gtmtypes("shm_snapshot_t",323,"name")="shm_snapshot_t.shadow_file_header.t_qread_ripsleep_cnt_tn"
+	Set gtmtypes("shm_snapshot_t",323,"off")=7304
 	Set gtmtypes("shm_snapshot_t",323,"len")=8
 	Set gtmtypes("shm_snapshot_t",323,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_ripsleep_nblks_tn")=323
-	Set gtmtypes("shm_snapshot_t",324,"name")="shm_snapshot_t.shadow_file_header.bg_trc_rec_tn_filler"
-	Set gtmtypes("shm_snapshot_t",324,"off")=7320
-	Set gtmtypes("shm_snapshot_t",324,"len")=112
-	Set gtmtypes("shm_snapshot_t",324,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bg_trc_rec_tn_filler")=324
-	Set gtmtypes("shm_snapshot_t",325,"name")="shm_snapshot_t.shadow_file_header.total_buffer_flush_cntr"
-	Set gtmtypes("shm_snapshot_t",325,"off")=7432
-	Set gtmtypes("shm_snapshot_t",325,"len")=4
-	Set gtmtypes("shm_snapshot_t",325,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.total_buffer_flush_cntr")=325
-	Set gtmtypes("shm_snapshot_t",326,"name")="shm_snapshot_t.shadow_file_header.bufct_buffer_flush_cntr"
-	Set gtmtypes("shm_snapshot_t",326,"off")=7436
-	Set gtmtypes("shm_snapshot_t",326,"len")=4
-	Set gtmtypes("shm_snapshot_t",326,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bufct_buffer_flush_cntr")=326
-	Set gtmtypes("shm_snapshot_t",327,"name")="shm_snapshot_t.shadow_file_header.bufct_buffer_flush_loop_cntr"
-	Set gtmtypes("shm_snapshot_t",327,"off")=7440
-	Set gtmtypes("shm_snapshot_t",327,"len")=4
-	Set gtmtypes("shm_snapshot_t",327,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bufct_buffer_flush_loop_cntr")=327
-	Set gtmtypes("shm_snapshot_t",328,"name")="shm_snapshot_t.shadow_file_header.wrt_calls_cntr"
-	Set gtmtypes("shm_snapshot_t",328,"off")=7444
-	Set gtmtypes("shm_snapshot_t",328,"len")=4
-	Set gtmtypes("shm_snapshot_t",328,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_calls_cntr")=328
-	Set gtmtypes("shm_snapshot_t",329,"name")="shm_snapshot_t.shadow_file_header.wrt_count_cntr"
-	Set gtmtypes("shm_snapshot_t",329,"off")=7448
-	Set gtmtypes("shm_snapshot_t",329,"len")=4
-	Set gtmtypes("shm_snapshot_t",329,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_count_cntr")=329
-	Set gtmtypes("shm_snapshot_t",330,"name")="shm_snapshot_t.shadow_file_header.wrt_blocked_cntr"
-	Set gtmtypes("shm_snapshot_t",330,"off")=7452
-	Set gtmtypes("shm_snapshot_t",330,"len")=4
-	Set gtmtypes("shm_snapshot_t",330,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_blocked_cntr")=330
-	Set gtmtypes("shm_snapshot_t",331,"name")="shm_snapshot_t.shadow_file_header.wrt_busy_cntr"
-	Set gtmtypes("shm_snapshot_t",331,"off")=7456
-	Set gtmtypes("shm_snapshot_t",331,"len")=4
-	Set gtmtypes("shm_snapshot_t",331,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_busy_cntr")=331
-	Set gtmtypes("shm_snapshot_t",332,"name")="shm_snapshot_t.shadow_file_header.wrt_noblks_wrtn_cntr"
-	Set gtmtypes("shm_snapshot_t",332,"off")=7460
-	Set gtmtypes("shm_snapshot_t",332,"len")=4
-	Set gtmtypes("shm_snapshot_t",332,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_noblks_wrtn_cntr")=332
-	Set gtmtypes("shm_snapshot_t",333,"name")="shm_snapshot_t.shadow_file_header.reserved_bgtrcrec1_cntr"
-	Set gtmtypes("shm_snapshot_t",333,"off")=7464
-	Set gtmtypes("shm_snapshot_t",333,"len")=4
-	Set gtmtypes("shm_snapshot_t",333,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reserved_bgtrcrec1_cntr")=333
-	Set gtmtypes("shm_snapshot_t",334,"name")="shm_snapshot_t.shadow_file_header.reserved_bgtrcrec2_cntr"
-	Set gtmtypes("shm_snapshot_t",334,"off")=7468
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_ripsleep_cnt_tn")=323
+	Set gtmtypes("shm_snapshot_t",324,"name")="shm_snapshot_t.shadow_file_header.t_qread_ripsleep_nblks_tn"
+	Set gtmtypes("shm_snapshot_t",324,"off")=7312
+	Set gtmtypes("shm_snapshot_t",324,"len")=8
+	Set gtmtypes("shm_snapshot_t",324,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_ripsleep_nblks_tn")=324
+	Set gtmtypes("shm_snapshot_t",325,"name")="shm_snapshot_t.shadow_file_header.wcs_wtfini_invoked_tn"
+	Set gtmtypes("shm_snapshot_t",325,"off")=7320
+	Set gtmtypes("shm_snapshot_t",325,"len")=8
+	Set gtmtypes("shm_snapshot_t",325,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wtfini_invoked_tn")=325
+	Set gtmtypes("shm_snapshot_t",326,"name")="shm_snapshot_t.shadow_file_header.wcs_wterror_invoked_tn"
+	Set gtmtypes("shm_snapshot_t",326,"off")=7328
+	Set gtmtypes("shm_snapshot_t",326,"len")=8
+	Set gtmtypes("shm_snapshot_t",326,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wterror_invoked_tn")=326
+	Set gtmtypes("shm_snapshot_t",327,"name")="shm_snapshot_t.shadow_file_header.wcs_wt_restart_invoked_tn"
+	Set gtmtypes("shm_snapshot_t",327,"off")=7336
+	Set gtmtypes("shm_snapshot_t",327,"len")=8
+	Set gtmtypes("shm_snapshot_t",327,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wt_restart_invoked_tn")=327
+	Set gtmtypes("shm_snapshot_t",328,"name")="shm_snapshot_t.shadow_file_header.wcs_wt_restart_eagain_tn"
+	Set gtmtypes("shm_snapshot_t",328,"off")=7344
+	Set gtmtypes("shm_snapshot_t",328,"len")=8
+	Set gtmtypes("shm_snapshot_t",328,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wt_restart_eagain_tn")=328
+	Set gtmtypes("shm_snapshot_t",329,"name")="shm_snapshot_t.shadow_file_header.wcs_wt_restart_reinsert_tn"
+	Set gtmtypes("shm_snapshot_t",329,"off")=7352
+	Set gtmtypes("shm_snapshot_t",329,"len")=8
+	Set gtmtypes("shm_snapshot_t",329,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wt_restart_reinsert_tn")=329
+	Set gtmtypes("shm_snapshot_t",330,"name")="shm_snapshot_t.shadow_file_header.wcs_wtstart_eagain_tn"
+	Set gtmtypes("shm_snapshot_t",330,"off")=7360
+	Set gtmtypes("shm_snapshot_t",330,"len")=8
+	Set gtmtypes("shm_snapshot_t",330,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wtstart_eagain_tn")=330
+	Set gtmtypes("shm_snapshot_t",331,"name")="shm_snapshot_t.shadow_file_header.wcs_wtstart_eagain_incrit_tn"
+	Set gtmtypes("shm_snapshot_t",331,"off")=7368
+	Set gtmtypes("shm_snapshot_t",331,"len")=8
+	Set gtmtypes("shm_snapshot_t",331,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wtstart_eagain_incrit_tn")=331
+	Set gtmtypes("shm_snapshot_t",332,"name")="shm_snapshot_t.shadow_file_header.async_restart_eagain_tn"
+	Set gtmtypes("shm_snapshot_t",332,"off")=7376
+	Set gtmtypes("shm_snapshot_t",332,"len")=8
+	Set gtmtypes("shm_snapshot_t",332,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.async_restart_eagain_tn")=332
+	Set gtmtypes("shm_snapshot_t",333,"name")="shm_snapshot_t.shadow_file_header.bg_trc_rec_tn_filler"
+	Set gtmtypes("shm_snapshot_t",333,"off")=7384
+	Set gtmtypes("shm_snapshot_t",333,"len")=48
+	Set gtmtypes("shm_snapshot_t",333,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bg_trc_rec_tn_filler")=333
+	Set gtmtypes("shm_snapshot_t",334,"name")="shm_snapshot_t.shadow_file_header.total_buffer_flush_cntr"
+	Set gtmtypes("shm_snapshot_t",334,"off")=7432
 	Set gtmtypes("shm_snapshot_t",334,"len")=4
 	Set gtmtypes("shm_snapshot_t",334,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reserved_bgtrcrec2_cntr")=334
-	Set gtmtypes("shm_snapshot_t",335,"name")="shm_snapshot_t.shadow_file_header.reserved_bgtrcrec3_cntr"
-	Set gtmtypes("shm_snapshot_t",335,"off")=7472
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.total_buffer_flush_cntr")=334
+	Set gtmtypes("shm_snapshot_t",335,"name")="shm_snapshot_t.shadow_file_header.bufct_buffer_flush_cntr"
+	Set gtmtypes("shm_snapshot_t",335,"off")=7436
 	Set gtmtypes("shm_snapshot_t",335,"len")=4
 	Set gtmtypes("shm_snapshot_t",335,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reserved_bgtrcrec3_cntr")=335
-	Set gtmtypes("shm_snapshot_t",336,"name")="shm_snapshot_t.shadow_file_header.lost_block_recovery_cntr"
-	Set gtmtypes("shm_snapshot_t",336,"off")=7476
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bufct_buffer_flush_cntr")=335
+	Set gtmtypes("shm_snapshot_t",336,"name")="shm_snapshot_t.shadow_file_header.bufct_buffer_flush_loop_cntr"
+	Set gtmtypes("shm_snapshot_t",336,"off")=7440
 	Set gtmtypes("shm_snapshot_t",336,"len")=4
 	Set gtmtypes("shm_snapshot_t",336,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.lost_block_recovery_cntr")=336
-	Set gtmtypes("shm_snapshot_t",337,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_onln_rlbk_cntr"
-	Set gtmtypes("shm_snapshot_t",337,"off")=7480
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bufct_buffer_flush_loop_cntr")=336
+	Set gtmtypes("shm_snapshot_t",337,"name")="shm_snapshot_t.shadow_file_header.wrt_calls_cntr"
+	Set gtmtypes("shm_snapshot_t",337,"off")=7444
 	Set gtmtypes("shm_snapshot_t",337,"len")=4
 	Set gtmtypes("shm_snapshot_t",337,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_onln_rlbk_cntr")=337
-	Set gtmtypes("shm_snapshot_t",338,"name")="shm_snapshot_t.shadow_file_header.stale_cntr"
-	Set gtmtypes("shm_snapshot_t",338,"off")=7484
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_calls_cntr")=337
+	Set gtmtypes("shm_snapshot_t",338,"name")="shm_snapshot_t.shadow_file_header.wrt_count_cntr"
+	Set gtmtypes("shm_snapshot_t",338,"off")=7448
 	Set gtmtypes("shm_snapshot_t",338,"len")=4
 	Set gtmtypes("shm_snapshot_t",338,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_cntr")=338
-	Set gtmtypes("shm_snapshot_t",339,"name")="shm_snapshot_t.shadow_file_header.starved_cntr"
-	Set gtmtypes("shm_snapshot_t",339,"off")=7488
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_count_cntr")=338
+	Set gtmtypes("shm_snapshot_t",339,"name")="shm_snapshot_t.shadow_file_header.wrt_blocked_cntr"
+	Set gtmtypes("shm_snapshot_t",339,"off")=7452
 	Set gtmtypes("shm_snapshot_t",339,"len")=4
 	Set gtmtypes("shm_snapshot_t",339,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.starved_cntr")=339
-	Set gtmtypes("shm_snapshot_t",340,"name")="shm_snapshot_t.shadow_file_header.stale_timer_started_cntr"
-	Set gtmtypes("shm_snapshot_t",340,"off")=7492
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_blocked_cntr")=339
+	Set gtmtypes("shm_snapshot_t",340,"name")="shm_snapshot_t.shadow_file_header.wrt_busy_cntr"
+	Set gtmtypes("shm_snapshot_t",340,"off")=7456
 	Set gtmtypes("shm_snapshot_t",340,"len")=4
 	Set gtmtypes("shm_snapshot_t",340,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_timer_started_cntr")=340
-	Set gtmtypes("shm_snapshot_t",341,"name")="shm_snapshot_t.shadow_file_header.stale_timer_pop_cntr"
-	Set gtmtypes("shm_snapshot_t",341,"off")=7496
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_busy_cntr")=340
+	Set gtmtypes("shm_snapshot_t",341,"name")="shm_snapshot_t.shadow_file_header.wrt_noblks_wrtn_cntr"
+	Set gtmtypes("shm_snapshot_t",341,"off")=7460
 	Set gtmtypes("shm_snapshot_t",341,"len")=4
 	Set gtmtypes("shm_snapshot_t",341,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_timer_pop_cntr")=341
-	Set gtmtypes("shm_snapshot_t",342,"name")="shm_snapshot_t.shadow_file_header.stale_process_defer_cntr"
-	Set gtmtypes("shm_snapshot_t",342,"off")=7500
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_noblks_wrtn_cntr")=341
+	Set gtmtypes("shm_snapshot_t",342,"name")="shm_snapshot_t.shadow_file_header.reserved_bgtrcrec1_cntr"
+	Set gtmtypes("shm_snapshot_t",342,"off")=7464
 	Set gtmtypes("shm_snapshot_t",342,"len")=4
 	Set gtmtypes("shm_snapshot_t",342,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_process_defer_cntr")=342
-	Set gtmtypes("shm_snapshot_t",343,"name")="shm_snapshot_t.shadow_file_header.stale_defer_processed_cntr"
-	Set gtmtypes("shm_snapshot_t",343,"off")=7504
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reserved_bgtrcrec1_cntr")=342
+	Set gtmtypes("shm_snapshot_t",343,"name")="shm_snapshot_t.shadow_file_header.reserved_bgtrcrec2_cntr"
+	Set gtmtypes("shm_snapshot_t",343,"off")=7468
 	Set gtmtypes("shm_snapshot_t",343,"len")=4
 	Set gtmtypes("shm_snapshot_t",343,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_defer_processed_cntr")=343
-	Set gtmtypes("shm_snapshot_t",344,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flush_cntr"
-	Set gtmtypes("shm_snapshot_t",344,"off")=7508
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reserved_bgtrcrec2_cntr")=343
+	Set gtmtypes("shm_snapshot_t",344,"name")="shm_snapshot_t.shadow_file_header.reserved_bgtrcrec3_cntr"
+	Set gtmtypes("shm_snapshot_t",344,"off")=7472
 	Set gtmtypes("shm_snapshot_t",344,"len")=4
 	Set gtmtypes("shm_snapshot_t",344,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flush_cntr")=344
-	Set gtmtypes("shm_snapshot_t",345,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flush_loop_cntr"
-	Set gtmtypes("shm_snapshot_t",345,"off")=7512
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reserved_bgtrcrec3_cntr")=344
+	Set gtmtypes("shm_snapshot_t",345,"name")="shm_snapshot_t.shadow_file_header.lost_block_recovery_cntr"
+	Set gtmtypes("shm_snapshot_t",345,"off")=7476
 	Set gtmtypes("shm_snapshot_t",345,"len")=4
 	Set gtmtypes("shm_snapshot_t",345,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flush_loop_cntr")=345
-	Set gtmtypes("shm_snapshot_t",346,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flush_retries_cntr"
-	Set gtmtypes("shm_snapshot_t",346,"off")=7516
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.lost_block_recovery_cntr")=345
+	Set gtmtypes("shm_snapshot_t",346,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_onln_rlbk_cntr"
+	Set gtmtypes("shm_snapshot_t",346,"off")=7480
 	Set gtmtypes("shm_snapshot_t",346,"len")=4
 	Set gtmtypes("shm_snapshot_t",346,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flush_retries_cntr")=346
-	Set gtmtypes("shm_snapshot_t",347,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flushed_during_lockwait_cntr"
-	Set gtmtypes("shm_snapshot_t",347,"off")=7520
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_onln_rlbk_cntr")=346
+	Set gtmtypes("shm_snapshot_t",347,"name")="shm_snapshot_t.shadow_file_header.stale_cntr"
+	Set gtmtypes("shm_snapshot_t",347,"off")=7484
 	Set gtmtypes("shm_snapshot_t",347,"len")=4
 	Set gtmtypes("shm_snapshot_t",347,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flushed_during_lockwait_cntr")=347
-	Set gtmtypes("shm_snapshot_t",348,"name")="shm_snapshot_t.shadow_file_header.tp_crit_retries_cntr"
-	Set gtmtypes("shm_snapshot_t",348,"off")=7524
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_cntr")=347
+	Set gtmtypes("shm_snapshot_t",348,"name")="shm_snapshot_t.shadow_file_header.starved_cntr"
+	Set gtmtypes("shm_snapshot_t",348,"off")=7488
 	Set gtmtypes("shm_snapshot_t",348,"len")=4
 	Set gtmtypes("shm_snapshot_t",348,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.tp_crit_retries_cntr")=348
-	Set gtmtypes("shm_snapshot_t",349,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_flush_dirty_cntr"
-	Set gtmtypes("shm_snapshot_t",349,"off")=7528
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.starved_cntr")=348
+	Set gtmtypes("shm_snapshot_t",349,"name")="shm_snapshot_t.shadow_file_header.stale_timer_started_cntr"
+	Set gtmtypes("shm_snapshot_t",349,"off")=7492
 	Set gtmtypes("shm_snapshot_t",349,"len")=4
 	Set gtmtypes("shm_snapshot_t",349,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_flush_dirty_cntr")=349
-	Set gtmtypes("shm_snapshot_t",350,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_rip_wait_cntr"
-	Set gtmtypes("shm_snapshot_t",350,"off")=7532
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_timer_started_cntr")=349
+	Set gtmtypes("shm_snapshot_t",350,"name")="shm_snapshot_t.shadow_file_header.stale_timer_pop_cntr"
+	Set gtmtypes("shm_snapshot_t",350,"off")=7496
 	Set gtmtypes("shm_snapshot_t",350,"len")=4
 	Set gtmtypes("shm_snapshot_t",350,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_rip_wait_cntr")=350
-	Set gtmtypes("shm_snapshot_t",351,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_buf_owner_stuck_cntr"
-	Set gtmtypes("shm_snapshot_t",351,"off")=7536
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_timer_pop_cntr")=350
+	Set gtmtypes("shm_snapshot_t",351,"name")="shm_snapshot_t.shadow_file_header.stale_process_defer_cntr"
+	Set gtmtypes("shm_snapshot_t",351,"off")=7500
 	Set gtmtypes("shm_snapshot_t",351,"len")=4
 	Set gtmtypes("shm_snapshot_t",351,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_buf_owner_stuck_cntr")=351
-	Set gtmtypes("shm_snapshot_t",352,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_out_of_design_cntr"
-	Set gtmtypes("shm_snapshot_t",352,"off")=7540
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_process_defer_cntr")=351
+	Set gtmtypes("shm_snapshot_t",352,"name")="shm_snapshot_t.shadow_file_header.stale_defer_processed_cntr"
+	Set gtmtypes("shm_snapshot_t",352,"off")=7504
 	Set gtmtypes("shm_snapshot_t",352,"len")=4
 	Set gtmtypes("shm_snapshot_t",352,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_out_of_design_cntr")=352
-	Set gtmtypes("shm_snapshot_t",353,"name")="shm_snapshot_t.shadow_file_header.t_qread_buf_owner_stuck_cntr"
-	Set gtmtypes("shm_snapshot_t",353,"off")=7544
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_defer_processed_cntr")=352
+	Set gtmtypes("shm_snapshot_t",353,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flush_cntr"
+	Set gtmtypes("shm_snapshot_t",353,"off")=7508
 	Set gtmtypes("shm_snapshot_t",353,"len")=4
 	Set gtmtypes("shm_snapshot_t",353,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_buf_owner_stuck_cntr")=353
-	Set gtmtypes("shm_snapshot_t",354,"name")="shm_snapshot_t.shadow_file_header.t_qread_out_of_design_cntr"
-	Set gtmtypes("shm_snapshot_t",354,"off")=7548
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flush_cntr")=353
+	Set gtmtypes("shm_snapshot_t",354,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flush_loop_cntr"
+	Set gtmtypes("shm_snapshot_t",354,"off")=7512
 	Set gtmtypes("shm_snapshot_t",354,"len")=4
 	Set gtmtypes("shm_snapshot_t",354,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_out_of_design_cntr")=354
-	Set gtmtypes("shm_snapshot_t",355,"name")="shm_snapshot_t.shadow_file_header.bt_put_flush_dirty_cntr"
-	Set gtmtypes("shm_snapshot_t",355,"off")=7552
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flush_loop_cntr")=354
+	Set gtmtypes("shm_snapshot_t",355,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flush_retries_cntr"
+	Set gtmtypes("shm_snapshot_t",355,"off")=7516
 	Set gtmtypes("shm_snapshot_t",355,"len")=4
 	Set gtmtypes("shm_snapshot_t",355,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bt_put_flush_dirty_cntr")=355
-	Set gtmtypes("shm_snapshot_t",356,"name")="shm_snapshot_t.shadow_file_header.mlock_wakeups_cntr"
-	Set gtmtypes("shm_snapshot_t",356,"off")=7556
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flush_retries_cntr")=355
+	Set gtmtypes("shm_snapshot_t",356,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flushed_during_lockwait_cntr"
+	Set gtmtypes("shm_snapshot_t",356,"off")=7520
 	Set gtmtypes("shm_snapshot_t",356,"len")=4
 	Set gtmtypes("shm_snapshot_t",356,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.mlock_wakeups_cntr")=356
-	Set gtmtypes("shm_snapshot_t",357,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_recover_invoked_cntr"
-	Set gtmtypes("shm_snapshot_t",357,"off")=7560
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flushed_during_lockwait_cntr")=356
+	Set gtmtypes("shm_snapshot_t",357,"name")="shm_snapshot_t.shadow_file_header.tp_crit_retries_cntr"
+	Set gtmtypes("shm_snapshot_t",357,"off")=7524
 	Set gtmtypes("shm_snapshot_t",357,"len")=4
 	Set gtmtypes("shm_snapshot_t",357,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_recover_invoked_cntr")=357
-	Set gtmtypes("shm_snapshot_t",358,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_verify_passed_cntr"
-	Set gtmtypes("shm_snapshot_t",358,"off")=7564
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.tp_crit_retries_cntr")=357
+	Set gtmtypes("shm_snapshot_t",358,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_flush_dirty_cntr"
+	Set gtmtypes("shm_snapshot_t",358,"off")=7528
 	Set gtmtypes("shm_snapshot_t",358,"len")=4
 	Set gtmtypes("shm_snapshot_t",358,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_verify_passed_cntr")=358
-	Set gtmtypes("shm_snapshot_t",359,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr"
-	Set gtmtypes("shm_snapshot_t",359,"off")=7568
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_flush_dirty_cntr")=358
+	Set gtmtypes("shm_snapshot_t",359,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_rip_wait_cntr"
+	Set gtmtypes("shm_snapshot_t",359,"off")=7532
 	Set gtmtypes("shm_snapshot_t",359,"len")=4
 	Set gtmtypes("shm_snapshot_t",359,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr")=359
-	Set gtmtypes("shm_snapshot_t",360,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_cntr"
-	Set gtmtypes("shm_snapshot_t",360,"off")=7572
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_rip_wait_cntr")=359
+	Set gtmtypes("shm_snapshot_t",360,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_buf_owner_stuck_cntr"
+	Set gtmtypes("shm_snapshot_t",360,"off")=7536
 	Set gtmtypes("shm_snapshot_t",360,"len")=4
 	Set gtmtypes("shm_snapshot_t",360,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_cntr")=360
-	Set gtmtypes("shm_snapshot_t",361,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_db_csh_getn_loopexceed_cntr"
-	Set gtmtypes("shm_snapshot_t",361,"off")=7576
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_buf_owner_stuck_cntr")=360
+	Set gtmtypes("shm_snapshot_t",361,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_out_of_design_cntr"
+	Set gtmtypes("shm_snapshot_t",361,"off")=7540
 	Set gtmtypes("shm_snapshot_t",361,"len")=4
 	Set gtmtypes("shm_snapshot_t",361,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_db_csh_getn_loopexceed_cntr")=361
-	Set gtmtypes("shm_snapshot_t",362,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_cntr"
-	Set gtmtypes("shm_snapshot_t",362,"off")=7580
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_out_of_design_cntr")=361
+	Set gtmtypes("shm_snapshot_t",362,"name")="shm_snapshot_t.shadow_file_header.t_qread_buf_owner_stuck_cntr"
+	Set gtmtypes("shm_snapshot_t",362,"off")=7544
 	Set gtmtypes("shm_snapshot_t",362,"len")=4
 	Set gtmtypes("shm_snapshot_t",362,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_cntr")=362
-	Set gtmtypes("shm_snapshot_t",363,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_db_csh_get_cntr"
-	Set gtmtypes("shm_snapshot_t",363,"off")=7584
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_buf_owner_stuck_cntr")=362
+	Set gtmtypes("shm_snapshot_t",363,"name")="shm_snapshot_t.shadow_file_header.t_qread_out_of_design_cntr"
+	Set gtmtypes("shm_snapshot_t",363,"off")=7548
 	Set gtmtypes("shm_snapshot_t",363,"len")=4
 	Set gtmtypes("shm_snapshot_t",363,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_db_csh_get_cntr")=363
-	Set gtmtypes("shm_snapshot_t",364,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_wcsgetspace_cntr"
-	Set gtmtypes("shm_snapshot_t",364,"off")=7588
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_out_of_design_cntr")=363
+	Set gtmtypes("shm_snapshot_t",364,"name")="shm_snapshot_t.shadow_file_header.bt_put_flush_dirty_cntr"
+	Set gtmtypes("shm_snapshot_t",364,"off")=7552
 	Set gtmtypes("shm_snapshot_t",364,"len")=4
 	Set gtmtypes("shm_snapshot_t",364,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_wcsgetspace_cntr")=364
-	Set gtmtypes("shm_snapshot_t",365,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_t1_cntr"
-	Set gtmtypes("shm_snapshot_t",365,"off")=7592
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bt_put_flush_dirty_cntr")=364
+	Set gtmtypes("shm_snapshot_t",365,"name")="shm_snapshot_t.shadow_file_header.mlock_wakeups_cntr"
+	Set gtmtypes("shm_snapshot_t",365,"off")=7556
 	Set gtmtypes("shm_snapshot_t",365,"len")=4
 	Set gtmtypes("shm_snapshot_t",365,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_t1_cntr")=365
-	Set gtmtypes("shm_snapshot_t",366,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_bitmap_cntr"
-	Set gtmtypes("shm_snapshot_t",366,"off")=7596
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.mlock_wakeups_cntr")=365
+	Set gtmtypes("shm_snapshot_t",366,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_recover_invoked_cntr"
+	Set gtmtypes("shm_snapshot_t",366,"off")=7560
 	Set gtmtypes("shm_snapshot_t",366,"len")=4
 	Set gtmtypes("shm_snapshot_t",366,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_bitmap_cntr")=366
-	Set gtmtypes("shm_snapshot_t",367,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_jnl_cwset_cntr"
-	Set gtmtypes("shm_snapshot_t",367,"off")=7600
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_recover_invoked_cntr")=366
+	Set gtmtypes("shm_snapshot_t",367,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_verify_passed_cntr"
+	Set gtmtypes("shm_snapshot_t",367,"off")=7564
 	Set gtmtypes("shm_snapshot_t",367,"len")=4
 	Set gtmtypes("shm_snapshot_t",367,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_jnl_cwset_cntr")=367
-	Set gtmtypes("shm_snapshot_t",368,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_cntr"
-	Set gtmtypes("shm_snapshot_t",368,"off")=7604
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_verify_passed_cntr")=367
+	Set gtmtypes("shm_snapshot_t",368,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr"
+	Set gtmtypes("shm_snapshot_t",368,"off")=7568
 	Set gtmtypes("shm_snapshot_t",368,"len")=4
 	Set gtmtypes("shm_snapshot_t",368,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_cntr")=368
-	Set gtmtypes("shm_snapshot_t",369,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_hist_cntr"
-	Set gtmtypes("shm_snapshot_t",369,"off")=7608
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr")=368
+	Set gtmtypes("shm_snapshot_t",369,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_cntr"
+	Set gtmtypes("shm_snapshot_t",369,"off")=7572
 	Set gtmtypes("shm_snapshot_t",369,"len")=4
 	Set gtmtypes("shm_snapshot_t",369,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_hist_cntr")=369
-	Set gtmtypes("shm_snapshot_t",370,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_hist1_nullbt_cntr"
-	Set gtmtypes("shm_snapshot_t",370,"off")=7612
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_cntr")=369
+	Set gtmtypes("shm_snapshot_t",370,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_db_csh_getn_loopexceed_cntr"
+	Set gtmtypes("shm_snapshot_t",370,"off")=7576
 	Set gtmtypes("shm_snapshot_t",370,"len")=4
 	Set gtmtypes("shm_snapshot_t",370,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_hist1_nullbt_cntr")=370
-	Set gtmtypes("shm_snapshot_t",371,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_cntr"
-	Set gtmtypes("shm_snapshot_t",371,"off")=7616
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_db_csh_getn_loopexceed_cntr")=370
+	Set gtmtypes("shm_snapshot_t",371,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_cntr"
+	Set gtmtypes("shm_snapshot_t",371,"off")=7580
 	Set gtmtypes("shm_snapshot_t",371,"len")=4
 	Set gtmtypes("shm_snapshot_t",371,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_cntr")=371
-	Set gtmtypes("shm_snapshot_t",372,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_bitmap_nullbt_cntr"
-	Set gtmtypes("shm_snapshot_t",372,"off")=7620
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_cntr")=371
+	Set gtmtypes("shm_snapshot_t",372,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_db_csh_get_cntr"
+	Set gtmtypes("shm_snapshot_t",372,"off")=7584
 	Set gtmtypes("shm_snapshot_t",372,"len")=4
 	Set gtmtypes("shm_snapshot_t",372,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_bitmap_nullbt_cntr")=372
-	Set gtmtypes("shm_snapshot_t",373,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_cntr"
-	Set gtmtypes("shm_snapshot_t",373,"off")=7624
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_db_csh_get_cntr")=372
+	Set gtmtypes("shm_snapshot_t",373,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_wcsgetspace_cntr"
+	Set gtmtypes("shm_snapshot_t",373,"off")=7588
 	Set gtmtypes("shm_snapshot_t",373,"len")=4
 	Set gtmtypes("shm_snapshot_t",373,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_cntr")=373
-	Set gtmtypes("shm_snapshot_t",374,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_jnl_cwset_cntr"
-	Set gtmtypes("shm_snapshot_t",374,"off")=7628
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_wcsgetspace_cntr")=373
+	Set gtmtypes("shm_snapshot_t",374,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_t1_cntr"
+	Set gtmtypes("shm_snapshot_t",374,"off")=7592
 	Set gtmtypes("shm_snapshot_t",374,"len")=4
 	Set gtmtypes("shm_snapshot_t",374,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_jnl_cwset_cntr")=374
-	Set gtmtypes("shm_snapshot_t",375,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_jnl_wcsflu_cntr"
-	Set gtmtypes("shm_snapshot_t",375,"off")=7632
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_t1_cntr")=374
+	Set gtmtypes("shm_snapshot_t",375,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_bitmap_cntr"
+	Set gtmtypes("shm_snapshot_t",375,"off")=7596
 	Set gtmtypes("shm_snapshot_t",375,"len")=4
 	Set gtmtypes("shm_snapshot_t",375,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_jnl_wcsflu_cntr")=375
-	Set gtmtypes("shm_snapshot_t",376,"name")="shm_snapshot_t.shadow_file_header.db_csh_get_too_many_loops_cntr"
-	Set gtmtypes("shm_snapshot_t",376,"off")=7636
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_bitmap_cntr")=375
+	Set gtmtypes("shm_snapshot_t",376,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_jnl_cwset_cntr"
+	Set gtmtypes("shm_snapshot_t",376,"off")=7600
 	Set gtmtypes("shm_snapshot_t",376,"len")=4
 	Set gtmtypes("shm_snapshot_t",376,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_get_too_many_loops_cntr")=376
-	Set gtmtypes("shm_snapshot_t",377,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tpckh_hist1_nullbt_cntr"
-	Set gtmtypes("shm_snapshot_t",377,"off")=7640
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_jnl_cwset_cntr")=376
+	Set gtmtypes("shm_snapshot_t",377,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_cntr"
+	Set gtmtypes("shm_snapshot_t",377,"off")=7604
 	Set gtmtypes("shm_snapshot_t",377,"len")=4
 	Set gtmtypes("shm_snapshot_t",377,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tpckh_hist1_nullbt_cntr")=377
-	Set gtmtypes("shm_snapshot_t",378,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_cntr"
-	Set gtmtypes("shm_snapshot_t",378,"off")=7644
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_cntr")=377
+	Set gtmtypes("shm_snapshot_t",378,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_hist_cntr"
+	Set gtmtypes("shm_snapshot_t",378,"off")=7608
 	Set gtmtypes("shm_snapshot_t",378,"len")=4
 	Set gtmtypes("shm_snapshot_t",378,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_cntr")=378
-	Set gtmtypes("shm_snapshot_t",379,"name")="shm_snapshot_t.shadow_file_header.jnl_blocked_writer_lost_cntr"
-	Set gtmtypes("shm_snapshot_t",379,"off")=7648
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_hist_cntr")=378
+	Set gtmtypes("shm_snapshot_t",379,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_hist1_nullbt_cntr"
+	Set gtmtypes("shm_snapshot_t",379,"off")=7612
 	Set gtmtypes("shm_snapshot_t",379,"len")=4
 	Set gtmtypes("shm_snapshot_t",379,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_blocked_writer_lost_cntr")=379
-	Set gtmtypes("shm_snapshot_t",380,"name")="shm_snapshot_t.shadow_file_header.jnl_blocked_writer_stuck_cntr"
-	Set gtmtypes("shm_snapshot_t",380,"off")=7652
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_hist1_nullbt_cntr")=379
+	Set gtmtypes("shm_snapshot_t",380,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_cntr"
+	Set gtmtypes("shm_snapshot_t",380,"off")=7616
 	Set gtmtypes("shm_snapshot_t",380,"len")=4
 	Set gtmtypes("shm_snapshot_t",380,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_blocked_writer_stuck_cntr")=380
-	Set gtmtypes("shm_snapshot_t",381,"name")="shm_snapshot_t.shadow_file_header.jnl_blocked_writer_blocked_cntr"
-	Set gtmtypes("shm_snapshot_t",381,"off")=7656
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_cntr")=380
+	Set gtmtypes("shm_snapshot_t",381,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_bitmap_nullbt_cntr"
+	Set gtmtypes("shm_snapshot_t",381,"off")=7620
 	Set gtmtypes("shm_snapshot_t",381,"len")=4
 	Set gtmtypes("shm_snapshot_t",381,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_blocked_writer_blocked_cntr")=381
-	Set gtmtypes("shm_snapshot_t",382,"name")="shm_snapshot_t.shadow_file_header.n_jnl_fsyncs_cntr"
-	Set gtmtypes("shm_snapshot_t",382,"off")=7660
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_bitmap_nullbt_cntr")=381
+	Set gtmtypes("shm_snapshot_t",382,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_cntr"
+	Set gtmtypes("shm_snapshot_t",382,"off")=7624
 	Set gtmtypes("shm_snapshot_t",382,"len")=4
 	Set gtmtypes("shm_snapshot_t",382,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_jnl_fsyncs_cntr")=382
-	Set gtmtypes("shm_snapshot_t",383,"name")="shm_snapshot_t.shadow_file_header.n_jnl_fsync_tries_cntr"
-	Set gtmtypes("shm_snapshot_t",383,"off")=7664
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_cntr")=382
+	Set gtmtypes("shm_snapshot_t",383,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_jnl_cwset_cntr"
+	Set gtmtypes("shm_snapshot_t",383,"off")=7628
 	Set gtmtypes("shm_snapshot_t",383,"len")=4
 	Set gtmtypes("shm_snapshot_t",383,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_jnl_fsync_tries_cntr")=383
-	Set gtmtypes("shm_snapshot_t",384,"name")="shm_snapshot_t.shadow_file_header.n_jnl_fsync_recovers_cntr"
-	Set gtmtypes("shm_snapshot_t",384,"off")=7668
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_jnl_cwset_cntr")=383
+	Set gtmtypes("shm_snapshot_t",384,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_jnl_wcsflu_cntr"
+	Set gtmtypes("shm_snapshot_t",384,"off")=7632
 	Set gtmtypes("shm_snapshot_t",384,"len")=4
 	Set gtmtypes("shm_snapshot_t",384,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_jnl_fsync_recovers_cntr")=384
-	Set gtmtypes("shm_snapshot_t",385,"name")="shm_snapshot_t.shadow_file_header.n_db_fsyncs_cntr"
-	Set gtmtypes("shm_snapshot_t",385,"off")=7672
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_jnl_wcsflu_cntr")=384
+	Set gtmtypes("shm_snapshot_t",385,"name")="shm_snapshot_t.shadow_file_header.db_csh_get_too_many_loops_cntr"
+	Set gtmtypes("shm_snapshot_t",385,"off")=7636
 	Set gtmtypes("shm_snapshot_t",385,"len")=4
 	Set gtmtypes("shm_snapshot_t",385,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_fsyncs_cntr")=385
-	Set gtmtypes("shm_snapshot_t",386,"name")="shm_snapshot_t.shadow_file_header.n_db_fsyncs_in_crit_cntr"
-	Set gtmtypes("shm_snapshot_t",386,"off")=7676
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_get_too_many_loops_cntr")=385
+	Set gtmtypes("shm_snapshot_t",386,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tpckh_hist1_nullbt_cntr"
+	Set gtmtypes("shm_snapshot_t",386,"off")=7640
 	Set gtmtypes("shm_snapshot_t",386,"len")=4
 	Set gtmtypes("shm_snapshot_t",386,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_fsyncs_in_crit_cntr")=386
-	Set gtmtypes("shm_snapshot_t",387,"name")="shm_snapshot_t.shadow_file_header.n_dbsync_timers_cntr"
-	Set gtmtypes("shm_snapshot_t",387,"off")=7680
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tpckh_hist1_nullbt_cntr")=386
+	Set gtmtypes("shm_snapshot_t",387,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_cntr"
+	Set gtmtypes("shm_snapshot_t",387,"off")=7644
 	Set gtmtypes("shm_snapshot_t",387,"len")=4
 	Set gtmtypes("shm_snapshot_t",387,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_dbsync_timers_cntr")=387
-	Set gtmtypes("shm_snapshot_t",388,"name")="shm_snapshot_t.shadow_file_header.n_dbsync_writes_cntr"
-	Set gtmtypes("shm_snapshot_t",388,"off")=7684
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_cntr")=387
+	Set gtmtypes("shm_snapshot_t",388,"name")="shm_snapshot_t.shadow_file_header.jnl_blocked_writer_lost_cntr"
+	Set gtmtypes("shm_snapshot_t",388,"off")=7648
 	Set gtmtypes("shm_snapshot_t",388,"len")=4
 	Set gtmtypes("shm_snapshot_t",388,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_dbsync_writes_cntr")=388
-	Set gtmtypes("shm_snapshot_t",389,"name")="shm_snapshot_t.shadow_file_header.mutex_queue_full_cntr"
-	Set gtmtypes("shm_snapshot_t",389,"off")=7688
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_blocked_writer_lost_cntr")=388
+	Set gtmtypes("shm_snapshot_t",389,"name")="shm_snapshot_t.shadow_file_header.jnl_blocked_writer_stuck_cntr"
+	Set gtmtypes("shm_snapshot_t",389,"off")=7652
 	Set gtmtypes("shm_snapshot_t",389,"len")=4
 	Set gtmtypes("shm_snapshot_t",389,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.mutex_queue_full_cntr")=389
-	Set gtmtypes("shm_snapshot_t",390,"name")="shm_snapshot_t.shadow_file_header.wcb_bt_put_cntr"
-	Set gtmtypes("shm_snapshot_t",390,"off")=7692
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_blocked_writer_stuck_cntr")=389
+	Set gtmtypes("shm_snapshot_t",390,"name")="shm_snapshot_t.shadow_file_header.jnl_blocked_writer_blocked_cntr"
+	Set gtmtypes("shm_snapshot_t",390,"off")=7656
 	Set gtmtypes("shm_snapshot_t",390,"len")=4
 	Set gtmtypes("shm_snapshot_t",390,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_bt_put_cntr")=390
-	Set gtmtypes("shm_snapshot_t",391,"name")="shm_snapshot_t.shadow_file_header.wcb_mutex_salvage_cntr"
-	Set gtmtypes("shm_snapshot_t",391,"off")=7696
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_blocked_writer_blocked_cntr")=390
+	Set gtmtypes("shm_snapshot_t",391,"name")="shm_snapshot_t.shadow_file_header.n_jnl_fsyncs_cntr"
+	Set gtmtypes("shm_snapshot_t",391,"off")=7660
 	Set gtmtypes("shm_snapshot_t",391,"len")=4
 	Set gtmtypes("shm_snapshot_t",391,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_mutex_salvage_cntr")=391
-	Set gtmtypes("shm_snapshot_t",392,"name")="shm_snapshot_t.shadow_file_header.wcb_tp_grab_crit_cntr"
-	Set gtmtypes("shm_snapshot_t",392,"off")=7700
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_jnl_fsyncs_cntr")=391
+	Set gtmtypes("shm_snapshot_t",392,"name")="shm_snapshot_t.shadow_file_header.n_jnl_fsync_tries_cntr"
+	Set gtmtypes("shm_snapshot_t",392,"off")=7664
 	Set gtmtypes("shm_snapshot_t",392,"len")=4
 	Set gtmtypes("shm_snapshot_t",392,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_tp_grab_crit_cntr")=392
-	Set gtmtypes("shm_snapshot_t",393,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_nocr_invcr_cntr"
-	Set gtmtypes("shm_snapshot_t",393,"off")=7704
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_jnl_fsync_tries_cntr")=392
+	Set gtmtypes("shm_snapshot_t",393,"name")="shm_snapshot_t.shadow_file_header.n_jnl_fsync_recovers_cntr"
+	Set gtmtypes("shm_snapshot_t",393,"off")=7668
 	Set gtmtypes("shm_snapshot_t",393,"len")=4
 	Set gtmtypes("shm_snapshot_t",393,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_nocr_invcr_cntr")=393
-	Set gtmtypes("shm_snapshot_t",394,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_cr_invcr_cntr"
-	Set gtmtypes("shm_snapshot_t",394,"off")=7708
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_jnl_fsync_recovers_cntr")=393
+	Set gtmtypes("shm_snapshot_t",394,"name")="shm_snapshot_t.shadow_file_header.n_db_fsyncs_cntr"
+	Set gtmtypes("shm_snapshot_t",394,"off")=7672
 	Set gtmtypes("shm_snapshot_t",394,"len")=4
 	Set gtmtypes("shm_snapshot_t",394,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_cr_invcr_cntr")=394
-	Set gtmtypes("shm_snapshot_t",395,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_rip_wait_cntr"
-	Set gtmtypes("shm_snapshot_t",395,"off")=7712
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_fsyncs_cntr")=394
+	Set gtmtypes("shm_snapshot_t",395,"name")="shm_snapshot_t.shadow_file_header.n_db_fsyncs_in_crit_cntr"
+	Set gtmtypes("shm_snapshot_t",395,"off")=7676
 	Set gtmtypes("shm_snapshot_t",395,"len")=4
 	Set gtmtypes("shm_snapshot_t",395,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_rip_wait_cntr")=395
-	Set gtmtypes("shm_snapshot_t",396,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirtyripwait_cntr"
-	Set gtmtypes("shm_snapshot_t",396,"off")=7716
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_fsyncs_in_crit_cntr")=395
+	Set gtmtypes("shm_snapshot_t",396,"name")="shm_snapshot_t.shadow_file_header.n_dbsync_timers_cntr"
+	Set gtmtypes("shm_snapshot_t",396,"off")=7680
 	Set gtmtypes("shm_snapshot_t",396,"len")=4
 	Set gtmtypes("shm_snapshot_t",396,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirtyripwait_cntr")=396
-	Set gtmtypes("shm_snapshot_t",397,"name")="shm_snapshot_t.shadow_file_header.wcb_gds_rundown_cntr"
-	Set gtmtypes("shm_snapshot_t",397,"off")=7720
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_dbsync_timers_cntr")=396
+	Set gtmtypes("shm_snapshot_t",397,"name")="shm_snapshot_t.shadow_file_header.n_dbsync_writes_cntr"
+	Set gtmtypes("shm_snapshot_t",397,"off")=7684
 	Set gtmtypes("shm_snapshot_t",397,"len")=4
 	Set gtmtypes("shm_snapshot_t",397,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_gds_rundown_cntr")=397
-	Set gtmtypes("shm_snapshot_t",398,"name")="shm_snapshot_t.shadow_file_header.wcb_wcs_flu1_cntr"
-	Set gtmtypes("shm_snapshot_t",398,"off")=7724
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_dbsync_writes_cntr")=397
+	Set gtmtypes("shm_snapshot_t",398,"name")="shm_snapshot_t.shadow_file_header.mutex_queue_full_cntr"
+	Set gtmtypes("shm_snapshot_t",398,"off")=7688
 	Set gtmtypes("shm_snapshot_t",398,"len")=4
 	Set gtmtypes("shm_snapshot_t",398,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wcs_flu1_cntr")=398
-	Set gtmtypes("shm_snapshot_t",399,"name")="shm_snapshot_t.shadow_file_header.wcb_mu_back_cntr"
-	Set gtmtypes("shm_snapshot_t",399,"off")=7728
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.mutex_queue_full_cntr")=398
+	Set gtmtypes("shm_snapshot_t",399,"name")="shm_snapshot_t.shadow_file_header.wcb_bt_put_cntr"
+	Set gtmtypes("shm_snapshot_t",399,"off")=7692
 	Set gtmtypes("shm_snapshot_t",399,"len")=4
 	Set gtmtypes("shm_snapshot_t",399,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_mu_back_cntr")=399
-	Set gtmtypes("shm_snapshot_t",400,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirty_invcr_cntr"
-	Set gtmtypes("shm_snapshot_t",400,"off")=7732
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_bt_put_cntr")=399
+	Set gtmtypes("shm_snapshot_t",400,"name")="shm_snapshot_t.shadow_file_header.wcb_mutex_salvage_cntr"
+	Set gtmtypes("shm_snapshot_t",400,"off")=7696
 	Set gtmtypes("shm_snapshot_t",400,"len")=4
 	Set gtmtypes("shm_snapshot_t",400,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirty_invcr_cntr")=400
-	Set gtmtypes("shm_snapshot_t",401,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_wtfini_fail_cntr"
-	Set gtmtypes("shm_snapshot_t",401,"off")=7736
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_mutex_salvage_cntr")=400
+	Set gtmtypes("shm_snapshot_t",401,"name")="shm_snapshot_t.shadow_file_header.wcb_tp_grab_crit_cntr"
+	Set gtmtypes("shm_snapshot_t",401,"off")=7700
 	Set gtmtypes("shm_snapshot_t",401,"len")=4
 	Set gtmtypes("shm_snapshot_t",401,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_wtfini_fail_cntr")=401
-	Set gtmtypes("shm_snapshot_t",402,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_twin_stuck_cntr"
-	Set gtmtypes("shm_snapshot_t",402,"off")=7740
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_tp_grab_crit_cntr")=401
+	Set gtmtypes("shm_snapshot_t",402,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_nocr_invcr_cntr"
+	Set gtmtypes("shm_snapshot_t",402,"off")=7704
 	Set gtmtypes("shm_snapshot_t",402,"len")=4
 	Set gtmtypes("shm_snapshot_t",402,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_twin_stuck_cntr")=402
-	Set gtmtypes("shm_snapshot_t",403,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_wrt_latch_stuck_cntr"
-	Set gtmtypes("shm_snapshot_t",403,"off")=7744
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_nocr_invcr_cntr")=402
+	Set gtmtypes("shm_snapshot_t",403,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_cr_invcr_cntr"
+	Set gtmtypes("shm_snapshot_t",403,"off")=7708
 	Set gtmtypes("shm_snapshot_t",403,"len")=4
 	Set gtmtypes("shm_snapshot_t",403,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_wrt_latch_stuck_cntr")=403
-	Set gtmtypes("shm_snapshot_t",404,"name")="shm_snapshot_t.shadow_file_header.wcb_secshr_db_clnup_now_crit_cntr"
-	Set gtmtypes("shm_snapshot_t",404,"off")=7748
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_cr_invcr_cntr")=403
+	Set gtmtypes("shm_snapshot_t",404,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_rip_wait_cntr"
+	Set gtmtypes("shm_snapshot_t",404,"off")=7712
 	Set gtmtypes("shm_snapshot_t",404,"len")=4
 	Set gtmtypes("shm_snapshot_t",404,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_secshr_db_clnup_now_crit_cntr")=404
-	Set gtmtypes("shm_snapshot_t",405,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_bad_bt_index1_cntr"
-	Set gtmtypes("shm_snapshot_t",405,"off")=7752
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_rip_wait_cntr")=404
+	Set gtmtypes("shm_snapshot_t",405,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirtyripwait_cntr"
+	Set gtmtypes("shm_snapshot_t",405,"off")=7716
 	Set gtmtypes("shm_snapshot_t",405,"len")=4
 	Set gtmtypes("shm_snapshot_t",405,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_bad_bt_index1_cntr")=405
-	Set gtmtypes("shm_snapshot_t",406,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_bad_bt_index2_cntr"
-	Set gtmtypes("shm_snapshot_t",406,"off")=7756
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirtyripwait_cntr")=405
+	Set gtmtypes("shm_snapshot_t",406,"name")="shm_snapshot_t.shadow_file_header.wcb_gds_rundown_cntr"
+	Set gtmtypes("shm_snapshot_t",406,"off")=7720
 	Set gtmtypes("shm_snapshot_t",406,"len")=4
 	Set gtmtypes("shm_snapshot_t",406,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_bad_bt_index2_cntr")=406
-	Set gtmtypes("shm_snapshot_t",407,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_crbtmismatch1_cntr"
-	Set gtmtypes("shm_snapshot_t",407,"off")=7760
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_gds_rundown_cntr")=406
+	Set gtmtypes("shm_snapshot_t",407,"name")="shm_snapshot_t.shadow_file_header.wcb_wcs_flu1_cntr"
+	Set gtmtypes("shm_snapshot_t",407,"off")=7724
 	Set gtmtypes("shm_snapshot_t",407,"len")=4
 	Set gtmtypes("shm_snapshot_t",407,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_crbtmismatch1_cntr")=407
-	Set gtmtypes("shm_snapshot_t",408,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_crbtmismatch2_cntr"
-	Set gtmtypes("shm_snapshot_t",408,"off")=7764
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wcs_flu1_cntr")=407
+	Set gtmtypes("shm_snapshot_t",408,"name")="shm_snapshot_t.shadow_file_header.wcb_mu_back_cntr"
+	Set gtmtypes("shm_snapshot_t",408,"off")=7728
 	Set gtmtypes("shm_snapshot_t",408,"len")=4
 	Set gtmtypes("shm_snapshot_t",408,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_crbtmismatch2_cntr")=408
-	Set gtmtypes("shm_snapshot_t",409,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_crbtmismatch3_cntr"
-	Set gtmtypes("shm_snapshot_t",409,"off")=7768
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_mu_back_cntr")=408
+	Set gtmtypes("shm_snapshot_t",409,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirty_invcr_cntr"
+	Set gtmtypes("shm_snapshot_t",409,"off")=7732
 	Set gtmtypes("shm_snapshot_t",409,"len")=4
 	Set gtmtypes("shm_snapshot_t",409,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_crbtmismatch3_cntr")=409
-	Set gtmtypes("shm_snapshot_t",410,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_cntr"
-	Set gtmtypes("shm_snapshot_t",410,"off")=7772
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirty_invcr_cntr")=409
+	Set gtmtypes("shm_snapshot_t",410,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_wtfini_fail_cntr"
+	Set gtmtypes("shm_snapshot_t",410,"off")=7736
 	Set gtmtypes("shm_snapshot_t",410,"len")=4
 	Set gtmtypes("shm_snapshot_t",410,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_cntr")=410
-	Set gtmtypes("shm_snapshot_t",411,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_cntr"
-	Set gtmtypes("shm_snapshot_t",411,"off")=7776
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_wtfini_fail_cntr")=410
+	Set gtmtypes("shm_snapshot_t",411,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_twin_stuck_cntr"
+	Set gtmtypes("shm_snapshot_t",411,"off")=7740
 	Set gtmtypes("shm_snapshot_t",411,"len")=4
 	Set gtmtypes("shm_snapshot_t",411,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_cntr")=411
-	Set gtmtypes("shm_snapshot_t",412,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_cntr"
-	Set gtmtypes("shm_snapshot_t",412,"off")=7780
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_twin_stuck_cntr")=411
+	Set gtmtypes("shm_snapshot_t",412,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_wrt_latch_stuck_cntr"
+	Set gtmtypes("shm_snapshot_t",412,"off")=7744
 	Set gtmtypes("shm_snapshot_t",412,"len")=4
 	Set gtmtypes("shm_snapshot_t",412,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_cntr")=412
-	Set gtmtypes("shm_snapshot_t",413,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_cntr"
-	Set gtmtypes("shm_snapshot_t",413,"off")=7784
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_wrt_latch_stuck_cntr")=412
+	Set gtmtypes("shm_snapshot_t",413,"name")="shm_snapshot_t.shadow_file_header.wcb_secshr_db_clnup_now_crit_cntr"
+	Set gtmtypes("shm_snapshot_t",413,"off")=7748
 	Set gtmtypes("shm_snapshot_t",413,"len")=4
 	Set gtmtypes("shm_snapshot_t",413,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_cntr")=413
-	Set gtmtypes("shm_snapshot_t",414,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_cntr"
-	Set gtmtypes("shm_snapshot_t",414,"off")=7788
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_secshr_db_clnup_now_crit_cntr")=413
+	Set gtmtypes("shm_snapshot_t",414,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_bad_bt_index1_cntr"
+	Set gtmtypes("shm_snapshot_t",414,"off")=7752
 	Set gtmtypes("shm_snapshot_t",414,"len")=4
 	Set gtmtypes("shm_snapshot_t",414,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_cntr")=414
-	Set gtmtypes("shm_snapshot_t",415,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_bt_get_cntr"
-	Set gtmtypes("shm_snapshot_t",415,"off")=7792
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_bad_bt_index1_cntr")=414
+	Set gtmtypes("shm_snapshot_t",415,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_bad_bt_index2_cntr"
+	Set gtmtypes("shm_snapshot_t",415,"off")=7756
 	Set gtmtypes("shm_snapshot_t",415,"len")=4
 	Set gtmtypes("shm_snapshot_t",415,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_bt_get_cntr")=415
-	Set gtmtypes("shm_snapshot_t",416,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_cntr"
-	Set gtmtypes("shm_snapshot_t",416,"off")=7796
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_bad_bt_index2_cntr")=415
+	Set gtmtypes("shm_snapshot_t",416,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_crbtmismatch1_cntr"
+	Set gtmtypes("shm_snapshot_t",416,"off")=7760
 	Set gtmtypes("shm_snapshot_t",416,"len")=4
 	Set gtmtypes("shm_snapshot_t",416,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_cntr")=416
-	Set gtmtypes("shm_snapshot_t",417,"name")="shm_snapshot_t.shadow_file_header.wcb_bg_update_lckfail1_cntr"
-	Set gtmtypes("shm_snapshot_t",417,"off")=7800
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_crbtmismatch1_cntr")=416
+	Set gtmtypes("shm_snapshot_t",417,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_crbtmismatch2_cntr"
+	Set gtmtypes("shm_snapshot_t",417,"off")=7764
 	Set gtmtypes("shm_snapshot_t",417,"len")=4
 	Set gtmtypes("shm_snapshot_t",417,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_bg_update_lckfail1_cntr")=417
-	Set gtmtypes("shm_snapshot_t",418,"name")="shm_snapshot_t.shadow_file_header.wcb_bg_update_lckfail2_cntr"
-	Set gtmtypes("shm_snapshot_t",418,"off")=7804
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_crbtmismatch2_cntr")=417
+	Set gtmtypes("shm_snapshot_t",418,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_crbtmismatch3_cntr"
+	Set gtmtypes("shm_snapshot_t",418,"off")=7768
 	Set gtmtypes("shm_snapshot_t",418,"len")=4
 	Set gtmtypes("shm_snapshot_t",418,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_bg_update_lckfail2_cntr")=418
-	Set gtmtypes("shm_snapshot_t",419,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail1_cntr"
-	Set gtmtypes("shm_snapshot_t",419,"off")=7808
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_crbtmismatch3_cntr")=418
+	Set gtmtypes("shm_snapshot_t",419,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_cntr"
+	Set gtmtypes("shm_snapshot_t",419,"off")=7772
 	Set gtmtypes("shm_snapshot_t",419,"len")=4
 	Set gtmtypes("shm_snapshot_t",419,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail1_cntr")=419
-	Set gtmtypes("shm_snapshot_t",420,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail2_cntr"
-	Set gtmtypes("shm_snapshot_t",420,"off")=7812
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_cntr")=419
+	Set gtmtypes("shm_snapshot_t",420,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_cntr"
+	Set gtmtypes("shm_snapshot_t",420,"off")=7776
 	Set gtmtypes("shm_snapshot_t",420,"len")=4
 	Set gtmtypes("shm_snapshot_t",420,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail2_cntr")=420
-	Set gtmtypes("shm_snapshot_t",421,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail3_cntr"
-	Set gtmtypes("shm_snapshot_t",421,"off")=7816
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_cntr")=420
+	Set gtmtypes("shm_snapshot_t",421,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_cntr"
+	Set gtmtypes("shm_snapshot_t",421,"off")=7780
 	Set gtmtypes("shm_snapshot_t",421,"len")=4
 	Set gtmtypes("shm_snapshot_t",421,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail3_cntr")=421
-	Set gtmtypes("shm_snapshot_t",422,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail4_cntr"
-	Set gtmtypes("shm_snapshot_t",422,"off")=7820
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_cntr")=421
+	Set gtmtypes("shm_snapshot_t",422,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_cntr"
+	Set gtmtypes("shm_snapshot_t",422,"off")=7784
 	Set gtmtypes("shm_snapshot_t",422,"len")=4
 	Set gtmtypes("shm_snapshot_t",422,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail4_cntr")=422
-	Set gtmtypes("shm_snapshot_t",423,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail1_cntr"
-	Set gtmtypes("shm_snapshot_t",423,"off")=7824
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_cntr")=422
+	Set gtmtypes("shm_snapshot_t",423,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_cntr"
+	Set gtmtypes("shm_snapshot_t",423,"off")=7788
 	Set gtmtypes("shm_snapshot_t",423,"len")=4
 	Set gtmtypes("shm_snapshot_t",423,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail1_cntr")=423
-	Set gtmtypes("shm_snapshot_t",424,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail2_cntr"
-	Set gtmtypes("shm_snapshot_t",424,"off")=7828
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_cntr")=423
+	Set gtmtypes("shm_snapshot_t",424,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_bt_get_cntr"
+	Set gtmtypes("shm_snapshot_t",424,"off")=7792
 	Set gtmtypes("shm_snapshot_t",424,"len")=4
 	Set gtmtypes("shm_snapshot_t",424,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail2_cntr")=424
-	Set gtmtypes("shm_snapshot_t",425,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail3_cntr"
-	Set gtmtypes("shm_snapshot_t",425,"off")=7832
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_bt_get_cntr")=424
+	Set gtmtypes("shm_snapshot_t",425,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_cntr"
+	Set gtmtypes("shm_snapshot_t",425,"off")=7796
 	Set gtmtypes("shm_snapshot_t",425,"len")=4
 	Set gtmtypes("shm_snapshot_t",425,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail3_cntr")=425
-	Set gtmtypes("shm_snapshot_t",426,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail4_cntr"
-	Set gtmtypes("shm_snapshot_t",426,"off")=7836
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_cntr")=425
+	Set gtmtypes("shm_snapshot_t",426,"name")="shm_snapshot_t.shadow_file_header.wcb_bg_update_lckfail1_cntr"
+	Set gtmtypes("shm_snapshot_t",426,"off")=7800
 	Set gtmtypes("shm_snapshot_t",426,"len")=4
 	Set gtmtypes("shm_snapshot_t",426,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail4_cntr")=426
-	Set gtmtypes("shm_snapshot_t",427,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirtystuck1_cntr"
-	Set gtmtypes("shm_snapshot_t",427,"off")=7840
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_bg_update_lckfail1_cntr")=426
+	Set gtmtypes("shm_snapshot_t",427,"name")="shm_snapshot_t.shadow_file_header.wcb_bg_update_lckfail2_cntr"
+	Set gtmtypes("shm_snapshot_t",427,"off")=7804
 	Set gtmtypes("shm_snapshot_t",427,"len")=4
 	Set gtmtypes("shm_snapshot_t",427,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirtystuck1_cntr")=427
-	Set gtmtypes("shm_snapshot_t",428,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirtystuck2_cntr"
-	Set gtmtypes("shm_snapshot_t",428,"off")=7844
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_bg_update_lckfail2_cntr")=427
+	Set gtmtypes("shm_snapshot_t",428,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail1_cntr"
+	Set gtmtypes("shm_snapshot_t",428,"off")=7808
 	Set gtmtypes("shm_snapshot_t",428,"len")=4
 	Set gtmtypes("shm_snapshot_t",428,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirtystuck2_cntr")=428
-	Set gtmtypes("shm_snapshot_t",429,"name")="shm_snapshot_t.shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_cntr"
-	Set gtmtypes("shm_snapshot_t",429,"off")=7848
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail1_cntr")=428
+	Set gtmtypes("shm_snapshot_t",429,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail2_cntr"
+	Set gtmtypes("shm_snapshot_t",429,"off")=7812
 	Set gtmtypes("shm_snapshot_t",429,"len")=4
 	Set gtmtypes("shm_snapshot_t",429,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_cntr")=429
-	Set gtmtypes("shm_snapshot_t",430,"name")="shm_snapshot_t.shadow_file_header.dwngrd_refmts_syncio_cntr"
-	Set gtmtypes("shm_snapshot_t",430,"off")=7852
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail2_cntr")=429
+	Set gtmtypes("shm_snapshot_t",430,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail3_cntr"
+	Set gtmtypes("shm_snapshot_t",430,"off")=7816
 	Set gtmtypes("shm_snapshot_t",430,"len")=4
 	Set gtmtypes("shm_snapshot_t",430,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.dwngrd_refmts_syncio_cntr")=430
-	Set gtmtypes("shm_snapshot_t",431,"name")="shm_snapshot_t.shadow_file_header.dwngrd_refmts_asyncio_cntr"
-	Set gtmtypes("shm_snapshot_t",431,"off")=7856
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail3_cntr")=430
+	Set gtmtypes("shm_snapshot_t",431,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail4_cntr"
+	Set gtmtypes("shm_snapshot_t",431,"off")=7820
 	Set gtmtypes("shm_snapshot_t",431,"len")=4
 	Set gtmtypes("shm_snapshot_t",431,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.dwngrd_refmts_asyncio_cntr")=431
-	Set gtmtypes("shm_snapshot_t",432,"name")="shm_snapshot_t.shadow_file_header.shmpool_refmt_harvests_cntr"
-	Set gtmtypes("shm_snapshot_t",432,"off")=7860
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail4_cntr")=431
+	Set gtmtypes("shm_snapshot_t",432,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail1_cntr"
+	Set gtmtypes("shm_snapshot_t",432,"off")=7824
 	Set gtmtypes("shm_snapshot_t",432,"len")=4
 	Set gtmtypes("shm_snapshot_t",432,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_refmt_harvests_cntr")=432
-	Set gtmtypes("shm_snapshot_t",433,"name")="shm_snapshot_t.shadow_file_header.shmpool_recovery_cntr"
-	Set gtmtypes("shm_snapshot_t",433,"off")=7864
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail1_cntr")=432
+	Set gtmtypes("shm_snapshot_t",433,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail2_cntr"
+	Set gtmtypes("shm_snapshot_t",433,"off")=7828
 	Set gtmtypes("shm_snapshot_t",433,"len")=4
 	Set gtmtypes("shm_snapshot_t",433,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_recovery_cntr")=433
-	Set gtmtypes("shm_snapshot_t",434,"name")="shm_snapshot_t.shadow_file_header.shmpool_blkd_by_sdc_cntr"
-	Set gtmtypes("shm_snapshot_t",434,"off")=7868
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail2_cntr")=433
+	Set gtmtypes("shm_snapshot_t",434,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail3_cntr"
+	Set gtmtypes("shm_snapshot_t",434,"off")=7832
 	Set gtmtypes("shm_snapshot_t",434,"len")=4
 	Set gtmtypes("shm_snapshot_t",434,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_blkd_by_sdc_cntr")=434
-	Set gtmtypes("shm_snapshot_t",435,"name")="shm_snapshot_t.shadow_file_header.shmpool_alloc_bbflush_cntr"
-	Set gtmtypes("shm_snapshot_t",435,"off")=7872
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail3_cntr")=434
+	Set gtmtypes("shm_snapshot_t",435,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail4_cntr"
+	Set gtmtypes("shm_snapshot_t",435,"off")=7836
 	Set gtmtypes("shm_snapshot_t",435,"len")=4
 	Set gtmtypes("shm_snapshot_t",435,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_alloc_bbflush_cntr")=435
-	Set gtmtypes("shm_snapshot_t",436,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_released_replaced_cntr"
-	Set gtmtypes("shm_snapshot_t",436,"off")=7876
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail4_cntr")=435
+	Set gtmtypes("shm_snapshot_t",436,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirtystuck1_cntr"
+	Set gtmtypes("shm_snapshot_t",436,"off")=7840
 	Set gtmtypes("shm_snapshot_t",436,"len")=4
 	Set gtmtypes("shm_snapshot_t",436,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_released_replaced_cntr")=436
-	Set gtmtypes("shm_snapshot_t",437,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_released_io_complete_cntr"
-	Set gtmtypes("shm_snapshot_t",437,"off")=7880
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirtystuck1_cntr")=436
+	Set gtmtypes("shm_snapshot_t",437,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirtystuck2_cntr"
+	Set gtmtypes("shm_snapshot_t",437,"off")=7844
 	Set gtmtypes("shm_snapshot_t",437,"len")=4
 	Set gtmtypes("shm_snapshot_t",437,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_released_io_complete_cntr")=437
-	Set gtmtypes("shm_snapshot_t",438,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_kept_cntr"
-	Set gtmtypes("shm_snapshot_t",438,"off")=7884
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirtystuck2_cntr")=437
+	Set gtmtypes("shm_snapshot_t",438,"name")="shm_snapshot_t.shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_cntr"
+	Set gtmtypes("shm_snapshot_t",438,"off")=7848
 	Set gtmtypes("shm_snapshot_t",438,"len")=4
 	Set gtmtypes("shm_snapshot_t",438,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_kept_cntr")=438
-	Set gtmtypes("shm_snapshot_t",439,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_ignored_cntr"
-	Set gtmtypes("shm_snapshot_t",439,"off")=7888
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_cntr")=438
+	Set gtmtypes("shm_snapshot_t",439,"name")="shm_snapshot_t.shadow_file_header.dwngrd_refmts_syncio_cntr"
+	Set gtmtypes("shm_snapshot_t",439,"off")=7852
 	Set gtmtypes("shm_snapshot_t",439,"len")=4
 	Set gtmtypes("shm_snapshot_t",439,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_ignored_cntr")=439
-	Set gtmtypes("shm_snapshot_t",440,"name")="shm_snapshot_t.shadow_file_header.refmt_blk_chk_blk_freed_cntr"
-	Set gtmtypes("shm_snapshot_t",440,"off")=7892
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.dwngrd_refmts_syncio_cntr")=439
+	Set gtmtypes("shm_snapshot_t",440,"name")="shm_snapshot_t.shadow_file_header.dwngrd_refmts_asyncio_cntr"
+	Set gtmtypes("shm_snapshot_t",440,"off")=7856
 	Set gtmtypes("shm_snapshot_t",440,"len")=4
 	Set gtmtypes("shm_snapshot_t",440,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_blk_chk_blk_freed_cntr")=440
-	Set gtmtypes("shm_snapshot_t",441,"name")="shm_snapshot_t.shadow_file_header.refmt_blk_chk_blk_kept_cntr"
-	Set gtmtypes("shm_snapshot_t",441,"off")=7896
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.dwngrd_refmts_asyncio_cntr")=440
+	Set gtmtypes("shm_snapshot_t",441,"name")="shm_snapshot_t.shadow_file_header.shmpool_refmt_harvests_cntr"
+	Set gtmtypes("shm_snapshot_t",441,"off")=7860
 	Set gtmtypes("shm_snapshot_t",441,"len")=4
 	Set gtmtypes("shm_snapshot_t",441,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_blk_chk_blk_kept_cntr")=441
-	Set gtmtypes("shm_snapshot_t",442,"name")="shm_snapshot_t.shadow_file_header.active_lvl_trigger_cntr"
-	Set gtmtypes("shm_snapshot_t",442,"off")=7900
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_refmt_harvests_cntr")=441
+	Set gtmtypes("shm_snapshot_t",442,"name")="shm_snapshot_t.shadow_file_header.shmpool_recovery_cntr"
+	Set gtmtypes("shm_snapshot_t",442,"off")=7864
 	Set gtmtypes("shm_snapshot_t",442,"len")=4
 	Set gtmtypes("shm_snapshot_t",442,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.active_lvl_trigger_cntr")=442
-	Set gtmtypes("shm_snapshot_t",443,"name")="shm_snapshot_t.shadow_file_header.new_buff_cntr"
-	Set gtmtypes("shm_snapshot_t",443,"off")=7904
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_recovery_cntr")=442
+	Set gtmtypes("shm_snapshot_t",443,"name")="shm_snapshot_t.shadow_file_header.shmpool_blkd_by_sdc_cntr"
+	Set gtmtypes("shm_snapshot_t",443,"off")=7868
 	Set gtmtypes("shm_snapshot_t",443,"len")=4
 	Set gtmtypes("shm_snapshot_t",443,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.new_buff_cntr")=443
-	Set gtmtypes("shm_snapshot_t",444,"name")="shm_snapshot_t.shadow_file_header.phase2_commit_wait_sleep_in_crit_cntr"
-	Set gtmtypes("shm_snapshot_t",444,"off")=7908
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_blkd_by_sdc_cntr")=443
+	Set gtmtypes("shm_snapshot_t",444,"name")="shm_snapshot_t.shadow_file_header.shmpool_alloc_bbflush_cntr"
+	Set gtmtypes("shm_snapshot_t",444,"off")=7872
 	Set gtmtypes("shm_snapshot_t",444,"len")=4
 	Set gtmtypes("shm_snapshot_t",444,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.phase2_commit_wait_sleep_in_crit_cntr")=444
-	Set gtmtypes("shm_snapshot_t",445,"name")="shm_snapshot_t.shadow_file_header.phase2_commit_wait_sleep_no_crit_cntr"
-	Set gtmtypes("shm_snapshot_t",445,"off")=7912
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_alloc_bbflush_cntr")=444
+	Set gtmtypes("shm_snapshot_t",445,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_released_replaced_cntr"
+	Set gtmtypes("shm_snapshot_t",445,"off")=7876
 	Set gtmtypes("shm_snapshot_t",445,"len")=4
 	Set gtmtypes("shm_snapshot_t",445,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.phase2_commit_wait_sleep_no_crit_cntr")=445
-	Set gtmtypes("shm_snapshot_t",446,"name")="shm_snapshot_t.shadow_file_header.phase2_commit_wait_pidcnt_cntr"
-	Set gtmtypes("shm_snapshot_t",446,"off")=7916
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_released_replaced_cntr")=445
+	Set gtmtypes("shm_snapshot_t",446,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_released_io_complete_cntr"
+	Set gtmtypes("shm_snapshot_t",446,"off")=7880
 	Set gtmtypes("shm_snapshot_t",446,"len")=4
 	Set gtmtypes("shm_snapshot_t",446,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.phase2_commit_wait_pidcnt_cntr")=446
-	Set gtmtypes("shm_snapshot_t",447,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_intend_wait_cntr"
-	Set gtmtypes("shm_snapshot_t",447,"off")=7920
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_released_io_complete_cntr")=446
+	Set gtmtypes("shm_snapshot_t",447,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_kept_cntr"
+	Set gtmtypes("shm_snapshot_t",447,"off")=7884
 	Set gtmtypes("shm_snapshot_t",447,"len")=4
 	Set gtmtypes("shm_snapshot_t",447,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_intend_wait_cntr")=447
-	Set gtmtypes("shm_snapshot_t",448,"name")="shm_snapshot_t.shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_cntr"
-	Set gtmtypes("shm_snapshot_t",448,"off")=7924
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_kept_cntr")=447
+	Set gtmtypes("shm_snapshot_t",448,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_ignored_cntr"
+	Set gtmtypes("shm_snapshot_t",448,"off")=7888
 	Set gtmtypes("shm_snapshot_t",448,"len")=4
 	Set gtmtypes("shm_snapshot_t",448,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_cntr")=448
-	Set gtmtypes("shm_snapshot_t",449,"name")="shm_snapshot_t.shadow_file_header.wcb_phase2_commit_wait_cntr"
-	Set gtmtypes("shm_snapshot_t",449,"off")=7928
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_ignored_cntr")=448
+	Set gtmtypes("shm_snapshot_t",449,"name")="shm_snapshot_t.shadow_file_header.refmt_blk_chk_blk_freed_cntr"
+	Set gtmtypes("shm_snapshot_t",449,"off")=7892
 	Set gtmtypes("shm_snapshot_t",449,"len")=4
 	Set gtmtypes("shm_snapshot_t",449,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_phase2_commit_wait_cntr")=449
-	Set gtmtypes("shm_snapshot_t",450,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_calls_cntr"
-	Set gtmtypes("shm_snapshot_t",450,"off")=7932
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_blk_chk_blk_freed_cntr")=449
+	Set gtmtypes("shm_snapshot_t",450,"name")="shm_snapshot_t.shadow_file_header.refmt_blk_chk_blk_kept_cntr"
+	Set gtmtypes("shm_snapshot_t",450,"off")=7896
 	Set gtmtypes("shm_snapshot_t",450,"len")=4
 	Set gtmtypes("shm_snapshot_t",450,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_calls_cntr")=450
-	Set gtmtypes("shm_snapshot_t",451,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_rip_cntr"
-	Set gtmtypes("shm_snapshot_t",451,"off")=7936
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_blk_chk_blk_kept_cntr")=450
+	Set gtmtypes("shm_snapshot_t",451,"name")="shm_snapshot_t.shadow_file_header.active_lvl_trigger_cntr"
+	Set gtmtypes("shm_snapshot_t",451,"off")=7900
 	Set gtmtypes("shm_snapshot_t",451,"len")=4
 	Set gtmtypes("shm_snapshot_t",451,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_rip_cntr")=451
-	Set gtmtypes("shm_snapshot_t",452,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_in_tend_cntr"
-	Set gtmtypes("shm_snapshot_t",452,"off")=7940
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.active_lvl_trigger_cntr")=451
+	Set gtmtypes("shm_snapshot_t",452,"name")="shm_snapshot_t.shadow_file_header.new_buff_cntr"
+	Set gtmtypes("shm_snapshot_t",452,"off")=7904
 	Set gtmtypes("shm_snapshot_t",452,"len")=4
 	Set gtmtypes("shm_snapshot_t",452,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_in_tend_cntr")=452
-	Set gtmtypes("shm_snapshot_t",453,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_search_blk_cntr"
-	Set gtmtypes("shm_snapshot_t",453,"off")=7944
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.new_buff_cntr")=452
+	Set gtmtypes("shm_snapshot_t",453,"name")="shm_snapshot_t.shadow_file_header.phase2_commit_wait_sleep_in_crit_cntr"
+	Set gtmtypes("shm_snapshot_t",453,"off")=7908
 	Set gtmtypes("shm_snapshot_t",453,"len")=4
 	Set gtmtypes("shm_snapshot_t",453,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_search_blk_cntr")=453
-	Set gtmtypes("shm_snapshot_t",454,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_new_rec_cntr"
-	Set gtmtypes("shm_snapshot_t",454,"off")=7948
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.phase2_commit_wait_sleep_in_crit_cntr")=453
+	Set gtmtypes("shm_snapshot_t",454,"name")="shm_snapshot_t.shadow_file_header.phase2_commit_wait_sleep_no_crit_cntr"
+	Set gtmtypes("shm_snapshot_t",454,"off")=7912
 	Set gtmtypes("shm_snapshot_t",454,"len")=4
 	Set gtmtypes("shm_snapshot_t",454,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_new_rec_cntr")=454
-	Set gtmtypes("shm_snapshot_t",455,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_rec_size_cntr"
-	Set gtmtypes("shm_snapshot_t",455,"off")=7952
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.phase2_commit_wait_sleep_no_crit_cntr")=454
+	Set gtmtypes("shm_snapshot_t",455,"name")="shm_snapshot_t.shadow_file_header.phase2_commit_wait_pidcnt_cntr"
+	Set gtmtypes("shm_snapshot_t",455,"off")=7916
 	Set gtmtypes("shm_snapshot_t",455,"len")=4
 	Set gtmtypes("shm_snapshot_t",455,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_rec_size_cntr")=455
-	Set gtmtypes("shm_snapshot_t",456,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_rec_cmpc_cntr"
-	Set gtmtypes("shm_snapshot_t",456,"off")=7956
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.phase2_commit_wait_pidcnt_cntr")=455
+	Set gtmtypes("shm_snapshot_t",456,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_intend_wait_cntr"
+	Set gtmtypes("shm_snapshot_t",456,"off")=7920
 	Set gtmtypes("shm_snapshot_t",456,"len")=4
 	Set gtmtypes("shm_snapshot_t",456,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_rec_cmpc_cntr")=456
-	Set gtmtypes("shm_snapshot_t",457,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_blk_fini_cntr"
-	Set gtmtypes("shm_snapshot_t",457,"off")=7960
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_intend_wait_cntr")=456
+	Set gtmtypes("shm_snapshot_t",457,"name")="shm_snapshot_t.shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_cntr"
+	Set gtmtypes("shm_snapshot_t",457,"off")=7924
 	Set gtmtypes("shm_snapshot_t",457,"len")=4
 	Set gtmtypes("shm_snapshot_t",457,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_blk_fini_cntr")=457
-	Set gtmtypes("shm_snapshot_t",458,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_blk_split_cntr"
-	Set gtmtypes("shm_snapshot_t",458,"off")=7964
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_cntr")=457
+	Set gtmtypes("shm_snapshot_t",458,"name")="shm_snapshot_t.shadow_file_header.wcb_phase2_commit_wait_cntr"
+	Set gtmtypes("shm_snapshot_t",458,"off")=7928
 	Set gtmtypes("shm_snapshot_t",458,"len")=4
 	Set gtmtypes("shm_snapshot_t",458,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_blk_split_cntr")=458
-	Set gtmtypes("shm_snapshot_t",459,"name")="shm_snapshot_t.shadow_file_header.t_qread_ripsleep_cnt_cntr"
-	Set gtmtypes("shm_snapshot_t",459,"off")=7968
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_phase2_commit_wait_cntr")=458
+	Set gtmtypes("shm_snapshot_t",459,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_calls_cntr"
+	Set gtmtypes("shm_snapshot_t",459,"off")=7932
 	Set gtmtypes("shm_snapshot_t",459,"len")=4
 	Set gtmtypes("shm_snapshot_t",459,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_ripsleep_cnt_cntr")=459
-	Set gtmtypes("shm_snapshot_t",460,"name")="shm_snapshot_t.shadow_file_header.t_qread_ripsleep_nblks_cntr"
-	Set gtmtypes("shm_snapshot_t",460,"off")=7972
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_calls_cntr")=459
+	Set gtmtypes("shm_snapshot_t",460,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_rip_cntr"
+	Set gtmtypes("shm_snapshot_t",460,"off")=7936
 	Set gtmtypes("shm_snapshot_t",460,"len")=4
 	Set gtmtypes("shm_snapshot_t",460,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_ripsleep_nblks_cntr")=460
-	Set gtmtypes("shm_snapshot_t",461,"name")="shm_snapshot_t.shadow_file_header.bg_trc_rec_cntr_filler"
-	Set gtmtypes("shm_snapshot_t",461,"off")=7976
-	Set gtmtypes("shm_snapshot_t",461,"len")=56
-	Set gtmtypes("shm_snapshot_t",461,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bg_trc_rec_cntr_filler")=461
-	Set gtmtypes("shm_snapshot_t",462,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srches"
-	Set gtmtypes("shm_snapshot_t",462,"off")=8032
-	Set gtmtypes("shm_snapshot_t",462,"len")=8
-	Set gtmtypes("shm_snapshot_t",462,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srches")=462
-	Set gtmtypes("shm_snapshot_t",463,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srches.curr_count"
-	Set gtmtypes("shm_snapshot_t",463,"off")=8032
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_rip_cntr")=460
+	Set gtmtypes("shm_snapshot_t",461,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_in_tend_cntr"
+	Set gtmtypes("shm_snapshot_t",461,"off")=7940
+	Set gtmtypes("shm_snapshot_t",461,"len")=4
+	Set gtmtypes("shm_snapshot_t",461,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_in_tend_cntr")=461
+	Set gtmtypes("shm_snapshot_t",462,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_search_blk_cntr"
+	Set gtmtypes("shm_snapshot_t",462,"off")=7944
+	Set gtmtypes("shm_snapshot_t",462,"len")=4
+	Set gtmtypes("shm_snapshot_t",462,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_search_blk_cntr")=462
+	Set gtmtypes("shm_snapshot_t",463,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_new_rec_cntr"
+	Set gtmtypes("shm_snapshot_t",463,"off")=7948
 	Set gtmtypes("shm_snapshot_t",463,"len")=4
 	Set gtmtypes("shm_snapshot_t",463,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srches.curr_count")=463
-	Set gtmtypes("shm_snapshot_t",464,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srches.cumul_count"
-	Set gtmtypes("shm_snapshot_t",464,"off")=8036
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_new_rec_cntr")=463
+	Set gtmtypes("shm_snapshot_t",464,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_rec_size_cntr"
+	Set gtmtypes("shm_snapshot_t",464,"off")=7952
 	Set gtmtypes("shm_snapshot_t",464,"len")=4
 	Set gtmtypes("shm_snapshot_t",464,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srches.cumul_count")=464
-	Set gtmtypes("shm_snapshot_t",465,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srch_clues"
-	Set gtmtypes("shm_snapshot_t",465,"off")=8040
-	Set gtmtypes("shm_snapshot_t",465,"len")=8
-	Set gtmtypes("shm_snapshot_t",465,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srch_clues")=465
-	Set gtmtypes("shm_snapshot_t",466,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srch_clues.curr_count"
-	Set gtmtypes("shm_snapshot_t",466,"off")=8040
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_rec_size_cntr")=464
+	Set gtmtypes("shm_snapshot_t",465,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_rec_cmpc_cntr"
+	Set gtmtypes("shm_snapshot_t",465,"off")=7956
+	Set gtmtypes("shm_snapshot_t",465,"len")=4
+	Set gtmtypes("shm_snapshot_t",465,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_rec_cmpc_cntr")=465
+	Set gtmtypes("shm_snapshot_t",466,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_blk_fini_cntr"
+	Set gtmtypes("shm_snapshot_t",466,"off")=7960
 	Set gtmtypes("shm_snapshot_t",466,"len")=4
 	Set gtmtypes("shm_snapshot_t",466,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srch_clues.curr_count")=466
-	Set gtmtypes("shm_snapshot_t",467,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srch_clues.cumul_count"
-	Set gtmtypes("shm_snapshot_t",467,"off")=8044
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_blk_fini_cntr")=466
+	Set gtmtypes("shm_snapshot_t",467,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_blk_split_cntr"
+	Set gtmtypes("shm_snapshot_t",467,"off")=7964
 	Set gtmtypes("shm_snapshot_t",467,"len")=4
 	Set gtmtypes("shm_snapshot_t",467,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srch_clues.cumul_count")=467
-	Set gtmtypes("shm_snapshot_t",468,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_head"
-	Set gtmtypes("shm_snapshot_t",468,"off")=8048
-	Set gtmtypes("shm_snapshot_t",468,"len")=8
-	Set gtmtypes("shm_snapshot_t",468,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_head")=468
-	Set gtmtypes("shm_snapshot_t",469,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_head.curr_count"
-	Set gtmtypes("shm_snapshot_t",469,"off")=8048
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_blk_split_cntr")=467
+	Set gtmtypes("shm_snapshot_t",468,"name")="shm_snapshot_t.shadow_file_header.t_qread_ripsleep_cnt_cntr"
+	Set gtmtypes("shm_snapshot_t",468,"off")=7968
+	Set gtmtypes("shm_snapshot_t",468,"len")=4
+	Set gtmtypes("shm_snapshot_t",468,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_ripsleep_cnt_cntr")=468
+	Set gtmtypes("shm_snapshot_t",469,"name")="shm_snapshot_t.shadow_file_header.t_qread_ripsleep_nblks_cntr"
+	Set gtmtypes("shm_snapshot_t",469,"off")=7972
 	Set gtmtypes("shm_snapshot_t",469,"len")=4
 	Set gtmtypes("shm_snapshot_t",469,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_head.curr_count")=469
-	Set gtmtypes("shm_snapshot_t",470,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_head.cumul_count"
-	Set gtmtypes("shm_snapshot_t",470,"off")=8052
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_ripsleep_nblks_cntr")=469
+	Set gtmtypes("shm_snapshot_t",470,"name")="shm_snapshot_t.shadow_file_header.wcs_wtfini_invoked_cntr"
+	Set gtmtypes("shm_snapshot_t",470,"off")=7976
 	Set gtmtypes("shm_snapshot_t",470,"len")=4
 	Set gtmtypes("shm_snapshot_t",470,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_head.cumul_count")=470
-	Set gtmtypes("shm_snapshot_t",471,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_same"
-	Set gtmtypes("shm_snapshot_t",471,"off")=8056
-	Set gtmtypes("shm_snapshot_t",471,"len")=8
-	Set gtmtypes("shm_snapshot_t",471,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_same")=471
-	Set gtmtypes("shm_snapshot_t",472,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_same.curr_count"
-	Set gtmtypes("shm_snapshot_t",472,"off")=8056
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wtfini_invoked_cntr")=470
+	Set gtmtypes("shm_snapshot_t",471,"name")="shm_snapshot_t.shadow_file_header.wcs_wterror_invoked_cntr"
+	Set gtmtypes("shm_snapshot_t",471,"off")=7980
+	Set gtmtypes("shm_snapshot_t",471,"len")=4
+	Set gtmtypes("shm_snapshot_t",471,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wterror_invoked_cntr")=471
+	Set gtmtypes("shm_snapshot_t",472,"name")="shm_snapshot_t.shadow_file_header.wcs_wt_restart_invoked_cntr"
+	Set gtmtypes("shm_snapshot_t",472,"off")=7984
 	Set gtmtypes("shm_snapshot_t",472,"len")=4
 	Set gtmtypes("shm_snapshot_t",472,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_same.curr_count")=472
-	Set gtmtypes("shm_snapshot_t",473,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_same.cumul_count"
-	Set gtmtypes("shm_snapshot_t",473,"off")=8060
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wt_restart_invoked_cntr")=472
+	Set gtmtypes("shm_snapshot_t",473,"name")="shm_snapshot_t.shadow_file_header.wcs_wt_restart_eagain_cntr"
+	Set gtmtypes("shm_snapshot_t",473,"off")=7988
 	Set gtmtypes("shm_snapshot_t",473,"len")=4
 	Set gtmtypes("shm_snapshot_t",473,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_same.cumul_count")=473
-	Set gtmtypes("shm_snapshot_t",474,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_tail"
-	Set gtmtypes("shm_snapshot_t",474,"off")=8064
-	Set gtmtypes("shm_snapshot_t",474,"len")=8
-	Set gtmtypes("shm_snapshot_t",474,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_tail")=474
-	Set gtmtypes("shm_snapshot_t",475,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_tail.curr_count"
-	Set gtmtypes("shm_snapshot_t",475,"off")=8064
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wt_restart_eagain_cntr")=473
+	Set gtmtypes("shm_snapshot_t",474,"name")="shm_snapshot_t.shadow_file_header.wcs_wt_restart_reinsert_cntr"
+	Set gtmtypes("shm_snapshot_t",474,"off")=7992
+	Set gtmtypes("shm_snapshot_t",474,"len")=4
+	Set gtmtypes("shm_snapshot_t",474,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wt_restart_reinsert_cntr")=474
+	Set gtmtypes("shm_snapshot_t",475,"name")="shm_snapshot_t.shadow_file_header.wcs_wtstart_eagain_cntr"
+	Set gtmtypes("shm_snapshot_t",475,"off")=7996
 	Set gtmtypes("shm_snapshot_t",475,"len")=4
 	Set gtmtypes("shm_snapshot_t",475,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_tail.curr_count")=475
-	Set gtmtypes("shm_snapshot_t",476,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_tail.cumul_count"
-	Set gtmtypes("shm_snapshot_t",476,"off")=8068
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wtstart_eagain_cntr")=475
+	Set gtmtypes("shm_snapshot_t",476,"name")="shm_snapshot_t.shadow_file_header.wcs_wtstart_eagain_incrit_cntr"
+	Set gtmtypes("shm_snapshot_t",476,"off")=8000
 	Set gtmtypes("shm_snapshot_t",476,"len")=4
 	Set gtmtypes("shm_snapshot_t",476,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_tail.cumul_count")=476
-	Set gtmtypes("shm_snapshot_t",477,"name")="shm_snapshot_t.shadow_file_header.n_t_qreads"
-	Set gtmtypes("shm_snapshot_t",477,"off")=8072
-	Set gtmtypes("shm_snapshot_t",477,"len")=8
-	Set gtmtypes("shm_snapshot_t",477,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_t_qreads")=477
-	Set gtmtypes("shm_snapshot_t",478,"name")="shm_snapshot_t.shadow_file_header.n_t_qreads.curr_count"
-	Set gtmtypes("shm_snapshot_t",478,"off")=8072
-	Set gtmtypes("shm_snapshot_t",478,"len")=4
-	Set gtmtypes("shm_snapshot_t",478,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_t_qreads.curr_count")=478
-	Set gtmtypes("shm_snapshot_t",479,"name")="shm_snapshot_t.shadow_file_header.n_t_qreads.cumul_count"
-	Set gtmtypes("shm_snapshot_t",479,"off")=8076
-	Set gtmtypes("shm_snapshot_t",479,"len")=4
-	Set gtmtypes("shm_snapshot_t",479,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_t_qreads.cumul_count")=479
-	Set gtmtypes("shm_snapshot_t",480,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_reads"
-	Set gtmtypes("shm_snapshot_t",480,"off")=8080
-	Set gtmtypes("shm_snapshot_t",480,"len")=8
-	Set gtmtypes("shm_snapshot_t",480,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_reads")=480
-	Set gtmtypes("shm_snapshot_t",481,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_reads.curr_count"
-	Set gtmtypes("shm_snapshot_t",481,"off")=8080
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wtstart_eagain_incrit_cntr")=476
+	Set gtmtypes("shm_snapshot_t",477,"name")="shm_snapshot_t.shadow_file_header.async_restart_eagain_cntr"
+	Set gtmtypes("shm_snapshot_t",477,"off")=8004
+	Set gtmtypes("shm_snapshot_t",477,"len")=4
+	Set gtmtypes("shm_snapshot_t",477,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.async_restart_eagain_cntr")=477
+	Set gtmtypes("shm_snapshot_t",478,"name")="shm_snapshot_t.shadow_file_header.bg_trc_rec_cntr_filler"
+	Set gtmtypes("shm_snapshot_t",478,"off")=8008
+	Set gtmtypes("shm_snapshot_t",478,"len")=24
+	Set gtmtypes("shm_snapshot_t",478,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bg_trc_rec_cntr_filler")=478
+	Set gtmtypes("shm_snapshot_t",479,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srches"
+	Set gtmtypes("shm_snapshot_t",479,"off")=8032
+	Set gtmtypes("shm_snapshot_t",479,"len")=8
+	Set gtmtypes("shm_snapshot_t",479,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srches")=479
+	Set gtmtypes("shm_snapshot_t",480,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srches.curr_count"
+	Set gtmtypes("shm_snapshot_t",480,"off")=8032
+	Set gtmtypes("shm_snapshot_t",480,"len")=4
+	Set gtmtypes("shm_snapshot_t",480,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srches.curr_count")=480
+	Set gtmtypes("shm_snapshot_t",481,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srches.cumul_count"
+	Set gtmtypes("shm_snapshot_t",481,"off")=8036
 	Set gtmtypes("shm_snapshot_t",481,"len")=4
 	Set gtmtypes("shm_snapshot_t",481,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_reads.curr_count")=481
-	Set gtmtypes("shm_snapshot_t",482,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_reads.cumul_count"
-	Set gtmtypes("shm_snapshot_t",482,"off")=8084
-	Set gtmtypes("shm_snapshot_t",482,"len")=4
-	Set gtmtypes("shm_snapshot_t",482,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_reads.cumul_count")=482
-	Set gtmtypes("shm_snapshot_t",483,"name")="shm_snapshot_t.shadow_file_header.n_bgmm_updates"
-	Set gtmtypes("shm_snapshot_t",483,"off")=8088
-	Set gtmtypes("shm_snapshot_t",483,"len")=8
-	Set gtmtypes("shm_snapshot_t",483,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bgmm_updates")=483
-	Set gtmtypes("shm_snapshot_t",484,"name")="shm_snapshot_t.shadow_file_header.n_bgmm_updates.curr_count"
-	Set gtmtypes("shm_snapshot_t",484,"off")=8088
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srches.cumul_count")=481
+	Set gtmtypes("shm_snapshot_t",482,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srch_clues"
+	Set gtmtypes("shm_snapshot_t",482,"off")=8040
+	Set gtmtypes("shm_snapshot_t",482,"len")=8
+	Set gtmtypes("shm_snapshot_t",482,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srch_clues")=482
+	Set gtmtypes("shm_snapshot_t",483,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srch_clues.curr_count"
+	Set gtmtypes("shm_snapshot_t",483,"off")=8040
+	Set gtmtypes("shm_snapshot_t",483,"len")=4
+	Set gtmtypes("shm_snapshot_t",483,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srch_clues.curr_count")=483
+	Set gtmtypes("shm_snapshot_t",484,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srch_clues.cumul_count"
+	Set gtmtypes("shm_snapshot_t",484,"off")=8044
 	Set gtmtypes("shm_snapshot_t",484,"len")=4
 	Set gtmtypes("shm_snapshot_t",484,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bgmm_updates.curr_count")=484
-	Set gtmtypes("shm_snapshot_t",485,"name")="shm_snapshot_t.shadow_file_header.n_bgmm_updates.cumul_count"
-	Set gtmtypes("shm_snapshot_t",485,"off")=8092
-	Set gtmtypes("shm_snapshot_t",485,"len")=4
-	Set gtmtypes("shm_snapshot_t",485,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bgmm_updates.cumul_count")=485
-	Set gtmtypes("shm_snapshot_t",486,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_writes"
-	Set gtmtypes("shm_snapshot_t",486,"off")=8096
-	Set gtmtypes("shm_snapshot_t",486,"len")=8
-	Set gtmtypes("shm_snapshot_t",486,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_writes")=486
-	Set gtmtypes("shm_snapshot_t",487,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_writes.curr_count"
-	Set gtmtypes("shm_snapshot_t",487,"off")=8096
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srch_clues.cumul_count")=484
+	Set gtmtypes("shm_snapshot_t",485,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_head"
+	Set gtmtypes("shm_snapshot_t",485,"off")=8048
+	Set gtmtypes("shm_snapshot_t",485,"len")=8
+	Set gtmtypes("shm_snapshot_t",485,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_head")=485
+	Set gtmtypes("shm_snapshot_t",486,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_head.curr_count"
+	Set gtmtypes("shm_snapshot_t",486,"off")=8048
+	Set gtmtypes("shm_snapshot_t",486,"len")=4
+	Set gtmtypes("shm_snapshot_t",486,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_head.curr_count")=486
+	Set gtmtypes("shm_snapshot_t",487,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_head.cumul_count"
+	Set gtmtypes("shm_snapshot_t",487,"off")=8052
 	Set gtmtypes("shm_snapshot_t",487,"len")=4
 	Set gtmtypes("shm_snapshot_t",487,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_writes.curr_count")=487
-	Set gtmtypes("shm_snapshot_t",488,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_writes.cumul_count"
-	Set gtmtypes("shm_snapshot_t",488,"off")=8100
-	Set gtmtypes("shm_snapshot_t",488,"len")=4
-	Set gtmtypes("shm_snapshot_t",488,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_writes.cumul_count")=488
-	Set gtmtypes("shm_snapshot_t",489,"name")="shm_snapshot_t.shadow_file_header.n_bg_update_creates"
-	Set gtmtypes("shm_snapshot_t",489,"off")=8104
-	Set gtmtypes("shm_snapshot_t",489,"len")=8
-	Set gtmtypes("shm_snapshot_t",489,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bg_update_creates")=489
-	Set gtmtypes("shm_snapshot_t",490,"name")="shm_snapshot_t.shadow_file_header.n_bg_update_creates.curr_count"
-	Set gtmtypes("shm_snapshot_t",490,"off")=8104
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_head.cumul_count")=487
+	Set gtmtypes("shm_snapshot_t",488,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_same"
+	Set gtmtypes("shm_snapshot_t",488,"off")=8056
+	Set gtmtypes("shm_snapshot_t",488,"len")=8
+	Set gtmtypes("shm_snapshot_t",488,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_same")=488
+	Set gtmtypes("shm_snapshot_t",489,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_same.curr_count"
+	Set gtmtypes("shm_snapshot_t",489,"off")=8056
+	Set gtmtypes("shm_snapshot_t",489,"len")=4
+	Set gtmtypes("shm_snapshot_t",489,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_same.curr_count")=489
+	Set gtmtypes("shm_snapshot_t",490,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_same.cumul_count"
+	Set gtmtypes("shm_snapshot_t",490,"off")=8060
 	Set gtmtypes("shm_snapshot_t",490,"len")=4
 	Set gtmtypes("shm_snapshot_t",490,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bg_update_creates.curr_count")=490
-	Set gtmtypes("shm_snapshot_t",491,"name")="shm_snapshot_t.shadow_file_header.n_bg_update_creates.cumul_count"
-	Set gtmtypes("shm_snapshot_t",491,"off")=8108
-	Set gtmtypes("shm_snapshot_t",491,"len")=4
-	Set gtmtypes("shm_snapshot_t",491,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bg_update_creates.cumul_count")=491
-	Set gtmtypes("shm_snapshot_t",492,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getns"
-	Set gtmtypes("shm_snapshot_t",492,"off")=8112
-	Set gtmtypes("shm_snapshot_t",492,"len")=8
-	Set gtmtypes("shm_snapshot_t",492,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getns")=492
-	Set gtmtypes("shm_snapshot_t",493,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getns.curr_count"
-	Set gtmtypes("shm_snapshot_t",493,"off")=8112
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_same.cumul_count")=490
+	Set gtmtypes("shm_snapshot_t",491,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_tail"
+	Set gtmtypes("shm_snapshot_t",491,"off")=8064
+	Set gtmtypes("shm_snapshot_t",491,"len")=8
+	Set gtmtypes("shm_snapshot_t",491,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_tail")=491
+	Set gtmtypes("shm_snapshot_t",492,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_tail.curr_count"
+	Set gtmtypes("shm_snapshot_t",492,"off")=8064
+	Set gtmtypes("shm_snapshot_t",492,"len")=4
+	Set gtmtypes("shm_snapshot_t",492,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_tail.curr_count")=492
+	Set gtmtypes("shm_snapshot_t",493,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_tail.cumul_count"
+	Set gtmtypes("shm_snapshot_t",493,"off")=8068
 	Set gtmtypes("shm_snapshot_t",493,"len")=4
 	Set gtmtypes("shm_snapshot_t",493,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getns.curr_count")=493
-	Set gtmtypes("shm_snapshot_t",494,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getns.cumul_count"
-	Set gtmtypes("shm_snapshot_t",494,"off")=8116
-	Set gtmtypes("shm_snapshot_t",494,"len")=4
-	Set gtmtypes("shm_snapshot_t",494,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getns.cumul_count")=494
-	Set gtmtypes("shm_snapshot_t",495,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getn_lcnt"
-	Set gtmtypes("shm_snapshot_t",495,"off")=8120
-	Set gtmtypes("shm_snapshot_t",495,"len")=8
-	Set gtmtypes("shm_snapshot_t",495,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getn_lcnt")=495
-	Set gtmtypes("shm_snapshot_t",496,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getn_lcnt.curr_count"
-	Set gtmtypes("shm_snapshot_t",496,"off")=8120
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_tail.cumul_count")=493
+	Set gtmtypes("shm_snapshot_t",494,"name")="shm_snapshot_t.shadow_file_header.n_t_qreads"
+	Set gtmtypes("shm_snapshot_t",494,"off")=8072
+	Set gtmtypes("shm_snapshot_t",494,"len")=8
+	Set gtmtypes("shm_snapshot_t",494,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_t_qreads")=494
+	Set gtmtypes("shm_snapshot_t",495,"name")="shm_snapshot_t.shadow_file_header.n_t_qreads.curr_count"
+	Set gtmtypes("shm_snapshot_t",495,"off")=8072
+	Set gtmtypes("shm_snapshot_t",495,"len")=4
+	Set gtmtypes("shm_snapshot_t",495,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_t_qreads.curr_count")=495
+	Set gtmtypes("shm_snapshot_t",496,"name")="shm_snapshot_t.shadow_file_header.n_t_qreads.cumul_count"
+	Set gtmtypes("shm_snapshot_t",496,"off")=8076
 	Set gtmtypes("shm_snapshot_t",496,"len")=4
 	Set gtmtypes("shm_snapshot_t",496,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getn_lcnt.curr_count")=496
-	Set gtmtypes("shm_snapshot_t",497,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getn_lcnt.cumul_count"
-	Set gtmtypes("shm_snapshot_t",497,"off")=8124
-	Set gtmtypes("shm_snapshot_t",497,"len")=4
-	Set gtmtypes("shm_snapshot_t",497,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getn_lcnt.cumul_count")=497
-	Set gtmtypes("shm_snapshot_t",498,"name")="shm_snapshot_t.shadow_file_header.db_csh_acct_rec_filler_4k"
-	Set gtmtypes("shm_snapshot_t",498,"off")=8128
-	Set gtmtypes("shm_snapshot_t",498,"len")=152
-	Set gtmtypes("shm_snapshot_t",498,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_acct_rec_filler_4k")=498
-	Set gtmtypes("shm_snapshot_t",499,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec"
-	Set gtmtypes("shm_snapshot_t",499,"off")=8280
-	Set gtmtypes("shm_snapshot_t",499,"len")=464
-	Set gtmtypes("shm_snapshot_t",499,"type")="gvstats_rec_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec")=499
-	Set gtmtypes("shm_snapshot_t",500,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_set"
-	Set gtmtypes("shm_snapshot_t",500,"off")=8280
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_t_qreads.cumul_count")=496
+	Set gtmtypes("shm_snapshot_t",497,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_reads"
+	Set gtmtypes("shm_snapshot_t",497,"off")=8080
+	Set gtmtypes("shm_snapshot_t",497,"len")=8
+	Set gtmtypes("shm_snapshot_t",497,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_reads")=497
+	Set gtmtypes("shm_snapshot_t",498,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_reads.curr_count"
+	Set gtmtypes("shm_snapshot_t",498,"off")=8080
+	Set gtmtypes("shm_snapshot_t",498,"len")=4
+	Set gtmtypes("shm_snapshot_t",498,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_reads.curr_count")=498
+	Set gtmtypes("shm_snapshot_t",499,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_reads.cumul_count"
+	Set gtmtypes("shm_snapshot_t",499,"off")=8084
+	Set gtmtypes("shm_snapshot_t",499,"len")=4
+	Set gtmtypes("shm_snapshot_t",499,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_reads.cumul_count")=499
+	Set gtmtypes("shm_snapshot_t",500,"name")="shm_snapshot_t.shadow_file_header.n_bgmm_updates"
+	Set gtmtypes("shm_snapshot_t",500,"off")=8088
 	Set gtmtypes("shm_snapshot_t",500,"len")=8
-	Set gtmtypes("shm_snapshot_t",500,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_set")=500
-	Set gtmtypes("shm_snapshot_t",501,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_kill"
-	Set gtmtypes("shm_snapshot_t",501,"off")=8288
-	Set gtmtypes("shm_snapshot_t",501,"len")=8
-	Set gtmtypes("shm_snapshot_t",501,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_kill")=501
-	Set gtmtypes("shm_snapshot_t",502,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_get"
-	Set gtmtypes("shm_snapshot_t",502,"off")=8296
-	Set gtmtypes("shm_snapshot_t",502,"len")=8
-	Set gtmtypes("shm_snapshot_t",502,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_get")=502
-	Set gtmtypes("shm_snapshot_t",503,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_data"
-	Set gtmtypes("shm_snapshot_t",503,"off")=8304
+	Set gtmtypes("shm_snapshot_t",500,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bgmm_updates")=500
+	Set gtmtypes("shm_snapshot_t",501,"name")="shm_snapshot_t.shadow_file_header.n_bgmm_updates.curr_count"
+	Set gtmtypes("shm_snapshot_t",501,"off")=8088
+	Set gtmtypes("shm_snapshot_t",501,"len")=4
+	Set gtmtypes("shm_snapshot_t",501,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bgmm_updates.curr_count")=501
+	Set gtmtypes("shm_snapshot_t",502,"name")="shm_snapshot_t.shadow_file_header.n_bgmm_updates.cumul_count"
+	Set gtmtypes("shm_snapshot_t",502,"off")=8092
+	Set gtmtypes("shm_snapshot_t",502,"len")=4
+	Set gtmtypes("shm_snapshot_t",502,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bgmm_updates.cumul_count")=502
+	Set gtmtypes("shm_snapshot_t",503,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_writes"
+	Set gtmtypes("shm_snapshot_t",503,"off")=8096
 	Set gtmtypes("shm_snapshot_t",503,"len")=8
-	Set gtmtypes("shm_snapshot_t",503,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_data")=503
-	Set gtmtypes("shm_snapshot_t",504,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_order"
-	Set gtmtypes("shm_snapshot_t",504,"off")=8312
-	Set gtmtypes("shm_snapshot_t",504,"len")=8
-	Set gtmtypes("shm_snapshot_t",504,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_order")=504
-	Set gtmtypes("shm_snapshot_t",505,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_zprev"
-	Set gtmtypes("shm_snapshot_t",505,"off")=8320
-	Set gtmtypes("shm_snapshot_t",505,"len")=8
-	Set gtmtypes("shm_snapshot_t",505,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_zprev")=505
-	Set gtmtypes("shm_snapshot_t",506,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_query"
-	Set gtmtypes("shm_snapshot_t",506,"off")=8328
+	Set gtmtypes("shm_snapshot_t",503,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_writes")=503
+	Set gtmtypes("shm_snapshot_t",504,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_writes.curr_count"
+	Set gtmtypes("shm_snapshot_t",504,"off")=8096
+	Set gtmtypes("shm_snapshot_t",504,"len")=4
+	Set gtmtypes("shm_snapshot_t",504,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_writes.curr_count")=504
+	Set gtmtypes("shm_snapshot_t",505,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_writes.cumul_count"
+	Set gtmtypes("shm_snapshot_t",505,"off")=8100
+	Set gtmtypes("shm_snapshot_t",505,"len")=4
+	Set gtmtypes("shm_snapshot_t",505,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_writes.cumul_count")=505
+	Set gtmtypes("shm_snapshot_t",506,"name")="shm_snapshot_t.shadow_file_header.n_bg_update_creates"
+	Set gtmtypes("shm_snapshot_t",506,"off")=8104
 	Set gtmtypes("shm_snapshot_t",506,"len")=8
-	Set gtmtypes("shm_snapshot_t",506,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_query")=506
-	Set gtmtypes("shm_snapshot_t",507,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_lock_success"
-	Set gtmtypes("shm_snapshot_t",507,"off")=8336
-	Set gtmtypes("shm_snapshot_t",507,"len")=8
-	Set gtmtypes("shm_snapshot_t",507,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_lock_success")=507
-	Set gtmtypes("shm_snapshot_t",508,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_lock_fail"
-	Set gtmtypes("shm_snapshot_t",508,"off")=8344
-	Set gtmtypes("shm_snapshot_t",508,"len")=8
-	Set gtmtypes("shm_snapshot_t",508,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_lock_fail")=508
-	Set gtmtypes("shm_snapshot_t",509,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.db_curr_tn"
-	Set gtmtypes("shm_snapshot_t",509,"off")=8352
+	Set gtmtypes("shm_snapshot_t",506,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bg_update_creates")=506
+	Set gtmtypes("shm_snapshot_t",507,"name")="shm_snapshot_t.shadow_file_header.n_bg_update_creates.curr_count"
+	Set gtmtypes("shm_snapshot_t",507,"off")=8104
+	Set gtmtypes("shm_snapshot_t",507,"len")=4
+	Set gtmtypes("shm_snapshot_t",507,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bg_update_creates.curr_count")=507
+	Set gtmtypes("shm_snapshot_t",508,"name")="shm_snapshot_t.shadow_file_header.n_bg_update_creates.cumul_count"
+	Set gtmtypes("shm_snapshot_t",508,"off")=8108
+	Set gtmtypes("shm_snapshot_t",508,"len")=4
+	Set gtmtypes("shm_snapshot_t",508,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bg_update_creates.cumul_count")=508
+	Set gtmtypes("shm_snapshot_t",509,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getns"
+	Set gtmtypes("shm_snapshot_t",509,"off")=8112
 	Set gtmtypes("shm_snapshot_t",509,"len")=8
-	Set gtmtypes("shm_snapshot_t",509,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.db_curr_tn")=509
-	Set gtmtypes("shm_snapshot_t",510,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_dsk_read"
-	Set gtmtypes("shm_snapshot_t",510,"off")=8360
-	Set gtmtypes("shm_snapshot_t",510,"len")=8
-	Set gtmtypes("shm_snapshot_t",510,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_dsk_read")=510
-	Set gtmtypes("shm_snapshot_t",511,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_dsk_write"
-	Set gtmtypes("shm_snapshot_t",511,"off")=8368
-	Set gtmtypes("shm_snapshot_t",511,"len")=8
-	Set gtmtypes("shm_snapshot_t",511,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_dsk_write")=511
-	Set gtmtypes("shm_snapshot_t",512,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_readwrite"
-	Set gtmtypes("shm_snapshot_t",512,"off")=8376
+	Set gtmtypes("shm_snapshot_t",509,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getns")=509
+	Set gtmtypes("shm_snapshot_t",510,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getns.curr_count"
+	Set gtmtypes("shm_snapshot_t",510,"off")=8112
+	Set gtmtypes("shm_snapshot_t",510,"len")=4
+	Set gtmtypes("shm_snapshot_t",510,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getns.curr_count")=510
+	Set gtmtypes("shm_snapshot_t",511,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getns.cumul_count"
+	Set gtmtypes("shm_snapshot_t",511,"off")=8116
+	Set gtmtypes("shm_snapshot_t",511,"len")=4
+	Set gtmtypes("shm_snapshot_t",511,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getns.cumul_count")=511
+	Set gtmtypes("shm_snapshot_t",512,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getn_lcnt"
+	Set gtmtypes("shm_snapshot_t",512,"off")=8120
 	Set gtmtypes("shm_snapshot_t",512,"len")=8
-	Set gtmtypes("shm_snapshot_t",512,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_readwrite")=512
-	Set gtmtypes("shm_snapshot_t",513,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_readonly"
-	Set gtmtypes("shm_snapshot_t",513,"off")=8384
-	Set gtmtypes("shm_snapshot_t",513,"len")=8
-	Set gtmtypes("shm_snapshot_t",513,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_readonly")=513
-	Set gtmtypes("shm_snapshot_t",514,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_blkwrite"
-	Set gtmtypes("shm_snapshot_t",514,"off")=8392
-	Set gtmtypes("shm_snapshot_t",514,"len")=8
-	Set gtmtypes("shm_snapshot_t",514,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_blkwrite")=514
-	Set gtmtypes("shm_snapshot_t",515,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_blkread"
-	Set gtmtypes("shm_snapshot_t",515,"off")=8400
-	Set gtmtypes("shm_snapshot_t",515,"len")=8
-	Set gtmtypes("shm_snapshot_t",515,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_blkread")=515
-	Set gtmtypes("shm_snapshot_t",516,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_retries_0"
-	Set gtmtypes("shm_snapshot_t",516,"off")=8408
-	Set gtmtypes("shm_snapshot_t",516,"len")=8
-	Set gtmtypes("shm_snapshot_t",516,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_retries_0")=516
-	Set gtmtypes("shm_snapshot_t",517,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_retries_1"
-	Set gtmtypes("shm_snapshot_t",517,"off")=8416
+	Set gtmtypes("shm_snapshot_t",512,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getn_lcnt")=512
+	Set gtmtypes("shm_snapshot_t",513,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getn_lcnt.curr_count"
+	Set gtmtypes("shm_snapshot_t",513,"off")=8120
+	Set gtmtypes("shm_snapshot_t",513,"len")=4
+	Set gtmtypes("shm_snapshot_t",513,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getn_lcnt.curr_count")=513
+	Set gtmtypes("shm_snapshot_t",514,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getn_lcnt.cumul_count"
+	Set gtmtypes("shm_snapshot_t",514,"off")=8124
+	Set gtmtypes("shm_snapshot_t",514,"len")=4
+	Set gtmtypes("shm_snapshot_t",514,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getn_lcnt.cumul_count")=514
+	Set gtmtypes("shm_snapshot_t",515,"name")="shm_snapshot_t.shadow_file_header.db_csh_acct_rec_filler_4k"
+	Set gtmtypes("shm_snapshot_t",515,"off")=8128
+	Set gtmtypes("shm_snapshot_t",515,"len")=152
+	Set gtmtypes("shm_snapshot_t",515,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_acct_rec_filler_4k")=515
+	Set gtmtypes("shm_snapshot_t",516,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec"
+	Set gtmtypes("shm_snapshot_t",516,"off")=8280
+	Set gtmtypes("shm_snapshot_t",516,"len")=472
+	Set gtmtypes("shm_snapshot_t",516,"type")="gvstats_rec_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec")=516
+	Set gtmtypes("shm_snapshot_t",517,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_set"
+	Set gtmtypes("shm_snapshot_t",517,"off")=8280
 	Set gtmtypes("shm_snapshot_t",517,"len")=8
 	Set gtmtypes("shm_snapshot_t",517,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_retries_1")=517
-	Set gtmtypes("shm_snapshot_t",518,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_retries_2"
-	Set gtmtypes("shm_snapshot_t",518,"off")=8424
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_set")=517
+	Set gtmtypes("shm_snapshot_t",518,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_kill"
+	Set gtmtypes("shm_snapshot_t",518,"off")=8288
 	Set gtmtypes("shm_snapshot_t",518,"len")=8
 	Set gtmtypes("shm_snapshot_t",518,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_retries_2")=518
-	Set gtmtypes("shm_snapshot_t",519,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_retries_3"
-	Set gtmtypes("shm_snapshot_t",519,"off")=8432
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_kill")=518
+	Set gtmtypes("shm_snapshot_t",519,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_get"
+	Set gtmtypes("shm_snapshot_t",519,"off")=8296
 	Set gtmtypes("shm_snapshot_t",519,"len")=8
 	Set gtmtypes("shm_snapshot_t",519,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_retries_3")=519
-	Set gtmtypes("shm_snapshot_t",520,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_readwrite"
-	Set gtmtypes("shm_snapshot_t",520,"off")=8440
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_get")=519
+	Set gtmtypes("shm_snapshot_t",520,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_data"
+	Set gtmtypes("shm_snapshot_t",520,"off")=8304
 	Set gtmtypes("shm_snapshot_t",520,"len")=8
 	Set gtmtypes("shm_snapshot_t",520,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_readwrite")=520
-	Set gtmtypes("shm_snapshot_t",521,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_readonly"
-	Set gtmtypes("shm_snapshot_t",521,"off")=8448
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_data")=520
+	Set gtmtypes("shm_snapshot_t",521,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_order"
+	Set gtmtypes("shm_snapshot_t",521,"off")=8312
 	Set gtmtypes("shm_snapshot_t",521,"len")=8
 	Set gtmtypes("shm_snapshot_t",521,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_readonly")=521
-	Set gtmtypes("shm_snapshot_t",522,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_rolledback"
-	Set gtmtypes("shm_snapshot_t",522,"off")=8456
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_order")=521
+	Set gtmtypes("shm_snapshot_t",522,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_zprev"
+	Set gtmtypes("shm_snapshot_t",522,"off")=8320
 	Set gtmtypes("shm_snapshot_t",522,"len")=8
 	Set gtmtypes("shm_snapshot_t",522,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_rolledback")=522
-	Set gtmtypes("shm_snapshot_t",523,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_blkwrite"
-	Set gtmtypes("shm_snapshot_t",523,"off")=8464
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_zprev")=522
+	Set gtmtypes("shm_snapshot_t",523,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_query"
+	Set gtmtypes("shm_snapshot_t",523,"off")=8328
 	Set gtmtypes("shm_snapshot_t",523,"len")=8
 	Set gtmtypes("shm_snapshot_t",523,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_blkwrite")=523
-	Set gtmtypes("shm_snapshot_t",524,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_blkread"
-	Set gtmtypes("shm_snapshot_t",524,"off")=8472
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_query")=523
+	Set gtmtypes("shm_snapshot_t",524,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_lock_success"
+	Set gtmtypes("shm_snapshot_t",524,"off")=8336
 	Set gtmtypes("shm_snapshot_t",524,"len")=8
 	Set gtmtypes("shm_snapshot_t",524,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_blkread")=524
-	Set gtmtypes("shm_snapshot_t",525,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_tot_retries_0"
-	Set gtmtypes("shm_snapshot_t",525,"off")=8480
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_lock_success")=524
+	Set gtmtypes("shm_snapshot_t",525,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_lock_fail"
+	Set gtmtypes("shm_snapshot_t",525,"off")=8344
 	Set gtmtypes("shm_snapshot_t",525,"len")=8
 	Set gtmtypes("shm_snapshot_t",525,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_tot_retries_0")=525
-	Set gtmtypes("shm_snapshot_t",526,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_tot_retries_1"
-	Set gtmtypes("shm_snapshot_t",526,"off")=8488
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_lock_fail")=525
+	Set gtmtypes("shm_snapshot_t",526,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.db_curr_tn"
+	Set gtmtypes("shm_snapshot_t",526,"off")=8352
 	Set gtmtypes("shm_snapshot_t",526,"len")=8
 	Set gtmtypes("shm_snapshot_t",526,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_tot_retries_1")=526
-	Set gtmtypes("shm_snapshot_t",527,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_tot_retries_2"
-	Set gtmtypes("shm_snapshot_t",527,"off")=8496
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.db_curr_tn")=526
+	Set gtmtypes("shm_snapshot_t",527,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_dsk_read"
+	Set gtmtypes("shm_snapshot_t",527,"off")=8360
 	Set gtmtypes("shm_snapshot_t",527,"len")=8
 	Set gtmtypes("shm_snapshot_t",527,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_tot_retries_2")=527
-	Set gtmtypes("shm_snapshot_t",528,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_tot_retries_3"
-	Set gtmtypes("shm_snapshot_t",528,"off")=8504
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_dsk_read")=527
+	Set gtmtypes("shm_snapshot_t",528,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_dsk_write"
+	Set gtmtypes("shm_snapshot_t",528,"off")=8368
 	Set gtmtypes("shm_snapshot_t",528,"len")=8
 	Set gtmtypes("shm_snapshot_t",528,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_tot_retries_3")=528
-	Set gtmtypes("shm_snapshot_t",529,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_tot_retries_4"
-	Set gtmtypes("shm_snapshot_t",529,"off")=8512
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_dsk_write")=528
+	Set gtmtypes("shm_snapshot_t",529,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_readwrite"
+	Set gtmtypes("shm_snapshot_t",529,"off")=8376
 	Set gtmtypes("shm_snapshot_t",529,"len")=8
 	Set gtmtypes("shm_snapshot_t",529,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_tot_retries_4")=529
-	Set gtmtypes("shm_snapshot_t",530,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_0"
-	Set gtmtypes("shm_snapshot_t",530,"off")=8520
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_readwrite")=529
+	Set gtmtypes("shm_snapshot_t",530,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_readonly"
+	Set gtmtypes("shm_snapshot_t",530,"off")=8384
 	Set gtmtypes("shm_snapshot_t",530,"len")=8
 	Set gtmtypes("shm_snapshot_t",530,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_0")=530
-	Set gtmtypes("shm_snapshot_t",531,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_1"
-	Set gtmtypes("shm_snapshot_t",531,"off")=8528
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_readonly")=530
+	Set gtmtypes("shm_snapshot_t",531,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_blkwrite"
+	Set gtmtypes("shm_snapshot_t",531,"off")=8392
 	Set gtmtypes("shm_snapshot_t",531,"len")=8
 	Set gtmtypes("shm_snapshot_t",531,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_1")=531
-	Set gtmtypes("shm_snapshot_t",532,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_2"
-	Set gtmtypes("shm_snapshot_t",532,"off")=8536
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_blkwrite")=531
+	Set gtmtypes("shm_snapshot_t",532,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_blkread"
+	Set gtmtypes("shm_snapshot_t",532,"off")=8400
 	Set gtmtypes("shm_snapshot_t",532,"len")=8
 	Set gtmtypes("shm_snapshot_t",532,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_2")=532
-	Set gtmtypes("shm_snapshot_t",533,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_3"
-	Set gtmtypes("shm_snapshot_t",533,"off")=8544
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_blkread")=532
+	Set gtmtypes("shm_snapshot_t",533,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_retries_0"
+	Set gtmtypes("shm_snapshot_t",533,"off")=8408
 	Set gtmtypes("shm_snapshot_t",533,"len")=8
 	Set gtmtypes("shm_snapshot_t",533,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_3")=533
-	Set gtmtypes("shm_snapshot_t",534,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_4"
-	Set gtmtypes("shm_snapshot_t",534,"off")=8552
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_retries_0")=533
+	Set gtmtypes("shm_snapshot_t",534,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_retries_1"
+	Set gtmtypes("shm_snapshot_t",534,"off")=8416
 	Set gtmtypes("shm_snapshot_t",534,"len")=8
 	Set gtmtypes("shm_snapshot_t",534,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_4")=534
-	Set gtmtypes("shm_snapshot_t",535,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_ztrigger"
-	Set gtmtypes("shm_snapshot_t",535,"off")=8560
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_retries_1")=534
+	Set gtmtypes("shm_snapshot_t",535,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_retries_2"
+	Set gtmtypes("shm_snapshot_t",535,"off")=8424
 	Set gtmtypes("shm_snapshot_t",535,"len")=8
 	Set gtmtypes("shm_snapshot_t",535,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_ztrigger")=535
-	Set gtmtypes("shm_snapshot_t",536,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_db_flush"
-	Set gtmtypes("shm_snapshot_t",536,"off")=8568
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_retries_2")=535
+	Set gtmtypes("shm_snapshot_t",536,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_retries_3"
+	Set gtmtypes("shm_snapshot_t",536,"off")=8432
 	Set gtmtypes("shm_snapshot_t",536,"len")=8
 	Set gtmtypes("shm_snapshot_t",536,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_db_flush")=536
-	Set gtmtypes("shm_snapshot_t",537,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_db_fsync"
-	Set gtmtypes("shm_snapshot_t",537,"off")=8576
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_retries_3")=536
+	Set gtmtypes("shm_snapshot_t",537,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_readwrite"
+	Set gtmtypes("shm_snapshot_t",537,"off")=8440
 	Set gtmtypes("shm_snapshot_t",537,"len")=8
 	Set gtmtypes("shm_snapshot_t",537,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_db_fsync")=537
-	Set gtmtypes("shm_snapshot_t",538,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jnl_flush"
-	Set gtmtypes("shm_snapshot_t",538,"off")=8584
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_readwrite")=537
+	Set gtmtypes("shm_snapshot_t",538,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_readonly"
+	Set gtmtypes("shm_snapshot_t",538,"off")=8448
 	Set gtmtypes("shm_snapshot_t",538,"len")=8
 	Set gtmtypes("shm_snapshot_t",538,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jnl_flush")=538
-	Set gtmtypes("shm_snapshot_t",539,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jnl_fsync"
-	Set gtmtypes("shm_snapshot_t",539,"off")=8592
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_readonly")=538
+	Set gtmtypes("shm_snapshot_t",539,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_rolledback"
+	Set gtmtypes("shm_snapshot_t",539,"off")=8456
 	Set gtmtypes("shm_snapshot_t",539,"len")=8
 	Set gtmtypes("shm_snapshot_t",539,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jnl_fsync")=539
-	Set gtmtypes("shm_snapshot_t",540,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jbuff_bytes"
-	Set gtmtypes("shm_snapshot_t",540,"off")=8600
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_rolledback")=539
+	Set gtmtypes("shm_snapshot_t",540,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_blkwrite"
+	Set gtmtypes("shm_snapshot_t",540,"off")=8464
 	Set gtmtypes("shm_snapshot_t",540,"len")=8
 	Set gtmtypes("shm_snapshot_t",540,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jbuff_bytes")=540
-	Set gtmtypes("shm_snapshot_t",541,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jfile_bytes"
-	Set gtmtypes("shm_snapshot_t",541,"off")=8608
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_blkwrite")=540
+	Set gtmtypes("shm_snapshot_t",541,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_blkread"
+	Set gtmtypes("shm_snapshot_t",541,"off")=8472
 	Set gtmtypes("shm_snapshot_t",541,"len")=8
 	Set gtmtypes("shm_snapshot_t",541,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jfile_bytes")=541
-	Set gtmtypes("shm_snapshot_t",542,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jfile_writes"
-	Set gtmtypes("shm_snapshot_t",542,"off")=8616
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_blkread")=541
+	Set gtmtypes("shm_snapshot_t",542,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_tot_retries_0"
+	Set gtmtypes("shm_snapshot_t",542,"off")=8480
 	Set gtmtypes("shm_snapshot_t",542,"len")=8
 	Set gtmtypes("shm_snapshot_t",542,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jfile_writes")=542
-	Set gtmtypes("shm_snapshot_t",543,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jrec_logical"
-	Set gtmtypes("shm_snapshot_t",543,"off")=8624
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_tot_retries_0")=542
+	Set gtmtypes("shm_snapshot_t",543,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_tot_retries_1"
+	Set gtmtypes("shm_snapshot_t",543,"off")=8488
 	Set gtmtypes("shm_snapshot_t",543,"len")=8
 	Set gtmtypes("shm_snapshot_t",543,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jrec_logical")=543
-	Set gtmtypes("shm_snapshot_t",544,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jrec_pblk"
-	Set gtmtypes("shm_snapshot_t",544,"off")=8632
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_tot_retries_1")=543
+	Set gtmtypes("shm_snapshot_t",544,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_tot_retries_2"
+	Set gtmtypes("shm_snapshot_t",544,"off")=8496
 	Set gtmtypes("shm_snapshot_t",544,"len")=8
 	Set gtmtypes("shm_snapshot_t",544,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jrec_pblk")=544
-	Set gtmtypes("shm_snapshot_t",545,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jrec_epoch_regular"
-	Set gtmtypes("shm_snapshot_t",545,"off")=8640
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_tot_retries_2")=544
+	Set gtmtypes("shm_snapshot_t",545,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_tot_retries_3"
+	Set gtmtypes("shm_snapshot_t",545,"off")=8504
 	Set gtmtypes("shm_snapshot_t",545,"len")=8
 	Set gtmtypes("shm_snapshot_t",545,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jrec_epoch_regular")=545
-	Set gtmtypes("shm_snapshot_t",546,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jrec_epoch_idle"
-	Set gtmtypes("shm_snapshot_t",546,"off")=8648
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_tot_retries_3")=545
+	Set gtmtypes("shm_snapshot_t",546,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_tot_retries_4"
+	Set gtmtypes("shm_snapshot_t",546,"off")=8512
 	Set gtmtypes("shm_snapshot_t",546,"len")=8
 	Set gtmtypes("shm_snapshot_t",546,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jrec_epoch_idle")=546
-	Set gtmtypes("shm_snapshot_t",547,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jrec_other"
-	Set gtmtypes("shm_snapshot_t",547,"off")=8656
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_tot_retries_4")=546
+	Set gtmtypes("shm_snapshot_t",547,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_0"
+	Set gtmtypes("shm_snapshot_t",547,"off")=8520
 	Set gtmtypes("shm_snapshot_t",547,"len")=8
 	Set gtmtypes("shm_snapshot_t",547,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jrec_other")=547
-	Set gtmtypes("shm_snapshot_t",548,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jnl_extends"
-	Set gtmtypes("shm_snapshot_t",548,"off")=8664
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_0")=547
+	Set gtmtypes("shm_snapshot_t",548,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_1"
+	Set gtmtypes("shm_snapshot_t",548,"off")=8528
 	Set gtmtypes("shm_snapshot_t",548,"len")=8
 	Set gtmtypes("shm_snapshot_t",548,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jnl_extends")=548
-	Set gtmtypes("shm_snapshot_t",549,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_db_extends"
-	Set gtmtypes("shm_snapshot_t",549,"off")=8672
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_1")=548
+	Set gtmtypes("shm_snapshot_t",549,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_2"
+	Set gtmtypes("shm_snapshot_t",549,"off")=8536
 	Set gtmtypes("shm_snapshot_t",549,"len")=8
 	Set gtmtypes("shm_snapshot_t",549,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_db_extends")=549
-	Set gtmtypes("shm_snapshot_t",550,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_crit_success"
-	Set gtmtypes("shm_snapshot_t",550,"off")=8680
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_2")=549
+	Set gtmtypes("shm_snapshot_t",550,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_3"
+	Set gtmtypes("shm_snapshot_t",550,"off")=8544
 	Set gtmtypes("shm_snapshot_t",550,"len")=8
 	Set gtmtypes("shm_snapshot_t",550,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_crit_success")=550
-	Set gtmtypes("shm_snapshot_t",551,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_crits_in_epch"
-	Set gtmtypes("shm_snapshot_t",551,"off")=8688
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_3")=550
+	Set gtmtypes("shm_snapshot_t",551,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_4"
+	Set gtmtypes("shm_snapshot_t",551,"off")=8552
 	Set gtmtypes("shm_snapshot_t",551,"len")=8
 	Set gtmtypes("shm_snapshot_t",551,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_crits_in_epch")=551
-	Set gtmtypes("shm_snapshot_t",552,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.sq_crit_failed"
-	Set gtmtypes("shm_snapshot_t",552,"off")=8696
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_4")=551
+	Set gtmtypes("shm_snapshot_t",552,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_ztrigger"
+	Set gtmtypes("shm_snapshot_t",552,"off")=8560
 	Set gtmtypes("shm_snapshot_t",552,"len")=8
 	Set gtmtypes("shm_snapshot_t",552,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.sq_crit_failed")=552
-	Set gtmtypes("shm_snapshot_t",553,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_crit_failed"
-	Set gtmtypes("shm_snapshot_t",553,"off")=8704
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_ztrigger")=552
+	Set gtmtypes("shm_snapshot_t",553,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_db_flush"
+	Set gtmtypes("shm_snapshot_t",553,"off")=8568
 	Set gtmtypes("shm_snapshot_t",553,"len")=8
 	Set gtmtypes("shm_snapshot_t",553,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_crit_failed")=553
-	Set gtmtypes("shm_snapshot_t",554,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.sq_crit_que_slps"
-	Set gtmtypes("shm_snapshot_t",554,"off")=8712
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_db_flush")=553
+	Set gtmtypes("shm_snapshot_t",554,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_db_fsync"
+	Set gtmtypes("shm_snapshot_t",554,"off")=8576
 	Set gtmtypes("shm_snapshot_t",554,"len")=8
 	Set gtmtypes("shm_snapshot_t",554,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.sq_crit_que_slps")=554
-	Set gtmtypes("shm_snapshot_t",555,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_crit_que_slps"
-	Set gtmtypes("shm_snapshot_t",555,"off")=8720
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_db_fsync")=554
+	Set gtmtypes("shm_snapshot_t",555,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jnl_flush"
+	Set gtmtypes("shm_snapshot_t",555,"off")=8584
 	Set gtmtypes("shm_snapshot_t",555,"len")=8
 	Set gtmtypes("shm_snapshot_t",555,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_crit_que_slps")=555
-	Set gtmtypes("shm_snapshot_t",556,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.sq_crit_yields"
-	Set gtmtypes("shm_snapshot_t",556,"off")=8728
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jnl_flush")=555
+	Set gtmtypes("shm_snapshot_t",556,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jnl_fsync"
+	Set gtmtypes("shm_snapshot_t",556,"off")=8592
 	Set gtmtypes("shm_snapshot_t",556,"len")=8
 	Set gtmtypes("shm_snapshot_t",556,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.sq_crit_yields")=556
-	Set gtmtypes("shm_snapshot_t",557,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_crit_yields"
-	Set gtmtypes("shm_snapshot_t",557,"off")=8736
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jnl_fsync")=556
+	Set gtmtypes("shm_snapshot_t",557,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jbuff_bytes"
+	Set gtmtypes("shm_snapshot_t",557,"off")=8600
 	Set gtmtypes("shm_snapshot_t",557,"len")=8
 	Set gtmtypes("shm_snapshot_t",557,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_crit_yields")=557
-	Set gtmtypes("shm_snapshot_t",558,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec_filler_4k_plus_512"
-	Set gtmtypes("shm_snapshot_t",558,"off")=8744
-	Set gtmtypes("shm_snapshot_t",558,"len")=48
-	Set gtmtypes("shm_snapshot_t",558,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec_filler_4k_plus_512")=558
-	Set gtmtypes("shm_snapshot_t",559,"name")="shm_snapshot_t.shadow_file_header.filler_4k_plus_512"
-	Set gtmtypes("shm_snapshot_t",559,"off")=8792
-	Set gtmtypes("shm_snapshot_t",559,"len")=368
-	Set gtmtypes("shm_snapshot_t",559,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_4k_plus_512")=559
-	Set gtmtypes("shm_snapshot_t",560,"name")="shm_snapshot_t.shadow_file_header.intrpt_recov_resync_strm_seqno"
-	Set gtmtypes("shm_snapshot_t",560,"off")=9160
-	Set gtmtypes("shm_snapshot_t",560,"len")=128
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jbuff_bytes")=557
+	Set gtmtypes("shm_snapshot_t",558,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jfile_bytes"
+	Set gtmtypes("shm_snapshot_t",558,"off")=8608
+	Set gtmtypes("shm_snapshot_t",558,"len")=8
+	Set gtmtypes("shm_snapshot_t",558,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jfile_bytes")=558
+	Set gtmtypes("shm_snapshot_t",559,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jfile_writes"
+	Set gtmtypes("shm_snapshot_t",559,"off")=8616
+	Set gtmtypes("shm_snapshot_t",559,"len")=8
+	Set gtmtypes("shm_snapshot_t",559,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jfile_writes")=559
+	Set gtmtypes("shm_snapshot_t",560,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jrec_logical"
+	Set gtmtypes("shm_snapshot_t",560,"off")=8624
+	Set gtmtypes("shm_snapshot_t",560,"len")=8
 	Set gtmtypes("shm_snapshot_t",560,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.intrpt_recov_resync_strm_seqno")=560
-	Set gtmtypes("shm_snapshot_t",560,"dim")=16
-	Set gtmtypes("shm_snapshot_t",561,"name")="shm_snapshot_t.shadow_file_header.creation_db_ver"
-	Set gtmtypes("shm_snapshot_t",561,"off")=9288
-	Set gtmtypes("shm_snapshot_t",561,"len")=4
-	Set gtmtypes("shm_snapshot_t",561,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.creation_db_ver")=561
-	Set gtmtypes("shm_snapshot_t",562,"name")="shm_snapshot_t.shadow_file_header.creation_mdb_ver"
-	Set gtmtypes("shm_snapshot_t",562,"off")=9292
-	Set gtmtypes("shm_snapshot_t",562,"len")=4
-	Set gtmtypes("shm_snapshot_t",562,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.creation_mdb_ver")=562
-	Set gtmtypes("shm_snapshot_t",563,"name")="shm_snapshot_t.shadow_file_header.certified_for_upgrade_to"
-	Set gtmtypes("shm_snapshot_t",563,"off")=9296
-	Set gtmtypes("shm_snapshot_t",563,"len")=4
-	Set gtmtypes("shm_snapshot_t",563,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.certified_for_upgrade_to")=563
-	Set gtmtypes("shm_snapshot_t",564,"name")="shm_snapshot_t.shadow_file_header.filler_5k"
-	Set gtmtypes("shm_snapshot_t",564,"off")=9300
-	Set gtmtypes("shm_snapshot_t",564,"len")=4
-	Set gtmtypes("shm_snapshot_t",564,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_5k")=564
-	Set gtmtypes("shm_snapshot_t",565,"name")="shm_snapshot_t.shadow_file_header.secshr_ops_index_filler"
-	Set gtmtypes("shm_snapshot_t",565,"off")=9304
-	Set gtmtypes("shm_snapshot_t",565,"len")=4
-	Set gtmtypes("shm_snapshot_t",565,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.secshr_ops_index_filler")=565
-	Set gtmtypes("shm_snapshot_t",566,"name")="shm_snapshot_t.shadow_file_header.secshr_ops_array_filler"
-	Set gtmtypes("shm_snapshot_t",566,"off")=9308
-	Set gtmtypes("shm_snapshot_t",566,"len")=1020
-	Set gtmtypes("shm_snapshot_t",566,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.secshr_ops_array_filler")=566
-	Set gtmtypes("shm_snapshot_t",566,"dim")=255
-	Set gtmtypes("shm_snapshot_t",567,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn"
-	Set gtmtypes("shm_snapshot_t",567,"off")=10328
-	Set gtmtypes("shm_snapshot_t",567,"len")=24
-	Set gtmtypes("shm_snapshot_t",567,"type")="compswap_time_field"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn")=567
-	Set gtmtypes("shm_snapshot_t",568,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch"
-	Set gtmtypes("shm_snapshot_t",568,"off")=10328
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jrec_logical")=560
+	Set gtmtypes("shm_snapshot_t",561,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jrec_pblk"
+	Set gtmtypes("shm_snapshot_t",561,"off")=8632
+	Set gtmtypes("shm_snapshot_t",561,"len")=8
+	Set gtmtypes("shm_snapshot_t",561,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jrec_pblk")=561
+	Set gtmtypes("shm_snapshot_t",562,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jrec_epoch_regular"
+	Set gtmtypes("shm_snapshot_t",562,"off")=8640
+	Set gtmtypes("shm_snapshot_t",562,"len")=8
+	Set gtmtypes("shm_snapshot_t",562,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jrec_epoch_regular")=562
+	Set gtmtypes("shm_snapshot_t",563,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jrec_epoch_idle"
+	Set gtmtypes("shm_snapshot_t",563,"off")=8648
+	Set gtmtypes("shm_snapshot_t",563,"len")=8
+	Set gtmtypes("shm_snapshot_t",563,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jrec_epoch_idle")=563
+	Set gtmtypes("shm_snapshot_t",564,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jrec_other"
+	Set gtmtypes("shm_snapshot_t",564,"off")=8656
+	Set gtmtypes("shm_snapshot_t",564,"len")=8
+	Set gtmtypes("shm_snapshot_t",564,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jrec_other")=564
+	Set gtmtypes("shm_snapshot_t",565,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jnl_extends"
+	Set gtmtypes("shm_snapshot_t",565,"off")=8664
+	Set gtmtypes("shm_snapshot_t",565,"len")=8
+	Set gtmtypes("shm_snapshot_t",565,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jnl_extends")=565
+	Set gtmtypes("shm_snapshot_t",566,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_db_extends"
+	Set gtmtypes("shm_snapshot_t",566,"off")=8672
+	Set gtmtypes("shm_snapshot_t",566,"len")=8
+	Set gtmtypes("shm_snapshot_t",566,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_db_extends")=566
+	Set gtmtypes("shm_snapshot_t",567,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_crit_success"
+	Set gtmtypes("shm_snapshot_t",567,"off")=8680
+	Set gtmtypes("shm_snapshot_t",567,"len")=8
+	Set gtmtypes("shm_snapshot_t",567,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_crit_success")=567
+	Set gtmtypes("shm_snapshot_t",568,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_crits_in_epch"
+	Set gtmtypes("shm_snapshot_t",568,"off")=8688
 	Set gtmtypes("shm_snapshot_t",568,"len")=8
-	Set gtmtypes("shm_snapshot_t",568,"type")="global_latch_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch")=568
-	Set gtmtypes("shm_snapshot_t",569,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch.u"
-	Set gtmtypes("shm_snapshot_t",569,"off")=10328
+	Set gtmtypes("shm_snapshot_t",568,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_crits_in_epch")=568
+	Set gtmtypes("shm_snapshot_t",569,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.sq_crit_failed"
+	Set gtmtypes("shm_snapshot_t",569,"off")=8696
 	Set gtmtypes("shm_snapshot_t",569,"len")=8
-	Set gtmtypes("shm_snapshot_t",569,"type")="union"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch.u")=569
-	Set gtmtypes("shm_snapshot_t",570,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch.u.pid_imgcnt"
-	Set gtmtypes("shm_snapshot_t",570,"off")=10328
+	Set gtmtypes("shm_snapshot_t",569,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.sq_crit_failed")=569
+	Set gtmtypes("shm_snapshot_t",570,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_crit_failed"
+	Set gtmtypes("shm_snapshot_t",570,"off")=8704
 	Set gtmtypes("shm_snapshot_t",570,"len")=8
 	Set gtmtypes("shm_snapshot_t",570,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch.u.pid_imgcnt")=570
-	Set gtmtypes("shm_snapshot_t",571,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch.u.parts"
-	Set gtmtypes("shm_snapshot_t",571,"off")=10328
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_crit_failed")=570
+	Set gtmtypes("shm_snapshot_t",571,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.sq_crit_que_slps"
+	Set gtmtypes("shm_snapshot_t",571,"off")=8712
 	Set gtmtypes("shm_snapshot_t",571,"len")=8
-	Set gtmtypes("shm_snapshot_t",571,"type")="struct"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch.u.parts")=571
-	Set gtmtypes("shm_snapshot_t",572,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_pid"
-	Set gtmtypes("shm_snapshot_t",572,"off")=10328
-	Set gtmtypes("shm_snapshot_t",572,"len")=4
-	Set gtmtypes("shm_snapshot_t",572,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_pid")=572
-	Set gtmtypes("shm_snapshot_t",573,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_word"
-	Set gtmtypes("shm_snapshot_t",573,"off")=10332
-	Set gtmtypes("shm_snapshot_t",573,"len")=4
-	Set gtmtypes("shm_snapshot_t",573,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_word")=573
-	Set gtmtypes("shm_snapshot_t",574,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.hp_latch_space"
-	Set gtmtypes("shm_snapshot_t",574,"off")=10336
-	Set gtmtypes("shm_snapshot_t",574,"len")=16
-	Set gtmtypes("shm_snapshot_t",574,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.hp_latch_space")=574
-	Set gtmtypes("shm_snapshot_t",574,"dim")=4
-	Set gtmtypes("shm_snapshot_t",575,"name")="shm_snapshot_t.shadow_file_header.is_encrypted"
-	Set gtmtypes("shm_snapshot_t",575,"off")=10352
-	Set gtmtypes("shm_snapshot_t",575,"len")=4
-	Set gtmtypes("shm_snapshot_t",575,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.is_encrypted")=575
-	Set gtmtypes("shm_snapshot_t",576,"name")="shm_snapshot_t.shadow_file_header.db_trigger_cycle"
-	Set gtmtypes("shm_snapshot_t",576,"off")=10356
-	Set gtmtypes("shm_snapshot_t",576,"len")=4
-	Set gtmtypes("shm_snapshot_t",576,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_trigger_cycle")=576
-	Set gtmtypes("shm_snapshot_t",577,"name")="shm_snapshot_t.shadow_file_header.strm_reg_seqno"
-	Set gtmtypes("shm_snapshot_t",577,"off")=10360
-	Set gtmtypes("shm_snapshot_t",577,"len")=128
-	Set gtmtypes("shm_snapshot_t",577,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.strm_reg_seqno")=577
-	Set gtmtypes("shm_snapshot_t",577,"dim")=16
-	Set gtmtypes("shm_snapshot_t",578,"name")="shm_snapshot_t.shadow_file_header.save_strm_reg_seqno"
-	Set gtmtypes("shm_snapshot_t",578,"off")=10488
+	Set gtmtypes("shm_snapshot_t",571,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.sq_crit_que_slps")=571
+	Set gtmtypes("shm_snapshot_t",572,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_crit_que_slps"
+	Set gtmtypes("shm_snapshot_t",572,"off")=8720
+	Set gtmtypes("shm_snapshot_t",572,"len")=8
+	Set gtmtypes("shm_snapshot_t",572,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_crit_que_slps")=572
+	Set gtmtypes("shm_snapshot_t",573,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.sq_crit_yields"
+	Set gtmtypes("shm_snapshot_t",573,"off")=8728
+	Set gtmtypes("shm_snapshot_t",573,"len")=8
+	Set gtmtypes("shm_snapshot_t",573,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.sq_crit_yields")=573
+	Set gtmtypes("shm_snapshot_t",574,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_crit_yields"
+	Set gtmtypes("shm_snapshot_t",574,"off")=8736
+	Set gtmtypes("shm_snapshot_t",574,"len")=8
+	Set gtmtypes("shm_snapshot_t",574,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_crit_yields")=574
+	Set gtmtypes("shm_snapshot_t",575,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_clean2dirty"
+	Set gtmtypes("shm_snapshot_t",575,"off")=8744
+	Set gtmtypes("shm_snapshot_t",575,"len")=8
+	Set gtmtypes("shm_snapshot_t",575,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_clean2dirty")=575
+	Set gtmtypes("shm_snapshot_t",576,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec_filler_4k_plus_512"
+	Set gtmtypes("shm_snapshot_t",576,"off")=8752
+	Set gtmtypes("shm_snapshot_t",576,"len")=40
+	Set gtmtypes("shm_snapshot_t",576,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec_filler_4k_plus_512")=576
+	Set gtmtypes("shm_snapshot_t",577,"name")="shm_snapshot_t.shadow_file_header.filler_4k_plus_512"
+	Set gtmtypes("shm_snapshot_t",577,"off")=8792
+	Set gtmtypes("shm_snapshot_t",577,"len")=368
+	Set gtmtypes("shm_snapshot_t",577,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_4k_plus_512")=577
+	Set gtmtypes("shm_snapshot_t",578,"name")="shm_snapshot_t.shadow_file_header.intrpt_recov_resync_strm_seqno"
+	Set gtmtypes("shm_snapshot_t",578,"off")=9160
 	Set gtmtypes("shm_snapshot_t",578,"len")=128
 	Set gtmtypes("shm_snapshot_t",578,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.save_strm_reg_seqno")=578
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.intrpt_recov_resync_strm_seqno")=578
 	Set gtmtypes("shm_snapshot_t",578,"dim")=16
-	Set gtmtypes("shm_snapshot_t",579,"name")="shm_snapshot_t.shadow_file_header.freeze_on_fail"
-	Set gtmtypes("shm_snapshot_t",579,"off")=10616
+	Set gtmtypes("shm_snapshot_t",579,"name")="shm_snapshot_t.shadow_file_header.creation_db_ver"
+	Set gtmtypes("shm_snapshot_t",579,"off")=9288
 	Set gtmtypes("shm_snapshot_t",579,"len")=4
-	Set gtmtypes("shm_snapshot_t",579,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.freeze_on_fail")=579
-	Set gtmtypes("shm_snapshot_t",580,"name")="shm_snapshot_t.shadow_file_header.span_node_absent"
-	Set gtmtypes("shm_snapshot_t",580,"off")=10620
+	Set gtmtypes("shm_snapshot_t",579,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.creation_db_ver")=579
+	Set gtmtypes("shm_snapshot_t",580,"name")="shm_snapshot_t.shadow_file_header.creation_mdb_ver"
+	Set gtmtypes("shm_snapshot_t",580,"off")=9292
 	Set gtmtypes("shm_snapshot_t",580,"len")=4
-	Set gtmtypes("shm_snapshot_t",580,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.span_node_absent")=580
-	Set gtmtypes("shm_snapshot_t",581,"name")="shm_snapshot_t.shadow_file_header.maxkeysz_assured"
-	Set gtmtypes("shm_snapshot_t",581,"off")=10624
+	Set gtmtypes("shm_snapshot_t",580,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.creation_mdb_ver")=580
+	Set gtmtypes("shm_snapshot_t",581,"name")="shm_snapshot_t.shadow_file_header.certified_for_upgrade_to"
+	Set gtmtypes("shm_snapshot_t",581,"off")=9296
 	Set gtmtypes("shm_snapshot_t",581,"len")=4
-	Set gtmtypes("shm_snapshot_t",581,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.maxkeysz_assured")=581
-	Set gtmtypes("shm_snapshot_t",582,"name")="shm_snapshot_t.shadow_file_header.hasht_upgrade_needed"
-	Set gtmtypes("shm_snapshot_t",582,"off")=10628
+	Set gtmtypes("shm_snapshot_t",581,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.certified_for_upgrade_to")=581
+	Set gtmtypes("shm_snapshot_t",582,"name")="shm_snapshot_t.shadow_file_header.filler_5k"
+	Set gtmtypes("shm_snapshot_t",582,"off")=9300
 	Set gtmtypes("shm_snapshot_t",582,"len")=4
-	Set gtmtypes("shm_snapshot_t",582,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.hasht_upgrade_needed")=582
-	Set gtmtypes("shm_snapshot_t",583,"name")="shm_snapshot_t.shadow_file_header.defer_allocate"
-	Set gtmtypes("shm_snapshot_t",583,"off")=10632
+	Set gtmtypes("shm_snapshot_t",582,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_5k")=582
+	Set gtmtypes("shm_snapshot_t",583,"name")="shm_snapshot_t.shadow_file_header.secshr_ops_index_filler"
+	Set gtmtypes("shm_snapshot_t",583,"off")=9304
 	Set gtmtypes("shm_snapshot_t",583,"len")=4
-	Set gtmtypes("shm_snapshot_t",583,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.defer_allocate")=583
-	Set gtmtypes("shm_snapshot_t",584,"name")="shm_snapshot_t.shadow_file_header.filler_ftok_counter_halted"
-	Set gtmtypes("shm_snapshot_t",584,"off")=10636
-	Set gtmtypes("shm_snapshot_t",584,"len")=4
-	Set gtmtypes("shm_snapshot_t",584,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_ftok_counter_halted")=584
-	Set gtmtypes("shm_snapshot_t",585,"name")="shm_snapshot_t.shadow_file_header.filler_access_counter_halted"
-	Set gtmtypes("shm_snapshot_t",585,"off")=10640
-	Set gtmtypes("shm_snapshot_t",585,"len")=4
-	Set gtmtypes("shm_snapshot_t",585,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_access_counter_halted")=585
-	Set gtmtypes("shm_snapshot_t",586,"name")="shm_snapshot_t.shadow_file_header.filler_7k"
-	Set gtmtypes("shm_snapshot_t",586,"off")=10644
-	Set gtmtypes("shm_snapshot_t",586,"len")=708
-	Set gtmtypes("shm_snapshot_t",586,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_7k")=586
-	Set gtmtypes("shm_snapshot_t",587,"name")="shm_snapshot_t.shadow_file_header.filler_8k"
-	Set gtmtypes("shm_snapshot_t",587,"off")=11352
-	Set gtmtypes("shm_snapshot_t",587,"len")=1024
-	Set gtmtypes("shm_snapshot_t",587,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_8k")=587
+	Set gtmtypes("shm_snapshot_t",583,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.secshr_ops_index_filler")=583
+	Set gtmtypes("shm_snapshot_t",584,"name")="shm_snapshot_t.shadow_file_header.secshr_ops_array_filler"
+	Set gtmtypes("shm_snapshot_t",584,"off")=9308
+	Set gtmtypes("shm_snapshot_t",584,"len")=1020
+	Set gtmtypes("shm_snapshot_t",584,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.secshr_ops_array_filler")=584
+	Set gtmtypes("shm_snapshot_t",584,"dim")=255
+	Set gtmtypes("shm_snapshot_t",585,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn"
+	Set gtmtypes("shm_snapshot_t",585,"off")=10328
+	Set gtmtypes("shm_snapshot_t",585,"len")=24
+	Set gtmtypes("shm_snapshot_t",585,"type")="compswap_time_field"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn")=585
+	Set gtmtypes("shm_snapshot_t",586,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch"
+	Set gtmtypes("shm_snapshot_t",586,"off")=10328
+	Set gtmtypes("shm_snapshot_t",586,"len")=8
+	Set gtmtypes("shm_snapshot_t",586,"type")="global_latch_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch")=586
+	Set gtmtypes("shm_snapshot_t",587,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch.u"
+	Set gtmtypes("shm_snapshot_t",587,"off")=10328
+	Set gtmtypes("shm_snapshot_t",587,"len")=8
+	Set gtmtypes("shm_snapshot_t",587,"type")="union"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch.u")=587
+	Set gtmtypes("shm_snapshot_t",588,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch.u.pid_imgcnt"
+	Set gtmtypes("shm_snapshot_t",588,"off")=10328
+	Set gtmtypes("shm_snapshot_t",588,"len")=8
+	Set gtmtypes("shm_snapshot_t",588,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch.u.pid_imgcnt")=588
+	Set gtmtypes("shm_snapshot_t",589,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch.u.parts"
+	Set gtmtypes("shm_snapshot_t",589,"off")=10328
+	Set gtmtypes("shm_snapshot_t",589,"len")=8
+	Set gtmtypes("shm_snapshot_t",589,"type")="struct"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch.u.parts")=589
+	Set gtmtypes("shm_snapshot_t",590,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_pid"
+	Set gtmtypes("shm_snapshot_t",590,"off")=10328
+	Set gtmtypes("shm_snapshot_t",590,"len")=4
+	Set gtmtypes("shm_snapshot_t",590,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_pid")=590
+	Set gtmtypes("shm_snapshot_t",591,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_word"
+	Set gtmtypes("shm_snapshot_t",591,"off")=10332
+	Set gtmtypes("shm_snapshot_t",591,"len")=4
+	Set gtmtypes("shm_snapshot_t",591,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_word")=591
+	Set gtmtypes("shm_snapshot_t",592,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.hp_latch_space"
+	Set gtmtypes("shm_snapshot_t",592,"off")=10336
+	Set gtmtypes("shm_snapshot_t",592,"len")=16
+	Set gtmtypes("shm_snapshot_t",592,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.hp_latch_space")=592
+	Set gtmtypes("shm_snapshot_t",592,"dim")=4
+	Set gtmtypes("shm_snapshot_t",593,"name")="shm_snapshot_t.shadow_file_header.is_encrypted"
+	Set gtmtypes("shm_snapshot_t",593,"off")=10352
+	Set gtmtypes("shm_snapshot_t",593,"len")=4
+	Set gtmtypes("shm_snapshot_t",593,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.is_encrypted")=593
+	Set gtmtypes("shm_snapshot_t",594,"name")="shm_snapshot_t.shadow_file_header.db_trigger_cycle"
+	Set gtmtypes("shm_snapshot_t",594,"off")=10356
+	Set gtmtypes("shm_snapshot_t",594,"len")=4
+	Set gtmtypes("shm_snapshot_t",594,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_trigger_cycle")=594
+	Set gtmtypes("shm_snapshot_t",595,"name")="shm_snapshot_t.shadow_file_header.strm_reg_seqno"
+	Set gtmtypes("shm_snapshot_t",595,"off")=10360
+	Set gtmtypes("shm_snapshot_t",595,"len")=128
+	Set gtmtypes("shm_snapshot_t",595,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.strm_reg_seqno")=595
+	Set gtmtypes("shm_snapshot_t",595,"dim")=16
+	Set gtmtypes("shm_snapshot_t",596,"name")="shm_snapshot_t.shadow_file_header.save_strm_reg_seqno"
+	Set gtmtypes("shm_snapshot_t",596,"off")=10488
+	Set gtmtypes("shm_snapshot_t",596,"len")=128
+	Set gtmtypes("shm_snapshot_t",596,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.save_strm_reg_seqno")=596
+	Set gtmtypes("shm_snapshot_t",596,"dim")=16
+	Set gtmtypes("shm_snapshot_t",597,"name")="shm_snapshot_t.shadow_file_header.freeze_on_fail"
+	Set gtmtypes("shm_snapshot_t",597,"off")=10616
+	Set gtmtypes("shm_snapshot_t",597,"len")=4
+	Set gtmtypes("shm_snapshot_t",597,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.freeze_on_fail")=597
+	Set gtmtypes("shm_snapshot_t",598,"name")="shm_snapshot_t.shadow_file_header.span_node_absent"
+	Set gtmtypes("shm_snapshot_t",598,"off")=10620
+	Set gtmtypes("shm_snapshot_t",598,"len")=4
+	Set gtmtypes("shm_snapshot_t",598,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.span_node_absent")=598
+	Set gtmtypes("shm_snapshot_t",599,"name")="shm_snapshot_t.shadow_file_header.maxkeysz_assured"
+	Set gtmtypes("shm_snapshot_t",599,"off")=10624
+	Set gtmtypes("shm_snapshot_t",599,"len")=4
+	Set gtmtypes("shm_snapshot_t",599,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.maxkeysz_assured")=599
+	Set gtmtypes("shm_snapshot_t",600,"name")="shm_snapshot_t.shadow_file_header.hasht_upgrade_needed"
+	Set gtmtypes("shm_snapshot_t",600,"off")=10628
+	Set gtmtypes("shm_snapshot_t",600,"len")=4
+	Set gtmtypes("shm_snapshot_t",600,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.hasht_upgrade_needed")=600
+	Set gtmtypes("shm_snapshot_t",601,"name")="shm_snapshot_t.shadow_file_header.defer_allocate"
+	Set gtmtypes("shm_snapshot_t",601,"off")=10632
+	Set gtmtypes("shm_snapshot_t",601,"len")=4
+	Set gtmtypes("shm_snapshot_t",601,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.defer_allocate")=601
+	Set gtmtypes("shm_snapshot_t",602,"name")="shm_snapshot_t.shadow_file_header.filler_ftok_counter_halted"
+	Set gtmtypes("shm_snapshot_t",602,"off")=10636
+	Set gtmtypes("shm_snapshot_t",602,"len")=4
+	Set gtmtypes("shm_snapshot_t",602,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_ftok_counter_halted")=602
+	Set gtmtypes("shm_snapshot_t",603,"name")="shm_snapshot_t.shadow_file_header.filler_access_counter_halted"
+	Set gtmtypes("shm_snapshot_t",603,"off")=10640
+	Set gtmtypes("shm_snapshot_t",603,"len")=4
+	Set gtmtypes("shm_snapshot_t",603,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_access_counter_halted")=603
+	Set gtmtypes("shm_snapshot_t",604,"name")="shm_snapshot_t.shadow_file_header.lock_crit_with_db"
+	Set gtmtypes("shm_snapshot_t",604,"off")=10644
+	Set gtmtypes("shm_snapshot_t",604,"len")=4
+	Set gtmtypes("shm_snapshot_t",604,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.lock_crit_with_db")=604
+	Set gtmtypes("shm_snapshot_t",605,"name")="shm_snapshot_t.shadow_file_header.basedb_fname_len"
+	Set gtmtypes("shm_snapshot_t",605,"off")=10648
+	Set gtmtypes("shm_snapshot_t",605,"len")=4
+	Set gtmtypes("shm_snapshot_t",605,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.basedb_fname_len")=605
+	Set gtmtypes("shm_snapshot_t",606,"name")="shm_snapshot_t.shadow_file_header.basedb_fname"
+	Set gtmtypes("shm_snapshot_t",606,"off")=10652
+	Set gtmtypes("shm_snapshot_t",606,"len")=256
+	Set gtmtypes("shm_snapshot_t",606,"type")="unsigned-char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.basedb_fname")=606
+	Set gtmtypes("shm_snapshot_t",607,"name")="shm_snapshot_t.shadow_file_header.filler_7k"
+	Set gtmtypes("shm_snapshot_t",607,"off")=10908
+	Set gtmtypes("shm_snapshot_t",607,"len")=444
+	Set gtmtypes("shm_snapshot_t",607,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_7k")=607
+	Set gtmtypes("shm_snapshot_t",608,"name")="shm_snapshot_t.shadow_file_header.filler_8k"
+	Set gtmtypes("shm_snapshot_t",608,"off")=11352
+	Set gtmtypes("shm_snapshot_t",608,"len")=1024
+	Set gtmtypes("shm_snapshot_t",608,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_8k")=608
 	;
 	Set gtmtypes("shmpool_blk_hdr")="struct"
 	Set gtmtypes("shmpool_blk_hdr",0)=11
@@ -32757,7 +33477,7 @@ Init
 	Set gtmtypfldindx("shmpool_blk_hdr","image_count")=11
 	;
 	Set gtmtypes("shmpool_buff_hdr")="struct"
-	Set gtmtypes("shmpool_buff_hdr",0)=594
+	Set gtmtypes("shmpool_buff_hdr",0)=615
 	Set gtmtypes("shmpool_buff_hdr","len")=8560
 	Set gtmtypes("shmpool_buff_hdr",1,"name")="shmpool_buff_hdr.shmpool_crit_latch"
 	Set gtmtypes("shmpool_buff_hdr",1,"off")=0
@@ -32992,7 +33712,7 @@ Init
 	Set gtmtypes("shmpool_buff_hdr",47,"name")="shmpool_buff_hdr.shadow_file_header.null_subs"
 	Set gtmtypes("shmpool_buff_hdr",47,"off")=444
 	Set gtmtypes("shmpool_buff_hdr",47,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",47,"type")="boolean_t"
+	Set gtmtypes("shmpool_buff_hdr",47,"type")="int"
 	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.null_subs")=47
 	Set gtmtypes("shmpool_buff_hdr",48,"name")="shmpool_buff_hdr.shadow_file_header.free_space"
 	Set gtmtypes("shmpool_buff_hdr",48,"off")=448
@@ -33074,11 +33794,11 @@ Init
 	Set gtmtypes("shmpool_buff_hdr",63,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",63,"type")="int"
 	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.creation_time4")=63
-	Set gtmtypes("shmpool_buff_hdr",64,"name")="shmpool_buff_hdr.shadow_file_header.creation_filler_8byte"
+	Set gtmtypes("shmpool_buff_hdr",64,"name")="shmpool_buff_hdr.shadow_file_header.reservedDBFlags"
 	Set gtmtypes("shmpool_buff_hdr",64,"off")=556
 	Set gtmtypes("shmpool_buff_hdr",64,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",64,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.creation_filler_8byte")=64
+	Set gtmtypes("shmpool_buff_hdr",64,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reservedDBFlags")=64
 	Set gtmtypes("shmpool_buff_hdr",65,"name")="shmpool_buff_hdr.shadow_file_header.max_tn"
 	Set gtmtypes("shmpool_buff_hdr",65,"off")=560
 	Set gtmtypes("shmpool_buff_hdr",65,"len")=8
@@ -33159,2592 +33879,2697 @@ Init
 	Set gtmtypes("shmpool_buff_hdr",80,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",80,"type")="int"
 	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.abandoned_kills")=80
-	Set gtmtypes("shmpool_buff_hdr",81,"name")="shmpool_buff_hdr.shadow_file_header.filler_320"
+	Set gtmtypes("shmpool_buff_hdr",81,"name")="shmpool_buff_hdr.shadow_file_header.freeze_online"
 	Set gtmtypes("shmpool_buff_hdr",81,"off")=680
-	Set gtmtypes("shmpool_buff_hdr",81,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",81,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_320")=81
-	Set gtmtypes("shmpool_buff_hdr",82,"name")="shmpool_buff_hdr.shadow_file_header.tn_upgrd_blks_0"
-	Set gtmtypes("shmpool_buff_hdr",82,"off")=688
-	Set gtmtypes("shmpool_buff_hdr",82,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",82,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.tn_upgrd_blks_0")=82
-	Set gtmtypes("shmpool_buff_hdr",83,"name")="shmpool_buff_hdr.shadow_file_header.desired_db_format_tn"
-	Set gtmtypes("shmpool_buff_hdr",83,"off")=696
+	Set gtmtypes("shmpool_buff_hdr",81,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",81,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.freeze_online")=81
+	Set gtmtypes("shmpool_buff_hdr",82,"name")="shmpool_buff_hdr.shadow_file_header.filler_320"
+	Set gtmtypes("shmpool_buff_hdr",82,"off")=684
+	Set gtmtypes("shmpool_buff_hdr",82,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",82,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_320")=82
+	Set gtmtypes("shmpool_buff_hdr",83,"name")="shmpool_buff_hdr.shadow_file_header.tn_upgrd_blks_0"
+	Set gtmtypes("shmpool_buff_hdr",83,"off")=688
 	Set gtmtypes("shmpool_buff_hdr",83,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",83,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.desired_db_format_tn")=83
-	Set gtmtypes("shmpool_buff_hdr",84,"name")="shmpool_buff_hdr.shadow_file_header.reorg_db_fmt_start_tn"
-	Set gtmtypes("shmpool_buff_hdr",84,"off")=704
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.tn_upgrd_blks_0")=83
+	Set gtmtypes("shmpool_buff_hdr",84,"name")="shmpool_buff_hdr.shadow_file_header.desired_db_format_tn"
+	Set gtmtypes("shmpool_buff_hdr",84,"off")=696
 	Set gtmtypes("shmpool_buff_hdr",84,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",84,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reorg_db_fmt_start_tn")=84
-	Set gtmtypes("shmpool_buff_hdr",85,"name")="shmpool_buff_hdr.shadow_file_header.reorg_upgrd_dwngrd_restart_block"
-	Set gtmtypes("shmpool_buff_hdr",85,"off")=712
-	Set gtmtypes("shmpool_buff_hdr",85,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",85,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reorg_upgrd_dwngrd_restart_block")=85
-	Set gtmtypes("shmpool_buff_hdr",86,"name")="shmpool_buff_hdr.shadow_file_header.blks_to_upgrd"
-	Set gtmtypes("shmpool_buff_hdr",86,"off")=716
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.desired_db_format_tn")=84
+	Set gtmtypes("shmpool_buff_hdr",85,"name")="shmpool_buff_hdr.shadow_file_header.reorg_db_fmt_start_tn"
+	Set gtmtypes("shmpool_buff_hdr",85,"off")=704
+	Set gtmtypes("shmpool_buff_hdr",85,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",85,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reorg_db_fmt_start_tn")=85
+	Set gtmtypes("shmpool_buff_hdr",86,"name")="shmpool_buff_hdr.shadow_file_header.reorg_upgrd_dwngrd_restart_block"
+	Set gtmtypes("shmpool_buff_hdr",86,"off")=712
 	Set gtmtypes("shmpool_buff_hdr",86,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",86,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.blks_to_upgrd")=86
-	Set gtmtypes("shmpool_buff_hdr",87,"name")="shmpool_buff_hdr.shadow_file_header.blks_to_upgrd_subzero_error"
-	Set gtmtypes("shmpool_buff_hdr",87,"off")=720
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reorg_upgrd_dwngrd_restart_block")=86
+	Set gtmtypes("shmpool_buff_hdr",87,"name")="shmpool_buff_hdr.shadow_file_header.blks_to_upgrd"
+	Set gtmtypes("shmpool_buff_hdr",87,"off")=716
 	Set gtmtypes("shmpool_buff_hdr",87,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",87,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.blks_to_upgrd_subzero_error")=87
-	Set gtmtypes("shmpool_buff_hdr",88,"name")="shmpool_buff_hdr.shadow_file_header.desired_db_format"
-	Set gtmtypes("shmpool_buff_hdr",88,"off")=724
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.blks_to_upgrd")=87
+	Set gtmtypes("shmpool_buff_hdr",88,"name")="shmpool_buff_hdr.shadow_file_header.blks_to_upgrd_subzero_error"
+	Set gtmtypes("shmpool_buff_hdr",88,"off")=720
 	Set gtmtypes("shmpool_buff_hdr",88,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",88,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.desired_db_format")=88
-	Set gtmtypes("shmpool_buff_hdr",89,"name")="shmpool_buff_hdr.shadow_file_header.fully_upgraded"
-	Set gtmtypes("shmpool_buff_hdr",89,"off")=728
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.blks_to_upgrd_subzero_error")=88
+	Set gtmtypes("shmpool_buff_hdr",89,"name")="shmpool_buff_hdr.shadow_file_header.desired_db_format"
+	Set gtmtypes("shmpool_buff_hdr",89,"off")=724
 	Set gtmtypes("shmpool_buff_hdr",89,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",89,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.fully_upgraded")=89
-	Set gtmtypes("shmpool_buff_hdr",90,"name")="shmpool_buff_hdr.shadow_file_header.db_got_to_v5_once"
-	Set gtmtypes("shmpool_buff_hdr",90,"off")=732
+	Set gtmtypes("shmpool_buff_hdr",89,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.desired_db_format")=89
+	Set gtmtypes("shmpool_buff_hdr",90,"name")="shmpool_buff_hdr.shadow_file_header.fully_upgraded"
+	Set gtmtypes("shmpool_buff_hdr",90,"off")=728
 	Set gtmtypes("shmpool_buff_hdr",90,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",90,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_got_to_v5_once")=90
-	Set gtmtypes("shmpool_buff_hdr",91,"name")="shmpool_buff_hdr.shadow_file_header.opened_by_gtmv53"
-	Set gtmtypes("shmpool_buff_hdr",91,"off")=736
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.fully_upgraded")=90
+	Set gtmtypes("shmpool_buff_hdr",91,"name")="shmpool_buff_hdr.shadow_file_header.db_got_to_v5_once"
+	Set gtmtypes("shmpool_buff_hdr",91,"off")=732
 	Set gtmtypes("shmpool_buff_hdr",91,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",91,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.opened_by_gtmv53")=91
-	Set gtmtypes("shmpool_buff_hdr",92,"name")="shmpool_buff_hdr.shadow_file_header.filler_384"
-	Set gtmtypes("shmpool_buff_hdr",92,"off")=740
-	Set gtmtypes("shmpool_buff_hdr",92,"len")=12
-	Set gtmtypes("shmpool_buff_hdr",92,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_384")=92
-	Set gtmtypes("shmpool_buff_hdr",93,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist"
-	Set gtmtypes("shmpool_buff_hdr",93,"off")=752
-	Set gtmtypes("shmpool_buff_hdr",93,"len")=56
-	Set gtmtypes("shmpool_buff_hdr",93,"type")="th_index"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist")=93
-	Set gtmtypes("shmpool_buff_hdr",94,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.curr_tn"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_got_to_v5_once")=91
+	Set gtmtypes("shmpool_buff_hdr",92,"name")="shmpool_buff_hdr.shadow_file_header.opened_by_gtmv53"
+	Set gtmtypes("shmpool_buff_hdr",92,"off")=736
+	Set gtmtypes("shmpool_buff_hdr",92,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",92,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.opened_by_gtmv53")=92
+	Set gtmtypes("shmpool_buff_hdr",93,"name")="shmpool_buff_hdr.shadow_file_header.filler_384"
+	Set gtmtypes("shmpool_buff_hdr",93,"off")=740
+	Set gtmtypes("shmpool_buff_hdr",93,"len")=12
+	Set gtmtypes("shmpool_buff_hdr",93,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_384")=93
+	Set gtmtypes("shmpool_buff_hdr",94,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist"
 	Set gtmtypes("shmpool_buff_hdr",94,"off")=752
-	Set gtmtypes("shmpool_buff_hdr",94,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",94,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.curr_tn")=94
-	Set gtmtypes("shmpool_buff_hdr",95,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.early_tn"
-	Set gtmtypes("shmpool_buff_hdr",95,"off")=760
+	Set gtmtypes("shmpool_buff_hdr",94,"len")=56
+	Set gtmtypes("shmpool_buff_hdr",94,"type")="th_index"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist")=94
+	Set gtmtypes("shmpool_buff_hdr",95,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.curr_tn"
+	Set gtmtypes("shmpool_buff_hdr",95,"off")=752
 	Set gtmtypes("shmpool_buff_hdr",95,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",95,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.early_tn")=95
-	Set gtmtypes("shmpool_buff_hdr",96,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.last_mm_sync"
-	Set gtmtypes("shmpool_buff_hdr",96,"off")=768
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.curr_tn")=95
+	Set gtmtypes("shmpool_buff_hdr",96,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.early_tn"
+	Set gtmtypes("shmpool_buff_hdr",96,"off")=760
 	Set gtmtypes("shmpool_buff_hdr",96,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",96,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.last_mm_sync")=96
-	Set gtmtypes("shmpool_buff_hdr",97,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.filler_8byte"
-	Set gtmtypes("shmpool_buff_hdr",97,"off")=776
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.early_tn")=96
+	Set gtmtypes("shmpool_buff_hdr",97,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.last_mm_sync"
+	Set gtmtypes("shmpool_buff_hdr",97,"off")=768
 	Set gtmtypes("shmpool_buff_hdr",97,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",97,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.filler_8byte")=97
-	Set gtmtypes("shmpool_buff_hdr",98,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.mm_tn"
-	Set gtmtypes("shmpool_buff_hdr",98,"off")=784
+	Set gtmtypes("shmpool_buff_hdr",97,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.last_mm_sync")=97
+	Set gtmtypes("shmpool_buff_hdr",98,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.filler_8byte"
+	Set gtmtypes("shmpool_buff_hdr",98,"off")=776
 	Set gtmtypes("shmpool_buff_hdr",98,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",98,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.mm_tn")=98
-	Set gtmtypes("shmpool_buff_hdr",99,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.lock_sequence"
-	Set gtmtypes("shmpool_buff_hdr",99,"off")=792
-	Set gtmtypes("shmpool_buff_hdr",99,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",99,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.lock_sequence")=99
-	Set gtmtypes("shmpool_buff_hdr",100,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.ccp_jnl_filesize"
-	Set gtmtypes("shmpool_buff_hdr",100,"off")=796
+	Set gtmtypes("shmpool_buff_hdr",98,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.filler_8byte")=98
+	Set gtmtypes("shmpool_buff_hdr",99,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.mm_tn"
+	Set gtmtypes("shmpool_buff_hdr",99,"off")=784
+	Set gtmtypes("shmpool_buff_hdr",99,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",99,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.mm_tn")=99
+	Set gtmtypes("shmpool_buff_hdr",100,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.lock_sequence"
+	Set gtmtypes("shmpool_buff_hdr",100,"off")=792
 	Set gtmtypes("shmpool_buff_hdr",100,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",100,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.ccp_jnl_filesize")=100
-	Set gtmtypes("shmpool_buff_hdr",101,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.total_blks"
-	Set gtmtypes("shmpool_buff_hdr",101,"off")=800
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.lock_sequence")=100
+	Set gtmtypes("shmpool_buff_hdr",101,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.ccp_jnl_filesize"
+	Set gtmtypes("shmpool_buff_hdr",101,"off")=796
 	Set gtmtypes("shmpool_buff_hdr",101,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",101,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.total_blks")=101
-	Set gtmtypes("shmpool_buff_hdr",102,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.free_blocks"
-	Set gtmtypes("shmpool_buff_hdr",102,"off")=804
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.ccp_jnl_filesize")=101
+	Set gtmtypes("shmpool_buff_hdr",102,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.total_blks"
+	Set gtmtypes("shmpool_buff_hdr",102,"off")=800
 	Set gtmtypes("shmpool_buff_hdr",102,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",102,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.free_blocks")=102
-	Set gtmtypes("shmpool_buff_hdr",103,"name")="shmpool_buff_hdr.shadow_file_header.filler_trans_hist"
-	Set gtmtypes("shmpool_buff_hdr",103,"off")=808
-	Set gtmtypes("shmpool_buff_hdr",103,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",103,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_trans_hist")=103
-	Set gtmtypes("shmpool_buff_hdr",104,"name")="shmpool_buff_hdr.shadow_file_header.flush_time"
-	Set gtmtypes("shmpool_buff_hdr",104,"off")=816
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.total_blks")=102
+	Set gtmtypes("shmpool_buff_hdr",103,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.free_blocks"
+	Set gtmtypes("shmpool_buff_hdr",103,"off")=804
+	Set gtmtypes("shmpool_buff_hdr",103,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",103,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.free_blocks")=103
+	Set gtmtypes("shmpool_buff_hdr",104,"name")="shmpool_buff_hdr.shadow_file_header.filler_trans_hist"
+	Set gtmtypes("shmpool_buff_hdr",104,"off")=808
 	Set gtmtypes("shmpool_buff_hdr",104,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",104,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.flush_time")=104
-	Set gtmtypes("shmpool_buff_hdr",104,"dim")=2
-	Set gtmtypes("shmpool_buff_hdr",105,"name")="shmpool_buff_hdr.shadow_file_header.flush_trigger"
-	Set gtmtypes("shmpool_buff_hdr",105,"off")=824
-	Set gtmtypes("shmpool_buff_hdr",105,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",104,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_trans_hist")=104
+	Set gtmtypes("shmpool_buff_hdr",105,"name")="shmpool_buff_hdr.shadow_file_header.flush_time"
+	Set gtmtypes("shmpool_buff_hdr",105,"off")=816
+	Set gtmtypes("shmpool_buff_hdr",105,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",105,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.flush_trigger")=105
-	Set gtmtypes("shmpool_buff_hdr",106,"name")="shmpool_buff_hdr.shadow_file_header.n_wrt_per_flu"
-	Set gtmtypes("shmpool_buff_hdr",106,"off")=828
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.flush_time")=105
+	Set gtmtypes("shmpool_buff_hdr",105,"dim")=2
+	Set gtmtypes("shmpool_buff_hdr",106,"name")="shmpool_buff_hdr.shadow_file_header.flush_trigger"
+	Set gtmtypes("shmpool_buff_hdr",106,"off")=824
 	Set gtmtypes("shmpool_buff_hdr",106,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",106,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_wrt_per_flu")=106
-	Set gtmtypes("shmpool_buff_hdr",107,"name")="shmpool_buff_hdr.shadow_file_header.wait_disk_space"
-	Set gtmtypes("shmpool_buff_hdr",107,"off")=832
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.flush_trigger")=106
+	Set gtmtypes("shmpool_buff_hdr",107,"name")="shmpool_buff_hdr.shadow_file_header.n_wrt_per_flu"
+	Set gtmtypes("shmpool_buff_hdr",107,"off")=828
 	Set gtmtypes("shmpool_buff_hdr",107,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",107,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wait_disk_space")=107
-	Set gtmtypes("shmpool_buff_hdr",108,"name")="shmpool_buff_hdr.shadow_file_header.defer_time"
-	Set gtmtypes("shmpool_buff_hdr",108,"off")=836
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_wrt_per_flu")=107
+	Set gtmtypes("shmpool_buff_hdr",108,"name")="shmpool_buff_hdr.shadow_file_header.wait_disk_space"
+	Set gtmtypes("shmpool_buff_hdr",108,"off")=832
 	Set gtmtypes("shmpool_buff_hdr",108,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",108,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.defer_time")=108
-	Set gtmtypes("shmpool_buff_hdr",109,"name")="shmpool_buff_hdr.shadow_file_header.filler_wc_blocked"
-	Set gtmtypes("shmpool_buff_hdr",109,"off")=840
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wait_disk_space")=108
+	Set gtmtypes("shmpool_buff_hdr",109,"name")="shmpool_buff_hdr.shadow_file_header.defer_time"
+	Set gtmtypes("shmpool_buff_hdr",109,"off")=836
 	Set gtmtypes("shmpool_buff_hdr",109,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",109,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_wc_blocked")=109
-	Set gtmtypes("shmpool_buff_hdr",110,"name")="shmpool_buff_hdr.shadow_file_header.mumps_can_bypass"
-	Set gtmtypes("shmpool_buff_hdr",110,"off")=844
+	Set gtmtypes("shmpool_buff_hdr",109,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.defer_time")=109
+	Set gtmtypes("shmpool_buff_hdr",110,"name")="shmpool_buff_hdr.shadow_file_header.filler_wc_blocked"
+	Set gtmtypes("shmpool_buff_hdr",110,"off")=840
 	Set gtmtypes("shmpool_buff_hdr",110,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",110,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.mumps_can_bypass")=110
-	Set gtmtypes("shmpool_buff_hdr",111,"name")="shmpool_buff_hdr.shadow_file_header.epoch_taper"
-	Set gtmtypes("shmpool_buff_hdr",111,"off")=848
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_wc_blocked")=110
+	Set gtmtypes("shmpool_buff_hdr",111,"name")="shmpool_buff_hdr.shadow_file_header.mumps_can_bypass"
+	Set gtmtypes("shmpool_buff_hdr",111,"off")=844
 	Set gtmtypes("shmpool_buff_hdr",111,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",111,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.epoch_taper")=111
-	Set gtmtypes("shmpool_buff_hdr",112,"name")="shmpool_buff_hdr.shadow_file_header.epoch_taper_time_pct"
-	Set gtmtypes("shmpool_buff_hdr",112,"off")=852
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.mumps_can_bypass")=111
+	Set gtmtypes("shmpool_buff_hdr",112,"name")="shmpool_buff_hdr.shadow_file_header.epoch_taper"
+	Set gtmtypes("shmpool_buff_hdr",112,"off")=848
 	Set gtmtypes("shmpool_buff_hdr",112,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",112,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.epoch_taper_time_pct")=112
-	Set gtmtypes("shmpool_buff_hdr",113,"name")="shmpool_buff_hdr.shadow_file_header.epoch_taper_jnl_pct"
-	Set gtmtypes("shmpool_buff_hdr",113,"off")=856
+	Set gtmtypes("shmpool_buff_hdr",112,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.epoch_taper")=112
+	Set gtmtypes("shmpool_buff_hdr",113,"name")="shmpool_buff_hdr.shadow_file_header.epoch_taper_time_pct"
+	Set gtmtypes("shmpool_buff_hdr",113,"off")=852
 	Set gtmtypes("shmpool_buff_hdr",113,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",113,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.epoch_taper_jnl_pct")=113
-	Set gtmtypes("shmpool_buff_hdr",114,"name")="shmpool_buff_hdr.shadow_file_header.filler_512"
-	Set gtmtypes("shmpool_buff_hdr",114,"off")=860
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.epoch_taper_time_pct")=113
+	Set gtmtypes("shmpool_buff_hdr",114,"name")="shmpool_buff_hdr.shadow_file_header.epoch_taper_jnl_pct"
+	Set gtmtypes("shmpool_buff_hdr",114,"off")=856
 	Set gtmtypes("shmpool_buff_hdr",114,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",114,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_512")=114
-	Set gtmtypes("shmpool_buff_hdr",115,"name")="shmpool_buff_hdr.shadow_file_header.reserved_for_upd"
-	Set gtmtypes("shmpool_buff_hdr",115,"off")=864
+	Set gtmtypes("shmpool_buff_hdr",114,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.epoch_taper_jnl_pct")=114
+	Set gtmtypes("shmpool_buff_hdr",115,"name")="shmpool_buff_hdr.shadow_file_header.asyncio"
+	Set gtmtypes("shmpool_buff_hdr",115,"off")=860
 	Set gtmtypes("shmpool_buff_hdr",115,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",115,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reserved_for_upd")=115
-	Set gtmtypes("shmpool_buff_hdr",116,"name")="shmpool_buff_hdr.shadow_file_header.avg_blks_per_100gbl"
-	Set gtmtypes("shmpool_buff_hdr",116,"off")=868
+	Set gtmtypes("shmpool_buff_hdr",115,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.asyncio")=115
+	Set gtmtypes("shmpool_buff_hdr",116,"name")="shmpool_buff_hdr.shadow_file_header.reserved_for_upd"
+	Set gtmtypes("shmpool_buff_hdr",116,"off")=864
 	Set gtmtypes("shmpool_buff_hdr",116,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",116,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.avg_blks_per_100gbl")=116
-	Set gtmtypes("shmpool_buff_hdr",117,"name")="shmpool_buff_hdr.shadow_file_header.pre_read_trigger_factor"
-	Set gtmtypes("shmpool_buff_hdr",117,"off")=872
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reserved_for_upd")=116
+	Set gtmtypes("shmpool_buff_hdr",117,"name")="shmpool_buff_hdr.shadow_file_header.avg_blks_per_100gbl"
+	Set gtmtypes("shmpool_buff_hdr",117,"off")=868
 	Set gtmtypes("shmpool_buff_hdr",117,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",117,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.pre_read_trigger_factor")=117
-	Set gtmtypes("shmpool_buff_hdr",118,"name")="shmpool_buff_hdr.shadow_file_header.writer_trigger_factor"
-	Set gtmtypes("shmpool_buff_hdr",118,"off")=876
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.avg_blks_per_100gbl")=117
+	Set gtmtypes("shmpool_buff_hdr",118,"name")="shmpool_buff_hdr.shadow_file_header.pre_read_trigger_factor"
+	Set gtmtypes("shmpool_buff_hdr",118,"off")=872
 	Set gtmtypes("shmpool_buff_hdr",118,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",118,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.writer_trigger_factor")=118
-	Set gtmtypes("shmpool_buff_hdr",119,"name")="shmpool_buff_hdr.shadow_file_header.semid"
-	Set gtmtypes("shmpool_buff_hdr",119,"off")=880
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.pre_read_trigger_factor")=118
+	Set gtmtypes("shmpool_buff_hdr",119,"name")="shmpool_buff_hdr.shadow_file_header.writer_trigger_factor"
+	Set gtmtypes("shmpool_buff_hdr",119,"off")=876
 	Set gtmtypes("shmpool_buff_hdr",119,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",119,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.semid")=119
-	Set gtmtypes("shmpool_buff_hdr",120,"name")="shmpool_buff_hdr.shadow_file_header.shmid"
-	Set gtmtypes("shmpool_buff_hdr",120,"off")=884
+	Set gtmtypes("shmpool_buff_hdr",119,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.writer_trigger_factor")=119
+	Set gtmtypes("shmpool_buff_hdr",120,"name")="shmpool_buff_hdr.shadow_file_header.semid"
+	Set gtmtypes("shmpool_buff_hdr",120,"off")=880
 	Set gtmtypes("shmpool_buff_hdr",120,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",120,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmid")=120
-	Set gtmtypes("shmpool_buff_hdr",121,"name")="shmpool_buff_hdr.shadow_file_header.gt_sem_ctime"
-	Set gtmtypes("shmpool_buff_hdr",121,"off")=888
-	Set gtmtypes("shmpool_buff_hdr",121,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",121,"type")="gtm_time8"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gt_sem_ctime")=121
-	Set gtmtypes("shmpool_buff_hdr",122,"name")="shmpool_buff_hdr.shadow_file_header.gt_sem_ctime.ctime"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.semid")=120
+	Set gtmtypes("shmpool_buff_hdr",121,"name")="shmpool_buff_hdr.shadow_file_header.shmid"
+	Set gtmtypes("shmpool_buff_hdr",121,"off")=884
+	Set gtmtypes("shmpool_buff_hdr",121,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",121,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmid")=121
+	Set gtmtypes("shmpool_buff_hdr",122,"name")="shmpool_buff_hdr.shadow_file_header.gt_sem_ctime"
 	Set gtmtypes("shmpool_buff_hdr",122,"off")=888
 	Set gtmtypes("shmpool_buff_hdr",122,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",122,"type")="time_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gt_sem_ctime.ctime")=122
-	Set gtmtypes("shmpool_buff_hdr",123,"name")="shmpool_buff_hdr.shadow_file_header.gt_sem_ctime.filler"
+	Set gtmtypes("shmpool_buff_hdr",122,"type")="gtm_time8"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gt_sem_ctime")=122
+	Set gtmtypes("shmpool_buff_hdr",123,"name")="shmpool_buff_hdr.shadow_file_header.gt_sem_ctime.ctime"
 	Set gtmtypes("shmpool_buff_hdr",123,"off")=888
 	Set gtmtypes("shmpool_buff_hdr",123,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",123,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gt_sem_ctime.filler")=123
-	Set gtmtypes("shmpool_buff_hdr",123,"dim")=2
-	Set gtmtypes("shmpool_buff_hdr",124,"name")="shmpool_buff_hdr.shadow_file_header.gt_shm_ctime"
-	Set gtmtypes("shmpool_buff_hdr",124,"off")=896
+	Set gtmtypes("shmpool_buff_hdr",123,"type")="time_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gt_sem_ctime.ctime")=123
+	Set gtmtypes("shmpool_buff_hdr",124,"name")="shmpool_buff_hdr.shadow_file_header.gt_sem_ctime.filler"
+	Set gtmtypes("shmpool_buff_hdr",124,"off")=888
 	Set gtmtypes("shmpool_buff_hdr",124,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",124,"type")="gtm_time8"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gt_shm_ctime")=124
-	Set gtmtypes("shmpool_buff_hdr",125,"name")="shmpool_buff_hdr.shadow_file_header.gt_shm_ctime.ctime"
+	Set gtmtypes("shmpool_buff_hdr",124,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gt_sem_ctime.filler")=124
+	Set gtmtypes("shmpool_buff_hdr",124,"dim")=2
+	Set gtmtypes("shmpool_buff_hdr",125,"name")="shmpool_buff_hdr.shadow_file_header.gt_shm_ctime"
 	Set gtmtypes("shmpool_buff_hdr",125,"off")=896
 	Set gtmtypes("shmpool_buff_hdr",125,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",125,"type")="time_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gt_shm_ctime.ctime")=125
-	Set gtmtypes("shmpool_buff_hdr",126,"name")="shmpool_buff_hdr.shadow_file_header.gt_shm_ctime.filler"
+	Set gtmtypes("shmpool_buff_hdr",125,"type")="gtm_time8"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gt_shm_ctime")=125
+	Set gtmtypes("shmpool_buff_hdr",126,"name")="shmpool_buff_hdr.shadow_file_header.gt_shm_ctime.ctime"
 	Set gtmtypes("shmpool_buff_hdr",126,"off")=896
 	Set gtmtypes("shmpool_buff_hdr",126,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",126,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gt_shm_ctime.filler")=126
-	Set gtmtypes("shmpool_buff_hdr",126,"dim")=2
-	Set gtmtypes("shmpool_buff_hdr",127,"name")="shmpool_buff_hdr.shadow_file_header.filler_unixonly"
-	Set gtmtypes("shmpool_buff_hdr",127,"off")=904
-	Set gtmtypes("shmpool_buff_hdr",127,"len")=40
-	Set gtmtypes("shmpool_buff_hdr",127,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_unixonly")=127
-	Set gtmtypes("shmpool_buff_hdr",128,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_retries"
-	Set gtmtypes("shmpool_buff_hdr",128,"off")=944
-	Set gtmtypes("shmpool_buff_hdr",128,"len")=20
-	Set gtmtypes("shmpool_buff_hdr",128,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_retries")=128
-	Set gtmtypes("shmpool_buff_hdr",128,"dim")=5
-	Set gtmtypes("shmpool_buff_hdr",129,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_puts"
-	Set gtmtypes("shmpool_buff_hdr",129,"off")=964
-	Set gtmtypes("shmpool_buff_hdr",129,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",126,"type")="time_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gt_shm_ctime.ctime")=126
+	Set gtmtypes("shmpool_buff_hdr",127,"name")="shmpool_buff_hdr.shadow_file_header.gt_shm_ctime.filler"
+	Set gtmtypes("shmpool_buff_hdr",127,"off")=896
+	Set gtmtypes("shmpool_buff_hdr",127,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",127,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gt_shm_ctime.filler")=127
+	Set gtmtypes("shmpool_buff_hdr",127,"dim")=2
+	Set gtmtypes("shmpool_buff_hdr",128,"name")="shmpool_buff_hdr.shadow_file_header.filler_unixonly"
+	Set gtmtypes("shmpool_buff_hdr",128,"off")=904
+	Set gtmtypes("shmpool_buff_hdr",128,"len")=40
+	Set gtmtypes("shmpool_buff_hdr",128,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_unixonly")=128
+	Set gtmtypes("shmpool_buff_hdr",129,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_retries"
+	Set gtmtypes("shmpool_buff_hdr",129,"off")=944
+	Set gtmtypes("shmpool_buff_hdr",129,"len")=20
 	Set gtmtypes("shmpool_buff_hdr",129,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_puts")=129
-	Set gtmtypes("shmpool_buff_hdr",130,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_kills"
-	Set gtmtypes("shmpool_buff_hdr",130,"off")=968
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_retries")=129
+	Set gtmtypes("shmpool_buff_hdr",129,"dim")=5
+	Set gtmtypes("shmpool_buff_hdr",130,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_puts"
+	Set gtmtypes("shmpool_buff_hdr",130,"off")=964
 	Set gtmtypes("shmpool_buff_hdr",130,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",130,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_kills")=130
-	Set gtmtypes("shmpool_buff_hdr",131,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_queries"
-	Set gtmtypes("shmpool_buff_hdr",131,"off")=972
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_puts")=130
+	Set gtmtypes("shmpool_buff_hdr",131,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_kills"
+	Set gtmtypes("shmpool_buff_hdr",131,"off")=968
 	Set gtmtypes("shmpool_buff_hdr",131,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",131,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_queries")=131
-	Set gtmtypes("shmpool_buff_hdr",132,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_gets"
-	Set gtmtypes("shmpool_buff_hdr",132,"off")=976
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_kills")=131
+	Set gtmtypes("shmpool_buff_hdr",132,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_queries"
+	Set gtmtypes("shmpool_buff_hdr",132,"off")=972
 	Set gtmtypes("shmpool_buff_hdr",132,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",132,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_gets")=132
-	Set gtmtypes("shmpool_buff_hdr",133,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_order"
-	Set gtmtypes("shmpool_buff_hdr",133,"off")=980
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_queries")=132
+	Set gtmtypes("shmpool_buff_hdr",133,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_gets"
+	Set gtmtypes("shmpool_buff_hdr",133,"off")=976
 	Set gtmtypes("shmpool_buff_hdr",133,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",133,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_order")=133
-	Set gtmtypes("shmpool_buff_hdr",134,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_zprevs"
-	Set gtmtypes("shmpool_buff_hdr",134,"off")=984
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_gets")=133
+	Set gtmtypes("shmpool_buff_hdr",134,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_order"
+	Set gtmtypes("shmpool_buff_hdr",134,"off")=980
 	Set gtmtypes("shmpool_buff_hdr",134,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",134,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_zprevs")=134
-	Set gtmtypes("shmpool_buff_hdr",135,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_data"
-	Set gtmtypes("shmpool_buff_hdr",135,"off")=988
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_order")=134
+	Set gtmtypes("shmpool_buff_hdr",135,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_zprevs"
+	Set gtmtypes("shmpool_buff_hdr",135,"off")=984
 	Set gtmtypes("shmpool_buff_hdr",135,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",135,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_data")=135
-	Set gtmtypes("shmpool_buff_hdr",136,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_puts_duplicate"
-	Set gtmtypes("shmpool_buff_hdr",136,"off")=992
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_zprevs")=135
+	Set gtmtypes("shmpool_buff_hdr",136,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_data"
+	Set gtmtypes("shmpool_buff_hdr",136,"off")=988
 	Set gtmtypes("shmpool_buff_hdr",136,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",136,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_puts_duplicate")=136
-	Set gtmtypes("shmpool_buff_hdr",137,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_tp_updates"
-	Set gtmtypes("shmpool_buff_hdr",137,"off")=996
+	Set gtmtypes("shmpool_buff_hdr",136,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_data")=136
+	Set gtmtypes("shmpool_buff_hdr",137,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_puts_duplicate"
+	Set gtmtypes("shmpool_buff_hdr",137,"off")=992
 	Set gtmtypes("shmpool_buff_hdr",137,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",137,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_tp_updates")=137
-	Set gtmtypes("shmpool_buff_hdr",138,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_tp_updates_duplicate"
-	Set gtmtypes("shmpool_buff_hdr",138,"off")=1000
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_puts_duplicate")=137
+	Set gtmtypes("shmpool_buff_hdr",138,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_tp_updates"
+	Set gtmtypes("shmpool_buff_hdr",138,"off")=996
 	Set gtmtypes("shmpool_buff_hdr",138,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",138,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_tp_updates_duplicate")=138
-	Set gtmtypes("shmpool_buff_hdr",139,"name")="shmpool_buff_hdr.shadow_file_header.filler_accounting_64_align"
-	Set gtmtypes("shmpool_buff_hdr",139,"off")=1004
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_tp_updates")=138
+	Set gtmtypes("shmpool_buff_hdr",139,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_tp_updates_duplicate"
+	Set gtmtypes("shmpool_buff_hdr",139,"off")=1000
 	Set gtmtypes("shmpool_buff_hdr",139,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",139,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_accounting_64_align")=139
-	Set gtmtypes("shmpool_buff_hdr",140,"name")="shmpool_buff_hdr.shadow_file_header.staleness"
-	Set gtmtypes("shmpool_buff_hdr",140,"off")=1008
-	Set gtmtypes("shmpool_buff_hdr",140,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",140,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.staleness")=140
-	Set gtmtypes("shmpool_buff_hdr",140,"dim")=2
-	Set gtmtypes("shmpool_buff_hdr",141,"name")="shmpool_buff_hdr.shadow_file_header.ccp_tick_interval"
-	Set gtmtypes("shmpool_buff_hdr",141,"off")=1016
+	Set gtmtypes("shmpool_buff_hdr",139,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_tp_updates_duplicate")=139
+	Set gtmtypes("shmpool_buff_hdr",140,"name")="shmpool_buff_hdr.shadow_file_header.filler_accounting_64_align"
+	Set gtmtypes("shmpool_buff_hdr",140,"off")=1004
+	Set gtmtypes("shmpool_buff_hdr",140,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",140,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_accounting_64_align")=140
+	Set gtmtypes("shmpool_buff_hdr",141,"name")="shmpool_buff_hdr.shadow_file_header.staleness"
+	Set gtmtypes("shmpool_buff_hdr",141,"off")=1008
 	Set gtmtypes("shmpool_buff_hdr",141,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",141,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.ccp_tick_interval")=141
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.staleness")=141
 	Set gtmtypes("shmpool_buff_hdr",141,"dim")=2
-	Set gtmtypes("shmpool_buff_hdr",142,"name")="shmpool_buff_hdr.shadow_file_header.ccp_quantum_interval"
-	Set gtmtypes("shmpool_buff_hdr",142,"off")=1024
+	Set gtmtypes("shmpool_buff_hdr",142,"name")="shmpool_buff_hdr.shadow_file_header.ccp_tick_interval"
+	Set gtmtypes("shmpool_buff_hdr",142,"off")=1016
 	Set gtmtypes("shmpool_buff_hdr",142,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",142,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.ccp_quantum_interval")=142
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.ccp_tick_interval")=142
 	Set gtmtypes("shmpool_buff_hdr",142,"dim")=2
-	Set gtmtypes("shmpool_buff_hdr",143,"name")="shmpool_buff_hdr.shadow_file_header.ccp_response_interval"
-	Set gtmtypes("shmpool_buff_hdr",143,"off")=1032
+	Set gtmtypes("shmpool_buff_hdr",143,"name")="shmpool_buff_hdr.shadow_file_header.ccp_quantum_interval"
+	Set gtmtypes("shmpool_buff_hdr",143,"off")=1024
 	Set gtmtypes("shmpool_buff_hdr",143,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",143,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.ccp_response_interval")=143
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.ccp_quantum_interval")=143
 	Set gtmtypes("shmpool_buff_hdr",143,"dim")=2
-	Set gtmtypes("shmpool_buff_hdr",144,"name")="shmpool_buff_hdr.shadow_file_header.ccp_jnl_before"
-	Set gtmtypes("shmpool_buff_hdr",144,"off")=1040
-	Set gtmtypes("shmpool_buff_hdr",144,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",144,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.ccp_jnl_before")=144
-	Set gtmtypes("shmpool_buff_hdr",145,"name")="shmpool_buff_hdr.shadow_file_header.clustered"
-	Set gtmtypes("shmpool_buff_hdr",145,"off")=1044
+	Set gtmtypes("shmpool_buff_hdr",144,"name")="shmpool_buff_hdr.shadow_file_header.ccp_response_interval"
+	Set gtmtypes("shmpool_buff_hdr",144,"off")=1032
+	Set gtmtypes("shmpool_buff_hdr",144,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",144,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.ccp_response_interval")=144
+	Set gtmtypes("shmpool_buff_hdr",144,"dim")=2
+	Set gtmtypes("shmpool_buff_hdr",145,"name")="shmpool_buff_hdr.shadow_file_header.ccp_jnl_before"
+	Set gtmtypes("shmpool_buff_hdr",145,"off")=1040
 	Set gtmtypes("shmpool_buff_hdr",145,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",145,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.clustered")=145
-	Set gtmtypes("shmpool_buff_hdr",146,"name")="shmpool_buff_hdr.shadow_file_header.unbacked_cache"
-	Set gtmtypes("shmpool_buff_hdr",146,"off")=1048
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.ccp_jnl_before")=145
+	Set gtmtypes("shmpool_buff_hdr",146,"name")="shmpool_buff_hdr.shadow_file_header.clustered"
+	Set gtmtypes("shmpool_buff_hdr",146,"off")=1044
 	Set gtmtypes("shmpool_buff_hdr",146,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",146,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unbacked_cache")=146
-	Set gtmtypes("shmpool_buff_hdr",147,"name")="shmpool_buff_hdr.shadow_file_header.rc_srv_cnt"
-	Set gtmtypes("shmpool_buff_hdr",147,"off")=1052
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.clustered")=146
+	Set gtmtypes("shmpool_buff_hdr",147,"name")="shmpool_buff_hdr.shadow_file_header.unbacked_cache"
+	Set gtmtypes("shmpool_buff_hdr",147,"off")=1048
 	Set gtmtypes("shmpool_buff_hdr",147,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",147,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.rc_srv_cnt")=147
-	Set gtmtypes("shmpool_buff_hdr",148,"name")="shmpool_buff_hdr.shadow_file_header.dsid"
-	Set gtmtypes("shmpool_buff_hdr",148,"off")=1056
+	Set gtmtypes("shmpool_buff_hdr",147,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unbacked_cache")=147
+	Set gtmtypes("shmpool_buff_hdr",148,"name")="shmpool_buff_hdr.shadow_file_header.rc_srv_cnt"
+	Set gtmtypes("shmpool_buff_hdr",148,"off")=1052
 	Set gtmtypes("shmpool_buff_hdr",148,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",148,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.dsid")=148
-	Set gtmtypes("shmpool_buff_hdr",149,"name")="shmpool_buff_hdr.shadow_file_header.rc_node"
-	Set gtmtypes("shmpool_buff_hdr",149,"off")=1060
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.rc_srv_cnt")=148
+	Set gtmtypes("shmpool_buff_hdr",149,"name")="shmpool_buff_hdr.shadow_file_header.dsid"
+	Set gtmtypes("shmpool_buff_hdr",149,"off")=1056
 	Set gtmtypes("shmpool_buff_hdr",149,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",149,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.rc_node")=149
-	Set gtmtypes("shmpool_buff_hdr",150,"name")="shmpool_buff_hdr.shadow_file_header.filler_ccp_rc"
-	Set gtmtypes("shmpool_buff_hdr",150,"off")=1064
-	Set gtmtypes("shmpool_buff_hdr",150,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",150,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_ccp_rc")=150
-	Set gtmtypes("shmpool_buff_hdr",151,"name")="shmpool_buff_hdr.shadow_file_header.reg_seqno"
-	Set gtmtypes("shmpool_buff_hdr",151,"off")=1072
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.dsid")=149
+	Set gtmtypes("shmpool_buff_hdr",150,"name")="shmpool_buff_hdr.shadow_file_header.rc_node"
+	Set gtmtypes("shmpool_buff_hdr",150,"off")=1060
+	Set gtmtypes("shmpool_buff_hdr",150,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",150,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.rc_node")=150
+	Set gtmtypes("shmpool_buff_hdr",151,"name")="shmpool_buff_hdr.shadow_file_header.filler_ccp_rc"
+	Set gtmtypes("shmpool_buff_hdr",151,"off")=1064
 	Set gtmtypes("shmpool_buff_hdr",151,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",151,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reg_seqno")=151
-	Set gtmtypes("shmpool_buff_hdr",152,"name")="shmpool_buff_hdr.shadow_file_header.pre_multisite_resync_seqno"
-	Set gtmtypes("shmpool_buff_hdr",152,"off")=1080
+	Set gtmtypes("shmpool_buff_hdr",151,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_ccp_rc")=151
+	Set gtmtypes("shmpool_buff_hdr",152,"name")="shmpool_buff_hdr.shadow_file_header.reg_seqno"
+	Set gtmtypes("shmpool_buff_hdr",152,"off")=1072
 	Set gtmtypes("shmpool_buff_hdr",152,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",152,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.pre_multisite_resync_seqno")=152
-	Set gtmtypes("shmpool_buff_hdr",153,"name")="shmpool_buff_hdr.shadow_file_header.zqgblmod_tn"
-	Set gtmtypes("shmpool_buff_hdr",153,"off")=1088
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reg_seqno")=152
+	Set gtmtypes("shmpool_buff_hdr",153,"name")="shmpool_buff_hdr.shadow_file_header.pre_multisite_resync_seqno"
+	Set gtmtypes("shmpool_buff_hdr",153,"off")=1080
 	Set gtmtypes("shmpool_buff_hdr",153,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",153,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.zqgblmod_tn")=153
-	Set gtmtypes("shmpool_buff_hdr",154,"name")="shmpool_buff_hdr.shadow_file_header.zqgblmod_seqno"
-	Set gtmtypes("shmpool_buff_hdr",154,"off")=1096
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.pre_multisite_resync_seqno")=153
+	Set gtmtypes("shmpool_buff_hdr",154,"name")="shmpool_buff_hdr.shadow_file_header.zqgblmod_tn"
+	Set gtmtypes("shmpool_buff_hdr",154,"off")=1088
 	Set gtmtypes("shmpool_buff_hdr",154,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",154,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.zqgblmod_seqno")=154
-	Set gtmtypes("shmpool_buff_hdr",155,"name")="shmpool_buff_hdr.shadow_file_header.repl_state"
-	Set gtmtypes("shmpool_buff_hdr",155,"off")=1104
-	Set gtmtypes("shmpool_buff_hdr",155,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",155,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.repl_state")=155
-	Set gtmtypes("shmpool_buff_hdr",156,"name")="shmpool_buff_hdr.shadow_file_header.multi_site_open"
-	Set gtmtypes("shmpool_buff_hdr",156,"off")=1108
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.zqgblmod_tn")=154
+	Set gtmtypes("shmpool_buff_hdr",155,"name")="shmpool_buff_hdr.shadow_file_header.zqgblmod_seqno"
+	Set gtmtypes("shmpool_buff_hdr",155,"off")=1096
+	Set gtmtypes("shmpool_buff_hdr",155,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",155,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.zqgblmod_seqno")=155
+	Set gtmtypes("shmpool_buff_hdr",156,"name")="shmpool_buff_hdr.shadow_file_header.repl_state"
+	Set gtmtypes("shmpool_buff_hdr",156,"off")=1104
 	Set gtmtypes("shmpool_buff_hdr",156,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",156,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.multi_site_open")=156
-	Set gtmtypes("shmpool_buff_hdr",157,"name")="shmpool_buff_hdr.shadow_file_header.filler_seqno"
-	Set gtmtypes("shmpool_buff_hdr",157,"off")=1112
-	Set gtmtypes("shmpool_buff_hdr",157,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",157,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_seqno")=157
-	Set gtmtypes("shmpool_buff_hdr",158,"name")="shmpool_buff_hdr.shadow_file_header.filler_repl"
-	Set gtmtypes("shmpool_buff_hdr",158,"off")=1120
-	Set gtmtypes("shmpool_buff_hdr",158,"len")=16
-	Set gtmtypes("shmpool_buff_hdr",158,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_repl")=158
-	Set gtmtypes("shmpool_buff_hdr",159,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_tp_retries"
-	Set gtmtypes("shmpool_buff_hdr",159,"off")=1136
-	Set gtmtypes("shmpool_buff_hdr",159,"len")=48
-	Set gtmtypes("shmpool_buff_hdr",159,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_tp_retries")=159
-	Set gtmtypes("shmpool_buff_hdr",159,"dim")=12
-	Set gtmtypes("shmpool_buff_hdr",160,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_tp_retries_conflicts"
-	Set gtmtypes("shmpool_buff_hdr",160,"off")=1184
+	Set gtmtypes("shmpool_buff_hdr",156,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.repl_state")=156
+	Set gtmtypes("shmpool_buff_hdr",157,"name")="shmpool_buff_hdr.shadow_file_header.multi_site_open"
+	Set gtmtypes("shmpool_buff_hdr",157,"off")=1108
+	Set gtmtypes("shmpool_buff_hdr",157,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",157,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.multi_site_open")=157
+	Set gtmtypes("shmpool_buff_hdr",158,"name")="shmpool_buff_hdr.shadow_file_header.filler_seqno"
+	Set gtmtypes("shmpool_buff_hdr",158,"off")=1112
+	Set gtmtypes("shmpool_buff_hdr",158,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",158,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_seqno")=158
+	Set gtmtypes("shmpool_buff_hdr",159,"name")="shmpool_buff_hdr.shadow_file_header.filler_repl"
+	Set gtmtypes("shmpool_buff_hdr",159,"off")=1120
+	Set gtmtypes("shmpool_buff_hdr",159,"len")=16
+	Set gtmtypes("shmpool_buff_hdr",159,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_repl")=159
+	Set gtmtypes("shmpool_buff_hdr",160,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_tp_retries"
+	Set gtmtypes("shmpool_buff_hdr",160,"off")=1136
 	Set gtmtypes("shmpool_buff_hdr",160,"len")=48
 	Set gtmtypes("shmpool_buff_hdr",160,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_tp_retries_conflicts")=160
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_tp_retries")=160
 	Set gtmtypes("shmpool_buff_hdr",160,"dim")=12
-	Set gtmtypes("shmpool_buff_hdr",161,"name")="shmpool_buff_hdr.shadow_file_header.tp_cdb_sc_blkmod"
-	Set gtmtypes("shmpool_buff_hdr",161,"off")=1232
-	Set gtmtypes("shmpool_buff_hdr",161,"len")=32
+	Set gtmtypes("shmpool_buff_hdr",161,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_tp_retries_conflicts"
+	Set gtmtypes("shmpool_buff_hdr",161,"off")=1184
+	Set gtmtypes("shmpool_buff_hdr",161,"len")=48
 	Set gtmtypes("shmpool_buff_hdr",161,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.tp_cdb_sc_blkmod")=161
-	Set gtmtypes("shmpool_buff_hdr",161,"dim")=8
-	Set gtmtypes("shmpool_buff_hdr",162,"name")="shmpool_buff_hdr.shadow_file_header.jnl_alq"
-	Set gtmtypes("shmpool_buff_hdr",162,"off")=1264
-	Set gtmtypes("shmpool_buff_hdr",162,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",162,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_alq")=162
-	Set gtmtypes("shmpool_buff_hdr",163,"name")="shmpool_buff_hdr.shadow_file_header.jnl_deq"
-	Set gtmtypes("shmpool_buff_hdr",163,"off")=1268
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_tp_retries_conflicts")=161
+	Set gtmtypes("shmpool_buff_hdr",161,"dim")=12
+	Set gtmtypes("shmpool_buff_hdr",162,"name")="shmpool_buff_hdr.shadow_file_header.tp_cdb_sc_blkmod"
+	Set gtmtypes("shmpool_buff_hdr",162,"off")=1232
+	Set gtmtypes("shmpool_buff_hdr",162,"len")=32
+	Set gtmtypes("shmpool_buff_hdr",162,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.tp_cdb_sc_blkmod")=162
+	Set gtmtypes("shmpool_buff_hdr",162,"dim")=8
+	Set gtmtypes("shmpool_buff_hdr",163,"name")="shmpool_buff_hdr.shadow_file_header.jnl_alq"
+	Set gtmtypes("shmpool_buff_hdr",163,"off")=1264
 	Set gtmtypes("shmpool_buff_hdr",163,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",163,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_deq")=163
-	Set gtmtypes("shmpool_buff_hdr",164,"name")="shmpool_buff_hdr.shadow_file_header.jnl_buffer_size"
-	Set gtmtypes("shmpool_buff_hdr",164,"off")=1272
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_alq")=163
+	Set gtmtypes("shmpool_buff_hdr",164,"name")="shmpool_buff_hdr.shadow_file_header.jnl_deq"
+	Set gtmtypes("shmpool_buff_hdr",164,"off")=1268
 	Set gtmtypes("shmpool_buff_hdr",164,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",164,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_buffer_size")=164
-	Set gtmtypes("shmpool_buff_hdr",165,"name")="shmpool_buff_hdr.shadow_file_header.jnl_before_image"
-	Set gtmtypes("shmpool_buff_hdr",165,"off")=1276
+	Set gtmtypes("shmpool_buff_hdr",164,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_deq")=164
+	Set gtmtypes("shmpool_buff_hdr",165,"name")="shmpool_buff_hdr.shadow_file_header.jnl_buffer_size"
+	Set gtmtypes("shmpool_buff_hdr",165,"off")=1272
 	Set gtmtypes("shmpool_buff_hdr",165,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",165,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_before_image")=165
-	Set gtmtypes("shmpool_buff_hdr",166,"name")="shmpool_buff_hdr.shadow_file_header.jnl_state"
-	Set gtmtypes("shmpool_buff_hdr",166,"off")=1280
+	Set gtmtypes("shmpool_buff_hdr",165,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_buffer_size")=165
+	Set gtmtypes("shmpool_buff_hdr",166,"name")="shmpool_buff_hdr.shadow_file_header.jnl_before_image"
+	Set gtmtypes("shmpool_buff_hdr",166,"off")=1276
 	Set gtmtypes("shmpool_buff_hdr",166,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",166,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_state")=166
-	Set gtmtypes("shmpool_buff_hdr",167,"name")="shmpool_buff_hdr.shadow_file_header.jnl_file_len"
-	Set gtmtypes("shmpool_buff_hdr",167,"off")=1284
+	Set gtmtypes("shmpool_buff_hdr",166,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_before_image")=166
+	Set gtmtypes("shmpool_buff_hdr",167,"name")="shmpool_buff_hdr.shadow_file_header.jnl_state"
+	Set gtmtypes("shmpool_buff_hdr",167,"off")=1280
 	Set gtmtypes("shmpool_buff_hdr",167,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",167,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_file_len")=167
-	Set gtmtypes("shmpool_buff_hdr",168,"name")="shmpool_buff_hdr.shadow_file_header.autoswitchlimit"
-	Set gtmtypes("shmpool_buff_hdr",168,"off")=1288
+	Set gtmtypes("shmpool_buff_hdr",167,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_state")=167
+	Set gtmtypes("shmpool_buff_hdr",168,"name")="shmpool_buff_hdr.shadow_file_header.jnl_file_len"
+	Set gtmtypes("shmpool_buff_hdr",168,"off")=1284
 	Set gtmtypes("shmpool_buff_hdr",168,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",168,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.autoswitchlimit")=168
-	Set gtmtypes("shmpool_buff_hdr",169,"name")="shmpool_buff_hdr.shadow_file_header.epoch_interval"
-	Set gtmtypes("shmpool_buff_hdr",169,"off")=1292
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_file_len")=168
+	Set gtmtypes("shmpool_buff_hdr",169,"name")="shmpool_buff_hdr.shadow_file_header.autoswitchlimit"
+	Set gtmtypes("shmpool_buff_hdr",169,"off")=1288
 	Set gtmtypes("shmpool_buff_hdr",169,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",169,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.epoch_interval")=169
-	Set gtmtypes("shmpool_buff_hdr",170,"name")="shmpool_buff_hdr.shadow_file_header.alignsize"
-	Set gtmtypes("shmpool_buff_hdr",170,"off")=1296
+	Set gtmtypes("shmpool_buff_hdr",169,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.autoswitchlimit")=169
+	Set gtmtypes("shmpool_buff_hdr",170,"name")="shmpool_buff_hdr.shadow_file_header.epoch_interval"
+	Set gtmtypes("shmpool_buff_hdr",170,"off")=1292
 	Set gtmtypes("shmpool_buff_hdr",170,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",170,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.alignsize")=170
-	Set gtmtypes("shmpool_buff_hdr",171,"name")="shmpool_buff_hdr.shadow_file_header.jnl_sync_io"
-	Set gtmtypes("shmpool_buff_hdr",171,"off")=1300
+	Set gtmtypes("shmpool_buff_hdr",170,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.epoch_interval")=170
+	Set gtmtypes("shmpool_buff_hdr",171,"name")="shmpool_buff_hdr.shadow_file_header.alignsize"
+	Set gtmtypes("shmpool_buff_hdr",171,"off")=1296
 	Set gtmtypes("shmpool_buff_hdr",171,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",171,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_sync_io")=171
-	Set gtmtypes("shmpool_buff_hdr",172,"name")="shmpool_buff_hdr.shadow_file_header.yield_lmt"
-	Set gtmtypes("shmpool_buff_hdr",172,"off")=1304
+	Set gtmtypes("shmpool_buff_hdr",171,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.alignsize")=171
+	Set gtmtypes("shmpool_buff_hdr",172,"name")="shmpool_buff_hdr.shadow_file_header.jnl_sync_io"
+	Set gtmtypes("shmpool_buff_hdr",172,"off")=1300
 	Set gtmtypes("shmpool_buff_hdr",172,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",172,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.yield_lmt")=172
-	Set gtmtypes("shmpool_buff_hdr",173,"name")="shmpool_buff_hdr.shadow_file_header.turn_around_point"
-	Set gtmtypes("shmpool_buff_hdr",173,"off")=1308
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_sync_io")=172
+	Set gtmtypes("shmpool_buff_hdr",173,"name")="shmpool_buff_hdr.shadow_file_header.yield_lmt"
+	Set gtmtypes("shmpool_buff_hdr",173,"off")=1304
 	Set gtmtypes("shmpool_buff_hdr",173,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",173,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.turn_around_point")=173
-	Set gtmtypes("shmpool_buff_hdr",174,"name")="shmpool_buff_hdr.shadow_file_header.jnl_eovtn"
-	Set gtmtypes("shmpool_buff_hdr",174,"off")=1312
-	Set gtmtypes("shmpool_buff_hdr",174,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",174,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_eovtn")=174
-	Set gtmtypes("shmpool_buff_hdr",175,"name")="shmpool_buff_hdr.shadow_file_header.filler_jnl"
-	Set gtmtypes("shmpool_buff_hdr",175,"off")=1320
+	Set gtmtypes("shmpool_buff_hdr",173,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.yield_lmt")=173
+	Set gtmtypes("shmpool_buff_hdr",174,"name")="shmpool_buff_hdr.shadow_file_header.turn_around_point"
+	Set gtmtypes("shmpool_buff_hdr",174,"off")=1308
+	Set gtmtypes("shmpool_buff_hdr",174,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",174,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.turn_around_point")=174
+	Set gtmtypes("shmpool_buff_hdr",175,"name")="shmpool_buff_hdr.shadow_file_header.jnl_eovtn"
+	Set gtmtypes("shmpool_buff_hdr",175,"off")=1312
 	Set gtmtypes("shmpool_buff_hdr",175,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",175,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_jnl")=175
-	Set gtmtypes("shmpool_buff_hdr",176,"name")="shmpool_buff_hdr.shadow_file_header.intrpt_recov_resync_seqno"
-	Set gtmtypes("shmpool_buff_hdr",176,"off")=1328
+	Set gtmtypes("shmpool_buff_hdr",175,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_eovtn")=175
+	Set gtmtypes("shmpool_buff_hdr",176,"name")="shmpool_buff_hdr.shadow_file_header.filler_jnl"
+	Set gtmtypes("shmpool_buff_hdr",176,"off")=1320
 	Set gtmtypes("shmpool_buff_hdr",176,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",176,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.intrpt_recov_resync_seqno")=176
-	Set gtmtypes("shmpool_buff_hdr",177,"name")="shmpool_buff_hdr.shadow_file_header.intrpt_recov_tp_resolve_time"
-	Set gtmtypes("shmpool_buff_hdr",177,"off")=1336
-	Set gtmtypes("shmpool_buff_hdr",177,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",177,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.intrpt_recov_tp_resolve_time")=177
-	Set gtmtypes("shmpool_buff_hdr",178,"name")="shmpool_buff_hdr.shadow_file_header.recov_interrupted"
-	Set gtmtypes("shmpool_buff_hdr",178,"off")=1340
+	Set gtmtypes("shmpool_buff_hdr",176,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_jnl")=176
+	Set gtmtypes("shmpool_buff_hdr",177,"name")="shmpool_buff_hdr.shadow_file_header.intrpt_recov_resync_seqno"
+	Set gtmtypes("shmpool_buff_hdr",177,"off")=1328
+	Set gtmtypes("shmpool_buff_hdr",177,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",177,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.intrpt_recov_resync_seqno")=177
+	Set gtmtypes("shmpool_buff_hdr",178,"name")="shmpool_buff_hdr.shadow_file_header.intrpt_recov_tp_resolve_time"
+	Set gtmtypes("shmpool_buff_hdr",178,"off")=1336
 	Set gtmtypes("shmpool_buff_hdr",178,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",178,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recov_interrupted")=178
-	Set gtmtypes("shmpool_buff_hdr",179,"name")="shmpool_buff_hdr.shadow_file_header.intrpt_recov_jnl_state"
-	Set gtmtypes("shmpool_buff_hdr",179,"off")=1344
+	Set gtmtypes("shmpool_buff_hdr",178,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.intrpt_recov_tp_resolve_time")=178
+	Set gtmtypes("shmpool_buff_hdr",179,"name")="shmpool_buff_hdr.shadow_file_header.recov_interrupted"
+	Set gtmtypes("shmpool_buff_hdr",179,"off")=1340
 	Set gtmtypes("shmpool_buff_hdr",179,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",179,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.intrpt_recov_jnl_state")=179
-	Set gtmtypes("shmpool_buff_hdr",180,"name")="shmpool_buff_hdr.shadow_file_header.intrpt_recov_repl_state"
-	Set gtmtypes("shmpool_buff_hdr",180,"off")=1348
+	Set gtmtypes("shmpool_buff_hdr",179,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recov_interrupted")=179
+	Set gtmtypes("shmpool_buff_hdr",180,"name")="shmpool_buff_hdr.shadow_file_header.intrpt_recov_jnl_state"
+	Set gtmtypes("shmpool_buff_hdr",180,"off")=1344
 	Set gtmtypes("shmpool_buff_hdr",180,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",180,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.intrpt_recov_repl_state")=180
-	Set gtmtypes("shmpool_buff_hdr",181,"name")="shmpool_buff_hdr.shadow_file_header.before_trunc_total_blks"
-	Set gtmtypes("shmpool_buff_hdr",181,"off")=1352
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.intrpt_recov_jnl_state")=180
+	Set gtmtypes("shmpool_buff_hdr",181,"name")="shmpool_buff_hdr.shadow_file_header.intrpt_recov_repl_state"
+	Set gtmtypes("shmpool_buff_hdr",181,"off")=1348
 	Set gtmtypes("shmpool_buff_hdr",181,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",181,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.before_trunc_total_blks")=181
-	Set gtmtypes("shmpool_buff_hdr",182,"name")="shmpool_buff_hdr.shadow_file_header.after_trunc_total_blks"
-	Set gtmtypes("shmpool_buff_hdr",182,"off")=1356
+	Set gtmtypes("shmpool_buff_hdr",181,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.intrpt_recov_repl_state")=181
+	Set gtmtypes("shmpool_buff_hdr",182,"name")="shmpool_buff_hdr.shadow_file_header.before_trunc_total_blks"
+	Set gtmtypes("shmpool_buff_hdr",182,"off")=1352
 	Set gtmtypes("shmpool_buff_hdr",182,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",182,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.after_trunc_total_blks")=182
-	Set gtmtypes("shmpool_buff_hdr",183,"name")="shmpool_buff_hdr.shadow_file_header.before_trunc_free_blocks"
-	Set gtmtypes("shmpool_buff_hdr",183,"off")=1360
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.before_trunc_total_blks")=182
+	Set gtmtypes("shmpool_buff_hdr",183,"name")="shmpool_buff_hdr.shadow_file_header.after_trunc_total_blks"
+	Set gtmtypes("shmpool_buff_hdr",183,"off")=1356
 	Set gtmtypes("shmpool_buff_hdr",183,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",183,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.before_trunc_free_blocks")=183
-	Set gtmtypes("shmpool_buff_hdr",184,"name")="shmpool_buff_hdr.shadow_file_header.filler_trunc"
-	Set gtmtypes("shmpool_buff_hdr",184,"off")=1364
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.after_trunc_total_blks")=183
+	Set gtmtypes("shmpool_buff_hdr",184,"name")="shmpool_buff_hdr.shadow_file_header.before_trunc_free_blocks"
+	Set gtmtypes("shmpool_buff_hdr",184,"off")=1360
 	Set gtmtypes("shmpool_buff_hdr",184,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",184,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_trunc")=184
-	Set gtmtypes("shmpool_buff_hdr",185,"name")="shmpool_buff_hdr.shadow_file_header.filler_1k"
-	Set gtmtypes("shmpool_buff_hdr",185,"off")=1368
-	Set gtmtypes("shmpool_buff_hdr",185,"len")=24
-	Set gtmtypes("shmpool_buff_hdr",185,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_1k")=185
-	Set gtmtypes("shmpool_buff_hdr",186,"name")="shmpool_buff_hdr.shadow_file_header.jnl_file_name"
-	Set gtmtypes("shmpool_buff_hdr",186,"off")=1392
-	Set gtmtypes("shmpool_buff_hdr",186,"len")=256
-	Set gtmtypes("shmpool_buff_hdr",186,"type")="unsigned-char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_file_name")=186
-	Set gtmtypes("shmpool_buff_hdr",187,"name")="shmpool_buff_hdr.shadow_file_header.reorg_restart_key"
-	Set gtmtypes("shmpool_buff_hdr",187,"off")=1648
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.before_trunc_free_blocks")=184
+	Set gtmtypes("shmpool_buff_hdr",185,"name")="shmpool_buff_hdr.shadow_file_header.filler_trunc"
+	Set gtmtypes("shmpool_buff_hdr",185,"off")=1364
+	Set gtmtypes("shmpool_buff_hdr",185,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",185,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_trunc")=185
+	Set gtmtypes("shmpool_buff_hdr",186,"name")="shmpool_buff_hdr.shadow_file_header.filler_1k"
+	Set gtmtypes("shmpool_buff_hdr",186,"off")=1368
+	Set gtmtypes("shmpool_buff_hdr",186,"len")=24
+	Set gtmtypes("shmpool_buff_hdr",186,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_1k")=186
+	Set gtmtypes("shmpool_buff_hdr",187,"name")="shmpool_buff_hdr.shadow_file_header.jnl_file_name"
+	Set gtmtypes("shmpool_buff_hdr",187,"off")=1392
 	Set gtmtypes("shmpool_buff_hdr",187,"len")=256
 	Set gtmtypes("shmpool_buff_hdr",187,"type")="unsigned-char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reorg_restart_key")=187
-	Set gtmtypes("shmpool_buff_hdr",188,"name")="shmpool_buff_hdr.shadow_file_header.machine_name"
-	Set gtmtypes("shmpool_buff_hdr",188,"off")=1904
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_file_name")=187
+	Set gtmtypes("shmpool_buff_hdr",188,"name")="shmpool_buff_hdr.shadow_file_header.reorg_restart_key"
+	Set gtmtypes("shmpool_buff_hdr",188,"off")=1648
 	Set gtmtypes("shmpool_buff_hdr",188,"len")=256
-	Set gtmtypes("shmpool_buff_hdr",188,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.machine_name")=188
-	Set gtmtypes("shmpool_buff_hdr",189,"name")="shmpool_buff_hdr.shadow_file_header.encryption_hash"
-	Set gtmtypes("shmpool_buff_hdr",189,"off")=2160
-	Set gtmtypes("shmpool_buff_hdr",189,"len")=80
+	Set gtmtypes("shmpool_buff_hdr",188,"type")="unsigned-char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reorg_restart_key")=188
+	Set gtmtypes("shmpool_buff_hdr",189,"name")="shmpool_buff_hdr.shadow_file_header.machine_name"
+	Set gtmtypes("shmpool_buff_hdr",189,"off")=1904
+	Set gtmtypes("shmpool_buff_hdr",189,"len")=256
 	Set gtmtypes("shmpool_buff_hdr",189,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.encryption_hash")=189
-	Set gtmtypes("shmpool_buff_hdr",190,"name")="shmpool_buff_hdr.shadow_file_header.encryption_hash2"
-	Set gtmtypes("shmpool_buff_hdr",190,"off")=2240
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.machine_name")=189
+	Set gtmtypes("shmpool_buff_hdr",190,"name")="shmpool_buff_hdr.shadow_file_header.encryption_hash"
+	Set gtmtypes("shmpool_buff_hdr",190,"off")=2160
 	Set gtmtypes("shmpool_buff_hdr",190,"len")=80
 	Set gtmtypes("shmpool_buff_hdr",190,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.encryption_hash2")=190
-	Set gtmtypes("shmpool_buff_hdr",191,"name")="shmpool_buff_hdr.shadow_file_header.non_null_iv"
-	Set gtmtypes("shmpool_buff_hdr",191,"off")=2320
-	Set gtmtypes("shmpool_buff_hdr",191,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",191,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.non_null_iv")=191
-	Set gtmtypes("shmpool_buff_hdr",192,"name")="shmpool_buff_hdr.shadow_file_header.encryption_hash_cutoff"
-	Set gtmtypes("shmpool_buff_hdr",192,"off")=2324
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.encryption_hash")=190
+	Set gtmtypes("shmpool_buff_hdr",191,"name")="shmpool_buff_hdr.shadow_file_header.encryption_hash2"
+	Set gtmtypes("shmpool_buff_hdr",191,"off")=2240
+	Set gtmtypes("shmpool_buff_hdr",191,"len")=80
+	Set gtmtypes("shmpool_buff_hdr",191,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.encryption_hash2")=191
+	Set gtmtypes("shmpool_buff_hdr",192,"name")="shmpool_buff_hdr.shadow_file_header.non_null_iv"
+	Set gtmtypes("shmpool_buff_hdr",192,"off")=2320
 	Set gtmtypes("shmpool_buff_hdr",192,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",192,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.encryption_hash_cutoff")=192
-	Set gtmtypes("shmpool_buff_hdr",193,"name")="shmpool_buff_hdr.shadow_file_header.encryption_hash2_start_tn"
-	Set gtmtypes("shmpool_buff_hdr",193,"off")=2328
-	Set gtmtypes("shmpool_buff_hdr",193,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",193,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.encryption_hash2_start_tn")=193
-	Set gtmtypes("shmpool_buff_hdr",194,"name")="shmpool_buff_hdr.shadow_file_header.filler_encrypt"
-	Set gtmtypes("shmpool_buff_hdr",194,"off")=2336
-	Set gtmtypes("shmpool_buff_hdr",194,"len")=80
-	Set gtmtypes("shmpool_buff_hdr",194,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_encrypt")=194
-	Set gtmtypes("shmpool_buff_hdr",195,"name")="shmpool_buff_hdr.shadow_file_header.total_buffer_flush_tn"
-	Set gtmtypes("shmpool_buff_hdr",195,"off")=2416
-	Set gtmtypes("shmpool_buff_hdr",195,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",195,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.total_buffer_flush_tn")=195
-	Set gtmtypes("shmpool_buff_hdr",196,"name")="shmpool_buff_hdr.shadow_file_header.bufct_buffer_flush_tn"
-	Set gtmtypes("shmpool_buff_hdr",196,"off")=2424
+	Set gtmtypes("shmpool_buff_hdr",192,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.non_null_iv")=192
+	Set gtmtypes("shmpool_buff_hdr",193,"name")="shmpool_buff_hdr.shadow_file_header.encryption_hash_cutoff"
+	Set gtmtypes("shmpool_buff_hdr",193,"off")=2324
+	Set gtmtypes("shmpool_buff_hdr",193,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",193,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.encryption_hash_cutoff")=193
+	Set gtmtypes("shmpool_buff_hdr",194,"name")="shmpool_buff_hdr.shadow_file_header.encryption_hash2_start_tn"
+	Set gtmtypes("shmpool_buff_hdr",194,"off")=2328
+	Set gtmtypes("shmpool_buff_hdr",194,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",194,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.encryption_hash2_start_tn")=194
+	Set gtmtypes("shmpool_buff_hdr",195,"name")="shmpool_buff_hdr.shadow_file_header.filler_encrypt"
+	Set gtmtypes("shmpool_buff_hdr",195,"off")=2336
+	Set gtmtypes("shmpool_buff_hdr",195,"len")=80
+	Set gtmtypes("shmpool_buff_hdr",195,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_encrypt")=195
+	Set gtmtypes("shmpool_buff_hdr",196,"name")="shmpool_buff_hdr.shadow_file_header.total_buffer_flush_tn"
+	Set gtmtypes("shmpool_buff_hdr",196,"off")=2416
 	Set gtmtypes("shmpool_buff_hdr",196,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",196,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bufct_buffer_flush_tn")=196
-	Set gtmtypes("shmpool_buff_hdr",197,"name")="shmpool_buff_hdr.shadow_file_header.bufct_buffer_flush_loop_tn"
-	Set gtmtypes("shmpool_buff_hdr",197,"off")=2432
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.total_buffer_flush_tn")=196
+	Set gtmtypes("shmpool_buff_hdr",197,"name")="shmpool_buff_hdr.shadow_file_header.bufct_buffer_flush_tn"
+	Set gtmtypes("shmpool_buff_hdr",197,"off")=2424
 	Set gtmtypes("shmpool_buff_hdr",197,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",197,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bufct_buffer_flush_loop_tn")=197
-	Set gtmtypes("shmpool_buff_hdr",198,"name")="shmpool_buff_hdr.shadow_file_header.wrt_calls_tn"
-	Set gtmtypes("shmpool_buff_hdr",198,"off")=2440
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bufct_buffer_flush_tn")=197
+	Set gtmtypes("shmpool_buff_hdr",198,"name")="shmpool_buff_hdr.shadow_file_header.bufct_buffer_flush_loop_tn"
+	Set gtmtypes("shmpool_buff_hdr",198,"off")=2432
 	Set gtmtypes("shmpool_buff_hdr",198,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",198,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_calls_tn")=198
-	Set gtmtypes("shmpool_buff_hdr",199,"name")="shmpool_buff_hdr.shadow_file_header.wrt_count_tn"
-	Set gtmtypes("shmpool_buff_hdr",199,"off")=2448
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bufct_buffer_flush_loop_tn")=198
+	Set gtmtypes("shmpool_buff_hdr",199,"name")="shmpool_buff_hdr.shadow_file_header.wrt_calls_tn"
+	Set gtmtypes("shmpool_buff_hdr",199,"off")=2440
 	Set gtmtypes("shmpool_buff_hdr",199,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",199,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_count_tn")=199
-	Set gtmtypes("shmpool_buff_hdr",200,"name")="shmpool_buff_hdr.shadow_file_header.wrt_blocked_tn"
-	Set gtmtypes("shmpool_buff_hdr",200,"off")=2456
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_calls_tn")=199
+	Set gtmtypes("shmpool_buff_hdr",200,"name")="shmpool_buff_hdr.shadow_file_header.wrt_count_tn"
+	Set gtmtypes("shmpool_buff_hdr",200,"off")=2448
 	Set gtmtypes("shmpool_buff_hdr",200,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",200,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_blocked_tn")=200
-	Set gtmtypes("shmpool_buff_hdr",201,"name")="shmpool_buff_hdr.shadow_file_header.wrt_busy_tn"
-	Set gtmtypes("shmpool_buff_hdr",201,"off")=2464
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_count_tn")=200
+	Set gtmtypes("shmpool_buff_hdr",201,"name")="shmpool_buff_hdr.shadow_file_header.wrt_blocked_tn"
+	Set gtmtypes("shmpool_buff_hdr",201,"off")=2456
 	Set gtmtypes("shmpool_buff_hdr",201,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",201,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_busy_tn")=201
-	Set gtmtypes("shmpool_buff_hdr",202,"name")="shmpool_buff_hdr.shadow_file_header.wrt_noblks_wrtn_tn"
-	Set gtmtypes("shmpool_buff_hdr",202,"off")=2472
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_blocked_tn")=201
+	Set gtmtypes("shmpool_buff_hdr",202,"name")="shmpool_buff_hdr.shadow_file_header.wrt_busy_tn"
+	Set gtmtypes("shmpool_buff_hdr",202,"off")=2464
 	Set gtmtypes("shmpool_buff_hdr",202,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",202,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_noblks_wrtn_tn")=202
-	Set gtmtypes("shmpool_buff_hdr",203,"name")="shmpool_buff_hdr.shadow_file_header.reserved_bgtrcrec1_tn"
-	Set gtmtypes("shmpool_buff_hdr",203,"off")=2480
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_busy_tn")=202
+	Set gtmtypes("shmpool_buff_hdr",203,"name")="shmpool_buff_hdr.shadow_file_header.wrt_noblks_wrtn_tn"
+	Set gtmtypes("shmpool_buff_hdr",203,"off")=2472
 	Set gtmtypes("shmpool_buff_hdr",203,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",203,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reserved_bgtrcrec1_tn")=203
-	Set gtmtypes("shmpool_buff_hdr",204,"name")="shmpool_buff_hdr.shadow_file_header.reserved_bgtrcrec2_tn"
-	Set gtmtypes("shmpool_buff_hdr",204,"off")=2488
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_noblks_wrtn_tn")=203
+	Set gtmtypes("shmpool_buff_hdr",204,"name")="shmpool_buff_hdr.shadow_file_header.reserved_bgtrcrec1_tn"
+	Set gtmtypes("shmpool_buff_hdr",204,"off")=2480
 	Set gtmtypes("shmpool_buff_hdr",204,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",204,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reserved_bgtrcrec2_tn")=204
-	Set gtmtypes("shmpool_buff_hdr",205,"name")="shmpool_buff_hdr.shadow_file_header.reserved_bgtrcrec3_tn"
-	Set gtmtypes("shmpool_buff_hdr",205,"off")=2496
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reserved_bgtrcrec1_tn")=204
+	Set gtmtypes("shmpool_buff_hdr",205,"name")="shmpool_buff_hdr.shadow_file_header.reserved_bgtrcrec2_tn"
+	Set gtmtypes("shmpool_buff_hdr",205,"off")=2488
 	Set gtmtypes("shmpool_buff_hdr",205,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",205,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reserved_bgtrcrec3_tn")=205
-	Set gtmtypes("shmpool_buff_hdr",206,"name")="shmpool_buff_hdr.shadow_file_header.lost_block_recovery_tn"
-	Set gtmtypes("shmpool_buff_hdr",206,"off")=2504
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reserved_bgtrcrec2_tn")=205
+	Set gtmtypes("shmpool_buff_hdr",206,"name")="shmpool_buff_hdr.shadow_file_header.reserved_bgtrcrec3_tn"
+	Set gtmtypes("shmpool_buff_hdr",206,"off")=2496
 	Set gtmtypes("shmpool_buff_hdr",206,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",206,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.lost_block_recovery_tn")=206
-	Set gtmtypes("shmpool_buff_hdr",207,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_onln_rlbk_tn"
-	Set gtmtypes("shmpool_buff_hdr",207,"off")=2512
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reserved_bgtrcrec3_tn")=206
+	Set gtmtypes("shmpool_buff_hdr",207,"name")="shmpool_buff_hdr.shadow_file_header.lost_block_recovery_tn"
+	Set gtmtypes("shmpool_buff_hdr",207,"off")=2504
 	Set gtmtypes("shmpool_buff_hdr",207,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",207,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_onln_rlbk_tn")=207
-	Set gtmtypes("shmpool_buff_hdr",208,"name")="shmpool_buff_hdr.shadow_file_header.stale_tn"
-	Set gtmtypes("shmpool_buff_hdr",208,"off")=2520
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.lost_block_recovery_tn")=207
+	Set gtmtypes("shmpool_buff_hdr",208,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_onln_rlbk_tn"
+	Set gtmtypes("shmpool_buff_hdr",208,"off")=2512
 	Set gtmtypes("shmpool_buff_hdr",208,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",208,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_tn")=208
-	Set gtmtypes("shmpool_buff_hdr",209,"name")="shmpool_buff_hdr.shadow_file_header.starved_tn"
-	Set gtmtypes("shmpool_buff_hdr",209,"off")=2528
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_onln_rlbk_tn")=208
+	Set gtmtypes("shmpool_buff_hdr",209,"name")="shmpool_buff_hdr.shadow_file_header.stale_tn"
+	Set gtmtypes("shmpool_buff_hdr",209,"off")=2520
 	Set gtmtypes("shmpool_buff_hdr",209,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",209,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.starved_tn")=209
-	Set gtmtypes("shmpool_buff_hdr",210,"name")="shmpool_buff_hdr.shadow_file_header.stale_timer_started_tn"
-	Set gtmtypes("shmpool_buff_hdr",210,"off")=2536
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_tn")=209
+	Set gtmtypes("shmpool_buff_hdr",210,"name")="shmpool_buff_hdr.shadow_file_header.starved_tn"
+	Set gtmtypes("shmpool_buff_hdr",210,"off")=2528
 	Set gtmtypes("shmpool_buff_hdr",210,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",210,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_timer_started_tn")=210
-	Set gtmtypes("shmpool_buff_hdr",211,"name")="shmpool_buff_hdr.shadow_file_header.stale_timer_pop_tn"
-	Set gtmtypes("shmpool_buff_hdr",211,"off")=2544
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.starved_tn")=210
+	Set gtmtypes("shmpool_buff_hdr",211,"name")="shmpool_buff_hdr.shadow_file_header.stale_timer_started_tn"
+	Set gtmtypes("shmpool_buff_hdr",211,"off")=2536
 	Set gtmtypes("shmpool_buff_hdr",211,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",211,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_timer_pop_tn")=211
-	Set gtmtypes("shmpool_buff_hdr",212,"name")="shmpool_buff_hdr.shadow_file_header.stale_process_defer_tn"
-	Set gtmtypes("shmpool_buff_hdr",212,"off")=2552
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_timer_started_tn")=211
+	Set gtmtypes("shmpool_buff_hdr",212,"name")="shmpool_buff_hdr.shadow_file_header.stale_timer_pop_tn"
+	Set gtmtypes("shmpool_buff_hdr",212,"off")=2544
 	Set gtmtypes("shmpool_buff_hdr",212,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",212,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_process_defer_tn")=212
-	Set gtmtypes("shmpool_buff_hdr",213,"name")="shmpool_buff_hdr.shadow_file_header.stale_defer_processed_tn"
-	Set gtmtypes("shmpool_buff_hdr",213,"off")=2560
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_timer_pop_tn")=212
+	Set gtmtypes("shmpool_buff_hdr",213,"name")="shmpool_buff_hdr.shadow_file_header.stale_process_defer_tn"
+	Set gtmtypes("shmpool_buff_hdr",213,"off")=2552
 	Set gtmtypes("shmpool_buff_hdr",213,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",213,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_defer_processed_tn")=213
-	Set gtmtypes("shmpool_buff_hdr",214,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flush_tn"
-	Set gtmtypes("shmpool_buff_hdr",214,"off")=2568
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_process_defer_tn")=213
+	Set gtmtypes("shmpool_buff_hdr",214,"name")="shmpool_buff_hdr.shadow_file_header.stale_defer_processed_tn"
+	Set gtmtypes("shmpool_buff_hdr",214,"off")=2560
 	Set gtmtypes("shmpool_buff_hdr",214,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",214,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flush_tn")=214
-	Set gtmtypes("shmpool_buff_hdr",215,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flush_loop_tn"
-	Set gtmtypes("shmpool_buff_hdr",215,"off")=2576
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_defer_processed_tn")=214
+	Set gtmtypes("shmpool_buff_hdr",215,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flush_tn"
+	Set gtmtypes("shmpool_buff_hdr",215,"off")=2568
 	Set gtmtypes("shmpool_buff_hdr",215,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",215,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flush_loop_tn")=215
-	Set gtmtypes("shmpool_buff_hdr",216,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flush_retries_tn"
-	Set gtmtypes("shmpool_buff_hdr",216,"off")=2584
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flush_tn")=215
+	Set gtmtypes("shmpool_buff_hdr",216,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flush_loop_tn"
+	Set gtmtypes("shmpool_buff_hdr",216,"off")=2576
 	Set gtmtypes("shmpool_buff_hdr",216,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",216,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flush_retries_tn")=216
-	Set gtmtypes("shmpool_buff_hdr",217,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flushed_during_lockwait_tn"
-	Set gtmtypes("shmpool_buff_hdr",217,"off")=2592
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flush_loop_tn")=216
+	Set gtmtypes("shmpool_buff_hdr",217,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flush_retries_tn"
+	Set gtmtypes("shmpool_buff_hdr",217,"off")=2584
 	Set gtmtypes("shmpool_buff_hdr",217,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",217,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flushed_during_lockwait_tn")=217
-	Set gtmtypes("shmpool_buff_hdr",218,"name")="shmpool_buff_hdr.shadow_file_header.tp_crit_retries_tn"
-	Set gtmtypes("shmpool_buff_hdr",218,"off")=2600
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flush_retries_tn")=217
+	Set gtmtypes("shmpool_buff_hdr",218,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flushed_during_lockwait_tn"
+	Set gtmtypes("shmpool_buff_hdr",218,"off")=2592
 	Set gtmtypes("shmpool_buff_hdr",218,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",218,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.tp_crit_retries_tn")=218
-	Set gtmtypes("shmpool_buff_hdr",219,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_flush_dirty_tn"
-	Set gtmtypes("shmpool_buff_hdr",219,"off")=2608
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flushed_during_lockwait_tn")=218
+	Set gtmtypes("shmpool_buff_hdr",219,"name")="shmpool_buff_hdr.shadow_file_header.tp_crit_retries_tn"
+	Set gtmtypes("shmpool_buff_hdr",219,"off")=2600
 	Set gtmtypes("shmpool_buff_hdr",219,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",219,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_flush_dirty_tn")=219
-	Set gtmtypes("shmpool_buff_hdr",220,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_rip_wait_tn"
-	Set gtmtypes("shmpool_buff_hdr",220,"off")=2616
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.tp_crit_retries_tn")=219
+	Set gtmtypes("shmpool_buff_hdr",220,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_flush_dirty_tn"
+	Set gtmtypes("shmpool_buff_hdr",220,"off")=2608
 	Set gtmtypes("shmpool_buff_hdr",220,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",220,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_rip_wait_tn")=220
-	Set gtmtypes("shmpool_buff_hdr",221,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_buf_owner_stuck_tn"
-	Set gtmtypes("shmpool_buff_hdr",221,"off")=2624
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_flush_dirty_tn")=220
+	Set gtmtypes("shmpool_buff_hdr",221,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_rip_wait_tn"
+	Set gtmtypes("shmpool_buff_hdr",221,"off")=2616
 	Set gtmtypes("shmpool_buff_hdr",221,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",221,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_buf_owner_stuck_tn")=221
-	Set gtmtypes("shmpool_buff_hdr",222,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_out_of_design_tn"
-	Set gtmtypes("shmpool_buff_hdr",222,"off")=2632
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_rip_wait_tn")=221
+	Set gtmtypes("shmpool_buff_hdr",222,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_buf_owner_stuck_tn"
+	Set gtmtypes("shmpool_buff_hdr",222,"off")=2624
 	Set gtmtypes("shmpool_buff_hdr",222,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",222,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_out_of_design_tn")=222
-	Set gtmtypes("shmpool_buff_hdr",223,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_buf_owner_stuck_tn"
-	Set gtmtypes("shmpool_buff_hdr",223,"off")=2640
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_buf_owner_stuck_tn")=222
+	Set gtmtypes("shmpool_buff_hdr",223,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_out_of_design_tn"
+	Set gtmtypes("shmpool_buff_hdr",223,"off")=2632
 	Set gtmtypes("shmpool_buff_hdr",223,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",223,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_buf_owner_stuck_tn")=223
-	Set gtmtypes("shmpool_buff_hdr",224,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_out_of_design_tn"
-	Set gtmtypes("shmpool_buff_hdr",224,"off")=2648
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_out_of_design_tn")=223
+	Set gtmtypes("shmpool_buff_hdr",224,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_buf_owner_stuck_tn"
+	Set gtmtypes("shmpool_buff_hdr",224,"off")=2640
 	Set gtmtypes("shmpool_buff_hdr",224,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",224,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_out_of_design_tn")=224
-	Set gtmtypes("shmpool_buff_hdr",225,"name")="shmpool_buff_hdr.shadow_file_header.bt_put_flush_dirty_tn"
-	Set gtmtypes("shmpool_buff_hdr",225,"off")=2656
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_buf_owner_stuck_tn")=224
+	Set gtmtypes("shmpool_buff_hdr",225,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_out_of_design_tn"
+	Set gtmtypes("shmpool_buff_hdr",225,"off")=2648
 	Set gtmtypes("shmpool_buff_hdr",225,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",225,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bt_put_flush_dirty_tn")=225
-	Set gtmtypes("shmpool_buff_hdr",226,"name")="shmpool_buff_hdr.shadow_file_header.mlock_wakeups_tn"
-	Set gtmtypes("shmpool_buff_hdr",226,"off")=2664
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_out_of_design_tn")=225
+	Set gtmtypes("shmpool_buff_hdr",226,"name")="shmpool_buff_hdr.shadow_file_header.bt_put_flush_dirty_tn"
+	Set gtmtypes("shmpool_buff_hdr",226,"off")=2656
 	Set gtmtypes("shmpool_buff_hdr",226,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",226,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.mlock_wakeups_tn")=226
-	Set gtmtypes("shmpool_buff_hdr",227,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_recover_invoked_tn"
-	Set gtmtypes("shmpool_buff_hdr",227,"off")=2672
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bt_put_flush_dirty_tn")=226
+	Set gtmtypes("shmpool_buff_hdr",227,"name")="shmpool_buff_hdr.shadow_file_header.mlock_wakeups_tn"
+	Set gtmtypes("shmpool_buff_hdr",227,"off")=2664
 	Set gtmtypes("shmpool_buff_hdr",227,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",227,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_recover_invoked_tn")=227
-	Set gtmtypes("shmpool_buff_hdr",228,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_verify_passed_tn"
-	Set gtmtypes("shmpool_buff_hdr",228,"off")=2680
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.mlock_wakeups_tn")=227
+	Set gtmtypes("shmpool_buff_hdr",228,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_recover_invoked_tn"
+	Set gtmtypes("shmpool_buff_hdr",228,"off")=2672
 	Set gtmtypes("shmpool_buff_hdr",228,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",228,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_verify_passed_tn")=228
-	Set gtmtypes("shmpool_buff_hdr",229,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_tn"
-	Set gtmtypes("shmpool_buff_hdr",229,"off")=2688
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_recover_invoked_tn")=228
+	Set gtmtypes("shmpool_buff_hdr",229,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_verify_passed_tn"
+	Set gtmtypes("shmpool_buff_hdr",229,"off")=2680
 	Set gtmtypes("shmpool_buff_hdr",229,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",229,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_tn")=229
-	Set gtmtypes("shmpool_buff_hdr",230,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_tn"
-	Set gtmtypes("shmpool_buff_hdr",230,"off")=2696
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_verify_passed_tn")=229
+	Set gtmtypes("shmpool_buff_hdr",230,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_tn"
+	Set gtmtypes("shmpool_buff_hdr",230,"off")=2688
 	Set gtmtypes("shmpool_buff_hdr",230,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",230,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_tn")=230
-	Set gtmtypes("shmpool_buff_hdr",231,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_db_csh_getn_loopexceed_tn"
-	Set gtmtypes("shmpool_buff_hdr",231,"off")=2704
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_tn")=230
+	Set gtmtypes("shmpool_buff_hdr",231,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_tn"
+	Set gtmtypes("shmpool_buff_hdr",231,"off")=2696
 	Set gtmtypes("shmpool_buff_hdr",231,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",231,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_db_csh_getn_loopexceed_tn")=231
-	Set gtmtypes("shmpool_buff_hdr",232,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_tn"
-	Set gtmtypes("shmpool_buff_hdr",232,"off")=2712
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_tn")=231
+	Set gtmtypes("shmpool_buff_hdr",232,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_db_csh_getn_loopexceed_tn"
+	Set gtmtypes("shmpool_buff_hdr",232,"off")=2704
 	Set gtmtypes("shmpool_buff_hdr",232,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",232,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_tn")=232
-	Set gtmtypes("shmpool_buff_hdr",233,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_db_csh_get_tn"
-	Set gtmtypes("shmpool_buff_hdr",233,"off")=2720
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_db_csh_getn_loopexceed_tn")=232
+	Set gtmtypes("shmpool_buff_hdr",233,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_tn"
+	Set gtmtypes("shmpool_buff_hdr",233,"off")=2712
 	Set gtmtypes("shmpool_buff_hdr",233,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",233,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_db_csh_get_tn")=233
-	Set gtmtypes("shmpool_buff_hdr",234,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_wcsgetspace_tn"
-	Set gtmtypes("shmpool_buff_hdr",234,"off")=2728
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_tn")=233
+	Set gtmtypes("shmpool_buff_hdr",234,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_db_csh_get_tn"
+	Set gtmtypes("shmpool_buff_hdr",234,"off")=2720
 	Set gtmtypes("shmpool_buff_hdr",234,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",234,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_wcsgetspace_tn")=234
-	Set gtmtypes("shmpool_buff_hdr",235,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_t1_tn"
-	Set gtmtypes("shmpool_buff_hdr",235,"off")=2736
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_db_csh_get_tn")=234
+	Set gtmtypes("shmpool_buff_hdr",235,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_wcsgetspace_tn"
+	Set gtmtypes("shmpool_buff_hdr",235,"off")=2728
 	Set gtmtypes("shmpool_buff_hdr",235,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",235,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_t1_tn")=235
-	Set gtmtypes("shmpool_buff_hdr",236,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_bitmap_tn"
-	Set gtmtypes("shmpool_buff_hdr",236,"off")=2744
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_wcsgetspace_tn")=235
+	Set gtmtypes("shmpool_buff_hdr",236,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_t1_tn"
+	Set gtmtypes("shmpool_buff_hdr",236,"off")=2736
 	Set gtmtypes("shmpool_buff_hdr",236,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",236,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_bitmap_tn")=236
-	Set gtmtypes("shmpool_buff_hdr",237,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_jnl_cwset_tn"
-	Set gtmtypes("shmpool_buff_hdr",237,"off")=2752
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_t1_tn")=236
+	Set gtmtypes("shmpool_buff_hdr",237,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_bitmap_tn"
+	Set gtmtypes("shmpool_buff_hdr",237,"off")=2744
 	Set gtmtypes("shmpool_buff_hdr",237,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",237,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_jnl_cwset_tn")=237
-	Set gtmtypes("shmpool_buff_hdr",238,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_tn"
-	Set gtmtypes("shmpool_buff_hdr",238,"off")=2760
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_bitmap_tn")=237
+	Set gtmtypes("shmpool_buff_hdr",238,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_jnl_cwset_tn"
+	Set gtmtypes("shmpool_buff_hdr",238,"off")=2752
 	Set gtmtypes("shmpool_buff_hdr",238,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",238,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_tn")=238
-	Set gtmtypes("shmpool_buff_hdr",239,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_hist_tn"
-	Set gtmtypes("shmpool_buff_hdr",239,"off")=2768
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_jnl_cwset_tn")=238
+	Set gtmtypes("shmpool_buff_hdr",239,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_tn"
+	Set gtmtypes("shmpool_buff_hdr",239,"off")=2760
 	Set gtmtypes("shmpool_buff_hdr",239,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",239,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_hist_tn")=239
-	Set gtmtypes("shmpool_buff_hdr",240,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_hist1_nullbt_tn"
-	Set gtmtypes("shmpool_buff_hdr",240,"off")=2776
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_tn")=239
+	Set gtmtypes("shmpool_buff_hdr",240,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_hist_tn"
+	Set gtmtypes("shmpool_buff_hdr",240,"off")=2768
 	Set gtmtypes("shmpool_buff_hdr",240,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",240,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_hist1_nullbt_tn")=240
-	Set gtmtypes("shmpool_buff_hdr",241,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_tn"
-	Set gtmtypes("shmpool_buff_hdr",241,"off")=2784
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_hist_tn")=240
+	Set gtmtypes("shmpool_buff_hdr",241,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_hist1_nullbt_tn"
+	Set gtmtypes("shmpool_buff_hdr",241,"off")=2776
 	Set gtmtypes("shmpool_buff_hdr",241,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",241,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_tn")=241
-	Set gtmtypes("shmpool_buff_hdr",242,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_bitmap_nullbt_tn"
-	Set gtmtypes("shmpool_buff_hdr",242,"off")=2792
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_hist1_nullbt_tn")=241
+	Set gtmtypes("shmpool_buff_hdr",242,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_tn"
+	Set gtmtypes("shmpool_buff_hdr",242,"off")=2784
 	Set gtmtypes("shmpool_buff_hdr",242,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",242,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_bitmap_nullbt_tn")=242
-	Set gtmtypes("shmpool_buff_hdr",243,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_tn"
-	Set gtmtypes("shmpool_buff_hdr",243,"off")=2800
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_tn")=242
+	Set gtmtypes("shmpool_buff_hdr",243,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_bitmap_nullbt_tn"
+	Set gtmtypes("shmpool_buff_hdr",243,"off")=2792
 	Set gtmtypes("shmpool_buff_hdr",243,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",243,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_tn")=243
-	Set gtmtypes("shmpool_buff_hdr",244,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_jnl_cwset_tn"
-	Set gtmtypes("shmpool_buff_hdr",244,"off")=2808
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_bitmap_nullbt_tn")=243
+	Set gtmtypes("shmpool_buff_hdr",244,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_tn"
+	Set gtmtypes("shmpool_buff_hdr",244,"off")=2800
 	Set gtmtypes("shmpool_buff_hdr",244,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",244,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_jnl_cwset_tn")=244
-	Set gtmtypes("shmpool_buff_hdr",245,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_jnl_wcsflu_tn"
-	Set gtmtypes("shmpool_buff_hdr",245,"off")=2816
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_tn")=244
+	Set gtmtypes("shmpool_buff_hdr",245,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_jnl_cwset_tn"
+	Set gtmtypes("shmpool_buff_hdr",245,"off")=2808
 	Set gtmtypes("shmpool_buff_hdr",245,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",245,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_jnl_wcsflu_tn")=245
-	Set gtmtypes("shmpool_buff_hdr",246,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_get_too_many_loops_tn"
-	Set gtmtypes("shmpool_buff_hdr",246,"off")=2824
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_jnl_cwset_tn")=245
+	Set gtmtypes("shmpool_buff_hdr",246,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_jnl_wcsflu_tn"
+	Set gtmtypes("shmpool_buff_hdr",246,"off")=2816
 	Set gtmtypes("shmpool_buff_hdr",246,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",246,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_get_too_many_loops_tn")=246
-	Set gtmtypes("shmpool_buff_hdr",247,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tpckh_hist1_nullbt_tn"
-	Set gtmtypes("shmpool_buff_hdr",247,"off")=2832
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_jnl_wcsflu_tn")=246
+	Set gtmtypes("shmpool_buff_hdr",247,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_get_too_many_loops_tn"
+	Set gtmtypes("shmpool_buff_hdr",247,"off")=2824
 	Set gtmtypes("shmpool_buff_hdr",247,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",247,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tpckh_hist1_nullbt_tn")=247
-	Set gtmtypes("shmpool_buff_hdr",248,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_tn"
-	Set gtmtypes("shmpool_buff_hdr",248,"off")=2840
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_get_too_many_loops_tn")=247
+	Set gtmtypes("shmpool_buff_hdr",248,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tpckh_hist1_nullbt_tn"
+	Set gtmtypes("shmpool_buff_hdr",248,"off")=2832
 	Set gtmtypes("shmpool_buff_hdr",248,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",248,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_tn")=248
-	Set gtmtypes("shmpool_buff_hdr",249,"name")="shmpool_buff_hdr.shadow_file_header.jnl_blocked_writer_lost_tn"
-	Set gtmtypes("shmpool_buff_hdr",249,"off")=2848
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tpckh_hist1_nullbt_tn")=248
+	Set gtmtypes("shmpool_buff_hdr",249,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_tn"
+	Set gtmtypes("shmpool_buff_hdr",249,"off")=2840
 	Set gtmtypes("shmpool_buff_hdr",249,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",249,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_blocked_writer_lost_tn")=249
-	Set gtmtypes("shmpool_buff_hdr",250,"name")="shmpool_buff_hdr.shadow_file_header.jnl_blocked_writer_stuck_tn"
-	Set gtmtypes("shmpool_buff_hdr",250,"off")=2856
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_tn")=249
+	Set gtmtypes("shmpool_buff_hdr",250,"name")="shmpool_buff_hdr.shadow_file_header.jnl_blocked_writer_lost_tn"
+	Set gtmtypes("shmpool_buff_hdr",250,"off")=2848
 	Set gtmtypes("shmpool_buff_hdr",250,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",250,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_blocked_writer_stuck_tn")=250
-	Set gtmtypes("shmpool_buff_hdr",251,"name")="shmpool_buff_hdr.shadow_file_header.jnl_blocked_writer_blocked_tn"
-	Set gtmtypes("shmpool_buff_hdr",251,"off")=2864
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_blocked_writer_lost_tn")=250
+	Set gtmtypes("shmpool_buff_hdr",251,"name")="shmpool_buff_hdr.shadow_file_header.jnl_blocked_writer_stuck_tn"
+	Set gtmtypes("shmpool_buff_hdr",251,"off")=2856
 	Set gtmtypes("shmpool_buff_hdr",251,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",251,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_blocked_writer_blocked_tn")=251
-	Set gtmtypes("shmpool_buff_hdr",252,"name")="shmpool_buff_hdr.shadow_file_header.n_jnl_fsyncs_tn"
-	Set gtmtypes("shmpool_buff_hdr",252,"off")=2872
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_blocked_writer_stuck_tn")=251
+	Set gtmtypes("shmpool_buff_hdr",252,"name")="shmpool_buff_hdr.shadow_file_header.jnl_blocked_writer_blocked_tn"
+	Set gtmtypes("shmpool_buff_hdr",252,"off")=2864
 	Set gtmtypes("shmpool_buff_hdr",252,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",252,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_jnl_fsyncs_tn")=252
-	Set gtmtypes("shmpool_buff_hdr",253,"name")="shmpool_buff_hdr.shadow_file_header.n_jnl_fsync_tries_tn"
-	Set gtmtypes("shmpool_buff_hdr",253,"off")=2880
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_blocked_writer_blocked_tn")=252
+	Set gtmtypes("shmpool_buff_hdr",253,"name")="shmpool_buff_hdr.shadow_file_header.n_jnl_fsyncs_tn"
+	Set gtmtypes("shmpool_buff_hdr",253,"off")=2872
 	Set gtmtypes("shmpool_buff_hdr",253,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",253,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_jnl_fsync_tries_tn")=253
-	Set gtmtypes("shmpool_buff_hdr",254,"name")="shmpool_buff_hdr.shadow_file_header.n_jnl_fsync_recovers_tn"
-	Set gtmtypes("shmpool_buff_hdr",254,"off")=2888
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_jnl_fsyncs_tn")=253
+	Set gtmtypes("shmpool_buff_hdr",254,"name")="shmpool_buff_hdr.shadow_file_header.n_jnl_fsync_tries_tn"
+	Set gtmtypes("shmpool_buff_hdr",254,"off")=2880
 	Set gtmtypes("shmpool_buff_hdr",254,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",254,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_jnl_fsync_recovers_tn")=254
-	Set gtmtypes("shmpool_buff_hdr",255,"name")="shmpool_buff_hdr.shadow_file_header.n_db_fsyncs_tn"
-	Set gtmtypes("shmpool_buff_hdr",255,"off")=2896
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_jnl_fsync_tries_tn")=254
+	Set gtmtypes("shmpool_buff_hdr",255,"name")="shmpool_buff_hdr.shadow_file_header.n_jnl_fsync_recovers_tn"
+	Set gtmtypes("shmpool_buff_hdr",255,"off")=2888
 	Set gtmtypes("shmpool_buff_hdr",255,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",255,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_fsyncs_tn")=255
-	Set gtmtypes("shmpool_buff_hdr",256,"name")="shmpool_buff_hdr.shadow_file_header.n_db_fsyncs_in_crit_tn"
-	Set gtmtypes("shmpool_buff_hdr",256,"off")=2904
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_jnl_fsync_recovers_tn")=255
+	Set gtmtypes("shmpool_buff_hdr",256,"name")="shmpool_buff_hdr.shadow_file_header.n_db_fsyncs_tn"
+	Set gtmtypes("shmpool_buff_hdr",256,"off")=2896
 	Set gtmtypes("shmpool_buff_hdr",256,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",256,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_fsyncs_in_crit_tn")=256
-	Set gtmtypes("shmpool_buff_hdr",257,"name")="shmpool_buff_hdr.shadow_file_header.n_dbsync_timers_tn"
-	Set gtmtypes("shmpool_buff_hdr",257,"off")=2912
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_fsyncs_tn")=256
+	Set gtmtypes("shmpool_buff_hdr",257,"name")="shmpool_buff_hdr.shadow_file_header.n_db_fsyncs_in_crit_tn"
+	Set gtmtypes("shmpool_buff_hdr",257,"off")=2904
 	Set gtmtypes("shmpool_buff_hdr",257,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",257,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_dbsync_timers_tn")=257
-	Set gtmtypes("shmpool_buff_hdr",258,"name")="shmpool_buff_hdr.shadow_file_header.n_dbsync_writes_tn"
-	Set gtmtypes("shmpool_buff_hdr",258,"off")=2920
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_fsyncs_in_crit_tn")=257
+	Set gtmtypes("shmpool_buff_hdr",258,"name")="shmpool_buff_hdr.shadow_file_header.n_dbsync_timers_tn"
+	Set gtmtypes("shmpool_buff_hdr",258,"off")=2912
 	Set gtmtypes("shmpool_buff_hdr",258,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",258,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_dbsync_writes_tn")=258
-	Set gtmtypes("shmpool_buff_hdr",259,"name")="shmpool_buff_hdr.shadow_file_header.mutex_queue_full_tn"
-	Set gtmtypes("shmpool_buff_hdr",259,"off")=2928
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_dbsync_timers_tn")=258
+	Set gtmtypes("shmpool_buff_hdr",259,"name")="shmpool_buff_hdr.shadow_file_header.n_dbsync_writes_tn"
+	Set gtmtypes("shmpool_buff_hdr",259,"off")=2920
 	Set gtmtypes("shmpool_buff_hdr",259,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",259,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.mutex_queue_full_tn")=259
-	Set gtmtypes("shmpool_buff_hdr",260,"name")="shmpool_buff_hdr.shadow_file_header.wcb_bt_put_tn"
-	Set gtmtypes("shmpool_buff_hdr",260,"off")=2936
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_dbsync_writes_tn")=259
+	Set gtmtypes("shmpool_buff_hdr",260,"name")="shmpool_buff_hdr.shadow_file_header.mutex_queue_full_tn"
+	Set gtmtypes("shmpool_buff_hdr",260,"off")=2928
 	Set gtmtypes("shmpool_buff_hdr",260,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",260,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_bt_put_tn")=260
-	Set gtmtypes("shmpool_buff_hdr",261,"name")="shmpool_buff_hdr.shadow_file_header.wcb_mutex_salvage_tn"
-	Set gtmtypes("shmpool_buff_hdr",261,"off")=2944
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.mutex_queue_full_tn")=260
+	Set gtmtypes("shmpool_buff_hdr",261,"name")="shmpool_buff_hdr.shadow_file_header.wcb_bt_put_tn"
+	Set gtmtypes("shmpool_buff_hdr",261,"off")=2936
 	Set gtmtypes("shmpool_buff_hdr",261,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",261,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_mutex_salvage_tn")=261
-	Set gtmtypes("shmpool_buff_hdr",262,"name")="shmpool_buff_hdr.shadow_file_header.wcb_tp_grab_crit_tn"
-	Set gtmtypes("shmpool_buff_hdr",262,"off")=2952
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_bt_put_tn")=261
+	Set gtmtypes("shmpool_buff_hdr",262,"name")="shmpool_buff_hdr.shadow_file_header.wcb_mutex_salvage_tn"
+	Set gtmtypes("shmpool_buff_hdr",262,"off")=2944
 	Set gtmtypes("shmpool_buff_hdr",262,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",262,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_tp_grab_crit_tn")=262
-	Set gtmtypes("shmpool_buff_hdr",263,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_nocr_invcr_tn"
-	Set gtmtypes("shmpool_buff_hdr",263,"off")=2960
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_mutex_salvage_tn")=262
+	Set gtmtypes("shmpool_buff_hdr",263,"name")="shmpool_buff_hdr.shadow_file_header.wcb_tp_grab_crit_tn"
+	Set gtmtypes("shmpool_buff_hdr",263,"off")=2952
 	Set gtmtypes("shmpool_buff_hdr",263,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",263,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_nocr_invcr_tn")=263
-	Set gtmtypes("shmpool_buff_hdr",264,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_cr_invcr_tn"
-	Set gtmtypes("shmpool_buff_hdr",264,"off")=2968
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_tp_grab_crit_tn")=263
+	Set gtmtypes("shmpool_buff_hdr",264,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_nocr_invcr_tn"
+	Set gtmtypes("shmpool_buff_hdr",264,"off")=2960
 	Set gtmtypes("shmpool_buff_hdr",264,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",264,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_cr_invcr_tn")=264
-	Set gtmtypes("shmpool_buff_hdr",265,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_rip_wait_tn"
-	Set gtmtypes("shmpool_buff_hdr",265,"off")=2976
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_nocr_invcr_tn")=264
+	Set gtmtypes("shmpool_buff_hdr",265,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_cr_invcr_tn"
+	Set gtmtypes("shmpool_buff_hdr",265,"off")=2968
 	Set gtmtypes("shmpool_buff_hdr",265,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",265,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_rip_wait_tn")=265
-	Set gtmtypes("shmpool_buff_hdr",266,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirtyripwait_tn"
-	Set gtmtypes("shmpool_buff_hdr",266,"off")=2984
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_cr_invcr_tn")=265
+	Set gtmtypes("shmpool_buff_hdr",266,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_rip_wait_tn"
+	Set gtmtypes("shmpool_buff_hdr",266,"off")=2976
 	Set gtmtypes("shmpool_buff_hdr",266,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",266,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirtyripwait_tn")=266
-	Set gtmtypes("shmpool_buff_hdr",267,"name")="shmpool_buff_hdr.shadow_file_header.wcb_gds_rundown_tn"
-	Set gtmtypes("shmpool_buff_hdr",267,"off")=2992
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_rip_wait_tn")=266
+	Set gtmtypes("shmpool_buff_hdr",267,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirtyripwait_tn"
+	Set gtmtypes("shmpool_buff_hdr",267,"off")=2984
 	Set gtmtypes("shmpool_buff_hdr",267,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",267,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_gds_rundown_tn")=267
-	Set gtmtypes("shmpool_buff_hdr",268,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wcs_flu1_tn"
-	Set gtmtypes("shmpool_buff_hdr",268,"off")=3000
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirtyripwait_tn")=267
+	Set gtmtypes("shmpool_buff_hdr",268,"name")="shmpool_buff_hdr.shadow_file_header.wcb_gds_rundown_tn"
+	Set gtmtypes("shmpool_buff_hdr",268,"off")=2992
 	Set gtmtypes("shmpool_buff_hdr",268,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",268,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wcs_flu1_tn")=268
-	Set gtmtypes("shmpool_buff_hdr",269,"name")="shmpool_buff_hdr.shadow_file_header.wcb_mu_back_tn"
-	Set gtmtypes("shmpool_buff_hdr",269,"off")=3008
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_gds_rundown_tn")=268
+	Set gtmtypes("shmpool_buff_hdr",269,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wcs_flu1_tn"
+	Set gtmtypes("shmpool_buff_hdr",269,"off")=3000
 	Set gtmtypes("shmpool_buff_hdr",269,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",269,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_mu_back_tn")=269
-	Set gtmtypes("shmpool_buff_hdr",270,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirty_invcr_tn"
-	Set gtmtypes("shmpool_buff_hdr",270,"off")=3016
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wcs_flu1_tn")=269
+	Set gtmtypes("shmpool_buff_hdr",270,"name")="shmpool_buff_hdr.shadow_file_header.wcb_mu_back_tn"
+	Set gtmtypes("shmpool_buff_hdr",270,"off")=3008
 	Set gtmtypes("shmpool_buff_hdr",270,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",270,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirty_invcr_tn")=270
-	Set gtmtypes("shmpool_buff_hdr",271,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_wtfini_fail_tn"
-	Set gtmtypes("shmpool_buff_hdr",271,"off")=3024
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_mu_back_tn")=270
+	Set gtmtypes("shmpool_buff_hdr",271,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirty_invcr_tn"
+	Set gtmtypes("shmpool_buff_hdr",271,"off")=3016
 	Set gtmtypes("shmpool_buff_hdr",271,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",271,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_wtfini_fail_tn")=271
-	Set gtmtypes("shmpool_buff_hdr",272,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_twin_stuck_tn"
-	Set gtmtypes("shmpool_buff_hdr",272,"off")=3032
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirty_invcr_tn")=271
+	Set gtmtypes("shmpool_buff_hdr",272,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_wtfini_fail_tn"
+	Set gtmtypes("shmpool_buff_hdr",272,"off")=3024
 	Set gtmtypes("shmpool_buff_hdr",272,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",272,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_twin_stuck_tn")=272
-	Set gtmtypes("shmpool_buff_hdr",273,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_wrt_latch_stuck_tn"
-	Set gtmtypes("shmpool_buff_hdr",273,"off")=3040
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_wtfini_fail_tn")=272
+	Set gtmtypes("shmpool_buff_hdr",273,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_twin_stuck_tn"
+	Set gtmtypes("shmpool_buff_hdr",273,"off")=3032
 	Set gtmtypes("shmpool_buff_hdr",273,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",273,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_wrt_latch_stuck_tn")=273
-	Set gtmtypes("shmpool_buff_hdr",274,"name")="shmpool_buff_hdr.shadow_file_header.wcb_secshr_db_clnup_now_crit_tn"
-	Set gtmtypes("shmpool_buff_hdr",274,"off")=3048
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_twin_stuck_tn")=273
+	Set gtmtypes("shmpool_buff_hdr",274,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_wrt_latch_stuck_tn"
+	Set gtmtypes("shmpool_buff_hdr",274,"off")=3040
 	Set gtmtypes("shmpool_buff_hdr",274,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",274,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_secshr_db_clnup_now_crit_tn")=274
-	Set gtmtypes("shmpool_buff_hdr",275,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_bad_bt_index1_tn"
-	Set gtmtypes("shmpool_buff_hdr",275,"off")=3056
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_wrt_latch_stuck_tn")=274
+	Set gtmtypes("shmpool_buff_hdr",275,"name")="shmpool_buff_hdr.shadow_file_header.wcb_secshr_db_clnup_now_crit_tn"
+	Set gtmtypes("shmpool_buff_hdr",275,"off")=3048
 	Set gtmtypes("shmpool_buff_hdr",275,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",275,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_bad_bt_index1_tn")=275
-	Set gtmtypes("shmpool_buff_hdr",276,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_bad_bt_index2_tn"
-	Set gtmtypes("shmpool_buff_hdr",276,"off")=3064
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_secshr_db_clnup_now_crit_tn")=275
+	Set gtmtypes("shmpool_buff_hdr",276,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_bad_bt_index1_tn"
+	Set gtmtypes("shmpool_buff_hdr",276,"off")=3056
 	Set gtmtypes("shmpool_buff_hdr",276,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",276,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_bad_bt_index2_tn")=276
-	Set gtmtypes("shmpool_buff_hdr",277,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_crbtmismatch1_tn"
-	Set gtmtypes("shmpool_buff_hdr",277,"off")=3072
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_bad_bt_index1_tn")=276
+	Set gtmtypes("shmpool_buff_hdr",277,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_bad_bt_index2_tn"
+	Set gtmtypes("shmpool_buff_hdr",277,"off")=3064
 	Set gtmtypes("shmpool_buff_hdr",277,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",277,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_crbtmismatch1_tn")=277
-	Set gtmtypes("shmpool_buff_hdr",278,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_crbtmismatch2_tn"
-	Set gtmtypes("shmpool_buff_hdr",278,"off")=3080
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_bad_bt_index2_tn")=277
+	Set gtmtypes("shmpool_buff_hdr",278,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_crbtmismatch1_tn"
+	Set gtmtypes("shmpool_buff_hdr",278,"off")=3072
 	Set gtmtypes("shmpool_buff_hdr",278,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",278,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_crbtmismatch2_tn")=278
-	Set gtmtypes("shmpool_buff_hdr",279,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_crbtmismatch3_tn"
-	Set gtmtypes("shmpool_buff_hdr",279,"off")=3088
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_crbtmismatch1_tn")=278
+	Set gtmtypes("shmpool_buff_hdr",279,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_crbtmismatch2_tn"
+	Set gtmtypes("shmpool_buff_hdr",279,"off")=3080
 	Set gtmtypes("shmpool_buff_hdr",279,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",279,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_crbtmismatch3_tn")=279
-	Set gtmtypes("shmpool_buff_hdr",280,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_tn"
-	Set gtmtypes("shmpool_buff_hdr",280,"off")=3096
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_crbtmismatch2_tn")=279
+	Set gtmtypes("shmpool_buff_hdr",280,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_crbtmismatch3_tn"
+	Set gtmtypes("shmpool_buff_hdr",280,"off")=3088
 	Set gtmtypes("shmpool_buff_hdr",280,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",280,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_tn")=280
-	Set gtmtypes("shmpool_buff_hdr",281,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_tn"
-	Set gtmtypes("shmpool_buff_hdr",281,"off")=3104
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_crbtmismatch3_tn")=280
+	Set gtmtypes("shmpool_buff_hdr",281,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_tn"
+	Set gtmtypes("shmpool_buff_hdr",281,"off")=3096
 	Set gtmtypes("shmpool_buff_hdr",281,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",281,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_tn")=281
-	Set gtmtypes("shmpool_buff_hdr",282,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_tn"
-	Set gtmtypes("shmpool_buff_hdr",282,"off")=3112
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_tn")=281
+	Set gtmtypes("shmpool_buff_hdr",282,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_tn"
+	Set gtmtypes("shmpool_buff_hdr",282,"off")=3104
 	Set gtmtypes("shmpool_buff_hdr",282,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",282,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_tn")=282
-	Set gtmtypes("shmpool_buff_hdr",283,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_tn"
-	Set gtmtypes("shmpool_buff_hdr",283,"off")=3120
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_tn")=282
+	Set gtmtypes("shmpool_buff_hdr",283,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_tn"
+	Set gtmtypes("shmpool_buff_hdr",283,"off")=3112
 	Set gtmtypes("shmpool_buff_hdr",283,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",283,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_tn")=283
-	Set gtmtypes("shmpool_buff_hdr",284,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_tn"
-	Set gtmtypes("shmpool_buff_hdr",284,"off")=3128
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_tn")=283
+	Set gtmtypes("shmpool_buff_hdr",284,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_tn"
+	Set gtmtypes("shmpool_buff_hdr",284,"off")=3120
 	Set gtmtypes("shmpool_buff_hdr",284,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",284,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_tn")=284
-	Set gtmtypes("shmpool_buff_hdr",285,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_bt_get_tn"
-	Set gtmtypes("shmpool_buff_hdr",285,"off")=3136
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_tn")=284
+	Set gtmtypes("shmpool_buff_hdr",285,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_tn"
+	Set gtmtypes("shmpool_buff_hdr",285,"off")=3128
 	Set gtmtypes("shmpool_buff_hdr",285,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",285,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_bt_get_tn")=285
-	Set gtmtypes("shmpool_buff_hdr",286,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_tn"
-	Set gtmtypes("shmpool_buff_hdr",286,"off")=3144
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_tn")=285
+	Set gtmtypes("shmpool_buff_hdr",286,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_bt_get_tn"
+	Set gtmtypes("shmpool_buff_hdr",286,"off")=3136
 	Set gtmtypes("shmpool_buff_hdr",286,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",286,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_tn")=286
-	Set gtmtypes("shmpool_buff_hdr",287,"name")="shmpool_buff_hdr.shadow_file_header.wcb_bg_update_lckfail1_tn"
-	Set gtmtypes("shmpool_buff_hdr",287,"off")=3152
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_bt_get_tn")=286
+	Set gtmtypes("shmpool_buff_hdr",287,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_tn"
+	Set gtmtypes("shmpool_buff_hdr",287,"off")=3144
 	Set gtmtypes("shmpool_buff_hdr",287,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",287,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_bg_update_lckfail1_tn")=287
-	Set gtmtypes("shmpool_buff_hdr",288,"name")="shmpool_buff_hdr.shadow_file_header.wcb_bg_update_lckfail2_tn"
-	Set gtmtypes("shmpool_buff_hdr",288,"off")=3160
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_tn")=287
+	Set gtmtypes("shmpool_buff_hdr",288,"name")="shmpool_buff_hdr.shadow_file_header.wcb_bg_update_lckfail1_tn"
+	Set gtmtypes("shmpool_buff_hdr",288,"off")=3152
 	Set gtmtypes("shmpool_buff_hdr",288,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",288,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_bg_update_lckfail2_tn")=288
-	Set gtmtypes("shmpool_buff_hdr",289,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail1_tn"
-	Set gtmtypes("shmpool_buff_hdr",289,"off")=3168
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_bg_update_lckfail1_tn")=288
+	Set gtmtypes("shmpool_buff_hdr",289,"name")="shmpool_buff_hdr.shadow_file_header.wcb_bg_update_lckfail2_tn"
+	Set gtmtypes("shmpool_buff_hdr",289,"off")=3160
 	Set gtmtypes("shmpool_buff_hdr",289,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",289,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail1_tn")=289
-	Set gtmtypes("shmpool_buff_hdr",290,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail2_tn"
-	Set gtmtypes("shmpool_buff_hdr",290,"off")=3176
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_bg_update_lckfail2_tn")=289
+	Set gtmtypes("shmpool_buff_hdr",290,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail1_tn"
+	Set gtmtypes("shmpool_buff_hdr",290,"off")=3168
 	Set gtmtypes("shmpool_buff_hdr",290,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",290,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail2_tn")=290
-	Set gtmtypes("shmpool_buff_hdr",291,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail3_tn"
-	Set gtmtypes("shmpool_buff_hdr",291,"off")=3184
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail1_tn")=290
+	Set gtmtypes("shmpool_buff_hdr",291,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail2_tn"
+	Set gtmtypes("shmpool_buff_hdr",291,"off")=3176
 	Set gtmtypes("shmpool_buff_hdr",291,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",291,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail3_tn")=291
-	Set gtmtypes("shmpool_buff_hdr",292,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail4_tn"
-	Set gtmtypes("shmpool_buff_hdr",292,"off")=3192
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail2_tn")=291
+	Set gtmtypes("shmpool_buff_hdr",292,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail3_tn"
+	Set gtmtypes("shmpool_buff_hdr",292,"off")=3184
 	Set gtmtypes("shmpool_buff_hdr",292,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",292,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail4_tn")=292
-	Set gtmtypes("shmpool_buff_hdr",293,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail1_tn"
-	Set gtmtypes("shmpool_buff_hdr",293,"off")=3200
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail3_tn")=292
+	Set gtmtypes("shmpool_buff_hdr",293,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail4_tn"
+	Set gtmtypes("shmpool_buff_hdr",293,"off")=3192
 	Set gtmtypes("shmpool_buff_hdr",293,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",293,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail1_tn")=293
-	Set gtmtypes("shmpool_buff_hdr",294,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail2_tn"
-	Set gtmtypes("shmpool_buff_hdr",294,"off")=3208
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail4_tn")=293
+	Set gtmtypes("shmpool_buff_hdr",294,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail1_tn"
+	Set gtmtypes("shmpool_buff_hdr",294,"off")=3200
 	Set gtmtypes("shmpool_buff_hdr",294,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",294,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail2_tn")=294
-	Set gtmtypes("shmpool_buff_hdr",295,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail3_tn"
-	Set gtmtypes("shmpool_buff_hdr",295,"off")=3216
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail1_tn")=294
+	Set gtmtypes("shmpool_buff_hdr",295,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail2_tn"
+	Set gtmtypes("shmpool_buff_hdr",295,"off")=3208
 	Set gtmtypes("shmpool_buff_hdr",295,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",295,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail3_tn")=295
-	Set gtmtypes("shmpool_buff_hdr",296,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail4_tn"
-	Set gtmtypes("shmpool_buff_hdr",296,"off")=3224
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail2_tn")=295
+	Set gtmtypes("shmpool_buff_hdr",296,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail3_tn"
+	Set gtmtypes("shmpool_buff_hdr",296,"off")=3216
 	Set gtmtypes("shmpool_buff_hdr",296,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",296,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail4_tn")=296
-	Set gtmtypes("shmpool_buff_hdr",297,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirtystuck1_tn"
-	Set gtmtypes("shmpool_buff_hdr",297,"off")=3232
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail3_tn")=296
+	Set gtmtypes("shmpool_buff_hdr",297,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail4_tn"
+	Set gtmtypes("shmpool_buff_hdr",297,"off")=3224
 	Set gtmtypes("shmpool_buff_hdr",297,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",297,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirtystuck1_tn")=297
-	Set gtmtypes("shmpool_buff_hdr",298,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirtystuck2_tn"
-	Set gtmtypes("shmpool_buff_hdr",298,"off")=3240
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail4_tn")=297
+	Set gtmtypes("shmpool_buff_hdr",298,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirtystuck1_tn"
+	Set gtmtypes("shmpool_buff_hdr",298,"off")=3232
 	Set gtmtypes("shmpool_buff_hdr",298,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",298,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirtystuck2_tn")=298
-	Set gtmtypes("shmpool_buff_hdr",299,"name")="shmpool_buff_hdr.shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_tn"
-	Set gtmtypes("shmpool_buff_hdr",299,"off")=3248
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirtystuck1_tn")=298
+	Set gtmtypes("shmpool_buff_hdr",299,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirtystuck2_tn"
+	Set gtmtypes("shmpool_buff_hdr",299,"off")=3240
 	Set gtmtypes("shmpool_buff_hdr",299,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",299,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_tn")=299
-	Set gtmtypes("shmpool_buff_hdr",300,"name")="shmpool_buff_hdr.shadow_file_header.dwngrd_refmts_syncio_tn"
-	Set gtmtypes("shmpool_buff_hdr",300,"off")=3256
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirtystuck2_tn")=299
+	Set gtmtypes("shmpool_buff_hdr",300,"name")="shmpool_buff_hdr.shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_tn"
+	Set gtmtypes("shmpool_buff_hdr",300,"off")=3248
 	Set gtmtypes("shmpool_buff_hdr",300,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",300,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.dwngrd_refmts_syncio_tn")=300
-	Set gtmtypes("shmpool_buff_hdr",301,"name")="shmpool_buff_hdr.shadow_file_header.dwngrd_refmts_asyncio_tn"
-	Set gtmtypes("shmpool_buff_hdr",301,"off")=3264
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_tn")=300
+	Set gtmtypes("shmpool_buff_hdr",301,"name")="shmpool_buff_hdr.shadow_file_header.dwngrd_refmts_syncio_tn"
+	Set gtmtypes("shmpool_buff_hdr",301,"off")=3256
 	Set gtmtypes("shmpool_buff_hdr",301,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",301,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.dwngrd_refmts_asyncio_tn")=301
-	Set gtmtypes("shmpool_buff_hdr",302,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_refmt_harvests_tn"
-	Set gtmtypes("shmpool_buff_hdr",302,"off")=3272
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.dwngrd_refmts_syncio_tn")=301
+	Set gtmtypes("shmpool_buff_hdr",302,"name")="shmpool_buff_hdr.shadow_file_header.dwngrd_refmts_asyncio_tn"
+	Set gtmtypes("shmpool_buff_hdr",302,"off")=3264
 	Set gtmtypes("shmpool_buff_hdr",302,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",302,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_refmt_harvests_tn")=302
-	Set gtmtypes("shmpool_buff_hdr",303,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_recovery_tn"
-	Set gtmtypes("shmpool_buff_hdr",303,"off")=3280
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.dwngrd_refmts_asyncio_tn")=302
+	Set gtmtypes("shmpool_buff_hdr",303,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_refmt_harvests_tn"
+	Set gtmtypes("shmpool_buff_hdr",303,"off")=3272
 	Set gtmtypes("shmpool_buff_hdr",303,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",303,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_recovery_tn")=303
-	Set gtmtypes("shmpool_buff_hdr",304,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_blkd_by_sdc_tn"
-	Set gtmtypes("shmpool_buff_hdr",304,"off")=3288
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_refmt_harvests_tn")=303
+	Set gtmtypes("shmpool_buff_hdr",304,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_recovery_tn"
+	Set gtmtypes("shmpool_buff_hdr",304,"off")=3280
 	Set gtmtypes("shmpool_buff_hdr",304,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",304,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_blkd_by_sdc_tn")=304
-	Set gtmtypes("shmpool_buff_hdr",305,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_alloc_bbflush_tn"
-	Set gtmtypes("shmpool_buff_hdr",305,"off")=3296
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_recovery_tn")=304
+	Set gtmtypes("shmpool_buff_hdr",305,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_blkd_by_sdc_tn"
+	Set gtmtypes("shmpool_buff_hdr",305,"off")=3288
 	Set gtmtypes("shmpool_buff_hdr",305,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",305,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_alloc_bbflush_tn")=305
-	Set gtmtypes("shmpool_buff_hdr",306,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_released_replaced_tn"
-	Set gtmtypes("shmpool_buff_hdr",306,"off")=3304
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_blkd_by_sdc_tn")=305
+	Set gtmtypes("shmpool_buff_hdr",306,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_alloc_bbflush_tn"
+	Set gtmtypes("shmpool_buff_hdr",306,"off")=3296
 	Set gtmtypes("shmpool_buff_hdr",306,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",306,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_released_replaced_tn")=306
-	Set gtmtypes("shmpool_buff_hdr",307,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_released_io_complete_tn"
-	Set gtmtypes("shmpool_buff_hdr",307,"off")=3312
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_alloc_bbflush_tn")=306
+	Set gtmtypes("shmpool_buff_hdr",307,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_released_replaced_tn"
+	Set gtmtypes("shmpool_buff_hdr",307,"off")=3304
 	Set gtmtypes("shmpool_buff_hdr",307,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",307,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_released_io_complete_tn")=307
-	Set gtmtypes("shmpool_buff_hdr",308,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_kept_tn"
-	Set gtmtypes("shmpool_buff_hdr",308,"off")=3320
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_released_replaced_tn")=307
+	Set gtmtypes("shmpool_buff_hdr",308,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_released_io_complete_tn"
+	Set gtmtypes("shmpool_buff_hdr",308,"off")=3312
 	Set gtmtypes("shmpool_buff_hdr",308,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",308,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_kept_tn")=308
-	Set gtmtypes("shmpool_buff_hdr",309,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_ignored_tn"
-	Set gtmtypes("shmpool_buff_hdr",309,"off")=3328
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_released_io_complete_tn")=308
+	Set gtmtypes("shmpool_buff_hdr",309,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_kept_tn"
+	Set gtmtypes("shmpool_buff_hdr",309,"off")=3320
 	Set gtmtypes("shmpool_buff_hdr",309,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",309,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_ignored_tn")=309
-	Set gtmtypes("shmpool_buff_hdr",310,"name")="shmpool_buff_hdr.shadow_file_header.refmt_blk_chk_blk_freed_tn"
-	Set gtmtypes("shmpool_buff_hdr",310,"off")=3336
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_kept_tn")=309
+	Set gtmtypes("shmpool_buff_hdr",310,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_ignored_tn"
+	Set gtmtypes("shmpool_buff_hdr",310,"off")=3328
 	Set gtmtypes("shmpool_buff_hdr",310,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",310,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_blk_chk_blk_freed_tn")=310
-	Set gtmtypes("shmpool_buff_hdr",311,"name")="shmpool_buff_hdr.shadow_file_header.refmt_blk_chk_blk_kept_tn"
-	Set gtmtypes("shmpool_buff_hdr",311,"off")=3344
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_ignored_tn")=310
+	Set gtmtypes("shmpool_buff_hdr",311,"name")="shmpool_buff_hdr.shadow_file_header.refmt_blk_chk_blk_freed_tn"
+	Set gtmtypes("shmpool_buff_hdr",311,"off")=3336
 	Set gtmtypes("shmpool_buff_hdr",311,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",311,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_blk_chk_blk_kept_tn")=311
-	Set gtmtypes("shmpool_buff_hdr",312,"name")="shmpool_buff_hdr.shadow_file_header.active_lvl_trigger_tn"
-	Set gtmtypes("shmpool_buff_hdr",312,"off")=3352
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_blk_chk_blk_freed_tn")=311
+	Set gtmtypes("shmpool_buff_hdr",312,"name")="shmpool_buff_hdr.shadow_file_header.refmt_blk_chk_blk_kept_tn"
+	Set gtmtypes("shmpool_buff_hdr",312,"off")=3344
 	Set gtmtypes("shmpool_buff_hdr",312,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",312,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.active_lvl_trigger_tn")=312
-	Set gtmtypes("shmpool_buff_hdr",313,"name")="shmpool_buff_hdr.shadow_file_header.new_buff_tn"
-	Set gtmtypes("shmpool_buff_hdr",313,"off")=3360
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_blk_chk_blk_kept_tn")=312
+	Set gtmtypes("shmpool_buff_hdr",313,"name")="shmpool_buff_hdr.shadow_file_header.active_lvl_trigger_tn"
+	Set gtmtypes("shmpool_buff_hdr",313,"off")=3352
 	Set gtmtypes("shmpool_buff_hdr",313,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",313,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.new_buff_tn")=313
-	Set gtmtypes("shmpool_buff_hdr",314,"name")="shmpool_buff_hdr.shadow_file_header.phase2_commit_wait_sleep_in_crit_tn"
-	Set gtmtypes("shmpool_buff_hdr",314,"off")=3368
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.active_lvl_trigger_tn")=313
+	Set gtmtypes("shmpool_buff_hdr",314,"name")="shmpool_buff_hdr.shadow_file_header.new_buff_tn"
+	Set gtmtypes("shmpool_buff_hdr",314,"off")=3360
 	Set gtmtypes("shmpool_buff_hdr",314,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",314,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.phase2_commit_wait_sleep_in_crit_tn")=314
-	Set gtmtypes("shmpool_buff_hdr",315,"name")="shmpool_buff_hdr.shadow_file_header.phase2_commit_wait_sleep_no_crit_tn"
-	Set gtmtypes("shmpool_buff_hdr",315,"off")=3376
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.new_buff_tn")=314
+	Set gtmtypes("shmpool_buff_hdr",315,"name")="shmpool_buff_hdr.shadow_file_header.phase2_commit_wait_sleep_in_crit_tn"
+	Set gtmtypes("shmpool_buff_hdr",315,"off")=3368
 	Set gtmtypes("shmpool_buff_hdr",315,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",315,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.phase2_commit_wait_sleep_no_crit_tn")=315
-	Set gtmtypes("shmpool_buff_hdr",316,"name")="shmpool_buff_hdr.shadow_file_header.phase2_commit_wait_pidcnt_tn"
-	Set gtmtypes("shmpool_buff_hdr",316,"off")=3384
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.phase2_commit_wait_sleep_in_crit_tn")=315
+	Set gtmtypes("shmpool_buff_hdr",316,"name")="shmpool_buff_hdr.shadow_file_header.phase2_commit_wait_sleep_no_crit_tn"
+	Set gtmtypes("shmpool_buff_hdr",316,"off")=3376
 	Set gtmtypes("shmpool_buff_hdr",316,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",316,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.phase2_commit_wait_pidcnt_tn")=316
-	Set gtmtypes("shmpool_buff_hdr",317,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_intend_wait_tn"
-	Set gtmtypes("shmpool_buff_hdr",317,"off")=3392
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.phase2_commit_wait_sleep_no_crit_tn")=316
+	Set gtmtypes("shmpool_buff_hdr",317,"name")="shmpool_buff_hdr.shadow_file_header.phase2_commit_wait_pidcnt_tn"
+	Set gtmtypes("shmpool_buff_hdr",317,"off")=3384
 	Set gtmtypes("shmpool_buff_hdr",317,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",317,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_intend_wait_tn")=317
-	Set gtmtypes("shmpool_buff_hdr",318,"name")="shmpool_buff_hdr.shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_tn"
-	Set gtmtypes("shmpool_buff_hdr",318,"off")=3400
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.phase2_commit_wait_pidcnt_tn")=317
+	Set gtmtypes("shmpool_buff_hdr",318,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_intend_wait_tn"
+	Set gtmtypes("shmpool_buff_hdr",318,"off")=3392
 	Set gtmtypes("shmpool_buff_hdr",318,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",318,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_tn")=318
-	Set gtmtypes("shmpool_buff_hdr",319,"name")="shmpool_buff_hdr.shadow_file_header.wcb_phase2_commit_wait_tn"
-	Set gtmtypes("shmpool_buff_hdr",319,"off")=3408
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_intend_wait_tn")=318
+	Set gtmtypes("shmpool_buff_hdr",319,"name")="shmpool_buff_hdr.shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_tn"
+	Set gtmtypes("shmpool_buff_hdr",319,"off")=3400
 	Set gtmtypes("shmpool_buff_hdr",319,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",319,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_phase2_commit_wait_tn")=319
-	Set gtmtypes("shmpool_buff_hdr",320,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_calls_tn"
-	Set gtmtypes("shmpool_buff_hdr",320,"off")=3416
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_tn")=319
+	Set gtmtypes("shmpool_buff_hdr",320,"name")="shmpool_buff_hdr.shadow_file_header.wcb_phase2_commit_wait_tn"
+	Set gtmtypes("shmpool_buff_hdr",320,"off")=3408
 	Set gtmtypes("shmpool_buff_hdr",320,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",320,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_calls_tn")=320
-	Set gtmtypes("shmpool_buff_hdr",321,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_rip_tn"
-	Set gtmtypes("shmpool_buff_hdr",321,"off")=3424
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_phase2_commit_wait_tn")=320
+	Set gtmtypes("shmpool_buff_hdr",321,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_calls_tn"
+	Set gtmtypes("shmpool_buff_hdr",321,"off")=3416
 	Set gtmtypes("shmpool_buff_hdr",321,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",321,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_rip_tn")=321
-	Set gtmtypes("shmpool_buff_hdr",322,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_in_tend_tn"
-	Set gtmtypes("shmpool_buff_hdr",322,"off")=3432
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_calls_tn")=321
+	Set gtmtypes("shmpool_buff_hdr",322,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_rip_tn"
+	Set gtmtypes("shmpool_buff_hdr",322,"off")=3424
 	Set gtmtypes("shmpool_buff_hdr",322,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",322,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_in_tend_tn")=322
-	Set gtmtypes("shmpool_buff_hdr",323,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_search_blk_tn"
-	Set gtmtypes("shmpool_buff_hdr",323,"off")=3440
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_rip_tn")=322
+	Set gtmtypes("shmpool_buff_hdr",323,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_in_tend_tn"
+	Set gtmtypes("shmpool_buff_hdr",323,"off")=3432
 	Set gtmtypes("shmpool_buff_hdr",323,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",323,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_search_blk_tn")=323
-	Set gtmtypes("shmpool_buff_hdr",324,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_new_rec_tn"
-	Set gtmtypes("shmpool_buff_hdr",324,"off")=3448
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_in_tend_tn")=323
+	Set gtmtypes("shmpool_buff_hdr",324,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_search_blk_tn"
+	Set gtmtypes("shmpool_buff_hdr",324,"off")=3440
 	Set gtmtypes("shmpool_buff_hdr",324,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",324,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_new_rec_tn")=324
-	Set gtmtypes("shmpool_buff_hdr",325,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_rec_size_tn"
-	Set gtmtypes("shmpool_buff_hdr",325,"off")=3456
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_search_blk_tn")=324
+	Set gtmtypes("shmpool_buff_hdr",325,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_new_rec_tn"
+	Set gtmtypes("shmpool_buff_hdr",325,"off")=3448
 	Set gtmtypes("shmpool_buff_hdr",325,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",325,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_rec_size_tn")=325
-	Set gtmtypes("shmpool_buff_hdr",326,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_rec_cmpc_tn"
-	Set gtmtypes("shmpool_buff_hdr",326,"off")=3464
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_new_rec_tn")=325
+	Set gtmtypes("shmpool_buff_hdr",326,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_rec_size_tn"
+	Set gtmtypes("shmpool_buff_hdr",326,"off")=3456
 	Set gtmtypes("shmpool_buff_hdr",326,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",326,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_rec_cmpc_tn")=326
-	Set gtmtypes("shmpool_buff_hdr",327,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_blk_fini_tn"
-	Set gtmtypes("shmpool_buff_hdr",327,"off")=3472
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_rec_size_tn")=326
+	Set gtmtypes("shmpool_buff_hdr",327,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_rec_cmpc_tn"
+	Set gtmtypes("shmpool_buff_hdr",327,"off")=3464
 	Set gtmtypes("shmpool_buff_hdr",327,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",327,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_blk_fini_tn")=327
-	Set gtmtypes("shmpool_buff_hdr",328,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_blk_split_tn"
-	Set gtmtypes("shmpool_buff_hdr",328,"off")=3480
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_rec_cmpc_tn")=327
+	Set gtmtypes("shmpool_buff_hdr",328,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_blk_fini_tn"
+	Set gtmtypes("shmpool_buff_hdr",328,"off")=3472
 	Set gtmtypes("shmpool_buff_hdr",328,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",328,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_blk_split_tn")=328
-	Set gtmtypes("shmpool_buff_hdr",329,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_ripsleep_cnt_tn"
-	Set gtmtypes("shmpool_buff_hdr",329,"off")=3488
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_blk_fini_tn")=328
+	Set gtmtypes("shmpool_buff_hdr",329,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_blk_split_tn"
+	Set gtmtypes("shmpool_buff_hdr",329,"off")=3480
 	Set gtmtypes("shmpool_buff_hdr",329,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",329,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_ripsleep_cnt_tn")=329
-	Set gtmtypes("shmpool_buff_hdr",330,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_ripsleep_nblks_tn"
-	Set gtmtypes("shmpool_buff_hdr",330,"off")=3496
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_blk_split_tn")=329
+	Set gtmtypes("shmpool_buff_hdr",330,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_ripsleep_cnt_tn"
+	Set gtmtypes("shmpool_buff_hdr",330,"off")=3488
 	Set gtmtypes("shmpool_buff_hdr",330,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",330,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_ripsleep_nblks_tn")=330
-	Set gtmtypes("shmpool_buff_hdr",331,"name")="shmpool_buff_hdr.shadow_file_header.bg_trc_rec_tn_filler"
-	Set gtmtypes("shmpool_buff_hdr",331,"off")=3504
-	Set gtmtypes("shmpool_buff_hdr",331,"len")=112
-	Set gtmtypes("shmpool_buff_hdr",331,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bg_trc_rec_tn_filler")=331
-	Set gtmtypes("shmpool_buff_hdr",332,"name")="shmpool_buff_hdr.shadow_file_header.total_buffer_flush_cntr"
-	Set gtmtypes("shmpool_buff_hdr",332,"off")=3616
-	Set gtmtypes("shmpool_buff_hdr",332,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",332,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.total_buffer_flush_cntr")=332
-	Set gtmtypes("shmpool_buff_hdr",333,"name")="shmpool_buff_hdr.shadow_file_header.bufct_buffer_flush_cntr"
-	Set gtmtypes("shmpool_buff_hdr",333,"off")=3620
-	Set gtmtypes("shmpool_buff_hdr",333,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",333,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bufct_buffer_flush_cntr")=333
-	Set gtmtypes("shmpool_buff_hdr",334,"name")="shmpool_buff_hdr.shadow_file_header.bufct_buffer_flush_loop_cntr"
-	Set gtmtypes("shmpool_buff_hdr",334,"off")=3624
-	Set gtmtypes("shmpool_buff_hdr",334,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",334,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bufct_buffer_flush_loop_cntr")=334
-	Set gtmtypes("shmpool_buff_hdr",335,"name")="shmpool_buff_hdr.shadow_file_header.wrt_calls_cntr"
-	Set gtmtypes("shmpool_buff_hdr",335,"off")=3628
-	Set gtmtypes("shmpool_buff_hdr",335,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",335,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_calls_cntr")=335
-	Set gtmtypes("shmpool_buff_hdr",336,"name")="shmpool_buff_hdr.shadow_file_header.wrt_count_cntr"
-	Set gtmtypes("shmpool_buff_hdr",336,"off")=3632
-	Set gtmtypes("shmpool_buff_hdr",336,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",336,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_count_cntr")=336
-	Set gtmtypes("shmpool_buff_hdr",337,"name")="shmpool_buff_hdr.shadow_file_header.wrt_blocked_cntr"
-	Set gtmtypes("shmpool_buff_hdr",337,"off")=3636
-	Set gtmtypes("shmpool_buff_hdr",337,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",337,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_blocked_cntr")=337
-	Set gtmtypes("shmpool_buff_hdr",338,"name")="shmpool_buff_hdr.shadow_file_header.wrt_busy_cntr"
-	Set gtmtypes("shmpool_buff_hdr",338,"off")=3640
-	Set gtmtypes("shmpool_buff_hdr",338,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",338,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_busy_cntr")=338
-	Set gtmtypes("shmpool_buff_hdr",339,"name")="shmpool_buff_hdr.shadow_file_header.wrt_noblks_wrtn_cntr"
-	Set gtmtypes("shmpool_buff_hdr",339,"off")=3644
-	Set gtmtypes("shmpool_buff_hdr",339,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",339,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_noblks_wrtn_cntr")=339
-	Set gtmtypes("shmpool_buff_hdr",340,"name")="shmpool_buff_hdr.shadow_file_header.reserved_bgtrcrec1_cntr"
-	Set gtmtypes("shmpool_buff_hdr",340,"off")=3648
-	Set gtmtypes("shmpool_buff_hdr",340,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",340,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reserved_bgtrcrec1_cntr")=340
-	Set gtmtypes("shmpool_buff_hdr",341,"name")="shmpool_buff_hdr.shadow_file_header.reserved_bgtrcrec2_cntr"
-	Set gtmtypes("shmpool_buff_hdr",341,"off")=3652
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_ripsleep_cnt_tn")=330
+	Set gtmtypes("shmpool_buff_hdr",331,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_ripsleep_nblks_tn"
+	Set gtmtypes("shmpool_buff_hdr",331,"off")=3496
+	Set gtmtypes("shmpool_buff_hdr",331,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",331,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_ripsleep_nblks_tn")=331
+	Set gtmtypes("shmpool_buff_hdr",332,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wtfini_invoked_tn"
+	Set gtmtypes("shmpool_buff_hdr",332,"off")=3504
+	Set gtmtypes("shmpool_buff_hdr",332,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",332,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wtfini_invoked_tn")=332
+	Set gtmtypes("shmpool_buff_hdr",333,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wterror_invoked_tn"
+	Set gtmtypes("shmpool_buff_hdr",333,"off")=3512
+	Set gtmtypes("shmpool_buff_hdr",333,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",333,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wterror_invoked_tn")=333
+	Set gtmtypes("shmpool_buff_hdr",334,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wt_restart_invoked_tn"
+	Set gtmtypes("shmpool_buff_hdr",334,"off")=3520
+	Set gtmtypes("shmpool_buff_hdr",334,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",334,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wt_restart_invoked_tn")=334
+	Set gtmtypes("shmpool_buff_hdr",335,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wt_restart_eagain_tn"
+	Set gtmtypes("shmpool_buff_hdr",335,"off")=3528
+	Set gtmtypes("shmpool_buff_hdr",335,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",335,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wt_restart_eagain_tn")=335
+	Set gtmtypes("shmpool_buff_hdr",336,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wt_restart_reinsert_tn"
+	Set gtmtypes("shmpool_buff_hdr",336,"off")=3536
+	Set gtmtypes("shmpool_buff_hdr",336,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",336,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wt_restart_reinsert_tn")=336
+	Set gtmtypes("shmpool_buff_hdr",337,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wtstart_eagain_tn"
+	Set gtmtypes("shmpool_buff_hdr",337,"off")=3544
+	Set gtmtypes("shmpool_buff_hdr",337,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",337,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wtstart_eagain_tn")=337
+	Set gtmtypes("shmpool_buff_hdr",338,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wtstart_eagain_incrit_tn"
+	Set gtmtypes("shmpool_buff_hdr",338,"off")=3552
+	Set gtmtypes("shmpool_buff_hdr",338,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",338,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wtstart_eagain_incrit_tn")=338
+	Set gtmtypes("shmpool_buff_hdr",339,"name")="shmpool_buff_hdr.shadow_file_header.async_restart_eagain_tn"
+	Set gtmtypes("shmpool_buff_hdr",339,"off")=3560
+	Set gtmtypes("shmpool_buff_hdr",339,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",339,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.async_restart_eagain_tn")=339
+	Set gtmtypes("shmpool_buff_hdr",340,"name")="shmpool_buff_hdr.shadow_file_header.bg_trc_rec_tn_filler"
+	Set gtmtypes("shmpool_buff_hdr",340,"off")=3568
+	Set gtmtypes("shmpool_buff_hdr",340,"len")=48
+	Set gtmtypes("shmpool_buff_hdr",340,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bg_trc_rec_tn_filler")=340
+	Set gtmtypes("shmpool_buff_hdr",341,"name")="shmpool_buff_hdr.shadow_file_header.total_buffer_flush_cntr"
+	Set gtmtypes("shmpool_buff_hdr",341,"off")=3616
 	Set gtmtypes("shmpool_buff_hdr",341,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",341,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reserved_bgtrcrec2_cntr")=341
-	Set gtmtypes("shmpool_buff_hdr",342,"name")="shmpool_buff_hdr.shadow_file_header.reserved_bgtrcrec3_cntr"
-	Set gtmtypes("shmpool_buff_hdr",342,"off")=3656
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.total_buffer_flush_cntr")=341
+	Set gtmtypes("shmpool_buff_hdr",342,"name")="shmpool_buff_hdr.shadow_file_header.bufct_buffer_flush_cntr"
+	Set gtmtypes("shmpool_buff_hdr",342,"off")=3620
 	Set gtmtypes("shmpool_buff_hdr",342,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",342,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reserved_bgtrcrec3_cntr")=342
-	Set gtmtypes("shmpool_buff_hdr",343,"name")="shmpool_buff_hdr.shadow_file_header.lost_block_recovery_cntr"
-	Set gtmtypes("shmpool_buff_hdr",343,"off")=3660
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bufct_buffer_flush_cntr")=342
+	Set gtmtypes("shmpool_buff_hdr",343,"name")="shmpool_buff_hdr.shadow_file_header.bufct_buffer_flush_loop_cntr"
+	Set gtmtypes("shmpool_buff_hdr",343,"off")=3624
 	Set gtmtypes("shmpool_buff_hdr",343,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",343,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.lost_block_recovery_cntr")=343
-	Set gtmtypes("shmpool_buff_hdr",344,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_onln_rlbk_cntr"
-	Set gtmtypes("shmpool_buff_hdr",344,"off")=3664
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bufct_buffer_flush_loop_cntr")=343
+	Set gtmtypes("shmpool_buff_hdr",344,"name")="shmpool_buff_hdr.shadow_file_header.wrt_calls_cntr"
+	Set gtmtypes("shmpool_buff_hdr",344,"off")=3628
 	Set gtmtypes("shmpool_buff_hdr",344,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",344,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_onln_rlbk_cntr")=344
-	Set gtmtypes("shmpool_buff_hdr",345,"name")="shmpool_buff_hdr.shadow_file_header.stale_cntr"
-	Set gtmtypes("shmpool_buff_hdr",345,"off")=3668
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_calls_cntr")=344
+	Set gtmtypes("shmpool_buff_hdr",345,"name")="shmpool_buff_hdr.shadow_file_header.wrt_count_cntr"
+	Set gtmtypes("shmpool_buff_hdr",345,"off")=3632
 	Set gtmtypes("shmpool_buff_hdr",345,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",345,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_cntr")=345
-	Set gtmtypes("shmpool_buff_hdr",346,"name")="shmpool_buff_hdr.shadow_file_header.starved_cntr"
-	Set gtmtypes("shmpool_buff_hdr",346,"off")=3672
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_count_cntr")=345
+	Set gtmtypes("shmpool_buff_hdr",346,"name")="shmpool_buff_hdr.shadow_file_header.wrt_blocked_cntr"
+	Set gtmtypes("shmpool_buff_hdr",346,"off")=3636
 	Set gtmtypes("shmpool_buff_hdr",346,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",346,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.starved_cntr")=346
-	Set gtmtypes("shmpool_buff_hdr",347,"name")="shmpool_buff_hdr.shadow_file_header.stale_timer_started_cntr"
-	Set gtmtypes("shmpool_buff_hdr",347,"off")=3676
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_blocked_cntr")=346
+	Set gtmtypes("shmpool_buff_hdr",347,"name")="shmpool_buff_hdr.shadow_file_header.wrt_busy_cntr"
+	Set gtmtypes("shmpool_buff_hdr",347,"off")=3640
 	Set gtmtypes("shmpool_buff_hdr",347,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",347,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_timer_started_cntr")=347
-	Set gtmtypes("shmpool_buff_hdr",348,"name")="shmpool_buff_hdr.shadow_file_header.stale_timer_pop_cntr"
-	Set gtmtypes("shmpool_buff_hdr",348,"off")=3680
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_busy_cntr")=347
+	Set gtmtypes("shmpool_buff_hdr",348,"name")="shmpool_buff_hdr.shadow_file_header.wrt_noblks_wrtn_cntr"
+	Set gtmtypes("shmpool_buff_hdr",348,"off")=3644
 	Set gtmtypes("shmpool_buff_hdr",348,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",348,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_timer_pop_cntr")=348
-	Set gtmtypes("shmpool_buff_hdr",349,"name")="shmpool_buff_hdr.shadow_file_header.stale_process_defer_cntr"
-	Set gtmtypes("shmpool_buff_hdr",349,"off")=3684
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_noblks_wrtn_cntr")=348
+	Set gtmtypes("shmpool_buff_hdr",349,"name")="shmpool_buff_hdr.shadow_file_header.reserved_bgtrcrec1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",349,"off")=3648
 	Set gtmtypes("shmpool_buff_hdr",349,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",349,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_process_defer_cntr")=349
-	Set gtmtypes("shmpool_buff_hdr",350,"name")="shmpool_buff_hdr.shadow_file_header.stale_defer_processed_cntr"
-	Set gtmtypes("shmpool_buff_hdr",350,"off")=3688
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reserved_bgtrcrec1_cntr")=349
+	Set gtmtypes("shmpool_buff_hdr",350,"name")="shmpool_buff_hdr.shadow_file_header.reserved_bgtrcrec2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",350,"off")=3652
 	Set gtmtypes("shmpool_buff_hdr",350,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",350,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_defer_processed_cntr")=350
-	Set gtmtypes("shmpool_buff_hdr",351,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flush_cntr"
-	Set gtmtypes("shmpool_buff_hdr",351,"off")=3692
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reserved_bgtrcrec2_cntr")=350
+	Set gtmtypes("shmpool_buff_hdr",351,"name")="shmpool_buff_hdr.shadow_file_header.reserved_bgtrcrec3_cntr"
+	Set gtmtypes("shmpool_buff_hdr",351,"off")=3656
 	Set gtmtypes("shmpool_buff_hdr",351,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",351,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flush_cntr")=351
-	Set gtmtypes("shmpool_buff_hdr",352,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flush_loop_cntr"
-	Set gtmtypes("shmpool_buff_hdr",352,"off")=3696
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reserved_bgtrcrec3_cntr")=351
+	Set gtmtypes("shmpool_buff_hdr",352,"name")="shmpool_buff_hdr.shadow_file_header.lost_block_recovery_cntr"
+	Set gtmtypes("shmpool_buff_hdr",352,"off")=3660
 	Set gtmtypes("shmpool_buff_hdr",352,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",352,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flush_loop_cntr")=352
-	Set gtmtypes("shmpool_buff_hdr",353,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flush_retries_cntr"
-	Set gtmtypes("shmpool_buff_hdr",353,"off")=3700
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.lost_block_recovery_cntr")=352
+	Set gtmtypes("shmpool_buff_hdr",353,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_onln_rlbk_cntr"
+	Set gtmtypes("shmpool_buff_hdr",353,"off")=3664
 	Set gtmtypes("shmpool_buff_hdr",353,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",353,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flush_retries_cntr")=353
-	Set gtmtypes("shmpool_buff_hdr",354,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flushed_during_lockwait_cntr"
-	Set gtmtypes("shmpool_buff_hdr",354,"off")=3704
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_onln_rlbk_cntr")=353
+	Set gtmtypes("shmpool_buff_hdr",354,"name")="shmpool_buff_hdr.shadow_file_header.stale_cntr"
+	Set gtmtypes("shmpool_buff_hdr",354,"off")=3668
 	Set gtmtypes("shmpool_buff_hdr",354,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",354,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flushed_during_lockwait_cntr")=354
-	Set gtmtypes("shmpool_buff_hdr",355,"name")="shmpool_buff_hdr.shadow_file_header.tp_crit_retries_cntr"
-	Set gtmtypes("shmpool_buff_hdr",355,"off")=3708
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_cntr")=354
+	Set gtmtypes("shmpool_buff_hdr",355,"name")="shmpool_buff_hdr.shadow_file_header.starved_cntr"
+	Set gtmtypes("shmpool_buff_hdr",355,"off")=3672
 	Set gtmtypes("shmpool_buff_hdr",355,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",355,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.tp_crit_retries_cntr")=355
-	Set gtmtypes("shmpool_buff_hdr",356,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_flush_dirty_cntr"
-	Set gtmtypes("shmpool_buff_hdr",356,"off")=3712
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.starved_cntr")=355
+	Set gtmtypes("shmpool_buff_hdr",356,"name")="shmpool_buff_hdr.shadow_file_header.stale_timer_started_cntr"
+	Set gtmtypes("shmpool_buff_hdr",356,"off")=3676
 	Set gtmtypes("shmpool_buff_hdr",356,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",356,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_flush_dirty_cntr")=356
-	Set gtmtypes("shmpool_buff_hdr",357,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_rip_wait_cntr"
-	Set gtmtypes("shmpool_buff_hdr",357,"off")=3716
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_timer_started_cntr")=356
+	Set gtmtypes("shmpool_buff_hdr",357,"name")="shmpool_buff_hdr.shadow_file_header.stale_timer_pop_cntr"
+	Set gtmtypes("shmpool_buff_hdr",357,"off")=3680
 	Set gtmtypes("shmpool_buff_hdr",357,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",357,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_rip_wait_cntr")=357
-	Set gtmtypes("shmpool_buff_hdr",358,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_buf_owner_stuck_cntr"
-	Set gtmtypes("shmpool_buff_hdr",358,"off")=3720
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_timer_pop_cntr")=357
+	Set gtmtypes("shmpool_buff_hdr",358,"name")="shmpool_buff_hdr.shadow_file_header.stale_process_defer_cntr"
+	Set gtmtypes("shmpool_buff_hdr",358,"off")=3684
 	Set gtmtypes("shmpool_buff_hdr",358,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",358,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_buf_owner_stuck_cntr")=358
-	Set gtmtypes("shmpool_buff_hdr",359,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_out_of_design_cntr"
-	Set gtmtypes("shmpool_buff_hdr",359,"off")=3724
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_process_defer_cntr")=358
+	Set gtmtypes("shmpool_buff_hdr",359,"name")="shmpool_buff_hdr.shadow_file_header.stale_defer_processed_cntr"
+	Set gtmtypes("shmpool_buff_hdr",359,"off")=3688
 	Set gtmtypes("shmpool_buff_hdr",359,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",359,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_out_of_design_cntr")=359
-	Set gtmtypes("shmpool_buff_hdr",360,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_buf_owner_stuck_cntr"
-	Set gtmtypes("shmpool_buff_hdr",360,"off")=3728
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_defer_processed_cntr")=359
+	Set gtmtypes("shmpool_buff_hdr",360,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flush_cntr"
+	Set gtmtypes("shmpool_buff_hdr",360,"off")=3692
 	Set gtmtypes("shmpool_buff_hdr",360,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",360,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_buf_owner_stuck_cntr")=360
-	Set gtmtypes("shmpool_buff_hdr",361,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_out_of_design_cntr"
-	Set gtmtypes("shmpool_buff_hdr",361,"off")=3732
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flush_cntr")=360
+	Set gtmtypes("shmpool_buff_hdr",361,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flush_loop_cntr"
+	Set gtmtypes("shmpool_buff_hdr",361,"off")=3696
 	Set gtmtypes("shmpool_buff_hdr",361,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",361,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_out_of_design_cntr")=361
-	Set gtmtypes("shmpool_buff_hdr",362,"name")="shmpool_buff_hdr.shadow_file_header.bt_put_flush_dirty_cntr"
-	Set gtmtypes("shmpool_buff_hdr",362,"off")=3736
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flush_loop_cntr")=361
+	Set gtmtypes("shmpool_buff_hdr",362,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flush_retries_cntr"
+	Set gtmtypes("shmpool_buff_hdr",362,"off")=3700
 	Set gtmtypes("shmpool_buff_hdr",362,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",362,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bt_put_flush_dirty_cntr")=362
-	Set gtmtypes("shmpool_buff_hdr",363,"name")="shmpool_buff_hdr.shadow_file_header.mlock_wakeups_cntr"
-	Set gtmtypes("shmpool_buff_hdr",363,"off")=3740
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flush_retries_cntr")=362
+	Set gtmtypes("shmpool_buff_hdr",363,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flushed_during_lockwait_cntr"
+	Set gtmtypes("shmpool_buff_hdr",363,"off")=3704
 	Set gtmtypes("shmpool_buff_hdr",363,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",363,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.mlock_wakeups_cntr")=363
-	Set gtmtypes("shmpool_buff_hdr",364,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_recover_invoked_cntr"
-	Set gtmtypes("shmpool_buff_hdr",364,"off")=3744
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flushed_during_lockwait_cntr")=363
+	Set gtmtypes("shmpool_buff_hdr",364,"name")="shmpool_buff_hdr.shadow_file_header.tp_crit_retries_cntr"
+	Set gtmtypes("shmpool_buff_hdr",364,"off")=3708
 	Set gtmtypes("shmpool_buff_hdr",364,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",364,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_recover_invoked_cntr")=364
-	Set gtmtypes("shmpool_buff_hdr",365,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_verify_passed_cntr"
-	Set gtmtypes("shmpool_buff_hdr",365,"off")=3748
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.tp_crit_retries_cntr")=364
+	Set gtmtypes("shmpool_buff_hdr",365,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_flush_dirty_cntr"
+	Set gtmtypes("shmpool_buff_hdr",365,"off")=3712
 	Set gtmtypes("shmpool_buff_hdr",365,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",365,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_verify_passed_cntr")=365
-	Set gtmtypes("shmpool_buff_hdr",366,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr"
-	Set gtmtypes("shmpool_buff_hdr",366,"off")=3752
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_flush_dirty_cntr")=365
+	Set gtmtypes("shmpool_buff_hdr",366,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_rip_wait_cntr"
+	Set gtmtypes("shmpool_buff_hdr",366,"off")=3716
 	Set gtmtypes("shmpool_buff_hdr",366,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",366,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr")=366
-	Set gtmtypes("shmpool_buff_hdr",367,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_cntr"
-	Set gtmtypes("shmpool_buff_hdr",367,"off")=3756
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_rip_wait_cntr")=366
+	Set gtmtypes("shmpool_buff_hdr",367,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_buf_owner_stuck_cntr"
+	Set gtmtypes("shmpool_buff_hdr",367,"off")=3720
 	Set gtmtypes("shmpool_buff_hdr",367,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",367,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_cntr")=367
-	Set gtmtypes("shmpool_buff_hdr",368,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_db_csh_getn_loopexceed_cntr"
-	Set gtmtypes("shmpool_buff_hdr",368,"off")=3760
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_buf_owner_stuck_cntr")=367
+	Set gtmtypes("shmpool_buff_hdr",368,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_out_of_design_cntr"
+	Set gtmtypes("shmpool_buff_hdr",368,"off")=3724
 	Set gtmtypes("shmpool_buff_hdr",368,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",368,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_db_csh_getn_loopexceed_cntr")=368
-	Set gtmtypes("shmpool_buff_hdr",369,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_cntr"
-	Set gtmtypes("shmpool_buff_hdr",369,"off")=3764
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_out_of_design_cntr")=368
+	Set gtmtypes("shmpool_buff_hdr",369,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_buf_owner_stuck_cntr"
+	Set gtmtypes("shmpool_buff_hdr",369,"off")=3728
 	Set gtmtypes("shmpool_buff_hdr",369,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",369,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_cntr")=369
-	Set gtmtypes("shmpool_buff_hdr",370,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_db_csh_get_cntr"
-	Set gtmtypes("shmpool_buff_hdr",370,"off")=3768
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_buf_owner_stuck_cntr")=369
+	Set gtmtypes("shmpool_buff_hdr",370,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_out_of_design_cntr"
+	Set gtmtypes("shmpool_buff_hdr",370,"off")=3732
 	Set gtmtypes("shmpool_buff_hdr",370,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",370,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_db_csh_get_cntr")=370
-	Set gtmtypes("shmpool_buff_hdr",371,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_wcsgetspace_cntr"
-	Set gtmtypes("shmpool_buff_hdr",371,"off")=3772
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_out_of_design_cntr")=370
+	Set gtmtypes("shmpool_buff_hdr",371,"name")="shmpool_buff_hdr.shadow_file_header.bt_put_flush_dirty_cntr"
+	Set gtmtypes("shmpool_buff_hdr",371,"off")=3736
 	Set gtmtypes("shmpool_buff_hdr",371,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",371,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_wcsgetspace_cntr")=371
-	Set gtmtypes("shmpool_buff_hdr",372,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_t1_cntr"
-	Set gtmtypes("shmpool_buff_hdr",372,"off")=3776
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bt_put_flush_dirty_cntr")=371
+	Set gtmtypes("shmpool_buff_hdr",372,"name")="shmpool_buff_hdr.shadow_file_header.mlock_wakeups_cntr"
+	Set gtmtypes("shmpool_buff_hdr",372,"off")=3740
 	Set gtmtypes("shmpool_buff_hdr",372,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",372,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_t1_cntr")=372
-	Set gtmtypes("shmpool_buff_hdr",373,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_bitmap_cntr"
-	Set gtmtypes("shmpool_buff_hdr",373,"off")=3780
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.mlock_wakeups_cntr")=372
+	Set gtmtypes("shmpool_buff_hdr",373,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_recover_invoked_cntr"
+	Set gtmtypes("shmpool_buff_hdr",373,"off")=3744
 	Set gtmtypes("shmpool_buff_hdr",373,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",373,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_bitmap_cntr")=373
-	Set gtmtypes("shmpool_buff_hdr",374,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_jnl_cwset_cntr"
-	Set gtmtypes("shmpool_buff_hdr",374,"off")=3784
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_recover_invoked_cntr")=373
+	Set gtmtypes("shmpool_buff_hdr",374,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_verify_passed_cntr"
+	Set gtmtypes("shmpool_buff_hdr",374,"off")=3748
 	Set gtmtypes("shmpool_buff_hdr",374,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",374,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_jnl_cwset_cntr")=374
-	Set gtmtypes("shmpool_buff_hdr",375,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_cntr"
-	Set gtmtypes("shmpool_buff_hdr",375,"off")=3788
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_verify_passed_cntr")=374
+	Set gtmtypes("shmpool_buff_hdr",375,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr"
+	Set gtmtypes("shmpool_buff_hdr",375,"off")=3752
 	Set gtmtypes("shmpool_buff_hdr",375,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",375,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_cntr")=375
-	Set gtmtypes("shmpool_buff_hdr",376,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_hist_cntr"
-	Set gtmtypes("shmpool_buff_hdr",376,"off")=3792
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr")=375
+	Set gtmtypes("shmpool_buff_hdr",376,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_cntr"
+	Set gtmtypes("shmpool_buff_hdr",376,"off")=3756
 	Set gtmtypes("shmpool_buff_hdr",376,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",376,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_hist_cntr")=376
-	Set gtmtypes("shmpool_buff_hdr",377,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_hist1_nullbt_cntr"
-	Set gtmtypes("shmpool_buff_hdr",377,"off")=3796
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_cntr")=376
+	Set gtmtypes("shmpool_buff_hdr",377,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_db_csh_getn_loopexceed_cntr"
+	Set gtmtypes("shmpool_buff_hdr",377,"off")=3760
 	Set gtmtypes("shmpool_buff_hdr",377,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",377,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_hist1_nullbt_cntr")=377
-	Set gtmtypes("shmpool_buff_hdr",378,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_cntr"
-	Set gtmtypes("shmpool_buff_hdr",378,"off")=3800
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_db_csh_getn_loopexceed_cntr")=377
+	Set gtmtypes("shmpool_buff_hdr",378,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",378,"off")=3764
 	Set gtmtypes("shmpool_buff_hdr",378,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",378,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_cntr")=378
-	Set gtmtypes("shmpool_buff_hdr",379,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_bitmap_nullbt_cntr"
-	Set gtmtypes("shmpool_buff_hdr",379,"off")=3804
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_cntr")=378
+	Set gtmtypes("shmpool_buff_hdr",379,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_db_csh_get_cntr"
+	Set gtmtypes("shmpool_buff_hdr",379,"off")=3768
 	Set gtmtypes("shmpool_buff_hdr",379,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",379,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_bitmap_nullbt_cntr")=379
-	Set gtmtypes("shmpool_buff_hdr",380,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_cntr"
-	Set gtmtypes("shmpool_buff_hdr",380,"off")=3808
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_db_csh_get_cntr")=379
+	Set gtmtypes("shmpool_buff_hdr",380,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_wcsgetspace_cntr"
+	Set gtmtypes("shmpool_buff_hdr",380,"off")=3772
 	Set gtmtypes("shmpool_buff_hdr",380,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",380,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_cntr")=380
-	Set gtmtypes("shmpool_buff_hdr",381,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_jnl_cwset_cntr"
-	Set gtmtypes("shmpool_buff_hdr",381,"off")=3812
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_wcsgetspace_cntr")=380
+	Set gtmtypes("shmpool_buff_hdr",381,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_t1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",381,"off")=3776
 	Set gtmtypes("shmpool_buff_hdr",381,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",381,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_jnl_cwset_cntr")=381
-	Set gtmtypes("shmpool_buff_hdr",382,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_jnl_wcsflu_cntr"
-	Set gtmtypes("shmpool_buff_hdr",382,"off")=3816
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_t1_cntr")=381
+	Set gtmtypes("shmpool_buff_hdr",382,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_bitmap_cntr"
+	Set gtmtypes("shmpool_buff_hdr",382,"off")=3780
 	Set gtmtypes("shmpool_buff_hdr",382,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",382,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_jnl_wcsflu_cntr")=382
-	Set gtmtypes("shmpool_buff_hdr",383,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_get_too_many_loops_cntr"
-	Set gtmtypes("shmpool_buff_hdr",383,"off")=3820
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_bitmap_cntr")=382
+	Set gtmtypes("shmpool_buff_hdr",383,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_jnl_cwset_cntr"
+	Set gtmtypes("shmpool_buff_hdr",383,"off")=3784
 	Set gtmtypes("shmpool_buff_hdr",383,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",383,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_get_too_many_loops_cntr")=383
-	Set gtmtypes("shmpool_buff_hdr",384,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tpckh_hist1_nullbt_cntr"
-	Set gtmtypes("shmpool_buff_hdr",384,"off")=3824
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_jnl_cwset_cntr")=383
+	Set gtmtypes("shmpool_buff_hdr",384,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_cntr"
+	Set gtmtypes("shmpool_buff_hdr",384,"off")=3788
 	Set gtmtypes("shmpool_buff_hdr",384,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",384,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tpckh_hist1_nullbt_cntr")=384
-	Set gtmtypes("shmpool_buff_hdr",385,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_cntr"
-	Set gtmtypes("shmpool_buff_hdr",385,"off")=3828
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_cntr")=384
+	Set gtmtypes("shmpool_buff_hdr",385,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_hist_cntr"
+	Set gtmtypes("shmpool_buff_hdr",385,"off")=3792
 	Set gtmtypes("shmpool_buff_hdr",385,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",385,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_cntr")=385
-	Set gtmtypes("shmpool_buff_hdr",386,"name")="shmpool_buff_hdr.shadow_file_header.jnl_blocked_writer_lost_cntr"
-	Set gtmtypes("shmpool_buff_hdr",386,"off")=3832
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_hist_cntr")=385
+	Set gtmtypes("shmpool_buff_hdr",386,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_hist1_nullbt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",386,"off")=3796
 	Set gtmtypes("shmpool_buff_hdr",386,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",386,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_blocked_writer_lost_cntr")=386
-	Set gtmtypes("shmpool_buff_hdr",387,"name")="shmpool_buff_hdr.shadow_file_header.jnl_blocked_writer_stuck_cntr"
-	Set gtmtypes("shmpool_buff_hdr",387,"off")=3836
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_hist1_nullbt_cntr")=386
+	Set gtmtypes("shmpool_buff_hdr",387,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",387,"off")=3800
 	Set gtmtypes("shmpool_buff_hdr",387,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",387,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_blocked_writer_stuck_cntr")=387
-	Set gtmtypes("shmpool_buff_hdr",388,"name")="shmpool_buff_hdr.shadow_file_header.jnl_blocked_writer_blocked_cntr"
-	Set gtmtypes("shmpool_buff_hdr",388,"off")=3840
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_cntr")=387
+	Set gtmtypes("shmpool_buff_hdr",388,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_bitmap_nullbt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",388,"off")=3804
 	Set gtmtypes("shmpool_buff_hdr",388,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",388,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_blocked_writer_blocked_cntr")=388
-	Set gtmtypes("shmpool_buff_hdr",389,"name")="shmpool_buff_hdr.shadow_file_header.n_jnl_fsyncs_cntr"
-	Set gtmtypes("shmpool_buff_hdr",389,"off")=3844
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_bitmap_nullbt_cntr")=388
+	Set gtmtypes("shmpool_buff_hdr",389,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",389,"off")=3808
 	Set gtmtypes("shmpool_buff_hdr",389,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",389,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_jnl_fsyncs_cntr")=389
-	Set gtmtypes("shmpool_buff_hdr",390,"name")="shmpool_buff_hdr.shadow_file_header.n_jnl_fsync_tries_cntr"
-	Set gtmtypes("shmpool_buff_hdr",390,"off")=3848
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_cntr")=389
+	Set gtmtypes("shmpool_buff_hdr",390,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_jnl_cwset_cntr"
+	Set gtmtypes("shmpool_buff_hdr",390,"off")=3812
 	Set gtmtypes("shmpool_buff_hdr",390,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",390,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_jnl_fsync_tries_cntr")=390
-	Set gtmtypes("shmpool_buff_hdr",391,"name")="shmpool_buff_hdr.shadow_file_header.n_jnl_fsync_recovers_cntr"
-	Set gtmtypes("shmpool_buff_hdr",391,"off")=3852
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_jnl_cwset_cntr")=390
+	Set gtmtypes("shmpool_buff_hdr",391,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_jnl_wcsflu_cntr"
+	Set gtmtypes("shmpool_buff_hdr",391,"off")=3816
 	Set gtmtypes("shmpool_buff_hdr",391,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",391,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_jnl_fsync_recovers_cntr")=391
-	Set gtmtypes("shmpool_buff_hdr",392,"name")="shmpool_buff_hdr.shadow_file_header.n_db_fsyncs_cntr"
-	Set gtmtypes("shmpool_buff_hdr",392,"off")=3856
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_jnl_wcsflu_cntr")=391
+	Set gtmtypes("shmpool_buff_hdr",392,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_get_too_many_loops_cntr"
+	Set gtmtypes("shmpool_buff_hdr",392,"off")=3820
 	Set gtmtypes("shmpool_buff_hdr",392,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",392,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_fsyncs_cntr")=392
-	Set gtmtypes("shmpool_buff_hdr",393,"name")="shmpool_buff_hdr.shadow_file_header.n_db_fsyncs_in_crit_cntr"
-	Set gtmtypes("shmpool_buff_hdr",393,"off")=3860
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_get_too_many_loops_cntr")=392
+	Set gtmtypes("shmpool_buff_hdr",393,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tpckh_hist1_nullbt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",393,"off")=3824
 	Set gtmtypes("shmpool_buff_hdr",393,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",393,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_fsyncs_in_crit_cntr")=393
-	Set gtmtypes("shmpool_buff_hdr",394,"name")="shmpool_buff_hdr.shadow_file_header.n_dbsync_timers_cntr"
-	Set gtmtypes("shmpool_buff_hdr",394,"off")=3864
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tpckh_hist1_nullbt_cntr")=393
+	Set gtmtypes("shmpool_buff_hdr",394,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",394,"off")=3828
 	Set gtmtypes("shmpool_buff_hdr",394,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",394,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_dbsync_timers_cntr")=394
-	Set gtmtypes("shmpool_buff_hdr",395,"name")="shmpool_buff_hdr.shadow_file_header.n_dbsync_writes_cntr"
-	Set gtmtypes("shmpool_buff_hdr",395,"off")=3868
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_cntr")=394
+	Set gtmtypes("shmpool_buff_hdr",395,"name")="shmpool_buff_hdr.shadow_file_header.jnl_blocked_writer_lost_cntr"
+	Set gtmtypes("shmpool_buff_hdr",395,"off")=3832
 	Set gtmtypes("shmpool_buff_hdr",395,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",395,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_dbsync_writes_cntr")=395
-	Set gtmtypes("shmpool_buff_hdr",396,"name")="shmpool_buff_hdr.shadow_file_header.mutex_queue_full_cntr"
-	Set gtmtypes("shmpool_buff_hdr",396,"off")=3872
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_blocked_writer_lost_cntr")=395
+	Set gtmtypes("shmpool_buff_hdr",396,"name")="shmpool_buff_hdr.shadow_file_header.jnl_blocked_writer_stuck_cntr"
+	Set gtmtypes("shmpool_buff_hdr",396,"off")=3836
 	Set gtmtypes("shmpool_buff_hdr",396,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",396,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.mutex_queue_full_cntr")=396
-	Set gtmtypes("shmpool_buff_hdr",397,"name")="shmpool_buff_hdr.shadow_file_header.wcb_bt_put_cntr"
-	Set gtmtypes("shmpool_buff_hdr",397,"off")=3876
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_blocked_writer_stuck_cntr")=396
+	Set gtmtypes("shmpool_buff_hdr",397,"name")="shmpool_buff_hdr.shadow_file_header.jnl_blocked_writer_blocked_cntr"
+	Set gtmtypes("shmpool_buff_hdr",397,"off")=3840
 	Set gtmtypes("shmpool_buff_hdr",397,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",397,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_bt_put_cntr")=397
-	Set gtmtypes("shmpool_buff_hdr",398,"name")="shmpool_buff_hdr.shadow_file_header.wcb_mutex_salvage_cntr"
-	Set gtmtypes("shmpool_buff_hdr",398,"off")=3880
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_blocked_writer_blocked_cntr")=397
+	Set gtmtypes("shmpool_buff_hdr",398,"name")="shmpool_buff_hdr.shadow_file_header.n_jnl_fsyncs_cntr"
+	Set gtmtypes("shmpool_buff_hdr",398,"off")=3844
 	Set gtmtypes("shmpool_buff_hdr",398,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",398,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_mutex_salvage_cntr")=398
-	Set gtmtypes("shmpool_buff_hdr",399,"name")="shmpool_buff_hdr.shadow_file_header.wcb_tp_grab_crit_cntr"
-	Set gtmtypes("shmpool_buff_hdr",399,"off")=3884
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_jnl_fsyncs_cntr")=398
+	Set gtmtypes("shmpool_buff_hdr",399,"name")="shmpool_buff_hdr.shadow_file_header.n_jnl_fsync_tries_cntr"
+	Set gtmtypes("shmpool_buff_hdr",399,"off")=3848
 	Set gtmtypes("shmpool_buff_hdr",399,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",399,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_tp_grab_crit_cntr")=399
-	Set gtmtypes("shmpool_buff_hdr",400,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_nocr_invcr_cntr"
-	Set gtmtypes("shmpool_buff_hdr",400,"off")=3888
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_jnl_fsync_tries_cntr")=399
+	Set gtmtypes("shmpool_buff_hdr",400,"name")="shmpool_buff_hdr.shadow_file_header.n_jnl_fsync_recovers_cntr"
+	Set gtmtypes("shmpool_buff_hdr",400,"off")=3852
 	Set gtmtypes("shmpool_buff_hdr",400,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",400,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_nocr_invcr_cntr")=400
-	Set gtmtypes("shmpool_buff_hdr",401,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_cr_invcr_cntr"
-	Set gtmtypes("shmpool_buff_hdr",401,"off")=3892
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_jnl_fsync_recovers_cntr")=400
+	Set gtmtypes("shmpool_buff_hdr",401,"name")="shmpool_buff_hdr.shadow_file_header.n_db_fsyncs_cntr"
+	Set gtmtypes("shmpool_buff_hdr",401,"off")=3856
 	Set gtmtypes("shmpool_buff_hdr",401,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",401,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_cr_invcr_cntr")=401
-	Set gtmtypes("shmpool_buff_hdr",402,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_rip_wait_cntr"
-	Set gtmtypes("shmpool_buff_hdr",402,"off")=3896
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_fsyncs_cntr")=401
+	Set gtmtypes("shmpool_buff_hdr",402,"name")="shmpool_buff_hdr.shadow_file_header.n_db_fsyncs_in_crit_cntr"
+	Set gtmtypes("shmpool_buff_hdr",402,"off")=3860
 	Set gtmtypes("shmpool_buff_hdr",402,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",402,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_rip_wait_cntr")=402
-	Set gtmtypes("shmpool_buff_hdr",403,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirtyripwait_cntr"
-	Set gtmtypes("shmpool_buff_hdr",403,"off")=3900
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_fsyncs_in_crit_cntr")=402
+	Set gtmtypes("shmpool_buff_hdr",403,"name")="shmpool_buff_hdr.shadow_file_header.n_dbsync_timers_cntr"
+	Set gtmtypes("shmpool_buff_hdr",403,"off")=3864
 	Set gtmtypes("shmpool_buff_hdr",403,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",403,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirtyripwait_cntr")=403
-	Set gtmtypes("shmpool_buff_hdr",404,"name")="shmpool_buff_hdr.shadow_file_header.wcb_gds_rundown_cntr"
-	Set gtmtypes("shmpool_buff_hdr",404,"off")=3904
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_dbsync_timers_cntr")=403
+	Set gtmtypes("shmpool_buff_hdr",404,"name")="shmpool_buff_hdr.shadow_file_header.n_dbsync_writes_cntr"
+	Set gtmtypes("shmpool_buff_hdr",404,"off")=3868
 	Set gtmtypes("shmpool_buff_hdr",404,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",404,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_gds_rundown_cntr")=404
-	Set gtmtypes("shmpool_buff_hdr",405,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wcs_flu1_cntr"
-	Set gtmtypes("shmpool_buff_hdr",405,"off")=3908
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_dbsync_writes_cntr")=404
+	Set gtmtypes("shmpool_buff_hdr",405,"name")="shmpool_buff_hdr.shadow_file_header.mutex_queue_full_cntr"
+	Set gtmtypes("shmpool_buff_hdr",405,"off")=3872
 	Set gtmtypes("shmpool_buff_hdr",405,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",405,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wcs_flu1_cntr")=405
-	Set gtmtypes("shmpool_buff_hdr",406,"name")="shmpool_buff_hdr.shadow_file_header.wcb_mu_back_cntr"
-	Set gtmtypes("shmpool_buff_hdr",406,"off")=3912
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.mutex_queue_full_cntr")=405
+	Set gtmtypes("shmpool_buff_hdr",406,"name")="shmpool_buff_hdr.shadow_file_header.wcb_bt_put_cntr"
+	Set gtmtypes("shmpool_buff_hdr",406,"off")=3876
 	Set gtmtypes("shmpool_buff_hdr",406,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",406,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_mu_back_cntr")=406
-	Set gtmtypes("shmpool_buff_hdr",407,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirty_invcr_cntr"
-	Set gtmtypes("shmpool_buff_hdr",407,"off")=3916
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_bt_put_cntr")=406
+	Set gtmtypes("shmpool_buff_hdr",407,"name")="shmpool_buff_hdr.shadow_file_header.wcb_mutex_salvage_cntr"
+	Set gtmtypes("shmpool_buff_hdr",407,"off")=3880
 	Set gtmtypes("shmpool_buff_hdr",407,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",407,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirty_invcr_cntr")=407
-	Set gtmtypes("shmpool_buff_hdr",408,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_wtfini_fail_cntr"
-	Set gtmtypes("shmpool_buff_hdr",408,"off")=3920
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_mutex_salvage_cntr")=407
+	Set gtmtypes("shmpool_buff_hdr",408,"name")="shmpool_buff_hdr.shadow_file_header.wcb_tp_grab_crit_cntr"
+	Set gtmtypes("shmpool_buff_hdr",408,"off")=3884
 	Set gtmtypes("shmpool_buff_hdr",408,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",408,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_wtfini_fail_cntr")=408
-	Set gtmtypes("shmpool_buff_hdr",409,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_twin_stuck_cntr"
-	Set gtmtypes("shmpool_buff_hdr",409,"off")=3924
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_tp_grab_crit_cntr")=408
+	Set gtmtypes("shmpool_buff_hdr",409,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_nocr_invcr_cntr"
+	Set gtmtypes("shmpool_buff_hdr",409,"off")=3888
 	Set gtmtypes("shmpool_buff_hdr",409,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",409,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_twin_stuck_cntr")=409
-	Set gtmtypes("shmpool_buff_hdr",410,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_wrt_latch_stuck_cntr"
-	Set gtmtypes("shmpool_buff_hdr",410,"off")=3928
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_nocr_invcr_cntr")=409
+	Set gtmtypes("shmpool_buff_hdr",410,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_cr_invcr_cntr"
+	Set gtmtypes("shmpool_buff_hdr",410,"off")=3892
 	Set gtmtypes("shmpool_buff_hdr",410,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",410,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_wrt_latch_stuck_cntr")=410
-	Set gtmtypes("shmpool_buff_hdr",411,"name")="shmpool_buff_hdr.shadow_file_header.wcb_secshr_db_clnup_now_crit_cntr"
-	Set gtmtypes("shmpool_buff_hdr",411,"off")=3932
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_cr_invcr_cntr")=410
+	Set gtmtypes("shmpool_buff_hdr",411,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_rip_wait_cntr"
+	Set gtmtypes("shmpool_buff_hdr",411,"off")=3896
 	Set gtmtypes("shmpool_buff_hdr",411,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",411,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_secshr_db_clnup_now_crit_cntr")=411
-	Set gtmtypes("shmpool_buff_hdr",412,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_bad_bt_index1_cntr"
-	Set gtmtypes("shmpool_buff_hdr",412,"off")=3936
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_rip_wait_cntr")=411
+	Set gtmtypes("shmpool_buff_hdr",412,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirtyripwait_cntr"
+	Set gtmtypes("shmpool_buff_hdr",412,"off")=3900
 	Set gtmtypes("shmpool_buff_hdr",412,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",412,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_bad_bt_index1_cntr")=412
-	Set gtmtypes("shmpool_buff_hdr",413,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_bad_bt_index2_cntr"
-	Set gtmtypes("shmpool_buff_hdr",413,"off")=3940
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirtyripwait_cntr")=412
+	Set gtmtypes("shmpool_buff_hdr",413,"name")="shmpool_buff_hdr.shadow_file_header.wcb_gds_rundown_cntr"
+	Set gtmtypes("shmpool_buff_hdr",413,"off")=3904
 	Set gtmtypes("shmpool_buff_hdr",413,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",413,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_bad_bt_index2_cntr")=413
-	Set gtmtypes("shmpool_buff_hdr",414,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_crbtmismatch1_cntr"
-	Set gtmtypes("shmpool_buff_hdr",414,"off")=3944
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_gds_rundown_cntr")=413
+	Set gtmtypes("shmpool_buff_hdr",414,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wcs_flu1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",414,"off")=3908
 	Set gtmtypes("shmpool_buff_hdr",414,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",414,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_crbtmismatch1_cntr")=414
-	Set gtmtypes("shmpool_buff_hdr",415,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_crbtmismatch2_cntr"
-	Set gtmtypes("shmpool_buff_hdr",415,"off")=3948
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wcs_flu1_cntr")=414
+	Set gtmtypes("shmpool_buff_hdr",415,"name")="shmpool_buff_hdr.shadow_file_header.wcb_mu_back_cntr"
+	Set gtmtypes("shmpool_buff_hdr",415,"off")=3912
 	Set gtmtypes("shmpool_buff_hdr",415,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",415,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_crbtmismatch2_cntr")=415
-	Set gtmtypes("shmpool_buff_hdr",416,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_crbtmismatch3_cntr"
-	Set gtmtypes("shmpool_buff_hdr",416,"off")=3952
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_mu_back_cntr")=415
+	Set gtmtypes("shmpool_buff_hdr",416,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirty_invcr_cntr"
+	Set gtmtypes("shmpool_buff_hdr",416,"off")=3916
 	Set gtmtypes("shmpool_buff_hdr",416,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",416,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_crbtmismatch3_cntr")=416
-	Set gtmtypes("shmpool_buff_hdr",417,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_cntr"
-	Set gtmtypes("shmpool_buff_hdr",417,"off")=3956
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirty_invcr_cntr")=416
+	Set gtmtypes("shmpool_buff_hdr",417,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_wtfini_fail_cntr"
+	Set gtmtypes("shmpool_buff_hdr",417,"off")=3920
 	Set gtmtypes("shmpool_buff_hdr",417,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",417,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_cntr")=417
-	Set gtmtypes("shmpool_buff_hdr",418,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_cntr"
-	Set gtmtypes("shmpool_buff_hdr",418,"off")=3960
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_wtfini_fail_cntr")=417
+	Set gtmtypes("shmpool_buff_hdr",418,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_twin_stuck_cntr"
+	Set gtmtypes("shmpool_buff_hdr",418,"off")=3924
 	Set gtmtypes("shmpool_buff_hdr",418,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",418,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_cntr")=418
-	Set gtmtypes("shmpool_buff_hdr",419,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_cntr"
-	Set gtmtypes("shmpool_buff_hdr",419,"off")=3964
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_twin_stuck_cntr")=418
+	Set gtmtypes("shmpool_buff_hdr",419,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_wrt_latch_stuck_cntr"
+	Set gtmtypes("shmpool_buff_hdr",419,"off")=3928
 	Set gtmtypes("shmpool_buff_hdr",419,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",419,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_cntr")=419
-	Set gtmtypes("shmpool_buff_hdr",420,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_cntr"
-	Set gtmtypes("shmpool_buff_hdr",420,"off")=3968
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_wrt_latch_stuck_cntr")=419
+	Set gtmtypes("shmpool_buff_hdr",420,"name")="shmpool_buff_hdr.shadow_file_header.wcb_secshr_db_clnup_now_crit_cntr"
+	Set gtmtypes("shmpool_buff_hdr",420,"off")=3932
 	Set gtmtypes("shmpool_buff_hdr",420,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",420,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_cntr")=420
-	Set gtmtypes("shmpool_buff_hdr",421,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_cntr"
-	Set gtmtypes("shmpool_buff_hdr",421,"off")=3972
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_secshr_db_clnup_now_crit_cntr")=420
+	Set gtmtypes("shmpool_buff_hdr",421,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_bad_bt_index1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",421,"off")=3936
 	Set gtmtypes("shmpool_buff_hdr",421,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",421,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_cntr")=421
-	Set gtmtypes("shmpool_buff_hdr",422,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_bt_get_cntr"
-	Set gtmtypes("shmpool_buff_hdr",422,"off")=3976
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_bad_bt_index1_cntr")=421
+	Set gtmtypes("shmpool_buff_hdr",422,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_bad_bt_index2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",422,"off")=3940
 	Set gtmtypes("shmpool_buff_hdr",422,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",422,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_bt_get_cntr")=422
-	Set gtmtypes("shmpool_buff_hdr",423,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_cntr"
-	Set gtmtypes("shmpool_buff_hdr",423,"off")=3980
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_bad_bt_index2_cntr")=422
+	Set gtmtypes("shmpool_buff_hdr",423,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_crbtmismatch1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",423,"off")=3944
 	Set gtmtypes("shmpool_buff_hdr",423,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",423,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_cntr")=423
-	Set gtmtypes("shmpool_buff_hdr",424,"name")="shmpool_buff_hdr.shadow_file_header.wcb_bg_update_lckfail1_cntr"
-	Set gtmtypes("shmpool_buff_hdr",424,"off")=3984
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_crbtmismatch1_cntr")=423
+	Set gtmtypes("shmpool_buff_hdr",424,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_crbtmismatch2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",424,"off")=3948
 	Set gtmtypes("shmpool_buff_hdr",424,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",424,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_bg_update_lckfail1_cntr")=424
-	Set gtmtypes("shmpool_buff_hdr",425,"name")="shmpool_buff_hdr.shadow_file_header.wcb_bg_update_lckfail2_cntr"
-	Set gtmtypes("shmpool_buff_hdr",425,"off")=3988
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_crbtmismatch2_cntr")=424
+	Set gtmtypes("shmpool_buff_hdr",425,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_crbtmismatch3_cntr"
+	Set gtmtypes("shmpool_buff_hdr",425,"off")=3952
 	Set gtmtypes("shmpool_buff_hdr",425,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",425,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_bg_update_lckfail2_cntr")=425
-	Set gtmtypes("shmpool_buff_hdr",426,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail1_cntr"
-	Set gtmtypes("shmpool_buff_hdr",426,"off")=3992
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_crbtmismatch3_cntr")=425
+	Set gtmtypes("shmpool_buff_hdr",426,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",426,"off")=3956
 	Set gtmtypes("shmpool_buff_hdr",426,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",426,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail1_cntr")=426
-	Set gtmtypes("shmpool_buff_hdr",427,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail2_cntr"
-	Set gtmtypes("shmpool_buff_hdr",427,"off")=3996
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_cntr")=426
+	Set gtmtypes("shmpool_buff_hdr",427,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",427,"off")=3960
 	Set gtmtypes("shmpool_buff_hdr",427,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",427,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail2_cntr")=427
-	Set gtmtypes("shmpool_buff_hdr",428,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail3_cntr"
-	Set gtmtypes("shmpool_buff_hdr",428,"off")=4000
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_cntr")=427
+	Set gtmtypes("shmpool_buff_hdr",428,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_cntr"
+	Set gtmtypes("shmpool_buff_hdr",428,"off")=3964
 	Set gtmtypes("shmpool_buff_hdr",428,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",428,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail3_cntr")=428
-	Set gtmtypes("shmpool_buff_hdr",429,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail4_cntr"
-	Set gtmtypes("shmpool_buff_hdr",429,"off")=4004
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_cntr")=428
+	Set gtmtypes("shmpool_buff_hdr",429,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_cntr"
+	Set gtmtypes("shmpool_buff_hdr",429,"off")=3968
 	Set gtmtypes("shmpool_buff_hdr",429,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",429,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail4_cntr")=429
-	Set gtmtypes("shmpool_buff_hdr",430,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail1_cntr"
-	Set gtmtypes("shmpool_buff_hdr",430,"off")=4008
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_cntr")=429
+	Set gtmtypes("shmpool_buff_hdr",430,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_cntr"
+	Set gtmtypes("shmpool_buff_hdr",430,"off")=3972
 	Set gtmtypes("shmpool_buff_hdr",430,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",430,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail1_cntr")=430
-	Set gtmtypes("shmpool_buff_hdr",431,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail2_cntr"
-	Set gtmtypes("shmpool_buff_hdr",431,"off")=4012
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_cntr")=430
+	Set gtmtypes("shmpool_buff_hdr",431,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_bt_get_cntr"
+	Set gtmtypes("shmpool_buff_hdr",431,"off")=3976
 	Set gtmtypes("shmpool_buff_hdr",431,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",431,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail2_cntr")=431
-	Set gtmtypes("shmpool_buff_hdr",432,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail3_cntr"
-	Set gtmtypes("shmpool_buff_hdr",432,"off")=4016
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_bt_get_cntr")=431
+	Set gtmtypes("shmpool_buff_hdr",432,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_cntr"
+	Set gtmtypes("shmpool_buff_hdr",432,"off")=3980
 	Set gtmtypes("shmpool_buff_hdr",432,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",432,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail3_cntr")=432
-	Set gtmtypes("shmpool_buff_hdr",433,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail4_cntr"
-	Set gtmtypes("shmpool_buff_hdr",433,"off")=4020
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_cntr")=432
+	Set gtmtypes("shmpool_buff_hdr",433,"name")="shmpool_buff_hdr.shadow_file_header.wcb_bg_update_lckfail1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",433,"off")=3984
 	Set gtmtypes("shmpool_buff_hdr",433,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",433,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail4_cntr")=433
-	Set gtmtypes("shmpool_buff_hdr",434,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirtystuck1_cntr"
-	Set gtmtypes("shmpool_buff_hdr",434,"off")=4024
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_bg_update_lckfail1_cntr")=433
+	Set gtmtypes("shmpool_buff_hdr",434,"name")="shmpool_buff_hdr.shadow_file_header.wcb_bg_update_lckfail2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",434,"off")=3988
 	Set gtmtypes("shmpool_buff_hdr",434,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",434,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirtystuck1_cntr")=434
-	Set gtmtypes("shmpool_buff_hdr",435,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirtystuck2_cntr"
-	Set gtmtypes("shmpool_buff_hdr",435,"off")=4028
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_bg_update_lckfail2_cntr")=434
+	Set gtmtypes("shmpool_buff_hdr",435,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",435,"off")=3992
 	Set gtmtypes("shmpool_buff_hdr",435,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",435,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirtystuck2_cntr")=435
-	Set gtmtypes("shmpool_buff_hdr",436,"name")="shmpool_buff_hdr.shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_cntr"
-	Set gtmtypes("shmpool_buff_hdr",436,"off")=4032
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail1_cntr")=435
+	Set gtmtypes("shmpool_buff_hdr",436,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",436,"off")=3996
 	Set gtmtypes("shmpool_buff_hdr",436,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",436,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_cntr")=436
-	Set gtmtypes("shmpool_buff_hdr",437,"name")="shmpool_buff_hdr.shadow_file_header.dwngrd_refmts_syncio_cntr"
-	Set gtmtypes("shmpool_buff_hdr",437,"off")=4036
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail2_cntr")=436
+	Set gtmtypes("shmpool_buff_hdr",437,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail3_cntr"
+	Set gtmtypes("shmpool_buff_hdr",437,"off")=4000
 	Set gtmtypes("shmpool_buff_hdr",437,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",437,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.dwngrd_refmts_syncio_cntr")=437
-	Set gtmtypes("shmpool_buff_hdr",438,"name")="shmpool_buff_hdr.shadow_file_header.dwngrd_refmts_asyncio_cntr"
-	Set gtmtypes("shmpool_buff_hdr",438,"off")=4040
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail3_cntr")=437
+	Set gtmtypes("shmpool_buff_hdr",438,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail4_cntr"
+	Set gtmtypes("shmpool_buff_hdr",438,"off")=4004
 	Set gtmtypes("shmpool_buff_hdr",438,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",438,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.dwngrd_refmts_asyncio_cntr")=438
-	Set gtmtypes("shmpool_buff_hdr",439,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_refmt_harvests_cntr"
-	Set gtmtypes("shmpool_buff_hdr",439,"off")=4044
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail4_cntr")=438
+	Set gtmtypes("shmpool_buff_hdr",439,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",439,"off")=4008
 	Set gtmtypes("shmpool_buff_hdr",439,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",439,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_refmt_harvests_cntr")=439
-	Set gtmtypes("shmpool_buff_hdr",440,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_recovery_cntr"
-	Set gtmtypes("shmpool_buff_hdr",440,"off")=4048
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail1_cntr")=439
+	Set gtmtypes("shmpool_buff_hdr",440,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",440,"off")=4012
 	Set gtmtypes("shmpool_buff_hdr",440,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",440,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_recovery_cntr")=440
-	Set gtmtypes("shmpool_buff_hdr",441,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_blkd_by_sdc_cntr"
-	Set gtmtypes("shmpool_buff_hdr",441,"off")=4052
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail2_cntr")=440
+	Set gtmtypes("shmpool_buff_hdr",441,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail3_cntr"
+	Set gtmtypes("shmpool_buff_hdr",441,"off")=4016
 	Set gtmtypes("shmpool_buff_hdr",441,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",441,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_blkd_by_sdc_cntr")=441
-	Set gtmtypes("shmpool_buff_hdr",442,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_alloc_bbflush_cntr"
-	Set gtmtypes("shmpool_buff_hdr",442,"off")=4056
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail3_cntr")=441
+	Set gtmtypes("shmpool_buff_hdr",442,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail4_cntr"
+	Set gtmtypes("shmpool_buff_hdr",442,"off")=4020
 	Set gtmtypes("shmpool_buff_hdr",442,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",442,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_alloc_bbflush_cntr")=442
-	Set gtmtypes("shmpool_buff_hdr",443,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_released_replaced_cntr"
-	Set gtmtypes("shmpool_buff_hdr",443,"off")=4060
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail4_cntr")=442
+	Set gtmtypes("shmpool_buff_hdr",443,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirtystuck1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",443,"off")=4024
 	Set gtmtypes("shmpool_buff_hdr",443,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",443,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_released_replaced_cntr")=443
-	Set gtmtypes("shmpool_buff_hdr",444,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_released_io_complete_cntr"
-	Set gtmtypes("shmpool_buff_hdr",444,"off")=4064
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirtystuck1_cntr")=443
+	Set gtmtypes("shmpool_buff_hdr",444,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirtystuck2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",444,"off")=4028
 	Set gtmtypes("shmpool_buff_hdr",444,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",444,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_released_io_complete_cntr")=444
-	Set gtmtypes("shmpool_buff_hdr",445,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_kept_cntr"
-	Set gtmtypes("shmpool_buff_hdr",445,"off")=4068
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirtystuck2_cntr")=444
+	Set gtmtypes("shmpool_buff_hdr",445,"name")="shmpool_buff_hdr.shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_cntr"
+	Set gtmtypes("shmpool_buff_hdr",445,"off")=4032
 	Set gtmtypes("shmpool_buff_hdr",445,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",445,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_kept_cntr")=445
-	Set gtmtypes("shmpool_buff_hdr",446,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_ignored_cntr"
-	Set gtmtypes("shmpool_buff_hdr",446,"off")=4072
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_cntr")=445
+	Set gtmtypes("shmpool_buff_hdr",446,"name")="shmpool_buff_hdr.shadow_file_header.dwngrd_refmts_syncio_cntr"
+	Set gtmtypes("shmpool_buff_hdr",446,"off")=4036
 	Set gtmtypes("shmpool_buff_hdr",446,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",446,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_ignored_cntr")=446
-	Set gtmtypes("shmpool_buff_hdr",447,"name")="shmpool_buff_hdr.shadow_file_header.refmt_blk_chk_blk_freed_cntr"
-	Set gtmtypes("shmpool_buff_hdr",447,"off")=4076
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.dwngrd_refmts_syncio_cntr")=446
+	Set gtmtypes("shmpool_buff_hdr",447,"name")="shmpool_buff_hdr.shadow_file_header.dwngrd_refmts_asyncio_cntr"
+	Set gtmtypes("shmpool_buff_hdr",447,"off")=4040
 	Set gtmtypes("shmpool_buff_hdr",447,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",447,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_blk_chk_blk_freed_cntr")=447
-	Set gtmtypes("shmpool_buff_hdr",448,"name")="shmpool_buff_hdr.shadow_file_header.refmt_blk_chk_blk_kept_cntr"
-	Set gtmtypes("shmpool_buff_hdr",448,"off")=4080
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.dwngrd_refmts_asyncio_cntr")=447
+	Set gtmtypes("shmpool_buff_hdr",448,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_refmt_harvests_cntr"
+	Set gtmtypes("shmpool_buff_hdr",448,"off")=4044
 	Set gtmtypes("shmpool_buff_hdr",448,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",448,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_blk_chk_blk_kept_cntr")=448
-	Set gtmtypes("shmpool_buff_hdr",449,"name")="shmpool_buff_hdr.shadow_file_header.active_lvl_trigger_cntr"
-	Set gtmtypes("shmpool_buff_hdr",449,"off")=4084
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_refmt_harvests_cntr")=448
+	Set gtmtypes("shmpool_buff_hdr",449,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_recovery_cntr"
+	Set gtmtypes("shmpool_buff_hdr",449,"off")=4048
 	Set gtmtypes("shmpool_buff_hdr",449,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",449,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.active_lvl_trigger_cntr")=449
-	Set gtmtypes("shmpool_buff_hdr",450,"name")="shmpool_buff_hdr.shadow_file_header.new_buff_cntr"
-	Set gtmtypes("shmpool_buff_hdr",450,"off")=4088
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_recovery_cntr")=449
+	Set gtmtypes("shmpool_buff_hdr",450,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_blkd_by_sdc_cntr"
+	Set gtmtypes("shmpool_buff_hdr",450,"off")=4052
 	Set gtmtypes("shmpool_buff_hdr",450,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",450,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.new_buff_cntr")=450
-	Set gtmtypes("shmpool_buff_hdr",451,"name")="shmpool_buff_hdr.shadow_file_header.phase2_commit_wait_sleep_in_crit_cntr"
-	Set gtmtypes("shmpool_buff_hdr",451,"off")=4092
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_blkd_by_sdc_cntr")=450
+	Set gtmtypes("shmpool_buff_hdr",451,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_alloc_bbflush_cntr"
+	Set gtmtypes("shmpool_buff_hdr",451,"off")=4056
 	Set gtmtypes("shmpool_buff_hdr",451,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",451,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.phase2_commit_wait_sleep_in_crit_cntr")=451
-	Set gtmtypes("shmpool_buff_hdr",452,"name")="shmpool_buff_hdr.shadow_file_header.phase2_commit_wait_sleep_no_crit_cntr"
-	Set gtmtypes("shmpool_buff_hdr",452,"off")=4096
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_alloc_bbflush_cntr")=451
+	Set gtmtypes("shmpool_buff_hdr",452,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_released_replaced_cntr"
+	Set gtmtypes("shmpool_buff_hdr",452,"off")=4060
 	Set gtmtypes("shmpool_buff_hdr",452,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",452,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.phase2_commit_wait_sleep_no_crit_cntr")=452
-	Set gtmtypes("shmpool_buff_hdr",453,"name")="shmpool_buff_hdr.shadow_file_header.phase2_commit_wait_pidcnt_cntr"
-	Set gtmtypes("shmpool_buff_hdr",453,"off")=4100
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_released_replaced_cntr")=452
+	Set gtmtypes("shmpool_buff_hdr",453,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_released_io_complete_cntr"
+	Set gtmtypes("shmpool_buff_hdr",453,"off")=4064
 	Set gtmtypes("shmpool_buff_hdr",453,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",453,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.phase2_commit_wait_pidcnt_cntr")=453
-	Set gtmtypes("shmpool_buff_hdr",454,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_intend_wait_cntr"
-	Set gtmtypes("shmpool_buff_hdr",454,"off")=4104
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_released_io_complete_cntr")=453
+	Set gtmtypes("shmpool_buff_hdr",454,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_kept_cntr"
+	Set gtmtypes("shmpool_buff_hdr",454,"off")=4068
 	Set gtmtypes("shmpool_buff_hdr",454,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",454,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_intend_wait_cntr")=454
-	Set gtmtypes("shmpool_buff_hdr",455,"name")="shmpool_buff_hdr.shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_cntr"
-	Set gtmtypes("shmpool_buff_hdr",455,"off")=4108
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_kept_cntr")=454
+	Set gtmtypes("shmpool_buff_hdr",455,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_ignored_cntr"
+	Set gtmtypes("shmpool_buff_hdr",455,"off")=4072
 	Set gtmtypes("shmpool_buff_hdr",455,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",455,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_cntr")=455
-	Set gtmtypes("shmpool_buff_hdr",456,"name")="shmpool_buff_hdr.shadow_file_header.wcb_phase2_commit_wait_cntr"
-	Set gtmtypes("shmpool_buff_hdr",456,"off")=4112
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_ignored_cntr")=455
+	Set gtmtypes("shmpool_buff_hdr",456,"name")="shmpool_buff_hdr.shadow_file_header.refmt_blk_chk_blk_freed_cntr"
+	Set gtmtypes("shmpool_buff_hdr",456,"off")=4076
 	Set gtmtypes("shmpool_buff_hdr",456,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",456,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_phase2_commit_wait_cntr")=456
-	Set gtmtypes("shmpool_buff_hdr",457,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_calls_cntr"
-	Set gtmtypes("shmpool_buff_hdr",457,"off")=4116
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_blk_chk_blk_freed_cntr")=456
+	Set gtmtypes("shmpool_buff_hdr",457,"name")="shmpool_buff_hdr.shadow_file_header.refmt_blk_chk_blk_kept_cntr"
+	Set gtmtypes("shmpool_buff_hdr",457,"off")=4080
 	Set gtmtypes("shmpool_buff_hdr",457,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",457,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_calls_cntr")=457
-	Set gtmtypes("shmpool_buff_hdr",458,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_rip_cntr"
-	Set gtmtypes("shmpool_buff_hdr",458,"off")=4120
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_blk_chk_blk_kept_cntr")=457
+	Set gtmtypes("shmpool_buff_hdr",458,"name")="shmpool_buff_hdr.shadow_file_header.active_lvl_trigger_cntr"
+	Set gtmtypes("shmpool_buff_hdr",458,"off")=4084
 	Set gtmtypes("shmpool_buff_hdr",458,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",458,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_rip_cntr")=458
-	Set gtmtypes("shmpool_buff_hdr",459,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_in_tend_cntr"
-	Set gtmtypes("shmpool_buff_hdr",459,"off")=4124
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.active_lvl_trigger_cntr")=458
+	Set gtmtypes("shmpool_buff_hdr",459,"name")="shmpool_buff_hdr.shadow_file_header.new_buff_cntr"
+	Set gtmtypes("shmpool_buff_hdr",459,"off")=4088
 	Set gtmtypes("shmpool_buff_hdr",459,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",459,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_in_tend_cntr")=459
-	Set gtmtypes("shmpool_buff_hdr",460,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_search_blk_cntr"
-	Set gtmtypes("shmpool_buff_hdr",460,"off")=4128
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.new_buff_cntr")=459
+	Set gtmtypes("shmpool_buff_hdr",460,"name")="shmpool_buff_hdr.shadow_file_header.phase2_commit_wait_sleep_in_crit_cntr"
+	Set gtmtypes("shmpool_buff_hdr",460,"off")=4092
 	Set gtmtypes("shmpool_buff_hdr",460,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",460,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_search_blk_cntr")=460
-	Set gtmtypes("shmpool_buff_hdr",461,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_new_rec_cntr"
-	Set gtmtypes("shmpool_buff_hdr",461,"off")=4132
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.phase2_commit_wait_sleep_in_crit_cntr")=460
+	Set gtmtypes("shmpool_buff_hdr",461,"name")="shmpool_buff_hdr.shadow_file_header.phase2_commit_wait_sleep_no_crit_cntr"
+	Set gtmtypes("shmpool_buff_hdr",461,"off")=4096
 	Set gtmtypes("shmpool_buff_hdr",461,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",461,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_new_rec_cntr")=461
-	Set gtmtypes("shmpool_buff_hdr",462,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_rec_size_cntr"
-	Set gtmtypes("shmpool_buff_hdr",462,"off")=4136
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.phase2_commit_wait_sleep_no_crit_cntr")=461
+	Set gtmtypes("shmpool_buff_hdr",462,"name")="shmpool_buff_hdr.shadow_file_header.phase2_commit_wait_pidcnt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",462,"off")=4100
 	Set gtmtypes("shmpool_buff_hdr",462,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",462,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_rec_size_cntr")=462
-	Set gtmtypes("shmpool_buff_hdr",463,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_rec_cmpc_cntr"
-	Set gtmtypes("shmpool_buff_hdr",463,"off")=4140
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.phase2_commit_wait_pidcnt_cntr")=462
+	Set gtmtypes("shmpool_buff_hdr",463,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_intend_wait_cntr"
+	Set gtmtypes("shmpool_buff_hdr",463,"off")=4104
 	Set gtmtypes("shmpool_buff_hdr",463,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",463,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_rec_cmpc_cntr")=463
-	Set gtmtypes("shmpool_buff_hdr",464,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_blk_fini_cntr"
-	Set gtmtypes("shmpool_buff_hdr",464,"off")=4144
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_intend_wait_cntr")=463
+	Set gtmtypes("shmpool_buff_hdr",464,"name")="shmpool_buff_hdr.shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_cntr"
+	Set gtmtypes("shmpool_buff_hdr",464,"off")=4108
 	Set gtmtypes("shmpool_buff_hdr",464,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",464,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_blk_fini_cntr")=464
-	Set gtmtypes("shmpool_buff_hdr",465,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_blk_split_cntr"
-	Set gtmtypes("shmpool_buff_hdr",465,"off")=4148
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_cntr")=464
+	Set gtmtypes("shmpool_buff_hdr",465,"name")="shmpool_buff_hdr.shadow_file_header.wcb_phase2_commit_wait_cntr"
+	Set gtmtypes("shmpool_buff_hdr",465,"off")=4112
 	Set gtmtypes("shmpool_buff_hdr",465,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",465,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_blk_split_cntr")=465
-	Set gtmtypes("shmpool_buff_hdr",466,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_ripsleep_cnt_cntr"
-	Set gtmtypes("shmpool_buff_hdr",466,"off")=4152
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_phase2_commit_wait_cntr")=465
+	Set gtmtypes("shmpool_buff_hdr",466,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_calls_cntr"
+	Set gtmtypes("shmpool_buff_hdr",466,"off")=4116
 	Set gtmtypes("shmpool_buff_hdr",466,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",466,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_ripsleep_cnt_cntr")=466
-	Set gtmtypes("shmpool_buff_hdr",467,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_ripsleep_nblks_cntr"
-	Set gtmtypes("shmpool_buff_hdr",467,"off")=4156
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_calls_cntr")=466
+	Set gtmtypes("shmpool_buff_hdr",467,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_rip_cntr"
+	Set gtmtypes("shmpool_buff_hdr",467,"off")=4120
 	Set gtmtypes("shmpool_buff_hdr",467,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",467,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_ripsleep_nblks_cntr")=467
-	Set gtmtypes("shmpool_buff_hdr",468,"name")="shmpool_buff_hdr.shadow_file_header.bg_trc_rec_cntr_filler"
-	Set gtmtypes("shmpool_buff_hdr",468,"off")=4160
-	Set gtmtypes("shmpool_buff_hdr",468,"len")=56
-	Set gtmtypes("shmpool_buff_hdr",468,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bg_trc_rec_cntr_filler")=468
-	Set gtmtypes("shmpool_buff_hdr",469,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srches"
-	Set gtmtypes("shmpool_buff_hdr",469,"off")=4216
-	Set gtmtypes("shmpool_buff_hdr",469,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",469,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srches")=469
-	Set gtmtypes("shmpool_buff_hdr",470,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srches.curr_count"
-	Set gtmtypes("shmpool_buff_hdr",470,"off")=4216
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_rip_cntr")=467
+	Set gtmtypes("shmpool_buff_hdr",468,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_in_tend_cntr"
+	Set gtmtypes("shmpool_buff_hdr",468,"off")=4124
+	Set gtmtypes("shmpool_buff_hdr",468,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",468,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_in_tend_cntr")=468
+	Set gtmtypes("shmpool_buff_hdr",469,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_search_blk_cntr"
+	Set gtmtypes("shmpool_buff_hdr",469,"off")=4128
+	Set gtmtypes("shmpool_buff_hdr",469,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",469,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_search_blk_cntr")=469
+	Set gtmtypes("shmpool_buff_hdr",470,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_new_rec_cntr"
+	Set gtmtypes("shmpool_buff_hdr",470,"off")=4132
 	Set gtmtypes("shmpool_buff_hdr",470,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",470,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srches.curr_count")=470
-	Set gtmtypes("shmpool_buff_hdr",471,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srches.cumul_count"
-	Set gtmtypes("shmpool_buff_hdr",471,"off")=4220
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_new_rec_cntr")=470
+	Set gtmtypes("shmpool_buff_hdr",471,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_rec_size_cntr"
+	Set gtmtypes("shmpool_buff_hdr",471,"off")=4136
 	Set gtmtypes("shmpool_buff_hdr",471,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",471,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srches.cumul_count")=471
-	Set gtmtypes("shmpool_buff_hdr",472,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srch_clues"
-	Set gtmtypes("shmpool_buff_hdr",472,"off")=4224
-	Set gtmtypes("shmpool_buff_hdr",472,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",472,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srch_clues")=472
-	Set gtmtypes("shmpool_buff_hdr",473,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srch_clues.curr_count"
-	Set gtmtypes("shmpool_buff_hdr",473,"off")=4224
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_rec_size_cntr")=471
+	Set gtmtypes("shmpool_buff_hdr",472,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_rec_cmpc_cntr"
+	Set gtmtypes("shmpool_buff_hdr",472,"off")=4140
+	Set gtmtypes("shmpool_buff_hdr",472,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",472,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_rec_cmpc_cntr")=472
+	Set gtmtypes("shmpool_buff_hdr",473,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_blk_fini_cntr"
+	Set gtmtypes("shmpool_buff_hdr",473,"off")=4144
 	Set gtmtypes("shmpool_buff_hdr",473,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",473,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srch_clues.curr_count")=473
-	Set gtmtypes("shmpool_buff_hdr",474,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srch_clues.cumul_count"
-	Set gtmtypes("shmpool_buff_hdr",474,"off")=4228
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_blk_fini_cntr")=473
+	Set gtmtypes("shmpool_buff_hdr",474,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_blk_split_cntr"
+	Set gtmtypes("shmpool_buff_hdr",474,"off")=4148
 	Set gtmtypes("shmpool_buff_hdr",474,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",474,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srch_clues.cumul_count")=474
-	Set gtmtypes("shmpool_buff_hdr",475,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_head"
-	Set gtmtypes("shmpool_buff_hdr",475,"off")=4232
-	Set gtmtypes("shmpool_buff_hdr",475,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",475,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_head")=475
-	Set gtmtypes("shmpool_buff_hdr",476,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_head.curr_count"
-	Set gtmtypes("shmpool_buff_hdr",476,"off")=4232
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_blk_split_cntr")=474
+	Set gtmtypes("shmpool_buff_hdr",475,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_ripsleep_cnt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",475,"off")=4152
+	Set gtmtypes("shmpool_buff_hdr",475,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",475,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_ripsleep_cnt_cntr")=475
+	Set gtmtypes("shmpool_buff_hdr",476,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_ripsleep_nblks_cntr"
+	Set gtmtypes("shmpool_buff_hdr",476,"off")=4156
 	Set gtmtypes("shmpool_buff_hdr",476,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",476,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_head.curr_count")=476
-	Set gtmtypes("shmpool_buff_hdr",477,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_head.cumul_count"
-	Set gtmtypes("shmpool_buff_hdr",477,"off")=4236
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_ripsleep_nblks_cntr")=476
+	Set gtmtypes("shmpool_buff_hdr",477,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wtfini_invoked_cntr"
+	Set gtmtypes("shmpool_buff_hdr",477,"off")=4160
 	Set gtmtypes("shmpool_buff_hdr",477,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",477,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_head.cumul_count")=477
-	Set gtmtypes("shmpool_buff_hdr",478,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_same"
-	Set gtmtypes("shmpool_buff_hdr",478,"off")=4240
-	Set gtmtypes("shmpool_buff_hdr",478,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",478,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_same")=478
-	Set gtmtypes("shmpool_buff_hdr",479,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_same.curr_count"
-	Set gtmtypes("shmpool_buff_hdr",479,"off")=4240
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wtfini_invoked_cntr")=477
+	Set gtmtypes("shmpool_buff_hdr",478,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wterror_invoked_cntr"
+	Set gtmtypes("shmpool_buff_hdr",478,"off")=4164
+	Set gtmtypes("shmpool_buff_hdr",478,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",478,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wterror_invoked_cntr")=478
+	Set gtmtypes("shmpool_buff_hdr",479,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wt_restart_invoked_cntr"
+	Set gtmtypes("shmpool_buff_hdr",479,"off")=4168
 	Set gtmtypes("shmpool_buff_hdr",479,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",479,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_same.curr_count")=479
-	Set gtmtypes("shmpool_buff_hdr",480,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_same.cumul_count"
-	Set gtmtypes("shmpool_buff_hdr",480,"off")=4244
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wt_restart_invoked_cntr")=479
+	Set gtmtypes("shmpool_buff_hdr",480,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wt_restart_eagain_cntr"
+	Set gtmtypes("shmpool_buff_hdr",480,"off")=4172
 	Set gtmtypes("shmpool_buff_hdr",480,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",480,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_same.cumul_count")=480
-	Set gtmtypes("shmpool_buff_hdr",481,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_tail"
-	Set gtmtypes("shmpool_buff_hdr",481,"off")=4248
-	Set gtmtypes("shmpool_buff_hdr",481,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",481,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_tail")=481
-	Set gtmtypes("shmpool_buff_hdr",482,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_tail.curr_count"
-	Set gtmtypes("shmpool_buff_hdr",482,"off")=4248
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wt_restart_eagain_cntr")=480
+	Set gtmtypes("shmpool_buff_hdr",481,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wt_restart_reinsert_cntr"
+	Set gtmtypes("shmpool_buff_hdr",481,"off")=4176
+	Set gtmtypes("shmpool_buff_hdr",481,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",481,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wt_restart_reinsert_cntr")=481
+	Set gtmtypes("shmpool_buff_hdr",482,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wtstart_eagain_cntr"
+	Set gtmtypes("shmpool_buff_hdr",482,"off")=4180
 	Set gtmtypes("shmpool_buff_hdr",482,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",482,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_tail.curr_count")=482
-	Set gtmtypes("shmpool_buff_hdr",483,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_tail.cumul_count"
-	Set gtmtypes("shmpool_buff_hdr",483,"off")=4252
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wtstart_eagain_cntr")=482
+	Set gtmtypes("shmpool_buff_hdr",483,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wtstart_eagain_incrit_cntr"
+	Set gtmtypes("shmpool_buff_hdr",483,"off")=4184
 	Set gtmtypes("shmpool_buff_hdr",483,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",483,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_tail.cumul_count")=483
-	Set gtmtypes("shmpool_buff_hdr",484,"name")="shmpool_buff_hdr.shadow_file_header.n_t_qreads"
-	Set gtmtypes("shmpool_buff_hdr",484,"off")=4256
-	Set gtmtypes("shmpool_buff_hdr",484,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",484,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_t_qreads")=484
-	Set gtmtypes("shmpool_buff_hdr",485,"name")="shmpool_buff_hdr.shadow_file_header.n_t_qreads.curr_count"
-	Set gtmtypes("shmpool_buff_hdr",485,"off")=4256
-	Set gtmtypes("shmpool_buff_hdr",485,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",485,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_t_qreads.curr_count")=485
-	Set gtmtypes("shmpool_buff_hdr",486,"name")="shmpool_buff_hdr.shadow_file_header.n_t_qreads.cumul_count"
-	Set gtmtypes("shmpool_buff_hdr",486,"off")=4260
-	Set gtmtypes("shmpool_buff_hdr",486,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",486,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_t_qreads.cumul_count")=486
-	Set gtmtypes("shmpool_buff_hdr",487,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_reads"
-	Set gtmtypes("shmpool_buff_hdr",487,"off")=4264
-	Set gtmtypes("shmpool_buff_hdr",487,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",487,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_reads")=487
-	Set gtmtypes("shmpool_buff_hdr",488,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_reads.curr_count"
-	Set gtmtypes("shmpool_buff_hdr",488,"off")=4264
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wtstart_eagain_incrit_cntr")=483
+	Set gtmtypes("shmpool_buff_hdr",484,"name")="shmpool_buff_hdr.shadow_file_header.async_restart_eagain_cntr"
+	Set gtmtypes("shmpool_buff_hdr",484,"off")=4188
+	Set gtmtypes("shmpool_buff_hdr",484,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",484,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.async_restart_eagain_cntr")=484
+	Set gtmtypes("shmpool_buff_hdr",485,"name")="shmpool_buff_hdr.shadow_file_header.bg_trc_rec_cntr_filler"
+	Set gtmtypes("shmpool_buff_hdr",485,"off")=4192
+	Set gtmtypes("shmpool_buff_hdr",485,"len")=24
+	Set gtmtypes("shmpool_buff_hdr",485,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bg_trc_rec_cntr_filler")=485
+	Set gtmtypes("shmpool_buff_hdr",486,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srches"
+	Set gtmtypes("shmpool_buff_hdr",486,"off")=4216
+	Set gtmtypes("shmpool_buff_hdr",486,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",486,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srches")=486
+	Set gtmtypes("shmpool_buff_hdr",487,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srches.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",487,"off")=4216
+	Set gtmtypes("shmpool_buff_hdr",487,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",487,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srches.curr_count")=487
+	Set gtmtypes("shmpool_buff_hdr",488,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srches.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",488,"off")=4220
 	Set gtmtypes("shmpool_buff_hdr",488,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",488,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_reads.curr_count")=488
-	Set gtmtypes("shmpool_buff_hdr",489,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_reads.cumul_count"
-	Set gtmtypes("shmpool_buff_hdr",489,"off")=4268
-	Set gtmtypes("shmpool_buff_hdr",489,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",489,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_reads.cumul_count")=489
-	Set gtmtypes("shmpool_buff_hdr",490,"name")="shmpool_buff_hdr.shadow_file_header.n_bgmm_updates"
-	Set gtmtypes("shmpool_buff_hdr",490,"off")=4272
-	Set gtmtypes("shmpool_buff_hdr",490,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",490,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bgmm_updates")=490
-	Set gtmtypes("shmpool_buff_hdr",491,"name")="shmpool_buff_hdr.shadow_file_header.n_bgmm_updates.curr_count"
-	Set gtmtypes("shmpool_buff_hdr",491,"off")=4272
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srches.cumul_count")=488
+	Set gtmtypes("shmpool_buff_hdr",489,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srch_clues"
+	Set gtmtypes("shmpool_buff_hdr",489,"off")=4224
+	Set gtmtypes("shmpool_buff_hdr",489,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",489,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srch_clues")=489
+	Set gtmtypes("shmpool_buff_hdr",490,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srch_clues.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",490,"off")=4224
+	Set gtmtypes("shmpool_buff_hdr",490,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",490,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srch_clues.curr_count")=490
+	Set gtmtypes("shmpool_buff_hdr",491,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srch_clues.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",491,"off")=4228
 	Set gtmtypes("shmpool_buff_hdr",491,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",491,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bgmm_updates.curr_count")=491
-	Set gtmtypes("shmpool_buff_hdr",492,"name")="shmpool_buff_hdr.shadow_file_header.n_bgmm_updates.cumul_count"
-	Set gtmtypes("shmpool_buff_hdr",492,"off")=4276
-	Set gtmtypes("shmpool_buff_hdr",492,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",492,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bgmm_updates.cumul_count")=492
-	Set gtmtypes("shmpool_buff_hdr",493,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_writes"
-	Set gtmtypes("shmpool_buff_hdr",493,"off")=4280
-	Set gtmtypes("shmpool_buff_hdr",493,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",493,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_writes")=493
-	Set gtmtypes("shmpool_buff_hdr",494,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_writes.curr_count"
-	Set gtmtypes("shmpool_buff_hdr",494,"off")=4280
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srch_clues.cumul_count")=491
+	Set gtmtypes("shmpool_buff_hdr",492,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_head"
+	Set gtmtypes("shmpool_buff_hdr",492,"off")=4232
+	Set gtmtypes("shmpool_buff_hdr",492,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",492,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_head")=492
+	Set gtmtypes("shmpool_buff_hdr",493,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_head.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",493,"off")=4232
+	Set gtmtypes("shmpool_buff_hdr",493,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",493,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_head.curr_count")=493
+	Set gtmtypes("shmpool_buff_hdr",494,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_head.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",494,"off")=4236
 	Set gtmtypes("shmpool_buff_hdr",494,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",494,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_writes.curr_count")=494
-	Set gtmtypes("shmpool_buff_hdr",495,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_writes.cumul_count"
-	Set gtmtypes("shmpool_buff_hdr",495,"off")=4284
-	Set gtmtypes("shmpool_buff_hdr",495,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",495,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_writes.cumul_count")=495
-	Set gtmtypes("shmpool_buff_hdr",496,"name")="shmpool_buff_hdr.shadow_file_header.n_bg_update_creates"
-	Set gtmtypes("shmpool_buff_hdr",496,"off")=4288
-	Set gtmtypes("shmpool_buff_hdr",496,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",496,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bg_update_creates")=496
-	Set gtmtypes("shmpool_buff_hdr",497,"name")="shmpool_buff_hdr.shadow_file_header.n_bg_update_creates.curr_count"
-	Set gtmtypes("shmpool_buff_hdr",497,"off")=4288
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_head.cumul_count")=494
+	Set gtmtypes("shmpool_buff_hdr",495,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_same"
+	Set gtmtypes("shmpool_buff_hdr",495,"off")=4240
+	Set gtmtypes("shmpool_buff_hdr",495,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",495,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_same")=495
+	Set gtmtypes("shmpool_buff_hdr",496,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_same.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",496,"off")=4240
+	Set gtmtypes("shmpool_buff_hdr",496,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",496,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_same.curr_count")=496
+	Set gtmtypes("shmpool_buff_hdr",497,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_same.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",497,"off")=4244
 	Set gtmtypes("shmpool_buff_hdr",497,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",497,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bg_update_creates.curr_count")=497
-	Set gtmtypes("shmpool_buff_hdr",498,"name")="shmpool_buff_hdr.shadow_file_header.n_bg_update_creates.cumul_count"
-	Set gtmtypes("shmpool_buff_hdr",498,"off")=4292
-	Set gtmtypes("shmpool_buff_hdr",498,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",498,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bg_update_creates.cumul_count")=498
-	Set gtmtypes("shmpool_buff_hdr",499,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getns"
-	Set gtmtypes("shmpool_buff_hdr",499,"off")=4296
-	Set gtmtypes("shmpool_buff_hdr",499,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",499,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getns")=499
-	Set gtmtypes("shmpool_buff_hdr",500,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getns.curr_count"
-	Set gtmtypes("shmpool_buff_hdr",500,"off")=4296
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_same.cumul_count")=497
+	Set gtmtypes("shmpool_buff_hdr",498,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_tail"
+	Set gtmtypes("shmpool_buff_hdr",498,"off")=4248
+	Set gtmtypes("shmpool_buff_hdr",498,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",498,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_tail")=498
+	Set gtmtypes("shmpool_buff_hdr",499,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_tail.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",499,"off")=4248
+	Set gtmtypes("shmpool_buff_hdr",499,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",499,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_tail.curr_count")=499
+	Set gtmtypes("shmpool_buff_hdr",500,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_tail.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",500,"off")=4252
 	Set gtmtypes("shmpool_buff_hdr",500,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",500,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getns.curr_count")=500
-	Set gtmtypes("shmpool_buff_hdr",501,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getns.cumul_count"
-	Set gtmtypes("shmpool_buff_hdr",501,"off")=4300
-	Set gtmtypes("shmpool_buff_hdr",501,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",501,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getns.cumul_count")=501
-	Set gtmtypes("shmpool_buff_hdr",502,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getn_lcnt"
-	Set gtmtypes("shmpool_buff_hdr",502,"off")=4304
-	Set gtmtypes("shmpool_buff_hdr",502,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",502,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getn_lcnt")=502
-	Set gtmtypes("shmpool_buff_hdr",503,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getn_lcnt.curr_count"
-	Set gtmtypes("shmpool_buff_hdr",503,"off")=4304
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_tail.cumul_count")=500
+	Set gtmtypes("shmpool_buff_hdr",501,"name")="shmpool_buff_hdr.shadow_file_header.n_t_qreads"
+	Set gtmtypes("shmpool_buff_hdr",501,"off")=4256
+	Set gtmtypes("shmpool_buff_hdr",501,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",501,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_t_qreads")=501
+	Set gtmtypes("shmpool_buff_hdr",502,"name")="shmpool_buff_hdr.shadow_file_header.n_t_qreads.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",502,"off")=4256
+	Set gtmtypes("shmpool_buff_hdr",502,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",502,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_t_qreads.curr_count")=502
+	Set gtmtypes("shmpool_buff_hdr",503,"name")="shmpool_buff_hdr.shadow_file_header.n_t_qreads.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",503,"off")=4260
 	Set gtmtypes("shmpool_buff_hdr",503,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",503,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getn_lcnt.curr_count")=503
-	Set gtmtypes("shmpool_buff_hdr",504,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getn_lcnt.cumul_count"
-	Set gtmtypes("shmpool_buff_hdr",504,"off")=4308
-	Set gtmtypes("shmpool_buff_hdr",504,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",504,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getn_lcnt.cumul_count")=504
-	Set gtmtypes("shmpool_buff_hdr",505,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_acct_rec_filler_4k"
-	Set gtmtypes("shmpool_buff_hdr",505,"off")=4312
-	Set gtmtypes("shmpool_buff_hdr",505,"len")=152
-	Set gtmtypes("shmpool_buff_hdr",505,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_acct_rec_filler_4k")=505
-	Set gtmtypes("shmpool_buff_hdr",506,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec"
-	Set gtmtypes("shmpool_buff_hdr",506,"off")=4464
-	Set gtmtypes("shmpool_buff_hdr",506,"len")=464
-	Set gtmtypes("shmpool_buff_hdr",506,"type")="gvstats_rec_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec")=506
-	Set gtmtypes("shmpool_buff_hdr",507,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_set"
-	Set gtmtypes("shmpool_buff_hdr",507,"off")=4464
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_t_qreads.cumul_count")=503
+	Set gtmtypes("shmpool_buff_hdr",504,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_reads"
+	Set gtmtypes("shmpool_buff_hdr",504,"off")=4264
+	Set gtmtypes("shmpool_buff_hdr",504,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",504,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_reads")=504
+	Set gtmtypes("shmpool_buff_hdr",505,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_reads.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",505,"off")=4264
+	Set gtmtypes("shmpool_buff_hdr",505,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",505,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_reads.curr_count")=505
+	Set gtmtypes("shmpool_buff_hdr",506,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_reads.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",506,"off")=4268
+	Set gtmtypes("shmpool_buff_hdr",506,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",506,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_reads.cumul_count")=506
+	Set gtmtypes("shmpool_buff_hdr",507,"name")="shmpool_buff_hdr.shadow_file_header.n_bgmm_updates"
+	Set gtmtypes("shmpool_buff_hdr",507,"off")=4272
 	Set gtmtypes("shmpool_buff_hdr",507,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",507,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_set")=507
-	Set gtmtypes("shmpool_buff_hdr",508,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_kill"
-	Set gtmtypes("shmpool_buff_hdr",508,"off")=4472
-	Set gtmtypes("shmpool_buff_hdr",508,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",508,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_kill")=508
-	Set gtmtypes("shmpool_buff_hdr",509,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_get"
-	Set gtmtypes("shmpool_buff_hdr",509,"off")=4480
-	Set gtmtypes("shmpool_buff_hdr",509,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",509,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_get")=509
-	Set gtmtypes("shmpool_buff_hdr",510,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_data"
-	Set gtmtypes("shmpool_buff_hdr",510,"off")=4488
+	Set gtmtypes("shmpool_buff_hdr",507,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bgmm_updates")=507
+	Set gtmtypes("shmpool_buff_hdr",508,"name")="shmpool_buff_hdr.shadow_file_header.n_bgmm_updates.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",508,"off")=4272
+	Set gtmtypes("shmpool_buff_hdr",508,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",508,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bgmm_updates.curr_count")=508
+	Set gtmtypes("shmpool_buff_hdr",509,"name")="shmpool_buff_hdr.shadow_file_header.n_bgmm_updates.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",509,"off")=4276
+	Set gtmtypes("shmpool_buff_hdr",509,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",509,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bgmm_updates.cumul_count")=509
+	Set gtmtypes("shmpool_buff_hdr",510,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_writes"
+	Set gtmtypes("shmpool_buff_hdr",510,"off")=4280
 	Set gtmtypes("shmpool_buff_hdr",510,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",510,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_data")=510
-	Set gtmtypes("shmpool_buff_hdr",511,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_order"
-	Set gtmtypes("shmpool_buff_hdr",511,"off")=4496
-	Set gtmtypes("shmpool_buff_hdr",511,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",511,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_order")=511
-	Set gtmtypes("shmpool_buff_hdr",512,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_zprev"
-	Set gtmtypes("shmpool_buff_hdr",512,"off")=4504
-	Set gtmtypes("shmpool_buff_hdr",512,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",512,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_zprev")=512
-	Set gtmtypes("shmpool_buff_hdr",513,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_query"
-	Set gtmtypes("shmpool_buff_hdr",513,"off")=4512
+	Set gtmtypes("shmpool_buff_hdr",510,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_writes")=510
+	Set gtmtypes("shmpool_buff_hdr",511,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_writes.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",511,"off")=4280
+	Set gtmtypes("shmpool_buff_hdr",511,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",511,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_writes.curr_count")=511
+	Set gtmtypes("shmpool_buff_hdr",512,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_writes.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",512,"off")=4284
+	Set gtmtypes("shmpool_buff_hdr",512,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",512,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_writes.cumul_count")=512
+	Set gtmtypes("shmpool_buff_hdr",513,"name")="shmpool_buff_hdr.shadow_file_header.n_bg_update_creates"
+	Set gtmtypes("shmpool_buff_hdr",513,"off")=4288
 	Set gtmtypes("shmpool_buff_hdr",513,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",513,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_query")=513
-	Set gtmtypes("shmpool_buff_hdr",514,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_lock_success"
-	Set gtmtypes("shmpool_buff_hdr",514,"off")=4520
-	Set gtmtypes("shmpool_buff_hdr",514,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",514,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_lock_success")=514
-	Set gtmtypes("shmpool_buff_hdr",515,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_lock_fail"
-	Set gtmtypes("shmpool_buff_hdr",515,"off")=4528
-	Set gtmtypes("shmpool_buff_hdr",515,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",515,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_lock_fail")=515
-	Set gtmtypes("shmpool_buff_hdr",516,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.db_curr_tn"
-	Set gtmtypes("shmpool_buff_hdr",516,"off")=4536
+	Set gtmtypes("shmpool_buff_hdr",513,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bg_update_creates")=513
+	Set gtmtypes("shmpool_buff_hdr",514,"name")="shmpool_buff_hdr.shadow_file_header.n_bg_update_creates.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",514,"off")=4288
+	Set gtmtypes("shmpool_buff_hdr",514,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",514,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bg_update_creates.curr_count")=514
+	Set gtmtypes("shmpool_buff_hdr",515,"name")="shmpool_buff_hdr.shadow_file_header.n_bg_update_creates.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",515,"off")=4292
+	Set gtmtypes("shmpool_buff_hdr",515,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",515,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bg_update_creates.cumul_count")=515
+	Set gtmtypes("shmpool_buff_hdr",516,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getns"
+	Set gtmtypes("shmpool_buff_hdr",516,"off")=4296
 	Set gtmtypes("shmpool_buff_hdr",516,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",516,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.db_curr_tn")=516
-	Set gtmtypes("shmpool_buff_hdr",517,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_dsk_read"
-	Set gtmtypes("shmpool_buff_hdr",517,"off")=4544
-	Set gtmtypes("shmpool_buff_hdr",517,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",517,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_dsk_read")=517
-	Set gtmtypes("shmpool_buff_hdr",518,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_dsk_write"
-	Set gtmtypes("shmpool_buff_hdr",518,"off")=4552
-	Set gtmtypes("shmpool_buff_hdr",518,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",518,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_dsk_write")=518
-	Set gtmtypes("shmpool_buff_hdr",519,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_readwrite"
-	Set gtmtypes("shmpool_buff_hdr",519,"off")=4560
+	Set gtmtypes("shmpool_buff_hdr",516,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getns")=516
+	Set gtmtypes("shmpool_buff_hdr",517,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getns.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",517,"off")=4296
+	Set gtmtypes("shmpool_buff_hdr",517,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",517,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getns.curr_count")=517
+	Set gtmtypes("shmpool_buff_hdr",518,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getns.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",518,"off")=4300
+	Set gtmtypes("shmpool_buff_hdr",518,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",518,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getns.cumul_count")=518
+	Set gtmtypes("shmpool_buff_hdr",519,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getn_lcnt"
+	Set gtmtypes("shmpool_buff_hdr",519,"off")=4304
 	Set gtmtypes("shmpool_buff_hdr",519,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",519,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_readwrite")=519
-	Set gtmtypes("shmpool_buff_hdr",520,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_readonly"
-	Set gtmtypes("shmpool_buff_hdr",520,"off")=4568
-	Set gtmtypes("shmpool_buff_hdr",520,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",520,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_readonly")=520
-	Set gtmtypes("shmpool_buff_hdr",521,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_blkwrite"
-	Set gtmtypes("shmpool_buff_hdr",521,"off")=4576
-	Set gtmtypes("shmpool_buff_hdr",521,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",521,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_blkwrite")=521
-	Set gtmtypes("shmpool_buff_hdr",522,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_blkread"
-	Set gtmtypes("shmpool_buff_hdr",522,"off")=4584
-	Set gtmtypes("shmpool_buff_hdr",522,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",522,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_blkread")=522
-	Set gtmtypes("shmpool_buff_hdr",523,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_retries_0"
-	Set gtmtypes("shmpool_buff_hdr",523,"off")=4592
-	Set gtmtypes("shmpool_buff_hdr",523,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",523,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_retries_0")=523
-	Set gtmtypes("shmpool_buff_hdr",524,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_retries_1"
-	Set gtmtypes("shmpool_buff_hdr",524,"off")=4600
+	Set gtmtypes("shmpool_buff_hdr",519,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getn_lcnt")=519
+	Set gtmtypes("shmpool_buff_hdr",520,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getn_lcnt.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",520,"off")=4304
+	Set gtmtypes("shmpool_buff_hdr",520,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",520,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getn_lcnt.curr_count")=520
+	Set gtmtypes("shmpool_buff_hdr",521,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getn_lcnt.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",521,"off")=4308
+	Set gtmtypes("shmpool_buff_hdr",521,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",521,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getn_lcnt.cumul_count")=521
+	Set gtmtypes("shmpool_buff_hdr",522,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_acct_rec_filler_4k"
+	Set gtmtypes("shmpool_buff_hdr",522,"off")=4312
+	Set gtmtypes("shmpool_buff_hdr",522,"len")=152
+	Set gtmtypes("shmpool_buff_hdr",522,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_acct_rec_filler_4k")=522
+	Set gtmtypes("shmpool_buff_hdr",523,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec"
+	Set gtmtypes("shmpool_buff_hdr",523,"off")=4464
+	Set gtmtypes("shmpool_buff_hdr",523,"len")=472
+	Set gtmtypes("shmpool_buff_hdr",523,"type")="gvstats_rec_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec")=523
+	Set gtmtypes("shmpool_buff_hdr",524,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_set"
+	Set gtmtypes("shmpool_buff_hdr",524,"off")=4464
 	Set gtmtypes("shmpool_buff_hdr",524,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",524,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_retries_1")=524
-	Set gtmtypes("shmpool_buff_hdr",525,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_retries_2"
-	Set gtmtypes("shmpool_buff_hdr",525,"off")=4608
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_set")=524
+	Set gtmtypes("shmpool_buff_hdr",525,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_kill"
+	Set gtmtypes("shmpool_buff_hdr",525,"off")=4472
 	Set gtmtypes("shmpool_buff_hdr",525,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",525,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_retries_2")=525
-	Set gtmtypes("shmpool_buff_hdr",526,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_retries_3"
-	Set gtmtypes("shmpool_buff_hdr",526,"off")=4616
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_kill")=525
+	Set gtmtypes("shmpool_buff_hdr",526,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_get"
+	Set gtmtypes("shmpool_buff_hdr",526,"off")=4480
 	Set gtmtypes("shmpool_buff_hdr",526,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",526,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_retries_3")=526
-	Set gtmtypes("shmpool_buff_hdr",527,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_readwrite"
-	Set gtmtypes("shmpool_buff_hdr",527,"off")=4624
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_get")=526
+	Set gtmtypes("shmpool_buff_hdr",527,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_data"
+	Set gtmtypes("shmpool_buff_hdr",527,"off")=4488
 	Set gtmtypes("shmpool_buff_hdr",527,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",527,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_readwrite")=527
-	Set gtmtypes("shmpool_buff_hdr",528,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_readonly"
-	Set gtmtypes("shmpool_buff_hdr",528,"off")=4632
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_data")=527
+	Set gtmtypes("shmpool_buff_hdr",528,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_order"
+	Set gtmtypes("shmpool_buff_hdr",528,"off")=4496
 	Set gtmtypes("shmpool_buff_hdr",528,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",528,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_readonly")=528
-	Set gtmtypes("shmpool_buff_hdr",529,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_rolledback"
-	Set gtmtypes("shmpool_buff_hdr",529,"off")=4640
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_order")=528
+	Set gtmtypes("shmpool_buff_hdr",529,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_zprev"
+	Set gtmtypes("shmpool_buff_hdr",529,"off")=4504
 	Set gtmtypes("shmpool_buff_hdr",529,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",529,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_rolledback")=529
-	Set gtmtypes("shmpool_buff_hdr",530,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_blkwrite"
-	Set gtmtypes("shmpool_buff_hdr",530,"off")=4648
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_zprev")=529
+	Set gtmtypes("shmpool_buff_hdr",530,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_query"
+	Set gtmtypes("shmpool_buff_hdr",530,"off")=4512
 	Set gtmtypes("shmpool_buff_hdr",530,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",530,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_blkwrite")=530
-	Set gtmtypes("shmpool_buff_hdr",531,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_blkread"
-	Set gtmtypes("shmpool_buff_hdr",531,"off")=4656
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_query")=530
+	Set gtmtypes("shmpool_buff_hdr",531,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_lock_success"
+	Set gtmtypes("shmpool_buff_hdr",531,"off")=4520
 	Set gtmtypes("shmpool_buff_hdr",531,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",531,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_blkread")=531
-	Set gtmtypes("shmpool_buff_hdr",532,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_tot_retries_0"
-	Set gtmtypes("shmpool_buff_hdr",532,"off")=4664
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_lock_success")=531
+	Set gtmtypes("shmpool_buff_hdr",532,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_lock_fail"
+	Set gtmtypes("shmpool_buff_hdr",532,"off")=4528
 	Set gtmtypes("shmpool_buff_hdr",532,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",532,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_tot_retries_0")=532
-	Set gtmtypes("shmpool_buff_hdr",533,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_tot_retries_1"
-	Set gtmtypes("shmpool_buff_hdr",533,"off")=4672
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_lock_fail")=532
+	Set gtmtypes("shmpool_buff_hdr",533,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.db_curr_tn"
+	Set gtmtypes("shmpool_buff_hdr",533,"off")=4536
 	Set gtmtypes("shmpool_buff_hdr",533,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",533,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_tot_retries_1")=533
-	Set gtmtypes("shmpool_buff_hdr",534,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_tot_retries_2"
-	Set gtmtypes("shmpool_buff_hdr",534,"off")=4680
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.db_curr_tn")=533
+	Set gtmtypes("shmpool_buff_hdr",534,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_dsk_read"
+	Set gtmtypes("shmpool_buff_hdr",534,"off")=4544
 	Set gtmtypes("shmpool_buff_hdr",534,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",534,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_tot_retries_2")=534
-	Set gtmtypes("shmpool_buff_hdr",535,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_tot_retries_3"
-	Set gtmtypes("shmpool_buff_hdr",535,"off")=4688
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_dsk_read")=534
+	Set gtmtypes("shmpool_buff_hdr",535,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_dsk_write"
+	Set gtmtypes("shmpool_buff_hdr",535,"off")=4552
 	Set gtmtypes("shmpool_buff_hdr",535,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",535,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_tot_retries_3")=535
-	Set gtmtypes("shmpool_buff_hdr",536,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_tot_retries_4"
-	Set gtmtypes("shmpool_buff_hdr",536,"off")=4696
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_dsk_write")=535
+	Set gtmtypes("shmpool_buff_hdr",536,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_readwrite"
+	Set gtmtypes("shmpool_buff_hdr",536,"off")=4560
 	Set gtmtypes("shmpool_buff_hdr",536,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",536,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_tot_retries_4")=536
-	Set gtmtypes("shmpool_buff_hdr",537,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_0"
-	Set gtmtypes("shmpool_buff_hdr",537,"off")=4704
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_readwrite")=536
+	Set gtmtypes("shmpool_buff_hdr",537,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_readonly"
+	Set gtmtypes("shmpool_buff_hdr",537,"off")=4568
 	Set gtmtypes("shmpool_buff_hdr",537,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",537,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_0")=537
-	Set gtmtypes("shmpool_buff_hdr",538,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_1"
-	Set gtmtypes("shmpool_buff_hdr",538,"off")=4712
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_readonly")=537
+	Set gtmtypes("shmpool_buff_hdr",538,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_blkwrite"
+	Set gtmtypes("shmpool_buff_hdr",538,"off")=4576
 	Set gtmtypes("shmpool_buff_hdr",538,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",538,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_1")=538
-	Set gtmtypes("shmpool_buff_hdr",539,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_2"
-	Set gtmtypes("shmpool_buff_hdr",539,"off")=4720
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_blkwrite")=538
+	Set gtmtypes("shmpool_buff_hdr",539,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_blkread"
+	Set gtmtypes("shmpool_buff_hdr",539,"off")=4584
 	Set gtmtypes("shmpool_buff_hdr",539,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",539,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_2")=539
-	Set gtmtypes("shmpool_buff_hdr",540,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_3"
-	Set gtmtypes("shmpool_buff_hdr",540,"off")=4728
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_blkread")=539
+	Set gtmtypes("shmpool_buff_hdr",540,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_retries_0"
+	Set gtmtypes("shmpool_buff_hdr",540,"off")=4592
 	Set gtmtypes("shmpool_buff_hdr",540,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",540,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_3")=540
-	Set gtmtypes("shmpool_buff_hdr",541,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_4"
-	Set gtmtypes("shmpool_buff_hdr",541,"off")=4736
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_retries_0")=540
+	Set gtmtypes("shmpool_buff_hdr",541,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_retries_1"
+	Set gtmtypes("shmpool_buff_hdr",541,"off")=4600
 	Set gtmtypes("shmpool_buff_hdr",541,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",541,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_4")=541
-	Set gtmtypes("shmpool_buff_hdr",542,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_ztrigger"
-	Set gtmtypes("shmpool_buff_hdr",542,"off")=4744
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_retries_1")=541
+	Set gtmtypes("shmpool_buff_hdr",542,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_retries_2"
+	Set gtmtypes("shmpool_buff_hdr",542,"off")=4608
 	Set gtmtypes("shmpool_buff_hdr",542,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",542,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_ztrigger")=542
-	Set gtmtypes("shmpool_buff_hdr",543,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_db_flush"
-	Set gtmtypes("shmpool_buff_hdr",543,"off")=4752
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_retries_2")=542
+	Set gtmtypes("shmpool_buff_hdr",543,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_retries_3"
+	Set gtmtypes("shmpool_buff_hdr",543,"off")=4616
 	Set gtmtypes("shmpool_buff_hdr",543,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",543,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_db_flush")=543
-	Set gtmtypes("shmpool_buff_hdr",544,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_db_fsync"
-	Set gtmtypes("shmpool_buff_hdr",544,"off")=4760
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_retries_3")=543
+	Set gtmtypes("shmpool_buff_hdr",544,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_readwrite"
+	Set gtmtypes("shmpool_buff_hdr",544,"off")=4624
 	Set gtmtypes("shmpool_buff_hdr",544,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",544,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_db_fsync")=544
-	Set gtmtypes("shmpool_buff_hdr",545,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jnl_flush"
-	Set gtmtypes("shmpool_buff_hdr",545,"off")=4768
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_readwrite")=544
+	Set gtmtypes("shmpool_buff_hdr",545,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_readonly"
+	Set gtmtypes("shmpool_buff_hdr",545,"off")=4632
 	Set gtmtypes("shmpool_buff_hdr",545,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",545,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jnl_flush")=545
-	Set gtmtypes("shmpool_buff_hdr",546,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jnl_fsync"
-	Set gtmtypes("shmpool_buff_hdr",546,"off")=4776
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_readonly")=545
+	Set gtmtypes("shmpool_buff_hdr",546,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_rolledback"
+	Set gtmtypes("shmpool_buff_hdr",546,"off")=4640
 	Set gtmtypes("shmpool_buff_hdr",546,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",546,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jnl_fsync")=546
-	Set gtmtypes("shmpool_buff_hdr",547,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jbuff_bytes"
-	Set gtmtypes("shmpool_buff_hdr",547,"off")=4784
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_rolledback")=546
+	Set gtmtypes("shmpool_buff_hdr",547,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_blkwrite"
+	Set gtmtypes("shmpool_buff_hdr",547,"off")=4648
 	Set gtmtypes("shmpool_buff_hdr",547,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",547,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jbuff_bytes")=547
-	Set gtmtypes("shmpool_buff_hdr",548,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jfile_bytes"
-	Set gtmtypes("shmpool_buff_hdr",548,"off")=4792
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_blkwrite")=547
+	Set gtmtypes("shmpool_buff_hdr",548,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_blkread"
+	Set gtmtypes("shmpool_buff_hdr",548,"off")=4656
 	Set gtmtypes("shmpool_buff_hdr",548,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",548,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jfile_bytes")=548
-	Set gtmtypes("shmpool_buff_hdr",549,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jfile_writes"
-	Set gtmtypes("shmpool_buff_hdr",549,"off")=4800
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_blkread")=548
+	Set gtmtypes("shmpool_buff_hdr",549,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_tot_retries_0"
+	Set gtmtypes("shmpool_buff_hdr",549,"off")=4664
 	Set gtmtypes("shmpool_buff_hdr",549,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",549,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jfile_writes")=549
-	Set gtmtypes("shmpool_buff_hdr",550,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jrec_logical"
-	Set gtmtypes("shmpool_buff_hdr",550,"off")=4808
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_tot_retries_0")=549
+	Set gtmtypes("shmpool_buff_hdr",550,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_tot_retries_1"
+	Set gtmtypes("shmpool_buff_hdr",550,"off")=4672
 	Set gtmtypes("shmpool_buff_hdr",550,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",550,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jrec_logical")=550
-	Set gtmtypes("shmpool_buff_hdr",551,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jrec_pblk"
-	Set gtmtypes("shmpool_buff_hdr",551,"off")=4816
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_tot_retries_1")=550
+	Set gtmtypes("shmpool_buff_hdr",551,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_tot_retries_2"
+	Set gtmtypes("shmpool_buff_hdr",551,"off")=4680
 	Set gtmtypes("shmpool_buff_hdr",551,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",551,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jrec_pblk")=551
-	Set gtmtypes("shmpool_buff_hdr",552,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jrec_epoch_regular"
-	Set gtmtypes("shmpool_buff_hdr",552,"off")=4824
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_tot_retries_2")=551
+	Set gtmtypes("shmpool_buff_hdr",552,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_tot_retries_3"
+	Set gtmtypes("shmpool_buff_hdr",552,"off")=4688
 	Set gtmtypes("shmpool_buff_hdr",552,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",552,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jrec_epoch_regular")=552
-	Set gtmtypes("shmpool_buff_hdr",553,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jrec_epoch_idle"
-	Set gtmtypes("shmpool_buff_hdr",553,"off")=4832
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_tot_retries_3")=552
+	Set gtmtypes("shmpool_buff_hdr",553,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_tot_retries_4"
+	Set gtmtypes("shmpool_buff_hdr",553,"off")=4696
 	Set gtmtypes("shmpool_buff_hdr",553,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",553,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jrec_epoch_idle")=553
-	Set gtmtypes("shmpool_buff_hdr",554,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jrec_other"
-	Set gtmtypes("shmpool_buff_hdr",554,"off")=4840
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_tot_retries_4")=553
+	Set gtmtypes("shmpool_buff_hdr",554,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_0"
+	Set gtmtypes("shmpool_buff_hdr",554,"off")=4704
 	Set gtmtypes("shmpool_buff_hdr",554,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",554,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jrec_other")=554
-	Set gtmtypes("shmpool_buff_hdr",555,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jnl_extends"
-	Set gtmtypes("shmpool_buff_hdr",555,"off")=4848
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_0")=554
+	Set gtmtypes("shmpool_buff_hdr",555,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_1"
+	Set gtmtypes("shmpool_buff_hdr",555,"off")=4712
 	Set gtmtypes("shmpool_buff_hdr",555,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",555,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jnl_extends")=555
-	Set gtmtypes("shmpool_buff_hdr",556,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_db_extends"
-	Set gtmtypes("shmpool_buff_hdr",556,"off")=4856
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_1")=555
+	Set gtmtypes("shmpool_buff_hdr",556,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_2"
+	Set gtmtypes("shmpool_buff_hdr",556,"off")=4720
 	Set gtmtypes("shmpool_buff_hdr",556,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",556,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_db_extends")=556
-	Set gtmtypes("shmpool_buff_hdr",557,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_crit_success"
-	Set gtmtypes("shmpool_buff_hdr",557,"off")=4864
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_2")=556
+	Set gtmtypes("shmpool_buff_hdr",557,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_3"
+	Set gtmtypes("shmpool_buff_hdr",557,"off")=4728
 	Set gtmtypes("shmpool_buff_hdr",557,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",557,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_crit_success")=557
-	Set gtmtypes("shmpool_buff_hdr",558,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_crits_in_epch"
-	Set gtmtypes("shmpool_buff_hdr",558,"off")=4872
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_3")=557
+	Set gtmtypes("shmpool_buff_hdr",558,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_4"
+	Set gtmtypes("shmpool_buff_hdr",558,"off")=4736
 	Set gtmtypes("shmpool_buff_hdr",558,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",558,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_crits_in_epch")=558
-	Set gtmtypes("shmpool_buff_hdr",559,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.sq_crit_failed"
-	Set gtmtypes("shmpool_buff_hdr",559,"off")=4880
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_4")=558
+	Set gtmtypes("shmpool_buff_hdr",559,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_ztrigger"
+	Set gtmtypes("shmpool_buff_hdr",559,"off")=4744
 	Set gtmtypes("shmpool_buff_hdr",559,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",559,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.sq_crit_failed")=559
-	Set gtmtypes("shmpool_buff_hdr",560,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_crit_failed"
-	Set gtmtypes("shmpool_buff_hdr",560,"off")=4888
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_ztrigger")=559
+	Set gtmtypes("shmpool_buff_hdr",560,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_db_flush"
+	Set gtmtypes("shmpool_buff_hdr",560,"off")=4752
 	Set gtmtypes("shmpool_buff_hdr",560,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",560,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_crit_failed")=560
-	Set gtmtypes("shmpool_buff_hdr",561,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.sq_crit_que_slps"
-	Set gtmtypes("shmpool_buff_hdr",561,"off")=4896
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_db_flush")=560
+	Set gtmtypes("shmpool_buff_hdr",561,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_db_fsync"
+	Set gtmtypes("shmpool_buff_hdr",561,"off")=4760
 	Set gtmtypes("shmpool_buff_hdr",561,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",561,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.sq_crit_que_slps")=561
-	Set gtmtypes("shmpool_buff_hdr",562,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_crit_que_slps"
-	Set gtmtypes("shmpool_buff_hdr",562,"off")=4904
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_db_fsync")=561
+	Set gtmtypes("shmpool_buff_hdr",562,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jnl_flush"
+	Set gtmtypes("shmpool_buff_hdr",562,"off")=4768
 	Set gtmtypes("shmpool_buff_hdr",562,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",562,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_crit_que_slps")=562
-	Set gtmtypes("shmpool_buff_hdr",563,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.sq_crit_yields"
-	Set gtmtypes("shmpool_buff_hdr",563,"off")=4912
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jnl_flush")=562
+	Set gtmtypes("shmpool_buff_hdr",563,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jnl_fsync"
+	Set gtmtypes("shmpool_buff_hdr",563,"off")=4776
 	Set gtmtypes("shmpool_buff_hdr",563,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",563,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.sq_crit_yields")=563
-	Set gtmtypes("shmpool_buff_hdr",564,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_crit_yields"
-	Set gtmtypes("shmpool_buff_hdr",564,"off")=4920
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jnl_fsync")=563
+	Set gtmtypes("shmpool_buff_hdr",564,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jbuff_bytes"
+	Set gtmtypes("shmpool_buff_hdr",564,"off")=4784
 	Set gtmtypes("shmpool_buff_hdr",564,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",564,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_crit_yields")=564
-	Set gtmtypes("shmpool_buff_hdr",565,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec_filler_4k_plus_512"
-	Set gtmtypes("shmpool_buff_hdr",565,"off")=4928
-	Set gtmtypes("shmpool_buff_hdr",565,"len")=48
-	Set gtmtypes("shmpool_buff_hdr",565,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec_filler_4k_plus_512")=565
-	Set gtmtypes("shmpool_buff_hdr",566,"name")="shmpool_buff_hdr.shadow_file_header.filler_4k_plus_512"
-	Set gtmtypes("shmpool_buff_hdr",566,"off")=4976
-	Set gtmtypes("shmpool_buff_hdr",566,"len")=368
-	Set gtmtypes("shmpool_buff_hdr",566,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_4k_plus_512")=566
-	Set gtmtypes("shmpool_buff_hdr",567,"name")="shmpool_buff_hdr.shadow_file_header.intrpt_recov_resync_strm_seqno"
-	Set gtmtypes("shmpool_buff_hdr",567,"off")=5344
-	Set gtmtypes("shmpool_buff_hdr",567,"len")=128
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jbuff_bytes")=564
+	Set gtmtypes("shmpool_buff_hdr",565,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jfile_bytes"
+	Set gtmtypes("shmpool_buff_hdr",565,"off")=4792
+	Set gtmtypes("shmpool_buff_hdr",565,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",565,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jfile_bytes")=565
+	Set gtmtypes("shmpool_buff_hdr",566,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jfile_writes"
+	Set gtmtypes("shmpool_buff_hdr",566,"off")=4800
+	Set gtmtypes("shmpool_buff_hdr",566,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",566,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jfile_writes")=566
+	Set gtmtypes("shmpool_buff_hdr",567,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jrec_logical"
+	Set gtmtypes("shmpool_buff_hdr",567,"off")=4808
+	Set gtmtypes("shmpool_buff_hdr",567,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",567,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.intrpt_recov_resync_strm_seqno")=567
-	Set gtmtypes("shmpool_buff_hdr",567,"dim")=16
-	Set gtmtypes("shmpool_buff_hdr",568,"name")="shmpool_buff_hdr.shadow_file_header.creation_db_ver"
-	Set gtmtypes("shmpool_buff_hdr",568,"off")=5472
-	Set gtmtypes("shmpool_buff_hdr",568,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",568,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.creation_db_ver")=568
-	Set gtmtypes("shmpool_buff_hdr",569,"name")="shmpool_buff_hdr.shadow_file_header.creation_mdb_ver"
-	Set gtmtypes("shmpool_buff_hdr",569,"off")=5476
-	Set gtmtypes("shmpool_buff_hdr",569,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",569,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.creation_mdb_ver")=569
-	Set gtmtypes("shmpool_buff_hdr",570,"name")="shmpool_buff_hdr.shadow_file_header.certified_for_upgrade_to"
-	Set gtmtypes("shmpool_buff_hdr",570,"off")=5480
-	Set gtmtypes("shmpool_buff_hdr",570,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",570,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.certified_for_upgrade_to")=570
-	Set gtmtypes("shmpool_buff_hdr",571,"name")="shmpool_buff_hdr.shadow_file_header.filler_5k"
-	Set gtmtypes("shmpool_buff_hdr",571,"off")=5484
-	Set gtmtypes("shmpool_buff_hdr",571,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",571,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_5k")=571
-	Set gtmtypes("shmpool_buff_hdr",572,"name")="shmpool_buff_hdr.shadow_file_header.secshr_ops_index_filler"
-	Set gtmtypes("shmpool_buff_hdr",572,"off")=5488
-	Set gtmtypes("shmpool_buff_hdr",572,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",572,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.secshr_ops_index_filler")=572
-	Set gtmtypes("shmpool_buff_hdr",573,"name")="shmpool_buff_hdr.shadow_file_header.secshr_ops_array_filler"
-	Set gtmtypes("shmpool_buff_hdr",573,"off")=5492
-	Set gtmtypes("shmpool_buff_hdr",573,"len")=1020
-	Set gtmtypes("shmpool_buff_hdr",573,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.secshr_ops_array_filler")=573
-	Set gtmtypes("shmpool_buff_hdr",573,"dim")=255
-	Set gtmtypes("shmpool_buff_hdr",574,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn"
-	Set gtmtypes("shmpool_buff_hdr",574,"off")=6512
-	Set gtmtypes("shmpool_buff_hdr",574,"len")=24
-	Set gtmtypes("shmpool_buff_hdr",574,"type")="compswap_time_field"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn")=574
-	Set gtmtypes("shmpool_buff_hdr",575,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch"
-	Set gtmtypes("shmpool_buff_hdr",575,"off")=6512
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jrec_logical")=567
+	Set gtmtypes("shmpool_buff_hdr",568,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jrec_pblk"
+	Set gtmtypes("shmpool_buff_hdr",568,"off")=4816
+	Set gtmtypes("shmpool_buff_hdr",568,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",568,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jrec_pblk")=568
+	Set gtmtypes("shmpool_buff_hdr",569,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jrec_epoch_regular"
+	Set gtmtypes("shmpool_buff_hdr",569,"off")=4824
+	Set gtmtypes("shmpool_buff_hdr",569,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",569,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jrec_epoch_regular")=569
+	Set gtmtypes("shmpool_buff_hdr",570,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jrec_epoch_idle"
+	Set gtmtypes("shmpool_buff_hdr",570,"off")=4832
+	Set gtmtypes("shmpool_buff_hdr",570,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",570,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jrec_epoch_idle")=570
+	Set gtmtypes("shmpool_buff_hdr",571,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jrec_other"
+	Set gtmtypes("shmpool_buff_hdr",571,"off")=4840
+	Set gtmtypes("shmpool_buff_hdr",571,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",571,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jrec_other")=571
+	Set gtmtypes("shmpool_buff_hdr",572,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jnl_extends"
+	Set gtmtypes("shmpool_buff_hdr",572,"off")=4848
+	Set gtmtypes("shmpool_buff_hdr",572,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",572,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jnl_extends")=572
+	Set gtmtypes("shmpool_buff_hdr",573,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_db_extends"
+	Set gtmtypes("shmpool_buff_hdr",573,"off")=4856
+	Set gtmtypes("shmpool_buff_hdr",573,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",573,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_db_extends")=573
+	Set gtmtypes("shmpool_buff_hdr",574,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_crit_success"
+	Set gtmtypes("shmpool_buff_hdr",574,"off")=4864
+	Set gtmtypes("shmpool_buff_hdr",574,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",574,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_crit_success")=574
+	Set gtmtypes("shmpool_buff_hdr",575,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_crits_in_epch"
+	Set gtmtypes("shmpool_buff_hdr",575,"off")=4872
 	Set gtmtypes("shmpool_buff_hdr",575,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",575,"type")="global_latch_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch")=575
-	Set gtmtypes("shmpool_buff_hdr",576,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch.u"
-	Set gtmtypes("shmpool_buff_hdr",576,"off")=6512
+	Set gtmtypes("shmpool_buff_hdr",575,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_crits_in_epch")=575
+	Set gtmtypes("shmpool_buff_hdr",576,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.sq_crit_failed"
+	Set gtmtypes("shmpool_buff_hdr",576,"off")=4880
 	Set gtmtypes("shmpool_buff_hdr",576,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",576,"type")="union"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch.u")=576
-	Set gtmtypes("shmpool_buff_hdr",577,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch.u.pid_imgcnt"
-	Set gtmtypes("shmpool_buff_hdr",577,"off")=6512
+	Set gtmtypes("shmpool_buff_hdr",576,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.sq_crit_failed")=576
+	Set gtmtypes("shmpool_buff_hdr",577,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_crit_failed"
+	Set gtmtypes("shmpool_buff_hdr",577,"off")=4888
 	Set gtmtypes("shmpool_buff_hdr",577,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",577,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch.u.pid_imgcnt")=577
-	Set gtmtypes("shmpool_buff_hdr",578,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch.u.parts"
-	Set gtmtypes("shmpool_buff_hdr",578,"off")=6512
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_crit_failed")=577
+	Set gtmtypes("shmpool_buff_hdr",578,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.sq_crit_que_slps"
+	Set gtmtypes("shmpool_buff_hdr",578,"off")=4896
 	Set gtmtypes("shmpool_buff_hdr",578,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",578,"type")="struct"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch.u.parts")=578
-	Set gtmtypes("shmpool_buff_hdr",579,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_pid"
-	Set gtmtypes("shmpool_buff_hdr",579,"off")=6512
-	Set gtmtypes("shmpool_buff_hdr",579,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",579,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_pid")=579
-	Set gtmtypes("shmpool_buff_hdr",580,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_word"
-	Set gtmtypes("shmpool_buff_hdr",580,"off")=6516
-	Set gtmtypes("shmpool_buff_hdr",580,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",580,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_word")=580
-	Set gtmtypes("shmpool_buff_hdr",581,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.hp_latch_space"
-	Set gtmtypes("shmpool_buff_hdr",581,"off")=6520
-	Set gtmtypes("shmpool_buff_hdr",581,"len")=16
-	Set gtmtypes("shmpool_buff_hdr",581,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.hp_latch_space")=581
-	Set gtmtypes("shmpool_buff_hdr",581,"dim")=4
-	Set gtmtypes("shmpool_buff_hdr",582,"name")="shmpool_buff_hdr.shadow_file_header.is_encrypted"
-	Set gtmtypes("shmpool_buff_hdr",582,"off")=6536
-	Set gtmtypes("shmpool_buff_hdr",582,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",582,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.is_encrypted")=582
-	Set gtmtypes("shmpool_buff_hdr",583,"name")="shmpool_buff_hdr.shadow_file_header.db_trigger_cycle"
-	Set gtmtypes("shmpool_buff_hdr",583,"off")=6540
-	Set gtmtypes("shmpool_buff_hdr",583,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",583,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_trigger_cycle")=583
-	Set gtmtypes("shmpool_buff_hdr",584,"name")="shmpool_buff_hdr.shadow_file_header.strm_reg_seqno"
-	Set gtmtypes("shmpool_buff_hdr",584,"off")=6544
-	Set gtmtypes("shmpool_buff_hdr",584,"len")=128
-	Set gtmtypes("shmpool_buff_hdr",584,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.strm_reg_seqno")=584
-	Set gtmtypes("shmpool_buff_hdr",584,"dim")=16
-	Set gtmtypes("shmpool_buff_hdr",585,"name")="shmpool_buff_hdr.shadow_file_header.save_strm_reg_seqno"
-	Set gtmtypes("shmpool_buff_hdr",585,"off")=6672
+	Set gtmtypes("shmpool_buff_hdr",578,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.sq_crit_que_slps")=578
+	Set gtmtypes("shmpool_buff_hdr",579,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_crit_que_slps"
+	Set gtmtypes("shmpool_buff_hdr",579,"off")=4904
+	Set gtmtypes("shmpool_buff_hdr",579,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",579,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_crit_que_slps")=579
+	Set gtmtypes("shmpool_buff_hdr",580,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.sq_crit_yields"
+	Set gtmtypes("shmpool_buff_hdr",580,"off")=4912
+	Set gtmtypes("shmpool_buff_hdr",580,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",580,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.sq_crit_yields")=580
+	Set gtmtypes("shmpool_buff_hdr",581,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_crit_yields"
+	Set gtmtypes("shmpool_buff_hdr",581,"off")=4920
+	Set gtmtypes("shmpool_buff_hdr",581,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",581,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_crit_yields")=581
+	Set gtmtypes("shmpool_buff_hdr",582,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_clean2dirty"
+	Set gtmtypes("shmpool_buff_hdr",582,"off")=4928
+	Set gtmtypes("shmpool_buff_hdr",582,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",582,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_clean2dirty")=582
+	Set gtmtypes("shmpool_buff_hdr",583,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec_filler_4k_plus_512"
+	Set gtmtypes("shmpool_buff_hdr",583,"off")=4936
+	Set gtmtypes("shmpool_buff_hdr",583,"len")=40
+	Set gtmtypes("shmpool_buff_hdr",583,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec_filler_4k_plus_512")=583
+	Set gtmtypes("shmpool_buff_hdr",584,"name")="shmpool_buff_hdr.shadow_file_header.filler_4k_plus_512"
+	Set gtmtypes("shmpool_buff_hdr",584,"off")=4976
+	Set gtmtypes("shmpool_buff_hdr",584,"len")=368
+	Set gtmtypes("shmpool_buff_hdr",584,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_4k_plus_512")=584
+	Set gtmtypes("shmpool_buff_hdr",585,"name")="shmpool_buff_hdr.shadow_file_header.intrpt_recov_resync_strm_seqno"
+	Set gtmtypes("shmpool_buff_hdr",585,"off")=5344
 	Set gtmtypes("shmpool_buff_hdr",585,"len")=128
 	Set gtmtypes("shmpool_buff_hdr",585,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.save_strm_reg_seqno")=585
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.intrpt_recov_resync_strm_seqno")=585
 	Set gtmtypes("shmpool_buff_hdr",585,"dim")=16
-	Set gtmtypes("shmpool_buff_hdr",586,"name")="shmpool_buff_hdr.shadow_file_header.freeze_on_fail"
-	Set gtmtypes("shmpool_buff_hdr",586,"off")=6800
+	Set gtmtypes("shmpool_buff_hdr",586,"name")="shmpool_buff_hdr.shadow_file_header.creation_db_ver"
+	Set gtmtypes("shmpool_buff_hdr",586,"off")=5472
 	Set gtmtypes("shmpool_buff_hdr",586,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",586,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.freeze_on_fail")=586
-	Set gtmtypes("shmpool_buff_hdr",587,"name")="shmpool_buff_hdr.shadow_file_header.span_node_absent"
-	Set gtmtypes("shmpool_buff_hdr",587,"off")=6804
+	Set gtmtypes("shmpool_buff_hdr",586,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.creation_db_ver")=586
+	Set gtmtypes("shmpool_buff_hdr",587,"name")="shmpool_buff_hdr.shadow_file_header.creation_mdb_ver"
+	Set gtmtypes("shmpool_buff_hdr",587,"off")=5476
 	Set gtmtypes("shmpool_buff_hdr",587,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",587,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.span_node_absent")=587
-	Set gtmtypes("shmpool_buff_hdr",588,"name")="shmpool_buff_hdr.shadow_file_header.maxkeysz_assured"
-	Set gtmtypes("shmpool_buff_hdr",588,"off")=6808
+	Set gtmtypes("shmpool_buff_hdr",587,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.creation_mdb_ver")=587
+	Set gtmtypes("shmpool_buff_hdr",588,"name")="shmpool_buff_hdr.shadow_file_header.certified_for_upgrade_to"
+	Set gtmtypes("shmpool_buff_hdr",588,"off")=5480
 	Set gtmtypes("shmpool_buff_hdr",588,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",588,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.maxkeysz_assured")=588
-	Set gtmtypes("shmpool_buff_hdr",589,"name")="shmpool_buff_hdr.shadow_file_header.hasht_upgrade_needed"
-	Set gtmtypes("shmpool_buff_hdr",589,"off")=6812
+	Set gtmtypes("shmpool_buff_hdr",588,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.certified_for_upgrade_to")=588
+	Set gtmtypes("shmpool_buff_hdr",589,"name")="shmpool_buff_hdr.shadow_file_header.filler_5k"
+	Set gtmtypes("shmpool_buff_hdr",589,"off")=5484
 	Set gtmtypes("shmpool_buff_hdr",589,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",589,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.hasht_upgrade_needed")=589
-	Set gtmtypes("shmpool_buff_hdr",590,"name")="shmpool_buff_hdr.shadow_file_header.defer_allocate"
-	Set gtmtypes("shmpool_buff_hdr",590,"off")=6816
+	Set gtmtypes("shmpool_buff_hdr",589,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_5k")=589
+	Set gtmtypes("shmpool_buff_hdr",590,"name")="shmpool_buff_hdr.shadow_file_header.secshr_ops_index_filler"
+	Set gtmtypes("shmpool_buff_hdr",590,"off")=5488
 	Set gtmtypes("shmpool_buff_hdr",590,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",590,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.defer_allocate")=590
-	Set gtmtypes("shmpool_buff_hdr",591,"name")="shmpool_buff_hdr.shadow_file_header.filler_ftok_counter_halted"
-	Set gtmtypes("shmpool_buff_hdr",591,"off")=6820
-	Set gtmtypes("shmpool_buff_hdr",591,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",591,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_ftok_counter_halted")=591
-	Set gtmtypes("shmpool_buff_hdr",592,"name")="shmpool_buff_hdr.shadow_file_header.filler_access_counter_halted"
-	Set gtmtypes("shmpool_buff_hdr",592,"off")=6824
-	Set gtmtypes("shmpool_buff_hdr",592,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",592,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_access_counter_halted")=592
-	Set gtmtypes("shmpool_buff_hdr",593,"name")="shmpool_buff_hdr.shadow_file_header.filler_7k"
-	Set gtmtypes("shmpool_buff_hdr",593,"off")=6828
-	Set gtmtypes("shmpool_buff_hdr",593,"len")=708
-	Set gtmtypes("shmpool_buff_hdr",593,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_7k")=593
-	Set gtmtypes("shmpool_buff_hdr",594,"name")="shmpool_buff_hdr.shadow_file_header.filler_8k"
-	Set gtmtypes("shmpool_buff_hdr",594,"off")=7536
-	Set gtmtypes("shmpool_buff_hdr",594,"len")=1024
-	Set gtmtypes("shmpool_buff_hdr",594,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_8k")=594
+	Set gtmtypes("shmpool_buff_hdr",590,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.secshr_ops_index_filler")=590
+	Set gtmtypes("shmpool_buff_hdr",591,"name")="shmpool_buff_hdr.shadow_file_header.secshr_ops_array_filler"
+	Set gtmtypes("shmpool_buff_hdr",591,"off")=5492
+	Set gtmtypes("shmpool_buff_hdr",591,"len")=1020
+	Set gtmtypes("shmpool_buff_hdr",591,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.secshr_ops_array_filler")=591
+	Set gtmtypes("shmpool_buff_hdr",591,"dim")=255
+	Set gtmtypes("shmpool_buff_hdr",592,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn"
+	Set gtmtypes("shmpool_buff_hdr",592,"off")=6512
+	Set gtmtypes("shmpool_buff_hdr",592,"len")=24
+	Set gtmtypes("shmpool_buff_hdr",592,"type")="compswap_time_field"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn")=592
+	Set gtmtypes("shmpool_buff_hdr",593,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch"
+	Set gtmtypes("shmpool_buff_hdr",593,"off")=6512
+	Set gtmtypes("shmpool_buff_hdr",593,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",593,"type")="global_latch_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch")=593
+	Set gtmtypes("shmpool_buff_hdr",594,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch.u"
+	Set gtmtypes("shmpool_buff_hdr",594,"off")=6512
+	Set gtmtypes("shmpool_buff_hdr",594,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",594,"type")="union"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch.u")=594
+	Set gtmtypes("shmpool_buff_hdr",595,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch.u.pid_imgcnt"
+	Set gtmtypes("shmpool_buff_hdr",595,"off")=6512
+	Set gtmtypes("shmpool_buff_hdr",595,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",595,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch.u.pid_imgcnt")=595
+	Set gtmtypes("shmpool_buff_hdr",596,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch.u.parts"
+	Set gtmtypes("shmpool_buff_hdr",596,"off")=6512
+	Set gtmtypes("shmpool_buff_hdr",596,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",596,"type")="struct"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch.u.parts")=596
+	Set gtmtypes("shmpool_buff_hdr",597,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_pid"
+	Set gtmtypes("shmpool_buff_hdr",597,"off")=6512
+	Set gtmtypes("shmpool_buff_hdr",597,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",597,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_pid")=597
+	Set gtmtypes("shmpool_buff_hdr",598,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_word"
+	Set gtmtypes("shmpool_buff_hdr",598,"off")=6516
+	Set gtmtypes("shmpool_buff_hdr",598,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",598,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_word")=598
+	Set gtmtypes("shmpool_buff_hdr",599,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.hp_latch_space"
+	Set gtmtypes("shmpool_buff_hdr",599,"off")=6520
+	Set gtmtypes("shmpool_buff_hdr",599,"len")=16
+	Set gtmtypes("shmpool_buff_hdr",599,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.hp_latch_space")=599
+	Set gtmtypes("shmpool_buff_hdr",599,"dim")=4
+	Set gtmtypes("shmpool_buff_hdr",600,"name")="shmpool_buff_hdr.shadow_file_header.is_encrypted"
+	Set gtmtypes("shmpool_buff_hdr",600,"off")=6536
+	Set gtmtypes("shmpool_buff_hdr",600,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",600,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.is_encrypted")=600
+	Set gtmtypes("shmpool_buff_hdr",601,"name")="shmpool_buff_hdr.shadow_file_header.db_trigger_cycle"
+	Set gtmtypes("shmpool_buff_hdr",601,"off")=6540
+	Set gtmtypes("shmpool_buff_hdr",601,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",601,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_trigger_cycle")=601
+	Set gtmtypes("shmpool_buff_hdr",602,"name")="shmpool_buff_hdr.shadow_file_header.strm_reg_seqno"
+	Set gtmtypes("shmpool_buff_hdr",602,"off")=6544
+	Set gtmtypes("shmpool_buff_hdr",602,"len")=128
+	Set gtmtypes("shmpool_buff_hdr",602,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.strm_reg_seqno")=602
+	Set gtmtypes("shmpool_buff_hdr",602,"dim")=16
+	Set gtmtypes("shmpool_buff_hdr",603,"name")="shmpool_buff_hdr.shadow_file_header.save_strm_reg_seqno"
+	Set gtmtypes("shmpool_buff_hdr",603,"off")=6672
+	Set gtmtypes("shmpool_buff_hdr",603,"len")=128
+	Set gtmtypes("shmpool_buff_hdr",603,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.save_strm_reg_seqno")=603
+	Set gtmtypes("shmpool_buff_hdr",603,"dim")=16
+	Set gtmtypes("shmpool_buff_hdr",604,"name")="shmpool_buff_hdr.shadow_file_header.freeze_on_fail"
+	Set gtmtypes("shmpool_buff_hdr",604,"off")=6800
+	Set gtmtypes("shmpool_buff_hdr",604,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",604,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.freeze_on_fail")=604
+	Set gtmtypes("shmpool_buff_hdr",605,"name")="shmpool_buff_hdr.shadow_file_header.span_node_absent"
+	Set gtmtypes("shmpool_buff_hdr",605,"off")=6804
+	Set gtmtypes("shmpool_buff_hdr",605,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",605,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.span_node_absent")=605
+	Set gtmtypes("shmpool_buff_hdr",606,"name")="shmpool_buff_hdr.shadow_file_header.maxkeysz_assured"
+	Set gtmtypes("shmpool_buff_hdr",606,"off")=6808
+	Set gtmtypes("shmpool_buff_hdr",606,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",606,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.maxkeysz_assured")=606
+	Set gtmtypes("shmpool_buff_hdr",607,"name")="shmpool_buff_hdr.shadow_file_header.hasht_upgrade_needed"
+	Set gtmtypes("shmpool_buff_hdr",607,"off")=6812
+	Set gtmtypes("shmpool_buff_hdr",607,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",607,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.hasht_upgrade_needed")=607
+	Set gtmtypes("shmpool_buff_hdr",608,"name")="shmpool_buff_hdr.shadow_file_header.defer_allocate"
+	Set gtmtypes("shmpool_buff_hdr",608,"off")=6816
+	Set gtmtypes("shmpool_buff_hdr",608,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",608,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.defer_allocate")=608
+	Set gtmtypes("shmpool_buff_hdr",609,"name")="shmpool_buff_hdr.shadow_file_header.filler_ftok_counter_halted"
+	Set gtmtypes("shmpool_buff_hdr",609,"off")=6820
+	Set gtmtypes("shmpool_buff_hdr",609,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",609,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_ftok_counter_halted")=609
+	Set gtmtypes("shmpool_buff_hdr",610,"name")="shmpool_buff_hdr.shadow_file_header.filler_access_counter_halted"
+	Set gtmtypes("shmpool_buff_hdr",610,"off")=6824
+	Set gtmtypes("shmpool_buff_hdr",610,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",610,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_access_counter_halted")=610
+	Set gtmtypes("shmpool_buff_hdr",611,"name")="shmpool_buff_hdr.shadow_file_header.lock_crit_with_db"
+	Set gtmtypes("shmpool_buff_hdr",611,"off")=6828
+	Set gtmtypes("shmpool_buff_hdr",611,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",611,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.lock_crit_with_db")=611
+	Set gtmtypes("shmpool_buff_hdr",612,"name")="shmpool_buff_hdr.shadow_file_header.basedb_fname_len"
+	Set gtmtypes("shmpool_buff_hdr",612,"off")=6832
+	Set gtmtypes("shmpool_buff_hdr",612,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",612,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.basedb_fname_len")=612
+	Set gtmtypes("shmpool_buff_hdr",613,"name")="shmpool_buff_hdr.shadow_file_header.basedb_fname"
+	Set gtmtypes("shmpool_buff_hdr",613,"off")=6836
+	Set gtmtypes("shmpool_buff_hdr",613,"len")=256
+	Set gtmtypes("shmpool_buff_hdr",613,"type")="unsigned-char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.basedb_fname")=613
+	Set gtmtypes("shmpool_buff_hdr",614,"name")="shmpool_buff_hdr.shadow_file_header.filler_7k"
+	Set gtmtypes("shmpool_buff_hdr",614,"off")=7092
+	Set gtmtypes("shmpool_buff_hdr",614,"len")=444
+	Set gtmtypes("shmpool_buff_hdr",614,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_7k")=614
+	Set gtmtypes("shmpool_buff_hdr",615,"name")="shmpool_buff_hdr.shadow_file_header.filler_8k"
+	Set gtmtypes("shmpool_buff_hdr",615,"off")=7536
+	Set gtmtypes("shmpool_buff_hdr",615,"len")=1024
+	Set gtmtypes("shmpool_buff_hdr",615,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_8k")=615
 	;
 	Set gtmtypes("show_reply")="struct"
 	Set gtmtypes("show_reply",0)=2
@@ -35801,10 +36626,10 @@ Init
 	;
 	Set gtmtypes("sib_byte_type")="union"
 	Set gtmtypes("sib_byte_type",0)=2
-	Set gtmtypes("sib_byte_type","len")=4
+	Set gtmtypes("sib_byte_type","len")=1
 	Set gtmtypes("sib_byte_type",1,"name")="sib_byte_type.sib"
 	Set gtmtypes("sib_byte_type",1,"off")=0
-	Set gtmtypes("sib_byte_type",1,"len")=4
+	Set gtmtypes("sib_byte_type",1,"len")=1
 	Set gtmtypes("sib_byte_type",1,"type")="SIB"
 	Set gtmtypfldindx("sib_byte_type","sib")=1
 	Set gtmtypes("sib_byte_type",2,"name")="sib_byte_type.byte"
@@ -36661,8 +37486,8 @@ Init
 	Set gtmtypfldindx("span_subs","b_sec")=3
 	;
 	Set gtmtypes("spdesc")="struct"
-	Set gtmtypes("spdesc",0)=5
-	Set gtmtypes("spdesc","len")=40
+	Set gtmtypes("spdesc",0)=6
+	Set gtmtypes("spdesc","len")=48
 	Set gtmtypes("spdesc",1,"name")="spdesc.base"
 	Set gtmtypes("spdesc",1,"off")=0
 	Set gtmtypes("spdesc",1,"len")=8
@@ -36688,6 +37513,11 @@ Init
 	Set gtmtypes("spdesc",5,"len")=1
 	Set gtmtypes("spdesc",5,"type")="unsigned-char"
 	Set gtmtypfldindx("spdesc","prvprt")=5
+	Set gtmtypes("spdesc",6,"name")="spdesc.invokestpgcollevel"
+	Set gtmtypes("spdesc",6,"off")=40
+	Set gtmtypes("spdesc",6,"len")=8
+	Set gtmtypes("spdesc",6,"type")="addr"
+	Set gtmtypfldindx("spdesc","invokestpgcollevel")=6
 	;
 	Set gtmtypes("src_line_struct")="struct"
 	Set gtmtypes("src_line_struct",0)=8
@@ -37014,6 +37844,25 @@ Init
 	Set gtmtypes("stack_frame",15,"type")="addr"
 	Set gtmtypfldindx("stack_frame","ret_value")=15
 	;
+	Set gtmtypes("statsDB_deferred_init_que_elem")="struct"
+	Set gtmtypes("statsDB_deferred_init_que_elem",0)=3
+	Set gtmtypes("statsDB_deferred_init_que_elem","len")=24
+	Set gtmtypes("statsDB_deferred_init_que_elem",1,"name")="statsDB_deferred_init_que_elem.next"
+	Set gtmtypes("statsDB_deferred_init_que_elem",1,"off")=0
+	Set gtmtypes("statsDB_deferred_init_que_elem",1,"len")=8
+	Set gtmtypes("statsDB_deferred_init_que_elem",1,"type")="addr"
+	Set gtmtypfldindx("statsDB_deferred_init_que_elem","next")=1
+	Set gtmtypes("statsDB_deferred_init_que_elem",2,"name")="statsDB_deferred_init_que_elem.baseDBreg"
+	Set gtmtypes("statsDB_deferred_init_que_elem",2,"off")=8
+	Set gtmtypes("statsDB_deferred_init_que_elem",2,"len")=8
+	Set gtmtypes("statsDB_deferred_init_que_elem",2,"type")="addr"
+	Set gtmtypfldindx("statsDB_deferred_init_que_elem","baseDBreg")=2
+	Set gtmtypes("statsDB_deferred_init_que_elem",3,"name")="statsDB_deferred_init_que_elem.statsDBreg"
+	Set gtmtypes("statsDB_deferred_init_que_elem",3,"off")=16
+	Set gtmtypes("statsDB_deferred_init_que_elem",3,"len")=8
+	Set gtmtypes("statsDB_deferred_init_que_elem",3,"type")="addr"
+	Set gtmtypfldindx("statsDB_deferred_init_que_elem","statsDBreg")=3
+	;
 	Set gtmtypes("storElem")="struct"
 	Set gtmtypes("storElem",0)=14
 	Set gtmtypes("storElem","len")=72
@@ -39566,11 +40415,11 @@ Init
 	Set gtmtypfldindx("unique_file_id","file_id")=5
 	;
 	Set gtmtypes("unix_db_info")="struct"
-	Set gtmtypes("unix_db_info",0)=155
-	Set gtmtypes("unix_db_info","len")=1024
+	Set gtmtypes("unix_db_info",0)=168
+	Set gtmtypes("unix_db_info","len")=1096
 	Set gtmtypes("unix_db_info",1,"name")="unix_db_info.s_addrs"
 	Set gtmtypes("unix_db_info",1,"off")=0
-	Set gtmtypes("unix_db_info",1,"len")=936
+	Set gtmtypes("unix_db_info",1,"len")=992
 	Set gtmtypes("unix_db_info",1,"type")="sgmnt_addrs"
 	Set gtmtypfldindx("unix_db_info","s_addrs")=1
 	Set gtmtypes("unix_db_info",2,"name")="unix_db_info.s_addrs.hdr"
@@ -39725,626 +40574,691 @@ Init
 	Set gtmtypes("unix_db_info",31,"len")=8
 	Set gtmtypes("unix_db_info",31,"type")="addr"
 	Set gtmtypfldindx("unix_db_info","s_addrs.acc_meth.bg.cache_state")=31
-	Set gtmtypes("unix_db_info",32,"name")="unix_db_info.s_addrs.gvstats_rec"
+	Set gtmtypes("unix_db_info",32,"name")="unix_db_info.s_addrs.gvstats_rec_p"
 	Set gtmtypes("unix_db_info",32,"off")=224
-	Set gtmtypes("unix_db_info",32,"len")=464
-	Set gtmtypes("unix_db_info",32,"type")="gvstats_rec_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec")=32
-	Set gtmtypes("unix_db_info",33,"name")="unix_db_info.s_addrs.gvstats_rec.n_set"
-	Set gtmtypes("unix_db_info",33,"off")=224
-	Set gtmtypes("unix_db_info",33,"len")=8
-	Set gtmtypes("unix_db_info",33,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_set")=33
-	Set gtmtypes("unix_db_info",34,"name")="unix_db_info.s_addrs.gvstats_rec.n_kill"
+	Set gtmtypes("unix_db_info",32,"len")=8
+	Set gtmtypes("unix_db_info",32,"type")="addr"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec_p")=32
+	Set gtmtypes("unix_db_info",33,"name")="unix_db_info.s_addrs.gvstats_rec"
+	Set gtmtypes("unix_db_info",33,"off")=232
+	Set gtmtypes("unix_db_info",33,"len")=472
+	Set gtmtypes("unix_db_info",33,"type")="gvstats_rec_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec")=33
+	Set gtmtypes("unix_db_info",34,"name")="unix_db_info.s_addrs.gvstats_rec.n_set"
 	Set gtmtypes("unix_db_info",34,"off")=232
 	Set gtmtypes("unix_db_info",34,"len")=8
 	Set gtmtypes("unix_db_info",34,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_kill")=34
-	Set gtmtypes("unix_db_info",35,"name")="unix_db_info.s_addrs.gvstats_rec.n_get"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_set")=34
+	Set gtmtypes("unix_db_info",35,"name")="unix_db_info.s_addrs.gvstats_rec.n_kill"
 	Set gtmtypes("unix_db_info",35,"off")=240
 	Set gtmtypes("unix_db_info",35,"len")=8
 	Set gtmtypes("unix_db_info",35,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_get")=35
-	Set gtmtypes("unix_db_info",36,"name")="unix_db_info.s_addrs.gvstats_rec.n_data"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_kill")=35
+	Set gtmtypes("unix_db_info",36,"name")="unix_db_info.s_addrs.gvstats_rec.n_get"
 	Set gtmtypes("unix_db_info",36,"off")=248
 	Set gtmtypes("unix_db_info",36,"len")=8
 	Set gtmtypes("unix_db_info",36,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_data")=36
-	Set gtmtypes("unix_db_info",37,"name")="unix_db_info.s_addrs.gvstats_rec.n_order"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_get")=36
+	Set gtmtypes("unix_db_info",37,"name")="unix_db_info.s_addrs.gvstats_rec.n_data"
 	Set gtmtypes("unix_db_info",37,"off")=256
 	Set gtmtypes("unix_db_info",37,"len")=8
 	Set gtmtypes("unix_db_info",37,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_order")=37
-	Set gtmtypes("unix_db_info",38,"name")="unix_db_info.s_addrs.gvstats_rec.n_zprev"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_data")=37
+	Set gtmtypes("unix_db_info",38,"name")="unix_db_info.s_addrs.gvstats_rec.n_order"
 	Set gtmtypes("unix_db_info",38,"off")=264
 	Set gtmtypes("unix_db_info",38,"len")=8
 	Set gtmtypes("unix_db_info",38,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_zprev")=38
-	Set gtmtypes("unix_db_info",39,"name")="unix_db_info.s_addrs.gvstats_rec.n_query"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_order")=38
+	Set gtmtypes("unix_db_info",39,"name")="unix_db_info.s_addrs.gvstats_rec.n_zprev"
 	Set gtmtypes("unix_db_info",39,"off")=272
 	Set gtmtypes("unix_db_info",39,"len")=8
 	Set gtmtypes("unix_db_info",39,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_query")=39
-	Set gtmtypes("unix_db_info",40,"name")="unix_db_info.s_addrs.gvstats_rec.n_lock_success"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_zprev")=39
+	Set gtmtypes("unix_db_info",40,"name")="unix_db_info.s_addrs.gvstats_rec.n_query"
 	Set gtmtypes("unix_db_info",40,"off")=280
 	Set gtmtypes("unix_db_info",40,"len")=8
 	Set gtmtypes("unix_db_info",40,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_lock_success")=40
-	Set gtmtypes("unix_db_info",41,"name")="unix_db_info.s_addrs.gvstats_rec.n_lock_fail"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_query")=40
+	Set gtmtypes("unix_db_info",41,"name")="unix_db_info.s_addrs.gvstats_rec.n_lock_success"
 	Set gtmtypes("unix_db_info",41,"off")=288
 	Set gtmtypes("unix_db_info",41,"len")=8
 	Set gtmtypes("unix_db_info",41,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_lock_fail")=41
-	Set gtmtypes("unix_db_info",42,"name")="unix_db_info.s_addrs.gvstats_rec.db_curr_tn"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_lock_success")=41
+	Set gtmtypes("unix_db_info",42,"name")="unix_db_info.s_addrs.gvstats_rec.n_lock_fail"
 	Set gtmtypes("unix_db_info",42,"off")=296
 	Set gtmtypes("unix_db_info",42,"len")=8
 	Set gtmtypes("unix_db_info",42,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.db_curr_tn")=42
-	Set gtmtypes("unix_db_info",43,"name")="unix_db_info.s_addrs.gvstats_rec.n_dsk_read"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_lock_fail")=42
+	Set gtmtypes("unix_db_info",43,"name")="unix_db_info.s_addrs.gvstats_rec.db_curr_tn"
 	Set gtmtypes("unix_db_info",43,"off")=304
 	Set gtmtypes("unix_db_info",43,"len")=8
 	Set gtmtypes("unix_db_info",43,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_dsk_read")=43
-	Set gtmtypes("unix_db_info",44,"name")="unix_db_info.s_addrs.gvstats_rec.n_dsk_write"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.db_curr_tn")=43
+	Set gtmtypes("unix_db_info",44,"name")="unix_db_info.s_addrs.gvstats_rec.n_dsk_read"
 	Set gtmtypes("unix_db_info",44,"off")=312
 	Set gtmtypes("unix_db_info",44,"len")=8
 	Set gtmtypes("unix_db_info",44,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_dsk_write")=44
-	Set gtmtypes("unix_db_info",45,"name")="unix_db_info.s_addrs.gvstats_rec.n_nontp_readwrite"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_dsk_read")=44
+	Set gtmtypes("unix_db_info",45,"name")="unix_db_info.s_addrs.gvstats_rec.n_dsk_write"
 	Set gtmtypes("unix_db_info",45,"off")=320
 	Set gtmtypes("unix_db_info",45,"len")=8
 	Set gtmtypes("unix_db_info",45,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_nontp_readwrite")=45
-	Set gtmtypes("unix_db_info",46,"name")="unix_db_info.s_addrs.gvstats_rec.n_nontp_readonly"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_dsk_write")=45
+	Set gtmtypes("unix_db_info",46,"name")="unix_db_info.s_addrs.gvstats_rec.n_nontp_readwrite"
 	Set gtmtypes("unix_db_info",46,"off")=328
 	Set gtmtypes("unix_db_info",46,"len")=8
 	Set gtmtypes("unix_db_info",46,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_nontp_readonly")=46
-	Set gtmtypes("unix_db_info",47,"name")="unix_db_info.s_addrs.gvstats_rec.n_nontp_blkwrite"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_nontp_readwrite")=46
+	Set gtmtypes("unix_db_info",47,"name")="unix_db_info.s_addrs.gvstats_rec.n_nontp_readonly"
 	Set gtmtypes("unix_db_info",47,"off")=336
 	Set gtmtypes("unix_db_info",47,"len")=8
 	Set gtmtypes("unix_db_info",47,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_nontp_blkwrite")=47
-	Set gtmtypes("unix_db_info",48,"name")="unix_db_info.s_addrs.gvstats_rec.n_nontp_blkread"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_nontp_readonly")=47
+	Set gtmtypes("unix_db_info",48,"name")="unix_db_info.s_addrs.gvstats_rec.n_nontp_blkwrite"
 	Set gtmtypes("unix_db_info",48,"off")=344
 	Set gtmtypes("unix_db_info",48,"len")=8
 	Set gtmtypes("unix_db_info",48,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_nontp_blkread")=48
-	Set gtmtypes("unix_db_info",49,"name")="unix_db_info.s_addrs.gvstats_rec.n_nontp_retries_0"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_nontp_blkwrite")=48
+	Set gtmtypes("unix_db_info",49,"name")="unix_db_info.s_addrs.gvstats_rec.n_nontp_blkread"
 	Set gtmtypes("unix_db_info",49,"off")=352
 	Set gtmtypes("unix_db_info",49,"len")=8
 	Set gtmtypes("unix_db_info",49,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_nontp_retries_0")=49
-	Set gtmtypes("unix_db_info",50,"name")="unix_db_info.s_addrs.gvstats_rec.n_nontp_retries_1"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_nontp_blkread")=49
+	Set gtmtypes("unix_db_info",50,"name")="unix_db_info.s_addrs.gvstats_rec.n_nontp_retries_0"
 	Set gtmtypes("unix_db_info",50,"off")=360
 	Set gtmtypes("unix_db_info",50,"len")=8
 	Set gtmtypes("unix_db_info",50,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_nontp_retries_1")=50
-	Set gtmtypes("unix_db_info",51,"name")="unix_db_info.s_addrs.gvstats_rec.n_nontp_retries_2"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_nontp_retries_0")=50
+	Set gtmtypes("unix_db_info",51,"name")="unix_db_info.s_addrs.gvstats_rec.n_nontp_retries_1"
 	Set gtmtypes("unix_db_info",51,"off")=368
 	Set gtmtypes("unix_db_info",51,"len")=8
 	Set gtmtypes("unix_db_info",51,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_nontp_retries_2")=51
-	Set gtmtypes("unix_db_info",52,"name")="unix_db_info.s_addrs.gvstats_rec.n_nontp_retries_3"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_nontp_retries_1")=51
+	Set gtmtypes("unix_db_info",52,"name")="unix_db_info.s_addrs.gvstats_rec.n_nontp_retries_2"
 	Set gtmtypes("unix_db_info",52,"off")=376
 	Set gtmtypes("unix_db_info",52,"len")=8
 	Set gtmtypes("unix_db_info",52,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_nontp_retries_3")=52
-	Set gtmtypes("unix_db_info",53,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_readwrite"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_nontp_retries_2")=52
+	Set gtmtypes("unix_db_info",53,"name")="unix_db_info.s_addrs.gvstats_rec.n_nontp_retries_3"
 	Set gtmtypes("unix_db_info",53,"off")=384
 	Set gtmtypes("unix_db_info",53,"len")=8
 	Set gtmtypes("unix_db_info",53,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_readwrite")=53
-	Set gtmtypes("unix_db_info",54,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_readonly"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_nontp_retries_3")=53
+	Set gtmtypes("unix_db_info",54,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_readwrite"
 	Set gtmtypes("unix_db_info",54,"off")=392
 	Set gtmtypes("unix_db_info",54,"len")=8
 	Set gtmtypes("unix_db_info",54,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_readonly")=54
-	Set gtmtypes("unix_db_info",55,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_rolledback"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_readwrite")=54
+	Set gtmtypes("unix_db_info",55,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_readonly"
 	Set gtmtypes("unix_db_info",55,"off")=400
 	Set gtmtypes("unix_db_info",55,"len")=8
 	Set gtmtypes("unix_db_info",55,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_rolledback")=55
-	Set gtmtypes("unix_db_info",56,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_blkwrite"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_readonly")=55
+	Set gtmtypes("unix_db_info",56,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_rolledback"
 	Set gtmtypes("unix_db_info",56,"off")=408
 	Set gtmtypes("unix_db_info",56,"len")=8
 	Set gtmtypes("unix_db_info",56,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_blkwrite")=56
-	Set gtmtypes("unix_db_info",57,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_blkread"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_rolledback")=56
+	Set gtmtypes("unix_db_info",57,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_blkwrite"
 	Set gtmtypes("unix_db_info",57,"off")=416
 	Set gtmtypes("unix_db_info",57,"len")=8
 	Set gtmtypes("unix_db_info",57,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_blkread")=57
-	Set gtmtypes("unix_db_info",58,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_tot_retries_0"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_blkwrite")=57
+	Set gtmtypes("unix_db_info",58,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_blkread"
 	Set gtmtypes("unix_db_info",58,"off")=424
 	Set gtmtypes("unix_db_info",58,"len")=8
 	Set gtmtypes("unix_db_info",58,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_tot_retries_0")=58
-	Set gtmtypes("unix_db_info",59,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_tot_retries_1"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_blkread")=58
+	Set gtmtypes("unix_db_info",59,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_tot_retries_0"
 	Set gtmtypes("unix_db_info",59,"off")=432
 	Set gtmtypes("unix_db_info",59,"len")=8
 	Set gtmtypes("unix_db_info",59,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_tot_retries_1")=59
-	Set gtmtypes("unix_db_info",60,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_tot_retries_2"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_tot_retries_0")=59
+	Set gtmtypes("unix_db_info",60,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_tot_retries_1"
 	Set gtmtypes("unix_db_info",60,"off")=440
 	Set gtmtypes("unix_db_info",60,"len")=8
 	Set gtmtypes("unix_db_info",60,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_tot_retries_2")=60
-	Set gtmtypes("unix_db_info",61,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_tot_retries_3"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_tot_retries_1")=60
+	Set gtmtypes("unix_db_info",61,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_tot_retries_2"
 	Set gtmtypes("unix_db_info",61,"off")=448
 	Set gtmtypes("unix_db_info",61,"len")=8
 	Set gtmtypes("unix_db_info",61,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_tot_retries_3")=61
-	Set gtmtypes("unix_db_info",62,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_tot_retries_4"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_tot_retries_2")=61
+	Set gtmtypes("unix_db_info",62,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_tot_retries_3"
 	Set gtmtypes("unix_db_info",62,"off")=456
 	Set gtmtypes("unix_db_info",62,"len")=8
 	Set gtmtypes("unix_db_info",62,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_tot_retries_4")=62
-	Set gtmtypes("unix_db_info",63,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_cnflct_retries_0"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_tot_retries_3")=62
+	Set gtmtypes("unix_db_info",63,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_tot_retries_4"
 	Set gtmtypes("unix_db_info",63,"off")=464
 	Set gtmtypes("unix_db_info",63,"len")=8
 	Set gtmtypes("unix_db_info",63,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_cnflct_retries_0")=63
-	Set gtmtypes("unix_db_info",64,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_cnflct_retries_1"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_tot_retries_4")=63
+	Set gtmtypes("unix_db_info",64,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_cnflct_retries_0"
 	Set gtmtypes("unix_db_info",64,"off")=472
 	Set gtmtypes("unix_db_info",64,"len")=8
 	Set gtmtypes("unix_db_info",64,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_cnflct_retries_1")=64
-	Set gtmtypes("unix_db_info",65,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_cnflct_retries_2"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_cnflct_retries_0")=64
+	Set gtmtypes("unix_db_info",65,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_cnflct_retries_1"
 	Set gtmtypes("unix_db_info",65,"off")=480
 	Set gtmtypes("unix_db_info",65,"len")=8
 	Set gtmtypes("unix_db_info",65,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_cnflct_retries_2")=65
-	Set gtmtypes("unix_db_info",66,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_cnflct_retries_3"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_cnflct_retries_1")=65
+	Set gtmtypes("unix_db_info",66,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_cnflct_retries_2"
 	Set gtmtypes("unix_db_info",66,"off")=488
 	Set gtmtypes("unix_db_info",66,"len")=8
 	Set gtmtypes("unix_db_info",66,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_cnflct_retries_3")=66
-	Set gtmtypes("unix_db_info",67,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_cnflct_retries_4"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_cnflct_retries_2")=66
+	Set gtmtypes("unix_db_info",67,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_cnflct_retries_3"
 	Set gtmtypes("unix_db_info",67,"off")=496
 	Set gtmtypes("unix_db_info",67,"len")=8
 	Set gtmtypes("unix_db_info",67,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_cnflct_retries_4")=67
-	Set gtmtypes("unix_db_info",68,"name")="unix_db_info.s_addrs.gvstats_rec.n_ztrigger"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_cnflct_retries_3")=67
+	Set gtmtypes("unix_db_info",68,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_cnflct_retries_4"
 	Set gtmtypes("unix_db_info",68,"off")=504
 	Set gtmtypes("unix_db_info",68,"len")=8
 	Set gtmtypes("unix_db_info",68,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_ztrigger")=68
-	Set gtmtypes("unix_db_info",69,"name")="unix_db_info.s_addrs.gvstats_rec.n_db_flush"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_cnflct_retries_4")=68
+	Set gtmtypes("unix_db_info",69,"name")="unix_db_info.s_addrs.gvstats_rec.n_ztrigger"
 	Set gtmtypes("unix_db_info",69,"off")=512
 	Set gtmtypes("unix_db_info",69,"len")=8
 	Set gtmtypes("unix_db_info",69,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_db_flush")=69
-	Set gtmtypes("unix_db_info",70,"name")="unix_db_info.s_addrs.gvstats_rec.n_db_fsync"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_ztrigger")=69
+	Set gtmtypes("unix_db_info",70,"name")="unix_db_info.s_addrs.gvstats_rec.n_db_flush"
 	Set gtmtypes("unix_db_info",70,"off")=520
 	Set gtmtypes("unix_db_info",70,"len")=8
 	Set gtmtypes("unix_db_info",70,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_db_fsync")=70
-	Set gtmtypes("unix_db_info",71,"name")="unix_db_info.s_addrs.gvstats_rec.n_jnl_flush"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_db_flush")=70
+	Set gtmtypes("unix_db_info",71,"name")="unix_db_info.s_addrs.gvstats_rec.n_db_fsync"
 	Set gtmtypes("unix_db_info",71,"off")=528
 	Set gtmtypes("unix_db_info",71,"len")=8
 	Set gtmtypes("unix_db_info",71,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jnl_flush")=71
-	Set gtmtypes("unix_db_info",72,"name")="unix_db_info.s_addrs.gvstats_rec.n_jnl_fsync"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_db_fsync")=71
+	Set gtmtypes("unix_db_info",72,"name")="unix_db_info.s_addrs.gvstats_rec.n_jnl_flush"
 	Set gtmtypes("unix_db_info",72,"off")=536
 	Set gtmtypes("unix_db_info",72,"len")=8
 	Set gtmtypes("unix_db_info",72,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jnl_fsync")=72
-	Set gtmtypes("unix_db_info",73,"name")="unix_db_info.s_addrs.gvstats_rec.n_jbuff_bytes"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jnl_flush")=72
+	Set gtmtypes("unix_db_info",73,"name")="unix_db_info.s_addrs.gvstats_rec.n_jnl_fsync"
 	Set gtmtypes("unix_db_info",73,"off")=544
 	Set gtmtypes("unix_db_info",73,"len")=8
 	Set gtmtypes("unix_db_info",73,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jbuff_bytes")=73
-	Set gtmtypes("unix_db_info",74,"name")="unix_db_info.s_addrs.gvstats_rec.n_jfile_bytes"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jnl_fsync")=73
+	Set gtmtypes("unix_db_info",74,"name")="unix_db_info.s_addrs.gvstats_rec.n_jbuff_bytes"
 	Set gtmtypes("unix_db_info",74,"off")=552
 	Set gtmtypes("unix_db_info",74,"len")=8
 	Set gtmtypes("unix_db_info",74,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jfile_bytes")=74
-	Set gtmtypes("unix_db_info",75,"name")="unix_db_info.s_addrs.gvstats_rec.n_jfile_writes"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jbuff_bytes")=74
+	Set gtmtypes("unix_db_info",75,"name")="unix_db_info.s_addrs.gvstats_rec.n_jfile_bytes"
 	Set gtmtypes("unix_db_info",75,"off")=560
 	Set gtmtypes("unix_db_info",75,"len")=8
 	Set gtmtypes("unix_db_info",75,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jfile_writes")=75
-	Set gtmtypes("unix_db_info",76,"name")="unix_db_info.s_addrs.gvstats_rec.n_jrec_logical"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jfile_bytes")=75
+	Set gtmtypes("unix_db_info",76,"name")="unix_db_info.s_addrs.gvstats_rec.n_jfile_writes"
 	Set gtmtypes("unix_db_info",76,"off")=568
 	Set gtmtypes("unix_db_info",76,"len")=8
 	Set gtmtypes("unix_db_info",76,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jrec_logical")=76
-	Set gtmtypes("unix_db_info",77,"name")="unix_db_info.s_addrs.gvstats_rec.n_jrec_pblk"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jfile_writes")=76
+	Set gtmtypes("unix_db_info",77,"name")="unix_db_info.s_addrs.gvstats_rec.n_jrec_logical"
 	Set gtmtypes("unix_db_info",77,"off")=576
 	Set gtmtypes("unix_db_info",77,"len")=8
 	Set gtmtypes("unix_db_info",77,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jrec_pblk")=77
-	Set gtmtypes("unix_db_info",78,"name")="unix_db_info.s_addrs.gvstats_rec.n_jrec_epoch_regular"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jrec_logical")=77
+	Set gtmtypes("unix_db_info",78,"name")="unix_db_info.s_addrs.gvstats_rec.n_jrec_pblk"
 	Set gtmtypes("unix_db_info",78,"off")=584
 	Set gtmtypes("unix_db_info",78,"len")=8
 	Set gtmtypes("unix_db_info",78,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jrec_epoch_regular")=78
-	Set gtmtypes("unix_db_info",79,"name")="unix_db_info.s_addrs.gvstats_rec.n_jrec_epoch_idle"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jrec_pblk")=78
+	Set gtmtypes("unix_db_info",79,"name")="unix_db_info.s_addrs.gvstats_rec.n_jrec_epoch_regular"
 	Set gtmtypes("unix_db_info",79,"off")=592
 	Set gtmtypes("unix_db_info",79,"len")=8
 	Set gtmtypes("unix_db_info",79,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jrec_epoch_idle")=79
-	Set gtmtypes("unix_db_info",80,"name")="unix_db_info.s_addrs.gvstats_rec.n_jrec_other"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jrec_epoch_regular")=79
+	Set gtmtypes("unix_db_info",80,"name")="unix_db_info.s_addrs.gvstats_rec.n_jrec_epoch_idle"
 	Set gtmtypes("unix_db_info",80,"off")=600
 	Set gtmtypes("unix_db_info",80,"len")=8
 	Set gtmtypes("unix_db_info",80,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jrec_other")=80
-	Set gtmtypes("unix_db_info",81,"name")="unix_db_info.s_addrs.gvstats_rec.n_jnl_extends"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jrec_epoch_idle")=80
+	Set gtmtypes("unix_db_info",81,"name")="unix_db_info.s_addrs.gvstats_rec.n_jrec_other"
 	Set gtmtypes("unix_db_info",81,"off")=608
 	Set gtmtypes("unix_db_info",81,"len")=8
 	Set gtmtypes("unix_db_info",81,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jnl_extends")=81
-	Set gtmtypes("unix_db_info",82,"name")="unix_db_info.s_addrs.gvstats_rec.n_db_extends"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jrec_other")=81
+	Set gtmtypes("unix_db_info",82,"name")="unix_db_info.s_addrs.gvstats_rec.n_jnl_extends"
 	Set gtmtypes("unix_db_info",82,"off")=616
 	Set gtmtypes("unix_db_info",82,"len")=8
 	Set gtmtypes("unix_db_info",82,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_db_extends")=82
-	Set gtmtypes("unix_db_info",83,"name")="unix_db_info.s_addrs.gvstats_rec.n_crit_success"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jnl_extends")=82
+	Set gtmtypes("unix_db_info",83,"name")="unix_db_info.s_addrs.gvstats_rec.n_db_extends"
 	Set gtmtypes("unix_db_info",83,"off")=624
 	Set gtmtypes("unix_db_info",83,"len")=8
 	Set gtmtypes("unix_db_info",83,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_crit_success")=83
-	Set gtmtypes("unix_db_info",84,"name")="unix_db_info.s_addrs.gvstats_rec.n_crits_in_epch"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_db_extends")=83
+	Set gtmtypes("unix_db_info",84,"name")="unix_db_info.s_addrs.gvstats_rec.n_crit_success"
 	Set gtmtypes("unix_db_info",84,"off")=632
 	Set gtmtypes("unix_db_info",84,"len")=8
 	Set gtmtypes("unix_db_info",84,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_crits_in_epch")=84
-	Set gtmtypes("unix_db_info",85,"name")="unix_db_info.s_addrs.gvstats_rec.sq_crit_failed"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_crit_success")=84
+	Set gtmtypes("unix_db_info",85,"name")="unix_db_info.s_addrs.gvstats_rec.n_crits_in_epch"
 	Set gtmtypes("unix_db_info",85,"off")=640
 	Set gtmtypes("unix_db_info",85,"len")=8
 	Set gtmtypes("unix_db_info",85,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.sq_crit_failed")=85
-	Set gtmtypes("unix_db_info",86,"name")="unix_db_info.s_addrs.gvstats_rec.n_crit_failed"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_crits_in_epch")=85
+	Set gtmtypes("unix_db_info",86,"name")="unix_db_info.s_addrs.gvstats_rec.sq_crit_failed"
 	Set gtmtypes("unix_db_info",86,"off")=648
 	Set gtmtypes("unix_db_info",86,"len")=8
 	Set gtmtypes("unix_db_info",86,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_crit_failed")=86
-	Set gtmtypes("unix_db_info",87,"name")="unix_db_info.s_addrs.gvstats_rec.sq_crit_que_slps"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.sq_crit_failed")=86
+	Set gtmtypes("unix_db_info",87,"name")="unix_db_info.s_addrs.gvstats_rec.n_crit_failed"
 	Set gtmtypes("unix_db_info",87,"off")=656
 	Set gtmtypes("unix_db_info",87,"len")=8
 	Set gtmtypes("unix_db_info",87,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.sq_crit_que_slps")=87
-	Set gtmtypes("unix_db_info",88,"name")="unix_db_info.s_addrs.gvstats_rec.n_crit_que_slps"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_crit_failed")=87
+	Set gtmtypes("unix_db_info",88,"name")="unix_db_info.s_addrs.gvstats_rec.sq_crit_que_slps"
 	Set gtmtypes("unix_db_info",88,"off")=664
 	Set gtmtypes("unix_db_info",88,"len")=8
 	Set gtmtypes("unix_db_info",88,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_crit_que_slps")=88
-	Set gtmtypes("unix_db_info",89,"name")="unix_db_info.s_addrs.gvstats_rec.sq_crit_yields"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.sq_crit_que_slps")=88
+	Set gtmtypes("unix_db_info",89,"name")="unix_db_info.s_addrs.gvstats_rec.n_crit_que_slps"
 	Set gtmtypes("unix_db_info",89,"off")=672
 	Set gtmtypes("unix_db_info",89,"len")=8
 	Set gtmtypes("unix_db_info",89,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.sq_crit_yields")=89
-	Set gtmtypes("unix_db_info",90,"name")="unix_db_info.s_addrs.gvstats_rec.n_crit_yields"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_crit_que_slps")=89
+	Set gtmtypes("unix_db_info",90,"name")="unix_db_info.s_addrs.gvstats_rec.sq_crit_yields"
 	Set gtmtypes("unix_db_info",90,"off")=680
 	Set gtmtypes("unix_db_info",90,"len")=8
 	Set gtmtypes("unix_db_info",90,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_crit_yields")=90
-	Set gtmtypes("unix_db_info",91,"name")="unix_db_info.s_addrs.dbsync_timer_tn"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.sq_crit_yields")=90
+	Set gtmtypes("unix_db_info",91,"name")="unix_db_info.s_addrs.gvstats_rec.n_crit_yields"
 	Set gtmtypes("unix_db_info",91,"off")=688
 	Set gtmtypes("unix_db_info",91,"len")=8
 	Set gtmtypes("unix_db_info",91,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.dbsync_timer_tn")=91
-	Set gtmtypes("unix_db_info",92,"name")="unix_db_info.s_addrs.fullblockwrite_len"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_crit_yields")=91
+	Set gtmtypes("unix_db_info",92,"name")="unix_db_info.s_addrs.gvstats_rec.n_clean2dirty"
 	Set gtmtypes("unix_db_info",92,"off")=696
 	Set gtmtypes("unix_db_info",92,"len")=8
-	Set gtmtypes("unix_db_info",92,"type")="size_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.fullblockwrite_len")=92
-	Set gtmtypes("unix_db_info",93,"name")="unix_db_info.s_addrs.total_blks"
+	Set gtmtypes("unix_db_info",92,"type")="uint64_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_clean2dirty")=92
+	Set gtmtypes("unix_db_info",93,"name")="unix_db_info.s_addrs.dbsync_timer_tn"
 	Set gtmtypes("unix_db_info",93,"off")=704
-	Set gtmtypes("unix_db_info",93,"len")=4
-	Set gtmtypes("unix_db_info",93,"type")="unsigned-int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.total_blks")=93
-	Set gtmtypes("unix_db_info",94,"name")="unix_db_info.s_addrs.prev_free_blks"
-	Set gtmtypes("unix_db_info",94,"off")=708
-	Set gtmtypes("unix_db_info",94,"len")=4
-	Set gtmtypes("unix_db_info",94,"type")="unsigned-int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.prev_free_blks")=94
-	Set gtmtypes("unix_db_info",95,"name")="unix_db_info.s_addrs.timer"
-	Set gtmtypes("unix_db_info",95,"off")=712
-	Set gtmtypes("unix_db_info",95,"len")=4
-	Set gtmtypes("unix_db_info",95,"type")="unsigned-int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.timer")=95
-	Set gtmtypes("unix_db_info",96,"name")="unix_db_info.s_addrs.in_wtstart"
-	Set gtmtypes("unix_db_info",96,"off")=716
-	Set gtmtypes("unix_db_info",96,"len")=4
-	Set gtmtypes("unix_db_info",96,"type")="unsigned-int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.in_wtstart")=96
-	Set gtmtypes("unix_db_info",97,"name")="unix_db_info.s_addrs.now_crit"
-	Set gtmtypes("unix_db_info",97,"off")=720
+	Set gtmtypes("unix_db_info",93,"len")=8
+	Set gtmtypes("unix_db_info",93,"type")="uint64_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.dbsync_timer_tn")=93
+	Set gtmtypes("unix_db_info",94,"name")="unix_db_info.s_addrs.our_midnite"
+	Set gtmtypes("unix_db_info",94,"off")=712
+	Set gtmtypes("unix_db_info",94,"len")=8
+	Set gtmtypes("unix_db_info",94,"type")="addr"
+	Set gtmtypfldindx("unix_db_info","s_addrs.our_midnite")=94
+	Set gtmtypes("unix_db_info",95,"name")="unix_db_info.s_addrs.fullblockwrite_len"
+	Set gtmtypes("unix_db_info",95,"off")=720
+	Set gtmtypes("unix_db_info",95,"len")=8
+	Set gtmtypes("unix_db_info",95,"type")="size_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.fullblockwrite_len")=95
+	Set gtmtypes("unix_db_info",96,"name")="unix_db_info.s_addrs.our_lru_cache_rec_off"
+	Set gtmtypes("unix_db_info",96,"off")=728
+	Set gtmtypes("unix_db_info",96,"len")=8
+	Set gtmtypes("unix_db_info",96,"type")="intptr_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.our_lru_cache_rec_off")=96
+	Set gtmtypes("unix_db_info",97,"name")="unix_db_info.s_addrs.total_blks"
+	Set gtmtypes("unix_db_info",97,"off")=736
 	Set gtmtypes("unix_db_info",97,"len")=4
 	Set gtmtypes("unix_db_info",97,"type")="unsigned-int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.now_crit")=97
-	Set gtmtypes("unix_db_info",98,"name")="unix_db_info.s_addrs.wbuf_dqd"
-	Set gtmtypes("unix_db_info",98,"off")=724
+	Set gtmtypfldindx("unix_db_info","s_addrs.total_blks")=97
+	Set gtmtypes("unix_db_info",98,"name")="unix_db_info.s_addrs.prev_free_blks"
+	Set gtmtypes("unix_db_info",98,"off")=740
 	Set gtmtypes("unix_db_info",98,"len")=4
 	Set gtmtypes("unix_db_info",98,"type")="unsigned-int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.wbuf_dqd")=98
-	Set gtmtypes("unix_db_info",99,"name")="unix_db_info.s_addrs.stale_defer"
-	Set gtmtypes("unix_db_info",99,"off")=728
+	Set gtmtypfldindx("unix_db_info","s_addrs.prev_free_blks")=98
+	Set gtmtypes("unix_db_info",99,"name")="unix_db_info.s_addrs.timer"
+	Set gtmtypes("unix_db_info",99,"off")=744
 	Set gtmtypes("unix_db_info",99,"len")=4
 	Set gtmtypes("unix_db_info",99,"type")="unsigned-int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.stale_defer")=99
-	Set gtmtypes("unix_db_info",100,"name")="unix_db_info.s_addrs.freeze"
-	Set gtmtypes("unix_db_info",100,"off")=732
+	Set gtmtypfldindx("unix_db_info","s_addrs.timer")=99
+	Set gtmtypes("unix_db_info",100,"name")="unix_db_info.s_addrs.in_wtstart"
+	Set gtmtypes("unix_db_info",100,"off")=748
 	Set gtmtypes("unix_db_info",100,"len")=4
-	Set gtmtypes("unix_db_info",100,"type")="boolean_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.freeze")=100
-	Set gtmtypes("unix_db_info",101,"name")="unix_db_info.s_addrs.dbsync_timer"
-	Set gtmtypes("unix_db_info",101,"off")=736
+	Set gtmtypes("unix_db_info",100,"type")="unsigned-int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.in_wtstart")=100
+	Set gtmtypes("unix_db_info",101,"name")="unix_db_info.s_addrs.now_crit"
+	Set gtmtypes("unix_db_info",101,"off")=752
 	Set gtmtypes("unix_db_info",101,"len")=4
-	Set gtmtypes("unix_db_info",101,"type")="boolean_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.dbsync_timer")=101
-	Set gtmtypes("unix_db_info",102,"name")="unix_db_info.s_addrs.reorg_last_dest"
-	Set gtmtypes("unix_db_info",102,"off")=740
+	Set gtmtypes("unix_db_info",101,"type")="unsigned-int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.now_crit")=101
+	Set gtmtypes("unix_db_info",102,"name")="unix_db_info.s_addrs.wbuf_dqd"
+	Set gtmtypes("unix_db_info",102,"off")=756
 	Set gtmtypes("unix_db_info",102,"len")=4
-	Set gtmtypes("unix_db_info",102,"type")="int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.reorg_last_dest")=102
-	Set gtmtypes("unix_db_info",103,"name")="unix_db_info.s_addrs.jnl_before_image"
-	Set gtmtypes("unix_db_info",103,"off")=744
+	Set gtmtypes("unix_db_info",102,"type")="unsigned-int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.wbuf_dqd")=102
+	Set gtmtypes("unix_db_info",103,"name")="unix_db_info.s_addrs.stale_defer"
+	Set gtmtypes("unix_db_info",103,"off")=760
 	Set gtmtypes("unix_db_info",103,"len")=4
-	Set gtmtypes("unix_db_info",103,"type")="boolean_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.jnl_before_image")=103
-	Set gtmtypes("unix_db_info",104,"name")="unix_db_info.s_addrs.read_write"
-	Set gtmtypes("unix_db_info",104,"off")=748
+	Set gtmtypes("unix_db_info",103,"type")="unsigned-int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.stale_defer")=103
+	Set gtmtypes("unix_db_info",104,"name")="unix_db_info.s_addrs.freeze"
+	Set gtmtypes("unix_db_info",104,"off")=764
 	Set gtmtypes("unix_db_info",104,"len")=4
 	Set gtmtypes("unix_db_info",104,"type")="boolean_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.read_write")=104
-	Set gtmtypes("unix_db_info",105,"name")="unix_db_info.s_addrs.persistent_freeze"
-	Set gtmtypes("unix_db_info",105,"off")=752
+	Set gtmtypfldindx("unix_db_info","s_addrs.freeze")=104
+	Set gtmtypes("unix_db_info",105,"name")="unix_db_info.s_addrs.dbsync_timer"
+	Set gtmtypes("unix_db_info",105,"off")=768
 	Set gtmtypes("unix_db_info",105,"len")=4
 	Set gtmtypes("unix_db_info",105,"type")="boolean_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.persistent_freeze")=105
-	Set gtmtypes("unix_db_info",106,"name")="unix_db_info.s_addrs.pblk_align_jrecsize"
-	Set gtmtypes("unix_db_info",106,"off")=756
+	Set gtmtypfldindx("unix_db_info","s_addrs.dbsync_timer")=105
+	Set gtmtypes("unix_db_info",106,"name")="unix_db_info.s_addrs.reorg_last_dest"
+	Set gtmtypes("unix_db_info",106,"off")=772
 	Set gtmtypes("unix_db_info",106,"len")=4
 	Set gtmtypes("unix_db_info",106,"type")="int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.pblk_align_jrecsize")=106
-	Set gtmtypes("unix_db_info",107,"name")="unix_db_info.s_addrs.min_total_tpjnl_rec_size"
-	Set gtmtypes("unix_db_info",107,"off")=760
+	Set gtmtypfldindx("unix_db_info","s_addrs.reorg_last_dest")=106
+	Set gtmtypes("unix_db_info",107,"name")="unix_db_info.s_addrs.jnl_before_image"
+	Set gtmtypes("unix_db_info",107,"off")=776
 	Set gtmtypes("unix_db_info",107,"len")=4
-	Set gtmtypes("unix_db_info",107,"type")="int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.min_total_tpjnl_rec_size")=107
-	Set gtmtypes("unix_db_info",108,"name")="unix_db_info.s_addrs.min_total_nontpjnl_rec_size"
-	Set gtmtypes("unix_db_info",108,"off")=764
+	Set gtmtypes("unix_db_info",107,"type")="boolean_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.jnl_before_image")=107
+	Set gtmtypes("unix_db_info",108,"name")="unix_db_info.s_addrs.read_write"
+	Set gtmtypes("unix_db_info",108,"off")=780
 	Set gtmtypes("unix_db_info",108,"len")=4
-	Set gtmtypes("unix_db_info",108,"type")="int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.min_total_nontpjnl_rec_size")=108
-	Set gtmtypes("unix_db_info",109,"name")="unix_db_info.s_addrs.jnl_state"
-	Set gtmtypes("unix_db_info",109,"off")=768
+	Set gtmtypes("unix_db_info",108,"type")="boolean_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.read_write")=108
+	Set gtmtypes("unix_db_info",109,"name")="unix_db_info.s_addrs.orig_read_write"
+	Set gtmtypes("unix_db_info",109,"off")=784
 	Set gtmtypes("unix_db_info",109,"len")=4
-	Set gtmtypes("unix_db_info",109,"type")="int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.jnl_state")=109
-	Set gtmtypes("unix_db_info",110,"name")="unix_db_info.s_addrs.repl_state"
-	Set gtmtypes("unix_db_info",110,"off")=772
+	Set gtmtypes("unix_db_info",109,"type")="boolean_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.orig_read_write")=109
+	Set gtmtypes("unix_db_info",110,"name")="unix_db_info.s_addrs.persistent_freeze"
+	Set gtmtypes("unix_db_info",110,"off")=788
 	Set gtmtypes("unix_db_info",110,"len")=4
-	Set gtmtypes("unix_db_info",110,"type")="int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.repl_state")=110
-	Set gtmtypes("unix_db_info",111,"name")="unix_db_info.s_addrs.crit_check_cycle"
-	Set gtmtypes("unix_db_info",111,"off")=776
+	Set gtmtypes("unix_db_info",110,"type")="boolean_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.persistent_freeze")=110
+	Set gtmtypes("unix_db_info",111,"name")="unix_db_info.s_addrs.pblk_align_jrecsize"
+	Set gtmtypes("unix_db_info",111,"off")=792
 	Set gtmtypes("unix_db_info",111,"len")=4
-	Set gtmtypes("unix_db_info",111,"type")="unsigned-int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.crit_check_cycle")=111
-	Set gtmtypes("unix_db_info",112,"name")="unix_db_info.s_addrs.backup_in_prog"
-	Set gtmtypes("unix_db_info",112,"off")=780
+	Set gtmtypes("unix_db_info",111,"type")="int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.pblk_align_jrecsize")=111
+	Set gtmtypes("unix_db_info",112,"name")="unix_db_info.s_addrs.min_total_tpjnl_rec_size"
+	Set gtmtypes("unix_db_info",112,"off")=796
 	Set gtmtypes("unix_db_info",112,"len")=4
 	Set gtmtypes("unix_db_info",112,"type")="int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.backup_in_prog")=112
-	Set gtmtypes("unix_db_info",113,"name")="unix_db_info.s_addrs.snapshot_in_prog"
-	Set gtmtypes("unix_db_info",113,"off")=784
+	Set gtmtypfldindx("unix_db_info","s_addrs.min_total_tpjnl_rec_size")=112
+	Set gtmtypes("unix_db_info",113,"name")="unix_db_info.s_addrs.min_total_nontpjnl_rec_size"
+	Set gtmtypes("unix_db_info",113,"off")=800
 	Set gtmtypes("unix_db_info",113,"len")=4
-	Set gtmtypes("unix_db_info",113,"type")="boolean_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.snapshot_in_prog")=113
-	Set gtmtypes("unix_db_info",114,"name")="unix_db_info.s_addrs.ref_cnt"
-	Set gtmtypes("unix_db_info",114,"off")=788
+	Set gtmtypes("unix_db_info",113,"type")="int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.min_total_nontpjnl_rec_size")=113
+	Set gtmtypes("unix_db_info",114,"name")="unix_db_info.s_addrs.jnl_state"
+	Set gtmtypes("unix_db_info",114,"off")=804
 	Set gtmtypes("unix_db_info",114,"len")=4
 	Set gtmtypes("unix_db_info",114,"type")="int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.ref_cnt")=114
-	Set gtmtypes("unix_db_info",115,"name")="unix_db_info.s_addrs.fid_index"
-	Set gtmtypes("unix_db_info",115,"off")=792
+	Set gtmtypfldindx("unix_db_info","s_addrs.jnl_state")=114
+	Set gtmtypes("unix_db_info",115,"name")="unix_db_info.s_addrs.repl_state"
+	Set gtmtypes("unix_db_info",115,"off")=808
 	Set gtmtypes("unix_db_info",115,"len")=4
 	Set gtmtypes("unix_db_info",115,"type")="int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.fid_index")=115
-	Set gtmtypes("unix_db_info",116,"name")="unix_db_info.s_addrs.do_fullblockwrites"
-	Set gtmtypes("unix_db_info",116,"off")=796
+	Set gtmtypfldindx("unix_db_info","s_addrs.repl_state")=115
+	Set gtmtypes("unix_db_info",116,"name")="unix_db_info.s_addrs.crit_check_cycle"
+	Set gtmtypes("unix_db_info",116,"off")=812
 	Set gtmtypes("unix_db_info",116,"len")=4
-	Set gtmtypes("unix_db_info",116,"type")="boolean_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.do_fullblockwrites")=116
-	Set gtmtypes("unix_db_info",117,"name")="unix_db_info.s_addrs.regnum"
-	Set gtmtypes("unix_db_info",117,"off")=800
+	Set gtmtypes("unix_db_info",116,"type")="unsigned-int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.crit_check_cycle")=116
+	Set gtmtypes("unix_db_info",117,"name")="unix_db_info.s_addrs.backup_in_prog"
+	Set gtmtypes("unix_db_info",117,"off")=816
 	Set gtmtypes("unix_db_info",117,"len")=4
 	Set gtmtypes("unix_db_info",117,"type")="int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.regnum")=117
-	Set gtmtypes("unix_db_info",118,"name")="unix_db_info.s_addrs.n_pre_read_trigger"
-	Set gtmtypes("unix_db_info",118,"off")=804
+	Set gtmtypfldindx("unix_db_info","s_addrs.backup_in_prog")=117
+	Set gtmtypes("unix_db_info",118,"name")="unix_db_info.s_addrs.snapshot_in_prog"
+	Set gtmtypes("unix_db_info",118,"off")=820
 	Set gtmtypes("unix_db_info",118,"len")=4
-	Set gtmtypes("unix_db_info",118,"type")="int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.n_pre_read_trigger")=118
-	Set gtmtypes("unix_db_info",119,"name")="unix_db_info.s_addrs.jnlpool_validate_check"
-	Set gtmtypes("unix_db_info",119,"off")=808
+	Set gtmtypes("unix_db_info",118,"type")="boolean_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.snapshot_in_prog")=118
+	Set gtmtypes("unix_db_info",119,"name")="unix_db_info.s_addrs.ref_cnt"
+	Set gtmtypes("unix_db_info",119,"off")=824
 	Set gtmtypes("unix_db_info",119,"len")=4
-	Set gtmtypes("unix_db_info",119,"type")="unsigned-int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.jnlpool_validate_check")=119
-	Set gtmtypes("unix_db_info",120,"name")="unix_db_info.s_addrs.regcnt"
-	Set gtmtypes("unix_db_info",120,"off")=812
+	Set gtmtypes("unix_db_info",119,"type")="int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.ref_cnt")=119
+	Set gtmtypes("unix_db_info",120,"name")="unix_db_info.s_addrs.fid_index"
+	Set gtmtypes("unix_db_info",120,"off")=828
 	Set gtmtypes("unix_db_info",120,"len")=4
 	Set gtmtypes("unix_db_info",120,"type")="int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.regcnt")=120
-	Set gtmtypes("unix_db_info",121,"name")="unix_db_info.s_addrs.t_commit_crit"
-	Set gtmtypes("unix_db_info",121,"off")=816
+	Set gtmtypfldindx("unix_db_info","s_addrs.fid_index")=120
+	Set gtmtypes("unix_db_info",121,"name")="unix_db_info.s_addrs.do_fullblockwrites"
+	Set gtmtypes("unix_db_info",121,"off")=832
 	Set gtmtypes("unix_db_info",121,"len")=4
 	Set gtmtypes("unix_db_info",121,"type")="boolean_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.t_commit_crit")=121
-	Set gtmtypes("unix_db_info",122,"name")="unix_db_info.s_addrs.wcs_pidcnt_incremented"
-	Set gtmtypes("unix_db_info",122,"off")=820
+	Set gtmtypfldindx("unix_db_info","s_addrs.do_fullblockwrites")=121
+	Set gtmtypes("unix_db_info",122,"name")="unix_db_info.s_addrs.regnum"
+	Set gtmtypes("unix_db_info",122,"off")=836
 	Set gtmtypes("unix_db_info",122,"len")=4
-	Set gtmtypes("unix_db_info",122,"type")="boolean_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.wcs_pidcnt_incremented")=122
-	Set gtmtypes("unix_db_info",123,"name")="unix_db_info.s_addrs.incr_db_trigger_cycle"
-	Set gtmtypes("unix_db_info",123,"off")=824
+	Set gtmtypes("unix_db_info",122,"type")="int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.regnum")=122
+	Set gtmtypes("unix_db_info",123,"name")="unix_db_info.s_addrs.n_pre_read_trigger"
+	Set gtmtypes("unix_db_info",123,"off")=840
 	Set gtmtypes("unix_db_info",123,"len")=4
-	Set gtmtypes("unix_db_info",123,"type")="boolean_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.incr_db_trigger_cycle")=123
-	Set gtmtypes("unix_db_info",124,"name")="unix_db_info.s_addrs.db_trigger_cycle"
-	Set gtmtypes("unix_db_info",124,"off")=828
+	Set gtmtypes("unix_db_info",123,"type")="int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.n_pre_read_trigger")=123
+	Set gtmtypes("unix_db_info",124,"name")="unix_db_info.s_addrs.jnlpool_validate_check"
+	Set gtmtypes("unix_db_info",124,"off")=844
 	Set gtmtypes("unix_db_info",124,"len")=4
 	Set gtmtypes("unix_db_info",124,"type")="unsigned-int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.db_trigger_cycle")=124
-	Set gtmtypes("unix_db_info",125,"name")="unix_db_info.s_addrs.db_dztrigger_cycle"
-	Set gtmtypes("unix_db_info",125,"off")=832
+	Set gtmtypfldindx("unix_db_info","s_addrs.jnlpool_validate_check")=124
+	Set gtmtypes("unix_db_info",125,"name")="unix_db_info.s_addrs.regcnt"
+	Set gtmtypes("unix_db_info",125,"off")=848
 	Set gtmtypes("unix_db_info",125,"len")=4
-	Set gtmtypes("unix_db_info",125,"type")="unsigned-int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.db_dztrigger_cycle")=125
-	Set gtmtypes("unix_db_info",126,"name")="unix_db_info.s_addrs.hold_onto_crit"
-	Set gtmtypes("unix_db_info",126,"off")=836
+	Set gtmtypes("unix_db_info",125,"type")="int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.regcnt")=125
+	Set gtmtypes("unix_db_info",126,"name")="unix_db_info.s_addrs.t_commit_crit"
+	Set gtmtypes("unix_db_info",126,"off")=852
 	Set gtmtypes("unix_db_info",126,"len")=4
 	Set gtmtypes("unix_db_info",126,"type")="boolean_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.hold_onto_crit")=126
-	Set gtmtypes("unix_db_info",127,"name")="unix_db_info.s_addrs.dse_crit_seize_done"
-	Set gtmtypes("unix_db_info",127,"off")=840
+	Set gtmtypfldindx("unix_db_info","s_addrs.t_commit_crit")=126
+	Set gtmtypes("unix_db_info",127,"name")="unix_db_info.s_addrs.wcs_pidcnt_incremented"
+	Set gtmtypes("unix_db_info",127,"off")=856
 	Set gtmtypes("unix_db_info",127,"len")=4
 	Set gtmtypes("unix_db_info",127,"type")="boolean_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.dse_crit_seize_done")=127
-	Set gtmtypes("unix_db_info",128,"name")="unix_db_info.s_addrs.gbuff_limit"
-	Set gtmtypes("unix_db_info",128,"off")=844
+	Set gtmtypfldindx("unix_db_info","s_addrs.wcs_pidcnt_incremented")=127
+	Set gtmtypes("unix_db_info",128,"name")="unix_db_info.s_addrs.incr_db_trigger_cycle"
+	Set gtmtypes("unix_db_info",128,"off")=860
 	Set gtmtypes("unix_db_info",128,"len")=4
-	Set gtmtypes("unix_db_info",128,"type")="int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gbuff_limit")=128
-	Set gtmtypes("unix_db_info",129,"name")="unix_db_info.s_addrs.our_midnite"
-	Set gtmtypes("unix_db_info",129,"off")=848
-	Set gtmtypes("unix_db_info",129,"len")=8
-	Set gtmtypes("unix_db_info",129,"type")="addr"
-	Set gtmtypfldindx("unix_db_info","s_addrs.our_midnite")=129
-	Set gtmtypes("unix_db_info",130,"name")="unix_db_info.s_addrs.root_search_cycle"
-	Set gtmtypes("unix_db_info",130,"off")=856
+	Set gtmtypes("unix_db_info",128,"type")="boolean_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.incr_db_trigger_cycle")=128
+	Set gtmtypes("unix_db_info",129,"name")="unix_db_info.s_addrs.db_trigger_cycle"
+	Set gtmtypes("unix_db_info",129,"off")=864
+	Set gtmtypes("unix_db_info",129,"len")=4
+	Set gtmtypes("unix_db_info",129,"type")="unsigned-int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.db_trigger_cycle")=129
+	Set gtmtypes("unix_db_info",130,"name")="unix_db_info.s_addrs.db_dztrigger_cycle"
+	Set gtmtypes("unix_db_info",130,"off")=868
 	Set gtmtypes("unix_db_info",130,"len")=4
 	Set gtmtypes("unix_db_info",130,"type")="unsigned-int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.root_search_cycle")=130
-	Set gtmtypes("unix_db_info",131,"name")="unix_db_info.s_addrs.onln_rlbk_cycle"
-	Set gtmtypes("unix_db_info",131,"off")=860
+	Set gtmtypfldindx("unix_db_info","s_addrs.db_dztrigger_cycle")=130
+	Set gtmtypes("unix_db_info",131,"name")="unix_db_info.s_addrs.hold_onto_crit"
+	Set gtmtypes("unix_db_info",131,"off")=872
 	Set gtmtypes("unix_db_info",131,"len")=4
-	Set gtmtypes("unix_db_info",131,"type")="unsigned-int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.onln_rlbk_cycle")=131
-	Set gtmtypes("unix_db_info",132,"name")="unix_db_info.s_addrs.db_onln_rlbkd_cycle"
-	Set gtmtypes("unix_db_info",132,"off")=864
+	Set gtmtypes("unix_db_info",131,"type")="boolean_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.hold_onto_crit")=131
+	Set gtmtypes("unix_db_info",132,"name")="unix_db_info.s_addrs.dse_crit_seize_done"
+	Set gtmtypes("unix_db_info",132,"off")=876
 	Set gtmtypes("unix_db_info",132,"len")=4
-	Set gtmtypes("unix_db_info",132,"type")="unsigned-int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.db_onln_rlbkd_cycle")=132
-	Set gtmtypes("unix_db_info",133,"name")="unix_db_info.s_addrs.read_only_fs"
-	Set gtmtypes("unix_db_info",133,"off")=868
+	Set gtmtypes("unix_db_info",132,"type")="boolean_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.dse_crit_seize_done")=132
+	Set gtmtypes("unix_db_info",133,"name")="unix_db_info.s_addrs.gbuff_limit"
+	Set gtmtypes("unix_db_info",133,"off")=880
 	Set gtmtypes("unix_db_info",133,"len")=4
-	Set gtmtypes("unix_db_info",133,"type")="boolean_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.read_only_fs")=133
-	Set gtmtypes("unix_db_info",134,"name")="unix_db_info.s_addrs.crit_probe"
-	Set gtmtypes("unix_db_info",134,"off")=872
+	Set gtmtypes("unix_db_info",133,"type")="int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gbuff_limit")=133
+	Set gtmtypes("unix_db_info",134,"name")="unix_db_info.s_addrs.root_search_cycle"
+	Set gtmtypes("unix_db_info",134,"off")=884
 	Set gtmtypes("unix_db_info",134,"len")=4
-	Set gtmtypes("unix_db_info",134,"type")="boolean_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.crit_probe")=134
-	Set gtmtypes("unix_db_info",135,"name")="unix_db_info.s_addrs.probecrit_rec"
-	Set gtmtypes("unix_db_info",135,"off")=880
-	Set gtmtypes("unix_db_info",135,"len")=56
-	Set gtmtypes("unix_db_info",135,"type")="probecrit_rec_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.probecrit_rec")=135
-	Set gtmtypes("unix_db_info",136,"name")="unix_db_info.s_addrs.probecrit_rec.t_get_crit"
-	Set gtmtypes("unix_db_info",136,"off")=880
-	Set gtmtypes("unix_db_info",136,"len")=8
-	Set gtmtypes("unix_db_info",136,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.probecrit_rec.t_get_crit")=136
-	Set gtmtypes("unix_db_info",137,"name")="unix_db_info.s_addrs.probecrit_rec.p_crit_failed"
-	Set gtmtypes("unix_db_info",137,"off")=888
-	Set gtmtypes("unix_db_info",137,"len")=8
-	Set gtmtypes("unix_db_info",137,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.probecrit_rec.p_crit_failed")=137
-	Set gtmtypes("unix_db_info",138,"name")="unix_db_info.s_addrs.probecrit_rec.p_crit_que_slps"
-	Set gtmtypes("unix_db_info",138,"off")=896
-	Set gtmtypes("unix_db_info",138,"len")=8
-	Set gtmtypes("unix_db_info",138,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.probecrit_rec.p_crit_que_slps")=138
-	Set gtmtypes("unix_db_info",139,"name")="unix_db_info.s_addrs.probecrit_rec.p_crit_yields"
+	Set gtmtypes("unix_db_info",134,"type")="unsigned-int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.root_search_cycle")=134
+	Set gtmtypes("unix_db_info",135,"name")="unix_db_info.s_addrs.onln_rlbk_cycle"
+	Set gtmtypes("unix_db_info",135,"off")=888
+	Set gtmtypes("unix_db_info",135,"len")=4
+	Set gtmtypes("unix_db_info",135,"type")="unsigned-int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.onln_rlbk_cycle")=135
+	Set gtmtypes("unix_db_info",136,"name")="unix_db_info.s_addrs.db_onln_rlbkd_cycle"
+	Set gtmtypes("unix_db_info",136,"off")=892
+	Set gtmtypes("unix_db_info",136,"len")=4
+	Set gtmtypes("unix_db_info",136,"type")="unsigned-int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.db_onln_rlbkd_cycle")=136
+	Set gtmtypes("unix_db_info",137,"name")="unix_db_info.s_addrs.reservedDBFlags"
+	Set gtmtypes("unix_db_info",137,"off")=896
+	Set gtmtypes("unix_db_info",137,"len")=4
+	Set gtmtypes("unix_db_info",137,"type")="unsigned-int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.reservedDBFlags")=137
+	Set gtmtypes("unix_db_info",138,"name")="unix_db_info.s_addrs.read_only_fs"
+	Set gtmtypes("unix_db_info",138,"off")=900
+	Set gtmtypes("unix_db_info",138,"len")=4
+	Set gtmtypes("unix_db_info",138,"type")="boolean_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.read_only_fs")=138
+	Set gtmtypes("unix_db_info",139,"name")="unix_db_info.s_addrs.crit_probe"
 	Set gtmtypes("unix_db_info",139,"off")=904
-	Set gtmtypes("unix_db_info",139,"len")=8
-	Set gtmtypes("unix_db_info",139,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.probecrit_rec.p_crit_yields")=139
-	Set gtmtypes("unix_db_info",140,"name")="unix_db_info.s_addrs.probecrit_rec.p_crit_que_full"
-	Set gtmtypes("unix_db_info",140,"off")=912
-	Set gtmtypes("unix_db_info",140,"len")=8
-	Set gtmtypes("unix_db_info",140,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.probecrit_rec.p_crit_que_full")=140
-	Set gtmtypes("unix_db_info",141,"name")="unix_db_info.s_addrs.probecrit_rec.p_crit_que_slots"
-	Set gtmtypes("unix_db_info",141,"off")=920
-	Set gtmtypes("unix_db_info",141,"len")=8
-	Set gtmtypes("unix_db_info",141,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.probecrit_rec.p_crit_que_slots")=141
-	Set gtmtypes("unix_db_info",142,"name")="unix_db_info.s_addrs.probecrit_rec.p_crit_success"
-	Set gtmtypes("unix_db_info",142,"off")=928
+	Set gtmtypes("unix_db_info",139,"len")=4
+	Set gtmtypes("unix_db_info",139,"type")="boolean_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.crit_probe")=139
+	Set gtmtypes("unix_db_info",140,"name")="unix_db_info.s_addrs.canceled_flush_timer"
+	Set gtmtypes("unix_db_info",140,"off")=908
+	Set gtmtypes("unix_db_info",140,"len")=4
+	Set gtmtypes("unix_db_info",140,"type")="boolean_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.canceled_flush_timer")=140
+	Set gtmtypes("unix_db_info",141,"name")="unix_db_info.s_addrs.probecrit_rec"
+	Set gtmtypes("unix_db_info",141,"off")=912
+	Set gtmtypes("unix_db_info",141,"len")=56
+	Set gtmtypes("unix_db_info",141,"type")="probecrit_rec_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.probecrit_rec")=141
+	Set gtmtypes("unix_db_info",142,"name")="unix_db_info.s_addrs.probecrit_rec.t_get_crit"
+	Set gtmtypes("unix_db_info",142,"off")=912
 	Set gtmtypes("unix_db_info",142,"len")=8
 	Set gtmtypes("unix_db_info",142,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.probecrit_rec.p_crit_success")=142
-	Set gtmtypes("unix_db_info",143,"name")="unix_db_info.fn"
-	Set gtmtypes("unix_db_info",143,"off")=936
+	Set gtmtypfldindx("unix_db_info","s_addrs.probecrit_rec.t_get_crit")=142
+	Set gtmtypes("unix_db_info",143,"name")="unix_db_info.s_addrs.probecrit_rec.p_crit_failed"
+	Set gtmtypes("unix_db_info",143,"off")=920
 	Set gtmtypes("unix_db_info",143,"len")=8
-	Set gtmtypes("unix_db_info",143,"type")="addr"
-	Set gtmtypfldindx("unix_db_info","fn")=143
-	Set gtmtypes("unix_db_info",144,"name")="unix_db_info.fd"
-	Set gtmtypes("unix_db_info",144,"off")=944
-	Set gtmtypes("unix_db_info",144,"len")=4
-	Set gtmtypes("unix_db_info",144,"type")="int"
-	Set gtmtypfldindx("unix_db_info","fd")=144
-	Set gtmtypes("unix_db_info",145,"name")="unix_db_info.fileid"
-	Set gtmtypes("unix_db_info",145,"off")=952
-	Set gtmtypes("unix_db_info",145,"len")=24
-	Set gtmtypes("unix_db_info",145,"type")="unix_file_id"
-	Set gtmtypfldindx("unix_db_info","fileid")=145
-	Set gtmtypes("unix_db_info",146,"name")="unix_db_info.fileid.inode"
-	Set gtmtypes("unix_db_info",146,"off")=952
+	Set gtmtypes("unix_db_info",143,"type")="uint64_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.probecrit_rec.p_crit_failed")=143
+	Set gtmtypes("unix_db_info",144,"name")="unix_db_info.s_addrs.probecrit_rec.p_crit_que_slps"
+	Set gtmtypes("unix_db_info",144,"off")=928
+	Set gtmtypes("unix_db_info",144,"len")=8
+	Set gtmtypes("unix_db_info",144,"type")="uint64_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.probecrit_rec.p_crit_que_slps")=144
+	Set gtmtypes("unix_db_info",145,"name")="unix_db_info.s_addrs.probecrit_rec.p_crit_yields"
+	Set gtmtypes("unix_db_info",145,"off")=936
+	Set gtmtypes("unix_db_info",145,"len")=8
+	Set gtmtypes("unix_db_info",145,"type")="uint64_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.probecrit_rec.p_crit_yields")=145
+	Set gtmtypes("unix_db_info",146,"name")="unix_db_info.s_addrs.probecrit_rec.p_crit_que_full"
+	Set gtmtypes("unix_db_info",146,"off")=944
 	Set gtmtypes("unix_db_info",146,"len")=8
-	Set gtmtypes("unix_db_info",146,"type")="ino_t"
-	Set gtmtypfldindx("unix_db_info","fileid.inode")=146
-	Set gtmtypes("unix_db_info",147,"name")="unix_db_info.fileid.device"
-	Set gtmtypes("unix_db_info",147,"off")=960
+	Set gtmtypes("unix_db_info",146,"type")="uint64_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.probecrit_rec.p_crit_que_full")=146
+	Set gtmtypes("unix_db_info",147,"name")="unix_db_info.s_addrs.probecrit_rec.p_crit_que_slots"
+	Set gtmtypes("unix_db_info",147,"off")=952
 	Set gtmtypes("unix_db_info",147,"len")=8
-	Set gtmtypes("unix_db_info",147,"type")="dev_t"
-	Set gtmtypfldindx("unix_db_info","fileid.device")=147
-	Set gtmtypes("unix_db_info",148,"name")="unix_db_info.fileid.st_gen"
-	Set gtmtypes("unix_db_info",148,"off")=968
-	Set gtmtypes("unix_db_info",148,"len")=4
-	Set gtmtypes("unix_db_info",148,"type")="unsigned-int"
-	Set gtmtypfldindx("unix_db_info","fileid.st_gen")=148
-	Set gtmtypes("unix_db_info",149,"name")="unix_db_info.semid"
-	Set gtmtypes("unix_db_info",149,"off")=976
+	Set gtmtypes("unix_db_info",147,"type")="uint64_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.probecrit_rec.p_crit_que_slots")=147
+	Set gtmtypes("unix_db_info",148,"name")="unix_db_info.s_addrs.probecrit_rec.p_crit_success"
+	Set gtmtypes("unix_db_info",148,"off")=960
+	Set gtmtypes("unix_db_info",148,"len")=8
+	Set gtmtypes("unix_db_info",148,"type")="uint64_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.probecrit_rec.p_crit_success")=148
+	Set gtmtypes("unix_db_info",149,"name")="unix_db_info.s_addrs.lock_crit_with_db"
+	Set gtmtypes("unix_db_info",149,"off")=968
 	Set gtmtypes("unix_db_info",149,"len")=4
-	Set gtmtypes("unix_db_info",149,"type")="int"
-	Set gtmtypfldindx("unix_db_info","semid")=149
-	Set gtmtypes("unix_db_info",150,"name")="unix_db_info.gt_sem_ctime"
-	Set gtmtypes("unix_db_info",150,"off")=984
-	Set gtmtypes("unix_db_info",150,"len")=8
-	Set gtmtypes("unix_db_info",150,"type")="time_t"
-	Set gtmtypfldindx("unix_db_info","gt_sem_ctime")=150
-	Set gtmtypes("unix_db_info",151,"name")="unix_db_info.shmid"
-	Set gtmtypes("unix_db_info",151,"off")=992
+	Set gtmtypes("unix_db_info",149,"type")="boolean_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.lock_crit_with_db")=149
+	Set gtmtypes("unix_db_info",150,"name")="unix_db_info.s_addrs.needs_post_freeze_online_clean"
+	Set gtmtypes("unix_db_info",150,"off")=972
+	Set gtmtypes("unix_db_info",150,"len")=4
+	Set gtmtypes("unix_db_info",150,"type")="boolean_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.needs_post_freeze_online_clean")=150
+	Set gtmtypes("unix_db_info",151,"name")="unix_db_info.s_addrs.needs_post_freeze_flushsync"
+	Set gtmtypes("unix_db_info",151,"off")=976
 	Set gtmtypes("unix_db_info",151,"len")=4
-	Set gtmtypes("unix_db_info",151,"type")="int"
-	Set gtmtypfldindx("unix_db_info","shmid")=151
-	Set gtmtypes("unix_db_info",152,"name")="unix_db_info.gt_shm_ctime"
-	Set gtmtypes("unix_db_info",152,"off")=1000
-	Set gtmtypes("unix_db_info",152,"len")=8
-	Set gtmtypes("unix_db_info",152,"type")="time_t"
-	Set gtmtypfldindx("unix_db_info","gt_shm_ctime")=152
-	Set gtmtypes("unix_db_info",153,"name")="unix_db_info.ftok_semid"
-	Set gtmtypes("unix_db_info",153,"off")=1008
+	Set gtmtypes("unix_db_info",151,"type")="boolean_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.needs_post_freeze_flushsync")=151
+	Set gtmtypes("unix_db_info",152,"name")="unix_db_info.s_addrs.tp_hint"
+	Set gtmtypes("unix_db_info",152,"off")=980
+	Set gtmtypes("unix_db_info",152,"len")=4
+	Set gtmtypes("unix_db_info",152,"type")="int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.tp_hint")=152
+	Set gtmtypes("unix_db_info",153,"name")="unix_db_info.s_addrs.statsDB_setup_completed"
+	Set gtmtypes("unix_db_info",153,"off")=984
 	Set gtmtypes("unix_db_info",153,"len")=4
-	Set gtmtypes("unix_db_info",153,"type")="int"
-	Set gtmtypfldindx("unix_db_info","ftok_semid")=153
-	Set gtmtypes("unix_db_info",154,"name")="unix_db_info.key"
-	Set gtmtypes("unix_db_info",154,"off")=1016
-	Set gtmtypes("unix_db_info",154,"len")=4
-	Set gtmtypes("unix_db_info",154,"type")="key_t"
-	Set gtmtypfldindx("unix_db_info","key")=154
-	Set gtmtypes("unix_db_info",155,"name")="unix_db_info.raw"
-	Set gtmtypes("unix_db_info",155,"off")=1020
+	Set gtmtypes("unix_db_info",153,"type")="boolean_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.statsDB_setup_completed")=153
+	Set gtmtypes("unix_db_info",154,"name")="unix_db_info.fn"
+	Set gtmtypes("unix_db_info",154,"off")=992
+	Set gtmtypes("unix_db_info",154,"len")=8
+	Set gtmtypes("unix_db_info",154,"type")="addr"
+	Set gtmtypfldindx("unix_db_info","fn")=154
+	Set gtmtypes("unix_db_info",155,"name")="unix_db_info.fd"
+	Set gtmtypes("unix_db_info",155,"off")=1000
 	Set gtmtypes("unix_db_info",155,"len")=4
-	Set gtmtypes("unix_db_info",155,"type")="boolean_t"
-	Set gtmtypfldindx("unix_db_info","raw")=155
+	Set gtmtypes("unix_db_info",155,"type")="int"
+	Set gtmtypfldindx("unix_db_info","fd")=155
+	Set gtmtypes("unix_db_info",156,"name")="unix_db_info.owning_gd"
+	Set gtmtypes("unix_db_info",156,"off")=1008
+	Set gtmtypes("unix_db_info",156,"len")=8
+	Set gtmtypes("unix_db_info",156,"type")="addr"
+	Set gtmtypfldindx("unix_db_info","owning_gd")=156
+	Set gtmtypes("unix_db_info",157,"name")="unix_db_info.fileid"
+	Set gtmtypes("unix_db_info",157,"off")=1016
+	Set gtmtypes("unix_db_info",157,"len")=24
+	Set gtmtypes("unix_db_info",157,"type")="unix_file_id"
+	Set gtmtypfldindx("unix_db_info","fileid")=157
+	Set gtmtypes("unix_db_info",158,"name")="unix_db_info.fileid.inode"
+	Set gtmtypes("unix_db_info",158,"off")=1016
+	Set gtmtypes("unix_db_info",158,"len")=8
+	Set gtmtypes("unix_db_info",158,"type")="ino_t"
+	Set gtmtypfldindx("unix_db_info","fileid.inode")=158
+	Set gtmtypes("unix_db_info",159,"name")="unix_db_info.fileid.device"
+	Set gtmtypes("unix_db_info",159,"off")=1024
+	Set gtmtypes("unix_db_info",159,"len")=8
+	Set gtmtypes("unix_db_info",159,"type")="dev_t"
+	Set gtmtypfldindx("unix_db_info","fileid.device")=159
+	Set gtmtypes("unix_db_info",160,"name")="unix_db_info.fileid.st_gen"
+	Set gtmtypes("unix_db_info",160,"off")=1032
+	Set gtmtypes("unix_db_info",160,"len")=4
+	Set gtmtypes("unix_db_info",160,"type")="unsigned-int"
+	Set gtmtypfldindx("unix_db_info","fileid.st_gen")=160
+	Set gtmtypes("unix_db_info",161,"name")="unix_db_info.semid"
+	Set gtmtypes("unix_db_info",161,"off")=1040
+	Set gtmtypes("unix_db_info",161,"len")=4
+	Set gtmtypes("unix_db_info",161,"type")="int"
+	Set gtmtypfldindx("unix_db_info","semid")=161
+	Set gtmtypes("unix_db_info",162,"name")="unix_db_info.gt_sem_ctime"
+	Set gtmtypes("unix_db_info",162,"off")=1048
+	Set gtmtypes("unix_db_info",162,"len")=8
+	Set gtmtypes("unix_db_info",162,"type")="time_t"
+	Set gtmtypfldindx("unix_db_info","gt_sem_ctime")=162
+	Set gtmtypes("unix_db_info",163,"name")="unix_db_info.shmid"
+	Set gtmtypes("unix_db_info",163,"off")=1056
+	Set gtmtypes("unix_db_info",163,"len")=4
+	Set gtmtypes("unix_db_info",163,"type")="int"
+	Set gtmtypfldindx("unix_db_info","shmid")=163
+	Set gtmtypes("unix_db_info",164,"name")="unix_db_info.gt_shm_ctime"
+	Set gtmtypes("unix_db_info",164,"off")=1064
+	Set gtmtypes("unix_db_info",164,"len")=8
+	Set gtmtypes("unix_db_info",164,"type")="time_t"
+	Set gtmtypfldindx("unix_db_info","gt_shm_ctime")=164
+	Set gtmtypes("unix_db_info",165,"name")="unix_db_info.ftok_semid"
+	Set gtmtypes("unix_db_info",165,"off")=1072
+	Set gtmtypes("unix_db_info",165,"len")=4
+	Set gtmtypes("unix_db_info",165,"type")="int"
+	Set gtmtypfldindx("unix_db_info","ftok_semid")=165
+	Set gtmtypes("unix_db_info",166,"name")="unix_db_info.key"
+	Set gtmtypes("unix_db_info",166,"off")=1076
+	Set gtmtypes("unix_db_info",166,"len")=4
+	Set gtmtypes("unix_db_info",166,"type")="key_t"
+	Set gtmtypfldindx("unix_db_info","key")=166
+	Set gtmtypes("unix_db_info",167,"name")="unix_db_info.raw"
+	Set gtmtypes("unix_db_info",167,"off")=1080
+	Set gtmtypes("unix_db_info",167,"len")=4
+	Set gtmtypes("unix_db_info",167,"type")="boolean_t"
+	Set gtmtypfldindx("unix_db_info","raw")=167
+	Set gtmtypes("unix_db_info",168,"name")="unix_db_info.db_fs_block_size"
+	Set gtmtypes("unix_db_info",168,"off")=1084
+	Set gtmtypes("unix_db_info",168,"len")=4
+	Set gtmtypes("unix_db_info",168,"type")="unsigned-int"
+	Set gtmtypfldindx("unix_db_info","db_fs_block_size")=168
 	;
 	Set gtmtypes("unix_file_id")="struct"
 	Set gtmtypes("unix_file_id",0)=3
@@ -40911,6 +41825,84 @@ Init
 	Set gtmtypes("wcs_conflict_trace_t",3,"type")="int"
 	Set gtmtypfldindx("wcs_conflict_trace_t","fsync_in_prog_pid")=3
 	;
+	Set gtmtypes("wcs_ops_trace_t")="struct"
+	Set gtmtypes("wcs_ops_trace_t",0)=11
+	Set gtmtypes("wcs_ops_trace_t","len")=56
+	Set gtmtypes("wcs_ops_trace_t",1,"name")="wcs_ops_trace_t.db_tn"
+	Set gtmtypes("wcs_ops_trace_t",1,"off")=0
+	Set gtmtypes("wcs_ops_trace_t",1,"len")=8
+	Set gtmtypes("wcs_ops_trace_t",1,"type")="uint64_t"
+	Set gtmtypfldindx("wcs_ops_trace_t","db_tn")=1
+	Set gtmtypes("wcs_ops_trace_t",2,"name")="wcs_ops_trace_t.process_id"
+	Set gtmtypes("wcs_ops_trace_t",2,"off")=8
+	Set gtmtypes("wcs_ops_trace_t",2,"len")=4
+	Set gtmtypes("wcs_ops_trace_t",2,"type")="unsigned-int"
+	Set gtmtypfldindx("wcs_ops_trace_t","process_id")=2
+	Set gtmtypes("wcs_ops_trace_t",3,"name")="wcs_ops_trace_t.wc_in_free"
+	Set gtmtypes("wcs_ops_trace_t",3,"off")=12
+	Set gtmtypes("wcs_ops_trace_t",3,"len")=4
+	Set gtmtypes("wcs_ops_trace_t",3,"type")="unsigned-int"
+	Set gtmtypfldindx("wcs_ops_trace_t","wc_in_free")=3
+	Set gtmtypes("wcs_ops_trace_t",4,"name")="wcs_ops_trace_t.wcs_active_lvl"
+	Set gtmtypes("wcs_ops_trace_t",4,"off")=16
+	Set gtmtypes("wcs_ops_trace_t",4,"len")=4
+	Set gtmtypes("wcs_ops_trace_t",4,"type")="unsigned-int"
+	Set gtmtypfldindx("wcs_ops_trace_t","wcs_active_lvl")=4
+	Set gtmtypes("wcs_ops_trace_t",5,"name")="wcs_ops_trace_t.wcs_wip_lvl"
+	Set gtmtypes("wcs_ops_trace_t",5,"off")=20
+	Set gtmtypes("wcs_ops_trace_t",5,"len")=4
+	Set gtmtypes("wcs_ops_trace_t",5,"type")="unsigned-int"
+	Set gtmtypfldindx("wcs_ops_trace_t","wcs_wip_lvl")=5
+	Set gtmtypes("wcs_ops_trace_t",6,"name")="wcs_ops_trace_t.type"
+	Set gtmtypes("wcs_ops_trace_t",6,"off")=24
+	Set gtmtypes("wcs_ops_trace_t",6,"len")=4
+	Set gtmtypes("wcs_ops_trace_t",6,"type")="int"
+	Set gtmtypfldindx("wcs_ops_trace_t","type")=6
+	Set gtmtypes("wcs_ops_trace_t",7,"name")="wcs_ops_trace_t.blk"
+	Set gtmtypes("wcs_ops_trace_t",7,"off")=28
+	Set gtmtypes("wcs_ops_trace_t",7,"len")=4
+	Set gtmtypes("wcs_ops_trace_t",7,"type")="int"
+	Set gtmtypfldindx("wcs_ops_trace_t","blk")=7
+	Set gtmtypes("wcs_ops_trace_t",8,"name")="wcs_ops_trace_t.cr_off"
+	Set gtmtypes("wcs_ops_trace_t",8,"off")=32
+	Set gtmtypes("wcs_ops_trace_t",8,"len")=8
+	Set gtmtypes("wcs_ops_trace_t",8,"type")="intptr_t"
+	Set gtmtypfldindx("wcs_ops_trace_t","cr_off")=8
+	Set gtmtypes("wcs_ops_trace_t",9,"name")="wcs_ops_trace_t.cr_dirty"
+	Set gtmtypes("wcs_ops_trace_t",9,"off")=40
+	Set gtmtypes("wcs_ops_trace_t",9,"len")=8
+	Set gtmtypes("wcs_ops_trace_t",9,"type")="uint64_t"
+	Set gtmtypfldindx("wcs_ops_trace_t","cr_dirty")=9
+	Set gtmtypes("wcs_ops_trace_t",10,"name")="wcs_ops_trace_t.detail1"
+	Set gtmtypes("wcs_ops_trace_t",10,"off")=48
+	Set gtmtypes("wcs_ops_trace_t",10,"len")=4
+	Set gtmtypes("wcs_ops_trace_t",10,"type")="unsigned-int"
+	Set gtmtypfldindx("wcs_ops_trace_t","detail1")=10
+	Set gtmtypes("wcs_ops_trace_t",11,"name")="wcs_ops_trace_t.detail2"
+	Set gtmtypes("wcs_ops_trace_t",11,"off")=52
+	Set gtmtypes("wcs_ops_trace_t",11,"len")=4
+	Set gtmtypes("wcs_ops_trace_t",11,"type")="unsigned-int"
+	Set gtmtypfldindx("wcs_ops_trace_t","detail2")=11
+	;
+	Set gtmtypes("wtstart_cr_list_t")="struct"
+	Set gtmtypes("wtstart_cr_list_t",0)=3
+	Set gtmtypes("wtstart_cr_list_t","len")=16
+	Set gtmtypes("wtstart_cr_list_t",1,"name")="wtstart_cr_list_t.numcrs"
+	Set gtmtypes("wtstart_cr_list_t",1,"off")=0
+	Set gtmtypes("wtstart_cr_list_t",1,"len")=4
+	Set gtmtypes("wtstart_cr_list_t",1,"type")="int"
+	Set gtmtypfldindx("wtstart_cr_list_t","numcrs")=1
+	Set gtmtypes("wtstart_cr_list_t",2,"name")="wtstart_cr_list_t.listsize"
+	Set gtmtypes("wtstart_cr_list_t",2,"off")=4
+	Set gtmtypes("wtstart_cr_list_t",2,"len")=4
+	Set gtmtypes("wtstart_cr_list_t",2,"type")="int"
+	Set gtmtypfldindx("wtstart_cr_list_t","listsize")=2
+	Set gtmtypes("wtstart_cr_list_t",3,"name")="wtstart_cr_list_t.listcrs"
+	Set gtmtypes("wtstart_cr_list_t",3,"off")=8
+	Set gtmtypes("wtstart_cr_list_t",3,"len")=8
+	Set gtmtypes("wtstart_cr_list_t",3,"type")="addr"
+	Set gtmtypfldindx("wtstart_cr_list_t","listcrs")=3
+	;
 	Set gtmtypes("z_records")="struct"
 	Set gtmtypes("z_records",0)=3
 	Set gtmtypes("z_records","len")=24
@@ -41663,6 +42655,7 @@ Init
 	Set gtmstructs("srch_blk_status_struct")="srch_blk_status"
 	Set gtmstructs("st_timer_alloc")="st_timer_alloc"
 	Set gtmstructs("stack_frame_struct")="stack_frame"
+	Set gtmstructs("statsDB_diqe")="statsDB_deferred_init_que_elem"
 	Set gtmstructs("storElemStruct")="storElem"
 	Set gtmstructs("struct_spanode_integ")="span_node_integ"
 	Set gtmstructs("symval_struct")="symval"
@@ -41692,6 +42685,7 @@ Init
 	Set gtmstructs("util_snapshot_struct")="util_snapshot_t"
 	Set gtmstructs("vms_lock_sb_struct")="vms_lock_sb"
 	Set gtmstructs("wcs_conflict_trace_struct")="wcs_conflict_trace_t"
+	Set gtmstructs("wtstart_cr_list_struct")="wtstart_cr_list_t"
 	Set gtmstructs("zro_ent_type")="zro_ent"
 	Set gtmstructs("zshow_out_struct")="zshow_out"
 	Set gtmstructs("zwr_alias_var_struct")="zwr_alias_var"
diff --git a/sr_x86_64/GTMDefinedTypesInitRelease.m b/sr_x86_64/GTMDefinedTypesInitRelease.m
index ad89c94..8a87a51 100644
--- a/sr_x86_64/GTMDefinedTypesInitRelease.m
+++ b/sr_x86_64/GTMDefinedTypesInitRelease.m
@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;								;
-; Copyright (c) 2010-2016 Fidelity National Information 	;
+; Copyright (c) 2010-2017 Fidelity National Information 	;
 ; Services, Inc. and/or its subsidiaries. All rights reserved.	;
 ;								;
 ;	This source code contains the intellectual property	;
@@ -11,14 +11,14 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ;
-; Generated by scantypedefs.m at 17:35:46 on 2016-05-09
-; Build done with GT.M version: GT.M V6.3-000 Linux x86_64
+; Generated by scantypedefs.m at 10:47:25 on 2017-03-30
+; Build done with GT.M version: GT.M V6.3-000A Linux x86_64
 ;
 ; Environment variables during run:
-;   $gtm_dist: /usr/library/V63000/pro
-;   $gtm_exe: /usr/library/V63000A/pro
-;   $gtm_src: /usr/library/V63000A/src
-;   $gtm_inc: /usr/library/V63000A/inc
+;   $gtm_dist: /usr/library/V63000A/pro
+;   $gtm_exe: /usr/library/V63001A/pro
+;   $gtm_src: /usr/library/V63001A/src
+;   $gtm_inc: /usr/library/V63001A/inc
 ;
 ; Note this file should not be manually invoked
 ;
@@ -28,10 +28,10 @@
 ; Entry point used by gtmpcat and others to define GTM structure fields
 ;
 Init
-	Set gtmsdver="1.1.0"
+	; GT.M structure and field definitions
+	Set gtmsdver="1.2.0"
 	Set gtmsdtyp="pro"
 	;
-	; GT.M structure and field definitions
 	;
 	Set gtmtypes("ABS_TIME")="struct"
 	Set gtmtypes("ABS_TIME",0)=2
@@ -261,21 +261,21 @@ Init
 	Set gtmtypes("GT_TIMER",10,"len")=4
 	Set gtmtypes("GT_TIMER",10,"type")="int"
 	Set gtmtypfldindx("GT_TIMER","safe")=10
-	Set gtmtypes("GT_TIMER",11,"name")="GT_TIMER.hd_len_max"
+	Set gtmtypes("GT_TIMER",11,"name")="GT_TIMER.block_int"
 	Set gtmtypes("GT_TIMER",11,"off")=60
 	Set gtmtypes("GT_TIMER",11,"len")=4
 	Set gtmtypes("GT_TIMER",11,"type")="int"
-	Set gtmtypfldindx("GT_TIMER","hd_len_max")=11
-	Set gtmtypes("GT_TIMER",12,"name")="GT_TIMER.hd_len"
+	Set gtmtypfldindx("GT_TIMER","block_int")=11
+	Set gtmtypes("GT_TIMER",12,"name")="GT_TIMER.hd_len_max"
 	Set gtmtypes("GT_TIMER",12,"off")=64
 	Set gtmtypes("GT_TIMER",12,"len")=4
 	Set gtmtypes("GT_TIMER",12,"type")="int"
-	Set gtmtypfldindx("GT_TIMER","hd_len")=12
-	Set gtmtypes("GT_TIMER",13,"name")="GT_TIMER.padding"
+	Set gtmtypfldindx("GT_TIMER","hd_len_max")=12
+	Set gtmtypes("GT_TIMER",13,"name")="GT_TIMER.hd_len"
 	Set gtmtypes("GT_TIMER",13,"off")=68
 	Set gtmtypes("GT_TIMER",13,"len")=4
 	Set gtmtypes("GT_TIMER",13,"type")="int"
-	Set gtmtypfldindx("GT_TIMER","padding")=13
+	Set gtmtypfldindx("GT_TIMER","hd_len")=13
 	Set gtmtypes("GT_TIMER",14,"name")="GT_TIMER.hd_data"
 	Set gtmtypes("GT_TIMER",14,"off")=72
 	Set gtmtypes("GT_TIMER",14,"len")=1
@@ -813,8 +813,8 @@ Init
 	Set gtmtypfldindx("cache_que_head","latch.u.parts.latch_word")=8
 	;
 	Set gtmtypes("cache_que_heads")="struct"
-	Set gtmtypes("cache_que_heads",0)=49
-	Set gtmtypes("cache_que_heads","len")=200
+	Set gtmtypes("cache_que_heads",0)=52
+	Set gtmtypes("cache_que_heads","len")=264
 	Set gtmtypes("cache_que_heads",1,"name")="cache_que_heads.cacheq_wip"
 	Set gtmtypes("cache_que_heads",1,"off")=0
 	Set gtmtypes("cache_que_heads",1,"len")=24
@@ -907,7 +907,7 @@ Init
 	Set gtmtypfldindx("cache_que_heads","cacheq_active.latch.u.parts.latch_word")=18
 	Set gtmtypes("cache_que_heads",19,"name")="cache_que_heads.cache_array"
 	Set gtmtypes("cache_que_heads",19,"off")=48
-	Set gtmtypes("cache_que_heads",19,"len")=152
+	Set gtmtypes("cache_que_heads",19,"len")=216
 	Set gtmtypes("cache_que_heads",19,"type")="cache_rec"
 	Set gtmtypfldindx("cache_que_heads","cache_array")=19
 	Set gtmtypes("cache_que_heads",20,"name")="cache_que_heads.cache_array[0].blkque"
@@ -1005,65 +1005,80 @@ Init
 	Set gtmtypes("cache_que_heads",38,"len")=4
 	Set gtmtypes("cache_que_heads",38,"type")="unsigned-int"
 	Set gtmtypfldindx("cache_que_heads","cache_array[0].jnl_addr")=38
-	Set gtmtypes("cache_que_heads",39,"name")="cache_que_heads.cache_array[0].rip_latch"
-	Set gtmtypes("cache_que_heads",39,"off")=152
-	Set gtmtypes("cache_que_heads",39,"len")=8
-	Set gtmtypes("cache_que_heads",39,"type")="global_latch_t"
-	Set gtmtypfldindx("cache_que_heads","cache_array[0].rip_latch")=39
-	Set gtmtypes("cache_que_heads",40,"name")="cache_que_heads.cache_array[0].image_count"
-	Set gtmtypes("cache_que_heads",40,"off")=160
-	Set gtmtypes("cache_que_heads",40,"len")=4
-	Set gtmtypes("cache_que_heads",40,"type")="int"
-	Set gtmtypfldindx("cache_que_heads","cache_array[0].image_count")=40
-	Set gtmtypes("cache_que_heads",41,"name")="cache_que_heads.cache_array[0].epid"
-	Set gtmtypes("cache_que_heads",41,"off")=164
+	Set gtmtypes("cache_que_heads",39,"name")="cache_que_heads.cache_array[0].stopped"
+	Set gtmtypes("cache_que_heads",39,"off")=148
+	Set gtmtypes("cache_que_heads",39,"len")=4
+	Set gtmtypes("cache_que_heads",39,"type")="unsigned-int"
+	Set gtmtypfldindx("cache_que_heads","cache_array[0].stopped")=39
+	Set gtmtypes("cache_que_heads",40,"name")="cache_que_heads.cache_array[0].rip_latch"
+	Set gtmtypes("cache_que_heads",40,"off")=152
+	Set gtmtypes("cache_que_heads",40,"len")=8
+	Set gtmtypes("cache_que_heads",40,"type")="global_latch_t"
+	Set gtmtypfldindx("cache_que_heads","cache_array[0].rip_latch")=40
+	Set gtmtypes("cache_que_heads",41,"name")="cache_que_heads.cache_array[0].data_invalid"
+	Set gtmtypes("cache_que_heads",41,"off")=160
 	Set gtmtypes("cache_que_heads",41,"len")=4
-	Set gtmtypes("cache_que_heads",41,"type")="int"
-	Set gtmtypfldindx("cache_que_heads","cache_array[0].epid")=41
-	Set gtmtypes("cache_que_heads",42,"name")="cache_que_heads.cache_array[0].cycle"
-	Set gtmtypes("cache_que_heads",42,"off")=168
+	Set gtmtypes("cache_que_heads",41,"type")="unsigned-int"
+	Set gtmtypfldindx("cache_que_heads","cache_array[0].data_invalid")=41
+	Set gtmtypes("cache_que_heads",42,"name")="cache_que_heads.cache_array[0].epid"
+	Set gtmtypes("cache_que_heads",42,"off")=164
 	Set gtmtypes("cache_que_heads",42,"len")=4
 	Set gtmtypes("cache_que_heads",42,"type")="int"
-	Set gtmtypfldindx("cache_que_heads","cache_array[0].cycle")=42
-	Set gtmtypes("cache_que_heads",43,"name")="cache_que_heads.cache_array[0].r_epid"
-	Set gtmtypes("cache_que_heads",43,"off")=172
+	Set gtmtypfldindx("cache_que_heads","cache_array[0].epid")=42
+	Set gtmtypes("cache_que_heads",43,"name")="cache_que_heads.cache_array[0].cycle"
+	Set gtmtypes("cache_que_heads",43,"off")=168
 	Set gtmtypes("cache_que_heads",43,"len")=4
 	Set gtmtypes("cache_que_heads",43,"type")="int"
-	Set gtmtypfldindx("cache_que_heads","cache_array[0].r_epid")=43
-	Set gtmtypes("cache_que_heads",44,"name")="cache_que_heads.cache_array[0].read_in_progress"
-	Set gtmtypes("cache_que_heads",44,"off")=176
+	Set gtmtypfldindx("cache_que_heads","cache_array[0].cycle")=43
+	Set gtmtypes("cache_que_heads",44,"name")="cache_que_heads.cache_array[0].r_epid"
+	Set gtmtypes("cache_que_heads",44,"off")=172
 	Set gtmtypes("cache_que_heads",44,"len")=4
 	Set gtmtypes("cache_que_heads",44,"type")="int"
-	Set gtmtypfldindx("cache_que_heads","cache_array[0].read_in_progress")=44
-	Set gtmtypes("cache_que_heads",45,"name")="cache_que_heads.cache_array[0].in_tend"
-	Set gtmtypes("cache_que_heads",45,"off")=180
-	Set gtmtypes("cache_que_heads",45,"len")=4
-	Set gtmtypes("cache_que_heads",45,"type")="unsigned-int"
-	Set gtmtypfldindx("cache_que_heads","cache_array[0].in_tend")=45
-	Set gtmtypes("cache_que_heads",46,"name")="cache_que_heads.cache_array[0].in_cw_set"
-	Set gtmtypes("cache_que_heads",46,"off")=184
+	Set gtmtypfldindx("cache_que_heads","cache_array[0].r_epid")=44
+	Set gtmtypes("cache_que_heads",45,"name")="cache_que_heads.cache_array[0].aiocb"
+	Set gtmtypes("cache_que_heads",45,"off")=176
+	Set gtmtypes("cache_que_heads",45,"len")=72
+	Set gtmtypes("cache_que_heads",45,"type")="struct"
+	Set gtmtypfldindx("cache_que_heads","cache_array[0].aiocb")=45
+	Set gtmtypes("cache_que_heads",46,"name")="cache_que_heads.cache_array[0].read_in_progress"
+	Set gtmtypes("cache_que_heads",46,"off")=248
 	Set gtmtypes("cache_que_heads",46,"len")=4
-	Set gtmtypes("cache_que_heads",46,"type")="unsigned-int"
-	Set gtmtypfldindx("cache_que_heads","cache_array[0].in_cw_set")=46
-	Set gtmtypes("cache_que_heads",47,"name")="cache_que_heads.cache_array[0].data_invalid"
-	Set gtmtypes("cache_que_heads",47,"off")=188
+	Set gtmtypes("cache_que_heads",46,"type")="int"
+	Set gtmtypfldindx("cache_que_heads","cache_array[0].read_in_progress")=46
+	Set gtmtypes("cache_que_heads",47,"name")="cache_que_heads.cache_array[0].in_tend"
+	Set gtmtypes("cache_que_heads",47,"off")=252
 	Set gtmtypes("cache_que_heads",47,"len")=4
 	Set gtmtypes("cache_que_heads",47,"type")="unsigned-int"
-	Set gtmtypfldindx("cache_que_heads","cache_array[0].data_invalid")=47
-	Set gtmtypes("cache_que_heads",48,"name")="cache_que_heads.cache_array[0].stopped"
-	Set gtmtypes("cache_que_heads",48,"off")=192
+	Set gtmtypfldindx("cache_que_heads","cache_array[0].in_tend")=47
+	Set gtmtypes("cache_que_heads",48,"name")="cache_que_heads.cache_array[0].in_cw_set"
+	Set gtmtypes("cache_que_heads",48,"off")=256
 	Set gtmtypes("cache_que_heads",48,"len")=4
-	Set gtmtypes("cache_que_heads",48,"type")="boolean_t"
-	Set gtmtypfldindx("cache_que_heads","cache_array[0].stopped")=48
-	Set gtmtypes("cache_que_heads",49,"name")="cache_que_heads.cache_array[0].wip_stopped"
-	Set gtmtypes("cache_que_heads",49,"off")=196
-	Set gtmtypes("cache_que_heads",49,"len")=4
-	Set gtmtypes("cache_que_heads",49,"type")="boolean_t"
-	Set gtmtypfldindx("cache_que_heads","cache_array[0].wip_stopped")=49
+	Set gtmtypes("cache_que_heads",48,"type")="unsigned-int"
+	Set gtmtypfldindx("cache_que_heads","cache_array[0].in_cw_set")=48
+	Set gtmtypes("cache_que_heads",49,"name")="cache_que_heads.cache_array[0].wip_is_encr_buf"
+	Set gtmtypes("cache_que_heads",49,"off")=260
+	Set gtmtypes("cache_que_heads",49,"len")=1
+	Set gtmtypes("cache_que_heads",49,"type")="char"
+	Set gtmtypfldindx("cache_que_heads","cache_array[0].wip_is_encr_buf")=49
+	Set gtmtypes("cache_que_heads",50,"name")="cache_que_heads.cache_array[0].backup_cr_is_twin"
+	Set gtmtypes("cache_que_heads",50,"off")=261
+	Set gtmtypes("cache_que_heads",50,"len")=1
+	Set gtmtypes("cache_que_heads",50,"type")="char"
+	Set gtmtypfldindx("cache_que_heads","cache_array[0].backup_cr_is_twin")=50
+	Set gtmtypes("cache_que_heads",51,"name")="cache_que_heads.cache_array[0].aio_issued"
+	Set gtmtypes("cache_que_heads",51,"off")=262
+	Set gtmtypes("cache_que_heads",51,"len")=1
+	Set gtmtypes("cache_que_heads",51,"type")="char"
+	Set gtmtypfldindx("cache_que_heads","cache_array[0].aio_issued")=51
+	Set gtmtypes("cache_que_heads",52,"name")="cache_que_heads.cache_array[0].filler4bytealign"
+	Set gtmtypes("cache_que_heads",52,"off")=263
+	Set gtmtypes("cache_que_heads",52,"len")=1
+	Set gtmtypes("cache_que_heads",52,"type")="char"
+	Set gtmtypfldindx("cache_que_heads","cache_array[0].filler4bytealign")=52
 	;
 	Set gtmtypes("cache_rec")="struct"
-	Set gtmtypes("cache_rec",0)=35
-	Set gtmtypes("cache_rec","len")=152
+	Set gtmtypes("cache_rec",0)=38
+	Set gtmtypes("cache_rec","len")=216
 	Set gtmtypes("cache_rec",1,"name")="cache_rec.blkque"
 	Set gtmtypes("cache_rec",1,"off")=0
 	Set gtmtypes("cache_rec",1,"len")=16
@@ -1159,90 +1174,105 @@ Init
 	Set gtmtypes("cache_rec",19,"len")=4
 	Set gtmtypes("cache_rec",19,"type")="unsigned-int"
 	Set gtmtypfldindx("cache_rec","jnl_addr")=19
-	Set gtmtypes("cache_rec",20,"name")="cache_rec.rip_latch"
-	Set gtmtypes("cache_rec",20,"off")=104
-	Set gtmtypes("cache_rec",20,"len")=8
-	Set gtmtypes("cache_rec",20,"type")="global_latch_t"
-	Set gtmtypfldindx("cache_rec","rip_latch")=20
-	Set gtmtypes("cache_rec",21,"name")="cache_rec.rip_latch.u"
+	Set gtmtypes("cache_rec",20,"name")="cache_rec.stopped"
+	Set gtmtypes("cache_rec",20,"off")=100
+	Set gtmtypes("cache_rec",20,"len")=4
+	Set gtmtypes("cache_rec",20,"type")="unsigned-int"
+	Set gtmtypfldindx("cache_rec","stopped")=20
+	Set gtmtypes("cache_rec",21,"name")="cache_rec.rip_latch"
 	Set gtmtypes("cache_rec",21,"off")=104
 	Set gtmtypes("cache_rec",21,"len")=8
-	Set gtmtypes("cache_rec",21,"type")="union"
-	Set gtmtypfldindx("cache_rec","rip_latch.u")=21
-	Set gtmtypes("cache_rec",22,"name")="cache_rec.rip_latch.u.pid_imgcnt"
+	Set gtmtypes("cache_rec",21,"type")="global_latch_t"
+	Set gtmtypfldindx("cache_rec","rip_latch")=21
+	Set gtmtypes("cache_rec",22,"name")="cache_rec.rip_latch.u"
 	Set gtmtypes("cache_rec",22,"off")=104
 	Set gtmtypes("cache_rec",22,"len")=8
-	Set gtmtypes("cache_rec",22,"type")="uint64_t"
-	Set gtmtypfldindx("cache_rec","rip_latch.u.pid_imgcnt")=22
-	Set gtmtypes("cache_rec",23,"name")="cache_rec.rip_latch.u.parts"
+	Set gtmtypes("cache_rec",22,"type")="union"
+	Set gtmtypfldindx("cache_rec","rip_latch.u")=22
+	Set gtmtypes("cache_rec",23,"name")="cache_rec.rip_latch.u.pid_imgcnt"
 	Set gtmtypes("cache_rec",23,"off")=104
 	Set gtmtypes("cache_rec",23,"len")=8
-	Set gtmtypes("cache_rec",23,"type")="struct"
-	Set gtmtypfldindx("cache_rec","rip_latch.u.parts")=23
-	Set gtmtypes("cache_rec",24,"name")="cache_rec.rip_latch.u.parts.latch_pid"
+	Set gtmtypes("cache_rec",23,"type")="uint64_t"
+	Set gtmtypfldindx("cache_rec","rip_latch.u.pid_imgcnt")=23
+	Set gtmtypes("cache_rec",24,"name")="cache_rec.rip_latch.u.parts"
 	Set gtmtypes("cache_rec",24,"off")=104
-	Set gtmtypes("cache_rec",24,"len")=4
-	Set gtmtypes("cache_rec",24,"type")="int"
-	Set gtmtypfldindx("cache_rec","rip_latch.u.parts.latch_pid")=24
-	Set gtmtypes("cache_rec",25,"name")="cache_rec.rip_latch.u.parts.latch_word"
-	Set gtmtypes("cache_rec",25,"off")=108
+	Set gtmtypes("cache_rec",24,"len")=8
+	Set gtmtypes("cache_rec",24,"type")="struct"
+	Set gtmtypfldindx("cache_rec","rip_latch.u.parts")=24
+	Set gtmtypes("cache_rec",25,"name")="cache_rec.rip_latch.u.parts.latch_pid"
+	Set gtmtypes("cache_rec",25,"off")=104
 	Set gtmtypes("cache_rec",25,"len")=4
 	Set gtmtypes("cache_rec",25,"type")="int"
-	Set gtmtypfldindx("cache_rec","rip_latch.u.parts.latch_word")=25
-	Set gtmtypes("cache_rec",26,"name")="cache_rec.image_count"
-	Set gtmtypes("cache_rec",26,"off")=112
+	Set gtmtypfldindx("cache_rec","rip_latch.u.parts.latch_pid")=25
+	Set gtmtypes("cache_rec",26,"name")="cache_rec.rip_latch.u.parts.latch_word"
+	Set gtmtypes("cache_rec",26,"off")=108
 	Set gtmtypes("cache_rec",26,"len")=4
 	Set gtmtypes("cache_rec",26,"type")="int"
-	Set gtmtypfldindx("cache_rec","image_count")=26
-	Set gtmtypes("cache_rec",27,"name")="cache_rec.epid"
-	Set gtmtypes("cache_rec",27,"off")=116
+	Set gtmtypfldindx("cache_rec","rip_latch.u.parts.latch_word")=26
+	Set gtmtypes("cache_rec",27,"name")="cache_rec.data_invalid"
+	Set gtmtypes("cache_rec",27,"off")=112
 	Set gtmtypes("cache_rec",27,"len")=4
-	Set gtmtypes("cache_rec",27,"type")="int"
-	Set gtmtypfldindx("cache_rec","epid")=27
-	Set gtmtypes("cache_rec",28,"name")="cache_rec.cycle"
-	Set gtmtypes("cache_rec",28,"off")=120
+	Set gtmtypes("cache_rec",27,"type")="unsigned-int"
+	Set gtmtypfldindx("cache_rec","data_invalid")=27
+	Set gtmtypes("cache_rec",28,"name")="cache_rec.epid"
+	Set gtmtypes("cache_rec",28,"off")=116
 	Set gtmtypes("cache_rec",28,"len")=4
 	Set gtmtypes("cache_rec",28,"type")="int"
-	Set gtmtypfldindx("cache_rec","cycle")=28
-	Set gtmtypes("cache_rec",29,"name")="cache_rec.r_epid"
-	Set gtmtypes("cache_rec",29,"off")=124
+	Set gtmtypfldindx("cache_rec","epid")=28
+	Set gtmtypes("cache_rec",29,"name")="cache_rec.cycle"
+	Set gtmtypes("cache_rec",29,"off")=120
 	Set gtmtypes("cache_rec",29,"len")=4
 	Set gtmtypes("cache_rec",29,"type")="int"
-	Set gtmtypfldindx("cache_rec","r_epid")=29
-	Set gtmtypes("cache_rec",30,"name")="cache_rec.read_in_progress"
-	Set gtmtypes("cache_rec",30,"off")=128
+	Set gtmtypfldindx("cache_rec","cycle")=29
+	Set gtmtypes("cache_rec",30,"name")="cache_rec.r_epid"
+	Set gtmtypes("cache_rec",30,"off")=124
 	Set gtmtypes("cache_rec",30,"len")=4
 	Set gtmtypes("cache_rec",30,"type")="int"
-	Set gtmtypfldindx("cache_rec","read_in_progress")=30
-	Set gtmtypes("cache_rec",31,"name")="cache_rec.in_tend"
-	Set gtmtypes("cache_rec",31,"off")=132
-	Set gtmtypes("cache_rec",31,"len")=4
-	Set gtmtypes("cache_rec",31,"type")="unsigned-int"
-	Set gtmtypfldindx("cache_rec","in_tend")=31
-	Set gtmtypes("cache_rec",32,"name")="cache_rec.in_cw_set"
-	Set gtmtypes("cache_rec",32,"off")=136
+	Set gtmtypfldindx("cache_rec","r_epid")=30
+	Set gtmtypes("cache_rec",31,"name")="cache_rec.aiocb"
+	Set gtmtypes("cache_rec",31,"off")=128
+	Set gtmtypes("cache_rec",31,"len")=72
+	Set gtmtypes("cache_rec",31,"type")="struct"
+	Set gtmtypfldindx("cache_rec","aiocb")=31
+	Set gtmtypes("cache_rec",32,"name")="cache_rec.read_in_progress"
+	Set gtmtypes("cache_rec",32,"off")=200
 	Set gtmtypes("cache_rec",32,"len")=4
-	Set gtmtypes("cache_rec",32,"type")="unsigned-int"
-	Set gtmtypfldindx("cache_rec","in_cw_set")=32
-	Set gtmtypes("cache_rec",33,"name")="cache_rec.data_invalid"
-	Set gtmtypes("cache_rec",33,"off")=140
+	Set gtmtypes("cache_rec",32,"type")="int"
+	Set gtmtypfldindx("cache_rec","read_in_progress")=32
+	Set gtmtypes("cache_rec",33,"name")="cache_rec.in_tend"
+	Set gtmtypes("cache_rec",33,"off")=204
 	Set gtmtypes("cache_rec",33,"len")=4
 	Set gtmtypes("cache_rec",33,"type")="unsigned-int"
-	Set gtmtypfldindx("cache_rec","data_invalid")=33
-	Set gtmtypes("cache_rec",34,"name")="cache_rec.stopped"
-	Set gtmtypes("cache_rec",34,"off")=144
+	Set gtmtypfldindx("cache_rec","in_tend")=33
+	Set gtmtypes("cache_rec",34,"name")="cache_rec.in_cw_set"
+	Set gtmtypes("cache_rec",34,"off")=208
 	Set gtmtypes("cache_rec",34,"len")=4
-	Set gtmtypes("cache_rec",34,"type")="boolean_t"
-	Set gtmtypfldindx("cache_rec","stopped")=34
-	Set gtmtypes("cache_rec",35,"name")="cache_rec.wip_stopped"
-	Set gtmtypes("cache_rec",35,"off")=148
-	Set gtmtypes("cache_rec",35,"len")=4
-	Set gtmtypes("cache_rec",35,"type")="boolean_t"
-	Set gtmtypfldindx("cache_rec","wip_stopped")=35
+	Set gtmtypes("cache_rec",34,"type")="unsigned-int"
+	Set gtmtypfldindx("cache_rec","in_cw_set")=34
+	Set gtmtypes("cache_rec",35,"name")="cache_rec.wip_is_encr_buf"
+	Set gtmtypes("cache_rec",35,"off")=212
+	Set gtmtypes("cache_rec",35,"len")=1
+	Set gtmtypes("cache_rec",35,"type")="char"
+	Set gtmtypfldindx("cache_rec","wip_is_encr_buf")=35
+	Set gtmtypes("cache_rec",36,"name")="cache_rec.backup_cr_is_twin"
+	Set gtmtypes("cache_rec",36,"off")=213
+	Set gtmtypes("cache_rec",36,"len")=1
+	Set gtmtypes("cache_rec",36,"type")="char"
+	Set gtmtypfldindx("cache_rec","backup_cr_is_twin")=36
+	Set gtmtypes("cache_rec",37,"name")="cache_rec.aio_issued"
+	Set gtmtypes("cache_rec",37,"off")=214
+	Set gtmtypes("cache_rec",37,"len")=1
+	Set gtmtypes("cache_rec",37,"type")="char"
+	Set gtmtypfldindx("cache_rec","aio_issued")=37
+	Set gtmtypes("cache_rec",38,"name")="cache_rec.filler4bytealign"
+	Set gtmtypes("cache_rec",38,"off")=215
+	Set gtmtypes("cache_rec",38,"len")=1
+	Set gtmtypes("cache_rec",38,"type")="char"
+	Set gtmtypfldindx("cache_rec","filler4bytealign")=38
 	;
 	Set gtmtypes("cache_state_rec")="struct"
-	Set gtmtypes("cache_state_rec",0)=32
-	Set gtmtypes("cache_state_rec","len")=136
+	Set gtmtypes("cache_state_rec",0)=35
+	Set gtmtypes("cache_state_rec","len")=200
 	Set gtmtypes("cache_state_rec",1,"name")="cache_state_rec.state_que"
 	Set gtmtypes("cache_state_rec",1,"off")=0
 	Set gtmtypes("cache_state_rec",1,"len")=16
@@ -1323,86 +1353,101 @@ Init
 	Set gtmtypes("cache_state_rec",16,"len")=4
 	Set gtmtypes("cache_state_rec",16,"type")="unsigned-int"
 	Set gtmtypfldindx("cache_state_rec","jnl_addr")=16
-	Set gtmtypes("cache_state_rec",17,"name")="cache_state_rec.rip_latch"
-	Set gtmtypes("cache_state_rec",17,"off")=88
-	Set gtmtypes("cache_state_rec",17,"len")=8
-	Set gtmtypes("cache_state_rec",17,"type")="global_latch_t"
-	Set gtmtypfldindx("cache_state_rec","rip_latch")=17
-	Set gtmtypes("cache_state_rec",18,"name")="cache_state_rec.rip_latch.u"
+	Set gtmtypes("cache_state_rec",17,"name")="cache_state_rec.stopped"
+	Set gtmtypes("cache_state_rec",17,"off")=84
+	Set gtmtypes("cache_state_rec",17,"len")=4
+	Set gtmtypes("cache_state_rec",17,"type")="boolean_t"
+	Set gtmtypfldindx("cache_state_rec","stopped")=17
+	Set gtmtypes("cache_state_rec",18,"name")="cache_state_rec.rip_latch"
 	Set gtmtypes("cache_state_rec",18,"off")=88
 	Set gtmtypes("cache_state_rec",18,"len")=8
-	Set gtmtypes("cache_state_rec",18,"type")="union"
-	Set gtmtypfldindx("cache_state_rec","rip_latch.u")=18
-	Set gtmtypes("cache_state_rec",19,"name")="cache_state_rec.rip_latch.u.pid_imgcnt"
+	Set gtmtypes("cache_state_rec",18,"type")="global_latch_t"
+	Set gtmtypfldindx("cache_state_rec","rip_latch")=18
+	Set gtmtypes("cache_state_rec",19,"name")="cache_state_rec.rip_latch.u"
 	Set gtmtypes("cache_state_rec",19,"off")=88
 	Set gtmtypes("cache_state_rec",19,"len")=8
-	Set gtmtypes("cache_state_rec",19,"type")="uint64_t"
-	Set gtmtypfldindx("cache_state_rec","rip_latch.u.pid_imgcnt")=19
-	Set gtmtypes("cache_state_rec",20,"name")="cache_state_rec.rip_latch.u.parts"
+	Set gtmtypes("cache_state_rec",19,"type")="union"
+	Set gtmtypfldindx("cache_state_rec","rip_latch.u")=19
+	Set gtmtypes("cache_state_rec",20,"name")="cache_state_rec.rip_latch.u.pid_imgcnt"
 	Set gtmtypes("cache_state_rec",20,"off")=88
 	Set gtmtypes("cache_state_rec",20,"len")=8
-	Set gtmtypes("cache_state_rec",20,"type")="struct"
-	Set gtmtypfldindx("cache_state_rec","rip_latch.u.parts")=20
-	Set gtmtypes("cache_state_rec",21,"name")="cache_state_rec.rip_latch.u.parts.latch_pid"
+	Set gtmtypes("cache_state_rec",20,"type")="uint64_t"
+	Set gtmtypfldindx("cache_state_rec","rip_latch.u.pid_imgcnt")=20
+	Set gtmtypes("cache_state_rec",21,"name")="cache_state_rec.rip_latch.u.parts"
 	Set gtmtypes("cache_state_rec",21,"off")=88
-	Set gtmtypes("cache_state_rec",21,"len")=4
-	Set gtmtypes("cache_state_rec",21,"type")="int"
-	Set gtmtypfldindx("cache_state_rec","rip_latch.u.parts.latch_pid")=21
-	Set gtmtypes("cache_state_rec",22,"name")="cache_state_rec.rip_latch.u.parts.latch_word"
-	Set gtmtypes("cache_state_rec",22,"off")=92
+	Set gtmtypes("cache_state_rec",21,"len")=8
+	Set gtmtypes("cache_state_rec",21,"type")="struct"
+	Set gtmtypfldindx("cache_state_rec","rip_latch.u.parts")=21
+	Set gtmtypes("cache_state_rec",22,"name")="cache_state_rec.rip_latch.u.parts.latch_pid"
+	Set gtmtypes("cache_state_rec",22,"off")=88
 	Set gtmtypes("cache_state_rec",22,"len")=4
 	Set gtmtypes("cache_state_rec",22,"type")="int"
-	Set gtmtypfldindx("cache_state_rec","rip_latch.u.parts.latch_word")=22
-	Set gtmtypes("cache_state_rec",23,"name")="cache_state_rec.image_count"
-	Set gtmtypes("cache_state_rec",23,"off")=96
+	Set gtmtypfldindx("cache_state_rec","rip_latch.u.parts.latch_pid")=22
+	Set gtmtypes("cache_state_rec",23,"name")="cache_state_rec.rip_latch.u.parts.latch_word"
+	Set gtmtypes("cache_state_rec",23,"off")=92
 	Set gtmtypes("cache_state_rec",23,"len")=4
 	Set gtmtypes("cache_state_rec",23,"type")="int"
-	Set gtmtypfldindx("cache_state_rec","image_count")=23
-	Set gtmtypes("cache_state_rec",24,"name")="cache_state_rec.epid"
-	Set gtmtypes("cache_state_rec",24,"off")=100
+	Set gtmtypfldindx("cache_state_rec","rip_latch.u.parts.latch_word")=23
+	Set gtmtypes("cache_state_rec",24,"name")="cache_state_rec.data_invalid"
+	Set gtmtypes("cache_state_rec",24,"off")=96
 	Set gtmtypes("cache_state_rec",24,"len")=4
-	Set gtmtypes("cache_state_rec",24,"type")="int"
-	Set gtmtypfldindx("cache_state_rec","epid")=24
-	Set gtmtypes("cache_state_rec",25,"name")="cache_state_rec.cycle"
-	Set gtmtypes("cache_state_rec",25,"off")=104
+	Set gtmtypes("cache_state_rec",24,"type")="unsigned-int"
+	Set gtmtypfldindx("cache_state_rec","data_invalid")=24
+	Set gtmtypes("cache_state_rec",25,"name")="cache_state_rec.epid"
+	Set gtmtypes("cache_state_rec",25,"off")=100
 	Set gtmtypes("cache_state_rec",25,"len")=4
 	Set gtmtypes("cache_state_rec",25,"type")="int"
-	Set gtmtypfldindx("cache_state_rec","cycle")=25
-	Set gtmtypes("cache_state_rec",26,"name")="cache_state_rec.r_epid"
-	Set gtmtypes("cache_state_rec",26,"off")=108
+	Set gtmtypfldindx("cache_state_rec","epid")=25
+	Set gtmtypes("cache_state_rec",26,"name")="cache_state_rec.cycle"
+	Set gtmtypes("cache_state_rec",26,"off")=104
 	Set gtmtypes("cache_state_rec",26,"len")=4
 	Set gtmtypes("cache_state_rec",26,"type")="int"
-	Set gtmtypfldindx("cache_state_rec","r_epid")=26
-	Set gtmtypes("cache_state_rec",27,"name")="cache_state_rec.read_in_progress"
-	Set gtmtypes("cache_state_rec",27,"off")=112
+	Set gtmtypfldindx("cache_state_rec","cycle")=26
+	Set gtmtypes("cache_state_rec",27,"name")="cache_state_rec.r_epid"
+	Set gtmtypes("cache_state_rec",27,"off")=108
 	Set gtmtypes("cache_state_rec",27,"len")=4
 	Set gtmtypes("cache_state_rec",27,"type")="int"
-	Set gtmtypfldindx("cache_state_rec","read_in_progress")=27
-	Set gtmtypes("cache_state_rec",28,"name")="cache_state_rec.in_tend"
-	Set gtmtypes("cache_state_rec",28,"off")=116
-	Set gtmtypes("cache_state_rec",28,"len")=4
-	Set gtmtypes("cache_state_rec",28,"type")="unsigned-int"
-	Set gtmtypfldindx("cache_state_rec","in_tend")=28
-	Set gtmtypes("cache_state_rec",29,"name")="cache_state_rec.in_cw_set"
-	Set gtmtypes("cache_state_rec",29,"off")=120
+	Set gtmtypfldindx("cache_state_rec","r_epid")=27
+	Set gtmtypes("cache_state_rec",28,"name")="cache_state_rec.aiocb"
+	Set gtmtypes("cache_state_rec",28,"off")=112
+	Set gtmtypes("cache_state_rec",28,"len")=72
+	Set gtmtypes("cache_state_rec",28,"type")="struct"
+	Set gtmtypfldindx("cache_state_rec","aiocb")=28
+	Set gtmtypes("cache_state_rec",29,"name")="cache_state_rec.read_in_progress"
+	Set gtmtypes("cache_state_rec",29,"off")=184
 	Set gtmtypes("cache_state_rec",29,"len")=4
-	Set gtmtypes("cache_state_rec",29,"type")="unsigned-int"
-	Set gtmtypfldindx("cache_state_rec","in_cw_set")=29
-	Set gtmtypes("cache_state_rec",30,"name")="cache_state_rec.data_invalid"
-	Set gtmtypes("cache_state_rec",30,"off")=124
+	Set gtmtypes("cache_state_rec",29,"type")="int"
+	Set gtmtypfldindx("cache_state_rec","read_in_progress")=29
+	Set gtmtypes("cache_state_rec",30,"name")="cache_state_rec.in_tend"
+	Set gtmtypes("cache_state_rec",30,"off")=188
 	Set gtmtypes("cache_state_rec",30,"len")=4
 	Set gtmtypes("cache_state_rec",30,"type")="unsigned-int"
-	Set gtmtypfldindx("cache_state_rec","data_invalid")=30
-	Set gtmtypes("cache_state_rec",31,"name")="cache_state_rec.stopped"
-	Set gtmtypes("cache_state_rec",31,"off")=128
+	Set gtmtypfldindx("cache_state_rec","in_tend")=30
+	Set gtmtypes("cache_state_rec",31,"name")="cache_state_rec.in_cw_set"
+	Set gtmtypes("cache_state_rec",31,"off")=192
 	Set gtmtypes("cache_state_rec",31,"len")=4
-	Set gtmtypes("cache_state_rec",31,"type")="boolean_t"
-	Set gtmtypfldindx("cache_state_rec","stopped")=31
-	Set gtmtypes("cache_state_rec",32,"name")="cache_state_rec.wip_stopped"
-	Set gtmtypes("cache_state_rec",32,"off")=132
-	Set gtmtypes("cache_state_rec",32,"len")=4
-	Set gtmtypes("cache_state_rec",32,"type")="boolean_t"
-	Set gtmtypfldindx("cache_state_rec","wip_stopped")=32
+	Set gtmtypes("cache_state_rec",31,"type")="unsigned-int"
+	Set gtmtypfldindx("cache_state_rec","in_cw_set")=31
+	Set gtmtypes("cache_state_rec",32,"name")="cache_state_rec.wip_is_encr_buf"
+	Set gtmtypes("cache_state_rec",32,"off")=196
+	Set gtmtypes("cache_state_rec",32,"len")=1
+	Set gtmtypes("cache_state_rec",32,"type")="char"
+	Set gtmtypfldindx("cache_state_rec","wip_is_encr_buf")=32
+	Set gtmtypes("cache_state_rec",33,"name")="cache_state_rec.backup_cr_is_twin"
+	Set gtmtypes("cache_state_rec",33,"off")=197
+	Set gtmtypes("cache_state_rec",33,"len")=1
+	Set gtmtypes("cache_state_rec",33,"type")="char"
+	Set gtmtypfldindx("cache_state_rec","backup_cr_is_twin")=33
+	Set gtmtypes("cache_state_rec",34,"name")="cache_state_rec.aio_issued"
+	Set gtmtypes("cache_state_rec",34,"off")=198
+	Set gtmtypes("cache_state_rec",34,"len")=1
+	Set gtmtypes("cache_state_rec",34,"type")="char"
+	Set gtmtypfldindx("cache_state_rec","aio_issued")=34
+	Set gtmtypes("cache_state_rec",35,"name")="cache_state_rec.filler4bytealign"
+	Set gtmtypes("cache_state_rec",35,"off")=199
+	Set gtmtypes("cache_state_rec",35,"len")=1
+	Set gtmtypes("cache_state_rec",35,"type")="char"
+	Set gtmtypfldindx("cache_state_rec","filler4bytealign")=35
 	;
 	Set gtmtypes("callin_entry_list")="struct"
 	Set gtmtypes("callin_entry_list",0)=14
@@ -2677,8 +2722,8 @@ Init
 	Set gtmtypfldindx("d_mt_struct","stream")=32
 	;
 	Set gtmtypes("d_rm_struct")="struct"
-	Set gtmtypes("d_rm_struct",0)=88
-	Set gtmtypes("d_rm_struct","len")=976
+	Set gtmtypes("d_rm_struct",0)=90
+	Set gtmtypes("d_rm_struct","len")=480
 	Set gtmtypes("d_rm_struct",1,"name")="d_rm_struct.fixed"
 	Set gtmtypes("d_rm_struct",1,"off")=0
 	Set gtmtypes("d_rm_struct",1,"len")=4
@@ -2985,145 +3030,155 @@ Init
 	Set gtmtypes("d_rm_struct",61,"len")=8
 	Set gtmtypes("d_rm_struct",61,"type")="long"
 	Set gtmtypfldindx("d_rm_struct","pipe_buff_size")=61
-	Set gtmtypes("d_rm_struct",62,"name")="d_rm_struct.utf_tmp_buffer"
+	Set gtmtypes("d_rm_struct",62,"name")="d_rm_struct.tmp_buffer"
 	Set gtmtypes("d_rm_struct",62,"off")=344
-	Set gtmtypes("d_rm_struct",62,"len")=512
-	Set gtmtypes("d_rm_struct",62,"type")="char"
-	Set gtmtypfldindx("d_rm_struct","utf_tmp_buffer")=62
-	Set gtmtypes("d_rm_struct",63,"name")="d_rm_struct.utf_tot_bytes_in_buffer"
-	Set gtmtypes("d_rm_struct",63,"off")=856
+	Set gtmtypes("d_rm_struct",62,"len")=8
+	Set gtmtypes("d_rm_struct",62,"type")="addr"
+	Set gtmtypfldindx("d_rm_struct","tmp_buffer")=62
+	Set gtmtypes("d_rm_struct",63,"name")="d_rm_struct.tot_bytes_in_buffer"
+	Set gtmtypes("d_rm_struct",63,"off")=352
 	Set gtmtypes("d_rm_struct",63,"len")=4
 	Set gtmtypes("d_rm_struct",63,"type")="int"
-	Set gtmtypfldindx("d_rm_struct","utf_tot_bytes_in_buffer")=63
-	Set gtmtypes("d_rm_struct",64,"name")="d_rm_struct.utf_start_pos"
-	Set gtmtypes("d_rm_struct",64,"off")=860
+	Set gtmtypfldindx("d_rm_struct","tot_bytes_in_buffer")=63
+	Set gtmtypes("d_rm_struct",64,"name")="d_rm_struct.start_pos"
+	Set gtmtypes("d_rm_struct",64,"off")=356
 	Set gtmtypes("d_rm_struct",64,"len")=4
 	Set gtmtypes("d_rm_struct",64,"type")="int"
-	Set gtmtypfldindx("d_rm_struct","utf_start_pos")=64
+	Set gtmtypfldindx("d_rm_struct","start_pos")=64
 	Set gtmtypes("d_rm_struct",65,"name")="d_rm_struct.write_occurred"
-	Set gtmtypes("d_rm_struct",65,"off")=864
+	Set gtmtypes("d_rm_struct",65,"off")=360
 	Set gtmtypes("d_rm_struct",65,"len")=4
 	Set gtmtypes("d_rm_struct",65,"type")="boolean_t"
 	Set gtmtypfldindx("d_rm_struct","write_occurred")=65
 	Set gtmtypes("d_rm_struct",66,"name")="d_rm_struct.read_occurred"
-	Set gtmtypes("d_rm_struct",66,"off")=868
+	Set gtmtypes("d_rm_struct",66,"off")=364
 	Set gtmtypes("d_rm_struct",66,"len")=4
 	Set gtmtypes("d_rm_struct",66,"type")="boolean_t"
 	Set gtmtypfldindx("d_rm_struct","read_occurred")=66
 	Set gtmtypes("d_rm_struct",67,"name")="d_rm_struct.input_encrypted"
-	Set gtmtypes("d_rm_struct",67,"off")=872
+	Set gtmtypes("d_rm_struct",67,"off")=368
 	Set gtmtypes("d_rm_struct",67,"len")=4
 	Set gtmtypes("d_rm_struct",67,"type")="boolean_t"
 	Set gtmtypfldindx("d_rm_struct","input_encrypted")=67
 	Set gtmtypes("d_rm_struct",68,"name")="d_rm_struct.output_encrypted"
-	Set gtmtypes("d_rm_struct",68,"off")=876
+	Set gtmtypes("d_rm_struct",68,"off")=372
 	Set gtmtypes("d_rm_struct",68,"len")=4
 	Set gtmtypes("d_rm_struct",68,"type")="boolean_t"
 	Set gtmtypfldindx("d_rm_struct","output_encrypted")=68
 	Set gtmtypes("d_rm_struct",69,"name")="d_rm_struct.input_iv"
-	Set gtmtypes("d_rm_struct",69,"off")=880
+	Set gtmtypes("d_rm_struct",69,"off")=376
 	Set gtmtypes("d_rm_struct",69,"len")=16
 	Set gtmtypes("d_rm_struct",69,"type")="mstr"
 	Set gtmtypfldindx("d_rm_struct","input_iv")=69
 	Set gtmtypes("d_rm_struct",70,"name")="d_rm_struct.input_iv.char_len"
-	Set gtmtypes("d_rm_struct",70,"off")=880
+	Set gtmtypes("d_rm_struct",70,"off")=376
 	Set gtmtypes("d_rm_struct",70,"len")=4
 	Set gtmtypes("d_rm_struct",70,"type")="unsigned-int"
 	Set gtmtypfldindx("d_rm_struct","input_iv.char_len")=70
 	Set gtmtypes("d_rm_struct",71,"name")="d_rm_struct.input_iv.len"
-	Set gtmtypes("d_rm_struct",71,"off")=884
+	Set gtmtypes("d_rm_struct",71,"off")=380
 	Set gtmtypes("d_rm_struct",71,"len")=4
 	Set gtmtypes("d_rm_struct",71,"type")="int"
 	Set gtmtypfldindx("d_rm_struct","input_iv.len")=71
 	Set gtmtypes("d_rm_struct",72,"name")="d_rm_struct.input_iv.addr"
-	Set gtmtypes("d_rm_struct",72,"off")=888
+	Set gtmtypes("d_rm_struct",72,"off")=384
 	Set gtmtypes("d_rm_struct",72,"len")=8
 	Set gtmtypes("d_rm_struct",72,"type")="addr"
 	Set gtmtypfldindx("d_rm_struct","input_iv.addr")=72
 	Set gtmtypes("d_rm_struct",73,"name")="d_rm_struct.output_iv"
-	Set gtmtypes("d_rm_struct",73,"off")=896
+	Set gtmtypes("d_rm_struct",73,"off")=392
 	Set gtmtypes("d_rm_struct",73,"len")=16
 	Set gtmtypes("d_rm_struct",73,"type")="mstr"
 	Set gtmtypfldindx("d_rm_struct","output_iv")=73
 	Set gtmtypes("d_rm_struct",74,"name")="d_rm_struct.output_iv.char_len"
-	Set gtmtypes("d_rm_struct",74,"off")=896
+	Set gtmtypes("d_rm_struct",74,"off")=392
 	Set gtmtypes("d_rm_struct",74,"len")=4
 	Set gtmtypes("d_rm_struct",74,"type")="unsigned-int"
 	Set gtmtypfldindx("d_rm_struct","output_iv.char_len")=74
 	Set gtmtypes("d_rm_struct",75,"name")="d_rm_struct.output_iv.len"
-	Set gtmtypes("d_rm_struct",75,"off")=900
+	Set gtmtypes("d_rm_struct",75,"off")=396
 	Set gtmtypes("d_rm_struct",75,"len")=4
 	Set gtmtypes("d_rm_struct",75,"type")="int"
 	Set gtmtypfldindx("d_rm_struct","output_iv.len")=75
 	Set gtmtypes("d_rm_struct",76,"name")="d_rm_struct.output_iv.addr"
-	Set gtmtypes("d_rm_struct",76,"off")=904
+	Set gtmtypes("d_rm_struct",76,"off")=400
 	Set gtmtypes("d_rm_struct",76,"len")=8
 	Set gtmtypes("d_rm_struct",76,"type")="addr"
 	Set gtmtypfldindx("d_rm_struct","output_iv.addr")=76
 	Set gtmtypes("d_rm_struct",77,"name")="d_rm_struct.input_key"
-	Set gtmtypes("d_rm_struct",77,"off")=912
+	Set gtmtypes("d_rm_struct",77,"off")=408
 	Set gtmtypes("d_rm_struct",77,"len")=16
 	Set gtmtypes("d_rm_struct",77,"type")="mstr"
 	Set gtmtypfldindx("d_rm_struct","input_key")=77
 	Set gtmtypes("d_rm_struct",78,"name")="d_rm_struct.input_key.char_len"
-	Set gtmtypes("d_rm_struct",78,"off")=912
+	Set gtmtypes("d_rm_struct",78,"off")=408
 	Set gtmtypes("d_rm_struct",78,"len")=4
 	Set gtmtypes("d_rm_struct",78,"type")="unsigned-int"
 	Set gtmtypfldindx("d_rm_struct","input_key.char_len")=78
 	Set gtmtypes("d_rm_struct",79,"name")="d_rm_struct.input_key.len"
-	Set gtmtypes("d_rm_struct",79,"off")=916
+	Set gtmtypes("d_rm_struct",79,"off")=412
 	Set gtmtypes("d_rm_struct",79,"len")=4
 	Set gtmtypes("d_rm_struct",79,"type")="int"
 	Set gtmtypfldindx("d_rm_struct","input_key.len")=79
 	Set gtmtypes("d_rm_struct",80,"name")="d_rm_struct.input_key.addr"
-	Set gtmtypes("d_rm_struct",80,"off")=920
+	Set gtmtypes("d_rm_struct",80,"off")=416
 	Set gtmtypes("d_rm_struct",80,"len")=8
 	Set gtmtypes("d_rm_struct",80,"type")="addr"
 	Set gtmtypfldindx("d_rm_struct","input_key.addr")=80
 	Set gtmtypes("d_rm_struct",81,"name")="d_rm_struct.output_key"
-	Set gtmtypes("d_rm_struct",81,"off")=928
+	Set gtmtypes("d_rm_struct",81,"off")=424
 	Set gtmtypes("d_rm_struct",81,"len")=16
 	Set gtmtypes("d_rm_struct",81,"type")="mstr"
 	Set gtmtypfldindx("d_rm_struct","output_key")=81
 	Set gtmtypes("d_rm_struct",82,"name")="d_rm_struct.output_key.char_len"
-	Set gtmtypes("d_rm_struct",82,"off")=928
+	Set gtmtypes("d_rm_struct",82,"off")=424
 	Set gtmtypes("d_rm_struct",82,"len")=4
 	Set gtmtypes("d_rm_struct",82,"type")="unsigned-int"
 	Set gtmtypfldindx("d_rm_struct","output_key.char_len")=82
 	Set gtmtypes("d_rm_struct",83,"name")="d_rm_struct.output_key.len"
-	Set gtmtypes("d_rm_struct",83,"off")=932
+	Set gtmtypes("d_rm_struct",83,"off")=428
 	Set gtmtypes("d_rm_struct",83,"len")=4
 	Set gtmtypes("d_rm_struct",83,"type")="int"
 	Set gtmtypfldindx("d_rm_struct","output_key.len")=83
 	Set gtmtypes("d_rm_struct",84,"name")="d_rm_struct.output_key.addr"
-	Set gtmtypes("d_rm_struct",84,"off")=936
+	Set gtmtypes("d_rm_struct",84,"off")=432
 	Set gtmtypes("d_rm_struct",84,"len")=8
 	Set gtmtypes("d_rm_struct",84,"type")="addr"
 	Set gtmtypfldindx("d_rm_struct","output_key.addr")=84
 	Set gtmtypes("d_rm_struct",85,"name")="d_rm_struct.input_cipher_handle"
-	Set gtmtypes("d_rm_struct",85,"off")=944
+	Set gtmtypes("d_rm_struct",85,"off")=440
 	Set gtmtypes("d_rm_struct",85,"len")=8
 	Set gtmtypes("d_rm_struct",85,"type")="addr"
 	Set gtmtypfldindx("d_rm_struct","input_cipher_handle")=85
 	Set gtmtypes("d_rm_struct",86,"name")="d_rm_struct.output_cipher_handle"
-	Set gtmtypes("d_rm_struct",86,"off")=952
+	Set gtmtypes("d_rm_struct",86,"off")=448
 	Set gtmtypes("d_rm_struct",86,"len")=8
 	Set gtmtypes("d_rm_struct",86,"type")="addr"
 	Set gtmtypfldindx("d_rm_struct","output_cipher_handle")=86
-	Set gtmtypes("d_rm_struct",87,"name")="d_rm_struct.fsblock_buffer_size"
-	Set gtmtypes("d_rm_struct",87,"off")=960
+	Set gtmtypes("d_rm_struct",87,"name")="d_rm_struct.ichset_utf16_variant"
+	Set gtmtypes("d_rm_struct",87,"off")=456
 	Set gtmtypes("d_rm_struct",87,"len")=4
-	Set gtmtypes("d_rm_struct",87,"type")="unsigned-int"
-	Set gtmtypfldindx("d_rm_struct","fsblock_buffer_size")=87
-	Set gtmtypes("d_rm_struct",88,"name")="d_rm_struct.fsblock_buffer"
-	Set gtmtypes("d_rm_struct",88,"off")=968
-	Set gtmtypes("d_rm_struct",88,"len")=8
-	Set gtmtypes("d_rm_struct",88,"type")="addr"
-	Set gtmtypfldindx("d_rm_struct","fsblock_buffer")=88
+	Set gtmtypes("d_rm_struct",87,"type")="int"
+	Set gtmtypfldindx("d_rm_struct","ichset_utf16_variant")=87
+	Set gtmtypes("d_rm_struct",88,"name")="d_rm_struct.ochset_utf16_variant"
+	Set gtmtypes("d_rm_struct",88,"off")=460
+	Set gtmtypes("d_rm_struct",88,"len")=4
+	Set gtmtypes("d_rm_struct",88,"type")="int"
+	Set gtmtypfldindx("d_rm_struct","ochset_utf16_variant")=88
+	Set gtmtypes("d_rm_struct",89,"name")="d_rm_struct.fsblock_buffer_size"
+	Set gtmtypes("d_rm_struct",89,"off")=464
+	Set gtmtypes("d_rm_struct",89,"len")=4
+	Set gtmtypes("d_rm_struct",89,"type")="unsigned-int"
+	Set gtmtypfldindx("d_rm_struct","fsblock_buffer_size")=89
+	Set gtmtypes("d_rm_struct",90,"name")="d_rm_struct.fsblock_buffer"
+	Set gtmtypes("d_rm_struct",90,"off")=472
+	Set gtmtypes("d_rm_struct",90,"len")=8
+	Set gtmtypes("d_rm_struct",90,"type")="addr"
+	Set gtmtypfldindx("d_rm_struct","fsblock_buffer")=90
 	;
 	Set gtmtypes("d_socket_struct")="struct"
-	Set gtmtypes("d_socket_struct",0)=17
-	Set gtmtypes("d_socket_struct","len")=88
+	Set gtmtypes("d_socket_struct",0)=19
+	Set gtmtypes("d_socket_struct","len")=96
 	Set gtmtypes("d_socket_struct",1,"name")="d_socket_struct.sock_save_state"
 	Set gtmtypes("d_socket_struct",1,"off")=0
 	Set gtmtypes("d_socket_struct",1,"len")=48
@@ -3199,16 +3254,26 @@ Init
 	Set gtmtypes("d_socket_struct",15,"len")=4
 	Set gtmtypes("d_socket_struct",15,"type")="boolean_t"
 	Set gtmtypfldindx("d_socket_struct","ochset_specified")=15
-	Set gtmtypes("d_socket_struct",16,"name")="d_socket_struct.iod"
+	Set gtmtypes("d_socket_struct",16,"name")="d_socket_struct.ichset_utf16_variant"
 	Set gtmtypes("d_socket_struct",16,"off")=72
-	Set gtmtypes("d_socket_struct",16,"len")=8
-	Set gtmtypes("d_socket_struct",16,"type")="addr"
-	Set gtmtypfldindx("d_socket_struct","iod")=16
-	Set gtmtypes("d_socket_struct",17,"name")="d_socket_struct.gtm_socket"
-	Set gtmtypes("d_socket_struct",17,"off")=80
-	Set gtmtypes("d_socket_struct",17,"len")=8
-	Set gtmtypes("d_socket_struct",17,"type")="addr"
-	Set gtmtypfldindx("d_socket_struct","gtm_socket")=17
+	Set gtmtypes("d_socket_struct",16,"len")=4
+	Set gtmtypes("d_socket_struct",16,"type")="int"
+	Set gtmtypfldindx("d_socket_struct","ichset_utf16_variant")=16
+	Set gtmtypes("d_socket_struct",17,"name")="d_socket_struct.ochset_utf16_variant"
+	Set gtmtypes("d_socket_struct",17,"off")=76
+	Set gtmtypes("d_socket_struct",17,"len")=4
+	Set gtmtypes("d_socket_struct",17,"type")="int"
+	Set gtmtypfldindx("d_socket_struct","ochset_utf16_variant")=17
+	Set gtmtypes("d_socket_struct",18,"name")="d_socket_struct.iod"
+	Set gtmtypes("d_socket_struct",18,"off")=80
+	Set gtmtypes("d_socket_struct",18,"len")=8
+	Set gtmtypes("d_socket_struct",18,"type")="addr"
+	Set gtmtypfldindx("d_socket_struct","iod")=18
+	Set gtmtypes("d_socket_struct",19,"name")="d_socket_struct.gtm_socket"
+	Set gtmtypes("d_socket_struct",19,"off")=88
+	Set gtmtypes("d_socket_struct",19,"len")=8
+	Set gtmtypes("d_socket_struct",19,"type")="addr"
+	Set gtmtypfldindx("d_socket_struct","gtm_socket")=19
 	;
 	Set gtmtypes("d_tt_struct")="struct"
 	Set gtmtypes("d_tt_struct",0)=48
@@ -3873,6 +3938,25 @@ Init
 	Set gtmtypes("dev_dispatch_struct",16,"type")="addr"
 	Set gtmtypfldindx("dev_dispatch_struct","dlr_zkey")=16
 	;
+	Set gtmtypes("dio_buff_t")="struct"
+	Set gtmtypes("dio_buff_t",0)=3
+	Set gtmtypes("dio_buff_t","len")=24
+	Set gtmtypes("dio_buff_t",1,"name")="dio_buff_t.unaligned_size"
+	Set gtmtypes("dio_buff_t",1,"off")=0
+	Set gtmtypes("dio_buff_t",1,"len")=4
+	Set gtmtypes("dio_buff_t",1,"type")="int"
+	Set gtmtypfldindx("dio_buff_t","unaligned_size")=1
+	Set gtmtypes("dio_buff_t",2,"name")="dio_buff_t.unaligned"
+	Set gtmtypes("dio_buff_t",2,"off")=8
+	Set gtmtypes("dio_buff_t",2,"len")=8
+	Set gtmtypes("dio_buff_t",2,"type")="addr"
+	Set gtmtypfldindx("dio_buff_t","unaligned")=2
+	Set gtmtypes("dio_buff_t",3,"name")="dio_buff_t.aligned"
+	Set gtmtypes("dio_buff_t",3,"off")=16
+	Set gtmtypes("dio_buff_t",3,"len")=8
+	Set gtmtypes("dio_buff_t",3,"type")="addr"
+	Set gtmtypfldindx("dio_buff_t","aligned")=3
+	;
 	Set gtmtypes("dollar_ecode_struct")="struct"
 	Set gtmtypes("dollar_ecode_struct",0)=4
 	Set gtmtypes("dollar_ecode_struct","len")=16
@@ -4088,6 +4172,70 @@ Init
 	Set gtmtypes("dskread_trace",5,"type")="unsigned-int"
 	Set gtmtypfldindx("dskread_trace","cycle")=5
 	;
+	Set gtmtypes("emit_base_info_struct")="struct"
+	Set gtmtypes("emit_base_info_struct",0)=12
+	Set gtmtypes("emit_base_info_struct","len")=16
+	Set gtmtypes("emit_base_info_struct",1,"name")="emit_base_info_struct.modrm_byte"
+	Set gtmtypes("emit_base_info_struct",1,"off")=0
+	Set gtmtypes("emit_base_info_struct",1,"len")=1
+	Set gtmtypes("emit_base_info_struct",1,"type")="modrm_byte_type"
+	Set gtmtypfldindx("emit_base_info_struct","modrm_byte")=1
+	Set gtmtypes("emit_base_info_struct",2,"name")="emit_base_info_struct.modrm_byte.modrm"
+	Set gtmtypes("emit_base_info_struct",2,"off")=0
+	Set gtmtypes("emit_base_info_struct",2,"len")=1
+	Set gtmtypes("emit_base_info_struct",2,"type")="ModR_M"
+	Set gtmtypfldindx("emit_base_info_struct","modrm_byte.modrm")=2
+	Set gtmtypes("emit_base_info_struct",3,"name")="emit_base_info_struct.modrm_byte.byte"
+	Set gtmtypes("emit_base_info_struct",3,"off")=0
+	Set gtmtypes("emit_base_info_struct",3,"len")=1
+	Set gtmtypes("emit_base_info_struct",3,"type")="unsigned-char"
+	Set gtmtypfldindx("emit_base_info_struct","modrm_byte.byte")=3
+	Set gtmtypes("emit_base_info_struct",4,"name")="emit_base_info_struct.sib_byte"
+	Set gtmtypes("emit_base_info_struct",4,"off")=1
+	Set gtmtypes("emit_base_info_struct",4,"len")=1
+	Set gtmtypes("emit_base_info_struct",4,"type")="sib_byte_type"
+	Set gtmtypfldindx("emit_base_info_struct","sib_byte")=4
+	Set gtmtypes("emit_base_info_struct",5,"name")="emit_base_info_struct.sib_byte.sib"
+	Set gtmtypes("emit_base_info_struct",5,"off")=1
+	Set gtmtypes("emit_base_info_struct",5,"len")=1
+	Set gtmtypes("emit_base_info_struct",5,"type")="SIB"
+	Set gtmtypfldindx("emit_base_info_struct","sib_byte.sib")=5
+	Set gtmtypes("emit_base_info_struct",6,"name")="emit_base_info_struct.sib_byte.byte"
+	Set gtmtypes("emit_base_info_struct",6,"off")=1
+	Set gtmtypes("emit_base_info_struct",6,"len")=1
+	Set gtmtypes("emit_base_info_struct",6,"type")="unsigned-char"
+	Set gtmtypfldindx("emit_base_info_struct","sib_byte.byte")=6
+	Set gtmtypes("emit_base_info_struct",7,"name")="emit_base_info_struct.rex"
+	Set gtmtypes("emit_base_info_struct",7,"off")=2
+	Set gtmtypes("emit_base_info_struct",7,"len")=1
+	Set gtmtypes("emit_base_info_struct",7,"type")="char"
+	Set gtmtypfldindx("emit_base_info_struct","rex")=7
+	Set gtmtypes("emit_base_info_struct",8,"name")="emit_base_info_struct.offset8"
+	Set gtmtypes("emit_base_info_struct",8,"off")=3
+	Set gtmtypes("emit_base_info_struct",8,"len")=1
+	Set gtmtypes("emit_base_info_struct",8,"type")="char"
+	Set gtmtypfldindx("emit_base_info_struct","offset8")=8
+	Set gtmtypes("emit_base_info_struct",9,"name")="emit_base_info_struct.flags"
+	Set gtmtypes("emit_base_info_struct",9,"off")=4
+	Set gtmtypes("emit_base_info_struct",9,"len")=1
+	Set gtmtypes("emit_base_info_struct",9,"type")="struct"
+	Set gtmtypfldindx("emit_base_info_struct","flags")=9
+	Set gtmtypes("emit_base_info_struct",10,"name")="emit_base_info_struct.filler"
+	Set gtmtypes("emit_base_info_struct",10,"off")=5
+	Set gtmtypes("emit_base_info_struct",10,"len")=1
+	Set gtmtypes("emit_base_info_struct",10,"type")="char"
+	Set gtmtypfldindx("emit_base_info_struct","filler")=10
+	Set gtmtypes("emit_base_info_struct",11,"name")="emit_base_info_struct.offset32"
+	Set gtmtypes("emit_base_info_struct",11,"off")=8
+	Set gtmtypes("emit_base_info_struct",11,"len")=4
+	Set gtmtypes("emit_base_info_struct",11,"type")="int"
+	Set gtmtypfldindx("emit_base_info_struct","offset32")=11
+	Set gtmtypes("emit_base_info_struct",12,"name")="emit_base_info_struct.imm32"
+	Set gtmtypes("emit_base_info_struct",12,"off")=12
+	Set gtmtypes("emit_base_info_struct",12,"len")=4
+	Set gtmtypes("emit_base_info_struct",12,"type")="int"
+	Set gtmtypfldindx("emit_base_info_struct","imm32")=12
+	;
 	Set gtmtypes("enc_handles")="struct"
 	Set gtmtypes("enc_handles",0)=2
 	Set gtmtypes("enc_handles","len")=16
@@ -4261,7 +4409,7 @@ Init
 	Set gtmtypfldindx("fdinfo_t","is_db")=2
 	;
 	Set gtmtypes("file_control")="struct"
-	Set gtmtypes("file_control",0)=6
+	Set gtmtypes("file_control",0)=5
 	Set gtmtypes("file_control","len")=40
 	Set gtmtypes("file_control",1,"name")="file_control.op_buff"
 	Set gtmtypes("file_control",1,"off")=0
@@ -4283,16 +4431,11 @@ Init
 	Set gtmtypes("file_control",4,"len")=8
 	Set gtmtypes("file_control",4,"type")="addr"
 	Set gtmtypfldindx("file_control","file_info")=4
-	Set gtmtypes("file_control",5,"name")="file_control.file_type"
+	Set gtmtypes("file_control",5,"name")="file_control.op"
 	Set gtmtypes("file_control",5,"off")=32
 	Set gtmtypes("file_control",5,"len")=1
 	Set gtmtypes("file_control",5,"type")="char"
-	Set gtmtypfldindx("file_control","file_type")=5
-	Set gtmtypes("file_control",6,"name")="file_control.op"
-	Set gtmtypes("file_control",6,"off")=33
-	Set gtmtypes("file_control",6,"len")=1
-	Set gtmtypes("file_control",6,"type")="char"
-	Set gtmtypfldindx("file_control","op")=6
+	Set gtmtypfldindx("file_control","op")=5
 	;
 	Set gtmtypes("file_info")="struct"
 	Set gtmtypes("file_info",0)=5
@@ -4663,7 +4806,7 @@ Init
 	Set gtmtypes("gcall_args",6,"dim")=32
 	;
 	Set gtmtypes("gd_addr")="struct"
-	Set gtmtypes("gd_addr",0)=17
+	Set gtmtypes("gd_addr",0)=20
 	Set gtmtypes("gd_addr","len")=112
 	Set gtmtypes("gd_addr",1,"name")="gd_addr.local_locks"
 	Set gtmtypes("gd_addr",1,"off")=0
@@ -4745,11 +4888,26 @@ Init
 	Set gtmtypes("gd_addr",16,"len")=4
 	Set gtmtypes("gd_addr",16,"type")="unsigned-int"
 	Set gtmtypfldindx("gd_addr","has_span_gbls")=16
-	Set gtmtypes("gd_addr",17,"name")="gd_addr.filler"
+	Set gtmtypes("gd_addr",17,"name")="gd_addr.ygs_map_entry_changed"
 	Set gtmtypes("gd_addr",17,"off")=100
-	Set gtmtypes("gd_addr",17,"len")=12
+	Set gtmtypes("gd_addr",17,"len")=1
 	Set gtmtypes("gd_addr",17,"type")="char"
-	Set gtmtypfldindx("gd_addr","filler")=17
+	Set gtmtypfldindx("gd_addr","ygs_map_entry_changed")=17
+	Set gtmtypes("gd_addr",18,"name")="gd_addr.is_dummy_gbldir"
+	Set gtmtypes("gd_addr",18,"off")=101
+	Set gtmtypes("gd_addr",18,"len")=1
+	Set gtmtypes("gd_addr",18,"type")="char"
+	Set gtmtypfldindx("gd_addr","is_dummy_gbldir")=18
+	Set gtmtypes("gd_addr",19,"name")="gd_addr.filler"
+	Set gtmtypes("gd_addr",19,"off")=102
+	Set gtmtypes("gd_addr",19,"len")=2
+	Set gtmtypes("gd_addr",19,"type")="char"
+	Set gtmtypfldindx("gd_addr","filler")=19
+	Set gtmtypes("gd_addr",20,"name")="gd_addr.thread_gdi"
+	Set gtmtypes("gd_addr",20,"off")=104
+	Set gtmtypes("gd_addr",20,"len")=8
+	Set gtmtypes("gd_addr",20,"type")="addr"
+	Set gtmtypfldindx("gd_addr","thread_gdi")=20
 	;
 	Set gtmtypes("gd_binding")="struct"
 	Set gtmtypes("gd_binding",0)=8
@@ -4815,8 +4973,8 @@ Init
 	Set gtmtypfldindx("gd_gblname","ver")=3
 	;
 	Set gtmtypes("gd_region")="struct"
-	Set gtmtypes("gd_region",0)=38
-	Set gtmtypes("gd_region","len")=384
+	Set gtmtypes("gd_region",0)=44
+	Set gtmtypes("gd_region","len")=424
 	Set gtmtypes("gd_region",1,"name")="gd_region.rname_len"
 	Set gtmtypes("gd_region",1,"off")=0
 	Set gtmtypes("gd_region",1,"len")=2
@@ -4997,16 +5155,46 @@ Init
 	Set gtmtypes("gd_region",36,"len")=4
 	Set gtmtypes("gd_region",36,"type")="unsigned-int"
 	Set gtmtypfldindx("gd_region","is_spanned")=36
-	Set gtmtypes("gd_region",37,"name")="gd_region.epoch_taper"
+	Set gtmtypes("gd_region",37,"name")="gd_region.statsDB_reg_index"
 	Set gtmtypes("gd_region",37,"off")=368
-	Set gtmtypes("gd_region",37,"len")=1
-	Set gtmtypes("gd_region",37,"type")="char"
-	Set gtmtypfldindx("gd_region","epoch_taper")=37
-	Set gtmtypes("gd_region",38,"name")="gd_region.filler"
-	Set gtmtypes("gd_region",38,"off")=369
-	Set gtmtypes("gd_region",38,"len")=11
+	Set gtmtypes("gd_region",37,"len")=4
+	Set gtmtypes("gd_region",37,"type")="unsigned-int"
+	Set gtmtypfldindx("gd_region","statsDB_reg_index")=37
+	Set gtmtypes("gd_region",38,"name")="gd_region.epoch_taper"
+	Set gtmtypes("gd_region",38,"off")=372
+	Set gtmtypes("gd_region",38,"len")=1
 	Set gtmtypes("gd_region",38,"type")="char"
-	Set gtmtypfldindx("gd_region","filler")=38
+	Set gtmtypfldindx("gd_region","epoch_taper")=38
+	Set gtmtypes("gd_region",39,"name")="gd_region.reservedDBFlags"
+	Set gtmtypes("gd_region",39,"off")=373
+	Set gtmtypes("gd_region",39,"len")=1
+	Set gtmtypes("gd_region",39,"type")="char"
+	Set gtmtypfldindx("gd_region","reservedDBFlags")=39
+	Set gtmtypes("gd_region",40,"name")="gd_region.lock_crit_with_db"
+	Set gtmtypes("gd_region",40,"off")=374
+	Set gtmtypes("gd_region",40,"len")=1
+	Set gtmtypes("gd_region",40,"type")="char"
+	Set gtmtypfldindx("gd_region","lock_crit_with_db")=40
+	Set gtmtypes("gd_region",41,"name")="gd_region.statsDB_setup_started"
+	Set gtmtypes("gd_region",41,"off")=375
+	Set gtmtypes("gd_region",41,"len")=1
+	Set gtmtypes("gd_region",41,"type")="char"
+	Set gtmtypfldindx("gd_region","statsDB_setup_started")=41
+	Set gtmtypes("gd_region",42,"name")="gd_region.owning_gd"
+	Set gtmtypes("gd_region",42,"off")=376
+	Set gtmtypes("gd_region",42,"len")=8
+	Set gtmtypes("gd_region",42,"type")="addr"
+	Set gtmtypfldindx("gd_region","owning_gd")=42
+	Set gtmtypes("gd_region",43,"name")="gd_region.statsDB_setup_completed"
+	Set gtmtypes("gd_region",43,"off")=384
+	Set gtmtypes("gd_region",43,"len")=1
+	Set gtmtypes("gd_region",43,"type")="char"
+	Set gtmtypfldindx("gd_region","statsDB_setup_completed")=43
+	Set gtmtypes("gd_region",44,"name")="gd_region.filler"
+	Set gtmtypes("gd_region",44,"off")=385
+	Set gtmtypes("gd_region",44,"len")=39
+	Set gtmtypes("gd_region",44,"type")="char"
+	Set gtmtypfldindx("gd_region","filler")=44
 	;
 	Set gtmtypes("gd_seg_addr")="union"
 	Set gtmtypes("gd_seg_addr",0)=2
@@ -5023,7 +5211,7 @@ Init
 	Set gtmtypfldindx("gd_seg_addr","addr")=2
 	;
 	Set gtmtypes("gd_segment")="struct"
-	Set gtmtypes("gd_segment",0)=23
+	Set gtmtypes("gd_segment",0)=24
 	Set gtmtypes("gd_segment","len")=384
 	Set gtmtypes("gd_segment",1,"name")="gd_segment.sname_len"
 	Set gtmtypes("gd_segment",1,"off")=0
@@ -5135,11 +5323,16 @@ Init
 	Set gtmtypes("gd_segment",22,"len")=4
 	Set gtmtypes("gd_segment",22,"type")="unsigned-int"
 	Set gtmtypfldindx("gd_segment","is_encrypted")=22
-	Set gtmtypes("gd_segment",23,"name")="gd_segment.filler"
+	Set gtmtypes("gd_segment",23,"name")="gd_segment.asyncio"
 	Set gtmtypes("gd_segment",23,"off")=364
-	Set gtmtypes("gd_segment",23,"len")=16
-	Set gtmtypes("gd_segment",23,"type")="char"
-	Set gtmtypfldindx("gd_segment","filler")=23
+	Set gtmtypes("gd_segment",23,"len")=4
+	Set gtmtypes("gd_segment",23,"type")="boolean_t"
+	Set gtmtypfldindx("gd_segment","asyncio")=23
+	Set gtmtypes("gd_segment",24,"name")="gd_segment.filler"
+	Set gtmtypes("gd_segment",24,"off")=368
+	Set gtmtypes("gd_segment",24,"len")=16
+	Set gtmtypes("gd_segment",24,"type")="char"
+	Set gtmtypfldindx("gd_segment","filler")=24
 	;
 	Set gtmtypes("gdr_name")="struct"
 	Set gtmtypes("gdr_name",0)=10
@@ -6350,8 +6543,8 @@ Init
 	Set gtmtypfldindx("gtmrecv_options_t","autorollback_verbose")=29
 	;
 	Set gtmtypes("gtmsecshr_mesg")="struct"
-	Set gtmtypes("gtmsecshr_mesg",0)=15
-	Set gtmtypes("gtmsecshr_mesg","len")=4152
+	Set gtmtypes("gtmsecshr_mesg",0)=16
+	Set gtmtypes("gtmsecshr_mesg","len")=4160
 	Set gtmtypes("gtmsecshr_mesg",1,"name")="gtmsecshr_mesg.code"
 	Set gtmtypes("gtmsecshr_mesg",1,"off")=0
 	Set gtmtypes("gtmsecshr_mesg",1,"len")=4
@@ -6379,7 +6572,7 @@ Init
 	Set gtmtypfldindx("gtmsecshr_mesg","seqno")=5
 	Set gtmtypes("gtmsecshr_mesg",6,"name")="gtmsecshr_mesg.mesg"
 	Set gtmtypes("gtmsecshr_mesg",6,"off")=24
-	Set gtmtypes("gtmsecshr_mesg",6,"len")=4128
+	Set gtmtypes("gtmsecshr_mesg",6,"len")=4136
 	Set gtmtypes("gtmsecshr_mesg",6,"type")="union"
 	Set gtmtypfldindx("gtmsecshr_mesg","mesg")=6
 	Set gtmtypes("gtmsecshr_mesg",7,"name")="gtmsecshr_mesg.mesg.id"
@@ -6394,39 +6587,44 @@ Init
 	Set gtmtypfldindx("gtmsecshr_mesg","mesg.path")=8
 	Set gtmtypes("gtmsecshr_mesg",9,"name")="gtmsecshr_mesg.mesg.db_ipcs"
 	Set gtmtypes("gtmsecshr_mesg",9,"off")=24
-	Set gtmtypes("gtmsecshr_mesg",9,"len")=4128
+	Set gtmtypes("gtmsecshr_mesg",9,"len")=4136
 	Set gtmtypes("gtmsecshr_mesg",9,"type")="ipcs_mesg"
 	Set gtmtypfldindx("gtmsecshr_mesg","mesg.db_ipcs")=9
-	Set gtmtypes("gtmsecshr_mesg",10,"name")="gtmsecshr_mesg.mesg.db_ipcs.semid"
+	Set gtmtypes("gtmsecshr_mesg",10,"name")="gtmsecshr_mesg.mesg.db_ipcs.open_fd_with_o_direct"
 	Set gtmtypes("gtmsecshr_mesg",10,"off")=24
 	Set gtmtypes("gtmsecshr_mesg",10,"len")=4
-	Set gtmtypes("gtmsecshr_mesg",10,"type")="int"
-	Set gtmtypfldindx("gtmsecshr_mesg","mesg.db_ipcs.semid")=10
-	Set gtmtypes("gtmsecshr_mesg",11,"name")="gtmsecshr_mesg.mesg.db_ipcs.shmid"
+	Set gtmtypes("gtmsecshr_mesg",10,"type")="boolean_t"
+	Set gtmtypfldindx("gtmsecshr_mesg","mesg.db_ipcs.open_fd_with_o_direct")=10
+	Set gtmtypes("gtmsecshr_mesg",11,"name")="gtmsecshr_mesg.mesg.db_ipcs.semid"
 	Set gtmtypes("gtmsecshr_mesg",11,"off")=28
 	Set gtmtypes("gtmsecshr_mesg",11,"len")=4
 	Set gtmtypes("gtmsecshr_mesg",11,"type")="int"
-	Set gtmtypfldindx("gtmsecshr_mesg","mesg.db_ipcs.shmid")=11
-	Set gtmtypes("gtmsecshr_mesg",12,"name")="gtmsecshr_mesg.mesg.db_ipcs.gt_sem_ctime"
+	Set gtmtypfldindx("gtmsecshr_mesg","mesg.db_ipcs.semid")=11
+	Set gtmtypes("gtmsecshr_mesg",12,"name")="gtmsecshr_mesg.mesg.db_ipcs.shmid"
 	Set gtmtypes("gtmsecshr_mesg",12,"off")=32
-	Set gtmtypes("gtmsecshr_mesg",12,"len")=8
-	Set gtmtypes("gtmsecshr_mesg",12,"type")="time_t"
-	Set gtmtypfldindx("gtmsecshr_mesg","mesg.db_ipcs.gt_sem_ctime")=12
-	Set gtmtypes("gtmsecshr_mesg",13,"name")="gtmsecshr_mesg.mesg.db_ipcs.gt_shm_ctime"
+	Set gtmtypes("gtmsecshr_mesg",12,"len")=4
+	Set gtmtypes("gtmsecshr_mesg",12,"type")="int"
+	Set gtmtypfldindx("gtmsecshr_mesg","mesg.db_ipcs.shmid")=12
+	Set gtmtypes("gtmsecshr_mesg",13,"name")="gtmsecshr_mesg.mesg.db_ipcs.gt_sem_ctime"
 	Set gtmtypes("gtmsecshr_mesg",13,"off")=40
 	Set gtmtypes("gtmsecshr_mesg",13,"len")=8
 	Set gtmtypes("gtmsecshr_mesg",13,"type")="time_t"
-	Set gtmtypfldindx("gtmsecshr_mesg","mesg.db_ipcs.gt_shm_ctime")=13
-	Set gtmtypes("gtmsecshr_mesg",14,"name")="gtmsecshr_mesg.mesg.db_ipcs.fn_len"
+	Set gtmtypfldindx("gtmsecshr_mesg","mesg.db_ipcs.gt_sem_ctime")=13
+	Set gtmtypes("gtmsecshr_mesg",14,"name")="gtmsecshr_mesg.mesg.db_ipcs.gt_shm_ctime"
 	Set gtmtypes("gtmsecshr_mesg",14,"off")=48
-	Set gtmtypes("gtmsecshr_mesg",14,"len")=4
-	Set gtmtypes("gtmsecshr_mesg",14,"type")="unsigned-int"
-	Set gtmtypfldindx("gtmsecshr_mesg","mesg.db_ipcs.fn_len")=14
-	Set gtmtypes("gtmsecshr_mesg",15,"name")="gtmsecshr_mesg.mesg.db_ipcs.fn"
-	Set gtmtypes("gtmsecshr_mesg",15,"off")=52
-	Set gtmtypes("gtmsecshr_mesg",15,"len")=4097
-	Set gtmtypes("gtmsecshr_mesg",15,"type")="char"
-	Set gtmtypfldindx("gtmsecshr_mesg","mesg.db_ipcs.fn")=15
+	Set gtmtypes("gtmsecshr_mesg",14,"len")=8
+	Set gtmtypes("gtmsecshr_mesg",14,"type")="time_t"
+	Set gtmtypfldindx("gtmsecshr_mesg","mesg.db_ipcs.gt_shm_ctime")=14
+	Set gtmtypes("gtmsecshr_mesg",15,"name")="gtmsecshr_mesg.mesg.db_ipcs.fn_len"
+	Set gtmtypes("gtmsecshr_mesg",15,"off")=56
+	Set gtmtypes("gtmsecshr_mesg",15,"len")=4
+	Set gtmtypes("gtmsecshr_mesg",15,"type")="unsigned-int"
+	Set gtmtypfldindx("gtmsecshr_mesg","mesg.db_ipcs.fn_len")=15
+	Set gtmtypes("gtmsecshr_mesg",16,"name")="gtmsecshr_mesg.mesg.db_ipcs.fn"
+	Set gtmtypes("gtmsecshr_mesg",16,"off")=60
+	Set gtmtypes("gtmsecshr_mesg",16,"len")=4097
+	Set gtmtypes("gtmsecshr_mesg",16,"type")="char"
+	Set gtmtypfldindx("gtmsecshr_mesg","mesg.db_ipcs.fn")=16
 	;
 	Set gtmtypes("gtmsiginfo_t")="struct"
 	Set gtmtypes("gtmsiginfo_t",0)=8
@@ -6970,6 +7168,22 @@ Init
 	Set gtmtypes("gv_key",4,"type")="unsigned-char"
 	Set gtmtypfldindx("gv_key","base")=4
 	;
+	Set gtmtypes("gv_name_and_subscripts")="union"
+	Set gtmtypes("gv_name_and_subscripts",0)=2
+	Set gtmtypes("gv_name_and_subscripts","len")=140
+	Set gtmtypes("gv_name_and_subscripts",1,"name")="gv_name_and_subscripts.lv"
+	Set gtmtypes("gv_name_and_subscripts",1,"off")=0
+	Set gtmtypes("gv_name_and_subscripts",1,"len")=140
+	Set gtmtypes("gv_name_and_subscripts",1,"type")="int"
+	Set gtmtypfldindx("gv_name_and_subscripts","lv")=1
+	Set gtmtypes("gv_name_and_subscripts",1,"dim")=35
+	Set gtmtypes("gv_name_and_subscripts",2,"name")="gv_name_and_subscripts.gv"
+	Set gtmtypes("gv_name_and_subscripts",2,"off")=0
+	Set gtmtypes("gv_name_and_subscripts",2,"len")=140
+	Set gtmtypes("gv_name_and_subscripts",2,"type")="int"
+	Set gtmtypfldindx("gv_name_and_subscripts","gv")=2
+	Set gtmtypes("gv_name_and_subscripts",2,"dim")=35
+	;
 	Set gtmtypes("gv_namehead")="struct"
 	Set gtmtypes("gv_namehead",0)=42
 	Set gtmtypes("gv_namehead","len")=808
@@ -7519,8 +7733,8 @@ Init
 	Set gtmtypfldindx("gvsavtarg_t","end")=8
 	;
 	Set gtmtypes("gvstats_rec_t")="struct"
-	Set gtmtypes("gvstats_rec_t",0)=58
-	Set gtmtypes("gvstats_rec_t","len")=464
+	Set gtmtypes("gvstats_rec_t",0)=59
+	Set gtmtypes("gvstats_rec_t","len")=472
 	Set gtmtypes("gvstats_rec_t",1,"name")="gvstats_rec_t.n_set"
 	Set gtmtypes("gvstats_rec_t",1,"off")=0
 	Set gtmtypes("gvstats_rec_t",1,"len")=8
@@ -7811,6 +8025,11 @@ Init
 	Set gtmtypes("gvstats_rec_t",58,"len")=8
 	Set gtmtypes("gvstats_rec_t",58,"type")="uint64_t"
 	Set gtmtypfldindx("gvstats_rec_t","n_crit_yields")=58
+	Set gtmtypes("gvstats_rec_t",59,"name")="gvstats_rec_t.n_clean2dirty"
+	Set gtmtypes("gvstats_rec_t",59,"off")=464
+	Set gtmtypes("gvstats_rec_t",59,"len")=8
+	Set gtmtypes("gvstats_rec_t",59,"type")="uint64_t"
+	Set gtmtypfldindx("gvstats_rec_t","n_clean2dirty")=59
 	;
 	Set gtmtypes("gvt_container")="struct"
 	Set gtmtypes("gvt_container",0)=4
@@ -9405,38 +9624,43 @@ Init
 	Set gtmtypfldindx("iosb","dev_dep_info")=3
 	;
 	Set gtmtypes("ipcs_mesg")="struct"
-	Set gtmtypes("ipcs_mesg",0)=6
-	Set gtmtypes("ipcs_mesg","len")=4128
-	Set gtmtypes("ipcs_mesg",1,"name")="ipcs_mesg.semid"
+	Set gtmtypes("ipcs_mesg",0)=7
+	Set gtmtypes("ipcs_mesg","len")=4136
+	Set gtmtypes("ipcs_mesg",1,"name")="ipcs_mesg.open_fd_with_o_direct"
 	Set gtmtypes("ipcs_mesg",1,"off")=0
 	Set gtmtypes("ipcs_mesg",1,"len")=4
-	Set gtmtypes("ipcs_mesg",1,"type")="int"
-	Set gtmtypfldindx("ipcs_mesg","semid")=1
-	Set gtmtypes("ipcs_mesg",2,"name")="ipcs_mesg.shmid"
+	Set gtmtypes("ipcs_mesg",1,"type")="boolean_t"
+	Set gtmtypfldindx("ipcs_mesg","open_fd_with_o_direct")=1
+	Set gtmtypes("ipcs_mesg",2,"name")="ipcs_mesg.semid"
 	Set gtmtypes("ipcs_mesg",2,"off")=4
 	Set gtmtypes("ipcs_mesg",2,"len")=4
 	Set gtmtypes("ipcs_mesg",2,"type")="int"
-	Set gtmtypfldindx("ipcs_mesg","shmid")=2
-	Set gtmtypes("ipcs_mesg",3,"name")="ipcs_mesg.gt_sem_ctime"
+	Set gtmtypfldindx("ipcs_mesg","semid")=2
+	Set gtmtypes("ipcs_mesg",3,"name")="ipcs_mesg.shmid"
 	Set gtmtypes("ipcs_mesg",3,"off")=8
-	Set gtmtypes("ipcs_mesg",3,"len")=8
-	Set gtmtypes("ipcs_mesg",3,"type")="time_t"
-	Set gtmtypfldindx("ipcs_mesg","gt_sem_ctime")=3
-	Set gtmtypes("ipcs_mesg",4,"name")="ipcs_mesg.gt_shm_ctime"
+	Set gtmtypes("ipcs_mesg",3,"len")=4
+	Set gtmtypes("ipcs_mesg",3,"type")="int"
+	Set gtmtypfldindx("ipcs_mesg","shmid")=3
+	Set gtmtypes("ipcs_mesg",4,"name")="ipcs_mesg.gt_sem_ctime"
 	Set gtmtypes("ipcs_mesg",4,"off")=16
 	Set gtmtypes("ipcs_mesg",4,"len")=8
 	Set gtmtypes("ipcs_mesg",4,"type")="time_t"
-	Set gtmtypfldindx("ipcs_mesg","gt_shm_ctime")=4
-	Set gtmtypes("ipcs_mesg",5,"name")="ipcs_mesg.fn_len"
+	Set gtmtypfldindx("ipcs_mesg","gt_sem_ctime")=4
+	Set gtmtypes("ipcs_mesg",5,"name")="ipcs_mesg.gt_shm_ctime"
 	Set gtmtypes("ipcs_mesg",5,"off")=24
-	Set gtmtypes("ipcs_mesg",5,"len")=4
-	Set gtmtypes("ipcs_mesg",5,"type")="unsigned-int"
-	Set gtmtypfldindx("ipcs_mesg","fn_len")=5
-	Set gtmtypes("ipcs_mesg",6,"name")="ipcs_mesg.fn"
-	Set gtmtypes("ipcs_mesg",6,"off")=28
-	Set gtmtypes("ipcs_mesg",6,"len")=4097
-	Set gtmtypes("ipcs_mesg",6,"type")="char"
-	Set gtmtypfldindx("ipcs_mesg","fn")=6
+	Set gtmtypes("ipcs_mesg",5,"len")=8
+	Set gtmtypes("ipcs_mesg",5,"type")="time_t"
+	Set gtmtypfldindx("ipcs_mesg","gt_shm_ctime")=5
+	Set gtmtypes("ipcs_mesg",6,"name")="ipcs_mesg.fn_len"
+	Set gtmtypes("ipcs_mesg",6,"off")=32
+	Set gtmtypes("ipcs_mesg",6,"len")=4
+	Set gtmtypes("ipcs_mesg",6,"type")="unsigned-int"
+	Set gtmtypfldindx("ipcs_mesg","fn_len")=6
+	Set gtmtypes("ipcs_mesg",7,"name")="ipcs_mesg.fn"
+	Set gtmtypes("ipcs_mesg",7,"off")=36
+	Set gtmtypes("ipcs_mesg",7,"len")=4097
+	Set gtmtypes("ipcs_mesg",7,"type")="char"
+	Set gtmtypfldindx("ipcs_mesg","fn")=7
 	;
 	Set gtmtypes("jext_heap_elem_t")="struct"
 	Set gtmtypes("jext_heap_elem_t",0)=2
@@ -10216,7 +10440,7 @@ Init
 	Set gtmtypfldindx("jnl_fence_control","strm_seqno")=4
 	;
 	Set gtmtypes("jnl_file_header")="struct"
-	Set gtmtypes("jnl_file_header",0)=66
+	Set gtmtypes("jnl_file_header",0)=67
 	Set gtmtypes("jnl_file_header","len")=2048
 	Set gtmtypes("jnl_file_header",1,"name")="jnl_file_header.label"
 	Set gtmtypes("jnl_file_header",1,"off")=0
@@ -10545,11 +10769,16 @@ Init
 	Set gtmtypes("jnl_file_header",65,"len")=4
 	Set gtmtypes("jnl_file_header",65,"type")="boolean_t"
 	Set gtmtypfldindx("jnl_file_header","last_eof_written")=65
-	Set gtmtypes("jnl_file_header",66,"name")="jnl_file_header.filler"
+	Set gtmtypes("jnl_file_header",66,"name")="jnl_file_header.is_not_latest_jnl"
 	Set gtmtypes("jnl_file_header",66,"off")=1612
-	Set gtmtypes("jnl_file_header",66,"len")=436
-	Set gtmtypes("jnl_file_header",66,"type")="char"
-	Set gtmtypfldindx("jnl_file_header","filler")=66
+	Set gtmtypes("jnl_file_header",66,"len")=4
+	Set gtmtypes("jnl_file_header",66,"type")="boolean_t"
+	Set gtmtypfldindx("jnl_file_header","is_not_latest_jnl")=66
+	Set gtmtypes("jnl_file_header",67,"name")="jnl_file_header.filler"
+	Set gtmtypes("jnl_file_header",67,"off")=1616
+	Set gtmtypes("jnl_file_header",67,"len")=432
+	Set gtmtypes("jnl_file_header",67,"type")="char"
+	Set gtmtypfldindx("jnl_file_header","filler")=67
 	;
 	Set gtmtypes("jnl_format_buffer")="struct"
 	Set gtmtypes("jnl_format_buffer",0)=14
@@ -10735,8 +10964,8 @@ Init
 	Set gtmtypfldindx("jnl_gbls_t","mur_update")=21
 	;
 	Set gtmtypes("jnl_private_control")="struct"
-	Set gtmtypes("jnl_private_control",0)=23
-	Set gtmtypes("jnl_private_control","len")=120
+	Set gtmtypes("jnl_private_control",0)=24
+	Set gtmtypes("jnl_private_control","len")=128
 	Set gtmtypes("jnl_private_control",1,"name")="jnl_private_control.jnl_buff"
 	Set gtmtypes("jnl_private_control",1,"off")=0
 	Set gtmtypes("jnl_private_control",1,"len")=8
@@ -10852,6 +11081,11 @@ Init
 	Set gtmtypes("jnl_private_control",23,"len")=4
 	Set gtmtypes("jnl_private_control",23,"type")="unsigned-int"
 	Set gtmtypfldindx("jnl_private_control","cycle")=23
+	Set gtmtypes("jnl_private_control",24,"name")="jnl_private_control.err_str"
+	Set gtmtypes("jnl_private_control",24,"off")=120
+	Set gtmtypes("jnl_private_control",24,"len")=8
+	Set gtmtypes("jnl_private_control",24,"type")="addr"
+	Set gtmtypfldindx("jnl_private_control","err_str")=24
 	;
 	Set gtmtypes("jnl_process_vector")="struct"
 	Set gtmtypes("jnl_process_vector",0)=10
@@ -13199,8 +13433,8 @@ Init
 	Set gtmtypfldindx("mline","table")=6
 	;
 	Set gtmtypes("mliteral")="struct"
-	Set gtmtypes("mliteral",0)=10
-	Set gtmtypes("mliteral","len")=56
+	Set gtmtypes("mliteral",0)=11
+	Set gtmtypes("mliteral","len")=64
 	Set gtmtypes("mliteral",1,"name")="mliteral.que"
 	Set gtmtypes("mliteral",1,"off")=0
 	Set gtmtypes("mliteral",1,"len")=16
@@ -13221,37 +13455,42 @@ Init
 	Set gtmtypes("mliteral",4,"len")=8
 	Set gtmtypes("mliteral",4,"type")="intptr_t"
 	Set gtmtypfldindx("mliteral","rt_addr")=4
-	Set gtmtypes("mliteral",5,"name")="mliteral.v"
+	Set gtmtypes("mliteral",5,"name")="mliteral.reference_count"
 	Set gtmtypes("mliteral",5,"off")=24
-	Set gtmtypes("mliteral",5,"len")=32
-	Set gtmtypes("mliteral",5,"type")="mval"
-	Set gtmtypfldindx("mliteral","v")=5
-	Set gtmtypes("mliteral",6,"name")="mliteral.v.mvtype"
-	Set gtmtypes("mliteral",6,"off")=24
-	Set gtmtypes("mliteral",6,"len")=2
-	Set gtmtypes("mliteral",6,"type")="unsigned-short"
-	Set gtmtypfldindx("mliteral","v.mvtype")=6
-	Set gtmtypes("mliteral",7,"name")="mliteral.v.fnpc_indx"
-	Set gtmtypes("mliteral",7,"off")=27
-	Set gtmtypes("mliteral",7,"len")=1
-	Set gtmtypes("mliteral",7,"type")="unsigned-char"
-	Set gtmtypfldindx("mliteral","v.fnpc_indx")=7
-	Set gtmtypes("mliteral",8,"name")="mliteral.v.utfcgr_indx"
-	Set gtmtypes("mliteral",8,"off")=28
-	Set gtmtypes("mliteral",8,"len")=4
-	Set gtmtypes("mliteral",8,"type")="unsigned-int"
-	Set gtmtypfldindx("mliteral","v.utfcgr_indx")=8
-	Set gtmtypes("mliteral",9,"name")="mliteral.v.m"
-	Set gtmtypes("mliteral",9,"off")=32
-	Set gtmtypes("mliteral",9,"len")=8
-	Set gtmtypes("mliteral",9,"type")="int"
-	Set gtmtypfldindx("mliteral","v.m")=9
-	Set gtmtypes("mliteral",9,"dim")=2
-	Set gtmtypes("mliteral",10,"name")="mliteral.v.str"
+	Set gtmtypes("mliteral",5,"len")=4
+	Set gtmtypes("mliteral",5,"type")="int"
+	Set gtmtypfldindx("mliteral","reference_count")=5
+	Set gtmtypes("mliteral",6,"name")="mliteral.v"
+	Set gtmtypes("mliteral",6,"off")=32
+	Set gtmtypes("mliteral",6,"len")=32
+	Set gtmtypes("mliteral",6,"type")="mval"
+	Set gtmtypfldindx("mliteral","v")=6
+	Set gtmtypes("mliteral",7,"name")="mliteral.v.mvtype"
+	Set gtmtypes("mliteral",7,"off")=32
+	Set gtmtypes("mliteral",7,"len")=2
+	Set gtmtypes("mliteral",7,"type")="unsigned-short"
+	Set gtmtypfldindx("mliteral","v.mvtype")=7
+	Set gtmtypes("mliteral",8,"name")="mliteral.v.fnpc_indx"
+	Set gtmtypes("mliteral",8,"off")=35
+	Set gtmtypes("mliteral",8,"len")=1
+	Set gtmtypes("mliteral",8,"type")="unsigned-char"
+	Set gtmtypfldindx("mliteral","v.fnpc_indx")=8
+	Set gtmtypes("mliteral",9,"name")="mliteral.v.utfcgr_indx"
+	Set gtmtypes("mliteral",9,"off")=36
+	Set gtmtypes("mliteral",9,"len")=4
+	Set gtmtypes("mliteral",9,"type")="unsigned-int"
+	Set gtmtypfldindx("mliteral","v.utfcgr_indx")=9
+	Set gtmtypes("mliteral",10,"name")="mliteral.v.m"
 	Set gtmtypes("mliteral",10,"off")=40
-	Set gtmtypes("mliteral",10,"len")=16
-	Set gtmtypes("mliteral",10,"type")="mstr"
-	Set gtmtypfldindx("mliteral","v.str")=10
+	Set gtmtypes("mliteral",10,"len")=8
+	Set gtmtypes("mliteral",10,"type")="int"
+	Set gtmtypfldindx("mliteral","v.m")=10
+	Set gtmtypes("mliteral",10,"dim")=2
+	Set gtmtypes("mliteral",11,"name")="mliteral.v.str"
+	Set gtmtypes("mliteral",11,"off")=48
+	Set gtmtypes("mliteral",11,"len")=16
+	Set gtmtypes("mliteral",11,"type")="mstr"
+	Set gtmtypfldindx("mliteral","v.str")=11
 	;
 	Set gtmtypes("mlk_ctldata")="struct"
 	Set gtmtypes("mlk_ctldata",0)=12
@@ -13582,10 +13821,10 @@ Init
 	;
 	Set gtmtypes("modrm_byte_type")="union"
 	Set gtmtypes("modrm_byte_type",0)=2
-	Set gtmtypes("modrm_byte_type","len")=4
+	Set gtmtypes("modrm_byte_type","len")=1
 	Set gtmtypes("modrm_byte_type",1,"name")="modrm_byte_type.modrm"
 	Set gtmtypes("modrm_byte_type",1,"off")=0
-	Set gtmtypes("modrm_byte_type",1,"len")=4
+	Set gtmtypes("modrm_byte_type",1,"len")=1
 	Set gtmtypes("modrm_byte_type",1,"type")="ModR_M"
 	Set gtmtypfldindx("modrm_byte_type","modrm")=1
 	Set gtmtypes("modrm_byte_type",2,"name")="modrm_byte_type.byte"
@@ -16731,8 +16970,8 @@ Init
 	Set gtmtypfldindx("nametabent","name")=2
 	;
 	Set gtmtypes("node_local")="struct"
-	Set gtmtypes("node_local",0)=209
-	Set gtmtypes("node_local","len")=63792
+	Set gtmtypes("node_local",0)=247
+	Set gtmtypes("node_local","len")=121528
 	Set gtmtypes("node_local",1,"name")="node_local.label"
 	Set gtmtypes("node_local",1,"off")=0
 	Set gtmtypes("node_local",1,"len")=12
@@ -17004,790 +17243,981 @@ Init
 	Set gtmtypes("node_local",54,"len")=60
 	Set gtmtypes("node_local",54,"type")="char"
 	Set gtmtypfldindx("node_local","fill_cacheline9")=54
-	Set gtmtypes("node_local",55,"name")="node_local.mm_extender_pid"
+	Set gtmtypes("node_local",55,"name")="node_local.wcs_wip_lvl"
 	Set gtmtypes("node_local",55,"off")=1288
 	Set gtmtypes("node_local",55,"len")=4
 	Set gtmtypes("node_local",55,"type")="int"
-	Set gtmtypfldindx("node_local","mm_extender_pid")=55
-	Set gtmtypes("node_local",56,"name")="node_local.highest_lbm_blk_changed"
+	Set gtmtypfldindx("node_local","wcs_wip_lvl")=55
+	Set gtmtypes("node_local",56,"name")="node_local.fill_cacheline10"
 	Set gtmtypes("node_local",56,"off")=1292
-	Set gtmtypes("node_local",56,"len")=4
-	Set gtmtypes("node_local",56,"type")="int"
-	Set gtmtypfldindx("node_local","highest_lbm_blk_changed")=56
-	Set gtmtypes("node_local",57,"name")="node_local.nbb"
-	Set gtmtypes("node_local",57,"off")=1296
+	Set gtmtypes("node_local",56,"len")=60
+	Set gtmtypes("node_local",56,"type")="char"
+	Set gtmtypfldindx("node_local","fill_cacheline10")=56
+	Set gtmtypes("node_local",57,"name")="node_local.wtfini_in_prog"
+	Set gtmtypes("node_local",57,"off")=1352
 	Set gtmtypes("node_local",57,"len")=4
 	Set gtmtypes("node_local",57,"type")="int"
-	Set gtmtypfldindx("node_local","nbb")=57
-	Set gtmtypes("node_local",58,"name")="node_local.lockhist_idx"
-	Set gtmtypes("node_local",58,"off")=1300
+	Set gtmtypfldindx("node_local","wtfini_in_prog")=57
+	Set gtmtypes("node_local",58,"name")="node_local.freezer_waited_for_kip"
+	Set gtmtypes("node_local",58,"off")=1356
 	Set gtmtypes("node_local",58,"len")=4
-	Set gtmtypes("node_local",58,"type")="int"
-	Set gtmtypfldindx("node_local","lockhist_idx")=58
-	Set gtmtypes("node_local",59,"name")="node_local.crit_ops_index"
-	Set gtmtypes("node_local",59,"off")=1304
+	Set gtmtypes("node_local",58,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","freezer_waited_for_kip")=58
+	Set gtmtypes("node_local",59,"name")="node_local.mm_extender_pid"
+	Set gtmtypes("node_local",59,"off")=1360
 	Set gtmtypes("node_local",59,"len")=4
 	Set gtmtypes("node_local",59,"type")="int"
-	Set gtmtypfldindx("node_local","crit_ops_index")=59
-	Set gtmtypes("node_local",60,"name")="node_local.dskread_ops_index"
-	Set gtmtypes("node_local",60,"off")=1308
+	Set gtmtypfldindx("node_local","mm_extender_pid")=59
+	Set gtmtypes("node_local",60,"name")="node_local.highest_lbm_blk_changed"
+	Set gtmtypes("node_local",60,"off")=1364
 	Set gtmtypes("node_local",60,"len")=4
 	Set gtmtypes("node_local",60,"type")="int"
-	Set gtmtypfldindx("node_local","dskread_ops_index")=60
-	Set gtmtypes("node_local",61,"name")="node_local.ftok_ops_index"
-	Set gtmtypes("node_local",61,"off")=1312
+	Set gtmtypfldindx("node_local","highest_lbm_blk_changed")=60
+	Set gtmtypes("node_local",61,"name")="node_local.nbb"
+	Set gtmtypes("node_local",61,"off")=1368
 	Set gtmtypes("node_local",61,"len")=4
 	Set gtmtypes("node_local",61,"type")="int"
-	Set gtmtypfldindx("node_local","ftok_ops_index")=61
-	Set gtmtypes("node_local",62,"name")="node_local.lockhists"
-	Set gtmtypes("node_local",62,"off")=1320
-	Set gtmtypes("node_local",62,"len")=16384
-	Set gtmtypes("node_local",62,"type")="lockhist"
-	Set gtmtypfldindx("node_local","lockhists")=62
-	Set gtmtypes("node_local",62,"dim")=512
-	Set gtmtypes("node_local",63,"name")="node_local.lockhists[0].lock_addr"
-	Set gtmtypes("node_local",63,"off")=1320
-	Set gtmtypes("node_local",63,"len")=8
-	Set gtmtypes("node_local",63,"type")="addr"
-	Set gtmtypfldindx("node_local","lockhists[0].lock_addr")=63
-	Set gtmtypes("node_local",64,"name")="node_local.lockhists[0].lock_callr"
-	Set gtmtypes("node_local",64,"off")=1328
-	Set gtmtypes("node_local",64,"len")=8
-	Set gtmtypes("node_local",64,"type")="caddr_t"
-	Set gtmtypfldindx("node_local","lockhists[0].lock_callr")=64
-	Set gtmtypes("node_local",65,"name")="node_local.lockhists[0].lock_pid"
-	Set gtmtypes("node_local",65,"off")=1336
+	Set gtmtypfldindx("node_local","nbb")=61
+	Set gtmtypes("node_local",62,"name")="node_local.lockhist_idx"
+	Set gtmtypes("node_local",62,"off")=1372
+	Set gtmtypes("node_local",62,"len")=4
+	Set gtmtypes("node_local",62,"type")="int"
+	Set gtmtypfldindx("node_local","lockhist_idx")=62
+	Set gtmtypes("node_local",63,"name")="node_local.crit_ops_index"
+	Set gtmtypes("node_local",63,"off")=1376
+	Set gtmtypes("node_local",63,"len")=4
+	Set gtmtypes("node_local",63,"type")="int"
+	Set gtmtypfldindx("node_local","crit_ops_index")=63
+	Set gtmtypes("node_local",64,"name")="node_local.dskread_ops_index"
+	Set gtmtypes("node_local",64,"off")=1380
+	Set gtmtypes("node_local",64,"len")=4
+	Set gtmtypes("node_local",64,"type")="int"
+	Set gtmtypfldindx("node_local","dskread_ops_index")=64
+	Set gtmtypes("node_local",65,"name")="node_local.ftok_ops_index"
+	Set gtmtypes("node_local",65,"off")=1384
 	Set gtmtypes("node_local",65,"len")=4
 	Set gtmtypes("node_local",65,"type")="int"
-	Set gtmtypfldindx("node_local","lockhists[0].lock_pid")=65
-	Set gtmtypes("node_local",66,"name")="node_local.lockhists[0].loop_cnt"
-	Set gtmtypes("node_local",66,"off")=1340
+	Set gtmtypfldindx("node_local","ftok_ops_index")=65
+	Set gtmtypes("node_local",66,"name")="node_local.wcs_ops_index"
+	Set gtmtypes("node_local",66,"off")=1388
 	Set gtmtypes("node_local",66,"len")=4
 	Set gtmtypes("node_local",66,"type")="int"
-	Set gtmtypfldindx("node_local","lockhists[0].loop_cnt")=66
-	Set gtmtypes("node_local",67,"name")="node_local.lockhists[0].lock_op"
-	Set gtmtypes("node_local",67,"off")=1344
-	Set gtmtypes("node_local",67,"len")=4
-	Set gtmtypes("node_local",67,"type")="char"
-	Set gtmtypfldindx("node_local","lockhists[0].lock_op")=67
-	Set gtmtypes("node_local",68,"name")="node_local.crit_ops_array"
-	Set gtmtypes("node_local",68,"off")=17704
-	Set gtmtypes("node_local",68,"len")=12288
-	Set gtmtypes("node_local",68,"type")="crit_trace"
-	Set gtmtypfldindx("node_local","crit_ops_array")=68
-	Set gtmtypes("node_local",68,"dim")=512
-	Set gtmtypes("node_local",69,"name")="node_local.crit_ops_array[0].call_from"
-	Set gtmtypes("node_local",69,"off")=17704
+	Set gtmtypfldindx("node_local","wcs_ops_index")=66
+	Set gtmtypes("node_local",67,"name")="node_local.lockhists"
+	Set gtmtypes("node_local",67,"off")=1392
+	Set gtmtypes("node_local",67,"len")=16384
+	Set gtmtypes("node_local",67,"type")="lockhist"
+	Set gtmtypfldindx("node_local","lockhists")=67
+	Set gtmtypes("node_local",67,"dim")=512
+	Set gtmtypes("node_local",68,"name")="node_local.lockhists[0].lock_addr"
+	Set gtmtypes("node_local",68,"off")=1392
+	Set gtmtypes("node_local",68,"len")=8
+	Set gtmtypes("node_local",68,"type")="addr"
+	Set gtmtypfldindx("node_local","lockhists[0].lock_addr")=68
+	Set gtmtypes("node_local",69,"name")="node_local.lockhists[0].lock_callr"
+	Set gtmtypes("node_local",69,"off")=1400
 	Set gtmtypes("node_local",69,"len")=8
 	Set gtmtypes("node_local",69,"type")="caddr_t"
-	Set gtmtypfldindx("node_local","crit_ops_array[0].call_from")=69
-	Set gtmtypes("node_local",70,"name")="node_local.crit_ops_array[0].crit_act"
-	Set gtmtypes("node_local",70,"off")=17712
+	Set gtmtypfldindx("node_local","lockhists[0].lock_callr")=69
+	Set gtmtypes("node_local",70,"name")="node_local.lockhists[0].lock_pid"
+	Set gtmtypes("node_local",70,"off")=1408
 	Set gtmtypes("node_local",70,"len")=4
 	Set gtmtypes("node_local",70,"type")="int"
-	Set gtmtypfldindx("node_local","crit_ops_array[0].crit_act")=70
-	Set gtmtypes("node_local",71,"name")="node_local.crit_ops_array[0].epid"
-	Set gtmtypes("node_local",71,"off")=17716
+	Set gtmtypfldindx("node_local","lockhists[0].lock_pid")=70
+	Set gtmtypes("node_local",71,"name")="node_local.lockhists[0].loop_cnt"
+	Set gtmtypes("node_local",71,"off")=1412
 	Set gtmtypes("node_local",71,"len")=4
 	Set gtmtypes("node_local",71,"type")="int"
-	Set gtmtypfldindx("node_local","crit_ops_array[0].epid")=71
-	Set gtmtypes("node_local",72,"name")="node_local.crit_ops_array[0].curr_tn"
-	Set gtmtypes("node_local",72,"off")=17720
-	Set gtmtypes("node_local",72,"len")=8
-	Set gtmtypes("node_local",72,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","crit_ops_array[0].curr_tn")=72
-	Set gtmtypes("node_local",73,"name")="node_local.dskread_ops_array"
-	Set gtmtypes("node_local",73,"off")=29992
-	Set gtmtypes("node_local",73,"len")=16384
-	Set gtmtypes("node_local",73,"type")="dskread_trace"
-	Set gtmtypfldindx("node_local","dskread_ops_array")=73
+	Set gtmtypfldindx("node_local","lockhists[0].loop_cnt")=71
+	Set gtmtypes("node_local",72,"name")="node_local.lockhists[0].lock_op"
+	Set gtmtypes("node_local",72,"off")=1416
+	Set gtmtypes("node_local",72,"len")=4
+	Set gtmtypes("node_local",72,"type")="char"
+	Set gtmtypfldindx("node_local","lockhists[0].lock_op")=72
+	Set gtmtypes("node_local",73,"name")="node_local.crit_ops_array"
+	Set gtmtypes("node_local",73,"off")=17776
+	Set gtmtypes("node_local",73,"len")=12288
+	Set gtmtypes("node_local",73,"type")="crit_trace"
+	Set gtmtypfldindx("node_local","crit_ops_array")=73
 	Set gtmtypes("node_local",73,"dim")=512
-	Set gtmtypes("node_local",74,"name")="node_local.dskread_ops_array[0].cr_off"
-	Set gtmtypes("node_local",74,"off")=29992
+	Set gtmtypes("node_local",74,"name")="node_local.crit_ops_array[0].call_from"
+	Set gtmtypes("node_local",74,"off")=17776
 	Set gtmtypes("node_local",74,"len")=8
-	Set gtmtypes("node_local",74,"type")="intptr_t"
-	Set gtmtypfldindx("node_local","dskread_ops_array[0].cr_off")=74
-	Set gtmtypes("node_local",75,"name")="node_local.dskread_ops_array[0].cr_tn"
-	Set gtmtypes("node_local",75,"off")=30000
-	Set gtmtypes("node_local",75,"len")=8
-	Set gtmtypes("node_local",75,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","dskread_ops_array[0].cr_tn")=75
-	Set gtmtypes("node_local",76,"name")="node_local.dskread_ops_array[0].process_id"
-	Set gtmtypes("node_local",76,"off")=30008
+	Set gtmtypes("node_local",74,"type")="caddr_t"
+	Set gtmtypfldindx("node_local","crit_ops_array[0].call_from")=74
+	Set gtmtypes("node_local",75,"name")="node_local.crit_ops_array[0].crit_act"
+	Set gtmtypes("node_local",75,"off")=17784
+	Set gtmtypes("node_local",75,"len")=4
+	Set gtmtypes("node_local",75,"type")="int"
+	Set gtmtypfldindx("node_local","crit_ops_array[0].crit_act")=75
+	Set gtmtypes("node_local",76,"name")="node_local.crit_ops_array[0].epid"
+	Set gtmtypes("node_local",76,"off")=17788
 	Set gtmtypes("node_local",76,"len")=4
-	Set gtmtypes("node_local",76,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","dskread_ops_array[0].process_id")=76
-	Set gtmtypes("node_local",77,"name")="node_local.dskread_ops_array[0].blk"
-	Set gtmtypes("node_local",77,"off")=30012
-	Set gtmtypes("node_local",77,"len")=4
-	Set gtmtypes("node_local",77,"type")="int"
-	Set gtmtypfldindx("node_local","dskread_ops_array[0].blk")=77
-	Set gtmtypes("node_local",78,"name")="node_local.dskread_ops_array[0].cycle"
-	Set gtmtypes("node_local",78,"off")=30016
-	Set gtmtypes("node_local",78,"len")=4
-	Set gtmtypes("node_local",78,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","dskread_ops_array[0].cycle")=78
-	Set gtmtypes("node_local",79,"name")="node_local.unique_id"
-	Set gtmtypes("node_local",79,"off")=46376
-	Set gtmtypes("node_local",79,"len")=24
-	Set gtmtypes("node_local",79,"type")="unique_file_id"
-	Set gtmtypfldindx("node_local","unique_id")=79
-	Set gtmtypes("node_local",80,"name")="node_local.unique_id.uid"
-	Set gtmtypes("node_local",80,"off")=46376
-	Set gtmtypes("node_local",80,"len")=24
-	Set gtmtypes("node_local",80,"type")="unix_file_id"
-	Set gtmtypfldindx("node_local","unique_id.uid")=80
-	Set gtmtypes("node_local",81,"name")="node_local.unique_id.file_id"
-	Set gtmtypes("node_local",81,"off")=46376
-	Set gtmtypes("node_local",81,"len")=24
-	Set gtmtypes("node_local",81,"type")="char"
-	Set gtmtypfldindx("node_local","unique_id.file_id")=81
-	Set gtmtypes("node_local",82,"name")="node_local.owner_node"
-	Set gtmtypes("node_local",82,"off")=46400
+	Set gtmtypes("node_local",76,"type")="int"
+	Set gtmtypfldindx("node_local","crit_ops_array[0].epid")=76
+	Set gtmtypes("node_local",77,"name")="node_local.crit_ops_array[0].curr_tn"
+	Set gtmtypes("node_local",77,"off")=17792
+	Set gtmtypes("node_local",77,"len")=8
+	Set gtmtypes("node_local",77,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","crit_ops_array[0].curr_tn")=77
+	Set gtmtypes("node_local",78,"name")="node_local.dskread_ops_array"
+	Set gtmtypes("node_local",78,"off")=30064
+	Set gtmtypes("node_local",78,"len")=16384
+	Set gtmtypes("node_local",78,"type")="dskread_trace"
+	Set gtmtypfldindx("node_local","dskread_ops_array")=78
+	Set gtmtypes("node_local",78,"dim")=512
+	Set gtmtypes("node_local",79,"name")="node_local.dskread_ops_array[0].cr_off"
+	Set gtmtypes("node_local",79,"off")=30064
+	Set gtmtypes("node_local",79,"len")=8
+	Set gtmtypes("node_local",79,"type")="intptr_t"
+	Set gtmtypfldindx("node_local","dskread_ops_array[0].cr_off")=79
+	Set gtmtypes("node_local",80,"name")="node_local.dskread_ops_array[0].cr_tn"
+	Set gtmtypes("node_local",80,"off")=30072
+	Set gtmtypes("node_local",80,"len")=8
+	Set gtmtypes("node_local",80,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","dskread_ops_array[0].cr_tn")=80
+	Set gtmtypes("node_local",81,"name")="node_local.dskread_ops_array[0].process_id"
+	Set gtmtypes("node_local",81,"off")=30080
+	Set gtmtypes("node_local",81,"len")=4
+	Set gtmtypes("node_local",81,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","dskread_ops_array[0].process_id")=81
+	Set gtmtypes("node_local",82,"name")="node_local.dskread_ops_array[0].blk"
+	Set gtmtypes("node_local",82,"off")=30084
 	Set gtmtypes("node_local",82,"len")=4
-	Set gtmtypes("node_local",82,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","owner_node")=82
-	Set gtmtypes("node_local",83,"name")="node_local.wcsflu_pid"
-	Set gtmtypes("node_local",83,"off")=46404
+	Set gtmtypes("node_local",82,"type")="int"
+	Set gtmtypfldindx("node_local","dskread_ops_array[0].blk")=82
+	Set gtmtypes("node_local",83,"name")="node_local.dskread_ops_array[0].cycle"
+	Set gtmtypes("node_local",83,"off")=30088
 	Set gtmtypes("node_local",83,"len")=4
-	Set gtmtypes("node_local",83,"type")="int"
-	Set gtmtypfldindx("node_local","wcsflu_pid")=83
-	Set gtmtypes("node_local",84,"name")="node_local.creation_date_time4"
-	Set gtmtypes("node_local",84,"off")=46408
-	Set gtmtypes("node_local",84,"len")=4
-	Set gtmtypes("node_local",84,"type")="int"
-	Set gtmtypfldindx("node_local","creation_date_time4")=84
-	Set gtmtypes("node_local",85,"name")="node_local.inhibit_kills"
-	Set gtmtypes("node_local",85,"off")=46412
-	Set gtmtypes("node_local",85,"len")=4
-	Set gtmtypes("node_local",85,"type")="int"
-	Set gtmtypfldindx("node_local","inhibit_kills")=85
-	Set gtmtypes("node_local",86,"name")="node_local.remove_shm"
-	Set gtmtypes("node_local",86,"off")=46416
+	Set gtmtypes("node_local",83,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","dskread_ops_array[0].cycle")=83
+	Set gtmtypes("node_local",84,"name")="node_local.wcs_ops_array"
+	Set gtmtypes("node_local",84,"off")=46448
+	Set gtmtypes("node_local",84,"len")=57344
+	Set gtmtypes("node_local",84,"type")="wcs_ops_trace_t"
+	Set gtmtypfldindx("node_local","wcs_ops_array")=84
+	Set gtmtypes("node_local",84,"dim")=1024
+	Set gtmtypes("node_local",85,"name")="node_local.wcs_ops_array[0].db_tn"
+	Set gtmtypes("node_local",85,"off")=46448
+	Set gtmtypes("node_local",85,"len")=8
+	Set gtmtypes("node_local",85,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","wcs_ops_array[0].db_tn")=85
+	Set gtmtypes("node_local",86,"name")="node_local.wcs_ops_array[0].process_id"
+	Set gtmtypes("node_local",86,"off")=46456
 	Set gtmtypes("node_local",86,"len")=4
-	Set gtmtypes("node_local",86,"type")="boolean_t"
-	Set gtmtypfldindx("node_local","remove_shm")=86
-	Set gtmtypes("node_local",87,"name")="node_local.jnl_file"
-	Set gtmtypes("node_local",87,"off")=46424
-	Set gtmtypes("node_local",87,"len")=32
-	Set gtmtypes("node_local",87,"type")="union"
-	Set gtmtypfldindx("node_local","jnl_file")=87
-	Set gtmtypes("node_local",88,"name")="node_local.jnl_file.jnl_file_id"
-	Set gtmtypes("node_local",88,"off")=46424
-	Set gtmtypes("node_local",88,"len")=28
-	Set gtmtypes("node_local",88,"type")="gds_file_id"
-	Set gtmtypfldindx("node_local","jnl_file.jnl_file_id")=88
-	Set gtmtypes("node_local",89,"name")="node_local.jnl_file.jnl_file_id.dvi"
-	Set gtmtypes("node_local",89,"off")=46424
-	Set gtmtypes("node_local",89,"len")=16
-	Set gtmtypes("node_local",89,"type")="char"
-	Set gtmtypfldindx("node_local","jnl_file.jnl_file_id.dvi")=89
-	Set gtmtypes("node_local",90,"name")="node_local.jnl_file.jnl_file_id.did"
-	Set gtmtypes("node_local",90,"off")=46440
-	Set gtmtypes("node_local",90,"len")=6
-	Set gtmtypes("node_local",90,"type")="unsigned-short"
-	Set gtmtypfldindx("node_local","jnl_file.jnl_file_id.did")=90
-	Set gtmtypes("node_local",90,"dim")=3
-	Set gtmtypes("node_local",91,"name")="node_local.jnl_file.jnl_file_id.fid"
-	Set gtmtypes("node_local",91,"off")=46446
-	Set gtmtypes("node_local",91,"len")=6
-	Set gtmtypes("node_local",91,"type")="unsigned-short"
-	Set gtmtypfldindx("node_local","jnl_file.jnl_file_id.fid")=91
-	Set gtmtypes("node_local",91,"dim")=3
-	Set gtmtypes("node_local",92,"name")="node_local.jnl_file.u"
-	Set gtmtypes("node_local",92,"off")=46424
-	Set gtmtypes("node_local",92,"len")=24
-	Set gtmtypes("node_local",92,"type")="unix_file_id"
-	Set gtmtypfldindx("node_local","jnl_file.u")=92
-	Set gtmtypes("node_local",93,"name")="node_local.jnl_file.u.inode"
-	Set gtmtypes("node_local",93,"off")=46424
+	Set gtmtypes("node_local",86,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","wcs_ops_array[0].process_id")=86
+	Set gtmtypes("node_local",87,"name")="node_local.wcs_ops_array[0].wc_in_free"
+	Set gtmtypes("node_local",87,"off")=46460
+	Set gtmtypes("node_local",87,"len")=4
+	Set gtmtypes("node_local",87,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","wcs_ops_array[0].wc_in_free")=87
+	Set gtmtypes("node_local",88,"name")="node_local.wcs_ops_array[0].wcs_active_lvl"
+	Set gtmtypes("node_local",88,"off")=46464
+	Set gtmtypes("node_local",88,"len")=4
+	Set gtmtypes("node_local",88,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","wcs_ops_array[0].wcs_active_lvl")=88
+	Set gtmtypes("node_local",89,"name")="node_local.wcs_ops_array[0].wcs_wip_lvl"
+	Set gtmtypes("node_local",89,"off")=46468
+	Set gtmtypes("node_local",89,"len")=4
+	Set gtmtypes("node_local",89,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","wcs_ops_array[0].wcs_wip_lvl")=89
+	Set gtmtypes("node_local",90,"name")="node_local.wcs_ops_array[0].type"
+	Set gtmtypes("node_local",90,"off")=46472
+	Set gtmtypes("node_local",90,"len")=4
+	Set gtmtypes("node_local",90,"type")="int"
+	Set gtmtypfldindx("node_local","wcs_ops_array[0].type")=90
+	Set gtmtypes("node_local",91,"name")="node_local.wcs_ops_array[0].blk"
+	Set gtmtypes("node_local",91,"off")=46476
+	Set gtmtypes("node_local",91,"len")=4
+	Set gtmtypes("node_local",91,"type")="int"
+	Set gtmtypfldindx("node_local","wcs_ops_array[0].blk")=91
+	Set gtmtypes("node_local",92,"name")="node_local.wcs_ops_array[0].cr_off"
+	Set gtmtypes("node_local",92,"off")=46480
+	Set gtmtypes("node_local",92,"len")=8
+	Set gtmtypes("node_local",92,"type")="intptr_t"
+	Set gtmtypfldindx("node_local","wcs_ops_array[0].cr_off")=92
+	Set gtmtypes("node_local",93,"name")="node_local.wcs_ops_array[0].cr_dirty"
+	Set gtmtypes("node_local",93,"off")=46488
 	Set gtmtypes("node_local",93,"len")=8
-	Set gtmtypes("node_local",93,"type")="ino_t"
-	Set gtmtypfldindx("node_local","jnl_file.u.inode")=93
-	Set gtmtypes("node_local",94,"name")="node_local.jnl_file.u.device"
-	Set gtmtypes("node_local",94,"off")=46432
-	Set gtmtypes("node_local",94,"len")=8
-	Set gtmtypes("node_local",94,"type")="dev_t"
-	Set gtmtypfldindx("node_local","jnl_file.u.device")=94
-	Set gtmtypes("node_local",95,"name")="node_local.jnl_file.u.st_gen"
-	Set gtmtypes("node_local",95,"off")=46440
+	Set gtmtypes("node_local",93,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","wcs_ops_array[0].cr_dirty")=93
+	Set gtmtypes("node_local",94,"name")="node_local.wcs_ops_array[0].detail1"
+	Set gtmtypes("node_local",94,"off")=46496
+	Set gtmtypes("node_local",94,"len")=4
+	Set gtmtypes("node_local",94,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","wcs_ops_array[0].detail1")=94
+	Set gtmtypes("node_local",95,"name")="node_local.wcs_ops_array[0].detail2"
+	Set gtmtypes("node_local",95,"off")=46500
 	Set gtmtypes("node_local",95,"len")=4
 	Set gtmtypes("node_local",95,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","jnl_file.u.st_gen")=95
-	Set gtmtypes("node_local",96,"name")="node_local.donotflush_dbjnl"
-	Set gtmtypes("node_local",96,"off")=46456
-	Set gtmtypes("node_local",96,"len")=4
-	Set gtmtypes("node_local",96,"type")="boolean_t"
-	Set gtmtypfldindx("node_local","donotflush_dbjnl")=96
-	Set gtmtypes("node_local",97,"name")="node_local.n_pre_read"
-	Set gtmtypes("node_local",97,"off")=46460
-	Set gtmtypes("node_local",97,"len")=4
-	Set gtmtypes("node_local",97,"type")="int"
-	Set gtmtypfldindx("node_local","n_pre_read")=97
-	Set gtmtypes("node_local",98,"name")="node_local.replinstfilename"
-	Set gtmtypes("node_local",98,"off")=46464
-	Set gtmtypes("node_local",98,"len")=256
+	Set gtmtypfldindx("node_local","wcs_ops_array[0].detail2")=95
+	Set gtmtypes("node_local",96,"name")="node_local.unique_id"
+	Set gtmtypes("node_local",96,"off")=103792
+	Set gtmtypes("node_local",96,"len")=24
+	Set gtmtypes("node_local",96,"type")="unique_file_id"
+	Set gtmtypfldindx("node_local","unique_id")=96
+	Set gtmtypes("node_local",97,"name")="node_local.unique_id.uid"
+	Set gtmtypes("node_local",97,"off")=103792
+	Set gtmtypes("node_local",97,"len")=24
+	Set gtmtypes("node_local",97,"type")="unix_file_id"
+	Set gtmtypfldindx("node_local","unique_id.uid")=97
+	Set gtmtypes("node_local",98,"name")="node_local.unique_id.file_id"
+	Set gtmtypes("node_local",98,"off")=103792
+	Set gtmtypes("node_local",98,"len")=24
 	Set gtmtypes("node_local",98,"type")="char"
-	Set gtmtypfldindx("node_local","replinstfilename")=98
-	Set gtmtypes("node_local",99,"name")="node_local.secshr_ops_index"
-	Set gtmtypes("node_local",99,"off")=46720
+	Set gtmtypfldindx("node_local","unique_id.file_id")=98
+	Set gtmtypes("node_local",99,"name")="node_local.owner_node"
+	Set gtmtypes("node_local",99,"off")=103816
 	Set gtmtypes("node_local",99,"len")=4
-	Set gtmtypes("node_local",99,"type")="int"
-	Set gtmtypfldindx("node_local","secshr_ops_index")=99
-	Set gtmtypes("node_local",100,"name")="node_local.secshr_ops_array"
-	Set gtmtypes("node_local",100,"off")=46728
-	Set gtmtypes("node_local",100,"len")=8184
-	Set gtmtypes("node_local",100,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","secshr_ops_array")=100
-	Set gtmtypes("node_local",100,"dim")=1023
-	Set gtmtypes("node_local",101,"name")="node_local.gvstats_rec"
-	Set gtmtypes("node_local",101,"off")=54912
-	Set gtmtypes("node_local",101,"len")=464
-	Set gtmtypes("node_local",101,"type")="gvstats_rec_t"
-	Set gtmtypfldindx("node_local","gvstats_rec")=101
-	Set gtmtypes("node_local",102,"name")="node_local.gvstats_rec.n_set"
-	Set gtmtypes("node_local",102,"off")=54912
-	Set gtmtypes("node_local",102,"len")=8
-	Set gtmtypes("node_local",102,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_set")=102
-	Set gtmtypes("node_local",103,"name")="node_local.gvstats_rec.n_kill"
-	Set gtmtypes("node_local",103,"off")=54920
-	Set gtmtypes("node_local",103,"len")=8
-	Set gtmtypes("node_local",103,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_kill")=103
-	Set gtmtypes("node_local",104,"name")="node_local.gvstats_rec.n_get"
-	Set gtmtypes("node_local",104,"off")=54928
-	Set gtmtypes("node_local",104,"len")=8
-	Set gtmtypes("node_local",104,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_get")=104
-	Set gtmtypes("node_local",105,"name")="node_local.gvstats_rec.n_data"
-	Set gtmtypes("node_local",105,"off")=54936
-	Set gtmtypes("node_local",105,"len")=8
-	Set gtmtypes("node_local",105,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_data")=105
-	Set gtmtypes("node_local",106,"name")="node_local.gvstats_rec.n_order"
-	Set gtmtypes("node_local",106,"off")=54944
-	Set gtmtypes("node_local",106,"len")=8
-	Set gtmtypes("node_local",106,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_order")=106
-	Set gtmtypes("node_local",107,"name")="node_local.gvstats_rec.n_zprev"
-	Set gtmtypes("node_local",107,"off")=54952
-	Set gtmtypes("node_local",107,"len")=8
-	Set gtmtypes("node_local",107,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_zprev")=107
-	Set gtmtypes("node_local",108,"name")="node_local.gvstats_rec.n_query"
-	Set gtmtypes("node_local",108,"off")=54960
-	Set gtmtypes("node_local",108,"len")=8
-	Set gtmtypes("node_local",108,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_query")=108
-	Set gtmtypes("node_local",109,"name")="node_local.gvstats_rec.n_lock_success"
-	Set gtmtypes("node_local",109,"off")=54968
-	Set gtmtypes("node_local",109,"len")=8
-	Set gtmtypes("node_local",109,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_lock_success")=109
-	Set gtmtypes("node_local",110,"name")="node_local.gvstats_rec.n_lock_fail"
-	Set gtmtypes("node_local",110,"off")=54976
+	Set gtmtypes("node_local",99,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","owner_node")=99
+	Set gtmtypes("node_local",100,"name")="node_local.wcsflu_pid"
+	Set gtmtypes("node_local",100,"off")=103820
+	Set gtmtypes("node_local",100,"len")=4
+	Set gtmtypes("node_local",100,"type")="int"
+	Set gtmtypfldindx("node_local","wcsflu_pid")=100
+	Set gtmtypes("node_local",101,"name")="node_local.creation_date_time4"
+	Set gtmtypes("node_local",101,"off")=103824
+	Set gtmtypes("node_local",101,"len")=4
+	Set gtmtypes("node_local",101,"type")="int"
+	Set gtmtypfldindx("node_local","creation_date_time4")=101
+	Set gtmtypes("node_local",102,"name")="node_local.inhibit_kills"
+	Set gtmtypes("node_local",102,"off")=103828
+	Set gtmtypes("node_local",102,"len")=4
+	Set gtmtypes("node_local",102,"type")="int"
+	Set gtmtypfldindx("node_local","inhibit_kills")=102
+	Set gtmtypes("node_local",103,"name")="node_local.remove_shm"
+	Set gtmtypes("node_local",103,"off")=103832
+	Set gtmtypes("node_local",103,"len")=4
+	Set gtmtypes("node_local",103,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","remove_shm")=103
+	Set gtmtypes("node_local",104,"name")="node_local.jnl_file"
+	Set gtmtypes("node_local",104,"off")=103840
+	Set gtmtypes("node_local",104,"len")=32
+	Set gtmtypes("node_local",104,"type")="union"
+	Set gtmtypfldindx("node_local","jnl_file")=104
+	Set gtmtypes("node_local",105,"name")="node_local.jnl_file.jnl_file_id"
+	Set gtmtypes("node_local",105,"off")=103840
+	Set gtmtypes("node_local",105,"len")=28
+	Set gtmtypes("node_local",105,"type")="gds_file_id"
+	Set gtmtypfldindx("node_local","jnl_file.jnl_file_id")=105
+	Set gtmtypes("node_local",106,"name")="node_local.jnl_file.jnl_file_id.dvi"
+	Set gtmtypes("node_local",106,"off")=103840
+	Set gtmtypes("node_local",106,"len")=16
+	Set gtmtypes("node_local",106,"type")="char"
+	Set gtmtypfldindx("node_local","jnl_file.jnl_file_id.dvi")=106
+	Set gtmtypes("node_local",107,"name")="node_local.jnl_file.jnl_file_id.did"
+	Set gtmtypes("node_local",107,"off")=103856
+	Set gtmtypes("node_local",107,"len")=6
+	Set gtmtypes("node_local",107,"type")="unsigned-short"
+	Set gtmtypfldindx("node_local","jnl_file.jnl_file_id.did")=107
+	Set gtmtypes("node_local",107,"dim")=3
+	Set gtmtypes("node_local",108,"name")="node_local.jnl_file.jnl_file_id.fid"
+	Set gtmtypes("node_local",108,"off")=103862
+	Set gtmtypes("node_local",108,"len")=6
+	Set gtmtypes("node_local",108,"type")="unsigned-short"
+	Set gtmtypfldindx("node_local","jnl_file.jnl_file_id.fid")=108
+	Set gtmtypes("node_local",108,"dim")=3
+	Set gtmtypes("node_local",109,"name")="node_local.jnl_file.u"
+	Set gtmtypes("node_local",109,"off")=103840
+	Set gtmtypes("node_local",109,"len")=24
+	Set gtmtypes("node_local",109,"type")="unix_file_id"
+	Set gtmtypfldindx("node_local","jnl_file.u")=109
+	Set gtmtypes("node_local",110,"name")="node_local.jnl_file.u.inode"
+	Set gtmtypes("node_local",110,"off")=103840
 	Set gtmtypes("node_local",110,"len")=8
-	Set gtmtypes("node_local",110,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_lock_fail")=110
-	Set gtmtypes("node_local",111,"name")="node_local.gvstats_rec.db_curr_tn"
-	Set gtmtypes("node_local",111,"off")=54984
+	Set gtmtypes("node_local",110,"type")="ino_t"
+	Set gtmtypfldindx("node_local","jnl_file.u.inode")=110
+	Set gtmtypes("node_local",111,"name")="node_local.jnl_file.u.device"
+	Set gtmtypes("node_local",111,"off")=103848
 	Set gtmtypes("node_local",111,"len")=8
-	Set gtmtypes("node_local",111,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.db_curr_tn")=111
-	Set gtmtypes("node_local",112,"name")="node_local.gvstats_rec.n_dsk_read"
-	Set gtmtypes("node_local",112,"off")=54992
-	Set gtmtypes("node_local",112,"len")=8
-	Set gtmtypes("node_local",112,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_dsk_read")=112
-	Set gtmtypes("node_local",113,"name")="node_local.gvstats_rec.n_dsk_write"
-	Set gtmtypes("node_local",113,"off")=55000
-	Set gtmtypes("node_local",113,"len")=8
-	Set gtmtypes("node_local",113,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_dsk_write")=113
-	Set gtmtypes("node_local",114,"name")="node_local.gvstats_rec.n_nontp_readwrite"
-	Set gtmtypes("node_local",114,"off")=55008
-	Set gtmtypes("node_local",114,"len")=8
-	Set gtmtypes("node_local",114,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_nontp_readwrite")=114
-	Set gtmtypes("node_local",115,"name")="node_local.gvstats_rec.n_nontp_readonly"
-	Set gtmtypes("node_local",115,"off")=55016
-	Set gtmtypes("node_local",115,"len")=8
-	Set gtmtypes("node_local",115,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_nontp_readonly")=115
-	Set gtmtypes("node_local",116,"name")="node_local.gvstats_rec.n_nontp_blkwrite"
-	Set gtmtypes("node_local",116,"off")=55024
-	Set gtmtypes("node_local",116,"len")=8
-	Set gtmtypes("node_local",116,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_nontp_blkwrite")=116
-	Set gtmtypes("node_local",117,"name")="node_local.gvstats_rec.n_nontp_blkread"
-	Set gtmtypes("node_local",117,"off")=55032
-	Set gtmtypes("node_local",117,"len")=8
-	Set gtmtypes("node_local",117,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_nontp_blkread")=117
-	Set gtmtypes("node_local",118,"name")="node_local.gvstats_rec.n_nontp_retries_0"
-	Set gtmtypes("node_local",118,"off")=55040
-	Set gtmtypes("node_local",118,"len")=8
+	Set gtmtypes("node_local",111,"type")="dev_t"
+	Set gtmtypfldindx("node_local","jnl_file.u.device")=111
+	Set gtmtypes("node_local",112,"name")="node_local.jnl_file.u.st_gen"
+	Set gtmtypes("node_local",112,"off")=103856
+	Set gtmtypes("node_local",112,"len")=4
+	Set gtmtypes("node_local",112,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","jnl_file.u.st_gen")=112
+	Set gtmtypes("node_local",113,"name")="node_local.donotflush_dbjnl"
+	Set gtmtypes("node_local",113,"off")=103872
+	Set gtmtypes("node_local",113,"len")=4
+	Set gtmtypes("node_local",113,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","donotflush_dbjnl")=113
+	Set gtmtypes("node_local",114,"name")="node_local.n_pre_read"
+	Set gtmtypes("node_local",114,"off")=103876
+	Set gtmtypes("node_local",114,"len")=4
+	Set gtmtypes("node_local",114,"type")="int"
+	Set gtmtypfldindx("node_local","n_pre_read")=114
+	Set gtmtypes("node_local",115,"name")="node_local.replinstfilename"
+	Set gtmtypes("node_local",115,"off")=103880
+	Set gtmtypes("node_local",115,"len")=256
+	Set gtmtypes("node_local",115,"type")="char"
+	Set gtmtypfldindx("node_local","replinstfilename")=115
+	Set gtmtypes("node_local",116,"name")="node_local.statsdb_fname"
+	Set gtmtypes("node_local",116,"off")=104136
+	Set gtmtypes("node_local",116,"len")=256
+	Set gtmtypes("node_local",116,"type")="char"
+	Set gtmtypfldindx("node_local","statsdb_fname")=116
+	Set gtmtypes("node_local",117,"name")="node_local.secshr_ops_index"
+	Set gtmtypes("node_local",117,"off")=104392
+	Set gtmtypes("node_local",117,"len")=4
+	Set gtmtypes("node_local",117,"type")="int"
+	Set gtmtypfldindx("node_local","secshr_ops_index")=117
+	Set gtmtypes("node_local",118,"name")="node_local.secshr_ops_array"
+	Set gtmtypes("node_local",118,"off")=104400
+	Set gtmtypes("node_local",118,"len")=8184
 	Set gtmtypes("node_local",118,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_nontp_retries_0")=118
-	Set gtmtypes("node_local",119,"name")="node_local.gvstats_rec.n_nontp_retries_1"
-	Set gtmtypes("node_local",119,"off")=55048
-	Set gtmtypes("node_local",119,"len")=8
-	Set gtmtypes("node_local",119,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_nontp_retries_1")=119
-	Set gtmtypes("node_local",120,"name")="node_local.gvstats_rec.n_nontp_retries_2"
-	Set gtmtypes("node_local",120,"off")=55056
+	Set gtmtypfldindx("node_local","secshr_ops_array")=118
+	Set gtmtypes("node_local",118,"dim")=1023
+	Set gtmtypes("node_local",119,"name")="node_local.gvstats_rec"
+	Set gtmtypes("node_local",119,"off")=112584
+	Set gtmtypes("node_local",119,"len")=472
+	Set gtmtypes("node_local",119,"type")="gvstats_rec_t"
+	Set gtmtypfldindx("node_local","gvstats_rec")=119
+	Set gtmtypes("node_local",120,"name")="node_local.gvstats_rec.n_set"
+	Set gtmtypes("node_local",120,"off")=112584
 	Set gtmtypes("node_local",120,"len")=8
 	Set gtmtypes("node_local",120,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_nontp_retries_2")=120
-	Set gtmtypes("node_local",121,"name")="node_local.gvstats_rec.n_nontp_retries_3"
-	Set gtmtypes("node_local",121,"off")=55064
+	Set gtmtypfldindx("node_local","gvstats_rec.n_set")=120
+	Set gtmtypes("node_local",121,"name")="node_local.gvstats_rec.n_kill"
+	Set gtmtypes("node_local",121,"off")=112592
 	Set gtmtypes("node_local",121,"len")=8
 	Set gtmtypes("node_local",121,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_nontp_retries_3")=121
-	Set gtmtypes("node_local",122,"name")="node_local.gvstats_rec.n_tp_readwrite"
-	Set gtmtypes("node_local",122,"off")=55072
+	Set gtmtypfldindx("node_local","gvstats_rec.n_kill")=121
+	Set gtmtypes("node_local",122,"name")="node_local.gvstats_rec.n_get"
+	Set gtmtypes("node_local",122,"off")=112600
 	Set gtmtypes("node_local",122,"len")=8
 	Set gtmtypes("node_local",122,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_readwrite")=122
-	Set gtmtypes("node_local",123,"name")="node_local.gvstats_rec.n_tp_readonly"
-	Set gtmtypes("node_local",123,"off")=55080
+	Set gtmtypfldindx("node_local","gvstats_rec.n_get")=122
+	Set gtmtypes("node_local",123,"name")="node_local.gvstats_rec.n_data"
+	Set gtmtypes("node_local",123,"off")=112608
 	Set gtmtypes("node_local",123,"len")=8
 	Set gtmtypes("node_local",123,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_readonly")=123
-	Set gtmtypes("node_local",124,"name")="node_local.gvstats_rec.n_tp_rolledback"
-	Set gtmtypes("node_local",124,"off")=55088
+	Set gtmtypfldindx("node_local","gvstats_rec.n_data")=123
+	Set gtmtypes("node_local",124,"name")="node_local.gvstats_rec.n_order"
+	Set gtmtypes("node_local",124,"off")=112616
 	Set gtmtypes("node_local",124,"len")=8
 	Set gtmtypes("node_local",124,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_rolledback")=124
-	Set gtmtypes("node_local",125,"name")="node_local.gvstats_rec.n_tp_blkwrite"
-	Set gtmtypes("node_local",125,"off")=55096
+	Set gtmtypfldindx("node_local","gvstats_rec.n_order")=124
+	Set gtmtypes("node_local",125,"name")="node_local.gvstats_rec.n_zprev"
+	Set gtmtypes("node_local",125,"off")=112624
 	Set gtmtypes("node_local",125,"len")=8
 	Set gtmtypes("node_local",125,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_blkwrite")=125
-	Set gtmtypes("node_local",126,"name")="node_local.gvstats_rec.n_tp_blkread"
-	Set gtmtypes("node_local",126,"off")=55104
+	Set gtmtypfldindx("node_local","gvstats_rec.n_zprev")=125
+	Set gtmtypes("node_local",126,"name")="node_local.gvstats_rec.n_query"
+	Set gtmtypes("node_local",126,"off")=112632
 	Set gtmtypes("node_local",126,"len")=8
 	Set gtmtypes("node_local",126,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_blkread")=126
-	Set gtmtypes("node_local",127,"name")="node_local.gvstats_rec.n_tp_tot_retries_0"
-	Set gtmtypes("node_local",127,"off")=55112
+	Set gtmtypfldindx("node_local","gvstats_rec.n_query")=126
+	Set gtmtypes("node_local",127,"name")="node_local.gvstats_rec.n_lock_success"
+	Set gtmtypes("node_local",127,"off")=112640
 	Set gtmtypes("node_local",127,"len")=8
 	Set gtmtypes("node_local",127,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_tot_retries_0")=127
-	Set gtmtypes("node_local",128,"name")="node_local.gvstats_rec.n_tp_tot_retries_1"
-	Set gtmtypes("node_local",128,"off")=55120
+	Set gtmtypfldindx("node_local","gvstats_rec.n_lock_success")=127
+	Set gtmtypes("node_local",128,"name")="node_local.gvstats_rec.n_lock_fail"
+	Set gtmtypes("node_local",128,"off")=112648
 	Set gtmtypes("node_local",128,"len")=8
 	Set gtmtypes("node_local",128,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_tot_retries_1")=128
-	Set gtmtypes("node_local",129,"name")="node_local.gvstats_rec.n_tp_tot_retries_2"
-	Set gtmtypes("node_local",129,"off")=55128
+	Set gtmtypfldindx("node_local","gvstats_rec.n_lock_fail")=128
+	Set gtmtypes("node_local",129,"name")="node_local.gvstats_rec.db_curr_tn"
+	Set gtmtypes("node_local",129,"off")=112656
 	Set gtmtypes("node_local",129,"len")=8
 	Set gtmtypes("node_local",129,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_tot_retries_2")=129
-	Set gtmtypes("node_local",130,"name")="node_local.gvstats_rec.n_tp_tot_retries_3"
-	Set gtmtypes("node_local",130,"off")=55136
+	Set gtmtypfldindx("node_local","gvstats_rec.db_curr_tn")=129
+	Set gtmtypes("node_local",130,"name")="node_local.gvstats_rec.n_dsk_read"
+	Set gtmtypes("node_local",130,"off")=112664
 	Set gtmtypes("node_local",130,"len")=8
 	Set gtmtypes("node_local",130,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_tot_retries_3")=130
-	Set gtmtypes("node_local",131,"name")="node_local.gvstats_rec.n_tp_tot_retries_4"
-	Set gtmtypes("node_local",131,"off")=55144
+	Set gtmtypfldindx("node_local","gvstats_rec.n_dsk_read")=130
+	Set gtmtypes("node_local",131,"name")="node_local.gvstats_rec.n_dsk_write"
+	Set gtmtypes("node_local",131,"off")=112672
 	Set gtmtypes("node_local",131,"len")=8
 	Set gtmtypes("node_local",131,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_tot_retries_4")=131
-	Set gtmtypes("node_local",132,"name")="node_local.gvstats_rec.n_tp_cnflct_retries_0"
-	Set gtmtypes("node_local",132,"off")=55152
+	Set gtmtypfldindx("node_local","gvstats_rec.n_dsk_write")=131
+	Set gtmtypes("node_local",132,"name")="node_local.gvstats_rec.n_nontp_readwrite"
+	Set gtmtypes("node_local",132,"off")=112680
 	Set gtmtypes("node_local",132,"len")=8
 	Set gtmtypes("node_local",132,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_cnflct_retries_0")=132
-	Set gtmtypes("node_local",133,"name")="node_local.gvstats_rec.n_tp_cnflct_retries_1"
-	Set gtmtypes("node_local",133,"off")=55160
+	Set gtmtypfldindx("node_local","gvstats_rec.n_nontp_readwrite")=132
+	Set gtmtypes("node_local",133,"name")="node_local.gvstats_rec.n_nontp_readonly"
+	Set gtmtypes("node_local",133,"off")=112688
 	Set gtmtypes("node_local",133,"len")=8
 	Set gtmtypes("node_local",133,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_cnflct_retries_1")=133
-	Set gtmtypes("node_local",134,"name")="node_local.gvstats_rec.n_tp_cnflct_retries_2"
-	Set gtmtypes("node_local",134,"off")=55168
+	Set gtmtypfldindx("node_local","gvstats_rec.n_nontp_readonly")=133
+	Set gtmtypes("node_local",134,"name")="node_local.gvstats_rec.n_nontp_blkwrite"
+	Set gtmtypes("node_local",134,"off")=112696
 	Set gtmtypes("node_local",134,"len")=8
 	Set gtmtypes("node_local",134,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_cnflct_retries_2")=134
-	Set gtmtypes("node_local",135,"name")="node_local.gvstats_rec.n_tp_cnflct_retries_3"
-	Set gtmtypes("node_local",135,"off")=55176
+	Set gtmtypfldindx("node_local","gvstats_rec.n_nontp_blkwrite")=134
+	Set gtmtypes("node_local",135,"name")="node_local.gvstats_rec.n_nontp_blkread"
+	Set gtmtypes("node_local",135,"off")=112704
 	Set gtmtypes("node_local",135,"len")=8
 	Set gtmtypes("node_local",135,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_cnflct_retries_3")=135
-	Set gtmtypes("node_local",136,"name")="node_local.gvstats_rec.n_tp_cnflct_retries_4"
-	Set gtmtypes("node_local",136,"off")=55184
+	Set gtmtypfldindx("node_local","gvstats_rec.n_nontp_blkread")=135
+	Set gtmtypes("node_local",136,"name")="node_local.gvstats_rec.n_nontp_retries_0"
+	Set gtmtypes("node_local",136,"off")=112712
 	Set gtmtypes("node_local",136,"len")=8
 	Set gtmtypes("node_local",136,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_cnflct_retries_4")=136
-	Set gtmtypes("node_local",137,"name")="node_local.gvstats_rec.n_ztrigger"
-	Set gtmtypes("node_local",137,"off")=55192
+	Set gtmtypfldindx("node_local","gvstats_rec.n_nontp_retries_0")=136
+	Set gtmtypes("node_local",137,"name")="node_local.gvstats_rec.n_nontp_retries_1"
+	Set gtmtypes("node_local",137,"off")=112720
 	Set gtmtypes("node_local",137,"len")=8
 	Set gtmtypes("node_local",137,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_ztrigger")=137
-	Set gtmtypes("node_local",138,"name")="node_local.gvstats_rec.n_db_flush"
-	Set gtmtypes("node_local",138,"off")=55200
+	Set gtmtypfldindx("node_local","gvstats_rec.n_nontp_retries_1")=137
+	Set gtmtypes("node_local",138,"name")="node_local.gvstats_rec.n_nontp_retries_2"
+	Set gtmtypes("node_local",138,"off")=112728
 	Set gtmtypes("node_local",138,"len")=8
 	Set gtmtypes("node_local",138,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_db_flush")=138
-	Set gtmtypes("node_local",139,"name")="node_local.gvstats_rec.n_db_fsync"
-	Set gtmtypes("node_local",139,"off")=55208
+	Set gtmtypfldindx("node_local","gvstats_rec.n_nontp_retries_2")=138
+	Set gtmtypes("node_local",139,"name")="node_local.gvstats_rec.n_nontp_retries_3"
+	Set gtmtypes("node_local",139,"off")=112736
 	Set gtmtypes("node_local",139,"len")=8
 	Set gtmtypes("node_local",139,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_db_fsync")=139
-	Set gtmtypes("node_local",140,"name")="node_local.gvstats_rec.n_jnl_flush"
-	Set gtmtypes("node_local",140,"off")=55216
+	Set gtmtypfldindx("node_local","gvstats_rec.n_nontp_retries_3")=139
+	Set gtmtypes("node_local",140,"name")="node_local.gvstats_rec.n_tp_readwrite"
+	Set gtmtypes("node_local",140,"off")=112744
 	Set gtmtypes("node_local",140,"len")=8
 	Set gtmtypes("node_local",140,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_jnl_flush")=140
-	Set gtmtypes("node_local",141,"name")="node_local.gvstats_rec.n_jnl_fsync"
-	Set gtmtypes("node_local",141,"off")=55224
+	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_readwrite")=140
+	Set gtmtypes("node_local",141,"name")="node_local.gvstats_rec.n_tp_readonly"
+	Set gtmtypes("node_local",141,"off")=112752
 	Set gtmtypes("node_local",141,"len")=8
 	Set gtmtypes("node_local",141,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_jnl_fsync")=141
-	Set gtmtypes("node_local",142,"name")="node_local.gvstats_rec.n_jbuff_bytes"
-	Set gtmtypes("node_local",142,"off")=55232
+	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_readonly")=141
+	Set gtmtypes("node_local",142,"name")="node_local.gvstats_rec.n_tp_rolledback"
+	Set gtmtypes("node_local",142,"off")=112760
 	Set gtmtypes("node_local",142,"len")=8
 	Set gtmtypes("node_local",142,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_jbuff_bytes")=142
-	Set gtmtypes("node_local",143,"name")="node_local.gvstats_rec.n_jfile_bytes"
-	Set gtmtypes("node_local",143,"off")=55240
+	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_rolledback")=142
+	Set gtmtypes("node_local",143,"name")="node_local.gvstats_rec.n_tp_blkwrite"
+	Set gtmtypes("node_local",143,"off")=112768
 	Set gtmtypes("node_local",143,"len")=8
 	Set gtmtypes("node_local",143,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_jfile_bytes")=143
-	Set gtmtypes("node_local",144,"name")="node_local.gvstats_rec.n_jfile_writes"
-	Set gtmtypes("node_local",144,"off")=55248
+	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_blkwrite")=143
+	Set gtmtypes("node_local",144,"name")="node_local.gvstats_rec.n_tp_blkread"
+	Set gtmtypes("node_local",144,"off")=112776
 	Set gtmtypes("node_local",144,"len")=8
 	Set gtmtypes("node_local",144,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_jfile_writes")=144
-	Set gtmtypes("node_local",145,"name")="node_local.gvstats_rec.n_jrec_logical"
-	Set gtmtypes("node_local",145,"off")=55256
+	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_blkread")=144
+	Set gtmtypes("node_local",145,"name")="node_local.gvstats_rec.n_tp_tot_retries_0"
+	Set gtmtypes("node_local",145,"off")=112784
 	Set gtmtypes("node_local",145,"len")=8
 	Set gtmtypes("node_local",145,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_jrec_logical")=145
-	Set gtmtypes("node_local",146,"name")="node_local.gvstats_rec.n_jrec_pblk"
-	Set gtmtypes("node_local",146,"off")=55264
+	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_tot_retries_0")=145
+	Set gtmtypes("node_local",146,"name")="node_local.gvstats_rec.n_tp_tot_retries_1"
+	Set gtmtypes("node_local",146,"off")=112792
 	Set gtmtypes("node_local",146,"len")=8
 	Set gtmtypes("node_local",146,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_jrec_pblk")=146
-	Set gtmtypes("node_local",147,"name")="node_local.gvstats_rec.n_jrec_epoch_regular"
-	Set gtmtypes("node_local",147,"off")=55272
+	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_tot_retries_1")=146
+	Set gtmtypes("node_local",147,"name")="node_local.gvstats_rec.n_tp_tot_retries_2"
+	Set gtmtypes("node_local",147,"off")=112800
 	Set gtmtypes("node_local",147,"len")=8
 	Set gtmtypes("node_local",147,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_jrec_epoch_regular")=147
-	Set gtmtypes("node_local",148,"name")="node_local.gvstats_rec.n_jrec_epoch_idle"
-	Set gtmtypes("node_local",148,"off")=55280
+	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_tot_retries_2")=147
+	Set gtmtypes("node_local",148,"name")="node_local.gvstats_rec.n_tp_tot_retries_3"
+	Set gtmtypes("node_local",148,"off")=112808
 	Set gtmtypes("node_local",148,"len")=8
 	Set gtmtypes("node_local",148,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_jrec_epoch_idle")=148
-	Set gtmtypes("node_local",149,"name")="node_local.gvstats_rec.n_jrec_other"
-	Set gtmtypes("node_local",149,"off")=55288
+	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_tot_retries_3")=148
+	Set gtmtypes("node_local",149,"name")="node_local.gvstats_rec.n_tp_tot_retries_4"
+	Set gtmtypes("node_local",149,"off")=112816
 	Set gtmtypes("node_local",149,"len")=8
 	Set gtmtypes("node_local",149,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_jrec_other")=149
-	Set gtmtypes("node_local",150,"name")="node_local.gvstats_rec.n_jnl_extends"
-	Set gtmtypes("node_local",150,"off")=55296
+	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_tot_retries_4")=149
+	Set gtmtypes("node_local",150,"name")="node_local.gvstats_rec.n_tp_cnflct_retries_0"
+	Set gtmtypes("node_local",150,"off")=112824
 	Set gtmtypes("node_local",150,"len")=8
 	Set gtmtypes("node_local",150,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_jnl_extends")=150
-	Set gtmtypes("node_local",151,"name")="node_local.gvstats_rec.n_db_extends"
-	Set gtmtypes("node_local",151,"off")=55304
+	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_cnflct_retries_0")=150
+	Set gtmtypes("node_local",151,"name")="node_local.gvstats_rec.n_tp_cnflct_retries_1"
+	Set gtmtypes("node_local",151,"off")=112832
 	Set gtmtypes("node_local",151,"len")=8
 	Set gtmtypes("node_local",151,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_db_extends")=151
-	Set gtmtypes("node_local",152,"name")="node_local.gvstats_rec.n_crit_success"
-	Set gtmtypes("node_local",152,"off")=55312
+	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_cnflct_retries_1")=151
+	Set gtmtypes("node_local",152,"name")="node_local.gvstats_rec.n_tp_cnflct_retries_2"
+	Set gtmtypes("node_local",152,"off")=112840
 	Set gtmtypes("node_local",152,"len")=8
 	Set gtmtypes("node_local",152,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_crit_success")=152
-	Set gtmtypes("node_local",153,"name")="node_local.gvstats_rec.n_crits_in_epch"
-	Set gtmtypes("node_local",153,"off")=55320
+	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_cnflct_retries_2")=152
+	Set gtmtypes("node_local",153,"name")="node_local.gvstats_rec.n_tp_cnflct_retries_3"
+	Set gtmtypes("node_local",153,"off")=112848
 	Set gtmtypes("node_local",153,"len")=8
 	Set gtmtypes("node_local",153,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_crits_in_epch")=153
-	Set gtmtypes("node_local",154,"name")="node_local.gvstats_rec.sq_crit_failed"
-	Set gtmtypes("node_local",154,"off")=55328
+	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_cnflct_retries_3")=153
+	Set gtmtypes("node_local",154,"name")="node_local.gvstats_rec.n_tp_cnflct_retries_4"
+	Set gtmtypes("node_local",154,"off")=112856
 	Set gtmtypes("node_local",154,"len")=8
 	Set gtmtypes("node_local",154,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.sq_crit_failed")=154
-	Set gtmtypes("node_local",155,"name")="node_local.gvstats_rec.n_crit_failed"
-	Set gtmtypes("node_local",155,"off")=55336
+	Set gtmtypfldindx("node_local","gvstats_rec.n_tp_cnflct_retries_4")=154
+	Set gtmtypes("node_local",155,"name")="node_local.gvstats_rec.n_ztrigger"
+	Set gtmtypes("node_local",155,"off")=112864
 	Set gtmtypes("node_local",155,"len")=8
 	Set gtmtypes("node_local",155,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_crit_failed")=155
-	Set gtmtypes("node_local",156,"name")="node_local.gvstats_rec.sq_crit_que_slps"
-	Set gtmtypes("node_local",156,"off")=55344
+	Set gtmtypfldindx("node_local","gvstats_rec.n_ztrigger")=155
+	Set gtmtypes("node_local",156,"name")="node_local.gvstats_rec.n_db_flush"
+	Set gtmtypes("node_local",156,"off")=112872
 	Set gtmtypes("node_local",156,"len")=8
 	Set gtmtypes("node_local",156,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.sq_crit_que_slps")=156
-	Set gtmtypes("node_local",157,"name")="node_local.gvstats_rec.n_crit_que_slps"
-	Set gtmtypes("node_local",157,"off")=55352
+	Set gtmtypfldindx("node_local","gvstats_rec.n_db_flush")=156
+	Set gtmtypes("node_local",157,"name")="node_local.gvstats_rec.n_db_fsync"
+	Set gtmtypes("node_local",157,"off")=112880
 	Set gtmtypes("node_local",157,"len")=8
 	Set gtmtypes("node_local",157,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_crit_que_slps")=157
-	Set gtmtypes("node_local",158,"name")="node_local.gvstats_rec.sq_crit_yields"
-	Set gtmtypes("node_local",158,"off")=55360
+	Set gtmtypfldindx("node_local","gvstats_rec.n_db_fsync")=157
+	Set gtmtypes("node_local",158,"name")="node_local.gvstats_rec.n_jnl_flush"
+	Set gtmtypes("node_local",158,"off")=112888
 	Set gtmtypes("node_local",158,"len")=8
 	Set gtmtypes("node_local",158,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.sq_crit_yields")=158
-	Set gtmtypes("node_local",159,"name")="node_local.gvstats_rec.n_crit_yields"
-	Set gtmtypes("node_local",159,"off")=55368
+	Set gtmtypfldindx("node_local","gvstats_rec.n_jnl_flush")=158
+	Set gtmtypes("node_local",159,"name")="node_local.gvstats_rec.n_jnl_fsync"
+	Set gtmtypes("node_local",159,"off")=112896
 	Set gtmtypes("node_local",159,"len")=8
 	Set gtmtypes("node_local",159,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","gvstats_rec.n_crit_yields")=159
-	Set gtmtypes("node_local",160,"name")="node_local.last_wcsflu_tn"
-	Set gtmtypes("node_local",160,"off")=55376
+	Set gtmtypfldindx("node_local","gvstats_rec.n_jnl_fsync")=159
+	Set gtmtypes("node_local",160,"name")="node_local.gvstats_rec.n_jbuff_bytes"
+	Set gtmtypes("node_local",160,"off")=112904
 	Set gtmtypes("node_local",160,"len")=8
 	Set gtmtypes("node_local",160,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","last_wcsflu_tn")=160
-	Set gtmtypes("node_local",161,"name")="node_local.encrypt_glo_buff_off"
-	Set gtmtypes("node_local",161,"off")=55384
+	Set gtmtypfldindx("node_local","gvstats_rec.n_jbuff_bytes")=160
+	Set gtmtypes("node_local",161,"name")="node_local.gvstats_rec.n_jfile_bytes"
+	Set gtmtypes("node_local",161,"off")=112912
 	Set gtmtypes("node_local",161,"len")=8
-	Set gtmtypes("node_local",161,"type")="intptr_t"
-	Set gtmtypfldindx("node_local","encrypt_glo_buff_off")=161
-	Set gtmtypes("node_local",162,"name")="node_local.snapshot_crit_latch"
-	Set gtmtypes("node_local",162,"off")=55392
+	Set gtmtypes("node_local",161,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","gvstats_rec.n_jfile_bytes")=161
+	Set gtmtypes("node_local",162,"name")="node_local.gvstats_rec.n_jfile_writes"
+	Set gtmtypes("node_local",162,"off")=112920
 	Set gtmtypes("node_local",162,"len")=8
-	Set gtmtypes("node_local",162,"type")="global_latch_t"
-	Set gtmtypfldindx("node_local","snapshot_crit_latch")=162
-	Set gtmtypes("node_local",163,"name")="node_local.snapshot_crit_latch.u"
-	Set gtmtypes("node_local",163,"off")=55392
+	Set gtmtypes("node_local",162,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","gvstats_rec.n_jfile_writes")=162
+	Set gtmtypes("node_local",163,"name")="node_local.gvstats_rec.n_jrec_logical"
+	Set gtmtypes("node_local",163,"off")=112928
 	Set gtmtypes("node_local",163,"len")=8
-	Set gtmtypes("node_local",163,"type")="union"
-	Set gtmtypfldindx("node_local","snapshot_crit_latch.u")=163
-	Set gtmtypes("node_local",164,"name")="node_local.snapshot_crit_latch.u.pid_imgcnt"
-	Set gtmtypes("node_local",164,"off")=55392
+	Set gtmtypes("node_local",163,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","gvstats_rec.n_jrec_logical")=163
+	Set gtmtypes("node_local",164,"name")="node_local.gvstats_rec.n_jrec_pblk"
+	Set gtmtypes("node_local",164,"off")=112936
 	Set gtmtypes("node_local",164,"len")=8
 	Set gtmtypes("node_local",164,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","snapshot_crit_latch.u.pid_imgcnt")=164
-	Set gtmtypes("node_local",165,"name")="node_local.snapshot_crit_latch.u.parts"
-	Set gtmtypes("node_local",165,"off")=55392
+	Set gtmtypfldindx("node_local","gvstats_rec.n_jrec_pblk")=164
+	Set gtmtypes("node_local",165,"name")="node_local.gvstats_rec.n_jrec_epoch_regular"
+	Set gtmtypes("node_local",165,"off")=112944
 	Set gtmtypes("node_local",165,"len")=8
-	Set gtmtypes("node_local",165,"type")="struct"
-	Set gtmtypfldindx("node_local","snapshot_crit_latch.u.parts")=165
-	Set gtmtypes("node_local",166,"name")="node_local.snapshot_crit_latch.u.parts.latch_pid"
-	Set gtmtypes("node_local",166,"off")=55392
-	Set gtmtypes("node_local",166,"len")=4
-	Set gtmtypes("node_local",166,"type")="int"
-	Set gtmtypfldindx("node_local","snapshot_crit_latch.u.parts.latch_pid")=166
-	Set gtmtypes("node_local",167,"name")="node_local.snapshot_crit_latch.u.parts.latch_word"
-	Set gtmtypes("node_local",167,"off")=55396
-	Set gtmtypes("node_local",167,"len")=4
-	Set gtmtypes("node_local",167,"type")="int"
-	Set gtmtypfldindx("node_local","snapshot_crit_latch.u.parts.latch_word")=167
-	Set gtmtypes("node_local",168,"name")="node_local.ss_shmid"
-	Set gtmtypes("node_local",168,"off")=55400
+	Set gtmtypes("node_local",165,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","gvstats_rec.n_jrec_epoch_regular")=165
+	Set gtmtypes("node_local",166,"name")="node_local.gvstats_rec.n_jrec_epoch_idle"
+	Set gtmtypes("node_local",166,"off")=112952
+	Set gtmtypes("node_local",166,"len")=8
+	Set gtmtypes("node_local",166,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","gvstats_rec.n_jrec_epoch_idle")=166
+	Set gtmtypes("node_local",167,"name")="node_local.gvstats_rec.n_jrec_other"
+	Set gtmtypes("node_local",167,"off")=112960
+	Set gtmtypes("node_local",167,"len")=8
+	Set gtmtypes("node_local",167,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","gvstats_rec.n_jrec_other")=167
+	Set gtmtypes("node_local",168,"name")="node_local.gvstats_rec.n_jnl_extends"
+	Set gtmtypes("node_local",168,"off")=112968
 	Set gtmtypes("node_local",168,"len")=8
-	Set gtmtypes("node_local",168,"type")="long"
-	Set gtmtypfldindx("node_local","ss_shmid")=168
-	Set gtmtypes("node_local",169,"name")="node_local.ss_shmcycle"
-	Set gtmtypes("node_local",169,"off")=55408
-	Set gtmtypes("node_local",169,"len")=4
-	Set gtmtypes("node_local",169,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","ss_shmcycle")=169
-	Set gtmtypes("node_local",170,"name")="node_local.snapshot_in_prog"
-	Set gtmtypes("node_local",170,"off")=55412
-	Set gtmtypes("node_local",170,"len")=4
-	Set gtmtypes("node_local",170,"type")="boolean_t"
-	Set gtmtypfldindx("node_local","snapshot_in_prog")=170
-	Set gtmtypes("node_local",171,"name")="node_local.num_snapshots_in_effect"
-	Set gtmtypes("node_local",171,"off")=55416
-	Set gtmtypes("node_local",171,"len")=4
-	Set gtmtypes("node_local",171,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","num_snapshots_in_effect")=171
-	Set gtmtypes("node_local",172,"name")="node_local.wbox_test_seq_num"
-	Set gtmtypes("node_local",172,"off")=55420
-	Set gtmtypes("node_local",172,"len")=4
-	Set gtmtypes("node_local",172,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","wbox_test_seq_num")=172
-	Set gtmtypes("node_local",173,"name")="node_local.kip_pid_array"
-	Set gtmtypes("node_local",173,"off")=55424
-	Set gtmtypes("node_local",173,"len")=32
-	Set gtmtypes("node_local",173,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","kip_pid_array")=173
-	Set gtmtypes("node_local",173,"dim")=8
-	Set gtmtypes("node_local",174,"name")="node_local.sec_size"
-	Set gtmtypes("node_local",174,"off")=55456
+	Set gtmtypes("node_local",168,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","gvstats_rec.n_jnl_extends")=168
+	Set gtmtypes("node_local",169,"name")="node_local.gvstats_rec.n_db_extends"
+	Set gtmtypes("node_local",169,"off")=112976
+	Set gtmtypes("node_local",169,"len")=8
+	Set gtmtypes("node_local",169,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","gvstats_rec.n_db_extends")=169
+	Set gtmtypes("node_local",170,"name")="node_local.gvstats_rec.n_crit_success"
+	Set gtmtypes("node_local",170,"off")=112984
+	Set gtmtypes("node_local",170,"len")=8
+	Set gtmtypes("node_local",170,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","gvstats_rec.n_crit_success")=170
+	Set gtmtypes("node_local",171,"name")="node_local.gvstats_rec.n_crits_in_epch"
+	Set gtmtypes("node_local",171,"off")=112992
+	Set gtmtypes("node_local",171,"len")=8
+	Set gtmtypes("node_local",171,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","gvstats_rec.n_crits_in_epch")=171
+	Set gtmtypes("node_local",172,"name")="node_local.gvstats_rec.sq_crit_failed"
+	Set gtmtypes("node_local",172,"off")=113000
+	Set gtmtypes("node_local",172,"len")=8
+	Set gtmtypes("node_local",172,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","gvstats_rec.sq_crit_failed")=172
+	Set gtmtypes("node_local",173,"name")="node_local.gvstats_rec.n_crit_failed"
+	Set gtmtypes("node_local",173,"off")=113008
+	Set gtmtypes("node_local",173,"len")=8
+	Set gtmtypes("node_local",173,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","gvstats_rec.n_crit_failed")=173
+	Set gtmtypes("node_local",174,"name")="node_local.gvstats_rec.sq_crit_que_slps"
+	Set gtmtypes("node_local",174,"off")=113016
 	Set gtmtypes("node_local",174,"len")=8
 	Set gtmtypes("node_local",174,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","sec_size")=174
-	Set gtmtypes("node_local",175,"name")="node_local.jnlpool_shmid"
-	Set gtmtypes("node_local",175,"off")=55464
-	Set gtmtypes("node_local",175,"len")=4
-	Set gtmtypes("node_local",175,"type")="int"
-	Set gtmtypfldindx("node_local","jnlpool_shmid")=175
-	Set gtmtypes("node_local",176,"name")="node_local.lockspacefull_logged"
-	Set gtmtypes("node_local",176,"off")=55468
-	Set gtmtypes("node_local",176,"len")=4
-	Set gtmtypes("node_local",176,"type")="boolean_t"
-	Set gtmtypfldindx("node_local","lockspacefull_logged")=176
-	Set gtmtypes("node_local",177,"name")="node_local.trunc_pid"
-	Set gtmtypes("node_local",177,"off")=55472
-	Set gtmtypes("node_local",177,"len")=4
-	Set gtmtypes("node_local",177,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","trunc_pid")=177
-	Set gtmtypes("node_local",178,"name")="node_local.highest_lbm_with_busy_blk"
-	Set gtmtypes("node_local",178,"off")=55476
-	Set gtmtypes("node_local",178,"len")=4
-	Set gtmtypes("node_local",178,"type")="int"
-	Set gtmtypfldindx("node_local","highest_lbm_with_busy_blk")=178
-	Set gtmtypes("node_local",179,"name")="node_local.ftok_ops_array"
-	Set gtmtypes("node_local",179,"off")=55480
-	Set gtmtypes("node_local",179,"len")=8192
-	Set gtmtypes("node_local",179,"type")="ftokhist"
-	Set gtmtypfldindx("node_local","ftok_ops_array")=179
-	Set gtmtypes("node_local",179,"dim")=512
-	Set gtmtypes("node_local",180,"name")="node_local.ftok_ops_array[0].ftok_oper"
-	Set gtmtypes("node_local",180,"off")=55480
-	Set gtmtypes("node_local",180,"len")=4
-	Set gtmtypes("node_local",180,"type")="int"
-	Set gtmtypfldindx("node_local","ftok_ops_array[0].ftok_oper")=180
-	Set gtmtypes("node_local",181,"name")="node_local.ftok_ops_array[0].process_id"
-	Set gtmtypes("node_local",181,"off")=55484
-	Set gtmtypes("node_local",181,"len")=4
-	Set gtmtypes("node_local",181,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","ftok_ops_array[0].process_id")=181
-	Set gtmtypes("node_local",182,"name")="node_local.ftok_ops_array[0].cr_tn"
-	Set gtmtypes("node_local",182,"off")=55488
+	Set gtmtypfldindx("node_local","gvstats_rec.sq_crit_que_slps")=174
+	Set gtmtypes("node_local",175,"name")="node_local.gvstats_rec.n_crit_que_slps"
+	Set gtmtypes("node_local",175,"off")=113024
+	Set gtmtypes("node_local",175,"len")=8
+	Set gtmtypes("node_local",175,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","gvstats_rec.n_crit_que_slps")=175
+	Set gtmtypes("node_local",176,"name")="node_local.gvstats_rec.sq_crit_yields"
+	Set gtmtypes("node_local",176,"off")=113032
+	Set gtmtypes("node_local",176,"len")=8
+	Set gtmtypes("node_local",176,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","gvstats_rec.sq_crit_yields")=176
+	Set gtmtypes("node_local",177,"name")="node_local.gvstats_rec.n_crit_yields"
+	Set gtmtypes("node_local",177,"off")=113040
+	Set gtmtypes("node_local",177,"len")=8
+	Set gtmtypes("node_local",177,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","gvstats_rec.n_crit_yields")=177
+	Set gtmtypes("node_local",178,"name")="node_local.gvstats_rec.n_clean2dirty"
+	Set gtmtypes("node_local",178,"off")=113048
+	Set gtmtypes("node_local",178,"len")=8
+	Set gtmtypes("node_local",178,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","gvstats_rec.n_clean2dirty")=178
+	Set gtmtypes("node_local",179,"name")="node_local.last_wcsflu_tn"
+	Set gtmtypes("node_local",179,"off")=113056
+	Set gtmtypes("node_local",179,"len")=8
+	Set gtmtypes("node_local",179,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","last_wcsflu_tn")=179
+	Set gtmtypes("node_local",180,"name")="node_local.last_wcs_recover_tn"
+	Set gtmtypes("node_local",180,"off")=113064
+	Set gtmtypes("node_local",180,"len")=8
+	Set gtmtypes("node_local",180,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","last_wcs_recover_tn")=180
+	Set gtmtypes("node_local",181,"name")="node_local.encrypt_glo_buff_off"
+	Set gtmtypes("node_local",181,"off")=113072
+	Set gtmtypes("node_local",181,"len")=8
+	Set gtmtypes("node_local",181,"type")="intptr_t"
+	Set gtmtypfldindx("node_local","encrypt_glo_buff_off")=181
+	Set gtmtypes("node_local",182,"name")="node_local.snapshot_crit_latch"
+	Set gtmtypes("node_local",182,"off")=113080
 	Set gtmtypes("node_local",182,"len")=8
-	Set gtmtypes("node_local",182,"type")="uint64_t"
-	Set gtmtypfldindx("node_local","ftok_ops_array[0].cr_tn")=182
-	Set gtmtypes("node_local",183,"name")="node_local.root_search_cycle"
-	Set gtmtypes("node_local",183,"off")=63672
-	Set gtmtypes("node_local",183,"len")=4
-	Set gtmtypes("node_local",183,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","root_search_cycle")=183
-	Set gtmtypes("node_local",184,"name")="node_local.onln_rlbk_cycle"
-	Set gtmtypes("node_local",184,"off")=63676
-	Set gtmtypes("node_local",184,"len")=4
-	Set gtmtypes("node_local",184,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","onln_rlbk_cycle")=184
-	Set gtmtypes("node_local",185,"name")="node_local.db_onln_rlbkd_cycle"
-	Set gtmtypes("node_local",185,"off")=63680
-	Set gtmtypes("node_local",185,"len")=4
-	Set gtmtypes("node_local",185,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","db_onln_rlbkd_cycle")=185
-	Set gtmtypes("node_local",186,"name")="node_local.onln_rlbk_pid"
-	Set gtmtypes("node_local",186,"off")=63684
+	Set gtmtypes("node_local",182,"type")="global_latch_t"
+	Set gtmtypfldindx("node_local","snapshot_crit_latch")=182
+	Set gtmtypes("node_local",183,"name")="node_local.snapshot_crit_latch.u"
+	Set gtmtypes("node_local",183,"off")=113080
+	Set gtmtypes("node_local",183,"len")=8
+	Set gtmtypes("node_local",183,"type")="union"
+	Set gtmtypfldindx("node_local","snapshot_crit_latch.u")=183
+	Set gtmtypes("node_local",184,"name")="node_local.snapshot_crit_latch.u.pid_imgcnt"
+	Set gtmtypes("node_local",184,"off")=113080
+	Set gtmtypes("node_local",184,"len")=8
+	Set gtmtypes("node_local",184,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","snapshot_crit_latch.u.pid_imgcnt")=184
+	Set gtmtypes("node_local",185,"name")="node_local.snapshot_crit_latch.u.parts"
+	Set gtmtypes("node_local",185,"off")=113080
+	Set gtmtypes("node_local",185,"len")=8
+	Set gtmtypes("node_local",185,"type")="struct"
+	Set gtmtypfldindx("node_local","snapshot_crit_latch.u.parts")=185
+	Set gtmtypes("node_local",186,"name")="node_local.snapshot_crit_latch.u.parts.latch_pid"
+	Set gtmtypes("node_local",186,"off")=113080
 	Set gtmtypes("node_local",186,"len")=4
-	Set gtmtypes("node_local",186,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","onln_rlbk_pid")=186
-	Set gtmtypes("node_local",187,"name")="node_local.dbrndwn_ftok_skip"
-	Set gtmtypes("node_local",187,"off")=63688
+	Set gtmtypes("node_local",186,"type")="int"
+	Set gtmtypfldindx("node_local","snapshot_crit_latch.u.parts.latch_pid")=186
+	Set gtmtypes("node_local",187,"name")="node_local.snapshot_crit_latch.u.parts.latch_word"
+	Set gtmtypes("node_local",187,"off")=113084
 	Set gtmtypes("node_local",187,"len")=4
-	Set gtmtypes("node_local",187,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","dbrndwn_ftok_skip")=187
-	Set gtmtypes("node_local",188,"name")="node_local.dbrndwn_access_skip"
-	Set gtmtypes("node_local",188,"off")=63692
-	Set gtmtypes("node_local",188,"len")=4
-	Set gtmtypes("node_local",188,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","dbrndwn_access_skip")=188
-	Set gtmtypes("node_local",189,"name")="node_local.fastinteg_in_prog"
-	Set gtmtypes("node_local",189,"off")=63696
+	Set gtmtypes("node_local",187,"type")="int"
+	Set gtmtypfldindx("node_local","snapshot_crit_latch.u.parts.latch_word")=187
+	Set gtmtypes("node_local",188,"name")="node_local.ss_shmid"
+	Set gtmtypes("node_local",188,"off")=113088
+	Set gtmtypes("node_local",188,"len")=8
+	Set gtmtypes("node_local",188,"type")="long"
+	Set gtmtypfldindx("node_local","ss_shmid")=188
+	Set gtmtypes("node_local",189,"name")="node_local.ss_shmcycle"
+	Set gtmtypes("node_local",189,"off")=113096
 	Set gtmtypes("node_local",189,"len")=4
-	Set gtmtypes("node_local",189,"type")="boolean_t"
-	Set gtmtypfldindx("node_local","fastinteg_in_prog")=189
-	Set gtmtypes("node_local",190,"name")="node_local.wtstart_errcnt"
-	Set gtmtypes("node_local",190,"off")=63700
+	Set gtmtypes("node_local",189,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","ss_shmcycle")=189
+	Set gtmtypes("node_local",190,"name")="node_local.snapshot_in_prog"
+	Set gtmtypes("node_local",190,"off")=113100
 	Set gtmtypes("node_local",190,"len")=4
-	Set gtmtypes("node_local",190,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","wtstart_errcnt")=190
-	Set gtmtypes("node_local",191,"name")="node_local.fake_db_enospc"
-	Set gtmtypes("node_local",191,"off")=63704
+	Set gtmtypes("node_local",190,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","snapshot_in_prog")=190
+	Set gtmtypes("node_local",191,"name")="node_local.num_snapshots_in_effect"
+	Set gtmtypes("node_local",191,"off")=113104
 	Set gtmtypes("node_local",191,"len")=4
-	Set gtmtypes("node_local",191,"type")="boolean_t"
-	Set gtmtypfldindx("node_local","fake_db_enospc")=191
-	Set gtmtypes("node_local",192,"name")="node_local.fake_jnl_enospc"
-	Set gtmtypes("node_local",192,"off")=63708
+	Set gtmtypes("node_local",191,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","num_snapshots_in_effect")=191
+	Set gtmtypes("node_local",192,"name")="node_local.wbox_test_seq_num"
+	Set gtmtypes("node_local",192,"off")=113108
 	Set gtmtypes("node_local",192,"len")=4
-	Set gtmtypes("node_local",192,"type")="boolean_t"
-	Set gtmtypfldindx("node_local","fake_jnl_enospc")=192
-	Set gtmtypes("node_local",193,"name")="node_local.doing_epoch"
-	Set gtmtypes("node_local",193,"off")=63712
-	Set gtmtypes("node_local",193,"len")=4
-	Set gtmtypes("node_local",193,"type")="boolean_t"
-	Set gtmtypfldindx("node_local","doing_epoch")=193
-	Set gtmtypes("node_local",194,"name")="node_local.epoch_taper_start_dbuffs"
-	Set gtmtypes("node_local",194,"off")=63716
-	Set gtmtypes("node_local",194,"len")=4
-	Set gtmtypes("node_local",194,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","epoch_taper_start_dbuffs")=194
-	Set gtmtypes("node_local",195,"name")="node_local.epoch_taper_need_fsync"
-	Set gtmtypes("node_local",195,"off")=63720
+	Set gtmtypes("node_local",192,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","wbox_test_seq_num")=192
+	Set gtmtypes("node_local",193,"name")="node_local.kip_pid_array"
+	Set gtmtypes("node_local",193,"off")=113112
+	Set gtmtypes("node_local",193,"len")=32
+	Set gtmtypes("node_local",193,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","kip_pid_array")=193
+	Set gtmtypes("node_local",193,"dim")=8
+	Set gtmtypes("node_local",194,"name")="node_local.sec_size"
+	Set gtmtypes("node_local",194,"off")=113144
+	Set gtmtypes("node_local",194,"len")=8
+	Set gtmtypes("node_local",194,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","sec_size")=194
+	Set gtmtypes("node_local",195,"name")="node_local.jnlpool_shmid"
+	Set gtmtypes("node_local",195,"off")=113152
 	Set gtmtypes("node_local",195,"len")=4
-	Set gtmtypes("node_local",195,"type")="boolean_t"
-	Set gtmtypfldindx("node_local","epoch_taper_need_fsync")=195
-	Set gtmtypes("node_local",196,"name")="node_local.wt_pid_array"
-	Set gtmtypes("node_local",196,"off")=63724
-	Set gtmtypes("node_local",196,"len")=16
-	Set gtmtypes("node_local",196,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","wt_pid_array")=196
-	Set gtmtypes("node_local",196,"dim")=4
-	Set gtmtypes("node_local",197,"name")="node_local.reorg_encrypt_pid"
-	Set gtmtypes("node_local",197,"off")=63740
+	Set gtmtypes("node_local",195,"type")="int"
+	Set gtmtypfldindx("node_local","jnlpool_shmid")=195
+	Set gtmtypes("node_local",196,"name")="node_local.lockspacefull_logged"
+	Set gtmtypes("node_local",196,"off")=113156
+	Set gtmtypes("node_local",196,"len")=4
+	Set gtmtypes("node_local",196,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","lockspacefull_logged")=196
+	Set gtmtypes("node_local",197,"name")="node_local.trunc_pid"
+	Set gtmtypes("node_local",197,"off")=113160
 	Set gtmtypes("node_local",197,"len")=4
 	Set gtmtypes("node_local",197,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","reorg_encrypt_pid")=197
-	Set gtmtypes("node_local",198,"name")="node_local.reorg_encrypt_cycle"
-	Set gtmtypes("node_local",198,"off")=63744
+	Set gtmtypfldindx("node_local","trunc_pid")=197
+	Set gtmtypes("node_local",198,"name")="node_local.highest_lbm_with_busy_blk"
+	Set gtmtypes("node_local",198,"off")=113164
 	Set gtmtypes("node_local",198,"len")=4
-	Set gtmtypes("node_local",198,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","reorg_encrypt_cycle")=198
-	Set gtmtypes("node_local",199,"name")="node_local.mupip_extract_count"
-	Set gtmtypes("node_local",199,"off")=63748
-	Set gtmtypes("node_local",199,"len")=4
-	Set gtmtypes("node_local",199,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","mupip_extract_count")=199
-	Set gtmtypes("node_local",200,"name")="node_local.saved_acc_meth"
-	Set gtmtypes("node_local",200,"off")=63752
+	Set gtmtypes("node_local",198,"type")="int"
+	Set gtmtypfldindx("node_local","highest_lbm_with_busy_blk")=198
+	Set gtmtypes("node_local",199,"name")="node_local.ftok_ops_array"
+	Set gtmtypes("node_local",199,"off")=113168
+	Set gtmtypes("node_local",199,"len")=8192
+	Set gtmtypes("node_local",199,"type")="ftokhist"
+	Set gtmtypfldindx("node_local","ftok_ops_array")=199
+	Set gtmtypes("node_local",199,"dim")=512
+	Set gtmtypes("node_local",200,"name")="node_local.ftok_ops_array[0].ftok_oper"
+	Set gtmtypes("node_local",200,"off")=113168
 	Set gtmtypes("node_local",200,"len")=4
 	Set gtmtypes("node_local",200,"type")="int"
-	Set gtmtypfldindx("node_local","saved_acc_meth")=200
-	Set gtmtypes("node_local",201,"name")="node_local.saved_blk_size"
-	Set gtmtypes("node_local",201,"off")=63756
+	Set gtmtypfldindx("node_local","ftok_ops_array[0].ftok_oper")=200
+	Set gtmtypes("node_local",201,"name")="node_local.ftok_ops_array[0].process_id"
+	Set gtmtypes("node_local",201,"off")=113172
 	Set gtmtypes("node_local",201,"len")=4
-	Set gtmtypes("node_local",201,"type")="int"
-	Set gtmtypfldindx("node_local","saved_blk_size")=201
-	Set gtmtypes("node_local",202,"name")="node_local.saved_lock_space_size"
-	Set gtmtypes("node_local",202,"off")=63760
-	Set gtmtypes("node_local",202,"len")=4
-	Set gtmtypes("node_local",202,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","saved_lock_space_size")=202
-	Set gtmtypes("node_local",203,"name")="node_local.saved_jnl_buffer_size"
-	Set gtmtypes("node_local",203,"off")=63764
+	Set gtmtypes("node_local",201,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","ftok_ops_array[0].process_id")=201
+	Set gtmtypes("node_local",202,"name")="node_local.ftok_ops_array[0].cr_tn"
+	Set gtmtypes("node_local",202,"off")=113176
+	Set gtmtypes("node_local",202,"len")=8
+	Set gtmtypes("node_local",202,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","ftok_ops_array[0].cr_tn")=202
+	Set gtmtypes("node_local",203,"name")="node_local.root_search_cycle"
+	Set gtmtypes("node_local",203,"off")=121360
 	Set gtmtypes("node_local",203,"len")=4
-	Set gtmtypes("node_local",203,"type")="int"
-	Set gtmtypfldindx("node_local","saved_jnl_buffer_size")=203
-	Set gtmtypes("node_local",204,"name")="node_local.lastwriterbypas_msg_issued"
-	Set gtmtypes("node_local",204,"off")=63768
+	Set gtmtypes("node_local",203,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","root_search_cycle")=203
+	Set gtmtypes("node_local",204,"name")="node_local.onln_rlbk_cycle"
+	Set gtmtypes("node_local",204,"off")=121364
 	Set gtmtypes("node_local",204,"len")=4
-	Set gtmtypes("node_local",204,"type")="boolean_t"
-	Set gtmtypfldindx("node_local","lastwriterbypas_msg_issued")=204
-	Set gtmtypes("node_local",205,"name")="node_local.first_writer_seen"
-	Set gtmtypes("node_local",205,"off")=63772
+	Set gtmtypes("node_local",204,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","onln_rlbk_cycle")=204
+	Set gtmtypes("node_local",205,"name")="node_local.db_onln_rlbkd_cycle"
+	Set gtmtypes("node_local",205,"off")=121368
 	Set gtmtypes("node_local",205,"len")=4
-	Set gtmtypes("node_local",205,"type")="boolean_t"
-	Set gtmtypfldindx("node_local","first_writer_seen")=205
-	Set gtmtypes("node_local",206,"name")="node_local.first_nonbypas_writer_seen"
-	Set gtmtypes("node_local",206,"off")=63776
+	Set gtmtypes("node_local",205,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","db_onln_rlbkd_cycle")=205
+	Set gtmtypes("node_local",206,"name")="node_local.onln_rlbk_pid"
+	Set gtmtypes("node_local",206,"off")=121372
 	Set gtmtypes("node_local",206,"len")=4
-	Set gtmtypes("node_local",206,"type")="boolean_t"
-	Set gtmtypfldindx("node_local","first_nonbypas_writer_seen")=206
-	Set gtmtypes("node_local",207,"name")="node_local.ftok_counter_halted"
-	Set gtmtypes("node_local",207,"off")=63780
+	Set gtmtypes("node_local",206,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","onln_rlbk_pid")=206
+	Set gtmtypes("node_local",207,"name")="node_local.dbrndwn_ftok_skip"
+	Set gtmtypes("node_local",207,"off")=121376
 	Set gtmtypes("node_local",207,"len")=4
-	Set gtmtypes("node_local",207,"type")="boolean_t"
-	Set gtmtypfldindx("node_local","ftok_counter_halted")=207
-	Set gtmtypes("node_local",208,"name")="node_local.access_counter_halted"
-	Set gtmtypes("node_local",208,"off")=63784
+	Set gtmtypes("node_local",207,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","dbrndwn_ftok_skip")=207
+	Set gtmtypes("node_local",208,"name")="node_local.dbrndwn_access_skip"
+	Set gtmtypes("node_local",208,"off")=121380
 	Set gtmtypes("node_local",208,"len")=4
-	Set gtmtypes("node_local",208,"type")="boolean_t"
-	Set gtmtypfldindx("node_local","access_counter_halted")=208
-	Set gtmtypes("node_local",209,"name")="node_local.filler_8byte_align1"
-	Set gtmtypes("node_local",209,"off")=63788
+	Set gtmtypes("node_local",208,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","dbrndwn_access_skip")=208
+	Set gtmtypes("node_local",209,"name")="node_local.fastinteg_in_prog"
+	Set gtmtypes("node_local",209,"off")=121384
 	Set gtmtypes("node_local",209,"len")=4
-	Set gtmtypes("node_local",209,"type")="unsigned-int"
-	Set gtmtypfldindx("node_local","filler_8byte_align1")=209
+	Set gtmtypes("node_local",209,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","fastinteg_in_prog")=209
+	Set gtmtypes("node_local",210,"name")="node_local.wtstart_errcnt"
+	Set gtmtypes("node_local",210,"off")=121388
+	Set gtmtypes("node_local",210,"len")=4
+	Set gtmtypes("node_local",210,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","wtstart_errcnt")=210
+	Set gtmtypes("node_local",211,"name")="node_local.fake_db_enospc"
+	Set gtmtypes("node_local",211,"off")=121392
+	Set gtmtypes("node_local",211,"len")=4
+	Set gtmtypes("node_local",211,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","fake_db_enospc")=211
+	Set gtmtypes("node_local",212,"name")="node_local.fake_jnl_enospc"
+	Set gtmtypes("node_local",212,"off")=121396
+	Set gtmtypes("node_local",212,"len")=4
+	Set gtmtypes("node_local",212,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","fake_jnl_enospc")=212
+	Set gtmtypes("node_local",213,"name")="node_local.doing_epoch"
+	Set gtmtypes("node_local",213,"off")=121400
+	Set gtmtypes("node_local",213,"len")=4
+	Set gtmtypes("node_local",213,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","doing_epoch")=213
+	Set gtmtypes("node_local",214,"name")="node_local.epoch_taper_start_dbuffs"
+	Set gtmtypes("node_local",214,"off")=121404
+	Set gtmtypes("node_local",214,"len")=4
+	Set gtmtypes("node_local",214,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","epoch_taper_start_dbuffs")=214
+	Set gtmtypes("node_local",215,"name")="node_local.epoch_taper_need_fsync"
+	Set gtmtypes("node_local",215,"off")=121408
+	Set gtmtypes("node_local",215,"len")=4
+	Set gtmtypes("node_local",215,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","epoch_taper_need_fsync")=215
+	Set gtmtypes("node_local",216,"name")="node_local.wt_pid_array"
+	Set gtmtypes("node_local",216,"off")=121412
+	Set gtmtypes("node_local",216,"len")=16
+	Set gtmtypes("node_local",216,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","wt_pid_array")=216
+	Set gtmtypes("node_local",216,"dim")=4
+	Set gtmtypes("node_local",217,"name")="node_local.reorg_encrypt_pid"
+	Set gtmtypes("node_local",217,"off")=121428
+	Set gtmtypes("node_local",217,"len")=4
+	Set gtmtypes("node_local",217,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","reorg_encrypt_pid")=217
+	Set gtmtypes("node_local",218,"name")="node_local.reorg_encrypt_cycle"
+	Set gtmtypes("node_local",218,"off")=121432
+	Set gtmtypes("node_local",218,"len")=4
+	Set gtmtypes("node_local",218,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","reorg_encrypt_cycle")=218
+	Set gtmtypes("node_local",219,"name")="node_local.mupip_extract_count"
+	Set gtmtypes("node_local",219,"off")=121436
+	Set gtmtypes("node_local",219,"len")=4
+	Set gtmtypes("node_local",219,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","mupip_extract_count")=219
+	Set gtmtypes("node_local",220,"name")="node_local.saved_acc_meth"
+	Set gtmtypes("node_local",220,"off")=121440
+	Set gtmtypes("node_local",220,"len")=4
+	Set gtmtypes("node_local",220,"type")="int"
+	Set gtmtypfldindx("node_local","saved_acc_meth")=220
+	Set gtmtypes("node_local",221,"name")="node_local.saved_blk_size"
+	Set gtmtypes("node_local",221,"off")=121444
+	Set gtmtypes("node_local",221,"len")=4
+	Set gtmtypes("node_local",221,"type")="int"
+	Set gtmtypfldindx("node_local","saved_blk_size")=221
+	Set gtmtypes("node_local",222,"name")="node_local.saved_lock_space_size"
+	Set gtmtypes("node_local",222,"off")=121448
+	Set gtmtypes("node_local",222,"len")=4
+	Set gtmtypes("node_local",222,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","saved_lock_space_size")=222
+	Set gtmtypes("node_local",223,"name")="node_local.saved_jnl_buffer_size"
+	Set gtmtypes("node_local",223,"off")=121452
+	Set gtmtypes("node_local",223,"len")=4
+	Set gtmtypes("node_local",223,"type")="int"
+	Set gtmtypfldindx("node_local","saved_jnl_buffer_size")=223
+	Set gtmtypes("node_local",224,"name")="node_local.lastwriterbypas_msg_issued"
+	Set gtmtypes("node_local",224,"off")=121456
+	Set gtmtypes("node_local",224,"len")=4
+	Set gtmtypes("node_local",224,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","lastwriterbypas_msg_issued")=224
+	Set gtmtypes("node_local",225,"name")="node_local.first_writer_seen"
+	Set gtmtypes("node_local",225,"off")=121460
+	Set gtmtypes("node_local",225,"len")=4
+	Set gtmtypes("node_local",225,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","first_writer_seen")=225
+	Set gtmtypes("node_local",226,"name")="node_local.first_nonbypas_writer_seen"
+	Set gtmtypes("node_local",226,"off")=121464
+	Set gtmtypes("node_local",226,"len")=4
+	Set gtmtypes("node_local",226,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","first_nonbypas_writer_seen")=226
+	Set gtmtypes("node_local",227,"name")="node_local.ftok_counter_halted"
+	Set gtmtypes("node_local",227,"off")=121468
+	Set gtmtypes("node_local",227,"len")=4
+	Set gtmtypes("node_local",227,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","ftok_counter_halted")=227
+	Set gtmtypes("node_local",228,"name")="node_local.access_counter_halted"
+	Set gtmtypes("node_local",228,"off")=121472
+	Set gtmtypes("node_local",228,"len")=4
+	Set gtmtypes("node_local",228,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","access_counter_halted")=228
+	Set gtmtypes("node_local",229,"name")="node_local.statsdb_created"
+	Set gtmtypes("node_local",229,"off")=121476
+	Set gtmtypes("node_local",229,"len")=4
+	Set gtmtypes("node_local",229,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","statsdb_created")=229
+	Set gtmtypes("node_local",230,"name")="node_local.statsdb_fname_len"
+	Set gtmtypes("node_local",230,"off")=121480
+	Set gtmtypes("node_local",230,"len")=4
+	Set gtmtypes("node_local",230,"type")="unsigned-int"
+	Set gtmtypfldindx("node_local","statsdb_fname_len")=230
+	Set gtmtypes("node_local",231,"name")="node_local.statsdb_rundown_clean"
+	Set gtmtypes("node_local",231,"off")=121484
+	Set gtmtypes("node_local",231,"len")=4
+	Set gtmtypes("node_local",231,"type")="boolean_t"
+	Set gtmtypfldindx("node_local","statsdb_rundown_clean")=231
+	Set gtmtypes("node_local",232,"name")="node_local.freeze_latch"
+	Set gtmtypes("node_local",232,"off")=121488
+	Set gtmtypes("node_local",232,"len")=8
+	Set gtmtypes("node_local",232,"type")="global_latch_t"
+	Set gtmtypfldindx("node_local","freeze_latch")=232
+	Set gtmtypes("node_local",233,"name")="node_local.freeze_latch.u"
+	Set gtmtypes("node_local",233,"off")=121488
+	Set gtmtypes("node_local",233,"len")=8
+	Set gtmtypes("node_local",233,"type")="union"
+	Set gtmtypfldindx("node_local","freeze_latch.u")=233
+	Set gtmtypes("node_local",234,"name")="node_local.freeze_latch.u.pid_imgcnt"
+	Set gtmtypes("node_local",234,"off")=121488
+	Set gtmtypes("node_local",234,"len")=8
+	Set gtmtypes("node_local",234,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","freeze_latch.u.pid_imgcnt")=234
+	Set gtmtypes("node_local",235,"name")="node_local.freeze_latch.u.parts"
+	Set gtmtypes("node_local",235,"off")=121488
+	Set gtmtypes("node_local",235,"len")=8
+	Set gtmtypes("node_local",235,"type")="struct"
+	Set gtmtypfldindx("node_local","freeze_latch.u.parts")=235
+	Set gtmtypes("node_local",236,"name")="node_local.freeze_latch.u.parts.latch_pid"
+	Set gtmtypes("node_local",236,"off")=121488
+	Set gtmtypes("node_local",236,"len")=4
+	Set gtmtypes("node_local",236,"type")="int"
+	Set gtmtypfldindx("node_local","freeze_latch.u.parts.latch_pid")=236
+	Set gtmtypes("node_local",237,"name")="node_local.freeze_latch.u.parts.latch_word"
+	Set gtmtypes("node_local",237,"off")=121492
+	Set gtmtypes("node_local",237,"len")=4
+	Set gtmtypes("node_local",237,"type")="int"
+	Set gtmtypfldindx("node_local","freeze_latch.u.parts.latch_word")=237
+	Set gtmtypes("node_local",238,"name")="node_local.wcs_buffs_freed"
+	Set gtmtypes("node_local",238,"off")=121496
+	Set gtmtypes("node_local",238,"len")=8
+	Set gtmtypes("node_local",238,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","wcs_buffs_freed")=238
+	Set gtmtypes("node_local",239,"name")="node_local.dskspace_next_fire"
+	Set gtmtypes("node_local",239,"off")=121504
+	Set gtmtypes("node_local",239,"len")=8
+	Set gtmtypes("node_local",239,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","dskspace_next_fire")=239
+	Set gtmtypes("node_local",240,"name")="node_local.lock_crit"
+	Set gtmtypes("node_local",240,"off")=121512
+	Set gtmtypes("node_local",240,"len")=8
+	Set gtmtypes("node_local",240,"type")="global_latch_t"
+	Set gtmtypfldindx("node_local","lock_crit")=240
+	Set gtmtypes("node_local",241,"name")="node_local.lock_crit.u"
+	Set gtmtypes("node_local",241,"off")=121512
+	Set gtmtypes("node_local",241,"len")=8
+	Set gtmtypes("node_local",241,"type")="union"
+	Set gtmtypfldindx("node_local","lock_crit.u")=241
+	Set gtmtypes("node_local",242,"name")="node_local.lock_crit.u.pid_imgcnt"
+	Set gtmtypes("node_local",242,"off")=121512
+	Set gtmtypes("node_local",242,"len")=8
+	Set gtmtypes("node_local",242,"type")="uint64_t"
+	Set gtmtypfldindx("node_local","lock_crit.u.pid_imgcnt")=242
+	Set gtmtypes("node_local",243,"name")="node_local.lock_crit.u.parts"
+	Set gtmtypes("node_local",243,"off")=121512
+	Set gtmtypes("node_local",243,"len")=8
+	Set gtmtypes("node_local",243,"type")="struct"
+	Set gtmtypfldindx("node_local","lock_crit.u.parts")=243
+	Set gtmtypes("node_local",244,"name")="node_local.lock_crit.u.parts.latch_pid"
+	Set gtmtypes("node_local",244,"off")=121512
+	Set gtmtypes("node_local",244,"len")=4
+	Set gtmtypes("node_local",244,"type")="int"
+	Set gtmtypfldindx("node_local","lock_crit.u.parts.latch_pid")=244
+	Set gtmtypes("node_local",245,"name")="node_local.lock_crit.u.parts.latch_word"
+	Set gtmtypes("node_local",245,"off")=121516
+	Set gtmtypes("node_local",245,"len")=4
+	Set gtmtypes("node_local",245,"type")="int"
+	Set gtmtypfldindx("node_local","lock_crit.u.parts.latch_word")=245
+	Set gtmtypes("node_local",246,"name")="node_local.tp_hint"
+	Set gtmtypes("node_local",246,"off")=121520
+	Set gtmtypes("node_local",246,"len")=4
+	Set gtmtypes("node_local",246,"type")="int"
+	Set gtmtypfldindx("node_local","tp_hint")=246
+	Set gtmtypes("node_local",247,"name")="node_local.filler_8byte_align6"
+	Set gtmtypes("node_local",247,"off")=121524
+	Set gtmtypes("node_local",247,"len")=4
+	Set gtmtypes("node_local",247,"type")="int"
+	Set gtmtypfldindx("node_local","filler_8byte_align6")=247
 	;
 	Set gtmtypes("noisolation_element")="struct"
 	Set gtmtypes("noisolation_element",0)=2
@@ -17829,11 +18259,11 @@ Init
 	;
 	Set gtmtypes("octabstruct")="struct"
 	Set gtmtypes("octabstruct",0)=1
-	Set gtmtypes("octabstruct","len")=2
+	Set gtmtypes("octabstruct","len")=4
 	Set gtmtypes("octabstruct",1,"name")="octabstruct.octype"
 	Set gtmtypes("octabstruct",1,"off")=0
-	Set gtmtypes("octabstruct",1,"len")=2
-	Set gtmtypes("octabstruct",1,"type")="unsigned-short"
+	Set gtmtypes("octabstruct",1,"len")=4
+	Set gtmtypes("octabstruct",1,"type")="unsigned-int"
 	Set gtmtypfldindx("octabstruct","octype")=1
 	;
 	Set gtmtypes("omi_cl_stat")="struct"
@@ -22454,8 +22884,8 @@ Init
 	Set gtmtypfldindx("redo_root_search_context","gv_currkey")=14
 	;
 	Set gtmtypes("reg_ctl_list")="struct"
-	Set gtmtypes("reg_ctl_list",0)=58
-	Set gtmtypes("reg_ctl_list","len")=448
+	Set gtmtypes("reg_ctl_list",0)=62
+	Set gtmtypes("reg_ctl_list","len")=472
 	Set gtmtypes("reg_ctl_list",1,"name")="reg_ctl_list.db_tn"
 	Set gtmtypes("reg_ctl_list",1,"off")=0
 	Set gtmtypes("reg_ctl_list",1,"len")=8
@@ -22754,6 +23184,26 @@ Init
 	Set gtmtypes("reg_ctl_list",58,"type")="boolean_t"
 	Set gtmtypfldindx("reg_ctl_list","last_jext_logical_rec")=58
 	Set gtmtypes("reg_ctl_list",58,"dim")=3
+	Set gtmtypes("reg_ctl_list",59,"name")="reg_ctl_list.dio_buff"
+	Set gtmtypes("reg_ctl_list",59,"off")=448
+	Set gtmtypes("reg_ctl_list",59,"len")=24
+	Set gtmtypes("reg_ctl_list",59,"type")="dio_buff_t"
+	Set gtmtypfldindx("reg_ctl_list","dio_buff")=59
+	Set gtmtypes("reg_ctl_list",60,"name")="reg_ctl_list.dio_buff.unaligned_size"
+	Set gtmtypes("reg_ctl_list",60,"off")=448
+	Set gtmtypes("reg_ctl_list",60,"len")=4
+	Set gtmtypes("reg_ctl_list",60,"type")="int"
+	Set gtmtypfldindx("reg_ctl_list","dio_buff.unaligned_size")=60
+	Set gtmtypes("reg_ctl_list",61,"name")="reg_ctl_list.dio_buff.unaligned"
+	Set gtmtypes("reg_ctl_list",61,"off")=456
+	Set gtmtypes("reg_ctl_list",61,"len")=8
+	Set gtmtypes("reg_ctl_list",61,"type")="addr"
+	Set gtmtypfldindx("reg_ctl_list","dio_buff.unaligned")=61
+	Set gtmtypes("reg_ctl_list",62,"name")="reg_ctl_list.dio_buff.aligned"
+	Set gtmtypes("reg_ctl_list",62,"off")=464
+	Set gtmtypes("reg_ctl_list",62,"len")=8
+	Set gtmtypes("reg_ctl_list",62,"type")="addr"
+	Set gtmtypfldindx("reg_ctl_list","dio_buff.aligned")=62
 	;
 	Set gtmtypes("reg_jrec_info_t")="struct"
 	Set gtmtypes("reg_jrec_info_t",0)=2
@@ -25813,8 +26263,8 @@ Init
 	Set gtmtypfldindx("sgmm_addrs","filler")=1
 	;
 	Set gtmtypes("sgmnt_addrs")="struct"
-	Set gtmtypes("sgmnt_addrs",0)=141
-	Set gtmtypes("sgmnt_addrs","len")=936
+	Set gtmtypes("sgmnt_addrs",0)=152
+	Set gtmtypes("sgmnt_addrs","len")=992
 	Set gtmtypes("sgmnt_addrs",1,"name")="sgmnt_addrs.hdr"
 	Set gtmtypes("sgmnt_addrs",1,"off")=0
 	Set gtmtypes("sgmnt_addrs",1,"len")=8
@@ -25967,564 +26417,619 @@ Init
 	Set gtmtypes("sgmnt_addrs",30,"len")=8
 	Set gtmtypes("sgmnt_addrs",30,"type")="addr"
 	Set gtmtypfldindx("sgmnt_addrs","acc_meth.bg.cache_state")=30
-	Set gtmtypes("sgmnt_addrs",31,"name")="sgmnt_addrs.gvstats_rec"
+	Set gtmtypes("sgmnt_addrs",31,"name")="sgmnt_addrs.gvstats_rec_p"
 	Set gtmtypes("sgmnt_addrs",31,"off")=224
-	Set gtmtypes("sgmnt_addrs",31,"len")=464
-	Set gtmtypes("sgmnt_addrs",31,"type")="gvstats_rec_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec")=31
-	Set gtmtypes("sgmnt_addrs",32,"name")="sgmnt_addrs.gvstats_rec.n_set"
-	Set gtmtypes("sgmnt_addrs",32,"off")=224
-	Set gtmtypes("sgmnt_addrs",32,"len")=8
-	Set gtmtypes("sgmnt_addrs",32,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_set")=32
-	Set gtmtypes("sgmnt_addrs",33,"name")="sgmnt_addrs.gvstats_rec.n_kill"
+	Set gtmtypes("sgmnt_addrs",31,"len")=8
+	Set gtmtypes("sgmnt_addrs",31,"type")="addr"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec_p")=31
+	Set gtmtypes("sgmnt_addrs",32,"name")="sgmnt_addrs.gvstats_rec"
+	Set gtmtypes("sgmnt_addrs",32,"off")=232
+	Set gtmtypes("sgmnt_addrs",32,"len")=472
+	Set gtmtypes("sgmnt_addrs",32,"type")="gvstats_rec_t"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec")=32
+	Set gtmtypes("sgmnt_addrs",33,"name")="sgmnt_addrs.gvstats_rec.n_set"
 	Set gtmtypes("sgmnt_addrs",33,"off")=232
 	Set gtmtypes("sgmnt_addrs",33,"len")=8
 	Set gtmtypes("sgmnt_addrs",33,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_kill")=33
-	Set gtmtypes("sgmnt_addrs",34,"name")="sgmnt_addrs.gvstats_rec.n_get"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_set")=33
+	Set gtmtypes("sgmnt_addrs",34,"name")="sgmnt_addrs.gvstats_rec.n_kill"
 	Set gtmtypes("sgmnt_addrs",34,"off")=240
 	Set gtmtypes("sgmnt_addrs",34,"len")=8
 	Set gtmtypes("sgmnt_addrs",34,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_get")=34
-	Set gtmtypes("sgmnt_addrs",35,"name")="sgmnt_addrs.gvstats_rec.n_data"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_kill")=34
+	Set gtmtypes("sgmnt_addrs",35,"name")="sgmnt_addrs.gvstats_rec.n_get"
 	Set gtmtypes("sgmnt_addrs",35,"off")=248
 	Set gtmtypes("sgmnt_addrs",35,"len")=8
 	Set gtmtypes("sgmnt_addrs",35,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_data")=35
-	Set gtmtypes("sgmnt_addrs",36,"name")="sgmnt_addrs.gvstats_rec.n_order"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_get")=35
+	Set gtmtypes("sgmnt_addrs",36,"name")="sgmnt_addrs.gvstats_rec.n_data"
 	Set gtmtypes("sgmnt_addrs",36,"off")=256
 	Set gtmtypes("sgmnt_addrs",36,"len")=8
 	Set gtmtypes("sgmnt_addrs",36,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_order")=36
-	Set gtmtypes("sgmnt_addrs",37,"name")="sgmnt_addrs.gvstats_rec.n_zprev"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_data")=36
+	Set gtmtypes("sgmnt_addrs",37,"name")="sgmnt_addrs.gvstats_rec.n_order"
 	Set gtmtypes("sgmnt_addrs",37,"off")=264
 	Set gtmtypes("sgmnt_addrs",37,"len")=8
 	Set gtmtypes("sgmnt_addrs",37,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_zprev")=37
-	Set gtmtypes("sgmnt_addrs",38,"name")="sgmnt_addrs.gvstats_rec.n_query"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_order")=37
+	Set gtmtypes("sgmnt_addrs",38,"name")="sgmnt_addrs.gvstats_rec.n_zprev"
 	Set gtmtypes("sgmnt_addrs",38,"off")=272
 	Set gtmtypes("sgmnt_addrs",38,"len")=8
 	Set gtmtypes("sgmnt_addrs",38,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_query")=38
-	Set gtmtypes("sgmnt_addrs",39,"name")="sgmnt_addrs.gvstats_rec.n_lock_success"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_zprev")=38
+	Set gtmtypes("sgmnt_addrs",39,"name")="sgmnt_addrs.gvstats_rec.n_query"
 	Set gtmtypes("sgmnt_addrs",39,"off")=280
 	Set gtmtypes("sgmnt_addrs",39,"len")=8
 	Set gtmtypes("sgmnt_addrs",39,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_lock_success")=39
-	Set gtmtypes("sgmnt_addrs",40,"name")="sgmnt_addrs.gvstats_rec.n_lock_fail"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_query")=39
+	Set gtmtypes("sgmnt_addrs",40,"name")="sgmnt_addrs.gvstats_rec.n_lock_success"
 	Set gtmtypes("sgmnt_addrs",40,"off")=288
 	Set gtmtypes("sgmnt_addrs",40,"len")=8
 	Set gtmtypes("sgmnt_addrs",40,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_lock_fail")=40
-	Set gtmtypes("sgmnt_addrs",41,"name")="sgmnt_addrs.gvstats_rec.db_curr_tn"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_lock_success")=40
+	Set gtmtypes("sgmnt_addrs",41,"name")="sgmnt_addrs.gvstats_rec.n_lock_fail"
 	Set gtmtypes("sgmnt_addrs",41,"off")=296
 	Set gtmtypes("sgmnt_addrs",41,"len")=8
 	Set gtmtypes("sgmnt_addrs",41,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.db_curr_tn")=41
-	Set gtmtypes("sgmnt_addrs",42,"name")="sgmnt_addrs.gvstats_rec.n_dsk_read"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_lock_fail")=41
+	Set gtmtypes("sgmnt_addrs",42,"name")="sgmnt_addrs.gvstats_rec.db_curr_tn"
 	Set gtmtypes("sgmnt_addrs",42,"off")=304
 	Set gtmtypes("sgmnt_addrs",42,"len")=8
 	Set gtmtypes("sgmnt_addrs",42,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_dsk_read")=42
-	Set gtmtypes("sgmnt_addrs",43,"name")="sgmnt_addrs.gvstats_rec.n_dsk_write"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.db_curr_tn")=42
+	Set gtmtypes("sgmnt_addrs",43,"name")="sgmnt_addrs.gvstats_rec.n_dsk_read"
 	Set gtmtypes("sgmnt_addrs",43,"off")=312
 	Set gtmtypes("sgmnt_addrs",43,"len")=8
 	Set gtmtypes("sgmnt_addrs",43,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_dsk_write")=43
-	Set gtmtypes("sgmnt_addrs",44,"name")="sgmnt_addrs.gvstats_rec.n_nontp_readwrite"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_dsk_read")=43
+	Set gtmtypes("sgmnt_addrs",44,"name")="sgmnt_addrs.gvstats_rec.n_dsk_write"
 	Set gtmtypes("sgmnt_addrs",44,"off")=320
 	Set gtmtypes("sgmnt_addrs",44,"len")=8
 	Set gtmtypes("sgmnt_addrs",44,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_nontp_readwrite")=44
-	Set gtmtypes("sgmnt_addrs",45,"name")="sgmnt_addrs.gvstats_rec.n_nontp_readonly"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_dsk_write")=44
+	Set gtmtypes("sgmnt_addrs",45,"name")="sgmnt_addrs.gvstats_rec.n_nontp_readwrite"
 	Set gtmtypes("sgmnt_addrs",45,"off")=328
 	Set gtmtypes("sgmnt_addrs",45,"len")=8
 	Set gtmtypes("sgmnt_addrs",45,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_nontp_readonly")=45
-	Set gtmtypes("sgmnt_addrs",46,"name")="sgmnt_addrs.gvstats_rec.n_nontp_blkwrite"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_nontp_readwrite")=45
+	Set gtmtypes("sgmnt_addrs",46,"name")="sgmnt_addrs.gvstats_rec.n_nontp_readonly"
 	Set gtmtypes("sgmnt_addrs",46,"off")=336
 	Set gtmtypes("sgmnt_addrs",46,"len")=8
 	Set gtmtypes("sgmnt_addrs",46,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_nontp_blkwrite")=46
-	Set gtmtypes("sgmnt_addrs",47,"name")="sgmnt_addrs.gvstats_rec.n_nontp_blkread"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_nontp_readonly")=46
+	Set gtmtypes("sgmnt_addrs",47,"name")="sgmnt_addrs.gvstats_rec.n_nontp_blkwrite"
 	Set gtmtypes("sgmnt_addrs",47,"off")=344
 	Set gtmtypes("sgmnt_addrs",47,"len")=8
 	Set gtmtypes("sgmnt_addrs",47,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_nontp_blkread")=47
-	Set gtmtypes("sgmnt_addrs",48,"name")="sgmnt_addrs.gvstats_rec.n_nontp_retries_0"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_nontp_blkwrite")=47
+	Set gtmtypes("sgmnt_addrs",48,"name")="sgmnt_addrs.gvstats_rec.n_nontp_blkread"
 	Set gtmtypes("sgmnt_addrs",48,"off")=352
 	Set gtmtypes("sgmnt_addrs",48,"len")=8
 	Set gtmtypes("sgmnt_addrs",48,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_nontp_retries_0")=48
-	Set gtmtypes("sgmnt_addrs",49,"name")="sgmnt_addrs.gvstats_rec.n_nontp_retries_1"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_nontp_blkread")=48
+	Set gtmtypes("sgmnt_addrs",49,"name")="sgmnt_addrs.gvstats_rec.n_nontp_retries_0"
 	Set gtmtypes("sgmnt_addrs",49,"off")=360
 	Set gtmtypes("sgmnt_addrs",49,"len")=8
 	Set gtmtypes("sgmnt_addrs",49,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_nontp_retries_1")=49
-	Set gtmtypes("sgmnt_addrs",50,"name")="sgmnt_addrs.gvstats_rec.n_nontp_retries_2"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_nontp_retries_0")=49
+	Set gtmtypes("sgmnt_addrs",50,"name")="sgmnt_addrs.gvstats_rec.n_nontp_retries_1"
 	Set gtmtypes("sgmnt_addrs",50,"off")=368
 	Set gtmtypes("sgmnt_addrs",50,"len")=8
 	Set gtmtypes("sgmnt_addrs",50,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_nontp_retries_2")=50
-	Set gtmtypes("sgmnt_addrs",51,"name")="sgmnt_addrs.gvstats_rec.n_nontp_retries_3"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_nontp_retries_1")=50
+	Set gtmtypes("sgmnt_addrs",51,"name")="sgmnt_addrs.gvstats_rec.n_nontp_retries_2"
 	Set gtmtypes("sgmnt_addrs",51,"off")=376
 	Set gtmtypes("sgmnt_addrs",51,"len")=8
 	Set gtmtypes("sgmnt_addrs",51,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_nontp_retries_3")=51
-	Set gtmtypes("sgmnt_addrs",52,"name")="sgmnt_addrs.gvstats_rec.n_tp_readwrite"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_nontp_retries_2")=51
+	Set gtmtypes("sgmnt_addrs",52,"name")="sgmnt_addrs.gvstats_rec.n_nontp_retries_3"
 	Set gtmtypes("sgmnt_addrs",52,"off")=384
 	Set gtmtypes("sgmnt_addrs",52,"len")=8
 	Set gtmtypes("sgmnt_addrs",52,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_readwrite")=52
-	Set gtmtypes("sgmnt_addrs",53,"name")="sgmnt_addrs.gvstats_rec.n_tp_readonly"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_nontp_retries_3")=52
+	Set gtmtypes("sgmnt_addrs",53,"name")="sgmnt_addrs.gvstats_rec.n_tp_readwrite"
 	Set gtmtypes("sgmnt_addrs",53,"off")=392
 	Set gtmtypes("sgmnt_addrs",53,"len")=8
 	Set gtmtypes("sgmnt_addrs",53,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_readonly")=53
-	Set gtmtypes("sgmnt_addrs",54,"name")="sgmnt_addrs.gvstats_rec.n_tp_rolledback"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_readwrite")=53
+	Set gtmtypes("sgmnt_addrs",54,"name")="sgmnt_addrs.gvstats_rec.n_tp_readonly"
 	Set gtmtypes("sgmnt_addrs",54,"off")=400
 	Set gtmtypes("sgmnt_addrs",54,"len")=8
 	Set gtmtypes("sgmnt_addrs",54,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_rolledback")=54
-	Set gtmtypes("sgmnt_addrs",55,"name")="sgmnt_addrs.gvstats_rec.n_tp_blkwrite"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_readonly")=54
+	Set gtmtypes("sgmnt_addrs",55,"name")="sgmnt_addrs.gvstats_rec.n_tp_rolledback"
 	Set gtmtypes("sgmnt_addrs",55,"off")=408
 	Set gtmtypes("sgmnt_addrs",55,"len")=8
 	Set gtmtypes("sgmnt_addrs",55,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_blkwrite")=55
-	Set gtmtypes("sgmnt_addrs",56,"name")="sgmnt_addrs.gvstats_rec.n_tp_blkread"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_rolledback")=55
+	Set gtmtypes("sgmnt_addrs",56,"name")="sgmnt_addrs.gvstats_rec.n_tp_blkwrite"
 	Set gtmtypes("sgmnt_addrs",56,"off")=416
 	Set gtmtypes("sgmnt_addrs",56,"len")=8
 	Set gtmtypes("sgmnt_addrs",56,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_blkread")=56
-	Set gtmtypes("sgmnt_addrs",57,"name")="sgmnt_addrs.gvstats_rec.n_tp_tot_retries_0"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_blkwrite")=56
+	Set gtmtypes("sgmnt_addrs",57,"name")="sgmnt_addrs.gvstats_rec.n_tp_blkread"
 	Set gtmtypes("sgmnt_addrs",57,"off")=424
 	Set gtmtypes("sgmnt_addrs",57,"len")=8
 	Set gtmtypes("sgmnt_addrs",57,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_tot_retries_0")=57
-	Set gtmtypes("sgmnt_addrs",58,"name")="sgmnt_addrs.gvstats_rec.n_tp_tot_retries_1"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_blkread")=57
+	Set gtmtypes("sgmnt_addrs",58,"name")="sgmnt_addrs.gvstats_rec.n_tp_tot_retries_0"
 	Set gtmtypes("sgmnt_addrs",58,"off")=432
 	Set gtmtypes("sgmnt_addrs",58,"len")=8
 	Set gtmtypes("sgmnt_addrs",58,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_tot_retries_1")=58
-	Set gtmtypes("sgmnt_addrs",59,"name")="sgmnt_addrs.gvstats_rec.n_tp_tot_retries_2"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_tot_retries_0")=58
+	Set gtmtypes("sgmnt_addrs",59,"name")="sgmnt_addrs.gvstats_rec.n_tp_tot_retries_1"
 	Set gtmtypes("sgmnt_addrs",59,"off")=440
 	Set gtmtypes("sgmnt_addrs",59,"len")=8
 	Set gtmtypes("sgmnt_addrs",59,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_tot_retries_2")=59
-	Set gtmtypes("sgmnt_addrs",60,"name")="sgmnt_addrs.gvstats_rec.n_tp_tot_retries_3"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_tot_retries_1")=59
+	Set gtmtypes("sgmnt_addrs",60,"name")="sgmnt_addrs.gvstats_rec.n_tp_tot_retries_2"
 	Set gtmtypes("sgmnt_addrs",60,"off")=448
 	Set gtmtypes("sgmnt_addrs",60,"len")=8
 	Set gtmtypes("sgmnt_addrs",60,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_tot_retries_3")=60
-	Set gtmtypes("sgmnt_addrs",61,"name")="sgmnt_addrs.gvstats_rec.n_tp_tot_retries_4"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_tot_retries_2")=60
+	Set gtmtypes("sgmnt_addrs",61,"name")="sgmnt_addrs.gvstats_rec.n_tp_tot_retries_3"
 	Set gtmtypes("sgmnt_addrs",61,"off")=456
 	Set gtmtypes("sgmnt_addrs",61,"len")=8
 	Set gtmtypes("sgmnt_addrs",61,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_tot_retries_4")=61
-	Set gtmtypes("sgmnt_addrs",62,"name")="sgmnt_addrs.gvstats_rec.n_tp_cnflct_retries_0"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_tot_retries_3")=61
+	Set gtmtypes("sgmnt_addrs",62,"name")="sgmnt_addrs.gvstats_rec.n_tp_tot_retries_4"
 	Set gtmtypes("sgmnt_addrs",62,"off")=464
 	Set gtmtypes("sgmnt_addrs",62,"len")=8
 	Set gtmtypes("sgmnt_addrs",62,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_cnflct_retries_0")=62
-	Set gtmtypes("sgmnt_addrs",63,"name")="sgmnt_addrs.gvstats_rec.n_tp_cnflct_retries_1"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_tot_retries_4")=62
+	Set gtmtypes("sgmnt_addrs",63,"name")="sgmnt_addrs.gvstats_rec.n_tp_cnflct_retries_0"
 	Set gtmtypes("sgmnt_addrs",63,"off")=472
 	Set gtmtypes("sgmnt_addrs",63,"len")=8
 	Set gtmtypes("sgmnt_addrs",63,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_cnflct_retries_1")=63
-	Set gtmtypes("sgmnt_addrs",64,"name")="sgmnt_addrs.gvstats_rec.n_tp_cnflct_retries_2"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_cnflct_retries_0")=63
+	Set gtmtypes("sgmnt_addrs",64,"name")="sgmnt_addrs.gvstats_rec.n_tp_cnflct_retries_1"
 	Set gtmtypes("sgmnt_addrs",64,"off")=480
 	Set gtmtypes("sgmnt_addrs",64,"len")=8
 	Set gtmtypes("sgmnt_addrs",64,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_cnflct_retries_2")=64
-	Set gtmtypes("sgmnt_addrs",65,"name")="sgmnt_addrs.gvstats_rec.n_tp_cnflct_retries_3"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_cnflct_retries_1")=64
+	Set gtmtypes("sgmnt_addrs",65,"name")="sgmnt_addrs.gvstats_rec.n_tp_cnflct_retries_2"
 	Set gtmtypes("sgmnt_addrs",65,"off")=488
 	Set gtmtypes("sgmnt_addrs",65,"len")=8
 	Set gtmtypes("sgmnt_addrs",65,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_cnflct_retries_3")=65
-	Set gtmtypes("sgmnt_addrs",66,"name")="sgmnt_addrs.gvstats_rec.n_tp_cnflct_retries_4"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_cnflct_retries_2")=65
+	Set gtmtypes("sgmnt_addrs",66,"name")="sgmnt_addrs.gvstats_rec.n_tp_cnflct_retries_3"
 	Set gtmtypes("sgmnt_addrs",66,"off")=496
 	Set gtmtypes("sgmnt_addrs",66,"len")=8
 	Set gtmtypes("sgmnt_addrs",66,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_cnflct_retries_4")=66
-	Set gtmtypes("sgmnt_addrs",67,"name")="sgmnt_addrs.gvstats_rec.n_ztrigger"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_cnflct_retries_3")=66
+	Set gtmtypes("sgmnt_addrs",67,"name")="sgmnt_addrs.gvstats_rec.n_tp_cnflct_retries_4"
 	Set gtmtypes("sgmnt_addrs",67,"off")=504
 	Set gtmtypes("sgmnt_addrs",67,"len")=8
 	Set gtmtypes("sgmnt_addrs",67,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_ztrigger")=67
-	Set gtmtypes("sgmnt_addrs",68,"name")="sgmnt_addrs.gvstats_rec.n_db_flush"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_tp_cnflct_retries_4")=67
+	Set gtmtypes("sgmnt_addrs",68,"name")="sgmnt_addrs.gvstats_rec.n_ztrigger"
 	Set gtmtypes("sgmnt_addrs",68,"off")=512
 	Set gtmtypes("sgmnt_addrs",68,"len")=8
 	Set gtmtypes("sgmnt_addrs",68,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_db_flush")=68
-	Set gtmtypes("sgmnt_addrs",69,"name")="sgmnt_addrs.gvstats_rec.n_db_fsync"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_ztrigger")=68
+	Set gtmtypes("sgmnt_addrs",69,"name")="sgmnt_addrs.gvstats_rec.n_db_flush"
 	Set gtmtypes("sgmnt_addrs",69,"off")=520
 	Set gtmtypes("sgmnt_addrs",69,"len")=8
 	Set gtmtypes("sgmnt_addrs",69,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_db_fsync")=69
-	Set gtmtypes("sgmnt_addrs",70,"name")="sgmnt_addrs.gvstats_rec.n_jnl_flush"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_db_flush")=69
+	Set gtmtypes("sgmnt_addrs",70,"name")="sgmnt_addrs.gvstats_rec.n_db_fsync"
 	Set gtmtypes("sgmnt_addrs",70,"off")=528
 	Set gtmtypes("sgmnt_addrs",70,"len")=8
 	Set gtmtypes("sgmnt_addrs",70,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jnl_flush")=70
-	Set gtmtypes("sgmnt_addrs",71,"name")="sgmnt_addrs.gvstats_rec.n_jnl_fsync"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_db_fsync")=70
+	Set gtmtypes("sgmnt_addrs",71,"name")="sgmnt_addrs.gvstats_rec.n_jnl_flush"
 	Set gtmtypes("sgmnt_addrs",71,"off")=536
 	Set gtmtypes("sgmnt_addrs",71,"len")=8
 	Set gtmtypes("sgmnt_addrs",71,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jnl_fsync")=71
-	Set gtmtypes("sgmnt_addrs",72,"name")="sgmnt_addrs.gvstats_rec.n_jbuff_bytes"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jnl_flush")=71
+	Set gtmtypes("sgmnt_addrs",72,"name")="sgmnt_addrs.gvstats_rec.n_jnl_fsync"
 	Set gtmtypes("sgmnt_addrs",72,"off")=544
 	Set gtmtypes("sgmnt_addrs",72,"len")=8
 	Set gtmtypes("sgmnt_addrs",72,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jbuff_bytes")=72
-	Set gtmtypes("sgmnt_addrs",73,"name")="sgmnt_addrs.gvstats_rec.n_jfile_bytes"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jnl_fsync")=72
+	Set gtmtypes("sgmnt_addrs",73,"name")="sgmnt_addrs.gvstats_rec.n_jbuff_bytes"
 	Set gtmtypes("sgmnt_addrs",73,"off")=552
 	Set gtmtypes("sgmnt_addrs",73,"len")=8
 	Set gtmtypes("sgmnt_addrs",73,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jfile_bytes")=73
-	Set gtmtypes("sgmnt_addrs",74,"name")="sgmnt_addrs.gvstats_rec.n_jfile_writes"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jbuff_bytes")=73
+	Set gtmtypes("sgmnt_addrs",74,"name")="sgmnt_addrs.gvstats_rec.n_jfile_bytes"
 	Set gtmtypes("sgmnt_addrs",74,"off")=560
 	Set gtmtypes("sgmnt_addrs",74,"len")=8
 	Set gtmtypes("sgmnt_addrs",74,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jfile_writes")=74
-	Set gtmtypes("sgmnt_addrs",75,"name")="sgmnt_addrs.gvstats_rec.n_jrec_logical"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jfile_bytes")=74
+	Set gtmtypes("sgmnt_addrs",75,"name")="sgmnt_addrs.gvstats_rec.n_jfile_writes"
 	Set gtmtypes("sgmnt_addrs",75,"off")=568
 	Set gtmtypes("sgmnt_addrs",75,"len")=8
 	Set gtmtypes("sgmnt_addrs",75,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jrec_logical")=75
-	Set gtmtypes("sgmnt_addrs",76,"name")="sgmnt_addrs.gvstats_rec.n_jrec_pblk"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jfile_writes")=75
+	Set gtmtypes("sgmnt_addrs",76,"name")="sgmnt_addrs.gvstats_rec.n_jrec_logical"
 	Set gtmtypes("sgmnt_addrs",76,"off")=576
 	Set gtmtypes("sgmnt_addrs",76,"len")=8
 	Set gtmtypes("sgmnt_addrs",76,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jrec_pblk")=76
-	Set gtmtypes("sgmnt_addrs",77,"name")="sgmnt_addrs.gvstats_rec.n_jrec_epoch_regular"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jrec_logical")=76
+	Set gtmtypes("sgmnt_addrs",77,"name")="sgmnt_addrs.gvstats_rec.n_jrec_pblk"
 	Set gtmtypes("sgmnt_addrs",77,"off")=584
 	Set gtmtypes("sgmnt_addrs",77,"len")=8
 	Set gtmtypes("sgmnt_addrs",77,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jrec_epoch_regular")=77
-	Set gtmtypes("sgmnt_addrs",78,"name")="sgmnt_addrs.gvstats_rec.n_jrec_epoch_idle"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jrec_pblk")=77
+	Set gtmtypes("sgmnt_addrs",78,"name")="sgmnt_addrs.gvstats_rec.n_jrec_epoch_regular"
 	Set gtmtypes("sgmnt_addrs",78,"off")=592
 	Set gtmtypes("sgmnt_addrs",78,"len")=8
 	Set gtmtypes("sgmnt_addrs",78,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jrec_epoch_idle")=78
-	Set gtmtypes("sgmnt_addrs",79,"name")="sgmnt_addrs.gvstats_rec.n_jrec_other"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jrec_epoch_regular")=78
+	Set gtmtypes("sgmnt_addrs",79,"name")="sgmnt_addrs.gvstats_rec.n_jrec_epoch_idle"
 	Set gtmtypes("sgmnt_addrs",79,"off")=600
 	Set gtmtypes("sgmnt_addrs",79,"len")=8
 	Set gtmtypes("sgmnt_addrs",79,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jrec_other")=79
-	Set gtmtypes("sgmnt_addrs",80,"name")="sgmnt_addrs.gvstats_rec.n_jnl_extends"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jrec_epoch_idle")=79
+	Set gtmtypes("sgmnt_addrs",80,"name")="sgmnt_addrs.gvstats_rec.n_jrec_other"
 	Set gtmtypes("sgmnt_addrs",80,"off")=608
 	Set gtmtypes("sgmnt_addrs",80,"len")=8
 	Set gtmtypes("sgmnt_addrs",80,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jnl_extends")=80
-	Set gtmtypes("sgmnt_addrs",81,"name")="sgmnt_addrs.gvstats_rec.n_db_extends"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jrec_other")=80
+	Set gtmtypes("sgmnt_addrs",81,"name")="sgmnt_addrs.gvstats_rec.n_jnl_extends"
 	Set gtmtypes("sgmnt_addrs",81,"off")=616
 	Set gtmtypes("sgmnt_addrs",81,"len")=8
 	Set gtmtypes("sgmnt_addrs",81,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_db_extends")=81
-	Set gtmtypes("sgmnt_addrs",82,"name")="sgmnt_addrs.gvstats_rec.n_crit_success"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_jnl_extends")=81
+	Set gtmtypes("sgmnt_addrs",82,"name")="sgmnt_addrs.gvstats_rec.n_db_extends"
 	Set gtmtypes("sgmnt_addrs",82,"off")=624
 	Set gtmtypes("sgmnt_addrs",82,"len")=8
 	Set gtmtypes("sgmnt_addrs",82,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_crit_success")=82
-	Set gtmtypes("sgmnt_addrs",83,"name")="sgmnt_addrs.gvstats_rec.n_crits_in_epch"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_db_extends")=82
+	Set gtmtypes("sgmnt_addrs",83,"name")="sgmnt_addrs.gvstats_rec.n_crit_success"
 	Set gtmtypes("sgmnt_addrs",83,"off")=632
 	Set gtmtypes("sgmnt_addrs",83,"len")=8
 	Set gtmtypes("sgmnt_addrs",83,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_crits_in_epch")=83
-	Set gtmtypes("sgmnt_addrs",84,"name")="sgmnt_addrs.gvstats_rec.sq_crit_failed"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_crit_success")=83
+	Set gtmtypes("sgmnt_addrs",84,"name")="sgmnt_addrs.gvstats_rec.n_crits_in_epch"
 	Set gtmtypes("sgmnt_addrs",84,"off")=640
 	Set gtmtypes("sgmnt_addrs",84,"len")=8
 	Set gtmtypes("sgmnt_addrs",84,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.sq_crit_failed")=84
-	Set gtmtypes("sgmnt_addrs",85,"name")="sgmnt_addrs.gvstats_rec.n_crit_failed"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_crits_in_epch")=84
+	Set gtmtypes("sgmnt_addrs",85,"name")="sgmnt_addrs.gvstats_rec.sq_crit_failed"
 	Set gtmtypes("sgmnt_addrs",85,"off")=648
 	Set gtmtypes("sgmnt_addrs",85,"len")=8
 	Set gtmtypes("sgmnt_addrs",85,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_crit_failed")=85
-	Set gtmtypes("sgmnt_addrs",86,"name")="sgmnt_addrs.gvstats_rec.sq_crit_que_slps"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.sq_crit_failed")=85
+	Set gtmtypes("sgmnt_addrs",86,"name")="sgmnt_addrs.gvstats_rec.n_crit_failed"
 	Set gtmtypes("sgmnt_addrs",86,"off")=656
 	Set gtmtypes("sgmnt_addrs",86,"len")=8
 	Set gtmtypes("sgmnt_addrs",86,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.sq_crit_que_slps")=86
-	Set gtmtypes("sgmnt_addrs",87,"name")="sgmnt_addrs.gvstats_rec.n_crit_que_slps"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_crit_failed")=86
+	Set gtmtypes("sgmnt_addrs",87,"name")="sgmnt_addrs.gvstats_rec.sq_crit_que_slps"
 	Set gtmtypes("sgmnt_addrs",87,"off")=664
 	Set gtmtypes("sgmnt_addrs",87,"len")=8
 	Set gtmtypes("sgmnt_addrs",87,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_crit_que_slps")=87
-	Set gtmtypes("sgmnt_addrs",88,"name")="sgmnt_addrs.gvstats_rec.sq_crit_yields"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.sq_crit_que_slps")=87
+	Set gtmtypes("sgmnt_addrs",88,"name")="sgmnt_addrs.gvstats_rec.n_crit_que_slps"
 	Set gtmtypes("sgmnt_addrs",88,"off")=672
 	Set gtmtypes("sgmnt_addrs",88,"len")=8
 	Set gtmtypes("sgmnt_addrs",88,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.sq_crit_yields")=88
-	Set gtmtypes("sgmnt_addrs",89,"name")="sgmnt_addrs.gvstats_rec.n_crit_yields"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_crit_que_slps")=88
+	Set gtmtypes("sgmnt_addrs",89,"name")="sgmnt_addrs.gvstats_rec.sq_crit_yields"
 	Set gtmtypes("sgmnt_addrs",89,"off")=680
 	Set gtmtypes("sgmnt_addrs",89,"len")=8
 	Set gtmtypes("sgmnt_addrs",89,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_crit_yields")=89
-	Set gtmtypes("sgmnt_addrs",90,"name")="sgmnt_addrs.dbsync_timer_tn"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.sq_crit_yields")=89
+	Set gtmtypes("sgmnt_addrs",90,"name")="sgmnt_addrs.gvstats_rec.n_crit_yields"
 	Set gtmtypes("sgmnt_addrs",90,"off")=688
 	Set gtmtypes("sgmnt_addrs",90,"len")=8
 	Set gtmtypes("sgmnt_addrs",90,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","dbsync_timer_tn")=90
-	Set gtmtypes("sgmnt_addrs",91,"name")="sgmnt_addrs.fullblockwrite_len"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_crit_yields")=90
+	Set gtmtypes("sgmnt_addrs",91,"name")="sgmnt_addrs.gvstats_rec.n_clean2dirty"
 	Set gtmtypes("sgmnt_addrs",91,"off")=696
 	Set gtmtypes("sgmnt_addrs",91,"len")=8
-	Set gtmtypes("sgmnt_addrs",91,"type")="size_t"
-	Set gtmtypfldindx("sgmnt_addrs","fullblockwrite_len")=91
-	Set gtmtypes("sgmnt_addrs",92,"name")="sgmnt_addrs.total_blks"
+	Set gtmtypes("sgmnt_addrs",91,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_addrs","gvstats_rec.n_clean2dirty")=91
+	Set gtmtypes("sgmnt_addrs",92,"name")="sgmnt_addrs.dbsync_timer_tn"
 	Set gtmtypes("sgmnt_addrs",92,"off")=704
-	Set gtmtypes("sgmnt_addrs",92,"len")=4
-	Set gtmtypes("sgmnt_addrs",92,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_addrs","total_blks")=92
-	Set gtmtypes("sgmnt_addrs",93,"name")="sgmnt_addrs.prev_free_blks"
-	Set gtmtypes("sgmnt_addrs",93,"off")=708
-	Set gtmtypes("sgmnt_addrs",93,"len")=4
-	Set gtmtypes("sgmnt_addrs",93,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_addrs","prev_free_blks")=93
-	Set gtmtypes("sgmnt_addrs",94,"name")="sgmnt_addrs.timer"
-	Set gtmtypes("sgmnt_addrs",94,"off")=712
-	Set gtmtypes("sgmnt_addrs",94,"len")=4
-	Set gtmtypes("sgmnt_addrs",94,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_addrs","timer")=94
-	Set gtmtypes("sgmnt_addrs",95,"name")="sgmnt_addrs.in_wtstart"
-	Set gtmtypes("sgmnt_addrs",95,"off")=716
-	Set gtmtypes("sgmnt_addrs",95,"len")=4
-	Set gtmtypes("sgmnt_addrs",95,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_addrs","in_wtstart")=95
-	Set gtmtypes("sgmnt_addrs",96,"name")="sgmnt_addrs.now_crit"
-	Set gtmtypes("sgmnt_addrs",96,"off")=720
+	Set gtmtypes("sgmnt_addrs",92,"len")=8
+	Set gtmtypes("sgmnt_addrs",92,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_addrs","dbsync_timer_tn")=92
+	Set gtmtypes("sgmnt_addrs",93,"name")="sgmnt_addrs.our_midnite"
+	Set gtmtypes("sgmnt_addrs",93,"off")=712
+	Set gtmtypes("sgmnt_addrs",93,"len")=8
+	Set gtmtypes("sgmnt_addrs",93,"type")="addr"
+	Set gtmtypfldindx("sgmnt_addrs","our_midnite")=93
+	Set gtmtypes("sgmnt_addrs",94,"name")="sgmnt_addrs.fullblockwrite_len"
+	Set gtmtypes("sgmnt_addrs",94,"off")=720
+	Set gtmtypes("sgmnt_addrs",94,"len")=8
+	Set gtmtypes("sgmnt_addrs",94,"type")="size_t"
+	Set gtmtypfldindx("sgmnt_addrs","fullblockwrite_len")=94
+	Set gtmtypes("sgmnt_addrs",95,"name")="sgmnt_addrs.our_lru_cache_rec_off"
+	Set gtmtypes("sgmnt_addrs",95,"off")=728
+	Set gtmtypes("sgmnt_addrs",95,"len")=8
+	Set gtmtypes("sgmnt_addrs",95,"type")="intptr_t"
+	Set gtmtypfldindx("sgmnt_addrs","our_lru_cache_rec_off")=95
+	Set gtmtypes("sgmnt_addrs",96,"name")="sgmnt_addrs.total_blks"
+	Set gtmtypes("sgmnt_addrs",96,"off")=736
 	Set gtmtypes("sgmnt_addrs",96,"len")=4
 	Set gtmtypes("sgmnt_addrs",96,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_addrs","now_crit")=96
-	Set gtmtypes("sgmnt_addrs",97,"name")="sgmnt_addrs.wbuf_dqd"
-	Set gtmtypes("sgmnt_addrs",97,"off")=724
+	Set gtmtypfldindx("sgmnt_addrs","total_blks")=96
+	Set gtmtypes("sgmnt_addrs",97,"name")="sgmnt_addrs.prev_free_blks"
+	Set gtmtypes("sgmnt_addrs",97,"off")=740
 	Set gtmtypes("sgmnt_addrs",97,"len")=4
 	Set gtmtypes("sgmnt_addrs",97,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_addrs","wbuf_dqd")=97
-	Set gtmtypes("sgmnt_addrs",98,"name")="sgmnt_addrs.stale_defer"
-	Set gtmtypes("sgmnt_addrs",98,"off")=728
+	Set gtmtypfldindx("sgmnt_addrs","prev_free_blks")=97
+	Set gtmtypes("sgmnt_addrs",98,"name")="sgmnt_addrs.timer"
+	Set gtmtypes("sgmnt_addrs",98,"off")=744
 	Set gtmtypes("sgmnt_addrs",98,"len")=4
 	Set gtmtypes("sgmnt_addrs",98,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_addrs","stale_defer")=98
-	Set gtmtypes("sgmnt_addrs",99,"name")="sgmnt_addrs.freeze"
-	Set gtmtypes("sgmnt_addrs",99,"off")=732
+	Set gtmtypfldindx("sgmnt_addrs","timer")=98
+	Set gtmtypes("sgmnt_addrs",99,"name")="sgmnt_addrs.in_wtstart"
+	Set gtmtypes("sgmnt_addrs",99,"off")=748
 	Set gtmtypes("sgmnt_addrs",99,"len")=4
-	Set gtmtypes("sgmnt_addrs",99,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_addrs","freeze")=99
-	Set gtmtypes("sgmnt_addrs",100,"name")="sgmnt_addrs.dbsync_timer"
-	Set gtmtypes("sgmnt_addrs",100,"off")=736
+	Set gtmtypes("sgmnt_addrs",99,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_addrs","in_wtstart")=99
+	Set gtmtypes("sgmnt_addrs",100,"name")="sgmnt_addrs.now_crit"
+	Set gtmtypes("sgmnt_addrs",100,"off")=752
 	Set gtmtypes("sgmnt_addrs",100,"len")=4
-	Set gtmtypes("sgmnt_addrs",100,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_addrs","dbsync_timer")=100
-	Set gtmtypes("sgmnt_addrs",101,"name")="sgmnt_addrs.reorg_last_dest"
-	Set gtmtypes("sgmnt_addrs",101,"off")=740
+	Set gtmtypes("sgmnt_addrs",100,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_addrs","now_crit")=100
+	Set gtmtypes("sgmnt_addrs",101,"name")="sgmnt_addrs.wbuf_dqd"
+	Set gtmtypes("sgmnt_addrs",101,"off")=756
 	Set gtmtypes("sgmnt_addrs",101,"len")=4
-	Set gtmtypes("sgmnt_addrs",101,"type")="int"
-	Set gtmtypfldindx("sgmnt_addrs","reorg_last_dest")=101
-	Set gtmtypes("sgmnt_addrs",102,"name")="sgmnt_addrs.jnl_before_image"
-	Set gtmtypes("sgmnt_addrs",102,"off")=744
+	Set gtmtypes("sgmnt_addrs",101,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_addrs","wbuf_dqd")=101
+	Set gtmtypes("sgmnt_addrs",102,"name")="sgmnt_addrs.stale_defer"
+	Set gtmtypes("sgmnt_addrs",102,"off")=760
 	Set gtmtypes("sgmnt_addrs",102,"len")=4
-	Set gtmtypes("sgmnt_addrs",102,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_addrs","jnl_before_image")=102
-	Set gtmtypes("sgmnt_addrs",103,"name")="sgmnt_addrs.read_write"
-	Set gtmtypes("sgmnt_addrs",103,"off")=748
+	Set gtmtypes("sgmnt_addrs",102,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_addrs","stale_defer")=102
+	Set gtmtypes("sgmnt_addrs",103,"name")="sgmnt_addrs.freeze"
+	Set gtmtypes("sgmnt_addrs",103,"off")=764
 	Set gtmtypes("sgmnt_addrs",103,"len")=4
 	Set gtmtypes("sgmnt_addrs",103,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_addrs","read_write")=103
-	Set gtmtypes("sgmnt_addrs",104,"name")="sgmnt_addrs.persistent_freeze"
-	Set gtmtypes("sgmnt_addrs",104,"off")=752
+	Set gtmtypfldindx("sgmnt_addrs","freeze")=103
+	Set gtmtypes("sgmnt_addrs",104,"name")="sgmnt_addrs.dbsync_timer"
+	Set gtmtypes("sgmnt_addrs",104,"off")=768
 	Set gtmtypes("sgmnt_addrs",104,"len")=4
 	Set gtmtypes("sgmnt_addrs",104,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_addrs","persistent_freeze")=104
-	Set gtmtypes("sgmnt_addrs",105,"name")="sgmnt_addrs.pblk_align_jrecsize"
-	Set gtmtypes("sgmnt_addrs",105,"off")=756
+	Set gtmtypfldindx("sgmnt_addrs","dbsync_timer")=104
+	Set gtmtypes("sgmnt_addrs",105,"name")="sgmnt_addrs.reorg_last_dest"
+	Set gtmtypes("sgmnt_addrs",105,"off")=772
 	Set gtmtypes("sgmnt_addrs",105,"len")=4
 	Set gtmtypes("sgmnt_addrs",105,"type")="int"
-	Set gtmtypfldindx("sgmnt_addrs","pblk_align_jrecsize")=105
-	Set gtmtypes("sgmnt_addrs",106,"name")="sgmnt_addrs.min_total_tpjnl_rec_size"
-	Set gtmtypes("sgmnt_addrs",106,"off")=760
+	Set gtmtypfldindx("sgmnt_addrs","reorg_last_dest")=105
+	Set gtmtypes("sgmnt_addrs",106,"name")="sgmnt_addrs.jnl_before_image"
+	Set gtmtypes("sgmnt_addrs",106,"off")=776
 	Set gtmtypes("sgmnt_addrs",106,"len")=4
-	Set gtmtypes("sgmnt_addrs",106,"type")="int"
-	Set gtmtypfldindx("sgmnt_addrs","min_total_tpjnl_rec_size")=106
-	Set gtmtypes("sgmnt_addrs",107,"name")="sgmnt_addrs.min_total_nontpjnl_rec_size"
-	Set gtmtypes("sgmnt_addrs",107,"off")=764
+	Set gtmtypes("sgmnt_addrs",106,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_addrs","jnl_before_image")=106
+	Set gtmtypes("sgmnt_addrs",107,"name")="sgmnt_addrs.read_write"
+	Set gtmtypes("sgmnt_addrs",107,"off")=780
 	Set gtmtypes("sgmnt_addrs",107,"len")=4
-	Set gtmtypes("sgmnt_addrs",107,"type")="int"
-	Set gtmtypfldindx("sgmnt_addrs","min_total_nontpjnl_rec_size")=107
-	Set gtmtypes("sgmnt_addrs",108,"name")="sgmnt_addrs.jnl_state"
-	Set gtmtypes("sgmnt_addrs",108,"off")=768
+	Set gtmtypes("sgmnt_addrs",107,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_addrs","read_write")=107
+	Set gtmtypes("sgmnt_addrs",108,"name")="sgmnt_addrs.orig_read_write"
+	Set gtmtypes("sgmnt_addrs",108,"off")=784
 	Set gtmtypes("sgmnt_addrs",108,"len")=4
-	Set gtmtypes("sgmnt_addrs",108,"type")="int"
-	Set gtmtypfldindx("sgmnt_addrs","jnl_state")=108
-	Set gtmtypes("sgmnt_addrs",109,"name")="sgmnt_addrs.repl_state"
-	Set gtmtypes("sgmnt_addrs",109,"off")=772
+	Set gtmtypes("sgmnt_addrs",108,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_addrs","orig_read_write")=108
+	Set gtmtypes("sgmnt_addrs",109,"name")="sgmnt_addrs.persistent_freeze"
+	Set gtmtypes("sgmnt_addrs",109,"off")=788
 	Set gtmtypes("sgmnt_addrs",109,"len")=4
-	Set gtmtypes("sgmnt_addrs",109,"type")="int"
-	Set gtmtypfldindx("sgmnt_addrs","repl_state")=109
-	Set gtmtypes("sgmnt_addrs",110,"name")="sgmnt_addrs.crit_check_cycle"
-	Set gtmtypes("sgmnt_addrs",110,"off")=776
+	Set gtmtypes("sgmnt_addrs",109,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_addrs","persistent_freeze")=109
+	Set gtmtypes("sgmnt_addrs",110,"name")="sgmnt_addrs.pblk_align_jrecsize"
+	Set gtmtypes("sgmnt_addrs",110,"off")=792
 	Set gtmtypes("sgmnt_addrs",110,"len")=4
-	Set gtmtypes("sgmnt_addrs",110,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_addrs","crit_check_cycle")=110
-	Set gtmtypes("sgmnt_addrs",111,"name")="sgmnt_addrs.backup_in_prog"
-	Set gtmtypes("sgmnt_addrs",111,"off")=780
+	Set gtmtypes("sgmnt_addrs",110,"type")="int"
+	Set gtmtypfldindx("sgmnt_addrs","pblk_align_jrecsize")=110
+	Set gtmtypes("sgmnt_addrs",111,"name")="sgmnt_addrs.min_total_tpjnl_rec_size"
+	Set gtmtypes("sgmnt_addrs",111,"off")=796
 	Set gtmtypes("sgmnt_addrs",111,"len")=4
 	Set gtmtypes("sgmnt_addrs",111,"type")="int"
-	Set gtmtypfldindx("sgmnt_addrs","backup_in_prog")=111
-	Set gtmtypes("sgmnt_addrs",112,"name")="sgmnt_addrs.snapshot_in_prog"
-	Set gtmtypes("sgmnt_addrs",112,"off")=784
+	Set gtmtypfldindx("sgmnt_addrs","min_total_tpjnl_rec_size")=111
+	Set gtmtypes("sgmnt_addrs",112,"name")="sgmnt_addrs.min_total_nontpjnl_rec_size"
+	Set gtmtypes("sgmnt_addrs",112,"off")=800
 	Set gtmtypes("sgmnt_addrs",112,"len")=4
-	Set gtmtypes("sgmnt_addrs",112,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_addrs","snapshot_in_prog")=112
-	Set gtmtypes("sgmnt_addrs",113,"name")="sgmnt_addrs.ref_cnt"
-	Set gtmtypes("sgmnt_addrs",113,"off")=788
+	Set gtmtypes("sgmnt_addrs",112,"type")="int"
+	Set gtmtypfldindx("sgmnt_addrs","min_total_nontpjnl_rec_size")=112
+	Set gtmtypes("sgmnt_addrs",113,"name")="sgmnt_addrs.jnl_state"
+	Set gtmtypes("sgmnt_addrs",113,"off")=804
 	Set gtmtypes("sgmnt_addrs",113,"len")=4
 	Set gtmtypes("sgmnt_addrs",113,"type")="int"
-	Set gtmtypfldindx("sgmnt_addrs","ref_cnt")=113
-	Set gtmtypes("sgmnt_addrs",114,"name")="sgmnt_addrs.fid_index"
-	Set gtmtypes("sgmnt_addrs",114,"off")=792
+	Set gtmtypfldindx("sgmnt_addrs","jnl_state")=113
+	Set gtmtypes("sgmnt_addrs",114,"name")="sgmnt_addrs.repl_state"
+	Set gtmtypes("sgmnt_addrs",114,"off")=808
 	Set gtmtypes("sgmnt_addrs",114,"len")=4
 	Set gtmtypes("sgmnt_addrs",114,"type")="int"
-	Set gtmtypfldindx("sgmnt_addrs","fid_index")=114
-	Set gtmtypes("sgmnt_addrs",115,"name")="sgmnt_addrs.do_fullblockwrites"
-	Set gtmtypes("sgmnt_addrs",115,"off")=796
+	Set gtmtypfldindx("sgmnt_addrs","repl_state")=114
+	Set gtmtypes("sgmnt_addrs",115,"name")="sgmnt_addrs.crit_check_cycle"
+	Set gtmtypes("sgmnt_addrs",115,"off")=812
 	Set gtmtypes("sgmnt_addrs",115,"len")=4
-	Set gtmtypes("sgmnt_addrs",115,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_addrs","do_fullblockwrites")=115
-	Set gtmtypes("sgmnt_addrs",116,"name")="sgmnt_addrs.regnum"
-	Set gtmtypes("sgmnt_addrs",116,"off")=800
+	Set gtmtypes("sgmnt_addrs",115,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_addrs","crit_check_cycle")=115
+	Set gtmtypes("sgmnt_addrs",116,"name")="sgmnt_addrs.backup_in_prog"
+	Set gtmtypes("sgmnt_addrs",116,"off")=816
 	Set gtmtypes("sgmnt_addrs",116,"len")=4
 	Set gtmtypes("sgmnt_addrs",116,"type")="int"
-	Set gtmtypfldindx("sgmnt_addrs","regnum")=116
-	Set gtmtypes("sgmnt_addrs",117,"name")="sgmnt_addrs.n_pre_read_trigger"
-	Set gtmtypes("sgmnt_addrs",117,"off")=804
+	Set gtmtypfldindx("sgmnt_addrs","backup_in_prog")=116
+	Set gtmtypes("sgmnt_addrs",117,"name")="sgmnt_addrs.snapshot_in_prog"
+	Set gtmtypes("sgmnt_addrs",117,"off")=820
 	Set gtmtypes("sgmnt_addrs",117,"len")=4
-	Set gtmtypes("sgmnt_addrs",117,"type")="int"
-	Set gtmtypfldindx("sgmnt_addrs","n_pre_read_trigger")=117
-	Set gtmtypes("sgmnt_addrs",118,"name")="sgmnt_addrs.jnlpool_validate_check"
-	Set gtmtypes("sgmnt_addrs",118,"off")=808
+	Set gtmtypes("sgmnt_addrs",117,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_addrs","snapshot_in_prog")=117
+	Set gtmtypes("sgmnt_addrs",118,"name")="sgmnt_addrs.ref_cnt"
+	Set gtmtypes("sgmnt_addrs",118,"off")=824
 	Set gtmtypes("sgmnt_addrs",118,"len")=4
-	Set gtmtypes("sgmnt_addrs",118,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_addrs","jnlpool_validate_check")=118
-	Set gtmtypes("sgmnt_addrs",119,"name")="sgmnt_addrs.regcnt"
-	Set gtmtypes("sgmnt_addrs",119,"off")=812
+	Set gtmtypes("sgmnt_addrs",118,"type")="int"
+	Set gtmtypfldindx("sgmnt_addrs","ref_cnt")=118
+	Set gtmtypes("sgmnt_addrs",119,"name")="sgmnt_addrs.fid_index"
+	Set gtmtypes("sgmnt_addrs",119,"off")=828
 	Set gtmtypes("sgmnt_addrs",119,"len")=4
 	Set gtmtypes("sgmnt_addrs",119,"type")="int"
-	Set gtmtypfldindx("sgmnt_addrs","regcnt")=119
-	Set gtmtypes("sgmnt_addrs",120,"name")="sgmnt_addrs.t_commit_crit"
-	Set gtmtypes("sgmnt_addrs",120,"off")=816
+	Set gtmtypfldindx("sgmnt_addrs","fid_index")=119
+	Set gtmtypes("sgmnt_addrs",120,"name")="sgmnt_addrs.do_fullblockwrites"
+	Set gtmtypes("sgmnt_addrs",120,"off")=832
 	Set gtmtypes("sgmnt_addrs",120,"len")=4
 	Set gtmtypes("sgmnt_addrs",120,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_addrs","t_commit_crit")=120
-	Set gtmtypes("sgmnt_addrs",121,"name")="sgmnt_addrs.wcs_pidcnt_incremented"
-	Set gtmtypes("sgmnt_addrs",121,"off")=820
+	Set gtmtypfldindx("sgmnt_addrs","do_fullblockwrites")=120
+	Set gtmtypes("sgmnt_addrs",121,"name")="sgmnt_addrs.regnum"
+	Set gtmtypes("sgmnt_addrs",121,"off")=836
 	Set gtmtypes("sgmnt_addrs",121,"len")=4
-	Set gtmtypes("sgmnt_addrs",121,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_addrs","wcs_pidcnt_incremented")=121
-	Set gtmtypes("sgmnt_addrs",122,"name")="sgmnt_addrs.incr_db_trigger_cycle"
-	Set gtmtypes("sgmnt_addrs",122,"off")=824
+	Set gtmtypes("sgmnt_addrs",121,"type")="int"
+	Set gtmtypfldindx("sgmnt_addrs","regnum")=121
+	Set gtmtypes("sgmnt_addrs",122,"name")="sgmnt_addrs.n_pre_read_trigger"
+	Set gtmtypes("sgmnt_addrs",122,"off")=840
 	Set gtmtypes("sgmnt_addrs",122,"len")=4
-	Set gtmtypes("sgmnt_addrs",122,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_addrs","incr_db_trigger_cycle")=122
-	Set gtmtypes("sgmnt_addrs",123,"name")="sgmnt_addrs.db_trigger_cycle"
-	Set gtmtypes("sgmnt_addrs",123,"off")=828
+	Set gtmtypes("sgmnt_addrs",122,"type")="int"
+	Set gtmtypfldindx("sgmnt_addrs","n_pre_read_trigger")=122
+	Set gtmtypes("sgmnt_addrs",123,"name")="sgmnt_addrs.jnlpool_validate_check"
+	Set gtmtypes("sgmnt_addrs",123,"off")=844
 	Set gtmtypes("sgmnt_addrs",123,"len")=4
 	Set gtmtypes("sgmnt_addrs",123,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_addrs","db_trigger_cycle")=123
-	Set gtmtypes("sgmnt_addrs",124,"name")="sgmnt_addrs.db_dztrigger_cycle"
-	Set gtmtypes("sgmnt_addrs",124,"off")=832
+	Set gtmtypfldindx("sgmnt_addrs","jnlpool_validate_check")=123
+	Set gtmtypes("sgmnt_addrs",124,"name")="sgmnt_addrs.regcnt"
+	Set gtmtypes("sgmnt_addrs",124,"off")=848
 	Set gtmtypes("sgmnt_addrs",124,"len")=4
-	Set gtmtypes("sgmnt_addrs",124,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_addrs","db_dztrigger_cycle")=124
-	Set gtmtypes("sgmnt_addrs",125,"name")="sgmnt_addrs.hold_onto_crit"
-	Set gtmtypes("sgmnt_addrs",125,"off")=836
+	Set gtmtypes("sgmnt_addrs",124,"type")="int"
+	Set gtmtypfldindx("sgmnt_addrs","regcnt")=124
+	Set gtmtypes("sgmnt_addrs",125,"name")="sgmnt_addrs.t_commit_crit"
+	Set gtmtypes("sgmnt_addrs",125,"off")=852
 	Set gtmtypes("sgmnt_addrs",125,"len")=4
 	Set gtmtypes("sgmnt_addrs",125,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_addrs","hold_onto_crit")=125
-	Set gtmtypes("sgmnt_addrs",126,"name")="sgmnt_addrs.dse_crit_seize_done"
-	Set gtmtypes("sgmnt_addrs",126,"off")=840
+	Set gtmtypfldindx("sgmnt_addrs","t_commit_crit")=125
+	Set gtmtypes("sgmnt_addrs",126,"name")="sgmnt_addrs.wcs_pidcnt_incremented"
+	Set gtmtypes("sgmnt_addrs",126,"off")=856
 	Set gtmtypes("sgmnt_addrs",126,"len")=4
 	Set gtmtypes("sgmnt_addrs",126,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_addrs","dse_crit_seize_done")=126
-	Set gtmtypes("sgmnt_addrs",127,"name")="sgmnt_addrs.gbuff_limit"
-	Set gtmtypes("sgmnt_addrs",127,"off")=844
+	Set gtmtypfldindx("sgmnt_addrs","wcs_pidcnt_incremented")=126
+	Set gtmtypes("sgmnt_addrs",127,"name")="sgmnt_addrs.incr_db_trigger_cycle"
+	Set gtmtypes("sgmnt_addrs",127,"off")=860
 	Set gtmtypes("sgmnt_addrs",127,"len")=4
-	Set gtmtypes("sgmnt_addrs",127,"type")="int"
-	Set gtmtypfldindx("sgmnt_addrs","gbuff_limit")=127
-	Set gtmtypes("sgmnt_addrs",128,"name")="sgmnt_addrs.our_midnite"
-	Set gtmtypes("sgmnt_addrs",128,"off")=848
-	Set gtmtypes("sgmnt_addrs",128,"len")=8
-	Set gtmtypes("sgmnt_addrs",128,"type")="addr"
-	Set gtmtypfldindx("sgmnt_addrs","our_midnite")=128
-	Set gtmtypes("sgmnt_addrs",129,"name")="sgmnt_addrs.root_search_cycle"
-	Set gtmtypes("sgmnt_addrs",129,"off")=856
+	Set gtmtypes("sgmnt_addrs",127,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_addrs","incr_db_trigger_cycle")=127
+	Set gtmtypes("sgmnt_addrs",128,"name")="sgmnt_addrs.db_trigger_cycle"
+	Set gtmtypes("sgmnt_addrs",128,"off")=864
+	Set gtmtypes("sgmnt_addrs",128,"len")=4
+	Set gtmtypes("sgmnt_addrs",128,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_addrs","db_trigger_cycle")=128
+	Set gtmtypes("sgmnt_addrs",129,"name")="sgmnt_addrs.db_dztrigger_cycle"
+	Set gtmtypes("sgmnt_addrs",129,"off")=868
 	Set gtmtypes("sgmnt_addrs",129,"len")=4
 	Set gtmtypes("sgmnt_addrs",129,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_addrs","root_search_cycle")=129
-	Set gtmtypes("sgmnt_addrs",130,"name")="sgmnt_addrs.onln_rlbk_cycle"
-	Set gtmtypes("sgmnt_addrs",130,"off")=860
+	Set gtmtypfldindx("sgmnt_addrs","db_dztrigger_cycle")=129
+	Set gtmtypes("sgmnt_addrs",130,"name")="sgmnt_addrs.hold_onto_crit"
+	Set gtmtypes("sgmnt_addrs",130,"off")=872
 	Set gtmtypes("sgmnt_addrs",130,"len")=4
-	Set gtmtypes("sgmnt_addrs",130,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_addrs","onln_rlbk_cycle")=130
-	Set gtmtypes("sgmnt_addrs",131,"name")="sgmnt_addrs.db_onln_rlbkd_cycle"
-	Set gtmtypes("sgmnt_addrs",131,"off")=864
+	Set gtmtypes("sgmnt_addrs",130,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_addrs","hold_onto_crit")=130
+	Set gtmtypes("sgmnt_addrs",131,"name")="sgmnt_addrs.dse_crit_seize_done"
+	Set gtmtypes("sgmnt_addrs",131,"off")=876
 	Set gtmtypes("sgmnt_addrs",131,"len")=4
-	Set gtmtypes("sgmnt_addrs",131,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_addrs","db_onln_rlbkd_cycle")=131
-	Set gtmtypes("sgmnt_addrs",132,"name")="sgmnt_addrs.read_only_fs"
-	Set gtmtypes("sgmnt_addrs",132,"off")=868
+	Set gtmtypes("sgmnt_addrs",131,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_addrs","dse_crit_seize_done")=131
+	Set gtmtypes("sgmnt_addrs",132,"name")="sgmnt_addrs.gbuff_limit"
+	Set gtmtypes("sgmnt_addrs",132,"off")=880
 	Set gtmtypes("sgmnt_addrs",132,"len")=4
-	Set gtmtypes("sgmnt_addrs",132,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_addrs","read_only_fs")=132
-	Set gtmtypes("sgmnt_addrs",133,"name")="sgmnt_addrs.crit_probe"
-	Set gtmtypes("sgmnt_addrs",133,"off")=872
+	Set gtmtypes("sgmnt_addrs",132,"type")="int"
+	Set gtmtypfldindx("sgmnt_addrs","gbuff_limit")=132
+	Set gtmtypes("sgmnt_addrs",133,"name")="sgmnt_addrs.root_search_cycle"
+	Set gtmtypes("sgmnt_addrs",133,"off")=884
 	Set gtmtypes("sgmnt_addrs",133,"len")=4
-	Set gtmtypes("sgmnt_addrs",133,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_addrs","crit_probe")=133
-	Set gtmtypes("sgmnt_addrs",134,"name")="sgmnt_addrs.probecrit_rec"
-	Set gtmtypes("sgmnt_addrs",134,"off")=880
-	Set gtmtypes("sgmnt_addrs",134,"len")=56
-	Set gtmtypes("sgmnt_addrs",134,"type")="probecrit_rec_t"
-	Set gtmtypfldindx("sgmnt_addrs","probecrit_rec")=134
-	Set gtmtypes("sgmnt_addrs",135,"name")="sgmnt_addrs.probecrit_rec.t_get_crit"
-	Set gtmtypes("sgmnt_addrs",135,"off")=880
-	Set gtmtypes("sgmnt_addrs",135,"len")=8
-	Set gtmtypes("sgmnt_addrs",135,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","probecrit_rec.t_get_crit")=135
-	Set gtmtypes("sgmnt_addrs",136,"name")="sgmnt_addrs.probecrit_rec.p_crit_failed"
-	Set gtmtypes("sgmnt_addrs",136,"off")=888
-	Set gtmtypes("sgmnt_addrs",136,"len")=8
-	Set gtmtypes("sgmnt_addrs",136,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","probecrit_rec.p_crit_failed")=136
-	Set gtmtypes("sgmnt_addrs",137,"name")="sgmnt_addrs.probecrit_rec.p_crit_que_slps"
-	Set gtmtypes("sgmnt_addrs",137,"off")=896
-	Set gtmtypes("sgmnt_addrs",137,"len")=8
-	Set gtmtypes("sgmnt_addrs",137,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","probecrit_rec.p_crit_que_slps")=137
-	Set gtmtypes("sgmnt_addrs",138,"name")="sgmnt_addrs.probecrit_rec.p_crit_yields"
+	Set gtmtypes("sgmnt_addrs",133,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_addrs","root_search_cycle")=133
+	Set gtmtypes("sgmnt_addrs",134,"name")="sgmnt_addrs.onln_rlbk_cycle"
+	Set gtmtypes("sgmnt_addrs",134,"off")=888
+	Set gtmtypes("sgmnt_addrs",134,"len")=4
+	Set gtmtypes("sgmnt_addrs",134,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_addrs","onln_rlbk_cycle")=134
+	Set gtmtypes("sgmnt_addrs",135,"name")="sgmnt_addrs.db_onln_rlbkd_cycle"
+	Set gtmtypes("sgmnt_addrs",135,"off")=892
+	Set gtmtypes("sgmnt_addrs",135,"len")=4
+	Set gtmtypes("sgmnt_addrs",135,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_addrs","db_onln_rlbkd_cycle")=135
+	Set gtmtypes("sgmnt_addrs",136,"name")="sgmnt_addrs.reservedDBFlags"
+	Set gtmtypes("sgmnt_addrs",136,"off")=896
+	Set gtmtypes("sgmnt_addrs",136,"len")=4
+	Set gtmtypes("sgmnt_addrs",136,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_addrs","reservedDBFlags")=136
+	Set gtmtypes("sgmnt_addrs",137,"name")="sgmnt_addrs.read_only_fs"
+	Set gtmtypes("sgmnt_addrs",137,"off")=900
+	Set gtmtypes("sgmnt_addrs",137,"len")=4
+	Set gtmtypes("sgmnt_addrs",137,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_addrs","read_only_fs")=137
+	Set gtmtypes("sgmnt_addrs",138,"name")="sgmnt_addrs.crit_probe"
 	Set gtmtypes("sgmnt_addrs",138,"off")=904
-	Set gtmtypes("sgmnt_addrs",138,"len")=8
-	Set gtmtypes("sgmnt_addrs",138,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","probecrit_rec.p_crit_yields")=138
-	Set gtmtypes("sgmnt_addrs",139,"name")="sgmnt_addrs.probecrit_rec.p_crit_que_full"
-	Set gtmtypes("sgmnt_addrs",139,"off")=912
-	Set gtmtypes("sgmnt_addrs",139,"len")=8
-	Set gtmtypes("sgmnt_addrs",139,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","probecrit_rec.p_crit_que_full")=139
-	Set gtmtypes("sgmnt_addrs",140,"name")="sgmnt_addrs.probecrit_rec.p_crit_que_slots"
-	Set gtmtypes("sgmnt_addrs",140,"off")=920
-	Set gtmtypes("sgmnt_addrs",140,"len")=8
-	Set gtmtypes("sgmnt_addrs",140,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","probecrit_rec.p_crit_que_slots")=140
-	Set gtmtypes("sgmnt_addrs",141,"name")="sgmnt_addrs.probecrit_rec.p_crit_success"
-	Set gtmtypes("sgmnt_addrs",141,"off")=928
+	Set gtmtypes("sgmnt_addrs",138,"len")=4
+	Set gtmtypes("sgmnt_addrs",138,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_addrs","crit_probe")=138
+	Set gtmtypes("sgmnt_addrs",139,"name")="sgmnt_addrs.canceled_flush_timer"
+	Set gtmtypes("sgmnt_addrs",139,"off")=908
+	Set gtmtypes("sgmnt_addrs",139,"len")=4
+	Set gtmtypes("sgmnt_addrs",139,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_addrs","canceled_flush_timer")=139
+	Set gtmtypes("sgmnt_addrs",140,"name")="sgmnt_addrs.probecrit_rec"
+	Set gtmtypes("sgmnt_addrs",140,"off")=912
+	Set gtmtypes("sgmnt_addrs",140,"len")=56
+	Set gtmtypes("sgmnt_addrs",140,"type")="probecrit_rec_t"
+	Set gtmtypfldindx("sgmnt_addrs","probecrit_rec")=140
+	Set gtmtypes("sgmnt_addrs",141,"name")="sgmnt_addrs.probecrit_rec.t_get_crit"
+	Set gtmtypes("sgmnt_addrs",141,"off")=912
 	Set gtmtypes("sgmnt_addrs",141,"len")=8
 	Set gtmtypes("sgmnt_addrs",141,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_addrs","probecrit_rec.p_crit_success")=141
+	Set gtmtypfldindx("sgmnt_addrs","probecrit_rec.t_get_crit")=141
+	Set gtmtypes("sgmnt_addrs",142,"name")="sgmnt_addrs.probecrit_rec.p_crit_failed"
+	Set gtmtypes("sgmnt_addrs",142,"off")=920
+	Set gtmtypes("sgmnt_addrs",142,"len")=8
+	Set gtmtypes("sgmnt_addrs",142,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_addrs","probecrit_rec.p_crit_failed")=142
+	Set gtmtypes("sgmnt_addrs",143,"name")="sgmnt_addrs.probecrit_rec.p_crit_que_slps"
+	Set gtmtypes("sgmnt_addrs",143,"off")=928
+	Set gtmtypes("sgmnt_addrs",143,"len")=8
+	Set gtmtypes("sgmnt_addrs",143,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_addrs","probecrit_rec.p_crit_que_slps")=143
+	Set gtmtypes("sgmnt_addrs",144,"name")="sgmnt_addrs.probecrit_rec.p_crit_yields"
+	Set gtmtypes("sgmnt_addrs",144,"off")=936
+	Set gtmtypes("sgmnt_addrs",144,"len")=8
+	Set gtmtypes("sgmnt_addrs",144,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_addrs","probecrit_rec.p_crit_yields")=144
+	Set gtmtypes("sgmnt_addrs",145,"name")="sgmnt_addrs.probecrit_rec.p_crit_que_full"
+	Set gtmtypes("sgmnt_addrs",145,"off")=944
+	Set gtmtypes("sgmnt_addrs",145,"len")=8
+	Set gtmtypes("sgmnt_addrs",145,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_addrs","probecrit_rec.p_crit_que_full")=145
+	Set gtmtypes("sgmnt_addrs",146,"name")="sgmnt_addrs.probecrit_rec.p_crit_que_slots"
+	Set gtmtypes("sgmnt_addrs",146,"off")=952
+	Set gtmtypes("sgmnt_addrs",146,"len")=8
+	Set gtmtypes("sgmnt_addrs",146,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_addrs","probecrit_rec.p_crit_que_slots")=146
+	Set gtmtypes("sgmnt_addrs",147,"name")="sgmnt_addrs.probecrit_rec.p_crit_success"
+	Set gtmtypes("sgmnt_addrs",147,"off")=960
+	Set gtmtypes("sgmnt_addrs",147,"len")=8
+	Set gtmtypes("sgmnt_addrs",147,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_addrs","probecrit_rec.p_crit_success")=147
+	Set gtmtypes("sgmnt_addrs",148,"name")="sgmnt_addrs.lock_crit_with_db"
+	Set gtmtypes("sgmnt_addrs",148,"off")=968
+	Set gtmtypes("sgmnt_addrs",148,"len")=4
+	Set gtmtypes("sgmnt_addrs",148,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_addrs","lock_crit_with_db")=148
+	Set gtmtypes("sgmnt_addrs",149,"name")="sgmnt_addrs.needs_post_freeze_online_clean"
+	Set gtmtypes("sgmnt_addrs",149,"off")=972
+	Set gtmtypes("sgmnt_addrs",149,"len")=4
+	Set gtmtypes("sgmnt_addrs",149,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_addrs","needs_post_freeze_online_clean")=149
+	Set gtmtypes("sgmnt_addrs",150,"name")="sgmnt_addrs.needs_post_freeze_flushsync"
+	Set gtmtypes("sgmnt_addrs",150,"off")=976
+	Set gtmtypes("sgmnt_addrs",150,"len")=4
+	Set gtmtypes("sgmnt_addrs",150,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_addrs","needs_post_freeze_flushsync")=150
+	Set gtmtypes("sgmnt_addrs",151,"name")="sgmnt_addrs.tp_hint"
+	Set gtmtypes("sgmnt_addrs",151,"off")=980
+	Set gtmtypes("sgmnt_addrs",151,"len")=4
+	Set gtmtypes("sgmnt_addrs",151,"type")="int"
+	Set gtmtypfldindx("sgmnt_addrs","tp_hint")=151
+	Set gtmtypes("sgmnt_addrs",152,"name")="sgmnt_addrs.statsDB_setup_completed"
+	Set gtmtypes("sgmnt_addrs",152,"off")=984
+	Set gtmtypes("sgmnt_addrs",152,"len")=4
+	Set gtmtypes("sgmnt_addrs",152,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_addrs","statsDB_setup_completed")=152
 	;
 	Set gtmtypes("sgmnt_data")="struct"
-	Set gtmtypes("sgmnt_data",0)=565
+	Set gtmtypes("sgmnt_data",0)=586
 	Set gtmtypes("sgmnt_data","len")=8192
 	Set gtmtypes("sgmnt_data",1,"name")="sgmnt_data.label"
 	Set gtmtypes("sgmnt_data",1,"off")=0
@@ -26614,7 +27119,7 @@ Init
 	Set gtmtypes("sgmnt_data",18,"name")="sgmnt_data.null_subs"
 	Set gtmtypes("sgmnt_data",18,"off")=76
 	Set gtmtypes("sgmnt_data",18,"len")=4
-	Set gtmtypes("sgmnt_data",18,"type")="boolean_t"
+	Set gtmtypes("sgmnt_data",18,"type")="int"
 	Set gtmtypfldindx("sgmnt_data","null_subs")=18
 	Set gtmtypes("sgmnt_data",19,"name")="sgmnt_data.free_space"
 	Set gtmtypes("sgmnt_data",19,"off")=80
@@ -26696,11 +27201,11 @@ Init
 	Set gtmtypes("sgmnt_data",34,"len")=4
 	Set gtmtypes("sgmnt_data",34,"type")="int"
 	Set gtmtypfldindx("sgmnt_data","creation_time4")=34
-	Set gtmtypes("sgmnt_data",35,"name")="sgmnt_data.creation_filler_8byte"
+	Set gtmtypes("sgmnt_data",35,"name")="sgmnt_data.reservedDBFlags"
 	Set gtmtypes("sgmnt_data",35,"off")=188
 	Set gtmtypes("sgmnt_data",35,"len")=4
-	Set gtmtypes("sgmnt_data",35,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","creation_filler_8byte")=35
+	Set gtmtypes("sgmnt_data",35,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","reservedDBFlags")=35
 	Set gtmtypes("sgmnt_data",36,"name")="sgmnt_data.max_tn"
 	Set gtmtypes("sgmnt_data",36,"off")=192
 	Set gtmtypes("sgmnt_data",36,"len")=8
@@ -26781,2592 +27286,2697 @@ Init
 	Set gtmtypes("sgmnt_data",51,"len")=4
 	Set gtmtypes("sgmnt_data",51,"type")="int"
 	Set gtmtypfldindx("sgmnt_data","abandoned_kills")=51
-	Set gtmtypes("sgmnt_data",52,"name")="sgmnt_data.filler_320"
+	Set gtmtypes("sgmnt_data",52,"name")="sgmnt_data.freeze_online"
 	Set gtmtypes("sgmnt_data",52,"off")=312
-	Set gtmtypes("sgmnt_data",52,"len")=8
-	Set gtmtypes("sgmnt_data",52,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","filler_320")=52
-	Set gtmtypes("sgmnt_data",53,"name")="sgmnt_data.tn_upgrd_blks_0"
-	Set gtmtypes("sgmnt_data",53,"off")=320
-	Set gtmtypes("sgmnt_data",53,"len")=8
-	Set gtmtypes("sgmnt_data",53,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","tn_upgrd_blks_0")=53
-	Set gtmtypes("sgmnt_data",54,"name")="sgmnt_data.desired_db_format_tn"
-	Set gtmtypes("sgmnt_data",54,"off")=328
+	Set gtmtypes("sgmnt_data",52,"len")=4
+	Set gtmtypes("sgmnt_data",52,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","freeze_online")=52
+	Set gtmtypes("sgmnt_data",53,"name")="sgmnt_data.filler_320"
+	Set gtmtypes("sgmnt_data",53,"off")=316
+	Set gtmtypes("sgmnt_data",53,"len")=4
+	Set gtmtypes("sgmnt_data",53,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","filler_320")=53
+	Set gtmtypes("sgmnt_data",54,"name")="sgmnt_data.tn_upgrd_blks_0"
+	Set gtmtypes("sgmnt_data",54,"off")=320
 	Set gtmtypes("sgmnt_data",54,"len")=8
 	Set gtmtypes("sgmnt_data",54,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","desired_db_format_tn")=54
-	Set gtmtypes("sgmnt_data",55,"name")="sgmnt_data.reorg_db_fmt_start_tn"
-	Set gtmtypes("sgmnt_data",55,"off")=336
+	Set gtmtypfldindx("sgmnt_data","tn_upgrd_blks_0")=54
+	Set gtmtypes("sgmnt_data",55,"name")="sgmnt_data.desired_db_format_tn"
+	Set gtmtypes("sgmnt_data",55,"off")=328
 	Set gtmtypes("sgmnt_data",55,"len")=8
 	Set gtmtypes("sgmnt_data",55,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","reorg_db_fmt_start_tn")=55
-	Set gtmtypes("sgmnt_data",56,"name")="sgmnt_data.reorg_upgrd_dwngrd_restart_block"
-	Set gtmtypes("sgmnt_data",56,"off")=344
-	Set gtmtypes("sgmnt_data",56,"len")=4
-	Set gtmtypes("sgmnt_data",56,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","reorg_upgrd_dwngrd_restart_block")=56
-	Set gtmtypes("sgmnt_data",57,"name")="sgmnt_data.blks_to_upgrd"
-	Set gtmtypes("sgmnt_data",57,"off")=348
+	Set gtmtypfldindx("sgmnt_data","desired_db_format_tn")=55
+	Set gtmtypes("sgmnt_data",56,"name")="sgmnt_data.reorg_db_fmt_start_tn"
+	Set gtmtypes("sgmnt_data",56,"off")=336
+	Set gtmtypes("sgmnt_data",56,"len")=8
+	Set gtmtypes("sgmnt_data",56,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","reorg_db_fmt_start_tn")=56
+	Set gtmtypes("sgmnt_data",57,"name")="sgmnt_data.reorg_upgrd_dwngrd_restart_block"
+	Set gtmtypes("sgmnt_data",57,"off")=344
 	Set gtmtypes("sgmnt_data",57,"len")=4
 	Set gtmtypes("sgmnt_data",57,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","blks_to_upgrd")=57
-	Set gtmtypes("sgmnt_data",58,"name")="sgmnt_data.blks_to_upgrd_subzero_error"
-	Set gtmtypes("sgmnt_data",58,"off")=352
+	Set gtmtypfldindx("sgmnt_data","reorg_upgrd_dwngrd_restart_block")=57
+	Set gtmtypes("sgmnt_data",58,"name")="sgmnt_data.blks_to_upgrd"
+	Set gtmtypes("sgmnt_data",58,"off")=348
 	Set gtmtypes("sgmnt_data",58,"len")=4
 	Set gtmtypes("sgmnt_data",58,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","blks_to_upgrd_subzero_error")=58
-	Set gtmtypes("sgmnt_data",59,"name")="sgmnt_data.desired_db_format"
-	Set gtmtypes("sgmnt_data",59,"off")=356
+	Set gtmtypfldindx("sgmnt_data","blks_to_upgrd")=58
+	Set gtmtypes("sgmnt_data",59,"name")="sgmnt_data.blks_to_upgrd_subzero_error"
+	Set gtmtypes("sgmnt_data",59,"off")=352
 	Set gtmtypes("sgmnt_data",59,"len")=4
 	Set gtmtypes("sgmnt_data",59,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","desired_db_format")=59
-	Set gtmtypes("sgmnt_data",60,"name")="sgmnt_data.fully_upgraded"
-	Set gtmtypes("sgmnt_data",60,"off")=360
+	Set gtmtypfldindx("sgmnt_data","blks_to_upgrd_subzero_error")=59
+	Set gtmtypes("sgmnt_data",60,"name")="sgmnt_data.desired_db_format"
+	Set gtmtypes("sgmnt_data",60,"off")=356
 	Set gtmtypes("sgmnt_data",60,"len")=4
-	Set gtmtypes("sgmnt_data",60,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","fully_upgraded")=60
-	Set gtmtypes("sgmnt_data",61,"name")="sgmnt_data.db_got_to_v5_once"
-	Set gtmtypes("sgmnt_data",61,"off")=364
+	Set gtmtypes("sgmnt_data",60,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","desired_db_format")=60
+	Set gtmtypes("sgmnt_data",61,"name")="sgmnt_data.fully_upgraded"
+	Set gtmtypes("sgmnt_data",61,"off")=360
 	Set gtmtypes("sgmnt_data",61,"len")=4
 	Set gtmtypes("sgmnt_data",61,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","db_got_to_v5_once")=61
-	Set gtmtypes("sgmnt_data",62,"name")="sgmnt_data.opened_by_gtmv53"
-	Set gtmtypes("sgmnt_data",62,"off")=368
+	Set gtmtypfldindx("sgmnt_data","fully_upgraded")=61
+	Set gtmtypes("sgmnt_data",62,"name")="sgmnt_data.db_got_to_v5_once"
+	Set gtmtypes("sgmnt_data",62,"off")=364
 	Set gtmtypes("sgmnt_data",62,"len")=4
 	Set gtmtypes("sgmnt_data",62,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","opened_by_gtmv53")=62
-	Set gtmtypes("sgmnt_data",63,"name")="sgmnt_data.filler_384"
-	Set gtmtypes("sgmnt_data",63,"off")=372
-	Set gtmtypes("sgmnt_data",63,"len")=12
-	Set gtmtypes("sgmnt_data",63,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","filler_384")=63
-	Set gtmtypes("sgmnt_data",64,"name")="sgmnt_data.trans_hist"
-	Set gtmtypes("sgmnt_data",64,"off")=384
-	Set gtmtypes("sgmnt_data",64,"len")=56
-	Set gtmtypes("sgmnt_data",64,"type")="th_index"
-	Set gtmtypfldindx("sgmnt_data","trans_hist")=64
-	Set gtmtypes("sgmnt_data",65,"name")="sgmnt_data.trans_hist.curr_tn"
+	Set gtmtypfldindx("sgmnt_data","db_got_to_v5_once")=62
+	Set gtmtypes("sgmnt_data",63,"name")="sgmnt_data.opened_by_gtmv53"
+	Set gtmtypes("sgmnt_data",63,"off")=368
+	Set gtmtypes("sgmnt_data",63,"len")=4
+	Set gtmtypes("sgmnt_data",63,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","opened_by_gtmv53")=63
+	Set gtmtypes("sgmnt_data",64,"name")="sgmnt_data.filler_384"
+	Set gtmtypes("sgmnt_data",64,"off")=372
+	Set gtmtypes("sgmnt_data",64,"len")=12
+	Set gtmtypes("sgmnt_data",64,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","filler_384")=64
+	Set gtmtypes("sgmnt_data",65,"name")="sgmnt_data.trans_hist"
 	Set gtmtypes("sgmnt_data",65,"off")=384
-	Set gtmtypes("sgmnt_data",65,"len")=8
-	Set gtmtypes("sgmnt_data",65,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","trans_hist.curr_tn")=65
-	Set gtmtypes("sgmnt_data",66,"name")="sgmnt_data.trans_hist.early_tn"
-	Set gtmtypes("sgmnt_data",66,"off")=392
+	Set gtmtypes("sgmnt_data",65,"len")=56
+	Set gtmtypes("sgmnt_data",65,"type")="th_index"
+	Set gtmtypfldindx("sgmnt_data","trans_hist")=65
+	Set gtmtypes("sgmnt_data",66,"name")="sgmnt_data.trans_hist.curr_tn"
+	Set gtmtypes("sgmnt_data",66,"off")=384
 	Set gtmtypes("sgmnt_data",66,"len")=8
 	Set gtmtypes("sgmnt_data",66,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","trans_hist.early_tn")=66
-	Set gtmtypes("sgmnt_data",67,"name")="sgmnt_data.trans_hist.last_mm_sync"
-	Set gtmtypes("sgmnt_data",67,"off")=400
+	Set gtmtypfldindx("sgmnt_data","trans_hist.curr_tn")=66
+	Set gtmtypes("sgmnt_data",67,"name")="sgmnt_data.trans_hist.early_tn"
+	Set gtmtypes("sgmnt_data",67,"off")=392
 	Set gtmtypes("sgmnt_data",67,"len")=8
 	Set gtmtypes("sgmnt_data",67,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","trans_hist.last_mm_sync")=67
-	Set gtmtypes("sgmnt_data",68,"name")="sgmnt_data.trans_hist.filler_8byte"
-	Set gtmtypes("sgmnt_data",68,"off")=408
+	Set gtmtypfldindx("sgmnt_data","trans_hist.early_tn")=67
+	Set gtmtypes("sgmnt_data",68,"name")="sgmnt_data.trans_hist.last_mm_sync"
+	Set gtmtypes("sgmnt_data",68,"off")=400
 	Set gtmtypes("sgmnt_data",68,"len")=8
-	Set gtmtypes("sgmnt_data",68,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","trans_hist.filler_8byte")=68
-	Set gtmtypes("sgmnt_data",69,"name")="sgmnt_data.trans_hist.mm_tn"
-	Set gtmtypes("sgmnt_data",69,"off")=416
+	Set gtmtypes("sgmnt_data",68,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","trans_hist.last_mm_sync")=68
+	Set gtmtypes("sgmnt_data",69,"name")="sgmnt_data.trans_hist.filler_8byte"
+	Set gtmtypes("sgmnt_data",69,"off")=408
 	Set gtmtypes("sgmnt_data",69,"len")=8
-	Set gtmtypes("sgmnt_data",69,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","trans_hist.mm_tn")=69
-	Set gtmtypes("sgmnt_data",70,"name")="sgmnt_data.trans_hist.lock_sequence"
-	Set gtmtypes("sgmnt_data",70,"off")=424
-	Set gtmtypes("sgmnt_data",70,"len")=4
-	Set gtmtypes("sgmnt_data",70,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","trans_hist.lock_sequence")=70
-	Set gtmtypes("sgmnt_data",71,"name")="sgmnt_data.trans_hist.ccp_jnl_filesize"
-	Set gtmtypes("sgmnt_data",71,"off")=428
+	Set gtmtypes("sgmnt_data",69,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","trans_hist.filler_8byte")=69
+	Set gtmtypes("sgmnt_data",70,"name")="sgmnt_data.trans_hist.mm_tn"
+	Set gtmtypes("sgmnt_data",70,"off")=416
+	Set gtmtypes("sgmnt_data",70,"len")=8
+	Set gtmtypes("sgmnt_data",70,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","trans_hist.mm_tn")=70
+	Set gtmtypes("sgmnt_data",71,"name")="sgmnt_data.trans_hist.lock_sequence"
+	Set gtmtypes("sgmnt_data",71,"off")=424
 	Set gtmtypes("sgmnt_data",71,"len")=4
 	Set gtmtypes("sgmnt_data",71,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","trans_hist.ccp_jnl_filesize")=71
-	Set gtmtypes("sgmnt_data",72,"name")="sgmnt_data.trans_hist.total_blks"
-	Set gtmtypes("sgmnt_data",72,"off")=432
+	Set gtmtypfldindx("sgmnt_data","trans_hist.lock_sequence")=71
+	Set gtmtypes("sgmnt_data",72,"name")="sgmnt_data.trans_hist.ccp_jnl_filesize"
+	Set gtmtypes("sgmnt_data",72,"off")=428
 	Set gtmtypes("sgmnt_data",72,"len")=4
 	Set gtmtypes("sgmnt_data",72,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","trans_hist.total_blks")=72
-	Set gtmtypes("sgmnt_data",73,"name")="sgmnt_data.trans_hist.free_blocks"
-	Set gtmtypes("sgmnt_data",73,"off")=436
+	Set gtmtypfldindx("sgmnt_data","trans_hist.ccp_jnl_filesize")=72
+	Set gtmtypes("sgmnt_data",73,"name")="sgmnt_data.trans_hist.total_blks"
+	Set gtmtypes("sgmnt_data",73,"off")=432
 	Set gtmtypes("sgmnt_data",73,"len")=4
 	Set gtmtypes("sgmnt_data",73,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","trans_hist.free_blocks")=73
-	Set gtmtypes("sgmnt_data",74,"name")="sgmnt_data.filler_trans_hist"
-	Set gtmtypes("sgmnt_data",74,"off")=440
-	Set gtmtypes("sgmnt_data",74,"len")=8
-	Set gtmtypes("sgmnt_data",74,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","filler_trans_hist")=74
-	Set gtmtypes("sgmnt_data",75,"name")="sgmnt_data.flush_time"
-	Set gtmtypes("sgmnt_data",75,"off")=448
+	Set gtmtypfldindx("sgmnt_data","trans_hist.total_blks")=73
+	Set gtmtypes("sgmnt_data",74,"name")="sgmnt_data.trans_hist.free_blocks"
+	Set gtmtypes("sgmnt_data",74,"off")=436
+	Set gtmtypes("sgmnt_data",74,"len")=4
+	Set gtmtypes("sgmnt_data",74,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","trans_hist.free_blocks")=74
+	Set gtmtypes("sgmnt_data",75,"name")="sgmnt_data.filler_trans_hist"
+	Set gtmtypes("sgmnt_data",75,"off")=440
 	Set gtmtypes("sgmnt_data",75,"len")=8
-	Set gtmtypes("sgmnt_data",75,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","flush_time")=75
-	Set gtmtypes("sgmnt_data",75,"dim")=2
-	Set gtmtypes("sgmnt_data",76,"name")="sgmnt_data.flush_trigger"
-	Set gtmtypes("sgmnt_data",76,"off")=456
-	Set gtmtypes("sgmnt_data",76,"len")=4
+	Set gtmtypes("sgmnt_data",75,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","filler_trans_hist")=75
+	Set gtmtypes("sgmnt_data",76,"name")="sgmnt_data.flush_time"
+	Set gtmtypes("sgmnt_data",76,"off")=448
+	Set gtmtypes("sgmnt_data",76,"len")=8
 	Set gtmtypes("sgmnt_data",76,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","flush_trigger")=76
-	Set gtmtypes("sgmnt_data",77,"name")="sgmnt_data.n_wrt_per_flu"
-	Set gtmtypes("sgmnt_data",77,"off")=460
+	Set gtmtypfldindx("sgmnt_data","flush_time")=76
+	Set gtmtypes("sgmnt_data",76,"dim")=2
+	Set gtmtypes("sgmnt_data",77,"name")="sgmnt_data.flush_trigger"
+	Set gtmtypes("sgmnt_data",77,"off")=456
 	Set gtmtypes("sgmnt_data",77,"len")=4
 	Set gtmtypes("sgmnt_data",77,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_wrt_per_flu")=77
-	Set gtmtypes("sgmnt_data",78,"name")="sgmnt_data.wait_disk_space"
-	Set gtmtypes("sgmnt_data",78,"off")=464
+	Set gtmtypfldindx("sgmnt_data","flush_trigger")=77
+	Set gtmtypes("sgmnt_data",78,"name")="sgmnt_data.n_wrt_per_flu"
+	Set gtmtypes("sgmnt_data",78,"off")=460
 	Set gtmtypes("sgmnt_data",78,"len")=4
 	Set gtmtypes("sgmnt_data",78,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wait_disk_space")=78
-	Set gtmtypes("sgmnt_data",79,"name")="sgmnt_data.defer_time"
-	Set gtmtypes("sgmnt_data",79,"off")=468
+	Set gtmtypfldindx("sgmnt_data","n_wrt_per_flu")=78
+	Set gtmtypes("sgmnt_data",79,"name")="sgmnt_data.wait_disk_space"
+	Set gtmtypes("sgmnt_data",79,"off")=464
 	Set gtmtypes("sgmnt_data",79,"len")=4
 	Set gtmtypes("sgmnt_data",79,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","defer_time")=79
-	Set gtmtypes("sgmnt_data",80,"name")="sgmnt_data.filler_wc_blocked"
-	Set gtmtypes("sgmnt_data",80,"off")=472
+	Set gtmtypfldindx("sgmnt_data","wait_disk_space")=79
+	Set gtmtypes("sgmnt_data",80,"name")="sgmnt_data.defer_time"
+	Set gtmtypes("sgmnt_data",80,"off")=468
 	Set gtmtypes("sgmnt_data",80,"len")=4
-	Set gtmtypes("sgmnt_data",80,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","filler_wc_blocked")=80
-	Set gtmtypes("sgmnt_data",81,"name")="sgmnt_data.mumps_can_bypass"
-	Set gtmtypes("sgmnt_data",81,"off")=476
+	Set gtmtypes("sgmnt_data",80,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","defer_time")=80
+	Set gtmtypes("sgmnt_data",81,"name")="sgmnt_data.filler_wc_blocked"
+	Set gtmtypes("sgmnt_data",81,"off")=472
 	Set gtmtypes("sgmnt_data",81,"len")=4
 	Set gtmtypes("sgmnt_data",81,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","mumps_can_bypass")=81
-	Set gtmtypes("sgmnt_data",82,"name")="sgmnt_data.epoch_taper"
-	Set gtmtypes("sgmnt_data",82,"off")=480
+	Set gtmtypfldindx("sgmnt_data","filler_wc_blocked")=81
+	Set gtmtypes("sgmnt_data",82,"name")="sgmnt_data.mumps_can_bypass"
+	Set gtmtypes("sgmnt_data",82,"off")=476
 	Set gtmtypes("sgmnt_data",82,"len")=4
 	Set gtmtypes("sgmnt_data",82,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","epoch_taper")=82
-	Set gtmtypes("sgmnt_data",83,"name")="sgmnt_data.epoch_taper_time_pct"
-	Set gtmtypes("sgmnt_data",83,"off")=484
+	Set gtmtypfldindx("sgmnt_data","mumps_can_bypass")=82
+	Set gtmtypes("sgmnt_data",83,"name")="sgmnt_data.epoch_taper"
+	Set gtmtypes("sgmnt_data",83,"off")=480
 	Set gtmtypes("sgmnt_data",83,"len")=4
-	Set gtmtypes("sgmnt_data",83,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","epoch_taper_time_pct")=83
-	Set gtmtypes("sgmnt_data",84,"name")="sgmnt_data.epoch_taper_jnl_pct"
-	Set gtmtypes("sgmnt_data",84,"off")=488
+	Set gtmtypes("sgmnt_data",83,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","epoch_taper")=83
+	Set gtmtypes("sgmnt_data",84,"name")="sgmnt_data.epoch_taper_time_pct"
+	Set gtmtypes("sgmnt_data",84,"off")=484
 	Set gtmtypes("sgmnt_data",84,"len")=4
 	Set gtmtypes("sgmnt_data",84,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","epoch_taper_jnl_pct")=84
-	Set gtmtypes("sgmnt_data",85,"name")="sgmnt_data.filler_512"
-	Set gtmtypes("sgmnt_data",85,"off")=492
+	Set gtmtypfldindx("sgmnt_data","epoch_taper_time_pct")=84
+	Set gtmtypes("sgmnt_data",85,"name")="sgmnt_data.epoch_taper_jnl_pct"
+	Set gtmtypes("sgmnt_data",85,"off")=488
 	Set gtmtypes("sgmnt_data",85,"len")=4
-	Set gtmtypes("sgmnt_data",85,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","filler_512")=85
-	Set gtmtypes("sgmnt_data",86,"name")="sgmnt_data.reserved_for_upd"
-	Set gtmtypes("sgmnt_data",86,"off")=496
+	Set gtmtypes("sgmnt_data",85,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","epoch_taper_jnl_pct")=85
+	Set gtmtypes("sgmnt_data",86,"name")="sgmnt_data.asyncio"
+	Set gtmtypes("sgmnt_data",86,"off")=492
 	Set gtmtypes("sgmnt_data",86,"len")=4
-	Set gtmtypes("sgmnt_data",86,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","reserved_for_upd")=86
-	Set gtmtypes("sgmnt_data",87,"name")="sgmnt_data.avg_blks_per_100gbl"
-	Set gtmtypes("sgmnt_data",87,"off")=500
+	Set gtmtypes("sgmnt_data",86,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","asyncio")=86
+	Set gtmtypes("sgmnt_data",87,"name")="sgmnt_data.reserved_for_upd"
+	Set gtmtypes("sgmnt_data",87,"off")=496
 	Set gtmtypes("sgmnt_data",87,"len")=4
 	Set gtmtypes("sgmnt_data",87,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","avg_blks_per_100gbl")=87
-	Set gtmtypes("sgmnt_data",88,"name")="sgmnt_data.pre_read_trigger_factor"
-	Set gtmtypes("sgmnt_data",88,"off")=504
+	Set gtmtypfldindx("sgmnt_data","reserved_for_upd")=87
+	Set gtmtypes("sgmnt_data",88,"name")="sgmnt_data.avg_blks_per_100gbl"
+	Set gtmtypes("sgmnt_data",88,"off")=500
 	Set gtmtypes("sgmnt_data",88,"len")=4
 	Set gtmtypes("sgmnt_data",88,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","pre_read_trigger_factor")=88
-	Set gtmtypes("sgmnt_data",89,"name")="sgmnt_data.writer_trigger_factor"
-	Set gtmtypes("sgmnt_data",89,"off")=508
+	Set gtmtypfldindx("sgmnt_data","avg_blks_per_100gbl")=88
+	Set gtmtypes("sgmnt_data",89,"name")="sgmnt_data.pre_read_trigger_factor"
+	Set gtmtypes("sgmnt_data",89,"off")=504
 	Set gtmtypes("sgmnt_data",89,"len")=4
 	Set gtmtypes("sgmnt_data",89,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","writer_trigger_factor")=89
-	Set gtmtypes("sgmnt_data",90,"name")="sgmnt_data.semid"
-	Set gtmtypes("sgmnt_data",90,"off")=512
+	Set gtmtypfldindx("sgmnt_data","pre_read_trigger_factor")=89
+	Set gtmtypes("sgmnt_data",90,"name")="sgmnt_data.writer_trigger_factor"
+	Set gtmtypes("sgmnt_data",90,"off")=508
 	Set gtmtypes("sgmnt_data",90,"len")=4
-	Set gtmtypes("sgmnt_data",90,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","semid")=90
-	Set gtmtypes("sgmnt_data",91,"name")="sgmnt_data.shmid"
-	Set gtmtypes("sgmnt_data",91,"off")=516
+	Set gtmtypes("sgmnt_data",90,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","writer_trigger_factor")=90
+	Set gtmtypes("sgmnt_data",91,"name")="sgmnt_data.semid"
+	Set gtmtypes("sgmnt_data",91,"off")=512
 	Set gtmtypes("sgmnt_data",91,"len")=4
 	Set gtmtypes("sgmnt_data",91,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","shmid")=91
-	Set gtmtypes("sgmnt_data",92,"name")="sgmnt_data.gt_sem_ctime"
-	Set gtmtypes("sgmnt_data",92,"off")=520
-	Set gtmtypes("sgmnt_data",92,"len")=8
-	Set gtmtypes("sgmnt_data",92,"type")="gtm_time8"
-	Set gtmtypfldindx("sgmnt_data","gt_sem_ctime")=92
-	Set gtmtypes("sgmnt_data",93,"name")="sgmnt_data.gt_sem_ctime.ctime"
+	Set gtmtypfldindx("sgmnt_data","semid")=91
+	Set gtmtypes("sgmnt_data",92,"name")="sgmnt_data.shmid"
+	Set gtmtypes("sgmnt_data",92,"off")=516
+	Set gtmtypes("sgmnt_data",92,"len")=4
+	Set gtmtypes("sgmnt_data",92,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","shmid")=92
+	Set gtmtypes("sgmnt_data",93,"name")="sgmnt_data.gt_sem_ctime"
 	Set gtmtypes("sgmnt_data",93,"off")=520
 	Set gtmtypes("sgmnt_data",93,"len")=8
-	Set gtmtypes("sgmnt_data",93,"type")="time_t"
-	Set gtmtypfldindx("sgmnt_data","gt_sem_ctime.ctime")=93
-	Set gtmtypes("sgmnt_data",94,"name")="sgmnt_data.gt_sem_ctime.filler"
+	Set gtmtypes("sgmnt_data",93,"type")="gtm_time8"
+	Set gtmtypfldindx("sgmnt_data","gt_sem_ctime")=93
+	Set gtmtypes("sgmnt_data",94,"name")="sgmnt_data.gt_sem_ctime.ctime"
 	Set gtmtypes("sgmnt_data",94,"off")=520
 	Set gtmtypes("sgmnt_data",94,"len")=8
-	Set gtmtypes("sgmnt_data",94,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","gt_sem_ctime.filler")=94
-	Set gtmtypes("sgmnt_data",94,"dim")=2
-	Set gtmtypes("sgmnt_data",95,"name")="sgmnt_data.gt_shm_ctime"
-	Set gtmtypes("sgmnt_data",95,"off")=528
+	Set gtmtypes("sgmnt_data",94,"type")="time_t"
+	Set gtmtypfldindx("sgmnt_data","gt_sem_ctime.ctime")=94
+	Set gtmtypes("sgmnt_data",95,"name")="sgmnt_data.gt_sem_ctime.filler"
+	Set gtmtypes("sgmnt_data",95,"off")=520
 	Set gtmtypes("sgmnt_data",95,"len")=8
-	Set gtmtypes("sgmnt_data",95,"type")="gtm_time8"
-	Set gtmtypfldindx("sgmnt_data","gt_shm_ctime")=95
-	Set gtmtypes("sgmnt_data",96,"name")="sgmnt_data.gt_shm_ctime.ctime"
+	Set gtmtypes("sgmnt_data",95,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","gt_sem_ctime.filler")=95
+	Set gtmtypes("sgmnt_data",95,"dim")=2
+	Set gtmtypes("sgmnt_data",96,"name")="sgmnt_data.gt_shm_ctime"
 	Set gtmtypes("sgmnt_data",96,"off")=528
 	Set gtmtypes("sgmnt_data",96,"len")=8
-	Set gtmtypes("sgmnt_data",96,"type")="time_t"
-	Set gtmtypfldindx("sgmnt_data","gt_shm_ctime.ctime")=96
-	Set gtmtypes("sgmnt_data",97,"name")="sgmnt_data.gt_shm_ctime.filler"
+	Set gtmtypes("sgmnt_data",96,"type")="gtm_time8"
+	Set gtmtypfldindx("sgmnt_data","gt_shm_ctime")=96
+	Set gtmtypes("sgmnt_data",97,"name")="sgmnt_data.gt_shm_ctime.ctime"
 	Set gtmtypes("sgmnt_data",97,"off")=528
 	Set gtmtypes("sgmnt_data",97,"len")=8
-	Set gtmtypes("sgmnt_data",97,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","gt_shm_ctime.filler")=97
-	Set gtmtypes("sgmnt_data",97,"dim")=2
-	Set gtmtypes("sgmnt_data",98,"name")="sgmnt_data.filler_unixonly"
-	Set gtmtypes("sgmnt_data",98,"off")=536
-	Set gtmtypes("sgmnt_data",98,"len")=40
-	Set gtmtypes("sgmnt_data",98,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","filler_unixonly")=98
-	Set gtmtypes("sgmnt_data",99,"name")="sgmnt_data.filler_n_retries"
-	Set gtmtypes("sgmnt_data",99,"off")=576
-	Set gtmtypes("sgmnt_data",99,"len")=20
-	Set gtmtypes("sgmnt_data",99,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","filler_n_retries")=99
-	Set gtmtypes("sgmnt_data",99,"dim")=5
-	Set gtmtypes("sgmnt_data",100,"name")="sgmnt_data.filler_n_puts"
-	Set gtmtypes("sgmnt_data",100,"off")=596
-	Set gtmtypes("sgmnt_data",100,"len")=4
+	Set gtmtypes("sgmnt_data",97,"type")="time_t"
+	Set gtmtypfldindx("sgmnt_data","gt_shm_ctime.ctime")=97
+	Set gtmtypes("sgmnt_data",98,"name")="sgmnt_data.gt_shm_ctime.filler"
+	Set gtmtypes("sgmnt_data",98,"off")=528
+	Set gtmtypes("sgmnt_data",98,"len")=8
+	Set gtmtypes("sgmnt_data",98,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","gt_shm_ctime.filler")=98
+	Set gtmtypes("sgmnt_data",98,"dim")=2
+	Set gtmtypes("sgmnt_data",99,"name")="sgmnt_data.filler_unixonly"
+	Set gtmtypes("sgmnt_data",99,"off")=536
+	Set gtmtypes("sgmnt_data",99,"len")=40
+	Set gtmtypes("sgmnt_data",99,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","filler_unixonly")=99
+	Set gtmtypes("sgmnt_data",100,"name")="sgmnt_data.filler_n_retries"
+	Set gtmtypes("sgmnt_data",100,"off")=576
+	Set gtmtypes("sgmnt_data",100,"len")=20
 	Set gtmtypes("sgmnt_data",100,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","filler_n_puts")=100
-	Set gtmtypes("sgmnt_data",101,"name")="sgmnt_data.filler_n_kills"
-	Set gtmtypes("sgmnt_data",101,"off")=600
+	Set gtmtypfldindx("sgmnt_data","filler_n_retries")=100
+	Set gtmtypes("sgmnt_data",100,"dim")=5
+	Set gtmtypes("sgmnt_data",101,"name")="sgmnt_data.filler_n_puts"
+	Set gtmtypes("sgmnt_data",101,"off")=596
 	Set gtmtypes("sgmnt_data",101,"len")=4
 	Set gtmtypes("sgmnt_data",101,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","filler_n_kills")=101
-	Set gtmtypes("sgmnt_data",102,"name")="sgmnt_data.filler_n_queries"
-	Set gtmtypes("sgmnt_data",102,"off")=604
+	Set gtmtypfldindx("sgmnt_data","filler_n_puts")=101
+	Set gtmtypes("sgmnt_data",102,"name")="sgmnt_data.filler_n_kills"
+	Set gtmtypes("sgmnt_data",102,"off")=600
 	Set gtmtypes("sgmnt_data",102,"len")=4
 	Set gtmtypes("sgmnt_data",102,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","filler_n_queries")=102
-	Set gtmtypes("sgmnt_data",103,"name")="sgmnt_data.filler_n_gets"
-	Set gtmtypes("sgmnt_data",103,"off")=608
+	Set gtmtypfldindx("sgmnt_data","filler_n_kills")=102
+	Set gtmtypes("sgmnt_data",103,"name")="sgmnt_data.filler_n_queries"
+	Set gtmtypes("sgmnt_data",103,"off")=604
 	Set gtmtypes("sgmnt_data",103,"len")=4
 	Set gtmtypes("sgmnt_data",103,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","filler_n_gets")=103
-	Set gtmtypes("sgmnt_data",104,"name")="sgmnt_data.filler_n_order"
-	Set gtmtypes("sgmnt_data",104,"off")=612
+	Set gtmtypfldindx("sgmnt_data","filler_n_queries")=103
+	Set gtmtypes("sgmnt_data",104,"name")="sgmnt_data.filler_n_gets"
+	Set gtmtypes("sgmnt_data",104,"off")=608
 	Set gtmtypes("sgmnt_data",104,"len")=4
 	Set gtmtypes("sgmnt_data",104,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","filler_n_order")=104
-	Set gtmtypes("sgmnt_data",105,"name")="sgmnt_data.filler_n_zprevs"
-	Set gtmtypes("sgmnt_data",105,"off")=616
+	Set gtmtypfldindx("sgmnt_data","filler_n_gets")=104
+	Set gtmtypes("sgmnt_data",105,"name")="sgmnt_data.filler_n_order"
+	Set gtmtypes("sgmnt_data",105,"off")=612
 	Set gtmtypes("sgmnt_data",105,"len")=4
 	Set gtmtypes("sgmnt_data",105,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","filler_n_zprevs")=105
-	Set gtmtypes("sgmnt_data",106,"name")="sgmnt_data.filler_n_data"
-	Set gtmtypes("sgmnt_data",106,"off")=620
+	Set gtmtypfldindx("sgmnt_data","filler_n_order")=105
+	Set gtmtypes("sgmnt_data",106,"name")="sgmnt_data.filler_n_zprevs"
+	Set gtmtypes("sgmnt_data",106,"off")=616
 	Set gtmtypes("sgmnt_data",106,"len")=4
 	Set gtmtypes("sgmnt_data",106,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","filler_n_data")=106
-	Set gtmtypes("sgmnt_data",107,"name")="sgmnt_data.filler_n_puts_duplicate"
-	Set gtmtypes("sgmnt_data",107,"off")=624
+	Set gtmtypfldindx("sgmnt_data","filler_n_zprevs")=106
+	Set gtmtypes("sgmnt_data",107,"name")="sgmnt_data.filler_n_data"
+	Set gtmtypes("sgmnt_data",107,"off")=620
 	Set gtmtypes("sgmnt_data",107,"len")=4
-	Set gtmtypes("sgmnt_data",107,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","filler_n_puts_duplicate")=107
-	Set gtmtypes("sgmnt_data",108,"name")="sgmnt_data.filler_n_tp_updates"
-	Set gtmtypes("sgmnt_data",108,"off")=628
+	Set gtmtypes("sgmnt_data",107,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","filler_n_data")=107
+	Set gtmtypes("sgmnt_data",108,"name")="sgmnt_data.filler_n_puts_duplicate"
+	Set gtmtypes("sgmnt_data",108,"off")=624
 	Set gtmtypes("sgmnt_data",108,"len")=4
 	Set gtmtypes("sgmnt_data",108,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","filler_n_tp_updates")=108
-	Set gtmtypes("sgmnt_data",109,"name")="sgmnt_data.filler_n_tp_updates_duplicate"
-	Set gtmtypes("sgmnt_data",109,"off")=632
+	Set gtmtypfldindx("sgmnt_data","filler_n_puts_duplicate")=108
+	Set gtmtypes("sgmnt_data",109,"name")="sgmnt_data.filler_n_tp_updates"
+	Set gtmtypes("sgmnt_data",109,"off")=628
 	Set gtmtypes("sgmnt_data",109,"len")=4
 	Set gtmtypes("sgmnt_data",109,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","filler_n_tp_updates_duplicate")=109
-	Set gtmtypes("sgmnt_data",110,"name")="sgmnt_data.filler_accounting_64_align"
-	Set gtmtypes("sgmnt_data",110,"off")=636
+	Set gtmtypfldindx("sgmnt_data","filler_n_tp_updates")=109
+	Set gtmtypes("sgmnt_data",110,"name")="sgmnt_data.filler_n_tp_updates_duplicate"
+	Set gtmtypes("sgmnt_data",110,"off")=632
 	Set gtmtypes("sgmnt_data",110,"len")=4
-	Set gtmtypes("sgmnt_data",110,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","filler_accounting_64_align")=110
-	Set gtmtypes("sgmnt_data",111,"name")="sgmnt_data.staleness"
-	Set gtmtypes("sgmnt_data",111,"off")=640
-	Set gtmtypes("sgmnt_data",111,"len")=8
-	Set gtmtypes("sgmnt_data",111,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","staleness")=111
-	Set gtmtypes("sgmnt_data",111,"dim")=2
-	Set gtmtypes("sgmnt_data",112,"name")="sgmnt_data.ccp_tick_interval"
-	Set gtmtypes("sgmnt_data",112,"off")=648
+	Set gtmtypes("sgmnt_data",110,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","filler_n_tp_updates_duplicate")=110
+	Set gtmtypes("sgmnt_data",111,"name")="sgmnt_data.filler_accounting_64_align"
+	Set gtmtypes("sgmnt_data",111,"off")=636
+	Set gtmtypes("sgmnt_data",111,"len")=4
+	Set gtmtypes("sgmnt_data",111,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","filler_accounting_64_align")=111
+	Set gtmtypes("sgmnt_data",112,"name")="sgmnt_data.staleness"
+	Set gtmtypes("sgmnt_data",112,"off")=640
 	Set gtmtypes("sgmnt_data",112,"len")=8
 	Set gtmtypes("sgmnt_data",112,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","ccp_tick_interval")=112
+	Set gtmtypfldindx("sgmnt_data","staleness")=112
 	Set gtmtypes("sgmnt_data",112,"dim")=2
-	Set gtmtypes("sgmnt_data",113,"name")="sgmnt_data.ccp_quantum_interval"
-	Set gtmtypes("sgmnt_data",113,"off")=656
+	Set gtmtypes("sgmnt_data",113,"name")="sgmnt_data.ccp_tick_interval"
+	Set gtmtypes("sgmnt_data",113,"off")=648
 	Set gtmtypes("sgmnt_data",113,"len")=8
 	Set gtmtypes("sgmnt_data",113,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","ccp_quantum_interval")=113
+	Set gtmtypfldindx("sgmnt_data","ccp_tick_interval")=113
 	Set gtmtypes("sgmnt_data",113,"dim")=2
-	Set gtmtypes("sgmnt_data",114,"name")="sgmnt_data.ccp_response_interval"
-	Set gtmtypes("sgmnt_data",114,"off")=664
+	Set gtmtypes("sgmnt_data",114,"name")="sgmnt_data.ccp_quantum_interval"
+	Set gtmtypes("sgmnt_data",114,"off")=656
 	Set gtmtypes("sgmnt_data",114,"len")=8
 	Set gtmtypes("sgmnt_data",114,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","ccp_response_interval")=114
+	Set gtmtypfldindx("sgmnt_data","ccp_quantum_interval")=114
 	Set gtmtypes("sgmnt_data",114,"dim")=2
-	Set gtmtypes("sgmnt_data",115,"name")="sgmnt_data.ccp_jnl_before"
-	Set gtmtypes("sgmnt_data",115,"off")=672
-	Set gtmtypes("sgmnt_data",115,"len")=4
-	Set gtmtypes("sgmnt_data",115,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","ccp_jnl_before")=115
-	Set gtmtypes("sgmnt_data",116,"name")="sgmnt_data.clustered"
-	Set gtmtypes("sgmnt_data",116,"off")=676
+	Set gtmtypes("sgmnt_data",115,"name")="sgmnt_data.ccp_response_interval"
+	Set gtmtypes("sgmnt_data",115,"off")=664
+	Set gtmtypes("sgmnt_data",115,"len")=8
+	Set gtmtypes("sgmnt_data",115,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","ccp_response_interval")=115
+	Set gtmtypes("sgmnt_data",115,"dim")=2
+	Set gtmtypes("sgmnt_data",116,"name")="sgmnt_data.ccp_jnl_before"
+	Set gtmtypes("sgmnt_data",116,"off")=672
 	Set gtmtypes("sgmnt_data",116,"len")=4
 	Set gtmtypes("sgmnt_data",116,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","clustered")=116
-	Set gtmtypes("sgmnt_data",117,"name")="sgmnt_data.unbacked_cache"
-	Set gtmtypes("sgmnt_data",117,"off")=680
+	Set gtmtypfldindx("sgmnt_data","ccp_jnl_before")=116
+	Set gtmtypes("sgmnt_data",117,"name")="sgmnt_data.clustered"
+	Set gtmtypes("sgmnt_data",117,"off")=676
 	Set gtmtypes("sgmnt_data",117,"len")=4
 	Set gtmtypes("sgmnt_data",117,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","unbacked_cache")=117
-	Set gtmtypes("sgmnt_data",118,"name")="sgmnt_data.rc_srv_cnt"
-	Set gtmtypes("sgmnt_data",118,"off")=684
+	Set gtmtypfldindx("sgmnt_data","clustered")=117
+	Set gtmtypes("sgmnt_data",118,"name")="sgmnt_data.unbacked_cache"
+	Set gtmtypes("sgmnt_data",118,"off")=680
 	Set gtmtypes("sgmnt_data",118,"len")=4
-	Set gtmtypes("sgmnt_data",118,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","rc_srv_cnt")=118
-	Set gtmtypes("sgmnt_data",119,"name")="sgmnt_data.dsid"
-	Set gtmtypes("sgmnt_data",119,"off")=688
+	Set gtmtypes("sgmnt_data",118,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","unbacked_cache")=118
+	Set gtmtypes("sgmnt_data",119,"name")="sgmnt_data.rc_srv_cnt"
+	Set gtmtypes("sgmnt_data",119,"off")=684
 	Set gtmtypes("sgmnt_data",119,"len")=4
 	Set gtmtypes("sgmnt_data",119,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","dsid")=119
-	Set gtmtypes("sgmnt_data",120,"name")="sgmnt_data.rc_node"
-	Set gtmtypes("sgmnt_data",120,"off")=692
+	Set gtmtypfldindx("sgmnt_data","rc_srv_cnt")=119
+	Set gtmtypes("sgmnt_data",120,"name")="sgmnt_data.dsid"
+	Set gtmtypes("sgmnt_data",120,"off")=688
 	Set gtmtypes("sgmnt_data",120,"len")=4
 	Set gtmtypes("sgmnt_data",120,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","rc_node")=120
-	Set gtmtypes("sgmnt_data",121,"name")="sgmnt_data.filler_ccp_rc"
-	Set gtmtypes("sgmnt_data",121,"off")=696
-	Set gtmtypes("sgmnt_data",121,"len")=8
-	Set gtmtypes("sgmnt_data",121,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","filler_ccp_rc")=121
-	Set gtmtypes("sgmnt_data",122,"name")="sgmnt_data.reg_seqno"
-	Set gtmtypes("sgmnt_data",122,"off")=704
+	Set gtmtypfldindx("sgmnt_data","dsid")=120
+	Set gtmtypes("sgmnt_data",121,"name")="sgmnt_data.rc_node"
+	Set gtmtypes("sgmnt_data",121,"off")=692
+	Set gtmtypes("sgmnt_data",121,"len")=4
+	Set gtmtypes("sgmnt_data",121,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","rc_node")=121
+	Set gtmtypes("sgmnt_data",122,"name")="sgmnt_data.filler_ccp_rc"
+	Set gtmtypes("sgmnt_data",122,"off")=696
 	Set gtmtypes("sgmnt_data",122,"len")=8
-	Set gtmtypes("sgmnt_data",122,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","reg_seqno")=122
-	Set gtmtypes("sgmnt_data",123,"name")="sgmnt_data.pre_multisite_resync_seqno"
-	Set gtmtypes("sgmnt_data",123,"off")=712
+	Set gtmtypes("sgmnt_data",122,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","filler_ccp_rc")=122
+	Set gtmtypes("sgmnt_data",123,"name")="sgmnt_data.reg_seqno"
+	Set gtmtypes("sgmnt_data",123,"off")=704
 	Set gtmtypes("sgmnt_data",123,"len")=8
 	Set gtmtypes("sgmnt_data",123,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","pre_multisite_resync_seqno")=123
-	Set gtmtypes("sgmnt_data",124,"name")="sgmnt_data.zqgblmod_tn"
-	Set gtmtypes("sgmnt_data",124,"off")=720
+	Set gtmtypfldindx("sgmnt_data","reg_seqno")=123
+	Set gtmtypes("sgmnt_data",124,"name")="sgmnt_data.pre_multisite_resync_seqno"
+	Set gtmtypes("sgmnt_data",124,"off")=712
 	Set gtmtypes("sgmnt_data",124,"len")=8
 	Set gtmtypes("sgmnt_data",124,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","zqgblmod_tn")=124
-	Set gtmtypes("sgmnt_data",125,"name")="sgmnt_data.zqgblmod_seqno"
-	Set gtmtypes("sgmnt_data",125,"off")=728
+	Set gtmtypfldindx("sgmnt_data","pre_multisite_resync_seqno")=124
+	Set gtmtypes("sgmnt_data",125,"name")="sgmnt_data.zqgblmod_tn"
+	Set gtmtypes("sgmnt_data",125,"off")=720
 	Set gtmtypes("sgmnt_data",125,"len")=8
 	Set gtmtypes("sgmnt_data",125,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","zqgblmod_seqno")=125
-	Set gtmtypes("sgmnt_data",126,"name")="sgmnt_data.repl_state"
-	Set gtmtypes("sgmnt_data",126,"off")=736
-	Set gtmtypes("sgmnt_data",126,"len")=4
-	Set gtmtypes("sgmnt_data",126,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","repl_state")=126
-	Set gtmtypes("sgmnt_data",127,"name")="sgmnt_data.multi_site_open"
-	Set gtmtypes("sgmnt_data",127,"off")=740
+	Set gtmtypfldindx("sgmnt_data","zqgblmod_tn")=125
+	Set gtmtypes("sgmnt_data",126,"name")="sgmnt_data.zqgblmod_seqno"
+	Set gtmtypes("sgmnt_data",126,"off")=728
+	Set gtmtypes("sgmnt_data",126,"len")=8
+	Set gtmtypes("sgmnt_data",126,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","zqgblmod_seqno")=126
+	Set gtmtypes("sgmnt_data",127,"name")="sgmnt_data.repl_state"
+	Set gtmtypes("sgmnt_data",127,"off")=736
 	Set gtmtypes("sgmnt_data",127,"len")=4
-	Set gtmtypes("sgmnt_data",127,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","multi_site_open")=127
-	Set gtmtypes("sgmnt_data",128,"name")="sgmnt_data.filler_seqno"
-	Set gtmtypes("sgmnt_data",128,"off")=744
-	Set gtmtypes("sgmnt_data",128,"len")=8
-	Set gtmtypes("sgmnt_data",128,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","filler_seqno")=128
-	Set gtmtypes("sgmnt_data",129,"name")="sgmnt_data.filler_repl"
-	Set gtmtypes("sgmnt_data",129,"off")=752
-	Set gtmtypes("sgmnt_data",129,"len")=16
-	Set gtmtypes("sgmnt_data",129,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","filler_repl")=129
-	Set gtmtypes("sgmnt_data",130,"name")="sgmnt_data.filler_n_tp_retries"
-	Set gtmtypes("sgmnt_data",130,"off")=768
-	Set gtmtypes("sgmnt_data",130,"len")=48
-	Set gtmtypes("sgmnt_data",130,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","filler_n_tp_retries")=130
-	Set gtmtypes("sgmnt_data",130,"dim")=12
-	Set gtmtypes("sgmnt_data",131,"name")="sgmnt_data.filler_n_tp_retries_conflicts"
-	Set gtmtypes("sgmnt_data",131,"off")=816
+	Set gtmtypes("sgmnt_data",127,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","repl_state")=127
+	Set gtmtypes("sgmnt_data",128,"name")="sgmnt_data.multi_site_open"
+	Set gtmtypes("sgmnt_data",128,"off")=740
+	Set gtmtypes("sgmnt_data",128,"len")=4
+	Set gtmtypes("sgmnt_data",128,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","multi_site_open")=128
+	Set gtmtypes("sgmnt_data",129,"name")="sgmnt_data.filler_seqno"
+	Set gtmtypes("sgmnt_data",129,"off")=744
+	Set gtmtypes("sgmnt_data",129,"len")=8
+	Set gtmtypes("sgmnt_data",129,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","filler_seqno")=129
+	Set gtmtypes("sgmnt_data",130,"name")="sgmnt_data.filler_repl"
+	Set gtmtypes("sgmnt_data",130,"off")=752
+	Set gtmtypes("sgmnt_data",130,"len")=16
+	Set gtmtypes("sgmnt_data",130,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","filler_repl")=130
+	Set gtmtypes("sgmnt_data",131,"name")="sgmnt_data.filler_n_tp_retries"
+	Set gtmtypes("sgmnt_data",131,"off")=768
 	Set gtmtypes("sgmnt_data",131,"len")=48
 	Set gtmtypes("sgmnt_data",131,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","filler_n_tp_retries_conflicts")=131
+	Set gtmtypfldindx("sgmnt_data","filler_n_tp_retries")=131
 	Set gtmtypes("sgmnt_data",131,"dim")=12
-	Set gtmtypes("sgmnt_data",132,"name")="sgmnt_data.tp_cdb_sc_blkmod"
-	Set gtmtypes("sgmnt_data",132,"off")=864
-	Set gtmtypes("sgmnt_data",132,"len")=32
+	Set gtmtypes("sgmnt_data",132,"name")="sgmnt_data.filler_n_tp_retries_conflicts"
+	Set gtmtypes("sgmnt_data",132,"off")=816
+	Set gtmtypes("sgmnt_data",132,"len")=48
 	Set gtmtypes("sgmnt_data",132,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","tp_cdb_sc_blkmod")=132
-	Set gtmtypes("sgmnt_data",132,"dim")=8
-	Set gtmtypes("sgmnt_data",133,"name")="sgmnt_data.jnl_alq"
-	Set gtmtypes("sgmnt_data",133,"off")=896
-	Set gtmtypes("sgmnt_data",133,"len")=4
-	Set gtmtypes("sgmnt_data",133,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","jnl_alq")=133
-	Set gtmtypes("sgmnt_data",134,"name")="sgmnt_data.jnl_deq"
-	Set gtmtypes("sgmnt_data",134,"off")=900
+	Set gtmtypfldindx("sgmnt_data","filler_n_tp_retries_conflicts")=132
+	Set gtmtypes("sgmnt_data",132,"dim")=12
+	Set gtmtypes("sgmnt_data",133,"name")="sgmnt_data.tp_cdb_sc_blkmod"
+	Set gtmtypes("sgmnt_data",133,"off")=864
+	Set gtmtypes("sgmnt_data",133,"len")=32
+	Set gtmtypes("sgmnt_data",133,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","tp_cdb_sc_blkmod")=133
+	Set gtmtypes("sgmnt_data",133,"dim")=8
+	Set gtmtypes("sgmnt_data",134,"name")="sgmnt_data.jnl_alq"
+	Set gtmtypes("sgmnt_data",134,"off")=896
 	Set gtmtypes("sgmnt_data",134,"len")=4
 	Set gtmtypes("sgmnt_data",134,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","jnl_deq")=134
-	Set gtmtypes("sgmnt_data",135,"name")="sgmnt_data.jnl_buffer_size"
-	Set gtmtypes("sgmnt_data",135,"off")=904
+	Set gtmtypfldindx("sgmnt_data","jnl_alq")=134
+	Set gtmtypes("sgmnt_data",135,"name")="sgmnt_data.jnl_deq"
+	Set gtmtypes("sgmnt_data",135,"off")=900
 	Set gtmtypes("sgmnt_data",135,"len")=4
-	Set gtmtypes("sgmnt_data",135,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","jnl_buffer_size")=135
-	Set gtmtypes("sgmnt_data",136,"name")="sgmnt_data.jnl_before_image"
-	Set gtmtypes("sgmnt_data",136,"off")=908
+	Set gtmtypes("sgmnt_data",135,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","jnl_deq")=135
+	Set gtmtypes("sgmnt_data",136,"name")="sgmnt_data.jnl_buffer_size"
+	Set gtmtypes("sgmnt_data",136,"off")=904
 	Set gtmtypes("sgmnt_data",136,"len")=4
-	Set gtmtypes("sgmnt_data",136,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","jnl_before_image")=136
-	Set gtmtypes("sgmnt_data",137,"name")="sgmnt_data.jnl_state"
-	Set gtmtypes("sgmnt_data",137,"off")=912
+	Set gtmtypes("sgmnt_data",136,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","jnl_buffer_size")=136
+	Set gtmtypes("sgmnt_data",137,"name")="sgmnt_data.jnl_before_image"
+	Set gtmtypes("sgmnt_data",137,"off")=908
 	Set gtmtypes("sgmnt_data",137,"len")=4
-	Set gtmtypes("sgmnt_data",137,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","jnl_state")=137
-	Set gtmtypes("sgmnt_data",138,"name")="sgmnt_data.jnl_file_len"
-	Set gtmtypes("sgmnt_data",138,"off")=916
+	Set gtmtypes("sgmnt_data",137,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","jnl_before_image")=137
+	Set gtmtypes("sgmnt_data",138,"name")="sgmnt_data.jnl_state"
+	Set gtmtypes("sgmnt_data",138,"off")=912
 	Set gtmtypes("sgmnt_data",138,"len")=4
-	Set gtmtypes("sgmnt_data",138,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","jnl_file_len")=138
-	Set gtmtypes("sgmnt_data",139,"name")="sgmnt_data.autoswitchlimit"
-	Set gtmtypes("sgmnt_data",139,"off")=920
+	Set gtmtypes("sgmnt_data",138,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","jnl_state")=138
+	Set gtmtypes("sgmnt_data",139,"name")="sgmnt_data.jnl_file_len"
+	Set gtmtypes("sgmnt_data",139,"off")=916
 	Set gtmtypes("sgmnt_data",139,"len")=4
 	Set gtmtypes("sgmnt_data",139,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","autoswitchlimit")=139
-	Set gtmtypes("sgmnt_data",140,"name")="sgmnt_data.epoch_interval"
-	Set gtmtypes("sgmnt_data",140,"off")=924
+	Set gtmtypfldindx("sgmnt_data","jnl_file_len")=139
+	Set gtmtypes("sgmnt_data",140,"name")="sgmnt_data.autoswitchlimit"
+	Set gtmtypes("sgmnt_data",140,"off")=920
 	Set gtmtypes("sgmnt_data",140,"len")=4
-	Set gtmtypes("sgmnt_data",140,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","epoch_interval")=140
-	Set gtmtypes("sgmnt_data",141,"name")="sgmnt_data.alignsize"
-	Set gtmtypes("sgmnt_data",141,"off")=928
+	Set gtmtypes("sgmnt_data",140,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","autoswitchlimit")=140
+	Set gtmtypes("sgmnt_data",141,"name")="sgmnt_data.epoch_interval"
+	Set gtmtypes("sgmnt_data",141,"off")=924
 	Set gtmtypes("sgmnt_data",141,"len")=4
-	Set gtmtypes("sgmnt_data",141,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","alignsize")=141
-	Set gtmtypes("sgmnt_data",142,"name")="sgmnt_data.jnl_sync_io"
-	Set gtmtypes("sgmnt_data",142,"off")=932
+	Set gtmtypes("sgmnt_data",141,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","epoch_interval")=141
+	Set gtmtypes("sgmnt_data",142,"name")="sgmnt_data.alignsize"
+	Set gtmtypes("sgmnt_data",142,"off")=928
 	Set gtmtypes("sgmnt_data",142,"len")=4
-	Set gtmtypes("sgmnt_data",142,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","jnl_sync_io")=142
-	Set gtmtypes("sgmnt_data",143,"name")="sgmnt_data.yield_lmt"
-	Set gtmtypes("sgmnt_data",143,"off")=936
+	Set gtmtypes("sgmnt_data",142,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","alignsize")=142
+	Set gtmtypes("sgmnt_data",143,"name")="sgmnt_data.jnl_sync_io"
+	Set gtmtypes("sgmnt_data",143,"off")=932
 	Set gtmtypes("sgmnt_data",143,"len")=4
 	Set gtmtypes("sgmnt_data",143,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","yield_lmt")=143
-	Set gtmtypes("sgmnt_data",144,"name")="sgmnt_data.turn_around_point"
-	Set gtmtypes("sgmnt_data",144,"off")=940
+	Set gtmtypfldindx("sgmnt_data","jnl_sync_io")=143
+	Set gtmtypes("sgmnt_data",144,"name")="sgmnt_data.yield_lmt"
+	Set gtmtypes("sgmnt_data",144,"off")=936
 	Set gtmtypes("sgmnt_data",144,"len")=4
-	Set gtmtypes("sgmnt_data",144,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","turn_around_point")=144
-	Set gtmtypes("sgmnt_data",145,"name")="sgmnt_data.jnl_eovtn"
-	Set gtmtypes("sgmnt_data",145,"off")=944
-	Set gtmtypes("sgmnt_data",145,"len")=8
-	Set gtmtypes("sgmnt_data",145,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","jnl_eovtn")=145
-	Set gtmtypes("sgmnt_data",146,"name")="sgmnt_data.filler_jnl"
-	Set gtmtypes("sgmnt_data",146,"off")=952
+	Set gtmtypes("sgmnt_data",144,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","yield_lmt")=144
+	Set gtmtypes("sgmnt_data",145,"name")="sgmnt_data.turn_around_point"
+	Set gtmtypes("sgmnt_data",145,"off")=940
+	Set gtmtypes("sgmnt_data",145,"len")=4
+	Set gtmtypes("sgmnt_data",145,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","turn_around_point")=145
+	Set gtmtypes("sgmnt_data",146,"name")="sgmnt_data.jnl_eovtn"
+	Set gtmtypes("sgmnt_data",146,"off")=944
 	Set gtmtypes("sgmnt_data",146,"len")=8
-	Set gtmtypes("sgmnt_data",146,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","filler_jnl")=146
-	Set gtmtypes("sgmnt_data",147,"name")="sgmnt_data.intrpt_recov_resync_seqno"
-	Set gtmtypes("sgmnt_data",147,"off")=960
+	Set gtmtypes("sgmnt_data",146,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","jnl_eovtn")=146
+	Set gtmtypes("sgmnt_data",147,"name")="sgmnt_data.filler_jnl"
+	Set gtmtypes("sgmnt_data",147,"off")=952
 	Set gtmtypes("sgmnt_data",147,"len")=8
-	Set gtmtypes("sgmnt_data",147,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","intrpt_recov_resync_seqno")=147
-	Set gtmtypes("sgmnt_data",148,"name")="sgmnt_data.intrpt_recov_tp_resolve_time"
-	Set gtmtypes("sgmnt_data",148,"off")=968
-	Set gtmtypes("sgmnt_data",148,"len")=4
-	Set gtmtypes("sgmnt_data",148,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","intrpt_recov_tp_resolve_time")=148
-	Set gtmtypes("sgmnt_data",149,"name")="sgmnt_data.recov_interrupted"
-	Set gtmtypes("sgmnt_data",149,"off")=972
+	Set gtmtypes("sgmnt_data",147,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","filler_jnl")=147
+	Set gtmtypes("sgmnt_data",148,"name")="sgmnt_data.intrpt_recov_resync_seqno"
+	Set gtmtypes("sgmnt_data",148,"off")=960
+	Set gtmtypes("sgmnt_data",148,"len")=8
+	Set gtmtypes("sgmnt_data",148,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","intrpt_recov_resync_seqno")=148
+	Set gtmtypes("sgmnt_data",149,"name")="sgmnt_data.intrpt_recov_tp_resolve_time"
+	Set gtmtypes("sgmnt_data",149,"off")=968
 	Set gtmtypes("sgmnt_data",149,"len")=4
-	Set gtmtypes("sgmnt_data",149,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","recov_interrupted")=149
-	Set gtmtypes("sgmnt_data",150,"name")="sgmnt_data.intrpt_recov_jnl_state"
-	Set gtmtypes("sgmnt_data",150,"off")=976
+	Set gtmtypes("sgmnt_data",149,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","intrpt_recov_tp_resolve_time")=149
+	Set gtmtypes("sgmnt_data",150,"name")="sgmnt_data.recov_interrupted"
+	Set gtmtypes("sgmnt_data",150,"off")=972
 	Set gtmtypes("sgmnt_data",150,"len")=4
-	Set gtmtypes("sgmnt_data",150,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","intrpt_recov_jnl_state")=150
-	Set gtmtypes("sgmnt_data",151,"name")="sgmnt_data.intrpt_recov_repl_state"
-	Set gtmtypes("sgmnt_data",151,"off")=980
+	Set gtmtypes("sgmnt_data",150,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","recov_interrupted")=150
+	Set gtmtypes("sgmnt_data",151,"name")="sgmnt_data.intrpt_recov_jnl_state"
+	Set gtmtypes("sgmnt_data",151,"off")=976
 	Set gtmtypes("sgmnt_data",151,"len")=4
 	Set gtmtypes("sgmnt_data",151,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","intrpt_recov_repl_state")=151
-	Set gtmtypes("sgmnt_data",152,"name")="sgmnt_data.before_trunc_total_blks"
-	Set gtmtypes("sgmnt_data",152,"off")=984
+	Set gtmtypfldindx("sgmnt_data","intrpt_recov_jnl_state")=151
+	Set gtmtypes("sgmnt_data",152,"name")="sgmnt_data.intrpt_recov_repl_state"
+	Set gtmtypes("sgmnt_data",152,"off")=980
 	Set gtmtypes("sgmnt_data",152,"len")=4
-	Set gtmtypes("sgmnt_data",152,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","before_trunc_total_blks")=152
-	Set gtmtypes("sgmnt_data",153,"name")="sgmnt_data.after_trunc_total_blks"
-	Set gtmtypes("sgmnt_data",153,"off")=988
+	Set gtmtypes("sgmnt_data",152,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","intrpt_recov_repl_state")=152
+	Set gtmtypes("sgmnt_data",153,"name")="sgmnt_data.before_trunc_total_blks"
+	Set gtmtypes("sgmnt_data",153,"off")=984
 	Set gtmtypes("sgmnt_data",153,"len")=4
 	Set gtmtypes("sgmnt_data",153,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","after_trunc_total_blks")=153
-	Set gtmtypes("sgmnt_data",154,"name")="sgmnt_data.before_trunc_free_blocks"
-	Set gtmtypes("sgmnt_data",154,"off")=992
+	Set gtmtypfldindx("sgmnt_data","before_trunc_total_blks")=153
+	Set gtmtypes("sgmnt_data",154,"name")="sgmnt_data.after_trunc_total_blks"
+	Set gtmtypes("sgmnt_data",154,"off")=988
 	Set gtmtypes("sgmnt_data",154,"len")=4
 	Set gtmtypes("sgmnt_data",154,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","before_trunc_free_blocks")=154
-	Set gtmtypes("sgmnt_data",155,"name")="sgmnt_data.filler_trunc"
-	Set gtmtypes("sgmnt_data",155,"off")=996
+	Set gtmtypfldindx("sgmnt_data","after_trunc_total_blks")=154
+	Set gtmtypes("sgmnt_data",155,"name")="sgmnt_data.before_trunc_free_blocks"
+	Set gtmtypes("sgmnt_data",155,"off")=992
 	Set gtmtypes("sgmnt_data",155,"len")=4
 	Set gtmtypes("sgmnt_data",155,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","filler_trunc")=155
-	Set gtmtypes("sgmnt_data",156,"name")="sgmnt_data.filler_1k"
-	Set gtmtypes("sgmnt_data",156,"off")=1000
-	Set gtmtypes("sgmnt_data",156,"len")=24
-	Set gtmtypes("sgmnt_data",156,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","filler_1k")=156
-	Set gtmtypes("sgmnt_data",157,"name")="sgmnt_data.jnl_file_name"
-	Set gtmtypes("sgmnt_data",157,"off")=1024
-	Set gtmtypes("sgmnt_data",157,"len")=256
-	Set gtmtypes("sgmnt_data",157,"type")="unsigned-char"
-	Set gtmtypfldindx("sgmnt_data","jnl_file_name")=157
-	Set gtmtypes("sgmnt_data",158,"name")="sgmnt_data.reorg_restart_key"
-	Set gtmtypes("sgmnt_data",158,"off")=1280
+	Set gtmtypfldindx("sgmnt_data","before_trunc_free_blocks")=155
+	Set gtmtypes("sgmnt_data",156,"name")="sgmnt_data.filler_trunc"
+	Set gtmtypes("sgmnt_data",156,"off")=996
+	Set gtmtypes("sgmnt_data",156,"len")=4
+	Set gtmtypes("sgmnt_data",156,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","filler_trunc")=156
+	Set gtmtypes("sgmnt_data",157,"name")="sgmnt_data.filler_1k"
+	Set gtmtypes("sgmnt_data",157,"off")=1000
+	Set gtmtypes("sgmnt_data",157,"len")=24
+	Set gtmtypes("sgmnt_data",157,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","filler_1k")=157
+	Set gtmtypes("sgmnt_data",158,"name")="sgmnt_data.jnl_file_name"
+	Set gtmtypes("sgmnt_data",158,"off")=1024
 	Set gtmtypes("sgmnt_data",158,"len")=256
 	Set gtmtypes("sgmnt_data",158,"type")="unsigned-char"
-	Set gtmtypfldindx("sgmnt_data","reorg_restart_key")=158
-	Set gtmtypes("sgmnt_data",159,"name")="sgmnt_data.machine_name"
-	Set gtmtypes("sgmnt_data",159,"off")=1536
+	Set gtmtypfldindx("sgmnt_data","jnl_file_name")=158
+	Set gtmtypes("sgmnt_data",159,"name")="sgmnt_data.reorg_restart_key"
+	Set gtmtypes("sgmnt_data",159,"off")=1280
 	Set gtmtypes("sgmnt_data",159,"len")=256
-	Set gtmtypes("sgmnt_data",159,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","machine_name")=159
-	Set gtmtypes("sgmnt_data",160,"name")="sgmnt_data.encryption_hash"
-	Set gtmtypes("sgmnt_data",160,"off")=1792
-	Set gtmtypes("sgmnt_data",160,"len")=80
+	Set gtmtypes("sgmnt_data",159,"type")="unsigned-char"
+	Set gtmtypfldindx("sgmnt_data","reorg_restart_key")=159
+	Set gtmtypes("sgmnt_data",160,"name")="sgmnt_data.machine_name"
+	Set gtmtypes("sgmnt_data",160,"off")=1536
+	Set gtmtypes("sgmnt_data",160,"len")=256
 	Set gtmtypes("sgmnt_data",160,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","encryption_hash")=160
-	Set gtmtypes("sgmnt_data",161,"name")="sgmnt_data.encryption_hash2"
-	Set gtmtypes("sgmnt_data",161,"off")=1872
+	Set gtmtypfldindx("sgmnt_data","machine_name")=160
+	Set gtmtypes("sgmnt_data",161,"name")="sgmnt_data.encryption_hash"
+	Set gtmtypes("sgmnt_data",161,"off")=1792
 	Set gtmtypes("sgmnt_data",161,"len")=80
 	Set gtmtypes("sgmnt_data",161,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","encryption_hash2")=161
-	Set gtmtypes("sgmnt_data",162,"name")="sgmnt_data.non_null_iv"
-	Set gtmtypes("sgmnt_data",162,"off")=1952
-	Set gtmtypes("sgmnt_data",162,"len")=4
-	Set gtmtypes("sgmnt_data",162,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","non_null_iv")=162
-	Set gtmtypes("sgmnt_data",163,"name")="sgmnt_data.encryption_hash_cutoff"
-	Set gtmtypes("sgmnt_data",163,"off")=1956
+	Set gtmtypfldindx("sgmnt_data","encryption_hash")=161
+	Set gtmtypes("sgmnt_data",162,"name")="sgmnt_data.encryption_hash2"
+	Set gtmtypes("sgmnt_data",162,"off")=1872
+	Set gtmtypes("sgmnt_data",162,"len")=80
+	Set gtmtypes("sgmnt_data",162,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","encryption_hash2")=162
+	Set gtmtypes("sgmnt_data",163,"name")="sgmnt_data.non_null_iv"
+	Set gtmtypes("sgmnt_data",163,"off")=1952
 	Set gtmtypes("sgmnt_data",163,"len")=4
-	Set gtmtypes("sgmnt_data",163,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","encryption_hash_cutoff")=163
-	Set gtmtypes("sgmnt_data",164,"name")="sgmnt_data.encryption_hash2_start_tn"
-	Set gtmtypes("sgmnt_data",164,"off")=1960
-	Set gtmtypes("sgmnt_data",164,"len")=8
-	Set gtmtypes("sgmnt_data",164,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","encryption_hash2_start_tn")=164
-	Set gtmtypes("sgmnt_data",165,"name")="sgmnt_data.filler_encrypt"
-	Set gtmtypes("sgmnt_data",165,"off")=1968
-	Set gtmtypes("sgmnt_data",165,"len")=80
-	Set gtmtypes("sgmnt_data",165,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","filler_encrypt")=165
-	Set gtmtypes("sgmnt_data",166,"name")="sgmnt_data.total_buffer_flush_tn"
-	Set gtmtypes("sgmnt_data",166,"off")=2048
-	Set gtmtypes("sgmnt_data",166,"len")=8
-	Set gtmtypes("sgmnt_data",166,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","total_buffer_flush_tn")=166
-	Set gtmtypes("sgmnt_data",167,"name")="sgmnt_data.bufct_buffer_flush_tn"
-	Set gtmtypes("sgmnt_data",167,"off")=2056
+	Set gtmtypes("sgmnt_data",163,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","non_null_iv")=163
+	Set gtmtypes("sgmnt_data",164,"name")="sgmnt_data.encryption_hash_cutoff"
+	Set gtmtypes("sgmnt_data",164,"off")=1956
+	Set gtmtypes("sgmnt_data",164,"len")=4
+	Set gtmtypes("sgmnt_data",164,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","encryption_hash_cutoff")=164
+	Set gtmtypes("sgmnt_data",165,"name")="sgmnt_data.encryption_hash2_start_tn"
+	Set gtmtypes("sgmnt_data",165,"off")=1960
+	Set gtmtypes("sgmnt_data",165,"len")=8
+	Set gtmtypes("sgmnt_data",165,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","encryption_hash2_start_tn")=165
+	Set gtmtypes("sgmnt_data",166,"name")="sgmnt_data.filler_encrypt"
+	Set gtmtypes("sgmnt_data",166,"off")=1968
+	Set gtmtypes("sgmnt_data",166,"len")=80
+	Set gtmtypes("sgmnt_data",166,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","filler_encrypt")=166
+	Set gtmtypes("sgmnt_data",167,"name")="sgmnt_data.total_buffer_flush_tn"
+	Set gtmtypes("sgmnt_data",167,"off")=2048
 	Set gtmtypes("sgmnt_data",167,"len")=8
 	Set gtmtypes("sgmnt_data",167,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","bufct_buffer_flush_tn")=167
-	Set gtmtypes("sgmnt_data",168,"name")="sgmnt_data.bufct_buffer_flush_loop_tn"
-	Set gtmtypes("sgmnt_data",168,"off")=2064
+	Set gtmtypfldindx("sgmnt_data","total_buffer_flush_tn")=167
+	Set gtmtypes("sgmnt_data",168,"name")="sgmnt_data.bufct_buffer_flush_tn"
+	Set gtmtypes("sgmnt_data",168,"off")=2056
 	Set gtmtypes("sgmnt_data",168,"len")=8
 	Set gtmtypes("sgmnt_data",168,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","bufct_buffer_flush_loop_tn")=168
-	Set gtmtypes("sgmnt_data",169,"name")="sgmnt_data.wrt_calls_tn"
-	Set gtmtypes("sgmnt_data",169,"off")=2072
+	Set gtmtypfldindx("sgmnt_data","bufct_buffer_flush_tn")=168
+	Set gtmtypes("sgmnt_data",169,"name")="sgmnt_data.bufct_buffer_flush_loop_tn"
+	Set gtmtypes("sgmnt_data",169,"off")=2064
 	Set gtmtypes("sgmnt_data",169,"len")=8
 	Set gtmtypes("sgmnt_data",169,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wrt_calls_tn")=169
-	Set gtmtypes("sgmnt_data",170,"name")="sgmnt_data.wrt_count_tn"
-	Set gtmtypes("sgmnt_data",170,"off")=2080
+	Set gtmtypfldindx("sgmnt_data","bufct_buffer_flush_loop_tn")=169
+	Set gtmtypes("sgmnt_data",170,"name")="sgmnt_data.wrt_calls_tn"
+	Set gtmtypes("sgmnt_data",170,"off")=2072
 	Set gtmtypes("sgmnt_data",170,"len")=8
 	Set gtmtypes("sgmnt_data",170,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wrt_count_tn")=170
-	Set gtmtypes("sgmnt_data",171,"name")="sgmnt_data.wrt_blocked_tn"
-	Set gtmtypes("sgmnt_data",171,"off")=2088
+	Set gtmtypfldindx("sgmnt_data","wrt_calls_tn")=170
+	Set gtmtypes("sgmnt_data",171,"name")="sgmnt_data.wrt_count_tn"
+	Set gtmtypes("sgmnt_data",171,"off")=2080
 	Set gtmtypes("sgmnt_data",171,"len")=8
 	Set gtmtypes("sgmnt_data",171,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wrt_blocked_tn")=171
-	Set gtmtypes("sgmnt_data",172,"name")="sgmnt_data.wrt_busy_tn"
-	Set gtmtypes("sgmnt_data",172,"off")=2096
+	Set gtmtypfldindx("sgmnt_data","wrt_count_tn")=171
+	Set gtmtypes("sgmnt_data",172,"name")="sgmnt_data.wrt_blocked_tn"
+	Set gtmtypes("sgmnt_data",172,"off")=2088
 	Set gtmtypes("sgmnt_data",172,"len")=8
 	Set gtmtypes("sgmnt_data",172,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wrt_busy_tn")=172
-	Set gtmtypes("sgmnt_data",173,"name")="sgmnt_data.wrt_noblks_wrtn_tn"
-	Set gtmtypes("sgmnt_data",173,"off")=2104
+	Set gtmtypfldindx("sgmnt_data","wrt_blocked_tn")=172
+	Set gtmtypes("sgmnt_data",173,"name")="sgmnt_data.wrt_busy_tn"
+	Set gtmtypes("sgmnt_data",173,"off")=2096
 	Set gtmtypes("sgmnt_data",173,"len")=8
 	Set gtmtypes("sgmnt_data",173,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wrt_noblks_wrtn_tn")=173
-	Set gtmtypes("sgmnt_data",174,"name")="sgmnt_data.reserved_bgtrcrec1_tn"
-	Set gtmtypes("sgmnt_data",174,"off")=2112
+	Set gtmtypfldindx("sgmnt_data","wrt_busy_tn")=173
+	Set gtmtypes("sgmnt_data",174,"name")="sgmnt_data.wrt_noblks_wrtn_tn"
+	Set gtmtypes("sgmnt_data",174,"off")=2104
 	Set gtmtypes("sgmnt_data",174,"len")=8
 	Set gtmtypes("sgmnt_data",174,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","reserved_bgtrcrec1_tn")=174
-	Set gtmtypes("sgmnt_data",175,"name")="sgmnt_data.reserved_bgtrcrec2_tn"
-	Set gtmtypes("sgmnt_data",175,"off")=2120
+	Set gtmtypfldindx("sgmnt_data","wrt_noblks_wrtn_tn")=174
+	Set gtmtypes("sgmnt_data",175,"name")="sgmnt_data.reserved_bgtrcrec1_tn"
+	Set gtmtypes("sgmnt_data",175,"off")=2112
 	Set gtmtypes("sgmnt_data",175,"len")=8
 	Set gtmtypes("sgmnt_data",175,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","reserved_bgtrcrec2_tn")=175
-	Set gtmtypes("sgmnt_data",176,"name")="sgmnt_data.reserved_bgtrcrec3_tn"
-	Set gtmtypes("sgmnt_data",176,"off")=2128
+	Set gtmtypfldindx("sgmnt_data","reserved_bgtrcrec1_tn")=175
+	Set gtmtypes("sgmnt_data",176,"name")="sgmnt_data.reserved_bgtrcrec2_tn"
+	Set gtmtypes("sgmnt_data",176,"off")=2120
 	Set gtmtypes("sgmnt_data",176,"len")=8
 	Set gtmtypes("sgmnt_data",176,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","reserved_bgtrcrec3_tn")=176
-	Set gtmtypes("sgmnt_data",177,"name")="sgmnt_data.lost_block_recovery_tn"
-	Set gtmtypes("sgmnt_data",177,"off")=2136
+	Set gtmtypfldindx("sgmnt_data","reserved_bgtrcrec2_tn")=176
+	Set gtmtypes("sgmnt_data",177,"name")="sgmnt_data.reserved_bgtrcrec3_tn"
+	Set gtmtypes("sgmnt_data",177,"off")=2128
 	Set gtmtypes("sgmnt_data",177,"len")=8
 	Set gtmtypes("sgmnt_data",177,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","lost_block_recovery_tn")=177
-	Set gtmtypes("sgmnt_data",178,"name")="sgmnt_data.wc_blocked_onln_rlbk_tn"
-	Set gtmtypes("sgmnt_data",178,"off")=2144
+	Set gtmtypfldindx("sgmnt_data","reserved_bgtrcrec3_tn")=177
+	Set gtmtypes("sgmnt_data",178,"name")="sgmnt_data.lost_block_recovery_tn"
+	Set gtmtypes("sgmnt_data",178,"off")=2136
 	Set gtmtypes("sgmnt_data",178,"len")=8
 	Set gtmtypes("sgmnt_data",178,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_onln_rlbk_tn")=178
-	Set gtmtypes("sgmnt_data",179,"name")="sgmnt_data.stale_tn"
-	Set gtmtypes("sgmnt_data",179,"off")=2152
+	Set gtmtypfldindx("sgmnt_data","lost_block_recovery_tn")=178
+	Set gtmtypes("sgmnt_data",179,"name")="sgmnt_data.wc_blocked_onln_rlbk_tn"
+	Set gtmtypes("sgmnt_data",179,"off")=2144
 	Set gtmtypes("sgmnt_data",179,"len")=8
 	Set gtmtypes("sgmnt_data",179,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","stale_tn")=179
-	Set gtmtypes("sgmnt_data",180,"name")="sgmnt_data.starved_tn"
-	Set gtmtypes("sgmnt_data",180,"off")=2160
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_onln_rlbk_tn")=179
+	Set gtmtypes("sgmnt_data",180,"name")="sgmnt_data.stale_tn"
+	Set gtmtypes("sgmnt_data",180,"off")=2152
 	Set gtmtypes("sgmnt_data",180,"len")=8
 	Set gtmtypes("sgmnt_data",180,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","starved_tn")=180
-	Set gtmtypes("sgmnt_data",181,"name")="sgmnt_data.stale_timer_started_tn"
-	Set gtmtypes("sgmnt_data",181,"off")=2168
+	Set gtmtypfldindx("sgmnt_data","stale_tn")=180
+	Set gtmtypes("sgmnt_data",181,"name")="sgmnt_data.starved_tn"
+	Set gtmtypes("sgmnt_data",181,"off")=2160
 	Set gtmtypes("sgmnt_data",181,"len")=8
 	Set gtmtypes("sgmnt_data",181,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","stale_timer_started_tn")=181
-	Set gtmtypes("sgmnt_data",182,"name")="sgmnt_data.stale_timer_pop_tn"
-	Set gtmtypes("sgmnt_data",182,"off")=2176
+	Set gtmtypfldindx("sgmnt_data","starved_tn")=181
+	Set gtmtypes("sgmnt_data",182,"name")="sgmnt_data.stale_timer_started_tn"
+	Set gtmtypes("sgmnt_data",182,"off")=2168
 	Set gtmtypes("sgmnt_data",182,"len")=8
 	Set gtmtypes("sgmnt_data",182,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","stale_timer_pop_tn")=182
-	Set gtmtypes("sgmnt_data",183,"name")="sgmnt_data.stale_process_defer_tn"
-	Set gtmtypes("sgmnt_data",183,"off")=2184
+	Set gtmtypfldindx("sgmnt_data","stale_timer_started_tn")=182
+	Set gtmtypes("sgmnt_data",183,"name")="sgmnt_data.stale_timer_pop_tn"
+	Set gtmtypes("sgmnt_data",183,"off")=2176
 	Set gtmtypes("sgmnt_data",183,"len")=8
 	Set gtmtypes("sgmnt_data",183,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","stale_process_defer_tn")=183
-	Set gtmtypes("sgmnt_data",184,"name")="sgmnt_data.stale_defer_processed_tn"
-	Set gtmtypes("sgmnt_data",184,"off")=2192
+	Set gtmtypfldindx("sgmnt_data","stale_timer_pop_tn")=183
+	Set gtmtypes("sgmnt_data",184,"name")="sgmnt_data.stale_process_defer_tn"
+	Set gtmtypes("sgmnt_data",184,"off")=2184
 	Set gtmtypes("sgmnt_data",184,"len")=8
 	Set gtmtypes("sgmnt_data",184,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","stale_defer_processed_tn")=184
-	Set gtmtypes("sgmnt_data",185,"name")="sgmnt_data.spcfc_buffer_flush_tn"
-	Set gtmtypes("sgmnt_data",185,"off")=2200
+	Set gtmtypfldindx("sgmnt_data","stale_process_defer_tn")=184
+	Set gtmtypes("sgmnt_data",185,"name")="sgmnt_data.stale_defer_processed_tn"
+	Set gtmtypes("sgmnt_data",185,"off")=2192
 	Set gtmtypes("sgmnt_data",185,"len")=8
 	Set gtmtypes("sgmnt_data",185,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","spcfc_buffer_flush_tn")=185
-	Set gtmtypes("sgmnt_data",186,"name")="sgmnt_data.spcfc_buffer_flush_loop_tn"
-	Set gtmtypes("sgmnt_data",186,"off")=2208
+	Set gtmtypfldindx("sgmnt_data","stale_defer_processed_tn")=185
+	Set gtmtypes("sgmnt_data",186,"name")="sgmnt_data.spcfc_buffer_flush_tn"
+	Set gtmtypes("sgmnt_data",186,"off")=2200
 	Set gtmtypes("sgmnt_data",186,"len")=8
 	Set gtmtypes("sgmnt_data",186,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","spcfc_buffer_flush_loop_tn")=186
-	Set gtmtypes("sgmnt_data",187,"name")="sgmnt_data.spcfc_buffer_flush_retries_tn"
-	Set gtmtypes("sgmnt_data",187,"off")=2216
+	Set gtmtypfldindx("sgmnt_data","spcfc_buffer_flush_tn")=186
+	Set gtmtypes("sgmnt_data",187,"name")="sgmnt_data.spcfc_buffer_flush_loop_tn"
+	Set gtmtypes("sgmnt_data",187,"off")=2208
 	Set gtmtypes("sgmnt_data",187,"len")=8
 	Set gtmtypes("sgmnt_data",187,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","spcfc_buffer_flush_retries_tn")=187
-	Set gtmtypes("sgmnt_data",188,"name")="sgmnt_data.spcfc_buffer_flushed_during_lockwait_tn"
-	Set gtmtypes("sgmnt_data",188,"off")=2224
+	Set gtmtypfldindx("sgmnt_data","spcfc_buffer_flush_loop_tn")=187
+	Set gtmtypes("sgmnt_data",188,"name")="sgmnt_data.spcfc_buffer_flush_retries_tn"
+	Set gtmtypes("sgmnt_data",188,"off")=2216
 	Set gtmtypes("sgmnt_data",188,"len")=8
 	Set gtmtypes("sgmnt_data",188,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","spcfc_buffer_flushed_during_lockwait_tn")=188
-	Set gtmtypes("sgmnt_data",189,"name")="sgmnt_data.tp_crit_retries_tn"
-	Set gtmtypes("sgmnt_data",189,"off")=2232
+	Set gtmtypfldindx("sgmnt_data","spcfc_buffer_flush_retries_tn")=188
+	Set gtmtypes("sgmnt_data",189,"name")="sgmnt_data.spcfc_buffer_flushed_during_lockwait_tn"
+	Set gtmtypes("sgmnt_data",189,"off")=2224
 	Set gtmtypes("sgmnt_data",189,"len")=8
 	Set gtmtypes("sgmnt_data",189,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","tp_crit_retries_tn")=189
-	Set gtmtypes("sgmnt_data",190,"name")="sgmnt_data.db_csh_getn_flush_dirty_tn"
-	Set gtmtypes("sgmnt_data",190,"off")=2240
+	Set gtmtypfldindx("sgmnt_data","spcfc_buffer_flushed_during_lockwait_tn")=189
+	Set gtmtypes("sgmnt_data",190,"name")="sgmnt_data.tp_crit_retries_tn"
+	Set gtmtypes("sgmnt_data",190,"off")=2232
 	Set gtmtypes("sgmnt_data",190,"len")=8
 	Set gtmtypes("sgmnt_data",190,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","db_csh_getn_flush_dirty_tn")=190
-	Set gtmtypes("sgmnt_data",191,"name")="sgmnt_data.db_csh_getn_rip_wait_tn"
-	Set gtmtypes("sgmnt_data",191,"off")=2248
+	Set gtmtypfldindx("sgmnt_data","tp_crit_retries_tn")=190
+	Set gtmtypes("sgmnt_data",191,"name")="sgmnt_data.db_csh_getn_flush_dirty_tn"
+	Set gtmtypes("sgmnt_data",191,"off")=2240
 	Set gtmtypes("sgmnt_data",191,"len")=8
 	Set gtmtypes("sgmnt_data",191,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","db_csh_getn_rip_wait_tn")=191
-	Set gtmtypes("sgmnt_data",192,"name")="sgmnt_data.db_csh_getn_buf_owner_stuck_tn"
-	Set gtmtypes("sgmnt_data",192,"off")=2256
+	Set gtmtypfldindx("sgmnt_data","db_csh_getn_flush_dirty_tn")=191
+	Set gtmtypes("sgmnt_data",192,"name")="sgmnt_data.db_csh_getn_rip_wait_tn"
+	Set gtmtypes("sgmnt_data",192,"off")=2248
 	Set gtmtypes("sgmnt_data",192,"len")=8
 	Set gtmtypes("sgmnt_data",192,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","db_csh_getn_buf_owner_stuck_tn")=192
-	Set gtmtypes("sgmnt_data",193,"name")="sgmnt_data.db_csh_getn_out_of_design_tn"
-	Set gtmtypes("sgmnt_data",193,"off")=2264
+	Set gtmtypfldindx("sgmnt_data","db_csh_getn_rip_wait_tn")=192
+	Set gtmtypes("sgmnt_data",193,"name")="sgmnt_data.db_csh_getn_buf_owner_stuck_tn"
+	Set gtmtypes("sgmnt_data",193,"off")=2256
 	Set gtmtypes("sgmnt_data",193,"len")=8
 	Set gtmtypes("sgmnt_data",193,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","db_csh_getn_out_of_design_tn")=193
-	Set gtmtypes("sgmnt_data",194,"name")="sgmnt_data.t_qread_buf_owner_stuck_tn"
-	Set gtmtypes("sgmnt_data",194,"off")=2272
+	Set gtmtypfldindx("sgmnt_data","db_csh_getn_buf_owner_stuck_tn")=193
+	Set gtmtypes("sgmnt_data",194,"name")="sgmnt_data.db_csh_getn_out_of_design_tn"
+	Set gtmtypes("sgmnt_data",194,"off")=2264
 	Set gtmtypes("sgmnt_data",194,"len")=8
 	Set gtmtypes("sgmnt_data",194,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","t_qread_buf_owner_stuck_tn")=194
-	Set gtmtypes("sgmnt_data",195,"name")="sgmnt_data.t_qread_out_of_design_tn"
-	Set gtmtypes("sgmnt_data",195,"off")=2280
+	Set gtmtypfldindx("sgmnt_data","db_csh_getn_out_of_design_tn")=194
+	Set gtmtypes("sgmnt_data",195,"name")="sgmnt_data.t_qread_buf_owner_stuck_tn"
+	Set gtmtypes("sgmnt_data",195,"off")=2272
 	Set gtmtypes("sgmnt_data",195,"len")=8
 	Set gtmtypes("sgmnt_data",195,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","t_qread_out_of_design_tn")=195
-	Set gtmtypes("sgmnt_data",196,"name")="sgmnt_data.bt_put_flush_dirty_tn"
-	Set gtmtypes("sgmnt_data",196,"off")=2288
+	Set gtmtypfldindx("sgmnt_data","t_qread_buf_owner_stuck_tn")=195
+	Set gtmtypes("sgmnt_data",196,"name")="sgmnt_data.t_qread_out_of_design_tn"
+	Set gtmtypes("sgmnt_data",196,"off")=2280
 	Set gtmtypes("sgmnt_data",196,"len")=8
 	Set gtmtypes("sgmnt_data",196,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","bt_put_flush_dirty_tn")=196
-	Set gtmtypes("sgmnt_data",197,"name")="sgmnt_data.mlock_wakeups_tn"
-	Set gtmtypes("sgmnt_data",197,"off")=2296
+	Set gtmtypfldindx("sgmnt_data","t_qread_out_of_design_tn")=196
+	Set gtmtypes("sgmnt_data",197,"name")="sgmnt_data.bt_put_flush_dirty_tn"
+	Set gtmtypes("sgmnt_data",197,"off")=2288
 	Set gtmtypes("sgmnt_data",197,"len")=8
 	Set gtmtypes("sgmnt_data",197,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","mlock_wakeups_tn")=197
-	Set gtmtypes("sgmnt_data",198,"name")="sgmnt_data.wc_blocked_wcs_recover_invoked_tn"
-	Set gtmtypes("sgmnt_data",198,"off")=2304
+	Set gtmtypfldindx("sgmnt_data","bt_put_flush_dirty_tn")=197
+	Set gtmtypes("sgmnt_data",198,"name")="sgmnt_data.mlock_wakeups_tn"
+	Set gtmtypes("sgmnt_data",198,"off")=2296
 	Set gtmtypes("sgmnt_data",198,"len")=8
 	Set gtmtypes("sgmnt_data",198,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_recover_invoked_tn")=198
-	Set gtmtypes("sgmnt_data",199,"name")="sgmnt_data.wc_blocked_wcs_verify_passed_tn"
-	Set gtmtypes("sgmnt_data",199,"off")=2312
+	Set gtmtypfldindx("sgmnt_data","mlock_wakeups_tn")=198
+	Set gtmtypes("sgmnt_data",199,"name")="sgmnt_data.wc_blocked_wcs_recover_invoked_tn"
+	Set gtmtypes("sgmnt_data",199,"off")=2304
 	Set gtmtypes("sgmnt_data",199,"len")=8
 	Set gtmtypes("sgmnt_data",199,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_verify_passed_tn")=199
-	Set gtmtypes("sgmnt_data",200,"name")="sgmnt_data.wc_blocked_t_qread_db_csh_getn_invalid_blk_tn"
-	Set gtmtypes("sgmnt_data",200,"off")=2320
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_recover_invoked_tn")=199
+	Set gtmtypes("sgmnt_data",200,"name")="sgmnt_data.wc_blocked_wcs_verify_passed_tn"
+	Set gtmtypes("sgmnt_data",200,"off")=2312
 	Set gtmtypes("sgmnt_data",200,"len")=8
 	Set gtmtypes("sgmnt_data",200,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_db_csh_getn_invalid_blk_tn")=200
-	Set gtmtypes("sgmnt_data",201,"name")="sgmnt_data.wc_blocked_t_qread_db_csh_get_invalid_blk_tn"
-	Set gtmtypes("sgmnt_data",201,"off")=2328
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_verify_passed_tn")=200
+	Set gtmtypes("sgmnt_data",201,"name")="sgmnt_data.wc_blocked_t_qread_db_csh_getn_invalid_blk_tn"
+	Set gtmtypes("sgmnt_data",201,"off")=2320
 	Set gtmtypes("sgmnt_data",201,"len")=8
 	Set gtmtypes("sgmnt_data",201,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_db_csh_get_invalid_blk_tn")=201
-	Set gtmtypes("sgmnt_data",202,"name")="sgmnt_data.wc_blocked_db_csh_getn_loopexceed_tn"
-	Set gtmtypes("sgmnt_data",202,"off")=2336
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_db_csh_getn_invalid_blk_tn")=201
+	Set gtmtypes("sgmnt_data",202,"name")="sgmnt_data.wc_blocked_t_qread_db_csh_get_invalid_blk_tn"
+	Set gtmtypes("sgmnt_data",202,"off")=2328
 	Set gtmtypes("sgmnt_data",202,"len")=8
 	Set gtmtypes("sgmnt_data",202,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_db_csh_getn_loopexceed_tn")=202
-	Set gtmtypes("sgmnt_data",203,"name")="sgmnt_data.wc_blocked_db_csh_getn_wcsstarvewrt_tn"
-	Set gtmtypes("sgmnt_data",203,"off")=2344
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_db_csh_get_invalid_blk_tn")=202
+	Set gtmtypes("sgmnt_data",203,"name")="sgmnt_data.wc_blocked_db_csh_getn_loopexceed_tn"
+	Set gtmtypes("sgmnt_data",203,"off")=2336
 	Set gtmtypes("sgmnt_data",203,"len")=8
 	Set gtmtypes("sgmnt_data",203,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_db_csh_getn_wcsstarvewrt_tn")=203
-	Set gtmtypes("sgmnt_data",204,"name")="sgmnt_data.wc_blocked_db_csh_get_tn"
-	Set gtmtypes("sgmnt_data",204,"off")=2352
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_db_csh_getn_loopexceed_tn")=203
+	Set gtmtypes("sgmnt_data",204,"name")="sgmnt_data.wc_blocked_db_csh_getn_wcsstarvewrt_tn"
+	Set gtmtypes("sgmnt_data",204,"off")=2344
 	Set gtmtypes("sgmnt_data",204,"len")=8
 	Set gtmtypes("sgmnt_data",204,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_db_csh_get_tn")=204
-	Set gtmtypes("sgmnt_data",205,"name")="sgmnt_data.wc_blocked_tp_tend_wcsgetspace_tn"
-	Set gtmtypes("sgmnt_data",205,"off")=2360
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_db_csh_getn_wcsstarvewrt_tn")=204
+	Set gtmtypes("sgmnt_data",205,"name")="sgmnt_data.wc_blocked_db_csh_get_tn"
+	Set gtmtypes("sgmnt_data",205,"off")=2352
 	Set gtmtypes("sgmnt_data",205,"len")=8
 	Set gtmtypes("sgmnt_data",205,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_wcsgetspace_tn")=205
-	Set gtmtypes("sgmnt_data",206,"name")="sgmnt_data.wc_blocked_tp_tend_t1_tn"
-	Set gtmtypes("sgmnt_data",206,"off")=2368
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_db_csh_get_tn")=205
+	Set gtmtypes("sgmnt_data",206,"name")="sgmnt_data.wc_blocked_tp_tend_wcsgetspace_tn"
+	Set gtmtypes("sgmnt_data",206,"off")=2360
 	Set gtmtypes("sgmnt_data",206,"len")=8
 	Set gtmtypes("sgmnt_data",206,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_t1_tn")=206
-	Set gtmtypes("sgmnt_data",207,"name")="sgmnt_data.wc_blocked_tp_tend_bitmap_tn"
-	Set gtmtypes("sgmnt_data",207,"off")=2376
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_wcsgetspace_tn")=206
+	Set gtmtypes("sgmnt_data",207,"name")="sgmnt_data.wc_blocked_tp_tend_t1_tn"
+	Set gtmtypes("sgmnt_data",207,"off")=2368
 	Set gtmtypes("sgmnt_data",207,"len")=8
 	Set gtmtypes("sgmnt_data",207,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_bitmap_tn")=207
-	Set gtmtypes("sgmnt_data",208,"name")="sgmnt_data.wc_blocked_tp_tend_jnl_cwset_tn"
-	Set gtmtypes("sgmnt_data",208,"off")=2384
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_t1_tn")=207
+	Set gtmtypes("sgmnt_data",208,"name")="sgmnt_data.wc_blocked_tp_tend_bitmap_tn"
+	Set gtmtypes("sgmnt_data",208,"off")=2376
 	Set gtmtypes("sgmnt_data",208,"len")=8
 	Set gtmtypes("sgmnt_data",208,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_jnl_cwset_tn")=208
-	Set gtmtypes("sgmnt_data",209,"name")="sgmnt_data.wc_blocked_tp_tend_jnl_wcsflu_tn"
-	Set gtmtypes("sgmnt_data",209,"off")=2392
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_bitmap_tn")=208
+	Set gtmtypes("sgmnt_data",209,"name")="sgmnt_data.wc_blocked_tp_tend_jnl_cwset_tn"
+	Set gtmtypes("sgmnt_data",209,"off")=2384
 	Set gtmtypes("sgmnt_data",209,"len")=8
 	Set gtmtypes("sgmnt_data",209,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_jnl_wcsflu_tn")=209
-	Set gtmtypes("sgmnt_data",210,"name")="sgmnt_data.wc_blocked_t_end_hist_tn"
-	Set gtmtypes("sgmnt_data",210,"off")=2400
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_jnl_cwset_tn")=209
+	Set gtmtypes("sgmnt_data",210,"name")="sgmnt_data.wc_blocked_tp_tend_jnl_wcsflu_tn"
+	Set gtmtypes("sgmnt_data",210,"off")=2392
 	Set gtmtypes("sgmnt_data",210,"len")=8
 	Set gtmtypes("sgmnt_data",210,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_hist_tn")=210
-	Set gtmtypes("sgmnt_data",211,"name")="sgmnt_data.wc_blocked_t_end_hist1_nullbt_tn"
-	Set gtmtypes("sgmnt_data",211,"off")=2408
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_jnl_wcsflu_tn")=210
+	Set gtmtypes("sgmnt_data",211,"name")="sgmnt_data.wc_blocked_t_end_hist_tn"
+	Set gtmtypes("sgmnt_data",211,"off")=2400
 	Set gtmtypes("sgmnt_data",211,"len")=8
 	Set gtmtypes("sgmnt_data",211,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_hist1_nullbt_tn")=211
-	Set gtmtypes("sgmnt_data",212,"name")="sgmnt_data.wc_blocked_t_end_hist1_nonnullbt_tn"
-	Set gtmtypes("sgmnt_data",212,"off")=2416
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_hist_tn")=211
+	Set gtmtypes("sgmnt_data",212,"name")="sgmnt_data.wc_blocked_t_end_hist1_nullbt_tn"
+	Set gtmtypes("sgmnt_data",212,"off")=2408
 	Set gtmtypes("sgmnt_data",212,"len")=8
 	Set gtmtypes("sgmnt_data",212,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_hist1_nonnullbt_tn")=212
-	Set gtmtypes("sgmnt_data",213,"name")="sgmnt_data.wc_blocked_t_end_bitmap_nullbt_tn"
-	Set gtmtypes("sgmnt_data",213,"off")=2424
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_hist1_nullbt_tn")=212
+	Set gtmtypes("sgmnt_data",213,"name")="sgmnt_data.wc_blocked_t_end_hist1_nonnullbt_tn"
+	Set gtmtypes("sgmnt_data",213,"off")=2416
 	Set gtmtypes("sgmnt_data",213,"len")=8
 	Set gtmtypes("sgmnt_data",213,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_bitmap_nullbt_tn")=213
-	Set gtmtypes("sgmnt_data",214,"name")="sgmnt_data.wc_blocked_t_end_bitmap_nonnullbt_tn"
-	Set gtmtypes("sgmnt_data",214,"off")=2432
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_hist1_nonnullbt_tn")=213
+	Set gtmtypes("sgmnt_data",214,"name")="sgmnt_data.wc_blocked_t_end_bitmap_nullbt_tn"
+	Set gtmtypes("sgmnt_data",214,"off")=2424
 	Set gtmtypes("sgmnt_data",214,"len")=8
 	Set gtmtypes("sgmnt_data",214,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_bitmap_nonnullbt_tn")=214
-	Set gtmtypes("sgmnt_data",215,"name")="sgmnt_data.wc_blocked_t_end_jnl_cwset_tn"
-	Set gtmtypes("sgmnt_data",215,"off")=2440
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_bitmap_nullbt_tn")=214
+	Set gtmtypes("sgmnt_data",215,"name")="sgmnt_data.wc_blocked_t_end_bitmap_nonnullbt_tn"
+	Set gtmtypes("sgmnt_data",215,"off")=2432
 	Set gtmtypes("sgmnt_data",215,"len")=8
 	Set gtmtypes("sgmnt_data",215,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_jnl_cwset_tn")=215
-	Set gtmtypes("sgmnt_data",216,"name")="sgmnt_data.wc_blocked_t_end_jnl_wcsflu_tn"
-	Set gtmtypes("sgmnt_data",216,"off")=2448
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_bitmap_nonnullbt_tn")=215
+	Set gtmtypes("sgmnt_data",216,"name")="sgmnt_data.wc_blocked_t_end_jnl_cwset_tn"
+	Set gtmtypes("sgmnt_data",216,"off")=2440
 	Set gtmtypes("sgmnt_data",216,"len")=8
 	Set gtmtypes("sgmnt_data",216,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_jnl_wcsflu_tn")=216
-	Set gtmtypes("sgmnt_data",217,"name")="sgmnt_data.db_csh_get_too_many_loops_tn"
-	Set gtmtypes("sgmnt_data",217,"off")=2456
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_jnl_cwset_tn")=216
+	Set gtmtypes("sgmnt_data",217,"name")="sgmnt_data.wc_blocked_t_end_jnl_wcsflu_tn"
+	Set gtmtypes("sgmnt_data",217,"off")=2448
 	Set gtmtypes("sgmnt_data",217,"len")=8
 	Set gtmtypes("sgmnt_data",217,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","db_csh_get_too_many_loops_tn")=217
-	Set gtmtypes("sgmnt_data",218,"name")="sgmnt_data.wc_blocked_tpckh_hist1_nullbt_tn"
-	Set gtmtypes("sgmnt_data",218,"off")=2464
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_jnl_wcsflu_tn")=217
+	Set gtmtypes("sgmnt_data",218,"name")="sgmnt_data.db_csh_get_too_many_loops_tn"
+	Set gtmtypes("sgmnt_data",218,"off")=2456
 	Set gtmtypes("sgmnt_data",218,"len")=8
 	Set gtmtypes("sgmnt_data",218,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tpckh_hist1_nullbt_tn")=218
-	Set gtmtypes("sgmnt_data",219,"name")="sgmnt_data.wc_blocked_tpckh_hist1_nonnullbt_tn"
-	Set gtmtypes("sgmnt_data",219,"off")=2472
+	Set gtmtypfldindx("sgmnt_data","db_csh_get_too_many_loops_tn")=218
+	Set gtmtypes("sgmnt_data",219,"name")="sgmnt_data.wc_blocked_tpckh_hist1_nullbt_tn"
+	Set gtmtypes("sgmnt_data",219,"off")=2464
 	Set gtmtypes("sgmnt_data",219,"len")=8
 	Set gtmtypes("sgmnt_data",219,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tpckh_hist1_nonnullbt_tn")=219
-	Set gtmtypes("sgmnt_data",220,"name")="sgmnt_data.jnl_blocked_writer_lost_tn"
-	Set gtmtypes("sgmnt_data",220,"off")=2480
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tpckh_hist1_nullbt_tn")=219
+	Set gtmtypes("sgmnt_data",220,"name")="sgmnt_data.wc_blocked_tpckh_hist1_nonnullbt_tn"
+	Set gtmtypes("sgmnt_data",220,"off")=2472
 	Set gtmtypes("sgmnt_data",220,"len")=8
 	Set gtmtypes("sgmnt_data",220,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","jnl_blocked_writer_lost_tn")=220
-	Set gtmtypes("sgmnt_data",221,"name")="sgmnt_data.jnl_blocked_writer_stuck_tn"
-	Set gtmtypes("sgmnt_data",221,"off")=2488
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tpckh_hist1_nonnullbt_tn")=220
+	Set gtmtypes("sgmnt_data",221,"name")="sgmnt_data.jnl_blocked_writer_lost_tn"
+	Set gtmtypes("sgmnt_data",221,"off")=2480
 	Set gtmtypes("sgmnt_data",221,"len")=8
 	Set gtmtypes("sgmnt_data",221,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","jnl_blocked_writer_stuck_tn")=221
-	Set gtmtypes("sgmnt_data",222,"name")="sgmnt_data.jnl_blocked_writer_blocked_tn"
-	Set gtmtypes("sgmnt_data",222,"off")=2496
+	Set gtmtypfldindx("sgmnt_data","jnl_blocked_writer_lost_tn")=221
+	Set gtmtypes("sgmnt_data",222,"name")="sgmnt_data.jnl_blocked_writer_stuck_tn"
+	Set gtmtypes("sgmnt_data",222,"off")=2488
 	Set gtmtypes("sgmnt_data",222,"len")=8
 	Set gtmtypes("sgmnt_data",222,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","jnl_blocked_writer_blocked_tn")=222
-	Set gtmtypes("sgmnt_data",223,"name")="sgmnt_data.n_jnl_fsyncs_tn"
-	Set gtmtypes("sgmnt_data",223,"off")=2504
+	Set gtmtypfldindx("sgmnt_data","jnl_blocked_writer_stuck_tn")=222
+	Set gtmtypes("sgmnt_data",223,"name")="sgmnt_data.jnl_blocked_writer_blocked_tn"
+	Set gtmtypes("sgmnt_data",223,"off")=2496
 	Set gtmtypes("sgmnt_data",223,"len")=8
 	Set gtmtypes("sgmnt_data",223,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","n_jnl_fsyncs_tn")=223
-	Set gtmtypes("sgmnt_data",224,"name")="sgmnt_data.n_jnl_fsync_tries_tn"
-	Set gtmtypes("sgmnt_data",224,"off")=2512
+	Set gtmtypfldindx("sgmnt_data","jnl_blocked_writer_blocked_tn")=223
+	Set gtmtypes("sgmnt_data",224,"name")="sgmnt_data.n_jnl_fsyncs_tn"
+	Set gtmtypes("sgmnt_data",224,"off")=2504
 	Set gtmtypes("sgmnt_data",224,"len")=8
 	Set gtmtypes("sgmnt_data",224,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","n_jnl_fsync_tries_tn")=224
-	Set gtmtypes("sgmnt_data",225,"name")="sgmnt_data.n_jnl_fsync_recovers_tn"
-	Set gtmtypes("sgmnt_data",225,"off")=2520
+	Set gtmtypfldindx("sgmnt_data","n_jnl_fsyncs_tn")=224
+	Set gtmtypes("sgmnt_data",225,"name")="sgmnt_data.n_jnl_fsync_tries_tn"
+	Set gtmtypes("sgmnt_data",225,"off")=2512
 	Set gtmtypes("sgmnt_data",225,"len")=8
 	Set gtmtypes("sgmnt_data",225,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","n_jnl_fsync_recovers_tn")=225
-	Set gtmtypes("sgmnt_data",226,"name")="sgmnt_data.n_db_fsyncs_tn"
-	Set gtmtypes("sgmnt_data",226,"off")=2528
+	Set gtmtypfldindx("sgmnt_data","n_jnl_fsync_tries_tn")=225
+	Set gtmtypes("sgmnt_data",226,"name")="sgmnt_data.n_jnl_fsync_recovers_tn"
+	Set gtmtypes("sgmnt_data",226,"off")=2520
 	Set gtmtypes("sgmnt_data",226,"len")=8
 	Set gtmtypes("sgmnt_data",226,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","n_db_fsyncs_tn")=226
-	Set gtmtypes("sgmnt_data",227,"name")="sgmnt_data.n_db_fsyncs_in_crit_tn"
-	Set gtmtypes("sgmnt_data",227,"off")=2536
+	Set gtmtypfldindx("sgmnt_data","n_jnl_fsync_recovers_tn")=226
+	Set gtmtypes("sgmnt_data",227,"name")="sgmnt_data.n_db_fsyncs_tn"
+	Set gtmtypes("sgmnt_data",227,"off")=2528
 	Set gtmtypes("sgmnt_data",227,"len")=8
 	Set gtmtypes("sgmnt_data",227,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","n_db_fsyncs_in_crit_tn")=227
-	Set gtmtypes("sgmnt_data",228,"name")="sgmnt_data.n_dbsync_timers_tn"
-	Set gtmtypes("sgmnt_data",228,"off")=2544
+	Set gtmtypfldindx("sgmnt_data","n_db_fsyncs_tn")=227
+	Set gtmtypes("sgmnt_data",228,"name")="sgmnt_data.n_db_fsyncs_in_crit_tn"
+	Set gtmtypes("sgmnt_data",228,"off")=2536
 	Set gtmtypes("sgmnt_data",228,"len")=8
 	Set gtmtypes("sgmnt_data",228,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","n_dbsync_timers_tn")=228
-	Set gtmtypes("sgmnt_data",229,"name")="sgmnt_data.n_dbsync_writes_tn"
-	Set gtmtypes("sgmnt_data",229,"off")=2552
+	Set gtmtypfldindx("sgmnt_data","n_db_fsyncs_in_crit_tn")=228
+	Set gtmtypes("sgmnt_data",229,"name")="sgmnt_data.n_dbsync_timers_tn"
+	Set gtmtypes("sgmnt_data",229,"off")=2544
 	Set gtmtypes("sgmnt_data",229,"len")=8
 	Set gtmtypes("sgmnt_data",229,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","n_dbsync_writes_tn")=229
-	Set gtmtypes("sgmnt_data",230,"name")="sgmnt_data.mutex_queue_full_tn"
-	Set gtmtypes("sgmnt_data",230,"off")=2560
+	Set gtmtypfldindx("sgmnt_data","n_dbsync_timers_tn")=229
+	Set gtmtypes("sgmnt_data",230,"name")="sgmnt_data.n_dbsync_writes_tn"
+	Set gtmtypes("sgmnt_data",230,"off")=2552
 	Set gtmtypes("sgmnt_data",230,"len")=8
 	Set gtmtypes("sgmnt_data",230,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","mutex_queue_full_tn")=230
-	Set gtmtypes("sgmnt_data",231,"name")="sgmnt_data.wcb_bt_put_tn"
-	Set gtmtypes("sgmnt_data",231,"off")=2568
+	Set gtmtypfldindx("sgmnt_data","n_dbsync_writes_tn")=230
+	Set gtmtypes("sgmnt_data",231,"name")="sgmnt_data.mutex_queue_full_tn"
+	Set gtmtypes("sgmnt_data",231,"off")=2560
 	Set gtmtypes("sgmnt_data",231,"len")=8
 	Set gtmtypes("sgmnt_data",231,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_bt_put_tn")=231
-	Set gtmtypes("sgmnt_data",232,"name")="sgmnt_data.wcb_mutex_salvage_tn"
-	Set gtmtypes("sgmnt_data",232,"off")=2576
+	Set gtmtypfldindx("sgmnt_data","mutex_queue_full_tn")=231
+	Set gtmtypes("sgmnt_data",232,"name")="sgmnt_data.wcb_bt_put_tn"
+	Set gtmtypes("sgmnt_data",232,"off")=2568
 	Set gtmtypes("sgmnt_data",232,"len")=8
 	Set gtmtypes("sgmnt_data",232,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_mutex_salvage_tn")=232
-	Set gtmtypes("sgmnt_data",233,"name")="sgmnt_data.wcb_tp_grab_crit_tn"
-	Set gtmtypes("sgmnt_data",233,"off")=2584
+	Set gtmtypfldindx("sgmnt_data","wcb_bt_put_tn")=232
+	Set gtmtypes("sgmnt_data",233,"name")="sgmnt_data.wcb_mutex_salvage_tn"
+	Set gtmtypes("sgmnt_data",233,"off")=2576
 	Set gtmtypes("sgmnt_data",233,"len")=8
 	Set gtmtypes("sgmnt_data",233,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_tp_grab_crit_tn")=233
-	Set gtmtypes("sgmnt_data",234,"name")="sgmnt_data.wcb_t_end_sysops_nocr_invcr_tn"
-	Set gtmtypes("sgmnt_data",234,"off")=2592
+	Set gtmtypfldindx("sgmnt_data","wcb_mutex_salvage_tn")=233
+	Set gtmtypes("sgmnt_data",234,"name")="sgmnt_data.wcb_tp_grab_crit_tn"
+	Set gtmtypes("sgmnt_data",234,"off")=2584
 	Set gtmtypes("sgmnt_data",234,"len")=8
 	Set gtmtypes("sgmnt_data",234,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_nocr_invcr_tn")=234
-	Set gtmtypes("sgmnt_data",235,"name")="sgmnt_data.wcb_t_end_sysops_cr_invcr_tn"
-	Set gtmtypes("sgmnt_data",235,"off")=2600
+	Set gtmtypfldindx("sgmnt_data","wcb_tp_grab_crit_tn")=234
+	Set gtmtypes("sgmnt_data",235,"name")="sgmnt_data.wcb_t_end_sysops_nocr_invcr_tn"
+	Set gtmtypes("sgmnt_data",235,"off")=2592
 	Set gtmtypes("sgmnt_data",235,"len")=8
 	Set gtmtypes("sgmnt_data",235,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_cr_invcr_tn")=235
-	Set gtmtypes("sgmnt_data",236,"name")="sgmnt_data.wcb_t_end_sysops_rip_wait_tn"
-	Set gtmtypes("sgmnt_data",236,"off")=2608
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_nocr_invcr_tn")=235
+	Set gtmtypes("sgmnt_data",236,"name")="sgmnt_data.wcb_t_end_sysops_cr_invcr_tn"
+	Set gtmtypes("sgmnt_data",236,"off")=2600
 	Set gtmtypes("sgmnt_data",236,"len")=8
 	Set gtmtypes("sgmnt_data",236,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_rip_wait_tn")=236
-	Set gtmtypes("sgmnt_data",237,"name")="sgmnt_data.wcb_t_end_sysops_dirtyripwait_tn"
-	Set gtmtypes("sgmnt_data",237,"off")=2616
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_cr_invcr_tn")=236
+	Set gtmtypes("sgmnt_data",237,"name")="sgmnt_data.wcb_t_end_sysops_rip_wait_tn"
+	Set gtmtypes("sgmnt_data",237,"off")=2608
 	Set gtmtypes("sgmnt_data",237,"len")=8
 	Set gtmtypes("sgmnt_data",237,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirtyripwait_tn")=237
-	Set gtmtypes("sgmnt_data",238,"name")="sgmnt_data.wcb_gds_rundown_tn"
-	Set gtmtypes("sgmnt_data",238,"off")=2624
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_rip_wait_tn")=237
+	Set gtmtypes("sgmnt_data",238,"name")="sgmnt_data.wcb_t_end_sysops_dirtyripwait_tn"
+	Set gtmtypes("sgmnt_data",238,"off")=2616
 	Set gtmtypes("sgmnt_data",238,"len")=8
 	Set gtmtypes("sgmnt_data",238,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_gds_rundown_tn")=238
-	Set gtmtypes("sgmnt_data",239,"name")="sgmnt_data.wcb_wcs_flu1_tn"
-	Set gtmtypes("sgmnt_data",239,"off")=2632
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirtyripwait_tn")=238
+	Set gtmtypes("sgmnt_data",239,"name")="sgmnt_data.wcb_gds_rundown_tn"
+	Set gtmtypes("sgmnt_data",239,"off")=2624
 	Set gtmtypes("sgmnt_data",239,"len")=8
 	Set gtmtypes("sgmnt_data",239,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_wcs_flu1_tn")=239
-	Set gtmtypes("sgmnt_data",240,"name")="sgmnt_data.wcb_mu_back_tn"
-	Set gtmtypes("sgmnt_data",240,"off")=2640
+	Set gtmtypfldindx("sgmnt_data","wcb_gds_rundown_tn")=239
+	Set gtmtypes("sgmnt_data",240,"name")="sgmnt_data.wcb_wcs_flu1_tn"
+	Set gtmtypes("sgmnt_data",240,"off")=2632
 	Set gtmtypes("sgmnt_data",240,"len")=8
 	Set gtmtypes("sgmnt_data",240,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_mu_back_tn")=240
-	Set gtmtypes("sgmnt_data",241,"name")="sgmnt_data.wcb_t_end_sysops_dirty_invcr_tn"
-	Set gtmtypes("sgmnt_data",241,"off")=2648
+	Set gtmtypfldindx("sgmnt_data","wcb_wcs_flu1_tn")=240
+	Set gtmtypes("sgmnt_data",241,"name")="sgmnt_data.wcb_mu_back_tn"
+	Set gtmtypes("sgmnt_data",241,"off")=2640
 	Set gtmtypes("sgmnt_data",241,"len")=8
 	Set gtmtypes("sgmnt_data",241,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirty_invcr_tn")=241
-	Set gtmtypes("sgmnt_data",242,"name")="sgmnt_data.wcb_t_end_sysops_wtfini_fail_tn"
-	Set gtmtypes("sgmnt_data",242,"off")=2656
+	Set gtmtypfldindx("sgmnt_data","wcb_mu_back_tn")=241
+	Set gtmtypes("sgmnt_data",242,"name")="sgmnt_data.wcb_t_end_sysops_dirty_invcr_tn"
+	Set gtmtypes("sgmnt_data",242,"off")=2648
 	Set gtmtypes("sgmnt_data",242,"len")=8
 	Set gtmtypes("sgmnt_data",242,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_wtfini_fail_tn")=242
-	Set gtmtypes("sgmnt_data",243,"name")="sgmnt_data.wcb_t_end_sysops_twin_stuck_tn"
-	Set gtmtypes("sgmnt_data",243,"off")=2664
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirty_invcr_tn")=242
+	Set gtmtypes("sgmnt_data",243,"name")="sgmnt_data.wcb_t_end_sysops_wtfini_fail_tn"
+	Set gtmtypes("sgmnt_data",243,"off")=2656
 	Set gtmtypes("sgmnt_data",243,"len")=8
 	Set gtmtypes("sgmnt_data",243,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_twin_stuck_tn")=243
-	Set gtmtypes("sgmnt_data",244,"name")="sgmnt_data.db_csh_getn_wrt_latch_stuck_tn"
-	Set gtmtypes("sgmnt_data",244,"off")=2672
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_wtfini_fail_tn")=243
+	Set gtmtypes("sgmnt_data",244,"name")="sgmnt_data.wcb_t_end_sysops_twin_stuck_tn"
+	Set gtmtypes("sgmnt_data",244,"off")=2664
 	Set gtmtypes("sgmnt_data",244,"len")=8
 	Set gtmtypes("sgmnt_data",244,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","db_csh_getn_wrt_latch_stuck_tn")=244
-	Set gtmtypes("sgmnt_data",245,"name")="sgmnt_data.wcb_secshr_db_clnup_now_crit_tn"
-	Set gtmtypes("sgmnt_data",245,"off")=2680
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_twin_stuck_tn")=244
+	Set gtmtypes("sgmnt_data",245,"name")="sgmnt_data.db_csh_getn_wrt_latch_stuck_tn"
+	Set gtmtypes("sgmnt_data",245,"off")=2672
 	Set gtmtypes("sgmnt_data",245,"len")=8
 	Set gtmtypes("sgmnt_data",245,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_secshr_db_clnup_now_crit_tn")=245
-	Set gtmtypes("sgmnt_data",246,"name")="sgmnt_data.wc_blocked_t_qread_bad_bt_index1_tn"
-	Set gtmtypes("sgmnt_data",246,"off")=2688
+	Set gtmtypfldindx("sgmnt_data","db_csh_getn_wrt_latch_stuck_tn")=245
+	Set gtmtypes("sgmnt_data",246,"name")="sgmnt_data.wcb_secshr_db_clnup_now_crit_tn"
+	Set gtmtypes("sgmnt_data",246,"off")=2680
 	Set gtmtypes("sgmnt_data",246,"len")=8
 	Set gtmtypes("sgmnt_data",246,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_bad_bt_index1_tn")=246
-	Set gtmtypes("sgmnt_data",247,"name")="sgmnt_data.wc_blocked_t_qread_bad_bt_index2_tn"
-	Set gtmtypes("sgmnt_data",247,"off")=2696
+	Set gtmtypfldindx("sgmnt_data","wcb_secshr_db_clnup_now_crit_tn")=246
+	Set gtmtypes("sgmnt_data",247,"name")="sgmnt_data.wc_blocked_t_qread_bad_bt_index1_tn"
+	Set gtmtypes("sgmnt_data",247,"off")=2688
 	Set gtmtypes("sgmnt_data",247,"len")=8
 	Set gtmtypes("sgmnt_data",247,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_bad_bt_index2_tn")=247
-	Set gtmtypes("sgmnt_data",248,"name")="sgmnt_data.wc_blocked_t_end_crbtmismatch1_tn"
-	Set gtmtypes("sgmnt_data",248,"off")=2704
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_bad_bt_index1_tn")=247
+	Set gtmtypes("sgmnt_data",248,"name")="sgmnt_data.wc_blocked_t_qread_bad_bt_index2_tn"
+	Set gtmtypes("sgmnt_data",248,"off")=2696
 	Set gtmtypes("sgmnt_data",248,"len")=8
 	Set gtmtypes("sgmnt_data",248,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_crbtmismatch1_tn")=248
-	Set gtmtypes("sgmnt_data",249,"name")="sgmnt_data.wc_blocked_t_end_crbtmismatch2_tn"
-	Set gtmtypes("sgmnt_data",249,"off")=2712
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_bad_bt_index2_tn")=248
+	Set gtmtypes("sgmnt_data",249,"name")="sgmnt_data.wc_blocked_t_end_crbtmismatch1_tn"
+	Set gtmtypes("sgmnt_data",249,"off")=2704
 	Set gtmtypes("sgmnt_data",249,"len")=8
 	Set gtmtypes("sgmnt_data",249,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_crbtmismatch2_tn")=249
-	Set gtmtypes("sgmnt_data",250,"name")="sgmnt_data.wc_blocked_t_end_crbtmismatch3_tn"
-	Set gtmtypes("sgmnt_data",250,"off")=2720
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_crbtmismatch1_tn")=249
+	Set gtmtypes("sgmnt_data",250,"name")="sgmnt_data.wc_blocked_t_end_crbtmismatch2_tn"
+	Set gtmtypes("sgmnt_data",250,"off")=2712
 	Set gtmtypes("sgmnt_data",250,"len")=8
 	Set gtmtypes("sgmnt_data",250,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_crbtmismatch3_tn")=250
-	Set gtmtypes("sgmnt_data",251,"name")="sgmnt_data.wc_blocked_tp_tend_crbtmismatch1_tn"
-	Set gtmtypes("sgmnt_data",251,"off")=2728
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_crbtmismatch2_tn")=250
+	Set gtmtypes("sgmnt_data",251,"name")="sgmnt_data.wc_blocked_t_end_crbtmismatch3_tn"
+	Set gtmtypes("sgmnt_data",251,"off")=2720
 	Set gtmtypes("sgmnt_data",251,"len")=8
 	Set gtmtypes("sgmnt_data",251,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_crbtmismatch1_tn")=251
-	Set gtmtypes("sgmnt_data",252,"name")="sgmnt_data.wc_blocked_tp_tend_crbtmismatch2_tn"
-	Set gtmtypes("sgmnt_data",252,"off")=2736
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_crbtmismatch3_tn")=251
+	Set gtmtypes("sgmnt_data",252,"name")="sgmnt_data.wc_blocked_tp_tend_crbtmismatch1_tn"
+	Set gtmtypes("sgmnt_data",252,"off")=2728
 	Set gtmtypes("sgmnt_data",252,"len")=8
 	Set gtmtypes("sgmnt_data",252,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_crbtmismatch2_tn")=252
-	Set gtmtypes("sgmnt_data",253,"name")="sgmnt_data.wc_blocked_tp_tend_crbtmismatch3_tn"
-	Set gtmtypes("sgmnt_data",253,"off")=2744
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_crbtmismatch1_tn")=252
+	Set gtmtypes("sgmnt_data",253,"name")="sgmnt_data.wc_blocked_tp_tend_crbtmismatch2_tn"
+	Set gtmtypes("sgmnt_data",253,"off")=2736
 	Set gtmtypes("sgmnt_data",253,"len")=8
 	Set gtmtypes("sgmnt_data",253,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_crbtmismatch3_tn")=253
-	Set gtmtypes("sgmnt_data",254,"name")="sgmnt_data.wc_blocked_wcs_wtstart_bad_cr_tn"
-	Set gtmtypes("sgmnt_data",254,"off")=2752
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_crbtmismatch2_tn")=253
+	Set gtmtypes("sgmnt_data",254,"name")="sgmnt_data.wc_blocked_tp_tend_crbtmismatch3_tn"
+	Set gtmtypes("sgmnt_data",254,"off")=2744
 	Set gtmtypes("sgmnt_data",254,"len")=8
 	Set gtmtypes("sgmnt_data",254,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_wtstart_bad_cr_tn")=254
-	Set gtmtypes("sgmnt_data",255,"name")="sgmnt_data.wc_blocked_wcs_wtfini_bad_cr_tn"
-	Set gtmtypes("sgmnt_data",255,"off")=2760
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_crbtmismatch3_tn")=254
+	Set gtmtypes("sgmnt_data",255,"name")="sgmnt_data.wc_blocked_wcs_wtstart_bad_cr_tn"
+	Set gtmtypes("sgmnt_data",255,"off")=2752
 	Set gtmtypes("sgmnt_data",255,"len")=8
 	Set gtmtypes("sgmnt_data",255,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_wtfini_bad_cr_tn")=255
-	Set gtmtypes("sgmnt_data",256,"name")="sgmnt_data.wc_blocked_bt_get_tn"
-	Set gtmtypes("sgmnt_data",256,"off")=2768
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_wtstart_bad_cr_tn")=255
+	Set gtmtypes("sgmnt_data",256,"name")="sgmnt_data.wc_blocked_wcs_wtfini_bad_cr_tn"
+	Set gtmtypes("sgmnt_data",256,"off")=2760
 	Set gtmtypes("sgmnt_data",256,"len")=8
 	Set gtmtypes("sgmnt_data",256,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_bt_get_tn")=256
-	Set gtmtypes("sgmnt_data",257,"name")="sgmnt_data.wc_blocked_wcs_cdb_sc_final_retry_tn"
-	Set gtmtypes("sgmnt_data",257,"off")=2776
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_wtfini_bad_cr_tn")=256
+	Set gtmtypes("sgmnt_data",257,"name")="sgmnt_data.wc_blocked_bt_get_tn"
+	Set gtmtypes("sgmnt_data",257,"off")=2768
 	Set gtmtypes("sgmnt_data",257,"len")=8
 	Set gtmtypes("sgmnt_data",257,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_cdb_sc_final_retry_tn")=257
-	Set gtmtypes("sgmnt_data",258,"name")="sgmnt_data.wcb_bg_update_lckfail1_tn"
-	Set gtmtypes("sgmnt_data",258,"off")=2784
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_bt_get_tn")=257
+	Set gtmtypes("sgmnt_data",258,"name")="sgmnt_data.wc_blocked_wcs_cdb_sc_final_retry_tn"
+	Set gtmtypes("sgmnt_data",258,"off")=2776
 	Set gtmtypes("sgmnt_data",258,"len")=8
 	Set gtmtypes("sgmnt_data",258,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_bg_update_lckfail1_tn")=258
-	Set gtmtypes("sgmnt_data",259,"name")="sgmnt_data.wcb_bg_update_lckfail2_tn"
-	Set gtmtypes("sgmnt_data",259,"off")=2792
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_cdb_sc_final_retry_tn")=258
+	Set gtmtypes("sgmnt_data",259,"name")="sgmnt_data.wcb_bg_update_lckfail1_tn"
+	Set gtmtypes("sgmnt_data",259,"off")=2784
 	Set gtmtypes("sgmnt_data",259,"len")=8
 	Set gtmtypes("sgmnt_data",259,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_bg_update_lckfail2_tn")=259
-	Set gtmtypes("sgmnt_data",260,"name")="sgmnt_data.wcb_wtstart_lckfail1_tn"
-	Set gtmtypes("sgmnt_data",260,"off")=2800
+	Set gtmtypfldindx("sgmnt_data","wcb_bg_update_lckfail1_tn")=259
+	Set gtmtypes("sgmnt_data",260,"name")="sgmnt_data.wcb_bg_update_lckfail2_tn"
+	Set gtmtypes("sgmnt_data",260,"off")=2792
 	Set gtmtypes("sgmnt_data",260,"len")=8
 	Set gtmtypes("sgmnt_data",260,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail1_tn")=260
-	Set gtmtypes("sgmnt_data",261,"name")="sgmnt_data.wcb_wtstart_lckfail2_tn"
-	Set gtmtypes("sgmnt_data",261,"off")=2808
+	Set gtmtypfldindx("sgmnt_data","wcb_bg_update_lckfail2_tn")=260
+	Set gtmtypes("sgmnt_data",261,"name")="sgmnt_data.wcb_wtstart_lckfail1_tn"
+	Set gtmtypes("sgmnt_data",261,"off")=2800
 	Set gtmtypes("sgmnt_data",261,"len")=8
 	Set gtmtypes("sgmnt_data",261,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail2_tn")=261
-	Set gtmtypes("sgmnt_data",262,"name")="sgmnt_data.wcb_wtstart_lckfail3_tn"
-	Set gtmtypes("sgmnt_data",262,"off")=2816
+	Set gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail1_tn")=261
+	Set gtmtypes("sgmnt_data",262,"name")="sgmnt_data.wcb_wtstart_lckfail2_tn"
+	Set gtmtypes("sgmnt_data",262,"off")=2808
 	Set gtmtypes("sgmnt_data",262,"len")=8
 	Set gtmtypes("sgmnt_data",262,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail3_tn")=262
-	Set gtmtypes("sgmnt_data",263,"name")="sgmnt_data.wcb_wtstart_lckfail4_tn"
-	Set gtmtypes("sgmnt_data",263,"off")=2824
+	Set gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail2_tn")=262
+	Set gtmtypes("sgmnt_data",263,"name")="sgmnt_data.wcb_wtstart_lckfail3_tn"
+	Set gtmtypes("sgmnt_data",263,"off")=2816
 	Set gtmtypes("sgmnt_data",263,"len")=8
 	Set gtmtypes("sgmnt_data",263,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail4_tn")=263
-	Set gtmtypes("sgmnt_data",264,"name")="sgmnt_data.wcb_wtfini_lckfail1_tn"
-	Set gtmtypes("sgmnt_data",264,"off")=2832
+	Set gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail3_tn")=263
+	Set gtmtypes("sgmnt_data",264,"name")="sgmnt_data.wcb_wtstart_lckfail4_tn"
+	Set gtmtypes("sgmnt_data",264,"off")=2824
 	Set gtmtypes("sgmnt_data",264,"len")=8
 	Set gtmtypes("sgmnt_data",264,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail1_tn")=264
-	Set gtmtypes("sgmnt_data",265,"name")="sgmnt_data.wcb_wtfini_lckfail2_tn"
-	Set gtmtypes("sgmnt_data",265,"off")=2840
+	Set gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail4_tn")=264
+	Set gtmtypes("sgmnt_data",265,"name")="sgmnt_data.wcb_wtfini_lckfail1_tn"
+	Set gtmtypes("sgmnt_data",265,"off")=2832
 	Set gtmtypes("sgmnt_data",265,"len")=8
 	Set gtmtypes("sgmnt_data",265,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail2_tn")=265
-	Set gtmtypes("sgmnt_data",266,"name")="sgmnt_data.wcb_wtfini_lckfail3_tn"
-	Set gtmtypes("sgmnt_data",266,"off")=2848
+	Set gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail1_tn")=265
+	Set gtmtypes("sgmnt_data",266,"name")="sgmnt_data.wcb_wtfini_lckfail2_tn"
+	Set gtmtypes("sgmnt_data",266,"off")=2840
 	Set gtmtypes("sgmnt_data",266,"len")=8
 	Set gtmtypes("sgmnt_data",266,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail3_tn")=266
-	Set gtmtypes("sgmnt_data",267,"name")="sgmnt_data.wcb_wtfini_lckfail4_tn"
-	Set gtmtypes("sgmnt_data",267,"off")=2856
+	Set gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail2_tn")=266
+	Set gtmtypes("sgmnt_data",267,"name")="sgmnt_data.wcb_wtfini_lckfail3_tn"
+	Set gtmtypes("sgmnt_data",267,"off")=2848
 	Set gtmtypes("sgmnt_data",267,"len")=8
 	Set gtmtypes("sgmnt_data",267,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail4_tn")=267
-	Set gtmtypes("sgmnt_data",268,"name")="sgmnt_data.wcb_t_end_sysops_dirtystuck1_tn"
-	Set gtmtypes("sgmnt_data",268,"off")=2864
+	Set gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail3_tn")=267
+	Set gtmtypes("sgmnt_data",268,"name")="sgmnt_data.wcb_wtfini_lckfail4_tn"
+	Set gtmtypes("sgmnt_data",268,"off")=2856
 	Set gtmtypes("sgmnt_data",268,"len")=8
 	Set gtmtypes("sgmnt_data",268,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirtystuck1_tn")=268
-	Set gtmtypes("sgmnt_data",269,"name")="sgmnt_data.wcb_t_end_sysops_dirtystuck2_tn"
-	Set gtmtypes("sgmnt_data",269,"off")=2872
+	Set gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail4_tn")=268
+	Set gtmtypes("sgmnt_data",269,"name")="sgmnt_data.wcb_t_end_sysops_dirtystuck1_tn"
+	Set gtmtypes("sgmnt_data",269,"off")=2864
 	Set gtmtypes("sgmnt_data",269,"len")=8
 	Set gtmtypes("sgmnt_data",269,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirtystuck2_tn")=269
-	Set gtmtypes("sgmnt_data",270,"name")="sgmnt_data.wcb_secshr_db_clnup_wbuf_dqd_tn"
-	Set gtmtypes("sgmnt_data",270,"off")=2880
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirtystuck1_tn")=269
+	Set gtmtypes("sgmnt_data",270,"name")="sgmnt_data.wcb_t_end_sysops_dirtystuck2_tn"
+	Set gtmtypes("sgmnt_data",270,"off")=2872
 	Set gtmtypes("sgmnt_data",270,"len")=8
 	Set gtmtypes("sgmnt_data",270,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_secshr_db_clnup_wbuf_dqd_tn")=270
-	Set gtmtypes("sgmnt_data",271,"name")="sgmnt_data.dwngrd_refmts_syncio_tn"
-	Set gtmtypes("sgmnt_data",271,"off")=2888
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirtystuck2_tn")=270
+	Set gtmtypes("sgmnt_data",271,"name")="sgmnt_data.wcb_secshr_db_clnup_wbuf_dqd_tn"
+	Set gtmtypes("sgmnt_data",271,"off")=2880
 	Set gtmtypes("sgmnt_data",271,"len")=8
 	Set gtmtypes("sgmnt_data",271,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","dwngrd_refmts_syncio_tn")=271
-	Set gtmtypes("sgmnt_data",272,"name")="sgmnt_data.dwngrd_refmts_asyncio_tn"
-	Set gtmtypes("sgmnt_data",272,"off")=2896
+	Set gtmtypfldindx("sgmnt_data","wcb_secshr_db_clnup_wbuf_dqd_tn")=271
+	Set gtmtypes("sgmnt_data",272,"name")="sgmnt_data.dwngrd_refmts_syncio_tn"
+	Set gtmtypes("sgmnt_data",272,"off")=2888
 	Set gtmtypes("sgmnt_data",272,"len")=8
 	Set gtmtypes("sgmnt_data",272,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","dwngrd_refmts_asyncio_tn")=272
-	Set gtmtypes("sgmnt_data",273,"name")="sgmnt_data.shmpool_refmt_harvests_tn"
-	Set gtmtypes("sgmnt_data",273,"off")=2904
+	Set gtmtypfldindx("sgmnt_data","dwngrd_refmts_syncio_tn")=272
+	Set gtmtypes("sgmnt_data",273,"name")="sgmnt_data.dwngrd_refmts_asyncio_tn"
+	Set gtmtypes("sgmnt_data",273,"off")=2896
 	Set gtmtypes("sgmnt_data",273,"len")=8
 	Set gtmtypes("sgmnt_data",273,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","shmpool_refmt_harvests_tn")=273
-	Set gtmtypes("sgmnt_data",274,"name")="sgmnt_data.shmpool_recovery_tn"
-	Set gtmtypes("sgmnt_data",274,"off")=2912
+	Set gtmtypfldindx("sgmnt_data","dwngrd_refmts_asyncio_tn")=273
+	Set gtmtypes("sgmnt_data",274,"name")="sgmnt_data.shmpool_refmt_harvests_tn"
+	Set gtmtypes("sgmnt_data",274,"off")=2904
 	Set gtmtypes("sgmnt_data",274,"len")=8
 	Set gtmtypes("sgmnt_data",274,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","shmpool_recovery_tn")=274
-	Set gtmtypes("sgmnt_data",275,"name")="sgmnt_data.shmpool_blkd_by_sdc_tn"
-	Set gtmtypes("sgmnt_data",275,"off")=2920
+	Set gtmtypfldindx("sgmnt_data","shmpool_refmt_harvests_tn")=274
+	Set gtmtypes("sgmnt_data",275,"name")="sgmnt_data.shmpool_recovery_tn"
+	Set gtmtypes("sgmnt_data",275,"off")=2912
 	Set gtmtypes("sgmnt_data",275,"len")=8
 	Set gtmtypes("sgmnt_data",275,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","shmpool_blkd_by_sdc_tn")=275
-	Set gtmtypes("sgmnt_data",276,"name")="sgmnt_data.shmpool_alloc_bbflush_tn"
-	Set gtmtypes("sgmnt_data",276,"off")=2928
+	Set gtmtypfldindx("sgmnt_data","shmpool_recovery_tn")=275
+	Set gtmtypes("sgmnt_data",276,"name")="sgmnt_data.shmpool_blkd_by_sdc_tn"
+	Set gtmtypes("sgmnt_data",276,"off")=2920
 	Set gtmtypes("sgmnt_data",276,"len")=8
 	Set gtmtypes("sgmnt_data",276,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","shmpool_alloc_bbflush_tn")=276
-	Set gtmtypes("sgmnt_data",277,"name")="sgmnt_data.refmt_hvst_blk_released_replaced_tn"
-	Set gtmtypes("sgmnt_data",277,"off")=2936
+	Set gtmtypfldindx("sgmnt_data","shmpool_blkd_by_sdc_tn")=276
+	Set gtmtypes("sgmnt_data",277,"name")="sgmnt_data.shmpool_alloc_bbflush_tn"
+	Set gtmtypes("sgmnt_data",277,"off")=2928
 	Set gtmtypes("sgmnt_data",277,"len")=8
 	Set gtmtypes("sgmnt_data",277,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","refmt_hvst_blk_released_replaced_tn")=277
-	Set gtmtypes("sgmnt_data",278,"name")="sgmnt_data.refmt_hvst_blk_released_io_complete_tn"
-	Set gtmtypes("sgmnt_data",278,"off")=2944
+	Set gtmtypfldindx("sgmnt_data","shmpool_alloc_bbflush_tn")=277
+	Set gtmtypes("sgmnt_data",278,"name")="sgmnt_data.refmt_hvst_blk_released_replaced_tn"
+	Set gtmtypes("sgmnt_data",278,"off")=2936
 	Set gtmtypes("sgmnt_data",278,"len")=8
 	Set gtmtypes("sgmnt_data",278,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","refmt_hvst_blk_released_io_complete_tn")=278
-	Set gtmtypes("sgmnt_data",279,"name")="sgmnt_data.refmt_hvst_blk_kept_tn"
-	Set gtmtypes("sgmnt_data",279,"off")=2952
+	Set gtmtypfldindx("sgmnt_data","refmt_hvst_blk_released_replaced_tn")=278
+	Set gtmtypes("sgmnt_data",279,"name")="sgmnt_data.refmt_hvst_blk_released_io_complete_tn"
+	Set gtmtypes("sgmnt_data",279,"off")=2944
 	Set gtmtypes("sgmnt_data",279,"len")=8
 	Set gtmtypes("sgmnt_data",279,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","refmt_hvst_blk_kept_tn")=279
-	Set gtmtypes("sgmnt_data",280,"name")="sgmnt_data.refmt_hvst_blk_ignored_tn"
-	Set gtmtypes("sgmnt_data",280,"off")=2960
+	Set gtmtypfldindx("sgmnt_data","refmt_hvst_blk_released_io_complete_tn")=279
+	Set gtmtypes("sgmnt_data",280,"name")="sgmnt_data.refmt_hvst_blk_kept_tn"
+	Set gtmtypes("sgmnt_data",280,"off")=2952
 	Set gtmtypes("sgmnt_data",280,"len")=8
 	Set gtmtypes("sgmnt_data",280,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","refmt_hvst_blk_ignored_tn")=280
-	Set gtmtypes("sgmnt_data",281,"name")="sgmnt_data.refmt_blk_chk_blk_freed_tn"
-	Set gtmtypes("sgmnt_data",281,"off")=2968
+	Set gtmtypfldindx("sgmnt_data","refmt_hvst_blk_kept_tn")=280
+	Set gtmtypes("sgmnt_data",281,"name")="sgmnt_data.refmt_hvst_blk_ignored_tn"
+	Set gtmtypes("sgmnt_data",281,"off")=2960
 	Set gtmtypes("sgmnt_data",281,"len")=8
 	Set gtmtypes("sgmnt_data",281,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","refmt_blk_chk_blk_freed_tn")=281
-	Set gtmtypes("sgmnt_data",282,"name")="sgmnt_data.refmt_blk_chk_blk_kept_tn"
-	Set gtmtypes("sgmnt_data",282,"off")=2976
+	Set gtmtypfldindx("sgmnt_data","refmt_hvst_blk_ignored_tn")=281
+	Set gtmtypes("sgmnt_data",282,"name")="sgmnt_data.refmt_blk_chk_blk_freed_tn"
+	Set gtmtypes("sgmnt_data",282,"off")=2968
 	Set gtmtypes("sgmnt_data",282,"len")=8
 	Set gtmtypes("sgmnt_data",282,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","refmt_blk_chk_blk_kept_tn")=282
-	Set gtmtypes("sgmnt_data",283,"name")="sgmnt_data.active_lvl_trigger_tn"
-	Set gtmtypes("sgmnt_data",283,"off")=2984
+	Set gtmtypfldindx("sgmnt_data","refmt_blk_chk_blk_freed_tn")=282
+	Set gtmtypes("sgmnt_data",283,"name")="sgmnt_data.refmt_blk_chk_blk_kept_tn"
+	Set gtmtypes("sgmnt_data",283,"off")=2976
 	Set gtmtypes("sgmnt_data",283,"len")=8
 	Set gtmtypes("sgmnt_data",283,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","active_lvl_trigger_tn")=283
-	Set gtmtypes("sgmnt_data",284,"name")="sgmnt_data.new_buff_tn"
-	Set gtmtypes("sgmnt_data",284,"off")=2992
+	Set gtmtypfldindx("sgmnt_data","refmt_blk_chk_blk_kept_tn")=283
+	Set gtmtypes("sgmnt_data",284,"name")="sgmnt_data.active_lvl_trigger_tn"
+	Set gtmtypes("sgmnt_data",284,"off")=2984
 	Set gtmtypes("sgmnt_data",284,"len")=8
 	Set gtmtypes("sgmnt_data",284,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","new_buff_tn")=284
-	Set gtmtypes("sgmnt_data",285,"name")="sgmnt_data.phase2_commit_wait_sleep_in_crit_tn"
-	Set gtmtypes("sgmnt_data",285,"off")=3000
+	Set gtmtypfldindx("sgmnt_data","active_lvl_trigger_tn")=284
+	Set gtmtypes("sgmnt_data",285,"name")="sgmnt_data.new_buff_tn"
+	Set gtmtypes("sgmnt_data",285,"off")=2992
 	Set gtmtypes("sgmnt_data",285,"len")=8
 	Set gtmtypes("sgmnt_data",285,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","phase2_commit_wait_sleep_in_crit_tn")=285
-	Set gtmtypes("sgmnt_data",286,"name")="sgmnt_data.phase2_commit_wait_sleep_no_crit_tn"
-	Set gtmtypes("sgmnt_data",286,"off")=3008
+	Set gtmtypfldindx("sgmnt_data","new_buff_tn")=285
+	Set gtmtypes("sgmnt_data",286,"name")="sgmnt_data.phase2_commit_wait_sleep_in_crit_tn"
+	Set gtmtypes("sgmnt_data",286,"off")=3000
 	Set gtmtypes("sgmnt_data",286,"len")=8
 	Set gtmtypes("sgmnt_data",286,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","phase2_commit_wait_sleep_no_crit_tn")=286
-	Set gtmtypes("sgmnt_data",287,"name")="sgmnt_data.phase2_commit_wait_pidcnt_tn"
-	Set gtmtypes("sgmnt_data",287,"off")=3016
+	Set gtmtypfldindx("sgmnt_data","phase2_commit_wait_sleep_in_crit_tn")=286
+	Set gtmtypes("sgmnt_data",287,"name")="sgmnt_data.phase2_commit_wait_sleep_no_crit_tn"
+	Set gtmtypes("sgmnt_data",287,"off")=3008
 	Set gtmtypes("sgmnt_data",287,"len")=8
 	Set gtmtypes("sgmnt_data",287,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","phase2_commit_wait_pidcnt_tn")=287
-	Set gtmtypes("sgmnt_data",288,"name")="sgmnt_data.wcb_t_end_sysops_intend_wait_tn"
-	Set gtmtypes("sgmnt_data",288,"off")=3024
+	Set gtmtypfldindx("sgmnt_data","phase2_commit_wait_sleep_no_crit_tn")=287
+	Set gtmtypes("sgmnt_data",288,"name")="sgmnt_data.phase2_commit_wait_pidcnt_tn"
+	Set gtmtypes("sgmnt_data",288,"off")=3016
 	Set gtmtypes("sgmnt_data",288,"len")=8
 	Set gtmtypes("sgmnt_data",288,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_intend_wait_tn")=288
-	Set gtmtypes("sgmnt_data",289,"name")="sgmnt_data.wcb_secshr_db_clnup_phase2_clnup_tn"
-	Set gtmtypes("sgmnt_data",289,"off")=3032
+	Set gtmtypfldindx("sgmnt_data","phase2_commit_wait_pidcnt_tn")=288
+	Set gtmtypes("sgmnt_data",289,"name")="sgmnt_data.wcb_t_end_sysops_intend_wait_tn"
+	Set gtmtypes("sgmnt_data",289,"off")=3024
 	Set gtmtypes("sgmnt_data",289,"len")=8
 	Set gtmtypes("sgmnt_data",289,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_secshr_db_clnup_phase2_clnup_tn")=289
-	Set gtmtypes("sgmnt_data",290,"name")="sgmnt_data.wcb_phase2_commit_wait_tn"
-	Set gtmtypes("sgmnt_data",290,"off")=3040
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_intend_wait_tn")=289
+	Set gtmtypes("sgmnt_data",290,"name")="sgmnt_data.wcb_secshr_db_clnup_phase2_clnup_tn"
+	Set gtmtypes("sgmnt_data",290,"off")=3032
 	Set gtmtypes("sgmnt_data",290,"len")=8
 	Set gtmtypes("sgmnt_data",290,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","wcb_phase2_commit_wait_tn")=290
-	Set gtmtypes("sgmnt_data",291,"name")="sgmnt_data.recompute_upd_array_calls_tn"
-	Set gtmtypes("sgmnt_data",291,"off")=3048
+	Set gtmtypfldindx("sgmnt_data","wcb_secshr_db_clnup_phase2_clnup_tn")=290
+	Set gtmtypes("sgmnt_data",291,"name")="sgmnt_data.wcb_phase2_commit_wait_tn"
+	Set gtmtypes("sgmnt_data",291,"off")=3040
 	Set gtmtypes("sgmnt_data",291,"len")=8
 	Set gtmtypes("sgmnt_data",291,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_calls_tn")=291
-	Set gtmtypes("sgmnt_data",292,"name")="sgmnt_data.recompute_upd_array_rip_tn"
-	Set gtmtypes("sgmnt_data",292,"off")=3056
+	Set gtmtypfldindx("sgmnt_data","wcb_phase2_commit_wait_tn")=291
+	Set gtmtypes("sgmnt_data",292,"name")="sgmnt_data.recompute_upd_array_calls_tn"
+	Set gtmtypes("sgmnt_data",292,"off")=3048
 	Set gtmtypes("sgmnt_data",292,"len")=8
 	Set gtmtypes("sgmnt_data",292,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_rip_tn")=292
-	Set gtmtypes("sgmnt_data",293,"name")="sgmnt_data.recompute_upd_array_in_tend_tn"
-	Set gtmtypes("sgmnt_data",293,"off")=3064
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_calls_tn")=292
+	Set gtmtypes("sgmnt_data",293,"name")="sgmnt_data.recompute_upd_array_rip_tn"
+	Set gtmtypes("sgmnt_data",293,"off")=3056
 	Set gtmtypes("sgmnt_data",293,"len")=8
 	Set gtmtypes("sgmnt_data",293,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_in_tend_tn")=293
-	Set gtmtypes("sgmnt_data",294,"name")="sgmnt_data.recompute_upd_array_search_blk_tn"
-	Set gtmtypes("sgmnt_data",294,"off")=3072
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_rip_tn")=293
+	Set gtmtypes("sgmnt_data",294,"name")="sgmnt_data.recompute_upd_array_in_tend_tn"
+	Set gtmtypes("sgmnt_data",294,"off")=3064
 	Set gtmtypes("sgmnt_data",294,"len")=8
 	Set gtmtypes("sgmnt_data",294,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_search_blk_tn")=294
-	Set gtmtypes("sgmnt_data",295,"name")="sgmnt_data.recompute_upd_array_new_rec_tn"
-	Set gtmtypes("sgmnt_data",295,"off")=3080
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_in_tend_tn")=294
+	Set gtmtypes("sgmnt_data",295,"name")="sgmnt_data.recompute_upd_array_search_blk_tn"
+	Set gtmtypes("sgmnt_data",295,"off")=3072
 	Set gtmtypes("sgmnt_data",295,"len")=8
 	Set gtmtypes("sgmnt_data",295,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_new_rec_tn")=295
-	Set gtmtypes("sgmnt_data",296,"name")="sgmnt_data.recompute_upd_array_rec_size_tn"
-	Set gtmtypes("sgmnt_data",296,"off")=3088
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_search_blk_tn")=295
+	Set gtmtypes("sgmnt_data",296,"name")="sgmnt_data.recompute_upd_array_new_rec_tn"
+	Set gtmtypes("sgmnt_data",296,"off")=3080
 	Set gtmtypes("sgmnt_data",296,"len")=8
 	Set gtmtypes("sgmnt_data",296,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_rec_size_tn")=296
-	Set gtmtypes("sgmnt_data",297,"name")="sgmnt_data.recompute_upd_array_rec_cmpc_tn"
-	Set gtmtypes("sgmnt_data",297,"off")=3096
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_new_rec_tn")=296
+	Set gtmtypes("sgmnt_data",297,"name")="sgmnt_data.recompute_upd_array_rec_size_tn"
+	Set gtmtypes("sgmnt_data",297,"off")=3088
 	Set gtmtypes("sgmnt_data",297,"len")=8
 	Set gtmtypes("sgmnt_data",297,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_rec_cmpc_tn")=297
-	Set gtmtypes("sgmnt_data",298,"name")="sgmnt_data.recompute_upd_array_blk_fini_tn"
-	Set gtmtypes("sgmnt_data",298,"off")=3104
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_rec_size_tn")=297
+	Set gtmtypes("sgmnt_data",298,"name")="sgmnt_data.recompute_upd_array_rec_cmpc_tn"
+	Set gtmtypes("sgmnt_data",298,"off")=3096
 	Set gtmtypes("sgmnt_data",298,"len")=8
 	Set gtmtypes("sgmnt_data",298,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_blk_fini_tn")=298
-	Set gtmtypes("sgmnt_data",299,"name")="sgmnt_data.recompute_upd_array_blk_split_tn"
-	Set gtmtypes("sgmnt_data",299,"off")=3112
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_rec_cmpc_tn")=298
+	Set gtmtypes("sgmnt_data",299,"name")="sgmnt_data.recompute_upd_array_blk_fini_tn"
+	Set gtmtypes("sgmnt_data",299,"off")=3104
 	Set gtmtypes("sgmnt_data",299,"len")=8
 	Set gtmtypes("sgmnt_data",299,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_blk_split_tn")=299
-	Set gtmtypes("sgmnt_data",300,"name")="sgmnt_data.t_qread_ripsleep_cnt_tn"
-	Set gtmtypes("sgmnt_data",300,"off")=3120
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_blk_fini_tn")=299
+	Set gtmtypes("sgmnt_data",300,"name")="sgmnt_data.recompute_upd_array_blk_split_tn"
+	Set gtmtypes("sgmnt_data",300,"off")=3112
 	Set gtmtypes("sgmnt_data",300,"len")=8
 	Set gtmtypes("sgmnt_data",300,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","t_qread_ripsleep_cnt_tn")=300
-	Set gtmtypes("sgmnt_data",301,"name")="sgmnt_data.t_qread_ripsleep_nblks_tn"
-	Set gtmtypes("sgmnt_data",301,"off")=3128
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_blk_split_tn")=300
+	Set gtmtypes("sgmnt_data",301,"name")="sgmnt_data.t_qread_ripsleep_cnt_tn"
+	Set gtmtypes("sgmnt_data",301,"off")=3120
 	Set gtmtypes("sgmnt_data",301,"len")=8
 	Set gtmtypes("sgmnt_data",301,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","t_qread_ripsleep_nblks_tn")=301
-	Set gtmtypes("sgmnt_data",302,"name")="sgmnt_data.bg_trc_rec_tn_filler"
-	Set gtmtypes("sgmnt_data",302,"off")=3136
-	Set gtmtypes("sgmnt_data",302,"len")=112
-	Set gtmtypes("sgmnt_data",302,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","bg_trc_rec_tn_filler")=302
-	Set gtmtypes("sgmnt_data",303,"name")="sgmnt_data.total_buffer_flush_cntr"
-	Set gtmtypes("sgmnt_data",303,"off")=3248
-	Set gtmtypes("sgmnt_data",303,"len")=4
-	Set gtmtypes("sgmnt_data",303,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","total_buffer_flush_cntr")=303
-	Set gtmtypes("sgmnt_data",304,"name")="sgmnt_data.bufct_buffer_flush_cntr"
-	Set gtmtypes("sgmnt_data",304,"off")=3252
-	Set gtmtypes("sgmnt_data",304,"len")=4
-	Set gtmtypes("sgmnt_data",304,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","bufct_buffer_flush_cntr")=304
-	Set gtmtypes("sgmnt_data",305,"name")="sgmnt_data.bufct_buffer_flush_loop_cntr"
-	Set gtmtypes("sgmnt_data",305,"off")=3256
-	Set gtmtypes("sgmnt_data",305,"len")=4
-	Set gtmtypes("sgmnt_data",305,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","bufct_buffer_flush_loop_cntr")=305
-	Set gtmtypes("sgmnt_data",306,"name")="sgmnt_data.wrt_calls_cntr"
-	Set gtmtypes("sgmnt_data",306,"off")=3260
-	Set gtmtypes("sgmnt_data",306,"len")=4
-	Set gtmtypes("sgmnt_data",306,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wrt_calls_cntr")=306
-	Set gtmtypes("sgmnt_data",307,"name")="sgmnt_data.wrt_count_cntr"
-	Set gtmtypes("sgmnt_data",307,"off")=3264
-	Set gtmtypes("sgmnt_data",307,"len")=4
-	Set gtmtypes("sgmnt_data",307,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wrt_count_cntr")=307
-	Set gtmtypes("sgmnt_data",308,"name")="sgmnt_data.wrt_blocked_cntr"
-	Set gtmtypes("sgmnt_data",308,"off")=3268
-	Set gtmtypes("sgmnt_data",308,"len")=4
-	Set gtmtypes("sgmnt_data",308,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wrt_blocked_cntr")=308
-	Set gtmtypes("sgmnt_data",309,"name")="sgmnt_data.wrt_busy_cntr"
-	Set gtmtypes("sgmnt_data",309,"off")=3272
-	Set gtmtypes("sgmnt_data",309,"len")=4
-	Set gtmtypes("sgmnt_data",309,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wrt_busy_cntr")=309
-	Set gtmtypes("sgmnt_data",310,"name")="sgmnt_data.wrt_noblks_wrtn_cntr"
-	Set gtmtypes("sgmnt_data",310,"off")=3276
-	Set gtmtypes("sgmnt_data",310,"len")=4
-	Set gtmtypes("sgmnt_data",310,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wrt_noblks_wrtn_cntr")=310
-	Set gtmtypes("sgmnt_data",311,"name")="sgmnt_data.reserved_bgtrcrec1_cntr"
-	Set gtmtypes("sgmnt_data",311,"off")=3280
-	Set gtmtypes("sgmnt_data",311,"len")=4
-	Set gtmtypes("sgmnt_data",311,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","reserved_bgtrcrec1_cntr")=311
-	Set gtmtypes("sgmnt_data",312,"name")="sgmnt_data.reserved_bgtrcrec2_cntr"
-	Set gtmtypes("sgmnt_data",312,"off")=3284
+	Set gtmtypfldindx("sgmnt_data","t_qread_ripsleep_cnt_tn")=301
+	Set gtmtypes("sgmnt_data",302,"name")="sgmnt_data.t_qread_ripsleep_nblks_tn"
+	Set gtmtypes("sgmnt_data",302,"off")=3128
+	Set gtmtypes("sgmnt_data",302,"len")=8
+	Set gtmtypes("sgmnt_data",302,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","t_qread_ripsleep_nblks_tn")=302
+	Set gtmtypes("sgmnt_data",303,"name")="sgmnt_data.wcs_wtfini_invoked_tn"
+	Set gtmtypes("sgmnt_data",303,"off")=3136
+	Set gtmtypes("sgmnt_data",303,"len")=8
+	Set gtmtypes("sgmnt_data",303,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","wcs_wtfini_invoked_tn")=303
+	Set gtmtypes("sgmnt_data",304,"name")="sgmnt_data.wcs_wterror_invoked_tn"
+	Set gtmtypes("sgmnt_data",304,"off")=3144
+	Set gtmtypes("sgmnt_data",304,"len")=8
+	Set gtmtypes("sgmnt_data",304,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","wcs_wterror_invoked_tn")=304
+	Set gtmtypes("sgmnt_data",305,"name")="sgmnt_data.wcs_wt_restart_invoked_tn"
+	Set gtmtypes("sgmnt_data",305,"off")=3152
+	Set gtmtypes("sgmnt_data",305,"len")=8
+	Set gtmtypes("sgmnt_data",305,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","wcs_wt_restart_invoked_tn")=305
+	Set gtmtypes("sgmnt_data",306,"name")="sgmnt_data.wcs_wt_restart_eagain_tn"
+	Set gtmtypes("sgmnt_data",306,"off")=3160
+	Set gtmtypes("sgmnt_data",306,"len")=8
+	Set gtmtypes("sgmnt_data",306,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","wcs_wt_restart_eagain_tn")=306
+	Set gtmtypes("sgmnt_data",307,"name")="sgmnt_data.wcs_wt_restart_reinsert_tn"
+	Set gtmtypes("sgmnt_data",307,"off")=3168
+	Set gtmtypes("sgmnt_data",307,"len")=8
+	Set gtmtypes("sgmnt_data",307,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","wcs_wt_restart_reinsert_tn")=307
+	Set gtmtypes("sgmnt_data",308,"name")="sgmnt_data.wcs_wtstart_eagain_tn"
+	Set gtmtypes("sgmnt_data",308,"off")=3176
+	Set gtmtypes("sgmnt_data",308,"len")=8
+	Set gtmtypes("sgmnt_data",308,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","wcs_wtstart_eagain_tn")=308
+	Set gtmtypes("sgmnt_data",309,"name")="sgmnt_data.wcs_wtstart_eagain_incrit_tn"
+	Set gtmtypes("sgmnt_data",309,"off")=3184
+	Set gtmtypes("sgmnt_data",309,"len")=8
+	Set gtmtypes("sgmnt_data",309,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","wcs_wtstart_eagain_incrit_tn")=309
+	Set gtmtypes("sgmnt_data",310,"name")="sgmnt_data.async_restart_eagain_tn"
+	Set gtmtypes("sgmnt_data",310,"off")=3192
+	Set gtmtypes("sgmnt_data",310,"len")=8
+	Set gtmtypes("sgmnt_data",310,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","async_restart_eagain_tn")=310
+	Set gtmtypes("sgmnt_data",311,"name")="sgmnt_data.bg_trc_rec_tn_filler"
+	Set gtmtypes("sgmnt_data",311,"off")=3200
+	Set gtmtypes("sgmnt_data",311,"len")=48
+	Set gtmtypes("sgmnt_data",311,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","bg_trc_rec_tn_filler")=311
+	Set gtmtypes("sgmnt_data",312,"name")="sgmnt_data.total_buffer_flush_cntr"
+	Set gtmtypes("sgmnt_data",312,"off")=3248
 	Set gtmtypes("sgmnt_data",312,"len")=4
 	Set gtmtypes("sgmnt_data",312,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","reserved_bgtrcrec2_cntr")=312
-	Set gtmtypes("sgmnt_data",313,"name")="sgmnt_data.reserved_bgtrcrec3_cntr"
-	Set gtmtypes("sgmnt_data",313,"off")=3288
+	Set gtmtypfldindx("sgmnt_data","total_buffer_flush_cntr")=312
+	Set gtmtypes("sgmnt_data",313,"name")="sgmnt_data.bufct_buffer_flush_cntr"
+	Set gtmtypes("sgmnt_data",313,"off")=3252
 	Set gtmtypes("sgmnt_data",313,"len")=4
 	Set gtmtypes("sgmnt_data",313,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","reserved_bgtrcrec3_cntr")=313
-	Set gtmtypes("sgmnt_data",314,"name")="sgmnt_data.lost_block_recovery_cntr"
-	Set gtmtypes("sgmnt_data",314,"off")=3292
+	Set gtmtypfldindx("sgmnt_data","bufct_buffer_flush_cntr")=313
+	Set gtmtypes("sgmnt_data",314,"name")="sgmnt_data.bufct_buffer_flush_loop_cntr"
+	Set gtmtypes("sgmnt_data",314,"off")=3256
 	Set gtmtypes("sgmnt_data",314,"len")=4
 	Set gtmtypes("sgmnt_data",314,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","lost_block_recovery_cntr")=314
-	Set gtmtypes("sgmnt_data",315,"name")="sgmnt_data.wc_blocked_onln_rlbk_cntr"
-	Set gtmtypes("sgmnt_data",315,"off")=3296
+	Set gtmtypfldindx("sgmnt_data","bufct_buffer_flush_loop_cntr")=314
+	Set gtmtypes("sgmnt_data",315,"name")="sgmnt_data.wrt_calls_cntr"
+	Set gtmtypes("sgmnt_data",315,"off")=3260
 	Set gtmtypes("sgmnt_data",315,"len")=4
 	Set gtmtypes("sgmnt_data",315,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_onln_rlbk_cntr")=315
-	Set gtmtypes("sgmnt_data",316,"name")="sgmnt_data.stale_cntr"
-	Set gtmtypes("sgmnt_data",316,"off")=3300
+	Set gtmtypfldindx("sgmnt_data","wrt_calls_cntr")=315
+	Set gtmtypes("sgmnt_data",316,"name")="sgmnt_data.wrt_count_cntr"
+	Set gtmtypes("sgmnt_data",316,"off")=3264
 	Set gtmtypes("sgmnt_data",316,"len")=4
 	Set gtmtypes("sgmnt_data",316,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","stale_cntr")=316
-	Set gtmtypes("sgmnt_data",317,"name")="sgmnt_data.starved_cntr"
-	Set gtmtypes("sgmnt_data",317,"off")=3304
+	Set gtmtypfldindx("sgmnt_data","wrt_count_cntr")=316
+	Set gtmtypes("sgmnt_data",317,"name")="sgmnt_data.wrt_blocked_cntr"
+	Set gtmtypes("sgmnt_data",317,"off")=3268
 	Set gtmtypes("sgmnt_data",317,"len")=4
 	Set gtmtypes("sgmnt_data",317,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","starved_cntr")=317
-	Set gtmtypes("sgmnt_data",318,"name")="sgmnt_data.stale_timer_started_cntr"
-	Set gtmtypes("sgmnt_data",318,"off")=3308
+	Set gtmtypfldindx("sgmnt_data","wrt_blocked_cntr")=317
+	Set gtmtypes("sgmnt_data",318,"name")="sgmnt_data.wrt_busy_cntr"
+	Set gtmtypes("sgmnt_data",318,"off")=3272
 	Set gtmtypes("sgmnt_data",318,"len")=4
 	Set gtmtypes("sgmnt_data",318,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","stale_timer_started_cntr")=318
-	Set gtmtypes("sgmnt_data",319,"name")="sgmnt_data.stale_timer_pop_cntr"
-	Set gtmtypes("sgmnt_data",319,"off")=3312
+	Set gtmtypfldindx("sgmnt_data","wrt_busy_cntr")=318
+	Set gtmtypes("sgmnt_data",319,"name")="sgmnt_data.wrt_noblks_wrtn_cntr"
+	Set gtmtypes("sgmnt_data",319,"off")=3276
 	Set gtmtypes("sgmnt_data",319,"len")=4
 	Set gtmtypes("sgmnt_data",319,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","stale_timer_pop_cntr")=319
-	Set gtmtypes("sgmnt_data",320,"name")="sgmnt_data.stale_process_defer_cntr"
-	Set gtmtypes("sgmnt_data",320,"off")=3316
+	Set gtmtypfldindx("sgmnt_data","wrt_noblks_wrtn_cntr")=319
+	Set gtmtypes("sgmnt_data",320,"name")="sgmnt_data.reserved_bgtrcrec1_cntr"
+	Set gtmtypes("sgmnt_data",320,"off")=3280
 	Set gtmtypes("sgmnt_data",320,"len")=4
 	Set gtmtypes("sgmnt_data",320,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","stale_process_defer_cntr")=320
-	Set gtmtypes("sgmnt_data",321,"name")="sgmnt_data.stale_defer_processed_cntr"
-	Set gtmtypes("sgmnt_data",321,"off")=3320
+	Set gtmtypfldindx("sgmnt_data","reserved_bgtrcrec1_cntr")=320
+	Set gtmtypes("sgmnt_data",321,"name")="sgmnt_data.reserved_bgtrcrec2_cntr"
+	Set gtmtypes("sgmnt_data",321,"off")=3284
 	Set gtmtypes("sgmnt_data",321,"len")=4
 	Set gtmtypes("sgmnt_data",321,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","stale_defer_processed_cntr")=321
-	Set gtmtypes("sgmnt_data",322,"name")="sgmnt_data.spcfc_buffer_flush_cntr"
-	Set gtmtypes("sgmnt_data",322,"off")=3324
+	Set gtmtypfldindx("sgmnt_data","reserved_bgtrcrec2_cntr")=321
+	Set gtmtypes("sgmnt_data",322,"name")="sgmnt_data.reserved_bgtrcrec3_cntr"
+	Set gtmtypes("sgmnt_data",322,"off")=3288
 	Set gtmtypes("sgmnt_data",322,"len")=4
 	Set gtmtypes("sgmnt_data",322,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","spcfc_buffer_flush_cntr")=322
-	Set gtmtypes("sgmnt_data",323,"name")="sgmnt_data.spcfc_buffer_flush_loop_cntr"
-	Set gtmtypes("sgmnt_data",323,"off")=3328
+	Set gtmtypfldindx("sgmnt_data","reserved_bgtrcrec3_cntr")=322
+	Set gtmtypes("sgmnt_data",323,"name")="sgmnt_data.lost_block_recovery_cntr"
+	Set gtmtypes("sgmnt_data",323,"off")=3292
 	Set gtmtypes("sgmnt_data",323,"len")=4
 	Set gtmtypes("sgmnt_data",323,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","spcfc_buffer_flush_loop_cntr")=323
-	Set gtmtypes("sgmnt_data",324,"name")="sgmnt_data.spcfc_buffer_flush_retries_cntr"
-	Set gtmtypes("sgmnt_data",324,"off")=3332
+	Set gtmtypfldindx("sgmnt_data","lost_block_recovery_cntr")=323
+	Set gtmtypes("sgmnt_data",324,"name")="sgmnt_data.wc_blocked_onln_rlbk_cntr"
+	Set gtmtypes("sgmnt_data",324,"off")=3296
 	Set gtmtypes("sgmnt_data",324,"len")=4
 	Set gtmtypes("sgmnt_data",324,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","spcfc_buffer_flush_retries_cntr")=324
-	Set gtmtypes("sgmnt_data",325,"name")="sgmnt_data.spcfc_buffer_flushed_during_lockwait_cntr"
-	Set gtmtypes("sgmnt_data",325,"off")=3336
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_onln_rlbk_cntr")=324
+	Set gtmtypes("sgmnt_data",325,"name")="sgmnt_data.stale_cntr"
+	Set gtmtypes("sgmnt_data",325,"off")=3300
 	Set gtmtypes("sgmnt_data",325,"len")=4
 	Set gtmtypes("sgmnt_data",325,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","spcfc_buffer_flushed_during_lockwait_cntr")=325
-	Set gtmtypes("sgmnt_data",326,"name")="sgmnt_data.tp_crit_retries_cntr"
-	Set gtmtypes("sgmnt_data",326,"off")=3340
+	Set gtmtypfldindx("sgmnt_data","stale_cntr")=325
+	Set gtmtypes("sgmnt_data",326,"name")="sgmnt_data.starved_cntr"
+	Set gtmtypes("sgmnt_data",326,"off")=3304
 	Set gtmtypes("sgmnt_data",326,"len")=4
 	Set gtmtypes("sgmnt_data",326,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","tp_crit_retries_cntr")=326
-	Set gtmtypes("sgmnt_data",327,"name")="sgmnt_data.db_csh_getn_flush_dirty_cntr"
-	Set gtmtypes("sgmnt_data",327,"off")=3344
+	Set gtmtypfldindx("sgmnt_data","starved_cntr")=326
+	Set gtmtypes("sgmnt_data",327,"name")="sgmnt_data.stale_timer_started_cntr"
+	Set gtmtypes("sgmnt_data",327,"off")=3308
 	Set gtmtypes("sgmnt_data",327,"len")=4
 	Set gtmtypes("sgmnt_data",327,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","db_csh_getn_flush_dirty_cntr")=327
-	Set gtmtypes("sgmnt_data",328,"name")="sgmnt_data.db_csh_getn_rip_wait_cntr"
-	Set gtmtypes("sgmnt_data",328,"off")=3348
+	Set gtmtypfldindx("sgmnt_data","stale_timer_started_cntr")=327
+	Set gtmtypes("sgmnt_data",328,"name")="sgmnt_data.stale_timer_pop_cntr"
+	Set gtmtypes("sgmnt_data",328,"off")=3312
 	Set gtmtypes("sgmnt_data",328,"len")=4
 	Set gtmtypes("sgmnt_data",328,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","db_csh_getn_rip_wait_cntr")=328
-	Set gtmtypes("sgmnt_data",329,"name")="sgmnt_data.db_csh_getn_buf_owner_stuck_cntr"
-	Set gtmtypes("sgmnt_data",329,"off")=3352
+	Set gtmtypfldindx("sgmnt_data","stale_timer_pop_cntr")=328
+	Set gtmtypes("sgmnt_data",329,"name")="sgmnt_data.stale_process_defer_cntr"
+	Set gtmtypes("sgmnt_data",329,"off")=3316
 	Set gtmtypes("sgmnt_data",329,"len")=4
 	Set gtmtypes("sgmnt_data",329,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","db_csh_getn_buf_owner_stuck_cntr")=329
-	Set gtmtypes("sgmnt_data",330,"name")="sgmnt_data.db_csh_getn_out_of_design_cntr"
-	Set gtmtypes("sgmnt_data",330,"off")=3356
+	Set gtmtypfldindx("sgmnt_data","stale_process_defer_cntr")=329
+	Set gtmtypes("sgmnt_data",330,"name")="sgmnt_data.stale_defer_processed_cntr"
+	Set gtmtypes("sgmnt_data",330,"off")=3320
 	Set gtmtypes("sgmnt_data",330,"len")=4
 	Set gtmtypes("sgmnt_data",330,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","db_csh_getn_out_of_design_cntr")=330
-	Set gtmtypes("sgmnt_data",331,"name")="sgmnt_data.t_qread_buf_owner_stuck_cntr"
-	Set gtmtypes("sgmnt_data",331,"off")=3360
+	Set gtmtypfldindx("sgmnt_data","stale_defer_processed_cntr")=330
+	Set gtmtypes("sgmnt_data",331,"name")="sgmnt_data.spcfc_buffer_flush_cntr"
+	Set gtmtypes("sgmnt_data",331,"off")=3324
 	Set gtmtypes("sgmnt_data",331,"len")=4
 	Set gtmtypes("sgmnt_data",331,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","t_qread_buf_owner_stuck_cntr")=331
-	Set gtmtypes("sgmnt_data",332,"name")="sgmnt_data.t_qread_out_of_design_cntr"
-	Set gtmtypes("sgmnt_data",332,"off")=3364
+	Set gtmtypfldindx("sgmnt_data","spcfc_buffer_flush_cntr")=331
+	Set gtmtypes("sgmnt_data",332,"name")="sgmnt_data.spcfc_buffer_flush_loop_cntr"
+	Set gtmtypes("sgmnt_data",332,"off")=3328
 	Set gtmtypes("sgmnt_data",332,"len")=4
 	Set gtmtypes("sgmnt_data",332,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","t_qread_out_of_design_cntr")=332
-	Set gtmtypes("sgmnt_data",333,"name")="sgmnt_data.bt_put_flush_dirty_cntr"
-	Set gtmtypes("sgmnt_data",333,"off")=3368
+	Set gtmtypfldindx("sgmnt_data","spcfc_buffer_flush_loop_cntr")=332
+	Set gtmtypes("sgmnt_data",333,"name")="sgmnt_data.spcfc_buffer_flush_retries_cntr"
+	Set gtmtypes("sgmnt_data",333,"off")=3332
 	Set gtmtypes("sgmnt_data",333,"len")=4
 	Set gtmtypes("sgmnt_data",333,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","bt_put_flush_dirty_cntr")=333
-	Set gtmtypes("sgmnt_data",334,"name")="sgmnt_data.mlock_wakeups_cntr"
-	Set gtmtypes("sgmnt_data",334,"off")=3372
+	Set gtmtypfldindx("sgmnt_data","spcfc_buffer_flush_retries_cntr")=333
+	Set gtmtypes("sgmnt_data",334,"name")="sgmnt_data.spcfc_buffer_flushed_during_lockwait_cntr"
+	Set gtmtypes("sgmnt_data",334,"off")=3336
 	Set gtmtypes("sgmnt_data",334,"len")=4
 	Set gtmtypes("sgmnt_data",334,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","mlock_wakeups_cntr")=334
-	Set gtmtypes("sgmnt_data",335,"name")="sgmnt_data.wc_blocked_wcs_recover_invoked_cntr"
-	Set gtmtypes("sgmnt_data",335,"off")=3376
+	Set gtmtypfldindx("sgmnt_data","spcfc_buffer_flushed_during_lockwait_cntr")=334
+	Set gtmtypes("sgmnt_data",335,"name")="sgmnt_data.tp_crit_retries_cntr"
+	Set gtmtypes("sgmnt_data",335,"off")=3340
 	Set gtmtypes("sgmnt_data",335,"len")=4
 	Set gtmtypes("sgmnt_data",335,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_recover_invoked_cntr")=335
-	Set gtmtypes("sgmnt_data",336,"name")="sgmnt_data.wc_blocked_wcs_verify_passed_cntr"
-	Set gtmtypes("sgmnt_data",336,"off")=3380
+	Set gtmtypfldindx("sgmnt_data","tp_crit_retries_cntr")=335
+	Set gtmtypes("sgmnt_data",336,"name")="sgmnt_data.db_csh_getn_flush_dirty_cntr"
+	Set gtmtypes("sgmnt_data",336,"off")=3344
 	Set gtmtypes("sgmnt_data",336,"len")=4
 	Set gtmtypes("sgmnt_data",336,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_verify_passed_cntr")=336
-	Set gtmtypes("sgmnt_data",337,"name")="sgmnt_data.wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr"
-	Set gtmtypes("sgmnt_data",337,"off")=3384
+	Set gtmtypfldindx("sgmnt_data","db_csh_getn_flush_dirty_cntr")=336
+	Set gtmtypes("sgmnt_data",337,"name")="sgmnt_data.db_csh_getn_rip_wait_cntr"
+	Set gtmtypes("sgmnt_data",337,"off")=3348
 	Set gtmtypes("sgmnt_data",337,"len")=4
 	Set gtmtypes("sgmnt_data",337,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr")=337
-	Set gtmtypes("sgmnt_data",338,"name")="sgmnt_data.wc_blocked_t_qread_db_csh_get_invalid_blk_cntr"
-	Set gtmtypes("sgmnt_data",338,"off")=3388
+	Set gtmtypfldindx("sgmnt_data","db_csh_getn_rip_wait_cntr")=337
+	Set gtmtypes("sgmnt_data",338,"name")="sgmnt_data.db_csh_getn_buf_owner_stuck_cntr"
+	Set gtmtypes("sgmnt_data",338,"off")=3352
 	Set gtmtypes("sgmnt_data",338,"len")=4
 	Set gtmtypes("sgmnt_data",338,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_db_csh_get_invalid_blk_cntr")=338
-	Set gtmtypes("sgmnt_data",339,"name")="sgmnt_data.wc_blocked_db_csh_getn_loopexceed_cntr"
-	Set gtmtypes("sgmnt_data",339,"off")=3392
+	Set gtmtypfldindx("sgmnt_data","db_csh_getn_buf_owner_stuck_cntr")=338
+	Set gtmtypes("sgmnt_data",339,"name")="sgmnt_data.db_csh_getn_out_of_design_cntr"
+	Set gtmtypes("sgmnt_data",339,"off")=3356
 	Set gtmtypes("sgmnt_data",339,"len")=4
 	Set gtmtypes("sgmnt_data",339,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_db_csh_getn_loopexceed_cntr")=339
-	Set gtmtypes("sgmnt_data",340,"name")="sgmnt_data.wc_blocked_db_csh_getn_wcsstarvewrt_cntr"
-	Set gtmtypes("sgmnt_data",340,"off")=3396
+	Set gtmtypfldindx("sgmnt_data","db_csh_getn_out_of_design_cntr")=339
+	Set gtmtypes("sgmnt_data",340,"name")="sgmnt_data.t_qread_buf_owner_stuck_cntr"
+	Set gtmtypes("sgmnt_data",340,"off")=3360
 	Set gtmtypes("sgmnt_data",340,"len")=4
 	Set gtmtypes("sgmnt_data",340,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_db_csh_getn_wcsstarvewrt_cntr")=340
-	Set gtmtypes("sgmnt_data",341,"name")="sgmnt_data.wc_blocked_db_csh_get_cntr"
-	Set gtmtypes("sgmnt_data",341,"off")=3400
+	Set gtmtypfldindx("sgmnt_data","t_qread_buf_owner_stuck_cntr")=340
+	Set gtmtypes("sgmnt_data",341,"name")="sgmnt_data.t_qread_out_of_design_cntr"
+	Set gtmtypes("sgmnt_data",341,"off")=3364
 	Set gtmtypes("sgmnt_data",341,"len")=4
 	Set gtmtypes("sgmnt_data",341,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_db_csh_get_cntr")=341
-	Set gtmtypes("sgmnt_data",342,"name")="sgmnt_data.wc_blocked_tp_tend_wcsgetspace_cntr"
-	Set gtmtypes("sgmnt_data",342,"off")=3404
+	Set gtmtypfldindx("sgmnt_data","t_qread_out_of_design_cntr")=341
+	Set gtmtypes("sgmnt_data",342,"name")="sgmnt_data.bt_put_flush_dirty_cntr"
+	Set gtmtypes("sgmnt_data",342,"off")=3368
 	Set gtmtypes("sgmnt_data",342,"len")=4
 	Set gtmtypes("sgmnt_data",342,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_wcsgetspace_cntr")=342
-	Set gtmtypes("sgmnt_data",343,"name")="sgmnt_data.wc_blocked_tp_tend_t1_cntr"
-	Set gtmtypes("sgmnt_data",343,"off")=3408
+	Set gtmtypfldindx("sgmnt_data","bt_put_flush_dirty_cntr")=342
+	Set gtmtypes("sgmnt_data",343,"name")="sgmnt_data.mlock_wakeups_cntr"
+	Set gtmtypes("sgmnt_data",343,"off")=3372
 	Set gtmtypes("sgmnt_data",343,"len")=4
 	Set gtmtypes("sgmnt_data",343,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_t1_cntr")=343
-	Set gtmtypes("sgmnt_data",344,"name")="sgmnt_data.wc_blocked_tp_tend_bitmap_cntr"
-	Set gtmtypes("sgmnt_data",344,"off")=3412
+	Set gtmtypfldindx("sgmnt_data","mlock_wakeups_cntr")=343
+	Set gtmtypes("sgmnt_data",344,"name")="sgmnt_data.wc_blocked_wcs_recover_invoked_cntr"
+	Set gtmtypes("sgmnt_data",344,"off")=3376
 	Set gtmtypes("sgmnt_data",344,"len")=4
 	Set gtmtypes("sgmnt_data",344,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_bitmap_cntr")=344
-	Set gtmtypes("sgmnt_data",345,"name")="sgmnt_data.wc_blocked_tp_tend_jnl_cwset_cntr"
-	Set gtmtypes("sgmnt_data",345,"off")=3416
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_recover_invoked_cntr")=344
+	Set gtmtypes("sgmnt_data",345,"name")="sgmnt_data.wc_blocked_wcs_verify_passed_cntr"
+	Set gtmtypes("sgmnt_data",345,"off")=3380
 	Set gtmtypes("sgmnt_data",345,"len")=4
 	Set gtmtypes("sgmnt_data",345,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_jnl_cwset_cntr")=345
-	Set gtmtypes("sgmnt_data",346,"name")="sgmnt_data.wc_blocked_tp_tend_jnl_wcsflu_cntr"
-	Set gtmtypes("sgmnt_data",346,"off")=3420
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_verify_passed_cntr")=345
+	Set gtmtypes("sgmnt_data",346,"name")="sgmnt_data.wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr"
+	Set gtmtypes("sgmnt_data",346,"off")=3384
 	Set gtmtypes("sgmnt_data",346,"len")=4
 	Set gtmtypes("sgmnt_data",346,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_jnl_wcsflu_cntr")=346
-	Set gtmtypes("sgmnt_data",347,"name")="sgmnt_data.wc_blocked_t_end_hist_cntr"
-	Set gtmtypes("sgmnt_data",347,"off")=3424
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr")=346
+	Set gtmtypes("sgmnt_data",347,"name")="sgmnt_data.wc_blocked_t_qread_db_csh_get_invalid_blk_cntr"
+	Set gtmtypes("sgmnt_data",347,"off")=3388
 	Set gtmtypes("sgmnt_data",347,"len")=4
 	Set gtmtypes("sgmnt_data",347,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_hist_cntr")=347
-	Set gtmtypes("sgmnt_data",348,"name")="sgmnt_data.wc_blocked_t_end_hist1_nullbt_cntr"
-	Set gtmtypes("sgmnt_data",348,"off")=3428
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_db_csh_get_invalid_blk_cntr")=347
+	Set gtmtypes("sgmnt_data",348,"name")="sgmnt_data.wc_blocked_db_csh_getn_loopexceed_cntr"
+	Set gtmtypes("sgmnt_data",348,"off")=3392
 	Set gtmtypes("sgmnt_data",348,"len")=4
 	Set gtmtypes("sgmnt_data",348,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_hist1_nullbt_cntr")=348
-	Set gtmtypes("sgmnt_data",349,"name")="sgmnt_data.wc_blocked_t_end_hist1_nonnullbt_cntr"
-	Set gtmtypes("sgmnt_data",349,"off")=3432
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_db_csh_getn_loopexceed_cntr")=348
+	Set gtmtypes("sgmnt_data",349,"name")="sgmnt_data.wc_blocked_db_csh_getn_wcsstarvewrt_cntr"
+	Set gtmtypes("sgmnt_data",349,"off")=3396
 	Set gtmtypes("sgmnt_data",349,"len")=4
 	Set gtmtypes("sgmnt_data",349,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_hist1_nonnullbt_cntr")=349
-	Set gtmtypes("sgmnt_data",350,"name")="sgmnt_data.wc_blocked_t_end_bitmap_nullbt_cntr"
-	Set gtmtypes("sgmnt_data",350,"off")=3436
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_db_csh_getn_wcsstarvewrt_cntr")=349
+	Set gtmtypes("sgmnt_data",350,"name")="sgmnt_data.wc_blocked_db_csh_get_cntr"
+	Set gtmtypes("sgmnt_data",350,"off")=3400
 	Set gtmtypes("sgmnt_data",350,"len")=4
 	Set gtmtypes("sgmnt_data",350,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_bitmap_nullbt_cntr")=350
-	Set gtmtypes("sgmnt_data",351,"name")="sgmnt_data.wc_blocked_t_end_bitmap_nonnullbt_cntr"
-	Set gtmtypes("sgmnt_data",351,"off")=3440
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_db_csh_get_cntr")=350
+	Set gtmtypes("sgmnt_data",351,"name")="sgmnt_data.wc_blocked_tp_tend_wcsgetspace_cntr"
+	Set gtmtypes("sgmnt_data",351,"off")=3404
 	Set gtmtypes("sgmnt_data",351,"len")=4
 	Set gtmtypes("sgmnt_data",351,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_bitmap_nonnullbt_cntr")=351
-	Set gtmtypes("sgmnt_data",352,"name")="sgmnt_data.wc_blocked_t_end_jnl_cwset_cntr"
-	Set gtmtypes("sgmnt_data",352,"off")=3444
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_wcsgetspace_cntr")=351
+	Set gtmtypes("sgmnt_data",352,"name")="sgmnt_data.wc_blocked_tp_tend_t1_cntr"
+	Set gtmtypes("sgmnt_data",352,"off")=3408
 	Set gtmtypes("sgmnt_data",352,"len")=4
 	Set gtmtypes("sgmnt_data",352,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_jnl_cwset_cntr")=352
-	Set gtmtypes("sgmnt_data",353,"name")="sgmnt_data.wc_blocked_t_end_jnl_wcsflu_cntr"
-	Set gtmtypes("sgmnt_data",353,"off")=3448
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_t1_cntr")=352
+	Set gtmtypes("sgmnt_data",353,"name")="sgmnt_data.wc_blocked_tp_tend_bitmap_cntr"
+	Set gtmtypes("sgmnt_data",353,"off")=3412
 	Set gtmtypes("sgmnt_data",353,"len")=4
 	Set gtmtypes("sgmnt_data",353,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_jnl_wcsflu_cntr")=353
-	Set gtmtypes("sgmnt_data",354,"name")="sgmnt_data.db_csh_get_too_many_loops_cntr"
-	Set gtmtypes("sgmnt_data",354,"off")=3452
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_bitmap_cntr")=353
+	Set gtmtypes("sgmnt_data",354,"name")="sgmnt_data.wc_blocked_tp_tend_jnl_cwset_cntr"
+	Set gtmtypes("sgmnt_data",354,"off")=3416
 	Set gtmtypes("sgmnt_data",354,"len")=4
 	Set gtmtypes("sgmnt_data",354,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","db_csh_get_too_many_loops_cntr")=354
-	Set gtmtypes("sgmnt_data",355,"name")="sgmnt_data.wc_blocked_tpckh_hist1_nullbt_cntr"
-	Set gtmtypes("sgmnt_data",355,"off")=3456
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_jnl_cwset_cntr")=354
+	Set gtmtypes("sgmnt_data",355,"name")="sgmnt_data.wc_blocked_tp_tend_jnl_wcsflu_cntr"
+	Set gtmtypes("sgmnt_data",355,"off")=3420
 	Set gtmtypes("sgmnt_data",355,"len")=4
 	Set gtmtypes("sgmnt_data",355,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tpckh_hist1_nullbt_cntr")=355
-	Set gtmtypes("sgmnt_data",356,"name")="sgmnt_data.wc_blocked_tpckh_hist1_nonnullbt_cntr"
-	Set gtmtypes("sgmnt_data",356,"off")=3460
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_jnl_wcsflu_cntr")=355
+	Set gtmtypes("sgmnt_data",356,"name")="sgmnt_data.wc_blocked_t_end_hist_cntr"
+	Set gtmtypes("sgmnt_data",356,"off")=3424
 	Set gtmtypes("sgmnt_data",356,"len")=4
 	Set gtmtypes("sgmnt_data",356,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tpckh_hist1_nonnullbt_cntr")=356
-	Set gtmtypes("sgmnt_data",357,"name")="sgmnt_data.jnl_blocked_writer_lost_cntr"
-	Set gtmtypes("sgmnt_data",357,"off")=3464
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_hist_cntr")=356
+	Set gtmtypes("sgmnt_data",357,"name")="sgmnt_data.wc_blocked_t_end_hist1_nullbt_cntr"
+	Set gtmtypes("sgmnt_data",357,"off")=3428
 	Set gtmtypes("sgmnt_data",357,"len")=4
 	Set gtmtypes("sgmnt_data",357,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","jnl_blocked_writer_lost_cntr")=357
-	Set gtmtypes("sgmnt_data",358,"name")="sgmnt_data.jnl_blocked_writer_stuck_cntr"
-	Set gtmtypes("sgmnt_data",358,"off")=3468
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_hist1_nullbt_cntr")=357
+	Set gtmtypes("sgmnt_data",358,"name")="sgmnt_data.wc_blocked_t_end_hist1_nonnullbt_cntr"
+	Set gtmtypes("sgmnt_data",358,"off")=3432
 	Set gtmtypes("sgmnt_data",358,"len")=4
 	Set gtmtypes("sgmnt_data",358,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","jnl_blocked_writer_stuck_cntr")=358
-	Set gtmtypes("sgmnt_data",359,"name")="sgmnt_data.jnl_blocked_writer_blocked_cntr"
-	Set gtmtypes("sgmnt_data",359,"off")=3472
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_hist1_nonnullbt_cntr")=358
+	Set gtmtypes("sgmnt_data",359,"name")="sgmnt_data.wc_blocked_t_end_bitmap_nullbt_cntr"
+	Set gtmtypes("sgmnt_data",359,"off")=3436
 	Set gtmtypes("sgmnt_data",359,"len")=4
 	Set gtmtypes("sgmnt_data",359,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","jnl_blocked_writer_blocked_cntr")=359
-	Set gtmtypes("sgmnt_data",360,"name")="sgmnt_data.n_jnl_fsyncs_cntr"
-	Set gtmtypes("sgmnt_data",360,"off")=3476
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_bitmap_nullbt_cntr")=359
+	Set gtmtypes("sgmnt_data",360,"name")="sgmnt_data.wc_blocked_t_end_bitmap_nonnullbt_cntr"
+	Set gtmtypes("sgmnt_data",360,"off")=3440
 	Set gtmtypes("sgmnt_data",360,"len")=4
 	Set gtmtypes("sgmnt_data",360,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_jnl_fsyncs_cntr")=360
-	Set gtmtypes("sgmnt_data",361,"name")="sgmnt_data.n_jnl_fsync_tries_cntr"
-	Set gtmtypes("sgmnt_data",361,"off")=3480
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_bitmap_nonnullbt_cntr")=360
+	Set gtmtypes("sgmnt_data",361,"name")="sgmnt_data.wc_blocked_t_end_jnl_cwset_cntr"
+	Set gtmtypes("sgmnt_data",361,"off")=3444
 	Set gtmtypes("sgmnt_data",361,"len")=4
 	Set gtmtypes("sgmnt_data",361,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_jnl_fsync_tries_cntr")=361
-	Set gtmtypes("sgmnt_data",362,"name")="sgmnt_data.n_jnl_fsync_recovers_cntr"
-	Set gtmtypes("sgmnt_data",362,"off")=3484
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_jnl_cwset_cntr")=361
+	Set gtmtypes("sgmnt_data",362,"name")="sgmnt_data.wc_blocked_t_end_jnl_wcsflu_cntr"
+	Set gtmtypes("sgmnt_data",362,"off")=3448
 	Set gtmtypes("sgmnt_data",362,"len")=4
 	Set gtmtypes("sgmnt_data",362,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_jnl_fsync_recovers_cntr")=362
-	Set gtmtypes("sgmnt_data",363,"name")="sgmnt_data.n_db_fsyncs_cntr"
-	Set gtmtypes("sgmnt_data",363,"off")=3488
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_jnl_wcsflu_cntr")=362
+	Set gtmtypes("sgmnt_data",363,"name")="sgmnt_data.db_csh_get_too_many_loops_cntr"
+	Set gtmtypes("sgmnt_data",363,"off")=3452
 	Set gtmtypes("sgmnt_data",363,"len")=4
 	Set gtmtypes("sgmnt_data",363,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_db_fsyncs_cntr")=363
-	Set gtmtypes("sgmnt_data",364,"name")="sgmnt_data.n_db_fsyncs_in_crit_cntr"
-	Set gtmtypes("sgmnt_data",364,"off")=3492
+	Set gtmtypfldindx("sgmnt_data","db_csh_get_too_many_loops_cntr")=363
+	Set gtmtypes("sgmnt_data",364,"name")="sgmnt_data.wc_blocked_tpckh_hist1_nullbt_cntr"
+	Set gtmtypes("sgmnt_data",364,"off")=3456
 	Set gtmtypes("sgmnt_data",364,"len")=4
 	Set gtmtypes("sgmnt_data",364,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_db_fsyncs_in_crit_cntr")=364
-	Set gtmtypes("sgmnt_data",365,"name")="sgmnt_data.n_dbsync_timers_cntr"
-	Set gtmtypes("sgmnt_data",365,"off")=3496
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tpckh_hist1_nullbt_cntr")=364
+	Set gtmtypes("sgmnt_data",365,"name")="sgmnt_data.wc_blocked_tpckh_hist1_nonnullbt_cntr"
+	Set gtmtypes("sgmnt_data",365,"off")=3460
 	Set gtmtypes("sgmnt_data",365,"len")=4
 	Set gtmtypes("sgmnt_data",365,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_dbsync_timers_cntr")=365
-	Set gtmtypes("sgmnt_data",366,"name")="sgmnt_data.n_dbsync_writes_cntr"
-	Set gtmtypes("sgmnt_data",366,"off")=3500
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tpckh_hist1_nonnullbt_cntr")=365
+	Set gtmtypes("sgmnt_data",366,"name")="sgmnt_data.jnl_blocked_writer_lost_cntr"
+	Set gtmtypes("sgmnt_data",366,"off")=3464
 	Set gtmtypes("sgmnt_data",366,"len")=4
 	Set gtmtypes("sgmnt_data",366,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_dbsync_writes_cntr")=366
-	Set gtmtypes("sgmnt_data",367,"name")="sgmnt_data.mutex_queue_full_cntr"
-	Set gtmtypes("sgmnt_data",367,"off")=3504
+	Set gtmtypfldindx("sgmnt_data","jnl_blocked_writer_lost_cntr")=366
+	Set gtmtypes("sgmnt_data",367,"name")="sgmnt_data.jnl_blocked_writer_stuck_cntr"
+	Set gtmtypes("sgmnt_data",367,"off")=3468
 	Set gtmtypes("sgmnt_data",367,"len")=4
 	Set gtmtypes("sgmnt_data",367,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","mutex_queue_full_cntr")=367
-	Set gtmtypes("sgmnt_data",368,"name")="sgmnt_data.wcb_bt_put_cntr"
-	Set gtmtypes("sgmnt_data",368,"off")=3508
+	Set gtmtypfldindx("sgmnt_data","jnl_blocked_writer_stuck_cntr")=367
+	Set gtmtypes("sgmnt_data",368,"name")="sgmnt_data.jnl_blocked_writer_blocked_cntr"
+	Set gtmtypes("sgmnt_data",368,"off")=3472
 	Set gtmtypes("sgmnt_data",368,"len")=4
 	Set gtmtypes("sgmnt_data",368,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_bt_put_cntr")=368
-	Set gtmtypes("sgmnt_data",369,"name")="sgmnt_data.wcb_mutex_salvage_cntr"
-	Set gtmtypes("sgmnt_data",369,"off")=3512
+	Set gtmtypfldindx("sgmnt_data","jnl_blocked_writer_blocked_cntr")=368
+	Set gtmtypes("sgmnt_data",369,"name")="sgmnt_data.n_jnl_fsyncs_cntr"
+	Set gtmtypes("sgmnt_data",369,"off")=3476
 	Set gtmtypes("sgmnt_data",369,"len")=4
 	Set gtmtypes("sgmnt_data",369,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_mutex_salvage_cntr")=369
-	Set gtmtypes("sgmnt_data",370,"name")="sgmnt_data.wcb_tp_grab_crit_cntr"
-	Set gtmtypes("sgmnt_data",370,"off")=3516
+	Set gtmtypfldindx("sgmnt_data","n_jnl_fsyncs_cntr")=369
+	Set gtmtypes("sgmnt_data",370,"name")="sgmnt_data.n_jnl_fsync_tries_cntr"
+	Set gtmtypes("sgmnt_data",370,"off")=3480
 	Set gtmtypes("sgmnt_data",370,"len")=4
 	Set gtmtypes("sgmnt_data",370,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_tp_grab_crit_cntr")=370
-	Set gtmtypes("sgmnt_data",371,"name")="sgmnt_data.wcb_t_end_sysops_nocr_invcr_cntr"
-	Set gtmtypes("sgmnt_data",371,"off")=3520
+	Set gtmtypfldindx("sgmnt_data","n_jnl_fsync_tries_cntr")=370
+	Set gtmtypes("sgmnt_data",371,"name")="sgmnt_data.n_jnl_fsync_recovers_cntr"
+	Set gtmtypes("sgmnt_data",371,"off")=3484
 	Set gtmtypes("sgmnt_data",371,"len")=4
 	Set gtmtypes("sgmnt_data",371,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_nocr_invcr_cntr")=371
-	Set gtmtypes("sgmnt_data",372,"name")="sgmnt_data.wcb_t_end_sysops_cr_invcr_cntr"
-	Set gtmtypes("sgmnt_data",372,"off")=3524
+	Set gtmtypfldindx("sgmnt_data","n_jnl_fsync_recovers_cntr")=371
+	Set gtmtypes("sgmnt_data",372,"name")="sgmnt_data.n_db_fsyncs_cntr"
+	Set gtmtypes("sgmnt_data",372,"off")=3488
 	Set gtmtypes("sgmnt_data",372,"len")=4
 	Set gtmtypes("sgmnt_data",372,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_cr_invcr_cntr")=372
-	Set gtmtypes("sgmnt_data",373,"name")="sgmnt_data.wcb_t_end_sysops_rip_wait_cntr"
-	Set gtmtypes("sgmnt_data",373,"off")=3528
+	Set gtmtypfldindx("sgmnt_data","n_db_fsyncs_cntr")=372
+	Set gtmtypes("sgmnt_data",373,"name")="sgmnt_data.n_db_fsyncs_in_crit_cntr"
+	Set gtmtypes("sgmnt_data",373,"off")=3492
 	Set gtmtypes("sgmnt_data",373,"len")=4
 	Set gtmtypes("sgmnt_data",373,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_rip_wait_cntr")=373
-	Set gtmtypes("sgmnt_data",374,"name")="sgmnt_data.wcb_t_end_sysops_dirtyripwait_cntr"
-	Set gtmtypes("sgmnt_data",374,"off")=3532
+	Set gtmtypfldindx("sgmnt_data","n_db_fsyncs_in_crit_cntr")=373
+	Set gtmtypes("sgmnt_data",374,"name")="sgmnt_data.n_dbsync_timers_cntr"
+	Set gtmtypes("sgmnt_data",374,"off")=3496
 	Set gtmtypes("sgmnt_data",374,"len")=4
 	Set gtmtypes("sgmnt_data",374,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirtyripwait_cntr")=374
-	Set gtmtypes("sgmnt_data",375,"name")="sgmnt_data.wcb_gds_rundown_cntr"
-	Set gtmtypes("sgmnt_data",375,"off")=3536
+	Set gtmtypfldindx("sgmnt_data","n_dbsync_timers_cntr")=374
+	Set gtmtypes("sgmnt_data",375,"name")="sgmnt_data.n_dbsync_writes_cntr"
+	Set gtmtypes("sgmnt_data",375,"off")=3500
 	Set gtmtypes("sgmnt_data",375,"len")=4
 	Set gtmtypes("sgmnt_data",375,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_gds_rundown_cntr")=375
-	Set gtmtypes("sgmnt_data",376,"name")="sgmnt_data.wcb_wcs_flu1_cntr"
-	Set gtmtypes("sgmnt_data",376,"off")=3540
+	Set gtmtypfldindx("sgmnt_data","n_dbsync_writes_cntr")=375
+	Set gtmtypes("sgmnt_data",376,"name")="sgmnt_data.mutex_queue_full_cntr"
+	Set gtmtypes("sgmnt_data",376,"off")=3504
 	Set gtmtypes("sgmnt_data",376,"len")=4
 	Set gtmtypes("sgmnt_data",376,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_wcs_flu1_cntr")=376
-	Set gtmtypes("sgmnt_data",377,"name")="sgmnt_data.wcb_mu_back_cntr"
-	Set gtmtypes("sgmnt_data",377,"off")=3544
+	Set gtmtypfldindx("sgmnt_data","mutex_queue_full_cntr")=376
+	Set gtmtypes("sgmnt_data",377,"name")="sgmnt_data.wcb_bt_put_cntr"
+	Set gtmtypes("sgmnt_data",377,"off")=3508
 	Set gtmtypes("sgmnt_data",377,"len")=4
 	Set gtmtypes("sgmnt_data",377,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_mu_back_cntr")=377
-	Set gtmtypes("sgmnt_data",378,"name")="sgmnt_data.wcb_t_end_sysops_dirty_invcr_cntr"
-	Set gtmtypes("sgmnt_data",378,"off")=3548
+	Set gtmtypfldindx("sgmnt_data","wcb_bt_put_cntr")=377
+	Set gtmtypes("sgmnt_data",378,"name")="sgmnt_data.wcb_mutex_salvage_cntr"
+	Set gtmtypes("sgmnt_data",378,"off")=3512
 	Set gtmtypes("sgmnt_data",378,"len")=4
 	Set gtmtypes("sgmnt_data",378,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirty_invcr_cntr")=378
-	Set gtmtypes("sgmnt_data",379,"name")="sgmnt_data.wcb_t_end_sysops_wtfini_fail_cntr"
-	Set gtmtypes("sgmnt_data",379,"off")=3552
+	Set gtmtypfldindx("sgmnt_data","wcb_mutex_salvage_cntr")=378
+	Set gtmtypes("sgmnt_data",379,"name")="sgmnt_data.wcb_tp_grab_crit_cntr"
+	Set gtmtypes("sgmnt_data",379,"off")=3516
 	Set gtmtypes("sgmnt_data",379,"len")=4
 	Set gtmtypes("sgmnt_data",379,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_wtfini_fail_cntr")=379
-	Set gtmtypes("sgmnt_data",380,"name")="sgmnt_data.wcb_t_end_sysops_twin_stuck_cntr"
-	Set gtmtypes("sgmnt_data",380,"off")=3556
+	Set gtmtypfldindx("sgmnt_data","wcb_tp_grab_crit_cntr")=379
+	Set gtmtypes("sgmnt_data",380,"name")="sgmnt_data.wcb_t_end_sysops_nocr_invcr_cntr"
+	Set gtmtypes("sgmnt_data",380,"off")=3520
 	Set gtmtypes("sgmnt_data",380,"len")=4
 	Set gtmtypes("sgmnt_data",380,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_twin_stuck_cntr")=380
-	Set gtmtypes("sgmnt_data",381,"name")="sgmnt_data.db_csh_getn_wrt_latch_stuck_cntr"
-	Set gtmtypes("sgmnt_data",381,"off")=3560
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_nocr_invcr_cntr")=380
+	Set gtmtypes("sgmnt_data",381,"name")="sgmnt_data.wcb_t_end_sysops_cr_invcr_cntr"
+	Set gtmtypes("sgmnt_data",381,"off")=3524
 	Set gtmtypes("sgmnt_data",381,"len")=4
 	Set gtmtypes("sgmnt_data",381,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","db_csh_getn_wrt_latch_stuck_cntr")=381
-	Set gtmtypes("sgmnt_data",382,"name")="sgmnt_data.wcb_secshr_db_clnup_now_crit_cntr"
-	Set gtmtypes("sgmnt_data",382,"off")=3564
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_cr_invcr_cntr")=381
+	Set gtmtypes("sgmnt_data",382,"name")="sgmnt_data.wcb_t_end_sysops_rip_wait_cntr"
+	Set gtmtypes("sgmnt_data",382,"off")=3528
 	Set gtmtypes("sgmnt_data",382,"len")=4
 	Set gtmtypes("sgmnt_data",382,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_secshr_db_clnup_now_crit_cntr")=382
-	Set gtmtypes("sgmnt_data",383,"name")="sgmnt_data.wc_blocked_t_qread_bad_bt_index1_cntr"
-	Set gtmtypes("sgmnt_data",383,"off")=3568
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_rip_wait_cntr")=382
+	Set gtmtypes("sgmnt_data",383,"name")="sgmnt_data.wcb_t_end_sysops_dirtyripwait_cntr"
+	Set gtmtypes("sgmnt_data",383,"off")=3532
 	Set gtmtypes("sgmnt_data",383,"len")=4
 	Set gtmtypes("sgmnt_data",383,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_bad_bt_index1_cntr")=383
-	Set gtmtypes("sgmnt_data",384,"name")="sgmnt_data.wc_blocked_t_qread_bad_bt_index2_cntr"
-	Set gtmtypes("sgmnt_data",384,"off")=3572
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirtyripwait_cntr")=383
+	Set gtmtypes("sgmnt_data",384,"name")="sgmnt_data.wcb_gds_rundown_cntr"
+	Set gtmtypes("sgmnt_data",384,"off")=3536
 	Set gtmtypes("sgmnt_data",384,"len")=4
 	Set gtmtypes("sgmnt_data",384,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_bad_bt_index2_cntr")=384
-	Set gtmtypes("sgmnt_data",385,"name")="sgmnt_data.wc_blocked_t_end_crbtmismatch1_cntr"
-	Set gtmtypes("sgmnt_data",385,"off")=3576
+	Set gtmtypfldindx("sgmnt_data","wcb_gds_rundown_cntr")=384
+	Set gtmtypes("sgmnt_data",385,"name")="sgmnt_data.wcb_wcs_flu1_cntr"
+	Set gtmtypes("sgmnt_data",385,"off")=3540
 	Set gtmtypes("sgmnt_data",385,"len")=4
 	Set gtmtypes("sgmnt_data",385,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_crbtmismatch1_cntr")=385
-	Set gtmtypes("sgmnt_data",386,"name")="sgmnt_data.wc_blocked_t_end_crbtmismatch2_cntr"
-	Set gtmtypes("sgmnt_data",386,"off")=3580
+	Set gtmtypfldindx("sgmnt_data","wcb_wcs_flu1_cntr")=385
+	Set gtmtypes("sgmnt_data",386,"name")="sgmnt_data.wcb_mu_back_cntr"
+	Set gtmtypes("sgmnt_data",386,"off")=3544
 	Set gtmtypes("sgmnt_data",386,"len")=4
 	Set gtmtypes("sgmnt_data",386,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_crbtmismatch2_cntr")=386
-	Set gtmtypes("sgmnt_data",387,"name")="sgmnt_data.wc_blocked_t_end_crbtmismatch3_cntr"
-	Set gtmtypes("sgmnt_data",387,"off")=3584
+	Set gtmtypfldindx("sgmnt_data","wcb_mu_back_cntr")=386
+	Set gtmtypes("sgmnt_data",387,"name")="sgmnt_data.wcb_t_end_sysops_dirty_invcr_cntr"
+	Set gtmtypes("sgmnt_data",387,"off")=3548
 	Set gtmtypes("sgmnt_data",387,"len")=4
 	Set gtmtypes("sgmnt_data",387,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_crbtmismatch3_cntr")=387
-	Set gtmtypes("sgmnt_data",388,"name")="sgmnt_data.wc_blocked_tp_tend_crbtmismatch1_cntr"
-	Set gtmtypes("sgmnt_data",388,"off")=3588
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirty_invcr_cntr")=387
+	Set gtmtypes("sgmnt_data",388,"name")="sgmnt_data.wcb_t_end_sysops_wtfini_fail_cntr"
+	Set gtmtypes("sgmnt_data",388,"off")=3552
 	Set gtmtypes("sgmnt_data",388,"len")=4
 	Set gtmtypes("sgmnt_data",388,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_crbtmismatch1_cntr")=388
-	Set gtmtypes("sgmnt_data",389,"name")="sgmnt_data.wc_blocked_tp_tend_crbtmismatch2_cntr"
-	Set gtmtypes("sgmnt_data",389,"off")=3592
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_wtfini_fail_cntr")=388
+	Set gtmtypes("sgmnt_data",389,"name")="sgmnt_data.wcb_t_end_sysops_twin_stuck_cntr"
+	Set gtmtypes("sgmnt_data",389,"off")=3556
 	Set gtmtypes("sgmnt_data",389,"len")=4
 	Set gtmtypes("sgmnt_data",389,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_crbtmismatch2_cntr")=389
-	Set gtmtypes("sgmnt_data",390,"name")="sgmnt_data.wc_blocked_tp_tend_crbtmismatch3_cntr"
-	Set gtmtypes("sgmnt_data",390,"off")=3596
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_twin_stuck_cntr")=389
+	Set gtmtypes("sgmnt_data",390,"name")="sgmnt_data.db_csh_getn_wrt_latch_stuck_cntr"
+	Set gtmtypes("sgmnt_data",390,"off")=3560
 	Set gtmtypes("sgmnt_data",390,"len")=4
 	Set gtmtypes("sgmnt_data",390,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_crbtmismatch3_cntr")=390
-	Set gtmtypes("sgmnt_data",391,"name")="sgmnt_data.wc_blocked_wcs_wtstart_bad_cr_cntr"
-	Set gtmtypes("sgmnt_data",391,"off")=3600
+	Set gtmtypfldindx("sgmnt_data","db_csh_getn_wrt_latch_stuck_cntr")=390
+	Set gtmtypes("sgmnt_data",391,"name")="sgmnt_data.wcb_secshr_db_clnup_now_crit_cntr"
+	Set gtmtypes("sgmnt_data",391,"off")=3564
 	Set gtmtypes("sgmnt_data",391,"len")=4
 	Set gtmtypes("sgmnt_data",391,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_wtstart_bad_cr_cntr")=391
-	Set gtmtypes("sgmnt_data",392,"name")="sgmnt_data.wc_blocked_wcs_wtfini_bad_cr_cntr"
-	Set gtmtypes("sgmnt_data",392,"off")=3604
+	Set gtmtypfldindx("sgmnt_data","wcb_secshr_db_clnup_now_crit_cntr")=391
+	Set gtmtypes("sgmnt_data",392,"name")="sgmnt_data.wc_blocked_t_qread_bad_bt_index1_cntr"
+	Set gtmtypes("sgmnt_data",392,"off")=3568
 	Set gtmtypes("sgmnt_data",392,"len")=4
 	Set gtmtypes("sgmnt_data",392,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_wtfini_bad_cr_cntr")=392
-	Set gtmtypes("sgmnt_data",393,"name")="sgmnt_data.wc_blocked_bt_get_cntr"
-	Set gtmtypes("sgmnt_data",393,"off")=3608
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_bad_bt_index1_cntr")=392
+	Set gtmtypes("sgmnt_data",393,"name")="sgmnt_data.wc_blocked_t_qread_bad_bt_index2_cntr"
+	Set gtmtypes("sgmnt_data",393,"off")=3572
 	Set gtmtypes("sgmnt_data",393,"len")=4
 	Set gtmtypes("sgmnt_data",393,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_bt_get_cntr")=393
-	Set gtmtypes("sgmnt_data",394,"name")="sgmnt_data.wc_blocked_wcs_cdb_sc_final_retry_cntr"
-	Set gtmtypes("sgmnt_data",394,"off")=3612
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_qread_bad_bt_index2_cntr")=393
+	Set gtmtypes("sgmnt_data",394,"name")="sgmnt_data.wc_blocked_t_end_crbtmismatch1_cntr"
+	Set gtmtypes("sgmnt_data",394,"off")=3576
 	Set gtmtypes("sgmnt_data",394,"len")=4
 	Set gtmtypes("sgmnt_data",394,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_cdb_sc_final_retry_cntr")=394
-	Set gtmtypes("sgmnt_data",395,"name")="sgmnt_data.wcb_bg_update_lckfail1_cntr"
-	Set gtmtypes("sgmnt_data",395,"off")=3616
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_crbtmismatch1_cntr")=394
+	Set gtmtypes("sgmnt_data",395,"name")="sgmnt_data.wc_blocked_t_end_crbtmismatch2_cntr"
+	Set gtmtypes("sgmnt_data",395,"off")=3580
 	Set gtmtypes("sgmnt_data",395,"len")=4
 	Set gtmtypes("sgmnt_data",395,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_bg_update_lckfail1_cntr")=395
-	Set gtmtypes("sgmnt_data",396,"name")="sgmnt_data.wcb_bg_update_lckfail2_cntr"
-	Set gtmtypes("sgmnt_data",396,"off")=3620
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_crbtmismatch2_cntr")=395
+	Set gtmtypes("sgmnt_data",396,"name")="sgmnt_data.wc_blocked_t_end_crbtmismatch3_cntr"
+	Set gtmtypes("sgmnt_data",396,"off")=3584
 	Set gtmtypes("sgmnt_data",396,"len")=4
 	Set gtmtypes("sgmnt_data",396,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_bg_update_lckfail2_cntr")=396
-	Set gtmtypes("sgmnt_data",397,"name")="sgmnt_data.wcb_wtstart_lckfail1_cntr"
-	Set gtmtypes("sgmnt_data",397,"off")=3624
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_t_end_crbtmismatch3_cntr")=396
+	Set gtmtypes("sgmnt_data",397,"name")="sgmnt_data.wc_blocked_tp_tend_crbtmismatch1_cntr"
+	Set gtmtypes("sgmnt_data",397,"off")=3588
 	Set gtmtypes("sgmnt_data",397,"len")=4
 	Set gtmtypes("sgmnt_data",397,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail1_cntr")=397
-	Set gtmtypes("sgmnt_data",398,"name")="sgmnt_data.wcb_wtstart_lckfail2_cntr"
-	Set gtmtypes("sgmnt_data",398,"off")=3628
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_crbtmismatch1_cntr")=397
+	Set gtmtypes("sgmnt_data",398,"name")="sgmnt_data.wc_blocked_tp_tend_crbtmismatch2_cntr"
+	Set gtmtypes("sgmnt_data",398,"off")=3592
 	Set gtmtypes("sgmnt_data",398,"len")=4
 	Set gtmtypes("sgmnt_data",398,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail2_cntr")=398
-	Set gtmtypes("sgmnt_data",399,"name")="sgmnt_data.wcb_wtstart_lckfail3_cntr"
-	Set gtmtypes("sgmnt_data",399,"off")=3632
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_crbtmismatch2_cntr")=398
+	Set gtmtypes("sgmnt_data",399,"name")="sgmnt_data.wc_blocked_tp_tend_crbtmismatch3_cntr"
+	Set gtmtypes("sgmnt_data",399,"off")=3596
 	Set gtmtypes("sgmnt_data",399,"len")=4
 	Set gtmtypes("sgmnt_data",399,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail3_cntr")=399
-	Set gtmtypes("sgmnt_data",400,"name")="sgmnt_data.wcb_wtstart_lckfail4_cntr"
-	Set gtmtypes("sgmnt_data",400,"off")=3636
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_tp_tend_crbtmismatch3_cntr")=399
+	Set gtmtypes("sgmnt_data",400,"name")="sgmnt_data.wc_blocked_wcs_wtstart_bad_cr_cntr"
+	Set gtmtypes("sgmnt_data",400,"off")=3600
 	Set gtmtypes("sgmnt_data",400,"len")=4
 	Set gtmtypes("sgmnt_data",400,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail4_cntr")=400
-	Set gtmtypes("sgmnt_data",401,"name")="sgmnt_data.wcb_wtfini_lckfail1_cntr"
-	Set gtmtypes("sgmnt_data",401,"off")=3640
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_wtstart_bad_cr_cntr")=400
+	Set gtmtypes("sgmnt_data",401,"name")="sgmnt_data.wc_blocked_wcs_wtfini_bad_cr_cntr"
+	Set gtmtypes("sgmnt_data",401,"off")=3604
 	Set gtmtypes("sgmnt_data",401,"len")=4
 	Set gtmtypes("sgmnt_data",401,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail1_cntr")=401
-	Set gtmtypes("sgmnt_data",402,"name")="sgmnt_data.wcb_wtfini_lckfail2_cntr"
-	Set gtmtypes("sgmnt_data",402,"off")=3644
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_wtfini_bad_cr_cntr")=401
+	Set gtmtypes("sgmnt_data",402,"name")="sgmnt_data.wc_blocked_bt_get_cntr"
+	Set gtmtypes("sgmnt_data",402,"off")=3608
 	Set gtmtypes("sgmnt_data",402,"len")=4
 	Set gtmtypes("sgmnt_data",402,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail2_cntr")=402
-	Set gtmtypes("sgmnt_data",403,"name")="sgmnt_data.wcb_wtfini_lckfail3_cntr"
-	Set gtmtypes("sgmnt_data",403,"off")=3648
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_bt_get_cntr")=402
+	Set gtmtypes("sgmnt_data",403,"name")="sgmnt_data.wc_blocked_wcs_cdb_sc_final_retry_cntr"
+	Set gtmtypes("sgmnt_data",403,"off")=3612
 	Set gtmtypes("sgmnt_data",403,"len")=4
 	Set gtmtypes("sgmnt_data",403,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail3_cntr")=403
-	Set gtmtypes("sgmnt_data",404,"name")="sgmnt_data.wcb_wtfini_lckfail4_cntr"
-	Set gtmtypes("sgmnt_data",404,"off")=3652
+	Set gtmtypfldindx("sgmnt_data","wc_blocked_wcs_cdb_sc_final_retry_cntr")=403
+	Set gtmtypes("sgmnt_data",404,"name")="sgmnt_data.wcb_bg_update_lckfail1_cntr"
+	Set gtmtypes("sgmnt_data",404,"off")=3616
 	Set gtmtypes("sgmnt_data",404,"len")=4
 	Set gtmtypes("sgmnt_data",404,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail4_cntr")=404
-	Set gtmtypes("sgmnt_data",405,"name")="sgmnt_data.wcb_t_end_sysops_dirtystuck1_cntr"
-	Set gtmtypes("sgmnt_data",405,"off")=3656
+	Set gtmtypfldindx("sgmnt_data","wcb_bg_update_lckfail1_cntr")=404
+	Set gtmtypes("sgmnt_data",405,"name")="sgmnt_data.wcb_bg_update_lckfail2_cntr"
+	Set gtmtypes("sgmnt_data",405,"off")=3620
 	Set gtmtypes("sgmnt_data",405,"len")=4
 	Set gtmtypes("sgmnt_data",405,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirtystuck1_cntr")=405
-	Set gtmtypes("sgmnt_data",406,"name")="sgmnt_data.wcb_t_end_sysops_dirtystuck2_cntr"
-	Set gtmtypes("sgmnt_data",406,"off")=3660
+	Set gtmtypfldindx("sgmnt_data","wcb_bg_update_lckfail2_cntr")=405
+	Set gtmtypes("sgmnt_data",406,"name")="sgmnt_data.wcb_wtstart_lckfail1_cntr"
+	Set gtmtypes("sgmnt_data",406,"off")=3624
 	Set gtmtypes("sgmnt_data",406,"len")=4
 	Set gtmtypes("sgmnt_data",406,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirtystuck2_cntr")=406
-	Set gtmtypes("sgmnt_data",407,"name")="sgmnt_data.wcb_secshr_db_clnup_wbuf_dqd_cntr"
-	Set gtmtypes("sgmnt_data",407,"off")=3664
+	Set gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail1_cntr")=406
+	Set gtmtypes("sgmnt_data",407,"name")="sgmnt_data.wcb_wtstart_lckfail2_cntr"
+	Set gtmtypes("sgmnt_data",407,"off")=3628
 	Set gtmtypes("sgmnt_data",407,"len")=4
 	Set gtmtypes("sgmnt_data",407,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_secshr_db_clnup_wbuf_dqd_cntr")=407
-	Set gtmtypes("sgmnt_data",408,"name")="sgmnt_data.dwngrd_refmts_syncio_cntr"
-	Set gtmtypes("sgmnt_data",408,"off")=3668
+	Set gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail2_cntr")=407
+	Set gtmtypes("sgmnt_data",408,"name")="sgmnt_data.wcb_wtstart_lckfail3_cntr"
+	Set gtmtypes("sgmnt_data",408,"off")=3632
 	Set gtmtypes("sgmnt_data",408,"len")=4
 	Set gtmtypes("sgmnt_data",408,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","dwngrd_refmts_syncio_cntr")=408
-	Set gtmtypes("sgmnt_data",409,"name")="sgmnt_data.dwngrd_refmts_asyncio_cntr"
-	Set gtmtypes("sgmnt_data",409,"off")=3672
+	Set gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail3_cntr")=408
+	Set gtmtypes("sgmnt_data",409,"name")="sgmnt_data.wcb_wtstart_lckfail4_cntr"
+	Set gtmtypes("sgmnt_data",409,"off")=3636
 	Set gtmtypes("sgmnt_data",409,"len")=4
 	Set gtmtypes("sgmnt_data",409,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","dwngrd_refmts_asyncio_cntr")=409
-	Set gtmtypes("sgmnt_data",410,"name")="sgmnt_data.shmpool_refmt_harvests_cntr"
-	Set gtmtypes("sgmnt_data",410,"off")=3676
+	Set gtmtypfldindx("sgmnt_data","wcb_wtstart_lckfail4_cntr")=409
+	Set gtmtypes("sgmnt_data",410,"name")="sgmnt_data.wcb_wtfini_lckfail1_cntr"
+	Set gtmtypes("sgmnt_data",410,"off")=3640
 	Set gtmtypes("sgmnt_data",410,"len")=4
 	Set gtmtypes("sgmnt_data",410,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","shmpool_refmt_harvests_cntr")=410
-	Set gtmtypes("sgmnt_data",411,"name")="sgmnt_data.shmpool_recovery_cntr"
-	Set gtmtypes("sgmnt_data",411,"off")=3680
+	Set gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail1_cntr")=410
+	Set gtmtypes("sgmnt_data",411,"name")="sgmnt_data.wcb_wtfini_lckfail2_cntr"
+	Set gtmtypes("sgmnt_data",411,"off")=3644
 	Set gtmtypes("sgmnt_data",411,"len")=4
 	Set gtmtypes("sgmnt_data",411,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","shmpool_recovery_cntr")=411
-	Set gtmtypes("sgmnt_data",412,"name")="sgmnt_data.shmpool_blkd_by_sdc_cntr"
-	Set gtmtypes("sgmnt_data",412,"off")=3684
+	Set gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail2_cntr")=411
+	Set gtmtypes("sgmnt_data",412,"name")="sgmnt_data.wcb_wtfini_lckfail3_cntr"
+	Set gtmtypes("sgmnt_data",412,"off")=3648
 	Set gtmtypes("sgmnt_data",412,"len")=4
 	Set gtmtypes("sgmnt_data",412,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","shmpool_blkd_by_sdc_cntr")=412
-	Set gtmtypes("sgmnt_data",413,"name")="sgmnt_data.shmpool_alloc_bbflush_cntr"
-	Set gtmtypes("sgmnt_data",413,"off")=3688
+	Set gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail3_cntr")=412
+	Set gtmtypes("sgmnt_data",413,"name")="sgmnt_data.wcb_wtfini_lckfail4_cntr"
+	Set gtmtypes("sgmnt_data",413,"off")=3652
 	Set gtmtypes("sgmnt_data",413,"len")=4
 	Set gtmtypes("sgmnt_data",413,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","shmpool_alloc_bbflush_cntr")=413
-	Set gtmtypes("sgmnt_data",414,"name")="sgmnt_data.refmt_hvst_blk_released_replaced_cntr"
-	Set gtmtypes("sgmnt_data",414,"off")=3692
+	Set gtmtypfldindx("sgmnt_data","wcb_wtfini_lckfail4_cntr")=413
+	Set gtmtypes("sgmnt_data",414,"name")="sgmnt_data.wcb_t_end_sysops_dirtystuck1_cntr"
+	Set gtmtypes("sgmnt_data",414,"off")=3656
 	Set gtmtypes("sgmnt_data",414,"len")=4
 	Set gtmtypes("sgmnt_data",414,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","refmt_hvst_blk_released_replaced_cntr")=414
-	Set gtmtypes("sgmnt_data",415,"name")="sgmnt_data.refmt_hvst_blk_released_io_complete_cntr"
-	Set gtmtypes("sgmnt_data",415,"off")=3696
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirtystuck1_cntr")=414
+	Set gtmtypes("sgmnt_data",415,"name")="sgmnt_data.wcb_t_end_sysops_dirtystuck2_cntr"
+	Set gtmtypes("sgmnt_data",415,"off")=3660
 	Set gtmtypes("sgmnt_data",415,"len")=4
 	Set gtmtypes("sgmnt_data",415,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","refmt_hvst_blk_released_io_complete_cntr")=415
-	Set gtmtypes("sgmnt_data",416,"name")="sgmnt_data.refmt_hvst_blk_kept_cntr"
-	Set gtmtypes("sgmnt_data",416,"off")=3700
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_dirtystuck2_cntr")=415
+	Set gtmtypes("sgmnt_data",416,"name")="sgmnt_data.wcb_secshr_db_clnup_wbuf_dqd_cntr"
+	Set gtmtypes("sgmnt_data",416,"off")=3664
 	Set gtmtypes("sgmnt_data",416,"len")=4
 	Set gtmtypes("sgmnt_data",416,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","refmt_hvst_blk_kept_cntr")=416
-	Set gtmtypes("sgmnt_data",417,"name")="sgmnt_data.refmt_hvst_blk_ignored_cntr"
-	Set gtmtypes("sgmnt_data",417,"off")=3704
+	Set gtmtypfldindx("sgmnt_data","wcb_secshr_db_clnup_wbuf_dqd_cntr")=416
+	Set gtmtypes("sgmnt_data",417,"name")="sgmnt_data.dwngrd_refmts_syncio_cntr"
+	Set gtmtypes("sgmnt_data",417,"off")=3668
 	Set gtmtypes("sgmnt_data",417,"len")=4
 	Set gtmtypes("sgmnt_data",417,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","refmt_hvst_blk_ignored_cntr")=417
-	Set gtmtypes("sgmnt_data",418,"name")="sgmnt_data.refmt_blk_chk_blk_freed_cntr"
-	Set gtmtypes("sgmnt_data",418,"off")=3708
+	Set gtmtypfldindx("sgmnt_data","dwngrd_refmts_syncio_cntr")=417
+	Set gtmtypes("sgmnt_data",418,"name")="sgmnt_data.dwngrd_refmts_asyncio_cntr"
+	Set gtmtypes("sgmnt_data",418,"off")=3672
 	Set gtmtypes("sgmnt_data",418,"len")=4
 	Set gtmtypes("sgmnt_data",418,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","refmt_blk_chk_blk_freed_cntr")=418
-	Set gtmtypes("sgmnt_data",419,"name")="sgmnt_data.refmt_blk_chk_blk_kept_cntr"
-	Set gtmtypes("sgmnt_data",419,"off")=3712
+	Set gtmtypfldindx("sgmnt_data","dwngrd_refmts_asyncio_cntr")=418
+	Set gtmtypes("sgmnt_data",419,"name")="sgmnt_data.shmpool_refmt_harvests_cntr"
+	Set gtmtypes("sgmnt_data",419,"off")=3676
 	Set gtmtypes("sgmnt_data",419,"len")=4
 	Set gtmtypes("sgmnt_data",419,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","refmt_blk_chk_blk_kept_cntr")=419
-	Set gtmtypes("sgmnt_data",420,"name")="sgmnt_data.active_lvl_trigger_cntr"
-	Set gtmtypes("sgmnt_data",420,"off")=3716
+	Set gtmtypfldindx("sgmnt_data","shmpool_refmt_harvests_cntr")=419
+	Set gtmtypes("sgmnt_data",420,"name")="sgmnt_data.shmpool_recovery_cntr"
+	Set gtmtypes("sgmnt_data",420,"off")=3680
 	Set gtmtypes("sgmnt_data",420,"len")=4
 	Set gtmtypes("sgmnt_data",420,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","active_lvl_trigger_cntr")=420
-	Set gtmtypes("sgmnt_data",421,"name")="sgmnt_data.new_buff_cntr"
-	Set gtmtypes("sgmnt_data",421,"off")=3720
+	Set gtmtypfldindx("sgmnt_data","shmpool_recovery_cntr")=420
+	Set gtmtypes("sgmnt_data",421,"name")="sgmnt_data.shmpool_blkd_by_sdc_cntr"
+	Set gtmtypes("sgmnt_data",421,"off")=3684
 	Set gtmtypes("sgmnt_data",421,"len")=4
 	Set gtmtypes("sgmnt_data",421,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","new_buff_cntr")=421
-	Set gtmtypes("sgmnt_data",422,"name")="sgmnt_data.phase2_commit_wait_sleep_in_crit_cntr"
-	Set gtmtypes("sgmnt_data",422,"off")=3724
+	Set gtmtypfldindx("sgmnt_data","shmpool_blkd_by_sdc_cntr")=421
+	Set gtmtypes("sgmnt_data",422,"name")="sgmnt_data.shmpool_alloc_bbflush_cntr"
+	Set gtmtypes("sgmnt_data",422,"off")=3688
 	Set gtmtypes("sgmnt_data",422,"len")=4
 	Set gtmtypes("sgmnt_data",422,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","phase2_commit_wait_sleep_in_crit_cntr")=422
-	Set gtmtypes("sgmnt_data",423,"name")="sgmnt_data.phase2_commit_wait_sleep_no_crit_cntr"
-	Set gtmtypes("sgmnt_data",423,"off")=3728
+	Set gtmtypfldindx("sgmnt_data","shmpool_alloc_bbflush_cntr")=422
+	Set gtmtypes("sgmnt_data",423,"name")="sgmnt_data.refmt_hvst_blk_released_replaced_cntr"
+	Set gtmtypes("sgmnt_data",423,"off")=3692
 	Set gtmtypes("sgmnt_data",423,"len")=4
 	Set gtmtypes("sgmnt_data",423,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","phase2_commit_wait_sleep_no_crit_cntr")=423
-	Set gtmtypes("sgmnt_data",424,"name")="sgmnt_data.phase2_commit_wait_pidcnt_cntr"
-	Set gtmtypes("sgmnt_data",424,"off")=3732
+	Set gtmtypfldindx("sgmnt_data","refmt_hvst_blk_released_replaced_cntr")=423
+	Set gtmtypes("sgmnt_data",424,"name")="sgmnt_data.refmt_hvst_blk_released_io_complete_cntr"
+	Set gtmtypes("sgmnt_data",424,"off")=3696
 	Set gtmtypes("sgmnt_data",424,"len")=4
 	Set gtmtypes("sgmnt_data",424,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","phase2_commit_wait_pidcnt_cntr")=424
-	Set gtmtypes("sgmnt_data",425,"name")="sgmnt_data.wcb_t_end_sysops_intend_wait_cntr"
-	Set gtmtypes("sgmnt_data",425,"off")=3736
+	Set gtmtypfldindx("sgmnt_data","refmt_hvst_blk_released_io_complete_cntr")=424
+	Set gtmtypes("sgmnt_data",425,"name")="sgmnt_data.refmt_hvst_blk_kept_cntr"
+	Set gtmtypes("sgmnt_data",425,"off")=3700
 	Set gtmtypes("sgmnt_data",425,"len")=4
 	Set gtmtypes("sgmnt_data",425,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_intend_wait_cntr")=425
-	Set gtmtypes("sgmnt_data",426,"name")="sgmnt_data.wcb_secshr_db_clnup_phase2_clnup_cntr"
-	Set gtmtypes("sgmnt_data",426,"off")=3740
+	Set gtmtypfldindx("sgmnt_data","refmt_hvst_blk_kept_cntr")=425
+	Set gtmtypes("sgmnt_data",426,"name")="sgmnt_data.refmt_hvst_blk_ignored_cntr"
+	Set gtmtypes("sgmnt_data",426,"off")=3704
 	Set gtmtypes("sgmnt_data",426,"len")=4
 	Set gtmtypes("sgmnt_data",426,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_secshr_db_clnup_phase2_clnup_cntr")=426
-	Set gtmtypes("sgmnt_data",427,"name")="sgmnt_data.wcb_phase2_commit_wait_cntr"
-	Set gtmtypes("sgmnt_data",427,"off")=3744
+	Set gtmtypfldindx("sgmnt_data","refmt_hvst_blk_ignored_cntr")=426
+	Set gtmtypes("sgmnt_data",427,"name")="sgmnt_data.refmt_blk_chk_blk_freed_cntr"
+	Set gtmtypes("sgmnt_data",427,"off")=3708
 	Set gtmtypes("sgmnt_data",427,"len")=4
 	Set gtmtypes("sgmnt_data",427,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","wcb_phase2_commit_wait_cntr")=427
-	Set gtmtypes("sgmnt_data",428,"name")="sgmnt_data.recompute_upd_array_calls_cntr"
-	Set gtmtypes("sgmnt_data",428,"off")=3748
+	Set gtmtypfldindx("sgmnt_data","refmt_blk_chk_blk_freed_cntr")=427
+	Set gtmtypes("sgmnt_data",428,"name")="sgmnt_data.refmt_blk_chk_blk_kept_cntr"
+	Set gtmtypes("sgmnt_data",428,"off")=3712
 	Set gtmtypes("sgmnt_data",428,"len")=4
 	Set gtmtypes("sgmnt_data",428,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_calls_cntr")=428
-	Set gtmtypes("sgmnt_data",429,"name")="sgmnt_data.recompute_upd_array_rip_cntr"
-	Set gtmtypes("sgmnt_data",429,"off")=3752
+	Set gtmtypfldindx("sgmnt_data","refmt_blk_chk_blk_kept_cntr")=428
+	Set gtmtypes("sgmnt_data",429,"name")="sgmnt_data.active_lvl_trigger_cntr"
+	Set gtmtypes("sgmnt_data",429,"off")=3716
 	Set gtmtypes("sgmnt_data",429,"len")=4
 	Set gtmtypes("sgmnt_data",429,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_rip_cntr")=429
-	Set gtmtypes("sgmnt_data",430,"name")="sgmnt_data.recompute_upd_array_in_tend_cntr"
-	Set gtmtypes("sgmnt_data",430,"off")=3756
+	Set gtmtypfldindx("sgmnt_data","active_lvl_trigger_cntr")=429
+	Set gtmtypes("sgmnt_data",430,"name")="sgmnt_data.new_buff_cntr"
+	Set gtmtypes("sgmnt_data",430,"off")=3720
 	Set gtmtypes("sgmnt_data",430,"len")=4
 	Set gtmtypes("sgmnt_data",430,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_in_tend_cntr")=430
-	Set gtmtypes("sgmnt_data",431,"name")="sgmnt_data.recompute_upd_array_search_blk_cntr"
-	Set gtmtypes("sgmnt_data",431,"off")=3760
+	Set gtmtypfldindx("sgmnt_data","new_buff_cntr")=430
+	Set gtmtypes("sgmnt_data",431,"name")="sgmnt_data.phase2_commit_wait_sleep_in_crit_cntr"
+	Set gtmtypes("sgmnt_data",431,"off")=3724
 	Set gtmtypes("sgmnt_data",431,"len")=4
 	Set gtmtypes("sgmnt_data",431,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_search_blk_cntr")=431
-	Set gtmtypes("sgmnt_data",432,"name")="sgmnt_data.recompute_upd_array_new_rec_cntr"
-	Set gtmtypes("sgmnt_data",432,"off")=3764
+	Set gtmtypfldindx("sgmnt_data","phase2_commit_wait_sleep_in_crit_cntr")=431
+	Set gtmtypes("sgmnt_data",432,"name")="sgmnt_data.phase2_commit_wait_sleep_no_crit_cntr"
+	Set gtmtypes("sgmnt_data",432,"off")=3728
 	Set gtmtypes("sgmnt_data",432,"len")=4
 	Set gtmtypes("sgmnt_data",432,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_new_rec_cntr")=432
-	Set gtmtypes("sgmnt_data",433,"name")="sgmnt_data.recompute_upd_array_rec_size_cntr"
-	Set gtmtypes("sgmnt_data",433,"off")=3768
+	Set gtmtypfldindx("sgmnt_data","phase2_commit_wait_sleep_no_crit_cntr")=432
+	Set gtmtypes("sgmnt_data",433,"name")="sgmnt_data.phase2_commit_wait_pidcnt_cntr"
+	Set gtmtypes("sgmnt_data",433,"off")=3732
 	Set gtmtypes("sgmnt_data",433,"len")=4
 	Set gtmtypes("sgmnt_data",433,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_rec_size_cntr")=433
-	Set gtmtypes("sgmnt_data",434,"name")="sgmnt_data.recompute_upd_array_rec_cmpc_cntr"
-	Set gtmtypes("sgmnt_data",434,"off")=3772
+	Set gtmtypfldindx("sgmnt_data","phase2_commit_wait_pidcnt_cntr")=433
+	Set gtmtypes("sgmnt_data",434,"name")="sgmnt_data.wcb_t_end_sysops_intend_wait_cntr"
+	Set gtmtypes("sgmnt_data",434,"off")=3736
 	Set gtmtypes("sgmnt_data",434,"len")=4
 	Set gtmtypes("sgmnt_data",434,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_rec_cmpc_cntr")=434
-	Set gtmtypes("sgmnt_data",435,"name")="sgmnt_data.recompute_upd_array_blk_fini_cntr"
-	Set gtmtypes("sgmnt_data",435,"off")=3776
+	Set gtmtypfldindx("sgmnt_data","wcb_t_end_sysops_intend_wait_cntr")=434
+	Set gtmtypes("sgmnt_data",435,"name")="sgmnt_data.wcb_secshr_db_clnup_phase2_clnup_cntr"
+	Set gtmtypes("sgmnt_data",435,"off")=3740
 	Set gtmtypes("sgmnt_data",435,"len")=4
 	Set gtmtypes("sgmnt_data",435,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_blk_fini_cntr")=435
-	Set gtmtypes("sgmnt_data",436,"name")="sgmnt_data.recompute_upd_array_blk_split_cntr"
-	Set gtmtypes("sgmnt_data",436,"off")=3780
+	Set gtmtypfldindx("sgmnt_data","wcb_secshr_db_clnup_phase2_clnup_cntr")=435
+	Set gtmtypes("sgmnt_data",436,"name")="sgmnt_data.wcb_phase2_commit_wait_cntr"
+	Set gtmtypes("sgmnt_data",436,"off")=3744
 	Set gtmtypes("sgmnt_data",436,"len")=4
 	Set gtmtypes("sgmnt_data",436,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_blk_split_cntr")=436
-	Set gtmtypes("sgmnt_data",437,"name")="sgmnt_data.t_qread_ripsleep_cnt_cntr"
-	Set gtmtypes("sgmnt_data",437,"off")=3784
+	Set gtmtypfldindx("sgmnt_data","wcb_phase2_commit_wait_cntr")=436
+	Set gtmtypes("sgmnt_data",437,"name")="sgmnt_data.recompute_upd_array_calls_cntr"
+	Set gtmtypes("sgmnt_data",437,"off")=3748
 	Set gtmtypes("sgmnt_data",437,"len")=4
 	Set gtmtypes("sgmnt_data",437,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","t_qread_ripsleep_cnt_cntr")=437
-	Set gtmtypes("sgmnt_data",438,"name")="sgmnt_data.t_qread_ripsleep_nblks_cntr"
-	Set gtmtypes("sgmnt_data",438,"off")=3788
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_calls_cntr")=437
+	Set gtmtypes("sgmnt_data",438,"name")="sgmnt_data.recompute_upd_array_rip_cntr"
+	Set gtmtypes("sgmnt_data",438,"off")=3752
 	Set gtmtypes("sgmnt_data",438,"len")=4
 	Set gtmtypes("sgmnt_data",438,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","t_qread_ripsleep_nblks_cntr")=438
-	Set gtmtypes("sgmnt_data",439,"name")="sgmnt_data.bg_trc_rec_cntr_filler"
-	Set gtmtypes("sgmnt_data",439,"off")=3792
-	Set gtmtypes("sgmnt_data",439,"len")=56
-	Set gtmtypes("sgmnt_data",439,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","bg_trc_rec_cntr_filler")=439
-	Set gtmtypes("sgmnt_data",440,"name")="sgmnt_data.n_gvcst_srches"
-	Set gtmtypes("sgmnt_data",440,"off")=3848
-	Set gtmtypes("sgmnt_data",440,"len")=8
-	Set gtmtypes("sgmnt_data",440,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("sgmnt_data","n_gvcst_srches")=440
-	Set gtmtypes("sgmnt_data",441,"name")="sgmnt_data.n_gvcst_srches.curr_count"
-	Set gtmtypes("sgmnt_data",441,"off")=3848
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_rip_cntr")=438
+	Set gtmtypes("sgmnt_data",439,"name")="sgmnt_data.recompute_upd_array_in_tend_cntr"
+	Set gtmtypes("sgmnt_data",439,"off")=3756
+	Set gtmtypes("sgmnt_data",439,"len")=4
+	Set gtmtypes("sgmnt_data",439,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_in_tend_cntr")=439
+	Set gtmtypes("sgmnt_data",440,"name")="sgmnt_data.recompute_upd_array_search_blk_cntr"
+	Set gtmtypes("sgmnt_data",440,"off")=3760
+	Set gtmtypes("sgmnt_data",440,"len")=4
+	Set gtmtypes("sgmnt_data",440,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_search_blk_cntr")=440
+	Set gtmtypes("sgmnt_data",441,"name")="sgmnt_data.recompute_upd_array_new_rec_cntr"
+	Set gtmtypes("sgmnt_data",441,"off")=3764
 	Set gtmtypes("sgmnt_data",441,"len")=4
 	Set gtmtypes("sgmnt_data",441,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_gvcst_srches.curr_count")=441
-	Set gtmtypes("sgmnt_data",442,"name")="sgmnt_data.n_gvcst_srches.cumul_count"
-	Set gtmtypes("sgmnt_data",442,"off")=3852
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_new_rec_cntr")=441
+	Set gtmtypes("sgmnt_data",442,"name")="sgmnt_data.recompute_upd_array_rec_size_cntr"
+	Set gtmtypes("sgmnt_data",442,"off")=3768
 	Set gtmtypes("sgmnt_data",442,"len")=4
 	Set gtmtypes("sgmnt_data",442,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_gvcst_srches.cumul_count")=442
-	Set gtmtypes("sgmnt_data",443,"name")="sgmnt_data.n_gvcst_srch_clues"
-	Set gtmtypes("sgmnt_data",443,"off")=3856
-	Set gtmtypes("sgmnt_data",443,"len")=8
-	Set gtmtypes("sgmnt_data",443,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("sgmnt_data","n_gvcst_srch_clues")=443
-	Set gtmtypes("sgmnt_data",444,"name")="sgmnt_data.n_gvcst_srch_clues.curr_count"
-	Set gtmtypes("sgmnt_data",444,"off")=3856
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_rec_size_cntr")=442
+	Set gtmtypes("sgmnt_data",443,"name")="sgmnt_data.recompute_upd_array_rec_cmpc_cntr"
+	Set gtmtypes("sgmnt_data",443,"off")=3772
+	Set gtmtypes("sgmnt_data",443,"len")=4
+	Set gtmtypes("sgmnt_data",443,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_rec_cmpc_cntr")=443
+	Set gtmtypes("sgmnt_data",444,"name")="sgmnt_data.recompute_upd_array_blk_fini_cntr"
+	Set gtmtypes("sgmnt_data",444,"off")=3776
 	Set gtmtypes("sgmnt_data",444,"len")=4
 	Set gtmtypes("sgmnt_data",444,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_gvcst_srch_clues.curr_count")=444
-	Set gtmtypes("sgmnt_data",445,"name")="sgmnt_data.n_gvcst_srch_clues.cumul_count"
-	Set gtmtypes("sgmnt_data",445,"off")=3860
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_blk_fini_cntr")=444
+	Set gtmtypes("sgmnt_data",445,"name")="sgmnt_data.recompute_upd_array_blk_split_cntr"
+	Set gtmtypes("sgmnt_data",445,"off")=3780
 	Set gtmtypes("sgmnt_data",445,"len")=4
 	Set gtmtypes("sgmnt_data",445,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_gvcst_srch_clues.cumul_count")=445
-	Set gtmtypes("sgmnt_data",446,"name")="sgmnt_data.n_clue_used_head"
-	Set gtmtypes("sgmnt_data",446,"off")=3864
-	Set gtmtypes("sgmnt_data",446,"len")=8
-	Set gtmtypes("sgmnt_data",446,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("sgmnt_data","n_clue_used_head")=446
-	Set gtmtypes("sgmnt_data",447,"name")="sgmnt_data.n_clue_used_head.curr_count"
-	Set gtmtypes("sgmnt_data",447,"off")=3864
+	Set gtmtypfldindx("sgmnt_data","recompute_upd_array_blk_split_cntr")=445
+	Set gtmtypes("sgmnt_data",446,"name")="sgmnt_data.t_qread_ripsleep_cnt_cntr"
+	Set gtmtypes("sgmnt_data",446,"off")=3784
+	Set gtmtypes("sgmnt_data",446,"len")=4
+	Set gtmtypes("sgmnt_data",446,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","t_qread_ripsleep_cnt_cntr")=446
+	Set gtmtypes("sgmnt_data",447,"name")="sgmnt_data.t_qread_ripsleep_nblks_cntr"
+	Set gtmtypes("sgmnt_data",447,"off")=3788
 	Set gtmtypes("sgmnt_data",447,"len")=4
 	Set gtmtypes("sgmnt_data",447,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_clue_used_head.curr_count")=447
-	Set gtmtypes("sgmnt_data",448,"name")="sgmnt_data.n_clue_used_head.cumul_count"
-	Set gtmtypes("sgmnt_data",448,"off")=3868
+	Set gtmtypfldindx("sgmnt_data","t_qread_ripsleep_nblks_cntr")=447
+	Set gtmtypes("sgmnt_data",448,"name")="sgmnt_data.wcs_wtfini_invoked_cntr"
+	Set gtmtypes("sgmnt_data",448,"off")=3792
 	Set gtmtypes("sgmnt_data",448,"len")=4
 	Set gtmtypes("sgmnt_data",448,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_clue_used_head.cumul_count")=448
-	Set gtmtypes("sgmnt_data",449,"name")="sgmnt_data.n_clue_used_same"
-	Set gtmtypes("sgmnt_data",449,"off")=3872
-	Set gtmtypes("sgmnt_data",449,"len")=8
-	Set gtmtypes("sgmnt_data",449,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("sgmnt_data","n_clue_used_same")=449
-	Set gtmtypes("sgmnt_data",450,"name")="sgmnt_data.n_clue_used_same.curr_count"
-	Set gtmtypes("sgmnt_data",450,"off")=3872
+	Set gtmtypfldindx("sgmnt_data","wcs_wtfini_invoked_cntr")=448
+	Set gtmtypes("sgmnt_data",449,"name")="sgmnt_data.wcs_wterror_invoked_cntr"
+	Set gtmtypes("sgmnt_data",449,"off")=3796
+	Set gtmtypes("sgmnt_data",449,"len")=4
+	Set gtmtypes("sgmnt_data",449,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","wcs_wterror_invoked_cntr")=449
+	Set gtmtypes("sgmnt_data",450,"name")="sgmnt_data.wcs_wt_restart_invoked_cntr"
+	Set gtmtypes("sgmnt_data",450,"off")=3800
 	Set gtmtypes("sgmnt_data",450,"len")=4
 	Set gtmtypes("sgmnt_data",450,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_clue_used_same.curr_count")=450
-	Set gtmtypes("sgmnt_data",451,"name")="sgmnt_data.n_clue_used_same.cumul_count"
-	Set gtmtypes("sgmnt_data",451,"off")=3876
+	Set gtmtypfldindx("sgmnt_data","wcs_wt_restart_invoked_cntr")=450
+	Set gtmtypes("sgmnt_data",451,"name")="sgmnt_data.wcs_wt_restart_eagain_cntr"
+	Set gtmtypes("sgmnt_data",451,"off")=3804
 	Set gtmtypes("sgmnt_data",451,"len")=4
 	Set gtmtypes("sgmnt_data",451,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_clue_used_same.cumul_count")=451
-	Set gtmtypes("sgmnt_data",452,"name")="sgmnt_data.n_clue_used_tail"
-	Set gtmtypes("sgmnt_data",452,"off")=3880
-	Set gtmtypes("sgmnt_data",452,"len")=8
-	Set gtmtypes("sgmnt_data",452,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("sgmnt_data","n_clue_used_tail")=452
-	Set gtmtypes("sgmnt_data",453,"name")="sgmnt_data.n_clue_used_tail.curr_count"
-	Set gtmtypes("sgmnt_data",453,"off")=3880
+	Set gtmtypfldindx("sgmnt_data","wcs_wt_restart_eagain_cntr")=451
+	Set gtmtypes("sgmnt_data",452,"name")="sgmnt_data.wcs_wt_restart_reinsert_cntr"
+	Set gtmtypes("sgmnt_data",452,"off")=3808
+	Set gtmtypes("sgmnt_data",452,"len")=4
+	Set gtmtypes("sgmnt_data",452,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","wcs_wt_restart_reinsert_cntr")=452
+	Set gtmtypes("sgmnt_data",453,"name")="sgmnt_data.wcs_wtstart_eagain_cntr"
+	Set gtmtypes("sgmnt_data",453,"off")=3812
 	Set gtmtypes("sgmnt_data",453,"len")=4
 	Set gtmtypes("sgmnt_data",453,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_clue_used_tail.curr_count")=453
-	Set gtmtypes("sgmnt_data",454,"name")="sgmnt_data.n_clue_used_tail.cumul_count"
-	Set gtmtypes("sgmnt_data",454,"off")=3884
+	Set gtmtypfldindx("sgmnt_data","wcs_wtstart_eagain_cntr")=453
+	Set gtmtypes("sgmnt_data",454,"name")="sgmnt_data.wcs_wtstart_eagain_incrit_cntr"
+	Set gtmtypes("sgmnt_data",454,"off")=3816
 	Set gtmtypes("sgmnt_data",454,"len")=4
 	Set gtmtypes("sgmnt_data",454,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_clue_used_tail.cumul_count")=454
-	Set gtmtypes("sgmnt_data",455,"name")="sgmnt_data.n_t_qreads"
-	Set gtmtypes("sgmnt_data",455,"off")=3888
-	Set gtmtypes("sgmnt_data",455,"len")=8
-	Set gtmtypes("sgmnt_data",455,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("sgmnt_data","n_t_qreads")=455
-	Set gtmtypes("sgmnt_data",456,"name")="sgmnt_data.n_t_qreads.curr_count"
-	Set gtmtypes("sgmnt_data",456,"off")=3888
-	Set gtmtypes("sgmnt_data",456,"len")=4
-	Set gtmtypes("sgmnt_data",456,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_t_qreads.curr_count")=456
-	Set gtmtypes("sgmnt_data",457,"name")="sgmnt_data.n_t_qreads.cumul_count"
-	Set gtmtypes("sgmnt_data",457,"off")=3892
-	Set gtmtypes("sgmnt_data",457,"len")=4
-	Set gtmtypes("sgmnt_data",457,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_t_qreads.cumul_count")=457
-	Set gtmtypes("sgmnt_data",458,"name")="sgmnt_data.unused_dsk_reads"
-	Set gtmtypes("sgmnt_data",458,"off")=3896
-	Set gtmtypes("sgmnt_data",458,"len")=8
-	Set gtmtypes("sgmnt_data",458,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("sgmnt_data","unused_dsk_reads")=458
-	Set gtmtypes("sgmnt_data",459,"name")="sgmnt_data.unused_dsk_reads.curr_count"
-	Set gtmtypes("sgmnt_data",459,"off")=3896
+	Set gtmtypfldindx("sgmnt_data","wcs_wtstart_eagain_incrit_cntr")=454
+	Set gtmtypes("sgmnt_data",455,"name")="sgmnt_data.async_restart_eagain_cntr"
+	Set gtmtypes("sgmnt_data",455,"off")=3820
+	Set gtmtypes("sgmnt_data",455,"len")=4
+	Set gtmtypes("sgmnt_data",455,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","async_restart_eagain_cntr")=455
+	Set gtmtypes("sgmnt_data",456,"name")="sgmnt_data.bg_trc_rec_cntr_filler"
+	Set gtmtypes("sgmnt_data",456,"off")=3824
+	Set gtmtypes("sgmnt_data",456,"len")=24
+	Set gtmtypes("sgmnt_data",456,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","bg_trc_rec_cntr_filler")=456
+	Set gtmtypes("sgmnt_data",457,"name")="sgmnt_data.n_gvcst_srches"
+	Set gtmtypes("sgmnt_data",457,"off")=3848
+	Set gtmtypes("sgmnt_data",457,"len")=8
+	Set gtmtypes("sgmnt_data",457,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("sgmnt_data","n_gvcst_srches")=457
+	Set gtmtypes("sgmnt_data",458,"name")="sgmnt_data.n_gvcst_srches.curr_count"
+	Set gtmtypes("sgmnt_data",458,"off")=3848
+	Set gtmtypes("sgmnt_data",458,"len")=4
+	Set gtmtypes("sgmnt_data",458,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_gvcst_srches.curr_count")=458
+	Set gtmtypes("sgmnt_data",459,"name")="sgmnt_data.n_gvcst_srches.cumul_count"
+	Set gtmtypes("sgmnt_data",459,"off")=3852
 	Set gtmtypes("sgmnt_data",459,"len")=4
 	Set gtmtypes("sgmnt_data",459,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","unused_dsk_reads.curr_count")=459
-	Set gtmtypes("sgmnt_data",460,"name")="sgmnt_data.unused_dsk_reads.cumul_count"
-	Set gtmtypes("sgmnt_data",460,"off")=3900
-	Set gtmtypes("sgmnt_data",460,"len")=4
-	Set gtmtypes("sgmnt_data",460,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","unused_dsk_reads.cumul_count")=460
-	Set gtmtypes("sgmnt_data",461,"name")="sgmnt_data.n_bgmm_updates"
-	Set gtmtypes("sgmnt_data",461,"off")=3904
-	Set gtmtypes("sgmnt_data",461,"len")=8
-	Set gtmtypes("sgmnt_data",461,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("sgmnt_data","n_bgmm_updates")=461
-	Set gtmtypes("sgmnt_data",462,"name")="sgmnt_data.n_bgmm_updates.curr_count"
-	Set gtmtypes("sgmnt_data",462,"off")=3904
+	Set gtmtypfldindx("sgmnt_data","n_gvcst_srches.cumul_count")=459
+	Set gtmtypes("sgmnt_data",460,"name")="sgmnt_data.n_gvcst_srch_clues"
+	Set gtmtypes("sgmnt_data",460,"off")=3856
+	Set gtmtypes("sgmnt_data",460,"len")=8
+	Set gtmtypes("sgmnt_data",460,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("sgmnt_data","n_gvcst_srch_clues")=460
+	Set gtmtypes("sgmnt_data",461,"name")="sgmnt_data.n_gvcst_srch_clues.curr_count"
+	Set gtmtypes("sgmnt_data",461,"off")=3856
+	Set gtmtypes("sgmnt_data",461,"len")=4
+	Set gtmtypes("sgmnt_data",461,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_gvcst_srch_clues.curr_count")=461
+	Set gtmtypes("sgmnt_data",462,"name")="sgmnt_data.n_gvcst_srch_clues.cumul_count"
+	Set gtmtypes("sgmnt_data",462,"off")=3860
 	Set gtmtypes("sgmnt_data",462,"len")=4
 	Set gtmtypes("sgmnt_data",462,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_bgmm_updates.curr_count")=462
-	Set gtmtypes("sgmnt_data",463,"name")="sgmnt_data.n_bgmm_updates.cumul_count"
-	Set gtmtypes("sgmnt_data",463,"off")=3908
-	Set gtmtypes("sgmnt_data",463,"len")=4
-	Set gtmtypes("sgmnt_data",463,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_bgmm_updates.cumul_count")=463
-	Set gtmtypes("sgmnt_data",464,"name")="sgmnt_data.unused_dsk_writes"
-	Set gtmtypes("sgmnt_data",464,"off")=3912
-	Set gtmtypes("sgmnt_data",464,"len")=8
-	Set gtmtypes("sgmnt_data",464,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("sgmnt_data","unused_dsk_writes")=464
-	Set gtmtypes("sgmnt_data",465,"name")="sgmnt_data.unused_dsk_writes.curr_count"
-	Set gtmtypes("sgmnt_data",465,"off")=3912
+	Set gtmtypfldindx("sgmnt_data","n_gvcst_srch_clues.cumul_count")=462
+	Set gtmtypes("sgmnt_data",463,"name")="sgmnt_data.n_clue_used_head"
+	Set gtmtypes("sgmnt_data",463,"off")=3864
+	Set gtmtypes("sgmnt_data",463,"len")=8
+	Set gtmtypes("sgmnt_data",463,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("sgmnt_data","n_clue_used_head")=463
+	Set gtmtypes("sgmnt_data",464,"name")="sgmnt_data.n_clue_used_head.curr_count"
+	Set gtmtypes("sgmnt_data",464,"off")=3864
+	Set gtmtypes("sgmnt_data",464,"len")=4
+	Set gtmtypes("sgmnt_data",464,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_clue_used_head.curr_count")=464
+	Set gtmtypes("sgmnt_data",465,"name")="sgmnt_data.n_clue_used_head.cumul_count"
+	Set gtmtypes("sgmnt_data",465,"off")=3868
 	Set gtmtypes("sgmnt_data",465,"len")=4
 	Set gtmtypes("sgmnt_data",465,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","unused_dsk_writes.curr_count")=465
-	Set gtmtypes("sgmnt_data",466,"name")="sgmnt_data.unused_dsk_writes.cumul_count"
-	Set gtmtypes("sgmnt_data",466,"off")=3916
-	Set gtmtypes("sgmnt_data",466,"len")=4
-	Set gtmtypes("sgmnt_data",466,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","unused_dsk_writes.cumul_count")=466
-	Set gtmtypes("sgmnt_data",467,"name")="sgmnt_data.n_bg_update_creates"
-	Set gtmtypes("sgmnt_data",467,"off")=3920
-	Set gtmtypes("sgmnt_data",467,"len")=8
-	Set gtmtypes("sgmnt_data",467,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("sgmnt_data","n_bg_update_creates")=467
-	Set gtmtypes("sgmnt_data",468,"name")="sgmnt_data.n_bg_update_creates.curr_count"
-	Set gtmtypes("sgmnt_data",468,"off")=3920
+	Set gtmtypfldindx("sgmnt_data","n_clue_used_head.cumul_count")=465
+	Set gtmtypes("sgmnt_data",466,"name")="sgmnt_data.n_clue_used_same"
+	Set gtmtypes("sgmnt_data",466,"off")=3872
+	Set gtmtypes("sgmnt_data",466,"len")=8
+	Set gtmtypes("sgmnt_data",466,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("sgmnt_data","n_clue_used_same")=466
+	Set gtmtypes("sgmnt_data",467,"name")="sgmnt_data.n_clue_used_same.curr_count"
+	Set gtmtypes("sgmnt_data",467,"off")=3872
+	Set gtmtypes("sgmnt_data",467,"len")=4
+	Set gtmtypes("sgmnt_data",467,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_clue_used_same.curr_count")=467
+	Set gtmtypes("sgmnt_data",468,"name")="sgmnt_data.n_clue_used_same.cumul_count"
+	Set gtmtypes("sgmnt_data",468,"off")=3876
 	Set gtmtypes("sgmnt_data",468,"len")=4
 	Set gtmtypes("sgmnt_data",468,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_bg_update_creates.curr_count")=468
-	Set gtmtypes("sgmnt_data",469,"name")="sgmnt_data.n_bg_update_creates.cumul_count"
-	Set gtmtypes("sgmnt_data",469,"off")=3924
-	Set gtmtypes("sgmnt_data",469,"len")=4
-	Set gtmtypes("sgmnt_data",469,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_bg_update_creates.cumul_count")=469
-	Set gtmtypes("sgmnt_data",470,"name")="sgmnt_data.n_db_csh_getns"
-	Set gtmtypes("sgmnt_data",470,"off")=3928
-	Set gtmtypes("sgmnt_data",470,"len")=8
-	Set gtmtypes("sgmnt_data",470,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("sgmnt_data","n_db_csh_getns")=470
-	Set gtmtypes("sgmnt_data",471,"name")="sgmnt_data.n_db_csh_getns.curr_count"
-	Set gtmtypes("sgmnt_data",471,"off")=3928
+	Set gtmtypfldindx("sgmnt_data","n_clue_used_same.cumul_count")=468
+	Set gtmtypes("sgmnt_data",469,"name")="sgmnt_data.n_clue_used_tail"
+	Set gtmtypes("sgmnt_data",469,"off")=3880
+	Set gtmtypes("sgmnt_data",469,"len")=8
+	Set gtmtypes("sgmnt_data",469,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("sgmnt_data","n_clue_used_tail")=469
+	Set gtmtypes("sgmnt_data",470,"name")="sgmnt_data.n_clue_used_tail.curr_count"
+	Set gtmtypes("sgmnt_data",470,"off")=3880
+	Set gtmtypes("sgmnt_data",470,"len")=4
+	Set gtmtypes("sgmnt_data",470,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_clue_used_tail.curr_count")=470
+	Set gtmtypes("sgmnt_data",471,"name")="sgmnt_data.n_clue_used_tail.cumul_count"
+	Set gtmtypes("sgmnt_data",471,"off")=3884
 	Set gtmtypes("sgmnt_data",471,"len")=4
 	Set gtmtypes("sgmnt_data",471,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_db_csh_getns.curr_count")=471
-	Set gtmtypes("sgmnt_data",472,"name")="sgmnt_data.n_db_csh_getns.cumul_count"
-	Set gtmtypes("sgmnt_data",472,"off")=3932
-	Set gtmtypes("sgmnt_data",472,"len")=4
-	Set gtmtypes("sgmnt_data",472,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_db_csh_getns.cumul_count")=472
-	Set gtmtypes("sgmnt_data",473,"name")="sgmnt_data.n_db_csh_getn_lcnt"
-	Set gtmtypes("sgmnt_data",473,"off")=3936
-	Set gtmtypes("sgmnt_data",473,"len")=8
-	Set gtmtypes("sgmnt_data",473,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("sgmnt_data","n_db_csh_getn_lcnt")=473
-	Set gtmtypes("sgmnt_data",474,"name")="sgmnt_data.n_db_csh_getn_lcnt.curr_count"
-	Set gtmtypes("sgmnt_data",474,"off")=3936
+	Set gtmtypfldindx("sgmnt_data","n_clue_used_tail.cumul_count")=471
+	Set gtmtypes("sgmnt_data",472,"name")="sgmnt_data.n_t_qreads"
+	Set gtmtypes("sgmnt_data",472,"off")=3888
+	Set gtmtypes("sgmnt_data",472,"len")=8
+	Set gtmtypes("sgmnt_data",472,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("sgmnt_data","n_t_qreads")=472
+	Set gtmtypes("sgmnt_data",473,"name")="sgmnt_data.n_t_qreads.curr_count"
+	Set gtmtypes("sgmnt_data",473,"off")=3888
+	Set gtmtypes("sgmnt_data",473,"len")=4
+	Set gtmtypes("sgmnt_data",473,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_t_qreads.curr_count")=473
+	Set gtmtypes("sgmnt_data",474,"name")="sgmnt_data.n_t_qreads.cumul_count"
+	Set gtmtypes("sgmnt_data",474,"off")=3892
 	Set gtmtypes("sgmnt_data",474,"len")=4
 	Set gtmtypes("sgmnt_data",474,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_db_csh_getn_lcnt.curr_count")=474
-	Set gtmtypes("sgmnt_data",475,"name")="sgmnt_data.n_db_csh_getn_lcnt.cumul_count"
-	Set gtmtypes("sgmnt_data",475,"off")=3940
-	Set gtmtypes("sgmnt_data",475,"len")=4
-	Set gtmtypes("sgmnt_data",475,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","n_db_csh_getn_lcnt.cumul_count")=475
-	Set gtmtypes("sgmnt_data",476,"name")="sgmnt_data.db_csh_acct_rec_filler_4k"
-	Set gtmtypes("sgmnt_data",476,"off")=3944
-	Set gtmtypes("sgmnt_data",476,"len")=152
-	Set gtmtypes("sgmnt_data",476,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","db_csh_acct_rec_filler_4k")=476
-	Set gtmtypes("sgmnt_data",477,"name")="sgmnt_data.gvstats_rec"
-	Set gtmtypes("sgmnt_data",477,"off")=4096
-	Set gtmtypes("sgmnt_data",477,"len")=464
-	Set gtmtypes("sgmnt_data",477,"type")="gvstats_rec_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec")=477
-	Set gtmtypes("sgmnt_data",478,"name")="sgmnt_data.gvstats_rec.n_set"
-	Set gtmtypes("sgmnt_data",478,"off")=4096
+	Set gtmtypfldindx("sgmnt_data","n_t_qreads.cumul_count")=474
+	Set gtmtypes("sgmnt_data",475,"name")="sgmnt_data.unused_dsk_reads"
+	Set gtmtypes("sgmnt_data",475,"off")=3896
+	Set gtmtypes("sgmnt_data",475,"len")=8
+	Set gtmtypes("sgmnt_data",475,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("sgmnt_data","unused_dsk_reads")=475
+	Set gtmtypes("sgmnt_data",476,"name")="sgmnt_data.unused_dsk_reads.curr_count"
+	Set gtmtypes("sgmnt_data",476,"off")=3896
+	Set gtmtypes("sgmnt_data",476,"len")=4
+	Set gtmtypes("sgmnt_data",476,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","unused_dsk_reads.curr_count")=476
+	Set gtmtypes("sgmnt_data",477,"name")="sgmnt_data.unused_dsk_reads.cumul_count"
+	Set gtmtypes("sgmnt_data",477,"off")=3900
+	Set gtmtypes("sgmnt_data",477,"len")=4
+	Set gtmtypes("sgmnt_data",477,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","unused_dsk_reads.cumul_count")=477
+	Set gtmtypes("sgmnt_data",478,"name")="sgmnt_data.n_bgmm_updates"
+	Set gtmtypes("sgmnt_data",478,"off")=3904
 	Set gtmtypes("sgmnt_data",478,"len")=8
-	Set gtmtypes("sgmnt_data",478,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_set")=478
-	Set gtmtypes("sgmnt_data",479,"name")="sgmnt_data.gvstats_rec.n_kill"
-	Set gtmtypes("sgmnt_data",479,"off")=4104
-	Set gtmtypes("sgmnt_data",479,"len")=8
-	Set gtmtypes("sgmnt_data",479,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_kill")=479
-	Set gtmtypes("sgmnt_data",480,"name")="sgmnt_data.gvstats_rec.n_get"
-	Set gtmtypes("sgmnt_data",480,"off")=4112
-	Set gtmtypes("sgmnt_data",480,"len")=8
-	Set gtmtypes("sgmnt_data",480,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_get")=480
-	Set gtmtypes("sgmnt_data",481,"name")="sgmnt_data.gvstats_rec.n_data"
-	Set gtmtypes("sgmnt_data",481,"off")=4120
+	Set gtmtypes("sgmnt_data",478,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("sgmnt_data","n_bgmm_updates")=478
+	Set gtmtypes("sgmnt_data",479,"name")="sgmnt_data.n_bgmm_updates.curr_count"
+	Set gtmtypes("sgmnt_data",479,"off")=3904
+	Set gtmtypes("sgmnt_data",479,"len")=4
+	Set gtmtypes("sgmnt_data",479,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_bgmm_updates.curr_count")=479
+	Set gtmtypes("sgmnt_data",480,"name")="sgmnt_data.n_bgmm_updates.cumul_count"
+	Set gtmtypes("sgmnt_data",480,"off")=3908
+	Set gtmtypes("sgmnt_data",480,"len")=4
+	Set gtmtypes("sgmnt_data",480,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_bgmm_updates.cumul_count")=480
+	Set gtmtypes("sgmnt_data",481,"name")="sgmnt_data.unused_dsk_writes"
+	Set gtmtypes("sgmnt_data",481,"off")=3912
 	Set gtmtypes("sgmnt_data",481,"len")=8
-	Set gtmtypes("sgmnt_data",481,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_data")=481
-	Set gtmtypes("sgmnt_data",482,"name")="sgmnt_data.gvstats_rec.n_order"
-	Set gtmtypes("sgmnt_data",482,"off")=4128
-	Set gtmtypes("sgmnt_data",482,"len")=8
-	Set gtmtypes("sgmnt_data",482,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_order")=482
-	Set gtmtypes("sgmnt_data",483,"name")="sgmnt_data.gvstats_rec.n_zprev"
-	Set gtmtypes("sgmnt_data",483,"off")=4136
-	Set gtmtypes("sgmnt_data",483,"len")=8
-	Set gtmtypes("sgmnt_data",483,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_zprev")=483
-	Set gtmtypes("sgmnt_data",484,"name")="sgmnt_data.gvstats_rec.n_query"
-	Set gtmtypes("sgmnt_data",484,"off")=4144
+	Set gtmtypes("sgmnt_data",481,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("sgmnt_data","unused_dsk_writes")=481
+	Set gtmtypes("sgmnt_data",482,"name")="sgmnt_data.unused_dsk_writes.curr_count"
+	Set gtmtypes("sgmnt_data",482,"off")=3912
+	Set gtmtypes("sgmnt_data",482,"len")=4
+	Set gtmtypes("sgmnt_data",482,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","unused_dsk_writes.curr_count")=482
+	Set gtmtypes("sgmnt_data",483,"name")="sgmnt_data.unused_dsk_writes.cumul_count"
+	Set gtmtypes("sgmnt_data",483,"off")=3916
+	Set gtmtypes("sgmnt_data",483,"len")=4
+	Set gtmtypes("sgmnt_data",483,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","unused_dsk_writes.cumul_count")=483
+	Set gtmtypes("sgmnt_data",484,"name")="sgmnt_data.n_bg_update_creates"
+	Set gtmtypes("sgmnt_data",484,"off")=3920
 	Set gtmtypes("sgmnt_data",484,"len")=8
-	Set gtmtypes("sgmnt_data",484,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_query")=484
-	Set gtmtypes("sgmnt_data",485,"name")="sgmnt_data.gvstats_rec.n_lock_success"
-	Set gtmtypes("sgmnt_data",485,"off")=4152
-	Set gtmtypes("sgmnt_data",485,"len")=8
-	Set gtmtypes("sgmnt_data",485,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_lock_success")=485
-	Set gtmtypes("sgmnt_data",486,"name")="sgmnt_data.gvstats_rec.n_lock_fail"
-	Set gtmtypes("sgmnt_data",486,"off")=4160
-	Set gtmtypes("sgmnt_data",486,"len")=8
-	Set gtmtypes("sgmnt_data",486,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_lock_fail")=486
-	Set gtmtypes("sgmnt_data",487,"name")="sgmnt_data.gvstats_rec.db_curr_tn"
-	Set gtmtypes("sgmnt_data",487,"off")=4168
+	Set gtmtypes("sgmnt_data",484,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("sgmnt_data","n_bg_update_creates")=484
+	Set gtmtypes("sgmnt_data",485,"name")="sgmnt_data.n_bg_update_creates.curr_count"
+	Set gtmtypes("sgmnt_data",485,"off")=3920
+	Set gtmtypes("sgmnt_data",485,"len")=4
+	Set gtmtypes("sgmnt_data",485,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_bg_update_creates.curr_count")=485
+	Set gtmtypes("sgmnt_data",486,"name")="sgmnt_data.n_bg_update_creates.cumul_count"
+	Set gtmtypes("sgmnt_data",486,"off")=3924
+	Set gtmtypes("sgmnt_data",486,"len")=4
+	Set gtmtypes("sgmnt_data",486,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_bg_update_creates.cumul_count")=486
+	Set gtmtypes("sgmnt_data",487,"name")="sgmnt_data.n_db_csh_getns"
+	Set gtmtypes("sgmnt_data",487,"off")=3928
 	Set gtmtypes("sgmnt_data",487,"len")=8
-	Set gtmtypes("sgmnt_data",487,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.db_curr_tn")=487
-	Set gtmtypes("sgmnt_data",488,"name")="sgmnt_data.gvstats_rec.n_dsk_read"
-	Set gtmtypes("sgmnt_data",488,"off")=4176
-	Set gtmtypes("sgmnt_data",488,"len")=8
-	Set gtmtypes("sgmnt_data",488,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_dsk_read")=488
-	Set gtmtypes("sgmnt_data",489,"name")="sgmnt_data.gvstats_rec.n_dsk_write"
-	Set gtmtypes("sgmnt_data",489,"off")=4184
-	Set gtmtypes("sgmnt_data",489,"len")=8
-	Set gtmtypes("sgmnt_data",489,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_dsk_write")=489
-	Set gtmtypes("sgmnt_data",490,"name")="sgmnt_data.gvstats_rec.n_nontp_readwrite"
-	Set gtmtypes("sgmnt_data",490,"off")=4192
+	Set gtmtypes("sgmnt_data",487,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("sgmnt_data","n_db_csh_getns")=487
+	Set gtmtypes("sgmnt_data",488,"name")="sgmnt_data.n_db_csh_getns.curr_count"
+	Set gtmtypes("sgmnt_data",488,"off")=3928
+	Set gtmtypes("sgmnt_data",488,"len")=4
+	Set gtmtypes("sgmnt_data",488,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_db_csh_getns.curr_count")=488
+	Set gtmtypes("sgmnt_data",489,"name")="sgmnt_data.n_db_csh_getns.cumul_count"
+	Set gtmtypes("sgmnt_data",489,"off")=3932
+	Set gtmtypes("sgmnt_data",489,"len")=4
+	Set gtmtypes("sgmnt_data",489,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_db_csh_getns.cumul_count")=489
+	Set gtmtypes("sgmnt_data",490,"name")="sgmnt_data.n_db_csh_getn_lcnt"
+	Set gtmtypes("sgmnt_data",490,"off")=3936
 	Set gtmtypes("sgmnt_data",490,"len")=8
-	Set gtmtypes("sgmnt_data",490,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_readwrite")=490
-	Set gtmtypes("sgmnt_data",491,"name")="sgmnt_data.gvstats_rec.n_nontp_readonly"
-	Set gtmtypes("sgmnt_data",491,"off")=4200
-	Set gtmtypes("sgmnt_data",491,"len")=8
-	Set gtmtypes("sgmnt_data",491,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_readonly")=491
-	Set gtmtypes("sgmnt_data",492,"name")="sgmnt_data.gvstats_rec.n_nontp_blkwrite"
-	Set gtmtypes("sgmnt_data",492,"off")=4208
-	Set gtmtypes("sgmnt_data",492,"len")=8
-	Set gtmtypes("sgmnt_data",492,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_blkwrite")=492
-	Set gtmtypes("sgmnt_data",493,"name")="sgmnt_data.gvstats_rec.n_nontp_blkread"
-	Set gtmtypes("sgmnt_data",493,"off")=4216
-	Set gtmtypes("sgmnt_data",493,"len")=8
-	Set gtmtypes("sgmnt_data",493,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_blkread")=493
-	Set gtmtypes("sgmnt_data",494,"name")="sgmnt_data.gvstats_rec.n_nontp_retries_0"
-	Set gtmtypes("sgmnt_data",494,"off")=4224
-	Set gtmtypes("sgmnt_data",494,"len")=8
-	Set gtmtypes("sgmnt_data",494,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_retries_0")=494
-	Set gtmtypes("sgmnt_data",495,"name")="sgmnt_data.gvstats_rec.n_nontp_retries_1"
-	Set gtmtypes("sgmnt_data",495,"off")=4232
+	Set gtmtypes("sgmnt_data",490,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("sgmnt_data","n_db_csh_getn_lcnt")=490
+	Set gtmtypes("sgmnt_data",491,"name")="sgmnt_data.n_db_csh_getn_lcnt.curr_count"
+	Set gtmtypes("sgmnt_data",491,"off")=3936
+	Set gtmtypes("sgmnt_data",491,"len")=4
+	Set gtmtypes("sgmnt_data",491,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_db_csh_getn_lcnt.curr_count")=491
+	Set gtmtypes("sgmnt_data",492,"name")="sgmnt_data.n_db_csh_getn_lcnt.cumul_count"
+	Set gtmtypes("sgmnt_data",492,"off")=3940
+	Set gtmtypes("sgmnt_data",492,"len")=4
+	Set gtmtypes("sgmnt_data",492,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","n_db_csh_getn_lcnt.cumul_count")=492
+	Set gtmtypes("sgmnt_data",493,"name")="sgmnt_data.db_csh_acct_rec_filler_4k"
+	Set gtmtypes("sgmnt_data",493,"off")=3944
+	Set gtmtypes("sgmnt_data",493,"len")=152
+	Set gtmtypes("sgmnt_data",493,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","db_csh_acct_rec_filler_4k")=493
+	Set gtmtypes("sgmnt_data",494,"name")="sgmnt_data.gvstats_rec"
+	Set gtmtypes("sgmnt_data",494,"off")=4096
+	Set gtmtypes("sgmnt_data",494,"len")=472
+	Set gtmtypes("sgmnt_data",494,"type")="gvstats_rec_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec")=494
+	Set gtmtypes("sgmnt_data",495,"name")="sgmnt_data.gvstats_rec.n_set"
+	Set gtmtypes("sgmnt_data",495,"off")=4096
 	Set gtmtypes("sgmnt_data",495,"len")=8
 	Set gtmtypes("sgmnt_data",495,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_retries_1")=495
-	Set gtmtypes("sgmnt_data",496,"name")="sgmnt_data.gvstats_rec.n_nontp_retries_2"
-	Set gtmtypes("sgmnt_data",496,"off")=4240
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_set")=495
+	Set gtmtypes("sgmnt_data",496,"name")="sgmnt_data.gvstats_rec.n_kill"
+	Set gtmtypes("sgmnt_data",496,"off")=4104
 	Set gtmtypes("sgmnt_data",496,"len")=8
 	Set gtmtypes("sgmnt_data",496,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_retries_2")=496
-	Set gtmtypes("sgmnt_data",497,"name")="sgmnt_data.gvstats_rec.n_nontp_retries_3"
-	Set gtmtypes("sgmnt_data",497,"off")=4248
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_kill")=496
+	Set gtmtypes("sgmnt_data",497,"name")="sgmnt_data.gvstats_rec.n_get"
+	Set gtmtypes("sgmnt_data",497,"off")=4112
 	Set gtmtypes("sgmnt_data",497,"len")=8
 	Set gtmtypes("sgmnt_data",497,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_retries_3")=497
-	Set gtmtypes("sgmnt_data",498,"name")="sgmnt_data.gvstats_rec.n_tp_readwrite"
-	Set gtmtypes("sgmnt_data",498,"off")=4256
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_get")=497
+	Set gtmtypes("sgmnt_data",498,"name")="sgmnt_data.gvstats_rec.n_data"
+	Set gtmtypes("sgmnt_data",498,"off")=4120
 	Set gtmtypes("sgmnt_data",498,"len")=8
 	Set gtmtypes("sgmnt_data",498,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_readwrite")=498
-	Set gtmtypes("sgmnt_data",499,"name")="sgmnt_data.gvstats_rec.n_tp_readonly"
-	Set gtmtypes("sgmnt_data",499,"off")=4264
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_data")=498
+	Set gtmtypes("sgmnt_data",499,"name")="sgmnt_data.gvstats_rec.n_order"
+	Set gtmtypes("sgmnt_data",499,"off")=4128
 	Set gtmtypes("sgmnt_data",499,"len")=8
 	Set gtmtypes("sgmnt_data",499,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_readonly")=499
-	Set gtmtypes("sgmnt_data",500,"name")="sgmnt_data.gvstats_rec.n_tp_rolledback"
-	Set gtmtypes("sgmnt_data",500,"off")=4272
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_order")=499
+	Set gtmtypes("sgmnt_data",500,"name")="sgmnt_data.gvstats_rec.n_zprev"
+	Set gtmtypes("sgmnt_data",500,"off")=4136
 	Set gtmtypes("sgmnt_data",500,"len")=8
 	Set gtmtypes("sgmnt_data",500,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_rolledback")=500
-	Set gtmtypes("sgmnt_data",501,"name")="sgmnt_data.gvstats_rec.n_tp_blkwrite"
-	Set gtmtypes("sgmnt_data",501,"off")=4280
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_zprev")=500
+	Set gtmtypes("sgmnt_data",501,"name")="sgmnt_data.gvstats_rec.n_query"
+	Set gtmtypes("sgmnt_data",501,"off")=4144
 	Set gtmtypes("sgmnt_data",501,"len")=8
 	Set gtmtypes("sgmnt_data",501,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_blkwrite")=501
-	Set gtmtypes("sgmnt_data",502,"name")="sgmnt_data.gvstats_rec.n_tp_blkread"
-	Set gtmtypes("sgmnt_data",502,"off")=4288
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_query")=501
+	Set gtmtypes("sgmnt_data",502,"name")="sgmnt_data.gvstats_rec.n_lock_success"
+	Set gtmtypes("sgmnt_data",502,"off")=4152
 	Set gtmtypes("sgmnt_data",502,"len")=8
 	Set gtmtypes("sgmnt_data",502,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_blkread")=502
-	Set gtmtypes("sgmnt_data",503,"name")="sgmnt_data.gvstats_rec.n_tp_tot_retries_0"
-	Set gtmtypes("sgmnt_data",503,"off")=4296
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_lock_success")=502
+	Set gtmtypes("sgmnt_data",503,"name")="sgmnt_data.gvstats_rec.n_lock_fail"
+	Set gtmtypes("sgmnt_data",503,"off")=4160
 	Set gtmtypes("sgmnt_data",503,"len")=8
 	Set gtmtypes("sgmnt_data",503,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_tot_retries_0")=503
-	Set gtmtypes("sgmnt_data",504,"name")="sgmnt_data.gvstats_rec.n_tp_tot_retries_1"
-	Set gtmtypes("sgmnt_data",504,"off")=4304
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_lock_fail")=503
+	Set gtmtypes("sgmnt_data",504,"name")="sgmnt_data.gvstats_rec.db_curr_tn"
+	Set gtmtypes("sgmnt_data",504,"off")=4168
 	Set gtmtypes("sgmnt_data",504,"len")=8
 	Set gtmtypes("sgmnt_data",504,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_tot_retries_1")=504
-	Set gtmtypes("sgmnt_data",505,"name")="sgmnt_data.gvstats_rec.n_tp_tot_retries_2"
-	Set gtmtypes("sgmnt_data",505,"off")=4312
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.db_curr_tn")=504
+	Set gtmtypes("sgmnt_data",505,"name")="sgmnt_data.gvstats_rec.n_dsk_read"
+	Set gtmtypes("sgmnt_data",505,"off")=4176
 	Set gtmtypes("sgmnt_data",505,"len")=8
 	Set gtmtypes("sgmnt_data",505,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_tot_retries_2")=505
-	Set gtmtypes("sgmnt_data",506,"name")="sgmnt_data.gvstats_rec.n_tp_tot_retries_3"
-	Set gtmtypes("sgmnt_data",506,"off")=4320
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_dsk_read")=505
+	Set gtmtypes("sgmnt_data",506,"name")="sgmnt_data.gvstats_rec.n_dsk_write"
+	Set gtmtypes("sgmnt_data",506,"off")=4184
 	Set gtmtypes("sgmnt_data",506,"len")=8
 	Set gtmtypes("sgmnt_data",506,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_tot_retries_3")=506
-	Set gtmtypes("sgmnt_data",507,"name")="sgmnt_data.gvstats_rec.n_tp_tot_retries_4"
-	Set gtmtypes("sgmnt_data",507,"off")=4328
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_dsk_write")=506
+	Set gtmtypes("sgmnt_data",507,"name")="sgmnt_data.gvstats_rec.n_nontp_readwrite"
+	Set gtmtypes("sgmnt_data",507,"off")=4192
 	Set gtmtypes("sgmnt_data",507,"len")=8
 	Set gtmtypes("sgmnt_data",507,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_tot_retries_4")=507
-	Set gtmtypes("sgmnt_data",508,"name")="sgmnt_data.gvstats_rec.n_tp_cnflct_retries_0"
-	Set gtmtypes("sgmnt_data",508,"off")=4336
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_readwrite")=507
+	Set gtmtypes("sgmnt_data",508,"name")="sgmnt_data.gvstats_rec.n_nontp_readonly"
+	Set gtmtypes("sgmnt_data",508,"off")=4200
 	Set gtmtypes("sgmnt_data",508,"len")=8
 	Set gtmtypes("sgmnt_data",508,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_cnflct_retries_0")=508
-	Set gtmtypes("sgmnt_data",509,"name")="sgmnt_data.gvstats_rec.n_tp_cnflct_retries_1"
-	Set gtmtypes("sgmnt_data",509,"off")=4344
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_readonly")=508
+	Set gtmtypes("sgmnt_data",509,"name")="sgmnt_data.gvstats_rec.n_nontp_blkwrite"
+	Set gtmtypes("sgmnt_data",509,"off")=4208
 	Set gtmtypes("sgmnt_data",509,"len")=8
 	Set gtmtypes("sgmnt_data",509,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_cnflct_retries_1")=509
-	Set gtmtypes("sgmnt_data",510,"name")="sgmnt_data.gvstats_rec.n_tp_cnflct_retries_2"
-	Set gtmtypes("sgmnt_data",510,"off")=4352
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_blkwrite")=509
+	Set gtmtypes("sgmnt_data",510,"name")="sgmnt_data.gvstats_rec.n_nontp_blkread"
+	Set gtmtypes("sgmnt_data",510,"off")=4216
 	Set gtmtypes("sgmnt_data",510,"len")=8
 	Set gtmtypes("sgmnt_data",510,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_cnflct_retries_2")=510
-	Set gtmtypes("sgmnt_data",511,"name")="sgmnt_data.gvstats_rec.n_tp_cnflct_retries_3"
-	Set gtmtypes("sgmnt_data",511,"off")=4360
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_blkread")=510
+	Set gtmtypes("sgmnt_data",511,"name")="sgmnt_data.gvstats_rec.n_nontp_retries_0"
+	Set gtmtypes("sgmnt_data",511,"off")=4224
 	Set gtmtypes("sgmnt_data",511,"len")=8
 	Set gtmtypes("sgmnt_data",511,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_cnflct_retries_3")=511
-	Set gtmtypes("sgmnt_data",512,"name")="sgmnt_data.gvstats_rec.n_tp_cnflct_retries_4"
-	Set gtmtypes("sgmnt_data",512,"off")=4368
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_retries_0")=511
+	Set gtmtypes("sgmnt_data",512,"name")="sgmnt_data.gvstats_rec.n_nontp_retries_1"
+	Set gtmtypes("sgmnt_data",512,"off")=4232
 	Set gtmtypes("sgmnt_data",512,"len")=8
 	Set gtmtypes("sgmnt_data",512,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_cnflct_retries_4")=512
-	Set gtmtypes("sgmnt_data",513,"name")="sgmnt_data.gvstats_rec.n_ztrigger"
-	Set gtmtypes("sgmnt_data",513,"off")=4376
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_retries_1")=512
+	Set gtmtypes("sgmnt_data",513,"name")="sgmnt_data.gvstats_rec.n_nontp_retries_2"
+	Set gtmtypes("sgmnt_data",513,"off")=4240
 	Set gtmtypes("sgmnt_data",513,"len")=8
 	Set gtmtypes("sgmnt_data",513,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_ztrigger")=513
-	Set gtmtypes("sgmnt_data",514,"name")="sgmnt_data.gvstats_rec.n_db_flush"
-	Set gtmtypes("sgmnt_data",514,"off")=4384
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_retries_2")=513
+	Set gtmtypes("sgmnt_data",514,"name")="sgmnt_data.gvstats_rec.n_nontp_retries_3"
+	Set gtmtypes("sgmnt_data",514,"off")=4248
 	Set gtmtypes("sgmnt_data",514,"len")=8
 	Set gtmtypes("sgmnt_data",514,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_db_flush")=514
-	Set gtmtypes("sgmnt_data",515,"name")="sgmnt_data.gvstats_rec.n_db_fsync"
-	Set gtmtypes("sgmnt_data",515,"off")=4392
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_nontp_retries_3")=514
+	Set gtmtypes("sgmnt_data",515,"name")="sgmnt_data.gvstats_rec.n_tp_readwrite"
+	Set gtmtypes("sgmnt_data",515,"off")=4256
 	Set gtmtypes("sgmnt_data",515,"len")=8
 	Set gtmtypes("sgmnt_data",515,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_db_fsync")=515
-	Set gtmtypes("sgmnt_data",516,"name")="sgmnt_data.gvstats_rec.n_jnl_flush"
-	Set gtmtypes("sgmnt_data",516,"off")=4400
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_readwrite")=515
+	Set gtmtypes("sgmnt_data",516,"name")="sgmnt_data.gvstats_rec.n_tp_readonly"
+	Set gtmtypes("sgmnt_data",516,"off")=4264
 	Set gtmtypes("sgmnt_data",516,"len")=8
 	Set gtmtypes("sgmnt_data",516,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jnl_flush")=516
-	Set gtmtypes("sgmnt_data",517,"name")="sgmnt_data.gvstats_rec.n_jnl_fsync"
-	Set gtmtypes("sgmnt_data",517,"off")=4408
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_readonly")=516
+	Set gtmtypes("sgmnt_data",517,"name")="sgmnt_data.gvstats_rec.n_tp_rolledback"
+	Set gtmtypes("sgmnt_data",517,"off")=4272
 	Set gtmtypes("sgmnt_data",517,"len")=8
 	Set gtmtypes("sgmnt_data",517,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jnl_fsync")=517
-	Set gtmtypes("sgmnt_data",518,"name")="sgmnt_data.gvstats_rec.n_jbuff_bytes"
-	Set gtmtypes("sgmnt_data",518,"off")=4416
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_rolledback")=517
+	Set gtmtypes("sgmnt_data",518,"name")="sgmnt_data.gvstats_rec.n_tp_blkwrite"
+	Set gtmtypes("sgmnt_data",518,"off")=4280
 	Set gtmtypes("sgmnt_data",518,"len")=8
 	Set gtmtypes("sgmnt_data",518,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jbuff_bytes")=518
-	Set gtmtypes("sgmnt_data",519,"name")="sgmnt_data.gvstats_rec.n_jfile_bytes"
-	Set gtmtypes("sgmnt_data",519,"off")=4424
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_blkwrite")=518
+	Set gtmtypes("sgmnt_data",519,"name")="sgmnt_data.gvstats_rec.n_tp_blkread"
+	Set gtmtypes("sgmnt_data",519,"off")=4288
 	Set gtmtypes("sgmnt_data",519,"len")=8
 	Set gtmtypes("sgmnt_data",519,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jfile_bytes")=519
-	Set gtmtypes("sgmnt_data",520,"name")="sgmnt_data.gvstats_rec.n_jfile_writes"
-	Set gtmtypes("sgmnt_data",520,"off")=4432
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_blkread")=519
+	Set gtmtypes("sgmnt_data",520,"name")="sgmnt_data.gvstats_rec.n_tp_tot_retries_0"
+	Set gtmtypes("sgmnt_data",520,"off")=4296
 	Set gtmtypes("sgmnt_data",520,"len")=8
 	Set gtmtypes("sgmnt_data",520,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jfile_writes")=520
-	Set gtmtypes("sgmnt_data",521,"name")="sgmnt_data.gvstats_rec.n_jrec_logical"
-	Set gtmtypes("sgmnt_data",521,"off")=4440
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_tot_retries_0")=520
+	Set gtmtypes("sgmnt_data",521,"name")="sgmnt_data.gvstats_rec.n_tp_tot_retries_1"
+	Set gtmtypes("sgmnt_data",521,"off")=4304
 	Set gtmtypes("sgmnt_data",521,"len")=8
 	Set gtmtypes("sgmnt_data",521,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jrec_logical")=521
-	Set gtmtypes("sgmnt_data",522,"name")="sgmnt_data.gvstats_rec.n_jrec_pblk"
-	Set gtmtypes("sgmnt_data",522,"off")=4448
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_tot_retries_1")=521
+	Set gtmtypes("sgmnt_data",522,"name")="sgmnt_data.gvstats_rec.n_tp_tot_retries_2"
+	Set gtmtypes("sgmnt_data",522,"off")=4312
 	Set gtmtypes("sgmnt_data",522,"len")=8
 	Set gtmtypes("sgmnt_data",522,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jrec_pblk")=522
-	Set gtmtypes("sgmnt_data",523,"name")="sgmnt_data.gvstats_rec.n_jrec_epoch_regular"
-	Set gtmtypes("sgmnt_data",523,"off")=4456
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_tot_retries_2")=522
+	Set gtmtypes("sgmnt_data",523,"name")="sgmnt_data.gvstats_rec.n_tp_tot_retries_3"
+	Set gtmtypes("sgmnt_data",523,"off")=4320
 	Set gtmtypes("sgmnt_data",523,"len")=8
 	Set gtmtypes("sgmnt_data",523,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jrec_epoch_regular")=523
-	Set gtmtypes("sgmnt_data",524,"name")="sgmnt_data.gvstats_rec.n_jrec_epoch_idle"
-	Set gtmtypes("sgmnt_data",524,"off")=4464
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_tot_retries_3")=523
+	Set gtmtypes("sgmnt_data",524,"name")="sgmnt_data.gvstats_rec.n_tp_tot_retries_4"
+	Set gtmtypes("sgmnt_data",524,"off")=4328
 	Set gtmtypes("sgmnt_data",524,"len")=8
 	Set gtmtypes("sgmnt_data",524,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jrec_epoch_idle")=524
-	Set gtmtypes("sgmnt_data",525,"name")="sgmnt_data.gvstats_rec.n_jrec_other"
-	Set gtmtypes("sgmnt_data",525,"off")=4472
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_tot_retries_4")=524
+	Set gtmtypes("sgmnt_data",525,"name")="sgmnt_data.gvstats_rec.n_tp_cnflct_retries_0"
+	Set gtmtypes("sgmnt_data",525,"off")=4336
 	Set gtmtypes("sgmnt_data",525,"len")=8
 	Set gtmtypes("sgmnt_data",525,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jrec_other")=525
-	Set gtmtypes("sgmnt_data",526,"name")="sgmnt_data.gvstats_rec.n_jnl_extends"
-	Set gtmtypes("sgmnt_data",526,"off")=4480
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_cnflct_retries_0")=525
+	Set gtmtypes("sgmnt_data",526,"name")="sgmnt_data.gvstats_rec.n_tp_cnflct_retries_1"
+	Set gtmtypes("sgmnt_data",526,"off")=4344
 	Set gtmtypes("sgmnt_data",526,"len")=8
 	Set gtmtypes("sgmnt_data",526,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jnl_extends")=526
-	Set gtmtypes("sgmnt_data",527,"name")="sgmnt_data.gvstats_rec.n_db_extends"
-	Set gtmtypes("sgmnt_data",527,"off")=4488
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_cnflct_retries_1")=526
+	Set gtmtypes("sgmnt_data",527,"name")="sgmnt_data.gvstats_rec.n_tp_cnflct_retries_2"
+	Set gtmtypes("sgmnt_data",527,"off")=4352
 	Set gtmtypes("sgmnt_data",527,"len")=8
 	Set gtmtypes("sgmnt_data",527,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_db_extends")=527
-	Set gtmtypes("sgmnt_data",528,"name")="sgmnt_data.gvstats_rec.n_crit_success"
-	Set gtmtypes("sgmnt_data",528,"off")=4496
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_cnflct_retries_2")=527
+	Set gtmtypes("sgmnt_data",528,"name")="sgmnt_data.gvstats_rec.n_tp_cnflct_retries_3"
+	Set gtmtypes("sgmnt_data",528,"off")=4360
 	Set gtmtypes("sgmnt_data",528,"len")=8
 	Set gtmtypes("sgmnt_data",528,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_crit_success")=528
-	Set gtmtypes("sgmnt_data",529,"name")="sgmnt_data.gvstats_rec.n_crits_in_epch"
-	Set gtmtypes("sgmnt_data",529,"off")=4504
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_cnflct_retries_3")=528
+	Set gtmtypes("sgmnt_data",529,"name")="sgmnt_data.gvstats_rec.n_tp_cnflct_retries_4"
+	Set gtmtypes("sgmnt_data",529,"off")=4368
 	Set gtmtypes("sgmnt_data",529,"len")=8
 	Set gtmtypes("sgmnt_data",529,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_crits_in_epch")=529
-	Set gtmtypes("sgmnt_data",530,"name")="sgmnt_data.gvstats_rec.sq_crit_failed"
-	Set gtmtypes("sgmnt_data",530,"off")=4512
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_tp_cnflct_retries_4")=529
+	Set gtmtypes("sgmnt_data",530,"name")="sgmnt_data.gvstats_rec.n_ztrigger"
+	Set gtmtypes("sgmnt_data",530,"off")=4376
 	Set gtmtypes("sgmnt_data",530,"len")=8
 	Set gtmtypes("sgmnt_data",530,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.sq_crit_failed")=530
-	Set gtmtypes("sgmnt_data",531,"name")="sgmnt_data.gvstats_rec.n_crit_failed"
-	Set gtmtypes("sgmnt_data",531,"off")=4520
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_ztrigger")=530
+	Set gtmtypes("sgmnt_data",531,"name")="sgmnt_data.gvstats_rec.n_db_flush"
+	Set gtmtypes("sgmnt_data",531,"off")=4384
 	Set gtmtypes("sgmnt_data",531,"len")=8
 	Set gtmtypes("sgmnt_data",531,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_crit_failed")=531
-	Set gtmtypes("sgmnt_data",532,"name")="sgmnt_data.gvstats_rec.sq_crit_que_slps"
-	Set gtmtypes("sgmnt_data",532,"off")=4528
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_db_flush")=531
+	Set gtmtypes("sgmnt_data",532,"name")="sgmnt_data.gvstats_rec.n_db_fsync"
+	Set gtmtypes("sgmnt_data",532,"off")=4392
 	Set gtmtypes("sgmnt_data",532,"len")=8
 	Set gtmtypes("sgmnt_data",532,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.sq_crit_que_slps")=532
-	Set gtmtypes("sgmnt_data",533,"name")="sgmnt_data.gvstats_rec.n_crit_que_slps"
-	Set gtmtypes("sgmnt_data",533,"off")=4536
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_db_fsync")=532
+	Set gtmtypes("sgmnt_data",533,"name")="sgmnt_data.gvstats_rec.n_jnl_flush"
+	Set gtmtypes("sgmnt_data",533,"off")=4400
 	Set gtmtypes("sgmnt_data",533,"len")=8
 	Set gtmtypes("sgmnt_data",533,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_crit_que_slps")=533
-	Set gtmtypes("sgmnt_data",534,"name")="sgmnt_data.gvstats_rec.sq_crit_yields"
-	Set gtmtypes("sgmnt_data",534,"off")=4544
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jnl_flush")=533
+	Set gtmtypes("sgmnt_data",534,"name")="sgmnt_data.gvstats_rec.n_jnl_fsync"
+	Set gtmtypes("sgmnt_data",534,"off")=4408
 	Set gtmtypes("sgmnt_data",534,"len")=8
 	Set gtmtypes("sgmnt_data",534,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.sq_crit_yields")=534
-	Set gtmtypes("sgmnt_data",535,"name")="sgmnt_data.gvstats_rec.n_crit_yields"
-	Set gtmtypes("sgmnt_data",535,"off")=4552
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jnl_fsync")=534
+	Set gtmtypes("sgmnt_data",535,"name")="sgmnt_data.gvstats_rec.n_jbuff_bytes"
+	Set gtmtypes("sgmnt_data",535,"off")=4416
 	Set gtmtypes("sgmnt_data",535,"len")=8
 	Set gtmtypes("sgmnt_data",535,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_crit_yields")=535
-	Set gtmtypes("sgmnt_data",536,"name")="sgmnt_data.gvstats_rec_filler_4k_plus_512"
-	Set gtmtypes("sgmnt_data",536,"off")=4560
-	Set gtmtypes("sgmnt_data",536,"len")=48
-	Set gtmtypes("sgmnt_data",536,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","gvstats_rec_filler_4k_plus_512")=536
-	Set gtmtypes("sgmnt_data",537,"name")="sgmnt_data.filler_4k_plus_512"
-	Set gtmtypes("sgmnt_data",537,"off")=4608
-	Set gtmtypes("sgmnt_data",537,"len")=368
-	Set gtmtypes("sgmnt_data",537,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","filler_4k_plus_512")=537
-	Set gtmtypes("sgmnt_data",538,"name")="sgmnt_data.intrpt_recov_resync_strm_seqno"
-	Set gtmtypes("sgmnt_data",538,"off")=4976
-	Set gtmtypes("sgmnt_data",538,"len")=128
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jbuff_bytes")=535
+	Set gtmtypes("sgmnt_data",536,"name")="sgmnt_data.gvstats_rec.n_jfile_bytes"
+	Set gtmtypes("sgmnt_data",536,"off")=4424
+	Set gtmtypes("sgmnt_data",536,"len")=8
+	Set gtmtypes("sgmnt_data",536,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jfile_bytes")=536
+	Set gtmtypes("sgmnt_data",537,"name")="sgmnt_data.gvstats_rec.n_jfile_writes"
+	Set gtmtypes("sgmnt_data",537,"off")=4432
+	Set gtmtypes("sgmnt_data",537,"len")=8
+	Set gtmtypes("sgmnt_data",537,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jfile_writes")=537
+	Set gtmtypes("sgmnt_data",538,"name")="sgmnt_data.gvstats_rec.n_jrec_logical"
+	Set gtmtypes("sgmnt_data",538,"off")=4440
+	Set gtmtypes("sgmnt_data",538,"len")=8
 	Set gtmtypes("sgmnt_data",538,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","intrpt_recov_resync_strm_seqno")=538
-	Set gtmtypes("sgmnt_data",538,"dim")=16
-	Set gtmtypes("sgmnt_data",539,"name")="sgmnt_data.creation_db_ver"
-	Set gtmtypes("sgmnt_data",539,"off")=5104
-	Set gtmtypes("sgmnt_data",539,"len")=4
-	Set gtmtypes("sgmnt_data",539,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","creation_db_ver")=539
-	Set gtmtypes("sgmnt_data",540,"name")="sgmnt_data.creation_mdb_ver"
-	Set gtmtypes("sgmnt_data",540,"off")=5108
-	Set gtmtypes("sgmnt_data",540,"len")=4
-	Set gtmtypes("sgmnt_data",540,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","creation_mdb_ver")=540
-	Set gtmtypes("sgmnt_data",541,"name")="sgmnt_data.certified_for_upgrade_to"
-	Set gtmtypes("sgmnt_data",541,"off")=5112
-	Set gtmtypes("sgmnt_data",541,"len")=4
-	Set gtmtypes("sgmnt_data",541,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","certified_for_upgrade_to")=541
-	Set gtmtypes("sgmnt_data",542,"name")="sgmnt_data.filler_5k"
-	Set gtmtypes("sgmnt_data",542,"off")=5116
-	Set gtmtypes("sgmnt_data",542,"len")=4
-	Set gtmtypes("sgmnt_data",542,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","filler_5k")=542
-	Set gtmtypes("sgmnt_data",543,"name")="sgmnt_data.secshr_ops_index_filler"
-	Set gtmtypes("sgmnt_data",543,"off")=5120
-	Set gtmtypes("sgmnt_data",543,"len")=4
-	Set gtmtypes("sgmnt_data",543,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","secshr_ops_index_filler")=543
-	Set gtmtypes("sgmnt_data",544,"name")="sgmnt_data.secshr_ops_array_filler"
-	Set gtmtypes("sgmnt_data",544,"off")=5124
-	Set gtmtypes("sgmnt_data",544,"len")=1020
-	Set gtmtypes("sgmnt_data",544,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","secshr_ops_array_filler")=544
-	Set gtmtypes("sgmnt_data",544,"dim")=255
-	Set gtmtypes("sgmnt_data",545,"name")="sgmnt_data.next_upgrd_warn"
-	Set gtmtypes("sgmnt_data",545,"off")=6144
-	Set gtmtypes("sgmnt_data",545,"len")=24
-	Set gtmtypes("sgmnt_data",545,"type")="compswap_time_field"
-	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn")=545
-	Set gtmtypes("sgmnt_data",546,"name")="sgmnt_data.next_upgrd_warn.time_latch"
-	Set gtmtypes("sgmnt_data",546,"off")=6144
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jrec_logical")=538
+	Set gtmtypes("sgmnt_data",539,"name")="sgmnt_data.gvstats_rec.n_jrec_pblk"
+	Set gtmtypes("sgmnt_data",539,"off")=4448
+	Set gtmtypes("sgmnt_data",539,"len")=8
+	Set gtmtypes("sgmnt_data",539,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jrec_pblk")=539
+	Set gtmtypes("sgmnt_data",540,"name")="sgmnt_data.gvstats_rec.n_jrec_epoch_regular"
+	Set gtmtypes("sgmnt_data",540,"off")=4456
+	Set gtmtypes("sgmnt_data",540,"len")=8
+	Set gtmtypes("sgmnt_data",540,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jrec_epoch_regular")=540
+	Set gtmtypes("sgmnt_data",541,"name")="sgmnt_data.gvstats_rec.n_jrec_epoch_idle"
+	Set gtmtypes("sgmnt_data",541,"off")=4464
+	Set gtmtypes("sgmnt_data",541,"len")=8
+	Set gtmtypes("sgmnt_data",541,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jrec_epoch_idle")=541
+	Set gtmtypes("sgmnt_data",542,"name")="sgmnt_data.gvstats_rec.n_jrec_other"
+	Set gtmtypes("sgmnt_data",542,"off")=4472
+	Set gtmtypes("sgmnt_data",542,"len")=8
+	Set gtmtypes("sgmnt_data",542,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jrec_other")=542
+	Set gtmtypes("sgmnt_data",543,"name")="sgmnt_data.gvstats_rec.n_jnl_extends"
+	Set gtmtypes("sgmnt_data",543,"off")=4480
+	Set gtmtypes("sgmnt_data",543,"len")=8
+	Set gtmtypes("sgmnt_data",543,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_jnl_extends")=543
+	Set gtmtypes("sgmnt_data",544,"name")="sgmnt_data.gvstats_rec.n_db_extends"
+	Set gtmtypes("sgmnt_data",544,"off")=4488
+	Set gtmtypes("sgmnt_data",544,"len")=8
+	Set gtmtypes("sgmnt_data",544,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_db_extends")=544
+	Set gtmtypes("sgmnt_data",545,"name")="sgmnt_data.gvstats_rec.n_crit_success"
+	Set gtmtypes("sgmnt_data",545,"off")=4496
+	Set gtmtypes("sgmnt_data",545,"len")=8
+	Set gtmtypes("sgmnt_data",545,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_crit_success")=545
+	Set gtmtypes("sgmnt_data",546,"name")="sgmnt_data.gvstats_rec.n_crits_in_epch"
+	Set gtmtypes("sgmnt_data",546,"off")=4504
 	Set gtmtypes("sgmnt_data",546,"len")=8
-	Set gtmtypes("sgmnt_data",546,"type")="global_latch_t"
-	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch")=546
-	Set gtmtypes("sgmnt_data",547,"name")="sgmnt_data.next_upgrd_warn.time_latch.u"
-	Set gtmtypes("sgmnt_data",547,"off")=6144
+	Set gtmtypes("sgmnt_data",546,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_crits_in_epch")=546
+	Set gtmtypes("sgmnt_data",547,"name")="sgmnt_data.gvstats_rec.sq_crit_failed"
+	Set gtmtypes("sgmnt_data",547,"off")=4512
 	Set gtmtypes("sgmnt_data",547,"len")=8
-	Set gtmtypes("sgmnt_data",547,"type")="union"
-	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch.u")=547
-	Set gtmtypes("sgmnt_data",548,"name")="sgmnt_data.next_upgrd_warn.time_latch.u.pid_imgcnt"
-	Set gtmtypes("sgmnt_data",548,"off")=6144
+	Set gtmtypes("sgmnt_data",547,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.sq_crit_failed")=547
+	Set gtmtypes("sgmnt_data",548,"name")="sgmnt_data.gvstats_rec.n_crit_failed"
+	Set gtmtypes("sgmnt_data",548,"off")=4520
 	Set gtmtypes("sgmnt_data",548,"len")=8
 	Set gtmtypes("sgmnt_data",548,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch.u.pid_imgcnt")=548
-	Set gtmtypes("sgmnt_data",549,"name")="sgmnt_data.next_upgrd_warn.time_latch.u.parts"
-	Set gtmtypes("sgmnt_data",549,"off")=6144
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_crit_failed")=548
+	Set gtmtypes("sgmnt_data",549,"name")="sgmnt_data.gvstats_rec.sq_crit_que_slps"
+	Set gtmtypes("sgmnt_data",549,"off")=4528
 	Set gtmtypes("sgmnt_data",549,"len")=8
-	Set gtmtypes("sgmnt_data",549,"type")="struct"
-	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch.u.parts")=549
-	Set gtmtypes("sgmnt_data",550,"name")="sgmnt_data.next_upgrd_warn.time_latch.u.parts.latch_pid"
-	Set gtmtypes("sgmnt_data",550,"off")=6144
-	Set gtmtypes("sgmnt_data",550,"len")=4
-	Set gtmtypes("sgmnt_data",550,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch.u.parts.latch_pid")=550
-	Set gtmtypes("sgmnt_data",551,"name")="sgmnt_data.next_upgrd_warn.time_latch.u.parts.latch_word"
-	Set gtmtypes("sgmnt_data",551,"off")=6148
-	Set gtmtypes("sgmnt_data",551,"len")=4
-	Set gtmtypes("sgmnt_data",551,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch.u.parts.latch_word")=551
-	Set gtmtypes("sgmnt_data",552,"name")="sgmnt_data.next_upgrd_warn.hp_latch_space"
-	Set gtmtypes("sgmnt_data",552,"off")=6152
-	Set gtmtypes("sgmnt_data",552,"len")=16
-	Set gtmtypes("sgmnt_data",552,"type")="int"
-	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.hp_latch_space")=552
-	Set gtmtypes("sgmnt_data",552,"dim")=4
-	Set gtmtypes("sgmnt_data",553,"name")="sgmnt_data.is_encrypted"
-	Set gtmtypes("sgmnt_data",553,"off")=6168
-	Set gtmtypes("sgmnt_data",553,"len")=4
-	Set gtmtypes("sgmnt_data",553,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","is_encrypted")=553
-	Set gtmtypes("sgmnt_data",554,"name")="sgmnt_data.db_trigger_cycle"
-	Set gtmtypes("sgmnt_data",554,"off")=6172
-	Set gtmtypes("sgmnt_data",554,"len")=4
-	Set gtmtypes("sgmnt_data",554,"type")="unsigned-int"
-	Set gtmtypfldindx("sgmnt_data","db_trigger_cycle")=554
-	Set gtmtypes("sgmnt_data",555,"name")="sgmnt_data.strm_reg_seqno"
-	Set gtmtypes("sgmnt_data",555,"off")=6176
-	Set gtmtypes("sgmnt_data",555,"len")=128
-	Set gtmtypes("sgmnt_data",555,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","strm_reg_seqno")=555
-	Set gtmtypes("sgmnt_data",555,"dim")=16
-	Set gtmtypes("sgmnt_data",556,"name")="sgmnt_data.save_strm_reg_seqno"
-	Set gtmtypes("sgmnt_data",556,"off")=6304
+	Set gtmtypes("sgmnt_data",549,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.sq_crit_que_slps")=549
+	Set gtmtypes("sgmnt_data",550,"name")="sgmnt_data.gvstats_rec.n_crit_que_slps"
+	Set gtmtypes("sgmnt_data",550,"off")=4536
+	Set gtmtypes("sgmnt_data",550,"len")=8
+	Set gtmtypes("sgmnt_data",550,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_crit_que_slps")=550
+	Set gtmtypes("sgmnt_data",551,"name")="sgmnt_data.gvstats_rec.sq_crit_yields"
+	Set gtmtypes("sgmnt_data",551,"off")=4544
+	Set gtmtypes("sgmnt_data",551,"len")=8
+	Set gtmtypes("sgmnt_data",551,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.sq_crit_yields")=551
+	Set gtmtypes("sgmnt_data",552,"name")="sgmnt_data.gvstats_rec.n_crit_yields"
+	Set gtmtypes("sgmnt_data",552,"off")=4552
+	Set gtmtypes("sgmnt_data",552,"len")=8
+	Set gtmtypes("sgmnt_data",552,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_crit_yields")=552
+	Set gtmtypes("sgmnt_data",553,"name")="sgmnt_data.gvstats_rec.n_clean2dirty"
+	Set gtmtypes("sgmnt_data",553,"off")=4560
+	Set gtmtypes("sgmnt_data",553,"len")=8
+	Set gtmtypes("sgmnt_data",553,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec.n_clean2dirty")=553
+	Set gtmtypes("sgmnt_data",554,"name")="sgmnt_data.gvstats_rec_filler_4k_plus_512"
+	Set gtmtypes("sgmnt_data",554,"off")=4568
+	Set gtmtypes("sgmnt_data",554,"len")=40
+	Set gtmtypes("sgmnt_data",554,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","gvstats_rec_filler_4k_plus_512")=554
+	Set gtmtypes("sgmnt_data",555,"name")="sgmnt_data.filler_4k_plus_512"
+	Set gtmtypes("sgmnt_data",555,"off")=4608
+	Set gtmtypes("sgmnt_data",555,"len")=368
+	Set gtmtypes("sgmnt_data",555,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","filler_4k_plus_512")=555
+	Set gtmtypes("sgmnt_data",556,"name")="sgmnt_data.intrpt_recov_resync_strm_seqno"
+	Set gtmtypes("sgmnt_data",556,"off")=4976
 	Set gtmtypes("sgmnt_data",556,"len")=128
 	Set gtmtypes("sgmnt_data",556,"type")="uint64_t"
-	Set gtmtypfldindx("sgmnt_data","save_strm_reg_seqno")=556
+	Set gtmtypfldindx("sgmnt_data","intrpt_recov_resync_strm_seqno")=556
 	Set gtmtypes("sgmnt_data",556,"dim")=16
-	Set gtmtypes("sgmnt_data",557,"name")="sgmnt_data.freeze_on_fail"
-	Set gtmtypes("sgmnt_data",557,"off")=6432
+	Set gtmtypes("sgmnt_data",557,"name")="sgmnt_data.creation_db_ver"
+	Set gtmtypes("sgmnt_data",557,"off")=5104
 	Set gtmtypes("sgmnt_data",557,"len")=4
-	Set gtmtypes("sgmnt_data",557,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","freeze_on_fail")=557
-	Set gtmtypes("sgmnt_data",558,"name")="sgmnt_data.span_node_absent"
-	Set gtmtypes("sgmnt_data",558,"off")=6436
+	Set gtmtypes("sgmnt_data",557,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","creation_db_ver")=557
+	Set gtmtypes("sgmnt_data",558,"name")="sgmnt_data.creation_mdb_ver"
+	Set gtmtypes("sgmnt_data",558,"off")=5108
 	Set gtmtypes("sgmnt_data",558,"len")=4
-	Set gtmtypes("sgmnt_data",558,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","span_node_absent")=558
-	Set gtmtypes("sgmnt_data",559,"name")="sgmnt_data.maxkeysz_assured"
-	Set gtmtypes("sgmnt_data",559,"off")=6440
+	Set gtmtypes("sgmnt_data",558,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","creation_mdb_ver")=558
+	Set gtmtypes("sgmnt_data",559,"name")="sgmnt_data.certified_for_upgrade_to"
+	Set gtmtypes("sgmnt_data",559,"off")=5112
 	Set gtmtypes("sgmnt_data",559,"len")=4
-	Set gtmtypes("sgmnt_data",559,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","maxkeysz_assured")=559
-	Set gtmtypes("sgmnt_data",560,"name")="sgmnt_data.hasht_upgrade_needed"
-	Set gtmtypes("sgmnt_data",560,"off")=6444
+	Set gtmtypes("sgmnt_data",559,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","certified_for_upgrade_to")=559
+	Set gtmtypes("sgmnt_data",560,"name")="sgmnt_data.filler_5k"
+	Set gtmtypes("sgmnt_data",560,"off")=5116
 	Set gtmtypes("sgmnt_data",560,"len")=4
-	Set gtmtypes("sgmnt_data",560,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","hasht_upgrade_needed")=560
-	Set gtmtypes("sgmnt_data",561,"name")="sgmnt_data.defer_allocate"
-	Set gtmtypes("sgmnt_data",561,"off")=6448
+	Set gtmtypes("sgmnt_data",560,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","filler_5k")=560
+	Set gtmtypes("sgmnt_data",561,"name")="sgmnt_data.secshr_ops_index_filler"
+	Set gtmtypes("sgmnt_data",561,"off")=5120
 	Set gtmtypes("sgmnt_data",561,"len")=4
-	Set gtmtypes("sgmnt_data",561,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","defer_allocate")=561
-	Set gtmtypes("sgmnt_data",562,"name")="sgmnt_data.filler_ftok_counter_halted"
-	Set gtmtypes("sgmnt_data",562,"off")=6452
-	Set gtmtypes("sgmnt_data",562,"len")=4
-	Set gtmtypes("sgmnt_data",562,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","filler_ftok_counter_halted")=562
-	Set gtmtypes("sgmnt_data",563,"name")="sgmnt_data.filler_access_counter_halted"
-	Set gtmtypes("sgmnt_data",563,"off")=6456
-	Set gtmtypes("sgmnt_data",563,"len")=4
-	Set gtmtypes("sgmnt_data",563,"type")="boolean_t"
-	Set gtmtypfldindx("sgmnt_data","filler_access_counter_halted")=563
-	Set gtmtypes("sgmnt_data",564,"name")="sgmnt_data.filler_7k"
-	Set gtmtypes("sgmnt_data",564,"off")=6460
-	Set gtmtypes("sgmnt_data",564,"len")=708
-	Set gtmtypes("sgmnt_data",564,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","filler_7k")=564
-	Set gtmtypes("sgmnt_data",565,"name")="sgmnt_data.filler_8k"
-	Set gtmtypes("sgmnt_data",565,"off")=7168
-	Set gtmtypes("sgmnt_data",565,"len")=1024
-	Set gtmtypes("sgmnt_data",565,"type")="char"
-	Set gtmtypfldindx("sgmnt_data","filler_8k")=565
+	Set gtmtypes("sgmnt_data",561,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","secshr_ops_index_filler")=561
+	Set gtmtypes("sgmnt_data",562,"name")="sgmnt_data.secshr_ops_array_filler"
+	Set gtmtypes("sgmnt_data",562,"off")=5124
+	Set gtmtypes("sgmnt_data",562,"len")=1020
+	Set gtmtypes("sgmnt_data",562,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","secshr_ops_array_filler")=562
+	Set gtmtypes("sgmnt_data",562,"dim")=255
+	Set gtmtypes("sgmnt_data",563,"name")="sgmnt_data.next_upgrd_warn"
+	Set gtmtypes("sgmnt_data",563,"off")=6144
+	Set gtmtypes("sgmnt_data",563,"len")=24
+	Set gtmtypes("sgmnt_data",563,"type")="compswap_time_field"
+	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn")=563
+	Set gtmtypes("sgmnt_data",564,"name")="sgmnt_data.next_upgrd_warn.time_latch"
+	Set gtmtypes("sgmnt_data",564,"off")=6144
+	Set gtmtypes("sgmnt_data",564,"len")=8
+	Set gtmtypes("sgmnt_data",564,"type")="global_latch_t"
+	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch")=564
+	Set gtmtypes("sgmnt_data",565,"name")="sgmnt_data.next_upgrd_warn.time_latch.u"
+	Set gtmtypes("sgmnt_data",565,"off")=6144
+	Set gtmtypes("sgmnt_data",565,"len")=8
+	Set gtmtypes("sgmnt_data",565,"type")="union"
+	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch.u")=565
+	Set gtmtypes("sgmnt_data",566,"name")="sgmnt_data.next_upgrd_warn.time_latch.u.pid_imgcnt"
+	Set gtmtypes("sgmnt_data",566,"off")=6144
+	Set gtmtypes("sgmnt_data",566,"len")=8
+	Set gtmtypes("sgmnt_data",566,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch.u.pid_imgcnt")=566
+	Set gtmtypes("sgmnt_data",567,"name")="sgmnt_data.next_upgrd_warn.time_latch.u.parts"
+	Set gtmtypes("sgmnt_data",567,"off")=6144
+	Set gtmtypes("sgmnt_data",567,"len")=8
+	Set gtmtypes("sgmnt_data",567,"type")="struct"
+	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch.u.parts")=567
+	Set gtmtypes("sgmnt_data",568,"name")="sgmnt_data.next_upgrd_warn.time_latch.u.parts.latch_pid"
+	Set gtmtypes("sgmnt_data",568,"off")=6144
+	Set gtmtypes("sgmnt_data",568,"len")=4
+	Set gtmtypes("sgmnt_data",568,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch.u.parts.latch_pid")=568
+	Set gtmtypes("sgmnt_data",569,"name")="sgmnt_data.next_upgrd_warn.time_latch.u.parts.latch_word"
+	Set gtmtypes("sgmnt_data",569,"off")=6148
+	Set gtmtypes("sgmnt_data",569,"len")=4
+	Set gtmtypes("sgmnt_data",569,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.time_latch.u.parts.latch_word")=569
+	Set gtmtypes("sgmnt_data",570,"name")="sgmnt_data.next_upgrd_warn.hp_latch_space"
+	Set gtmtypes("sgmnt_data",570,"off")=6152
+	Set gtmtypes("sgmnt_data",570,"len")=16
+	Set gtmtypes("sgmnt_data",570,"type")="int"
+	Set gtmtypfldindx("sgmnt_data","next_upgrd_warn.hp_latch_space")=570
+	Set gtmtypes("sgmnt_data",570,"dim")=4
+	Set gtmtypes("sgmnt_data",571,"name")="sgmnt_data.is_encrypted"
+	Set gtmtypes("sgmnt_data",571,"off")=6168
+	Set gtmtypes("sgmnt_data",571,"len")=4
+	Set gtmtypes("sgmnt_data",571,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","is_encrypted")=571
+	Set gtmtypes("sgmnt_data",572,"name")="sgmnt_data.db_trigger_cycle"
+	Set gtmtypes("sgmnt_data",572,"off")=6172
+	Set gtmtypes("sgmnt_data",572,"len")=4
+	Set gtmtypes("sgmnt_data",572,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","db_trigger_cycle")=572
+	Set gtmtypes("sgmnt_data",573,"name")="sgmnt_data.strm_reg_seqno"
+	Set gtmtypes("sgmnt_data",573,"off")=6176
+	Set gtmtypes("sgmnt_data",573,"len")=128
+	Set gtmtypes("sgmnt_data",573,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","strm_reg_seqno")=573
+	Set gtmtypes("sgmnt_data",573,"dim")=16
+	Set gtmtypes("sgmnt_data",574,"name")="sgmnt_data.save_strm_reg_seqno"
+	Set gtmtypes("sgmnt_data",574,"off")=6304
+	Set gtmtypes("sgmnt_data",574,"len")=128
+	Set gtmtypes("sgmnt_data",574,"type")="uint64_t"
+	Set gtmtypfldindx("sgmnt_data","save_strm_reg_seqno")=574
+	Set gtmtypes("sgmnt_data",574,"dim")=16
+	Set gtmtypes("sgmnt_data",575,"name")="sgmnt_data.freeze_on_fail"
+	Set gtmtypes("sgmnt_data",575,"off")=6432
+	Set gtmtypes("sgmnt_data",575,"len")=4
+	Set gtmtypes("sgmnt_data",575,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","freeze_on_fail")=575
+	Set gtmtypes("sgmnt_data",576,"name")="sgmnt_data.span_node_absent"
+	Set gtmtypes("sgmnt_data",576,"off")=6436
+	Set gtmtypes("sgmnt_data",576,"len")=4
+	Set gtmtypes("sgmnt_data",576,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","span_node_absent")=576
+	Set gtmtypes("sgmnt_data",577,"name")="sgmnt_data.maxkeysz_assured"
+	Set gtmtypes("sgmnt_data",577,"off")=6440
+	Set gtmtypes("sgmnt_data",577,"len")=4
+	Set gtmtypes("sgmnt_data",577,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","maxkeysz_assured")=577
+	Set gtmtypes("sgmnt_data",578,"name")="sgmnt_data.hasht_upgrade_needed"
+	Set gtmtypes("sgmnt_data",578,"off")=6444
+	Set gtmtypes("sgmnt_data",578,"len")=4
+	Set gtmtypes("sgmnt_data",578,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","hasht_upgrade_needed")=578
+	Set gtmtypes("sgmnt_data",579,"name")="sgmnt_data.defer_allocate"
+	Set gtmtypes("sgmnt_data",579,"off")=6448
+	Set gtmtypes("sgmnt_data",579,"len")=4
+	Set gtmtypes("sgmnt_data",579,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","defer_allocate")=579
+	Set gtmtypes("sgmnt_data",580,"name")="sgmnt_data.filler_ftok_counter_halted"
+	Set gtmtypes("sgmnt_data",580,"off")=6452
+	Set gtmtypes("sgmnt_data",580,"len")=4
+	Set gtmtypes("sgmnt_data",580,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","filler_ftok_counter_halted")=580
+	Set gtmtypes("sgmnt_data",581,"name")="sgmnt_data.filler_access_counter_halted"
+	Set gtmtypes("sgmnt_data",581,"off")=6456
+	Set gtmtypes("sgmnt_data",581,"len")=4
+	Set gtmtypes("sgmnt_data",581,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","filler_access_counter_halted")=581
+	Set gtmtypes("sgmnt_data",582,"name")="sgmnt_data.lock_crit_with_db"
+	Set gtmtypes("sgmnt_data",582,"off")=6460
+	Set gtmtypes("sgmnt_data",582,"len")=4
+	Set gtmtypes("sgmnt_data",582,"type")="boolean_t"
+	Set gtmtypfldindx("sgmnt_data","lock_crit_with_db")=582
+	Set gtmtypes("sgmnt_data",583,"name")="sgmnt_data.basedb_fname_len"
+	Set gtmtypes("sgmnt_data",583,"off")=6464
+	Set gtmtypes("sgmnt_data",583,"len")=4
+	Set gtmtypes("sgmnt_data",583,"type")="unsigned-int"
+	Set gtmtypfldindx("sgmnt_data","basedb_fname_len")=583
+	Set gtmtypes("sgmnt_data",584,"name")="sgmnt_data.basedb_fname"
+	Set gtmtypes("sgmnt_data",584,"off")=6468
+	Set gtmtypes("sgmnt_data",584,"len")=256
+	Set gtmtypes("sgmnt_data",584,"type")="unsigned-char"
+	Set gtmtypfldindx("sgmnt_data","basedb_fname")=584
+	Set gtmtypes("sgmnt_data",585,"name")="sgmnt_data.filler_7k"
+	Set gtmtypes("sgmnt_data",585,"off")=6724
+	Set gtmtypes("sgmnt_data",585,"len")=444
+	Set gtmtypes("sgmnt_data",585,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","filler_7k")=585
+	Set gtmtypes("sgmnt_data",586,"name")="sgmnt_data.filler_8k"
+	Set gtmtypes("sgmnt_data",586,"off")=7168
+	Set gtmtypes("sgmnt_data",586,"len")=1024
+	Set gtmtypes("sgmnt_data",586,"type")="char"
+	Set gtmtypfldindx("sgmnt_data","filler_8k")=586
 	;
 	Set gtmtypes("shm_forw_multi_t")="struct"
 	Set gtmtypes("shm_forw_multi_t",0)=20
@@ -29543,7 +30153,7 @@ Init
 	Set gtmtypes("shm_reg_ctl_t",9,"dim")=3
 	;
 	Set gtmtypes("shm_snapshot_t")="struct"
-	Set gtmtypes("shm_snapshot_t",0)=587
+	Set gtmtypes("shm_snapshot_t",0)=608
 	Set gtmtypes("shm_snapshot_t","len")=12376
 	Set gtmtypes("shm_snapshot_t",1,"name")="shm_snapshot_t.ss_info"
 	Set gtmtypes("shm_snapshot_t",1,"off")=0
@@ -29743,7 +30353,7 @@ Init
 	Set gtmtypes("shm_snapshot_t",40,"name")="shm_snapshot_t.shadow_file_header.null_subs"
 	Set gtmtypes("shm_snapshot_t",40,"off")=4260
 	Set gtmtypes("shm_snapshot_t",40,"len")=4
-	Set gtmtypes("shm_snapshot_t",40,"type")="boolean_t"
+	Set gtmtypes("shm_snapshot_t",40,"type")="int"
 	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.null_subs")=40
 	Set gtmtypes("shm_snapshot_t",41,"name")="shm_snapshot_t.shadow_file_header.free_space"
 	Set gtmtypes("shm_snapshot_t",41,"off")=4264
@@ -29825,11 +30435,11 @@ Init
 	Set gtmtypes("shm_snapshot_t",56,"len")=4
 	Set gtmtypes("shm_snapshot_t",56,"type")="int"
 	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.creation_time4")=56
-	Set gtmtypes("shm_snapshot_t",57,"name")="shm_snapshot_t.shadow_file_header.creation_filler_8byte"
+	Set gtmtypes("shm_snapshot_t",57,"name")="shm_snapshot_t.shadow_file_header.reservedDBFlags"
 	Set gtmtypes("shm_snapshot_t",57,"off")=4372
 	Set gtmtypes("shm_snapshot_t",57,"len")=4
-	Set gtmtypes("shm_snapshot_t",57,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.creation_filler_8byte")=57
+	Set gtmtypes("shm_snapshot_t",57,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reservedDBFlags")=57
 	Set gtmtypes("shm_snapshot_t",58,"name")="shm_snapshot_t.shadow_file_header.max_tn"
 	Set gtmtypes("shm_snapshot_t",58,"off")=4376
 	Set gtmtypes("shm_snapshot_t",58,"len")=8
@@ -29910,2592 +30520,2697 @@ Init
 	Set gtmtypes("shm_snapshot_t",73,"len")=4
 	Set gtmtypes("shm_snapshot_t",73,"type")="int"
 	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.abandoned_kills")=73
-	Set gtmtypes("shm_snapshot_t",74,"name")="shm_snapshot_t.shadow_file_header.filler_320"
+	Set gtmtypes("shm_snapshot_t",74,"name")="shm_snapshot_t.shadow_file_header.freeze_online"
 	Set gtmtypes("shm_snapshot_t",74,"off")=4496
-	Set gtmtypes("shm_snapshot_t",74,"len")=8
-	Set gtmtypes("shm_snapshot_t",74,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_320")=74
-	Set gtmtypes("shm_snapshot_t",75,"name")="shm_snapshot_t.shadow_file_header.tn_upgrd_blks_0"
-	Set gtmtypes("shm_snapshot_t",75,"off")=4504
-	Set gtmtypes("shm_snapshot_t",75,"len")=8
-	Set gtmtypes("shm_snapshot_t",75,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.tn_upgrd_blks_0")=75
-	Set gtmtypes("shm_snapshot_t",76,"name")="shm_snapshot_t.shadow_file_header.desired_db_format_tn"
-	Set gtmtypes("shm_snapshot_t",76,"off")=4512
+	Set gtmtypes("shm_snapshot_t",74,"len")=4
+	Set gtmtypes("shm_snapshot_t",74,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.freeze_online")=74
+	Set gtmtypes("shm_snapshot_t",75,"name")="shm_snapshot_t.shadow_file_header.filler_320"
+	Set gtmtypes("shm_snapshot_t",75,"off")=4500
+	Set gtmtypes("shm_snapshot_t",75,"len")=4
+	Set gtmtypes("shm_snapshot_t",75,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_320")=75
+	Set gtmtypes("shm_snapshot_t",76,"name")="shm_snapshot_t.shadow_file_header.tn_upgrd_blks_0"
+	Set gtmtypes("shm_snapshot_t",76,"off")=4504
 	Set gtmtypes("shm_snapshot_t",76,"len")=8
 	Set gtmtypes("shm_snapshot_t",76,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.desired_db_format_tn")=76
-	Set gtmtypes("shm_snapshot_t",77,"name")="shm_snapshot_t.shadow_file_header.reorg_db_fmt_start_tn"
-	Set gtmtypes("shm_snapshot_t",77,"off")=4520
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.tn_upgrd_blks_0")=76
+	Set gtmtypes("shm_snapshot_t",77,"name")="shm_snapshot_t.shadow_file_header.desired_db_format_tn"
+	Set gtmtypes("shm_snapshot_t",77,"off")=4512
 	Set gtmtypes("shm_snapshot_t",77,"len")=8
 	Set gtmtypes("shm_snapshot_t",77,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reorg_db_fmt_start_tn")=77
-	Set gtmtypes("shm_snapshot_t",78,"name")="shm_snapshot_t.shadow_file_header.reorg_upgrd_dwngrd_restart_block"
-	Set gtmtypes("shm_snapshot_t",78,"off")=4528
-	Set gtmtypes("shm_snapshot_t",78,"len")=4
-	Set gtmtypes("shm_snapshot_t",78,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reorg_upgrd_dwngrd_restart_block")=78
-	Set gtmtypes("shm_snapshot_t",79,"name")="shm_snapshot_t.shadow_file_header.blks_to_upgrd"
-	Set gtmtypes("shm_snapshot_t",79,"off")=4532
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.desired_db_format_tn")=77
+	Set gtmtypes("shm_snapshot_t",78,"name")="shm_snapshot_t.shadow_file_header.reorg_db_fmt_start_tn"
+	Set gtmtypes("shm_snapshot_t",78,"off")=4520
+	Set gtmtypes("shm_snapshot_t",78,"len")=8
+	Set gtmtypes("shm_snapshot_t",78,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reorg_db_fmt_start_tn")=78
+	Set gtmtypes("shm_snapshot_t",79,"name")="shm_snapshot_t.shadow_file_header.reorg_upgrd_dwngrd_restart_block"
+	Set gtmtypes("shm_snapshot_t",79,"off")=4528
 	Set gtmtypes("shm_snapshot_t",79,"len")=4
 	Set gtmtypes("shm_snapshot_t",79,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.blks_to_upgrd")=79
-	Set gtmtypes("shm_snapshot_t",80,"name")="shm_snapshot_t.shadow_file_header.blks_to_upgrd_subzero_error"
-	Set gtmtypes("shm_snapshot_t",80,"off")=4536
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reorg_upgrd_dwngrd_restart_block")=79
+	Set gtmtypes("shm_snapshot_t",80,"name")="shm_snapshot_t.shadow_file_header.blks_to_upgrd"
+	Set gtmtypes("shm_snapshot_t",80,"off")=4532
 	Set gtmtypes("shm_snapshot_t",80,"len")=4
 	Set gtmtypes("shm_snapshot_t",80,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.blks_to_upgrd_subzero_error")=80
-	Set gtmtypes("shm_snapshot_t",81,"name")="shm_snapshot_t.shadow_file_header.desired_db_format"
-	Set gtmtypes("shm_snapshot_t",81,"off")=4540
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.blks_to_upgrd")=80
+	Set gtmtypes("shm_snapshot_t",81,"name")="shm_snapshot_t.shadow_file_header.blks_to_upgrd_subzero_error"
+	Set gtmtypes("shm_snapshot_t",81,"off")=4536
 	Set gtmtypes("shm_snapshot_t",81,"len")=4
 	Set gtmtypes("shm_snapshot_t",81,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.desired_db_format")=81
-	Set gtmtypes("shm_snapshot_t",82,"name")="shm_snapshot_t.shadow_file_header.fully_upgraded"
-	Set gtmtypes("shm_snapshot_t",82,"off")=4544
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.blks_to_upgrd_subzero_error")=81
+	Set gtmtypes("shm_snapshot_t",82,"name")="shm_snapshot_t.shadow_file_header.desired_db_format"
+	Set gtmtypes("shm_snapshot_t",82,"off")=4540
 	Set gtmtypes("shm_snapshot_t",82,"len")=4
-	Set gtmtypes("shm_snapshot_t",82,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.fully_upgraded")=82
-	Set gtmtypes("shm_snapshot_t",83,"name")="shm_snapshot_t.shadow_file_header.db_got_to_v5_once"
-	Set gtmtypes("shm_snapshot_t",83,"off")=4548
+	Set gtmtypes("shm_snapshot_t",82,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.desired_db_format")=82
+	Set gtmtypes("shm_snapshot_t",83,"name")="shm_snapshot_t.shadow_file_header.fully_upgraded"
+	Set gtmtypes("shm_snapshot_t",83,"off")=4544
 	Set gtmtypes("shm_snapshot_t",83,"len")=4
 	Set gtmtypes("shm_snapshot_t",83,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_got_to_v5_once")=83
-	Set gtmtypes("shm_snapshot_t",84,"name")="shm_snapshot_t.shadow_file_header.opened_by_gtmv53"
-	Set gtmtypes("shm_snapshot_t",84,"off")=4552
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.fully_upgraded")=83
+	Set gtmtypes("shm_snapshot_t",84,"name")="shm_snapshot_t.shadow_file_header.db_got_to_v5_once"
+	Set gtmtypes("shm_snapshot_t",84,"off")=4548
 	Set gtmtypes("shm_snapshot_t",84,"len")=4
 	Set gtmtypes("shm_snapshot_t",84,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.opened_by_gtmv53")=84
-	Set gtmtypes("shm_snapshot_t",85,"name")="shm_snapshot_t.shadow_file_header.filler_384"
-	Set gtmtypes("shm_snapshot_t",85,"off")=4556
-	Set gtmtypes("shm_snapshot_t",85,"len")=12
-	Set gtmtypes("shm_snapshot_t",85,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_384")=85
-	Set gtmtypes("shm_snapshot_t",86,"name")="shm_snapshot_t.shadow_file_header.trans_hist"
-	Set gtmtypes("shm_snapshot_t",86,"off")=4568
-	Set gtmtypes("shm_snapshot_t",86,"len")=56
-	Set gtmtypes("shm_snapshot_t",86,"type")="th_index"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist")=86
-	Set gtmtypes("shm_snapshot_t",87,"name")="shm_snapshot_t.shadow_file_header.trans_hist.curr_tn"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_got_to_v5_once")=84
+	Set gtmtypes("shm_snapshot_t",85,"name")="shm_snapshot_t.shadow_file_header.opened_by_gtmv53"
+	Set gtmtypes("shm_snapshot_t",85,"off")=4552
+	Set gtmtypes("shm_snapshot_t",85,"len")=4
+	Set gtmtypes("shm_snapshot_t",85,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.opened_by_gtmv53")=85
+	Set gtmtypes("shm_snapshot_t",86,"name")="shm_snapshot_t.shadow_file_header.filler_384"
+	Set gtmtypes("shm_snapshot_t",86,"off")=4556
+	Set gtmtypes("shm_snapshot_t",86,"len")=12
+	Set gtmtypes("shm_snapshot_t",86,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_384")=86
+	Set gtmtypes("shm_snapshot_t",87,"name")="shm_snapshot_t.shadow_file_header.trans_hist"
 	Set gtmtypes("shm_snapshot_t",87,"off")=4568
-	Set gtmtypes("shm_snapshot_t",87,"len")=8
-	Set gtmtypes("shm_snapshot_t",87,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.curr_tn")=87
-	Set gtmtypes("shm_snapshot_t",88,"name")="shm_snapshot_t.shadow_file_header.trans_hist.early_tn"
-	Set gtmtypes("shm_snapshot_t",88,"off")=4576
+	Set gtmtypes("shm_snapshot_t",87,"len")=56
+	Set gtmtypes("shm_snapshot_t",87,"type")="th_index"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist")=87
+	Set gtmtypes("shm_snapshot_t",88,"name")="shm_snapshot_t.shadow_file_header.trans_hist.curr_tn"
+	Set gtmtypes("shm_snapshot_t",88,"off")=4568
 	Set gtmtypes("shm_snapshot_t",88,"len")=8
 	Set gtmtypes("shm_snapshot_t",88,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.early_tn")=88
-	Set gtmtypes("shm_snapshot_t",89,"name")="shm_snapshot_t.shadow_file_header.trans_hist.last_mm_sync"
-	Set gtmtypes("shm_snapshot_t",89,"off")=4584
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.curr_tn")=88
+	Set gtmtypes("shm_snapshot_t",89,"name")="shm_snapshot_t.shadow_file_header.trans_hist.early_tn"
+	Set gtmtypes("shm_snapshot_t",89,"off")=4576
 	Set gtmtypes("shm_snapshot_t",89,"len")=8
 	Set gtmtypes("shm_snapshot_t",89,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.last_mm_sync")=89
-	Set gtmtypes("shm_snapshot_t",90,"name")="shm_snapshot_t.shadow_file_header.trans_hist.filler_8byte"
-	Set gtmtypes("shm_snapshot_t",90,"off")=4592
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.early_tn")=89
+	Set gtmtypes("shm_snapshot_t",90,"name")="shm_snapshot_t.shadow_file_header.trans_hist.last_mm_sync"
+	Set gtmtypes("shm_snapshot_t",90,"off")=4584
 	Set gtmtypes("shm_snapshot_t",90,"len")=8
-	Set gtmtypes("shm_snapshot_t",90,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.filler_8byte")=90
-	Set gtmtypes("shm_snapshot_t",91,"name")="shm_snapshot_t.shadow_file_header.trans_hist.mm_tn"
-	Set gtmtypes("shm_snapshot_t",91,"off")=4600
+	Set gtmtypes("shm_snapshot_t",90,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.last_mm_sync")=90
+	Set gtmtypes("shm_snapshot_t",91,"name")="shm_snapshot_t.shadow_file_header.trans_hist.filler_8byte"
+	Set gtmtypes("shm_snapshot_t",91,"off")=4592
 	Set gtmtypes("shm_snapshot_t",91,"len")=8
-	Set gtmtypes("shm_snapshot_t",91,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.mm_tn")=91
-	Set gtmtypes("shm_snapshot_t",92,"name")="shm_snapshot_t.shadow_file_header.trans_hist.lock_sequence"
-	Set gtmtypes("shm_snapshot_t",92,"off")=4608
-	Set gtmtypes("shm_snapshot_t",92,"len")=4
-	Set gtmtypes("shm_snapshot_t",92,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.lock_sequence")=92
-	Set gtmtypes("shm_snapshot_t",93,"name")="shm_snapshot_t.shadow_file_header.trans_hist.ccp_jnl_filesize"
-	Set gtmtypes("shm_snapshot_t",93,"off")=4612
+	Set gtmtypes("shm_snapshot_t",91,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.filler_8byte")=91
+	Set gtmtypes("shm_snapshot_t",92,"name")="shm_snapshot_t.shadow_file_header.trans_hist.mm_tn"
+	Set gtmtypes("shm_snapshot_t",92,"off")=4600
+	Set gtmtypes("shm_snapshot_t",92,"len")=8
+	Set gtmtypes("shm_snapshot_t",92,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.mm_tn")=92
+	Set gtmtypes("shm_snapshot_t",93,"name")="shm_snapshot_t.shadow_file_header.trans_hist.lock_sequence"
+	Set gtmtypes("shm_snapshot_t",93,"off")=4608
 	Set gtmtypes("shm_snapshot_t",93,"len")=4
 	Set gtmtypes("shm_snapshot_t",93,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.ccp_jnl_filesize")=93
-	Set gtmtypes("shm_snapshot_t",94,"name")="shm_snapshot_t.shadow_file_header.trans_hist.total_blks"
-	Set gtmtypes("shm_snapshot_t",94,"off")=4616
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.lock_sequence")=93
+	Set gtmtypes("shm_snapshot_t",94,"name")="shm_snapshot_t.shadow_file_header.trans_hist.ccp_jnl_filesize"
+	Set gtmtypes("shm_snapshot_t",94,"off")=4612
 	Set gtmtypes("shm_snapshot_t",94,"len")=4
 	Set gtmtypes("shm_snapshot_t",94,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.total_blks")=94
-	Set gtmtypes("shm_snapshot_t",95,"name")="shm_snapshot_t.shadow_file_header.trans_hist.free_blocks"
-	Set gtmtypes("shm_snapshot_t",95,"off")=4620
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.ccp_jnl_filesize")=94
+	Set gtmtypes("shm_snapshot_t",95,"name")="shm_snapshot_t.shadow_file_header.trans_hist.total_blks"
+	Set gtmtypes("shm_snapshot_t",95,"off")=4616
 	Set gtmtypes("shm_snapshot_t",95,"len")=4
 	Set gtmtypes("shm_snapshot_t",95,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.free_blocks")=95
-	Set gtmtypes("shm_snapshot_t",96,"name")="shm_snapshot_t.shadow_file_header.filler_trans_hist"
-	Set gtmtypes("shm_snapshot_t",96,"off")=4624
-	Set gtmtypes("shm_snapshot_t",96,"len")=8
-	Set gtmtypes("shm_snapshot_t",96,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_trans_hist")=96
-	Set gtmtypes("shm_snapshot_t",97,"name")="shm_snapshot_t.shadow_file_header.flush_time"
-	Set gtmtypes("shm_snapshot_t",97,"off")=4632
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.total_blks")=95
+	Set gtmtypes("shm_snapshot_t",96,"name")="shm_snapshot_t.shadow_file_header.trans_hist.free_blocks"
+	Set gtmtypes("shm_snapshot_t",96,"off")=4620
+	Set gtmtypes("shm_snapshot_t",96,"len")=4
+	Set gtmtypes("shm_snapshot_t",96,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.trans_hist.free_blocks")=96
+	Set gtmtypes("shm_snapshot_t",97,"name")="shm_snapshot_t.shadow_file_header.filler_trans_hist"
+	Set gtmtypes("shm_snapshot_t",97,"off")=4624
 	Set gtmtypes("shm_snapshot_t",97,"len")=8
-	Set gtmtypes("shm_snapshot_t",97,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.flush_time")=97
-	Set gtmtypes("shm_snapshot_t",97,"dim")=2
-	Set gtmtypes("shm_snapshot_t",98,"name")="shm_snapshot_t.shadow_file_header.flush_trigger"
-	Set gtmtypes("shm_snapshot_t",98,"off")=4640
-	Set gtmtypes("shm_snapshot_t",98,"len")=4
+	Set gtmtypes("shm_snapshot_t",97,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_trans_hist")=97
+	Set gtmtypes("shm_snapshot_t",98,"name")="shm_snapshot_t.shadow_file_header.flush_time"
+	Set gtmtypes("shm_snapshot_t",98,"off")=4632
+	Set gtmtypes("shm_snapshot_t",98,"len")=8
 	Set gtmtypes("shm_snapshot_t",98,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.flush_trigger")=98
-	Set gtmtypes("shm_snapshot_t",99,"name")="shm_snapshot_t.shadow_file_header.n_wrt_per_flu"
-	Set gtmtypes("shm_snapshot_t",99,"off")=4644
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.flush_time")=98
+	Set gtmtypes("shm_snapshot_t",98,"dim")=2
+	Set gtmtypes("shm_snapshot_t",99,"name")="shm_snapshot_t.shadow_file_header.flush_trigger"
+	Set gtmtypes("shm_snapshot_t",99,"off")=4640
 	Set gtmtypes("shm_snapshot_t",99,"len")=4
 	Set gtmtypes("shm_snapshot_t",99,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_wrt_per_flu")=99
-	Set gtmtypes("shm_snapshot_t",100,"name")="shm_snapshot_t.shadow_file_header.wait_disk_space"
-	Set gtmtypes("shm_snapshot_t",100,"off")=4648
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.flush_trigger")=99
+	Set gtmtypes("shm_snapshot_t",100,"name")="shm_snapshot_t.shadow_file_header.n_wrt_per_flu"
+	Set gtmtypes("shm_snapshot_t",100,"off")=4644
 	Set gtmtypes("shm_snapshot_t",100,"len")=4
 	Set gtmtypes("shm_snapshot_t",100,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wait_disk_space")=100
-	Set gtmtypes("shm_snapshot_t",101,"name")="shm_snapshot_t.shadow_file_header.defer_time"
-	Set gtmtypes("shm_snapshot_t",101,"off")=4652
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_wrt_per_flu")=100
+	Set gtmtypes("shm_snapshot_t",101,"name")="shm_snapshot_t.shadow_file_header.wait_disk_space"
+	Set gtmtypes("shm_snapshot_t",101,"off")=4648
 	Set gtmtypes("shm_snapshot_t",101,"len")=4
 	Set gtmtypes("shm_snapshot_t",101,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.defer_time")=101
-	Set gtmtypes("shm_snapshot_t",102,"name")="shm_snapshot_t.shadow_file_header.filler_wc_blocked"
-	Set gtmtypes("shm_snapshot_t",102,"off")=4656
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wait_disk_space")=101
+	Set gtmtypes("shm_snapshot_t",102,"name")="shm_snapshot_t.shadow_file_header.defer_time"
+	Set gtmtypes("shm_snapshot_t",102,"off")=4652
 	Set gtmtypes("shm_snapshot_t",102,"len")=4
-	Set gtmtypes("shm_snapshot_t",102,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_wc_blocked")=102
-	Set gtmtypes("shm_snapshot_t",103,"name")="shm_snapshot_t.shadow_file_header.mumps_can_bypass"
-	Set gtmtypes("shm_snapshot_t",103,"off")=4660
+	Set gtmtypes("shm_snapshot_t",102,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.defer_time")=102
+	Set gtmtypes("shm_snapshot_t",103,"name")="shm_snapshot_t.shadow_file_header.filler_wc_blocked"
+	Set gtmtypes("shm_snapshot_t",103,"off")=4656
 	Set gtmtypes("shm_snapshot_t",103,"len")=4
 	Set gtmtypes("shm_snapshot_t",103,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.mumps_can_bypass")=103
-	Set gtmtypes("shm_snapshot_t",104,"name")="shm_snapshot_t.shadow_file_header.epoch_taper"
-	Set gtmtypes("shm_snapshot_t",104,"off")=4664
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_wc_blocked")=103
+	Set gtmtypes("shm_snapshot_t",104,"name")="shm_snapshot_t.shadow_file_header.mumps_can_bypass"
+	Set gtmtypes("shm_snapshot_t",104,"off")=4660
 	Set gtmtypes("shm_snapshot_t",104,"len")=4
 	Set gtmtypes("shm_snapshot_t",104,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.epoch_taper")=104
-	Set gtmtypes("shm_snapshot_t",105,"name")="shm_snapshot_t.shadow_file_header.epoch_taper_time_pct"
-	Set gtmtypes("shm_snapshot_t",105,"off")=4668
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.mumps_can_bypass")=104
+	Set gtmtypes("shm_snapshot_t",105,"name")="shm_snapshot_t.shadow_file_header.epoch_taper"
+	Set gtmtypes("shm_snapshot_t",105,"off")=4664
 	Set gtmtypes("shm_snapshot_t",105,"len")=4
-	Set gtmtypes("shm_snapshot_t",105,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.epoch_taper_time_pct")=105
-	Set gtmtypes("shm_snapshot_t",106,"name")="shm_snapshot_t.shadow_file_header.epoch_taper_jnl_pct"
-	Set gtmtypes("shm_snapshot_t",106,"off")=4672
+	Set gtmtypes("shm_snapshot_t",105,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.epoch_taper")=105
+	Set gtmtypes("shm_snapshot_t",106,"name")="shm_snapshot_t.shadow_file_header.epoch_taper_time_pct"
+	Set gtmtypes("shm_snapshot_t",106,"off")=4668
 	Set gtmtypes("shm_snapshot_t",106,"len")=4
 	Set gtmtypes("shm_snapshot_t",106,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.epoch_taper_jnl_pct")=106
-	Set gtmtypes("shm_snapshot_t",107,"name")="shm_snapshot_t.shadow_file_header.filler_512"
-	Set gtmtypes("shm_snapshot_t",107,"off")=4676
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.epoch_taper_time_pct")=106
+	Set gtmtypes("shm_snapshot_t",107,"name")="shm_snapshot_t.shadow_file_header.epoch_taper_jnl_pct"
+	Set gtmtypes("shm_snapshot_t",107,"off")=4672
 	Set gtmtypes("shm_snapshot_t",107,"len")=4
-	Set gtmtypes("shm_snapshot_t",107,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_512")=107
-	Set gtmtypes("shm_snapshot_t",108,"name")="shm_snapshot_t.shadow_file_header.reserved_for_upd"
-	Set gtmtypes("shm_snapshot_t",108,"off")=4680
+	Set gtmtypes("shm_snapshot_t",107,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.epoch_taper_jnl_pct")=107
+	Set gtmtypes("shm_snapshot_t",108,"name")="shm_snapshot_t.shadow_file_header.asyncio"
+	Set gtmtypes("shm_snapshot_t",108,"off")=4676
 	Set gtmtypes("shm_snapshot_t",108,"len")=4
-	Set gtmtypes("shm_snapshot_t",108,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reserved_for_upd")=108
-	Set gtmtypes("shm_snapshot_t",109,"name")="shm_snapshot_t.shadow_file_header.avg_blks_per_100gbl"
-	Set gtmtypes("shm_snapshot_t",109,"off")=4684
+	Set gtmtypes("shm_snapshot_t",108,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.asyncio")=108
+	Set gtmtypes("shm_snapshot_t",109,"name")="shm_snapshot_t.shadow_file_header.reserved_for_upd"
+	Set gtmtypes("shm_snapshot_t",109,"off")=4680
 	Set gtmtypes("shm_snapshot_t",109,"len")=4
 	Set gtmtypes("shm_snapshot_t",109,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.avg_blks_per_100gbl")=109
-	Set gtmtypes("shm_snapshot_t",110,"name")="shm_snapshot_t.shadow_file_header.pre_read_trigger_factor"
-	Set gtmtypes("shm_snapshot_t",110,"off")=4688
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reserved_for_upd")=109
+	Set gtmtypes("shm_snapshot_t",110,"name")="shm_snapshot_t.shadow_file_header.avg_blks_per_100gbl"
+	Set gtmtypes("shm_snapshot_t",110,"off")=4684
 	Set gtmtypes("shm_snapshot_t",110,"len")=4
 	Set gtmtypes("shm_snapshot_t",110,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.pre_read_trigger_factor")=110
-	Set gtmtypes("shm_snapshot_t",111,"name")="shm_snapshot_t.shadow_file_header.writer_trigger_factor"
-	Set gtmtypes("shm_snapshot_t",111,"off")=4692
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.avg_blks_per_100gbl")=110
+	Set gtmtypes("shm_snapshot_t",111,"name")="shm_snapshot_t.shadow_file_header.pre_read_trigger_factor"
+	Set gtmtypes("shm_snapshot_t",111,"off")=4688
 	Set gtmtypes("shm_snapshot_t",111,"len")=4
 	Set gtmtypes("shm_snapshot_t",111,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.writer_trigger_factor")=111
-	Set gtmtypes("shm_snapshot_t",112,"name")="shm_snapshot_t.shadow_file_header.semid"
-	Set gtmtypes("shm_snapshot_t",112,"off")=4696
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.pre_read_trigger_factor")=111
+	Set gtmtypes("shm_snapshot_t",112,"name")="shm_snapshot_t.shadow_file_header.writer_trigger_factor"
+	Set gtmtypes("shm_snapshot_t",112,"off")=4692
 	Set gtmtypes("shm_snapshot_t",112,"len")=4
-	Set gtmtypes("shm_snapshot_t",112,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.semid")=112
-	Set gtmtypes("shm_snapshot_t",113,"name")="shm_snapshot_t.shadow_file_header.shmid"
-	Set gtmtypes("shm_snapshot_t",113,"off")=4700
+	Set gtmtypes("shm_snapshot_t",112,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.writer_trigger_factor")=112
+	Set gtmtypes("shm_snapshot_t",113,"name")="shm_snapshot_t.shadow_file_header.semid"
+	Set gtmtypes("shm_snapshot_t",113,"off")=4696
 	Set gtmtypes("shm_snapshot_t",113,"len")=4
 	Set gtmtypes("shm_snapshot_t",113,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmid")=113
-	Set gtmtypes("shm_snapshot_t",114,"name")="shm_snapshot_t.shadow_file_header.gt_sem_ctime"
-	Set gtmtypes("shm_snapshot_t",114,"off")=4704
-	Set gtmtypes("shm_snapshot_t",114,"len")=8
-	Set gtmtypes("shm_snapshot_t",114,"type")="gtm_time8"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gt_sem_ctime")=114
-	Set gtmtypes("shm_snapshot_t",115,"name")="shm_snapshot_t.shadow_file_header.gt_sem_ctime.ctime"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.semid")=113
+	Set gtmtypes("shm_snapshot_t",114,"name")="shm_snapshot_t.shadow_file_header.shmid"
+	Set gtmtypes("shm_snapshot_t",114,"off")=4700
+	Set gtmtypes("shm_snapshot_t",114,"len")=4
+	Set gtmtypes("shm_snapshot_t",114,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmid")=114
+	Set gtmtypes("shm_snapshot_t",115,"name")="shm_snapshot_t.shadow_file_header.gt_sem_ctime"
 	Set gtmtypes("shm_snapshot_t",115,"off")=4704
 	Set gtmtypes("shm_snapshot_t",115,"len")=8
-	Set gtmtypes("shm_snapshot_t",115,"type")="time_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gt_sem_ctime.ctime")=115
-	Set gtmtypes("shm_snapshot_t",116,"name")="shm_snapshot_t.shadow_file_header.gt_sem_ctime.filler"
+	Set gtmtypes("shm_snapshot_t",115,"type")="gtm_time8"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gt_sem_ctime")=115
+	Set gtmtypes("shm_snapshot_t",116,"name")="shm_snapshot_t.shadow_file_header.gt_sem_ctime.ctime"
 	Set gtmtypes("shm_snapshot_t",116,"off")=4704
 	Set gtmtypes("shm_snapshot_t",116,"len")=8
-	Set gtmtypes("shm_snapshot_t",116,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gt_sem_ctime.filler")=116
-	Set gtmtypes("shm_snapshot_t",116,"dim")=2
-	Set gtmtypes("shm_snapshot_t",117,"name")="shm_snapshot_t.shadow_file_header.gt_shm_ctime"
-	Set gtmtypes("shm_snapshot_t",117,"off")=4712
+	Set gtmtypes("shm_snapshot_t",116,"type")="time_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gt_sem_ctime.ctime")=116
+	Set gtmtypes("shm_snapshot_t",117,"name")="shm_snapshot_t.shadow_file_header.gt_sem_ctime.filler"
+	Set gtmtypes("shm_snapshot_t",117,"off")=4704
 	Set gtmtypes("shm_snapshot_t",117,"len")=8
-	Set gtmtypes("shm_snapshot_t",117,"type")="gtm_time8"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gt_shm_ctime")=117
-	Set gtmtypes("shm_snapshot_t",118,"name")="shm_snapshot_t.shadow_file_header.gt_shm_ctime.ctime"
+	Set gtmtypes("shm_snapshot_t",117,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gt_sem_ctime.filler")=117
+	Set gtmtypes("shm_snapshot_t",117,"dim")=2
+	Set gtmtypes("shm_snapshot_t",118,"name")="shm_snapshot_t.shadow_file_header.gt_shm_ctime"
 	Set gtmtypes("shm_snapshot_t",118,"off")=4712
 	Set gtmtypes("shm_snapshot_t",118,"len")=8
-	Set gtmtypes("shm_snapshot_t",118,"type")="time_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gt_shm_ctime.ctime")=118
-	Set gtmtypes("shm_snapshot_t",119,"name")="shm_snapshot_t.shadow_file_header.gt_shm_ctime.filler"
+	Set gtmtypes("shm_snapshot_t",118,"type")="gtm_time8"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gt_shm_ctime")=118
+	Set gtmtypes("shm_snapshot_t",119,"name")="shm_snapshot_t.shadow_file_header.gt_shm_ctime.ctime"
 	Set gtmtypes("shm_snapshot_t",119,"off")=4712
 	Set gtmtypes("shm_snapshot_t",119,"len")=8
-	Set gtmtypes("shm_snapshot_t",119,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gt_shm_ctime.filler")=119
-	Set gtmtypes("shm_snapshot_t",119,"dim")=2
-	Set gtmtypes("shm_snapshot_t",120,"name")="shm_snapshot_t.shadow_file_header.filler_unixonly"
-	Set gtmtypes("shm_snapshot_t",120,"off")=4720
-	Set gtmtypes("shm_snapshot_t",120,"len")=40
-	Set gtmtypes("shm_snapshot_t",120,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_unixonly")=120
-	Set gtmtypes("shm_snapshot_t",121,"name")="shm_snapshot_t.shadow_file_header.filler_n_retries"
-	Set gtmtypes("shm_snapshot_t",121,"off")=4760
-	Set gtmtypes("shm_snapshot_t",121,"len")=20
-	Set gtmtypes("shm_snapshot_t",121,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_retries")=121
-	Set gtmtypes("shm_snapshot_t",121,"dim")=5
-	Set gtmtypes("shm_snapshot_t",122,"name")="shm_snapshot_t.shadow_file_header.filler_n_puts"
-	Set gtmtypes("shm_snapshot_t",122,"off")=4780
-	Set gtmtypes("shm_snapshot_t",122,"len")=4
+	Set gtmtypes("shm_snapshot_t",119,"type")="time_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gt_shm_ctime.ctime")=119
+	Set gtmtypes("shm_snapshot_t",120,"name")="shm_snapshot_t.shadow_file_header.gt_shm_ctime.filler"
+	Set gtmtypes("shm_snapshot_t",120,"off")=4712
+	Set gtmtypes("shm_snapshot_t",120,"len")=8
+	Set gtmtypes("shm_snapshot_t",120,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gt_shm_ctime.filler")=120
+	Set gtmtypes("shm_snapshot_t",120,"dim")=2
+	Set gtmtypes("shm_snapshot_t",121,"name")="shm_snapshot_t.shadow_file_header.filler_unixonly"
+	Set gtmtypes("shm_snapshot_t",121,"off")=4720
+	Set gtmtypes("shm_snapshot_t",121,"len")=40
+	Set gtmtypes("shm_snapshot_t",121,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_unixonly")=121
+	Set gtmtypes("shm_snapshot_t",122,"name")="shm_snapshot_t.shadow_file_header.filler_n_retries"
+	Set gtmtypes("shm_snapshot_t",122,"off")=4760
+	Set gtmtypes("shm_snapshot_t",122,"len")=20
 	Set gtmtypes("shm_snapshot_t",122,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_puts")=122
-	Set gtmtypes("shm_snapshot_t",123,"name")="shm_snapshot_t.shadow_file_header.filler_n_kills"
-	Set gtmtypes("shm_snapshot_t",123,"off")=4784
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_retries")=122
+	Set gtmtypes("shm_snapshot_t",122,"dim")=5
+	Set gtmtypes("shm_snapshot_t",123,"name")="shm_snapshot_t.shadow_file_header.filler_n_puts"
+	Set gtmtypes("shm_snapshot_t",123,"off")=4780
 	Set gtmtypes("shm_snapshot_t",123,"len")=4
 	Set gtmtypes("shm_snapshot_t",123,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_kills")=123
-	Set gtmtypes("shm_snapshot_t",124,"name")="shm_snapshot_t.shadow_file_header.filler_n_queries"
-	Set gtmtypes("shm_snapshot_t",124,"off")=4788
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_puts")=123
+	Set gtmtypes("shm_snapshot_t",124,"name")="shm_snapshot_t.shadow_file_header.filler_n_kills"
+	Set gtmtypes("shm_snapshot_t",124,"off")=4784
 	Set gtmtypes("shm_snapshot_t",124,"len")=4
 	Set gtmtypes("shm_snapshot_t",124,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_queries")=124
-	Set gtmtypes("shm_snapshot_t",125,"name")="shm_snapshot_t.shadow_file_header.filler_n_gets"
-	Set gtmtypes("shm_snapshot_t",125,"off")=4792
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_kills")=124
+	Set gtmtypes("shm_snapshot_t",125,"name")="shm_snapshot_t.shadow_file_header.filler_n_queries"
+	Set gtmtypes("shm_snapshot_t",125,"off")=4788
 	Set gtmtypes("shm_snapshot_t",125,"len")=4
 	Set gtmtypes("shm_snapshot_t",125,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_gets")=125
-	Set gtmtypes("shm_snapshot_t",126,"name")="shm_snapshot_t.shadow_file_header.filler_n_order"
-	Set gtmtypes("shm_snapshot_t",126,"off")=4796
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_queries")=125
+	Set gtmtypes("shm_snapshot_t",126,"name")="shm_snapshot_t.shadow_file_header.filler_n_gets"
+	Set gtmtypes("shm_snapshot_t",126,"off")=4792
 	Set gtmtypes("shm_snapshot_t",126,"len")=4
 	Set gtmtypes("shm_snapshot_t",126,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_order")=126
-	Set gtmtypes("shm_snapshot_t",127,"name")="shm_snapshot_t.shadow_file_header.filler_n_zprevs"
-	Set gtmtypes("shm_snapshot_t",127,"off")=4800
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_gets")=126
+	Set gtmtypes("shm_snapshot_t",127,"name")="shm_snapshot_t.shadow_file_header.filler_n_order"
+	Set gtmtypes("shm_snapshot_t",127,"off")=4796
 	Set gtmtypes("shm_snapshot_t",127,"len")=4
 	Set gtmtypes("shm_snapshot_t",127,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_zprevs")=127
-	Set gtmtypes("shm_snapshot_t",128,"name")="shm_snapshot_t.shadow_file_header.filler_n_data"
-	Set gtmtypes("shm_snapshot_t",128,"off")=4804
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_order")=127
+	Set gtmtypes("shm_snapshot_t",128,"name")="shm_snapshot_t.shadow_file_header.filler_n_zprevs"
+	Set gtmtypes("shm_snapshot_t",128,"off")=4800
 	Set gtmtypes("shm_snapshot_t",128,"len")=4
 	Set gtmtypes("shm_snapshot_t",128,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_data")=128
-	Set gtmtypes("shm_snapshot_t",129,"name")="shm_snapshot_t.shadow_file_header.filler_n_puts_duplicate"
-	Set gtmtypes("shm_snapshot_t",129,"off")=4808
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_zprevs")=128
+	Set gtmtypes("shm_snapshot_t",129,"name")="shm_snapshot_t.shadow_file_header.filler_n_data"
+	Set gtmtypes("shm_snapshot_t",129,"off")=4804
 	Set gtmtypes("shm_snapshot_t",129,"len")=4
-	Set gtmtypes("shm_snapshot_t",129,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_puts_duplicate")=129
-	Set gtmtypes("shm_snapshot_t",130,"name")="shm_snapshot_t.shadow_file_header.filler_n_tp_updates"
-	Set gtmtypes("shm_snapshot_t",130,"off")=4812
+	Set gtmtypes("shm_snapshot_t",129,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_data")=129
+	Set gtmtypes("shm_snapshot_t",130,"name")="shm_snapshot_t.shadow_file_header.filler_n_puts_duplicate"
+	Set gtmtypes("shm_snapshot_t",130,"off")=4808
 	Set gtmtypes("shm_snapshot_t",130,"len")=4
 	Set gtmtypes("shm_snapshot_t",130,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_tp_updates")=130
-	Set gtmtypes("shm_snapshot_t",131,"name")="shm_snapshot_t.shadow_file_header.filler_n_tp_updates_duplicate"
-	Set gtmtypes("shm_snapshot_t",131,"off")=4816
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_puts_duplicate")=130
+	Set gtmtypes("shm_snapshot_t",131,"name")="shm_snapshot_t.shadow_file_header.filler_n_tp_updates"
+	Set gtmtypes("shm_snapshot_t",131,"off")=4812
 	Set gtmtypes("shm_snapshot_t",131,"len")=4
 	Set gtmtypes("shm_snapshot_t",131,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_tp_updates_duplicate")=131
-	Set gtmtypes("shm_snapshot_t",132,"name")="shm_snapshot_t.shadow_file_header.filler_accounting_64_align"
-	Set gtmtypes("shm_snapshot_t",132,"off")=4820
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_tp_updates")=131
+	Set gtmtypes("shm_snapshot_t",132,"name")="shm_snapshot_t.shadow_file_header.filler_n_tp_updates_duplicate"
+	Set gtmtypes("shm_snapshot_t",132,"off")=4816
 	Set gtmtypes("shm_snapshot_t",132,"len")=4
-	Set gtmtypes("shm_snapshot_t",132,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_accounting_64_align")=132
-	Set gtmtypes("shm_snapshot_t",133,"name")="shm_snapshot_t.shadow_file_header.staleness"
-	Set gtmtypes("shm_snapshot_t",133,"off")=4824
-	Set gtmtypes("shm_snapshot_t",133,"len")=8
-	Set gtmtypes("shm_snapshot_t",133,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.staleness")=133
-	Set gtmtypes("shm_snapshot_t",133,"dim")=2
-	Set gtmtypes("shm_snapshot_t",134,"name")="shm_snapshot_t.shadow_file_header.ccp_tick_interval"
-	Set gtmtypes("shm_snapshot_t",134,"off")=4832
+	Set gtmtypes("shm_snapshot_t",132,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_tp_updates_duplicate")=132
+	Set gtmtypes("shm_snapshot_t",133,"name")="shm_snapshot_t.shadow_file_header.filler_accounting_64_align"
+	Set gtmtypes("shm_snapshot_t",133,"off")=4820
+	Set gtmtypes("shm_snapshot_t",133,"len")=4
+	Set gtmtypes("shm_snapshot_t",133,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_accounting_64_align")=133
+	Set gtmtypes("shm_snapshot_t",134,"name")="shm_snapshot_t.shadow_file_header.staleness"
+	Set gtmtypes("shm_snapshot_t",134,"off")=4824
 	Set gtmtypes("shm_snapshot_t",134,"len")=8
 	Set gtmtypes("shm_snapshot_t",134,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.ccp_tick_interval")=134
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.staleness")=134
 	Set gtmtypes("shm_snapshot_t",134,"dim")=2
-	Set gtmtypes("shm_snapshot_t",135,"name")="shm_snapshot_t.shadow_file_header.ccp_quantum_interval"
-	Set gtmtypes("shm_snapshot_t",135,"off")=4840
+	Set gtmtypes("shm_snapshot_t",135,"name")="shm_snapshot_t.shadow_file_header.ccp_tick_interval"
+	Set gtmtypes("shm_snapshot_t",135,"off")=4832
 	Set gtmtypes("shm_snapshot_t",135,"len")=8
 	Set gtmtypes("shm_snapshot_t",135,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.ccp_quantum_interval")=135
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.ccp_tick_interval")=135
 	Set gtmtypes("shm_snapshot_t",135,"dim")=2
-	Set gtmtypes("shm_snapshot_t",136,"name")="shm_snapshot_t.shadow_file_header.ccp_response_interval"
-	Set gtmtypes("shm_snapshot_t",136,"off")=4848
+	Set gtmtypes("shm_snapshot_t",136,"name")="shm_snapshot_t.shadow_file_header.ccp_quantum_interval"
+	Set gtmtypes("shm_snapshot_t",136,"off")=4840
 	Set gtmtypes("shm_snapshot_t",136,"len")=8
 	Set gtmtypes("shm_snapshot_t",136,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.ccp_response_interval")=136
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.ccp_quantum_interval")=136
 	Set gtmtypes("shm_snapshot_t",136,"dim")=2
-	Set gtmtypes("shm_snapshot_t",137,"name")="shm_snapshot_t.shadow_file_header.ccp_jnl_before"
-	Set gtmtypes("shm_snapshot_t",137,"off")=4856
-	Set gtmtypes("shm_snapshot_t",137,"len")=4
-	Set gtmtypes("shm_snapshot_t",137,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.ccp_jnl_before")=137
-	Set gtmtypes("shm_snapshot_t",138,"name")="shm_snapshot_t.shadow_file_header.clustered"
-	Set gtmtypes("shm_snapshot_t",138,"off")=4860
+	Set gtmtypes("shm_snapshot_t",137,"name")="shm_snapshot_t.shadow_file_header.ccp_response_interval"
+	Set gtmtypes("shm_snapshot_t",137,"off")=4848
+	Set gtmtypes("shm_snapshot_t",137,"len")=8
+	Set gtmtypes("shm_snapshot_t",137,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.ccp_response_interval")=137
+	Set gtmtypes("shm_snapshot_t",137,"dim")=2
+	Set gtmtypes("shm_snapshot_t",138,"name")="shm_snapshot_t.shadow_file_header.ccp_jnl_before"
+	Set gtmtypes("shm_snapshot_t",138,"off")=4856
 	Set gtmtypes("shm_snapshot_t",138,"len")=4
 	Set gtmtypes("shm_snapshot_t",138,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.clustered")=138
-	Set gtmtypes("shm_snapshot_t",139,"name")="shm_snapshot_t.shadow_file_header.unbacked_cache"
-	Set gtmtypes("shm_snapshot_t",139,"off")=4864
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.ccp_jnl_before")=138
+	Set gtmtypes("shm_snapshot_t",139,"name")="shm_snapshot_t.shadow_file_header.clustered"
+	Set gtmtypes("shm_snapshot_t",139,"off")=4860
 	Set gtmtypes("shm_snapshot_t",139,"len")=4
 	Set gtmtypes("shm_snapshot_t",139,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.unbacked_cache")=139
-	Set gtmtypes("shm_snapshot_t",140,"name")="shm_snapshot_t.shadow_file_header.rc_srv_cnt"
-	Set gtmtypes("shm_snapshot_t",140,"off")=4868
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.clustered")=139
+	Set gtmtypes("shm_snapshot_t",140,"name")="shm_snapshot_t.shadow_file_header.unbacked_cache"
+	Set gtmtypes("shm_snapshot_t",140,"off")=4864
 	Set gtmtypes("shm_snapshot_t",140,"len")=4
-	Set gtmtypes("shm_snapshot_t",140,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.rc_srv_cnt")=140
-	Set gtmtypes("shm_snapshot_t",141,"name")="shm_snapshot_t.shadow_file_header.dsid"
-	Set gtmtypes("shm_snapshot_t",141,"off")=4872
+	Set gtmtypes("shm_snapshot_t",140,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.unbacked_cache")=140
+	Set gtmtypes("shm_snapshot_t",141,"name")="shm_snapshot_t.shadow_file_header.rc_srv_cnt"
+	Set gtmtypes("shm_snapshot_t",141,"off")=4868
 	Set gtmtypes("shm_snapshot_t",141,"len")=4
 	Set gtmtypes("shm_snapshot_t",141,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.dsid")=141
-	Set gtmtypes("shm_snapshot_t",142,"name")="shm_snapshot_t.shadow_file_header.rc_node"
-	Set gtmtypes("shm_snapshot_t",142,"off")=4876
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.rc_srv_cnt")=141
+	Set gtmtypes("shm_snapshot_t",142,"name")="shm_snapshot_t.shadow_file_header.dsid"
+	Set gtmtypes("shm_snapshot_t",142,"off")=4872
 	Set gtmtypes("shm_snapshot_t",142,"len")=4
 	Set gtmtypes("shm_snapshot_t",142,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.rc_node")=142
-	Set gtmtypes("shm_snapshot_t",143,"name")="shm_snapshot_t.shadow_file_header.filler_ccp_rc"
-	Set gtmtypes("shm_snapshot_t",143,"off")=4880
-	Set gtmtypes("shm_snapshot_t",143,"len")=8
-	Set gtmtypes("shm_snapshot_t",143,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_ccp_rc")=143
-	Set gtmtypes("shm_snapshot_t",144,"name")="shm_snapshot_t.shadow_file_header.reg_seqno"
-	Set gtmtypes("shm_snapshot_t",144,"off")=4888
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.dsid")=142
+	Set gtmtypes("shm_snapshot_t",143,"name")="shm_snapshot_t.shadow_file_header.rc_node"
+	Set gtmtypes("shm_snapshot_t",143,"off")=4876
+	Set gtmtypes("shm_snapshot_t",143,"len")=4
+	Set gtmtypes("shm_snapshot_t",143,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.rc_node")=143
+	Set gtmtypes("shm_snapshot_t",144,"name")="shm_snapshot_t.shadow_file_header.filler_ccp_rc"
+	Set gtmtypes("shm_snapshot_t",144,"off")=4880
 	Set gtmtypes("shm_snapshot_t",144,"len")=8
-	Set gtmtypes("shm_snapshot_t",144,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reg_seqno")=144
-	Set gtmtypes("shm_snapshot_t",145,"name")="shm_snapshot_t.shadow_file_header.pre_multisite_resync_seqno"
-	Set gtmtypes("shm_snapshot_t",145,"off")=4896
+	Set gtmtypes("shm_snapshot_t",144,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_ccp_rc")=144
+	Set gtmtypes("shm_snapshot_t",145,"name")="shm_snapshot_t.shadow_file_header.reg_seqno"
+	Set gtmtypes("shm_snapshot_t",145,"off")=4888
 	Set gtmtypes("shm_snapshot_t",145,"len")=8
 	Set gtmtypes("shm_snapshot_t",145,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.pre_multisite_resync_seqno")=145
-	Set gtmtypes("shm_snapshot_t",146,"name")="shm_snapshot_t.shadow_file_header.zqgblmod_tn"
-	Set gtmtypes("shm_snapshot_t",146,"off")=4904
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reg_seqno")=145
+	Set gtmtypes("shm_snapshot_t",146,"name")="shm_snapshot_t.shadow_file_header.pre_multisite_resync_seqno"
+	Set gtmtypes("shm_snapshot_t",146,"off")=4896
 	Set gtmtypes("shm_snapshot_t",146,"len")=8
 	Set gtmtypes("shm_snapshot_t",146,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.zqgblmod_tn")=146
-	Set gtmtypes("shm_snapshot_t",147,"name")="shm_snapshot_t.shadow_file_header.zqgblmod_seqno"
-	Set gtmtypes("shm_snapshot_t",147,"off")=4912
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.pre_multisite_resync_seqno")=146
+	Set gtmtypes("shm_snapshot_t",147,"name")="shm_snapshot_t.shadow_file_header.zqgblmod_tn"
+	Set gtmtypes("shm_snapshot_t",147,"off")=4904
 	Set gtmtypes("shm_snapshot_t",147,"len")=8
 	Set gtmtypes("shm_snapshot_t",147,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.zqgblmod_seqno")=147
-	Set gtmtypes("shm_snapshot_t",148,"name")="shm_snapshot_t.shadow_file_header.repl_state"
-	Set gtmtypes("shm_snapshot_t",148,"off")=4920
-	Set gtmtypes("shm_snapshot_t",148,"len")=4
-	Set gtmtypes("shm_snapshot_t",148,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.repl_state")=148
-	Set gtmtypes("shm_snapshot_t",149,"name")="shm_snapshot_t.shadow_file_header.multi_site_open"
-	Set gtmtypes("shm_snapshot_t",149,"off")=4924
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.zqgblmod_tn")=147
+	Set gtmtypes("shm_snapshot_t",148,"name")="shm_snapshot_t.shadow_file_header.zqgblmod_seqno"
+	Set gtmtypes("shm_snapshot_t",148,"off")=4912
+	Set gtmtypes("shm_snapshot_t",148,"len")=8
+	Set gtmtypes("shm_snapshot_t",148,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.zqgblmod_seqno")=148
+	Set gtmtypes("shm_snapshot_t",149,"name")="shm_snapshot_t.shadow_file_header.repl_state"
+	Set gtmtypes("shm_snapshot_t",149,"off")=4920
 	Set gtmtypes("shm_snapshot_t",149,"len")=4
-	Set gtmtypes("shm_snapshot_t",149,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.multi_site_open")=149
-	Set gtmtypes("shm_snapshot_t",150,"name")="shm_snapshot_t.shadow_file_header.filler_seqno"
-	Set gtmtypes("shm_snapshot_t",150,"off")=4928
-	Set gtmtypes("shm_snapshot_t",150,"len")=8
-	Set gtmtypes("shm_snapshot_t",150,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_seqno")=150
-	Set gtmtypes("shm_snapshot_t",151,"name")="shm_snapshot_t.shadow_file_header.filler_repl"
-	Set gtmtypes("shm_snapshot_t",151,"off")=4936
-	Set gtmtypes("shm_snapshot_t",151,"len")=16
-	Set gtmtypes("shm_snapshot_t",151,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_repl")=151
-	Set gtmtypes("shm_snapshot_t",152,"name")="shm_snapshot_t.shadow_file_header.filler_n_tp_retries"
-	Set gtmtypes("shm_snapshot_t",152,"off")=4952
-	Set gtmtypes("shm_snapshot_t",152,"len")=48
-	Set gtmtypes("shm_snapshot_t",152,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_tp_retries")=152
-	Set gtmtypes("shm_snapshot_t",152,"dim")=12
-	Set gtmtypes("shm_snapshot_t",153,"name")="shm_snapshot_t.shadow_file_header.filler_n_tp_retries_conflicts"
-	Set gtmtypes("shm_snapshot_t",153,"off")=5000
+	Set gtmtypes("shm_snapshot_t",149,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.repl_state")=149
+	Set gtmtypes("shm_snapshot_t",150,"name")="shm_snapshot_t.shadow_file_header.multi_site_open"
+	Set gtmtypes("shm_snapshot_t",150,"off")=4924
+	Set gtmtypes("shm_snapshot_t",150,"len")=4
+	Set gtmtypes("shm_snapshot_t",150,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.multi_site_open")=150
+	Set gtmtypes("shm_snapshot_t",151,"name")="shm_snapshot_t.shadow_file_header.filler_seqno"
+	Set gtmtypes("shm_snapshot_t",151,"off")=4928
+	Set gtmtypes("shm_snapshot_t",151,"len")=8
+	Set gtmtypes("shm_snapshot_t",151,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_seqno")=151
+	Set gtmtypes("shm_snapshot_t",152,"name")="shm_snapshot_t.shadow_file_header.filler_repl"
+	Set gtmtypes("shm_snapshot_t",152,"off")=4936
+	Set gtmtypes("shm_snapshot_t",152,"len")=16
+	Set gtmtypes("shm_snapshot_t",152,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_repl")=152
+	Set gtmtypes("shm_snapshot_t",153,"name")="shm_snapshot_t.shadow_file_header.filler_n_tp_retries"
+	Set gtmtypes("shm_snapshot_t",153,"off")=4952
 	Set gtmtypes("shm_snapshot_t",153,"len")=48
 	Set gtmtypes("shm_snapshot_t",153,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_tp_retries_conflicts")=153
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_tp_retries")=153
 	Set gtmtypes("shm_snapshot_t",153,"dim")=12
-	Set gtmtypes("shm_snapshot_t",154,"name")="shm_snapshot_t.shadow_file_header.tp_cdb_sc_blkmod"
-	Set gtmtypes("shm_snapshot_t",154,"off")=5048
-	Set gtmtypes("shm_snapshot_t",154,"len")=32
+	Set gtmtypes("shm_snapshot_t",154,"name")="shm_snapshot_t.shadow_file_header.filler_n_tp_retries_conflicts"
+	Set gtmtypes("shm_snapshot_t",154,"off")=5000
+	Set gtmtypes("shm_snapshot_t",154,"len")=48
 	Set gtmtypes("shm_snapshot_t",154,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.tp_cdb_sc_blkmod")=154
-	Set gtmtypes("shm_snapshot_t",154,"dim")=8
-	Set gtmtypes("shm_snapshot_t",155,"name")="shm_snapshot_t.shadow_file_header.jnl_alq"
-	Set gtmtypes("shm_snapshot_t",155,"off")=5080
-	Set gtmtypes("shm_snapshot_t",155,"len")=4
-	Set gtmtypes("shm_snapshot_t",155,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_alq")=155
-	Set gtmtypes("shm_snapshot_t",156,"name")="shm_snapshot_t.shadow_file_header.jnl_deq"
-	Set gtmtypes("shm_snapshot_t",156,"off")=5084
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_n_tp_retries_conflicts")=154
+	Set gtmtypes("shm_snapshot_t",154,"dim")=12
+	Set gtmtypes("shm_snapshot_t",155,"name")="shm_snapshot_t.shadow_file_header.tp_cdb_sc_blkmod"
+	Set gtmtypes("shm_snapshot_t",155,"off")=5048
+	Set gtmtypes("shm_snapshot_t",155,"len")=32
+	Set gtmtypes("shm_snapshot_t",155,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.tp_cdb_sc_blkmod")=155
+	Set gtmtypes("shm_snapshot_t",155,"dim")=8
+	Set gtmtypes("shm_snapshot_t",156,"name")="shm_snapshot_t.shadow_file_header.jnl_alq"
+	Set gtmtypes("shm_snapshot_t",156,"off")=5080
 	Set gtmtypes("shm_snapshot_t",156,"len")=4
 	Set gtmtypes("shm_snapshot_t",156,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_deq")=156
-	Set gtmtypes("shm_snapshot_t",157,"name")="shm_snapshot_t.shadow_file_header.jnl_buffer_size"
-	Set gtmtypes("shm_snapshot_t",157,"off")=5088
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_alq")=156
+	Set gtmtypes("shm_snapshot_t",157,"name")="shm_snapshot_t.shadow_file_header.jnl_deq"
+	Set gtmtypes("shm_snapshot_t",157,"off")=5084
 	Set gtmtypes("shm_snapshot_t",157,"len")=4
-	Set gtmtypes("shm_snapshot_t",157,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_buffer_size")=157
-	Set gtmtypes("shm_snapshot_t",158,"name")="shm_snapshot_t.shadow_file_header.jnl_before_image"
-	Set gtmtypes("shm_snapshot_t",158,"off")=5092
+	Set gtmtypes("shm_snapshot_t",157,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_deq")=157
+	Set gtmtypes("shm_snapshot_t",158,"name")="shm_snapshot_t.shadow_file_header.jnl_buffer_size"
+	Set gtmtypes("shm_snapshot_t",158,"off")=5088
 	Set gtmtypes("shm_snapshot_t",158,"len")=4
-	Set gtmtypes("shm_snapshot_t",158,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_before_image")=158
-	Set gtmtypes("shm_snapshot_t",159,"name")="shm_snapshot_t.shadow_file_header.jnl_state"
-	Set gtmtypes("shm_snapshot_t",159,"off")=5096
+	Set gtmtypes("shm_snapshot_t",158,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_buffer_size")=158
+	Set gtmtypes("shm_snapshot_t",159,"name")="shm_snapshot_t.shadow_file_header.jnl_before_image"
+	Set gtmtypes("shm_snapshot_t",159,"off")=5092
 	Set gtmtypes("shm_snapshot_t",159,"len")=4
-	Set gtmtypes("shm_snapshot_t",159,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_state")=159
-	Set gtmtypes("shm_snapshot_t",160,"name")="shm_snapshot_t.shadow_file_header.jnl_file_len"
-	Set gtmtypes("shm_snapshot_t",160,"off")=5100
+	Set gtmtypes("shm_snapshot_t",159,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_before_image")=159
+	Set gtmtypes("shm_snapshot_t",160,"name")="shm_snapshot_t.shadow_file_header.jnl_state"
+	Set gtmtypes("shm_snapshot_t",160,"off")=5096
 	Set gtmtypes("shm_snapshot_t",160,"len")=4
-	Set gtmtypes("shm_snapshot_t",160,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_file_len")=160
-	Set gtmtypes("shm_snapshot_t",161,"name")="shm_snapshot_t.shadow_file_header.autoswitchlimit"
-	Set gtmtypes("shm_snapshot_t",161,"off")=5104
+	Set gtmtypes("shm_snapshot_t",160,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_state")=160
+	Set gtmtypes("shm_snapshot_t",161,"name")="shm_snapshot_t.shadow_file_header.jnl_file_len"
+	Set gtmtypes("shm_snapshot_t",161,"off")=5100
 	Set gtmtypes("shm_snapshot_t",161,"len")=4
 	Set gtmtypes("shm_snapshot_t",161,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.autoswitchlimit")=161
-	Set gtmtypes("shm_snapshot_t",162,"name")="shm_snapshot_t.shadow_file_header.epoch_interval"
-	Set gtmtypes("shm_snapshot_t",162,"off")=5108
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_file_len")=161
+	Set gtmtypes("shm_snapshot_t",162,"name")="shm_snapshot_t.shadow_file_header.autoswitchlimit"
+	Set gtmtypes("shm_snapshot_t",162,"off")=5104
 	Set gtmtypes("shm_snapshot_t",162,"len")=4
-	Set gtmtypes("shm_snapshot_t",162,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.epoch_interval")=162
-	Set gtmtypes("shm_snapshot_t",163,"name")="shm_snapshot_t.shadow_file_header.alignsize"
-	Set gtmtypes("shm_snapshot_t",163,"off")=5112
+	Set gtmtypes("shm_snapshot_t",162,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.autoswitchlimit")=162
+	Set gtmtypes("shm_snapshot_t",163,"name")="shm_snapshot_t.shadow_file_header.epoch_interval"
+	Set gtmtypes("shm_snapshot_t",163,"off")=5108
 	Set gtmtypes("shm_snapshot_t",163,"len")=4
-	Set gtmtypes("shm_snapshot_t",163,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.alignsize")=163
-	Set gtmtypes("shm_snapshot_t",164,"name")="shm_snapshot_t.shadow_file_header.jnl_sync_io"
-	Set gtmtypes("shm_snapshot_t",164,"off")=5116
+	Set gtmtypes("shm_snapshot_t",163,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.epoch_interval")=163
+	Set gtmtypes("shm_snapshot_t",164,"name")="shm_snapshot_t.shadow_file_header.alignsize"
+	Set gtmtypes("shm_snapshot_t",164,"off")=5112
 	Set gtmtypes("shm_snapshot_t",164,"len")=4
-	Set gtmtypes("shm_snapshot_t",164,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_sync_io")=164
-	Set gtmtypes("shm_snapshot_t",165,"name")="shm_snapshot_t.shadow_file_header.yield_lmt"
-	Set gtmtypes("shm_snapshot_t",165,"off")=5120
+	Set gtmtypes("shm_snapshot_t",164,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.alignsize")=164
+	Set gtmtypes("shm_snapshot_t",165,"name")="shm_snapshot_t.shadow_file_header.jnl_sync_io"
+	Set gtmtypes("shm_snapshot_t",165,"off")=5116
 	Set gtmtypes("shm_snapshot_t",165,"len")=4
 	Set gtmtypes("shm_snapshot_t",165,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.yield_lmt")=165
-	Set gtmtypes("shm_snapshot_t",166,"name")="shm_snapshot_t.shadow_file_header.turn_around_point"
-	Set gtmtypes("shm_snapshot_t",166,"off")=5124
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_sync_io")=165
+	Set gtmtypes("shm_snapshot_t",166,"name")="shm_snapshot_t.shadow_file_header.yield_lmt"
+	Set gtmtypes("shm_snapshot_t",166,"off")=5120
 	Set gtmtypes("shm_snapshot_t",166,"len")=4
-	Set gtmtypes("shm_snapshot_t",166,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.turn_around_point")=166
-	Set gtmtypes("shm_snapshot_t",167,"name")="shm_snapshot_t.shadow_file_header.jnl_eovtn"
-	Set gtmtypes("shm_snapshot_t",167,"off")=5128
-	Set gtmtypes("shm_snapshot_t",167,"len")=8
-	Set gtmtypes("shm_snapshot_t",167,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_eovtn")=167
-	Set gtmtypes("shm_snapshot_t",168,"name")="shm_snapshot_t.shadow_file_header.filler_jnl"
-	Set gtmtypes("shm_snapshot_t",168,"off")=5136
+	Set gtmtypes("shm_snapshot_t",166,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.yield_lmt")=166
+	Set gtmtypes("shm_snapshot_t",167,"name")="shm_snapshot_t.shadow_file_header.turn_around_point"
+	Set gtmtypes("shm_snapshot_t",167,"off")=5124
+	Set gtmtypes("shm_snapshot_t",167,"len")=4
+	Set gtmtypes("shm_snapshot_t",167,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.turn_around_point")=167
+	Set gtmtypes("shm_snapshot_t",168,"name")="shm_snapshot_t.shadow_file_header.jnl_eovtn"
+	Set gtmtypes("shm_snapshot_t",168,"off")=5128
 	Set gtmtypes("shm_snapshot_t",168,"len")=8
-	Set gtmtypes("shm_snapshot_t",168,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_jnl")=168
-	Set gtmtypes("shm_snapshot_t",169,"name")="shm_snapshot_t.shadow_file_header.intrpt_recov_resync_seqno"
-	Set gtmtypes("shm_snapshot_t",169,"off")=5144
+	Set gtmtypes("shm_snapshot_t",168,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_eovtn")=168
+	Set gtmtypes("shm_snapshot_t",169,"name")="shm_snapshot_t.shadow_file_header.filler_jnl"
+	Set gtmtypes("shm_snapshot_t",169,"off")=5136
 	Set gtmtypes("shm_snapshot_t",169,"len")=8
-	Set gtmtypes("shm_snapshot_t",169,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.intrpt_recov_resync_seqno")=169
-	Set gtmtypes("shm_snapshot_t",170,"name")="shm_snapshot_t.shadow_file_header.intrpt_recov_tp_resolve_time"
-	Set gtmtypes("shm_snapshot_t",170,"off")=5152
-	Set gtmtypes("shm_snapshot_t",170,"len")=4
-	Set gtmtypes("shm_snapshot_t",170,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.intrpt_recov_tp_resolve_time")=170
-	Set gtmtypes("shm_snapshot_t",171,"name")="shm_snapshot_t.shadow_file_header.recov_interrupted"
-	Set gtmtypes("shm_snapshot_t",171,"off")=5156
+	Set gtmtypes("shm_snapshot_t",169,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_jnl")=169
+	Set gtmtypes("shm_snapshot_t",170,"name")="shm_snapshot_t.shadow_file_header.intrpt_recov_resync_seqno"
+	Set gtmtypes("shm_snapshot_t",170,"off")=5144
+	Set gtmtypes("shm_snapshot_t",170,"len")=8
+	Set gtmtypes("shm_snapshot_t",170,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.intrpt_recov_resync_seqno")=170
+	Set gtmtypes("shm_snapshot_t",171,"name")="shm_snapshot_t.shadow_file_header.intrpt_recov_tp_resolve_time"
+	Set gtmtypes("shm_snapshot_t",171,"off")=5152
 	Set gtmtypes("shm_snapshot_t",171,"len")=4
-	Set gtmtypes("shm_snapshot_t",171,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recov_interrupted")=171
-	Set gtmtypes("shm_snapshot_t",172,"name")="shm_snapshot_t.shadow_file_header.intrpt_recov_jnl_state"
-	Set gtmtypes("shm_snapshot_t",172,"off")=5160
+	Set gtmtypes("shm_snapshot_t",171,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.intrpt_recov_tp_resolve_time")=171
+	Set gtmtypes("shm_snapshot_t",172,"name")="shm_snapshot_t.shadow_file_header.recov_interrupted"
+	Set gtmtypes("shm_snapshot_t",172,"off")=5156
 	Set gtmtypes("shm_snapshot_t",172,"len")=4
-	Set gtmtypes("shm_snapshot_t",172,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.intrpt_recov_jnl_state")=172
-	Set gtmtypes("shm_snapshot_t",173,"name")="shm_snapshot_t.shadow_file_header.intrpt_recov_repl_state"
-	Set gtmtypes("shm_snapshot_t",173,"off")=5164
+	Set gtmtypes("shm_snapshot_t",172,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recov_interrupted")=172
+	Set gtmtypes("shm_snapshot_t",173,"name")="shm_snapshot_t.shadow_file_header.intrpt_recov_jnl_state"
+	Set gtmtypes("shm_snapshot_t",173,"off")=5160
 	Set gtmtypes("shm_snapshot_t",173,"len")=4
 	Set gtmtypes("shm_snapshot_t",173,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.intrpt_recov_repl_state")=173
-	Set gtmtypes("shm_snapshot_t",174,"name")="shm_snapshot_t.shadow_file_header.before_trunc_total_blks"
-	Set gtmtypes("shm_snapshot_t",174,"off")=5168
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.intrpt_recov_jnl_state")=173
+	Set gtmtypes("shm_snapshot_t",174,"name")="shm_snapshot_t.shadow_file_header.intrpt_recov_repl_state"
+	Set gtmtypes("shm_snapshot_t",174,"off")=5164
 	Set gtmtypes("shm_snapshot_t",174,"len")=4
-	Set gtmtypes("shm_snapshot_t",174,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.before_trunc_total_blks")=174
-	Set gtmtypes("shm_snapshot_t",175,"name")="shm_snapshot_t.shadow_file_header.after_trunc_total_blks"
-	Set gtmtypes("shm_snapshot_t",175,"off")=5172
+	Set gtmtypes("shm_snapshot_t",174,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.intrpt_recov_repl_state")=174
+	Set gtmtypes("shm_snapshot_t",175,"name")="shm_snapshot_t.shadow_file_header.before_trunc_total_blks"
+	Set gtmtypes("shm_snapshot_t",175,"off")=5168
 	Set gtmtypes("shm_snapshot_t",175,"len")=4
 	Set gtmtypes("shm_snapshot_t",175,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.after_trunc_total_blks")=175
-	Set gtmtypes("shm_snapshot_t",176,"name")="shm_snapshot_t.shadow_file_header.before_trunc_free_blocks"
-	Set gtmtypes("shm_snapshot_t",176,"off")=5176
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.before_trunc_total_blks")=175
+	Set gtmtypes("shm_snapshot_t",176,"name")="shm_snapshot_t.shadow_file_header.after_trunc_total_blks"
+	Set gtmtypes("shm_snapshot_t",176,"off")=5172
 	Set gtmtypes("shm_snapshot_t",176,"len")=4
 	Set gtmtypes("shm_snapshot_t",176,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.before_trunc_free_blocks")=176
-	Set gtmtypes("shm_snapshot_t",177,"name")="shm_snapshot_t.shadow_file_header.filler_trunc"
-	Set gtmtypes("shm_snapshot_t",177,"off")=5180
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.after_trunc_total_blks")=176
+	Set gtmtypes("shm_snapshot_t",177,"name")="shm_snapshot_t.shadow_file_header.before_trunc_free_blocks"
+	Set gtmtypes("shm_snapshot_t",177,"off")=5176
 	Set gtmtypes("shm_snapshot_t",177,"len")=4
 	Set gtmtypes("shm_snapshot_t",177,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_trunc")=177
-	Set gtmtypes("shm_snapshot_t",178,"name")="shm_snapshot_t.shadow_file_header.filler_1k"
-	Set gtmtypes("shm_snapshot_t",178,"off")=5184
-	Set gtmtypes("shm_snapshot_t",178,"len")=24
-	Set gtmtypes("shm_snapshot_t",178,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_1k")=178
-	Set gtmtypes("shm_snapshot_t",179,"name")="shm_snapshot_t.shadow_file_header.jnl_file_name"
-	Set gtmtypes("shm_snapshot_t",179,"off")=5208
-	Set gtmtypes("shm_snapshot_t",179,"len")=256
-	Set gtmtypes("shm_snapshot_t",179,"type")="unsigned-char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_file_name")=179
-	Set gtmtypes("shm_snapshot_t",180,"name")="shm_snapshot_t.shadow_file_header.reorg_restart_key"
-	Set gtmtypes("shm_snapshot_t",180,"off")=5464
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.before_trunc_free_blocks")=177
+	Set gtmtypes("shm_snapshot_t",178,"name")="shm_snapshot_t.shadow_file_header.filler_trunc"
+	Set gtmtypes("shm_snapshot_t",178,"off")=5180
+	Set gtmtypes("shm_snapshot_t",178,"len")=4
+	Set gtmtypes("shm_snapshot_t",178,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_trunc")=178
+	Set gtmtypes("shm_snapshot_t",179,"name")="shm_snapshot_t.shadow_file_header.filler_1k"
+	Set gtmtypes("shm_snapshot_t",179,"off")=5184
+	Set gtmtypes("shm_snapshot_t",179,"len")=24
+	Set gtmtypes("shm_snapshot_t",179,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_1k")=179
+	Set gtmtypes("shm_snapshot_t",180,"name")="shm_snapshot_t.shadow_file_header.jnl_file_name"
+	Set gtmtypes("shm_snapshot_t",180,"off")=5208
 	Set gtmtypes("shm_snapshot_t",180,"len")=256
 	Set gtmtypes("shm_snapshot_t",180,"type")="unsigned-char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reorg_restart_key")=180
-	Set gtmtypes("shm_snapshot_t",181,"name")="shm_snapshot_t.shadow_file_header.machine_name"
-	Set gtmtypes("shm_snapshot_t",181,"off")=5720
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_file_name")=180
+	Set gtmtypes("shm_snapshot_t",181,"name")="shm_snapshot_t.shadow_file_header.reorg_restart_key"
+	Set gtmtypes("shm_snapshot_t",181,"off")=5464
 	Set gtmtypes("shm_snapshot_t",181,"len")=256
-	Set gtmtypes("shm_snapshot_t",181,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.machine_name")=181
-	Set gtmtypes("shm_snapshot_t",182,"name")="shm_snapshot_t.shadow_file_header.encryption_hash"
-	Set gtmtypes("shm_snapshot_t",182,"off")=5976
-	Set gtmtypes("shm_snapshot_t",182,"len")=80
+	Set gtmtypes("shm_snapshot_t",181,"type")="unsigned-char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reorg_restart_key")=181
+	Set gtmtypes("shm_snapshot_t",182,"name")="shm_snapshot_t.shadow_file_header.machine_name"
+	Set gtmtypes("shm_snapshot_t",182,"off")=5720
+	Set gtmtypes("shm_snapshot_t",182,"len")=256
 	Set gtmtypes("shm_snapshot_t",182,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.encryption_hash")=182
-	Set gtmtypes("shm_snapshot_t",183,"name")="shm_snapshot_t.shadow_file_header.encryption_hash2"
-	Set gtmtypes("shm_snapshot_t",183,"off")=6056
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.machine_name")=182
+	Set gtmtypes("shm_snapshot_t",183,"name")="shm_snapshot_t.shadow_file_header.encryption_hash"
+	Set gtmtypes("shm_snapshot_t",183,"off")=5976
 	Set gtmtypes("shm_snapshot_t",183,"len")=80
 	Set gtmtypes("shm_snapshot_t",183,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.encryption_hash2")=183
-	Set gtmtypes("shm_snapshot_t",184,"name")="shm_snapshot_t.shadow_file_header.non_null_iv"
-	Set gtmtypes("shm_snapshot_t",184,"off")=6136
-	Set gtmtypes("shm_snapshot_t",184,"len")=4
-	Set gtmtypes("shm_snapshot_t",184,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.non_null_iv")=184
-	Set gtmtypes("shm_snapshot_t",185,"name")="shm_snapshot_t.shadow_file_header.encryption_hash_cutoff"
-	Set gtmtypes("shm_snapshot_t",185,"off")=6140
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.encryption_hash")=183
+	Set gtmtypes("shm_snapshot_t",184,"name")="shm_snapshot_t.shadow_file_header.encryption_hash2"
+	Set gtmtypes("shm_snapshot_t",184,"off")=6056
+	Set gtmtypes("shm_snapshot_t",184,"len")=80
+	Set gtmtypes("shm_snapshot_t",184,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.encryption_hash2")=184
+	Set gtmtypes("shm_snapshot_t",185,"name")="shm_snapshot_t.shadow_file_header.non_null_iv"
+	Set gtmtypes("shm_snapshot_t",185,"off")=6136
 	Set gtmtypes("shm_snapshot_t",185,"len")=4
-	Set gtmtypes("shm_snapshot_t",185,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.encryption_hash_cutoff")=185
-	Set gtmtypes("shm_snapshot_t",186,"name")="shm_snapshot_t.shadow_file_header.encryption_hash2_start_tn"
-	Set gtmtypes("shm_snapshot_t",186,"off")=6144
-	Set gtmtypes("shm_snapshot_t",186,"len")=8
-	Set gtmtypes("shm_snapshot_t",186,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.encryption_hash2_start_tn")=186
-	Set gtmtypes("shm_snapshot_t",187,"name")="shm_snapshot_t.shadow_file_header.filler_encrypt"
-	Set gtmtypes("shm_snapshot_t",187,"off")=6152
-	Set gtmtypes("shm_snapshot_t",187,"len")=80
-	Set gtmtypes("shm_snapshot_t",187,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_encrypt")=187
-	Set gtmtypes("shm_snapshot_t",188,"name")="shm_snapshot_t.shadow_file_header.total_buffer_flush_tn"
-	Set gtmtypes("shm_snapshot_t",188,"off")=6232
-	Set gtmtypes("shm_snapshot_t",188,"len")=8
-	Set gtmtypes("shm_snapshot_t",188,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.total_buffer_flush_tn")=188
-	Set gtmtypes("shm_snapshot_t",189,"name")="shm_snapshot_t.shadow_file_header.bufct_buffer_flush_tn"
-	Set gtmtypes("shm_snapshot_t",189,"off")=6240
+	Set gtmtypes("shm_snapshot_t",185,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.non_null_iv")=185
+	Set gtmtypes("shm_snapshot_t",186,"name")="shm_snapshot_t.shadow_file_header.encryption_hash_cutoff"
+	Set gtmtypes("shm_snapshot_t",186,"off")=6140
+	Set gtmtypes("shm_snapshot_t",186,"len")=4
+	Set gtmtypes("shm_snapshot_t",186,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.encryption_hash_cutoff")=186
+	Set gtmtypes("shm_snapshot_t",187,"name")="shm_snapshot_t.shadow_file_header.encryption_hash2_start_tn"
+	Set gtmtypes("shm_snapshot_t",187,"off")=6144
+	Set gtmtypes("shm_snapshot_t",187,"len")=8
+	Set gtmtypes("shm_snapshot_t",187,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.encryption_hash2_start_tn")=187
+	Set gtmtypes("shm_snapshot_t",188,"name")="shm_snapshot_t.shadow_file_header.filler_encrypt"
+	Set gtmtypes("shm_snapshot_t",188,"off")=6152
+	Set gtmtypes("shm_snapshot_t",188,"len")=80
+	Set gtmtypes("shm_snapshot_t",188,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_encrypt")=188
+	Set gtmtypes("shm_snapshot_t",189,"name")="shm_snapshot_t.shadow_file_header.total_buffer_flush_tn"
+	Set gtmtypes("shm_snapshot_t",189,"off")=6232
 	Set gtmtypes("shm_snapshot_t",189,"len")=8
 	Set gtmtypes("shm_snapshot_t",189,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bufct_buffer_flush_tn")=189
-	Set gtmtypes("shm_snapshot_t",190,"name")="shm_snapshot_t.shadow_file_header.bufct_buffer_flush_loop_tn"
-	Set gtmtypes("shm_snapshot_t",190,"off")=6248
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.total_buffer_flush_tn")=189
+	Set gtmtypes("shm_snapshot_t",190,"name")="shm_snapshot_t.shadow_file_header.bufct_buffer_flush_tn"
+	Set gtmtypes("shm_snapshot_t",190,"off")=6240
 	Set gtmtypes("shm_snapshot_t",190,"len")=8
 	Set gtmtypes("shm_snapshot_t",190,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bufct_buffer_flush_loop_tn")=190
-	Set gtmtypes("shm_snapshot_t",191,"name")="shm_snapshot_t.shadow_file_header.wrt_calls_tn"
-	Set gtmtypes("shm_snapshot_t",191,"off")=6256
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bufct_buffer_flush_tn")=190
+	Set gtmtypes("shm_snapshot_t",191,"name")="shm_snapshot_t.shadow_file_header.bufct_buffer_flush_loop_tn"
+	Set gtmtypes("shm_snapshot_t",191,"off")=6248
 	Set gtmtypes("shm_snapshot_t",191,"len")=8
 	Set gtmtypes("shm_snapshot_t",191,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_calls_tn")=191
-	Set gtmtypes("shm_snapshot_t",192,"name")="shm_snapshot_t.shadow_file_header.wrt_count_tn"
-	Set gtmtypes("shm_snapshot_t",192,"off")=6264
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bufct_buffer_flush_loop_tn")=191
+	Set gtmtypes("shm_snapshot_t",192,"name")="shm_snapshot_t.shadow_file_header.wrt_calls_tn"
+	Set gtmtypes("shm_snapshot_t",192,"off")=6256
 	Set gtmtypes("shm_snapshot_t",192,"len")=8
 	Set gtmtypes("shm_snapshot_t",192,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_count_tn")=192
-	Set gtmtypes("shm_snapshot_t",193,"name")="shm_snapshot_t.shadow_file_header.wrt_blocked_tn"
-	Set gtmtypes("shm_snapshot_t",193,"off")=6272
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_calls_tn")=192
+	Set gtmtypes("shm_snapshot_t",193,"name")="shm_snapshot_t.shadow_file_header.wrt_count_tn"
+	Set gtmtypes("shm_snapshot_t",193,"off")=6264
 	Set gtmtypes("shm_snapshot_t",193,"len")=8
 	Set gtmtypes("shm_snapshot_t",193,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_blocked_tn")=193
-	Set gtmtypes("shm_snapshot_t",194,"name")="shm_snapshot_t.shadow_file_header.wrt_busy_tn"
-	Set gtmtypes("shm_snapshot_t",194,"off")=6280
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_count_tn")=193
+	Set gtmtypes("shm_snapshot_t",194,"name")="shm_snapshot_t.shadow_file_header.wrt_blocked_tn"
+	Set gtmtypes("shm_snapshot_t",194,"off")=6272
 	Set gtmtypes("shm_snapshot_t",194,"len")=8
 	Set gtmtypes("shm_snapshot_t",194,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_busy_tn")=194
-	Set gtmtypes("shm_snapshot_t",195,"name")="shm_snapshot_t.shadow_file_header.wrt_noblks_wrtn_tn"
-	Set gtmtypes("shm_snapshot_t",195,"off")=6288
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_blocked_tn")=194
+	Set gtmtypes("shm_snapshot_t",195,"name")="shm_snapshot_t.shadow_file_header.wrt_busy_tn"
+	Set gtmtypes("shm_snapshot_t",195,"off")=6280
 	Set gtmtypes("shm_snapshot_t",195,"len")=8
 	Set gtmtypes("shm_snapshot_t",195,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_noblks_wrtn_tn")=195
-	Set gtmtypes("shm_snapshot_t",196,"name")="shm_snapshot_t.shadow_file_header.reserved_bgtrcrec1_tn"
-	Set gtmtypes("shm_snapshot_t",196,"off")=6296
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_busy_tn")=195
+	Set gtmtypes("shm_snapshot_t",196,"name")="shm_snapshot_t.shadow_file_header.wrt_noblks_wrtn_tn"
+	Set gtmtypes("shm_snapshot_t",196,"off")=6288
 	Set gtmtypes("shm_snapshot_t",196,"len")=8
 	Set gtmtypes("shm_snapshot_t",196,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reserved_bgtrcrec1_tn")=196
-	Set gtmtypes("shm_snapshot_t",197,"name")="shm_snapshot_t.shadow_file_header.reserved_bgtrcrec2_tn"
-	Set gtmtypes("shm_snapshot_t",197,"off")=6304
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_noblks_wrtn_tn")=196
+	Set gtmtypes("shm_snapshot_t",197,"name")="shm_snapshot_t.shadow_file_header.reserved_bgtrcrec1_tn"
+	Set gtmtypes("shm_snapshot_t",197,"off")=6296
 	Set gtmtypes("shm_snapshot_t",197,"len")=8
 	Set gtmtypes("shm_snapshot_t",197,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reserved_bgtrcrec2_tn")=197
-	Set gtmtypes("shm_snapshot_t",198,"name")="shm_snapshot_t.shadow_file_header.reserved_bgtrcrec3_tn"
-	Set gtmtypes("shm_snapshot_t",198,"off")=6312
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reserved_bgtrcrec1_tn")=197
+	Set gtmtypes("shm_snapshot_t",198,"name")="shm_snapshot_t.shadow_file_header.reserved_bgtrcrec2_tn"
+	Set gtmtypes("shm_snapshot_t",198,"off")=6304
 	Set gtmtypes("shm_snapshot_t",198,"len")=8
 	Set gtmtypes("shm_snapshot_t",198,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reserved_bgtrcrec3_tn")=198
-	Set gtmtypes("shm_snapshot_t",199,"name")="shm_snapshot_t.shadow_file_header.lost_block_recovery_tn"
-	Set gtmtypes("shm_snapshot_t",199,"off")=6320
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reserved_bgtrcrec2_tn")=198
+	Set gtmtypes("shm_snapshot_t",199,"name")="shm_snapshot_t.shadow_file_header.reserved_bgtrcrec3_tn"
+	Set gtmtypes("shm_snapshot_t",199,"off")=6312
 	Set gtmtypes("shm_snapshot_t",199,"len")=8
 	Set gtmtypes("shm_snapshot_t",199,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.lost_block_recovery_tn")=199
-	Set gtmtypes("shm_snapshot_t",200,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_onln_rlbk_tn"
-	Set gtmtypes("shm_snapshot_t",200,"off")=6328
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reserved_bgtrcrec3_tn")=199
+	Set gtmtypes("shm_snapshot_t",200,"name")="shm_snapshot_t.shadow_file_header.lost_block_recovery_tn"
+	Set gtmtypes("shm_snapshot_t",200,"off")=6320
 	Set gtmtypes("shm_snapshot_t",200,"len")=8
 	Set gtmtypes("shm_snapshot_t",200,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_onln_rlbk_tn")=200
-	Set gtmtypes("shm_snapshot_t",201,"name")="shm_snapshot_t.shadow_file_header.stale_tn"
-	Set gtmtypes("shm_snapshot_t",201,"off")=6336
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.lost_block_recovery_tn")=200
+	Set gtmtypes("shm_snapshot_t",201,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_onln_rlbk_tn"
+	Set gtmtypes("shm_snapshot_t",201,"off")=6328
 	Set gtmtypes("shm_snapshot_t",201,"len")=8
 	Set gtmtypes("shm_snapshot_t",201,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_tn")=201
-	Set gtmtypes("shm_snapshot_t",202,"name")="shm_snapshot_t.shadow_file_header.starved_tn"
-	Set gtmtypes("shm_snapshot_t",202,"off")=6344
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_onln_rlbk_tn")=201
+	Set gtmtypes("shm_snapshot_t",202,"name")="shm_snapshot_t.shadow_file_header.stale_tn"
+	Set gtmtypes("shm_snapshot_t",202,"off")=6336
 	Set gtmtypes("shm_snapshot_t",202,"len")=8
 	Set gtmtypes("shm_snapshot_t",202,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.starved_tn")=202
-	Set gtmtypes("shm_snapshot_t",203,"name")="shm_snapshot_t.shadow_file_header.stale_timer_started_tn"
-	Set gtmtypes("shm_snapshot_t",203,"off")=6352
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_tn")=202
+	Set gtmtypes("shm_snapshot_t",203,"name")="shm_snapshot_t.shadow_file_header.starved_tn"
+	Set gtmtypes("shm_snapshot_t",203,"off")=6344
 	Set gtmtypes("shm_snapshot_t",203,"len")=8
 	Set gtmtypes("shm_snapshot_t",203,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_timer_started_tn")=203
-	Set gtmtypes("shm_snapshot_t",204,"name")="shm_snapshot_t.shadow_file_header.stale_timer_pop_tn"
-	Set gtmtypes("shm_snapshot_t",204,"off")=6360
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.starved_tn")=203
+	Set gtmtypes("shm_snapshot_t",204,"name")="shm_snapshot_t.shadow_file_header.stale_timer_started_tn"
+	Set gtmtypes("shm_snapshot_t",204,"off")=6352
 	Set gtmtypes("shm_snapshot_t",204,"len")=8
 	Set gtmtypes("shm_snapshot_t",204,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_timer_pop_tn")=204
-	Set gtmtypes("shm_snapshot_t",205,"name")="shm_snapshot_t.shadow_file_header.stale_process_defer_tn"
-	Set gtmtypes("shm_snapshot_t",205,"off")=6368
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_timer_started_tn")=204
+	Set gtmtypes("shm_snapshot_t",205,"name")="shm_snapshot_t.shadow_file_header.stale_timer_pop_tn"
+	Set gtmtypes("shm_snapshot_t",205,"off")=6360
 	Set gtmtypes("shm_snapshot_t",205,"len")=8
 	Set gtmtypes("shm_snapshot_t",205,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_process_defer_tn")=205
-	Set gtmtypes("shm_snapshot_t",206,"name")="shm_snapshot_t.shadow_file_header.stale_defer_processed_tn"
-	Set gtmtypes("shm_snapshot_t",206,"off")=6376
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_timer_pop_tn")=205
+	Set gtmtypes("shm_snapshot_t",206,"name")="shm_snapshot_t.shadow_file_header.stale_process_defer_tn"
+	Set gtmtypes("shm_snapshot_t",206,"off")=6368
 	Set gtmtypes("shm_snapshot_t",206,"len")=8
 	Set gtmtypes("shm_snapshot_t",206,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_defer_processed_tn")=206
-	Set gtmtypes("shm_snapshot_t",207,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flush_tn"
-	Set gtmtypes("shm_snapshot_t",207,"off")=6384
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_process_defer_tn")=206
+	Set gtmtypes("shm_snapshot_t",207,"name")="shm_snapshot_t.shadow_file_header.stale_defer_processed_tn"
+	Set gtmtypes("shm_snapshot_t",207,"off")=6376
 	Set gtmtypes("shm_snapshot_t",207,"len")=8
 	Set gtmtypes("shm_snapshot_t",207,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flush_tn")=207
-	Set gtmtypes("shm_snapshot_t",208,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flush_loop_tn"
-	Set gtmtypes("shm_snapshot_t",208,"off")=6392
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_defer_processed_tn")=207
+	Set gtmtypes("shm_snapshot_t",208,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flush_tn"
+	Set gtmtypes("shm_snapshot_t",208,"off")=6384
 	Set gtmtypes("shm_snapshot_t",208,"len")=8
 	Set gtmtypes("shm_snapshot_t",208,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flush_loop_tn")=208
-	Set gtmtypes("shm_snapshot_t",209,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flush_retries_tn"
-	Set gtmtypes("shm_snapshot_t",209,"off")=6400
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flush_tn")=208
+	Set gtmtypes("shm_snapshot_t",209,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flush_loop_tn"
+	Set gtmtypes("shm_snapshot_t",209,"off")=6392
 	Set gtmtypes("shm_snapshot_t",209,"len")=8
 	Set gtmtypes("shm_snapshot_t",209,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flush_retries_tn")=209
-	Set gtmtypes("shm_snapshot_t",210,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flushed_during_lockwait_tn"
-	Set gtmtypes("shm_snapshot_t",210,"off")=6408
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flush_loop_tn")=209
+	Set gtmtypes("shm_snapshot_t",210,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flush_retries_tn"
+	Set gtmtypes("shm_snapshot_t",210,"off")=6400
 	Set gtmtypes("shm_snapshot_t",210,"len")=8
 	Set gtmtypes("shm_snapshot_t",210,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flushed_during_lockwait_tn")=210
-	Set gtmtypes("shm_snapshot_t",211,"name")="shm_snapshot_t.shadow_file_header.tp_crit_retries_tn"
-	Set gtmtypes("shm_snapshot_t",211,"off")=6416
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flush_retries_tn")=210
+	Set gtmtypes("shm_snapshot_t",211,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flushed_during_lockwait_tn"
+	Set gtmtypes("shm_snapshot_t",211,"off")=6408
 	Set gtmtypes("shm_snapshot_t",211,"len")=8
 	Set gtmtypes("shm_snapshot_t",211,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.tp_crit_retries_tn")=211
-	Set gtmtypes("shm_snapshot_t",212,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_flush_dirty_tn"
-	Set gtmtypes("shm_snapshot_t",212,"off")=6424
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flushed_during_lockwait_tn")=211
+	Set gtmtypes("shm_snapshot_t",212,"name")="shm_snapshot_t.shadow_file_header.tp_crit_retries_tn"
+	Set gtmtypes("shm_snapshot_t",212,"off")=6416
 	Set gtmtypes("shm_snapshot_t",212,"len")=8
 	Set gtmtypes("shm_snapshot_t",212,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_flush_dirty_tn")=212
-	Set gtmtypes("shm_snapshot_t",213,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_rip_wait_tn"
-	Set gtmtypes("shm_snapshot_t",213,"off")=6432
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.tp_crit_retries_tn")=212
+	Set gtmtypes("shm_snapshot_t",213,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_flush_dirty_tn"
+	Set gtmtypes("shm_snapshot_t",213,"off")=6424
 	Set gtmtypes("shm_snapshot_t",213,"len")=8
 	Set gtmtypes("shm_snapshot_t",213,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_rip_wait_tn")=213
-	Set gtmtypes("shm_snapshot_t",214,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_buf_owner_stuck_tn"
-	Set gtmtypes("shm_snapshot_t",214,"off")=6440
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_flush_dirty_tn")=213
+	Set gtmtypes("shm_snapshot_t",214,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_rip_wait_tn"
+	Set gtmtypes("shm_snapshot_t",214,"off")=6432
 	Set gtmtypes("shm_snapshot_t",214,"len")=8
 	Set gtmtypes("shm_snapshot_t",214,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_buf_owner_stuck_tn")=214
-	Set gtmtypes("shm_snapshot_t",215,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_out_of_design_tn"
-	Set gtmtypes("shm_snapshot_t",215,"off")=6448
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_rip_wait_tn")=214
+	Set gtmtypes("shm_snapshot_t",215,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_buf_owner_stuck_tn"
+	Set gtmtypes("shm_snapshot_t",215,"off")=6440
 	Set gtmtypes("shm_snapshot_t",215,"len")=8
 	Set gtmtypes("shm_snapshot_t",215,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_out_of_design_tn")=215
-	Set gtmtypes("shm_snapshot_t",216,"name")="shm_snapshot_t.shadow_file_header.t_qread_buf_owner_stuck_tn"
-	Set gtmtypes("shm_snapshot_t",216,"off")=6456
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_buf_owner_stuck_tn")=215
+	Set gtmtypes("shm_snapshot_t",216,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_out_of_design_tn"
+	Set gtmtypes("shm_snapshot_t",216,"off")=6448
 	Set gtmtypes("shm_snapshot_t",216,"len")=8
 	Set gtmtypes("shm_snapshot_t",216,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_buf_owner_stuck_tn")=216
-	Set gtmtypes("shm_snapshot_t",217,"name")="shm_snapshot_t.shadow_file_header.t_qread_out_of_design_tn"
-	Set gtmtypes("shm_snapshot_t",217,"off")=6464
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_out_of_design_tn")=216
+	Set gtmtypes("shm_snapshot_t",217,"name")="shm_snapshot_t.shadow_file_header.t_qread_buf_owner_stuck_tn"
+	Set gtmtypes("shm_snapshot_t",217,"off")=6456
 	Set gtmtypes("shm_snapshot_t",217,"len")=8
 	Set gtmtypes("shm_snapshot_t",217,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_out_of_design_tn")=217
-	Set gtmtypes("shm_snapshot_t",218,"name")="shm_snapshot_t.shadow_file_header.bt_put_flush_dirty_tn"
-	Set gtmtypes("shm_snapshot_t",218,"off")=6472
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_buf_owner_stuck_tn")=217
+	Set gtmtypes("shm_snapshot_t",218,"name")="shm_snapshot_t.shadow_file_header.t_qread_out_of_design_tn"
+	Set gtmtypes("shm_snapshot_t",218,"off")=6464
 	Set gtmtypes("shm_snapshot_t",218,"len")=8
 	Set gtmtypes("shm_snapshot_t",218,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bt_put_flush_dirty_tn")=218
-	Set gtmtypes("shm_snapshot_t",219,"name")="shm_snapshot_t.shadow_file_header.mlock_wakeups_tn"
-	Set gtmtypes("shm_snapshot_t",219,"off")=6480
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_out_of_design_tn")=218
+	Set gtmtypes("shm_snapshot_t",219,"name")="shm_snapshot_t.shadow_file_header.bt_put_flush_dirty_tn"
+	Set gtmtypes("shm_snapshot_t",219,"off")=6472
 	Set gtmtypes("shm_snapshot_t",219,"len")=8
 	Set gtmtypes("shm_snapshot_t",219,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.mlock_wakeups_tn")=219
-	Set gtmtypes("shm_snapshot_t",220,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_recover_invoked_tn"
-	Set gtmtypes("shm_snapshot_t",220,"off")=6488
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bt_put_flush_dirty_tn")=219
+	Set gtmtypes("shm_snapshot_t",220,"name")="shm_snapshot_t.shadow_file_header.mlock_wakeups_tn"
+	Set gtmtypes("shm_snapshot_t",220,"off")=6480
 	Set gtmtypes("shm_snapshot_t",220,"len")=8
 	Set gtmtypes("shm_snapshot_t",220,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_recover_invoked_tn")=220
-	Set gtmtypes("shm_snapshot_t",221,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_verify_passed_tn"
-	Set gtmtypes("shm_snapshot_t",221,"off")=6496
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.mlock_wakeups_tn")=220
+	Set gtmtypes("shm_snapshot_t",221,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_recover_invoked_tn"
+	Set gtmtypes("shm_snapshot_t",221,"off")=6488
 	Set gtmtypes("shm_snapshot_t",221,"len")=8
 	Set gtmtypes("shm_snapshot_t",221,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_verify_passed_tn")=221
-	Set gtmtypes("shm_snapshot_t",222,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_tn"
-	Set gtmtypes("shm_snapshot_t",222,"off")=6504
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_recover_invoked_tn")=221
+	Set gtmtypes("shm_snapshot_t",222,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_verify_passed_tn"
+	Set gtmtypes("shm_snapshot_t",222,"off")=6496
 	Set gtmtypes("shm_snapshot_t",222,"len")=8
 	Set gtmtypes("shm_snapshot_t",222,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_tn")=222
-	Set gtmtypes("shm_snapshot_t",223,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_tn"
-	Set gtmtypes("shm_snapshot_t",223,"off")=6512
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_verify_passed_tn")=222
+	Set gtmtypes("shm_snapshot_t",223,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_tn"
+	Set gtmtypes("shm_snapshot_t",223,"off")=6504
 	Set gtmtypes("shm_snapshot_t",223,"len")=8
 	Set gtmtypes("shm_snapshot_t",223,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_tn")=223
-	Set gtmtypes("shm_snapshot_t",224,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_db_csh_getn_loopexceed_tn"
-	Set gtmtypes("shm_snapshot_t",224,"off")=6520
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_tn")=223
+	Set gtmtypes("shm_snapshot_t",224,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_tn"
+	Set gtmtypes("shm_snapshot_t",224,"off")=6512
 	Set gtmtypes("shm_snapshot_t",224,"len")=8
 	Set gtmtypes("shm_snapshot_t",224,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_db_csh_getn_loopexceed_tn")=224
-	Set gtmtypes("shm_snapshot_t",225,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_tn"
-	Set gtmtypes("shm_snapshot_t",225,"off")=6528
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_tn")=224
+	Set gtmtypes("shm_snapshot_t",225,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_db_csh_getn_loopexceed_tn"
+	Set gtmtypes("shm_snapshot_t",225,"off")=6520
 	Set gtmtypes("shm_snapshot_t",225,"len")=8
 	Set gtmtypes("shm_snapshot_t",225,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_tn")=225
-	Set gtmtypes("shm_snapshot_t",226,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_db_csh_get_tn"
-	Set gtmtypes("shm_snapshot_t",226,"off")=6536
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_db_csh_getn_loopexceed_tn")=225
+	Set gtmtypes("shm_snapshot_t",226,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_tn"
+	Set gtmtypes("shm_snapshot_t",226,"off")=6528
 	Set gtmtypes("shm_snapshot_t",226,"len")=8
 	Set gtmtypes("shm_snapshot_t",226,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_db_csh_get_tn")=226
-	Set gtmtypes("shm_snapshot_t",227,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_wcsgetspace_tn"
-	Set gtmtypes("shm_snapshot_t",227,"off")=6544
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_tn")=226
+	Set gtmtypes("shm_snapshot_t",227,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_db_csh_get_tn"
+	Set gtmtypes("shm_snapshot_t",227,"off")=6536
 	Set gtmtypes("shm_snapshot_t",227,"len")=8
 	Set gtmtypes("shm_snapshot_t",227,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_wcsgetspace_tn")=227
-	Set gtmtypes("shm_snapshot_t",228,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_t1_tn"
-	Set gtmtypes("shm_snapshot_t",228,"off")=6552
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_db_csh_get_tn")=227
+	Set gtmtypes("shm_snapshot_t",228,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_wcsgetspace_tn"
+	Set gtmtypes("shm_snapshot_t",228,"off")=6544
 	Set gtmtypes("shm_snapshot_t",228,"len")=8
 	Set gtmtypes("shm_snapshot_t",228,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_t1_tn")=228
-	Set gtmtypes("shm_snapshot_t",229,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_bitmap_tn"
-	Set gtmtypes("shm_snapshot_t",229,"off")=6560
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_wcsgetspace_tn")=228
+	Set gtmtypes("shm_snapshot_t",229,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_t1_tn"
+	Set gtmtypes("shm_snapshot_t",229,"off")=6552
 	Set gtmtypes("shm_snapshot_t",229,"len")=8
 	Set gtmtypes("shm_snapshot_t",229,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_bitmap_tn")=229
-	Set gtmtypes("shm_snapshot_t",230,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_jnl_cwset_tn"
-	Set gtmtypes("shm_snapshot_t",230,"off")=6568
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_t1_tn")=229
+	Set gtmtypes("shm_snapshot_t",230,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_bitmap_tn"
+	Set gtmtypes("shm_snapshot_t",230,"off")=6560
 	Set gtmtypes("shm_snapshot_t",230,"len")=8
 	Set gtmtypes("shm_snapshot_t",230,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_jnl_cwset_tn")=230
-	Set gtmtypes("shm_snapshot_t",231,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_tn"
-	Set gtmtypes("shm_snapshot_t",231,"off")=6576
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_bitmap_tn")=230
+	Set gtmtypes("shm_snapshot_t",231,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_jnl_cwset_tn"
+	Set gtmtypes("shm_snapshot_t",231,"off")=6568
 	Set gtmtypes("shm_snapshot_t",231,"len")=8
 	Set gtmtypes("shm_snapshot_t",231,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_tn")=231
-	Set gtmtypes("shm_snapshot_t",232,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_hist_tn"
-	Set gtmtypes("shm_snapshot_t",232,"off")=6584
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_jnl_cwset_tn")=231
+	Set gtmtypes("shm_snapshot_t",232,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_tn"
+	Set gtmtypes("shm_snapshot_t",232,"off")=6576
 	Set gtmtypes("shm_snapshot_t",232,"len")=8
 	Set gtmtypes("shm_snapshot_t",232,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_hist_tn")=232
-	Set gtmtypes("shm_snapshot_t",233,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_hist1_nullbt_tn"
-	Set gtmtypes("shm_snapshot_t",233,"off")=6592
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_tn")=232
+	Set gtmtypes("shm_snapshot_t",233,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_hist_tn"
+	Set gtmtypes("shm_snapshot_t",233,"off")=6584
 	Set gtmtypes("shm_snapshot_t",233,"len")=8
 	Set gtmtypes("shm_snapshot_t",233,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_hist1_nullbt_tn")=233
-	Set gtmtypes("shm_snapshot_t",234,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_tn"
-	Set gtmtypes("shm_snapshot_t",234,"off")=6600
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_hist_tn")=233
+	Set gtmtypes("shm_snapshot_t",234,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_hist1_nullbt_tn"
+	Set gtmtypes("shm_snapshot_t",234,"off")=6592
 	Set gtmtypes("shm_snapshot_t",234,"len")=8
 	Set gtmtypes("shm_snapshot_t",234,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_tn")=234
-	Set gtmtypes("shm_snapshot_t",235,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_bitmap_nullbt_tn"
-	Set gtmtypes("shm_snapshot_t",235,"off")=6608
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_hist1_nullbt_tn")=234
+	Set gtmtypes("shm_snapshot_t",235,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_tn"
+	Set gtmtypes("shm_snapshot_t",235,"off")=6600
 	Set gtmtypes("shm_snapshot_t",235,"len")=8
 	Set gtmtypes("shm_snapshot_t",235,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_bitmap_nullbt_tn")=235
-	Set gtmtypes("shm_snapshot_t",236,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_tn"
-	Set gtmtypes("shm_snapshot_t",236,"off")=6616
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_tn")=235
+	Set gtmtypes("shm_snapshot_t",236,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_bitmap_nullbt_tn"
+	Set gtmtypes("shm_snapshot_t",236,"off")=6608
 	Set gtmtypes("shm_snapshot_t",236,"len")=8
 	Set gtmtypes("shm_snapshot_t",236,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_tn")=236
-	Set gtmtypes("shm_snapshot_t",237,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_jnl_cwset_tn"
-	Set gtmtypes("shm_snapshot_t",237,"off")=6624
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_bitmap_nullbt_tn")=236
+	Set gtmtypes("shm_snapshot_t",237,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_tn"
+	Set gtmtypes("shm_snapshot_t",237,"off")=6616
 	Set gtmtypes("shm_snapshot_t",237,"len")=8
 	Set gtmtypes("shm_snapshot_t",237,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_jnl_cwset_tn")=237
-	Set gtmtypes("shm_snapshot_t",238,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_jnl_wcsflu_tn"
-	Set gtmtypes("shm_snapshot_t",238,"off")=6632
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_tn")=237
+	Set gtmtypes("shm_snapshot_t",238,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_jnl_cwset_tn"
+	Set gtmtypes("shm_snapshot_t",238,"off")=6624
 	Set gtmtypes("shm_snapshot_t",238,"len")=8
 	Set gtmtypes("shm_snapshot_t",238,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_jnl_wcsflu_tn")=238
-	Set gtmtypes("shm_snapshot_t",239,"name")="shm_snapshot_t.shadow_file_header.db_csh_get_too_many_loops_tn"
-	Set gtmtypes("shm_snapshot_t",239,"off")=6640
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_jnl_cwset_tn")=238
+	Set gtmtypes("shm_snapshot_t",239,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_jnl_wcsflu_tn"
+	Set gtmtypes("shm_snapshot_t",239,"off")=6632
 	Set gtmtypes("shm_snapshot_t",239,"len")=8
 	Set gtmtypes("shm_snapshot_t",239,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_get_too_many_loops_tn")=239
-	Set gtmtypes("shm_snapshot_t",240,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tpckh_hist1_nullbt_tn"
-	Set gtmtypes("shm_snapshot_t",240,"off")=6648
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_jnl_wcsflu_tn")=239
+	Set gtmtypes("shm_snapshot_t",240,"name")="shm_snapshot_t.shadow_file_header.db_csh_get_too_many_loops_tn"
+	Set gtmtypes("shm_snapshot_t",240,"off")=6640
 	Set gtmtypes("shm_snapshot_t",240,"len")=8
 	Set gtmtypes("shm_snapshot_t",240,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tpckh_hist1_nullbt_tn")=240
-	Set gtmtypes("shm_snapshot_t",241,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_tn"
-	Set gtmtypes("shm_snapshot_t",241,"off")=6656
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_get_too_many_loops_tn")=240
+	Set gtmtypes("shm_snapshot_t",241,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tpckh_hist1_nullbt_tn"
+	Set gtmtypes("shm_snapshot_t",241,"off")=6648
 	Set gtmtypes("shm_snapshot_t",241,"len")=8
 	Set gtmtypes("shm_snapshot_t",241,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_tn")=241
-	Set gtmtypes("shm_snapshot_t",242,"name")="shm_snapshot_t.shadow_file_header.jnl_blocked_writer_lost_tn"
-	Set gtmtypes("shm_snapshot_t",242,"off")=6664
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tpckh_hist1_nullbt_tn")=241
+	Set gtmtypes("shm_snapshot_t",242,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_tn"
+	Set gtmtypes("shm_snapshot_t",242,"off")=6656
 	Set gtmtypes("shm_snapshot_t",242,"len")=8
 	Set gtmtypes("shm_snapshot_t",242,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_blocked_writer_lost_tn")=242
-	Set gtmtypes("shm_snapshot_t",243,"name")="shm_snapshot_t.shadow_file_header.jnl_blocked_writer_stuck_tn"
-	Set gtmtypes("shm_snapshot_t",243,"off")=6672
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_tn")=242
+	Set gtmtypes("shm_snapshot_t",243,"name")="shm_snapshot_t.shadow_file_header.jnl_blocked_writer_lost_tn"
+	Set gtmtypes("shm_snapshot_t",243,"off")=6664
 	Set gtmtypes("shm_snapshot_t",243,"len")=8
 	Set gtmtypes("shm_snapshot_t",243,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_blocked_writer_stuck_tn")=243
-	Set gtmtypes("shm_snapshot_t",244,"name")="shm_snapshot_t.shadow_file_header.jnl_blocked_writer_blocked_tn"
-	Set gtmtypes("shm_snapshot_t",244,"off")=6680
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_blocked_writer_lost_tn")=243
+	Set gtmtypes("shm_snapshot_t",244,"name")="shm_snapshot_t.shadow_file_header.jnl_blocked_writer_stuck_tn"
+	Set gtmtypes("shm_snapshot_t",244,"off")=6672
 	Set gtmtypes("shm_snapshot_t",244,"len")=8
 	Set gtmtypes("shm_snapshot_t",244,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_blocked_writer_blocked_tn")=244
-	Set gtmtypes("shm_snapshot_t",245,"name")="shm_snapshot_t.shadow_file_header.n_jnl_fsyncs_tn"
-	Set gtmtypes("shm_snapshot_t",245,"off")=6688
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_blocked_writer_stuck_tn")=244
+	Set gtmtypes("shm_snapshot_t",245,"name")="shm_snapshot_t.shadow_file_header.jnl_blocked_writer_blocked_tn"
+	Set gtmtypes("shm_snapshot_t",245,"off")=6680
 	Set gtmtypes("shm_snapshot_t",245,"len")=8
 	Set gtmtypes("shm_snapshot_t",245,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_jnl_fsyncs_tn")=245
-	Set gtmtypes("shm_snapshot_t",246,"name")="shm_snapshot_t.shadow_file_header.n_jnl_fsync_tries_tn"
-	Set gtmtypes("shm_snapshot_t",246,"off")=6696
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_blocked_writer_blocked_tn")=245
+	Set gtmtypes("shm_snapshot_t",246,"name")="shm_snapshot_t.shadow_file_header.n_jnl_fsyncs_tn"
+	Set gtmtypes("shm_snapshot_t",246,"off")=6688
 	Set gtmtypes("shm_snapshot_t",246,"len")=8
 	Set gtmtypes("shm_snapshot_t",246,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_jnl_fsync_tries_tn")=246
-	Set gtmtypes("shm_snapshot_t",247,"name")="shm_snapshot_t.shadow_file_header.n_jnl_fsync_recovers_tn"
-	Set gtmtypes("shm_snapshot_t",247,"off")=6704
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_jnl_fsyncs_tn")=246
+	Set gtmtypes("shm_snapshot_t",247,"name")="shm_snapshot_t.shadow_file_header.n_jnl_fsync_tries_tn"
+	Set gtmtypes("shm_snapshot_t",247,"off")=6696
 	Set gtmtypes("shm_snapshot_t",247,"len")=8
 	Set gtmtypes("shm_snapshot_t",247,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_jnl_fsync_recovers_tn")=247
-	Set gtmtypes("shm_snapshot_t",248,"name")="shm_snapshot_t.shadow_file_header.n_db_fsyncs_tn"
-	Set gtmtypes("shm_snapshot_t",248,"off")=6712
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_jnl_fsync_tries_tn")=247
+	Set gtmtypes("shm_snapshot_t",248,"name")="shm_snapshot_t.shadow_file_header.n_jnl_fsync_recovers_tn"
+	Set gtmtypes("shm_snapshot_t",248,"off")=6704
 	Set gtmtypes("shm_snapshot_t",248,"len")=8
 	Set gtmtypes("shm_snapshot_t",248,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_fsyncs_tn")=248
-	Set gtmtypes("shm_snapshot_t",249,"name")="shm_snapshot_t.shadow_file_header.n_db_fsyncs_in_crit_tn"
-	Set gtmtypes("shm_snapshot_t",249,"off")=6720
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_jnl_fsync_recovers_tn")=248
+	Set gtmtypes("shm_snapshot_t",249,"name")="shm_snapshot_t.shadow_file_header.n_db_fsyncs_tn"
+	Set gtmtypes("shm_snapshot_t",249,"off")=6712
 	Set gtmtypes("shm_snapshot_t",249,"len")=8
 	Set gtmtypes("shm_snapshot_t",249,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_fsyncs_in_crit_tn")=249
-	Set gtmtypes("shm_snapshot_t",250,"name")="shm_snapshot_t.shadow_file_header.n_dbsync_timers_tn"
-	Set gtmtypes("shm_snapshot_t",250,"off")=6728
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_fsyncs_tn")=249
+	Set gtmtypes("shm_snapshot_t",250,"name")="shm_snapshot_t.shadow_file_header.n_db_fsyncs_in_crit_tn"
+	Set gtmtypes("shm_snapshot_t",250,"off")=6720
 	Set gtmtypes("shm_snapshot_t",250,"len")=8
 	Set gtmtypes("shm_snapshot_t",250,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_dbsync_timers_tn")=250
-	Set gtmtypes("shm_snapshot_t",251,"name")="shm_snapshot_t.shadow_file_header.n_dbsync_writes_tn"
-	Set gtmtypes("shm_snapshot_t",251,"off")=6736
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_fsyncs_in_crit_tn")=250
+	Set gtmtypes("shm_snapshot_t",251,"name")="shm_snapshot_t.shadow_file_header.n_dbsync_timers_tn"
+	Set gtmtypes("shm_snapshot_t",251,"off")=6728
 	Set gtmtypes("shm_snapshot_t",251,"len")=8
 	Set gtmtypes("shm_snapshot_t",251,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_dbsync_writes_tn")=251
-	Set gtmtypes("shm_snapshot_t",252,"name")="shm_snapshot_t.shadow_file_header.mutex_queue_full_tn"
-	Set gtmtypes("shm_snapshot_t",252,"off")=6744
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_dbsync_timers_tn")=251
+	Set gtmtypes("shm_snapshot_t",252,"name")="shm_snapshot_t.shadow_file_header.n_dbsync_writes_tn"
+	Set gtmtypes("shm_snapshot_t",252,"off")=6736
 	Set gtmtypes("shm_snapshot_t",252,"len")=8
 	Set gtmtypes("shm_snapshot_t",252,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.mutex_queue_full_tn")=252
-	Set gtmtypes("shm_snapshot_t",253,"name")="shm_snapshot_t.shadow_file_header.wcb_bt_put_tn"
-	Set gtmtypes("shm_snapshot_t",253,"off")=6752
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_dbsync_writes_tn")=252
+	Set gtmtypes("shm_snapshot_t",253,"name")="shm_snapshot_t.shadow_file_header.mutex_queue_full_tn"
+	Set gtmtypes("shm_snapshot_t",253,"off")=6744
 	Set gtmtypes("shm_snapshot_t",253,"len")=8
 	Set gtmtypes("shm_snapshot_t",253,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_bt_put_tn")=253
-	Set gtmtypes("shm_snapshot_t",254,"name")="shm_snapshot_t.shadow_file_header.wcb_mutex_salvage_tn"
-	Set gtmtypes("shm_snapshot_t",254,"off")=6760
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.mutex_queue_full_tn")=253
+	Set gtmtypes("shm_snapshot_t",254,"name")="shm_snapshot_t.shadow_file_header.wcb_bt_put_tn"
+	Set gtmtypes("shm_snapshot_t",254,"off")=6752
 	Set gtmtypes("shm_snapshot_t",254,"len")=8
 	Set gtmtypes("shm_snapshot_t",254,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_mutex_salvage_tn")=254
-	Set gtmtypes("shm_snapshot_t",255,"name")="shm_snapshot_t.shadow_file_header.wcb_tp_grab_crit_tn"
-	Set gtmtypes("shm_snapshot_t",255,"off")=6768
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_bt_put_tn")=254
+	Set gtmtypes("shm_snapshot_t",255,"name")="shm_snapshot_t.shadow_file_header.wcb_mutex_salvage_tn"
+	Set gtmtypes("shm_snapshot_t",255,"off")=6760
 	Set gtmtypes("shm_snapshot_t",255,"len")=8
 	Set gtmtypes("shm_snapshot_t",255,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_tp_grab_crit_tn")=255
-	Set gtmtypes("shm_snapshot_t",256,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_nocr_invcr_tn"
-	Set gtmtypes("shm_snapshot_t",256,"off")=6776
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_mutex_salvage_tn")=255
+	Set gtmtypes("shm_snapshot_t",256,"name")="shm_snapshot_t.shadow_file_header.wcb_tp_grab_crit_tn"
+	Set gtmtypes("shm_snapshot_t",256,"off")=6768
 	Set gtmtypes("shm_snapshot_t",256,"len")=8
 	Set gtmtypes("shm_snapshot_t",256,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_nocr_invcr_tn")=256
-	Set gtmtypes("shm_snapshot_t",257,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_cr_invcr_tn"
-	Set gtmtypes("shm_snapshot_t",257,"off")=6784
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_tp_grab_crit_tn")=256
+	Set gtmtypes("shm_snapshot_t",257,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_nocr_invcr_tn"
+	Set gtmtypes("shm_snapshot_t",257,"off")=6776
 	Set gtmtypes("shm_snapshot_t",257,"len")=8
 	Set gtmtypes("shm_snapshot_t",257,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_cr_invcr_tn")=257
-	Set gtmtypes("shm_snapshot_t",258,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_rip_wait_tn"
-	Set gtmtypes("shm_snapshot_t",258,"off")=6792
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_nocr_invcr_tn")=257
+	Set gtmtypes("shm_snapshot_t",258,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_cr_invcr_tn"
+	Set gtmtypes("shm_snapshot_t",258,"off")=6784
 	Set gtmtypes("shm_snapshot_t",258,"len")=8
 	Set gtmtypes("shm_snapshot_t",258,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_rip_wait_tn")=258
-	Set gtmtypes("shm_snapshot_t",259,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirtyripwait_tn"
-	Set gtmtypes("shm_snapshot_t",259,"off")=6800
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_cr_invcr_tn")=258
+	Set gtmtypes("shm_snapshot_t",259,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_rip_wait_tn"
+	Set gtmtypes("shm_snapshot_t",259,"off")=6792
 	Set gtmtypes("shm_snapshot_t",259,"len")=8
 	Set gtmtypes("shm_snapshot_t",259,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirtyripwait_tn")=259
-	Set gtmtypes("shm_snapshot_t",260,"name")="shm_snapshot_t.shadow_file_header.wcb_gds_rundown_tn"
-	Set gtmtypes("shm_snapshot_t",260,"off")=6808
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_rip_wait_tn")=259
+	Set gtmtypes("shm_snapshot_t",260,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirtyripwait_tn"
+	Set gtmtypes("shm_snapshot_t",260,"off")=6800
 	Set gtmtypes("shm_snapshot_t",260,"len")=8
 	Set gtmtypes("shm_snapshot_t",260,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_gds_rundown_tn")=260
-	Set gtmtypes("shm_snapshot_t",261,"name")="shm_snapshot_t.shadow_file_header.wcb_wcs_flu1_tn"
-	Set gtmtypes("shm_snapshot_t",261,"off")=6816
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirtyripwait_tn")=260
+	Set gtmtypes("shm_snapshot_t",261,"name")="shm_snapshot_t.shadow_file_header.wcb_gds_rundown_tn"
+	Set gtmtypes("shm_snapshot_t",261,"off")=6808
 	Set gtmtypes("shm_snapshot_t",261,"len")=8
 	Set gtmtypes("shm_snapshot_t",261,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wcs_flu1_tn")=261
-	Set gtmtypes("shm_snapshot_t",262,"name")="shm_snapshot_t.shadow_file_header.wcb_mu_back_tn"
-	Set gtmtypes("shm_snapshot_t",262,"off")=6824
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_gds_rundown_tn")=261
+	Set gtmtypes("shm_snapshot_t",262,"name")="shm_snapshot_t.shadow_file_header.wcb_wcs_flu1_tn"
+	Set gtmtypes("shm_snapshot_t",262,"off")=6816
 	Set gtmtypes("shm_snapshot_t",262,"len")=8
 	Set gtmtypes("shm_snapshot_t",262,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_mu_back_tn")=262
-	Set gtmtypes("shm_snapshot_t",263,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirty_invcr_tn"
-	Set gtmtypes("shm_snapshot_t",263,"off")=6832
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wcs_flu1_tn")=262
+	Set gtmtypes("shm_snapshot_t",263,"name")="shm_snapshot_t.shadow_file_header.wcb_mu_back_tn"
+	Set gtmtypes("shm_snapshot_t",263,"off")=6824
 	Set gtmtypes("shm_snapshot_t",263,"len")=8
 	Set gtmtypes("shm_snapshot_t",263,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirty_invcr_tn")=263
-	Set gtmtypes("shm_snapshot_t",264,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_wtfini_fail_tn"
-	Set gtmtypes("shm_snapshot_t",264,"off")=6840
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_mu_back_tn")=263
+	Set gtmtypes("shm_snapshot_t",264,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirty_invcr_tn"
+	Set gtmtypes("shm_snapshot_t",264,"off")=6832
 	Set gtmtypes("shm_snapshot_t",264,"len")=8
 	Set gtmtypes("shm_snapshot_t",264,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_wtfini_fail_tn")=264
-	Set gtmtypes("shm_snapshot_t",265,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_twin_stuck_tn"
-	Set gtmtypes("shm_snapshot_t",265,"off")=6848
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirty_invcr_tn")=264
+	Set gtmtypes("shm_snapshot_t",265,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_wtfini_fail_tn"
+	Set gtmtypes("shm_snapshot_t",265,"off")=6840
 	Set gtmtypes("shm_snapshot_t",265,"len")=8
 	Set gtmtypes("shm_snapshot_t",265,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_twin_stuck_tn")=265
-	Set gtmtypes("shm_snapshot_t",266,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_wrt_latch_stuck_tn"
-	Set gtmtypes("shm_snapshot_t",266,"off")=6856
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_wtfini_fail_tn")=265
+	Set gtmtypes("shm_snapshot_t",266,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_twin_stuck_tn"
+	Set gtmtypes("shm_snapshot_t",266,"off")=6848
 	Set gtmtypes("shm_snapshot_t",266,"len")=8
 	Set gtmtypes("shm_snapshot_t",266,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_wrt_latch_stuck_tn")=266
-	Set gtmtypes("shm_snapshot_t",267,"name")="shm_snapshot_t.shadow_file_header.wcb_secshr_db_clnup_now_crit_tn"
-	Set gtmtypes("shm_snapshot_t",267,"off")=6864
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_twin_stuck_tn")=266
+	Set gtmtypes("shm_snapshot_t",267,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_wrt_latch_stuck_tn"
+	Set gtmtypes("shm_snapshot_t",267,"off")=6856
 	Set gtmtypes("shm_snapshot_t",267,"len")=8
 	Set gtmtypes("shm_snapshot_t",267,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_secshr_db_clnup_now_crit_tn")=267
-	Set gtmtypes("shm_snapshot_t",268,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_bad_bt_index1_tn"
-	Set gtmtypes("shm_snapshot_t",268,"off")=6872
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_wrt_latch_stuck_tn")=267
+	Set gtmtypes("shm_snapshot_t",268,"name")="shm_snapshot_t.shadow_file_header.wcb_secshr_db_clnup_now_crit_tn"
+	Set gtmtypes("shm_snapshot_t",268,"off")=6864
 	Set gtmtypes("shm_snapshot_t",268,"len")=8
 	Set gtmtypes("shm_snapshot_t",268,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_bad_bt_index1_tn")=268
-	Set gtmtypes("shm_snapshot_t",269,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_bad_bt_index2_tn"
-	Set gtmtypes("shm_snapshot_t",269,"off")=6880
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_secshr_db_clnup_now_crit_tn")=268
+	Set gtmtypes("shm_snapshot_t",269,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_bad_bt_index1_tn"
+	Set gtmtypes("shm_snapshot_t",269,"off")=6872
 	Set gtmtypes("shm_snapshot_t",269,"len")=8
 	Set gtmtypes("shm_snapshot_t",269,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_bad_bt_index2_tn")=269
-	Set gtmtypes("shm_snapshot_t",270,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_crbtmismatch1_tn"
-	Set gtmtypes("shm_snapshot_t",270,"off")=6888
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_bad_bt_index1_tn")=269
+	Set gtmtypes("shm_snapshot_t",270,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_bad_bt_index2_tn"
+	Set gtmtypes("shm_snapshot_t",270,"off")=6880
 	Set gtmtypes("shm_snapshot_t",270,"len")=8
 	Set gtmtypes("shm_snapshot_t",270,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_crbtmismatch1_tn")=270
-	Set gtmtypes("shm_snapshot_t",271,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_crbtmismatch2_tn"
-	Set gtmtypes("shm_snapshot_t",271,"off")=6896
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_bad_bt_index2_tn")=270
+	Set gtmtypes("shm_snapshot_t",271,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_crbtmismatch1_tn"
+	Set gtmtypes("shm_snapshot_t",271,"off")=6888
 	Set gtmtypes("shm_snapshot_t",271,"len")=8
 	Set gtmtypes("shm_snapshot_t",271,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_crbtmismatch2_tn")=271
-	Set gtmtypes("shm_snapshot_t",272,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_crbtmismatch3_tn"
-	Set gtmtypes("shm_snapshot_t",272,"off")=6904
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_crbtmismatch1_tn")=271
+	Set gtmtypes("shm_snapshot_t",272,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_crbtmismatch2_tn"
+	Set gtmtypes("shm_snapshot_t",272,"off")=6896
 	Set gtmtypes("shm_snapshot_t",272,"len")=8
 	Set gtmtypes("shm_snapshot_t",272,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_crbtmismatch3_tn")=272
-	Set gtmtypes("shm_snapshot_t",273,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_tn"
-	Set gtmtypes("shm_snapshot_t",273,"off")=6912
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_crbtmismatch2_tn")=272
+	Set gtmtypes("shm_snapshot_t",273,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_crbtmismatch3_tn"
+	Set gtmtypes("shm_snapshot_t",273,"off")=6904
 	Set gtmtypes("shm_snapshot_t",273,"len")=8
 	Set gtmtypes("shm_snapshot_t",273,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_tn")=273
-	Set gtmtypes("shm_snapshot_t",274,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_tn"
-	Set gtmtypes("shm_snapshot_t",274,"off")=6920
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_crbtmismatch3_tn")=273
+	Set gtmtypes("shm_snapshot_t",274,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_tn"
+	Set gtmtypes("shm_snapshot_t",274,"off")=6912
 	Set gtmtypes("shm_snapshot_t",274,"len")=8
 	Set gtmtypes("shm_snapshot_t",274,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_tn")=274
-	Set gtmtypes("shm_snapshot_t",275,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_tn"
-	Set gtmtypes("shm_snapshot_t",275,"off")=6928
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_tn")=274
+	Set gtmtypes("shm_snapshot_t",275,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_tn"
+	Set gtmtypes("shm_snapshot_t",275,"off")=6920
 	Set gtmtypes("shm_snapshot_t",275,"len")=8
 	Set gtmtypes("shm_snapshot_t",275,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_tn")=275
-	Set gtmtypes("shm_snapshot_t",276,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_tn"
-	Set gtmtypes("shm_snapshot_t",276,"off")=6936
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_tn")=275
+	Set gtmtypes("shm_snapshot_t",276,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_tn"
+	Set gtmtypes("shm_snapshot_t",276,"off")=6928
 	Set gtmtypes("shm_snapshot_t",276,"len")=8
 	Set gtmtypes("shm_snapshot_t",276,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_tn")=276
-	Set gtmtypes("shm_snapshot_t",277,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_tn"
-	Set gtmtypes("shm_snapshot_t",277,"off")=6944
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_tn")=276
+	Set gtmtypes("shm_snapshot_t",277,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_tn"
+	Set gtmtypes("shm_snapshot_t",277,"off")=6936
 	Set gtmtypes("shm_snapshot_t",277,"len")=8
 	Set gtmtypes("shm_snapshot_t",277,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_tn")=277
-	Set gtmtypes("shm_snapshot_t",278,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_bt_get_tn"
-	Set gtmtypes("shm_snapshot_t",278,"off")=6952
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_tn")=277
+	Set gtmtypes("shm_snapshot_t",278,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_tn"
+	Set gtmtypes("shm_snapshot_t",278,"off")=6944
 	Set gtmtypes("shm_snapshot_t",278,"len")=8
 	Set gtmtypes("shm_snapshot_t",278,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_bt_get_tn")=278
-	Set gtmtypes("shm_snapshot_t",279,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_tn"
-	Set gtmtypes("shm_snapshot_t",279,"off")=6960
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_tn")=278
+	Set gtmtypes("shm_snapshot_t",279,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_bt_get_tn"
+	Set gtmtypes("shm_snapshot_t",279,"off")=6952
 	Set gtmtypes("shm_snapshot_t",279,"len")=8
 	Set gtmtypes("shm_snapshot_t",279,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_tn")=279
-	Set gtmtypes("shm_snapshot_t",280,"name")="shm_snapshot_t.shadow_file_header.wcb_bg_update_lckfail1_tn"
-	Set gtmtypes("shm_snapshot_t",280,"off")=6968
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_bt_get_tn")=279
+	Set gtmtypes("shm_snapshot_t",280,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_tn"
+	Set gtmtypes("shm_snapshot_t",280,"off")=6960
 	Set gtmtypes("shm_snapshot_t",280,"len")=8
 	Set gtmtypes("shm_snapshot_t",280,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_bg_update_lckfail1_tn")=280
-	Set gtmtypes("shm_snapshot_t",281,"name")="shm_snapshot_t.shadow_file_header.wcb_bg_update_lckfail2_tn"
-	Set gtmtypes("shm_snapshot_t",281,"off")=6976
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_tn")=280
+	Set gtmtypes("shm_snapshot_t",281,"name")="shm_snapshot_t.shadow_file_header.wcb_bg_update_lckfail1_tn"
+	Set gtmtypes("shm_snapshot_t",281,"off")=6968
 	Set gtmtypes("shm_snapshot_t",281,"len")=8
 	Set gtmtypes("shm_snapshot_t",281,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_bg_update_lckfail2_tn")=281
-	Set gtmtypes("shm_snapshot_t",282,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail1_tn"
-	Set gtmtypes("shm_snapshot_t",282,"off")=6984
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_bg_update_lckfail1_tn")=281
+	Set gtmtypes("shm_snapshot_t",282,"name")="shm_snapshot_t.shadow_file_header.wcb_bg_update_lckfail2_tn"
+	Set gtmtypes("shm_snapshot_t",282,"off")=6976
 	Set gtmtypes("shm_snapshot_t",282,"len")=8
 	Set gtmtypes("shm_snapshot_t",282,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail1_tn")=282
-	Set gtmtypes("shm_snapshot_t",283,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail2_tn"
-	Set gtmtypes("shm_snapshot_t",283,"off")=6992
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_bg_update_lckfail2_tn")=282
+	Set gtmtypes("shm_snapshot_t",283,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail1_tn"
+	Set gtmtypes("shm_snapshot_t",283,"off")=6984
 	Set gtmtypes("shm_snapshot_t",283,"len")=8
 	Set gtmtypes("shm_snapshot_t",283,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail2_tn")=283
-	Set gtmtypes("shm_snapshot_t",284,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail3_tn"
-	Set gtmtypes("shm_snapshot_t",284,"off")=7000
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail1_tn")=283
+	Set gtmtypes("shm_snapshot_t",284,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail2_tn"
+	Set gtmtypes("shm_snapshot_t",284,"off")=6992
 	Set gtmtypes("shm_snapshot_t",284,"len")=8
 	Set gtmtypes("shm_snapshot_t",284,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail3_tn")=284
-	Set gtmtypes("shm_snapshot_t",285,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail4_tn"
-	Set gtmtypes("shm_snapshot_t",285,"off")=7008
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail2_tn")=284
+	Set gtmtypes("shm_snapshot_t",285,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail3_tn"
+	Set gtmtypes("shm_snapshot_t",285,"off")=7000
 	Set gtmtypes("shm_snapshot_t",285,"len")=8
 	Set gtmtypes("shm_snapshot_t",285,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail4_tn")=285
-	Set gtmtypes("shm_snapshot_t",286,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail1_tn"
-	Set gtmtypes("shm_snapshot_t",286,"off")=7016
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail3_tn")=285
+	Set gtmtypes("shm_snapshot_t",286,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail4_tn"
+	Set gtmtypes("shm_snapshot_t",286,"off")=7008
 	Set gtmtypes("shm_snapshot_t",286,"len")=8
 	Set gtmtypes("shm_snapshot_t",286,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail1_tn")=286
-	Set gtmtypes("shm_snapshot_t",287,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail2_tn"
-	Set gtmtypes("shm_snapshot_t",287,"off")=7024
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail4_tn")=286
+	Set gtmtypes("shm_snapshot_t",287,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail1_tn"
+	Set gtmtypes("shm_snapshot_t",287,"off")=7016
 	Set gtmtypes("shm_snapshot_t",287,"len")=8
 	Set gtmtypes("shm_snapshot_t",287,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail2_tn")=287
-	Set gtmtypes("shm_snapshot_t",288,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail3_tn"
-	Set gtmtypes("shm_snapshot_t",288,"off")=7032
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail1_tn")=287
+	Set gtmtypes("shm_snapshot_t",288,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail2_tn"
+	Set gtmtypes("shm_snapshot_t",288,"off")=7024
 	Set gtmtypes("shm_snapshot_t",288,"len")=8
 	Set gtmtypes("shm_snapshot_t",288,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail3_tn")=288
-	Set gtmtypes("shm_snapshot_t",289,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail4_tn"
-	Set gtmtypes("shm_snapshot_t",289,"off")=7040
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail2_tn")=288
+	Set gtmtypes("shm_snapshot_t",289,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail3_tn"
+	Set gtmtypes("shm_snapshot_t",289,"off")=7032
 	Set gtmtypes("shm_snapshot_t",289,"len")=8
 	Set gtmtypes("shm_snapshot_t",289,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail4_tn")=289
-	Set gtmtypes("shm_snapshot_t",290,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirtystuck1_tn"
-	Set gtmtypes("shm_snapshot_t",290,"off")=7048
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail3_tn")=289
+	Set gtmtypes("shm_snapshot_t",290,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail4_tn"
+	Set gtmtypes("shm_snapshot_t",290,"off")=7040
 	Set gtmtypes("shm_snapshot_t",290,"len")=8
 	Set gtmtypes("shm_snapshot_t",290,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirtystuck1_tn")=290
-	Set gtmtypes("shm_snapshot_t",291,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirtystuck2_tn"
-	Set gtmtypes("shm_snapshot_t",291,"off")=7056
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail4_tn")=290
+	Set gtmtypes("shm_snapshot_t",291,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirtystuck1_tn"
+	Set gtmtypes("shm_snapshot_t",291,"off")=7048
 	Set gtmtypes("shm_snapshot_t",291,"len")=8
 	Set gtmtypes("shm_snapshot_t",291,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirtystuck2_tn")=291
-	Set gtmtypes("shm_snapshot_t",292,"name")="shm_snapshot_t.shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_tn"
-	Set gtmtypes("shm_snapshot_t",292,"off")=7064
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirtystuck1_tn")=291
+	Set gtmtypes("shm_snapshot_t",292,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirtystuck2_tn"
+	Set gtmtypes("shm_snapshot_t",292,"off")=7056
 	Set gtmtypes("shm_snapshot_t",292,"len")=8
 	Set gtmtypes("shm_snapshot_t",292,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_tn")=292
-	Set gtmtypes("shm_snapshot_t",293,"name")="shm_snapshot_t.shadow_file_header.dwngrd_refmts_syncio_tn"
-	Set gtmtypes("shm_snapshot_t",293,"off")=7072
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirtystuck2_tn")=292
+	Set gtmtypes("shm_snapshot_t",293,"name")="shm_snapshot_t.shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_tn"
+	Set gtmtypes("shm_snapshot_t",293,"off")=7064
 	Set gtmtypes("shm_snapshot_t",293,"len")=8
 	Set gtmtypes("shm_snapshot_t",293,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.dwngrd_refmts_syncio_tn")=293
-	Set gtmtypes("shm_snapshot_t",294,"name")="shm_snapshot_t.shadow_file_header.dwngrd_refmts_asyncio_tn"
-	Set gtmtypes("shm_snapshot_t",294,"off")=7080
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_tn")=293
+	Set gtmtypes("shm_snapshot_t",294,"name")="shm_snapshot_t.shadow_file_header.dwngrd_refmts_syncio_tn"
+	Set gtmtypes("shm_snapshot_t",294,"off")=7072
 	Set gtmtypes("shm_snapshot_t",294,"len")=8
 	Set gtmtypes("shm_snapshot_t",294,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.dwngrd_refmts_asyncio_tn")=294
-	Set gtmtypes("shm_snapshot_t",295,"name")="shm_snapshot_t.shadow_file_header.shmpool_refmt_harvests_tn"
-	Set gtmtypes("shm_snapshot_t",295,"off")=7088
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.dwngrd_refmts_syncio_tn")=294
+	Set gtmtypes("shm_snapshot_t",295,"name")="shm_snapshot_t.shadow_file_header.dwngrd_refmts_asyncio_tn"
+	Set gtmtypes("shm_snapshot_t",295,"off")=7080
 	Set gtmtypes("shm_snapshot_t",295,"len")=8
 	Set gtmtypes("shm_snapshot_t",295,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_refmt_harvests_tn")=295
-	Set gtmtypes("shm_snapshot_t",296,"name")="shm_snapshot_t.shadow_file_header.shmpool_recovery_tn"
-	Set gtmtypes("shm_snapshot_t",296,"off")=7096
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.dwngrd_refmts_asyncio_tn")=295
+	Set gtmtypes("shm_snapshot_t",296,"name")="shm_snapshot_t.shadow_file_header.shmpool_refmt_harvests_tn"
+	Set gtmtypes("shm_snapshot_t",296,"off")=7088
 	Set gtmtypes("shm_snapshot_t",296,"len")=8
 	Set gtmtypes("shm_snapshot_t",296,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_recovery_tn")=296
-	Set gtmtypes("shm_snapshot_t",297,"name")="shm_snapshot_t.shadow_file_header.shmpool_blkd_by_sdc_tn"
-	Set gtmtypes("shm_snapshot_t",297,"off")=7104
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_refmt_harvests_tn")=296
+	Set gtmtypes("shm_snapshot_t",297,"name")="shm_snapshot_t.shadow_file_header.shmpool_recovery_tn"
+	Set gtmtypes("shm_snapshot_t",297,"off")=7096
 	Set gtmtypes("shm_snapshot_t",297,"len")=8
 	Set gtmtypes("shm_snapshot_t",297,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_blkd_by_sdc_tn")=297
-	Set gtmtypes("shm_snapshot_t",298,"name")="shm_snapshot_t.shadow_file_header.shmpool_alloc_bbflush_tn"
-	Set gtmtypes("shm_snapshot_t",298,"off")=7112
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_recovery_tn")=297
+	Set gtmtypes("shm_snapshot_t",298,"name")="shm_snapshot_t.shadow_file_header.shmpool_blkd_by_sdc_tn"
+	Set gtmtypes("shm_snapshot_t",298,"off")=7104
 	Set gtmtypes("shm_snapshot_t",298,"len")=8
 	Set gtmtypes("shm_snapshot_t",298,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_alloc_bbflush_tn")=298
-	Set gtmtypes("shm_snapshot_t",299,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_released_replaced_tn"
-	Set gtmtypes("shm_snapshot_t",299,"off")=7120
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_blkd_by_sdc_tn")=298
+	Set gtmtypes("shm_snapshot_t",299,"name")="shm_snapshot_t.shadow_file_header.shmpool_alloc_bbflush_tn"
+	Set gtmtypes("shm_snapshot_t",299,"off")=7112
 	Set gtmtypes("shm_snapshot_t",299,"len")=8
 	Set gtmtypes("shm_snapshot_t",299,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_released_replaced_tn")=299
-	Set gtmtypes("shm_snapshot_t",300,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_released_io_complete_tn"
-	Set gtmtypes("shm_snapshot_t",300,"off")=7128
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_alloc_bbflush_tn")=299
+	Set gtmtypes("shm_snapshot_t",300,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_released_replaced_tn"
+	Set gtmtypes("shm_snapshot_t",300,"off")=7120
 	Set gtmtypes("shm_snapshot_t",300,"len")=8
 	Set gtmtypes("shm_snapshot_t",300,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_released_io_complete_tn")=300
-	Set gtmtypes("shm_snapshot_t",301,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_kept_tn"
-	Set gtmtypes("shm_snapshot_t",301,"off")=7136
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_released_replaced_tn")=300
+	Set gtmtypes("shm_snapshot_t",301,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_released_io_complete_tn"
+	Set gtmtypes("shm_snapshot_t",301,"off")=7128
 	Set gtmtypes("shm_snapshot_t",301,"len")=8
 	Set gtmtypes("shm_snapshot_t",301,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_kept_tn")=301
-	Set gtmtypes("shm_snapshot_t",302,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_ignored_tn"
-	Set gtmtypes("shm_snapshot_t",302,"off")=7144
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_released_io_complete_tn")=301
+	Set gtmtypes("shm_snapshot_t",302,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_kept_tn"
+	Set gtmtypes("shm_snapshot_t",302,"off")=7136
 	Set gtmtypes("shm_snapshot_t",302,"len")=8
 	Set gtmtypes("shm_snapshot_t",302,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_ignored_tn")=302
-	Set gtmtypes("shm_snapshot_t",303,"name")="shm_snapshot_t.shadow_file_header.refmt_blk_chk_blk_freed_tn"
-	Set gtmtypes("shm_snapshot_t",303,"off")=7152
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_kept_tn")=302
+	Set gtmtypes("shm_snapshot_t",303,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_ignored_tn"
+	Set gtmtypes("shm_snapshot_t",303,"off")=7144
 	Set gtmtypes("shm_snapshot_t",303,"len")=8
 	Set gtmtypes("shm_snapshot_t",303,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_blk_chk_blk_freed_tn")=303
-	Set gtmtypes("shm_snapshot_t",304,"name")="shm_snapshot_t.shadow_file_header.refmt_blk_chk_blk_kept_tn"
-	Set gtmtypes("shm_snapshot_t",304,"off")=7160
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_ignored_tn")=303
+	Set gtmtypes("shm_snapshot_t",304,"name")="shm_snapshot_t.shadow_file_header.refmt_blk_chk_blk_freed_tn"
+	Set gtmtypes("shm_snapshot_t",304,"off")=7152
 	Set gtmtypes("shm_snapshot_t",304,"len")=8
 	Set gtmtypes("shm_snapshot_t",304,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_blk_chk_blk_kept_tn")=304
-	Set gtmtypes("shm_snapshot_t",305,"name")="shm_snapshot_t.shadow_file_header.active_lvl_trigger_tn"
-	Set gtmtypes("shm_snapshot_t",305,"off")=7168
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_blk_chk_blk_freed_tn")=304
+	Set gtmtypes("shm_snapshot_t",305,"name")="shm_snapshot_t.shadow_file_header.refmt_blk_chk_blk_kept_tn"
+	Set gtmtypes("shm_snapshot_t",305,"off")=7160
 	Set gtmtypes("shm_snapshot_t",305,"len")=8
 	Set gtmtypes("shm_snapshot_t",305,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.active_lvl_trigger_tn")=305
-	Set gtmtypes("shm_snapshot_t",306,"name")="shm_snapshot_t.shadow_file_header.new_buff_tn"
-	Set gtmtypes("shm_snapshot_t",306,"off")=7176
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_blk_chk_blk_kept_tn")=305
+	Set gtmtypes("shm_snapshot_t",306,"name")="shm_snapshot_t.shadow_file_header.active_lvl_trigger_tn"
+	Set gtmtypes("shm_snapshot_t",306,"off")=7168
 	Set gtmtypes("shm_snapshot_t",306,"len")=8
 	Set gtmtypes("shm_snapshot_t",306,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.new_buff_tn")=306
-	Set gtmtypes("shm_snapshot_t",307,"name")="shm_snapshot_t.shadow_file_header.phase2_commit_wait_sleep_in_crit_tn"
-	Set gtmtypes("shm_snapshot_t",307,"off")=7184
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.active_lvl_trigger_tn")=306
+	Set gtmtypes("shm_snapshot_t",307,"name")="shm_snapshot_t.shadow_file_header.new_buff_tn"
+	Set gtmtypes("shm_snapshot_t",307,"off")=7176
 	Set gtmtypes("shm_snapshot_t",307,"len")=8
 	Set gtmtypes("shm_snapshot_t",307,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.phase2_commit_wait_sleep_in_crit_tn")=307
-	Set gtmtypes("shm_snapshot_t",308,"name")="shm_snapshot_t.shadow_file_header.phase2_commit_wait_sleep_no_crit_tn"
-	Set gtmtypes("shm_snapshot_t",308,"off")=7192
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.new_buff_tn")=307
+	Set gtmtypes("shm_snapshot_t",308,"name")="shm_snapshot_t.shadow_file_header.phase2_commit_wait_sleep_in_crit_tn"
+	Set gtmtypes("shm_snapshot_t",308,"off")=7184
 	Set gtmtypes("shm_snapshot_t",308,"len")=8
 	Set gtmtypes("shm_snapshot_t",308,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.phase2_commit_wait_sleep_no_crit_tn")=308
-	Set gtmtypes("shm_snapshot_t",309,"name")="shm_snapshot_t.shadow_file_header.phase2_commit_wait_pidcnt_tn"
-	Set gtmtypes("shm_snapshot_t",309,"off")=7200
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.phase2_commit_wait_sleep_in_crit_tn")=308
+	Set gtmtypes("shm_snapshot_t",309,"name")="shm_snapshot_t.shadow_file_header.phase2_commit_wait_sleep_no_crit_tn"
+	Set gtmtypes("shm_snapshot_t",309,"off")=7192
 	Set gtmtypes("shm_snapshot_t",309,"len")=8
 	Set gtmtypes("shm_snapshot_t",309,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.phase2_commit_wait_pidcnt_tn")=309
-	Set gtmtypes("shm_snapshot_t",310,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_intend_wait_tn"
-	Set gtmtypes("shm_snapshot_t",310,"off")=7208
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.phase2_commit_wait_sleep_no_crit_tn")=309
+	Set gtmtypes("shm_snapshot_t",310,"name")="shm_snapshot_t.shadow_file_header.phase2_commit_wait_pidcnt_tn"
+	Set gtmtypes("shm_snapshot_t",310,"off")=7200
 	Set gtmtypes("shm_snapshot_t",310,"len")=8
 	Set gtmtypes("shm_snapshot_t",310,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_intend_wait_tn")=310
-	Set gtmtypes("shm_snapshot_t",311,"name")="shm_snapshot_t.shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_tn"
-	Set gtmtypes("shm_snapshot_t",311,"off")=7216
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.phase2_commit_wait_pidcnt_tn")=310
+	Set gtmtypes("shm_snapshot_t",311,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_intend_wait_tn"
+	Set gtmtypes("shm_snapshot_t",311,"off")=7208
 	Set gtmtypes("shm_snapshot_t",311,"len")=8
 	Set gtmtypes("shm_snapshot_t",311,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_tn")=311
-	Set gtmtypes("shm_snapshot_t",312,"name")="shm_snapshot_t.shadow_file_header.wcb_phase2_commit_wait_tn"
-	Set gtmtypes("shm_snapshot_t",312,"off")=7224
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_intend_wait_tn")=311
+	Set gtmtypes("shm_snapshot_t",312,"name")="shm_snapshot_t.shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_tn"
+	Set gtmtypes("shm_snapshot_t",312,"off")=7216
 	Set gtmtypes("shm_snapshot_t",312,"len")=8
 	Set gtmtypes("shm_snapshot_t",312,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_phase2_commit_wait_tn")=312
-	Set gtmtypes("shm_snapshot_t",313,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_calls_tn"
-	Set gtmtypes("shm_snapshot_t",313,"off")=7232
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_tn")=312
+	Set gtmtypes("shm_snapshot_t",313,"name")="shm_snapshot_t.shadow_file_header.wcb_phase2_commit_wait_tn"
+	Set gtmtypes("shm_snapshot_t",313,"off")=7224
 	Set gtmtypes("shm_snapshot_t",313,"len")=8
 	Set gtmtypes("shm_snapshot_t",313,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_calls_tn")=313
-	Set gtmtypes("shm_snapshot_t",314,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_rip_tn"
-	Set gtmtypes("shm_snapshot_t",314,"off")=7240
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_phase2_commit_wait_tn")=313
+	Set gtmtypes("shm_snapshot_t",314,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_calls_tn"
+	Set gtmtypes("shm_snapshot_t",314,"off")=7232
 	Set gtmtypes("shm_snapshot_t",314,"len")=8
 	Set gtmtypes("shm_snapshot_t",314,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_rip_tn")=314
-	Set gtmtypes("shm_snapshot_t",315,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_in_tend_tn"
-	Set gtmtypes("shm_snapshot_t",315,"off")=7248
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_calls_tn")=314
+	Set gtmtypes("shm_snapshot_t",315,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_rip_tn"
+	Set gtmtypes("shm_snapshot_t",315,"off")=7240
 	Set gtmtypes("shm_snapshot_t",315,"len")=8
 	Set gtmtypes("shm_snapshot_t",315,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_in_tend_tn")=315
-	Set gtmtypes("shm_snapshot_t",316,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_search_blk_tn"
-	Set gtmtypes("shm_snapshot_t",316,"off")=7256
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_rip_tn")=315
+	Set gtmtypes("shm_snapshot_t",316,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_in_tend_tn"
+	Set gtmtypes("shm_snapshot_t",316,"off")=7248
 	Set gtmtypes("shm_snapshot_t",316,"len")=8
 	Set gtmtypes("shm_snapshot_t",316,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_search_blk_tn")=316
-	Set gtmtypes("shm_snapshot_t",317,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_new_rec_tn"
-	Set gtmtypes("shm_snapshot_t",317,"off")=7264
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_in_tend_tn")=316
+	Set gtmtypes("shm_snapshot_t",317,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_search_blk_tn"
+	Set gtmtypes("shm_snapshot_t",317,"off")=7256
 	Set gtmtypes("shm_snapshot_t",317,"len")=8
 	Set gtmtypes("shm_snapshot_t",317,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_new_rec_tn")=317
-	Set gtmtypes("shm_snapshot_t",318,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_rec_size_tn"
-	Set gtmtypes("shm_snapshot_t",318,"off")=7272
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_search_blk_tn")=317
+	Set gtmtypes("shm_snapshot_t",318,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_new_rec_tn"
+	Set gtmtypes("shm_snapshot_t",318,"off")=7264
 	Set gtmtypes("shm_snapshot_t",318,"len")=8
 	Set gtmtypes("shm_snapshot_t",318,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_rec_size_tn")=318
-	Set gtmtypes("shm_snapshot_t",319,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_rec_cmpc_tn"
-	Set gtmtypes("shm_snapshot_t",319,"off")=7280
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_new_rec_tn")=318
+	Set gtmtypes("shm_snapshot_t",319,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_rec_size_tn"
+	Set gtmtypes("shm_snapshot_t",319,"off")=7272
 	Set gtmtypes("shm_snapshot_t",319,"len")=8
 	Set gtmtypes("shm_snapshot_t",319,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_rec_cmpc_tn")=319
-	Set gtmtypes("shm_snapshot_t",320,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_blk_fini_tn"
-	Set gtmtypes("shm_snapshot_t",320,"off")=7288
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_rec_size_tn")=319
+	Set gtmtypes("shm_snapshot_t",320,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_rec_cmpc_tn"
+	Set gtmtypes("shm_snapshot_t",320,"off")=7280
 	Set gtmtypes("shm_snapshot_t",320,"len")=8
 	Set gtmtypes("shm_snapshot_t",320,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_blk_fini_tn")=320
-	Set gtmtypes("shm_snapshot_t",321,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_blk_split_tn"
-	Set gtmtypes("shm_snapshot_t",321,"off")=7296
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_rec_cmpc_tn")=320
+	Set gtmtypes("shm_snapshot_t",321,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_blk_fini_tn"
+	Set gtmtypes("shm_snapshot_t",321,"off")=7288
 	Set gtmtypes("shm_snapshot_t",321,"len")=8
 	Set gtmtypes("shm_snapshot_t",321,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_blk_split_tn")=321
-	Set gtmtypes("shm_snapshot_t",322,"name")="shm_snapshot_t.shadow_file_header.t_qread_ripsleep_cnt_tn"
-	Set gtmtypes("shm_snapshot_t",322,"off")=7304
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_blk_fini_tn")=321
+	Set gtmtypes("shm_snapshot_t",322,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_blk_split_tn"
+	Set gtmtypes("shm_snapshot_t",322,"off")=7296
 	Set gtmtypes("shm_snapshot_t",322,"len")=8
 	Set gtmtypes("shm_snapshot_t",322,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_ripsleep_cnt_tn")=322
-	Set gtmtypes("shm_snapshot_t",323,"name")="shm_snapshot_t.shadow_file_header.t_qread_ripsleep_nblks_tn"
-	Set gtmtypes("shm_snapshot_t",323,"off")=7312
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_blk_split_tn")=322
+	Set gtmtypes("shm_snapshot_t",323,"name")="shm_snapshot_t.shadow_file_header.t_qread_ripsleep_cnt_tn"
+	Set gtmtypes("shm_snapshot_t",323,"off")=7304
 	Set gtmtypes("shm_snapshot_t",323,"len")=8
 	Set gtmtypes("shm_snapshot_t",323,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_ripsleep_nblks_tn")=323
-	Set gtmtypes("shm_snapshot_t",324,"name")="shm_snapshot_t.shadow_file_header.bg_trc_rec_tn_filler"
-	Set gtmtypes("shm_snapshot_t",324,"off")=7320
-	Set gtmtypes("shm_snapshot_t",324,"len")=112
-	Set gtmtypes("shm_snapshot_t",324,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bg_trc_rec_tn_filler")=324
-	Set gtmtypes("shm_snapshot_t",325,"name")="shm_snapshot_t.shadow_file_header.total_buffer_flush_cntr"
-	Set gtmtypes("shm_snapshot_t",325,"off")=7432
-	Set gtmtypes("shm_snapshot_t",325,"len")=4
-	Set gtmtypes("shm_snapshot_t",325,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.total_buffer_flush_cntr")=325
-	Set gtmtypes("shm_snapshot_t",326,"name")="shm_snapshot_t.shadow_file_header.bufct_buffer_flush_cntr"
-	Set gtmtypes("shm_snapshot_t",326,"off")=7436
-	Set gtmtypes("shm_snapshot_t",326,"len")=4
-	Set gtmtypes("shm_snapshot_t",326,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bufct_buffer_flush_cntr")=326
-	Set gtmtypes("shm_snapshot_t",327,"name")="shm_snapshot_t.shadow_file_header.bufct_buffer_flush_loop_cntr"
-	Set gtmtypes("shm_snapshot_t",327,"off")=7440
-	Set gtmtypes("shm_snapshot_t",327,"len")=4
-	Set gtmtypes("shm_snapshot_t",327,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bufct_buffer_flush_loop_cntr")=327
-	Set gtmtypes("shm_snapshot_t",328,"name")="shm_snapshot_t.shadow_file_header.wrt_calls_cntr"
-	Set gtmtypes("shm_snapshot_t",328,"off")=7444
-	Set gtmtypes("shm_snapshot_t",328,"len")=4
-	Set gtmtypes("shm_snapshot_t",328,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_calls_cntr")=328
-	Set gtmtypes("shm_snapshot_t",329,"name")="shm_snapshot_t.shadow_file_header.wrt_count_cntr"
-	Set gtmtypes("shm_snapshot_t",329,"off")=7448
-	Set gtmtypes("shm_snapshot_t",329,"len")=4
-	Set gtmtypes("shm_snapshot_t",329,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_count_cntr")=329
-	Set gtmtypes("shm_snapshot_t",330,"name")="shm_snapshot_t.shadow_file_header.wrt_blocked_cntr"
-	Set gtmtypes("shm_snapshot_t",330,"off")=7452
-	Set gtmtypes("shm_snapshot_t",330,"len")=4
-	Set gtmtypes("shm_snapshot_t",330,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_blocked_cntr")=330
-	Set gtmtypes("shm_snapshot_t",331,"name")="shm_snapshot_t.shadow_file_header.wrt_busy_cntr"
-	Set gtmtypes("shm_snapshot_t",331,"off")=7456
-	Set gtmtypes("shm_snapshot_t",331,"len")=4
-	Set gtmtypes("shm_snapshot_t",331,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_busy_cntr")=331
-	Set gtmtypes("shm_snapshot_t",332,"name")="shm_snapshot_t.shadow_file_header.wrt_noblks_wrtn_cntr"
-	Set gtmtypes("shm_snapshot_t",332,"off")=7460
-	Set gtmtypes("shm_snapshot_t",332,"len")=4
-	Set gtmtypes("shm_snapshot_t",332,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_noblks_wrtn_cntr")=332
-	Set gtmtypes("shm_snapshot_t",333,"name")="shm_snapshot_t.shadow_file_header.reserved_bgtrcrec1_cntr"
-	Set gtmtypes("shm_snapshot_t",333,"off")=7464
-	Set gtmtypes("shm_snapshot_t",333,"len")=4
-	Set gtmtypes("shm_snapshot_t",333,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reserved_bgtrcrec1_cntr")=333
-	Set gtmtypes("shm_snapshot_t",334,"name")="shm_snapshot_t.shadow_file_header.reserved_bgtrcrec2_cntr"
-	Set gtmtypes("shm_snapshot_t",334,"off")=7468
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_ripsleep_cnt_tn")=323
+	Set gtmtypes("shm_snapshot_t",324,"name")="shm_snapshot_t.shadow_file_header.t_qread_ripsleep_nblks_tn"
+	Set gtmtypes("shm_snapshot_t",324,"off")=7312
+	Set gtmtypes("shm_snapshot_t",324,"len")=8
+	Set gtmtypes("shm_snapshot_t",324,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_ripsleep_nblks_tn")=324
+	Set gtmtypes("shm_snapshot_t",325,"name")="shm_snapshot_t.shadow_file_header.wcs_wtfini_invoked_tn"
+	Set gtmtypes("shm_snapshot_t",325,"off")=7320
+	Set gtmtypes("shm_snapshot_t",325,"len")=8
+	Set gtmtypes("shm_snapshot_t",325,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wtfini_invoked_tn")=325
+	Set gtmtypes("shm_snapshot_t",326,"name")="shm_snapshot_t.shadow_file_header.wcs_wterror_invoked_tn"
+	Set gtmtypes("shm_snapshot_t",326,"off")=7328
+	Set gtmtypes("shm_snapshot_t",326,"len")=8
+	Set gtmtypes("shm_snapshot_t",326,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wterror_invoked_tn")=326
+	Set gtmtypes("shm_snapshot_t",327,"name")="shm_snapshot_t.shadow_file_header.wcs_wt_restart_invoked_tn"
+	Set gtmtypes("shm_snapshot_t",327,"off")=7336
+	Set gtmtypes("shm_snapshot_t",327,"len")=8
+	Set gtmtypes("shm_snapshot_t",327,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wt_restart_invoked_tn")=327
+	Set gtmtypes("shm_snapshot_t",328,"name")="shm_snapshot_t.shadow_file_header.wcs_wt_restart_eagain_tn"
+	Set gtmtypes("shm_snapshot_t",328,"off")=7344
+	Set gtmtypes("shm_snapshot_t",328,"len")=8
+	Set gtmtypes("shm_snapshot_t",328,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wt_restart_eagain_tn")=328
+	Set gtmtypes("shm_snapshot_t",329,"name")="shm_snapshot_t.shadow_file_header.wcs_wt_restart_reinsert_tn"
+	Set gtmtypes("shm_snapshot_t",329,"off")=7352
+	Set gtmtypes("shm_snapshot_t",329,"len")=8
+	Set gtmtypes("shm_snapshot_t",329,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wt_restart_reinsert_tn")=329
+	Set gtmtypes("shm_snapshot_t",330,"name")="shm_snapshot_t.shadow_file_header.wcs_wtstart_eagain_tn"
+	Set gtmtypes("shm_snapshot_t",330,"off")=7360
+	Set gtmtypes("shm_snapshot_t",330,"len")=8
+	Set gtmtypes("shm_snapshot_t",330,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wtstart_eagain_tn")=330
+	Set gtmtypes("shm_snapshot_t",331,"name")="shm_snapshot_t.shadow_file_header.wcs_wtstart_eagain_incrit_tn"
+	Set gtmtypes("shm_snapshot_t",331,"off")=7368
+	Set gtmtypes("shm_snapshot_t",331,"len")=8
+	Set gtmtypes("shm_snapshot_t",331,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wtstart_eagain_incrit_tn")=331
+	Set gtmtypes("shm_snapshot_t",332,"name")="shm_snapshot_t.shadow_file_header.async_restart_eagain_tn"
+	Set gtmtypes("shm_snapshot_t",332,"off")=7376
+	Set gtmtypes("shm_snapshot_t",332,"len")=8
+	Set gtmtypes("shm_snapshot_t",332,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.async_restart_eagain_tn")=332
+	Set gtmtypes("shm_snapshot_t",333,"name")="shm_snapshot_t.shadow_file_header.bg_trc_rec_tn_filler"
+	Set gtmtypes("shm_snapshot_t",333,"off")=7384
+	Set gtmtypes("shm_snapshot_t",333,"len")=48
+	Set gtmtypes("shm_snapshot_t",333,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bg_trc_rec_tn_filler")=333
+	Set gtmtypes("shm_snapshot_t",334,"name")="shm_snapshot_t.shadow_file_header.total_buffer_flush_cntr"
+	Set gtmtypes("shm_snapshot_t",334,"off")=7432
 	Set gtmtypes("shm_snapshot_t",334,"len")=4
 	Set gtmtypes("shm_snapshot_t",334,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reserved_bgtrcrec2_cntr")=334
-	Set gtmtypes("shm_snapshot_t",335,"name")="shm_snapshot_t.shadow_file_header.reserved_bgtrcrec3_cntr"
-	Set gtmtypes("shm_snapshot_t",335,"off")=7472
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.total_buffer_flush_cntr")=334
+	Set gtmtypes("shm_snapshot_t",335,"name")="shm_snapshot_t.shadow_file_header.bufct_buffer_flush_cntr"
+	Set gtmtypes("shm_snapshot_t",335,"off")=7436
 	Set gtmtypes("shm_snapshot_t",335,"len")=4
 	Set gtmtypes("shm_snapshot_t",335,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reserved_bgtrcrec3_cntr")=335
-	Set gtmtypes("shm_snapshot_t",336,"name")="shm_snapshot_t.shadow_file_header.lost_block_recovery_cntr"
-	Set gtmtypes("shm_snapshot_t",336,"off")=7476
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bufct_buffer_flush_cntr")=335
+	Set gtmtypes("shm_snapshot_t",336,"name")="shm_snapshot_t.shadow_file_header.bufct_buffer_flush_loop_cntr"
+	Set gtmtypes("shm_snapshot_t",336,"off")=7440
 	Set gtmtypes("shm_snapshot_t",336,"len")=4
 	Set gtmtypes("shm_snapshot_t",336,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.lost_block_recovery_cntr")=336
-	Set gtmtypes("shm_snapshot_t",337,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_onln_rlbk_cntr"
-	Set gtmtypes("shm_snapshot_t",337,"off")=7480
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bufct_buffer_flush_loop_cntr")=336
+	Set gtmtypes("shm_snapshot_t",337,"name")="shm_snapshot_t.shadow_file_header.wrt_calls_cntr"
+	Set gtmtypes("shm_snapshot_t",337,"off")=7444
 	Set gtmtypes("shm_snapshot_t",337,"len")=4
 	Set gtmtypes("shm_snapshot_t",337,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_onln_rlbk_cntr")=337
-	Set gtmtypes("shm_snapshot_t",338,"name")="shm_snapshot_t.shadow_file_header.stale_cntr"
-	Set gtmtypes("shm_snapshot_t",338,"off")=7484
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_calls_cntr")=337
+	Set gtmtypes("shm_snapshot_t",338,"name")="shm_snapshot_t.shadow_file_header.wrt_count_cntr"
+	Set gtmtypes("shm_snapshot_t",338,"off")=7448
 	Set gtmtypes("shm_snapshot_t",338,"len")=4
 	Set gtmtypes("shm_snapshot_t",338,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_cntr")=338
-	Set gtmtypes("shm_snapshot_t",339,"name")="shm_snapshot_t.shadow_file_header.starved_cntr"
-	Set gtmtypes("shm_snapshot_t",339,"off")=7488
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_count_cntr")=338
+	Set gtmtypes("shm_snapshot_t",339,"name")="shm_snapshot_t.shadow_file_header.wrt_blocked_cntr"
+	Set gtmtypes("shm_snapshot_t",339,"off")=7452
 	Set gtmtypes("shm_snapshot_t",339,"len")=4
 	Set gtmtypes("shm_snapshot_t",339,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.starved_cntr")=339
-	Set gtmtypes("shm_snapshot_t",340,"name")="shm_snapshot_t.shadow_file_header.stale_timer_started_cntr"
-	Set gtmtypes("shm_snapshot_t",340,"off")=7492
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_blocked_cntr")=339
+	Set gtmtypes("shm_snapshot_t",340,"name")="shm_snapshot_t.shadow_file_header.wrt_busy_cntr"
+	Set gtmtypes("shm_snapshot_t",340,"off")=7456
 	Set gtmtypes("shm_snapshot_t",340,"len")=4
 	Set gtmtypes("shm_snapshot_t",340,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_timer_started_cntr")=340
-	Set gtmtypes("shm_snapshot_t",341,"name")="shm_snapshot_t.shadow_file_header.stale_timer_pop_cntr"
-	Set gtmtypes("shm_snapshot_t",341,"off")=7496
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_busy_cntr")=340
+	Set gtmtypes("shm_snapshot_t",341,"name")="shm_snapshot_t.shadow_file_header.wrt_noblks_wrtn_cntr"
+	Set gtmtypes("shm_snapshot_t",341,"off")=7460
 	Set gtmtypes("shm_snapshot_t",341,"len")=4
 	Set gtmtypes("shm_snapshot_t",341,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_timer_pop_cntr")=341
-	Set gtmtypes("shm_snapshot_t",342,"name")="shm_snapshot_t.shadow_file_header.stale_process_defer_cntr"
-	Set gtmtypes("shm_snapshot_t",342,"off")=7500
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wrt_noblks_wrtn_cntr")=341
+	Set gtmtypes("shm_snapshot_t",342,"name")="shm_snapshot_t.shadow_file_header.reserved_bgtrcrec1_cntr"
+	Set gtmtypes("shm_snapshot_t",342,"off")=7464
 	Set gtmtypes("shm_snapshot_t",342,"len")=4
 	Set gtmtypes("shm_snapshot_t",342,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_process_defer_cntr")=342
-	Set gtmtypes("shm_snapshot_t",343,"name")="shm_snapshot_t.shadow_file_header.stale_defer_processed_cntr"
-	Set gtmtypes("shm_snapshot_t",343,"off")=7504
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reserved_bgtrcrec1_cntr")=342
+	Set gtmtypes("shm_snapshot_t",343,"name")="shm_snapshot_t.shadow_file_header.reserved_bgtrcrec2_cntr"
+	Set gtmtypes("shm_snapshot_t",343,"off")=7468
 	Set gtmtypes("shm_snapshot_t",343,"len")=4
 	Set gtmtypes("shm_snapshot_t",343,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_defer_processed_cntr")=343
-	Set gtmtypes("shm_snapshot_t",344,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flush_cntr"
-	Set gtmtypes("shm_snapshot_t",344,"off")=7508
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reserved_bgtrcrec2_cntr")=343
+	Set gtmtypes("shm_snapshot_t",344,"name")="shm_snapshot_t.shadow_file_header.reserved_bgtrcrec3_cntr"
+	Set gtmtypes("shm_snapshot_t",344,"off")=7472
 	Set gtmtypes("shm_snapshot_t",344,"len")=4
 	Set gtmtypes("shm_snapshot_t",344,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flush_cntr")=344
-	Set gtmtypes("shm_snapshot_t",345,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flush_loop_cntr"
-	Set gtmtypes("shm_snapshot_t",345,"off")=7512
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.reserved_bgtrcrec3_cntr")=344
+	Set gtmtypes("shm_snapshot_t",345,"name")="shm_snapshot_t.shadow_file_header.lost_block_recovery_cntr"
+	Set gtmtypes("shm_snapshot_t",345,"off")=7476
 	Set gtmtypes("shm_snapshot_t",345,"len")=4
 	Set gtmtypes("shm_snapshot_t",345,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flush_loop_cntr")=345
-	Set gtmtypes("shm_snapshot_t",346,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flush_retries_cntr"
-	Set gtmtypes("shm_snapshot_t",346,"off")=7516
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.lost_block_recovery_cntr")=345
+	Set gtmtypes("shm_snapshot_t",346,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_onln_rlbk_cntr"
+	Set gtmtypes("shm_snapshot_t",346,"off")=7480
 	Set gtmtypes("shm_snapshot_t",346,"len")=4
 	Set gtmtypes("shm_snapshot_t",346,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flush_retries_cntr")=346
-	Set gtmtypes("shm_snapshot_t",347,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flushed_during_lockwait_cntr"
-	Set gtmtypes("shm_snapshot_t",347,"off")=7520
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_onln_rlbk_cntr")=346
+	Set gtmtypes("shm_snapshot_t",347,"name")="shm_snapshot_t.shadow_file_header.stale_cntr"
+	Set gtmtypes("shm_snapshot_t",347,"off")=7484
 	Set gtmtypes("shm_snapshot_t",347,"len")=4
 	Set gtmtypes("shm_snapshot_t",347,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flushed_during_lockwait_cntr")=347
-	Set gtmtypes("shm_snapshot_t",348,"name")="shm_snapshot_t.shadow_file_header.tp_crit_retries_cntr"
-	Set gtmtypes("shm_snapshot_t",348,"off")=7524
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_cntr")=347
+	Set gtmtypes("shm_snapshot_t",348,"name")="shm_snapshot_t.shadow_file_header.starved_cntr"
+	Set gtmtypes("shm_snapshot_t",348,"off")=7488
 	Set gtmtypes("shm_snapshot_t",348,"len")=4
 	Set gtmtypes("shm_snapshot_t",348,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.tp_crit_retries_cntr")=348
-	Set gtmtypes("shm_snapshot_t",349,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_flush_dirty_cntr"
-	Set gtmtypes("shm_snapshot_t",349,"off")=7528
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.starved_cntr")=348
+	Set gtmtypes("shm_snapshot_t",349,"name")="shm_snapshot_t.shadow_file_header.stale_timer_started_cntr"
+	Set gtmtypes("shm_snapshot_t",349,"off")=7492
 	Set gtmtypes("shm_snapshot_t",349,"len")=4
 	Set gtmtypes("shm_snapshot_t",349,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_flush_dirty_cntr")=349
-	Set gtmtypes("shm_snapshot_t",350,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_rip_wait_cntr"
-	Set gtmtypes("shm_snapshot_t",350,"off")=7532
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_timer_started_cntr")=349
+	Set gtmtypes("shm_snapshot_t",350,"name")="shm_snapshot_t.shadow_file_header.stale_timer_pop_cntr"
+	Set gtmtypes("shm_snapshot_t",350,"off")=7496
 	Set gtmtypes("shm_snapshot_t",350,"len")=4
 	Set gtmtypes("shm_snapshot_t",350,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_rip_wait_cntr")=350
-	Set gtmtypes("shm_snapshot_t",351,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_buf_owner_stuck_cntr"
-	Set gtmtypes("shm_snapshot_t",351,"off")=7536
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_timer_pop_cntr")=350
+	Set gtmtypes("shm_snapshot_t",351,"name")="shm_snapshot_t.shadow_file_header.stale_process_defer_cntr"
+	Set gtmtypes("shm_snapshot_t",351,"off")=7500
 	Set gtmtypes("shm_snapshot_t",351,"len")=4
 	Set gtmtypes("shm_snapshot_t",351,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_buf_owner_stuck_cntr")=351
-	Set gtmtypes("shm_snapshot_t",352,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_out_of_design_cntr"
-	Set gtmtypes("shm_snapshot_t",352,"off")=7540
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_process_defer_cntr")=351
+	Set gtmtypes("shm_snapshot_t",352,"name")="shm_snapshot_t.shadow_file_header.stale_defer_processed_cntr"
+	Set gtmtypes("shm_snapshot_t",352,"off")=7504
 	Set gtmtypes("shm_snapshot_t",352,"len")=4
 	Set gtmtypes("shm_snapshot_t",352,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_out_of_design_cntr")=352
-	Set gtmtypes("shm_snapshot_t",353,"name")="shm_snapshot_t.shadow_file_header.t_qread_buf_owner_stuck_cntr"
-	Set gtmtypes("shm_snapshot_t",353,"off")=7544
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.stale_defer_processed_cntr")=352
+	Set gtmtypes("shm_snapshot_t",353,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flush_cntr"
+	Set gtmtypes("shm_snapshot_t",353,"off")=7508
 	Set gtmtypes("shm_snapshot_t",353,"len")=4
 	Set gtmtypes("shm_snapshot_t",353,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_buf_owner_stuck_cntr")=353
-	Set gtmtypes("shm_snapshot_t",354,"name")="shm_snapshot_t.shadow_file_header.t_qread_out_of_design_cntr"
-	Set gtmtypes("shm_snapshot_t",354,"off")=7548
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flush_cntr")=353
+	Set gtmtypes("shm_snapshot_t",354,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flush_loop_cntr"
+	Set gtmtypes("shm_snapshot_t",354,"off")=7512
 	Set gtmtypes("shm_snapshot_t",354,"len")=4
 	Set gtmtypes("shm_snapshot_t",354,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_out_of_design_cntr")=354
-	Set gtmtypes("shm_snapshot_t",355,"name")="shm_snapshot_t.shadow_file_header.bt_put_flush_dirty_cntr"
-	Set gtmtypes("shm_snapshot_t",355,"off")=7552
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flush_loop_cntr")=354
+	Set gtmtypes("shm_snapshot_t",355,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flush_retries_cntr"
+	Set gtmtypes("shm_snapshot_t",355,"off")=7516
 	Set gtmtypes("shm_snapshot_t",355,"len")=4
 	Set gtmtypes("shm_snapshot_t",355,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bt_put_flush_dirty_cntr")=355
-	Set gtmtypes("shm_snapshot_t",356,"name")="shm_snapshot_t.shadow_file_header.mlock_wakeups_cntr"
-	Set gtmtypes("shm_snapshot_t",356,"off")=7556
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flush_retries_cntr")=355
+	Set gtmtypes("shm_snapshot_t",356,"name")="shm_snapshot_t.shadow_file_header.spcfc_buffer_flushed_during_lockwait_cntr"
+	Set gtmtypes("shm_snapshot_t",356,"off")=7520
 	Set gtmtypes("shm_snapshot_t",356,"len")=4
 	Set gtmtypes("shm_snapshot_t",356,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.mlock_wakeups_cntr")=356
-	Set gtmtypes("shm_snapshot_t",357,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_recover_invoked_cntr"
-	Set gtmtypes("shm_snapshot_t",357,"off")=7560
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.spcfc_buffer_flushed_during_lockwait_cntr")=356
+	Set gtmtypes("shm_snapshot_t",357,"name")="shm_snapshot_t.shadow_file_header.tp_crit_retries_cntr"
+	Set gtmtypes("shm_snapshot_t",357,"off")=7524
 	Set gtmtypes("shm_snapshot_t",357,"len")=4
 	Set gtmtypes("shm_snapshot_t",357,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_recover_invoked_cntr")=357
-	Set gtmtypes("shm_snapshot_t",358,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_verify_passed_cntr"
-	Set gtmtypes("shm_snapshot_t",358,"off")=7564
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.tp_crit_retries_cntr")=357
+	Set gtmtypes("shm_snapshot_t",358,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_flush_dirty_cntr"
+	Set gtmtypes("shm_snapshot_t",358,"off")=7528
 	Set gtmtypes("shm_snapshot_t",358,"len")=4
 	Set gtmtypes("shm_snapshot_t",358,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_verify_passed_cntr")=358
-	Set gtmtypes("shm_snapshot_t",359,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr"
-	Set gtmtypes("shm_snapshot_t",359,"off")=7568
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_flush_dirty_cntr")=358
+	Set gtmtypes("shm_snapshot_t",359,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_rip_wait_cntr"
+	Set gtmtypes("shm_snapshot_t",359,"off")=7532
 	Set gtmtypes("shm_snapshot_t",359,"len")=4
 	Set gtmtypes("shm_snapshot_t",359,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr")=359
-	Set gtmtypes("shm_snapshot_t",360,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_cntr"
-	Set gtmtypes("shm_snapshot_t",360,"off")=7572
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_rip_wait_cntr")=359
+	Set gtmtypes("shm_snapshot_t",360,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_buf_owner_stuck_cntr"
+	Set gtmtypes("shm_snapshot_t",360,"off")=7536
 	Set gtmtypes("shm_snapshot_t",360,"len")=4
 	Set gtmtypes("shm_snapshot_t",360,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_cntr")=360
-	Set gtmtypes("shm_snapshot_t",361,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_db_csh_getn_loopexceed_cntr"
-	Set gtmtypes("shm_snapshot_t",361,"off")=7576
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_buf_owner_stuck_cntr")=360
+	Set gtmtypes("shm_snapshot_t",361,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_out_of_design_cntr"
+	Set gtmtypes("shm_snapshot_t",361,"off")=7540
 	Set gtmtypes("shm_snapshot_t",361,"len")=4
 	Set gtmtypes("shm_snapshot_t",361,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_db_csh_getn_loopexceed_cntr")=361
-	Set gtmtypes("shm_snapshot_t",362,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_cntr"
-	Set gtmtypes("shm_snapshot_t",362,"off")=7580
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_out_of_design_cntr")=361
+	Set gtmtypes("shm_snapshot_t",362,"name")="shm_snapshot_t.shadow_file_header.t_qread_buf_owner_stuck_cntr"
+	Set gtmtypes("shm_snapshot_t",362,"off")=7544
 	Set gtmtypes("shm_snapshot_t",362,"len")=4
 	Set gtmtypes("shm_snapshot_t",362,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_cntr")=362
-	Set gtmtypes("shm_snapshot_t",363,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_db_csh_get_cntr"
-	Set gtmtypes("shm_snapshot_t",363,"off")=7584
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_buf_owner_stuck_cntr")=362
+	Set gtmtypes("shm_snapshot_t",363,"name")="shm_snapshot_t.shadow_file_header.t_qread_out_of_design_cntr"
+	Set gtmtypes("shm_snapshot_t",363,"off")=7548
 	Set gtmtypes("shm_snapshot_t",363,"len")=4
 	Set gtmtypes("shm_snapshot_t",363,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_db_csh_get_cntr")=363
-	Set gtmtypes("shm_snapshot_t",364,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_wcsgetspace_cntr"
-	Set gtmtypes("shm_snapshot_t",364,"off")=7588
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_out_of_design_cntr")=363
+	Set gtmtypes("shm_snapshot_t",364,"name")="shm_snapshot_t.shadow_file_header.bt_put_flush_dirty_cntr"
+	Set gtmtypes("shm_snapshot_t",364,"off")=7552
 	Set gtmtypes("shm_snapshot_t",364,"len")=4
 	Set gtmtypes("shm_snapshot_t",364,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_wcsgetspace_cntr")=364
-	Set gtmtypes("shm_snapshot_t",365,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_t1_cntr"
-	Set gtmtypes("shm_snapshot_t",365,"off")=7592
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bt_put_flush_dirty_cntr")=364
+	Set gtmtypes("shm_snapshot_t",365,"name")="shm_snapshot_t.shadow_file_header.mlock_wakeups_cntr"
+	Set gtmtypes("shm_snapshot_t",365,"off")=7556
 	Set gtmtypes("shm_snapshot_t",365,"len")=4
 	Set gtmtypes("shm_snapshot_t",365,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_t1_cntr")=365
-	Set gtmtypes("shm_snapshot_t",366,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_bitmap_cntr"
-	Set gtmtypes("shm_snapshot_t",366,"off")=7596
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.mlock_wakeups_cntr")=365
+	Set gtmtypes("shm_snapshot_t",366,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_recover_invoked_cntr"
+	Set gtmtypes("shm_snapshot_t",366,"off")=7560
 	Set gtmtypes("shm_snapshot_t",366,"len")=4
 	Set gtmtypes("shm_snapshot_t",366,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_bitmap_cntr")=366
-	Set gtmtypes("shm_snapshot_t",367,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_jnl_cwset_cntr"
-	Set gtmtypes("shm_snapshot_t",367,"off")=7600
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_recover_invoked_cntr")=366
+	Set gtmtypes("shm_snapshot_t",367,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_verify_passed_cntr"
+	Set gtmtypes("shm_snapshot_t",367,"off")=7564
 	Set gtmtypes("shm_snapshot_t",367,"len")=4
 	Set gtmtypes("shm_snapshot_t",367,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_jnl_cwset_cntr")=367
-	Set gtmtypes("shm_snapshot_t",368,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_cntr"
-	Set gtmtypes("shm_snapshot_t",368,"off")=7604
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_verify_passed_cntr")=367
+	Set gtmtypes("shm_snapshot_t",368,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr"
+	Set gtmtypes("shm_snapshot_t",368,"off")=7568
 	Set gtmtypes("shm_snapshot_t",368,"len")=4
 	Set gtmtypes("shm_snapshot_t",368,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_cntr")=368
-	Set gtmtypes("shm_snapshot_t",369,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_hist_cntr"
-	Set gtmtypes("shm_snapshot_t",369,"off")=7608
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr")=368
+	Set gtmtypes("shm_snapshot_t",369,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_cntr"
+	Set gtmtypes("shm_snapshot_t",369,"off")=7572
 	Set gtmtypes("shm_snapshot_t",369,"len")=4
 	Set gtmtypes("shm_snapshot_t",369,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_hist_cntr")=369
-	Set gtmtypes("shm_snapshot_t",370,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_hist1_nullbt_cntr"
-	Set gtmtypes("shm_snapshot_t",370,"off")=7612
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_cntr")=369
+	Set gtmtypes("shm_snapshot_t",370,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_db_csh_getn_loopexceed_cntr"
+	Set gtmtypes("shm_snapshot_t",370,"off")=7576
 	Set gtmtypes("shm_snapshot_t",370,"len")=4
 	Set gtmtypes("shm_snapshot_t",370,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_hist1_nullbt_cntr")=370
-	Set gtmtypes("shm_snapshot_t",371,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_cntr"
-	Set gtmtypes("shm_snapshot_t",371,"off")=7616
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_db_csh_getn_loopexceed_cntr")=370
+	Set gtmtypes("shm_snapshot_t",371,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_cntr"
+	Set gtmtypes("shm_snapshot_t",371,"off")=7580
 	Set gtmtypes("shm_snapshot_t",371,"len")=4
 	Set gtmtypes("shm_snapshot_t",371,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_cntr")=371
-	Set gtmtypes("shm_snapshot_t",372,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_bitmap_nullbt_cntr"
-	Set gtmtypes("shm_snapshot_t",372,"off")=7620
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_cntr")=371
+	Set gtmtypes("shm_snapshot_t",372,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_db_csh_get_cntr"
+	Set gtmtypes("shm_snapshot_t",372,"off")=7584
 	Set gtmtypes("shm_snapshot_t",372,"len")=4
 	Set gtmtypes("shm_snapshot_t",372,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_bitmap_nullbt_cntr")=372
-	Set gtmtypes("shm_snapshot_t",373,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_cntr"
-	Set gtmtypes("shm_snapshot_t",373,"off")=7624
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_db_csh_get_cntr")=372
+	Set gtmtypes("shm_snapshot_t",373,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_wcsgetspace_cntr"
+	Set gtmtypes("shm_snapshot_t",373,"off")=7588
 	Set gtmtypes("shm_snapshot_t",373,"len")=4
 	Set gtmtypes("shm_snapshot_t",373,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_cntr")=373
-	Set gtmtypes("shm_snapshot_t",374,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_jnl_cwset_cntr"
-	Set gtmtypes("shm_snapshot_t",374,"off")=7628
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_wcsgetspace_cntr")=373
+	Set gtmtypes("shm_snapshot_t",374,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_t1_cntr"
+	Set gtmtypes("shm_snapshot_t",374,"off")=7592
 	Set gtmtypes("shm_snapshot_t",374,"len")=4
 	Set gtmtypes("shm_snapshot_t",374,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_jnl_cwset_cntr")=374
-	Set gtmtypes("shm_snapshot_t",375,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_jnl_wcsflu_cntr"
-	Set gtmtypes("shm_snapshot_t",375,"off")=7632
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_t1_cntr")=374
+	Set gtmtypes("shm_snapshot_t",375,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_bitmap_cntr"
+	Set gtmtypes("shm_snapshot_t",375,"off")=7596
 	Set gtmtypes("shm_snapshot_t",375,"len")=4
 	Set gtmtypes("shm_snapshot_t",375,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_jnl_wcsflu_cntr")=375
-	Set gtmtypes("shm_snapshot_t",376,"name")="shm_snapshot_t.shadow_file_header.db_csh_get_too_many_loops_cntr"
-	Set gtmtypes("shm_snapshot_t",376,"off")=7636
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_bitmap_cntr")=375
+	Set gtmtypes("shm_snapshot_t",376,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_jnl_cwset_cntr"
+	Set gtmtypes("shm_snapshot_t",376,"off")=7600
 	Set gtmtypes("shm_snapshot_t",376,"len")=4
 	Set gtmtypes("shm_snapshot_t",376,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_get_too_many_loops_cntr")=376
-	Set gtmtypes("shm_snapshot_t",377,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tpckh_hist1_nullbt_cntr"
-	Set gtmtypes("shm_snapshot_t",377,"off")=7640
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_jnl_cwset_cntr")=376
+	Set gtmtypes("shm_snapshot_t",377,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_cntr"
+	Set gtmtypes("shm_snapshot_t",377,"off")=7604
 	Set gtmtypes("shm_snapshot_t",377,"len")=4
 	Set gtmtypes("shm_snapshot_t",377,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tpckh_hist1_nullbt_cntr")=377
-	Set gtmtypes("shm_snapshot_t",378,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_cntr"
-	Set gtmtypes("shm_snapshot_t",378,"off")=7644
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_cntr")=377
+	Set gtmtypes("shm_snapshot_t",378,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_hist_cntr"
+	Set gtmtypes("shm_snapshot_t",378,"off")=7608
 	Set gtmtypes("shm_snapshot_t",378,"len")=4
 	Set gtmtypes("shm_snapshot_t",378,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_cntr")=378
-	Set gtmtypes("shm_snapshot_t",379,"name")="shm_snapshot_t.shadow_file_header.jnl_blocked_writer_lost_cntr"
-	Set gtmtypes("shm_snapshot_t",379,"off")=7648
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_hist_cntr")=378
+	Set gtmtypes("shm_snapshot_t",379,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_hist1_nullbt_cntr"
+	Set gtmtypes("shm_snapshot_t",379,"off")=7612
 	Set gtmtypes("shm_snapshot_t",379,"len")=4
 	Set gtmtypes("shm_snapshot_t",379,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_blocked_writer_lost_cntr")=379
-	Set gtmtypes("shm_snapshot_t",380,"name")="shm_snapshot_t.shadow_file_header.jnl_blocked_writer_stuck_cntr"
-	Set gtmtypes("shm_snapshot_t",380,"off")=7652
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_hist1_nullbt_cntr")=379
+	Set gtmtypes("shm_snapshot_t",380,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_cntr"
+	Set gtmtypes("shm_snapshot_t",380,"off")=7616
 	Set gtmtypes("shm_snapshot_t",380,"len")=4
 	Set gtmtypes("shm_snapshot_t",380,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_blocked_writer_stuck_cntr")=380
-	Set gtmtypes("shm_snapshot_t",381,"name")="shm_snapshot_t.shadow_file_header.jnl_blocked_writer_blocked_cntr"
-	Set gtmtypes("shm_snapshot_t",381,"off")=7656
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_cntr")=380
+	Set gtmtypes("shm_snapshot_t",381,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_bitmap_nullbt_cntr"
+	Set gtmtypes("shm_snapshot_t",381,"off")=7620
 	Set gtmtypes("shm_snapshot_t",381,"len")=4
 	Set gtmtypes("shm_snapshot_t",381,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_blocked_writer_blocked_cntr")=381
-	Set gtmtypes("shm_snapshot_t",382,"name")="shm_snapshot_t.shadow_file_header.n_jnl_fsyncs_cntr"
-	Set gtmtypes("shm_snapshot_t",382,"off")=7660
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_bitmap_nullbt_cntr")=381
+	Set gtmtypes("shm_snapshot_t",382,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_cntr"
+	Set gtmtypes("shm_snapshot_t",382,"off")=7624
 	Set gtmtypes("shm_snapshot_t",382,"len")=4
 	Set gtmtypes("shm_snapshot_t",382,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_jnl_fsyncs_cntr")=382
-	Set gtmtypes("shm_snapshot_t",383,"name")="shm_snapshot_t.shadow_file_header.n_jnl_fsync_tries_cntr"
-	Set gtmtypes("shm_snapshot_t",383,"off")=7664
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_cntr")=382
+	Set gtmtypes("shm_snapshot_t",383,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_jnl_cwset_cntr"
+	Set gtmtypes("shm_snapshot_t",383,"off")=7628
 	Set gtmtypes("shm_snapshot_t",383,"len")=4
 	Set gtmtypes("shm_snapshot_t",383,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_jnl_fsync_tries_cntr")=383
-	Set gtmtypes("shm_snapshot_t",384,"name")="shm_snapshot_t.shadow_file_header.n_jnl_fsync_recovers_cntr"
-	Set gtmtypes("shm_snapshot_t",384,"off")=7668
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_jnl_cwset_cntr")=383
+	Set gtmtypes("shm_snapshot_t",384,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_jnl_wcsflu_cntr"
+	Set gtmtypes("shm_snapshot_t",384,"off")=7632
 	Set gtmtypes("shm_snapshot_t",384,"len")=4
 	Set gtmtypes("shm_snapshot_t",384,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_jnl_fsync_recovers_cntr")=384
-	Set gtmtypes("shm_snapshot_t",385,"name")="shm_snapshot_t.shadow_file_header.n_db_fsyncs_cntr"
-	Set gtmtypes("shm_snapshot_t",385,"off")=7672
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_jnl_wcsflu_cntr")=384
+	Set gtmtypes("shm_snapshot_t",385,"name")="shm_snapshot_t.shadow_file_header.db_csh_get_too_many_loops_cntr"
+	Set gtmtypes("shm_snapshot_t",385,"off")=7636
 	Set gtmtypes("shm_snapshot_t",385,"len")=4
 	Set gtmtypes("shm_snapshot_t",385,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_fsyncs_cntr")=385
-	Set gtmtypes("shm_snapshot_t",386,"name")="shm_snapshot_t.shadow_file_header.n_db_fsyncs_in_crit_cntr"
-	Set gtmtypes("shm_snapshot_t",386,"off")=7676
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_get_too_many_loops_cntr")=385
+	Set gtmtypes("shm_snapshot_t",386,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tpckh_hist1_nullbt_cntr"
+	Set gtmtypes("shm_snapshot_t",386,"off")=7640
 	Set gtmtypes("shm_snapshot_t",386,"len")=4
 	Set gtmtypes("shm_snapshot_t",386,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_fsyncs_in_crit_cntr")=386
-	Set gtmtypes("shm_snapshot_t",387,"name")="shm_snapshot_t.shadow_file_header.n_dbsync_timers_cntr"
-	Set gtmtypes("shm_snapshot_t",387,"off")=7680
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tpckh_hist1_nullbt_cntr")=386
+	Set gtmtypes("shm_snapshot_t",387,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_cntr"
+	Set gtmtypes("shm_snapshot_t",387,"off")=7644
 	Set gtmtypes("shm_snapshot_t",387,"len")=4
 	Set gtmtypes("shm_snapshot_t",387,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_dbsync_timers_cntr")=387
-	Set gtmtypes("shm_snapshot_t",388,"name")="shm_snapshot_t.shadow_file_header.n_dbsync_writes_cntr"
-	Set gtmtypes("shm_snapshot_t",388,"off")=7684
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_cntr")=387
+	Set gtmtypes("shm_snapshot_t",388,"name")="shm_snapshot_t.shadow_file_header.jnl_blocked_writer_lost_cntr"
+	Set gtmtypes("shm_snapshot_t",388,"off")=7648
 	Set gtmtypes("shm_snapshot_t",388,"len")=4
 	Set gtmtypes("shm_snapshot_t",388,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_dbsync_writes_cntr")=388
-	Set gtmtypes("shm_snapshot_t",389,"name")="shm_snapshot_t.shadow_file_header.mutex_queue_full_cntr"
-	Set gtmtypes("shm_snapshot_t",389,"off")=7688
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_blocked_writer_lost_cntr")=388
+	Set gtmtypes("shm_snapshot_t",389,"name")="shm_snapshot_t.shadow_file_header.jnl_blocked_writer_stuck_cntr"
+	Set gtmtypes("shm_snapshot_t",389,"off")=7652
 	Set gtmtypes("shm_snapshot_t",389,"len")=4
 	Set gtmtypes("shm_snapshot_t",389,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.mutex_queue_full_cntr")=389
-	Set gtmtypes("shm_snapshot_t",390,"name")="shm_snapshot_t.shadow_file_header.wcb_bt_put_cntr"
-	Set gtmtypes("shm_snapshot_t",390,"off")=7692
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_blocked_writer_stuck_cntr")=389
+	Set gtmtypes("shm_snapshot_t",390,"name")="shm_snapshot_t.shadow_file_header.jnl_blocked_writer_blocked_cntr"
+	Set gtmtypes("shm_snapshot_t",390,"off")=7656
 	Set gtmtypes("shm_snapshot_t",390,"len")=4
 	Set gtmtypes("shm_snapshot_t",390,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_bt_put_cntr")=390
-	Set gtmtypes("shm_snapshot_t",391,"name")="shm_snapshot_t.shadow_file_header.wcb_mutex_salvage_cntr"
-	Set gtmtypes("shm_snapshot_t",391,"off")=7696
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.jnl_blocked_writer_blocked_cntr")=390
+	Set gtmtypes("shm_snapshot_t",391,"name")="shm_snapshot_t.shadow_file_header.n_jnl_fsyncs_cntr"
+	Set gtmtypes("shm_snapshot_t",391,"off")=7660
 	Set gtmtypes("shm_snapshot_t",391,"len")=4
 	Set gtmtypes("shm_snapshot_t",391,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_mutex_salvage_cntr")=391
-	Set gtmtypes("shm_snapshot_t",392,"name")="shm_snapshot_t.shadow_file_header.wcb_tp_grab_crit_cntr"
-	Set gtmtypes("shm_snapshot_t",392,"off")=7700
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_jnl_fsyncs_cntr")=391
+	Set gtmtypes("shm_snapshot_t",392,"name")="shm_snapshot_t.shadow_file_header.n_jnl_fsync_tries_cntr"
+	Set gtmtypes("shm_snapshot_t",392,"off")=7664
 	Set gtmtypes("shm_snapshot_t",392,"len")=4
 	Set gtmtypes("shm_snapshot_t",392,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_tp_grab_crit_cntr")=392
-	Set gtmtypes("shm_snapshot_t",393,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_nocr_invcr_cntr"
-	Set gtmtypes("shm_snapshot_t",393,"off")=7704
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_jnl_fsync_tries_cntr")=392
+	Set gtmtypes("shm_snapshot_t",393,"name")="shm_snapshot_t.shadow_file_header.n_jnl_fsync_recovers_cntr"
+	Set gtmtypes("shm_snapshot_t",393,"off")=7668
 	Set gtmtypes("shm_snapshot_t",393,"len")=4
 	Set gtmtypes("shm_snapshot_t",393,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_nocr_invcr_cntr")=393
-	Set gtmtypes("shm_snapshot_t",394,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_cr_invcr_cntr"
-	Set gtmtypes("shm_snapshot_t",394,"off")=7708
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_jnl_fsync_recovers_cntr")=393
+	Set gtmtypes("shm_snapshot_t",394,"name")="shm_snapshot_t.shadow_file_header.n_db_fsyncs_cntr"
+	Set gtmtypes("shm_snapshot_t",394,"off")=7672
 	Set gtmtypes("shm_snapshot_t",394,"len")=4
 	Set gtmtypes("shm_snapshot_t",394,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_cr_invcr_cntr")=394
-	Set gtmtypes("shm_snapshot_t",395,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_rip_wait_cntr"
-	Set gtmtypes("shm_snapshot_t",395,"off")=7712
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_fsyncs_cntr")=394
+	Set gtmtypes("shm_snapshot_t",395,"name")="shm_snapshot_t.shadow_file_header.n_db_fsyncs_in_crit_cntr"
+	Set gtmtypes("shm_snapshot_t",395,"off")=7676
 	Set gtmtypes("shm_snapshot_t",395,"len")=4
 	Set gtmtypes("shm_snapshot_t",395,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_rip_wait_cntr")=395
-	Set gtmtypes("shm_snapshot_t",396,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirtyripwait_cntr"
-	Set gtmtypes("shm_snapshot_t",396,"off")=7716
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_fsyncs_in_crit_cntr")=395
+	Set gtmtypes("shm_snapshot_t",396,"name")="shm_snapshot_t.shadow_file_header.n_dbsync_timers_cntr"
+	Set gtmtypes("shm_snapshot_t",396,"off")=7680
 	Set gtmtypes("shm_snapshot_t",396,"len")=4
 	Set gtmtypes("shm_snapshot_t",396,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirtyripwait_cntr")=396
-	Set gtmtypes("shm_snapshot_t",397,"name")="shm_snapshot_t.shadow_file_header.wcb_gds_rundown_cntr"
-	Set gtmtypes("shm_snapshot_t",397,"off")=7720
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_dbsync_timers_cntr")=396
+	Set gtmtypes("shm_snapshot_t",397,"name")="shm_snapshot_t.shadow_file_header.n_dbsync_writes_cntr"
+	Set gtmtypes("shm_snapshot_t",397,"off")=7684
 	Set gtmtypes("shm_snapshot_t",397,"len")=4
 	Set gtmtypes("shm_snapshot_t",397,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_gds_rundown_cntr")=397
-	Set gtmtypes("shm_snapshot_t",398,"name")="shm_snapshot_t.shadow_file_header.wcb_wcs_flu1_cntr"
-	Set gtmtypes("shm_snapshot_t",398,"off")=7724
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_dbsync_writes_cntr")=397
+	Set gtmtypes("shm_snapshot_t",398,"name")="shm_snapshot_t.shadow_file_header.mutex_queue_full_cntr"
+	Set gtmtypes("shm_snapshot_t",398,"off")=7688
 	Set gtmtypes("shm_snapshot_t",398,"len")=4
 	Set gtmtypes("shm_snapshot_t",398,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wcs_flu1_cntr")=398
-	Set gtmtypes("shm_snapshot_t",399,"name")="shm_snapshot_t.shadow_file_header.wcb_mu_back_cntr"
-	Set gtmtypes("shm_snapshot_t",399,"off")=7728
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.mutex_queue_full_cntr")=398
+	Set gtmtypes("shm_snapshot_t",399,"name")="shm_snapshot_t.shadow_file_header.wcb_bt_put_cntr"
+	Set gtmtypes("shm_snapshot_t",399,"off")=7692
 	Set gtmtypes("shm_snapshot_t",399,"len")=4
 	Set gtmtypes("shm_snapshot_t",399,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_mu_back_cntr")=399
-	Set gtmtypes("shm_snapshot_t",400,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirty_invcr_cntr"
-	Set gtmtypes("shm_snapshot_t",400,"off")=7732
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_bt_put_cntr")=399
+	Set gtmtypes("shm_snapshot_t",400,"name")="shm_snapshot_t.shadow_file_header.wcb_mutex_salvage_cntr"
+	Set gtmtypes("shm_snapshot_t",400,"off")=7696
 	Set gtmtypes("shm_snapshot_t",400,"len")=4
 	Set gtmtypes("shm_snapshot_t",400,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirty_invcr_cntr")=400
-	Set gtmtypes("shm_snapshot_t",401,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_wtfini_fail_cntr"
-	Set gtmtypes("shm_snapshot_t",401,"off")=7736
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_mutex_salvage_cntr")=400
+	Set gtmtypes("shm_snapshot_t",401,"name")="shm_snapshot_t.shadow_file_header.wcb_tp_grab_crit_cntr"
+	Set gtmtypes("shm_snapshot_t",401,"off")=7700
 	Set gtmtypes("shm_snapshot_t",401,"len")=4
 	Set gtmtypes("shm_snapshot_t",401,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_wtfini_fail_cntr")=401
-	Set gtmtypes("shm_snapshot_t",402,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_twin_stuck_cntr"
-	Set gtmtypes("shm_snapshot_t",402,"off")=7740
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_tp_grab_crit_cntr")=401
+	Set gtmtypes("shm_snapshot_t",402,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_nocr_invcr_cntr"
+	Set gtmtypes("shm_snapshot_t",402,"off")=7704
 	Set gtmtypes("shm_snapshot_t",402,"len")=4
 	Set gtmtypes("shm_snapshot_t",402,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_twin_stuck_cntr")=402
-	Set gtmtypes("shm_snapshot_t",403,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_wrt_latch_stuck_cntr"
-	Set gtmtypes("shm_snapshot_t",403,"off")=7744
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_nocr_invcr_cntr")=402
+	Set gtmtypes("shm_snapshot_t",403,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_cr_invcr_cntr"
+	Set gtmtypes("shm_snapshot_t",403,"off")=7708
 	Set gtmtypes("shm_snapshot_t",403,"len")=4
 	Set gtmtypes("shm_snapshot_t",403,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_wrt_latch_stuck_cntr")=403
-	Set gtmtypes("shm_snapshot_t",404,"name")="shm_snapshot_t.shadow_file_header.wcb_secshr_db_clnup_now_crit_cntr"
-	Set gtmtypes("shm_snapshot_t",404,"off")=7748
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_cr_invcr_cntr")=403
+	Set gtmtypes("shm_snapshot_t",404,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_rip_wait_cntr"
+	Set gtmtypes("shm_snapshot_t",404,"off")=7712
 	Set gtmtypes("shm_snapshot_t",404,"len")=4
 	Set gtmtypes("shm_snapshot_t",404,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_secshr_db_clnup_now_crit_cntr")=404
-	Set gtmtypes("shm_snapshot_t",405,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_bad_bt_index1_cntr"
-	Set gtmtypes("shm_snapshot_t",405,"off")=7752
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_rip_wait_cntr")=404
+	Set gtmtypes("shm_snapshot_t",405,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirtyripwait_cntr"
+	Set gtmtypes("shm_snapshot_t",405,"off")=7716
 	Set gtmtypes("shm_snapshot_t",405,"len")=4
 	Set gtmtypes("shm_snapshot_t",405,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_bad_bt_index1_cntr")=405
-	Set gtmtypes("shm_snapshot_t",406,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_bad_bt_index2_cntr"
-	Set gtmtypes("shm_snapshot_t",406,"off")=7756
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirtyripwait_cntr")=405
+	Set gtmtypes("shm_snapshot_t",406,"name")="shm_snapshot_t.shadow_file_header.wcb_gds_rundown_cntr"
+	Set gtmtypes("shm_snapshot_t",406,"off")=7720
 	Set gtmtypes("shm_snapshot_t",406,"len")=4
 	Set gtmtypes("shm_snapshot_t",406,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_bad_bt_index2_cntr")=406
-	Set gtmtypes("shm_snapshot_t",407,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_crbtmismatch1_cntr"
-	Set gtmtypes("shm_snapshot_t",407,"off")=7760
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_gds_rundown_cntr")=406
+	Set gtmtypes("shm_snapshot_t",407,"name")="shm_snapshot_t.shadow_file_header.wcb_wcs_flu1_cntr"
+	Set gtmtypes("shm_snapshot_t",407,"off")=7724
 	Set gtmtypes("shm_snapshot_t",407,"len")=4
 	Set gtmtypes("shm_snapshot_t",407,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_crbtmismatch1_cntr")=407
-	Set gtmtypes("shm_snapshot_t",408,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_crbtmismatch2_cntr"
-	Set gtmtypes("shm_snapshot_t",408,"off")=7764
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wcs_flu1_cntr")=407
+	Set gtmtypes("shm_snapshot_t",408,"name")="shm_snapshot_t.shadow_file_header.wcb_mu_back_cntr"
+	Set gtmtypes("shm_snapshot_t",408,"off")=7728
 	Set gtmtypes("shm_snapshot_t",408,"len")=4
 	Set gtmtypes("shm_snapshot_t",408,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_crbtmismatch2_cntr")=408
-	Set gtmtypes("shm_snapshot_t",409,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_crbtmismatch3_cntr"
-	Set gtmtypes("shm_snapshot_t",409,"off")=7768
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_mu_back_cntr")=408
+	Set gtmtypes("shm_snapshot_t",409,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirty_invcr_cntr"
+	Set gtmtypes("shm_snapshot_t",409,"off")=7732
 	Set gtmtypes("shm_snapshot_t",409,"len")=4
 	Set gtmtypes("shm_snapshot_t",409,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_crbtmismatch3_cntr")=409
-	Set gtmtypes("shm_snapshot_t",410,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_cntr"
-	Set gtmtypes("shm_snapshot_t",410,"off")=7772
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirty_invcr_cntr")=409
+	Set gtmtypes("shm_snapshot_t",410,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_wtfini_fail_cntr"
+	Set gtmtypes("shm_snapshot_t",410,"off")=7736
 	Set gtmtypes("shm_snapshot_t",410,"len")=4
 	Set gtmtypes("shm_snapshot_t",410,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_cntr")=410
-	Set gtmtypes("shm_snapshot_t",411,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_cntr"
-	Set gtmtypes("shm_snapshot_t",411,"off")=7776
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_wtfini_fail_cntr")=410
+	Set gtmtypes("shm_snapshot_t",411,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_twin_stuck_cntr"
+	Set gtmtypes("shm_snapshot_t",411,"off")=7740
 	Set gtmtypes("shm_snapshot_t",411,"len")=4
 	Set gtmtypes("shm_snapshot_t",411,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_cntr")=411
-	Set gtmtypes("shm_snapshot_t",412,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_cntr"
-	Set gtmtypes("shm_snapshot_t",412,"off")=7780
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_twin_stuck_cntr")=411
+	Set gtmtypes("shm_snapshot_t",412,"name")="shm_snapshot_t.shadow_file_header.db_csh_getn_wrt_latch_stuck_cntr"
+	Set gtmtypes("shm_snapshot_t",412,"off")=7744
 	Set gtmtypes("shm_snapshot_t",412,"len")=4
 	Set gtmtypes("shm_snapshot_t",412,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_cntr")=412
-	Set gtmtypes("shm_snapshot_t",413,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_cntr"
-	Set gtmtypes("shm_snapshot_t",413,"off")=7784
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_getn_wrt_latch_stuck_cntr")=412
+	Set gtmtypes("shm_snapshot_t",413,"name")="shm_snapshot_t.shadow_file_header.wcb_secshr_db_clnup_now_crit_cntr"
+	Set gtmtypes("shm_snapshot_t",413,"off")=7748
 	Set gtmtypes("shm_snapshot_t",413,"len")=4
 	Set gtmtypes("shm_snapshot_t",413,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_cntr")=413
-	Set gtmtypes("shm_snapshot_t",414,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_cntr"
-	Set gtmtypes("shm_snapshot_t",414,"off")=7788
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_secshr_db_clnup_now_crit_cntr")=413
+	Set gtmtypes("shm_snapshot_t",414,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_bad_bt_index1_cntr"
+	Set gtmtypes("shm_snapshot_t",414,"off")=7752
 	Set gtmtypes("shm_snapshot_t",414,"len")=4
 	Set gtmtypes("shm_snapshot_t",414,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_cntr")=414
-	Set gtmtypes("shm_snapshot_t",415,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_bt_get_cntr"
-	Set gtmtypes("shm_snapshot_t",415,"off")=7792
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_bad_bt_index1_cntr")=414
+	Set gtmtypes("shm_snapshot_t",415,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_qread_bad_bt_index2_cntr"
+	Set gtmtypes("shm_snapshot_t",415,"off")=7756
 	Set gtmtypes("shm_snapshot_t",415,"len")=4
 	Set gtmtypes("shm_snapshot_t",415,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_bt_get_cntr")=415
-	Set gtmtypes("shm_snapshot_t",416,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_cntr"
-	Set gtmtypes("shm_snapshot_t",416,"off")=7796
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_qread_bad_bt_index2_cntr")=415
+	Set gtmtypes("shm_snapshot_t",416,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_crbtmismatch1_cntr"
+	Set gtmtypes("shm_snapshot_t",416,"off")=7760
 	Set gtmtypes("shm_snapshot_t",416,"len")=4
 	Set gtmtypes("shm_snapshot_t",416,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_cntr")=416
-	Set gtmtypes("shm_snapshot_t",417,"name")="shm_snapshot_t.shadow_file_header.wcb_bg_update_lckfail1_cntr"
-	Set gtmtypes("shm_snapshot_t",417,"off")=7800
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_crbtmismatch1_cntr")=416
+	Set gtmtypes("shm_snapshot_t",417,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_crbtmismatch2_cntr"
+	Set gtmtypes("shm_snapshot_t",417,"off")=7764
 	Set gtmtypes("shm_snapshot_t",417,"len")=4
 	Set gtmtypes("shm_snapshot_t",417,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_bg_update_lckfail1_cntr")=417
-	Set gtmtypes("shm_snapshot_t",418,"name")="shm_snapshot_t.shadow_file_header.wcb_bg_update_lckfail2_cntr"
-	Set gtmtypes("shm_snapshot_t",418,"off")=7804
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_crbtmismatch2_cntr")=417
+	Set gtmtypes("shm_snapshot_t",418,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_t_end_crbtmismatch3_cntr"
+	Set gtmtypes("shm_snapshot_t",418,"off")=7768
 	Set gtmtypes("shm_snapshot_t",418,"len")=4
 	Set gtmtypes("shm_snapshot_t",418,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_bg_update_lckfail2_cntr")=418
-	Set gtmtypes("shm_snapshot_t",419,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail1_cntr"
-	Set gtmtypes("shm_snapshot_t",419,"off")=7808
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_t_end_crbtmismatch3_cntr")=418
+	Set gtmtypes("shm_snapshot_t",419,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_cntr"
+	Set gtmtypes("shm_snapshot_t",419,"off")=7772
 	Set gtmtypes("shm_snapshot_t",419,"len")=4
 	Set gtmtypes("shm_snapshot_t",419,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail1_cntr")=419
-	Set gtmtypes("shm_snapshot_t",420,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail2_cntr"
-	Set gtmtypes("shm_snapshot_t",420,"off")=7812
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_cntr")=419
+	Set gtmtypes("shm_snapshot_t",420,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_cntr"
+	Set gtmtypes("shm_snapshot_t",420,"off")=7776
 	Set gtmtypes("shm_snapshot_t",420,"len")=4
 	Set gtmtypes("shm_snapshot_t",420,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail2_cntr")=420
-	Set gtmtypes("shm_snapshot_t",421,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail3_cntr"
-	Set gtmtypes("shm_snapshot_t",421,"off")=7816
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_cntr")=420
+	Set gtmtypes("shm_snapshot_t",421,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_cntr"
+	Set gtmtypes("shm_snapshot_t",421,"off")=7780
 	Set gtmtypes("shm_snapshot_t",421,"len")=4
 	Set gtmtypes("shm_snapshot_t",421,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail3_cntr")=421
-	Set gtmtypes("shm_snapshot_t",422,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail4_cntr"
-	Set gtmtypes("shm_snapshot_t",422,"off")=7820
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_cntr")=421
+	Set gtmtypes("shm_snapshot_t",422,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_cntr"
+	Set gtmtypes("shm_snapshot_t",422,"off")=7784
 	Set gtmtypes("shm_snapshot_t",422,"len")=4
 	Set gtmtypes("shm_snapshot_t",422,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail4_cntr")=422
-	Set gtmtypes("shm_snapshot_t",423,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail1_cntr"
-	Set gtmtypes("shm_snapshot_t",423,"off")=7824
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_cntr")=422
+	Set gtmtypes("shm_snapshot_t",423,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_cntr"
+	Set gtmtypes("shm_snapshot_t",423,"off")=7788
 	Set gtmtypes("shm_snapshot_t",423,"len")=4
 	Set gtmtypes("shm_snapshot_t",423,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail1_cntr")=423
-	Set gtmtypes("shm_snapshot_t",424,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail2_cntr"
-	Set gtmtypes("shm_snapshot_t",424,"off")=7828
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_cntr")=423
+	Set gtmtypes("shm_snapshot_t",424,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_bt_get_cntr"
+	Set gtmtypes("shm_snapshot_t",424,"off")=7792
 	Set gtmtypes("shm_snapshot_t",424,"len")=4
 	Set gtmtypes("shm_snapshot_t",424,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail2_cntr")=424
-	Set gtmtypes("shm_snapshot_t",425,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail3_cntr"
-	Set gtmtypes("shm_snapshot_t",425,"off")=7832
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_bt_get_cntr")=424
+	Set gtmtypes("shm_snapshot_t",425,"name")="shm_snapshot_t.shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_cntr"
+	Set gtmtypes("shm_snapshot_t",425,"off")=7796
 	Set gtmtypes("shm_snapshot_t",425,"len")=4
 	Set gtmtypes("shm_snapshot_t",425,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail3_cntr")=425
-	Set gtmtypes("shm_snapshot_t",426,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail4_cntr"
-	Set gtmtypes("shm_snapshot_t",426,"off")=7836
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_cntr")=425
+	Set gtmtypes("shm_snapshot_t",426,"name")="shm_snapshot_t.shadow_file_header.wcb_bg_update_lckfail1_cntr"
+	Set gtmtypes("shm_snapshot_t",426,"off")=7800
 	Set gtmtypes("shm_snapshot_t",426,"len")=4
 	Set gtmtypes("shm_snapshot_t",426,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail4_cntr")=426
-	Set gtmtypes("shm_snapshot_t",427,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirtystuck1_cntr"
-	Set gtmtypes("shm_snapshot_t",427,"off")=7840
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_bg_update_lckfail1_cntr")=426
+	Set gtmtypes("shm_snapshot_t",427,"name")="shm_snapshot_t.shadow_file_header.wcb_bg_update_lckfail2_cntr"
+	Set gtmtypes("shm_snapshot_t",427,"off")=7804
 	Set gtmtypes("shm_snapshot_t",427,"len")=4
 	Set gtmtypes("shm_snapshot_t",427,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirtystuck1_cntr")=427
-	Set gtmtypes("shm_snapshot_t",428,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirtystuck2_cntr"
-	Set gtmtypes("shm_snapshot_t",428,"off")=7844
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_bg_update_lckfail2_cntr")=427
+	Set gtmtypes("shm_snapshot_t",428,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail1_cntr"
+	Set gtmtypes("shm_snapshot_t",428,"off")=7808
 	Set gtmtypes("shm_snapshot_t",428,"len")=4
 	Set gtmtypes("shm_snapshot_t",428,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirtystuck2_cntr")=428
-	Set gtmtypes("shm_snapshot_t",429,"name")="shm_snapshot_t.shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_cntr"
-	Set gtmtypes("shm_snapshot_t",429,"off")=7848
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail1_cntr")=428
+	Set gtmtypes("shm_snapshot_t",429,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail2_cntr"
+	Set gtmtypes("shm_snapshot_t",429,"off")=7812
 	Set gtmtypes("shm_snapshot_t",429,"len")=4
 	Set gtmtypes("shm_snapshot_t",429,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_cntr")=429
-	Set gtmtypes("shm_snapshot_t",430,"name")="shm_snapshot_t.shadow_file_header.dwngrd_refmts_syncio_cntr"
-	Set gtmtypes("shm_snapshot_t",430,"off")=7852
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail2_cntr")=429
+	Set gtmtypes("shm_snapshot_t",430,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail3_cntr"
+	Set gtmtypes("shm_snapshot_t",430,"off")=7816
 	Set gtmtypes("shm_snapshot_t",430,"len")=4
 	Set gtmtypes("shm_snapshot_t",430,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.dwngrd_refmts_syncio_cntr")=430
-	Set gtmtypes("shm_snapshot_t",431,"name")="shm_snapshot_t.shadow_file_header.dwngrd_refmts_asyncio_cntr"
-	Set gtmtypes("shm_snapshot_t",431,"off")=7856
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail3_cntr")=430
+	Set gtmtypes("shm_snapshot_t",431,"name")="shm_snapshot_t.shadow_file_header.wcb_wtstart_lckfail4_cntr"
+	Set gtmtypes("shm_snapshot_t",431,"off")=7820
 	Set gtmtypes("shm_snapshot_t",431,"len")=4
 	Set gtmtypes("shm_snapshot_t",431,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.dwngrd_refmts_asyncio_cntr")=431
-	Set gtmtypes("shm_snapshot_t",432,"name")="shm_snapshot_t.shadow_file_header.shmpool_refmt_harvests_cntr"
-	Set gtmtypes("shm_snapshot_t",432,"off")=7860
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtstart_lckfail4_cntr")=431
+	Set gtmtypes("shm_snapshot_t",432,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail1_cntr"
+	Set gtmtypes("shm_snapshot_t",432,"off")=7824
 	Set gtmtypes("shm_snapshot_t",432,"len")=4
 	Set gtmtypes("shm_snapshot_t",432,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_refmt_harvests_cntr")=432
-	Set gtmtypes("shm_snapshot_t",433,"name")="shm_snapshot_t.shadow_file_header.shmpool_recovery_cntr"
-	Set gtmtypes("shm_snapshot_t",433,"off")=7864
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail1_cntr")=432
+	Set gtmtypes("shm_snapshot_t",433,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail2_cntr"
+	Set gtmtypes("shm_snapshot_t",433,"off")=7828
 	Set gtmtypes("shm_snapshot_t",433,"len")=4
 	Set gtmtypes("shm_snapshot_t",433,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_recovery_cntr")=433
-	Set gtmtypes("shm_snapshot_t",434,"name")="shm_snapshot_t.shadow_file_header.shmpool_blkd_by_sdc_cntr"
-	Set gtmtypes("shm_snapshot_t",434,"off")=7868
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail2_cntr")=433
+	Set gtmtypes("shm_snapshot_t",434,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail3_cntr"
+	Set gtmtypes("shm_snapshot_t",434,"off")=7832
 	Set gtmtypes("shm_snapshot_t",434,"len")=4
 	Set gtmtypes("shm_snapshot_t",434,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_blkd_by_sdc_cntr")=434
-	Set gtmtypes("shm_snapshot_t",435,"name")="shm_snapshot_t.shadow_file_header.shmpool_alloc_bbflush_cntr"
-	Set gtmtypes("shm_snapshot_t",435,"off")=7872
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail3_cntr")=434
+	Set gtmtypes("shm_snapshot_t",435,"name")="shm_snapshot_t.shadow_file_header.wcb_wtfini_lckfail4_cntr"
+	Set gtmtypes("shm_snapshot_t",435,"off")=7836
 	Set gtmtypes("shm_snapshot_t",435,"len")=4
 	Set gtmtypes("shm_snapshot_t",435,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_alloc_bbflush_cntr")=435
-	Set gtmtypes("shm_snapshot_t",436,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_released_replaced_cntr"
-	Set gtmtypes("shm_snapshot_t",436,"off")=7876
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_wtfini_lckfail4_cntr")=435
+	Set gtmtypes("shm_snapshot_t",436,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirtystuck1_cntr"
+	Set gtmtypes("shm_snapshot_t",436,"off")=7840
 	Set gtmtypes("shm_snapshot_t",436,"len")=4
 	Set gtmtypes("shm_snapshot_t",436,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_released_replaced_cntr")=436
-	Set gtmtypes("shm_snapshot_t",437,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_released_io_complete_cntr"
-	Set gtmtypes("shm_snapshot_t",437,"off")=7880
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirtystuck1_cntr")=436
+	Set gtmtypes("shm_snapshot_t",437,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_dirtystuck2_cntr"
+	Set gtmtypes("shm_snapshot_t",437,"off")=7844
 	Set gtmtypes("shm_snapshot_t",437,"len")=4
 	Set gtmtypes("shm_snapshot_t",437,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_released_io_complete_cntr")=437
-	Set gtmtypes("shm_snapshot_t",438,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_kept_cntr"
-	Set gtmtypes("shm_snapshot_t",438,"off")=7884
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_dirtystuck2_cntr")=437
+	Set gtmtypes("shm_snapshot_t",438,"name")="shm_snapshot_t.shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_cntr"
+	Set gtmtypes("shm_snapshot_t",438,"off")=7848
 	Set gtmtypes("shm_snapshot_t",438,"len")=4
 	Set gtmtypes("shm_snapshot_t",438,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_kept_cntr")=438
-	Set gtmtypes("shm_snapshot_t",439,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_ignored_cntr"
-	Set gtmtypes("shm_snapshot_t",439,"off")=7888
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_cntr")=438
+	Set gtmtypes("shm_snapshot_t",439,"name")="shm_snapshot_t.shadow_file_header.dwngrd_refmts_syncio_cntr"
+	Set gtmtypes("shm_snapshot_t",439,"off")=7852
 	Set gtmtypes("shm_snapshot_t",439,"len")=4
 	Set gtmtypes("shm_snapshot_t",439,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_ignored_cntr")=439
-	Set gtmtypes("shm_snapshot_t",440,"name")="shm_snapshot_t.shadow_file_header.refmt_blk_chk_blk_freed_cntr"
-	Set gtmtypes("shm_snapshot_t",440,"off")=7892
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.dwngrd_refmts_syncio_cntr")=439
+	Set gtmtypes("shm_snapshot_t",440,"name")="shm_snapshot_t.shadow_file_header.dwngrd_refmts_asyncio_cntr"
+	Set gtmtypes("shm_snapshot_t",440,"off")=7856
 	Set gtmtypes("shm_snapshot_t",440,"len")=4
 	Set gtmtypes("shm_snapshot_t",440,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_blk_chk_blk_freed_cntr")=440
-	Set gtmtypes("shm_snapshot_t",441,"name")="shm_snapshot_t.shadow_file_header.refmt_blk_chk_blk_kept_cntr"
-	Set gtmtypes("shm_snapshot_t",441,"off")=7896
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.dwngrd_refmts_asyncio_cntr")=440
+	Set gtmtypes("shm_snapshot_t",441,"name")="shm_snapshot_t.shadow_file_header.shmpool_refmt_harvests_cntr"
+	Set gtmtypes("shm_snapshot_t",441,"off")=7860
 	Set gtmtypes("shm_snapshot_t",441,"len")=4
 	Set gtmtypes("shm_snapshot_t",441,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_blk_chk_blk_kept_cntr")=441
-	Set gtmtypes("shm_snapshot_t",442,"name")="shm_snapshot_t.shadow_file_header.active_lvl_trigger_cntr"
-	Set gtmtypes("shm_snapshot_t",442,"off")=7900
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_refmt_harvests_cntr")=441
+	Set gtmtypes("shm_snapshot_t",442,"name")="shm_snapshot_t.shadow_file_header.shmpool_recovery_cntr"
+	Set gtmtypes("shm_snapshot_t",442,"off")=7864
 	Set gtmtypes("shm_snapshot_t",442,"len")=4
 	Set gtmtypes("shm_snapshot_t",442,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.active_lvl_trigger_cntr")=442
-	Set gtmtypes("shm_snapshot_t",443,"name")="shm_snapshot_t.shadow_file_header.new_buff_cntr"
-	Set gtmtypes("shm_snapshot_t",443,"off")=7904
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_recovery_cntr")=442
+	Set gtmtypes("shm_snapshot_t",443,"name")="shm_snapshot_t.shadow_file_header.shmpool_blkd_by_sdc_cntr"
+	Set gtmtypes("shm_snapshot_t",443,"off")=7868
 	Set gtmtypes("shm_snapshot_t",443,"len")=4
 	Set gtmtypes("shm_snapshot_t",443,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.new_buff_cntr")=443
-	Set gtmtypes("shm_snapshot_t",444,"name")="shm_snapshot_t.shadow_file_header.phase2_commit_wait_sleep_in_crit_cntr"
-	Set gtmtypes("shm_snapshot_t",444,"off")=7908
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_blkd_by_sdc_cntr")=443
+	Set gtmtypes("shm_snapshot_t",444,"name")="shm_snapshot_t.shadow_file_header.shmpool_alloc_bbflush_cntr"
+	Set gtmtypes("shm_snapshot_t",444,"off")=7872
 	Set gtmtypes("shm_snapshot_t",444,"len")=4
 	Set gtmtypes("shm_snapshot_t",444,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.phase2_commit_wait_sleep_in_crit_cntr")=444
-	Set gtmtypes("shm_snapshot_t",445,"name")="shm_snapshot_t.shadow_file_header.phase2_commit_wait_sleep_no_crit_cntr"
-	Set gtmtypes("shm_snapshot_t",445,"off")=7912
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.shmpool_alloc_bbflush_cntr")=444
+	Set gtmtypes("shm_snapshot_t",445,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_released_replaced_cntr"
+	Set gtmtypes("shm_snapshot_t",445,"off")=7876
 	Set gtmtypes("shm_snapshot_t",445,"len")=4
 	Set gtmtypes("shm_snapshot_t",445,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.phase2_commit_wait_sleep_no_crit_cntr")=445
-	Set gtmtypes("shm_snapshot_t",446,"name")="shm_snapshot_t.shadow_file_header.phase2_commit_wait_pidcnt_cntr"
-	Set gtmtypes("shm_snapshot_t",446,"off")=7916
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_released_replaced_cntr")=445
+	Set gtmtypes("shm_snapshot_t",446,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_released_io_complete_cntr"
+	Set gtmtypes("shm_snapshot_t",446,"off")=7880
 	Set gtmtypes("shm_snapshot_t",446,"len")=4
 	Set gtmtypes("shm_snapshot_t",446,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.phase2_commit_wait_pidcnt_cntr")=446
-	Set gtmtypes("shm_snapshot_t",447,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_intend_wait_cntr"
-	Set gtmtypes("shm_snapshot_t",447,"off")=7920
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_released_io_complete_cntr")=446
+	Set gtmtypes("shm_snapshot_t",447,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_kept_cntr"
+	Set gtmtypes("shm_snapshot_t",447,"off")=7884
 	Set gtmtypes("shm_snapshot_t",447,"len")=4
 	Set gtmtypes("shm_snapshot_t",447,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_intend_wait_cntr")=447
-	Set gtmtypes("shm_snapshot_t",448,"name")="shm_snapshot_t.shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_cntr"
-	Set gtmtypes("shm_snapshot_t",448,"off")=7924
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_kept_cntr")=447
+	Set gtmtypes("shm_snapshot_t",448,"name")="shm_snapshot_t.shadow_file_header.refmt_hvst_blk_ignored_cntr"
+	Set gtmtypes("shm_snapshot_t",448,"off")=7888
 	Set gtmtypes("shm_snapshot_t",448,"len")=4
 	Set gtmtypes("shm_snapshot_t",448,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_cntr")=448
-	Set gtmtypes("shm_snapshot_t",449,"name")="shm_snapshot_t.shadow_file_header.wcb_phase2_commit_wait_cntr"
-	Set gtmtypes("shm_snapshot_t",449,"off")=7928
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_hvst_blk_ignored_cntr")=448
+	Set gtmtypes("shm_snapshot_t",449,"name")="shm_snapshot_t.shadow_file_header.refmt_blk_chk_blk_freed_cntr"
+	Set gtmtypes("shm_snapshot_t",449,"off")=7892
 	Set gtmtypes("shm_snapshot_t",449,"len")=4
 	Set gtmtypes("shm_snapshot_t",449,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_phase2_commit_wait_cntr")=449
-	Set gtmtypes("shm_snapshot_t",450,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_calls_cntr"
-	Set gtmtypes("shm_snapshot_t",450,"off")=7932
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_blk_chk_blk_freed_cntr")=449
+	Set gtmtypes("shm_snapshot_t",450,"name")="shm_snapshot_t.shadow_file_header.refmt_blk_chk_blk_kept_cntr"
+	Set gtmtypes("shm_snapshot_t",450,"off")=7896
 	Set gtmtypes("shm_snapshot_t",450,"len")=4
 	Set gtmtypes("shm_snapshot_t",450,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_calls_cntr")=450
-	Set gtmtypes("shm_snapshot_t",451,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_rip_cntr"
-	Set gtmtypes("shm_snapshot_t",451,"off")=7936
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.refmt_blk_chk_blk_kept_cntr")=450
+	Set gtmtypes("shm_snapshot_t",451,"name")="shm_snapshot_t.shadow_file_header.active_lvl_trigger_cntr"
+	Set gtmtypes("shm_snapshot_t",451,"off")=7900
 	Set gtmtypes("shm_snapshot_t",451,"len")=4
 	Set gtmtypes("shm_snapshot_t",451,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_rip_cntr")=451
-	Set gtmtypes("shm_snapshot_t",452,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_in_tend_cntr"
-	Set gtmtypes("shm_snapshot_t",452,"off")=7940
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.active_lvl_trigger_cntr")=451
+	Set gtmtypes("shm_snapshot_t",452,"name")="shm_snapshot_t.shadow_file_header.new_buff_cntr"
+	Set gtmtypes("shm_snapshot_t",452,"off")=7904
 	Set gtmtypes("shm_snapshot_t",452,"len")=4
 	Set gtmtypes("shm_snapshot_t",452,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_in_tend_cntr")=452
-	Set gtmtypes("shm_snapshot_t",453,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_search_blk_cntr"
-	Set gtmtypes("shm_snapshot_t",453,"off")=7944
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.new_buff_cntr")=452
+	Set gtmtypes("shm_snapshot_t",453,"name")="shm_snapshot_t.shadow_file_header.phase2_commit_wait_sleep_in_crit_cntr"
+	Set gtmtypes("shm_snapshot_t",453,"off")=7908
 	Set gtmtypes("shm_snapshot_t",453,"len")=4
 	Set gtmtypes("shm_snapshot_t",453,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_search_blk_cntr")=453
-	Set gtmtypes("shm_snapshot_t",454,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_new_rec_cntr"
-	Set gtmtypes("shm_snapshot_t",454,"off")=7948
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.phase2_commit_wait_sleep_in_crit_cntr")=453
+	Set gtmtypes("shm_snapshot_t",454,"name")="shm_snapshot_t.shadow_file_header.phase2_commit_wait_sleep_no_crit_cntr"
+	Set gtmtypes("shm_snapshot_t",454,"off")=7912
 	Set gtmtypes("shm_snapshot_t",454,"len")=4
 	Set gtmtypes("shm_snapshot_t",454,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_new_rec_cntr")=454
-	Set gtmtypes("shm_snapshot_t",455,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_rec_size_cntr"
-	Set gtmtypes("shm_snapshot_t",455,"off")=7952
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.phase2_commit_wait_sleep_no_crit_cntr")=454
+	Set gtmtypes("shm_snapshot_t",455,"name")="shm_snapshot_t.shadow_file_header.phase2_commit_wait_pidcnt_cntr"
+	Set gtmtypes("shm_snapshot_t",455,"off")=7916
 	Set gtmtypes("shm_snapshot_t",455,"len")=4
 	Set gtmtypes("shm_snapshot_t",455,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_rec_size_cntr")=455
-	Set gtmtypes("shm_snapshot_t",456,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_rec_cmpc_cntr"
-	Set gtmtypes("shm_snapshot_t",456,"off")=7956
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.phase2_commit_wait_pidcnt_cntr")=455
+	Set gtmtypes("shm_snapshot_t",456,"name")="shm_snapshot_t.shadow_file_header.wcb_t_end_sysops_intend_wait_cntr"
+	Set gtmtypes("shm_snapshot_t",456,"off")=7920
 	Set gtmtypes("shm_snapshot_t",456,"len")=4
 	Set gtmtypes("shm_snapshot_t",456,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_rec_cmpc_cntr")=456
-	Set gtmtypes("shm_snapshot_t",457,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_blk_fini_cntr"
-	Set gtmtypes("shm_snapshot_t",457,"off")=7960
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_t_end_sysops_intend_wait_cntr")=456
+	Set gtmtypes("shm_snapshot_t",457,"name")="shm_snapshot_t.shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_cntr"
+	Set gtmtypes("shm_snapshot_t",457,"off")=7924
 	Set gtmtypes("shm_snapshot_t",457,"len")=4
 	Set gtmtypes("shm_snapshot_t",457,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_blk_fini_cntr")=457
-	Set gtmtypes("shm_snapshot_t",458,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_blk_split_cntr"
-	Set gtmtypes("shm_snapshot_t",458,"off")=7964
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_cntr")=457
+	Set gtmtypes("shm_snapshot_t",458,"name")="shm_snapshot_t.shadow_file_header.wcb_phase2_commit_wait_cntr"
+	Set gtmtypes("shm_snapshot_t",458,"off")=7928
 	Set gtmtypes("shm_snapshot_t",458,"len")=4
 	Set gtmtypes("shm_snapshot_t",458,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_blk_split_cntr")=458
-	Set gtmtypes("shm_snapshot_t",459,"name")="shm_snapshot_t.shadow_file_header.t_qread_ripsleep_cnt_cntr"
-	Set gtmtypes("shm_snapshot_t",459,"off")=7968
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcb_phase2_commit_wait_cntr")=458
+	Set gtmtypes("shm_snapshot_t",459,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_calls_cntr"
+	Set gtmtypes("shm_snapshot_t",459,"off")=7932
 	Set gtmtypes("shm_snapshot_t",459,"len")=4
 	Set gtmtypes("shm_snapshot_t",459,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_ripsleep_cnt_cntr")=459
-	Set gtmtypes("shm_snapshot_t",460,"name")="shm_snapshot_t.shadow_file_header.t_qread_ripsleep_nblks_cntr"
-	Set gtmtypes("shm_snapshot_t",460,"off")=7972
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_calls_cntr")=459
+	Set gtmtypes("shm_snapshot_t",460,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_rip_cntr"
+	Set gtmtypes("shm_snapshot_t",460,"off")=7936
 	Set gtmtypes("shm_snapshot_t",460,"len")=4
 	Set gtmtypes("shm_snapshot_t",460,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_ripsleep_nblks_cntr")=460
-	Set gtmtypes("shm_snapshot_t",461,"name")="shm_snapshot_t.shadow_file_header.bg_trc_rec_cntr_filler"
-	Set gtmtypes("shm_snapshot_t",461,"off")=7976
-	Set gtmtypes("shm_snapshot_t",461,"len")=56
-	Set gtmtypes("shm_snapshot_t",461,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bg_trc_rec_cntr_filler")=461
-	Set gtmtypes("shm_snapshot_t",462,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srches"
-	Set gtmtypes("shm_snapshot_t",462,"off")=8032
-	Set gtmtypes("shm_snapshot_t",462,"len")=8
-	Set gtmtypes("shm_snapshot_t",462,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srches")=462
-	Set gtmtypes("shm_snapshot_t",463,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srches.curr_count"
-	Set gtmtypes("shm_snapshot_t",463,"off")=8032
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_rip_cntr")=460
+	Set gtmtypes("shm_snapshot_t",461,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_in_tend_cntr"
+	Set gtmtypes("shm_snapshot_t",461,"off")=7940
+	Set gtmtypes("shm_snapshot_t",461,"len")=4
+	Set gtmtypes("shm_snapshot_t",461,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_in_tend_cntr")=461
+	Set gtmtypes("shm_snapshot_t",462,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_search_blk_cntr"
+	Set gtmtypes("shm_snapshot_t",462,"off")=7944
+	Set gtmtypes("shm_snapshot_t",462,"len")=4
+	Set gtmtypes("shm_snapshot_t",462,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_search_blk_cntr")=462
+	Set gtmtypes("shm_snapshot_t",463,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_new_rec_cntr"
+	Set gtmtypes("shm_snapshot_t",463,"off")=7948
 	Set gtmtypes("shm_snapshot_t",463,"len")=4
 	Set gtmtypes("shm_snapshot_t",463,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srches.curr_count")=463
-	Set gtmtypes("shm_snapshot_t",464,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srches.cumul_count"
-	Set gtmtypes("shm_snapshot_t",464,"off")=8036
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_new_rec_cntr")=463
+	Set gtmtypes("shm_snapshot_t",464,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_rec_size_cntr"
+	Set gtmtypes("shm_snapshot_t",464,"off")=7952
 	Set gtmtypes("shm_snapshot_t",464,"len")=4
 	Set gtmtypes("shm_snapshot_t",464,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srches.cumul_count")=464
-	Set gtmtypes("shm_snapshot_t",465,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srch_clues"
-	Set gtmtypes("shm_snapshot_t",465,"off")=8040
-	Set gtmtypes("shm_snapshot_t",465,"len")=8
-	Set gtmtypes("shm_snapshot_t",465,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srch_clues")=465
-	Set gtmtypes("shm_snapshot_t",466,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srch_clues.curr_count"
-	Set gtmtypes("shm_snapshot_t",466,"off")=8040
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_rec_size_cntr")=464
+	Set gtmtypes("shm_snapshot_t",465,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_rec_cmpc_cntr"
+	Set gtmtypes("shm_snapshot_t",465,"off")=7956
+	Set gtmtypes("shm_snapshot_t",465,"len")=4
+	Set gtmtypes("shm_snapshot_t",465,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_rec_cmpc_cntr")=465
+	Set gtmtypes("shm_snapshot_t",466,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_blk_fini_cntr"
+	Set gtmtypes("shm_snapshot_t",466,"off")=7960
 	Set gtmtypes("shm_snapshot_t",466,"len")=4
 	Set gtmtypes("shm_snapshot_t",466,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srch_clues.curr_count")=466
-	Set gtmtypes("shm_snapshot_t",467,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srch_clues.cumul_count"
-	Set gtmtypes("shm_snapshot_t",467,"off")=8044
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_blk_fini_cntr")=466
+	Set gtmtypes("shm_snapshot_t",467,"name")="shm_snapshot_t.shadow_file_header.recompute_upd_array_blk_split_cntr"
+	Set gtmtypes("shm_snapshot_t",467,"off")=7964
 	Set gtmtypes("shm_snapshot_t",467,"len")=4
 	Set gtmtypes("shm_snapshot_t",467,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srch_clues.cumul_count")=467
-	Set gtmtypes("shm_snapshot_t",468,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_head"
-	Set gtmtypes("shm_snapshot_t",468,"off")=8048
-	Set gtmtypes("shm_snapshot_t",468,"len")=8
-	Set gtmtypes("shm_snapshot_t",468,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_head")=468
-	Set gtmtypes("shm_snapshot_t",469,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_head.curr_count"
-	Set gtmtypes("shm_snapshot_t",469,"off")=8048
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.recompute_upd_array_blk_split_cntr")=467
+	Set gtmtypes("shm_snapshot_t",468,"name")="shm_snapshot_t.shadow_file_header.t_qread_ripsleep_cnt_cntr"
+	Set gtmtypes("shm_snapshot_t",468,"off")=7968
+	Set gtmtypes("shm_snapshot_t",468,"len")=4
+	Set gtmtypes("shm_snapshot_t",468,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_ripsleep_cnt_cntr")=468
+	Set gtmtypes("shm_snapshot_t",469,"name")="shm_snapshot_t.shadow_file_header.t_qread_ripsleep_nblks_cntr"
+	Set gtmtypes("shm_snapshot_t",469,"off")=7972
 	Set gtmtypes("shm_snapshot_t",469,"len")=4
 	Set gtmtypes("shm_snapshot_t",469,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_head.curr_count")=469
-	Set gtmtypes("shm_snapshot_t",470,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_head.cumul_count"
-	Set gtmtypes("shm_snapshot_t",470,"off")=8052
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.t_qread_ripsleep_nblks_cntr")=469
+	Set gtmtypes("shm_snapshot_t",470,"name")="shm_snapshot_t.shadow_file_header.wcs_wtfini_invoked_cntr"
+	Set gtmtypes("shm_snapshot_t",470,"off")=7976
 	Set gtmtypes("shm_snapshot_t",470,"len")=4
 	Set gtmtypes("shm_snapshot_t",470,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_head.cumul_count")=470
-	Set gtmtypes("shm_snapshot_t",471,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_same"
-	Set gtmtypes("shm_snapshot_t",471,"off")=8056
-	Set gtmtypes("shm_snapshot_t",471,"len")=8
-	Set gtmtypes("shm_snapshot_t",471,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_same")=471
-	Set gtmtypes("shm_snapshot_t",472,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_same.curr_count"
-	Set gtmtypes("shm_snapshot_t",472,"off")=8056
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wtfini_invoked_cntr")=470
+	Set gtmtypes("shm_snapshot_t",471,"name")="shm_snapshot_t.shadow_file_header.wcs_wterror_invoked_cntr"
+	Set gtmtypes("shm_snapshot_t",471,"off")=7980
+	Set gtmtypes("shm_snapshot_t",471,"len")=4
+	Set gtmtypes("shm_snapshot_t",471,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wterror_invoked_cntr")=471
+	Set gtmtypes("shm_snapshot_t",472,"name")="shm_snapshot_t.shadow_file_header.wcs_wt_restart_invoked_cntr"
+	Set gtmtypes("shm_snapshot_t",472,"off")=7984
 	Set gtmtypes("shm_snapshot_t",472,"len")=4
 	Set gtmtypes("shm_snapshot_t",472,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_same.curr_count")=472
-	Set gtmtypes("shm_snapshot_t",473,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_same.cumul_count"
-	Set gtmtypes("shm_snapshot_t",473,"off")=8060
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wt_restart_invoked_cntr")=472
+	Set gtmtypes("shm_snapshot_t",473,"name")="shm_snapshot_t.shadow_file_header.wcs_wt_restart_eagain_cntr"
+	Set gtmtypes("shm_snapshot_t",473,"off")=7988
 	Set gtmtypes("shm_snapshot_t",473,"len")=4
 	Set gtmtypes("shm_snapshot_t",473,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_same.cumul_count")=473
-	Set gtmtypes("shm_snapshot_t",474,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_tail"
-	Set gtmtypes("shm_snapshot_t",474,"off")=8064
-	Set gtmtypes("shm_snapshot_t",474,"len")=8
-	Set gtmtypes("shm_snapshot_t",474,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_tail")=474
-	Set gtmtypes("shm_snapshot_t",475,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_tail.curr_count"
-	Set gtmtypes("shm_snapshot_t",475,"off")=8064
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wt_restart_eagain_cntr")=473
+	Set gtmtypes("shm_snapshot_t",474,"name")="shm_snapshot_t.shadow_file_header.wcs_wt_restart_reinsert_cntr"
+	Set gtmtypes("shm_snapshot_t",474,"off")=7992
+	Set gtmtypes("shm_snapshot_t",474,"len")=4
+	Set gtmtypes("shm_snapshot_t",474,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wt_restart_reinsert_cntr")=474
+	Set gtmtypes("shm_snapshot_t",475,"name")="shm_snapshot_t.shadow_file_header.wcs_wtstart_eagain_cntr"
+	Set gtmtypes("shm_snapshot_t",475,"off")=7996
 	Set gtmtypes("shm_snapshot_t",475,"len")=4
 	Set gtmtypes("shm_snapshot_t",475,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_tail.curr_count")=475
-	Set gtmtypes("shm_snapshot_t",476,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_tail.cumul_count"
-	Set gtmtypes("shm_snapshot_t",476,"off")=8068
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wtstart_eagain_cntr")=475
+	Set gtmtypes("shm_snapshot_t",476,"name")="shm_snapshot_t.shadow_file_header.wcs_wtstart_eagain_incrit_cntr"
+	Set gtmtypes("shm_snapshot_t",476,"off")=8000
 	Set gtmtypes("shm_snapshot_t",476,"len")=4
 	Set gtmtypes("shm_snapshot_t",476,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_tail.cumul_count")=476
-	Set gtmtypes("shm_snapshot_t",477,"name")="shm_snapshot_t.shadow_file_header.n_t_qreads"
-	Set gtmtypes("shm_snapshot_t",477,"off")=8072
-	Set gtmtypes("shm_snapshot_t",477,"len")=8
-	Set gtmtypes("shm_snapshot_t",477,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_t_qreads")=477
-	Set gtmtypes("shm_snapshot_t",478,"name")="shm_snapshot_t.shadow_file_header.n_t_qreads.curr_count"
-	Set gtmtypes("shm_snapshot_t",478,"off")=8072
-	Set gtmtypes("shm_snapshot_t",478,"len")=4
-	Set gtmtypes("shm_snapshot_t",478,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_t_qreads.curr_count")=478
-	Set gtmtypes("shm_snapshot_t",479,"name")="shm_snapshot_t.shadow_file_header.n_t_qreads.cumul_count"
-	Set gtmtypes("shm_snapshot_t",479,"off")=8076
-	Set gtmtypes("shm_snapshot_t",479,"len")=4
-	Set gtmtypes("shm_snapshot_t",479,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_t_qreads.cumul_count")=479
-	Set gtmtypes("shm_snapshot_t",480,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_reads"
-	Set gtmtypes("shm_snapshot_t",480,"off")=8080
-	Set gtmtypes("shm_snapshot_t",480,"len")=8
-	Set gtmtypes("shm_snapshot_t",480,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_reads")=480
-	Set gtmtypes("shm_snapshot_t",481,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_reads.curr_count"
-	Set gtmtypes("shm_snapshot_t",481,"off")=8080
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.wcs_wtstart_eagain_incrit_cntr")=476
+	Set gtmtypes("shm_snapshot_t",477,"name")="shm_snapshot_t.shadow_file_header.async_restart_eagain_cntr"
+	Set gtmtypes("shm_snapshot_t",477,"off")=8004
+	Set gtmtypes("shm_snapshot_t",477,"len")=4
+	Set gtmtypes("shm_snapshot_t",477,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.async_restart_eagain_cntr")=477
+	Set gtmtypes("shm_snapshot_t",478,"name")="shm_snapshot_t.shadow_file_header.bg_trc_rec_cntr_filler"
+	Set gtmtypes("shm_snapshot_t",478,"off")=8008
+	Set gtmtypes("shm_snapshot_t",478,"len")=24
+	Set gtmtypes("shm_snapshot_t",478,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.bg_trc_rec_cntr_filler")=478
+	Set gtmtypes("shm_snapshot_t",479,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srches"
+	Set gtmtypes("shm_snapshot_t",479,"off")=8032
+	Set gtmtypes("shm_snapshot_t",479,"len")=8
+	Set gtmtypes("shm_snapshot_t",479,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srches")=479
+	Set gtmtypes("shm_snapshot_t",480,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srches.curr_count"
+	Set gtmtypes("shm_snapshot_t",480,"off")=8032
+	Set gtmtypes("shm_snapshot_t",480,"len")=4
+	Set gtmtypes("shm_snapshot_t",480,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srches.curr_count")=480
+	Set gtmtypes("shm_snapshot_t",481,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srches.cumul_count"
+	Set gtmtypes("shm_snapshot_t",481,"off")=8036
 	Set gtmtypes("shm_snapshot_t",481,"len")=4
 	Set gtmtypes("shm_snapshot_t",481,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_reads.curr_count")=481
-	Set gtmtypes("shm_snapshot_t",482,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_reads.cumul_count"
-	Set gtmtypes("shm_snapshot_t",482,"off")=8084
-	Set gtmtypes("shm_snapshot_t",482,"len")=4
-	Set gtmtypes("shm_snapshot_t",482,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_reads.cumul_count")=482
-	Set gtmtypes("shm_snapshot_t",483,"name")="shm_snapshot_t.shadow_file_header.n_bgmm_updates"
-	Set gtmtypes("shm_snapshot_t",483,"off")=8088
-	Set gtmtypes("shm_snapshot_t",483,"len")=8
-	Set gtmtypes("shm_snapshot_t",483,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bgmm_updates")=483
-	Set gtmtypes("shm_snapshot_t",484,"name")="shm_snapshot_t.shadow_file_header.n_bgmm_updates.curr_count"
-	Set gtmtypes("shm_snapshot_t",484,"off")=8088
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srches.cumul_count")=481
+	Set gtmtypes("shm_snapshot_t",482,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srch_clues"
+	Set gtmtypes("shm_snapshot_t",482,"off")=8040
+	Set gtmtypes("shm_snapshot_t",482,"len")=8
+	Set gtmtypes("shm_snapshot_t",482,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srch_clues")=482
+	Set gtmtypes("shm_snapshot_t",483,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srch_clues.curr_count"
+	Set gtmtypes("shm_snapshot_t",483,"off")=8040
+	Set gtmtypes("shm_snapshot_t",483,"len")=4
+	Set gtmtypes("shm_snapshot_t",483,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srch_clues.curr_count")=483
+	Set gtmtypes("shm_snapshot_t",484,"name")="shm_snapshot_t.shadow_file_header.n_gvcst_srch_clues.cumul_count"
+	Set gtmtypes("shm_snapshot_t",484,"off")=8044
 	Set gtmtypes("shm_snapshot_t",484,"len")=4
 	Set gtmtypes("shm_snapshot_t",484,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bgmm_updates.curr_count")=484
-	Set gtmtypes("shm_snapshot_t",485,"name")="shm_snapshot_t.shadow_file_header.n_bgmm_updates.cumul_count"
-	Set gtmtypes("shm_snapshot_t",485,"off")=8092
-	Set gtmtypes("shm_snapshot_t",485,"len")=4
-	Set gtmtypes("shm_snapshot_t",485,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bgmm_updates.cumul_count")=485
-	Set gtmtypes("shm_snapshot_t",486,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_writes"
-	Set gtmtypes("shm_snapshot_t",486,"off")=8096
-	Set gtmtypes("shm_snapshot_t",486,"len")=8
-	Set gtmtypes("shm_snapshot_t",486,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_writes")=486
-	Set gtmtypes("shm_snapshot_t",487,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_writes.curr_count"
-	Set gtmtypes("shm_snapshot_t",487,"off")=8096
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_gvcst_srch_clues.cumul_count")=484
+	Set gtmtypes("shm_snapshot_t",485,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_head"
+	Set gtmtypes("shm_snapshot_t",485,"off")=8048
+	Set gtmtypes("shm_snapshot_t",485,"len")=8
+	Set gtmtypes("shm_snapshot_t",485,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_head")=485
+	Set gtmtypes("shm_snapshot_t",486,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_head.curr_count"
+	Set gtmtypes("shm_snapshot_t",486,"off")=8048
+	Set gtmtypes("shm_snapshot_t",486,"len")=4
+	Set gtmtypes("shm_snapshot_t",486,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_head.curr_count")=486
+	Set gtmtypes("shm_snapshot_t",487,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_head.cumul_count"
+	Set gtmtypes("shm_snapshot_t",487,"off")=8052
 	Set gtmtypes("shm_snapshot_t",487,"len")=4
 	Set gtmtypes("shm_snapshot_t",487,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_writes.curr_count")=487
-	Set gtmtypes("shm_snapshot_t",488,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_writes.cumul_count"
-	Set gtmtypes("shm_snapshot_t",488,"off")=8100
-	Set gtmtypes("shm_snapshot_t",488,"len")=4
-	Set gtmtypes("shm_snapshot_t",488,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_writes.cumul_count")=488
-	Set gtmtypes("shm_snapshot_t",489,"name")="shm_snapshot_t.shadow_file_header.n_bg_update_creates"
-	Set gtmtypes("shm_snapshot_t",489,"off")=8104
-	Set gtmtypes("shm_snapshot_t",489,"len")=8
-	Set gtmtypes("shm_snapshot_t",489,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bg_update_creates")=489
-	Set gtmtypes("shm_snapshot_t",490,"name")="shm_snapshot_t.shadow_file_header.n_bg_update_creates.curr_count"
-	Set gtmtypes("shm_snapshot_t",490,"off")=8104
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_head.cumul_count")=487
+	Set gtmtypes("shm_snapshot_t",488,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_same"
+	Set gtmtypes("shm_snapshot_t",488,"off")=8056
+	Set gtmtypes("shm_snapshot_t",488,"len")=8
+	Set gtmtypes("shm_snapshot_t",488,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_same")=488
+	Set gtmtypes("shm_snapshot_t",489,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_same.curr_count"
+	Set gtmtypes("shm_snapshot_t",489,"off")=8056
+	Set gtmtypes("shm_snapshot_t",489,"len")=4
+	Set gtmtypes("shm_snapshot_t",489,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_same.curr_count")=489
+	Set gtmtypes("shm_snapshot_t",490,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_same.cumul_count"
+	Set gtmtypes("shm_snapshot_t",490,"off")=8060
 	Set gtmtypes("shm_snapshot_t",490,"len")=4
 	Set gtmtypes("shm_snapshot_t",490,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bg_update_creates.curr_count")=490
-	Set gtmtypes("shm_snapshot_t",491,"name")="shm_snapshot_t.shadow_file_header.n_bg_update_creates.cumul_count"
-	Set gtmtypes("shm_snapshot_t",491,"off")=8108
-	Set gtmtypes("shm_snapshot_t",491,"len")=4
-	Set gtmtypes("shm_snapshot_t",491,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bg_update_creates.cumul_count")=491
-	Set gtmtypes("shm_snapshot_t",492,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getns"
-	Set gtmtypes("shm_snapshot_t",492,"off")=8112
-	Set gtmtypes("shm_snapshot_t",492,"len")=8
-	Set gtmtypes("shm_snapshot_t",492,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getns")=492
-	Set gtmtypes("shm_snapshot_t",493,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getns.curr_count"
-	Set gtmtypes("shm_snapshot_t",493,"off")=8112
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_same.cumul_count")=490
+	Set gtmtypes("shm_snapshot_t",491,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_tail"
+	Set gtmtypes("shm_snapshot_t",491,"off")=8064
+	Set gtmtypes("shm_snapshot_t",491,"len")=8
+	Set gtmtypes("shm_snapshot_t",491,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_tail")=491
+	Set gtmtypes("shm_snapshot_t",492,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_tail.curr_count"
+	Set gtmtypes("shm_snapshot_t",492,"off")=8064
+	Set gtmtypes("shm_snapshot_t",492,"len")=4
+	Set gtmtypes("shm_snapshot_t",492,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_tail.curr_count")=492
+	Set gtmtypes("shm_snapshot_t",493,"name")="shm_snapshot_t.shadow_file_header.n_clue_used_tail.cumul_count"
+	Set gtmtypes("shm_snapshot_t",493,"off")=8068
 	Set gtmtypes("shm_snapshot_t",493,"len")=4
 	Set gtmtypes("shm_snapshot_t",493,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getns.curr_count")=493
-	Set gtmtypes("shm_snapshot_t",494,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getns.cumul_count"
-	Set gtmtypes("shm_snapshot_t",494,"off")=8116
-	Set gtmtypes("shm_snapshot_t",494,"len")=4
-	Set gtmtypes("shm_snapshot_t",494,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getns.cumul_count")=494
-	Set gtmtypes("shm_snapshot_t",495,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getn_lcnt"
-	Set gtmtypes("shm_snapshot_t",495,"off")=8120
-	Set gtmtypes("shm_snapshot_t",495,"len")=8
-	Set gtmtypes("shm_snapshot_t",495,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getn_lcnt")=495
-	Set gtmtypes("shm_snapshot_t",496,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getn_lcnt.curr_count"
-	Set gtmtypes("shm_snapshot_t",496,"off")=8120
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_clue_used_tail.cumul_count")=493
+	Set gtmtypes("shm_snapshot_t",494,"name")="shm_snapshot_t.shadow_file_header.n_t_qreads"
+	Set gtmtypes("shm_snapshot_t",494,"off")=8072
+	Set gtmtypes("shm_snapshot_t",494,"len")=8
+	Set gtmtypes("shm_snapshot_t",494,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_t_qreads")=494
+	Set gtmtypes("shm_snapshot_t",495,"name")="shm_snapshot_t.shadow_file_header.n_t_qreads.curr_count"
+	Set gtmtypes("shm_snapshot_t",495,"off")=8072
+	Set gtmtypes("shm_snapshot_t",495,"len")=4
+	Set gtmtypes("shm_snapshot_t",495,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_t_qreads.curr_count")=495
+	Set gtmtypes("shm_snapshot_t",496,"name")="shm_snapshot_t.shadow_file_header.n_t_qreads.cumul_count"
+	Set gtmtypes("shm_snapshot_t",496,"off")=8076
 	Set gtmtypes("shm_snapshot_t",496,"len")=4
 	Set gtmtypes("shm_snapshot_t",496,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getn_lcnt.curr_count")=496
-	Set gtmtypes("shm_snapshot_t",497,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getn_lcnt.cumul_count"
-	Set gtmtypes("shm_snapshot_t",497,"off")=8124
-	Set gtmtypes("shm_snapshot_t",497,"len")=4
-	Set gtmtypes("shm_snapshot_t",497,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getn_lcnt.cumul_count")=497
-	Set gtmtypes("shm_snapshot_t",498,"name")="shm_snapshot_t.shadow_file_header.db_csh_acct_rec_filler_4k"
-	Set gtmtypes("shm_snapshot_t",498,"off")=8128
-	Set gtmtypes("shm_snapshot_t",498,"len")=152
-	Set gtmtypes("shm_snapshot_t",498,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_acct_rec_filler_4k")=498
-	Set gtmtypes("shm_snapshot_t",499,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec"
-	Set gtmtypes("shm_snapshot_t",499,"off")=8280
-	Set gtmtypes("shm_snapshot_t",499,"len")=464
-	Set gtmtypes("shm_snapshot_t",499,"type")="gvstats_rec_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec")=499
-	Set gtmtypes("shm_snapshot_t",500,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_set"
-	Set gtmtypes("shm_snapshot_t",500,"off")=8280
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_t_qreads.cumul_count")=496
+	Set gtmtypes("shm_snapshot_t",497,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_reads"
+	Set gtmtypes("shm_snapshot_t",497,"off")=8080
+	Set gtmtypes("shm_snapshot_t",497,"len")=8
+	Set gtmtypes("shm_snapshot_t",497,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_reads")=497
+	Set gtmtypes("shm_snapshot_t",498,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_reads.curr_count"
+	Set gtmtypes("shm_snapshot_t",498,"off")=8080
+	Set gtmtypes("shm_snapshot_t",498,"len")=4
+	Set gtmtypes("shm_snapshot_t",498,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_reads.curr_count")=498
+	Set gtmtypes("shm_snapshot_t",499,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_reads.cumul_count"
+	Set gtmtypes("shm_snapshot_t",499,"off")=8084
+	Set gtmtypes("shm_snapshot_t",499,"len")=4
+	Set gtmtypes("shm_snapshot_t",499,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_reads.cumul_count")=499
+	Set gtmtypes("shm_snapshot_t",500,"name")="shm_snapshot_t.shadow_file_header.n_bgmm_updates"
+	Set gtmtypes("shm_snapshot_t",500,"off")=8088
 	Set gtmtypes("shm_snapshot_t",500,"len")=8
-	Set gtmtypes("shm_snapshot_t",500,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_set")=500
-	Set gtmtypes("shm_snapshot_t",501,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_kill"
-	Set gtmtypes("shm_snapshot_t",501,"off")=8288
-	Set gtmtypes("shm_snapshot_t",501,"len")=8
-	Set gtmtypes("shm_snapshot_t",501,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_kill")=501
-	Set gtmtypes("shm_snapshot_t",502,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_get"
-	Set gtmtypes("shm_snapshot_t",502,"off")=8296
-	Set gtmtypes("shm_snapshot_t",502,"len")=8
-	Set gtmtypes("shm_snapshot_t",502,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_get")=502
-	Set gtmtypes("shm_snapshot_t",503,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_data"
-	Set gtmtypes("shm_snapshot_t",503,"off")=8304
+	Set gtmtypes("shm_snapshot_t",500,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bgmm_updates")=500
+	Set gtmtypes("shm_snapshot_t",501,"name")="shm_snapshot_t.shadow_file_header.n_bgmm_updates.curr_count"
+	Set gtmtypes("shm_snapshot_t",501,"off")=8088
+	Set gtmtypes("shm_snapshot_t",501,"len")=4
+	Set gtmtypes("shm_snapshot_t",501,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bgmm_updates.curr_count")=501
+	Set gtmtypes("shm_snapshot_t",502,"name")="shm_snapshot_t.shadow_file_header.n_bgmm_updates.cumul_count"
+	Set gtmtypes("shm_snapshot_t",502,"off")=8092
+	Set gtmtypes("shm_snapshot_t",502,"len")=4
+	Set gtmtypes("shm_snapshot_t",502,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bgmm_updates.cumul_count")=502
+	Set gtmtypes("shm_snapshot_t",503,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_writes"
+	Set gtmtypes("shm_snapshot_t",503,"off")=8096
 	Set gtmtypes("shm_snapshot_t",503,"len")=8
-	Set gtmtypes("shm_snapshot_t",503,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_data")=503
-	Set gtmtypes("shm_snapshot_t",504,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_order"
-	Set gtmtypes("shm_snapshot_t",504,"off")=8312
-	Set gtmtypes("shm_snapshot_t",504,"len")=8
-	Set gtmtypes("shm_snapshot_t",504,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_order")=504
-	Set gtmtypes("shm_snapshot_t",505,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_zprev"
-	Set gtmtypes("shm_snapshot_t",505,"off")=8320
-	Set gtmtypes("shm_snapshot_t",505,"len")=8
-	Set gtmtypes("shm_snapshot_t",505,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_zprev")=505
-	Set gtmtypes("shm_snapshot_t",506,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_query"
-	Set gtmtypes("shm_snapshot_t",506,"off")=8328
+	Set gtmtypes("shm_snapshot_t",503,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_writes")=503
+	Set gtmtypes("shm_snapshot_t",504,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_writes.curr_count"
+	Set gtmtypes("shm_snapshot_t",504,"off")=8096
+	Set gtmtypes("shm_snapshot_t",504,"len")=4
+	Set gtmtypes("shm_snapshot_t",504,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_writes.curr_count")=504
+	Set gtmtypes("shm_snapshot_t",505,"name")="shm_snapshot_t.shadow_file_header.unused_dsk_writes.cumul_count"
+	Set gtmtypes("shm_snapshot_t",505,"off")=8100
+	Set gtmtypes("shm_snapshot_t",505,"len")=4
+	Set gtmtypes("shm_snapshot_t",505,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.unused_dsk_writes.cumul_count")=505
+	Set gtmtypes("shm_snapshot_t",506,"name")="shm_snapshot_t.shadow_file_header.n_bg_update_creates"
+	Set gtmtypes("shm_snapshot_t",506,"off")=8104
 	Set gtmtypes("shm_snapshot_t",506,"len")=8
-	Set gtmtypes("shm_snapshot_t",506,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_query")=506
-	Set gtmtypes("shm_snapshot_t",507,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_lock_success"
-	Set gtmtypes("shm_snapshot_t",507,"off")=8336
-	Set gtmtypes("shm_snapshot_t",507,"len")=8
-	Set gtmtypes("shm_snapshot_t",507,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_lock_success")=507
-	Set gtmtypes("shm_snapshot_t",508,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_lock_fail"
-	Set gtmtypes("shm_snapshot_t",508,"off")=8344
-	Set gtmtypes("shm_snapshot_t",508,"len")=8
-	Set gtmtypes("shm_snapshot_t",508,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_lock_fail")=508
-	Set gtmtypes("shm_snapshot_t",509,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.db_curr_tn"
-	Set gtmtypes("shm_snapshot_t",509,"off")=8352
+	Set gtmtypes("shm_snapshot_t",506,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bg_update_creates")=506
+	Set gtmtypes("shm_snapshot_t",507,"name")="shm_snapshot_t.shadow_file_header.n_bg_update_creates.curr_count"
+	Set gtmtypes("shm_snapshot_t",507,"off")=8104
+	Set gtmtypes("shm_snapshot_t",507,"len")=4
+	Set gtmtypes("shm_snapshot_t",507,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bg_update_creates.curr_count")=507
+	Set gtmtypes("shm_snapshot_t",508,"name")="shm_snapshot_t.shadow_file_header.n_bg_update_creates.cumul_count"
+	Set gtmtypes("shm_snapshot_t",508,"off")=8108
+	Set gtmtypes("shm_snapshot_t",508,"len")=4
+	Set gtmtypes("shm_snapshot_t",508,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_bg_update_creates.cumul_count")=508
+	Set gtmtypes("shm_snapshot_t",509,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getns"
+	Set gtmtypes("shm_snapshot_t",509,"off")=8112
 	Set gtmtypes("shm_snapshot_t",509,"len")=8
-	Set gtmtypes("shm_snapshot_t",509,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.db_curr_tn")=509
-	Set gtmtypes("shm_snapshot_t",510,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_dsk_read"
-	Set gtmtypes("shm_snapshot_t",510,"off")=8360
-	Set gtmtypes("shm_snapshot_t",510,"len")=8
-	Set gtmtypes("shm_snapshot_t",510,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_dsk_read")=510
-	Set gtmtypes("shm_snapshot_t",511,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_dsk_write"
-	Set gtmtypes("shm_snapshot_t",511,"off")=8368
-	Set gtmtypes("shm_snapshot_t",511,"len")=8
-	Set gtmtypes("shm_snapshot_t",511,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_dsk_write")=511
-	Set gtmtypes("shm_snapshot_t",512,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_readwrite"
-	Set gtmtypes("shm_snapshot_t",512,"off")=8376
+	Set gtmtypes("shm_snapshot_t",509,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getns")=509
+	Set gtmtypes("shm_snapshot_t",510,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getns.curr_count"
+	Set gtmtypes("shm_snapshot_t",510,"off")=8112
+	Set gtmtypes("shm_snapshot_t",510,"len")=4
+	Set gtmtypes("shm_snapshot_t",510,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getns.curr_count")=510
+	Set gtmtypes("shm_snapshot_t",511,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getns.cumul_count"
+	Set gtmtypes("shm_snapshot_t",511,"off")=8116
+	Set gtmtypes("shm_snapshot_t",511,"len")=4
+	Set gtmtypes("shm_snapshot_t",511,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getns.cumul_count")=511
+	Set gtmtypes("shm_snapshot_t",512,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getn_lcnt"
+	Set gtmtypes("shm_snapshot_t",512,"off")=8120
 	Set gtmtypes("shm_snapshot_t",512,"len")=8
-	Set gtmtypes("shm_snapshot_t",512,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_readwrite")=512
-	Set gtmtypes("shm_snapshot_t",513,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_readonly"
-	Set gtmtypes("shm_snapshot_t",513,"off")=8384
-	Set gtmtypes("shm_snapshot_t",513,"len")=8
-	Set gtmtypes("shm_snapshot_t",513,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_readonly")=513
-	Set gtmtypes("shm_snapshot_t",514,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_blkwrite"
-	Set gtmtypes("shm_snapshot_t",514,"off")=8392
-	Set gtmtypes("shm_snapshot_t",514,"len")=8
-	Set gtmtypes("shm_snapshot_t",514,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_blkwrite")=514
-	Set gtmtypes("shm_snapshot_t",515,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_blkread"
-	Set gtmtypes("shm_snapshot_t",515,"off")=8400
-	Set gtmtypes("shm_snapshot_t",515,"len")=8
-	Set gtmtypes("shm_snapshot_t",515,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_blkread")=515
-	Set gtmtypes("shm_snapshot_t",516,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_retries_0"
-	Set gtmtypes("shm_snapshot_t",516,"off")=8408
-	Set gtmtypes("shm_snapshot_t",516,"len")=8
-	Set gtmtypes("shm_snapshot_t",516,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_retries_0")=516
-	Set gtmtypes("shm_snapshot_t",517,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_retries_1"
-	Set gtmtypes("shm_snapshot_t",517,"off")=8416
+	Set gtmtypes("shm_snapshot_t",512,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getn_lcnt")=512
+	Set gtmtypes("shm_snapshot_t",513,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getn_lcnt.curr_count"
+	Set gtmtypes("shm_snapshot_t",513,"off")=8120
+	Set gtmtypes("shm_snapshot_t",513,"len")=4
+	Set gtmtypes("shm_snapshot_t",513,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getn_lcnt.curr_count")=513
+	Set gtmtypes("shm_snapshot_t",514,"name")="shm_snapshot_t.shadow_file_header.n_db_csh_getn_lcnt.cumul_count"
+	Set gtmtypes("shm_snapshot_t",514,"off")=8124
+	Set gtmtypes("shm_snapshot_t",514,"len")=4
+	Set gtmtypes("shm_snapshot_t",514,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.n_db_csh_getn_lcnt.cumul_count")=514
+	Set gtmtypes("shm_snapshot_t",515,"name")="shm_snapshot_t.shadow_file_header.db_csh_acct_rec_filler_4k"
+	Set gtmtypes("shm_snapshot_t",515,"off")=8128
+	Set gtmtypes("shm_snapshot_t",515,"len")=152
+	Set gtmtypes("shm_snapshot_t",515,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_csh_acct_rec_filler_4k")=515
+	Set gtmtypes("shm_snapshot_t",516,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec"
+	Set gtmtypes("shm_snapshot_t",516,"off")=8280
+	Set gtmtypes("shm_snapshot_t",516,"len")=472
+	Set gtmtypes("shm_snapshot_t",516,"type")="gvstats_rec_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec")=516
+	Set gtmtypes("shm_snapshot_t",517,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_set"
+	Set gtmtypes("shm_snapshot_t",517,"off")=8280
 	Set gtmtypes("shm_snapshot_t",517,"len")=8
 	Set gtmtypes("shm_snapshot_t",517,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_retries_1")=517
-	Set gtmtypes("shm_snapshot_t",518,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_retries_2"
-	Set gtmtypes("shm_snapshot_t",518,"off")=8424
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_set")=517
+	Set gtmtypes("shm_snapshot_t",518,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_kill"
+	Set gtmtypes("shm_snapshot_t",518,"off")=8288
 	Set gtmtypes("shm_snapshot_t",518,"len")=8
 	Set gtmtypes("shm_snapshot_t",518,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_retries_2")=518
-	Set gtmtypes("shm_snapshot_t",519,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_retries_3"
-	Set gtmtypes("shm_snapshot_t",519,"off")=8432
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_kill")=518
+	Set gtmtypes("shm_snapshot_t",519,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_get"
+	Set gtmtypes("shm_snapshot_t",519,"off")=8296
 	Set gtmtypes("shm_snapshot_t",519,"len")=8
 	Set gtmtypes("shm_snapshot_t",519,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_retries_3")=519
-	Set gtmtypes("shm_snapshot_t",520,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_readwrite"
-	Set gtmtypes("shm_snapshot_t",520,"off")=8440
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_get")=519
+	Set gtmtypes("shm_snapshot_t",520,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_data"
+	Set gtmtypes("shm_snapshot_t",520,"off")=8304
 	Set gtmtypes("shm_snapshot_t",520,"len")=8
 	Set gtmtypes("shm_snapshot_t",520,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_readwrite")=520
-	Set gtmtypes("shm_snapshot_t",521,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_readonly"
-	Set gtmtypes("shm_snapshot_t",521,"off")=8448
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_data")=520
+	Set gtmtypes("shm_snapshot_t",521,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_order"
+	Set gtmtypes("shm_snapshot_t",521,"off")=8312
 	Set gtmtypes("shm_snapshot_t",521,"len")=8
 	Set gtmtypes("shm_snapshot_t",521,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_readonly")=521
-	Set gtmtypes("shm_snapshot_t",522,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_rolledback"
-	Set gtmtypes("shm_snapshot_t",522,"off")=8456
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_order")=521
+	Set gtmtypes("shm_snapshot_t",522,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_zprev"
+	Set gtmtypes("shm_snapshot_t",522,"off")=8320
 	Set gtmtypes("shm_snapshot_t",522,"len")=8
 	Set gtmtypes("shm_snapshot_t",522,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_rolledback")=522
-	Set gtmtypes("shm_snapshot_t",523,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_blkwrite"
-	Set gtmtypes("shm_snapshot_t",523,"off")=8464
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_zprev")=522
+	Set gtmtypes("shm_snapshot_t",523,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_query"
+	Set gtmtypes("shm_snapshot_t",523,"off")=8328
 	Set gtmtypes("shm_snapshot_t",523,"len")=8
 	Set gtmtypes("shm_snapshot_t",523,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_blkwrite")=523
-	Set gtmtypes("shm_snapshot_t",524,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_blkread"
-	Set gtmtypes("shm_snapshot_t",524,"off")=8472
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_query")=523
+	Set gtmtypes("shm_snapshot_t",524,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_lock_success"
+	Set gtmtypes("shm_snapshot_t",524,"off")=8336
 	Set gtmtypes("shm_snapshot_t",524,"len")=8
 	Set gtmtypes("shm_snapshot_t",524,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_blkread")=524
-	Set gtmtypes("shm_snapshot_t",525,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_tot_retries_0"
-	Set gtmtypes("shm_snapshot_t",525,"off")=8480
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_lock_success")=524
+	Set gtmtypes("shm_snapshot_t",525,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_lock_fail"
+	Set gtmtypes("shm_snapshot_t",525,"off")=8344
 	Set gtmtypes("shm_snapshot_t",525,"len")=8
 	Set gtmtypes("shm_snapshot_t",525,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_tot_retries_0")=525
-	Set gtmtypes("shm_snapshot_t",526,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_tot_retries_1"
-	Set gtmtypes("shm_snapshot_t",526,"off")=8488
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_lock_fail")=525
+	Set gtmtypes("shm_snapshot_t",526,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.db_curr_tn"
+	Set gtmtypes("shm_snapshot_t",526,"off")=8352
 	Set gtmtypes("shm_snapshot_t",526,"len")=8
 	Set gtmtypes("shm_snapshot_t",526,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_tot_retries_1")=526
-	Set gtmtypes("shm_snapshot_t",527,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_tot_retries_2"
-	Set gtmtypes("shm_snapshot_t",527,"off")=8496
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.db_curr_tn")=526
+	Set gtmtypes("shm_snapshot_t",527,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_dsk_read"
+	Set gtmtypes("shm_snapshot_t",527,"off")=8360
 	Set gtmtypes("shm_snapshot_t",527,"len")=8
 	Set gtmtypes("shm_snapshot_t",527,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_tot_retries_2")=527
-	Set gtmtypes("shm_snapshot_t",528,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_tot_retries_3"
-	Set gtmtypes("shm_snapshot_t",528,"off")=8504
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_dsk_read")=527
+	Set gtmtypes("shm_snapshot_t",528,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_dsk_write"
+	Set gtmtypes("shm_snapshot_t",528,"off")=8368
 	Set gtmtypes("shm_snapshot_t",528,"len")=8
 	Set gtmtypes("shm_snapshot_t",528,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_tot_retries_3")=528
-	Set gtmtypes("shm_snapshot_t",529,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_tot_retries_4"
-	Set gtmtypes("shm_snapshot_t",529,"off")=8512
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_dsk_write")=528
+	Set gtmtypes("shm_snapshot_t",529,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_readwrite"
+	Set gtmtypes("shm_snapshot_t",529,"off")=8376
 	Set gtmtypes("shm_snapshot_t",529,"len")=8
 	Set gtmtypes("shm_snapshot_t",529,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_tot_retries_4")=529
-	Set gtmtypes("shm_snapshot_t",530,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_0"
-	Set gtmtypes("shm_snapshot_t",530,"off")=8520
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_readwrite")=529
+	Set gtmtypes("shm_snapshot_t",530,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_readonly"
+	Set gtmtypes("shm_snapshot_t",530,"off")=8384
 	Set gtmtypes("shm_snapshot_t",530,"len")=8
 	Set gtmtypes("shm_snapshot_t",530,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_0")=530
-	Set gtmtypes("shm_snapshot_t",531,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_1"
-	Set gtmtypes("shm_snapshot_t",531,"off")=8528
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_readonly")=530
+	Set gtmtypes("shm_snapshot_t",531,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_blkwrite"
+	Set gtmtypes("shm_snapshot_t",531,"off")=8392
 	Set gtmtypes("shm_snapshot_t",531,"len")=8
 	Set gtmtypes("shm_snapshot_t",531,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_1")=531
-	Set gtmtypes("shm_snapshot_t",532,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_2"
-	Set gtmtypes("shm_snapshot_t",532,"off")=8536
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_blkwrite")=531
+	Set gtmtypes("shm_snapshot_t",532,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_blkread"
+	Set gtmtypes("shm_snapshot_t",532,"off")=8400
 	Set gtmtypes("shm_snapshot_t",532,"len")=8
 	Set gtmtypes("shm_snapshot_t",532,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_2")=532
-	Set gtmtypes("shm_snapshot_t",533,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_3"
-	Set gtmtypes("shm_snapshot_t",533,"off")=8544
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_blkread")=532
+	Set gtmtypes("shm_snapshot_t",533,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_retries_0"
+	Set gtmtypes("shm_snapshot_t",533,"off")=8408
 	Set gtmtypes("shm_snapshot_t",533,"len")=8
 	Set gtmtypes("shm_snapshot_t",533,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_3")=533
-	Set gtmtypes("shm_snapshot_t",534,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_4"
-	Set gtmtypes("shm_snapshot_t",534,"off")=8552
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_retries_0")=533
+	Set gtmtypes("shm_snapshot_t",534,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_retries_1"
+	Set gtmtypes("shm_snapshot_t",534,"off")=8416
 	Set gtmtypes("shm_snapshot_t",534,"len")=8
 	Set gtmtypes("shm_snapshot_t",534,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_4")=534
-	Set gtmtypes("shm_snapshot_t",535,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_ztrigger"
-	Set gtmtypes("shm_snapshot_t",535,"off")=8560
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_retries_1")=534
+	Set gtmtypes("shm_snapshot_t",535,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_retries_2"
+	Set gtmtypes("shm_snapshot_t",535,"off")=8424
 	Set gtmtypes("shm_snapshot_t",535,"len")=8
 	Set gtmtypes("shm_snapshot_t",535,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_ztrigger")=535
-	Set gtmtypes("shm_snapshot_t",536,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_db_flush"
-	Set gtmtypes("shm_snapshot_t",536,"off")=8568
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_retries_2")=535
+	Set gtmtypes("shm_snapshot_t",536,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_nontp_retries_3"
+	Set gtmtypes("shm_snapshot_t",536,"off")=8432
 	Set gtmtypes("shm_snapshot_t",536,"len")=8
 	Set gtmtypes("shm_snapshot_t",536,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_db_flush")=536
-	Set gtmtypes("shm_snapshot_t",537,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_db_fsync"
-	Set gtmtypes("shm_snapshot_t",537,"off")=8576
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_nontp_retries_3")=536
+	Set gtmtypes("shm_snapshot_t",537,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_readwrite"
+	Set gtmtypes("shm_snapshot_t",537,"off")=8440
 	Set gtmtypes("shm_snapshot_t",537,"len")=8
 	Set gtmtypes("shm_snapshot_t",537,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_db_fsync")=537
-	Set gtmtypes("shm_snapshot_t",538,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jnl_flush"
-	Set gtmtypes("shm_snapshot_t",538,"off")=8584
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_readwrite")=537
+	Set gtmtypes("shm_snapshot_t",538,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_readonly"
+	Set gtmtypes("shm_snapshot_t",538,"off")=8448
 	Set gtmtypes("shm_snapshot_t",538,"len")=8
 	Set gtmtypes("shm_snapshot_t",538,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jnl_flush")=538
-	Set gtmtypes("shm_snapshot_t",539,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jnl_fsync"
-	Set gtmtypes("shm_snapshot_t",539,"off")=8592
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_readonly")=538
+	Set gtmtypes("shm_snapshot_t",539,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_rolledback"
+	Set gtmtypes("shm_snapshot_t",539,"off")=8456
 	Set gtmtypes("shm_snapshot_t",539,"len")=8
 	Set gtmtypes("shm_snapshot_t",539,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jnl_fsync")=539
-	Set gtmtypes("shm_snapshot_t",540,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jbuff_bytes"
-	Set gtmtypes("shm_snapshot_t",540,"off")=8600
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_rolledback")=539
+	Set gtmtypes("shm_snapshot_t",540,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_blkwrite"
+	Set gtmtypes("shm_snapshot_t",540,"off")=8464
 	Set gtmtypes("shm_snapshot_t",540,"len")=8
 	Set gtmtypes("shm_snapshot_t",540,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jbuff_bytes")=540
-	Set gtmtypes("shm_snapshot_t",541,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jfile_bytes"
-	Set gtmtypes("shm_snapshot_t",541,"off")=8608
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_blkwrite")=540
+	Set gtmtypes("shm_snapshot_t",541,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_blkread"
+	Set gtmtypes("shm_snapshot_t",541,"off")=8472
 	Set gtmtypes("shm_snapshot_t",541,"len")=8
 	Set gtmtypes("shm_snapshot_t",541,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jfile_bytes")=541
-	Set gtmtypes("shm_snapshot_t",542,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jfile_writes"
-	Set gtmtypes("shm_snapshot_t",542,"off")=8616
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_blkread")=541
+	Set gtmtypes("shm_snapshot_t",542,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_tot_retries_0"
+	Set gtmtypes("shm_snapshot_t",542,"off")=8480
 	Set gtmtypes("shm_snapshot_t",542,"len")=8
 	Set gtmtypes("shm_snapshot_t",542,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jfile_writes")=542
-	Set gtmtypes("shm_snapshot_t",543,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jrec_logical"
-	Set gtmtypes("shm_snapshot_t",543,"off")=8624
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_tot_retries_0")=542
+	Set gtmtypes("shm_snapshot_t",543,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_tot_retries_1"
+	Set gtmtypes("shm_snapshot_t",543,"off")=8488
 	Set gtmtypes("shm_snapshot_t",543,"len")=8
 	Set gtmtypes("shm_snapshot_t",543,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jrec_logical")=543
-	Set gtmtypes("shm_snapshot_t",544,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jrec_pblk"
-	Set gtmtypes("shm_snapshot_t",544,"off")=8632
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_tot_retries_1")=543
+	Set gtmtypes("shm_snapshot_t",544,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_tot_retries_2"
+	Set gtmtypes("shm_snapshot_t",544,"off")=8496
 	Set gtmtypes("shm_snapshot_t",544,"len")=8
 	Set gtmtypes("shm_snapshot_t",544,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jrec_pblk")=544
-	Set gtmtypes("shm_snapshot_t",545,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jrec_epoch_regular"
-	Set gtmtypes("shm_snapshot_t",545,"off")=8640
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_tot_retries_2")=544
+	Set gtmtypes("shm_snapshot_t",545,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_tot_retries_3"
+	Set gtmtypes("shm_snapshot_t",545,"off")=8504
 	Set gtmtypes("shm_snapshot_t",545,"len")=8
 	Set gtmtypes("shm_snapshot_t",545,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jrec_epoch_regular")=545
-	Set gtmtypes("shm_snapshot_t",546,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jrec_epoch_idle"
-	Set gtmtypes("shm_snapshot_t",546,"off")=8648
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_tot_retries_3")=545
+	Set gtmtypes("shm_snapshot_t",546,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_tot_retries_4"
+	Set gtmtypes("shm_snapshot_t",546,"off")=8512
 	Set gtmtypes("shm_snapshot_t",546,"len")=8
 	Set gtmtypes("shm_snapshot_t",546,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jrec_epoch_idle")=546
-	Set gtmtypes("shm_snapshot_t",547,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jrec_other"
-	Set gtmtypes("shm_snapshot_t",547,"off")=8656
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_tot_retries_4")=546
+	Set gtmtypes("shm_snapshot_t",547,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_0"
+	Set gtmtypes("shm_snapshot_t",547,"off")=8520
 	Set gtmtypes("shm_snapshot_t",547,"len")=8
 	Set gtmtypes("shm_snapshot_t",547,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jrec_other")=547
-	Set gtmtypes("shm_snapshot_t",548,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jnl_extends"
-	Set gtmtypes("shm_snapshot_t",548,"off")=8664
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_0")=547
+	Set gtmtypes("shm_snapshot_t",548,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_1"
+	Set gtmtypes("shm_snapshot_t",548,"off")=8528
 	Set gtmtypes("shm_snapshot_t",548,"len")=8
 	Set gtmtypes("shm_snapshot_t",548,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jnl_extends")=548
-	Set gtmtypes("shm_snapshot_t",549,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_db_extends"
-	Set gtmtypes("shm_snapshot_t",549,"off")=8672
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_1")=548
+	Set gtmtypes("shm_snapshot_t",549,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_2"
+	Set gtmtypes("shm_snapshot_t",549,"off")=8536
 	Set gtmtypes("shm_snapshot_t",549,"len")=8
 	Set gtmtypes("shm_snapshot_t",549,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_db_extends")=549
-	Set gtmtypes("shm_snapshot_t",550,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_crit_success"
-	Set gtmtypes("shm_snapshot_t",550,"off")=8680
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_2")=549
+	Set gtmtypes("shm_snapshot_t",550,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_3"
+	Set gtmtypes("shm_snapshot_t",550,"off")=8544
 	Set gtmtypes("shm_snapshot_t",550,"len")=8
 	Set gtmtypes("shm_snapshot_t",550,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_crit_success")=550
-	Set gtmtypes("shm_snapshot_t",551,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_crits_in_epch"
-	Set gtmtypes("shm_snapshot_t",551,"off")=8688
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_3")=550
+	Set gtmtypes("shm_snapshot_t",551,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_4"
+	Set gtmtypes("shm_snapshot_t",551,"off")=8552
 	Set gtmtypes("shm_snapshot_t",551,"len")=8
 	Set gtmtypes("shm_snapshot_t",551,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_crits_in_epch")=551
-	Set gtmtypes("shm_snapshot_t",552,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.sq_crit_failed"
-	Set gtmtypes("shm_snapshot_t",552,"off")=8696
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_4")=551
+	Set gtmtypes("shm_snapshot_t",552,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_ztrigger"
+	Set gtmtypes("shm_snapshot_t",552,"off")=8560
 	Set gtmtypes("shm_snapshot_t",552,"len")=8
 	Set gtmtypes("shm_snapshot_t",552,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.sq_crit_failed")=552
-	Set gtmtypes("shm_snapshot_t",553,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_crit_failed"
-	Set gtmtypes("shm_snapshot_t",553,"off")=8704
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_ztrigger")=552
+	Set gtmtypes("shm_snapshot_t",553,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_db_flush"
+	Set gtmtypes("shm_snapshot_t",553,"off")=8568
 	Set gtmtypes("shm_snapshot_t",553,"len")=8
 	Set gtmtypes("shm_snapshot_t",553,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_crit_failed")=553
-	Set gtmtypes("shm_snapshot_t",554,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.sq_crit_que_slps"
-	Set gtmtypes("shm_snapshot_t",554,"off")=8712
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_db_flush")=553
+	Set gtmtypes("shm_snapshot_t",554,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_db_fsync"
+	Set gtmtypes("shm_snapshot_t",554,"off")=8576
 	Set gtmtypes("shm_snapshot_t",554,"len")=8
 	Set gtmtypes("shm_snapshot_t",554,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.sq_crit_que_slps")=554
-	Set gtmtypes("shm_snapshot_t",555,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_crit_que_slps"
-	Set gtmtypes("shm_snapshot_t",555,"off")=8720
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_db_fsync")=554
+	Set gtmtypes("shm_snapshot_t",555,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jnl_flush"
+	Set gtmtypes("shm_snapshot_t",555,"off")=8584
 	Set gtmtypes("shm_snapshot_t",555,"len")=8
 	Set gtmtypes("shm_snapshot_t",555,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_crit_que_slps")=555
-	Set gtmtypes("shm_snapshot_t",556,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.sq_crit_yields"
-	Set gtmtypes("shm_snapshot_t",556,"off")=8728
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jnl_flush")=555
+	Set gtmtypes("shm_snapshot_t",556,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jnl_fsync"
+	Set gtmtypes("shm_snapshot_t",556,"off")=8592
 	Set gtmtypes("shm_snapshot_t",556,"len")=8
 	Set gtmtypes("shm_snapshot_t",556,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.sq_crit_yields")=556
-	Set gtmtypes("shm_snapshot_t",557,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_crit_yields"
-	Set gtmtypes("shm_snapshot_t",557,"off")=8736
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jnl_fsync")=556
+	Set gtmtypes("shm_snapshot_t",557,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jbuff_bytes"
+	Set gtmtypes("shm_snapshot_t",557,"off")=8600
 	Set gtmtypes("shm_snapshot_t",557,"len")=8
 	Set gtmtypes("shm_snapshot_t",557,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_crit_yields")=557
-	Set gtmtypes("shm_snapshot_t",558,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec_filler_4k_plus_512"
-	Set gtmtypes("shm_snapshot_t",558,"off")=8744
-	Set gtmtypes("shm_snapshot_t",558,"len")=48
-	Set gtmtypes("shm_snapshot_t",558,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec_filler_4k_plus_512")=558
-	Set gtmtypes("shm_snapshot_t",559,"name")="shm_snapshot_t.shadow_file_header.filler_4k_plus_512"
-	Set gtmtypes("shm_snapshot_t",559,"off")=8792
-	Set gtmtypes("shm_snapshot_t",559,"len")=368
-	Set gtmtypes("shm_snapshot_t",559,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_4k_plus_512")=559
-	Set gtmtypes("shm_snapshot_t",560,"name")="shm_snapshot_t.shadow_file_header.intrpt_recov_resync_strm_seqno"
-	Set gtmtypes("shm_snapshot_t",560,"off")=9160
-	Set gtmtypes("shm_snapshot_t",560,"len")=128
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jbuff_bytes")=557
+	Set gtmtypes("shm_snapshot_t",558,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jfile_bytes"
+	Set gtmtypes("shm_snapshot_t",558,"off")=8608
+	Set gtmtypes("shm_snapshot_t",558,"len")=8
+	Set gtmtypes("shm_snapshot_t",558,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jfile_bytes")=558
+	Set gtmtypes("shm_snapshot_t",559,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jfile_writes"
+	Set gtmtypes("shm_snapshot_t",559,"off")=8616
+	Set gtmtypes("shm_snapshot_t",559,"len")=8
+	Set gtmtypes("shm_snapshot_t",559,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jfile_writes")=559
+	Set gtmtypes("shm_snapshot_t",560,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jrec_logical"
+	Set gtmtypes("shm_snapshot_t",560,"off")=8624
+	Set gtmtypes("shm_snapshot_t",560,"len")=8
 	Set gtmtypes("shm_snapshot_t",560,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.intrpt_recov_resync_strm_seqno")=560
-	Set gtmtypes("shm_snapshot_t",560,"dim")=16
-	Set gtmtypes("shm_snapshot_t",561,"name")="shm_snapshot_t.shadow_file_header.creation_db_ver"
-	Set gtmtypes("shm_snapshot_t",561,"off")=9288
-	Set gtmtypes("shm_snapshot_t",561,"len")=4
-	Set gtmtypes("shm_snapshot_t",561,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.creation_db_ver")=561
-	Set gtmtypes("shm_snapshot_t",562,"name")="shm_snapshot_t.shadow_file_header.creation_mdb_ver"
-	Set gtmtypes("shm_snapshot_t",562,"off")=9292
-	Set gtmtypes("shm_snapshot_t",562,"len")=4
-	Set gtmtypes("shm_snapshot_t",562,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.creation_mdb_ver")=562
-	Set gtmtypes("shm_snapshot_t",563,"name")="shm_snapshot_t.shadow_file_header.certified_for_upgrade_to"
-	Set gtmtypes("shm_snapshot_t",563,"off")=9296
-	Set gtmtypes("shm_snapshot_t",563,"len")=4
-	Set gtmtypes("shm_snapshot_t",563,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.certified_for_upgrade_to")=563
-	Set gtmtypes("shm_snapshot_t",564,"name")="shm_snapshot_t.shadow_file_header.filler_5k"
-	Set gtmtypes("shm_snapshot_t",564,"off")=9300
-	Set gtmtypes("shm_snapshot_t",564,"len")=4
-	Set gtmtypes("shm_snapshot_t",564,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_5k")=564
-	Set gtmtypes("shm_snapshot_t",565,"name")="shm_snapshot_t.shadow_file_header.secshr_ops_index_filler"
-	Set gtmtypes("shm_snapshot_t",565,"off")=9304
-	Set gtmtypes("shm_snapshot_t",565,"len")=4
-	Set gtmtypes("shm_snapshot_t",565,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.secshr_ops_index_filler")=565
-	Set gtmtypes("shm_snapshot_t",566,"name")="shm_snapshot_t.shadow_file_header.secshr_ops_array_filler"
-	Set gtmtypes("shm_snapshot_t",566,"off")=9308
-	Set gtmtypes("shm_snapshot_t",566,"len")=1020
-	Set gtmtypes("shm_snapshot_t",566,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.secshr_ops_array_filler")=566
-	Set gtmtypes("shm_snapshot_t",566,"dim")=255
-	Set gtmtypes("shm_snapshot_t",567,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn"
-	Set gtmtypes("shm_snapshot_t",567,"off")=10328
-	Set gtmtypes("shm_snapshot_t",567,"len")=24
-	Set gtmtypes("shm_snapshot_t",567,"type")="compswap_time_field"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn")=567
-	Set gtmtypes("shm_snapshot_t",568,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch"
-	Set gtmtypes("shm_snapshot_t",568,"off")=10328
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jrec_logical")=560
+	Set gtmtypes("shm_snapshot_t",561,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jrec_pblk"
+	Set gtmtypes("shm_snapshot_t",561,"off")=8632
+	Set gtmtypes("shm_snapshot_t",561,"len")=8
+	Set gtmtypes("shm_snapshot_t",561,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jrec_pblk")=561
+	Set gtmtypes("shm_snapshot_t",562,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jrec_epoch_regular"
+	Set gtmtypes("shm_snapshot_t",562,"off")=8640
+	Set gtmtypes("shm_snapshot_t",562,"len")=8
+	Set gtmtypes("shm_snapshot_t",562,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jrec_epoch_regular")=562
+	Set gtmtypes("shm_snapshot_t",563,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jrec_epoch_idle"
+	Set gtmtypes("shm_snapshot_t",563,"off")=8648
+	Set gtmtypes("shm_snapshot_t",563,"len")=8
+	Set gtmtypes("shm_snapshot_t",563,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jrec_epoch_idle")=563
+	Set gtmtypes("shm_snapshot_t",564,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jrec_other"
+	Set gtmtypes("shm_snapshot_t",564,"off")=8656
+	Set gtmtypes("shm_snapshot_t",564,"len")=8
+	Set gtmtypes("shm_snapshot_t",564,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jrec_other")=564
+	Set gtmtypes("shm_snapshot_t",565,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_jnl_extends"
+	Set gtmtypes("shm_snapshot_t",565,"off")=8664
+	Set gtmtypes("shm_snapshot_t",565,"len")=8
+	Set gtmtypes("shm_snapshot_t",565,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_jnl_extends")=565
+	Set gtmtypes("shm_snapshot_t",566,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_db_extends"
+	Set gtmtypes("shm_snapshot_t",566,"off")=8672
+	Set gtmtypes("shm_snapshot_t",566,"len")=8
+	Set gtmtypes("shm_snapshot_t",566,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_db_extends")=566
+	Set gtmtypes("shm_snapshot_t",567,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_crit_success"
+	Set gtmtypes("shm_snapshot_t",567,"off")=8680
+	Set gtmtypes("shm_snapshot_t",567,"len")=8
+	Set gtmtypes("shm_snapshot_t",567,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_crit_success")=567
+	Set gtmtypes("shm_snapshot_t",568,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_crits_in_epch"
+	Set gtmtypes("shm_snapshot_t",568,"off")=8688
 	Set gtmtypes("shm_snapshot_t",568,"len")=8
-	Set gtmtypes("shm_snapshot_t",568,"type")="global_latch_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch")=568
-	Set gtmtypes("shm_snapshot_t",569,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch.u"
-	Set gtmtypes("shm_snapshot_t",569,"off")=10328
+	Set gtmtypes("shm_snapshot_t",568,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_crits_in_epch")=568
+	Set gtmtypes("shm_snapshot_t",569,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.sq_crit_failed"
+	Set gtmtypes("shm_snapshot_t",569,"off")=8696
 	Set gtmtypes("shm_snapshot_t",569,"len")=8
-	Set gtmtypes("shm_snapshot_t",569,"type")="union"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch.u")=569
-	Set gtmtypes("shm_snapshot_t",570,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch.u.pid_imgcnt"
-	Set gtmtypes("shm_snapshot_t",570,"off")=10328
+	Set gtmtypes("shm_snapshot_t",569,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.sq_crit_failed")=569
+	Set gtmtypes("shm_snapshot_t",570,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_crit_failed"
+	Set gtmtypes("shm_snapshot_t",570,"off")=8704
 	Set gtmtypes("shm_snapshot_t",570,"len")=8
 	Set gtmtypes("shm_snapshot_t",570,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch.u.pid_imgcnt")=570
-	Set gtmtypes("shm_snapshot_t",571,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch.u.parts"
-	Set gtmtypes("shm_snapshot_t",571,"off")=10328
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_crit_failed")=570
+	Set gtmtypes("shm_snapshot_t",571,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.sq_crit_que_slps"
+	Set gtmtypes("shm_snapshot_t",571,"off")=8712
 	Set gtmtypes("shm_snapshot_t",571,"len")=8
-	Set gtmtypes("shm_snapshot_t",571,"type")="struct"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch.u.parts")=571
-	Set gtmtypes("shm_snapshot_t",572,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_pid"
-	Set gtmtypes("shm_snapshot_t",572,"off")=10328
-	Set gtmtypes("shm_snapshot_t",572,"len")=4
-	Set gtmtypes("shm_snapshot_t",572,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_pid")=572
-	Set gtmtypes("shm_snapshot_t",573,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_word"
-	Set gtmtypes("shm_snapshot_t",573,"off")=10332
-	Set gtmtypes("shm_snapshot_t",573,"len")=4
-	Set gtmtypes("shm_snapshot_t",573,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_word")=573
-	Set gtmtypes("shm_snapshot_t",574,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.hp_latch_space"
-	Set gtmtypes("shm_snapshot_t",574,"off")=10336
-	Set gtmtypes("shm_snapshot_t",574,"len")=16
-	Set gtmtypes("shm_snapshot_t",574,"type")="int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.hp_latch_space")=574
-	Set gtmtypes("shm_snapshot_t",574,"dim")=4
-	Set gtmtypes("shm_snapshot_t",575,"name")="shm_snapshot_t.shadow_file_header.is_encrypted"
-	Set gtmtypes("shm_snapshot_t",575,"off")=10352
-	Set gtmtypes("shm_snapshot_t",575,"len")=4
-	Set gtmtypes("shm_snapshot_t",575,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.is_encrypted")=575
-	Set gtmtypes("shm_snapshot_t",576,"name")="shm_snapshot_t.shadow_file_header.db_trigger_cycle"
-	Set gtmtypes("shm_snapshot_t",576,"off")=10356
-	Set gtmtypes("shm_snapshot_t",576,"len")=4
-	Set gtmtypes("shm_snapshot_t",576,"type")="unsigned-int"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_trigger_cycle")=576
-	Set gtmtypes("shm_snapshot_t",577,"name")="shm_snapshot_t.shadow_file_header.strm_reg_seqno"
-	Set gtmtypes("shm_snapshot_t",577,"off")=10360
-	Set gtmtypes("shm_snapshot_t",577,"len")=128
-	Set gtmtypes("shm_snapshot_t",577,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.strm_reg_seqno")=577
-	Set gtmtypes("shm_snapshot_t",577,"dim")=16
-	Set gtmtypes("shm_snapshot_t",578,"name")="shm_snapshot_t.shadow_file_header.save_strm_reg_seqno"
-	Set gtmtypes("shm_snapshot_t",578,"off")=10488
+	Set gtmtypes("shm_snapshot_t",571,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.sq_crit_que_slps")=571
+	Set gtmtypes("shm_snapshot_t",572,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_crit_que_slps"
+	Set gtmtypes("shm_snapshot_t",572,"off")=8720
+	Set gtmtypes("shm_snapshot_t",572,"len")=8
+	Set gtmtypes("shm_snapshot_t",572,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_crit_que_slps")=572
+	Set gtmtypes("shm_snapshot_t",573,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.sq_crit_yields"
+	Set gtmtypes("shm_snapshot_t",573,"off")=8728
+	Set gtmtypes("shm_snapshot_t",573,"len")=8
+	Set gtmtypes("shm_snapshot_t",573,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.sq_crit_yields")=573
+	Set gtmtypes("shm_snapshot_t",574,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_crit_yields"
+	Set gtmtypes("shm_snapshot_t",574,"off")=8736
+	Set gtmtypes("shm_snapshot_t",574,"len")=8
+	Set gtmtypes("shm_snapshot_t",574,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_crit_yields")=574
+	Set gtmtypes("shm_snapshot_t",575,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec.n_clean2dirty"
+	Set gtmtypes("shm_snapshot_t",575,"off")=8744
+	Set gtmtypes("shm_snapshot_t",575,"len")=8
+	Set gtmtypes("shm_snapshot_t",575,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec.n_clean2dirty")=575
+	Set gtmtypes("shm_snapshot_t",576,"name")="shm_snapshot_t.shadow_file_header.gvstats_rec_filler_4k_plus_512"
+	Set gtmtypes("shm_snapshot_t",576,"off")=8752
+	Set gtmtypes("shm_snapshot_t",576,"len")=40
+	Set gtmtypes("shm_snapshot_t",576,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.gvstats_rec_filler_4k_plus_512")=576
+	Set gtmtypes("shm_snapshot_t",577,"name")="shm_snapshot_t.shadow_file_header.filler_4k_plus_512"
+	Set gtmtypes("shm_snapshot_t",577,"off")=8792
+	Set gtmtypes("shm_snapshot_t",577,"len")=368
+	Set gtmtypes("shm_snapshot_t",577,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_4k_plus_512")=577
+	Set gtmtypes("shm_snapshot_t",578,"name")="shm_snapshot_t.shadow_file_header.intrpt_recov_resync_strm_seqno"
+	Set gtmtypes("shm_snapshot_t",578,"off")=9160
 	Set gtmtypes("shm_snapshot_t",578,"len")=128
 	Set gtmtypes("shm_snapshot_t",578,"type")="uint64_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.save_strm_reg_seqno")=578
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.intrpt_recov_resync_strm_seqno")=578
 	Set gtmtypes("shm_snapshot_t",578,"dim")=16
-	Set gtmtypes("shm_snapshot_t",579,"name")="shm_snapshot_t.shadow_file_header.freeze_on_fail"
-	Set gtmtypes("shm_snapshot_t",579,"off")=10616
+	Set gtmtypes("shm_snapshot_t",579,"name")="shm_snapshot_t.shadow_file_header.creation_db_ver"
+	Set gtmtypes("shm_snapshot_t",579,"off")=9288
 	Set gtmtypes("shm_snapshot_t",579,"len")=4
-	Set gtmtypes("shm_snapshot_t",579,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.freeze_on_fail")=579
-	Set gtmtypes("shm_snapshot_t",580,"name")="shm_snapshot_t.shadow_file_header.span_node_absent"
-	Set gtmtypes("shm_snapshot_t",580,"off")=10620
+	Set gtmtypes("shm_snapshot_t",579,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.creation_db_ver")=579
+	Set gtmtypes("shm_snapshot_t",580,"name")="shm_snapshot_t.shadow_file_header.creation_mdb_ver"
+	Set gtmtypes("shm_snapshot_t",580,"off")=9292
 	Set gtmtypes("shm_snapshot_t",580,"len")=4
-	Set gtmtypes("shm_snapshot_t",580,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.span_node_absent")=580
-	Set gtmtypes("shm_snapshot_t",581,"name")="shm_snapshot_t.shadow_file_header.maxkeysz_assured"
-	Set gtmtypes("shm_snapshot_t",581,"off")=10624
+	Set gtmtypes("shm_snapshot_t",580,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.creation_mdb_ver")=580
+	Set gtmtypes("shm_snapshot_t",581,"name")="shm_snapshot_t.shadow_file_header.certified_for_upgrade_to"
+	Set gtmtypes("shm_snapshot_t",581,"off")=9296
 	Set gtmtypes("shm_snapshot_t",581,"len")=4
-	Set gtmtypes("shm_snapshot_t",581,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.maxkeysz_assured")=581
-	Set gtmtypes("shm_snapshot_t",582,"name")="shm_snapshot_t.shadow_file_header.hasht_upgrade_needed"
-	Set gtmtypes("shm_snapshot_t",582,"off")=10628
+	Set gtmtypes("shm_snapshot_t",581,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.certified_for_upgrade_to")=581
+	Set gtmtypes("shm_snapshot_t",582,"name")="shm_snapshot_t.shadow_file_header.filler_5k"
+	Set gtmtypes("shm_snapshot_t",582,"off")=9300
 	Set gtmtypes("shm_snapshot_t",582,"len")=4
-	Set gtmtypes("shm_snapshot_t",582,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.hasht_upgrade_needed")=582
-	Set gtmtypes("shm_snapshot_t",583,"name")="shm_snapshot_t.shadow_file_header.defer_allocate"
-	Set gtmtypes("shm_snapshot_t",583,"off")=10632
+	Set gtmtypes("shm_snapshot_t",582,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_5k")=582
+	Set gtmtypes("shm_snapshot_t",583,"name")="shm_snapshot_t.shadow_file_header.secshr_ops_index_filler"
+	Set gtmtypes("shm_snapshot_t",583,"off")=9304
 	Set gtmtypes("shm_snapshot_t",583,"len")=4
-	Set gtmtypes("shm_snapshot_t",583,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.defer_allocate")=583
-	Set gtmtypes("shm_snapshot_t",584,"name")="shm_snapshot_t.shadow_file_header.filler_ftok_counter_halted"
-	Set gtmtypes("shm_snapshot_t",584,"off")=10636
-	Set gtmtypes("shm_snapshot_t",584,"len")=4
-	Set gtmtypes("shm_snapshot_t",584,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_ftok_counter_halted")=584
-	Set gtmtypes("shm_snapshot_t",585,"name")="shm_snapshot_t.shadow_file_header.filler_access_counter_halted"
-	Set gtmtypes("shm_snapshot_t",585,"off")=10640
-	Set gtmtypes("shm_snapshot_t",585,"len")=4
-	Set gtmtypes("shm_snapshot_t",585,"type")="boolean_t"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_access_counter_halted")=585
-	Set gtmtypes("shm_snapshot_t",586,"name")="shm_snapshot_t.shadow_file_header.filler_7k"
-	Set gtmtypes("shm_snapshot_t",586,"off")=10644
-	Set gtmtypes("shm_snapshot_t",586,"len")=708
-	Set gtmtypes("shm_snapshot_t",586,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_7k")=586
-	Set gtmtypes("shm_snapshot_t",587,"name")="shm_snapshot_t.shadow_file_header.filler_8k"
-	Set gtmtypes("shm_snapshot_t",587,"off")=11352
-	Set gtmtypes("shm_snapshot_t",587,"len")=1024
-	Set gtmtypes("shm_snapshot_t",587,"type")="char"
-	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_8k")=587
+	Set gtmtypes("shm_snapshot_t",583,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.secshr_ops_index_filler")=583
+	Set gtmtypes("shm_snapshot_t",584,"name")="shm_snapshot_t.shadow_file_header.secshr_ops_array_filler"
+	Set gtmtypes("shm_snapshot_t",584,"off")=9308
+	Set gtmtypes("shm_snapshot_t",584,"len")=1020
+	Set gtmtypes("shm_snapshot_t",584,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.secshr_ops_array_filler")=584
+	Set gtmtypes("shm_snapshot_t",584,"dim")=255
+	Set gtmtypes("shm_snapshot_t",585,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn"
+	Set gtmtypes("shm_snapshot_t",585,"off")=10328
+	Set gtmtypes("shm_snapshot_t",585,"len")=24
+	Set gtmtypes("shm_snapshot_t",585,"type")="compswap_time_field"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn")=585
+	Set gtmtypes("shm_snapshot_t",586,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch"
+	Set gtmtypes("shm_snapshot_t",586,"off")=10328
+	Set gtmtypes("shm_snapshot_t",586,"len")=8
+	Set gtmtypes("shm_snapshot_t",586,"type")="global_latch_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch")=586
+	Set gtmtypes("shm_snapshot_t",587,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch.u"
+	Set gtmtypes("shm_snapshot_t",587,"off")=10328
+	Set gtmtypes("shm_snapshot_t",587,"len")=8
+	Set gtmtypes("shm_snapshot_t",587,"type")="union"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch.u")=587
+	Set gtmtypes("shm_snapshot_t",588,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch.u.pid_imgcnt"
+	Set gtmtypes("shm_snapshot_t",588,"off")=10328
+	Set gtmtypes("shm_snapshot_t",588,"len")=8
+	Set gtmtypes("shm_snapshot_t",588,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch.u.pid_imgcnt")=588
+	Set gtmtypes("shm_snapshot_t",589,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch.u.parts"
+	Set gtmtypes("shm_snapshot_t",589,"off")=10328
+	Set gtmtypes("shm_snapshot_t",589,"len")=8
+	Set gtmtypes("shm_snapshot_t",589,"type")="struct"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch.u.parts")=589
+	Set gtmtypes("shm_snapshot_t",590,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_pid"
+	Set gtmtypes("shm_snapshot_t",590,"off")=10328
+	Set gtmtypes("shm_snapshot_t",590,"len")=4
+	Set gtmtypes("shm_snapshot_t",590,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_pid")=590
+	Set gtmtypes("shm_snapshot_t",591,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_word"
+	Set gtmtypes("shm_snapshot_t",591,"off")=10332
+	Set gtmtypes("shm_snapshot_t",591,"len")=4
+	Set gtmtypes("shm_snapshot_t",591,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_word")=591
+	Set gtmtypes("shm_snapshot_t",592,"name")="shm_snapshot_t.shadow_file_header.next_upgrd_warn.hp_latch_space"
+	Set gtmtypes("shm_snapshot_t",592,"off")=10336
+	Set gtmtypes("shm_snapshot_t",592,"len")=16
+	Set gtmtypes("shm_snapshot_t",592,"type")="int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.next_upgrd_warn.hp_latch_space")=592
+	Set gtmtypes("shm_snapshot_t",592,"dim")=4
+	Set gtmtypes("shm_snapshot_t",593,"name")="shm_snapshot_t.shadow_file_header.is_encrypted"
+	Set gtmtypes("shm_snapshot_t",593,"off")=10352
+	Set gtmtypes("shm_snapshot_t",593,"len")=4
+	Set gtmtypes("shm_snapshot_t",593,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.is_encrypted")=593
+	Set gtmtypes("shm_snapshot_t",594,"name")="shm_snapshot_t.shadow_file_header.db_trigger_cycle"
+	Set gtmtypes("shm_snapshot_t",594,"off")=10356
+	Set gtmtypes("shm_snapshot_t",594,"len")=4
+	Set gtmtypes("shm_snapshot_t",594,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.db_trigger_cycle")=594
+	Set gtmtypes("shm_snapshot_t",595,"name")="shm_snapshot_t.shadow_file_header.strm_reg_seqno"
+	Set gtmtypes("shm_snapshot_t",595,"off")=10360
+	Set gtmtypes("shm_snapshot_t",595,"len")=128
+	Set gtmtypes("shm_snapshot_t",595,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.strm_reg_seqno")=595
+	Set gtmtypes("shm_snapshot_t",595,"dim")=16
+	Set gtmtypes("shm_snapshot_t",596,"name")="shm_snapshot_t.shadow_file_header.save_strm_reg_seqno"
+	Set gtmtypes("shm_snapshot_t",596,"off")=10488
+	Set gtmtypes("shm_snapshot_t",596,"len")=128
+	Set gtmtypes("shm_snapshot_t",596,"type")="uint64_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.save_strm_reg_seqno")=596
+	Set gtmtypes("shm_snapshot_t",596,"dim")=16
+	Set gtmtypes("shm_snapshot_t",597,"name")="shm_snapshot_t.shadow_file_header.freeze_on_fail"
+	Set gtmtypes("shm_snapshot_t",597,"off")=10616
+	Set gtmtypes("shm_snapshot_t",597,"len")=4
+	Set gtmtypes("shm_snapshot_t",597,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.freeze_on_fail")=597
+	Set gtmtypes("shm_snapshot_t",598,"name")="shm_snapshot_t.shadow_file_header.span_node_absent"
+	Set gtmtypes("shm_snapshot_t",598,"off")=10620
+	Set gtmtypes("shm_snapshot_t",598,"len")=4
+	Set gtmtypes("shm_snapshot_t",598,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.span_node_absent")=598
+	Set gtmtypes("shm_snapshot_t",599,"name")="shm_snapshot_t.shadow_file_header.maxkeysz_assured"
+	Set gtmtypes("shm_snapshot_t",599,"off")=10624
+	Set gtmtypes("shm_snapshot_t",599,"len")=4
+	Set gtmtypes("shm_snapshot_t",599,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.maxkeysz_assured")=599
+	Set gtmtypes("shm_snapshot_t",600,"name")="shm_snapshot_t.shadow_file_header.hasht_upgrade_needed"
+	Set gtmtypes("shm_snapshot_t",600,"off")=10628
+	Set gtmtypes("shm_snapshot_t",600,"len")=4
+	Set gtmtypes("shm_snapshot_t",600,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.hasht_upgrade_needed")=600
+	Set gtmtypes("shm_snapshot_t",601,"name")="shm_snapshot_t.shadow_file_header.defer_allocate"
+	Set gtmtypes("shm_snapshot_t",601,"off")=10632
+	Set gtmtypes("shm_snapshot_t",601,"len")=4
+	Set gtmtypes("shm_snapshot_t",601,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.defer_allocate")=601
+	Set gtmtypes("shm_snapshot_t",602,"name")="shm_snapshot_t.shadow_file_header.filler_ftok_counter_halted"
+	Set gtmtypes("shm_snapshot_t",602,"off")=10636
+	Set gtmtypes("shm_snapshot_t",602,"len")=4
+	Set gtmtypes("shm_snapshot_t",602,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_ftok_counter_halted")=602
+	Set gtmtypes("shm_snapshot_t",603,"name")="shm_snapshot_t.shadow_file_header.filler_access_counter_halted"
+	Set gtmtypes("shm_snapshot_t",603,"off")=10640
+	Set gtmtypes("shm_snapshot_t",603,"len")=4
+	Set gtmtypes("shm_snapshot_t",603,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_access_counter_halted")=603
+	Set gtmtypes("shm_snapshot_t",604,"name")="shm_snapshot_t.shadow_file_header.lock_crit_with_db"
+	Set gtmtypes("shm_snapshot_t",604,"off")=10644
+	Set gtmtypes("shm_snapshot_t",604,"len")=4
+	Set gtmtypes("shm_snapshot_t",604,"type")="boolean_t"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.lock_crit_with_db")=604
+	Set gtmtypes("shm_snapshot_t",605,"name")="shm_snapshot_t.shadow_file_header.basedb_fname_len"
+	Set gtmtypes("shm_snapshot_t",605,"off")=10648
+	Set gtmtypes("shm_snapshot_t",605,"len")=4
+	Set gtmtypes("shm_snapshot_t",605,"type")="unsigned-int"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.basedb_fname_len")=605
+	Set gtmtypes("shm_snapshot_t",606,"name")="shm_snapshot_t.shadow_file_header.basedb_fname"
+	Set gtmtypes("shm_snapshot_t",606,"off")=10652
+	Set gtmtypes("shm_snapshot_t",606,"len")=256
+	Set gtmtypes("shm_snapshot_t",606,"type")="unsigned-char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.basedb_fname")=606
+	Set gtmtypes("shm_snapshot_t",607,"name")="shm_snapshot_t.shadow_file_header.filler_7k"
+	Set gtmtypes("shm_snapshot_t",607,"off")=10908
+	Set gtmtypes("shm_snapshot_t",607,"len")=444
+	Set gtmtypes("shm_snapshot_t",607,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_7k")=607
+	Set gtmtypes("shm_snapshot_t",608,"name")="shm_snapshot_t.shadow_file_header.filler_8k"
+	Set gtmtypes("shm_snapshot_t",608,"off")=11352
+	Set gtmtypes("shm_snapshot_t",608,"len")=1024
+	Set gtmtypes("shm_snapshot_t",608,"type")="char"
+	Set gtmtypfldindx("shm_snapshot_t","shadow_file_header.filler_8k")=608
 	;
 	Set gtmtypes("shmpool_blk_hdr")="struct"
 	Set gtmtypes("shmpool_blk_hdr",0)=11
@@ -32557,7 +33272,7 @@ Init
 	Set gtmtypfldindx("shmpool_blk_hdr","image_count")=11
 	;
 	Set gtmtypes("shmpool_buff_hdr")="struct"
-	Set gtmtypes("shmpool_buff_hdr",0)=594
+	Set gtmtypes("shmpool_buff_hdr",0)=615
 	Set gtmtypes("shmpool_buff_hdr","len")=8560
 	Set gtmtypes("shmpool_buff_hdr",1,"name")="shmpool_buff_hdr.shmpool_crit_latch"
 	Set gtmtypes("shmpool_buff_hdr",1,"off")=0
@@ -32792,7 +33507,7 @@ Init
 	Set gtmtypes("shmpool_buff_hdr",47,"name")="shmpool_buff_hdr.shadow_file_header.null_subs"
 	Set gtmtypes("shmpool_buff_hdr",47,"off")=444
 	Set gtmtypes("shmpool_buff_hdr",47,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",47,"type")="boolean_t"
+	Set gtmtypes("shmpool_buff_hdr",47,"type")="int"
 	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.null_subs")=47
 	Set gtmtypes("shmpool_buff_hdr",48,"name")="shmpool_buff_hdr.shadow_file_header.free_space"
 	Set gtmtypes("shmpool_buff_hdr",48,"off")=448
@@ -32874,11 +33589,11 @@ Init
 	Set gtmtypes("shmpool_buff_hdr",63,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",63,"type")="int"
 	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.creation_time4")=63
-	Set gtmtypes("shmpool_buff_hdr",64,"name")="shmpool_buff_hdr.shadow_file_header.creation_filler_8byte"
+	Set gtmtypes("shmpool_buff_hdr",64,"name")="shmpool_buff_hdr.shadow_file_header.reservedDBFlags"
 	Set gtmtypes("shmpool_buff_hdr",64,"off")=556
 	Set gtmtypes("shmpool_buff_hdr",64,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",64,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.creation_filler_8byte")=64
+	Set gtmtypes("shmpool_buff_hdr",64,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reservedDBFlags")=64
 	Set gtmtypes("shmpool_buff_hdr",65,"name")="shmpool_buff_hdr.shadow_file_header.max_tn"
 	Set gtmtypes("shmpool_buff_hdr",65,"off")=560
 	Set gtmtypes("shmpool_buff_hdr",65,"len")=8
@@ -32959,2592 +33674,2697 @@ Init
 	Set gtmtypes("shmpool_buff_hdr",80,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",80,"type")="int"
 	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.abandoned_kills")=80
-	Set gtmtypes("shmpool_buff_hdr",81,"name")="shmpool_buff_hdr.shadow_file_header.filler_320"
+	Set gtmtypes("shmpool_buff_hdr",81,"name")="shmpool_buff_hdr.shadow_file_header.freeze_online"
 	Set gtmtypes("shmpool_buff_hdr",81,"off")=680
-	Set gtmtypes("shmpool_buff_hdr",81,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",81,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_320")=81
-	Set gtmtypes("shmpool_buff_hdr",82,"name")="shmpool_buff_hdr.shadow_file_header.tn_upgrd_blks_0"
-	Set gtmtypes("shmpool_buff_hdr",82,"off")=688
-	Set gtmtypes("shmpool_buff_hdr",82,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",82,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.tn_upgrd_blks_0")=82
-	Set gtmtypes("shmpool_buff_hdr",83,"name")="shmpool_buff_hdr.shadow_file_header.desired_db_format_tn"
-	Set gtmtypes("shmpool_buff_hdr",83,"off")=696
+	Set gtmtypes("shmpool_buff_hdr",81,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",81,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.freeze_online")=81
+	Set gtmtypes("shmpool_buff_hdr",82,"name")="shmpool_buff_hdr.shadow_file_header.filler_320"
+	Set gtmtypes("shmpool_buff_hdr",82,"off")=684
+	Set gtmtypes("shmpool_buff_hdr",82,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",82,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_320")=82
+	Set gtmtypes("shmpool_buff_hdr",83,"name")="shmpool_buff_hdr.shadow_file_header.tn_upgrd_blks_0"
+	Set gtmtypes("shmpool_buff_hdr",83,"off")=688
 	Set gtmtypes("shmpool_buff_hdr",83,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",83,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.desired_db_format_tn")=83
-	Set gtmtypes("shmpool_buff_hdr",84,"name")="shmpool_buff_hdr.shadow_file_header.reorg_db_fmt_start_tn"
-	Set gtmtypes("shmpool_buff_hdr",84,"off")=704
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.tn_upgrd_blks_0")=83
+	Set gtmtypes("shmpool_buff_hdr",84,"name")="shmpool_buff_hdr.shadow_file_header.desired_db_format_tn"
+	Set gtmtypes("shmpool_buff_hdr",84,"off")=696
 	Set gtmtypes("shmpool_buff_hdr",84,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",84,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reorg_db_fmt_start_tn")=84
-	Set gtmtypes("shmpool_buff_hdr",85,"name")="shmpool_buff_hdr.shadow_file_header.reorg_upgrd_dwngrd_restart_block"
-	Set gtmtypes("shmpool_buff_hdr",85,"off")=712
-	Set gtmtypes("shmpool_buff_hdr",85,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",85,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reorg_upgrd_dwngrd_restart_block")=85
-	Set gtmtypes("shmpool_buff_hdr",86,"name")="shmpool_buff_hdr.shadow_file_header.blks_to_upgrd"
-	Set gtmtypes("shmpool_buff_hdr",86,"off")=716
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.desired_db_format_tn")=84
+	Set gtmtypes("shmpool_buff_hdr",85,"name")="shmpool_buff_hdr.shadow_file_header.reorg_db_fmt_start_tn"
+	Set gtmtypes("shmpool_buff_hdr",85,"off")=704
+	Set gtmtypes("shmpool_buff_hdr",85,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",85,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reorg_db_fmt_start_tn")=85
+	Set gtmtypes("shmpool_buff_hdr",86,"name")="shmpool_buff_hdr.shadow_file_header.reorg_upgrd_dwngrd_restart_block"
+	Set gtmtypes("shmpool_buff_hdr",86,"off")=712
 	Set gtmtypes("shmpool_buff_hdr",86,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",86,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.blks_to_upgrd")=86
-	Set gtmtypes("shmpool_buff_hdr",87,"name")="shmpool_buff_hdr.shadow_file_header.blks_to_upgrd_subzero_error"
-	Set gtmtypes("shmpool_buff_hdr",87,"off")=720
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reorg_upgrd_dwngrd_restart_block")=86
+	Set gtmtypes("shmpool_buff_hdr",87,"name")="shmpool_buff_hdr.shadow_file_header.blks_to_upgrd"
+	Set gtmtypes("shmpool_buff_hdr",87,"off")=716
 	Set gtmtypes("shmpool_buff_hdr",87,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",87,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.blks_to_upgrd_subzero_error")=87
-	Set gtmtypes("shmpool_buff_hdr",88,"name")="shmpool_buff_hdr.shadow_file_header.desired_db_format"
-	Set gtmtypes("shmpool_buff_hdr",88,"off")=724
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.blks_to_upgrd")=87
+	Set gtmtypes("shmpool_buff_hdr",88,"name")="shmpool_buff_hdr.shadow_file_header.blks_to_upgrd_subzero_error"
+	Set gtmtypes("shmpool_buff_hdr",88,"off")=720
 	Set gtmtypes("shmpool_buff_hdr",88,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",88,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.desired_db_format")=88
-	Set gtmtypes("shmpool_buff_hdr",89,"name")="shmpool_buff_hdr.shadow_file_header.fully_upgraded"
-	Set gtmtypes("shmpool_buff_hdr",89,"off")=728
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.blks_to_upgrd_subzero_error")=88
+	Set gtmtypes("shmpool_buff_hdr",89,"name")="shmpool_buff_hdr.shadow_file_header.desired_db_format"
+	Set gtmtypes("shmpool_buff_hdr",89,"off")=724
 	Set gtmtypes("shmpool_buff_hdr",89,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",89,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.fully_upgraded")=89
-	Set gtmtypes("shmpool_buff_hdr",90,"name")="shmpool_buff_hdr.shadow_file_header.db_got_to_v5_once"
-	Set gtmtypes("shmpool_buff_hdr",90,"off")=732
+	Set gtmtypes("shmpool_buff_hdr",89,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.desired_db_format")=89
+	Set gtmtypes("shmpool_buff_hdr",90,"name")="shmpool_buff_hdr.shadow_file_header.fully_upgraded"
+	Set gtmtypes("shmpool_buff_hdr",90,"off")=728
 	Set gtmtypes("shmpool_buff_hdr",90,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",90,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_got_to_v5_once")=90
-	Set gtmtypes("shmpool_buff_hdr",91,"name")="shmpool_buff_hdr.shadow_file_header.opened_by_gtmv53"
-	Set gtmtypes("shmpool_buff_hdr",91,"off")=736
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.fully_upgraded")=90
+	Set gtmtypes("shmpool_buff_hdr",91,"name")="shmpool_buff_hdr.shadow_file_header.db_got_to_v5_once"
+	Set gtmtypes("shmpool_buff_hdr",91,"off")=732
 	Set gtmtypes("shmpool_buff_hdr",91,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",91,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.opened_by_gtmv53")=91
-	Set gtmtypes("shmpool_buff_hdr",92,"name")="shmpool_buff_hdr.shadow_file_header.filler_384"
-	Set gtmtypes("shmpool_buff_hdr",92,"off")=740
-	Set gtmtypes("shmpool_buff_hdr",92,"len")=12
-	Set gtmtypes("shmpool_buff_hdr",92,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_384")=92
-	Set gtmtypes("shmpool_buff_hdr",93,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist"
-	Set gtmtypes("shmpool_buff_hdr",93,"off")=752
-	Set gtmtypes("shmpool_buff_hdr",93,"len")=56
-	Set gtmtypes("shmpool_buff_hdr",93,"type")="th_index"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist")=93
-	Set gtmtypes("shmpool_buff_hdr",94,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.curr_tn"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_got_to_v5_once")=91
+	Set gtmtypes("shmpool_buff_hdr",92,"name")="shmpool_buff_hdr.shadow_file_header.opened_by_gtmv53"
+	Set gtmtypes("shmpool_buff_hdr",92,"off")=736
+	Set gtmtypes("shmpool_buff_hdr",92,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",92,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.opened_by_gtmv53")=92
+	Set gtmtypes("shmpool_buff_hdr",93,"name")="shmpool_buff_hdr.shadow_file_header.filler_384"
+	Set gtmtypes("shmpool_buff_hdr",93,"off")=740
+	Set gtmtypes("shmpool_buff_hdr",93,"len")=12
+	Set gtmtypes("shmpool_buff_hdr",93,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_384")=93
+	Set gtmtypes("shmpool_buff_hdr",94,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist"
 	Set gtmtypes("shmpool_buff_hdr",94,"off")=752
-	Set gtmtypes("shmpool_buff_hdr",94,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",94,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.curr_tn")=94
-	Set gtmtypes("shmpool_buff_hdr",95,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.early_tn"
-	Set gtmtypes("shmpool_buff_hdr",95,"off")=760
+	Set gtmtypes("shmpool_buff_hdr",94,"len")=56
+	Set gtmtypes("shmpool_buff_hdr",94,"type")="th_index"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist")=94
+	Set gtmtypes("shmpool_buff_hdr",95,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.curr_tn"
+	Set gtmtypes("shmpool_buff_hdr",95,"off")=752
 	Set gtmtypes("shmpool_buff_hdr",95,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",95,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.early_tn")=95
-	Set gtmtypes("shmpool_buff_hdr",96,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.last_mm_sync"
-	Set gtmtypes("shmpool_buff_hdr",96,"off")=768
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.curr_tn")=95
+	Set gtmtypes("shmpool_buff_hdr",96,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.early_tn"
+	Set gtmtypes("shmpool_buff_hdr",96,"off")=760
 	Set gtmtypes("shmpool_buff_hdr",96,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",96,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.last_mm_sync")=96
-	Set gtmtypes("shmpool_buff_hdr",97,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.filler_8byte"
-	Set gtmtypes("shmpool_buff_hdr",97,"off")=776
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.early_tn")=96
+	Set gtmtypes("shmpool_buff_hdr",97,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.last_mm_sync"
+	Set gtmtypes("shmpool_buff_hdr",97,"off")=768
 	Set gtmtypes("shmpool_buff_hdr",97,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",97,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.filler_8byte")=97
-	Set gtmtypes("shmpool_buff_hdr",98,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.mm_tn"
-	Set gtmtypes("shmpool_buff_hdr",98,"off")=784
+	Set gtmtypes("shmpool_buff_hdr",97,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.last_mm_sync")=97
+	Set gtmtypes("shmpool_buff_hdr",98,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.filler_8byte"
+	Set gtmtypes("shmpool_buff_hdr",98,"off")=776
 	Set gtmtypes("shmpool_buff_hdr",98,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",98,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.mm_tn")=98
-	Set gtmtypes("shmpool_buff_hdr",99,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.lock_sequence"
-	Set gtmtypes("shmpool_buff_hdr",99,"off")=792
-	Set gtmtypes("shmpool_buff_hdr",99,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",99,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.lock_sequence")=99
-	Set gtmtypes("shmpool_buff_hdr",100,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.ccp_jnl_filesize"
-	Set gtmtypes("shmpool_buff_hdr",100,"off")=796
+	Set gtmtypes("shmpool_buff_hdr",98,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.filler_8byte")=98
+	Set gtmtypes("shmpool_buff_hdr",99,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.mm_tn"
+	Set gtmtypes("shmpool_buff_hdr",99,"off")=784
+	Set gtmtypes("shmpool_buff_hdr",99,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",99,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.mm_tn")=99
+	Set gtmtypes("shmpool_buff_hdr",100,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.lock_sequence"
+	Set gtmtypes("shmpool_buff_hdr",100,"off")=792
 	Set gtmtypes("shmpool_buff_hdr",100,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",100,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.ccp_jnl_filesize")=100
-	Set gtmtypes("shmpool_buff_hdr",101,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.total_blks"
-	Set gtmtypes("shmpool_buff_hdr",101,"off")=800
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.lock_sequence")=100
+	Set gtmtypes("shmpool_buff_hdr",101,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.ccp_jnl_filesize"
+	Set gtmtypes("shmpool_buff_hdr",101,"off")=796
 	Set gtmtypes("shmpool_buff_hdr",101,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",101,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.total_blks")=101
-	Set gtmtypes("shmpool_buff_hdr",102,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.free_blocks"
-	Set gtmtypes("shmpool_buff_hdr",102,"off")=804
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.ccp_jnl_filesize")=101
+	Set gtmtypes("shmpool_buff_hdr",102,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.total_blks"
+	Set gtmtypes("shmpool_buff_hdr",102,"off")=800
 	Set gtmtypes("shmpool_buff_hdr",102,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",102,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.free_blocks")=102
-	Set gtmtypes("shmpool_buff_hdr",103,"name")="shmpool_buff_hdr.shadow_file_header.filler_trans_hist"
-	Set gtmtypes("shmpool_buff_hdr",103,"off")=808
-	Set gtmtypes("shmpool_buff_hdr",103,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",103,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_trans_hist")=103
-	Set gtmtypes("shmpool_buff_hdr",104,"name")="shmpool_buff_hdr.shadow_file_header.flush_time"
-	Set gtmtypes("shmpool_buff_hdr",104,"off")=816
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.total_blks")=102
+	Set gtmtypes("shmpool_buff_hdr",103,"name")="shmpool_buff_hdr.shadow_file_header.trans_hist.free_blocks"
+	Set gtmtypes("shmpool_buff_hdr",103,"off")=804
+	Set gtmtypes("shmpool_buff_hdr",103,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",103,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.trans_hist.free_blocks")=103
+	Set gtmtypes("shmpool_buff_hdr",104,"name")="shmpool_buff_hdr.shadow_file_header.filler_trans_hist"
+	Set gtmtypes("shmpool_buff_hdr",104,"off")=808
 	Set gtmtypes("shmpool_buff_hdr",104,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",104,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.flush_time")=104
-	Set gtmtypes("shmpool_buff_hdr",104,"dim")=2
-	Set gtmtypes("shmpool_buff_hdr",105,"name")="shmpool_buff_hdr.shadow_file_header.flush_trigger"
-	Set gtmtypes("shmpool_buff_hdr",105,"off")=824
-	Set gtmtypes("shmpool_buff_hdr",105,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",104,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_trans_hist")=104
+	Set gtmtypes("shmpool_buff_hdr",105,"name")="shmpool_buff_hdr.shadow_file_header.flush_time"
+	Set gtmtypes("shmpool_buff_hdr",105,"off")=816
+	Set gtmtypes("shmpool_buff_hdr",105,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",105,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.flush_trigger")=105
-	Set gtmtypes("shmpool_buff_hdr",106,"name")="shmpool_buff_hdr.shadow_file_header.n_wrt_per_flu"
-	Set gtmtypes("shmpool_buff_hdr",106,"off")=828
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.flush_time")=105
+	Set gtmtypes("shmpool_buff_hdr",105,"dim")=2
+	Set gtmtypes("shmpool_buff_hdr",106,"name")="shmpool_buff_hdr.shadow_file_header.flush_trigger"
+	Set gtmtypes("shmpool_buff_hdr",106,"off")=824
 	Set gtmtypes("shmpool_buff_hdr",106,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",106,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_wrt_per_flu")=106
-	Set gtmtypes("shmpool_buff_hdr",107,"name")="shmpool_buff_hdr.shadow_file_header.wait_disk_space"
-	Set gtmtypes("shmpool_buff_hdr",107,"off")=832
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.flush_trigger")=106
+	Set gtmtypes("shmpool_buff_hdr",107,"name")="shmpool_buff_hdr.shadow_file_header.n_wrt_per_flu"
+	Set gtmtypes("shmpool_buff_hdr",107,"off")=828
 	Set gtmtypes("shmpool_buff_hdr",107,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",107,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wait_disk_space")=107
-	Set gtmtypes("shmpool_buff_hdr",108,"name")="shmpool_buff_hdr.shadow_file_header.defer_time"
-	Set gtmtypes("shmpool_buff_hdr",108,"off")=836
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_wrt_per_flu")=107
+	Set gtmtypes("shmpool_buff_hdr",108,"name")="shmpool_buff_hdr.shadow_file_header.wait_disk_space"
+	Set gtmtypes("shmpool_buff_hdr",108,"off")=832
 	Set gtmtypes("shmpool_buff_hdr",108,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",108,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.defer_time")=108
-	Set gtmtypes("shmpool_buff_hdr",109,"name")="shmpool_buff_hdr.shadow_file_header.filler_wc_blocked"
-	Set gtmtypes("shmpool_buff_hdr",109,"off")=840
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wait_disk_space")=108
+	Set gtmtypes("shmpool_buff_hdr",109,"name")="shmpool_buff_hdr.shadow_file_header.defer_time"
+	Set gtmtypes("shmpool_buff_hdr",109,"off")=836
 	Set gtmtypes("shmpool_buff_hdr",109,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",109,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_wc_blocked")=109
-	Set gtmtypes("shmpool_buff_hdr",110,"name")="shmpool_buff_hdr.shadow_file_header.mumps_can_bypass"
-	Set gtmtypes("shmpool_buff_hdr",110,"off")=844
+	Set gtmtypes("shmpool_buff_hdr",109,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.defer_time")=109
+	Set gtmtypes("shmpool_buff_hdr",110,"name")="shmpool_buff_hdr.shadow_file_header.filler_wc_blocked"
+	Set gtmtypes("shmpool_buff_hdr",110,"off")=840
 	Set gtmtypes("shmpool_buff_hdr",110,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",110,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.mumps_can_bypass")=110
-	Set gtmtypes("shmpool_buff_hdr",111,"name")="shmpool_buff_hdr.shadow_file_header.epoch_taper"
-	Set gtmtypes("shmpool_buff_hdr",111,"off")=848
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_wc_blocked")=110
+	Set gtmtypes("shmpool_buff_hdr",111,"name")="shmpool_buff_hdr.shadow_file_header.mumps_can_bypass"
+	Set gtmtypes("shmpool_buff_hdr",111,"off")=844
 	Set gtmtypes("shmpool_buff_hdr",111,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",111,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.epoch_taper")=111
-	Set gtmtypes("shmpool_buff_hdr",112,"name")="shmpool_buff_hdr.shadow_file_header.epoch_taper_time_pct"
-	Set gtmtypes("shmpool_buff_hdr",112,"off")=852
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.mumps_can_bypass")=111
+	Set gtmtypes("shmpool_buff_hdr",112,"name")="shmpool_buff_hdr.shadow_file_header.epoch_taper"
+	Set gtmtypes("shmpool_buff_hdr",112,"off")=848
 	Set gtmtypes("shmpool_buff_hdr",112,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",112,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.epoch_taper_time_pct")=112
-	Set gtmtypes("shmpool_buff_hdr",113,"name")="shmpool_buff_hdr.shadow_file_header.epoch_taper_jnl_pct"
-	Set gtmtypes("shmpool_buff_hdr",113,"off")=856
+	Set gtmtypes("shmpool_buff_hdr",112,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.epoch_taper")=112
+	Set gtmtypes("shmpool_buff_hdr",113,"name")="shmpool_buff_hdr.shadow_file_header.epoch_taper_time_pct"
+	Set gtmtypes("shmpool_buff_hdr",113,"off")=852
 	Set gtmtypes("shmpool_buff_hdr",113,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",113,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.epoch_taper_jnl_pct")=113
-	Set gtmtypes("shmpool_buff_hdr",114,"name")="shmpool_buff_hdr.shadow_file_header.filler_512"
-	Set gtmtypes("shmpool_buff_hdr",114,"off")=860
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.epoch_taper_time_pct")=113
+	Set gtmtypes("shmpool_buff_hdr",114,"name")="shmpool_buff_hdr.shadow_file_header.epoch_taper_jnl_pct"
+	Set gtmtypes("shmpool_buff_hdr",114,"off")=856
 	Set gtmtypes("shmpool_buff_hdr",114,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",114,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_512")=114
-	Set gtmtypes("shmpool_buff_hdr",115,"name")="shmpool_buff_hdr.shadow_file_header.reserved_for_upd"
-	Set gtmtypes("shmpool_buff_hdr",115,"off")=864
+	Set gtmtypes("shmpool_buff_hdr",114,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.epoch_taper_jnl_pct")=114
+	Set gtmtypes("shmpool_buff_hdr",115,"name")="shmpool_buff_hdr.shadow_file_header.asyncio"
+	Set gtmtypes("shmpool_buff_hdr",115,"off")=860
 	Set gtmtypes("shmpool_buff_hdr",115,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",115,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reserved_for_upd")=115
-	Set gtmtypes("shmpool_buff_hdr",116,"name")="shmpool_buff_hdr.shadow_file_header.avg_blks_per_100gbl"
-	Set gtmtypes("shmpool_buff_hdr",116,"off")=868
+	Set gtmtypes("shmpool_buff_hdr",115,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.asyncio")=115
+	Set gtmtypes("shmpool_buff_hdr",116,"name")="shmpool_buff_hdr.shadow_file_header.reserved_for_upd"
+	Set gtmtypes("shmpool_buff_hdr",116,"off")=864
 	Set gtmtypes("shmpool_buff_hdr",116,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",116,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.avg_blks_per_100gbl")=116
-	Set gtmtypes("shmpool_buff_hdr",117,"name")="shmpool_buff_hdr.shadow_file_header.pre_read_trigger_factor"
-	Set gtmtypes("shmpool_buff_hdr",117,"off")=872
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reserved_for_upd")=116
+	Set gtmtypes("shmpool_buff_hdr",117,"name")="shmpool_buff_hdr.shadow_file_header.avg_blks_per_100gbl"
+	Set gtmtypes("shmpool_buff_hdr",117,"off")=868
 	Set gtmtypes("shmpool_buff_hdr",117,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",117,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.pre_read_trigger_factor")=117
-	Set gtmtypes("shmpool_buff_hdr",118,"name")="shmpool_buff_hdr.shadow_file_header.writer_trigger_factor"
-	Set gtmtypes("shmpool_buff_hdr",118,"off")=876
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.avg_blks_per_100gbl")=117
+	Set gtmtypes("shmpool_buff_hdr",118,"name")="shmpool_buff_hdr.shadow_file_header.pre_read_trigger_factor"
+	Set gtmtypes("shmpool_buff_hdr",118,"off")=872
 	Set gtmtypes("shmpool_buff_hdr",118,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",118,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.writer_trigger_factor")=118
-	Set gtmtypes("shmpool_buff_hdr",119,"name")="shmpool_buff_hdr.shadow_file_header.semid"
-	Set gtmtypes("shmpool_buff_hdr",119,"off")=880
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.pre_read_trigger_factor")=118
+	Set gtmtypes("shmpool_buff_hdr",119,"name")="shmpool_buff_hdr.shadow_file_header.writer_trigger_factor"
+	Set gtmtypes("shmpool_buff_hdr",119,"off")=876
 	Set gtmtypes("shmpool_buff_hdr",119,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",119,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.semid")=119
-	Set gtmtypes("shmpool_buff_hdr",120,"name")="shmpool_buff_hdr.shadow_file_header.shmid"
-	Set gtmtypes("shmpool_buff_hdr",120,"off")=884
+	Set gtmtypes("shmpool_buff_hdr",119,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.writer_trigger_factor")=119
+	Set gtmtypes("shmpool_buff_hdr",120,"name")="shmpool_buff_hdr.shadow_file_header.semid"
+	Set gtmtypes("shmpool_buff_hdr",120,"off")=880
 	Set gtmtypes("shmpool_buff_hdr",120,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",120,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmid")=120
-	Set gtmtypes("shmpool_buff_hdr",121,"name")="shmpool_buff_hdr.shadow_file_header.gt_sem_ctime"
-	Set gtmtypes("shmpool_buff_hdr",121,"off")=888
-	Set gtmtypes("shmpool_buff_hdr",121,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",121,"type")="gtm_time8"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gt_sem_ctime")=121
-	Set gtmtypes("shmpool_buff_hdr",122,"name")="shmpool_buff_hdr.shadow_file_header.gt_sem_ctime.ctime"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.semid")=120
+	Set gtmtypes("shmpool_buff_hdr",121,"name")="shmpool_buff_hdr.shadow_file_header.shmid"
+	Set gtmtypes("shmpool_buff_hdr",121,"off")=884
+	Set gtmtypes("shmpool_buff_hdr",121,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",121,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmid")=121
+	Set gtmtypes("shmpool_buff_hdr",122,"name")="shmpool_buff_hdr.shadow_file_header.gt_sem_ctime"
 	Set gtmtypes("shmpool_buff_hdr",122,"off")=888
 	Set gtmtypes("shmpool_buff_hdr",122,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",122,"type")="time_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gt_sem_ctime.ctime")=122
-	Set gtmtypes("shmpool_buff_hdr",123,"name")="shmpool_buff_hdr.shadow_file_header.gt_sem_ctime.filler"
+	Set gtmtypes("shmpool_buff_hdr",122,"type")="gtm_time8"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gt_sem_ctime")=122
+	Set gtmtypes("shmpool_buff_hdr",123,"name")="shmpool_buff_hdr.shadow_file_header.gt_sem_ctime.ctime"
 	Set gtmtypes("shmpool_buff_hdr",123,"off")=888
 	Set gtmtypes("shmpool_buff_hdr",123,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",123,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gt_sem_ctime.filler")=123
-	Set gtmtypes("shmpool_buff_hdr",123,"dim")=2
-	Set gtmtypes("shmpool_buff_hdr",124,"name")="shmpool_buff_hdr.shadow_file_header.gt_shm_ctime"
-	Set gtmtypes("shmpool_buff_hdr",124,"off")=896
+	Set gtmtypes("shmpool_buff_hdr",123,"type")="time_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gt_sem_ctime.ctime")=123
+	Set gtmtypes("shmpool_buff_hdr",124,"name")="shmpool_buff_hdr.shadow_file_header.gt_sem_ctime.filler"
+	Set gtmtypes("shmpool_buff_hdr",124,"off")=888
 	Set gtmtypes("shmpool_buff_hdr",124,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",124,"type")="gtm_time8"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gt_shm_ctime")=124
-	Set gtmtypes("shmpool_buff_hdr",125,"name")="shmpool_buff_hdr.shadow_file_header.gt_shm_ctime.ctime"
+	Set gtmtypes("shmpool_buff_hdr",124,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gt_sem_ctime.filler")=124
+	Set gtmtypes("shmpool_buff_hdr",124,"dim")=2
+	Set gtmtypes("shmpool_buff_hdr",125,"name")="shmpool_buff_hdr.shadow_file_header.gt_shm_ctime"
 	Set gtmtypes("shmpool_buff_hdr",125,"off")=896
 	Set gtmtypes("shmpool_buff_hdr",125,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",125,"type")="time_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gt_shm_ctime.ctime")=125
-	Set gtmtypes("shmpool_buff_hdr",126,"name")="shmpool_buff_hdr.shadow_file_header.gt_shm_ctime.filler"
+	Set gtmtypes("shmpool_buff_hdr",125,"type")="gtm_time8"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gt_shm_ctime")=125
+	Set gtmtypes("shmpool_buff_hdr",126,"name")="shmpool_buff_hdr.shadow_file_header.gt_shm_ctime.ctime"
 	Set gtmtypes("shmpool_buff_hdr",126,"off")=896
 	Set gtmtypes("shmpool_buff_hdr",126,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",126,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gt_shm_ctime.filler")=126
-	Set gtmtypes("shmpool_buff_hdr",126,"dim")=2
-	Set gtmtypes("shmpool_buff_hdr",127,"name")="shmpool_buff_hdr.shadow_file_header.filler_unixonly"
-	Set gtmtypes("shmpool_buff_hdr",127,"off")=904
-	Set gtmtypes("shmpool_buff_hdr",127,"len")=40
-	Set gtmtypes("shmpool_buff_hdr",127,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_unixonly")=127
-	Set gtmtypes("shmpool_buff_hdr",128,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_retries"
-	Set gtmtypes("shmpool_buff_hdr",128,"off")=944
-	Set gtmtypes("shmpool_buff_hdr",128,"len")=20
-	Set gtmtypes("shmpool_buff_hdr",128,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_retries")=128
-	Set gtmtypes("shmpool_buff_hdr",128,"dim")=5
-	Set gtmtypes("shmpool_buff_hdr",129,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_puts"
-	Set gtmtypes("shmpool_buff_hdr",129,"off")=964
-	Set gtmtypes("shmpool_buff_hdr",129,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",126,"type")="time_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gt_shm_ctime.ctime")=126
+	Set gtmtypes("shmpool_buff_hdr",127,"name")="shmpool_buff_hdr.shadow_file_header.gt_shm_ctime.filler"
+	Set gtmtypes("shmpool_buff_hdr",127,"off")=896
+	Set gtmtypes("shmpool_buff_hdr",127,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",127,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gt_shm_ctime.filler")=127
+	Set gtmtypes("shmpool_buff_hdr",127,"dim")=2
+	Set gtmtypes("shmpool_buff_hdr",128,"name")="shmpool_buff_hdr.shadow_file_header.filler_unixonly"
+	Set gtmtypes("shmpool_buff_hdr",128,"off")=904
+	Set gtmtypes("shmpool_buff_hdr",128,"len")=40
+	Set gtmtypes("shmpool_buff_hdr",128,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_unixonly")=128
+	Set gtmtypes("shmpool_buff_hdr",129,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_retries"
+	Set gtmtypes("shmpool_buff_hdr",129,"off")=944
+	Set gtmtypes("shmpool_buff_hdr",129,"len")=20
 	Set gtmtypes("shmpool_buff_hdr",129,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_puts")=129
-	Set gtmtypes("shmpool_buff_hdr",130,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_kills"
-	Set gtmtypes("shmpool_buff_hdr",130,"off")=968
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_retries")=129
+	Set gtmtypes("shmpool_buff_hdr",129,"dim")=5
+	Set gtmtypes("shmpool_buff_hdr",130,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_puts"
+	Set gtmtypes("shmpool_buff_hdr",130,"off")=964
 	Set gtmtypes("shmpool_buff_hdr",130,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",130,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_kills")=130
-	Set gtmtypes("shmpool_buff_hdr",131,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_queries"
-	Set gtmtypes("shmpool_buff_hdr",131,"off")=972
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_puts")=130
+	Set gtmtypes("shmpool_buff_hdr",131,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_kills"
+	Set gtmtypes("shmpool_buff_hdr",131,"off")=968
 	Set gtmtypes("shmpool_buff_hdr",131,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",131,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_queries")=131
-	Set gtmtypes("shmpool_buff_hdr",132,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_gets"
-	Set gtmtypes("shmpool_buff_hdr",132,"off")=976
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_kills")=131
+	Set gtmtypes("shmpool_buff_hdr",132,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_queries"
+	Set gtmtypes("shmpool_buff_hdr",132,"off")=972
 	Set gtmtypes("shmpool_buff_hdr",132,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",132,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_gets")=132
-	Set gtmtypes("shmpool_buff_hdr",133,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_order"
-	Set gtmtypes("shmpool_buff_hdr",133,"off")=980
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_queries")=132
+	Set gtmtypes("shmpool_buff_hdr",133,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_gets"
+	Set gtmtypes("shmpool_buff_hdr",133,"off")=976
 	Set gtmtypes("shmpool_buff_hdr",133,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",133,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_order")=133
-	Set gtmtypes("shmpool_buff_hdr",134,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_zprevs"
-	Set gtmtypes("shmpool_buff_hdr",134,"off")=984
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_gets")=133
+	Set gtmtypes("shmpool_buff_hdr",134,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_order"
+	Set gtmtypes("shmpool_buff_hdr",134,"off")=980
 	Set gtmtypes("shmpool_buff_hdr",134,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",134,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_zprevs")=134
-	Set gtmtypes("shmpool_buff_hdr",135,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_data"
-	Set gtmtypes("shmpool_buff_hdr",135,"off")=988
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_order")=134
+	Set gtmtypes("shmpool_buff_hdr",135,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_zprevs"
+	Set gtmtypes("shmpool_buff_hdr",135,"off")=984
 	Set gtmtypes("shmpool_buff_hdr",135,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",135,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_data")=135
-	Set gtmtypes("shmpool_buff_hdr",136,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_puts_duplicate"
-	Set gtmtypes("shmpool_buff_hdr",136,"off")=992
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_zprevs")=135
+	Set gtmtypes("shmpool_buff_hdr",136,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_data"
+	Set gtmtypes("shmpool_buff_hdr",136,"off")=988
 	Set gtmtypes("shmpool_buff_hdr",136,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",136,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_puts_duplicate")=136
-	Set gtmtypes("shmpool_buff_hdr",137,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_tp_updates"
-	Set gtmtypes("shmpool_buff_hdr",137,"off")=996
+	Set gtmtypes("shmpool_buff_hdr",136,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_data")=136
+	Set gtmtypes("shmpool_buff_hdr",137,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_puts_duplicate"
+	Set gtmtypes("shmpool_buff_hdr",137,"off")=992
 	Set gtmtypes("shmpool_buff_hdr",137,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",137,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_tp_updates")=137
-	Set gtmtypes("shmpool_buff_hdr",138,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_tp_updates_duplicate"
-	Set gtmtypes("shmpool_buff_hdr",138,"off")=1000
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_puts_duplicate")=137
+	Set gtmtypes("shmpool_buff_hdr",138,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_tp_updates"
+	Set gtmtypes("shmpool_buff_hdr",138,"off")=996
 	Set gtmtypes("shmpool_buff_hdr",138,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",138,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_tp_updates_duplicate")=138
-	Set gtmtypes("shmpool_buff_hdr",139,"name")="shmpool_buff_hdr.shadow_file_header.filler_accounting_64_align"
-	Set gtmtypes("shmpool_buff_hdr",139,"off")=1004
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_tp_updates")=138
+	Set gtmtypes("shmpool_buff_hdr",139,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_tp_updates_duplicate"
+	Set gtmtypes("shmpool_buff_hdr",139,"off")=1000
 	Set gtmtypes("shmpool_buff_hdr",139,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",139,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_accounting_64_align")=139
-	Set gtmtypes("shmpool_buff_hdr",140,"name")="shmpool_buff_hdr.shadow_file_header.staleness"
-	Set gtmtypes("shmpool_buff_hdr",140,"off")=1008
-	Set gtmtypes("shmpool_buff_hdr",140,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",140,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.staleness")=140
-	Set gtmtypes("shmpool_buff_hdr",140,"dim")=2
-	Set gtmtypes("shmpool_buff_hdr",141,"name")="shmpool_buff_hdr.shadow_file_header.ccp_tick_interval"
-	Set gtmtypes("shmpool_buff_hdr",141,"off")=1016
+	Set gtmtypes("shmpool_buff_hdr",139,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_tp_updates_duplicate")=139
+	Set gtmtypes("shmpool_buff_hdr",140,"name")="shmpool_buff_hdr.shadow_file_header.filler_accounting_64_align"
+	Set gtmtypes("shmpool_buff_hdr",140,"off")=1004
+	Set gtmtypes("shmpool_buff_hdr",140,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",140,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_accounting_64_align")=140
+	Set gtmtypes("shmpool_buff_hdr",141,"name")="shmpool_buff_hdr.shadow_file_header.staleness"
+	Set gtmtypes("shmpool_buff_hdr",141,"off")=1008
 	Set gtmtypes("shmpool_buff_hdr",141,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",141,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.ccp_tick_interval")=141
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.staleness")=141
 	Set gtmtypes("shmpool_buff_hdr",141,"dim")=2
-	Set gtmtypes("shmpool_buff_hdr",142,"name")="shmpool_buff_hdr.shadow_file_header.ccp_quantum_interval"
-	Set gtmtypes("shmpool_buff_hdr",142,"off")=1024
+	Set gtmtypes("shmpool_buff_hdr",142,"name")="shmpool_buff_hdr.shadow_file_header.ccp_tick_interval"
+	Set gtmtypes("shmpool_buff_hdr",142,"off")=1016
 	Set gtmtypes("shmpool_buff_hdr",142,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",142,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.ccp_quantum_interval")=142
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.ccp_tick_interval")=142
 	Set gtmtypes("shmpool_buff_hdr",142,"dim")=2
-	Set gtmtypes("shmpool_buff_hdr",143,"name")="shmpool_buff_hdr.shadow_file_header.ccp_response_interval"
-	Set gtmtypes("shmpool_buff_hdr",143,"off")=1032
+	Set gtmtypes("shmpool_buff_hdr",143,"name")="shmpool_buff_hdr.shadow_file_header.ccp_quantum_interval"
+	Set gtmtypes("shmpool_buff_hdr",143,"off")=1024
 	Set gtmtypes("shmpool_buff_hdr",143,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",143,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.ccp_response_interval")=143
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.ccp_quantum_interval")=143
 	Set gtmtypes("shmpool_buff_hdr",143,"dim")=2
-	Set gtmtypes("shmpool_buff_hdr",144,"name")="shmpool_buff_hdr.shadow_file_header.ccp_jnl_before"
-	Set gtmtypes("shmpool_buff_hdr",144,"off")=1040
-	Set gtmtypes("shmpool_buff_hdr",144,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",144,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.ccp_jnl_before")=144
-	Set gtmtypes("shmpool_buff_hdr",145,"name")="shmpool_buff_hdr.shadow_file_header.clustered"
-	Set gtmtypes("shmpool_buff_hdr",145,"off")=1044
+	Set gtmtypes("shmpool_buff_hdr",144,"name")="shmpool_buff_hdr.shadow_file_header.ccp_response_interval"
+	Set gtmtypes("shmpool_buff_hdr",144,"off")=1032
+	Set gtmtypes("shmpool_buff_hdr",144,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",144,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.ccp_response_interval")=144
+	Set gtmtypes("shmpool_buff_hdr",144,"dim")=2
+	Set gtmtypes("shmpool_buff_hdr",145,"name")="shmpool_buff_hdr.shadow_file_header.ccp_jnl_before"
+	Set gtmtypes("shmpool_buff_hdr",145,"off")=1040
 	Set gtmtypes("shmpool_buff_hdr",145,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",145,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.clustered")=145
-	Set gtmtypes("shmpool_buff_hdr",146,"name")="shmpool_buff_hdr.shadow_file_header.unbacked_cache"
-	Set gtmtypes("shmpool_buff_hdr",146,"off")=1048
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.ccp_jnl_before")=145
+	Set gtmtypes("shmpool_buff_hdr",146,"name")="shmpool_buff_hdr.shadow_file_header.clustered"
+	Set gtmtypes("shmpool_buff_hdr",146,"off")=1044
 	Set gtmtypes("shmpool_buff_hdr",146,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",146,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unbacked_cache")=146
-	Set gtmtypes("shmpool_buff_hdr",147,"name")="shmpool_buff_hdr.shadow_file_header.rc_srv_cnt"
-	Set gtmtypes("shmpool_buff_hdr",147,"off")=1052
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.clustered")=146
+	Set gtmtypes("shmpool_buff_hdr",147,"name")="shmpool_buff_hdr.shadow_file_header.unbacked_cache"
+	Set gtmtypes("shmpool_buff_hdr",147,"off")=1048
 	Set gtmtypes("shmpool_buff_hdr",147,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",147,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.rc_srv_cnt")=147
-	Set gtmtypes("shmpool_buff_hdr",148,"name")="shmpool_buff_hdr.shadow_file_header.dsid"
-	Set gtmtypes("shmpool_buff_hdr",148,"off")=1056
+	Set gtmtypes("shmpool_buff_hdr",147,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unbacked_cache")=147
+	Set gtmtypes("shmpool_buff_hdr",148,"name")="shmpool_buff_hdr.shadow_file_header.rc_srv_cnt"
+	Set gtmtypes("shmpool_buff_hdr",148,"off")=1052
 	Set gtmtypes("shmpool_buff_hdr",148,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",148,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.dsid")=148
-	Set gtmtypes("shmpool_buff_hdr",149,"name")="shmpool_buff_hdr.shadow_file_header.rc_node"
-	Set gtmtypes("shmpool_buff_hdr",149,"off")=1060
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.rc_srv_cnt")=148
+	Set gtmtypes("shmpool_buff_hdr",149,"name")="shmpool_buff_hdr.shadow_file_header.dsid"
+	Set gtmtypes("shmpool_buff_hdr",149,"off")=1056
 	Set gtmtypes("shmpool_buff_hdr",149,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",149,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.rc_node")=149
-	Set gtmtypes("shmpool_buff_hdr",150,"name")="shmpool_buff_hdr.shadow_file_header.filler_ccp_rc"
-	Set gtmtypes("shmpool_buff_hdr",150,"off")=1064
-	Set gtmtypes("shmpool_buff_hdr",150,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",150,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_ccp_rc")=150
-	Set gtmtypes("shmpool_buff_hdr",151,"name")="shmpool_buff_hdr.shadow_file_header.reg_seqno"
-	Set gtmtypes("shmpool_buff_hdr",151,"off")=1072
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.dsid")=149
+	Set gtmtypes("shmpool_buff_hdr",150,"name")="shmpool_buff_hdr.shadow_file_header.rc_node"
+	Set gtmtypes("shmpool_buff_hdr",150,"off")=1060
+	Set gtmtypes("shmpool_buff_hdr",150,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",150,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.rc_node")=150
+	Set gtmtypes("shmpool_buff_hdr",151,"name")="shmpool_buff_hdr.shadow_file_header.filler_ccp_rc"
+	Set gtmtypes("shmpool_buff_hdr",151,"off")=1064
 	Set gtmtypes("shmpool_buff_hdr",151,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",151,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reg_seqno")=151
-	Set gtmtypes("shmpool_buff_hdr",152,"name")="shmpool_buff_hdr.shadow_file_header.pre_multisite_resync_seqno"
-	Set gtmtypes("shmpool_buff_hdr",152,"off")=1080
+	Set gtmtypes("shmpool_buff_hdr",151,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_ccp_rc")=151
+	Set gtmtypes("shmpool_buff_hdr",152,"name")="shmpool_buff_hdr.shadow_file_header.reg_seqno"
+	Set gtmtypes("shmpool_buff_hdr",152,"off")=1072
 	Set gtmtypes("shmpool_buff_hdr",152,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",152,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.pre_multisite_resync_seqno")=152
-	Set gtmtypes("shmpool_buff_hdr",153,"name")="shmpool_buff_hdr.shadow_file_header.zqgblmod_tn"
-	Set gtmtypes("shmpool_buff_hdr",153,"off")=1088
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reg_seqno")=152
+	Set gtmtypes("shmpool_buff_hdr",153,"name")="shmpool_buff_hdr.shadow_file_header.pre_multisite_resync_seqno"
+	Set gtmtypes("shmpool_buff_hdr",153,"off")=1080
 	Set gtmtypes("shmpool_buff_hdr",153,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",153,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.zqgblmod_tn")=153
-	Set gtmtypes("shmpool_buff_hdr",154,"name")="shmpool_buff_hdr.shadow_file_header.zqgblmod_seqno"
-	Set gtmtypes("shmpool_buff_hdr",154,"off")=1096
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.pre_multisite_resync_seqno")=153
+	Set gtmtypes("shmpool_buff_hdr",154,"name")="shmpool_buff_hdr.shadow_file_header.zqgblmod_tn"
+	Set gtmtypes("shmpool_buff_hdr",154,"off")=1088
 	Set gtmtypes("shmpool_buff_hdr",154,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",154,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.zqgblmod_seqno")=154
-	Set gtmtypes("shmpool_buff_hdr",155,"name")="shmpool_buff_hdr.shadow_file_header.repl_state"
-	Set gtmtypes("shmpool_buff_hdr",155,"off")=1104
-	Set gtmtypes("shmpool_buff_hdr",155,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",155,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.repl_state")=155
-	Set gtmtypes("shmpool_buff_hdr",156,"name")="shmpool_buff_hdr.shadow_file_header.multi_site_open"
-	Set gtmtypes("shmpool_buff_hdr",156,"off")=1108
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.zqgblmod_tn")=154
+	Set gtmtypes("shmpool_buff_hdr",155,"name")="shmpool_buff_hdr.shadow_file_header.zqgblmod_seqno"
+	Set gtmtypes("shmpool_buff_hdr",155,"off")=1096
+	Set gtmtypes("shmpool_buff_hdr",155,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",155,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.zqgblmod_seqno")=155
+	Set gtmtypes("shmpool_buff_hdr",156,"name")="shmpool_buff_hdr.shadow_file_header.repl_state"
+	Set gtmtypes("shmpool_buff_hdr",156,"off")=1104
 	Set gtmtypes("shmpool_buff_hdr",156,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",156,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.multi_site_open")=156
-	Set gtmtypes("shmpool_buff_hdr",157,"name")="shmpool_buff_hdr.shadow_file_header.filler_seqno"
-	Set gtmtypes("shmpool_buff_hdr",157,"off")=1112
-	Set gtmtypes("shmpool_buff_hdr",157,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",157,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_seqno")=157
-	Set gtmtypes("shmpool_buff_hdr",158,"name")="shmpool_buff_hdr.shadow_file_header.filler_repl"
-	Set gtmtypes("shmpool_buff_hdr",158,"off")=1120
-	Set gtmtypes("shmpool_buff_hdr",158,"len")=16
-	Set gtmtypes("shmpool_buff_hdr",158,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_repl")=158
-	Set gtmtypes("shmpool_buff_hdr",159,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_tp_retries"
-	Set gtmtypes("shmpool_buff_hdr",159,"off")=1136
-	Set gtmtypes("shmpool_buff_hdr",159,"len")=48
-	Set gtmtypes("shmpool_buff_hdr",159,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_tp_retries")=159
-	Set gtmtypes("shmpool_buff_hdr",159,"dim")=12
-	Set gtmtypes("shmpool_buff_hdr",160,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_tp_retries_conflicts"
-	Set gtmtypes("shmpool_buff_hdr",160,"off")=1184
+	Set gtmtypes("shmpool_buff_hdr",156,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.repl_state")=156
+	Set gtmtypes("shmpool_buff_hdr",157,"name")="shmpool_buff_hdr.shadow_file_header.multi_site_open"
+	Set gtmtypes("shmpool_buff_hdr",157,"off")=1108
+	Set gtmtypes("shmpool_buff_hdr",157,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",157,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.multi_site_open")=157
+	Set gtmtypes("shmpool_buff_hdr",158,"name")="shmpool_buff_hdr.shadow_file_header.filler_seqno"
+	Set gtmtypes("shmpool_buff_hdr",158,"off")=1112
+	Set gtmtypes("shmpool_buff_hdr",158,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",158,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_seqno")=158
+	Set gtmtypes("shmpool_buff_hdr",159,"name")="shmpool_buff_hdr.shadow_file_header.filler_repl"
+	Set gtmtypes("shmpool_buff_hdr",159,"off")=1120
+	Set gtmtypes("shmpool_buff_hdr",159,"len")=16
+	Set gtmtypes("shmpool_buff_hdr",159,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_repl")=159
+	Set gtmtypes("shmpool_buff_hdr",160,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_tp_retries"
+	Set gtmtypes("shmpool_buff_hdr",160,"off")=1136
 	Set gtmtypes("shmpool_buff_hdr",160,"len")=48
 	Set gtmtypes("shmpool_buff_hdr",160,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_tp_retries_conflicts")=160
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_tp_retries")=160
 	Set gtmtypes("shmpool_buff_hdr",160,"dim")=12
-	Set gtmtypes("shmpool_buff_hdr",161,"name")="shmpool_buff_hdr.shadow_file_header.tp_cdb_sc_blkmod"
-	Set gtmtypes("shmpool_buff_hdr",161,"off")=1232
-	Set gtmtypes("shmpool_buff_hdr",161,"len")=32
+	Set gtmtypes("shmpool_buff_hdr",161,"name")="shmpool_buff_hdr.shadow_file_header.filler_n_tp_retries_conflicts"
+	Set gtmtypes("shmpool_buff_hdr",161,"off")=1184
+	Set gtmtypes("shmpool_buff_hdr",161,"len")=48
 	Set gtmtypes("shmpool_buff_hdr",161,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.tp_cdb_sc_blkmod")=161
-	Set gtmtypes("shmpool_buff_hdr",161,"dim")=8
-	Set gtmtypes("shmpool_buff_hdr",162,"name")="shmpool_buff_hdr.shadow_file_header.jnl_alq"
-	Set gtmtypes("shmpool_buff_hdr",162,"off")=1264
-	Set gtmtypes("shmpool_buff_hdr",162,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",162,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_alq")=162
-	Set gtmtypes("shmpool_buff_hdr",163,"name")="shmpool_buff_hdr.shadow_file_header.jnl_deq"
-	Set gtmtypes("shmpool_buff_hdr",163,"off")=1268
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_n_tp_retries_conflicts")=161
+	Set gtmtypes("shmpool_buff_hdr",161,"dim")=12
+	Set gtmtypes("shmpool_buff_hdr",162,"name")="shmpool_buff_hdr.shadow_file_header.tp_cdb_sc_blkmod"
+	Set gtmtypes("shmpool_buff_hdr",162,"off")=1232
+	Set gtmtypes("shmpool_buff_hdr",162,"len")=32
+	Set gtmtypes("shmpool_buff_hdr",162,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.tp_cdb_sc_blkmod")=162
+	Set gtmtypes("shmpool_buff_hdr",162,"dim")=8
+	Set gtmtypes("shmpool_buff_hdr",163,"name")="shmpool_buff_hdr.shadow_file_header.jnl_alq"
+	Set gtmtypes("shmpool_buff_hdr",163,"off")=1264
 	Set gtmtypes("shmpool_buff_hdr",163,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",163,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_deq")=163
-	Set gtmtypes("shmpool_buff_hdr",164,"name")="shmpool_buff_hdr.shadow_file_header.jnl_buffer_size"
-	Set gtmtypes("shmpool_buff_hdr",164,"off")=1272
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_alq")=163
+	Set gtmtypes("shmpool_buff_hdr",164,"name")="shmpool_buff_hdr.shadow_file_header.jnl_deq"
+	Set gtmtypes("shmpool_buff_hdr",164,"off")=1268
 	Set gtmtypes("shmpool_buff_hdr",164,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",164,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_buffer_size")=164
-	Set gtmtypes("shmpool_buff_hdr",165,"name")="shmpool_buff_hdr.shadow_file_header.jnl_before_image"
-	Set gtmtypes("shmpool_buff_hdr",165,"off")=1276
+	Set gtmtypes("shmpool_buff_hdr",164,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_deq")=164
+	Set gtmtypes("shmpool_buff_hdr",165,"name")="shmpool_buff_hdr.shadow_file_header.jnl_buffer_size"
+	Set gtmtypes("shmpool_buff_hdr",165,"off")=1272
 	Set gtmtypes("shmpool_buff_hdr",165,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",165,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_before_image")=165
-	Set gtmtypes("shmpool_buff_hdr",166,"name")="shmpool_buff_hdr.shadow_file_header.jnl_state"
-	Set gtmtypes("shmpool_buff_hdr",166,"off")=1280
+	Set gtmtypes("shmpool_buff_hdr",165,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_buffer_size")=165
+	Set gtmtypes("shmpool_buff_hdr",166,"name")="shmpool_buff_hdr.shadow_file_header.jnl_before_image"
+	Set gtmtypes("shmpool_buff_hdr",166,"off")=1276
 	Set gtmtypes("shmpool_buff_hdr",166,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",166,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_state")=166
-	Set gtmtypes("shmpool_buff_hdr",167,"name")="shmpool_buff_hdr.shadow_file_header.jnl_file_len"
-	Set gtmtypes("shmpool_buff_hdr",167,"off")=1284
+	Set gtmtypes("shmpool_buff_hdr",166,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_before_image")=166
+	Set gtmtypes("shmpool_buff_hdr",167,"name")="shmpool_buff_hdr.shadow_file_header.jnl_state"
+	Set gtmtypes("shmpool_buff_hdr",167,"off")=1280
 	Set gtmtypes("shmpool_buff_hdr",167,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",167,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_file_len")=167
-	Set gtmtypes("shmpool_buff_hdr",168,"name")="shmpool_buff_hdr.shadow_file_header.autoswitchlimit"
-	Set gtmtypes("shmpool_buff_hdr",168,"off")=1288
+	Set gtmtypes("shmpool_buff_hdr",167,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_state")=167
+	Set gtmtypes("shmpool_buff_hdr",168,"name")="shmpool_buff_hdr.shadow_file_header.jnl_file_len"
+	Set gtmtypes("shmpool_buff_hdr",168,"off")=1284
 	Set gtmtypes("shmpool_buff_hdr",168,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",168,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.autoswitchlimit")=168
-	Set gtmtypes("shmpool_buff_hdr",169,"name")="shmpool_buff_hdr.shadow_file_header.epoch_interval"
-	Set gtmtypes("shmpool_buff_hdr",169,"off")=1292
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_file_len")=168
+	Set gtmtypes("shmpool_buff_hdr",169,"name")="shmpool_buff_hdr.shadow_file_header.autoswitchlimit"
+	Set gtmtypes("shmpool_buff_hdr",169,"off")=1288
 	Set gtmtypes("shmpool_buff_hdr",169,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",169,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.epoch_interval")=169
-	Set gtmtypes("shmpool_buff_hdr",170,"name")="shmpool_buff_hdr.shadow_file_header.alignsize"
-	Set gtmtypes("shmpool_buff_hdr",170,"off")=1296
+	Set gtmtypes("shmpool_buff_hdr",169,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.autoswitchlimit")=169
+	Set gtmtypes("shmpool_buff_hdr",170,"name")="shmpool_buff_hdr.shadow_file_header.epoch_interval"
+	Set gtmtypes("shmpool_buff_hdr",170,"off")=1292
 	Set gtmtypes("shmpool_buff_hdr",170,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",170,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.alignsize")=170
-	Set gtmtypes("shmpool_buff_hdr",171,"name")="shmpool_buff_hdr.shadow_file_header.jnl_sync_io"
-	Set gtmtypes("shmpool_buff_hdr",171,"off")=1300
+	Set gtmtypes("shmpool_buff_hdr",170,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.epoch_interval")=170
+	Set gtmtypes("shmpool_buff_hdr",171,"name")="shmpool_buff_hdr.shadow_file_header.alignsize"
+	Set gtmtypes("shmpool_buff_hdr",171,"off")=1296
 	Set gtmtypes("shmpool_buff_hdr",171,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",171,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_sync_io")=171
-	Set gtmtypes("shmpool_buff_hdr",172,"name")="shmpool_buff_hdr.shadow_file_header.yield_lmt"
-	Set gtmtypes("shmpool_buff_hdr",172,"off")=1304
+	Set gtmtypes("shmpool_buff_hdr",171,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.alignsize")=171
+	Set gtmtypes("shmpool_buff_hdr",172,"name")="shmpool_buff_hdr.shadow_file_header.jnl_sync_io"
+	Set gtmtypes("shmpool_buff_hdr",172,"off")=1300
 	Set gtmtypes("shmpool_buff_hdr",172,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",172,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.yield_lmt")=172
-	Set gtmtypes("shmpool_buff_hdr",173,"name")="shmpool_buff_hdr.shadow_file_header.turn_around_point"
-	Set gtmtypes("shmpool_buff_hdr",173,"off")=1308
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_sync_io")=172
+	Set gtmtypes("shmpool_buff_hdr",173,"name")="shmpool_buff_hdr.shadow_file_header.yield_lmt"
+	Set gtmtypes("shmpool_buff_hdr",173,"off")=1304
 	Set gtmtypes("shmpool_buff_hdr",173,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",173,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.turn_around_point")=173
-	Set gtmtypes("shmpool_buff_hdr",174,"name")="shmpool_buff_hdr.shadow_file_header.jnl_eovtn"
-	Set gtmtypes("shmpool_buff_hdr",174,"off")=1312
-	Set gtmtypes("shmpool_buff_hdr",174,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",174,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_eovtn")=174
-	Set gtmtypes("shmpool_buff_hdr",175,"name")="shmpool_buff_hdr.shadow_file_header.filler_jnl"
-	Set gtmtypes("shmpool_buff_hdr",175,"off")=1320
+	Set gtmtypes("shmpool_buff_hdr",173,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.yield_lmt")=173
+	Set gtmtypes("shmpool_buff_hdr",174,"name")="shmpool_buff_hdr.shadow_file_header.turn_around_point"
+	Set gtmtypes("shmpool_buff_hdr",174,"off")=1308
+	Set gtmtypes("shmpool_buff_hdr",174,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",174,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.turn_around_point")=174
+	Set gtmtypes("shmpool_buff_hdr",175,"name")="shmpool_buff_hdr.shadow_file_header.jnl_eovtn"
+	Set gtmtypes("shmpool_buff_hdr",175,"off")=1312
 	Set gtmtypes("shmpool_buff_hdr",175,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",175,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_jnl")=175
-	Set gtmtypes("shmpool_buff_hdr",176,"name")="shmpool_buff_hdr.shadow_file_header.intrpt_recov_resync_seqno"
-	Set gtmtypes("shmpool_buff_hdr",176,"off")=1328
+	Set gtmtypes("shmpool_buff_hdr",175,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_eovtn")=175
+	Set gtmtypes("shmpool_buff_hdr",176,"name")="shmpool_buff_hdr.shadow_file_header.filler_jnl"
+	Set gtmtypes("shmpool_buff_hdr",176,"off")=1320
 	Set gtmtypes("shmpool_buff_hdr",176,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",176,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.intrpt_recov_resync_seqno")=176
-	Set gtmtypes("shmpool_buff_hdr",177,"name")="shmpool_buff_hdr.shadow_file_header.intrpt_recov_tp_resolve_time"
-	Set gtmtypes("shmpool_buff_hdr",177,"off")=1336
-	Set gtmtypes("shmpool_buff_hdr",177,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",177,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.intrpt_recov_tp_resolve_time")=177
-	Set gtmtypes("shmpool_buff_hdr",178,"name")="shmpool_buff_hdr.shadow_file_header.recov_interrupted"
-	Set gtmtypes("shmpool_buff_hdr",178,"off")=1340
+	Set gtmtypes("shmpool_buff_hdr",176,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_jnl")=176
+	Set gtmtypes("shmpool_buff_hdr",177,"name")="shmpool_buff_hdr.shadow_file_header.intrpt_recov_resync_seqno"
+	Set gtmtypes("shmpool_buff_hdr",177,"off")=1328
+	Set gtmtypes("shmpool_buff_hdr",177,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",177,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.intrpt_recov_resync_seqno")=177
+	Set gtmtypes("shmpool_buff_hdr",178,"name")="shmpool_buff_hdr.shadow_file_header.intrpt_recov_tp_resolve_time"
+	Set gtmtypes("shmpool_buff_hdr",178,"off")=1336
 	Set gtmtypes("shmpool_buff_hdr",178,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",178,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recov_interrupted")=178
-	Set gtmtypes("shmpool_buff_hdr",179,"name")="shmpool_buff_hdr.shadow_file_header.intrpt_recov_jnl_state"
-	Set gtmtypes("shmpool_buff_hdr",179,"off")=1344
+	Set gtmtypes("shmpool_buff_hdr",178,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.intrpt_recov_tp_resolve_time")=178
+	Set gtmtypes("shmpool_buff_hdr",179,"name")="shmpool_buff_hdr.shadow_file_header.recov_interrupted"
+	Set gtmtypes("shmpool_buff_hdr",179,"off")=1340
 	Set gtmtypes("shmpool_buff_hdr",179,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",179,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.intrpt_recov_jnl_state")=179
-	Set gtmtypes("shmpool_buff_hdr",180,"name")="shmpool_buff_hdr.shadow_file_header.intrpt_recov_repl_state"
-	Set gtmtypes("shmpool_buff_hdr",180,"off")=1348
+	Set gtmtypes("shmpool_buff_hdr",179,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recov_interrupted")=179
+	Set gtmtypes("shmpool_buff_hdr",180,"name")="shmpool_buff_hdr.shadow_file_header.intrpt_recov_jnl_state"
+	Set gtmtypes("shmpool_buff_hdr",180,"off")=1344
 	Set gtmtypes("shmpool_buff_hdr",180,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",180,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.intrpt_recov_repl_state")=180
-	Set gtmtypes("shmpool_buff_hdr",181,"name")="shmpool_buff_hdr.shadow_file_header.before_trunc_total_blks"
-	Set gtmtypes("shmpool_buff_hdr",181,"off")=1352
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.intrpt_recov_jnl_state")=180
+	Set gtmtypes("shmpool_buff_hdr",181,"name")="shmpool_buff_hdr.shadow_file_header.intrpt_recov_repl_state"
+	Set gtmtypes("shmpool_buff_hdr",181,"off")=1348
 	Set gtmtypes("shmpool_buff_hdr",181,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",181,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.before_trunc_total_blks")=181
-	Set gtmtypes("shmpool_buff_hdr",182,"name")="shmpool_buff_hdr.shadow_file_header.after_trunc_total_blks"
-	Set gtmtypes("shmpool_buff_hdr",182,"off")=1356
+	Set gtmtypes("shmpool_buff_hdr",181,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.intrpt_recov_repl_state")=181
+	Set gtmtypes("shmpool_buff_hdr",182,"name")="shmpool_buff_hdr.shadow_file_header.before_trunc_total_blks"
+	Set gtmtypes("shmpool_buff_hdr",182,"off")=1352
 	Set gtmtypes("shmpool_buff_hdr",182,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",182,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.after_trunc_total_blks")=182
-	Set gtmtypes("shmpool_buff_hdr",183,"name")="shmpool_buff_hdr.shadow_file_header.before_trunc_free_blocks"
-	Set gtmtypes("shmpool_buff_hdr",183,"off")=1360
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.before_trunc_total_blks")=182
+	Set gtmtypes("shmpool_buff_hdr",183,"name")="shmpool_buff_hdr.shadow_file_header.after_trunc_total_blks"
+	Set gtmtypes("shmpool_buff_hdr",183,"off")=1356
 	Set gtmtypes("shmpool_buff_hdr",183,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",183,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.before_trunc_free_blocks")=183
-	Set gtmtypes("shmpool_buff_hdr",184,"name")="shmpool_buff_hdr.shadow_file_header.filler_trunc"
-	Set gtmtypes("shmpool_buff_hdr",184,"off")=1364
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.after_trunc_total_blks")=183
+	Set gtmtypes("shmpool_buff_hdr",184,"name")="shmpool_buff_hdr.shadow_file_header.before_trunc_free_blocks"
+	Set gtmtypes("shmpool_buff_hdr",184,"off")=1360
 	Set gtmtypes("shmpool_buff_hdr",184,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",184,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_trunc")=184
-	Set gtmtypes("shmpool_buff_hdr",185,"name")="shmpool_buff_hdr.shadow_file_header.filler_1k"
-	Set gtmtypes("shmpool_buff_hdr",185,"off")=1368
-	Set gtmtypes("shmpool_buff_hdr",185,"len")=24
-	Set gtmtypes("shmpool_buff_hdr",185,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_1k")=185
-	Set gtmtypes("shmpool_buff_hdr",186,"name")="shmpool_buff_hdr.shadow_file_header.jnl_file_name"
-	Set gtmtypes("shmpool_buff_hdr",186,"off")=1392
-	Set gtmtypes("shmpool_buff_hdr",186,"len")=256
-	Set gtmtypes("shmpool_buff_hdr",186,"type")="unsigned-char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_file_name")=186
-	Set gtmtypes("shmpool_buff_hdr",187,"name")="shmpool_buff_hdr.shadow_file_header.reorg_restart_key"
-	Set gtmtypes("shmpool_buff_hdr",187,"off")=1648
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.before_trunc_free_blocks")=184
+	Set gtmtypes("shmpool_buff_hdr",185,"name")="shmpool_buff_hdr.shadow_file_header.filler_trunc"
+	Set gtmtypes("shmpool_buff_hdr",185,"off")=1364
+	Set gtmtypes("shmpool_buff_hdr",185,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",185,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_trunc")=185
+	Set gtmtypes("shmpool_buff_hdr",186,"name")="shmpool_buff_hdr.shadow_file_header.filler_1k"
+	Set gtmtypes("shmpool_buff_hdr",186,"off")=1368
+	Set gtmtypes("shmpool_buff_hdr",186,"len")=24
+	Set gtmtypes("shmpool_buff_hdr",186,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_1k")=186
+	Set gtmtypes("shmpool_buff_hdr",187,"name")="shmpool_buff_hdr.shadow_file_header.jnl_file_name"
+	Set gtmtypes("shmpool_buff_hdr",187,"off")=1392
 	Set gtmtypes("shmpool_buff_hdr",187,"len")=256
 	Set gtmtypes("shmpool_buff_hdr",187,"type")="unsigned-char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reorg_restart_key")=187
-	Set gtmtypes("shmpool_buff_hdr",188,"name")="shmpool_buff_hdr.shadow_file_header.machine_name"
-	Set gtmtypes("shmpool_buff_hdr",188,"off")=1904
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_file_name")=187
+	Set gtmtypes("shmpool_buff_hdr",188,"name")="shmpool_buff_hdr.shadow_file_header.reorg_restart_key"
+	Set gtmtypes("shmpool_buff_hdr",188,"off")=1648
 	Set gtmtypes("shmpool_buff_hdr",188,"len")=256
-	Set gtmtypes("shmpool_buff_hdr",188,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.machine_name")=188
-	Set gtmtypes("shmpool_buff_hdr",189,"name")="shmpool_buff_hdr.shadow_file_header.encryption_hash"
-	Set gtmtypes("shmpool_buff_hdr",189,"off")=2160
-	Set gtmtypes("shmpool_buff_hdr",189,"len")=80
+	Set gtmtypes("shmpool_buff_hdr",188,"type")="unsigned-char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reorg_restart_key")=188
+	Set gtmtypes("shmpool_buff_hdr",189,"name")="shmpool_buff_hdr.shadow_file_header.machine_name"
+	Set gtmtypes("shmpool_buff_hdr",189,"off")=1904
+	Set gtmtypes("shmpool_buff_hdr",189,"len")=256
 	Set gtmtypes("shmpool_buff_hdr",189,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.encryption_hash")=189
-	Set gtmtypes("shmpool_buff_hdr",190,"name")="shmpool_buff_hdr.shadow_file_header.encryption_hash2"
-	Set gtmtypes("shmpool_buff_hdr",190,"off")=2240
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.machine_name")=189
+	Set gtmtypes("shmpool_buff_hdr",190,"name")="shmpool_buff_hdr.shadow_file_header.encryption_hash"
+	Set gtmtypes("shmpool_buff_hdr",190,"off")=2160
 	Set gtmtypes("shmpool_buff_hdr",190,"len")=80
 	Set gtmtypes("shmpool_buff_hdr",190,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.encryption_hash2")=190
-	Set gtmtypes("shmpool_buff_hdr",191,"name")="shmpool_buff_hdr.shadow_file_header.non_null_iv"
-	Set gtmtypes("shmpool_buff_hdr",191,"off")=2320
-	Set gtmtypes("shmpool_buff_hdr",191,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",191,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.non_null_iv")=191
-	Set gtmtypes("shmpool_buff_hdr",192,"name")="shmpool_buff_hdr.shadow_file_header.encryption_hash_cutoff"
-	Set gtmtypes("shmpool_buff_hdr",192,"off")=2324
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.encryption_hash")=190
+	Set gtmtypes("shmpool_buff_hdr",191,"name")="shmpool_buff_hdr.shadow_file_header.encryption_hash2"
+	Set gtmtypes("shmpool_buff_hdr",191,"off")=2240
+	Set gtmtypes("shmpool_buff_hdr",191,"len")=80
+	Set gtmtypes("shmpool_buff_hdr",191,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.encryption_hash2")=191
+	Set gtmtypes("shmpool_buff_hdr",192,"name")="shmpool_buff_hdr.shadow_file_header.non_null_iv"
+	Set gtmtypes("shmpool_buff_hdr",192,"off")=2320
 	Set gtmtypes("shmpool_buff_hdr",192,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",192,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.encryption_hash_cutoff")=192
-	Set gtmtypes("shmpool_buff_hdr",193,"name")="shmpool_buff_hdr.shadow_file_header.encryption_hash2_start_tn"
-	Set gtmtypes("shmpool_buff_hdr",193,"off")=2328
-	Set gtmtypes("shmpool_buff_hdr",193,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",193,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.encryption_hash2_start_tn")=193
-	Set gtmtypes("shmpool_buff_hdr",194,"name")="shmpool_buff_hdr.shadow_file_header.filler_encrypt"
-	Set gtmtypes("shmpool_buff_hdr",194,"off")=2336
-	Set gtmtypes("shmpool_buff_hdr",194,"len")=80
-	Set gtmtypes("shmpool_buff_hdr",194,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_encrypt")=194
-	Set gtmtypes("shmpool_buff_hdr",195,"name")="shmpool_buff_hdr.shadow_file_header.total_buffer_flush_tn"
-	Set gtmtypes("shmpool_buff_hdr",195,"off")=2416
-	Set gtmtypes("shmpool_buff_hdr",195,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",195,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.total_buffer_flush_tn")=195
-	Set gtmtypes("shmpool_buff_hdr",196,"name")="shmpool_buff_hdr.shadow_file_header.bufct_buffer_flush_tn"
-	Set gtmtypes("shmpool_buff_hdr",196,"off")=2424
+	Set gtmtypes("shmpool_buff_hdr",192,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.non_null_iv")=192
+	Set gtmtypes("shmpool_buff_hdr",193,"name")="shmpool_buff_hdr.shadow_file_header.encryption_hash_cutoff"
+	Set gtmtypes("shmpool_buff_hdr",193,"off")=2324
+	Set gtmtypes("shmpool_buff_hdr",193,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",193,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.encryption_hash_cutoff")=193
+	Set gtmtypes("shmpool_buff_hdr",194,"name")="shmpool_buff_hdr.shadow_file_header.encryption_hash2_start_tn"
+	Set gtmtypes("shmpool_buff_hdr",194,"off")=2328
+	Set gtmtypes("shmpool_buff_hdr",194,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",194,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.encryption_hash2_start_tn")=194
+	Set gtmtypes("shmpool_buff_hdr",195,"name")="shmpool_buff_hdr.shadow_file_header.filler_encrypt"
+	Set gtmtypes("shmpool_buff_hdr",195,"off")=2336
+	Set gtmtypes("shmpool_buff_hdr",195,"len")=80
+	Set gtmtypes("shmpool_buff_hdr",195,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_encrypt")=195
+	Set gtmtypes("shmpool_buff_hdr",196,"name")="shmpool_buff_hdr.shadow_file_header.total_buffer_flush_tn"
+	Set gtmtypes("shmpool_buff_hdr",196,"off")=2416
 	Set gtmtypes("shmpool_buff_hdr",196,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",196,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bufct_buffer_flush_tn")=196
-	Set gtmtypes("shmpool_buff_hdr",197,"name")="shmpool_buff_hdr.shadow_file_header.bufct_buffer_flush_loop_tn"
-	Set gtmtypes("shmpool_buff_hdr",197,"off")=2432
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.total_buffer_flush_tn")=196
+	Set gtmtypes("shmpool_buff_hdr",197,"name")="shmpool_buff_hdr.shadow_file_header.bufct_buffer_flush_tn"
+	Set gtmtypes("shmpool_buff_hdr",197,"off")=2424
 	Set gtmtypes("shmpool_buff_hdr",197,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",197,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bufct_buffer_flush_loop_tn")=197
-	Set gtmtypes("shmpool_buff_hdr",198,"name")="shmpool_buff_hdr.shadow_file_header.wrt_calls_tn"
-	Set gtmtypes("shmpool_buff_hdr",198,"off")=2440
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bufct_buffer_flush_tn")=197
+	Set gtmtypes("shmpool_buff_hdr",198,"name")="shmpool_buff_hdr.shadow_file_header.bufct_buffer_flush_loop_tn"
+	Set gtmtypes("shmpool_buff_hdr",198,"off")=2432
 	Set gtmtypes("shmpool_buff_hdr",198,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",198,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_calls_tn")=198
-	Set gtmtypes("shmpool_buff_hdr",199,"name")="shmpool_buff_hdr.shadow_file_header.wrt_count_tn"
-	Set gtmtypes("shmpool_buff_hdr",199,"off")=2448
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bufct_buffer_flush_loop_tn")=198
+	Set gtmtypes("shmpool_buff_hdr",199,"name")="shmpool_buff_hdr.shadow_file_header.wrt_calls_tn"
+	Set gtmtypes("shmpool_buff_hdr",199,"off")=2440
 	Set gtmtypes("shmpool_buff_hdr",199,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",199,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_count_tn")=199
-	Set gtmtypes("shmpool_buff_hdr",200,"name")="shmpool_buff_hdr.shadow_file_header.wrt_blocked_tn"
-	Set gtmtypes("shmpool_buff_hdr",200,"off")=2456
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_calls_tn")=199
+	Set gtmtypes("shmpool_buff_hdr",200,"name")="shmpool_buff_hdr.shadow_file_header.wrt_count_tn"
+	Set gtmtypes("shmpool_buff_hdr",200,"off")=2448
 	Set gtmtypes("shmpool_buff_hdr",200,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",200,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_blocked_tn")=200
-	Set gtmtypes("shmpool_buff_hdr",201,"name")="shmpool_buff_hdr.shadow_file_header.wrt_busy_tn"
-	Set gtmtypes("shmpool_buff_hdr",201,"off")=2464
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_count_tn")=200
+	Set gtmtypes("shmpool_buff_hdr",201,"name")="shmpool_buff_hdr.shadow_file_header.wrt_blocked_tn"
+	Set gtmtypes("shmpool_buff_hdr",201,"off")=2456
 	Set gtmtypes("shmpool_buff_hdr",201,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",201,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_busy_tn")=201
-	Set gtmtypes("shmpool_buff_hdr",202,"name")="shmpool_buff_hdr.shadow_file_header.wrt_noblks_wrtn_tn"
-	Set gtmtypes("shmpool_buff_hdr",202,"off")=2472
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_blocked_tn")=201
+	Set gtmtypes("shmpool_buff_hdr",202,"name")="shmpool_buff_hdr.shadow_file_header.wrt_busy_tn"
+	Set gtmtypes("shmpool_buff_hdr",202,"off")=2464
 	Set gtmtypes("shmpool_buff_hdr",202,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",202,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_noblks_wrtn_tn")=202
-	Set gtmtypes("shmpool_buff_hdr",203,"name")="shmpool_buff_hdr.shadow_file_header.reserved_bgtrcrec1_tn"
-	Set gtmtypes("shmpool_buff_hdr",203,"off")=2480
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_busy_tn")=202
+	Set gtmtypes("shmpool_buff_hdr",203,"name")="shmpool_buff_hdr.shadow_file_header.wrt_noblks_wrtn_tn"
+	Set gtmtypes("shmpool_buff_hdr",203,"off")=2472
 	Set gtmtypes("shmpool_buff_hdr",203,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",203,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reserved_bgtrcrec1_tn")=203
-	Set gtmtypes("shmpool_buff_hdr",204,"name")="shmpool_buff_hdr.shadow_file_header.reserved_bgtrcrec2_tn"
-	Set gtmtypes("shmpool_buff_hdr",204,"off")=2488
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_noblks_wrtn_tn")=203
+	Set gtmtypes("shmpool_buff_hdr",204,"name")="shmpool_buff_hdr.shadow_file_header.reserved_bgtrcrec1_tn"
+	Set gtmtypes("shmpool_buff_hdr",204,"off")=2480
 	Set gtmtypes("shmpool_buff_hdr",204,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",204,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reserved_bgtrcrec2_tn")=204
-	Set gtmtypes("shmpool_buff_hdr",205,"name")="shmpool_buff_hdr.shadow_file_header.reserved_bgtrcrec3_tn"
-	Set gtmtypes("shmpool_buff_hdr",205,"off")=2496
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reserved_bgtrcrec1_tn")=204
+	Set gtmtypes("shmpool_buff_hdr",205,"name")="shmpool_buff_hdr.shadow_file_header.reserved_bgtrcrec2_tn"
+	Set gtmtypes("shmpool_buff_hdr",205,"off")=2488
 	Set gtmtypes("shmpool_buff_hdr",205,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",205,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reserved_bgtrcrec3_tn")=205
-	Set gtmtypes("shmpool_buff_hdr",206,"name")="shmpool_buff_hdr.shadow_file_header.lost_block_recovery_tn"
-	Set gtmtypes("shmpool_buff_hdr",206,"off")=2504
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reserved_bgtrcrec2_tn")=205
+	Set gtmtypes("shmpool_buff_hdr",206,"name")="shmpool_buff_hdr.shadow_file_header.reserved_bgtrcrec3_tn"
+	Set gtmtypes("shmpool_buff_hdr",206,"off")=2496
 	Set gtmtypes("shmpool_buff_hdr",206,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",206,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.lost_block_recovery_tn")=206
-	Set gtmtypes("shmpool_buff_hdr",207,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_onln_rlbk_tn"
-	Set gtmtypes("shmpool_buff_hdr",207,"off")=2512
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reserved_bgtrcrec3_tn")=206
+	Set gtmtypes("shmpool_buff_hdr",207,"name")="shmpool_buff_hdr.shadow_file_header.lost_block_recovery_tn"
+	Set gtmtypes("shmpool_buff_hdr",207,"off")=2504
 	Set gtmtypes("shmpool_buff_hdr",207,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",207,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_onln_rlbk_tn")=207
-	Set gtmtypes("shmpool_buff_hdr",208,"name")="shmpool_buff_hdr.shadow_file_header.stale_tn"
-	Set gtmtypes("shmpool_buff_hdr",208,"off")=2520
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.lost_block_recovery_tn")=207
+	Set gtmtypes("shmpool_buff_hdr",208,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_onln_rlbk_tn"
+	Set gtmtypes("shmpool_buff_hdr",208,"off")=2512
 	Set gtmtypes("shmpool_buff_hdr",208,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",208,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_tn")=208
-	Set gtmtypes("shmpool_buff_hdr",209,"name")="shmpool_buff_hdr.shadow_file_header.starved_tn"
-	Set gtmtypes("shmpool_buff_hdr",209,"off")=2528
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_onln_rlbk_tn")=208
+	Set gtmtypes("shmpool_buff_hdr",209,"name")="shmpool_buff_hdr.shadow_file_header.stale_tn"
+	Set gtmtypes("shmpool_buff_hdr",209,"off")=2520
 	Set gtmtypes("shmpool_buff_hdr",209,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",209,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.starved_tn")=209
-	Set gtmtypes("shmpool_buff_hdr",210,"name")="shmpool_buff_hdr.shadow_file_header.stale_timer_started_tn"
-	Set gtmtypes("shmpool_buff_hdr",210,"off")=2536
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_tn")=209
+	Set gtmtypes("shmpool_buff_hdr",210,"name")="shmpool_buff_hdr.shadow_file_header.starved_tn"
+	Set gtmtypes("shmpool_buff_hdr",210,"off")=2528
 	Set gtmtypes("shmpool_buff_hdr",210,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",210,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_timer_started_tn")=210
-	Set gtmtypes("shmpool_buff_hdr",211,"name")="shmpool_buff_hdr.shadow_file_header.stale_timer_pop_tn"
-	Set gtmtypes("shmpool_buff_hdr",211,"off")=2544
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.starved_tn")=210
+	Set gtmtypes("shmpool_buff_hdr",211,"name")="shmpool_buff_hdr.shadow_file_header.stale_timer_started_tn"
+	Set gtmtypes("shmpool_buff_hdr",211,"off")=2536
 	Set gtmtypes("shmpool_buff_hdr",211,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",211,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_timer_pop_tn")=211
-	Set gtmtypes("shmpool_buff_hdr",212,"name")="shmpool_buff_hdr.shadow_file_header.stale_process_defer_tn"
-	Set gtmtypes("shmpool_buff_hdr",212,"off")=2552
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_timer_started_tn")=211
+	Set gtmtypes("shmpool_buff_hdr",212,"name")="shmpool_buff_hdr.shadow_file_header.stale_timer_pop_tn"
+	Set gtmtypes("shmpool_buff_hdr",212,"off")=2544
 	Set gtmtypes("shmpool_buff_hdr",212,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",212,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_process_defer_tn")=212
-	Set gtmtypes("shmpool_buff_hdr",213,"name")="shmpool_buff_hdr.shadow_file_header.stale_defer_processed_tn"
-	Set gtmtypes("shmpool_buff_hdr",213,"off")=2560
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_timer_pop_tn")=212
+	Set gtmtypes("shmpool_buff_hdr",213,"name")="shmpool_buff_hdr.shadow_file_header.stale_process_defer_tn"
+	Set gtmtypes("shmpool_buff_hdr",213,"off")=2552
 	Set gtmtypes("shmpool_buff_hdr",213,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",213,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_defer_processed_tn")=213
-	Set gtmtypes("shmpool_buff_hdr",214,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flush_tn"
-	Set gtmtypes("shmpool_buff_hdr",214,"off")=2568
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_process_defer_tn")=213
+	Set gtmtypes("shmpool_buff_hdr",214,"name")="shmpool_buff_hdr.shadow_file_header.stale_defer_processed_tn"
+	Set gtmtypes("shmpool_buff_hdr",214,"off")=2560
 	Set gtmtypes("shmpool_buff_hdr",214,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",214,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flush_tn")=214
-	Set gtmtypes("shmpool_buff_hdr",215,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flush_loop_tn"
-	Set gtmtypes("shmpool_buff_hdr",215,"off")=2576
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_defer_processed_tn")=214
+	Set gtmtypes("shmpool_buff_hdr",215,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flush_tn"
+	Set gtmtypes("shmpool_buff_hdr",215,"off")=2568
 	Set gtmtypes("shmpool_buff_hdr",215,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",215,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flush_loop_tn")=215
-	Set gtmtypes("shmpool_buff_hdr",216,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flush_retries_tn"
-	Set gtmtypes("shmpool_buff_hdr",216,"off")=2584
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flush_tn")=215
+	Set gtmtypes("shmpool_buff_hdr",216,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flush_loop_tn"
+	Set gtmtypes("shmpool_buff_hdr",216,"off")=2576
 	Set gtmtypes("shmpool_buff_hdr",216,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",216,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flush_retries_tn")=216
-	Set gtmtypes("shmpool_buff_hdr",217,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flushed_during_lockwait_tn"
-	Set gtmtypes("shmpool_buff_hdr",217,"off")=2592
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flush_loop_tn")=216
+	Set gtmtypes("shmpool_buff_hdr",217,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flush_retries_tn"
+	Set gtmtypes("shmpool_buff_hdr",217,"off")=2584
 	Set gtmtypes("shmpool_buff_hdr",217,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",217,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flushed_during_lockwait_tn")=217
-	Set gtmtypes("shmpool_buff_hdr",218,"name")="shmpool_buff_hdr.shadow_file_header.tp_crit_retries_tn"
-	Set gtmtypes("shmpool_buff_hdr",218,"off")=2600
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flush_retries_tn")=217
+	Set gtmtypes("shmpool_buff_hdr",218,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flushed_during_lockwait_tn"
+	Set gtmtypes("shmpool_buff_hdr",218,"off")=2592
 	Set gtmtypes("shmpool_buff_hdr",218,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",218,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.tp_crit_retries_tn")=218
-	Set gtmtypes("shmpool_buff_hdr",219,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_flush_dirty_tn"
-	Set gtmtypes("shmpool_buff_hdr",219,"off")=2608
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flushed_during_lockwait_tn")=218
+	Set gtmtypes("shmpool_buff_hdr",219,"name")="shmpool_buff_hdr.shadow_file_header.tp_crit_retries_tn"
+	Set gtmtypes("shmpool_buff_hdr",219,"off")=2600
 	Set gtmtypes("shmpool_buff_hdr",219,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",219,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_flush_dirty_tn")=219
-	Set gtmtypes("shmpool_buff_hdr",220,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_rip_wait_tn"
-	Set gtmtypes("shmpool_buff_hdr",220,"off")=2616
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.tp_crit_retries_tn")=219
+	Set gtmtypes("shmpool_buff_hdr",220,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_flush_dirty_tn"
+	Set gtmtypes("shmpool_buff_hdr",220,"off")=2608
 	Set gtmtypes("shmpool_buff_hdr",220,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",220,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_rip_wait_tn")=220
-	Set gtmtypes("shmpool_buff_hdr",221,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_buf_owner_stuck_tn"
-	Set gtmtypes("shmpool_buff_hdr",221,"off")=2624
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_flush_dirty_tn")=220
+	Set gtmtypes("shmpool_buff_hdr",221,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_rip_wait_tn"
+	Set gtmtypes("shmpool_buff_hdr",221,"off")=2616
 	Set gtmtypes("shmpool_buff_hdr",221,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",221,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_buf_owner_stuck_tn")=221
-	Set gtmtypes("shmpool_buff_hdr",222,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_out_of_design_tn"
-	Set gtmtypes("shmpool_buff_hdr",222,"off")=2632
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_rip_wait_tn")=221
+	Set gtmtypes("shmpool_buff_hdr",222,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_buf_owner_stuck_tn"
+	Set gtmtypes("shmpool_buff_hdr",222,"off")=2624
 	Set gtmtypes("shmpool_buff_hdr",222,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",222,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_out_of_design_tn")=222
-	Set gtmtypes("shmpool_buff_hdr",223,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_buf_owner_stuck_tn"
-	Set gtmtypes("shmpool_buff_hdr",223,"off")=2640
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_buf_owner_stuck_tn")=222
+	Set gtmtypes("shmpool_buff_hdr",223,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_out_of_design_tn"
+	Set gtmtypes("shmpool_buff_hdr",223,"off")=2632
 	Set gtmtypes("shmpool_buff_hdr",223,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",223,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_buf_owner_stuck_tn")=223
-	Set gtmtypes("shmpool_buff_hdr",224,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_out_of_design_tn"
-	Set gtmtypes("shmpool_buff_hdr",224,"off")=2648
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_out_of_design_tn")=223
+	Set gtmtypes("shmpool_buff_hdr",224,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_buf_owner_stuck_tn"
+	Set gtmtypes("shmpool_buff_hdr",224,"off")=2640
 	Set gtmtypes("shmpool_buff_hdr",224,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",224,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_out_of_design_tn")=224
-	Set gtmtypes("shmpool_buff_hdr",225,"name")="shmpool_buff_hdr.shadow_file_header.bt_put_flush_dirty_tn"
-	Set gtmtypes("shmpool_buff_hdr",225,"off")=2656
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_buf_owner_stuck_tn")=224
+	Set gtmtypes("shmpool_buff_hdr",225,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_out_of_design_tn"
+	Set gtmtypes("shmpool_buff_hdr",225,"off")=2648
 	Set gtmtypes("shmpool_buff_hdr",225,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",225,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bt_put_flush_dirty_tn")=225
-	Set gtmtypes("shmpool_buff_hdr",226,"name")="shmpool_buff_hdr.shadow_file_header.mlock_wakeups_tn"
-	Set gtmtypes("shmpool_buff_hdr",226,"off")=2664
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_out_of_design_tn")=225
+	Set gtmtypes("shmpool_buff_hdr",226,"name")="shmpool_buff_hdr.shadow_file_header.bt_put_flush_dirty_tn"
+	Set gtmtypes("shmpool_buff_hdr",226,"off")=2656
 	Set gtmtypes("shmpool_buff_hdr",226,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",226,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.mlock_wakeups_tn")=226
-	Set gtmtypes("shmpool_buff_hdr",227,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_recover_invoked_tn"
-	Set gtmtypes("shmpool_buff_hdr",227,"off")=2672
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bt_put_flush_dirty_tn")=226
+	Set gtmtypes("shmpool_buff_hdr",227,"name")="shmpool_buff_hdr.shadow_file_header.mlock_wakeups_tn"
+	Set gtmtypes("shmpool_buff_hdr",227,"off")=2664
 	Set gtmtypes("shmpool_buff_hdr",227,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",227,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_recover_invoked_tn")=227
-	Set gtmtypes("shmpool_buff_hdr",228,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_verify_passed_tn"
-	Set gtmtypes("shmpool_buff_hdr",228,"off")=2680
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.mlock_wakeups_tn")=227
+	Set gtmtypes("shmpool_buff_hdr",228,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_recover_invoked_tn"
+	Set gtmtypes("shmpool_buff_hdr",228,"off")=2672
 	Set gtmtypes("shmpool_buff_hdr",228,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",228,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_verify_passed_tn")=228
-	Set gtmtypes("shmpool_buff_hdr",229,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_tn"
-	Set gtmtypes("shmpool_buff_hdr",229,"off")=2688
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_recover_invoked_tn")=228
+	Set gtmtypes("shmpool_buff_hdr",229,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_verify_passed_tn"
+	Set gtmtypes("shmpool_buff_hdr",229,"off")=2680
 	Set gtmtypes("shmpool_buff_hdr",229,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",229,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_tn")=229
-	Set gtmtypes("shmpool_buff_hdr",230,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_tn"
-	Set gtmtypes("shmpool_buff_hdr",230,"off")=2696
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_verify_passed_tn")=229
+	Set gtmtypes("shmpool_buff_hdr",230,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_tn"
+	Set gtmtypes("shmpool_buff_hdr",230,"off")=2688
 	Set gtmtypes("shmpool_buff_hdr",230,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",230,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_tn")=230
-	Set gtmtypes("shmpool_buff_hdr",231,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_db_csh_getn_loopexceed_tn"
-	Set gtmtypes("shmpool_buff_hdr",231,"off")=2704
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_tn")=230
+	Set gtmtypes("shmpool_buff_hdr",231,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_tn"
+	Set gtmtypes("shmpool_buff_hdr",231,"off")=2696
 	Set gtmtypes("shmpool_buff_hdr",231,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",231,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_db_csh_getn_loopexceed_tn")=231
-	Set gtmtypes("shmpool_buff_hdr",232,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_tn"
-	Set gtmtypes("shmpool_buff_hdr",232,"off")=2712
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_tn")=231
+	Set gtmtypes("shmpool_buff_hdr",232,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_db_csh_getn_loopexceed_tn"
+	Set gtmtypes("shmpool_buff_hdr",232,"off")=2704
 	Set gtmtypes("shmpool_buff_hdr",232,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",232,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_tn")=232
-	Set gtmtypes("shmpool_buff_hdr",233,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_db_csh_get_tn"
-	Set gtmtypes("shmpool_buff_hdr",233,"off")=2720
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_db_csh_getn_loopexceed_tn")=232
+	Set gtmtypes("shmpool_buff_hdr",233,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_tn"
+	Set gtmtypes("shmpool_buff_hdr",233,"off")=2712
 	Set gtmtypes("shmpool_buff_hdr",233,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",233,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_db_csh_get_tn")=233
-	Set gtmtypes("shmpool_buff_hdr",234,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_wcsgetspace_tn"
-	Set gtmtypes("shmpool_buff_hdr",234,"off")=2728
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_tn")=233
+	Set gtmtypes("shmpool_buff_hdr",234,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_db_csh_get_tn"
+	Set gtmtypes("shmpool_buff_hdr",234,"off")=2720
 	Set gtmtypes("shmpool_buff_hdr",234,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",234,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_wcsgetspace_tn")=234
-	Set gtmtypes("shmpool_buff_hdr",235,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_t1_tn"
-	Set gtmtypes("shmpool_buff_hdr",235,"off")=2736
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_db_csh_get_tn")=234
+	Set gtmtypes("shmpool_buff_hdr",235,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_wcsgetspace_tn"
+	Set gtmtypes("shmpool_buff_hdr",235,"off")=2728
 	Set gtmtypes("shmpool_buff_hdr",235,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",235,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_t1_tn")=235
-	Set gtmtypes("shmpool_buff_hdr",236,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_bitmap_tn"
-	Set gtmtypes("shmpool_buff_hdr",236,"off")=2744
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_wcsgetspace_tn")=235
+	Set gtmtypes("shmpool_buff_hdr",236,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_t1_tn"
+	Set gtmtypes("shmpool_buff_hdr",236,"off")=2736
 	Set gtmtypes("shmpool_buff_hdr",236,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",236,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_bitmap_tn")=236
-	Set gtmtypes("shmpool_buff_hdr",237,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_jnl_cwset_tn"
-	Set gtmtypes("shmpool_buff_hdr",237,"off")=2752
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_t1_tn")=236
+	Set gtmtypes("shmpool_buff_hdr",237,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_bitmap_tn"
+	Set gtmtypes("shmpool_buff_hdr",237,"off")=2744
 	Set gtmtypes("shmpool_buff_hdr",237,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",237,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_jnl_cwset_tn")=237
-	Set gtmtypes("shmpool_buff_hdr",238,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_tn"
-	Set gtmtypes("shmpool_buff_hdr",238,"off")=2760
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_bitmap_tn")=237
+	Set gtmtypes("shmpool_buff_hdr",238,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_jnl_cwset_tn"
+	Set gtmtypes("shmpool_buff_hdr",238,"off")=2752
 	Set gtmtypes("shmpool_buff_hdr",238,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",238,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_tn")=238
-	Set gtmtypes("shmpool_buff_hdr",239,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_hist_tn"
-	Set gtmtypes("shmpool_buff_hdr",239,"off")=2768
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_jnl_cwset_tn")=238
+	Set gtmtypes("shmpool_buff_hdr",239,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_tn"
+	Set gtmtypes("shmpool_buff_hdr",239,"off")=2760
 	Set gtmtypes("shmpool_buff_hdr",239,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",239,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_hist_tn")=239
-	Set gtmtypes("shmpool_buff_hdr",240,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_hist1_nullbt_tn"
-	Set gtmtypes("shmpool_buff_hdr",240,"off")=2776
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_tn")=239
+	Set gtmtypes("shmpool_buff_hdr",240,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_hist_tn"
+	Set gtmtypes("shmpool_buff_hdr",240,"off")=2768
 	Set gtmtypes("shmpool_buff_hdr",240,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",240,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_hist1_nullbt_tn")=240
-	Set gtmtypes("shmpool_buff_hdr",241,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_tn"
-	Set gtmtypes("shmpool_buff_hdr",241,"off")=2784
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_hist_tn")=240
+	Set gtmtypes("shmpool_buff_hdr",241,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_hist1_nullbt_tn"
+	Set gtmtypes("shmpool_buff_hdr",241,"off")=2776
 	Set gtmtypes("shmpool_buff_hdr",241,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",241,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_tn")=241
-	Set gtmtypes("shmpool_buff_hdr",242,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_bitmap_nullbt_tn"
-	Set gtmtypes("shmpool_buff_hdr",242,"off")=2792
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_hist1_nullbt_tn")=241
+	Set gtmtypes("shmpool_buff_hdr",242,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_tn"
+	Set gtmtypes("shmpool_buff_hdr",242,"off")=2784
 	Set gtmtypes("shmpool_buff_hdr",242,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",242,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_bitmap_nullbt_tn")=242
-	Set gtmtypes("shmpool_buff_hdr",243,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_tn"
-	Set gtmtypes("shmpool_buff_hdr",243,"off")=2800
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_tn")=242
+	Set gtmtypes("shmpool_buff_hdr",243,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_bitmap_nullbt_tn"
+	Set gtmtypes("shmpool_buff_hdr",243,"off")=2792
 	Set gtmtypes("shmpool_buff_hdr",243,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",243,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_tn")=243
-	Set gtmtypes("shmpool_buff_hdr",244,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_jnl_cwset_tn"
-	Set gtmtypes("shmpool_buff_hdr",244,"off")=2808
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_bitmap_nullbt_tn")=243
+	Set gtmtypes("shmpool_buff_hdr",244,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_tn"
+	Set gtmtypes("shmpool_buff_hdr",244,"off")=2800
 	Set gtmtypes("shmpool_buff_hdr",244,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",244,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_jnl_cwset_tn")=244
-	Set gtmtypes("shmpool_buff_hdr",245,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_jnl_wcsflu_tn"
-	Set gtmtypes("shmpool_buff_hdr",245,"off")=2816
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_tn")=244
+	Set gtmtypes("shmpool_buff_hdr",245,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_jnl_cwset_tn"
+	Set gtmtypes("shmpool_buff_hdr",245,"off")=2808
 	Set gtmtypes("shmpool_buff_hdr",245,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",245,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_jnl_wcsflu_tn")=245
-	Set gtmtypes("shmpool_buff_hdr",246,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_get_too_many_loops_tn"
-	Set gtmtypes("shmpool_buff_hdr",246,"off")=2824
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_jnl_cwset_tn")=245
+	Set gtmtypes("shmpool_buff_hdr",246,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_jnl_wcsflu_tn"
+	Set gtmtypes("shmpool_buff_hdr",246,"off")=2816
 	Set gtmtypes("shmpool_buff_hdr",246,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",246,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_get_too_many_loops_tn")=246
-	Set gtmtypes("shmpool_buff_hdr",247,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tpckh_hist1_nullbt_tn"
-	Set gtmtypes("shmpool_buff_hdr",247,"off")=2832
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_jnl_wcsflu_tn")=246
+	Set gtmtypes("shmpool_buff_hdr",247,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_get_too_many_loops_tn"
+	Set gtmtypes("shmpool_buff_hdr",247,"off")=2824
 	Set gtmtypes("shmpool_buff_hdr",247,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",247,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tpckh_hist1_nullbt_tn")=247
-	Set gtmtypes("shmpool_buff_hdr",248,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_tn"
-	Set gtmtypes("shmpool_buff_hdr",248,"off")=2840
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_get_too_many_loops_tn")=247
+	Set gtmtypes("shmpool_buff_hdr",248,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tpckh_hist1_nullbt_tn"
+	Set gtmtypes("shmpool_buff_hdr",248,"off")=2832
 	Set gtmtypes("shmpool_buff_hdr",248,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",248,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_tn")=248
-	Set gtmtypes("shmpool_buff_hdr",249,"name")="shmpool_buff_hdr.shadow_file_header.jnl_blocked_writer_lost_tn"
-	Set gtmtypes("shmpool_buff_hdr",249,"off")=2848
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tpckh_hist1_nullbt_tn")=248
+	Set gtmtypes("shmpool_buff_hdr",249,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_tn"
+	Set gtmtypes("shmpool_buff_hdr",249,"off")=2840
 	Set gtmtypes("shmpool_buff_hdr",249,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",249,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_blocked_writer_lost_tn")=249
-	Set gtmtypes("shmpool_buff_hdr",250,"name")="shmpool_buff_hdr.shadow_file_header.jnl_blocked_writer_stuck_tn"
-	Set gtmtypes("shmpool_buff_hdr",250,"off")=2856
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_tn")=249
+	Set gtmtypes("shmpool_buff_hdr",250,"name")="shmpool_buff_hdr.shadow_file_header.jnl_blocked_writer_lost_tn"
+	Set gtmtypes("shmpool_buff_hdr",250,"off")=2848
 	Set gtmtypes("shmpool_buff_hdr",250,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",250,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_blocked_writer_stuck_tn")=250
-	Set gtmtypes("shmpool_buff_hdr",251,"name")="shmpool_buff_hdr.shadow_file_header.jnl_blocked_writer_blocked_tn"
-	Set gtmtypes("shmpool_buff_hdr",251,"off")=2864
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_blocked_writer_lost_tn")=250
+	Set gtmtypes("shmpool_buff_hdr",251,"name")="shmpool_buff_hdr.shadow_file_header.jnl_blocked_writer_stuck_tn"
+	Set gtmtypes("shmpool_buff_hdr",251,"off")=2856
 	Set gtmtypes("shmpool_buff_hdr",251,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",251,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_blocked_writer_blocked_tn")=251
-	Set gtmtypes("shmpool_buff_hdr",252,"name")="shmpool_buff_hdr.shadow_file_header.n_jnl_fsyncs_tn"
-	Set gtmtypes("shmpool_buff_hdr",252,"off")=2872
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_blocked_writer_stuck_tn")=251
+	Set gtmtypes("shmpool_buff_hdr",252,"name")="shmpool_buff_hdr.shadow_file_header.jnl_blocked_writer_blocked_tn"
+	Set gtmtypes("shmpool_buff_hdr",252,"off")=2864
 	Set gtmtypes("shmpool_buff_hdr",252,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",252,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_jnl_fsyncs_tn")=252
-	Set gtmtypes("shmpool_buff_hdr",253,"name")="shmpool_buff_hdr.shadow_file_header.n_jnl_fsync_tries_tn"
-	Set gtmtypes("shmpool_buff_hdr",253,"off")=2880
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_blocked_writer_blocked_tn")=252
+	Set gtmtypes("shmpool_buff_hdr",253,"name")="shmpool_buff_hdr.shadow_file_header.n_jnl_fsyncs_tn"
+	Set gtmtypes("shmpool_buff_hdr",253,"off")=2872
 	Set gtmtypes("shmpool_buff_hdr",253,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",253,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_jnl_fsync_tries_tn")=253
-	Set gtmtypes("shmpool_buff_hdr",254,"name")="shmpool_buff_hdr.shadow_file_header.n_jnl_fsync_recovers_tn"
-	Set gtmtypes("shmpool_buff_hdr",254,"off")=2888
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_jnl_fsyncs_tn")=253
+	Set gtmtypes("shmpool_buff_hdr",254,"name")="shmpool_buff_hdr.shadow_file_header.n_jnl_fsync_tries_tn"
+	Set gtmtypes("shmpool_buff_hdr",254,"off")=2880
 	Set gtmtypes("shmpool_buff_hdr",254,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",254,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_jnl_fsync_recovers_tn")=254
-	Set gtmtypes("shmpool_buff_hdr",255,"name")="shmpool_buff_hdr.shadow_file_header.n_db_fsyncs_tn"
-	Set gtmtypes("shmpool_buff_hdr",255,"off")=2896
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_jnl_fsync_tries_tn")=254
+	Set gtmtypes("shmpool_buff_hdr",255,"name")="shmpool_buff_hdr.shadow_file_header.n_jnl_fsync_recovers_tn"
+	Set gtmtypes("shmpool_buff_hdr",255,"off")=2888
 	Set gtmtypes("shmpool_buff_hdr",255,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",255,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_fsyncs_tn")=255
-	Set gtmtypes("shmpool_buff_hdr",256,"name")="shmpool_buff_hdr.shadow_file_header.n_db_fsyncs_in_crit_tn"
-	Set gtmtypes("shmpool_buff_hdr",256,"off")=2904
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_jnl_fsync_recovers_tn")=255
+	Set gtmtypes("shmpool_buff_hdr",256,"name")="shmpool_buff_hdr.shadow_file_header.n_db_fsyncs_tn"
+	Set gtmtypes("shmpool_buff_hdr",256,"off")=2896
 	Set gtmtypes("shmpool_buff_hdr",256,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",256,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_fsyncs_in_crit_tn")=256
-	Set gtmtypes("shmpool_buff_hdr",257,"name")="shmpool_buff_hdr.shadow_file_header.n_dbsync_timers_tn"
-	Set gtmtypes("shmpool_buff_hdr",257,"off")=2912
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_fsyncs_tn")=256
+	Set gtmtypes("shmpool_buff_hdr",257,"name")="shmpool_buff_hdr.shadow_file_header.n_db_fsyncs_in_crit_tn"
+	Set gtmtypes("shmpool_buff_hdr",257,"off")=2904
 	Set gtmtypes("shmpool_buff_hdr",257,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",257,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_dbsync_timers_tn")=257
-	Set gtmtypes("shmpool_buff_hdr",258,"name")="shmpool_buff_hdr.shadow_file_header.n_dbsync_writes_tn"
-	Set gtmtypes("shmpool_buff_hdr",258,"off")=2920
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_fsyncs_in_crit_tn")=257
+	Set gtmtypes("shmpool_buff_hdr",258,"name")="shmpool_buff_hdr.shadow_file_header.n_dbsync_timers_tn"
+	Set gtmtypes("shmpool_buff_hdr",258,"off")=2912
 	Set gtmtypes("shmpool_buff_hdr",258,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",258,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_dbsync_writes_tn")=258
-	Set gtmtypes("shmpool_buff_hdr",259,"name")="shmpool_buff_hdr.shadow_file_header.mutex_queue_full_tn"
-	Set gtmtypes("shmpool_buff_hdr",259,"off")=2928
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_dbsync_timers_tn")=258
+	Set gtmtypes("shmpool_buff_hdr",259,"name")="shmpool_buff_hdr.shadow_file_header.n_dbsync_writes_tn"
+	Set gtmtypes("shmpool_buff_hdr",259,"off")=2920
 	Set gtmtypes("shmpool_buff_hdr",259,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",259,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.mutex_queue_full_tn")=259
-	Set gtmtypes("shmpool_buff_hdr",260,"name")="shmpool_buff_hdr.shadow_file_header.wcb_bt_put_tn"
-	Set gtmtypes("shmpool_buff_hdr",260,"off")=2936
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_dbsync_writes_tn")=259
+	Set gtmtypes("shmpool_buff_hdr",260,"name")="shmpool_buff_hdr.shadow_file_header.mutex_queue_full_tn"
+	Set gtmtypes("shmpool_buff_hdr",260,"off")=2928
 	Set gtmtypes("shmpool_buff_hdr",260,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",260,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_bt_put_tn")=260
-	Set gtmtypes("shmpool_buff_hdr",261,"name")="shmpool_buff_hdr.shadow_file_header.wcb_mutex_salvage_tn"
-	Set gtmtypes("shmpool_buff_hdr",261,"off")=2944
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.mutex_queue_full_tn")=260
+	Set gtmtypes("shmpool_buff_hdr",261,"name")="shmpool_buff_hdr.shadow_file_header.wcb_bt_put_tn"
+	Set gtmtypes("shmpool_buff_hdr",261,"off")=2936
 	Set gtmtypes("shmpool_buff_hdr",261,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",261,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_mutex_salvage_tn")=261
-	Set gtmtypes("shmpool_buff_hdr",262,"name")="shmpool_buff_hdr.shadow_file_header.wcb_tp_grab_crit_tn"
-	Set gtmtypes("shmpool_buff_hdr",262,"off")=2952
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_bt_put_tn")=261
+	Set gtmtypes("shmpool_buff_hdr",262,"name")="shmpool_buff_hdr.shadow_file_header.wcb_mutex_salvage_tn"
+	Set gtmtypes("shmpool_buff_hdr",262,"off")=2944
 	Set gtmtypes("shmpool_buff_hdr",262,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",262,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_tp_grab_crit_tn")=262
-	Set gtmtypes("shmpool_buff_hdr",263,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_nocr_invcr_tn"
-	Set gtmtypes("shmpool_buff_hdr",263,"off")=2960
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_mutex_salvage_tn")=262
+	Set gtmtypes("shmpool_buff_hdr",263,"name")="shmpool_buff_hdr.shadow_file_header.wcb_tp_grab_crit_tn"
+	Set gtmtypes("shmpool_buff_hdr",263,"off")=2952
 	Set gtmtypes("shmpool_buff_hdr",263,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",263,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_nocr_invcr_tn")=263
-	Set gtmtypes("shmpool_buff_hdr",264,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_cr_invcr_tn"
-	Set gtmtypes("shmpool_buff_hdr",264,"off")=2968
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_tp_grab_crit_tn")=263
+	Set gtmtypes("shmpool_buff_hdr",264,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_nocr_invcr_tn"
+	Set gtmtypes("shmpool_buff_hdr",264,"off")=2960
 	Set gtmtypes("shmpool_buff_hdr",264,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",264,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_cr_invcr_tn")=264
-	Set gtmtypes("shmpool_buff_hdr",265,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_rip_wait_tn"
-	Set gtmtypes("shmpool_buff_hdr",265,"off")=2976
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_nocr_invcr_tn")=264
+	Set gtmtypes("shmpool_buff_hdr",265,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_cr_invcr_tn"
+	Set gtmtypes("shmpool_buff_hdr",265,"off")=2968
 	Set gtmtypes("shmpool_buff_hdr",265,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",265,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_rip_wait_tn")=265
-	Set gtmtypes("shmpool_buff_hdr",266,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirtyripwait_tn"
-	Set gtmtypes("shmpool_buff_hdr",266,"off")=2984
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_cr_invcr_tn")=265
+	Set gtmtypes("shmpool_buff_hdr",266,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_rip_wait_tn"
+	Set gtmtypes("shmpool_buff_hdr",266,"off")=2976
 	Set gtmtypes("shmpool_buff_hdr",266,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",266,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirtyripwait_tn")=266
-	Set gtmtypes("shmpool_buff_hdr",267,"name")="shmpool_buff_hdr.shadow_file_header.wcb_gds_rundown_tn"
-	Set gtmtypes("shmpool_buff_hdr",267,"off")=2992
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_rip_wait_tn")=266
+	Set gtmtypes("shmpool_buff_hdr",267,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirtyripwait_tn"
+	Set gtmtypes("shmpool_buff_hdr",267,"off")=2984
 	Set gtmtypes("shmpool_buff_hdr",267,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",267,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_gds_rundown_tn")=267
-	Set gtmtypes("shmpool_buff_hdr",268,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wcs_flu1_tn"
-	Set gtmtypes("shmpool_buff_hdr",268,"off")=3000
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirtyripwait_tn")=267
+	Set gtmtypes("shmpool_buff_hdr",268,"name")="shmpool_buff_hdr.shadow_file_header.wcb_gds_rundown_tn"
+	Set gtmtypes("shmpool_buff_hdr",268,"off")=2992
 	Set gtmtypes("shmpool_buff_hdr",268,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",268,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wcs_flu1_tn")=268
-	Set gtmtypes("shmpool_buff_hdr",269,"name")="shmpool_buff_hdr.shadow_file_header.wcb_mu_back_tn"
-	Set gtmtypes("shmpool_buff_hdr",269,"off")=3008
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_gds_rundown_tn")=268
+	Set gtmtypes("shmpool_buff_hdr",269,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wcs_flu1_tn"
+	Set gtmtypes("shmpool_buff_hdr",269,"off")=3000
 	Set gtmtypes("shmpool_buff_hdr",269,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",269,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_mu_back_tn")=269
-	Set gtmtypes("shmpool_buff_hdr",270,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirty_invcr_tn"
-	Set gtmtypes("shmpool_buff_hdr",270,"off")=3016
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wcs_flu1_tn")=269
+	Set gtmtypes("shmpool_buff_hdr",270,"name")="shmpool_buff_hdr.shadow_file_header.wcb_mu_back_tn"
+	Set gtmtypes("shmpool_buff_hdr",270,"off")=3008
 	Set gtmtypes("shmpool_buff_hdr",270,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",270,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirty_invcr_tn")=270
-	Set gtmtypes("shmpool_buff_hdr",271,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_wtfini_fail_tn"
-	Set gtmtypes("shmpool_buff_hdr",271,"off")=3024
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_mu_back_tn")=270
+	Set gtmtypes("shmpool_buff_hdr",271,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirty_invcr_tn"
+	Set gtmtypes("shmpool_buff_hdr",271,"off")=3016
 	Set gtmtypes("shmpool_buff_hdr",271,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",271,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_wtfini_fail_tn")=271
-	Set gtmtypes("shmpool_buff_hdr",272,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_twin_stuck_tn"
-	Set gtmtypes("shmpool_buff_hdr",272,"off")=3032
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirty_invcr_tn")=271
+	Set gtmtypes("shmpool_buff_hdr",272,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_wtfini_fail_tn"
+	Set gtmtypes("shmpool_buff_hdr",272,"off")=3024
 	Set gtmtypes("shmpool_buff_hdr",272,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",272,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_twin_stuck_tn")=272
-	Set gtmtypes("shmpool_buff_hdr",273,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_wrt_latch_stuck_tn"
-	Set gtmtypes("shmpool_buff_hdr",273,"off")=3040
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_wtfini_fail_tn")=272
+	Set gtmtypes("shmpool_buff_hdr",273,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_twin_stuck_tn"
+	Set gtmtypes("shmpool_buff_hdr",273,"off")=3032
 	Set gtmtypes("shmpool_buff_hdr",273,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",273,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_wrt_latch_stuck_tn")=273
-	Set gtmtypes("shmpool_buff_hdr",274,"name")="shmpool_buff_hdr.shadow_file_header.wcb_secshr_db_clnup_now_crit_tn"
-	Set gtmtypes("shmpool_buff_hdr",274,"off")=3048
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_twin_stuck_tn")=273
+	Set gtmtypes("shmpool_buff_hdr",274,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_wrt_latch_stuck_tn"
+	Set gtmtypes("shmpool_buff_hdr",274,"off")=3040
 	Set gtmtypes("shmpool_buff_hdr",274,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",274,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_secshr_db_clnup_now_crit_tn")=274
-	Set gtmtypes("shmpool_buff_hdr",275,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_bad_bt_index1_tn"
-	Set gtmtypes("shmpool_buff_hdr",275,"off")=3056
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_wrt_latch_stuck_tn")=274
+	Set gtmtypes("shmpool_buff_hdr",275,"name")="shmpool_buff_hdr.shadow_file_header.wcb_secshr_db_clnup_now_crit_tn"
+	Set gtmtypes("shmpool_buff_hdr",275,"off")=3048
 	Set gtmtypes("shmpool_buff_hdr",275,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",275,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_bad_bt_index1_tn")=275
-	Set gtmtypes("shmpool_buff_hdr",276,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_bad_bt_index2_tn"
-	Set gtmtypes("shmpool_buff_hdr",276,"off")=3064
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_secshr_db_clnup_now_crit_tn")=275
+	Set gtmtypes("shmpool_buff_hdr",276,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_bad_bt_index1_tn"
+	Set gtmtypes("shmpool_buff_hdr",276,"off")=3056
 	Set gtmtypes("shmpool_buff_hdr",276,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",276,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_bad_bt_index2_tn")=276
-	Set gtmtypes("shmpool_buff_hdr",277,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_crbtmismatch1_tn"
-	Set gtmtypes("shmpool_buff_hdr",277,"off")=3072
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_bad_bt_index1_tn")=276
+	Set gtmtypes("shmpool_buff_hdr",277,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_bad_bt_index2_tn"
+	Set gtmtypes("shmpool_buff_hdr",277,"off")=3064
 	Set gtmtypes("shmpool_buff_hdr",277,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",277,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_crbtmismatch1_tn")=277
-	Set gtmtypes("shmpool_buff_hdr",278,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_crbtmismatch2_tn"
-	Set gtmtypes("shmpool_buff_hdr",278,"off")=3080
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_bad_bt_index2_tn")=277
+	Set gtmtypes("shmpool_buff_hdr",278,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_crbtmismatch1_tn"
+	Set gtmtypes("shmpool_buff_hdr",278,"off")=3072
 	Set gtmtypes("shmpool_buff_hdr",278,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",278,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_crbtmismatch2_tn")=278
-	Set gtmtypes("shmpool_buff_hdr",279,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_crbtmismatch3_tn"
-	Set gtmtypes("shmpool_buff_hdr",279,"off")=3088
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_crbtmismatch1_tn")=278
+	Set gtmtypes("shmpool_buff_hdr",279,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_crbtmismatch2_tn"
+	Set gtmtypes("shmpool_buff_hdr",279,"off")=3080
 	Set gtmtypes("shmpool_buff_hdr",279,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",279,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_crbtmismatch3_tn")=279
-	Set gtmtypes("shmpool_buff_hdr",280,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_tn"
-	Set gtmtypes("shmpool_buff_hdr",280,"off")=3096
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_crbtmismatch2_tn")=279
+	Set gtmtypes("shmpool_buff_hdr",280,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_crbtmismatch3_tn"
+	Set gtmtypes("shmpool_buff_hdr",280,"off")=3088
 	Set gtmtypes("shmpool_buff_hdr",280,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",280,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_tn")=280
-	Set gtmtypes("shmpool_buff_hdr",281,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_tn"
-	Set gtmtypes("shmpool_buff_hdr",281,"off")=3104
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_crbtmismatch3_tn")=280
+	Set gtmtypes("shmpool_buff_hdr",281,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_tn"
+	Set gtmtypes("shmpool_buff_hdr",281,"off")=3096
 	Set gtmtypes("shmpool_buff_hdr",281,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",281,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_tn")=281
-	Set gtmtypes("shmpool_buff_hdr",282,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_tn"
-	Set gtmtypes("shmpool_buff_hdr",282,"off")=3112
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_tn")=281
+	Set gtmtypes("shmpool_buff_hdr",282,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_tn"
+	Set gtmtypes("shmpool_buff_hdr",282,"off")=3104
 	Set gtmtypes("shmpool_buff_hdr",282,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",282,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_tn")=282
-	Set gtmtypes("shmpool_buff_hdr",283,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_tn"
-	Set gtmtypes("shmpool_buff_hdr",283,"off")=3120
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_tn")=282
+	Set gtmtypes("shmpool_buff_hdr",283,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_tn"
+	Set gtmtypes("shmpool_buff_hdr",283,"off")=3112
 	Set gtmtypes("shmpool_buff_hdr",283,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",283,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_tn")=283
-	Set gtmtypes("shmpool_buff_hdr",284,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_tn"
-	Set gtmtypes("shmpool_buff_hdr",284,"off")=3128
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_tn")=283
+	Set gtmtypes("shmpool_buff_hdr",284,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_tn"
+	Set gtmtypes("shmpool_buff_hdr",284,"off")=3120
 	Set gtmtypes("shmpool_buff_hdr",284,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",284,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_tn")=284
-	Set gtmtypes("shmpool_buff_hdr",285,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_bt_get_tn"
-	Set gtmtypes("shmpool_buff_hdr",285,"off")=3136
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_tn")=284
+	Set gtmtypes("shmpool_buff_hdr",285,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_tn"
+	Set gtmtypes("shmpool_buff_hdr",285,"off")=3128
 	Set gtmtypes("shmpool_buff_hdr",285,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",285,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_bt_get_tn")=285
-	Set gtmtypes("shmpool_buff_hdr",286,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_tn"
-	Set gtmtypes("shmpool_buff_hdr",286,"off")=3144
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_tn")=285
+	Set gtmtypes("shmpool_buff_hdr",286,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_bt_get_tn"
+	Set gtmtypes("shmpool_buff_hdr",286,"off")=3136
 	Set gtmtypes("shmpool_buff_hdr",286,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",286,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_tn")=286
-	Set gtmtypes("shmpool_buff_hdr",287,"name")="shmpool_buff_hdr.shadow_file_header.wcb_bg_update_lckfail1_tn"
-	Set gtmtypes("shmpool_buff_hdr",287,"off")=3152
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_bt_get_tn")=286
+	Set gtmtypes("shmpool_buff_hdr",287,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_tn"
+	Set gtmtypes("shmpool_buff_hdr",287,"off")=3144
 	Set gtmtypes("shmpool_buff_hdr",287,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",287,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_bg_update_lckfail1_tn")=287
-	Set gtmtypes("shmpool_buff_hdr",288,"name")="shmpool_buff_hdr.shadow_file_header.wcb_bg_update_lckfail2_tn"
-	Set gtmtypes("shmpool_buff_hdr",288,"off")=3160
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_tn")=287
+	Set gtmtypes("shmpool_buff_hdr",288,"name")="shmpool_buff_hdr.shadow_file_header.wcb_bg_update_lckfail1_tn"
+	Set gtmtypes("shmpool_buff_hdr",288,"off")=3152
 	Set gtmtypes("shmpool_buff_hdr",288,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",288,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_bg_update_lckfail2_tn")=288
-	Set gtmtypes("shmpool_buff_hdr",289,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail1_tn"
-	Set gtmtypes("shmpool_buff_hdr",289,"off")=3168
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_bg_update_lckfail1_tn")=288
+	Set gtmtypes("shmpool_buff_hdr",289,"name")="shmpool_buff_hdr.shadow_file_header.wcb_bg_update_lckfail2_tn"
+	Set gtmtypes("shmpool_buff_hdr",289,"off")=3160
 	Set gtmtypes("shmpool_buff_hdr",289,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",289,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail1_tn")=289
-	Set gtmtypes("shmpool_buff_hdr",290,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail2_tn"
-	Set gtmtypes("shmpool_buff_hdr",290,"off")=3176
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_bg_update_lckfail2_tn")=289
+	Set gtmtypes("shmpool_buff_hdr",290,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail1_tn"
+	Set gtmtypes("shmpool_buff_hdr",290,"off")=3168
 	Set gtmtypes("shmpool_buff_hdr",290,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",290,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail2_tn")=290
-	Set gtmtypes("shmpool_buff_hdr",291,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail3_tn"
-	Set gtmtypes("shmpool_buff_hdr",291,"off")=3184
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail1_tn")=290
+	Set gtmtypes("shmpool_buff_hdr",291,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail2_tn"
+	Set gtmtypes("shmpool_buff_hdr",291,"off")=3176
 	Set gtmtypes("shmpool_buff_hdr",291,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",291,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail3_tn")=291
-	Set gtmtypes("shmpool_buff_hdr",292,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail4_tn"
-	Set gtmtypes("shmpool_buff_hdr",292,"off")=3192
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail2_tn")=291
+	Set gtmtypes("shmpool_buff_hdr",292,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail3_tn"
+	Set gtmtypes("shmpool_buff_hdr",292,"off")=3184
 	Set gtmtypes("shmpool_buff_hdr",292,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",292,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail4_tn")=292
-	Set gtmtypes("shmpool_buff_hdr",293,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail1_tn"
-	Set gtmtypes("shmpool_buff_hdr",293,"off")=3200
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail3_tn")=292
+	Set gtmtypes("shmpool_buff_hdr",293,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail4_tn"
+	Set gtmtypes("shmpool_buff_hdr",293,"off")=3192
 	Set gtmtypes("shmpool_buff_hdr",293,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",293,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail1_tn")=293
-	Set gtmtypes("shmpool_buff_hdr",294,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail2_tn"
-	Set gtmtypes("shmpool_buff_hdr",294,"off")=3208
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail4_tn")=293
+	Set gtmtypes("shmpool_buff_hdr",294,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail1_tn"
+	Set gtmtypes("shmpool_buff_hdr",294,"off")=3200
 	Set gtmtypes("shmpool_buff_hdr",294,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",294,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail2_tn")=294
-	Set gtmtypes("shmpool_buff_hdr",295,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail3_tn"
-	Set gtmtypes("shmpool_buff_hdr",295,"off")=3216
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail1_tn")=294
+	Set gtmtypes("shmpool_buff_hdr",295,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail2_tn"
+	Set gtmtypes("shmpool_buff_hdr",295,"off")=3208
 	Set gtmtypes("shmpool_buff_hdr",295,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",295,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail3_tn")=295
-	Set gtmtypes("shmpool_buff_hdr",296,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail4_tn"
-	Set gtmtypes("shmpool_buff_hdr",296,"off")=3224
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail2_tn")=295
+	Set gtmtypes("shmpool_buff_hdr",296,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail3_tn"
+	Set gtmtypes("shmpool_buff_hdr",296,"off")=3216
 	Set gtmtypes("shmpool_buff_hdr",296,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",296,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail4_tn")=296
-	Set gtmtypes("shmpool_buff_hdr",297,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirtystuck1_tn"
-	Set gtmtypes("shmpool_buff_hdr",297,"off")=3232
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail3_tn")=296
+	Set gtmtypes("shmpool_buff_hdr",297,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail4_tn"
+	Set gtmtypes("shmpool_buff_hdr",297,"off")=3224
 	Set gtmtypes("shmpool_buff_hdr",297,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",297,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirtystuck1_tn")=297
-	Set gtmtypes("shmpool_buff_hdr",298,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirtystuck2_tn"
-	Set gtmtypes("shmpool_buff_hdr",298,"off")=3240
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail4_tn")=297
+	Set gtmtypes("shmpool_buff_hdr",298,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirtystuck1_tn"
+	Set gtmtypes("shmpool_buff_hdr",298,"off")=3232
 	Set gtmtypes("shmpool_buff_hdr",298,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",298,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirtystuck2_tn")=298
-	Set gtmtypes("shmpool_buff_hdr",299,"name")="shmpool_buff_hdr.shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_tn"
-	Set gtmtypes("shmpool_buff_hdr",299,"off")=3248
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirtystuck1_tn")=298
+	Set gtmtypes("shmpool_buff_hdr",299,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirtystuck2_tn"
+	Set gtmtypes("shmpool_buff_hdr",299,"off")=3240
 	Set gtmtypes("shmpool_buff_hdr",299,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",299,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_tn")=299
-	Set gtmtypes("shmpool_buff_hdr",300,"name")="shmpool_buff_hdr.shadow_file_header.dwngrd_refmts_syncio_tn"
-	Set gtmtypes("shmpool_buff_hdr",300,"off")=3256
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirtystuck2_tn")=299
+	Set gtmtypes("shmpool_buff_hdr",300,"name")="shmpool_buff_hdr.shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_tn"
+	Set gtmtypes("shmpool_buff_hdr",300,"off")=3248
 	Set gtmtypes("shmpool_buff_hdr",300,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",300,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.dwngrd_refmts_syncio_tn")=300
-	Set gtmtypes("shmpool_buff_hdr",301,"name")="shmpool_buff_hdr.shadow_file_header.dwngrd_refmts_asyncio_tn"
-	Set gtmtypes("shmpool_buff_hdr",301,"off")=3264
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_tn")=300
+	Set gtmtypes("shmpool_buff_hdr",301,"name")="shmpool_buff_hdr.shadow_file_header.dwngrd_refmts_syncio_tn"
+	Set gtmtypes("shmpool_buff_hdr",301,"off")=3256
 	Set gtmtypes("shmpool_buff_hdr",301,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",301,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.dwngrd_refmts_asyncio_tn")=301
-	Set gtmtypes("shmpool_buff_hdr",302,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_refmt_harvests_tn"
-	Set gtmtypes("shmpool_buff_hdr",302,"off")=3272
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.dwngrd_refmts_syncio_tn")=301
+	Set gtmtypes("shmpool_buff_hdr",302,"name")="shmpool_buff_hdr.shadow_file_header.dwngrd_refmts_asyncio_tn"
+	Set gtmtypes("shmpool_buff_hdr",302,"off")=3264
 	Set gtmtypes("shmpool_buff_hdr",302,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",302,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_refmt_harvests_tn")=302
-	Set gtmtypes("shmpool_buff_hdr",303,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_recovery_tn"
-	Set gtmtypes("shmpool_buff_hdr",303,"off")=3280
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.dwngrd_refmts_asyncio_tn")=302
+	Set gtmtypes("shmpool_buff_hdr",303,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_refmt_harvests_tn"
+	Set gtmtypes("shmpool_buff_hdr",303,"off")=3272
 	Set gtmtypes("shmpool_buff_hdr",303,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",303,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_recovery_tn")=303
-	Set gtmtypes("shmpool_buff_hdr",304,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_blkd_by_sdc_tn"
-	Set gtmtypes("shmpool_buff_hdr",304,"off")=3288
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_refmt_harvests_tn")=303
+	Set gtmtypes("shmpool_buff_hdr",304,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_recovery_tn"
+	Set gtmtypes("shmpool_buff_hdr",304,"off")=3280
 	Set gtmtypes("shmpool_buff_hdr",304,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",304,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_blkd_by_sdc_tn")=304
-	Set gtmtypes("shmpool_buff_hdr",305,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_alloc_bbflush_tn"
-	Set gtmtypes("shmpool_buff_hdr",305,"off")=3296
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_recovery_tn")=304
+	Set gtmtypes("shmpool_buff_hdr",305,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_blkd_by_sdc_tn"
+	Set gtmtypes("shmpool_buff_hdr",305,"off")=3288
 	Set gtmtypes("shmpool_buff_hdr",305,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",305,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_alloc_bbflush_tn")=305
-	Set gtmtypes("shmpool_buff_hdr",306,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_released_replaced_tn"
-	Set gtmtypes("shmpool_buff_hdr",306,"off")=3304
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_blkd_by_sdc_tn")=305
+	Set gtmtypes("shmpool_buff_hdr",306,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_alloc_bbflush_tn"
+	Set gtmtypes("shmpool_buff_hdr",306,"off")=3296
 	Set gtmtypes("shmpool_buff_hdr",306,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",306,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_released_replaced_tn")=306
-	Set gtmtypes("shmpool_buff_hdr",307,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_released_io_complete_tn"
-	Set gtmtypes("shmpool_buff_hdr",307,"off")=3312
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_alloc_bbflush_tn")=306
+	Set gtmtypes("shmpool_buff_hdr",307,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_released_replaced_tn"
+	Set gtmtypes("shmpool_buff_hdr",307,"off")=3304
 	Set gtmtypes("shmpool_buff_hdr",307,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",307,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_released_io_complete_tn")=307
-	Set gtmtypes("shmpool_buff_hdr",308,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_kept_tn"
-	Set gtmtypes("shmpool_buff_hdr",308,"off")=3320
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_released_replaced_tn")=307
+	Set gtmtypes("shmpool_buff_hdr",308,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_released_io_complete_tn"
+	Set gtmtypes("shmpool_buff_hdr",308,"off")=3312
 	Set gtmtypes("shmpool_buff_hdr",308,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",308,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_kept_tn")=308
-	Set gtmtypes("shmpool_buff_hdr",309,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_ignored_tn"
-	Set gtmtypes("shmpool_buff_hdr",309,"off")=3328
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_released_io_complete_tn")=308
+	Set gtmtypes("shmpool_buff_hdr",309,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_kept_tn"
+	Set gtmtypes("shmpool_buff_hdr",309,"off")=3320
 	Set gtmtypes("shmpool_buff_hdr",309,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",309,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_ignored_tn")=309
-	Set gtmtypes("shmpool_buff_hdr",310,"name")="shmpool_buff_hdr.shadow_file_header.refmt_blk_chk_blk_freed_tn"
-	Set gtmtypes("shmpool_buff_hdr",310,"off")=3336
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_kept_tn")=309
+	Set gtmtypes("shmpool_buff_hdr",310,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_ignored_tn"
+	Set gtmtypes("shmpool_buff_hdr",310,"off")=3328
 	Set gtmtypes("shmpool_buff_hdr",310,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",310,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_blk_chk_blk_freed_tn")=310
-	Set gtmtypes("shmpool_buff_hdr",311,"name")="shmpool_buff_hdr.shadow_file_header.refmt_blk_chk_blk_kept_tn"
-	Set gtmtypes("shmpool_buff_hdr",311,"off")=3344
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_ignored_tn")=310
+	Set gtmtypes("shmpool_buff_hdr",311,"name")="shmpool_buff_hdr.shadow_file_header.refmt_blk_chk_blk_freed_tn"
+	Set gtmtypes("shmpool_buff_hdr",311,"off")=3336
 	Set gtmtypes("shmpool_buff_hdr",311,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",311,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_blk_chk_blk_kept_tn")=311
-	Set gtmtypes("shmpool_buff_hdr",312,"name")="shmpool_buff_hdr.shadow_file_header.active_lvl_trigger_tn"
-	Set gtmtypes("shmpool_buff_hdr",312,"off")=3352
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_blk_chk_blk_freed_tn")=311
+	Set gtmtypes("shmpool_buff_hdr",312,"name")="shmpool_buff_hdr.shadow_file_header.refmt_blk_chk_blk_kept_tn"
+	Set gtmtypes("shmpool_buff_hdr",312,"off")=3344
 	Set gtmtypes("shmpool_buff_hdr",312,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",312,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.active_lvl_trigger_tn")=312
-	Set gtmtypes("shmpool_buff_hdr",313,"name")="shmpool_buff_hdr.shadow_file_header.new_buff_tn"
-	Set gtmtypes("shmpool_buff_hdr",313,"off")=3360
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_blk_chk_blk_kept_tn")=312
+	Set gtmtypes("shmpool_buff_hdr",313,"name")="shmpool_buff_hdr.shadow_file_header.active_lvl_trigger_tn"
+	Set gtmtypes("shmpool_buff_hdr",313,"off")=3352
 	Set gtmtypes("shmpool_buff_hdr",313,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",313,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.new_buff_tn")=313
-	Set gtmtypes("shmpool_buff_hdr",314,"name")="shmpool_buff_hdr.shadow_file_header.phase2_commit_wait_sleep_in_crit_tn"
-	Set gtmtypes("shmpool_buff_hdr",314,"off")=3368
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.active_lvl_trigger_tn")=313
+	Set gtmtypes("shmpool_buff_hdr",314,"name")="shmpool_buff_hdr.shadow_file_header.new_buff_tn"
+	Set gtmtypes("shmpool_buff_hdr",314,"off")=3360
 	Set gtmtypes("shmpool_buff_hdr",314,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",314,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.phase2_commit_wait_sleep_in_crit_tn")=314
-	Set gtmtypes("shmpool_buff_hdr",315,"name")="shmpool_buff_hdr.shadow_file_header.phase2_commit_wait_sleep_no_crit_tn"
-	Set gtmtypes("shmpool_buff_hdr",315,"off")=3376
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.new_buff_tn")=314
+	Set gtmtypes("shmpool_buff_hdr",315,"name")="shmpool_buff_hdr.shadow_file_header.phase2_commit_wait_sleep_in_crit_tn"
+	Set gtmtypes("shmpool_buff_hdr",315,"off")=3368
 	Set gtmtypes("shmpool_buff_hdr",315,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",315,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.phase2_commit_wait_sleep_no_crit_tn")=315
-	Set gtmtypes("shmpool_buff_hdr",316,"name")="shmpool_buff_hdr.shadow_file_header.phase2_commit_wait_pidcnt_tn"
-	Set gtmtypes("shmpool_buff_hdr",316,"off")=3384
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.phase2_commit_wait_sleep_in_crit_tn")=315
+	Set gtmtypes("shmpool_buff_hdr",316,"name")="shmpool_buff_hdr.shadow_file_header.phase2_commit_wait_sleep_no_crit_tn"
+	Set gtmtypes("shmpool_buff_hdr",316,"off")=3376
 	Set gtmtypes("shmpool_buff_hdr",316,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",316,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.phase2_commit_wait_pidcnt_tn")=316
-	Set gtmtypes("shmpool_buff_hdr",317,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_intend_wait_tn"
-	Set gtmtypes("shmpool_buff_hdr",317,"off")=3392
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.phase2_commit_wait_sleep_no_crit_tn")=316
+	Set gtmtypes("shmpool_buff_hdr",317,"name")="shmpool_buff_hdr.shadow_file_header.phase2_commit_wait_pidcnt_tn"
+	Set gtmtypes("shmpool_buff_hdr",317,"off")=3384
 	Set gtmtypes("shmpool_buff_hdr",317,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",317,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_intend_wait_tn")=317
-	Set gtmtypes("shmpool_buff_hdr",318,"name")="shmpool_buff_hdr.shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_tn"
-	Set gtmtypes("shmpool_buff_hdr",318,"off")=3400
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.phase2_commit_wait_pidcnt_tn")=317
+	Set gtmtypes("shmpool_buff_hdr",318,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_intend_wait_tn"
+	Set gtmtypes("shmpool_buff_hdr",318,"off")=3392
 	Set gtmtypes("shmpool_buff_hdr",318,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",318,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_tn")=318
-	Set gtmtypes("shmpool_buff_hdr",319,"name")="shmpool_buff_hdr.shadow_file_header.wcb_phase2_commit_wait_tn"
-	Set gtmtypes("shmpool_buff_hdr",319,"off")=3408
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_intend_wait_tn")=318
+	Set gtmtypes("shmpool_buff_hdr",319,"name")="shmpool_buff_hdr.shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_tn"
+	Set gtmtypes("shmpool_buff_hdr",319,"off")=3400
 	Set gtmtypes("shmpool_buff_hdr",319,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",319,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_phase2_commit_wait_tn")=319
-	Set gtmtypes("shmpool_buff_hdr",320,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_calls_tn"
-	Set gtmtypes("shmpool_buff_hdr",320,"off")=3416
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_tn")=319
+	Set gtmtypes("shmpool_buff_hdr",320,"name")="shmpool_buff_hdr.shadow_file_header.wcb_phase2_commit_wait_tn"
+	Set gtmtypes("shmpool_buff_hdr",320,"off")=3408
 	Set gtmtypes("shmpool_buff_hdr",320,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",320,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_calls_tn")=320
-	Set gtmtypes("shmpool_buff_hdr",321,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_rip_tn"
-	Set gtmtypes("shmpool_buff_hdr",321,"off")=3424
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_phase2_commit_wait_tn")=320
+	Set gtmtypes("shmpool_buff_hdr",321,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_calls_tn"
+	Set gtmtypes("shmpool_buff_hdr",321,"off")=3416
 	Set gtmtypes("shmpool_buff_hdr",321,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",321,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_rip_tn")=321
-	Set gtmtypes("shmpool_buff_hdr",322,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_in_tend_tn"
-	Set gtmtypes("shmpool_buff_hdr",322,"off")=3432
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_calls_tn")=321
+	Set gtmtypes("shmpool_buff_hdr",322,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_rip_tn"
+	Set gtmtypes("shmpool_buff_hdr",322,"off")=3424
 	Set gtmtypes("shmpool_buff_hdr",322,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",322,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_in_tend_tn")=322
-	Set gtmtypes("shmpool_buff_hdr",323,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_search_blk_tn"
-	Set gtmtypes("shmpool_buff_hdr",323,"off")=3440
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_rip_tn")=322
+	Set gtmtypes("shmpool_buff_hdr",323,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_in_tend_tn"
+	Set gtmtypes("shmpool_buff_hdr",323,"off")=3432
 	Set gtmtypes("shmpool_buff_hdr",323,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",323,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_search_blk_tn")=323
-	Set gtmtypes("shmpool_buff_hdr",324,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_new_rec_tn"
-	Set gtmtypes("shmpool_buff_hdr",324,"off")=3448
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_in_tend_tn")=323
+	Set gtmtypes("shmpool_buff_hdr",324,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_search_blk_tn"
+	Set gtmtypes("shmpool_buff_hdr",324,"off")=3440
 	Set gtmtypes("shmpool_buff_hdr",324,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",324,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_new_rec_tn")=324
-	Set gtmtypes("shmpool_buff_hdr",325,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_rec_size_tn"
-	Set gtmtypes("shmpool_buff_hdr",325,"off")=3456
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_search_blk_tn")=324
+	Set gtmtypes("shmpool_buff_hdr",325,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_new_rec_tn"
+	Set gtmtypes("shmpool_buff_hdr",325,"off")=3448
 	Set gtmtypes("shmpool_buff_hdr",325,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",325,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_rec_size_tn")=325
-	Set gtmtypes("shmpool_buff_hdr",326,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_rec_cmpc_tn"
-	Set gtmtypes("shmpool_buff_hdr",326,"off")=3464
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_new_rec_tn")=325
+	Set gtmtypes("shmpool_buff_hdr",326,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_rec_size_tn"
+	Set gtmtypes("shmpool_buff_hdr",326,"off")=3456
 	Set gtmtypes("shmpool_buff_hdr",326,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",326,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_rec_cmpc_tn")=326
-	Set gtmtypes("shmpool_buff_hdr",327,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_blk_fini_tn"
-	Set gtmtypes("shmpool_buff_hdr",327,"off")=3472
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_rec_size_tn")=326
+	Set gtmtypes("shmpool_buff_hdr",327,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_rec_cmpc_tn"
+	Set gtmtypes("shmpool_buff_hdr",327,"off")=3464
 	Set gtmtypes("shmpool_buff_hdr",327,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",327,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_blk_fini_tn")=327
-	Set gtmtypes("shmpool_buff_hdr",328,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_blk_split_tn"
-	Set gtmtypes("shmpool_buff_hdr",328,"off")=3480
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_rec_cmpc_tn")=327
+	Set gtmtypes("shmpool_buff_hdr",328,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_blk_fini_tn"
+	Set gtmtypes("shmpool_buff_hdr",328,"off")=3472
 	Set gtmtypes("shmpool_buff_hdr",328,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",328,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_blk_split_tn")=328
-	Set gtmtypes("shmpool_buff_hdr",329,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_ripsleep_cnt_tn"
-	Set gtmtypes("shmpool_buff_hdr",329,"off")=3488
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_blk_fini_tn")=328
+	Set gtmtypes("shmpool_buff_hdr",329,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_blk_split_tn"
+	Set gtmtypes("shmpool_buff_hdr",329,"off")=3480
 	Set gtmtypes("shmpool_buff_hdr",329,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",329,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_ripsleep_cnt_tn")=329
-	Set gtmtypes("shmpool_buff_hdr",330,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_ripsleep_nblks_tn"
-	Set gtmtypes("shmpool_buff_hdr",330,"off")=3496
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_blk_split_tn")=329
+	Set gtmtypes("shmpool_buff_hdr",330,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_ripsleep_cnt_tn"
+	Set gtmtypes("shmpool_buff_hdr",330,"off")=3488
 	Set gtmtypes("shmpool_buff_hdr",330,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",330,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_ripsleep_nblks_tn")=330
-	Set gtmtypes("shmpool_buff_hdr",331,"name")="shmpool_buff_hdr.shadow_file_header.bg_trc_rec_tn_filler"
-	Set gtmtypes("shmpool_buff_hdr",331,"off")=3504
-	Set gtmtypes("shmpool_buff_hdr",331,"len")=112
-	Set gtmtypes("shmpool_buff_hdr",331,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bg_trc_rec_tn_filler")=331
-	Set gtmtypes("shmpool_buff_hdr",332,"name")="shmpool_buff_hdr.shadow_file_header.total_buffer_flush_cntr"
-	Set gtmtypes("shmpool_buff_hdr",332,"off")=3616
-	Set gtmtypes("shmpool_buff_hdr",332,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",332,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.total_buffer_flush_cntr")=332
-	Set gtmtypes("shmpool_buff_hdr",333,"name")="shmpool_buff_hdr.shadow_file_header.bufct_buffer_flush_cntr"
-	Set gtmtypes("shmpool_buff_hdr",333,"off")=3620
-	Set gtmtypes("shmpool_buff_hdr",333,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",333,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bufct_buffer_flush_cntr")=333
-	Set gtmtypes("shmpool_buff_hdr",334,"name")="shmpool_buff_hdr.shadow_file_header.bufct_buffer_flush_loop_cntr"
-	Set gtmtypes("shmpool_buff_hdr",334,"off")=3624
-	Set gtmtypes("shmpool_buff_hdr",334,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",334,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bufct_buffer_flush_loop_cntr")=334
-	Set gtmtypes("shmpool_buff_hdr",335,"name")="shmpool_buff_hdr.shadow_file_header.wrt_calls_cntr"
-	Set gtmtypes("shmpool_buff_hdr",335,"off")=3628
-	Set gtmtypes("shmpool_buff_hdr",335,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",335,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_calls_cntr")=335
-	Set gtmtypes("shmpool_buff_hdr",336,"name")="shmpool_buff_hdr.shadow_file_header.wrt_count_cntr"
-	Set gtmtypes("shmpool_buff_hdr",336,"off")=3632
-	Set gtmtypes("shmpool_buff_hdr",336,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",336,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_count_cntr")=336
-	Set gtmtypes("shmpool_buff_hdr",337,"name")="shmpool_buff_hdr.shadow_file_header.wrt_blocked_cntr"
-	Set gtmtypes("shmpool_buff_hdr",337,"off")=3636
-	Set gtmtypes("shmpool_buff_hdr",337,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",337,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_blocked_cntr")=337
-	Set gtmtypes("shmpool_buff_hdr",338,"name")="shmpool_buff_hdr.shadow_file_header.wrt_busy_cntr"
-	Set gtmtypes("shmpool_buff_hdr",338,"off")=3640
-	Set gtmtypes("shmpool_buff_hdr",338,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",338,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_busy_cntr")=338
-	Set gtmtypes("shmpool_buff_hdr",339,"name")="shmpool_buff_hdr.shadow_file_header.wrt_noblks_wrtn_cntr"
-	Set gtmtypes("shmpool_buff_hdr",339,"off")=3644
-	Set gtmtypes("shmpool_buff_hdr",339,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",339,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_noblks_wrtn_cntr")=339
-	Set gtmtypes("shmpool_buff_hdr",340,"name")="shmpool_buff_hdr.shadow_file_header.reserved_bgtrcrec1_cntr"
-	Set gtmtypes("shmpool_buff_hdr",340,"off")=3648
-	Set gtmtypes("shmpool_buff_hdr",340,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",340,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reserved_bgtrcrec1_cntr")=340
-	Set gtmtypes("shmpool_buff_hdr",341,"name")="shmpool_buff_hdr.shadow_file_header.reserved_bgtrcrec2_cntr"
-	Set gtmtypes("shmpool_buff_hdr",341,"off")=3652
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_ripsleep_cnt_tn")=330
+	Set gtmtypes("shmpool_buff_hdr",331,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_ripsleep_nblks_tn"
+	Set gtmtypes("shmpool_buff_hdr",331,"off")=3496
+	Set gtmtypes("shmpool_buff_hdr",331,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",331,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_ripsleep_nblks_tn")=331
+	Set gtmtypes("shmpool_buff_hdr",332,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wtfini_invoked_tn"
+	Set gtmtypes("shmpool_buff_hdr",332,"off")=3504
+	Set gtmtypes("shmpool_buff_hdr",332,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",332,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wtfini_invoked_tn")=332
+	Set gtmtypes("shmpool_buff_hdr",333,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wterror_invoked_tn"
+	Set gtmtypes("shmpool_buff_hdr",333,"off")=3512
+	Set gtmtypes("shmpool_buff_hdr",333,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",333,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wterror_invoked_tn")=333
+	Set gtmtypes("shmpool_buff_hdr",334,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wt_restart_invoked_tn"
+	Set gtmtypes("shmpool_buff_hdr",334,"off")=3520
+	Set gtmtypes("shmpool_buff_hdr",334,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",334,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wt_restart_invoked_tn")=334
+	Set gtmtypes("shmpool_buff_hdr",335,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wt_restart_eagain_tn"
+	Set gtmtypes("shmpool_buff_hdr",335,"off")=3528
+	Set gtmtypes("shmpool_buff_hdr",335,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",335,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wt_restart_eagain_tn")=335
+	Set gtmtypes("shmpool_buff_hdr",336,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wt_restart_reinsert_tn"
+	Set gtmtypes("shmpool_buff_hdr",336,"off")=3536
+	Set gtmtypes("shmpool_buff_hdr",336,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",336,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wt_restart_reinsert_tn")=336
+	Set gtmtypes("shmpool_buff_hdr",337,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wtstart_eagain_tn"
+	Set gtmtypes("shmpool_buff_hdr",337,"off")=3544
+	Set gtmtypes("shmpool_buff_hdr",337,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",337,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wtstart_eagain_tn")=337
+	Set gtmtypes("shmpool_buff_hdr",338,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wtstart_eagain_incrit_tn"
+	Set gtmtypes("shmpool_buff_hdr",338,"off")=3552
+	Set gtmtypes("shmpool_buff_hdr",338,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",338,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wtstart_eagain_incrit_tn")=338
+	Set gtmtypes("shmpool_buff_hdr",339,"name")="shmpool_buff_hdr.shadow_file_header.async_restart_eagain_tn"
+	Set gtmtypes("shmpool_buff_hdr",339,"off")=3560
+	Set gtmtypes("shmpool_buff_hdr",339,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",339,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.async_restart_eagain_tn")=339
+	Set gtmtypes("shmpool_buff_hdr",340,"name")="shmpool_buff_hdr.shadow_file_header.bg_trc_rec_tn_filler"
+	Set gtmtypes("shmpool_buff_hdr",340,"off")=3568
+	Set gtmtypes("shmpool_buff_hdr",340,"len")=48
+	Set gtmtypes("shmpool_buff_hdr",340,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bg_trc_rec_tn_filler")=340
+	Set gtmtypes("shmpool_buff_hdr",341,"name")="shmpool_buff_hdr.shadow_file_header.total_buffer_flush_cntr"
+	Set gtmtypes("shmpool_buff_hdr",341,"off")=3616
 	Set gtmtypes("shmpool_buff_hdr",341,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",341,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reserved_bgtrcrec2_cntr")=341
-	Set gtmtypes("shmpool_buff_hdr",342,"name")="shmpool_buff_hdr.shadow_file_header.reserved_bgtrcrec3_cntr"
-	Set gtmtypes("shmpool_buff_hdr",342,"off")=3656
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.total_buffer_flush_cntr")=341
+	Set gtmtypes("shmpool_buff_hdr",342,"name")="shmpool_buff_hdr.shadow_file_header.bufct_buffer_flush_cntr"
+	Set gtmtypes("shmpool_buff_hdr",342,"off")=3620
 	Set gtmtypes("shmpool_buff_hdr",342,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",342,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reserved_bgtrcrec3_cntr")=342
-	Set gtmtypes("shmpool_buff_hdr",343,"name")="shmpool_buff_hdr.shadow_file_header.lost_block_recovery_cntr"
-	Set gtmtypes("shmpool_buff_hdr",343,"off")=3660
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bufct_buffer_flush_cntr")=342
+	Set gtmtypes("shmpool_buff_hdr",343,"name")="shmpool_buff_hdr.shadow_file_header.bufct_buffer_flush_loop_cntr"
+	Set gtmtypes("shmpool_buff_hdr",343,"off")=3624
 	Set gtmtypes("shmpool_buff_hdr",343,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",343,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.lost_block_recovery_cntr")=343
-	Set gtmtypes("shmpool_buff_hdr",344,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_onln_rlbk_cntr"
-	Set gtmtypes("shmpool_buff_hdr",344,"off")=3664
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bufct_buffer_flush_loop_cntr")=343
+	Set gtmtypes("shmpool_buff_hdr",344,"name")="shmpool_buff_hdr.shadow_file_header.wrt_calls_cntr"
+	Set gtmtypes("shmpool_buff_hdr",344,"off")=3628
 	Set gtmtypes("shmpool_buff_hdr",344,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",344,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_onln_rlbk_cntr")=344
-	Set gtmtypes("shmpool_buff_hdr",345,"name")="shmpool_buff_hdr.shadow_file_header.stale_cntr"
-	Set gtmtypes("shmpool_buff_hdr",345,"off")=3668
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_calls_cntr")=344
+	Set gtmtypes("shmpool_buff_hdr",345,"name")="shmpool_buff_hdr.shadow_file_header.wrt_count_cntr"
+	Set gtmtypes("shmpool_buff_hdr",345,"off")=3632
 	Set gtmtypes("shmpool_buff_hdr",345,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",345,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_cntr")=345
-	Set gtmtypes("shmpool_buff_hdr",346,"name")="shmpool_buff_hdr.shadow_file_header.starved_cntr"
-	Set gtmtypes("shmpool_buff_hdr",346,"off")=3672
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_count_cntr")=345
+	Set gtmtypes("shmpool_buff_hdr",346,"name")="shmpool_buff_hdr.shadow_file_header.wrt_blocked_cntr"
+	Set gtmtypes("shmpool_buff_hdr",346,"off")=3636
 	Set gtmtypes("shmpool_buff_hdr",346,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",346,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.starved_cntr")=346
-	Set gtmtypes("shmpool_buff_hdr",347,"name")="shmpool_buff_hdr.shadow_file_header.stale_timer_started_cntr"
-	Set gtmtypes("shmpool_buff_hdr",347,"off")=3676
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_blocked_cntr")=346
+	Set gtmtypes("shmpool_buff_hdr",347,"name")="shmpool_buff_hdr.shadow_file_header.wrt_busy_cntr"
+	Set gtmtypes("shmpool_buff_hdr",347,"off")=3640
 	Set gtmtypes("shmpool_buff_hdr",347,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",347,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_timer_started_cntr")=347
-	Set gtmtypes("shmpool_buff_hdr",348,"name")="shmpool_buff_hdr.shadow_file_header.stale_timer_pop_cntr"
-	Set gtmtypes("shmpool_buff_hdr",348,"off")=3680
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_busy_cntr")=347
+	Set gtmtypes("shmpool_buff_hdr",348,"name")="shmpool_buff_hdr.shadow_file_header.wrt_noblks_wrtn_cntr"
+	Set gtmtypes("shmpool_buff_hdr",348,"off")=3644
 	Set gtmtypes("shmpool_buff_hdr",348,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",348,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_timer_pop_cntr")=348
-	Set gtmtypes("shmpool_buff_hdr",349,"name")="shmpool_buff_hdr.shadow_file_header.stale_process_defer_cntr"
-	Set gtmtypes("shmpool_buff_hdr",349,"off")=3684
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wrt_noblks_wrtn_cntr")=348
+	Set gtmtypes("shmpool_buff_hdr",349,"name")="shmpool_buff_hdr.shadow_file_header.reserved_bgtrcrec1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",349,"off")=3648
 	Set gtmtypes("shmpool_buff_hdr",349,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",349,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_process_defer_cntr")=349
-	Set gtmtypes("shmpool_buff_hdr",350,"name")="shmpool_buff_hdr.shadow_file_header.stale_defer_processed_cntr"
-	Set gtmtypes("shmpool_buff_hdr",350,"off")=3688
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reserved_bgtrcrec1_cntr")=349
+	Set gtmtypes("shmpool_buff_hdr",350,"name")="shmpool_buff_hdr.shadow_file_header.reserved_bgtrcrec2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",350,"off")=3652
 	Set gtmtypes("shmpool_buff_hdr",350,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",350,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_defer_processed_cntr")=350
-	Set gtmtypes("shmpool_buff_hdr",351,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flush_cntr"
-	Set gtmtypes("shmpool_buff_hdr",351,"off")=3692
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reserved_bgtrcrec2_cntr")=350
+	Set gtmtypes("shmpool_buff_hdr",351,"name")="shmpool_buff_hdr.shadow_file_header.reserved_bgtrcrec3_cntr"
+	Set gtmtypes("shmpool_buff_hdr",351,"off")=3656
 	Set gtmtypes("shmpool_buff_hdr",351,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",351,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flush_cntr")=351
-	Set gtmtypes("shmpool_buff_hdr",352,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flush_loop_cntr"
-	Set gtmtypes("shmpool_buff_hdr",352,"off")=3696
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.reserved_bgtrcrec3_cntr")=351
+	Set gtmtypes("shmpool_buff_hdr",352,"name")="shmpool_buff_hdr.shadow_file_header.lost_block_recovery_cntr"
+	Set gtmtypes("shmpool_buff_hdr",352,"off")=3660
 	Set gtmtypes("shmpool_buff_hdr",352,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",352,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flush_loop_cntr")=352
-	Set gtmtypes("shmpool_buff_hdr",353,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flush_retries_cntr"
-	Set gtmtypes("shmpool_buff_hdr",353,"off")=3700
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.lost_block_recovery_cntr")=352
+	Set gtmtypes("shmpool_buff_hdr",353,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_onln_rlbk_cntr"
+	Set gtmtypes("shmpool_buff_hdr",353,"off")=3664
 	Set gtmtypes("shmpool_buff_hdr",353,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",353,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flush_retries_cntr")=353
-	Set gtmtypes("shmpool_buff_hdr",354,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flushed_during_lockwait_cntr"
-	Set gtmtypes("shmpool_buff_hdr",354,"off")=3704
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_onln_rlbk_cntr")=353
+	Set gtmtypes("shmpool_buff_hdr",354,"name")="shmpool_buff_hdr.shadow_file_header.stale_cntr"
+	Set gtmtypes("shmpool_buff_hdr",354,"off")=3668
 	Set gtmtypes("shmpool_buff_hdr",354,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",354,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flushed_during_lockwait_cntr")=354
-	Set gtmtypes("shmpool_buff_hdr",355,"name")="shmpool_buff_hdr.shadow_file_header.tp_crit_retries_cntr"
-	Set gtmtypes("shmpool_buff_hdr",355,"off")=3708
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_cntr")=354
+	Set gtmtypes("shmpool_buff_hdr",355,"name")="shmpool_buff_hdr.shadow_file_header.starved_cntr"
+	Set gtmtypes("shmpool_buff_hdr",355,"off")=3672
 	Set gtmtypes("shmpool_buff_hdr",355,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",355,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.tp_crit_retries_cntr")=355
-	Set gtmtypes("shmpool_buff_hdr",356,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_flush_dirty_cntr"
-	Set gtmtypes("shmpool_buff_hdr",356,"off")=3712
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.starved_cntr")=355
+	Set gtmtypes("shmpool_buff_hdr",356,"name")="shmpool_buff_hdr.shadow_file_header.stale_timer_started_cntr"
+	Set gtmtypes("shmpool_buff_hdr",356,"off")=3676
 	Set gtmtypes("shmpool_buff_hdr",356,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",356,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_flush_dirty_cntr")=356
-	Set gtmtypes("shmpool_buff_hdr",357,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_rip_wait_cntr"
-	Set gtmtypes("shmpool_buff_hdr",357,"off")=3716
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_timer_started_cntr")=356
+	Set gtmtypes("shmpool_buff_hdr",357,"name")="shmpool_buff_hdr.shadow_file_header.stale_timer_pop_cntr"
+	Set gtmtypes("shmpool_buff_hdr",357,"off")=3680
 	Set gtmtypes("shmpool_buff_hdr",357,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",357,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_rip_wait_cntr")=357
-	Set gtmtypes("shmpool_buff_hdr",358,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_buf_owner_stuck_cntr"
-	Set gtmtypes("shmpool_buff_hdr",358,"off")=3720
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_timer_pop_cntr")=357
+	Set gtmtypes("shmpool_buff_hdr",358,"name")="shmpool_buff_hdr.shadow_file_header.stale_process_defer_cntr"
+	Set gtmtypes("shmpool_buff_hdr",358,"off")=3684
 	Set gtmtypes("shmpool_buff_hdr",358,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",358,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_buf_owner_stuck_cntr")=358
-	Set gtmtypes("shmpool_buff_hdr",359,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_out_of_design_cntr"
-	Set gtmtypes("shmpool_buff_hdr",359,"off")=3724
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_process_defer_cntr")=358
+	Set gtmtypes("shmpool_buff_hdr",359,"name")="shmpool_buff_hdr.shadow_file_header.stale_defer_processed_cntr"
+	Set gtmtypes("shmpool_buff_hdr",359,"off")=3688
 	Set gtmtypes("shmpool_buff_hdr",359,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",359,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_out_of_design_cntr")=359
-	Set gtmtypes("shmpool_buff_hdr",360,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_buf_owner_stuck_cntr"
-	Set gtmtypes("shmpool_buff_hdr",360,"off")=3728
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.stale_defer_processed_cntr")=359
+	Set gtmtypes("shmpool_buff_hdr",360,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flush_cntr"
+	Set gtmtypes("shmpool_buff_hdr",360,"off")=3692
 	Set gtmtypes("shmpool_buff_hdr",360,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",360,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_buf_owner_stuck_cntr")=360
-	Set gtmtypes("shmpool_buff_hdr",361,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_out_of_design_cntr"
-	Set gtmtypes("shmpool_buff_hdr",361,"off")=3732
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flush_cntr")=360
+	Set gtmtypes("shmpool_buff_hdr",361,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flush_loop_cntr"
+	Set gtmtypes("shmpool_buff_hdr",361,"off")=3696
 	Set gtmtypes("shmpool_buff_hdr",361,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",361,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_out_of_design_cntr")=361
-	Set gtmtypes("shmpool_buff_hdr",362,"name")="shmpool_buff_hdr.shadow_file_header.bt_put_flush_dirty_cntr"
-	Set gtmtypes("shmpool_buff_hdr",362,"off")=3736
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flush_loop_cntr")=361
+	Set gtmtypes("shmpool_buff_hdr",362,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flush_retries_cntr"
+	Set gtmtypes("shmpool_buff_hdr",362,"off")=3700
 	Set gtmtypes("shmpool_buff_hdr",362,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",362,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bt_put_flush_dirty_cntr")=362
-	Set gtmtypes("shmpool_buff_hdr",363,"name")="shmpool_buff_hdr.shadow_file_header.mlock_wakeups_cntr"
-	Set gtmtypes("shmpool_buff_hdr",363,"off")=3740
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flush_retries_cntr")=362
+	Set gtmtypes("shmpool_buff_hdr",363,"name")="shmpool_buff_hdr.shadow_file_header.spcfc_buffer_flushed_during_lockwait_cntr"
+	Set gtmtypes("shmpool_buff_hdr",363,"off")=3704
 	Set gtmtypes("shmpool_buff_hdr",363,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",363,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.mlock_wakeups_cntr")=363
-	Set gtmtypes("shmpool_buff_hdr",364,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_recover_invoked_cntr"
-	Set gtmtypes("shmpool_buff_hdr",364,"off")=3744
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.spcfc_buffer_flushed_during_lockwait_cntr")=363
+	Set gtmtypes("shmpool_buff_hdr",364,"name")="shmpool_buff_hdr.shadow_file_header.tp_crit_retries_cntr"
+	Set gtmtypes("shmpool_buff_hdr",364,"off")=3708
 	Set gtmtypes("shmpool_buff_hdr",364,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",364,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_recover_invoked_cntr")=364
-	Set gtmtypes("shmpool_buff_hdr",365,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_verify_passed_cntr"
-	Set gtmtypes("shmpool_buff_hdr",365,"off")=3748
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.tp_crit_retries_cntr")=364
+	Set gtmtypes("shmpool_buff_hdr",365,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_flush_dirty_cntr"
+	Set gtmtypes("shmpool_buff_hdr",365,"off")=3712
 	Set gtmtypes("shmpool_buff_hdr",365,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",365,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_verify_passed_cntr")=365
-	Set gtmtypes("shmpool_buff_hdr",366,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr"
-	Set gtmtypes("shmpool_buff_hdr",366,"off")=3752
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_flush_dirty_cntr")=365
+	Set gtmtypes("shmpool_buff_hdr",366,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_rip_wait_cntr"
+	Set gtmtypes("shmpool_buff_hdr",366,"off")=3716
 	Set gtmtypes("shmpool_buff_hdr",366,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",366,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr")=366
-	Set gtmtypes("shmpool_buff_hdr",367,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_cntr"
-	Set gtmtypes("shmpool_buff_hdr",367,"off")=3756
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_rip_wait_cntr")=366
+	Set gtmtypes("shmpool_buff_hdr",367,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_buf_owner_stuck_cntr"
+	Set gtmtypes("shmpool_buff_hdr",367,"off")=3720
 	Set gtmtypes("shmpool_buff_hdr",367,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",367,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_cntr")=367
-	Set gtmtypes("shmpool_buff_hdr",368,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_db_csh_getn_loopexceed_cntr"
-	Set gtmtypes("shmpool_buff_hdr",368,"off")=3760
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_buf_owner_stuck_cntr")=367
+	Set gtmtypes("shmpool_buff_hdr",368,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_out_of_design_cntr"
+	Set gtmtypes("shmpool_buff_hdr",368,"off")=3724
 	Set gtmtypes("shmpool_buff_hdr",368,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",368,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_db_csh_getn_loopexceed_cntr")=368
-	Set gtmtypes("shmpool_buff_hdr",369,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_cntr"
-	Set gtmtypes("shmpool_buff_hdr",369,"off")=3764
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_out_of_design_cntr")=368
+	Set gtmtypes("shmpool_buff_hdr",369,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_buf_owner_stuck_cntr"
+	Set gtmtypes("shmpool_buff_hdr",369,"off")=3728
 	Set gtmtypes("shmpool_buff_hdr",369,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",369,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_cntr")=369
-	Set gtmtypes("shmpool_buff_hdr",370,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_db_csh_get_cntr"
-	Set gtmtypes("shmpool_buff_hdr",370,"off")=3768
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_buf_owner_stuck_cntr")=369
+	Set gtmtypes("shmpool_buff_hdr",370,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_out_of_design_cntr"
+	Set gtmtypes("shmpool_buff_hdr",370,"off")=3732
 	Set gtmtypes("shmpool_buff_hdr",370,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",370,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_db_csh_get_cntr")=370
-	Set gtmtypes("shmpool_buff_hdr",371,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_wcsgetspace_cntr"
-	Set gtmtypes("shmpool_buff_hdr",371,"off")=3772
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_out_of_design_cntr")=370
+	Set gtmtypes("shmpool_buff_hdr",371,"name")="shmpool_buff_hdr.shadow_file_header.bt_put_flush_dirty_cntr"
+	Set gtmtypes("shmpool_buff_hdr",371,"off")=3736
 	Set gtmtypes("shmpool_buff_hdr",371,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",371,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_wcsgetspace_cntr")=371
-	Set gtmtypes("shmpool_buff_hdr",372,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_t1_cntr"
-	Set gtmtypes("shmpool_buff_hdr",372,"off")=3776
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bt_put_flush_dirty_cntr")=371
+	Set gtmtypes("shmpool_buff_hdr",372,"name")="shmpool_buff_hdr.shadow_file_header.mlock_wakeups_cntr"
+	Set gtmtypes("shmpool_buff_hdr",372,"off")=3740
 	Set gtmtypes("shmpool_buff_hdr",372,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",372,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_t1_cntr")=372
-	Set gtmtypes("shmpool_buff_hdr",373,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_bitmap_cntr"
-	Set gtmtypes("shmpool_buff_hdr",373,"off")=3780
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.mlock_wakeups_cntr")=372
+	Set gtmtypes("shmpool_buff_hdr",373,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_recover_invoked_cntr"
+	Set gtmtypes("shmpool_buff_hdr",373,"off")=3744
 	Set gtmtypes("shmpool_buff_hdr",373,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",373,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_bitmap_cntr")=373
-	Set gtmtypes("shmpool_buff_hdr",374,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_jnl_cwset_cntr"
-	Set gtmtypes("shmpool_buff_hdr",374,"off")=3784
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_recover_invoked_cntr")=373
+	Set gtmtypes("shmpool_buff_hdr",374,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_verify_passed_cntr"
+	Set gtmtypes("shmpool_buff_hdr",374,"off")=3748
 	Set gtmtypes("shmpool_buff_hdr",374,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",374,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_jnl_cwset_cntr")=374
-	Set gtmtypes("shmpool_buff_hdr",375,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_cntr"
-	Set gtmtypes("shmpool_buff_hdr",375,"off")=3788
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_verify_passed_cntr")=374
+	Set gtmtypes("shmpool_buff_hdr",375,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr"
+	Set gtmtypes("shmpool_buff_hdr",375,"off")=3752
 	Set gtmtypes("shmpool_buff_hdr",375,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",375,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_cntr")=375
-	Set gtmtypes("shmpool_buff_hdr",376,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_hist_cntr"
-	Set gtmtypes("shmpool_buff_hdr",376,"off")=3792
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_db_csh_getn_invalid_blk_cntr")=375
+	Set gtmtypes("shmpool_buff_hdr",376,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_cntr"
+	Set gtmtypes("shmpool_buff_hdr",376,"off")=3756
 	Set gtmtypes("shmpool_buff_hdr",376,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",376,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_hist_cntr")=376
-	Set gtmtypes("shmpool_buff_hdr",377,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_hist1_nullbt_cntr"
-	Set gtmtypes("shmpool_buff_hdr",377,"off")=3796
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_db_csh_get_invalid_blk_cntr")=376
+	Set gtmtypes("shmpool_buff_hdr",377,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_db_csh_getn_loopexceed_cntr"
+	Set gtmtypes("shmpool_buff_hdr",377,"off")=3760
 	Set gtmtypes("shmpool_buff_hdr",377,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",377,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_hist1_nullbt_cntr")=377
-	Set gtmtypes("shmpool_buff_hdr",378,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_cntr"
-	Set gtmtypes("shmpool_buff_hdr",378,"off")=3800
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_db_csh_getn_loopexceed_cntr")=377
+	Set gtmtypes("shmpool_buff_hdr",378,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",378,"off")=3764
 	Set gtmtypes("shmpool_buff_hdr",378,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",378,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_cntr")=378
-	Set gtmtypes("shmpool_buff_hdr",379,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_bitmap_nullbt_cntr"
-	Set gtmtypes("shmpool_buff_hdr",379,"off")=3804
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_db_csh_getn_wcsstarvewrt_cntr")=378
+	Set gtmtypes("shmpool_buff_hdr",379,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_db_csh_get_cntr"
+	Set gtmtypes("shmpool_buff_hdr",379,"off")=3768
 	Set gtmtypes("shmpool_buff_hdr",379,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",379,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_bitmap_nullbt_cntr")=379
-	Set gtmtypes("shmpool_buff_hdr",380,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_cntr"
-	Set gtmtypes("shmpool_buff_hdr",380,"off")=3808
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_db_csh_get_cntr")=379
+	Set gtmtypes("shmpool_buff_hdr",380,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_wcsgetspace_cntr"
+	Set gtmtypes("shmpool_buff_hdr",380,"off")=3772
 	Set gtmtypes("shmpool_buff_hdr",380,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",380,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_cntr")=380
-	Set gtmtypes("shmpool_buff_hdr",381,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_jnl_cwset_cntr"
-	Set gtmtypes("shmpool_buff_hdr",381,"off")=3812
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_wcsgetspace_cntr")=380
+	Set gtmtypes("shmpool_buff_hdr",381,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_t1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",381,"off")=3776
 	Set gtmtypes("shmpool_buff_hdr",381,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",381,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_jnl_cwset_cntr")=381
-	Set gtmtypes("shmpool_buff_hdr",382,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_jnl_wcsflu_cntr"
-	Set gtmtypes("shmpool_buff_hdr",382,"off")=3816
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_t1_cntr")=381
+	Set gtmtypes("shmpool_buff_hdr",382,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_bitmap_cntr"
+	Set gtmtypes("shmpool_buff_hdr",382,"off")=3780
 	Set gtmtypes("shmpool_buff_hdr",382,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",382,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_jnl_wcsflu_cntr")=382
-	Set gtmtypes("shmpool_buff_hdr",383,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_get_too_many_loops_cntr"
-	Set gtmtypes("shmpool_buff_hdr",383,"off")=3820
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_bitmap_cntr")=382
+	Set gtmtypes("shmpool_buff_hdr",383,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_jnl_cwset_cntr"
+	Set gtmtypes("shmpool_buff_hdr",383,"off")=3784
 	Set gtmtypes("shmpool_buff_hdr",383,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",383,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_get_too_many_loops_cntr")=383
-	Set gtmtypes("shmpool_buff_hdr",384,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tpckh_hist1_nullbt_cntr"
-	Set gtmtypes("shmpool_buff_hdr",384,"off")=3824
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_jnl_cwset_cntr")=383
+	Set gtmtypes("shmpool_buff_hdr",384,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_cntr"
+	Set gtmtypes("shmpool_buff_hdr",384,"off")=3788
 	Set gtmtypes("shmpool_buff_hdr",384,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",384,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tpckh_hist1_nullbt_cntr")=384
-	Set gtmtypes("shmpool_buff_hdr",385,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_cntr"
-	Set gtmtypes("shmpool_buff_hdr",385,"off")=3828
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_jnl_wcsflu_cntr")=384
+	Set gtmtypes("shmpool_buff_hdr",385,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_hist_cntr"
+	Set gtmtypes("shmpool_buff_hdr",385,"off")=3792
 	Set gtmtypes("shmpool_buff_hdr",385,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",385,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_cntr")=385
-	Set gtmtypes("shmpool_buff_hdr",386,"name")="shmpool_buff_hdr.shadow_file_header.jnl_blocked_writer_lost_cntr"
-	Set gtmtypes("shmpool_buff_hdr",386,"off")=3832
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_hist_cntr")=385
+	Set gtmtypes("shmpool_buff_hdr",386,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_hist1_nullbt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",386,"off")=3796
 	Set gtmtypes("shmpool_buff_hdr",386,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",386,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_blocked_writer_lost_cntr")=386
-	Set gtmtypes("shmpool_buff_hdr",387,"name")="shmpool_buff_hdr.shadow_file_header.jnl_blocked_writer_stuck_cntr"
-	Set gtmtypes("shmpool_buff_hdr",387,"off")=3836
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_hist1_nullbt_cntr")=386
+	Set gtmtypes("shmpool_buff_hdr",387,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",387,"off")=3800
 	Set gtmtypes("shmpool_buff_hdr",387,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",387,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_blocked_writer_stuck_cntr")=387
-	Set gtmtypes("shmpool_buff_hdr",388,"name")="shmpool_buff_hdr.shadow_file_header.jnl_blocked_writer_blocked_cntr"
-	Set gtmtypes("shmpool_buff_hdr",388,"off")=3840
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_hist1_nonnullbt_cntr")=387
+	Set gtmtypes("shmpool_buff_hdr",388,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_bitmap_nullbt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",388,"off")=3804
 	Set gtmtypes("shmpool_buff_hdr",388,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",388,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_blocked_writer_blocked_cntr")=388
-	Set gtmtypes("shmpool_buff_hdr",389,"name")="shmpool_buff_hdr.shadow_file_header.n_jnl_fsyncs_cntr"
-	Set gtmtypes("shmpool_buff_hdr",389,"off")=3844
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_bitmap_nullbt_cntr")=388
+	Set gtmtypes("shmpool_buff_hdr",389,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",389,"off")=3808
 	Set gtmtypes("shmpool_buff_hdr",389,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",389,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_jnl_fsyncs_cntr")=389
-	Set gtmtypes("shmpool_buff_hdr",390,"name")="shmpool_buff_hdr.shadow_file_header.n_jnl_fsync_tries_cntr"
-	Set gtmtypes("shmpool_buff_hdr",390,"off")=3848
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_bitmap_nonnullbt_cntr")=389
+	Set gtmtypes("shmpool_buff_hdr",390,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_jnl_cwset_cntr"
+	Set gtmtypes("shmpool_buff_hdr",390,"off")=3812
 	Set gtmtypes("shmpool_buff_hdr",390,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",390,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_jnl_fsync_tries_cntr")=390
-	Set gtmtypes("shmpool_buff_hdr",391,"name")="shmpool_buff_hdr.shadow_file_header.n_jnl_fsync_recovers_cntr"
-	Set gtmtypes("shmpool_buff_hdr",391,"off")=3852
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_jnl_cwset_cntr")=390
+	Set gtmtypes("shmpool_buff_hdr",391,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_jnl_wcsflu_cntr"
+	Set gtmtypes("shmpool_buff_hdr",391,"off")=3816
 	Set gtmtypes("shmpool_buff_hdr",391,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",391,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_jnl_fsync_recovers_cntr")=391
-	Set gtmtypes("shmpool_buff_hdr",392,"name")="shmpool_buff_hdr.shadow_file_header.n_db_fsyncs_cntr"
-	Set gtmtypes("shmpool_buff_hdr",392,"off")=3856
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_jnl_wcsflu_cntr")=391
+	Set gtmtypes("shmpool_buff_hdr",392,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_get_too_many_loops_cntr"
+	Set gtmtypes("shmpool_buff_hdr",392,"off")=3820
 	Set gtmtypes("shmpool_buff_hdr",392,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",392,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_fsyncs_cntr")=392
-	Set gtmtypes("shmpool_buff_hdr",393,"name")="shmpool_buff_hdr.shadow_file_header.n_db_fsyncs_in_crit_cntr"
-	Set gtmtypes("shmpool_buff_hdr",393,"off")=3860
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_get_too_many_loops_cntr")=392
+	Set gtmtypes("shmpool_buff_hdr",393,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tpckh_hist1_nullbt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",393,"off")=3824
 	Set gtmtypes("shmpool_buff_hdr",393,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",393,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_fsyncs_in_crit_cntr")=393
-	Set gtmtypes("shmpool_buff_hdr",394,"name")="shmpool_buff_hdr.shadow_file_header.n_dbsync_timers_cntr"
-	Set gtmtypes("shmpool_buff_hdr",394,"off")=3864
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tpckh_hist1_nullbt_cntr")=393
+	Set gtmtypes("shmpool_buff_hdr",394,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",394,"off")=3828
 	Set gtmtypes("shmpool_buff_hdr",394,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",394,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_dbsync_timers_cntr")=394
-	Set gtmtypes("shmpool_buff_hdr",395,"name")="shmpool_buff_hdr.shadow_file_header.n_dbsync_writes_cntr"
-	Set gtmtypes("shmpool_buff_hdr",395,"off")=3868
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tpckh_hist1_nonnullbt_cntr")=394
+	Set gtmtypes("shmpool_buff_hdr",395,"name")="shmpool_buff_hdr.shadow_file_header.jnl_blocked_writer_lost_cntr"
+	Set gtmtypes("shmpool_buff_hdr",395,"off")=3832
 	Set gtmtypes("shmpool_buff_hdr",395,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",395,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_dbsync_writes_cntr")=395
-	Set gtmtypes("shmpool_buff_hdr",396,"name")="shmpool_buff_hdr.shadow_file_header.mutex_queue_full_cntr"
-	Set gtmtypes("shmpool_buff_hdr",396,"off")=3872
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_blocked_writer_lost_cntr")=395
+	Set gtmtypes("shmpool_buff_hdr",396,"name")="shmpool_buff_hdr.shadow_file_header.jnl_blocked_writer_stuck_cntr"
+	Set gtmtypes("shmpool_buff_hdr",396,"off")=3836
 	Set gtmtypes("shmpool_buff_hdr",396,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",396,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.mutex_queue_full_cntr")=396
-	Set gtmtypes("shmpool_buff_hdr",397,"name")="shmpool_buff_hdr.shadow_file_header.wcb_bt_put_cntr"
-	Set gtmtypes("shmpool_buff_hdr",397,"off")=3876
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_blocked_writer_stuck_cntr")=396
+	Set gtmtypes("shmpool_buff_hdr",397,"name")="shmpool_buff_hdr.shadow_file_header.jnl_blocked_writer_blocked_cntr"
+	Set gtmtypes("shmpool_buff_hdr",397,"off")=3840
 	Set gtmtypes("shmpool_buff_hdr",397,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",397,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_bt_put_cntr")=397
-	Set gtmtypes("shmpool_buff_hdr",398,"name")="shmpool_buff_hdr.shadow_file_header.wcb_mutex_salvage_cntr"
-	Set gtmtypes("shmpool_buff_hdr",398,"off")=3880
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.jnl_blocked_writer_blocked_cntr")=397
+	Set gtmtypes("shmpool_buff_hdr",398,"name")="shmpool_buff_hdr.shadow_file_header.n_jnl_fsyncs_cntr"
+	Set gtmtypes("shmpool_buff_hdr",398,"off")=3844
 	Set gtmtypes("shmpool_buff_hdr",398,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",398,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_mutex_salvage_cntr")=398
-	Set gtmtypes("shmpool_buff_hdr",399,"name")="shmpool_buff_hdr.shadow_file_header.wcb_tp_grab_crit_cntr"
-	Set gtmtypes("shmpool_buff_hdr",399,"off")=3884
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_jnl_fsyncs_cntr")=398
+	Set gtmtypes("shmpool_buff_hdr",399,"name")="shmpool_buff_hdr.shadow_file_header.n_jnl_fsync_tries_cntr"
+	Set gtmtypes("shmpool_buff_hdr",399,"off")=3848
 	Set gtmtypes("shmpool_buff_hdr",399,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",399,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_tp_grab_crit_cntr")=399
-	Set gtmtypes("shmpool_buff_hdr",400,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_nocr_invcr_cntr"
-	Set gtmtypes("shmpool_buff_hdr",400,"off")=3888
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_jnl_fsync_tries_cntr")=399
+	Set gtmtypes("shmpool_buff_hdr",400,"name")="shmpool_buff_hdr.shadow_file_header.n_jnl_fsync_recovers_cntr"
+	Set gtmtypes("shmpool_buff_hdr",400,"off")=3852
 	Set gtmtypes("shmpool_buff_hdr",400,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",400,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_nocr_invcr_cntr")=400
-	Set gtmtypes("shmpool_buff_hdr",401,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_cr_invcr_cntr"
-	Set gtmtypes("shmpool_buff_hdr",401,"off")=3892
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_jnl_fsync_recovers_cntr")=400
+	Set gtmtypes("shmpool_buff_hdr",401,"name")="shmpool_buff_hdr.shadow_file_header.n_db_fsyncs_cntr"
+	Set gtmtypes("shmpool_buff_hdr",401,"off")=3856
 	Set gtmtypes("shmpool_buff_hdr",401,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",401,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_cr_invcr_cntr")=401
-	Set gtmtypes("shmpool_buff_hdr",402,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_rip_wait_cntr"
-	Set gtmtypes("shmpool_buff_hdr",402,"off")=3896
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_fsyncs_cntr")=401
+	Set gtmtypes("shmpool_buff_hdr",402,"name")="shmpool_buff_hdr.shadow_file_header.n_db_fsyncs_in_crit_cntr"
+	Set gtmtypes("shmpool_buff_hdr",402,"off")=3860
 	Set gtmtypes("shmpool_buff_hdr",402,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",402,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_rip_wait_cntr")=402
-	Set gtmtypes("shmpool_buff_hdr",403,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirtyripwait_cntr"
-	Set gtmtypes("shmpool_buff_hdr",403,"off")=3900
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_fsyncs_in_crit_cntr")=402
+	Set gtmtypes("shmpool_buff_hdr",403,"name")="shmpool_buff_hdr.shadow_file_header.n_dbsync_timers_cntr"
+	Set gtmtypes("shmpool_buff_hdr",403,"off")=3864
 	Set gtmtypes("shmpool_buff_hdr",403,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",403,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirtyripwait_cntr")=403
-	Set gtmtypes("shmpool_buff_hdr",404,"name")="shmpool_buff_hdr.shadow_file_header.wcb_gds_rundown_cntr"
-	Set gtmtypes("shmpool_buff_hdr",404,"off")=3904
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_dbsync_timers_cntr")=403
+	Set gtmtypes("shmpool_buff_hdr",404,"name")="shmpool_buff_hdr.shadow_file_header.n_dbsync_writes_cntr"
+	Set gtmtypes("shmpool_buff_hdr",404,"off")=3868
 	Set gtmtypes("shmpool_buff_hdr",404,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",404,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_gds_rundown_cntr")=404
-	Set gtmtypes("shmpool_buff_hdr",405,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wcs_flu1_cntr"
-	Set gtmtypes("shmpool_buff_hdr",405,"off")=3908
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_dbsync_writes_cntr")=404
+	Set gtmtypes("shmpool_buff_hdr",405,"name")="shmpool_buff_hdr.shadow_file_header.mutex_queue_full_cntr"
+	Set gtmtypes("shmpool_buff_hdr",405,"off")=3872
 	Set gtmtypes("shmpool_buff_hdr",405,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",405,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wcs_flu1_cntr")=405
-	Set gtmtypes("shmpool_buff_hdr",406,"name")="shmpool_buff_hdr.shadow_file_header.wcb_mu_back_cntr"
-	Set gtmtypes("shmpool_buff_hdr",406,"off")=3912
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.mutex_queue_full_cntr")=405
+	Set gtmtypes("shmpool_buff_hdr",406,"name")="shmpool_buff_hdr.shadow_file_header.wcb_bt_put_cntr"
+	Set gtmtypes("shmpool_buff_hdr",406,"off")=3876
 	Set gtmtypes("shmpool_buff_hdr",406,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",406,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_mu_back_cntr")=406
-	Set gtmtypes("shmpool_buff_hdr",407,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirty_invcr_cntr"
-	Set gtmtypes("shmpool_buff_hdr",407,"off")=3916
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_bt_put_cntr")=406
+	Set gtmtypes("shmpool_buff_hdr",407,"name")="shmpool_buff_hdr.shadow_file_header.wcb_mutex_salvage_cntr"
+	Set gtmtypes("shmpool_buff_hdr",407,"off")=3880
 	Set gtmtypes("shmpool_buff_hdr",407,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",407,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirty_invcr_cntr")=407
-	Set gtmtypes("shmpool_buff_hdr",408,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_wtfini_fail_cntr"
-	Set gtmtypes("shmpool_buff_hdr",408,"off")=3920
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_mutex_salvage_cntr")=407
+	Set gtmtypes("shmpool_buff_hdr",408,"name")="shmpool_buff_hdr.shadow_file_header.wcb_tp_grab_crit_cntr"
+	Set gtmtypes("shmpool_buff_hdr",408,"off")=3884
 	Set gtmtypes("shmpool_buff_hdr",408,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",408,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_wtfini_fail_cntr")=408
-	Set gtmtypes("shmpool_buff_hdr",409,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_twin_stuck_cntr"
-	Set gtmtypes("shmpool_buff_hdr",409,"off")=3924
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_tp_grab_crit_cntr")=408
+	Set gtmtypes("shmpool_buff_hdr",409,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_nocr_invcr_cntr"
+	Set gtmtypes("shmpool_buff_hdr",409,"off")=3888
 	Set gtmtypes("shmpool_buff_hdr",409,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",409,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_twin_stuck_cntr")=409
-	Set gtmtypes("shmpool_buff_hdr",410,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_wrt_latch_stuck_cntr"
-	Set gtmtypes("shmpool_buff_hdr",410,"off")=3928
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_nocr_invcr_cntr")=409
+	Set gtmtypes("shmpool_buff_hdr",410,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_cr_invcr_cntr"
+	Set gtmtypes("shmpool_buff_hdr",410,"off")=3892
 	Set gtmtypes("shmpool_buff_hdr",410,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",410,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_wrt_latch_stuck_cntr")=410
-	Set gtmtypes("shmpool_buff_hdr",411,"name")="shmpool_buff_hdr.shadow_file_header.wcb_secshr_db_clnup_now_crit_cntr"
-	Set gtmtypes("shmpool_buff_hdr",411,"off")=3932
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_cr_invcr_cntr")=410
+	Set gtmtypes("shmpool_buff_hdr",411,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_rip_wait_cntr"
+	Set gtmtypes("shmpool_buff_hdr",411,"off")=3896
 	Set gtmtypes("shmpool_buff_hdr",411,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",411,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_secshr_db_clnup_now_crit_cntr")=411
-	Set gtmtypes("shmpool_buff_hdr",412,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_bad_bt_index1_cntr"
-	Set gtmtypes("shmpool_buff_hdr",412,"off")=3936
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_rip_wait_cntr")=411
+	Set gtmtypes("shmpool_buff_hdr",412,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirtyripwait_cntr"
+	Set gtmtypes("shmpool_buff_hdr",412,"off")=3900
 	Set gtmtypes("shmpool_buff_hdr",412,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",412,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_bad_bt_index1_cntr")=412
-	Set gtmtypes("shmpool_buff_hdr",413,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_bad_bt_index2_cntr"
-	Set gtmtypes("shmpool_buff_hdr",413,"off")=3940
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirtyripwait_cntr")=412
+	Set gtmtypes("shmpool_buff_hdr",413,"name")="shmpool_buff_hdr.shadow_file_header.wcb_gds_rundown_cntr"
+	Set gtmtypes("shmpool_buff_hdr",413,"off")=3904
 	Set gtmtypes("shmpool_buff_hdr",413,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",413,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_bad_bt_index2_cntr")=413
-	Set gtmtypes("shmpool_buff_hdr",414,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_crbtmismatch1_cntr"
-	Set gtmtypes("shmpool_buff_hdr",414,"off")=3944
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_gds_rundown_cntr")=413
+	Set gtmtypes("shmpool_buff_hdr",414,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wcs_flu1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",414,"off")=3908
 	Set gtmtypes("shmpool_buff_hdr",414,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",414,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_crbtmismatch1_cntr")=414
-	Set gtmtypes("shmpool_buff_hdr",415,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_crbtmismatch2_cntr"
-	Set gtmtypes("shmpool_buff_hdr",415,"off")=3948
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wcs_flu1_cntr")=414
+	Set gtmtypes("shmpool_buff_hdr",415,"name")="shmpool_buff_hdr.shadow_file_header.wcb_mu_back_cntr"
+	Set gtmtypes("shmpool_buff_hdr",415,"off")=3912
 	Set gtmtypes("shmpool_buff_hdr",415,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",415,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_crbtmismatch2_cntr")=415
-	Set gtmtypes("shmpool_buff_hdr",416,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_crbtmismatch3_cntr"
-	Set gtmtypes("shmpool_buff_hdr",416,"off")=3952
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_mu_back_cntr")=415
+	Set gtmtypes("shmpool_buff_hdr",416,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirty_invcr_cntr"
+	Set gtmtypes("shmpool_buff_hdr",416,"off")=3916
 	Set gtmtypes("shmpool_buff_hdr",416,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",416,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_crbtmismatch3_cntr")=416
-	Set gtmtypes("shmpool_buff_hdr",417,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_cntr"
-	Set gtmtypes("shmpool_buff_hdr",417,"off")=3956
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirty_invcr_cntr")=416
+	Set gtmtypes("shmpool_buff_hdr",417,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_wtfini_fail_cntr"
+	Set gtmtypes("shmpool_buff_hdr",417,"off")=3920
 	Set gtmtypes("shmpool_buff_hdr",417,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",417,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_cntr")=417
-	Set gtmtypes("shmpool_buff_hdr",418,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_cntr"
-	Set gtmtypes("shmpool_buff_hdr",418,"off")=3960
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_wtfini_fail_cntr")=417
+	Set gtmtypes("shmpool_buff_hdr",418,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_twin_stuck_cntr"
+	Set gtmtypes("shmpool_buff_hdr",418,"off")=3924
 	Set gtmtypes("shmpool_buff_hdr",418,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",418,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_cntr")=418
-	Set gtmtypes("shmpool_buff_hdr",419,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_cntr"
-	Set gtmtypes("shmpool_buff_hdr",419,"off")=3964
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_twin_stuck_cntr")=418
+	Set gtmtypes("shmpool_buff_hdr",419,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_getn_wrt_latch_stuck_cntr"
+	Set gtmtypes("shmpool_buff_hdr",419,"off")=3928
 	Set gtmtypes("shmpool_buff_hdr",419,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",419,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_cntr")=419
-	Set gtmtypes("shmpool_buff_hdr",420,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_cntr"
-	Set gtmtypes("shmpool_buff_hdr",420,"off")=3968
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_getn_wrt_latch_stuck_cntr")=419
+	Set gtmtypes("shmpool_buff_hdr",420,"name")="shmpool_buff_hdr.shadow_file_header.wcb_secshr_db_clnup_now_crit_cntr"
+	Set gtmtypes("shmpool_buff_hdr",420,"off")=3932
 	Set gtmtypes("shmpool_buff_hdr",420,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",420,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_cntr")=420
-	Set gtmtypes("shmpool_buff_hdr",421,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_cntr"
-	Set gtmtypes("shmpool_buff_hdr",421,"off")=3972
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_secshr_db_clnup_now_crit_cntr")=420
+	Set gtmtypes("shmpool_buff_hdr",421,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_bad_bt_index1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",421,"off")=3936
 	Set gtmtypes("shmpool_buff_hdr",421,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",421,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_cntr")=421
-	Set gtmtypes("shmpool_buff_hdr",422,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_bt_get_cntr"
-	Set gtmtypes("shmpool_buff_hdr",422,"off")=3976
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_bad_bt_index1_cntr")=421
+	Set gtmtypes("shmpool_buff_hdr",422,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_qread_bad_bt_index2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",422,"off")=3940
 	Set gtmtypes("shmpool_buff_hdr",422,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",422,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_bt_get_cntr")=422
-	Set gtmtypes("shmpool_buff_hdr",423,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_cntr"
-	Set gtmtypes("shmpool_buff_hdr",423,"off")=3980
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_qread_bad_bt_index2_cntr")=422
+	Set gtmtypes("shmpool_buff_hdr",423,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_crbtmismatch1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",423,"off")=3944
 	Set gtmtypes("shmpool_buff_hdr",423,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",423,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_cntr")=423
-	Set gtmtypes("shmpool_buff_hdr",424,"name")="shmpool_buff_hdr.shadow_file_header.wcb_bg_update_lckfail1_cntr"
-	Set gtmtypes("shmpool_buff_hdr",424,"off")=3984
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_crbtmismatch1_cntr")=423
+	Set gtmtypes("shmpool_buff_hdr",424,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_crbtmismatch2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",424,"off")=3948
 	Set gtmtypes("shmpool_buff_hdr",424,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",424,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_bg_update_lckfail1_cntr")=424
-	Set gtmtypes("shmpool_buff_hdr",425,"name")="shmpool_buff_hdr.shadow_file_header.wcb_bg_update_lckfail2_cntr"
-	Set gtmtypes("shmpool_buff_hdr",425,"off")=3988
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_crbtmismatch2_cntr")=424
+	Set gtmtypes("shmpool_buff_hdr",425,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_t_end_crbtmismatch3_cntr"
+	Set gtmtypes("shmpool_buff_hdr",425,"off")=3952
 	Set gtmtypes("shmpool_buff_hdr",425,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",425,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_bg_update_lckfail2_cntr")=425
-	Set gtmtypes("shmpool_buff_hdr",426,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail1_cntr"
-	Set gtmtypes("shmpool_buff_hdr",426,"off")=3992
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_t_end_crbtmismatch3_cntr")=425
+	Set gtmtypes("shmpool_buff_hdr",426,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",426,"off")=3956
 	Set gtmtypes("shmpool_buff_hdr",426,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",426,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail1_cntr")=426
-	Set gtmtypes("shmpool_buff_hdr",427,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail2_cntr"
-	Set gtmtypes("shmpool_buff_hdr",427,"off")=3996
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_crbtmismatch1_cntr")=426
+	Set gtmtypes("shmpool_buff_hdr",427,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",427,"off")=3960
 	Set gtmtypes("shmpool_buff_hdr",427,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",427,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail2_cntr")=427
-	Set gtmtypes("shmpool_buff_hdr",428,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail3_cntr"
-	Set gtmtypes("shmpool_buff_hdr",428,"off")=4000
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_crbtmismatch2_cntr")=427
+	Set gtmtypes("shmpool_buff_hdr",428,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_cntr"
+	Set gtmtypes("shmpool_buff_hdr",428,"off")=3964
 	Set gtmtypes("shmpool_buff_hdr",428,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",428,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail3_cntr")=428
-	Set gtmtypes("shmpool_buff_hdr",429,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail4_cntr"
-	Set gtmtypes("shmpool_buff_hdr",429,"off")=4004
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_tp_tend_crbtmismatch3_cntr")=428
+	Set gtmtypes("shmpool_buff_hdr",429,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_cntr"
+	Set gtmtypes("shmpool_buff_hdr",429,"off")=3968
 	Set gtmtypes("shmpool_buff_hdr",429,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",429,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail4_cntr")=429
-	Set gtmtypes("shmpool_buff_hdr",430,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail1_cntr"
-	Set gtmtypes("shmpool_buff_hdr",430,"off")=4008
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_wtstart_bad_cr_cntr")=429
+	Set gtmtypes("shmpool_buff_hdr",430,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_cntr"
+	Set gtmtypes("shmpool_buff_hdr",430,"off")=3972
 	Set gtmtypes("shmpool_buff_hdr",430,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",430,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail1_cntr")=430
-	Set gtmtypes("shmpool_buff_hdr",431,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail2_cntr"
-	Set gtmtypes("shmpool_buff_hdr",431,"off")=4012
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_wtfini_bad_cr_cntr")=430
+	Set gtmtypes("shmpool_buff_hdr",431,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_bt_get_cntr"
+	Set gtmtypes("shmpool_buff_hdr",431,"off")=3976
 	Set gtmtypes("shmpool_buff_hdr",431,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",431,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail2_cntr")=431
-	Set gtmtypes("shmpool_buff_hdr",432,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail3_cntr"
-	Set gtmtypes("shmpool_buff_hdr",432,"off")=4016
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_bt_get_cntr")=431
+	Set gtmtypes("shmpool_buff_hdr",432,"name")="shmpool_buff_hdr.shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_cntr"
+	Set gtmtypes("shmpool_buff_hdr",432,"off")=3980
 	Set gtmtypes("shmpool_buff_hdr",432,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",432,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail3_cntr")=432
-	Set gtmtypes("shmpool_buff_hdr",433,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail4_cntr"
-	Set gtmtypes("shmpool_buff_hdr",433,"off")=4020
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wc_blocked_wcs_cdb_sc_final_retry_cntr")=432
+	Set gtmtypes("shmpool_buff_hdr",433,"name")="shmpool_buff_hdr.shadow_file_header.wcb_bg_update_lckfail1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",433,"off")=3984
 	Set gtmtypes("shmpool_buff_hdr",433,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",433,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail4_cntr")=433
-	Set gtmtypes("shmpool_buff_hdr",434,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirtystuck1_cntr"
-	Set gtmtypes("shmpool_buff_hdr",434,"off")=4024
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_bg_update_lckfail1_cntr")=433
+	Set gtmtypes("shmpool_buff_hdr",434,"name")="shmpool_buff_hdr.shadow_file_header.wcb_bg_update_lckfail2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",434,"off")=3988
 	Set gtmtypes("shmpool_buff_hdr",434,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",434,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirtystuck1_cntr")=434
-	Set gtmtypes("shmpool_buff_hdr",435,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirtystuck2_cntr"
-	Set gtmtypes("shmpool_buff_hdr",435,"off")=4028
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_bg_update_lckfail2_cntr")=434
+	Set gtmtypes("shmpool_buff_hdr",435,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",435,"off")=3992
 	Set gtmtypes("shmpool_buff_hdr",435,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",435,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirtystuck2_cntr")=435
-	Set gtmtypes("shmpool_buff_hdr",436,"name")="shmpool_buff_hdr.shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_cntr"
-	Set gtmtypes("shmpool_buff_hdr",436,"off")=4032
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail1_cntr")=435
+	Set gtmtypes("shmpool_buff_hdr",436,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",436,"off")=3996
 	Set gtmtypes("shmpool_buff_hdr",436,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",436,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_cntr")=436
-	Set gtmtypes("shmpool_buff_hdr",437,"name")="shmpool_buff_hdr.shadow_file_header.dwngrd_refmts_syncio_cntr"
-	Set gtmtypes("shmpool_buff_hdr",437,"off")=4036
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail2_cntr")=436
+	Set gtmtypes("shmpool_buff_hdr",437,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail3_cntr"
+	Set gtmtypes("shmpool_buff_hdr",437,"off")=4000
 	Set gtmtypes("shmpool_buff_hdr",437,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",437,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.dwngrd_refmts_syncio_cntr")=437
-	Set gtmtypes("shmpool_buff_hdr",438,"name")="shmpool_buff_hdr.shadow_file_header.dwngrd_refmts_asyncio_cntr"
-	Set gtmtypes("shmpool_buff_hdr",438,"off")=4040
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail3_cntr")=437
+	Set gtmtypes("shmpool_buff_hdr",438,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtstart_lckfail4_cntr"
+	Set gtmtypes("shmpool_buff_hdr",438,"off")=4004
 	Set gtmtypes("shmpool_buff_hdr",438,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",438,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.dwngrd_refmts_asyncio_cntr")=438
-	Set gtmtypes("shmpool_buff_hdr",439,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_refmt_harvests_cntr"
-	Set gtmtypes("shmpool_buff_hdr",439,"off")=4044
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtstart_lckfail4_cntr")=438
+	Set gtmtypes("shmpool_buff_hdr",439,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",439,"off")=4008
 	Set gtmtypes("shmpool_buff_hdr",439,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",439,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_refmt_harvests_cntr")=439
-	Set gtmtypes("shmpool_buff_hdr",440,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_recovery_cntr"
-	Set gtmtypes("shmpool_buff_hdr",440,"off")=4048
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail1_cntr")=439
+	Set gtmtypes("shmpool_buff_hdr",440,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",440,"off")=4012
 	Set gtmtypes("shmpool_buff_hdr",440,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",440,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_recovery_cntr")=440
-	Set gtmtypes("shmpool_buff_hdr",441,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_blkd_by_sdc_cntr"
-	Set gtmtypes("shmpool_buff_hdr",441,"off")=4052
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail2_cntr")=440
+	Set gtmtypes("shmpool_buff_hdr",441,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail3_cntr"
+	Set gtmtypes("shmpool_buff_hdr",441,"off")=4016
 	Set gtmtypes("shmpool_buff_hdr",441,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",441,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_blkd_by_sdc_cntr")=441
-	Set gtmtypes("shmpool_buff_hdr",442,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_alloc_bbflush_cntr"
-	Set gtmtypes("shmpool_buff_hdr",442,"off")=4056
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail3_cntr")=441
+	Set gtmtypes("shmpool_buff_hdr",442,"name")="shmpool_buff_hdr.shadow_file_header.wcb_wtfini_lckfail4_cntr"
+	Set gtmtypes("shmpool_buff_hdr",442,"off")=4020
 	Set gtmtypes("shmpool_buff_hdr",442,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",442,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_alloc_bbflush_cntr")=442
-	Set gtmtypes("shmpool_buff_hdr",443,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_released_replaced_cntr"
-	Set gtmtypes("shmpool_buff_hdr",443,"off")=4060
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_wtfini_lckfail4_cntr")=442
+	Set gtmtypes("shmpool_buff_hdr",443,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirtystuck1_cntr"
+	Set gtmtypes("shmpool_buff_hdr",443,"off")=4024
 	Set gtmtypes("shmpool_buff_hdr",443,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",443,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_released_replaced_cntr")=443
-	Set gtmtypes("shmpool_buff_hdr",444,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_released_io_complete_cntr"
-	Set gtmtypes("shmpool_buff_hdr",444,"off")=4064
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirtystuck1_cntr")=443
+	Set gtmtypes("shmpool_buff_hdr",444,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_dirtystuck2_cntr"
+	Set gtmtypes("shmpool_buff_hdr",444,"off")=4028
 	Set gtmtypes("shmpool_buff_hdr",444,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",444,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_released_io_complete_cntr")=444
-	Set gtmtypes("shmpool_buff_hdr",445,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_kept_cntr"
-	Set gtmtypes("shmpool_buff_hdr",445,"off")=4068
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_dirtystuck2_cntr")=444
+	Set gtmtypes("shmpool_buff_hdr",445,"name")="shmpool_buff_hdr.shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_cntr"
+	Set gtmtypes("shmpool_buff_hdr",445,"off")=4032
 	Set gtmtypes("shmpool_buff_hdr",445,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",445,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_kept_cntr")=445
-	Set gtmtypes("shmpool_buff_hdr",446,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_ignored_cntr"
-	Set gtmtypes("shmpool_buff_hdr",446,"off")=4072
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_secshr_db_clnup_wbuf_dqd_cntr")=445
+	Set gtmtypes("shmpool_buff_hdr",446,"name")="shmpool_buff_hdr.shadow_file_header.dwngrd_refmts_syncio_cntr"
+	Set gtmtypes("shmpool_buff_hdr",446,"off")=4036
 	Set gtmtypes("shmpool_buff_hdr",446,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",446,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_ignored_cntr")=446
-	Set gtmtypes("shmpool_buff_hdr",447,"name")="shmpool_buff_hdr.shadow_file_header.refmt_blk_chk_blk_freed_cntr"
-	Set gtmtypes("shmpool_buff_hdr",447,"off")=4076
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.dwngrd_refmts_syncio_cntr")=446
+	Set gtmtypes("shmpool_buff_hdr",447,"name")="shmpool_buff_hdr.shadow_file_header.dwngrd_refmts_asyncio_cntr"
+	Set gtmtypes("shmpool_buff_hdr",447,"off")=4040
 	Set gtmtypes("shmpool_buff_hdr",447,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",447,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_blk_chk_blk_freed_cntr")=447
-	Set gtmtypes("shmpool_buff_hdr",448,"name")="shmpool_buff_hdr.shadow_file_header.refmt_blk_chk_blk_kept_cntr"
-	Set gtmtypes("shmpool_buff_hdr",448,"off")=4080
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.dwngrd_refmts_asyncio_cntr")=447
+	Set gtmtypes("shmpool_buff_hdr",448,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_refmt_harvests_cntr"
+	Set gtmtypes("shmpool_buff_hdr",448,"off")=4044
 	Set gtmtypes("shmpool_buff_hdr",448,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",448,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_blk_chk_blk_kept_cntr")=448
-	Set gtmtypes("shmpool_buff_hdr",449,"name")="shmpool_buff_hdr.shadow_file_header.active_lvl_trigger_cntr"
-	Set gtmtypes("shmpool_buff_hdr",449,"off")=4084
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_refmt_harvests_cntr")=448
+	Set gtmtypes("shmpool_buff_hdr",449,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_recovery_cntr"
+	Set gtmtypes("shmpool_buff_hdr",449,"off")=4048
 	Set gtmtypes("shmpool_buff_hdr",449,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",449,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.active_lvl_trigger_cntr")=449
-	Set gtmtypes("shmpool_buff_hdr",450,"name")="shmpool_buff_hdr.shadow_file_header.new_buff_cntr"
-	Set gtmtypes("shmpool_buff_hdr",450,"off")=4088
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_recovery_cntr")=449
+	Set gtmtypes("shmpool_buff_hdr",450,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_blkd_by_sdc_cntr"
+	Set gtmtypes("shmpool_buff_hdr",450,"off")=4052
 	Set gtmtypes("shmpool_buff_hdr",450,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",450,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.new_buff_cntr")=450
-	Set gtmtypes("shmpool_buff_hdr",451,"name")="shmpool_buff_hdr.shadow_file_header.phase2_commit_wait_sleep_in_crit_cntr"
-	Set gtmtypes("shmpool_buff_hdr",451,"off")=4092
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_blkd_by_sdc_cntr")=450
+	Set gtmtypes("shmpool_buff_hdr",451,"name")="shmpool_buff_hdr.shadow_file_header.shmpool_alloc_bbflush_cntr"
+	Set gtmtypes("shmpool_buff_hdr",451,"off")=4056
 	Set gtmtypes("shmpool_buff_hdr",451,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",451,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.phase2_commit_wait_sleep_in_crit_cntr")=451
-	Set gtmtypes("shmpool_buff_hdr",452,"name")="shmpool_buff_hdr.shadow_file_header.phase2_commit_wait_sleep_no_crit_cntr"
-	Set gtmtypes("shmpool_buff_hdr",452,"off")=4096
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.shmpool_alloc_bbflush_cntr")=451
+	Set gtmtypes("shmpool_buff_hdr",452,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_released_replaced_cntr"
+	Set gtmtypes("shmpool_buff_hdr",452,"off")=4060
 	Set gtmtypes("shmpool_buff_hdr",452,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",452,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.phase2_commit_wait_sleep_no_crit_cntr")=452
-	Set gtmtypes("shmpool_buff_hdr",453,"name")="shmpool_buff_hdr.shadow_file_header.phase2_commit_wait_pidcnt_cntr"
-	Set gtmtypes("shmpool_buff_hdr",453,"off")=4100
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_released_replaced_cntr")=452
+	Set gtmtypes("shmpool_buff_hdr",453,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_released_io_complete_cntr"
+	Set gtmtypes("shmpool_buff_hdr",453,"off")=4064
 	Set gtmtypes("shmpool_buff_hdr",453,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",453,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.phase2_commit_wait_pidcnt_cntr")=453
-	Set gtmtypes("shmpool_buff_hdr",454,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_intend_wait_cntr"
-	Set gtmtypes("shmpool_buff_hdr",454,"off")=4104
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_released_io_complete_cntr")=453
+	Set gtmtypes("shmpool_buff_hdr",454,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_kept_cntr"
+	Set gtmtypes("shmpool_buff_hdr",454,"off")=4068
 	Set gtmtypes("shmpool_buff_hdr",454,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",454,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_intend_wait_cntr")=454
-	Set gtmtypes("shmpool_buff_hdr",455,"name")="shmpool_buff_hdr.shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_cntr"
-	Set gtmtypes("shmpool_buff_hdr",455,"off")=4108
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_kept_cntr")=454
+	Set gtmtypes("shmpool_buff_hdr",455,"name")="shmpool_buff_hdr.shadow_file_header.refmt_hvst_blk_ignored_cntr"
+	Set gtmtypes("shmpool_buff_hdr",455,"off")=4072
 	Set gtmtypes("shmpool_buff_hdr",455,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",455,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_cntr")=455
-	Set gtmtypes("shmpool_buff_hdr",456,"name")="shmpool_buff_hdr.shadow_file_header.wcb_phase2_commit_wait_cntr"
-	Set gtmtypes("shmpool_buff_hdr",456,"off")=4112
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_hvst_blk_ignored_cntr")=455
+	Set gtmtypes("shmpool_buff_hdr",456,"name")="shmpool_buff_hdr.shadow_file_header.refmt_blk_chk_blk_freed_cntr"
+	Set gtmtypes("shmpool_buff_hdr",456,"off")=4076
 	Set gtmtypes("shmpool_buff_hdr",456,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",456,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_phase2_commit_wait_cntr")=456
-	Set gtmtypes("shmpool_buff_hdr",457,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_calls_cntr"
-	Set gtmtypes("shmpool_buff_hdr",457,"off")=4116
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_blk_chk_blk_freed_cntr")=456
+	Set gtmtypes("shmpool_buff_hdr",457,"name")="shmpool_buff_hdr.shadow_file_header.refmt_blk_chk_blk_kept_cntr"
+	Set gtmtypes("shmpool_buff_hdr",457,"off")=4080
 	Set gtmtypes("shmpool_buff_hdr",457,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",457,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_calls_cntr")=457
-	Set gtmtypes("shmpool_buff_hdr",458,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_rip_cntr"
-	Set gtmtypes("shmpool_buff_hdr",458,"off")=4120
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.refmt_blk_chk_blk_kept_cntr")=457
+	Set gtmtypes("shmpool_buff_hdr",458,"name")="shmpool_buff_hdr.shadow_file_header.active_lvl_trigger_cntr"
+	Set gtmtypes("shmpool_buff_hdr",458,"off")=4084
 	Set gtmtypes("shmpool_buff_hdr",458,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",458,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_rip_cntr")=458
-	Set gtmtypes("shmpool_buff_hdr",459,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_in_tend_cntr"
-	Set gtmtypes("shmpool_buff_hdr",459,"off")=4124
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.active_lvl_trigger_cntr")=458
+	Set gtmtypes("shmpool_buff_hdr",459,"name")="shmpool_buff_hdr.shadow_file_header.new_buff_cntr"
+	Set gtmtypes("shmpool_buff_hdr",459,"off")=4088
 	Set gtmtypes("shmpool_buff_hdr",459,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",459,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_in_tend_cntr")=459
-	Set gtmtypes("shmpool_buff_hdr",460,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_search_blk_cntr"
-	Set gtmtypes("shmpool_buff_hdr",460,"off")=4128
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.new_buff_cntr")=459
+	Set gtmtypes("shmpool_buff_hdr",460,"name")="shmpool_buff_hdr.shadow_file_header.phase2_commit_wait_sleep_in_crit_cntr"
+	Set gtmtypes("shmpool_buff_hdr",460,"off")=4092
 	Set gtmtypes("shmpool_buff_hdr",460,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",460,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_search_blk_cntr")=460
-	Set gtmtypes("shmpool_buff_hdr",461,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_new_rec_cntr"
-	Set gtmtypes("shmpool_buff_hdr",461,"off")=4132
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.phase2_commit_wait_sleep_in_crit_cntr")=460
+	Set gtmtypes("shmpool_buff_hdr",461,"name")="shmpool_buff_hdr.shadow_file_header.phase2_commit_wait_sleep_no_crit_cntr"
+	Set gtmtypes("shmpool_buff_hdr",461,"off")=4096
 	Set gtmtypes("shmpool_buff_hdr",461,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",461,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_new_rec_cntr")=461
-	Set gtmtypes("shmpool_buff_hdr",462,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_rec_size_cntr"
-	Set gtmtypes("shmpool_buff_hdr",462,"off")=4136
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.phase2_commit_wait_sleep_no_crit_cntr")=461
+	Set gtmtypes("shmpool_buff_hdr",462,"name")="shmpool_buff_hdr.shadow_file_header.phase2_commit_wait_pidcnt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",462,"off")=4100
 	Set gtmtypes("shmpool_buff_hdr",462,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",462,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_rec_size_cntr")=462
-	Set gtmtypes("shmpool_buff_hdr",463,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_rec_cmpc_cntr"
-	Set gtmtypes("shmpool_buff_hdr",463,"off")=4140
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.phase2_commit_wait_pidcnt_cntr")=462
+	Set gtmtypes("shmpool_buff_hdr",463,"name")="shmpool_buff_hdr.shadow_file_header.wcb_t_end_sysops_intend_wait_cntr"
+	Set gtmtypes("shmpool_buff_hdr",463,"off")=4104
 	Set gtmtypes("shmpool_buff_hdr",463,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",463,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_rec_cmpc_cntr")=463
-	Set gtmtypes("shmpool_buff_hdr",464,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_blk_fini_cntr"
-	Set gtmtypes("shmpool_buff_hdr",464,"off")=4144
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_t_end_sysops_intend_wait_cntr")=463
+	Set gtmtypes("shmpool_buff_hdr",464,"name")="shmpool_buff_hdr.shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_cntr"
+	Set gtmtypes("shmpool_buff_hdr",464,"off")=4108
 	Set gtmtypes("shmpool_buff_hdr",464,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",464,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_blk_fini_cntr")=464
-	Set gtmtypes("shmpool_buff_hdr",465,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_blk_split_cntr"
-	Set gtmtypes("shmpool_buff_hdr",465,"off")=4148
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_secshr_db_clnup_phase2_clnup_cntr")=464
+	Set gtmtypes("shmpool_buff_hdr",465,"name")="shmpool_buff_hdr.shadow_file_header.wcb_phase2_commit_wait_cntr"
+	Set gtmtypes("shmpool_buff_hdr",465,"off")=4112
 	Set gtmtypes("shmpool_buff_hdr",465,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",465,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_blk_split_cntr")=465
-	Set gtmtypes("shmpool_buff_hdr",466,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_ripsleep_cnt_cntr"
-	Set gtmtypes("shmpool_buff_hdr",466,"off")=4152
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcb_phase2_commit_wait_cntr")=465
+	Set gtmtypes("shmpool_buff_hdr",466,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_calls_cntr"
+	Set gtmtypes("shmpool_buff_hdr",466,"off")=4116
 	Set gtmtypes("shmpool_buff_hdr",466,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",466,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_ripsleep_cnt_cntr")=466
-	Set gtmtypes("shmpool_buff_hdr",467,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_ripsleep_nblks_cntr"
-	Set gtmtypes("shmpool_buff_hdr",467,"off")=4156
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_calls_cntr")=466
+	Set gtmtypes("shmpool_buff_hdr",467,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_rip_cntr"
+	Set gtmtypes("shmpool_buff_hdr",467,"off")=4120
 	Set gtmtypes("shmpool_buff_hdr",467,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",467,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_ripsleep_nblks_cntr")=467
-	Set gtmtypes("shmpool_buff_hdr",468,"name")="shmpool_buff_hdr.shadow_file_header.bg_trc_rec_cntr_filler"
-	Set gtmtypes("shmpool_buff_hdr",468,"off")=4160
-	Set gtmtypes("shmpool_buff_hdr",468,"len")=56
-	Set gtmtypes("shmpool_buff_hdr",468,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bg_trc_rec_cntr_filler")=468
-	Set gtmtypes("shmpool_buff_hdr",469,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srches"
-	Set gtmtypes("shmpool_buff_hdr",469,"off")=4216
-	Set gtmtypes("shmpool_buff_hdr",469,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",469,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srches")=469
-	Set gtmtypes("shmpool_buff_hdr",470,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srches.curr_count"
-	Set gtmtypes("shmpool_buff_hdr",470,"off")=4216
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_rip_cntr")=467
+	Set gtmtypes("shmpool_buff_hdr",468,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_in_tend_cntr"
+	Set gtmtypes("shmpool_buff_hdr",468,"off")=4124
+	Set gtmtypes("shmpool_buff_hdr",468,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",468,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_in_tend_cntr")=468
+	Set gtmtypes("shmpool_buff_hdr",469,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_search_blk_cntr"
+	Set gtmtypes("shmpool_buff_hdr",469,"off")=4128
+	Set gtmtypes("shmpool_buff_hdr",469,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",469,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_search_blk_cntr")=469
+	Set gtmtypes("shmpool_buff_hdr",470,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_new_rec_cntr"
+	Set gtmtypes("shmpool_buff_hdr",470,"off")=4132
 	Set gtmtypes("shmpool_buff_hdr",470,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",470,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srches.curr_count")=470
-	Set gtmtypes("shmpool_buff_hdr",471,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srches.cumul_count"
-	Set gtmtypes("shmpool_buff_hdr",471,"off")=4220
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_new_rec_cntr")=470
+	Set gtmtypes("shmpool_buff_hdr",471,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_rec_size_cntr"
+	Set gtmtypes("shmpool_buff_hdr",471,"off")=4136
 	Set gtmtypes("shmpool_buff_hdr",471,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",471,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srches.cumul_count")=471
-	Set gtmtypes("shmpool_buff_hdr",472,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srch_clues"
-	Set gtmtypes("shmpool_buff_hdr",472,"off")=4224
-	Set gtmtypes("shmpool_buff_hdr",472,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",472,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srch_clues")=472
-	Set gtmtypes("shmpool_buff_hdr",473,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srch_clues.curr_count"
-	Set gtmtypes("shmpool_buff_hdr",473,"off")=4224
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_rec_size_cntr")=471
+	Set gtmtypes("shmpool_buff_hdr",472,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_rec_cmpc_cntr"
+	Set gtmtypes("shmpool_buff_hdr",472,"off")=4140
+	Set gtmtypes("shmpool_buff_hdr",472,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",472,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_rec_cmpc_cntr")=472
+	Set gtmtypes("shmpool_buff_hdr",473,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_blk_fini_cntr"
+	Set gtmtypes("shmpool_buff_hdr",473,"off")=4144
 	Set gtmtypes("shmpool_buff_hdr",473,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",473,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srch_clues.curr_count")=473
-	Set gtmtypes("shmpool_buff_hdr",474,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srch_clues.cumul_count"
-	Set gtmtypes("shmpool_buff_hdr",474,"off")=4228
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_blk_fini_cntr")=473
+	Set gtmtypes("shmpool_buff_hdr",474,"name")="shmpool_buff_hdr.shadow_file_header.recompute_upd_array_blk_split_cntr"
+	Set gtmtypes("shmpool_buff_hdr",474,"off")=4148
 	Set gtmtypes("shmpool_buff_hdr",474,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",474,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srch_clues.cumul_count")=474
-	Set gtmtypes("shmpool_buff_hdr",475,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_head"
-	Set gtmtypes("shmpool_buff_hdr",475,"off")=4232
-	Set gtmtypes("shmpool_buff_hdr",475,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",475,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_head")=475
-	Set gtmtypes("shmpool_buff_hdr",476,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_head.curr_count"
-	Set gtmtypes("shmpool_buff_hdr",476,"off")=4232
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.recompute_upd_array_blk_split_cntr")=474
+	Set gtmtypes("shmpool_buff_hdr",475,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_ripsleep_cnt_cntr"
+	Set gtmtypes("shmpool_buff_hdr",475,"off")=4152
+	Set gtmtypes("shmpool_buff_hdr",475,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",475,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_ripsleep_cnt_cntr")=475
+	Set gtmtypes("shmpool_buff_hdr",476,"name")="shmpool_buff_hdr.shadow_file_header.t_qread_ripsleep_nblks_cntr"
+	Set gtmtypes("shmpool_buff_hdr",476,"off")=4156
 	Set gtmtypes("shmpool_buff_hdr",476,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",476,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_head.curr_count")=476
-	Set gtmtypes("shmpool_buff_hdr",477,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_head.cumul_count"
-	Set gtmtypes("shmpool_buff_hdr",477,"off")=4236
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.t_qread_ripsleep_nblks_cntr")=476
+	Set gtmtypes("shmpool_buff_hdr",477,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wtfini_invoked_cntr"
+	Set gtmtypes("shmpool_buff_hdr",477,"off")=4160
 	Set gtmtypes("shmpool_buff_hdr",477,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",477,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_head.cumul_count")=477
-	Set gtmtypes("shmpool_buff_hdr",478,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_same"
-	Set gtmtypes("shmpool_buff_hdr",478,"off")=4240
-	Set gtmtypes("shmpool_buff_hdr",478,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",478,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_same")=478
-	Set gtmtypes("shmpool_buff_hdr",479,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_same.curr_count"
-	Set gtmtypes("shmpool_buff_hdr",479,"off")=4240
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wtfini_invoked_cntr")=477
+	Set gtmtypes("shmpool_buff_hdr",478,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wterror_invoked_cntr"
+	Set gtmtypes("shmpool_buff_hdr",478,"off")=4164
+	Set gtmtypes("shmpool_buff_hdr",478,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",478,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wterror_invoked_cntr")=478
+	Set gtmtypes("shmpool_buff_hdr",479,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wt_restart_invoked_cntr"
+	Set gtmtypes("shmpool_buff_hdr",479,"off")=4168
 	Set gtmtypes("shmpool_buff_hdr",479,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",479,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_same.curr_count")=479
-	Set gtmtypes("shmpool_buff_hdr",480,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_same.cumul_count"
-	Set gtmtypes("shmpool_buff_hdr",480,"off")=4244
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wt_restart_invoked_cntr")=479
+	Set gtmtypes("shmpool_buff_hdr",480,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wt_restart_eagain_cntr"
+	Set gtmtypes("shmpool_buff_hdr",480,"off")=4172
 	Set gtmtypes("shmpool_buff_hdr",480,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",480,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_same.cumul_count")=480
-	Set gtmtypes("shmpool_buff_hdr",481,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_tail"
-	Set gtmtypes("shmpool_buff_hdr",481,"off")=4248
-	Set gtmtypes("shmpool_buff_hdr",481,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",481,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_tail")=481
-	Set gtmtypes("shmpool_buff_hdr",482,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_tail.curr_count"
-	Set gtmtypes("shmpool_buff_hdr",482,"off")=4248
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wt_restart_eagain_cntr")=480
+	Set gtmtypes("shmpool_buff_hdr",481,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wt_restart_reinsert_cntr"
+	Set gtmtypes("shmpool_buff_hdr",481,"off")=4176
+	Set gtmtypes("shmpool_buff_hdr",481,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",481,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wt_restart_reinsert_cntr")=481
+	Set gtmtypes("shmpool_buff_hdr",482,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wtstart_eagain_cntr"
+	Set gtmtypes("shmpool_buff_hdr",482,"off")=4180
 	Set gtmtypes("shmpool_buff_hdr",482,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",482,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_tail.curr_count")=482
-	Set gtmtypes("shmpool_buff_hdr",483,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_tail.cumul_count"
-	Set gtmtypes("shmpool_buff_hdr",483,"off")=4252
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wtstart_eagain_cntr")=482
+	Set gtmtypes("shmpool_buff_hdr",483,"name")="shmpool_buff_hdr.shadow_file_header.wcs_wtstart_eagain_incrit_cntr"
+	Set gtmtypes("shmpool_buff_hdr",483,"off")=4184
 	Set gtmtypes("shmpool_buff_hdr",483,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",483,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_tail.cumul_count")=483
-	Set gtmtypes("shmpool_buff_hdr",484,"name")="shmpool_buff_hdr.shadow_file_header.n_t_qreads"
-	Set gtmtypes("shmpool_buff_hdr",484,"off")=4256
-	Set gtmtypes("shmpool_buff_hdr",484,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",484,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_t_qreads")=484
-	Set gtmtypes("shmpool_buff_hdr",485,"name")="shmpool_buff_hdr.shadow_file_header.n_t_qreads.curr_count"
-	Set gtmtypes("shmpool_buff_hdr",485,"off")=4256
-	Set gtmtypes("shmpool_buff_hdr",485,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",485,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_t_qreads.curr_count")=485
-	Set gtmtypes("shmpool_buff_hdr",486,"name")="shmpool_buff_hdr.shadow_file_header.n_t_qreads.cumul_count"
-	Set gtmtypes("shmpool_buff_hdr",486,"off")=4260
-	Set gtmtypes("shmpool_buff_hdr",486,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",486,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_t_qreads.cumul_count")=486
-	Set gtmtypes("shmpool_buff_hdr",487,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_reads"
-	Set gtmtypes("shmpool_buff_hdr",487,"off")=4264
-	Set gtmtypes("shmpool_buff_hdr",487,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",487,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_reads")=487
-	Set gtmtypes("shmpool_buff_hdr",488,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_reads.curr_count"
-	Set gtmtypes("shmpool_buff_hdr",488,"off")=4264
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.wcs_wtstart_eagain_incrit_cntr")=483
+	Set gtmtypes("shmpool_buff_hdr",484,"name")="shmpool_buff_hdr.shadow_file_header.async_restart_eagain_cntr"
+	Set gtmtypes("shmpool_buff_hdr",484,"off")=4188
+	Set gtmtypes("shmpool_buff_hdr",484,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",484,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.async_restart_eagain_cntr")=484
+	Set gtmtypes("shmpool_buff_hdr",485,"name")="shmpool_buff_hdr.shadow_file_header.bg_trc_rec_cntr_filler"
+	Set gtmtypes("shmpool_buff_hdr",485,"off")=4192
+	Set gtmtypes("shmpool_buff_hdr",485,"len")=24
+	Set gtmtypes("shmpool_buff_hdr",485,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.bg_trc_rec_cntr_filler")=485
+	Set gtmtypes("shmpool_buff_hdr",486,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srches"
+	Set gtmtypes("shmpool_buff_hdr",486,"off")=4216
+	Set gtmtypes("shmpool_buff_hdr",486,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",486,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srches")=486
+	Set gtmtypes("shmpool_buff_hdr",487,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srches.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",487,"off")=4216
+	Set gtmtypes("shmpool_buff_hdr",487,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",487,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srches.curr_count")=487
+	Set gtmtypes("shmpool_buff_hdr",488,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srches.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",488,"off")=4220
 	Set gtmtypes("shmpool_buff_hdr",488,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",488,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_reads.curr_count")=488
-	Set gtmtypes("shmpool_buff_hdr",489,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_reads.cumul_count"
-	Set gtmtypes("shmpool_buff_hdr",489,"off")=4268
-	Set gtmtypes("shmpool_buff_hdr",489,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",489,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_reads.cumul_count")=489
-	Set gtmtypes("shmpool_buff_hdr",490,"name")="shmpool_buff_hdr.shadow_file_header.n_bgmm_updates"
-	Set gtmtypes("shmpool_buff_hdr",490,"off")=4272
-	Set gtmtypes("shmpool_buff_hdr",490,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",490,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bgmm_updates")=490
-	Set gtmtypes("shmpool_buff_hdr",491,"name")="shmpool_buff_hdr.shadow_file_header.n_bgmm_updates.curr_count"
-	Set gtmtypes("shmpool_buff_hdr",491,"off")=4272
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srches.cumul_count")=488
+	Set gtmtypes("shmpool_buff_hdr",489,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srch_clues"
+	Set gtmtypes("shmpool_buff_hdr",489,"off")=4224
+	Set gtmtypes("shmpool_buff_hdr",489,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",489,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srch_clues")=489
+	Set gtmtypes("shmpool_buff_hdr",490,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srch_clues.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",490,"off")=4224
+	Set gtmtypes("shmpool_buff_hdr",490,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",490,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srch_clues.curr_count")=490
+	Set gtmtypes("shmpool_buff_hdr",491,"name")="shmpool_buff_hdr.shadow_file_header.n_gvcst_srch_clues.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",491,"off")=4228
 	Set gtmtypes("shmpool_buff_hdr",491,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",491,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bgmm_updates.curr_count")=491
-	Set gtmtypes("shmpool_buff_hdr",492,"name")="shmpool_buff_hdr.shadow_file_header.n_bgmm_updates.cumul_count"
-	Set gtmtypes("shmpool_buff_hdr",492,"off")=4276
-	Set gtmtypes("shmpool_buff_hdr",492,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",492,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bgmm_updates.cumul_count")=492
-	Set gtmtypes("shmpool_buff_hdr",493,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_writes"
-	Set gtmtypes("shmpool_buff_hdr",493,"off")=4280
-	Set gtmtypes("shmpool_buff_hdr",493,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",493,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_writes")=493
-	Set gtmtypes("shmpool_buff_hdr",494,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_writes.curr_count"
-	Set gtmtypes("shmpool_buff_hdr",494,"off")=4280
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_gvcst_srch_clues.cumul_count")=491
+	Set gtmtypes("shmpool_buff_hdr",492,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_head"
+	Set gtmtypes("shmpool_buff_hdr",492,"off")=4232
+	Set gtmtypes("shmpool_buff_hdr",492,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",492,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_head")=492
+	Set gtmtypes("shmpool_buff_hdr",493,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_head.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",493,"off")=4232
+	Set gtmtypes("shmpool_buff_hdr",493,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",493,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_head.curr_count")=493
+	Set gtmtypes("shmpool_buff_hdr",494,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_head.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",494,"off")=4236
 	Set gtmtypes("shmpool_buff_hdr",494,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",494,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_writes.curr_count")=494
-	Set gtmtypes("shmpool_buff_hdr",495,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_writes.cumul_count"
-	Set gtmtypes("shmpool_buff_hdr",495,"off")=4284
-	Set gtmtypes("shmpool_buff_hdr",495,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",495,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_writes.cumul_count")=495
-	Set gtmtypes("shmpool_buff_hdr",496,"name")="shmpool_buff_hdr.shadow_file_header.n_bg_update_creates"
-	Set gtmtypes("shmpool_buff_hdr",496,"off")=4288
-	Set gtmtypes("shmpool_buff_hdr",496,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",496,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bg_update_creates")=496
-	Set gtmtypes("shmpool_buff_hdr",497,"name")="shmpool_buff_hdr.shadow_file_header.n_bg_update_creates.curr_count"
-	Set gtmtypes("shmpool_buff_hdr",497,"off")=4288
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_head.cumul_count")=494
+	Set gtmtypes("shmpool_buff_hdr",495,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_same"
+	Set gtmtypes("shmpool_buff_hdr",495,"off")=4240
+	Set gtmtypes("shmpool_buff_hdr",495,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",495,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_same")=495
+	Set gtmtypes("shmpool_buff_hdr",496,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_same.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",496,"off")=4240
+	Set gtmtypes("shmpool_buff_hdr",496,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",496,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_same.curr_count")=496
+	Set gtmtypes("shmpool_buff_hdr",497,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_same.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",497,"off")=4244
 	Set gtmtypes("shmpool_buff_hdr",497,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",497,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bg_update_creates.curr_count")=497
-	Set gtmtypes("shmpool_buff_hdr",498,"name")="shmpool_buff_hdr.shadow_file_header.n_bg_update_creates.cumul_count"
-	Set gtmtypes("shmpool_buff_hdr",498,"off")=4292
-	Set gtmtypes("shmpool_buff_hdr",498,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",498,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bg_update_creates.cumul_count")=498
-	Set gtmtypes("shmpool_buff_hdr",499,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getns"
-	Set gtmtypes("shmpool_buff_hdr",499,"off")=4296
-	Set gtmtypes("shmpool_buff_hdr",499,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",499,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getns")=499
-	Set gtmtypes("shmpool_buff_hdr",500,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getns.curr_count"
-	Set gtmtypes("shmpool_buff_hdr",500,"off")=4296
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_same.cumul_count")=497
+	Set gtmtypes("shmpool_buff_hdr",498,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_tail"
+	Set gtmtypes("shmpool_buff_hdr",498,"off")=4248
+	Set gtmtypes("shmpool_buff_hdr",498,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",498,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_tail")=498
+	Set gtmtypes("shmpool_buff_hdr",499,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_tail.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",499,"off")=4248
+	Set gtmtypes("shmpool_buff_hdr",499,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",499,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_tail.curr_count")=499
+	Set gtmtypes("shmpool_buff_hdr",500,"name")="shmpool_buff_hdr.shadow_file_header.n_clue_used_tail.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",500,"off")=4252
 	Set gtmtypes("shmpool_buff_hdr",500,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",500,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getns.curr_count")=500
-	Set gtmtypes("shmpool_buff_hdr",501,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getns.cumul_count"
-	Set gtmtypes("shmpool_buff_hdr",501,"off")=4300
-	Set gtmtypes("shmpool_buff_hdr",501,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",501,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getns.cumul_count")=501
-	Set gtmtypes("shmpool_buff_hdr",502,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getn_lcnt"
-	Set gtmtypes("shmpool_buff_hdr",502,"off")=4304
-	Set gtmtypes("shmpool_buff_hdr",502,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",502,"type")="db_csh_acct_rec"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getn_lcnt")=502
-	Set gtmtypes("shmpool_buff_hdr",503,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getn_lcnt.curr_count"
-	Set gtmtypes("shmpool_buff_hdr",503,"off")=4304
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_clue_used_tail.cumul_count")=500
+	Set gtmtypes("shmpool_buff_hdr",501,"name")="shmpool_buff_hdr.shadow_file_header.n_t_qreads"
+	Set gtmtypes("shmpool_buff_hdr",501,"off")=4256
+	Set gtmtypes("shmpool_buff_hdr",501,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",501,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_t_qreads")=501
+	Set gtmtypes("shmpool_buff_hdr",502,"name")="shmpool_buff_hdr.shadow_file_header.n_t_qreads.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",502,"off")=4256
+	Set gtmtypes("shmpool_buff_hdr",502,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",502,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_t_qreads.curr_count")=502
+	Set gtmtypes("shmpool_buff_hdr",503,"name")="shmpool_buff_hdr.shadow_file_header.n_t_qreads.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",503,"off")=4260
 	Set gtmtypes("shmpool_buff_hdr",503,"len")=4
 	Set gtmtypes("shmpool_buff_hdr",503,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getn_lcnt.curr_count")=503
-	Set gtmtypes("shmpool_buff_hdr",504,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getn_lcnt.cumul_count"
-	Set gtmtypes("shmpool_buff_hdr",504,"off")=4308
-	Set gtmtypes("shmpool_buff_hdr",504,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",504,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getn_lcnt.cumul_count")=504
-	Set gtmtypes("shmpool_buff_hdr",505,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_acct_rec_filler_4k"
-	Set gtmtypes("shmpool_buff_hdr",505,"off")=4312
-	Set gtmtypes("shmpool_buff_hdr",505,"len")=152
-	Set gtmtypes("shmpool_buff_hdr",505,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_acct_rec_filler_4k")=505
-	Set gtmtypes("shmpool_buff_hdr",506,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec"
-	Set gtmtypes("shmpool_buff_hdr",506,"off")=4464
-	Set gtmtypes("shmpool_buff_hdr",506,"len")=464
-	Set gtmtypes("shmpool_buff_hdr",506,"type")="gvstats_rec_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec")=506
-	Set gtmtypes("shmpool_buff_hdr",507,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_set"
-	Set gtmtypes("shmpool_buff_hdr",507,"off")=4464
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_t_qreads.cumul_count")=503
+	Set gtmtypes("shmpool_buff_hdr",504,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_reads"
+	Set gtmtypes("shmpool_buff_hdr",504,"off")=4264
+	Set gtmtypes("shmpool_buff_hdr",504,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",504,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_reads")=504
+	Set gtmtypes("shmpool_buff_hdr",505,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_reads.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",505,"off")=4264
+	Set gtmtypes("shmpool_buff_hdr",505,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",505,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_reads.curr_count")=505
+	Set gtmtypes("shmpool_buff_hdr",506,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_reads.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",506,"off")=4268
+	Set gtmtypes("shmpool_buff_hdr",506,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",506,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_reads.cumul_count")=506
+	Set gtmtypes("shmpool_buff_hdr",507,"name")="shmpool_buff_hdr.shadow_file_header.n_bgmm_updates"
+	Set gtmtypes("shmpool_buff_hdr",507,"off")=4272
 	Set gtmtypes("shmpool_buff_hdr",507,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",507,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_set")=507
-	Set gtmtypes("shmpool_buff_hdr",508,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_kill"
-	Set gtmtypes("shmpool_buff_hdr",508,"off")=4472
-	Set gtmtypes("shmpool_buff_hdr",508,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",508,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_kill")=508
-	Set gtmtypes("shmpool_buff_hdr",509,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_get"
-	Set gtmtypes("shmpool_buff_hdr",509,"off")=4480
-	Set gtmtypes("shmpool_buff_hdr",509,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",509,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_get")=509
-	Set gtmtypes("shmpool_buff_hdr",510,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_data"
-	Set gtmtypes("shmpool_buff_hdr",510,"off")=4488
+	Set gtmtypes("shmpool_buff_hdr",507,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bgmm_updates")=507
+	Set gtmtypes("shmpool_buff_hdr",508,"name")="shmpool_buff_hdr.shadow_file_header.n_bgmm_updates.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",508,"off")=4272
+	Set gtmtypes("shmpool_buff_hdr",508,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",508,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bgmm_updates.curr_count")=508
+	Set gtmtypes("shmpool_buff_hdr",509,"name")="shmpool_buff_hdr.shadow_file_header.n_bgmm_updates.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",509,"off")=4276
+	Set gtmtypes("shmpool_buff_hdr",509,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",509,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bgmm_updates.cumul_count")=509
+	Set gtmtypes("shmpool_buff_hdr",510,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_writes"
+	Set gtmtypes("shmpool_buff_hdr",510,"off")=4280
 	Set gtmtypes("shmpool_buff_hdr",510,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",510,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_data")=510
-	Set gtmtypes("shmpool_buff_hdr",511,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_order"
-	Set gtmtypes("shmpool_buff_hdr",511,"off")=4496
-	Set gtmtypes("shmpool_buff_hdr",511,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",511,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_order")=511
-	Set gtmtypes("shmpool_buff_hdr",512,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_zprev"
-	Set gtmtypes("shmpool_buff_hdr",512,"off")=4504
-	Set gtmtypes("shmpool_buff_hdr",512,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",512,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_zprev")=512
-	Set gtmtypes("shmpool_buff_hdr",513,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_query"
-	Set gtmtypes("shmpool_buff_hdr",513,"off")=4512
+	Set gtmtypes("shmpool_buff_hdr",510,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_writes")=510
+	Set gtmtypes("shmpool_buff_hdr",511,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_writes.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",511,"off")=4280
+	Set gtmtypes("shmpool_buff_hdr",511,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",511,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_writes.curr_count")=511
+	Set gtmtypes("shmpool_buff_hdr",512,"name")="shmpool_buff_hdr.shadow_file_header.unused_dsk_writes.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",512,"off")=4284
+	Set gtmtypes("shmpool_buff_hdr",512,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",512,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.unused_dsk_writes.cumul_count")=512
+	Set gtmtypes("shmpool_buff_hdr",513,"name")="shmpool_buff_hdr.shadow_file_header.n_bg_update_creates"
+	Set gtmtypes("shmpool_buff_hdr",513,"off")=4288
 	Set gtmtypes("shmpool_buff_hdr",513,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",513,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_query")=513
-	Set gtmtypes("shmpool_buff_hdr",514,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_lock_success"
-	Set gtmtypes("shmpool_buff_hdr",514,"off")=4520
-	Set gtmtypes("shmpool_buff_hdr",514,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",514,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_lock_success")=514
-	Set gtmtypes("shmpool_buff_hdr",515,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_lock_fail"
-	Set gtmtypes("shmpool_buff_hdr",515,"off")=4528
-	Set gtmtypes("shmpool_buff_hdr",515,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",515,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_lock_fail")=515
-	Set gtmtypes("shmpool_buff_hdr",516,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.db_curr_tn"
-	Set gtmtypes("shmpool_buff_hdr",516,"off")=4536
+	Set gtmtypes("shmpool_buff_hdr",513,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bg_update_creates")=513
+	Set gtmtypes("shmpool_buff_hdr",514,"name")="shmpool_buff_hdr.shadow_file_header.n_bg_update_creates.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",514,"off")=4288
+	Set gtmtypes("shmpool_buff_hdr",514,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",514,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bg_update_creates.curr_count")=514
+	Set gtmtypes("shmpool_buff_hdr",515,"name")="shmpool_buff_hdr.shadow_file_header.n_bg_update_creates.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",515,"off")=4292
+	Set gtmtypes("shmpool_buff_hdr",515,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",515,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_bg_update_creates.cumul_count")=515
+	Set gtmtypes("shmpool_buff_hdr",516,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getns"
+	Set gtmtypes("shmpool_buff_hdr",516,"off")=4296
 	Set gtmtypes("shmpool_buff_hdr",516,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",516,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.db_curr_tn")=516
-	Set gtmtypes("shmpool_buff_hdr",517,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_dsk_read"
-	Set gtmtypes("shmpool_buff_hdr",517,"off")=4544
-	Set gtmtypes("shmpool_buff_hdr",517,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",517,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_dsk_read")=517
-	Set gtmtypes("shmpool_buff_hdr",518,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_dsk_write"
-	Set gtmtypes("shmpool_buff_hdr",518,"off")=4552
-	Set gtmtypes("shmpool_buff_hdr",518,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",518,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_dsk_write")=518
-	Set gtmtypes("shmpool_buff_hdr",519,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_readwrite"
-	Set gtmtypes("shmpool_buff_hdr",519,"off")=4560
+	Set gtmtypes("shmpool_buff_hdr",516,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getns")=516
+	Set gtmtypes("shmpool_buff_hdr",517,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getns.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",517,"off")=4296
+	Set gtmtypes("shmpool_buff_hdr",517,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",517,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getns.curr_count")=517
+	Set gtmtypes("shmpool_buff_hdr",518,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getns.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",518,"off")=4300
+	Set gtmtypes("shmpool_buff_hdr",518,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",518,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getns.cumul_count")=518
+	Set gtmtypes("shmpool_buff_hdr",519,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getn_lcnt"
+	Set gtmtypes("shmpool_buff_hdr",519,"off")=4304
 	Set gtmtypes("shmpool_buff_hdr",519,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",519,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_readwrite")=519
-	Set gtmtypes("shmpool_buff_hdr",520,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_readonly"
-	Set gtmtypes("shmpool_buff_hdr",520,"off")=4568
-	Set gtmtypes("shmpool_buff_hdr",520,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",520,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_readonly")=520
-	Set gtmtypes("shmpool_buff_hdr",521,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_blkwrite"
-	Set gtmtypes("shmpool_buff_hdr",521,"off")=4576
-	Set gtmtypes("shmpool_buff_hdr",521,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",521,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_blkwrite")=521
-	Set gtmtypes("shmpool_buff_hdr",522,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_blkread"
-	Set gtmtypes("shmpool_buff_hdr",522,"off")=4584
-	Set gtmtypes("shmpool_buff_hdr",522,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",522,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_blkread")=522
-	Set gtmtypes("shmpool_buff_hdr",523,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_retries_0"
-	Set gtmtypes("shmpool_buff_hdr",523,"off")=4592
-	Set gtmtypes("shmpool_buff_hdr",523,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",523,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_retries_0")=523
-	Set gtmtypes("shmpool_buff_hdr",524,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_retries_1"
-	Set gtmtypes("shmpool_buff_hdr",524,"off")=4600
+	Set gtmtypes("shmpool_buff_hdr",519,"type")="db_csh_acct_rec"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getn_lcnt")=519
+	Set gtmtypes("shmpool_buff_hdr",520,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getn_lcnt.curr_count"
+	Set gtmtypes("shmpool_buff_hdr",520,"off")=4304
+	Set gtmtypes("shmpool_buff_hdr",520,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",520,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getn_lcnt.curr_count")=520
+	Set gtmtypes("shmpool_buff_hdr",521,"name")="shmpool_buff_hdr.shadow_file_header.n_db_csh_getn_lcnt.cumul_count"
+	Set gtmtypes("shmpool_buff_hdr",521,"off")=4308
+	Set gtmtypes("shmpool_buff_hdr",521,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",521,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.n_db_csh_getn_lcnt.cumul_count")=521
+	Set gtmtypes("shmpool_buff_hdr",522,"name")="shmpool_buff_hdr.shadow_file_header.db_csh_acct_rec_filler_4k"
+	Set gtmtypes("shmpool_buff_hdr",522,"off")=4312
+	Set gtmtypes("shmpool_buff_hdr",522,"len")=152
+	Set gtmtypes("shmpool_buff_hdr",522,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_csh_acct_rec_filler_4k")=522
+	Set gtmtypes("shmpool_buff_hdr",523,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec"
+	Set gtmtypes("shmpool_buff_hdr",523,"off")=4464
+	Set gtmtypes("shmpool_buff_hdr",523,"len")=472
+	Set gtmtypes("shmpool_buff_hdr",523,"type")="gvstats_rec_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec")=523
+	Set gtmtypes("shmpool_buff_hdr",524,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_set"
+	Set gtmtypes("shmpool_buff_hdr",524,"off")=4464
 	Set gtmtypes("shmpool_buff_hdr",524,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",524,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_retries_1")=524
-	Set gtmtypes("shmpool_buff_hdr",525,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_retries_2"
-	Set gtmtypes("shmpool_buff_hdr",525,"off")=4608
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_set")=524
+	Set gtmtypes("shmpool_buff_hdr",525,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_kill"
+	Set gtmtypes("shmpool_buff_hdr",525,"off")=4472
 	Set gtmtypes("shmpool_buff_hdr",525,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",525,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_retries_2")=525
-	Set gtmtypes("shmpool_buff_hdr",526,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_retries_3"
-	Set gtmtypes("shmpool_buff_hdr",526,"off")=4616
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_kill")=525
+	Set gtmtypes("shmpool_buff_hdr",526,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_get"
+	Set gtmtypes("shmpool_buff_hdr",526,"off")=4480
 	Set gtmtypes("shmpool_buff_hdr",526,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",526,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_retries_3")=526
-	Set gtmtypes("shmpool_buff_hdr",527,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_readwrite"
-	Set gtmtypes("shmpool_buff_hdr",527,"off")=4624
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_get")=526
+	Set gtmtypes("shmpool_buff_hdr",527,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_data"
+	Set gtmtypes("shmpool_buff_hdr",527,"off")=4488
 	Set gtmtypes("shmpool_buff_hdr",527,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",527,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_readwrite")=527
-	Set gtmtypes("shmpool_buff_hdr",528,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_readonly"
-	Set gtmtypes("shmpool_buff_hdr",528,"off")=4632
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_data")=527
+	Set gtmtypes("shmpool_buff_hdr",528,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_order"
+	Set gtmtypes("shmpool_buff_hdr",528,"off")=4496
 	Set gtmtypes("shmpool_buff_hdr",528,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",528,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_readonly")=528
-	Set gtmtypes("shmpool_buff_hdr",529,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_rolledback"
-	Set gtmtypes("shmpool_buff_hdr",529,"off")=4640
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_order")=528
+	Set gtmtypes("shmpool_buff_hdr",529,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_zprev"
+	Set gtmtypes("shmpool_buff_hdr",529,"off")=4504
 	Set gtmtypes("shmpool_buff_hdr",529,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",529,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_rolledback")=529
-	Set gtmtypes("shmpool_buff_hdr",530,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_blkwrite"
-	Set gtmtypes("shmpool_buff_hdr",530,"off")=4648
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_zprev")=529
+	Set gtmtypes("shmpool_buff_hdr",530,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_query"
+	Set gtmtypes("shmpool_buff_hdr",530,"off")=4512
 	Set gtmtypes("shmpool_buff_hdr",530,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",530,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_blkwrite")=530
-	Set gtmtypes("shmpool_buff_hdr",531,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_blkread"
-	Set gtmtypes("shmpool_buff_hdr",531,"off")=4656
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_query")=530
+	Set gtmtypes("shmpool_buff_hdr",531,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_lock_success"
+	Set gtmtypes("shmpool_buff_hdr",531,"off")=4520
 	Set gtmtypes("shmpool_buff_hdr",531,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",531,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_blkread")=531
-	Set gtmtypes("shmpool_buff_hdr",532,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_tot_retries_0"
-	Set gtmtypes("shmpool_buff_hdr",532,"off")=4664
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_lock_success")=531
+	Set gtmtypes("shmpool_buff_hdr",532,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_lock_fail"
+	Set gtmtypes("shmpool_buff_hdr",532,"off")=4528
 	Set gtmtypes("shmpool_buff_hdr",532,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",532,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_tot_retries_0")=532
-	Set gtmtypes("shmpool_buff_hdr",533,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_tot_retries_1"
-	Set gtmtypes("shmpool_buff_hdr",533,"off")=4672
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_lock_fail")=532
+	Set gtmtypes("shmpool_buff_hdr",533,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.db_curr_tn"
+	Set gtmtypes("shmpool_buff_hdr",533,"off")=4536
 	Set gtmtypes("shmpool_buff_hdr",533,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",533,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_tot_retries_1")=533
-	Set gtmtypes("shmpool_buff_hdr",534,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_tot_retries_2"
-	Set gtmtypes("shmpool_buff_hdr",534,"off")=4680
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.db_curr_tn")=533
+	Set gtmtypes("shmpool_buff_hdr",534,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_dsk_read"
+	Set gtmtypes("shmpool_buff_hdr",534,"off")=4544
 	Set gtmtypes("shmpool_buff_hdr",534,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",534,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_tot_retries_2")=534
-	Set gtmtypes("shmpool_buff_hdr",535,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_tot_retries_3"
-	Set gtmtypes("shmpool_buff_hdr",535,"off")=4688
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_dsk_read")=534
+	Set gtmtypes("shmpool_buff_hdr",535,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_dsk_write"
+	Set gtmtypes("shmpool_buff_hdr",535,"off")=4552
 	Set gtmtypes("shmpool_buff_hdr",535,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",535,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_tot_retries_3")=535
-	Set gtmtypes("shmpool_buff_hdr",536,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_tot_retries_4"
-	Set gtmtypes("shmpool_buff_hdr",536,"off")=4696
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_dsk_write")=535
+	Set gtmtypes("shmpool_buff_hdr",536,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_readwrite"
+	Set gtmtypes("shmpool_buff_hdr",536,"off")=4560
 	Set gtmtypes("shmpool_buff_hdr",536,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",536,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_tot_retries_4")=536
-	Set gtmtypes("shmpool_buff_hdr",537,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_0"
-	Set gtmtypes("shmpool_buff_hdr",537,"off")=4704
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_readwrite")=536
+	Set gtmtypes("shmpool_buff_hdr",537,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_readonly"
+	Set gtmtypes("shmpool_buff_hdr",537,"off")=4568
 	Set gtmtypes("shmpool_buff_hdr",537,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",537,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_0")=537
-	Set gtmtypes("shmpool_buff_hdr",538,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_1"
-	Set gtmtypes("shmpool_buff_hdr",538,"off")=4712
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_readonly")=537
+	Set gtmtypes("shmpool_buff_hdr",538,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_blkwrite"
+	Set gtmtypes("shmpool_buff_hdr",538,"off")=4576
 	Set gtmtypes("shmpool_buff_hdr",538,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",538,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_1")=538
-	Set gtmtypes("shmpool_buff_hdr",539,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_2"
-	Set gtmtypes("shmpool_buff_hdr",539,"off")=4720
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_blkwrite")=538
+	Set gtmtypes("shmpool_buff_hdr",539,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_blkread"
+	Set gtmtypes("shmpool_buff_hdr",539,"off")=4584
 	Set gtmtypes("shmpool_buff_hdr",539,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",539,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_2")=539
-	Set gtmtypes("shmpool_buff_hdr",540,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_3"
-	Set gtmtypes("shmpool_buff_hdr",540,"off")=4728
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_blkread")=539
+	Set gtmtypes("shmpool_buff_hdr",540,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_retries_0"
+	Set gtmtypes("shmpool_buff_hdr",540,"off")=4592
 	Set gtmtypes("shmpool_buff_hdr",540,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",540,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_3")=540
-	Set gtmtypes("shmpool_buff_hdr",541,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_4"
-	Set gtmtypes("shmpool_buff_hdr",541,"off")=4736
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_retries_0")=540
+	Set gtmtypes("shmpool_buff_hdr",541,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_retries_1"
+	Set gtmtypes("shmpool_buff_hdr",541,"off")=4600
 	Set gtmtypes("shmpool_buff_hdr",541,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",541,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_4")=541
-	Set gtmtypes("shmpool_buff_hdr",542,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_ztrigger"
-	Set gtmtypes("shmpool_buff_hdr",542,"off")=4744
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_retries_1")=541
+	Set gtmtypes("shmpool_buff_hdr",542,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_retries_2"
+	Set gtmtypes("shmpool_buff_hdr",542,"off")=4608
 	Set gtmtypes("shmpool_buff_hdr",542,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",542,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_ztrigger")=542
-	Set gtmtypes("shmpool_buff_hdr",543,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_db_flush"
-	Set gtmtypes("shmpool_buff_hdr",543,"off")=4752
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_retries_2")=542
+	Set gtmtypes("shmpool_buff_hdr",543,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_nontp_retries_3"
+	Set gtmtypes("shmpool_buff_hdr",543,"off")=4616
 	Set gtmtypes("shmpool_buff_hdr",543,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",543,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_db_flush")=543
-	Set gtmtypes("shmpool_buff_hdr",544,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_db_fsync"
-	Set gtmtypes("shmpool_buff_hdr",544,"off")=4760
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_nontp_retries_3")=543
+	Set gtmtypes("shmpool_buff_hdr",544,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_readwrite"
+	Set gtmtypes("shmpool_buff_hdr",544,"off")=4624
 	Set gtmtypes("shmpool_buff_hdr",544,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",544,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_db_fsync")=544
-	Set gtmtypes("shmpool_buff_hdr",545,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jnl_flush"
-	Set gtmtypes("shmpool_buff_hdr",545,"off")=4768
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_readwrite")=544
+	Set gtmtypes("shmpool_buff_hdr",545,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_readonly"
+	Set gtmtypes("shmpool_buff_hdr",545,"off")=4632
 	Set gtmtypes("shmpool_buff_hdr",545,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",545,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jnl_flush")=545
-	Set gtmtypes("shmpool_buff_hdr",546,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jnl_fsync"
-	Set gtmtypes("shmpool_buff_hdr",546,"off")=4776
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_readonly")=545
+	Set gtmtypes("shmpool_buff_hdr",546,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_rolledback"
+	Set gtmtypes("shmpool_buff_hdr",546,"off")=4640
 	Set gtmtypes("shmpool_buff_hdr",546,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",546,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jnl_fsync")=546
-	Set gtmtypes("shmpool_buff_hdr",547,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jbuff_bytes"
-	Set gtmtypes("shmpool_buff_hdr",547,"off")=4784
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_rolledback")=546
+	Set gtmtypes("shmpool_buff_hdr",547,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_blkwrite"
+	Set gtmtypes("shmpool_buff_hdr",547,"off")=4648
 	Set gtmtypes("shmpool_buff_hdr",547,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",547,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jbuff_bytes")=547
-	Set gtmtypes("shmpool_buff_hdr",548,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jfile_bytes"
-	Set gtmtypes("shmpool_buff_hdr",548,"off")=4792
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_blkwrite")=547
+	Set gtmtypes("shmpool_buff_hdr",548,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_blkread"
+	Set gtmtypes("shmpool_buff_hdr",548,"off")=4656
 	Set gtmtypes("shmpool_buff_hdr",548,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",548,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jfile_bytes")=548
-	Set gtmtypes("shmpool_buff_hdr",549,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jfile_writes"
-	Set gtmtypes("shmpool_buff_hdr",549,"off")=4800
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_blkread")=548
+	Set gtmtypes("shmpool_buff_hdr",549,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_tot_retries_0"
+	Set gtmtypes("shmpool_buff_hdr",549,"off")=4664
 	Set gtmtypes("shmpool_buff_hdr",549,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",549,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jfile_writes")=549
-	Set gtmtypes("shmpool_buff_hdr",550,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jrec_logical"
-	Set gtmtypes("shmpool_buff_hdr",550,"off")=4808
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_tot_retries_0")=549
+	Set gtmtypes("shmpool_buff_hdr",550,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_tot_retries_1"
+	Set gtmtypes("shmpool_buff_hdr",550,"off")=4672
 	Set gtmtypes("shmpool_buff_hdr",550,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",550,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jrec_logical")=550
-	Set gtmtypes("shmpool_buff_hdr",551,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jrec_pblk"
-	Set gtmtypes("shmpool_buff_hdr",551,"off")=4816
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_tot_retries_1")=550
+	Set gtmtypes("shmpool_buff_hdr",551,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_tot_retries_2"
+	Set gtmtypes("shmpool_buff_hdr",551,"off")=4680
 	Set gtmtypes("shmpool_buff_hdr",551,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",551,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jrec_pblk")=551
-	Set gtmtypes("shmpool_buff_hdr",552,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jrec_epoch_regular"
-	Set gtmtypes("shmpool_buff_hdr",552,"off")=4824
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_tot_retries_2")=551
+	Set gtmtypes("shmpool_buff_hdr",552,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_tot_retries_3"
+	Set gtmtypes("shmpool_buff_hdr",552,"off")=4688
 	Set gtmtypes("shmpool_buff_hdr",552,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",552,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jrec_epoch_regular")=552
-	Set gtmtypes("shmpool_buff_hdr",553,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jrec_epoch_idle"
-	Set gtmtypes("shmpool_buff_hdr",553,"off")=4832
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_tot_retries_3")=552
+	Set gtmtypes("shmpool_buff_hdr",553,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_tot_retries_4"
+	Set gtmtypes("shmpool_buff_hdr",553,"off")=4696
 	Set gtmtypes("shmpool_buff_hdr",553,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",553,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jrec_epoch_idle")=553
-	Set gtmtypes("shmpool_buff_hdr",554,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jrec_other"
-	Set gtmtypes("shmpool_buff_hdr",554,"off")=4840
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_tot_retries_4")=553
+	Set gtmtypes("shmpool_buff_hdr",554,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_0"
+	Set gtmtypes("shmpool_buff_hdr",554,"off")=4704
 	Set gtmtypes("shmpool_buff_hdr",554,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",554,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jrec_other")=554
-	Set gtmtypes("shmpool_buff_hdr",555,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jnl_extends"
-	Set gtmtypes("shmpool_buff_hdr",555,"off")=4848
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_0")=554
+	Set gtmtypes("shmpool_buff_hdr",555,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_1"
+	Set gtmtypes("shmpool_buff_hdr",555,"off")=4712
 	Set gtmtypes("shmpool_buff_hdr",555,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",555,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jnl_extends")=555
-	Set gtmtypes("shmpool_buff_hdr",556,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_db_extends"
-	Set gtmtypes("shmpool_buff_hdr",556,"off")=4856
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_1")=555
+	Set gtmtypes("shmpool_buff_hdr",556,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_2"
+	Set gtmtypes("shmpool_buff_hdr",556,"off")=4720
 	Set gtmtypes("shmpool_buff_hdr",556,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",556,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_db_extends")=556
-	Set gtmtypes("shmpool_buff_hdr",557,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_crit_success"
-	Set gtmtypes("shmpool_buff_hdr",557,"off")=4864
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_2")=556
+	Set gtmtypes("shmpool_buff_hdr",557,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_3"
+	Set gtmtypes("shmpool_buff_hdr",557,"off")=4728
 	Set gtmtypes("shmpool_buff_hdr",557,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",557,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_crit_success")=557
-	Set gtmtypes("shmpool_buff_hdr",558,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_crits_in_epch"
-	Set gtmtypes("shmpool_buff_hdr",558,"off")=4872
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_3")=557
+	Set gtmtypes("shmpool_buff_hdr",558,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_tp_cnflct_retries_4"
+	Set gtmtypes("shmpool_buff_hdr",558,"off")=4736
 	Set gtmtypes("shmpool_buff_hdr",558,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",558,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_crits_in_epch")=558
-	Set gtmtypes("shmpool_buff_hdr",559,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.sq_crit_failed"
-	Set gtmtypes("shmpool_buff_hdr",559,"off")=4880
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_tp_cnflct_retries_4")=558
+	Set gtmtypes("shmpool_buff_hdr",559,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_ztrigger"
+	Set gtmtypes("shmpool_buff_hdr",559,"off")=4744
 	Set gtmtypes("shmpool_buff_hdr",559,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",559,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.sq_crit_failed")=559
-	Set gtmtypes("shmpool_buff_hdr",560,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_crit_failed"
-	Set gtmtypes("shmpool_buff_hdr",560,"off")=4888
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_ztrigger")=559
+	Set gtmtypes("shmpool_buff_hdr",560,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_db_flush"
+	Set gtmtypes("shmpool_buff_hdr",560,"off")=4752
 	Set gtmtypes("shmpool_buff_hdr",560,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",560,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_crit_failed")=560
-	Set gtmtypes("shmpool_buff_hdr",561,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.sq_crit_que_slps"
-	Set gtmtypes("shmpool_buff_hdr",561,"off")=4896
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_db_flush")=560
+	Set gtmtypes("shmpool_buff_hdr",561,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_db_fsync"
+	Set gtmtypes("shmpool_buff_hdr",561,"off")=4760
 	Set gtmtypes("shmpool_buff_hdr",561,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",561,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.sq_crit_que_slps")=561
-	Set gtmtypes("shmpool_buff_hdr",562,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_crit_que_slps"
-	Set gtmtypes("shmpool_buff_hdr",562,"off")=4904
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_db_fsync")=561
+	Set gtmtypes("shmpool_buff_hdr",562,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jnl_flush"
+	Set gtmtypes("shmpool_buff_hdr",562,"off")=4768
 	Set gtmtypes("shmpool_buff_hdr",562,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",562,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_crit_que_slps")=562
-	Set gtmtypes("shmpool_buff_hdr",563,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.sq_crit_yields"
-	Set gtmtypes("shmpool_buff_hdr",563,"off")=4912
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jnl_flush")=562
+	Set gtmtypes("shmpool_buff_hdr",563,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jnl_fsync"
+	Set gtmtypes("shmpool_buff_hdr",563,"off")=4776
 	Set gtmtypes("shmpool_buff_hdr",563,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",563,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.sq_crit_yields")=563
-	Set gtmtypes("shmpool_buff_hdr",564,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_crit_yields"
-	Set gtmtypes("shmpool_buff_hdr",564,"off")=4920
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jnl_fsync")=563
+	Set gtmtypes("shmpool_buff_hdr",564,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jbuff_bytes"
+	Set gtmtypes("shmpool_buff_hdr",564,"off")=4784
 	Set gtmtypes("shmpool_buff_hdr",564,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",564,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_crit_yields")=564
-	Set gtmtypes("shmpool_buff_hdr",565,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec_filler_4k_plus_512"
-	Set gtmtypes("shmpool_buff_hdr",565,"off")=4928
-	Set gtmtypes("shmpool_buff_hdr",565,"len")=48
-	Set gtmtypes("shmpool_buff_hdr",565,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec_filler_4k_plus_512")=565
-	Set gtmtypes("shmpool_buff_hdr",566,"name")="shmpool_buff_hdr.shadow_file_header.filler_4k_plus_512"
-	Set gtmtypes("shmpool_buff_hdr",566,"off")=4976
-	Set gtmtypes("shmpool_buff_hdr",566,"len")=368
-	Set gtmtypes("shmpool_buff_hdr",566,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_4k_plus_512")=566
-	Set gtmtypes("shmpool_buff_hdr",567,"name")="shmpool_buff_hdr.shadow_file_header.intrpt_recov_resync_strm_seqno"
-	Set gtmtypes("shmpool_buff_hdr",567,"off")=5344
-	Set gtmtypes("shmpool_buff_hdr",567,"len")=128
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jbuff_bytes")=564
+	Set gtmtypes("shmpool_buff_hdr",565,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jfile_bytes"
+	Set gtmtypes("shmpool_buff_hdr",565,"off")=4792
+	Set gtmtypes("shmpool_buff_hdr",565,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",565,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jfile_bytes")=565
+	Set gtmtypes("shmpool_buff_hdr",566,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jfile_writes"
+	Set gtmtypes("shmpool_buff_hdr",566,"off")=4800
+	Set gtmtypes("shmpool_buff_hdr",566,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",566,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jfile_writes")=566
+	Set gtmtypes("shmpool_buff_hdr",567,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jrec_logical"
+	Set gtmtypes("shmpool_buff_hdr",567,"off")=4808
+	Set gtmtypes("shmpool_buff_hdr",567,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",567,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.intrpt_recov_resync_strm_seqno")=567
-	Set gtmtypes("shmpool_buff_hdr",567,"dim")=16
-	Set gtmtypes("shmpool_buff_hdr",568,"name")="shmpool_buff_hdr.shadow_file_header.creation_db_ver"
-	Set gtmtypes("shmpool_buff_hdr",568,"off")=5472
-	Set gtmtypes("shmpool_buff_hdr",568,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",568,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.creation_db_ver")=568
-	Set gtmtypes("shmpool_buff_hdr",569,"name")="shmpool_buff_hdr.shadow_file_header.creation_mdb_ver"
-	Set gtmtypes("shmpool_buff_hdr",569,"off")=5476
-	Set gtmtypes("shmpool_buff_hdr",569,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",569,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.creation_mdb_ver")=569
-	Set gtmtypes("shmpool_buff_hdr",570,"name")="shmpool_buff_hdr.shadow_file_header.certified_for_upgrade_to"
-	Set gtmtypes("shmpool_buff_hdr",570,"off")=5480
-	Set gtmtypes("shmpool_buff_hdr",570,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",570,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.certified_for_upgrade_to")=570
-	Set gtmtypes("shmpool_buff_hdr",571,"name")="shmpool_buff_hdr.shadow_file_header.filler_5k"
-	Set gtmtypes("shmpool_buff_hdr",571,"off")=5484
-	Set gtmtypes("shmpool_buff_hdr",571,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",571,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_5k")=571
-	Set gtmtypes("shmpool_buff_hdr",572,"name")="shmpool_buff_hdr.shadow_file_header.secshr_ops_index_filler"
-	Set gtmtypes("shmpool_buff_hdr",572,"off")=5488
-	Set gtmtypes("shmpool_buff_hdr",572,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",572,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.secshr_ops_index_filler")=572
-	Set gtmtypes("shmpool_buff_hdr",573,"name")="shmpool_buff_hdr.shadow_file_header.secshr_ops_array_filler"
-	Set gtmtypes("shmpool_buff_hdr",573,"off")=5492
-	Set gtmtypes("shmpool_buff_hdr",573,"len")=1020
-	Set gtmtypes("shmpool_buff_hdr",573,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.secshr_ops_array_filler")=573
-	Set gtmtypes("shmpool_buff_hdr",573,"dim")=255
-	Set gtmtypes("shmpool_buff_hdr",574,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn"
-	Set gtmtypes("shmpool_buff_hdr",574,"off")=6512
-	Set gtmtypes("shmpool_buff_hdr",574,"len")=24
-	Set gtmtypes("shmpool_buff_hdr",574,"type")="compswap_time_field"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn")=574
-	Set gtmtypes("shmpool_buff_hdr",575,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch"
-	Set gtmtypes("shmpool_buff_hdr",575,"off")=6512
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jrec_logical")=567
+	Set gtmtypes("shmpool_buff_hdr",568,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jrec_pblk"
+	Set gtmtypes("shmpool_buff_hdr",568,"off")=4816
+	Set gtmtypes("shmpool_buff_hdr",568,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",568,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jrec_pblk")=568
+	Set gtmtypes("shmpool_buff_hdr",569,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jrec_epoch_regular"
+	Set gtmtypes("shmpool_buff_hdr",569,"off")=4824
+	Set gtmtypes("shmpool_buff_hdr",569,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",569,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jrec_epoch_regular")=569
+	Set gtmtypes("shmpool_buff_hdr",570,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jrec_epoch_idle"
+	Set gtmtypes("shmpool_buff_hdr",570,"off")=4832
+	Set gtmtypes("shmpool_buff_hdr",570,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",570,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jrec_epoch_idle")=570
+	Set gtmtypes("shmpool_buff_hdr",571,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jrec_other"
+	Set gtmtypes("shmpool_buff_hdr",571,"off")=4840
+	Set gtmtypes("shmpool_buff_hdr",571,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",571,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jrec_other")=571
+	Set gtmtypes("shmpool_buff_hdr",572,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_jnl_extends"
+	Set gtmtypes("shmpool_buff_hdr",572,"off")=4848
+	Set gtmtypes("shmpool_buff_hdr",572,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",572,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_jnl_extends")=572
+	Set gtmtypes("shmpool_buff_hdr",573,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_db_extends"
+	Set gtmtypes("shmpool_buff_hdr",573,"off")=4856
+	Set gtmtypes("shmpool_buff_hdr",573,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",573,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_db_extends")=573
+	Set gtmtypes("shmpool_buff_hdr",574,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_crit_success"
+	Set gtmtypes("shmpool_buff_hdr",574,"off")=4864
+	Set gtmtypes("shmpool_buff_hdr",574,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",574,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_crit_success")=574
+	Set gtmtypes("shmpool_buff_hdr",575,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_crits_in_epch"
+	Set gtmtypes("shmpool_buff_hdr",575,"off")=4872
 	Set gtmtypes("shmpool_buff_hdr",575,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",575,"type")="global_latch_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch")=575
-	Set gtmtypes("shmpool_buff_hdr",576,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch.u"
-	Set gtmtypes("shmpool_buff_hdr",576,"off")=6512
+	Set gtmtypes("shmpool_buff_hdr",575,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_crits_in_epch")=575
+	Set gtmtypes("shmpool_buff_hdr",576,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.sq_crit_failed"
+	Set gtmtypes("shmpool_buff_hdr",576,"off")=4880
 	Set gtmtypes("shmpool_buff_hdr",576,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",576,"type")="union"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch.u")=576
-	Set gtmtypes("shmpool_buff_hdr",577,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch.u.pid_imgcnt"
-	Set gtmtypes("shmpool_buff_hdr",577,"off")=6512
+	Set gtmtypes("shmpool_buff_hdr",576,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.sq_crit_failed")=576
+	Set gtmtypes("shmpool_buff_hdr",577,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_crit_failed"
+	Set gtmtypes("shmpool_buff_hdr",577,"off")=4888
 	Set gtmtypes("shmpool_buff_hdr",577,"len")=8
 	Set gtmtypes("shmpool_buff_hdr",577,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch.u.pid_imgcnt")=577
-	Set gtmtypes("shmpool_buff_hdr",578,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch.u.parts"
-	Set gtmtypes("shmpool_buff_hdr",578,"off")=6512
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_crit_failed")=577
+	Set gtmtypes("shmpool_buff_hdr",578,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.sq_crit_que_slps"
+	Set gtmtypes("shmpool_buff_hdr",578,"off")=4896
 	Set gtmtypes("shmpool_buff_hdr",578,"len")=8
-	Set gtmtypes("shmpool_buff_hdr",578,"type")="struct"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch.u.parts")=578
-	Set gtmtypes("shmpool_buff_hdr",579,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_pid"
-	Set gtmtypes("shmpool_buff_hdr",579,"off")=6512
-	Set gtmtypes("shmpool_buff_hdr",579,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",579,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_pid")=579
-	Set gtmtypes("shmpool_buff_hdr",580,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_word"
-	Set gtmtypes("shmpool_buff_hdr",580,"off")=6516
-	Set gtmtypes("shmpool_buff_hdr",580,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",580,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_word")=580
-	Set gtmtypes("shmpool_buff_hdr",581,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.hp_latch_space"
-	Set gtmtypes("shmpool_buff_hdr",581,"off")=6520
-	Set gtmtypes("shmpool_buff_hdr",581,"len")=16
-	Set gtmtypes("shmpool_buff_hdr",581,"type")="int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.hp_latch_space")=581
-	Set gtmtypes("shmpool_buff_hdr",581,"dim")=4
-	Set gtmtypes("shmpool_buff_hdr",582,"name")="shmpool_buff_hdr.shadow_file_header.is_encrypted"
-	Set gtmtypes("shmpool_buff_hdr",582,"off")=6536
-	Set gtmtypes("shmpool_buff_hdr",582,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",582,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.is_encrypted")=582
-	Set gtmtypes("shmpool_buff_hdr",583,"name")="shmpool_buff_hdr.shadow_file_header.db_trigger_cycle"
-	Set gtmtypes("shmpool_buff_hdr",583,"off")=6540
-	Set gtmtypes("shmpool_buff_hdr",583,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",583,"type")="unsigned-int"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_trigger_cycle")=583
-	Set gtmtypes("shmpool_buff_hdr",584,"name")="shmpool_buff_hdr.shadow_file_header.strm_reg_seqno"
-	Set gtmtypes("shmpool_buff_hdr",584,"off")=6544
-	Set gtmtypes("shmpool_buff_hdr",584,"len")=128
-	Set gtmtypes("shmpool_buff_hdr",584,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.strm_reg_seqno")=584
-	Set gtmtypes("shmpool_buff_hdr",584,"dim")=16
-	Set gtmtypes("shmpool_buff_hdr",585,"name")="shmpool_buff_hdr.shadow_file_header.save_strm_reg_seqno"
-	Set gtmtypes("shmpool_buff_hdr",585,"off")=6672
+	Set gtmtypes("shmpool_buff_hdr",578,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.sq_crit_que_slps")=578
+	Set gtmtypes("shmpool_buff_hdr",579,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_crit_que_slps"
+	Set gtmtypes("shmpool_buff_hdr",579,"off")=4904
+	Set gtmtypes("shmpool_buff_hdr",579,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",579,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_crit_que_slps")=579
+	Set gtmtypes("shmpool_buff_hdr",580,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.sq_crit_yields"
+	Set gtmtypes("shmpool_buff_hdr",580,"off")=4912
+	Set gtmtypes("shmpool_buff_hdr",580,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",580,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.sq_crit_yields")=580
+	Set gtmtypes("shmpool_buff_hdr",581,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_crit_yields"
+	Set gtmtypes("shmpool_buff_hdr",581,"off")=4920
+	Set gtmtypes("shmpool_buff_hdr",581,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",581,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_crit_yields")=581
+	Set gtmtypes("shmpool_buff_hdr",582,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec.n_clean2dirty"
+	Set gtmtypes("shmpool_buff_hdr",582,"off")=4928
+	Set gtmtypes("shmpool_buff_hdr",582,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",582,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec.n_clean2dirty")=582
+	Set gtmtypes("shmpool_buff_hdr",583,"name")="shmpool_buff_hdr.shadow_file_header.gvstats_rec_filler_4k_plus_512"
+	Set gtmtypes("shmpool_buff_hdr",583,"off")=4936
+	Set gtmtypes("shmpool_buff_hdr",583,"len")=40
+	Set gtmtypes("shmpool_buff_hdr",583,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.gvstats_rec_filler_4k_plus_512")=583
+	Set gtmtypes("shmpool_buff_hdr",584,"name")="shmpool_buff_hdr.shadow_file_header.filler_4k_plus_512"
+	Set gtmtypes("shmpool_buff_hdr",584,"off")=4976
+	Set gtmtypes("shmpool_buff_hdr",584,"len")=368
+	Set gtmtypes("shmpool_buff_hdr",584,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_4k_plus_512")=584
+	Set gtmtypes("shmpool_buff_hdr",585,"name")="shmpool_buff_hdr.shadow_file_header.intrpt_recov_resync_strm_seqno"
+	Set gtmtypes("shmpool_buff_hdr",585,"off")=5344
 	Set gtmtypes("shmpool_buff_hdr",585,"len")=128
 	Set gtmtypes("shmpool_buff_hdr",585,"type")="uint64_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.save_strm_reg_seqno")=585
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.intrpt_recov_resync_strm_seqno")=585
 	Set gtmtypes("shmpool_buff_hdr",585,"dim")=16
-	Set gtmtypes("shmpool_buff_hdr",586,"name")="shmpool_buff_hdr.shadow_file_header.freeze_on_fail"
-	Set gtmtypes("shmpool_buff_hdr",586,"off")=6800
+	Set gtmtypes("shmpool_buff_hdr",586,"name")="shmpool_buff_hdr.shadow_file_header.creation_db_ver"
+	Set gtmtypes("shmpool_buff_hdr",586,"off")=5472
 	Set gtmtypes("shmpool_buff_hdr",586,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",586,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.freeze_on_fail")=586
-	Set gtmtypes("shmpool_buff_hdr",587,"name")="shmpool_buff_hdr.shadow_file_header.span_node_absent"
-	Set gtmtypes("shmpool_buff_hdr",587,"off")=6804
+	Set gtmtypes("shmpool_buff_hdr",586,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.creation_db_ver")=586
+	Set gtmtypes("shmpool_buff_hdr",587,"name")="shmpool_buff_hdr.shadow_file_header.creation_mdb_ver"
+	Set gtmtypes("shmpool_buff_hdr",587,"off")=5476
 	Set gtmtypes("shmpool_buff_hdr",587,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",587,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.span_node_absent")=587
-	Set gtmtypes("shmpool_buff_hdr",588,"name")="shmpool_buff_hdr.shadow_file_header.maxkeysz_assured"
-	Set gtmtypes("shmpool_buff_hdr",588,"off")=6808
+	Set gtmtypes("shmpool_buff_hdr",587,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.creation_mdb_ver")=587
+	Set gtmtypes("shmpool_buff_hdr",588,"name")="shmpool_buff_hdr.shadow_file_header.certified_for_upgrade_to"
+	Set gtmtypes("shmpool_buff_hdr",588,"off")=5480
 	Set gtmtypes("shmpool_buff_hdr",588,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",588,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.maxkeysz_assured")=588
-	Set gtmtypes("shmpool_buff_hdr",589,"name")="shmpool_buff_hdr.shadow_file_header.hasht_upgrade_needed"
-	Set gtmtypes("shmpool_buff_hdr",589,"off")=6812
+	Set gtmtypes("shmpool_buff_hdr",588,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.certified_for_upgrade_to")=588
+	Set gtmtypes("shmpool_buff_hdr",589,"name")="shmpool_buff_hdr.shadow_file_header.filler_5k"
+	Set gtmtypes("shmpool_buff_hdr",589,"off")=5484
 	Set gtmtypes("shmpool_buff_hdr",589,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",589,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.hasht_upgrade_needed")=589
-	Set gtmtypes("shmpool_buff_hdr",590,"name")="shmpool_buff_hdr.shadow_file_header.defer_allocate"
-	Set gtmtypes("shmpool_buff_hdr",590,"off")=6816
+	Set gtmtypes("shmpool_buff_hdr",589,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_5k")=589
+	Set gtmtypes("shmpool_buff_hdr",590,"name")="shmpool_buff_hdr.shadow_file_header.secshr_ops_index_filler"
+	Set gtmtypes("shmpool_buff_hdr",590,"off")=5488
 	Set gtmtypes("shmpool_buff_hdr",590,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",590,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.defer_allocate")=590
-	Set gtmtypes("shmpool_buff_hdr",591,"name")="shmpool_buff_hdr.shadow_file_header.filler_ftok_counter_halted"
-	Set gtmtypes("shmpool_buff_hdr",591,"off")=6820
-	Set gtmtypes("shmpool_buff_hdr",591,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",591,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_ftok_counter_halted")=591
-	Set gtmtypes("shmpool_buff_hdr",592,"name")="shmpool_buff_hdr.shadow_file_header.filler_access_counter_halted"
-	Set gtmtypes("shmpool_buff_hdr",592,"off")=6824
-	Set gtmtypes("shmpool_buff_hdr",592,"len")=4
-	Set gtmtypes("shmpool_buff_hdr",592,"type")="boolean_t"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_access_counter_halted")=592
-	Set gtmtypes("shmpool_buff_hdr",593,"name")="shmpool_buff_hdr.shadow_file_header.filler_7k"
-	Set gtmtypes("shmpool_buff_hdr",593,"off")=6828
-	Set gtmtypes("shmpool_buff_hdr",593,"len")=708
-	Set gtmtypes("shmpool_buff_hdr",593,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_7k")=593
-	Set gtmtypes("shmpool_buff_hdr",594,"name")="shmpool_buff_hdr.shadow_file_header.filler_8k"
-	Set gtmtypes("shmpool_buff_hdr",594,"off")=7536
-	Set gtmtypes("shmpool_buff_hdr",594,"len")=1024
-	Set gtmtypes("shmpool_buff_hdr",594,"type")="char"
-	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_8k")=594
+	Set gtmtypes("shmpool_buff_hdr",590,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.secshr_ops_index_filler")=590
+	Set gtmtypes("shmpool_buff_hdr",591,"name")="shmpool_buff_hdr.shadow_file_header.secshr_ops_array_filler"
+	Set gtmtypes("shmpool_buff_hdr",591,"off")=5492
+	Set gtmtypes("shmpool_buff_hdr",591,"len")=1020
+	Set gtmtypes("shmpool_buff_hdr",591,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.secshr_ops_array_filler")=591
+	Set gtmtypes("shmpool_buff_hdr",591,"dim")=255
+	Set gtmtypes("shmpool_buff_hdr",592,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn"
+	Set gtmtypes("shmpool_buff_hdr",592,"off")=6512
+	Set gtmtypes("shmpool_buff_hdr",592,"len")=24
+	Set gtmtypes("shmpool_buff_hdr",592,"type")="compswap_time_field"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn")=592
+	Set gtmtypes("shmpool_buff_hdr",593,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch"
+	Set gtmtypes("shmpool_buff_hdr",593,"off")=6512
+	Set gtmtypes("shmpool_buff_hdr",593,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",593,"type")="global_latch_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch")=593
+	Set gtmtypes("shmpool_buff_hdr",594,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch.u"
+	Set gtmtypes("shmpool_buff_hdr",594,"off")=6512
+	Set gtmtypes("shmpool_buff_hdr",594,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",594,"type")="union"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch.u")=594
+	Set gtmtypes("shmpool_buff_hdr",595,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch.u.pid_imgcnt"
+	Set gtmtypes("shmpool_buff_hdr",595,"off")=6512
+	Set gtmtypes("shmpool_buff_hdr",595,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",595,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch.u.pid_imgcnt")=595
+	Set gtmtypes("shmpool_buff_hdr",596,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch.u.parts"
+	Set gtmtypes("shmpool_buff_hdr",596,"off")=6512
+	Set gtmtypes("shmpool_buff_hdr",596,"len")=8
+	Set gtmtypes("shmpool_buff_hdr",596,"type")="struct"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch.u.parts")=596
+	Set gtmtypes("shmpool_buff_hdr",597,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_pid"
+	Set gtmtypes("shmpool_buff_hdr",597,"off")=6512
+	Set gtmtypes("shmpool_buff_hdr",597,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",597,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_pid")=597
+	Set gtmtypes("shmpool_buff_hdr",598,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_word"
+	Set gtmtypes("shmpool_buff_hdr",598,"off")=6516
+	Set gtmtypes("shmpool_buff_hdr",598,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",598,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.time_latch.u.parts.latch_word")=598
+	Set gtmtypes("shmpool_buff_hdr",599,"name")="shmpool_buff_hdr.shadow_file_header.next_upgrd_warn.hp_latch_space"
+	Set gtmtypes("shmpool_buff_hdr",599,"off")=6520
+	Set gtmtypes("shmpool_buff_hdr",599,"len")=16
+	Set gtmtypes("shmpool_buff_hdr",599,"type")="int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.next_upgrd_warn.hp_latch_space")=599
+	Set gtmtypes("shmpool_buff_hdr",599,"dim")=4
+	Set gtmtypes("shmpool_buff_hdr",600,"name")="shmpool_buff_hdr.shadow_file_header.is_encrypted"
+	Set gtmtypes("shmpool_buff_hdr",600,"off")=6536
+	Set gtmtypes("shmpool_buff_hdr",600,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",600,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.is_encrypted")=600
+	Set gtmtypes("shmpool_buff_hdr",601,"name")="shmpool_buff_hdr.shadow_file_header.db_trigger_cycle"
+	Set gtmtypes("shmpool_buff_hdr",601,"off")=6540
+	Set gtmtypes("shmpool_buff_hdr",601,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",601,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.db_trigger_cycle")=601
+	Set gtmtypes("shmpool_buff_hdr",602,"name")="shmpool_buff_hdr.shadow_file_header.strm_reg_seqno"
+	Set gtmtypes("shmpool_buff_hdr",602,"off")=6544
+	Set gtmtypes("shmpool_buff_hdr",602,"len")=128
+	Set gtmtypes("shmpool_buff_hdr",602,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.strm_reg_seqno")=602
+	Set gtmtypes("shmpool_buff_hdr",602,"dim")=16
+	Set gtmtypes("shmpool_buff_hdr",603,"name")="shmpool_buff_hdr.shadow_file_header.save_strm_reg_seqno"
+	Set gtmtypes("shmpool_buff_hdr",603,"off")=6672
+	Set gtmtypes("shmpool_buff_hdr",603,"len")=128
+	Set gtmtypes("shmpool_buff_hdr",603,"type")="uint64_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.save_strm_reg_seqno")=603
+	Set gtmtypes("shmpool_buff_hdr",603,"dim")=16
+	Set gtmtypes("shmpool_buff_hdr",604,"name")="shmpool_buff_hdr.shadow_file_header.freeze_on_fail"
+	Set gtmtypes("shmpool_buff_hdr",604,"off")=6800
+	Set gtmtypes("shmpool_buff_hdr",604,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",604,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.freeze_on_fail")=604
+	Set gtmtypes("shmpool_buff_hdr",605,"name")="shmpool_buff_hdr.shadow_file_header.span_node_absent"
+	Set gtmtypes("shmpool_buff_hdr",605,"off")=6804
+	Set gtmtypes("shmpool_buff_hdr",605,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",605,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.span_node_absent")=605
+	Set gtmtypes("shmpool_buff_hdr",606,"name")="shmpool_buff_hdr.shadow_file_header.maxkeysz_assured"
+	Set gtmtypes("shmpool_buff_hdr",606,"off")=6808
+	Set gtmtypes("shmpool_buff_hdr",606,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",606,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.maxkeysz_assured")=606
+	Set gtmtypes("shmpool_buff_hdr",607,"name")="shmpool_buff_hdr.shadow_file_header.hasht_upgrade_needed"
+	Set gtmtypes("shmpool_buff_hdr",607,"off")=6812
+	Set gtmtypes("shmpool_buff_hdr",607,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",607,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.hasht_upgrade_needed")=607
+	Set gtmtypes("shmpool_buff_hdr",608,"name")="shmpool_buff_hdr.shadow_file_header.defer_allocate"
+	Set gtmtypes("shmpool_buff_hdr",608,"off")=6816
+	Set gtmtypes("shmpool_buff_hdr",608,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",608,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.defer_allocate")=608
+	Set gtmtypes("shmpool_buff_hdr",609,"name")="shmpool_buff_hdr.shadow_file_header.filler_ftok_counter_halted"
+	Set gtmtypes("shmpool_buff_hdr",609,"off")=6820
+	Set gtmtypes("shmpool_buff_hdr",609,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",609,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_ftok_counter_halted")=609
+	Set gtmtypes("shmpool_buff_hdr",610,"name")="shmpool_buff_hdr.shadow_file_header.filler_access_counter_halted"
+	Set gtmtypes("shmpool_buff_hdr",610,"off")=6824
+	Set gtmtypes("shmpool_buff_hdr",610,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",610,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_access_counter_halted")=610
+	Set gtmtypes("shmpool_buff_hdr",611,"name")="shmpool_buff_hdr.shadow_file_header.lock_crit_with_db"
+	Set gtmtypes("shmpool_buff_hdr",611,"off")=6828
+	Set gtmtypes("shmpool_buff_hdr",611,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",611,"type")="boolean_t"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.lock_crit_with_db")=611
+	Set gtmtypes("shmpool_buff_hdr",612,"name")="shmpool_buff_hdr.shadow_file_header.basedb_fname_len"
+	Set gtmtypes("shmpool_buff_hdr",612,"off")=6832
+	Set gtmtypes("shmpool_buff_hdr",612,"len")=4
+	Set gtmtypes("shmpool_buff_hdr",612,"type")="unsigned-int"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.basedb_fname_len")=612
+	Set gtmtypes("shmpool_buff_hdr",613,"name")="shmpool_buff_hdr.shadow_file_header.basedb_fname"
+	Set gtmtypes("shmpool_buff_hdr",613,"off")=6836
+	Set gtmtypes("shmpool_buff_hdr",613,"len")=256
+	Set gtmtypes("shmpool_buff_hdr",613,"type")="unsigned-char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.basedb_fname")=613
+	Set gtmtypes("shmpool_buff_hdr",614,"name")="shmpool_buff_hdr.shadow_file_header.filler_7k"
+	Set gtmtypes("shmpool_buff_hdr",614,"off")=7092
+	Set gtmtypes("shmpool_buff_hdr",614,"len")=444
+	Set gtmtypes("shmpool_buff_hdr",614,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_7k")=614
+	Set gtmtypes("shmpool_buff_hdr",615,"name")="shmpool_buff_hdr.shadow_file_header.filler_8k"
+	Set gtmtypes("shmpool_buff_hdr",615,"off")=7536
+	Set gtmtypes("shmpool_buff_hdr",615,"len")=1024
+	Set gtmtypes("shmpool_buff_hdr",615,"type")="char"
+	Set gtmtypfldindx("shmpool_buff_hdr","shadow_file_header.filler_8k")=615
 	;
 	Set gtmtypes("show_reply")="struct"
 	Set gtmtypes("show_reply",0)=2
@@ -35601,10 +36421,10 @@ Init
 	;
 	Set gtmtypes("sib_byte_type")="union"
 	Set gtmtypes("sib_byte_type",0)=2
-	Set gtmtypes("sib_byte_type","len")=4
+	Set gtmtypes("sib_byte_type","len")=1
 	Set gtmtypes("sib_byte_type",1,"name")="sib_byte_type.sib"
 	Set gtmtypes("sib_byte_type",1,"off")=0
-	Set gtmtypes("sib_byte_type",1,"len")=4
+	Set gtmtypes("sib_byte_type",1,"len")=1
 	Set gtmtypes("sib_byte_type",1,"type")="SIB"
 	Set gtmtypfldindx("sib_byte_type","sib")=1
 	Set gtmtypes("sib_byte_type",2,"name")="sib_byte_type.byte"
@@ -36461,8 +37281,8 @@ Init
 	Set gtmtypfldindx("span_subs","b_sec")=3
 	;
 	Set gtmtypes("spdesc")="struct"
-	Set gtmtypes("spdesc",0)=5
-	Set gtmtypes("spdesc","len")=40
+	Set gtmtypes("spdesc",0)=6
+	Set gtmtypes("spdesc","len")=48
 	Set gtmtypes("spdesc",1,"name")="spdesc.base"
 	Set gtmtypes("spdesc",1,"off")=0
 	Set gtmtypes("spdesc",1,"len")=8
@@ -36488,6 +37308,11 @@ Init
 	Set gtmtypes("spdesc",5,"len")=1
 	Set gtmtypes("spdesc",5,"type")="unsigned-char"
 	Set gtmtypfldindx("spdesc","prvprt")=5
+	Set gtmtypes("spdesc",6,"name")="spdesc.invokestpgcollevel"
+	Set gtmtypes("spdesc",6,"off")=40
+	Set gtmtypes("spdesc",6,"len")=8
+	Set gtmtypes("spdesc",6,"type")="addr"
+	Set gtmtypfldindx("spdesc","invokestpgcollevel")=6
 	;
 	Set gtmtypes("src_line_struct")="struct"
 	Set gtmtypes("src_line_struct",0)=8
@@ -36814,6 +37639,25 @@ Init
 	Set gtmtypes("stack_frame",15,"type")="addr"
 	Set gtmtypfldindx("stack_frame","ret_value")=15
 	;
+	Set gtmtypes("statsDB_deferred_init_que_elem")="struct"
+	Set gtmtypes("statsDB_deferred_init_que_elem",0)=3
+	Set gtmtypes("statsDB_deferred_init_que_elem","len")=24
+	Set gtmtypes("statsDB_deferred_init_que_elem",1,"name")="statsDB_deferred_init_que_elem.next"
+	Set gtmtypes("statsDB_deferred_init_que_elem",1,"off")=0
+	Set gtmtypes("statsDB_deferred_init_que_elem",1,"len")=8
+	Set gtmtypes("statsDB_deferred_init_que_elem",1,"type")="addr"
+	Set gtmtypfldindx("statsDB_deferred_init_que_elem","next")=1
+	Set gtmtypes("statsDB_deferred_init_que_elem",2,"name")="statsDB_deferred_init_que_elem.baseDBreg"
+	Set gtmtypes("statsDB_deferred_init_que_elem",2,"off")=8
+	Set gtmtypes("statsDB_deferred_init_que_elem",2,"len")=8
+	Set gtmtypes("statsDB_deferred_init_que_elem",2,"type")="addr"
+	Set gtmtypfldindx("statsDB_deferred_init_que_elem","baseDBreg")=2
+	Set gtmtypes("statsDB_deferred_init_que_elem",3,"name")="statsDB_deferred_init_que_elem.statsDBreg"
+	Set gtmtypes("statsDB_deferred_init_que_elem",3,"off")=16
+	Set gtmtypes("statsDB_deferred_init_que_elem",3,"len")=8
+	Set gtmtypes("statsDB_deferred_init_que_elem",3,"type")="addr"
+	Set gtmtypfldindx("statsDB_deferred_init_que_elem","statsDBreg")=3
+	;
 	Set gtmtypes("storElem")="struct"
 	Set gtmtypes("storElem",0)=11
 	Set gtmtypes("storElem","len")=32
@@ -39307,11 +40151,11 @@ Init
 	Set gtmtypfldindx("unique_file_id","file_id")=5
 	;
 	Set gtmtypes("unix_db_info")="struct"
-	Set gtmtypes("unix_db_info",0)=155
-	Set gtmtypes("unix_db_info","len")=1024
+	Set gtmtypes("unix_db_info",0)=168
+	Set gtmtypes("unix_db_info","len")=1096
 	Set gtmtypes("unix_db_info",1,"name")="unix_db_info.s_addrs"
 	Set gtmtypes("unix_db_info",1,"off")=0
-	Set gtmtypes("unix_db_info",1,"len")=936
+	Set gtmtypes("unix_db_info",1,"len")=992
 	Set gtmtypes("unix_db_info",1,"type")="sgmnt_addrs"
 	Set gtmtypfldindx("unix_db_info","s_addrs")=1
 	Set gtmtypes("unix_db_info",2,"name")="unix_db_info.s_addrs.hdr"
@@ -39466,626 +40310,691 @@ Init
 	Set gtmtypes("unix_db_info",31,"len")=8
 	Set gtmtypes("unix_db_info",31,"type")="addr"
 	Set gtmtypfldindx("unix_db_info","s_addrs.acc_meth.bg.cache_state")=31
-	Set gtmtypes("unix_db_info",32,"name")="unix_db_info.s_addrs.gvstats_rec"
+	Set gtmtypes("unix_db_info",32,"name")="unix_db_info.s_addrs.gvstats_rec_p"
 	Set gtmtypes("unix_db_info",32,"off")=224
-	Set gtmtypes("unix_db_info",32,"len")=464
-	Set gtmtypes("unix_db_info",32,"type")="gvstats_rec_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec")=32
-	Set gtmtypes("unix_db_info",33,"name")="unix_db_info.s_addrs.gvstats_rec.n_set"
-	Set gtmtypes("unix_db_info",33,"off")=224
-	Set gtmtypes("unix_db_info",33,"len")=8
-	Set gtmtypes("unix_db_info",33,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_set")=33
-	Set gtmtypes("unix_db_info",34,"name")="unix_db_info.s_addrs.gvstats_rec.n_kill"
+	Set gtmtypes("unix_db_info",32,"len")=8
+	Set gtmtypes("unix_db_info",32,"type")="addr"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec_p")=32
+	Set gtmtypes("unix_db_info",33,"name")="unix_db_info.s_addrs.gvstats_rec"
+	Set gtmtypes("unix_db_info",33,"off")=232
+	Set gtmtypes("unix_db_info",33,"len")=472
+	Set gtmtypes("unix_db_info",33,"type")="gvstats_rec_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec")=33
+	Set gtmtypes("unix_db_info",34,"name")="unix_db_info.s_addrs.gvstats_rec.n_set"
 	Set gtmtypes("unix_db_info",34,"off")=232
 	Set gtmtypes("unix_db_info",34,"len")=8
 	Set gtmtypes("unix_db_info",34,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_kill")=34
-	Set gtmtypes("unix_db_info",35,"name")="unix_db_info.s_addrs.gvstats_rec.n_get"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_set")=34
+	Set gtmtypes("unix_db_info",35,"name")="unix_db_info.s_addrs.gvstats_rec.n_kill"
 	Set gtmtypes("unix_db_info",35,"off")=240
 	Set gtmtypes("unix_db_info",35,"len")=8
 	Set gtmtypes("unix_db_info",35,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_get")=35
-	Set gtmtypes("unix_db_info",36,"name")="unix_db_info.s_addrs.gvstats_rec.n_data"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_kill")=35
+	Set gtmtypes("unix_db_info",36,"name")="unix_db_info.s_addrs.gvstats_rec.n_get"
 	Set gtmtypes("unix_db_info",36,"off")=248
 	Set gtmtypes("unix_db_info",36,"len")=8
 	Set gtmtypes("unix_db_info",36,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_data")=36
-	Set gtmtypes("unix_db_info",37,"name")="unix_db_info.s_addrs.gvstats_rec.n_order"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_get")=36
+	Set gtmtypes("unix_db_info",37,"name")="unix_db_info.s_addrs.gvstats_rec.n_data"
 	Set gtmtypes("unix_db_info",37,"off")=256
 	Set gtmtypes("unix_db_info",37,"len")=8
 	Set gtmtypes("unix_db_info",37,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_order")=37
-	Set gtmtypes("unix_db_info",38,"name")="unix_db_info.s_addrs.gvstats_rec.n_zprev"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_data")=37
+	Set gtmtypes("unix_db_info",38,"name")="unix_db_info.s_addrs.gvstats_rec.n_order"
 	Set gtmtypes("unix_db_info",38,"off")=264
 	Set gtmtypes("unix_db_info",38,"len")=8
 	Set gtmtypes("unix_db_info",38,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_zprev")=38
-	Set gtmtypes("unix_db_info",39,"name")="unix_db_info.s_addrs.gvstats_rec.n_query"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_order")=38
+	Set gtmtypes("unix_db_info",39,"name")="unix_db_info.s_addrs.gvstats_rec.n_zprev"
 	Set gtmtypes("unix_db_info",39,"off")=272
 	Set gtmtypes("unix_db_info",39,"len")=8
 	Set gtmtypes("unix_db_info",39,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_query")=39
-	Set gtmtypes("unix_db_info",40,"name")="unix_db_info.s_addrs.gvstats_rec.n_lock_success"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_zprev")=39
+	Set gtmtypes("unix_db_info",40,"name")="unix_db_info.s_addrs.gvstats_rec.n_query"
 	Set gtmtypes("unix_db_info",40,"off")=280
 	Set gtmtypes("unix_db_info",40,"len")=8
 	Set gtmtypes("unix_db_info",40,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_lock_success")=40
-	Set gtmtypes("unix_db_info",41,"name")="unix_db_info.s_addrs.gvstats_rec.n_lock_fail"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_query")=40
+	Set gtmtypes("unix_db_info",41,"name")="unix_db_info.s_addrs.gvstats_rec.n_lock_success"
 	Set gtmtypes("unix_db_info",41,"off")=288
 	Set gtmtypes("unix_db_info",41,"len")=8
 	Set gtmtypes("unix_db_info",41,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_lock_fail")=41
-	Set gtmtypes("unix_db_info",42,"name")="unix_db_info.s_addrs.gvstats_rec.db_curr_tn"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_lock_success")=41
+	Set gtmtypes("unix_db_info",42,"name")="unix_db_info.s_addrs.gvstats_rec.n_lock_fail"
 	Set gtmtypes("unix_db_info",42,"off")=296
 	Set gtmtypes("unix_db_info",42,"len")=8
 	Set gtmtypes("unix_db_info",42,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.db_curr_tn")=42
-	Set gtmtypes("unix_db_info",43,"name")="unix_db_info.s_addrs.gvstats_rec.n_dsk_read"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_lock_fail")=42
+	Set gtmtypes("unix_db_info",43,"name")="unix_db_info.s_addrs.gvstats_rec.db_curr_tn"
 	Set gtmtypes("unix_db_info",43,"off")=304
 	Set gtmtypes("unix_db_info",43,"len")=8
 	Set gtmtypes("unix_db_info",43,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_dsk_read")=43
-	Set gtmtypes("unix_db_info",44,"name")="unix_db_info.s_addrs.gvstats_rec.n_dsk_write"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.db_curr_tn")=43
+	Set gtmtypes("unix_db_info",44,"name")="unix_db_info.s_addrs.gvstats_rec.n_dsk_read"
 	Set gtmtypes("unix_db_info",44,"off")=312
 	Set gtmtypes("unix_db_info",44,"len")=8
 	Set gtmtypes("unix_db_info",44,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_dsk_write")=44
-	Set gtmtypes("unix_db_info",45,"name")="unix_db_info.s_addrs.gvstats_rec.n_nontp_readwrite"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_dsk_read")=44
+	Set gtmtypes("unix_db_info",45,"name")="unix_db_info.s_addrs.gvstats_rec.n_dsk_write"
 	Set gtmtypes("unix_db_info",45,"off")=320
 	Set gtmtypes("unix_db_info",45,"len")=8
 	Set gtmtypes("unix_db_info",45,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_nontp_readwrite")=45
-	Set gtmtypes("unix_db_info",46,"name")="unix_db_info.s_addrs.gvstats_rec.n_nontp_readonly"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_dsk_write")=45
+	Set gtmtypes("unix_db_info",46,"name")="unix_db_info.s_addrs.gvstats_rec.n_nontp_readwrite"
 	Set gtmtypes("unix_db_info",46,"off")=328
 	Set gtmtypes("unix_db_info",46,"len")=8
 	Set gtmtypes("unix_db_info",46,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_nontp_readonly")=46
-	Set gtmtypes("unix_db_info",47,"name")="unix_db_info.s_addrs.gvstats_rec.n_nontp_blkwrite"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_nontp_readwrite")=46
+	Set gtmtypes("unix_db_info",47,"name")="unix_db_info.s_addrs.gvstats_rec.n_nontp_readonly"
 	Set gtmtypes("unix_db_info",47,"off")=336
 	Set gtmtypes("unix_db_info",47,"len")=8
 	Set gtmtypes("unix_db_info",47,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_nontp_blkwrite")=47
-	Set gtmtypes("unix_db_info",48,"name")="unix_db_info.s_addrs.gvstats_rec.n_nontp_blkread"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_nontp_readonly")=47
+	Set gtmtypes("unix_db_info",48,"name")="unix_db_info.s_addrs.gvstats_rec.n_nontp_blkwrite"
 	Set gtmtypes("unix_db_info",48,"off")=344
 	Set gtmtypes("unix_db_info",48,"len")=8
 	Set gtmtypes("unix_db_info",48,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_nontp_blkread")=48
-	Set gtmtypes("unix_db_info",49,"name")="unix_db_info.s_addrs.gvstats_rec.n_nontp_retries_0"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_nontp_blkwrite")=48
+	Set gtmtypes("unix_db_info",49,"name")="unix_db_info.s_addrs.gvstats_rec.n_nontp_blkread"
 	Set gtmtypes("unix_db_info",49,"off")=352
 	Set gtmtypes("unix_db_info",49,"len")=8
 	Set gtmtypes("unix_db_info",49,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_nontp_retries_0")=49
-	Set gtmtypes("unix_db_info",50,"name")="unix_db_info.s_addrs.gvstats_rec.n_nontp_retries_1"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_nontp_blkread")=49
+	Set gtmtypes("unix_db_info",50,"name")="unix_db_info.s_addrs.gvstats_rec.n_nontp_retries_0"
 	Set gtmtypes("unix_db_info",50,"off")=360
 	Set gtmtypes("unix_db_info",50,"len")=8
 	Set gtmtypes("unix_db_info",50,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_nontp_retries_1")=50
-	Set gtmtypes("unix_db_info",51,"name")="unix_db_info.s_addrs.gvstats_rec.n_nontp_retries_2"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_nontp_retries_0")=50
+	Set gtmtypes("unix_db_info",51,"name")="unix_db_info.s_addrs.gvstats_rec.n_nontp_retries_1"
 	Set gtmtypes("unix_db_info",51,"off")=368
 	Set gtmtypes("unix_db_info",51,"len")=8
 	Set gtmtypes("unix_db_info",51,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_nontp_retries_2")=51
-	Set gtmtypes("unix_db_info",52,"name")="unix_db_info.s_addrs.gvstats_rec.n_nontp_retries_3"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_nontp_retries_1")=51
+	Set gtmtypes("unix_db_info",52,"name")="unix_db_info.s_addrs.gvstats_rec.n_nontp_retries_2"
 	Set gtmtypes("unix_db_info",52,"off")=376
 	Set gtmtypes("unix_db_info",52,"len")=8
 	Set gtmtypes("unix_db_info",52,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_nontp_retries_3")=52
-	Set gtmtypes("unix_db_info",53,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_readwrite"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_nontp_retries_2")=52
+	Set gtmtypes("unix_db_info",53,"name")="unix_db_info.s_addrs.gvstats_rec.n_nontp_retries_3"
 	Set gtmtypes("unix_db_info",53,"off")=384
 	Set gtmtypes("unix_db_info",53,"len")=8
 	Set gtmtypes("unix_db_info",53,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_readwrite")=53
-	Set gtmtypes("unix_db_info",54,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_readonly"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_nontp_retries_3")=53
+	Set gtmtypes("unix_db_info",54,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_readwrite"
 	Set gtmtypes("unix_db_info",54,"off")=392
 	Set gtmtypes("unix_db_info",54,"len")=8
 	Set gtmtypes("unix_db_info",54,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_readonly")=54
-	Set gtmtypes("unix_db_info",55,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_rolledback"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_readwrite")=54
+	Set gtmtypes("unix_db_info",55,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_readonly"
 	Set gtmtypes("unix_db_info",55,"off")=400
 	Set gtmtypes("unix_db_info",55,"len")=8
 	Set gtmtypes("unix_db_info",55,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_rolledback")=55
-	Set gtmtypes("unix_db_info",56,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_blkwrite"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_readonly")=55
+	Set gtmtypes("unix_db_info",56,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_rolledback"
 	Set gtmtypes("unix_db_info",56,"off")=408
 	Set gtmtypes("unix_db_info",56,"len")=8
 	Set gtmtypes("unix_db_info",56,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_blkwrite")=56
-	Set gtmtypes("unix_db_info",57,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_blkread"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_rolledback")=56
+	Set gtmtypes("unix_db_info",57,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_blkwrite"
 	Set gtmtypes("unix_db_info",57,"off")=416
 	Set gtmtypes("unix_db_info",57,"len")=8
 	Set gtmtypes("unix_db_info",57,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_blkread")=57
-	Set gtmtypes("unix_db_info",58,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_tot_retries_0"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_blkwrite")=57
+	Set gtmtypes("unix_db_info",58,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_blkread"
 	Set gtmtypes("unix_db_info",58,"off")=424
 	Set gtmtypes("unix_db_info",58,"len")=8
 	Set gtmtypes("unix_db_info",58,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_tot_retries_0")=58
-	Set gtmtypes("unix_db_info",59,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_tot_retries_1"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_blkread")=58
+	Set gtmtypes("unix_db_info",59,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_tot_retries_0"
 	Set gtmtypes("unix_db_info",59,"off")=432
 	Set gtmtypes("unix_db_info",59,"len")=8
 	Set gtmtypes("unix_db_info",59,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_tot_retries_1")=59
-	Set gtmtypes("unix_db_info",60,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_tot_retries_2"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_tot_retries_0")=59
+	Set gtmtypes("unix_db_info",60,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_tot_retries_1"
 	Set gtmtypes("unix_db_info",60,"off")=440
 	Set gtmtypes("unix_db_info",60,"len")=8
 	Set gtmtypes("unix_db_info",60,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_tot_retries_2")=60
-	Set gtmtypes("unix_db_info",61,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_tot_retries_3"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_tot_retries_1")=60
+	Set gtmtypes("unix_db_info",61,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_tot_retries_2"
 	Set gtmtypes("unix_db_info",61,"off")=448
 	Set gtmtypes("unix_db_info",61,"len")=8
 	Set gtmtypes("unix_db_info",61,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_tot_retries_3")=61
-	Set gtmtypes("unix_db_info",62,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_tot_retries_4"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_tot_retries_2")=61
+	Set gtmtypes("unix_db_info",62,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_tot_retries_3"
 	Set gtmtypes("unix_db_info",62,"off")=456
 	Set gtmtypes("unix_db_info",62,"len")=8
 	Set gtmtypes("unix_db_info",62,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_tot_retries_4")=62
-	Set gtmtypes("unix_db_info",63,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_cnflct_retries_0"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_tot_retries_3")=62
+	Set gtmtypes("unix_db_info",63,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_tot_retries_4"
 	Set gtmtypes("unix_db_info",63,"off")=464
 	Set gtmtypes("unix_db_info",63,"len")=8
 	Set gtmtypes("unix_db_info",63,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_cnflct_retries_0")=63
-	Set gtmtypes("unix_db_info",64,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_cnflct_retries_1"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_tot_retries_4")=63
+	Set gtmtypes("unix_db_info",64,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_cnflct_retries_0"
 	Set gtmtypes("unix_db_info",64,"off")=472
 	Set gtmtypes("unix_db_info",64,"len")=8
 	Set gtmtypes("unix_db_info",64,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_cnflct_retries_1")=64
-	Set gtmtypes("unix_db_info",65,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_cnflct_retries_2"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_cnflct_retries_0")=64
+	Set gtmtypes("unix_db_info",65,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_cnflct_retries_1"
 	Set gtmtypes("unix_db_info",65,"off")=480
 	Set gtmtypes("unix_db_info",65,"len")=8
 	Set gtmtypes("unix_db_info",65,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_cnflct_retries_2")=65
-	Set gtmtypes("unix_db_info",66,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_cnflct_retries_3"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_cnflct_retries_1")=65
+	Set gtmtypes("unix_db_info",66,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_cnflct_retries_2"
 	Set gtmtypes("unix_db_info",66,"off")=488
 	Set gtmtypes("unix_db_info",66,"len")=8
 	Set gtmtypes("unix_db_info",66,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_cnflct_retries_3")=66
-	Set gtmtypes("unix_db_info",67,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_cnflct_retries_4"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_cnflct_retries_2")=66
+	Set gtmtypes("unix_db_info",67,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_cnflct_retries_3"
 	Set gtmtypes("unix_db_info",67,"off")=496
 	Set gtmtypes("unix_db_info",67,"len")=8
 	Set gtmtypes("unix_db_info",67,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_cnflct_retries_4")=67
-	Set gtmtypes("unix_db_info",68,"name")="unix_db_info.s_addrs.gvstats_rec.n_ztrigger"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_cnflct_retries_3")=67
+	Set gtmtypes("unix_db_info",68,"name")="unix_db_info.s_addrs.gvstats_rec.n_tp_cnflct_retries_4"
 	Set gtmtypes("unix_db_info",68,"off")=504
 	Set gtmtypes("unix_db_info",68,"len")=8
 	Set gtmtypes("unix_db_info",68,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_ztrigger")=68
-	Set gtmtypes("unix_db_info",69,"name")="unix_db_info.s_addrs.gvstats_rec.n_db_flush"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_tp_cnflct_retries_4")=68
+	Set gtmtypes("unix_db_info",69,"name")="unix_db_info.s_addrs.gvstats_rec.n_ztrigger"
 	Set gtmtypes("unix_db_info",69,"off")=512
 	Set gtmtypes("unix_db_info",69,"len")=8
 	Set gtmtypes("unix_db_info",69,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_db_flush")=69
-	Set gtmtypes("unix_db_info",70,"name")="unix_db_info.s_addrs.gvstats_rec.n_db_fsync"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_ztrigger")=69
+	Set gtmtypes("unix_db_info",70,"name")="unix_db_info.s_addrs.gvstats_rec.n_db_flush"
 	Set gtmtypes("unix_db_info",70,"off")=520
 	Set gtmtypes("unix_db_info",70,"len")=8
 	Set gtmtypes("unix_db_info",70,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_db_fsync")=70
-	Set gtmtypes("unix_db_info",71,"name")="unix_db_info.s_addrs.gvstats_rec.n_jnl_flush"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_db_flush")=70
+	Set gtmtypes("unix_db_info",71,"name")="unix_db_info.s_addrs.gvstats_rec.n_db_fsync"
 	Set gtmtypes("unix_db_info",71,"off")=528
 	Set gtmtypes("unix_db_info",71,"len")=8
 	Set gtmtypes("unix_db_info",71,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jnl_flush")=71
-	Set gtmtypes("unix_db_info",72,"name")="unix_db_info.s_addrs.gvstats_rec.n_jnl_fsync"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_db_fsync")=71
+	Set gtmtypes("unix_db_info",72,"name")="unix_db_info.s_addrs.gvstats_rec.n_jnl_flush"
 	Set gtmtypes("unix_db_info",72,"off")=536
 	Set gtmtypes("unix_db_info",72,"len")=8
 	Set gtmtypes("unix_db_info",72,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jnl_fsync")=72
-	Set gtmtypes("unix_db_info",73,"name")="unix_db_info.s_addrs.gvstats_rec.n_jbuff_bytes"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jnl_flush")=72
+	Set gtmtypes("unix_db_info",73,"name")="unix_db_info.s_addrs.gvstats_rec.n_jnl_fsync"
 	Set gtmtypes("unix_db_info",73,"off")=544
 	Set gtmtypes("unix_db_info",73,"len")=8
 	Set gtmtypes("unix_db_info",73,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jbuff_bytes")=73
-	Set gtmtypes("unix_db_info",74,"name")="unix_db_info.s_addrs.gvstats_rec.n_jfile_bytes"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jnl_fsync")=73
+	Set gtmtypes("unix_db_info",74,"name")="unix_db_info.s_addrs.gvstats_rec.n_jbuff_bytes"
 	Set gtmtypes("unix_db_info",74,"off")=552
 	Set gtmtypes("unix_db_info",74,"len")=8
 	Set gtmtypes("unix_db_info",74,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jfile_bytes")=74
-	Set gtmtypes("unix_db_info",75,"name")="unix_db_info.s_addrs.gvstats_rec.n_jfile_writes"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jbuff_bytes")=74
+	Set gtmtypes("unix_db_info",75,"name")="unix_db_info.s_addrs.gvstats_rec.n_jfile_bytes"
 	Set gtmtypes("unix_db_info",75,"off")=560
 	Set gtmtypes("unix_db_info",75,"len")=8
 	Set gtmtypes("unix_db_info",75,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jfile_writes")=75
-	Set gtmtypes("unix_db_info",76,"name")="unix_db_info.s_addrs.gvstats_rec.n_jrec_logical"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jfile_bytes")=75
+	Set gtmtypes("unix_db_info",76,"name")="unix_db_info.s_addrs.gvstats_rec.n_jfile_writes"
 	Set gtmtypes("unix_db_info",76,"off")=568
 	Set gtmtypes("unix_db_info",76,"len")=8
 	Set gtmtypes("unix_db_info",76,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jrec_logical")=76
-	Set gtmtypes("unix_db_info",77,"name")="unix_db_info.s_addrs.gvstats_rec.n_jrec_pblk"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jfile_writes")=76
+	Set gtmtypes("unix_db_info",77,"name")="unix_db_info.s_addrs.gvstats_rec.n_jrec_logical"
 	Set gtmtypes("unix_db_info",77,"off")=576
 	Set gtmtypes("unix_db_info",77,"len")=8
 	Set gtmtypes("unix_db_info",77,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jrec_pblk")=77
-	Set gtmtypes("unix_db_info",78,"name")="unix_db_info.s_addrs.gvstats_rec.n_jrec_epoch_regular"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jrec_logical")=77
+	Set gtmtypes("unix_db_info",78,"name")="unix_db_info.s_addrs.gvstats_rec.n_jrec_pblk"
 	Set gtmtypes("unix_db_info",78,"off")=584
 	Set gtmtypes("unix_db_info",78,"len")=8
 	Set gtmtypes("unix_db_info",78,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jrec_epoch_regular")=78
-	Set gtmtypes("unix_db_info",79,"name")="unix_db_info.s_addrs.gvstats_rec.n_jrec_epoch_idle"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jrec_pblk")=78
+	Set gtmtypes("unix_db_info",79,"name")="unix_db_info.s_addrs.gvstats_rec.n_jrec_epoch_regular"
 	Set gtmtypes("unix_db_info",79,"off")=592
 	Set gtmtypes("unix_db_info",79,"len")=8
 	Set gtmtypes("unix_db_info",79,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jrec_epoch_idle")=79
-	Set gtmtypes("unix_db_info",80,"name")="unix_db_info.s_addrs.gvstats_rec.n_jrec_other"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jrec_epoch_regular")=79
+	Set gtmtypes("unix_db_info",80,"name")="unix_db_info.s_addrs.gvstats_rec.n_jrec_epoch_idle"
 	Set gtmtypes("unix_db_info",80,"off")=600
 	Set gtmtypes("unix_db_info",80,"len")=8
 	Set gtmtypes("unix_db_info",80,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jrec_other")=80
-	Set gtmtypes("unix_db_info",81,"name")="unix_db_info.s_addrs.gvstats_rec.n_jnl_extends"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jrec_epoch_idle")=80
+	Set gtmtypes("unix_db_info",81,"name")="unix_db_info.s_addrs.gvstats_rec.n_jrec_other"
 	Set gtmtypes("unix_db_info",81,"off")=608
 	Set gtmtypes("unix_db_info",81,"len")=8
 	Set gtmtypes("unix_db_info",81,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jnl_extends")=81
-	Set gtmtypes("unix_db_info",82,"name")="unix_db_info.s_addrs.gvstats_rec.n_db_extends"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jrec_other")=81
+	Set gtmtypes("unix_db_info",82,"name")="unix_db_info.s_addrs.gvstats_rec.n_jnl_extends"
 	Set gtmtypes("unix_db_info",82,"off")=616
 	Set gtmtypes("unix_db_info",82,"len")=8
 	Set gtmtypes("unix_db_info",82,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_db_extends")=82
-	Set gtmtypes("unix_db_info",83,"name")="unix_db_info.s_addrs.gvstats_rec.n_crit_success"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_jnl_extends")=82
+	Set gtmtypes("unix_db_info",83,"name")="unix_db_info.s_addrs.gvstats_rec.n_db_extends"
 	Set gtmtypes("unix_db_info",83,"off")=624
 	Set gtmtypes("unix_db_info",83,"len")=8
 	Set gtmtypes("unix_db_info",83,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_crit_success")=83
-	Set gtmtypes("unix_db_info",84,"name")="unix_db_info.s_addrs.gvstats_rec.n_crits_in_epch"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_db_extends")=83
+	Set gtmtypes("unix_db_info",84,"name")="unix_db_info.s_addrs.gvstats_rec.n_crit_success"
 	Set gtmtypes("unix_db_info",84,"off")=632
 	Set gtmtypes("unix_db_info",84,"len")=8
 	Set gtmtypes("unix_db_info",84,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_crits_in_epch")=84
-	Set gtmtypes("unix_db_info",85,"name")="unix_db_info.s_addrs.gvstats_rec.sq_crit_failed"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_crit_success")=84
+	Set gtmtypes("unix_db_info",85,"name")="unix_db_info.s_addrs.gvstats_rec.n_crits_in_epch"
 	Set gtmtypes("unix_db_info",85,"off")=640
 	Set gtmtypes("unix_db_info",85,"len")=8
 	Set gtmtypes("unix_db_info",85,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.sq_crit_failed")=85
-	Set gtmtypes("unix_db_info",86,"name")="unix_db_info.s_addrs.gvstats_rec.n_crit_failed"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_crits_in_epch")=85
+	Set gtmtypes("unix_db_info",86,"name")="unix_db_info.s_addrs.gvstats_rec.sq_crit_failed"
 	Set gtmtypes("unix_db_info",86,"off")=648
 	Set gtmtypes("unix_db_info",86,"len")=8
 	Set gtmtypes("unix_db_info",86,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_crit_failed")=86
-	Set gtmtypes("unix_db_info",87,"name")="unix_db_info.s_addrs.gvstats_rec.sq_crit_que_slps"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.sq_crit_failed")=86
+	Set gtmtypes("unix_db_info",87,"name")="unix_db_info.s_addrs.gvstats_rec.n_crit_failed"
 	Set gtmtypes("unix_db_info",87,"off")=656
 	Set gtmtypes("unix_db_info",87,"len")=8
 	Set gtmtypes("unix_db_info",87,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.sq_crit_que_slps")=87
-	Set gtmtypes("unix_db_info",88,"name")="unix_db_info.s_addrs.gvstats_rec.n_crit_que_slps"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_crit_failed")=87
+	Set gtmtypes("unix_db_info",88,"name")="unix_db_info.s_addrs.gvstats_rec.sq_crit_que_slps"
 	Set gtmtypes("unix_db_info",88,"off")=664
 	Set gtmtypes("unix_db_info",88,"len")=8
 	Set gtmtypes("unix_db_info",88,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_crit_que_slps")=88
-	Set gtmtypes("unix_db_info",89,"name")="unix_db_info.s_addrs.gvstats_rec.sq_crit_yields"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.sq_crit_que_slps")=88
+	Set gtmtypes("unix_db_info",89,"name")="unix_db_info.s_addrs.gvstats_rec.n_crit_que_slps"
 	Set gtmtypes("unix_db_info",89,"off")=672
 	Set gtmtypes("unix_db_info",89,"len")=8
 	Set gtmtypes("unix_db_info",89,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.sq_crit_yields")=89
-	Set gtmtypes("unix_db_info",90,"name")="unix_db_info.s_addrs.gvstats_rec.n_crit_yields"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_crit_que_slps")=89
+	Set gtmtypes("unix_db_info",90,"name")="unix_db_info.s_addrs.gvstats_rec.sq_crit_yields"
 	Set gtmtypes("unix_db_info",90,"off")=680
 	Set gtmtypes("unix_db_info",90,"len")=8
 	Set gtmtypes("unix_db_info",90,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_crit_yields")=90
-	Set gtmtypes("unix_db_info",91,"name")="unix_db_info.s_addrs.dbsync_timer_tn"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.sq_crit_yields")=90
+	Set gtmtypes("unix_db_info",91,"name")="unix_db_info.s_addrs.gvstats_rec.n_crit_yields"
 	Set gtmtypes("unix_db_info",91,"off")=688
 	Set gtmtypes("unix_db_info",91,"len")=8
 	Set gtmtypes("unix_db_info",91,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.dbsync_timer_tn")=91
-	Set gtmtypes("unix_db_info",92,"name")="unix_db_info.s_addrs.fullblockwrite_len"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_crit_yields")=91
+	Set gtmtypes("unix_db_info",92,"name")="unix_db_info.s_addrs.gvstats_rec.n_clean2dirty"
 	Set gtmtypes("unix_db_info",92,"off")=696
 	Set gtmtypes("unix_db_info",92,"len")=8
-	Set gtmtypes("unix_db_info",92,"type")="size_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.fullblockwrite_len")=92
-	Set gtmtypes("unix_db_info",93,"name")="unix_db_info.s_addrs.total_blks"
+	Set gtmtypes("unix_db_info",92,"type")="uint64_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gvstats_rec.n_clean2dirty")=92
+	Set gtmtypes("unix_db_info",93,"name")="unix_db_info.s_addrs.dbsync_timer_tn"
 	Set gtmtypes("unix_db_info",93,"off")=704
-	Set gtmtypes("unix_db_info",93,"len")=4
-	Set gtmtypes("unix_db_info",93,"type")="unsigned-int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.total_blks")=93
-	Set gtmtypes("unix_db_info",94,"name")="unix_db_info.s_addrs.prev_free_blks"
-	Set gtmtypes("unix_db_info",94,"off")=708
-	Set gtmtypes("unix_db_info",94,"len")=4
-	Set gtmtypes("unix_db_info",94,"type")="unsigned-int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.prev_free_blks")=94
-	Set gtmtypes("unix_db_info",95,"name")="unix_db_info.s_addrs.timer"
-	Set gtmtypes("unix_db_info",95,"off")=712
-	Set gtmtypes("unix_db_info",95,"len")=4
-	Set gtmtypes("unix_db_info",95,"type")="unsigned-int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.timer")=95
-	Set gtmtypes("unix_db_info",96,"name")="unix_db_info.s_addrs.in_wtstart"
-	Set gtmtypes("unix_db_info",96,"off")=716
-	Set gtmtypes("unix_db_info",96,"len")=4
-	Set gtmtypes("unix_db_info",96,"type")="unsigned-int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.in_wtstart")=96
-	Set gtmtypes("unix_db_info",97,"name")="unix_db_info.s_addrs.now_crit"
-	Set gtmtypes("unix_db_info",97,"off")=720
+	Set gtmtypes("unix_db_info",93,"len")=8
+	Set gtmtypes("unix_db_info",93,"type")="uint64_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.dbsync_timer_tn")=93
+	Set gtmtypes("unix_db_info",94,"name")="unix_db_info.s_addrs.our_midnite"
+	Set gtmtypes("unix_db_info",94,"off")=712
+	Set gtmtypes("unix_db_info",94,"len")=8
+	Set gtmtypes("unix_db_info",94,"type")="addr"
+	Set gtmtypfldindx("unix_db_info","s_addrs.our_midnite")=94
+	Set gtmtypes("unix_db_info",95,"name")="unix_db_info.s_addrs.fullblockwrite_len"
+	Set gtmtypes("unix_db_info",95,"off")=720
+	Set gtmtypes("unix_db_info",95,"len")=8
+	Set gtmtypes("unix_db_info",95,"type")="size_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.fullblockwrite_len")=95
+	Set gtmtypes("unix_db_info",96,"name")="unix_db_info.s_addrs.our_lru_cache_rec_off"
+	Set gtmtypes("unix_db_info",96,"off")=728
+	Set gtmtypes("unix_db_info",96,"len")=8
+	Set gtmtypes("unix_db_info",96,"type")="intptr_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.our_lru_cache_rec_off")=96
+	Set gtmtypes("unix_db_info",97,"name")="unix_db_info.s_addrs.total_blks"
+	Set gtmtypes("unix_db_info",97,"off")=736
 	Set gtmtypes("unix_db_info",97,"len")=4
 	Set gtmtypes("unix_db_info",97,"type")="unsigned-int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.now_crit")=97
-	Set gtmtypes("unix_db_info",98,"name")="unix_db_info.s_addrs.wbuf_dqd"
-	Set gtmtypes("unix_db_info",98,"off")=724
+	Set gtmtypfldindx("unix_db_info","s_addrs.total_blks")=97
+	Set gtmtypes("unix_db_info",98,"name")="unix_db_info.s_addrs.prev_free_blks"
+	Set gtmtypes("unix_db_info",98,"off")=740
 	Set gtmtypes("unix_db_info",98,"len")=4
 	Set gtmtypes("unix_db_info",98,"type")="unsigned-int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.wbuf_dqd")=98
-	Set gtmtypes("unix_db_info",99,"name")="unix_db_info.s_addrs.stale_defer"
-	Set gtmtypes("unix_db_info",99,"off")=728
+	Set gtmtypfldindx("unix_db_info","s_addrs.prev_free_blks")=98
+	Set gtmtypes("unix_db_info",99,"name")="unix_db_info.s_addrs.timer"
+	Set gtmtypes("unix_db_info",99,"off")=744
 	Set gtmtypes("unix_db_info",99,"len")=4
 	Set gtmtypes("unix_db_info",99,"type")="unsigned-int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.stale_defer")=99
-	Set gtmtypes("unix_db_info",100,"name")="unix_db_info.s_addrs.freeze"
-	Set gtmtypes("unix_db_info",100,"off")=732
+	Set gtmtypfldindx("unix_db_info","s_addrs.timer")=99
+	Set gtmtypes("unix_db_info",100,"name")="unix_db_info.s_addrs.in_wtstart"
+	Set gtmtypes("unix_db_info",100,"off")=748
 	Set gtmtypes("unix_db_info",100,"len")=4
-	Set gtmtypes("unix_db_info",100,"type")="boolean_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.freeze")=100
-	Set gtmtypes("unix_db_info",101,"name")="unix_db_info.s_addrs.dbsync_timer"
-	Set gtmtypes("unix_db_info",101,"off")=736
+	Set gtmtypes("unix_db_info",100,"type")="unsigned-int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.in_wtstart")=100
+	Set gtmtypes("unix_db_info",101,"name")="unix_db_info.s_addrs.now_crit"
+	Set gtmtypes("unix_db_info",101,"off")=752
 	Set gtmtypes("unix_db_info",101,"len")=4
-	Set gtmtypes("unix_db_info",101,"type")="boolean_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.dbsync_timer")=101
-	Set gtmtypes("unix_db_info",102,"name")="unix_db_info.s_addrs.reorg_last_dest"
-	Set gtmtypes("unix_db_info",102,"off")=740
+	Set gtmtypes("unix_db_info",101,"type")="unsigned-int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.now_crit")=101
+	Set gtmtypes("unix_db_info",102,"name")="unix_db_info.s_addrs.wbuf_dqd"
+	Set gtmtypes("unix_db_info",102,"off")=756
 	Set gtmtypes("unix_db_info",102,"len")=4
-	Set gtmtypes("unix_db_info",102,"type")="int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.reorg_last_dest")=102
-	Set gtmtypes("unix_db_info",103,"name")="unix_db_info.s_addrs.jnl_before_image"
-	Set gtmtypes("unix_db_info",103,"off")=744
+	Set gtmtypes("unix_db_info",102,"type")="unsigned-int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.wbuf_dqd")=102
+	Set gtmtypes("unix_db_info",103,"name")="unix_db_info.s_addrs.stale_defer"
+	Set gtmtypes("unix_db_info",103,"off")=760
 	Set gtmtypes("unix_db_info",103,"len")=4
-	Set gtmtypes("unix_db_info",103,"type")="boolean_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.jnl_before_image")=103
-	Set gtmtypes("unix_db_info",104,"name")="unix_db_info.s_addrs.read_write"
-	Set gtmtypes("unix_db_info",104,"off")=748
+	Set gtmtypes("unix_db_info",103,"type")="unsigned-int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.stale_defer")=103
+	Set gtmtypes("unix_db_info",104,"name")="unix_db_info.s_addrs.freeze"
+	Set gtmtypes("unix_db_info",104,"off")=764
 	Set gtmtypes("unix_db_info",104,"len")=4
 	Set gtmtypes("unix_db_info",104,"type")="boolean_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.read_write")=104
-	Set gtmtypes("unix_db_info",105,"name")="unix_db_info.s_addrs.persistent_freeze"
-	Set gtmtypes("unix_db_info",105,"off")=752
+	Set gtmtypfldindx("unix_db_info","s_addrs.freeze")=104
+	Set gtmtypes("unix_db_info",105,"name")="unix_db_info.s_addrs.dbsync_timer"
+	Set gtmtypes("unix_db_info",105,"off")=768
 	Set gtmtypes("unix_db_info",105,"len")=4
 	Set gtmtypes("unix_db_info",105,"type")="boolean_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.persistent_freeze")=105
-	Set gtmtypes("unix_db_info",106,"name")="unix_db_info.s_addrs.pblk_align_jrecsize"
-	Set gtmtypes("unix_db_info",106,"off")=756
+	Set gtmtypfldindx("unix_db_info","s_addrs.dbsync_timer")=105
+	Set gtmtypes("unix_db_info",106,"name")="unix_db_info.s_addrs.reorg_last_dest"
+	Set gtmtypes("unix_db_info",106,"off")=772
 	Set gtmtypes("unix_db_info",106,"len")=4
 	Set gtmtypes("unix_db_info",106,"type")="int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.pblk_align_jrecsize")=106
-	Set gtmtypes("unix_db_info",107,"name")="unix_db_info.s_addrs.min_total_tpjnl_rec_size"
-	Set gtmtypes("unix_db_info",107,"off")=760
+	Set gtmtypfldindx("unix_db_info","s_addrs.reorg_last_dest")=106
+	Set gtmtypes("unix_db_info",107,"name")="unix_db_info.s_addrs.jnl_before_image"
+	Set gtmtypes("unix_db_info",107,"off")=776
 	Set gtmtypes("unix_db_info",107,"len")=4
-	Set gtmtypes("unix_db_info",107,"type")="int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.min_total_tpjnl_rec_size")=107
-	Set gtmtypes("unix_db_info",108,"name")="unix_db_info.s_addrs.min_total_nontpjnl_rec_size"
-	Set gtmtypes("unix_db_info",108,"off")=764
+	Set gtmtypes("unix_db_info",107,"type")="boolean_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.jnl_before_image")=107
+	Set gtmtypes("unix_db_info",108,"name")="unix_db_info.s_addrs.read_write"
+	Set gtmtypes("unix_db_info",108,"off")=780
 	Set gtmtypes("unix_db_info",108,"len")=4
-	Set gtmtypes("unix_db_info",108,"type")="int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.min_total_nontpjnl_rec_size")=108
-	Set gtmtypes("unix_db_info",109,"name")="unix_db_info.s_addrs.jnl_state"
-	Set gtmtypes("unix_db_info",109,"off")=768
+	Set gtmtypes("unix_db_info",108,"type")="boolean_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.read_write")=108
+	Set gtmtypes("unix_db_info",109,"name")="unix_db_info.s_addrs.orig_read_write"
+	Set gtmtypes("unix_db_info",109,"off")=784
 	Set gtmtypes("unix_db_info",109,"len")=4
-	Set gtmtypes("unix_db_info",109,"type")="int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.jnl_state")=109
-	Set gtmtypes("unix_db_info",110,"name")="unix_db_info.s_addrs.repl_state"
-	Set gtmtypes("unix_db_info",110,"off")=772
+	Set gtmtypes("unix_db_info",109,"type")="boolean_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.orig_read_write")=109
+	Set gtmtypes("unix_db_info",110,"name")="unix_db_info.s_addrs.persistent_freeze"
+	Set gtmtypes("unix_db_info",110,"off")=788
 	Set gtmtypes("unix_db_info",110,"len")=4
-	Set gtmtypes("unix_db_info",110,"type")="int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.repl_state")=110
-	Set gtmtypes("unix_db_info",111,"name")="unix_db_info.s_addrs.crit_check_cycle"
-	Set gtmtypes("unix_db_info",111,"off")=776
+	Set gtmtypes("unix_db_info",110,"type")="boolean_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.persistent_freeze")=110
+	Set gtmtypes("unix_db_info",111,"name")="unix_db_info.s_addrs.pblk_align_jrecsize"
+	Set gtmtypes("unix_db_info",111,"off")=792
 	Set gtmtypes("unix_db_info",111,"len")=4
-	Set gtmtypes("unix_db_info",111,"type")="unsigned-int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.crit_check_cycle")=111
-	Set gtmtypes("unix_db_info",112,"name")="unix_db_info.s_addrs.backup_in_prog"
-	Set gtmtypes("unix_db_info",112,"off")=780
+	Set gtmtypes("unix_db_info",111,"type")="int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.pblk_align_jrecsize")=111
+	Set gtmtypes("unix_db_info",112,"name")="unix_db_info.s_addrs.min_total_tpjnl_rec_size"
+	Set gtmtypes("unix_db_info",112,"off")=796
 	Set gtmtypes("unix_db_info",112,"len")=4
 	Set gtmtypes("unix_db_info",112,"type")="int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.backup_in_prog")=112
-	Set gtmtypes("unix_db_info",113,"name")="unix_db_info.s_addrs.snapshot_in_prog"
-	Set gtmtypes("unix_db_info",113,"off")=784
+	Set gtmtypfldindx("unix_db_info","s_addrs.min_total_tpjnl_rec_size")=112
+	Set gtmtypes("unix_db_info",113,"name")="unix_db_info.s_addrs.min_total_nontpjnl_rec_size"
+	Set gtmtypes("unix_db_info",113,"off")=800
 	Set gtmtypes("unix_db_info",113,"len")=4
-	Set gtmtypes("unix_db_info",113,"type")="boolean_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.snapshot_in_prog")=113
-	Set gtmtypes("unix_db_info",114,"name")="unix_db_info.s_addrs.ref_cnt"
-	Set gtmtypes("unix_db_info",114,"off")=788
+	Set gtmtypes("unix_db_info",113,"type")="int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.min_total_nontpjnl_rec_size")=113
+	Set gtmtypes("unix_db_info",114,"name")="unix_db_info.s_addrs.jnl_state"
+	Set gtmtypes("unix_db_info",114,"off")=804
 	Set gtmtypes("unix_db_info",114,"len")=4
 	Set gtmtypes("unix_db_info",114,"type")="int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.ref_cnt")=114
-	Set gtmtypes("unix_db_info",115,"name")="unix_db_info.s_addrs.fid_index"
-	Set gtmtypes("unix_db_info",115,"off")=792
+	Set gtmtypfldindx("unix_db_info","s_addrs.jnl_state")=114
+	Set gtmtypes("unix_db_info",115,"name")="unix_db_info.s_addrs.repl_state"
+	Set gtmtypes("unix_db_info",115,"off")=808
 	Set gtmtypes("unix_db_info",115,"len")=4
 	Set gtmtypes("unix_db_info",115,"type")="int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.fid_index")=115
-	Set gtmtypes("unix_db_info",116,"name")="unix_db_info.s_addrs.do_fullblockwrites"
-	Set gtmtypes("unix_db_info",116,"off")=796
+	Set gtmtypfldindx("unix_db_info","s_addrs.repl_state")=115
+	Set gtmtypes("unix_db_info",116,"name")="unix_db_info.s_addrs.crit_check_cycle"
+	Set gtmtypes("unix_db_info",116,"off")=812
 	Set gtmtypes("unix_db_info",116,"len")=4
-	Set gtmtypes("unix_db_info",116,"type")="boolean_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.do_fullblockwrites")=116
-	Set gtmtypes("unix_db_info",117,"name")="unix_db_info.s_addrs.regnum"
-	Set gtmtypes("unix_db_info",117,"off")=800
+	Set gtmtypes("unix_db_info",116,"type")="unsigned-int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.crit_check_cycle")=116
+	Set gtmtypes("unix_db_info",117,"name")="unix_db_info.s_addrs.backup_in_prog"
+	Set gtmtypes("unix_db_info",117,"off")=816
 	Set gtmtypes("unix_db_info",117,"len")=4
 	Set gtmtypes("unix_db_info",117,"type")="int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.regnum")=117
-	Set gtmtypes("unix_db_info",118,"name")="unix_db_info.s_addrs.n_pre_read_trigger"
-	Set gtmtypes("unix_db_info",118,"off")=804
+	Set gtmtypfldindx("unix_db_info","s_addrs.backup_in_prog")=117
+	Set gtmtypes("unix_db_info",118,"name")="unix_db_info.s_addrs.snapshot_in_prog"
+	Set gtmtypes("unix_db_info",118,"off")=820
 	Set gtmtypes("unix_db_info",118,"len")=4
-	Set gtmtypes("unix_db_info",118,"type")="int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.n_pre_read_trigger")=118
-	Set gtmtypes("unix_db_info",119,"name")="unix_db_info.s_addrs.jnlpool_validate_check"
-	Set gtmtypes("unix_db_info",119,"off")=808
+	Set gtmtypes("unix_db_info",118,"type")="boolean_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.snapshot_in_prog")=118
+	Set gtmtypes("unix_db_info",119,"name")="unix_db_info.s_addrs.ref_cnt"
+	Set gtmtypes("unix_db_info",119,"off")=824
 	Set gtmtypes("unix_db_info",119,"len")=4
-	Set gtmtypes("unix_db_info",119,"type")="unsigned-int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.jnlpool_validate_check")=119
-	Set gtmtypes("unix_db_info",120,"name")="unix_db_info.s_addrs.regcnt"
-	Set gtmtypes("unix_db_info",120,"off")=812
+	Set gtmtypes("unix_db_info",119,"type")="int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.ref_cnt")=119
+	Set gtmtypes("unix_db_info",120,"name")="unix_db_info.s_addrs.fid_index"
+	Set gtmtypes("unix_db_info",120,"off")=828
 	Set gtmtypes("unix_db_info",120,"len")=4
 	Set gtmtypes("unix_db_info",120,"type")="int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.regcnt")=120
-	Set gtmtypes("unix_db_info",121,"name")="unix_db_info.s_addrs.t_commit_crit"
-	Set gtmtypes("unix_db_info",121,"off")=816
+	Set gtmtypfldindx("unix_db_info","s_addrs.fid_index")=120
+	Set gtmtypes("unix_db_info",121,"name")="unix_db_info.s_addrs.do_fullblockwrites"
+	Set gtmtypes("unix_db_info",121,"off")=832
 	Set gtmtypes("unix_db_info",121,"len")=4
 	Set gtmtypes("unix_db_info",121,"type")="boolean_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.t_commit_crit")=121
-	Set gtmtypes("unix_db_info",122,"name")="unix_db_info.s_addrs.wcs_pidcnt_incremented"
-	Set gtmtypes("unix_db_info",122,"off")=820
+	Set gtmtypfldindx("unix_db_info","s_addrs.do_fullblockwrites")=121
+	Set gtmtypes("unix_db_info",122,"name")="unix_db_info.s_addrs.regnum"
+	Set gtmtypes("unix_db_info",122,"off")=836
 	Set gtmtypes("unix_db_info",122,"len")=4
-	Set gtmtypes("unix_db_info",122,"type")="boolean_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.wcs_pidcnt_incremented")=122
-	Set gtmtypes("unix_db_info",123,"name")="unix_db_info.s_addrs.incr_db_trigger_cycle"
-	Set gtmtypes("unix_db_info",123,"off")=824
+	Set gtmtypes("unix_db_info",122,"type")="int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.regnum")=122
+	Set gtmtypes("unix_db_info",123,"name")="unix_db_info.s_addrs.n_pre_read_trigger"
+	Set gtmtypes("unix_db_info",123,"off")=840
 	Set gtmtypes("unix_db_info",123,"len")=4
-	Set gtmtypes("unix_db_info",123,"type")="boolean_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.incr_db_trigger_cycle")=123
-	Set gtmtypes("unix_db_info",124,"name")="unix_db_info.s_addrs.db_trigger_cycle"
-	Set gtmtypes("unix_db_info",124,"off")=828
+	Set gtmtypes("unix_db_info",123,"type")="int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.n_pre_read_trigger")=123
+	Set gtmtypes("unix_db_info",124,"name")="unix_db_info.s_addrs.jnlpool_validate_check"
+	Set gtmtypes("unix_db_info",124,"off")=844
 	Set gtmtypes("unix_db_info",124,"len")=4
 	Set gtmtypes("unix_db_info",124,"type")="unsigned-int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.db_trigger_cycle")=124
-	Set gtmtypes("unix_db_info",125,"name")="unix_db_info.s_addrs.db_dztrigger_cycle"
-	Set gtmtypes("unix_db_info",125,"off")=832
+	Set gtmtypfldindx("unix_db_info","s_addrs.jnlpool_validate_check")=124
+	Set gtmtypes("unix_db_info",125,"name")="unix_db_info.s_addrs.regcnt"
+	Set gtmtypes("unix_db_info",125,"off")=848
 	Set gtmtypes("unix_db_info",125,"len")=4
-	Set gtmtypes("unix_db_info",125,"type")="unsigned-int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.db_dztrigger_cycle")=125
-	Set gtmtypes("unix_db_info",126,"name")="unix_db_info.s_addrs.hold_onto_crit"
-	Set gtmtypes("unix_db_info",126,"off")=836
+	Set gtmtypes("unix_db_info",125,"type")="int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.regcnt")=125
+	Set gtmtypes("unix_db_info",126,"name")="unix_db_info.s_addrs.t_commit_crit"
+	Set gtmtypes("unix_db_info",126,"off")=852
 	Set gtmtypes("unix_db_info",126,"len")=4
 	Set gtmtypes("unix_db_info",126,"type")="boolean_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.hold_onto_crit")=126
-	Set gtmtypes("unix_db_info",127,"name")="unix_db_info.s_addrs.dse_crit_seize_done"
-	Set gtmtypes("unix_db_info",127,"off")=840
+	Set gtmtypfldindx("unix_db_info","s_addrs.t_commit_crit")=126
+	Set gtmtypes("unix_db_info",127,"name")="unix_db_info.s_addrs.wcs_pidcnt_incremented"
+	Set gtmtypes("unix_db_info",127,"off")=856
 	Set gtmtypes("unix_db_info",127,"len")=4
 	Set gtmtypes("unix_db_info",127,"type")="boolean_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.dse_crit_seize_done")=127
-	Set gtmtypes("unix_db_info",128,"name")="unix_db_info.s_addrs.gbuff_limit"
-	Set gtmtypes("unix_db_info",128,"off")=844
+	Set gtmtypfldindx("unix_db_info","s_addrs.wcs_pidcnt_incremented")=127
+	Set gtmtypes("unix_db_info",128,"name")="unix_db_info.s_addrs.incr_db_trigger_cycle"
+	Set gtmtypes("unix_db_info",128,"off")=860
 	Set gtmtypes("unix_db_info",128,"len")=4
-	Set gtmtypes("unix_db_info",128,"type")="int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.gbuff_limit")=128
-	Set gtmtypes("unix_db_info",129,"name")="unix_db_info.s_addrs.our_midnite"
-	Set gtmtypes("unix_db_info",129,"off")=848
-	Set gtmtypes("unix_db_info",129,"len")=8
-	Set gtmtypes("unix_db_info",129,"type")="addr"
-	Set gtmtypfldindx("unix_db_info","s_addrs.our_midnite")=129
-	Set gtmtypes("unix_db_info",130,"name")="unix_db_info.s_addrs.root_search_cycle"
-	Set gtmtypes("unix_db_info",130,"off")=856
+	Set gtmtypes("unix_db_info",128,"type")="boolean_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.incr_db_trigger_cycle")=128
+	Set gtmtypes("unix_db_info",129,"name")="unix_db_info.s_addrs.db_trigger_cycle"
+	Set gtmtypes("unix_db_info",129,"off")=864
+	Set gtmtypes("unix_db_info",129,"len")=4
+	Set gtmtypes("unix_db_info",129,"type")="unsigned-int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.db_trigger_cycle")=129
+	Set gtmtypes("unix_db_info",130,"name")="unix_db_info.s_addrs.db_dztrigger_cycle"
+	Set gtmtypes("unix_db_info",130,"off")=868
 	Set gtmtypes("unix_db_info",130,"len")=4
 	Set gtmtypes("unix_db_info",130,"type")="unsigned-int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.root_search_cycle")=130
-	Set gtmtypes("unix_db_info",131,"name")="unix_db_info.s_addrs.onln_rlbk_cycle"
-	Set gtmtypes("unix_db_info",131,"off")=860
+	Set gtmtypfldindx("unix_db_info","s_addrs.db_dztrigger_cycle")=130
+	Set gtmtypes("unix_db_info",131,"name")="unix_db_info.s_addrs.hold_onto_crit"
+	Set gtmtypes("unix_db_info",131,"off")=872
 	Set gtmtypes("unix_db_info",131,"len")=4
-	Set gtmtypes("unix_db_info",131,"type")="unsigned-int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.onln_rlbk_cycle")=131
-	Set gtmtypes("unix_db_info",132,"name")="unix_db_info.s_addrs.db_onln_rlbkd_cycle"
-	Set gtmtypes("unix_db_info",132,"off")=864
+	Set gtmtypes("unix_db_info",131,"type")="boolean_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.hold_onto_crit")=131
+	Set gtmtypes("unix_db_info",132,"name")="unix_db_info.s_addrs.dse_crit_seize_done"
+	Set gtmtypes("unix_db_info",132,"off")=876
 	Set gtmtypes("unix_db_info",132,"len")=4
-	Set gtmtypes("unix_db_info",132,"type")="unsigned-int"
-	Set gtmtypfldindx("unix_db_info","s_addrs.db_onln_rlbkd_cycle")=132
-	Set gtmtypes("unix_db_info",133,"name")="unix_db_info.s_addrs.read_only_fs"
-	Set gtmtypes("unix_db_info",133,"off")=868
+	Set gtmtypes("unix_db_info",132,"type")="boolean_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.dse_crit_seize_done")=132
+	Set gtmtypes("unix_db_info",133,"name")="unix_db_info.s_addrs.gbuff_limit"
+	Set gtmtypes("unix_db_info",133,"off")=880
 	Set gtmtypes("unix_db_info",133,"len")=4
-	Set gtmtypes("unix_db_info",133,"type")="boolean_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.read_only_fs")=133
-	Set gtmtypes("unix_db_info",134,"name")="unix_db_info.s_addrs.crit_probe"
-	Set gtmtypes("unix_db_info",134,"off")=872
+	Set gtmtypes("unix_db_info",133,"type")="int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.gbuff_limit")=133
+	Set gtmtypes("unix_db_info",134,"name")="unix_db_info.s_addrs.root_search_cycle"
+	Set gtmtypes("unix_db_info",134,"off")=884
 	Set gtmtypes("unix_db_info",134,"len")=4
-	Set gtmtypes("unix_db_info",134,"type")="boolean_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.crit_probe")=134
-	Set gtmtypes("unix_db_info",135,"name")="unix_db_info.s_addrs.probecrit_rec"
-	Set gtmtypes("unix_db_info",135,"off")=880
-	Set gtmtypes("unix_db_info",135,"len")=56
-	Set gtmtypes("unix_db_info",135,"type")="probecrit_rec_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.probecrit_rec")=135
-	Set gtmtypes("unix_db_info",136,"name")="unix_db_info.s_addrs.probecrit_rec.t_get_crit"
-	Set gtmtypes("unix_db_info",136,"off")=880
-	Set gtmtypes("unix_db_info",136,"len")=8
-	Set gtmtypes("unix_db_info",136,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.probecrit_rec.t_get_crit")=136
-	Set gtmtypes("unix_db_info",137,"name")="unix_db_info.s_addrs.probecrit_rec.p_crit_failed"
-	Set gtmtypes("unix_db_info",137,"off")=888
-	Set gtmtypes("unix_db_info",137,"len")=8
-	Set gtmtypes("unix_db_info",137,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.probecrit_rec.p_crit_failed")=137
-	Set gtmtypes("unix_db_info",138,"name")="unix_db_info.s_addrs.probecrit_rec.p_crit_que_slps"
-	Set gtmtypes("unix_db_info",138,"off")=896
-	Set gtmtypes("unix_db_info",138,"len")=8
-	Set gtmtypes("unix_db_info",138,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.probecrit_rec.p_crit_que_slps")=138
-	Set gtmtypes("unix_db_info",139,"name")="unix_db_info.s_addrs.probecrit_rec.p_crit_yields"
+	Set gtmtypes("unix_db_info",134,"type")="unsigned-int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.root_search_cycle")=134
+	Set gtmtypes("unix_db_info",135,"name")="unix_db_info.s_addrs.onln_rlbk_cycle"
+	Set gtmtypes("unix_db_info",135,"off")=888
+	Set gtmtypes("unix_db_info",135,"len")=4
+	Set gtmtypes("unix_db_info",135,"type")="unsigned-int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.onln_rlbk_cycle")=135
+	Set gtmtypes("unix_db_info",136,"name")="unix_db_info.s_addrs.db_onln_rlbkd_cycle"
+	Set gtmtypes("unix_db_info",136,"off")=892
+	Set gtmtypes("unix_db_info",136,"len")=4
+	Set gtmtypes("unix_db_info",136,"type")="unsigned-int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.db_onln_rlbkd_cycle")=136
+	Set gtmtypes("unix_db_info",137,"name")="unix_db_info.s_addrs.reservedDBFlags"
+	Set gtmtypes("unix_db_info",137,"off")=896
+	Set gtmtypes("unix_db_info",137,"len")=4
+	Set gtmtypes("unix_db_info",137,"type")="unsigned-int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.reservedDBFlags")=137
+	Set gtmtypes("unix_db_info",138,"name")="unix_db_info.s_addrs.read_only_fs"
+	Set gtmtypes("unix_db_info",138,"off")=900
+	Set gtmtypes("unix_db_info",138,"len")=4
+	Set gtmtypes("unix_db_info",138,"type")="boolean_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.read_only_fs")=138
+	Set gtmtypes("unix_db_info",139,"name")="unix_db_info.s_addrs.crit_probe"
 	Set gtmtypes("unix_db_info",139,"off")=904
-	Set gtmtypes("unix_db_info",139,"len")=8
-	Set gtmtypes("unix_db_info",139,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.probecrit_rec.p_crit_yields")=139
-	Set gtmtypes("unix_db_info",140,"name")="unix_db_info.s_addrs.probecrit_rec.p_crit_que_full"
-	Set gtmtypes("unix_db_info",140,"off")=912
-	Set gtmtypes("unix_db_info",140,"len")=8
-	Set gtmtypes("unix_db_info",140,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.probecrit_rec.p_crit_que_full")=140
-	Set gtmtypes("unix_db_info",141,"name")="unix_db_info.s_addrs.probecrit_rec.p_crit_que_slots"
-	Set gtmtypes("unix_db_info",141,"off")=920
-	Set gtmtypes("unix_db_info",141,"len")=8
-	Set gtmtypes("unix_db_info",141,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.probecrit_rec.p_crit_que_slots")=141
-	Set gtmtypes("unix_db_info",142,"name")="unix_db_info.s_addrs.probecrit_rec.p_crit_success"
-	Set gtmtypes("unix_db_info",142,"off")=928
+	Set gtmtypes("unix_db_info",139,"len")=4
+	Set gtmtypes("unix_db_info",139,"type")="boolean_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.crit_probe")=139
+	Set gtmtypes("unix_db_info",140,"name")="unix_db_info.s_addrs.canceled_flush_timer"
+	Set gtmtypes("unix_db_info",140,"off")=908
+	Set gtmtypes("unix_db_info",140,"len")=4
+	Set gtmtypes("unix_db_info",140,"type")="boolean_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.canceled_flush_timer")=140
+	Set gtmtypes("unix_db_info",141,"name")="unix_db_info.s_addrs.probecrit_rec"
+	Set gtmtypes("unix_db_info",141,"off")=912
+	Set gtmtypes("unix_db_info",141,"len")=56
+	Set gtmtypes("unix_db_info",141,"type")="probecrit_rec_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.probecrit_rec")=141
+	Set gtmtypes("unix_db_info",142,"name")="unix_db_info.s_addrs.probecrit_rec.t_get_crit"
+	Set gtmtypes("unix_db_info",142,"off")=912
 	Set gtmtypes("unix_db_info",142,"len")=8
 	Set gtmtypes("unix_db_info",142,"type")="uint64_t"
-	Set gtmtypfldindx("unix_db_info","s_addrs.probecrit_rec.p_crit_success")=142
-	Set gtmtypes("unix_db_info",143,"name")="unix_db_info.fn"
-	Set gtmtypes("unix_db_info",143,"off")=936
+	Set gtmtypfldindx("unix_db_info","s_addrs.probecrit_rec.t_get_crit")=142
+	Set gtmtypes("unix_db_info",143,"name")="unix_db_info.s_addrs.probecrit_rec.p_crit_failed"
+	Set gtmtypes("unix_db_info",143,"off")=920
 	Set gtmtypes("unix_db_info",143,"len")=8
-	Set gtmtypes("unix_db_info",143,"type")="addr"
-	Set gtmtypfldindx("unix_db_info","fn")=143
-	Set gtmtypes("unix_db_info",144,"name")="unix_db_info.fd"
-	Set gtmtypes("unix_db_info",144,"off")=944
-	Set gtmtypes("unix_db_info",144,"len")=4
-	Set gtmtypes("unix_db_info",144,"type")="int"
-	Set gtmtypfldindx("unix_db_info","fd")=144
-	Set gtmtypes("unix_db_info",145,"name")="unix_db_info.fileid"
-	Set gtmtypes("unix_db_info",145,"off")=952
-	Set gtmtypes("unix_db_info",145,"len")=24
-	Set gtmtypes("unix_db_info",145,"type")="unix_file_id"
-	Set gtmtypfldindx("unix_db_info","fileid")=145
-	Set gtmtypes("unix_db_info",146,"name")="unix_db_info.fileid.inode"
-	Set gtmtypes("unix_db_info",146,"off")=952
+	Set gtmtypes("unix_db_info",143,"type")="uint64_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.probecrit_rec.p_crit_failed")=143
+	Set gtmtypes("unix_db_info",144,"name")="unix_db_info.s_addrs.probecrit_rec.p_crit_que_slps"
+	Set gtmtypes("unix_db_info",144,"off")=928
+	Set gtmtypes("unix_db_info",144,"len")=8
+	Set gtmtypes("unix_db_info",144,"type")="uint64_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.probecrit_rec.p_crit_que_slps")=144
+	Set gtmtypes("unix_db_info",145,"name")="unix_db_info.s_addrs.probecrit_rec.p_crit_yields"
+	Set gtmtypes("unix_db_info",145,"off")=936
+	Set gtmtypes("unix_db_info",145,"len")=8
+	Set gtmtypes("unix_db_info",145,"type")="uint64_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.probecrit_rec.p_crit_yields")=145
+	Set gtmtypes("unix_db_info",146,"name")="unix_db_info.s_addrs.probecrit_rec.p_crit_que_full"
+	Set gtmtypes("unix_db_info",146,"off")=944
 	Set gtmtypes("unix_db_info",146,"len")=8
-	Set gtmtypes("unix_db_info",146,"type")="ino_t"
-	Set gtmtypfldindx("unix_db_info","fileid.inode")=146
-	Set gtmtypes("unix_db_info",147,"name")="unix_db_info.fileid.device"
-	Set gtmtypes("unix_db_info",147,"off")=960
+	Set gtmtypes("unix_db_info",146,"type")="uint64_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.probecrit_rec.p_crit_que_full")=146
+	Set gtmtypes("unix_db_info",147,"name")="unix_db_info.s_addrs.probecrit_rec.p_crit_que_slots"
+	Set gtmtypes("unix_db_info",147,"off")=952
 	Set gtmtypes("unix_db_info",147,"len")=8
-	Set gtmtypes("unix_db_info",147,"type")="dev_t"
-	Set gtmtypfldindx("unix_db_info","fileid.device")=147
-	Set gtmtypes("unix_db_info",148,"name")="unix_db_info.fileid.st_gen"
-	Set gtmtypes("unix_db_info",148,"off")=968
-	Set gtmtypes("unix_db_info",148,"len")=4
-	Set gtmtypes("unix_db_info",148,"type")="unsigned-int"
-	Set gtmtypfldindx("unix_db_info","fileid.st_gen")=148
-	Set gtmtypes("unix_db_info",149,"name")="unix_db_info.semid"
-	Set gtmtypes("unix_db_info",149,"off")=976
+	Set gtmtypes("unix_db_info",147,"type")="uint64_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.probecrit_rec.p_crit_que_slots")=147
+	Set gtmtypes("unix_db_info",148,"name")="unix_db_info.s_addrs.probecrit_rec.p_crit_success"
+	Set gtmtypes("unix_db_info",148,"off")=960
+	Set gtmtypes("unix_db_info",148,"len")=8
+	Set gtmtypes("unix_db_info",148,"type")="uint64_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.probecrit_rec.p_crit_success")=148
+	Set gtmtypes("unix_db_info",149,"name")="unix_db_info.s_addrs.lock_crit_with_db"
+	Set gtmtypes("unix_db_info",149,"off")=968
 	Set gtmtypes("unix_db_info",149,"len")=4
-	Set gtmtypes("unix_db_info",149,"type")="int"
-	Set gtmtypfldindx("unix_db_info","semid")=149
-	Set gtmtypes("unix_db_info",150,"name")="unix_db_info.gt_sem_ctime"
-	Set gtmtypes("unix_db_info",150,"off")=984
-	Set gtmtypes("unix_db_info",150,"len")=8
-	Set gtmtypes("unix_db_info",150,"type")="time_t"
-	Set gtmtypfldindx("unix_db_info","gt_sem_ctime")=150
-	Set gtmtypes("unix_db_info",151,"name")="unix_db_info.shmid"
-	Set gtmtypes("unix_db_info",151,"off")=992
+	Set gtmtypes("unix_db_info",149,"type")="boolean_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.lock_crit_with_db")=149
+	Set gtmtypes("unix_db_info",150,"name")="unix_db_info.s_addrs.needs_post_freeze_online_clean"
+	Set gtmtypes("unix_db_info",150,"off")=972
+	Set gtmtypes("unix_db_info",150,"len")=4
+	Set gtmtypes("unix_db_info",150,"type")="boolean_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.needs_post_freeze_online_clean")=150
+	Set gtmtypes("unix_db_info",151,"name")="unix_db_info.s_addrs.needs_post_freeze_flushsync"
+	Set gtmtypes("unix_db_info",151,"off")=976
 	Set gtmtypes("unix_db_info",151,"len")=4
-	Set gtmtypes("unix_db_info",151,"type")="int"
-	Set gtmtypfldindx("unix_db_info","shmid")=151
-	Set gtmtypes("unix_db_info",152,"name")="unix_db_info.gt_shm_ctime"
-	Set gtmtypes("unix_db_info",152,"off")=1000
-	Set gtmtypes("unix_db_info",152,"len")=8
-	Set gtmtypes("unix_db_info",152,"type")="time_t"
-	Set gtmtypfldindx("unix_db_info","gt_shm_ctime")=152
-	Set gtmtypes("unix_db_info",153,"name")="unix_db_info.ftok_semid"
-	Set gtmtypes("unix_db_info",153,"off")=1008
+	Set gtmtypes("unix_db_info",151,"type")="boolean_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.needs_post_freeze_flushsync")=151
+	Set gtmtypes("unix_db_info",152,"name")="unix_db_info.s_addrs.tp_hint"
+	Set gtmtypes("unix_db_info",152,"off")=980
+	Set gtmtypes("unix_db_info",152,"len")=4
+	Set gtmtypes("unix_db_info",152,"type")="int"
+	Set gtmtypfldindx("unix_db_info","s_addrs.tp_hint")=152
+	Set gtmtypes("unix_db_info",153,"name")="unix_db_info.s_addrs.statsDB_setup_completed"
+	Set gtmtypes("unix_db_info",153,"off")=984
 	Set gtmtypes("unix_db_info",153,"len")=4
-	Set gtmtypes("unix_db_info",153,"type")="int"
-	Set gtmtypfldindx("unix_db_info","ftok_semid")=153
-	Set gtmtypes("unix_db_info",154,"name")="unix_db_info.key"
-	Set gtmtypes("unix_db_info",154,"off")=1016
-	Set gtmtypes("unix_db_info",154,"len")=4
-	Set gtmtypes("unix_db_info",154,"type")="key_t"
-	Set gtmtypfldindx("unix_db_info","key")=154
-	Set gtmtypes("unix_db_info",155,"name")="unix_db_info.raw"
-	Set gtmtypes("unix_db_info",155,"off")=1020
+	Set gtmtypes("unix_db_info",153,"type")="boolean_t"
+	Set gtmtypfldindx("unix_db_info","s_addrs.statsDB_setup_completed")=153
+	Set gtmtypes("unix_db_info",154,"name")="unix_db_info.fn"
+	Set gtmtypes("unix_db_info",154,"off")=992
+	Set gtmtypes("unix_db_info",154,"len")=8
+	Set gtmtypes("unix_db_info",154,"type")="addr"
+	Set gtmtypfldindx("unix_db_info","fn")=154
+	Set gtmtypes("unix_db_info",155,"name")="unix_db_info.fd"
+	Set gtmtypes("unix_db_info",155,"off")=1000
 	Set gtmtypes("unix_db_info",155,"len")=4
-	Set gtmtypes("unix_db_info",155,"type")="boolean_t"
-	Set gtmtypfldindx("unix_db_info","raw")=155
+	Set gtmtypes("unix_db_info",155,"type")="int"
+	Set gtmtypfldindx("unix_db_info","fd")=155
+	Set gtmtypes("unix_db_info",156,"name")="unix_db_info.owning_gd"
+	Set gtmtypes("unix_db_info",156,"off")=1008
+	Set gtmtypes("unix_db_info",156,"len")=8
+	Set gtmtypes("unix_db_info",156,"type")="addr"
+	Set gtmtypfldindx("unix_db_info","owning_gd")=156
+	Set gtmtypes("unix_db_info",157,"name")="unix_db_info.fileid"
+	Set gtmtypes("unix_db_info",157,"off")=1016
+	Set gtmtypes("unix_db_info",157,"len")=24
+	Set gtmtypes("unix_db_info",157,"type")="unix_file_id"
+	Set gtmtypfldindx("unix_db_info","fileid")=157
+	Set gtmtypes("unix_db_info",158,"name")="unix_db_info.fileid.inode"
+	Set gtmtypes("unix_db_info",158,"off")=1016
+	Set gtmtypes("unix_db_info",158,"len")=8
+	Set gtmtypes("unix_db_info",158,"type")="ino_t"
+	Set gtmtypfldindx("unix_db_info","fileid.inode")=158
+	Set gtmtypes("unix_db_info",159,"name")="unix_db_info.fileid.device"
+	Set gtmtypes("unix_db_info",159,"off")=1024
+	Set gtmtypes("unix_db_info",159,"len")=8
+	Set gtmtypes("unix_db_info",159,"type")="dev_t"
+	Set gtmtypfldindx("unix_db_info","fileid.device")=159
+	Set gtmtypes("unix_db_info",160,"name")="unix_db_info.fileid.st_gen"
+	Set gtmtypes("unix_db_info",160,"off")=1032
+	Set gtmtypes("unix_db_info",160,"len")=4
+	Set gtmtypes("unix_db_info",160,"type")="unsigned-int"
+	Set gtmtypfldindx("unix_db_info","fileid.st_gen")=160
+	Set gtmtypes("unix_db_info",161,"name")="unix_db_info.semid"
+	Set gtmtypes("unix_db_info",161,"off")=1040
+	Set gtmtypes("unix_db_info",161,"len")=4
+	Set gtmtypes("unix_db_info",161,"type")="int"
+	Set gtmtypfldindx("unix_db_info","semid")=161
+	Set gtmtypes("unix_db_info",162,"name")="unix_db_info.gt_sem_ctime"
+	Set gtmtypes("unix_db_info",162,"off")=1048
+	Set gtmtypes("unix_db_info",162,"len")=8
+	Set gtmtypes("unix_db_info",162,"type")="time_t"
+	Set gtmtypfldindx("unix_db_info","gt_sem_ctime")=162
+	Set gtmtypes("unix_db_info",163,"name")="unix_db_info.shmid"
+	Set gtmtypes("unix_db_info",163,"off")=1056
+	Set gtmtypes("unix_db_info",163,"len")=4
+	Set gtmtypes("unix_db_info",163,"type")="int"
+	Set gtmtypfldindx("unix_db_info","shmid")=163
+	Set gtmtypes("unix_db_info",164,"name")="unix_db_info.gt_shm_ctime"
+	Set gtmtypes("unix_db_info",164,"off")=1064
+	Set gtmtypes("unix_db_info",164,"len")=8
+	Set gtmtypes("unix_db_info",164,"type")="time_t"
+	Set gtmtypfldindx("unix_db_info","gt_shm_ctime")=164
+	Set gtmtypes("unix_db_info",165,"name")="unix_db_info.ftok_semid"
+	Set gtmtypes("unix_db_info",165,"off")=1072
+	Set gtmtypes("unix_db_info",165,"len")=4
+	Set gtmtypes("unix_db_info",165,"type")="int"
+	Set gtmtypfldindx("unix_db_info","ftok_semid")=165
+	Set gtmtypes("unix_db_info",166,"name")="unix_db_info.key"
+	Set gtmtypes("unix_db_info",166,"off")=1076
+	Set gtmtypes("unix_db_info",166,"len")=4
+	Set gtmtypes("unix_db_info",166,"type")="key_t"
+	Set gtmtypfldindx("unix_db_info","key")=166
+	Set gtmtypes("unix_db_info",167,"name")="unix_db_info.raw"
+	Set gtmtypes("unix_db_info",167,"off")=1080
+	Set gtmtypes("unix_db_info",167,"len")=4
+	Set gtmtypes("unix_db_info",167,"type")="boolean_t"
+	Set gtmtypfldindx("unix_db_info","raw")=167
+	Set gtmtypes("unix_db_info",168,"name")="unix_db_info.db_fs_block_size"
+	Set gtmtypes("unix_db_info",168,"off")=1084
+	Set gtmtypes("unix_db_info",168,"len")=4
+	Set gtmtypes("unix_db_info",168,"type")="unsigned-int"
+	Set gtmtypfldindx("unix_db_info","db_fs_block_size")=168
 	;
 	Set gtmtypes("unix_file_id")="struct"
 	Set gtmtypes("unix_file_id",0)=3
@@ -40652,6 +41561,84 @@ Init
 	Set gtmtypes("wcs_conflict_trace_t",3,"type")="int"
 	Set gtmtypfldindx("wcs_conflict_trace_t","fsync_in_prog_pid")=3
 	;
+	Set gtmtypes("wcs_ops_trace_t")="struct"
+	Set gtmtypes("wcs_ops_trace_t",0)=11
+	Set gtmtypes("wcs_ops_trace_t","len")=56
+	Set gtmtypes("wcs_ops_trace_t",1,"name")="wcs_ops_trace_t.db_tn"
+	Set gtmtypes("wcs_ops_trace_t",1,"off")=0
+	Set gtmtypes("wcs_ops_trace_t",1,"len")=8
+	Set gtmtypes("wcs_ops_trace_t",1,"type")="uint64_t"
+	Set gtmtypfldindx("wcs_ops_trace_t","db_tn")=1
+	Set gtmtypes("wcs_ops_trace_t",2,"name")="wcs_ops_trace_t.process_id"
+	Set gtmtypes("wcs_ops_trace_t",2,"off")=8
+	Set gtmtypes("wcs_ops_trace_t",2,"len")=4
+	Set gtmtypes("wcs_ops_trace_t",2,"type")="unsigned-int"
+	Set gtmtypfldindx("wcs_ops_trace_t","process_id")=2
+	Set gtmtypes("wcs_ops_trace_t",3,"name")="wcs_ops_trace_t.wc_in_free"
+	Set gtmtypes("wcs_ops_trace_t",3,"off")=12
+	Set gtmtypes("wcs_ops_trace_t",3,"len")=4
+	Set gtmtypes("wcs_ops_trace_t",3,"type")="unsigned-int"
+	Set gtmtypfldindx("wcs_ops_trace_t","wc_in_free")=3
+	Set gtmtypes("wcs_ops_trace_t",4,"name")="wcs_ops_trace_t.wcs_active_lvl"
+	Set gtmtypes("wcs_ops_trace_t",4,"off")=16
+	Set gtmtypes("wcs_ops_trace_t",4,"len")=4
+	Set gtmtypes("wcs_ops_trace_t",4,"type")="unsigned-int"
+	Set gtmtypfldindx("wcs_ops_trace_t","wcs_active_lvl")=4
+	Set gtmtypes("wcs_ops_trace_t",5,"name")="wcs_ops_trace_t.wcs_wip_lvl"
+	Set gtmtypes("wcs_ops_trace_t",5,"off")=20
+	Set gtmtypes("wcs_ops_trace_t",5,"len")=4
+	Set gtmtypes("wcs_ops_trace_t",5,"type")="unsigned-int"
+	Set gtmtypfldindx("wcs_ops_trace_t","wcs_wip_lvl")=5
+	Set gtmtypes("wcs_ops_trace_t",6,"name")="wcs_ops_trace_t.type"
+	Set gtmtypes("wcs_ops_trace_t",6,"off")=24
+	Set gtmtypes("wcs_ops_trace_t",6,"len")=4
+	Set gtmtypes("wcs_ops_trace_t",6,"type")="int"
+	Set gtmtypfldindx("wcs_ops_trace_t","type")=6
+	Set gtmtypes("wcs_ops_trace_t",7,"name")="wcs_ops_trace_t.blk"
+	Set gtmtypes("wcs_ops_trace_t",7,"off")=28
+	Set gtmtypes("wcs_ops_trace_t",7,"len")=4
+	Set gtmtypes("wcs_ops_trace_t",7,"type")="int"
+	Set gtmtypfldindx("wcs_ops_trace_t","blk")=7
+	Set gtmtypes("wcs_ops_trace_t",8,"name")="wcs_ops_trace_t.cr_off"
+	Set gtmtypes("wcs_ops_trace_t",8,"off")=32
+	Set gtmtypes("wcs_ops_trace_t",8,"len")=8
+	Set gtmtypes("wcs_ops_trace_t",8,"type")="intptr_t"
+	Set gtmtypfldindx("wcs_ops_trace_t","cr_off")=8
+	Set gtmtypes("wcs_ops_trace_t",9,"name")="wcs_ops_trace_t.cr_dirty"
+	Set gtmtypes("wcs_ops_trace_t",9,"off")=40
+	Set gtmtypes("wcs_ops_trace_t",9,"len")=8
+	Set gtmtypes("wcs_ops_trace_t",9,"type")="uint64_t"
+	Set gtmtypfldindx("wcs_ops_trace_t","cr_dirty")=9
+	Set gtmtypes("wcs_ops_trace_t",10,"name")="wcs_ops_trace_t.detail1"
+	Set gtmtypes("wcs_ops_trace_t",10,"off")=48
+	Set gtmtypes("wcs_ops_trace_t",10,"len")=4
+	Set gtmtypes("wcs_ops_trace_t",10,"type")="unsigned-int"
+	Set gtmtypfldindx("wcs_ops_trace_t","detail1")=10
+	Set gtmtypes("wcs_ops_trace_t",11,"name")="wcs_ops_trace_t.detail2"
+	Set gtmtypes("wcs_ops_trace_t",11,"off")=52
+	Set gtmtypes("wcs_ops_trace_t",11,"len")=4
+	Set gtmtypes("wcs_ops_trace_t",11,"type")="unsigned-int"
+	Set gtmtypfldindx("wcs_ops_trace_t","detail2")=11
+	;
+	Set gtmtypes("wtstart_cr_list_t")="struct"
+	Set gtmtypes("wtstart_cr_list_t",0)=3
+	Set gtmtypes("wtstart_cr_list_t","len")=16
+	Set gtmtypes("wtstart_cr_list_t",1,"name")="wtstart_cr_list_t.numcrs"
+	Set gtmtypes("wtstart_cr_list_t",1,"off")=0
+	Set gtmtypes("wtstart_cr_list_t",1,"len")=4
+	Set gtmtypes("wtstart_cr_list_t",1,"type")="int"
+	Set gtmtypfldindx("wtstart_cr_list_t","numcrs")=1
+	Set gtmtypes("wtstart_cr_list_t",2,"name")="wtstart_cr_list_t.listsize"
+	Set gtmtypes("wtstart_cr_list_t",2,"off")=4
+	Set gtmtypes("wtstart_cr_list_t",2,"len")=4
+	Set gtmtypes("wtstart_cr_list_t",2,"type")="int"
+	Set gtmtypfldindx("wtstart_cr_list_t","listsize")=2
+	Set gtmtypes("wtstart_cr_list_t",3,"name")="wtstart_cr_list_t.listcrs"
+	Set gtmtypes("wtstart_cr_list_t",3,"off")=8
+	Set gtmtypes("wtstart_cr_list_t",3,"len")=8
+	Set gtmtypes("wtstart_cr_list_t",3,"type")="addr"
+	Set gtmtypfldindx("wtstart_cr_list_t","listcrs")=3
+	;
 	Set gtmtypes("z_records")="struct"
 	Set gtmtypes("z_records",0)=3
 	Set gtmtypes("z_records","len")=24
@@ -41404,6 +42391,7 @@ Init
 	Set gtmstructs("srch_blk_status_struct")="srch_blk_status"
 	Set gtmstructs("st_timer_alloc")="st_timer_alloc"
 	Set gtmstructs("stack_frame_struct")="stack_frame"
+	Set gtmstructs("statsDB_diqe")="statsDB_deferred_init_que_elem"
 	Set gtmstructs("storElemStruct")="storElem"
 	Set gtmstructs("struct_spanode_integ")="span_node_integ"
 	Set gtmstructs("symval_struct")="symval"
@@ -41432,6 +42420,7 @@ Init
 	Set gtmstructs("util_snapshot_struct")="util_snapshot_t"
 	Set gtmstructs("vms_lock_sb_struct")="vms_lock_sb"
 	Set gtmstructs("wcs_conflict_trace_struct")="wcs_conflict_trace_t"
+	Set gtmstructs("wtstart_cr_list_struct")="wtstart_cr_list_t"
 	Set gtmstructs("zro_ent_type")="zro_ent"
 	Set gtmstructs("zshow_out_struct")="zshow_out"
 	Set gtmstructs("zwr_alias_var_struct")="zwr_alias_var"
diff --git a/sr_x86_64/ci_restart.s b/sr_x86_64/ci_restart.s
index 205b0f2..21f03cd 100644
--- a/sr_x86_64/ci_restart.s
+++ b/sr_x86_64/ci_restart.s
@@ -1,6 +1,6 @@
 #################################################################
 #								#
-# Copyright (c) 2007-2015 Fidelity National Information 	#
+# Copyright (c) 2007-2016 Fidelity National Information		#
 # Services, Inc. and/or its subsidiaries. All rights reserved.	#
 #								#
 #	This source code contains the intellectual property	#
@@ -31,7 +31,7 @@ ENTRY	ci_restart
 	subl	$1, REG32_ARG3
 	leaq	8(REG64_ARG2), REG64_ARG1
 	leaq	8(REG_SP), REG64_ARG0
-	REP
+	REP						#   copy argument registers
 	movsq						# }
 L0:
 	movq	param_list(REG_IP), REG64_ACCUM
diff --git a/sr_x86_64/cmerrors_ctl.c b/sr_x86_64/cmerrors_ctl.c
index 5e6fa3b..3d09df6 100644
--- a/sr_x86_64/cmerrors_ctl.c
+++ b/sr_x86_64/cmerrors_ctl.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information 	*
+ * Copyright (c) 2001-2017 Fidelity National Information 	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
diff --git a/sr_x86_64/cmierrors_ctl.c b/sr_x86_64/cmierrors_ctl.c
index 43d69d2..4ff26bf 100644
--- a/sr_x86_64/cmierrors_ctl.c
+++ b/sr_x86_64/cmierrors_ctl.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information 	*
+ * Copyright (c) 2001-2017 Fidelity National Information 	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
diff --git a/sr_x86_64/emit_code_sp.c b/sr_x86_64/emit_code_sp.c
index 071a90e..afe58fe 100644
--- a/sr_x86_64/emit_code_sp.c
+++ b/sr_x86_64/emit_code_sp.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *                                                              *
- * Copyright (c) 2007-2015 Fidelity National Information 	*
+ * Copyright (c) 2007-2016 Fidelity National Information	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *                                                              *
  *      This source code contains the intellectual property     *
@@ -27,16 +27,10 @@
 #include "compiler.h"
 #include "list_file.h"
 #include <emit_code.h>
-GBLDEF struct emit_base_info emit_base_info;
 
-
-#define SET_OBPT_STR(str, len)	\
-	memcpy(obpt, str, len);	\
-	obpt += len;
-#define SET_OBPT_INT4(value)	\
-	obpt = i2asc(obpt, value);
-#define SET_OBPT_INT8(value)	\
-	obpt = i2asclx(obpt, value);
+#define SET_OBPT_STR(str, len)	(memcpy(obpt, str, len), obpt += len)
+#define SET_OBPT_INT4(value)	obpt = i2asc(obpt, value)
+#define SET_OBPT_INT8(value)	obpt = i2asclx(obpt, value)
 
 /* Possible values for instruction Byte's Meaning */
 #define one_byte_opcode		0
@@ -57,83 +51,59 @@ GBLDEF struct emit_base_info emit_base_info;
 #define memory_class 	2
 #define immediate_class	3
 
-struct instruction_mnemonics
+/* Decoding instruction prefix indicating 64 bit features used */
+struct Rex
 {
-	char *opcode_mnemonic;
-	char opcode_suffix;
+	short	Base;
+	/* short	Index;		Not currently used */
+	short	Reg;
+	short	Word64;
+} rex_prefix;
 
-	short reg_rip;
-	char  reg_prefix;
-	short num_operands;  /* Some instructions have one, some two and some None operands..
-				one operand will be taken in source.. num_operands = 4 would
-				mean that modrm reg_opcode will denote opcode extension
-			      */
-	short source_operand_class;
-	char  *source_operand_reg;
-	short destination_operand_class;
-	char  *destination_operand_reg;
-	long  offset;
-	short has_immediate;
-	long  immediate;
+struct instruction_mnemonics
+{
+	char		*opcode_mnemonic;
+	char		opcode_suffix;
+	char		reg_prefix;
+	boolean_t	reg_rip;
+	int		num_operands;	/* Instructions have 0, 1, or 2 operands. One operand is taken to be a source operand.
+					 * Four operands would mean that modrm reg_opcode will denote opcode extension.
+					 */
+	int		source_operand_class;
+	char		*source_operand_reg;
+	int		destination_operand_class;
+	int		has_immediate;
+	char		*destination_operand_reg;
+	long		offset;
+	long		immediate;
 } instruction;
 
-
 #undef I386_OP
 #define I386_OP(opcode, operand, num)	#opcode ,
+#define REG_RIP 16
 
 LITDEF char *mnemonic_list[] = {
 	#include "i386_ops.h"
 	};
-
 LITDEF char *mnemonic_list_2b[] = {
 	#include "i386_ops_2b.h"
 	};
-
 LITDEF char *mnemonic_list_g1[] = {
 	#include "i386_ops_g1.h"
 	};
-
 LITDEF char *mnemonic_list_g2[] = {
 	#include "i386_ops_g2.h"
 	};
-
 LITDEF char *mnemonic_list_g3[] = {
 	#include "i386_ops_g3.h"
 	};
-
 LITDEF char *mnemonic_list_g4[] = {
 	#include "i386_ops_g4.h"
 	};
-
 LITDEF char *mnemonic_list_g5[] = {
 	#include "i386_ops_g5.h"
 	};
-
-
-/* Structures and unions for different Bytes .. */
-struct Rex
-{
-	short Base;
-	short Index;
-	short Reg;
-	short Word64;
-} rex_prefix;
-
-static modrm_byte_type modrm_byte;
-static sib_byte_type sib_byte;
-
-GBLREF int 	call_4lcldo_variant;
-GBLREF int	jmp_offset;	/* Offset to jump target */
-GBLREF char	cg_phase;	/* code generation phase */
-GBLREF char 	code_buf[];
-GBLREF int	code_idx;
-GBLREF unsigned char	*obpt;	 /* output buffer index */
-GBLREF unsigned char	outbuf[];
-GBLREF int	curr_addr;
-GBLDEF int	instidx, prev_idx;
-
-#define REG_RIP 16
-LITDEF char	*register_list[] = {
+LITDEF char *register_list[] = {
 	"AX",
 	"CX",
 	"DX",
@@ -153,8 +123,23 @@ LITDEF char	*register_list[] = {
 	"RIP"
 };
 
-GBLREF boolean_t force_32;	/* We want to generate 4 byte offets even for an offset lesser than 8bits long,
-				   to keep things consistent between CGP_APPROX_ADDR phase and CGP_MACHINE phase */
+GBLDEF int			instidx, prev_idx;
+
+GBLREF emit_base_info_struct	emit_base_info;
+GBLREF int 			call_4lcldo_variant;
+GBLREF int			jmp_offset;	/* Offset to jump target */
+GBLREF char			cg_phase;	/* Code generation phase */
+GBLREF char 			code_buf[];
+GBLREF int			code_idx;
+GBLREF unsigned char		*obpt;	 	/* Output buffer index */
+GBLREF unsigned char		outbuf[];
+GBLREF int			curr_addr;
+GBLREF boolean_t		force_32;	/* We want to generate 4 byte offets even for an offset lesser than 8bits long,
+						 * to keep things consistent between CGP_APPROX_ADDR phase and CGP_MACHINE phase.
+						 */
+static modrm_byte_type modrm_byte;
+static sib_byte_type sib_byte;
+
 
 int	x86_64_arg_reg(int indx)
 {
@@ -185,10 +170,9 @@ void	emit_jmp(uint4 branch_op, short **instp, int reg) /* Note that the 'reg' pa
 	assert (jmp_offset != 0);
 	force_32 = TRUE;
 	jmp_offset -= code_idx * SIZEOF(code_buf[0]);	/* size of this particular instruction */
-
 	switch (cg_phase)
 	{
-#ifdef DEBUG
+#		ifdef DEBUG
 		case CGP_ASSEMBLY:
 			*obpt++ = 'x';
 			*obpt++ = '^';
@@ -198,7 +182,7 @@ void	emit_jmp(uint4 branch_op, short **instp, int reg) /* Note that the 'reg' pa
 			*obpt++ = ',';
 			*obpt++ = ' ';
 		/***** WARNING - FALL THRU *****/
-#endif
+#		endif
 		case CGP_ADDR_OPT:
 		case CGP_APPROX_ADDR:
 		case CGP_MACHINE:
@@ -285,48 +269,43 @@ void	emit_jmp(uint4 branch_op, short **instp, int reg) /* Note that the 'reg' pa
 	force_32 = FALSE;
 }
 
-
-
 void	emit_base_offset(int base_reg, int offset)
 {
-	memset((void *)&emit_base_info, 0, SIZEOF(emit_base_info));
+	CLEAR_EMIT_BASE_INFO;
 	emit_base_info.rex = REX_OP; /* All instructions that we generate need to set the REX prefix */
-
-	emit_base_info.modrm_byte_set = 1;
-/*
- *	if (offset == 0)
- *		emit_base_info.modrm_byte.modrm.mod = I386_MOD32_BASE;
- *		 else
- */
-	if ((offset >= -128  &&  offset <= 127)  &&  force_32 == FALSE)
+	emit_base_info.flags.modrm_byte_set = TRUE;
+	emit_base_info.modrm_byte.modrm.reg_opcode = 0;	/* Not cleared above nor set below */
+	/*
+	 *	if (offset == 0)
+	 *		emit_base_info.modrm_byte.modrm.mod = I386_MOD32_BASE;
+	 *	 else
+	 */
+	if (((-128 <= offset) && (127 >= offset)) && (FALSE == force_32))
 		emit_base_info.modrm_byte.modrm.mod = I386_MOD32_BASE_DISP_8;
 	else
 		emit_base_info.modrm_byte.modrm.mod = I386_MOD32_BASE_DISP_32;
-
-	if (((base_reg & 0x7) == I386_REG_ESP ) ||  ((base_reg & 0x7) == I386_REG_EBP  &&  offset == 0))
+	if ((I386_REG_ESP == (base_reg & 0x7)) || ((I386_REG_EBP == (base_reg & 0x7)) && (0 == offset)))
 	{
 		emit_base_info.modrm_byte.modrm.r_m = I386_REG_SIB_FOLLOWS;
-
 		/* Refer to the comment in emit_code_sp.h before SET_REX_PREFIX */
 		emit_base_info.sib_byte.sib.base = base_reg & 0x7; /* Need only the bottom 3 bits */
-		SET_REX_PREFIX(0, REX_B, base_reg)
+		SET_REX_PREFIX(0, REX_B, base_reg);
 		emit_base_info.sib_byte.sib.ss = I386_SS_TIMES_1;
 		emit_base_info.sib_byte.sib.index = I386_REG_NO_INDEX;
-		emit_base_info.sib_byte_set = 1;
+		emit_base_info.flags.sib_byte_set = TRUE;
 	} else
 	{
 		emit_base_info.modrm_byte.modrm.r_m = base_reg & 0x7; /* Need only the bottom 3 bits */
-		SET_REX_PREFIX(0, REX_B, base_reg)
+		SET_REX_PREFIX(0, REX_B, base_reg);
 	}
-
-	if ((offset >= -128  &&  offset <= 127)  &&  force_32 == FALSE)
+	if (((-128 <= offset) && (127 >= offset)) && (FALSE == force_32))
 	{
 		emit_base_info.offset8 = offset & 0xff;
-		emit_base_info.offset8_set = 1;
+		emit_base_info.flags.offset8_set = TRUE;
 	} else
 	{
 		emit_base_info.offset32 = offset;
-		emit_base_info.offset32_set = 1;
+		emit_base_info.flags.offset32_set = TRUE;
 	}
 }
 
@@ -335,7 +314,7 @@ void	emit_base_offset(int base_reg, int offset)
 void reset_instruction()
 {
 	rex_prefix.Base	= 0;
-	rex_prefix.Index = 0;
+	/* rex_prefix.Index = 0; Not currently used */
 	rex_prefix.Reg = 0;
 	rex_prefix.Word64 = 0;
 
@@ -366,7 +345,7 @@ void print_source_operand()
 			assert(instruction.source_operand_reg != NULL);
 			*obpt++ = '%';
 			*obpt++ = instruction.reg_prefix;
-			SET_OBPT_STR(instruction.source_operand_reg, STRLEN(instruction.source_operand_reg))
+			SET_OBPT_STR(instruction.source_operand_reg, STRLEN(instruction.source_operand_reg));
 			break;
 		case memory_class :
 			assert(instruction.destination_operand_class != memory_class);
@@ -376,7 +355,7 @@ void print_source_operand()
 				*obpt++ = '(';
 				*obpt++ = '%';
 				*obpt++ = instruction.reg_prefix;
-				SET_OBPT_STR(instruction.source_operand_reg, STRLEN(instruction.source_operand_reg))
+				SET_OBPT_STR(instruction.source_operand_reg, STRLEN(instruction.source_operand_reg));
 				*obpt++ = ')';
 			} else
 			{
@@ -404,7 +383,7 @@ void print_destination_operand()
 			assert(instruction.destination_operand_reg != NULL);
 			*obpt++ = '%';
 			*obpt++ = instruction.reg_prefix;
-			SET_OBPT_STR(instruction.destination_operand_reg, STRLEN(instruction.destination_operand_reg))
+			SET_OBPT_STR(instruction.destination_operand_reg, STRLEN(instruction.destination_operand_reg));
 			break;
 		case memory_class :
 			assert(instruction.source_operand_class != memory_class);
@@ -414,7 +393,7 @@ void print_destination_operand()
 				*obpt++ = '(';
 				*obpt++ = '%';
 				*obpt++ = instruction.reg_prefix;
-				SET_OBPT_STR(instruction.destination_operand_reg, STRLEN(instruction.destination_operand_reg))
+				SET_OBPT_STR(instruction.destination_operand_reg, STRLEN(instruction.destination_operand_reg));
 				*obpt++ = ')';
 			} else
 			{
@@ -431,10 +410,8 @@ void print_destination_operand()
 	}
 }
 
-
 void print_instruction()
 {
-
 	list_chkpage();
 	obpt = &outbuf[0];
 	memset(obpt, SP, ASM_OUT_BUFF);
@@ -456,18 +433,17 @@ void print_instruction()
 	*obpt++ = '\t';
 	*obpt++ = '\t';
 	assert( instruction.opcode_mnemonic != NULL );
-	SET_OBPT_STR(instruction.opcode_mnemonic, STRLEN(instruction.opcode_mnemonic))
+	SET_OBPT_STR(instruction.opcode_mnemonic, STRLEN(instruction.opcode_mnemonic));
 	*obpt++ = instruction.opcode_suffix;
 	*obpt++ = '\t';
-	instruction.num_operands = (instruction.num_operands > grp_prefix) ? \
-					(instruction.num_operands - grp_prefix) : instruction.num_operands;
-
+	instruction.num_operands = (instruction.num_operands > grp_prefix)
+		? (instruction.num_operands - grp_prefix) : instruction.num_operands;
 	switch (instruction.num_operands)
 	{
 		case 0 :
 			break;
 		case 1 :
-		/* single operand assumed to be in the source operand only.. */
+			/* single operand assumed to be in the source operand only.. */
 			assert(instruction.destination_operand_class == undefined_class);
 			print_source_operand();
 			break;
@@ -477,7 +453,7 @@ void print_instruction()
 			print_destination_operand();
 			break;
 		default :
-		assertpro(FALSE);
+			assertpro(FALSE);
 	}
 	/*  Now reset the instruction structure  */
 	emit_eoi();
@@ -487,18 +463,16 @@ void print_instruction()
 void set_memory_reg()
 {
 	instruction.reg_prefix = 'r';
-
 	if (instruction.source_operand_class == memory_class)
-		instruction.source_operand_reg =(char *) register_list[modrm_byte.modrm.r_m + 8 * rex_prefix.Base];
+		instruction.source_operand_reg = (char *)register_list[modrm_byte.modrm.r_m + 8 * rex_prefix.Base];
 	else if (instruction.destination_operand_class == memory_class)
-		instruction.destination_operand_reg =(char *) register_list[modrm_byte.modrm.r_m + 8 * rex_prefix.Base];
-
+		instruction.destination_operand_reg = (char *)register_list[modrm_byte.modrm.r_m + 8 * rex_prefix.Base];
 	/* Printing of RIP has to be handled differently	*/
  	if (instruction.reg_rip)
 		if (instruction.source_operand_class == memory_class)
-			instruction.source_operand_reg =(char *) register_list[REG_RIP];
+			instruction.source_operand_reg = (char *)register_list[REG_RIP];
 		else if (instruction.destination_operand_class == memory_class)
-			instruction.destination_operand_reg =(char *) register_list[REG_RIP];
+			instruction.destination_operand_reg = (char *)register_list[REG_RIP];
 		else
 			assertpro(FALSE);
 }
@@ -506,7 +480,7 @@ void set_memory_reg()
 void set_register_reg()
 {
 	if (instruction.source_operand_class == register_class)
-		instruction.source_operand_reg =(char *) register_list[modrm_byte.modrm.reg_opcode + 8 * rex_prefix.Reg];
+		instruction.source_operand_reg = (char *)register_list[modrm_byte.modrm.reg_opcode + 8 * rex_prefix.Reg];
 	else if (instruction.destination_operand_class == register_class)
 		instruction.destination_operand_reg = (char *)register_list[modrm_byte.modrm.reg_opcode + 8 * rex_prefix.Reg];
 }
@@ -521,29 +495,29 @@ void clear_memory_reg()
 
 void format_machine_inst()
 {
-	short	next_inst_byte_meaning = one_byte_opcode;
-	int	i, tot_inst_len = 0;
+	int		next_inst_byte_meaning = one_byte_opcode;
+	int		i, tot_inst_len = 0;
 	unsigned char	inst_curr_byte;
-	short	lock_prefix_seen;
-	short	rep_e_prefix_seen;
-	short	repne_prefix_seen;
-	short	operand_size_prefix_seen;
-	short	address_size_prefix_seen;
-
-
-	/*	Start Parsing the Instruction Buffer	*/
+	/* None of the flags below are currently used but may be in the near future so are left here */
+	boolean_t	lock_prefix_seen;
+	boolean_t	rep_e_prefix_seen;
+	boolean_t	repne_prefix_seen;
+	boolean_t	operand_size_prefix_seen;
+	boolean_t	address_size_prefix_seen;
+
+	/* Start Parsing the Instruction Buffer	*/
 	instidx = 0;
 	prev_idx = 0;
 	while(instidx < code_idx)
 	{
 		switch(next_inst_byte_meaning)
-		{			/* Can be a Prefix, or opcode !! */
+		{	/* Can be a Prefix, or opcode !! */
 			case one_byte_opcode :
 				inst_curr_byte = code_buf[instidx++];
-				instruction.opcode_mnemonic =(char *) mnemonic_list[inst_curr_byte];
+				instruction.opcode_mnemonic = (char *)mnemonic_list[inst_curr_byte];
 				switch(inst_curr_byte)
 				{
-					/*	If Prefixes, set corresponding Flag and continue... 	*/
+					/* If Prefixes, set corresponding Flag and continue... 	*/
 					case I386_INS_Two_Byte_Escape_Prefix :
 						next_inst_byte_meaning = two_byte_opcode;
 						break;
@@ -564,7 +538,7 @@ void format_machine_inst()
 					case I386_INS_REX_PREFIX__W_R_X :
 					case I386_INS_REX_PREFIX__W_R_X_B :
 						rex_prefix.Base = (inst_curr_byte & 0x01);
-						rex_prefix.Index = (inst_curr_byte & 0x02) ? 1 : 0;
+						/* rex_prefix.Index = (inst_curr_byte & 0x02) ? 1 : 0; Not currently used */
 						rex_prefix.Reg = (inst_curr_byte & 0x04) ? 1 : 0;
 						rex_prefix.Word64 = (inst_curr_byte & 0x08) ? 1 : 0;
 						if (rex_prefix.Word64)
@@ -592,8 +566,7 @@ void format_machine_inst()
 					case I386_INS_Address_Size_Prefix :
 						address_size_prefix_seen = TRUE;
 						break;
-
-			/* now the instructions having Opcode Extension in the modrm.reg field.. */
+					/* Now the instructions having Opcode Extension in the modrm.reg field.. */
 					case I386_INS_Grp1_Ev_Iv_Prefix :
 					case I386_INS_Grp2_Ev_Iv_Prefix :
 						instruction.destination_operand_class = memory_class;
@@ -656,12 +629,10 @@ void format_machine_inst()
 						instruction.num_operands = grp_prefix + 1;
 						next_inst_byte_meaning = modrm_sib_bytes;
 						break;
-
-				/*	Now the instructions :  Mainly those who have been used in the code generation in .c
-				 *	files.
-				 */
-				/*	Ins :: OPCODE		*/
-
+					/* Now the instructions :  Mainly those who have been used in the code generation in .c
+					 *	files.
+					 */
+					/*	Ins :: OPCODE		*/
 					case (I386_INS_PUSH_eAX + I386_REG_RAX) :
 					case (I386_INS_PUSH_eAX + I386_REG_RCX) :
 					case (I386_INS_PUSH_eAX + I386_REG_RDX) :
@@ -674,7 +645,7 @@ void format_machine_inst()
 						instruction.reg_prefix = 'r';
 						instruction.num_operands = 1;
 						instruction.source_operand_class = register_class;
-						instruction.source_operand_reg = (char *)\
+						instruction.source_operand_reg = (char *)
 							register_list[8 * rex_prefix.Base + inst_curr_byte - I386_INS_PUSH_eAX];
 						print_instruction();
 						break;
@@ -690,7 +661,7 @@ void format_machine_inst()
 						instruction.reg_prefix = 'r';
 						instruction.num_operands = 1;
 						instruction.source_operand_class = register_class;
-						instruction.source_operand_reg =(char *) \
+						instruction.source_operand_reg = (char *)
 							register_list[8 * rex_prefix.Base + inst_curr_byte - I386_INS_POP_eAX];
 						print_instruction();
 						break;
@@ -698,8 +669,12 @@ void format_machine_inst()
 					case I386_INS_MOVSB_Xb_Yb :
 						print_instruction();
 						break;
-
-				/*	Ins :: OPCODE disp8(%rip) 	*/
+					case I386_INS_MOVSW_D_Xv_Yv:
+						assert(rex_prefix.Word64);		/* Expect this to actually be MOVSQ */
+						instruction.opcode_mnemonic = "REP MOVS";
+						print_instruction();
+						break;
+					/* Ins :: OPCODE disp8(%rip) 	*/
 					case I386_INS_JZ_Jb :
 					case I386_INS_JNL_Jb :
 					case I386_INS_JNLE_Jb :
@@ -714,8 +689,7 @@ void format_machine_inst()
 						instruction.num_operands = 1;
 						next_inst_byte_meaning = one_byte_offset;
 						break;
-
-				/*	Ins :: OPCODE disp32(%rip) 	*/
+					/* Ins :: OPCODE disp32(%rip) 	*/
 					case I386_INS_CALL_Jv :
 					case I386_INS_JMP_Jv :
 						instruction.opcode_suffix = ' ';
@@ -725,16 +699,14 @@ void format_machine_inst()
 						instruction.num_operands = 1;
 						next_inst_byte_meaning = double_word_offset;
 						break;
-
-				/*	Ins :: OPCODE IMM8 	*/
+					/* Ins :: OPCODE IMM8 	*/
 					case I386_INS_PUSH_Ib :
 						instruction.opcode_suffix = 'b';
 						instruction.num_operands = 1;
 						instruction.source_operand_class = immediate_class;
 						next_inst_byte_meaning = one_byte_immediate;
 						break;
-
-				/* 	Ins :: OPCODE IMM32/64	*/
+					/* Ins :: OPCODE IMM32/64	*/
 					case I386_INS_PUSH_Iv :
 						instruction.opcode_suffix = 'l';
 						instruction.num_operands = 1;
@@ -747,7 +719,7 @@ void format_machine_inst()
 					case I386_INS_CMP_eAX_Iv :
 						instruction.num_operands = 2;
 						instruction.destination_operand_class = register_class;
-						instruction.destination_operand_reg =(char *) register_list[I386_REG_RAX];
+						instruction.destination_operand_reg = (char *)register_list[I386_REG_RAX];
 						instruction.source_operand_class = immediate_class;
 						if (rex_prefix.Word64 == 0)
 							next_inst_byte_meaning = double_word_immediate;
@@ -764,7 +736,7 @@ void format_machine_inst()
 					case (I386_INS_MOV_eAX + I386_REG_RDI) :
 						instruction.num_operands = 2;
 						instruction.destination_operand_class = register_class;
-						instruction.destination_operand_reg =(char *) \
+						instruction.destination_operand_reg = (char *)
 							register_list[8 * rex_prefix.Base + inst_curr_byte - I386_INS_MOV_eAX];
 						instruction.source_operand_class = immediate_class;
 						if (rex_prefix.Word64 == 0)
@@ -772,8 +744,7 @@ void format_machine_inst()
 						else
 							next_inst_byte_meaning = quad_word_immediate;
 						break;
-
-				/*	Ins :: OPCODE ModRM (Reg, Mem)/(No_IMM)	*/
+					/* Ins :: OPCODE ModRM (Reg, Mem)/(No_IMM)	*/
 					case I386_INS_LEA_Gv_M :
 					case I386_INS_MOV_Gv_Ev :
 					case I386_INS_CMP_Gv_Ev :
@@ -784,9 +755,7 @@ void format_machine_inst()
 						instruction.destination_operand_class = register_class;
 						next_inst_byte_meaning = modrm_sib_bytes;
 						break;
-
-
-				/*	Ins :: OPCODE ModRM (Mem, Reg)/(No_IMM)	*/
+					/* Ins :: OPCODE ModRM (Mem, Reg)/(No_IMM)	*/
 					case I386_INS_MOV_Ev_Gv :
 						instruction.num_operands = 2;
 						instruction.source_operand_class = register_class;
@@ -794,7 +763,7 @@ void format_machine_inst()
 						next_inst_byte_meaning = modrm_sib_bytes;
 						break;
 
-				/*	Ins :: OPCODE ModRM (Mem, IMM) */
+					/* Ins :: OPCODE ModRM (Mem, IMM) */
 					case I386_INS_MOV_Ev_Iv :
 						instruction.num_operands = 2;
 						instruction.destination_operand_class = memory_class;
@@ -828,7 +797,7 @@ void format_machine_inst()
 					case I386_INS_JLE_Jv :
 					case I386_INS_JNLE_Jv :
  						instruction.reg_rip = TRUE;
-						instruction.opcode_mnemonic =(char *) mnemonic_list_2b[inst_curr_byte];
+						instruction.opcode_mnemonic = (char *) mnemonic_list_2b[inst_curr_byte];
 						instruction.source_operand_class = memory_class;
 						set_memory_reg();
 						instruction.num_operands = 1;
@@ -849,8 +818,8 @@ void format_machine_inst()
 						case I386_INS_Grp1_Eb_Ib_Prefix :
 						case I386_INS_Grp1_Ev_Iv_Prefix :
 						case I386_INS_Grp1_Ev_Ib_Prefix :
-							instruction.opcode_mnemonic =(char *) \
-								mnemonic_list_g1[modrm_byte.modrm.reg_opcode];
+							instruction.opcode_mnemonic =
+								(char *)mnemonic_list_g1[modrm_byte.modrm.reg_opcode];
 							break;
 						case I386_INS_Grp2_Eb_Ib_Prefix :
 						case I386_INS_Grp2_Ev_Iv_Prefix :
@@ -858,47 +827,44 @@ void format_machine_inst()
 						case I386_INS_Grp2_Ev_1_Prefix :
 						case I386_INS_Grp2_Eb_CL_Prefix :
 						case I386_INS_Grp2_Ev_CL_Prefix :
-							instruction.opcode_mnemonic = (char *)\
-								mnemonic_list_g2[modrm_byte.modrm.reg_opcode];
+							instruction.opcode_mnemonic =
+								(char *)mnemonic_list_g2[modrm_byte.modrm.reg_opcode];
 							break;
 						case I386_INS_Grp3_Eb_Prefix :
 						case I386_INS_Grp3_Ev_Prefix :
-							instruction.opcode_mnemonic =(char *) \
-								 mnemonic_list_g3[modrm_byte.modrm.reg_opcode];
+							instruction.opcode_mnemonic =
+								(char *)mnemonic_list_g3[modrm_byte.modrm.reg_opcode];
 							break;
 						case I386_INS_Grp4_Prefix :
-							instruction.opcode_mnemonic =(char *) \
-								mnemonic_list_g4[modrm_byte.modrm.reg_opcode];
+							instruction.opcode_mnemonic =
+								(char *)mnemonic_list_g4[modrm_byte.modrm.reg_opcode];
 							break;
 						case I386_INS_Grp5_Prefix :
 							instruction.opcode_suffix = ' ';
-							instruction.opcode_mnemonic =(char *) \
-								mnemonic_list_g5[modrm_byte.modrm.reg_opcode];
+							instruction.opcode_mnemonic =
+								(char *)mnemonic_list_g5[modrm_byte.modrm.reg_opcode];
 							break;
 					}
 				} else
 					set_register_reg();
-
 				set_memory_reg();
-
 				/* Handle the SIB byte ! */
-				if ((modrm_byte.modrm.mod != I386_MOD32_REGISTER) &&
-				    (modrm_byte.modrm.r_m == I386_REG_SIB_FOLLOWS))
+				if ((modrm_byte.modrm.mod != I386_MOD32_REGISTER)
+				    && (modrm_byte.modrm.r_m == I386_REG_SIB_FOLLOWS))
 				{
 					inst_curr_byte = code_buf[instidx++];
 					sib_byte.byte = inst_curr_byte;
-			/*	Assert that the SIB is not used for any complex addressing but is actually a dummy */
+					/* Assert that the SIB is not used for any complex addressing but is actually a dummy */
 					assert((sib_byte.sib.base == I386_REG_ESP) || (sib_byte.sib.base == I386_REG_EBP));
 					assert(sib_byte.sib.ss == I386_SS_TIMES_1);
 					assert(sib_byte.sib.index == I386_REG_NO_INDEX);
 
 					if (instruction.source_operand_class == memory_class)
 						instruction.source_operand_reg =
-							(char *) register_list[sib_byte.sib.base + 8 * rex_prefix.Base];
+							(char *)register_list[sib_byte.sib.base + 8 * rex_prefix.Base];
 					else if (instruction.destination_operand_class == memory_class)
 						instruction.destination_operand_reg =
-							(char *) register_list[sib_byte.sib.base + 8 * rex_prefix.Base];
-
+							(char *)register_list[sib_byte.sib.base + 8 * rex_prefix.Base];
 					switch(modrm_byte.modrm.mod)
 					{
 						case I386_MOD32_BASE :
@@ -1021,7 +987,6 @@ void format_machine_inst()
 				break;
 			default :
 				assertpro(FALSE);
-
 		 }
 	}
 }
diff --git a/sr_x86_64/emit_code_sp.h b/sr_x86_64/emit_code_sp.h
index 0a94de4..77f5e28 100644
--- a/sr_x86_64/emit_code_sp.h
+++ b/sr_x86_64/emit_code_sp.h
@@ -1,6 +1,7 @@
 /****************************************************************
  *                                                              *
- *      Copyright 2007, 2009 Fidelity Information Services, Inc *
+ * Copyright (c) 2007-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *                                                              *
  *      This source code contains the intellectual property     *
  *      of its copyright holder(s), and is made available       *
@@ -12,6 +13,17 @@
 #include "mdef.h"
 #include "x86_64.h"
 
+/* Some general comments on code generation for x86-64:
+ *
+ * 1.  Code generation is a fairly simple subset of what is possible with X86-64. For example, GT.M never
+ *     generates memory-to-memory instructions. Where necessary, values are loaded to a register, then stored.
+ * 2.  Only one use of the REP prefix is with the MOVSQ instructions (MOVSXD with REX bit to make it MOVSQ) used
+ *     for copying MVALs inline in generatede code.
+ * 3.  As noted below, there are several constructs building offsets that come up with different sized offsets
+ *     between some of the compiler phases. Consequently, we force offsets to be 32bit for certain classes of memory
+ *     references. This should be looked at again so we can eliminate the 4 byte "override" as it were which would
+ *     again cause a significant decrease in generated code size.
+ */
 #ifdef DEBUG
 void format_machine_inst(void);
 void initialize_registers(void);
@@ -27,55 +39,13 @@ void clear_memory_reg(void);
 void emit_base_offset(int base, int offset);
 
 /*  Define the COND values for use in the 2 byte JCC instructions.. */
-
 #define INST_SIZE 	1
 #define XFER_BYTE_INST_SIZE 3
 #define XFER_LONG_INST_SIZE 6
 #define BRB_INST_SIZE 2
 #define JMP_LONG_INST_SIZE 5
-#define CALL_4LCLDO_XFER 2	/* index in ttt from start of call[sp] and forlcldo to xfer_table index */
-#define MAX_BRANCH_CODEGEN_SIZE 32  /* The length in bytes, of the longest form of branch instruction sequence */
-
-
-int x86_64_arg_reg(int indx);
-#define GET_ARG_REG(indx)	x86_64_arg_reg(indx)
-
-/* Should be offset from RSP */
-#define STACK_ARG_OFFSET(indx)	(8 * indx)
-
-enum condition
-{
-	JO,
-	JNO,
-	JB,
-	JC = JB,
-	JNAE = JC,
-	JNB,
-	JNC = JNB,
-	JAE = JNB,
-	JZ,
-	JE = JZ,
-	JNZ,
-	JNE = JNZ,
-	JBE,
-	JNA = JBE,
-	JNBE,
-	JA = JNBE,
-	JS,
-	JNS,
-	JP,
-	JPE = JP,
-	JNP,
-	JPO = JNP,
-	JL,
-	JNGE = JL,
-	JNL,
-	JGE = JNL,
-	JLE,
-	JNG = JLE,
-	JNLE,
-	JG = JNLE
-};
+#define CALL_4LCLDO_XFER 2		/* Index in ttt from start of call[sp] and forlcldo to xfer_table index */
+#define MAX_BRANCH_CODEGEN_SIZE 32	/* The length in bytes, of the longest form of branch instruction sequence */
 
 #define REX_FIELD 	char
 
@@ -85,62 +55,39 @@ enum condition
 #define REX_R 	0x04
 #define REX_W	0x08
 
+/* Size of the MVAL in quadwords (64 bits on x86_64) - used when copying mval */
+#define MVAL_QWORD_SIZE	(SIZEOF(mval) / SIZEOF(long))
+
+/* Macro used to clear the flags in emit_base_info.flags. Using this method rather than declaring a union and complicating
+ * the reference we make (and gendefinedtypesinit.csh doesn't like unnamed unions/structs at this point 7/2016). Note since
+ * we no longer clear the other parts of the structure with memset(), we do need to explicitly zero out the rex field
+ * since it is assumed 0 after a clear and flags are OR'd into it.
+ */
+#define CLEAR_EMIT_BASE_INFO				\
+MBSTART {						\
+	*((char *)(&emit_base_info.flags)) = 0;		\
+	emit_base_info.rex = 0;				\
+} MBEND
+
 /* Note that while the register number we use in gtm can go from 0-15, the number of bits in the modrm/sib regfields are only 3.
  * So if we need to use the regs r8-r15, then a bit in the REX field should be set (depending on whether the register is encoded
- * in the sib or opcode or modrm, etc.
+ * in the sib or opcode or modrm, etc).
  */
-#define SET_REX_PREFIX(REX_MANDATORY, REX_COND, reg)	\
-{ \
-  if (reg & 0x8) {  /* If bit 3 (index starting from 0) is set, set the specified REX bit */	\
-	emit_base_info.rex |= REX_COND;		\
-  } \
-  emit_base_info.rex |= REX_OP | REX_MANDATORY; \
-  emit_base_info.rex_set = 1; \
-}
+#define SET_REX_PREFIX(REX_MANDATORY, REX_COND, reg)							\
+MBSTART { 												\
+	if (reg & 0x8)	/* If bit 3 (index starting from 0) is set, set the specified REX bit */	\
+		emit_base_info.rex |= REX_COND;								\
+	emit_base_info.rex |= REX_OP | REX_MANDATORY;							\
+	emit_base_info.flags.rex_set = TRUE;								\
+} MBEND
 
-typedef union
-{
-	ModR_M		modrm;
-	unsigned char	byte;
-} modrm_byte_type;
-
-typedef union
-{
-	SIB		sib;
-	unsigned char	byte;
-} sib_byte_type;
-
-/* Instead of filling up the code buf, emit_base_offset will instead fill this structure, which will be used by the
- * macro which actually creates the instruction stream
- */
-struct emit_base_info
-{
-	REX_FIELD rex;
-	modrm_byte_type modrm_byte;
-	sib_byte_type sib_byte;
-	char offset8;
-	int offset32;
-	int64_t offset64;
-	char imm8;
-	int imm32;
-	int64_t imm64;
-	int rex_set;
-	int modrm_byte_set;
-	int sib_byte_set; /* Not using bitfields, since this would generate faster code. Since this is a one-type only
-			   * created object, no real need for space optimization
-			   */
-	int offset8_set;
-	int offset32_set;
-	int offset64_set;
-	int imm8_set;
-	int imm32_set;
-	int imm64_set;
-};
+int x86_64_arg_reg(int indx);
+#define GET_ARG_REG(indx)	x86_64_arg_reg(indx)
 
-GBLREF struct emit_base_info emit_base_info;
+/* Should be offset from RSP */
+#define STACK_ARG_OFFSET(indx)	(8 * indx)
 
 /* Define the macros for the instructions to be generated.. */
-
 #define GENERIC_OPCODE_BEQ		1
 #define GENERIC_OPCODE_BGE		2
 #define GENERIC_OPCODE_BGT		3
@@ -157,346 +104,431 @@ GBLREF struct emit_base_info emit_base_info;
 #define GENERIC_OPCODE_NOP		15
 
 #define LONG_JUMP_OFFSET 		(0x7ffffffc)
-#define MAX_OFFSET				0xffffffff
+#define MAX_OFFSET			0xffffffff
 #define EMIT_JMP_ADJUST_BRANCH_OFFSET	branch_offset -= 5
 
-
-#define EMIT_BASE_CODE_SIZE ((emit_base_info.rex_set ? 1 : 0) /* REX */ + 1 /* OPCODE */ + \
-				(emit_base_info.modrm_byte_set ? 1 : 0)  /* MODRM */ + \
-				(emit_base_info.sib_byte_set ? 1 : 0) + (emit_base_info.offset8_set ? 1 : 0) + \
-				(emit_base_info.offset32_set ? 4 : 0) + (emit_base_info.offset64_set ? 8 : 0) + \
-				(emit_base_info.imm8_set ? 1 : 0) + (emit_base_info.imm32_set ? 4 : 0) + \
-				(emit_base_info.imm64_set ? 8 : 0))
-
-#define CODE_BUF_GEN(op_code)			\
-{ \
-	(emit_base_info.rex_set) ? (code_buf[code_idx++] = emit_base_info.rex):0;	\
-	code_buf[code_idx++] = (char) op_code;			\
-	if (emit_base_info.modrm_byte_set)  { \
-		code_buf[code_idx++] = emit_base_info.modrm_byte.byte; \
-	} \
-	if (emit_base_info.sib_byte_set) { \
-		code_buf[code_idx++] = emit_base_info.sib_byte.byte; \
-	} \
-	if (emit_base_info.offset8_set) { \
-		code_buf[code_idx++] = emit_base_info.offset8; \
-	} \
-	if (emit_base_info.offset32_set) { \
-		*((int4 *)&code_buf[code_idx]) = emit_base_info.offset32; \
-		code_idx += SIZEOF(int4) ;			\
-	} \
-	if (emit_base_info.offset64_set) { \
-		*((int64_t *)&code_buf[code_idx]) = emit_base_info.offset64; \
-		code_idx += SIZEOF(int64_t) ;			\
-	} \
-	if (emit_base_info.imm8_set) { \
-		code_buf[code_idx++] = emit_base_info.imm8; \
-	} \
-	if (emit_base_info.imm32_set) { \
-		*((int4 *)&code_buf[code_idx]) = emit_base_info.imm32; \
-		code_idx += SIZEOF(int4) ;			\
-	} \
-	if (emit_base_info.imm64_set) { \
-		*((int64_t *)&code_buf[code_idx]) = emit_base_info.imm64; \
-		code_idx += SIZEOF(int64_t) ;			\
-	} \
-}
-
-#define IGEN_LOAD_WORD_REG_8(reg) \
-{ \
-	SET_REX_PREFIX(REX_W, REX_R, reg)				\
-	emit_base_info.modrm_byte.modrm.reg_opcode = reg & 0x7;	\
-	CODE_BUF_GEN(I386_INS_MOV_Gv_Ev)				\
-}
+/* Note: the code base contains an odd assortment of unused features of the x86-64 architecture. Many of these
+ * unused features are not fully implemented but for the pieces that are implemented, where testing for them causes
+ * us to spend time doing unnecessary IF tests or clearing unnecessary storage (such as in emit_base_info struct),
+ * those features are commented out rather than removed in case they are needed in the future.
+ */
+#define EMIT_BASE_CODE_SIZE ((emit_base_info.flags.rex_set ? 1 : 0) /* REX */ + 1 /* OPCODE */ 			\
+	+ (emit_base_info.flags.modrm_byte_set ? 1 : 0)  /* MODRM */						\
+	+ (emit_base_info.flags.sib_byte_set ? 1 : 0) + (emit_base_info.flags.offset8_set ? 1 : 0)		\
+	+ (emit_base_info.flags.offset32_set ? 4 : 0)								\
+	+ (emit_base_info.flags.imm32_set ? 4 : 0)								\
+	/* + (emit_base_info.flags.offset64_set ? 8 : 0) + not used */						\
+	/* + (emit_base_info.flags.imm8_set ? 1 : 0) not used */						\
+	/* + (emit_base_info.flags.imm64_set ? 8 : 0) not used */)
+
+/* Generate a memory reference using flags/values in emit_base_info structre. Note some field references
+ * have been commented out as GT.M does not currently use them (so no use testing for them). If these
+ * types become useful (and fully implemented), this/these line(s) can be uncommented.
+ */
+#define CODE_BUF_GEN(op_code)								\
+MBSTART {										\
+	(emit_base_info.flags.rex_set) ? (code_buf[code_idx++] = emit_base_info.rex):0;	\
+	code_buf[code_idx++] = (char)op_code;						\
+	if (emit_base_info.flags.modrm_byte_set)					\
+		code_buf[code_idx++] = emit_base_info.modrm_byte.byte;			\
+	if (emit_base_info.flags.sib_byte_set)						\
+		code_buf[code_idx++] = emit_base_info.sib_byte.byte;			\
+	if (emit_base_info.flags.offset8_set)						\
+		code_buf[code_idx++] = emit_base_info.offset8;				\
+	else if (emit_base_info.flags.offset32_set)					\
+	{										\
+		*((int4 *)&code_buf[code_idx]) = emit_base_info.offset32;		\
+		code_idx += SIZEOF(int4);						\
+	}										\
+	/* else if (emit_base_info.offset64_set)	Not currently used	*/	\
+	/* {									*/	\
+	/*	*((int64_t *)&code_buf[code_idx]) = emit_base_info.offset64; 	*/	\
+	/*	code_idx += SIZEOF(int64_t);					*/	\
+	/* }									*/	\
+	/* if (emit_base_info.flags.imm8_set)					*/	\
+	/*	code_buf[code_idx++] = emit_base_info.imm8;			*/	\
+	/* else 								*/	\
+	if (emit_base_info.flags.imm32_set)						\
+	{										\
+		*((int4 *)&code_buf[code_idx]) = emit_base_info.imm32;			\
+		code_idx += SIZEOF(int4);						\
+	}										\
+	/* else if (emit_base_info.imm64_set)			       		*/	\
+	/* {									*/	\
+	/* 	*((int64_t *)&code_buf[code_idx]) = emit_base_info.imm64;	*/	\
+	/* 	code_idx += SIZEOF(int64_t);					*/	\
+	/* }									*/	\
+} MBEND
+
+#define IGEN_LOAD_WORD_REG_8(reg)					\
+MBSTART {								\
+	SET_REX_PREFIX(REX_W, REX_R, reg);				\
+	emit_base_info.modrm_byte.modrm.reg_opcode = reg & 0x7;		\
+	CODE_BUF_GEN(I386_INS_MOV_Gv_Ev);				\
+} MBEND
+/* Only used immediately after call to emit_base_offset() which does a CLEAR_EMIT_BASE_INFO macro */
 #define IGEN_LOAD_NATIVE_REG(reg)	IGEN_LOAD_WORD_REG_8(reg)
 
 /* Sign extended load */
-#define IGEN_LOAD_WORD_REG_4(reg) \
-{ \
-	SET_REX_PREFIX(REX_W, REX_R, reg)				\
-	emit_base_info.modrm_byte.modrm.reg_opcode = reg & 0x7;	\
-	CODE_BUF_GEN(I386_INS_MOVSXD_Gv_Ev)				\
-}
-
-#define IGEN_STORE_WORD_REG_8(reg) \
-{ \
-	SET_REX_PREFIX(REX_W, REX_R, reg)				\
-	emit_base_info.modrm_byte.modrm.reg_opcode = reg & 0x7;	\
-	CODE_BUF_GEN(I386_INS_MOV_Ev_Gv) \
-}
-
-#define IGEN_STORE_WORD_REG_4(reg) \
-{ \
-	SET_REX_PREFIX(0, REX_R, reg)					\
-	emit_base_info.modrm_byte.modrm.reg_opcode = reg & 0x7;	\
-	CODE_BUF_GEN(I386_INS_MOV_Ev_Gv) \
-}
-
-#define IGEN_STORE_ZERO_REG_8(reg) \
-{ \
-	SET_REX_PREFIX(REX_W, 0, 0)				\
-	emit_base_info.imm32 = 0; \
-	emit_base_info.imm32_set = 1; \
-	CODE_BUF_GEN(I386_INS_MOV_Ev_Iv) \
-}
-
-#define IGEN_STORE_ZERO_REG_4(reg)	\
-{ \
-	emit_base_info.imm32 = 0;	\
-	emit_base_info.imm32_set = 1;	\
-	CODE_BUF_GEN(I386_INS_MOV_Ev_Iv)	\
-}
-
-#define IGEN_GENERIC_REG(opcode, reg) \
-{\
-	switch(opcode)  \
-	{\
-		case  GENERIC_OPCODE_LDA:\
-			IGEN_LOAD_ADDR_REG(reg)\
-			break;\
-		case GENERIC_OPCODE_LOAD:\
-			if ( next_ptr_offset == 4 ) {	\
+#define IGEN_LOAD_WORD_REG_4(reg)					\
+MBSTART {								\
+	SET_REX_PREFIX(REX_W, REX_R, reg);				\
+	emit_base_info.modrm_byte.modrm.reg_opcode = reg & 0x7;		\
+	CODE_BUF_GEN(I386_INS_MOVSXD_Gv_Ev);				\
+} MBEND
+
+#define IGEN_STORE_WORD_REG_8(reg)					\
+MBSTART {								\
+	SET_REX_PREFIX(REX_W, REX_R, reg);				\
+	emit_base_info.modrm_byte.modrm.reg_opcode = reg & 0x7;		\
+	CODE_BUF_GEN(I386_INS_MOV_Ev_Gv);				\
+} MBEND
+
+#define IGEN_STORE_WORD_REG_4(reg)					\
+MBSTART {								\
+	SET_REX_PREFIX(0, REX_R, reg);					\
+	emit_base_info.modrm_byte.modrm.reg_opcode = reg & 0x7;		\
+	CODE_BUF_GEN(I386_INS_MOV_Ev_Gv);				\
+} MBEND
+
+#define IGEN_STORE_ZERO_REG_8(reg)				\
+MBSTART {							\
+	SET_REX_PREFIX(REX_W, 0, 0);				\
+	emit_base_info.imm32 = 0;				\
+	emit_base_info.flags.imm32_set = TRUE;			\
+	CODE_BUF_GEN(I386_INS_MOV_Ev_Iv);			\
+} MBEND
+
+#define IGEN_STORE_ZERO_REG_4(reg)				\
+MBSTART {							\
+	emit_base_info.imm32 = 0;				\
+	emit_base_info.flags.imm32_set = TRUE;			\
+	CODE_BUF_GEN(I386_INS_MOV_Ev_Iv);			\
+} MBEND
+
+#define IGEN_GENERIC_REG(opcode, reg)				\
+MBSTART {							\
+	switch(opcode)						\
+	{							\
+		case GENERIC_OPCODE_LDA:			\
+			IGEN_LOAD_ADDR_REG(reg);		\
+			break;					\
+		case GENERIC_OPCODE_LOAD:			\
+			if (4 == next_ptr_offset)		\
 				IGEN_LOAD_WORD_REG_4(reg);	\
-			} else	{\
-				IGEN_LOAD_WORD_REG_8(reg); \
-			}	\
-			next_ptr_offset = 8;	\
-			break;\
-		case GENERIC_OPCODE_STORE:\
-			if ( next_ptr_offset == 4 ) {	\
+			else					\
+				IGEN_LOAD_WORD_REG_8(reg);	\
+			next_ptr_offset = 8;			\
+			break;					\
+		case GENERIC_OPCODE_STORE:			\
+			if (4 == next_ptr_offset)		\
 				IGEN_STORE_WORD_REG_4(reg);	\
-			} else	{\
-				IGEN_STORE_WORD_REG_8(reg); \
-			}	\
-			next_ptr_offset = 8;	\
-			break;\
-		case GENERIC_OPCODE_STORE_ZERO:\
-			if ( next_ptr_offset == 4 ) {	\
+			else					\
+				IGEN_STORE_WORD_REG_8(reg);	\
+			next_ptr_offset = 8;			\
+			break;					\
+		case GENERIC_OPCODE_STORE_ZERO:			\
+			if (4 == next_ptr_offset)		\
 				IGEN_STORE_ZERO_REG_4(reg);	\
-			} else	{\
-				IGEN_STORE_ZERO_REG_8(reg); \
-			}	\
-			next_ptr_offset = 8;	\
-			break;\
-		default: /* which opcode ? */ \
-			GTMASSERT;\
-			break;\
-	}\
-}
-
+			else					\
+				IGEN_STORE_ZERO_REG_8(reg);	\
+			next_ptr_offset = 8;			\
+			break;					\
+		default: /* which opcode ? */			\
+			assertpro(FALSE);			\
+			break;					\
+	}							\
+} MBEND
+
+/* Only used immediately after call to emit_base_offset() which does a CLEAR_EMIT_BASE_INFO macro */
 #define IGEN_LOAD_LINKAGE(reg)	 	IGEN_LOAD_WORD_REG_8(reg)
 
-#define IGEN_LOAD_ADDR_REG(reg)		\
-{ \
-	SET_REX_PREFIX(REX_W, REX_R, reg)					\
+#define IGEN_LOAD_ADDR_REG(reg)					\
+MBSTART {							\
+	SET_REX_PREFIX(REX_W, REX_R, reg);			\
 	emit_base_info.modrm_byte.modrm.reg_opcode = reg & 0x7;	\
-	CODE_BUF_GEN(I386_INS_LEA_Gv_M) \
-}
-
-#define GEN_STORE_ARG(reg, offset)	\
-{ \
-	X86_64_ONLY(force_32 = TRUE;)	\
-	GEN_STORE_WORD_8(reg, I386_REG_RSP, offset)	\
-	X86_64_ONLY(force_32 = FALSE;)	\
-}
-
-#define GEN_LOAD_WORD_8(reg, base_reg, offset)	\
-{ \
-	emit_base_offset(base_reg, offset);				\
-	SET_REX_PREFIX(REX_W, REX_R, reg)				\
+	CODE_BUF_GEN(I386_INS_LEA_Gv_M);			\
+} MBEND
+
+#define GEN_STORE_ARG(reg, offset)				\
+MBSTART {							\
+	X86_64_ONLY(force_32 = TRUE;)				\
+	GEN_STORE_WORD_8(reg, I386_REG_RSP, offset);		\
+	X86_64_ONLY(force_32 = FALSE;)				\
+} MBEND
+
+#define GEN_LOAD_WORD_8(reg, base_reg, offset)			\
+MBSTART {							\
+	emit_base_offset(base_reg, offset);			\
+	SET_REX_PREFIX(REX_W, REX_R, reg);			\
 	emit_base_info.modrm_byte.modrm.reg_opcode = reg & 0x7;	\
-	CODE_BUF_GEN(I386_INS_MOV_Gv_Ev) \
-}
+	CODE_BUF_GEN(I386_INS_MOV_Gv_Ev);			\
+} MBEND
 
 /* Load 4 bytes with sign extension */
-#define GEN_LOAD_WORD_4(reg, base_reg, offset)	\
-{ \
-	emit_base_offset(base_reg, offset);					\
-	SET_REX_PREFIX(REX_W, REX_R, reg)				\
+#define GEN_LOAD_WORD_4(reg, base_reg, offset)			\
+MBSTART {							\
+	emit_base_offset(base_reg, offset);			\
+	SET_REX_PREFIX(REX_W, REX_R, reg);			\
 	emit_base_info.modrm_byte.modrm.reg_opcode = reg & 0x7;	\
-	CODE_BUF_GEN(I386_INS_MOVSXD_Gv_Ev) \
-}
+	CODE_BUF_GEN(I386_INS_MOVSXD_Gv_Ev);			\
+} MBEND
 
-#define GEN_STORE_WORD_8(reg, base_reg, offset)	\
-{ \
-	emit_base_offset(base_reg, offset);					\
-	SET_REX_PREFIX(REX_W, REX_R, reg)				\
+#define GEN_STORE_WORD_8(reg, base_reg, offset)			\
+MBSTART {							\
+	emit_base_offset(base_reg, offset);			\
+	SET_REX_PREFIX(REX_W, REX_R, reg);			\
 	emit_base_info.modrm_byte.modrm.reg_opcode = reg & 0x7;	\
-	CODE_BUF_GEN(I386_INS_MOV_Ev_Gv) \
-}
+	CODE_BUF_GEN(I386_INS_MOV_Ev_Gv);			\
+} MBEND
 
-#define GEN_STORE_WORD_4(reg, base_reg, offset)	\
-{ \
-	emit_base_offset(base_reg, offset);					\
-	SET_REX_PREFIX(0, REX_R, reg)					\
+#define GEN_STORE_WORD_4(reg, base_reg, offset)			\
+MBSTART {							\
+	emit_base_offset(base_reg, offset);			\
+	SET_REX_PREFIX(0, REX_R, reg);				\
 	emit_base_info.modrm_byte.modrm.reg_opcode = reg & 0x7;	\
-	CODE_BUF_GEN(I386_INS_MOV_Ev_Gv) \
-}
-
-#define GEN_LOAD_IMMED(reg, imval)	\
-{ \
-	int op_code = I386_INS_MOV_eAX + (reg & 0x7); \
-	memset((void *)&emit_base_info, 0, SIZEOF(emit_base_info));	\
-	SET_REX_PREFIX(0, REX_B, reg) \
-	emit_base_info.imm32 = (int) imval & 0xffffffff;	\
-	emit_base_info.imm32_set = 1; \
-	CODE_BUF_GEN(op_code)	\
-}
+	CODE_BUF_GEN(I386_INS_MOV_Ev_Gv);			\
+} MBEND
+
+#define GEN_LOAD_IMMED(reg, imval)				\
+MBSTART {							\
+	CLEAR_EMIT_BASE_INFO;					\
+	SET_REX_PREFIX(0, REX_B, reg);				\
+	emit_base_info.imm32 = imval & 0xffffffff;		\
+	emit_base_info.flags.imm32_set = TRUE;			\
+	CODE_BUF_GEN(I386_INS_MOV_eAX + (reg & 0x7));		\
+} MBEND
 
 #define GEN_CLEAR_WORD_EMIT(reg)	emit_trip(*(fst_opr + *inst++), TRUE, GENERIC_OPCODE_STORE_ZERO, reg)
 
-#define GEN_LOAD_WORD_EMIT(reg)	 emit_trip(*(fst_opr + *inst++), TRUE, GENERIC_OPCODE_LOAD, reg)
+#define GEN_LOAD_WORD_EMIT(reg)		emit_trip(*(fst_opr + *inst++), TRUE, GENERIC_OPCODE_LOAD, reg)
 
 #define EMIT_TRIP_ILIT_GEN		GEN_LOAD_IMMED(trg_reg, immediate)
 
-#define GEN_XFER_TBL_CALL(xfer)	 \
-{  \
-	emit_base_offset(GTM_REG_XFER_TABLE, xfer); \
-	emit_base_info.rex_set = 0;					\
-	assert(GTM_REG_XFER_TABLE <= 7); /* if its a 64 bit register, we might need to set the REX bit */ \
-	emit_base_info.modrm_byte.modrm.reg_opcode = (char) I386_INS_CALL_Ev; \
-	CODE_BUF_GEN(I386_INS_Grp5_Prefix) \
-}
-
-#define GEN_CMP_EAX_IMM32(imm)	\
-{ \
-	int op_code = I386_INS_CMP_eAX_Iv ; \
-	memset((void *)&emit_base_info, 0, SIZEOF(emit_base_info));	\
-	emit_base_info.imm32 = (int4) imm & 0xffffffff;	\
-	emit_base_info.imm32_set = 1; \
-	CODE_BUF_GEN(op_code)	\
-}
-
-
-
-#define GEN_CMP_MEM64_ZERO(base_reg, offset)			\
-{ \
-	int op_code = I386_INS_Grp1_Ev_Iv_Prefix; \
-	emit_base_offset(base_reg, offset); \
-	SET_REX_PREFIX(REX_W, 0, 0) \
-	emit_base_info.modrm_byte.modrm.reg_opcode = I386_INS_CMP__; \
-	emit_base_info.imm32 = (int4) 0; \
-	emit_base_info.imm32_set = 1; \
-	CODE_BUF_GEN(op_code)	\
-}
-
-#define GEN_CMP_MEM32_ZERO(base_reg, offset)			\
-{ \
-	int op_code = I386_INS_Grp1_Ev_Iv_Prefix; \
-	emit_base_offset(base_reg, offset); \
-	emit_base_info.modrm_byte.modrm.reg_opcode = I386_INS_CMP__; \
-	emit_base_info.imm32 = (int4) 0 ;  \
-	emit_base_info.imm32_set = 1; \
-	CODE_BUF_GEN(op_code)	\
-}
+#define GEN_XFER_TBL_CALL(xfer)											\
+MBSTART {													\
+	emit_base_offset(GTM_REG_XFER_TABLE, xfer);								\
+	emit_base_info.flags.rex_set = FALSE;									\
+	assert(7 >= GTM_REG_XFER_TABLE); /* if its a 64 bit register, we might need to set the REX bit */	\
+	emit_base_info.modrm_byte.modrm.reg_opcode = (char)I386_INS_CALL_Ev;					\
+	CODE_BUF_GEN(I386_INS_Grp5_Prefix);									\
+} MBEND
+
+#define GEN_CMP_EAX_IMM32(imm)				\
+MBSTART {						\
+	CLEAR_EMIT_BASE_INFO;				\
+	emit_base_info.imm32 = (int4)imm & 0xffffffff;	\
+	emit_base_info.flags.imm32_set = TRUE;		\
+	CODE_BUF_GEN(I386_INS_CMP_eAX_Iv);		\
+} MBEND
+
+#define GEN_CMP_MEM64_ZERO(base_reg, offset)				\
+MBSTART {								\
+	emit_base_offset(base_reg, offset);				\
+	SET_REX_PREFIX(REX_W, 0, 0);					\
+	emit_base_info.modrm_byte.modrm.reg_opcode = I386_INS_CMP__;	\
+	emit_base_info.imm32 = 0;					\
+	emit_base_info.flags.imm32_set = TRUE;				\
+	CODE_BUF_GEN(I386_INS_Grp1_Ev_Iv_Prefix);			\
+} MBEND
+
+#define GEN_CMP_MEM32_ZERO(base_reg, offset)				\
+MBSTART {								\
+	emit_base_offset(base_reg, offset);				\
+	emit_base_info.modrm_byte.modrm.reg_opcode = I386_INS_CMP__;	\
+	emit_base_info.imm32 = 0;					\
+	emit_base_info.flags.imm32_set = TRUE;				\
+	CODE_BUF_GEN(I386_INS_Grp1_Ev_Iv_Prefix);			\
+} MBEND
 
 #define GEN_CMP_REG_MEM32(reg, base_reg, offset)			\
-{ \
-	int op_code = I386_INS_CMP_Gv_Ev; \
-	emit_base_offset(base_reg, offset); \
-	SET_REX_PREFIX(0, REX_R, reg)					\
-	emit_base_info.modrm_byte.modrm.reg_opcode = reg & 0x7;	\
-	CODE_BUF_GEN(op_code)	\
-}
+MBSTART {								\
+	emit_base_offset(base_reg, offset);				\
+	SET_REX_PREFIX(0, REX_R, reg);					\
+	emit_base_info.modrm_byte.modrm.reg_opcode = reg & 0x7;		\
+	CODE_BUF_GEN(I386_INS_CMP_Gv_Ev);				\
+} MBEND
 
 #define GEN_CMP_REG_MEM64(reg, base_reg, offset)			\
-{ \
-	int op_code = I386_INS_CMP_Gv_Ev; \
-	emit_base_offset(base_reg, offset); \
-	SET_REX_PREFIX(REX_W, REX_R, reg)					\
-	emit_base_info.modrm_byte.modrm.reg_opcode = reg & 0x7;	\
-	CODE_BUF_GEN(op_code)	\
-}
-
-#define GEN_CMP_REGS(reg1, reg2) \
-{ \
-	int op_code = I386_INS_CMP_Gv_Ev; \
-	memset((void *)&emit_base_info, 0, SIZEOF(emit_base_info));	\
-	SET_REX_PREFIX(REX_W, REX_R, reg1)					\
-	SET_REX_PREFIX(0, REX_B, reg2)					\
+MBSTART {								\
+	emit_base_offset(base_reg, offset);				\
+	SET_REX_PREFIX(REX_W, REX_R, reg);				\
+	emit_base_info.modrm_byte.modrm.reg_opcode = reg & 0x7;		\
+	CODE_BUF_GEN(I386_INS_CMP_Gv_Ev);				\
+} MBEND
+
+#define GEN_CMP_REGS(reg1, reg2)					\
+MBSTART {								\
+	CLEAR_EMIT_BASE_INFO;						\
+	SET_REX_PREFIX(REX_W, REX_R, reg1);				\
+	SET_REX_PREFIX(0, REX_B, reg2);					\
 	emit_base_info.modrm_byte.modrm.reg_opcode = reg1 & 0x7;	\
-	emit_base_info.modrm_byte.modrm.mod = I386_MOD32_REGISTER; \
-	emit_base_info.modrm_byte.modrm.r_m = reg2 & 0x7;	\
-	emit_base_info.modrm_byte_set = 1; \
-	CODE_BUF_GEN(op_code)	\
-}
+	emit_base_info.modrm_byte.modrm.mod = I386_MOD32_REGISTER;	\
+	emit_base_info.modrm_byte.modrm.r_m = reg2 & 0x7;		\
+	emit_base_info.flags.modrm_byte_set = TRUE;			\
+	CODE_BUF_GEN(I386_INS_CMP_Gv_Ev);				\
+} MBEND
 
 /* Note that there is no CMP_IMM64 in AMD64 */
-#define GEN_CMP_IMM32(reg, imm)			\
-{ \
-	int op_code = I386_INS_Grp1_Ev_Iv_Prefix; \
-	memset((void *)&emit_base_info, 0, SIZEOF(emit_base_info));	\
-	emit_base_info.modrm_byte.modrm.reg_opcode = I386_INS_CMP__; \
-	emit_base_info.modrm_byte.modrm.mod = I386_MOD32_REGISTER; \
-	emit_base_info.modrm_byte.modrm.r_m = reg & 0x7; \
-	emit_base_info.modrm_byte_set = 1; \
-	SET_REX_PREFIX(0, REX_B, reg) \
-	emit_base_info.imm32 = (int4) imm & 0xffffffff;	\
-	emit_base_info.imm32_set = 1; \
-	CODE_BUF_GEN(op_code)	\
-}
-
-
-#define GEN_SUBTRACT_REGS(src1, src2, trgt)	GTMASSERT;
-
-#define GEN_ADD_IMMED(reg, imval)		\
-{ \
-	int op_code = I386_INS_Grp1_Ev_Iv_Prefix; \
-	memset((void *)&emit_base_info, 0, SIZEOF(emit_base_info)); \
-	SET_REX_PREFIX(REX_W, REX_B, reg) \
-	emit_base_info.modrm_byte_set = 1;	\
+#define GEN_CMP_IMM32(reg, imm)						\
+MBSTART {								\
+	CLEAR_EMIT_BASE_INFO;						\
+	emit_base_info.modrm_byte.modrm.reg_opcode = I386_INS_CMP__;	\
+	emit_base_info.modrm_byte.modrm.mod = I386_MOD32_REGISTER;	\
+	emit_base_info.modrm_byte.modrm.r_m = reg & 0x7;		\
+	emit_base_info.flags.modrm_byte_set = TRUE;			\
+	SET_REX_PREFIX(0, REX_B, reg);					\
+	emit_base_info.imm32 = imm & 0xffffffff;			\
+	emit_base_info.flags.imm32_set = TRUE;				\
+	CODE_BUF_GEN(I386_INS_Grp1_Ev_Iv_Prefix);			\
+} MBEND
+
+#define GEN_SUBTRACT_REGS(src1, src2, trgt) assertpro(FALSE);
+
+#define GEN_ADD_IMMED(reg, imval)					\
+MBSTART {								\
+	CLEAR_EMIT_BASE_INFO;						\
+	SET_REX_PREFIX(REX_W, REX_B, reg);				\
+	emit_base_info.flags.modrm_byte_set = TRUE;			\
 	emit_base_info.modrm_byte.modrm.mod = I386_MOD32_REGISTER;	\
 	emit_base_info.modrm_byte.modrm.reg_opcode = I386_INS_ADD__;	\
-	emit_base_info.modrm_byte.modrm.r_m = reg & 0x7; \
-	emit_base_info.imm32 = (int4) imval;  \
-	emit_base_info.imm32_set = 1; \
-	CODE_BUF_GEN(op_code)	\
-}
-
-#define GEN_MOVE_REG(trg, src)	\
-{ \
-	int op_code = I386_INS_MOV_Ev_Gv; \
-	memset((void *)&emit_base_info, 0, SIZEOF(emit_base_info)); \
-	SET_REX_PREFIX(REX_W, REX_B, trg) \
-	SET_REX_PREFIX(0, REX_R, src) \
-	emit_base_info.modrm_byte_set = 1;	\
+	emit_base_info.modrm_byte.modrm.r_m = reg & 0x7;		\
+	emit_base_info.imm32 = imval;					\
+	emit_base_info.flags.imm32_set = TRUE;				\
+	CODE_BUF_GEN(I386_INS_Grp1_Ev_Iv_Prefix);			\
+} MBEND
+
+#define GEN_MOVE_REG(trg, src)						\
+MBSTART {								\
+	CLEAR_EMIT_BASE_INFO;						\
+	SET_REX_PREFIX(REX_W, REX_B, trg);				\
+	SET_REX_PREFIX(0, REX_R, src);					\
+	emit_base_info.flags.modrm_byte_set = TRUE;			\
 	emit_base_info.modrm_byte.modrm.mod = I386_MOD32_REGISTER;	\
-	emit_base_info.modrm_byte.modrm.reg_opcode = src;	\
-	emit_base_info.modrm_byte.modrm.r_m = trg & 0x7;	\
-	CODE_BUF_GEN(op_code)	\
-}
-
-#define GEN_JUMP_REG(reg)	\
-{ \
-	int op_code = I386_INS_Grp5_Prefix; \
-	memset((void *)&emit_base_info, 0, SIZEOF(emit_base_info)); \
-	SET_REX_PREFIX(REX_OP | REX_W, REX_B, reg) \
-	emit_base_info.modrm_byte_set = 1;	\
+	emit_base_info.modrm_byte.modrm.reg_opcode = src;		\
+	emit_base_info.modrm_byte.modrm.r_m = trg & 0x7;		\
+	CODE_BUF_GEN(I386_INS_MOV_Ev_Gv);				\
+} MBEND
+
+#define GEN_JUMP_REG(reg)						\
+MBSTART {								\
+	CLEAR_EMIT_BASE_INFO;						\
+	SET_REX_PREFIX(REX_OP | REX_W, REX_B, reg);			\
+	emit_base_info.flags.modrm_byte_set = TRUE;			\
 	emit_base_info.modrm_byte.modrm.mod = I386_MOD32_REGISTER;	\
 	emit_base_info.modrm_byte.modrm.reg_opcode = I386_INS_JMP_Ev;	\
-	emit_base_info.modrm_byte.modrm.r_m = reg & 0x7;	\
-	CODE_BUF_GEN(op_code)	\
-}
-
-#define GEN_PCREL		\
-{ \
-	int op_code = I386_INS_CALL_Jv; \
-	memset((void *)&emit_base_info, 0, SIZEOF(emit_base_info)); \
-	emit_base_info.imm32 = 0; \
-	emit_base_info.imm32_set = 1; \
-	CODE_BUF_GEN(op_code)	\
-	memset((void *)&emit_base_info, 0, SIZEOF(emit_base_info)); \
-	op_code = I386_INS_POP_eAX + (GTM_REG_CODEGEN_TEMP & 0x7);	\
-	SET_REX_PREFIX(0, REX_B, GTM_REG_CODEGEN_TEMP) \
-	assert(GTM_REG_CODEGEN_TEMP > 7); \
-	CODE_BUF_GEN(op_code) \
-}
+	emit_base_info.modrm_byte.modrm.r_m = reg & 0x7;		\
+	CODE_BUF_GEN(I386_INS_Grp5_Prefix);				\
+} MBEND
+
+#define GEN_PCREL							\
+MBSTART {								\
+	CLEAR_EMIT_BASE_INFO;						\
+	emit_base_info.imm32 = 0;					\
+	emit_base_info.flags.imm32_set = TRUE;				\
+	CODE_BUF_GEN(I386_INS_CALL_Jv);					\
+	CLEAR_EMIT_BASE_INFO;						\
+	SET_REX_PREFIX(0, REX_B, GTM_REG_CODEGEN_TEMP);			\
+	assert(7 < GTM_REG_CODEGEN_TEMP);				\
+	CODE_BUF_GEN(I386_INS_POP_eAX + (GTM_REG_CODEGEN_TEMP & 0x7));	\
+} MBEND
+
+#define GEN_MVAL_COPY(SRC_REG, TRG_REG, QWSIZE)										\
+MBSTART {														\
+	GEN_LOAD_IMMED(I386_REG_ECX, QWSIZE);										\
+	/* Do this brute force instead of using SET_REX_PREFIX/CODE_BUF_GEN() macros since we'd have to add a new	\
+	 * test to CODE_BUF_GEN() macros to support F3H prefix we need only for the MOVSQ instruction. The instruction	\
+	 * format is REP header followed by the REX field used to turn the MOVSW instruction into a MOVSQ and finally   \
+	 * the instruction opcode itself. There are no (express) parameters as this instruction used pre-determined 	\
+	 * registers (ARG1:src, ARG0:trg, ARG3:len-in-qwords since this is a MOVSQ).					\
+	 */														\
+	code_buf[code_idx++] = I386_INS_REP_E_Prefix;									\
+	code_buf[code_idx++] = REX_OP | REX_W;										\
+	code_buf[code_idx++] = I386_INS_MOVSW_D_Xv_Yv;	/* REX.W prefix turns this to MOVSQ */				\
+} MBEND
 
 /*
  * GT.M on AIX and SPARC is 64bit
  * By default the loads/stores use ldd/std(load double),
- * but if the value being dealt with is a word,the
+ * but if the value being dealt with is a word, the
  * opcode in generic_inst is changed to ldw/stw
  * On other platforms, it is defined to null
  */
 #define REVERT_GENERICINST_TO_WORD(inst)
+
+enum condition
+{
+	JO,
+	JNO,
+	JB,
+	JC = JB,
+	JNAE = JC,
+	JNB,
+	JNC = JNB,
+	JAE = JNB,
+	JZ,
+	JE = JZ,
+	JNZ,
+	JNE = JNZ,
+	JBE,
+	JNA = JBE,
+	JNBE,
+	JA = JNBE,
+	JS,
+	JNS,
+	JP,
+	JPE = JP,
+	JNP,
+	JPO = JNP,
+	JL,
+	JNGE = JL,
+	JNL,
+	JGE = JNL,
+	JLE,
+	JNG = JLE,
+	JNLE,
+	JG = JNLE
+};
+
+typedef union
+{
+	ModR_M		modrm;
+	unsigned char	byte;
+} modrm_byte_type;
+
+typedef union
+{
+	SIB		sib;
+	unsigned char	byte;
+} sib_byte_type;
+
+/* Instead of filling up the code buffer, emit_base_offset() instead fills this structure, which is used by the
+ * CODE_BUF_GEN macro to actually create the generated instruction stream. Note we use bit flags in this structure
+ * to keep it as small as possible since it gets reset (cleared via memset) for nearly every instruction generated.
+ */
+typedef struct
+{
+	modrm_byte_type	modrm_byte;
+	sib_byte_type	sib_byte;
+	REX_FIELD	rex;
+	char		offset8;
+	struct
+	{	/* Type needs to change if exceed 8 (used) flag bits */
+		unsigned char	rex_set: 1;
+		unsigned char	modrm_byte_set : 1;
+		unsigned char	sib_byte_set : 1;
+		unsigned char	offset8_set : 1;
+		unsigned char	offset32_set : 1;
+		unsigned char	imm32_set : 1;
+		/* unsigned char imm8_set : 1;		Not currently used */
+		/* unsigned char offset64_set : 1;	Not currently used */
+		/* unsigned char imm64_set : 1;		Not currently used */
+	} flags;
+	/* char		imm8;				Not currently used */
+	char		filler;
+	int		offset32;
+	int		imm32;
+	/* int64_t		offset64;
+	 * int64_t		imm64;			These fields not currently used
+	 */
+} emit_base_info_struct;
diff --git a/sr_x86_64/find_line_call.c b/sr_x86_64/find_line_call.c
index d70a860..8e4dc65 100644
--- a/sr_x86_64/find_line_call.c
+++ b/sr_x86_64/find_line_call.c
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2007, 2012 Fidelity Information Services, Inc	*
+ * Copyright (c) 2007-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -16,6 +17,8 @@
 #include <rtnhdr.h>	/* Needed by zbreak.h */
 #include "zbreak.h"
 
+GBLREF emit_base_info_struct	emit_base_info;
+
 int inst_size = 0;
 /* inst_size is REX + OP_CODE + immed32 used to go past the instruction*/
 #define MOV_INTO_ARGREG(call_addr,inst_op)  							\
diff --git a/sr_x86_64/g_msf.si b/sr_x86_64/g_msf.si
index b6b73a4..97ae5af 100644
--- a/sr_x86_64/g_msf.si
+++ b/sr_x86_64/g_msf.si
@@ -1,6 +1,6 @@
 #################################################################
 #								#
-# Copyright (c) 2007-2015 Fidelity National Information 	#
+# Copyright (c) 2007-2016 Fidelity National Information		#
 # Services, Inc. and/or its subsidiaries. All rights reserved.	#
 #								#
 #	This source code contains the intellectual property	#
@@ -125,7 +125,7 @@ SFF_DEV_ACT_ERR		=	0x04
 SFF_CI			=	0x08
 SFF_ETRAP_ERR		=	0x10
 
-/* Opcode defination needed by assembly files
+/* Opcode definition needed by assembly files
  * These are defined in i386*.h for using in "c" files
  */
 JMP_Jb			=       0x0eb
@@ -140,7 +140,7 @@ NO_REG_SAVED		   =   7
 REG_FRAME_POINTER_SAVE_OFF =   SUPER_STACK_SIZE - 16
 REG_XFER_TABLE_SAVE_OFF    =   REG_FRAME_POINTER_SAVE_OFF - 8
 ARG_SAVE_OFFSET            =   REG_XFER_TABLE_SAVE_OFF - 8
-ARG_COUNT_OFFSET	   =   ARG_SAVE_OFFSET - (8*NO_REG_SAVED)
+ARG_COUNT_OFFSET	   =   ARG_SAVE_OFFSET - (8 * NO_REG_SAVED)
 
 .macro save_callee_saved
         movq    %r12, ARG_SAVE_OFFSET(REG_SP)
diff --git a/sr_x86_64/gdeerrors_ctl.c b/sr_x86_64/gdeerrors_ctl.c
index 11a983b..a7a8ef2 100644
--- a/sr_x86_64/gdeerrors_ctl.c
+++ b/sr_x86_64/gdeerrors_ctl.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information 	*
+ * Copyright (c) 2001-2017 Fidelity National Information 	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -68,7 +68,7 @@ LITDEF	err_msg gdeerrors[] = {
 	{ "INVGBLDIR", "Invalid Global Directory spec: !AD.!/Continuing with !AD", 4 },
 	{ "WRITEERROR", "Cannot exit because of write failure.  Reason for failure: !AD", 2 },
 	{ "NONASCII", "!AD is illegal for a !AD as it contains non-ASCII characters", 4 },
-	{ "CRYPTNOMM", "!AD is an encrypted database. Cannot support MM access method.", 2 },
+	{ "GDECRYPTNOMM", "!AD segment has encryption turned on. Cannot support MM access method.", 2 },
 	{ "JNLALLOCGROW", "Increased Journal ALLOCATION from [!AD blocks] to [!AD blocks] to match AUTOSWITCHLIMIT for !AD !AD", 8 },
 	{ "KEYFORBLK", "But block size !AD and reserved bytes !AD limit key size to !AD", 6 },
 	{ "STRMISSQUOTE", "Missing double-quote at end of string specification !AD", 2 },
@@ -97,6 +97,8 @@ LITDEF	err_msg gdeerrors[] = {
 	{ "GBLNAMCOLLRANGE", "Collation sequence #!UL is out of range (0 thru 255)", 3 },
 	{ "STDNULLCOLLREQ", "Region !AD needs Standard Null Collation enabled because global !AD spans through it", 4 },
 	{ "GBLNAMCOLLVER", "Global directory indicates GBLNAME !AD has collation sequence #!UL with a version #!UL but shared library reports different version #!UL", 5 },
+	{ "GDEASYNCIONOMM", "!AD segment has ASYNCIO turned on. Cannot support MM access method.", 2 },
+	{ "NOPERCENTY", "^%Y* is a reserved global name in GT.M", 0 },
 };
 
 LITDEF	int GDE_BLKSIZ512 = 150503435;
@@ -154,7 +156,7 @@ LITDEF	int GDE_GDNOTSET = 150503843;
 LITDEF	int GDE_INVGBLDIR = 150503851;
 LITDEF	int GDE_WRITEERROR = 150503859;
 LITDEF	int GDE_NONASCII = 150503866;
-LITDEF	int GDE_CRYPTNOMM = 150503874;
+LITDEF	int GDE_GDECRYPTNOMM = 150503874;
 LITDEF	int GDE_JNLALLOCGROW = 150503883;
 LITDEF	int GDE_KEYFORBLK = 150503891;
 LITDEF	int GDE_STRMISSQUOTE = 150503898;
@@ -183,9 +185,11 @@ LITDEF	int GDE_NAMGVSUBOFLOW = 150504074;
 LITDEF	int GDE_GBLNAMCOLLRANGE = 150504082;
 LITDEF	int GDE_STDNULLCOLLREQ = 150504091;
 LITDEF	int GDE_GBLNAMCOLLVER = 150504098;
+LITDEF	int GDE_GDEASYNCIONOMM = 150504106;
+LITDEF	int GDE_NOPERCENTY = 150504114;
 
 GBLDEF	err_ctl gdeerrors_ctl = {
 	248,
 	"GDE",
 	&gdeerrors[0],
-	84};
+	86};
diff --git a/sr_x86_64/merrors_ansi.h b/sr_x86_64/merrors_ansi.h
index 9dee92b..ddf134a 100644
--- a/sr_x86_64/merrors_ansi.h
+++ b/sr_x86_64/merrors_ansi.h
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information 	*
+ * Copyright (c) 2001-2017 Fidelity National Information 	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -608,8 +608,8 @@ const static readonly int error_ansi[] = {
 	   0,	/* MEMORYRECURSIVE */
 	   0,	/* FREEZEID */
 	   0,	/* BLKWRITERR */
-	   0,	/* STOPTIMEOUT */
-	   0,	/* UNUSEDMSG777 */
+	   0,	/* UNUSEDMSG776 */
+	   0,	/* PINENTRYERR */
 	   0,	/* BCKUPBUFLUSH */
 	   0,	/* NOFORKCORE */
 	   0,	/* JNLREAD */
@@ -1359,7 +1359,7 @@ const static readonly int error_ansi[] = {
 	   0,	/* GETNAMEINFO */
 	   0,	/* SOCKBIND */
 	   0,	/* INSTFRZDEFER */
-	   0,	/* REGOPENRETRY */
+	   0,	/* UNUSEDMSG1529 */
 	   0,	/* REGOPENFAIL */
 	   0,	/* REPLINSTNOSHM */
 	   0,	/* DEVPARMTOOSMALL */
@@ -1369,8 +1369,8 @@ const static readonly int error_ansi[] = {
 	   0,	/* GBLNOMAPTOREG */
 	   0,	/* ISSPANGBL */
 	   0,	/* TPNOSUPPORT */
-	   0,	/* GVSUBSERR */
-	   0,	/* UNUSEDMSG1540 */
+	   0,	/* UNUSEDMSG1539 */
+	   0,	/* ZATRANSERR */
 	   0,	/* FILTERTIMEDOUT */
 	   0,	/* TLSDLLNOOPEN */
 	   0,	/* TLSINIT */
@@ -1451,4 +1451,44 @@ const static readonly int error_ansi[] = {
 	   0,	/* ENCRYPTCONFLT */
 	   0,	/* JNLPOOLRECOVERY */
 	   0,	/* LOCKTIMINGINTP */
+	   0,	/* PBNUNSUPTYPE */
+	   0,	/* DBFHEADLRU */
+	   0,	/* ASYNCIONOV4 */
+	   0,	/* AIOCANCELTIMEOUT */
+	   0,	/* DBGLDMISMATCH */
+	   0,	/* DBBLKSIZEALIGN */
+	   0,	/* ASYNCIONOMM */
+	   0,	/* RESYNCSEQLOW */
+	   0,	/* DBNULCOL */
+	   0,	/* UTF16ENDIAN */
+	   0,	/* OFRZACTIVE */
+	   0,	/* OFRZAUTOREL */
+	   0,	/* OFRZCRITREL */
+	   0,	/* OFRZCRITSTUCK */
+	   0,	/* OFRZNOTHELD */
+	   0,	/* AIOBUFSTUCK */
+	   0,	/* DBDUPNULCOL */
+	   0,	/* CHANGELOGINTERVAL */
+	   0,	/* DBNONUMSUBS */
+	   0,	/* AUTODBCREFAIL */
+	   0,	/* RNDWNSTATSDBFAIL */
+	   0,	/* STATSDBNOTSUPP */
+	   0,	/* TPNOSTATSHARE */
+	   0,	/* FNTRANSERROR */
+	   0,	/* NOCRENETFILE */
+	   0,	/* DSKSPCCHK */
+	   0,	/* NOCREMMBIJ */
+	   0,	/* FILECREERR */
+	   0,	/* RAWDEVUNSUP */
+	   0,	/* DBFILECREATED */
+	   0,	/* PCTYRESERVED */
+	   0,	/* REGFILENOTFOUND */
+	   0,	/* DRVLONGJMP */
+	   0,	/* INVSTATSDB */
+	   0,	/* STATSDBERR */
+	   0,	/* STATSDBINUSE */
+	   0,	/* STATSDBFNERR */
+	   0,	/* JNLSWITCHRETRY */
+	   0,	/* JNLSWITCHFAIL */
+	   0,	/* CLISTRTOOLONG */
 	};
diff --git a/sr_x86_64/merrors_ctl.c b/sr_x86_64/merrors_ctl.c
index 2afc71f..47f0528 100644
--- a/sr_x86_64/merrors_ctl.c
+++ b/sr_x86_64/merrors_ctl.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information 	*
+ * Copyright (c) 2001-2017 Fidelity National Information 	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -414,7 +414,7 @@ LITDEF	err_msg merrors[] = {
 	{ "ZWRSPONE", "Subscript patterns in ZWRITE are atomic; Invalid delimiter", 0 },
 	{ "FILEDEL", "File !AD successfully deleted", 2 },
 	{ "JNLBADLABEL", "Journal file !AD has a bad GT.M Journal File Label. Expected !AD. Found !AD.", 6 },
-	{ "JNLREADEOF", "End of journal file encountered for !AD", 2 },
+	{ "JNLREADEOF", "End of journal file encountered", 0 },
 	{ "JNLRECFMT", "Journal file record format error encountered", 0 },
 	{ "BLKTOODEEP", "Block level too deep", 0 },
 	{ "NESTFORMP", "Formal parameter list cannot be combined with nested line", 0 },
@@ -551,8 +551,8 @@ LITDEF	err_msg merrors[] = {
 	{ "INVACCMETHOD", "Invalid access method", 0 },
 	{ "JNLOPNERR", "Error opening journal file !AD!/  for database !AD", 4 },
 	{ "JNLRECTYPE", "Journal record type does not match expected type", 0 },
-	{ "JNLTRANSGTR", "Transaction number in journal is greater than in database", 0 },
-	{ "JNLTRANSLSS", "Transaction number in journal is less than in database", 0 },
+	{ "JNLTRANSGTR", "Transaction number !@UQ in journal header is greater than !@UQ in database header", 2 },
+	{ "JNLTRANSLSS", "Transaction number !@UQ in journal header is less than !@UQ in database header", 2 },
 	{ "JNLWRERR", "Error writing journal file !AD.  Unable to update header.", 2 },
 	{ "FILEIDMATCH", "Saved File ID does not match the current ID - the file appears to have been moved", 0 },
 	{ "EXTSRCLIN", "!_!AD!/!_!AD", 4 },
@@ -610,8 +610,8 @@ LITDEF	err_msg merrors[] = {
 	{ "MEMORYRECURSIVE", "Memory Subsystem called recursively", 0 },
 	{ "FREEZEID", "Cache !AD on !AD by freeze id 0x!XL with match 0x!XL from 0x!XJ", 7 },
 	{ "BLKWRITERR", "Unable to queue disk write for block 0x!XL.  Will keep trying.", 1 },
-	{ "STOPTIMEOUT", "Waited too long for stopped process to release.  Region: !AD.", 2 },
-	{ "UNUSEDMSG777", "TRIGMODINTP last used in V6.2-000", 0 },
+	{ "UNUSEDMSG776", "STOPTIMEOUT last used in V6.3-000A", 0 },
+	{ "PINENTRYERR", "Custom pinentry program failure", 0 },
 	{ "BCKUPBUFLUSH", "Unable to flush buffer for online backup", 0 },
 	{ "NOFORKCORE", "Unable to fork off process to create core.  Core creation postponed.", 0 },
 	{ "JNLREAD", "Error reading from journal file !AD at offset [0x!XL]", 3 },
@@ -797,7 +797,7 @@ LITDEF	err_msg merrors[] = {
 	{ "DBSVBNMIN", "!AD Start VBN smaller than possible", 2 },
 	{ "DBTTLBLK0", "!AD Total blocks equal zero", 2 },
 	{ "DBNOTDB", "!AD File does not have a valid GDS file header", 2 },
-	{ "DBTOTBLK", "Total blocks should be 0x!XL, is 0x!XL", 2 },
+	{ "DBTOTBLK", "File header indicates total blocks is 0x!XL but file size indicates total blocks would be 0x!XL", 2 },
 	{ "DBTN", "Block TN is 0x!16 at XQ", 1 },
 	{ "DBNOREGION", "None of the database regions accessible", 0 },
 	{ "DBTNRESETINC", "WARNING: tn_reset for database is incomplete due to integrity errors", 0 },
@@ -1090,7 +1090,7 @@ LITDEF	err_msg merrors[] = {
 	{ "REPLINSTSEQORD", "!AD has seqno [0x!16 at XQ] which is less than last record seqno [0x!16 at XQ] in replication instance file !AD", 6 },
 	{ "REPLINSTSTNDALN", "Could not get exclusive access to replication instance file !AD", 2 },
 	{ "REPLREQROLLBACK", "Replication instance file !AD indicates abnormal shutdown or an incomplete ROLLBACK. Run MUPIP JOURNAL ROLLBACK first", 2 },
-	{ "REQROLLBACK", "Error accessing database !AD.  Run MUPIP JOURNAL ROLLBACK on cluster node !AD.", 4 },
+	{ "REQROLLBACK", "Error accessing database !AD.  Run MUPIP JOURNAL -ROLLBACK -NOONLINE on cluster node !AD.", 4 },
 	{ "INVOBJFILE", "Cannot ZLINK object file !AD due to unexpected format", 2 },
 	{ "SRCSRVEXISTS", "Source server for secondary instance !AD is already running with pid !UL", 3 },
 	{ "SRCSRVNOTEXIST", "Source server for secondary instance !AD is not alive", 2 },
@@ -1105,7 +1105,7 @@ LITDEF	err_msg merrors[] = {
 	{ "DLRCILLEGAL", "!_!AD!/!_!_!_Illegal $CHAR() value !UL", 3 },
 	{ "NONUTF8LOCALE", "Locale has character encoding (!AD) which is not compatible with UTF-8 character set", 2 },
 	{ "INVDLRCVAL", "Invalid $CHAR() value !UL", 1 },
-	{ "DBMISALIGN", "Database file !AD has !UL blocks which does not match alignment rules. Reconstruct the database from a backup or extend it by at least !UL blocks.", 4 },
+	{ "DBMISALIGN", "File header indicates total blocks is 0x!XL but file size indicates total blocks would be between 0x!XL and 0x!XL. Reconstruct the database from a backup or extend it by at least !UL blocks.", 4 },
 	{ "LOADINVCHSET", "Extract file CHSET (!AD) is incompatible with gtm_chset", 2 },
 	{ "DLLCHSETM", "Routine !AD in library !AD was compiled with CHSET=M which is different from $ZCHSET. Recompile with CHSET=UTF-8 and re-link.", 4 },
 	{ "DLLCHSETUTF8", "Routine !AD in library !AD was compiled with CHSET=UTF-8 which is different from $ZCHSET. Recompile with CHSET=M and re-link.", 4 },
@@ -1277,7 +1277,7 @@ LITDEF	err_msg merrors[] = {
 	{ "SRVLCKWT2LNG", "PID !UL is holding the source server lock. Waited for !UL minute(s). Now exiting", 2 },
 	{ "IGNBMPMRKFREE", "Ignoring bitmap free-up operation for region !AD (!AD) due to concurrent ONLINE ROLLBACK", 4 },
 	{ "PERMGENFAIL", "Failed to determine access permissions to use for creation of !AD for file !AD", 4 },
-	{ "PERMGENDIAG", "Permissions: Proc(uid:!UL,gid:!UL), DB File(uid:!UL,gid:!UL,perm:!AD), Lib File(gid:!UL,perm:!AD), Group Mem(opener:!UL,owner:!UL)", 11 },
+	{ "PERMGENDIAG", "Permissions: Proc(uid:!UL,gid:!UL!AD), DB File(uid:!UL,gid:!UL,perm:!AD), Lib File(gid:!UL,perm:!AD)", 11 },
 	{ "MUTRUNC1ATIME", "Process with PID !UL already performing truncate in region !AD", 3 },
 	{ "MUTRUNCBACKINPROG", "Truncate detected concurrent backup in progress for region !AD", 2 },
 	{ "MUTRUNCERROR", "Truncate of region !AD encountered service error !AD", 4 },
@@ -1361,7 +1361,7 @@ LITDEF	err_msg merrors[] = {
 	{ "GETNAMEINFO", "Error in getting name info", 0 },
 	{ "SOCKBIND", "Error in binding socket", 0 },
 	{ "INSTFRZDEFER", "Instance Freeze initiated by !AD error on region !AD deferred due to critical resource conflict", 4 },
-	{ "REGOPENRETRY", "Attempt to open region !AD (!AD) using startup shortcut failed due to conflicting database shutdown. Retrying...", 4 },
+	{ "UNUSEDMSG1529", "REGOPENRETRY last used in V6.3-000A", 0 },
 	{ "REGOPENFAIL", "Failed to open region !AD (!AD) due to conflicting database shutdown activity", 4 },
 	{ "REPLINSTNOSHM", "Database !AD has no active connection to a replication journal pool", 2 },
 	{ "DEVPARMTOOSMALL", "Deviceparameter must be greater than zero (0)", 0 },
@@ -1371,8 +1371,8 @@ LITDEF	err_msg merrors[] = {
 	{ "GBLNOMAPTOREG", "Global !AD does not map to region !AD in current global directory", 4 },
 	{ "ISSPANGBL", "Operation cannot be performed on global ^!AD as it spans multiple regions in current global directory", 2 },
 	{ "TPNOSUPPORT", "Operation cannot be performed while inside of a TP transaction", 0 },
-	{ "GVSUBSERR", "Invalid subscripted global name specification in $VIEW() function", 0 },
-	{ "UNUSEDMSG1540", "TRIGNOSPANBL : Last used in V6.2-000", 0 },
+	{ "UNUSEDMSG1539", "GVSUBSERR last used in V6.3-000A", 0 },
+	{ "ZATRANSERR", "The input string is too long to convert", 0 },
 	{ "FILTERTIMEDOUT", "Replication server timed out attempting to read seqno !16 at XQ from external filter", 1 },
 	{ "TLSDLLNOOPEN", "Failed to load GT.M TLS/SSL library for secure communication", 0 },
 	{ "TLSINIT", "Failed to initialize GT.M TLS/SSL library for secure communication", 0 },
@@ -1393,7 +1393,7 @@ LITDEF	err_msg merrors[] = {
 	{ "DSENOTOPEN", "DSE could not open region !AD - see DSE startup error message for cause", 2 },
 	{ "ZSOCKETATTR", "Attribute \"!AD\" invalid for $ZSOCKET function", 2 },
 	{ "ZSOCKETNOTSOCK", "$ZSOCKET function called but device is not a socket", 0 },
-	{ "CHSETALREADY", "CHSET !AD already specified for socket device", 2 },
+	{ "CHSETALREADY", "Socket device already contains sockets with iCHSET=!AD, oCHSET=!AD", 4 },
 	{ "DSEMAXBLKSAV", "DSE cannot SAVE another block as it already has the maximum of !UL", 1 },
 	{ "BLKINVALID", "!XL is not a valid block as database file !AD has !XL total blocks", 4 },
 	{ "CANTBITMAP", "Can't perform this operation on a bit map (block at a 200 hexadecimal boundary)", 0 },
@@ -1453,6 +1453,46 @@ LITDEF	err_msg merrors[] = {
 	{ "ENCRYPTCONFLT", "MUPIP REORG -ENCRYPT and MUPIP EXTRACT -FORMAT=BIN cannot run concurrently - skipping !AD on region: !AD, file: !AD", 6 },
 	{ "JNLPOOLRECOVERY", "The size of the data written to the journal pool (!UL) does not match the size of the data in the journal record (!UL) for the replication instance file !AZ. The journal pool has been recovered.", 3 },
 	{ "LOCKTIMINGINTP", "A LOCK at !AD within a TP transaction is waiting in a final TP retry, which may lead to a general response gap", 2 },
+	{ "PBNUNSUPTYPE", "$ZPEEK() does not support type !AD", 2 },
+	{ "DBFHEADLRU", "Database file !AD LRU pointer: 0x!16 at XQ is outside of range: 0x!16 at XQ to 0x!16 at XQ or misaligned", 5 },
+	{ "ASYNCIONOV4", "!AD database has !AD; cannot !AD", 6 },
+	{ "AIOCANCELTIMEOUT", "Pid [0x!XL] timed out waiting for pending async io to complete/cancel in database file !AD", 3 },
+	{ "DBGLDMISMATCH", "Database file !AD has !AZ whereas !AZ !AD in global directory !AD has !AZ", 9 },
+	{ "DBBLKSIZEALIGN", "Database file !AD has AIO=ON and block_size=!UL which is not a multiple of filesystem block size !UL", 4 },
+	{ "ASYNCIONOMM", "Database file !AD!AD cannot !AD", 6 },
+	{ "RESYNCSEQLOW", "MUPIP JOURNAL -ROLLBACK -FORWARD -RESYNC=!@ZQ [0x!16 at XQ] requested is lower than !@ZQ [0x!16 at XQ] which is the starting sequence number of the instance", 4 },
+	{ "DBNULCOL", "NULL collation representation for record !UL in block !UL is !AD which differs from the database file header settings of !AD", 6 },
+	{ "UTF16ENDIAN", "The device previously set UTF-16 endianness to !AD and cannot change to !AD", 4 },
+	{ "OFRZACTIVE", "Region !AD has an Online Freeze", 2 },
+	{ "OFRZAUTOREL", "Online Freeze automatically released for region !AD", 2 },
+	{ "OFRZCRITREL", "Proceeding with a write to region !AD after Online Freeze while holding crit", 2 },
+	{ "OFRZCRITSTUCK", "Unable to proceed with a write to region !AD with Online Freeze while holding crit. Region stuck until freeze is removed.", 2 },
+	{ "OFRZNOTHELD", "Online Freeze had been automatically released for at least one region", 0 },
+	{ "AIOBUFSTUCK", "Waited !UL minutes for PID: !UL to finish AIO disk write of block: !UL [0x!XL] aio_error=!UL", 5 },
+	{ "DBDUPNULCOL", "Discarding !AD=!AD key due to duplicate null collation record", 4 },
+	{ "CHANGELOGINTERVAL", "!AD Server now logging to !AD with a !UL second interval", 5 },
+	{ "DBNONUMSUBS", "!AD key contains a numeric form of subscript in a global defined to collate all subscripts as strings", 2 },
+	{ "AUTODBCREFAIL", "Automatic creation of database file !AD associated with region !AD failed; see associated messages for details", 4 },
+	{ "RNDWNSTATSDBFAIL", "Rundown of statistics database region !AD (DB !AD) failed at/in !AD with following error: !AD", 8 },
+	{ "STATSDBNOTSUPP", "Attempted operation is not supported on statistics database file !AD", 2 },
+	{ "TPNOSTATSHARE", "VIEW \"[NO]STATSHARE\" is not allowed inside a TP transaction", 0 },
+	{ "FNTRANSERROR", "Buffer too small error occurred trying to translate filename !AD", 2 },
+	{ "NOCRENETFILE", "Database file !AD not created; cannot create across network", 2 },
+	{ "DSKSPCCHK", "Error while checking for available disk space to create file !AD", 2 },
+	{ "NOCREMMBIJ", "MM access method not compatible with BEFORE image journaling; Database file !AD not created", 2 },
+	{ "FILECREERR", "Error !AD for file !AD during DB creation", 4 },
+	{ "RAWDEVUNSUP", "RAW device for region !AD is not supported", 2 },
+	{ "DBFILECREATED", "Database file !AD created", 2 },
+	{ "PCTYRESERVED", "Attempted operation not supported on ^%Y* namespace", 0 },
+	{ "REGFILENOTFOUND", "Database file !AD corresponding to region !AD cannot be found", 4 },
+	{ "DRVLONGJMP", "Fake internal error that drives longjmp()", 0 },
+	{ "INVSTATSDB", "Database file !AD associated with statistics database region !AD is not a valid statistics database", 4 },
+	{ "STATSDBERR", "Error in/at !AD attempting to use a statistics database: !AD", 4 },
+	{ "STATSDBINUSE", "Statistics database !AD is in use with database !AD so cannot also be used with database !AD", 6 },
+	{ "STATSDBFNERR", "This database has no accessible statistics database due to the following error: !AD", 2 },
+	{ "JNLSWITCHRETRY", "Retrying previously abandoned switch of journal file !AD for database !AD", 4 },
+	{ "JNLSWITCHFAIL", "Failed to switch journal file !AD for database file !AD", 4 },
+	{ "CLISTRTOOLONG", "!AZ specified is !UL bytes long which is greater than the allowed maximum of !UL bytes", 3 },
 };
 
 LITDEF	int ERR_ACK = 150372361;
@@ -2052,8 +2092,8 @@ LITDEF	int ERR_KRNLKILL = 150377108;
 LITDEF	int ERR_MEMORYRECURSIVE = 150377116;
 LITDEF	int ERR_FREEZEID = 150377123;
 LITDEF	int ERR_BLKWRITERR = 150377131;
-LITDEF	int ERR_STOPTIMEOUT = 150377138;
-LITDEF	int ERR_UNUSEDMSG777 = 150377146;
+LITDEF	int ERR_UNUSEDMSG776 = 150377138;
+LITDEF	int ERR_PINENTRYERR = 150377146;
 LITDEF	int ERR_BCKUPBUFLUSH = 150377154;
 LITDEF	int ERR_NOFORKCORE = 150377160;
 LITDEF	int ERR_JNLREAD = 150377170;
@@ -2803,7 +2843,7 @@ LITDEF	int ERR_GETADDRINFO = 150383114;
 LITDEF	int ERR_GETNAMEINFO = 150383122;
 LITDEF	int ERR_SOCKBIND = 150383130;
 LITDEF	int ERR_INSTFRZDEFER = 150383139;
-LITDEF	int ERR_REGOPENRETRY = 150383147;
+LITDEF	int ERR_UNUSEDMSG1529 = 150383146;
 LITDEF	int ERR_REGOPENFAIL = 150383154;
 LITDEF	int ERR_REPLINSTNOSHM = 150383162;
 LITDEF	int ERR_DEVPARMTOOSMALL = 150383170;
@@ -2813,8 +2853,8 @@ LITDEF	int ERR_ACTCOLLMISMTCH = 150383194;
 LITDEF	int ERR_GBLNOMAPTOREG = 150383202;
 LITDEF	int ERR_ISSPANGBL = 150383210;
 LITDEF	int ERR_TPNOSUPPORT = 150383218;
-LITDEF	int ERR_GVSUBSERR = 150383226;
-LITDEF	int ERR_UNUSEDMSG1540 = 150383234;
+LITDEF	int ERR_UNUSEDMSG1539 = 150383226;
+LITDEF	int ERR_ZATRANSERR = 150383234;
 LITDEF	int ERR_FILTERTIMEDOUT = 150383242;
 LITDEF	int ERR_TLSDLLNOOPEN = 150383250;
 LITDEF	int ERR_TLSINIT = 150383258;
@@ -2895,9 +2935,49 @@ LITDEF	int ERR_MUREENCRYPTV4NOALLOW = 150383850;
 LITDEF	int ERR_ENCRYPTCONFLT = 150383858;
 LITDEF	int ERR_JNLPOOLRECOVERY = 150383866;
 LITDEF	int ERR_LOCKTIMINGINTP = 150383872;
+LITDEF	int ERR_PBNUNSUPTYPE = 150383882;
+LITDEF	int ERR_DBFHEADLRU = 150383891;
+LITDEF	int ERR_ASYNCIONOV4 = 150383898;
+LITDEF	int ERR_AIOCANCELTIMEOUT = 150383906;
+LITDEF	int ERR_DBGLDMISMATCH = 150383914;
+LITDEF	int ERR_DBBLKSIZEALIGN = 150383922;
+LITDEF	int ERR_ASYNCIONOMM = 150383930;
+LITDEF	int ERR_RESYNCSEQLOW = 150383938;
+LITDEF	int ERR_DBNULCOL = 150383946;
+LITDEF	int ERR_UTF16ENDIAN = 150383954;
+LITDEF	int ERR_OFRZACTIVE = 150383960;
+LITDEF	int ERR_OFRZAUTOREL = 150383968;
+LITDEF	int ERR_OFRZCRITREL = 150383976;
+LITDEF	int ERR_OFRZCRITSTUCK = 150383984;
+LITDEF	int ERR_OFRZNOTHELD = 150383992;
+LITDEF	int ERR_AIOBUFSTUCK = 150384002;
+LITDEF	int ERR_DBDUPNULCOL = 150384010;
+LITDEF	int ERR_CHANGELOGINTERVAL = 150384019;
+LITDEF	int ERR_DBNONUMSUBS = 150384026;
+LITDEF	int ERR_AUTODBCREFAIL = 150384034;
+LITDEF	int ERR_RNDWNSTATSDBFAIL = 150384042;
+LITDEF	int ERR_STATSDBNOTSUPP = 150384050;
+LITDEF	int ERR_TPNOSTATSHARE = 150384058;
+LITDEF	int ERR_FNTRANSERROR = 150384066;
+LITDEF	int ERR_NOCRENETFILE = 150384074;
+LITDEF	int ERR_DSKSPCCHK = 150384082;
+LITDEF	int ERR_NOCREMMBIJ = 150384090;
+LITDEF	int ERR_FILECREERR = 150384098;
+LITDEF	int ERR_RAWDEVUNSUP = 150384106;
+LITDEF	int ERR_DBFILECREATED = 150384115;
+LITDEF	int ERR_PCTYRESERVED = 150384122;
+LITDEF	int ERR_REGFILENOTFOUND = 150384131;
+LITDEF	int ERR_DRVLONGJMP = 150384138;
+LITDEF	int ERR_INVSTATSDB = 150384146;
+LITDEF	int ERR_STATSDBERR = 150384154;
+LITDEF	int ERR_STATSDBINUSE = 150384162;
+LITDEF	int ERR_STATSDBFNERR = 150384170;
+LITDEF	int ERR_JNLSWITCHRETRY = 150384179;
+LITDEF	int ERR_JNLSWITCHFAIL = 150384186;
+LITDEF	int ERR_CLISTRTOOLONG = 150384194;
 
 GBLDEF	err_ctl merrors_ctl = {
 	246,
 	"GTM",
 	&merrors[0],
-	1440};
+	1480};
diff --git a/sr_x86_64/mval_def.si b/sr_x86_64/mval_def.si
index b3cfefa..a027e32 100644
--- a/sr_x86_64/mval_def.si
+++ b/sr_x86_64/mval_def.si
@@ -1,6 +1,6 @@
 #################################################################
 #								#
-# Copyright (c) 2007-2015 Fidelity National Information 	#
+# Copyright (c) 2007-2016 Fidelity National Information		#
 # Services, Inc. and/or its subsidiaries. All rights reserved.	#
 #								#
 #	This source code contains the intellectual property	#
@@ -40,7 +40,8 @@ mval_m_retarg		=	0x080
 mval_m_utflen		=	0x100
 mval_m_aliascont	=	0x200
 
-mval_byte_len		=	32	#	Length of mval in bytes
+mval_byte_len		=	32				# Length of mval in bytes
+mval_qword_len		=	((mval_byte_len + 7) / 8)	# Length of mval in quadwords (8 byte words)
 
 #
 # Offsets of type, exp, strlen, stradd, num in mval structure
diff --git a/sr_x86_64/op_fnget.s b/sr_x86_64/op_fnget.s
index b548b87..1279d65 100644
--- a/sr_x86_64/op_fnget.s
+++ b/sr_x86_64/op_fnget.s
@@ -1,6 +1,6 @@
 #################################################################
 #								#
-# Copyright (c) 2007-2015 Fidelity National Information 	#
+# Copyright (c) 2007-2016 Fidelity National Information		#
 # Services, Inc. and/or its subsidiaries. All rights reserved.	#
 #								#
 #	This source code contains the intellectual property	#
@@ -36,11 +36,11 @@ ENTRY	op_fnget
 	cmpq	$0, REG64_RET1
 	je	l5				# Source mval does not exist
 	mv_if_notdefined REG64_RET1, l5		# Branch if source mval is not defined
-	movl	$mval_byte_len, REG32_ARG3	# Size of mval
+	movl	$mval_qword_len, REG32_ARG3	# Size of mval
 	movq	REG64_RET1, REG64_ARG1		# Set source
 	movq	REG64_RET0, REG64_ARG0		# Set destination
 	REP					# Repeat until count is zero
-	movsb
+	movsq
 	andw	$~mval_m_aliascont, mval_w_mvtype(REG64_RET0)	# Don't propagate alias container flag
 	ret
 
diff --git a/sr_x86_64/op_forcenum.s b/sr_x86_64/op_forcenum.s
index aae63b2..b6b9884 100644
--- a/sr_x86_64/op_forcenum.s
+++ b/sr_x86_64/op_forcenum.s
@@ -1,6 +1,6 @@
 #################################################################
 #								#
-# Copyright (c) 2007-2015 Fidelity National Information 	#
+# Copyright (c) 2007-2016 Fidelity National Information		#
 # Services, Inc. and/or its subsidiaries. All rights reserved.	#
 #								#
 #	This source code contains the intellectual property	#
@@ -67,9 +67,9 @@ l40:
 	#
 	movq	REG64_RET0, REG64_ARG0
 	movq	REG64_RET1, REG64_ARG1
-	movl	$mval_byte_len, REG32_ARG3
+	movl	$mval_qword_len, REG32_ARG3
 	REP
-	movsb
+	movsq
 done:
 	addq	$FRAME_SIZE, REG_SP			# Remove save area from C stack
 	ret
diff --git a/sr_x86_64/op_gettruth.s b/sr_x86_64/op_gettruth.s
index 7f1fc2d..2ca0ff2 100644
--- a/sr_x86_64/op_gettruth.s
+++ b/sr_x86_64/op_gettruth.s
@@ -1,6 +1,6 @@
 #################################################################
 #								#
-# Copyright (c) 2007-2015 Fidelity National Information 	#
+# Copyright (c) 2007-2016 Fidelity National Information		#
 # Services, Inc. and/or its subsidiaries. All rights reserved.	#
 #								#
 #	This source code contains the intellectual property	#
@@ -39,7 +39,7 @@ doit:
 	# Copy/return literal_zero or literal_one mval to caller
 	#
 	movq	REG64_RET1, REG64_ARG0
-	movl	$mval_byte_len, REG32_ARG3
+	movl	$mval_qword_len, REG32_ARG3
 	REP
-	movsb
+	movsq
 	ret
diff --git a/sr_x86_64/op_sto.s b/sr_x86_64/op_sto.s
index 4df3198..4673d9f 100644
--- a/sr_x86_64/op_sto.s
+++ b/sr_x86_64/op_sto.s
@@ -1,6 +1,6 @@
 #################################################################
 #								#
-# Copyright (c) 2007-2015 Fidelity National Information 	#
+# Copyright (c) 2007-2016 Fidelity National Information		#
 # Services, Inc. and/or its subsidiaries. All rights reserved.	#
 #								#
 #	This source code contains the intellectual property	#
@@ -27,11 +27,11 @@ ENTRY	op_sto
 	CHKSTKALIGN						# Verify stack alignment
 	mv_if_notdefined REG64_RET1, notdef
 nowdef:
-	movl	$mval_byte_len, REG32_ARG3
+	movl	$mval_qword_len, REG32_ARG3
 	movq	REG64_RET1, REG64_ARG1
 	movq	REG64_RET0, REG64_ARG0
 	REP
-	movsb
+	movsq
 	andw	$~mval_m_aliascont, mval_w_mvtype(REG64_RET0)	# Don't propagate alias container flag
 done:
 	addq	$8, REG_SP					# Remove stack alignment bump
diff --git a/sr_x86_64/ttt.c b/sr_x86_64/ttt.c
index 7230bc5..9ed8bf7 100644
--- a/sr_x86_64/ttt.c
+++ b/sr_x86_64/ttt.c
@@ -1,6 +1,6 @@
 /****************************************************************
  *								*
- * Copyright (c) 2001-2016 Fidelity National Information 	*
+ * Copyright (c) 2001-2017 Fidelity National Information 	*
  * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
@@ -14,704 +14,711 @@
 #include "vxi.h"
 #include "vxt.h"
 #include "xfer_enum.h"
-LITDEF short ttt[4349] = {
+LITDEF short ttt[4392] = {
 
-/*    0 */	0,0,0,0,329,3581,3054,574,
-/*    8 */	2378,3039,3069,2050,425,3531,2171,3157,
-/*   16 */	2254,2242,3764,3801,2215,2224,2296,2236,
-/*   24 */	2287,2266,2194,780,795,807,819,861,
-/*   32 */	879,900,929,959,974,989,1007,1166,
-/*   40 */	1079,1112,1145,1223,1274,1604,1637,1652,
-/*   48 */	1682,1748,1778,1802,1865,1886,1904,3596,
-/*   56 */	3618,0,0,0,0,589,0,527,
-/*   64 */	0,2036,0,3143,0,0,0,0,
-/*   72 */	0,0,361,437,2356,2362,2787,2814,
-/*   80 */	2832,2935,2873,2864,2950,3670,3754,3090,
-/*   88 */	0,3122,3223,3186,3171,3201,3545,3399,
-/*   96 */	3676,3688,3703,3727,3736,3721,3712,3432,
-/*  104 */	3797,3810,3832,3869,3881,3902,3926,3992,
-/*  112 */	0,0,2983,2338,3275,4298,668,4301,
-/*  120 */	722,2844,3241,541,550,4304,2441,2538,
-/*  128 */	2428,494,2464,2558,2203,2496,2568,4307,
-/*  136 */	2323,2314,4311,1292,4312,357,353,3423,
-/*  144 */	449,4316,4319,4322,3108,4325,4328,4331,
-/*  152 */	4334,4337,4340,3567,0,2959,2627,2605,
-/*  160 */	1565,2596,2374,2185,2910,2071,747,2900,
-/*  168 */	0,0,2393,3745,3773,1496,3697,2476,
-/*  176 */	2064,559,3893,1850,2305,1208,344,3227,
-/*  184 */	631,700,612,678,3857,1127,3825,3083,
-/*  192 */	2332,2974,3097,650,1019,2914,4343,2548,
-/*  200 */	3944,3962,3977,518,2929,3219,1997,4019,
-/*  208 */	4004,1310,3559,603,1667,1736,2511,4346,
-/*  216 */	3630,2584,756,837,3258,3785,3654,3640,
-/*  224 */	3647,3636,732,914,2451,1061,2415,1049,
-/*  232 */	2275,1034,1094,2523,1466,1409,1394,1448,
-/*  240 */	1364,1376,1421,1349,1433,1481,0,3517,
-/*  248 */	0,938,947,3378,1877,3357,2402,2486,
-/*  256 */	3009,3015,3027,2995,1247,1259,1181,1193,
-/*  264 */	1235,3608,1712,1916,0,1322,1508,1586,
-/*  272 */	3451,1619,1697,1724,1835,1814,3493,1760,
-/*  280 */	3472,1961,1520,1535,2024,4034,1943,3285,
-/*  288 */	3297,3309,3321,2823,2838,1553,458,1337,
-/*  296 */	1979,659,3333,3345,4013,4025,0,0,
-/*  304 */	0,0,3848,4049,4060,4072,4081,4095,
-/*  312 */	4108,4118,4135,4147,4156,4168,4180,4192,
-/*  320 */	4207,4219,4228,4240,4256,1931,4277,4289,
-/*  328 */	0,VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,
-/*  336 */	VXT_VAL,1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_add,VXT_END,
-/*  344 */	VXT_IREPL,VXT_VAL,2,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_bindparm,
-/*  352 */	VXT_END,
-/*  353 */	VXI_INCL,VXT_VAL,1,VXT_END,
-/*  357 */	VXI_CLRL,VXT_VAL,0,VXT_END,
-/*  361 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_break,VXT_END,
-/*  365 */	VXI_PUSHL,VXT_VAL,2,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_callb,VXI_BRB,VXT_JMP,
-/*  373 */	1,VXT_END,
-/*  375 */	VXI_PUSHL,VXT_VAL,2,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_calll,VXI_JMP,VXT_JMP,
-/*  383 */	1,VXT_END,
-/*  385 */	VXI_PUSHL,VXT_VAL,2,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_callw,VXI_BRW,VXT_JMP,
-/*  393 */	1,VXT_END,
-/*  395 */	VXI_PUSHL,VXT_VAL,2,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_callspb,VXI_BRB,VXT_JMP,
-/*  403 */	1,VXT_END,
-/*  405 */	VXI_PUSHL,VXT_VAL,2,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_callspl,VXI_JMP,VXT_JMP,
-/*  413 */	1,VXT_END,
-/*  415 */	VXI_PUSHL,VXT_VAL,2,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_callspw,VXI_BRW,VXT_JMP,
-/*  423 */	1,VXT_END,
-/*  425 */	VXT_IREPAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_VAL,
-/*  433 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_cat,VXT_END,
-/*  437 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/*  445 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_close,VXT_END,
-/*  449 */	VXI_BICB2,VXT_LIT,1,VXT_REG,0x5A,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_dt_false,
-/*  457 */	VXT_END,
-/*  458 */	VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_clralsvars,
-/*  466 */	VXT_END,
-/*  467 */	VXI_TSTL,VXT_VAL,1,VXT_END,
-/*  471 */	VXI_MOVAB,VXT_VAL,1,VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_mval2bool,
-/*  479 */	VXT_END,
-/*  480 */	VXI_MOVAB,VXT_VAL,1,VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_mval2mint,
-/*  488 */	VXI_MOVL,VXT_REG,0x50,VXT_VAL,0,VXT_END,
-/*  494 */	VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_JSB,VXT_XFER,
-/*  502 */	SIZEOF(char *) * (short int)xf_commarg,VXT_END,
-/*  504 */	VXI_MOVAB,VXT_VAL,0,VXT_REG,0x50,VXI_MOVL,VXT_VAL,1,
-/*  512 */	VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_mint2mval,VXT_END,
-/*  518 */	VXI_MOVAB,VXT_VAL,1,VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_mval2num,
-/*  526 */	VXT_END,
-/*  527 */	VXI_MOVAB,VXT_VAL,1,VXT_REG,0x50,VXI_MOVAB,VXT_VAL,2,
-/*  535 */	VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_contain,VXT_END,
-/*  541 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_currhd,VXI_MOVL,VXT_REG,0x50,VXT_VAL,0,
-/*  549 */	VXT_END,
-/*  550 */	VXI_MOVAB,VXT_VAL,0,VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_currtn,
-/*  558 */	VXT_END,
-/*  559 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHL,VXT_VAL,
-/*  567 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_cvtparm,VXT_END,
-/*  574 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
-/*  582 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_div,VXT_END,
-/*  589 */	VXI_MOVAB,VXT_VAL,2,VXT_REG,0x51,VXI_MOVAB,VXT_VAL,1,
-/*  597 */	VXT_REG,0x50,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_equ,VXT_END,
-/*  603 */	VXI_MOVAB,VXT_VAL,1,VXT_REG,0x50,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_equnul,
-/*  611 */	VXT_END,
-/*  612 */	VXT_IREPAB,VXT_VAL,5,VXI_PUSHL,VXT_VAL,4,VXI_PUSHL,VXT_VAL,
-/*  620 */	3,VXI_PUSHL,VXT_VAL,2,VXI_PUSHL,VXT_LIT,0,VXI_JSB,
-/*  628 */	VXT_XFER,SIZEOF(char *) * (short int)xf_exfun,VXT_END,
-/*  631 */	VXT_IREPAB,VXT_VAL,5,VXI_PUSHL,VXT_VAL,4,VXI_PUSHL,VXT_VAL,
-/*  639 */	3,VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,0,VXI_JSB,
-/*  647 */	VXT_XFER,SIZEOF(char *) * (short int)xf_exfun,VXT_END,
-/*  650 */	VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_exfunret,
-/*  658 */	VXT_END,
-/*  659 */	VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_exfunretals,
-/*  667 */	VXT_END,
-/*  668 */	VXI_PUSHL,VXT_VAL,2,VXI_PUSHL,VXT_VAL,1,VXI_JSB,VXT_XFER,
-/*  676 */	SIZEOF(char *) * (short int)xf_extcall,VXT_END,
-/*  678 */	VXT_IREPAB,VXT_VAL,5,VXI_PUSHL,VXT_VAL,4,VXI_PUSHL,VXT_VAL,
-/*  686 */	3,VXI_PUSHL,VXT_LIT,0,VXI_PUSHL,VXT_VAL,2,VXI_PUSHL,
-/*  694 */	VXT_VAL,1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_extexfun,VXT_END,
-/*  700 */	VXT_IREPAB,VXT_VAL,5,VXI_PUSHL,VXT_VAL,4,VXI_PUSHL,VXT_VAL,
-/*  708 */	3,VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,2,VXI_PUSHL,
-/*  716 */	VXT_VAL,1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_extexfun,VXT_END,
-/*  722 */	VXI_PUSHL,VXT_VAL,2,VXI_PUSHL,VXT_VAL,1,VXI_JSB,VXT_XFER,
-/*  730 */	SIZEOF(char *) * (short int)xf_extjmp,VXT_END,
-/*  732 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
-/*  740 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_exp,VXT_END,
-/*  747 */	VXT_IREPL,VXT_VAL,2,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_fetch,
-/*  755 */	VXT_END,
-/*  756 */	VXT_IREPAB,VXT_VAL,6,VXI_PUSHL,VXT_VAL,5,VXI_PUSHL,VXT_VAL,
-/*  764 */	4,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHL,
-/*  772 */	VXT_LIT,0,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_fnfgncal,VXT_END,
-/*  780 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHL,VXT_VAL,
-/*  788 */	2,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnascii,VXT_END,
-/*  795 */	VXT_IREPL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_VAL,
-/*  803 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_fnchar,VXT_END,
-/*  807 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/*  815 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fndata,VXT_END,
-/*  819 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHL,VXT_VAL,
-/*  827 */	2,VXI_PUSHL,VXT_VAL,3,VXI_CALLS,VXT_LIT,4,VXT_XFER,
-/*  835 */	SIZEOF(char *) * (short int)xf_fnextract,VXT_END,
-/*  837 */	VXT_IREPAB,VXT_VAL,6,VXI_PUSHL,VXT_VAL,5,VXI_PUSHL,VXT_VAL,
-/*  845 */	4,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,
-/*  853 */	VXT_VAL,0,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_fnfgncal,VXT_END,
-/*  861 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,
-/*  869 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
-/*  877 */	SIZEOF(char *) * (short int)xf_fnfind,VXT_END,
-/*  879 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,4,VXI_PUSHL,VXT_VAL,
-/*  887 */	3,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,
-/*  895 */	VXT_LIT,5,VXT_XFER,SIZEOF(char *) * (short int)xf_fnfnumber,VXT_END,
-/*  900 */	VXI_MOVAB,VXT_VAL,1,VXT_REG,0x51,VXI_MOVAB,VXT_VAL,0,
-/*  908 */	VXT_REG,0x50,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_fnget,VXT_END,
-/*  914 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
-/*  922 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnget2,VXT_END,
-/*  929 */	VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_fngvget,
-/*  937 */	VXT_END,
-/*  938 */	VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_fngvget1,
-/*  946 */	VXT_END,
-/*  947 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/*  955 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnget1,VXT_END,
-/*  959 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
-/*  967 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnincr,VXT_END,
-/*  974 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
-/*  982 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnj2,VXT_END,
-/*  989 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,3,VXI_PUSHL,VXT_VAL,
-/*  997 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
-/* 1005 */	SIZEOF(char *) * (short int)xf_fnj3,VXT_END,
-/* 1007 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 1015 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnlength,VXT_END,
-/* 1019 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
-/* 1027 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnlvname,VXT_END,
-/* 1034 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,
-/* 1042 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnlvnameo2,VXT_END,
-/* 1049 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 1057 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnlvprvname,VXT_END,
-/* 1061 */	VXT_IREPAB,VXT_VAL,4,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHL,VXT_VAL,
-/* 1069 */	3,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_VAL,2,VXT_XFER,
-/* 1077 */	SIZEOF(char *) * (short int)xf_fnname,VXT_END,
-/* 1079 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
-/* 1087 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnnext,VXT_END,
-/* 1094 */	VXI_PUSHAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,
-/* 1102 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
-/* 1110 */	SIZEOF(char *) * (short int)xf_fno2,VXT_END,
-/* 1112 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
-/* 1120 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnorder,VXT_END,
-/* 1127 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,3,VXI_PUSHL,VXT_VAL,
-/* 1135 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
-/* 1143 */	SIZEOF(char *) * (short int)xf_fnp1,VXT_END,
-/* 1145 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,4,VXI_PUSHL,VXT_VAL,
-/* 1153 */	3,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,
-/* 1161 */	VXT_LIT,5,VXT_XFER,SIZEOF(char *) * (short int)xf_fnpiece,VXT_END,
-/* 1166 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
-/* 1174 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnpopulation,VXT_END,
-/* 1181 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 1189 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnqlength,VXT_END,
-/* 1193 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
-/* 1201 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnqsubscript,VXT_END,
-/* 1208 */	VXT_IREPAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
-/* 1216 */	0,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_fnquery,VXT_END,
-/* 1223 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 1231 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnrandom,VXT_END,
-/* 1235 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 1243 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnreverse,VXT_END,
-/* 1247 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 1255 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnstack1,VXT_END,
-/* 1259 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHL,VXT_VAL,
-/* 1267 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnstack2,VXT_END,
-/* 1274 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHL,VXT_VAL,
-/* 1282 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
-/* 1290 */	SIZEOF(char *) * (short int)xf_fntext,VXT_END,
-/* 1292 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,
-/* 1300 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
-/* 1308 */	SIZEOF(char *) * (short int)xf_fntranslate,VXT_END,
-/* 1310 */	VXT_IREPAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_VAL,
-/* 1318 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_fnview,VXT_END,
-/* 1322 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHL,VXT_VAL,
-/* 1330 */	2,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzascii,VXT_END,
-/* 1337 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 1345 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzahandle,VXT_END,
-/* 1349 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,
-/* 1357 */	0,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzbitand,VXT_END,
-/* 1364 */	VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,
-/* 1372 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzbitcoun,VXT_END,
-/* 1376 */	VXI_PUSHL,VXT_VAL,3,VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
-/* 1384 */	1,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,4,VXT_XFER,
-/* 1392 */	SIZEOF(char *) * (short int)xf_fnzbitfind,VXT_END,
-/* 1394 */	VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,
-/* 1402 */	0,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzbitget,VXT_END,
-/* 1409 */	VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,
-/* 1417 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzbitlen,VXT_END,
-/* 1421 */	VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,
-/* 1429 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzbitnot,VXT_END,
-/* 1433 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,
-/* 1441 */	0,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzbitor,VXT_END,
-/* 1448 */	VXI_PUSHL,VXT_VAL,3,VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
-/* 1456 */	1,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,4,VXT_XFER,
-/* 1464 */	SIZEOF(char *) * (short int)xf_fnzbitset,VXT_END,
-/* 1466 */	VXI_PUSHL,VXT_VAL,2,VXI_PUSHL,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,
-/* 1474 */	0,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzbitstr,VXT_END,
-/* 1481 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,
-/* 1489 */	0,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzbitxor,VXT_END,
-/* 1496 */	VXT_IREPAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_VAL,
-/* 1504 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzcall,VXT_END,
-/* 1508 */	VXT_IREPL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_VAL,
-/* 1516 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzchar,VXT_END,
-/* 1520 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
-/* 1528 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzconvert2,VXT_END,
-/* 1535 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,
-/* 1543 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
-/* 1551 */	SIZEOF(char *) * (short int)xf_fnzconvert3,VXT_END,
-/* 1553 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 1561 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzdata,VXT_END,
-/* 1565 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,4,VXI_PUSHAB,VXT_VAL,
-/* 1573 */	3,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,
-/* 1581 */	VXT_LIT,5,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzdate,VXT_END,
-/* 1586 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHL,VXT_VAL,
-/* 1594 */	2,VXI_PUSHL,VXT_VAL,3,VXI_CALLS,VXT_LIT,4,VXT_XFER,
-/* 1602 */	SIZEOF(char *) * (short int)xf_fnzextract,VXT_END,
-/* 1604 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
-/* 1612 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzfile,VXT_END,
-/* 1619 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,
-/* 1627 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
-/* 1635 */	SIZEOF(char *) * (short int)xf_fnzfind,VXT_END,
-/* 1637 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
-/* 1645 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fngetdvi,VXT_END,
-/* 1652 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHL,VXT_VAL,
-/* 1660 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fngetjpi,VXT_END,
-/* 1667 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHL,VXT_VAL,
-/* 1675 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fngetlki,VXT_END,
-/* 1682 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
-/* 1690 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fngetsyi,VXT_END,
-/* 1697 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
-/* 1705 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzj2,VXT_END,
-/* 1712 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 1720 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzjobexam,VXT_END,
-/* 1724 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 1732 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzlength,VXT_END,
-/* 1736 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 1744 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzlkid,VXT_END,
-/* 1748 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 1756 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzm,VXT_END,
-/* 1760 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,3,VXI_PUSHL,VXT_VAL,
-/* 1768 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
-/* 1776 */	SIZEOF(char *) * (short int)xf_fnzp1,VXT_END,
-/* 1778 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,5,VXI_PUSHAB,VXT_VAL,
-/* 1786 */	4,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,
-/* 1794 */	VXT_VAL,1,VXI_CALLS,VXT_LIT,6,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzparse,VXT_END,
-/* 1802 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 1810 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzpid,VXT_END,
-/* 1814 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,4,VXI_PUSHL,VXT_VAL,
-/* 1822 */	3,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,
-/* 1830 */	VXT_LIT,5,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzpiece,VXT_END,
-/* 1835 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
-/* 1843 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzpopulation,VXT_END,
-/* 1850 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
-/* 1858 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzprevious,VXT_END,
-/* 1865 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 1873 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzpriv,VXT_END,
-/* 1877 */	VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzqgblmod,
-/* 1885 */	VXT_END,
-/* 1886 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,3,VXI_PUSHL,VXT_VAL,
-/* 1894 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
-/* 1902 */	SIZEOF(char *) * (short int)xf_fnzsearch,VXT_END,
-/* 1904 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 1912 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzsetprv,VXT_END,
-/* 1916 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,2,VXI_PUSHL,VXT_VAL,
-/* 1924 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzsigproc,VXT_END,
-/* 1931 */	VXT_IREPAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_VAL,
-/* 1939 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzsocket,VXT_END,
-/* 1943 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,3,VXI_PUSHL,VXT_VAL,
-/* 1951 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
-/* 1959 */	SIZEOF(char *) * (short int)xf_fnzsubstr,VXT_END,
-/* 1961 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,
-/* 1969 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
-/* 1977 */	SIZEOF(char *) * (short int)xf_fnztranslate,VXT_END,
-/* 1979 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,
-/* 1987 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
-/* 1995 */	SIZEOF(char *) * (short int)xf_fnztrigger,VXT_END,
-/* 1997 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,6,VXI_PUSHAB,VXT_VAL,
-/* 2005 */	5,VXI_PUSHAB,VXT_VAL,4,VXI_PUSHL,VXT_VAL,3,VXI_PUSHAB,
-/* 2013 */	VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,7,
-/* 2021 */	VXT_XFER,SIZEOF(char *) * (short int)xf_fnztrnlnm,VXT_END,
-/* 2024 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 2032 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzwidth,VXT_END,
-/* 2036 */	VXI_MOVAB,VXT_VAL,1,VXT_REG,0x50,VXI_MOVAB,VXT_VAL,2,
-/* 2044 */	VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_follow,VXT_END,
-/* 2050 */	VXI_MOVAB,VXT_VAL,0,VXT_REG,0x50,VXI_MOVAB,VXT_VAL,1,
-/* 2058 */	VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_forcenum,VXT_END,
-/* 2064 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_forchk1,VXT_END,
-/* 2071 */	VXI_PUSHAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
-/* 2079 */	1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_forinit,VXT_END,
-/* 2084 */	VXI_PUSHL,VXT_VAL,2,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_forlcldob,VXI_BRB,VXT_JMP,
-/* 2092 */	1,VXT_END,
-/* 2094 */	VXI_PUSHL,VXT_VAL,2,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_forlcldol,VXI_JMP,VXT_JMP,
-/* 2102 */	1,VXT_END,
-/* 2104 */	VXI_PUSHL,VXT_VAL,2,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_forlcldow,VXI_BRW,VXT_JMP,
-/* 2112 */	1,VXT_END,
-/* 2114 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHAB,VXT_JMP,1,VXI_PUSHAB,VXT_VAL,
-/* 2122 */	4,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,2,VXI_JSB,
-/* 2130 */	VXT_XFER,SIZEOF(char *) * (short int)xf_forloop,VXT_END,
-/* 2133 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHAB,VXT_JMP,1,VXI_PUSHAB,VXT_VAL,
-/* 2141 */	4,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,2,VXI_JSB,
-/* 2149 */	VXT_XFER,SIZEOF(char *) * (short int)xf_forloop,VXT_END,
-/* 2152 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHAB,VXT_JMP,1,VXI_PUSHAB,VXT_VAL,
-/* 2160 */	4,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,2,VXI_JSB,
-/* 2168 */	VXT_XFER,SIZEOF(char *) * (short int)xf_forloop,VXT_END,
-/* 2171 */	VXT_IREPAB,VXT_VAL,2,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_getindx,
-/* 2179 */	VXI_MOVL,VXT_REG,0x50,VXT_ADDR,0,VXT_END,
-/* 2185 */	VXI_MOVAB,VXT_VAL,0,VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_gettruth,
-/* 2193 */	VXT_END,
-/* 2194 */	VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_gvdata,
-/* 2202 */	VXT_END,
-/* 2203 */	VXT_IREPAB,VXT_VAL,3,VXI_PUSHL,VXT_VAL,2,VXI_CALLS,VXT_VAL,
-/* 2211 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_gvextnam,VXT_END,
-/* 2215 */	VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_gvget,
-/* 2223 */	VXT_END,
-/* 2224 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_CALLS,VXT_LIT,
-/* 2232 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_gvincr,VXT_END,
-/* 2236 */	VXI_CALLS,VXT_LIT,0,VXT_XFER,SIZEOF(char *) * (short int)xf_gvkill,VXT_END,
-/* 2242 */	VXT_IREPAB,VXT_VAL,3,VXI_PUSHL,VXT_VAL,2,VXI_CALLS,VXT_VAL,
-/* 2250 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_gvnaked,VXT_END,
-/* 2254 */	VXT_IREPAB,VXT_VAL,3,VXI_PUSHL,VXT_VAL,2,VXI_CALLS,VXT_VAL,
-/* 2262 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_gvname,VXT_END,
-/* 2266 */	VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_gvnext,
-/* 2274 */	VXT_END,
-/* 2275 */	VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,
-/* 2283 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_gvo2,VXT_END,
-/* 2287 */	VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_gvorder,
-/* 2295 */	VXT_END,
-/* 2296 */	VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_gvput,
-/* 2304 */	VXT_END,
-/* 2305 */	VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_gvquery,
-/* 2313 */	VXT_END,
-/* 2314 */	VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_gvrectarg,
-/* 2322 */	VXT_END,
-/* 2323 */	VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_gvsavtarg,
-/* 2331 */	VXT_END,
-/* 2332 */	VXI_CALLS,VXT_LIT,0,VXT_XFER,SIZEOF(char *) * (short int)xf_gvzwithdraw,VXT_END,
-/* 2338 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXT_IREPAB,VXT_VAL,4,VXI_PUSHL,VXT_VAL,
-/* 2346 */	3,VXI_PUSHL,VXT_VAL,2,VXI_CALLS,VXT_VAL,1,VXT_XFER,
-/* 2354 */	SIZEOF(char *) * (short int)xf_gvzwrite,VXT_END,
-/* 2356 */	VXI_CALLS,VXT_LIT,0,VXT_XFER,SIZEOF(char *) * (short int)xf_halt,VXT_END,
-/* 2362 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 2370 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_hang,VXT_END,
-/* 2374 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_hardret,VXT_END,
-/* 2378 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
-/* 2386 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_idiv,VXT_END,
-/* 2393 */	VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_igetsrc,
-/* 2401 */	VXT_END,
-/* 2402 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
-/* 2410 */	1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_inddevparms,VXT_END,
-/* 2415 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,
-/* 2423 */	0,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_indfnname,VXT_END,
-/* 2428 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
-/* 2436 */	1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_indfun,VXT_END,
-/* 2441 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_JSB,VXT_XFER,
-/* 2449 */	SIZEOF(char *) * (short int)xf_indglvn,VXT_END,
-/* 2451 */	VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
-/* 2459 */	0,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_indincr,VXT_END,
-/* 2464 */	VXI_PUSHAB,VXT_VAL,1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_indlvadr,VXI_MOVL,VXT_REG,
-/* 2472 */	0x50,VXT_ADDR,0,VXT_END,
-/* 2476 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_JSB,VXT_XFER,
-/* 2484 */	SIZEOF(char *) * (short int)xf_indlvarg,VXT_END,
-/* 2486 */	VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,2,VXI_JSB,VXT_XFER,
-/* 2494 */	SIZEOF(char *) * (short int)xf_indmerge,VXT_END,
-/* 2496 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,
-/* 2504 */	0,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_indname,VXT_END,
-/* 2511 */	VXI_PUSHAB,VXT_VAL,1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_indlvnamadr,VXI_MOVL,VXT_REG,
-/* 2519 */	0x50,VXT_ADDR,0,VXT_END,
-/* 2523 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,
-/* 2531 */	0,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_indo2,VXT_END,
-/* 2538 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_JSB,VXT_XFER,
-/* 2546 */	SIZEOF(char *) * (short int)xf_indpat,VXT_END,
-/* 2548 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_JSB,VXT_XFER,
-/* 2556 */	SIZEOF(char *) * (short int)xf_indrzshow,VXT_END,
-/* 2558 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_JSB,VXT_XFER,
-/* 2566 */	SIZEOF(char *) * (short int)xf_indset,VXT_END,
-/* 2568 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHL,VXT_VAL,
-/* 2576 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_indtext,VXT_END,
-/* 2584 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXT_IREPAB,VXT_VAL,2,VXI_CALLS,VXT_VAL,
-/* 2592 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_iocontrol,VXT_END,
-/* 2596 */	VXI_MOVAB,VXT_VAL,1,VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_iretmvad,
-/* 2604 */	VXT_END,
-/* 2605 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_JSB,VXT_XFER,
-/* 2613 */	SIZEOF(char *) * (short int)xf_iretmval,VXT_END,
-/* 2615 */	VXI_BRB,VXT_JMP,1,VXT_END,
-/* 2619 */	VXI_JMP,VXT_JMP,1,VXT_END,
-/* 2623 */	VXI_BRW,VXT_JMP,1,VXT_END,
-/* 2627 */	VXI_JMP,VXT_VAL,1,VXT_END,
-/* 2631 */	VXI_BEQL,VXT_JMP,1,VXT_END,
-/* 2635 */	VXI_BNEQ,VXT_LIT,6,VXI_JMP,VXT_JMP,1,VXT_END,
-/* 2642 */	VXI_BNEQ,VXT_LIT,3,VXI_BRW,VXT_JMP,1,VXT_END,
-/* 2649 */	VXI_BGEQ,VXT_JMP,1,VXT_END,
-/* 2653 */	VXI_BLSS,VXT_LIT,6,VXI_JMP,VXT_JMP,1,VXT_END,
-/* 2660 */	VXI_BLSS,VXT_LIT,3,VXI_BRW,VXT_JMP,1,VXT_END,
-/* 2667 */	VXI_BGTR,VXT_JMP,1,VXT_END,
-/* 2671 */	VXI_BLEQ,VXT_LIT,6,VXI_JMP,VXT_JMP,1,VXT_END,
-/* 2678 */	VXI_BLEQ,VXT_LIT,3,VXI_BRW,VXT_JMP,1,VXT_END,
-/* 2685 */	VXI_BLEQ,VXT_JMP,1,VXT_END,
-/* 2689 */	VXI_BGTR,VXT_LIT,6,VXI_JMP,VXT_JMP,1,VXT_END,
-/* 2696 */	VXI_BGTR,VXT_LIT,3,VXI_BRW,VXT_JMP,1,VXT_END,
-/* 2703 */	VXI_BLSS,VXT_JMP,1,VXT_END,
-/* 2707 */	VXI_BGEQ,VXT_LIT,6,VXI_JMP,VXT_JMP,1,VXT_END,
-/* 2714 */	VXI_BGEQ,VXT_LIT,3,VXI_BRW,VXT_JMP,1,VXT_END,
-/* 2721 */	VXI_BNEQ,VXT_JMP,1,VXT_END,
-/* 2725 */	VXI_BNEQ,VXT_LIT,6,VXI_JMP,VXT_JMP,1,VXT_END,
-/* 2732 */	VXI_BEQL,VXT_LIT,3,VXI_BRW,VXT_JMP,1,VXT_END,
-/* 2739 */	VXI_BLBC,VXT_REG,0x5A,VXT_JMP,1,VXT_END,
-/* 2745 */	VXI_BLBS,VXT_REG,0x5A,VXT_LIT,6,VXI_JMP,VXT_JMP,1,
-/* 2753 */	VXT_END,
-/* 2754 */	VXI_BLBS,VXT_REG,0x5A,VXT_LIT,3,VXI_BRW,VXT_JMP,1,
-/* 2762 */	VXT_END,
-/* 2763 */	VXI_BLBS,VXT_REG,0x5A,VXT_JMP,1,VXT_END,
-/* 2769 */	VXI_BLBC,VXT_REG,0x5A,VXT_LIT,6,VXI_JMP,VXT_JMP,1,
-/* 2777 */	VXT_END,
-/* 2778 */	VXI_BLBC,VXT_REG,0x5A,VXT_LIT,3,VXI_BRW,VXT_JMP,1,
-/* 2786 */	VXT_END,
-/* 2787 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXT_IREPAB,VXT_VAL,7,VXI_PUSHL,VXT_VAL,
-/* 2795 */	6,VXI_PUSHAB,VXT_VAL,5,VXI_PUSHAB,VXT_VAL,4,VXI_PUSHL,
-/* 2803 */	VXT_VAL,3,VXI_PUSHAB,VXT_VAL,2,VXI_CALLS,VXT_VAL,1,
-/* 2811 */	VXT_XFER,SIZEOF(char *) * (short int)xf_job,VXT_END,
-/* 2814 */	VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_kill,
-/* 2822 */	VXT_END,
-/* 2823 */	VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_killalias,
-/* 2831 */	VXT_END,
-/* 2832 */	VXI_CALLS,VXT_LIT,0,VXT_XFER,SIZEOF(char *) * (short int)xf_killall,VXT_END,
-/* 2838 */	VXI_CALLS,VXT_LIT,0,VXT_XFER,SIZEOF(char *) * (short int)xf_killaliasall,VXT_END,
-/* 2844 */	VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHL,VXT_VAL,
-/* 2852 */	3,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_labaddr,VXI_MOVL,VXT_REG,
-/* 2860 */	0x50,VXT_VAL,0,VXT_END,
-/* 2864 */	VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_lckdecr,
-/* 2872 */	VXT_END,
-/* 2873 */	VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_lckincr,
-/* 2881 */	VXT_END,
-/* 2882 */	VXI_MOVAB,VXT_JMP,1,VXT_ADDR,0,VXT_END,
-/* 2888 */	VXI_MOVAB,VXT_JMP,1,VXT_ADDR,0,VXT_END,
-/* 2894 */	VXI_MOVAB,VXT_JMP,1,VXT_ADDR,0,VXT_END,
-/* 2900 */	VXT_IREPL,VXT_VAL,2,VXI_PUSHL,VXT_VAL,1,VXI_JSB,VXT_XFER,
-/* 2908 */	SIZEOF(char *) * (short int)xf_linefetch,VXT_END,
-/* 2910 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_linestart,VXT_END,
-/* 2914 */	VXT_IREPAB,VXT_VAL,4,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,
-/* 2922 */	2,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_lkname,VXT_END,
-/* 2929 */	VXI_CALLS,VXT_LIT,0,VXT_XFER,SIZEOF(char *) * (short int)xf_lkinit,VXT_END,
-/* 2935 */	VXT_IREPAB,VXT_VAL,4,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHL,VXT_VAL,
-/* 2943 */	2,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_lkname,VXT_END,
-/* 2950 */	VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_lock,
-/* 2958 */	VXT_END,
-/* 2959 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXT_IREPAB,VXT_VAL,3,VXI_PUSHL,VXT_VAL,
-/* 2967 */	2,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_lvpatwrite,VXT_END,
-/* 2974 */	VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_lvzwithdraw,
-/* 2982 */	VXT_END,
-/* 2983 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXT_IREPAB,VXT_VAL,2,VXI_CALLS,VXT_VAL,
-/* 2991 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_lvzwrite,VXT_END,
-/* 2995 */	VXT_IREPAB,VXT_VAL,2,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_m_srchindx,
-/* 3003 */	VXI_MOVL,VXT_REG,0x50,VXT_ADDR,0,VXT_END,
-/* 3009 */	VXI_CALLS,VXT_LIT,0,VXT_XFER,SIZEOF(char *) * (short int)xf_merge,VXT_END,
-/* 3015 */	VXI_PUSHL,VXT_LIT,0,VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 3023 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_merge_arg,VXT_END,
-/* 3027 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 3035 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_merge_arg,VXT_END,
-/* 3039 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
-/* 3047 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_flt_mod,VXT_END,
-/* 3054 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
-/* 3062 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_mul,VXT_END,
-/* 3069 */	VXI_MOVAB,VXT_VAL,0,VXT_REG,0x50,VXI_MOVAB,VXT_VAL,1,
-/* 3077 */	VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_neg,VXT_END,
-/* 3083 */	VXI_PUSHL,VXT_VAL,1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_newintrinsic,VXT_END,
-/* 3090 */	VXI_PUSHL,VXT_VAL,1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_newvar,VXT_END,
-/* 3097 */	VXI_CALLS,VXT_LIT,0,VXT_XFER,SIZEOF(char *) * (short int)xf_nullexp,VXI_MOVL,VXT_REG,0x50,
-/* 3105 */	VXT_ADDR,0,VXT_END,
-/* 3108 */	VXI_MOVAB,VXT_VAL,1,VXT_REG,0x50,VXI_MOVAB,VXT_VAL,2,
-/* 3116 */	VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_numcmp,VXT_END,
-/* 3122 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHAB,VXT_VAL,4,VXI_PUSHL,VXT_VAL,
-/* 3130 */	3,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,
-/* 3138 */	VXT_LIT,4,VXT_XFER,SIZEOF(char *) * (short int)xf_open,VXT_END,
-/* 3143 */	VXI_MOVAB,VXT_VAL,1,VXT_REG,0x50,VXI_MOVAB,VXT_VAL,2,
-/* 3151 */	VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_pattern,VXT_END,
-/* 3157 */	VXT_IREPAB,VXT_VAL,2,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_putindx,
-/* 3165 */	VXI_MOVL,VXT_REG,0x50,VXT_ADDR,0,VXT_END,
-/* 3171 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHL,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,
-/* 3179 */	0,VXI_CALLS,VXT_LIT,2,VXT_XFER,SIZEOF(char *) * (short int)xf_rdone,VXT_END,
-/* 3186 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHL,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,
-/* 3194 */	0,VXI_CALLS,VXT_LIT,2,VXT_XFER,SIZEOF(char *) * (short int)xf_read,VXT_END,
-/* 3201 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHL,VXT_VAL,2,VXI_PUSHL,VXT_VAL,
-/* 3209 */	1,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,3,VXT_XFER,
-/* 3217 */	SIZEOF(char *) * (short int)xf_readfl,VXT_END,
-/* 3219 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXT_END,
-/* 3223 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_ret,VXT_END,
-/* 3227 */	VXI_MOVAB,VXT_VAL,1,VXT_REG,0x50,VXI_MOVL,VXT_VAL,2,
-/* 3235 */	VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_retarg,VXT_END,
-/* 3241 */	VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 3249 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_rhdaddr,VXI_MOVL,VXT_REG,0x50,VXT_VAL,0,
-/* 3257 */	VXT_END,
-/* 3258 */	VXI_PUSHL,VXT_LIT,-1,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 3266 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_rhdaddr,VXI_MOVL,VXT_REG,0x50,VXT_VAL,0,
-/* 3274 */	VXT_END,
-/* 3275 */	VXI_PUSHL,VXT_VAL,2,VXI_PUSHL,VXT_VAL,1,VXI_JSB,VXT_XFER,
-/* 3283 */	SIZEOF(char *) * (short int)xf_rterror,VXT_END,
-/* 3285 */	VXI_PUSHL,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,2,VXI_CALLS,VXT_LIT,
-/* 3293 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_setals2als,VXT_END,
-/* 3297 */	VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,2,VXI_CALLS,VXT_LIT,
-/* 3305 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_setalsin2alsct,VXT_END,
-/* 3309 */	VXI_PUSHL,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,2,VXI_CALLS,VXT_LIT,
-/* 3317 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_setalsctin2als,VXT_END,
-/* 3321 */	VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,2,VXI_CALLS,VXT_LIT,
-/* 3329 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_setalsct2alsct,VXT_END,
-/* 3333 */	VXI_PUSHL,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,2,VXI_CALLS,VXT_LIT,
-/* 3341 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_setfnretin2als,VXT_END,
-/* 3345 */	VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,2,VXI_CALLS,VXT_LIT,
-/* 3353 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_setfnretin2alsct,VXT_END,
-/* 3357 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,3,VXI_PUSHL,VXT_VAL,
-/* 3365 */	2,VXI_PUSHAB,VXT_VAL,4,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,
-/* 3373 */	VXT_LIT,5,VXT_XFER,SIZEOF(char *) * (short int)xf_setextract,VXT_END,
-/* 3378 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,
-/* 3386 */	4,VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,
-/* 3394 */	VXT_LIT,5,VXT_XFER,SIZEOF(char *) * (short int)xf_setp1,VXT_END,
-/* 3399 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,4,VXI_PUSHL,VXT_VAL,
-/* 3407 */	3,VXI_PUSHAB,VXT_VAL,5,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,
-/* 3415 */	VXT_VAL,1,VXI_CALLS,VXT_LIT,6,VXT_XFER,SIZEOF(char *) * (short int)xf_setpiece,VXT_END,
-/* 3423 */	VXI_BISB2,VXT_LIT,1,VXT_REG,0x5A,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_dt_true,
-/* 3431 */	VXT_END,
-/* 3432 */	VXI_PUSHL,VXT_VAL,5,VXI_PUSHAB,VXT_VAL,4,VXI_PUSHL,VXT_VAL,
-/* 3440 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,3,VXI_JSB,
-/* 3448 */	VXT_XFER,SIZEOF(char *) * (short int)xf_setzbrk,VXT_END,
-/* 3451 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,3,VXI_PUSHL,VXT_VAL,
-/* 3459 */	2,VXI_PUSHAB,VXT_VAL,4,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,
-/* 3467 */	VXT_LIT,5,VXT_XFER,SIZEOF(char *) * (short int)xf_setzextract,VXT_END,
-/* 3472 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,
-/* 3480 */	4,VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,
-/* 3488 */	VXT_LIT,5,VXT_XFER,SIZEOF(char *) * (short int)xf_setzp1,VXT_END,
-/* 3493 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,4,VXI_PUSHL,VXT_VAL,
-/* 3501 */	3,VXI_PUSHAB,VXT_VAL,5,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,
-/* 3509 */	VXT_VAL,1,VXI_CALLS,VXT_LIT,6,VXT_XFER,SIZEOF(char *) * (short int)xf_setzpiece,VXT_END,
-/* 3517 */	VXI_MOVAB,VXT_VAL,1,VXT_REG,0x50,VXI_MOVAB,VXT_VAL,2,
-/* 3525 */	VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_sorts_after,VXT_END,
-/* 3531 */	VXT_IREPAB,VXT_VAL,2,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_srchindx,
-/* 3539 */	VXI_MOVL,VXT_REG,0x50,VXT_ADDR,0,VXT_END,
-/* 3545 */	VXI_MOVAB,VXT_VAL,2,VXT_REG,0x51,VXI_MOVAB,VXT_VAL,1,
-/* 3553 */	VXT_REG,0x50,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_sto,VXT_END,
-/* 3559 */	VXI_MOVC3,VXT_LIT,16,VXT_VAL,2,VXT_VAL,1,VXT_END,
-/* 3567 */	VXI_MOVAB,VXT_VAL,1,VXT_REG,0x51,VXI_MOVAB,VXT_VAL,0,
-/* 3575 */	VXT_REG,0x50,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_sto,VXT_END,
-/* 3581 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
-/* 3589 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_sub,VXT_END,
-/* 3596 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 3604 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_svget,VXT_END,
-/* 3608 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHL,VXT_VAL,1,VXI_JSB,VXT_XFER,
-/* 3616 */	SIZEOF(char *) * (short int)xf_psvput,VXT_END,
-/* 3618 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 3626 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_svput,VXT_END,
-/* 3630 */	VXI_MOVL,VXT_REG,0x50,VXT_REG,0x5A,VXT_END,
-/* 3636 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_tcommit,VXT_END,
-/* 3640 */	VXI_PUSHL,VXT_VAL,1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_trollback,VXT_END,
-/* 3647 */	VXI_PUSHL,VXT_VAL,1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_trestart,VXT_END,
-/* 3654 */	VXT_IREPAB,VXT_VAL,4,VXI_PUSHL,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,
-/* 3662 */	2,VXI_PUSHL,VXT_VAL,1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_tstart,VXT_END,
-/* 3670 */	VXI_CALLS,VXT_LIT,0,VXT_XFER,SIZEOF(char *) * (short int)xf_unlock,VXT_END,
-/* 3676 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 3684 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_use,VXT_END,
-/* 3688 */	VXT_IREPAB,VXT_VAL,2,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_view,
-/* 3696 */	VXT_END,
-/* 3697 */	VXI_CMPL,VXT_VAL,1,VXT_VAL,2,VXT_END,
-/* 3703 */	VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_write,
-/* 3711 */	VXT_END,
-/* 3712 */	VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_wteol,
-/* 3720 */	VXT_END,
-/* 3721 */	VXI_CALLS,VXT_LIT,0,VXT_XFER,SIZEOF(char *) * (short int)xf_wtff,VXT_END,
-/* 3727 */	VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_wtone,
-/* 3735 */	VXT_END,
-/* 3736 */	VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_wttab,
-/* 3744 */	VXT_END,
-/* 3745 */	VXT_IREPAB,VXT_VAL,2,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_xkill,
-/* 3753 */	VXT_END,
-/* 3754 */	VXT_IREPAB,VXT_VAL,2,VXI_PUSHL,VXT_VAL,1,VXI_JSB,VXT_XFER,
-/* 3762 */	SIZEOF(char *) * (short int)xf_xnew,VXT_END,
-/* 3764 */	VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_zallocate,
-/* 3772 */	VXT_END,
-/* 3773 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 3781 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_zattach,VXT_END,
-/* 3785 */	VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 3793 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_zcompile,VXT_END,
-/* 3797 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_zcont,VXT_END,
-/* 3801 */	VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_zdeallocate,
-/* 3809 */	VXT_END,
-/* 3810 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
-/* 3818 */	1,VXI_CALLS,VXT_LIT,2,VXT_XFER,SIZEOF(char *) * (short int)xf_zedit,VXT_END,
-/* 3825 */	VXI_PUSHL,VXT_VAL,1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_zg1,VXT_END,
-/* 3832 */	VXI_PUSHL,VXT_VAL,1,VXI_PUSHL,VXT_VAL,4,VXI_PUSHAB,VXT_VAL,
-/* 3840 */	3,VXI_PUSHAB,VXT_VAL,2,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_zgoto,VXT_END,
-/* 3848 */	VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_zhalt,
-/* 3856 */	VXT_END,
-/* 3857 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 3865 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_zhelp,VXT_END,
-/* 3869 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 3877 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_zlink,VXT_END,
-/* 3881 */	VXT_IREPAB,VXT_VAL,3,VXI_PUSHL,VXT_VAL,2,VXI_CALLS,VXT_VAL,
-/* 3889 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_zmess,VXT_END,
-/* 3893 */	VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_zprevious,
-/* 3901 */	VXT_END,
-/* 3902 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHL,VXT_VAL,5,VXI_PUSHAB,VXT_VAL,
-/* 3910 */	4,VXI_PUSHL,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,
-/* 3918 */	VXT_VAL,1,VXI_CALLS,VXT_LIT,5,VXT_XFER,SIZEOF(char *) * (short int)xf_zprint,VXT_END,
-/* 3926 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHL,VXT_LIT,0,VXI_PUSHL,VXT_VAL,
-/* 3934 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,3,VXT_XFER,
-/* 3942 */	SIZEOF(char *) * (short int)xf_zshow,VXT_END,
-/* 3944 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHL,VXT_VAL,
-/* 3952 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,3,VXT_XFER,
-/* 3960 */	SIZEOF(char *) * (short int)xf_zshow,VXT_END,
-/* 3962 */	VXI_PUSHL,VXT_LIT,0,VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 3970 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_zstep,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_zcont,VXT_END,
-/* 3977 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 3985 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_zstep,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_zcont,VXT_END,
-/* 3992 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 4000 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_zsystem,VXT_END,
-/* 4004 */	VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_ztcommit,
-/* 4012 */	VXT_END,
-/* 4013 */	VXI_CALLS,VXT_LIT,0,VXT_XFER,SIZEOF(char *) * (short int)xf_ztrigger,VXT_END,
-/* 4019 */	VXI_CALLS,VXT_LIT,0,VXT_XFER,SIZEOF(char *) * (short int)xf_ztstart,VXT_END,
-/* 4025 */	VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_zwritesvn,
-/* 4033 */	VXT_END,
-/* 4034 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHL,VXT_VAL,
-/* 4042 */	2,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzwrite,VXT_END,
-/* 4049 */	VXI_CALLS,VXT_LIT,0,VXT_XFER,SIZEOF(char *) * (short int)xf_igetdst,VXI_MOVL,VXT_REG,0x50,
-/* 4057 */	VXT_ADDR,0,VXT_END,
-/* 4060 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 4068 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_indget1,VXT_END,
-/* 4072 */	VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_glvnpop,
-/* 4080 */	VXT_END,
-/* 4081 */	VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_glvnslot,
-/* 4089 */	VXI_MOVL,VXT_REG,0x50,VXT_ADDR,0,VXT_END,
-/* 4095 */	VXI_PUSHL,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
-/* 4103 */	1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_indsavglvn,VXT_END,
-/* 4108 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_JSB,VXT_XFER,
-/* 4116 */	SIZEOF(char *) * (short int)xf_indsavlvn,VXT_END,
-/* 4118 */	VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 4126 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_rfrshlvn,VXI_MOVL,VXT_REG,0x50,VXT_ADDR,0,
-/* 4134 */	VXT_END,
-/* 4135 */	VXT_IREPAB,VXT_VAL,3,VXI_PUSHL,VXT_VAL,2,VXI_CALLS,VXT_VAL,
-/* 4143 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_savgvn,VXT_END,
-/* 4147 */	VXT_IREPAB,VXT_VAL,2,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_savlvn,
-/* 4155 */	VXT_END,
-/* 4156 */	VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 4164 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_shareslot,VXT_END,
-/* 4168 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 4176 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_stoglvn,VXT_END,
-/* 4180 */	VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 4188 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_rfrshgvn,VXT_END,
-/* 4192 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,
-/* 4200 */	0,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_indfnname2,VXT_END,
-/* 4207 */	VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,
-/* 4215 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_indget2,VXT_END,
-/* 4219 */	VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_indmerge2,
-/* 4227 */	VXT_END,
-/* 4228 */	VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,
-/* 4236 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_litc,VXT_END,
-/* 4240 */	VXI_MOVC3,VXT_LIT,16,VXT_VAL,2,VXT_VAL,1,VXI_PUSHAB,
-/* 4248 */	VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_stolitc,VXT_END,
-/* 4256 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,4,VXI_PUSHL,VXT_VAL,
-/* 4264 */	3,VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,
-/* 4272 */	VXT_LIT,5,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzpeek,VXT_END,
-/* 4277 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
-/* 4285 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzsyslog,VXT_END,
-/* 4289 */	VXT_IREPAB,VXT_VAL,2,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_zrupdate,
-/* 4297 */	VXT_END,
-/* 4298 */	365,385,375,2615,2623,2619,2882,2894,
-/* 4306 */	2888,0,0,0,504,480,471,0,
-/* 4314 */	0,467,2114,2152,2133,2763,2778,2769,
-/* 4322 */	2739,2754,2745,2631,2642,2635,2721,2732,
-/* 4330 */	2725,2667,2678,2671,2685,2696,2689,2703,
-/* 4338 */	2714,2707,2649,2660,2653,2084,2104,2094,
-/* 4346 */	395,415,405};
+/*    0 */	0,0,0,0,333,3624,3097,578,
+/*    8 */	2421,3082,3112,2093,429,3574,2214,3200,
+/*   16 */	2297,2285,3807,3844,2258,2267,2339,2279,
+/*   24 */	2330,2309,2237,784,799,811,823,865,
+/*   32 */	883,904,933,963,978,993,1011,1170,
+/*   40 */	1083,1116,1149,1227,1278,1647,1680,1695,
+/*   48 */	1725,1791,1821,1845,1908,1929,1947,3639,
+/*   56 */	3661,0,0,0,0,593,0,531,
+/*   64 */	0,2079,0,3186,0,0,0,0,
+/*   72 */	0,0,365,441,2399,2405,2830,2857,
+/*   80 */	2875,2978,2916,2907,2993,3713,3797,3133,
+/*   88 */	0,3165,3266,3229,3214,3244,3588,3442,
+/*   96 */	3719,3731,3746,3770,3779,3764,3755,3475,
+/*  104 */	3840,3853,3875,3912,3924,3945,3969,4035,
+/*  112 */	0,0,3026,2381,3318,4341,672,4344,
+/*  120 */	726,2887,3284,545,554,4347,2484,2581,
+/*  128 */	2471,498,2507,2601,2246,2539,2611,4350,
+/*  136 */	2366,2357,4354,1296,4355,361,357,3466,
+/*  144 */	453,4359,4362,4365,3151,4368,4371,4374,
+/*  152 */	4377,4380,4383,3610,0,3002,2670,2648,
+/*  160 */	1608,2639,2417,2228,2953,2114,751,2943,
+/*  168 */	0,0,2436,3788,3816,1521,3740,2519,
+/*  176 */	2107,563,3936,1893,2348,1212,348,3270,
+/*  184 */	635,704,616,682,3900,1131,3868,3126,
+/*  192 */	2375,3017,3140,654,1023,2957,4386,2591,
+/*  200 */	3987,4005,4020,522,2972,3262,2040,4062,
+/*  208 */	4047,1314,3602,607,1710,1779,2554,4389,
+/*  216 */	3673,2627,760,841,3301,3828,3697,3683,
+/*  224 */	3690,3679,736,918,2494,1065,2458,1053,
+/*  232 */	2318,1038,1098,2566,1491,1434,1419,1473,
+/*  240 */	1389,1401,1446,1374,1458,1506,0,3560,
+/*  248 */	0,942,951,3421,1920,3400,2445,2529,
+/*  256 */	3052,3058,3070,3038,1251,1263,1185,1197,
+/*  264 */	1239,3651,1755,1959,0,1326,1533,1629,
+/*  272 */	3494,1662,1740,1767,1878,1857,3536,1803,
+/*  280 */	3515,2004,1545,1560,2067,4077,1986,3328,
+/*  288 */	3340,3352,3364,2866,2881,1596,462,1341,
+/*  296 */	2022,663,3376,3388,4056,4068,0,0,
+/*  304 */	0,0,3891,4092,4103,4115,4124,4138,
+/*  312 */	4151,4161,4178,4190,4199,4211,4223,4235,
+/*  320 */	4250,4262,4271,4283,4299,1974,4320,4332,
+/*  328 */	0,1578,1353,0,0,VXI_PUSHAB,VXT_VAL,0,
+/*  336 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/*  344 */	3,VXT_XFER,SIZEOF(char *) * (short int)xf_add,VXT_END,
+/*  348 */	VXT_IREPL,VXT_VAL,2,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_bindparm,
+/*  356 */	VXT_END,
+/*  357 */	VXI_INCL,VXT_VAL,1,VXT_END,
+/*  361 */	VXI_CLRL,VXT_VAL,0,VXT_END,
+/*  365 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_break,VXT_END,
+/*  369 */	VXI_PUSHL,VXT_VAL,2,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_callb,VXI_BRB,VXT_JMP,
+/*  377 */	1,VXT_END,
+/*  379 */	VXI_PUSHL,VXT_VAL,2,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_calll,VXI_JMP,VXT_JMP,
+/*  387 */	1,VXT_END,
+/*  389 */	VXI_PUSHL,VXT_VAL,2,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_callw,VXI_BRW,VXT_JMP,
+/*  397 */	1,VXT_END,
+/*  399 */	VXI_PUSHL,VXT_VAL,2,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_callspb,VXI_BRB,VXT_JMP,
+/*  407 */	1,VXT_END,
+/*  409 */	VXI_PUSHL,VXT_VAL,2,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_callspl,VXI_JMP,VXT_JMP,
+/*  417 */	1,VXT_END,
+/*  419 */	VXI_PUSHL,VXT_VAL,2,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_callspw,VXI_BRW,VXT_JMP,
+/*  427 */	1,VXT_END,
+/*  429 */	VXT_IREPAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_VAL,
+/*  437 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_cat,VXT_END,
+/*  441 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/*  449 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_close,VXT_END,
+/*  453 */	VXI_BICB2,VXT_LIT,1,VXT_REG,0x5A,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_dt_false,
+/*  461 */	VXT_END,
+/*  462 */	VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_clralsvars,
+/*  470 */	VXT_END,
+/*  471 */	VXI_TSTL,VXT_VAL,1,VXT_END,
+/*  475 */	VXI_MOVAB,VXT_VAL,1,VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_mval2bool,
+/*  483 */	VXT_END,
+/*  484 */	VXI_MOVAB,VXT_VAL,1,VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_mval2mint,
+/*  492 */	VXI_MOVL,VXT_REG,0x50,VXT_VAL,0,VXT_END,
+/*  498 */	VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_JSB,VXT_XFER,
+/*  506 */	SIZEOF(char *) * (short int)xf_commarg,VXT_END,
+/*  508 */	VXI_MOVAB,VXT_VAL,0,VXT_REG,0x50,VXI_MOVL,VXT_VAL,1,
+/*  516 */	VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_mint2mval,VXT_END,
+/*  522 */	VXI_MOVAB,VXT_VAL,1,VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_mval2num,
+/*  530 */	VXT_END,
+/*  531 */	VXI_MOVAB,VXT_VAL,1,VXT_REG,0x50,VXI_MOVAB,VXT_VAL,2,
+/*  539 */	VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_contain,VXT_END,
+/*  545 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_currhd,VXI_MOVL,VXT_REG,0x50,VXT_VAL,0,
+/*  553 */	VXT_END,
+/*  554 */	VXI_MOVAB,VXT_VAL,0,VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_currtn,
+/*  562 */	VXT_END,
+/*  563 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHL,VXT_VAL,
+/*  571 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_cvtparm,VXT_END,
+/*  578 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/*  586 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_div,VXT_END,
+/*  593 */	VXI_MOVAB,VXT_VAL,2,VXT_REG,0x51,VXI_MOVAB,VXT_VAL,1,
+/*  601 */	VXT_REG,0x50,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_equ,VXT_END,
+/*  607 */	VXI_MOVAB,VXT_VAL,1,VXT_REG,0x50,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_equnul,
+/*  615 */	VXT_END,
+/*  616 */	VXT_IREPAB,VXT_VAL,5,VXI_PUSHL,VXT_VAL,4,VXI_PUSHL,VXT_VAL,
+/*  624 */	3,VXI_PUSHL,VXT_VAL,2,VXI_PUSHL,VXT_LIT,0,VXI_JSB,
+/*  632 */	VXT_XFER,SIZEOF(char *) * (short int)xf_exfun,VXT_END,
+/*  635 */	VXT_IREPAB,VXT_VAL,5,VXI_PUSHL,VXT_VAL,4,VXI_PUSHL,VXT_VAL,
+/*  643 */	3,VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,0,VXI_JSB,
+/*  651 */	VXT_XFER,SIZEOF(char *) * (short int)xf_exfun,VXT_END,
+/*  654 */	VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_exfunret,
+/*  662 */	VXT_END,
+/*  663 */	VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_exfunretals,
+/*  671 */	VXT_END,
+/*  672 */	VXI_PUSHL,VXT_VAL,2,VXI_PUSHL,VXT_VAL,1,VXI_JSB,VXT_XFER,
+/*  680 */	SIZEOF(char *) * (short int)xf_extcall,VXT_END,
+/*  682 */	VXT_IREPAB,VXT_VAL,5,VXI_PUSHL,VXT_VAL,4,VXI_PUSHL,VXT_VAL,
+/*  690 */	3,VXI_PUSHL,VXT_LIT,0,VXI_PUSHL,VXT_VAL,2,VXI_PUSHL,
+/*  698 */	VXT_VAL,1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_extexfun,VXT_END,
+/*  704 */	VXT_IREPAB,VXT_VAL,5,VXI_PUSHL,VXT_VAL,4,VXI_PUSHL,VXT_VAL,
+/*  712 */	3,VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,2,VXI_PUSHL,
+/*  720 */	VXT_VAL,1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_extexfun,VXT_END,
+/*  726 */	VXI_PUSHL,VXT_VAL,2,VXI_PUSHL,VXT_VAL,1,VXI_JSB,VXT_XFER,
+/*  734 */	SIZEOF(char *) * (short int)xf_extjmp,VXT_END,
+/*  736 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/*  744 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_exp,VXT_END,
+/*  751 */	VXT_IREPL,VXT_VAL,2,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_fetch,
+/*  759 */	VXT_END,
+/*  760 */	VXT_IREPAB,VXT_VAL,6,VXI_PUSHL,VXT_VAL,5,VXI_PUSHL,VXT_VAL,
+/*  768 */	4,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHL,
+/*  776 */	VXT_LIT,0,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_fnfgncal,VXT_END,
+/*  784 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHL,VXT_VAL,
+/*  792 */	2,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnascii,VXT_END,
+/*  799 */	VXT_IREPL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_VAL,
+/*  807 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_fnchar,VXT_END,
+/*  811 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/*  819 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fndata,VXT_END,
+/*  823 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHL,VXT_VAL,
+/*  831 */	2,VXI_PUSHL,VXT_VAL,3,VXI_CALLS,VXT_LIT,4,VXT_XFER,
+/*  839 */	SIZEOF(char *) * (short int)xf_fnextract,VXT_END,
+/*  841 */	VXT_IREPAB,VXT_VAL,6,VXI_PUSHL,VXT_VAL,5,VXI_PUSHL,VXT_VAL,
+/*  849 */	4,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,
+/*  857 */	VXT_VAL,0,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_fnfgncal,VXT_END,
+/*  865 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,
+/*  873 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
+/*  881 */	SIZEOF(char *) * (short int)xf_fnfind,VXT_END,
+/*  883 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,4,VXI_PUSHL,VXT_VAL,
+/*  891 */	3,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,
+/*  899 */	VXT_LIT,5,VXT_XFER,SIZEOF(char *) * (short int)xf_fnfnumber,VXT_END,
+/*  904 */	VXI_MOVAB,VXT_VAL,1,VXT_REG,0x51,VXI_MOVAB,VXT_VAL,0,
+/*  912 */	VXT_REG,0x50,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_fnget,VXT_END,
+/*  918 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/*  926 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnget2,VXT_END,
+/*  933 */	VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_fngvget,
+/*  941 */	VXT_END,
+/*  942 */	VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_fngvget1,
+/*  950 */	VXT_END,
+/*  951 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/*  959 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnget1,VXT_END,
+/*  963 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/*  971 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnincr,VXT_END,
+/*  978 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/*  986 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnj2,VXT_END,
+/*  993 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,3,VXI_PUSHL,VXT_VAL,
+/* 1001 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
+/* 1009 */	SIZEOF(char *) * (short int)xf_fnj3,VXT_END,
+/* 1011 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 1019 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnlength,VXT_END,
+/* 1023 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 1031 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnlvname,VXT_END,
+/* 1038 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,
+/* 1046 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnlvnameo2,VXT_END,
+/* 1053 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 1061 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnlvprvname,VXT_END,
+/* 1065 */	VXT_IREPAB,VXT_VAL,4,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHL,VXT_VAL,
+/* 1073 */	3,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_VAL,2,VXT_XFER,
+/* 1081 */	SIZEOF(char *) * (short int)xf_fnname,VXT_END,
+/* 1083 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 1091 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnnext,VXT_END,
+/* 1098 */	VXI_PUSHAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,
+/* 1106 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
+/* 1114 */	SIZEOF(char *) * (short int)xf_fno2,VXT_END,
+/* 1116 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 1124 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnorder,VXT_END,
+/* 1131 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,3,VXI_PUSHL,VXT_VAL,
+/* 1139 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
+/* 1147 */	SIZEOF(char *) * (short int)xf_fnp1,VXT_END,
+/* 1149 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,4,VXI_PUSHL,VXT_VAL,
+/* 1157 */	3,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,
+/* 1165 */	VXT_LIT,5,VXT_XFER,SIZEOF(char *) * (short int)xf_fnpiece,VXT_END,
+/* 1170 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 1178 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnpopulation,VXT_END,
+/* 1185 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 1193 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnqlength,VXT_END,
+/* 1197 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 1205 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnqsubscript,VXT_END,
+/* 1212 */	VXT_IREPAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 1220 */	0,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_fnquery,VXT_END,
+/* 1227 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 1235 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnrandom,VXT_END,
+/* 1239 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 1247 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnreverse,VXT_END,
+/* 1251 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 1259 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnstack1,VXT_END,
+/* 1263 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHL,VXT_VAL,
+/* 1271 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnstack2,VXT_END,
+/* 1278 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHL,VXT_VAL,
+/* 1286 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
+/* 1294 */	SIZEOF(char *) * (short int)xf_fntext,VXT_END,
+/* 1296 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,
+/* 1304 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
+/* 1312 */	SIZEOF(char *) * (short int)xf_fntranslate,VXT_END,
+/* 1314 */	VXT_IREPAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_VAL,
+/* 1322 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_fnview,VXT_END,
+/* 1326 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHL,VXT_VAL,
+/* 1334 */	2,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzascii,VXT_END,
+/* 1341 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 1349 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzahandle,VXT_END,
+/* 1353 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,4,VXI_PUSHL,VXT_VAL,
+/* 1361 */	3,VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,
+/* 1369 */	VXT_LIT,5,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzatransform,VXT_END,
+/* 1374 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,
+/* 1382 */	0,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzbitand,VXT_END,
+/* 1389 */	VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,
+/* 1397 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzbitcoun,VXT_END,
+/* 1401 */	VXI_PUSHL,VXT_VAL,3,VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 1409 */	1,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,4,VXT_XFER,
+/* 1417 */	SIZEOF(char *) * (short int)xf_fnzbitfind,VXT_END,
+/* 1419 */	VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,
+/* 1427 */	0,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzbitget,VXT_END,
+/* 1434 */	VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,
+/* 1442 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzbitlen,VXT_END,
+/* 1446 */	VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,
+/* 1454 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzbitnot,VXT_END,
+/* 1458 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,
+/* 1466 */	0,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzbitor,VXT_END,
+/* 1473 */	VXI_PUSHL,VXT_VAL,3,VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 1481 */	1,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,4,VXT_XFER,
+/* 1489 */	SIZEOF(char *) * (short int)xf_fnzbitset,VXT_END,
+/* 1491 */	VXI_PUSHL,VXT_VAL,2,VXI_PUSHL,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,
+/* 1499 */	0,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzbitstr,VXT_END,
+/* 1506 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,
+/* 1514 */	0,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzbitxor,VXT_END,
+/* 1521 */	VXT_IREPAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_VAL,
+/* 1529 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzcall,VXT_END,
+/* 1533 */	VXT_IREPL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_VAL,
+/* 1541 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzchar,VXT_END,
+/* 1545 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 1553 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzconvert2,VXT_END,
+/* 1560 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,
+/* 1568 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
+/* 1576 */	SIZEOF(char *) * (short int)xf_fnzconvert3,VXT_END,
+/* 1578 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,3,VXI_PUSHL,VXT_VAL,
+/* 1586 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
+/* 1594 */	SIZEOF(char *) * (short int)xf_fnzcollate,VXT_END,
+/* 1596 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 1604 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzdata,VXT_END,
+/* 1608 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,4,VXI_PUSHAB,VXT_VAL,
+/* 1616 */	3,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,
+/* 1624 */	VXT_LIT,5,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzdate,VXT_END,
+/* 1629 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHL,VXT_VAL,
+/* 1637 */	2,VXI_PUSHL,VXT_VAL,3,VXI_CALLS,VXT_LIT,4,VXT_XFER,
+/* 1645 */	SIZEOF(char *) * (short int)xf_fnzextract,VXT_END,
+/* 1647 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 1655 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzfile,VXT_END,
+/* 1662 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,
+/* 1670 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
+/* 1678 */	SIZEOF(char *) * (short int)xf_fnzfind,VXT_END,
+/* 1680 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 1688 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fngetdvi,VXT_END,
+/* 1695 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHL,VXT_VAL,
+/* 1703 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fngetjpi,VXT_END,
+/* 1710 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHL,VXT_VAL,
+/* 1718 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fngetlki,VXT_END,
+/* 1725 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 1733 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fngetsyi,VXT_END,
+/* 1740 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 1748 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzj2,VXT_END,
+/* 1755 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 1763 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzjobexam,VXT_END,
+/* 1767 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 1775 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzlength,VXT_END,
+/* 1779 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 1787 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzlkid,VXT_END,
+/* 1791 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 1799 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzm,VXT_END,
+/* 1803 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,3,VXI_PUSHL,VXT_VAL,
+/* 1811 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
+/* 1819 */	SIZEOF(char *) * (short int)xf_fnzp1,VXT_END,
+/* 1821 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,5,VXI_PUSHAB,VXT_VAL,
+/* 1829 */	4,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,
+/* 1837 */	VXT_VAL,1,VXI_CALLS,VXT_LIT,6,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzparse,VXT_END,
+/* 1845 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 1853 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzpid,VXT_END,
+/* 1857 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,4,VXI_PUSHL,VXT_VAL,
+/* 1865 */	3,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,
+/* 1873 */	VXT_LIT,5,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzpiece,VXT_END,
+/* 1878 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 1886 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzpopulation,VXT_END,
+/* 1893 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 1901 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzprevious,VXT_END,
+/* 1908 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 1916 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzpriv,VXT_END,
+/* 1920 */	VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzqgblmod,
+/* 1928 */	VXT_END,
+/* 1929 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,3,VXI_PUSHL,VXT_VAL,
+/* 1937 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
+/* 1945 */	SIZEOF(char *) * (short int)xf_fnzsearch,VXT_END,
+/* 1947 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 1955 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzsetprv,VXT_END,
+/* 1959 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,2,VXI_PUSHL,VXT_VAL,
+/* 1967 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzsigproc,VXT_END,
+/* 1974 */	VXT_IREPAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_VAL,
+/* 1982 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzsocket,VXT_END,
+/* 1986 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,3,VXI_PUSHL,VXT_VAL,
+/* 1994 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
+/* 2002 */	SIZEOF(char *) * (short int)xf_fnzsubstr,VXT_END,
+/* 2004 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,
+/* 2012 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
+/* 2020 */	SIZEOF(char *) * (short int)xf_fnztranslate,VXT_END,
+/* 2022 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,
+/* 2030 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,4,VXT_XFER,
+/* 2038 */	SIZEOF(char *) * (short int)xf_fnztrigger,VXT_END,
+/* 2040 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,6,VXI_PUSHAB,VXT_VAL,
+/* 2048 */	5,VXI_PUSHAB,VXT_VAL,4,VXI_PUSHL,VXT_VAL,3,VXI_PUSHAB,
+/* 2056 */	VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,7,
+/* 2064 */	VXT_XFER,SIZEOF(char *) * (short int)xf_fnztrnlnm,VXT_END,
+/* 2067 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 2075 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzwidth,VXT_END,
+/* 2079 */	VXI_MOVAB,VXT_VAL,1,VXT_REG,0x50,VXI_MOVAB,VXT_VAL,2,
+/* 2087 */	VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_follow,VXT_END,
+/* 2093 */	VXI_MOVAB,VXT_VAL,0,VXT_REG,0x50,VXI_MOVAB,VXT_VAL,1,
+/* 2101 */	VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_forcenum,VXT_END,
+/* 2107 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_forchk1,VXT_END,
+/* 2114 */	VXI_PUSHAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 2122 */	1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_forinit,VXT_END,
+/* 2127 */	VXI_PUSHL,VXT_VAL,2,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_forlcldob,VXI_BRB,VXT_JMP,
+/* 2135 */	1,VXT_END,
+/* 2137 */	VXI_PUSHL,VXT_VAL,2,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_forlcldol,VXI_JMP,VXT_JMP,
+/* 2145 */	1,VXT_END,
+/* 2147 */	VXI_PUSHL,VXT_VAL,2,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_forlcldow,VXI_BRW,VXT_JMP,
+/* 2155 */	1,VXT_END,
+/* 2157 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHAB,VXT_JMP,1,VXI_PUSHAB,VXT_VAL,
+/* 2165 */	4,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,2,VXI_JSB,
+/* 2173 */	VXT_XFER,SIZEOF(char *) * (short int)xf_forloop,VXT_END,
+/* 2176 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHAB,VXT_JMP,1,VXI_PUSHAB,VXT_VAL,
+/* 2184 */	4,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,2,VXI_JSB,
+/* 2192 */	VXT_XFER,SIZEOF(char *) * (short int)xf_forloop,VXT_END,
+/* 2195 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHAB,VXT_JMP,1,VXI_PUSHAB,VXT_VAL,
+/* 2203 */	4,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,2,VXI_JSB,
+/* 2211 */	VXT_XFER,SIZEOF(char *) * (short int)xf_forloop,VXT_END,
+/* 2214 */	VXT_IREPAB,VXT_VAL,2,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_getindx,
+/* 2222 */	VXI_MOVL,VXT_REG,0x50,VXT_ADDR,0,VXT_END,
+/* 2228 */	VXI_MOVAB,VXT_VAL,0,VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_gettruth,
+/* 2236 */	VXT_END,
+/* 2237 */	VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_gvdata,
+/* 2245 */	VXT_END,
+/* 2246 */	VXT_IREPAB,VXT_VAL,3,VXI_PUSHL,VXT_VAL,2,VXI_CALLS,VXT_VAL,
+/* 2254 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_gvextnam,VXT_END,
+/* 2258 */	VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_gvget,
+/* 2266 */	VXT_END,
+/* 2267 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_CALLS,VXT_LIT,
+/* 2275 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_gvincr,VXT_END,
+/* 2279 */	VXI_CALLS,VXT_LIT,0,VXT_XFER,SIZEOF(char *) * (short int)xf_gvkill,VXT_END,
+/* 2285 */	VXT_IREPAB,VXT_VAL,3,VXI_PUSHL,VXT_VAL,2,VXI_CALLS,VXT_VAL,
+/* 2293 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_gvnaked,VXT_END,
+/* 2297 */	VXT_IREPAB,VXT_VAL,3,VXI_PUSHL,VXT_VAL,2,VXI_CALLS,VXT_VAL,
+/* 2305 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_gvname,VXT_END,
+/* 2309 */	VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_gvnext,
+/* 2317 */	VXT_END,
+/* 2318 */	VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,
+/* 2326 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_gvo2,VXT_END,
+/* 2330 */	VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_gvorder,
+/* 2338 */	VXT_END,
+/* 2339 */	VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_gvput,
+/* 2347 */	VXT_END,
+/* 2348 */	VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_gvquery,
+/* 2356 */	VXT_END,
+/* 2357 */	VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_gvrectarg,
+/* 2365 */	VXT_END,
+/* 2366 */	VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_gvsavtarg,
+/* 2374 */	VXT_END,
+/* 2375 */	VXI_CALLS,VXT_LIT,0,VXT_XFER,SIZEOF(char *) * (short int)xf_gvzwithdraw,VXT_END,
+/* 2381 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXT_IREPAB,VXT_VAL,4,VXI_PUSHL,VXT_VAL,
+/* 2389 */	3,VXI_PUSHL,VXT_VAL,2,VXI_CALLS,VXT_VAL,1,VXT_XFER,
+/* 2397 */	SIZEOF(char *) * (short int)xf_gvzwrite,VXT_END,
+/* 2399 */	VXI_CALLS,VXT_LIT,0,VXT_XFER,SIZEOF(char *) * (short int)xf_halt,VXT_END,
+/* 2405 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 2413 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_hang,VXT_END,
+/* 2417 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_hardret,VXT_END,
+/* 2421 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 2429 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_idiv,VXT_END,
+/* 2436 */	VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_igetsrc,
+/* 2444 */	VXT_END,
+/* 2445 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 2453 */	1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_inddevparms,VXT_END,
+/* 2458 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,
+/* 2466 */	0,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_indfnname,VXT_END,
+/* 2471 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 2479 */	1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_indfun,VXT_END,
+/* 2484 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_JSB,VXT_XFER,
+/* 2492 */	SIZEOF(char *) * (short int)xf_indglvn,VXT_END,
+/* 2494 */	VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 2502 */	0,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_indincr,VXT_END,
+/* 2507 */	VXI_PUSHAB,VXT_VAL,1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_indlvadr,VXI_MOVL,VXT_REG,
+/* 2515 */	0x50,VXT_ADDR,0,VXT_END,
+/* 2519 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_JSB,VXT_XFER,
+/* 2527 */	SIZEOF(char *) * (short int)xf_indlvarg,VXT_END,
+/* 2529 */	VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,2,VXI_JSB,VXT_XFER,
+/* 2537 */	SIZEOF(char *) * (short int)xf_indmerge,VXT_END,
+/* 2539 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,
+/* 2547 */	0,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_indname,VXT_END,
+/* 2554 */	VXI_PUSHAB,VXT_VAL,1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_indlvnamadr,VXI_MOVL,VXT_REG,
+/* 2562 */	0x50,VXT_ADDR,0,VXT_END,
+/* 2566 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,
+/* 2574 */	0,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_indo2,VXT_END,
+/* 2581 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_JSB,VXT_XFER,
+/* 2589 */	SIZEOF(char *) * (short int)xf_indpat,VXT_END,
+/* 2591 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_JSB,VXT_XFER,
+/* 2599 */	SIZEOF(char *) * (short int)xf_indrzshow,VXT_END,
+/* 2601 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_JSB,VXT_XFER,
+/* 2609 */	SIZEOF(char *) * (short int)xf_indset,VXT_END,
+/* 2611 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHL,VXT_VAL,
+/* 2619 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_indtext,VXT_END,
+/* 2627 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXT_IREPAB,VXT_VAL,2,VXI_CALLS,VXT_VAL,
+/* 2635 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_iocontrol,VXT_END,
+/* 2639 */	VXI_MOVAB,VXT_VAL,1,VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_iretmvad,
+/* 2647 */	VXT_END,
+/* 2648 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_JSB,VXT_XFER,
+/* 2656 */	SIZEOF(char *) * (short int)xf_iretmval,VXT_END,
+/* 2658 */	VXI_BRB,VXT_JMP,1,VXT_END,
+/* 2662 */	VXI_JMP,VXT_JMP,1,VXT_END,
+/* 2666 */	VXI_BRW,VXT_JMP,1,VXT_END,
+/* 2670 */	VXI_JMP,VXT_VAL,1,VXT_END,
+/* 2674 */	VXI_BEQL,VXT_JMP,1,VXT_END,
+/* 2678 */	VXI_BNEQ,VXT_LIT,6,VXI_JMP,VXT_JMP,1,VXT_END,
+/* 2685 */	VXI_BNEQ,VXT_LIT,3,VXI_BRW,VXT_JMP,1,VXT_END,
+/* 2692 */	VXI_BGEQ,VXT_JMP,1,VXT_END,
+/* 2696 */	VXI_BLSS,VXT_LIT,6,VXI_JMP,VXT_JMP,1,VXT_END,
+/* 2703 */	VXI_BLSS,VXT_LIT,3,VXI_BRW,VXT_JMP,1,VXT_END,
+/* 2710 */	VXI_BGTR,VXT_JMP,1,VXT_END,
+/* 2714 */	VXI_BLEQ,VXT_LIT,6,VXI_JMP,VXT_JMP,1,VXT_END,
+/* 2721 */	VXI_BLEQ,VXT_LIT,3,VXI_BRW,VXT_JMP,1,VXT_END,
+/* 2728 */	VXI_BLEQ,VXT_JMP,1,VXT_END,
+/* 2732 */	VXI_BGTR,VXT_LIT,6,VXI_JMP,VXT_JMP,1,VXT_END,
+/* 2739 */	VXI_BGTR,VXT_LIT,3,VXI_BRW,VXT_JMP,1,VXT_END,
+/* 2746 */	VXI_BLSS,VXT_JMP,1,VXT_END,
+/* 2750 */	VXI_BGEQ,VXT_LIT,6,VXI_JMP,VXT_JMP,1,VXT_END,
+/* 2757 */	VXI_BGEQ,VXT_LIT,3,VXI_BRW,VXT_JMP,1,VXT_END,
+/* 2764 */	VXI_BNEQ,VXT_JMP,1,VXT_END,
+/* 2768 */	VXI_BNEQ,VXT_LIT,6,VXI_JMP,VXT_JMP,1,VXT_END,
+/* 2775 */	VXI_BEQL,VXT_LIT,3,VXI_BRW,VXT_JMP,1,VXT_END,
+/* 2782 */	VXI_BLBC,VXT_REG,0x5A,VXT_JMP,1,VXT_END,
+/* 2788 */	VXI_BLBS,VXT_REG,0x5A,VXT_LIT,6,VXI_JMP,VXT_JMP,1,
+/* 2796 */	VXT_END,
+/* 2797 */	VXI_BLBS,VXT_REG,0x5A,VXT_LIT,3,VXI_BRW,VXT_JMP,1,
+/* 2805 */	VXT_END,
+/* 2806 */	VXI_BLBS,VXT_REG,0x5A,VXT_JMP,1,VXT_END,
+/* 2812 */	VXI_BLBC,VXT_REG,0x5A,VXT_LIT,6,VXI_JMP,VXT_JMP,1,
+/* 2820 */	VXT_END,
+/* 2821 */	VXI_BLBC,VXT_REG,0x5A,VXT_LIT,3,VXI_BRW,VXT_JMP,1,
+/* 2829 */	VXT_END,
+/* 2830 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXT_IREPAB,VXT_VAL,7,VXI_PUSHL,VXT_VAL,
+/* 2838 */	6,VXI_PUSHAB,VXT_VAL,5,VXI_PUSHAB,VXT_VAL,4,VXI_PUSHL,
+/* 2846 */	VXT_VAL,3,VXI_PUSHAB,VXT_VAL,2,VXI_CALLS,VXT_VAL,1,
+/* 2854 */	VXT_XFER,SIZEOF(char *) * (short int)xf_job,VXT_END,
+/* 2857 */	VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_kill,
+/* 2865 */	VXT_END,
+/* 2866 */	VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_killalias,
+/* 2874 */	VXT_END,
+/* 2875 */	VXI_CALLS,VXT_LIT,0,VXT_XFER,SIZEOF(char *) * (short int)xf_killall,VXT_END,
+/* 2881 */	VXI_CALLS,VXT_LIT,0,VXT_XFER,SIZEOF(char *) * (short int)xf_killaliasall,VXT_END,
+/* 2887 */	VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHL,VXT_VAL,
+/* 2895 */	3,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_labaddr,VXI_MOVL,VXT_REG,
+/* 2903 */	0x50,VXT_VAL,0,VXT_END,
+/* 2907 */	VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_lckdecr,
+/* 2915 */	VXT_END,
+/* 2916 */	VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_lckincr,
+/* 2924 */	VXT_END,
+/* 2925 */	VXI_MOVAB,VXT_JMP,1,VXT_ADDR,0,VXT_END,
+/* 2931 */	VXI_MOVAB,VXT_JMP,1,VXT_ADDR,0,VXT_END,
+/* 2937 */	VXI_MOVAB,VXT_JMP,1,VXT_ADDR,0,VXT_END,
+/* 2943 */	VXT_IREPL,VXT_VAL,2,VXI_PUSHL,VXT_VAL,1,VXI_JSB,VXT_XFER,
+/* 2951 */	SIZEOF(char *) * (short int)xf_linefetch,VXT_END,
+/* 2953 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_linestart,VXT_END,
+/* 2957 */	VXT_IREPAB,VXT_VAL,4,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,
+/* 2965 */	2,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_lkname,VXT_END,
+/* 2972 */	VXI_CALLS,VXT_LIT,0,VXT_XFER,SIZEOF(char *) * (short int)xf_lkinit,VXT_END,
+/* 2978 */	VXT_IREPAB,VXT_VAL,4,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHL,VXT_VAL,
+/* 2986 */	2,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_lkname,VXT_END,
+/* 2993 */	VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_lock,
+/* 3001 */	VXT_END,
+/* 3002 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXT_IREPAB,VXT_VAL,3,VXI_PUSHL,VXT_VAL,
+/* 3010 */	2,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_lvpatwrite,VXT_END,
+/* 3017 */	VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_lvzwithdraw,
+/* 3025 */	VXT_END,
+/* 3026 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXT_IREPAB,VXT_VAL,2,VXI_CALLS,VXT_VAL,
+/* 3034 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_lvzwrite,VXT_END,
+/* 3038 */	VXT_IREPAB,VXT_VAL,2,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_m_srchindx,
+/* 3046 */	VXI_MOVL,VXT_REG,0x50,VXT_ADDR,0,VXT_END,
+/* 3052 */	VXI_CALLS,VXT_LIT,0,VXT_XFER,SIZEOF(char *) * (short int)xf_merge,VXT_END,
+/* 3058 */	VXI_PUSHL,VXT_LIT,0,VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 3066 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_merge_arg,VXT_END,
+/* 3070 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 3078 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_merge_arg,VXT_END,
+/* 3082 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 3090 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_flt_mod,VXT_END,
+/* 3097 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 3105 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_mul,VXT_END,
+/* 3112 */	VXI_MOVAB,VXT_VAL,0,VXT_REG,0x50,VXI_MOVAB,VXT_VAL,1,
+/* 3120 */	VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_neg,VXT_END,
+/* 3126 */	VXI_PUSHL,VXT_VAL,1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_newintrinsic,VXT_END,
+/* 3133 */	VXI_PUSHL,VXT_VAL,1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_newvar,VXT_END,
+/* 3140 */	VXI_CALLS,VXT_LIT,0,VXT_XFER,SIZEOF(char *) * (short int)xf_nullexp,VXI_MOVL,VXT_REG,0x50,
+/* 3148 */	VXT_ADDR,0,VXT_END,
+/* 3151 */	VXI_MOVAB,VXT_VAL,1,VXT_REG,0x50,VXI_MOVAB,VXT_VAL,2,
+/* 3159 */	VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_numcmp,VXT_END,
+/* 3165 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHAB,VXT_VAL,4,VXI_PUSHL,VXT_VAL,
+/* 3173 */	3,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,
+/* 3181 */	VXT_LIT,4,VXT_XFER,SIZEOF(char *) * (short int)xf_open,VXT_END,
+/* 3186 */	VXI_MOVAB,VXT_VAL,1,VXT_REG,0x50,VXI_MOVAB,VXT_VAL,2,
+/* 3194 */	VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_pattern,VXT_END,
+/* 3200 */	VXT_IREPAB,VXT_VAL,2,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_putindx,
+/* 3208 */	VXI_MOVL,VXT_REG,0x50,VXT_ADDR,0,VXT_END,
+/* 3214 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHL,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,
+/* 3222 */	0,VXI_CALLS,VXT_LIT,2,VXT_XFER,SIZEOF(char *) * (short int)xf_rdone,VXT_END,
+/* 3229 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHL,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,
+/* 3237 */	0,VXI_CALLS,VXT_LIT,2,VXT_XFER,SIZEOF(char *) * (short int)xf_read,VXT_END,
+/* 3244 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHL,VXT_VAL,2,VXI_PUSHL,VXT_VAL,
+/* 3252 */	1,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,3,VXT_XFER,
+/* 3260 */	SIZEOF(char *) * (short int)xf_readfl,VXT_END,
+/* 3262 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXT_END,
+/* 3266 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_ret,VXT_END,
+/* 3270 */	VXI_MOVAB,VXT_VAL,1,VXT_REG,0x50,VXI_MOVL,VXT_VAL,2,
+/* 3278 */	VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_retarg,VXT_END,
+/* 3284 */	VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 3292 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_rhdaddr,VXI_MOVL,VXT_REG,0x50,VXT_VAL,0,
+/* 3300 */	VXT_END,
+/* 3301 */	VXI_PUSHL,VXT_LIT,-1,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 3309 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_rhdaddr,VXI_MOVL,VXT_REG,0x50,VXT_VAL,0,
+/* 3317 */	VXT_END,
+/* 3318 */	VXI_PUSHL,VXT_VAL,2,VXI_PUSHL,VXT_VAL,1,VXI_JSB,VXT_XFER,
+/* 3326 */	SIZEOF(char *) * (short int)xf_rterror,VXT_END,
+/* 3328 */	VXI_PUSHL,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,2,VXI_CALLS,VXT_LIT,
+/* 3336 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_setals2als,VXT_END,
+/* 3340 */	VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,2,VXI_CALLS,VXT_LIT,
+/* 3348 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_setalsin2alsct,VXT_END,
+/* 3352 */	VXI_PUSHL,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,2,VXI_CALLS,VXT_LIT,
+/* 3360 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_setalsctin2als,VXT_END,
+/* 3364 */	VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,2,VXI_CALLS,VXT_LIT,
+/* 3372 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_setalsct2alsct,VXT_END,
+/* 3376 */	VXI_PUSHL,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,2,VXI_CALLS,VXT_LIT,
+/* 3384 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_setfnretin2als,VXT_END,
+/* 3388 */	VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,2,VXI_CALLS,VXT_LIT,
+/* 3396 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_setfnretin2alsct,VXT_END,
+/* 3400 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,3,VXI_PUSHL,VXT_VAL,
+/* 3408 */	2,VXI_PUSHAB,VXT_VAL,4,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,
+/* 3416 */	VXT_LIT,5,VXT_XFER,SIZEOF(char *) * (short int)xf_setextract,VXT_END,
+/* 3421 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,
+/* 3429 */	4,VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,
+/* 3437 */	VXT_LIT,5,VXT_XFER,SIZEOF(char *) * (short int)xf_setp1,VXT_END,
+/* 3442 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,4,VXI_PUSHL,VXT_VAL,
+/* 3450 */	3,VXI_PUSHAB,VXT_VAL,5,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,
+/* 3458 */	VXT_VAL,1,VXI_CALLS,VXT_LIT,6,VXT_XFER,SIZEOF(char *) * (short int)xf_setpiece,VXT_END,
+/* 3466 */	VXI_BISB2,VXT_LIT,1,VXT_REG,0x5A,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_dt_true,
+/* 3474 */	VXT_END,
+/* 3475 */	VXI_PUSHL,VXT_VAL,5,VXI_PUSHAB,VXT_VAL,4,VXI_PUSHL,VXT_VAL,
+/* 3483 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,3,VXI_JSB,
+/* 3491 */	VXT_XFER,SIZEOF(char *) * (short int)xf_setzbrk,VXT_END,
+/* 3494 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,3,VXI_PUSHL,VXT_VAL,
+/* 3502 */	2,VXI_PUSHAB,VXT_VAL,4,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,
+/* 3510 */	VXT_LIT,5,VXT_XFER,SIZEOF(char *) * (short int)xf_setzextract,VXT_END,
+/* 3515 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,
+/* 3523 */	4,VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,
+/* 3531 */	VXT_LIT,5,VXT_XFER,SIZEOF(char *) * (short int)xf_setzp1,VXT_END,
+/* 3536 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,4,VXI_PUSHL,VXT_VAL,
+/* 3544 */	3,VXI_PUSHAB,VXT_VAL,5,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,
+/* 3552 */	VXT_VAL,1,VXI_CALLS,VXT_LIT,6,VXT_XFER,SIZEOF(char *) * (short int)xf_setzpiece,VXT_END,
+/* 3560 */	VXI_MOVAB,VXT_VAL,1,VXT_REG,0x50,VXI_MOVAB,VXT_VAL,2,
+/* 3568 */	VXT_REG,0x51,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_sorts_after,VXT_END,
+/* 3574 */	VXT_IREPAB,VXT_VAL,2,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_srchindx,
+/* 3582 */	VXI_MOVL,VXT_REG,0x50,VXT_ADDR,0,VXT_END,
+/* 3588 */	VXI_MOVAB,VXT_VAL,2,VXT_REG,0x51,VXI_MOVAB,VXT_VAL,1,
+/* 3596 */	VXT_REG,0x50,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_sto,VXT_END,
+/* 3602 */	VXI_MOVC3,VXT_LIT,16,VXT_VAL,2,VXT_VAL,1,VXT_END,
+/* 3610 */	VXI_MOVAB,VXT_VAL,1,VXT_REG,0x51,VXI_MOVAB,VXT_VAL,0,
+/* 3618 */	VXT_REG,0x50,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_sto,VXT_END,
+/* 3624 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 3632 */	1,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_sub,VXT_END,
+/* 3639 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 3647 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_svget,VXT_END,
+/* 3651 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHL,VXT_VAL,1,VXI_JSB,VXT_XFER,
+/* 3659 */	SIZEOF(char *) * (short int)xf_psvput,VXT_END,
+/* 3661 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 3669 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_svput,VXT_END,
+/* 3673 */	VXI_MOVL,VXT_REG,0x50,VXT_REG,0x5A,VXT_END,
+/* 3679 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_tcommit,VXT_END,
+/* 3683 */	VXI_PUSHL,VXT_VAL,1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_trollback,VXT_END,
+/* 3690 */	VXI_PUSHL,VXT_VAL,1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_trestart,VXT_END,
+/* 3697 */	VXT_IREPAB,VXT_VAL,4,VXI_PUSHL,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,
+/* 3705 */	2,VXI_PUSHL,VXT_VAL,1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_tstart,VXT_END,
+/* 3713 */	VXI_CALLS,VXT_LIT,0,VXT_XFER,SIZEOF(char *) * (short int)xf_unlock,VXT_END,
+/* 3719 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 3727 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_use,VXT_END,
+/* 3731 */	VXT_IREPAB,VXT_VAL,2,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_view,
+/* 3739 */	VXT_END,
+/* 3740 */	VXI_CMPL,VXT_VAL,1,VXT_VAL,2,VXT_END,
+/* 3746 */	VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_write,
+/* 3754 */	VXT_END,
+/* 3755 */	VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_wteol,
+/* 3763 */	VXT_END,
+/* 3764 */	VXI_CALLS,VXT_LIT,0,VXT_XFER,SIZEOF(char *) * (short int)xf_wtff,VXT_END,
+/* 3770 */	VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_wtone,
+/* 3778 */	VXT_END,
+/* 3779 */	VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_wttab,
+/* 3787 */	VXT_END,
+/* 3788 */	VXT_IREPAB,VXT_VAL,2,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_xkill,
+/* 3796 */	VXT_END,
+/* 3797 */	VXT_IREPAB,VXT_VAL,2,VXI_PUSHL,VXT_VAL,1,VXI_JSB,VXT_XFER,
+/* 3805 */	SIZEOF(char *) * (short int)xf_xnew,VXT_END,
+/* 3807 */	VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_zallocate,
+/* 3815 */	VXT_END,
+/* 3816 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 3824 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_zattach,VXT_END,
+/* 3828 */	VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 3836 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_zcompile,VXT_END,
+/* 3840 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_zcont,VXT_END,
+/* 3844 */	VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_zdeallocate,
+/* 3852 */	VXT_END,
+/* 3853 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 3861 */	1,VXI_CALLS,VXT_LIT,2,VXT_XFER,SIZEOF(char *) * (short int)xf_zedit,VXT_END,
+/* 3868 */	VXI_PUSHL,VXT_VAL,1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_zg1,VXT_END,
+/* 3875 */	VXI_PUSHL,VXT_VAL,1,VXI_PUSHL,VXT_VAL,4,VXI_PUSHAB,VXT_VAL,
+/* 3883 */	3,VXI_PUSHAB,VXT_VAL,2,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_zgoto,VXT_END,
+/* 3891 */	VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_zhalt,
+/* 3899 */	VXT_END,
+/* 3900 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 3908 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_zhelp,VXT_END,
+/* 3912 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 3920 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_zlink,VXT_END,
+/* 3924 */	VXT_IREPAB,VXT_VAL,3,VXI_PUSHL,VXT_VAL,2,VXI_CALLS,VXT_VAL,
+/* 3932 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_zmess,VXT_END,
+/* 3936 */	VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_zprevious,
+/* 3944 */	VXT_END,
+/* 3945 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHL,VXT_VAL,5,VXI_PUSHAB,VXT_VAL,
+/* 3953 */	4,VXI_PUSHL,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,
+/* 3961 */	VXT_VAL,1,VXI_CALLS,VXT_LIT,5,VXT_XFER,SIZEOF(char *) * (short int)xf_zprint,VXT_END,
+/* 3969 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHL,VXT_LIT,0,VXI_PUSHL,VXT_VAL,
+/* 3977 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,3,VXT_XFER,
+/* 3985 */	SIZEOF(char *) * (short int)xf_zshow,VXT_END,
+/* 3987 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHAB,VXT_VAL,3,VXI_PUSHL,VXT_VAL,
+/* 3995 */	2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,3,VXT_XFER,
+/* 4003 */	SIZEOF(char *) * (short int)xf_zshow,VXT_END,
+/* 4005 */	VXI_PUSHL,VXT_LIT,0,VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 4013 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_zstep,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_zcont,VXT_END,
+/* 4020 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 4028 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_zstep,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_zcont,VXT_END,
+/* 4035 */	VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_restartpc,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 4043 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_zsystem,VXT_END,
+/* 4047 */	VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_ztcommit,
+/* 4055 */	VXT_END,
+/* 4056 */	VXI_CALLS,VXT_LIT,0,VXT_XFER,SIZEOF(char *) * (short int)xf_ztrigger,VXT_END,
+/* 4062 */	VXI_CALLS,VXT_LIT,0,VXT_XFER,SIZEOF(char *) * (short int)xf_ztstart,VXT_END,
+/* 4068 */	VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_zwritesvn,
+/* 4076 */	VXT_END,
+/* 4077 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHL,VXT_VAL,
+/* 4085 */	2,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzwrite,VXT_END,
+/* 4092 */	VXI_CALLS,VXT_LIT,0,VXT_XFER,SIZEOF(char *) * (short int)xf_igetdst,VXI_MOVL,VXT_REG,0x50,
+/* 4100 */	VXT_ADDR,0,VXT_END,
+/* 4103 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 4111 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_indget1,VXT_END,
+/* 4115 */	VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_glvnpop,
+/* 4123 */	VXT_END,
+/* 4124 */	VXI_PUSHL,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_glvnslot,
+/* 4132 */	VXI_MOVL,VXT_REG,0x50,VXT_ADDR,0,VXT_END,
+/* 4138 */	VXI_PUSHL,VXT_VAL,3,VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,
+/* 4146 */	1,VXI_JSB,VXT_XFER,SIZEOF(char *) * (short int)xf_indsavglvn,VXT_END,
+/* 4151 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_JSB,VXT_XFER,
+/* 4159 */	SIZEOF(char *) * (short int)xf_indsavlvn,VXT_END,
+/* 4161 */	VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 4169 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_rfrshlvn,VXI_MOVL,VXT_REG,0x50,VXT_ADDR,0,
+/* 4177 */	VXT_END,
+/* 4178 */	VXT_IREPAB,VXT_VAL,3,VXI_PUSHL,VXT_VAL,2,VXI_CALLS,VXT_VAL,
+/* 4186 */	1,VXT_XFER,SIZEOF(char *) * (short int)xf_savgvn,VXT_END,
+/* 4190 */	VXT_IREPAB,VXT_VAL,2,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_savlvn,
+/* 4198 */	VXT_END,
+/* 4199 */	VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 4207 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_shareslot,VXT_END,
+/* 4211 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 4219 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_stoglvn,VXT_END,
+/* 4223 */	VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 4231 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_rfrshgvn,VXT_END,
+/* 4235 */	VXI_PUSHAB,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,
+/* 4243 */	0,VXI_CALLS,VXT_LIT,3,VXT_XFER,SIZEOF(char *) * (short int)xf_indfnname2,VXT_END,
+/* 4250 */	VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,
+/* 4258 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_indget2,VXT_END,
+/* 4262 */	VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_indmerge2,
+/* 4270 */	VXT_END,
+/* 4271 */	VXI_PUSHAB,VXT_VAL,1,VXI_PUSHAB,VXT_VAL,0,VXI_CALLS,VXT_LIT,
+/* 4279 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_litc,VXT_END,
+/* 4283 */	VXI_MOVC3,VXT_LIT,16,VXT_VAL,2,VXT_VAL,1,VXI_PUSHAB,
+/* 4291 */	VXT_VAL,1,VXI_CALLS,VXT_LIT,1,VXT_XFER,SIZEOF(char *) * (short int)xf_stolitc,VXT_END,
+/* 4299 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,4,VXI_PUSHL,VXT_VAL,
+/* 4307 */	3,VXI_PUSHL,VXT_VAL,2,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,
+/* 4315 */	VXT_LIT,5,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzpeek,VXT_END,
+/* 4320 */	VXI_PUSHAB,VXT_VAL,0,VXI_PUSHAB,VXT_VAL,1,VXI_CALLS,VXT_LIT,
+/* 4328 */	2,VXT_XFER,SIZEOF(char *) * (short int)xf_fnzsyslog,VXT_END,
+/* 4332 */	VXT_IREPAB,VXT_VAL,2,VXI_CALLS,VXT_VAL,1,VXT_XFER,SIZEOF(char *) * (short int)xf_zrupdate,
+/* 4340 */	VXT_END,
+/* 4341 */	369,389,379,2658,2666,2662,2925,2937,
+/* 4349 */	2931,0,0,0,508,484,475,0,
+/* 4357 */	0,471,2157,2195,2176,2806,2821,2812,
+/* 4365 */	2782,2797,2788,2674,2685,2678,2764,2775,
+/* 4373 */	2768,2710,2721,2714,2728,2739,2732,2746,
+/* 4381 */	2757,2750,2692,2703,2696,2127,2147,2137,
+/* 4389 */	399,419,409};
diff --git a/sr_x86_64/x86_64.h b/sr_x86_64/x86_64.h
index 0c10d96..9d157a1 100644
--- a/sr_x86_64/x86_64.h
+++ b/sr_x86_64/x86_64.h
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2007 Fidelity Information Services, Inc	*
+ * Copyright (c) 2007-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -25,7 +26,8 @@
 #define GTM_REG_FRAME_POINTER   I386_REG_RBP
 /* Note that GTM_REG_COND_CODE is not assigned a separate register on x86_64.h
  * The following defination is dummy used in emit_jmp as dummy parameter
- * emit_jmp in x86_64 is not an generic function */
+ * emit_jmp in x86_64 is not an generic function.
+ */
 #define GTM_REG_COND_CODE       I386_REG_RAX
 
 #define GTM_REG_R0              I386_REG_RAX
@@ -36,11 +38,11 @@
 
 #define MOVL_RETVAL_REG		GTM_REG_R0
 #define MOVL_REG_R1		GTM_REG_R1
-#define CLRL_REG		GTM_REG_R0  /* Note this is just a dummy reg. There is no ZEROing reg in x86 */
+#define CLRL_REG		GTM_REG_R0  	/* Note this is just a dummy reg. There is no ZEROing reg in x86 */
 #define CMPL_TEMP_REG		I386_REG_RSI
 
-#define MOVC3_SRC_REG		GTM_REG_R0
-#define MOVC3_TRG_REG		GTM_REG_R1
+#define MOVC3_SRC_REG		I386_REG_RSI
+#define MOVC3_TRG_REG		I386_REG_RDI
 
 #define MACHINE_FIRST_ARG_REG	I386_REG_RDI
 #define MACHINE_REG_ARGS	6
diff --git a/sr_x86_regs/i386.h b/sr_x86_regs/i386.h
index 3f1d3d4..ad5c072 100644
--- a/sr_x86_regs/i386.h
+++ b/sr_x86_regs/i386.h
@@ -1,6 +1,7 @@
 /****************************************************************
  *								*
- *	Copyright 2007 Fidelity Information Services, Inc	*
+ * Copyright (c) 2007-2016 Fidelity National Information	*
+ * Services, Inc. and/or its subsidiaries. All rights reserved.	*
  *								*
  *	This source code contains the intellectual property	*
  *	of its copyright holder(s), and is made available	*
@@ -125,16 +126,16 @@ NUM_8_BIT_REGISTERS
 
 typedef struct
 {
-	unsigned int	r_m:3;
-	unsigned int	reg_opcode:3;
-	unsigned int	mod:2;
+	unsigned char	r_m : 3;
+	unsigned char	reg_opcode : 3;
+	unsigned char	mod : 2;
 } ModR_M;
 
 typedef struct
 {
-	unsigned int	base:3;
-	unsigned int	index:3;
-	unsigned int	ss:2;
+	unsigned char	base : 3;
+	unsigned char	index : 3;
+	unsigned char	ss : 2;
 } SIB;
 
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/fis-gtm.git



More information about the debian-med-commit mailing list